From c8f005f9a347a9c0c68c10efff5a63ca5af23dfe Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 13 Jun 2023 10:50:21 +0300 Subject: [PATCH 0001/1688] Add initial version of planConnection schema --- .../legacygraphqlapi/schema.graphqls | 230 ++++++++++++++++++ 1 file changed, 230 insertions(+) diff --git a/src/ext/resources/legacygraphqlapi/schema.graphqls b/src/ext/resources/legacygraphqlapi/schema.graphqls index dd6bf025265..c759f689d37 100644 --- a/src/ext/resources/legacygraphqlapi/schema.graphqls +++ b/src/ext/resources/legacygraphqlapi/schema.graphqls @@ -8,10 +8,16 @@ This is only worth it when the execution is long running, i.e. more than ~50 mil """ directive @async on FIELD_DEFINITION +directive @oneOf on FIELD_DEFINITION + schema { query: QueryType } +input AccessibilityPreferences { + enabled: Boolean +} + """A public transport agency""" type Agency implements Node { """ @@ -273,6 +279,10 @@ enum AlertSeverityLevelType { SEVERE } +input AlightPreferences { + slack: Int +} + type OpeningHours { """ OSM-formatted string of the opening hours. @@ -758,6 +768,21 @@ enum BikesAllowed { NOT_ALLOWED } +input BikePreferences { + reluctance: Float + bikeWalking: WalkPreferences + speed: Float + switchTime: Int + switchCost: Int + optimize: OptimizationCriteria + boardCost: Int +} + +input BoardPreferences { + waitReluctance: Float + slack: Int +} + """Car park represents a location where cars can be parked.""" type CarPark implements Node & PlaceInterface { """ @@ -802,6 +827,10 @@ type CarPark implements Node & PlaceInterface { openingHours: OpeningHours } +input CarPreferences { + reluctance: Float +} + """Cluster is a list of stops grouped by name and proximity""" type Cluster implements Node { """ @@ -829,6 +858,13 @@ type Cluster implements Node { stops: [Stop!] } +input Cost @oneOf { + static: Float + function: CostFunction +} + +scalar CostFunction + type Coordinates { """Latitude (WGS 84)""" lat: Float @@ -837,6 +873,23 @@ type Coordinates { lon: Float } +input SearchWindowOptions @oneOf { + departure: SearchWindow + arrival: SearchWindow +} + +input SearchWindow { + dateTime: DateTime + timeZone: TimeZone + before: SearchWindowRestriction + after: SearchWindowRestriction +} + +input SearchWindowRestriction { + maxOffset: Duration + numberOfItineraries: Int +} + type debugOutput { totalTime: Long pathCalculationTime: Long @@ -1012,6 +1065,11 @@ type StopGeometries { googleEncoded: [Geometry] } +input Coordinate { + lat: Float! + lon: Float! +} + input InputBanned { """A comma-separated list of banned route ids""" routes: String @@ -1195,6 +1253,43 @@ input ParkingFilter { select: [ParkingFilterOperation!] } +input PlanDebugSettings { + debugItineraryFilter: Boolean +} + +input PlanLocation @oneOf { + coordinate: Coordinate + """TODO should place string be a scalar?""" + place: String +} + +input PlanLocations { + origin: PlanLocation + destination: PlanLocation +} + +input PlanPreferences { + street: PlanStreetPreferences + transit: TransitPreferences + accessibility: AccessibilityPreferences +} + +input PlanStreetModes { + direct: StreetMode + access: StreetMode + egress: StreetMode + transfer: StreetMode +} + +input PlanStreetPreferences { + modes: PlanStreetModes + bike: BikePreferences + scooter: ScooterPreferences + car: CarPreferences + walk: WalkPreferences + rental: RentalPreferences +} + """ Relative importances of optimization factors. Only effective for bicycling legs. Invariant: `timeFactor + slopeFactor + safetyFactor == 1` @@ -1448,6 +1543,11 @@ type Money { amount: Float! } +"""" +An ISO-8601-formatted datetime, i.e. `2023-06-13T14:30` for 2:30pm on June 13th 2023. +""" +scalar DateTime + """" An ISO-8601-formatted duration, i.e. `PT2H30M` for 2 hours and 30 minutes. """ @@ -1836,6 +1936,26 @@ type PageInfo { endCursor: String } +enum StreetMode { + """BICYCLE""" + BICYCLE + + """CAR""" + CAR + + """"Private car trips shared with others.""" + CARPOOL + + """Enables flexible transit for access and egress legs""" + FLEX + + """SCOOTER""" + SCOOTER + + """WALK""" + WALK +} + """Realtime vehicle position""" type VehiclePosition { """Feed-scoped ID that uniquely identifies the vehicle in the format FeedId:VehicleId""" @@ -2049,6 +2169,18 @@ type BookingInfo { dropOffMessage: String } +input OptimizationCriteria @oneOf { + type: OptimizationType + triangle: InputTriangle +} + +enum OptimizationType { + QUICK + SAFE + FLAT + GREENWAYS +} + type Place { """ For transit stops, the name of the stop. For points of interest, the name of the POI. @@ -2203,6 +2335,41 @@ type Plan { debugOutput: debugOutput! } +type PlanConnection { + searchDateTime: PlanDateTime + + locations: PlanPlaces + + routingErrors: [RoutingError!]! + + debugInformation: PlanDebugInformation! + + edges: [PlanEdge] + + pageInfo: PageInfo! +} + +type PlanDateTime { + date: DateTime + timeZone: TimeZone +} + +type PlanDebugInformation { + totalTime: Int + pathCalculationTime: Int + searchWindowUsed: Long +} + +type PlanEdge { + node: Itinerary + cursor: String! +} + +type PlanPlaces { + from: Place! + to: Place! +} + """ List of coordinates in an encoded polyline format (see https://developers.google.com/maps/documentation/utilities/polylinealgorithm). @@ -3050,6 +3217,23 @@ type QueryType { """ startTransitTripId: String @deprecated(reason: "Not implemented in OTP2") ): Plan @async + + planConnection( + searchWindow: SearchWindowOptions + locations: PlanLocations + preferences: PlanPreferences + debugSettings: PlanDebugSettings + locale: String + before: String + after: String + first: Int + last: Int + ): PlanConnection @async +} + +input RealtimePreferences { + omitCanceled: Boolean + ignoreRealtimeUpdates: Boolean } enum RealtimeState { @@ -3078,6 +3262,13 @@ enum RealtimeState { MODIFIED } +input RentalPreferences { + allowKeepingVehicleAtDestination: Boolean + keepingVehicleAtDestinationCost: Int + allowedNetworks: [String!] + bannedNetworks: [String!] +} + """ Route represents a public transportation service, usually from point A to point B and *back*, shown to customers under a single name, e.g. bus 550. Routes @@ -3248,6 +3439,14 @@ enum AbsoluteDirection { NORTHWEST } +input ScooterPreferences { + reluctance: Float + scooterWalking: WalkPreferences + speed: Float + optimize: OptimizationCriteria + boardCost: Int +} + type step { """The distance in meters that this step takes.""" distance: Float @@ -3694,6 +3893,30 @@ type TicketType implements Node { zones: [String!] } +scalar TimeZone + +input TransferPreferences { + penalty: Int + minimumTime: Duration +} + +input TransitModePreferences { + mode: TransitMode! + reluctance: Cost +} + +input TransitPreferences { + """TODO should we reuse this or make a new design""" + unpreferred: InputUnpreferred + """TODO should we reuse this or make a new design""" + banned: InputBanned + board: BoardPreferences + alight: AlightPreferences + transfer: TransferPreferences + realtime: RealtimePreferences + modes: [TransitModePreference!] +} + """Text with language""" type TranslatedString { text: String @@ -3877,6 +4100,13 @@ enum VertexType { PARKANDRIDE } +input WalkPreferences { + speed: Float + reluctance: Float + safetyFactor: Float + boardCost: Int +} + enum WheelchairBoarding { """There is no accessibility information for the stop.""" NO_INFORMATION From d0e1e6dd677d5ddbde3d9387400b22b65dcb8fc3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 7 Aug 2023 23:04:52 +0300 Subject: [PATCH 0002/1688] Update src/ext/resources/legacygraphqlapi/schema.graphqls Co-authored-by: Leonard Ehrenfried --- src/ext/resources/legacygraphqlapi/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/resources/legacygraphqlapi/schema.graphqls b/src/ext/resources/legacygraphqlapi/schema.graphqls index c759f689d37..70170611a47 100644 --- a/src/ext/resources/legacygraphqlapi/schema.graphqls +++ b/src/ext/resources/legacygraphqlapi/schema.graphqls @@ -1544,7 +1544,7 @@ type Money { } """" -An ISO-8601-formatted datetime, i.e. `2023-06-13T14:30` for 2:30pm on June 13th 2023. +An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. """ scalar DateTime From 897af2c06f3ba8b322a7bb3f4315a7d673238b9e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 1 May 2023 22:32:42 +0200 Subject: [PATCH 0003/1688] Extract GTFS zip files, rename dropoff to drop_off --- .../opentripplanner/ext/flex/FlexTest.java | 6 +- .../flex/trip/ScheduledDeviatedTripTest.java | 2 +- .../flex/aspen-flex-on-demand.gtfs.zip | Bin 9922 -> 0 bytes .../flex/aspen-flex-on-demand.gtfs/agency.txt | 2 + .../booking_rules.txt | 2 + .../aspen-flex-on-demand.gtfs/calendar.txt | 3 + .../calendar_attributes.txt | 22 + .../calendar_dates.txt | 1 + .../aspen-flex-on-demand.gtfs/feed_info.txt | 2 + .../location_groups.txt | 1 + .../locations.geojson | 469 + .../flex/aspen-flex-on-demand.gtfs/routes.txt | 2 + .../flex/aspen-flex-on-demand.gtfs/shapes.txt | 1 + .../aspen-flex-on-demand.gtfs/stop_times.txt | 3 + .../flex/aspen-flex-on-demand.gtfs/stops.txt | 210 + .../flex/aspen-flex-on-demand.gtfs/trips.txt | 3 + .../cobblinc-scheduled-deviated-flex.gtfs.zip | Bin 16553 -> 0 bytes .../agency.txt | 2 + .../booking_rules.txt | 2 + .../calendar.txt | 2 + .../fare_attributes.txt | 2 + .../fare_rules.txt | 10 + .../feed_info.txt | 2 + .../location_groups.txt | 1 + .../locations.geojson | 597 + .../routes.txt | 4 + .../shapes.txt | 351 + .../stop_times.txt | 289 + .../stops.txt | 5 + .../trips.txt | 73 + .../flex/lincoln-county-flex.gtfs.zip | Bin 461815 -> 0 bytes .../flex/lincoln-county-flex.gtfs/agency.txt | 2 + .../flex/lincoln-county-flex.gtfs/areas.txt | 1 + .../booking_rules.txt | 7 + .../lincoln-county-flex.gtfs/calendar.txt | 4 + .../calendar_attributes.txt | 4 + .../calendar_dates.txt | 14 + .../lincoln-county-flex.gtfs/directions.txt | 11 + .../lincoln-county-flex.gtfs/feed_info.txt | 2 + .../locations.geojson | 93139 ++++++++++++++++ .../flex/lincoln-county-flex.gtfs/routes.txt | 7 + .../lincoln-county-flex.gtfs/stop_times.txt | 1023 + .../flex/lincoln-county-flex.gtfs/stops.txt | 17 + .../flex/lincoln-county-flex.gtfs/trips.txt | 57 + 44 files changed, 96353 insertions(+), 4 deletions(-) delete mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs.zip create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/agency.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/booking_rules.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/calendar.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/calendar_attributes.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/calendar_dates.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/feed_info.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/location_groups.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/locations.geojson create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/routes.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/shapes.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/stop_times.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/stops.txt create mode 100644 src/ext-test/resources/flex/aspen-flex-on-demand.gtfs/trips.txt delete mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs.zip create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt create mode 100644 src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt delete mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs.zip create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/agency.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/areas.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/booking_rules.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/calendar.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/calendar_attributes.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/calendar_dates.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/directions.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/feed_info.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/locations.geojson create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/routes.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/stop_times.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/stops.txt create mode 100644 src/ext-test/resources/flex/lincoln-county-flex.gtfs/trips.txt diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java index f2cb72ed3da..117da781b4a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java @@ -23,11 +23,11 @@ public abstract class FlexTest { - protected static final String ASPEN_GTFS = "/flex/aspen-flex-on-demand.gtfs.zip"; - protected static final String COBB_FLEX_GTFS = "/flex/cobblinc-scheduled-deviated-flex.gtfs.zip"; + protected static final String ASPEN_GTFS = "/flex/aspen-flex-on-demand.gtfs"; + protected static final String COBB_FLEX_GTFS = "/flex/cobblinc-scheduled-deviated-flex.gtfs"; protected static final String COBB_BUS_30_GTFS = "/flex/cobblinc-bus-30-only.gtfs.zip"; protected static final String MARTA_BUS_856_GTFS = "/flex/marta-bus-856-only.gtfs.zip"; - protected static final String LINCOLN_COUNTY_GBFS = "/flex/lincoln-county-flex.gtfs.zip"; + protected static final String LINCOLN_COUNTY_GTFS = "/flex/lincoln-county-flex.gtfs"; protected static final String COBB_OSM = "/flex/cobb-county.filtered.osm.pbf"; protected static final DirectFlexPathCalculator calculator = new DirectFlexPathCalculator(); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 3fb77a29adf..13e88f86c83 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -223,7 +223,7 @@ void shouldNotInterpolateFlexTimes() { */ @Test void parseContinuousPickup() { - var lincolnGraph = FlexTest.buildFlexGraph(LINCOLN_COUNTY_GBFS); + var lincolnGraph = FlexTest.buildFlexGraph(LINCOLN_COUNTY_GTFS); assertNotNull(lincolnGraph); } diff --git a/src/ext-test/resources/flex/aspen-flex-on-demand.gtfs.zip b/src/ext-test/resources/flex/aspen-flex-on-demand.gtfs.zip deleted file mode 100644 index 2f5d4d32e613dc57837f569450c7d5b72183be57..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9922 zcma)?by!r}`p1Xv&Y`=zK}5Q{L24LUx=W>VXb_Z;a_9z8N*afjP#UC_7U}wp_uSt- zoO{l>_x`b-XYc2k`KokM-SxVj|D(LK0yEg{_$UpVHwPDKK#h9?InkRqE8`liz-18 z`$Nf^LRKvFDx9Z3tJ2f=J7{U}?5&%Yhp7)Ml#B(9*2S|w>Atn3x?=#U)qMC&zAeT+ z_iPuW0vkxfpMN_&SiI;6$$MuwiaG1MN|9XTM-LK63?(0ZZSc)oocaNIG?cp}laH)It@`(L&QfROaqP{f(V;7fdf2mlbkZLxN9d*bM7Z|UjdZ0q$elibq( z(j*_9_pUvB*o(&`@=(%RFzZ8IZ>;flxdv}So9x8MnL>p}DsO=D+4^Jo=**qK<&AxRyq!)44NsSKizTD!9&at{ zPu^KZT1Cpt{qdmo_yE2AaJ`aRYtOjvm)P&3xHu?V5XJf5vXH!csFrxUyDo?#(`3eb zY>>)2Ah;}ot~K>ImJCQW*`>c-U?*Q1BSxaCgw;J4sKhndBkfkqPg)Fge0`D+6xPO} zJQ(M(Qd=29tvJWa4+SqHhYgf%&JQOfl&fdF+#=g9^lPO_;yCaUld$RPs&WbhDxLC&_WHXu(+khiy|qqUFsy+COHb#5i3scH4_ z;YS=?$33LyAemm0+@%V~Uj@iAM0>`|t`^2jCH}}iJn%3TtvW6Zj9KpyT{0OfCY{#G zixV4r(IjqHs9DkG?8)plkrfytc?+SIrKYjxS9lAV+cVU6CnH6%fmz}>Aw8h)AR}s% z3kt3xNYK&=b<>fxqmGOaFJ)g(=MxOd9kO%v9e5D6CGs2(WR4k-s~JQyINFxvK=nyy zqA{ai24=0h)(Y0(bU|UgwfO4q;2WU-V0K$;C~@piKW4da!7#_$4TA7>|2(RB1eGCW zO4XtxQg?8edjOlp;wx#l{W$-|53GfZR#^$wGc!;0IY!^77W%J<4-pQ^U3wvN_BM|w zZ#sf(r$^dQ56bPgkIzx@PshcCDW?lgw&}QD2cRVr&2Mci&DN(a!{%_TsJirS$Cz2~ z8s1j<{B zbhP1eaC3IF0R>pPf?RC5Z2iHu?%s}Wu9n^b?zWhJObLfYU8+j>oZRrVz`i%{zaGfH z$%Bl9hj`s|#0qD(n2OnafQh)GSPvg}cP3++y1K{+yox)EI3GUE&5ez`jU}Sa~a)QI{N<%Fwq6l%;@l%bXSHTEtSK?uDFf!#g1cg6zoJbJDr%}o^1sGzI$zX5g z-OHG5Dck(g5-z%miukvYImF@(qY-F?P4}V@HrhjSWQaPe`hV__gVNpSi1X8r`X)w6 z>s)7QHWucy*6@&EJ$p)h6=Z+3c=o|SR43eGZMelaaEtA1ZEY+aUG3cdo5?PTUASR< z`0@wOP>!5r;-c7C6IjPqUryCKq}4MoR$X_HQxwHE&t|@y{RWt`Ll=FrjnILy6t_=S z@Ev4l`1Prw)}alRqO%a4LXz)CRWGD=fm5=lEwLF}Py;H#ki9RqbA90frJr{^s02^@ zO^E_eF=6gdbKVy|5wO15&PjYi7|`b}amcFa>vE>$;sJN9__pNO1%r86bj+R=$r|z) zqYiL}Qzoj!^%Xu^@5f~VJs%!hosP(yUc--`mOK`JbOR?jJ{v9E4Fd2%1b2h88yNJD zB(e8&^Kt*ZApcGLhhSQoT(IG>crD&RUhbGN^-r+SSh@!K`heK?WoCfi=Q@a&)T?A< zRCR&ZoB^iaO8@`Q<;7!f>*nO;=K7Df*=mCxDCf^_vs}}WC-X}9?OQeYQY9cMKf6Hg zp9?`4eN0Y##X9bb;rzGD4<4~Xt6xT*UeGaBT?@4ypDb0z`|ZcY@kP(#$i~q0Jow_w&FyZM_M*x1wI-fcQoHBz(RuUE{PBsK?&;5OC1;ih zw+)Bif-lyB{eqU`$LM&aZihCGZ%Pi9FQ0zv+3>tN+8jDrjIX&nJ^OL7V^lJUr@mv( zQDNKuv%gcL^51`{P z!eXk(;IH$f9}9mhpx;Y&6^dk!OL^ki+tE1NaVqt0d6qU6^Ab!H&M+F8Ll-#`g5B3h zF-E{xpG=*-FEShxVE2`gYDkuF)N_g3fc|LL*-M6wwYPQD3x~-RJ?CXYNoJq&Tc1Oh z6+?y+)`?ulrJ6`OQUSMD=uZItscm+5o_+)Xw}6q8I5FhIT5s_3MMPvM_P6@t?EG&% z+6vCz^wb1Kl(gs!UZXJMi+Q<}Nwg=HTLJL*PsECMyZ~kgyg3wT1Q3)M#9g3Pey4p)f^Tl`WnM_@QUJiN=OfL);rk^QL-UfTwYLTe$X>|JJ?q( zPjs=Vo$kiEks!o2bo%iR9Ir})n7I9pCht@A_xQTqNf(`{pK=H`m3Jv;b>gL?>Veeh zXizYN$aI~dEJNso-$0fb{+mbSeUg-V+p4jT`wxTXrK_=k9;H6zBQcyQGdjyQKBCA` z=_#%fPju*!yxt0H<-V$-kBGin-%8=76u`7;HlfnTVqkIzP8;q+378RmZ-y9)b1IDW zR-*b9ep_l2LZvAHVS}aGOPMzFIbccB*Qrr@%4VDGR#ky+&D*P>I84ZP|5B<)d_A6T zZh=?OQ+!;!N#vW|D*D+fOGY+#woK9W(lLwmFo9uDE6~b>o`6lsZbZ|=ptxNv{z}*_ zAeOFqxKOjex^XRzxejXVBVg8bN{K~5_yPeQp zqafL@f}uqYY3cHMFPR}Z{Pr!xKNcZ0A6tfl@KRdAv1|u*i6wIwPahdvSTPo?ak0TH zzRBaF&XUhyd3Rx55vum9tO|OPwNxC)iq$WJIan!3O(8UtCf{!xR!RkuU3bmjAq1SM zZK;1Q;)G$MCAIG{6{FSG3u4&JPl|3Dxm!y;!f={wv}@?2er4Ch&qhNcedAH@FemH) z(36`U7k<$k!4MHxk#RwwHBDrg$XJA+~w+VNXk37umQre(4Mh<^P zCUmv-Lx&sSBXV3NNAY|ryYCT03NVRMl%eThe&9nn_59@X=Dlj0B%e=ri@tbkucHn` z`+9y(S1-5?)Et(5i+>BcbIcYfkn|C*n0NVP;mzGEj&c2+z-S#y&UVC1gY5^QY250&sb|}PKb6hh-68Afu zJ`bC>Z2Kg6-idtMNp8QpTCiL0ax}J6e_`T_y_}totOt3@Uf%K~esOcv{{6*(;+bD| z_A_Z=RSA2ff)>jhBVA+|a_v}=Dm2ve#ym57Ou_HN#qvm|lW6tiM=Qxp41R|K0elic zd;HvH4hGdR1=M`InU@uB59T-DyZBAcQxsIaOg97PQYCi>Fb#A+W@3%dR5nDw#k5f;4t+Gn zgdMxra{2-Ma#y_ZF-9@C4N$41)?i85dyCL*QA>Q@?TzP8>KZ%>B#r4=2Z%m<@uJ%J z&;WUfH0cL~*BrbT5b1hYY*6b#sl1~*<=Y2`FlamL2? zk$l-#wYcBK(tJ^GnwEmuK4c1uSOE;^(RZgqU`U1(&ZtnUiQK;Q&>du_${~|d8%*EZ zj;fu)S(havpY|k?kmBf08iL5_a9hmaEv`aq)po@;%^36v0eVcJENY=$t+%hqZhVWS zVs)c-{8=plDPC3%2<0;$`4IoiJJX8DHNi?xO`A?rsQb?^dtQ@kU+j8c1KPc% z0OqPOe`%{gpzrN=Ijw=-RJ?z<+$n==Q^QA6;JZ9QZp{@a3MJT@3aOTu2hEtzn7vhD z%0-km?^P%j^o^5Ch@i|5x+<8M0^T#|lC%Y@GHXI?@=^u1be}ZWX6Bvo^_H#rljgo5 zZ0!DmLK*k#yyMeXT|Be2C$3(TjbnIy&wQ;=(7{Umlx>RZqbB7bu~8Ha|I$u}+Tj!h zM(uD7O|H2Iuz^~aQLrhr2a)Kp>BAR`R!#g&h`?JYLw)AQUEs&Wmv5R9Bfe^_kUo0B zu8TSYb7+{sO7`v@!1f-)MlsVaUIi8VJ%jo&IMn!?)gjg$?VzAA#OZ9&A?+DP5IO z0(s+g(NeyZ2eVz(2h9dMyR*Hn$cyPK@wAlprGM`sV8RCJG0hHjC9hxP{Fz-2&AlPx z?~A}aEmV-l`YtsoSzs}7 zVX^kh9$9L$*d9iW=6YO+;KkOf6L&v^*`kGcm?uL({Aioc! zQQ@OG1Sy(8m$Ql+w9Q6v2bL@G&>C|+PJ`Qz#zD|aDaN_1GHtg@0DuOXC*X}h)wcMs?HZ&gn5yZ3wL zk4DDC%KH5LN}@jIzJ!(qLMX%OcAeA7J=+hZS9u*Z74bEN)+Bs z5QrJ4cBcZS$|;Q`5IQ!(oH-M*?1OkY0&`*u>^TsmA`&#!$7Aw zFAr3xl?V@YUyxUUf%@;|MY^g6k&bhWG?te@ie6MUTa z@m7nUB9x>15jq+GXwLw0Bly@|7<=C!aXHT+_d1efR(7rl#F1Sh$P6AaDdDvS-9+$B z@b1P>rPx^d=C|*3+6bf@fqSoXT{Askr4B&<3C;ODDnK_bwXV|nT5T6Oi*m+`m)ObPiq56B__X!cx zHHP>7P|7?4i89PbGyElmz8c~rl6jo%7Sx0d^q-za-Cddqhlf~@-8_4#$6ct- zfrEH9mxb+boUgyNQbW|n6b(5vqab-b}u5vQ%Z zwR2vi#W%!ovXX~jrUwfqA9<%KMk6IWb%HP`;#GjaW_wJMO6LJA82z+0@bU^XQH` zu^*6m`m&Ay93JywvyXEurI0f^f|v5wvHQH1$Oy?2QYjrA1$HfYddk|=MM<88Mk(H> zCh23Ewh_8>53jYkI8BrN#P$y~1b0$Y@qH2sq$8JtB)Sz^qqU_8UZVtV zLhBrHtc!96%VYkUo@s}OGghPXJvgN&wVi4;d+o}7!cGt_v2$i&np9{uY4n>ngc?Ck zZ|w8Cwtw;uoL6nfZLMy^EQU!a%yK)-CFLme+?C$B@AIS8$tTyQ(5%+$hKD0{yBdE# zVEPn^tEr%g>?{BDJ+@?U)EtHA)A{t}=<+8*bKy5D`YnnIlbt1AAGu{l>rtlt6RK$GX)*iZ^84@wc_MKA{$d&vM#&wFI;j5RomkX=3#$d zt$nm9J(E{{VG^a-p{h{TB*N;WN3AlF>*vz&WQXC!0G(`|0bo=^5N}7>pF-GYiEL4B zzOA@}60g4x8D|R(X|PV^oXp2(DGXGjkBFo<7@)LUZSH&2LASXVcd(~7fu!@e5IwPC zD&HAcw$$TMDVBJ}y=rY~vpR0o52P;Y8rtQ2&$2-PTyPdQ-KZp@)HKgI_-%&D3agE)3efjsFnL7$MB^VHQ7dkHCo@}^I5Z+ zBr3Z{Bs*;Ba#NXQWsg+Vw<>%Hj~8r=U(D_ES^+Xo#^CrhAzZ%EE62#rVk5NM#%P&V zg;qXc8kY&%j17k96aV0-77=jab7n2{gIr-)#ycVtXoOy|;b4U?qrkvf2~;Kb0X~s- zPHz#uhQNYQXRg_+qt^0EGHd%YTOr+&0K!US9JWoX?zGYikM9w?`3e0*0&-+ldl3$Z znJu&>b^;kq*8FK@U+e{hWhqLJ=d__QMRlm8vOUH-@A$Ou%5zzI>-8AJlLTeyb~QI* z^owJHo|?W{6Y$Wrr5Z~~OEJ{>BH$ZTn~B<|q~3K-{Jj{mMBEInx_TrPflGL=meA# zMe=@FC4!e7P;is5-B_@3opRX*QFZ6-F$^vs6201km~K#jYkB?7(l7!Ww?P(C!yx)q zxH|d51rgDlyr4p)Bu-4VGge~8_8e#SYVnOyw&zsVXh`>CZGEvdrNgl-sp79w%a#fx zIVzr3;;`E^bbba^jrURv-4(-uJ;Ue-^1&F_EIMG4ek84JF+NxVI+#ELvQ9&U6LF@*5aZ@nT<-K?;h5Dc*}KS^Jj* zUJvh%GFXsUa)r=IY(^uP4RU(j3~9Xc2kADMVog!jMkE*u-za;igW~G9yNF6ri2KZ^ zeu{^CDt4o7@OylFdKCO9QC=HrDHY9_+WR9r@Q3)Uc^B^n|I@RUOBJNk8jHxFeK0)@ zewnvoMMzW&NmE1c?rX~?pZTuqv`uS=S{M_L3Zpylf;f+>to_W_ZgV`@y_5ro1GPfF zUnoVUyXdG#+-i~ZVO>{%*OieF=2kXJijZB=*LkPYzQ;a1VQu5b>4}uCQPpm|RH+me%a@)7Bw;ly z+!lw}2%jDN7u>UL4M(HhgFa>St=lMblr=n2&97 z+!iW^bZYg^aQ8|9tou4QkWWNd)S*xc%n=EF zx!&cIkxheoX$J9n_HEsOQ0JZdDRSO9#o)By!va9rlPWp|ByQZ!=t`Nk6*PdF+ z#cjVL8ckN~$!F7&I@SGPMJ*ZYgs`XiiQ}!Zyq8 z(*CV;Rt`QD?qWZb9H$Stx+7PoM;%V5g5LQwfm7cdbRU4R`^m|9gwv%ApPx~tK&R}0 z7Mg>T9QfT*O%MwW{7>|t#S|9|3U{63VTmt5!VfY8GV+@S4V{JZY9olE5J)9s*KJvf zm-Q%&3wkW6F=j^>sAvl&B#>??G)T=FN*lDT?S=sDU&R!%Urmy!IaG^R6E27zp2RbI zXUphd_^)rODJO_TZX_bRqNpQrC9?=G-b(tq@#jm#xAWuvup7Rt0wW7SOC=w~U31g- zj88+jHZE}OJjuW{_Uw$Ghfo4C>L=i~_3Rr##;rA)T1 z7J~Wtlk+}@W8vdgeewuFX9^3O%^{q`*6BGn{5|{!<$=q7eT+CX-a2Vm&%Qf-a{nM8 zXSByfSjcx})HLrV^=0Eui;j|Q9^w~JTF#NZffQrv0d2*zS2n0;WQHY1 z#TOSDqP_1^6v@;nP~UUy1Xg|!N9Xr<|30kN((gft*~hh*mcAy|clzwE-9K=~j07)9 zYZ9CMCX&+Y5qd#*wPbFX+MBYro_s8UD@QJ4_LOx-&PSRF(ekQ zV}!wR&P$#GFTAqyFtHU(PV*5I<6oBi&@fiv$0ZR>Wxmni9zgZlW_+P# zs&%|)L}ru~;m7*qE!OYH!LslZOtQRopDg$ZCIGG+{yKhxYv%Wavev&oyflEQ;lfXY z<`8vwX3k-&MsB$EHY`?KD0pEvxA_iyS4ocT-r_z%oq ziS$PS;64)%_c!K0-fKX-abvf73jC3XJTY+;6~%<>L?Xa3ExErD|qKE zF%yyqS6Tf<$=X~#yr)7_Meesd17bq@+Ufy3kv%J!`bsng12Z=x6XVc5(u)cdEA!f1 zMGBfLVbt^ehp^Uu*o2_)=3!28S(K-sV8B(G-SQ@$ItT!O^mf&^v9U0-Hqo(nvNUpdm)1#E z>|NRx;)`HBKIkGNq!qUiG^~$QQw{dWU^d$w@%Nx+atDVP;PU1O z5#&CwX<{ozBEqo3D-xxUvm~)XM8Bl_iv$SbE>CffQ*W4*lEw`WTmDWgys{~I=vox|c z)U$urQmBs}-j@KDck){`oh-AoKuCFPXIg^t_DLdp3eOXZ=vbTV3C3MO<*Hm{-;>b5 zcgHVwWm9{?3Mj#qGU=wh1*oBuNCYqW^%)Gj{tU4wyif@LTzlHga!HvS{p*sj*h3+y*aBH|CC1OiR2%t>A;IT4?2JjQRvQ} z1xi>e(b^-1jx-m1OE69>-{dGq-QgclSOP!V|_>gL@BbCBUpA1 z`5VqVzCo=*K^;Q?9}&@CwyX4lM`9Sqglyc$HDutU&}2VP5z3RQ8h+Dgh{4b^j9*ah zR#7F6DLx856?tNOg2-Zh?C4k|y0HoPwA5sk*3@We6gfZ<{)YzEZ&n=^O6_HPYuxp$ ze>WaW8v{K@GaG9M8WSTMa|avi(R7tzMLyV|A81bqTead0si`BbCVZ$Zh;oQRf{xU> z-TrW|%`(Tk5hUoE_Y3yUGRE?2En>esYHiM5o*^<@TpKuS4PX7@n=NEAxtDN#Z0}A_ zAL2O>PVrgqZy!cozVrOzNdE2HU+N;G+3Y~<{rj@>c~!~l(Ft#T?Xvna0zQ{(gU9ub z^a{;swaKerzYHE{i~H+Rt4n)Bvq#%2^4;?IGq+Y-rH3aM&G%N@^IL=4nRX3%8b-_?0VK&MYAjYPx!q z@M~>v0d6}43!)tZrb zr-h_kf7g}*B<@KWQElX}vWg}#irUw2=N7+Qt;m>L<`W?kjFe4MGna!L{ac)h^P>WL zgOyHZ3r)oZaldUaXO@*c&G7>InS{mV&@fdyi7%)={REF2idZP6$SUchmEe;q@Y<}i z3K3eGNWE15Y+9@*4Mr^(gIjp0(IEMuA&?uQH7yT0v!w#kBa` z@+=x6^ith`#7f3K1-CHGO)(^$YVUcO(0M8)Bq&aO+Okl&F10L-i8%}sxx5(0-~rk1vd(lxC1w~HtfryV3NajdO zM(`ciHlZCPyUjGq>|;BlJk;uy;tdL^S^1G4L ztv?o^;02A#FkII`YA&_JC*|cKe;(-~vb%h2M5JHLa=G6qVgm=I@5m>u>o8z8YA`Pn zhYiTjX?7-Xbhr4rzz>!>2|=?erc-Ri7|9N$A^e~@aE{*S|22-G?--?iR(>($HDBvV zRd}ZM9&8Q5MOw|k-`Zbfwglz{{}UKkK`s}{6BybA4VC+jI+ zMb@EHpx8qUU{>=#j0h?_EI5tFLYA&Vwoegqz(9S?7o=8VoL2#jVOkVP- z992_ZW6eL_Sm%A~ApLZ+N)*#KgX*Osg&6EKPI0Q?3uA9T@7=zvt0 zGlMZBmX}wF95hBWN=J+!T~)Rs&f+uFVDw?#WzH;Gt1x_`N)X$;LVkP9C*uXta?}W;~ z47^qgwSI9pv7v};@VBP+;I2th`+A|Mu!}0Cmr`wjq|8w-RFhSaAMii{>BpBv;4TbS zX(b}es@QWYs6gQ`t+{>bh{Wr(n1rOkXu4|nnZkk*6b3PG#xI{%&@o-_2ceh&If(3(K;hnTU!Pet|nC4 z$XLmliacqmDry5+L^e)C(o}c`^^RjIz#4zwP8Hac>u4kDue@34l-tIM#1ebB_S+=N zDPqDI(_>+H{BSEo?>Qpyc(?|0aM-~4C4Rwhb(n#Cir6YvpnpmXi2P*eauQ!~^gj0W zfV^!K*=AFu^M|FiB;Ij|`;cter~}^al4>|PhVHtM6!1nNC(6c3S;FsbWQ9mt%aRZ} zT~j?S*FFrafv}`twOz)7%y4*~s1k@A(+-io$WoqhpO;dasJjC0^^e)&x8dW1bcD(g zDrh#8F$d8pktA+^n9hNx4RxXRP37W-TkK(lqTguWWM@tA%dm^8!G5wUl^oiqug^){ zoJ3Gl)#yO?OhYDMsiKD{)b&8mvq~qj&7a)rI!xQzvuw}F8(8a2d0xnK6VKG-H}Zg%l0$2E8r z;}ABFp)Oao+_Z=LevLtcCS~LzXzLQGUY>BNQXpIgf1k504>{h>_>iL!mO!+*Pzr+A ztBhJZSS@b3UfYiF8VE^%#}uo`iS~?@6oI0ZOLdLPRNhe|+QJ6)s!R0r#lb2{4A!_V zfwDLu|5(2zJ--5e15#2>|IMz6GGSHBP&Rh!Yr=uC$WFwff|TDkVgtWYqE;B#4Q2J? zW$Vw`OKYrw-$vxk)N4WKh)y1K#xd^7Z(gqeGP-VF<3cX711G%*L8FKqZwDgcIP~te zYwn$OQBhJeyUD|uC$q{TF0OQzJ`Ce;OfOqmhJ|Fh;6URJHenK}^VDHDW|M{I2`Mev z*YbVg6F^#0s>|iLl}$ZFc577r9H=ch9_AkegT%hA2<5tB5~VVaoXcjqRAPx|2gvRz zu2r*l7!YnMlas43{)$Crv5tp!o0=OAhX!!MG6=Df+N?@k;(`t-YYlkr<|ewa42u!F z?ic%fu~YM_pPK{;y;I(u;i6MppL1L=kh6`NXhB_4eo2y0l<s}+oaf0rdL z{g-^Q$nEfs5WC#lWISwwcE?J$e>( zh}{WwA=a{VSVuUaLxiHT5B#PqPu_k6!0!SoL!ko+61@jsH$3bB)`Wz{j7Yw-3bLgj zc5=-95jGlN7=3Dc7w9M)2lMDkVCs8{;zJ}1fB!vhcy0i=phq3e% z%mSmiOv1y^wl%S5oCv!XO(rOQWi<9_E4E0d@`=?m1l8~N{)|dP^{WQVjwGOqQ0u2F z(%Km^Qt)l+I^LL1EVYyH^NUP=HMPnnBOS9d?;+T4Jb&3dSP9cHxWF^wrJ+EwuNB$F z^O^}P(T9G#l@v3llKz}_%SWdYSM#F`q|f#Gp0l6L=LgA6^|L_cR`w`tX`0X=A2fgf^24N;$$>Nx8esxY&gq%>D%=%1 z7LVUl%YAU33eRNmkOwO8ztAA|Y6>=RkbKi`kS1^QzxQeC8{og@BTCVe=G}C#LhFxc zF95Dj6dK9>iS*11S#;nAw0zZxV>7i8meb5S>osDg#E6=>tRbH>P?+Wb)`LgWByi*} z)p>o}nZg?jHfJ^ha?$kPx&*5m=%1n74LtUO7&(##vklVxTz~iLi}F^>%$bZ;LMflw zH;@UlGOpBx=g_c|ZzgjUBQvibMc?7yBmzSp1Q+E%RY5z#elmS_ZH4FkFbir&8?V-h zEs@toQ_SR+%UpM4D_c3I$}=+4A(S#h(sJHe=soKY6`Fy~NcnxJU%%knAJd@s`QXUW zGae#30N~93x9Se2dbWR0#S+t1Dh!!Wg`@~!YflV5=6Lah1^sF* zss3>iA8=-~?)h@1^4;rkH~6M|yxr$^S*88yVm4aG^X6gaaop#1oR;U=wB7UfiOt)W zk3YV@{+_+l@%k-R#O-yCFK^#!?EU-PY`mf_qv~~IzP__fYSVK$>@_ApqIOnZ9*p~>{%p#X>b2YSynqh& zwH+%DzbIis4EAe*kPf=n@sH=4j#w|3?7W?L{Nk!|y~iKn+%02A%jft@q7}vn_`(*{ z$!Q@cB*R)LT)f`9|QbZ|a+<79g+L14^0KdYKLu}*%iitM&4Q5^h4rT!o z9Uqu2eeW=N?1pHP6B-9aNGNm)n| z%K+NaNNUD;2=FO~F;#&Ra7b|SHGta;Ij_wa1gji&6|Zk6fYdb80U+m#SN%D#Tz9cJ zKY@k7ig(3VI}Px_1{USFC=&y630?zCvBWKAt!eszK0;U-2QtJhu;4q_1jy%*#4Hu) zy^zpQGg#Fef?VXZH*x*6W;tn78|@}iSpUjd~@F^1Og`z zO7AkTyb!sFud|q0m;}MVa{*s^9FtQuA}J(HtSoGTH1iQr@GMh_wjBzvV`?K{N}k&W zNCFYB(C?f*mO6Y03>YgiM`<*R74-}kdTVEAqn~<9Ym?DLe2+wOCNL6yx0FS4QT++ChRt++=0BHCGz<_M}hLAI+x^IfG*s^muhp75adEp?FUEE*?Y?KX}}y$&x0xdHF! zLlhwAJ_36i7C8d%9l%`40UTX^M*dthlqd>tbj(>ez70!6;4D~tmD{6GP3fgEm;_dU zC<)(5+=@b5<0lc}Sy)|vX^})-l72!Jezir6f>7pP)Pcw>UhCJMuw0nflD%g2Yt18$ zz^S##B+$db=>5SCG!x{~gBOP--xiSc(w-P-UzYj|gTH3-47pID-f zJW)x^XG~ofcL=RG;$rH_jG{IF47eFc4+kfhrpJ$2P`)r7PeyD|;UOG1R9-(2?~+0Y z0Smd$8)-h+^V z?CxxW(N%2H6S~qOB9;4X`_nmOOnYH-seUwuZg`Q&^_+(^NJ+er1$w14G;Q-pz10G`#smJpOEyzH&9Q#>!A zT^)tpJiKpsH^4x7qkg@*ud__?Wn6Nh(O;EPH5{2}d5q2-Uz^Z)>dMaGOb8@kb;fDs z8)f`?0#NkJmDMLfPRM+bVbPW#kR;zh@h1?`Sw-s&QA)d1gtSW{pdj#`ntl%1_dJT9 z^hIdkL)01C6zIL{*oyJ3cBojD)?rjnk}NM!RTFo&Y{KLg{tIqsIu5jk`6kZNmbni| z-^vt04*`Qd0(+Xom*NvewaqI-{80Sdy}g);pe#!~7ah2X)8BAS5E>38KLbQIgjurI zFR?-Liuee*&{XB8!6Q7pQ52NXi=J{z!Hd0c(^}WAu+b9XudwKqo@hN79&BZ7WT!UG z@jr}qbAh$gfoyTLhMICf=?Rj^Iplxt1{`Frk*{z>GZ~1p0$F8YW6lnw@&rl!a(Ys0 z`IgDZ?{-L$i8Kx61Sc5WR=IgwcbRkcdJK^o>{{TI_Sx*3_n4s_D!SN+U_kgtO?C{o#CGP2D4^O?WGJ6FOkY#~#=<#Zlw=`HL4H%zy&BgJ{_YrDjG6lu zNti-{To1U#)y&sxN1sAc!E44EN5|V_!~z;qMqrYN#OOykn+avcEB@gyzr1;2UhlMG13yVb2i99uA@)R=d!o{_362D{owh5nUe}X!Dr|Q znNBR@d^VhWZCqtfhU&ZfWtp#l>NNsv9;Zvd_6IkV%Rp}Q-vSSznjvL9NpmFn;>sMF zjbIdg}J;&r{L_N__J4r57gYkgajhB4` zX}Mq7!s6A>oCz3DQYccHqYCnR0FT$s^^=VD&}Bs{bJXnqMr+;%H)Ie<5HRuHhrU~0 zOoBBpG@oraFVa&J)-WO!Ag8Oq%NSj4kpvcl6)$nSavaf~$pdlqk+4bdE3EA4O9maU zA9vTWSXlr@)*3OmlC6C;Fe_thI2kKz)j*!NsV07>=sfd~==2MxU~5PvYa^pFuh{_l zEi?ibu=awP#R#|2IVAU5zx4lGJ~kiQ$GcF-G|SX9wi(tsDcXb_J0!!N*%ha1Bn$WDp=v0 zz`O@|ilXFCxm$ngqJjkz(>t6m#f*X%@_xBfF(*1(0_ejix!vJewU$vam5yhXaH403 z5WKSipS!Nfr|W&L?}QEHOzzTk&Go&5X8WtM*kmLZf@PKC6K9bwHBZ&P_IlzQ$x(S* zn^s|#nAZOha|%RX`R?79B#VTG%Avj+j1;va1rK?mIf;KYxXb-1F5UhxTcH3&0}8Ph zaKjx`g66QHfb)4V)zQqMb`?SkPMZB2CnFq?iJg(RJ$g!UjN@S7xE@XBo3U@O8m^}p zd=szxXp00c{IJ-Q7sf)EKRZ4$xl%+tGzP&+K_n<_zGDcyST`iH+M7AeNSA)ef6Z1! z=GX=S7p=D|z5yv#9MDJ0HG4co!~0bUZSBaAS0siey5OeTIPT#=B>GwIGDADcY+0ii z0l14QRt^n2u>*jpWSKbyT1-`zlp$P+062Xf2d8YV&Z3)qr?J{zDqfA;7*glaK^f#T zTiW0rmz~=Z)8`KC31x}ok1*p#h0lOp zcN|~Xry;iq=AptagbZAt*YiliXuc!F#sjIo z#rl?`Wh2;G-_Vpz5;>P+^%b~@LO@JdbYYt2fHC0;w9$^?9l|#fbpkkF-iEpkrVHe} zUFeLsf@Gq4(+i*T;PxRpzJN^h^@PRSPtgz`f)6~xiootzgBDe*hq%Up;uOyUj2sRC zMf+eyO?A9`Nf9xHn-g%l{-lGRApU@wp26rF+oXP4tBxeb5QiYf^j1-IAOdgG(N86c zw7g~dhM%POlRv5;e4>tZkA6+j@xCBv1OrOA*@eaVKdrZF2{VXQKZHwAh8QQZy={qV zNmX(>)raj=OLRgVByGgw#kJm`{modkr5XrgOsDYTt$>J7Qun(E1iSygR}a_M;t$h4tTWBf40#?122vR_<;@O+#| zIeTY5zRw=AxA8b4F(G&Xl;zwsg$@;85>S>)ZJwMLdQEFG<0Ny>e~=W|J2yy!Q8G#Zj%$kS2a zrwGZ7hlm$Q$T9@ou=c9sj2x4>q!O+)5Eh6t8oyS0+&dl3dp(&*$K;fgAE$g9G>w!> zb1I-jg2cx7s^S6`ZQx5{l41)ejUd@-=xa+0YNgU(A@H8b`^KJQD14fFZ77~9ISD|h zCsGuu1l@$@m^!9>>o#lhXY<??qk^FUvh{HkHAuc)!dfW(~uGDr01EU(e1)4mZg# z?O`;r>iPz2Ad%NB6*aN@PyF5v2EnryGTkVa*W7KM@qO8_@$o{z?+3qHcIgAp@iDO^ zcwp%RC;IE3w>$A|YfMxILFO>qiwRVEk4}^I>CiG9EJf-1k$o_c>B&V)^y%~U}s+SFtr zSmR1$M+NMd2cL!j7A+csW_2ASfj=ZpH>QAh!|I35rVA|L*8~y; zVvf~vK@(v`{OOd0CoY8f&)`w`>eE`n#oM<9Tixgq1ssJIR?d4pfR$DO+=DC%`kg~9Z0$}|Qr!J{{ESn^=zrQ4HH3KzWS zE=_t=Wh{#uDAJW~MOy1InL_W*T#^M^IAdW2zJFJh5Yt_wh*Fbh4Q~E3`ds#YXtqgB zb83KS)qfa$>8Z75Osg$3whCi*&$Sn@soi37<7d2DVM@-^7+}&;5AjKV2Rt~0tVz)+ z$Et~i08w$a1(hQ^!QUHyGrPNU%+8|;Uwt;=DB&5LydEzMa23WRV&EfC9~K63*eVfl zHvcGqn~gAlF5-h^Uf9QY|;9- z%w3Sa+{X}bW_Vbi(Ad)r1w8enrn{~4lFJoW<4EwgF`|^*2b?BexmFaW`NvJU)_N_> zRy{5?8m4M8slK;aSfo~ymb(vcfc)H~&|8OeH&^*9cF2=8{S*eis|X}BZ93Gr5&TAw zIw{l)SmLwqZPF_csThXJM1=M>MD+MpNrnHpbrd5;_!S%R?8HNAON;lLG59wz{JW$n zFK*f8miY2!XtRp-J7@$Tq?JJF#qo%@u00cPBLb^qIG=*WO1gigwLNy$8aVk8ZV1%5 zY7ukB9p;i3KQOtvf@}mFY~Dbu9d3da_&pkiXz_r|=NYlxtt{kM{h6X*j!z*G@-sGC z?7(_)h~TTV(5D9%8u`$dZ{dnLK6^xo`|FLOBoFm8@=)hk&~Rz(y+%d80gB5wyiAR^0c0U-^GL7`diAN7URlu(*e*p|LcXWH;W9`P4pWAg$A8Ge! z>p?$kvq;#d1h891T7Ee+U-;{ei%QjHHqmd=L$Z7nVV>Qmi(&eh4kcdqaF&sRDv*K< z9`EO%5!W_!_;3ho0NXJ!XUlpnl<#NxmWsIAD^#E)pU)F$>>(;yJDf+4$`}`jGNRX$ zKQgq`3cPtdeCzM;NhRuB*B3CdZf*4WG+g6{?jMb4>E39tm5tu+B&%IWc=n^fou5O0 zR6_}H3>+_6|7~kyHuQVjr6&b=II7wDl!Qt2v%Iw{;i{iDdoXYxFBNNo&iOG<3Bl`H ze7Qfl2L|Q|=D$nk?`L^Bj=F&#-8(z|#Af!m( zPXkqEAIoRNY8ZoCukD?fbTj)CvE|*3BKx%h*yi{J&A*lQqg;Q37Xow4;F}z7Ak5~SZ&4nK z&IWM{G0{iQZ-D2AH8&oPmJ;9KsQQjmgM20J0Te1q6=50ORr00&4voKlD$tepx|P}c zY9046)EO?KT0fv?1s@v2qBHq0o$ zp*CZ`#`x-5Jn4#A`b}S7GYWv)35%_N-gUMwZ13sEZ7z{^dwF_}o=*(eKId5O@zvBzLwVc_|?%r%3TzDtlK3re^pxv6~ zfjb|@In!?RvGdtw9(%aHUhUqVzoWHTj}|JLc6qs*Z-45#F;qyGcG_#Q7a&uzv^5W7 zJQ6pji01IRJF*#E@BLBsB7St$e)RohodenU)Z4=y=gzoM==`IPvtd^-3KlKnCwXps zv$Lh;dLA2=@2_4wJ9)X4&U~V>70FrR-NEKTr^FgOPipOsFQLZ}x+>SpvA^wqzQ5CW z=+egan(STIU>t^7G8Z}sSzfG|UyLaqu5_oYzkL10{WU|dsJv7X-m$cBC}boRj~HVv*(HIe35#am!QDf_9d3!5P_r3kMI?zqd@ z$1@)|r|+uBHHT0#bw|4Bxwvzyb2Ty!39;ksXt1cH zJhs#2l9m@GyV{k?sB%L5O59CG^+Rff&u-WMmdj~nbMt@YY7ktm<=ZeE@&_vJvK3rb zjDPS-(>Mi{x>bFkY4owCT{b?a}kXdxL~kjOOF)HQkUJSQZmwq2qyY8p32F z*Dt8Y<0XWRio=HP?f;6^`mQ?um-!?mX@kYOj*&*g-O{^SbA`g>>Zn4;jkEB--*`>5 zjQJM__Q%&}&LNyQL{6jVeh>Y{ zA-WNTiI*s0=gk{B_P6mD3ZR~*`M-YE`OBSTB|ai~PK{dR32-6oB+*DFijSC&Odjn+ zo=db&8~TO#Ybn@?=)fln4($l9|n1^b@PL-<&3!HI;XS_VgcY&1h@f*NV_@Ex*|yG(`Iae%@y15?KlijiNsk+ zGz58;0%hn3E}_HS)apvfxl;uRWl}SQd?M`M@@(hdOrI=3nr#m@Gxec7$vm0)+;u#( zANwd!yjp~0>?^nC_}Bu6R5A_1r4Wzs-`v8B*2P5{e`a3^NZFhT;;^ zdhFqrD&#{wZHnS}`rDt>+4W$`3*|KBkp=o|bcN$Y?ydQ$%*2_TiL~>k?V(+?`f?q^W>p0D{_rrVO6`xJ&(%qw@Y_M?FGYv|AX0t_(kBnwp#)Ai~e$&Q%Q>} zGO?){DflGZ4J12t;s5INbtPW-d7gaInFjnsP(3sKa+Qqb@U3@ybb4ZHd-0JM>y)O1 zHX%?D{q6bbNGv!d*beXJax=+3|E%Qx7+s~y9K&#M(QfMOHNXwJ?w}uY0QD`d47yLX z&T@W2NbJ94o!{_7J658OR-3BYtB?17{hpxkQ;KKmE-%F%5Pv7%obbsxER0Q$e@j0w zG~{wk#9-*B-mmx|Npa~-W;8XJO#dMy*|m8aYjMjt%H%`;ZZM_w;I3-zN;=i`hdOiy z3X;HON5d0#=(iByhF~jMYCs{^yO5k9uaYoAtgHqh06J|{W;srb(xuQKB{FB6lVuN< za95#^{)w-*E1Vi0hT8a3ILr`y4I%-TOI=EQl;pnHCNr+ua{OP!61dYJQGJ9`wPWSY zPn6(+H#uw;N3%z4yLrU%Y43=2)L-8pY@0V6I=9N%1&#IW-HwDR3Fiqv{T{L=vn&8Z zhMOvn^e*HwKlxkK+4Yc84|+mpW%(k$pUpBN+JC4~1Jm?zaPpg@p*$gU{lUOeKk8cq zyv(eDC&Y4PUnunSN28CGcNVT24oQ*`Ubt7pc(48>J$bES*7jSBK}=g z>{TbQ?{1*p&ecEpqFWPWbQOXh!zyDHBwJkhtnezig~O2_ialB$e)Yc#UB z8rVvB6SRWtE7SLe|2J~u;oYm7W6da9j}WEv$bkET6PDldNoNn6UPB$r&Lpa}LX4E# zyU%JV8D8!ilH{;J-%3qOG<-#1yNe|G{xE6WGMa-_Cm@JSlhSZ0XdpVVM~ zx4h$QY_SMzSviQ8qJ+SyzKsZLl{362WL;gH#LY#}Q}nx`im^VtbtI)xk}vbH(v|36 zGqyh0QK#36d(k+0{)=S5z7OUku%mnKO`u~0xXA0qYMzAbI)$1sDNbhls= zT$9&CgD=^zXu^)j5mU*Tv*7ti6W`meMNdJ@ z5tAj-13LS3nO#=URpmea3RcfGeb}Af8*o%HpzVruvz>5D!PYvcj8W;6zkoYp$h>*! zqO!odoWEasw*pWjxALUAi7l&Kfq;bJN!(ChD4R@K^{%roYCBnPfoP`@5Jmw(_q!V0 z%&Z|=p%j^#U*=d9@)ryx9x!;z-1l?cweKYfJa~Qa03OV{nG$#`VgjPkq&%VFxFsNM ze)c&#{ve>OciS-Z7@vrhrg-;~FmeCtP;ONL@5X;p z12(|1!X#JTvehxZ?5MqV8cS><`{RF@3<&S zDGsvAgOxar%UEvD5(Mvgd8wq#%MJ zJ%5dI6o2og7MU&o5_Rpg{f`r5?`NGf?ZXWrAOHX^#J}gPZ;2=WnzO2$SQ|0HK8;te zh(=u<6!Jx#Ou#fd&eABJUrUA|iss3eDz`dhM40q(udipWdwV`?pWM`+*?GG~*ROxS z{e86es?GoW{CoO`&+E<0<-_fBzs`*X=hJWW+vnd8N5A(UF3sCLyL7IX$?msFw!&NY zuTDgm!td_(9+0DNo=DbwW@vS^dAfXxxQA=B;^z;G!AJA*=W9~S6~8f);C;H@Bj&-| z<8Yyj?niK%8pzL(agdp4|ncGD^Fq)QMbs|W|45H%wH{x6tZSN4zd`X z-(XXy$~D7i+V_7w5L?IRsb~K&OoqjpAb2cN@{Rbb2ye1WHhn?Y7Bd-^5Vx zU#Uln*bVLL%mo112cy2J*DhY&t~?Ee-wsuWk>(B*qhEVDm4?oI(KyOgZr9I|?>-saMJn0``Tjw?w1;N)Kgey^Ozg~*Y*@oq!yyW#z_c-_ML0~V zl-M8BFp*p5(hVcCz9jpKTCAHL#-MU|1`3EZRWz8d{u-euLpWd5BTW7_bhv1&W;>5o zD4bh!#kVSA0`hHge-MJR*7y1x+gkj<04+nIpN&jGT}e2nj4}b@#;tcza||8x;}R=b zMcS|1*oI%Ha$4pzEI25%XJB`b3q>#mDPEm;U-MD|&|zJ>ovtv|O|~X+Z)DAxneV;! zS6b{B=UO}<*xvS>dvtpfF#a4QSOM3GcynLpHbr{VBSrXWxs1e` zwVtFCS!^rA;Uh(y%cKvFxlOG@j)wU$g0`#po$IV8o&3GsOw| zvrp6+*N>P2_t=bdCdlL@rhvvv9;rWsJ+9#D+0v|bI1Q_9r4_Zw1nK3$`>ZdlpNGOX z8b35Nkr+fZW+w!Y<}VE<8qHuwx#MF_f`MW`^4nl1?1cy`Aw>#ZNSMao54o^y8=emC@6c?Gy z`cx~yuqIl%LdW(9H{V_En5Qb3k-^If)e^JtMF@@N{0Z)(RyNc=Y|CZ_8X{UBtK;UV z)9&hV(Dne#gNbJo?kzBW@Z#&Y`UD}$_{&7;Rr|w+=Rzj;>WWlgrAUA)8 zJj*QPNzD=(*|}yNXl`9l+mDQxX$+a=i#+%r#}@eNi*R3H!j&?(zz%}gf>1avVZ}s= z{qfed50-fv?xK@(kE)&3$G>z+H0;NU{;>cnFrvd&OO zAVTS6cwR-&EJvyWX-gDk(*S_N1s+K5#Ww>d)tom(XonRYYwfz#`bvuSnd?7rhs&n5 z$?)sd1M=Z-G>@3-Ii)&>wF`X~1i-F|hURdv`?coXt5${1p%J%_1ISZkakHu2#9rI)!3OYnYHU z)Q*_$>vU#Dcy?e2?fuj!9X(>(TO{o($ji+-%lbGZw?Oq>>i0+x!>^w*eHkjc1^-t`7rriFCUHFFej|ANRp|I8fD*Qol z{`BD=6#q^nWI^{)r9``u|LA{gb5j(OJ&t ztyTh<>Bir$fE;zN;{U6b-bwy9N%c>X^na85CuQ|d{QInczwke-J&gSS@c)^8`X@dS z@c+t1{SzLr@7D8f0bVSz{_>m#$cO&_pXdB@2jfp@46?tW|GS^@C%z4kUo3iP9^~JmR{_xeA^JbZ s>VM)#F#-Vp8M*%n{qNB8Z)mC?=>LNL0RA4I;NE`c!2p03j`vUh2gNf6y#N3J diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt new file mode 100644 index 00000000000..30325a16880 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/agency.txt @@ -0,0 +1,2 @@ +agency_id,agency_name,agency_url,agency_timezone,agency_lang,agency_phone,agency_branding_url,agency_fare_url,agency_email +1,Cobblinc,https://www.cobbcounty.org/transportation/cobblinc,America/New_York,en,,,, diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt new file mode 100644 index 00000000000..541e13197c2 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/booking_rules.txt @@ -0,0 +1,2 @@ +booking_rule_id,booking_type,prior_notice_duration_min,prior_notice_duration_max,prior_notice_start_day,prior_notice_start_time,prior_notice_last_day,prior_notice_last_time,prior_notice_service_id,message,pickup_message,drop_off_message,phone_number,info_url,booking_url +1,1,120,1440,,,,,,Call reservationist to schedule.,,,(770) 528-1053,, diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt new file mode 100644 index 00000000000..d055defc895 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/calendar.txt @@ -0,0 +1,2 @@ +service_id,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date +1,1,1,1,1,1,0,0,20211019,20220119 diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt new file mode 100644 index 00000000000..3ebb041bcb3 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_attributes.txt @@ -0,0 +1,2 @@ +fare_id,price,currency_type,payment_method,transfers,agency_id,transfer_duration +flex-adult,2.50,USD,0,0,1, diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt new file mode 100644 index 00000000000..62e8c4f518f --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/fare_rules.txt @@ -0,0 +1,10 @@ +fare_id,route_id,origin_id,destination_id,contains_id +flex-adult,,Z4,Z3, +flex-adult,,Z3,Z4, +flex-adult,,Z3,Z3, +flex-adult,,Z4,Z2, +flex-adult,,Z2,Z4, +flex-adult,,Z2,Z2, +flex-adult,,Z4,Z1, +flex-adult,,Z1,Z4, +flex-adult,,Z1,Z1, diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt new file mode 100644 index 00000000000..0ec181c3a8e --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/feed_info.txt @@ -0,0 +1,2 @@ +feed_publisher_name,feed_id,feed_publisher_url,feed_lang,feed_start_date,feed_end_date,feed_version,default_lang,feed_contact_email,feed_contact_url +Cobblinc,,https://www.cobbcounty.org/transportation/cobblinc,en,20211018,20211111,,,, diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt new file mode 100644 index 00000000000..45845294fa8 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/location_groups.txt @@ -0,0 +1 @@ +location_group_id,location_id,location_group_name diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson new file mode 100644 index 00000000000..3f2f8665c30 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/locations.geojson @@ -0,0 +1,597 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "id": "zone_1", + "type": "Feature", + "properties": { + "stop_name": "Flex Zone 1", + "stop_desc": "PUBLIX to Route 30 Transfer Points", + "zone_id": "Z1" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -84.70458984375, + 33.867796513389074 + ], + [ + -84.69547033309937, + 33.8646963242773 + ], + [ + -84.68733787536621, + 33.86157820443925 + ], + [ + -84.68567490577698, + 33.85978746128715 + ], + [ + -84.68505263328552, + 33.85972509642107 + ], + [ + -84.6845269203186, + 33.859600366552314 + ], + [ + -84.68194127082825, + 33.859502364384745 + ], + [ + -84.67999935150146, + 33.85926181313301 + ], + [ + -84.67733860015869, + 33.858762889858156 + ], + [ + -84.67227458953857, + 33.85890543966268 + ], + [ + -84.67103004455566, + 33.858941077076636 + ], + [ + -84.66673851013184, + 33.860722928812585 + ], + [ + -84.66090202331543, + 33.85990328163186 + ], + [ + -84.65712547302246, + 33.85972509642107 + ], + [ + -84.65373516082764, + 33.859760733492976 + ], + [ + -84.65064525604248, + 33.85883416479016 + ], + [ + -84.64862823486327, + 33.8583708766687 + ], + [ + -84.64648246765137, + 33.858620339815644 + ], + [ + -84.64356422424316, + 33.86058038204195 + ], + [ + -84.63223457336426, + 33.86695911708288 + ], + [ + -84.61893081665039, + 33.849175869452154 + ], + [ + -84.61481094360352, + 33.85145689379216 + ], + [ + -84.61360931396484, + 33.85045895313795 + ], + [ + -84.61172103881836, + 33.85145689379216 + ], + [ + -84.61219310760498, + 33.85236572245879 + ], + [ + -84.60996150970459, + 33.85245482278801 + ], + [ + -84.61004734039307, + 33.85311416233549 + ], + [ + -84.60442543029785, + 33.8533101812195 + ], + [ + -84.60004806518555, + 33.85886980223386 + ], + [ + -84.60760116577148, + 33.85986764461944 + ], + [ + -84.60691452026367, + 33.85423680985424 + ], + [ + -84.61309432983397, + 33.85423680985424 + ], + [ + -84.6152400970459, + 33.85566237273956 + ], + [ + -84.62450981140137, + 33.86556937742616 + ], + [ + -84.62665557861328, + 33.86628206725556 + ], + [ + -84.63197708129883, + 33.86806376580027 + ], + [ + -84.63343620300293, + 33.869132767078476 + ], + [ + -84.63480949401854, + 33.87112820031405 + ], + [ + -84.64622497558594, + 33.876187839766146 + ], + [ + -84.65120315551758, + 33.8767579211837 + ], + [ + -84.69695091247557, + 33.876187839766146 + ], + [ + -84.69695091247557, + 33.867493626311635 + ], + [ + -84.6994400024414, + 33.868491367917954 + ], + [ + -84.70407485961914, + 33.869702895619845 + ], + [ + -84.70458984375, + 33.867796513389074 + ] + ] + ] + } + }, + { + "id": "zone_2", + "type": "Feature", + "properties": { + "stop_name": "Flex Zone 2", + "stop_desc": "Horseshoe Bend Plaza to Route 30 Transfer Point", + "zone_id": "Z2" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -84.63489532470703, + 33.87198337170695 + ], + [ + -84.6346378326416, + 33.871146016472125 + ], + [ + -84.63341474533081, + 33.869204033354386 + ], + [ + -84.63199853897095, + 33.86817957491865 + ], + [ + -84.63159084320068, + 33.86797468175618 + ], + [ + -84.62459564208984, + 33.86599699203773 + ], + [ + -84.61957454681396, + 33.86063383710883 + ], + [ + -84.61506843566893, + 33.855680192125064 + ], + [ + -84.61308360099792, + 33.8542991787282 + ], + [ + -84.60694670677185, + 33.854263539377236 + ], + [ + -84.60761189460754, + 33.859885463127526 + ], + [ + -84.60001587867737, + 33.85888762095013 + ], + [ + -84.59524154663086, + 33.864143979919355 + ], + [ + -84.60494041442871, + 33.87419252481561 + ], + [ + -84.6045970916748, + 33.88024958676915 + ], + [ + -84.60253715515137, + 33.88195973819444 + ], + [ + -84.59258079528809, + 33.88509492678373 + ], + [ + -84.58974838256835, + 33.888871250976955 + ], + [ + -84.58356857299805, + 33.895283493992615 + ], + [ + -84.5854139328003, + 33.89563971558044 + ], + [ + -84.59129333496094, + 33.89649464132018 + ], + [ + -84.593825340271, + 33.902265165877225 + ], + [ + -84.59554195404053, + 33.907696938616645 + ], + [ + -84.59605693817139, + 33.908462701690695 + ], + [ + -84.59650754928589, + 33.909549004947415 + ], + [ + -84.59644317626953, + 33.91116952997516 + ], + [ + -84.59884643554688, + 33.90988735887179 + ], + [ + -84.60433959960938, + 33.905755787445045 + ], + [ + -84.60850238800047, + 33.9048297181011 + ], + [ + -84.61399555206299, + 33.90368992663683 + ], + [ + -84.62034702301024, + 33.902585739124085 + ], + [ + -84.62815761566162, + 33.899771777255694 + ], + [ + -84.62824344635008, + 33.89841819289737 + ], + [ + -84.62893009185791, + 33.897420801199644 + ], + [ + -84.63056087493896, + 33.89613842330356 + ], + [ + -84.63219165802, + 33.893644855523824 + ], + [ + -84.63532447814941, + 33.89182806737398 + ], + [ + -84.63708400726318, + 33.89068810210888 + ], + [ + -84.63759899139404, + 33.88940562297412 + ], + [ + -84.63734149932861, + 33.88548681725667 + ], + [ + -84.6369981765747, + 33.881817226884806 + ], + [ + -84.63489532470703, + 33.87198337170695 + ] + ] + ] + } + }, + { + "id": "zone_3", + "type": "Feature", + "properties": { + "stop_name": "Flex Zone 3", + "stop_desc": "Downtown Austell to Route 30 Transfer Point", + "zone_id": "Z3" + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ + [ + -84.60438251495361, + 33.85341710042116 + ], + [ + -84.60449516773222, + 33.8533101812195 + ], + [ + -84.61005806922913, + 33.85311416233549 + ], + [ + -84.60994005203247, + 33.85244591275925 + ], + [ + -84.61217164993286, + 33.85235681242077 + ], + [ + -84.6117103099823, + 33.85143907352557 + ], + [ + -84.61360931396484, + 33.85045895313795 + ], + [ + -84.61481094360352, + 33.851447983659334 + ], + [ + -84.61609840393066, + 33.85074408022878 + ], + [ + -84.62133407592772, + 33.84575421874202 + ], + [ + -84.62442398071289, + 33.84603936153525 + ], + [ + -84.62167739868163, + 33.83919567185717 + ], + [ + -84.62356567382812, + 33.83919567185717 + ], + [ + -84.62871551513672, + 33.838910506226014 + ], + [ + -84.63489532470703, + 33.8397660002649 + ], + [ + -84.63815689086914, + 33.838910506226014 + ], + [ + -84.6470832824707, + 33.84033632486645 + ], + [ + -84.65841293334961, + 33.83933825431594 + ], + [ + -84.65309143066406, + 33.83363477042082 + ], + [ + -84.64828491210936, + 33.831923651036924 + ], + [ + -84.64279174804688, + 33.82636227649246 + ], + [ + -84.6554946899414, + 33.817769954707906 + ], + [ + -84.65510845184326, + 33.81054959781494 + ], + [ + -84.65390682220458, + 33.809515521507386 + ], + [ + -84.65309143066406, + 33.80632406926795 + ], + [ + -84.62339401245117, + 33.8085349203599 + ], + [ + -84.62094783782959, + 33.81388351734996 + ], + [ + -84.61901664733885, + 33.81388351734996 + ], + [ + -84.61785793304443, + 33.81673596567925 + ], + [ + -84.62090492248535, + 33.81577327500237 + ], + [ + -84.62236404418945, + 33.826825738188624 + ], + [ + -84.62116241455078, + 33.82839435913459 + ], + [ + -84.6163558959961, + 33.82850130951472 + ], + [ + -84.61622714996338, + 33.82946385691532 + ], + [ + -84.61747169494629, + 33.83003425026114 + ], + [ + -84.61785793304443, + 33.83302875288965 + ], + [ + -84.61395263671875, + 33.83641526636492 + ], + [ + -84.61326599121094, + 33.84144131795057 + ], + [ + -84.61678504943848, + 33.84144131795057 + ], + [ + -84.61657047271729, + 33.84646707394075 + ], + [ + -84.61489677429199, + 33.847785840378656 + ], + [ + -84.61416721343994, + 33.84757198774456 + ], + [ + -84.6126651763916, + 33.84896202029756 + ], + [ + -84.61142063140869, + 33.84896202029756 + ], + [ + -84.61103439331055, + 33.847001711436604 + ], + [ + -84.61004734039307, + 33.846787856839725 + ], + [ + -84.60944652557373, + 33.84881945389713 + ], + [ + -84.60803031921387, + 33.848926378719746 + ], + [ + -84.60438251495361, + 33.85341710042116 + ] + ] + ] + } + } + ] +} \ No newline at end of file diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt new file mode 100644 index 00000000000..4e488ca9422 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/routes.txt @@ -0,0 +1,4 @@ +route_id,agency_id,route_short_name,route_long_name,route_desc,route_type,route_url,route_branding_url,route_color,route_text_color,route_sort_order,continuous_pickup,continuous_drop_off +090z,1,Zone 1,PUBLIX Super Market,,3,,,7eafd7,FFFFFF,,2,2 +aamr,1,Zone 2,Horseshoe Bend Pizza,,3,,,a9ca95,FFFFFF,,2,2 +po0p,1,Zone 3,Downtown Austell,,3,,,e18160,FFFFFF,,2,2 diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt new file mode 100644 index 00000000000..d2edbc6290a --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/shapes.txt @@ -0,0 +1,351 @@ +shape_id,shape_pt_sequence,shape_pt_lat,shape_pt_lon,shape_dist_traveled +1603,0,33.864160,-84.674340,0 +1603,1,33.864310,-84.674750,41.3676553616532772 +1603,2,33.864450,-84.675240,89.2135886238208826 +1603,3,33.864470,-84.675420,105.981431995762449 +1603,4,33.864460,-84.675670,129.091131151471473 +1603,5,33.862850,-84.675710,308.153303093688692 +1603,6,33.861310,-84.670790,793.64064397774564 +1603,7,33.861230,-84.670500,821.856781782056942 +1603,8,33.861050,-84.669670,901.065599474204191 +1603,9,33.860970,-84.669210,944.46144211700198 +1603,10,33.860430,-84.665250,1315.00860103015407 +1603,11,33.860450,-84.665020,1336.36202220561586 +1603,12,33.859770,-84.660040,1802.37267252520996 +1603,13,33.859680,-84.659240,1876.91696686866931 +1603,14,33.859650,-84.658580,1937.95056407665402 +1603,15,33.859750,-84.654950,2273.31783540791594 +1603,16,33.859720,-84.654320,2331.5856147646009 +1603,17,33.859690,-84.654020,2359.48681178299285 +1603,18,33.859610,-84.653630,2396.58065355784629 +1603,19,33.859440,-84.652960,2461.26999921240213 +1603,20,33.858670,-84.650340,2717.89864844431168 +1603,21,33.858500,-84.649620,2787.01720676967261 +1603,22,33.858440,-84.649220,2824.55021752373341 +1603,23,33.858420,-84.648570,2884.61126988275237 +1603,24,33.858470,-84.648020,2935.70071922413217 +1603,25,33.858510,-84.647780,2958.30382108636786 +1603,26,33.858640,-84.647270,3007.56490521255773 +1603,27,33.858820,-84.646790,3056.19681660850665 +1603,28,33.859040,-84.646360,3102.83305365301112 +1603,29,33.867630,-84.631050,4808.89751699588669 +1603,30,33.867510,-84.630680,4845.57250132258559 +1603,31,33.867050,-84.629100,5000.15927979081607 +1603,32,33.866740,-84.628070,5101.31276957639147 +1603,33,33.866350,-84.626740,5231.54339896257443 +1603,34,33.865890,-84.625110,5390.49585608849611 +1603,35,33.865740,-84.624700,5431.86287035937767 +1603,36,33.865580,-84.624380,5466.35167998693578 +1603,37,33.865410,-84.624090,5499.12784904032833 +1603,38,33.865220,-84.623820,5531.80542258516834 +1603,39,33.864990,-84.623550,5567.52023576729516 +1603,40,33.864170,-84.622780,5683.14174282334079 +1603,41,33.855180,-84.614540,6939.40195187243262 +1603,42,33.854810,-84.614140,6994.69214287862087 +1603,43,33.854740,-84.614050,7006.07874325375178 +1603,44,33.854590,-84.613820,7033.08395833279792 +1603,45,33.854400,-84.613450,7073.2550700937345 +1603,46,33.854240,-84.613020,7116.76600806439819 +1603,47,33.854170,-84.612800,7138.52150453755439 +1603,48,33.854090,-84.612430,7173.82741232934131 +1603,49,33.854050,-84.612140,7200.97372852915487 +1603,50,33.854030,-84.611080,7298.88257001024522 +1603,51,33.853990,-84.608370,7549.1717147238478 +1603,52,33.853980,-84.606030,7765.25733788839898 +1603,53,33.854000,-84.602300,8109.70411364922438 +1603,54,33.854070,-84.601760,8160.17317170635761 +1603,55,33.854170,-84.601290,8204.97612933502569 +1603,56,33.854690,-84.599810,8353.37152312560647 +1603,57,33.854800,-84.599870,8366.79933403518226 +1603,58,33.854620,-84.600380,8417.97063950866686 +5mw2,0,33.883310,-84.620270,0 +5mw2,1,33.883100,-84.620380,25.4632412848342753 +5mw2,2,33.882770,-84.619380,124.800729087131458 +5mw2,3,33.881920,-84.619930,232.090136550085901 +5mw2,4,33.878200,-84.622150,693.720674651098534 +5mw2,5,33.875140,-84.623950,1072.38724479474945 +5mw2,6,33.874410,-84.624310,1160.1001415742428 +5mw2,7,33.873860,-84.624640,1228.42578060626147 +5mw2,8,33.873140,-84.625040,1316.59273529802135 +5mw2,9,33.873010,-84.625140,1333.74475359342864 +5mw2,10,33.872650,-84.625320,1377.08734117159929 +5mw2,11,33.871900,-84.625800,1471.52663025872175 +5mw2,12,33.871020,-84.626500,1588.79379329057519 +5mw2,13,33.870240,-84.627250,1699.77654563159331 +5mw2,14,33.869520,-84.628020,1806.84472985877164 +5mw2,15,33.868520,-84.629500,1983.01464183445728 +5mw2,16,33.867990,-84.630390,2084.13494192404596 +5mw2,17,33.867630,-84.631050,2157.04367103032746 +5mw2,18,33.867510,-84.630680,2193.71865535702636 +5mw2,19,33.867050,-84.629100,2348.30543382525684 +5mw2,20,33.866740,-84.628070,2449.4589236108327 +5mw2,21,33.866350,-84.626740,2579.68955299701611 +5mw2,22,33.865890,-84.625110,2738.64201012293779 +5mw2,23,33.865740,-84.624700,2780.00902439381935 +5mw2,24,33.865580,-84.624380,2814.497834021377 +5mw2,25,33.865410,-84.624090,2847.2740030747691 +5mw2,26,33.865220,-84.623820,2879.95157661960911 +5mw2,27,33.864990,-84.623550,2915.66638980173593 +5mw2,28,33.864170,-84.622780,3031.28789685778111 +5mw2,29,33.855180,-84.614540,4287.54810590687339 +5mw2,30,33.854810,-84.614140,4342.83829691306164 +5mw2,31,33.854740,-84.614050,4354.22489728819255 +5mw2,32,33.854590,-84.613820,4381.23011236723869 +5mw2,33,33.854400,-84.613450,4421.40122412817527 +5mw2,34,33.854240,-84.613020,4464.91216209883896 +5mw2,35,33.854170,-84.612800,4486.66765857199516 +5mw2,36,33.854090,-84.612430,4521.97356636378208 +5mw2,37,33.854050,-84.612140,4549.11988256359564 +5mw2,38,33.854030,-84.611080,4647.02872404468599 +5mw2,39,33.853990,-84.608370,4897.31786875828857 +5mw2,40,33.853980,-84.606030,5113.40349192283975 +5mw2,41,33.854000,-84.602300,5457.85026768366515 +5mw2,42,33.854070,-84.601760,5508.31932574079838 +5mw2,43,33.854170,-84.601290,5553.12228336946646 +5mw2,44,33.854690,-84.599810,5701.51767716004724 +5mw2,45,33.854800,-84.599870,5714.94548806962302 +5mw2,46,33.854620,-84.600380,5766.11679354310763 +cizy,0,33.854620,-84.600380,0 +cizy,1,33.854800,-84.599870,51.1713054734841535 +cizy,2,33.854690,-84.599810,64.5991163830600641 +cizy,3,33.854170,-84.601290,212.99451017364089 +cizy,4,33.854070,-84.601760,257.797467802309143 +cizy,5,33.854000,-84.602300,308.266525859442254 +cizy,6,33.853980,-84.606030,652.713301620267202 +cizy,7,33.853990,-84.608370,868.798924784818155 +cizy,8,33.854030,-84.611080,1119.08806949842074 +cizy,9,33.854050,-84.612140,1216.99691097951154 +cizy,10,33.854090,-84.612430,1244.14322717932464 +cizy,11,33.854170,-84.612800,1279.44913497111179 +cizy,12,33.854240,-84.613020,1301.20463144426776 +cizy,13,33.854400,-84.613450,1344.715569414931 +cizy,14,33.854590,-84.613820,1384.88668117586758 +cizy,15,33.854740,-84.614050,1411.89189625491349 +cizy,16,33.854810,-84.614140,1423.27849663004486 +cizy,17,33.855180,-84.614540,1478.56868763623311 +cizy,18,33.864170,-84.622780,2734.82889668532516 +cizy,19,33.864990,-84.623550,2850.45040374137034 +cizy,20,33.865220,-84.623820,2886.16521692349716 +cizy,21,33.865410,-84.624090,2918.84279046833717 +cizy,22,33.865580,-84.624380,2951.61895952172927 +cizy,23,33.865740,-84.624700,2986.10776914928692 +cizy,24,33.865890,-84.625110,3027.47478342016848 +cizy,25,33.866350,-84.626740,3186.42724054609016 +cizy,26,33.866740,-84.628070,3316.65786993227357 +cizy,27,33.867050,-84.629100,3417.81135971784943 +cizy,28,33.867510,-84.630680,3572.3981381860799 +cizy,29,33.867630,-84.631050,3609.07312251277881 +cizy,30,33.859040,-84.646360,5315.13758585565392 +cizy,31,33.858820,-84.646790,5361.77382290015794 +cizy,32,33.858640,-84.647270,5410.40573429610686 +cizy,33,33.858510,-84.647780,5459.66681842229718 +cizy,34,33.858470,-84.648020,5482.26992028453242 +cizy,35,33.858420,-84.648570,5533.35936962591222 +cizy,36,33.858440,-84.649220,5593.42042198493164 +cizy,37,33.858500,-84.649620,5630.95343273899198 +cizy,38,33.858670,-84.650340,5700.07199106435291 +cizy,39,33.859440,-84.652960,5956.70064029626246 +cizy,40,33.859610,-84.653630,6021.3899859508183 +cizy,41,33.859690,-84.654020,6058.48382772567129 +cizy,42,33.859720,-84.654320,6086.38502474406323 +cizy,43,33.859750,-84.654950,6144.65280410074774 +cizy,44,33.859650,-84.658580,6480.02007543200943 +cizy,45,33.859680,-84.659240,6541.05367263999415 +cizy,46,33.859770,-84.660040,6615.59796698345326 +cizy,47,33.860450,-84.665020,7081.60861730304714 +cizy,48,33.860430,-84.665250,7102.96203847850938 +cizy,49,33.860970,-84.669210,7473.50919739166147 +cizy,50,33.861050,-84.669670,7516.90504003445949 +cizy,51,33.861230,-84.670500,7596.11385772660651 +cizy,52,33.861310,-84.670790,7624.32999553091759 +cizy,53,33.862850,-84.675710,8109.81733641497431 +cizy,54,33.864460,-84.675670,8288.8795083571913 +cizy,55,33.864470,-84.675420,8311.98920751290098 +cizy,56,33.864450,-84.675240,8328.7570508848421 +cizy,57,33.864310,-84.674750,8376.60298414700992 +cizy,58,33.864160,-84.674340,8417.97063950866323 +fj8w,0,33.812130,-84.634480,0 +fj8w,1,33.812170,-84.634360,11.9455210030212005 +fj8w,2,33.812710,-84.634610,76.279913916894813 +fj8w,3,33.812850,-84.634650,92.279849053187931 +fj8w,4,33.813260,-84.633250,229.421571582750914 +fj8w,5,33.813330,-84.632900,262.680664666869916 +fj8w,6,33.813470,-84.631130,426.94482553777982 +fj8w,7,33.813580,-84.629890,542.155555480363091 +fj8w,8,33.813700,-84.629120,614.533884663003732 +fj8w,9,33.813850,-84.628330,689.400820648105878 +fj8w,10,33.814020,-84.627630,756.777336790232653 +fj8w,11,33.815340,-84.622650,1239.70300436535308 +fj8w,12,33.816710,-84.617700,1721.71029261900571 +fj8w,13,33.816980,-84.616660,1822.37033079301045 +fj8w,14,33.816830,-84.616620,1839.45404263526211 +fj8w,15,33.816640,-84.616600,1860.66174775616264 +fj8w,16,33.816430,-84.616610,1884.0309823274722 +fj8w,17,33.816150,-84.616680,1915.83011858231112 +fj8w,18,33.816000,-84.616780,1934.89699733012708 +fj8w,19,33.815840,-84.616960,1959.24973939017377 +fj8w,20,33.815700,-84.617250,1990.23560192697937 +fj8w,21,33.815660,-84.617460,2010.13965870778543 +fj8w,22,33.815650,-84.617750,2036.95422308684397 +fj8w,23,33.815680,-84.617870,2048.53136993844828 +fj8w,24,33.815730,-84.617940,2057.05966327484066 +fj8w,25,33.815830,-84.618000,2069.48419467573149 +fj8w,26,33.815900,-84.618010,2077.32248401577999 +fj8w,27,33.816590,-84.617830,2155.82848224535564 +fj8w,28,33.817020,-84.617780,2203.86497053938547 +fj8w,29,33.817450,-84.617790,2251.68777899641691 +fj8w,30,33.818280,-84.617920,2344.75780688978466 +fj8w,31,33.818580,-84.617950,2378.23125954415173 +fj8w,32,33.818970,-84.617960,2421.60717951736524 +fj8w,33,33.819610,-84.617940,2492.79601104468929 +fj8w,34,33.820250,-84.617840,2564.55795400538045 +fj8w,35,33.820570,-84.617740,2601.32000575365601 +fj8w,36,33.821140,-84.617530,2667.60363081003698 +fj8w,37,33.822000,-84.617110,2770.80255010889414 +fj8w,38,33.822450,-84.616910,2824.14224711326233 +fj8w,39,33.824120,-84.616290,3018.46968055592561 +fj8w,40,33.824610,-84.616070,3076.62192977544873 +fj8w,41,33.825150,-84.615800,3141.64117829165889 +fj8w,42,33.829950,-84.613300,3723.19321138423675 +fj8w,43,33.830700,-84.612930,3813.3207347007874 +fj8w,44,33.832430,-84.612080,4021.09324516900551 +fj8w,45,33.833230,-84.611770,4114.5440614867648 +fj8w,46,33.833860,-84.611600,4186.33517561256576 +fj8w,47,33.834760,-84.611440,4287.49602809629869 +fj8w,48,33.837440,-84.611330,4585.67198383807136 +fj8w,49,33.838680,-84.611160,4724.4449904067551 +fj8w,50,33.839410,-84.610990,4807.12197254783678 +fj8w,51,33.843350,-84.609680,5261.6294821976544 +fj8w,52,33.843890,-84.609530,5323.25214634696658 +fj8w,53,33.844970,-84.609300,5445.20691247350896 +fj8w,54,33.846290,-84.609110,5593.02954218924333 +fj8w,55,33.846600,-84.609050,5627.9425358250528 +fj8w,56,33.847280,-84.608850,5705.77838507436354 +fj8w,57,33.847640,-84.608680,5748.77715408244603 +fj8w,58,33.848230,-84.608340,5821.50897298361815 +fj8w,59,33.848860,-84.607870,5903.91841611216842 +fj8w,60,33.851630,-84.605380,6288.29422883609277 +fj8w,61,33.852830,-84.604320,6453.78217286460767 +fj8w,62,33.853990,-84.603350,6610.81991596658008 +fj8w,63,33.854000,-84.602300,6707.78649418878922 +fj8w,64,33.854070,-84.601760,6758.25555224592244 +fj8w,65,33.854170,-84.601290,6803.05850987459053 +fj8w,66,33.854690,-84.599810,6951.45390366517131 +fj8w,67,33.854800,-84.599870,6964.88171457474709 +fj8w,68,33.854620,-84.600380,7016.0530200482317 +swh2,0,33.854620,-84.600380,0 +swh2,1,33.854800,-84.599870,51.1713054734841535 +swh2,2,33.854690,-84.599810,64.5991163830600641 +swh2,3,33.854170,-84.601290,212.99451017364089 +swh2,4,33.854070,-84.601760,257.797467802309143 +swh2,5,33.854000,-84.602300,308.266525859442254 +swh2,6,33.853990,-84.603350,405.233104081651106 +swh2,7,33.852830,-84.604320,562.270847183623459 +swh2,8,33.851630,-84.605380,727.758791212138476 +swh2,9,33.848860,-84.607870,1112.1346039360626 +swh2,10,33.848230,-84.608340,1194.54404706461241 +swh2,11,33.847640,-84.608680,1267.27586596578431 +swh2,12,33.847280,-84.608850,1310.27463497386657 +swh2,13,33.846600,-84.609050,1388.11048422317776 +swh2,14,33.846290,-84.609110,1423.02347785898746 +swh2,15,33.844970,-84.609300,1570.84610757472137 +swh2,16,33.843890,-84.609530,1692.80087370126375 +swh2,17,33.843350,-84.609680,1754.42353785057549 +swh2,18,33.839410,-84.610990,2208.93104750039311 +swh2,19,33.838680,-84.611160,2291.60802964147479 +swh2,20,33.837440,-84.611330,2430.38103621015898 +swh2,21,33.834760,-84.611440,2728.55699195193165 +swh2,22,33.833860,-84.611600,2829.71784443566457 +swh2,23,33.833230,-84.611770,2901.50895856146553 +swh2,24,33.832430,-84.612080,2994.95977487922482 +swh2,25,33.830700,-84.612930,3202.73228534744294 +swh2,26,33.829950,-84.613300,3292.85980866399359 +swh2,27,33.825150,-84.615800,3874.41184175657145 +swh2,28,33.824610,-84.616070,3939.4310902727816 +swh2,29,33.824120,-84.616290,3997.58333949230473 +swh2,30,33.822450,-84.616910,4191.91077293496801 +swh2,31,33.822000,-84.617110,4245.25046993933665 +swh2,32,33.821140,-84.617530,4348.44938923819336 +swh2,33,33.820570,-84.617740,4414.73301429457388 +swh2,34,33.820250,-84.617840,4451.49506604284943 +swh2,35,33.819610,-84.617940,4523.25700900354059 +swh2,36,33.818970,-84.617960,4594.4458405308651 +swh2,37,33.818580,-84.617950,4637.82176050407907 +swh2,38,33.818280,-84.617920,4671.29521315844613 +swh2,39,33.817450,-84.617790,4764.36524105181434 +swh2,40,33.817020,-84.617780,4812.18804950884532 +swh2,41,33.816590,-84.617830,4860.22453780287469 +swh2,42,33.815900,-84.618010,4938.73053603244989 +swh2,43,33.815830,-84.618000,4946.5688253724984 +swh2,44,33.815730,-84.617940,4958.99335677338877 +swh2,45,33.815680,-84.617870,4967.52165010978115 +swh2,46,33.815650,-84.617750,4979.09879696138523 +swh2,47,33.815660,-84.617460,5005.91336134044377 +swh2,48,33.815700,-84.617250,5025.81741812124983 +swh2,49,33.815840,-84.616960,5056.80328065805497 +swh2,50,33.816000,-84.616780,5081.15602271810167 +swh2,51,33.816150,-84.616680,5100.22290146591786 +swh2,52,33.816430,-84.616610,5132.022037720757 +swh2,53,33.816640,-84.616600,5155.39127229206679 +swh2,54,33.816830,-84.616620,5176.59897741296754 +swh2,55,33.816980,-84.616660,5193.68268925521897 +swh2,56,33.816710,-84.617700,5294.34272742922349 +swh2,57,33.815340,-84.622650,5776.35001568287589 +swh2,58,33.814020,-84.627630,6259.27568325799621 +swh2,59,33.813850,-84.628330,6326.65219940012321 +swh2,60,33.813700,-84.629120,6401.51913538522513 +swh2,61,33.813580,-84.629890,6473.89746456786543 +swh2,62,33.813470,-84.631130,6589.10819451044881 +swh2,63,33.813330,-84.632900,6753.37235538135883 +swh2,64,33.813260,-84.633250,6786.63144846547766 +swh2,65,33.812850,-84.634650,6923.77317099504035 +swh2,66,33.812710,-84.634610,6939.77310613133341 +swh2,67,33.812170,-84.634360,7004.10749904520708 +swh2,68,33.812130,-84.634480,7016.05302004822806 +wm2h,0,33.854620,-84.600380,0 +wm2h,1,33.854800,-84.599870,51.1713054734841535 +wm2h,2,33.854690,-84.599810,64.5991163830600641 +wm2h,3,33.854170,-84.601290,212.99451017364089 +wm2h,4,33.854070,-84.601760,257.797467802309143 +wm2h,5,33.854000,-84.602300,308.266525859442254 +wm2h,6,33.853980,-84.606030,652.713301620267202 +wm2h,7,33.853990,-84.608370,868.798924784818155 +wm2h,8,33.854030,-84.611080,1119.08806949842074 +wm2h,9,33.854050,-84.612140,1216.99691097951154 +wm2h,10,33.854090,-84.612430,1244.14322717932464 +wm2h,11,33.854170,-84.612800,1279.44913497111179 +wm2h,12,33.854240,-84.613020,1301.20463144426776 +wm2h,13,33.854400,-84.613450,1344.715569414931 +wm2h,14,33.854590,-84.613820,1384.88668117586758 +wm2h,15,33.854740,-84.614050,1411.89189625491349 +wm2h,16,33.854810,-84.614140,1423.27849663004486 +wm2h,17,33.855180,-84.614540,1478.56868763623311 +wm2h,18,33.864170,-84.622780,2734.82889668532516 +wm2h,19,33.864990,-84.623550,2850.45040374137034 +wm2h,20,33.865220,-84.623820,2886.16521692349716 +wm2h,21,33.865410,-84.624090,2918.84279046833717 +wm2h,22,33.865580,-84.624380,2951.61895952172927 +wm2h,23,33.865740,-84.624700,2986.10776914928692 +wm2h,24,33.865890,-84.625110,3027.47478342016848 +wm2h,25,33.866350,-84.626740,3186.42724054609016 +wm2h,26,33.866740,-84.628070,3316.65786993227357 +wm2h,27,33.867050,-84.629100,3417.81135971784943 +wm2h,28,33.867510,-84.630680,3572.3981381860799 +wm2h,29,33.867630,-84.631050,3609.07312251277881 +wm2h,30,33.867990,-84.630390,3681.98185161906031 +wm2h,31,33.868520,-84.629500,3783.10215170864876 +wm2h,32,33.869520,-84.628020,3959.27206368433463 +wm2h,33,33.870240,-84.627250,4066.34024791151296 +wm2h,34,33.871020,-84.626500,4177.32300025253153 +wm2h,35,33.871900,-84.625800,4294.5901632843852 +wm2h,36,33.872650,-84.625320,4389.02945237150743 +wm2h,37,33.873010,-84.625140,4432.37203994967786 +wm2h,38,33.873140,-84.625040,4449.52405824508514 +wm2h,39,33.873860,-84.624640,4537.69101293684525 +wm2h,40,33.874410,-84.624310,4606.0166519688637 +wm2h,41,33.875140,-84.623950,4693.72954874835705 +wm2h,42,33.878200,-84.622150,5072.39611889200751 +wm2h,43,33.881920,-84.619930,5534.02665699301997 +wm2h,44,33.882770,-84.619380,5641.31606445597481 +wm2h,45,33.883100,-84.620380,5740.6535522582717 +wm2h,46,33.883310,-84.620270,5766.11679354310581 diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt new file mode 100644 index 00000000000..bfeb52654d8 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stop_times.txt @@ -0,0 +1,289 @@ +trip_id,stop_sequence,stop_id,arrival_time,departure_time,stop_headsign,pickup_type,drop_off_type,continuous_pickup,continuous_drop_off,shape_dist_traveled,timepoint,start_pickup_drop_off_window,end_pickup_drop_off_window,mean_duration_factor,mean_duration_offset,safe_duration_factor,safe_duration_offset,pickup_booking_rule_id,dropoff_booking_rule_id +4d838cf4-d44d-4e08-a364-f22c34a8c89e,0,yz85,7:30:00,7:30:00,,,,,,,0,,,,,,,, +4d838cf4-d44d-4e08-a364-f22c34a8c89e,1,zone_1,,,,2,2,,,,0,7:30:00,8:00:00,,,,,1,1 +4d838cf4-d44d-4e08-a364-f22c34a8c89e,2,zone_1,,,,2,2,,,,0,7:30:00,8:00:00,,,,,1,1 +4d838cf4-d44d-4e08-a364-f22c34a8c89e,3,cujv,8:00:00,8:00:00,,,,,,,0,,,,,,,, +48071338-a326-4da6-aca6-b1e0de935e5e,0,yz85,8:30:00,8:30:00,,,,,,,0,,,,,,,, +48071338-a326-4da6-aca6-b1e0de935e5e,1,zone_1,,,,2,2,,,,0,8:30:00,9:00:00,,,,,1,1 +48071338-a326-4da6-aca6-b1e0de935e5e,2,zone_1,,,,2,2,,,,0,8:30:00,9:00:00,,,,,1,1 +48071338-a326-4da6-aca6-b1e0de935e5e,3,cujv,9:00:00,9:00:00,,,,,,,0,,,,,,,, +3a4c1a1e-bbfd-46cc-8b2c-f68c7b0dca7c,0,yz85,10:30:00,10:30:00,,,,,,,0,,,,,,,, +3a4c1a1e-bbfd-46cc-8b2c-f68c7b0dca7c,1,zone_1,,,,2,2,,,,0,10:30:00,11:00:00,,,,,1,1 +3a4c1a1e-bbfd-46cc-8b2c-f68c7b0dca7c,2,zone_1,,,,2,2,,,,0,10:30:00,11:00:00,,,,,1,1 +3a4c1a1e-bbfd-46cc-8b2c-f68c7b0dca7c,3,cujv,11:00:00,11:00:00,,,,,,,0,,,,,,,, +55db7288-4c30-47ba-b766-16a09b1d5020,0,yz85,9:30:00,9:30:00,,,,,,,0,,,,,,,, +55db7288-4c30-47ba-b766-16a09b1d5020,1,zone_1,,,,2,2,,,,0,9:30:00,10:00:00,,,,,1,1 +55db7288-4c30-47ba-b766-16a09b1d5020,2,zone_1,,,,2,2,,,,0,9:30:00,10:00:00,,,,,1,1 +55db7288-4c30-47ba-b766-16a09b1d5020,3,cujv,10:00:00,10:00:00,,,,,,,0,,,,,,,, +3570424a-a8ae-4a7c-8137-c6f6245ddfca,0,yz85,12:30:00,12:30:00,,,,,,,0,,,,,,,, +3570424a-a8ae-4a7c-8137-c6f6245ddfca,1,zone_1,,,,2,2,,,,0,12:30:00,13:00:00,,,,,1,1 +3570424a-a8ae-4a7c-8137-c6f6245ddfca,2,zone_1,,,,2,2,,,,0,12:30:00,13:00:00,,,,,1,1 +3570424a-a8ae-4a7c-8137-c6f6245ddfca,3,cujv,13:00:00,13:00:00,,,,,,,0,,,,,,,, +d0cc6a8d-78c6-496a-aa3e-66c0829930f1,0,yz85,13:30:00,13:30:00,,,,,,,0,,,,,,,, +d0cc6a8d-78c6-496a-aa3e-66c0829930f1,1,zone_1,,,,2,2,,,,0,13:30:00,14:00:00,,,,,1,1 +d0cc6a8d-78c6-496a-aa3e-66c0829930f1,2,zone_1,,,,2,2,,,,0,13:30:00,14:00:00,,,,,1,1 +d0cc6a8d-78c6-496a-aa3e-66c0829930f1,3,cujv,14:00:00,14:00:00,,,,,,,0,,,,,,,, +50dfb2c0-d8ba-4dc6-a104-a3cc058feae9,0,yz85,11:30:00,11:30:00,,,,,,,0,,,,,,,, +50dfb2c0-d8ba-4dc6-a104-a3cc058feae9,1,zone_1,,,,2,2,,,,0,11:30:00,12:00:00,,,,,1,1 +50dfb2c0-d8ba-4dc6-a104-a3cc058feae9,2,zone_1,,,,2,2,,,,0,11:30:00,12:00:00,,,,,1,1 +50dfb2c0-d8ba-4dc6-a104-a3cc058feae9,3,cujv,12:00:00,12:00:00,,,,,,,0,,,,,,,, +1d32fa36-c9db-4ca2-a26b-574935e99081,0,yz85,15:30:00,15:30:00,,,,,,,0,,,,,,,, +1d32fa36-c9db-4ca2-a26b-574935e99081,1,zone_1,,,,2,2,,,,0,15:30:00,16:00:00,,,,,1,1 +1d32fa36-c9db-4ca2-a26b-574935e99081,2,zone_1,,,,2,2,,,,0,15:30:00,16:00:00,,,,,1,1 +1d32fa36-c9db-4ca2-a26b-574935e99081,3,cujv,16:00:00,16:00:00,,,,,,,0,,,,,,,, +273d01f4-1adb-4c9d-9fef-54c861fd15d0,0,yz85,14:30:00,14:30:00,,,,,,,0,,,,,,,, +273d01f4-1adb-4c9d-9fef-54c861fd15d0,1,zone_1,,,,2,2,,,,0,14:30:00,15:00:00,,,,,1,1 +273d01f4-1adb-4c9d-9fef-54c861fd15d0,2,zone_1,,,,2,2,,,,0,14:30:00,15:00:00,,,,,1,1 +273d01f4-1adb-4c9d-9fef-54c861fd15d0,3,cujv,15:00:00,15:00:00,,,,,,,0,,,,,,,, +a642849a-c0e1-4308-b6c4-0ad12c56744c,0,yz85,16:30:00,16:30:00,,,,,,,0,,,,,,,, +a642849a-c0e1-4308-b6c4-0ad12c56744c,1,zone_1,,,,2,2,,,,0,16:30:00,17:00:00,,,,,1,1 +a642849a-c0e1-4308-b6c4-0ad12c56744c,2,zone_1,,,,2,2,,,,0,16:30:00,17:00:00,,,,,1,1 +a642849a-c0e1-4308-b6c4-0ad12c56744c,3,cujv,17:00:00,17:00:00,,,,,,,0,,,,,,,, +adef9bc9-98ee-4ae1-99a9-5b55bb01bf52,0,yz85,17:30:00,17:30:00,,,,,,,0,,,,,,,, +adef9bc9-98ee-4ae1-99a9-5b55bb01bf52,1,zone_1,,,,2,2,,,,0,17:30:00,18:00:00,,,,,1,1 +adef9bc9-98ee-4ae1-99a9-5b55bb01bf52,2,zone_1,,,,2,2,,,,0,17:30:00,18:00:00,,,,,1,1 +adef9bc9-98ee-4ae1-99a9-5b55bb01bf52,3,cujv,18:00:00,18:00:00,,,,,,,0,,,,,,,, +a62fe28a-b95b-4f37-b72c-db27af73e6fe,0,yz85,18:30:00,18:30:00,,,,,,,0,,,,,,,, +a62fe28a-b95b-4f37-b72c-db27af73e6fe,1,zone_1,,,,2,2,,,,0,18:30:00,19:00:00,,,,,1,1 +a62fe28a-b95b-4f37-b72c-db27af73e6fe,2,zone_1,,,,2,2,,,,0,18:30:00,19:00:00,,,,,1,1 +a62fe28a-b95b-4f37-b72c-db27af73e6fe,3,cujv,19:00:00,19:00:00,,,,,,,0,,,,,,,, +b43131c7-63c2-4127-a837-6987dcc428ae,0,cujv,7:00:00,7:00:00,,,,,,,0,,,,,,,, +b43131c7-63c2-4127-a837-6987dcc428ae,1,zone_1,,,,2,2,,,,0,7:00:00,7:30:00,,,,,1,1 +b43131c7-63c2-4127-a837-6987dcc428ae,2,zone_1,,,,2,2,,,,0,7:00:00,7:30:00,,,,,1,1 +b43131c7-63c2-4127-a837-6987dcc428ae,3,yz85,7:30:00,7:30:00,,,,,,,0,,,,,,,, +5ad42b7b-30df-47ad-8264-b9c1119d954a,0,cujv,9:00:00,9:00:00,,,,,,,0,,,,,,,, +5ad42b7b-30df-47ad-8264-b9c1119d954a,1,zone_1,,,,2,2,,,,0,9:00:00,9:30:00,,,,,1,1 +5ad42b7b-30df-47ad-8264-b9c1119d954a,2,zone_1,,,,2,2,,,,0,9:00:00,9:30:00,,,,,1,1 +5ad42b7b-30df-47ad-8264-b9c1119d954a,3,yz85,9:30:00,9:30:00,,,,,,,0,,,,,,,, +0ef63de2-f001-423e-b2c8-cb362db810dc,0,cujv,10:00:00,10:00:00,,,,,,,0,,,,,,,, +0ef63de2-f001-423e-b2c8-cb362db810dc,1,zone_1,,,,2,2,,,,0,10:00:00,10:30:00,,,,,1,1 +0ef63de2-f001-423e-b2c8-cb362db810dc,2,zone_1,,,,2,2,,,,0,10:00:00,10:30:00,,,,,1,1 +0ef63de2-f001-423e-b2c8-cb362db810dc,3,yz85,10:30:00,10:30:00,,,,,,,0,,,,,,,, +580c504a-d9e8-446f-8a79-efedbeda8dab,0,cujv,8:00:00,8:00:00,,,,,,,0,,,,,,,, +580c504a-d9e8-446f-8a79-efedbeda8dab,1,zone_1,,,,2,2,,,,0,8:00:00,8:30:00,,,,,1,1 +580c504a-d9e8-446f-8a79-efedbeda8dab,2,zone_1,,,,2,2,,,,0,8:00:00,8:30:00,,,,,1,1 +580c504a-d9e8-446f-8a79-efedbeda8dab,3,yz85,8:30:00,8:30:00,,,,,,,0,,,,,,,, +54c6c881-ec67-4a66-bd9f-3b61c83b326b,0,cujv,11:00:00,11:00:00,,,,,,,0,,,,,,,, +54c6c881-ec67-4a66-bd9f-3b61c83b326b,1,zone_1,,,,2,2,,,,0,11:00:00,11:30:00,,,,,1,1 +54c6c881-ec67-4a66-bd9f-3b61c83b326b,2,zone_1,,,,2,2,,,,0,11:00:00,11:30:00,,,,,1,1 +54c6c881-ec67-4a66-bd9f-3b61c83b326b,3,yz85,11:30:00,11:30:00,,,,,,,0,,,,,,,, +ac07359f-3afa-4de6-a076-d746cbc83ded,0,cujv,13:00:00,13:00:00,,,,,,,0,,,,,,,, +ac07359f-3afa-4de6-a076-d746cbc83ded,1,zone_1,,,,2,2,,,,0,13:00:00,13:30:00,,,,,1,1 +ac07359f-3afa-4de6-a076-d746cbc83ded,2,zone_1,,,,2,2,,,,0,13:00:00,13:30:00,,,,,1,1 +ac07359f-3afa-4de6-a076-d746cbc83ded,3,yz85,13:30:00,13:30:00,,,,,,,0,,,,,,,, +89367b3a-da78-4420-b497-01aa9017068d,0,cujv,12:00:00,12:00:00,,,,,,,0,,,,,,,, +89367b3a-da78-4420-b497-01aa9017068d,1,zone_1,,,,2,2,,,,0,12:00:00,12:30:00,,,,,1,1 +89367b3a-da78-4420-b497-01aa9017068d,2,zone_1,,,,2,2,,,,0,12:00:00,12:30:00,,,,,1,1 +89367b3a-da78-4420-b497-01aa9017068d,3,yz85,12:30:00,12:30:00,,,,,,,0,,,,,,,, +c8bd2ce1-eff7-4504-8fd7-2416de4d9413,0,cujv,14:00:00,14:00:00,,,,,,,0,,,,,,,, +c8bd2ce1-eff7-4504-8fd7-2416de4d9413,1,zone_1,,,,2,2,,,,0,14:00:00,14:30:00,,,,,1,1 +c8bd2ce1-eff7-4504-8fd7-2416de4d9413,2,zone_1,,,,2,2,,,,0,14:00:00,14:30:00,,,,,1,1 +c8bd2ce1-eff7-4504-8fd7-2416de4d9413,3,yz85,14:30:00,14:30:00,,,,,,,0,,,,,,,, +202bd60a-a979-4bba-86b0-d0b1e870bdfc,0,cujv,17:00:00,17:00:00,,,,,,,0,,,,,,,, +202bd60a-a979-4bba-86b0-d0b1e870bdfc,1,zone_1,,,,2,2,,,,0,17:00:00,17:30:00,,,,,1,1 +202bd60a-a979-4bba-86b0-d0b1e870bdfc,2,zone_1,,,,2,2,,,,0,17:00:00,17:30:00,,,,,1,1 +202bd60a-a979-4bba-86b0-d0b1e870bdfc,3,yz85,17:30:00,17:30:00,,,,,,,0,,,,,,,, +6cd8ea48-276d-45d7-852c-167a8f2b13fa,0,cujv,15:00:00,15:00:00,,,,,,,0,,,,,,,, +6cd8ea48-276d-45d7-852c-167a8f2b13fa,1,zone_1,,,,2,2,,,,0,15:00:00,15:30:00,,,,,1,1 +6cd8ea48-276d-45d7-852c-167a8f2b13fa,2,zone_1,,,,2,2,,,,0,15:00:00,15:30:00,,,,,1,1 +6cd8ea48-276d-45d7-852c-167a8f2b13fa,3,yz85,15:30:00,15:30:00,,,,,,,0,,,,,,,, +19290d0c-323c-499b-aa37-65cb80505d6b,0,cujv,16:00:00,16:00:00,,,,,,,0,,,,,,,, +19290d0c-323c-499b-aa37-65cb80505d6b,1,zone_1,,,,2,2,,,,0,16:00:00,16:30:00,,,,,1,1 +19290d0c-323c-499b-aa37-65cb80505d6b,2,zone_1,,,,2,2,,,,0,16:00:00,16:30:00,,,,,1,1 +19290d0c-323c-499b-aa37-65cb80505d6b,3,yz85,16:30:00,16:30:00,,,,,,,0,,,,,,,, +f665bd4d-6f7a-4fbf-97ba-e602c17620c2,0,cujv,18:00:00,18:00:00,,,,,,,0,,,,,,,, +f665bd4d-6f7a-4fbf-97ba-e602c17620c2,1,zone_1,,,,2,2,,,,0,18:00:00,18:30:00,,,,,1,1 +f665bd4d-6f7a-4fbf-97ba-e602c17620c2,2,zone_1,,,,2,2,,,,0,18:00:00,18:30:00,,,,,1,1 +f665bd4d-6f7a-4fbf-97ba-e602c17620c2,3,yz85,18:30:00,18:30:00,,,,,,,0,,,,,,,, +9d80fb21-203f-4e0f-b79c-5d584ebe4ffd,0,7y7t,7:30:00,7:30:00,,,,,,,0,,,,,,,, +9d80fb21-203f-4e0f-b79c-5d584ebe4ffd,1,zone_2,,,,2,2,,,,0,7:30:00,8:00:00,,,,,1,1 +9d80fb21-203f-4e0f-b79c-5d584ebe4ffd,2,zone_2,,,,2,2,,,,0,7:30:00,8:00:00,,,,,1,1 +9d80fb21-203f-4e0f-b79c-5d584ebe4ffd,3,cujv,8:00:00,8:00:00,,,,,,,0,,,,,,,, +679e1454-ae4b-4c5d-a594-78c30b76843e,0,7y7t,8:30:00,8:30:00,,,,,,,0,,,,,,,, +679e1454-ae4b-4c5d-a594-78c30b76843e,1,zone_2,,,,2,2,,,,0,8:30:00,9:00:00,,,,,1,1 +679e1454-ae4b-4c5d-a594-78c30b76843e,2,zone_2,,,,2,2,,,,0,8:30:00,9:00:00,,,,,1,1 +679e1454-ae4b-4c5d-a594-78c30b76843e,3,cujv,9:00:00,9:00:00,,,,,,,0,,,,,,,, +dcb9e29e-9e7a-4b65-ae2a-8c9efa816dec,0,7y7t,9:30:00,9:30:00,,,,,,,0,,,,,,,, +dcb9e29e-9e7a-4b65-ae2a-8c9efa816dec,1,zone_2,,,,2,2,,,,0,9:30:00,10:00:00,,,,,1,1 +dcb9e29e-9e7a-4b65-ae2a-8c9efa816dec,2,zone_2,,,,2,2,,,,0,9:30:00,10:00:00,,,,,1,1 +dcb9e29e-9e7a-4b65-ae2a-8c9efa816dec,3,cujv,10:00:00,10:00:00,,,,,,,0,,,,,,,, +d2a823f2-798b-476a-a222-555711ae36f9,0,7y7t,10:30:00,10:30:00,,,,,,,0,,,,,,,, +d2a823f2-798b-476a-a222-555711ae36f9,1,zone_2,,,,2,2,,,,0,10:30:00,11:00:00,,,,,1,1 +d2a823f2-798b-476a-a222-555711ae36f9,2,zone_2,,,,2,2,,,,0,10:30:00,11:00:00,,,,,1,1 +d2a823f2-798b-476a-a222-555711ae36f9,3,cujv,11:00:00,11:00:00,,,,,,,0,,,,,,,, +c4f27c33-48bb-479e-b5de-454b4eb35cdd,0,7y7t,11:30:00,11:30:00,,,,,,,0,,,,,,,, +c4f27c33-48bb-479e-b5de-454b4eb35cdd,1,zone_2,,,,2,2,,,,0,11:30:00,12:00:00,,,,,1,1 +c4f27c33-48bb-479e-b5de-454b4eb35cdd,2,zone_2,,,,2,2,,,,0,11:30:00,12:00:00,,,,,1,1 +c4f27c33-48bb-479e-b5de-454b4eb35cdd,3,cujv,12:00:00,12:00:00,,,,,,,0,,,,,,,, +ef307aa7-77da-4d0b-997f-b48493f21329,0,7y7t,14:30:00,14:30:00,,,,,,,0,,,,,,,, +ef307aa7-77da-4d0b-997f-b48493f21329,1,zone_2,,,,2,2,,,,0,14:30:00,15:00:00,,,,,1,1 +ef307aa7-77da-4d0b-997f-b48493f21329,2,zone_2,,,,2,2,,,,0,14:30:00,15:00:00,,,,,1,1 +ef307aa7-77da-4d0b-997f-b48493f21329,3,cujv,15:00:00,15:00:00,,,,,,,0,,,,,,,, +792effa3-a3a4-4cde-9246-3e70474643a1,0,7y7t,15:30:00,15:30:00,,,,,,,0,,,,,,,, +792effa3-a3a4-4cde-9246-3e70474643a1,1,zone_2,,,,2,2,,,,0,15:30:00,16:00:00,,,,,1,1 +792effa3-a3a4-4cde-9246-3e70474643a1,2,zone_2,,,,2,2,,,,0,15:30:00,16:00:00,,,,,1,1 +792effa3-a3a4-4cde-9246-3e70474643a1,3,cujv,16:00:00,16:00:00,,,,,,,0,,,,,,,, +ef5a5ad2-1db7-4005-96e6-bffbcdb50ff2,0,7y7t,12:30:00,12:30:00,,,,,,,0,,,,,,,, +ef5a5ad2-1db7-4005-96e6-bffbcdb50ff2,1,zone_2,,,,2,2,,,,0,12:30:00,13:00:00,,,,,1,1 +ef5a5ad2-1db7-4005-96e6-bffbcdb50ff2,2,zone_2,,,,2,2,,,,0,12:30:00,13:00:00,,,,,1,1 +ef5a5ad2-1db7-4005-96e6-bffbcdb50ff2,3,cujv,13:00:00,13:00:00,,,,,,,0,,,,,,,, +f2e5cf8d-290b-4da3-bc9d-b1d7ead3d6c6,0,7y7t,13:30:00,13:30:00,,,,,,,0,,,,,,,, +f2e5cf8d-290b-4da3-bc9d-b1d7ead3d6c6,1,zone_2,,,,2,2,,,,0,13:30:00,14:00:00,,,,,1,1 +f2e5cf8d-290b-4da3-bc9d-b1d7ead3d6c6,2,zone_2,,,,2,2,,,,0,13:30:00,14:00:00,,,,,1,1 +f2e5cf8d-290b-4da3-bc9d-b1d7ead3d6c6,3,cujv,14:00:00,14:00:00,,,,,,,0,,,,,,,, +c9fbc38d-4f91-46dc-bfd3-4a0460da2974,0,7y7t,16:30:00,16:30:00,,,,,,,0,,,,,,,, +c9fbc38d-4f91-46dc-bfd3-4a0460da2974,1,zone_2,,,,2,2,,,,0,16:30:00,17:00:00,,,,,1,1 +c9fbc38d-4f91-46dc-bfd3-4a0460da2974,2,zone_2,,,,2,2,,,,0,16:30:00,17:00:00,,,,,1,1 +c9fbc38d-4f91-46dc-bfd3-4a0460da2974,3,cujv,17:00:00,17:00:00,,,,,,,0,,,,,,,, +06671d42-4558-42fb-ad0f-00680b157ab7,0,7y7t,17:30:00,17:30:00,,,,,,,0,,,,,,,, +06671d42-4558-42fb-ad0f-00680b157ab7,1,zone_2,,,,2,2,,,,0,17:30:00,18:00:00,,,,,1,1 +06671d42-4558-42fb-ad0f-00680b157ab7,2,zone_2,,,,2,2,,,,0,17:30:00,18:00:00,,,,,1,1 +06671d42-4558-42fb-ad0f-00680b157ab7,3,cujv,18:00:00,18:00:00,,,,,,,0,,,,,,,, +b86afa6f-467e-4c46-8a09-5916d1cf9733,0,7y7t,18:30:00,18:30:00,,,,,,,0,,,,,,,, +b86afa6f-467e-4c46-8a09-5916d1cf9733,1,zone_2,,,,2,2,,,,0,18:30:00,19:00:00,,,,,1,1 +b86afa6f-467e-4c46-8a09-5916d1cf9733,2,zone_2,,,,2,2,,,,0,18:30:00,19:00:00,,,,,1,1 +b86afa6f-467e-4c46-8a09-5916d1cf9733,3,cujv,19:00:00,19:00:00,,,,,,,0,,,,,,,, +fe470cdb-09e4-42f9-b182-e14ddb13c15e,0,cujv,7:00:00,7:00:00,,,,,,,0,,,,,,,, +fe470cdb-09e4-42f9-b182-e14ddb13c15e,1,zone_2,,,,2,2,,,,0,7:00:00,7:30:00,,,,,1,1 +fe470cdb-09e4-42f9-b182-e14ddb13c15e,2,zone_2,,,,2,2,,,,0,7:00:00,7:30:00,,,,,1,1 +fe470cdb-09e4-42f9-b182-e14ddb13c15e,3,7y7t,7:30:00,7:30:00,,,,,,,0,,,,,,,, +d5774d48-8a06-46e0-9469-c2f881155dd6,0,cujv,8:00:00,8:00:00,,,,,,,0,,,,,,,, +d5774d48-8a06-46e0-9469-c2f881155dd6,1,zone_2,,,,2,2,,,,0,8:00:00,8:30:00,,,,,1,1 +d5774d48-8a06-46e0-9469-c2f881155dd6,2,zone_2,,,,2,2,,,,0,8:00:00,8:30:00,,,,,1,1 +d5774d48-8a06-46e0-9469-c2f881155dd6,3,7y7t,8:30:00,8:30:00,,,,,,,0,,,,,,,, +6edc3666-eee7-45fa-95d5-2d10e4923870,0,cujv,9:00:00,9:00:00,,,,,,,0,,,,,,,, +6edc3666-eee7-45fa-95d5-2d10e4923870,1,zone_2,,,,2,2,,,,0,9:00:00,9:30:00,,,,,1,1 +6edc3666-eee7-45fa-95d5-2d10e4923870,2,zone_2,,,,2,2,,,,0,9:00:00,9:30:00,,,,,1,1 +6edc3666-eee7-45fa-95d5-2d10e4923870,3,7y7t,9:30:00,9:30:00,,,,,,,0,,,,,,,, +e6a21333-9744-44d5-a926-cd92f24b1f5c,0,cujv,10:00:00,10:00:00,,,,,,,0,,,,,,,, +e6a21333-9744-44d5-a926-cd92f24b1f5c,1,zone_2,,,,2,2,,,,0,10:00:00,10:30:00,,,,,1,1 +e6a21333-9744-44d5-a926-cd92f24b1f5c,2,zone_2,,,,2,2,,,,0,10:00:00,10:30:00,,,,,1,1 +e6a21333-9744-44d5-a926-cd92f24b1f5c,3,7y7t,10:30:00,10:30:00,,,,,,,0,,,,,,,, +2e1be2a2-a953-4ae9-9d44-f1f93b0a9801,0,cujv,11:00:00,11:00:00,,,,,,,0,,,,,,,, +2e1be2a2-a953-4ae9-9d44-f1f93b0a9801,1,zone_2,,,,2,2,,,,0,11:00:00,11:30:00,,,,,1,1 +2e1be2a2-a953-4ae9-9d44-f1f93b0a9801,2,zone_2,,,,2,2,,,,0,11:00:00,11:30:00,,,,,1,1 +2e1be2a2-a953-4ae9-9d44-f1f93b0a9801,3,7y7t,11:30:00,11:30:00,,,,,,,0,,,,,,,, +e2c9bd09-af14-4e82-b6a2-ae1508e85458,0,cujv,12:00:00,12:00:00,,,,,,,0,,,,,,,, +e2c9bd09-af14-4e82-b6a2-ae1508e85458,1,zone_2,,,,2,2,,,,0,12:00:00,12:30:00,,,,,1,1 +e2c9bd09-af14-4e82-b6a2-ae1508e85458,2,zone_2,,,,2,2,,,,0,12:00:00,12:30:00,,,,,1,1 +e2c9bd09-af14-4e82-b6a2-ae1508e85458,3,7y7t,12:30:00,12:30:00,,,,,,,0,,,,,,,, +064d8fdf-7616-4ff1-b6eb-2a1f961dffd5,0,cujv,14:00:00,14:00:00,,,,,,,0,,,,,,,, +064d8fdf-7616-4ff1-b6eb-2a1f961dffd5,1,zone_2,,,,2,2,,,,0,14:00:00,14:30:00,,,,,1,1 +064d8fdf-7616-4ff1-b6eb-2a1f961dffd5,2,zone_2,,,,2,2,,,,0,14:00:00,14:30:00,,,,,1,1 +064d8fdf-7616-4ff1-b6eb-2a1f961dffd5,3,7y7t,14:30:00,14:30:00,,,,,,,0,,,,,,,, +6e9dcf78-99fe-44d5-9d1b-8f5f35bc814c,0,cujv,13:00:00,13:00:00,,,,,,,0,,,,,,,, +6e9dcf78-99fe-44d5-9d1b-8f5f35bc814c,1,zone_2,,,,2,2,,,,0,13:00:00,13:30:00,,,,,1,1 +6e9dcf78-99fe-44d5-9d1b-8f5f35bc814c,2,zone_2,,,,2,2,,,,0,13:00:00,13:30:00,,,,,1,1 +6e9dcf78-99fe-44d5-9d1b-8f5f35bc814c,3,7y7t,13:30:00,13:30:00,,,,,,,0,,,,,,,, +a77552e4-413f-4a0b-a638-0ff99b9b411d,0,cujv,15:00:00,15:00:00,,,,,,,0,,,,,,,, +a77552e4-413f-4a0b-a638-0ff99b9b411d,1,zone_2,,,,2,2,,,,0,15:00:00,15:30:00,,,,,1,1 +a77552e4-413f-4a0b-a638-0ff99b9b411d,2,zone_2,,,,2,2,,,,0,15:00:00,15:30:00,,,,,1,1 +a77552e4-413f-4a0b-a638-0ff99b9b411d,3,7y7t,15:30:00,15:30:00,,,,,,,0,,,,,,,, +21f51e8c-43f7-44ea-9f6f-c145a3c58203,0,cujv,16:00:00,16:00:00,,,,,,,0,,,,,,,, +21f51e8c-43f7-44ea-9f6f-c145a3c58203,1,zone_2,,,,2,2,,,,0,16:00:00,16:30:00,,,,,1,1 +21f51e8c-43f7-44ea-9f6f-c145a3c58203,2,zone_2,,,,2,2,,,,0,16:00:00,16:30:00,,,,,1,1 +21f51e8c-43f7-44ea-9f6f-c145a3c58203,3,7y7t,16:30:00,16:30:00,,,,,,,0,,,,,,,, +1cd920d7-e402-4e99-960c-06caaeea60b5,0,cujv,17:00:00,17:00:00,,,,,,,0,,,,,,,, +1cd920d7-e402-4e99-960c-06caaeea60b5,1,zone_2,,,,2,2,,,,0,17:00:00,17:30:00,,,,,1,1 +1cd920d7-e402-4e99-960c-06caaeea60b5,2,zone_2,,,,2,2,,,,0,17:00:00,17:30:00,,,,,1,1 +1cd920d7-e402-4e99-960c-06caaeea60b5,3,7y7t,17:30:00,17:30:00,,,,,,,0,,,,,,,, +194001c3-3e55-45b1-a8ff-3fde406bc3f1,0,cujv,18:00:00,18:00:00,,,,,,,0,,,,,,,, +194001c3-3e55-45b1-a8ff-3fde406bc3f1,1,zone_2,,,,2,2,,,,0,18:00:00,18:30:00,,,,,1,1 +194001c3-3e55-45b1-a8ff-3fde406bc3f1,2,zone_2,,,,2,2,,,,0,18:00:00,18:30:00,,,,,1,1 +194001c3-3e55-45b1-a8ff-3fde406bc3f1,3,7y7t,18:30:00,18:30:00,,,,,,,0,,,,,,,, +53f5d74e-6ee1-4cb9-a0f7-dc9ec3007ee0,0,cujv,7:00:00,7:00:00,,,,,,,0,,,,,,,, +53f5d74e-6ee1-4cb9-a0f7-dc9ec3007ee0,1,zone_3,,,,2,2,,,,0,7:00:00,7:30:00,,,,,1,1 +53f5d74e-6ee1-4cb9-a0f7-dc9ec3007ee0,2,zone_3,,,,2,2,,,,0,7:00:00,7:30:00,,,,,1,1 +53f5d74e-6ee1-4cb9-a0f7-dc9ec3007ee0,3,urnz,7:30:00,7:30:00,,,,,,,0,,,,,,,, +a326c618-d42c-4bd1-9624-c314fbf8ecd8,0,cujv,8:00:00,8:00:00,,,,,,,0,,,,,,,, +a326c618-d42c-4bd1-9624-c314fbf8ecd8,1,zone_3,,,,2,2,,,,0,8:00:00,8:30:00,,,,,1,1 +a326c618-d42c-4bd1-9624-c314fbf8ecd8,2,zone_3,,,,2,2,,,,0,8:00:00,8:30:00,,,,,1,1 +a326c618-d42c-4bd1-9624-c314fbf8ecd8,3,urnz,8:30:00,8:30:00,,,,,,,0,,,,,,,, +5e1d5f1c-6d00-49a6-bcb4-102e23473ef1,0,cujv,9:00:00,9:00:00,,,,,,,0,,,,,,,, +5e1d5f1c-6d00-49a6-bcb4-102e23473ef1,1,zone_3,,,,2,2,,,,0,9:00:00,9:30:00,,,,,1,1 +5e1d5f1c-6d00-49a6-bcb4-102e23473ef1,2,zone_3,,,,2,2,,,,0,9:00:00,9:30:00,,,,,1,1 +5e1d5f1c-6d00-49a6-bcb4-102e23473ef1,3,urnz,9:30:00,9:30:00,,,,,,,0,,,,,,,, +73c4a35b-7d18-424a-af12-9e5cb4020a82,0,cujv,10:00:00,10:00:00,,,,,,,0,,,,,,,, +73c4a35b-7d18-424a-af12-9e5cb4020a82,1,zone_3,,,,2,2,,,,0,10:00:00,10:30:00,,,,,1,1 +73c4a35b-7d18-424a-af12-9e5cb4020a82,2,zone_3,,,,2,2,,,,0,10:00:00,10:30:00,,,,,1,1 +73c4a35b-7d18-424a-af12-9e5cb4020a82,3,urnz,10:30:00,10:30:00,,,,,,,0,,,,,,,, +8327b802-1c0f-4a0f-99dd-57e2e5a5f9c5,0,cujv,11:00:00,11:00:00,,,,,,,0,,,,,,,, +8327b802-1c0f-4a0f-99dd-57e2e5a5f9c5,1,zone_3,,,,2,2,,,,0,11:00:00,11:30:00,,,,,1,1 +8327b802-1c0f-4a0f-99dd-57e2e5a5f9c5,2,zone_3,,,,2,2,,,,0,11:00:00,11:30:00,,,,,1,1 +8327b802-1c0f-4a0f-99dd-57e2e5a5f9c5,3,urnz,11:30:00,11:30:00,,,,,,,0,,,,,,,, +d8a01791-b8e2-4677-bc70-b4750a6d038a,0,cujv,12:00:00,12:00:00,,,,,,,0,,,,,,,, +d8a01791-b8e2-4677-bc70-b4750a6d038a,1,zone_3,,,,2,2,,,,0,12:00:00,12:30:00,,,,,1,1 +d8a01791-b8e2-4677-bc70-b4750a6d038a,2,zone_3,,,,2,2,,,,0,12:00:00,12:30:00,,,,,1,1 +d8a01791-b8e2-4677-bc70-b4750a6d038a,3,urnz,12:30:00,12:30:00,,,,,,,0,,,,,,,, +f53a1465-6030-4885-9f05-243867071272,0,cujv,13:00:00,13:00:00,,,,,,,0,,,,,,,, +f53a1465-6030-4885-9f05-243867071272,1,zone_3,,,,2,2,,,,0,13:00:00,13:30:00,,,,,1,1 +f53a1465-6030-4885-9f05-243867071272,2,zone_3,,,,2,2,,,,0,13:00:00,13:30:00,,,,,1,1 +f53a1465-6030-4885-9f05-243867071272,3,urnz,13:30:00,13:30:00,,,,,,,0,,,,,,,, +86e55114-94ea-4716-bbe4-7382452e83a4,0,cujv,14:00:00,14:00:00,,,,,,,0,,,,,,,, +86e55114-94ea-4716-bbe4-7382452e83a4,1,zone_3,,,,2,2,,,,0,14:00:00,14:30:00,,,,,1,1 +86e55114-94ea-4716-bbe4-7382452e83a4,2,zone_3,,,,2,2,,,,0,14:00:00,14:30:00,,,,,1,1 +86e55114-94ea-4716-bbe4-7382452e83a4,3,urnz,14:30:00,14:30:00,,,,,,,0,,,,,,,, +ef126e29-8527-407d-b3fe-b363bca9ab57,0,cujv,16:00:00,16:00:00,,,,,,,0,,,,,,,, +ef126e29-8527-407d-b3fe-b363bca9ab57,1,zone_3,,,,2,2,,,,0,16:00:00,16:30:00,,,,,1,1 +ef126e29-8527-407d-b3fe-b363bca9ab57,2,zone_3,,,,2,2,,,,0,16:00:00,16:30:00,,,,,1,1 +ef126e29-8527-407d-b3fe-b363bca9ab57,3,urnz,16:30:00,16:30:00,,,,,,,0,,,,,,,, +c11bfab9-25b8-4390-8df4-424505cbda8f,0,cujv,17:00:00,17:00:00,,,,,,,0,,,,,,,, +c11bfab9-25b8-4390-8df4-424505cbda8f,1,zone_3,,,,2,2,,,,0,17:00:00,17:30:00,,,,,1,1 +c11bfab9-25b8-4390-8df4-424505cbda8f,2,zone_3,,,,2,2,,,,0,17:00:00,17:30:00,,,,,1,1 +c11bfab9-25b8-4390-8df4-424505cbda8f,3,urnz,17:30:00,17:30:00,,,,,,,0,,,,,,,, +e5dc18ca-b8fb-49a4-8902-b13b87f738b7,0,cujv,15:00:00,15:00:00,,,,,,,0,,,,,,,, +e5dc18ca-b8fb-49a4-8902-b13b87f738b7,1,zone_3,,,,2,2,,,,0,15:00:00,15:30:00,,,,,1,1 +e5dc18ca-b8fb-49a4-8902-b13b87f738b7,2,zone_3,,,,2,2,,,,0,15:00:00,15:30:00,,,,,1,1 +e5dc18ca-b8fb-49a4-8902-b13b87f738b7,3,urnz,15:30:00,15:30:00,,,,,,,0,,,,,,,, +9fdd99ae-e7df-4439-ab9c-b91f863a6eb8,0,cujv,18:00:00,18:00:00,,,,,,,0,,,,,,,, +9fdd99ae-e7df-4439-ab9c-b91f863a6eb8,1,zone_3,,,,2,2,,,,0,18:00:00,18:30:00,,,,,1,1 +9fdd99ae-e7df-4439-ab9c-b91f863a6eb8,2,zone_3,,,,2,2,,,,0,18:00:00,18:30:00,,,,,1,1 +9fdd99ae-e7df-4439-ab9c-b91f863a6eb8,3,urnz,18:30:00,18:30:00,,,,,,,0,,,,,,,, +4c890d38-1b3a-44ca-9800-106abbdc2d7f,0,urnz,7:30:00,7:30:00,,,,,,,0,,,,,,,, +4c890d38-1b3a-44ca-9800-106abbdc2d7f,1,zone_3,,,,2,2,,,,0,7:30:00,8:00:00,,,,,1,1 +4c890d38-1b3a-44ca-9800-106abbdc2d7f,2,zone_3,,,,2,2,,,,0,7:30:00,8:00:00,,,,,1,1 +4c890d38-1b3a-44ca-9800-106abbdc2d7f,3,cujv,8:00:00,8:00:00,,,,,,,0,,,,,,,, +099936e9-ebc8-48b4-b658-a4d6ca172360,0,urnz,8:30:00,8:30:00,,,,,,,0,,,,,,,, +099936e9-ebc8-48b4-b658-a4d6ca172360,1,zone_3,,,,2,2,,,,0,8:30:00,9:00:00,,,,,1,1 +099936e9-ebc8-48b4-b658-a4d6ca172360,2,zone_3,,,,2,2,,,,0,8:30:00,9:00:00,,,,,1,1 +099936e9-ebc8-48b4-b658-a4d6ca172360,3,cujv,9:00:00,9:00:00,,,,,,,0,,,,,,,, +5f6f34cc-01c8-4f9d-a232-91072eecb085,0,urnz,11:30:00,11:30:00,,,,,,,0,,,,,,,, +5f6f34cc-01c8-4f9d-a232-91072eecb085,1,zone_3,,,,2,2,,,,0,11:30:00,12:00:00,,,,,1,1 +5f6f34cc-01c8-4f9d-a232-91072eecb085,2,zone_3,,,,2,2,,,,0,11:30:00,12:00:00,,,,,1,1 +5f6f34cc-01c8-4f9d-a232-91072eecb085,3,cujv,12:00:00,12:00:00,,,,,,,0,,,,,,,, +15122227-203e-4652-b84d-e7f6879cd93e,0,urnz,12:30:00,12:30:00,,,,,,,0,,,,,,,, +15122227-203e-4652-b84d-e7f6879cd93e,1,zone_3,,,,2,2,,,,0,12:30:00,13:00:00,,,,,1,1 +15122227-203e-4652-b84d-e7f6879cd93e,2,zone_3,,,,2,2,,,,0,12:30:00,13:00:00,,,,,1,1 +15122227-203e-4652-b84d-e7f6879cd93e,3,cujv,13:00:00,13:00:00,,,,,,,0,,,,,,,, +a562a0b1-38e5-403d-8a3c-1dab58aeac80,0,urnz,9:30:00,9:30:00,,,,,,,0,,,,,,,, +a562a0b1-38e5-403d-8a3c-1dab58aeac80,1,zone_3,,,,2,2,,,,0,9:30:00,10:00:00,,,,,1,1 +a562a0b1-38e5-403d-8a3c-1dab58aeac80,2,zone_3,,,,2,2,,,,0,9:30:00,10:00:00,,,,,1,1 +a562a0b1-38e5-403d-8a3c-1dab58aeac80,3,cujv,10:00:00,10:00:00,,,,,,,0,,,,,,,, +8823f7f0-a737-49fd-94ab-7e52cb6d1bc6,0,urnz,10:30:00,10:30:00,,,,,,,0,,,,,,,, +8823f7f0-a737-49fd-94ab-7e52cb6d1bc6,1,zone_3,,,,2,2,,,,0,10:30:00,11:00:00,,,,,1,1 +8823f7f0-a737-49fd-94ab-7e52cb6d1bc6,2,zone_3,,,,2,2,,,,0,10:30:00,11:00:00,,,,,1,1 +8823f7f0-a737-49fd-94ab-7e52cb6d1bc6,3,cujv,11:00:00,11:00:00,,,,,,,0,,,,,,,, +9657b71d-dd67-4018-adfa-50a39e6c8d96,0,urnz,13:30:00,13:30:00,,,,,,,0,,,,,,,, +9657b71d-dd67-4018-adfa-50a39e6c8d96,1,zone_3,,,,2,2,,,,0,13:30:00,14:00:00,,,,,1,1 +9657b71d-dd67-4018-adfa-50a39e6c8d96,2,zone_3,,,,2,2,,,,0,13:30:00,14:00:00,,,,,1,1 +9657b71d-dd67-4018-adfa-50a39e6c8d96,3,cujv,14:00:00,14:00:00,,,,,,,0,,,,,,,, +9b814859-a7a2-499e-9132-12439865c2e3,0,urnz,14:30:00,14:30:00,,,,,,,0,,,,,,,, +9b814859-a7a2-499e-9132-12439865c2e3,1,zone_3,,,,2,2,,,,0,14:30:00,15:00:00,,,,,1,1 +9b814859-a7a2-499e-9132-12439865c2e3,2,zone_3,,,,2,2,,,,0,14:30:00,15:00:00,,,,,1,1 +9b814859-a7a2-499e-9132-12439865c2e3,3,cujv,15:00:00,15:00:00,,,,,,,0,,,,,,,, +ae72c875-e838-4be5-a610-7fd1d204c96a,0,urnz,15:30:00,15:30:00,,,,,,,0,,,,,,,, +ae72c875-e838-4be5-a610-7fd1d204c96a,1,zone_3,,,,2,2,,,,0,15:30:00,16:00:00,,,,,1,1 +ae72c875-e838-4be5-a610-7fd1d204c96a,2,zone_3,,,,2,2,,,,0,15:30:00,16:00:00,,,,,1,1 +ae72c875-e838-4be5-a610-7fd1d204c96a,3,cujv,16:00:00,16:00:00,,,,,,,0,,,,,,,, +4fb5949c-0916-4c3d-9210-0887d632baf1,0,urnz,16:30:00,16:30:00,,,,,,,0,,,,,,,, +4fb5949c-0916-4c3d-9210-0887d632baf1,1,zone_3,,,,2,2,,,,0,16:30:00,17:00:00,,,,,1,1 +4fb5949c-0916-4c3d-9210-0887d632baf1,2,zone_3,,,,2,2,,,,0,16:30:00,17:00:00,,,,,1,1 +4fb5949c-0916-4c3d-9210-0887d632baf1,3,cujv,17:00:00,17:00:00,,,,,,,0,,,,,,,, +04c8b180-b8ec-4786-ae01-b7a15eeaeb90,0,urnz,17:30:00,17:30:00,,,,,,,0,,,,,,,, +04c8b180-b8ec-4786-ae01-b7a15eeaeb90,1,zone_3,,,,2,2,,,,0,17:30:00,18:00:00,,,,,1,1 +04c8b180-b8ec-4786-ae01-b7a15eeaeb90,2,zone_3,,,,2,2,,,,0,17:30:00,18:00:00,,,,,1,1 +04c8b180-b8ec-4786-ae01-b7a15eeaeb90,3,cujv,18:00:00,18:00:00,,,,,,,0,,,,,,,, +a92ebee3-8f29-49f0-bb57-f1c1662172f0,0,urnz,18:30:00,18:30:00,,,,,,,0,,,,,,,, +a92ebee3-8f29-49f0-bb57-f1c1662172f0,1,zone_3,,,,2,2,,,,0,18:30:00,19:00:00,,,,,1,1 +a92ebee3-8f29-49f0-bb57-f1c1662172f0,2,zone_3,,,,2,2,,,,0,18:30:00,19:00:00,,,,,1,1 +a92ebee3-8f29-49f0-bb57-f1c1662172f0,3,cujv,19:00:00,19:00:00,,,,,,,0,,,,,,,, diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt new file mode 100644 index 00000000000..0e1854c2e4c --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/stops.txt @@ -0,0 +1,5 @@ +stop_id,stop_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,location_type,parent_station,stop_timezone,wheelchair_boarding,platform_code +cujv,,Transfer Point for Route 30,,33.854650,-84.600390,Z4,,,,,, +yz85,,Zone 1 - PUBLIX Super Market,Zone 1 Collection Point,33.864460,-84.674200,Z1,,,,,, +7y7t,,Zone 2 - Horseshoe Bend Plaza,Zone 2 Collection Point,33.883320,-84.620270,Z2,,,,,, +urnz,,Zone 3 - Downtown Austell,Zone 3 Collection Point,33.812190,-84.634500,Z3,,,,,, diff --git a/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt new file mode 100644 index 00000000000..8888cd8f6c6 --- /dev/null +++ b/src/ext-test/resources/flex/cobblinc-scheduled-deviated-flex.gtfs/trips.txt @@ -0,0 +1,73 @@ +trip_id,route_id,service_id,trip_headsign,trip_short_name,direction_id,block_id,shape_id,wheelchair_accessible,bikes_allowed +4d838cf4-d44d-4e08-a364-f22c34a8c89e,090z,1,,,1,,1603,, +48071338-a326-4da6-aca6-b1e0de935e5e,090z,1,,,1,,1603,, +3a4c1a1e-bbfd-46cc-8b2c-f68c7b0dca7c,090z,1,,,1,,1603,, +55db7288-4c30-47ba-b766-16a09b1d5020,090z,1,,,1,,1603,, +3570424a-a8ae-4a7c-8137-c6f6245ddfca,090z,1,,,1,,1603,, +d0cc6a8d-78c6-496a-aa3e-66c0829930f1,090z,1,,,1,,1603,, +50dfb2c0-d8ba-4dc6-a104-a3cc058feae9,090z,1,,,1,,1603,, +1d32fa36-c9db-4ca2-a26b-574935e99081,090z,1,,,1,,1603,, +273d01f4-1adb-4c9d-9fef-54c861fd15d0,090z,1,,,1,,1603,, +a642849a-c0e1-4308-b6c4-0ad12c56744c,090z,1,,,1,,1603,, +adef9bc9-98ee-4ae1-99a9-5b55bb01bf52,090z,1,,,1,,1603,, +a62fe28a-b95b-4f37-b72c-db27af73e6fe,090z,1,,,1,,1603,, +b43131c7-63c2-4127-a837-6987dcc428ae,090z,1,,,0,,cizy,, +5ad42b7b-30df-47ad-8264-b9c1119d954a,090z,1,,,0,,cizy,, +0ef63de2-f001-423e-b2c8-cb362db810dc,090z,1,,,0,,cizy,, +580c504a-d9e8-446f-8a79-efedbeda8dab,090z,1,,,0,,cizy,, +54c6c881-ec67-4a66-bd9f-3b61c83b326b,090z,1,,,0,,cizy,, +ac07359f-3afa-4de6-a076-d746cbc83ded,090z,1,,,0,,cizy,, +89367b3a-da78-4420-b497-01aa9017068d,090z,1,,,0,,cizy,, +c8bd2ce1-eff7-4504-8fd7-2416de4d9413,090z,1,,,0,,cizy,, +202bd60a-a979-4bba-86b0-d0b1e870bdfc,090z,1,,,0,,cizy,, +6cd8ea48-276d-45d7-852c-167a8f2b13fa,090z,1,,,0,,cizy,, +19290d0c-323c-499b-aa37-65cb80505d6b,090z,1,,,0,,cizy,, +f665bd4d-6f7a-4fbf-97ba-e602c17620c2,090z,1,,,0,,cizy,, +9d80fb21-203f-4e0f-b79c-5d584ebe4ffd,aamr,1,,,1,,5mw2,, +679e1454-ae4b-4c5d-a594-78c30b76843e,aamr,1,,,1,,5mw2,, +dcb9e29e-9e7a-4b65-ae2a-8c9efa816dec,aamr,1,,,1,,5mw2,, +d2a823f2-798b-476a-a222-555711ae36f9,aamr,1,,,1,,5mw2,, +c4f27c33-48bb-479e-b5de-454b4eb35cdd,aamr,1,,,1,,5mw2,, +ef307aa7-77da-4d0b-997f-b48493f21329,aamr,1,,,1,,5mw2,, +792effa3-a3a4-4cde-9246-3e70474643a1,aamr,1,,,1,,5mw2,, +ef5a5ad2-1db7-4005-96e6-bffbcdb50ff2,aamr,1,,,1,,5mw2,, +f2e5cf8d-290b-4da3-bc9d-b1d7ead3d6c6,aamr,1,,,1,,5mw2,, +c9fbc38d-4f91-46dc-bfd3-4a0460da2974,aamr,1,,,1,,5mw2,, +06671d42-4558-42fb-ad0f-00680b157ab7,aamr,1,,,1,,5mw2,, +b86afa6f-467e-4c46-8a09-5916d1cf9733,aamr,1,,,1,,5mw2,, +fe470cdb-09e4-42f9-b182-e14ddb13c15e,aamr,1,,,0,,wm2h,, +d5774d48-8a06-46e0-9469-c2f881155dd6,aamr,1,,,0,,wm2h,, +6edc3666-eee7-45fa-95d5-2d10e4923870,aamr,1,,,0,,wm2h,, +e6a21333-9744-44d5-a926-cd92f24b1f5c,aamr,1,,,0,,wm2h,, +2e1be2a2-a953-4ae9-9d44-f1f93b0a9801,aamr,1,,,0,,wm2h,, +e2c9bd09-af14-4e82-b6a2-ae1508e85458,aamr,1,,,0,,wm2h,, +064d8fdf-7616-4ff1-b6eb-2a1f961dffd5,aamr,1,,,0,,wm2h,, +6e9dcf78-99fe-44d5-9d1b-8f5f35bc814c,aamr,1,,,0,,wm2h,, +a77552e4-413f-4a0b-a638-0ff99b9b411d,aamr,1,,,0,,wm2h,, +21f51e8c-43f7-44ea-9f6f-c145a3c58203,aamr,1,,,0,,wm2h,, +1cd920d7-e402-4e99-960c-06caaeea60b5,aamr,1,,,0,,wm2h,, +194001c3-3e55-45b1-a8ff-3fde406bc3f1,aamr,1,,,0,,wm2h,, +53f5d74e-6ee1-4cb9-a0f7-dc9ec3007ee0,po0p,1,,,0,,swh2,, +a326c618-d42c-4bd1-9624-c314fbf8ecd8,po0p,1,,,0,,swh2,, +5e1d5f1c-6d00-49a6-bcb4-102e23473ef1,po0p,1,,,0,,swh2,, +73c4a35b-7d18-424a-af12-9e5cb4020a82,po0p,1,,,0,,swh2,, +8327b802-1c0f-4a0f-99dd-57e2e5a5f9c5,po0p,1,,,0,,swh2,, +d8a01791-b8e2-4677-bc70-b4750a6d038a,po0p,1,,,0,,swh2,, +f53a1465-6030-4885-9f05-243867071272,po0p,1,,,0,,swh2,, +86e55114-94ea-4716-bbe4-7382452e83a4,po0p,1,,,0,,swh2,, +ef126e29-8527-407d-b3fe-b363bca9ab57,po0p,1,,,0,,swh2,, +c11bfab9-25b8-4390-8df4-424505cbda8f,po0p,1,,,0,,swh2,, +e5dc18ca-b8fb-49a4-8902-b13b87f738b7,po0p,1,,,0,,swh2,, +9fdd99ae-e7df-4439-ab9c-b91f863a6eb8,po0p,1,,,0,,swh2,, +4c890d38-1b3a-44ca-9800-106abbdc2d7f,po0p,1,,,1,,fj8w,, +099936e9-ebc8-48b4-b658-a4d6ca172360,po0p,1,,,1,,fj8w,, +5f6f34cc-01c8-4f9d-a232-91072eecb085,po0p,1,,,1,,fj8w,, +15122227-203e-4652-b84d-e7f6879cd93e,po0p,1,,,1,,fj8w,, +a562a0b1-38e5-403d-8a3c-1dab58aeac80,po0p,1,,,1,,fj8w,, +8823f7f0-a737-49fd-94ab-7e52cb6d1bc6,po0p,1,,,1,,fj8w,, +9657b71d-dd67-4018-adfa-50a39e6c8d96,po0p,1,,,1,,fj8w,, +9b814859-a7a2-499e-9132-12439865c2e3,po0p,1,,,1,,fj8w,, +ae72c875-e838-4be5-a610-7fd1d204c96a,po0p,1,,,1,,fj8w,, +4fb5949c-0916-4c3d-9210-0887d632baf1,po0p,1,,,1,,fj8w,, +04c8b180-b8ec-4786-ae01-b7a15eeaeb90,po0p,1,,,1,,fj8w,, +a92ebee3-8f29-49f0-bb57-f1c1662172f0,po0p,1,,,1,,fj8w,, diff --git a/src/ext-test/resources/flex/lincoln-county-flex.gtfs.zip b/src/ext-test/resources/flex/lincoln-county-flex.gtfs.zip deleted file mode 100644 index f63a0bf736a0c3d74fbad6baea5e3c45bb1fa0b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 461815 zcmV)OK(@b7O9KQH00;mG0CTsNQ2+n{000000000000{s90AX@vVRJ5YcyvoFN==N< zOwlRNF5v@6aWYS2mo`pmQerz0000000000000UA z0047nVQ^)0E_8TweBJGiEX!`4>;LCk`ZW5xyRJqMtPR+JVe1^pzJ5P%R%T=sbHkFS zwboq0%!nX^92{h1{l|a(*MI-Vzx=mwiA{%m4fz=fC{NKmNb} z^^gDYU;eTG&A96fBpLY_+H~bf8IVmzrQ~}KVCjw zzW-j|-@o49-adb(I`+58Q zxP8vC-oD1Zf4_Xcy#Kzv-adXU>g{7Z_viMv#=iZ%{Jebp{=WWxTleS3<+-=pG4|vA z>*e?5^ZVoV^Xud7+op}@{+_$n*uR(0+uN(BetrGEfBoOa{(ZmP4E}umxqbcp{Cs}T z!9Tx0zi&TpKc7G6WNsgypZ@M<2VYG5_2c8`@8|vd_bPkHe7@c6%lpgs+vn@w_uJQv zz!?4a_Oo7LIQ3BG*RSC}?>}EZ?{oOa-{bK2m-o+??_V4A_Vxb${eF4+=Yzex-3?aLATzRj)t{Q7$wZ?Qkdf4{wc(dvzM z$8tY^9~5OJ9}MUH@BQ`nojdsWn5+GId+;3G-pdD5_~4Yj-`;-dWtjZeS4VD{+4swb z1Nia#^=jikKEE!rVb`Y)_WS+uK6mH)`{%(JzP?`gtoKjb^M0eO&);d8zh95r+rpP ze%z?{XPTzN@L-x$#mTc_^Z9)L`}mqJ;p^}7@fg}nF7Ey3_WpW%`~3c4TSL2l-w!^4 zYCmcB_x`+KRf7L_>XY+cYB}9y}dbnOS_KMC-wdcCAsjw&&&4T zc)5r1A1`0j%O`mL_xo)+awhe52Fy3R;~c;Lv7XOgTXXRX!tDF+?d!v=9&GO8<4frN z^)9ORUs<-$`!PK~;g64-v;514pG*3FXJVfsMzVasn^W<18~gChIX}Kp@TKQPq;k($6D7KoG2(l2>#(u zf4)B)r)RZ)e+c?({L2@A>I^Zd+t2ND9#J6X9GiX|x(~kV)iHV(0!LK({`fl~!RH%i z@cm}|&DPi!4tV&l?@!Kc&E?J3u$T`5(8*UGX|B~de;EGrVs=9N+v^|y_4)lbEd2W^ zq`n!RfB*SmQOs%j_U|vT|KaHcckZ15GR^PX$M6>49LVF`;VNqV5;{Kq{(jzA<=FS{ zUv{$e#8u>fsrr>`XNeax`+?-n@wd=`@xOr3*B68`kLS0zd>*%tU-O~b-**V|W~Lw0 z8^IQT=X@Zym%`2O&vyLZc=BoXf1hx}F@L!2<%e#?Fy7j%Om?i7b)3)tF(1zC4}Z#pc$beKPIWx~=gr?8oOrZaB8@!|H$DMZ-1x z*9nB5KbhKV*y_jTJkoGFug2Rc zLGY7Tn(v~}HMbkD3blON+Skv|_g@R0OP5EiIQac>^L%i+ICcB_fkEEKG5GnmFURwL zAc+?q(`n)0z8pzTbj&BySmQqdwBI+O=jZnNeS@N}^Z7ZK`|}Io{0a@i@#`m7>6pyv z|NNZ?$J;%grg`nxcP{-ljty-8yB1qudNChs4gY;PBDcAjKesbz{`^4*zZC8NzOu)g zY-1|=m$%=oS{mW;bo*yApYLx@&28@G-vf9BJ3d~_?o+bR_#Qu}E6$*PBE1KJ#S>oAb77_lFbzdMW1RW@-0Zl%MnA?bdug-f36RfIt|hC=5+bYr8Ek$V2l{Y$NY! zGf@j)pCjJ=GWYZGO!6Ute$7lkY#~Gp3Ux zIRf4f1^vE&PT%(b6*Tq#X2#EH9!JaYvd%Y%LzWHXlt>NN5VSmILpO%wHuB;2{{0I) zd^VjwK7S227d}LMfB$}!DEc(IIXAR%@p#loxL?Gut z2Z`fB=WrRXr(-sFCeR&D=!su%aP^c@51=dKX>b}9iBB(fUmsC zAtG?TKAwZ%ublYUL@1(}JF5~|%;>Fb>)FyJhihBD|29H{tNFm-yubha`fp=f(f4qCS2XSeYylRCEXJEn+MoIFXgfcExr*%!&hT4#CNb~KnFEF@JHq@L^r znmN%#NX|Y{D{_dzu=KC7)V$R3cqw#biQ$|Qm-?IU?A(`?7=^KJC|udY5CP zfZw-`{o@j!jro^TlE`pfvXk{z5IX=0&*x4V><5n})WM``jInA8J?pb;lbNFu!% zuw2i7|8|s~-LHUqrZX02e7ngFqZ=GDF8KL%yxp24e`|cY@|Ul1kna~G15gk58!Z!$ z#u89rk^$yBynC>EDV7?I@6X$(-0&tO%YmM!gHkxQj8PieiZe=q2iG%<4DYvWQci8? zw&48ZM|9>uHp1Z<=$S4SDP{|k3pm;F$zs#_nR><+yl>1FLR2t-VkWuFl`Q|uxa>@) zP*f^)X%`@_}0{;?aG{BTg}HR~9% zEaPc6gu?q_QY5BhK90hg58xyw`6DP7EiG<(1!4Da^q4I3iP-`Ta4y)DH=NG%^S_Hq z`+8wa<6HBWS`seC`5V^end|X^g!>Y(nH#KUEc5Xn&g%a7Q0V)nVZNA?;_u*(F&)Of z5C4+%caUiy2EGImkuru$Lyz&GjPY57XbBc0$ua$7{MQ0nJaXe{7vzxnE7C;m&haO4 z@t4yC8;ysAu%ZM8jJBLJ3y{iZmy>LD2i z`g?jSmdDy1O8A?uM_4+H0f4j8K#^Qf4S^?w3Wn|TrpH;q%Gh}{mhoV;1HcK-vnbXa z)=(B;eA@l7`%*#)`rv_nW=Yg7wh?2+ANF=<2UIePC%56PrLC3YdYKJ6iM?@c=1ogptrgC$be(|y(uEg_~;E8zY@*dOy1%c46?zJ)3ot&PLU!kGu$k+evZ$DbQo>yy;KW;%;n;H z)_jO^#*Ig+{*}JYVjeOCCfe6q4x)N$e5Q$M0ojM!(QB}@TO*0Yr{NIEpYjuoIu4ek z^c;z;=Wi|zb;TkS3xp5Od;(5s;NhpFuBI=>7$4%PXlLEy`9B67 z)|RG-vmgLWO9?PH4~yFEI=NeJo-4=jIO(jvusEN;Adf0jG_pUgZeZOu1P0X%0@t8Xx!#q{f&6%KiZFw^(#l`q1yk=qLowdT4G zNNB3wwqy`hABRnyjSz6q8RjY~D#tb+$WRxo6g8jE*&g%%;`cwK3v2-Ik5ETujiQLo zmlKqTgT_-YEQzRwn7PB}?aa`B>^8$)P7cE=>4C>9q008`Flv+X1;yb@@wiOretH-~ z%TXyrg0K!}4X}R>liPSv9eHvR(lQ{$v){n!2cj$SX8WheJL*sJ3C@g$M8Tycuo6B% z8P?B}!XR376S`3r`*gO5pMX;;W_&9YKjpgC{QdTPR-Ee7c*JYwWw?ofFdRDc`uup# z_uP!C;nd~t077Y(lFl>B;xEp<%M8>78ecAlUS-?Qp2T>rb>C|&wXxLe1S)Js1WY~) z2?=r?{WX40Qe$q*D)XdJr(svmLgM@7citpmVO!Mh=v zM!S}{a;6`$gAW9lB_lq*=nW8fcKlU>&*`%k6|s{OL>lqjL(+r(}|^081SbW zN^luKAJ!0PUE^!(0BVev>Voc$`tX|>_p%116Ju!rBP%`N_Af0)=+ZMegG-I4-MHkf zrw4K#+m9bz+anB_is7uYR8-+>fF6(ME%xPd!ach2WzzZ)a8h%79;)ZJc0U6}jY%g; z;^$~}gZ=58hk>^L6Bk}}OsX=SpvJEwrs#ZVd@oRVu{RF7y7jYa*WgM3u`mX!{@~~N zm2pZy;$tR)y^;MQ>%lZ%zIOSLyJC7MN8_j?c!y7Zu-(U z;ZUb5LjN*;xint9=liqOmQ?ob=jddUv#+!ab=XS1<2xdGJ0;N4m=CwOuNM(vF8HiE zBY|HbgB3o*7lfNh-|fI2+M65+Tv7+JP=-`~e!i^rcz)F(lGjT;x~!V}JM%NwDEWq!9K}V5)X79)EhM zPZnmp8Qma!+~d||HK&7tS<}gd)RHAX;gOZF1k&+%0AdXXL)2Uv4*9CIXkQ+Q1h#g0 z5QU#jz=q1Uv0wNR1+?)3f3@N*|65Z~exG|#Qvn88=~yxD=iDJ}F-g!bXrzFs1fs+? zJc%4>wdwL52G^UV%#cANw|@s7ua?L4?G_zNLn0-6khoYmZtSX^TSpT8AH=9V%US7+ z2^E&{ys@nJVHGJ&%1{rYf}aG6!@UUL_tu=YBS4cRYNult^7Fa1tmg15`YrOI^=Jt% zEZbJs(l91PWv7II-m$OkN*NLrOnW2qQiN1tIA-+**ORDG3(k>=>xYugj&~@Ytam_} zw#orPd^15yKMcOrWf{|w6x|Ul4W;?4jYI(Bw$_@kI zV;PRkxr~U-s`w zSxIyr2o?Q9W3n`6RI3&Y9rj~)a@gn1v8W>|NCA6(ZFtTFKO>Iocbel@)X89suMJP^ zr{1k-G)$;2=6yTCpDjWePg~8$6h(0SUQoPv@0oIeoF+h``n}PE*9D6dgkVE+p$ka3%KEqZnu?c*DWAC9~Q81 zB_?k$OlB^sEnfpogiiQ*|eATM_riZtJcJ|J%W9Db0p%5lcJ+&Wmcs zczn#ETQhAobi4IZxs|}?2H;X*VlemVs1_FM>DECP_&6?4dp_yLuQZ9j39!&@41$p4 zl*xjgcgLYVluHlIpK>)=y2^kT!C*a~6c1Q*S8mey8fXz^`rze+lg>2$+@Fe}0;=(q z=gWoZcJ5CobYHJt3*%{5;SaqETCmY!Y{KEWKY2CYkW1Lwm^7u@?XljI4y<%ub|X}4 zOsePeCQi-a3&FNN<4sBV0GaIk3L+#Suh7?>T8#@7025eOx%h@NL;ayiZ`E|OT3F~l)h#u`-~B@>t$|9V|Fo( z7=$@l;OU5JSagYnh)Kc;%LX<0H&H|w(D9(hCUIc28fIaozjPsR|uVvsWk}xq@iOuaMn?AR(aP_uB-=NV3 zWawL;5qujf%8ZAED%#pyn9bbMLEA$keq>qIM>!z4wC*0wdrM+5AJ3j&!BB8)_YJ??>VT_l`? zC4tW;k;bKw+8`vKn6dE=fMrceJ;1CS$gWAiXSRW@%$-tfUGGq}Ng|DRlMM;Qy-mpF zdgm&V%Erq4U?dWE%f;G^)1;wd%?X}r74#hifJUp#JL+O+hWbwTokFk}ZB^0au8?tT z`ZMM$s$4FC62$_Rh!G>q#W)_%8`Y^_hl#RM26amj;bhJm8927qje*lsZLo7&ie3&^ z>}0%R-h4$Q)G?`Aqs7=>!9TY|F8%U~Gq0}DLcr$grTy;8wQw`XJ8J8E>w_@3*c7+7 z)wgGB0i9MB+o!}S*(Y$D0H$5xPFNbP9d)=%AMtGuNtc)?Z49o0s-)HR>v7_NE^3i` zcR>N>7|pj&7h7N6%#upkRBQv((@~&}7IBY*Z1>Wv z%~JwoX|`y@1_9#?ai-diWCuFi8K?TYTcl%B+~;9A8KWf#+yGBG4fiQHjAJbK5()3S zUQvStHjM-%C{idPj&g{mR50U^5DDxuLJf+7j;cII=RVJ>n+1nvg|s%8wUSUhto2Xg zJ!YjF@!Z@`1w0Z~PYaHv&}-IXufA>IQit-Z=LZR-mDHi60iq5CD#3rmhI?NK+ zIuZb$S(w_|%$KQTm?Ws2<#vxuY?m&Km5asath$}Z$Vs@i0MtMW^XSL0FLl&GE6y1Y zddk2<@zZhJrxVO!4U;f0j#Jhs(?B%NIhpSBD==#ISoP8UK#A|jlHGJa`v)Ge0xiS? z;~aMT-4cviz=*QTZlzh209}l^h&!)rT})r%l0F$(euHx)9rVlJVyAaUZDP)3YH9hKe!TUS}RfYln5cny~PAMwmAa#8jp zmA$N;+YlpovXx{K7Zw$d)R>)1;>waBz58EuIIJ}DhQA#1LuJJEcQMMszuhOkeZ@wl zbe1@7-|Y|+($;VoIb$mG$D48pPHp0tOP)lWopy#`5`VNqEL=+5*>o%mYu)n1Y%51f zG@0F?6TBVo4EJz^yV(%uK^@RQJsvUfnt{x3Hc&KqNMGi29&hHNY0-bN@lubZv9vrx zJ2ZEWBakuSFOH>iUmOHtsi|jkh)`K)b;XO#Au(&`>qsq&$9?njWg68Hi8C6aOm5~p zH7Be8!exuBR4w$s;%@w-Kg7i!ZmrlqrmjF|pPWU$;P9$=3Ja=>L|`Rt6T3x~x19zb z>%QbPL6OMHHux>zJEYSO%c4&SsRjv#1%P6TXfNX(Q)HLx6`Lt+7lgsCnhk97#gfj7 zg8!Q3cZ(F})yN4`1HMCln$p*K?Rkuy#gYJBE!wuvIWfeQlSiA{XGfMq?SbOFrwlK? z>El=iOq4`7g`Jt#&F85*J+GU8T?HY1Ih27$Bp^;Wym2fe?|{WtE)*-paBWxl3yPI% z7Njo=FUQ)|-YsDg6z&+fYc7jImrlnAc9FaXmG)OVy|_m%($acc|XwsM5GX17w$HxNKEm`B*s4trMEY zd35cL_EC**&I(I*N(c{3D+x7pn9nz1E)p_guLj;vW~?2;jPQxXQ@@lzx&oN$m>4e% zH}9&UrA}4qhhXY&Wnt41Km;qr6Emdr{Ou+YvR4Ejw-g=3vj<`eG6d4T@b&7TK-@@WW zeLU65Px#taofOQ*Z3%>6!7vd8l1B+MLRXTAFVQKAc$hvV3T5q8*9fYykZ=#W{++(V zHs1k^Es0=1r=5iUa#2eG;Nq|KRWF|cL|F&oE(z<%44w7y4wkSyoukt`T0JAwms8d| zISfiV5lVyriFB^Rs|vM1cR5bpeC|~#gw08Ur-P0*bU$ZxMiDs&<>g8wc$Jo%a$ao; zbX(#$P$kxPgOB@X$nvr4!s~BX5*fM^>>Wz0Jezvp#Yny&FKBt?xO_!j3 z<$M8Bk3`BwNI6QZ24H(~?tU$C#eCjp%?YOF>V6=*(7k5D7 z)Y}GNAb)Sr47t@uMfIWSpEEaLa~;#{qlWXCY`A;^M1F4dZdqk8T;L_4kx%3YTgN>I z%TR7vJG*^E4O2-1fG$2G%cmxkTb9dlcflHvZ6tiS0u>dfHyw!VYw4l{nCmrOXqA&` zd$@#hiN!e{F+(D4%dF*M&;q7=^g1@3JT*fQepgA!rz_f2piKn(m4p**OhGjXuG|4Qy%NEaJoqEx@oy7 zP6AUfc2`z@rgrdrvr6Ys5)HzWllVuztiF+w<+du7Q#zF394d~@Wjq{NE3mP}{ft8d zmsw-phJ==YwN;y)<0J_dNHzIg{PlQ;lXEVEyCjjuYv^J<(IImk>}Oe3WB`dYuCsZg z-=oXtJGj+j9kJCU(zv_|%+m@w4S?wEh2rxu(>MmYBn$^M4lUk$1It=tNpXJX<{CmEjf3;}dbPm02m$Nd+6WRXWaGQRgaVSW%@U&9|wVjJF&vjP$rUX(pDvWoI5WDPCrIGcD4gPPS9z_?ez}hA%1jEn7r0yP= zzgOT%`B_eKHWS22F4f6&lAvqtS-$jvn-M;zva!GCGGY~U%_re_^V>}N;+?T@=Q1ED z65gZB1E5!922AHkLddSYEl2VdHVOw0wr`D9NgL|ZpSb|N`j8`0^iy0?W1>2xtQj(D zX+HK=a@Z>y5raf`-uwksUd;`uQa9E)xcJdBFWG%8fh+FZNVtY}=_4uygv zWJ7b|x|Gg^M|CMnBq2eD6_K!`4VeHeCOS7YUh>uamDjQ9j!JX;)oFaa%l3E|bT z*Q`{7NThPpfv7m$3ohhS7k0r-B+wz3r_|#I8O{zaWuu496(dNbaoCFG7Plsqpt!sa zhZ{Y;B83CeQfj-%rOtJ8Bx@B!d+E|XHkTkjC{WMTwr5rfaWXE=|zn#ytf^mehYI<-lNG+tjF zXGkcTtWqTM-9|B80*sK&_HpfTmM~C@q;WE6F4mNU%)NU+)fk_*HUM;-SGDh!ox0Tp zP@byB7e-Q6w!kf%2~lipUOn~Ta2(rAVR@Z(mS9g=po;ln~4SBmLoI*E-4LLecp#yh-vsZYozkiO-q0*x%o|6T-6o9YG= zi4@)^=nYo=odAs6SPX=oQu(e8N@}a!I_70a& zU&0YLNH}?A|G~#@Yl&x&=v>G7QC(pb8x|rX0fE&W*%kJS#Hu6EWlkhoxms=>x(^~u z!(E8Vc#+UI0k-kbi$rlgJx1zSGf(L|p(#7ouL~6-*=0V`?n9tb0JpRW;KXZDbUA6h zLOfjp=7wfT0GjGjIDX`^N9U(@l*w}Dfwme5ad`EKUG?DA>m4NwIdl@(3I_>Dy1WCw za=1b7XcehiRF~vaI8z*}(5rWD6n2+Hs*Z~6`!RURxo(u{Iu$P9wv1HWy%T4t3fOc9 z0@Z^=t4Py`EE#)b(+Kw*<-@Z1JOZgYs!*g*=$ZK3yH~YA%>zJC1WO{<%r9#MxU8af z+CzQai_%xRNz_v;lB2ojP8ENbgfzDbhj#=i#O46#kSMU75;C}I+6Y6%BJ0LIOzIE3 zdQe|?oCS#_YCOst2}|=G)gRZa*leFxOTs5ACFJ<2%dF1UNqZI2vD+k=Vc$@4_NM-n z>dv!~_Hk5buqx2pEQb8z2fg`pIbn2JaS|}P+*!BOB;8%uK7$NaK7G(RH!URtz^^rH z5}@N+c@oiVBx=zY{}d_4USS6x_9~|k&1SClN@)|SxJW#@wQW|hL27=gmWr}ENv;x$ z39`HG)kYbLINX%m7yS2})!8Imy^ifhvq4e75!j;aI~_^6#j)_dn^T>ffCIR-rd`4@ z2zc&P;ll^{6398LVfveCRjaA2{+ni$zEv{R_P4gNX(7VSdBQii7RM&C$VK5=IsEiH z;@pEopdyaV$PdJk*pBuY`y>XPt_=|J@#OR!&6wPrYBX4JCN#kZ7s(sztj#8JP+ z;Bv~vPl<=i1kq%zJbk=|z7FaT-}I)e`!I z34y9!5TY16gBfhImQjvQB9)7*rEvJ@nUHA&79WpEHKDG&kmyrmeahidK-PnO265h_ zWu$Vu1h4sTm-0L}bh@e9LrA1@DNq-o^_X0apN#rkM>&K2O2SqNYogQSMD(Vgh)uE} z{Kc|4MVg>(uHBn^1;9SMgZj02Z4%zmW!Ks8gUnrAkk$zCSdNhZ+NEYYmk_7MOYP3h z4MxVZ^)+7VDD@b3a)Izg9^pn>MRXAL6*OAJb=`}sAW#gC;$Y#H&B@7Lr%lPg*Oayc z8&eZ4Rdx)iUa;zU8J{r}^JCfM*os)7tNxw2v2dhrKsCpQsl}alI9gG<$7HHjcPZzR zb3DM%j+7wKc&?hmnw?=5vvP-sFa)3ai9}S_fS5LeQ~jmK;_-BT@`lDs@u|as7u25J z0xMW2mL}sz!jOHy5fD*U8N(rs^?2qH$0m!@bC!d?)T6f6(BtUYmeicLt7^#woMS~E>1W0W-|kE(_^@*N=sZSXRs`bI5U9w?HrsY#~Da2 zag1``^*rA$hHM|dY4VJsIHw{AZB7&cQ)=k1sIwX^W%K3cXh9*M@&T}&v(>?IVQ3O3 zZS9MC7m8#)RV@=|BHjMPLNGgo)zFK%!)pr2ryl~+Wu9H%A)e7NPD_s&o5wf?*3m)? zJRmv-z@g@*VA#Yr7t8YJJ$ntJ*PW}OKzW`k>_SbMw8+#4vV`pG+(nwcNVvcPJ%kRr zA|bs@TnR-ul)z5|E^2e}wr-tzP0}V_Yai)ME~>=(%0tFc?rt*!mbI;#^ ziG%D^A;3(^G(DE;*MPsOZT683`!dV3~k zTP?kIv3ZRL+}irT;%&~iyDFm_hU0PS5?5n_xio!EoUWrxG|FTb`Yt0wh6u`jmNoLw z>be8z9MQlq8scaH)TQ^_Jq&Rs?3-acpz)iyPJR!(XiYYnc@j7`4&Cpl7lk7-;n1yQ z(k0gkgzhvR3sxv5?C%*k!EzfoF&?*&*{i@PuhK6;l_egL9aucra)7O6_ zD`VNNBGz?|^E{T_dIL(#m^6cPTJup^@NAy#yE2$F=bDCgzl<+&+PdmSoWU{q?W+Pp z-$b^=1qE+EFNwv9h}zyp<;XHOZ zbYKn48((NdSE7%gq7~g(I92*jnn|Jt1(wS_r}}&)ZVDnR-riR-mdDN6_ja1So#(yzY-eEhJt9qmxKcreDAkNxEb_Ye(5yx>6 zr$$Z&F}xx>Z|cGhT{LsnCQelBsiJm`467h0=ro>zm8(TPVh|=}&L=IjT#-izXuQm` z>gBL=i|@i;|& zwSZCCoKb%EzN6xt-NoG{0dd!3FxcMh9ebl$@92Dxpkjs(PhrIL-#o_kBx2-`cWgdu zE1>hx?l1PS7+qasR)XA?#q|z{nC9XzZK9F)Pocy*NxS)|A(e%EB@89TnvFy+YErR}QnW4x943|2G8=V})F4j+bk=Jij`Y zC(Mm;Eb|&N+38k3|UXTgziq z2<{Il_k2xf+owAg+}^Q z&Z#>B(`NutT5@a&!lNJP9g?=CZcf)xio%rb=-Q0v;fu$*%hQfoVF)QN3bSi$(f~1^ z3!f5og6`|Elf5H#a}0eXNYl;}7}{nPcd$!90VJX@oo)S*o`7k%yhC_j5?gq4fJwMQ z-(?eKKaU3IxK=KmW42M4{BY!exbpmqYR#&4ll6{>`>Jd3T0S`!iS-yOhr13t^ACOqDOz&N~4eHIM2-Za^N zU*!@J(1k-noq0*<{xGXJOmS8JMs>XBTUO0Vuh1#ccbgz764FRjCfDJiuknukf=bIM zeI`KP`DOYxVSZr>bg6OQD%}8<5r@hDOT0Y63+HJA(YMGZJ}Qn1dFfbdDsc%Sm=N49DHsY|z=s^#^R$flw&kqt%fl9MN- zNP;o1aM|?~RuzSbQR=r{@EFfU>P-TfbG~C+cp8sU?)T^A(L);^gHJqGzO5q)lacFo zj9Jmq_Pp{^*d@T0{B&>%$Jg7cO14jF@HVL!-s2Tfb5+kt^f5ElQl;BrhS-AhaP;YU z5@{T!mv@PLZVS#y?Y~@qx2nSa)~6K*&1dP^o57EZymQcZ39c;?li_R^1Ta(+8=+R@ zPlp-SWRK_EB)HFNw&3QNlrqxVTX_*1iMZ5%Ss!0t*?ek8Y^xM*mQ~gM5gZ`^KiXKX zXaXcpxTE)N6>PS9#K;A-xcJabhdC#y-{GL8unax^64ju9zzW5xsf)gsx0c;~z`BY^ z^r;&GWYA45g8y3j=EoVjZ6HyTu0CMib2!6piXM^4q#VV5Ifew1J7%TiaBMB&>xco} z4zlpLO9c%FHo6H$n-Y6()3#H*CW#a-y=Ax17G+I|y%G2>(WKJ1e1@`V z4)N7*TE`-aNKu%y$+wMnNG8@hoMk_n9dRi0*}nQE3QY`#hB;r+SL5Y`n}DJeUkV>h z?bQysA8)6qRiK68i89r?xG(Fj=j#w?$$(%2j*Ye z@ZjjP+_7v>e3^ND{UnqeqTn!|GAtorN?6;PRTW9>DT!Dgcw1N4W!>P^@;OKo3XjnC zMILYpkIvf;c&o6ma%f32GX%_&sNg3-f4+Xu!et^y<`Ai88CCGQxU2kXF;e8Q3_G|s zx2g{b#gp0tb#h~_M8+XOU8h7J@anQHi3qEV@wrd1S@m1M$5x>W`_=h0E)Mfk?lHL< zINuRjv#Y#@7!s*m*}k8&0*I&C!U0R;aZm)(IBS;0$pk@>@ro{*9j`#pH>otPbO0rY z#xTs3sK<7nlqPZ7z_pQpz-XhNx16)u`YsO%``Y~z0=#YaI=uBVDM9ym1uVftoOlui zOF2Jpa(P9lYk!4yItxeZAjR?`ZdmZeV{fBt*D?Td8n5=uHgN+PJdgXla7pkPXSS~< z0<=l^Xg>ic{i*xGUm`qKuBhm^ZB-iQ;Udww&vBX<#l2dT`*aQ%m47E74~SdDIL$dp z>5p}5RZAHuygoiixLbl_r@UfqEdsEuP2aWU>EDgzxeA=84~g5aPp5Ax3V>DS9Otz= zjO&EgwLv0<=b-!PA*|?S8D}6Wk4yc0|(abmBab_A)B_2o7Gzmw^X$9RTKg9|h zxcwcGtt2SiE6M^03LTesu+>AN#?Y;MQ@}`nY}h4%i^N*Eo|`5`;o5(-;3zfYREPRZ zYWZi&=4t!QUm2oM#>UlpXToc9o#}m2PFs^o;c6oKPy0^KQzPbG0!UIb9YeHAqlc)nP?EnEe4y`$^ZTdx+jOgYjr%Yc3kEq`EJhuGokJVnGPy`U%|c84emq zUWt2F)H`UrivfKWrXRStyn~vLckl!bVC`V)b$(z~CxklcW#K~NE@4!Wi4uk4fSz@z ze-4MM$8oWkvbSE5#=C$}1c$mWMz!B*;q*}<0SiQ%vHdV8-^*8BU$FwL2ITBj#p^Ru?$pOHDRx)MFett-l=ZaA4e7i#0){!{GxEyRSm`DDUeC*tGFX1 z=upUKhAMpWtfz*yCIt~6QP~3vvO>=W60qrzx&(5*L-FExM_)xELE)G@g*6yZ^ckk! zcfHp#fb!Ns;}KfQtm-+od%R;~>GyRY_u8s7E>DS1*giQwB`W{lC8AnLpxQ{V5p_ZZ zkr_GS5s!6HFrTuue6oXXH%iq6=J5`ue1Ih7AlgrfT#k4qOD|uZd!-0?>~0)Zvr6UA zly~Sbny@e|tT7s0U~DtDZ5VAUc?FkH!?RQdXjg+FO40OK{{ zv-3we)z~gxeg95|6AR;q?7fBrE(HjrtEZmCTot^$CY526pmBu9##%7p35vIGi5>cL zw3DFmZt~V<4)$IsLmqbNPv~&|ux%tZ;7wCkwyktwHxc|O_4yRx&*jU>Yu?WAAG!mZhA!;7dQn#;DMElcZeH@H|$C{Z9oF`*J00U z9eHjvPvhvX!*F>mGmK-X$;p)shn$}nrwL)RoSWlTkj1y@Qq$bQ(9LsJJT+Gy`s0F3 zNa~t^sz3?0C_5Yv13lKw-+DtoPF5crG@=0`*EiOU^f}IJ2j@nD!jUP!g;*fg&a+_y z*Sf2SlAv&o5RR5-sRYiw-KdJY!bL9zre`3Der>lm07`RKXN|@iKn1O5BuWSLVxZHW zuJxo14s5O5^9WFQ@JR0iHcxUlUlB#KPf8X;fWE0(gmw114><+ox`zNS`$dAjF(`IQ zWkckcuMpmr`o!nfP2a^oHidVR*Nu1RC|HvMsWfFZzH*uQNI);+Wi7{?;0bezY;&e0 zb1oV=%omCCfIFGMQRspMfCQc~sVl{gT3YYWUO*y!%LBUAi9^2BTO7%CmauySQnz^Rlj6%o{)f|OK% z#>Q3zJd8Z>+s4wi0H_(oPFu$174atfMwx`e8q=nZ1r3*ZKL4mWr-p7dlU>3-CPCc{ zljE%S5UQBVfUB3pX6I3D%I+Q~_g66-p)yMM5WrkI-4sFqCUgP>m|?TVFBS|jl|jX{ z5$Ge{`Jjm@p5MSc$Qxfd$GrHU;rzA#qqgHLm(rCq+_uy%Kse0%2$lteHXtii$)xPO03y<3tc^%Ioo>fTiAzi$n)5@HvGsGL)Upq}sHY?C{WrKi2bw;0cVff_m0aRe-J z8C#?V;@)`q4q8Hu1(Q1Fv)|!pKG2)-%wTIwq%R72y64h-I#K&B-Jj12BI?9qWSS&r zJiiR~7~g4$d}A~U#pO`)*E!yReY`}%c#20OIxDg$NN(mB3#{KCkA#9j3WZ}91HB~UBNj9Rpj#K3y%|6C0inum$2zT;8C=CF6-{gFyOvKnc{0uFmIrJd|rZ<;q4V7Yx>qczOQeLnM{WhHg>3TVb0g zxiodHI$1qpJ)UkgL)GGgVU#qE=^v)%)P)V=*EBKk08c=$zi5yl7IV%f;IwVN@hLZY ztuN>n@WANncuPFSgP9l~<8!g>fLD6@65V!mkJb=%etC#}H{J`d$o$pisL|`KP#Au8hz4B^CVRIEogu8=DZc z&0l{+)eTL_YOYrlE2Q%SQ9zgg*N502qo zi`e>F9KycQ2Yzt>&&D7~t=+NP#%r8$pzMxK`b-f-vkja2?yfyMTQ|i<%S;M#xeGe zMw?Ba3ix_K0SYYw6t;HEXzwT9#sU!EFYpK$Q)lV1Tb^U-{%xnlXpI$hPlZWBUld@}T>5<=_9ev3z}>x_9{c2off14(36{ zJ*DMMt@p`9q58X<9rP^+7c(PJAF#{5fQZ_CQV19O;vh;XdFOh4<`S}}hvC#inO(L4 z5UV$giE-DD!{1*@lcc!ZE6jR2g?%o<>e?ZbF}wgOoa-8U>;XQ8-_g*nr{5QP#Z0SX zU_>7H$9*)+u^qvEIJ3p8sZ)X$z{MGT?!(0ZE@^Fyq_yhU7JLBOhtA()_@15LpWbjj zoclvrg0v^J-iPyN50inK3%Kzr&?x?A!M|g8&|pnQu#ywuG97RE$ioGXV>q<;Fx+p& zzQ4%3(N%J~vt+-IJ{rC5Q|AX|L*)=iRxAM=@~l*>g4lFU#xJ>cN^K2l25)%grTg=B zdpwSRkqU8d4UeBZTPKd;=f}q?=K0m#j8a|$5V&u47H^O7duQ8y`of^MF)nmo{i_d& z(=lH7TeG(kn5}C#T^~^?Jt>ZTc&zKg_u z@p)_}yWRrrefE5}{70IrYln%T*rp|T!oy}Z-YJpw`e_mPO<{RF-&-H1&x+Vx_tM;U zuJ!aR=ai^~e4PBl9@O%%K`C#(5o&@SW?*{GT9fk+fq$*CH z4VzEQ8qhxGFS&UfZ@sju5kWVQ()BQu)>_(P z$Wj`#gYVo4cYxm9e!S%4_LcQb=t37|fVVjPCjD`X~)A z(UBtwXLDnH4E=Gfkn@}I?!Q^ED;{$yst%8j2h6$D5)0l}r`5@4-)$DKcrd{zU5JVg z$95HKPG;#C{uommo`bKQb^BQ41RjXzM-#M3@*HIsK%PH!qUXlvl-K5Tds3d`9CH|@ z?#R=zmxi1tBIutB=A=q2a0q8wv`^m`2hQ#-AX<>dMiK?>iQ7SsclnzQb@VS3L(hq}zC3Cj!8j4o0-S*AkkK4U~mY zF1Q-(5W3I)jAK6gWsk;7J!B!YTce>I6N57VmPejuYzEQ<+C|y-0rxVy%kKAi?cJ2M z-WX527+gd*c!;PQ%f-;IaI*ni(ZPKMaJYEJHO%p)#>ewv2lru&59SIA-ZzKuH>|eR z)-?i*c6)^JsOw1^=Xjk->+w-6K_Nb{i@H{SULo0c6C;0)uQtq2Vt)Zpc(vPc^ZDm> zc$=cAM!9`Mg~b!+0sLf3`Q55W!(A+tFiMQvvYgq%-R}9H$?QDP7N(6M@^tOD@DAKK!!# zAo{Xp#fVD3#`9EmN1^fR2p=J#R|8gD!0FCH*m$zDC$j9Go@MXfQo-o4g3 zKQF`k_1gWcP!>u?{tK8?)sX>TqMUN$(yka_H^aIZa)Vvey~H6vYn?^wlQH`ZSW&)e znNLg13`|&k7_U|KMY^eRsozh;=RNdY?c4J-zK=(UE!xIVEG&n!n%cbp5=_0F^nA4! zANiWr{|rc|u5YBGUg{`0yWb97oqmVvKVQTovAGuOc>ar_xp%xvz(fpc!ZZ|&ntaYm!3ZSDaU6w)Qs9^MwJjBF39e)x!@73ktBc{QLF7c zB6H(~snZZr6tYhmV0XHE@2Jm%<@_wm?EW5seoIsdN+#et?2{j=1hx*Y6f=PmhkBk> zL#locPvW?(qszvc68*+@f{}LVf_?$Hb4nN`0uZp~S`DzS4`}8dZ*ZK?MLQt`BoCcl zCt0R+HkIw$3W}U>=qhHFd^tv6_y#IeH=f@hoSo+v{hk02FRS35!MF>tB#Lu5$AL%9 zASopk`Z{E7eS>2h02;N^wZPq(+x$x3Ai@|H1`!5QjDC{`xrQPcz{3GNi7EGz%IRCF zmQ(&k-hF*tKl5`;FH{r?4{Y{jE_xhRqBZ4YG1NTk1RZPBsBsNPHKwz*Oz!LD z-eh++2`IqCG9HBW2=@rZdoRz1KDrEmB_W`PsqgYQA5(!kb(fXfKbfoe%n?-nk}Uz# zV@mb2?=un~y`V}zvcbm`R7iZ5XN(6Rmyx48oQf*_GONDy<^>ZWpcPJZ>?j*AAJC3l zG5|?Vc2j<^cGU80QDy!*yrZpW-lk%B9#Z{Q4M$gUZ$6QU`cqIG^9Pa61uGp9kZ-69 zy7`T`q~j^zsH`0V5DApOVSCz8jZgCwsPwKgr&WSYfP`o^JH)8F^Zxt>8QQ%aCnc*L z_XbLqkmFpXpHANt;DC-P(Q)J!B|E69gtBa$)fDJX=dR^KB{qqc;c`7i!Yx-i1o~FM zAy7@404>{62h;x#3QmFZ7m;hpNPwE-YCU~x0T}|uoNuVxH6X@Yg!Vk+< zN09yNGT6#DkhrYdK1_jQk5C~pGI+iEN=S3N#xRGg-X4a{GGoNboL~y^pYwBbaXcUE zc5G_!iP}o#q5(lGB*Q%YHe=OQxavqQe>}Xa*zAb%#~Xy0H6@O@JyIi5Vx?!E??N-6 zp_V%`^Yo1BQZQtzx?-8xuvH12B)Y34n5mA-R_$Ci6pzxa(C5bso`*&?zZq`Z1$WKXeVoN{9>X61pbHqr+e&V$FDI%Pf`el`NOXAF zdd=Wm4{TD9P9u&N9vwVe_oDc185R_9OcUW@6TH|)+`&#?&Y*jA z=6pLIm-}=g9}q_0H{i!QepoL~wdRU~1WMw0u`%lFtsNd#Jlj40&6&C4A;iDhNmj57f;)D3FTL)`q^(+=s1S! zOflSccfSCoDbmU1pC5lTIcGWDt#BpAc-XkF&xwGOEL zMuuZP)i7MaH(qn1pa4(V)-fIqJ;rZQ3acV^c8{BZPS(hKS6Cp}bm&&%R<^TaPcR5+;nt!Z{>P)}U!XzU8H0F583j5^4EY_6SW)kLf=A5!9kcjQ8h$WuuGY zlMpX*Eej8XDB>CKda>pTK*au!?a^Iw%)bEMMFi#w^mBuHD+lF^^?R6qPQi%~Xf=A! z0jxG1L#@&4`DJO6P@z`6cI*3bDxc@mP2yubAm0Ko6T3!yh@vLIl=JbnZLh zLQ1V&W4ymQrc;Aos}ZlblC42>a?rNxWG?gu8Bb*p2=rdN)~sOi7iW4vZfk!*Bxm3tl9a$^iTUmj8JO2#aFnxmb3oiNp9PT$}*w97z*gx^iQq znhxE9E(jbvB}*E*#nm2X%lOLGbgL|lN0f-hr#$OQs9f{eb_c~}e61)5IK=GS{0d}i zcdA&^Etd)NNL^|&8P7kz^D3`WyC5zCY3|Y(BlJ$!yxkkzpN}Cjo^o|kvmG80-k;Au zaefRcBw{#=kmX`oCmX{+R$v!7m72Eb#Y4dXtZgO+#;@(sz|i!m7X*ScJX^juw&(1w z;|iKR?RtpxkOSg*o;L@~IPffN+tVpm($+z#6@1WP3~~PDJRYaJ z>q;-H$D_84=LffYtB%+h-#3TvdtYK^w-1+#H>*Q+nF&%zQ z`F-ww-Oy_~+!}G?C7`%%FmkZ9s(H)S^c1&T%7xZk*zwf@b-KA+3CVgs(LR}Fp?%X< zD$ntb`EW*SKB*RCVSKiUe6c;F#RHvks+R$1kf2@!o{l`oKcM=oUR1#{hc3IDweh9` z)GEi}PUd)v-1kRNGd}g=JS*O9AHEvn_ltW#FhAUU(y!tU2p`itO3T#sI3N4JAs=eh zKC1=e>@U7s8*+15PnlNzL4EkSE)4f$W^GV9w9=k#Vi-@oN;?r?o<-YZ`Z|%0<(7nF zmm3d+$wd{%=V{R+u?}w+a)EH;mEr22bfIhXRpFi%>QTd{-spZNQWOQ^v@*^4EKn{X zVm@_k0V6f8x{obynd8BPySi)$^N*3MX{y_RD)964);7Jyn|leE@lHG1TdqDRPAMwy zv_D@8VLbI}bgqjJeLTuXb*r!G0D*=FtN=*do!Q8E#`MqAZnGPodPNV+8i3+ge#iI- zgMB)%i}9&fIIgKhIy||F?R$gAcoE(J?|qT7eD`XuK@~GL-xTUHtJd zpNG!gZf6;9i)wuD zjZ;e%7h*BFWzmPYsDbyjR-F=4{Dhn}EU6$i9tv}Rir*N8eaHDcTSB(VIqxhWb_Y>W zX4t-*aOKBcVyf>!Yz*%^<$Wsic{bgIJN6*BiC<}at@ffj*z|leLS@BrMobR_a9hZa|@9cjV1$bXJJ=>Y)%eTP-&qL5V><{m%27tFW~INWRAAv z7~fLs=junxyL}RppYz#2oFa@;y|r$>oV#KTI3<2{%;zEdLtPkePOyI8KylXsUoysb zHF=+p7AWJbSxroWgQjuIYYsmP7)7C64{C+7gq7-&b2w+QKV61yJQ+DweGCwWKsm=R zkcToglg*V=tO7=rxdDN3_{;6bNc-;|j|;A9)=$=sgRUBNn3~dJ<5Mn&0+0i?bM|X& z^#F{ru`au02>P%_nhsf>!(kD`NW*1*xiR=+*rlU$oLcFXX~-;?zEe`Y#*w~^UwZO> zQ`u}yHf!qYM-M+5aX+=&cSPxFS&2^G4x#uo z#@9`@Kfk<%|FuOm{0K$h(I|Waq9%PGzx}@3mW_6^t2-1L@TZTJxgO8&_ZvLFci=zz zvJ1d8GGiEYu@acp_TQSt51gy8((fTW&tDWfpC2m`219(u(PG&F`RDOxvQoE4kJehI z(&`e{#u<-eW%yzEGJnJM`zU>E*IdIH&v~~~yjTVq(^ zuMIC?IkDX}8j}aKj?Isq3%?sw|CDG9Ukw-Dz3DYRCjta?V@Rcy-80oW{XRahE7v&V z>(i4op$)qJJ#q;LZg~-u<0eq29wWn1NrO4i=LLAg3b`naA{>&7ge8k~D6bi{N>tYt z#Zr=}TMzi~;j>Q1;2}*4$U9b%W0NZ;AVq+dPy+*!_l*TP*}m*xTVloeQv5* z&b5$+Dg*MPmVXk8K6G3=@6cTN^SKOxI5(pk4$gMiC~lN_Osf0y$D~5#3?qs7QJ%3+ z-i*B!q>m7wy5*cP4H5vCdV+I1+gAIiriJeBfO}fFKVdK(b|9K!`FMwGnn!xU@o}Zh zgM_MH7wh{>`g6X6V?4PQ+bY@2VIno0Xkb?K+NA!XS%+C{2WjS<>4{SQN35xC0Vn{0{J;&RXeL9>{Q*XQt zf{RpgM?D46xtI>AVB@_5ZmF-9^VVWDpTBrAwFsM!_^Q|!1oTBB^yV19e?4wP>m(>YU5L`UN-xu5l^t=Z^_@4M5mp5JcL zu2zH^H2^Nre>@&NcMR{mV0rWfSDM8x=%#qy9Kc~2gILyhGomBKEN(+6e~#n*D$<&b z<7XBTSwWcr%+`dm%D1ScfT>i>WBqhzq8f=WO4#k4NtHBXe;w{k%#*kn*)&_qiaYDTR2lb(C^w3(;S#r3fcG;O#tz5h@ddTvkiJ*I<8cT8$3@5@FoWUV4&`X@!n5j1_; z#opL{DZc#e*)jAbf`(?L$-XW(Oqn<|v2I5}n*x-vr zZ&6@wE^&ZYTi^0_inPYLjoD;ro-}q>t}NG_lZ8i@E_u+-v_DvAd4Bya6Co*oS;H|; zSI3$m^>f3*=5=}imsEP+4$0N#WHkJ1SFZ^~6W4I_I&wIyLn1fm1(eDo1==dlOxF~Q z*xyhehw&zb4icwis_MwY^@;Q6`G{sC!3092arofWJb;0+Lpct6I04zkgQ{9MJlN-v z_&_32iT7E786gqL0EwKl7YUq%Hc|P`07|M4$mU}meVdjd_`x84zYhIebP2hjLv5OL1R zW*mW_*6q$}D)&DOF*6y}4^**w-g-x+NRE*NG}*0NM9#RX2-K`59du%=NaK_ZM|2Jb zh%>%ux35AXMibeI{izGJ*2L-FY3f{s8RSjvuXGtQE83uy$4)^XYo`GEX5~E&J8*_} z_Kdkx;N99O1bY%R?vzxflS9wWJQXKBZO1zDOC-#!Mhlj!E~%yVc~^uSzp*J#(Qw)h}P=*0Ur_u~TM%b5GLkQ#KYYbbt z1EihzibvxPYE_f5gY3f+_@nhEc&yQV;6kLZBQO!!DFK2Xb2Hb>z$Ge^LG*GlY+>$* z#*o8!R1l)ZU`-No8uRV**~907R)XQ(Kx5lBGa#YJ=brV}LN|OjII}!4=-5f-13O7} z+G%jmhD4tNJ~S)i-*(sSxh{7I*ARzD_q=kn*}1#a(C)fEhfH%YJC$@kCHRD69gMR> z<^r9X2z}@X!SxLdipR@M0)^lKT_gdM16WYx1gVk7OM@hOK1Mqd-S-Bh)7;OP6in&-h-tCY^1c4&_D)7dF=YAm-hZg3^J*{HZz^KjXL3+86?qb`jScHyUce^3d1;F z;o@A)_0Dpo#gQiCfzB3Y)g$w><|MSUV?lJ44n`d-P~Y#q3XZ;A>b_)OPxZK(n}*wC zM-MwyRlxQnfjZ%m6o@W1qJplV#|d-t$E*Bv*cWqQ2Z+N{_)dL+?&1v9ND1I9jc=<1 zmXC1&I2`-e{Yh3)r4Jp$L@&~H1q*eHst5Fe!qOp<7F?gGV@g=+JEiqli1qo+W9s5n zmDD<4tSNDxtK=DqAD+bD_IZV9!L`Y)w9qZ>3ycv5L4;zV^}2DK6eWwjH3p~0-PXvh-h2AZfDXoyOfOCvNY*NVav2LJd%iPd8b-U1x9$Gp#V)jt zOZK3h6%|=38m=N)TeV%oMb1}YuL*9xuyU}oaCR(3%m*f22PEDjtVN>}U}5(z;_V*< z#wPAIM!X9t8l!siwg7!Y$PFH2qJ=t7v10J^g89U$*mQU(v+C{0N=a^gP?xuNvt9`k zt$4n@&8;9nJS&S^?1t1oS-ZTmegt!U5QpCLY`r}z6BS@1b#|d}tUc=n!Cb32RA%zp z2Jx6VV?dO+jGis9$5G@E=az7xvkoWWWB>)o~ppgMaMyh8;IkyD_> zI}v9z91N^7(;gFy`%@=bWMx&K>e&|Dm2%>`231`8KG7h^oo<`tzPfmJY+R-MI#gLrB7V%BB1CEAM{s+zj&+ zXh|s)M05((;VEXSJWxwH!+CPAC;ZqpDFh;kln2JCO=yQsTIrA@ zlCRR3M?f`&yK*w7;WCpGaJunl1z;)(iF~Y$<2(E-BUt&62$p@Kpd4=NcKB+e8<7(r zJG@b(JXII6q$$;t5swhe*eEpj!nAOJjVeHE0`o0}dZ$_0lzT~WC z9WHZ%m6yPVxa5U=OgF(fY&`>0--5<6!mh4)Mf&E8`iQJt=OW<@@JM*-lN{4@hTrp< zt;AElV1pu)7V>OkO~mrp72*Fl{82O8I!JwN2#XkU1sdm>6XeLX9?W z-51k=fsrSU;(wCJ6!b-IHwT2VxlstSWuKdyFGiB!R_i&?E_9hyU*pnFze0sDBF)kz!adClQrP)In+N}n9q%KlZ3w|CbTxDy>%I1>ivrb5 zy`z31sJCx8ObKXwNrdRToG;L_609}iYyvxwa7KJQ_OThh$clAv-~xqkBN!fRew5+xToeZ3;urR-OqqMQpqT~*X) zJ;cTXYjCP1Tn@QVx_q(ngpJ}Olc;k=ncpFXeO1OUl{$Qj6RnnM??`GD=3WQn1 zy~FVB7Ad;uIwSCHNl1@LScjgEelE<)FIIlm#U;+$gs8e6A~`&;HtSR9yT#Evt2BVO zgw48qRC6J^Yp(dA=o8*1k*0OI)CbiMl+9y=y+7Ab9|Mq`M1)!wdF3nf9WtY}Y8bK4 z_axy8Sm~%Lz;w^ji}T=_0*Q2uo<}@$qtfT`4(IpC#H!iQ!v<=(@EMl>|B}O8nP3)sVZ+2Ju-PpaP!AHa8tb_jcY2%8*DwJQ{v>R*+lw?pi~0dK73L; zQBFB;eAdjoeOE8 za?X5wb)t;>%-TfnzF3vcRYYm9deks>XLz-QK;Mo=pMWC3bo*Xx|M09pSn*tVMHLdM z90!1c!41vt#DGjPj$?BJ;<+x_QFqK;X2E0(uMlIg^ha&2JB{;4p>a9*q*-0NIlY2( zu63vJZglaV)H}T!iSv}hZ_TPxj#-m4kwkw>li6pkh5*Q9-pRYK%uQK{RIhFtv(siW#!W0ls)|?8*k|GiilcqUG^SV)3 zlyli7R$WUXp>Bs%$0Ck4I1EW`zsI_32P#=1QSTEns~)j2t4NF`(edtEw%c=Q@PIzUY<&G6U_SEp))hx?;}Fr9lETPJm5i>f>`LLLxI;I~DnXgiAokwDC0w zjja_@SKI(-ji+zk7P4&t3WP&|l`acGh7zD|tck)4&&Ud|0;fqydbZEfCBaQ0wRq@R zuPh{=ujsCGyFfym;p_qWxd{4MhZVPwK-z}wy7UW+&$_%@gD1;?%TFS0Lq@Wn9NUD2 z_`@?Zsdq<(AORezgRgKf>GBB2r8^TyB4tZ-l|*CdCP!2lIhRqX&CHXii`(fg6bxm^ zWlrrWwU9{N7OX-|QACFXOI~}62C(prz>p1g{Tei#uh7@MfFU&4SNu}A!{;P*rDQbW z3$AwXu)%5(B%JT8w#ujVU-nkIy&#oqVJ$p`%NE_raIc+p&1IbTK5 zf!Sg0<5rIgkH?}l63n?v{7~y<9n!X?4vezRje;YgGe*a|+sp&DdB?-b>v`#01W813 z_`zC5x3Laf-a4;U<4C0PKKg>gah@-p4eNXEZucGHib=3sW_jrt6Gl&;BWJVjjqvKb zAR4NjrpZ^7fh-e25!%}rI8@38?2*KmNah$XQ%B4+r!*cslEA^17sHipEKgX+0*N&4 zSl0il#4$cWRvrI@-Ttw?P2)Hp{lwL^#@&wU1w8B?XN02mHjQiaWQV@zg61FE@OS5| zHs==6hEQ+-fjD*9DG;G?yuxwoYmW&)BGqcx;q>VJs?jNtA1MRG4s`y+{CP9ZG9K35 zPdXwBHUS=*&DQ8LC&iDfSC|8dd^#T~Xt2d;wc_EiYWABijAyf6tKOP0#?4Sus*mu# zZ0AD6kPRf!7iGH`;E2yTDS9jk8F+aCf#`3X06;Jgc*t)FD5a4|-Hv@1*?_!RSQQvn zmC=ox_9<(g8@QvW=Z&Rg(}(BL-f1~Mz;7Ybbw_?vPrE)V@SEy zhAD7ly3b zh0^FG+1yaz299^grb(o5st0wV6DDOwV)a@%-%e{B8v)){LW^V@HbvmHsct8cNa1}_ zz7KTZ1;3PseDo5poh~|jC8b)gSEMw zwROa?0hD3Yu1L&Mr1HVpxsK(dz(_V@;RKyY`VdCE^o|vh-$Fwqs9g4^s3PcJ&jyL* zL^NAjMjV^>dPQB-Ak)ye1GWyVRE+*&*#LTQ2LTN*To=yM>>7{eBSGU*v)X>Pt1wpy zNb```1ZZ5ISh$!z*Z9)>PL|`!v0Xb+0Z2&#@^xBw`tu7OhT3AMm0u&8 zt0g?WBZaFWkU%XviBo^|9`0KudlN3>+8|KWd!*B)ZNscq8O^t(N*vVIYP%1#FGF3P0wZ{U1tgWEiEUm4R^q2ysmwjDP3YI>_UxQV>8QB~+zF}#&`W)*I(6frgbh67)uk&ftXBw~K203Y#_7t-aOzTl z%R6@7WqU{TgVZevnVjng@odvVba9;TpehobaKX5i8LzoYw3qwBYb_y>zDgEg;STCJb2HhRiHmUAxdTJ7V zyTX@nJn!-jAalJ#rG-Q)7clDER}h)R8Or^h`)%(iBMnoNs2mOeQOi`vQF6aau&Ssw z_Kr=jA9dcq2AlWZnY#e+Q~w4DxJ_iLXZo_Y?na%*%Tte|l(H(UR~51lovcv%|<2z#)(}XC*B{MgkGb;z1C--2#(EMZ5KH z{Y)LyH>;RR&1K(iRNcw!R3wuqMsYI4*@E^{`LMsR?eo|G7`nwo^wYE@@>0&OvURCS z61sh}K>%Y|W9~^G`_uh15)4BTnoH|8m*()R#5!~soEDg2zz2f8Q+EyaL7?Lu_4Ja+ zG9&`7LSQNw`Q;sV-l4tlM0$>t%P-YyF01`#>p0)h=Vru{O#)TO^i(vi`*zRRdxs}) z-}xuu`54vur!R`C0)4Clsm6Om%jvd>!K=MBcEa9I!1oh&;VFAzT-1TwI#DWMOnQ(fJBLjdSs`nJXd z()Z@bsfFE7Pf+*Lxd!Qi(?CLNk2@08Y{nNgw`S3Yeag$m$_=F5kOZ zNuYi!^>9J&5+;F$MbboTkf3sjvf_acMsT|GFg-MqgP*dR$~hz;;l7chJ@X>rzRfWy z+DaX%ymnr}O7?ZZAo0mdqHRM`C((6q1ye-;#vUtYu2k-lo<{wtz^XOt z9VP5sP7=NhSKD5M%}_a(XsH9lra%Ty!q?imyQt7P1Vp-X;nm^pttBpO)SKoE&O22o zpOes%KiJ%Ox$Y}bXz25@aGih;@8E4Y^dusWYN?Tj&sj+c&xMB&BIZbVhxkfpMkfsZ z!&W&N9CZ@?APZVR9GP3y&sCi7D4xa4iAgoT_sz&zM26#6UP*tJ5izHeOSw;(PC?@G zip8R%H26ZFPD~(PAkaGtaoxXENvcoVwlRhRL2)D8pH4doeaE`@whjJxhxhm_7SrxmTK5k8tGMS_8y1?#3=vgc>oa=xq-0B4|#$>QJwm?`}g%D;W zCy~Ntz#KMl0l`lf_)NeAP7Z_V0fPR^xd&dvazpL0b*kNV4kARFjANX*FHYL5(_`>+ z3L08%Og`$4+Phre7exp5)l;gKRu{TC952^7kM63>MLMgHi|L?+EHu>5r7I6al%Ug= zxQ<)tO7$-QBXK`D%0OA>_^m+42df9i^6ksGs4qHEJ%o5hBmcE@%)lk@BA($hsC%5x z=f{Zxf_V|Um3TEfJ*o;@;{g4$o#XRx)TJ?@Z!DHiu_zWfOtU7HbYIb|#C0s49+2)F z36m5YiI?;P-Wbho7G{frDkLiF4=h@y>cI zGDRf~KxdZ-+NpIY2n=A&4|5lwqXL7WOo_Na+l2$F8&ii!L}1Y4p@7uAJOMMUWpOGm znDV}@Ib?;MZX&@H$Ff_m2|F9(rB}Cl2 zV^g`}>7UiDYx@!TR?y&y1vzMg%2_d@qB;;LR{eQSzHV;`e_vxb-o8~iJ;Am`YToaa z>p{1Gxo;JD(ATi!p|p~~*h=xb-{V29`SPS}5`vm_O3uJ9J2S3x>be~Sg8J}CXKrdb zK?E25=eBF1E~PyANU=+3M)S~Ew5Oy^LI>sR7QL7%McQ-C(C574=DIzQ&N4QKzMrtu zS27bwmcj3pfypI~SX!X0xw)BVY)qZKbWQjg8SczrjxBb&l+t+JQaE|J!u*m`+4=FB z+7#_?zLIi(qI@+F!-(xzJ z*!Jl-ipJx;K}%$R7O$D-GJbo0SuNJWc&v2nJZIYhy~HC`@Sfjz7Gk_gN{UmicS;%X zeEz*O(D+1!LF4-{89<_zayf!$>d$zDE{$ruptRA=@Jm?^KfPw(ef`(PRJ?onCy@du$06tkO*gMi;1MHEzmxICZd zITjFe=9q2*HJ{qjXZCV?Lw zsV@K-PTkxw^NUFaZ07jA@o$@wIg_AocA*y^bt9ZyB^IU2!2PrRPXZm}c$e&5mfb1d z72c<-`YHqgOewG;w{TU%3Y+k;Zj@3B}$gZJV?5*Gpmx zZ)QfKpPNC9gLRLfV|zzUZ^t{(Ki-kXtDWoF0lc2d)JcGW2W41Sk)t6_kl>T$IQIT> zG$e!vy&4meL^>Cr)n4O@r=g=sj%CP^GF&_+0gg(*^Nc6ByiMxPP}$qsuZ&OOS_O1S zO5A0XW23NS=akCZU2i1e?tv9@3=Z&=*dyciijW3mm4s|xjm7bOV!E4CAEw>6w*EYZ zi^Z(N6MySgaF?maJ02Kc@nV}*3a7ZPnVQ|@_~H51J7nMghp&4}lqEOLD?Fk7K#8_w z&wpb67AgT$MYb&Z(9J%G#3k;31W?#l-vGXqPSQZ8ZOkF%*^4TDMi9SiXXAZDOh1W# z+W?_#{R4KUu{EX3>ZHrujLxm^fN)VrjP@MNQimJAs|oP9%+BNnnK)BO7)=4hMBs9^ zet_`Y={4lAXB$QMDB`$t)&!ju`GHo~qMlcW7J>rE zA#9I=XOj1EY}2BP@@)2_Oi|dlRiaq!F_nXVDsff?7CV(D6l))GJS2oSa0hAbqZIZ` z;qXln!-;`{u#ND_zYKSY=$nFg$hD*BUIYM(IT>OIEx5{|50Fu}6%?YP#p2OjO9|vqn8i9^#knAY%o9WjSCo^6X$QQ$Wm zp_GX1vqD2c2+a;%pkh=Jl!HQ-V!w|p0QIt;))#~=wqF2?$WkGvup#~L!rhLG3riX-*|&SILt-&=H(p! z!9hQ~!?=8>@d{ZYA8_I8WW!(11PPb3L=lREgB6YEu2sSBu50;QU9N)1x=*=|-`4L= zHlXj!(G9#_0R$W6h&k}04NE!DRo!DqaG zfV@@(H$8I*BHMZVhJdQUs_nc|jk26Gg^r#-u454>+LH688H?&Z-y!uq2@@zVfJ3UQf8C^ja9Ly$L0V{FkI4zLf$~%LmH-n_g2Q3D2bS3ZbC?KSGAA~F#`%vba1RNeI8VJ$k}!hEK-QVO(_AKq+m_~b2|LiM9fIZ zx7=${wuBw`%bnBl3CqsLK}SpiKZAnJ2_WMHrc6O0?i@NvQN(XSD_#T-{U8)ch{XRG zbO;gx?3R6lvFlBEbAy7Olk!js0b!w0aFvu?BJ@)yT2mBrJ%TQ~ZR0qu((lKhfZs6a zakgQ#XB!j($Dv**x(cb-8&>)&wkk2#%YZ}w`%h?yq8y9et&lz(xU};I^}hI@C~({n zKp%QjYNl8=_Nf(RpnF9J0fv|Ixi=#Md(Y6r6VJYVuNg4hTV(xsCRu#J6{a{xtIYCW z2=Lp@IPc!eXGp_q6Wx7$rVtLaZTuGFh$8ELU{dBm^7iJZIs);w7(}V< z2h;ydahxRz3lil$6ji2#jISx4cj<8N1E0fIQNXu#5&`dj+O$j&?y>b-b%d$rv?E{$ z1xVb|6c7}fd-PeP4PQba0}ThN&^g^P_+kqP8>e4D1{8%Z5liBHe{N!Z7G8>i4MDux43API61QQvEdd$@cGh6l3M>X9z7Ni*HW4eI$U zN>X7_foxSB*yr8_nrS|YgVs`OBB?6bWvQO_cZ^PV*r_PC`f=RMc|`*h%OvOnr&e-jb)Iq+T%Z*t>V+O4bIU&6RjxfB(kP|@ZgrZji=lm;35u;BCi268#is1 zR58M54j~^392XxdM$%n)<}kPNjC)iHBaA{gTNnF!I;N21#qoPmY)p&7aZv^TO0w9P z7ssDpx1zAXD2@=G5QX@eA5bitP=X}vr0p<#QAP_BVo*T5p-n&S6>Hus$p=c{=qOSw;_n*RNq^2@IV!@DI(8JNE@%L z>1>19YRJ>_&Y1~TUlhl|lA`o4m`w&pMz9K!{tt6(84-@fzhJgvzj_Yfp6`td9`?rJ zLhS>`VOe5N+w$in>f+=tisry_hs2wy9*9O?hwB^0`z#YESX+%C_KzC`XyTIP&XP3Ob8AG>)AmO%XR%ZDkWkI z``tz%%~tYUadX6SYwJ;L;nFy%9<)CjUrzz(6+rN5%u{?~AjTB+1MZ_@dCU;Q15p@g zrh4N0Adi!52#bo40@_q~nJPhqOPH@InEX9OnLP>&R|OSQDPeJ-BP0fBpVUt{$ZUyG zqj1wEkVY%Y5X1U}&o=DRKKxOYa`~KP6SYq)opb-9Uqz(KP z11q=8(7vqp5a2L^IL?#zwkCHl%aFoeh`_TbShZaQv;hruh=|ePw=)nE6P-mV%L;iy z+9VCVTe=#Q=EmjGTSlbuv^U@zMIn#)Os zq=^V(IGc#!Jc!B0*^-(&0H8o$zXdykB8Kadi zHMK@;3PCRA2x@b#(g8{(j~|I z2L->et)a^h@h_}R__nY!CD=DG^1Ld=aZpg3?txSkt_*P@D+HKxJk3i{5RX=cs3dGUfH5Q1CeJ`luBZfXmz$y!HmBs3Ckvgd+#jVho zp->^Pt!S9WIx1b0lcM_LGl$d!K@8_PKnjXkf{Pcyu_BeB5X5ga$W>r-@ULAk^m_() z4nZeZC_Iw^sRB^Erl7%xef+b12evsbo$TmH?$mI`Yg>^ZMsS(&^`HvV`KDKDCUiLC zS^U-%zkR&-8VkZ+Gh781pRykrP-_<;rLAy@X{TiLXBRU0PAYy2sn^vZ@-vUNGS@yS zHChC*yB_m0cdltNPq=!f=&I`Rf_uVU1acsWTAiuyqa{asQL-Ks_zk8HAYcc9 zBXd!oPQ&&csE7c&MIb$p$n#_FBsid!2B~~yNE;gq#Y9mKF$e@Sdr9o-zyHL82=s|i zB-ZT}>L|u-@euTgZHq(@i1BE+UB4`j82n6;PD5=iQrbFA726rby01wj_Q@Ej{MIhpVgyeiNvY{$B*zX@#%$ScPp0l<{)O zXNG>S!&RAHQ)e0}j69(#hd?%U}W zJC{ubSvOuIJXa`FCLvNNDY`f>z@-)Ns^tbbZNlV^=Nf!tCmnfPwu|_$@IS z)<}2F5w<{$nr$TKP$GvWop^2jxxtazL#d2U4BS$4(7n3w^S0!Y|Eu+%?PkqE@X$$a8>JO2SI779k^DL>_u?x434vla>iqC zH;!r&ry>&oU4uT$7co12Ns%_=oX2Z95QmLh!~v$KS;a z;={1Z^sAq^0jB9?Y*$~$=krcF>0z-2gHB&(5Gk7OH9+p?_xw07Jiyfsu_Wv4hi+ena%%d2u$WR(BW%#*uw+xFo{}~@XC0j6_9Jomh zCVuIPAE|wWv(BH!V=k{%jaK8b^5gGz#Ym5}Ydnk0*twaf^Q-HRc07!vhK95L7$;I} zJmHsBC<44tH8Qf-AMnamHQx0+tvVI!hc5OI;TbQiW{(?Rzz7lmMve2Vjr%#CR*wVH z{!ha=uFX=9nC+~lTM^Yn1sW_T@PnLB)g`azbi}vD$6bqX`ueT;l6{&kL)6nRUFi-` z?_;zqefWwTs*|!#OZ$(%e~s~VZ}Y39_KbJ<@=SG%|NJYfD2nZukdBx>GpSeX8M;aG z?>{L9doH#xc+T>{7g~)X_uv2e>&;GSfA@OlShJt+@+<%QPdQu8se%d17~g$D@AchW z|DOO4U+tSEe2raN-dNXC{`}G#1L93HOS&rf?5*z6=kyxeuLIT?)0>SqUH_-C8GD1V z2OwLWWh{bkbTN=`q8VobRzXRPEcY}>FS~@Gemx_(CxT`?GzB+*74WDD%#d7PAMuRt zuGH6X?7_@_aZZG&WBO>-9?r{r4gZh7ig!8;prCBpZF}3ppXQCv$;)4y5)`ESPekDA z$R7R)haNut_h0dXB113Oz|Q9(K{Kuhh!_8a3sSqTwLu>*&iDDa=ZHT2GoP=^T15-` zTa>vdxcK6i1xpw1P8%*wV9t1c;rk60p0BfKUyBhobGVX7g?J!~NNjvvHGe7iXEB_W zP@zlEs_X7JT{v)mJ@ayyioqfU0f=IXD#Q)Dp3#iq_s9SJCr(iLW9sX;U{)P>QCR}?H709*@8%gd|~ta{-ldhI*n5z zqcNOFeL9Vv&%2X{yCKb8Ugev|a=2Nriqn`cTv+XINjBH}^^nMC?-6S_ z(P8%i@%EAFR^_O`;1Ve6R z;>_OfLAy=#DI$MX1r-p_>Er=Ls&B~3hg|U`c6%5}r^FGQFg3LxzGKL_Eq=+ZyV*=6 zU_;i@%Ok_d*Uta-?QVD)UhG_+^VM+l>{SW+d#|9Me;Mz3Mpz++jjeXk^y~AWB_soT>zCdM0ltTV;m2N{~rsW@D zaOj2G#!D{vAvXMV`a<+0%c>D|z#7j|IUP;5Z$tRy=%lp8=b|&0w!!O+$xIpHF*o!e zV~Q8J3zyNuTMB-!D{Vvjv}}LaYdvxd1w*ERi-6Zm-IAvqOAD=(0AR27r>?h&0H@_q zC_2X@5>QkSoPl5KL1w6L!_2cBZu?piI;e}lc&0&}RsM3{<2vJSV9f3rFE|S!Dvjg< zry+mJM{BqJ6gl*;a9#QZS=JjkgkMZ?mV;SU^2Dy8)++;kc{z7K4|jXCR}IB@W%~7_ z2>3O={}V8%0|4R0x_r7aV^7*m<@y;9@c{1{Us2y!o^%@WpYgpN!MA8;(=S1C7^~NM zWCuYiPNvh|Qy z=lF_tUhxP!3(V*h6P=h}Z>ny&AMuFVQfKZO8Ar!#4o3at_(6sE$`q;2Dg$#`WB4l` zff`8ym=VQV#lcquz)c;a>~N$PG7b>1>YgG6RiB4Re~x4_1>#uJpx(gFioPJbBPHaT zKE0rcz7#Wp5{KUBQT^f5CINLjs!PUN68_eZC5)`Ed`7)nABf1cG>31@kP7djU(l zID_+q0-8UJ_h<)G(%m45(#$+@)JZEt33d)yT_g0s%m9NPotFvqvu0nv()AHS3V4Aj zH#o}ay#u2qDElJseov?A{LE8SR206t#I-))K#PDe}-ZxI($n0iPiG2VkW6Z&4;x)y;j6b?G0$0=!ite3W3!}eBhVi zZqHn`VBTbR4oOe|i6uO}`ZEY5P51lNOrazQdX1TRrys+AYis}VmvsqKHv~0k+DS>& zoI#HH2nhdZg7w5h2%hv+<#d<=JGh`3xPw**a>6hW5FE(&m;i`*w1O%dFCS1NEg29= zPIOa#aCU5ajtC&2dceiv{>2A1c95@R>eeDFP z_lqY1RXHalKtxdf*2{JdRCnocYAXL1y-{E#6GB2Tn-e0`YHWkaGPF-WPBN#Bs2MO> zLcV@n%hrb&NxX^u!!$e&+`?oRXZtxd_4FBnW9&WDTqQI~YlFC4Wre$CN`E)475gft z!ni#UCAlQ{vOCK{!AbDcjoSmwjR2d&YJHs|nIzZ-rMKL%e)BN3e_RCmZfXJmF6nRwlB#h&6XK-c`firSV_k{Kda<|L-z{~5op zhLn%B)1=6}KQoXzY%7%u1{7KW8K(9-j8j)(ssp)JK@4z3L2El69tbB7Zm1}_xS%4Y z#EQ=>-wS2{LmhKu?ukj-PvXLMz%Ah>_)!+2&xddtNS+fxs zkOj~j($Bgj*PDU_*EKT8exq*rvkLyB5YI zpQYEr28@)>DMwOa$s%7Su!AVse`}hfzlIlP0~5zuz=p zX9$D6&Z}y=fJsP{4G}xYpN0TvjKArd)T-ME;?i1()%h5tUrX-({tW=TZ&Sk!<5@p| z7XCUEepj!{bsvp>1gnQ*2{K)q4fTZ+jkBpI;t_V^t%a{A=LXKEMT#L1hKJLfX?16? zbU{YCR{2eyCa49_I1)C{2-DRM={(m;I~6JHy1<_LLA@ANFjDz!t=jiHUJ|m0lQhE}w*-;kS09qgkKv|1_8bDQTzB92{?lZZ z$Yr@#Oz6^yBt%aK<2)3R=QFPu4C82qTP@(UQdYiS1r4bk$%jwTaZWGM4rYMSkT`5 zvNF~bH+k#%e&K@Zobe3c3i>5RW530Fd%r6-1$%MMx^5vmvV_~G`>cm;eU3*9n$O2x z>8Tu0&_gDEkCS6M%aIW%!C|imP!Q5}Y6>*QcM;(EemBqB4S&Uy1RVKaLtDgS=lk`n ztC2TeNCZ)2|3+-hUflGcYKIzU@?qt`~%gOe439LVVvN_?_Ke5>)`Pt;hAw|77<{#pKgTcnIo}r}EfLb`*>Aq_5=h4P zZ_fUF9}T=$!PzBZJDTVD+%Q}*M%D!SWxTkKd6y>N*7IjQwKzX9W+}2z-1y#_qFLUF znCe(vV2>{y?Rui|qAyz|aC7-3mCxsk)xtshu?C;#?L^Sy_@O{s+f@u2??^*>dJjUB zICd-h+1#pm&~V%>_r|TXYm}ShYBc;=4zt3;8P3!By50{@JNzDgfAupQZ(W?}2Mave zVXb4h^4T69g2w?HAA}1NAe|#=5|^Ib*r=9+w?Y>HPVb61{qcQH?R=jZS+0r z#olrFT;*BMIvo&~GIp&f064(xJp2k|=X9!A<1LdZ=8?M8WHQ$CJZ6`yDV!M}b0MHT zD#i6q)4VPYKHrBB8IQT*P_n}!iudRDZ=4^3DiSfAM96ZXtP_nPAjh%uoJvj0d$CaB z0Ma%S1LM!}2%cL$_6mW-8NMyw8^?3I>zIO8kGno1J!F7bp5MdKPq7tUWYyO(SJIZE zKyGGR5&=9ghVh2eTS+oFpEWF68=r^iKD_E_EfsgXRV(Y#eEstyAyd9Q=pu{*Z>e#O z8KsBZFwk>+KX~fHD~D;fMLtG$DOh6rKFl!GJ)Y>-vc*}2Cx@s^v#A<&KQBAr)*A0& zR1q*)m|nVryPt2nG*_#S<*;kY@ALG#n0uDPtRXkPH+(fnba!lQw_8Aad=>hdwnS^% zXV>pjjHI&V-}NBnI*q5}WDVNEEB$_-F*@ImwGa#AlTF}@iB-J+Oz&{yIZyKmLjNCj)R@d@iw`~bBTiX##?`*1J1_yEbAHHdg8C*ju1Yi zdAfD1|5}gpUy%>CYM<4Dai4Vfcp>2C`8*3{IQHUfT^KIN%-W!I=%hX7ZanrX?F4}N z7H*H__q%VKz2ZISa^nSIa#6+csV#aWj`EhN3&M?8hO2+l4T>3+xD>p%tA>re!Tm%e zFDi)py1DY~m&1S7BOxL_b!`boYFu@>LEbXgFVg(1-+>VS5V@MBcnS~%zK!v8_Kdgo z5-{UwdoNr`!{_(8%ROESVLbNs7-?6xn4@6{rEO<9f ze-DP~_c7jO>%chq{Jq?;#HT3ztlwW6Pee<=^DX{wSkGSHbYq4S6t?Vn1P@vt`#N$< zlydt0NJAjGzs9S7aipV4%b-IgAdu}Cg!WfVDoy?gN4tj|pThGTqn6<(=GenV_Yu3HUtH0J<>V zn#B5wVOpPg%DMh-`akQ@0%g2CtBFZ)z%*VG8{7RVVC01|J)jlL;#R6l&f$#3^K}`z z@o3~&^)ZMrILbNxn0=6`l`K<^vHfaksOGO3?~&2XUDm^Je+YdSE^45fR!}u+i<;76 z<6|y^A|Myo&efl>)dL)?u`atL2>P(@t?!TE@RH9?dq+jrSA4B?Dl^v0tG_#?I-5_@ zE6b2s5Pe!wy@pD^#veYJ-%^&W$!0CRw^ZKWKQ@gS@B7Jem8LrNG!_0j6cO|Rh2Yq@ zx^yKtc_|_PG}hnCCLhk$o^1S*1}!aIk??2~z6GKd{Tc81gwBU70|D4rHs3|#VMTNq z?e81!_+xK1B6k~mq-|uzV$g$1KwA60J@X$hS8l~KJwuRrvHShZPB9qZJB${}E|CA- z?@dWRGjeuX2^8RLkdLK*b_cnSIsf#2i zM0rAVjGS!N?{c(Kl>zushaC#HFYvf_-eEw?pYJv};>-+|h_g8(j2mShi|U29y{Mvc zf)PddD9b1pm}kpLA8v?xR?j2~0T%$7-p;mFv35^8JadS9+PFWTJ3?+7^-kqDTh}zV z8)NvGQsRL^RZluDj#Moe6gq~^9GKQo)t#xNUm1c6dF?}|#Wul2gdYyUl8dvc?7mQH z#s=O%I_%&ISZ%EEhr+3tvI0IbRwV=3GQuBmH>n2-9#D8t`|{j55b~@_d>i*-`DzNT zS&(CU&9N;LXHQWaQv_XLf+512=J?88A8v>ySR1Dl0fbf8E~7JJ5CHBW5WDi)+D65F zP%N4$ksT8}4|55*DtsF6Phg|}trvu2{vEH%vUv>;Y&nie6w8To(7fF^B5OP+#3;4& z#&^F1A}C}Srdx~ucAZke#+yUjQeQ3O?dH~8&%w#mA{;*8t72avpf@+bn`8X*ih%v< zXL`6`C;efO|H^>h4jJ!0|JVh#wLr&vmj9KjgRl05v%92xJ=daBzyDbj(N-7rgg zyrib_*o#ea!-ZrGedZdsh>G}H4)zL;8x8|yo5yl)>Z#h;cw2U}8&cr92@gG-Lw6dU z<#%P($r}zr;i@1VjW;Rpj?)_5ygFU+z`x$<9O z&=W+-pU?NZC;X4zUCjuDxuV?YkTL!qWobJI%Y zR}}jz{28H&M7>0qeD~5n&`PFtN|KulpTzh^LzN!S@y?kNGrCWQ!e4VwnQ{X%*%%gB%Z~rvqVz0 z9mpY9p*r+ zRWjpwVHg>>lK718i^TSLrp9=@r46n-aQn5Ojqzcg&-b}GP1u#h1VR8irmX*xap*UXwyi30kax3KZqnE*O4dSjg^UrUITT`6Q32BD5eBWut-v2Pu}^*kytAU7qo zffw`MyudtMq?}cDJ*jt8TP)6_hVIIh<(hM`;?X1OEND9I4-{ISU%$(Ykd(jd zVee1vr4?d7Gt6zimnYzoN!+(#lVVfqdVdi_T?09`Zc}AXeW|2hokO%PF zFinLK&kPdAwqQ}6rye^eGdp+9z{wnnp3P!AqR?&)>J?5+1uQ7r6qLO<0ocWYs#;JU z=<`T?L?S_npH&GnibNy>D7sGRREt`F#VjAZSs`dCR*=nCGV1M$3RIJzj-EXQJj~|_ zHV@ZDnIf2(+p8S8T*YFaA_vlv5w{0AiEVg1F9A;j7WB_iL zbFXMbVe?8m!H#-z+AYklOc0#X2C8er)@f(z1bt$~^iIM?0XgHUVy^rystl{0 zxJFgIBs~~Gobh?PEhC}Qj90I%1ljl73#4G|yI1oLMK41w9!i%*W_cU1@}LlXoJ9%f zTa|ezyWkA$>>Kl>gm-5S0DBZTPD?7&$)RUwo{EzjJbP8yB@|XxqXo%Tm()`GyQ=!# z4#9HypfLo}GPwZvIZ9&*0VY33W!));X{dnWl5mM4jv4BZI^&nJVmEXe4ye^%9eWZe ztz4T>?FW0Ja1TSxK+rUg*1hy=saDJx-h_hx2|Nc6%x!m#_N;2%-vW`z;DkHiE~af- zL&5e*tE;tG6n$cPVNwFrp2;5j=0}c(*FJ$Fe#?SZkz3XDMNx6=IVxT&8IRw^vvmi_ z=Y~uP$7P0;|10O>6xojzt>)*!;zeYD)PW=Md!^t0wZ@lc)@p<@3}JLEO%P;+es)2B z2{$_S*Okys#~m+OM$rXUN-7~3U8)#Jcn-yi{~&2(5{Sdrhnx;;?;`SbbJm&|xI|?! zfLG)*s=1is6B z=b|8tV+t4NYObftl@>>u3V&TO+r6@3or+IuJ)RO&ql#S+4@fWgHvYJ7rg=Lu@$O#> zd#`pA7iOgR1$9E#OR~HM>|iv>udVZHczj_2UY_af=N7VasJ&(0O*3jfxen7}0bIto zCKUX}j2B%XPv!#985pt3OnWRa>`w{pfR$B!s%JZ|u9PF!HK^j!`$PjEr`-<8eRck9 zA6%vUI#gtGf1+3+xOl54T_=T0Iok*lgec5YF72g$ z=5@Yg;&^YomnW-yW4yqNz_z%TDBYR@9wheJXy%fA#%ZTHL|^6cC@hMkoux$~ctsm- zH+CV2Jc)U*X{#b6<J!9 z9Mg0L-}B5?=8b^O`D`b5R$ih$V5>{9#|2|I|E|+f1|a`N^eL+p<6)= z;Q(ID{Dyj+ixolHqUbkk;Mg#YxhhtEpH-n}+9*2c$u~*;D;w^*=k{4Vw zK&x7TOx>Nh%^HlGuvYbz#B%8N00l8eolsysD8=L-Q*~F>O;o9K6kZ$%x2qL!oGz>X zP0`NdIZkvHRNgz&cU=|-fRw5f4gd&IsO;9nBYhg4P0h)OM+33V_a*%uQtxx~=dT*zNXe5F6!t-aSk7sQ2&5_crO3G9GzML?ezz8)xj?V>xs`=nN4otanX0;V8wcrS|Q zCm||p`$aG(RghMfQ2|;Hkxv;Z4%<^?sTft`g=9FBq)h$eZjZfI!swuEJ^To&CX)r^ z4w>rm?U|u01qy*c=u?MXKWs4xj?XEsGv2a{=Mdx{qKMa$NZXk~4vhk{HHHKwGGV;M zoZ;qsl3z=LR*J}ae;T?ggLx5%8_yJ(W?&@(RYB*`b;NnBaKXzu(HM%DEeKL(rSE*z zT+>YtM4bg0a4HmVd48;%cq$Sjet9R9L=m%DC?`uVRdD7Uy5-L{EF4Abmh|*Ss0m+g zMkn{#IM;=9@JbYV3_%1fYMPMsq|U?dlr9=EJZ@L9#Feooxy9igU(^ioTjRQP%n?uE zU-oc8u&&V|h}|4hKXITo^pe1?>+WqkNrwcKM4^Deyi@&oP8yjHfe_M;%e1Vp-Zy9w_y#vY8A`rYPZ{DR};$bhTUPu zf&zmxQ1D7p66oN#EofC=3R~sH9I?E1H#o->Z+EJFCZzn*4+gS)E|L3vLqxG~IImtQa`#}eK^MVn3i>;d0-3GscBHgc>f}4TL&Bm}gXYS#`ZBWo~lP&Zd z!^h=@%4)Z4RIf7%EUzZu`b71w8H<4Quj7CvAi!||;p%Q<)MrpAAHm^=8`1>?7!EIm zMTo5`W)1e?)+O*k6c|o%bK(rw3!}^>e^G!LvZg4)x3D(aIR|Ta7F8yrW{QH0Yt|to zu(ub*1tUQID1zXuo{M$+SmH3n5Nv$-SBp=*5)lBOtj|A9^$WB+i>kLtY!HQXRLUU- zn4p{J@rJ|FTVfdKR*ofMVovdYY=cf7Cm<}s@P%54Ml{~@Tm0Fe;G53jg8tfg9H*=T z9@x|ifT;ibxF&|C*ZyL8UL2BS7qfEKtO9V#Pv}l~>fwBV*blRj!Y<^H}cV z>x~I6K*21iY!zTmL4^68L=NIX14G_;Z#C8GYwsz#SG13+YY_sM z2uN;DPzE)%L+8?wTz;jE$8rXp=ddC|KQ~@r{>j;oX%M( z1UuZ&HlRX+=t(c!niM?R*~hYPVOu~2Dp*qjk(d^up{qx8A@+jYCoh+W8=_?Eg`Uz{C+?iXA&61T8S856sIW*1#PuR1nQjl zD88M5g5dg!RM(hL#BboDqk{AamF5&6{VgD?B)yVM83hV8n_537g=lh92tJ5yK$~6| z$%8bZ{Y(nM!=(^4Xx)gSS2&;xDqTaF)ERDzyQ(V&hP3e*B88gFrCoClK*pIvc7+1V zC5QN;kL<~dPsvpQN#aP;rDO2jK_R{RNW;ZbOhP~0{5mBioHIcwI48U)^sZ?^plB~n;OnKZJia0d zkOlsE*6lS1RB0PR;j%phv`I-Tgh1(FF=Nx3_UJ5XSDuPQ+kpp36`rM^ck$~zF? zwT!fP0g;(&P9dW`yT}=bvq=_vw^!ximG!Z5U)%1c9XGTnm>l>VFkz~NR*5@B_nYZk z6xrsgXVYIm>Q4NuctiGT6pFwu;B+#q$?k4CoLy9*>TWcOqG3(RGUc&tw)YAM#X%6e z*|Tn~wDUOy^y)H?+d>h$!}5p@U7Z0!?XO>p>TCnrP>8h@3CcX3WYo1j_w zt~VU!^SwI1nDe`Dob1gP6a|s}kPNvUbMT(m;;az;Q(p^E7H+>=s65zneT*CoHv-yZ z4|1~lnqF0F6hvYx>xUwS1Ha;5NW*JY!P=LCPzAIZ=crg*Hta?5ZPh+=#Br!(_5C%? z+<9UDoujjg<*pO4QWTa1Op4noT(2p?4QP{Z^g@!@NYBWmxGqBu;br82wtnrtHs0P6 znTC+LxJQ-y;8UZ>I5TtA$j20?uWThpJ%GK&YgHmWu-&QP)aGhm(c0>#k~%1*vk7ps zDTV~@i$YMbie+`tqg^Yc)0udB3oU7`6acRaZ@v>eAwsviq!fFzTLhm0; zTD5fChlZrp<9OzZ1 zy=s&~;Bb3LNq^a7pcLS++!@4;r1k?oqHiBKGdh&9lPPuQ{+EqPi%|L7mvcseignzRpSvunOXVG_?V61hbD5rgTzK zNDiB#=fND^l;QMcSmS0cy*%&{|G2gh%PC&h*?IH##t&M7fEVvcdIVbj@&wTM$qn*+ z4r*y^I2&J4t2KzyvIhI^oqSCKygsFffD|fKD5y@C=;&nUVy|&rf#sseomkp7}nclINsy!>N@IYbNpA_1FbV2+Yx!V zg6)+u1fXTigPm$J)c<)W=i?9lvm49=vsX9hhG@EtgznEj=oa{6N55 z&+RME2oxqtqaFdLQ8J@vdvfn^D!kX=iJFv%7?VWaMcV9sG*xI8inuQw&RG0Hd0Zc zNPX+4{)SGZDb(h^QXu586P)bH;SsH|q8*EZ%nhit+w@emlt_O_)J%`qQkiGMM{4sn zNtKzshv&qfeNj=Ac6BAeUy0lMd3I3qa0((|E0TR({3h1AkwQc$ORykTF+{GbO<<`@ zP9j4xbE1!~-#QPv(cH5;AkfpN)}gpLxF$5> zSIFxLz(a^s+k0RFIeFuqU52a*qJ+4~vy}>7-ZkvNbiDYAcN+ix^*aELwW5~>a1(#- z0rlc9$E*Qp3@!3_z6A{Z>lYf?Vh!O|ci8=zmm6F@wN9HhZf2~it&Wag!F~n<$Da?2 zBBd{W{6MQYJP*z{KU@jovj`9pv+B15*i@mJOQaV8em?v>(bFobhIto~Zm-wVV1h?T z_TUdT)Zo0cH$T_U#ei-CR>oQM(%!R-A~+9zx{#oELbNZ@nS(#k8;qCD_7-Q)eO7%o z*v0*$r+XcnWh@+X!YF}PxDEDJY=8W~8T~ATIN^^NnnEi1fwG+R|Gbc*Z6-%X)bkYe zEZh)efBJ)6wrs}8+4Zt1ha|oMdcIENQ(tLxjUSv4^r7p?b#7c=`h2?%gmr$(JH$@R zrrSo|T}OwsYOMQ{O8PYTlPLAto73(Q54v?++w*C8;qz&X>)~I|MJX2pq2Ly`F>a6k zbnEqPjuvA)HRSyGHifq-BITr?RpX=Yy7O4$mQ^uKw-NjK^aBO<>2fI1v4~?KrakU4 zwd;ux*JvhIWL(JN3E8eTTwG{>`%`&uG`of|-e_=s0?Jr91yC5h*WJ}i5wRRxc@*&f z1r9u)rqIve%)K`*T??)hK(JZMA*~F|J`#qTsCLb@Zc5>&y6E5yPq9)4%jWQm=CT5T zIFUk!A+AEl$1W7w^$uLEn!dfBA)8jDAm>?ky>Xb%GI|3}jg1L<8OG;+l$G%2&cm;U zQ8$ozZsz7wpEF?z_AZN>aJ|lj-s=O0$}N7ym6LvqpKg=Rnn}|YSEWPld>zE|?P7+H zP*q&Rb=5QGPg`vrKts*!?2cxGsXb4qTh0eD@jWn$^%jp+74k-aHZ7ETH zvkEXrN%r=B+Qnlfnwp7NKXK@F;Lj!>c))S{wuJ;k2T6)k#Eny^?jGrK zbvTeSR3J{i1dz4Z>k!$w$7poF!9=k2BM#Q|BamlwDA~d;%Me5@kj~#d!ojvGI0BA( z!H{a2f~(+*Iognik+rIZgEPT!e+mgBdyPJ)U1B4E%kF5)p0 z+N7fQI=<~At2z6&C`AtDXQ`}$Nc=8@9Pdx-5ur0;IZ+_r=g#?Di12JBjq$NQ8&+K4 z*sCKVq?dF0`gE1j74FD*$sT(+U8*!;y99L&eDV8ktSSRXd0f|-tKJ7Ok5=I;mBSB^+{;0#19`-0`(itg?hp$CTj3;x6(Dbm#yGq zzDRAf`S2gFZ=YR)YAQq+U6dizkjaf*`u0|vvNm#UG+aNe!2R`UvdEp(4l3{h2C(|S%Z8zCO^^kZMEHqn)oBS@ts5`KJGGAl)?C}~ z)@vxxLPNOgd7t0@G)=XVU~^(n3;@mNknv}Xrl|YdYcy86@4^xb0wvI6v?Ohh<_h}B zdaHGjz)`c9b0ya~xy|V}(EsI!ue*;?ZIh)M->$6l>=GMEL6>~RX`V-*Lvygq?F|0U zeyv`3x6FJf>m2bb-07WE~d%PAzu695%{MNs4;O+D=34r`436@3pU{3`JPU4pET?LZM$@=XUpE zBq9ACJ>S>cggpwVY&_Nu0zbpq6N*Zp+&k3Ez<1vcpGN>b;24eIc}ZbOE0HWMqV=!5 zs0)_Q!N{xqVy3LMn>^qQVZyLLf~qZvY+$-(v{pBss_gH+zxFKUX%TNNUGZXT4R?$^ z70@#~W1|ni)NlbHl`vcxm0_lwUo9cNPQ|;X`7B*>O_lK!jH(__7D?FmF|Oe!MwTZK zbE5$~ih-aCnBCV}8qN3aj|Z4bXL`~@!VRTjRg_m zKf#!gAaTJ|)!e$sK|Z3d*Z8GN>#Z$Tk!lz(?{))6f(1jJ<8LX&ksEJKzN^?R4WUi* z`(IV%^;=x!>L7!kunF;}c7dGze*3RP857 zh{l{7kqZMPD&GJ3 zQSh~R%HP%G4@TCxtrk%K#qvN{qpp!d49xd@d*cuFC(ynZ7z%oFC1ygNPzhPU0M1;0 z!#H->Ji9I#0Q^vpI@G#;HEas2|AAaWEl>P-l0|Mf4@_*3Cvx~rD&?ctQy&t_aP@auyy9DP67Y+wRoViJuwCQ=xh~OU5aHBQHNVv3*7kIJFc~NoaC{U zJ_k<(a0&N1bTUU+Yihs>$jO|%mm*X*?%PS(YaJ6l+o@SW4~(pcMLzc0x&}-;5Al9x zXRc~uss$7|p`&MYu;C$CX3lO?p@aOvA-BnHDszPx5V^(cl_0wJ0@ve3C*n!zI@jrC&9JweRKsmwlmRU()YQm4zjA)bOqj$81sq|zhmL1ji^Ap!Rs%`~!lswtQx@97aE)_A zt%zSSV9P7VsDw&^WkX%`jXZprSl#~gE$!h8as!U=EZoP6wvx5}po3N=SUib+yZ;F}fnt0mx0wr}zb43?6k zKaQ;?F%k-IKx+GXAR(XbPbgGO`&#SomJ??z*$|nSEt4&%nW1aFGQ>gk|LBJ77Ff?D zHdDvdO)+)RSpOnNElEOtX2s5GDwPhEg#4j>E*OxMujj2F8SzDN8k>A|L(QpYAG^v} zx`Dh>o?F*%n}qQUC0V|e?xF|1_ZW?`KddEbasXpMoWE25CEcES4N8;8j%-K!hC;qqYpqgYOA+rpr*yErf>tG?-_U{h*vfgr%@0p6mrt=@2N}( zKDEWH2aLthX7~_P)sr9Vkor|#;PO?Rk`h)V0`)Y~z=8b$Mx>r&x>{bJkYdOp$SyLs zGYgP8U!zh_O|LsS=8BSn4`(;bFoGLj*XpE>u?SRpLW=dmk1f2qsWco!q2kRN@`gVs zOnZqRlU!s=m-LK0kWhF*=is&BKJqD#=ON>9P z5jXKca2E6GZd;~%-6tVL62$k;v&~zJ>!9me6Oru3pMD1D_B^XsmmZ;wLRQI^kj;B1 z`=fjBPC#gL6kX$=N+YhKfhd6 z6?YCX3YY}{Rs+S9s#jm81H$%tC0J>sx8H1UoF&_byLvzEHVWW>OOgOgUE-;a=rV6c z14vQSKEx_Z*XB{lM2><}4tprVtC>qtE^y$dPLv=z^GgwmEy|5T`c*rRqn|sc^+y9& zFK$2~itgSBF||#MMBm|k<%!j*tJ9*Wy}NtbzlGdZC1Sm2#bu&M(*>+9c?t$KaSfIO z8jlLL?X02HTE)u_<fK+p^=(nLuNdM>Vp}r zeJ?**-q^)!eJS=J#F{hAPJ4Mu6zmQZMipgln;*R^3fc=)Ww2`Q<~G0HlX(<_lfHW( zr6^+dC#(l>h)KqpRBBIfw=NiT)f|QV4X_dPHARrQJ(jKT&>Zo*ixQ$x0p3pmCJ_v_ zJp1UPL@z_2pstD~72sa0`fl2*pt}Mm6!jD=F@I5rPJZVIXD#mTrz)Ta@14&}CB5E> zqN^3eOJMQZxzyro4x{6VXirO-AcSsA33*+Psn8ll$0F#$;K2`8^_YZp0SBK^h@lvf z0{@q!zwY>S8ybZ>T>xXZ`F`46n%Kb~lVA>`SHz>Gwj{(=$0@k4t4d11O`&uEeX*pM zWpfnQhIAXMSXg|~qxfv0Ty}O?m}&CJ0QGvGXzu6rZUOn3ZeXyzA2GvY;r$Y`ihh=ykB)maP(r z+E{aB(fJz5$mE1*=1f635v1OL5QvlBdF9#{#YO3e0)m(gd#v0I9=Khwj}HiYI#a;- zP{eHQOf`Q<)PMS#7VBh5n}W@6Q89b9X{eM7b7xdoqtT&Q1TovyFW?jIi8@}pa4^r& z!X!JWxGgR!VuSGh!%5N2O_37G)uK=V?;#zvv)4(5X*?9xVjCfuu5Lio)J`NEFK)1% zheBq*yqOOxS#gzc%GWkP!keISEQ-os{Oa?{w`sDcEH_j2O=1gt}rado>qT z)c8<{)1ts}Ca2bA04DI^O>smd9|MnB1eqL=HdT8OT)A~fwMt?*bf(r+Yoi-43d`P$ zDm(`)N6}kLp5j?u*;JES6VWZGWwGd)>!JNaX z916ez3Mw8L1doRT2rDNAtol%}WGHalwJFer=8ZDzNg>HQ6nq4VSdQ^P`%Ljq7v(3| zxW;o8_LbYB;4Hg-Pdi>`RsY&^x?Wgqj#yqvUqu9D^9olb=Z64R0X1nn=&9mw4(+vz zt9}YZ>}|MSX^(vaNtmKZ(TiZ#q-G4T!ir6`Ag5qyHx2*4M7MvwvvWZV9m zp`KO*#CE0#%tjHzi61D4pa?DI9M7v_YYyB(5yKhPo^f{F^X+Kp%-#ko)2d=PYzO-w zhcdu1NBX}hm`frOFjql=P&s!+vq|whN7AZ9Tv5buSetSH-9XH zi-HKK%636*$_VFmwjoAjs!Edu0IJpAACObOC_vC>8$e1Fu^h6f6HaWTMlv=|c~*G4 zR<*jRgW9_N%vP53av-V_nE9|q@_iNf=pmwI0pwFN>xkwy^{U} zNlH24-U8YqE4?k%L)ZLuXhY&I#tJ|N5RHSYIb6C3#XEbWyuzNW406ICZ~{*BZj2;j zkXM?lpUd|5VJZyDoofPK*^>Gw3niK-OjG!xK4i))C`bk)gu+!ESD{CMi z3l)+qO6EgbCq;#hy(mEkirC*f0-_>z=LN8_a!2g|qHUZpkjcR+94z^Mtx7p+&p|s0 zxRs$$`4b2WL|z0{^0zHlUPlnenKGapesX+s8yVI^K`;fIQAlO*yCTbrq9%z=!Rn)k zS?B`gO3)gq!{p43aP>x~+I_$p^*Q9vaf?zpT zp*#DOL*-;ryzEV|95_d1Mh&de^Q3s$w17FvtKrJdzwV(w<_2VUw$UAD+lb?8UE0^w zhu`W{%h5jEfCCh997v)XP#fdhwZ6=MxLlo0^@>;Xorn8&F;JY35FI0{j`uqT@YRlxtJBkdItHvJsAk2AjL%HM3@rhJd z?L;WuwQIGWmmlbvn!PGfjUTuRm8+c&@@EbJ>o}@c#4TlwqP7P3t!Q`ZxQ`rvzoL3c zY!sA3oXT_D_iP^p6jGm6l{nCd2sGdK<6HDJ~=+JA5nbc z%^>$_kyHCL$t+`7F1qro+SMh8q7H7H2c2DCS>ff(7Ddh3IxM1C#xS_%RS^a;pOh>t z5e0_3LSLvr-YCb586y|1SqTL+x%UdR=S?vbQ=ff6q+CY}meXiZl|nA?3eaCEby|+V z`*CpLg6P*#Jzef?e5LKm6DU9m{C>B=ey-CkNULrtzA1{;o5deR(eG-x>HuDR>4qxW zp(wlRmzblF#Q}Esjj2gNv=X8$kh&EJF=wo>YMGnIaHHpIa1?0PU5vH@y}$ zftq@VRE^+GvJMLQ;)dM#aGdhEBwH(DEz*IcVvM&@n0S-eD+*Pnx`A~+%!r4;E%j^T z8d+#l&|EKpRhI&h-8XACCOL64>&L95&~ zL$^)YS{8aPX@cC^1S9A!l0Z+h(2ExeXnWh5iwJtaoQpIP>V=lh)KxFbIj5S&5X5es z0b$k^W?sAYojnD^=w!p?)>SPofYo`Ugu*h~3b* zfCL4Rw?&Zb-6^4QpTO)tv^VmcJ?C={_r z4od=&PYTG}nM2HiB8D4Gm+I?&`2Zi;1R7Slu-Vxk zll}*oz|5KW+fVN9qS9%auJjHFpZreH~@ zb+6FP%|`{16S95dihmqJ^bbO*Cmwc!!2r9Vk77H)A1QtW<2DAX~u(kA74%!o^Y6Ery4XGUNr}HGw!G+XVCej$YDIzO3rIqprc@;FMszKb2n^?Ok)!xx1oJMb8R(mH1VnwY1Q1wI4`6m%#Gtry)(5aiA^eG&Bf8UlP4 zL#Zqjn(|~Xifie#;*tzOo#qIV5zbvd%%A{1>^0S;Q#+UOHQz}S_}R${-SB6;grz6{ zAazQnq_rPQ8lt3Jc}#YfuKF<_`FlhNJ|M;u3YY?zhJwEmZ165a znZIY~nu1*mff0n>=ro}iFN)e;J{m;NtZ$WNbM5$`+5vT#i&EJ>6hb`|ae4)2G@FGV zE=SwMZE&EI%s{wqj?+nbh6kWF=E#)XISTey>jiWJD6c)@>)G;8!bww3oMj)xU8bxB zp-XWEzRG};8#c>amz6&T#Mi9_$b}Z~Q`*ndBHGdB`b15KtcOc_H4_EQl0(*=I{SDT zn@>GAR(7K*kwnl-9r8#4!DI~no+&sf58{B;P_S*%GnxHt+LHrc&jRr2!5z$RRUhmJ z+&;Du_nysX*So~2Y}oxzSct=z+ZIBf@hm40&3HX@y#&+Mmic{A`X1j}gzd&tRgg@# z!=`hodGm}nnu7BOToGFf4jxv`ymvJn4}Qb0pvK&aTwuzSOW^zC={6k0c(%91yh7gm z{7vl~ruTFRN+ngWm?ld`^Y<((nD5UkDH)Ex^5$N-BL1&1KvUk?YaO6$s_`KUuol45 zyb;%()ct)u494Sa38S+F-2e*5dh%8eZ?#JskGI6AoWF|#^LDN1^`x?*N9lZ*qlrKl zYE8x@4?}?BQ_UpOiuTM%@6Q;kCXQRL1BHI>9dpsG2!8`_`D)K%04m20?%h9rfpj{s zes-ZgxGd9zcR=i$1ICj!duTk9p&L>g+%QYsl6y`lRW}}kJytEUVx!D4PZR=j#?xR+ zH@+_D8aYVokbXzJIgqRML=_HeU+7jkH2Hl#&ucp!r=wSfYB-RFdv?2fM!|Tw1%jJu zJO&drc3TUI1Z%J>oBNRmR;S@{SF@E{yHx__X^Ife>SLVKHD0=*;8j=ev<(%=_xDS~ z9K7)Y9^-={r+v%CKFcW{hv*tkPzeJQJb5KA*~)9`o~FZFH}v#jD`m5%Lw2O6cQqtm zbYQ%3^{w*sQ(H>>pVia~5>O907Fz%}9Nge6EOIYiGGjP+tb#Y=uZ6_*$zeC)<6F{7 zw2a4E_0=B5a!!KYU&&Xi*vqM)U_92U0J`H0g<{Z$WJ*tuo#i%+$J?sJ9$&A5IAebN z+}@Q|IQ$xtx|*_zDa3G?LVAAotFmD{-nz%Ahi(~$d4E>P_I%&Lg0u`5Xm%?`xnmk~ znDdrombTAhu83>Zc0w11Bva8X%9=%p=IR(x5z>moNxl?Ucg8uM0{$Rc4IkY&cSt${ zMl4IhzLrmvpiX+W?408Z2>~W!wd5Iv zhza;3DVn$$ZT*tf+%^;p0abQP!h)IG=>odS@GJ_u2_HYeMe5NQ#zNA1GcS_M*fGB- zl#H?gvVb8_Zq?zBimL212bPNx>Kg+Jxhp-7>ZUr$yABxR z9fmdaZpE8@$9ac=7$3VOMJzBm;qZUIZ$(EwDs#qg2oU#_AP7NTd%l>F#d>%#Rts?` z9hBeogYo?@m_F&llzyLwHxtz9$r#&}CvM@xKOTXB4H*-wb0B_$XISj6{5?7sLg*q+ zoiR{k+Amd^XsYOIYaHuLP(!>xS3(8d%6{H+%0%h<$Dc`Rh-ruyETPgg6Z7h*5MFJI zx(dju-HjJZ;H;!(=z((J*=+@XC40jI)cRF5q4zv|5YAqX)XjLz2Jt3c~5;{1C$-PJqGDQX3I@t`%j`5VXi zYgzcdgU7p5?eK}eqMYCWRGKjVo{sVK{8^3DFdhg5jH~feybBxs*{xvYo@O_|#gfK{ zmI@{0y`%VI{K>zA`;C`Py0o!=6GJpH;?Rl{o4La7)&qIS_E8nl1z2sYCu#YtpJo$I zM{0bS12|SM*)O-Ml(a}9J44toTDz2IG|oLcr!!GNyr_+R2#&yf1t4H3j~eJElopu^0Li=$7a$Wm~>S1eHApCAlJ zN7l05M!Iv`7?0m|JF;X<^sKn|OP$-W8b$_#UG2XN z96B`He1xQ@pN19fU17XNpmxR12;#oaFXqsn12GGH zS`N;N<_XSr0rS zjbQC8hZ8ei_{VW@jXWQ-Gnhq{?|PsZLT%##ZSumffzd1G^$LTw;BRpb1<9TcFgKirU3&nhW|Coh}RJ@eo-2*G~rs+e? zxr}Xfz*B~EqB=IU9n_})D*2U#o{-zzDm1Aj1_&%r4D}G#4^`Q1&Shze>Bi%3Y+`jp zOHOZmKco8bZ*oA=VDrZ7x+C|pkQrrYRy)hD)ve02Ak1kl*kRV7ZaMksPP`I$^lC{mmk87C*B)Ff@U36LFEu`UE#U#U!{wYX zy>d9yE_^pd@n-a}n97N3TA>xMh9%=M=sC*_vbv=4>O;MnBk~?e28VP4HjD0X@b-Bf zks!>T5-7|So#G7P0l-NFRVj>*7y-KR$LNcL@HX(sR^5r?y1_udqS;%AN7jPBye!c8 z_0)_4oelrUPA{MxSzz}4d;#VXp288asQT6%f3PpL2&z)bKqf0JOAE&Z7@t2ml_;FQ zEnjf{#n_f6uN=hCcH*FNm^gRCyQv%)Wmo^9)R&4Ds$6bFQ)v<(zJ5Cy4xULvcE`1zrH}xUy z#S}8wFkVSJq^I?Y&Bg0KI^zjWe%*MnWA`rKF+abtZ}{3de5z_Z=29@hrsad3$NF*ij?e3oZR7csLRrD@5YDeO zOV1PL!mo^1s_pT|y4}Y5uWcaA)=$BtHSjK!v}artYmHZ!9p?wWtn$=wPR;TR^7USVXz)3!D+7kWR z=li0otfxJKR?F3e{6iXmy4w;`tv-*t;znLr&I7%j(jcaIgtH#;3XK$9IIg3!+v8)i zT}Rx*C7=}@fW7s7bh%+(=%`!wEWQklFEpN`D}~m>F%PqH+~@OZrtE^*fU)wRn(WyB zAv(a*y;%*B}5d|!5re2R&??hXd((%snaR~S=-x8PDrro6WvWD_6&BiHizd-^p-=45KK6fR3WUQUAIpTqYQk>Qw& zt(>Ce1jPJq*5}Un8Wf5%;2rChhjSaL5ODJ#81~Jq5mi_$v#I$SuSSEF@kg_4ge-*h zstj`ynhErK47)>>4sV^E@pvnrlKPpZ+;uGf{y?sslTCk$yn47_I1HB<<8K+50Q7yT zYmM$=Rg;qQj`4B-Bg;PRM~9$O#_LxRy<*3-n_`x&ySBQ1G|YHjx71Q6+PEqUa)Uzb z?>nk~!O-|s8uS63{$o83V~^+6jK^MqY5h4#{&-)9(LXVg{k4AV)ukndkxNMC=6MFe zJ?klc5tbTn0{mqd01;z7M|I8Aa$>Kl#CQly#aZrgp3ZZpJ2NlDHyn2fIO$|qLgvTkVH^ANJ#MEHrtz-f&~t(OR2JCh z;TG>;Jlz#YxH-+s2~URfIJx`%emVc6G1M9<1H2mF}PErbNJ>yH%UC?PfC#o{ePP}(3|9NDAcjpfcuQ{z}je3M; zEZ?Ti@I;dfHXiWHpZmWVUR(ZlE8?^cKi=Y!?+fu5mGS-KoDD##F5>tUb*vv&r9aq2`C z<0x@gK8;hgZIr5v#ox{ipYKQA7=F#+JxT!K@x3wr7VDnnFw81Mn*5XtN*2d>mHl(} zNlqb{b5h3_PF1s*xiTpUjGGyuM99gA7-^bpHKqjjOSD|)d5F=LcgEyk-0OT zTIJM*1U1Qp-%U9VRXW3YPf(Nb46RVP-*_09id08T_eh%9&v?Am`%5&0I-JS~@2X;- z@ht~$yVwO(3G|pIQ|;{7s8nD9^%lZpGAJO8`FStgp3f6%RR|EF35wPv_0x&~r;lDq zij2oxC5Gz$tk8rX9q-k{ka0ibVZ2B|MSSxU5^5WKC20?@9Is&lz9ih_V5Egw~Q8@zDf{zcQwRUg%xui;$f* z0b9pUM=7O!$Kb?Z0Suf711Oh-F8{3FTUs|Nt>dekli&_PHCrDA4I_A=-h+z7vrF6GT!6a*VKVKb8iBge0>%A}E7tfERP*w9 zE3%719Z`tSrOXXfK|V{W;?ML&Q5q4JK0E}kacw5^Dk$~fY6RSE@*wj06$li)NcHSm z7G~S*1Xw~9#?~uZ{2D6ZsuMgEEwCT3VgX?=@+M`7(IblDi_g{FQP5v`8I;G>34Y-> z2tW~9uvdjyD6l%06(+6Wd8BjVh_4I>Jk>sM8&aYo0M(Kr4AGWcUFicxM}grGj(#LS zAR+er6+fwl6Wyx{Oz2`W$fO4$92=Z_oUUM+58V`+|4_toma%p#am}azvQhPW9g3_A zXMjRuM}ebYew>vfKf!$EXcRCj6#RV8cme5#Sh3>A6AL~gh~>Hz8F$6i=?lUzc)Mp& z94|W{N<$%kVJ!XSFk+%CU)vOHbQH1N_r>(^0p~jox483}LXi%~t3*K8w2bnAX~H0& z`A0@B1 z+Q`O9m4sXhhd{v=1u5*8zh+k|?z-)ED3}=(7|!A?5fO9_#}bx>!FyGj5>a5d^mF~j zc(v}y@N%C+U^sRg&WH%BvEw(`Bv02QFmfHO=ozL(YL)DDM8?5x4}J)9XH3J?0$+kcH5moFrc3k{bhI8Yqlz-qXYyMif(VM>oKFDgoU|{&L~8l ztIMUX9U+Yd;guVWS+u_#{(-6aziJir5qZ-#+;Ezm9PDOC-SP-xxl*bq4mPWmZcfo% znny%<3mR@36!Nc-YgodNDcW|d2p=YdttB4bQ0o>60Ra!2o&p{rsofk!JclB93nLMl zr)!&M8@&R60LwFK91Y!@X&$d~>w!d~sH-BMNKq|Z*g{3-#$_!>5JiiA^%>qJ>(MmK zYq0l{v0>bbC7z>_I`{?U0CC70hgrZTlzda%3}S(T-H4S}0&oSLY{H1XdW`7o98}`ao%bErQS-eBRuOh&4`Gy=z0hmV3DYV010)LGH#~DI7D}ai2%qb+CN1wXI zhKC5i-0N0*YCF~>TRUf~xiSh2=P6l*c)^4GQgp%LQeY;EI8OT%oxn(>YEaOa?P*v5 zyez?FgbPO00f3G6GHBSmJ4+9A$TJ{k^?(Wqbj`tOUo_Pu9WLrs4&NQ#;TW>Lckyxi2(Bn0C}8#%{H#@Bw#IyRq2I@%rDlDI#V0xHJ**D&p0X| z847J{HP;E{UW>Y!7B_~Pv5TU%{4OoXyywPQ%ri%=?JLHjJ^d1%RY6WCg@kHTz;!TP zoN10)r88-SYf{v5{_I0-(vQANz+ll`q^+}F+Ww-rE}B+E5zGCjMk(uRJTQODtV&q~@D3NONAzEF zbYJwDLl)2+v0PuNpjyx_2pU3CZ`q{~&j^8|(0Y~?(SY+3_I&c5qrh~i@9z`to2%0S7(m=oLn;sJzVa&@Fy>Ru#qR!z+h?)R1>bV zZ`vdzoHKo_0DsS_07yYS3WXi`vpjgTFRbgscU4^`6yHSAV_^CYBKSdaacq|a;+aCQAu9a$*wT)Ds zQ{@Fk4SPLw+cCc=>~`-Xz@d_46i$~MLS&}#>8{z)MqJQVdbx&;+Q!3GX8R`YOu>?p0`S`=7bT?+t6fu(t4jvtCHsBlRr zG}r~Kmr+dha7R!wz>t1L0w5v|n;IgI|FTu6-LfH*HzrI?g}mqdJVvAbR``TGVNi4I z%25Y7){Ff&#_J|Sn`8iKvls-YM&oP%!#+a!C(VS*0Xp=%sZ9i^j_pBK50F>q5jIIY zRC-jGiwI`d3FKUEjwCzImi-sHMO`XS4&8g2j-41k5#cn~=-$K>iZ69zH6UPRfJqu#SC@|e6|=|N6< zz!PSMZ=S>XlOFd{O7pOf4mO zPhRK+N4aaa^V%weg0-JFx&EAb0;KSRT=1f}pk8|unS7pxh^3rCzO+~>uB%H#J;}p1 ziJcE0Ikry!qK8+_PRs-#^1vcf$>f+F!X#7{*L@&!1hvHrehXr=>TJC?2;zM7H= zj>(jz+75==Is7or_VbQ_^%jWYxj`tQ?xA6sIC?(bi7ytW69(wMzgPC(X$Yp}Jhngj`R-?xY5nMo>W12p5r zO{+_)Ypmj}zzV?`t9McKP3Z2V-6;oe!DxHxBi8xH0IBSYO}XE(RLGzTjgk<}`5a7p z0wQq{QtRG`0l2Y01Zi_z4S4F@iLU!ISHiGEunv*zew#Zi^4yLOm z0Pqls_tippPPePTbz1M`ipmvSz{uWX4CkOT6|XM-eknmqeEUfOdIA?)xDAg#78+H2 zE_S$~?L!Npl<_Fy9z;S)!z!59qmHbcm`ZcGveqplZBikoo%~O~r5<90H|)m60X8Ms zVt}Ah+ozkk#UUiR}NnJm^Y$Yyly=akE!*I5HzEF+s8p%H7&WubC z`_!W`j)t@px-jl{TIZr6(kH!xMgV1!B+(JRv z@netYb+p*wZ1vFE;o&4xayZoE0@y0w?>TJO!&YUCNQ|vQ{m**Hz3*c!qw5ZCH(77? z`>aPKd&hT7(q+e@P$`j@bxc-?iO%_mPkjYzHSk%FuuhxRSWjiMv)>ZTye9iA2g8A{ zyO+;;G^^b6VbBBw#&<<5JnS|z?cujSHZ;CRkh@eMd(2wTwe&XP!z)DxkyTG1*DV^> zuI4buOGfVa+5&n485Ym~2|PxC>W~?N^ZANe`6EF|(JZL#J^r)L@nM1@L^HmJK*hG- zm6JWb!r(r9VFP5qc#U2X7IElpK|JHXWWhBinR?@kcmXoJ^<2M>x3BM)U^YGv(ehp< zinblO7smL0%oXr4U0xP=@3&5%yME&_Hw=osr1ux@+3N>mevKExVy~b&oH8I|+7VXw z@@t)s=YGgdd4(+hC2XSBul3-a#8OR6N?l?hWfORA zo_+1TAGu7ye~;ZwaSM08-)BUaImfCILF_=8r=5a(eXYk{cojh`ac0+qJ99l?hcEeA z$glBS5Ppek?_I~|{Dc4RdP2YOmjSFxlf1q5TMx$>?K9GltBIpqdU}i;r0LYHUJ`5hlUo>brL)+f7}k@J5KlRg5N2@qt4lKk@Q>{E z&Z!*FQz~4}7%tYmo6RBhwlywExb-o;(w#8StL!BM{I2oh>3Ai+n%_UA+c01WC*BIs z)h;cDUzx+NO9ZO@`%myda<~)`lBjuZw#eojX3+&rriEJPq+eXv6io}*M_*TswTT)3 zA76KX1j}t(QFKG9lwC^f{qHR2a+>4}T9Tb_$6sJKn*f1_2aqF3NJJpz=?HDMYshuS z=q(`+OUeEyj+ zfQZXDaVM5)KL4g{!f+phDy)`blQ7*G&^i&kpWY$P@E=m6ZGqwN8Nc6-%iVS>F9qp4 zNCiUEBoaYRIK(5NpSc4Wekjq)Pt>wl}|QlnG$H zL_b~Wwr1zp#=-<^x00wolBTnds|@@?a8kV^?H`h+Q+vT(Wbgz2bUd5`*$=PL7FF5F z$FdP%k2Ov4`I8rNSGkvbp+hRsL~{TuKQE{Ux9miIsaA#U~4G8WlhXt^~l~aW!*2Ye2dKO00QHRGIDzM8ccK?(oW8q>kU!e`@-& zSu7(G^0i9ld*5J(tFJboEB$bbiu3aux*g}yvFy54(gIeEe5DOv%`=aImP(ufT(kia zJsJjFYvq~|3MB#A?l*K2TkdE8C$IfMEoS=cN~~uOIFP|IC{ke;n$vZ`i;ak1Hn(3O zvYL@k68SpTnC52MjE(&oP#>i?O10Ib>aXuwwXsM@p zu^zS2=<&}&dIRX$NU#WMk=V=`b$aT2)Xu`vfSbxBdq6`qka=z?nPDxxpb|I~@M#wCF3i`rOp^E2}{QBzsW`=G6JzK4H z(2;cy%d0%Rm4Je1MzJuFB&MS?VSKWi$L{m%y%QVB1J`InZ23JI^f3$E<#k~`lw|`F z)l+nk(ZSaZL(hPk74M9sSv;=+9jbMA1Pn9RNGbYjN~|21K@4f~#`RQ|9j47&9K25p z@x+xFMNy5;DPdwx%+f8OBE1?w&z@5+HJ3M&Q98K0)B9<`Afa2kwukXyQw!=jXFE$? zEvpCU(C7@HmU!3b4n1@}`m9ntb^?k4dUxA6@WyL^pmzsI2YF2c(2Bx1r2Voa?B{Xx z&KC3yG!3)?@+HdCW89-n_ClLy5op{zf?P5@GvwOe?(>7bpW{~LIqU>V8DGrEPFN`a zH-MVgm3OfkFVKZX{dxg2LT|CZQsgN3NeD2QYj&Lj7lt|#vo5vJWi{!u8pH4WT^ery z9Ye*u1<(YijSr}Vbu`d1d|5WmkiV%p4GA+%qDLWP}?n z5Cr+!GD5}qUTe$ZSe-qI#Np%hag2vw@>?VetVw>OW8xinyxH@h>*%Iqc6rNFqaHvD z-7)dmbHEC(0+6c>s80`*fGUoknKRNMzXq5Qo(reMZz=8;Y=^w!-L+|zNCOb1>uN?BtNdfWfVcd5L7PBw1e)5H zakfa2`GyX9J}P!@9`>@;%1g3R)%TY?XLIGLOl^sLkXf5(eT4G`x4snI=6WGWeP(KJ z;5x;>K0zY6-ypZ`o9mC#Q-_PuFEulf(DYH87Hje~M8P>7j1z!{RYTe^+q)} zpp|zUK+(_xrp(rr)y@I+uRoT=yYZ8n-|d01qH+K zsAikCEJY;esrAS^J1gC+;4n>F?Al*Y7S?qG#5*G=WV}ck`P=r8awbnlcGXBF*9_my zZNMj=hr>l?RKI?lVF6^)*Y%hkalw`mC=4y<7#}rT@bu8!smn4=hx2feIZ`|Mfb%C>p-VC|gBNU>4j{I6eO{aCZK>Pj=y$SDX$ER$jA1^U%e zF6XhDB8(WR@h4*sUC|NT{VQIx*%oId#MNpTocgVI zD2Wg8TPW}_n{*X|^kbFp!NS9JckRc1x+QhXg2Ik%}0+TQ?Bo`r4y*;aQjUOT&DI3I+=h1o2tJ8&y#}bIEvR*r*#Z2fh1F z$F0M5cEC$hS28LI0fL09X)#oOCIev-SCOL4z*kwqfWYkUPDX$gGKkZuCfrT|jc~*2 z_TFG046HURQN%)u1)aJXN)3TOCX++R`H`2RNp2wS8J&2bU!BkrjWs|Yc4`;`%V0*z?X zoRC&X{o-7(14h78oslvt-7;TSnt!$;oBc|5I*+w_arrd9Tk~7L**j-d;NELX%UF|M zVf)JL9T=MBC(-_Hg7uqYimZ)rY!>3B+L__`n=gvM`g=$EW@3=D656Xj*z(=lOvPR! z(zuEr5>f&t(*1shcU)F6x1hS2#+5F!5!L8fU-lixWHWZf+2m0>PS@$`eXH*TXgsSO zQID3|Z09F|n^}%Fp<^EM58~;%1G8qr!tWXGkLF<5W8zq6@@ZPgvg7JKnD)nN_7)O@ zh|4ZiJH@V!tI2A|`Y7=}TBbe`fJR^*JC5af`~*jk-;Nmlic$+ix+BG1W$_})5Ue{M z`9^li!+0jDU#g3(e5uQ(-P5TJgQbz@(KH(XQ;5GY{d>S&SGDP5vB(1r7-p&9M9g*A z-{(_qwMi7Ia=q4#n$pMf!*ZWZVE&d<%&B&ZCd2cCF~8!$$t|w4fH>uHO5z4au`}O4 z^7ALhc>1a>^_XP{{=XsKLCt42VfV_g{Qv_u;Y1K~8{%C8vc-+;U=vW+&$XkP0h`|_ z7CU})tHey6a@XzkGDrb@n6f6dyO=9mVR_`SNJ7c(;^AxqMOmhOUN@ zfsOe)s($2a3PE3~mLO<+xm0XaKS4wb@_4NH*p9h!+HI{4{)|u-64{@-esPT7#E$3S z0`K|uF`X~&oiD3VfV@5H@fs^ehV1dj7Wn1FDYw%t!aN`3v*+WFzlHJpTG}l=Q7?tv zM%xTPd={r>AL5kD3Zevh_K!_R+FPuM{WdIW(4;4_0@Q`ZPON%s} */ -public class TransitPriorityGroupSelect { +public class TransitGroupSelect { - private static final TransitPriorityGroupSelect DEFAULT = new TransitPriorityGroupSelect(); + private static final TransitGroupSelect DEFAULT = new TransitGroupSelect(); private final List modes; private final List subModeRegexp; private final List agencyIds; private final List routeIds; - public TransitPriorityGroupSelect() { + public TransitGroupSelect() { this.modes = List.of(); this.subModeRegexp = List.of(); this.agencyIds = List.of(); this.routeIds = List.of(); } - private TransitPriorityGroupSelect(Builder builder) { + private TransitGroupSelect(Builder builder) { // Sort and keep only unique entries, this make this // implementation consistent for eq/hc/toString. this.modes = @@ -77,7 +77,7 @@ public boolean isEmpty() { public boolean equals(Object o) { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; - TransitPriorityGroupSelect that = (TransitPriorityGroupSelect) o; + TransitGroupSelect that = (TransitGroupSelect) o; return ( Objects.equals(modes, that.modes) && Objects.equals(subModeRegexp, that.subModeRegexp) && @@ -96,7 +96,7 @@ public String toString() { return isEmpty() ? "TransitGroupSelect{ EMPTY }" : ToStringBuilder - .of(TransitPriorityGroupSelect.class) + .of(TransitGroupSelect.class) .addCol("modes", modes) .addCol("subModeRegexp", subModeRegexp) .addCol("agencyIds", agencyIds) @@ -106,13 +106,13 @@ public String toString() { public static class Builder { - private final TransitPriorityGroupSelect original; + private final TransitGroupSelect original; private final List modes; private final List subModeRegexp; private final List agencyIds; private final List routeIds; - public Builder(TransitPriorityGroupSelect original) { + public Builder(TransitGroupSelect original) { this.original = original; this.modes = new ArrayList<>(original.modes); this.subModeRegexp = new ArrayList<>(original.subModeRegexp); @@ -140,8 +140,8 @@ public Builder addRouteIds(Collection routeIds) { return this; } - public TransitPriorityGroupSelect build() { - var obj = new TransitPriorityGroupSelect(this); + public TransitGroupSelect build() { + var obj = new TransitGroupSelect(this); return original.equals(obj) ? original : obj; } } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index f6a79ea9192..1f3807f46b6 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -167,7 +167,7 @@ cost function. The cost function (`unpreferredCost`) is defined as a linear func .asFeedScopedIds(request.journey().transit().unpreferredAgencies()) ); - TransitPriorityGroupConfig.mapTransitRequest(c, request.journey().transit()); + TransitGroupPriorityConfig.mapTransitRequest(c, request.journey().transit()); // Map preferences request.withPreferences(preferences -> mapPreferences(c, request, preferences)); @@ -297,25 +297,26 @@ The board time is added to the time when going from the stop (offboard) to onboa .asCostLinearFunction(dft.unpreferredCost()) ); - String relaxTransitPriorityGroupValue = c - .of("relaxTransitPriorityGroup") + String relaxTransitGroupPriorityValue = c + .of("relaxTransitGroupPriority") .since(V2_5) - .summary("The relax function for transit-priority-groups") + .summary("The relax function for transit-group-priority") .description( """ - A path is considered optimal if the generalized-cost is less than the - generalized-cost of another path. If this parameter is set, the comparison is relaxed - further if they belong to different transit-priority-groups. + A path is considered optimal if the generalized-cost is less than the generalized-cost of + another path. If this parameter is set, the comparison is relaxed further if they belong + to different transit groups. """ ) - .asString(dft.relaxTransitPriorityGroup().toString()); + .asString(dft.relaxTransitGroupPriority().toString()); - if (relaxTransitPriorityGroupValue != null) { + if (relaxTransitGroupPriorityValue != null) { builder.withTransitGroupPriorityGeneralizedCostSlack( - CostLinearFunction.of(relaxTransitPriorityGroupValue) + CostLinearFunction.of(relaxTransitGroupPriorityValue) ); } + // TODO REMOVE THIS builder.withRaptor(it -> c .of("relaxTransitSearchGeneralizedCostAtDestination") diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransitPriorityGroupConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransitGroupPriorityConfig.java similarity index 76% rename from src/main/java/org/opentripplanner/standalone/config/routerequest/TransitPriorityGroupConfig.java rename to src/main/java/org/opentripplanner/standalone/config/routerequest/TransitGroupPriorityConfig.java index 51faafc7cbf..e5f1ccd784a 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransitPriorityGroupConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransitGroupPriorityConfig.java @@ -6,36 +6,36 @@ import java.util.Collection; import java.util.List; import org.opentripplanner.routing.api.request.request.TransitRequest; -import org.opentripplanner.routing.api.request.request.filter.TransitPriorityGroupSelect; +import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.framework.json.OtpVersion; import org.opentripplanner.transit.model.basic.TransitMode; -public class TransitPriorityGroupConfig { +public class TransitGroupPriorityConfig { public static void mapTransitRequest(NodeAdapter root, TransitRequest transit) { var c = root - .of("transitPriorityGroups") + .of("transitGroupPriority") .since(OtpVersion.V2_5) - .summary("Transit priority groups configuration") + .summary( + "Group transit patterns and give each group a mutual advantage in the Raptor search." + ) .description( """ Use this to separate transit patterns into groups. Each group will be given a group-id. A path (multiple legs) will then have a set of group-ids based on the group-id from each leg. Hence, two paths with a different set of group-ids will BOTH be optimal unless the cost is - worse than the relaxation specified in the `relaxTransitPriorityGroup` parameter. This is + worse than the relaxation specified in the `relaxTransitGroupPriority` parameter. This is only available in the TransmodelAPI for now. - Unmatched patterns are put in the BASE priority-group (group id: 0). This group is special. - If a path only have legs in the base group, then that path dominates other paths, but other - paths must be better to make it. + Unmatched patterns are put in the BASE priority-group. """ ) .experimentalFeature() .asObject(); transit.addPriorityGroupsByAgency( - TransitPriorityGroupConfig.mapList( + TransitGroupPriorityConfig.mapList( c, "byAgency", "All groups here are split by agency. For example if you list mode " + @@ -44,7 +44,7 @@ public static void mapTransitRequest(NodeAdapter root, TransitRequest transit) { ) ); transit.addPriorityGroupsGlobal( - TransitPriorityGroupConfig.mapList( + TransitGroupPriorityConfig.mapList( c, "global", "All services matching a 'global' group will get the same group-id. Use this " + @@ -53,7 +53,7 @@ public static void mapTransitRequest(NodeAdapter root, TransitRequest transit) { ); } - private static Collection mapList( + private static Collection mapList( NodeAdapter root, String parameterName, String description @@ -61,13 +61,13 @@ private static Collection mapList( return root .of(parameterName) .since(V2_5) - .summary("Configuration for transit priority groups.") + .summary("List of transit groups.") .description(description + " The max total number of group-ids are 32, so be careful.") - .asObjects(TransitPriorityGroupConfig::mapTransitGroupSelect); + .asObjects(TransitGroupPriorityConfig::mapTransitGroupSelect); } - private static TransitPriorityGroupSelect mapTransitGroupSelect(NodeAdapter c) { - return TransitPriorityGroupSelect + private static TransitGroupSelect mapTransitGroupSelect(NodeAdapter c) { + return TransitGroupSelect .of() .addModes( c diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 349c05f63dd..ab79917b9cc 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -825,12 +825,12 @@ type QueryType { passThroughPoints: [PassThroughPoint!], """ Relax generalized-cost when comparing trips with a different set of - transit-priority-groups. The groups are set server side for service-journey and + transit-group-priorities. The groups are set server side for service-journey and can not be configured in the API. This mainly helps to return competition neutral - services. Long distance authorities are put in different transit-priority-groups. + services. Long distance authorities are put in different transit-groups. This relaxes the comparison inside the routing engine for each stop-arrival. If two - paths have a different set of transit-priority-groups, then the generalized-cost + paths have a different set of transit-group-priorities, then the generalized-cost comparison is relaxed. The final set of paths are filtered through the normal itinerary-filters. @@ -839,7 +839,7 @@ type QueryType { THIS IS STILL AN EXPERIMENTAL FEATURE - IT MAY CHANGE WITHOUT ANY NOTICE! """ - relaxTransitPriorityGroup: RelaxCostInput = null, + relaxTransitGroupPriority: RelaxCostInput = null, """ Whether non-optimal transit paths at the destination should be returned. Let c be the existing minimum pareto optimal generalized-cost to beat. Then a trip with cost c' is @@ -852,7 +852,7 @@ type QueryType { Values less than 1.0 is not allowed, and values greater than 2.0 are not supported, due to performance reasons. """ - relaxTransitSearchGeneralizedCostAtDestination: Float = null @deprecated(reason : "This is replaced by 'relaxTransitPriorityGroup'."), + relaxTransitSearchGeneralizedCostAtDestination: Float = null @deprecated(reason : "This is replaced by 'relaxTransitGroupPriority'."), """ The length of the search-window in minutes. This parameter is optional. diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java index c1db11be779..43351b06eb8 100644 --- a/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java +++ b/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java @@ -22,7 +22,7 @@ import org.opentripplanner.raptor.api.model.DominanceFunction; import org.opentripplanner.raptor.api.request.RaptorProfile; import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; -import org.opentripplanner.raptor.api.request.RaptorTransitPriorityGroupCalculator; +import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; @@ -33,9 +33,9 @@ */ public class K01_TransitPriorityTest { - private static final RaptorTransitPriorityGroupCalculator PRIORITY_GROUP_CALCULATOR = new RaptorTransitPriorityGroupCalculator() { + private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR = new RaptorTransitGroupCalculator() { @Override - public int mergeTransitPriorityGroupIds(int currentGroupIds, int boardingGroupId) { + public int mergeGroupIds(int currentGroupIds, int boardingGroupId) { return currentGroupIds | boardingGroupId; } @@ -51,14 +51,8 @@ public DominanceFunction dominanceFunction() { private static final int GROUP_A = 0x01; private static final int GROUP_B = 0x02; private static final int GROUP_C = 0x04; - private static final int GROUP_AB = PRIORITY_GROUP_CALCULATOR.mergeTransitPriorityGroupIds( - GROUP_A, - GROUP_B - ); - private static final int GROUP_AC = PRIORITY_GROUP_CALCULATOR.mergeTransitPriorityGroupIds( - GROUP_A, - GROUP_C - ); + private static final int GROUP_AB = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_B); + private static final int GROUP_AC = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_C); private static final int C1_SLACK_90s = RaptorCostConverter.toRaptorCost(90); private final TestTransitData data = new TestTransitData(); diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java index c7b64cb5b9e..6954ac0d41a 100644 --- a/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java +++ b/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java @@ -8,7 +8,6 @@ import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_D; import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_E; import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_F; -import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_G; import static org.opentripplanner.raptor._data.RaptorTestConstants.T00_00; import static org.opentripplanner.raptor._data.RaptorTestConstants.T01_00; import static org.opentripplanner.raptor._data.api.PathUtils.pathsToString; @@ -26,7 +25,7 @@ import org.opentripplanner.raptor.api.model.DominanceFunction; import org.opentripplanner.raptor.api.request.RaptorProfile; import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; -import org.opentripplanner.raptor.api.request.RaptorTransitPriorityGroupCalculator; +import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator; import org.opentripplanner.raptor.configure.RaptorConfig; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; @@ -37,9 +36,9 @@ */ public class K02_TransitPriorityDestinationTest { - private static final RaptorTransitPriorityGroupCalculator PRIORITY_GROUP_CALCULATOR = new RaptorTransitPriorityGroupCalculator() { + private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR = new RaptorTransitGroupCalculator() { @Override - public int mergeTransitPriorityGroupIds(int currentGroupIds, int boardingGroupId) { + public int mergeGroupIds(int currentGroupIds, int boardingGroupId) { return currentGroupIds | boardingGroupId; } @@ -55,14 +54,8 @@ public DominanceFunction dominanceFunction() { private static final int GROUP_A = 0x01; private static final int GROUP_B = 0x02; private static final int GROUP_C = 0x04; - private static final int GROUP_AB = PRIORITY_GROUP_CALCULATOR.mergeTransitPriorityGroupIds( - GROUP_A, - GROUP_B - ); - private static final int GROUP_AC = PRIORITY_GROUP_CALCULATOR.mergeTransitPriorityGroupIds( - GROUP_A, - GROUP_C - ); + private static final int GROUP_AB = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_B); + private static final int GROUP_AC = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_C); private static final int C1_SLACK_90s = RaptorCostConverter.toRaptorCost(90); private final TestTransitData data = new TestTransitData(); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitPriorityGroup32nTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java similarity index 51% rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitPriorityGroup32nTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java index 85083a3ee6a..2713a190dbf 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitPriorityGroup32nTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java @@ -6,9 +6,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.raptor.api.request.RaptorTransitPriorityGroupCalculator; +import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator; -class TransitPriorityGroup32nTest { +class TransitGroupPriority32nTest { private static final int GROUP_INDEX_0 = 0; private static final int GROUP_INDEX_1 = 1; @@ -16,35 +16,35 @@ class TransitPriorityGroup32nTest { private static final int GROUP_INDEX_30 = 30; private static final int GROUP_INDEX_31 = 31; - private static final int GROUP_0 = TransitPriorityGroup32n.groupId(GROUP_INDEX_0); - private static final int GROUP_1 = TransitPriorityGroup32n.groupId(GROUP_INDEX_1); - private static final int GROUP_2 = TransitPriorityGroup32n.groupId(GROUP_INDEX_2); - private static final int GROUP_30 = TransitPriorityGroup32n.groupId(GROUP_INDEX_30); - private static final int GROUP_31 = TransitPriorityGroup32n.groupId(GROUP_INDEX_31); - private static final RaptorTransitPriorityGroupCalculator subjct = TransitPriorityGroup32n.priorityCalculator(); + private static final int GROUP_0 = TransitGroupPriority32n.groupId(GROUP_INDEX_0); + private static final int GROUP_1 = TransitGroupPriority32n.groupId(GROUP_INDEX_1); + private static final int GROUP_2 = TransitGroupPriority32n.groupId(GROUP_INDEX_2); + private static final int GROUP_30 = TransitGroupPriority32n.groupId(GROUP_INDEX_30); + private static final int GROUP_31 = TransitGroupPriority32n.groupId(GROUP_INDEX_31); + private static final RaptorTransitGroupCalculator subjct = TransitGroupPriority32n.priorityCalculator(); @Test void groupId() { - assertEqualsHex(0x00_00_00_00, TransitPriorityGroup32n.groupId(0)); - assertEqualsHex(0x00_00_00_01, TransitPriorityGroup32n.groupId(1)); - assertEqualsHex(0x00_00_00_02, TransitPriorityGroup32n.groupId(2)); - assertEqualsHex(0x00_00_00_04, TransitPriorityGroup32n.groupId(3)); - assertEqualsHex(0x40_00_00_00, TransitPriorityGroup32n.groupId(31)); - assertEqualsHex(0x80_00_00_00, TransitPriorityGroup32n.groupId(32)); + assertEqualsHex(0x00_00_00_00, TransitGroupPriority32n.groupId(0)); + assertEqualsHex(0x00_00_00_01, TransitGroupPriority32n.groupId(1)); + assertEqualsHex(0x00_00_00_02, TransitGroupPriority32n.groupId(2)); + assertEqualsHex(0x00_00_00_04, TransitGroupPriority32n.groupId(3)); + assertEqualsHex(0x40_00_00_00, TransitGroupPriority32n.groupId(31)); + assertEqualsHex(0x80_00_00_00, TransitGroupPriority32n.groupId(32)); - assertThrows(IllegalArgumentException.class, () -> TransitPriorityGroup32n.groupId(-1)); - assertThrows(IllegalArgumentException.class, () -> TransitPriorityGroup32n.groupId(33)); + assertThrows(IllegalArgumentException.class, () -> TransitGroupPriority32n.groupId(-1)); + assertThrows(IllegalArgumentException.class, () -> TransitGroupPriority32n.groupId(33)); } @Test - void mergeTransitPriorityGroupIds() { - assertEqualsHex(GROUP_0, subjct.mergeTransitPriorityGroupIds(GROUP_0, GROUP_0)); - assertEqualsHex(GROUP_1, subjct.mergeTransitPriorityGroupIds(GROUP_1, GROUP_1)); - assertEqualsHex(GROUP_0 | GROUP_1, subjct.mergeTransitPriorityGroupIds(GROUP_0, GROUP_1)); - assertEqualsHex(GROUP_30 | GROUP_31, subjct.mergeTransitPriorityGroupIds(GROUP_30, GROUP_31)); + void mergeTransitGroupPriorityIds() { + assertEqualsHex(GROUP_0, subjct.mergeGroupIds(GROUP_0, GROUP_0)); + assertEqualsHex(GROUP_1, subjct.mergeGroupIds(GROUP_1, GROUP_1)); + assertEqualsHex(GROUP_0 | GROUP_1, subjct.mergeGroupIds(GROUP_0, GROUP_1)); + assertEqualsHex(GROUP_30 | GROUP_31, subjct.mergeGroupIds(GROUP_30, GROUP_31)); assertEqualsHex( GROUP_0 | GROUP_1 | GROUP_2 | GROUP_30 | GROUP_31, - subjct.mergeTransitPriorityGroupIds(GROUP_0 | GROUP_1 | GROUP_2 | GROUP_30, GROUP_31) + subjct.mergeGroupIds(GROUP_0 | GROUP_1 | GROUP_2 | GROUP_30, GROUP_31) ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java index 777aee5352c..cc4bb09f01e 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java @@ -7,7 +7,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.routing.api.request.request.filter.TransitPriorityGroupSelect; +import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.RoutingTripPattern; import org.opentripplanner.transit.model.site.RegularStop; @@ -69,14 +69,14 @@ class PriorityGroupConfiguratorTest { @Test void emptyConfigurationShouldReturnGroupZero() { var subject = PriorityGroupConfigurator.of(List.of(), List.of()); - assertEquals(subject.baseGroupId(), subject.lookupTransitPriorityGroupId(railR1)); - assertEquals(subject.baseGroupId(), subject.lookupTransitPriorityGroupId(busB2)); - assertEquals(subject.baseGroupId(), subject.lookupTransitPriorityGroupId(null)); + assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(railR1)); + assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(busB2)); + assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(null)); } @Test - void lookupTransitPriorityGroupIdByAgency() { - var select = TransitPriorityGroupSelect + void lookupTransitGroupIdByAgency() { + var select = TransitGroupSelect .of() .addModes(List.of(TransitMode.BUS, TransitMode.RAIL)) .build(); @@ -85,12 +85,12 @@ void lookupTransitPriorityGroupIdByAgency() { var subject = PriorityGroupConfigurator.of(List.of(select), List.of()); // Agency groups are indexed (group-id set) at request time - assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitPriorityGroupId(null)); - assertEquals(EXP_GROUP_1, subject.lookupTransitPriorityGroupId(busB2)); - assertEquals(EXP_GROUP_2, subject.lookupTransitPriorityGroupId(railR3)); - assertEquals(EXP_GROUP_3, subject.lookupTransitPriorityGroupId(railR1)); - assertEquals(EXP_GROUP_2, subject.lookupTransitPriorityGroupId(busB3)); - assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitPriorityGroupId(ferryF3)); + assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(null)); + assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2)); + assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3)); + assertEquals(EXP_GROUP_3, subject.lookupTransitGroupPriorityId(railR1)); + assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(busB3)); + assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(ferryF3)); } @Test @@ -99,17 +99,17 @@ void lookupTransitPriorityGroupIdByGlobalMode() { var subject = PriorityGroupConfigurator.of( List.of(), List.of( - TransitPriorityGroupSelect.of().addModes(List.of(TransitMode.BUS)).build(), - TransitPriorityGroupSelect.of().addModes(List.of(TransitMode.RAIL)).build() + TransitGroupSelect.of().addModes(List.of(TransitMode.BUS)).build(), + TransitGroupSelect.of().addModes(List.of(TransitMode.RAIL)).build() ) ); - assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitPriorityGroupId(null)); - assertEquals(EXP_GROUP_2, subject.lookupTransitPriorityGroupId(railR1)); - assertEquals(EXP_GROUP_1, subject.lookupTransitPriorityGroupId(busB2)); - assertEquals(EXP_GROUP_2, subject.lookupTransitPriorityGroupId(railR3)); - assertEquals(EXP_GROUP_1, subject.lookupTransitPriorityGroupId(busB3)); - assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitPriorityGroupId(ferryF3)); + assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(null)); + assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR1)); + assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2)); + assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3)); + assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB3)); + assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(ferryF3)); } private static TestRouteData route( diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcherTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcherTest.java index 880d8bc9b45..91d0142f9ef 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcherTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcherTest.java @@ -6,7 +6,7 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.routing.api.request.request.filter.TransitPriorityGroupSelect; +import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; @@ -35,7 +35,7 @@ class PriorityGroupMatcherTest { @Test void testMode() { var m = PriorityGroupMatcher.of( - TransitPriorityGroupSelect.of().addModes(List.of(TransitMode.BUS, TransitMode.TRAM)).build() + TransitGroupSelect.of().addModes(List.of(TransitMode.BUS, TransitMode.TRAM)).build() ); assertEquals("Mode(BUS | TRAM)", m.toString()); assertFalse(m.isEmpty()); @@ -47,10 +47,10 @@ void testMode() { @Test void testAgencyIds() { var m1 = PriorityGroupMatcher.of( - TransitPriorityGroupSelect.of().addAgencyIds(List.of(r1agencyId)).build() + TransitGroupSelect.of().addAgencyIds(List.of(r1agencyId)).build() ); var m2 = PriorityGroupMatcher.of( - TransitPriorityGroupSelect.of().addAgencyIds(List.of(r1agencyId, anyId)).build() + TransitGroupSelect.of().addAgencyIds(List.of(r1agencyId, anyId)).build() ); var matchers = List.of(m1, m2); @@ -68,10 +68,10 @@ void testAgencyIds() { @Test void routeIds() { var m1 = PriorityGroupMatcher.of( - TransitPriorityGroupSelect.of().addRouteIds(List.of(r1routeId)).build() + TransitGroupSelect.of().addRouteIds(List.of(r1routeId)).build() ); var m2 = PriorityGroupMatcher.of( - TransitPriorityGroupSelect.of().addRouteIds(List.of(r1routeId, anyId)).build() + TransitGroupSelect.of().addRouteIds(List.of(r1routeId, anyId)).build() ); var matchers = List.of(m1, m2); @@ -89,7 +89,7 @@ void routeIds() { @Test void testSubMode() { var subject = PriorityGroupMatcher.of( - TransitPriorityGroupSelect.of().addSubModeRegexp(List.of(".*local.*")).build() + TransitGroupSelect.of().addSubModeRegexp(List.of(".*local.*")).build() ); assertEquals("SubModeRegexp(.*local.*)", subject.toString()); @@ -103,7 +103,7 @@ void testSubMode() { @Test void testAnd() { var subject = PriorityGroupMatcher.of( - TransitPriorityGroupSelect + TransitGroupSelect .of() .addSubModeRegexp(List.of("express")) .addRouteIds(List.of(r1routeId)) @@ -125,7 +125,7 @@ void testAnd() { @Test void testToString() { var subject = PriorityGroupMatcher.of( - TransitPriorityGroupSelect + TransitGroupSelect .of() .addModes(List.of(TransitMode.BUS, TransitMode.TRAM)) .addAgencyIds(List.of(anyId, r1agencyId)) diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java index 811c4a70b29..eb48de51867 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java @@ -77,8 +77,8 @@ void unpreferredCost() { } @Test - void relaxTransitPriorityGroup() { - assertEquals(TRANSIT_GROUP_PRIORITY_RELAX, subject.relaxTransitPriorityGroup()); + void relaxTransitGroupPriority() { + assertEquals(TRANSIT_GROUP_PRIORITY_RELAX, subject.relaxTransitGroupPriority()); } @Test @@ -125,7 +125,7 @@ void testToString() { "reluctanceForMode: {AIRPLANE=2.1}, " + "otherThanPreferredRoutesPenalty: $350, " + "unpreferredCost: 5m + 1.15 t, " + - "relaxTransitPriorityGroup: 5m + 1.50 t, " + + "relaxTransitGroupPriority: 5m + 1.50 t, " + "ignoreRealtimeUpdates, " + "includePlannedCancellations, " + "includeRealtimeCancellations, " + From 4c537c8a2f6ee9d1872d35892a31432972e03168 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 20 Dec 2023 14:55:33 +0100 Subject: [PATCH 0116/1688] fix: Properly implement the `relaxTransitGroupPriority` parameter in Transmodel API --- .../common/RequestToPreferencesMapper.java | 4 +- .../preferences/TransitPreferencesMapper.java | 8 +- .../transmodel/model/plan/RelaxCostType.java | 45 +++++++--- .../apis/transmodel/model/plan/TripQuery.java | 2 +- .../graphql/scalar/CostScalarFactory.java | 83 +++++++++++++++++++ .../preference/TransitPreferences.java | 2 +- .../routerequest/RouteRequestConfig.java | 4 +- .../apis/transmodel/schema.graphql | 13 +-- .../model/plan/RelaxCostTypeTest.java | 71 ++++++++++++++++ .../preference/TransitPreferencesTest.java | 2 +- 10 files changed, 209 insertions(+), 25 deletions(-) create mode 100644 src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java create mode 100644 src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java diff --git a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java index 6a8b71fe939..5c64d04a5d5 100644 --- a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java @@ -96,9 +96,7 @@ private BoardAndAlightSlack mapTransit() { setIfNotNull(req.ignoreRealtimeUpdates, tr::setIgnoreRealtimeUpdates); if (req.relaxTransitGroupPriority != null) { - tr.withTransitGroupPriorityGeneralizedCostSlack( - CostLinearFunction.of(req.relaxTransitGroupPriority) - ); + tr.withRelaxTransitGroupPriority(CostLinearFunction.of(req.relaxTransitGroupPriority)); } else { setIfNotNull( req.relaxTransitSearchGeneralizedCostAtDestination, diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java index d4bf92b828c..28643bf8199 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransitPreferencesMapper.java @@ -1,8 +1,11 @@ package org.opentripplanner.apis.transmodel.mapping.preferences; import graphql.schema.DataFetchingEnvironment; +import java.util.Map; import org.opentripplanner.apis.transmodel.model.TransportModeSlack; +import org.opentripplanner.apis.transmodel.model.plan.RelaxCostType; import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator; +import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.TransitPreferences; public class TransitPreferencesMapper { @@ -35,7 +38,10 @@ public static void mapTransitPreferences( callWith.argument("includeRealtimeCancellations", transit::setIncludeRealtimeCancellations); callWith.argument( "relaxTransitGroupPriority", - transit::withTransitGroupPriorityGeneralizedCostSlack + it -> + transit.withRelaxTransitGroupPriority( + RelaxCostType.mapToDomain((Map) it, CostLinearFunction.NORMAL) + ) ); callWith.argument( "relaxTransitSearchGeneralizedCostAtDestination", diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java index 3bd3ed129ef..d3455083695 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java @@ -2,13 +2,15 @@ import graphql.Scalars; import graphql.language.FloatValue; -import graphql.language.IntValue; import graphql.language.ObjectField; import graphql.language.ObjectValue; +import graphql.language.StringValue; import graphql.schema.GraphQLInputObjectField; import graphql.schema.GraphQLInputObjectType; -import graphql.schema.GraphQLList; -import graphql.schema.GraphQLNonNull; +import java.util.Map; +import org.opentripplanner.framework.graphql.scalar.CostScalarFactory; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; public class RelaxCostType { @@ -26,8 +28,8 @@ public class RelaxCostType { with twice as high cost as another one, is accepted. A `constant=$300` means a "fixed" constant is added to the limit. A `{ratio=1.0, constant=0}` is said to be the NORMAL relaxed cost - the limit is the same as the cost used to calculate the limit. The NORMAL is usually - the default. We can express the RelaxCost as a function `f(x) = constant + ratio * x`. - `f(x)=x` is the NORMAL function. + the default. We can express the RelaxCost as a function `f(t) = constant + ratio * t`. + `f(t)=t` is the NORMAL function. """ ) .field( @@ -44,11 +46,12 @@ public class RelaxCostType { .newInputObjectField() .name(CONSTANT) .description( - "The constant value to add to the limit. Must be a positive number. The unit" + - " is cost-seconds." + "The constant value to add to the limit. Must be a positive number. The value is" + + "equivalent to transit-cost-seconds. Integers is treated as seconds, but you may use " + + "the duration format. Example: '3665 = 'DT1h1m5s' = '1h1m5s'." ) - .defaultValueLiteral(IntValue.of(0)) - .type(new GraphQLList(new GraphQLNonNull(Scalars.GraphQLID))) + .defaultValueProgrammatic("0s") + .type(CostScalarFactory.costScalar()) .build() ) .build(); @@ -63,9 +66,31 @@ public static ObjectValue valueOf(CostLinearFunction value) { ObjectField .newObjectField() .name(CONSTANT) - .value(IntValue.of(value.constant().toSeconds())) + // We only use this to display default value (this is an input type), so using the + // lenient OTP version of duration is ok - it is slightly more readable. + .value(StringValue.of(DurationUtils.durationToStr(value.constant().asDuration()))) .build() ) .build(); } + + public static CostLinearFunction mapToDomain( + Map input, + CostLinearFunction defaultValue + ) { + if (input == null || input.isEmpty()) { + return defaultValue; + } + + double ratio = 1.0; + Cost constant = Cost.ZERO; + + if (input.containsKey(RATIO)) { + ratio = (Double) input.get(RATIO); + } + if (input.containsKey(CONSTANT)) { + constant = (Cost) input.get(CONSTANT); + } + return CostLinearFunction.of(constant, ratio); + } } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index 52bafc1f28b..410ec0ee74a 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -291,7 +291,7 @@ public static GraphQLFieldDefinition create( itinerary-filters. - The `ratio` must be greater or equal to 1.0 and less then 1.2. - - The `slack` must be greater or equal to 0 and less then 3600. + - The `constant` must be greater or equal to '0s' and less then '1h'. THIS IS STILL AN EXPERIMENTAL FEATURE - IT MAY CHANGE WITHOUT ANY NOTICE! """.stripIndent() diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java b/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java new file mode 100644 index 00000000000..6f710328174 --- /dev/null +++ b/src/main/java/org/opentripplanner/framework/graphql/scalar/CostScalarFactory.java @@ -0,0 +1,83 @@ +package org.opentripplanner.framework.graphql.scalar; + +import graphql.GraphQLContext; +import graphql.execution.CoercedVariables; +import graphql.language.StringValue; +import graphql.language.Value; +import graphql.schema.Coercing; +import graphql.schema.CoercingParseLiteralException; +import graphql.schema.CoercingParseValueException; +import graphql.schema.GraphQLScalarType; +import java.util.Locale; +import java.util.NoSuchElementException; +import javax.annotation.Nonnull; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.framework.time.DurationUtils; + +public class CostScalarFactory { + + private static final String TYPENAME = "Cost"; + + private static final String DOCUMENTATION = + "A cost value, normally a value of 1 is equivalent to riding transit for 1 second, " + + "but it might not depending on the use-case. Format: 3665 = DT1h1m5s = 1h1m5s"; + + private static final GraphQLScalarType SCALAR_INSTANCE = createCostScalar(); + + private CostScalarFactory() {} + + public static GraphQLScalarType costScalar() { + return SCALAR_INSTANCE; + } + + private static GraphQLScalarType createCostScalar() { + return GraphQLScalarType + .newScalar() + .name(TYPENAME) + .description(DOCUMENTATION) + .coercing(createCoercing()) + .build(); + } + + private static String serializeCost(Cost cost) { + return cost.asDuration().toString(); + } + + private static Cost parseCost(String input) throws CoercingParseValueException { + try { + return Cost.fromDuration(DurationUtils.parseSecondsOrDuration(input).orElseThrow()); + } catch (IllegalArgumentException | NoSuchElementException e) { + throw new CoercingParseValueException(e.getMessage(), e); + } + } + + private static Coercing createCoercing() { + return new Coercing<>() { + @Override + public String serialize(@Nonnull Object result, GraphQLContext c, Locale l) { + return serializeCost((Cost) result); + } + + @Override + public Cost parseValue(Object input, GraphQLContext c, Locale l) + throws CoercingParseValueException { + return parseCost((String) input); + } + + @Override + public Cost parseLiteral(Value input, CoercedVariables v, GraphQLContext c, Locale l) + throws CoercingParseLiteralException { + if (input instanceof StringValue stringValue) { + return parseCost(stringValue.getValue()); + } + return null; + } + + @Override + @Nonnull + public Value valueToLiteral(Object input, GraphQLContext c, Locale l) { + return StringValue.of((String) input); + } + }; + } +} diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java index c0a090937d9..9c54fcb6d5c 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TransitPreferences.java @@ -302,7 +302,7 @@ public Builder setUnpreferredCostString(String constFunction) { return setUnpreferredCost(CostLinearFunction.of(constFunction)); } - public Builder withTransitGroupPriorityGeneralizedCostSlack(CostLinearFunction value) { + public Builder withRelaxTransitGroupPriority(CostLinearFunction value) { this.relaxTransitGroupPriority = value; return this; } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 1f3807f46b6..a975848e260 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -311,9 +311,7 @@ The board time is added to the time when going from the stop (offboard) to onboa .asString(dft.relaxTransitGroupPriority().toString()); if (relaxTransitGroupPriorityValue != null) { - builder.withTransitGroupPriorityGeneralizedCostSlack( - CostLinearFunction.of(relaxTransitGroupPriorityValue) - ); + builder.withRelaxTransitGroupPriority(CostLinearFunction.of(relaxTransitGroupPriorityValue)); } // TODO REMOVE THIS diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index ab79917b9cc..b5d1dc00a39 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -835,7 +835,7 @@ type QueryType { itinerary-filters. - The `ratio` must be greater or equal to 1.0 and less then 1.2. - - The `slack` must be greater or equal to 0 and less then 3600. + - The `constant` must be greater or equal to '0s' and less then '1h'. THIS IS STILL AN EXPERIMENTAL FEATURE - IT MAY CHANGE WITHOUT ANY NOTICE! """ @@ -1867,6 +1867,9 @@ enum WheelchairBoarding { "List of coordinates like: [[60.89, 11.12], [62.56, 12.10]]" scalar Coordinates +"A cost value, normally a value of 1 is equivalent to riding transit for 1 second, but it might not depending on the use-case. Format: 3665 = DT1h1m5s = 1h1m5s" +scalar Cost + "Local date using the ISO 8601 format: `YYYY-MM-DD`. Example: `2020-05-17`." scalar Date @@ -2028,12 +2031,12 @@ This is used to include more results into the result. A `ratio=2.0` means a path with twice as high cost as another one, is accepted. A `constant=$300` means a "fixed" constant is added to the limit. A `{ratio=1.0, constant=0}` is said to be the NORMAL relaxed cost - the limit is the same as the cost used to calculate the limit. The NORMAL is usually -the default. We can express the RelaxCost as a function `f(x) = constant + ratio * x`. -`f(x)=x` is the NORMAL function. +the default. We can express the RelaxCost as a function `f(t) = constant + ratio * t`. +`f(t)=t` is the NORMAL function. """ input RelaxCostInput { - "The constant value to add to the limit. Must be a positive number. The unit is cost-seconds." - constant: [ID!] = 0 + "The constant value to add to the limit. Must be a positive number. The value isequivalent to transit-cost-seconds. Integers is treated as seconds, but you may use the duration format. Example: '3665 = 'DT1h1m5s' = '1h1m5s'." + constant: Cost = "0s" "The factor to multiply with the 'other cost'. Minimum value is 1.0." ratio: Float = 1.0 } diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java b/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java new file mode 100644 index 00000000000..b4da249742c --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostTypeTest.java @@ -0,0 +1,71 @@ +package org.opentripplanner.apis.transmodel.model.plan; + +import static org.junit.jupiter.api.Assertions.*; +import static org.opentripplanner.apis.transmodel.model.plan.RelaxCostType.CONSTANT; +import static org.opentripplanner.apis.transmodel.model.plan.RelaxCostType.RATIO; + +import graphql.language.FloatValue; +import graphql.language.ObjectField; +import graphql.language.ObjectValue; +import graphql.language.StringValue; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.routing.api.request.framework.CostLinearFunction; + +class RelaxCostTypeTest { + + @Test + void valueOf() { + assertEquals( + ObjectValue + .newObjectValue() + .objectField(ObjectField.newObjectField().name(RATIO).value(FloatValue.of(1.0)).build()) + .objectField( + ObjectField.newObjectField().name(CONSTANT).value(StringValue.of("0s")).build() + ) + .build() + .toString(), + RelaxCostType.valueOf(CostLinearFunction.NORMAL).toString() + ); + assertEquals( + ObjectValue + .newObjectValue() + .objectField(ObjectField.newObjectField().name(RATIO).value(FloatValue.of(1.3)).build()) + .objectField( + ObjectField.newObjectField().name(CONSTANT).value(StringValue.of("1m7s")).build() + ) + .build() + .toString(), + RelaxCostType.valueOf(CostLinearFunction.of(Cost.costOfSeconds(67), 1.3)).toString() + ); + } + + @Test + void mapToDomain() { + Map input; + + input = Map.of(RATIO, 1.0, CONSTANT, Cost.ZERO); + assertEquals( + CostLinearFunction.NORMAL, + RelaxCostType.mapToDomain(input, CostLinearFunction.ZERO) + ); + + input = Map.of(RATIO, 0.0, CONSTANT, Cost.ZERO); + assertEquals( + CostLinearFunction.ZERO, + RelaxCostType.mapToDomain(input, CostLinearFunction.ZERO) + ); + + input = Map.of(RATIO, 1.7, CONSTANT, Cost.costOfSeconds(3600 + 3 * 60 + 7)); + assertEquals( + CostLinearFunction.of("1h3m7s + 1.7t"), + RelaxCostType.mapToDomain(input, CostLinearFunction.ZERO) + ); + assertEquals( + CostLinearFunction.NORMAL, + RelaxCostType.mapToDomain(null, CostLinearFunction.NORMAL) + ); + assertEquals(CostLinearFunction.ZERO, RelaxCostType.mapToDomain(null, CostLinearFunction.ZERO)); + } +} diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java index eb48de51867..b77a7d9085b 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/TransitPreferencesTest.java @@ -42,7 +42,7 @@ class TransitPreferencesTest { .setUnpreferredCost(UNPREFERRED_COST) .withBoardSlack(b -> b.withDefault(D45s).with(TransitMode.AIRPLANE, D35m)) .withAlightSlack(b -> b.withDefault(D15s).with(TransitMode.AIRPLANE, D25m)) - .withTransitGroupPriorityGeneralizedCostSlack(TRANSIT_GROUP_PRIORITY_RELAX) + .withRelaxTransitGroupPriority(TRANSIT_GROUP_PRIORITY_RELAX) .setIgnoreRealtimeUpdates(IGNORE_REALTIME_UPDATES) .setIncludePlannedCancellations(INCLUDE_PLANNED_CANCELLATIONS) .setIncludeRealtimeCancellations(INCLUDE_REALTIME_CANCELLATIONS) From ce558ec12dd1a00e695875badae520c31068a1c9 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 21 Dec 2023 16:28:49 +0100 Subject: [PATCH 0117/1688] refactor: Cleanup transit-group-priority module-tests --- .../moduletests/K01_TransitPriorityTest.java | 44 +++------------- .../K02_TransitPriorityDestinationTest.java | 44 +++------------- .../support/TestGroupPriorityCalculator.java | 51 +++++++++++++++++++ 3 files changed, 63 insertions(+), 76 deletions(-) create mode 100644 src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java index 43351b06eb8..1795663aaba 100644 --- a/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java +++ b/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java @@ -12,6 +12,9 @@ import static org.opentripplanner.raptor._data.transit.TestRoute.route; import static org.opentripplanner.raptor._data.transit.TestTripPattern.pattern; import static org.opentripplanner.raptor._data.transit.TestTripSchedule.schedule; +import static org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator.GROUP_A; +import static org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator.GROUP_B; +import static org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator.GROUP_C; import java.time.Duration; import org.junit.jupiter.api.BeforeEach; @@ -24,6 +27,7 @@ import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator; import org.opentripplanner.raptor.configure.RaptorConfig; +import org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; /** @@ -33,26 +37,8 @@ */ public class K01_TransitPriorityTest { - private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR = new RaptorTransitGroupCalculator() { - @Override - public int mergeGroupIds(int currentGroupIds, int boardingGroupId) { - return currentGroupIds | boardingGroupId; - } - - /** - * Left dominate right, if right has at least one priority group not in left. - */ - @Override - public DominanceFunction dominanceFunction() { - return (l, r) -> ((l ^ r) & r) != 0; - } - }; - - private static final int GROUP_A = 0x01; - private static final int GROUP_B = 0x02; - private static final int GROUP_C = 0x04; - private static final int GROUP_AB = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_B); - private static final int GROUP_AC = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_C); + private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR = + TestGroupPriorityCalculator.PRIORITY_CALCULATOR; private static final int C1_SLACK_90s = RaptorCostConverter.toRaptorCost(90); private final TestTransitData data = new TestTransitData(); @@ -102,7 +88,6 @@ private void prepareRequest() { ); // Add 1 second access/egress paths requestBuilder.searchParams().addAccessPaths(walk(STOP_B, 1)).addEgressPaths(walk(STOP_C, 1)); - assetGroupCalculatorIsSetupCorrect(); } @Test @@ -116,21 +101,4 @@ public void transitPriority() { pathsToString(raptorService.route(requestBuilder.build(), data)) ); } - - /** - * Make sure the calculator and group setup is done correct. - */ - void assetGroupCalculatorIsSetupCorrect() { - var d = PRIORITY_GROUP_CALCULATOR.dominanceFunction(); - - assertTrue(d.leftDominateRight(GROUP_A, GROUP_B)); - assertTrue(d.leftDominateRight(GROUP_B, GROUP_A)); - assertFalse(d.leftDominateRight(GROUP_A, GROUP_A)); - // 3 = 1&2, 5 = 1&4 - assertTrue(d.leftDominateRight(GROUP_A, GROUP_AB)); - assertFalse(d.leftDominateRight(GROUP_AB, GROUP_A)); - assertFalse(d.leftDominateRight(GROUP_AB, GROUP_AB)); - assertTrue(d.leftDominateRight(GROUP_AB, GROUP_AC)); - assertTrue(d.leftDominateRight(GROUP_AC, GROUP_AB)); - } } diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java index 6954ac0d41a..a2185acef5e 100644 --- a/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java +++ b/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java @@ -15,6 +15,9 @@ import static org.opentripplanner.raptor._data.transit.TestRoute.route; import static org.opentripplanner.raptor._data.transit.TestTripPattern.pattern; import static org.opentripplanner.raptor._data.transit.TestTripSchedule.schedule; +import static org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator.GROUP_A; +import static org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator.GROUP_B; +import static org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator.GROUP_C; import java.time.Duration; import org.junit.jupiter.api.BeforeEach; @@ -27,6 +30,7 @@ import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator; import org.opentripplanner.raptor.configure.RaptorConfig; +import org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; /** @@ -36,26 +40,8 @@ */ public class K02_TransitPriorityDestinationTest { - private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR = new RaptorTransitGroupCalculator() { - @Override - public int mergeGroupIds(int currentGroupIds, int boardingGroupId) { - return currentGroupIds | boardingGroupId; - } - - /** - * Left dominate right, if right has at least one priority group not in left. - */ - @Override - public DominanceFunction dominanceFunction() { - return (l, r) -> ((l ^ r) & r) != 0; - } - }; - - private static final int GROUP_A = 0x01; - private static final int GROUP_B = 0x02; - private static final int GROUP_C = 0x04; - private static final int GROUP_AB = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_B); - private static final int GROUP_AC = PRIORITY_GROUP_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_C); + private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR = + TestGroupPriorityCalculator.PRIORITY_CALCULATOR; private static final int C1_SLACK_90s = RaptorCostConverter.toRaptorCost(90); private final TestTransitData data = new TestTransitData(); @@ -110,7 +96,6 @@ private void prepareRequest() { .addEgressPaths(walk(STOP_D, 1)) .addEgressPaths(walk(STOP_E, 1)) .addEgressPaths(walk(STOP_F, 1)); - assetGroupCalculatorIsSetupCorrect(); } @Test @@ -124,21 +109,4 @@ public void transitPriority() { pathsToString(raptorService.route(requestBuilder.build(), data)) ); } - - /** - * Make sure the calculator and group setup is done correct. - */ - void assetGroupCalculatorIsSetupCorrect() { - var d = PRIORITY_GROUP_CALCULATOR.dominanceFunction(); - - assertTrue(d.leftDominateRight(GROUP_A, GROUP_B)); - assertTrue(d.leftDominateRight(GROUP_B, GROUP_A)); - assertFalse(d.leftDominateRight(GROUP_A, GROUP_A)); - // 3 = 1&2, 5 = 1&4 - assertTrue(d.leftDominateRight(GROUP_A, GROUP_AB)); - assertFalse(d.leftDominateRight(GROUP_AB, GROUP_A)); - assertFalse(d.leftDominateRight(GROUP_AB, GROUP_AB)); - assertTrue(d.leftDominateRight(GROUP_AB, GROUP_AC)); - assertTrue(d.leftDominateRight(GROUP_AC, GROUP_AB)); - } } diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java b/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java new file mode 100644 index 00000000000..cdbe82f18a6 --- /dev/null +++ b/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java @@ -0,0 +1,51 @@ +package org.opentripplanner.raptor.moduletests.support; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.raptor.api.model.DominanceFunction; +import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator; + +public class TestGroupPriorityCalculator implements RaptorTransitGroupCalculator { + + public static final RaptorTransitGroupCalculator PRIORITY_CALCULATOR = new TestGroupPriorityCalculator(); + + public static final int GROUP_A = 0x01; + public static final int GROUP_B = 0x02; + public static final int GROUP_C = 0x04; + + private static final int GROUP_AB = PRIORITY_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_B); + private static final int GROUP_AC = PRIORITY_CALCULATOR.mergeGroupIds(GROUP_A, GROUP_C); + + @Override + public int mergeGroupIds(int currentGroupIds, int boardingGroupId) { + return currentGroupIds | boardingGroupId; + } + + /** + * Left dominate right, if right has at least one priority group not in left. + */ + @Override + public DominanceFunction dominanceFunction() { + return (l, r) -> ((l ^ r) & r) != 0; + } + + /** + * Make sure the calculator and group setup is done correct. + */ + @Test + void assetGroupCalculatorIsSetupCorrect() { + var d = PRIORITY_CALCULATOR.dominanceFunction(); + + assertTrue(d.leftDominateRight(GROUP_A, GROUP_B)); + assertTrue(d.leftDominateRight(GROUP_B, GROUP_A)); + assertFalse(d.leftDominateRight(GROUP_A, GROUP_A)); + // 3 = 1&2, 5 = 1&4 + assertTrue(d.leftDominateRight(GROUP_A, GROUP_AB)); + assertFalse(d.leftDominateRight(GROUP_AB, GROUP_A)); + assertFalse(d.leftDominateRight(GROUP_AB, GROUP_AB)); + assertTrue(d.leftDominateRight(GROUP_AB, GROUP_AC)); + assertTrue(d.leftDominateRight(GROUP_AC, GROUP_AB)); + } +} From d03bd74891a1f5c28cfdfc5b507abc847d33a49d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Dec 2023 09:10:10 +0000 Subject: [PATCH 0118/1688] fix(deps): update dependency ch.poole:openinghoursparser to v0.28.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 17da0dcfc95..e66a9ee868e 100644 --- a/pom.xml +++ b/pom.xml @@ -944,7 +944,7 @@ ch.poole OpeningHoursParser - 0.27.1 + 0.28.0 From 4aed01b1a266fd7ba4c45f2e8ad5fbbb30c59543 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 29 Dec 2023 17:38:38 +0200 Subject: [PATCH 0119/1688] Fix typo --- .../street/model/edge/VehicleRentalEdgeTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java index f61c9599685..84f5efcc1c5 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java @@ -227,8 +227,8 @@ private void initEdgeAndRequest( .withCar(car -> car.withRental(rental -> rental.withUseAvailabilityInformation(useRealtime)) ) - .withBike(bik -> - bik.withRental(rental -> rental.withUseAvailabilityInformation(useRealtime)) + .withBike(bike -> + bike.withRental(rental -> rental.withUseAvailabilityInformation(useRealtime)) ) .build() ) From 85e818272ecf11cfee4d0c0b173126403a98fecf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 29 Dec 2023 12:51:36 +0000 Subject: [PATCH 0120/1688] chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.12.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e66a9ee868e..5a3f6a6d6ec 100644 --- a/pom.xml +++ b/pom.xml @@ -142,7 +142,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.0 + 3.12.1 21 From 52d2107032468c75148226a6d9a8133d93b828fb Mon Sep 17 00:00:00 2001 From: Pi-Cla Date: Fri, 29 Dec 2023 19:57:42 -0700 Subject: [PATCH 0121/1688] doc: mention protomaps in basic tutorial It does not require installing any additional software and the interface is intuitive to use --- docs/Basic-Tutorial.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/Basic-Tutorial.md b/docs/Basic-Tutorial.md index 6b993395aec..3d99d96f4da 100644 --- a/docs/Basic-Tutorial.md +++ b/docs/Basic-Tutorial.md @@ -64,6 +64,8 @@ states, from which you can prepare your own smaller bounding-box extracts using [Osmosis](http://wiki.openstreetmap.org/wiki/Osmosis#Extracting_bounding_boxes) , [osmconvert](http://wiki.openstreetmap.org/wiki/Osmconvert#Applying_Geographical_Borders), or (our favorite) [Osmium-Tool](https://osmcode.org/osmium-tool/manual.html#creating-geographic-extracts). +There is also [Protomaps](https://app.protomaps.com/) which can create custom extracts +for any region of the world with an easy to use drag and drop interface. OSM data can be delivered as XML or in the more compact binary PBF format. OpenTripPlanner consumes only PBF because it's smaller and more efficient. @@ -202,4 +204,4 @@ You can run the OTP .jar file with the `--help` option for a full list of comman ## Exploring the API -If you want to learn how to use OTP's API's, check out the [GraphQL tutorial](apis/GraphQL-Tutorial.md). \ No newline at end of file +If you want to learn how to use OTP's API's, check out the [GraphQL tutorial](apis/GraphQL-Tutorial.md). From 204503e622331289825ec8bf2d6c99d0f2a11300 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 30 Dec 2023 08:31:35 +0000 Subject: [PATCH 0122/1688] fix(deps): update slf4j.version to v2.0.10 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5a3f6a6d6ec..de8baecefd9 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 5.5.3 1.4.14 9.8.0 - 2.0.9 + 2.0.10 2.0.15 1.26 4.0.4 From 2ae11b618ff285d62ada2afd929b87dc25281006 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 00:53:08 +0000 Subject: [PATCH 0123/1688] chore(deps): update dependency mkdocs-material to v9.5.3 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 1474504e154..8c87ef1c626 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ mkdocs==1.5.3 -mkdocs-material==9.4.2 +mkdocs-material==9.5.3 mike@git+https://github.com/jimporter/mike.git@f0522f245e64687dd18384fbd86b721175711474 mkdocs-no-sitemap-plugin==0.0.1 From cc80089ed05efe9801641714cf0f9a1afa609aa0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 03:32:35 +0000 Subject: [PATCH 0124/1688] fix(deps): update lucene.version to v9.9.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de8baecefd9..fd08bc9975a 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 1.11.5 5.5.3 1.4.14 - 9.8.0 + 9.9.1 2.0.10 2.0.15 1.26 From b08822ba63144214ae4eaf3cadd7afa900748cf1 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 2 Jan 2024 09:17:19 +0000 Subject: [PATCH 0125/1688] Add changelog entry for #5586 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index ab111495f5d..23da2030fd5 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -65,6 +65,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - GTFS Flex spec update: separate columns for `location_id`, `location_group_id` [#5564](https://github.com/opentripplanner/OpenTripPlanner/pull/5564) - Report NO_TRANSIT_CONNECTION when search-window is set. [#5570](https://github.com/opentripplanner/OpenTripPlanner/pull/5570) - Transit priority - part 3 [#5583](https://github.com/opentripplanner/OpenTripPlanner/pull/5583) +- Fix preference cost comparisons [#5586](https://github.com/opentripplanner/OpenTripPlanner/pull/5586) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From d96191f734cc5f4e249482ef2680629708bca80b Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 2 Jan 2024 09:17:53 +0000 Subject: [PATCH 0126/1688] Add changelog entry for #5587 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 23da2030fd5..bf2d502e636 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -66,6 +66,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Report NO_TRANSIT_CONNECTION when search-window is set. [#5570](https://github.com/opentripplanner/OpenTripPlanner/pull/5570) - Transit priority - part 3 [#5583](https://github.com/opentripplanner/OpenTripPlanner/pull/5583) - Fix preference cost comparisons [#5586](https://github.com/opentripplanner/OpenTripPlanner/pull/5586) +- Report and throw away trip-times which fail sanity check [#5587](https://github.com/opentripplanner/OpenTripPlanner/pull/5587) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 5c8e8477eb31914a328670697ca9ac74857d965f Mon Sep 17 00:00:00 2001 From: Viljami Nurminen Date: Tue, 2 Jan 2024 12:42:52 +0200 Subject: [PATCH 0127/1688] Extract static method for OSM graph building --- .../islandpruning/EscalatorPruningTest.java | 50 ++----------------- .../islandpruning/IslandPruningUtils.java | 46 +++++++++++++++++ .../islandpruning/PruneNoThruIslandsTest.java | 41 +-------------- 3 files changed, 52 insertions(+), 85 deletions(-) create mode 100644 src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java index aa4191d3002..b063fcbd184 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java @@ -1,32 +1,22 @@ package org.opentripplanner.graph_builder.module.islandpruning; -import java.io.File; +import static org.opentripplanner.graph_builder.module.islandpruning.IslandPruningUtils.buildOsmGraph; + import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.graph_builder.module.osm.OsmModule; -import org.opentripplanner.openstreetmap.OsmProvider; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; -import org.opentripplanner.transit.model.framework.Deduplicator; -import org.opentripplanner.transit.service.StopModel; -import org.opentripplanner.transit.service.TransitModel; public class EscalatorPruningTest { private static Graph graph; - @BeforeAll - static void setup() { - graph = - buildOsmGraph(ResourceLoader.of(EscalatorPruningTest.class).file("matinkyla-escalator.pbf")); - } - @Test public void streetEdgesBetweenEscalatorEdgesRetained() { + graph = + buildOsmGraph(ResourceLoader.of(EscalatorPruningTest.class).file("matinkyla-escalator.pbf")); Assertions.assertTrue( graph .getStreetEdges() @@ -36,36 +26,4 @@ public void streetEdgesBetweenEscalatorEdgesRetained() { .containsAll(Set.of("490072445")) ); } - - private static Graph buildOsmGraph(File osmFile) { - try { - var deduplicator = new Deduplicator(); - var graph = new Graph(deduplicator); - var transitModel = new TransitModel(new StopModel(), deduplicator); - // Add street data from OSM - OsmProvider osmProvider = new OsmProvider(osmFile, true); - OsmModule osmModule = OsmModule.of(osmProvider, graph).withEdgeNamer(new TestNamer()).build(); - - osmModule.buildGraph(); - - transitModel.index(); - graph.index(transitModel.getStopModel()); - - // Prune floating islands and set noThru where necessary - PruneIslands pruneIslands = new PruneIslands( - graph, - transitModel, - DataImportIssueStore.NOOP, - null - ); - pruneIslands.setPruningThresholdIslandWithoutStops(40); - pruneIslands.setPruningThresholdIslandWithStops(5); - pruneIslands.setAdaptivePruningFactor(1); - pruneIslands.buildGraph(); - - return graph; - } catch (Exception e) { - throw new RuntimeException(e); - } - } } diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java new file mode 100644 index 00000000000..499756de70e --- /dev/null +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java @@ -0,0 +1,46 @@ +package org.opentripplanner.graph_builder.module.islandpruning; + +import java.io.File; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; +import org.opentripplanner.graph_builder.module.osm.OsmModule; +import org.opentripplanner.openstreetmap.OsmProvider; +import org.opentripplanner.routing.graph.Graph; +import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.service.StopModel; +import org.opentripplanner.transit.service.TransitModel; + +public class IslandPruningUtils { + + static Graph buildOsmGraph(File osmFile) { + try { + var deduplicator = new Deduplicator(); + var graph = new Graph(deduplicator); + var transitModel = new TransitModel(new StopModel(), deduplicator); + // Add street data from OSM + OsmProvider osmProvider = new OsmProvider(osmFile, true); + OsmModule osmModule = OsmModule.of(osmProvider, graph).withEdgeNamer(new TestNamer()).build(); + + osmModule.buildGraph(); + + transitModel.index(); + graph.index(transitModel.getStopModel()); + + // Prune floating islands and set noThru where necessary + PruneIslands pruneIslands = new PruneIslands( + graph, + transitModel, + DataImportIssueStore.NOOP, + null + ); + pruneIslands.setPruningThresholdIslandWithoutStops(10); + pruneIslands.setPruningThresholdIslandWithStops(2); + pruneIslands.setAdaptivePruningFactor(50); + pruneIslands.setAdaptivePruningDistance(250); + pruneIslands.buildGraph(); + + return graph; + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java index 53a2d60fe0f..f9453b0941c 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java @@ -1,20 +1,15 @@ package org.opentripplanner.graph_builder.module.islandpruning; -import java.io.File; +import static org.opentripplanner.graph_builder.module.islandpruning.IslandPruningUtils.buildOsmGraph; + import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.graph_builder.module.osm.OsmModule; -import org.opentripplanner.openstreetmap.OsmProvider; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.test.support.ResourceLoader; -import org.opentripplanner.transit.model.framework.Deduplicator; -import org.opentripplanner.transit.service.StopModel; -import org.opentripplanner.transit.service.TransitModel; public class PruneNoThruIslandsTest { @@ -67,36 +62,4 @@ public void pruneFloatingBikeAndWalkIsland() { .contains("159830257") ); } - - private static Graph buildOsmGraph(File osmFile) { - try { - var deduplicator = new Deduplicator(); - var graph = new Graph(deduplicator); - var transitModel = new TransitModel(new StopModel(), deduplicator); - // Add street data from OSM - OsmProvider osmProvider = new OsmProvider(osmFile, true); - OsmModule osmModule = OsmModule.of(osmProvider, graph).withEdgeNamer(new TestNamer()).build(); - - osmModule.buildGraph(); - - transitModel.index(); - graph.index(transitModel.getStopModel()); - - // Prune floating islands and set noThru where necessary - PruneIslands pruneIslands = new PruneIslands( - graph, - transitModel, - DataImportIssueStore.NOOP, - null - ); - pruneIslands.setPruningThresholdIslandWithoutStops(40); - pruneIslands.setPruningThresholdIslandWithStops(5); - pruneIslands.setAdaptivePruningFactor(1); - pruneIslands.buildGraph(); - - return graph; - } catch (Exception e) { - throw new RuntimeException(e); - } - } } From 9138ba08acb320ee2c9be83e5f2c849008282897 Mon Sep 17 00:00:00 2001 From: Viljami Nurminen Date: Tue, 2 Jan 2024 13:07:28 +0200 Subject: [PATCH 0128/1688] Make OSM graph building method package-private --- .../graph_builder/module/islandpruning/IslandPruningUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java index 499756de70e..dbe86247cac 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java @@ -9,7 +9,7 @@ import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; -public class IslandPruningUtils { +class IslandPruningUtils { static Graph buildOsmGraph(File osmFile) { try { From 71047d8d905e6563253ccddc53bd8dc21e1472b8 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 2 Jan 2024 15:01:01 +0200 Subject: [PATCH 0129/1688] hopOnOrOffCost -> hopCost --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 32acd3d4557..0859edd8ab7 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -5544,7 +5544,7 @@ input BicycleWalkPreferencesCostInput { bicycle walking. However, this cost is not applied when getting on a rented bicycle for the first time or when getting off the bicycle when returning the bicycle. """ - hopOnOrOffCost: Cost + hopCost: Cost """ A cost multiplier of bicycle walking travel time. The multiplier is for how bad @@ -5562,7 +5562,7 @@ input ScooterWalkPreferencesCostInput { scooter walking. However, this cost is not applied when getting on a rented scooter for the first time or when getting off the scooter when returning the scooter. """ - hopOnOrOffCost: Cost + hopCost: Cost """ A cost multiplier of scooter walking travel time. The multiplier is for how bad From 32ebf6c4389b3e261fbe1e207624a7ef93c42130 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 2 Jan 2024 16:42:03 +0100 Subject: [PATCH 0130/1688] Move serialization code into sandbox --- .../ext/restapi/serialization}/FeedScopedIdDeserializer.java | 2 +- .../ext/restapi/serialization}/FeedScopedIdKeyDeserializer.java | 2 +- .../ext/restapi/serialization}/FeedScopedIdSerializer.java | 2 +- .../ext/restapi/serialization}/JSONObjectMapperProvider.java | 2 +- .../framework/graphql/GraphQLResponseSerializer.java | 2 +- .../opentripplanner/standalone/server/OTPWebApplication.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/{main/java/org/opentripplanner/apis/common/json => ext/java/org/opentripplanner/ext/restapi/serialization}/FeedScopedIdDeserializer.java (94%) rename src/{main/java/org/opentripplanner/apis/common/json => ext/java/org/opentripplanner/ext/restapi/serialization}/FeedScopedIdKeyDeserializer.java (91%) rename src/{main/java/org/opentripplanner/apis/common/json => ext/java/org/opentripplanner/ext/restapi/serialization}/FeedScopedIdSerializer.java (96%) rename src/{main/java/org/opentripplanner/apis/common/json => ext/java/org/opentripplanner/ext/restapi/serialization}/JSONObjectMapperProvider.java (98%) diff --git a/src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdDeserializer.java b/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdDeserializer.java similarity index 94% rename from src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdDeserializer.java rename to src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdDeserializer.java index b1946038e7e..75b1b58bfee 100644 --- a/src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdDeserializer.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdDeserializer.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common.json; +package org.opentripplanner.ext.restapi.serialization; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdKeyDeserializer.java b/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdKeyDeserializer.java similarity index 91% rename from src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdKeyDeserializer.java rename to src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdKeyDeserializer.java index 316894763ad..75270e9dd0b 100644 --- a/src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdKeyDeserializer.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdKeyDeserializer.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common.json; +package org.opentripplanner.ext.restapi.serialization; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.KeyDeserializer; diff --git a/src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdSerializer.java b/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdSerializer.java similarity index 96% rename from src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdSerializer.java rename to src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdSerializer.java index 471d80aa915..c9c67e675c4 100644 --- a/src/main/java/org/opentripplanner/apis/common/json/FeedScopedIdSerializer.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/serialization/FeedScopedIdSerializer.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common.json; +package org.opentripplanner.ext.restapi.serialization; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/src/main/java/org/opentripplanner/apis/common/json/JSONObjectMapperProvider.java b/src/ext/java/org/opentripplanner/ext/restapi/serialization/JSONObjectMapperProvider.java similarity index 98% rename from src/main/java/org/opentripplanner/apis/common/json/JSONObjectMapperProvider.java rename to src/ext/java/org/opentripplanner/ext/restapi/serialization/JSONObjectMapperProvider.java index 6121a0ba698..e271e945ca1 100644 --- a/src/main/java/org/opentripplanner/apis/common/json/JSONObjectMapperProvider.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/serialization/JSONObjectMapperProvider.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common.json; +package org.opentripplanner.ext.restapi.serialization; import com.bedatadriven.jackson.datatype.jts.JtsModule; import com.fasterxml.jackson.annotation.JsonInclude.Include; diff --git a/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java b/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java index 25242456722..cb3b146a113 100644 --- a/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java +++ b/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java @@ -10,7 +10,7 @@ import java.util.Map; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; -import org.opentripplanner.apis.common.json.JSONObjectMapperProvider; +import org.opentripplanner.ext.restapi.serialization.JSONObjectMapperProvider; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java b/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java index 5612d98ea0c..b238a74c7d3 100644 --- a/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java +++ b/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java @@ -18,7 +18,7 @@ import org.glassfish.jersey.jackson.internal.jackson.jaxrs.json.JacksonJsonProvider; import org.opentripplanner.api.common.OTPExceptionMapper; import org.opentripplanner.apis.APIEndpoints; -import org.opentripplanner.apis.common.json.JSONObjectMapperProvider; +import org.opentripplanner.ext.restapi.serialization.JSONObjectMapperProvider; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.slf4j.bridge.SLF4JBridgeHandler; From 2218c1af12110e1d84730f25a76870cf94e856ec Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 19 Dec 2023 18:52:42 +0100 Subject: [PATCH 0131/1688] Add new debug vector tiles --- .../api/configuration/APIEndpoints.java | 2 +- .../GraphInspectorVectorTileResource.java | 58 +++++++++++++++--- .../apis/vectortiles/MapboxStyleJson.java | 53 ++++++++++++++++ .../vector/RegularStopsLayerBuilder.java | 60 +++++++++++++++++++ 4 files changed, 164 insertions(+), 9 deletions(-) rename src/main/java/org/opentripplanner/{api/resource => apis/vectortiles}/GraphInspectorVectorTileResource.java (72%) create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java create mode 100644 src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java diff --git a/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java b/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java index b0d38aa00cd..64bbb2896a2 100644 --- a/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java @@ -19,13 +19,13 @@ import java.util.List; import org.opentripplanner.api.resource.BikeRental; import org.opentripplanner.api.resource.GraphInspectorTileResource; -import org.opentripplanner.api.resource.GraphInspectorVectorTileResource; import org.opentripplanner.api.resource.PlannerResource; import org.opentripplanner.api.resource.Routers; import org.opentripplanner.api.resource.ServerInfo; import org.opentripplanner.api.resource.UpdaterStatusResource; import org.opentripplanner.apis.gtfs.GtfsGraphQLAPI; import org.opentripplanner.apis.transmodel.TransmodelAPI; +import org.opentripplanner.apis.vectortiles.GraphInspectorVectorTileResource; import org.opentripplanner.ext.actuator.ActuatorAPI; import org.opentripplanner.ext.geocoder.GeocoderResource; import org.opentripplanner.ext.parkAndRideApi.ParkAndRideResource; diff --git a/src/main/java/org/opentripplanner/api/resource/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java similarity index 72% rename from src/main/java/org/opentripplanner/api/resource/GraphInspectorVectorTileResource.java rename to src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 2c21e0396ce..04d2630a301 100644 --- a/src/main/java/org/opentripplanner/api/resource/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.resource; +package org.opentripplanner.apis.vectortiles; import static org.opentripplanner.framework.io.HttpUtils.APPLICATION_X_PROTOBUF; @@ -14,13 +14,20 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; +import java.util.Map; import java.util.Objects; import java.util.function.Predicate; +import java.util.stream.Collectors; +import javax.annotation.Nonnull; import org.glassfish.grizzly.http.server.Request; import org.opentripplanner.api.model.TileJson; +import org.opentripplanner.apis.vectortiles.MapboxStyleJson.LayerStyleBuilder; +import org.opentripplanner.apis.vectortiles.MapboxStyleJson.VectorTileSource; +import org.opentripplanner.framework.io.HttpUtils; import org.opentripplanner.inspector.vector.AreaStopsLayerBuilder; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.inspector.vector.RegularStopsLayerBuilder; import org.opentripplanner.inspector.vector.VectorTileResponseFactory; import org.opentripplanner.inspector.vector.geofencing.GeofencingZonesLayerBuilder; import org.opentripplanner.model.FeedInfo; @@ -34,6 +41,7 @@ public class GraphInspectorVectorTileResource { private static final List> DEBUG_LAYERS = List.of( + new LayerParams("regularStops", LayerType.RegularStop), new LayerParams("areaStops", LayerType.AreaStop), new LayerParams("geofencingZones", LayerType.GeofencingZones) ); @@ -84,13 +92,7 @@ public TileJson getTileJson( @PathParam("layers") String requestedLayers ) { var envelope = serverContext.worldEnvelopeService().envelope().orElseThrow(); - List feedInfos = serverContext - .transitService() - .getFeedIds() - .stream() - .map(serverContext.transitService()::getFeedInfo) - .filter(Predicate.not(Objects::isNull)) - .toList(); + List feedInfos = feedInfos(); return new TileJson( uri, @@ -103,18 +105,58 @@ public TileJson getTileJson( ); } + @GET + @Path("/style.json") + @Produces(MediaType.APPLICATION_JSON) + public MapboxStyleJson getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) { + var base = HttpUtils.getBaseAddress(uri, headers); + final String allLayers = DEBUG_LAYERS + .stream() + .map(LayerParameters::name) + .collect(Collectors.joining(",")); + var url = + base + + "/otp/routers/" + + ignoreRouterId + + "/inspector/vectortile/" + + allLayers + + "/tilejson.json"; + return new MapboxStyleJson( + "OTP Debug Tiles", + Map.of("debug", new VectorTileSource("vector", url)), + List.of(LayerStyleBuilder.ofId("regular-stop").source("regularStops").circleColor("#f73109").build()) + ); + } + + @Nonnull + private List feedInfos() { + return serverContext + .transitService() + .getFeedIds() + .stream() + .map(serverContext.transitService()::getFeedInfo) + .filter(Predicate.not(Objects::isNull)) + .toList(); + } + private static LayerBuilder createLayerBuilder( LayerParameters layerParameters, Locale locale, OtpServerRequestContext context ) { return switch (layerParameters.type()) { + case RegularStop -> new RegularStopsLayerBuilder( + context.transitService(), + layerParameters, + locale + ); case AreaStop -> new AreaStopsLayerBuilder(context.transitService(), layerParameters, locale); case GeofencingZones -> new GeofencingZonesLayerBuilder(context.graph(), layerParameters); }; } private enum LayerType { + RegularStop, AreaStop, GeofencingZones, } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java new file mode 100644 index 00000000000..72f92a9c02e --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java @@ -0,0 +1,53 @@ +package org.opentripplanner.apis.vectortiles; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.opentripplanner.framework.json.ObjectMappers; + +public record MapboxStyleJson( + String name, + Map sources, + List layers +) { + public record VectorTileSource(String type, String url) {} + + public static class LayerStyleBuilder { + + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); + private final Map props = new HashMap<>(); + private final Map paint = new HashMap<>(); + + public static LayerStyleBuilder ofId(String id) { + return new LayerStyleBuilder(id); + } + + private LayerStyleBuilder(String id) { + props.put("id", id); + } + + /** + * Which vector tile source this should apply to. + */ + public LayerStyleBuilder source(String source) { + props.put("source", source); + return this; + } + + public LayerStyleBuilder circleColor(String color) { + paint.put("circle-color", color); + return this; + } + + public JsonNode build() { + var copy = new HashMap<>(props); + if(!paint.isEmpty()) { + copy.put("paint", paint); + } + return OBJECT_MAPPER.valueToTree(copy); + } + + } +} diff --git a/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java new file mode 100644 index 00000000000..c4bf0d88a23 --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java @@ -0,0 +1,60 @@ +package org.opentripplanner.inspector.vector; + +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.Function; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.service.TransitService; + +/** + * A vector tile layer containing all {@link RegularStop}s inside the vector tile bounds. + */ +public class RegularStopsLayerBuilder extends LayerBuilder { + + private static final Map mappers = Map.of( + MapperType.DebugClient, + DebugClientAreaStopPropertyMapper::create + ); + private final Function> findAreaStops; + + public RegularStopsLayerBuilder( + TransitService transitService, + LayerParameters layerParameters, + Locale locale + ) { + super( + mappers.get(MapperType.valueOf(layerParameters.mapper())).build(transitService, locale), + layerParameters.name(), + layerParameters.expansionFactor() + ); + this.findAreaStops = transitService::findRegularStop; + } + + @Override + protected List getGeometries(Envelope query) { + return findAreaStops + .apply(query) + .stream() + .map(stop -> { + Geometry geometry = stop.getGeometry().copy(); + geometry.setUserData(stop); + return geometry; + }) + .toList(); + } + + enum MapperType { + DebugClient, + } + + @FunctionalInterface + private interface MapperFactory { + PropertyMapper build(TransitService transitService, Locale locale); + } +} From 176187c5dba4a735fbd78171d98c5dda0c29c1cb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 19 Dec 2023 18:48:30 +0100 Subject: [PATCH 0132/1688] Add stop layer to tile.json --- .../GraphInspectorVectorTileResource.java | 40 ++++++- .../apis/vectortiles/MapboxStyleJson.java | 53 --------- .../vectortiles/model/LayerStyleBuilder.java | 105 ++++++++++++++++++ .../vectortiles/model/MapboxStyleJson.java | 46 ++++++++ .../apis/vectortiles/model/TileSource.java | 25 +++++ .../vector/AreaStopsLayerBuilder.java | 10 +- .../DebugClientAreaStopPropertyMapper.java | 14 +-- .../vector/RegularStopsLayerBuilder.java | 20 +--- .../vector/AreaStopLayerBuilderTest.java | 5 +- 9 files changed, 225 insertions(+), 93 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 04d2630a301..8df1fd9e388 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -14,15 +14,17 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.Objects; import java.util.function.Predicate; import java.util.stream.Collectors; import javax.annotation.Nonnull; import org.glassfish.grizzly.http.server.Request; import org.opentripplanner.api.model.TileJson; -import org.opentripplanner.apis.vectortiles.MapboxStyleJson.LayerStyleBuilder; -import org.opentripplanner.apis.vectortiles.MapboxStyleJson.VectorTileSource; +import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder; +import org.opentripplanner.apis.vectortiles.model.MapboxStyleJson; +import org.opentripplanner.apis.vectortiles.model.TileSource; +import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; +import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; import org.opentripplanner.framework.io.HttpUtils; import org.opentripplanner.inspector.vector.AreaStopsLayerBuilder; import org.opentripplanner.inspector.vector.LayerBuilder; @@ -121,10 +123,38 @@ public MapboxStyleJson getTileJson(@Context UriInfo uri, @Context HttpHeaders he "/inspector/vectortile/" + allLayers + "/tilejson.json"; + var vectorSource = new VectorSource("debug", url); + var backgroundSource = new RasterSource( + "background", + List.of("https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"), + 256 + ); + List sources = List.of( + backgroundSource, + vectorSource + ); return new MapboxStyleJson( "OTP Debug Tiles", - Map.of("debug", new VectorTileSource("vector", url)), - List.of(LayerStyleBuilder.ofId("regular-stop").source("regularStops").circleColor("#f73109").build()) + sources, + List.of( + LayerStyleBuilder + .ofId("background") + .typeRaster() + .source(backgroundSource) + .minZoom(0) + .maxZoom(22) + .build(), + LayerStyleBuilder + .ofId("regular-stop") + .source(vectorSource) + .sourceLayer("regularStops") + .typeCircle() + .circleStroke("#140d0e", 1) + .circleColor("#fcf9fa") + .minZoom(13) + .maxZoom(22) + .build() + ) ); } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java deleted file mode 100644 index 72f92a9c02e..00000000000 --- a/src/main/java/org/opentripplanner/apis/vectortiles/MapboxStyleJson.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.opentripplanner.apis.vectortiles; - -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import org.opentripplanner.framework.json.ObjectMappers; - -public record MapboxStyleJson( - String name, - Map sources, - List layers -) { - public record VectorTileSource(String type, String url) {} - - public static class LayerStyleBuilder { - - private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); - private final Map props = new HashMap<>(); - private final Map paint = new HashMap<>(); - - public static LayerStyleBuilder ofId(String id) { - return new LayerStyleBuilder(id); - } - - private LayerStyleBuilder(String id) { - props.put("id", id); - } - - /** - * Which vector tile source this should apply to. - */ - public LayerStyleBuilder source(String source) { - props.put("source", source); - return this; - } - - public LayerStyleBuilder circleColor(String color) { - paint.put("circle-color", color); - return this; - } - - public JsonNode build() { - var copy = new HashMap<>(props); - if(!paint.isEmpty()) { - copy.put("paint", paint); - } - return OBJECT_MAPPER.valueToTree(copy); - } - - } -} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java new file mode 100644 index 00000000000..65a009ec53e --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -0,0 +1,105 @@ +package org.opentripplanner.apis.vectortiles.model; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Stream; +import org.opentripplanner.framework.json.ObjectMappers; + +/** + * Builds a Maplibre/Mapbox vector tile + * layer style. + */ +public class LayerStyleBuilder { + + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); + private static final String TYPE = "type"; + private static final String SOURCE_LAYER = "source-layer"; + private final Map props = new HashMap<>(); + private final Map paint = new HashMap<>(); + + public static LayerStyleBuilder ofId(String id) { + return new LayerStyleBuilder(id); + } + + public enum LayerType { + Circle, + Raster, + } + + private LayerStyleBuilder(String id) { + props.put("id", id); + } + + public LayerStyleBuilder minZoom(int i) { + props.put("minzoom", i); + return this; + } + + public LayerStyleBuilder maxZoom(int i) { + props.put("maxzoom", i); + return this; + } + + /** + * Which vector tile source this should apply to. + */ + public LayerStyleBuilder source(TileSource source) { + props.put("source", source.id()); + return this; + } + + public LayerStyleBuilder sourceLayer(String source) { + props.put(SOURCE_LAYER, source); + return this; + } + + public LayerStyleBuilder typeRaster() { + return type(LayerType.Raster); + } + + public LayerStyleBuilder typeCircle() { + return type(LayerType.Circle); + } + + private LayerStyleBuilder type(LayerType type) { + props.put(TYPE, type.name().toLowerCase()); + return this; + } + + public LayerStyleBuilder circleColor(String color) { + paint.put("circle-color", validateColor(color)); + return this; + } + + public LayerStyleBuilder circleStroke(String color, int width) { + paint.put("circle-stroke-color", validateColor(color)); + paint.put("circle-stroke-width", width); + return this; + } + + public JsonNode build() { + validate(); + + var copy = new HashMap<>(props); + if (!paint.isEmpty()) { + copy.put("paint", paint); + } + return OBJECT_MAPPER.valueToTree(copy); + } + + private String validateColor(String color) { + if (!color.startsWith("#")) { + throw new IllegalArgumentException("Colors must start with '#'"); + } + return color; + } + + private void validate() { + Stream + .of(TYPE) + .forEach(p -> Objects.requireNonNull(props.get(p), "%s must be set".formatted(p))); + } +} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java new file mode 100644 index 00000000000..bf84b697b92 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java @@ -0,0 +1,46 @@ +package org.opentripplanner.apis.vectortiles.model; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public final class MapboxStyleJson { + + private final String name; + private final List sources; + private final List layers; + + public MapboxStyleJson( + String name, + List sources, + List layers + ) { + this.name = name; + this.sources = sources; + this.layers = layers; + } + + @JsonSerialize + public int version() { + return 8; + } + + @JsonSerialize + public String name() { + return name; + } + + @JsonSerialize + public Map sources() { + var output = new HashMap(); + sources.forEach(s -> output.put(s.id(), s)); + return output; + } + + @JsonSerialize + public List layers() { + return layers; + } +} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java new file mode 100644 index 00000000000..2e404d9a1eb --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java @@ -0,0 +1,25 @@ +package org.opentripplanner.apis.vectortiles.model; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.util.List; + +public sealed interface TileSource { + @JsonSerialize + String type(); + + String id(); + + record VectorSource(String id, String url) implements TileSource { + @Override + public String type() { + return "vector"; + } + } + + record RasterSource(String id, List tiles, int tileSize) implements TileSource { + @Override + public String type() { + return "raster"; + } + } +} diff --git a/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java index 1604cf7d8d1..6ce7b0962ba 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java @@ -3,23 +3,19 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.function.Function; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.opentripplanner.api.mapping.PropertyMapper; import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; /** * A vector tile layer containing all {@link AreaStop}s inside the vector tile bounds. */ -public class AreaStopsLayerBuilder extends LayerBuilder { +public class AreaStopsLayerBuilder extends LayerBuilder { - private static final Map mappers = Map.of( - MapperType.DebugClient, - DebugClientAreaStopPropertyMapper::create - ); private final Function> findAreaStops; public AreaStopsLayerBuilder( @@ -28,7 +24,7 @@ public AreaStopsLayerBuilder( Locale locale ) { super( - mappers.get(MapperType.valueOf(layerParameters.mapper())).build(transitService, locale), + new DebugClientAreaStopPropertyMapper(locale), layerParameters.name(), layerParameters.expansionFactor() ); diff --git a/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java index 88f7a17385b..1d507140378 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java @@ -5,29 +5,29 @@ import java.util.Locale; import org.opentripplanner.api.mapping.I18NStringMapper; import org.opentripplanner.api.mapping.PropertyMapper; -import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; /** * A {@link PropertyMapper} for the {@link AreaStopsLayerBuilder} for the OTP debug client. */ -public class DebugClientAreaStopPropertyMapper extends PropertyMapper { +public class DebugClientAreaStopPropertyMapper extends PropertyMapper { private final I18NStringMapper i18NStringMapper; - public DebugClientAreaStopPropertyMapper(TransitService transitService, Locale locale) { + public DebugClientAreaStopPropertyMapper(Locale locale) { this.i18NStringMapper = new I18NStringMapper(locale); } - public static PropertyMapper create(TransitService transitService, Locale locale) { - return new DebugClientAreaStopPropertyMapper(transitService, locale); + public static PropertyMapper create(TransitService ignored, Locale locale) { + return new DebugClientAreaStopPropertyMapper(locale); } @Override - protected Collection map(AreaStop input) { + protected Collection map(StopLocation input) { return List.of( new KeyValue("id", input.getId().toString()), - new KeyValue("name", i18NStringMapper.mapNonnullToApi(input.getName())) + new KeyValue("name", i18NStringMapper.mapToApi(input.getName())) ); } } diff --git a/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java index c4bf0d88a23..26e3f8726ae 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java @@ -3,24 +3,18 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.function.Function; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.apis.common.mapping.PropertyMapper; -import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; /** * A vector tile layer containing all {@link RegularStop}s inside the vector tile bounds. */ -public class RegularStopsLayerBuilder extends LayerBuilder { +public class RegularStopsLayerBuilder extends LayerBuilder { - private static final Map mappers = Map.of( - MapperType.DebugClient, - DebugClientAreaStopPropertyMapper::create - ); private final Function> findAreaStops; public RegularStopsLayerBuilder( @@ -29,7 +23,7 @@ public RegularStopsLayerBuilder( Locale locale ) { super( - mappers.get(MapperType.valueOf(layerParameters.mapper())).build(transitService, locale), + new DebugClientAreaStopPropertyMapper(locale), layerParameters.name(), layerParameters.expansionFactor() ); @@ -49,12 +43,4 @@ protected List getGeometries(Envelope query) { .toList(); } - enum MapperType { - DebugClient, - } - - @FunctionalInterface - private interface MapperFactory { - PropertyMapper build(TransitService transitService, Locale locale); - } } diff --git a/src/test/java/org/opentripplanner/inspector/vector/AreaStopLayerBuilderTest.java b/src/test/java/org/opentripplanner/inspector/vector/AreaStopLayerBuilderTest.java index 09b64adcf75..6f2ca872f21 100644 --- a/src/test/java/org/opentripplanner/inspector/vector/AreaStopLayerBuilderTest.java +++ b/src/test/java/org/opentripplanner/inspector/vector/AreaStopLayerBuilderTest.java @@ -38,10 +38,7 @@ class AreaStopLayerBuilderTest { @Test void map() { - var subject = new DebugClientAreaStopPropertyMapper( - new DefaultTransitService(new TransitModel()), - Locale.ENGLISH - ); + var subject = new DebugClientAreaStopPropertyMapper(Locale.ENGLISH); var properties = subject.map(areaStop); From 7aaf79ff43d1421786ac5c0e4c8297d783b7b06b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 19 Dec 2023 23:41:36 +0100 Subject: [PATCH 0133/1688] Move classes into their own packages --- .../GraphInspectorVectorTileResource.java | 9 ++--- .../vectortiles/model/LayerStyleBuilder.java | 5 +++ .../vectortiles/model/MapboxStyleJson.java | 6 +-- .../opentripplanner/astar/model/BinHeap.java | 12 ------ .../vector/edge/EdgeLayerBuilder.java | 40 +++++++++++++++++++ .../vector/edge/EdgePropertyMapper.java | 18 +++++++++ .../GeofencingZonesLayerBuilder.java | 17 +------- .../{ => stop}/AreaStopsLayerBuilder.java | 18 ++------- .../{ => stop}/RegularStopsLayerBuilder.java | 7 ++-- .../StopLocationPropertyMapper.java} | 9 +++-- .../{ => stop}/AreaStopLayerBuilderTest.java | 7 ++-- 11 files changed, 84 insertions(+), 64 deletions(-) create mode 100644 src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java create mode 100644 src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java rename src/main/java/org/opentripplanner/inspector/vector/{ => stop}/AreaStopsLayerBuilder.java (77%) rename src/main/java/org/opentripplanner/inspector/vector/{ => stop}/RegularStopsLayerBuilder.java (84%) rename src/main/java/org/opentripplanner/inspector/vector/{DebugClientAreaStopPropertyMapper.java => stop/StopLocationPropertyMapper.java} (74%) rename src/test/java/org/opentripplanner/inspector/vector/{ => stop}/AreaStopLayerBuilderTest.java (86%) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 8df1fd9e388..9d083bd5e03 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -26,12 +26,12 @@ import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; import org.opentripplanner.framework.io.HttpUtils; -import org.opentripplanner.inspector.vector.AreaStopsLayerBuilder; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; -import org.opentripplanner.inspector.vector.RegularStopsLayerBuilder; import org.opentripplanner.inspector.vector.VectorTileResponseFactory; import org.opentripplanner.inspector.vector.geofencing.GeofencingZonesLayerBuilder; +import org.opentripplanner.inspector.vector.stop.AreaStopsLayerBuilder; +import org.opentripplanner.inspector.vector.stop.RegularStopsLayerBuilder; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.standalone.api.OtpServerRequestContext; @@ -129,10 +129,7 @@ public MapboxStyleJson getTileJson(@Context UriInfo uri, @Context HttpHeaders he List.of("https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"), 256 ); - List sources = List.of( - backgroundSource, - vectorSource - ); + List sources = List.of(backgroundSource, vectorSource); return new MapboxStyleJson( "OTP Debug Tiles", sources, diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index 65a009ec53e..759ce7eeb30 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -51,6 +51,11 @@ public LayerStyleBuilder source(TileSource source) { return this; } + /** + * For vector tile sources, specify which source layer in the tile the styles should apply to. + * There is an unfortunate collision in the name "layer" as it can both refer to a styling layer + * and the layer inside the vector tile. + */ public LayerStyleBuilder sourceLayer(String source) { props.put(SOURCE_LAYER, source); return this; diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java index bf84b697b92..6461d697bfc 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java @@ -12,11 +12,7 @@ public final class MapboxStyleJson { private final List sources; private final List layers; - public MapboxStyleJson( - String name, - List sources, - List layers - ) { + public MapboxStyleJson(String name, List sources, List layers) { this.name = name; this.sources = sources; this.layers = layers; diff --git a/src/main/java/org/opentripplanner/astar/model/BinHeap.java b/src/main/java/org/opentripplanner/astar/model/BinHeap.java index 9bc2b0762a8..1e9b540a77a 100644 --- a/src/main/java/org/opentripplanner/astar/model/BinHeap.java +++ b/src/main/java/org/opentripplanner/astar/model/BinHeap.java @@ -79,14 +79,6 @@ public void rekey(T e, double p) { prio[i] = p; } - public void dump() { - for (int i = 0; i <= capacity; i++) { - String topMarker = (i > size) ? "(UNUSED)" : ""; - System.out.printf("%d\t%f\t%s\t%s\n", i, prio[i], elem[i], topMarker); - } - System.out.printf("-----------------------\n"); - } - public void reset() { // empties the queue in one operation size = 0; @@ -135,8 +127,4 @@ public void resize(int capacity) { prio = Arrays.copyOf(prio, capacity + 1); elem = Arrays.copyOf(elem, capacity + 1); } - - public int getCapacity() { - return capacity; - } } diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java new file mode 100644 index 00000000000..3c1bc3436d8 --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java @@ -0,0 +1,40 @@ +package org.opentripplanner.inspector.vector.edge; + +import java.util.List; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.framework.geometry.GeometryUtils; +import org.opentripplanner.inspector.vector.LayerBuilder; +import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.routing.graph.Graph; +import org.opentripplanner.routing.graph.index.StreetIndex; +import org.opentripplanner.street.model.edge.Edge; +import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.transit.model.site.AreaStop; + +/** + * A vector tile layer containing all {@link AreaStop}s inside the vector tile bounds. + */ +public class EdgeLayerBuilder extends LayerBuilder { + + private final StreetIndex streetIndex; + + public EdgeLayerBuilder(Graph graph, LayerParameters layerParameters) { + super(new EdgePropertyMapper(), layerParameters.name(), layerParameters.expansionFactor()); + this.streetIndex = graph.getStreetIndex(); + } + + @Override + protected List getGeometries(Envelope query) { + return streetIndex + .getEdgesForEnvelope(query) + .stream() + .filter(edge -> edge.getGeometry() != null) + .map(edge -> { + Geometry geometry = edge.getGeometry().copy(); + geometry.setUserData(edge); + return geometry; + }) + .toList(); + } +} diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java new file mode 100644 index 00000000000..936c965c9f5 --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java @@ -0,0 +1,18 @@ +package org.opentripplanner.inspector.vector.edge; + +import java.util.Collection; +import java.util.List; +import org.opentripplanner.api.mapping.PropertyMapper; +import org.opentripplanner.inspector.vector.KeyValue; +import org.opentripplanner.street.model.edge.Edge; + +/** + * A {@link PropertyMapper} for the {@link EdgeLayerBuilder} for the OTP debug client. + */ +public class EdgePropertyMapper extends PropertyMapper { + + @Override + protected Collection map(Edge edge) { + return List.of(new KeyValue("java-class", edge.getClass().getSimpleName())); + } +} diff --git a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java index 8a77b8502ea..24be8d202a8 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java @@ -1,10 +1,8 @@ package org.opentripplanner.inspector.vector.geofencing; import java.util.List; -import java.util.Map; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.api.mapping.PropertyMapper; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; @@ -19,15 +17,11 @@ */ public class GeofencingZonesLayerBuilder extends LayerBuilder { - private static final Map mappers = Map.of( - MapperType.DebugClient, - transitService -> new GeofencingZonesPropertyMapper() - ); private final StreetIndex streetIndex; public GeofencingZonesLayerBuilder(Graph graph, LayerParameters layerParameters) { super( - mappers.get(MapperType.valueOf(layerParameters.mapper())).build(graph), + new GeofencingZonesPropertyMapper(), layerParameters.name(), layerParameters.expansionFactor() ); @@ -47,13 +41,4 @@ protected List getGeometries(Envelope query) { }) .toList(); } - - enum MapperType { - DebugClient, - } - - @FunctionalInterface - private interface MapperFactory { - PropertyMapper build(Graph transitService); - } } diff --git a/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/stop/AreaStopsLayerBuilder.java similarity index 77% rename from src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java rename to src/main/java/org/opentripplanner/inspector/vector/stop/AreaStopsLayerBuilder.java index 6ce7b0962ba..d1a2552e4e2 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/AreaStopsLayerBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.inspector.vector; +package org.opentripplanner.inspector.vector.stop; import java.util.Collection; import java.util.List; @@ -6,7 +6,8 @@ import java.util.function.Function; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.api.mapping.PropertyMapper; +import org.opentripplanner.inspector.vector.LayerBuilder; +import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; @@ -24,7 +25,7 @@ public AreaStopsLayerBuilder( Locale locale ) { super( - new DebugClientAreaStopPropertyMapper(locale), + new StopLocationPropertyMapper(locale), layerParameters.name(), layerParameters.expansionFactor() ); @@ -38,20 +39,9 @@ protected List getGeometries(Envelope query) { .stream() .map(areaStop -> { Geometry geometry = areaStop.getGeometry().copy(); - geometry.setUserData(areaStop); - return geometry; }) .toList(); } - - enum MapperType { - DebugClient, - } - - @FunctionalInterface - private interface MapperFactory { - PropertyMapper build(TransitService transitService, Locale locale); - } } diff --git a/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/stop/RegularStopsLayerBuilder.java similarity index 84% rename from src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java rename to src/main/java/org/opentripplanner/inspector/vector/stop/RegularStopsLayerBuilder.java index 26e3f8726ae..f943e23eb88 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/RegularStopsLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/RegularStopsLayerBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.inspector.vector; +package org.opentripplanner.inspector.vector.stop; import java.util.Collection; import java.util.List; @@ -6,6 +6,8 @@ import java.util.function.Function; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.inspector.vector.LayerBuilder; +import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; @@ -23,7 +25,7 @@ public RegularStopsLayerBuilder( Locale locale ) { super( - new DebugClientAreaStopPropertyMapper(locale), + new StopLocationPropertyMapper(locale), layerParameters.name(), layerParameters.expansionFactor() ); @@ -42,5 +44,4 @@ protected List getGeometries(Envelope query) { }) .toList(); } - } diff --git a/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java similarity index 74% rename from src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java rename to src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java index 1d507140378..d2e1accf483 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java @@ -1,26 +1,27 @@ -package org.opentripplanner.inspector.vector; +package org.opentripplanner.inspector.vector.stop; import java.util.Collection; import java.util.List; import java.util.Locale; import org.opentripplanner.api.mapping.I18NStringMapper; import org.opentripplanner.api.mapping.PropertyMapper; +import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; /** * A {@link PropertyMapper} for the {@link AreaStopsLayerBuilder} for the OTP debug client. */ -public class DebugClientAreaStopPropertyMapper extends PropertyMapper { +public class StopLocationPropertyMapper extends PropertyMapper { private final I18NStringMapper i18NStringMapper; - public DebugClientAreaStopPropertyMapper(Locale locale) { + public StopLocationPropertyMapper(Locale locale) { this.i18NStringMapper = new I18NStringMapper(locale); } public static PropertyMapper create(TransitService ignored, Locale locale) { - return new DebugClientAreaStopPropertyMapper(locale); + return new StopLocationPropertyMapper(locale); } @Override diff --git a/src/test/java/org/opentripplanner/inspector/vector/AreaStopLayerBuilderTest.java b/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java similarity index 86% rename from src/test/java/org/opentripplanner/inspector/vector/AreaStopLayerBuilderTest.java rename to src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java index 6f2ca872f21..3fea49ab236 100644 --- a/src/test/java/org/opentripplanner/inspector/vector/AreaStopLayerBuilderTest.java +++ b/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.inspector.vector; +package org.opentripplanner.inspector.vector.stop; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -9,12 +9,11 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.AreaStop; -import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.StopModelBuilder; -import org.opentripplanner.transit.service.TransitModel; class AreaStopLayerBuilderTest { @@ -38,7 +37,7 @@ class AreaStopLayerBuilderTest { @Test void map() { - var subject = new DebugClientAreaStopPropertyMapper(Locale.ENGLISH); + var subject = new StopLocationPropertyMapper(Locale.ENGLISH); var properties = subject.map(areaStop); From 033000a2afa7921730bf41a64fb5517b7eaf6a2f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Dec 2023 11:20:08 +0100 Subject: [PATCH 0134/1688] Move styles into separate class --- .../apis/vectortiles/DebugStyleJson.java | 43 +++++++++++++++++++ .../GraphInspectorVectorTileResource.java | 35 +-------------- .../vectortiles/model/LayerStyleBuilder.java | 2 +- .../vectortiles/model/MapboxStyleJson.java | 4 +- 4 files changed, 47 insertions(+), 37 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleJson.java diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleJson.java new file mode 100644 index 00000000000..75592cbc0cd --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleJson.java @@ -0,0 +1,43 @@ +package org.opentripplanner.apis.vectortiles; + +import java.util.List; +import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder; +import org.opentripplanner.apis.vectortiles.model.MapboxStyleJson; +import org.opentripplanner.apis.vectortiles.model.TileSource; +import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; +import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; + +public class DebugStyleJson { + + private static final RasterSource BACKGROUND_SOURCE = new RasterSource( + "background", + List.of("https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"), + 256 + ); + + static MapboxStyleJson build(String url) { + var vectorSource = new VectorSource("debug", url); + List sources = List.of(BACKGROUND_SOURCE, vectorSource); + return new MapboxStyleJson( + "OTP Debug Tiles", + sources, + List.of( + LayerStyleBuilder + .ofId("background") + .typeRaster() + .source(BACKGROUND_SOURCE) + .minZoom(0) + .maxZoom(22), + LayerStyleBuilder + .ofId("regular-stop") + .typeCircle() + .source(vectorSource) + .sourceLayer("regularStops") + .circleStroke("#140d0e", 1) + .circleColor("#fcf9fa") + .minZoom(13) + .maxZoom(22) + ) + ); + } +} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 9d083bd5e03..6d23e533aad 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -20,11 +20,7 @@ import javax.annotation.Nonnull; import org.glassfish.grizzly.http.server.Request; import org.opentripplanner.api.model.TileJson; -import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder; import org.opentripplanner.apis.vectortiles.model.MapboxStyleJson; -import org.opentripplanner.apis.vectortiles.model.TileSource; -import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; -import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; import org.opentripplanner.framework.io.HttpUtils; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; @@ -123,36 +119,7 @@ public MapboxStyleJson getTileJson(@Context UriInfo uri, @Context HttpHeaders he "/inspector/vectortile/" + allLayers + "/tilejson.json"; - var vectorSource = new VectorSource("debug", url); - var backgroundSource = new RasterSource( - "background", - List.of("https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"), - 256 - ); - List sources = List.of(backgroundSource, vectorSource); - return new MapboxStyleJson( - "OTP Debug Tiles", - sources, - List.of( - LayerStyleBuilder - .ofId("background") - .typeRaster() - .source(backgroundSource) - .minZoom(0) - .maxZoom(22) - .build(), - LayerStyleBuilder - .ofId("regular-stop") - .source(vectorSource) - .sourceLayer("regularStops") - .typeCircle() - .circleStroke("#140d0e", 1) - .circleColor("#fcf9fa") - .minZoom(13) - .maxZoom(22) - .build() - ) - ); + return DebugStyleJson.build(url); } @Nonnull diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index 759ce7eeb30..d549f2938e0 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -85,7 +85,7 @@ public LayerStyleBuilder circleStroke(String color, int width) { return this; } - public JsonNode build() { + public JsonNode toJson() { validate(); var copy = new HashMap<>(props); diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java index 6461d697bfc..6214a5aac65 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java @@ -12,10 +12,10 @@ public final class MapboxStyleJson { private final List sources; private final List layers; - public MapboxStyleJson(String name, List sources, List layers) { + public MapboxStyleJson(String name, List sources, List layers) { this.name = name; this.sources = sources; - this.layers = layers; + this.layers = layers.stream().map(LayerStyleBuilder::toJson).toList(); } @JsonSerialize From 57f07ddac6a2c34973b4f591b49ad20bec83e02f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 21 Dec 2023 08:30:45 +0100 Subject: [PATCH 0135/1688] Use style.json from server --- client-next/src/components/MapView/MapView.tsx | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 011d9408148..258a925a142 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -4,7 +4,6 @@ import { TripPattern, TripQuery, TripQueryVariables } from '../../gql/graphql.ts import { NavigationMarkers } from './NavigationMarkers.tsx'; import { LegLines } from './LegLines.tsx'; import { useMapDoubleClick } from './useMapDoubleClick.ts'; -import { mapStyle } from './mapStyle.ts'; import { useState } from 'react'; import { ContextMenuPopup } from './ContextMenuPopup.tsx'; @@ -37,12 +36,21 @@ export function MapView({ // @ts-ignore mapLib={import('maplibre-gl')} // @ts-ignore - mapStyle={mapStyle} + mapStyle="http://localhost:8080/otp/routers/default/inspector/vectortile/style.json" initialViewState={initialViewState} onDblClick={onMapDoubleClick} onContextMenu={(e) => { setShowPopup(e.lngLat); }} + interactiveLayerIds={["regular-stop"]} + onClick={e => { + console.log(e.features); + }} + // put lat/long in URL and pan to it on page reload + hash={true} + // disable pitching and rotating the map + touchPitch={false} + dragRotate={false} > Date: Thu, 21 Dec 2023 22:03:33 +0100 Subject: [PATCH 0136/1688] Refactor dependencies of map style classes --- ...ebugStyleJson.java => DebugStyleSpec.java} | 16 +++--- .../GraphInspectorVectorTileResource.java | 50 +++++++++---------- .../apis/vectortiles/model/LayerParams.java | 15 ++++++ .../vectortiles/model/LayerStyleBuilder.java | 7 +++ .../apis/vectortiles/model/LayerType.java | 7 +++ .../{MapboxStyleJson.java => StyleSpec.java} | 8 ++- .../apis/vectortiles/model/TileSource.java | 6 +++ .../framework/io/HttpUtils.java | 6 +-- 8 files changed, 77 insertions(+), 38 deletions(-) rename src/main/java/org/opentripplanner/apis/vectortiles/{DebugStyleJson.java => DebugStyleSpec.java} (70%) create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java rename src/main/java/org/opentripplanner/apis/vectortiles/model/{MapboxStyleJson.java => StyleSpec.java} (77%) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java similarity index 70% rename from src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleJson.java rename to src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 75592cbc0cd..9121d671c06 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleJson.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -2,12 +2,12 @@ import java.util.List; import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder; -import org.opentripplanner.apis.vectortiles.model.MapboxStyleJson; +import org.opentripplanner.apis.vectortiles.model.StyleSpec; import org.opentripplanner.apis.vectortiles.model.TileSource; import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; -public class DebugStyleJson { +public class DebugStyleSpec { private static final RasterSource BACKGROUND_SOURCE = new RasterSource( "background", @@ -15,10 +15,11 @@ public class DebugStyleJson { 256 ); - static MapboxStyleJson build(String url) { - var vectorSource = new VectorSource("debug", url); - List sources = List.of(BACKGROUND_SOURCE, vectorSource); - return new MapboxStyleJson( + public record VectorSourceLayer(VectorSource vectorSource, String vectorLayer) {} + + static StyleSpec build(VectorSource debugSource, VectorSourceLayer regularStops) { + List sources = List.of(BACKGROUND_SOURCE, debugSource); + return new StyleSpec( "OTP Debug Tiles", sources, List.of( @@ -31,8 +32,7 @@ static MapboxStyleJson build(String url) { LayerStyleBuilder .ofId("regular-stop") .typeCircle() - .source(vectorSource) - .sourceLayer("regularStops") + .vectorSourceLayer(regularStops) .circleStroke("#140d0e", 1) .circleColor("#fcf9fa") .minZoom(13) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 6d23e533aad..7e800b5639b 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -20,7 +20,10 @@ import javax.annotation.Nonnull; import org.glassfish.grizzly.http.server.Request; import org.opentripplanner.api.model.TileJson; -import org.opentripplanner.apis.vectortiles.model.MapboxStyleJson; +import org.opentripplanner.apis.vectortiles.model.LayerParams; +import org.opentripplanner.apis.vectortiles.model.LayerType; +import org.opentripplanner.apis.vectortiles.model.StyleSpec; +import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; import org.opentripplanner.framework.io.HttpUtils; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; @@ -38,10 +41,19 @@ @Path("/routers/{ignoreRouterId}/inspector/vectortile") public class GraphInspectorVectorTileResource { + private static final LayerParams REGULAR_STOPS = new LayerParams( + "regularStops", + LayerType.RegularStop + ); + private static final LayerParams AREA_STOPS = new LayerParams("areaStops", LayerType.AreaStop); + private static final LayerParams GEOFENCING_ZONES = new LayerParams( + "geofencingZones", + LayerType.GeofencingZones + ); private static final List> DEBUG_LAYERS = List.of( - new LayerParams("regularStops", LayerType.RegularStop), - new LayerParams("areaStops", LayerType.AreaStop), - new LayerParams("geofencingZones", LayerType.GeofencingZones) + REGULAR_STOPS, + AREA_STOPS, + GEOFENCING_ZONES ); private final OtpServerRequestContext serverContext; @@ -106,20 +118,21 @@ public TileJson getTileJson( @GET @Path("/style.json") @Produces(MediaType.APPLICATION_JSON) - public MapboxStyleJson getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) { + public StyleSpec getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) { var base = HttpUtils.getBaseAddress(uri, headers); final String allLayers = DEBUG_LAYERS .stream() .map(LayerParameters::name) .collect(Collectors.joining(",")); var url = - base + - "/otp/routers/" + - ignoreRouterId + - "/inspector/vectortile/" + - allLayers + - "/tilejson.json"; - return DebugStyleJson.build(url); + "%s/otp/routers/%s/inspector/vectortile/%s/tilejson.json".formatted( + base, + ignoreRouterId, + allLayers + ); + + var vectorSource = new VectorSource("debug", url); + return DebugStyleSpec.build(vectorSource, REGULAR_STOPS.toVectorSourceLayer(vectorSource)); } @Nonnull @@ -148,17 +161,4 @@ private static LayerBuilder createLayerBuilder( case GeofencingZones -> new GeofencingZonesLayerBuilder(context.graph(), layerParameters); }; } - - private enum LayerType { - RegularStop, - AreaStop, - GeofencingZones, - } - - private record LayerParams(String name, LayerType type) implements LayerParameters { - @Override - public String mapper() { - return "DebugClient"; - } - } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java new file mode 100644 index 00000000000..2f1e6eb7109 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java @@ -0,0 +1,15 @@ +package org.opentripplanner.apis.vectortiles.model; + +import org.opentripplanner.apis.vectortiles.DebugStyleSpec; +import org.opentripplanner.inspector.vector.LayerParameters; + +public record LayerParams(String name, LayerType type) implements LayerParameters { + @Override + public String mapper() { + return "DebugClient"; + } + + public DebugStyleSpec.VectorSourceLayer toVectorSourceLayer(TileSource.VectorSource source) { + return new DebugStyleSpec.VectorSourceLayer(source, name); + } +} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index d549f2938e0..0e1006027f2 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -6,6 +6,7 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Stream; +import org.opentripplanner.apis.vectortiles.DebugStyleSpec.VectorSourceLayer; import org.opentripplanner.framework.json.ObjectMappers; /** @@ -24,6 +25,12 @@ public static LayerStyleBuilder ofId(String id) { return new LayerStyleBuilder(id); } + public LayerStyleBuilder vectorSourceLayer(VectorSourceLayer source) { + source(source.vectorSource()); + sourceLayer(source.vectorLayer()); + return this; + } + public enum LayerType { Circle, Raster, diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java new file mode 100644 index 00000000000..f4cb7a636fa --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java @@ -0,0 +1,7 @@ +package org.opentripplanner.apis.vectortiles.model; + +public enum LayerType { + RegularStop, + AreaStop, + GeofencingZones, +} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java similarity index 77% rename from src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java rename to src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java index 6214a5aac65..090573d467d 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/MapboxStyleJson.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java @@ -6,13 +6,17 @@ import java.util.List; import java.util.Map; -public final class MapboxStyleJson { +/** + * Represents a style specification for Maplibre/Mapbox vector tile layers. + * https://maplibre.org/maplibre-style-spec/root/ + */ +public final class StyleSpec { private final String name; private final List sources; private final List layers; - public MapboxStyleJson(String name, List sources, List layers) { + public StyleSpec(String name, List sources, List layers) { this.name = name; this.sources = sources; this.layers = layers.stream().map(LayerStyleBuilder::toJson).toList(); diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java index 2e404d9a1eb..debf3070782 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java @@ -9,6 +9,9 @@ public sealed interface TileSource { String id(); + /** + * Represents a vector tile source. + */ record VectorSource(String id, String url) implements TileSource { @Override public String type() { @@ -16,6 +19,9 @@ public String type() { } } + /** + * Represents a raster-based source for map tiles. + */ record RasterSource(String id, List tiles, int tileSize) implements TileSource { @Override public String type() { diff --git a/src/main/java/org/opentripplanner/framework/io/HttpUtils.java b/src/main/java/org/opentripplanner/framework/io/HttpUtils.java index 3450cf0786c..4981a8ab91b 100644 --- a/src/main/java/org/opentripplanner/framework/io/HttpUtils.java +++ b/src/main/java/org/opentripplanner/framework/io/HttpUtils.java @@ -24,16 +24,16 @@ private HttpUtils() {} public static String getBaseAddress(UriInfo uri, HttpHeaders headers) { String protocol; if (headers.getRequestHeader(HEADER_X_FORWARDED_PROTO) != null) { - protocol = headers.getRequestHeader(HEADER_X_FORWARDED_PROTO).get(0); + protocol = headers.getRequestHeader(HEADER_X_FORWARDED_PROTO).getFirst(); } else { protocol = uri.getRequestUri().getScheme(); } String host; if (headers.getRequestHeader(HEADER_X_FORWARDED_HOST) != null) { - host = headers.getRequestHeader(HEADER_X_FORWARDED_HOST).get(0); + host = headers.getRequestHeader(HEADER_X_FORWARDED_HOST).getFirst(); } else if (headers.getRequestHeader(HEADER_HOST) != null) { - host = headers.getRequestHeader(HEADER_HOST).get(0); + host = headers.getRequestHeader(HEADER_HOST).getFirst(); } else { host = uri.getBaseUri().getHost() + ":" + uri.getBaseUri().getPort(); } From ffd8ae6c80720888f8cff37ff0a772a0a28c2a9c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 22 Dec 2023 11:33:55 +0100 Subject: [PATCH 0137/1688] Add popup data --- .../src/components/MapView/MapView.tsx | 45 +++++++++++++++---- 1 file changed, 36 insertions(+), 9 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 258a925a142..9409a0cc68a 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -1,4 +1,4 @@ -import { LngLat, Map, NavigationControl } from 'react-map-gl'; +import { LngLat, Map, MapboxGeoJSONFeature, NavigationControl, Popup } from 'react-map-gl'; import 'maplibre-gl/dist/maplibre-gl.css'; import { TripPattern, TripQuery, TripQueryVariables } from '../../gql/graphql.ts'; import { NavigationMarkers } from './NavigationMarkers.tsx'; @@ -6,6 +6,7 @@ import { LegLines } from './LegLines.tsx'; import { useMapDoubleClick } from './useMapDoubleClick.ts'; import { useState } from 'react'; import { ContextMenuPopup } from './ContextMenuPopup.tsx'; +import { Table } from 'react-bootstrap'; // TODO: this should be configurable const initialViewState = { @@ -14,6 +15,13 @@ const initialViewState = { zoom: 4, }; +class PopupData { + constructor( + public coordinates: LngLat, + public feature: MapboxGeoJSONFeature, + ) {} +} + export function MapView({ tripQueryVariables, setTripQueryVariables, @@ -28,7 +36,8 @@ export function MapView({ loading: boolean; }) { const onMapDoubleClick = useMapDoubleClick({ tripQueryVariables, setTripQueryVariables }); - const [showPopup, setShowPopup] = useState(null); + const [showContextPopup, setShowContextPopup] = useState(null); + const [showPropsPopup, setShowPropsPopup] = useState(null); return (
@@ -40,11 +49,12 @@ export function MapView({ initialViewState={initialViewState} onDblClick={onMapDoubleClick} onContextMenu={(e) => { - setShowPopup(e.lngLat); + setShowContextPopup(e.lngLat); }} - interactiveLayerIds={["regular-stop"]} - onClick={e => { - console.log(e.features); + interactiveLayerIds={['regular-stop']} + onClick={(e) => { + const props = e.features[0]; + setShowPropsPopup(new PopupData(e.lngLat, props)); }} // put lat/long in URL and pan to it on page reload hash={true} @@ -61,14 +71,31 @@ export function MapView({ {tripQueryResult?.trip.tripPatterns.length && ( )} - {showPopup && ( + {showContextPopup && ( setShowPopup(null)} + coordinates={showContextPopup} + onClose={() => setShowContextPopup(null)} /> )} + {showPropsPopup && ( + setShowPropsPopup(null)} + > + + {Object.entries(showPropsPopup.feature.properties).map(([key, value]) => ( + + + + + ))} +
{key}{value}
+ + )}
); From da28cf241fc0cd67d634be6a0fe05e05b73a72e5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 30 Dec 2023 20:11:32 +0100 Subject: [PATCH 0138/1688] Remove edge layer builder --- .../vector/edge/EdgeLayerBuilder.java | 40 ------------------- .../vector/edge/EdgePropertyMapper.java | 18 --------- 2 files changed, 58 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java delete mode 100644 src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java deleted file mode 100644 index 3c1bc3436d8..00000000000 --- a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.opentripplanner.inspector.vector.edge; - -import java.util.List; -import org.locationtech.jts.geom.Envelope; -import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.framework.geometry.GeometryUtils; -import org.opentripplanner.inspector.vector.LayerBuilder; -import org.opentripplanner.inspector.vector.LayerParameters; -import org.opentripplanner.routing.graph.Graph; -import org.opentripplanner.routing.graph.index.StreetIndex; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.vertex.Vertex; -import org.opentripplanner.transit.model.site.AreaStop; - -/** - * A vector tile layer containing all {@link AreaStop}s inside the vector tile bounds. - */ -public class EdgeLayerBuilder extends LayerBuilder { - - private final StreetIndex streetIndex; - - public EdgeLayerBuilder(Graph graph, LayerParameters layerParameters) { - super(new EdgePropertyMapper(), layerParameters.name(), layerParameters.expansionFactor()); - this.streetIndex = graph.getStreetIndex(); - } - - @Override - protected List getGeometries(Envelope query) { - return streetIndex - .getEdgesForEnvelope(query) - .stream() - .filter(edge -> edge.getGeometry() != null) - .map(edge -> { - Geometry geometry = edge.getGeometry().copy(); - geometry.setUserData(edge); - return geometry; - }) - .toList(); - } -} diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java deleted file mode 100644 index 936c965c9f5..00000000000 --- a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.opentripplanner.inspector.vector.edge; - -import java.util.Collection; -import java.util.List; -import org.opentripplanner.api.mapping.PropertyMapper; -import org.opentripplanner.inspector.vector.KeyValue; -import org.opentripplanner.street.model.edge.Edge; - -/** - * A {@link PropertyMapper} for the {@link EdgeLayerBuilder} for the OTP debug client. - */ -public class EdgePropertyMapper extends PropertyMapper { - - @Override - protected Collection map(Edge edge) { - return List.of(new KeyValue("java-class", edge.getClass().getSimpleName())); - } -} From 18eb243f84aab078770d66fd2f8cceff74dd47ec Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 30 Dec 2023 23:31:49 +0100 Subject: [PATCH 0139/1688] Make styles a but prettier --- .../src/components/MapView/MapView.tsx | 12 +++-- .../apis/vectortiles/DebugStyleSpec.java | 6 ++- .../GraphInspectorVectorTileResource.java | 15 +++--- .../inspector/vector/KeyValue.java | 6 ++- .../vector/stop/AreaStopsLayerBuilder.java | 47 ------------------- ...ayerBuilder.java => StopLayerBuilder.java} | 15 +++--- .../stop/StopLocationPropertyMapper.java | 14 +++--- 7 files changed, 39 insertions(+), 76 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/inspector/vector/stop/AreaStopsLayerBuilder.java rename src/main/java/org/opentripplanner/inspector/vector/stop/{RegularStopsLayerBuilder.java => StopLayerBuilder.java} (73%) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 9409a0cc68a..a565ae22db9 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -86,12 +86,14 @@ export function MapView({ closeButton={true} onClose={() => setShowPropsPopup(null)} > - +
{Object.entries(showPropsPopup.feature.properties).map(([key, value]) => ( - - - - + + + + + + ))}
{key}{value}
{key}{value}
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 9121d671c06..c3dfc3d06f1 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -7,6 +7,10 @@ import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; +/** + * A Mapbox/Mapblibre style specification for rendering debug information about transit and + * street data. + */ public class DebugStyleSpec { private static final RasterSource BACKGROUND_SOURCE = new RasterSource( @@ -33,7 +37,7 @@ static StyleSpec build(VectorSource debugSource, VectorSourceLayer regularStops) .ofId("regular-stop") .typeCircle() .vectorSourceLayer(regularStops) - .circleStroke("#140d0e", 1) + .circleStroke("#140d0e", 2) .circleColor("#fcf9fa") .minZoom(13) .maxZoom(22) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 7e800b5639b..c27d38b260c 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -29,8 +29,7 @@ import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.inspector.vector.VectorTileResponseFactory; import org.opentripplanner.inspector.vector.geofencing.GeofencingZonesLayerBuilder; -import org.opentripplanner.inspector.vector.stop.AreaStopsLayerBuilder; -import org.opentripplanner.inspector.vector.stop.RegularStopsLayerBuilder; +import org.opentripplanner.inspector.vector.stop.StopLayerBuilder; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.standalone.api.OtpServerRequestContext; @@ -152,12 +151,16 @@ private static LayerBuilder createLayerBuilder( OtpServerRequestContext context ) { return switch (layerParameters.type()) { - case RegularStop -> new RegularStopsLayerBuilder( - context.transitService(), + case RegularStop -> new StopLayerBuilder<>( layerParameters, - locale + locale, + e -> context.transitService().findRegularStop(e) + ); + case AreaStop -> new StopLayerBuilder<>( + layerParameters, + locale, + e -> context.transitService().findAreaStops(e) ); - case AreaStop -> new AreaStopsLayerBuilder(context.transitService(), layerParameters, locale); case GeofencingZones -> new GeofencingZonesLayerBuilder(context.graph(), layerParameters); }; } diff --git a/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java b/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java index d57afd3429e..6c8b0f3aa4e 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java +++ b/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java @@ -1,3 +1,7 @@ package org.opentripplanner.inspector.vector; -public record KeyValue(String key, Object value) {} +public record KeyValue(String key, Object value) { + public static KeyValue kv(String key, Object value) { + return new KeyValue(key, value); + } +} diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/AreaStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/stop/AreaStopsLayerBuilder.java deleted file mode 100644 index d1a2552e4e2..00000000000 --- a/src/main/java/org/opentripplanner/inspector/vector/stop/AreaStopsLayerBuilder.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.opentripplanner.inspector.vector.stop; - -import java.util.Collection; -import java.util.List; -import java.util.Locale; -import java.util.function.Function; -import org.locationtech.jts.geom.Envelope; -import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.inspector.vector.LayerBuilder; -import org.opentripplanner.inspector.vector.LayerParameters; -import org.opentripplanner.transit.model.site.AreaStop; -import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.service.TransitService; - -/** - * A vector tile layer containing all {@link AreaStop}s inside the vector tile bounds. - */ -public class AreaStopsLayerBuilder extends LayerBuilder { - - private final Function> findAreaStops; - - public AreaStopsLayerBuilder( - TransitService transitService, - LayerParameters layerParameters, - Locale locale - ) { - super( - new StopLocationPropertyMapper(locale), - layerParameters.name(), - layerParameters.expansionFactor() - ); - this.findAreaStops = transitService::findAreaStops; - } - - @Override - protected List getGeometries(Envelope query) { - return findAreaStops - .apply(query) - .stream() - .map(areaStop -> { - Geometry geometry = areaStop.getGeometry().copy(); - geometry.setUserData(areaStop); - return geometry; - }) - .toList(); - } -} diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/RegularStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java similarity index 73% rename from src/main/java/org/opentripplanner/inspector/vector/stop/RegularStopsLayerBuilder.java rename to src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java index f943e23eb88..40784ab5b3b 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/stop/RegularStopsLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java @@ -10,31 +10,30 @@ import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.service.TransitService; /** * A vector tile layer containing all {@link RegularStop}s inside the vector tile bounds. */ -public class RegularStopsLayerBuilder extends LayerBuilder { +public class StopLayerBuilder extends LayerBuilder { - private final Function> findAreaStops; + private final Function> findStops; - public RegularStopsLayerBuilder( - TransitService transitService, + public StopLayerBuilder( LayerParameters layerParameters, - Locale locale + Locale locale, + Function> findStops ) { super( new StopLocationPropertyMapper(locale), layerParameters.name(), layerParameters.expansionFactor() ); - this.findAreaStops = transitService::findRegularStop; + this.findStops = findStops; } @Override protected List getGeometries(Envelope query) { - return findAreaStops + return findStops .apply(query) .stream() .map(stop -> { diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java index d2e1accf483..44729bcb407 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java @@ -1,5 +1,7 @@ package org.opentripplanner.inspector.vector.stop; +import static org.opentripplanner.inspector.vector.KeyValue.kv; + import java.util.Collection; import java.util.List; import java.util.Locale; @@ -7,7 +9,6 @@ import org.opentripplanner.api.mapping.PropertyMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.service.TransitService; /** * A {@link PropertyMapper} for the {@link AreaStopsLayerBuilder} for the OTP debug client. @@ -20,15 +21,12 @@ public StopLocationPropertyMapper(Locale locale) { this.i18NStringMapper = new I18NStringMapper(locale); } - public static PropertyMapper create(TransitService ignored, Locale locale) { - return new StopLocationPropertyMapper(locale); - } - @Override - protected Collection map(StopLocation input) { + protected Collection map(StopLocation stop) { return List.of( - new KeyValue("id", input.getId().toString()), - new KeyValue("name", i18NStringMapper.mapToApi(input.getName())) + kv("name", i18NStringMapper.mapToApi(stop.getName())), + kv("id", stop.getId().toString()), + kv("parentId", stop.isPartOfStation() ? stop.getParentStation().getId().toString() : null) ); } } From 7cfbae80109ecd00c9240ca9c2e803206eae8fd8 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 31 Dec 2023 00:04:49 +0100 Subject: [PATCH 0140/1688] Add test for debug style spec --- .../vectortiles/model/LayerStyleBuilder.java | 3 +- .../apis/vectortiles/DebugStyleSpecTest.java | 25 +++++++++++ .../vector/stop/AreaStopLayerBuilderTest.java | 16 ++------ .../test/support/ResourceLoader.java | 11 +++++ .../apis/vectortiles/style.json | 41 +++++++++++++++++++ 5 files changed, 81 insertions(+), 15 deletions(-) create mode 100644 src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java create mode 100644 src/test/resources/org/opentripplanner/apis/vectortiles/style.json diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index 0e1006027f2..41144611f92 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -27,8 +27,7 @@ public static LayerStyleBuilder ofId(String id) { public LayerStyleBuilder vectorSourceLayer(VectorSourceLayer source) { source(source.vectorSource()); - sourceLayer(source.vectorLayer()); - return this; + return sourceLayer(source.vectorLayer()); } public enum LayerType { diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java new file mode 100644 index 00000000000..4fd9204c2a9 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -0,0 +1,25 @@ +package org.opentripplanner.apis.vectortiles; + +import static org.opentripplanner.test.support.JsonAssertions.assertEqualJson; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.apis.vectortiles.DebugStyleSpec.VectorSourceLayer; +import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; +import org.opentripplanner.framework.json.ObjectMappers; +import org.opentripplanner.test.support.ResourceLoader; + +class DebugStyleSpecTest { + + private final ResourceLoader RES = ResourceLoader.of(this); + + @Test + void spec() { + var vectorSource = new VectorSource("vectorSource", "https://example.com"); + var regularStops = new VectorSourceLayer(vectorSource, "regularStops"); + var spec = DebugStyleSpec.build(vectorSource, regularStops); + + var json = ObjectMappers.ignoringExtraFields().valueToTree(spec).toPrettyString(); + var expectation = RES.fileToString("style.json"); + assertEqualJson(expectation, json); + } +} diff --git a/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java b/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java index 3fea49ab236..231f3ddce59 100644 --- a/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java +++ b/src/test/java/org/opentripplanner/inspector/vector/stop/AreaStopLayerBuilderTest.java @@ -1,12 +1,10 @@ package org.opentripplanner.inspector.vector.stop; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Locale; import org.junit.jupiter.api.Test; -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.framework.geometry.GeometryUtils; +import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.inspector.vector.KeyValue; @@ -17,22 +15,15 @@ class AreaStopLayerBuilderTest { - private static final Coordinate[] COORDINATES = { - new Coordinate(0, 0), - new Coordinate(0, 1), - new Coordinate(1, 1), - new Coordinate(1, 0), - new Coordinate(0, 0), - }; private static final FeedScopedId ID = new FeedScopedId("FEED", "ID"); - private static final I18NString NAME = new NonLocalizedString("Test stop"); + private static final I18NString NAME = I18NString.of("Test stop"); private final StopModelBuilder stopModelBuilder = StopModel.of(); private final AreaStop areaStop = stopModelBuilder .areaStop(ID) .withName(NAME) - .withGeometry(GeometryUtils.getGeometryFactory().createPolygon(COORDINATES)) + .withGeometry(Polygons.BERLIN) .build(); @Test @@ -41,7 +32,6 @@ void map() { var properties = subject.map(areaStop); - assertEquals(2, properties.size()); assertTrue(properties.contains(new KeyValue("id", ID.toString()))); assertTrue(properties.contains(new KeyValue("name", NAME.toString()))); } diff --git a/src/test/java/org/opentripplanner/test/support/ResourceLoader.java b/src/test/java/org/opentripplanner/test/support/ResourceLoader.java index 38fe02a8c74..5eb51cac55a 100644 --- a/src/test/java/org/opentripplanner/test/support/ResourceLoader.java +++ b/src/test/java/org/opentripplanner/test/support/ResourceLoader.java @@ -55,6 +55,17 @@ public File file(String path) { return file; } + /** + * Returns the string content of a file. + */ + public String fileToString(String p) { + try { + return Files.readString(file(p).toPath()); + } catch (IOException e) { + throw new RuntimeException(e); + } + } + /** * Return a URL for the given resource. */ diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json new file mode 100644 index 00000000000..f0ed87090c3 --- /dev/null +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -0,0 +1,41 @@ +{ + "name": "OTP Debug Tiles", + "sources": { + "background": { + "id": "background", + "tiles": [ + "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png" + ], + "tileSize": 256, + "type": "raster" + }, + "vectorSource": { + "id": "vectorSource", + "url": "https://example.com", + "type": "vector" + } + }, + "layers": [ + { + "id": "background", + "source": "background", + "type": "raster", + "maxzoom": 22, + "minzoom": 0 + }, + { + "maxzoom": 22, + "paint": { + "circle-stroke-width": 2, + "circle-color": "#fcf9fa", + "circle-stroke-color": "#140d0e" + }, + "id": "regular-stop", + "source": "vectorSource", + "source-layer": "regularStops", + "type": "circle", + "minzoom": 13 + } + ], + "version": 8 +} From c7395d8282ea247e4d4a1d808efb740c0a6a6a79 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 31 Dec 2023 00:13:31 +0100 Subject: [PATCH 0141/1688] Save a JSON round trip --- .../apis/vectortiles/DebugStyleSpecTest.java | 2 +- .../test/support/JsonAssertions.java | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index 4fd9204c2a9..d685e07a2f2 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -18,7 +18,7 @@ void spec() { var regularStops = new VectorSourceLayer(vectorSource, "regularStops"); var spec = DebugStyleSpec.build(vectorSource, regularStops); - var json = ObjectMappers.ignoringExtraFields().valueToTree(spec).toPrettyString(); + var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); var expectation = RES.fileToString("style.json"); assertEqualJson(expectation, json); } diff --git a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java index f3942c16f3b..2dab1e96190 100644 --- a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java +++ b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import org.opentripplanner.standalone.config.framework.json.JsonSupport; @@ -15,9 +16,19 @@ public class JsonAssertions { */ public static void assertEqualJson(String expected, String actual) { try { - var act = MAPPER.readTree(actual); + assertEqualJson(expected, MAPPER.readTree(actual)); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } + + /** + * @see JsonAssertions#assertEqualJson(String, String) + */ + public static void assertEqualJson(String expected, JsonNode actual) { + try { var exp = MAPPER.readTree(expected); - assertEquals(JsonSupport.prettyPrint(exp), JsonSupport.prettyPrint(act)); + assertEquals(JsonSupport.prettyPrint(exp), JsonSupport.prettyPrint(actual)); } catch (JsonProcessingException e) { throw new RuntimeException(e); } From 934b809480f9f4976f95d7f5d93125a1d7d4e1e9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 2 Jan 2024 16:59:58 +0100 Subject: [PATCH 0142/1688] Add attribution, remove client side style --- .../src/components/MapView/mapStyle.ts | 19 ------------------- .../apis/vectortiles/DebugStyleSpec.java | 3 ++- .../apis/vectortiles/model/TileSource.java | 2 +- .../apis/vectortiles/style.json | 1 + 4 files changed, 4 insertions(+), 21 deletions(-) delete mode 100644 client-next/src/components/MapView/mapStyle.ts diff --git a/client-next/src/components/MapView/mapStyle.ts b/client-next/src/components/MapView/mapStyle.ts deleted file mode 100644 index ecaa88c0354..00000000000 --- a/client-next/src/components/MapView/mapStyle.ts +++ /dev/null @@ -1,19 +0,0 @@ -export const mapStyle = { - version: 8, - sources: { - osm: { - type: 'raster', - tiles: ['https://a.tile.openstreetmap.org/{z}/{x}/{y}.png'], - tileSize: 256, - attribution: '© OpenStreetMap Contributors', - maxzoom: 19, - }, - }, - layers: [ - { - id: 'osm', - type: 'raster', - source: 'osm', // This must match the source key above - }, - ], -}; diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index c3dfc3d06f1..9a4fe9be123 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -16,7 +16,8 @@ public class DebugStyleSpec { private static final RasterSource BACKGROUND_SOURCE = new RasterSource( "background", List.of("https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"), - 256 + 256, + "© OpenStreetMap Contributors" ); public record VectorSourceLayer(VectorSource vectorSource, String vectorLayer) {} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java index debf3070782..d9dbe50f68e 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java @@ -22,7 +22,7 @@ public String type() { /** * Represents a raster-based source for map tiles. */ - record RasterSource(String id, List tiles, int tileSize) implements TileSource { + record RasterSource(String id, List tiles, int tileSize, String attribution) implements TileSource { @Override public String type() { return "raster"; diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index f0ed87090c3..6f95471a667 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -7,6 +7,7 @@ "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png" ], "tileSize": 256, + "attribution" : "© OpenStreetMap Contributors", "type": "raster" }, "vectorSource": { From 826a8429e14afe04ea48dbe8f4e5061d4cb303fd Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 2 Jan 2024 17:09:44 +0100 Subject: [PATCH 0143/1688] Add documentation, fix frontend code --- client-next/src/components/MapView/MapView.tsx | 10 +++++----- .../apis/vectortiles/model/LayerParams.java | 11 ++++++++--- .../apis/vectortiles/model/StyleSpec.java | 2 ++ .../apis/vectortiles/model/TileSource.java | 8 ++++++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index a565ae22db9..c3879dd2a6b 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -87,14 +87,14 @@ export function MapView({ onClose={() => setShowPropsPopup(null)} > - {Object.entries(showPropsPopup.feature.properties).map(([key, value]) => ( - - + + {Object.entries(showPropsPopup.feature.properties).map(([key, value]) => ( + - - ))} + ))} +
{key} {value}
)} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java index 2f1e6eb7109..7365e8972da 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java @@ -1,6 +1,7 @@ package org.opentripplanner.apis.vectortiles.model; -import org.opentripplanner.apis.vectortiles.DebugStyleSpec; +import org.opentripplanner.apis.vectortiles.DebugStyleSpec.VectorSourceLayer; +import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; import org.opentripplanner.inspector.vector.LayerParameters; public record LayerParams(String name, LayerType type) implements LayerParameters { @@ -9,7 +10,11 @@ public String mapper() { return "DebugClient"; } - public DebugStyleSpec.VectorSourceLayer toVectorSourceLayer(TileSource.VectorSource source) { - return new DebugStyleSpec.VectorSourceLayer(source, name); + /** + * Convert these params to a vector source layer so that it can be used in the style for rendering + * in the frontend. + */ + public VectorSourceLayer toVectorSourceLayer(VectorSource source) { + return new VectorSourceLayer(source, name); } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java index 090573d467d..84e19f25364 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java @@ -9,6 +9,8 @@ /** * Represents a style specification for Maplibre/Mapbox vector tile layers. * https://maplibre.org/maplibre-style-spec/root/ + *

+ * Maplibre uses these to render vector maps in the browser. */ public final class StyleSpec { diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java index d9dbe50f68e..e3186cc1d99 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java @@ -3,6 +3,9 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import java.util.List; +/** + * Represent a data source where Maplibre can fetch data for rendering directly in the browser. + */ public sealed interface TileSource { @JsonSerialize String type(); @@ -10,7 +13,7 @@ public sealed interface TileSource { String id(); /** - * Represents a vector tile source. + * Represents a vector tile source which is rendered into a map in the browser. */ record VectorSource(String id, String url) implements TileSource { @Override @@ -20,7 +23,8 @@ public String type() { } /** - * Represents a raster-based source for map tiles. + * Represents a raster-based source for map tiles. These are used mainly for background + * map layers with vector data being rendered on top of it. */ record RasterSource(String id, List tiles, int tileSize, String attribution) implements TileSource { @Override From c8642006f32c59f94007bcb532bc2eb51f8f1804 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 2 Jan 2024 21:57:30 +0100 Subject: [PATCH 0144/1688] Make TS compiler happy --- client-next/src/components/MapView/MapView.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index c3879dd2a6b..d03c4869067 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -53,8 +53,10 @@ export function MapView({ }} interactiveLayerIds={['regular-stop']} onClick={(e) => { - const props = e.features[0]; - setShowPropsPopup(new PopupData(e.lngLat, props)); + if (e.features) { + const props = e.features[0]; + setShowPropsPopup(new PopupData(e.lngLat, props)); + } }} // put lat/long in URL and pan to it on page reload hash={true} @@ -79,7 +81,7 @@ export function MapView({ onClose={() => setShowContextPopup(null)} /> )} - {showPropsPopup && ( + {showPropsPopup && showPropsPopup.feature && showPropsPopup.feature.properties && ( Date: Tue, 2 Jan 2024 22:00:55 +0100 Subject: [PATCH 0145/1688] Convert from class to type --- client-next/src/components/MapView/MapView.tsx | 9 ++------- .../apis/vectortiles/model/TileSource.java | 3 ++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index d03c4869067..9ecc35c27aa 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -15,12 +15,7 @@ const initialViewState = { zoom: 4, }; -class PopupData { - constructor( - public coordinates: LngLat, - public feature: MapboxGeoJSONFeature, - ) {} -} +type PopupData = { coordinates: LngLat; feature: MapboxGeoJSONFeature }; export function MapView({ tripQueryVariables, @@ -55,7 +50,7 @@ export function MapView({ onClick={(e) => { if (e.features) { const props = e.features[0]; - setShowPropsPopup(new PopupData(e.lngLat, props)); + setShowPropsPopup({ coordinates: e.lngLat, feature: props }); } }} // put lat/long in URL and pan to it on page reload diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java index e3186cc1d99..06af294a4f0 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java @@ -26,7 +26,8 @@ public String type() { * Represents a raster-based source for map tiles. These are used mainly for background * map layers with vector data being rendered on top of it. */ - record RasterSource(String id, List tiles, int tileSize, String attribution) implements TileSource { + record RasterSource(String id, List tiles, int tileSize, String attribution) + implements TileSource { @Override public String type() { return "raster"; From 1cbce1fcd83b0af48f8f9d5cc62c522ce621fbea Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 2 Jan 2024 22:15:40 +0100 Subject: [PATCH 0146/1688] Use optional chaining --- client-next/src/components/MapView/MapView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 9ecc35c27aa..95c898c4a28 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -76,7 +76,7 @@ export function MapView({ onClose={() => setShowContextPopup(null)} /> )} - {showPropsPopup && showPropsPopup.feature && showPropsPopup.feature.properties && ( + {showPropsPopup?.feature?.properties && ( Date: Tue, 2 Jan 2024 22:09:22 +0100 Subject: [PATCH 0147/1688] Update codec format --- .../org/opentripplanner/ext/geocoder/LuceneIndex.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 7037fd19361..71b0cf67b34 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -17,7 +17,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer; import org.apache.lucene.codecs.Codec; import org.apache.lucene.codecs.PostingsFormat; -import org.apache.lucene.codecs.lucene95.Lucene95Codec; +import org.apache.lucene.codecs.lucene99.Lucene99Codec; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field.Store; import org.apache.lucene.document.StoredField; @@ -33,7 +33,7 @@ import org.apache.lucene.search.FuzzyQuery; import org.apache.lucene.search.PrefixQuery; import org.apache.lucene.search.TermQuery; -import org.apache.lucene.search.suggest.document.Completion90PostingsFormat; +import org.apache.lucene.search.suggest.document.Completion99PostingsFormat; import org.apache.lucene.search.suggest.document.CompletionAnalyzer; import org.apache.lucene.search.suggest.document.ContextQuery; import org.apache.lucene.search.suggest.document.ContextSuggestField; @@ -191,8 +191,8 @@ private static StopCluster toStopCluster(Document document) { static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, final Set suggestFields) { IndexWriterConfig iwc = new IndexWriterConfig(analyzer); - Codec filterCodec = new Lucene95Codec() { - final PostingsFormat postingsFormat = new Completion90PostingsFormat(); + Codec filterCodec = new Lucene99Codec() { + final PostingsFormat postingsFormat = new Completion99PostingsFormat(); @Override public PostingsFormat getPostingsFormatForField(String field) { From 7157ff82c0797f7caaa1d55965f19b6495ec951e Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 4 Jan 2024 11:36:14 +0200 Subject: [PATCH 0148/1688] Remove boardCost from scooter preferences --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 0859edd8ab7..fda86f54add 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -4675,11 +4675,6 @@ input ScooterPreferencesInput { """ optimization: ScooterOptimizationInput - """ - Cost of boarding a vehicle with a scooter. - """ - boardCost: Cost - """ Scooter rental related preferences. """ From d3f802173e92f742904e8343a0680f5466597e4e Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 4 Jan 2024 11:43:34 +0200 Subject: [PATCH 0149/1688] Only allow scooter rental as mode --- .../opentripplanner/apis/gtfs/schema.graphqls | 27 ------------------- 1 file changed, 27 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index fda86f54add..5281632629a 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -2614,13 +2614,6 @@ enum PlanAccessMode { """ FLEX - """ - Riding a scooter to a stop and boarding a vehicle with the scooter. - Note, this can include walking when it's needed to walk the scooter. Access - can use scooter only if the mode used for transfers and egress is also `SCOOTER`. - """ - SCOOTER - """ Scooter rental can use either station based systems or "floating" vehicles which are not linked to a rental station. Note, if there are no @@ -2689,12 +2682,6 @@ enum PlanDirectMode { """ FLEX - """ - Riding a scooter from the origin to the destination. Note, this can include walking - when it's needed to walk the scooter. - """ - SCOOTER - """ Scooter rental can use either station based systems or "floating" vehicles which are not linked to a rental station. Note, if there are no @@ -2753,13 +2740,6 @@ enum PlanEgressMode { """ FLEX - """ - Riding a scooter from a stop to the destination. Note, this can include walking - when it's needed to walk the scooter. Egress can use scooter only if the mode - used for transfers and egress is also `SCOOTER`. - """ - SCOOTER - """ Scooter rental can use either station based systems or "floating" vehicles which are not linked to a rental station. Note, if there are no @@ -2783,13 +2763,6 @@ enum PlanTransferMode { """ BICYCLE - """ - Riding a scooter between transit vehicles (typically between stops). Note, this can - include walking when it's needed to walk the scooter. Transfers can only use - scooter if the mode used for access and egress is also `SCOOTER`. - """ - SCOOTER - """ Walking between transit vehicles (typically between stops). """ From e132e888a2d46f16a0d0096a25879fdd95ffc295 Mon Sep 17 00:00:00 2001 From: Viljami Nurminen Date: Thu, 4 Jan 2024 13:24:59 +0200 Subject: [PATCH 0150/1688] Generalize graph building method --- .../islandpruning/AdaptivePruningTest.java | 56 ++++--------------- .../islandpruning/EscalatorPruningTest.java | 11 +++- .../islandpruning/IslandPruningUtils.java | 16 ++++-- .../islandpruning/PruneNoThruIslandsTest.java | 6 +- 4 files changed, 34 insertions(+), 55 deletions(-) diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java index 832045b6469..9f7e4e8cf4a 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java @@ -1,18 +1,13 @@ package org.opentripplanner.graph_builder.module.islandpruning; -import java.io.File; +import static org.opentripplanner.graph_builder.module.islandpruning.IslandPruningUtils.buildOsmGraph; + import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.graph_builder.module.osm.OsmModule; -import org.opentripplanner.openstreetmap.OsmProvider; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; -import org.opentripplanner.transit.model.framework.Deduplicator; -import org.opentripplanner.transit.service.StopModel; -import org.opentripplanner.transit.service.TransitModel; /* Test data consists of one bigger graph and two small sub graphs. These are totally disconnected. One small graphs is only at 5 meter distance from the big graph and another one 30 m away. @@ -26,7 +21,14 @@ public class AdaptivePruningTest { @BeforeAll static void setup() { - graph = buildOsmGraph(ResourceLoader.of(AdaptivePruningTest.class).file("isoiiluoto.pbf")); + graph = + buildOsmGraph( + ResourceLoader.of(AdaptivePruningTest.class).file("isoiiluoto.pbf"), + 5, + 0, + 20, + 30 + ); } @Test @@ -64,42 +66,4 @@ public void mainGraphIsNotRemoved() { .contains("73347312") ); } - - private static Graph buildOsmGraph(File file) { - try { - var deduplicator = new Deduplicator(); - var graph = new Graph(deduplicator); - var transitModel = new TransitModel(new StopModel(), deduplicator); - // Add street data from OSM - OsmProvider osmProvider = new OsmProvider(file, true); - OsmModule osmModule = OsmModule.of(osmProvider, graph).withEdgeNamer(new TestNamer()).build(); - - osmModule.buildGraph(); - - transitModel.index(); - graph.index(transitModel.getStopModel()); - - // Prune floating islands and set noThru where necessary - PruneIslands pruneIslands = new PruneIslands( - graph, - transitModel, - DataImportIssueStore.NOOP, - null - ); - // all 3 sub graphs are larger than 5 edges - pruneIslands.setPruningThresholdIslandWithoutStops(5); - - // up to 5*20 = 100 edge graphs get pruned if they are too close - pruneIslands.setAdaptivePruningFactor(20); - - // Distant island is 30 m away from main graph, let's keep it - pruneIslands.setAdaptivePruningDistance(30); - - pruneIslands.buildGraph(); - - return graph; - } catch (Exception e) { - throw new RuntimeException(e); - } - } } diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java index b063fcbd184..ce1b5f78489 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java @@ -2,7 +2,6 @@ import static org.opentripplanner.graph_builder.module.islandpruning.IslandPruningUtils.buildOsmGraph; -import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -16,14 +15,20 @@ public class EscalatorPruningTest { @Test public void streetEdgesBetweenEscalatorEdgesRetained() { graph = - buildOsmGraph(ResourceLoader.of(EscalatorPruningTest.class).file("matinkyla-escalator.pbf")); + buildOsmGraph( + ResourceLoader.of(EscalatorPruningTest.class).file("matinkyla-escalator.pbf"), + 10, + 2, + 50, + 250 + ); Assertions.assertTrue( graph .getStreetEdges() .stream() .map(streetEdge -> streetEdge.getName().toString()) .collect(Collectors.toSet()) - .containsAll(Set.of("490072445")) + .contains("490072445") ); } } diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java index dbe86247cac..6e8ff0ec2c2 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java @@ -11,7 +11,13 @@ class IslandPruningUtils { - static Graph buildOsmGraph(File osmFile) { + static Graph buildOsmGraph( + File osmFile, + int thresholdIslandWithoutStops, + int thresholdIslandWithStops, + double adaptivePruningFactor, + int adaptivePruningDistance + ) { try { var deduplicator = new Deduplicator(); var graph = new Graph(deduplicator); @@ -32,10 +38,10 @@ static Graph buildOsmGraph(File osmFile) { DataImportIssueStore.NOOP, null ); - pruneIslands.setPruningThresholdIslandWithoutStops(10); - pruneIslands.setPruningThresholdIslandWithStops(2); - pruneIslands.setAdaptivePruningFactor(50); - pruneIslands.setAdaptivePruningDistance(250); + pruneIslands.setPruningThresholdIslandWithoutStops(thresholdIslandWithoutStops); + pruneIslands.setPruningThresholdIslandWithStops(thresholdIslandWithStops); + pruneIslands.setAdaptivePruningFactor(adaptivePruningFactor/*50*/); + pruneIslands.setAdaptivePruningDistance(adaptivePruningDistance/*250*/); pruneIslands.buildGraph(); return graph; diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java index f9453b0941c..856b81bc385 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java @@ -21,7 +21,11 @@ static void setup() { buildOsmGraph( ResourceLoader .of(PruneNoThruIslandsTest.class) - .file("herrenberg-island-prune-nothru.osm.pbf") + .file("herrenberg-island-prune-nothru.osm.pbf"), + 10, + 2, + 50, + 250 ); } From 62865b09a7bf8c44f23271dd6d602fb4f2891bbe Mon Sep 17 00:00:00 2001 From: Viljami Nurminen Date: Thu, 4 Jan 2024 15:38:56 +0200 Subject: [PATCH 0151/1688] Clean up debugging comments --- .../module/islandpruning/IslandPruningUtils.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java index 6e8ff0ec2c2..59362472771 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/IslandPruningUtils.java @@ -40,8 +40,8 @@ static Graph buildOsmGraph( ); pruneIslands.setPruningThresholdIslandWithoutStops(thresholdIslandWithoutStops); pruneIslands.setPruningThresholdIslandWithStops(thresholdIslandWithStops); - pruneIslands.setAdaptivePruningFactor(adaptivePruningFactor/*50*/); - pruneIslands.setAdaptivePruningDistance(adaptivePruningDistance/*250*/); + pruneIslands.setAdaptivePruningFactor(adaptivePruningFactor); + pruneIslands.setAdaptivePruningDistance(adaptivePruningDistance); pruneIslands.buildGraph(); return graph; From d85ae6dab6571f9feca84b0c36019f8428000d18 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 4 Jan 2024 16:09:59 +0100 Subject: [PATCH 0152/1688] Fix changelog [ci skip] --- docs/Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Changelog.md b/docs/Changelog.md index bf2d502e636..7f26aebaca2 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -66,7 +66,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Report NO_TRANSIT_CONNECTION when search-window is set. [#5570](https://github.com/opentripplanner/OpenTripPlanner/pull/5570) - Transit priority - part 3 [#5583](https://github.com/opentripplanner/OpenTripPlanner/pull/5583) - Fix preference cost comparisons [#5586](https://github.com/opentripplanner/OpenTripPlanner/pull/5586) -- Report and throw away trip-times which fail sanity check [#5587](https://github.com/opentripplanner/OpenTripPlanner/pull/5587) +- Report and throw away trip-times which fail sanity check [#5587](https://github.com/opentripplanner/OpenTripPlanner/pull/5587) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 9a03857d3d971e9cb5a2582f3fffc62dc5f32224 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 4 Jan 2024 17:27:37 +0200 Subject: [PATCH 0153/1688] Add tests for rental and parking --- .../preference/BikePreferencesTest.java | 18 ++++++++++++++++++ .../request/preference/CarPreferencesTest.java | 18 ++++++++++++++++++ 2 files changed, 36 insertions(+) diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java index e8e3ff576a9..9da7852cc2c 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java @@ -21,6 +21,8 @@ class BikePreferencesTest { .withSlope(1) .build(); public static final BicycleOptimizeType OPTIMIZE_TYPE = BicycleOptimizeType.TRIANGLE; + public static final int RENTAL_PICKUP_TIME = 30; + public static final int PARK_COST = 30; private final BikePreferences subject = BikePreferences .of() @@ -32,6 +34,8 @@ class BikePreferencesTest { .withSwitchTime(SWITCH_TIME) .withSwitchCost(SWITCH_COST) .withOptimizeType(OPTIMIZE_TYPE) + .withRental(rental -> rental.withPickupTime(RENTAL_PICKUP_TIME).build()) + .withParking(parking -> parking.withParkCost(PARK_COST).build()) .withOptimizeTriangle(it -> it.withSlope(1).build()) .build(); @@ -80,6 +84,18 @@ void optimizeTriangle() { assertEquals(TRIANGLE, subject.optimizeTriangle()); } + @Test + void rental() { + var vehicleRental = VehicleRentalPreferences.of().withPickupTime(RENTAL_PICKUP_TIME).build(); + assertEquals(vehicleRental, subject.rental()); + } + + @Test + void parking() { + var vehicleParking = VehicleParkingPreferences.of().withParkCost(PARK_COST).build(); + assertEquals(vehicleParking, subject.parking()); + } + @Test void testOfAndCopyOf() { // Return same object if no value is set @@ -107,6 +123,8 @@ void testToString() { "walkingReluctance: 1.45, " + "switchTime: 3m20s, " + "switchCost: $450, " + + "parking: VehicleParkingPreferences{parkCost: $30}, " + + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + "optimizeType: TRIANGLE, " + "optimizeTriangle: TimeSlopeSafetyTriangle[time=0.0, slope=1.0, safety=0.0]" + "}", diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java index 7bc0a1620ab..c81cb41d883 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java @@ -17,6 +17,8 @@ class CarPreferencesTest { private static final double ACCELERATION_SPEED = 3.1; private static final double DECELERATION_SPEED = 3.5; public static final int DROPOFF_TIME = 450; + public static final int RENTAL_PICKUP_TIME = 30; + public static final int PARK_COST = 30; private final CarPreferences subject = CarPreferences .of() @@ -27,6 +29,8 @@ class CarPreferencesTest { .withDropoffTime(DROPOFF_TIME) .withAccelerationSpeed(ACCELERATION_SPEED) .withDecelerationSpeed(DECELERATION_SPEED) + .withRental(rental -> rental.withPickupTime(RENTAL_PICKUP_TIME).build()) + .withParking(parking -> parking.withParkCost(PARK_COST).build()) .build(); @Test @@ -64,6 +68,18 @@ void decelerationSpeed() { assertEquals(DECELERATION_SPEED, subject.decelerationSpeed()); } + @Test + void rental() { + var vehicleRental = VehicleRentalPreferences.of().withPickupTime(RENTAL_PICKUP_TIME).build(); + assertEquals(vehicleRental, subject.rental()); + } + + @Test + void parking() { + var vehicleParking = VehicleParkingPreferences.of().withParkCost(PARK_COST).build(); + assertEquals(vehicleParking, subject.parking()); + } + @Test void testCopyOfEqualsAndHashCode() { // Return same object if no value is set @@ -83,6 +99,8 @@ void testToString() { "CarPreferences{" + "speed: 20.0, " + "reluctance: 5.1, " + + "parking: VehicleParkingPreferences{parkCost: $30}, " + + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + "pickupTime: 600, " + "pickupCost: $500, " + "dropoffTime: 450, " + From 7fb9773db0c02713a2c82d1c8afed652e08a2cfd Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 4 Jan 2024 16:49:28 +0100 Subject: [PATCH 0154/1688] Fix changelog [ci skip] --- docs/Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Changelog.md b/docs/Changelog.md index 7f26aebaca2..9f5c13de0e4 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -44,7 +44,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix serialization of `AtomicInteger` [#5508](https://github.com/opentripplanner/OpenTripPlanner/pull/5508) - Improve linking of fixed stops used by flex trips [#5503](https://github.com/opentripplanner/OpenTripPlanner/pull/5503) - Keep min transfer filter is not local to group-by-filters [#5436](https://github.com/opentripplanner/OpenTripPlanner/pull/5436) -- Add paging deduplication when cropping. [#5458](https://github.com/opentripplanner/OpenTripPlanner/pull/5458) +- Add paging deduplication when cropping [#5458](https://github.com/opentripplanner/OpenTripPlanner/pull/5458) - Consolidate equivalent stops from several feeds [#5429](https://github.com/opentripplanner/OpenTripPlanner/pull/5429) - Check transport mode when mapping GroupStops [#5518](https://github.com/opentripplanner/OpenTripPlanner/pull/5518) - Cleanup trip times - Part A [#5437](https://github.com/opentripplanner/OpenTripPlanner/pull/5437) From 914e5c1a6ee88b6b610efa3f1c991f9d7b1bd3cb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 4 Jan 2024 17:46:18 +0100 Subject: [PATCH 0155/1688] Remove GTFS-RT websocket updater --- pom.xml | 21 -- .../config/routerconfig/UpdatersConfig.java | 9 - .../WebsocketGtfsRealtimeUpdaterConfig.java | 24 -- .../updater/UpdatersParameters.java | 3 - .../configure/UpdaterConfigurator.java | 10 - .../trip/WebsocketGtfsRealtimeUpdater.java | 211 ------------------ ...ebsocketGtfsRealtimeUpdaterParameters.java | 45 ---- 7 files changed, 323 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/WebsocketGtfsRealtimeUpdaterConfig.java delete mode 100644 src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdater.java delete mode 100644 src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdaterParameters.java diff --git a/pom.xml b/pom.xml index de8baecefd9..0e03a0ccc7d 100644 --- a/pom.xml +++ b/pom.xml @@ -551,20 +551,6 @@ import - - - io.netty - netty-bom - 4.1.100.Final - pom - import - - @@ -842,13 +828,6 @@ protobuf-java - - - - org.asynchttpclient - async-http-client - 2.12.3 - org.onebusaway diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java index 0f61fa4f7a2..08371660b8a 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java @@ -14,7 +14,6 @@ import static org.opentripplanner.standalone.config.routerconfig.UpdatersConfig.Type.VEHICLE_PARKING; import static org.opentripplanner.standalone.config.routerconfig.UpdatersConfig.Type.VEHICLE_POSITIONS; import static org.opentripplanner.standalone.config.routerconfig.UpdatersConfig.Type.VEHICLE_RENTAL; -import static org.opentripplanner.standalone.config.routerconfig.UpdatersConfig.Type.WEBSOCKET_GTFS_RT_UPDATER; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -39,7 +38,6 @@ import org.opentripplanner.standalone.config.routerconfig.updaters.VehicleParkingUpdaterConfig; import org.opentripplanner.standalone.config.routerconfig.updaters.VehiclePositionsUpdaterConfig; import org.opentripplanner.standalone.config.routerconfig.updaters.VehicleRentalUpdaterConfig; -import org.opentripplanner.standalone.config.routerconfig.updaters.WebsocketGtfsRealtimeUpdaterConfig; import org.opentripplanner.standalone.config.routerconfig.updaters.azure.SiriAzureETUpdaterConfig; import org.opentripplanner.standalone.config.routerconfig.updaters.azure.SiriAzureSXUpdaterConfig; import org.opentripplanner.standalone.config.sandbox.VehicleRentalServiceDirectoryFetcherConfig; @@ -48,7 +46,6 @@ import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdaterParameters; import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters; import org.opentripplanner.updater.trip.PollingTripUpdaterParameters; -import org.opentripplanner.updater.trip.WebsocketGtfsRealtimeUpdaterParameters; import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters; import org.opentripplanner.updater.vehicle_position.VehiclePositionsUpdaterParameters; import org.opentripplanner.updater.vehicle_rental.VehicleRentalUpdaterParameters; @@ -185,11 +182,6 @@ public List getSiriSXUpdaterParameters() { return getParameters(SIRI_SX_UPDATER); } - @Override - public List getWebsocketGtfsRealtimeUpdaterParameters() { - return getParameters(WEBSOCKET_GTFS_RT_UPDATER); - } - @Override public List getMqttGtfsRealtimeUpdaterParameters() { return getParameters(MQTT_GTFS_RT_UPDATER); @@ -222,7 +214,6 @@ public enum Type { BIKE_RENTAL(VehicleRentalUpdaterConfig::create), VEHICLE_RENTAL(VehicleRentalUpdaterConfig::create), STOP_TIME_UPDATER(PollingTripUpdaterConfig::create), - WEBSOCKET_GTFS_RT_UPDATER(WebsocketGtfsRealtimeUpdaterConfig::create), MQTT_GTFS_RT_UPDATER(MqttGtfsRealtimeUpdaterConfig::create), REAL_TIME_ALERTS(GtfsRealtimeAlertsUpdaterConfig::create), VEHICLE_POSITIONS(VehiclePositionsUpdaterConfig::create), diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/WebsocketGtfsRealtimeUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/WebsocketGtfsRealtimeUpdaterConfig.java deleted file mode 100644 index 5f1c203ca43..00000000000 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/WebsocketGtfsRealtimeUpdaterConfig.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.opentripplanner.standalone.config.routerconfig.updaters; - -import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V1_5; - -import org.opentripplanner.standalone.config.framework.json.NodeAdapter; -import org.opentripplanner.updater.trip.BackwardsDelayPropagationType; -import org.opentripplanner.updater.trip.WebsocketGtfsRealtimeUpdaterParameters; - -public class WebsocketGtfsRealtimeUpdaterConfig { - - public static WebsocketGtfsRealtimeUpdaterParameters create(String configRef, NodeAdapter c) { - return new WebsocketGtfsRealtimeUpdaterParameters( - configRef, - c.of("feedId").since(V1_5).summary("TODO").asString(), - c.of("url").since(V1_5).summary("TODO").asString(null), - c.of("reconnectPeriodSec").since(V1_5).summary("TODO").asInt(60), - c - .of("backwardsDelayPropagationType") - .since(V1_5) - .summary("TODO") - .asEnum(BackwardsDelayPropagationType.REQUIRED_NO_DATA) - ); - } -} diff --git a/src/main/java/org/opentripplanner/updater/UpdatersParameters.java b/src/main/java/org/opentripplanner/updater/UpdatersParameters.java index 8a7c422eb03..a955e757100 100644 --- a/src/main/java/org/opentripplanner/updater/UpdatersParameters.java +++ b/src/main/java/org/opentripplanner/updater/UpdatersParameters.java @@ -10,7 +10,6 @@ import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdaterParameters; import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters; import org.opentripplanner.updater.trip.PollingTripUpdaterParameters; -import org.opentripplanner.updater.trip.WebsocketGtfsRealtimeUpdaterParameters; import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters; import org.opentripplanner.updater.vehicle_position.VehiclePositionsUpdaterParameters; import org.opentripplanner.updater.vehicle_rental.VehicleRentalUpdaterParameters; @@ -34,8 +33,6 @@ public interface UpdatersParameters { List getSiriSXUpdaterParameters(); - List getWebsocketGtfsRealtimeUpdaterParameters(); - List getMqttGtfsRealtimeUpdaterParameters(); List getVehicleParkingUpdaterParameters(); diff --git a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java index 037bd080f47..c755578da41 100644 --- a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java +++ b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java @@ -23,14 +23,11 @@ import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdater; import org.opentripplanner.updater.trip.PollingTripUpdater; import org.opentripplanner.updater.trip.TimetableSnapshotSource; -import org.opentripplanner.updater.trip.WebsocketGtfsRealtimeUpdater; import org.opentripplanner.updater.vehicle_parking.VehicleParkingDataSourceFactory; import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdater; import org.opentripplanner.updater.vehicle_position.PollingVehiclePositionUpdater; import org.opentripplanner.updater.vehicle_rental.VehicleRentalUpdater; import org.opentripplanner.updater.vehicle_rental.datasources.VehicleRentalDataSourceFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Sets up and starts all the graph updaters. @@ -41,8 +38,6 @@ */ public class UpdaterConfigurator { - private static final Logger LOG = LoggerFactory.getLogger(UpdaterConfigurator.class); - private final Graph graph; private final TransitModel transitModel; private final UpdatersParameters updatersParameters; @@ -177,11 +172,6 @@ private List createUpdatersFromConfig() { for (var configItem : updatersParameters.getSiriSXUpdaterParameters()) { updaters.add(new SiriSXUpdater(configItem, transitModel)); } - for (var configItem : updatersParameters.getWebsocketGtfsRealtimeUpdaterParameters()) { - updaters.add( - new WebsocketGtfsRealtimeUpdater(configItem, provideGtfsTimetableSnapshot(), transitModel) - ); - } for (var configItem : updatersParameters.getMqttGtfsRealtimeUpdaterParameters()) { updaters.add( new MqttGtfsRealtimeUpdater(configItem, transitModel, provideGtfsTimetableSnapshot()) diff --git a/src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdater.java b/src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdater.java deleted file mode 100644 index 007c73d9b9b..00000000000 --- a/src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdater.java +++ /dev/null @@ -1,211 +0,0 @@ -package org.opentripplanner.updater.trip; - -import static org.asynchttpclient.Dsl.asyncHttpClient; - -import com.google.protobuf.InvalidProtocolBufferException; -import com.google.transit.realtime.GtfsRealtime; -import com.google.transit.realtime.GtfsRealtime.FeedEntity; -import com.google.transit.realtime.GtfsRealtime.FeedMessage; -import com.google.transit.realtime.GtfsRealtime.TripUpdate; -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ExecutionException; -import java.util.function.Consumer; -import org.asynchttpclient.AsyncHttpClient; -import org.asynchttpclient.ws.WebSocket; -import org.asynchttpclient.ws.WebSocketListener; -import org.asynchttpclient.ws.WebSocketUpgradeHandler; -import org.opentripplanner.transit.service.DefaultTransitService; -import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher; -import org.opentripplanner.updater.spi.GraphUpdater; -import org.opentripplanner.updater.spi.UpdateResult; -import org.opentripplanner.updater.spi.WriteToGraphCallback; -import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * This class starts an HTTP client which opens a websocket connection to a GTFS-RT data source. A - * callback is registered which handles incoming GTFS-RT messages as they stream in by placing a - * GTFS-RT decoder Runnable task in the single-threaded executor for handling. - * - * 

- * websocket.type = websocket-gtfs-rt-updater
- * websocket.defaultAgencyId = agency
- * websocket.url = ws://localhost:8088/tripUpdates
- *
- */ -public class WebsocketGtfsRealtimeUpdater implements GraphUpdater { - - private static final Logger LOG = LoggerFactory.getLogger(WebsocketGtfsRealtimeUpdater.class); - - /** - * Number of seconds to wait before checking again whether we are still connected - */ - private static final int CHECK_CONNECTION_PERIOD_SEC = 1; - - /** - * Url of the websocket server - */ - private final String url; - - /** - * The ID for the static feed to which these TripUpdates are applied - */ - private final String feedId; - - /** - * The number of seconds to wait before reconnecting after a failed connection. - */ - private final int reconnectPeriodSec; - - private final String configRef; - - private final BackwardsDelayPropagationType backwardsDelayPropagationType; - - private final TimetableSnapshotSource snapshotSource; - - /** - * Parent update manager. Is used to execute graph writer runnables. - */ - private WriteToGraphCallback saveResultOnGraph; - - private GtfsRealtimeFuzzyTripMatcher fuzzyTripMatcher; - - private final Consumer recordMetrics; - - public WebsocketGtfsRealtimeUpdater( - WebsocketGtfsRealtimeUpdaterParameters parameters, - TimetableSnapshotSource snapshotSource, - TransitModel transitModel - ) { - this.configRef = parameters.configRef(); - this.url = parameters.url(); - this.feedId = parameters.feedId(); - this.reconnectPeriodSec = parameters.getReconnectPeriodSec(); - this.backwardsDelayPropagationType = parameters.getBackwardsDelayPropagationType(); - this.snapshotSource = snapshotSource; - this.fuzzyTripMatcher = - new GtfsRealtimeFuzzyTripMatcher(new DefaultTransitService(transitModel)); - this.recordMetrics = TripUpdateMetrics.streaming(parameters); - } - - @Override - public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) { - this.saveResultOnGraph = saveResultOnGraph; - } - - @Override - public void run() throws InterruptedException, IOException { - while (true) { - AsyncHttpClient client = asyncHttpClient(); - WebSocketListener listener = new Listener(); - WebSocketUpgradeHandler handler = new WebSocketUpgradeHandler.Builder() - .addWebSocketListener(listener) - .build(); - WebSocket socket = null; - boolean connectionSuccessful = true; - // Try to create a websocket connection - try { - socket = client.prepareGet(url).execute(handler).get(); - LOG.info("Successfully connected to {}.", url); - } catch (ExecutionException e) { - LOG.error("Could not connect to {}: {}", url, e.getCause().getMessage()); - connectionSuccessful = false; - } catch (Exception e) { - LOG.error("Unknown exception when trying to connect to {}.", url, e); - connectionSuccessful = false; - } - - // If connection was unsuccessful, wait some time before trying again - if (!connectionSuccessful) { - Thread.sleep(reconnectPeriodSec * 1000); - } - - // Keep checking whether connection is still open - while (true) { - if (socket == null || !socket.isOpen()) { - // The connection is closed somehow, try to reconnect - if (connectionSuccessful) { - LOG.warn("Connection to {} was lost. Trying to reconnect...", url); - } - break; - } - Thread.sleep(CHECK_CONNECTION_PERIOD_SEC * 1000); - } - - client.close(); - } - } - - @Override - public String getConfigRef() { - return configRef; - } - - /** - * Auxiliary class to handle incoming messages via the websocket connection - */ - private class Listener implements WebSocketListener { - - @Override - public void onOpen(WebSocket websocket) {} - - @Override - public void onClose(WebSocket websocket, int code, String reason) {} - - @Override - public void onError(Throwable t) {} - - @Override - public void onBinaryFrame(byte[] message, boolean finalFragment, int rsv) { - FeedMessage feedMessage; - List feedEntityList; - List updates = null; - boolean fullDataset = true; - try { - // Decode message - feedMessage = FeedMessage.PARSER.parseFrom(message); - feedEntityList = feedMessage.getEntityList(); - - // Change fullDataset value if this is an incremental update - if ( - feedMessage.hasHeader() && - feedMessage.getHeader().hasIncrementality() && - feedMessage - .getHeader() - .getIncrementality() - .equals(GtfsRealtime.FeedHeader.Incrementality.DIFFERENTIAL) - ) { - fullDataset = false; - } - - // Create List of TripUpdates - updates = new ArrayList<>(feedEntityList.size()); - for (FeedEntity feedEntity : feedEntityList) { - if (feedEntity.hasTripUpdate()) { - updates.add(feedEntity.getTripUpdate()); - } - } - } catch (InvalidProtocolBufferException e) { - LOG.error("Could not decode gtfs-rt message:", e); - } - - if (updates != null) { - // Handle trip updates via graph writer runnable - TripUpdateGraphWriterRunnable runnable = new TripUpdateGraphWriterRunnable( - snapshotSource, - fuzzyTripMatcher, - backwardsDelayPropagationType, - fullDataset, - updates, - feedId, - recordMetrics - ); - saveResultOnGraph.execute(runnable); - } - } - } -} diff --git a/src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdaterParameters.java b/src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdaterParameters.java deleted file mode 100644 index d5eebd748af..00000000000 --- a/src/main/java/org/opentripplanner/updater/trip/WebsocketGtfsRealtimeUpdaterParameters.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.opentripplanner.updater.trip; - -public class WebsocketGtfsRealtimeUpdaterParameters implements UrlUpdaterParameters { - - private final String configRef; - private final String feedId; - private final String url; - private final int reconnectPeriodSec; - private final BackwardsDelayPropagationType backwardsDelayPropagationType; - - public WebsocketGtfsRealtimeUpdaterParameters( - String configRef, - String feedId, - String url, - int reconnectPeriodSec, - BackwardsDelayPropagationType backwardsDelayPropagationType - ) { - this.configRef = configRef; - this.feedId = feedId; - this.url = url; - this.reconnectPeriodSec = reconnectPeriodSec; - this.backwardsDelayPropagationType = backwardsDelayPropagationType; - } - - public String url() { - return url; - } - - public String feedId() { - return feedId; - } - - int getReconnectPeriodSec() { - return reconnectPeriodSec; - } - - /** The config name/type for the updater. Used to reference the configuration element. */ - public String configRef() { - return configRef; - } - - public BackwardsDelayPropagationType getBackwardsDelayPropagationType() { - return backwardsDelayPropagationType; - } -} From 4a29056bac782b0ee70868f6d5d136a8473ccdc5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 4 Jan 2024 17:47:52 +0100 Subject: [PATCH 0156/1688] Remove websocket documentation --- doc-templates/UpdaterConfig.md | 12 ----- docs/RouterConfiguration.md | 4 -- docs/UpdaterConfig.md | 50 ------------------- docs/sandbox/SiriUpdater.md | 30 +++++------ .../standalone/config/router-config.json | 5 -- 5 files changed, 15 insertions(+), 86 deletions(-) diff --git a/doc-templates/UpdaterConfig.md b/doc-templates/UpdaterConfig.md index 90c699fcf28..a239317f244 100644 --- a/doc-templates/UpdaterConfig.md +++ b/doc-templates/UpdaterConfig.md @@ -45,18 +45,6 @@ The information is downloaded in a single HTTP request and polled regularly. -### TripUpdates via WebSocket - -This updater doesn't poll a data source but opens a persistent connection to the GTFS-RT provider, -which then sends incremental updates immediately as they become available. - -The [OneBusAway GTFS-realtime exporter project](https://github.com/OneBusAway/onebusaway-gtfs-realtime-exporter) -provides this kind of streaming, incremental updates over a websocket rather than a single large -file. - - - - ### Vehicle Positions VehiclePositions give the location of some or all vehicles currently in service, in terms of diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 65f50260ee5..30e423f29b1 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -740,10 +740,6 @@ Used to group requests when monitoring OTP. "position" ] }, - { - "type" : "websocket-gtfs-rt-updater", - "feedId" : "ov" - }, { "type" : "siri-et-updater", "url" : "https://example.com/some/path", diff --git a/docs/UpdaterConfig.md b/docs/UpdaterConfig.md index 6b744794642..6c219d07ddf 100644 --- a/docs/UpdaterConfig.md +++ b/docs/UpdaterConfig.md @@ -165,56 +165,6 @@ HTTP headers to add to the request. Any header key, value can be inserted. -### TripUpdates via WebSocket - -This updater doesn't poll a data source but opens a persistent connection to the GTFS-RT provider, -which then sends incremental updates immediately as they become available. - -The [OneBusAway GTFS-realtime exporter project](https://github.com/OneBusAway/onebusaway-gtfs-realtime-exporter) -provides this kind of streaming, incremental updates over a websocket rather than a single large -file. - - - - -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|-----------------------------------------------------------------------|:---------:|--------------------------|:----------:|----------------------|:-----:| -| type = "websocket-gtfs-rt-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [backwardsDelayPropagationType](#u__7__backwardsDelayPropagationType) | `enum` | TODO | *Optional* | `"required-no-data"` | 1.5 | -| feedId | `string` | TODO | *Required* | | 1.5 | -| reconnectPeriodSec | `integer` | TODO | *Optional* | `60` | 1.5 | -| url | `string` | TODO | *Optional* | | 1.5 | - - -##### Parameter details - -

backwardsDelayPropagationType

- -**Since version:** `1.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"required-no-data"` -**Path:** /updaters/[7] -**Enum values:** `required-no-data` | `required` | `always` - -TODO - - - -##### Example configuration - -```JSON -// router-config.json -{ - "updaters" : [ - { - "type" : "websocket-gtfs-rt-updater", - "feedId" : "ov" - } - ] -} -``` - - - - ### Vehicle Positions VehiclePositions give the location of some or all vehicles currently in service, in terms of diff --git a/docs/sandbox/SiriUpdater.md b/docs/sandbox/SiriUpdater.md index f6c4c3f999f..7730df67d12 100644 --- a/docs/sandbox/SiriUpdater.md +++ b/docs/sandbox/SiriUpdater.md @@ -37,16 +37,16 @@ To enable the SIRI updater you need to add it to the updaters section of the `ro | previewInterval | `duration` | TODO | *Optional* | | 2.0 | | requestorRef | `string` | The requester reference. | *Optional* | | 2.0 | | timeout | `duration` | The HTTP timeout to download the updates. | *Optional* | `"PT15S"` | 2.0 | -| [url](#u__8__url) | `string` | The URL to send the HTTP requests to. | *Required* | | 2.0 | -| [headers](#u__8__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [url](#u__7__url) | `string` | The URL to send the HTTP requests to. | *Required* | | 2.0 | +| [headers](#u__7__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

url

+

url

**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /updaters/[8] +**Path:** /updaters/[7] The URL to send the HTTP requests to. @@ -58,10 +58,10 @@ renamed by the loader when processed: -

headers

+

headers

**Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[8] +**Path:** /updaters/[7] HTTP headers to add to the request. Any header key, value can be inserted. @@ -97,21 +97,21 @@ HTTP headers to add to the request. Any header key, value can be inserted. |---------------------------------|:---------------:|--------------------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| | type = "siri-sx-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | | blockReadinessUntilInitialized | `boolean` | Whether catching up with the updates should block the readiness check from returning a 'ready' result. | *Optional* | `false` | 2.0 | -| [earlyStart](#u__9__earlyStart) | `duration` | This value is subtracted from the actual validity defined in the message. | *Optional* | `"PT0S"` | 2.0 | +| [earlyStart](#u__8__earlyStart) | `duration` | This value is subtracted from the actual validity defined in the message. | *Optional* | `"PT0S"` | 2.0 | | feedId | `string` | The ID of the feed to apply the updates to. | *Required* | | 2.0 | | frequency | `duration` | How often the updates should be retrieved. | *Optional* | `"PT1M"` | 2.0 | | requestorRef | `string` | The requester reference. | *Optional* | | 2.0 | | timeout | `duration` | The HTTP timeout to download the updates. | *Optional* | `"PT15S"` | 2.0 | -| [url](#u__9__url) | `string` | The URL to send the HTTP requests to. Supports http/https and file protocol. | *Required* | | 2.0 | -| [headers](#u__9__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [url](#u__8__url) | `string` | The URL to send the HTTP requests to. Supports http/https and file protocol. | *Required* | | 2.0 | +| [headers](#u__8__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

earlyStart

+

earlyStart

**Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` -**Path:** /updaters/[9] +**Path:** /updaters/[8] This value is subtracted from the actual validity defined in the message. @@ -119,10 +119,10 @@ Normally the planned departure time is used, so setting this to 10s will cause t SX-message to be included in trip-results 10 seconds before the the planned departure time. -

url

+

url

**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /updaters/[9] +**Path:** /updaters/[8] The URL to send the HTTP requests to. Supports http/https and file protocol. @@ -135,10 +135,10 @@ renamed by the loader when processed: -

headers

+

headers

**Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[9] +**Path:** /updaters/[8] HTTP headers to add to the request. Any header key, value can be inserted. diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 69f859d784d..1a5eec22a28 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -295,11 +295,6 @@ "fuzzyTripMatching": false, "features": ["position"] }, - // Streaming differential GTFS-RT TripUpdates over websockets - { - "type": "websocket-gtfs-rt-updater", - "feedId": "ov" - }, // Siri-ET over HTTP { "type": "siri-et-updater", From 629ec1b0129bdfbd78f7467869a28ef13806250c Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 2 Jan 2024 17:56:47 +0100 Subject: [PATCH 0157/1688] feature: Filter away none optimal access/egress paths for multi-criteria Raptor --- .../transit/AccessEgressFunctions.java | 94 +++++++++++++++---- .../rangeraptor/transit/AccessPaths.java | 5 +- .../rangeraptor/transit/EgressPaths.java | 5 +- .../transit/AccessEgressFunctionsTest.java | 91 ++++++++++++++++-- .../rangeraptor/transit/EgressPathsTest.java | 11 +-- 5 files changed, 171 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java index 5059be84312..275a0f85cf3 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java @@ -5,12 +5,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Objects; import java.util.function.Predicate; import java.util.function.ToIntFunction; import java.util.stream.Collectors; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.util.paretoset.ParetoComparator; import org.opentripplanner.raptor.util.paretoset.ParetoSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class contains functions used by the {@link AccessPaths} and {@link EgressPaths} classes. @@ -23,6 +26,8 @@ */ public final class AccessEgressFunctions { + private static final Logger LOG = LoggerFactory.getLogger(AccessEgressFunctions.class); + /** * Filter standard(not multi-criteria) Raptor access and egress paths. A path is pareto optimal * for a given stop if @@ -47,32 +52,64 @@ public final class AccessEgressFunctions { * */ private static final ParetoComparator STANDARD_COMPARATOR = (l, r) -> - (l.stopReachedOnBoard() && !r.stopReachedOnBoard()) || - r.hasOpeningHours() || - (l.numberOfRides() < r.numberOfRides()) || - (l.durationInSeconds() < r.durationInSeconds()); + ( + l.stopReachedOnBoard() && + !r.stopReachedOnBoard() || + r.hasOpeningHours() || + l.numberOfRides() < r.numberOfRides() || + l.durationInSeconds() < r.durationInSeconds() + ); + + /** + * Filter Multi-criteria Raptor access and egress paths. This can be used to wash + * access/egress paths - paths that are not optimal using this should not be passed into + * Raptor - it is a bug. + */ + private static final ParetoComparator MC_COMPARATOR = (l, r) -> + ( + (l.stopReachedOnBoard() && !r.stopReachedOnBoard()) || + r.hasOpeningHours() || + l.numberOfRides() < r.numberOfRides() || + l.durationInSeconds() < r.durationInSeconds() || + l.c1() < r.c1() + ); /** private constructor to prevent instantiation of utils class. */ private AccessEgressFunctions() {} + /** + * Filter non-optimal paths away for the standard search. This method does not + * look at the c1 value. + */ static Collection removeNoneOptimalPathsForStandardRaptor( Collection paths ) { - // To avoid too many items in the pareto set we first group the paths by stop, - // for each stop we filter it down to the optimal pareto set. We could do this - // for multi-criteria as well, but it is likely not so important. The focus for - // the mc-set should be that the list of access/egress created in OTP should not - // contain to many non-optimal paths. - var mapByStop = groupByStop(paths); - var set = new ParetoSet<>(STANDARD_COMPARATOR); - Collection result = new ArrayList<>(); + return removeNoneOptimalPaths(paths, STANDARD_COMPARATOR); + } - mapByStop.forEachValue(list -> { - set.clear(); - set.addAll(list); - result.addAll(set); - return true; - }); + /** + * Filter non-optimal paths away for the multi-criteria search. This method should in theory + * not remove any paths since the caller should not pass in duplicates, but it turns out that + * this happens, so we do it. + */ + static Collection removeNoneOptimalPathsForMcRaptor( + Collection paths + ) { + var result = removeNoneOptimalPaths(paths, MC_COMPARATOR); + if (LOG.isDebugEnabled() && result.size() < paths.size()) { + var duplicates = new ArrayList<>(paths); + duplicates.removeAll(result); + // Note! This does not provide enough information to solve/debug this problem, but this is + // not a problem in Raptor, so we do not want to add more specific logging here - this does + // however document that the problem exist. Turn on debug logging and move the start/end + // coordinate around until you see this message. + // + // See https://github.com/opentripplanner/OpenTripPlanner/issues/5601 + LOG.warn( + "Duplicate access/egress paths passed into raptor:\n\t" + + duplicates.stream().map(Objects::toString).collect(Collectors.joining("\n\t")) + ); + } return result; } @@ -96,6 +133,27 @@ static TIntObjectMap> groupByStop(Collection removeNoneOptimalPaths( + Collection paths, + ParetoComparator comparator + ) { + var mapByStop = groupByStop(paths); + var set = new ParetoSet<>(comparator); + var result = new ArrayList(); + + for (int stop : mapByStop.keys()) { + var list = mapByStop.get(stop); + set.clear(); + set.addAll(list); + result.addAll(set); + } + return result; + } + private static List getOrCreate( int key, TIntObjectMap> map diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 940937f82db..dd757ac0415 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -1,6 +1,7 @@ package org.opentripplanner.raptor.rangeraptor.transit; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByRound; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForMcRaptor; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForStandardRaptor; import gnu.trove.map.TIntObjectMap; @@ -57,7 +58,9 @@ public int calculateMaxNumberOfRides() { * This method is static and package local to enable unit-testing. */ public static AccessPaths create(Collection paths, RaptorProfile profile) { - if (!profile.is(RaptorProfile.MULTI_CRITERIA)) { + if (profile.is(RaptorProfile.MULTI_CRITERIA)) { + paths = removeNoneOptimalPathsForMcRaptor(paths); + } else { paths = removeNoneOptimalPathsForStandardRaptor(paths); } return new AccessPaths( diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java index 2038ab543df..a1688ff8f5b 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java @@ -2,6 +2,7 @@ import static org.opentripplanner.raptor.api.request.RaptorProfile.MULTI_CRITERIA; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByStop; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForMcRaptor; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForStandardRaptor; import gnu.trove.map.TIntObjectMap; @@ -31,7 +32,9 @@ private EgressPaths(TIntObjectMap> pathsByStop) { * This method is static and package local to enable unit-testing. */ public static EgressPaths create(Collection paths, RaptorProfile profile) { - if (!MULTI_CRITERIA.is(profile)) { + if (MULTI_CRITERIA.is(profile)) { + paths = removeNoneOptimalPathsForMcRaptor(paths); + } else { paths = removeNoneOptimalPathsForStandardRaptor(paths); } return new EgressPaths(groupByStop(paths)); diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java index eab9ee418cf..041d74786d7 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java @@ -6,6 +6,7 @@ import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flexAndWalk; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByRound; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByStop; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForMcRaptor; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForStandardRaptor; import java.util.Arrays; @@ -24,19 +25,26 @@ class AccessEgressFunctionsTest implements RaptorTestConstants { public static final int TRANSFER_SLACK = D1m; private static final int STOP = 8; - - private static final RaptorAccessEgress WALK_10m = TestAccessEgress.walk(STOP, D10m); - private static final RaptorAccessEgress WALK_8m = TestAccessEgress.walk(STOP, D8m); - private static final RaptorAccessEgress FLEX_1x_10m = flex(STOP, D10m, 1); - private static final RaptorAccessEgress FLEX_1x_8m = flex(STOP, D8m, 1); - private static final RaptorAccessEgress FLEX_2x_8m = flex(STOP, D8m, 2); - private static final RaptorAccessEgress FLEX_AND_WALK_1x_8m = flexAndWalk(STOP, D8m, 1); + private static final int C1 = 1000; + private static final int C1_LOW = 999; + + private static final RaptorAccessEgress WALK_10m = TestAccessEgress.walk(STOP, D10m, C1); + private static final RaptorAccessEgress WALK_10m_C1_LOW = TestAccessEgress.walk( + STOP, + D10m, + C1_LOW + ); + private static final RaptorAccessEgress WALK_8m = TestAccessEgress.walk(STOP, D8m, C1); + private static final RaptorAccessEgress FLEX_1x_10m = flex(STOP, D10m, 1, C1); + private static final RaptorAccessEgress FLEX_1x_8m = flex(STOP, D8m, 1, C1); + private static final RaptorAccessEgress FLEX_2x_8m = flex(STOP, D8m, 2, C1); + private static final RaptorAccessEgress FLEX_AND_WALK_1x_8m = flexAndWalk(STOP, D8m, 1, C1); private static final RaptorAccessEgress WALK_W_OPENING_HOURS_8m = TestAccessEgress - .walk(STOP, D8m) + .walk(STOP, D8m, C1) .openingHours(T00_00, T01_00); private static final RaptorAccessEgress WALK_W_OPENING_HOURS_8m_OTHER = TestAccessEgress - .walk(STOP, D8m) + .walk(STOP, D8m, C1) .openingHours(T00_10, T01_00); @Test @@ -101,6 +109,71 @@ void removeNoneOptimalPathsForStandardRaptorTest() { ); } + @Test + void removeNoneOptimalPathsForMcRaptorTest() { + // Empty set + assertElements(List.of(), removeNoneOptimalPathsForMcRaptor(List.of())); + + // One element + assertElements(List.of(WALK_8m), removeNoneOptimalPathsForMcRaptor(List.of(WALK_8m))); + + // Lowest cost + assertElements( + List.of(WALK_10m_C1_LOW), + removeNoneOptimalPathsForMcRaptor(List.of(WALK_10m, WALK_10m_C1_LOW)) + ); + + // Shortest duration + assertElements(List.of(WALK_8m), removeNoneOptimalPathsForMcRaptor(List.of(WALK_8m, WALK_10m))); + + // Fewest rides + assertElements( + List.of(FLEX_1x_8m), + removeNoneOptimalPathsForMcRaptor(List.of(FLEX_1x_8m, FLEX_2x_8m)) + ); + + // Arriving at the stop on-board, and by-foot. + // OnBoard is better because we can do a transfer walk to nearby stops. + assertElements( + List.of(FLEX_1x_8m), + removeNoneOptimalPathsForMcRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_8m)) + ); + + // Flex+walk is faster, flex arrive on-board, both is optimal + assertElements( + List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m), + removeNoneOptimalPathsForStandardRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m)) + ); + + // Walk has few rides, and Flex is faster - both is optimal + assertElements( + List.of(WALK_10m, FLEX_1x_8m), + removeNoneOptimalPathsForMcRaptor(List.of(WALK_10m, FLEX_1x_8m)) + ); + + // Walk without opening hours is better than with, because it can be time-shifted without + // any constraints + assertElements( + List.of(WALK_8m), + removeNoneOptimalPathsForMcRaptor(List.of(WALK_8m, WALK_W_OPENING_HOURS_8m)) + ); + + // Walk with opening hours can NOT dominate another access/egress without - even if it is + // faster. The reason is that it may not be allowed to time-shift it to the desired time. + assertElements( + List.of(WALK_10m, WALK_W_OPENING_HOURS_8m), + removeNoneOptimalPathsForMcRaptor(List.of(WALK_10m, WALK_W_OPENING_HOURS_8m)) + ); + + // If two paths both have opening hours, both should be accepted. + assertElements( + List.of(WALK_W_OPENING_HOURS_8m, WALK_W_OPENING_HOURS_8m_OTHER), + removeNoneOptimalPathsForMcRaptor( + List.of(WALK_W_OPENING_HOURS_8m, WALK_W_OPENING_HOURS_8m_OTHER) + ) + ); + } + @Test void groupByRoundTest() { // Map one element diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java index 6d3b25c1d31..144904fa3e6 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPathsTest.java @@ -38,7 +38,7 @@ class EgressPathsTest { // Number of rides, smallest is better flex(STOP_D, D1m, 2), flex(STOP_D, D1m, 3), - // Opening Hours dominate each other(no check on overlapping) + // Opening Hours dominate each other (no check on overlapping) walk(STOP_E, D2m), walk(STOP_E, D1m).openingHours("10:00", "11:45"), walk(STOP_E, D1m).openingHours("11:30", "12:30"), @@ -83,18 +83,15 @@ void listAll() { """.strip(), subjectStd.listAll().stream().map(Object::toString).sorted().collect(Collectors.joining("\n")) ); + assertEquals( """ Flex 1m C₁120 1x ~ 3 Flex 1m C₁120 1x ~ 4 Flex 1m C₁120 2x ~ 5 - Flex 1m C₁120 3x ~ 5 - Flex 2m C₁240 1x ~ 3 - Flex+Walk 1m C₁120 1x ~ 4 Walk 1m C₁120 Open(10:00 11:45) ~ 6 Walk 1m C₁120 Open(11:30 12:30) ~ 6 Walk 1m C₁120 ~ 2 - Walk 2m C₁240 Open(14:00 14:00) ~ 6 Walk 2m C₁240 ~ 6 """.strip(), subjectMc.listAll().stream().map(Object::toString).sorted().collect(Collectors.joining("\n")) @@ -107,8 +104,10 @@ void walkToDestinationEgressStops() { toString(new int[] { STOP_A, STOP_E }), toString(subjectStd.egressesWitchStartByWalking()) ); + + //[2, 6] assertEquals( - toString(new int[] { STOP_A, STOP_C, STOP_E }), + toString(new int[] { STOP_A, STOP_E }), toString(subjectMc.egressesWitchStartByWalking()) ); } From 17d20c9d41a3d6345549c5fd8416fbdcd21d948e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 3 Jan 2024 16:08:30 +0100 Subject: [PATCH 0158/1688] feature: Enable Raptor debug logging by event type --- .../transit/mappers/RaptorRequestMapper.java | 21 ++++++++++++++++--- .../routing/api/request/DebugEventType.java | 11 ++++++++++ .../routing/api/request/DebugRaptor.java | 19 ++++++++++++++++- 3 files changed, 47 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java index 75c1bcf7214..e63546a87a2 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java @@ -13,6 +13,7 @@ import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RelaxFunction; +import org.opentripplanner.raptor.api.request.DebugRequestBuilder; import org.opentripplanner.raptor.api.request.Optimization; import org.opentripplanner.raptor.api.request.PassThroughPoint; import org.opentripplanner.raptor.api.request.RaptorRequest; @@ -22,6 +23,7 @@ import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitPriorityGroup32n; +import org.opentripplanner.routing.api.request.DebugEventType; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.transit.model.site.StopLocation; @@ -156,10 +158,11 @@ private RaptorRequest doMap() { .addStops(raptorDebugging.stops()) .setPath(raptorDebugging.path()) .debugPathFromStopIndex(raptorDebugging.debugPathFromStopIndex()) - .stopArrivalListener(debugLogger::stopArrivalLister) - .patternRideDebugListener(debugLogger::patternRideLister) - .pathFilteringListener(debugLogger::pathFilteringListener) .logger(debugLogger); + + for (var type : raptorDebugging.eventTypes()) { + addLogListenerForEachEventTypeRequested(debug, type, debugLogger); + } } if (!request.timetableView() && request.arriveBy()) { @@ -209,4 +212,16 @@ private int relativeTime(Instant time) { } return (int) (time.getEpochSecond() - transitSearchTimeZeroEpocSecond); } + + private static void addLogListenerForEachEventTypeRequested( + DebugRequestBuilder target, + DebugEventType type, + SystemErrDebugLogger logger + ) { + switch (type) { + case STOP_ARRIVALS -> target.stopArrivalListener(logger::stopArrivalLister); + case PATTERN_RIDES -> target.patternRideDebugListener(logger::patternRideLister); + case DESTINATION_ARRIVALS -> target.pathFilteringListener(logger::pathFilteringListener); + } + } } diff --git a/src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java b/src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java new file mode 100644 index 00000000000..09f9dbbe732 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/api/request/DebugEventType.java @@ -0,0 +1,11 @@ +package org.opentripplanner.routing.api.request; + +/** + * Raptor check paths in 3 different places. The debugger can print events + * for each of these. + */ +public enum DebugEventType { + STOP_ARRIVALS, + PATTERN_RIDES, + DESTINATION_ARRIVALS, +} diff --git a/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java b/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java index 7d6c1472eee..0b9ff4f0c30 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java +++ b/src/main/java/org/opentripplanner/routing/api/request/DebugRaptor.java @@ -3,7 +3,11 @@ import java.io.Serial; import java.io.Serializable; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; import java.util.List; +import java.util.Set; import java.util.regex.Pattern; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.slf4j.Logger; @@ -46,14 +50,16 @@ public class DebugRaptor implements Serializable { private List stops = List.of(); private List path = List.of(); private int debugPathFromStopIndex = 0; + private Set eventTypes = EnumSet.noneOf(DebugEventType.class); public DebugRaptor() {} - /** Avoid using clone(), use copy-constructor instead(Josh Bloch). */ + /** Avoid using clone(), use copy-constructor instead (Josh Bloch). */ public DebugRaptor(DebugRaptor other) { this.stops = List.copyOf(other.stops); this.path = List.copyOf(other.path); this.debugPathFromStopIndex = other.debugPathFromStopIndex; + this.eventTypes = EnumSet.copyOf(other.eventTypes); } public boolean isEnabled() { @@ -90,12 +96,23 @@ public int debugPathFromStopIndex() { return debugPathFromStopIndex; } + public Set eventTypes() { + return Collections.unmodifiableSet(eventTypes); + } + + public DebugRaptor withEventTypes(Collection eventTypes) { + this.eventTypes.clear(); + this.eventTypes.addAll(eventTypes); + return this; + } + @Override public String toString() { return ToStringBuilder .of(DebugRaptor.class) .addObj("stops", toString(stops, FIRST_STOP_INDEX)) .addObj("path", toString(path, debugPathFromStopIndex)) + .addCol("eventType", eventTypes) .toString(); } From a3e426fce2e9f35e062a5d0e5c705f5113f95af2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 3 Jan 2024 19:21:07 +0100 Subject: [PATCH 0159/1688] sandbox: Extract log config and rearrange OTP Startup View --- .../InteractiveOtpMain.java | 19 ++- .../ext/interactivelauncher/Model.java | 55 ++++---- .../OtpDebugController.java | 35 +++++ .../ext/interactivelauncher/SetupResult.java | 99 ------------- .../{ => logging}/DebugLoggingSupport.java | 33 ++--- .../interactivelauncher/logging/LogModel.java | 56 ++++++++ .../interactivelauncher/logging/LogView.java | 34 +++++ .../logging/OTPDebugLoggers.java | 19 +++ .../DataSourceRootView.java} | 17 ++- .../startup/DataSourcesView.java | 133 ++++++++++++++++++ .../{views => startup}/MainView.java | 127 +++++------------ .../{views => startup}/OptionsView.java | 64 ++++----- .../StartOtpButtonView.java | 4 +- .../startup/StatusBar.java | 15 ++ .../{ => support}/SearchForOtpConfig.java | 10 +- .../{views => support}/ViewUtils.java | 23 +-- .../views/DataSourcesView.java | 84 ----------- .../interactivelauncher/views/StatusBar.java | 15 -- 18 files changed, 434 insertions(+), 408 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java delete mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/SetupResult.java rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{ => logging}/DebugLoggingSupport.java (61%) create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogModel.java create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogView.java create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/OTPDebugLoggers.java rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{views/SearchDirectoryView.java => startup/DataSourceRootView.java} (80%) create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{views => startup}/MainView.java (55%) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{views => startup}/OptionsView.java (63%) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{views => startup}/StartOtpButtonView.java (82%) create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{ => support}/SearchForOtpConfig.java (85%) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{views => support}/ViewUtils.java (53%) delete mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/views/DataSourcesView.java delete mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/views/StatusBar.java diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java index 1f9227b3be6..d61ae6bfcd3 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java @@ -1,19 +1,18 @@ package org.opentripplanner.ext.interactivelauncher; -import static org.opentripplanner.ext.interactivelauncher.DebugLoggingSupport.configureDebugLogging; - -import org.opentripplanner.ext.interactivelauncher.views.MainView; +import org.opentripplanner.ext.interactivelauncher.startup.MainView; import org.opentripplanner.standalone.OTPMain; /** - * This class provide a main method to start a GUI which can start OTPMain. + * This class provides a main method to start a GUI which can start OTPMain. *

- * The UI allow the user to select a OTP configuration data set. The list of data location is - * created by searching the a root data source directory. + * The UI allows the user to select the OTP configuration dataset. The list of data locations is + * created by searching the root data source directory. *

- * The user then select what he/she want OTP to do. The settings are stored in the - * .interactive_otp_main.json file in the folder InteractiveOtpMain is started. The - * settings from the last run is loaded next time InteractiveOtpMain is started. + * The user then selects what he/she wants OTP to do. + * The settings are stored in the + * .interactive_otp_main.json file in the folder InteractiveOtpMain is started. + * The settings from the last run are loaded the next time InteractiveOtpMain is started. */ public class InteractiveOtpMain { @@ -32,7 +31,7 @@ private void run() { private void startOtp() { model.save(); - configureDebugLogging(model.getDebugLogging()); + new OtpDebugController(model).start(); System.out.println("Start OTP: " + model + "\n"); OTPMain.main(model.asOtpArgs()); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java index ee2dde3e684..1550f8bc1ab 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java @@ -6,11 +6,10 @@ import java.io.IOException; import java.io.Serializable; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import java.util.function.Consumer; +import org.opentripplanner.ext.interactivelauncher.logging.LogModel; +import org.opentripplanner.ext.interactivelauncher.support.SearchForOtpConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -20,8 +19,6 @@ public class Model implements Serializable { private static final File MODEL_FILE = new File("interactive_otp_main.json"); - private final Map debugLogging = new HashMap<>(); - @JsonIgnore private transient Consumer commandLineChange; @@ -32,13 +29,16 @@ public class Model implements Serializable { private boolean saveGraph = false; private boolean serveGraph = true; private boolean visualizer = false; + private LogModel logModel; - public Model() { - setupListOfDebugLoggers(); - } + public Model() {} public static Model load() { - return MODEL_FILE.exists() ? readFromFile() : new Model(); + var model = MODEL_FILE.exists() ? readFromFile() : createNew(); + // Setup callbacks + model.logModel.init(model::save); + + return model; } public void subscribeCmdLineUpdates(Consumer commandLineChange) { @@ -134,19 +134,6 @@ public void setVisualizer(boolean visualizer) { notifyChangeListener(); } - public Map getDebugLogging() { - return debugLogging; - } - - public void setDebugLogging(Map map) { - for (Entry e : map.entrySet()) { - // Only keep entries that exist in the log config - if (debugLogging.containsKey(e.getKey())) { - debugLogging.put(e.getKey(), e.getValue()); - } - } - } - @Override public String toString() { return ( @@ -174,6 +161,10 @@ public void save() { } } + public LogModel getLogModel() { + return logModel; + } + @JsonIgnore String getDataSourceDirectory() { if (dataSource == null) { @@ -210,16 +201,26 @@ String[] asOtpArgs() { return args.toArray(new String[0]); } + private static Model createNew() { + var model = new Model(); + model.logModel = new LogModel(); + model.logModel.initFromConfig(); + model.setupCallbacks(); + return model; + } + private static Model readFromFile() { try { - return new ObjectMapper().readValue(MODEL_FILE, Model.class); + var model = new ObjectMapper().readValue(MODEL_FILE, Model.class); + model.setupCallbacks(); + return model; } catch (IOException e) { System.err.println( "Unable to read the InteractiveOtpMain state cache. If the model changed this " + "is expected, and it will work next time. Cause: " + e.getMessage() ); - return new Model(); + return createNew(); } } @@ -237,9 +238,7 @@ private boolean buildStreetOnly() { return buildStreet && !buildTransit; } - private void setupListOfDebugLoggers() { - for (String log : DebugLoggingSupport.getLogs()) { - debugLogging.put(log, Boolean.FALSE); - } + private void setupCallbacks() { + logModel.init(this::save); } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java new file mode 100644 index 00000000000..95635c5bb0c --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java @@ -0,0 +1,35 @@ +package org.opentripplanner.ext.interactivelauncher; + +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.BACKGROUND; + +import javax.swing.JComponent; +import javax.swing.JFrame; +import javax.swing.JPanel; +import javax.swing.JTabbedPane; +import org.opentripplanner.ext.interactivelauncher.logging.LogModel; +import org.opentripplanner.ext.interactivelauncher.logging.LogView; + +public class OtpDebugController { + + private final JFrame debugFrame = new JFrame("OTP Debug Controller"); + + public OtpDebugController(Model model) { + var tabPanel = new JTabbedPane(); + tabPanel.addTab("Logging", createLogPanel(model.getLogModel())); + tabPanel.addTab("Raptor", new JPanel()); + debugFrame.add(tabPanel); + debugFrame.getContentPane().setBackground(BACKGROUND); + start(); + } + + private static JComponent createLogPanel(LogModel logModel) { + return new LogView(logModel).panel(); + } + + public void start() { + debugFrame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + debugFrame.pack(); + debugFrame.setLocationRelativeTo(null); + debugFrame.setVisible(true); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/SetupResult.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/SetupResult.java deleted file mode 100644 index a6ecf5e7229..00000000000 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/SetupResult.java +++ /dev/null @@ -1,99 +0,0 @@ -package org.opentripplanner.ext.interactivelauncher; - -import java.io.File; -import java.util.ArrayList; -import java.util.List; - -public class SetupResult { - - private final File configDataDir; - private final boolean buildStreet; - private final boolean buildTransit; - private final boolean saveGraph; - private final boolean serveGraph; - - public SetupResult( - File configDataDir, - boolean buildStreet, - boolean buildTransit, - boolean saveGraph, - boolean serveGraph - ) { - this.configDataDir = configDataDir; - this.buildStreet = buildStreet; - this.buildTransit = buildTransit; - this.saveGraph = saveGraph; - this.serveGraph = serveGraph; - } - - @Override - public String toString() { - return ( - "SetupResult{" + - "configDataDir=" + - configDataDir.getAbsolutePath() + - (buildStreet ? ", buildStreet" : "") + - (buildTransit ? ", buildTransit" : "") + - (saveGraph ? ", saveGraph" : "") + - (serveGraph ? ", serveGraph" : "") + - '}' - ); - } - - public String toCliString() { - return String.join(" ", asOtpArgs()); - } - - File configDataDir() { - return configDataDir; - } - - boolean buildStreet() { - return buildStreet; - } - - boolean buildTransit() { - return buildTransit; - } - - boolean buildAll() { - return buildStreet && buildTransit; - } - - boolean buildStreetOnly() { - return buildStreet && !buildTransit; - } - - boolean saveGraph() { - return saveGraph; - } - - boolean serveGraph() { - return serveGraph; - } - - String[] asOtpArgs() { - List args = new ArrayList<>(); - - if (buildAll()) { - args.add("--build"); - } else if (buildStreet) { - args.add("--buildStreet"); - } else if (buildTransit) { - args.add("--loadStreet"); - } else { - args.add("--load"); - } - - if (saveGraph && (buildTransit || buildStreet)) { - args.add("--save"); - } - if (serveGraph && !buildStreetOnly()) { - args.add("--serve"); - } - - args.add(configDataDir.getAbsolutePath()); - - return args.toArray(new String[0]); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/DebugLoggingSupport.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/DebugLoggingSupport.java similarity index 61% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/DebugLoggingSupport.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/DebugLoggingSupport.java index e0b07a8c79e..fcfa323680f 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/DebugLoggingSupport.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/DebugLoggingSupport.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.interactivelauncher; +package org.opentripplanner.ext.interactivelauncher.logging; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; @@ -10,13 +10,13 @@ import org.slf4j.LoggerFactory; /** - * Responsible for integration with the OTP Debug log configuraton, reading loggers from the slf4j + * Responsible for integration with the OTP Debug log configuration, reading loggers from the slf4j * context and setting DEBUG level on selected loggers back. *

- * The log names are transformed to be more human readable: + * The log names are transformed to be more human-readable: * 

org.opentripplanner.routing.algorithm  -->  o.o.routing.algorithm
*/ -public class DebugLoggingSupport { +class DebugLoggingSupport { private static final String OTP = Pattern.quote("org.opentripplanner.") + ".*"; private static final String GRAPHQL = Pattern.quote("fea"); @@ -26,29 +26,26 @@ public class DebugLoggingSupport { "(" + OTP + "|" + GRAPHQL + "|" + NAMED_LOGGERS + ")" ); - public static List getLogs() { + static List getDebugLoggers() { List result = new ArrayList<>(); LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); for (Logger log : context.getLoggerList()) { var name = log.getName(); - if (!name.equals("ROOT") && LOG_MATCHER_PATTERN.matcher(name).matches()) { - result.add(logDisplayName(name)); + if (name.equals("ROOT") || log.getLevel() == null) { + continue; + } + if (log.getLevel().toInt() <= Level.DEBUG.toInt()) { + if (LOG_MATCHER_PATTERN.matcher(name).matches()) { + result.add(name); + } } } return result; } - public static void configureDebugLogging(Map loggers) { + static void configureDebugLogging(String logger, boolean debug) { LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); - for (Logger log : context.getLoggerList()) { - var name = logDisplayName(log.getName()); - if (loggers.getOrDefault(name, false)) { - log.setLevel(Level.DEBUG); - } - } - } - - private static String logDisplayName(String name) { - return name.replace("org.opentripplanner.", "o.o."); + var log = context.getLogger(logger); + log.setLevel(debug ? Level.DEBUG : Level.INFO); } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogModel.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogModel.java new file mode 100644 index 00000000000..536c8d1dc87 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogModel.java @@ -0,0 +1,56 @@ +package org.opentripplanner.ext.interactivelauncher.logging; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.Serializable; +import java.util.Collection; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +/** + * Responsible for storing the selected loggers to debug. This is + * serialized to store the user preferences between runs. + */ +public class LogModel implements Serializable { + + private final Set activeLoggers = new HashSet<>(); + + @JsonIgnore + private Runnable saveCallback; + + public LogModel() {} + + /** Need to set this manually to support JSON serialization. */ + public void init(Runnable saveCallback) { + this.saveCallback = saveCallback; + } + + /** Needed to do JSON serialization. */ + public Collection getActiveLoggers() { + return List.copyOf(activeLoggers); + } + + /** Needed to do JSON serialization. */ + public void setActiveLoggers(Collection loggers) { + this.activeLoggers.clear(); + this.activeLoggers.addAll(loggers); + } + + public void initFromConfig() { + activeLoggers.addAll(DebugLoggingSupport.getDebugLoggers()); + } + + boolean isLoggerEnabled(String name) { + return activeLoggers.contains(name); + } + + void turnLoggerOnOff(String name, boolean enable) { + if (enable) { + activeLoggers.add(name); + } else { + activeLoggers.remove(name); + } + DebugLoggingSupport.configureDebugLogging(name, enable); + saveCallback.run(); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogView.java new file mode 100644 index 00000000000..a71f90eb697 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogView.java @@ -0,0 +1,34 @@ +package org.opentripplanner.ext.interactivelauncher.logging; + +import javax.swing.Box; +import javax.swing.JCheckBox; +import javax.swing.JComponent; + +/** + * Display a list of loggers to turn on/off. + */ +public class LogView { + + private final Box panel = Box.createVerticalBox(); + private final LogModel model; + + public LogView(LogModel model) { + this.model = model; + OTPDebugLoggers.list().forEach(this::add); + } + + public JComponent panel() { + return panel; + } + + private void add(OTPDebugLoggers logger) { + var box = new JCheckBox(logger.label()); + box.setSelected(model.isLoggerEnabled(logger.logger())); + box.addActionListener(e -> selectLogger(logger.logger(), box.isSelected())); + panel.add(box); + } + + private void selectLogger(String logger, boolean selected) { + model.turnLoggerOnOff(logger, selected); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/OTPDebugLoggers.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/OTPDebugLoggers.java new file mode 100644 index 00000000000..4663b6017de --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/OTPDebugLoggers.java @@ -0,0 +1,19 @@ +package org.opentripplanner.ext.interactivelauncher.logging; + +import java.util.List; + +record OTPDebugLoggers(String label, String logger) { + static List list() { + return List.of( + of("Data import issues", "DATA_IMPORT_ISSUES"), + of("All OTP debuggers", "org.opentripplanner"), + of("OTP request/response", "org.opentripplanner.routing.service.DefaultRoutingService"), + of("Raptor request/response", "org.opentripplanner.raptor.RaptorService"), + of("Transfer Optimization", "org.opentripplanner.routing.algorithm.transferoptimization") + ); + } + + private static OTPDebugLoggers of(String label, String logger) { + return new OTPDebugLoggers(label, logger); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/SearchDirectoryView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourceRootView.java similarity index 80% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/views/SearchDirectoryView.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourceRootView.java index ef054e2c879..e5ba9136e9d 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/SearchDirectoryView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourceRootView.java @@ -1,7 +1,7 @@ -package org.opentripplanner.ext.interactivelauncher.views; +package org.opentripplanner.ext.interactivelauncher.startup; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.BG_STATUS_BAR; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.FG_STATUS_BAR; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.BG_STATUS_BAR; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.FG_STATUS_BAR; import java.awt.Component; import java.awt.Dimension; @@ -9,18 +9,20 @@ import java.util.function.Consumer; import javax.swing.Box; import javax.swing.JButton; +import javax.swing.JComponent; import javax.swing.JFileChooser; import javax.swing.JLabel; import javax.swing.JTextField; +import org.opentripplanner.ext.interactivelauncher.support.ViewUtils; -public class SearchDirectoryView { +class DataSourceRootView { private final Box panel; private final JTextField fileTxt = new JTextField(); private final JButton searchBtn = new JButton("Open"); private final Consumer rootDirChangedListener; - public SearchDirectoryView(String dir, Consumer rootDirChangedListener) { + DataSourceRootView(String dir, Consumer rootDirChangedListener) { this.fileTxt.setText(dir); this.rootDirChangedListener = rootDirChangedListener; @@ -35,9 +37,6 @@ public SearchDirectoryView(String dir, Consumer rootDirChangedListener) fileTxt.setEditable(false); fileTxt.setBackground(BG_STATUS_BAR); fileTxt.setForeground(FG_STATUS_BAR); - //var d = minWidth(fileTxt.getPreferredSize(), 460); - //fileTxt.setMinimumSize(d); - //fileTxt.setPreferredSize(d); // Add text field and open button Box box = Box.createHorizontalBox(); @@ -48,7 +47,7 @@ public SearchDirectoryView(String dir, Consumer rootDirChangedListener) panel.add(box); } - public Box panel() { + public JComponent panel() { return panel; } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java new file mode 100644 index 00000000000..07052b9cd29 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java @@ -0,0 +1,133 @@ +package org.opentripplanner.ext.interactivelauncher.startup; + +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addComp; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addHorizontalGlue; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addVerticalSectionSpace; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.util.List; +import javax.swing.Box; +import javax.swing.ButtonGroup; +import javax.swing.JComponent; +import javax.swing.JLabel; +import javax.swing.JRadioButton; +import org.opentripplanner.ext.interactivelauncher.Model; +import org.opentripplanner.ext.interactivelauncher.support.ViewUtils; + +class DataSourcesView { + + /* + |-----------------------------------------------| + | Label | + |-----------------------------------------------| + | ( ) List 1 | ( ) List 2 | ( ) List 3 | + | ( ) List 1 | ( ) List 2 | ( ) List 3 | + |-----------------------------------------------| + */ + + private final Box mainPanel = Box.createVerticalBox(); + private final Box listPanel = Box.createHorizontalBox(); + private final Model model; + + public DataSourcesView(Model model) { + this.model = model; + setupDataSources(); + + JLabel label = new JLabel("Select data source"); + + listPanel.setAlignmentX(Component.LEFT_ALIGNMENT); + + addComp(label, mainPanel); + addVerticalSectionSpace(mainPanel); + addComp(listPanel, mainPanel); + } + + public JComponent panel() { + return mainPanel; + } + + public void onRootDirChange() { + model.setDataSource(null); + listPanel.removeAll(); + setupDataSources(); + listPanel.repaint(); + } + + public void onDataSourceChange(ActionEvent e) { + model.setDataSource(e.getActionCommand()); + } + + private void setupDataSources() { + final List values = model.getDataSourceOptions(); + + if (values.isEmpty()) { + model.setDataSource(null); + JLabel label = new JLabel(""); + label.setBackground(ViewUtils.BG_STATUS_BAR); + label.setForeground(ViewUtils.FG_STATUS_BAR); + addComp(label, listPanel); + return; + } + + String selectedValue = model.getDataSource(); + + if (selectedValue == null) { + selectedValue = values.get(0); + model.setDataSource(selectedValue); + } + + ButtonGroup selectDataSourceRadioGroup = new ButtonGroup(); + + List valuesSorted = values.stream().sorted().toList(); + int size = valuesSorted.size(); + + // Split the list of configuration in one, two or three columns depending on the + // number of configurations found. + if (size <= 10) { + addListPanel(valuesSorted, selectedValue, selectDataSourceRadioGroup); + } else if (size <= 20) { + int half = size / 2; + addListPanel(valuesSorted.subList(0, half), selectedValue, selectDataSourceRadioGroup); + addHorizontalGlue(listPanel); + addListPanel(valuesSorted.subList(half, size), selectedValue, selectDataSourceRadioGroup); + } else { + int third = size / 3; + addListPanel(valuesSorted.subList(0, third), selectedValue, selectDataSourceRadioGroup); + addHorizontalGlue(listPanel); + addListPanel( + valuesSorted.subList(third, third * 2), + selectedValue, + selectDataSourceRadioGroup + ); + addHorizontalGlue(listPanel); + addListPanel( + valuesSorted.subList(third * 2, size), + selectedValue, + selectDataSourceRadioGroup + ); + } + } + + private void addListPanel( + List values, + String selectedValue, + ButtonGroup selectDataSourceRadioGroup + ) { + Box column = Box.createVerticalBox(); + + for (String name : values) { + boolean selected = selectedValue.equals(name); + JRadioButton radioBtn = newRadioBtn(selectDataSourceRadioGroup, name, selected); + radioBtn.addActionListener(this::onDataSourceChange); + addComp(radioBtn, column); + } + addComp(column, listPanel); + } + + private static JRadioButton newRadioBtn(ButtonGroup group, String name, boolean selected) { + JRadioButton radioButton = new JRadioButton(name, selected); + group.add(radioButton); + return radioButton; + } +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/MainView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java similarity index 55% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/views/MainView.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java index 44ede02e3eb..d147624aa61 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/MainView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java @@ -1,11 +1,10 @@ -package org.opentripplanner.ext.interactivelauncher.views; +package org.opentripplanner.ext.interactivelauncher.startup; import static java.awt.GridBagConstraints.BOTH; import static java.awt.GridBagConstraints.CENTER; -import static java.awt.GridBagConstraints.NONE; -import static java.awt.GridBagConstraints.NORTH; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.BACKGROUND; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.debugLayout; +import static java.awt.GridBagConstraints.HORIZONTAL; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.BACKGROUND; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.debugLayout; import java.awt.GridBagConstraints; import java.awt.GridBagLayout; @@ -18,101 +17,32 @@ public class MainView { - /** Margins between components (IN) */ private static final int M_IN = 10; - - /** Margins around frame boarder (OUT) */ private static final int M_OUT = 2 * M_IN; + private static final Insets DEFAULT_INSETS = new Insets(M_OUT, M_OUT, M_IN, M_OUT); + private static final Insets SMALL_INSETS = new Insets(M_OUT, M_OUT, M_IN, M_OUT); + private static int Y = 0; /* - The application have the following 4 panels: + The application have the following panels: + +-----------------------------------+ + | Root dir [Open] | + +-----------------------------------+ + | Config Dirs Panel | + +-----------------------------------+ + | Options Panel | +-----------------------------------+ - | Root dir [Open] | - +-------------------+---------------+ - | | | - | Config Dirs Panel | Options Panel | - | | | - +-------------------+---------------+ - | Start OTP Main Panel | + | [ Start OTP ] | +-----------------------------------+ | Status Bar | +-----------------------------------+ */ - // Root dir view - private static final GridBagConstraints CONFIG_SOURCE_DIR_PANEL_CONSTRAINTS = new GridBagConstraints( - 0, - 0, - 2, - 1, - 1.0, - 0.0, - NORTH, - BOTH, - new Insets(M_OUT, M_OUT, M_IN, M_IN), - 0, - 0 - ); - - // List of locations - private static final GridBagConstraints CONFIG_DIRS_PANEL_CONSTRAINTS = new GridBagConstraints( - 0, - 1, - 1, - 1, - 1.0, - 1.0, - NORTH, - NONE, - new Insets(M_OUT, M_OUT, M_IN, M_IN), - 0, - 0 - ); - - // Options panel - private static final GridBagConstraints OPTIONS_PANEL_CONSTRAINTS = new GridBagConstraints( - 1, - 1, - 1, - 1, - 1.0, - 1.0, - NORTH, - NONE, - new Insets(M_OUT, M_IN, M_IN, M_OUT), - 0, - 0 - ); - - // Run btn and status - private static final GridBagConstraints START_OTP_BUTTON_PANEL_CONSTRAINTS = new GridBagConstraints( - 0, - 2, - 2, - 1, - 1.0, - 1.0, - CENTER, - BOTH, - new Insets(M_IN, M_OUT, M_IN, M_OUT), - 0, - 0 - ); - - // Run btn and status - private static final GridBagConstraints STATUS_BAR_CONSTRAINTS = new GridBagConstraints( - 0, - 3, - 2, - 1, - 1.0, - 0.0, - CENTER, - BOTH, - new Insets(M_IN, 0, 0, 0), - 40, - 0 - ); + private static final GridBagConstraints DATA_SOURCE_ROOT_PANEL_CONSTRAINTS = gbc(0f); + private static final GridBagConstraints DATA_SOURCE_LIST_PANEL_CONSTRAINTS = gbc(1f); + private static final GridBagConstraints OPTIONS_PANEL_CONSTRAINTS = gbc(1f); + private static final GridBagConstraints START_BUTTON_PANEL_CONSTRAINTS = gbc(0f); + private static final GridBagConstraints STATUS_BAR_CONSTRAINTS = gbc(0f, SMALL_INSETS, 40); private final JFrame mainFrame = new JFrame("Setup and Run OTP Main"); @@ -134,7 +64,7 @@ public MainView(Runnable otpStarter, Model model) throws HeadlessException { innerPanel.setLayout(layout); innerPanel.setBackground(BACKGROUND); - var sourceDirectoryView = new SearchDirectoryView( + var sourceDirectoryView = new DataSourceRootView( model.getRootDirectory(), this::onRootDirChanged ); @@ -142,16 +72,17 @@ public MainView(Runnable otpStarter, Model model) throws HeadlessException { this.optionsView = new OptionsView(model); this.startOtpButtonView = new StartOtpButtonView(); - innerPanel.add(sourceDirectoryView.panel(), CONFIG_SOURCE_DIR_PANEL_CONSTRAINTS); - innerPanel.add(dataSourcesView.panel(), CONFIG_DIRS_PANEL_CONSTRAINTS); + innerPanel.add(sourceDirectoryView.panel(), DATA_SOURCE_ROOT_PANEL_CONSTRAINTS); + innerPanel.add(dataSourcesView.panel(), DATA_SOURCE_LIST_PANEL_CONSTRAINTS); innerPanel.add(optionsView.panel(), OPTIONS_PANEL_CONSTRAINTS); - innerPanel.add(startOtpButtonView.panel(), START_OTP_BUTTON_PANEL_CONSTRAINTS); + innerPanel.add(startOtpButtonView.panel(), START_BUTTON_PANEL_CONSTRAINTS); innerPanel.add(statusBarTxt, STATUS_BAR_CONSTRAINTS); // Setup action listeners startOtpButtonView.addActionListener(e -> startOtp()); debugLayout( + sourceDirectoryView.panel(), dataSourcesView.panel(), optionsView.panel(), startOtpButtonView.panel(), @@ -186,4 +117,12 @@ private void startOtp() { mainFrame.dispose(); otpStarter.run(); } + + private static GridBagConstraints gbc(float weighty) { + return gbc(weighty, DEFAULT_INSETS, 0); + } + + private static GridBagConstraints gbc(float weighty, Insets insets, int ipadx) { + return new GridBagConstraints(0, Y++, 1, 1, 1.0, weighty, CENTER, HORIZONTAL, insets, ipadx, 0); + } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/OptionsView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java similarity index 63% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/views/OptionsView.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java index 08923f3af88..3d98bbf0cfc 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/OptionsView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java @@ -1,20 +1,18 @@ -package org.opentripplanner.ext.interactivelauncher.views; +package org.opentripplanner.ext.interactivelauncher.startup; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.addComp; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.addSectionDoubleSpace; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.addSectionSpace; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addComp; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addVerticalSectionSpace; -import java.util.List; import java.util.function.Consumer; -import java.util.stream.Collectors; import javax.swing.Box; import javax.swing.JCheckBox; +import javax.swing.JComponent; import javax.swing.JLabel; import org.opentripplanner.ext.interactivelauncher.Model; class OptionsView { - private final Box panel = Box.createVerticalBox(); + private final Box panel = Box.createHorizontalBox(); private final JCheckBox buildStreetGraphChk; private final JCheckBox buildTransitGraphChk; private final JCheckBox saveGraphChk; @@ -30,28 +28,41 @@ class OptionsView { this.startOptServerChk = new JCheckBox("Serve graph", model.isServeGraph()); this.startOptVisualizerChk = new JCheckBox("Visualizer", model.isVisualizer()); - addComp(new JLabel("Build graph"), panel); - addSectionSpace(panel); - addComp(buildStreetGraphChk, panel); - addComp(buildTransitGraphChk, panel); - addSectionDoubleSpace(panel); + panel.add(Box.createGlue()); + addComp(createBuildBox(), panel); + panel.add(Box.createGlue()); + addComp(createActionBox(), panel); + panel.add(Box.createGlue()); // Toggle [ ] save on/off buildStreetGraphChk.addActionListener(e -> onBuildGraphChkChanged()); buildTransitGraphChk.addActionListener(e -> onBuildGraphChkChanged()); startOptServerChk.addActionListener(e -> onStartOptServerChkChanged()); - addComp(new JLabel("Actions"), panel); - addSectionSpace(panel); - addComp(saveGraphChk, panel); - addComp(startOptServerChk, panel); - addComp(startOptVisualizerChk, panel); - - addDebugCheckBoxes(model); - addSectionDoubleSpace(panel); + //addSectionDoubleSpace(panel); bindCheckBoxesToModel(); } + private JComponent createBuildBox() { + var buildBox = Box.createVerticalBox(); + addComp(new JLabel("Build graph"), buildBox); + addVerticalSectionSpace(buildBox); + addComp(buildStreetGraphChk, buildBox); + addComp(buildTransitGraphChk, buildBox); + buildBox.add(Box.createVerticalGlue()); + return buildBox; + } + + private JComponent createActionBox() { + var actionBox = Box.createVerticalBox(); + addComp(new JLabel("Actions"), actionBox); + addVerticalSectionSpace(actionBox); + addComp(saveGraphChk, actionBox); + addComp(startOptServerChk, actionBox); + addComp(startOptVisualizerChk, actionBox); + return actionBox; + } + Box panel() { return panel; } @@ -64,19 +75,6 @@ void bind(JCheckBox box, Consumer modelUpdate) { box.addActionListener(l -> modelUpdate.accept(box.isSelected() && box.isEnabled())); } - private void addDebugCheckBoxes(Model model) { - addSectionSpace(panel); - addComp(new JLabel("Debug logging"), panel); - addSectionSpace(panel); - var entries = model.getDebugLogging(); - List keys = entries.keySet().stream().sorted().collect(Collectors.toList()); - for (String name : keys) { - JCheckBox box = new JCheckBox(name, entries.get(name)); - box.addActionListener(l -> model.getDebugLogging().put(name, box.isSelected())); - addComp(box, panel); - } - } - private void bindCheckBoxesToModel() { bind(buildStreetGraphChk, model::setBuildStreet); bind(buildTransitGraphChk, model::setBuildTransit); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/StartOtpButtonView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartOtpButtonView.java similarity index 82% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/views/StartOtpButtonView.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartOtpButtonView.java index 5c0c1e7a621..3050b7c5c62 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/StartOtpButtonView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartOtpButtonView.java @@ -1,6 +1,6 @@ -package org.opentripplanner.ext.interactivelauncher.views; +package org.opentripplanner.ext.interactivelauncher.startup; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.adjustSize; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.adjustSize; import java.awt.event.ActionListener; import javax.swing.Box; diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java new file mode 100644 index 00000000000..f88c77c9f75 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StatusBar.java @@ -0,0 +1,15 @@ +package org.opentripplanner.ext.interactivelauncher.startup; + +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.BG_STATUS_BAR; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.FG_STATUS_BAR; + +import javax.swing.JTextField; + +class StatusBar extends JTextField { + + public StatusBar() { + setEditable(false); + setBackground(BG_STATUS_BAR); + setForeground(FG_STATUS_BAR); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/SearchForOtpConfig.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/SearchForOtpConfig.java similarity index 85% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/SearchForOtpConfig.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/support/SearchForOtpConfig.java index ccf6be72e20..6b0574f0fdf 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/SearchForOtpConfig.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/SearchForOtpConfig.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.interactivelauncher; +package org.opentripplanner.ext.interactivelauncher.support; import java.io.File; import java.util.Arrays; @@ -10,17 +10,17 @@ /** * Search for directories containing OTP configuration files. The search is recursive and searches - * sub-directories 10 levels deep. + * subdirectories 10 levels deep. */ -class SearchForOtpConfig { +public class SearchForOtpConfig { private static final int DEPTH_LIMIT = 10; private static final Pattern EXCLUDE_DIR = Pattern.compile( "(otp1|archive|\\..*|te?mp|target|docs?|src|source|resource)" ); - static List search(File rootDir) { - return recursiveSearch(rootDir, DEPTH_LIMIT).collect(Collectors.toUnmodifiableList()); + public static List search(File rootDir) { + return recursiveSearch(rootDir, DEPTH_LIMIT).toList(); } @SuppressWarnings("ConstantConditions") diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/ViewUtils.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java similarity index 53% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/views/ViewUtils.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java index 14f6f589109..1e0c94fb588 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/ViewUtils.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java @@ -1,35 +1,36 @@ -package org.opentripplanner.ext.interactivelauncher.views; +package org.opentripplanner.ext.interactivelauncher.support; import java.awt.Color; +import java.awt.Container; import java.awt.Dimension; import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.JComponent; -final class ViewUtils { +public final class ViewUtils { private static final boolean DEBUG_LAYOUT = false; static final int SECTION_SPACE = 10; - static final Color BACKGROUND = new Color(0xe0, 0xf0, 0xff); - static final Color BG_STATUS_BAR = new Color(0xd0, 0xe0, 0xf0); - static final Color FG_STATUS_BAR = new Color(0, 0, 0x80); + public static final Color BACKGROUND = new Color(0xe0, 0xf0, 0xff); + public static final Color BG_STATUS_BAR = new Color(0xd0, 0xe0, 0xf0); + public static final Color FG_STATUS_BAR = new Color(0, 0, 0x80); - static void addSectionSpace(Box panel) { + public static void addVerticalSectionSpace(Box panel) { panel.add(Box.createVerticalStrut(SECTION_SPACE)); } - static void addSectionDoubleSpace(Box panel) { - panel.add(Box.createVerticalStrut(2 * SECTION_SPACE)); + public static void addHorizontalGlue(Box box) { + box.add(Box.createHorizontalGlue()); } - static void addComp(JComponent c, Box panel) { + public static void addComp(JComponent c, Container panel) { if (DEBUG_LAYOUT) { c.setBorder(BorderFactory.createLineBorder(Color.green)); } panel.add(c); } - static void debugLayout(JComponent... components) { + public static void debugLayout(JComponent... components) { if (DEBUG_LAYOUT) { for (JComponent c : components) { c.setBorder(BorderFactory.createLineBorder(Color.red)); @@ -37,7 +38,7 @@ static void debugLayout(JComponent... components) { } } - static void adjustSize(JComponent c, int dWidth, int dHeight) { + public static void adjustSize(JComponent c, int dWidth, int dHeight) { Dimension d0 = c.getPreferredSize(); Dimension d = new Dimension(d0.width + dWidth, d0.height + dHeight); c.setMinimumSize(d); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/DataSourcesView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/DataSourcesView.java deleted file mode 100644 index c7faa43779d..00000000000 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/DataSourcesView.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.opentripplanner.ext.interactivelauncher.views; - -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.addComp; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.addSectionDoubleSpace; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.addSectionSpace; - -import java.awt.event.ActionEvent; -import java.util.List; -import java.util.stream.Collectors; -import javax.swing.Box; -import javax.swing.ButtonGroup; -import javax.swing.JLabel; -import javax.swing.JRadioButton; -import org.opentripplanner.ext.interactivelauncher.Model; - -class DataSourcesView { - - private final Box panel = Box.createVerticalBox(); - private final Box dataSourceSelectionPanel = Box.createVerticalBox(); - private final Model model; - - public DataSourcesView(Model model) { - this.model = model; - - setupDataSources(); - - addComp(new JLabel("Select data source"), panel); - addSectionSpace(panel); - addComp(dataSourceSelectionPanel, panel); - addSectionDoubleSpace(panel); - } - - public Box panel() { - return panel; - } - - public void onRootDirChange() { - model.setDataSource(null); - dataSourceSelectionPanel.removeAll(); - setupDataSources(); - panel.repaint(); - } - - public void onDataSourceChange(ActionEvent e) { - model.setDataSource(e.getActionCommand()); - } - - private static JRadioButton newRadioBtn(ButtonGroup group, String name, boolean selected) { - JRadioButton radioButton = new JRadioButton(name, selected); - group.add(radioButton); - return radioButton; - } - - private void setupDataSources() { - final List values = model.getDataSourceOptions(); - - if (values.isEmpty()) { - model.setDataSource(null); - JLabel label = new JLabel(""); - label.setBackground(ViewUtils.BG_STATUS_BAR); - label.setForeground(ViewUtils.FG_STATUS_BAR); - addComp(label, dataSourceSelectionPanel); - return; - } - - String selectedValue = model.getDataSource(); - - if (selectedValue == null) { - selectedValue = values.get(0); - model.setDataSource(selectedValue); - } - - ButtonGroup selectDataSourceRadioGroup = new ButtonGroup(); - - List valuesSorted = values.stream().sorted().collect(Collectors.toList()); - - for (String name : valuesSorted) { - boolean selected = selectedValue.equals(name); - JRadioButton radioBtn = newRadioBtn(selectDataSourceRadioGroup, name, selected); - radioBtn.addActionListener(this::onDataSourceChange); - addComp(radioBtn, dataSourceSelectionPanel); - } - } -} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/StatusBar.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/StatusBar.java deleted file mode 100644 index faffa9d87d2..00000000000 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/views/StatusBar.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.opentripplanner.ext.interactivelauncher.views; - -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.BG_STATUS_BAR; -import static org.opentripplanner.ext.interactivelauncher.views.ViewUtils.FG_STATUS_BAR; - -import javax.swing.JTextField; - -public class StatusBar extends JTextField { - - public StatusBar() { - setEditable(false); - setBackground(BG_STATUS_BAR); - setForeground(FG_STATUS_BAR); - } -} From cb10208be9e800d93bb2b8c1621698d12740cc3e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 01:38:18 +0100 Subject: [PATCH 0160/1688] refactor: Extend the main code, so the interactive launcher can intercept the request. --- .../api/LauncherRequestDecorator.java | 15 ++++++++++++++ .../InteractiveLauncherModule.java | 20 +++++++++++++++++++ .../ConstructApplicationFactory.java | 2 ++ .../configure/ConstructApplicationModule.java | 8 ++++++-- 4 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java new file mode 100644 index 00000000000..99c28bad260 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/api/LauncherRequestDecorator.java @@ -0,0 +1,15 @@ +package org.opentripplanner.ext.interactivelauncher.api; + +import org.opentripplanner.routing.api.request.RouteRequest; + +/** + * Allow the interactive launcher intercept planing requests. + */ +public interface LauncherRequestDecorator { + /** + * The launcher may use this method to change the default plan request. Note! It is the DEFAULT + * request witch is passed in here, then the request-specific values are applied on top + * of that. + */ + RouteRequest intercept(RouteRequest defaultRequest); +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java new file mode 100644 index 00000000000..2df46b74127 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java @@ -0,0 +1,20 @@ +package org.opentripplanner.ext.interactivelauncher.configuration; + +import dagger.Module; +import dagger.Provides; +import org.opentripplanner.ext.interactivelauncher.api.LauncherRequestDecorator; + +@Module +public class InteractiveLauncherModule { + + static LauncherRequestDecorator decorator = request -> request; + + static void enable(LauncherRequestDecorator decorator) { + InteractiveLauncherModule.decorator = decorator; + } + + @Provides + LauncherRequestDecorator requestDecorator() { + return decorator; + } +} diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index 097fcfb4f7a..a4f0ee49652 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -6,6 +6,7 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.emissions.EmissionsDataModel; import org.opentripplanner.ext.emissions.EmissionsServiceModule; +import org.opentripplanner.ext.interactivelauncher.configuration.InteractiveLauncherModule; import org.opentripplanner.ext.ridehailing.configure.RideHailingServicesModule; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.configure.StopConsolidationServiceModule; @@ -50,6 +51,7 @@ RideHailingServicesModule.class, EmissionsServiceModule.class, StopConsolidationServiceModule.class, + InteractiveLauncherModule.class, } ) public interface ConstructApplicationFactory { diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java index 2ff6de29b3d..c9d7253b0be 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; import org.opentripplanner.astar.spi.TraverseVisitor; import org.opentripplanner.ext.emissions.EmissionsService; +import org.opentripplanner.ext.interactivelauncher.api.LauncherRequestDecorator; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.raptor.configure.RaptorConfig; @@ -36,11 +37,14 @@ OtpServerRequestContext providesServerContext( List rideHailingServices, @Nullable StopConsolidationService stopConsolidationService, @Nullable TraverseVisitor traverseVisitor, - EmissionsService emissionsService + EmissionsService emissionsService, + LauncherRequestDecorator launcherRequestDecorator ) { + var defaultRequest = launcherRequestDecorator.intercept(routerConfig.routingRequestDefaults()); + return DefaultServerRequestContext.create( routerConfig.transitTuningConfig(), - routerConfig.routingRequestDefaults(), + defaultRequest, raptorConfig, graph, transitService, From bd16e4046bd85c00ca35e7113fde8b6fe0b588b6 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 14:07:19 +0100 Subject: [PATCH 0161/1688] refactor: Cleanup SystemErrDebugLogger --- .../raptor/rangeraptor/SystemErrDebugLogger.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java index 060d3a2e018..951721f81a7 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/SystemErrDebugLogger.java @@ -43,14 +43,14 @@ public class SystemErrDebugLogger implements DebugLogger { private final Table arrivalTable = Table .of() .withAlights(Center, Center, Right, Right, Right, Right, Left, Left) - .withHeaders("ARRIVAL", "LEG", "RND", "STOP", "ARRIVE", "COST", "TRIP", "DETAILS") + .withHeaders("ARRIVAL", "LEG", "RND", "STOP", "ARRIVE", "C₁", "TRIP", "DETAILS") .withMinWidths(9, 7, 3, 5, 8, 9, 24, 0) .build(); private final Table pathTable = Table .of() .withAlights(Center, Center, Right, Right, Right, Right, Right, Right, Left) - .withHeaders(">>> PATH", "TR", "FROM", "TO", "START", "END", "DURATION", "COST", "DETAILS") - .withMinWidths(9, 2, 5, 5, 8, 8, 8, 6, 0) + .withHeaders(">>> PATH", "TR", "FROM", "TO", "START", "END", "DURATION", "C₁", "DETAILS") + .withMinWidths(9, 2, 5, 5, 8, 8, 8, 9, 0) .build(); private boolean forwardSearch = true; private int lastIterationTime = NOT_SET; @@ -112,6 +112,7 @@ public void pathFilteringListener(DebugEvent> e) { RaptorPath p = e.element(); var aLeg = p.accessLeg(); var eLeg = p.egressLeg(); + println( pathTable.rowAsText( e.action().toString(), From eb259ee3b247095206bfaff0876f00bd733250b9 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 15:59:41 +0100 Subject: [PATCH 0162/1688] refactor: Create a separate model for StartUp --- .../InteractiveOtpMain.java | 6 +- .../ext/interactivelauncher/Model.java | 187 +----------------- .../startup/DataSourcesView.java | 5 +- .../interactivelauncher/startup/MainView.java | 6 +- .../startup/OptionsView.java | 5 +- .../startup/StartupModel.java | 178 +++++++++++++++++ 6 files changed, 192 insertions(+), 195 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java index d61ae6bfcd3..f5621c45278 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java @@ -24,16 +24,14 @@ public static void main(String[] args) { private void run() { this.model = Model.load(); - MainView frame = new MainView(new Thread(this::startOtp)::start, model); + MainView frame = new MainView(new Thread(this::startOtp)::start, model.getStartupModel()); frame.start(); } private void startOtp() { model.save(); - new OtpDebugController(model).start(); - System.out.println("Start OTP: " + model + "\n"); - OTPMain.main(model.asOtpArgs()); + OTPMain.main(model.getStartupModel().asOtpArgs()); } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java index 1550f8bc1ab..8e0c2b353a7 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java @@ -1,34 +1,17 @@ package org.opentripplanner.ext.interactivelauncher; -import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.databind.ObjectMapper; import java.io.File; import java.io.IOException; import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; -import java.util.function.Consumer; import org.opentripplanner.ext.interactivelauncher.logging.LogModel; -import org.opentripplanner.ext.interactivelauncher.support.SearchForOtpConfig; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.opentripplanner.ext.interactivelauncher.startup.StartupModel; public class Model implements Serializable { - private static final Logger LOG = LoggerFactory.getLogger(Model.class); - private static final File MODEL_FILE = new File("interactive_otp_main.json"); - @JsonIgnore - private transient Consumer commandLineChange; - - private String rootDirectory = null; - private String dataSource = null; - private boolean buildStreet = false; - private boolean buildTransit = true; - private boolean saveGraph = false; - private boolean serveGraph = true; - private boolean visualizer = false; + private StartupModel startupModel; private LogModel logModel; public Model() {} @@ -41,116 +24,12 @@ public static Model load() { return model; } - public void subscribeCmdLineUpdates(Consumer commandLineChange) { - this.commandLineChange = commandLineChange; - } - - @SuppressWarnings("AccessOfSystemProperties") - public String getRootDirectory() { - return rootDirectory == null ? System.getProperty("user.dir") : rootDirectory; - } - - public void setRootDirectory(String rootDirectory) { - // If the persisted JSON do not contain the rootDirectory, then avoid setting it - if (rootDirectory != null) { - this.rootDirectory = rootDirectory; - } - notifyChangeListener(); - } - - public String getDataSource() { - return dataSource; - } - - public void setDataSource(String dataSource) { - this.dataSource = dataSource; - notifyChangeListener(); - } - - @JsonIgnore - public List getDataSourceOptions() { - List dataSourceOptions = new ArrayList<>(); - File rootDir = new File(getRootDirectory()); - List dirs = SearchForOtpConfig.search(rootDir); - // Add 1 char for the path-separator-character - int length = rootDir.getAbsolutePath().length() + 1; - - for (File dir : dirs) { - var path = dir.getAbsolutePath(); - if (path.length() <= length) { - LOG.warn( - "The root directory contains a config file, choose " + - "the parent directory or delete the config file." - ); - continue; - } - dataSourceOptions.add(path.substring(length)); - } - return dataSourceOptions; - } - - public boolean isBuildStreet() { - return buildStreet; - } - - public void setBuildStreet(boolean buildStreet) { - this.buildStreet = buildStreet; - notifyChangeListener(); - } - - public boolean isBuildTransit() { - return buildTransit; - } - - public void setBuildTransit(boolean buildTransit) { - this.buildTransit = buildTransit; - notifyChangeListener(); - } - - public boolean isSaveGraph() { - return saveGraph; - } - - public void setSaveGraph(boolean saveGraph) { - this.saveGraph = saveGraph; - notifyChangeListener(); - } - - public boolean isServeGraph() { - return serveGraph; - } - - public void setServeGraph(boolean serveGraph) { - this.serveGraph = serveGraph; - notifyChangeListener(); + public StartupModel getStartupModel() { + return startupModel; } - public boolean isVisualizer() { - return visualizer; - } - - public void setVisualizer(boolean visualizer) { - this.visualizer = visualizer; - notifyChangeListener(); - } - - @Override - public String toString() { - return ( - "(" + - "data-source-dir: " + - getDataSourceDirectory() + - (buildStreet ? ", buildStreet" : "") + - (buildTransit ? ", buildTransit" : "") + - (saveGraph ? ", saveGraph" : "") + - (serveGraph ? ", serveGraph" : "") + - (visualizer ? ", visualizer" : "") + - ')' - ); - } - - public String toCliString() { - return String.join(" ", asOtpArgs()); + public LogModel getLogModel() { + return logModel; } public void save() { @@ -161,46 +40,6 @@ public void save() { } } - public LogModel getLogModel() { - return logModel; - } - - @JsonIgnore - String getDataSourceDirectory() { - if (dataSource == null) { - return "DATA_SOURCE_NOT_SET"; - } - return rootDirectory + File.separatorChar + dataSource; - } - - String[] asOtpArgs() { - List args = new ArrayList<>(); - - if (buildAll()) { - args.add("--build"); - } else if (buildStreet) { - args.add("--buildStreet"); - } else if (buildTransit) { - args.add("--loadStreet"); - } else { - args.add("--load"); - } - - if (saveGraph && (buildTransit || buildStreet)) { - args.add("--save"); - } - if (serveGraph && !buildStreetOnly()) { - args.add("--serve"); - } - if (serveGraph && !buildStreetOnly() && visualizer) { - args.add("--visualize"); - } - - args.add(getDataSourceDirectory()); - - return args.toArray(new String[0]); - } - private static Model createNew() { var model = new Model(); model.logModel = new LogModel(); @@ -224,20 +63,6 @@ private static Model readFromFile() { } } - private void notifyChangeListener() { - if (commandLineChange != null) { - commandLineChange.accept(toCliString()); - } - } - - private boolean buildAll() { - return buildStreet && buildTransit; - } - - private boolean buildStreetOnly() { - return buildStreet && !buildTransit; - } - private void setupCallbacks() { logModel.init(this::save); } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java index 07052b9cd29..d8787287681 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java @@ -12,7 +12,6 @@ import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JRadioButton; -import org.opentripplanner.ext.interactivelauncher.Model; import org.opentripplanner.ext.interactivelauncher.support.ViewUtils; class DataSourcesView { @@ -28,9 +27,9 @@ class DataSourcesView { private final Box mainPanel = Box.createVerticalBox(); private final Box listPanel = Box.createHorizontalBox(); - private final Model model; + private final StartupModel model; - public DataSourcesView(Model model) { + public DataSourcesView(StartupModel model) { this.model = model; setupDataSources(); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java index d147624aa61..6db2508196c 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/MainView.java @@ -1,6 +1,5 @@ package org.opentripplanner.ext.interactivelauncher.startup; -import static java.awt.GridBagConstraints.BOTH; import static java.awt.GridBagConstraints.CENTER; import static java.awt.GridBagConstraints.HORIZONTAL; import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.BACKGROUND; @@ -13,7 +12,6 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JScrollPane; -import org.opentripplanner.ext.interactivelauncher.Model; public class MainView { @@ -50,9 +48,9 @@ public class MainView { private final OptionsView optionsView; private final StartOtpButtonView startOtpButtonView; private final Runnable otpStarter; - private final Model model; + private final StartupModel model; - public MainView(Runnable otpStarter, Model model) throws HeadlessException { + public MainView(Runnable otpStarter, StartupModel model) throws HeadlessException { var innerPanel = new JPanel(); var statusBarTxt = new StatusBar(); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java index 3d98bbf0cfc..a8c4327a2d4 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java @@ -8,7 +8,6 @@ import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JLabel; -import org.opentripplanner.ext.interactivelauncher.Model; class OptionsView { @@ -18,9 +17,9 @@ class OptionsView { private final JCheckBox saveGraphChk; private final JCheckBox startOptServerChk; private final JCheckBox startOptVisualizerChk; - private final Model model; + private final StartupModel model; - OptionsView(Model model) { + OptionsView(StartupModel model) { this.model = model; this.buildStreetGraphChk = new JCheckBox("Street graph", model.isBuildStreet()); this.buildTransitGraphChk = new JCheckBox("Transit graph", model.isBuildTransit()); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java new file mode 100644 index 00000000000..5b803b2318c --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/StartupModel.java @@ -0,0 +1,178 @@ +package org.opentripplanner.ext.interactivelauncher.startup; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import java.io.File; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Consumer; +import org.opentripplanner.ext.interactivelauncher.support.SearchForOtpConfig; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class StartupModel { + + private static final Logger LOG = LoggerFactory.getLogger(StartupModel.class); + + @JsonIgnore + private transient Consumer commandLineChange; + + private String rootDirectory = null; + private String dataSource = null; + private boolean buildStreet = false; + private boolean buildTransit = true; + private boolean saveGraph = false; + private boolean serveGraph = true; + private boolean visualizer = false; + + public void subscribeCmdLineUpdates(Consumer commandLineChange) { + this.commandLineChange = commandLineChange; + } + + @SuppressWarnings("AccessOfSystemProperties") + public String getRootDirectory() { + return rootDirectory == null ? System.getProperty("user.dir") : rootDirectory; + } + + public void setRootDirectory(String rootDirectory) { + // If the persisted JSON do not contain the rootDirectory, then avoid setting it + if (rootDirectory != null) { + this.rootDirectory = rootDirectory; + } + notifyChangeListener(); + } + + public String getDataSource() { + return dataSource; + } + + public void setDataSource(String dataSource) { + this.dataSource = dataSource; + notifyChangeListener(); + } + + @JsonIgnore + public List getDataSourceOptions() { + List dataSourceOptions = new ArrayList<>(); + File rootDir = new File(getRootDirectory()); + List dirs = SearchForOtpConfig.search(rootDir); + // Add 1 char for the path-separator-character + int length = rootDir.getAbsolutePath().length() + 1; + + for (File dir : dirs) { + var path = dir.getAbsolutePath(); + if (path.length() <= length) { + LOG.warn( + "The root directory contains a config file, choose " + + "the parent directory or delete the config file." + ); + continue; + } + dataSourceOptions.add(path.substring(length)); + } + return dataSourceOptions; + } + + public boolean isBuildStreet() { + return buildStreet; + } + + public void setBuildStreet(boolean buildStreet) { + this.buildStreet = buildStreet; + notifyChangeListener(); + } + + public boolean isBuildTransit() { + return buildTransit; + } + + public void setBuildTransit(boolean buildTransit) { + this.buildTransit = buildTransit; + notifyChangeListener(); + } + + public boolean isSaveGraph() { + return saveGraph; + } + + public void setSaveGraph(boolean saveGraph) { + this.saveGraph = saveGraph; + notifyChangeListener(); + } + + public boolean isServeGraph() { + return serveGraph; + } + + public void setServeGraph(boolean serveGraph) { + this.serveGraph = serveGraph; + notifyChangeListener(); + } + + public boolean isVisualizer() { + return visualizer; + } + + public void setVisualizer(boolean visualizer) { + this.visualizer = visualizer; + notifyChangeListener(); + } + + @Override + public String toString() { + return String.join("", asOtpArgs()); + } + + public String toCliString() { + return String.join(" ", asOtpArgs()); + } + + private void notifyChangeListener() { + if (commandLineChange != null) { + commandLineChange.accept(toCliString()); + } + } + + @JsonIgnore + String getDataSourceDirectory() { + if (dataSource == null) { + return "DATA_SOURCE_NOT_SET"; + } + return getRootDirectory() + File.separatorChar + dataSource; + } + + public String[] asOtpArgs() { + List args = new ArrayList<>(); + + if (buildAll()) { + args.add("--build"); + } else if (buildStreet) { + args.add("--buildStreet"); + } else if (buildTransit) { + args.add("--loadStreet"); + } else { + args.add("--load"); + } + + if (saveGraph && (buildTransit || buildStreet)) { + args.add("--save"); + } + if (serveGraph && !buildStreetOnly()) { + args.add("--serve"); + } + if (serveGraph && !buildStreetOnly() && visualizer) { + args.add("--visualize"); + } + + args.add(getDataSourceDirectory()); + + return args.toArray(new String[0]); + } + + private boolean buildAll() { + return buildStreet && buildTransit; + } + + private boolean buildStreetOnly() { + return buildStreet && !buildTransit; + } +} From 50cc04e15678ca3d74cc3931cf3c6ccb436a67c2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 16:02:52 +0100 Subject: [PATCH 0163/1688] refactor: Create debug package in o.o.ext.interactivelauncher --- .../org/opentripplanner/ext/interactivelauncher/Model.java | 2 +- .../ext/interactivelauncher/OtpDebugController.java | 4 ++-- .../{ => debug}/logging/DebugLoggingSupport.java | 3 +-- .../ext/interactivelauncher/{ => debug}/logging/LogModel.java | 2 +- .../ext/interactivelauncher/{ => debug}/logging/LogView.java | 2 +- .../{ => debug}/logging/OTPDebugLoggers.java | 2 +- 6 files changed, 7 insertions(+), 8 deletions(-) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{ => debug}/logging/DebugLoggingSupport.java (95%) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{ => debug}/logging/LogModel.java (95%) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{ => debug}/logging/LogView.java (92%) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{ => debug}/logging/OTPDebugLoggers.java (90%) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java index 8e0c2b353a7..d44e7c0e340 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java @@ -4,7 +4,7 @@ import java.io.File; import java.io.IOException; import java.io.Serializable; -import org.opentripplanner.ext.interactivelauncher.logging.LogModel; +import org.opentripplanner.ext.interactivelauncher.debug.logging.LogModel; import org.opentripplanner.ext.interactivelauncher.startup.StartupModel; public class Model implements Serializable { diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java index 95635c5bb0c..57ef7f70644 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java @@ -6,8 +6,8 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JTabbedPane; -import org.opentripplanner.ext.interactivelauncher.logging.LogModel; -import org.opentripplanner.ext.interactivelauncher.logging.LogView; +import org.opentripplanner.ext.interactivelauncher.debug.logging.LogModel; +import org.opentripplanner.ext.interactivelauncher.debug.logging.LogView; public class OtpDebugController { diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/DebugLoggingSupport.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java similarity index 95% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/DebugLoggingSupport.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java index fcfa323680f..9985f8eb079 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/DebugLoggingSupport.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java @@ -1,11 +1,10 @@ -package org.opentripplanner.ext.interactivelauncher.logging; +package org.opentripplanner.ext.interactivelauncher.debug.logging; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.LoggerContext; import java.util.ArrayList; import java.util.List; -import java.util.Map; import java.util.regex.Pattern; import org.slf4j.LoggerFactory; diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogModel.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java similarity index 95% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogModel.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java index 536c8d1dc87..7f7695ad2e5 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogModel.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.interactivelauncher.logging; +package org.opentripplanner.ext.interactivelauncher.debug.logging; import com.fasterxml.jackson.annotation.JsonIgnore; import java.io.Serializable; diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java similarity index 92% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogView.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java index a71f90eb697..d4cea4d0baf 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/LogView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.interactivelauncher.logging; +package org.opentripplanner.ext.interactivelauncher.debug.logging; import javax.swing.Box; import javax.swing.JCheckBox; diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/OTPDebugLoggers.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/OTPDebugLoggers.java similarity index 90% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/OTPDebugLoggers.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/OTPDebugLoggers.java index 4663b6017de..a38cb5cab58 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/logging/OTPDebugLoggers.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/OTPDebugLoggers.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.interactivelauncher.logging; +package org.opentripplanner.ext.interactivelauncher.debug.logging; import java.util.List; From 6d890c774d5a3a8379f520e0a7b50b44c15d4de1 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 16:04:59 +0100 Subject: [PATCH 0164/1688] refactor: Rename OTPDebugLoggers to DebugLoggers --- .../logging/{OTPDebugLoggers.java => DebugLoggers.java} | 8 ++++---- .../ext/interactivelauncher/debug/logging/LogView.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/{OTPDebugLoggers.java => DebugLoggers.java} (71%) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/OTPDebugLoggers.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java similarity index 71% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/OTPDebugLoggers.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java index a38cb5cab58..0635b9a3675 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/OTPDebugLoggers.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java @@ -2,8 +2,8 @@ import java.util.List; -record OTPDebugLoggers(String label, String logger) { - static List list() { +record DebugLoggers(String label, String logger) { + static List list() { return List.of( of("Data import issues", "DATA_IMPORT_ISSUES"), of("All OTP debuggers", "org.opentripplanner"), @@ -13,7 +13,7 @@ static List list() { ); } - private static OTPDebugLoggers of(String label, String logger) { - return new OTPDebugLoggers(label, logger); + private static DebugLoggers of(String label, String logger) { + return new DebugLoggers(label, logger); } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java index d4cea4d0baf..6417e487ca7 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java @@ -14,14 +14,14 @@ public class LogView { public LogView(LogModel model) { this.model = model; - OTPDebugLoggers.list().forEach(this::add); + DebugLoggers.list().forEach(this::add); } public JComponent panel() { return panel; } - private void add(OTPDebugLoggers logger) { + private void add(DebugLoggers logger) { var box = new JCheckBox(logger.label()); box.setSelected(model.isLoggerEnabled(logger.logger())); box.addActionListener(e -> selectLogger(logger.logger(), box.isSelected())); From 578cc48867fea053193b9c37697022de23f49561 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 16:09:31 +0100 Subject: [PATCH 0165/1688] refactor: Extract addLabel utility method --- .../ext/interactivelauncher/startup/DataSourcesView.java | 9 ++++----- .../ext/interactivelauncher/startup/OptionsView.java | 6 +++--- .../ext/interactivelauncher/support/ViewUtils.java | 5 +++++ 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java index d8787287681..e7b1814faa2 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/DataSourcesView.java @@ -2,6 +2,7 @@ import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addComp; import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addHorizontalGlue; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addLabel; import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addVerticalSectionSpace; import java.awt.Component; @@ -33,12 +34,10 @@ public DataSourcesView(StartupModel model) { this.model = model; setupDataSources(); - JLabel label = new JLabel("Select data source"); + addLabel("Select data source", mainPanel); + addVerticalSectionSpace(mainPanel); listPanel.setAlignmentX(Component.LEFT_ALIGNMENT); - - addComp(label, mainPanel); - addVerticalSectionSpace(mainPanel); addComp(listPanel, mainPanel); } @@ -62,7 +61,7 @@ private void setupDataSources() { if (values.isEmpty()) { model.setDataSource(null); - JLabel label = new JLabel(""); + var label = new JLabel(""); label.setBackground(ViewUtils.BG_STATUS_BAR); label.setForeground(ViewUtils.FG_STATUS_BAR); addComp(label, listPanel); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java index a8c4327a2d4..08907346a76 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/startup/OptionsView.java @@ -1,13 +1,13 @@ package org.opentripplanner.ext.interactivelauncher.startup; import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addComp; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addLabel; import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addVerticalSectionSpace; import java.util.function.Consumer; import javax.swing.Box; import javax.swing.JCheckBox; import javax.swing.JComponent; -import javax.swing.JLabel; class OptionsView { @@ -44,7 +44,7 @@ class OptionsView { private JComponent createBuildBox() { var buildBox = Box.createVerticalBox(); - addComp(new JLabel("Build graph"), buildBox); + addLabel("Build graph", buildBox); addVerticalSectionSpace(buildBox); addComp(buildStreetGraphChk, buildBox); addComp(buildTransitGraphChk, buildBox); @@ -54,7 +54,7 @@ private JComponent createBuildBox() { private JComponent createActionBox() { var actionBox = Box.createVerticalBox(); - addComp(new JLabel("Actions"), actionBox); + addLabel("Actions", actionBox); addVerticalSectionSpace(actionBox); addComp(saveGraphChk, actionBox); addComp(startOptServerChk, actionBox); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java index 1e0c94fb588..f906f063058 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/support/ViewUtils.java @@ -6,6 +6,7 @@ import javax.swing.BorderFactory; import javax.swing.Box; import javax.swing.JComponent; +import javax.swing.JLabel; public final class ViewUtils { @@ -23,6 +24,10 @@ public static void addHorizontalGlue(Box box) { box.add(Box.createHorizontalGlue()); } + public static void addLabel(String label, Container panel) { + addComp(new JLabel(label), panel); + } + public static void addComp(JComponent c, Container panel) { if (DEBUG_LAYOUT) { c.setBorder(BorderFactory.createLineBorder(Color.green)); From 0756cad80168ce9ca6e43b464a4dfcb86382239e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 16:13:21 +0100 Subject: [PATCH 0166/1688] InteractiveLauncherModule --- .../configuration/InteractiveLauncherModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java index 2df46b74127..9acd0298122 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/configuration/InteractiveLauncherModule.java @@ -9,7 +9,7 @@ public class InteractiveLauncherModule { static LauncherRequestDecorator decorator = request -> request; - static void enable(LauncherRequestDecorator decorator) { + public static void setRequestInterceptor(LauncherRequestDecorator decorator) { InteractiveLauncherModule.decorator = decorator; } From 5b131b2992348b3ebb5b308b0053803bfb2b6e55 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 16:31:25 +0100 Subject: [PATCH 0167/1688] refactor: Cleanup Model in interactive launcher This fixes a few small bugs/improve the JSON serialization --- .../ext/interactivelauncher/Model.java | 32 ++++++++++--------- .../debug/logging/LogModel.java | 14 +++++--- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java index d44e7c0e340..45d8583f66d 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java @@ -1,6 +1,8 @@ package org.opentripplanner.ext.interactivelauncher; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import java.io.File; import java.io.IOException; import java.io.Serializable; @@ -17,11 +19,7 @@ public class Model implements Serializable { public Model() {} public static Model load() { - var model = MODEL_FILE.exists() ? readFromFile() : createNew(); - // Setup callbacks - model.logModel.init(model::save); - - return model; + return MODEL_FILE.exists() ? readFromFile() : createNew(); } public StartupModel getStartupModel() { @@ -34,25 +32,22 @@ public LogModel getLogModel() { public void save() { try { - new ObjectMapper().writeValue(MODEL_FILE, this); + var mapper = new ObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, true); + mapper.writeValue(MODEL_FILE, this); } catch (IOException e) { throw new RuntimeException(e.getMessage(), e); } } private static Model createNew() { - var model = new Model(); - model.logModel = new LogModel(); - model.logModel.initFromConfig(); - model.setupCallbacks(); - return model; + return new Model().initSubModels(); } private static Model readFromFile() { try { - var model = new ObjectMapper().readValue(MODEL_FILE, Model.class); - model.setupCallbacks(); - return model; + var mapper = new ObjectMapper() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + return mapper.readValue(MODEL_FILE, Model.class).initSubModels(); } catch (IOException e) { System.err.println( "Unable to read the InteractiveOtpMain state cache. If the model changed this " + @@ -63,7 +58,14 @@ private static Model readFromFile() { } } - private void setupCallbacks() { + private Model initSubModels() { + if (startupModel == null) { + startupModel = new StartupModel(); + } + if (logModel == null) { + logModel = LogModel.createFromConfig(); + } logModel.init(this::save); + return this; } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java index 7f7695ad2e5..d6500fa060f 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java @@ -20,6 +20,12 @@ public class LogModel implements Serializable { public LogModel() {} + public static LogModel createFromConfig() { + var model = new LogModel(); + model.initFromConfig(); + return model; + } + /** Need to set this manually to support JSON serialization. */ public void init(Runnable saveCallback) { this.saveCallback = saveCallback; @@ -36,10 +42,6 @@ public void setActiveLoggers(Collection loggers) { this.activeLoggers.addAll(loggers); } - public void initFromConfig() { - activeLoggers.addAll(DebugLoggingSupport.getDebugLoggers()); - } - boolean isLoggerEnabled(String name) { return activeLoggers.contains(name); } @@ -53,4 +55,8 @@ void turnLoggerOnOff(String name, boolean enable) { DebugLoggingSupport.configureDebugLogging(name, enable); saveCallback.run(); } + + private void initFromConfig() { + activeLoggers.addAll(DebugLoggingSupport.getDebugLoggers()); + } } From dc06bb91ba827d3753ff1a41259e162d24ec398d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 16:34:33 +0100 Subject: [PATCH 0168/1688] refactor: Cleanup interactive launcher debug loggers --- .../debug/logging/DebugLoggers.java | 15 +++++--- .../debug/logging/DebugLoggingSupport.java | 2 +- .../debug/logging/LogModel.java | 34 +++++++++++++++---- .../debug/logging/LogView.java | 8 ++--- 4 files changed, 43 insertions(+), 16 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java index 0635b9a3675..48f87abf2ab 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggers.java @@ -2,8 +2,9 @@ import java.util.List; -record DebugLoggers(String label, String logger) { - static List list() { +class DebugLoggers { + + static List list() { return List.of( of("Data import issues", "DATA_IMPORT_ISSUES"), of("All OTP debuggers", "org.opentripplanner"), @@ -13,7 +14,13 @@ static List list() { ); } - private static DebugLoggers of(String label, String logger) { - return new DebugLoggers(label, logger); + static List listLoggers() { + return list().stream().map(Entry::logger).toList(); + } + + private static Entry of(String label, String logger) { + return new Entry(label, logger); } + + record Entry(String label, String logger) {} } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java index 9985f8eb079..09eddcfdf78 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/DebugLoggingSupport.java @@ -25,7 +25,7 @@ class DebugLoggingSupport { "(" + OTP + "|" + GRAPHQL + "|" + NAMED_LOGGERS + ")" ); - static List getDebugLoggers() { + static List listConfiguredDebugLoggers() { List result = new ArrayList<>(); LoggerContext context = (LoggerContext) LoggerFactory.getILoggerFactory(); for (Logger log : context.getLoggerList()) { diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java index d6500fa060f..df59ccaa968 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogModel.java @@ -31,15 +31,18 @@ public void init(Runnable saveCallback) { this.saveCallback = saveCallback; } - /** Needed to do JSON serialization. */ + /** Used by JSON serialization. */ public Collection getActiveLoggers() { return List.copyOf(activeLoggers); } - /** Needed to do JSON serialization. */ + /** Used by JSON deserialization. */ public void setActiveLoggers(Collection loggers) { this.activeLoggers.clear(); this.activeLoggers.addAll(loggers); + for (var logger : activeLoggers) { + DebugLoggingSupport.configureDebugLogging(logger, true); + } } boolean isLoggerEnabled(String name) { @@ -48,15 +51,32 @@ boolean isLoggerEnabled(String name) { void turnLoggerOnOff(String name, boolean enable) { if (enable) { - activeLoggers.add(name); + if (!activeLoggers.contains(name)) { + activeLoggers.add(name); + DebugLoggingSupport.configureDebugLogging(name, enable); + save(); + } } else { - activeLoggers.remove(name); + if (activeLoggers.contains(name)) { + activeLoggers.remove(name); + DebugLoggingSupport.configureDebugLogging(name, enable); + save(); + } } - DebugLoggingSupport.configureDebugLogging(name, enable); - saveCallback.run(); } private void initFromConfig() { - activeLoggers.addAll(DebugLoggingSupport.getDebugLoggers()); + var debugLoggers = DebugLoggers.listLoggers(); + for (var logger : DebugLoggingSupport.listConfiguredDebugLoggers()) { + if (debugLoggers.contains(logger)) { + activeLoggers.add(logger); + } + } + } + + private void save() { + if (saveCallback != null) { + saveCallback.run(); + } } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java index 6417e487ca7..52c1774c019 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java @@ -21,10 +21,10 @@ public JComponent panel() { return panel; } - private void add(DebugLoggers logger) { - var box = new JCheckBox(logger.label()); - box.setSelected(model.isLoggerEnabled(logger.logger())); - box.addActionListener(e -> selectLogger(logger.logger(), box.isSelected())); + private void add(DebugLoggers.Entry entry) { + var box = new JCheckBox(entry.label()); + box.setSelected(model.isLoggerEnabled(entry.logger())); + box.addActionListener(e -> selectLogger(entry.logger(), box.isSelected())); panel.add(box); } From 61af2c9aa13b89b389743637444b2be8eb6b89e0 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 16:38:47 +0100 Subject: [PATCH 0169/1688] refactor: move OtpDebugController to o.o.ext.interactivelauncher.debug --- .../interactivelauncher/{ => debug}/OtpDebugController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename src/ext/java/org/opentripplanner/ext/interactivelauncher/{ => debug}/OtpDebugController.java (90%) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java similarity index 90% rename from src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java rename to src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java index 57ef7f70644..25e3c8c7629 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/OtpDebugController.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.interactivelauncher; +package org.opentripplanner.ext.interactivelauncher.debug; import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.BACKGROUND; @@ -6,6 +6,7 @@ import javax.swing.JFrame; import javax.swing.JPanel; import javax.swing.JTabbedPane; +import org.opentripplanner.ext.interactivelauncher.Model; import org.opentripplanner.ext.interactivelauncher.debug.logging.LogModel; import org.opentripplanner.ext.interactivelauncher.debug.logging.LogView; From 39f2c39ae43990712a81f7e526e6da2f9383eff9 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 17:03:17 +0100 Subject: [PATCH 0170/1688] feature: Ann UI to set Raptor debug parameters The UI is used to instrument the Raptor search and log events at decision points during routing. --- .../InteractiveOtpMain.java | 9 +- .../ext/interactivelauncher/Model.java | 24 +++-- .../debug/OtpDebugController.java | 25 ++--- .../debug/raptor/RaptorDebugModel.java | 97 +++++++++++++++++++ .../debug/raptor/RaptorDebugView.java | 87 +++++++++++++++++ 5 files changed, 222 insertions(+), 20 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java create mode 100644 src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java index f5621c45278..43061ee2b62 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java @@ -1,5 +1,7 @@ package org.opentripplanner.ext.interactivelauncher; +import org.opentripplanner.ext.interactivelauncher.configuration.InteractiveLauncherModule; +import org.opentripplanner.ext.interactivelauncher.debug.OtpDebugController; import org.opentripplanner.ext.interactivelauncher.startup.MainView; import org.opentripplanner.standalone.OTPMain; @@ -29,9 +31,14 @@ private void run() { } private void startOtp() { - model.save(); + startDebugControllerAndSetupRequestInterceptor(); System.out.println("Start OTP: " + model + "\n"); OTPMain.main(model.getStartupModel().asOtpArgs()); } + + private void startDebugControllerAndSetupRequestInterceptor() { + new OtpDebugController(model).start(); + InteractiveLauncherModule.setRequestInterceptor(model.getRaptorDebugModel()); + } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java index 45d8583f66d..59682082b90 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java @@ -7,6 +7,7 @@ import java.io.IOException; import java.io.Serializable; import org.opentripplanner.ext.interactivelauncher.debug.logging.LogModel; +import org.opentripplanner.ext.interactivelauncher.debug.raptor.RaptorDebugModel; import org.opentripplanner.ext.interactivelauncher.startup.StartupModel; public class Model implements Serializable { @@ -15,6 +16,7 @@ public class Model implements Serializable { private StartupModel startupModel; private LogModel logModel; + private RaptorDebugModel raptorDebugModel; public Model() {} @@ -30,13 +32,8 @@ public LogModel getLogModel() { return logModel; } - public void save() { - try { - var mapper = new ObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, true); - mapper.writeValue(MODEL_FILE, this); - } catch (IOException e) { - throw new RuntimeException(e.getMessage(), e); - } + public RaptorDebugModel getRaptorDebugModel() { + return raptorDebugModel; } private static Model createNew() { @@ -58,6 +55,15 @@ private static Model readFromFile() { } } + private void save() { + try { + var mapper = new ObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, true); + mapper.writeValue(MODEL_FILE, this); + } catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + private Model initSubModels() { if (startupModel == null) { startupModel = new StartupModel(); @@ -65,7 +71,11 @@ private Model initSubModels() { if (logModel == null) { logModel = LogModel.createFromConfig(); } + if (raptorDebugModel == null) { + raptorDebugModel = new RaptorDebugModel(); + } logModel.init(this::save); + raptorDebugModel.init(this::save); return this; } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java index 25e3c8c7629..9e41fe3412d 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/OtpDebugController.java @@ -2,29 +2,23 @@ import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.BACKGROUND; -import javax.swing.JComponent; import javax.swing.JFrame; -import javax.swing.JPanel; import javax.swing.JTabbedPane; import org.opentripplanner.ext.interactivelauncher.Model; -import org.opentripplanner.ext.interactivelauncher.debug.logging.LogModel; import org.opentripplanner.ext.interactivelauncher.debug.logging.LogView; +import org.opentripplanner.ext.interactivelauncher.debug.raptor.RaptorDebugView; +/** + * This controller/UI allows changing the debug loggers and setting the raptor + * debug parameters for incoming rute requests. + */ public class OtpDebugController { private final JFrame debugFrame = new JFrame("OTP Debug Controller"); public OtpDebugController(Model model) { - var tabPanel = new JTabbedPane(); - tabPanel.addTab("Logging", createLogPanel(model.getLogModel())); - tabPanel.addTab("Raptor", new JPanel()); - debugFrame.add(tabPanel); + debugFrame.add(createTabbedPane(model)); debugFrame.getContentPane().setBackground(BACKGROUND); - start(); - } - - private static JComponent createLogPanel(LogModel logModel) { - return new LogView(logModel).panel(); } public void start() { @@ -33,4 +27,11 @@ public void start() { debugFrame.setLocationRelativeTo(null); debugFrame.setVisible(true); } + + private static JTabbedPane createTabbedPane(Model model) { + var tabPanel = new JTabbedPane(); + tabPanel.addTab("Logging", new LogView(model.getLogModel()).panel()); + tabPanel.addTab("Raptor", new RaptorDebugView(model.getRaptorDebugModel()).panel()); + return tabPanel; + } } diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java new file mode 100644 index 00000000000..41d6ed6be1a --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugModel.java @@ -0,0 +1,97 @@ +package org.opentripplanner.ext.interactivelauncher.debug.raptor; + +import java.util.Collection; +import java.util.Collections; +import java.util.EnumSet; +import java.util.Objects; +import java.util.Set; +import javax.annotation.Nullable; +import org.opentripplanner.ext.interactivelauncher.api.LauncherRequestDecorator; +import org.opentripplanner.framework.lang.StringUtils; +import org.opentripplanner.routing.api.request.DebugEventType; +import org.opentripplanner.routing.api.request.RouteRequest; + +public class RaptorDebugModel implements LauncherRequestDecorator { + + private final Set eventTypes = EnumSet.noneOf(DebugEventType.class); + private String stops = null; + private String path = null; + private Runnable saveCallback; + + public RaptorDebugModel() {} + + public void init(Runnable saveCallback) { + this.saveCallback = saveCallback; + } + + /** Used by JSON serialization */ + public Set getEventTypes() { + return Collections.unmodifiableSet(eventTypes); + } + + /** Used by JSON serialization */ + public void setEventTypes(Collection eventTypes) { + this.eventTypes.clear(); + this.eventTypes.addAll(eventTypes); + } + + public void enableEventTypes(DebugEventType eventType, boolean enable) { + if (enable) { + if (!isEventTypeSet(eventType)) { + this.eventTypes.add(eventType); + save(); + } + } else { + if (isEventTypeSet(eventType)) { + this.eventTypes.remove(eventType); + save(); + } + } + } + + @Nullable + public String getStops() { + return stops; + } + + public void setStops(@Nullable String stops) { + stops = StringUtils.hasValue(stops) ? stops : null; + if (!Objects.equals(this.stops, stops)) { + this.stops = stops; + save(); + } + } + + @Nullable + public String getPath() { + return path; + } + + public void setPath(@Nullable String path) { + path = StringUtils.hasValue(path) ? path : null; + if (!Objects.equals(this.path, path)) { + this.path = path; + save(); + } + } + + public boolean isEventTypeSet(DebugEventType eventType) { + return eventTypes.contains(eventType); + } + + @Override + public RouteRequest intercept(RouteRequest defaultRequest) { + var newRequest = defaultRequest.clone(); + var debug = newRequest.journey().transit().raptorDebugging(); + debug.withEventTypes(eventTypes); + debug.withStops(stops); + debug.withPath(path); + return newRequest; + } + + private void save() { + if (saveCallback != null) { + saveCallback.run(); + } + } +} diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java new file mode 100644 index 00000000000..186b8d14837 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/raptor/RaptorDebugView.java @@ -0,0 +1,87 @@ +package org.opentripplanner.ext.interactivelauncher.debug.raptor; + +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addComp; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addLabel; +import static org.opentripplanner.ext.interactivelauncher.support.ViewUtils.addVerticalSectionSpace; +import static org.opentripplanner.routing.api.request.DebugEventType.DESTINATION_ARRIVALS; +import static org.opentripplanner.routing.api.request.DebugEventType.PATTERN_RIDES; +import static org.opentripplanner.routing.api.request.DebugEventType.STOP_ARRIVALS; + +import java.awt.Component; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.util.function.Consumer; +import javax.swing.Box; +import javax.swing.JCheckBox; +import javax.swing.JTextField; +import org.opentripplanner.routing.api.request.DebugEventType; + +/** + * This UI is used to set Raptor debug parameters, instrument the Raptor + * search, and log event at decision points during routing. + */ +public class RaptorDebugView { + + private final RaptorDebugModel model; + private final Box panel = Box.createVerticalBox(); + private final JCheckBox logStopArrivalsChk = new JCheckBox("Stop arrivals"); + private final JCheckBox logPatternRidesChk = new JCheckBox("Pattern rides"); + private final JCheckBox logDestinationArrivalsChk = new JCheckBox("Destination arrivals"); + private final JTextField stopsTxt = new JTextField(40); + private final JTextField pathTxt = new JTextField(40); + + public RaptorDebugView(RaptorDebugModel model) { + this.model = model; + + addLabel("Log Raptor events for", panel); + addComp(logStopArrivalsChk, panel); + addComp(logPatternRidesChk, panel); + addComp(logDestinationArrivalsChk, panel); + addVerticalSectionSpace(panel); + + addLabel("A list of stops to debug", panel); + addComp(stopsTxt, panel); + addVerticalSectionSpace(panel); + addLabel("A a path (as a list of stops) to debug", panel); + addComp(pathTxt, panel); + addVerticalSectionSpace(panel); + + initValues(); + setupActionListeners(); + } + + private void initValues() { + logStopArrivalsChk.setSelected(model.isEventTypeSet(STOP_ARRIVALS)); + logPatternRidesChk.setSelected(model.isEventTypeSet(PATTERN_RIDES)); + logDestinationArrivalsChk.setSelected(model.isEventTypeSet(DESTINATION_ARRIVALS)); + stopsTxt.setText(model.getStops()); + pathTxt.setText(model.getPath()); + } + + private void setupActionListeners() { + setupActionListenerChkBox(logStopArrivalsChk, STOP_ARRIVALS); + setupActionListenerChkBox(logPatternRidesChk, PATTERN_RIDES); + setupActionListenerChkBox(logDestinationArrivalsChk, DESTINATION_ARRIVALS); + setupActionListenerTextField(stopsTxt, model::setStops); + setupActionListenerTextField(pathTxt, model::setPath); + } + + public Component panel() { + return panel; + } + + private void setupActionListenerChkBox(JCheckBox box, DebugEventType type) { + box.addActionListener(l -> model.enableEventTypes(type, box.isSelected())); + } + + private static void setupActionListenerTextField(JTextField txtField, Consumer model) { + txtField.addFocusListener( + new FocusAdapter() { + @Override + public void focusLost(FocusEvent e) { + model.accept(txtField.getText()); + } + } + ); + } +} From c4d2e6ea7d74e73e7ec9a397b597068764f98fa3 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 18:13:41 +0100 Subject: [PATCH 0171/1688] refactor: Add tooltip to debug loggers --- .../ext/interactivelauncher/debug/logging/LogView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java index 52c1774c019..ae8be59b07d 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/debug/logging/LogView.java @@ -23,6 +23,7 @@ public JComponent panel() { private void add(DebugLoggers.Entry entry) { var box = new JCheckBox(entry.label()); + box.setToolTipText("Logger: " + entry.logger()); box.setSelected(model.isLoggerEnabled(entry.logger())); box.addActionListener(e -> selectLogger(entry.logger(), box.isSelected())); panel.add(box); From 10da47f62ba8cb1e78dfea65a7979c119dc76c5d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 4 Jan 2024 18:18:13 +0100 Subject: [PATCH 0172/1688] Apply suggestions from code review Co-authored-by: Johan Torin --- .../apis/transmodel/model/plan/RelaxCostType.java | 8 ++++---- .../org/opentripplanner/apis/transmodel/schema.graphql | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java index d3455083695..41435c83a2f 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RelaxCostType.java @@ -46,8 +46,8 @@ public class RelaxCostType { .newInputObjectField() .name(CONSTANT) .description( - "The constant value to add to the limit. Must be a positive number. The value is" + - "equivalent to transit-cost-seconds. Integers is treated as seconds, but you may use " + + "The constant value to add to the limit. Must be a positive number. The value is " + + "equivalent to transit-cost-seconds. Integers are treated as seconds, but you may use " + "the duration format. Example: '3665 = 'DT1h1m5s' = '1h1m5s'." ) .defaultValueProgrammatic("0s") @@ -66,8 +66,8 @@ public static ObjectValue valueOf(CostLinearFunction value) { ObjectField .newObjectField() .name(CONSTANT) - // We only use this to display default value (this is an input type), so using the - // lenient OTP version of duration is ok - it is slightly more readable. + // We only use this to display the default value (this is an input type), so using + // the lenient OTP version of duration is ok - it is slightly more readable. .value(StringValue.of(DurationUtils.durationToStr(value.constant().asDuration()))) .build() ) diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index b5d1dc00a39..e73b074df3f 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -2035,7 +2035,7 @@ the default. We can express the RelaxCost as a function `f(t) = constant + ratio `f(t)=t` is the NORMAL function. """ input RelaxCostInput { - "The constant value to add to the limit. Must be a positive number. The value isequivalent to transit-cost-seconds. Integers is treated as seconds, but you may use the duration format. Example: '3665 = 'DT1h1m5s' = '1h1m5s'." + "The constant value to add to the limit. Must be a positive number. The value is equivalent to transit-cost-seconds. Integers are treated as seconds, but you may use the duration format. Example: '3665 = 'DT1h1m5s' = '1h1m5s'." constant: Cost = "0s" "The factor to multiply with the 'other cost'. Minimum value is 1.0." ratio: Float = 1.0 From cae4145d3b708426c40e96af8c56841c398cbba6 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Thu, 4 Jan 2024 20:14:49 +0200 Subject: [PATCH 0173/1688] Remove unnecessary edge selection --- .../module/islandpruning/PruneIslands.java | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java index 2ffecd3442f..9240a638496 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java @@ -339,17 +339,6 @@ private void collectNeighbourVertices( } State s0 = new State(gv, request); for (Edge e : gv.getOutgoing()) { - if ( - !( - e instanceof StreetEdge || - e instanceof ElevatorEdge || - e instanceof FreeEdge || - e instanceof StreetTransitEntityLink || - e instanceof EscalatorEdge - ) - ) { - continue; - } if ( e instanceof StreetEdge && shouldMatchNoThruType != ((StreetEdge) e).isNoThruTraffic(traverseMode) From a8086b14aad5a2dad7f10b37319a1b6d4f424890 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 4 Jan 2024 19:52:21 +0100 Subject: [PATCH 0174/1688] Cosmetic changes to island pruning tests --- .../module/islandpruning/PruneIslands.java | 4 ---- .../module/islandpruning/AdaptivePruningTest.java | 15 ++++++++------- .../islandpruning/EscalatorPruningTest.java | 8 +++----- .../islandpruning/PruneNoThruIslandsTest.java | 5 +++-- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java index 9240a638496..00404845349 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java @@ -25,11 +25,7 @@ import org.opentripplanner.street.model.edge.AreaEdge; import org.opentripplanner.street.model.edge.AreaEdgeList; import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.edge.ElevatorEdge; -import org.opentripplanner.street.model.edge.EscalatorEdge; -import org.opentripplanner.street.model.edge.FreeEdge; import org.opentripplanner.street.model.edge.StreetEdge; -import org.opentripplanner.street.model.edge.StreetTransitEntityLink; import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java index 9f7e4e8cf4a..90ffc33d848 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/AdaptivePruningTest.java @@ -1,5 +1,6 @@ package org.opentripplanner.graph_builder.module.islandpruning; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.graph_builder.module.islandpruning.IslandPruningUtils.buildOsmGraph; import java.util.stream.Collectors; @@ -9,12 +10,12 @@ import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; -/* Test data consists of one bigger graph and two small sub graphs. These are totally disconnected. - One small graphs is only at 5 meter distance from the big graph and another one 30 m away. - Adaptive pruning retains the distant island but removes the closer one which appears to be - disconnected part of the main graph. +/** + * Test data consists of one bigger graph and two small sub graphs. These are totally disconnected. + * One small graphs is only at 5 meter distance from the big graph and another one 30 m away. + * Adaptive pruning retains the distant island but removes the closer one which appears to be + * disconnected part of the main graph. */ - public class AdaptivePruningTest { private static Graph graph; @@ -33,7 +34,7 @@ static void setup() { @Test public void distantIslandIsRetained() { - Assertions.assertTrue( + assertTrue( graph .getStreetEdges() .stream() @@ -57,7 +58,7 @@ public void nearIslandIsRemoved() { @Test public void mainGraphIsNotRemoved() { - Assertions.assertTrue( + assertTrue( graph .getStreetEdges() .stream() diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java index ce1b5f78489..9d6a9b73c3c 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java @@ -1,20 +1,18 @@ package org.opentripplanner.graph_builder.module.islandpruning; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.graph_builder.module.islandpruning.IslandPruningUtils.buildOsmGraph; import java.util.stream.Collectors; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; public class EscalatorPruningTest { - private static Graph graph; @Test public void streetEdgesBetweenEscalatorEdgesRetained() { - graph = + var graph = buildOsmGraph( ResourceLoader.of(EscalatorPruningTest.class).file("matinkyla-escalator.pbf"), 10, @@ -22,7 +20,7 @@ public void streetEdgesBetweenEscalatorEdgesRetained() { 50, 250 ); - Assertions.assertTrue( + assertTrue( graph .getStreetEdges() .stream() diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java index 856b81bc385..9070fb00f8f 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/PruneNoThruIslandsTest.java @@ -1,5 +1,6 @@ package org.opentripplanner.graph_builder.module.islandpruning; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.graph_builder.module.islandpruning.IslandPruningUtils.buildOsmGraph; import java.util.Set; @@ -31,7 +32,7 @@ static void setup() { @Test public void bicycleIslandsBecomeNoThru() { - Assertions.assertTrue( + assertTrue( graph .getStreetEdges() .stream() @@ -44,7 +45,7 @@ public void bicycleIslandsBecomeNoThru() { @Test public void carIslandsBecomeNoThru() { - Assertions.assertTrue( + assertTrue( graph .getStreetEdges() .stream() From bb19842a0509b3539b33c58ccd9ef091334b734a Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Fri, 5 Jan 2024 08:46:23 +0200 Subject: [PATCH 0175/1688] Fix formatting --- .../islandpruning/EscalatorPruningTest.java | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java index 9d6a9b73c3c..540befb07e0 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/EscalatorPruningTest.java @@ -9,17 +9,15 @@ public class EscalatorPruningTest { - @Test public void streetEdgesBetweenEscalatorEdgesRetained() { - var graph = - buildOsmGraph( - ResourceLoader.of(EscalatorPruningTest.class).file("matinkyla-escalator.pbf"), - 10, - 2, - 50, - 250 - ); + var graph = buildOsmGraph( + ResourceLoader.of(EscalatorPruningTest.class).file("matinkyla-escalator.pbf"), + 10, + 2, + 50, + 250 + ); assertTrue( graph .getStreetEdges() From 7342f017a9d3f7e991697f115706cd96511e93af Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 5 Jan 2024 07:02:51 +0000 Subject: [PATCH 0176/1688] Add changelog entry for #5591 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 9f5c13de0e4..1d4e54da8d7 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -67,6 +67,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Transit priority - part 3 [#5583](https://github.com/opentripplanner/OpenTripPlanner/pull/5583) - Fix preference cost comparisons [#5586](https://github.com/opentripplanner/OpenTripPlanner/pull/5586) - Report and throw away trip-times which fail sanity check [#5587](https://github.com/opentripplanner/OpenTripPlanner/pull/5587) +- Consider escalator edges in island pruning [#5591](https://github.com/opentripplanner/OpenTripPlanner/pull/5591) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 97cf60c6ca5133bfc2fa49b8692509aca9e6f684 Mon Sep 17 00:00:00 2001 From: Lasse Tyrihjell Date: Fri, 5 Jan 2024 11:18:45 +0100 Subject: [PATCH 0177/1688] Adding javadoc --- .../opentripplanner/routing/alertpatch/TransitAlert.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java index 8f375be0490..d5d260a8218 100644 --- a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java +++ b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java @@ -121,6 +121,12 @@ public ZonedDateTime creationTime() { return creationTime; } + /** + * Note: Only supported for TransitAlerts created from SIRI-SX messages + * + * @return Version as provided, or null + */ + @Nullable public Integer version() { return version; } From 15ed36cb487c771710ccd9b7fcae4ed847485a04 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 14:25:45 +0100 Subject: [PATCH 0178/1688] doc: Fix JavaDoc in ItineraryListFilter --- .../routing/algorithm/filterchain/ItineraryListFilter.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilter.java index 883e6c48339..e18ee023b05 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilter.java @@ -8,11 +8,11 @@ * List. It should treat the list as immutable. Do not change the list passed into the filter, * instead　make a copy, change it and return the copy. It is allowed to return the list unchanged. *

- * A filter should do only one thing! For example do not change the itineraries and delete elements + * A filter should do only one thing! For example, do not change the itineraries and delete elements * in the same filter. Instead, create two filters and insert them after each other in the filter * chain. *

- * This allows decoration of each filter and make it easier to reuse logic. Like the {@link + * This allows decoration of each filter and makes it easier to reuse logic. Like the {@link * org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter} is reused in * several places. */ @@ -21,7 +21,7 @@ public interface ItineraryListFilter { * Process the given itineraries returning the result. *

* This function should not change the List instance passed in, but may change the elements. It - * must return a List with all the elements passed in (and possibly new elements). Note! that the + * must return a List with all the elements passed in (and possibly new elements). Note! The * list passed into the filter might be immutable. *

* This can be achieved using streams. Example: From 102cc45ae2b4f80d30d5fda85540c2a83aa5fe6c Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 14:31:46 +0100 Subject: [PATCH 0179/1688] refactor: Create an spi package in filterchain --- .../ext/accessibilityscore/AccessibilityScoreFilter.java | 2 +- .../org/opentripplanner/ext/emissions/EmissionsFilter.java | 2 +- src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java | 2 +- .../opentripplanner/ext/ridehailing/RideHailingFilter.java | 2 +- .../ext/stopconsolidation/ConsolidatedStopNameFilter.java | 2 +- .../algorithm/filterchain/ItineraryListFilterChain.java | 1 + .../filterchain/ItineraryListFilterChainBuilder.java | 1 + .../deletionflagger/RemoveItinerariesWithShortStreetLeg.java | 2 +- .../algorithm/filterchain/filter/DeletionFlaggingFilter.java | 2 +- .../routing/algorithm/filterchain/filter/GroupByFilter.java | 4 ++-- .../filter/RemoveDeletionFlagForLeastTransfersItinerary.java | 2 +- .../routing/algorithm/filterchain/filter/SortingFilter.java | 2 +- .../algorithm/filterchain/filter/TransitAlertFilter.java | 2 +- .../filterchain/groupids/GroupByAllSameStations.java | 1 + .../algorithm/filterchain/groupids/GroupByDistance.java | 1 + .../filterchain/groupids/GroupBySameFirstOrLastTrip.java | 1 + .../filterchain/groupids/GroupBySameRoutesAndStops.java | 1 + .../algorithm/filterchain/{groupids => spi}/GroupId.java | 2 +- .../algorithm/filterchain/{ => spi}/ItineraryListFilter.java | 2 +- .../algorithm/filterchain/filter/GroupByFilterTest.java | 2 +- 20 files changed, 21 insertions(+), 15 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{groupids => spi}/GroupId.java (98%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => spi}/ItineraryListFilter.java (95%) diff --git a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java b/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java index 46862b020d5..0ea16e6935f 100644 --- a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java +++ b/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java @@ -8,7 +8,7 @@ import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.WalkStep; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.WheelchairTraversalInformation; import org.opentripplanner.transit.model.basic.Accessibility; diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java b/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java index 19a27d248af..d565304b908 100644 --- a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java +++ b/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java @@ -10,7 +10,7 @@ import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.TransitLeg; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model.framework.FeedScopedId; diff --git a/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java b/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java index 8d344db8eb2..1831e58f5af 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java +++ b/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Objects; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.routing.fares.FareService; /** diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java index 730275d5952..6946e6d2ca8 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java @@ -7,7 +7,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.StreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java index c28d1de91b6..b360afaaa21 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java @@ -5,7 +5,7 @@ import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopLeg; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ScheduledTransitLeg; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; /** * A decorating filter that checks if a transit leg contains any primary stops and if it does, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java index 2d3a65e3bbd..0a6fe2db825 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.routing.api.response.RoutingError; public class ItineraryListFilterChain { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 872bad6b4ae..14c43ba39ca 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -43,6 +43,7 @@ import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByAllSameStations; import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByDistance; import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupBySameRoutesAndStops; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.services.TransitAlertService; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java index 2d45c46140b..0ab2e0114a8 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java @@ -3,7 +3,7 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.street.search.TraverseMode; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java index 43009b5012e..ad508df2b62 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java @@ -5,8 +5,8 @@ import java.util.stream.Collectors; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; /** * This class is responsible for flagging itineraries for deletion based on a predicate in the diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilter.java index 8084f4ced19..8db2ec945a1 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilter.java @@ -4,8 +4,8 @@ import java.util.List; import java.util.function.Function; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; -import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; /** * This filter groups the itineraries using a group-id and filter each group by the given {@code diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java index 42630fdf934..c44f13b0fc7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java @@ -7,7 +7,7 @@ import java.util.Set; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; /** * This filter makes sure that the itinerary with the least amount of transfers is not marked for diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilter.java index 3f1bae9049e..c2adcd56cb5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; /** * This is a filter to sort itineraries. To create a filter, provide a comparator as a constructor diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java index 06fb28716e6..bdcf035acd0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java @@ -4,7 +4,7 @@ import java.util.function.Function; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.routing.algorithm.mapping.AlertToLegMapper; import org.opentripplanner.routing.services.TransitAlertService; import org.opentripplanner.transit.model.site.MultiModalStation; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStations.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStations.java index f5199a597cb..6a47cabb109 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStations.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStations.java @@ -4,6 +4,7 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; import org.opentripplanner.transit.model.framework.FeedScopedId; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistance.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistance.java index bbc9b764d15..d71e52d5503 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistance.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistance.java @@ -7,6 +7,7 @@ import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.TransitLeg; +import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; /** * This class create a group identifier for an itinerary based on the longest legs which together diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTrip.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTrip.java index c8b942f1387..21ea75b7bf0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTrip.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTrip.java @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; import org.opentripplanner.transit.model.framework.FeedScopedId; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStops.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStops.java index 338ec98b1ff..9b147757de7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStops.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStops.java @@ -4,6 +4,7 @@ import java.util.stream.Stream; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; import org.opentripplanner.transit.model.framework.FeedScopedId; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupId.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/GroupId.java similarity index 98% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupId.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/GroupId.java index c83d3f4a9a7..eb5702ce5b5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupId.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/GroupId.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.spi; /** * A group-id identify a group of elements(itineraries). Group-ids can be arranged in a hierarchy diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryListFilter.java similarity index 95% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryListFilter.java index e18ee023b05..521a8120157 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryListFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain; +package org.opentripplanner.routing.algorithm.filterchain.spi; import java.util.List; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java index 447e9f0ab8e..d2e8c2b861b 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java @@ -11,7 +11,7 @@ import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter; -import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; public class GroupByFilterTest implements PlanTestConstants { From ea35203fa7c9b2e395414e227d6524c37b0fb7a9 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 14:33:46 +0100 Subject: [PATCH 0180/1688] refactor: Rename comparator to sort --- .../org/opentripplanner/model/plan/ItinerarySortKey.java | 2 +- .../filterchain/ItineraryListFilterChainBuilder.java | 4 ++-- .../algorithm/filterchain/deletionflagger/PagingFilter.java | 2 +- .../RemoveDeletionFlagForLeastTransfersItinerary.java | 2 +- .../{comparator => sort}/SortOnGeneralizedCost.java | 2 +- .../{comparator => sort}/SortOrderComparator.java | 2 +- .../filterchain/deletionflagger/PagingFilterTest.java | 2 +- .../algorithm/filterchain/filter/GroupByFilterTest.java | 2 +- .../algorithm/filterchain/filter/SortingFilterTest.java | 2 +- .../{comparator => sort}/SortOnGeneralizedCostTest.java | 4 ++-- .../{comparator => sort}/SortOnNumberOfTransfersTest.java | 4 ++-- .../{comparator => sort}/SortOrderComparatorTest.java | 6 +++--- .../org/opentripplanner/service/paging/TestPagingModel.java | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{comparator => sort}/SortOnGeneralizedCost.java (88%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{comparator => sort}/SortOrderComparator.java (98%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{comparator => sort}/SortOnGeneralizedCostTest.java (94%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{comparator => sort}/SortOnNumberOfTransfersTest.java (91%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{comparator => sort}/SortOrderComparatorTest.java (96%) diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java index b9165270444..1ddbf6b9f95 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java @@ -2,8 +2,8 @@ import java.time.Instant; import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; -import org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.filter.SortingFilter; +import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; /** * This interface is used to sort itineraries and other instances that we might want to sort among diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 14c43ba39ca..b156b3d3699 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.filterchain; -import static org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator.generalizedCostComparator; +import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.generalizedCostComparator; import java.time.Duration; import java.time.Instant; @@ -18,7 +18,6 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; -import org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.ItineraryDeletionFlagger; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NonTransitGeneralizedCostFilter; @@ -43,6 +42,7 @@ import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByAllSameStations; import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByDistance; import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupBySameRoutesAndStops; +import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java index 893a239b46b..0677fadd2a2 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java @@ -7,7 +7,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; -import org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; /** * This class is used to enforce the cut/limit between two pages. It removes potential duplicates diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java index c44f13b0fc7..44339b62ca9 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.filterchain.filter; -import static org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator.numberOfTransfersComparator; +import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.numberOfTransfersComparator; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCost.java similarity index 88% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnGeneralizedCost.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCost.java index 364f9fddfff..a434e764d27 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCost.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.comparator; +package org.opentripplanner.routing.algorithm.filterchain.sort; import org.opentripplanner.framework.collection.CompositeComparator; import org.opentripplanner.model.plan.ItinerarySortKey; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOrderComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparator.java similarity index 98% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOrderComparator.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparator.java index e52e53ab1c7..d4702949892 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOrderComparator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparator.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.comparator; +package org.opentripplanner.routing.algorithm.filterchain.sort; import static java.util.Comparator.comparing; import static java.util.Comparator.comparingInt; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java index 965889bdefc..c53e856e095 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java @@ -19,7 +19,7 @@ import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.SortOrder; -import org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; import org.opentripplanner.transit.model._data.TransitModelForTest; public class PagingFilterTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java index d2e8c2b861b..086c4dacc76 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java @@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter; +import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; public class GroupByFilterTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java index 1d5f12aba98..f587c6e1df1 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator.generalizedCostComparator; +import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.generalizedCostComparator; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnGeneralizedCostTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCostTest.java similarity index 94% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnGeneralizedCostTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCostTest.java index ac5ec5128c4..71913a0e7d3 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnGeneralizedCostTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCostTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.routing.algorithm.filterchain.comparator; +package org.opentripplanner.routing.algorithm.filterchain.sort; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator.generalizedCostComparator; +import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.generalizedCostComparator; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnNumberOfTransfersTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnNumberOfTransfersTest.java similarity index 91% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnNumberOfTransfersTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnNumberOfTransfersTest.java index 8a91c918c4b..942199110c3 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOnNumberOfTransfersTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnNumberOfTransfersTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.routing.algorithm.filterchain.comparator; +package org.opentripplanner.routing.algorithm.filterchain.sort; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator.numberOfTransfersComparator; +import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.numberOfTransfersComparator; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOrderComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparatorTest.java similarity index 96% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOrderComparatorTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparatorTest.java index d69bc119c76..e6014c80ea0 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/comparator/SortOrderComparatorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparatorTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.routing.algorithm.filterchain.comparator; +package org.opentripplanner.routing.algorithm.filterchain.sort; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator.defaultComparatorArriveBy; -import static org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator.defaultComparatorDepartAfter; +import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.defaultComparatorArriveBy; +import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.defaultComparatorDepartAfter; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java b/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java index f47e3444264..b97ff6a4fc9 100644 --- a/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java +++ b/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java @@ -13,7 +13,7 @@ import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.TestItineraryBuilder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; -import org.opentripplanner.routing.algorithm.filterchain.comparator.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; import org.opentripplanner.transit.model._data.TransitModelForTest; class TestPagingModel { From 0189d5fe4edb976bf389bdb67c64eec36d6dc9c4 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 14:37:23 +0100 Subject: [PATCH 0181/1688] refactor: Move ItineraryDeletionFlagger to spi --- .../filterchain/ItineraryListFilterChainBuilder.java | 2 +- .../filterchain/deletionflagger/MaxLimitFilter.java | 1 + .../deletionflagger/NonTransitGeneralizedCostFilter.java | 1 + .../filterchain/deletionflagger/NumItinerariesFilter.java | 1 + .../OtherThanSameLegsMaxGeneralizedCostFilter.java | 1 + .../deletionflagger/OutsideSearchWindowFilter.java | 1 + .../algorithm/filterchain/deletionflagger/PagingFilter.java | 1 + .../RemoveBikerentalWithMostlyWalkingFilter.java | 1 + .../RemoveParkAndRideWithMostlyWalkingFilter.java | 1 + .../RemoveTransitIfStreetOnlyIsBetterFilter.java | 4 +--- .../RemoveTransitIfWalkingIsBetterFilter.java | 6 +----- .../filterchain/deletionflagger/RemoveWalkOnlyFilter.java | 1 + .../deletionflagger/TransitGeneralizedCostFilter.java | 1 + .../filterchain/filter/DeletionFlaggingFilter.java | 2 +- .../filterchain/filter/SameFirstOrLastTripFilter.java | 2 +- .../{deletionflagger => spi}/ItineraryDeletionFlagger.java | 2 +- .../RemoveTransitIfStreetOnlyIsBetterFilterTest.java | 1 + 17 files changed, 17 insertions(+), 12 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => spi}/ItineraryDeletionFlagger.java (96%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index b156b3d3699..9694ca95783 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -18,7 +18,6 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.ItineraryDeletionFlagger; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NonTransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilter; @@ -43,6 +42,7 @@ import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByDistance; import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupBySameRoutesAndStops; import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java index 3a9d1422d34..5ff084a9db7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java @@ -2,6 +2,7 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * Flags the itineraries at the end of the list for removal. The list should be sorted on the diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java index da46b99f203..80802d0d95d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java index b939dd8ca68..484328aeb88 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java @@ -4,6 +4,7 @@ import java.util.function.Consumer; import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * Flag all itineraries after the provided limit. This flags the itineraries at the end of the list diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java index b8ed8e90de2..a4353184126 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java @@ -8,6 +8,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.filter.GroupByFilter; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.transit.model.timetable.Trip; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java index dc189efbc33..24382fc75cc 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java @@ -4,6 +4,7 @@ import java.time.Instant; import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * This filter will remove all itineraries that are outside the search-window. In some diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java index 0677fadd2a2..3b2ac845efa 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java @@ -8,6 +8,7 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * This class is used to enforce the cut/limit between two pages. It removes potential duplicates diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java index 74ce88bc379..3aa599ddf43 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java @@ -3,6 +3,7 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * This is used to filter out bike rental itineraries that contain mostly walking. The value diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java index ad8c08ce7ec..bde47ee43a5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java @@ -5,6 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.StreetLeg; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.street.search.TraverseMode; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java index 08307c16ade..70f05a1de98 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java @@ -1,13 +1,11 @@ package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; -import java.util.Comparator; import java.util.List; -import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.stream.Collectors; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java index 4b645e45a79..6895b94c419 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java @@ -1,14 +1,10 @@ package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; -import java.util.Comparator; import java.util.List; -import java.util.OptionalDouble; import java.util.OptionalInt; import java.util.stream.Collectors; -import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.api.request.framework.CostLinearFunction; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * Filter itineraries which have a higher generalized-cost than a pure walk itinerary. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java index abac48563f8..792f4a55f1d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java @@ -2,6 +2,7 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * Filter itineraries and remove all itineraries where all legs are walking. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java index f296ca0f7c1..d000467a08c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java @@ -7,6 +7,7 @@ import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java index ad508df2b62..304d7d14c4a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java index a556530cb36..bf875f6055b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java @@ -3,8 +3,8 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.ItineraryDeletionFlagger; import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupBySameFirstOrLastTrip; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; /** * This filter ensures that no more than one itinerary begins or ends with same trip. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/ItineraryDeletionFlagger.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryDeletionFlagger.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/ItineraryDeletionFlagger.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryDeletionFlagger.java index c6db9c14cf6..a51e9faeb49 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/ItineraryDeletionFlagger.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryDeletionFlagger.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.spi; import java.util.ArrayList; import java.util.List; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java index 9cbba961e71..3ea6b6d9016 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; +import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; public class RemoveTransitIfStreetOnlyIsBetterFilterTest implements PlanTestConstants { From 79214a6ca1478d824a62b2396a53c92238d4cdb2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 15:22:28 +0100 Subject: [PATCH 0182/1688] Take isFinal() into account when counting stops --- .../java/org/opentripplanner/astar/model/BinHeap.java | 6 ++++-- .../opentripplanner/astar/model/ShortestPathTree.java | 4 ---- .../astar/strategy/MaxCountSkipEdgeStrategy.java | 10 +++++----- .../graph_builder/module/NearbyStopFinder.java | 8 ++++---- .../street/search/StreetSearchBuilder.java | 3 +-- .../strategy/EuclideanRemainingWeightHeuristic.java | 1 - 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/opentripplanner/astar/model/BinHeap.java b/src/main/java/org/opentripplanner/astar/model/BinHeap.java index 9bc2b0762a8..f1c39f12b61 100644 --- a/src/main/java/org/opentripplanner/astar/model/BinHeap.java +++ b/src/main/java/org/opentripplanner/astar/model/BinHeap.java @@ -1,6 +1,7 @@ package org.opentripplanner.astar.model; import java.util.Arrays; +import org.opentripplanner.framework.tostring.ToStringBuilder; public class BinHeap { @@ -136,7 +137,8 @@ public void resize(int capacity) { elem = Arrays.copyOf(elem, capacity + 1); } - public int getCapacity() { - return capacity; + @Override + public String toString() { + return ToStringBuilder.of().addNum("size", size).toString(); } } diff --git a/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java b/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java index e373f9c785e..a6d7123cdfe 100644 --- a/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java +++ b/src/main/java/org/opentripplanner/astar/model/ShortestPathTree.java @@ -244,10 +244,6 @@ public void setAborted() { aborted = true; } - public boolean isAborted() { - return aborted; - } - public String toString() { return "ShortestPathTree(" + this.stateSets.size() + " vertices)"; } diff --git a/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java b/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java index bcae9dcdb86..f719ed371ac 100644 --- a/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java +++ b/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java @@ -1,12 +1,12 @@ package org.opentripplanner.astar.strategy; -import java.util.function.Function; +import java.util.function.Predicate; import org.opentripplanner.astar.spi.AStarEdge; import org.opentripplanner.astar.spi.AStarState; import org.opentripplanner.astar.spi.SkipEdgeStrategy; /** - * Skips edges when the specified number of desired vertices have been visited + * Skips edges when the specified number of desired vertices have been visited. */ public class MaxCountSkipEdgeStrategy< State extends AStarState, Edge extends AStarEdge @@ -14,11 +14,11 @@ public class MaxCountSkipEdgeStrategy< implements SkipEdgeStrategy { private final int maxCount; - private final Function shouldIncreaseCount; + private final Predicate shouldIncreaseCount; private int visited; - public MaxCountSkipEdgeStrategy(int count, Function shouldIncreaseCount) { + public MaxCountSkipEdgeStrategy(int count, Predicate shouldIncreaseCount) { this.maxCount = count; this.shouldIncreaseCount = shouldIncreaseCount; this.visited = 0; @@ -26,7 +26,7 @@ public MaxCountSkipEdgeStrategy(int count, Function shouldIncrea @Override public boolean shouldSkipEdge(State current, Edge edge) { - if (this.shouldIncreaseCount.apply(current)) { + if (current.isFinal() && shouldIncreaseCount.test(current)) { visited++; } return visited > maxCount; diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index ba776ac5243..4caa04d7892 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -227,15 +227,15 @@ public List findNearbyStopsViaStreets( for (State state : spt.getAllStates()) { Vertex targetVertex = state.getVertex(); if (originVertices.contains(targetVertex)) continue; - if (targetVertex instanceof TransitStopVertex && state.isFinal()) { + if (targetVertex instanceof TransitStopVertex tsv && state.isFinal()) { stopsFound.add( - NearbyStop.nearbyStopForState(state, ((TransitStopVertex) targetVertex).getStop()) + NearbyStop.nearbyStopForState(state, tsv.getStop()) ); } if ( OTPFeature.FlexRouting.isOn() && - targetVertex instanceof StreetVertex && - !((StreetVertex) targetVertex).areaStops().isEmpty() + targetVertex instanceof StreetVertex streetVertex && + !streetVertex.areaStops().isEmpty() ) { for (AreaStop areaStop : ((StreetVertex) targetVertex).areaStops()) { // This is for a simplification, so that we only return one vertex from each diff --git a/src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java b/src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java index b4ac98674d0..079cd29706f 100644 --- a/src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java +++ b/src/main/java/org/opentripplanner/street/search/StreetSearchBuilder.java @@ -102,7 +102,7 @@ protected void prepareInitialStates(Collection initialStates) { @Override protected void initializeHeuristic( RemainingWeightHeuristic heuristic, - Set origin, + Set ignored, Set destination, boolean arriveBy ) { @@ -111,7 +111,6 @@ protected void initializeHeuristic( } else if (heuristic instanceof EuclideanRemainingWeightHeuristic euclideanHeuristic) { euclideanHeuristic.initialize( streetRequest.mode(), - origin, destination, arriveBy, routeRequest.preferences() diff --git a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java index 36e4a57f8ec..e43278901d4 100644 --- a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java +++ b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java @@ -26,7 +26,6 @@ public class EuclideanRemainingWeightHeuristic implements RemainingWeightHeurist // not work correctly. public void initialize( StreetMode streetMode, - Set fromVertices, Set toVertices, boolean arriveBy, RoutingPreferences preferences From 12381a542c196b12479960da9d3c46f113e954ee Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 14:43:06 +0100 Subject: [PATCH 0183/1688] refactor: Organize framework package --- .../AccessibilityScoreFilter.java | 2 +- .../ext/emissions/EmissionsFilter.java | 2 +- .../ext/fares/FaresFilter.java | 2 +- .../ext/ridehailing/RideHailingFilter.java | 2 +- .../ConsolidatedStopNameFilter.java | 2 +- .../model/plan/ItinerarySortKey.java | 4 ++-- .../filterchain/ItineraryListFilterChain.java | 2 +- .../ItineraryListFilterChainBuilder.java | 20 +++++++++---------- .../deletionflagger/MaxLimitFilter.java | 2 +- .../NonTransitGeneralizedCostFilter.java | 2 +- .../deletionflagger/NumItinerariesFilter.java | 2 +- ...rThanSameLegsMaxGeneralizedCostFilter.java | 4 ++-- .../OutsideSearchWindowFilter.java | 2 +- .../deletionflagger/PagingFilter.java | 4 ++-- ...moveBikerentalWithMostlyWalkingFilter.java | 2 +- .../RemoveItinerariesWithShortStreetLeg.java | 2 +- ...oveParkAndRideWithMostlyWalkingFilter.java | 2 +- ...moveTransitIfStreetOnlyIsBetterFilter.java | 2 +- .../RemoveTransitIfWalkingIsBetterFilter.java | 2 +- .../deletionflagger/RemoveWalkOnlyFilter.java | 2 +- .../TransitGeneralizedCostFilter.java | 2 +- ...eletionFlagForLeastTransfersItinerary.java | 4 ++-- .../filter/SameFirstOrLastTripFilter.java | 6 +++--- .../filter/TransitAlertFilter.java | 2 +- .../filter/DeletionFlaggingFilter.java | 6 +++--- .../{ => framework}/filter/GroupByFilter.java | 6 +++--- .../{ => framework}/filter/SortingFilter.java | 4 ++-- .../groupids/GroupByAllSameStations.java | 4 ++-- .../groupids/GroupByDistance.java | 4 ++-- .../groupids/GroupBySameFirstOrLastTrip.java | 4 ++-- .../groupids/GroupBySameRoutesAndStops.java | 4 ++-- .../sort/SortOnGeneralizedCost.java | 2 +- .../sort/SortOrderComparator.java | 2 +- .../{ => framework}/spi/GroupId.java | 2 +- .../spi/ItineraryDeletionFlagger.java | 2 +- .../spi/ItineraryListFilter.java | 2 +- .../deletionflagger/PagingFilterTest.java | 2 +- ...TransitIfStreetOnlyIsBetterFilterTest.java | 2 +- .../filterchain/filter/GroupByFilterTest.java | 7 +++++-- .../filterchain/filter/SortingFilterTest.java | 3 ++- .../groupids/GroupByAllSameStationsTest.java | 2 +- .../groupids/GroupByDistanceTest.java | 6 +++--- .../GroupBySameFirstOrLastTripTest.java | 2 +- .../GroupBySameRoutesAndStopsTest.java | 2 +- .../sort/SortOnGeneralizedCostTest.java | 4 ++-- .../sort/SortOnNumberOfTransfersTest.java | 4 ++-- .../sort/SortOrderComparatorTest.java | 6 +++--- .../service/paging/TestPagingModel.java | 2 +- 48 files changed, 83 insertions(+), 79 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/filter/DeletionFlaggingFilter.java (84%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/filter/GroupByFilter.java (90%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/filter/SortingFilter.java (84%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupByAllSameStations.java (91%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupByDistance.java (97%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupBySameFirstOrLastTrip.java (92%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupBySameRoutesAndStops.java (90%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/sort/SortOnGeneralizedCost.java (87%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/sort/SortOrderComparator.java (97%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/spi/GroupId.java (98%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/spi/ItineraryDeletionFlagger.java (97%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/spi/ItineraryListFilter.java (94%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupByAllSameStationsTest.java (97%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupByDistanceTest.java (97%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupBySameFirstOrLastTripTest.java (98%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/groupids/GroupBySameRoutesAndStopsTest.java (97%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/sort/SortOnGeneralizedCostTest.java (94%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/sort/SortOnNumberOfTransfersTest.java (90%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/sort/SortOrderComparatorTest.java (96%) diff --git a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java b/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java index 0ea16e6935f..b0ced6e00c5 100644 --- a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java +++ b/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java @@ -8,7 +8,7 @@ import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.WalkStep; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.WheelchairTraversalInformation; import org.opentripplanner.transit.model.basic.Accessibility; diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java b/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java index d565304b908..2186339a4e6 100644 --- a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java +++ b/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java @@ -10,7 +10,7 @@ import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.TransitLeg; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model.framework.FeedScopedId; diff --git a/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java b/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java index 1831e58f5af..cc3a956ef16 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java +++ b/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.Objects; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.routing.fares.FareService; /** diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java index 6946e6d2ca8..bbaa707a00b 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java @@ -7,7 +7,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.StreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java index b360afaaa21..6165732e122 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java @@ -5,7 +5,7 @@ import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopLeg; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ScheduledTransitLeg; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; /** * A decorating filter that checks if a transit leg contains any primary stops and if it does, diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java index 1ddbf6b9f95..9c4879b0184 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java @@ -2,8 +2,8 @@ import java.time.Instant; import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; -import org.opentripplanner.routing.algorithm.filterchain.filter.SortingFilter; -import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; /** * This interface is used to sort itineraries and other instances that we might want to sort among diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java index 0a6fe2db825..4f07d5377b9 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java @@ -3,7 +3,7 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.routing.api.response.RoutingError; public class ItineraryListFilterChain { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 9694ca95783..f1fc7335e2d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -1,6 +1,6 @@ package org.opentripplanner.routing.algorithm.filterchain; -import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.generalizedCostComparator; +import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.generalizedCostComparator; import java.time.Duration; import java.time.Instant; @@ -32,18 +32,18 @@ import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfWalkingIsBetterFilter; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveWalkOnlyFilter; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.TransitGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.filter.DeletionFlaggingFilter; -import org.opentripplanner.routing.algorithm.filterchain.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.filter.RemoveDeletionFlagForLeastTransfersItinerary; import org.opentripplanner.routing.algorithm.filterchain.filter.SameFirstOrLastTripFilter; -import org.opentripplanner.routing.algorithm.filterchain.filter.SortingFilter; import org.opentripplanner.routing.algorithm.filterchain.filter.TransitAlertFilter; -import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByAllSameStations; -import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByDistance; -import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupBySameRoutesAndStops; -import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DeletionFlaggingFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByAllSameStations; +import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByDistance; +import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupBySameRoutesAndStops; +import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.services.TransitAlertService; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java index 5ff084a9db7..f5c36cab82f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java @@ -2,7 +2,7 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * Flags the itineraries at the end of the list for removal. The list should be sorted on the diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java index 80802d0d95d..5f7326088ed 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java index 484328aeb88..5234ed4d408 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java @@ -4,7 +4,7 @@ import java.util.function.Consumer; import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * Flag all itineraries after the provided limit. This flags the itineraries at the end of the list diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java index a4353184126..ad89e8b023a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java @@ -7,8 +7,8 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.filter.GroupByFilter; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.transit.model.timetable.Trip; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java index 24382fc75cc..ebca3f523eb 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java @@ -4,7 +4,7 @@ import java.time.Instant; import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * This filter will remove all itineraries that are outside the search-window. In some diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java index 3b2ac845efa..f7bb96b88ca 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java @@ -7,8 +7,8 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; -import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * This class is used to enforce the cut/limit between two pages. It removes potential duplicates diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java index 3aa599ddf43..d9ae1586f53 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java @@ -3,7 +3,7 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * This is used to filter out bike rental itineraries that contain mostly walking. The value diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java index 0ab2e0114a8..dc392fc3c1c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java @@ -3,7 +3,7 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.street.search.TraverseMode; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java index bde47ee43a5..4516d02cc77 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.StreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.street.search.TraverseMode; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java index 70f05a1de98..c39b20339b1 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java index 6895b94c419..4dabbcabe64 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java @@ -4,7 +4,7 @@ import java.util.OptionalInt; import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * Filter itineraries which have a higher generalized-cost than a pure walk itinerary. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java index 792f4a55f1d..411ed6f754e 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java @@ -2,7 +2,7 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * Filter itineraries and remove all itineraries where all legs are walking. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java index d000467a08c..55f8e4c5f0c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java @@ -7,7 +7,7 @@ import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java index 44339b62ca9..8ffd9986708 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java @@ -1,13 +1,13 @@ package org.opentripplanner.routing.algorithm.filterchain.filter; -import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.numberOfTransfersComparator; +import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.numberOfTransfersComparator; import java.util.HashSet; import java.util.List; import java.util.Set; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; /** * This filter makes sure that the itinerary with the least amount of transfers is not marked for diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java index bf875f6055b..4365131bc8c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java @@ -3,14 +3,14 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.groupids.GroupBySameFirstOrLastTrip; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupBySameFirstOrLastTrip; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; /** * This filter ensures that no more than one itinerary begins or ends with same trip. * It loops through itineraries from top to bottom. If itinerary matches with any other itinerary * from above, it is removed from list. - * Uses {@link org.opentripplanner.routing.algorithm.filterchain.groupids.GroupBySameFirstOrLastTrip}. + * Uses {@link GroupBySameFirstOrLastTrip}. * for matching itineraries. */ public class SameFirstOrLastTripFilter implements ItineraryDeletionFlagger { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java index bdcf035acd0..c50f7c17957 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java @@ -4,7 +4,7 @@ import java.util.function.Function; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.routing.algorithm.mapping.AlertToLegMapper; import org.opentripplanner.routing.services.TransitAlertService; import org.opentripplanner.transit.model.site.MultiModalStation; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DeletionFlaggingFilter.java similarity index 84% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DeletionFlaggingFilter.java index 304d7d14c4a..c3b0fd66c45 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/DeletionFlaggingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DeletionFlaggingFilter.java @@ -1,12 +1,12 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; import java.util.List; import java.util.function.Predicate; import java.util.stream.Collectors; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; /** * This class is responsible for flagging itineraries for deletion based on a predicate in the diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilter.java similarity index 90% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilter.java index 8db2ec945a1..73f84625750 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilter.java @@ -1,11 +1,11 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; import java.util.ArrayList; import java.util.List; import java.util.function.Function; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; /** * This filter groups the itineraries using a group-id and filter each group by the given {@code diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilter.java similarity index 84% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilter.java index c2adcd56cb5..0b2664ccf26 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilter.java @@ -1,11 +1,11 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; import java.util.Comparator; import java.util.List; import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; /** * This is a filter to sort itineraries. To create a filter, provide a comparator as a constructor diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStations.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java similarity index 91% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStations.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java index 6a47cabb109..83a5e15c802 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStations.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStations.java @@ -1,10 +1,10 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import java.util.List; import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; import org.opentripplanner.transit.model.framework.FeedScopedId; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistance.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java similarity index 97% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistance.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java index d71e52d5503..7ab605fb792 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistance.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import java.util.Comparator; import java.util.List; @@ -7,7 +7,7 @@ import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.TransitLeg; -import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; /** * This class create a group identifier for an itinerary based on the longest legs which together diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTrip.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java similarity index 92% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTrip.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java index 21ea75b7bf0..cd8c776ef66 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTrip.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTrip.java @@ -1,11 +1,11 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; import org.opentripplanner.transit.model.framework.FeedScopedId; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStops.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java similarity index 90% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStops.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java index 9b147757de7..ac95ae87db7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStops.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStops.java @@ -1,10 +1,10 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import java.util.List; import java.util.stream.Stream; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; import org.opentripplanner.transit.model.framework.FeedScopedId; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCost.java similarity index 87% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCost.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCost.java index a434e764d27..10c10362c46 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCost.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.sort; +package org.opentripplanner.routing.algorithm.filterchain.framework.sort; import org.opentripplanner.framework.collection.CompositeComparator; import org.opentripplanner.model.plan.ItinerarySortKey; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java similarity index 97% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparator.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java index d4702949892..475309eeae4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.sort; +package org.opentripplanner.routing.algorithm.filterchain.framework.sort; import static java.util.Comparator.comparing; import static java.util.Comparator.comparingInt; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/GroupId.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/GroupId.java similarity index 98% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/GroupId.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/GroupId.java index eb5702ce5b5..cb2b72f93ee 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/GroupId.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/GroupId.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.spi; +package org.opentripplanner.routing.algorithm.filterchain.framework.spi; /** * A group-id identify a group of elements(itineraries). Group-ids can be arranged in a hierarchy diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryDeletionFlagger.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDeletionFlagger.java similarity index 97% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryDeletionFlagger.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDeletionFlagger.java index a51e9faeb49..ba33971988f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryDeletionFlagger.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDeletionFlagger.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.spi; +package org.opentripplanner.routing.algorithm.filterchain.framework.spi; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryListFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java similarity index 94% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryListFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java index 521a8120157..99366cee4d1 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/spi/ItineraryListFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.spi; +package org.opentripplanner.routing.algorithm.filterchain.framework.spi; import java.util.List; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java index c53e856e095..1829e5c7802 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java @@ -19,7 +19,7 @@ import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.SortOrder; -import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.transit.model._data.TransitModelForTest; public class PagingFilterTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java index 3ea6b6d9016..a44462b0a93 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; public class RemoveTransitIfStreetOnlyIsBetterFilterTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java index 086c4dacc76..a79edeb3a4f 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java @@ -10,8 +10,11 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter; -import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; -import org.opentripplanner.routing.algorithm.filterchain.spi.GroupId; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DeletionFlaggingFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; public class GroupByFilterTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java index f587c6e1df1..550b85d92a8 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java @@ -3,12 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.generalizedCostComparator; +import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.generalizedCostComparator; import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; public class SortingFilterTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStationsTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStationsTest.java similarity index 97% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStationsTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStationsTest.java index 280fe43f3c8..692f3a61ca7 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByAllSameStationsTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByAllSameStationsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistanceTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java similarity index 97% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistanceTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java index 76d3b34fb5d..cc17305af6d 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupByDistanceTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistanceTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -6,8 +6,8 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByDistance.calculateTotalDistance; -import static org.opentripplanner.routing.algorithm.filterchain.groupids.GroupByDistance.createKeySetOfLegsByLimit; +import static org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByDistance.calculateTotalDistance; +import static org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByDistance.createKeySetOfLegsByLimit; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTripTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTripTest.java similarity index 98% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTripTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTripTest.java index 6e19fff5bbc..436c1568852 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameFirstOrLastTripTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameFirstOrLastTripTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStopsTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStopsTest.java similarity index 97% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStopsTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStopsTest.java index ea9b9c5d38b..26d3ca1d04b 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/groupids/GroupBySameRoutesAndStopsTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupBySameRoutesAndStopsTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.groupids; +package org.opentripplanner.routing.algorithm.filterchain.framework.groupids; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCostTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCostTest.java similarity index 94% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCostTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCostTest.java index 71913a0e7d3..c0e53de3381 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnGeneralizedCostTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCostTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.routing.algorithm.filterchain.sort; +package org.opentripplanner.routing.algorithm.filterchain.framework.sort; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.generalizedCostComparator; +import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.generalizedCostComparator; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnNumberOfTransfersTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnNumberOfTransfersTest.java similarity index 90% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnNumberOfTransfersTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnNumberOfTransfersTest.java index 942199110c3..40b7550b1a0 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOnNumberOfTransfersTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnNumberOfTransfersTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.routing.algorithm.filterchain.sort; +package org.opentripplanner.routing.algorithm.filterchain.framework.sort; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.numberOfTransfersComparator; +import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.numberOfTransfersComparator; import java.util.List; import java.util.stream.Collectors; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparatorTest.java similarity index 96% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparatorTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparatorTest.java index e6014c80ea0..c96ddede578 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/sort/SortOrderComparatorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparatorTest.java @@ -1,9 +1,9 @@ -package org.opentripplanner.routing.algorithm.filterchain.sort; +package org.opentripplanner.routing.algorithm.filterchain.framework.sort; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.defaultComparatorArriveBy; -import static org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator.defaultComparatorDepartAfter; +import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.defaultComparatorArriveBy; +import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.defaultComparatorDepartAfter; import java.util.Arrays; import java.util.List; diff --git a/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java b/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java index b97ff6a4fc9..938a201576f 100644 --- a/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java +++ b/src/test/java/org/opentripplanner/service/paging/TestPagingModel.java @@ -13,7 +13,7 @@ import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.TestItineraryBuilder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; -import org.opentripplanner.routing.algorithm.filterchain.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.transit.model._data.TransitModelForTest; class TestPagingModel { From 530e5d41bd4821ed8ee2ba33d42aa5e499e5e303 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 14:46:14 +0100 Subject: [PATCH 0184/1688] refactor: Rename deletionflagger package to filters --- .../routing/algorithm/RoutingWorker.java | 2 +- .../filterchain/DeleteResultHandler.java | 2 +- .../ItineraryListFilterChainBuilder.java | 28 +++++++++---------- .../filterchain/RoutingErrorsAttacher.java | 6 ++-- .../TransitGeneralizedCostFilterParams.java | 2 +- .../MaxLimitFilter.java | 2 +- .../NonTransitGeneralizedCostFilter.java | 2 +- .../NumItinerariesFilter.java | 2 +- .../NumItinerariesFilterResults.java | 2 +- ...rThanSameLegsMaxGeneralizedCostFilter.java | 2 +- .../OutsideSearchWindowFilter.java | 2 +- .../PagingFilter.java | 2 +- ...moveBikerentalWithMostlyWalkingFilter.java | 2 +- .../RemoveItinerariesWithShortStreetLeg.java | 2 +- ...oveParkAndRideWithMostlyWalkingFilter.java | 2 +- ...moveTransitIfStreetOnlyIsBetterFilter.java | 2 +- .../RemoveTransitIfWalkingIsBetterFilter.java | 2 +- .../RemoveWalkOnlyFilter.java | 2 +- .../TransitGeneralizedCostFilter.java | 2 +- .../framework/spi/ItineraryListFilter.java | 2 +- .../mapping/PagingServiceFactory.java | 2 +- .../RouteRequestToFilterChainMapper.java | 2 +- .../service/paging/PagingService.java | 2 +- .../filterchain/DeleteResultHandlerTest.java | 4 +-- .../RoutingErrorsAttacherTest.java | 2 +- .../filterchain/filter/GroupByFilterTest.java | 2 +- .../MaxLimitFilterTest.java | 2 +- .../NumItinerariesFilterTest.java | 2 +- ...nSameLegsMaxGeneralizedCostFilterTest.java | 2 +- .../OutsideSearchWindowFilterTest.java | 2 +- .../PagingFilterTest.java | 2 +- ...RemoveBikeRentalWithMostlyWalkingTest.java | 2 +- ...moveItinerariesWithShortStreetLegTest.java | 2 +- ...emoveParkAndRideWithMostlyWalkingTest.java | 2 +- ...TransitIfStreetOnlyIsBetterFilterTest.java | 2 +- .../RemoveTransitIfWalkingIsBetterTest.java | 2 +- .../RemoveWalkOnlyFilterTest.java | 2 +- .../TransitGeneralizedCostFilterTest.java | 2 +- .../service/paging/TestDriver.java | 8 +++--- 39 files changed, 58 insertions(+), 58 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/MaxLimitFilter.java (91%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/NonTransitGeneralizedCostFilter.java (96%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/NumItinerariesFilter.java (96%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/NumItinerariesFilterResults.java (97%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/OtherThanSameLegsMaxGeneralizedCostFilter.java (97%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/OutsideSearchWindowFilter.java (96%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/PagingFilter.java (96%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveBikerentalWithMostlyWalkingFilter.java (95%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveItinerariesWithShortStreetLeg.java (95%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveParkAndRideWithMostlyWalkingFilter.java (96%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveTransitIfStreetOnlyIsBetterFilter.java (96%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveTransitIfWalkingIsBetterFilter.java (94%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveWalkOnlyFilter.java (87%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/TransitGeneralizedCostFilter.java (96%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/MaxLimitFilterTest.java (95%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/NumItinerariesFilterTest.java (97%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/OtherThanSameLegsMaxGeneralizedCostFilterTest.java (91%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/OutsideSearchWindowFilterTest.java (97%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/PagingFilterTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveBikeRentalWithMostlyWalkingTest.java (95%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveItinerariesWithShortStreetLegTest.java (96%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveParkAndRideWithMostlyWalkingTest.java (95%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveTransitIfStreetOnlyIsBetterFilterTest.java (96%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveTransitIfWalkingIsBetterTest.java (95%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/RemoveWalkOnlyFilterTest.java (95%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{deletionflagger => filters}/TransitGeneralizedCostFilterTest.java (98%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java index ad2c4c92639..bb688f27be9 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java @@ -19,7 +19,7 @@ import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.api.request.SearchParams; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilterResults; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.algorithm.mapping.PagingServiceFactory; import org.opentripplanner.routing.algorithm.mapping.RouteRequestToFilterChainMapper; import org.opentripplanner.routing.algorithm.mapping.RoutingResponseMapper; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandler.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandler.java index c09af943564..2bd26c6b7d4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandler.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandler.java @@ -4,7 +4,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index f1fc7335e2d..6d197bf1169 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -18,23 +18,23 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NonTransitGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilterResults; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.OtherThanSameLegsMaxGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.OutsideSearchWindowFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.PagingFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveBikerentalWithMostlyWalkingFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveItinerariesWithShortStreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveParkAndRideWithMostlyWalkingFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfStreetOnlyIsBetterFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfWalkingIsBetterFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveWalkOnlyFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.filter.RemoveDeletionFlagForLeastTransfersItinerary; import org.opentripplanner.routing.algorithm.filterchain.filter.SameFirstOrLastTripFilter; import org.opentripplanner.routing.algorithm.filterchain.filter.TransitAlertFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.NonTransitGeneralizedCostFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; +import org.opentripplanner.routing.algorithm.filterchain.filters.OtherThanSameLegsMaxGeneralizedCostFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.PagingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveBikerentalWithMostlyWalkingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveItinerariesWithShortStreetLeg; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveParkAndRideWithMostlyWalkingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfWalkingIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveWalkOnlyFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DeletionFlaggingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacher.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacher.java index 63191fdb88e..532868019eb 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacher.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacher.java @@ -9,9 +9,9 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.StreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.OutsideSearchWindowFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfStreetOnlyIsBetterFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfWalkingIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfWalkingIsBetterFilter; import org.opentripplanner.routing.api.response.RoutingError; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java index 5a460e6fa82..eb4085c5c0c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.filterchain.api; import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.TransitGeneralizedCostFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java similarity index 91% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java index f5c36cab82f..f77512f54f4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java index 5f7326088ed..56f094386b3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NonTransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import java.util.OptionalInt; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java index 5234ed4d408..89f82962f32 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import java.util.function.Consumer; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilterResults.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterResults.java similarity index 97% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilterResults.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterResults.java index 7226c19535b..04c8fcc039c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilterResults.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterResults.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.time.Instant; import java.util.List; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java similarity index 97% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java index ad89e8b023a..4b316f9802a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import java.util.OptionalInt; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java index ebca3f523eb..374bc33164c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.time.Duration; import java.time.Instant; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java index f7bb96b88ca..2c4f79d45e5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java similarity index 95% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java index d9ae1586f53..9293c4d4072 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikerentalWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLeg.java similarity index 95% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLeg.java index dc392fc3c1c..5223704bbea 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLeg.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java index 4516d02cc77..c5ba7ff8c2d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java index c39b20339b1..e3d90c24a83 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import java.util.OptionalInt; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java similarity index 94% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java index 4dabbcabe64..7062957e500 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import java.util.OptionalInt; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java similarity index 87% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java index 411ed6f754e..a1a01dfc159 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java index 55f8e4c5f0c..9e8a79004d7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.time.temporal.ChronoUnit; import java.util.Comparator; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java index 99366cee4d1..7821779fabf 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java @@ -13,7 +13,7 @@ * chain. *

* This allows decoration of each filter and makes it easier to reuse logic. Like the {@link - * org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter} is reused in + * org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter} is reused in * several places. */ public interface ItineraryListFilter { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java index 8b122e6cf24..3e3ebc2967c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java @@ -6,7 +6,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.api.request.SearchParams; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilterResults; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitTuningParameters; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.service.paging.PagingService; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java index b379480bc33..76f9146f522 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java @@ -12,7 +12,7 @@ import org.opentripplanner.routing.algorithm.filterchain.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChainBuilder; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilterResults; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; diff --git a/src/main/java/org/opentripplanner/service/paging/PagingService.java b/src/main/java/org/opentripplanner/service/paging/PagingService.java index e8f09acf4d4..2734049e940 100644 --- a/src/main/java/org/opentripplanner/service/paging/PagingService.java +++ b/src/main/java/org/opentripplanner/service/paging/PagingService.java @@ -12,7 +12,7 @@ import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.model.plan.paging.cursor.PageCursorFactory; import org.opentripplanner.model.plan.paging.cursor.PageType; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilterResults; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.api.response.TripSearchMetadata; public class PagingService { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandlerTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandlerTest.java index beca0632114..32bcae2b86f 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandlerTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandlerTest.java @@ -21,8 +21,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; class DeleteResultHandlerTest { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java index 238604a66ad..eace7bc5cd9 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java @@ -8,7 +8,7 @@ import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfStreetOnlyIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; import org.opentripplanner.routing.api.response.RoutingErrorCode; class RoutingErrorsAttacherTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java index a79edeb3a4f..87cd29167c1 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.MaxLimitFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DeletionFlaggingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilterTest.java similarity index 95% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilterTest.java index b4418de6c68..86814b4fc27 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/MaxLimitFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java similarity index 97% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java index 879edd784b0..9ef7da991ff 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/NumItinerariesFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilterTest.java similarity index 91% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilterTest.java index e955b0ae04e..0bb2265c8a5 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OtherThanSameLegsMaxGeneralizedCostFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilterTest.java similarity index 97% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilterTest.java index 207210092b7..2ce7bbccf8c 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/OutsideSearchWindowFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilterTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilterTest.java index 1829e5c7802..82df57ee7a6 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/PagingFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.framework.collection.ListUtils.first; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikeRentalWithMostlyWalkingTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikeRentalWithMostlyWalkingTest.java similarity index 95% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikeRentalWithMostlyWalkingTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikeRentalWithMostlyWalkingTest.java index 5fe2bce098b..58cecb82810 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveBikeRentalWithMostlyWalkingTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikeRentalWithMostlyWalkingTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.opentripplanner.model.plan.TestItineraryBuilder.A; import static org.opentripplanner.model.plan.TestItineraryBuilder.B; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLegTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLegTest.java similarity index 96% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLegTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLegTest.java index 9b6df6bb1aa..72d88ec2469 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveItinerariesWithShortStreetLegTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLegTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingTest.java similarity index 95% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingTest.java index 2c65f882473..8fdfb3c6de6 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveParkAndRideWithMostlyWalkingTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.opentripplanner.model.plan.TestItineraryBuilder.A; import static org.opentripplanner.model.plan.TestItineraryBuilder.B; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java similarity index 96% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java index a44462b0a93..bb881bdc07d 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfStreetOnlyIsBetterFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterTest.java similarity index 95% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterTest.java index 9b008993ba3..af2e5a68965 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveTransitIfWalkingIsBetterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilterTest.java similarity index 95% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilterTest.java index 62029ca389f..2ede3ccac10 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/RemoveWalkOnlyFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.A; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilterTest.java similarity index 98% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilterTest.java index 37faa5f2feb..f55b0c8d0b3 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/deletionflagger/TransitGeneralizedCostFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.deletionflagger; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; diff --git a/src/test/java/org/opentripplanner/service/paging/TestDriver.java b/src/test/java/org/opentripplanner/service/paging/TestDriver.java index 0b40b140139..70e47f31a75 100644 --- a/src/test/java/org/opentripplanner/service/paging/TestDriver.java +++ b/src/test/java/org/opentripplanner/service/paging/TestDriver.java @@ -11,10 +11,10 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NumItinerariesFilterResults; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.OutsideSearchWindowFilter; -import org.opentripplanner.routing.algorithm.filterchain.deletionflagger.PagingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; +import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.PagingFilter; /** * This class simulate/mock the context the paging is operating in. From b8a0f0ab3015734cd4d89ed832737419f5375d51 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 14:57:35 +0100 Subject: [PATCH 0185/1688] refactor: Use remove consistent, not delete --- .../filterchain/ItineraryListFilterChain.java | 1 + .../ItineraryListFilterChainBuilder.java | 13 +++++++------ .../filterchain/{ => api}/GroupBySimilarity.java | 3 ++- .../filter/SameFirstOrLastTripFilter.java | 4 ++-- .../filterchain/filters/MaxLimitFilter.java | 4 ++-- .../filters/NonTransitGeneralizedCostFilter.java | 4 ++-- .../filterchain/filters/NumItinerariesFilter.java | 4 ++-- .../OtherThanSameLegsMaxGeneralizedCostFilter.java | 4 ++-- .../filters/OutsideSearchWindowFilter.java | 4 ++-- .../algorithm/filterchain/filters/PagingFilter.java | 4 ++-- .../RemoveBikerentalWithMostlyWalkingFilter.java | 4 ++-- .../RemoveParkAndRideWithMostlyWalkingFilter.java | 4 ++-- .../RemoveTransitIfStreetOnlyIsBetterFilter.java | 4 ++-- .../RemoveTransitIfWalkingIsBetterFilter.java | 4 ++-- .../filterchain/filters/RemoveWalkOnlyFilter.java | 4 ++-- .../filters/TransitGeneralizedCostFilter.java | 4 ++-- .../errorhandling}/RoutingErrorsAttacher.java | 6 +++--- ...eletionFlaggingFilter.java => RemoveFilter.java} | 8 ++++---- ...tionFlagger.java => RemoveItineraryFlagger.java} | 4 ++-- .../mapping/RouteRequestToFilterChainMapper.java | 2 +- .../filterchain/ItineraryListFilterChainTest.java | 1 + .../filterchain/RoutingErrorsAttacherTest.java | 1 + .../filterchain/filter/GroupByFilterTest.java | 8 +++----- ...RemoveTransitIfStreetOnlyIsBetterFilterTest.java | 6 +++--- 24 files changed, 54 insertions(+), 51 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => api}/GroupBySimilarity.java (96%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework/errorhandling}/RoutingErrorsAttacher.java (95%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/{DeletionFlaggingFilter.java => RemoveFilter.java} (86%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/{ItineraryDeletionFlagger.java => RemoveItineraryFlagger.java} (94%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java index 4f07d5377b9..744e7b80906 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.framework.errorhandling.RoutingErrorsAttacher; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.routing.api.response.RoutingError; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 6d197bf1169..3ee85669381 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -17,6 +17,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; +import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.algorithm.filterchain.filter.RemoveDeletionFlagForLeastTransfersItinerary; import org.opentripplanner.routing.algorithm.filterchain.filter.SameFirstOrLastTripFilter; @@ -35,15 +36,15 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfWalkingIsBetterFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveWalkOnlyFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DeletionFlaggingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByAllSameStations; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByDistance; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupBySameRoutesAndStops; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.services.TransitAlertService; @@ -516,7 +517,7 @@ private List buildGroupBySameRoutesAndStopsFilter() { GroupBySameRoutesAndStops::new, List.of( new SortingFilter(SortOrderComparator.comparator(sortOrder)), - new DeletionFlaggingFilter(new MaxLimitFilter(GroupBySameRoutesAndStops.TAG, 1)) + new RemoveFilter(new MaxLimitFilter(GroupBySameRoutesAndStops.TAG, 1)) ) ) ); @@ -560,7 +561,7 @@ private List buildGroupByTripIdAndDistanceFilters() { GroupByAllSameStations::new, List.of( new SortingFilter(generalizedCostComparator()), - new DeletionFlaggingFilter(new MaxLimitFilter(innerGroupName, 1)) + new RemoveFilter(new MaxLimitFilter(innerGroupName, 1)) ) ) ); @@ -592,8 +593,8 @@ private ListSection deduplicateSection() { private static void addRmFilter( List filters, - ItineraryDeletionFlagger removeFilter + RemoveItineraryFlagger removeFilter ) { - filters.add(new DeletionFlaggingFilter(removeFilter)); + filters.add(new RemoveFilter(removeFilter)); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/GroupBySimilarity.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java similarity index 96% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/GroupBySimilarity.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java index e98587d9f3f..0f671524a06 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/GroupBySimilarity.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/GroupBySimilarity.java @@ -1,6 +1,7 @@ -package org.opentripplanner.routing.algorithm.filterchain; +package org.opentripplanner.routing.algorithm.filterchain.api; import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChainBuilder; /** * Group itineraries by similarity and reduce the number of itineraries down to an given maximum diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java index 4365131bc8c..3d0f550eb0b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java @@ -4,7 +4,7 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupBySameFirstOrLastTrip; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * This filter ensures that no more than one itinerary begins or ends with same trip. @@ -13,7 +13,7 @@ * Uses {@link GroupBySameFirstOrLastTrip}. * for matching itineraries. */ -public class SameFirstOrLastTripFilter implements ItineraryDeletionFlagger { +public class SameFirstOrLastTripFilter implements RemoveItineraryFlagger { @Override public String name() { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java index f77512f54f4..b8c7991f30f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java @@ -2,13 +2,13 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * Flags the itineraries at the end of the list for removal. The list should be sorted on the * desired key before this filter is applied. */ -public class MaxLimitFilter implements ItineraryDeletionFlagger { +public class MaxLimitFilter implements RemoveItineraryFlagger { private final String name; private final int maxLimit; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java index 56f094386b3..f7aad5f2b59 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; @@ -20,7 +20,7 @@ * * @see ItineraryFilterPreferences#nonTransitGeneralizedCostLimit() */ -public class NonTransitGeneralizedCostFilter implements ItineraryDeletionFlagger { +public class NonTransitGeneralizedCostFilter implements RemoveItineraryFlagger { private final CostLinearFunction costLimitFunction; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java index 89f82962f32..1aa942afa19 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java @@ -4,7 +4,7 @@ import java.util.function.Consumer; import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * Flag all itineraries after the provided limit. This flags the itineraries at the end of the list @@ -12,7 +12,7 @@ *

* This filter reports information about the removed itineraries in the results consumer. */ -public class NumItinerariesFilter implements ItineraryDeletionFlagger { +public class NumItinerariesFilter implements RemoveItineraryFlagger { public static final String TAG = "number-of-itineraries-filter"; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java index 4b316f9802a..74a395379c8 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java @@ -8,7 +8,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.transit.model.timetable.Trip; /** @@ -17,7 +17,7 @@ * TransitGeneralizedCostFilter}, but is used together with {@link GroupByFilter} to filter within * the groups. */ -public class OtherThanSameLegsMaxGeneralizedCostFilter implements ItineraryDeletionFlagger { +public class OtherThanSameLegsMaxGeneralizedCostFilter implements RemoveItineraryFlagger { /** * How much higher cost do we allow for the non-shared legs before we filter out the itinerary. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java index 374bc33164c..bbaba7be22e 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java @@ -4,7 +4,7 @@ import java.time.Instant; import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * This filter will remove all itineraries that are outside the search-window. In some @@ -15,7 +15,7 @@ * Itineraries matching the start(earliest-departure-time) are included and itineraries matching * the end(latest-departure-time) are not. The filter is {@code [inclusive, exclusive]}. */ -public class OutsideSearchWindowFilter implements ItineraryDeletionFlagger { +public class OutsideSearchWindowFilter implements RemoveItineraryFlagger { public static final String TAG = "outside-search-window"; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java index 2c4f79d45e5..1e9813735ef 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java @@ -8,7 +8,7 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * This class is used to enforce the cut/limit between two pages. It removes potential duplicates @@ -20,7 +20,7 @@ * potential duplicates will appear at the bottom of the list. If the previous results were cropped * at the bottom, then the potential duplicates will appear at the top of the list. */ -public class PagingFilter implements ItineraryDeletionFlagger { +public class PagingFilter implements RemoveItineraryFlagger { public static final String TAG = "paging-filter"; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java index 9293c4d4072..370d9d57984 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java @@ -3,7 +3,7 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * This is used to filter out bike rental itineraries that contain mostly walking. The value @@ -12,7 +12,7 @@ *

* This filter is turned off by default (bikeRentalDistanceRatio == 0) */ -public class RemoveBikerentalWithMostlyWalkingFilter implements ItineraryDeletionFlagger { +public class RemoveBikerentalWithMostlyWalkingFilter implements RemoveItineraryFlagger { private final double bikeRentalDistanceRatio; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java index c5ba7ff8c2d..1c14de7686b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.StreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.street.search.TraverseMode; /** @@ -15,7 +15,7 @@ *

* This filter is turned off by default (parkAndRideDurationRatio == 0) */ -public class RemoveParkAndRideWithMostlyWalkingFilter implements ItineraryDeletionFlagger { +public class RemoveParkAndRideWithMostlyWalkingFilter implements RemoveItineraryFlagger { private final double parkAndRideDurationRatio; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java index e3d90c24a83..84a6f4e75b3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java @@ -5,7 +5,7 @@ import java.util.stream.Collectors; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** @@ -13,7 +13,7 @@ * it exist). If an itinerary cost exceeds the limit computed from the best all-the-way-on-street itinerary, then the * transit itinerary is removed. */ -public class RemoveTransitIfStreetOnlyIsBetterFilter implements ItineraryDeletionFlagger { +public class RemoveTransitIfStreetOnlyIsBetterFilter implements RemoveItineraryFlagger { private final CostLinearFunction costLimitFunction; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java index 7062957e500..f57d065e35a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java @@ -4,12 +4,12 @@ import java.util.OptionalInt; import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * Filter itineraries which have a higher generalized-cost than a pure walk itinerary. */ -public class RemoveTransitIfWalkingIsBetterFilter implements ItineraryDeletionFlagger { +public class RemoveTransitIfWalkingIsBetterFilter implements RemoveItineraryFlagger { /** * Required for {@link org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain}, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java index a1a01dfc159..3ec64f4b731 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java @@ -2,12 +2,12 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * Filter itineraries and remove all itineraries where all legs are walking. */ -public class RemoveWalkOnlyFilter implements ItineraryDeletionFlagger { +public class RemoveWalkOnlyFilter implements RemoveItineraryFlagger { @Override public String name() { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java index 9e8a79004d7..b3e6fb1c01d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java @@ -7,7 +7,7 @@ import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** @@ -15,7 +15,7 @@ * computed by the {@link #costLimitFunction} plus the wait cost given by * {@link TransitGeneralizedCostFilter#getWaitTimeCost}. */ -public class TransitGeneralizedCostFilter implements ItineraryDeletionFlagger { +public class TransitGeneralizedCostFilter implements RemoveItineraryFlagger { private final CostLinearFunction costLimitFunction; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacher.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/errorhandling/RoutingErrorsAttacher.java similarity index 95% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacher.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/errorhandling/RoutingErrorsAttacher.java index 532868019eb..c95ad4e9ff1 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacher.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/errorhandling/RoutingErrorsAttacher.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain; +package org.opentripplanner.routing.algorithm.filterchain.framework.errorhandling; import static org.opentripplanner.routing.api.response.InputField.DATE_TIME; import static org.opentripplanner.routing.api.response.RoutingErrorCode.NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW; @@ -18,7 +18,7 @@ * Computes {@link org.opentripplanner.routing.api.response.RoutingError} instances from itinerary * before and after they have been through the filter chain. */ -class RoutingErrorsAttacher { +public class RoutingErrorsAttacher { /** * Computes error codes from the itineraries. @@ -28,7 +28,7 @@ class RoutingErrorsAttacher { * have the {@link org.opentripplanner.model.SystemNotice}s to look up * the error from. */ - static List computeErrors( + public static List computeErrors( List originalItineraries, List filteredItineraries ) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DeletionFlaggingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java similarity index 86% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DeletionFlaggingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java index c3b0fd66c45..b53edf05a79 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DeletionFlaggingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java @@ -5,19 +5,19 @@ import java.util.stream.Collectors; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** * This class is responsible for flagging itineraries for deletion based on a predicate in the * supplied ItineraryDeletionFlagger. The itineraries are not actually deleted at this point, just * flagged. They are typically deleted later if debug mode is disabled. */ -public class DeletionFlaggingFilter implements ItineraryListFilter { +public class RemoveFilter implements ItineraryListFilter { - private final ItineraryDeletionFlagger flagger; + private final RemoveItineraryFlagger flagger; - public DeletionFlaggingFilter(ItineraryDeletionFlagger flagger) { + public RemoveFilter(RemoveItineraryFlagger flagger) { this.flagger = flagger; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDeletionFlagger.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/RemoveItineraryFlagger.java similarity index 94% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDeletionFlagger.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/RemoveItineraryFlagger.java index ba33971988f..4918f440d1f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDeletionFlagger.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/RemoveItineraryFlagger.java @@ -16,7 +16,7 @@ *

  • {@link #flagForRemoval(List)}}) - If you need more than one itinerary to decide which to delete.
    • * */ -public interface ItineraryDeletionFlagger { +public interface RemoveItineraryFlagger { /** * A name used for debugging the itinerary list filter chain. *

    @@ -47,7 +47,7 @@ default List flagForRemoval(List itineraries) { /** * Should itineraries already marked for deletion by previous deletionflagger be removed from the - * list passed to {@link ItineraryDeletionFlagger#flagForRemoval(List)}. The default value + * list passed to {@link RemoveItineraryFlagger#flagForRemoval(List)}. The default value * is true, as usually the already removed itineraries are not needed further in the filter * chain. */ diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java index 76f9146f522..1a2469de595 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java @@ -9,9 +9,9 @@ import org.opentripplanner.ext.ridehailing.RideHailingFilter; import org.opentripplanner.ext.stopconsolidation.ConsolidatedStopNameFilter; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.routing.algorithm.filterchain.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChainBuilder; +import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java index 1ce1aec36bd..0591ae7ce4e 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java @@ -30,6 +30,7 @@ import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.TestItineraryBuilder; import org.opentripplanner.routing.alertpatch.StopCondition; +import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.response.RoutingError; import org.opentripplanner.routing.api.response.RoutingErrorCode; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java index eace7bc5cd9..215d04aef67 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java @@ -9,6 +9,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.errorhandling.RoutingErrorsAttacher; import org.opentripplanner.routing.api.response.RoutingErrorCode; class RoutingErrorsAttacherTest implements PlanTestConstants { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java index 87cd29167c1..8b6fea0e029 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java @@ -10,8 +10,8 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DeletionFlaggingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; @@ -41,7 +41,7 @@ public void aSimpleTestGroupByMatchingTripIdsNoMerge() { assertFalse(i2a.isFlaggedForDeletion()); assertTrue(i2b.isFlaggedForDeletion()); - // Remove an none existing set of tags + // Remove a none existing set of tags i2b.removeDeletionFlags(Set.of("ANY_TAG")); assertTrue(i2b.isFlaggedForDeletion()); @@ -101,9 +101,7 @@ private GroupByFilter createFilter(int maxNumberOfItinerariesPrGroup) i -> new AGroupId(i.firstLeg().getTrip().getId().getId()), List.of( new SortingFilter(SortOrderComparator.defaultComparatorDepartAfter()), - new DeletionFlaggingFilter( - new MaxLimitFilter(TEST_FILTER_TAG, maxNumberOfItinerariesPrGroup) - ) + new RemoveFilter(new MaxLimitFilter(TEST_FILTER_TAG, maxNumberOfItinerariesPrGroup)) ) ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java index bb881bdc07d..1541afc623b 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDeletionFlagger; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; public class RemoveTransitIfStreetOnlyIsBetterFilterTest implements PlanTestConstants { @@ -21,7 +21,7 @@ public void filterAwayNothingIfNoWalking() { Itinerary i2 = newItinerary(A).rail(110, 6, 9, E).build(); // When: - ItineraryDeletionFlagger flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( + RemoveItineraryFlagger flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( CostLinearFunction.of(Duration.ofSeconds(200), 1.2) ); List result = flagger.removeMatchesForTest(List.of(i1, i2)); @@ -49,7 +49,7 @@ public void filterAwayLongTravelTimeWithoutWaitTime() { i2.setGeneralizedCost(360); // When: - ItineraryDeletionFlagger flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( + RemoveItineraryFlagger flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( CostLinearFunction.of(Duration.ofSeconds(60), 1.2) ); List result = flagger.removeMatchesForTest(List.of(i2, bicycle, walk, i1)); From 07158aff74ff58b9a2a5fb276a760095e36aeb65 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 15:03:22 +0100 Subject: [PATCH 0186/1688] refactor: Move filter-chain supporting classes to framework.filterchain package --- .../algorithm/filterchain/ItineraryListFilterChain.java | 3 ++- .../filterchain/ItineraryListFilterChainBuilder.java | 1 + .../{ => framework/filterchain}/DeleteResultHandler.java | 4 ++-- .../{errorhandling => filterchain}/RoutingErrorsAttacher.java | 2 +- .../{ => framework/filterchain}/DeleteResultHandlerTest.java | 2 +- .../filterchain}/RoutingErrorsAttacherTest.java | 3 +-- 6 files changed, 8 insertions(+), 7 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework/filterchain}/DeleteResultHandler.java (91%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/{errorhandling => filterchain}/RoutingErrorsAttacher.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework/filterchain}/DeleteResultHandlerTest.java (98%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework/filterchain}/RoutingErrorsAttacherTest.java (91%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java index 744e7b80906..cbea827e52b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.java @@ -3,7 +3,8 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.errorhandling.RoutingErrorsAttacher; +import org.opentripplanner.routing.algorithm.filterchain.framework.filterchain.DeleteResultHandler; +import org.opentripplanner.routing.algorithm.filterchain.framework.filterchain.RoutingErrorsAttacher; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.routing.api.response.RoutingError; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 3ee85669381..1a7ff032e20 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -39,6 +39,7 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filterchain.DeleteResultHandler; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByAllSameStations; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByDistance; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupBySameRoutesAndStops; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandler.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java similarity index 91% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandler.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java index 2bd26c6b7d4..089bf44ccd1 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandler.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain; +package org.opentripplanner.routing.algorithm.filterchain.framework.filterchain; import java.util.List; import java.util.function.Predicate; @@ -11,7 +11,7 @@ * This class will remove itineraries from the list which are flagged for deletion by the * filters. */ -class DeleteResultHandler { +public class DeleteResultHandler { private final ItineraryFilterDebugProfile debug; private final int numOfItineraries; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/errorhandling/RoutingErrorsAttacher.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/errorhandling/RoutingErrorsAttacher.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java index c95ad4e9ff1..0ae541e739a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/errorhandling/RoutingErrorsAttacher.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.framework.errorhandling; +package org.opentripplanner.routing.algorithm.filterchain.framework.filterchain; import static org.opentripplanner.routing.api.response.InputField.DATE_TIME; import static org.opentripplanner.routing.api.response.RoutingErrorCode.NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandlerTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java similarity index 98% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandlerTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java index 32bcae2b86f..bea81f773aa 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/DeleteResultHandlerTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain; +package org.opentripplanner.routing.algorithm.filterchain.framework.filterchain; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.PlanTestConstants.A; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java similarity index 91% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java index 215d04aef67..0330aca3683 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/RoutingErrorsAttacherTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain; +package org.opentripplanner.routing.algorithm.filterchain.framework.filterchain; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; @@ -9,7 +9,6 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.errorhandling.RoutingErrorsAttacher; import org.opentripplanner.routing.api.response.RoutingErrorCode; class RoutingErrorsAttacherTest implements PlanTestConstants { From 0c9aef580cc13bd037094a994956518bc0abe4dc Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 15:05:15 +0100 Subject: [PATCH 0187/1688] refactor: Move images into images package --- .../{ => images}/ItineraryListFilterChain.excalidraw | 0 .../filterchain/{ => images}/ItineraryListFilterChain.svg | 0 .../opentripplanner/routing/algorithm/filterchain/package.md | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => images}/ItineraryListFilterChain.excalidraw (100%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{ => images}/ItineraryListFilterChain.svg (100%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.excalidraw b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw similarity index 100% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.excalidraw rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.svg b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg similarity index 100% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChain.svg rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md index 7630f96b2df..7441e5f0849 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md @@ -7,7 +7,7 @@ chain is also responsible for creating routing errors, if no itineraries remain Itineraries are flagged for deletion, but not actually deleted when debugging is turned on. When debugging is off, the chain actually removes those itineraries that were flagged for deletion. -![Architecture diagram](ItineraryListFilterChain.svg) +![Architecture diagram](images/ItineraryListFilterChain.svg) There are four types of filters, which can be included in the filter chain. The same type of filter can appear multiple times. From d10e52c3c647181e6591b5193dda2de93f03c6e9 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 15:33:45 +0100 Subject: [PATCH 0188/1688] refactor: Fix dependency, set to: filterchain -> pagecursor --- .../routing/algorithm/RoutingWorker.java | 8 +++---- .../ItineraryListFilterChainBuilder.java | 23 ++++++++---------- .../filters/NumItinerariesFilter.java | 15 ++++++------ .../mapping/PagingServiceFactory.java | 6 ++--- .../RouteRequestToFilterChainMapper.java | 6 ++--- .../service/paging/PagingService.java | 24 ++++++++----------- .../filters/NumItinerariesFilterTest.java | 3 ++- .../service/paging/TestDriver.java | 10 ++++---- 8 files changed, 44 insertions(+), 51 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java index bb688f27be9..06ceaeebeb2 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java @@ -16,10 +16,10 @@ import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.api.request.SearchParams; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.algorithm.mapping.PagingServiceFactory; import org.opentripplanner.routing.algorithm.mapping.RouteRequestToFilterChainMapper; import org.opentripplanner.routing.algorithm.mapping.RoutingResponseMapper; @@ -65,7 +65,7 @@ public class RoutingWorker { private final ZonedDateTime transitSearchTimeZero; private final AdditionalSearchDays additionalSearchDays; private SearchParams raptorSearchParamsUsed = null; - private NumItinerariesFilterResults numItinerariesFilterResults = null; + private PageCursorInput pageCursorInput = null; public RoutingWorker(OtpServerRequestContext serverContext, RouteRequest request, ZoneId zoneId) { request.applyPageCursor(); @@ -137,7 +137,7 @@ public RoutingResponse route() { searchWindowUsed(), emptyDirectModeHandler.removeWalkAllTheWayResults() || removeWalkAllTheWayResultsFromDirectFlex, - it -> numItinerariesFilterResults = it + it -> pageCursorInput = it ); filteredItineraries = filterChain.filter(itineraries); @@ -283,7 +283,7 @@ private PagingService createPagingService(List itineraries) { serverContext.raptorTuningParameters(), request, raptorSearchParamsUsed, - numItinerariesFilterResults, + pageCursorInput, itineraries ); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 1a7ff032e20..305531c3f67 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -17,6 +17,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.algorithm.filterchain.filter.RemoveDeletionFlagForLeastTransfersItinerary; @@ -25,7 +26,6 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.NonTransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.algorithm.filterchain.filters.OtherThanSameLegsMaxGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.PagingFilter; @@ -72,7 +72,7 @@ public class ItineraryListFilterChainBuilder { private double bikeRentalDistanceRatio; private double parkAndRideDurationRatio; private CostLinearFunction nonTransitGeneralizedCostLimit; - private Consumer numItinerariesFilterResultsConsumer; + private Consumer pageCursorInputSubscriber; private Instant earliestDepartureTime = null; private Duration searchWindow = null; private boolean accessibilityScore; @@ -264,18 +264,15 @@ public ItineraryListFilterChainBuilder withSearchWindow( } /** - * If the maximum number of itineraries is exceeded, then the excess itineraries are removed. To - * get notified about this a consumer can be added. The 'maxLimit' check is the last thing - * happening in the filter-chain after the final sort. So, if another filter removes an itinerary, - * the itinerary is not considered with respect to the {@link #withMaxNumberOfItineraries(int)} - * limit. - * - * @param numItinerariesFilterResultsConsumer the consumer to notify when elements are removed. + * If the maximum number of itineraries is exceeded, then the excess itineraries are removed. + * The paging service needs this information to adjust the paging cursor. The 'maxLimit' check is + * the last thing* happening in the filter-chain after the final sort. So, if another filter + * removes an itinerary, the itinerary is not considered with respect to this limit. */ - public ItineraryListFilterChainBuilder withNumItinerariesFilterResultsConsumer( - Consumer numItinerariesFilterResultsConsumer + public ItineraryListFilterChainBuilder withPageCursorInputSubscriber( + Consumer pageCursorInputSubscriber ) { - this.numItinerariesFilterResultsConsumer = numItinerariesFilterResultsConsumer; + this.pageCursorInputSubscriber = pageCursorInputSubscriber; return this; } @@ -469,7 +466,7 @@ public ItineraryListFilterChain build() { new NumItinerariesFilter( maxNumberOfItineraries, maxNumberOfItinerariesCropSection, - numItinerariesFilterResultsConsumer + pageCursorInputSubscriber ) ); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java index 1aa942afa19..570071308cd 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java @@ -4,6 +4,7 @@ import java.util.function.Consumer; import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** @@ -16,23 +17,21 @@ public class NumItinerariesFilter implements RemoveItineraryFlagger { public static final String TAG = "number-of-itineraries-filter"; - private static final Consumer IGNORE_SUBSCRIBER = i -> {}; + private static final Consumer IGNORE_SUBSCRIBER = i -> {}; private final int maxLimit; private final ListSection cropSection; - private final Consumer numItinerariesFilterResultsConsumer; + private final Consumer pageCursorInputSubscriber; public NumItinerariesFilter( int maxLimit, ListSection cropSection, - Consumer numItinerariesFilterResultsConsumer + Consumer pageCursorInputSubscriber ) { this.maxLimit = maxLimit; this.cropSection = cropSection; - this.numItinerariesFilterResultsConsumer = - numItinerariesFilterResultsConsumer == null - ? IGNORE_SUBSCRIBER - : numItinerariesFilterResultsConsumer; + this.pageCursorInputSubscriber = + pageCursorInputSubscriber == null ? IGNORE_SUBSCRIBER : pageCursorInputSubscriber; } @Override @@ -59,7 +58,7 @@ public List flagForRemoval(List itineraries) { itinerariesToKeep = itineraries.subList(0, maxLimit); } - numItinerariesFilterResultsConsumer.accept( + pageCursorInputSubscriber.accept( new NumItinerariesFilterResults(itinerariesToKeep, itinerariesToRemove, cropSection) ); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java index 3e3ebc2967c..ec58d444914 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/PagingServiceFactory.java @@ -4,9 +4,9 @@ import java.time.Instant; import java.util.List; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.api.request.SearchParams; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitTuningParameters; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.service.paging.PagingService; @@ -19,7 +19,7 @@ public static PagingService createPagingService( RaptorTuningParameters raptorTuningParameters, RouteRequest request, SearchParams raptorSearchParamsUsed, - NumItinerariesFilterResults numItinerariesFilterResults, + PageCursorInput pageCursorInput, List itineraries ) { return new PagingService( @@ -33,7 +33,7 @@ public static PagingService createPagingService( request.arriveBy(), request.numItineraries(), request.pageCursor(), - numItinerariesFilterResults, + pageCursorInput, itineraries ); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java index 1a2469de595..2f1c531e102 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java @@ -9,10 +9,10 @@ import org.opentripplanner.ext.ridehailing.RideHailingFilter; import org.opentripplanner.ext.stopconsolidation.ConsolidatedStopNameFilter; import org.opentripplanner.framework.application.OTPFeature; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChainBuilder; import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; @@ -32,7 +32,7 @@ public static ItineraryListFilterChain createFilterChain( Instant earliestDepartureTimeUsed, Duration searchWindowUsed, boolean removeWalkAllTheWayResults, - Consumer maxLimitFilterResultsSubscriber + Consumer pageCursorInputSubscriber ) { var builder = new ItineraryListFilterChainBuilder(request.itinerariesSortOrder()); @@ -89,7 +89,7 @@ public static ItineraryListFilterChain createFilterChain( context.transitService()::getMultiModalStationForStation ) .withSearchWindow(earliestDepartureTimeUsed, searchWindowUsed) - .withNumItinerariesFilterResultsConsumer(maxLimitFilterResultsSubscriber) + .withPageCursorInputSubscriber(pageCursorInputSubscriber) .withRemoveWalkAllTheWayResults(removeWalkAllTheWayResults) .withRemoveTransitIfWalkingIsBetter(true) .withDebugEnabled(params.debug()); diff --git a/src/main/java/org/opentripplanner/service/paging/PagingService.java b/src/main/java/org/opentripplanner/service/paging/PagingService.java index 2734049e940..3aa8033105a 100644 --- a/src/main/java/org/opentripplanner/service/paging/PagingService.java +++ b/src/main/java/org/opentripplanner/service/paging/PagingService.java @@ -11,8 +11,8 @@ import org.opentripplanner.model.plan.paging.PagingSearchWindowAdjuster; import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.model.plan.paging.cursor.PageCursorFactory; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.model.plan.paging.cursor.PageType; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.api.response.TripSearchMetadata; public class PagingService { @@ -24,7 +24,7 @@ public class PagingService { private final boolean arriveBy; private final int numberOfItineraries; private final PageCursor pageCursor; - private final NumItinerariesFilterResults numItinerariesFilterResults; + private final PageCursorInput pageCursorInput; private final PagingSearchWindowAdjuster searchWindowAdjuster; private final List itineraries; @@ -42,7 +42,7 @@ public PagingService( boolean arriveBy, int numberOfItineraries, @Nullable PageCursor pageCursor, - NumItinerariesFilterResults numItinerariesFilterResults, + PageCursorInput pageCursorInput, List itineraries ) { this.searchWindowUsed = searchWindowUsed; @@ -53,7 +53,7 @@ public PagingService( this.numberOfItineraries = numberOfItineraries; this.pageCursor = pageCursor; - this.numItinerariesFilterResults = numItinerariesFilterResults; + this.pageCursorInput = pageCursorInput; this.itineraries = Objects.requireNonNull(itineraries); this.searchWindowAdjuster = createSearchWindowAdjuster( @@ -98,9 +98,9 @@ private Duration calculateSearchWindowNextSearch() { } // SearchWindow cropped -> decrease search-window - if (numItinerariesFilterResults != null) { + if (pageCursorInput != null) { boolean cropSWHead = doCropSearchWindowAtTail(); - Instant rmItineraryStartTime = numItinerariesFilterResults.pageCut().startTimeAsInstant(); + Instant rmItineraryStartTime = pageCursorInput.pageCut().startTimeAsInstant(); return searchWindowAdjuster.decreaseSearchWindow( searchWindowUsed, @@ -125,15 +125,11 @@ private Duration calculateSearchWindowNextSearch() { } private Instant lastKeptDepartureTime() { - return numItinerariesFilterResults == null - ? null - : numItinerariesFilterResults.pageCut().startTimeAsInstant(); + return pageCursorInput == null ? null : pageCursorInput.pageCut().startTimeAsInstant(); } private Instant firstKeptDepartureTime() { - return numItinerariesFilterResults == null - ? null - : numItinerariesFilterResults.pageCut().startTimeAsInstant(); + return pageCursorInput == null ? null : pageCursorInput.pageCut().startTimeAsInstant(); } private PagingSearchWindowAdjuster createSearchWindowAdjuster( @@ -189,8 +185,8 @@ private PageCursorFactory mapIntoPageCursorFactory(@Nullable PageType currentPag searchWindowUsed ); - if (numItinerariesFilterResults != null) { - factory = factory.withRemovedItineraries(numItinerariesFilterResults); + if (pageCursorInput != null) { + factory = factory.withRemovedItineraries(pageCursorInput); } return factory; } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java index 9ef7da991ff..2a48b08c22f 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java @@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; public class NumItinerariesFilterTest { @@ -17,7 +18,7 @@ public class NumItinerariesFilterTest { private static final Itinerary i2 = newItinerary(A).bicycle(6, 8, B).build(); private static final Itinerary i3 = newItinerary(A).bus(21, 7, 9, B).build(); - private NumItinerariesFilterResults subscribeResult = null; + private PageCursorInput subscribeResult = null; @Test public void name() { diff --git a/src/test/java/org/opentripplanner/service/paging/TestDriver.java b/src/test/java/org/opentripplanner/service/paging/TestDriver.java index 70e47f31a75..8b1e634f186 100644 --- a/src/test/java/org/opentripplanner/service/paging/TestDriver.java +++ b/src/test/java/org/opentripplanner/service/paging/TestDriver.java @@ -11,8 +11,8 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; +import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilterResults; import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.PagingFilter; @@ -29,7 +29,7 @@ final class TestDriver { private final Instant lat; private final SortOrder sortOrder; private final ListSection cropSection; - private final NumItinerariesFilterResults results; + private final PageCursorInput results; public TestDriver( int nResults, @@ -40,7 +40,7 @@ public TestDriver( Instant lat, SortOrder sortOrder, ListSection cropSection, - NumItinerariesFilterResults results + PageCursorInput results ) { this.nResults = nResults; this.searchWindow = searchWindow; @@ -106,7 +106,7 @@ boolean arrivedBy() { return !sortOrder.isSortedByAscendingArrivalTime(); } - NumItinerariesFilterResults filterResults() { + PageCursorInput filterResults() { return results; } @@ -163,7 +163,7 @@ private static TestDriver createNewDriver( } // Filter nResults - var filterResultBox = new Box(); + var filterResultBox = new Box(); var maxNumFilter = new NumItinerariesFilter(nResults, cropItineraries, filterResultBox::set); kept = maxNumFilter.removeMatchesForTest(kept); From 547a8c191e4b66ddf65aea93a9ed6bb74b28fee0 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 16:07:44 +0100 Subject: [PATCH 0189/1688] refactor: Move tests same package as subject (framework.filter) --- .../{ => framework}/filter/GroupByFilterTest.java | 5 +---- .../{ => framework}/filter/SortingFilterTest.java | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/filter/GroupByFilterTest.java (93%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{ => framework}/filter/SortingFilterTest.java (86%) diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java similarity index 93% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java index 8b6fea0e029..1db143739e3 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -10,9 +10,6 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilterTest.java similarity index 86% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilterTest.java index 550b85d92a8..9e03b5a2ace 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SortingFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/SortingFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; @@ -9,7 +9,6 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; public class SortingFilterTest implements PlanTestConstants { From 3ba31ce6e7efbfec2d2e317fabda4a0462f81f71 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 16:08:14 +0100 Subject: [PATCH 0190/1688] refactor: Move from filter to filters --- .../filterchain/ItineraryListFilterChainBuilder.java | 6 +++--- .../RemoveDeletionFlagForLeastTransfersItinerary.java | 2 +- .../{filter => filters}/SameFirstOrLastTripFilter.java | 2 +- .../filterchain/{filter => filters}/TransitAlertFilter.java | 2 +- .../{filter => filters}/SameFirstOrLastTripFilterTest.java | 4 ++-- .../{filter => filters}/TransitAlertFilterTest.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{filter => filters}/RemoveDeletionFlagForLeastTransfersItinerary.java (99%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{filter => filters}/SameFirstOrLastTripFilter.java (99%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{filter => filters}/TransitAlertFilter.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{filter => filters}/SameFirstOrLastTripFilterTest.java (96%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{filter => filters}/TransitAlertFilterTest.java (99%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 305531c3f67..6d7089df24b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -20,9 +20,6 @@ import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; -import org.opentripplanner.routing.algorithm.filterchain.filter.RemoveDeletionFlagForLeastTransfersItinerary; -import org.opentripplanner.routing.algorithm.filterchain.filter.SameFirstOrLastTripFilter; -import org.opentripplanner.routing.algorithm.filterchain.filter.TransitAlertFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.NonTransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; @@ -30,11 +27,14 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.PagingFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveBikerentalWithMostlyWalkingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveDeletionFlagForLeastTransfersItinerary; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveItinerariesWithShortStreetLeg; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveParkAndRideWithMostlyWalkingFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfWalkingIsBetterFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveWalkOnlyFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.SameFirstOrLastTripFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.TransitAlertFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveDeletionFlagForLeastTransfersItinerary.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveDeletionFlagForLeastTransfersItinerary.java index 8ffd9986708..a4626aa467b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/RemoveDeletionFlagForLeastTransfersItinerary.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveDeletionFlagForLeastTransfersItinerary.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.numberOfTransfersComparator; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilter.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilter.java index 3d0f550eb0b..233edb0d11f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilter.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilter.java index c50f7c17957..4f9648bca74 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.filters; import java.util.List; import java.util.function.Function; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilterTest.java similarity index 96% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilterTest.java index 3161d23a065..88ea9b12277 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/SameFirstOrLastTripFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilterTest.java @@ -1,7 +1,7 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.filters; +import static org.ejml.UtilEjml.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; import java.util.List; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilterTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilterTest.java index aae59e8e4b6..83eb532a7eb 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filter/TransitAlertFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filter; +package org.opentripplanner.routing.algorithm.filterchain.filters; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.BUS_ROUTE; From ae6740f211894df492f55eababc5ca81166a45fd Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 16:19:57 +0100 Subject: [PATCH 0191/1688] refactor: Use absolute references in doc - avoid import dependencies --- .../org/opentripplanner/model/plan/ItinerarySortKey.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java index 9c4879b0184..0ad62927d9a 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java @@ -2,13 +2,13 @@ import java.time.Instant; import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; /** * This interface is used to sort itineraries and other instances that we might want to sort among - * itineraries. It is used in the {@link SortingFilter} as defined by the - * {@link SortOrderComparator}. + * itineraries. It is used in the + * {@link org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter} + * as defined by the + * {@link org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator}. *

    * The methods in this interface are NOT documented here, but in the Itinerary class. To keep it simple, this * interface should be kept in sync with method names in the itinerary. From a4c55067cb6a404283d4277b2e016576608ca9b5 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 16:23:04 +0100 Subject: [PATCH 0192/1688] refactor: The MaxLimitFilter is a reusable generic filter, move to framework --- .../algorithm/filterchain/ItineraryListFilterChainBuilder.java | 2 +- .../{filters => framework/filter}/MaxLimitFilter.java | 2 +- .../filterchain/framework/spi/ItineraryListFilter.java | 3 ++- .../filterchain/framework/filter/GroupByFilterTest.java | 1 - .../{filters => framework/filter}/MaxLimitFilterTest.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/{filters => framework/filter}/MaxLimitFilter.java (91%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/{filters => framework/filter}/MaxLimitFilterTest.java (95%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 6d7089df24b..d541d86e73d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -20,7 +20,6 @@ import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; -import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.NonTransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.OtherThanSameLegsMaxGeneralizedCostFilter; @@ -37,6 +36,7 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.TransitAlertFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filterchain.DeleteResultHandler; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilter.java similarity index 91% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilter.java index b8c7991f30f..4c786455dba 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; import java.util.List; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java index 7821779fabf..c56b4fe42c9 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java @@ -2,6 +2,7 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimitFilter; /** * Filter, sort or decorate itineraries. A filter can modify the elements in the list, but not the @@ -13,7 +14,7 @@ * chain. *

    * This allows decoration of each filter and makes it easier to reuse logic. Like the {@link - * org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter} is reused in + * MaxLimitFilter} is reused in * several places. */ public interface ItineraryListFilter { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java index 1db143739e3..8bf29be62fa 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java @@ -9,7 +9,6 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.filters.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilterTest.java similarity index 95% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilterTest.java index 86814b4fc27..2fa10761c36 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/MaxLimitFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; From 07407c2dbea858202181f06a1b92d03a7e60dbe8 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 16:46:04 +0100 Subject: [PATCH 0193/1688] refactor: group filters -> system --- .../ItineraryListFilterChainBuilder.java | 6 +++--- .../{ => system}/NumItinerariesFilter.java | 2 +- .../NumItinerariesFilterResults.java | 21 ++++++++----------- .../OutsideSearchWindowFilter.java | 2 +- .../filters/{ => system}/PagingFilter.java | 2 +- .../filterchain/DeleteResultHandler.java | 2 +- .../filterchain/RoutingErrorsAttacher.java | 2 +- .../NumItinerariesFilterTest.java | 2 +- .../OutsideSearchWindowFilterTest.java | 2 +- .../{ => system}/PagingFilterTest.java | 2 +- .../filterchain/DeleteResultHandlerTest.java | 4 ++-- .../service/paging/TestDriver.java | 6 +++--- 12 files changed, 25 insertions(+), 28 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => system}/NumItinerariesFilter.java (99%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => system}/NumItinerariesFilterResults.java (74%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => system}/OutsideSearchWindowFilter.java (99%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => system}/PagingFilter.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => system}/NumItinerariesFilterTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => system}/OutsideSearchWindowFilterTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => system}/PagingFilterTest.java (99%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index d541d86e73d..3f621eab908 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -21,10 +21,7 @@ import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.algorithm.filterchain.filters.NonTransitGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.OtherThanSameLegsMaxGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.PagingFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveBikerentalWithMostlyWalkingFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveDeletionFlagForLeastTransfersItinerary; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveItinerariesWithShortStreetLeg; @@ -35,6 +32,9 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.SameFirstOrLastTripFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.TransitAlertFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.NumItinerariesFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.PagingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java index 570071308cd..aed5eeb4f95 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.system; import java.util.List; import java.util.function.Consumer; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterResults.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java similarity index 74% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterResults.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java index 04c8fcc039c..8b11be099f7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterResults.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterResults.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.system; import java.time.Instant; import java.util.List; @@ -9,20 +9,19 @@ import org.opentripplanner.model.plan.ItinerarySortKey; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; -public class NumItinerariesFilterResults implements PageCursorInput { +/** + * The NumItinerariesFilter removes itineraries from a list of itineraries based on the number to + * keep and whether it should crop at the head or the tail of the list. The results class keeps + * the extreme endpoints of the sets of itineraries that were kept and removed, as well as more + * details about the first itinerary removed (bottom of the head, or top of the tail) and whether + * itineraries were cropped at the head or the tail. + */ +class NumItinerariesFilterResults implements PageCursorInput { private final Instant earliestRemovedDeparture; private final Instant latestRemovedDeparture; private final ItinerarySortKey pageCut; - private final ListSection cropSection; - /** - * The NumItinerariesFilter removes itineraries from a list of itineraries based on the number to - * keep and whether it should crop at the head or the tail of the list. The results class keeps - * the extreme endpoints of the sets of itineraries that were kept and removed, as well as more - * details about the first itinerary removed (bottom of the head, or top of the tail) and whether - * itineraries were cropped at the head or the tail. - */ public NumItinerariesFilterResults( List keptItineraries, List removedItineraries, @@ -40,7 +39,6 @@ public NumItinerariesFilterResults( } else { pageCut = ListUtils.last(keptItineraries); } - this.cropSection = cropSection; } @Override @@ -65,7 +63,6 @@ public String toString() { .addDateTime("earliestRemovedDeparture", earliestRemovedDeparture) .addDateTime("latestRemovedDeparture", latestRemovedDeparture) .addObjOp("pageCut", pageCut, ItinerarySortKey::keyAsString) - .addEnum("cropSection", cropSection) .toString(); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilter.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilter.java index bbaba7be22e..ba3ef4b04f3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.system; import java.time.Duration; import java.time.Instant; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java index 1e9813735ef..1ef109525f6 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.system; import java.util.Comparator; import java.util.List; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java index 089bf44ccd1..c713ed7ac46 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandler.java @@ -4,7 +4,7 @@ import java.util.function.Predicate; import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java index 0ae541e739a..a4bd423884c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java @@ -9,9 +9,9 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.StreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfWalkingIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; import org.opentripplanner.routing.api.response.RoutingError; /** diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java index 2a48b08c22f..622482fe4b3 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/NumItinerariesFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/NumItinerariesFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java index 2ce7bbccf8c..9752004560e 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OutsideSearchWindowFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/OutsideSearchWindowFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java index 82df57ee7a6..751dcc7ad3c 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/PagingFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/PagingFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.system; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.framework.collection.ListUtils.first; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java index bea81f773aa..b7d91f734d2 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/DeleteResultHandlerTest.java @@ -21,8 +21,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.NumItinerariesFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; class DeleteResultHandlerTest { diff --git a/src/test/java/org/opentripplanner/service/paging/TestDriver.java b/src/test/java/org/opentripplanner/service/paging/TestDriver.java index 8b1e634f186..928fbaaf01d 100644 --- a/src/test/java/org/opentripplanner/service/paging/TestDriver.java +++ b/src/test/java/org/opentripplanner/service/paging/TestDriver.java @@ -12,9 +12,9 @@ import org.opentripplanner.model.plan.SortOrder; import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; -import org.opentripplanner.routing.algorithm.filterchain.filters.NumItinerariesFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.OutsideSearchWindowFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.PagingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.NumItinerariesFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.PagingFilter; /** * This class simulate/mock the context the paging is operating in. From 201978ceede7952c91eb5bc02bfb706e06b45ce2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 17:03:42 +0100 Subject: [PATCH 0194/1688] refactor: Simplify RemoveBikerentalWithMostlyWalkingFilter --- .../RemoveBikerentalWithMostlyWalkingFilter.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java index 370d9d57984..af77d181c30 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java @@ -28,10 +28,9 @@ public String name() { @Override public Predicate shouldBeFlaggedForRemoval() { return itinerary -> { - var containsTransit = itinerary - .getLegs() - .stream() - .anyMatch(l -> l != null && l.isTransitLeg()); + if(itinerary.hasTransit()) { + return false; + } double bikeRentalDistance = itinerary .getLegs() @@ -39,11 +38,10 @@ public Predicate shouldBeFlaggedForRemoval() { .filter(l -> l.getRentedVehicle() != null && l.getRentedVehicle()) .mapToDouble(Leg::getDistanceMeters) .sum(); - double totalDistance = itinerary.distanceMeters(); + double totalDistance = itinerary.distanceMeters(); return ( bikeRentalDistance != 0 && - !containsTransit && (bikeRentalDistance / totalDistance) <= bikeRentalDistanceRatio ); }; From 3f8abf080b3e492a44ee9e2d17fcd0c765aeb469 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 18:15:46 +0100 Subject: [PATCH 0195/1688] refactor: Go through the filters and update doc and package location --- .../ItineraryListFilterChainBuilder.java | 45 ++++++++++--------- .../TransitGeneralizedCostFilterParams.java | 2 +- .../RemoveBikeRentalWithMostlyWalking.java} | 11 +++-- ...sitItinerariesBasedOnGeneralizedCost.java} | 15 ++++--- ...oveParkAndRideWithMostlyWalkingFilter.java | 15 +++---- .../{ => street}/RemoveWalkOnlyFilter.java | 2 +- .../DecorateTransitAlert.java} | 6 +-- .../KeepItinerariesWithFewestTransfers.java} | 14 +++--- .../RemoveItinerariesWithShortStreetLeg.java | 7 ++- .../RemoveTransitIfStreetOnlyIsBetter.java} | 12 ++--- .../RemoveTransitIfWalkingIsBetter.java} | 6 +-- .../TransitGeneralizedCostFilter.java | 8 ++-- .../RemoveIfFirstOrLastTripIsTheSame.java} | 7 ++- ...eOtherThanSameLegsMaxGeneralizedCost.java} | 13 +++--- .../filterchain/RoutingErrorsAttacher.java | 8 ++-- ...RemoveBikeRentalWithMostlyWalkingTest.java | 4 +- ...emoveParkAndRideWithMostlyWalkingTest.java | 2 +- .../RemoveWalkOnlyFilterTest.java | 2 +- ...moveItinerariesWithShortStreetLegTest.java | 2 +- ...emoveTransitIfStreetOnlyIsBetterTest.java} | 8 ++-- .../RemoveTransitIfWalkingIsBetterTest.java | 6 +-- .../{ => transit}/TransitAlertFilterTest.java | 4 +- .../TransitGeneralizedCostFilterTest.java | 2 +- ...RemoveIfFirstOrLastTripIsTheSameTest.java} | 9 ++-- ...erThanSameLegsMaxGeneralizedCostTest.java} | 6 +-- .../RoutingErrorsAttacherTest.java | 4 +- 26 files changed, 113 insertions(+), 107 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{RemoveBikerentalWithMostlyWalkingFilter.java => street/RemoveBikeRentalWithMostlyWalking.java} (79%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{NonTransitGeneralizedCostFilter.java => street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java} (73%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => street}/RemoveParkAndRideWithMostlyWalkingFilter.java (86%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => street}/RemoveWalkOnlyFilter.java (98%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{TransitAlertFilter.java => transit/DecorateTransitAlert.java} (91%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{RemoveDeletionFlagForLeastTransfersItinerary.java => transit/KeepItinerariesWithFewestTransfers.java} (63%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => transit}/RemoveItinerariesWithShortStreetLeg.java (81%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{RemoveTransitIfStreetOnlyIsBetterFilter.java => transit/RemoveTransitIfStreetOnlyIsBetter.java} (79%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{RemoveTransitIfWalkingIsBetterFilter.java => transit/RemoveTransitIfWalkingIsBetter.java} (90%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => transit}/TransitGeneralizedCostFilter.java (88%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{SameFirstOrLastTripFilter.java => transit/group/RemoveIfFirstOrLastTripIsTheSame.java} (90%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/{OtherThanSameLegsMaxGeneralizedCostFilter.java => transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java} (85%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => street}/RemoveBikeRentalWithMostlyWalkingTest.java (93%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => street}/RemoveParkAndRideWithMostlyWalkingTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => street}/RemoveWalkOnlyFilterTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => transit}/RemoveItinerariesWithShortStreetLegTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{RemoveTransitIfStreetOnlyIsBetterFilterTest.java => transit/RemoveTransitIfStreetOnlyIsBetterTest.java} (94%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => transit}/RemoveTransitIfWalkingIsBetterTest.java (91%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => transit}/TransitAlertFilterTest.java (94%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{ => transit}/TransitGeneralizedCostFilterTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{SameFirstOrLastTripFilterTest.java => transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java} (83%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/{OtherThanSameLegsMaxGeneralizedCostFilterTest.java => transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java} (83%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 3f621eab908..03065cc9f22 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -20,21 +20,21 @@ import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.api.GroupBySimilarity; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; -import org.opentripplanner.routing.algorithm.filterchain.filters.NonTransitGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.OtherThanSameLegsMaxGeneralizedCostFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveBikerentalWithMostlyWalkingFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveDeletionFlagForLeastTransfersItinerary; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveItinerariesWithShortStreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveParkAndRideWithMostlyWalkingFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfWalkingIsBetterFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveWalkOnlyFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.SameFirstOrLastTripFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.TransitAlertFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.street.RemoveBikeRentalWithMostlyWalking; +import org.opentripplanner.routing.algorithm.filterchain.filters.street.RemoveNonTransitItinerariesBasedOnGeneralizedCost; +import org.opentripplanner.routing.algorithm.filterchain.filters.street.RemoveParkAndRideWithMostlyWalkingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.street.RemoveWalkOnlyFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.system.NumItinerariesFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.system.PagingFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.DecorateTransitAlert; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.KeepItinerariesWithFewestTransfers; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveItinerariesWithShortStreetLeg; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfStreetOnlyIsBetter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfWalkingIsBetter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.group.RemoveIfFirstOrLastTripIsTheSame; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.group.RemoveOtherThanSameLegsMaxGeneralizedCost; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; @@ -362,7 +362,7 @@ public ItineraryListFilterChain build() { if (sameFirstOrLastTripFilter) { filters.add(new SortingFilter(generalizedCostComparator())); - addRmFilter(filters, new SameFirstOrLastTripFilter()); + addRmFilter(filters, new RemoveIfFirstOrLastTripIsTheSame()); } if (minBikeParkingDistance > 0) { @@ -384,7 +384,7 @@ public ItineraryListFilterChain build() { } if (transitAlertService != null) { - filters.add(new TransitAlertFilter(transitAlertService, getMultiModalStation)); + filters.add(new DecorateTransitAlert(transitAlertService, getMultiModalStation)); } // Filter transit itineraries on generalized-cost @@ -400,7 +400,10 @@ public ItineraryListFilterChain build() { // Filter non-transit itineraries on generalized-cost if (nonTransitGeneralizedCostLimit != null) { - addRmFilter(filters, new NonTransitGeneralizedCostFilter(nonTransitGeneralizedCostLimit)); + addRmFilter( + filters, + new RemoveNonTransitItinerariesBasedOnGeneralizedCost(nonTransitGeneralizedCostLimit) + ); } // Apply all absolute filters AFTER the groupBy filters. Absolute filters are filters that @@ -417,14 +420,12 @@ public ItineraryListFilterChain build() { if (removeTransitWithHigherCostThanBestOnStreetOnly != null) { addRmFilter( filters, - new RemoveTransitIfStreetOnlyIsBetterFilter( - removeTransitWithHigherCostThanBestOnStreetOnly - ) + new RemoveTransitIfStreetOnlyIsBetter(removeTransitWithHigherCostThanBestOnStreetOnly) ); } if (removeTransitIfWalkingIsBetter) { - addRmFilter(filters, new RemoveTransitIfWalkingIsBetterFilter()); + addRmFilter(filters, new RemoveTransitIfWalkingIsBetter()); } if (removeWalkAllTheWayResults) { @@ -432,7 +433,7 @@ public ItineraryListFilterChain build() { } if (bikeRentalDistanceRatio > 0) { - addRmFilter(filters, new RemoveBikerentalWithMostlyWalkingFilter(bikeRentalDistanceRatio)); + addRmFilter(filters, new RemoveBikeRentalWithMostlyWalking(bikeRentalDistanceRatio)); } if (parkAndRideDurationRatio > 0) { @@ -566,7 +567,7 @@ private List buildGroupByTripIdAndDistanceFilters() { } if (group.maxCostOtherLegsFactor > 1.0) { - var flagger = new OtherThanSameLegsMaxGeneralizedCostFilter(group.maxCostOtherLegsFactor); + var flagger = new RemoveOtherThanSameLegsMaxGeneralizedCost(group.maxCostOtherLegsFactor); sysTags.add(flagger.name()); addRmFilter(nested, flagger); } @@ -575,7 +576,7 @@ private List buildGroupByTripIdAndDistanceFilters() { addRmFilter(nested, new MaxLimitFilter(tag, group.maxNumOfItinerariesPerGroup)); - nested.add(new RemoveDeletionFlagForLeastTransfersItinerary(sysTags)); + nested.add(new KeepItinerariesWithFewestTransfers(sysTags)); groupByFilters.add( new GroupByFilter<>(it -> new GroupByDistance(it, group.groupByP), nested) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java index eb4085c5c0c..c909ff00db0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.filterchain.api; import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.routing.algorithm.filterchain.filters.TransitGeneralizedCostFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalking.java similarity index 79% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalking.java index af77d181c30..21cadf413ae 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikerentalWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalking.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.street; import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; @@ -12,11 +12,11 @@ *

    * This filter is turned off by default (bikeRentalDistanceRatio == 0) */ -public class RemoveBikerentalWithMostlyWalkingFilter implements RemoveItineraryFlagger { +public class RemoveBikeRentalWithMostlyWalking implements RemoveItineraryFlagger { private final double bikeRentalDistanceRatio; - public RemoveBikerentalWithMostlyWalkingFilter(double bikeRentalDistanceRatio) { + public RemoveBikeRentalWithMostlyWalking(double bikeRentalDistanceRatio) { this.bikeRentalDistanceRatio = bikeRentalDistanceRatio; } @@ -28,7 +28,7 @@ public String name() { @Override public Predicate shouldBeFlaggedForRemoval() { return itinerary -> { - if(itinerary.hasTransit()) { + if (itinerary.hasTransit()) { return false; } @@ -41,8 +41,7 @@ public Predicate shouldBeFlaggedForRemoval() { double totalDistance = itinerary.distanceMeters(); return ( - bikeRentalDistance != 0 && - (bikeRentalDistance / totalDistance) <= bikeRentalDistanceRatio + bikeRentalDistance != 0 && (bikeRentalDistance / totalDistance) <= bikeRentalDistanceRatio ); }; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java similarity index 73% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java index f7aad5f2b59..427084a55f6 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/NonTransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java @@ -1,30 +1,35 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.street; import java.util.List; import java.util.OptionalInt; import java.util.stream.Collectors; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; /** + * This filter remove none-transit itineraries with generalized-cost higher than the max-limit. + * The max-limit is computed based on the overall min-generalized-cost using the provided cost + * function. + *

    * This filter is similar to {@link TransitGeneralizedCostFilter}. There are some important * differences, however. It will only remove non-transit results, but ALL results can be used as a * basis for computing the cost limit. *

    - * This is needed so that we do not for example get walk legs that last several hours, when transit - * can take you to the destination much quicker. + * This will, for example, remove walk legs which last several hours, when transit can take you to + * the destination much quicker. *

    * * @see ItineraryFilterPreferences#nonTransitGeneralizedCostLimit() */ -public class NonTransitGeneralizedCostFilter implements RemoveItineraryFlagger { +public class RemoveNonTransitItinerariesBasedOnGeneralizedCost implements RemoveItineraryFlagger { private final CostLinearFunction costLimitFunction; - public NonTransitGeneralizedCostFilter(CostLinearFunction costLimitFunction) { + public RemoveNonTransitItinerariesBasedOnGeneralizedCost(CostLinearFunction costLimitFunction) { this.costLimitFunction = costLimitFunction; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingFilter.java similarity index 86% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingFilter.java index 1c14de7686b..2a9cefd0657 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.street; import java.util.List; import java.util.function.Predicate; @@ -31,10 +31,9 @@ public String name() { @Override public Predicate shouldBeFlaggedForRemoval() { return itinerary -> { - var containsTransit = itinerary - .getLegs() - .stream() - .anyMatch(l -> l != null && l.isTransitLeg()); + if (itinerary.hasTransit()) { + return false; + } double carDuration = itinerary .getLegs() @@ -46,11 +45,7 @@ public Predicate shouldBeFlaggedForRemoval() { .sum(); double totalDuration = itinerary.getDuration().toSeconds(); - return ( - !containsTransit && - carDuration != 0 && - (carDuration / totalDuration) <= parkAndRideDurationRatio - ); + return (carDuration != 0 && (carDuration / totalDuration) <= parkAndRideDurationRatio); }; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilter.java similarity index 98% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilter.java index 3ec64f4b731..1a53b898931 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.street; import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java similarity index 91% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java index 4f9648bca74..f70c68587ec 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import java.util.List; import java.util.function.Function; @@ -10,11 +10,11 @@ import org.opentripplanner.transit.model.site.MultiModalStation; import org.opentripplanner.transit.model.site.Station; -public class TransitAlertFilter implements ItineraryListFilter { +public class DecorateTransitAlert implements ItineraryListFilter { private final AlertToLegMapper alertToLegMapper; - public TransitAlertFilter( + public DecorateTransitAlert( TransitAlertService transitAlertService, Function getMultiModalStation ) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveDeletionFlagForLeastTransfersItinerary.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/KeepItinerariesWithFewestTransfers.java similarity index 63% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveDeletionFlagForLeastTransfersItinerary.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/KeepItinerariesWithFewestTransfers.java index a4626aa467b..3d1e6301786 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveDeletionFlagForLeastTransfersItinerary.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/KeepItinerariesWithFewestTransfers.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import static org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator.numberOfTransfersComparator; @@ -10,16 +10,16 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; /** - * This filter makes sure that the itinerary with the least amount of transfers is not marked for - * deletion. It iterates over the itineraries and removes the SystemNotice if it contains - * the provided set of {@code filterKeys}. The itinerary must match all {@code filterKeys}, and - * if so the given keys are removed. Other system-notices are ignored. + * This filter makes sure that the itinerary with the fewest transfers is not removed. + * It iterates over the itineraries and removes the SystemNotice if it contains the provided set + * of {@code filterKeys}. The itinerary must match all {@code filterKeys}, and if so the given + * keys are removed. Itineraries with other system notices are ignored. */ -public class RemoveDeletionFlagForLeastTransfersItinerary implements ItineraryListFilter { +public class KeepItinerariesWithFewestTransfers implements ItineraryListFilter { private final Set filterKeys; - public RemoveDeletionFlagForLeastTransfersItinerary(List filterKeys) { + public KeepItinerariesWithFewestTransfers(List filterKeys) { this.filterKeys = new HashSet<>(filterKeys); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java similarity index 81% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLeg.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java index 5223704bbea..c9254b246e7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import java.util.List; import org.opentripplanner.model.plan.Itinerary; @@ -10,6 +10,11 @@ * This filter is useful if you want to remove those results where there is a short bicycle * leg followed by parking the bike and taking transit. In such a case you would not need a bike * could just walk to the stop instead. + *

    + * TODO: This filter build on assumptions that is more or less an implementation detail. The + * filter should compare itineraries and remove them if a condition is meet, not just + * assume that a better option exist. Perhaps the access and egress should be filtered + * instead of filtering the transit itineraries? */ public class RemoveItinerariesWithShortStreetLeg implements ItineraryListFilter { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java similarity index 79% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index 84a6f4e75b3..bddf5238f23 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import java.util.List; import java.util.OptionalInt; @@ -9,15 +9,15 @@ import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** - * Filter itineraries based on generalizedCost, compared with a on-street-all-the-way itinerary(if - * it exist). If an itinerary cost exceeds the limit computed from the best all-the-way-on-street itinerary, then the - * transit itinerary is removed. + * Filter itineraries based on generalizedCost, compared with an on-street-all-the-way itinerary + * (if it exists). If an itinerary cost exceeds the limit computed from the best + * all-the-way-on-street itinerary, then the transit itinerary is removed. */ -public class RemoveTransitIfStreetOnlyIsBetterFilter implements RemoveItineraryFlagger { +public class RemoveTransitIfStreetOnlyIsBetter implements RemoveItineraryFlagger { private final CostLinearFunction costLimitFunction; - public RemoveTransitIfStreetOnlyIsBetterFilter(CostLinearFunction costLimitFunction) { + public RemoveTransitIfStreetOnlyIsBetter(CostLinearFunction costLimitFunction) { this.costLimitFunction = costLimitFunction; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java similarity index 90% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java index f57d065e35a..cf4d102c11a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import java.util.List; import java.util.OptionalInt; @@ -7,9 +7,9 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** - * Filter itineraries which have a higher generalized-cost than a pure walk itinerary. + * Filter itineraries which have a higher generalized-cost than the walk-only itinerary (if exist). */ -public class RemoveTransitIfWalkingIsBetterFilter implements RemoveItineraryFlagger { +public class RemoveTransitIfWalkingIsBetter implements RemoveItineraryFlagger { /** * Required for {@link org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain}, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java similarity index 88% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java index b3e6fb1c01d..4d7ffffa13a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import java.time.temporal.ChronoUnit; import java.util.Comparator; @@ -11,7 +11,7 @@ import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** - * This filter remove all transit results which have a generalized-cost higher than the max-limit + * This filter removes all transit results that have a generalized-cost higher than the max-limit * computed by the {@link #costLimitFunction} plus the wait cost given by * {@link TransitGeneralizedCostFilter#getWaitTimeCost}. */ @@ -41,11 +41,11 @@ public List flagForRemoval(List itineraries) { return transitItineraries .stream() - .filter(it -> transitItineraries.stream().anyMatch(t -> acceptGeneralizedCost(it, t))) + .filter(it -> transitItineraries.stream().anyMatch(t -> generalizedCostExceedsLimit(it, t))) .collect(Collectors.toList()); } - private boolean acceptGeneralizedCost(Itinerary subject, Itinerary transitItinerary) { + private boolean generalizedCostExceedsLimit(Itinerary subject, Itinerary transitItinerary) { return subject.getGeneralizedCost() > calculateLimit(subject, transitItinerary); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java similarity index 90% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java index 233edb0d11f..f076586f487 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit.group; import java.util.ArrayList; import java.util.List; @@ -7,13 +7,12 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; /** - * This filter ensures that no more than one itinerary begins or ends with same trip. + * This filter ensures that no more than one itinerary begins or ends with the same trip. * It loops through itineraries from top to bottom. If itinerary matches with any other itinerary * from above, it is removed from list. * Uses {@link GroupBySameFirstOrLastTrip}. - * for matching itineraries. */ -public class SameFirstOrLastTripFilter implements RemoveItineraryFlagger { +public class RemoveIfFirstOrLastTripIsTheSame implements RemoveItineraryFlagger { @Override public String name() { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java similarity index 85% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java index 74a395379c8..becac712445 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit.group; import java.util.List; import java.util.OptionalInt; @@ -7,24 +7,25 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.transit.model.timetable.Trip; /** - * This filter marks itineraries, which use same trips for most of their legs, but where some - * itineraries have a much higher cost for the other legs, for deletion. This is similar to {@link + * This filter remove itineraries, which use the same trips for most of their legs, but where some + * itineraries have a much higher cost for the other legs. This is similar to {@link * TransitGeneralizedCostFilter}, but is used together with {@link GroupByFilter} to filter within * the groups. */ -public class OtherThanSameLegsMaxGeneralizedCostFilter implements RemoveItineraryFlagger { +public class RemoveOtherThanSameLegsMaxGeneralizedCost implements RemoveItineraryFlagger { /** - * How much higher cost do we allow for the non-shared legs before we filter out the itinerary. + * How much higher cost do we allow for the non-shared legs before we filter out the itinerary? */ private final double maxCostOtherLegsFactor; - public OtherThanSameLegsMaxGeneralizedCostFilter(double maxCostOtherLegsFactor) { + public RemoveOtherThanSameLegsMaxGeneralizedCost(double maxCostOtherLegsFactor) { this.maxCostOtherLegsFactor = maxCostOtherLegsFactor; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java index a4bd423884c..6af4f240a10 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacher.java @@ -9,9 +9,9 @@ import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.StreetLeg; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfWalkingIsBetterFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfStreetOnlyIsBetter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfWalkingIsBetter; import org.opentripplanner.routing.api.response.RoutingError; /** @@ -50,12 +50,12 @@ public static List computeErrors( it .getSystemNotices() .stream() - .anyMatch(notice -> notice.tag().equals(RemoveTransitIfStreetOnlyIsBetterFilter.TAG)); + .anyMatch(notice -> notice.tag().equals(RemoveTransitIfStreetOnlyIsBetter.TAG)); Predicate isWorseThanWalking = it -> it .getSystemNotices() .stream() - .anyMatch(notice -> notice.tag().equals(RemoveTransitIfWalkingIsBetterFilter.TAG)); + .anyMatch(notice -> notice.tag().equals(RemoveTransitIfWalkingIsBetter.TAG)); if ( filteredItineraries .stream() diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikeRentalWithMostlyWalkingTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java similarity index 93% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikeRentalWithMostlyWalkingTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java index 58cecb82810..4e47306601c 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveBikeRentalWithMostlyWalkingTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveBikeRentalWithMostlyWalkingTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.street; import static org.opentripplanner.model.plan.TestItineraryBuilder.A; import static org.opentripplanner.model.plan.TestItineraryBuilder.B; @@ -20,7 +20,7 @@ public class RemoveBikeRentalWithMostlyWalkingTest { private static final int T10_10 = TimeUtils.hm2time(10, 10); private static final int T10_20 = TimeUtils.hm2time(10, 20); - private final RemoveBikerentalWithMostlyWalkingFilter subject = new RemoveBikerentalWithMostlyWalkingFilter( + private final RemoveBikeRentalWithMostlyWalking subject = new RemoveBikeRentalWithMostlyWalking( 0.3 ); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java index 8fdfb3c6de6..a4c90d1346f 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveParkAndRideWithMostlyWalkingTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveParkAndRideWithMostlyWalkingTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.street; import static org.opentripplanner.model.plan.TestItineraryBuilder.A; import static org.opentripplanner.model.plan.TestItineraryBuilder.B; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java index 2ede3ccac10..359423a842b 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveWalkOnlyFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveWalkOnlyFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.street; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.A; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLegTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLegTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java index 72d88ec2469..7949b6ab086 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveItinerariesWithShortStreetLegTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java similarity index 94% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index 1541afc623b..df45bcf4538 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfStreetOnlyIsBetterFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; @@ -12,7 +12,7 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; -public class RemoveTransitIfStreetOnlyIsBetterFilterTest implements PlanTestConstants { +public class RemoveTransitIfStreetOnlyIsBetterTest implements PlanTestConstants { @Test public void filterAwayNothingIfNoWalking() { @@ -21,7 +21,7 @@ public void filterAwayNothingIfNoWalking() { Itinerary i2 = newItinerary(A).rail(110, 6, 9, E).build(); // When: - RemoveItineraryFlagger flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( + RemoveItineraryFlagger flagger = new RemoveTransitIfStreetOnlyIsBetter( CostLinearFunction.of(Duration.ofSeconds(200), 1.2) ); List result = flagger.removeMatchesForTest(List.of(i1, i2)); @@ -49,7 +49,7 @@ public void filterAwayLongTravelTimeWithoutWaitTime() { i2.setGeneralizedCost(360); // When: - RemoveItineraryFlagger flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( + RemoveItineraryFlagger flagger = new RemoveTransitIfStreetOnlyIsBetter( CostLinearFunction.of(Duration.ofSeconds(60), 1.2) ); List result = flagger.removeMatchesForTest(List.of(i2, bicycle, walk, i1)); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetterTest.java similarity index 91% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetterTest.java index af2e5a68965..55efcf68856 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/RemoveTransitIfWalkingIsBetterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; @@ -18,7 +18,7 @@ public void filterAwayNothingIfNoWalking() { Itinerary i2 = newItinerary(A).rail(110, 6, 9, E).build(); // When: - List result = new RemoveTransitIfWalkingIsBetterFilter() + List result = new RemoveTransitIfWalkingIsBetter() .removeMatchesForTest(List.of(i1, i2)); // Then: @@ -39,7 +39,7 @@ public void filterAwayTransitWithLongerWalk() { // transit which has less walking than plain walk should be kept Itinerary i2 = newItinerary(A, 6).walk(D1m, B).bus(2, 7, 10, E).build(); - List result = new RemoveTransitIfWalkingIsBetterFilter() + List result = new RemoveTransitIfWalkingIsBetter() .removeMatchesForTest(List.of(i1, i2, bicycle, walk)); assertEquals(toStr(List.of(i2, bicycle, walk)), toStr(result)); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java similarity index 94% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java index 83eb532a7eb..1ba7dde39fe 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitAlertFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.BUS_ROUTE; @@ -32,7 +32,7 @@ void testFilter() { ) ); - TransitAlertFilter filter = new TransitAlertFilter(transitAlertService, ignore -> null); + DecorateTransitAlert filter = new DecorateTransitAlert(transitAlertService, ignore -> null); // Expect filter to no fail on an empty list assertEquals(List.of(), filter.filter(List.of())); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java index f55b0c8d0b3..6f5f01a9728 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/TransitGeneralizedCostFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.Itinerary.toStr; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java similarity index 83% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java index 88ea9b12277..0e125207935 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/SameFirstOrLastTripFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSameTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit.group; import static org.ejml.UtilEjml.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -9,10 +9,11 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -public class SameFirstOrLastTripFilterTest implements PlanTestConstants { +public class RemoveIfFirstOrLastTripIsTheSameTest implements PlanTestConstants { /** - * This test ensures that filter work as intended regarding comparison order and exclusion logic + * This test ensures that the filter works as intended regarding comparison order and exclusion + * logic. */ @Test public void testMatchOrderOnFirstStation() { @@ -34,7 +35,7 @@ public void testMatchOrderOnFirstStation() { List input = List.of(i1, i2, i3, i4, i5); - final SameFirstOrLastTripFilter filter = new SameFirstOrLastTripFilter(); + final RemoveIfFirstOrLastTripIsTheSame filter = new RemoveIfFirstOrLastTripIsTheSame(); var flagged = filter.flagForRemoval(input); // First journey should always be included diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java similarity index 83% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java index 0bb2265c8a5..c5017c55ae3 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/OtherThanSameLegsMaxGeneralizedCostFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCostTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters; +package org.opentripplanner.routing.algorithm.filterchain.filters.transit.group; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; @@ -8,7 +8,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -class OtherThanSameLegsMaxGeneralizedCostFilterTest implements PlanTestConstants { +class RemoveOtherThanSameLegsMaxGeneralizedCostTest implements PlanTestConstants { @Test public void testFilter() { @@ -19,7 +19,7 @@ public void testFilter() { Itinerary second = newItinerary(A).rail(20, T11_05, T11_14, B).walk(D10m, C).build(); - var subject = new OtherThanSameLegsMaxGeneralizedCostFilter(2.0); + var subject = new RemoveOtherThanSameLegsMaxGeneralizedCost(2.0); assertEquals(List.of(second), subject.flagForRemoval(List.of(first, second))); } } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java index 0330aca3683..98ea33cea88 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filterchain/RoutingErrorsAttacherTest.java @@ -8,7 +8,7 @@ import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.algorithm.filterchain.filters.RemoveTransitIfStreetOnlyIsBetterFilter; +import org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfStreetOnlyIsBetter; import org.opentripplanner.routing.api.response.RoutingErrorCode; class RoutingErrorsAttacherTest implements PlanTestConstants { @@ -38,7 +38,7 @@ public static List flagAll(List itineraries) { itineraries.forEach(i -> i.flagForDeletion( new SystemNotice( - RemoveTransitIfStreetOnlyIsBetterFilter.TAG, + RemoveTransitIfStreetOnlyIsBetter.TAG, "This itinerary is marked as deleted." ) ) From b01c5d5ac94774e4b47a09b52b794612f662f176 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 5 Jan 2024 18:47:44 +0100 Subject: [PATCH 0196/1688] refactor: Rename decorators --- ...> DecorateWithAccessibilityScoreTest.java} | 4 +- .../ext/emissions/EmissionsTest.java | 19 ++-- .../ext/fares/FaresFilterTest.java | 2 +- .../flex/trip/ScheduledDeviatedTripTest.java | 4 +- ....java => DecorateWithRideHailingTest.java} | 8 +- ...=> DecorateConsolidatedStopNamesTest.java} | 4 +- ...va => DecorateWithAccessibilityScore.java} | 5 +- ...sFilter.java => DecorateWithEmission.java} | 3 +- ...FaresFilter.java => DecorateWithFare.java} | 4 +- ...lter.java => DecorateWithRideHailing.java} | 6 +- ...ava => DecorateConsolidatedStopNames.java} | 4 +- .../ItineraryListFilterChainBuilder.java | 105 +++++++++--------- .../RemoveItinerariesWithShortStreetLeg.java | 3 + .../RouteRequestToFilterChainMapper.java | 20 ++-- .../ItineraryListFilterChainTest.java | 6 +- 15 files changed, 104 insertions(+), 93 deletions(-) rename src/ext-test/java/org/opentripplanner/ext/accessibilityscore/{AccessibilityScoreFilterTest.java => DecorateWithAccessibilityScoreTest.java} (89%) rename src/ext-test/java/org/opentripplanner/ext/ridehailing/{RideHailingFilterTest.java => DecorateWithRideHailingTest.java} (87%) rename src/ext-test/java/org/opentripplanner/ext/stopconsolidation/{ConsolidatedStopNameFilterTest.java => DecorateConsolidatedStopNamesTest.java} (94%) rename src/ext/java/org/opentripplanner/ext/accessibilityscore/{AccessibilityScoreFilter.java => DecorateWithAccessibilityScore.java} (96%) rename src/ext/java/org/opentripplanner/ext/emissions/{EmissionsFilter.java => DecorateWithEmission.java} (97%) rename src/ext/java/org/opentripplanner/ext/fares/{FaresFilter.java => DecorateWithFare.java} (80%) rename src/ext/java/org/opentripplanner/ext/ridehailing/{RideHailingFilter.java => DecorateWithRideHailing.java} (93%) rename src/ext/java/org/opentripplanner/ext/stopconsolidation/{ConsolidatedStopNameFilter.java => DecorateConsolidatedStopNames.java} (92%) diff --git a/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilterTest.java b/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java similarity index 89% rename from src/ext-test/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilterTest.java rename to src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java index 3239a7a73df..4ffc59a1781 100644 --- a/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java @@ -11,7 +11,7 @@ import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.api.request.preference.WheelchairPreferences; -public class AccessibilityScoreFilterTest implements PlanTestConstants { +public class DecorateWithAccessibilityScoreTest implements PlanTestConstants { @Test public void shouldAddAccessibilityScore() { @@ -37,7 +37,7 @@ public void shouldAddAccessibilityScore() { input.forEach(i -> assertNull(i.getAccessibilityScore())); - var filter = new AccessibilityScoreFilter(WheelchairPreferences.DEFAULT.maxSlope()); + var filter = new DecorateWithAccessibilityScore(WheelchairPreferences.DEFAULT.maxSlope()); var filtered = filter.filter(input); filtered.forEach(i -> { diff --git a/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java b/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java index 82058567c38..ef33b6e3ba9 100644 --- a/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java @@ -31,7 +31,7 @@ class EmissionsTest { private static DefaultEmissionsService eService; - private static EmissionsFilter emissionsFilter; + private static DecorateWithEmission decorateWithEmission; static final ZonedDateTime TIME = OffsetDateTime .parse("2023-07-20T17:49:06+03:00") @@ -58,7 +58,7 @@ static void SetUp() { emissions.put(new FeedScopedId("F", "2"), 0.0); EmissionsDataModel emissionsDataModel = new EmissionsDataModel(emissions, 0.131); eService = new DefaultEmissionsService(emissionsDataModel); - emissionsFilter = new EmissionsFilter(eService); + decorateWithEmission = new DecorateWithEmission(eService); } @Test @@ -66,7 +66,7 @@ void testGetEmissionsForItinerary() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITH_EMISSIONS))); assertEquals( new Grams(2223.902), - emissionsFilter.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() + decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() ); } @@ -75,14 +75,14 @@ void testGetEmissionsForCarRoute() { Itinerary i = new Itinerary(List.of(STREET_LEG)); assertEquals( new Grams(28.0864), - emissionsFilter.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() + decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() ); } @Test void testNoEmissionsForFeedWithoutEmissionsConfigured() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITHOUT_EMISSIONS_CONFIGURED))); - assertNull(emissionsFilter.filter(List.of(i)).get(0).getEmissionsPerPerson()); + assertNull(decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson()); } @Test @@ -90,7 +90,7 @@ void testZeroEmissionsForItineraryWithZeroEmissions() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITH_ZERO_EMISSIONS))); assertEquals( new Grams(0.0), - emissionsFilter.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() + decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() ); } @@ -99,7 +99,7 @@ void testGetEmissionsForCombinedRoute() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITH_EMISSIONS), STREET_LEG)); assertEquals( new Grams(2251.9884), - emissionsFilter.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() + decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() ); } @@ -108,8 +108,9 @@ void testNoEmissionsForCombinedRouteWithoutTransitEmissions() { Itinerary i = new Itinerary( List.of(createTransitLeg(ROUTE_WITHOUT_EMISSIONS_CONFIGURED), STREET_LEG) ); - var emissionsResult = emissionsFilter.filter(List.of(i)).get(0).getEmissionsPerPerson() != null - ? emissionsFilter.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() + var emissionsResult = decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson() != + null + ? decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() : null; assertNull(emissionsResult); } diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java index 7fe315cb97b..134dd942d4e 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java @@ -42,7 +42,7 @@ void shouldAddFare() { var fp = new FareProduct(id("fp"), "fare product", Money.euros(10.00f), null, null, null); fares.addFareProduct(leg, fp); - var filter = new FaresFilter((FareService) itinerary -> fares); + var filter = new DecorateWithFare((FareService) itinerary -> fares); var filtered = filter.filter(input); filtered.forEach(i -> assertEquals(fares, i.getFares())); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 3fb77a29adf..4150dd5b489 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -18,7 +18,7 @@ import org.opentripplanner.TestOtpModel; import org.opentripplanner.TestServerContext; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.ext.fares.FaresFilter; +import org.opentripplanner.ext.fares.DecorateWithFare; import org.opentripplanner.ext.flex.FlexRouter; import org.opentripplanner.ext.flex.FlexTest; import org.opentripplanner.framework.application.OTPFeature; @@ -144,7 +144,7 @@ void calculateDirectFare() { List.of(to) ); - var filter = new FaresFilter(graph.getFareService()); + var filter = new DecorateWithFare(graph.getFareService()); var itineraries = filter.filter(router.createFlexOnlyItineraries().stream().toList()); diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingFilterTest.java b/src/ext-test/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailingTest.java similarity index 87% rename from src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingFilterTest.java rename to src/ext-test/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailingTest.java index ec7932b1d3d..58eb6315dd9 100644 --- a/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingFilterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailingTest.java @@ -16,7 +16,7 @@ import org.opentripplanner.model.plan.TestItineraryBuilder; import org.opentripplanner.transit.model.basic.Money; -class RideHailingFilterTest implements PlanTestConstants { +class DecorateWithRideHailingTest implements PlanTestConstants { public static final RideEstimate RIDE_ESTIMATE = new RideEstimate( UBER, @@ -39,7 +39,7 @@ class RideHailingFilterTest implements PlanTestConstants { @Test void noServices() { - var filter = new RideHailingFilter(List.of(), false); + var filter = new DecorateWithRideHailing(List.of(), false); var filtered = filter.filter(List.of(i)); @@ -48,7 +48,7 @@ void noServices() { @Test void addRideHailingInformation() { - var filter = new RideHailingFilter(List.of(mockService), false); + var filter = new DecorateWithRideHailing(List.of(mockService), false); var filtered = filter.filter(List.of(i)); @@ -63,7 +63,7 @@ void addRideHailingInformation() { @Test void failingService() { - var filter = new RideHailingFilter(List.of(failingService), false); + var filter = new DecorateWithRideHailing(List.of(failingService), false); var filtered = filter.filter(List.of(i)); diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilterTest.java b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java similarity index 94% rename from src/ext-test/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilterTest.java rename to src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java index d88e8a5879e..6f0671da04c 100644 --- a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java @@ -16,7 +16,7 @@ import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.TestItineraryBuilder; -class ConsolidatedStopNameFilterTest { +class DecorateConsolidatedStopNamesTest { @Test void changeNames() { @@ -27,7 +27,7 @@ void changeNames() { repo.addGroups(groups); var service = new DefaultStopConsolidationService(repo, transitModel); - var filter = new ConsolidatedStopNameFilter(service); + var filter = new DecorateConsolidatedStopNames(service); var itinerary = TestItineraryBuilder .newItinerary(Place.forStop(STOP_C)) diff --git a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java b/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java similarity index 96% rename from src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java rename to src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java index b0ced6e00c5..4c36964af19 100644 --- a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java +++ b/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java @@ -25,7 +25,8 @@ * calculating them on the backend makes life a little easier and changes are automatically applied * to all frontends. */ -public record AccessibilityScoreFilter(double wheelchairMaxSlope) implements ItineraryListFilter { +public record DecorateWithAccessibilityScore(double wheelchairMaxSlope) + implements ItineraryListFilter { public static Float compute(List legs) { return legs .stream() @@ -43,7 +44,7 @@ public static float compute(ScheduledTransitLeg leg) { var values = List.of(trip, fromStop, toStop); var sum = (float) values .stream() - .mapToDouble(AccessibilityScoreFilter::accessibilityScore) + .mapToDouble(DecorateWithAccessibilityScore::accessibilityScore) .sum(); return sum / values.size(); } diff --git a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java b/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java similarity index 97% rename from src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java rename to src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java index 2186339a4e6..50a5dd2c3ee 100644 --- a/src/ext/java/org/opentripplanner/ext/emissions/EmissionsFilter.java +++ b/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java @@ -19,7 +19,8 @@ * @param emissionsService */ @Sandbox -public record EmissionsFilter(EmissionsService emissionsService) implements ItineraryListFilter { +public record DecorateWithEmission(EmissionsService emissionsService) + implements ItineraryListFilter { @Override public List filter(List itineraries) { for (Itinerary itinerary : itineraries) { diff --git a/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java b/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java similarity index 80% rename from src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java rename to src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java index cc3a956ef16..786885452e7 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/FaresFilter.java +++ b/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java @@ -8,8 +8,10 @@ /** * Computes the fares of an itinerary and adds them. + *

    + * TODO: Convert to a class - exposing a service in a DTO is a risk. */ -public record FaresFilter(FareService fareService) implements ItineraryListFilter { +public record DecorateWithFare(FareService fareService) implements ItineraryListFilter { @Override public List filter(List itineraries) { return itineraries diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java similarity index 93% rename from src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java rename to src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java index bbaa707a00b..cbe4e174334 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingFilter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java @@ -15,15 +15,15 @@ * This filter decorates car dropoff/pickup legs with information from ride hailing services and * adds information about price and arrival time of the vehicle. */ -public class RideHailingFilter implements ItineraryListFilter { +public class DecorateWithRideHailing implements ItineraryListFilter { - private static final Logger LOG = LoggerFactory.getLogger(RideHailingFilter.class); + private static final Logger LOG = LoggerFactory.getLogger(DecorateWithRideHailing.class); public static final String NO_RIDE_HAILING_AVAILABLE = "no-ride-hailing-available"; private final List rideHailingServices; private final boolean wheelchairAccessible; - public RideHailingFilter( + public DecorateWithRideHailing( List rideHailingServices, boolean wheelchairAccessible ) { diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java similarity index 92% rename from src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java rename to src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index 6165732e122..b9f3012b425 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/ConsolidatedStopNameFilter.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -12,11 +12,11 @@ * then replaces it with the secondary, agency-specific stop name. This is so that the in-vehicle * display matches what OTP returns as a board/alight stop name. */ -public class ConsolidatedStopNameFilter implements ItineraryListFilter { +public class DecorateConsolidatedStopNames implements ItineraryListFilter { private final StopConsolidationService service; - public ConsolidatedStopNameFilter(StopConsolidationService service) { + public DecorateConsolidatedStopNames(StopConsolidationService service) { this.service = Objects.requireNonNull(service); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index 03065cc9f22..bcce86d7185 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -11,7 +11,7 @@ import java.util.function.Consumer; import java.util.function.Function; import javax.annotation.Nullable; -import org.opentripplanner.ext.accessibilityscore.AccessibilityScoreFilter; +import org.opentripplanner.ext.accessibilityscore.DecorateWithAccessibilityScore; import org.opentripplanner.framework.collection.ListSection; import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.model.plan.Itinerary; @@ -89,16 +89,16 @@ public class ItineraryListFilterChainBuilder { */ @Sandbox - private ItineraryListFilter emissionsFilter; + private ItineraryListFilter emissionDecorator; @Sandbox - private ItineraryListFilter faresFilter; + private ItineraryListFilter fareDecorator; @Sandbox - private ItineraryListFilter rideHailingFilter; + private ItineraryListFilter rideHailingDecorator; @Sandbox - private ItineraryListFilter stopConsolidationFilter; + private ItineraryListFilter stopConsolidationDecorator; public ItineraryListFilterChainBuilder(SortOrder sortOrder) { this.sortOrder = sortOrder; @@ -317,13 +317,13 @@ public ItineraryListFilterChainBuilder withAccessibilityScore( return this; } - public ItineraryListFilterChainBuilder withFaresFilter(ItineraryListFilter filter) { - this.faresFilter = filter; + public ItineraryListFilterChainBuilder withFareDecorator(ItineraryListFilter decorator) { + this.fareDecorator = decorator; return this; } - public ItineraryListFilterChainBuilder withEmissions(ItineraryListFilter emissionsFilter) { - this.emissionsFilter = emissionsFilter; + public ItineraryListFilterChainBuilder withEmissions(ItineraryListFilter emissionDecorator) { + this.emissionDecorator = emissionDecorator; return this; } @@ -339,15 +339,25 @@ public ItineraryListFilterChainBuilder withRemoveTimeshiftedItinerariesWithSameR return this; } - public ItineraryListFilterChainBuilder withRideHailingFilter(ItineraryListFilter filter) { - this.rideHailingFilter = filter; + public ItineraryListFilterChainBuilder withRideHailingDecorator(ItineraryListFilter decorator) { + this.rideHailingDecorator = decorator; return this; } - public ItineraryListFilterChainBuilder withStopConsolidationFilter( - @Nullable ItineraryListFilter filter + public ItineraryListFilterChainBuilder withConsolidatedStopNamesDecorator( + @Nullable ItineraryListFilter decorator ) { - this.stopConsolidationFilter = filter; + this.stopConsolidationDecorator = decorator; + return this; + } + + public ItineraryListFilterChainBuilder withTransitAlerts( + TransitAlertService transitAlertService, + Function getMultiModalStation + ) { + this.transitAlertService = transitAlertService; + this.getMultiModalStation = getMultiModalStation; + return this; } @@ -366,27 +376,12 @@ public ItineraryListFilterChain build() { } if (minBikeParkingDistance > 0) { + // TODO: use addRmFilter() here filters.add( new RemoveItinerariesWithShortStreetLeg(minBikeParkingDistance, TraverseMode.BICYCLE) ); } - if (accessibilityScore) { - filters.add(new AccessibilityScoreFilter(wheelchairMaxSlope)); - } - - if (faresFilter != null) { - filters.add(faresFilter); - } - - if (emissionsFilter != null) { - filters.add(emissionsFilter); - } - - if (transitAlertService != null) { - filters.add(new DecorateTransitAlert(transitAlertService, getMultiModalStation)); - } - // Filter transit itineraries on generalized-cost if (transitGeneralizedCostFilterParams != null) { addRmFilter( @@ -445,9 +440,9 @@ public ItineraryListFilterChain build() { } // Paging related filters - these filters are run after group-by filters to allow a result - // outside the page to also take effect inside the window. This is debatable but lead to less - // noise, however it is not deterministic because the result depends on the size of the search-window and - // where the "cut" between each page is located. + // outside the page to also take effect inside the window. This is debatable, but leads to less + // noise; However, it is not deterministic because the result depends on the size of the + // search-window and where the "cut" between each page is located. { // Limit to search-window if (earliestDepartureTime != null) { @@ -476,18 +471,34 @@ public ItineraryListFilterChain build() { // Do the final itineraries sort filters.add(new SortingFilter(SortOrderComparator.comparator(sortOrder))); - // Sandbox filters to decorate itineraries + // Decorate itineraries + { + if (transitAlertService != null) { + filters.add(new DecorateTransitAlert(transitAlertService, getMultiModalStation)); + } + + // Sandbox filters to decorate itineraries - if (faresFilter != null) { - filters.add(faresFilter); - } + if (accessibilityScore) { + // TODO: This should be injected to avoid circular dependencies (dep. on sandbox here) + filters.add(new DecorateWithAccessibilityScore(wheelchairMaxSlope)); + } - if (rideHailingFilter != null) { - filters.add(rideHailingFilter); - } + if (emissionDecorator != null) { + filters.add(emissionDecorator); + } - if (stopConsolidationFilter != null) { - filters.add(stopConsolidationFilter); + if (fareDecorator != null) { + filters.add(fareDecorator); + } + + if (rideHailingDecorator != null) { + filters.add(rideHailingDecorator); + } + + if (stopConsolidationDecorator != null) { + filters.add(stopConsolidationDecorator); + } } var debugHandler = new DeleteResultHandler(debug, maxNumberOfItineraries); @@ -495,16 +506,6 @@ public ItineraryListFilterChain build() { return new ItineraryListFilterChain(filters, debugHandler); } - public ItineraryListFilterChainBuilder withTransitAlerts( - TransitAlertService transitAlertService, - Function getMultiModalStation - ) { - this.transitAlertService = transitAlertService; - this.getMultiModalStation = getMultiModalStation; - - return this; - } - /** * If enabled, this adds the filter to remove itineraries which have the same stops and routes. * These are sometimes called "time-shifted duplicates" but since those terms have so many diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java index c9254b246e7..010828c4cff 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java @@ -11,6 +11,9 @@ * leg followed by parking the bike and taking transit. In such a case you would not need a bike * could just walk to the stop instead. *

    + * TODO: THIS FILTER DOES NOT FOLLOW THE ITINERARY FILTER FRAMEWORK. This filter should implement the + * {@link org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger}. + * * TODO: This filter build on assumptions that is more or less an implementation detail. The * filter should compare itineraries and remove them if a condition is meet, not just * assume that a better option exist. Perhaps the access and egress should be filtered diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java index 2f1c531e102..ab839f14798 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java @@ -4,10 +4,10 @@ import java.time.Instant; import java.util.List; import java.util.function.Consumer; -import org.opentripplanner.ext.emissions.EmissionsFilter; -import org.opentripplanner.ext.fares.FaresFilter; -import org.opentripplanner.ext.ridehailing.RideHailingFilter; -import org.opentripplanner.ext.stopconsolidation.ConsolidatedStopNameFilter; +import org.opentripplanner.ext.emissions.DecorateWithEmission; +import org.opentripplanner.ext.fares.DecorateWithFare; +import org.opentripplanner.ext.ridehailing.DecorateWithRideHailing; +import org.opentripplanner.ext.stopconsolidation.DecorateConsolidatedStopNames; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.model.plan.paging.cursor.PageCursorInput; import org.opentripplanner.routing.algorithm.filterchain.ItineraryListFilterChain; @@ -96,22 +96,22 @@ public static ItineraryListFilterChain createFilterChain( var fareService = context.graph().getFareService(); if (fareService != null) { - builder.withFaresFilter(new FaresFilter(fareService)); + builder.withFareDecorator(new DecorateWithFare(fareService)); } if (!context.rideHailingServices().isEmpty()) { - builder.withRideHailingFilter( - new RideHailingFilter(context.rideHailingServices(), request.wheelchair()) + builder.withRideHailingDecorator( + new DecorateWithRideHailing(context.rideHailingServices(), request.wheelchair()) ); } if (OTPFeature.Co2Emissions.isOn() && context.emissionsService() != null) { - builder.withEmissions(new EmissionsFilter(context.emissionsService())); + builder.withEmissions(new DecorateWithEmission(context.emissionsService())); } if (context.stopConsolidationService() != null) { - builder.withStopConsolidationFilter( - new ConsolidatedStopNameFilter(context.stopConsolidationService()) + builder.withConsolidatedStopNamesDecorator( + new DecorateConsolidatedStopNames(context.stopConsolidationService()) ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java index 0591ae7ce4e..d897c948e6d 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainTest.java @@ -20,9 +20,9 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.mockito.Mockito; +import org.opentripplanner.ext.emissions.DecorateWithEmission; import org.opentripplanner.ext.emissions.DefaultEmissionsService; import org.opentripplanner.ext.emissions.EmissionsDataModel; -import org.opentripplanner.ext.emissions.EmissionsFilter; import org.opentripplanner.ext.emissions.EmissionsService; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.plan.Itinerary; @@ -365,7 +365,9 @@ public void setUpItineraries() { @Test public void emissionsTest() { - ItineraryListFilterChain chain = builder.withEmissions(new EmissionsFilter(eService)).build(); + ItineraryListFilterChain chain = builder + .withEmissions(new DecorateWithEmission(eService)) + .build(); List itineraries = chain.filter(List.of(bus, car)); assertFalse(itineraries.stream().anyMatch(i -> i.getEmissionsPerPerson().getCo2() == null)); } From d4e28f746ae7f9f93e24554a4fe2326cccfb8500 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 20:46:19 +0100 Subject: [PATCH 0197/1688] Add tests --- pom.xml | 1 - .../opentripplanner/astar/model/BinHeap.java | 14 --------- .../strategy/MaxCountSkipEdgeStrategy.java | 2 +- .../module/NearbyStopFinder.java | 16 ++++------ .../MaxCountSkipEdgeStrategyTest.java | 12 ++++++-- .../model/_data/StreetModelForTest.java | 1 + .../street/search/state/TestStateBuilder.java | 29 +++++++++++++++++-- 7 files changed, 44 insertions(+), 31 deletions(-) diff --git a/pom.xml b/pom.xml index de8baecefd9..29b1f14dc09 100644 --- a/pom.xml +++ b/pom.xml @@ -282,7 +282,6 @@ --add-opens java.base/jdk.internal.loader=ALL-UNNAMED --add-opens java.base/jdk.internal.ref=ALL-UNNAMED --add-opens java.base/jdk.internal.util=ALL-UNNAMED - --add-opens java.base/jdk.internal.util.jar=ALL-UNNAMED --add-opens java.base/jdk.internal.module=ALL-UNNAMED --add-opens java.base/sun.net.www.protocol.http=ALL-UNNAMED --add-opens java.base/sun.net.www.protocol.jar=ALL-UNNAMED diff --git a/src/main/java/org/opentripplanner/astar/model/BinHeap.java b/src/main/java/org/opentripplanner/astar/model/BinHeap.java index f1c39f12b61..1e9b540a77a 100644 --- a/src/main/java/org/opentripplanner/astar/model/BinHeap.java +++ b/src/main/java/org/opentripplanner/astar/model/BinHeap.java @@ -1,7 +1,6 @@ package org.opentripplanner.astar.model; import java.util.Arrays; -import org.opentripplanner.framework.tostring.ToStringBuilder; public class BinHeap { @@ -80,14 +79,6 @@ public void rekey(T e, double p) { prio[i] = p; } - public void dump() { - for (int i = 0; i <= capacity; i++) { - String topMarker = (i > size) ? "(UNUSED)" : ""; - System.out.printf("%d\t%f\t%s\t%s\n", i, prio[i], elem[i], topMarker); - } - System.out.printf("-----------------------\n"); - } - public void reset() { // empties the queue in one operation size = 0; @@ -136,9 +127,4 @@ public void resize(int capacity) { prio = Arrays.copyOf(prio, capacity + 1); elem = Arrays.copyOf(elem, capacity + 1); } - - @Override - public String toString() { - return ToStringBuilder.of().addNum("size", size).toString(); - } } diff --git a/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java b/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java index f719ed371ac..0369e3e29db 100644 --- a/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java +++ b/src/main/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategy.java @@ -26,7 +26,7 @@ public MaxCountSkipEdgeStrategy(int count, Predicate shouldIncreaseCount) @Override public boolean shouldSkipEdge(State current, Edge edge) { - if (current.isFinal() && shouldIncreaseCount.test(current)) { + if (shouldIncreaseCount.test(current)) { visited++; } return visited > maxCount; diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index 4caa04d7892..13fbfec2b17 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -228,14 +228,11 @@ public List findNearbyStopsViaStreets( Vertex targetVertex = state.getVertex(); if (originVertices.contains(targetVertex)) continue; if (targetVertex instanceof TransitStopVertex tsv && state.isFinal()) { - stopsFound.add( - NearbyStop.nearbyStopForState(state, tsv.getStop()) - ); + stopsFound.add(NearbyStop.nearbyStopForState(state, tsv.getStop())); } if ( OTPFeature.FlexRouting.isOn() && - targetVertex instanceof StreetVertex streetVertex && - !streetVertex.areaStops().isEmpty() + targetVertex instanceof StreetVertex streetVertex && !streetVertex.areaStops().isEmpty() ) { for (AreaStop areaStop : ((StreetVertex) targetVertex).areaStops()) { // This is for a simplification, so that we only return one vertex from each @@ -312,10 +309,7 @@ private SkipEdgeStrategy getSkipEdgeStrategy( return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } else { if (maxStopCount > 0) { - var strategy = new MaxCountSkipEdgeStrategy<>( - maxStopCount, - NearbyStopFinder::isTransitVertex - ); + var strategy = new MaxCountSkipEdgeStrategy<>(maxStopCount, NearbyStopFinder::hasFoundStop); return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } return durationSkipEdgeStrategy; @@ -368,7 +362,7 @@ private boolean canBoardFlex(State state, boolean reverse) { /** * Checks if the {@code state} as at a transit vertex. */ - public static boolean isTransitVertex(State state) { - return state.getVertex() instanceof TransitStopVertex; + public static boolean hasFoundStop(State state) { + return state.getVertex() instanceof TransitStopVertex && state.isFinal(); } } diff --git a/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java b/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java index 04844d65da2..85d9fe72ec3 100644 --- a/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java +++ b/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java @@ -12,7 +12,7 @@ class MaxCountSkipEdgeStrategyTest { @Test void countStops() { var state = TestStateBuilder.ofWalking().stop().build(); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::isTransitVertex); + var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasFoundStop); assertFalse(strategy.shouldSkipEdge(state, null)); assertTrue(strategy.shouldSkipEdge(state, null)); } @@ -20,9 +20,17 @@ void countStops() { @Test void doNotCountStop() { var state = TestStateBuilder.ofWalking().build(); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::isTransitVertex); + var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasFoundStop); assertFalse(strategy.shouldSkipEdge(state, null)); assertFalse(strategy.shouldSkipEdge(state, null)); assertFalse(strategy.shouldSkipEdge(state, null)); } + + @Test + void nonFinalState() { + var state = TestStateBuilder.ofScooterRentalArriveBy().stop().build(); + assertFalse(state.isFinal()); + var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasFoundStop); + assertFalse(strategy.shouldSkipEdge(state, null)); + } } diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java index 1f3dbf8c4c9..0ac1762ae6f 100644 --- a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java +++ b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java @@ -93,4 +93,5 @@ public static StreetEdge streetEdge( ) { return streetEdge(from, to, 1, permissions); } + } diff --git a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java index 042ff5ba553..752985de51e 100644 --- a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java +++ b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java @@ -1,6 +1,7 @@ package org.opentripplanner.street.search.state; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType.EGRESS; import static org.opentripplanner.transit.model.site.PathwayMode.WALKWAY; import java.time.Instant; @@ -10,6 +11,7 @@ import javax.annotation.Nonnull; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder; @@ -20,6 +22,7 @@ import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model._data.StreetModelForTest; +import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.ElevatorAlightEdge; import org.opentripplanner.street.model.edge.ElevatorBoardEdge; import org.opentripplanner.street.model.edge.ElevatorHopEdge; @@ -51,10 +54,19 @@ public class TestStateBuilder { private State currentState; private TestStateBuilder(StreetMode mode) { + this(mode, AccessEgressType.ACCESS); + } + + private TestStateBuilder(StreetMode mode, AccessEgressType type) { currentState = new State( StreetModelForTest.intersectionVertex(count, count), - StreetSearchRequest.of().withMode(mode).withStartTime(DEFAULT_START_TIME).build() + StreetSearchRequest + .of() + .withArriveBy(type.isEgress()) + .withMode(mode) + .withStartTime(DEFAULT_START_TIME) + .build() ); } @@ -80,6 +92,14 @@ public static TestStateBuilder ofScooterRental() { return new TestStateBuilder(StreetMode.SCOOTER_RENTAL); } + /** + * Creates a state starts the scooter rental but in arriveBy mode, so therefore starting with + * a rental scooter and going backwards until it finds a rental vertex where to drop it. + */ + public static TestStateBuilder ofScooterRentalArriveBy() { + return new TestStateBuilder(StreetMode.SCOOTER_RENTAL, EGRESS); + } + public static TestStateBuilder ofBikeRental() { return new TestStateBuilder(StreetMode.BIKE_RENTAL); } @@ -248,7 +268,12 @@ private TestStateBuilder arriveAtStop(RegularStop stop) { var from = (StreetVertex) currentState.vertex; var to = new TransitStopVertexBuilder().withStop(stop).build(); - var edge = StreetTransitStopLink.createStreetTransitStopLink(from, to); + Edge edge; + if (currentState.getRequest().arriveBy()) { + edge = StreetTransitStopLink.createStreetTransitStopLink(to, from); + } else { + edge = StreetTransitStopLink.createStreetTransitStopLink(from, to); + } var states = edge.traverse(currentState); if (states.length != 1) { throw new IllegalStateException("Only single state transitions are supported."); From 67d6443655c449dcbd99f973f1dfda2f12a6d3bf Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 22:32:28 +0100 Subject: [PATCH 0198/1688] Improve documentation --- .../module/NearbyStopFinder.java | 30 +++++++++++-------- .../MaxCountSkipEdgeStrategyTest.java | 6 ++-- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index 13fbfec2b17..09d8024eca0 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -47,14 +47,8 @@ import org.opentripplanner.transit.service.TransitService; /** - * These library functions are used by the streetless and streetful stop linkers, and in profile - * transfer generation. - * TODO OTP2 Fold these into org.opentripplanner.routing.graphfinder.StreetGraphFinder - * These are not library functions, this is instantiated as an object. Define lifecycle of the object (reuse?). - * Because AStar instances should only be used once, NearbyStopFinder should only be used once. - * Ideally they could also be used in long distance mode and profile routing for the street segments. - * For each stop, it finds the closest stops on all other patterns. This reduces the number of transfer edges - * significantly compared to simple radius-constrained all-to-all stop linkage. + * This class contains code for finding nearby stops from a given vertex. It is being used by access + * and egress searches as well as transfer generation. */ public class NearbyStopFinder { @@ -100,6 +94,8 @@ public NearbyStopFinder( * that the result will include the origin vertex if it is an instance of StopVertex. This is * intentional: we don't want to return the next stop down the line for trip patterns that pass * through the origin vertex. + * Taking the patterns into account reduces the number of transfers significantly compared to + * simple traverse-duration-constrained all-to-all stop linkage. */ public Set findNearbyStopsConsideringPatterns( Vertex vertex, @@ -309,7 +305,7 @@ private SkipEdgeStrategy getSkipEdgeStrategy( return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } else { if (maxStopCount > 0) { - var strategy = new MaxCountSkipEdgeStrategy<>(maxStopCount, NearbyStopFinder::hasFoundStop); + var strategy = new MaxCountSkipEdgeStrategy<>(maxStopCount, NearbyStopFinder::hasReachedStop); return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } return durationSkipEdgeStrategy; @@ -355,14 +351,24 @@ private boolean canBoardFlex(State state, boolean reverse) { return edges .stream() .anyMatch(e -> - e instanceof StreetEdge && ((StreetEdge) e).getPermission().allows(TraverseMode.CAR) + e instanceof StreetEdge se && se.getPermission().allows(TraverseMode.CAR) ); } /** - * Checks if the {@code state} as at a transit vertex. + * Checks if the {@code state} is at a transit vertex and if it's final, which means that the state + * can actually board a vehicle. + *

    + * This is important because there can be cases where states that cannot actually board the vehicle + * can dominate those that can thereby leading to zero found stops when this predicate is used with + * the {@link MaxCountSkipEdgeStrategy}. + *

    + * An example of this would be an egress/reverse search with a very high walk reluctance where + * the states that speculatively rent a vehicle move the walk states down the A* priority queue + * until the required number of stops are reached to abort the search, leading to zero egress + * results. */ - public static boolean hasFoundStop(State state) { + public static boolean hasReachedStop(State state) { return state.getVertex() instanceof TransitStopVertex && state.isFinal(); } } diff --git a/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java b/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java index 85d9fe72ec3..17dc26a4c5e 100644 --- a/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java +++ b/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java @@ -12,7 +12,7 @@ class MaxCountSkipEdgeStrategyTest { @Test void countStops() { var state = TestStateBuilder.ofWalking().stop().build(); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasFoundStop); + var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasReachedStop); assertFalse(strategy.shouldSkipEdge(state, null)); assertTrue(strategy.shouldSkipEdge(state, null)); } @@ -20,7 +20,7 @@ void countStops() { @Test void doNotCountStop() { var state = TestStateBuilder.ofWalking().build(); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasFoundStop); + var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasReachedStop); assertFalse(strategy.shouldSkipEdge(state, null)); assertFalse(strategy.shouldSkipEdge(state, null)); assertFalse(strategy.shouldSkipEdge(state, null)); @@ -30,7 +30,7 @@ void doNotCountStop() { void nonFinalState() { var state = TestStateBuilder.ofScooterRentalArriveBy().stop().build(); assertFalse(state.isFinal()); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasFoundStop); + var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasReachedStop); assertFalse(strategy.shouldSkipEdge(state, null)); } } From 623b626a5b22d75f7bf8079ae2eee369b75ce52a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 22:51:16 +0100 Subject: [PATCH 0199/1688] Run speed test on branch --- .github/workflows/performance-test.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index c2168a79a06..d764fdbeff0 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -4,6 +4,7 @@ on: push: branches: - dev-2.x + - max-count-rental jobs: perf-test: From f2bc21fcf5b8d5d6b69370c239def28adee8f0bb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 22:53:25 +0100 Subject: [PATCH 0200/1688] Fix formatting --- .../graph_builder/module/NearbyStopFinder.java | 9 +++++---- .../street/model/_data/StreetModelForTest.java | 1 - 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index 09d8024eca0..360cdaee363 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -305,7 +305,10 @@ private SkipEdgeStrategy getSkipEdgeStrategy( return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } else { if (maxStopCount > 0) { - var strategy = new MaxCountSkipEdgeStrategy<>(maxStopCount, NearbyStopFinder::hasReachedStop); + var strategy = new MaxCountSkipEdgeStrategy<>( + maxStopCount, + NearbyStopFinder::hasReachedStop + ); return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } return durationSkipEdgeStrategy; @@ -350,9 +353,7 @@ private boolean canBoardFlex(State state, boolean reverse) { return edges .stream() - .anyMatch(e -> - e instanceof StreetEdge se && se.getPermission().allows(TraverseMode.CAR) - ); + .anyMatch(e -> e instanceof StreetEdge se && se.getPermission().allows(TraverseMode.CAR)); } /** diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java index 0ac1762ae6f..1f3dbf8c4c9 100644 --- a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java +++ b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java @@ -93,5 +93,4 @@ public static StreetEdge streetEdge( ) { return streetEdge(from, to, 1, permissions); } - } From 63327b72b243052806602a5fbd8d3b7c9ec4b70e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 23:04:43 +0100 Subject: [PATCH 0201/1688] Move classes according to review feedback --- .../ext/restapi}/mapping/EnumMapperTest.java | 5 +---- .../ext/restapi}/mapping/FareMapperTest.java | 3 +-- .../ext/restapi/model/ApiTravelOptionsMakerTest.java} | 6 ++---- .../opentripplanner/ext/restapi}/model/ApiWalkStepTest.java | 3 +-- .../ext/restapi}/parameter/ApiRequestModeTest.java | 4 +++- .../ext/restapi}/parameter/QualifiedModeSetTest.java | 4 +++- .../ext/restapi}/parameter/QualifiedModeTest.java | 5 ++++- .../org/opentripplanner/ext/restapi/resources/IndexAPI.java | 2 +- .../ext/restapi/resources/PlannerResource.java | 2 +- .../ext/vectortiles/VectorTilesResource.java | 2 +- .../layers/stations/DigitransitStationPropertyMapper.java | 2 +- .../vectortiles/layers/stations/StationsLayerBuilder.java | 2 +- .../layers/stops/DigitransitStopPropertyMapper.java | 2 +- .../ext/vectortiles/layers/stops/StopsLayerBuilder.java | 2 +- .../DigitransitVehicleParkingGroupPropertyMapper.java | 2 +- .../DigitransitVehicleParkingPropertyMapper.java | 2 +- .../StadtnaviVehicleParkingPropertyMapper.java | 2 +- .../vehicleparkings/VehicleParkingGroupsLayerBuilder.java | 2 +- .../layers/vehicleparkings/VehicleParkingsLayerBuilder.java | 2 +- .../layers/vehiclerental/VehicleRentalLayerBuilder.java | 2 +- ...gitransitRealtimeVehicleRentalStationPropertyMapper.java | 2 +- .../mapper/DigitransitRentalVehiclePropertyMapper.java | 2 +- .../mapper/DigitransitVehicleRentalPropertyMapper.java | 2 +- .../DigitransitVehicleRentalStationPropertyMapper.java | 2 +- .../api/resource/GraphInspectorVectorTileResource.java | 2 +- .../opentripplanner/apis/gtfs/datafetchers/PatternImpl.java | 2 +- .../opentripplanner/apis/gtfs/datafetchers/PlanImpl.java | 2 +- .../apis/gtfs/datafetchers/RoutingErrorImpl.java | 2 +- .../opentripplanner/apis/gtfs/datafetchers/TripImpl.java | 2 +- .../apis/{common => support}/SemanticHash.java | 2 +- .../opentripplanner/apis/{common => support}/TileJson.java | 2 +- .../{common => support}/mapping/PlannerErrorMapper.java | 2 +- .../apis/{common => support}/mapping/PropertyMapper.java | 2 +- .../apis/transmodel/model/plan/RoutingErrorType.java | 2 +- .../apis/transmodel/model/plan/TripType.java | 2 +- .../opentripplanner/framework/i18n/I18NStringMapper.java | 0 .../inspector/vector/AreaStopsLayerBuilder.java | 2 +- .../inspector/vector/DebugClientAreaStopPropertyMapper.java | 2 +- .../org/opentripplanner/inspector/vector/LayerBuilder.java | 2 +- .../opentripplanner/inspector/vector/LayerParameters.java | 2 +- .../vector/geofencing/GeofencingZonesLayerBuilder.java | 2 +- .../vector/geofencing/GeofencingZonesPropertyMapper.java | 2 +- 42 files changed, 49 insertions(+), 49 deletions(-) rename src/{test/java/org/opentripplanner/api => ext-test/java/org/opentripplanner/ext/restapi}/mapping/EnumMapperTest.java (91%) rename src/{test/java/org/opentripplanner/api => ext-test/java/org/opentripplanner/ext/restapi}/mapping/FareMapperTest.java (91%) rename src/{test/java/org/opentripplanner/api/model/ApiApiTravelOptionsMakerTest.java => ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java} (96%) rename src/{test/java/org/opentripplanner/api => ext-test/java/org/opentripplanner/ext/restapi}/model/ApiWalkStepTest.java (91%) rename src/{test/java/org/opentripplanner/api => ext-test/java/org/opentripplanner/ext/restapi}/parameter/ApiRequestModeTest.java (69%) rename src/{test/java/org/opentripplanner/api => ext-test/java/org/opentripplanner/ext/restapi}/parameter/QualifiedModeSetTest.java (97%) rename src/{test/java/org/opentripplanner/api => ext-test/java/org/opentripplanner/ext/restapi}/parameter/QualifiedModeTest.java (82%) rename src/main/java/org/opentripplanner/apis/{common => support}/SemanticHash.java (99%) rename src/main/java/org/opentripplanner/apis/{common => support}/TileJson.java (97%) rename src/main/java/org/opentripplanner/apis/{common => support}/mapping/PlannerErrorMapper.java (97%) rename src/main/java/org/opentripplanner/apis/{common => support}/mapping/PropertyMapper.java (96%) rename src/{ext => main}/java/org/opentripplanner/framework/i18n/I18NStringMapper.java (100%) diff --git a/src/test/java/org/opentripplanner/api/mapping/EnumMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java similarity index 91% rename from src/test/java/org/opentripplanner/api/mapping/EnumMapperTest.java rename to src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java index 956b2aa065e..35cc368fec4 100644 --- a/src/test/java/org/opentripplanner/api/mapping/EnumMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/EnumMapperTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.mapping; +package org.opentripplanner.ext.restapi.mapping; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -8,9 +8,6 @@ import java.util.Map; import java.util.function.Function; import org.junit.jupiter.api.Test; -import org.opentripplanner.ext.restapi.mapping.AbsoluteDirectionMapper; -import org.opentripplanner.ext.restapi.mapping.RelativeDirectionMapper; -import org.opentripplanner.ext.restapi.mapping.VertexTypeMapper; import org.opentripplanner.ext.restapi.model.ApiAbsoluteDirection; import org.opentripplanner.ext.restapi.model.ApiRelativeDirection; import org.opentripplanner.ext.restapi.model.ApiVertexType; diff --git a/src/test/java/org/opentripplanner/api/mapping/FareMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java similarity index 91% rename from src/test/java/org/opentripplanner/api/mapping/FareMapperTest.java rename to src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java index 0d13a77e7c9..bd1bd07aa43 100644 --- a/src/test/java/org/opentripplanner/api/mapping/FareMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.mapping; +package org.opentripplanner.ext.restapi.mapping; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; @@ -6,7 +6,6 @@ import java.util.List; import java.util.Locale; import org.junit.jupiter.api.Test; -import org.opentripplanner.ext.restapi.mapping.FareMapper; import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; diff --git a/src/test/java/org/opentripplanner/api/model/ApiApiTravelOptionsMakerTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java similarity index 96% rename from src/test/java/org/opentripplanner/api/model/ApiApiTravelOptionsMakerTest.java rename to src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java index 16e0ae1547e..fdcd0a7fe20 100644 --- a/src/test/java/org/opentripplanner/api/model/ApiApiTravelOptionsMakerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiTravelOptionsMakerTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.model; +package org.opentripplanner.ext.restapi.model; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -6,14 +6,12 @@ import java.util.List; import java.util.Set; import org.junit.jupiter.api.Test; -import org.opentripplanner.ext.restapi.model.ApiTravelOption; -import org.opentripplanner.ext.restapi.model.ApiTravelOptionsMaker; import org.opentripplanner.transit.model.basic.TransitMode; /** * Created by mabu on 28.7.2015. */ -public class ApiApiTravelOptionsMakerTest { +public class ApiTravelOptionsMakerTest { @Test public void testMakeOptions() throws Exception { diff --git a/src/test/java/org/opentripplanner/api/model/ApiWalkStepTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiWalkStepTest.java similarity index 91% rename from src/test/java/org/opentripplanner/api/model/ApiWalkStepTest.java rename to src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiWalkStepTest.java index fe265b05081..7f6909bfc2c 100644 --- a/src/test/java/org/opentripplanner/api/model/ApiWalkStepTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/model/ApiWalkStepTest.java @@ -1,10 +1,9 @@ -package org.opentripplanner.api.model; +package org.opentripplanner.ext.restapi.model; import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner.ext.restapi.model.ApiWalkStep; public class ApiWalkStepTest { diff --git a/src/test/java/org/opentripplanner/api/parameter/ApiRequestModeTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/ApiRequestModeTest.java similarity index 69% rename from src/test/java/org/opentripplanner/api/parameter/ApiRequestModeTest.java rename to src/ext-test/java/org/opentripplanner/ext/restapi/parameter/ApiRequestModeTest.java index caf26510b2a..13cfc43c59c 100644 --- a/src/test/java/org/opentripplanner/api/parameter/ApiRequestModeTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/ApiRequestModeTest.java @@ -1,10 +1,12 @@ -package org.opentripplanner.api.parameter; +package org.opentripplanner.ext.restapi.parameter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.transit.model.basic.TransitMode.CARPOOL; import java.util.List; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.opentripplanner.api.parameter.ApiRequestMode; class ApiRequestModeTest { diff --git a/src/test/java/org/opentripplanner/api/parameter/QualifiedModeSetTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java similarity index 97% rename from src/test/java/org/opentripplanner/api/parameter/QualifiedModeSetTest.java rename to src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java index ba5a39abe89..ad344713a74 100644 --- a/src/test/java/org/opentripplanner/api/parameter/QualifiedModeSetTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeSetTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.parameter; +package org.opentripplanner.ext.restapi.parameter; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -26,6 +26,8 @@ import jakarta.ws.rs.BadRequestException; import java.util.Set; import org.junit.jupiter.api.Test; +import org.opentripplanner.api.parameter.QualifiedMode; +import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.routing.api.request.RequestModes; import org.opentripplanner.transit.model.basic.TransitMode; diff --git a/src/test/java/org/opentripplanner/api/parameter/QualifiedModeTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeTest.java similarity index 82% rename from src/test/java/org/opentripplanner/api/parameter/QualifiedModeTest.java rename to src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeTest.java index e4c4c9448fc..3a682ba40c9 100644 --- a/src/test/java/org/opentripplanner/api/parameter/QualifiedModeTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/parameter/QualifiedModeTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.parameter; +package org.opentripplanner.ext.restapi.parameter; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -6,6 +6,9 @@ import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.Test; +import org.opentripplanner.api.parameter.ApiRequestMode; +import org.opentripplanner.api.parameter.QualifiedMode; +import org.opentripplanner.api.parameter.Qualifier; public class QualifiedModeTest { diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java index 90fd12a1c7c..5bdda8a57a2 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java @@ -25,7 +25,7 @@ import java.util.stream.Collectors; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; -import org.opentripplanner.apis.common.SemanticHash; +import org.opentripplanner.apis.support.SemanticHash; import org.opentripplanner.ext.restapi.mapping.AgencyMapper; import org.opentripplanner.ext.restapi.mapping.AlertMapper; import org.opentripplanner.ext.restapi.mapping.FeedInfoMapper; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java index ac1ee80df95..0b6a06f0b5d 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java @@ -11,7 +11,7 @@ import org.glassfish.grizzly.http.server.Request; import org.opentripplanner.api.common.Message; import org.opentripplanner.api.model.error.PlannerError; -import org.opentripplanner.apis.common.mapping.PlannerErrorMapper; +import org.opentripplanner.apis.support.mapping.PlannerErrorMapper; import org.opentripplanner.ext.restapi.mapping.TripPlanMapper; import org.opentripplanner.ext.restapi.mapping.TripSearchMetadataMapper; import org.opentripplanner.ext.restapi.model.ElevationMetadata; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index 96093884a25..af2715d6928 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.function.Predicate; import org.glassfish.grizzly.http.server.Request; -import org.opentripplanner.apis.common.TileJson; +import org.opentripplanner.apis.support.TileJson; import org.opentripplanner.ext.vectortiles.layers.stations.StationsLayerBuilder; import org.opentripplanner.ext.vectortiles.layers.stops.StopsLayerBuilder; import org.opentripplanner.ext.vectortiles.layers.vehicleparkings.VehicleParkingGroupsLayerBuilder; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java index b7b21e01c38..a828cd37a7c 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.Map; import java.util.stream.Collectors; import org.json.simple.JSONArray; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.framework.FeedScopedId; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java index 1b09d2e8c5d..449a1489d89 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/StationsLayerBuilder.java @@ -9,7 +9,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Point; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.inspector.vector.LayerBuilder; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java index d2b72e36cd3..2c5a4519e96 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java @@ -8,7 +8,7 @@ import java.util.stream.Collectors; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.network.TripPattern; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java index e57e3e48cb0..6d15816669e 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java @@ -7,7 +7,7 @@ import java.util.stream.Collectors; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java index 66cb6060ca9..33f415c157a 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java @@ -5,7 +5,7 @@ import java.util.Locale; import org.json.simple.JSONArray; import org.json.simple.JSONObject; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java index 27d2b78776b..892d4907395 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingPropertyMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import javax.annotation.Nonnull; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.routing.vehicle_parking.VehicleParking; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java index 7ff573864a2..c938f9736fd 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java @@ -4,7 +4,7 @@ import java.util.List; import java.util.Locale; import org.json.simple.JSONObject; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.model.calendar.openinghours.OsmOpeningHoursSupport; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java index 59440b78ab7..0cd1d84868b 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerBuilder.java @@ -8,7 +8,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Point; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.inspector.vector.LayerBuilder; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java index 7a43044d40c..95326172415 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerBuilder.java @@ -11,7 +11,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Point; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.inspector.vector.LayerBuilder; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java index 06fecf26e57..0869aeb2ba8 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java @@ -7,7 +7,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Point; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.inspector.vector.LayerBuilder; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java index 87b5cf9e126..4ceb7124d52 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRealtimeVehicleRentalStationPropertyMapper.java @@ -7,7 +7,7 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java index 1450b7855bd..33e661866bc 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitRentalVehiclePropertyMapper.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Collection; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java index 90e553e6320..3114b072934 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalPropertyMapper.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java index 6d82f592b38..67fb00efa85 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/mapper/DigitransitVehicleRentalStationPropertyMapper.java @@ -5,7 +5,7 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; diff --git a/src/main/java/org/opentripplanner/api/resource/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/api/resource/GraphInspectorVectorTileResource.java index 89905298e66..8c50b2e3bdc 100644 --- a/src/main/java/org/opentripplanner/api/resource/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/api/resource/GraphInspectorVectorTileResource.java @@ -17,7 +17,7 @@ import java.util.Objects; import java.util.function.Predicate; import org.glassfish.grizzly.http.server.Request; -import org.opentripplanner.apis.common.TileJson; +import org.opentripplanner.apis.support.TileJson; import org.opentripplanner.inspector.vector.AreaStopsLayerBuilder; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java index 5c121a6dd07..88db00c3c4e 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PatternImpl.java @@ -13,10 +13,10 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.apis.common.SemanticHash; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.apis.support.SemanticHash; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.routing.alertpatch.EntitySelector; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java index 36dc4a987d8..b9bdfde9cbc 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanImpl.java @@ -4,8 +4,8 @@ import graphql.schema.DataFetchingEnvironment; import java.util.stream.Collectors; import org.opentripplanner.api.resource.DebugOutput; -import org.opentripplanner.apis.common.mapping.PlannerErrorMapper; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; +import org.opentripplanner.apis.support.mapping.PlannerErrorMapper; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.paging.cursor.PageCursor; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java index d80db923df6..5c4bd7099c6 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RoutingErrorImpl.java @@ -4,9 +4,9 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; -import org.opentripplanner.apis.common.mapping.PlannerErrorMapper; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.apis.support.mapping.PlannerErrorMapper; import org.opentripplanner.routing.api.response.RoutingError; public class RoutingErrorImpl implements GraphQLDataFetchers.GraphQLRoutingError { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java index c9b1abdaa64..21bff637976 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/TripImpl.java @@ -15,7 +15,6 @@ import java.util.stream.Collectors; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.apis.common.SemanticHash; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.GraphQLUtils; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; @@ -23,6 +22,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed; import org.opentripplanner.apis.gtfs.mapping.BikesAllowedMapper; import org.opentripplanner.apis.gtfs.model.TripOccupancy; +import org.opentripplanner.apis.support.SemanticHash; import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TripTimeOnDate; diff --git a/src/main/java/org/opentripplanner/apis/common/SemanticHash.java b/src/main/java/org/opentripplanner/apis/support/SemanticHash.java similarity index 99% rename from src/main/java/org/opentripplanner/apis/common/SemanticHash.java rename to src/main/java/org/opentripplanner/apis/support/SemanticHash.java index 73ef2da906c..2d1f35977fa 100644 --- a/src/main/java/org/opentripplanner/apis/common/SemanticHash.java +++ b/src/main/java/org/opentripplanner/apis/support/SemanticHash.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common; +package org.opentripplanner.apis.support; import com.google.common.hash.HashCode; import com.google.common.hash.HashFunction; diff --git a/src/main/java/org/opentripplanner/apis/common/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java similarity index 97% rename from src/main/java/org/opentripplanner/apis/common/TileJson.java rename to src/main/java/org/opentripplanner/apis/support/TileJson.java index c9b3856e932..2259d72d828 100644 --- a/src/main/java/org/opentripplanner/apis/common/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common; +package org.opentripplanner.apis.support; import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.UriInfo; diff --git a/src/main/java/org/opentripplanner/apis/common/mapping/PlannerErrorMapper.java b/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java similarity index 97% rename from src/main/java/org/opentripplanner/apis/common/mapping/PlannerErrorMapper.java rename to src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java index b85986c930b..a606cb75a52 100644 --- a/src/main/java/org/opentripplanner/apis/common/mapping/PlannerErrorMapper.java +++ b/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common.mapping; +package org.opentripplanner.apis.support.mapping; import java.util.List; import org.opentripplanner.api.common.Message; diff --git a/src/main/java/org/opentripplanner/apis/common/mapping/PropertyMapper.java b/src/main/java/org/opentripplanner/apis/support/mapping/PropertyMapper.java similarity index 96% rename from src/main/java/org/opentripplanner/apis/common/mapping/PropertyMapper.java rename to src/main/java/org/opentripplanner/apis/support/mapping/PropertyMapper.java index ad2868239a8..dfb7def85c7 100644 --- a/src/main/java/org/opentripplanner/apis/common/mapping/PropertyMapper.java +++ b/src/main/java/org/opentripplanner/apis/support/mapping/PropertyMapper.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.common.mapping; +package org.opentripplanner.apis.support.mapping; import edu.colorado.cires.cmg.mvt.VectorTile; import edu.colorado.cires.cmg.mvt.adapt.jts.IUserDataConverter; diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java index a8ae74dede2..215e1983ca0 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/RoutingErrorType.java @@ -7,7 +7,7 @@ import graphql.schema.GraphQLFieldDefinition; import graphql.schema.GraphQLNonNull; import graphql.schema.GraphQLObjectType; -import org.opentripplanner.apis.common.mapping.PlannerErrorMapper; +import org.opentripplanner.apis.support.mapping.PlannerErrorMapper; public class RoutingErrorType { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java index fcf794a7ca8..053b261c08e 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripType.java @@ -8,7 +8,7 @@ import graphql.schema.GraphQLNonNull; import graphql.schema.GraphQLObjectType; import java.util.stream.Collectors; -import org.opentripplanner.apis.common.mapping.PlannerErrorMapper; +import org.opentripplanner.apis.support.mapping.PlannerErrorMapper; import org.opentripplanner.apis.transmodel.model.PlanResponse; import org.opentripplanner.apis.transmodel.support.GqlUtil; import org.opentripplanner.framework.graphql.GraphQLUtils; diff --git a/src/ext/java/org/opentripplanner/framework/i18n/I18NStringMapper.java b/src/main/java/org/opentripplanner/framework/i18n/I18NStringMapper.java similarity index 100% rename from src/ext/java/org/opentripplanner/framework/i18n/I18NStringMapper.java rename to src/main/java/org/opentripplanner/framework/i18n/I18NStringMapper.java diff --git a/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java index 5f268d9f9bf..5e4539e1f5c 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/AreaStopsLayerBuilder.java @@ -7,7 +7,7 @@ import java.util.function.Function; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.TransitService; diff --git a/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java index fb50a25fd33..63c58dd9b05 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/DebugClientAreaStopPropertyMapper.java @@ -3,7 +3,7 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.TransitService; diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java index cec59ef136f..949bbef0a94 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/LayerBuilder.java @@ -10,7 +10,7 @@ import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryFactory; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.geometry.GeometryUtils; /** diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java index a36fdfad840..ca4a6a64c76 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java +++ b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java @@ -1,6 +1,6 @@ package org.opentripplanner.inspector.vector; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; /** * Configuration options for a single vector tile layer. diff --git a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java index 3948f95e8ee..1764451cc89 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesLayerBuilder.java @@ -4,7 +4,7 @@ import java.util.Map; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; diff --git a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java index 7321727076c..98c9cf23eca 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/geofencing/GeofencingZonesPropertyMapper.java @@ -6,7 +6,7 @@ import java.util.Collection; import java.util.List; -import org.opentripplanner.apis.common.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.street.model.vertex.Vertex; From 154cfe970b17c5b3bcb08bf47335e4592aec7819 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 23:06:15 +0100 Subject: [PATCH 0202/1688] Move PlannerError back --- .../opentripplanner/ext/restapi/model/TripPlannerResponse.java | 2 +- .../opentripplanner/ext/restapi/resources/PlannerResource.java | 2 +- .../java/org/opentripplanner/api}/error/PlannerError.java | 2 +- .../apis/support/mapping/PlannerErrorMapper.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/{ext/java/org/opentripplanner/ext/restapi/model => main/java/org/opentripplanner/api}/error/PlannerError.java (94%) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java b/src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java index 337301cddfd..28cce2dd669 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/model/TripPlannerResponse.java @@ -4,7 +4,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map.Entry; -import org.opentripplanner.api.model.error.PlannerError; +import org.opentripplanner.api.error.PlannerError; import org.opentripplanner.api.resource.DebugOutput; /** Represents a trip planner response, will be serialized into XML or JSON by Jersey */ diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java index 0b6a06f0b5d..38c70851b76 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java @@ -10,7 +10,7 @@ import jakarta.ws.rs.core.UriInfo; import org.glassfish.grizzly.http.server.Request; import org.opentripplanner.api.common.Message; -import org.opentripplanner.api.model.error.PlannerError; +import org.opentripplanner.api.error.PlannerError; import org.opentripplanner.apis.support.mapping.PlannerErrorMapper; import org.opentripplanner.ext.restapi.mapping.TripPlanMapper; import org.opentripplanner.ext.restapi.mapping.TripSearchMetadataMapper; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/error/PlannerError.java b/src/main/java/org/opentripplanner/api/error/PlannerError.java similarity index 94% rename from src/ext/java/org/opentripplanner/ext/restapi/model/error/PlannerError.java rename to src/main/java/org/opentripplanner/api/error/PlannerError.java index a41a3f6148a..1a35275a7cd 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/model/error/PlannerError.java +++ b/src/main/java/org/opentripplanner/api/error/PlannerError.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.model.error; +package org.opentripplanner.api.error; import java.util.List; import org.opentripplanner.api.common.Message; diff --git a/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java b/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java index a606cb75a52..9ec662f51e0 100644 --- a/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java +++ b/src/main/java/org/opentripplanner/apis/support/mapping/PlannerErrorMapper.java @@ -2,7 +2,7 @@ import java.util.List; import org.opentripplanner.api.common.Message; -import org.opentripplanner.api.model.error.PlannerError; +import org.opentripplanner.api.error.PlannerError; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingError; From 8a8856b5b130e478b8d1ad89daa9ed24ed24c44c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 23:09:02 +0100 Subject: [PATCH 0203/1688] Update src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java Co-authored-by: Thomas Gran --- .../org/opentripplanner/routing/error/PathNotFoundException.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java b/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java index f0a2c854015..8776cb81c00 100644 --- a/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java +++ b/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java @@ -6,6 +6,5 @@ * Indicates that the call to org.opentripplanner.routing.services.PathService returned either null * or ZERO paths. * - * @see PlannerResource for where this is (locally) thrown. */ public class PathNotFoundException extends RuntimeException {} From 360b16594bc06ffce12adc7e61179a8a659a4bf5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 23:09:12 +0100 Subject: [PATCH 0204/1688] Update src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java Co-authored-by: Thomas Gran --- .../opentripplanner/routing/error/PathNotFoundException.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java b/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java index 8776cb81c00..a4071f9911e 100644 --- a/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java +++ b/src/main/java/org/opentripplanner/routing/error/PathNotFoundException.java @@ -1,7 +1,5 @@ package org.opentripplanner.routing.error; -import org.opentripplanner.ext.restapi.resources.PlannerResource; - /** * Indicates that the call to org.opentripplanner.routing.services.PathService returned either null * or ZERO paths. From 7fdb6958bc8acdd95a91b59ea5bf6f9517d2ccdb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 23:12:21 +0100 Subject: [PATCH 0205/1688] Move StreetNoteMapper into apis.support --- .../org/opentripplanner/ext/restapi/mapping/LegMapper.java | 5 +++-- .../opentripplanner/ext/restapi/mapping/WalkStepMapper.java | 5 +++-- .../opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java | 3 +-- .../apis/support/mapping/StreetNoteMapper.java} | 6 +++--- 4 files changed, 10 insertions(+), 9 deletions(-) rename src/{ext/java/org/opentripplanner/ext/restapi/mapping/StreetNoteMaperMapper.java => main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java} (89%) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java index f16a9e8fbf5..766262bca89 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java @@ -7,6 +7,7 @@ import java.util.GregorianCalendar; import java.util.List; import java.util.Locale; +import org.opentripplanner.apis.support.mapping.StreetNoteMapper; import org.opentripplanner.ext.restapi.model.ApiAlert; import org.opentripplanner.ext.restapi.model.ApiLeg; import org.opentripplanner.framework.geometry.EncodedPolyline; @@ -19,7 +20,7 @@ public class LegMapper { private final WalkStepMapper walkStepMapper; - private final StreetNoteMaperMapper streetNoteMaperMapper; + private final StreetNoteMapper streetNoteMaperMapper; private final AlertMapper alertMapper; private final PlaceMapper placeMapper; private final boolean addIntermediateStops; @@ -28,7 +29,7 @@ public class LegMapper { public LegMapper(Locale locale, boolean addIntermediateStops) { this.walkStepMapper = new WalkStepMapper(locale); - this.streetNoteMaperMapper = new StreetNoteMaperMapper(locale); + this.streetNoteMaperMapper = new StreetNoteMapper(locale); this.alertMapper = new AlertMapper(locale); this.placeMapper = new PlaceMapper(locale); this.addIntermediateStops = addIntermediateStops; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java index fba316d32ba..c5c59e4dc37 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/WalkStepMapper.java @@ -7,17 +7,18 @@ import java.util.List; import java.util.Locale; import java.util.stream.Collectors; +import org.opentripplanner.apis.support.mapping.StreetNoteMapper; import org.opentripplanner.ext.restapi.model.ApiWalkStep; import org.opentripplanner.model.plan.WalkStep; public class WalkStepMapper { - private final StreetNoteMaperMapper alertsMapper; + private final StreetNoteMapper alertsMapper; private final Locale locale; public WalkStepMapper(Locale locale) { this.locale = locale; - this.alertsMapper = new StreetNoteMaperMapper(locale); + this.alertsMapper = new StreetNoteMapper(locale); } public List mapWalkSteps(Collection domain) { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java index 572535a540d..563200dbba0 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/StreetNoteMapper.java @@ -1,6 +1,5 @@ package org.opentripplanner.apis.gtfs.mapping; -import org.opentripplanner.ext.restapi.mapping.StreetNoteMaperMapper; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.routing.alertpatch.TimePeriod; import org.opentripplanner.routing.alertpatch.TransitAlert; @@ -11,7 +10,7 @@ public class StreetNoteMapper { /** - * Similar to {@link StreetNoteMaperMapper ::mapToApi}. + * Similar to {@link org.opentripplanner.apis.support.mapping.StreetNoteMapper ::mapToApi}. */ public static TransitAlert mapStreetNoteToAlert(StreetNote note) { // TODO: The ID is used only in the mapping, we should instead have two mappers for the fields diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/StreetNoteMaperMapper.java b/src/main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java similarity index 89% rename from src/ext/java/org/opentripplanner/ext/restapi/mapping/StreetNoteMaperMapper.java rename to src/main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java index 62926eb6e18..9cde403c2ed 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/StreetNoteMaperMapper.java +++ b/src/main/java/org/opentripplanner/apis/support/mapping/StreetNoteMapper.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.restapi.mapping; +package org.opentripplanner.apis.support.mapping; import java.util.List; import java.util.Locale; @@ -7,11 +7,11 @@ import org.opentripplanner.ext.restapi.model.ApiAlert; import org.opentripplanner.street.model.note.StreetNote; -public class StreetNoteMaperMapper { +public class StreetNoteMapper { private final Locale locale; - public StreetNoteMaperMapper(Locale locale) { + public StreetNoteMapper(Locale locale) { this.locale = locale; } From 57fc58844a49a252ca85d10b0e662a014d0a5cd3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Jan 2024 23:14:25 +0100 Subject: [PATCH 0206/1688] Move resources into sandbox section --- .../java/org/opentripplanner/apis/APIEndpoints.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/APIEndpoints.java b/src/main/java/org/opentripplanner/apis/APIEndpoints.java index 04a0e3a145a..fc49c02431f 100644 --- a/src/main/java/org/opentripplanner/apis/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/apis/APIEndpoints.java @@ -46,11 +46,6 @@ public class APIEndpoints { private APIEndpoints() { // Add feature enabled APIs, these can be enabled by default, some is not. // See the OTPFeature enum for details. - addIfEnabled(LegacyRestApi, Routers.class); - addIfEnabled(LegacyRestApi, PlannerResource.class); - addIfEnabled(LegacyRestApi, IndexAPI.class); - - addIfEnabled(APIBikeRental, BikeRental.class); addIfEnabled(APIGraphInspectorTile, GraphInspectorTileResource.class); addIfEnabled(APIGraphInspectorTile, GraphInspectorVectorTileResource.class); addIfEnabled(APIServerInfo, ServerInfo.class); @@ -65,6 +60,12 @@ private APIEndpoints() { addIfEnabled(SandboxAPIParkAndRideApi, ParkAndRideResource.class); addIfEnabled(SandboxAPIGeocoder, GeocoderResource.class); addIfEnabled(SandboxAPITravelTime, TravelTimeResource.class); + + // scheduled to be removed + addIfEnabled(APIBikeRental, BikeRental.class); + addIfEnabled(LegacyRestApi, Routers.class); + addIfEnabled(LegacyRestApi, PlannerResource.class); + addIfEnabled(LegacyRestApi, IndexAPI.class); } /** From 3e71e1cf9e13ecf66a229de91105c9c9d55867f5 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sat, 6 Jan 2024 01:32:34 +0100 Subject: [PATCH 0207/1688] refactor: Introduce a ItineraryDecorator interface --- .../DecorateWithAccessibilityScoreTest.java | 82 +++++++++++-------- .../ext/emissions/EmissionsTest.java | 33 +++----- .../ext/fares/FaresFilterTest.java | 11 ++- .../flex/trip/ScheduledDeviatedTripTest.java | 2 +- .../DecorateConsolidatedStopNamesTest.java | 6 +- .../DecorateWithAccessibilityScore.java | 8 +- .../ext/emissions/DecorateWithEmission.java | 57 ++++++------- .../ext/fares/DecorateWithFare.java | 23 ++---- .../ridehailing/DecorateWithRideHailing.java | 2 +- .../DecorateConsolidatedStopNames.java | 13 ++- .../opentripplanner/model/plan/Itinerary.java | 3 +- .../ItineraryListFilterChainBuilder.java | 39 ++++++--- .../filters/transit/DecorateTransitAlert.java | 21 ++--- .../framework/filter/DecorateFilter.java | 23 ++++++ .../framework/spi/ItineraryDecorator.java | 13 +++ .../RouteRequestToFilterChainMapper.java | 2 +- .../transit/TransitAlertFilterTest.java | 25 +++--- 17 files changed, 196 insertions(+), 167 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java diff --git a/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java b/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java index 4ffc59a1781..d70b9f32f62 100644 --- a/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScoreTest.java @@ -1,11 +1,13 @@ package org.opentripplanner.ext.accessibilityscore; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; import java.util.List; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; @@ -13,40 +15,50 @@ public class DecorateWithAccessibilityScoreTest implements PlanTestConstants { - @Test - public void shouldAddAccessibilityScore() { - final int ID = 1; - - Itinerary i1 = newItinerary(A, 0) - .walk(20, Place.forStop(TEST_MODEL.stop("1:stop", 1d, 1d).build())) - .bus(ID, 0, 50, B) - .bus(ID, 52, 100, C) - .build(); - Itinerary i2 = newItinerary(A, 0) - .walk(20, Place.forStop(TEST_MODEL.stop("1:stop", 1d, 1d).build())) - .bus(ID, 0, 50, B) - .bus(ID, 52, 100, C) - .build(); - Itinerary i3 = newItinerary(A, 0) - .walk(20, Place.forStop(TEST_MODEL.stop("1:stop", 1d, 1d).build())) - .bus(ID, 0, 50, B) - .bus(ID, 52, 100, C) - .build(); - - List input = List.of(i1, i2, i3); - - input.forEach(i -> assertNull(i.getAccessibilityScore())); + private static final int ID = 1; + static List accessibilityScoreTestCase() { + return List.of( + Arguments.of( + newItinerary(A, 0) + .walk(20, Place.forStop(TEST_MODEL.stop("1:stop", 1d, 1d).build())) + .bus(ID, 0, 50, B) + .bus(ID, 52, 100, C) + .build(), + 0.5f + ), + Arguments.of( + newItinerary(A, 0) + .walk(20, Place.forStop(TEST_MODEL.stop("1:stop", 1d, 1d).build())) + .bus(ID, 0, 50, B) + .bus(ID, 52, 100, C) + .build(), + 0.5f + ), + Arguments.of( + newItinerary(A, 0) + .walk(20, Place.forStop(TEST_MODEL.stop("1:stop", 1d, 1d).build())) + .bus(ID, 0, 50, B) + .bus(ID, 52, 100, C) + .build(), + 0.5f + ) + ); + } + + @ParameterizedTest + @MethodSource("accessibilityScoreTestCase") + public void accessibilityScoreTest(Itinerary itinerary, float expectedAccessibilityScore) { var filter = new DecorateWithAccessibilityScore(WheelchairPreferences.DEFAULT.maxSlope()); - var filtered = filter.filter(input); - - filtered.forEach(i -> { - assertNotNull(i.getAccessibilityScore()); - i - .getLegs() - .forEach(l -> { - assertNotNull(l.accessibilityScore()); - }); - }); + + filter.decorate(itinerary); + + assertEquals(expectedAccessibilityScore, itinerary.getAccessibilityScore()); + + itinerary + .getLegs() + .forEach(l -> { + assertNotNull(l.accessibilityScore()); + }); } } diff --git a/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java b/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java index ef33b6e3ba9..ff8a65ab494 100644 --- a/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/emissions/EmissionsTest.java @@ -64,43 +64,36 @@ static void SetUp() { @Test void testGetEmissionsForItinerary() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITH_EMISSIONS))); - assertEquals( - new Grams(2223.902), - decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() - ); + decorateWithEmission.decorate(i); + assertEquals(new Grams(2223.902), i.getEmissionsPerPerson().getCo2()); } @Test void testGetEmissionsForCarRoute() { Itinerary i = new Itinerary(List.of(STREET_LEG)); - assertEquals( - new Grams(28.0864), - decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() - ); + decorateWithEmission.decorate(i); + assertEquals(new Grams(28.0864), i.getEmissionsPerPerson().getCo2()); } @Test void testNoEmissionsForFeedWithoutEmissionsConfigured() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITHOUT_EMISSIONS_CONFIGURED))); - assertNull(decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson()); + decorateWithEmission.decorate(i); + assertNull(i.getEmissionsPerPerson()); } @Test void testZeroEmissionsForItineraryWithZeroEmissions() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITH_ZERO_EMISSIONS))); - assertEquals( - new Grams(0.0), - decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() - ); + decorateWithEmission.decorate(i); + assertEquals(new Grams(0.0), i.getEmissionsPerPerson().getCo2()); } @Test void testGetEmissionsForCombinedRoute() { Itinerary i = new Itinerary(List.of(createTransitLeg(ROUTE_WITH_EMISSIONS), STREET_LEG)); - assertEquals( - new Grams(2251.9884), - decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() - ); + decorateWithEmission.decorate(i); + assertEquals(new Grams(2251.9884), i.getEmissionsPerPerson().getCo2()); } @Test @@ -108,9 +101,9 @@ void testNoEmissionsForCombinedRouteWithoutTransitEmissions() { Itinerary i = new Itinerary( List.of(createTransitLeg(ROUTE_WITHOUT_EMISSIONS_CONFIGURED), STREET_LEG) ); - var emissionsResult = decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson() != - null - ? decorateWithEmission.filter(List.of(i)).get(0).getEmissionsPerPerson().getCo2() + decorateWithEmission.decorate(i); + var emissionsResult = i.getEmissionsPerPerson() != null + ? i.getEmissionsPerPerson().getCo2() : null; assertNull(emissionsResult); } diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java index 134dd942d4e..90468b091f9 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java @@ -31,9 +31,7 @@ void shouldAddFare() { .bus(ID, 52, 100, C) .build(); - List input = List.of(i1, i1, i1); - - input.forEach(i -> assertEquals(ItineraryFares.empty(), i.getFares())); + assertEquals(ItineraryFares.empty(), i1.getFares()); var fares = new ItineraryFares(); fares.addFare(FareType.regular, Money.euros(2.80f)); @@ -43,11 +41,12 @@ void shouldAddFare() { fares.addFareProduct(leg, fp); var filter = new DecorateWithFare((FareService) itinerary -> fares); - var filtered = filter.filter(input); - filtered.forEach(i -> assertEquals(fares, i.getFares())); + filter.decorate(i1); + + assertEquals(fares, i1.getFares()); - var busLeg = filtered.get(0).getTransitLeg(1); + var busLeg = i1.getTransitLeg(1); assertEquals( List.of(new FareProductUse("c1a04702-1fb6-32d4-ba02-483bf68111ed", fp)), diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 4150dd5b489..3523a6e5c5e 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -146,7 +146,7 @@ void calculateDirectFare() { var filter = new DecorateWithFare(graph.getFareService()); - var itineraries = filter.filter(router.createFlexOnlyItineraries().stream().toList()); + var itineraries = router.createFlexOnlyItineraries().stream().peek(filter::decorate).toList(); var itinerary = itineraries.iterator().next(); assertFalse(itinerary.getFares().getFareTypes().isEmpty()); diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java index 6f0671da04c..38af8ea7187 100644 --- a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java @@ -1,7 +1,6 @@ package org.opentripplanner.ext.stopconsolidation; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.opentripplanner.ext.stopconsolidation.TestStopConsolidationModel.STOP_C; import static org.opentripplanner.ext.stopconsolidation.TestStopConsolidationModel.STOP_D; import static org.opentripplanner.model.plan.PlanTestConstants.T11_05; @@ -36,10 +35,9 @@ void changeNames() { .bus(1, T11_05, T11_12, PlanTestConstants.F) .build(); - var filtered = filter.filter(List.of(itinerary)); - assertFalse(filtered.isEmpty()); + filter.decorate(itinerary); - var updatedLeg = filtered.get(0).getLegs().get(0); + var updatedLeg = itinerary.getLegs().get(0); assertEquals(STOP_D.getName(), updatedLeg.getFrom().name); assertEquals(STOP_D.getName(), updatedLeg.getTo().name); } diff --git a/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java b/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java index 4c36964af19..a0430719382 100644 --- a/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java +++ b/src/ext/java/org/opentripplanner/ext/accessibilityscore/DecorateWithAccessibilityScore.java @@ -8,7 +8,7 @@ import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.WalkStep; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.WheelchairTraversalInformation; import org.opentripplanner.transit.model.basic.Accessibility; @@ -26,7 +26,7 @@ * to all frontends. */ public record DecorateWithAccessibilityScore(double wheelchairMaxSlope) - implements ItineraryListFilter { + implements ItineraryDecorator { public static Float compute(List legs) { return legs .stream() @@ -50,8 +50,8 @@ public static float compute(ScheduledTransitLeg leg) { } @Override - public List filter(List itineraries) { - return itineraries.stream().map(this::addAccessibilityScore).toList(); + public void decorate(Itinerary itinerary) { + addAccessibilityScore(itinerary); } private static double accessibilityScore(Accessibility wheelchair) { diff --git a/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java b/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java index 50a5dd2c3ee..1f6e79fc4df 100644 --- a/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java +++ b/src/ext/java/org/opentripplanner/ext/emissions/DecorateWithEmission.java @@ -10,7 +10,7 @@ import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StreetLeg; import org.opentripplanner.model.plan.TransitLeg; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -20,42 +20,39 @@ */ @Sandbox public record DecorateWithEmission(EmissionsService emissionsService) - implements ItineraryListFilter { + implements ItineraryDecorator { @Override - public List filter(List itineraries) { - for (Itinerary itinerary : itineraries) { - List transitLegs = itinerary - .getLegs() - .stream() - .filter(l -> l instanceof ScheduledTransitLeg || l instanceof FlexibleTransitLeg) - .map(TransitLeg.class::cast) - .toList(); + public void decorate(Itinerary itinerary) { + List transitLegs = itinerary + .getLegs() + .stream() + .filter(l -> l instanceof ScheduledTransitLeg || l instanceof FlexibleTransitLeg) + .map(TransitLeg.class::cast) + .toList(); - Optional co2ForTransit = calculateCo2EmissionsForTransit(transitLegs); + Optional co2ForTransit = calculateCo2EmissionsForTransit(transitLegs); - if (!transitLegs.isEmpty() && co2ForTransit.isEmpty()) { - continue; - } + if (!transitLegs.isEmpty() && co2ForTransit.isEmpty()) { + return; + } - List carLegs = itinerary - .getLegs() - .stream() - .filter(l -> l instanceof StreetLeg) - .map(StreetLeg.class::cast) - .filter(leg -> leg.getMode() == TraverseMode.CAR) - .toList(); + List carLegs = itinerary + .getLegs() + .stream() + .filter(l -> l instanceof StreetLeg) + .map(StreetLeg.class::cast) + .filter(leg -> leg.getMode() == TraverseMode.CAR) + .toList(); - Optional co2ForCar = calculateCo2EmissionsForCar(carLegs); + Optional co2ForCar = calculateCo2EmissionsForCar(carLegs); - if (co2ForTransit.isPresent() && co2ForCar.isPresent()) { - itinerary.setEmissionsPerPerson(new Emissions(co2ForTransit.get().plus(co2ForCar.get()))); - } else if (co2ForTransit.isPresent()) { - itinerary.setEmissionsPerPerson(new Emissions(co2ForTransit.get())); - } else if (co2ForCar.isPresent()) { - itinerary.setEmissionsPerPerson(new Emissions(co2ForCar.get())); - } + if (co2ForTransit.isPresent() && co2ForCar.isPresent()) { + itinerary.setEmissionsPerPerson(new Emissions(co2ForTransit.get().plus(co2ForCar.get()))); + } else if (co2ForTransit.isPresent()) { + itinerary.setEmissionsPerPerson(new Emissions(co2ForTransit.get())); + } else if (co2ForCar.isPresent()) { + itinerary.setEmissionsPerPerson(new Emissions(co2ForCar.get())); } - return itineraries; } private Optional calculateCo2EmissionsForTransit(List transitLegs) { diff --git a/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java b/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java index 786885452e7..a47392a3fbf 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java +++ b/src/ext/java/org/opentripplanner/ext/fares/DecorateWithFare.java @@ -1,9 +1,7 @@ package org.opentripplanner.ext.fares; -import java.util.List; -import java.util.Objects; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.routing.fares.FareService; /** @@ -11,18 +9,13 @@ *

    * TODO: Convert to a class - exposing a service in a DTO is a risk. */ -public record DecorateWithFare(FareService fareService) implements ItineraryListFilter { +public record DecorateWithFare(FareService fareService) implements ItineraryDecorator { @Override - public List filter(List itineraries) { - return itineraries - .stream() - .peek(i -> { - var fare = fareService.calculateFares(i); - if (Objects.nonNull(fare)) { - i.setFare(fare); - FaresToItineraryMapper.addFaresToLegs(fare, i); - } - }) - .toList(); + public void decorate(Itinerary itinerary) { + var fare = fareService.calculateFares(itinerary); + if (fare != null) { + itinerary.setFare(fare); + FaresToItineraryMapper.addFaresToLegs(fare, itinerary); + } } } diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java b/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java index cbe4e174334..cd076b7e2a5 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/DecorateWithRideHailing.java @@ -13,7 +13,7 @@ /** * This filter decorates car dropoff/pickup legs with information from ride hailing services and - * adds information about price and arrival time of the vehicle. + * adds information about the price and arrival time of the vehicle. */ public class DecorateWithRideHailing implements ItineraryListFilter { diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index b9f3012b425..8fcba82a357 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -1,18 +1,17 @@ package org.opentripplanner.ext.stopconsolidation; -import java.util.List; import java.util.Objects; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopLeg; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ScheduledTransitLeg; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; /** * A decorating filter that checks if a transit leg contains any primary stops and if it does, * then replaces it with the secondary, agency-specific stop name. This is so that the in-vehicle * display matches what OTP returns as a board/alight stop name. */ -public class DecorateConsolidatedStopNames implements ItineraryListFilter { +public class DecorateConsolidatedStopNames implements ItineraryDecorator { private final StopConsolidationService service; @@ -21,8 +20,8 @@ public DecorateConsolidatedStopNames(StopConsolidationService service) { } @Override - public List filter(List itineraries) { - return itineraries.stream().map(this::replacePrimaryNamesWithSecondary).toList(); + public void decorate(Itinerary itinerary) { + replacePrimaryNamesWithSecondary(itinerary); } /** @@ -31,8 +30,8 @@ public List filter(List itineraries) { * operating the route, so that the name in the result matches the name in the in-vehicle * display. */ - private Itinerary replacePrimaryNamesWithSecondary(Itinerary i) { - return i.transformTransitLegs(leg -> { + private void replacePrimaryNamesWithSecondary(Itinerary i) { + i.transformTransitLegs(leg -> { if (leg instanceof ScheduledTransitLeg stl && needsToRenameStops(stl)) { var agency = leg.getAgency(); return new ConsolidatedStopLeg( diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index d1252c45f2d..903e04c8b0c 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -388,7 +388,7 @@ public List getLegs() { *

    * NOTE: The itinerary is mutable so the transformation is done in-place! */ - public Itinerary transformTransitLegs(Function mapper) { + public void transformTransitLegs(Function mapper) { legs = legs .stream() @@ -400,7 +400,6 @@ public Itinerary transformTransitLegs(Function mapper) { } }) .toList(); - return this; } public Stream getStreetLegs() { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index bcce86d7185..c95005acd32 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -35,6 +35,7 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.filters.transit.group.RemoveIfFirstOrLastTripIsTheSame; import org.opentripplanner.routing.algorithm.filterchain.filters.transit.group.RemoveOtherThanSameLegsMaxGeneralizedCost; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DecorateFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimitFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; @@ -44,6 +45,7 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupByDistance; import org.opentripplanner.routing.algorithm.filterchain.framework.groupids.GroupBySameRoutesAndStops; import org.opentripplanner.routing.algorithm.filterchain.framework.sort.SortOrderComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; @@ -56,6 +58,7 @@ /** * Create a filter chain based on the given config. */ +@SuppressWarnings("UnusedReturnValue") public class ItineraryListFilterChainBuilder { private static final int NOT_SET = -1; @@ -89,16 +92,16 @@ public class ItineraryListFilterChainBuilder { */ @Sandbox - private ItineraryListFilter emissionDecorator; + private ItineraryDecorator emissionDecorator; @Sandbox - private ItineraryListFilter fareDecorator; + private ItineraryDecorator fareDecorator; @Sandbox private ItineraryListFilter rideHailingDecorator; @Sandbox - private ItineraryListFilter stopConsolidationDecorator; + private ItineraryDecorator stopConsolidationDecorator; public ItineraryListFilterChainBuilder(SortOrder sortOrder) { this.sortOrder = sortOrder; @@ -317,12 +320,12 @@ public ItineraryListFilterChainBuilder withAccessibilityScore( return this; } - public ItineraryListFilterChainBuilder withFareDecorator(ItineraryListFilter decorator) { + public ItineraryListFilterChainBuilder withFareDecorator(ItineraryDecorator decorator) { this.fareDecorator = decorator; return this; } - public ItineraryListFilterChainBuilder withEmissions(ItineraryListFilter emissionDecorator) { + public ItineraryListFilterChainBuilder withEmissions(ItineraryDecorator emissionDecorator) { this.emissionDecorator = emissionDecorator; return this; } @@ -339,13 +342,15 @@ public ItineraryListFilterChainBuilder withRemoveTimeshiftedItinerariesWithSameR return this; } - public ItineraryListFilterChainBuilder withRideHailingDecorator(ItineraryListFilter decorator) { - this.rideHailingDecorator = decorator; + public ItineraryListFilterChainBuilder withRideHailingDecoratingFilter( + ItineraryListFilter decoratorFilter + ) { + this.rideHailingDecorator = decoratorFilter; return this; } public ItineraryListFilterChainBuilder withConsolidatedStopNamesDecorator( - @Nullable ItineraryListFilter decorator + @Nullable ItineraryDecorator decorator ) { this.stopConsolidationDecorator = decorator; return this; @@ -361,6 +366,7 @@ public ItineraryListFilterChainBuilder withTransitAlerts( return this; } + @SuppressWarnings("CollectionAddAllCanBeReplacedWithConstructor") public ItineraryListFilterChain build() { List filters = new ArrayList<>(); @@ -474,22 +480,22 @@ public ItineraryListFilterChain build() { // Decorate itineraries { if (transitAlertService != null) { - filters.add(new DecorateTransitAlert(transitAlertService, getMultiModalStation)); + addDecorator(filters, new DecorateTransitAlert(transitAlertService, getMultiModalStation)); } // Sandbox filters to decorate itineraries if (accessibilityScore) { // TODO: This should be injected to avoid circular dependencies (dep. on sandbox here) - filters.add(new DecorateWithAccessibilityScore(wheelchairMaxSlope)); + addDecorator(filters, new DecorateWithAccessibilityScore(wheelchairMaxSlope)); } if (emissionDecorator != null) { - filters.add(emissionDecorator); + addDecorator(filters, emissionDecorator); } if (fareDecorator != null) { - filters.add(fareDecorator); + addDecorator(filters, fareDecorator); } if (rideHailingDecorator != null) { @@ -497,7 +503,7 @@ public ItineraryListFilterChain build() { } if (stopConsolidationDecorator != null) { - filters.add(stopConsolidationDecorator); + addDecorator(filters, stopConsolidationDecorator); } } @@ -597,4 +603,11 @@ private static void addRmFilter( ) { filters.add(new RemoveFilter(removeFilter)); } + + private static void addDecorator( + List filters, + ItineraryDecorator decorator + ) { + filters.add(new DecorateFilter(decorator)); + } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java index f70c68587ec..ccc2c9b26f0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/DecorateTransitAlert.java @@ -1,16 +1,15 @@ package org.opentripplanner.routing.algorithm.filterchain.filters.transit; -import java.util.List; import java.util.function.Function; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.routing.algorithm.mapping.AlertToLegMapper; import org.opentripplanner.routing.services.TransitAlertService; import org.opentripplanner.transit.model.site.MultiModalStation; import org.opentripplanner.transit.model.site.Station; -public class DecorateTransitAlert implements ItineraryListFilter { +public class DecorateTransitAlert implements ItineraryDecorator { private final AlertToLegMapper alertToLegMapper; @@ -22,17 +21,13 @@ public DecorateTransitAlert( } @Override - public List filter(List itineraries) { - for (Itinerary itinerary : itineraries) { - boolean firstLeg = true; - for (Leg leg : itinerary.getLegs()) { - if (leg.isTransitLeg()) { - alertToLegMapper.addTransitAlertsToLeg(leg, firstLeg); - firstLeg = false; - } + public void decorate(Itinerary itinerary) { + boolean firstLeg = true; + for (Leg leg : itinerary.getLegs()) { + if (leg.isTransitLeg()) { + alertToLegMapper.addTransitAlertsToLeg(leg, firstLeg); + firstLeg = false; } } - - return itineraries; } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java new file mode 100644 index 00000000000..b2101c0ebfc --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java @@ -0,0 +1,23 @@ +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; + +import java.util.List; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; + +public class DecorateFilter implements ItineraryListFilter { + + private final ItineraryDecorator decorator; + + public DecorateFilter(ItineraryDecorator decorator) { + this.decorator = decorator; + } + + @Override + public List filter(List itineraries) { + for (var it : itineraries) { + decorator.decorate(it); + } + return itineraries; + } +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java new file mode 100644 index 00000000000..f1df247f296 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java @@ -0,0 +1,13 @@ +package org.opentripplanner.routing.algorithm.filterchain.framework.spi; + +import org.opentripplanner.model.plan.Itinerary; + +/** + * Use this interface to decorate itineraries with more information. + */ +public interface ItineraryDecorator { + /** + * Implement this do decorate each itinerary in the result. + */ + void decorate(Itinerary itinerary); +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java index ab839f14798..651d94b4eac 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java @@ -100,7 +100,7 @@ public static ItineraryListFilterChain createFilterChain( } if (!context.rideHailingServices().isEmpty()) { - builder.withRideHailingDecorator( + builder.withRideHailingDecoratingFilter( new DecorateWithRideHailing(context.rideHailingServices(), request.wheelchair()) ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java index 1ba7dde39fe..379eb207155 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitAlertFilterTest.java @@ -6,7 +6,6 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TimePeriod; @@ -32,23 +31,19 @@ void testFilter() { ) ); - DecorateTransitAlert filter = new DecorateTransitAlert(transitAlertService, ignore -> null); - - // Expect filter to no fail on an empty list - assertEquals(List.of(), filter.filter(List.of())); + var decorator = new DecorateTransitAlert(transitAlertService, ignore -> null); // Given a list with one itinerary - List list = List.of( - newItinerary(A).bus(31, 0, 30, E).build(), - newItinerary(B).rail(21, 0, 30, E).build() - ); - - list = filter.filter(list); + var i1 = newItinerary(A).bus(31, 0, 30, E).build(); + decorator.decorate(i1); // Then: expect correct alerts to be added - Itinerary first = list.get(0); - assertEquals(1, first.getLegs().get(0).getTransitAlerts().size()); - assertEquals(ID, first.getLegs().get(0).getTransitAlerts().iterator().next().getId()); - assertEquals(0, list.get(1).getLegs().get(0).getTransitAlerts().size()); + assertEquals(1, i1.getLegs().get(0).getTransitAlerts().size()); + assertEquals(ID, i1.getLegs().get(0).getTransitAlerts().iterator().next().getId()); + + var i2 = newItinerary(B).rail(21, 0, 30, E).build(); + decorator.decorate(i2); + + assertEquals(0, i2.getLegs().get(0).getTransitAlerts().size()); } } From be3c3dfaac3c7ea813f244cb2335d22356f5684b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 13:23:29 +0000 Subject: [PATCH 0208/1688] fix(deps): update dependency ch.poole:openinghoursparser to v0.28.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a3cb501143..5db640f8230 100644 --- a/pom.xml +++ b/pom.xml @@ -944,7 +944,7 @@ ch.poole OpeningHoursParser - 0.28.0 + 0.28.1 From 424e35574a8f576eb04acbd222318df151f5de06 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 13:23:35 +0000 Subject: [PATCH 0209/1688] fix(deps): update jackson.version to v2.16.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a3cb501143..119e21dd415 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 30.1 2.50 - 2.16.0 + 2.16.1 3.1.5 5.10.1 1.11.5 From 79e30bc4624623d9e203dd61bc7d774b98f1c5f3 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 8 Jan 2024 14:10:56 +0000 Subject: [PATCH 0210/1688] Add changelog entry for #5562 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 1d4e54da8d7..e46b15cbd0f 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -68,6 +68,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix preference cost comparisons [#5586](https://github.com/opentripplanner/OpenTripPlanner/pull/5586) - Report and throw away trip-times which fail sanity check [#5587](https://github.com/opentripplanner/OpenTripPlanner/pull/5587) - Consider escalator edges in island pruning [#5591](https://github.com/opentripplanner/OpenTripPlanner/pull/5591) +- Create own rental preferences for bike and car in the internal model [#5562](https://github.com/opentripplanner/OpenTripPlanner/pull/5562) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 5c7576d3f3959cccb6d9a4c428ac5a8b1df7a37b Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Mon, 8 Jan 2024 14:11:19 +0000 Subject: [PATCH 0211/1688] Bump serialization version id for #5562 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a3cb501143..204a6b2a599 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 134 + 135 30.1 2.50 From 1ba569ab7328f2621d00b3eaff28dad6b4da2b45 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 18 Dec 2023 17:30:07 +0200 Subject: [PATCH 0212/1688] Introduce vehicle walking preferences --- .../common/RequestToPreferencesMapper.java | 10 +- .../apis/gtfs/mapping/RouteRequestMapper.java | 16 +- .../preferences/BikePreferencesMapper.java | 2 +- .../request/preference/BikePreferences.java | 128 ++---------- .../preference/RoutingPreferences.java | 2 +- .../preference/VehicleWalkingPreferences.java | 185 ++++++++++++++++++ .../street/model/edge/BikeWalkableEdge.java | 8 +- .../street/model/edge/StreetEdge.java | 6 +- .../edge/StreetEdgeReluctanceCalculator.java | 4 +- .../BikePreferencesMapperTest.java | 2 +- .../preference/BikePreferencesTest.java | 28 --- .../VehicleWalkingPreferencesTest.java | 77 ++++++++ .../integration/BarrierRoutingTest.java | 5 +- .../street/integration/BikeWalkingTest.java | 2 +- .../street/model/edge/StreetEdgeCostTest.java | 4 +- .../street/model/edge/StreetEdgeTest.java | 12 +- 16 files changed, 325 insertions(+), 166 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java create mode 100644 src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java diff --git a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java index 6ccc8d3ca47..68e61d6fe4e 100644 --- a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java @@ -67,10 +67,6 @@ private void mapBike() { setIfNotNull(req.bikeSpeed, bike::withSpeed); setIfNotNull(req.bikeReluctance, bike::withReluctance); setIfNotNull(req.bikeBoardCost, bike::withBoardCost); - setIfNotNull(req.bikeWalkingSpeed, bike::withWalkingSpeed); - setIfNotNull(req.bikeWalkingReluctance, bike::withWalkingReluctance); - setIfNotNull(req.bikeSwitchTime, bike::withSwitchTime); - setIfNotNull(req.bikeSwitchCost, bike::withSwitchCost); setIfNotNull(req.bikeOptimizeType, bike::withOptimizeType); if (req.bikeOptimizeType == BicycleOptimizeType.TRIANGLE) { @@ -87,6 +83,12 @@ private void mapBike() { setIfNotNull(req.bikeParkTime, parking::withParkTime); }); bike.withRental(this::mapRental); + bike.withWalking(walk -> { + setIfNotNull(req.bikeWalkingSpeed, walk::withSpeed); + setIfNotNull(req.bikeWalkingReluctance, walk::withReluctance); + setIfNotNull(req.bikeSwitchTime, walk::withHopTime); + setIfNotNull(req.bikeSwitchCost, walk::withHopCost); + }); }); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 790064aba22..a12ef45f6fb 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -23,6 +23,7 @@ import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; +import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; import org.opentripplanner.routing.core.BicycleOptimizeType; @@ -66,11 +67,7 @@ public static RouteRequest toRouteRequest( request.withPreferences(preferences -> { preferences.withBike(bike -> { callWith.argument("bikeReluctance", bike::withReluctance); - callWith.argument("bikeWalkingReluctance", bike::withWalkingReluctance); - callWith.argument("bikeWalkingSpeed", bike::withWalkingSpeed); callWith.argument("bikeSpeed", bike::withSpeed); - callWith.argument("bikeSwitchTime", bike::withSwitchTime); - callWith.argument("bikeSwitchCost", bike::withSwitchCost); callWith.argument("bikeBoardCost", bike::withBoardCost); if (environment.getArgument("optimize") != null) { @@ -86,6 +83,7 @@ public static RouteRequest toRouteRequest( bike.withParking(parking -> setParkingPreferences(callWith, parking)); bike.withRental(rental -> setRentalPreferences(callWith, request, rental)); + bike.withWalking(walking -> setVehicleWalkingPreferences(callWith, walking)); }); preferences.withCar(car -> { @@ -330,6 +328,16 @@ private static void setRentalPreferences( ); } + private static void setVehicleWalkingPreferences( + CallerWithEnvironment callWith, + VehicleWalkingPreferences.Builder walking + ) { + callWith.argument("bikeWalkingReluctance", walking::withReluctance); + callWith.argument("bikeWalkingSpeed", walking::withSpeed); + callWith.argument("bikeSwitchTime", time -> walking.withHopTime((int) time)); + callWith.argument("bikeSwitchCost", cost -> walking.withHopCost((int) cost)); + } + private static class CallerWithEnvironment { private final DataFetchingEnvironment environment; diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java index 3ccdd9007a4..1179c034e93 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java @@ -27,7 +27,7 @@ public static void mapBikePreferences( "walkReluctance", r -> { bike.withReluctance((double) r); - bike.withWalkingReluctance(WALK_BIKE_RELATIVE_RELUCTANCE * (double) r); + bike.withWalking(w -> w.withReluctance(WALK_BIKE_RELATIVE_RELUCTANCE * (double) r)); } ); diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java index 5717876bbfc..f282e02340c 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java @@ -25,45 +25,32 @@ public final class BikePreferences implements Serializable { private final double speed; private final double reluctance; private final Cost boardCost; - private final double walkingSpeed; - private final double walkingReluctance; - private final int switchTime; - private final Cost switchCost; private final VehicleParkingPreferences parking; private final VehicleRentalPreferences rental; - private final double stairsReluctance; private final BicycleOptimizeType optimizeType; private final TimeSlopeSafetyTriangle optimizeTriangle; + private final VehicleWalkingPreferences walking; private BikePreferences() { this.speed = 5; this.reluctance = 2.0; this.boardCost = Cost.costOfMinutes(10); - this.walkingSpeed = 1.33; - this.walkingReluctance = 5.0; - this.switchTime = 0; - this.switchCost = Cost.ZERO; this.parking = VehicleParkingPreferences.DEFAULT; this.rental = VehicleRentalPreferences.DEFAULT; this.optimizeType = BicycleOptimizeType.SAFE; this.optimizeTriangle = TimeSlopeSafetyTriangle.DEFAULT; - // very high reluctance to carry the bike up/down a flight of stairs - this.stairsReluctance = 10; + this.walking = VehicleWalkingPreferences.DEFAULT; } private BikePreferences(Builder builder) { this.speed = Units.speed(builder.speed); this.reluctance = Units.reluctance(builder.reluctance); this.boardCost = builder.boardCost; - this.walkingSpeed = Units.speed(builder.walkingSpeed); - this.walkingReluctance = Units.reluctance(builder.walkingReluctance); - this.switchTime = Units.duration(builder.switchTime); - this.switchCost = builder.switchCost; this.parking = builder.parking; this.rental = builder.rental; this.optimizeType = Objects.requireNonNull(builder.optimizeType); this.optimizeTriangle = Objects.requireNonNull(builder.optimizeTriangle); - this.stairsReluctance = Units.reluctance(builder.stairsReluctance); + this.walking = builder.walking; } public static BikePreferences.Builder of() { @@ -94,36 +81,6 @@ public int boardCost() { return boardCost.toSeconds(); } - /** - * The walking speed when walking a bike. Default: 1.33 m/s ~ Same as walkSpeed - */ - public double walkingSpeed() { - return walkingSpeed; - } - - /** - * A multiplier for how bad walking is, compared to being in transit for equal - * lengths of time. Empirically, values between 2 and 4 seem to correspond - * well to the concept of not wanting to walk too much without asking for - * totally ridiculous itineraries, but this observation should in no way be - * taken as scientific or definitive. Your mileage may vary. See - * https://github.com/opentripplanner/OpenTripPlanner/issues/4090 for impact on - * performance with high values. Default value: 2.0 - */ - public double walkingReluctance() { - return walkingReluctance; - } - - /** Time to get on and off your own bike */ - public int switchTime() { - return switchTime; - } - - /** Cost of getting on and off your own bike */ - public int switchCost() { - return switchCost.toSeconds(); - } - /** Parking preferences that can be different per request */ public VehicleParkingPreferences parking() { return parking; @@ -145,8 +102,9 @@ public TimeSlopeSafetyTriangle optimizeTriangle() { return optimizeTriangle; } - public double stairsReluctance() { - return stairsReluctance; + /** Bike walking preferences that can be different per request */ + public VehicleWalkingPreferences walking() { + return walking; } @Override @@ -158,15 +116,11 @@ public boolean equals(Object o) { doubleEquals(that.speed, speed) && doubleEquals(that.reluctance, reluctance) && boardCost.equals(that.boardCost) && - doubleEquals(that.walkingSpeed, walkingSpeed) && - doubleEquals(that.walkingReluctance, walkingReluctance) && - switchTime == that.switchTime && - switchCost.equals(that.switchCost) && - parking.equals(that.parking) && - rental.equals(that.rental) && + Objects.equals(parking, that.parking) && + Objects.equals(rental, that.rental) && optimizeType == that.optimizeType && optimizeTriangle.equals(that.optimizeTriangle) && - doubleEquals(stairsReluctance, that.stairsReluctance) + Objects.equals(walking, that.walking) ); } @@ -176,15 +130,11 @@ public int hashCode() { speed, reluctance, boardCost, - walkingSpeed, - walkingReluctance, - switchTime, - switchCost, parking, rental, optimizeType, optimizeTriangle, - stairsReluctance + walking ); } @@ -195,15 +145,11 @@ public String toString() { .addNum("speed", speed, DEFAULT.speed) .addNum("reluctance", reluctance, DEFAULT.reluctance) .addObj("boardCost", boardCost, DEFAULT.boardCost) - .addNum("walkingSpeed", walkingSpeed, DEFAULT.walkingSpeed) - .addNum("walkingReluctance", walkingReluctance, DEFAULT.walkingReluctance) - .addDurationSec("switchTime", switchTime, DEFAULT.switchTime) - .addObj("switchCost", switchCost, DEFAULT.switchCost) .addObj("parking", parking, DEFAULT.parking) .addObj("rental", rental, DEFAULT.rental) .addEnum("optimizeType", optimizeType, DEFAULT.optimizeType) .addObj("optimizeTriangle", optimizeTriangle, DEFAULT.optimizeTriangle) - .addNum("stairsReluctance", stairsReluctance, DEFAULT.stairsReluctance) + .addObj("walking", walking, DEFAULT.walking) .toString(); } @@ -214,31 +160,23 @@ public static class Builder { private double speed; private double reluctance; private Cost boardCost; - private double walkingSpeed; - private double walkingReluctance; - private int switchTime; - private Cost switchCost; private VehicleParkingPreferences parking; private VehicleRentalPreferences rental; private BicycleOptimizeType optimizeType; private TimeSlopeSafetyTriangle optimizeTriangle; - public double stairsReluctance; + public VehicleWalkingPreferences walking; public Builder(BikePreferences original) { this.original = original; this.speed = original.speed; this.reluctance = original.reluctance; this.boardCost = original.boardCost; - this.walkingSpeed = original.walkingSpeed; - this.walkingReluctance = original.walkingReluctance; - this.switchTime = original.switchTime; - this.switchCost = original.switchCost; this.parking = original.parking; this.rental = original.rental; this.optimizeType = original.optimizeType; this.optimizeTriangle = original.optimizeTriangle; - this.stairsReluctance = original.stairsReluctance; + this.walking = original.walking; } public BikePreferences original() { @@ -272,42 +210,6 @@ public Builder withBoardCost(int boardCost) { return this; } - public double walkingSpeed() { - return walkingSpeed; - } - - public Builder withWalkingSpeed(double walkingSpeed) { - this.walkingSpeed = walkingSpeed; - return this; - } - - public double walkingReluctance() { - return walkingReluctance; - } - - public Builder withWalkingReluctance(double walkingReluctance) { - this.walkingReluctance = walkingReluctance; - return this; - } - - public int switchTime() { - return switchTime; - } - - public Builder withSwitchTime(int switchTime) { - this.switchTime = switchTime; - return this; - } - - public Cost switchCost() { - return switchCost; - } - - public Builder withSwitchCost(int switchCost) { - this.switchCost = Cost.costOfSeconds(switchCost); - return this; - } - public Builder withParking(Consumer body) { this.parking = ifNotNull(this.parking, original.parking).copyOf().apply(body).build(); return this; @@ -338,8 +240,8 @@ public Builder withOptimizeTriangle(Consumer bo return this; } - public Builder withStairsReluctance(double value) { - this.stairsReluctance = value; + public Builder withWalking(Consumer body) { + this.walking = ifNotNull(this.walking, original.walking).copyOf().apply(body).build(); return this; } diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java index 3230bbf5968..d3d22160935 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java @@ -129,7 +129,7 @@ public SystemPreferences system() { */ public double getSpeed(TraverseMode mode, boolean walkingBike) { return switch (mode) { - case WALK -> walkingBike ? bike.walkingSpeed() : walk.speed(); + case WALK -> walkingBike ? bike.walking().speed() : walk.speed(); case BICYCLE -> bike.speed(); case CAR -> car.speed(); default -> throw new IllegalArgumentException("getSpeed(): Invalid mode " + mode); diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java new file mode 100644 index 00000000000..0abf2926f42 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java @@ -0,0 +1,185 @@ +package org.opentripplanner.routing.api.request.preference; + +import java.io.Serializable; +import java.time.Duration; +import java.util.Objects; +import java.util.function.Consumer; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.framework.model.Units; +import org.opentripplanner.framework.tostring.ToStringBuilder; + +/** + * Preferences for walking a vehicle. + *

    + * THIS CLASS IS IMMUTABLE AND THREAD-SAFE. + */ +public class VehicleWalkingPreferences implements Serializable { + + public static final VehicleWalkingPreferences DEFAULT = new VehicleWalkingPreferences(); + + private final double speed; + private final double reluctance; + private final Duration hopTime; + private final Cost hopCost; + private final double stairsReluctance; + + private VehicleWalkingPreferences() { + this.speed = 1.33; + this.reluctance = 5.0; + this.hopTime = Duration.ZERO; + this.hopCost = Cost.ZERO; + // very high reluctance to carry the bike up/down a flight of stairs + this.stairsReluctance = 10; + } + + /** + * Sets the vehicle walking preferences and does some input value validation and rounds + * reluctances and speed to not have too many decimals. + */ + private VehicleWalkingPreferences(Builder builder) { + this.speed = Units.speed(builder.speed); + this.reluctance = Units.reluctance(builder.reluctance); + this.hopTime = Duration.ofSeconds(Units.duration(builder.hopTime)); + this.hopCost = Cost.costOfSeconds(builder.hopCost); + this.stairsReluctance = Units.reluctance(builder.stairsReluctance); + } + + public static VehicleWalkingPreferences.Builder of() { + return new VehicleWalkingPreferences.Builder(DEFAULT); + } + + public VehicleWalkingPreferences.Builder copyOf() { + return new VehicleWalkingPreferences.Builder(this); + } + + /** + * The walking speed when walking a vehicle. Default: 1.33 m/s ~ Same as walkSpeed. + */ + public double speed() { + return speed; + } + + /** + * A multiplier for how bad walking is, compared to being in transit for equal + * lengths of time. Empirically, values between 2 and 4 seem to correspond + * well to the concept of not wanting to walk too much without asking for + * totally ridiculous itineraries, but this observation should in no way be + * taken as scientific or definitive. Your mileage may vary. See + * https://github.com/opentripplanner/OpenTripPlanner/issues/4090 for impact on + * performance with high values. Default value: 2.0 + */ + public double reluctance() { + return reluctance; + } + + /** Time to get on and off your own vehicle. */ + public Duration hopTime() { + return hopTime; + } + + /** Cost of getting on and off your own vehicle. */ + public Cost hopCost() { + return hopCost; + } + + /** Reluctance of walking carrying a vehicle up a flight of stairs. */ + public double stairsReluctance() { + return stairsReluctance; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + VehicleWalkingPreferences that = (VehicleWalkingPreferences) o; + return ( + speed == that.speed && + reluctance == that.reluctance && + Objects.equals(hopTime, that.hopTime) && + Objects.equals(hopCost, that.hopCost) && + stairsReluctance == that.stairsReluctance + ); + } + + @Override + public int hashCode() { + return Objects.hash(speed, reluctance, hopTime, hopCost, stairsReluctance); + } + + @Override + public String toString() { + return ToStringBuilder + .of(VehicleWalkingPreferences.class) + .addNum("speed", speed, DEFAULT.speed) + .addNum("reluctance", reluctance, DEFAULT.reluctance) + .addObj("hopTime", hopTime, DEFAULT.hopTime) + .addObj("hopCost", hopCost, DEFAULT.hopCost) + .addNum("stairsReluctance", stairsReluctance, DEFAULT.stairsReluctance) + .toString(); + } + + public static class Builder { + + private final VehicleWalkingPreferences original; + private double speed; + private double reluctance; + private int hopTime; + private int hopCost; + private double stairsReluctance; + + private Builder(VehicleWalkingPreferences original) { + this.original = original; + this.speed = original.speed; + this.reluctance = original.reluctance; + this.hopTime = (int) original.hopTime.toSeconds(); + this.hopCost = original.hopCost.toSeconds(); + this.stairsReluctance = original.stairsReluctance; + } + + public VehicleWalkingPreferences.Builder withSpeed(double speed) { + this.speed = speed; + return this; + } + + public VehicleWalkingPreferences.Builder withReluctance(double reluctance) { + this.reluctance = reluctance; + return this; + } + + public VehicleWalkingPreferences.Builder withHopTime(Duration hopTime) { + this.hopTime = (int) hopTime.toSeconds(); + return this; + } + + public VehicleWalkingPreferences.Builder withHopTime(int hopTime) { + this.hopTime = hopTime; + return this; + } + + public VehicleWalkingPreferences.Builder withHopCost(int hopCost) { + this.hopCost = hopCost; + return this; + } + + public VehicleWalkingPreferences.Builder withStairsReluctance(double stairsReluctance) { + this.stairsReluctance = stairsReluctance; + return this; + } + + public VehicleWalkingPreferences original() { + return original; + } + + public VehicleWalkingPreferences.Builder apply( + Consumer body + ) { + body.accept(this); + return this; + } + + public VehicleWalkingPreferences build() { + var newObj = new VehicleWalkingPreferences(this); + return original.equals(newObj) ? original : newObj; + } + } +} diff --git a/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java b/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java index eb17c5d0900..799a5b006e6 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java @@ -17,8 +17,8 @@ default void switchToWalkingBike(RoutingPreferences preferences, StateEditor edi editor.setBackWalkingBike(true); if (shouldIncludeCost) { - editor.incrementWeight(preferences.bike().switchCost()); - editor.incrementTimeInSeconds(preferences.bike().switchTime()); + editor.incrementWeight(preferences.bike().walking().hopCost().toSeconds()); + editor.incrementTimeInSeconds((int) preferences.bike().walking().hopTime().toSeconds()); } } @@ -28,8 +28,8 @@ default void switchToBiking(RoutingPreferences preferences, StateEditor editor) editor.setBackWalkingBike(false); if (shouldIncludeCost) { - editor.incrementWeight(preferences.bike().switchCost()); - editor.incrementTimeInSeconds(preferences.bike().switchTime()); + editor.incrementWeight(preferences.bike().walking().hopCost().toSeconds()); + editor.incrementTimeInSeconds((int) preferences.bike().walking().hopTime().toSeconds()); } } diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java index d0b0018898a..3f17081b6cb 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java @@ -231,7 +231,9 @@ public double calculateSpeed( final double speed = switch (traverseMode) { - case WALK -> walkingBike ? preferences.bike().walkingSpeed() : preferences.walk().speed(); + case WALK -> walkingBike + ? preferences.bike().walking().speed() + : preferences.walk().speed(); case BICYCLE, SCOOTER -> preferences.bike().speed(); case CAR -> getCarSpeed(); case FLEX -> throw new IllegalArgumentException("getSpeed(): Invalid mode " + traverseMode); @@ -1276,7 +1278,7 @@ private TraversalCosts walkingTraversalCosts( time = weight = (getEffectiveBikeDistance() / speed); if (isStairs()) { // we do allow walking the bike across a stairs but there is a very high default penalty - weight *= preferences.bike().stairsReluctance(); + weight *= preferences.bike().walking().stairsReluctance(); } } else { // take slopes into account when walking diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java b/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java index 669adc2489f..ee2f3d833ee 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java +++ b/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java @@ -10,7 +10,7 @@ private StreetEdgeReluctanceCalculator() {} /** * Compute reluctance for a regular street section. Note! This does not apply if in a wheelchair, - * see {@link #computeWheelchairReluctance(RouteRequest, double, boolean, boolean)}. + * see {@link #computeWheelchairReluctance(RoutingPreferences, double, boolean, boolean)}. */ static double computeReluctance( RoutingPreferences pref, @@ -22,7 +22,7 @@ static double computeReluctance( return pref.walk().stairsReluctance(); } else { return switch (traverseMode) { - case WALK -> walkingBike ? pref.bike().walkingReluctance() : pref.walk().reluctance(); + case WALK -> walkingBike ? pref.bike().walking().reluctance() : pref.walk().reluctance(); case BICYCLE -> pref.bike().reluctance(); case CAR -> pref.car().reluctance(); default -> throw new IllegalArgumentException( diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java index 378571eeea9..a72fd25cbfa 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java @@ -18,7 +18,7 @@ static List mapBikePreferencesTestCases() { Arguments.of( "walkReluctance", 10.0, - "BikePreferences{reluctance: 10.0, walkingReluctance: 27.0}" + "BikePreferences{reluctance: 10.0, walking: VehicleWalkingPreferences{reluctance: 27.0}}" ), Arguments.of("bikeSpeed", 10.0, "BikePreferences{speed: 10.0}"), Arguments.of( diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java index 9da7852cc2c..9bf287737df 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java @@ -11,11 +11,7 @@ class BikePreferencesTest { public static final double SPEED = 2.0; public static final double RELUCTANCE = 1.2; - public static final double WALKING_SPEED = 1.15; public static final int BOARD_COST = 660; - public static final double WALKING_RELUCTANCE = 1.45; - public static final int SWITCH_TIME = 200; - public static final int SWITCH_COST = 450; public static final TimeSlopeSafetyTriangle TRIANGLE = TimeSlopeSafetyTriangle .of() .withSlope(1) @@ -29,10 +25,6 @@ class BikePreferencesTest { .withSpeed(SPEED) .withReluctance(RELUCTANCE) .withBoardCost(BOARD_COST) - .withWalkingSpeed(WALKING_SPEED) - .withWalkingReluctance(WALKING_RELUCTANCE) - .withSwitchTime(SWITCH_TIME) - .withSwitchCost(SWITCH_COST) .withOptimizeType(OPTIMIZE_TYPE) .withRental(rental -> rental.withPickupTime(RENTAL_PICKUP_TIME).build()) .withParking(parking -> parking.withParkCost(PARK_COST).build()) @@ -54,26 +46,6 @@ void boardCost() { assertEquals(BOARD_COST, subject.boardCost()); } - @Test - void walkingSpeed() { - assertEquals(WALKING_SPEED, subject.walkingSpeed()); - } - - @Test - void walkingReluctance() { - assertEquals(WALKING_RELUCTANCE, subject.walkingReluctance()); - } - - @Test - void switchTime() { - assertEquals(SWITCH_TIME, subject.switchTime()); - } - - @Test - void switchCost() { - assertEquals(SWITCH_COST, subject.switchCost()); - } - @Test void optimizeType() { assertEquals(OPTIMIZE_TYPE, subject.optimizeType()); diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java new file mode 100644 index 00000000000..9571eee8cc5 --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java @@ -0,0 +1,77 @@ +package org.opentripplanner.routing.api.request.preference; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.routing.api.request.preference.ImmutablePreferencesAsserts.assertEqualsAndHashCode; + +import java.time.Duration; +import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.model.Cost; + +class VehicleWalkingPreferencesTest { + + private static final double SPEED = 1.45; + private static final double RELUCTANCE = 5.5; + private static final Duration HOP_TIME = Duration.ofSeconds(15); + private static final Cost HOP_COST = Cost.costOfSeconds(20); + private static final double STAIRS_RELUCTANCE = 11; + + private final VehicleWalkingPreferences subject = createPreferences(); + + @Test + void speed() { + assertEquals(SPEED, subject.speed()); + } + + @Test + void reluctance() { + assertEquals(RELUCTANCE, subject.reluctance()); + } + + @Test + void hopTime() { + assertEquals(HOP_TIME, subject.hopTime()); + } + + @Test + void hopCost() { + assertEquals(HOP_COST, subject.hopCost()); + } + + @Test + void stairsReluctance() { + assertEquals(STAIRS_RELUCTANCE, subject.stairsReluctance()); + } + + @Test + void testCopyOfEqualsAndHashCode() { + // Create a copy, make a change and set it back again to force creating a new object + var other = subject.copyOf().withSpeed(5.4).build(); + var same = other.copyOf().withSpeed(SPEED).build(); + assertEqualsAndHashCode(subject, other, same); + } + + @Test + void testToString() { + assertEquals("VehicleWalkingPreferences{}", VehicleWalkingPreferences.DEFAULT.toString()); + assertEquals( + "VehicleWalkingPreferences{" + + "speed: 1.45, " + + "reluctance: 5.5, " + + "hopTime: PT15S, " + + "hopCost: $20, " + + "stairsReluctance: 11.0}", + subject.toString() + ); + } + + private VehicleWalkingPreferences createPreferences() { + return VehicleWalkingPreferences + .of() + .withSpeed(SPEED) + .withReluctance(RELUCTANCE) + .withHopTime(HOP_TIME) + .withHopCost(HOP_COST.toSeconds()) + .withStairsReluctance(STAIRS_RELUCTANCE) + .build(); + } +} diff --git a/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java b/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java index e9b979e3b5b..d1ea3c8e59d 100644 --- a/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java +++ b/src/test/java/org/opentripplanner/street/integration/BarrierRoutingTest.java @@ -66,7 +66,10 @@ public void shouldWalkForBarriers() { from, to, BIKE, - rr -> rr.withPreferences(p -> p.withBike(it -> it.withWalkingReluctance(1d))), + rr -> + rr.withPreferences(p -> + p.withBike(it -> it.withWalking(walking -> walking.withReluctance(1d))) + ), itineraries -> itineraries .stream() diff --git a/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java b/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java index 66086c6d168..417f1b87347 100644 --- a/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java +++ b/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java @@ -375,7 +375,7 @@ private List runStreetSearchAndCreateDescriptor( preferences .withWalk(w -> w.withSpeed(10)) .withBike(it -> - it.withSpeed(20d).withWalkingSpeed(5d).withSwitchTime(100).withSwitchCost(1000) + it.withSpeed(20d).withWalking(w -> w.withSpeed(5d).withHopTime(100).withHopCost(1000)) ) ); request.setArriveBy(arriveBy); diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java index 4712841a8d9..2ecfa51822a 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java @@ -159,7 +159,9 @@ public void bikeStairsReluctance(double stairsReluctance, long expectedCost) { .buildAndConnect(); var req = StreetSearchRequest.of(); - req.withPreferences(p -> p.withBike(b -> b.withStairsReluctance(stairsReluctance))); + req.withPreferences(p -> + p.withBike(b -> b.withWalking(w -> w.withStairsReluctance(stairsReluctance))) + ); req.withMode(StreetMode.BIKE); var result = traverse(stairsEdge, req.build()); assertEquals(expectedCost, (long) result.weight); diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index e131bae1a7a..42d841b9fa3 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -55,7 +55,9 @@ public void before() { references .withStreet(s -> s.withTurnReluctance(1.0)) .withWalk(it -> it.withSpeed(1.0).withReluctance(1.0).withStairsReluctance(1.0)) - .withBike(it -> it.withSpeed(5.0f).withReluctance(1.0).withWalkingSpeed(0.8)) + .withBike(it -> + it.withSpeed(5.0f).withReluctance(1.0).withWalking(w -> w.withSpeed(0.8)) + ) .withCar(c -> c.withSpeed(15.0f).withReluctance(1.0)) ) .build(); @@ -218,7 +220,9 @@ public void testBikeSwitch() { StreetEdge e2 = streetEdge(v2, v0, 0.0, StreetTraversalPermission.PEDESTRIAN_AND_BICYCLE); StreetSearchRequestBuilder noPenalty = StreetSearchRequest.copyOf(proto); - noPenalty.withPreferences(p -> p.withBike(it -> it.withSwitchTime(0).withSwitchCost(0))); + noPenalty.withPreferences(p -> + p.withBike(it -> it.withWalking(w -> w.withHopTime(0).withHopCost(0))) + ); State s0 = new State(v0, noPenalty.withMode(StreetMode.BIKE).build()); State s1 = e0.traverse(s0)[0]; @@ -226,7 +230,9 @@ public void testBikeSwitch() { State s3 = e2.traverse(s2)[0]; StreetSearchRequestBuilder withPenalty = StreetSearchRequest.copyOf(proto); - withPenalty.withPreferences(p -> p.withBike(it -> it.withSwitchTime(42).withSwitchCost(23))); + withPenalty.withPreferences(p -> + p.withBike(it -> it.withWalking(w -> w.withHopTime(42).withHopCost(23))) + ); State s4 = new State(v0, withPenalty.withMode(StreetMode.BIKE).build()); State s5 = e0.traverse(s4)[0]; From f96c42bd52b4f22a1778d6baea3e4bfb0faab03a Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 18 Dec 2023 17:30:48 +0200 Subject: [PATCH 0213/1688] Restructure and name bike/car preferences in router-config --- docs/RouteRequest.md | 290 +++++++++++------- docs/RouterConfiguration.md | 45 ++- docs/examples/entur/router-config.json | 45 ++- docs/examples/ibi/atlanta/router-config.json | 24 +- .../routerequest/RouteRequestConfig.java | 272 +++------------- .../TriangleOptimizationConfig.java | 53 ++++ .../routerequest/VehicleParkingConfig.java | 93 ++++++ .../routerequest/VehicleRentalConfig.java | 8 +- .../routerequest/VehicleWalkingConfig.java | 82 +++++ .../standalone/config/router-config.json | 45 ++- .../performance/norway/speed-test-config.json | 6 +- .../switzerland/speed-test-config.json | 6 +- 12 files changed, 556 insertions(+), 413 deletions(-) create mode 100644 src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java create mode 100644 src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java create mode 100644 src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 9e891cf732d..755f5f73e28 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -17,29 +17,7 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |--------------------------------------------------------------------------------------------------------------|:----------------------:|------------------------------------------------------------------------------------------------------------------------------------------------|:----------:|------------------|:-----:| | [alightSlack](#rd_alightSlack) | `duration` | The minimum extra time after exiting a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | | arriveBy | `boolean` | Whether the trip should depart or arrive at the specified date and time. | *Optional* | `false` | 2.0 | -| [bikeBoardCost](#rd_bikeBoardCost) | `integer` | Prevents unnecessary transfers by adding a cost for boarding a vehicle. | *Optional* | `600` | 2.0 | -| bikeParkCost | `integer` | Cost to park a bike. | *Optional* | `120` | 2.0 | -| bikeParkTime | `duration` | Time to park a bike. | *Optional* | `"PT1M"` | 2.0 | -| bikeReluctance | `double` | A multiplier for how bad biking is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | -| bikeSpeed | `double` | Max bike speed along streets, in meters per second | *Optional* | `5.0` | 2.0 | -| bikeStairsReluctance | `double` | How bad is it to walk the bicycle up/down a flight of stairs compared to taking a detour. | *Optional* | `10.0` | 2.3 | -| bikeSwitchCost | `integer` | The cost of the user fetching their bike and parking it again. | *Optional* | `0` | 2.0 | -| bikeSwitchTime | `integer` | The time it takes the user to fetch their bike and park it again in seconds. | *Optional* | `0` | 2.0 | -| bikeTriangleSafetyFactor | `double` | For bike triangle routing, how much safety matters (range 0-1). | *Optional* | `0.0` | 2.0 | -| bikeTriangleSlopeFactor | `double` | For bike triangle routing, how much slope matters (range 0-1). | *Optional* | `0.0` | 2.0 | -| bikeTriangleTimeFactor | `double` | For bike triangle routing, how much time matters (range 0-1). | *Optional* | `0.0` | 2.0 | -| bikeWalkingReluctance | `double` | A multiplier for how bad walking with a bike is, compared to being in transit for equal lengths of time. | *Optional* | `5.0` | 2.1 | -| bikeWalkingSpeed | `double` | The user's bike walking speed in meters/second. Defaults to approximately 3 MPH. | *Optional* | `1.33` | 2.1 | | [boardSlack](#rd_boardSlack) | `duration` | The boardSlack is the minimum extra time to board a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | -| carAccelerationSpeed | `double` | The acceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | -| carDecelerationSpeed | `double` | The deceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | -| carDropoffTime | `integer` | Time to park a car in a park and ride, w/o taking into account driving and walking cost. | *Optional* | `120` | 2.0 | -| carParkCost | `integer` | Cost of parking a car. | *Optional* | `120` | 2.1 | -| carParkTime | `duration` | Time to park a car | *Optional* | `"PT1M"` | 2.1 | -| carPickupCost | `integer` | Add a cost for car pickup changes when a pickup or drop off takes place | *Optional* | `120` | 2.1 | -| carPickupTime | `integer` | Add a time for car pickup changes when a pickup or drop off takes place | *Optional* | `60` | 2.1 | -| carReluctance | `double` | A multiplier for how bad driving is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | -| carSpeed | `double` | Max car speed along streets, in meters per second | *Optional* | `40.0` | 2.0 | | [drivingDirection](#rd_drivingDirection) | `enum` | The driving direction to use in the intersection traversal calculation | *Optional* | `"right"` | 2.2 | | elevatorBoardCost | `integer` | What is the cost of boarding a elevator? | *Optional* | `90` | 2.0 | | elevatorBoardTime | `integer` | How long does it take to get on an elevator, on average. | *Optional* | `90` | 2.0 | @@ -55,7 +33,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | modes | `string` | The set of access/egress/direct/transit modes to be used for the route search. | *Optional* | `"TRANSIT,WALK"` | 2.0 | | nonpreferredTransferPenalty | `integer` | Penalty (in seconds) for using a non-preferred transfer. | *Optional* | `180` | 2.0 | | numItineraries | `integer` | The maximum number of itineraries to return. | *Optional* | `50` | 2.0 | -| [optimize](#rd_optimize) | `enum` | The set of characteristics that the user wants to optimize for. | *Optional* | `"safe"` | 2.0 | | [otherThanPreferredRoutesPenalty](#rd_otherThanPreferredRoutesPenalty) | `integer` | Penalty added for using every route that is not preferred if user set any route as preferred. | *Optional* | `300` | 2.0 | | [relaxTransitPriorityGroup](#rd_relaxTransitPriorityGroup) | `string` | The relax function for transit-priority-groups | *Optional* | `"0s + 1.00 t"` | 2.5 | | [relaxTransitSearchGeneralizedCostAtDestination](#rd_relaxTransitSearchGeneralizedCostAtDestination) | `double` | Whether non-optimal transit paths at the destination should be returned | *Optional* | | 2.3 | @@ -67,7 +44,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | [transferSlack](#rd_transferSlack) | `integer` | The extra time needed to make a safe transfer in seconds. | *Optional* | `120` | 2.0 | | turnReluctance | `double` | Multiplicative factor on expected turning time. | *Optional* | `1.0` | 2.0 | | [unpreferredCost](#rd_unpreferredCost) | `cost-linear-function` | A cost function used to calculate penalty for an unpreferred route. | *Optional* | `"0s + 1.00 t"` | 2.2 | -| [unpreferredVehicleParkingTagCost](#rd_unpreferredVehicleParkingTagCost) | `integer` | What cost to add if a parking facility doesn't contain a preferred tag. | *Optional* | `300` | 2.3 | | waitReluctance | `double` | How much worse is waiting for a transit vehicle than being on a transit vehicle, as a multiplier. | *Optional* | `1.0` | 2.0 | | walkBoardCost | `integer` | Prevents unnecessary transfers by adding a cost for boarding a vehicle. This is the cost that is used when boarding while walking. | *Optional* | `600` | 2.0 | | [walkReluctance](#rd_walkReluctance) | `double` | A multiplier for how bad walking is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | @@ -82,8 +58,55 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |          costFactor | `double` | A factor multiplied with the time-penalty to get the cost-penalty. | *Optional* | `0.0` | 2.4 | |          timePenalty | `time-penalty` | Penalty added to the time of a path/leg. | *Optional* | `"0s + 0.00 t"` | 2.4 | | [alightSlackForMode](#rd_alightSlackForMode) | `enum map of duration` | How much extra time should be given when alighting a vehicle for each given mode. | *Optional* | | 2.0 | -| [bannedVehicleParkingTags](#rd_bannedVehicleParkingTags) | `string[]` | Tags with which a vehicle parking will not be used. If empty, no tags are banned. | *Optional* | | 2.1 | +| bicycle | `object` | Bicycle preferences. | *Optional* | | 2.5 | +|    [boardCost](#rd_bicycle_boardCost) | `integer` | Prevents unnecessary transfers by adding a cost for boarding a transit vehicle. | *Optional* | `600` | 2.0 | +|    [optimization](#rd_bicycle_optimization) | `enum` | The set of characteristics that the user wants to optimize for. | *Optional* | `"safe"` | 2.0 | +|    reluctance | `double` | A multiplier for how bad cycling is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | +|    speed | `double` | Max bicycle speed along streets, in meters per second | *Optional* | `5.0` | 2.0 | +|    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | +|       parkCost | `integer` | Cost to park a vehicle. | *Optional* | `120` | 2.0 | +|       parkTime | `duration` | Time to park a vehicle. | *Optional* | `"PT1M"` | 2.0 | +|       [unpreferredVehicleParkingTagCost](#rd_bicycle_parking_unpreferredVehicleParkingTagCost) | `integer` | What cost to add if a parking facility doesn't contain a preferred tag. | *Optional* | `300` | 2.3 | +|       [bannedVehicleParkingTags](#rd_bicycle_parking_bannedVehicleParkingTags) | `string[]` | Tags with which a vehicle parking will not be used. If empty, no tags are banned. | *Optional* | | 2.1 | +|       [preferredVehicleParkingTags](#rd_bicycle_parking_preferredVehicleParkingTags) | `string[]` | Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. | *Optional* | | 2.3 | +|       [requiredVehicleParkingTags](#rd_bicycle_parking_requiredVehicleParkingTags) | `string[]` | Tags without which a vehicle parking will not be used. If empty, no tags are required. | *Optional* | | 2.1 | +|    rental | `object` | Vehicle rental options | *Optional* | | 2.3 | +|       allowKeepingAtDestination | `boolean` | If a vehicle should be allowed to be kept at the end of a station-based rental. | *Optional* | `false` | 2.2 | +|       dropOffCost | `integer` | Cost to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | +|       dropOffTime | `integer` | Time to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | +|       keepingAtDestinationCost | `double` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0.0` | 2.2 | +|       pickupCost | `integer` | Cost to rent a vehicle. | *Optional* | `120` | 2.0 | +|       pickupTime | `integer` | Time to rent a vehicle. | *Optional* | `60` | 2.0 | +|       useAvailabilityInformation | `boolean` | Whether or not vehicle rental availability information will be used to plan vehicle rental trips. | *Optional* | `false` | 2.0 | +|       [allowedNetworks](#rd_bicycle_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | +|       [bannedNetworks](#rd_bicycle_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | +|    triangle | `object` | Triangle optimization criteria. | *Optional* | | 2.5 | +|    walking | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | +|       [hopCost](#rd_bicycle_walking_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | +|       [hopTime](#rd_bicycle_walking_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle in seconds. | *Optional* | `"PT0S"` | 2.0 | +|       reluctance | `double` | A multiplier for how bad walking with a vehicle is, compared to being in transit for equal lengths of time. | *Optional* | `5.0` | 2.1 | +|       speed | `double` | The user's vehicle walking speed in meters/second. Defaults to approximately 3 MPH. | *Optional* | `1.33` | 2.1 | +|       stairsReluctance | `double` | How bad is it to walk the vehicle up/down a flight of stairs compared to taking a detour. | *Optional* | `10.0` | 2.3 | | [boardSlackForMode](#rd_boardSlackForMode) | `enum map of duration` | How much extra time should be given when boarding a vehicle for each given mode. | *Optional* | | 2.0 | +| car | `object` | Car preferences. | *Optional* | | 2.5 | +|    accelerationSpeed | `double` | The acceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | +|    decelerationSpeed | `double` | The deceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | +|    dropoffTime | `integer` | Time to park a car in a park and ride, w/o taking into account driving and walking cost. | *Optional* | `120` | 2.0 | +|    pickupCost | `integer` | Add a cost for car pickup changes when a pickup or drop off takes place | *Optional* | `120` | 2.1 | +|    pickupTime | `integer` | Add a time for car pickup changes when a pickup or drop off takes place | *Optional* | `60` | 2.1 | +|    reluctance | `double` | A multiplier for how bad driving is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | +|    speed | `double` | Max car speed along streets, in meters per second | *Optional* | `40.0` | 2.0 | +|    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | +|    rental | `object` | Vehicle rental options | *Optional* | | 2.3 | +|       allowKeepingAtDestination | `boolean` | If a vehicle should be allowed to be kept at the end of a station-based rental. | *Optional* | `false` | 2.2 | +|       dropOffCost | `integer` | Cost to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | +|       dropOffTime | `integer` | Time to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | +|       keepingAtDestinationCost | `double` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0.0` | 2.2 | +|       pickupCost | `integer` | Cost to rent a vehicle. | *Optional* | `120` | 2.0 | +|       pickupTime | `integer` | Time to rent a vehicle. | *Optional* | `60` | 2.0 | +|       useAvailabilityInformation | `boolean` | Whether or not vehicle rental availability information will be used to plan vehicle rental trips. | *Optional* | `false` | 2.0 | +|       [allowedNetworks](#rd_car_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | +|       [bannedNetworks](#rd_car_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | | [itineraryFilters](#rd_itineraryFilters) | `object` | Configure itinerary filters that may modify itineraries, sort them, and filter away less preferable results. | *Optional* | | 2.0 | |    [accessibilityScore](#rd_if_accessibilityScore) | `boolean` | An experimental feature contributed by IBI which adds a sandbox accessibility *score* between 0 and 1 for each leg and itinerary. | *Optional* | `false` | 2.2 | |    [bikeRentalDistanceRatio](#rd_if_bikeRentalDistanceRatio) | `double` | Filter routes that consist of bike-rental and walking by the minimum fraction of the bike-rental leg using _distance_. | *Optional* | `0.0` | 2.1 | @@ -101,8 +124,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       [costLimitFunction](#rd_if_transitGeneralizedCostLimit_costLimitFunction) | `cost-linear-function` | The base function used by the filter. | *Optional* | `"15m + 1.50 t"` | 2.2 | |       [intervalRelaxFactor](#rd_if_transitGeneralizedCostLimit_intervalRelaxFactor) | `double` | How much the filter should be relaxed for itineraries that do not overlap in time. | *Optional* | `0.4` | 2.2 | | [maxDirectStreetDurationForMode](#rd_maxDirectStreetDurationForMode) | `enum map of duration` | Limit direct route duration per street mode. | *Optional* | | 2.2 | -| [preferredVehicleParkingTags](#rd_preferredVehicleParkingTags) | `string[]` | Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. | *Optional* | | 2.3 | -| [requiredVehicleParkingTags](#rd_requiredVehicleParkingTags) | `string[]` | Tags without which a vehicle parking will not be used. If empty, no tags are required. | *Optional* | | 2.1 | | [transferOptimization](#rd_transferOptimization) | `object` | Optimize where a transfer between to trip happens. | *Optional* | | 2.1 | |    [backTravelWaitTimeFactor](#rd_to_backTravelWaitTimeFactor) | `double` | To reduce back-travel we favor waiting, this reduces the cost of waiting. | *Optional* | `1.0` | 2.1 | |    [extraStopBoardAlightCostsFactor](#rd_to_extraStopBoardAlightCostsFactor) | `double` | Add an extra board- and alight-cost for prioritized stops. | *Optional* | `0.0` | 2.1 | @@ -113,16 +134,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | [unpreferred](#rd_unpreferred) | `object` | Parameters listing authorities or lines that preferably should not be used in trip patters. | *Optional* | | 2.2 | |    [agencies](#rd_unpreferred_agencies) | `feed-scoped-id[]` | The ids of the agencies that incur an extra cost when being used. Format: `FeedId:AgencyId` | *Optional* | | 2.2 | |    [routes](#rd_unpreferred_routes) | `feed-scoped-id[]` | The ids of the routes that incur an extra cost when being used. Format: `FeedId:RouteId` | *Optional* | | 2.2 | -| vehicleRental | `object` | Vehicle rental options | *Optional* | | 2.3 | -|    allowKeepingAtDestination | `boolean` | If a vehicle should be allowed to be kept at the end of a station-based rental. | *Optional* | `false` | 2.2 | -|    dropOffCost | `integer` | Cost to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | -|    dropOffTime | `integer` | Time to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | -|    keepingAtDestinationCost | `double` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0.0` | 2.2 | -|    pickupCost | `integer` | Cost to rent a vehicle. | *Optional* | `120` | 2.0 | -|    pickupTime | `integer` | Time to rent a vehicle. | *Optional* | `60` | 2.0 | -|    useAvailabilityInformation | `boolean` | Whether or not vehicle rental availability information will be used to plan vehicle rental trips. | *Optional* | `false` | 2.0 | -|    [allowedNetworks](#rd_vehicleRental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | -|    [bannedNetworks](#rd_vehicleRental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | | wheelchairAccessibility | `object` | See [Wheelchair Accessibility](Accessibility.md) | *Optional* | | 2.2 | |    enabled | `boolean` | Enable wheelchair accessibility. | *Optional* | `false` | 2.0 | |    inaccessibleStreetReluctance | `double` | The factor to multiply the cost of traversing a street edge that is not wheelchair-accessible. | *Optional* | `25.0` | 2.2 | @@ -159,15 +170,6 @@ The minimum extra time after exiting a public transport vehicle. The slack is added to the time when going from the transit vehicle to the stop. -

    bikeBoardCost

    - -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `600` -**Path:** /routingDefaults - -Prevents unnecessary transfers by adding a cost for boarding a vehicle. - -This is the cost that is used when boarding while cycling.This is usually higher that walkBoardCost. -

    boardSlack

    **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` @@ -230,14 +232,6 @@ search, hence, making it a bit slower. Recommended values would be from 12 hours 1 day (region) to 2 days (country like Norway)." -

    optimize

    - -**Since version:** `2.0` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"safe"` -**Path:** /routingDefaults -**Enum values:** `quick` | `safe` | `flat` | `greenways` | `triangle` - -The set of characteristics that the user wants to optimize for. -

    otherThanPreferredRoutesPenalty

    **Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `300` @@ -364,15 +358,6 @@ Function should return number of seconds that we are willing to wait for preferr or for an unpreferred agency's departure. For example: `5m + 2.0 t` -

    unpreferredVehicleParkingTagCost

    - -**Since version:** `2.3` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `300` -**Path:** /routingDefaults - -What cost to add if a parking facility doesn't contain a preferred tag. - -See `preferredVehicleParkingTags`. -

    walkReluctance

    **Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `2.0` @@ -473,16 +458,98 @@ How much extra time should be given when alighting a vehicle for each given mode Sometimes there is a need to configure a longer alighting times for specific modes, such as airplanes or ferries. -

    bannedVehicleParkingTags

    +

    boardCost

    + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `600` +**Path:** /routingDefaults/bicycle + +Prevents unnecessary transfers by adding a cost for boarding a transit vehicle. + +This is the cost that is used when boarding while cycling.This is usually higher that walkBoardCost. + +

    optimization

    + +**Since version:** `2.0` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"safe"` +**Path:** /routingDefaults/bicycle +**Enum values:** `quick` | `safe` | `flat` | `greenways` | `triangle` + +The set of characteristics that the user wants to optimize for. + +

    unpreferredVehicleParkingTagCost

    + +**Since version:** `2.3` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `300` +**Path:** /routingDefaults/bicycle/parking + +What cost to add if a parking facility doesn't contain a preferred tag. + +See `preferredVehicleParkingTags`. + +

    bannedVehicleParkingTags

    **Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` -**Path:** /routingDefaults +**Path:** /routingDefaults/bicycle/parking Tags with which a vehicle parking will not be used. If empty, no tags are banned. Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). +

    preferredVehicleParkingTags

    + +**Since version:** `2.3` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/bicycle/parking + +Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. + +Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + + +

    requiredVehicleParkingTags

    + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/bicycle/parking + +Tags without which a vehicle parking will not be used. If empty, no tags are required. + +Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + + +

    allowedNetworks

    + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/bicycle/rental + +The vehicle rental networks which may be used. If empty all networks may be used. + +

    bannedNetworks

    + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/bicycle/rental + +The vehicle rental networks which may not be used. If empty, no networks are banned. + +

    hopCost

    + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` +**Path:** /routingDefaults/bicycle/walking + +The cost of hopping on or off a vehicle. + +There are different parameters for the cost of renting or parking a vehicle and this is +not meant for controlling the cost of those events. + + +

    hopTime

    + +**Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` +**Path:** /routingDefaults/bicycle/walking + +The time it takes the user to hop on or off a vehicle in seconds. + +Time it takes to rent or park a vehicle have their own parameters and this is not meant +for controlling the duration of those events. + +

    boardSlackForMode

    **Since version:** `2.0` ∙ **Type:** `enum map of duration` ∙ **Cardinality:** `Optional` @@ -495,6 +562,20 @@ Sometimes there is a need to configure a board times for specific modes, such as ferries, where the check-in process needs to be done in good time before ride. +

    allowedNetworks

    + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/car/rental + +The vehicle rental networks which may be used. If empty all networks may be used. + +

    bannedNetworks

    + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/car/rental + +The vehicle rental networks which may not be used. If empty, no networks are banned. +

    itineraryFilters

    **Since version:** `2.0` ∙ **Type:** `object` ∙ **Cardinality:** `Optional` @@ -710,26 +791,6 @@ Override the settings in `maxDirectStreetDuration` for specific street modes. Th done because some street modes searches are much more resource intensive than others. -

    preferredVehicleParkingTags

    - -**Since version:** `2.3` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` -**Path:** /routingDefaults - -Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. - -Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - - -

    requiredVehicleParkingTags

    - -**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` -**Path:** /routingDefaults - -Tags without which a vehicle parking will not be used. If empty, no tags are required. - -Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - -

    transferOptimization

    **Since version:** `2.1` ∙ **Type:** `object` ∙ **Cardinality:** `Optional` @@ -873,20 +934,6 @@ The ids of the routes that incur an extra cost when being used. Format: `FeedId: How much cost is added is configured in `unpreferredCost`. -

    allowedNetworks

    - -**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` -**Path:** /routingDefaults/vehicleRental - -The vehicle rental networks which may be used. If empty all networks may be used. - -

    bannedNetworks

    - -**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` -**Path:** /routingDefaults/vehicleRental - -The vehicle rental networks which may not be used. If empty, no networks are banned. -

    maxSlope

    **Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.083` @@ -934,15 +981,9 @@ include stairs as a last result. { "routingDefaults" : { "walkSpeed" : 1.3, - "bikeSpeed" : 5, - "carSpeed" : 40, "numItineraries" : 12, "transferPenalty" : 0, "walkReluctance" : 4.0, - "bikeReluctance" : 5.0, - "bikeWalkingReluctance" : 10.0, - "bikeStairsReluctance" : 150.0, - "carReluctance" : 10.0, "stairsReluctance" : 1.65, "turnReluctance" : 1.0, "elevatorBoardTime" : 90, @@ -950,17 +991,38 @@ include stairs as a last result. "elevatorHopTime" : 20, "elevatorHopCost" : 20, "escalatorReluctance" : 1.5, - "vehicleRental" : { - "pickupCost" : 120, - "dropOffTime" : 30, - "dropOffCost" : 30 + "bicycle" : { + "speed" : 5, + "reluctance" : 5.0, + "boardCost" : 600, + "walking" : { + "reluctance" : 10.0, + "stairsReluctance" : 150.0 + }, + "rental" : { + "pickupCost" : 120, + "dropOffTime" : 30, + "dropOffCost" : 30 + }, + "parking" : { + "parkTime" : "1m", + "parkCost" : 120 + } + }, + "car" : { + "speed" : 40, + "reluctance" : 10, + "dropoffTime" : 120, + "decelerationSpeed" : 2.9, + "accelerationSpeed" : 2.9, + "rental" : { + "pickupCost" : 120, + "dropOffTime" : 30, + "dropOffCost" : 30 + } }, - "bikeParkTime" : "1m", - "bikeParkCost" : 120, - "carDropoffTime" : 120, "waitReluctance" : 1.0, "walkBoardCost" : 600, - "bikeBoardCost" : 600, "otherThanPreferredRoutesPenalty" : 300, "transferSlack" : 120, "boardSlackForMode" : { @@ -997,8 +1059,6 @@ include stairs as a last result. "minBikeParkingDistance" : 300, "debug" : "limit-to-search-window" }, - "carDecelerationSpeed" : 2.9, - "carAccelerationSpeed" : 2.9, "ignoreRealtimeUpdates" : false, "geoidElevation" : false, "maxJourneyDuration" : "36h", diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 65f50260ee5..37a673ea7a2 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -452,15 +452,9 @@ Used to group requests when monitoring OTP. }, "routingDefaults" : { "walkSpeed" : 1.3, - "bikeSpeed" : 5, - "carSpeed" : 40, "numItineraries" : 12, "transferPenalty" : 0, "walkReluctance" : 4.0, - "bikeReluctance" : 5.0, - "bikeWalkingReluctance" : 10.0, - "bikeStairsReluctance" : 150.0, - "carReluctance" : 10.0, "stairsReluctance" : 1.65, "turnReluctance" : 1.0, "elevatorBoardTime" : 90, @@ -468,17 +462,38 @@ Used to group requests when monitoring OTP. "elevatorHopTime" : 20, "elevatorHopCost" : 20, "escalatorReluctance" : 1.5, - "vehicleRental" : { - "pickupCost" : 120, - "dropOffTime" : 30, - "dropOffCost" : 30 + "bicycle" : { + "speed" : 5, + "reluctance" : 5.0, + "boardCost" : 600, + "walking" : { + "reluctance" : 10.0, + "stairsReluctance" : 150.0 + }, + "rental" : { + "pickupCost" : 120, + "dropOffTime" : 30, + "dropOffCost" : 30 + }, + "parking" : { + "parkTime" : "1m", + "parkCost" : 120 + } + }, + "car" : { + "speed" : 40, + "reluctance" : 10, + "dropoffTime" : 120, + "decelerationSpeed" : 2.9, + "accelerationSpeed" : 2.9, + "rental" : { + "pickupCost" : 120, + "dropOffTime" : 30, + "dropOffCost" : 30 + } }, - "bikeParkTime" : "1m", - "bikeParkCost" : 120, - "carDropoffTime" : 120, "waitReluctance" : 1.0, "walkBoardCost" : 600, - "bikeBoardCost" : 600, "otherThanPreferredRoutesPenalty" : 300, "transferSlack" : 120, "boardSlackForMode" : { @@ -515,8 +530,6 @@ Used to group requests when monitoring OTP. "minBikeParkingDistance" : 300, "debug" : "limit-to-search-window" }, - "carDecelerationSpeed" : 2.9, - "carAccelerationSpeed" : 2.9, "ignoreRealtimeUpdates" : false, "geoidElevation" : false, "maxJourneyDuration" : "36h", diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index 0023dab130a..2d217cb2402 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -2,31 +2,46 @@ "configVersion" : "{{ Entur CI config build number inserted here }}", "routingDefaults": { "walkSpeed": 1.3, - "bikeSpeed": 5, - "carSpeed": 40, "numItineraries": 12, "transferPenalty": 0, "walkReluctance": 4.0, - "bikeReluctance": 5.0, - "bikeWalkingReluctance": 10.0, - "carReluctance": 10.0, "stairsReluctance": 1.65, "turnReluctance": 1.0, "elevatorBoardTime": 90, "elevatorBoardCost": 90, "elevatorHopTime": 20, "elevatorHopCost": 20, - "vehicleRental": { - "pickupCost": 120, - "dropOffTime": 30, - "dropOffCost": 30 + "bicycle": { + "speed": 5, + "reluctance": 5.0, + "boardCost": 600, + "walking": { + "reluctance": 10.0 + }, + "rental": { + "pickupCost": 120, + "dropOffTime": 30, + "dropOffCost": 30 + }, + "parking": { + "parkTime": "1m", + "parkCost": 120 + } + }, + "car": { + "speed": 40, + "reluctance": 4.0, + "dropoffTime": 120, + "decelerationSpeed": 2.9, + "accelerationSpeed": 2.9, + "rental": { + "pickupCost": 120, + "dropOffTime": 30, + "dropOffCost": 30 + } }, - "bikeParkTime": "1m", - "bikeParkCost": 120, - "carDropoffTime": 120, "waitReluctance": 1.0, "walkBoardCost": 600, - "bikeBoardCost": 600, "otherThanPreferredRoutesPenalty": 300, "transferSlack": 120, // Default slack for any mode is 0 (zero) @@ -41,15 +56,13 @@ }, "accessEgress": { "maxDurationForMode": { - "BIKE_RENTAL": "20m" + "BIKE_RENTAL": "20m" } }, "itineraryFilters" : { "transitGeneralizedCostLimit" : "1h + 2.5 x", "bikeRentalDistanceRatio": 0.3 }, - "carDecelerationSpeed": 2.9, - "carAccelerationSpeed": 2.9, "ignoreRealtimeUpdates": false, "geoidElevation": false, "maxJourneyDuration": "36h", diff --git a/docs/examples/ibi/atlanta/router-config.json b/docs/examples/ibi/atlanta/router-config.json index 5202fe227c1..2aeb3e6434e 100644 --- a/docs/examples/ibi/atlanta/router-config.json +++ b/docs/examples/ibi/atlanta/router-config.json @@ -1,18 +1,28 @@ { "routingDefaults": { - "bikeTriangleSafetyFactor": 0.4, - "bikeTriangleSlopeFactor": 0.3, - "bikeTriangleTimeFactor": 0.3, + "bicycle": { + "triangle": { + "time": 0.3, + "flatness": 0.3, + "safety": 0.4 + }, + "rental": { + "pickupTime": 180, + "pickupCost": 850 + } + }, + "car": { + "rental": { + "pickupTime": 180, + "pickupCost": 850 + } + }, "itineraryFilters": { // only show non-transit (ie. walking) when it's at least as good as the transit option "nonTransitGeneralizedCostLimit": "0 + 1.0 x", // add IBI accessibility score between 0 and 1 "accessibilityScore": true }, - "vehicleRental": { - "pickupTime": 180, - "pickupCost": 850 - }, // use stop and trip with unknown wheelchair accessibility during routing "wheelchairAccessibility": { "trip": { diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index e600f1f8f12..0ff1c48cf2b 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -8,11 +8,13 @@ import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5; import static org.opentripplanner.standalone.config.routerequest.ItineraryFiltersConfig.mapItineraryFilterParams; import static org.opentripplanner.standalone.config.routerequest.TransferConfig.mapTransferPreferences; -import static org.opentripplanner.standalone.config.routerequest.VehicleRentalConfig.setVehicleRental; +import static org.opentripplanner.standalone.config.routerequest.TriangleOptimizationConfig.mapOptimizationTriangle; +import static org.opentripplanner.standalone.config.routerequest.VehicleParkingConfig.mapParking; +import static org.opentripplanner.standalone.config.routerequest.VehicleRentalConfig.mapRental; +import static org.opentripplanner.standalone.config.routerequest.VehicleWalkingConfig.mapVehicleWalking; import static org.opentripplanner.standalone.config.routerequest.WheelchairConfig.mapWheelchairPreferences; import java.time.Duration; -import java.util.List; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.routing.api.request.RequestModes; @@ -25,7 +27,6 @@ import org.opentripplanner.routing.api.request.preference.StreetPreferences; import org.opentripplanner.routing.api.request.preference.SystemPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; -import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.WalkPreferences; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.sandbox.DataOverlayParametersMapper; @@ -335,176 +336,48 @@ The board time is added to the time when going from the stop (offboard) to onboa private static void mapBikePreferences(NodeAdapter c, BikePreferences.Builder builder) { var dft = builder.original(); + NodeAdapter cb = c.of("bicycle").since(V2_5).summary("Bicycle preferences.").asObject(); builder .withSpeed( - c - .of("bikeSpeed") + cb + .of("speed") .since(V2_0) - .summary("Max bike speed along streets, in meters per second") + .summary("Max bicycle speed along streets, in meters per second") .asDouble(dft.speed()) ) .withReluctance( - c - .of("bikeReluctance") + cb + .of("reluctance") .since(V2_0) .summary( - "A multiplier for how bad biking is, compared to being in transit for equal lengths of time." + "A multiplier for how bad cycling is, compared to being in transit for equal lengths of time." ) .asDouble(dft.reluctance()) ) .withBoardCost( - c - .of("bikeBoardCost") + cb + .of("boardCost") .since(V2_0) - .summary("Prevents unnecessary transfers by adding a cost for boarding a vehicle.") + .summary( + "Prevents unnecessary transfers by adding a cost for boarding a transit vehicle." + ) .description( "This is the cost that is used when boarding while cycling." + "This is usually higher that walkBoardCost." ) .asInt(dft.boardCost()) ) - .withWalkingSpeed( - c - .of("bikeWalkingSpeed") - .since(V2_1) - .summary( - "The user's bike walking speed in meters/second. Defaults to approximately 3 MPH." - ) - .asDouble(dft.walkingSpeed()) - ) - .withWalkingReluctance( - c - .of("bikeWalkingReluctance") - .since(V2_1) - .summary( - "A multiplier for how bad walking with a bike is, compared to being in transit for equal lengths of time." - ) - .asDouble(dft.walkingReluctance()) - ) - .withSwitchTime( - c - .of("bikeSwitchTime") - .since(V2_0) - .summary("The time it takes the user to fetch their bike and park it again in seconds.") - .asInt(dft.switchTime()) - ) - .withSwitchCost( - c - .of("bikeSwitchCost") - .since(V2_0) - .summary("The cost of the user fetching their bike and parking it again.") - .asInt(dft.switchCost()) - ) .withOptimizeType( - c - .of("optimize") + cb + .of("optimization") .since(V2_0) .summary("The set of characteristics that the user wants to optimize for.") .asEnum(dft.optimizeType()) ) - .withOptimizeTriangle(it -> - it - .withTime( - c - .of("bikeTriangleTimeFactor") - .since(V2_0) - .summary("For bike triangle routing, how much time matters (range 0-1).") - .asDouble(it.time()) - ) - .withSlope( - c - .of("bikeTriangleSlopeFactor") - .since(V2_0) - .summary("For bike triangle routing, how much slope matters (range 0-1).") - .asDouble(it.slope()) - ) - .withSafety( - c - .of("bikeTriangleSafetyFactor") - .since(V2_0) - .summary("For bike triangle routing, how much safety matters (range 0-1).") - .asDouble(it.safety()) - ) - ) - .withStairsReluctance( - c - .of("bikeStairsReluctance") - .since(V2_3) - .summary( - "How bad is it to walk the bicycle up/down a flight of stairs compared to taking a detour." - ) - .asDouble(dft.stairsReluctance()) - ) - .withParking(it -> - it - .withUnpreferredVehicleParkingTagCost( - c - .of("unpreferredVehicleParkingTagCost") - .since(V2_3) - .summary("What cost to add if a parking facility doesn't contain a preferred tag.") - .description("See `preferredVehicleParkingTags`.") - .asInt( - VehicleParkingPreferences.DEFAULT.unpreferredVehicleParkingTagCost().toSeconds() - ) - ) - .withBannedVehicleParkingTags( - c - .of("bannedVehicleParkingTags") - .since(V2_1) - .summary( - "Tags with which a vehicle parking will not be used. If empty, no tags are banned." - ) - .description( - """ - Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - """ - ) - .asStringSet(List.of()) - ) - .withRequiredVehicleParkingTags( - c - .of("requiredVehicleParkingTags") - .since(V2_1) - .summary( - "Tags without which a vehicle parking will not be used. If empty, no tags are required." - ) - .description( - """ - Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - """ - ) - .asStringSet(List.of()) - ) - .withParkTime( - c - .of("bikeParkTime") - .since(V2_0) - .summary("Time to park a bike.") - .asDuration(VehicleParkingPreferences.DEFAULT.parkTime()) - ) - .withParkCost( - c - .of("bikeParkCost") - .since(V2_0) - .summary("Cost to park a bike.") - .asInt(VehicleParkingPreferences.DEFAULT.parkCost().toSeconds()) - ) - .withPreferredVehicleParkingTags( - c - .of("preferredVehicleParkingTags") - .since(V2_3) - .summary( - "Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised." - ) - .description( - """ - Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - """ - ) - .asStringSet(List.of()) - ) - ) - .withRental(it -> setVehicleRental(c, it)); + .withOptimizeTriangle(it -> mapOptimizationTriangle(cb, it)) + .withWalking(it -> mapVehicleWalking(cb, it)) + .withParking(it -> mapParking(cb, it)) + .withRental(it -> mapRental(cb, it)); } private static void mapStreetPreferences(NodeAdapter c, StreetPreferences.Builder builder) { @@ -695,17 +568,18 @@ The street search(AStar) aborts after this duration and any paths found are retu private static void mapCarPreferences(NodeAdapter c, CarPreferences.Builder builder) { var dft = builder.original(); + NodeAdapter cc = c.of("car").since(V2_5).summary("Car preferences.").asObject(); builder .withSpeed( - c - .of("carSpeed") + cc + .of("speed") .since(V2_0) .summary("Max car speed along streets, in meters per second") .asDouble(dft.speed()) ) .withReluctance( - c - .of("carReluctance") + cc + .of("reluctance") .since(V2_0) .summary( "A multiplier for how bad driving is, compared to being in transit for equal lengths of time." @@ -713,8 +587,8 @@ private static void mapCarPreferences(NodeAdapter c, CarPreferences.Builder buil .asDouble(dft.reluctance()) ) .withDropoffTime( - c - .of("carDropoffTime") + cc + .of("dropoffTime") .since(V2_0) .summary( "Time to park a car in a park and ride, w/o taking into account driving and walking cost." @@ -722,103 +596,35 @@ private static void mapCarPreferences(NodeAdapter c, CarPreferences.Builder buil .asInt(dft.dropoffTime()) ) .withPickupCost( - c - .of("carPickupCost") + cc + .of("pickupCost") .since(V2_1) .summary("Add a cost for car pickup changes when a pickup or drop off takes place") .asInt(dft.pickupCost()) ) .withPickupTime( - c - .of("carPickupTime") + cc + .of("pickupTime") .since(V2_1) .summary("Add a time for car pickup changes when a pickup or drop off takes place") .asInt(dft.pickupTime()) ) .withAccelerationSpeed( - c - .of("carAccelerationSpeed") + cc + .of("accelerationSpeed") .since(V2_0) .summary("The acceleration speed of an automobile, in meters per second per second.") .asDouble(dft.accelerationSpeed()) ) .withDecelerationSpeed( - c - .of("carDecelerationSpeed") + cc + .of("decelerationSpeed") .since(V2_0) .summary("The deceleration speed of an automobile, in meters per second per second.") .asDouble(dft.decelerationSpeed()) ) - .withParking(it -> - it - .withUnpreferredVehicleParkingTagCost( - c - .of("unpreferredVehicleParkingTagCost") - .since(V2_3) - .summary("What cost to add if a parking facility doesn't contain a preferred tag.") - .description("See `preferredVehicleParkingTags`.") - .asInt( - VehicleParkingPreferences.DEFAULT.unpreferredVehicleParkingTagCost().toSeconds() - ) - ) - .withBannedVehicleParkingTags( - c - .of("bannedVehicleParkingTags") - .since(V2_1) - .summary( - "Tags with which a vehicle parking will not be used. If empty, no tags are banned." - ) - .description( - """ - Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - """ - ) - .asStringSet(List.of()) - ) - .withRequiredVehicleParkingTags( - c - .of("requiredVehicleParkingTags") - .since(V2_1) - .summary( - "Tags without which a vehicle parking will not be used. If empty, no tags are required." - ) - .description( - """ - Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - """ - ) - .asStringSet(List.of()) - ) - .withParkCost( - c - .of("carParkCost") - .since(V2_1) - .summary("Cost of parking a car.") - .asInt(VehicleParkingPreferences.DEFAULT.parkCost().toSeconds()) - ) - .withParkTime( - c - .of("carParkTime") - .since(V2_1) - .summary("Time to park a car") - .asDuration(VehicleParkingPreferences.DEFAULT.parkTime()) - ) - .withPreferredVehicleParkingTags( - c - .of("preferredVehicleParkingTags") - .since(V2_3) - .summary( - "Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised." - ) - .description( - """ - Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). - """ - ) - .asStringSet(List.of()) - ) - ) - .withRental(it -> setVehicleRental(c, it)); + .withParking(it -> mapParking(cc, it)) + .withRental(it -> mapRental(cc, it)); } private static void mapSystemPreferences(NodeAdapter c, SystemPreferences.Builder builder) { diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java new file mode 100644 index 00000000000..e4988b02767 --- /dev/null +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java @@ -0,0 +1,53 @@ +package org.opentripplanner.standalone.config.routerequest; + +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5; + +import org.opentripplanner.routing.api.request.preference.TimeSlopeSafetyTriangle; +import org.opentripplanner.standalone.config.framework.json.NodeAdapter; + +public class TriangleOptimizationConfig { + + private static void mapTriangleParameters( + NodeAdapter c, + TimeSlopeSafetyTriangle.Builder builder + ) { + builder + .withTime( + c + .of("time") + .since(V2_0) + .summary("Relative importance of duration of travel (range 0-1).") + .asDouble(builder.time()) + ) + .withSlope( + c + .of("flatness") + .since(V2_0) + .summary("Relative importance of flat terrain (range 0-1).") + .asDouble(builder.slope()) + ) + .withSafety( + c + .of("safety") + .since(V2_0) + .summary("Relative importance of safety (range 0-1).") + .description( + """ + This factor can also include other concerns such as convenience and general cyclist + preferences by taking into account road surface etc. + """ + ) + .asDouble(builder.safety()) + ); + } + + static void mapOptimizationTriangle(NodeAdapter c, TimeSlopeSafetyTriangle.Builder preferences) { + var optimizationTriangle = c + .of("triangle") + .since(V2_5) + .summary("Triangle optimization criteria.") + .asObject(); + mapTriangleParameters(optimizationTriangle, preferences); + } +} diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java new file mode 100644 index 00000000000..951129bc7b7 --- /dev/null +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java @@ -0,0 +1,93 @@ +package org.opentripplanner.standalone.config.routerequest; + +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5; + +import java.util.List; +import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; +import org.opentripplanner.standalone.config.framework.json.NodeAdapter; + +public class VehicleParkingConfig { + + private static void mapParkingPreferences( + NodeAdapter c, + VehicleParkingPreferences.Builder builder + ) { + builder + .withUnpreferredVehicleParkingTagCost( + c + .of("unpreferredVehicleParkingTagCost") + .since(V2_3) + .summary("What cost to add if a parking facility doesn't contain a preferred tag.") + .description("See `preferredVehicleParkingTags`.") + .asInt(VehicleParkingPreferences.DEFAULT.unpreferredVehicleParkingTagCost().toSeconds()) + ) + .withBannedVehicleParkingTags( + c + .of("bannedVehicleParkingTags") + .since(V2_1) + .summary( + "Tags with which a vehicle parking will not be used. If empty, no tags are banned." + ) + .description( + """ + Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + """ + ) + .asStringSet(List.of()) + ) + .withRequiredVehicleParkingTags( + c + .of("requiredVehicleParkingTags") + .since(V2_1) + .summary( + "Tags without which a vehicle parking will not be used. If empty, no tags are required." + ) + .description( + """ + Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + """ + ) + .asStringSet(List.of()) + ) + .withParkTime( + c + .of("parkTime") + .since(V2_0) + .summary("Time to park a vehicle.") + .asDuration(VehicleParkingPreferences.DEFAULT.parkTime()) + ) + .withParkCost( + c + .of("parkCost") + .since(V2_0) + .summary("Cost to park a vehicle.") + .asInt(VehicleParkingPreferences.DEFAULT.parkCost().toSeconds()) + ) + .withPreferredVehicleParkingTags( + c + .of("preferredVehicleParkingTags") + .since(V2_3) + .summary( + "Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised." + ) + .description( + """ + Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + """ + ) + .asStringSet(List.of()) + ); + } + + static void mapParking(NodeAdapter c, VehicleParkingPreferences.Builder preferences) { + var vehicleParking = c + .of("parking") + .since(V2_5) + .summary("Preferences for parking a vehicle.") + .asObject(); + mapParkingPreferences(vehicleParking, preferences); + } +} diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java index 057daa7001c..3d1534f5753 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java @@ -80,12 +80,8 @@ static void mapRentalPreferences(NodeAdapter c, VehicleRentalPreferences.Builder ); } - static void setVehicleRental(NodeAdapter c, VehicleRentalPreferences.Builder preferences) { - var vehicleRental = c - .of("vehicleRental") - .since(V2_3) - .summary("Vehicle rental options") - .asObject(); + static void mapRental(NodeAdapter c, VehicleRentalPreferences.Builder preferences) { + var vehicleRental = c.of("rental").since(V2_3).summary("Vehicle rental options").asObject(); mapRentalPreferences(vehicleRental, preferences); } } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java new file mode 100644 index 00000000000..e8ccbffe4df --- /dev/null +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java @@ -0,0 +1,82 @@ +package org.opentripplanner.standalone.config.routerequest; + +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5; + +import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences; +import org.opentripplanner.standalone.config.framework.json.NodeAdapter; + +public class VehicleWalkingConfig { + + private static void mapVehicleWalkingPreferences( + NodeAdapter c, + VehicleWalkingPreferences.Builder builder + ) { + var dft = builder.original(); + builder + .withSpeed( + c + .of("speed") + .since(V2_1) + .summary( + "The user's vehicle walking speed in meters/second. Defaults to approximately 3 MPH." + ) + .asDouble(dft.speed()) + ) + .withReluctance( + c + .of("reluctance") + .since(V2_1) + .summary( + "A multiplier for how bad walking with a vehicle is, compared to being in transit for equal lengths of time." + ) + .asDouble(dft.reluctance()) + ) + .withHopTime( + c + .of("hopTime") + .since(V2_0) + .summary("The time it takes the user to hop on or off a vehicle in seconds.") + .description( + """ + Time it takes to rent or park a vehicle have their own parameters and this is not meant + for controlling the duration of those events. + """ + ) + .asDuration(dft.hopTime()) + ) + .withHopCost( + c + .of("hopCost") + .since(V2_0) + .summary("The cost of hopping on or off a vehicle.") + .description( + """ + There are different parameters for the cost of renting or parking a vehicle and this is + not meant for controlling the cost of those events. + """ + ) + .asInt(dft.hopCost().toSeconds()) + ) + .withStairsReluctance( + c + .of("stairsReluctance") + .since(V2_3) + .summary( + "How bad is it to walk the vehicle up/down a flight of stairs compared to taking a detour." + ) + .asDouble(dft.stairsReluctance()) + ); + } + + static void mapVehicleWalking(NodeAdapter c, VehicleWalkingPreferences.Builder preferences) { + var vehicleWalking = c + .of("walking") + .since(V2_5) + .summary("Preferences for walking a vehicle.") + .asObject(); + mapVehicleWalkingPreferences(vehicleWalking, preferences); + } +} diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 69f859d784d..d9c1e8e8c19 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -13,15 +13,9 @@ }, "routingDefaults": { "walkSpeed": 1.3, - "bikeSpeed": 5, - "carSpeed": 40, "numItineraries": 12, "transferPenalty": 0, "walkReluctance": 4.0, - "bikeReluctance": 5.0, - "bikeWalkingReluctance": 10.0, - "bikeStairsReluctance": 150.0, - "carReluctance": 10.0, "stairsReluctance": 1.65, "turnReluctance": 1.0, "elevatorBoardTime": 90, @@ -29,17 +23,38 @@ "elevatorHopTime": 20, "elevatorHopCost": 20, "escalatorReluctance": 1.5, - "vehicleRental": { - "pickupCost": 120, - "dropOffTime": 30, - "dropOffCost": 30 + "bicycle": { + "speed": 5, + "reluctance": 5.0, + "boardCost": 600, + "walking": { + "reluctance": 10.0, + "stairsReluctance": 150.0 + }, + "rental": { + "pickupCost": 120, + "dropOffTime": 30, + "dropOffCost": 30 + }, + "parking": { + "parkTime": "1m", + "parkCost": 120 + } + }, + "car": { + "speed": 40, + "reluctance": 10, + "dropoffTime": 120, + "decelerationSpeed": 2.9, + "accelerationSpeed": 2.9, + "rental": { + "pickupCost": 120, + "dropOffTime": 30, + "dropOffCost": 30 + } }, - "bikeParkTime": "1m", - "bikeParkCost": 120, - "carDropoffTime": 120, "waitReluctance": 1.0, "walkBoardCost": 600, - "bikeBoardCost": 600, "otherThanPreferredRoutesPenalty": 300, "transferSlack": 120, // Default slack for any mode is 0 (zero) @@ -74,8 +89,6 @@ "minBikeParkingDistance": 300, "debug": "limit-to-search-window" }, - "carDecelerationSpeed": 2.9, - "carAccelerationSpeed": 2.9, "ignoreRealtimeUpdates": false, "geoidElevation": false, "maxJourneyDuration": "36h", diff --git a/test/performance/norway/speed-test-config.json b/test/performance/norway/speed-test-config.json index e673155eb4f..cef9b1ef061 100644 --- a/test/performance/norway/speed-test-config.json +++ b/test/performance/norway/speed-test-config.json @@ -41,8 +41,10 @@ "routingDefaults": { // Default is 1.4 m/s = ~ 5.0 km/t "walkSpeed": 1.4, - // Should not be used - a high cost indicate an error - "bikeBoardCost": 222000, + "bicycle": { + // Should not be used - a high cost indicate an error + "boardCost": 222000 + }, "walkBoardCost": 600, "transferPenalty": 0, "walkReluctance": 4.0, diff --git a/test/performance/switzerland/speed-test-config.json b/test/performance/switzerland/speed-test-config.json index f37c8497ffa..8b622825d09 100644 --- a/test/performance/switzerland/speed-test-config.json +++ b/test/performance/switzerland/speed-test-config.json @@ -41,8 +41,10 @@ "routingDefaults": { // Default is 1.4 m/s = ~ 5.0 km/t "walkSpeed": 1.4, - // Should not be used - a high cost indicate an error - "bikeBoardCost": 222000, + "bicycle": { + // Should not be used - a high cost indicate an error + "boardCost": 222000 + }, "walkBoardCost": 600, "transferPenalty": 0, "walkReluctance": 4.0, From d199e392e90062e810ea749312964eab21ab4851 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 18 Dec 2023 17:56:19 +0200 Subject: [PATCH 0214/1688] Make own wrapper for walk preferences in router-config --- docs/RouteRequest.md | 95 ++++++++++--------- docs/RouterConfiguration.md | 12 ++- docs/examples/entur/router-config.json | 10 +- docs/examples/ibi/portland/router-config.json | 6 +- .../examples/skanetrafiken/router-config.json | 4 +- .../routerequest/RouteRequestConfig.java | 23 ++--- .../standalone/config/router-config.json | 12 ++- .../performance/norway/speed-test-config.json | 10 +- .../skanetrafiken/speed-test-config.json | 6 +- .../switzerland/speed-test-config.json | 10 +- 10 files changed, 104 insertions(+), 84 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 755f5f73e28..f6b461c5212 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -23,7 +23,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | elevatorBoardTime | `integer` | How long does it take to get on an elevator, on average. | *Optional* | `90` | 2.0 | | elevatorHopCost | `integer` | What is the cost of travelling one floor on an elevator? | *Optional* | `20` | 2.0 | | elevatorHopTime | `integer` | How long does it take to advance one floor on an elevator? | *Optional* | `20` | 2.0 | -| escalatorReluctance | `double` | A multiplier for how bad being in an escalator is compared to being in transit for equal lengths of time | *Optional* | `1.5` | 2.4 | | geoidElevation | `boolean` | If true, the Graph's ellipsoidToGeoidDifference is applied to all elevations returned by this query. | *Optional* | `false` | 2.0 | | ignoreRealtimeUpdates | `boolean` | When true, real-time updates are ignored during this search. | *Optional* | `false` | 2.0 | | [intersectionTraversalModel](#rd_intersectionTraversalModel) | `enum` | The model that computes the costs of turns. | *Optional* | `"simple"` | 2.2 | @@ -37,18 +36,12 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | [relaxTransitPriorityGroup](#rd_relaxTransitPriorityGroup) | `string` | The relax function for transit-priority-groups | *Optional* | `"0s + 1.00 t"` | 2.5 | | [relaxTransitSearchGeneralizedCostAtDestination](#rd_relaxTransitSearchGeneralizedCostAtDestination) | `double` | Whether non-optimal transit paths at the destination should be returned | *Optional* | | 2.3 | | [searchWindow](#rd_searchWindow) | `duration` | The duration of the search-window. | *Optional* | | 2.0 | -| stairsReluctance | `double` | Used instead of walkReluctance for stairs. | *Optional* | `2.0` | 2.0 | -| [stairsTimeFactor](#rd_stairsTimeFactor) | `double` | How much more time does it take to walk a flight of stairs compared to walking a similar horizontal length. | *Optional* | `3.0` | 2.1 | | [streetRoutingTimeout](#rd_streetRoutingTimeout) | `duration` | The maximum time a street routing request is allowed to take before returning the results. | *Optional* | `"PT5S"` | 2.2 | | [transferPenalty](#rd_transferPenalty) | `integer` | An additional penalty added to boardings after the first. | *Optional* | `0` | 2.0 | | [transferSlack](#rd_transferSlack) | `integer` | The extra time needed to make a safe transfer in seconds. | *Optional* | `120` | 2.0 | | turnReluctance | `double` | Multiplicative factor on expected turning time. | *Optional* | `1.0` | 2.0 | | [unpreferredCost](#rd_unpreferredCost) | `cost-linear-function` | A cost function used to calculate penalty for an unpreferred route. | *Optional* | `"0s + 1.00 t"` | 2.2 | | waitReluctance | `double` | How much worse is waiting for a transit vehicle than being on a transit vehicle, as a multiplier. | *Optional* | `1.0` | 2.0 | -| walkBoardCost | `integer` | Prevents unnecessary transfers by adding a cost for boarding a vehicle. This is the cost that is used when boarding while walking. | *Optional* | `600` | 2.0 | -| [walkReluctance](#rd_walkReluctance) | `double` | A multiplier for how bad walking is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | -| [walkSafetyFactor](#rd_walkSafetyFactor) | `double` | Factor for how much the walk safety is considered in routing. | *Optional* | `1.0` | 2.2 | -| walkSpeed | `double` | The user's walking speed in meters/second. | *Optional* | `1.33` | 2.0 | | accessEgress | `object` | Parameters for access and egress routing. | *Optional* | | 2.4 | |    [maxDuration](#rd_accessEgress_maxDuration) | `duration` | This is the maximum duration for access/egress for street searches. | *Optional* | `"PT45M"` | 2.1 | |    [maxStopCount](#rd_accessEgress_maxStopCount) | `integer` | Maximal number of stops collected in access/egress routing | *Optional* | `500` | 2.4 | @@ -134,6 +127,14 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | [unpreferred](#rd_unpreferred) | `object` | Parameters listing authorities or lines that preferably should not be used in trip patters. | *Optional* | | 2.2 | |    [agencies](#rd_unpreferred_agencies) | `feed-scoped-id[]` | The ids of the agencies that incur an extra cost when being used. Format: `FeedId:AgencyId` | *Optional* | | 2.2 | |    [routes](#rd_unpreferred_routes) | `feed-scoped-id[]` | The ids of the routes that incur an extra cost when being used. Format: `FeedId:RouteId` | *Optional* | | 2.2 | +| walk | `object` | Walking preferences. | *Optional* | | 2.5 | +|    boardCost | `integer` | Prevents unnecessary transfers by adding a cost for boarding a vehicle. This is the cost that is used when boarding while walking. | *Optional* | `600` | 2.0 | +|    escalatorReluctance | `double` | A multiplier for how bad being in an escalator is compared to being in transit for equal lengths of time | *Optional* | `1.5` | 2.4 | +|    [reluctance](#rd_walk_reluctance) | `double` | A multiplier for how bad walking is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | +|    [safetyFactor](#rd_walk_safetyFactor) | `double` | Factor for how much the walk safety is considered in routing. | *Optional* | `1.0` | 2.2 | +|    speed | `double` | The user's walking speed in meters/second. | *Optional* | `1.33` | 2.0 | +|    stairsReluctance | `double` | Used instead of walkReluctance for stairs. | *Optional* | `2.0` | 2.0 | +|    [stairsTimeFactor](#rd_walk_stairsTimeFactor) | `double` | How much more time does it take to walk a flight of stairs compared to walking a similar horizontal length. | *Optional* | `3.0` | 2.1 | | wheelchairAccessibility | `object` | See [Wheelchair Accessibility](Accessibility.md) | *Optional* | | 2.2 | |    enabled | `boolean` | Enable wheelchair accessibility. | *Optional* | `false` | 2.0 | |    inaccessibleStreetReluctance | `double` | The factor to multiply the cost of traversing a street edge that is not wheelchair-accessible. | *Optional* | `25.0` | 2.2 | @@ -297,17 +298,6 @@ There is no need to set this when going to the next/previous page. The OTP Serve increase/decrease the search-window when paging to match the requested number of itineraries. -

    stairsTimeFactor

    - -**Since version:** `2.1` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `3.0` -**Path:** /routingDefaults - -How much more time does it take to walk a flight of stairs compared to walking a similar horizontal length. - -Default value is based on: Fujiyama, T., & Tyler, N. (2010). Predicting the walking -speed of pedestrians on stairs. Transportation Planning and Technology, 33(2), 177–202. - -

    streetRoutingTimeout

    **Since version:** `2.2` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT5S"` @@ -358,29 +348,6 @@ Function should return number of seconds that we are willing to wait for preferr or for an unpreferred agency's departure. For example: `5m + 2.0 t` -

    walkReluctance

    - -**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `2.0` -**Path:** /routingDefaults - -A multiplier for how bad walking is, compared to being in transit for equal lengths of time. - -Empirically, values between 2 and 4 seem to correspond well to the concept of not wanting to walk -too much without asking for totally ridiculous itineraries, but this observation should in no way -be taken as scientific or definitive. Your mileage may vary. -See https://github.com/opentripplanner/OpenTripPlanner/issues/4090 for impact on performance with -high values. - - -

    walkSafetyFactor

    - -**Since version:** `2.2` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `1.0` -**Path:** /routingDefaults - -Factor for how much the walk safety is considered in routing. - -Value should be between 0 and 1. If the value is set to be 0, safety is ignored. -

    maxDuration

    **Since version:** `2.1` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT45M"` @@ -934,6 +901,40 @@ The ids of the routes that incur an extra cost when being used. Format: `FeedId: How much cost is added is configured in `unpreferredCost`. +

    reluctance

    + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `2.0` +**Path:** /routingDefaults/walk + +A multiplier for how bad walking is, compared to being in transit for equal lengths of time. + +Empirically, values between 2 and 4 seem to correspond well to the concept of not wanting to walk +too much without asking for totally ridiculous itineraries, but this observation should in no way +be taken as scientific or definitive. Your mileage may vary. +See https://github.com/opentripplanner/OpenTripPlanner/issues/4090 for impact on performance with +high values. + + +

    safetyFactor

    + +**Since version:** `2.2` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `1.0` +**Path:** /routingDefaults/walk + +Factor for how much the walk safety is considered in routing. + +Value should be between 0 and 1. If the value is set to be 0, safety is ignored. + +

    stairsTimeFactor

    + +**Since version:** `2.1` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `3.0` +**Path:** /routingDefaults/walk + +How much more time does it take to walk a flight of stairs compared to walking a similar horizontal length. + +Default value is based on: Fujiyama, T., & Tyler, N. (2010). Predicting the walking +speed of pedestrians on stairs. Transportation Planning and Technology, 33(2), 177–202. + +

    maxSlope

    **Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.083` @@ -980,17 +981,13 @@ include stairs as a last result. // router-config.json { "routingDefaults" : { - "walkSpeed" : 1.3, "numItineraries" : 12, "transferPenalty" : 0, - "walkReluctance" : 4.0, - "stairsReluctance" : 1.65, "turnReluctance" : 1.0, "elevatorBoardTime" : 90, "elevatorBoardCost" : 90, "elevatorHopTime" : 20, "elevatorHopCost" : 20, - "escalatorReluctance" : 1.5, "bicycle" : { "speed" : 5, "reluctance" : 5.0, @@ -1021,8 +1018,14 @@ include stairs as a last result. "dropOffCost" : 30 } }, + "walk" : { + "speed" : 1.3, + "reluctance" : 4.0, + "stairsReluctance" : 1.65, + "boardCost" : 600, + "escalatorReluctance" : 1.5 + }, "waitReluctance" : 1.0, - "walkBoardCost" : 600, "otherThanPreferredRoutesPenalty" : 300, "transferSlack" : 120, "boardSlackForMode" : { diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 37a673ea7a2..35020637894 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -451,17 +451,13 @@ Used to group requests when monitoring OTP. ] }, "routingDefaults" : { - "walkSpeed" : 1.3, "numItineraries" : 12, "transferPenalty" : 0, - "walkReluctance" : 4.0, - "stairsReluctance" : 1.65, "turnReluctance" : 1.0, "elevatorBoardTime" : 90, "elevatorBoardCost" : 90, "elevatorHopTime" : 20, "elevatorHopCost" : 20, - "escalatorReluctance" : 1.5, "bicycle" : { "speed" : 5, "reluctance" : 5.0, @@ -492,8 +488,14 @@ Used to group requests when monitoring OTP. "dropOffCost" : 30 } }, + "walk" : { + "speed" : 1.3, + "reluctance" : 4.0, + "stairsReluctance" : 1.65, + "boardCost" : 600, + "escalatorReluctance" : 1.5 + }, "waitReluctance" : 1.0, - "walkBoardCost" : 600, "otherThanPreferredRoutesPenalty" : 300, "transferSlack" : 120, "boardSlackForMode" : { diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index 2d217cb2402..cd4736263ce 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -1,11 +1,8 @@ { "configVersion" : "{{ Entur CI config build number inserted here }}", "routingDefaults": { - "walkSpeed": 1.3, "numItineraries": 12, "transferPenalty": 0, - "walkReluctance": 4.0, - "stairsReluctance": 1.65, "turnReluctance": 1.0, "elevatorBoardTime": 90, "elevatorBoardCost": 90, @@ -40,8 +37,13 @@ "dropOffCost": 30 } }, + "walk": { + "speed": 1.3, + "reluctance": 4.0, + "stairsReluctance": 1.65, + "boardCost": 600 + }, "waitReluctance": 1.0, - "walkBoardCost": 600, "otherThanPreferredRoutesPenalty": 300, "transferSlack": 120, // Default slack for any mode is 0 (zero) diff --git a/docs/examples/ibi/portland/router-config.json b/docs/examples/ibi/portland/router-config.json index 55a487fcfdc..445738762a1 100644 --- a/docs/examples/ibi/portland/router-config.json +++ b/docs/examples/ibi/portland/router-config.json @@ -5,8 +5,10 @@ "alightSlack": "0s", "transferSlack": 180, "waitReluctance": 0.9, - "walkReluctance": 1.75, - "stairsReluctance": 1.65, + "walk": { + "reluctance": 1.75, + "stairsReluctance": 1.65 + }, "numItineraries": 3, "geoidElevation": true, "streetRoutingTimeout": "7s" diff --git a/docs/examples/skanetrafiken/router-config.json b/docs/examples/skanetrafiken/router-config.json index ddec543e516..d65604aaa00 100644 --- a/docs/examples/skanetrafiken/router-config.json +++ b/docs/examples/skanetrafiken/router-config.json @@ -5,7 +5,9 @@ }, "transferSlack": 180, "waitReluctance": 0.175, - "walkReluctance": 5, + "walk": { + "reluctance": 5 + }, "maxDirectStreetDuration": "3700s" }, "transit": { diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 0ff1c48cf2b..f15f6acdfe1 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -677,17 +677,18 @@ private static void mapSystemPreferences(NodeAdapter c, SystemPreferences.Builde private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder walk) { var dft = walk.original(); + NodeAdapter cw = c.of("walk").since(V2_5).summary("Walking preferences.").asObject(); walk .withSpeed( - c - .of("walkSpeed") + cw + .of("speed") .since(V2_0) .summary("The user's walking speed in meters/second.") .asDouble(dft.speed()) ) .withReluctance( - c - .of("walkReluctance") + cw + .of("reluctance") .since(V2_0) .summary( "A multiplier for how bad walking is, compared to being in transit for equal lengths of time." @@ -704,8 +705,8 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asDouble(dft.reluctance()) ) .withBoardCost( - c - .of("walkBoardCost") + cw + .of("boardCost") .since(V2_0) .summary( """ @@ -716,14 +717,14 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asInt(dft.boardCost()) ) .withStairsReluctance( - c + cw .of("stairsReluctance") .since(V2_0) .summary("Used instead of walkReluctance for stairs.") .asDouble(dft.stairsReluctance()) ) .withStairsTimeFactor( - c + cw .of("stairsTimeFactor") .since(V2_1) .summary( @@ -738,8 +739,8 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asDouble(dft.stairsTimeFactor()) ) .withSafetyFactor( - c - .of("walkSafetyFactor") + cw + .of("safetyFactor") .since(V2_2) .summary("Factor for how much the walk safety is considered in routing.") .description( @@ -748,7 +749,7 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asDouble(dft.safetyFactor()) ) .withEscalatorReluctance( - c + cw .of("escalatorReluctance") .since(V2_4) .summary( diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index d9c1e8e8c19..1d023c25688 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -12,17 +12,13 @@ ] }, "routingDefaults": { - "walkSpeed": 1.3, "numItineraries": 12, "transferPenalty": 0, - "walkReluctance": 4.0, - "stairsReluctance": 1.65, "turnReluctance": 1.0, "elevatorBoardTime": 90, "elevatorBoardCost": 90, "elevatorHopTime": 20, "elevatorHopCost": 20, - "escalatorReluctance": 1.5, "bicycle": { "speed": 5, "reluctance": 5.0, @@ -53,8 +49,14 @@ "dropOffCost": 30 } }, + "walk": { + "speed": 1.3, + "reluctance": 4.0, + "stairsReluctance": 1.65, + "boardCost": 600, + "escalatorReluctance": 1.5 + }, "waitReluctance": 1.0, - "walkBoardCost": 600, "otherThanPreferredRoutesPenalty": 300, "transferSlack": 120, // Default slack for any mode is 0 (zero) diff --git a/test/performance/norway/speed-test-config.json b/test/performance/norway/speed-test-config.json index cef9b1ef061..e4ca99d7fe5 100644 --- a/test/performance/norway/speed-test-config.json +++ b/test/performance/norway/speed-test-config.json @@ -39,15 +39,17 @@ } }, "routingDefaults": { - // Default is 1.4 m/s = ~ 5.0 km/t - "walkSpeed": 1.4, "bicycle": { // Should not be used - a high cost indicate an error "boardCost": 222000 }, - "walkBoardCost": 600, + "walk": { + // Default is 1.4 m/s = ~ 5.0 km/t + "speed": 1.4, + "boardCost": 600, + "reluctance": 4.0 + }, "transferPenalty": 0, - "walkReluctance": 4.0, "waitReluctance": 1.0, "boardSlack": "30s", "alightSlack": "15s", diff --git a/test/performance/skanetrafiken/speed-test-config.json b/test/performance/skanetrafiken/speed-test-config.json index a43cc97095d..66184ab124f 100644 --- a/test/performance/skanetrafiken/speed-test-config.json +++ b/test/performance/skanetrafiken/speed-test-config.json @@ -15,10 +15,12 @@ } }, "routingDefaults": { - "walkSpeed": 1.38, + "walk": { + "speed": 1.38, + "reluctance": 5 + }, "transferSlack": 180, "waitReluctance": 0.175, - "walkReluctance": 5, "maxDirectStreetDuration": "1h1m", "boardSlackForMode": { "RAIL": "12m" diff --git a/test/performance/switzerland/speed-test-config.json b/test/performance/switzerland/speed-test-config.json index 8b622825d09..19ac7a1358a 100644 --- a/test/performance/switzerland/speed-test-config.json +++ b/test/performance/switzerland/speed-test-config.json @@ -39,15 +39,17 @@ } }, "routingDefaults": { - // Default is 1.4 m/s = ~ 5.0 km/t - "walkSpeed": 1.4, "bicycle": { // Should not be used - a high cost indicate an error "boardCost": 222000 }, - "walkBoardCost": 600, + "walk": { + // Default is 1.4 m/s = ~ 5.0 km/t + "speed": 1.4, + "boardCost": 600, + "reluctance": 4.0 + }, "transferPenalty": 0, - "walkReluctance": 4.0, "waitReluctance": 1.0, "boardSlack": "30s", "alightSlack": "15s", From 845532a26090ad1954f9595b81bed3ba0b756de7 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 18 Dec 2023 18:12:08 +0200 Subject: [PATCH 0215/1688] Rename walking -> walk --- docs/RouteRequest.md | 16 ++++++++-------- docs/RouterConfiguration.md | 2 +- docs/examples/entur/router-config.json | 2 +- .../routerequest/VehicleWalkingConfig.java | 2 +- .../standalone/config/router-config.json | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index f6b461c5212..6577789f361 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -74,9 +74,9 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       [allowedNetworks](#rd_bicycle_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | |       [bannedNetworks](#rd_bicycle_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | |    triangle | `object` | Triangle optimization criteria. | *Optional* | | 2.5 | -|    walking | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | -|       [hopCost](#rd_bicycle_walking_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | -|       [hopTime](#rd_bicycle_walking_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle in seconds. | *Optional* | `"PT0S"` | 2.0 | +|    walk | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | +|       [hopCost](#rd_bicycle_walk_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | +|       [hopTime](#rd_bicycle_walk_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle in seconds. | *Optional* | `"PT0S"` | 2.0 | |       reluctance | `double` | A multiplier for how bad walking with a vehicle is, compared to being in transit for equal lengths of time. | *Optional* | `5.0` | 2.1 | |       speed | `double` | The user's vehicle walking speed in meters/second. Defaults to approximately 3 MPH. | *Optional* | `1.33` | 2.1 | |       stairsReluctance | `double` | How bad is it to walk the vehicle up/down a flight of stairs compared to taking a detour. | *Optional* | `10.0` | 2.3 | @@ -495,10 +495,10 @@ The vehicle rental networks which may be used. If empty all networks may be used The vehicle rental networks which may not be used. If empty, no networks are banned. -

    hopCost

    +

    hopCost

    **Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` -**Path:** /routingDefaults/bicycle/walking +**Path:** /routingDefaults/bicycle/walk The cost of hopping on or off a vehicle. @@ -506,10 +506,10 @@ There are different parameters for the cost of renting or parking a vehicle and not meant for controlling the cost of those events. -

    hopTime

    +

    hopTime

    **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` -**Path:** /routingDefaults/bicycle/walking +**Path:** /routingDefaults/bicycle/walk The time it takes the user to hop on or off a vehicle in seconds. @@ -992,7 +992,7 @@ include stairs as a last result. "speed" : 5, "reluctance" : 5.0, "boardCost" : 600, - "walking" : { + "walk" : { "reluctance" : 10.0, "stairsReluctance" : 150.0 }, diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 35020637894..a1541288c75 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -462,7 +462,7 @@ Used to group requests when monitoring OTP. "speed" : 5, "reluctance" : 5.0, "boardCost" : 600, - "walking" : { + "walk" : { "reluctance" : 10.0, "stairsReluctance" : 150.0 }, diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index cd4736263ce..06ee5590eed 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -12,7 +12,7 @@ "speed": 5, "reluctance": 5.0, "boardCost": 600, - "walking": { + "walk": { "reluctance": 10.0 }, "rental": { diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java index e8ccbffe4df..ac6ac7d92f4 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java @@ -73,7 +73,7 @@ private static void mapVehicleWalkingPreferences( static void mapVehicleWalking(NodeAdapter c, VehicleWalkingPreferences.Builder preferences) { var vehicleWalking = c - .of("walking") + .of("walk") .since(V2_5) .summary("Preferences for walking a vehicle.") .asObject(); diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 1d023c25688..996505b5296 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -23,7 +23,7 @@ "speed": 5, "reluctance": 5.0, "boardCost": 600, - "walking": { + "walk": { "reluctance": 10.0, "stairsReluctance": 150.0 }, From ee99250f7184e790e145e711e0a7ed15f73cb806 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 29 Dec 2023 18:30:29 +0200 Subject: [PATCH 0216/1688] Rename/type rental preferences and remove unused carDropoffTime --- docs/RouteRequest.md | 18 ++-- docs/RouterConfiguration.md | 5 +- docs/examples/entur/router-config.json | 5 +- docs/examples/ibi/atlanta/router-config.json | 4 +- .../common/RequestToPreferencesMapper.java | 2 +- .../model/DefaultRouteRequestType.java | 10 +- .../request/preference/CarPreferences.java | 21 ---- .../preference/VehicleRentalPreferences.java | 100 ++++++++++-------- .../street/VehicleRentalEdge.java | 10 +- .../routerequest/RouteRequestConfig.java | 9 -- .../routerequest/VehicleRentalConfig.java | 22 ++-- .../model/edge/StreetTransitEntityLink.java | 2 +- .../street/model/edge/TemporaryFreeEdge.java | 2 +- .../preference/BikePreferencesTest.java | 4 - .../preference/CarPreferencesTest.java | 8 -- .../VehicleRentalPreferencesTest.java | 25 +++-- .../street/integration/BikeRentalTest.java | 2 +- .../standalone/config/router-config.json | 5 +- 18 files changed, 118 insertions(+), 136 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 6577789f361..aff3f3e5758 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -66,10 +66,10 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |    rental | `object` | Vehicle rental options | *Optional* | | 2.3 | |       allowKeepingAtDestination | `boolean` | If a vehicle should be allowed to be kept at the end of a station-based rental. | *Optional* | `false` | 2.2 | |       dropOffCost | `integer` | Cost to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | -|       dropOffTime | `integer` | Time to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | -|       keepingAtDestinationCost | `double` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0.0` | 2.2 | +|       dropOffTime | `duration` | Time to drop-off a rented vehicle. | *Optional* | `"PT30S"` | 2.0 | +|       keepingAtDestinationCost | `integer` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0` | 2.2 | |       pickupCost | `integer` | Cost to rent a vehicle. | *Optional* | `120` | 2.0 | -|       pickupTime | `integer` | Time to rent a vehicle. | *Optional* | `60` | 2.0 | +|       pickupTime | `duration` | Time to rent a vehicle. | *Optional* | `"PT1M"` | 2.0 | |       useAvailabilityInformation | `boolean` | Whether or not vehicle rental availability information will be used to plan vehicle rental trips. | *Optional* | `false` | 2.0 | |       [allowedNetworks](#rd_bicycle_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | |       [bannedNetworks](#rd_bicycle_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | @@ -84,7 +84,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | car | `object` | Car preferences. | *Optional* | | 2.5 | |    accelerationSpeed | `double` | The acceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | |    decelerationSpeed | `double` | The deceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | -|    dropoffTime | `integer` | Time to park a car in a park and ride, w/o taking into account driving and walking cost. | *Optional* | `120` | 2.0 | |    pickupCost | `integer` | Add a cost for car pickup changes when a pickup or drop off takes place | *Optional* | `120` | 2.1 | |    pickupTime | `integer` | Add a time for car pickup changes when a pickup or drop off takes place | *Optional* | `60` | 2.1 | |    reluctance | `double` | A multiplier for how bad driving is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | @@ -93,10 +92,10 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |    rental | `object` | Vehicle rental options | *Optional* | | 2.3 | |       allowKeepingAtDestination | `boolean` | If a vehicle should be allowed to be kept at the end of a station-based rental. | *Optional* | `false` | 2.2 | |       dropOffCost | `integer` | Cost to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | -|       dropOffTime | `integer` | Time to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | -|       keepingAtDestinationCost | `double` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0.0` | 2.2 | +|       dropOffTime | `duration` | Time to drop-off a rented vehicle. | *Optional* | `"PT30S"` | 2.0 | +|       keepingAtDestinationCost | `integer` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0` | 2.2 | |       pickupCost | `integer` | Cost to rent a vehicle. | *Optional* | `120` | 2.0 | -|       pickupTime | `integer` | Time to rent a vehicle. | *Optional* | `60` | 2.0 | +|       pickupTime | `duration` | Time to rent a vehicle. | *Optional* | `"PT1M"` | 2.0 | |       useAvailabilityInformation | `boolean` | Whether or not vehicle rental availability information will be used to plan vehicle rental trips. | *Optional* | `false` | 2.0 | |       [allowedNetworks](#rd_car_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | |       [bannedNetworks](#rd_car_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | @@ -998,7 +997,7 @@ include stairs as a last result. }, "rental" : { "pickupCost" : 120, - "dropOffTime" : 30, + "dropOffTime" : "30s", "dropOffCost" : 30 }, "parking" : { @@ -1009,12 +1008,11 @@ include stairs as a last result. "car" : { "speed" : 40, "reluctance" : 10, - "dropoffTime" : 120, "decelerationSpeed" : 2.9, "accelerationSpeed" : 2.9, "rental" : { "pickupCost" : 120, - "dropOffTime" : 30, + "dropOffTime" : "30s", "dropOffCost" : 30 } }, diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index a1541288c75..af2c0a9630a 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -468,7 +468,7 @@ Used to group requests when monitoring OTP. }, "rental" : { "pickupCost" : 120, - "dropOffTime" : 30, + "dropOffTime" : "30s", "dropOffCost" : 30 }, "parking" : { @@ -479,12 +479,11 @@ Used to group requests when monitoring OTP. "car" : { "speed" : 40, "reluctance" : 10, - "dropoffTime" : 120, "decelerationSpeed" : 2.9, "accelerationSpeed" : 2.9, "rental" : { "pickupCost" : 120, - "dropOffTime" : 30, + "dropOffTime" : "30s", "dropOffCost" : 30 } }, diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index 06ee5590eed..cd8a393a3c3 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -17,7 +17,7 @@ }, "rental": { "pickupCost": 120, - "dropOffTime": 30, + "dropOffTime": "30s", "dropOffCost": 30 }, "parking": { @@ -28,12 +28,11 @@ "car": { "speed": 40, "reluctance": 4.0, - "dropoffTime": 120, "decelerationSpeed": 2.9, "accelerationSpeed": 2.9, "rental": { "pickupCost": 120, - "dropOffTime": 30, + "dropOffTime": "30s", "dropOffCost": 30 } }, diff --git a/docs/examples/ibi/atlanta/router-config.json b/docs/examples/ibi/atlanta/router-config.json index 2aeb3e6434e..909c164ec43 100644 --- a/docs/examples/ibi/atlanta/router-config.json +++ b/docs/examples/ibi/atlanta/router-config.json @@ -7,13 +7,13 @@ "safety": 0.4 }, "rental": { - "pickupTime": 180, + "pickupTime": "3m", "pickupCost": 850 } }, "car": { "rental": { - "pickupTime": 180, + "pickupTime": "3m", "pickupCost": 850 } }, diff --git a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java index 68e61d6fe4e..5da43e9a179 100644 --- a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java @@ -147,7 +147,7 @@ private void mapRental(VehicleRentalPreferences.Builder rental) { setIfNotNull( req.keepingRentedBicycleAtDestinationCost, - rental::withArrivingInRentalVehicleAtDestinationCost + cost -> rental.withArrivingInRentalVehicleAtDestinationCost((int) Math.round(cost)) ); rental.withUseAvailabilityInformation(isPlannedForNow); } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java index 5e4dca2bfc2..aadd73dcddb 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java @@ -184,7 +184,7 @@ private GraphQLObjectType createGraphQLType() { .name("bikeRentalPickupTime") .description("Time to rent a bike.") .type(Scalars.GraphQLInt) - .dataFetcher(env -> preferences.bike().rental().pickupTime()) + .dataFetcher(env -> (int) preferences.bike().rental().pickupTime().toSeconds()) .build() ) .field( @@ -193,7 +193,7 @@ private GraphQLObjectType createGraphQLType() { .name("bikeRentalPickupCost") .description("Cost to rent a bike.") .type(Scalars.GraphQLInt) - .dataFetcher(env -> preferences.bike().rental().pickupCost()) + .dataFetcher(env -> preferences.bike().rental().pickupCost().toSeconds()) .build() ) .field( @@ -202,7 +202,7 @@ private GraphQLObjectType createGraphQLType() { .name("bikeRentalDropOffTime") .description("Time to drop-off a rented bike.") .type(Scalars.GraphQLInt) - .dataFetcher(env -> preferences.bike().rental().dropoffTime()) + .dataFetcher(env -> (int) preferences.bike().rental().dropOffTime().toSeconds()) .build() ) .field( @@ -211,7 +211,7 @@ private GraphQLObjectType createGraphQLType() { .name("bikeRentalDropOffCost") .description("Cost to drop-off a rented bike.") .type(Scalars.GraphQLInt) - .dataFetcher(env -> preferences.bike().rental().dropoffCost()) + .dataFetcher(env -> preferences.bike().rental().dropOffCost().toSeconds()) .build() ) .field( @@ -240,7 +240,7 @@ private GraphQLObjectType createGraphQLType() { "Time to park a car in a park and ride, w/o taking into account driving and walking cost." ) .type(Scalars.GraphQLInt) - .dataFetcher(env -> preferences.car().dropoffTime()) + .dataFetcher(env -> 0) .build() ) .field( diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java index 6b103e8f3b7..9615a586335 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java @@ -27,7 +27,6 @@ public final class CarPreferences implements Serializable { private final VehicleRentalPreferences rental; private final int pickupTime; private final Cost pickupCost; - private final int dropoffTime; private final double accelerationSpeed; private final double decelerationSpeed; @@ -39,7 +38,6 @@ private CarPreferences() { this.rental = VehicleRentalPreferences.DEFAULT; this.pickupTime = 60; this.pickupCost = Cost.costOfMinutes(2); - this.dropoffTime = 120; this.accelerationSpeed = 2.9; this.decelerationSpeed = 2.9; } @@ -51,7 +49,6 @@ private CarPreferences(Builder builder) { this.rental = builder.rental; this.pickupTime = Units.duration(builder.pickupTime); this.pickupCost = builder.pickupCost; - this.dropoffTime = Units.duration(builder.dropoffTime); this.accelerationSpeed = Units.acceleration(builder.accelerationSpeed); this.decelerationSpeed = Units.acceleration(builder.decelerationSpeed); } @@ -97,14 +94,6 @@ public int pickupCost() { return pickupCost.toSeconds(); } - /** - * Time to park a car in a park and ride, w/o taking into account driving and walking cost (time - * to park, switch off, pick your stuff, lock the car, etc...) - */ - public int dropoffTime() { - return dropoffTime; - } - /** * The acceleration speed of an automobile, in meters per second per second. * Default is 2.9 m/s^2 (0 mph to 65 mph in 10 seconds) @@ -133,7 +122,6 @@ public boolean equals(Object o) { rental.equals(that.rental) && pickupTime == that.pickupTime && pickupCost.equals(that.pickupCost) && - dropoffTime == that.dropoffTime && DoubleUtils.doubleEquals(that.accelerationSpeed, accelerationSpeed) && DoubleUtils.doubleEquals(that.decelerationSpeed, decelerationSpeed) ); @@ -148,7 +136,6 @@ public int hashCode() { rental, pickupTime, pickupCost, - dropoffTime, accelerationSpeed, decelerationSpeed ); @@ -164,7 +151,6 @@ public String toString() { .addObj("rental", rental, DEFAULT.rental) .addNum("pickupTime", pickupTime, DEFAULT.pickupTime) .addObj("pickupCost", pickupCost, DEFAULT.pickupCost) - .addNum("dropoffTime", dropoffTime, DEFAULT.dropoffTime) .addNum("accelerationSpeed", accelerationSpeed, DEFAULT.accelerationSpeed) .addNum("decelerationSpeed", decelerationSpeed, DEFAULT.decelerationSpeed) .toString(); @@ -180,7 +166,6 @@ public static class Builder { private VehicleRentalPreferences rental; private int pickupTime; private Cost pickupCost; - private int dropoffTime; private double accelerationSpeed; private double decelerationSpeed; @@ -192,7 +177,6 @@ public Builder(CarPreferences original) { this.rental = original.rental; this.pickupTime = original.pickupTime; this.pickupCost = original.pickupCost; - this.dropoffTime = original.dropoffTime; this.accelerationSpeed = original.accelerationSpeed; this.decelerationSpeed = original.decelerationSpeed; } @@ -231,11 +215,6 @@ public Builder withPickupCost(int pickupCost) { return this; } - public Builder withDropoffTime(int dropoffTime) { - this.dropoffTime = dropoffTime; - return this; - } - public Builder withAccelerationSpeed(double accelerationSpeed) { this.accelerationSpeed = accelerationSpeed; return this; diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java index 8e18d2a81d5..6c9bbfea875 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferences.java @@ -1,10 +1,10 @@ package org.opentripplanner.routing.api.request.preference; import java.io.Serializable; +import java.time.Duration; import java.util.Objects; import java.util.Set; import java.util.function.Consumer; -import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; import org.opentripplanner.framework.tostring.ToStringBuilder; @@ -17,38 +17,38 @@ public final class VehicleRentalPreferences implements Serializable { public static final VehicleRentalPreferences DEFAULT = new VehicleRentalPreferences(); - private final int pickupTime; + private final Duration pickupTime; private final Cost pickupCost; - private final int dropoffTime; - private final Cost dropoffCost; + private final Duration dropOffTime; + private final Cost dropOffCost; private final boolean useAvailabilityInformation; - private final double arrivingInRentalVehicleAtDestinationCost; + private final Cost arrivingInRentalVehicleAtDestinationCost; private final boolean allowArrivingInRentedVehicleAtDestination; private final Set allowedNetworks; private final Set bannedNetworks; private VehicleRentalPreferences() { - this.pickupTime = 60; + this.pickupTime = Duration.ofMinutes(1); this.pickupCost = Cost.costOfMinutes(2); - this.dropoffTime = 30; - this.dropoffCost = Cost.costOfSeconds(30); + this.dropOffTime = Duration.ofSeconds(30); + this.dropOffCost = Cost.costOfSeconds(30); this.useAvailabilityInformation = false; - this.arrivingInRentalVehicleAtDestinationCost = 0; + this.arrivingInRentalVehicleAtDestinationCost = Cost.costOfSeconds(0); this.allowArrivingInRentedVehicleAtDestination = false; this.allowedNetworks = Set.of(); this.bannedNetworks = Set.of(); } private VehicleRentalPreferences(Builder builder) { - this.pickupTime = builder.pickupTime; + this.pickupTime = Duration.ofSeconds(Units.duration(builder.pickupTime)); this.pickupCost = builder.pickupCost; - this.dropoffTime = builder.dropoffTime; - this.dropoffCost = builder.dropoffCost; + this.dropOffTime = Duration.ofSeconds(Units.duration(builder.dropOffTime)); + this.dropOffCost = builder.dropOffCost; this.useAvailabilityInformation = builder.useAvailabilityInformation; this.arrivingInRentalVehicleAtDestinationCost = - DoubleUtils.roundTo1Decimal(builder.arrivingInRentalVehicleAtDestinationCost); + builder.arrivingInRentalVehicleAtDestinationCost; this.allowArrivingInRentedVehicleAtDestination = builder.allowArrivingInRentedVehicleAtDestination; this.allowedNetworks = builder.allowedNetworks; @@ -64,7 +64,7 @@ public Builder copyOf() { } /** Time to rent a vehicle */ - public int pickupTime() { + public Duration pickupTime() { return pickupTime; } @@ -72,18 +72,18 @@ public int pickupTime() { * Cost of renting a vehicle. The cost is a bit more than actual time to model the associated cost * and trouble. */ - public int pickupCost() { - return pickupCost.toSeconds(); + public Cost pickupCost() { + return pickupCost; } /** Time to drop-off a rented vehicle */ - public int dropoffTime() { - return dropoffTime; + public Duration dropOffTime() { + return dropOffTime; } /** Cost of dropping-off a rented vehicle */ - public int dropoffCost() { - return dropoffCost.toSeconds(); + public Cost dropOffCost() { + return dropOffCost; } /** @@ -97,7 +97,7 @@ public boolean useAvailabilityInformation() { /** * The cost of arriving at the destination with the rented vehicle, to discourage doing so. */ - public double arrivingInRentalVehicleAtDestinationCost() { + public Cost arrivingInRentalVehicleAtDestinationCost() { return arrivingInRentalVehicleAtDestinationCost; } @@ -127,16 +127,15 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; VehicleRentalPreferences that = (VehicleRentalPreferences) o; return ( - pickupTime == that.pickupTime && + Objects.equals(pickupTime, that.pickupTime) && Objects.equals(pickupCost, that.pickupCost) && - dropoffTime == that.dropoffTime && - Objects.equals(dropoffCost, that.dropoffCost) && + Objects.equals(dropOffTime, that.dropOffTime) && + Objects.equals(dropOffCost, that.dropOffCost) && useAvailabilityInformation == that.useAvailabilityInformation && - Double.compare( + Objects.equals( that.arrivingInRentalVehicleAtDestinationCost, arrivingInRentalVehicleAtDestinationCost - ) == - 0 && + ) && allowArrivingInRentedVehicleAtDestination == that.allowArrivingInRentedVehicleAtDestination && allowedNetworks.equals(that.allowedNetworks) && bannedNetworks.equals(that.bannedNetworks) @@ -148,8 +147,8 @@ public int hashCode() { return Objects.hash( pickupTime, pickupCost, - dropoffTime, - dropoffCost, + dropOffTime, + dropOffCost, useAvailabilityInformation, arrivingInRentalVehicleAtDestinationCost, allowArrivingInRentedVehicleAtDestination, @@ -162,12 +161,12 @@ public int hashCode() { public String toString() { return ToStringBuilder .of(VehicleRentalPreferences.class) - .addDurationSec("pickupTime", pickupTime, DEFAULT.pickupTime) + .addDuration("pickupTime", pickupTime, DEFAULT.pickupTime) .addObj("pickupCost", pickupCost, DEFAULT.pickupCost) - .addDurationSec("dropoffTime", dropoffTime, DEFAULT.dropoffTime) - .addObj("dropoffCost", dropoffCost, DEFAULT.dropoffCost) + .addDuration("dropOffTime", dropOffTime, DEFAULT.dropOffTime) + .addObj("dropOffCost", dropOffCost, DEFAULT.dropOffCost) .addBoolIfTrue("useAvailabilityInformation", useAvailabilityInformation) - .addNum( + .addObj( "arrivingInRentalVehicleAtDestinationCost", arrivingInRentalVehicleAtDestinationCost, DEFAULT.arrivingInRentalVehicleAtDestinationCost @@ -186,20 +185,20 @@ public static class Builder { private final VehicleRentalPreferences original; private int pickupTime; private Cost pickupCost; - private int dropoffTime; - private Cost dropoffCost; + private int dropOffTime; + private Cost dropOffCost; private boolean useAvailabilityInformation; - private double arrivingInRentalVehicleAtDestinationCost; + private Cost arrivingInRentalVehicleAtDestinationCost; private boolean allowArrivingInRentedVehicleAtDestination; private Set allowedNetworks; private Set bannedNetworks; private Builder(VehicleRentalPreferences original) { this.original = original; - this.pickupTime = Units.duration(original.pickupTime); + this.pickupTime = (int) original.pickupTime.toSeconds(); this.pickupCost = original.pickupCost; - this.dropoffTime = Units.duration(original.dropoffTime); - this.dropoffCost = original.dropoffCost; + this.dropOffTime = (int) original.dropOffTime.toSeconds(); + this.dropOffCost = original.dropOffCost; this.useAvailabilityInformation = original.useAvailabilityInformation; this.arrivingInRentalVehicleAtDestinationCost = original.arrivingInRentalVehicleAtDestinationCost; @@ -218,18 +217,28 @@ public Builder withPickupTime(int pickupTime) { return this; } + public Builder withPickupTime(Duration pickupTime) { + this.pickupTime = (int) pickupTime.toSeconds(); + return this; + } + public Builder withPickupCost(int pickupCost) { this.pickupCost = Cost.costOfSeconds(pickupCost); return this; } - public Builder withDropoffTime(int dropoffTime) { - this.dropoffTime = dropoffTime; + public Builder withDropOffTime(int dropOffTime) { + this.dropOffTime = dropOffTime; return this; } - public Builder withDropoffCost(int dropoffCost) { - this.dropoffCost = Cost.costOfSeconds(dropoffCost); + public Builder withDropOffTime(Duration dropOffTime) { + this.dropOffTime = (int) dropOffTime.toSeconds(); + return this; + } + + public Builder withDropOffCost(int dropOffCost) { + this.dropOffCost = Cost.costOfSeconds(dropOffCost); return this; } @@ -239,9 +248,10 @@ public Builder withUseAvailabilityInformation(boolean useAvailabilityInformation } public Builder withArrivingInRentalVehicleAtDestinationCost( - double arrivingInRentalVehicleAtDestinationCost + int arrivingInRentalVehicleAtDestinationCost ) { - this.arrivingInRentalVehicleAtDestinationCost = arrivingInRentalVehicleAtDestinationCost; + this.arrivingInRentalVehicleAtDestinationCost = + Cost.costOfSeconds(arrivingInRentalVehicleAtDestinationCost); return this; } diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java b/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java index 66665f73b54..dc9fed8b9a3 100644 --- a/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java +++ b/src/main/java/org/opentripplanner/service/vehiclerental/street/VehicleRentalEdge.java @@ -161,8 +161,14 @@ public State[] traverse(State s0) { } } - s1.incrementWeight(pickedUp ? preferences.pickupCost() : preferences.dropoffCost()); - s1.incrementTimeInSeconds(pickedUp ? preferences.pickupTime() : preferences.dropoffTime()); + s1.incrementWeight( + pickedUp ? preferences.pickupCost().toSeconds() : preferences.dropOffCost().toSeconds() + ); + s1.incrementTimeInSeconds( + pickedUp + ? (int) preferences.pickupTime().toSeconds() + : (int) preferences.dropOffTime().toSeconds() + ); s1.setBackMode(null); return s1.makeStateArray(); } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index f15f6acdfe1..fab5262988b 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -586,15 +586,6 @@ private static void mapCarPreferences(NodeAdapter c, CarPreferences.Builder buil ) .asDouble(dft.reluctance()) ) - .withDropoffTime( - cc - .of("dropoffTime") - .since(V2_0) - .summary( - "Time to park a car in a park and ride, w/o taking into account driving and walking cost." - ) - .asInt(dft.dropoffTime()) - ) .withPickupCost( cc .of("pickupCost") diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java index 3d1534f5753..f862e9b9628 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java @@ -13,25 +13,33 @@ public class VehicleRentalConfig { static void mapRentalPreferences(NodeAdapter c, VehicleRentalPreferences.Builder builder) { var dft = builder.original(); builder - .withDropoffCost( + .withDropOffCost( c .of("dropOffCost") .since(V2_0) .summary("Cost to drop-off a rented vehicle.") - .asInt(dft.dropoffCost()) + .asInt(dft.dropOffCost().toSeconds()) ) - .withDropoffTime( + .withDropOffTime( c .of("dropOffTime") .since(V2_0) .summary("Time to drop-off a rented vehicle.") - .asInt(dft.dropoffTime()) + .asDuration(dft.dropOffTime()) ) .withPickupCost( - c.of("pickupCost").since(V2_0).summary("Cost to rent a vehicle.").asInt(dft.pickupCost()) + c + .of("pickupCost") + .since(V2_0) + .summary("Cost to rent a vehicle.") + .asInt(dft.pickupCost().toSeconds()) ) .withPickupTime( - c.of("pickupTime").since(V2_0).summary("Time to rent a vehicle.").asInt(dft.pickupTime()) + c + .of("pickupTime") + .since(V2_0) + .summary("Time to rent a vehicle.") + .asDuration(dft.pickupTime()) ) .withUseAvailabilityInformation( c @@ -49,7 +57,7 @@ static void mapRentalPreferences(NodeAdapter c, VehicleRentalPreferences.Builder .summary( "The cost of arriving at the destination with the rented vehicle, to discourage doing so." ) - .asDouble(dft.arrivingInRentalVehicleAtDestinationCost()) + .asInt(dft.arrivingInRentalVehicleAtDestinationCost().toSeconds()) ) .withAllowArrivingInRentedVehicleAtDestination( c diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java index 926eebc31d9..df5b24a5928 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java +++ b/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java @@ -143,7 +143,7 @@ private State[] buildState(State s0, StateEditor s1, RoutingPreferences pref) { s0.mayKeepRentedVehicleAtDestination() && rentalPreferences.allowArrivingInRentedVehicleAtDestination() ) { - s1.incrementWeight(rentalPreferences.arrivingInRentalVehicleAtDestinationCost()); + s1.incrementWeight(rentalPreferences.arrivingInRentalVehicleAtDestinationCost().toSeconds()); } s1.setBackMode(null); diff --git a/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java b/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java index 011d0fec7f1..d825a8fcbea 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java @@ -48,7 +48,7 @@ public State[] traverse(State s0) { s0.mayKeepRentedVehicleAtDestination() && rentalPreferences.allowArrivingInRentedVehicleAtDestination() ) { - s1.incrementWeight(rentalPreferences.arrivingInRentalVehicleAtDestinationCost()); + s1.incrementWeight(rentalPreferences.arrivingInRentalVehicleAtDestinationCost().toSeconds()); } return s1.makeStateArray(); diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java index 9bf287737df..4591d689f6c 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java @@ -91,10 +91,6 @@ void testToString() { "speed: 2.0, " + "reluctance: 1.2, " + "boardCost: $660, " + - "walkingSpeed: 1.15, " + - "walkingReluctance: 1.45, " + - "switchTime: 3m20s, " + - "switchCost: $450, " + "parking: VehicleParkingPreferences{parkCost: $30}, " + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + "optimizeType: TRIANGLE, " + diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java index c81cb41d883..a21dfadbed0 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java @@ -16,7 +16,6 @@ class CarPreferencesTest { private static final int PICKUP_COST = 500; private static final double ACCELERATION_SPEED = 3.1; private static final double DECELERATION_SPEED = 3.5; - public static final int DROPOFF_TIME = 450; public static final int RENTAL_PICKUP_TIME = 30; public static final int PARK_COST = 30; @@ -26,7 +25,6 @@ class CarPreferencesTest { .withReluctance(RELUCTANCE) .withPickupTime(PICKUP_TIME) .withPickupCost(PICKUP_COST) - .withDropoffTime(DROPOFF_TIME) .withAccelerationSpeed(ACCELERATION_SPEED) .withDecelerationSpeed(DECELERATION_SPEED) .withRental(rental -> rental.withPickupTime(RENTAL_PICKUP_TIME).build()) @@ -53,11 +51,6 @@ void pickupCost() { assertEquals(PICKUP_COST, subject.pickupCost()); } - @Test - void dropoffTime() { - assertEquals(DROPOFF_TIME, subject.dropoffTime()); - } - @Test void accelerationSpeed() { assertEquals(ACCELERATION_SPEED, subject.accelerationSpeed()); @@ -103,7 +96,6 @@ void testToString() { "rental: VehicleRentalPreferences{pickupTime: 30s}, " + "pickupTime: 600, " + "pickupCost: $500, " + - "dropoffTime: 450, " + "accelerationSpeed: 3.1, decelerationSpeed: 3.5" + "}", subject.toString() diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java index 6092c8139bc..1b7068d0cd4 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleRentalPreferencesTest.java @@ -4,8 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.opentripplanner.routing.api.request.preference.ImmutablePreferencesAsserts.assertEqualsAndHashCode; +import java.time.Duration; import java.util.Set; import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.model.Cost; class VehicleRentalPreferencesTest { @@ -23,8 +25,8 @@ class VehicleRentalPreferencesTest { .of() .withPickupTime(PICKUP_TIME) .withPickupCost(PICKUP_COST) - .withDropoffTime(DROPOFF_TIME) - .withDropoffCost(DROPOFF_COST) + .withDropOffTime(DROPOFF_TIME) + .withDropOffCost(DROPOFF_COST) .withArrivingInRentalVehicleAtDestinationCost(ARRIVE_IN_RENTAL_COST) .withUseAvailabilityInformation(USE_AVAILABILITY_INFORMATION) .withAllowArrivingInRentedVehicleAtDestination(ALLOW_ARRIVING_IN_RENTED_VEHICLE) @@ -34,22 +36,22 @@ class VehicleRentalPreferencesTest { @Test void pickupTime() { - assertEquals(PICKUP_TIME, subject.pickupTime()); + assertEquals(Duration.ofSeconds(PICKUP_TIME), subject.pickupTime()); } @Test void pickupCost() { - assertEquals(PICKUP_COST, subject.pickupCost()); + assertEquals(Cost.costOfSeconds(PICKUP_COST), subject.pickupCost()); } @Test void dropoffTime() { - assertEquals(DROPOFF_TIME, subject.dropoffTime()); + assertEquals(Duration.ofSeconds(DROPOFF_TIME), subject.dropOffTime()); } @Test void dropoffCost() { - assertEquals(DROPOFF_COST, subject.dropoffCost()); + assertEquals(Cost.costOfSeconds(DROPOFF_COST), subject.dropOffCost()); } @Test @@ -59,7 +61,10 @@ void useAvailabilityInformation() { @Test void arrivingInRentalVehicleAtDestinationCost() { - assertEquals(ARRIVE_IN_RENTAL_COST, subject.arrivingInRentalVehicleAtDestinationCost()); + assertEquals( + Cost.costOfSeconds(ARRIVE_IN_RENTAL_COST), + subject.arrivingInRentalVehicleAtDestinationCost() + ); } @Test @@ -102,10 +107,10 @@ void testToString() { "VehicleRentalPreferences{" + "pickupTime: 25s, " + "pickupCost: $250, " + - "dropoffTime: 45s, " + - "dropoffCost: $450, " + + "dropOffTime: 45s, " + + "dropOffCost: $450, " + "useAvailabilityInformation, " + - "arrivingInRentalVehicleAtDestinationCost: 500.0, " + + "arrivingInRentalVehicleAtDestinationCost: $500, " + "allowArrivingInRentedVehicleAtDestination, " + "allowedNetworks: [foo], " + "bannedNetworks: [bar]" + diff --git a/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java b/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java index 0694a991069..8dc1e240392 100644 --- a/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java +++ b/src/test/java/org/opentripplanner/street/integration/BikeRentalTest.java @@ -620,7 +620,7 @@ private List runStreetSearchAndCreateDescriptor( request.withPreferences(preferences -> preferences.withBike(bike -> bike.withRental(rental -> - rental.withPickupTime(42).withPickupCost(62).withDropoffCost(33).withDropoffTime(15) + rental.withPickupTime(42).withPickupCost(62).withDropOffCost(33).withDropOffTime(15) ) ) ); diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 996505b5296..c3b99284dbd 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -29,7 +29,7 @@ }, "rental": { "pickupCost": 120, - "dropOffTime": 30, + "dropOffTime": "30s", "dropOffCost": 30 }, "parking": { @@ -40,12 +40,11 @@ "car": { "speed": 40, "reluctance": 10, - "dropoffTime": 120, "decelerationSpeed": 2.9, "accelerationSpeed": 2.9, "rental": { "pickupCost": 120, - "dropOffTime": 30, + "dropOffTime": "30s", "dropOffCost": 30 } }, From 3bbe2d05ed14071e02536f04ed05177e6b9d9614 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 2 Jan 2024 14:34:43 +0200 Subject: [PATCH 0217/1688] Retype pickupTime and expose cost as Cost --- docs/RouteRequest.md | 2 +- .../request/preference/CarPreferences.java | 23 ++++++++++--------- .../routerequest/RouteRequestConfig.java | 4 ++-- .../street/model/edge/CarPickupableEdge.java | 8 +++---- .../preference/CarPreferencesTest.java | 10 ++++---- 5 files changed, 25 insertions(+), 22 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index aff3f3e5758..f682eedcaa7 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -85,7 +85,7 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |    accelerationSpeed | `double` | The acceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | |    decelerationSpeed | `double` | The deceleration speed of an automobile, in meters per second per second. | *Optional* | `2.9` | 2.0 | |    pickupCost | `integer` | Add a cost for car pickup changes when a pickup or drop off takes place | *Optional* | `120` | 2.1 | -|    pickupTime | `integer` | Add a time for car pickup changes when a pickup or drop off takes place | *Optional* | `60` | 2.1 | +|    pickupTime | `duration` | Add a time for car pickup changes when a pickup or drop off takes place | *Optional* | `"PT1M"` | 2.1 | |    reluctance | `double` | A multiplier for how bad driving is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | |    speed | `double` | Max car speed along streets, in meters per second | *Optional* | `40.0` | 2.0 | |    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java index 9615a586335..b2f226cf307 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java @@ -3,6 +3,7 @@ import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; import java.io.Serializable; +import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.lang.DoubleUtils; @@ -25,7 +26,7 @@ public final class CarPreferences implements Serializable { private final double reluctance; private final VehicleParkingPreferences parking; private final VehicleRentalPreferences rental; - private final int pickupTime; + private final Duration pickupTime; private final Cost pickupCost; private final double accelerationSpeed; private final double decelerationSpeed; @@ -36,7 +37,7 @@ private CarPreferences() { this.reluctance = 2.0; this.parking = VehicleParkingPreferences.DEFAULT; this.rental = VehicleRentalPreferences.DEFAULT; - this.pickupTime = 60; + this.pickupTime = Duration.ofMinutes(1); this.pickupCost = Cost.costOfMinutes(2); this.accelerationSpeed = 2.9; this.decelerationSpeed = 2.9; @@ -47,7 +48,7 @@ private CarPreferences(Builder builder) { this.reluctance = Units.reluctance(builder.reluctance); this.parking = builder.parking; this.rental = builder.rental; - this.pickupTime = Units.duration(builder.pickupTime); + this.pickupTime = Duration.ofSeconds(Units.duration(builder.pickupTime)); this.pickupCost = builder.pickupCost; this.accelerationSpeed = Units.acceleration(builder.accelerationSpeed); this.decelerationSpeed = Units.acceleration(builder.decelerationSpeed); @@ -85,13 +86,13 @@ public VehicleRentalPreferences rental() { } /** Time of getting in/out of a carPickup (taxi) */ - public int pickupTime() { + public Duration pickupTime() { return pickupTime; } /** Cost of getting in/out of a carPickup (taxi) */ - public int pickupCost() { - return pickupCost.toSeconds(); + public Cost pickupCost() { + return pickupCost; } /** @@ -120,7 +121,7 @@ public boolean equals(Object o) { DoubleUtils.doubleEquals(that.reluctance, reluctance) && parking.equals(that.parking) && rental.equals(that.rental) && - pickupTime == that.pickupTime && + Objects.equals(pickupTime, that.pickupTime) && pickupCost.equals(that.pickupCost) && DoubleUtils.doubleEquals(that.accelerationSpeed, accelerationSpeed) && DoubleUtils.doubleEquals(that.decelerationSpeed, decelerationSpeed) @@ -149,7 +150,7 @@ public String toString() { .addNum("reluctance", reluctance, DEFAULT.reluctance) .addObj("parking", parking, DEFAULT.parking) .addObj("rental", rental, DEFAULT.rental) - .addNum("pickupTime", pickupTime, DEFAULT.pickupTime) + .addObj("pickupTime", pickupTime, DEFAULT.pickupTime) .addObj("pickupCost", pickupCost, DEFAULT.pickupCost) .addNum("accelerationSpeed", accelerationSpeed, DEFAULT.accelerationSpeed) .addNum("decelerationSpeed", decelerationSpeed, DEFAULT.decelerationSpeed) @@ -175,7 +176,7 @@ public Builder(CarPreferences original) { this.reluctance = original.reluctance; this.parking = original.parking; this.rental = original.rental; - this.pickupTime = original.pickupTime; + this.pickupTime = (int) original.pickupTime.toSeconds(); this.pickupCost = original.pickupCost; this.accelerationSpeed = original.accelerationSpeed; this.decelerationSpeed = original.decelerationSpeed; @@ -205,8 +206,8 @@ public Builder withRental(Consumer body) { return this; } - public Builder withPickupTime(int pickupTime) { - this.pickupTime = pickupTime; + public Builder withPickupTime(Duration pickupTime) { + this.pickupTime = (int) pickupTime.toSeconds(); return this; } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index fab5262988b..1e4f1e860c4 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -591,14 +591,14 @@ private static void mapCarPreferences(NodeAdapter c, CarPreferences.Builder buil .of("pickupCost") .since(V2_1) .summary("Add a cost for car pickup changes when a pickup or drop off takes place") - .asInt(dft.pickupCost()) + .asInt(dft.pickupCost().toSeconds()) ) .withPickupTime( cc .of("pickupTime") .since(V2_1) .summary("Add a time for car pickup changes when a pickup or drop off takes place") - .asInt(dft.pickupTime()) + .asDuration(dft.pickupTime()) ) .withAccelerationSpeed( cc diff --git a/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java b/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java index ec50e3b60ca..7ea1678bbe7 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/CarPickupableEdge.java @@ -30,13 +30,13 @@ default void dropOffAfterDriving(State state, StateEditor editor) { ? CarPickupState.WALK_TO_PICKUP : CarPickupState.WALK_FROM_DROP_OFF ); - editor.incrementTimeInSeconds(state.getPreferences().car().pickupTime()); - editor.incrementWeight(state.getPreferences().car().pickupCost()); + editor.incrementTimeInSeconds((int) state.getPreferences().car().pickupTime().toSeconds()); + editor.incrementWeight(state.getPreferences().car().pickupCost().toSeconds()); } default void driveAfterPickup(State state, StateEditor editor) { editor.setCarPickupState(CarPickupState.IN_CAR); - editor.incrementTimeInSeconds(state.getPreferences().car().pickupTime()); - editor.incrementWeight(state.getPreferences().car().pickupCost()); + editor.incrementTimeInSeconds((int) state.getPreferences().car().pickupTime().toSeconds()); + editor.incrementWeight(state.getPreferences().car().pickupCost().toSeconds()); } } diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java index a21dfadbed0..3c0a294d7e2 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java @@ -4,7 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.opentripplanner.routing.api.request.preference.ImmutablePreferencesAsserts.assertEqualsAndHashCode; +import java.time.Duration; import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.model.Cost; class CarPreferencesTest { @@ -23,7 +25,7 @@ class CarPreferencesTest { .of() .withSpeed(SPEED) .withReluctance(RELUCTANCE) - .withPickupTime(PICKUP_TIME) + .withPickupTime(Duration.ofSeconds(PICKUP_TIME)) .withPickupCost(PICKUP_COST) .withAccelerationSpeed(ACCELERATION_SPEED) .withDecelerationSpeed(DECELERATION_SPEED) @@ -43,12 +45,12 @@ void reluctance() { @Test void pickupTime() { - assertEquals(PICKUP_TIME, subject.pickupTime()); + assertEquals(Duration.ofSeconds(PICKUP_TIME), subject.pickupTime()); } @Test void pickupCost() { - assertEquals(PICKUP_COST, subject.pickupCost()); + assertEquals(Cost.costOfSeconds(PICKUP_COST), subject.pickupCost()); } @Test @@ -94,7 +96,7 @@ void testToString() { "reluctance: 5.1, " + "parking: VehicleParkingPreferences{parkCost: $30}, " + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + - "pickupTime: 600, " + + "pickupTime: PT10M, " + "pickupCost: $500, " + "accelerationSpeed: 3.1, decelerationSpeed: 3.5" + "}", From 4009ade94fb5b4cf1fcea30f8c1f30a32bdef4c4 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 2 Jan 2024 15:10:15 +0200 Subject: [PATCH 0218/1688] Add car parking to doc --- docs/RouteRequest.md | 49 +++++++++++++++++++ docs/RouterConfiguration.md | 4 ++ .../standalone/config/router-config.json | 4 ++ 3 files changed, 57 insertions(+) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index f682eedcaa7..f16a4996ffe 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -89,6 +89,12 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |    reluctance | `double` | A multiplier for how bad driving is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | |    speed | `double` | Max car speed along streets, in meters per second | *Optional* | `40.0` | 2.0 | |    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | +|       parkCost | `integer` | Cost to park a vehicle. | *Optional* | `120` | 2.0 | +|       parkTime | `duration` | Time to park a vehicle. | *Optional* | `"PT1M"` | 2.0 | +|       [unpreferredVehicleParkingTagCost](#rd_car_parking_unpreferredVehicleParkingTagCost) | `integer` | What cost to add if a parking facility doesn't contain a preferred tag. | *Optional* | `300` | 2.3 | +|       [bannedVehicleParkingTags](#rd_car_parking_bannedVehicleParkingTags) | `string[]` | Tags with which a vehicle parking will not be used. If empty, no tags are banned. | *Optional* | | 2.1 | +|       [preferredVehicleParkingTags](#rd_car_parking_preferredVehicleParkingTags) | `string[]` | Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. | *Optional* | | 2.3 | +|       [requiredVehicleParkingTags](#rd_car_parking_requiredVehicleParkingTags) | `string[]` | Tags without which a vehicle parking will not be used. If empty, no tags are required. | *Optional* | | 2.1 | |    rental | `object` | Vehicle rental options | *Optional* | | 2.3 | |       allowKeepingAtDestination | `boolean` | If a vehicle should be allowed to be kept at the end of a station-based rental. | *Optional* | `false` | 2.2 | |       dropOffCost | `integer` | Cost to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | @@ -528,6 +534,45 @@ Sometimes there is a need to configure a board times for specific modes, such as ferries, where the check-in process needs to be done in good time before ride. +

    unpreferredVehicleParkingTagCost

    + +**Since version:** `2.3` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `300` +**Path:** /routingDefaults/car/parking + +What cost to add if a parking facility doesn't contain a preferred tag. + +See `preferredVehicleParkingTags`. + +

    bannedVehicleParkingTags

    + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/car/parking + +Tags with which a vehicle parking will not be used. If empty, no tags are banned. + +Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + + +

    preferredVehicleParkingTags

    + +**Since version:** `2.3` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/car/parking + +Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. + +Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + + +

    requiredVehicleParkingTags

    + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/car/parking + +Tags without which a vehicle parking will not be used. If empty, no tags are required. + +Vehicle parking tags can originate from different places depending on the origin of the parking(OSM or RT feed). + +

    allowedNetworks

    **Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` @@ -1014,6 +1059,10 @@ include stairs as a last result. "pickupCost" : 120, "dropOffTime" : "30s", "dropOffCost" : 30 + }, + "parking" : { + "parkTime" : "5m", + "parkCost" : 600 } }, "walk" : { diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index af2c0a9630a..9c794b3086d 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -485,6 +485,10 @@ Used to group requests when monitoring OTP. "pickupCost" : 120, "dropOffTime" : "30s", "dropOffCost" : 30 + }, + "parking" : { + "parkTime" : "5m", + "parkCost" : 600 } }, "walk" : { diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index c3b99284dbd..8dfb1434ce4 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -46,6 +46,10 @@ "pickupCost": 120, "dropOffTime": "30s", "dropOffCost": 30 + }, + "parking": { + "parkTime": "5m", + "parkCost": 600 } }, "walk": { From 27d49214f488efdb9d37564ea8d9b85d71621247 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 2 Jan 2024 16:41:25 +0200 Subject: [PATCH 0219/1688] Expose triangle in docs --- docs/RouteRequest.md | 19 +++++++++++++++++++ docs/RouterConfiguration.md | 5 +++++ .../standalone/config/router-config.json | 5 +++++ 3 files changed, 29 insertions(+) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index f16a4996ffe..4f52149aad1 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -74,6 +74,9 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       [allowedNetworks](#rd_bicycle_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | |       [bannedNetworks](#rd_bicycle_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | |    triangle | `object` | Triangle optimization criteria. | *Optional* | | 2.5 | +|       flatness | `double` | Relative importance of flat terrain (range 0-1). | *Optional* | `0.0` | 2.0 | +|       [safety](#rd_bicycle_triangle_safety) | `double` | Relative importance of safety (range 0-1). | *Optional* | `0.0` | 2.0 | +|       time | `double` | Relative importance of duration of travel (range 0-1). | *Optional* | `0.0` | 2.0 | |    walk | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | |       [hopCost](#rd_bicycle_walk_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | |       [hopTime](#rd_bicycle_walk_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle in seconds. | *Optional* | `"PT0S"` | 2.0 | @@ -500,6 +503,17 @@ The vehicle rental networks which may be used. If empty all networks may be used The vehicle rental networks which may not be used. If empty, no networks are banned. +

    safety

    + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.0` +**Path:** /routingDefaults/bicycle/triangle + +Relative importance of safety (range 0-1). + +This factor can also include other concerns such as convenience and general cyclist +preferences by taking into account road surface etc. + +

    hopCost

    **Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` @@ -1048,6 +1062,11 @@ include stairs as a last result. "parking" : { "parkTime" : "1m", "parkCost" : 120 + }, + "triangle" : { + "safety" : 0.4, + "flatness" : 0.3, + "time" : 0.3 } }, "car" : { diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 9c794b3086d..f49a5bf9745 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -474,6 +474,11 @@ Used to group requests when monitoring OTP. "parking" : { "parkTime" : "1m", "parkCost" : 120 + }, + "triangle" : { + "safety" : 0.4, + "flatness" : 0.3, + "time" : 0.3 } }, "car" : { diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 8dfb1434ce4..9f6b336fde5 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -35,6 +35,11 @@ "parking": { "parkTime": "1m", "parkCost": 120 + }, + "triangle": { + "safety": 0.4, + "flatness": 0.3, + "time": 0.3 } }, "car": { From 831a4d8605a97d112111633ff848fd60679a6272 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 4 Jan 2024 11:22:11 +0200 Subject: [PATCH 0220/1688] Rename bicycle optimization types in the internal model and ease triangle configuration --- docs/RouteRequest.md | 19 +++++++++++---- .../common/RequestToPreferencesMapper.java | 9 ++++--- .../api/common/RoutingResource.java | 4 ++-- .../mapping/LegacyBicycleOptimizeType.java | 24 +++++++++++++++++++ .../gtfs/mapping/OptimizationTypeMapper.java | 19 +++++++++++++++ .../apis/gtfs/mapping/RouteRequestMapper.java | 7 +++++- .../apis/transmodel/model/EnumTypes.java | 8 +++---- .../request/preference/BikePreferences.java | 17 +++++++++++-- .../preference/TimeSlopeSafetyTriangle.java | 8 +++++++ .../routing/core/BicycleOptimizeType.java | 12 ++++++---- .../routerequest/RouteRequestConfig.java | 6 ++++- .../TriangleOptimizationConfig.java | 1 + .../street/model/edge/StreetEdge.java | 14 +++++------ .../visualizer/GraphVisualizer.java | 10 ++++---- .../gtfs/mapping/RouteRequestMapperTest.java | 17 ++++++------- .../mapping/TripRequestMapperTest.java | 2 +- .../preference/BikePreferencesTest.java | 23 ++++++++++++++++++ .../integration/BicycleRoutingTest.java | 4 +++- 18 files changed, 161 insertions(+), 43 deletions(-) create mode 100644 src/main/java/org/opentripplanner/api/mapping/LegacyBicycleOptimizeType.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 4f52149aad1..b95c58ec32f 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -53,7 +53,7 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | [alightSlackForMode](#rd_alightSlackForMode) | `enum map of duration` | How much extra time should be given when alighting a vehicle for each given mode. | *Optional* | | 2.0 | | bicycle | `object` | Bicycle preferences. | *Optional* | | 2.5 | |    [boardCost](#rd_bicycle_boardCost) | `integer` | Prevents unnecessary transfers by adding a cost for boarding a transit vehicle. | *Optional* | `600` | 2.0 | -|    [optimization](#rd_bicycle_optimization) | `enum` | The set of characteristics that the user wants to optimize for. | *Optional* | `"safe"` | 2.0 | +|    [optimization](#rd_bicycle_optimization) | `enum` | The set of characteristics that the user wants to optimize for. | *Optional* | `"safe-streets"` | 2.0 | |    reluctance | `double` | A multiplier for how bad cycling is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | |    speed | `double` | Max bicycle speed along streets, in meters per second | *Optional* | `5.0` | 2.0 | |    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | @@ -73,7 +73,7 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       useAvailabilityInformation | `boolean` | Whether or not vehicle rental availability information will be used to plan vehicle rental trips. | *Optional* | `false` | 2.0 | |       [allowedNetworks](#rd_bicycle_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | |       [bannedNetworks](#rd_bicycle_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | -|    triangle | `object` | Triangle optimization criteria. | *Optional* | | 2.5 | +|    [triangle](#rd_bicycle_triangle) | `object` | Triangle optimization criteria. | *Optional* | | 2.5 | |       flatness | `double` | Relative importance of flat terrain (range 0-1). | *Optional* | `0.0` | 2.0 | |       [safety](#rd_bicycle_triangle_safety) | `double` | Relative importance of safety (range 0-1). | *Optional* | `0.0` | 2.0 | |       time | `double` | Relative importance of duration of travel (range 0-1). | *Optional* | `0.0` | 2.0 | @@ -444,12 +444,14 @@ This is the cost that is used when boarding while cycling.This is usually higher

    optimization

    -**Since version:** `2.0` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"safe"` +**Since version:** `2.0` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"safe-streets"` **Path:** /routingDefaults/bicycle -**Enum values:** `quick` | `safe` | `flat` | `greenways` | `triangle` +**Enum values:** `shortest-duration` | `safe-streets` | `flat-streets` | `safest-streets` | `triangle` The set of characteristics that the user wants to optimize for. +If the triangle optimization is used, it's enough to just define the triangle parameters +

    unpreferredVehicleParkingTagCost

    **Since version:** `2.3` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `300` @@ -503,6 +505,15 @@ The vehicle rental networks which may be used. If empty all networks may be used The vehicle rental networks which may not be used. If empty, no networks are banned. +

    triangle

    + +**Since version:** `2.5` ∙ **Type:** `object` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/bicycle + +Triangle optimization criteria. + +Optimization type doesn't need to be defined if these values are defined. +

    safety

    **Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.0` diff --git a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java index 5da43e9a179..e4878e6c7d9 100644 --- a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java @@ -2,6 +2,7 @@ import jakarta.validation.constraints.NotNull; import java.util.function.Consumer; +import org.opentripplanner.api.mapping.LegacyBicycleOptimizeType; import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; @@ -10,7 +11,6 @@ import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; -import org.opentripplanner.routing.core.BicycleOptimizeType; class RequestToPreferencesMapper { @@ -67,9 +67,12 @@ private void mapBike() { setIfNotNull(req.bikeSpeed, bike::withSpeed); setIfNotNull(req.bikeReluctance, bike::withReluctance); setIfNotNull(req.bikeBoardCost, bike::withBoardCost); - setIfNotNull(req.bikeOptimizeType, bike::withOptimizeType); + setIfNotNull( + req.bikeOptimizeType, + optimizeType -> bike.withOptimizeType(LegacyBicycleOptimizeType.map(optimizeType)) + ); - if (req.bikeOptimizeType == BicycleOptimizeType.TRIANGLE) { + if (req.bikeOptimizeType == LegacyBicycleOptimizeType.TRIANGLE) { bike.withOptimizeTriangle(triangle -> { setIfNotNull(req.triangleTimeFactor, triangle::withTime); setIfNotNull(req.triangleSlopeFactor, triangle::withSlope); diff --git a/src/main/java/org/opentripplanner/api/common/RoutingResource.java b/src/main/java/org/opentripplanner/api/common/RoutingResource.java index 8e7501c77fd..374e5515e3d 100644 --- a/src/main/java/org/opentripplanner/api/common/RoutingResource.java +++ b/src/main/java/org/opentripplanner/api/common/RoutingResource.java @@ -18,6 +18,7 @@ import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; +import org.opentripplanner.api.mapping.LegacyBicycleOptimizeType; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.ext.dataoverlay.api.DataOverlayParameters; import org.opentripplanner.framework.application.OTPFeature; @@ -27,7 +28,6 @@ import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; -import org.opentripplanner.routing.core.BicycleOptimizeType; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.framework.file.ConfigFileLoader; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; @@ -248,7 +248,7 @@ public abstract class RoutingResource { */ @Deprecated @QueryParam("optimize") - protected BicycleOptimizeType bikeOptimizeType; + protected LegacyBicycleOptimizeType bikeOptimizeType; /** * The set of modes that a user is willing to use, with qualifiers stating whether vehicles should diff --git a/src/main/java/org/opentripplanner/api/mapping/LegacyBicycleOptimizeType.java b/src/main/java/org/opentripplanner/api/mapping/LegacyBicycleOptimizeType.java new file mode 100644 index 00000000000..1cc262ad720 --- /dev/null +++ b/src/main/java/org/opentripplanner/api/mapping/LegacyBicycleOptimizeType.java @@ -0,0 +1,24 @@ +package org.opentripplanner.api.mapping; + +import org.opentripplanner.routing.core.BicycleOptimizeType; + +/** + * Bicycle optimization types that are only meant to be used by the REST API. Related to {@link org.opentripplanner.routing.core.BicycleOptimizeType} + */ +public enum LegacyBicycleOptimizeType { + QUICK, + SAFE, + FLAT, + GREENWAYS, + TRIANGLE; + + public static BicycleOptimizeType map(LegacyBicycleOptimizeType type) { + return switch (type) { + case QUICK -> BicycleOptimizeType.SHORTEST_DURATION; + case FLAT -> BicycleOptimizeType.FLAT_STREETS; + case SAFE -> BicycleOptimizeType.SAFE_STREETS; + case GREENWAYS -> BicycleOptimizeType.SAFEST_STREETS; + case TRIANGLE -> BicycleOptimizeType.TRIANGLE; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java new file mode 100644 index 00000000000..1f53652f7b7 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java @@ -0,0 +1,19 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import javax.annotation.Nonnull; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.routing.core.BicycleOptimizeType; + +public final class OptimizationTypeMapper { + + @Nonnull + public static BicycleOptimizeType map(GraphQLTypes.GraphQLOptimizeType optimizeType) { + return switch (optimizeType) { + case QUICK -> BicycleOptimizeType.SHORTEST_DURATION; + case FLAT -> BicycleOptimizeType.FLAT_STREETS; + case SAFE -> BicycleOptimizeType.SAFE_STREETS; + case GREENWAYS -> BicycleOptimizeType.SAFEST_STREETS; + case TRIANGLE -> BicycleOptimizeType.TRIANGLE; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index a12ef45f6fb..13593a99e58 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -16,6 +16,7 @@ import org.opentripplanner.api.parameter.QualifiedMode; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; @@ -71,7 +72,11 @@ public static RouteRequest toRouteRequest( callWith.argument("bikeBoardCost", bike::withBoardCost); if (environment.getArgument("optimize") != null) { - bike.withOptimizeType(BicycleOptimizeType.valueOf(environment.getArgument("optimize"))); + bike.withOptimizeType( + OptimizationTypeMapper.map( + GraphQLTypes.GraphQLOptimizeType.valueOf(environment.getArgument("optimize")) + ) + ); } if (bike.optimizeType() == BicycleOptimizeType.TRIANGLE) { bike.withOptimizeTriangle(triangle -> { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java index 12aa19fbaea..e2897d868c9 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java @@ -64,10 +64,10 @@ public class EnumTypes { public static final GraphQLEnumType BICYCLE_OPTIMISATION_METHOD = GraphQLEnumType .newEnum() .name("BicycleOptimisationMethod") - .value("quick", BicycleOptimizeType.QUICK) - .value("safe", BicycleOptimizeType.SAFE) - .value("flat", BicycleOptimizeType.FLAT) - .value("greenways", BicycleOptimizeType.GREENWAYS) + .value("quick", BicycleOptimizeType.SHORTEST_DURATION) + .value("safe", BicycleOptimizeType.SAFE_STREETS) + .value("flat", BicycleOptimizeType.FLAT_STREETS) + .value("greenways", BicycleOptimizeType.SAFEST_STREETS) .value("triangle", BicycleOptimizeType.TRIANGLE) .build(); diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java index f282e02340c..2d887eba596 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java @@ -2,6 +2,8 @@ import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; +import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE_STREETS; +import static org.opentripplanner.routing.core.BicycleOptimizeType.TRIANGLE; import java.io.Serializable; import java.util.Objects; @@ -37,7 +39,7 @@ private BikePreferences() { this.boardCost = Cost.costOfMinutes(10); this.parking = VehicleParkingPreferences.DEFAULT; this.rental = VehicleRentalPreferences.DEFAULT; - this.optimizeType = BicycleOptimizeType.SAFE; + this.optimizeType = SAFE_STREETS; this.optimizeTriangle = TimeSlopeSafetyTriangle.DEFAULT; this.walking = VehicleWalkingPreferences.DEFAULT; } @@ -92,7 +94,7 @@ public VehicleRentalPreferences rental() { } /** - * The set of characteristics that the user wants to optimize for -- defaults to SAFE. + * The set of characteristics that the user wants to optimize for -- defaults to SAFE_STREETS. */ public BicycleOptimizeType optimizeType() { return optimizeType; @@ -233,6 +235,17 @@ public TimeSlopeSafetyTriangle optimizeTriangle() { return optimizeTriangle; } + /** This also sets the optimization type as TRIANGLE if triangle parameters are defined */ + public Builder withForcedOptimizeTriangle(Consumer body) { + var builder = TimeSlopeSafetyTriangle.of(); + body.accept(builder); + this.optimizeTriangle = builder.buildOrDefault(this.optimizeTriangle); + if (!builder.isEmpty()) { + this.optimizeType = TRIANGLE; + } + return this; + } + public Builder withOptimizeTriangle(Consumer body) { var builder = TimeSlopeSafetyTriangle.of(); body.accept(builder); diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java index b901d738213..99925a441fd 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java @@ -1,5 +1,6 @@ package org.opentripplanner.routing.api.request.preference; +import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; /** @@ -109,6 +110,13 @@ public Builder withSafety(double safety) { return this; } + /** + * Returns true if none of the values are set (i.e. all values are zero). + */ + public boolean isEmpty() { + return doubleEquals(time, ZERO) && doubleEquals(slope, ZERO) && doubleEquals(safety, ZERO); + } + public TimeSlopeSafetyTriangle build() { return new TimeSlopeSafetyTriangle(time, slope, safety); } diff --git a/src/main/java/org/opentripplanner/routing/core/BicycleOptimizeType.java b/src/main/java/org/opentripplanner/routing/core/BicycleOptimizeType.java index b5a47af82de..1d639e0af8b 100644 --- a/src/main/java/org/opentripplanner/routing/core/BicycleOptimizeType.java +++ b/src/main/java/org/opentripplanner/routing/core/BicycleOptimizeType.java @@ -9,10 +9,14 @@ * combined presets of routing parameters, except for triangle. */ public enum BicycleOptimizeType { - QUICK,/* the fastest trip */ - SAFE, - FLAT,/* needs a rewrite */ - GREENWAYS, + /** This was previously called QUICK */ + SHORTEST_DURATION, + /** This was previously called SAFE */ + SAFE_STREETS, + /** This was previously called FLAT. Needs a rewrite. */ + FLAT_STREETS, + /** This was previously called GREENWAYS. */ + SAFEST_STREETS, TRIANGLE; private static final Set NON_TRIANGLE_VALUES = Collections.unmodifiableSet( diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 1e4f1e860c4..8aaa0b1d243 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -372,9 +372,13 @@ private static void mapBikePreferences(NodeAdapter c, BikePreferences.Builder bu .of("optimization") .since(V2_0) .summary("The set of characteristics that the user wants to optimize for.") + .description( + "If the triangle optimization is used, it's enough to just define the triangle parameters" + ) .asEnum(dft.optimizeType()) ) - .withOptimizeTriangle(it -> mapOptimizationTriangle(cb, it)) + // triangle overrides the optimization type if defined + .withForcedOptimizeTriangle(it -> mapOptimizationTriangle(cb, it)) .withWalking(it -> mapVehicleWalking(cb, it)) .withParking(it -> mapParking(cb, it)) .withRental(it -> mapRental(cb, it)); diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java index e4988b02767..361e591891c 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java @@ -47,6 +47,7 @@ static void mapOptimizationTriangle(NodeAdapter c, TimeSlopeSafetyTriangle.Build .of("triangle") .since(V2_5) .summary("Triangle optimization criteria.") + .description("Optimization type doesn't need to be defined if these values are defined.") .asObject(); mapTriangleParameters(optimizationTriangle, preferences); } diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java index 3f17081b6cb..1e3594ee04b 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java @@ -51,7 +51,7 @@ public class StreetEdge private static final Logger LOG = LoggerFactory.getLogger(StreetEdge.class); - private static final double GREENWAY_SAFETY_FACTOR = 0.1; + private static final double SAFEST_STREETS_SAFETY_FACTOR = 0.1; /** If you have more than 16 flags, increase flags to short or int */ static final int BACK_FLAG_INDEX = 0; @@ -1217,17 +1217,17 @@ private TraversalCosts bicycleTraversalCost(RoutingPreferences pref, double spee double time = getEffectiveBikeDistance() / speed; double weight; switch (pref.bike().optimizeType()) { - case GREENWAYS -> { + case SAFEST_STREETS -> { weight = bicycleSafetyFactor * getDistanceMeters() / speed; - if (bicycleSafetyFactor <= GREENWAY_SAFETY_FACTOR) { - // greenways are treated as even safer than they really are + if (bicycleSafetyFactor <= SAFEST_STREETS_SAFETY_FACTOR) { + // safest streets are treated as even safer than they really are weight *= 0.66; } } - case SAFE -> weight = getEffectiveBicycleSafetyDistance() / speed; - case FLAT -> /* see notes in StreetVertex on speed overhead */weight = + case SAFE_STREETS -> weight = getEffectiveBicycleSafetyDistance() / speed; + case FLAT_STREETS -> /* see notes in StreetVertex on speed overhead */weight = getEffectiveBikeDistanceForWorkCost() / speed; - case QUICK -> weight = getEffectiveBikeDistance() / speed; + case SHORTEST_DURATION -> weight = getEffectiveBikeDistance() / speed; case TRIANGLE -> { double quick = getEffectiveBikeDistance(); double safety = getEffectiveBicycleSafetyDistance(); diff --git a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java index 73516b0348f..4154ee6362a 100644 --- a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java +++ b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java @@ -545,18 +545,18 @@ protected void route(String from, String to) { BicycleOptimizeType getSelectedOptimizeType() { if (opQuick.isSelected()) { - return BicycleOptimizeType.QUICK; + return BicycleOptimizeType.SHORTEST_DURATION; } if (opSafe.isSelected()) { - return BicycleOptimizeType.SAFE; + return BicycleOptimizeType.SAFE_STREETS; } if (opFlat.isSelected()) { - return BicycleOptimizeType.FLAT; + return BicycleOptimizeType.FLAT_STREETS; } if (opGreenways.isSelected()) { - return BicycleOptimizeType.GREENWAYS; + return BicycleOptimizeType.SAFEST_STREETS; } - return BicycleOptimizeType.QUICK; + return BicycleOptimizeType.SHORTEST_DURATION; } private Container makeDiffTab() { diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java index fba953cd93a..f52b81717d4 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java @@ -4,13 +4,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.params.provider.Arguments.of; -import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE; +import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE_STREETS; import static org.opentripplanner.routing.core.BicycleOptimizeType.TRIANGLE; import graphql.ExecutionInput; import graphql.execution.ExecutionId; import graphql.schema.DataFetchingEnvironment; import graphql.schema.DataFetchingEnvironmentImpl; +import java.util.Arrays; import java.util.List; import java.util.Locale; import java.util.Map; @@ -21,12 +22,12 @@ import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.TestRoutingService; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.ext.fares.impl.DefaultFareService; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.TimeSlopeSafetyTriangle; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; -import org.opentripplanner.routing.core.BicycleOptimizeType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.GraphFinder; import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService; @@ -149,7 +150,7 @@ private static Map mode(String mode) { void defaultBikeOptimize() { Map arguments = Map.of(); var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); - assertEquals(SAFE, routeRequest.preferences().bike().optimizeType()); + assertEquals(SAFE_STREETS, routeRequest.preferences().bike().optimizeType()); } @Test @@ -170,14 +171,14 @@ void bikeTriangle() { ); } - static Stream noTriangleCases = BicycleOptimizeType - .nonTriangleValues() - .stream() + static Stream noTriangleCases = Arrays + .stream(GraphQLTypes.GraphQLOptimizeType.values()) + .filter(value -> value != GraphQLTypes.GraphQLOptimizeType.TRIANGLE) .map(Arguments::of); @ParameterizedTest @VariableSource("noTriangleCases") - void noTriangle(BicycleOptimizeType bot) { + void noTriangle(GraphQLTypes.GraphQLOptimizeType bot) { Map arguments = Map.of( "optimize", bot.name(), @@ -187,7 +188,7 @@ void noTriangle(BicycleOptimizeType bot) { var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); - assertEquals(bot, routeRequest.preferences().bike().optimizeType()); + assertEquals(OptimizationTypeMapper.map(bot), routeRequest.preferences().bike().optimizeType()); assertEquals( TimeSlopeSafetyTriangle.DEFAULT, routeRequest.preferences().bike().optimizeTriangle() diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 3058f622281..9a01a36cbcb 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -272,7 +272,7 @@ public void testBikeTriangleFactors() { @Test void testDefaultTriangleFactors() { var req2 = TripRequestMapper.createRequest(executionContext(Map.of())); - assertEquals(BicycleOptimizeType.SAFE, req2.preferences().bike().optimizeType()); + assertEquals(BicycleOptimizeType.SAFE_STREETS, req2.preferences().bike().optimizeType()); assertEquals(TimeSlopeSafetyTriangle.DEFAULT, req2.preferences().bike().optimizeTriangle()); } diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java index 4591d689f6c..a314aa48799 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java @@ -99,4 +99,27 @@ void testToString() { subject.toString() ); } + + @Test + void testForcedTriangleOptimization() { + var trianglePreferences = BikePreferences + .of() + .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) + .build(); + assertEquals(BicycleOptimizeType.TRIANGLE, trianglePreferences.optimizeType()); + + var conflictingPreferences = BikePreferences + .of() + .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) + .build(); + assertEquals(BicycleOptimizeType.TRIANGLE, conflictingPreferences.optimizeType()); + + var emptyTrianglePreferences = BikePreferences + .of() + .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withForcedOptimizeTriangle(it -> it.build()) + .build(); + assertEquals(BicycleOptimizeType.SAFE_STREETS, emptyTrianglePreferences.optimizeType()); + } } diff --git a/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java b/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java index 300615269a1..d5b7733f3e8 100644 --- a/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java +++ b/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java @@ -75,7 +75,9 @@ private static String computePolyline(Graph graph, GenericLocation from, Generic request.setDateTime(dateTime); request.setFrom(from); request.setTo(to); - request.withPreferences(p -> p.withBike(it -> it.withOptimizeType(BicycleOptimizeType.QUICK))); + request.withPreferences(p -> + p.withBike(it -> it.withOptimizeType(BicycleOptimizeType.SHORTEST_DURATION)) + ); request.journey().direct().setMode(StreetMode.BIKE); var temporaryVertices = new TemporaryVerticesContainer( From b9787149de1e629ea0e2a348b7a3383b9f3d0c24 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 15:12:11 +0000 Subject: [PATCH 0221/1688] chore(deps): update micrometer.version to v1.12.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5e248f08e2e..02f3ea1722a 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 2.16.1 3.1.5 5.10.1 - 1.11.5 + 1.12.1 5.5.3 1.4.14 9.8.0 From 725537724af1bd1329e00c89803ad19ebed0a2db Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 09:56:12 +0100 Subject: [PATCH 0222/1688] Make configuration page more compliant with mkdocs-material [ci skip] --- doc-templates/Configuration.md | 18 +++++++++--------- docs/Configuration.md | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/doc-templates/Configuration.md b/doc-templates/Configuration.md index 003fe28d794..eabd4895a1f 100644 --- a/doc-templates/Configuration.md +++ b/doc-templates/Configuration.md @@ -176,7 +176,7 @@ The result will look like this: } ``` -# System-wide Configuration +## System-wide Configuration Using the file `otp-config.json` you can enable or disable different APIs and experimental [Sandbox Extensions](SandboxExtension.md). By default, all supported APIs are enabled and all @@ -185,7 +185,7 @@ Features that can be toggled in this file are generally only affect the routing but for consistency all such "feature flags", even those that would affect graph building, are managed in this one file. -## OTP Features +### OTP Features Here is a list of all features which can be toggled on/off and their default values. @@ -205,7 +205,7 @@ Here is a list of all features which can be toggled on/off and their default val ``` -# JVM configuration +## JVM configuration This section contains general recommendations for tuning the JVM in a production environment. It focuses mainly on garbage collection configuration and memory settings. @@ -213,19 +213,19 @@ See [Garbage Collector Tuning](https://docs.oracle.com/en/java/javase/17/gctunin See [Large Pages in Java](https://kstefanj.github.io/2021/05/19/large-pages-and-java.html) and [Transparent Huge Pages](https://shipilev.net/jvm/anatomy-quarks/2-transparent-huge-pages) for general information on large memory pages. -## OTP server +### OTP server The OTP server processes concurrent routing requests in real time. The main optimization goal for the OTP server is minimizing response time. -### Garbage collector +#### Garbage collector - The G1 garbage collector (default since Java 9) offers a good compromise between low latency (i.e. low GC pause time) and GC overhead. - If latency spikes are an issue, the ZGC garbage collector is an alternative. It produces in general more overhead than G1. -### Memory settings +#### Memory settings - Using Large Memory Pages can reduce pressure on the TLB cache and increase performance. - It is in general not recommended to use large memory page in _Transparent Huge Page_ mode (`-XX:+UseTransparentHugePages`) for latency-sensitive applications, since memory is allocated on-demand and this can induce latency spikes if the memory is fragmented. @@ -235,20 +235,20 @@ The physical memory can be committed upfront, at JVM startup time. This can be d Example: `-Xms18g -Xmx18g -XX:+UseTransparentHugePages -XX:+AlwaysPreTouch` -## Graph Builder +### Graph Builder The Graph Builder is the non-interactive mode used to build street graphs and transit graphs. The main optimization goal for the Graph Builder is minimizing total build time. -### Garbage collector +#### Garbage collector - In theory, the Parallel garbage collector offers the best throughput. In practice, it can be challenging to optimize the Parallel GC to build both a street graph and a transit graph, the memory usage patterns being different. - The G1 garbage collector provides in general a good compromise. -### Memory settings +#### Memory settings - Using Large Memory Pages can reduce pressure on the TLB cache and increase performance. - Since latency is not an issue, Large Memory Pages can be used indifferently in _TLBFS_ mode (`-XX:+UseHugeTLBFS`) or _Transparent Huge Page_ mode (`-XX:+UseTransparentHugePages`) diff --git a/docs/Configuration.md b/docs/Configuration.md index f1c0af287ab..d4803da0a56 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -203,7 +203,7 @@ The result will look like this: } ``` -# System-wide Configuration +## System-wide Configuration Using the file `otp-config.json` you can enable or disable different APIs and experimental [Sandbox Extensions](SandboxExtension.md). By default, all supported APIs are enabled and all @@ -212,7 +212,7 @@ Features that can be toggled in this file are generally only affect the routing but for consistency all such "feature flags", even those that would affect graph building, are managed in this one file. -## OTP Features +### OTP Features Here is a list of all features which can be toggled on/off and their default values. @@ -268,7 +268,7 @@ Here is a list of all features which can be toggled on/off and their default val ``` -# JVM configuration +## JVM configuration This section contains general recommendations for tuning the JVM in a production environment. It focuses mainly on garbage collection configuration and memory settings. @@ -276,19 +276,19 @@ See [Garbage Collector Tuning](https://docs.oracle.com/en/java/javase/17/gctunin See [Large Pages in Java](https://kstefanj.github.io/2021/05/19/large-pages-and-java.html) and [Transparent Huge Pages](https://shipilev.net/jvm/anatomy-quarks/2-transparent-huge-pages) for general information on large memory pages. -## OTP server +### OTP server The OTP server processes concurrent routing requests in real time. The main optimization goal for the OTP server is minimizing response time. -### Garbage collector +#### Garbage collector - The G1 garbage collector (default since Java 9) offers a good compromise between low latency (i.e. low GC pause time) and GC overhead. - If latency spikes are an issue, the ZGC garbage collector is an alternative. It produces in general more overhead than G1. -### Memory settings +#### Memory settings - Using Large Memory Pages can reduce pressure on the TLB cache and increase performance. - It is in general not recommended to use large memory page in _Transparent Huge Page_ mode (`-XX:+UseTransparentHugePages`) for latency-sensitive applications, since memory is allocated on-demand and this can induce latency spikes if the memory is fragmented. @@ -298,20 +298,20 @@ The physical memory can be committed upfront, at JVM startup time. This can be d Example: `-Xms18g -Xmx18g -XX:+UseTransparentHugePages -XX:+AlwaysPreTouch` -## Graph Builder +### Graph Builder The Graph Builder is the non-interactive mode used to build street graphs and transit graphs. The main optimization goal for the Graph Builder is minimizing total build time. -### Garbage collector +#### Garbage collector - In theory, the Parallel garbage collector offers the best throughput. In practice, it can be challenging to optimize the Parallel GC to build both a street graph and a transit graph, the memory usage patterns being different. - The G1 garbage collector provides in general a good compromise. -### Memory settings +#### Memory settings - Using Large Memory Pages can reduce pressure on the TLB cache and increase performance. - Since latency is not an issue, Large Memory Pages can be used indifferently in _TLBFS_ mode (`-XX:+UseHugeTLBFS`) or _Transparent Huge Page_ mode (`-XX:+UseTransparentHugePages`) From bed4effd5ea740572583055ea1385c37381e7765 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 12:31:29 +0100 Subject: [PATCH 0223/1688] Rename the feature flag DebugClient to DebugUi, remove separate one for the debug tiles --- docs/Configuration.md | 63 +++++++++---------- .../api/configuration/APIEndpoints.java | 6 +- .../framework/application/OTPFeature.java | 23 ++++--- .../standalone/server/GrizzlyServer.java | 2 +- 4 files changed, 50 insertions(+), 44 deletions(-) diff --git a/docs/Configuration.md b/docs/Configuration.md index f1c0af287ab..7a81e68fb4a 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -219,38 +219,37 @@ Here is a list of all features which can be toggled on/off and their default val -| Feature | Description | Enabled by default | Sandbox | -|--------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------------:|:-------:| -| `APIBikeRental` | Enable the bike rental endpoint. | ✓️ | | -| `APIServerInfo` | Enable the server info endpoint. | ✓️ | | -| `APIGraphInspectorTile` | Enable the inspector endpoint for graph information for inspection/debugging purpose. | ✓️ | | -| `APIUpdaterStatus` | Enable endpoint for graph updaters status. | ✓️ | | -| `ConsiderPatternsForDirectTransfers` | Enable limiting transfers so that there is only a single transfer to each pattern. | ✓️ | | -| `DebugClient` | Enable the debug web client located at the root of the web server. | ✓️ | | -| `FloatingBike` | Enable floating bike routing. | ✓️ | | -| `GtfsGraphQlApi` | Enable GTFS GraphQL API. | ✓️ | | -| `GtfsGraphQlApiRentalStationFuzzyMatching` | Does vehicleRentalStation query also allow ids that are not feed scoped. | | | -| `MinimumTransferTimeIsDefinitive` | If the minimum transfer time is a lower bound (default) or the definitive time for the transfer. Set this to `true` if you want to set a transfer time lower than what OTP derives from OSM data. | | | -| `OptimizeTransfers` | OTP will inspect all itineraries found and optimize where (which stops) the transfer will happen. Waiting time, priority and guaranteed transfers are taken into account. | ✓️ | | -| `ParallelRouting` | Enable performing parts of the trip planning in parallel. | | | -| `TransferConstraints` | Enforce transfers to happen according to the _transfers.txt_ (GTFS) and Interchanges (NeTEx). Turning this _off_ will increase the routing performance a little. | ✓️ | | -| `TransmodelGraphQlApi` | Enable Transmodel (NeTEx) GraphQL API. | ✓️ | ✓️ | -| `ActuatorAPI` | Endpoint for actuators (service health status). | | ✓️ | -| `AsyncGraphQLFetchers` | Whether the @async annotation in the GraphQL schema should lead to the fetch being executed asynchronously. This allows batch or alias queries to run in parallel at the cost of consuming extra threads. | | | -| `Co2Emissions` | Enable the emissions sandbox module. | | ✓️ | -| `DataOverlay` | Enable usage of data overlay when calculating costs for the street network. | | ✓️ | -| `FaresV2` | Enable import of GTFS-Fares v2 data. | | ✓️ | -| `FlexRouting` | Enable FLEX routing. | | ✓️ | -| `GoogleCloudStorage` | Enable Google Cloud Storage integration. | | ✓️ | -| `RealtimeResolver` | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data | | ✓️ | -| `ReportApi` | Enable the report API. | | ✓️ | -| `RestAPIPassInDefaultConfigAsJson` | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY! | | | -| `SandboxAPIGeocoder` | Enable the Geocoder API. | | ✓️ | -| `SandboxAPIMapboxVectorTilesApi` | Enable Mapbox vector tiles API. | | ✓️ | -| `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ | -| `SandboxAPITravelTime` | Enable the isochrone/travel time surface API. | | ✓️ | -| `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ | -| `VehicleToStopHeuristics` | Enable improved heuristic for park-and-ride queries. | | ✓️ | +| Feature | Description | Enabled by default | Sandbox | +|--------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------------:|:-------:| +| `APIBikeRental` | Enable the bike rental endpoint. | ✓️ | | +| `APIServerInfo` | Enable the server info endpoint. | ✓️ | | +| `APIUpdaterStatus` | Enable endpoint for graph updaters status. | ✓️ | | +| `ConsiderPatternsForDirectTransfers` | Enable limiting transfers so that there is only a single transfer to each pattern. | ✓️ | | +| `DebugUi` | Enable the debug GraphQL client and web UI and located at the root of the web server as well as the debug map tiles it uses. Be aware that the map tiles are not a stable API and can change without notice. Use the [vector tiles feature if](sandbox/MapboxVectorTilesApi.md) you want a stable map tiles API. | ✓️ | | +| `FloatingBike` | Enable floating bike routing. | ✓️ | | +| `GtfsGraphQlApi` | Enable the [GTFS GraphQL API](apis/GTFS-GraphQL-API.md). | ✓️ | | +| `GtfsGraphQlApiRentalStationFuzzyMatching` | Does vehicleRentalStation query also allow ids that are not feed scoped. | | | +| `MinimumTransferTimeIsDefinitive` | If the minimum transfer time is a lower bound (default) or the definitive time for the transfer. Set this to `true` if you want to set a transfer time lower than what OTP derives from OSM data. | | | +| `OptimizeTransfers` | OTP will inspect all itineraries found and optimize where (which stops) the transfer will happen. Waiting time, priority and guaranteed transfers are taken into account. | ✓️ | | +| `ParallelRouting` | Enable performing parts of the trip planning in parallel. | | | +| `TransferConstraints` | Enforce transfers to happen according to the _transfers.txt_ (GTFS) and Interchanges (NeTEx). Turning this _off_ will increase the routing performance a little. | ✓️ | | +| `TransmodelGraphQlApi` | Enable the [Transmodel (NeTEx) GraphQL API](apis/TransmodelApi.md). | ✓️ | ✓️ | +| `ActuatorAPI` | Endpoint for actuators (service health status). | | ✓️ | +| `AsyncGraphQLFetchers` | Whether the @async annotation in the GraphQL schema should lead to the fetch being executed asynchronously. This allows batch or alias queries to run in parallel at the cost of consuming extra threads. | | | +| `Co2Emissions` | Enable the emissions sandbox module. | | ✓️ | +| `DataOverlay` | Enable usage of data overlay when calculating costs for the street network. | | ✓️ | +| `FaresV2` | Enable import of GTFS-Fares v2 data. | | ✓️ | +| `FlexRouting` | Enable FLEX routing. | | ✓️ | +| `GoogleCloudStorage` | Enable Google Cloud Storage integration. | | ✓️ | +| `RealtimeResolver` | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data | | ✓️ | +| `ReportApi` | Enable the report API. | | ✓️ | +| `RestAPIPassInDefaultConfigAsJson` | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY! | | | +| `SandboxAPIGeocoder` | Enable the Geocoder API. | | ✓️ | +| `SandboxAPIMapboxVectorTilesApi` | Enable Mapbox vector tiles API. | | ✓️ | +| `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ | +| `SandboxAPITravelTime` | Enable the isochrone/travel time surface API. | | ✓️ | +| `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ | +| `VehicleToStopHeuristics` | Enable improved heuristic for park-and-ride queries. | | ✓️ | diff --git a/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java b/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java index 64bbb2896a2..79556302f04 100644 --- a/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/api/configuration/APIEndpoints.java @@ -1,10 +1,10 @@ package org.opentripplanner.api.configuration; import static org.opentripplanner.framework.application.OTPFeature.APIBikeRental; -import static org.opentripplanner.framework.application.OTPFeature.APIGraphInspectorTile; import static org.opentripplanner.framework.application.OTPFeature.APIServerInfo; import static org.opentripplanner.framework.application.OTPFeature.APIUpdaterStatus; import static org.opentripplanner.framework.application.OTPFeature.ActuatorAPI; +import static org.opentripplanner.framework.application.OTPFeature.DebugUi; import static org.opentripplanner.framework.application.OTPFeature.GtfsGraphQlApi; import static org.opentripplanner.framework.application.OTPFeature.ReportApi; import static org.opentripplanner.framework.application.OTPFeature.SandboxAPIGeocoder; @@ -51,10 +51,10 @@ private APIEndpoints() { // Add feature enabled APIs, these can be enabled by default, some is not. // See the OTPFeature enum for details. addIfEnabled(APIBikeRental, BikeRental.class); - addIfEnabled(APIGraphInspectorTile, GraphInspectorTileResource.class); - addIfEnabled(APIGraphInspectorTile, GraphInspectorVectorTileResource.class); addIfEnabled(APIServerInfo, ServerInfo.class); addIfEnabled(APIUpdaterStatus, UpdaterStatusResource.class); + addIfEnabled(DebugUi, GraphInspectorTileResource.class); + addIfEnabled(DebugUi, GraphInspectorVectorTileResource.class); addIfEnabled(GtfsGraphQlApi, GtfsGraphQLAPI.class); addIfEnabled(TransmodelGraphQlApi, TransmodelAPI.class); diff --git a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java index 05d1284a883..308710ef5a0 100644 --- a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java +++ b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java @@ -16,20 +16,23 @@ public enum OTPFeature { APIBikeRental(true, false, "Enable the bike rental endpoint."), APIServerInfo(true, false, "Enable the server info endpoint."), - APIGraphInspectorTile( - true, - false, - "Enable the inspector endpoint for graph information for inspection/debugging purpose." - ), APIUpdaterStatus(true, false, "Enable endpoint for graph updaters status."), ConsiderPatternsForDirectTransfers( true, false, "Enable limiting transfers so that there is only a single transfer to each pattern." ), - DebugClient(true, false, "Enable the debug web client located at the root of the web server."), + DebugUi( + true, + false, + """ + Enable the debug GraphQL client and web UI and located at the root of the web server as well as the debug map tiles it uses. + Be aware that the map tiles are not a stable API and can change without notice. + Use the [vector tiles feature if](sandbox/MapboxVectorTilesApi.md) you want a stable map tiles API. + """ + ), FloatingBike(true, false, "Enable floating bike routing."), - GtfsGraphQlApi(true, false, "Enable GTFS GraphQL API."), + GtfsGraphQlApi(true, false, "Enable the [GTFS GraphQL API](apis/GTFS-GraphQL-API.md)."), GtfsGraphQlApiRentalStationFuzzyMatching( false, false, @@ -63,7 +66,11 @@ public enum OTPFeature { false, "Enforce transfers to happen according to the _transfers.txt_ (GTFS) and Interchanges (NeTEx). Turning this _off_ will increase the routing performance a little." ), - TransmodelGraphQlApi(true, true, "Enable Transmodel (NeTEx) GraphQL API."), + TransmodelGraphQlApi( + true, + true, + "Enable the [Transmodel (NeTEx) GraphQL API](apis/TransmodelApi.md)." + ), /* Sandbox extension features - Must be turned OFF by default */ diff --git a/src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java b/src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java index c422e9c24f3..7dc7c87f735 100644 --- a/src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java +++ b/src/main/java/org/opentripplanner/standalone/server/GrizzlyServer.java @@ -102,7 +102,7 @@ public void run() { httpServer.getServerConfiguration().addHttpHandler(dynamicHandler, "/otp/"); /* 2. A static content handler to serve the client JS apps etc. from the classpath. */ - if (OTPFeature.DebugClient.isOn()) { + if (OTPFeature.DebugUi.isOn()) { CLStaticHttpHandler staticHandler = new CLStaticHttpHandler( GrizzlyServer.class.getClassLoader(), "/client/" From 4b9889101a59b4cfce3704a7e6e23db8315f7b25 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 12:49:06 +0100 Subject: [PATCH 0224/1688] Update comment --- .../inspector/vector/stop/StopLayerBuilder.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java index 40784ab5b3b..70ce6a58735 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLayerBuilder.java @@ -8,11 +8,14 @@ import org.locationtech.jts.geom.Geometry; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; /** - * A vector tile layer containing all {@link RegularStop}s inside the vector tile bounds. + * A vector tile layer for {@link StopLocation}s inside the vector tile bounds. These can be further + * filtered to get only a subset of stop implementations like {@link RegularStop} + * or {@link AreaStop}. */ public class StopLayerBuilder extends LayerBuilder { From 2b65d5702838d92a71a84923fb81afd8eb765a5c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 13:14:20 +0100 Subject: [PATCH 0225/1688] Make mapStyle configurable --- client-next/.env | 3 ++- client-next/.env.development | 3 ++- client-next/src/components/MapView/MapView.tsx | 4 +++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/client-next/.env b/client-next/.env index 003970b4e1f..e8a9667bc23 100644 --- a/client-next/.env +++ b/client-next/.env @@ -1 +1,2 @@ -VITE_API_URL=/otp/routers/default/transmodel/index/graphql \ No newline at end of file +VITE_API_URL=/otp/routers/default/transmodel/index/graphql +VITE_DEBUG_STYLE_URL=/otp/routers/default/inspector/vectortile/style.json diff --git a/client-next/.env.development b/client-next/.env.development index e11b45c4411..b10ac31fdf9 100644 --- a/client-next/.env.development +++ b/client-next/.env.development @@ -1 +1,2 @@ -VITE_API_URL=http://localhost:8080/otp/routers/default/transmodel/index/graphql \ No newline at end of file +VITE_API_URL=http://localhost:8080/otp/routers/default/transmodel/index/graphql +VITE_DEBUG_STYLE_URL=http://localhost:8080/otp/routers/default/inspector/vectortile/style.json \ No newline at end of file diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 95c898c4a28..e401b1756e6 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -15,6 +15,8 @@ const initialViewState = { zoom: 4, }; +const styleUrl = import.meta.env.VITE_DEBUG_STYLE_URL; + type PopupData = { coordinates: LngLat; feature: MapboxGeoJSONFeature }; export function MapView({ @@ -40,7 +42,7 @@ export function MapView({ // @ts-ignore mapLib={import('maplibre-gl')} // @ts-ignore - mapStyle="http://localhost:8080/otp/routers/default/inspector/vectortile/style.json" + mapStyle={styleUrl} initialViewState={initialViewState} onDblClick={onMapDoubleClick} onContextMenu={(e) => { From 756a2890d67f805111250364d6822962fb0c7ae9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 13:16:58 +0100 Subject: [PATCH 0226/1688] Use proper copyright symbol --- .../org/opentripplanner/apis/vectortiles/DebugStyleSpec.java | 2 +- .../resources/org/opentripplanner/apis/vectortiles/style.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 9a4fe9be123..ff933901cf8 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -17,7 +17,7 @@ public class DebugStyleSpec { "background", List.of("https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"), 256, - "© OpenStreetMap Contributors" + "© OpenStreetMap Contributors" ); public record VectorSourceLayer(VectorSource vectorSource, String vectorLayer) {} diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index 6f95471a667..f5bb18f6f6a 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -7,7 +7,7 @@ "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png" ], "tileSize": 256, - "attribution" : "© OpenStreetMap Contributors", + "attribution" : "© OpenStreetMap Contributors", "type": "raster" }, "vectorSource": { From a3f55d5d69c87669b1779b7dee2aa6abe56a7b31 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 9 Jan 2024 14:59:20 +0200 Subject: [PATCH 0227/1688] Update src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java Co-authored-by: Leonard Ehrenfried --- .../api/request/preference/VehicleWalkingPreferences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java index 0abf2926f42..aa3631e1c6b 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java @@ -33,7 +33,7 @@ private VehicleWalkingPreferences() { } /** - * Sets the vehicle walking preferences and does some input value validation and rounds + * Sets the vehicle walking preferences, does some input value validation and rounds * reluctances and speed to not have too many decimals. */ private VehicleWalkingPreferences(Builder builder) { From c7497c7680b5ced640819927b6ac9bf04105b735 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 9 Jan 2024 15:14:30 +0100 Subject: [PATCH 0228/1688] refactor: Rename MaxLimitFilter to MAxLimit (it is not a filter) --- .../ItineraryListFilterChainBuilder.java | 86 +++++++++++-------- .../{MaxLimitFilter.java => MaxLimit.java} | 4 +- .../framework/spi/ItineraryListFilter.java | 4 +- .../framework/filter/GroupByFilterTest.java | 2 +- ...LimitFilterTest.java => MaxLimitTest.java} | 10 +-- 5 files changed, 58 insertions(+), 48 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/{MaxLimitFilter.java => MaxLimit.java} (87%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/{MaxLimitFilterTest.java => MaxLimitTest.java} (82%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index c95005acd32..ec14286e6ca 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -37,7 +37,7 @@ import org.opentripplanner.routing.algorithm.filterchain.filters.transit.group.RemoveOtherThanSameLegsMaxGeneralizedCost; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.DecorateFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimitFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimit; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.RemoveFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.SortingFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filterchain.DeleteResultHandler; @@ -373,12 +373,12 @@ public ItineraryListFilterChain build() { filters.addAll(buildGroupByTripIdAndDistanceFilters()); if (removeItinerariesWithSameRoutesAndStops) { - filters.addAll(buildGroupBySameRoutesAndStopsFilter()); + filters.add(buildGroupBySameRoutesAndStopsFilter()); } if (sameFirstOrLastTripFilter) { - filters.add(new SortingFilter(generalizedCostComparator())); - addRmFilter(filters, new RemoveIfFirstOrLastTripIsTheSame()); + addSort(filters, generalizedCostComparator()); + addRemoveFilter(filters, new RemoveIfFirstOrLastTripIsTheSame()); } if (minBikeParkingDistance > 0) { @@ -390,7 +390,7 @@ public ItineraryListFilterChain build() { // Filter transit itineraries on generalized-cost if (transitGeneralizedCostFilterParams != null) { - addRmFilter( + addRemoveFilter( filters, new TransitGeneralizedCostFilter( transitGeneralizedCostFilterParams.costLimitFunction(), @@ -401,7 +401,7 @@ public ItineraryListFilterChain build() { // Filter non-transit itineraries on generalized-cost if (nonTransitGeneralizedCostLimit != null) { - addRmFilter( + addRemoveFilter( filters, new RemoveNonTransitItinerariesBasedOnGeneralizedCost(nonTransitGeneralizedCostLimit) ); @@ -419,26 +419,26 @@ public ItineraryListFilterChain build() { { // Filter transit itineraries by comparing against non-transit using generalized-cost if (removeTransitWithHigherCostThanBestOnStreetOnly != null) { - addRmFilter( + addRemoveFilter( filters, new RemoveTransitIfStreetOnlyIsBetter(removeTransitWithHigherCostThanBestOnStreetOnly) ); } if (removeTransitIfWalkingIsBetter) { - addRmFilter(filters, new RemoveTransitIfWalkingIsBetter()); + addRemoveFilter(filters, new RemoveTransitIfWalkingIsBetter()); } if (removeWalkAllTheWayResults) { - addRmFilter(filters, new RemoveWalkOnlyFilter()); + addRemoveFilter(filters, new RemoveWalkOnlyFilter()); } if (bikeRentalDistanceRatio > 0) { - addRmFilter(filters, new RemoveBikeRentalWithMostlyWalking(bikeRentalDistanceRatio)); + addRemoveFilter(filters, new RemoveBikeRentalWithMostlyWalking(bikeRentalDistanceRatio)); } if (parkAndRideDurationRatio > 0) { - addRmFilter( + addRemoveFilter( filters, new RemoveParkAndRideWithMostlyWalkingFilter(parkAndRideDurationRatio) ); @@ -452,18 +452,24 @@ public ItineraryListFilterChain build() { { // Limit to search-window if (earliestDepartureTime != null) { - addRmFilter(filters, new OutsideSearchWindowFilter(earliestDepartureTime, searchWindow)); + addRemoveFilter( + filters, + new OutsideSearchWindowFilter(earliestDepartureTime, searchWindow) + ); } // Remove itineraries present in the page retrieved before this page/search. if (itineraryPageCut != null) { - addRmFilter(filters, new PagingFilter(sortOrder, deduplicateSection(), itineraryPageCut)); + addRemoveFilter( + filters, + new PagingFilter(sortOrder, deduplicateSection(), itineraryPageCut) + ); } // Remove itineraries if max limit is set if (maxNumberOfItineraries > 0) { - filters.add(new SortingFilter(SortOrderComparator.comparator(sortOrder))); - addRmFilter( + addSort(filters, SortOrderComparator.comparator(sortOrder)); + addRemoveFilter( filters, new NumItinerariesFilter( maxNumberOfItineraries, @@ -475,27 +481,30 @@ public ItineraryListFilterChain build() { } // Do the final itineraries sort - filters.add(new SortingFilter(SortOrderComparator.comparator(sortOrder))); + addSort(filters, SortOrderComparator.comparator(sortOrder)); // Decorate itineraries { if (transitAlertService != null) { - addDecorator(filters, new DecorateTransitAlert(transitAlertService, getMultiModalStation)); + addDecorateFilter( + filters, + new DecorateTransitAlert(transitAlertService, getMultiModalStation) + ); } // Sandbox filters to decorate itineraries if (accessibilityScore) { // TODO: This should be injected to avoid circular dependencies (dep. on sandbox here) - addDecorator(filters, new DecorateWithAccessibilityScore(wheelchairMaxSlope)); + addDecorateFilter(filters, new DecorateWithAccessibilityScore(wheelchairMaxSlope)); } if (emissionDecorator != null) { - addDecorator(filters, emissionDecorator); + addDecorateFilter(filters, emissionDecorator); } if (fareDecorator != null) { - addDecorator(filters, fareDecorator); + addDecorateFilter(filters, fareDecorator); } if (rideHailingDecorator != null) { @@ -503,7 +512,7 @@ public ItineraryListFilterChain build() { } if (stopConsolidationDecorator != null) { - addDecorator(filters, stopConsolidationDecorator); + addDecorateFilter(filters, stopConsolidationDecorator); } } @@ -517,22 +526,20 @@ public ItineraryListFilterChain build() { * These are sometimes called "time-shifted duplicates" but since those terms have so many * meanings we chose to use a long, but descriptive name instead. */ - private List buildGroupBySameRoutesAndStopsFilter() { - return List.of( - new GroupByFilter<>( - GroupBySameRoutesAndStops::new, - List.of( - new SortingFilter(SortOrderComparator.comparator(sortOrder)), - new RemoveFilter(new MaxLimitFilter(GroupBySameRoutesAndStops.TAG, 1)) - ) + private ItineraryListFilter buildGroupBySameRoutesAndStopsFilter() { + return new GroupByFilter<>( + GroupBySameRoutesAndStops::new, + List.of( + new SortingFilter(SortOrderComparator.comparator(sortOrder)), + new RemoveFilter(new MaxLimit(GroupBySameRoutesAndStops.TAG, 1)) ) ); } /** * These filters will group the itineraries by the main-legs and reduce the number of itineraries - * in each group. The main legs is the legs that together constitute more than a given　percentage - * of the total travel distance. + * in each group. The main legs are the legs that together constitute more than a given + * percentage of the total travel distance. *

    * Each group is filtered using generalized-cost, keeping only the itineraries with the lowest * cost. If there is a tie, the filter look at the number-of-transfers as a tiebreaker. @@ -567,7 +574,7 @@ private List buildGroupByTripIdAndDistanceFilters() { GroupByAllSameStations::new, List.of( new SortingFilter(generalizedCostComparator()), - new RemoveFilter(new MaxLimitFilter(innerGroupName, 1)) + new RemoveFilter(new MaxLimit(innerGroupName, 1)) ) ) ); @@ -576,12 +583,11 @@ private List buildGroupByTripIdAndDistanceFilters() { if (group.maxCostOtherLegsFactor > 1.0) { var flagger = new RemoveOtherThanSameLegsMaxGeneralizedCost(group.maxCostOtherLegsFactor); sysTags.add(flagger.name()); - addRmFilter(nested, flagger); + addRemoveFilter(nested, flagger); } - nested.add(new SortingFilter(generalizedCostComparator())); - - addRmFilter(nested, new MaxLimitFilter(tag, group.maxNumOfItinerariesPerGroup)); + addSort(nested, generalizedCostComparator()); + addRemoveFilter(nested, new MaxLimit(tag, group.maxNumOfItinerariesPerGroup)); nested.add(new KeepItinerariesWithFewestTransfers(sysTags)); @@ -597,14 +603,18 @@ private ListSection deduplicateSection() { return maxNumberOfItinerariesCropSection.invert(); } - private static void addRmFilter( + private static void addSort(List filters, SortOrderComparator comparator) { + filters.add(new SortingFilter(comparator)); + } + + private static void addRemoveFilter( List filters, RemoveItineraryFlagger removeFilter ) { filters.add(new RemoveFilter(removeFilter)); } - private static void addDecorator( + private static void addDecorateFilter( List filters, ItineraryDecorator decorator ) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimit.java similarity index 87% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimit.java index 4c786455dba..5ab1e88f730 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimit.java @@ -8,12 +8,12 @@ * Flags the itineraries at the end of the list for removal. The list should be sorted on the * desired key before this filter is applied. */ -public class MaxLimitFilter implements RemoveItineraryFlagger { +public class MaxLimit implements RemoveItineraryFlagger { private final String name; private final int maxLimit; - public MaxLimitFilter(String name, int maxLimit) { + public MaxLimit(String name, int maxLimit) { this.name = name; this.maxLimit = maxLimit; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java index c56b4fe42c9..b0a67ab147f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java @@ -2,7 +2,7 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimitFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimit; /** * Filter, sort or decorate itineraries. A filter can modify the elements in the list, but not the @@ -14,7 +14,7 @@ * chain. *

    * This allows decoration of each filter and makes it easier to reuse logic. Like the {@link - * MaxLimitFilter} is reused in + * MaxLimit} is reused in * several places. */ public interface ItineraryListFilter { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java index 8bf29be62fa..adecedce669 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/GroupByFilterTest.java @@ -97,7 +97,7 @@ private GroupByFilter createFilter(int maxNumberOfItinerariesPrGroup) i -> new AGroupId(i.firstLeg().getTrip().getId().getId()), List.of( new SortingFilter(SortOrderComparator.defaultComparatorDepartAfter()), - new RemoveFilter(new MaxLimitFilter(TEST_FILTER_TAG, maxNumberOfItinerariesPrGroup)) + new RemoveFilter(new MaxLimit(TEST_FILTER_TAG, maxNumberOfItinerariesPrGroup)) ) ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitTest.java similarity index 82% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitTest.java index 2fa10761c36..25d9188524d 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/MaxLimitTest.java @@ -9,7 +9,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -public class MaxLimitFilterTest implements PlanTestConstants { +public class MaxLimitTest implements PlanTestConstants { private static final Itinerary i1 = newItinerary(A, 6).walk(1, B).build(); private static final Itinerary i2 = newItinerary(A).bicycle(6, 8, B).build(); @@ -17,27 +17,27 @@ public class MaxLimitFilterTest implements PlanTestConstants { @Test public void name() { - MaxLimitFilter subject = new MaxLimitFilter("Test", 3); + MaxLimit subject = new MaxLimit("Test", 3); assertEquals("Test", subject.name()); } @Test public void testNormalFilterMaxLimit3() { - MaxLimitFilter subject = new MaxLimitFilter("Test", 3); + MaxLimit subject = new MaxLimit("Test", 3); List itineraries = List.of(i1, i2, i3); assertEquals(toStr(itineraries), toStr(subject.removeMatchesForTest(itineraries))); } @Test public void testNormalFilterMaxLimit1() { - MaxLimitFilter subject = new MaxLimitFilter("Test", 1); + MaxLimit subject = new MaxLimit("Test", 1); List itineraries = List.of(i1, i2, i3); assertEquals(toStr(List.of(i1)), toStr(subject.removeMatchesForTest(itineraries))); } @Test public void testNormalFilterMaxLimit0() { - MaxLimitFilter subject = new MaxLimitFilter("Test", 0); + MaxLimit subject = new MaxLimit("Test", 0); List itineraries = List.of(i1, i2, i3); var result = subject.removeMatchesForTest(itineraries); assertEquals(toStr(List.of()), toStr(result)); From 57bc7a3d4ae38445c8277763770e5a279392c96d Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 9 Jan 2024 15:02:54 +0000 Subject: [PATCH 0229/1688] Add changelog entry for #5592 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index e46b15cbd0f..9f755bd8f8f 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -69,6 +69,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Report and throw away trip-times which fail sanity check [#5587](https://github.com/opentripplanner/OpenTripPlanner/pull/5587) - Consider escalator edges in island pruning [#5591](https://github.com/opentripplanner/OpenTripPlanner/pull/5591) - Create own rental preferences for bike and car in the internal model [#5562](https://github.com/opentripplanner/OpenTripPlanner/pull/5562) +- Adding situation-version to TransmodelGraphQL API [#5592](https://github.com/opentripplanner/OpenTripPlanner/pull/5592) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 69bd96562f8f63a4aaec237292898709b15a62e1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 14:07:13 +0100 Subject: [PATCH 0230/1688] Add API mapper test for walk reluctance --- .../apis/gtfs/mapping/RouteRequestMapperTest.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java index f52b81717d4..b05dd77e2a9 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java @@ -2,6 +2,7 @@ import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.params.provider.Arguments.of; import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE_STREETS; @@ -195,6 +196,18 @@ void noTriangle(GraphQLTypes.GraphQLOptimizeType bot) { ); } + @Test + void walkReluctance() { + var reluctance = 119d; + Map arguments = Map.of("walkReluctance", reluctance); + + var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + assertEquals(reluctance, routeRequest.preferences().walk().reluctance()); + + var noParamsRequest = RouteRequestMapper.toRouteRequest(executionContext(Map.of()), context); + assertNotEquals(reluctance, noParamsRequest.preferences().walk().reluctance()); + } + private DataFetchingEnvironment executionContext(Map arguments) { ExecutionInput executionInput = ExecutionInput .newExecutionInput() From 9b075d2965c6c719f63900a95cc85a85f8a32e83 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 9 Jan 2024 17:48:42 +0200 Subject: [PATCH 0231/1688] Rename park cost/time --- docs/RouteRequest.md | 16 +++--- docs/RouterConfiguration.md | 8 +-- docs/examples/entur/router-config.json | 4 +- .../common/RequestToPreferencesMapper.java | 8 +-- .../model/DefaultRouteRequestType.java | 4 +- .../preference/VehicleParkingPreferences.java | 50 +++++++++---------- .../routerequest/VehicleParkingConfig.java | 12 ++--- .../street/model/edge/VehicleParkingEdge.java | 22 +++----- .../preference/BikePreferencesTest.java | 6 +-- .../preference/CarPreferencesTest.java | 6 +-- .../VehicleParkingPreferencesTest.java | 20 ++++---- .../street/integration/ParkAndRideTest.java | 8 +-- .../edge/StreetVehicleParkingLinkTest.java | 2 +- .../edge/VehicleParkingPreferredTagsTest.java | 2 +- .../standalone/config/router-config.json | 8 +-- 15 files changed, 83 insertions(+), 93 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index b95c58ec32f..06c7b55c521 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -57,8 +57,8 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |    reluctance | `double` | A multiplier for how bad cycling is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | |    speed | `double` | Max bicycle speed along streets, in meters per second | *Optional* | `5.0` | 2.0 | |    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | -|       parkCost | `integer` | Cost to park a vehicle. | *Optional* | `120` | 2.0 | -|       parkTime | `duration` | Time to park a vehicle. | *Optional* | `"PT1M"` | 2.0 | +|       cost | `integer` | Cost to park a vehicle. | *Optional* | `120` | 2.0 | +|       time | `duration` | Time to park a vehicle. | *Optional* | `"PT1M"` | 2.0 | |       [unpreferredVehicleParkingTagCost](#rd_bicycle_parking_unpreferredVehicleParkingTagCost) | `integer` | What cost to add if a parking facility doesn't contain a preferred tag. | *Optional* | `300` | 2.3 | |       [bannedVehicleParkingTags](#rd_bicycle_parking_bannedVehicleParkingTags) | `string[]` | Tags with which a vehicle parking will not be used. If empty, no tags are banned. | *Optional* | | 2.1 | |       [preferredVehicleParkingTags](#rd_bicycle_parking_preferredVehicleParkingTags) | `string[]` | Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. | *Optional* | | 2.3 | @@ -92,8 +92,8 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |    reluctance | `double` | A multiplier for how bad driving is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | |    speed | `double` | Max car speed along streets, in meters per second | *Optional* | `40.0` | 2.0 | |    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | -|       parkCost | `integer` | Cost to park a vehicle. | *Optional* | `120` | 2.0 | -|       parkTime | `duration` | Time to park a vehicle. | *Optional* | `"PT1M"` | 2.0 | +|       cost | `integer` | Cost to park a vehicle. | *Optional* | `120` | 2.0 | +|       time | `duration` | Time to park a vehicle. | *Optional* | `"PT1M"` | 2.0 | |       [unpreferredVehicleParkingTagCost](#rd_car_parking_unpreferredVehicleParkingTagCost) | `integer` | What cost to add if a parking facility doesn't contain a preferred tag. | *Optional* | `300` | 2.3 | |       [bannedVehicleParkingTags](#rd_car_parking_bannedVehicleParkingTags) | `string[]` | Tags with which a vehicle parking will not be used. If empty, no tags are banned. | *Optional* | | 2.1 | |       [preferredVehicleParkingTags](#rd_car_parking_preferredVehicleParkingTags) | `string[]` | Vehicle parking facilities that don't have one of these tags will receive an extra cost and will therefore be penalised. | *Optional* | | 2.3 | @@ -1071,8 +1071,8 @@ include stairs as a last result. "dropOffCost" : 30 }, "parking" : { - "parkTime" : "1m", - "parkCost" : 120 + "time" : "1m", + "cost" : 120 }, "triangle" : { "safety" : 0.4, @@ -1091,8 +1091,8 @@ include stairs as a last result. "dropOffCost" : 30 }, "parking" : { - "parkTime" : "5m", - "parkCost" : 600 + "time" : "5m", + "cost" : 600 } }, "walk" : { diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index f49a5bf9745..df08b852fd5 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -472,8 +472,8 @@ Used to group requests when monitoring OTP. "dropOffCost" : 30 }, "parking" : { - "parkTime" : "1m", - "parkCost" : 120 + "time" : "1m", + "cost" : 120 }, "triangle" : { "safety" : 0.4, @@ -492,8 +492,8 @@ Used to group requests when monitoring OTP. "dropOffCost" : 30 }, "parking" : { - "parkTime" : "5m", - "parkCost" : 600 + "time" : "5m", + "cost" : 600 } }, "walk" : { diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index cd8a393a3c3..ffdec9ded79 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -21,8 +21,8 @@ "dropOffCost": 30 }, "parking": { - "parkTime": "1m", - "parkCost": 120 + "time": "1m", + "cost": 120 } }, "car": { diff --git a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java index e4878e6c7d9..2a97cd63a75 100644 --- a/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/api/common/RequestToPreferencesMapper.java @@ -46,8 +46,8 @@ private void mapCar() { setIfNotNull(req.carReluctance, car::withReluctance); car.withParking(parking -> { mapParking(parking); - setIfNotNull(req.carParkCost, parking::withParkCost); - setIfNotNull(req.carParkTime, parking::withParkTime); + setIfNotNull(req.carParkCost, parking::withCost); + setIfNotNull(req.carParkTime, parking::withTime); }); car.withRental(this::mapRental); }); @@ -82,8 +82,8 @@ private void mapBike() { bike.withParking(parking -> { mapParking(parking); - setIfNotNull(req.bikeParkCost, parking::withParkCost); - setIfNotNull(req.bikeParkTime, parking::withParkTime); + setIfNotNull(req.bikeParkCost, parking::withCost); + setIfNotNull(req.bikeParkTime, parking::withTime); }); bike.withRental(this::mapRental); bike.withWalking(walk -> { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java index aadd73dcddb..80b6418c314 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java @@ -220,7 +220,7 @@ private GraphQLObjectType createGraphQLType() { .name("bikeParkTime") .description("Time to park a bike.") .type(Scalars.GraphQLInt) - .dataFetcher(env -> (int) preferences.bike().parking().parkTime().toSeconds()) + .dataFetcher(env -> (int) preferences.bike().parking().time().toSeconds()) .build() ) .field( @@ -229,7 +229,7 @@ private GraphQLObjectType createGraphQLType() { .name("bikeParkCost") .description("Cost to park a bike.") .type(Scalars.GraphQLInt) - .dataFetcher(env -> preferences.bike().parking().parkCost().toSeconds()) + .dataFetcher(env -> preferences.bike().parking().cost().toSeconds()) .build() ) .field( diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java index c02862c4d79..f7183812c3a 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferences.java @@ -23,16 +23,16 @@ public final class VehicleParkingPreferences implements Serializable { private final Cost unpreferredVehicleParkingTagCost; private final VehicleParkingFilter filter; private final VehicleParkingFilter preferred; - private final Duration parkTime; - private final Cost parkCost; + private final Duration time; + private final Cost cost; /** Create a new instance with default values. */ private VehicleParkingPreferences() { this.unpreferredVehicleParkingTagCost = Cost.costOfMinutes(5); this.filter = VehicleParkingFilter.empty(); this.preferred = VehicleParkingFilter.empty(); - this.parkTime = Duration.ofMinutes(1); - this.parkCost = Cost.costOfMinutes(2); + this.time = Duration.ofMinutes(1); + this.cost = Cost.costOfMinutes(2); } private VehicleParkingPreferences(Builder builder) { @@ -47,8 +47,8 @@ private VehicleParkingPreferences(Builder builder) { builder.notPreferredVehicleParkingTags, builder.preferredVehicleParkingTags ); - this.parkTime = builder.parkTime; - this.parkCost = builder.parkCost; + this.time = builder.time; + this.cost = builder.cost; } public static VehicleParkingPreferences.Builder of() { @@ -85,13 +85,13 @@ public VehicleParkingFilter preferred() { } /** Time to park a vehicle */ - public Duration parkTime() { - return parkTime; + public Duration time() { + return time; } /** Cost of parking a bike. */ - public Cost parkCost() { - return parkCost; + public Cost cost() { + return cost; } @Override @@ -103,14 +103,14 @@ public boolean equals(Object o) { Objects.equals(unpreferredVehicleParkingTagCost, that.unpreferredVehicleParkingTagCost) && Objects.equals(filter, that.filter) && Objects.equals(preferred, that.preferred) && - Objects.equals(parkCost, that.parkCost) && - Objects.equals(parkTime, that.parkTime) + Objects.equals(cost, that.cost) && + Objects.equals(time, that.time) ); } @Override public int hashCode() { - return Objects.hash(unpreferredVehicleParkingTagCost, filter, preferred, parkCost, parkTime); + return Objects.hash(unpreferredVehicleParkingTagCost, filter, preferred, cost, time); } @Override @@ -124,8 +124,8 @@ public String toString() { ) .addObj("filter", filter, DEFAULT.filter) .addObj("preferred", preferred, DEFAULT.preferred) - .addObj("parkCost", parkCost, DEFAULT.parkCost) - .addObj("parkTime", parkTime, DEFAULT.parkTime) + .addObj("cost", cost, DEFAULT.cost) + .addObj("time", time, DEFAULT.time) .toString(); } @@ -137,8 +137,8 @@ public static class Builder { private List requiredVehicleParkingTags; private List preferredVehicleParkingTags; private List notPreferredVehicleParkingTags; - private Cost parkCost; - private Duration parkTime; + private Cost cost; + private Duration time; private Builder(VehicleParkingPreferences original) { this.original = original; @@ -147,8 +147,8 @@ private Builder(VehicleParkingPreferences original) { this.requiredVehicleParkingTags = original.filter.select(); this.preferredVehicleParkingTags = original.preferred.select(); this.notPreferredVehicleParkingTags = original.preferred.not(); - this.parkCost = original.parkCost; - this.parkTime = original.parkTime; + this.cost = original.cost; + this.time = original.time; } public Builder withUnpreferredVehicleParkingTagCost(int cost) { @@ -180,18 +180,18 @@ public Builder withNotPreferredVehicleParkingTags(Set notPreferredVehicl return this; } - public Builder withParkCost(int cost) { - this.parkCost = Cost.costOfSeconds(cost); + public Builder withCost(int cost) { + this.cost = Cost.costOfSeconds(cost); return this; } - public Builder withParkTime(int seconds) { - this.parkTime = Duration.ofSeconds(seconds); + public Builder withTime(int seconds) { + this.time = Duration.ofSeconds(seconds); return this; } - public Builder withParkTime(Duration duration) { - this.parkTime = duration; + public Builder withTime(Duration duration) { + this.time = duration; return this; } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java index 951129bc7b7..b4afc67e31c 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java @@ -52,19 +52,19 @@ Vehicle parking tags can originate from different places depending on the origin ) .asStringSet(List.of()) ) - .withParkTime( + .withTime( c - .of("parkTime") + .of("time") .since(V2_0) .summary("Time to park a vehicle.") - .asDuration(VehicleParkingPreferences.DEFAULT.parkTime()) + .asDuration(VehicleParkingPreferences.DEFAULT.time()) ) - .withParkCost( + .withCost( c - .of("parkCost") + .of("cost") .since(V2_0) .summary("Cost to park a vehicle.") - .asInt(VehicleParkingPreferences.DEFAULT.parkCost().toSeconds()) + .asInt(VehicleParkingPreferences.DEFAULT.cost().toSeconds()) ) .withPreferredVehicleParkingTags( c diff --git a/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java b/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java index be909c1dc4c..d32f13d6ea4 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/VehicleParkingEdge.java @@ -94,20 +94,10 @@ protected State[] traverseUnPark(State s0) { if (streetMode.includesBiking()) { final BikePreferences bike = s0.getPreferences().bike(); - return traverseUnPark( - s0, - bike.parking().parkCost(), - bike.parking().parkTime(), - TraverseMode.BICYCLE - ); + return traverseUnPark(s0, bike.parking().cost(), bike.parking().time(), TraverseMode.BICYCLE); } else if (streetMode.includesDriving()) { final CarPreferences car = s0.getPreferences().car(); - return traverseUnPark( - s0, - car.parking().parkCost(), - car.parking().parkTime(), - TraverseMode.CAR - ); + return traverseUnPark(s0, car.parking().cost(), car.parking().time(), TraverseMode.CAR); } else { return State.empty(); } @@ -151,14 +141,14 @@ private State[] traversePark(State s0) { return traversePark( s0, - preferences.bike().parking().parkCost(), - preferences.bike().parking().parkTime() + preferences.bike().parking().cost(), + preferences.bike().parking().time() ); } else if (streetMode.includesDriving()) { return traversePark( s0, - preferences.car().parking().parkCost(), - preferences.car().parking().parkTime() + preferences.car().parking().cost(), + preferences.car().parking().time() ); } else { return State.empty(); diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java index a314aa48799..8a6ac3f4f45 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java @@ -27,7 +27,7 @@ class BikePreferencesTest { .withBoardCost(BOARD_COST) .withOptimizeType(OPTIMIZE_TYPE) .withRental(rental -> rental.withPickupTime(RENTAL_PICKUP_TIME).build()) - .withParking(parking -> parking.withParkCost(PARK_COST).build()) + .withParking(parking -> parking.withCost(PARK_COST).build()) .withOptimizeTriangle(it -> it.withSlope(1).build()) .build(); @@ -64,7 +64,7 @@ void rental() { @Test void parking() { - var vehicleParking = VehicleParkingPreferences.of().withParkCost(PARK_COST).build(); + var vehicleParking = VehicleParkingPreferences.of().withCost(PARK_COST).build(); assertEquals(vehicleParking, subject.parking()); } @@ -91,7 +91,7 @@ void testToString() { "speed: 2.0, " + "reluctance: 1.2, " + "boardCost: $660, " + - "parking: VehicleParkingPreferences{parkCost: $30}, " + + "parking: VehicleParkingPreferences{cost: $30}, " + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + "optimizeType: TRIANGLE, " + "optimizeTriangle: TimeSlopeSafetyTriangle[time=0.0, slope=1.0, safety=0.0]" + diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java index 3c0a294d7e2..4359ed9b33d 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java @@ -30,7 +30,7 @@ class CarPreferencesTest { .withAccelerationSpeed(ACCELERATION_SPEED) .withDecelerationSpeed(DECELERATION_SPEED) .withRental(rental -> rental.withPickupTime(RENTAL_PICKUP_TIME).build()) - .withParking(parking -> parking.withParkCost(PARK_COST).build()) + .withParking(parking -> parking.withCost(PARK_COST).build()) .build(); @Test @@ -71,7 +71,7 @@ void rental() { @Test void parking() { - var vehicleParking = VehicleParkingPreferences.of().withParkCost(PARK_COST).build(); + var vehicleParking = VehicleParkingPreferences.of().withCost(PARK_COST).build(); assertEquals(vehicleParking, subject.parking()); } @@ -94,7 +94,7 @@ void testToString() { "CarPreferences{" + "speed: 20.0, " + "reluctance: 5.1, " + - "parking: VehicleParkingPreferences{parkCost: $30}, " + + "parking: VehicleParkingPreferences{cost: $30}, " + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + "pickupTime: PT10M, " + "pickupCost: $500, " + diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java index 35666b53f9f..ff43a7ddba6 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleParkingPreferencesTest.java @@ -38,20 +38,20 @@ void unpreferredCost() { } @Test - void parkCost() { - assertEquals(PARKING_COST, subject.parkCost()); + void cost() { + assertEquals(PARKING_COST, subject.cost()); } @Test - void parkTime() { - assertEquals(PARKING_TIME, subject.parkTime()); + void time() { + assertEquals(PARKING_TIME, subject.time()); } @Test void testCopyOfEqualsAndHashCode() { // Create a copy, make a change and set it back again to force creating a new object - var other = subject.copyOf().withParkCost(10).build(); - var same = other.copyOf().withParkCost(PARKING_COST.toSeconds()).build(); + var other = subject.copyOf().withCost(10).build(); + var same = other.copyOf().withCost(PARKING_COST.toSeconds()).build(); assertEqualsAndHashCode(subject, other, same); } @@ -63,8 +63,8 @@ void testToString() { "unpreferredVehicleParkingTagCost: $360, " + "filter: VehicleParkingFilter{not: [tags=[not]], select: [tags=[bar]]}, " + "preferred: VehicleParkingFilter{not: [tags=[bar]], select: [tags=[foo]]}, " + - "parkCost: $240, " + - "parkTime: PT2M}", + "cost: $240, " + + "time: PT2M}", subject.toString() ); } @@ -81,8 +81,8 @@ private VehicleParkingPreferences createPreferences() { .withUnpreferredVehicleParkingTagCost(UNPREFERRED_COST) .withRequiredVehicleParkingTags(REQUIRED_TAGS) .withBannedVehicleParkingTags(BANNED_TAGS) - .withParkCost(PARKING_COST.toSeconds()) - .withParkTime(PARKING_TIME) + .withCost(PARKING_COST.toSeconds()) + .withTime(PARKING_TIME) .build(); } } diff --git a/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java b/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java index 6dd53ae0c6e..c4f7f52f4ec 100644 --- a/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java +++ b/src/test/java/org/opentripplanner/street/integration/ParkAndRideTest.java @@ -142,16 +142,16 @@ protected List runStreetSearchAndCreateDescriptor( b.withParking(parking -> { parking.withRequiredVehicleParkingTags(requiredTags); parking.withBannedVehicleParkingTags(bannedTags); - parking.withParkCost(120); - parking.withParkTime(60); + parking.withCost(120); + parking.withTime(60); }) ) .withCar(c -> c.withParking(parking -> { parking.withRequiredVehicleParkingTags(requiredTags); parking.withBannedVehicleParkingTags(bannedTags); - parking.withParkCost(240); - parking.withParkTime(180); + parking.withCost(240); + parking.withTime(180); }) ) ); diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java index a9932381b40..a2a052d3b5c 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java @@ -64,7 +64,7 @@ void foo(Set parkingTags, Set not, Set select, boolean s bike.withParking(parkingPreferences -> { parkingPreferences.withRequiredVehicleParkingTags(select); parkingPreferences.withBannedVehicleParkingTags(not); - parkingPreferences.withParkCost(0); + parkingPreferences.withCost(0); }); }) ); diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java index 41ecbe162bb..5969121b6d6 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java @@ -88,7 +88,7 @@ private void runTest( bike.withParking(parkingPreferences -> { parkingPreferences.withUnpreferredVehicleParkingTagCost(EXTRA_COST); parkingPreferences.withPreferredVehicleParkingTags(preferredTags); - parkingPreferences.withParkCost(0); + parkingPreferences.withCost(0); }); }) ); diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 9f6b336fde5..089c2481dca 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -33,8 +33,8 @@ "dropOffCost": 30 }, "parking": { - "parkTime": "1m", - "parkCost": 120 + "time": "1m", + "cost": 120 }, "triangle": { "safety": 0.4, @@ -53,8 +53,8 @@ "dropOffCost": 30 }, "parking": { - "parkTime": "5m", - "parkCost": 600 + "time": "5m", + "cost": 600 } }, "walk": { From 173df94640a2fa09351cdaa82568bb7f933041da Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 9 Jan 2024 17:59:47 +0200 Subject: [PATCH 0232/1688] Update docs --- docs/RouteRequest.md | 6 +++--- .../standalone/config/routerequest/RouteRequestConfig.java | 2 +- .../config/routerequest/VehicleWalkingConfig.java | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 06c7b55c521..f9a4e7e5d2f 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -79,7 +79,7 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       time | `double` | Relative importance of duration of travel (range 0-1). | *Optional* | `0.0` | 2.0 | |    walk | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | |       [hopCost](#rd_bicycle_walk_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | -|       [hopTime](#rd_bicycle_walk_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle in seconds. | *Optional* | `"PT0S"` | 2.0 | +|       [hopTime](#rd_bicycle_walk_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle. | *Optional* | `"PT0S"` | 2.0 | |       reluctance | `double` | A multiplier for how bad walking with a vehicle is, compared to being in transit for equal lengths of time. | *Optional* | `5.0` | 2.1 | |       speed | `double` | The user's vehicle walking speed in meters/second. Defaults to approximately 3 MPH. | *Optional* | `1.33` | 2.1 | |       stairsReluctance | `double` | How bad is it to walk the vehicle up/down a flight of stairs compared to taking a detour. | *Optional* | `10.0` | 2.3 | @@ -440,7 +440,7 @@ Sometimes there is a need to configure a longer alighting times for specific mod Prevents unnecessary transfers by adding a cost for boarding a transit vehicle. -This is the cost that is used when boarding while cycling.This is usually higher that walkBoardCost. +This is the cost that is used when boarding while cycling. This is usually higher that walkBoardCost.

    optimization

    @@ -541,7 +541,7 @@ not meant for controlling the cost of those events. **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` **Path:** /routingDefaults/bicycle/walk -The time it takes the user to hop on or off a vehicle in seconds. +The time it takes the user to hop on or off a vehicle. Time it takes to rent or park a vehicle have their own parameters and this is not meant for controlling the duration of those events. diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 8aaa0b1d243..6ee164f0083 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -362,7 +362,7 @@ private static void mapBikePreferences(NodeAdapter c, BikePreferences.Builder bu "Prevents unnecessary transfers by adding a cost for boarding a transit vehicle." ) .description( - "This is the cost that is used when boarding while cycling." + + "This is the cost that is used when boarding while cycling. " + "This is usually higher that walkBoardCost." ) .asInt(dft.boardCost()) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java index ac6ac7d92f4..6bc3bd3ffca 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java @@ -38,7 +38,7 @@ private static void mapVehicleWalkingPreferences( c .of("hopTime") .since(V2_0) - .summary("The time it takes the user to hop on or off a vehicle in seconds.") + .summary("The time it takes the user to hop on or off a vehicle.") .description( """ Time it takes to rent or park a vehicle have their own parameters and this is not meant From cdc09ca6e59bce534e4c4759955bfd902dec87f0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 17:16:31 +0100 Subject: [PATCH 0233/1688] Move server info classes back into main code --- .../org/opentripplanner/api}/model/serverinfo/ApiConfigInfo.java | 0 .../opentripplanner/api}/model/serverinfo/ApiProjectVersion.java | 0 .../org/opentripplanner/api}/model/serverinfo/ApiServerInfo.java | 0 .../api}/model/serverinfo/ApiVersionControlInfo.java | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename src/{ext/java/org/opentripplanner/ext/restapi => main/java/org/opentripplanner/api}/model/serverinfo/ApiConfigInfo.java (100%) rename src/{ext/java/org/opentripplanner/ext/restapi => main/java/org/opentripplanner/api}/model/serverinfo/ApiProjectVersion.java (100%) rename src/{ext/java/org/opentripplanner/ext/restapi => main/java/org/opentripplanner/api}/model/serverinfo/ApiServerInfo.java (100%) rename src/{ext/java/org/opentripplanner/ext/restapi => main/java/org/opentripplanner/api}/model/serverinfo/ApiVersionControlInfo.java (100%) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiConfigInfo.java b/src/main/java/org/opentripplanner/api/model/serverinfo/ApiConfigInfo.java similarity index 100% rename from src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiConfigInfo.java rename to src/main/java/org/opentripplanner/api/model/serverinfo/ApiConfigInfo.java diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiProjectVersion.java b/src/main/java/org/opentripplanner/api/model/serverinfo/ApiProjectVersion.java similarity index 100% rename from src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiProjectVersion.java rename to src/main/java/org/opentripplanner/api/model/serverinfo/ApiProjectVersion.java diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiServerInfo.java b/src/main/java/org/opentripplanner/api/model/serverinfo/ApiServerInfo.java similarity index 100% rename from src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiServerInfo.java rename to src/main/java/org/opentripplanner/api/model/serverinfo/ApiServerInfo.java diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiVersionControlInfo.java b/src/main/java/org/opentripplanner/api/model/serverinfo/ApiVersionControlInfo.java similarity index 100% rename from src/ext/java/org/opentripplanner/ext/restapi/model/serverinfo/ApiVersionControlInfo.java rename to src/main/java/org/opentripplanner/api/model/serverinfo/ApiVersionControlInfo.java From 3c8fd3ed0696b0a41e1f3e0a6999c8f372ee25b8 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 9 Jan 2024 20:26:26 +0100 Subject: [PATCH 0234/1688] review: Six spelling removeNone -> removeNon --- .../transit/AccessEgressFunctions.java | 10 ++-- .../rangeraptor/transit/AccessPaths.java | 8 +-- .../rangeraptor/transit/EgressPaths.java | 8 +-- .../transit/AccessEgressFunctionsTest.java | 50 +++++++++---------- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java index 275a0f85cf3..d4bf4d1ef92 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java @@ -81,10 +81,10 @@ private AccessEgressFunctions() {} * Filter non-optimal paths away for the standard search. This method does not * look at the c1 value. */ - static Collection removeNoneOptimalPathsForStandardRaptor( + static Collection removeNonOptimalPathsForStandardRaptor( Collection paths ) { - return removeNoneOptimalPaths(paths, STANDARD_COMPARATOR); + return removeNonOptimalPaths(paths, STANDARD_COMPARATOR); } /** @@ -92,10 +92,10 @@ static Collection removeNoneOptimalPathsForStandardRaptor( * not remove any paths since the caller should not pass in duplicates, but it turns out that * this happens, so we do it. */ - static Collection removeNoneOptimalPathsForMcRaptor( + static Collection removeNonOptimalPathsForMcRaptor( Collection paths ) { - var result = removeNoneOptimalPaths(paths, MC_COMPARATOR); + var result = removeNonOptimalPaths(paths, MC_COMPARATOR); if (LOG.isDebugEnabled() && result.size() < paths.size()) { var duplicates = new ArrayList<>(paths); duplicates.removeAll(result); @@ -137,7 +137,7 @@ static TIntObjectMap> groupByStop(Collection removeNoneOptimalPaths( + static Collection removeNonOptimalPaths( Collection paths, ParetoComparator comparator ) { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index dd757ac0415..5c26a10db23 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -1,8 +1,8 @@ package org.opentripplanner.raptor.rangeraptor.transit; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByRound; -import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForMcRaptor; -import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForStandardRaptor; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNonOptimalPathsForMcRaptor; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNonOptimalPathsForStandardRaptor; import gnu.trove.map.TIntObjectMap; import java.util.Arrays; @@ -59,9 +59,9 @@ public int calculateMaxNumberOfRides() { */ public static AccessPaths create(Collection paths, RaptorProfile profile) { if (profile.is(RaptorProfile.MULTI_CRITERIA)) { - paths = removeNoneOptimalPathsForMcRaptor(paths); + paths = removeNonOptimalPathsForMcRaptor(paths); } else { - paths = removeNoneOptimalPathsForStandardRaptor(paths); + paths = removeNonOptimalPathsForStandardRaptor(paths); } return new AccessPaths( groupByRound(paths, RaptorAccessEgress::stopReachedByWalking), diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java index a1688ff8f5b..374fc050782 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java @@ -2,8 +2,8 @@ import static org.opentripplanner.raptor.api.request.RaptorProfile.MULTI_CRITERIA; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByStop; -import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForMcRaptor; -import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForStandardRaptor; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNonOptimalPathsForMcRaptor; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNonOptimalPathsForStandardRaptor; import gnu.trove.map.TIntObjectMap; import java.util.Collection; @@ -33,9 +33,9 @@ private EgressPaths(TIntObjectMap> pathsByStop) { */ public static EgressPaths create(Collection paths, RaptorProfile profile) { if (MULTI_CRITERIA.is(profile)) { - paths = removeNoneOptimalPathsForMcRaptor(paths); + paths = removeNonOptimalPathsForMcRaptor(paths); } else { - paths = removeNoneOptimalPathsForStandardRaptor(paths); + paths = removeNonOptimalPathsForStandardRaptor(paths); } return new EgressPaths(groupByStop(paths)); } diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java index 041d74786d7..1d4f90557b0 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctionsTest.java @@ -6,8 +6,8 @@ import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flexAndWalk; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByRound; import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.groupByStop; -import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForMcRaptor; -import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNoneOptimalPathsForStandardRaptor; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNonOptimalPathsForMcRaptor; +import static org.opentripplanner.raptor.rangeraptor.transit.AccessEgressFunctions.removeNonOptimalPathsForStandardRaptor; import java.util.Arrays; import java.util.Collection; @@ -48,127 +48,127 @@ class AccessEgressFunctionsTest implements RaptorTestConstants { .openingHours(T00_10, T01_00); @Test - void removeNoneOptimalPathsForStandardRaptorTest() { + void removeNonOptimalPathsForStandardRaptorTest() { // Empty set - assertElements(List.of(), removeNoneOptimalPathsForStandardRaptor(List.of())); + assertElements(List.of(), removeNonOptimalPathsForStandardRaptor(List.of())); // One element - assertElements(List.of(WALK_8m), removeNoneOptimalPathsForStandardRaptor(List.of(WALK_8m))); + assertElements(List.of(WALK_8m), removeNonOptimalPathsForStandardRaptor(List.of(WALK_8m))); // Shortest duration assertElements( List.of(WALK_8m), - removeNoneOptimalPathsForStandardRaptor(List.of(WALK_8m, WALK_10m)) + removeNonOptimalPathsForStandardRaptor(List.of(WALK_8m, WALK_10m)) ); // Fewest rides assertElements( List.of(FLEX_1x_8m), - removeNoneOptimalPathsForStandardRaptor(List.of(FLEX_1x_8m, FLEX_2x_8m)) + removeNonOptimalPathsForStandardRaptor(List.of(FLEX_1x_8m, FLEX_2x_8m)) ); // Arriving at the stop on-board, and by-foot. // OnBoard is better because we can do a transfer walk to nearby stops. assertElements( List.of(FLEX_1x_8m), - removeNoneOptimalPathsForStandardRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_8m)) + removeNonOptimalPathsForStandardRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_8m)) ); // Flex+walk is faster, flex arrive on-board, both is optimal assertElements( List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m), - removeNoneOptimalPathsForStandardRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m)) + removeNonOptimalPathsForStandardRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m)) ); // Walk has few rides, and Flex is faster - both is optimal assertElements( List.of(WALK_10m, FLEX_1x_8m), - removeNoneOptimalPathsForStandardRaptor(List.of(WALK_10m, FLEX_1x_8m)) + removeNonOptimalPathsForStandardRaptor(List.of(WALK_10m, FLEX_1x_8m)) ); // Walk without opening hours is better than with, because it can be time-shifted without // any constraints assertElements( List.of(WALK_8m), - removeNoneOptimalPathsForStandardRaptor(List.of(WALK_8m, WALK_W_OPENING_HOURS_8m)) + removeNonOptimalPathsForStandardRaptor(List.of(WALK_8m, WALK_W_OPENING_HOURS_8m)) ); // Walk with opening hours can NOT dominate another access/egress without - even if it is // faster. The reason is that it may not be allowed to time-shift it to the desired time. assertElements( List.of(WALK_10m, WALK_W_OPENING_HOURS_8m), - removeNoneOptimalPathsForStandardRaptor(List.of(WALK_10m, WALK_W_OPENING_HOURS_8m)) + removeNonOptimalPathsForStandardRaptor(List.of(WALK_10m, WALK_W_OPENING_HOURS_8m)) ); // If two paths both have opening hours, both should be accepted. assertElements( List.of(WALK_W_OPENING_HOURS_8m, WALK_W_OPENING_HOURS_8m_OTHER), - removeNoneOptimalPathsForStandardRaptor( + removeNonOptimalPathsForStandardRaptor( List.of(WALK_W_OPENING_HOURS_8m, WALK_W_OPENING_HOURS_8m_OTHER) ) ); } @Test - void removeNoneOptimalPathsForMcRaptorTest() { + void removeNonOptimalPathsForMcRaptorTest() { // Empty set - assertElements(List.of(), removeNoneOptimalPathsForMcRaptor(List.of())); + assertElements(List.of(), removeNonOptimalPathsForMcRaptor(List.of())); // One element - assertElements(List.of(WALK_8m), removeNoneOptimalPathsForMcRaptor(List.of(WALK_8m))); + assertElements(List.of(WALK_8m), removeNonOptimalPathsForMcRaptor(List.of(WALK_8m))); // Lowest cost assertElements( List.of(WALK_10m_C1_LOW), - removeNoneOptimalPathsForMcRaptor(List.of(WALK_10m, WALK_10m_C1_LOW)) + removeNonOptimalPathsForMcRaptor(List.of(WALK_10m, WALK_10m_C1_LOW)) ); // Shortest duration - assertElements(List.of(WALK_8m), removeNoneOptimalPathsForMcRaptor(List.of(WALK_8m, WALK_10m))); + assertElements(List.of(WALK_8m), removeNonOptimalPathsForMcRaptor(List.of(WALK_8m, WALK_10m))); // Fewest rides assertElements( List.of(FLEX_1x_8m), - removeNoneOptimalPathsForMcRaptor(List.of(FLEX_1x_8m, FLEX_2x_8m)) + removeNonOptimalPathsForMcRaptor(List.of(FLEX_1x_8m, FLEX_2x_8m)) ); // Arriving at the stop on-board, and by-foot. // OnBoard is better because we can do a transfer walk to nearby stops. assertElements( List.of(FLEX_1x_8m), - removeNoneOptimalPathsForMcRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_8m)) + removeNonOptimalPathsForMcRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_8m)) ); // Flex+walk is faster, flex arrive on-board, both is optimal assertElements( List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m), - removeNoneOptimalPathsForStandardRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m)) + removeNonOptimalPathsForStandardRaptor(List.of(FLEX_AND_WALK_1x_8m, FLEX_1x_10m)) ); // Walk has few rides, and Flex is faster - both is optimal assertElements( List.of(WALK_10m, FLEX_1x_8m), - removeNoneOptimalPathsForMcRaptor(List.of(WALK_10m, FLEX_1x_8m)) + removeNonOptimalPathsForMcRaptor(List.of(WALK_10m, FLEX_1x_8m)) ); // Walk without opening hours is better than with, because it can be time-shifted without // any constraints assertElements( List.of(WALK_8m), - removeNoneOptimalPathsForMcRaptor(List.of(WALK_8m, WALK_W_OPENING_HOURS_8m)) + removeNonOptimalPathsForMcRaptor(List.of(WALK_8m, WALK_W_OPENING_HOURS_8m)) ); // Walk with opening hours can NOT dominate another access/egress without - even if it is // faster. The reason is that it may not be allowed to time-shift it to the desired time. assertElements( List.of(WALK_10m, WALK_W_OPENING_HOURS_8m), - removeNoneOptimalPathsForMcRaptor(List.of(WALK_10m, WALK_W_OPENING_HOURS_8m)) + removeNonOptimalPathsForMcRaptor(List.of(WALK_10m, WALK_W_OPENING_HOURS_8m)) ); // If two paths both have opening hours, both should be accepted. assertElements( List.of(WALK_W_OPENING_HOURS_8m, WALK_W_OPENING_HOURS_8m_OTHER), - removeNoneOptimalPathsForMcRaptor( + removeNonOptimalPathsForMcRaptor( List.of(WALK_W_OPENING_HOURS_8m, WALK_W_OPENING_HOURS_8m_OTHER) ) ); From de319cdf178a35f85e114d28945ab5c51e9cb2ad Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 9 Jan 2024 20:30:21 +0100 Subject: [PATCH 0235/1688] review: Make sure ParetoComparator is as readable as possible using white-space. --- .../rangeraptor/transit/AccessEgressFunctions.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java index d4bf4d1ef92..1ab737ae907 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessEgressFunctions.java @@ -29,7 +29,7 @@ public final class AccessEgressFunctions { private static final Logger LOG = LoggerFactory.getLogger(AccessEgressFunctions.class); /** - * Filter standard(not multi-criteria) Raptor access and egress paths. A path is pareto optimal + * Filter standard (not multi-criteria) Raptor access and egress paths. A path is pareto optimal * for a given stop if *
      *
    1. @@ -53,8 +53,7 @@ public final class AccessEgressFunctions { */ private static final ParetoComparator STANDARD_COMPARATOR = (l, r) -> ( - l.stopReachedOnBoard() && - !r.stopReachedOnBoard() || + (l.stopReachedOnBoard() && !r.stopReachedOnBoard()) || r.hasOpeningHours() || l.numberOfRides() < r.numberOfRides() || l.durationInSeconds() < r.durationInSeconds() @@ -66,13 +65,7 @@ public final class AccessEgressFunctions { * Raptor - it is a bug. */ private static final ParetoComparator MC_COMPARATOR = (l, r) -> - ( - (l.stopReachedOnBoard() && !r.stopReachedOnBoard()) || - r.hasOpeningHours() || - l.numberOfRides() < r.numberOfRides() || - l.durationInSeconds() < r.durationInSeconds() || - l.c1() < r.c1() - ); + STANDARD_COMPARATOR.leftDominanceExist(l, r) || l.c1() < r.c1(); /** private constructor to prevent instantiation of utils class. */ private AccessEgressFunctions() {} From 8dab384d3238c79b244b42f06a5a8e29953af0d4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:15:51 +0000 Subject: [PATCH 0236/1688] chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.2.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a75ffb6143..6e11c31a951 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.3 + 3.2.5 me.fabriciorby From f2c18a3416bd7f57ba4fad2c544aa88cc7a9d0a5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 10 Jan 2024 00:15:57 +0000 Subject: [PATCH 0237/1688] fix(deps): update slf4j.version to v2.0.11 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e11c31a951..d2fd4a0515c 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 5.5.3 1.4.14 9.9.1 - 2.0.10 + 2.0.11 2.0.15 1.26 4.0.4 From 4acb6ed47867359c9d2da99b164634ebf10cd8b6 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Wed, 10 Jan 2024 14:51:45 +0000 Subject: [PATCH 0238/1688] Upgrade debug client to version 2024/01/2024-01-10T14:51 --- src/client/debug-client-preview/index.html | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 src/client/debug-client-preview/index.html diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html new file mode 100644 index 00000000000..8cbe7422def --- /dev/null +++ b/src/client/debug-client-preview/index.html @@ -0,0 +1,15 @@ + + + + + + + OTP Debug Client + + + + +
      + + + From b2fc0a1395d8d14c30bbd323ca56758b2de26dc1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 16:00:26 +0100 Subject: [PATCH 0239/1688] Don't run performance tests for client update PRs --- .github/workflows/performance-test.yml | 2 +- client-next/README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index c2168a79a06..a5274d9839f 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -7,7 +7,7 @@ on: jobs: perf-test: - if: github.repository_owner == 'opentripplanner' && !startsWith(github.event.head_commit.message ,'Bump serialization version id for') + if: github.repository_owner == 'opentripplanner' && !startsWith(github.event.head_commit.message ,'Bump serialization version id for') && !startsWith(github.event.head_commit.message ,'Upgrade debug client to version') runs-on: performance-test strategy: fail-fast: false diff --git a/client-next/README.md b/client-next/README.md index a00a5d094ad..a6c8e76cfad 100644 --- a/client-next/README.md +++ b/client-next/README.md @@ -62,4 +62,4 @@ or add it to a new `.env.development.local` file (this file will be ignored by g In production mode, the default is to access OTP via the same origin as the client (see `.env`). This behavior can also be modified by changing the previously mentioned environment variable at -build-time.. +build-time. From d7e9ecd98c720dfd9056dc33c280fd882e5d23a3 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Wed, 10 Jan 2024 15:01:24 +0000 Subject: [PATCH 0240/1688] Upgrade debug client to version 2024/01/2024-01-10T15:00 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 8cbe7422def..dfb4915efcc 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From 4b7cffa65b032e57925eb16b4807e45e0b385d7e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 16:41:32 +0100 Subject: [PATCH 0241/1688] Update dev meeting calendar instructions --- docs/Developers-Guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/Developers-Guide.md b/docs/Developers-Guide.md index e12d9cf6c1b..8a68f83f301 100644 --- a/docs/Developers-Guide.md +++ b/docs/Developers-Guide.md @@ -63,8 +63,8 @@ There are several ways to get involved: * Create pull requests citing the relevant issue. -* Join developer meetings hosted twice a week. Check the specific times - on [this calendar](https://calendar.google.com/calendar/u/0/embed?src=ormbltvsqb6adl80ejgudt0glc@group.calendar.google.com) +* Join developer meetings hosted twice a week. Check the specific times and URLs + on [this page](https://github.com/opentripplanner/OpenTripPlanner/blob/dev-2.x/CONTRIBUTING.md#developer-meetings) ### Branches and Branch Protection From 41b5cf0fce39a93b59f4dbbca22134cf748217f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Wed, 10 Jan 2024 22:20:11 +0100 Subject: [PATCH 0242/1688] Improve: Pin all dependencies, past and future --- client-next/.npmrc | 1 + client-next/package-lock.json | 50 +++++++++++++++++------------------ client-next/package.json | 50 +++++++++++++++++------------------ 3 files changed, 51 insertions(+), 50 deletions(-) create mode 100644 client-next/.npmrc diff --git a/client-next/.npmrc b/client-next/.npmrc new file mode 100644 index 00000000000..449691b70fd --- /dev/null +++ b/client-next/.npmrc @@ -0,0 +1 @@ +save-exact=true \ No newline at end of file diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 85a29784489..19909ba109d 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -8,36 +8,36 @@ "name": "otp-debug-client-next", "version": "0.0.0", "dependencies": { - "@googlemaps/polyline-codec": "^1.0.28", - "bootstrap": "^5.3.1", - "graphql": "^16.8.0", - "graphql-request": "^6.1.0", - "maplibre-gl": "^3.3.0", - "react": "^18.2.0", - "react-bootstrap": "^2.8.0", - "react-dom": "^18.2.0", - "react-map-gl": "^7.1.5" + "@googlemaps/polyline-codec": "1.0.28", + "bootstrap": "5.3.1", + "graphql": "16.8.0", + "graphql-request": "6.1.0", + "maplibre-gl": "3.3.0", + "react": "18.2.0", + "react-bootstrap": "2.8.0", + "react-dom": "18.2.0", + "react-map-gl": "7.1.5" }, "devDependencies": { "@graphql-codegen/cli": "5.0.0", "@graphql-codegen/client-preset": "4.1.0", "@graphql-codegen/introspection": "4.0.0", - "@parcel/watcher": "^2.3.0", - "@types/react": "^18.2.15", - "@types/react-dom": "^18.2.7", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "@vitejs/plugin-react": "^4.0.3", - "eslint": "^8.45.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-react": "^7.33.2", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.4.3", - "prettier": "^3.0.3", - "typescript": "^5.2.2", - "vite": "^4.4.5" + "@parcel/watcher": "2.3.0", + "@types/react": "18.2.21", + "@types/react-dom": "18.2.7", + "@typescript-eslint/eslint-plugin": "6.5.0", + "@typescript-eslint/parser": "6.5.0", + "@vitejs/plugin-react": "4.0.4", + "eslint": "8.48.0", + "eslint-config-prettier": "9.0.0", + "eslint-plugin-import": "2.28.1", + "eslint-plugin-jsx-a11y": "6.7.1", + "eslint-plugin-react": "7.33.2", + "eslint-plugin-react-hooks": "4.6.0", + "eslint-plugin-react-refresh": "0.4.3", + "prettier": "3.0.3", + "typescript": "5.2.2", + "vite": "4.4.9" } }, "node_modules/@aashutoshrathi/word-wrap": { diff --git a/client-next/package.json b/client-next/package.json index 4d453ed37ca..79d2c7942f1 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -15,35 +15,35 @@ "codegen": "graphql-codegen --config codegen.ts" }, "dependencies": { - "@googlemaps/polyline-codec": "^1.0.28", - "bootstrap": "^5.3.1", - "graphql": "^16.8.0", - "graphql-request": "^6.1.0", - "maplibre-gl": "^3.3.0", - "react": "^18.2.0", - "react-bootstrap": "^2.8.0", - "react-dom": "^18.2.0", - "react-map-gl": "^7.1.5" + "@googlemaps/polyline-codec": "1.0.28", + "bootstrap": "5.3.1", + "graphql": "16.8.0", + "graphql-request": "6.1.0", + "maplibre-gl": "3.3.0", + "react": "18.2.0", + "react-bootstrap": "2.8.0", + "react-dom": "18.2.0", + "react-map-gl": "7.1.5" }, "devDependencies": { "@graphql-codegen/cli": "5.0.0", "@graphql-codegen/client-preset": "4.1.0", "@graphql-codegen/introspection": "4.0.0", - "@parcel/watcher": "^2.3.0", - "@types/react": "^18.2.15", - "@types/react-dom": "^18.2.7", - "@typescript-eslint/eslint-plugin": "^6.0.0", - "@typescript-eslint/parser": "^6.0.0", - "@vitejs/plugin-react": "^4.0.3", - "eslint": "^8.45.0", - "eslint-config-prettier": "^9.0.0", - "eslint-plugin-import": "^2.28.1", - "eslint-plugin-jsx-a11y": "^6.7.1", - "eslint-plugin-react": "^7.33.2", - "eslint-plugin-react-hooks": "^4.6.0", - "eslint-plugin-react-refresh": "^0.4.3", - "prettier": "^3.0.3", - "typescript": "^5.2.2", - "vite": "^4.4.5" + "@parcel/watcher": "2.3.0", + "@types/react": "18.2.21", + "@types/react-dom": "18.2.7", + "@typescript-eslint/eslint-plugin": "6.5.0", + "@typescript-eslint/parser": "6.5.0", + "@vitejs/plugin-react": "4.0.4", + "eslint": "8.48.0", + "eslint-config-prettier": "9.0.0", + "eslint-plugin-import": "2.28.1", + "eslint-plugin-jsx-a11y": "6.7.1", + "eslint-plugin-react": "7.33.2", + "eslint-plugin-react-hooks": "4.6.0", + "eslint-plugin-react-refresh": "0.4.3", + "prettier": "3.0.3", + "typescript": "5.2.2", + "vite": "4.4.9" } } From c99c52cea163f0c93330577d7bda0fbf2a827476 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 11 Jan 2024 01:45:35 +0100 Subject: [PATCH 0243/1688] Update src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java Co-authored-by: Leonard Ehrenfried --- .../RemoveItinerariesWithShortStreetLeg.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java index 010828c4cff..3f587840690 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java @@ -11,13 +11,15 @@ * leg followed by parking the bike and taking transit. In such a case you would not need a bike * could just walk to the stop instead. *

      - * TODO: THIS FILTER DOES NOT FOLLOW THE ITINERARY FILTER FRAMEWORK. This filter should implement the - * {@link org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger}. - * - * TODO: This filter build on assumptions that is more or less an implementation detail. The - * filter should compare itineraries and remove them if a condition is meet, not just - * assume that a better option exist. Perhaps the access and egress should be filtered - * instead of filtering the transit itineraries? + * This filter does not follow the regular filter framework as it is intended only for use cases where + * several queries are combined in the frontend. + *

      + * Example: you have two queries for bike+transit and walk+transit each. Both give you very short legs + * to reach a train station. A user would not expect to see a bike+transit shorted than 200m leg when it's + * presented right next to a walk+transit leg of the same length. + *

      + * In other words, this offloads the comparison part of the filter chain to a system outside of OTP and + * that is the reason for this non-standard approach. */ public class RemoveItinerariesWithShortStreetLeg implements ItineraryListFilter { From bdb5355ca8e08111c45a6a06089879097059a674 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 11 Jan 2024 07:03:32 +0000 Subject: [PATCH 0244/1688] Add changelog entry for #5580 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 9f755bd8f8f..23bf7b11ad7 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -70,6 +70,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Consider escalator edges in island pruning [#5591](https://github.com/opentripplanner/OpenTripPlanner/pull/5591) - Create own rental preferences for bike and car in the internal model [#5562](https://github.com/opentripplanner/OpenTripPlanner/pull/5562) - Adding situation-version to TransmodelGraphQL API [#5592](https://github.com/opentripplanner/OpenTripPlanner/pull/5592) +- Move REST API into sandbox [#5580](https://github.com/opentripplanner/OpenTripPlanner/pull/5580) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 8a67be4e70b33b6a63a34b6080d79a1e22778785 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 09:59:47 +0100 Subject: [PATCH 0245/1688] Apply review feedback --- .github/workflows/performance-test.yml | 1 - .../opentripplanner/street/search/state/TestStateBuilder.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index d764fdbeff0..c2168a79a06 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -4,7 +4,6 @@ on: push: branches: - dev-2.x - - max-count-rental jobs: perf-test: diff --git a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java index 752985de51e..a4dbf76e55e 100644 --- a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java +++ b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java @@ -93,7 +93,7 @@ public static TestStateBuilder ofScooterRental() { } /** - * Creates a state starts the scooter rental but in arriveBy mode, so therefore starting with + * Creates a state that starts the scooter rental in arriveBy mode, so starting with * a rental scooter and going backwards until it finds a rental vertex where to drop it. */ public static TestStateBuilder ofScooterRentalArriveBy() { From 43438baf59cd6a734859b509bd932aaa711d9c6f Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 11 Jan 2024 09:11:03 +0000 Subject: [PATCH 0246/1688] Add changelog entry for #5605 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 23bf7b11ad7..7458295b9ba 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -71,6 +71,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Create own rental preferences for bike and car in the internal model [#5562](https://github.com/opentripplanner/OpenTripPlanner/pull/5562) - Adding situation-version to TransmodelGraphQL API [#5592](https://github.com/opentripplanner/OpenTripPlanner/pull/5592) - Move REST API into sandbox [#5580](https://github.com/opentripplanner/OpenTripPlanner/pull/5580) +- Fix high walk reluctance leading to zero egress results for rental searches [#5605](https://github.com/opentripplanner/OpenTripPlanner/pull/5605) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 5972e5d4260192621c62be4019c63f71f327c005 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 10:26:37 +0100 Subject: [PATCH 0247/1688] Resolve merge artifacts --- .../inspector/vector/stop/StopLocationPropertyMapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java index 44729bcb407..ab9685dd0f6 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/StopLocationPropertyMapper.java @@ -5,13 +5,13 @@ import java.util.Collection; import java.util.List; import java.util.Locale; -import org.opentripplanner.api.mapping.I18NStringMapper; -import org.opentripplanner.api.mapping.PropertyMapper; +import org.opentripplanner.apis.support.mapping.PropertyMapper; +import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.site.StopLocation; /** - * A {@link PropertyMapper} for the {@link AreaStopsLayerBuilder} for the OTP debug client. + * A {@link PropertyMapper} for the {@link StopLocationPropertyMapper} for the OTP debug client. */ public class StopLocationPropertyMapper extends PropertyMapper { From 4fd4325127655df8f0fb7c0ea26a672b961e7e2d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 10:27:32 +0100 Subject: [PATCH 0248/1688] Update docs --- docs/Configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Configuration.md b/docs/Configuration.md index b376b6b91dc..d43ff150926 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -241,7 +241,7 @@ Here is a list of all features which can be toggled on/off and their default val | `FaresV2` | Enable import of GTFS-Fares v2 data. | | ✓️ | | `FlexRouting` | Enable FLEX routing. | | ✓️ | | `GoogleCloudStorage` | Enable Google Cloud Storage integration. | | ✓️ | -| `LegacyRestApi` | Enable legacy REST API. This API will be removed in the future. | ✓️ | ✓️ | +| `LegacyRestApi` | Enable legacy REST API. This API will be removed in the future. | ✓️ | ✓️ | | `RealtimeResolver` | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data | | ✓️ | | `ReportApi` | Enable the report API. | | ✓️ | | `RestAPIPassInDefaultConfigAsJson` | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY! | | | From f4fc5aaf868a48a68eeb6231aa90e1017da89325 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Thu, 11 Jan 2024 10:37:56 +0100 Subject: [PATCH 0249/1688] Enable renovate for debug ui, group non-major --- renovate.json5 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index 42e7552c338..19f2c097e21 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -32,7 +32,9 @@ }, { "matchFiles": ["client-next/package.json"], - "enabled": false + "matchUpdateTypes": ["patch", "minor"], + "groupName": "Debug UI dependencies (non-major)", + "schedule": ["on the first day of the week"] }, // gbfs-java-model patch releases are automatic dependency upgrades so we automerge { From c5dc28984a83a968660c2478c2a6b3301fa7a6d4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 12:14:00 +0100 Subject: [PATCH 0250/1688] Apply review feedback --- .../MapView/GeometryPropertyPopup.tsx | 27 ++++++++++++ .../src/components/MapView/MapView.tsx | 43 +++++++++---------- 2 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 client-next/src/components/MapView/GeometryPropertyPopup.tsx diff --git a/client-next/src/components/MapView/GeometryPropertyPopup.tsx b/client-next/src/components/MapView/GeometryPropertyPopup.tsx new file mode 100644 index 00000000000..d2b55689270 --- /dev/null +++ b/client-next/src/components/MapView/GeometryPropertyPopup.tsx @@ -0,0 +1,27 @@ +import { LngLat, Popup } from 'react-map-gl'; +import { Table } from 'react-bootstrap'; + +export function GeometryPropertyPopup({ + coordinates, + properties, + onClose, +}: { + coordinates: LngLat; + properties: { [s: string]: string }; + onClose: () => void; +}) { + return ( + onClose()}> + + + {Object.entries(properties).map(([key, value]) => ( + + + + + ))} + +
      {key}{value}
      +       + ); +} diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index e401b1756e6..1b17e31cb88 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -1,4 +1,4 @@ -import { LngLat, Map, MapboxGeoJSONFeature, NavigationControl, Popup } from 'react-map-gl'; +import { LngLat, Map, MapboxGeoJSONFeature, NavigationControl } from 'react-map-gl'; import 'maplibre-gl/dist/maplibre-gl.css'; import { TripPattern, TripQuery, TripQueryVariables } from '../../gql/graphql.ts'; import { NavigationMarkers } from './NavigationMarkers.tsx'; @@ -6,7 +6,7 @@ import { LegLines } from './LegLines.tsx'; import { useMapDoubleClick } from './useMapDoubleClick.ts'; import { useState } from 'react'; import { ContextMenuPopup } from './ContextMenuPopup.tsx'; -import { Table } from 'react-bootstrap'; +import { GeometryPropertyPopup } from './GeometryPropertyPopup.tsx'; // TODO: this should be configurable const initialViewState = { @@ -35,6 +35,20 @@ export function MapView({ const onMapDoubleClick = useMapDoubleClick({ tripQueryVariables, setTripQueryVariables }); const [showContextPopup, setShowContextPopup] = useState(null); const [showPropsPopup, setShowPropsPopup] = useState(null); + const showFeaturePropPopup = ( + e: mapboxgl.MapMouseEvent & { + features?: mapboxgl.MapboxGeoJSONFeature[] | undefined; + }, + setShowPropsPopup: (value: ((prevState: PopupData | null) => PopupData | null) | PopupData | null) => void, + ) => { + if (e.features) { + // if you click on a cluster of map features it's possible that there are multiple + // to select from. we are using the first one instead of presenting a selection UI. + // you can always zoom in closer if you want to make a more specific click. + const feature = e.features[0]; + setShowPropsPopup({ coordinates: e.lngLat, feature: feature }); + } + }; return (

      @@ -50,10 +64,7 @@ export function MapView({ }} interactiveLayerIds={['regular-stop']} onClick={(e) => { - if (e.features) { - const props = e.features[0]; - setShowPropsPopup({ coordinates: e.lngLat, feature: props }); - } + showFeaturePropPopup(e, setShowPropsPopup); }} // put lat/long in URL and pan to it on page reload hash={true} @@ -79,23 +90,11 @@ export function MapView({ /> )} {showPropsPopup?.feature?.properties && ( - setShowPropsPopup(null)} - > - - - {Object.entries(showPropsPopup.feature.properties).map(([key, value]) => ( - - - - - ))} - -
      {key}{value}
      -       + /> )}
      From 92c12e99554ae13777edc8178e9a15052864de3e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 16:16:41 +0100 Subject: [PATCH 0251/1688] Remove FareComponent --- ...CombinedInterlinedLegsFareServiceTest.java | 8 +- .../fares/impl/DefaultFareServiceTest.java | 46 ++++++------ .../ext/fares/impl/FaresIntegrationTest.java | 5 +- .../ext/fares/impl/HSLFareServiceTest.java | 6 +- ...reInFreeTransferWindowFareServiceTest.java | 4 +- .../ext/fares/FaresToItineraryMapper.java | 1 - .../ext/fares/impl/DefaultFareService.java | 23 +++--- .../ext/restapi/mapping/FareMapper.java | 14 +--- .../apis/gtfs/GtfsGraphQLIndex.java | 2 - .../apis/gtfs/datafetchers/ItineraryImpl.java | 3 +- .../gtfs/datafetchers/fareComponentImpl.java | 48 ------------ .../apis/gtfs/datafetchers/fareImpl.java | 6 +- .../gtfs/generated/GraphQLDataFetchers.java | 3 +- .../apis/gtfs/generated/graphql-codegen.yml | 1 - .../model/fare/ItineraryFares.java | 75 ++----------------- .../routing/core/FareComponent.java | 21 ------ .../apis/gtfs/GraphQLIntegrationTest.java | 5 -- 17 files changed, 61 insertions(+), 210 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareComponentImpl.java delete mode 100644 src/main/java/org/opentripplanner/routing/core/FareComponent.java diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java index c5901a0269e..dde40e06cef 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java @@ -69,11 +69,11 @@ void modes(CombinationMode mode, Itinerary itinerary, Money totalPrice, String h assertEquals(totalPrice, price); var firstLeg = itinerary.getTransitLeg(0); - var uses = fare.legProductsFromComponents().get(firstLeg); + var uses = fare.getLegProducts().get(firstLeg); assertEquals(1, uses.size()); var secondLeg = itinerary.getTransitLeg(1); - uses = fare.legProductsFromComponents().get(secondLeg); + uses = fare.getLegProducts().get(secondLeg); assertEquals(1, uses.size()); } @@ -89,14 +89,14 @@ void legFares() { var fare = service.calculateFares(itinerary); var firstLeg = itinerary.getTransitLeg(0); - var uses = List.copyOf(fare.legProductsFromComponents().get(firstLeg)); + var uses = List.copyOf(fare.getLegProducts().get(firstLeg)); assertEquals(1, uses.size()); var firstLegUse = uses.get(0); assertEquals(tenDollars, firstLegUse.product().price()); var secondLeg = itinerary.getTransitLeg(1); - uses = List.copyOf(fare.legProductsFromComponents().get(secondLeg)); + uses = List.copyOf(fare.getLegProducts().get(secondLeg)); assertEquals(1, uses.size()); var secondLegUse = uses.get(0); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index 768e586da31..c0daa7bd3c0 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.ext.fares.impl.FareModelForTest.AIRPORT_STOP; import static org.opentripplanner.ext.fares.impl.FareModelForTest.AIRPORT_TO_CITY_CENTER_SET; import static org.opentripplanner.ext.fares.impl.FareModelForTest.CITY_CENTER_A_STOP; @@ -56,13 +55,10 @@ void simpleZoneBasedFare() { assertEquals(TEN_DOLLARS, fp.price()); assertEquals("F:regular", fp.id().toString()); - var lp = fare.legProductsFromComponents(); + var lp = fare.getLegProducts(); assertEquals(1, lp.size()); var product = lp.values().iterator().next().product(); assertEquals(TEN_DOLLARS, product.price()); - - // the leg products from the components and the "true" leg products are different collections - assertTrue(fare.getLegProducts().isEmpty()); } @Test @@ -91,9 +87,7 @@ void shouldNotCombineInterlinedLegs() { assertEquals(TWENTY_DOLLARS, price); - assertTrue(fare.getLegProducts().isEmpty()); - - var legProductsFromComponents = fare.legProductsFromComponents(); + var legProductsFromComponents = fare.getLegProducts(); var firstLeg = itin.getLegs().get(0); var products = List.copyOf(legProductsFromComponents.get(firstLeg)); @@ -124,18 +118,18 @@ void unknownLeg() { var price = fare.getFare(FareType.regular); assertEquals(Money.usDollars(-0.01f), price); - var components = fare.getComponents(FareType.regular); - assertEquals(1, components.size()); + var fareProducts = List.copyOf(fare.getLegProducts().values()); + assertEquals(1, fareProducts.size()); - var component = components.get(0); - assertEquals(AIRPORT_TO_CITY_CENTER_SET.getFareAttribute().getId(), component.fareId()); - assertEquals(TEN_DOLLARS, component.price()); + var fp = fareProducts.get(0).product(); + assertEquals(AIRPORT_TO_CITY_CENTER_SET.getFareAttribute().getId(), fp.id()); + assertEquals(TEN_DOLLARS, fp.price()); var firstBusLeg = itin.firstTransitLeg().get(); - assertEquals(List.of(firstBusLeg), component.legs()); + //assertEquals(List.of(firstBusLeg), fp.legs()); - var legProductsFromComponent = fare.legProductsFromComponents(); - assertEquals(1, legProductsFromComponent.size()); + var legProducts = fare.getLegProducts(); + assertEquals(1, legProducts.size()); } @Test @@ -150,18 +144,18 @@ void multipleFeeds() { var result = service.calculateFares(itin); var resultComponents = result - .getComponents(FareType.regular) + .getLegProducts() + .values() .stream() - .map(r -> r.fareId()) + .map(r -> r.product().id()) .toList(); - var resultPrice = result.getFare(FareType.regular); - assertEquals( List.of(AIRPORT_TO_CITY_CENTER_SET.getFareAttribute().getId(), OTHER_FEED_ATTRIBUTE.getId()), resultComponents ); + var resultPrice = result.getFare(FareType.regular); assertEquals(TWENTY_DOLLARS, resultPrice); } @@ -179,17 +173,18 @@ void multipleFeedsWithTransfersWithinFeed() { var result = service.calculateFares(itin); var resultComponents = result - .getComponents(FareType.regular) + .getLegProducts() + .values() .stream() - .map(r -> r.fareId()) + .map(r -> r.product().id()) .toList(); - var resultPrice = result.getFare(FareType.regular); assertEquals( List.of(INSIDE_CITY_CENTER_SET.getFareAttribute().getId(), OTHER_FEED_ATTRIBUTE.getId()), resultComponents ); + var resultPrice = result.getFare(FareType.regular); assertEquals(TWENTY_DOLLARS, resultPrice); } @@ -204,9 +199,10 @@ void multipleFeedsWithUnknownFareLegs() { .build(); var result = service.calculateFares(itin); var resultComponents = result - .getComponents(FareType.regular) + .getLegProducts() + .values() .stream() - .map(r -> r.fareId()) + .map(r -> r.product().id()) .toList(); var resultPrice = result.getFare(FareType.regular); assertEquals(List.of(OTHER_FEED_ATTRIBUTE.getId()), resultComponents); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index 939d05cb2c2..ecf06c6b7df 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -24,7 +24,6 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.model.basic.Money; -import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.service.TransitModel; public class FaresIntegrationTest { @@ -130,7 +129,7 @@ public void testFareComponent() { var to = GenericLocation.fromStopId("Destination", feedId, "B"); var fare = getFare(from, to, dateTime, serverContext); - + /* var fareComponents = fare.getComponents(FareType.regular); assertEquals(fareComponents.size(), 1); assertEquals(fareComponents.get(0).price(), tenUSD); @@ -220,6 +219,8 @@ public void testFareComponent() { assertEquals(fareComponents.get(1).fareId(), new FeedScopedId(feedId, "BD")); assertEquals(fareComponents.get(1).routes().get(0), new FeedScopedId(feedId, "2")); assertEquals(fareComponents.get(1).routes().get(1), new FeedScopedId(feedId, "3")); + + */ } private static ItineraryFares getFare( diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java index 14fbe18f792..a094a01412b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java @@ -18,7 +18,6 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.core.FareComponent; import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.fares.FareService; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -43,9 +42,10 @@ public void canCalculateHSLFares( expectedFareIds.toArray(), fareService .calculateFares(i) - .getComponents(FareType.regular) + .getLegProducts() + .values() .stream() - .map(FareComponent::fareId) + .map(u -> u.product().id()) .toArray() ); } diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java index 57621c9ab0f..48dd6b520c5 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.fares.impl; -import static graphql.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; import static org.opentripplanner.transit.model._data.TransitModelForTest.FEED_ID; import static org.opentripplanner.transit.model._data.TransitModelForTest.id; @@ -46,7 +46,7 @@ public void canCalculateFare( assertEquals(expectedFare, fares.getFare(FareType.regular)); for (var type : fares.getFareTypes()) { - assertTrue(fares.getComponents(type).isEmpty()); + assertFalse(fares.getLegProducts().isEmpty()); var prices = fares .getItineraryProducts() diff --git a/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java b/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java index a2b0984e4a3..f4a871b3ceb 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java +++ b/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java @@ -1,6 +1,5 @@ package org.opentripplanner.ext.fares; -import com.google.common.collect.Multimap; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.fare.ItineraryFares; diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index 6b7081de5ec..a39ccebe0e7 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -1,5 +1,7 @@ package org.opentripplanner.ext.fares.impl; +import com.google.common.collect.LinkedHashMultimap; +import com.google.common.collect.Multimap; import java.time.Duration; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -18,11 +20,11 @@ import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.model.fare.FareProduct; +import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.ScheduledTransitLeg; -import org.opentripplanner.routing.core.FareComponent; import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.fares.FareService; import org.opentripplanner.transit.model.basic.Money; @@ -119,7 +121,7 @@ public ItineraryFares calculateFares(Itinerary itinerary) { ItineraryFares fare = ItineraryFares.empty(); boolean hasFare = false; for (FareType fareType : fareRulesPerType.keySet()) { - List components = new ArrayList<>(); + final Multimap fareProducts = LinkedHashMultimap.create(); List fares = new ArrayList<>(); boolean legWithoutRulesFound = false; boolean legsWithoutMatchingRulesFound = false; @@ -143,7 +145,7 @@ public ItineraryFares calculateFares(Itinerary itinerary) { } hasFare = feedHasFare || hasFare; // Other feeds might still have fare for some legs - components.addAll(currentFare.getComponents(fareType)); + fareProducts.putAll(currentFare.getLegProducts()); fare.addFare(fareType, currentFare.getFare(fareType)); currentFare @@ -170,7 +172,7 @@ public ItineraryFares calculateFares(Itinerary itinerary) { } } - fare.addFareComponent(fareType, components); + fare.addFareProductUses(fareProducts); // No fares will be discovered after this point if (!hasFare) { @@ -244,7 +246,7 @@ protected boolean populateFare( ) { FareSearch r = performSearch(fareType, legs, fareRules); - List components = new ArrayList<>(); + Multimap legProducts = LinkedHashMultimap.create(); int count = 0; int start = 0; int end = legs.size() - 1; @@ -276,16 +278,19 @@ protected boolean populateFare( componentLegs.add(leg); } } - components.add( - new FareComponent(fareId, Money.ofFractionalAmount(currency, cost), componentLegs) - ); + + var product = FareProduct + .of(fareId, fareId.toString(), Money.ofFractionalAmount(currency, cost)) + .build(); + componentLegs.forEach(l -> legProducts.put(l, product)); + ++count; start = via + 1; } var amount = r.resultTable[0][legs.size() - 1]; fare.addFare(fareType, Money.ofFractionalAmount(currency, amount)); - fare.addFareComponent(fareType, components); + fare.addFareProducts(legProducts); return count > 0; } diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java index a6020c6bf37..7eb0d26339e 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java @@ -24,7 +24,6 @@ import org.opentripplanner.model.fare.RiderCategory; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.core.FareComponent; import org.opentripplanner.transit.model.basic.Money; public class FareMapper { @@ -106,14 +105,7 @@ private List toApiFareProducts(Collection product) } private Map> toApiFareComponents(ItineraryFares fare) { - return fare - .getFareTypes() - .stream() - .map(key -> { - var money = fare.getComponents(key).stream().map(this::toApiFareComponent).toList(); - return new SimpleEntry<>(key, money); - }) - .collect(Collectors.toMap(e -> e.getKey().name(), Entry::getValue)); + return Map.of(); } private Map toApiMoneys(ItineraryFares fare) { @@ -139,8 +131,4 @@ private ApiMoney toApiMoney(Money m) { ) ); } - - private ApiFareComponent toApiFareComponent(FareComponent m) { - return new ApiFareComponent(m.fareId(), null, toApiMoney(m.price()), m.routes()); - } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index b50bbaa9b9e..7101d132834 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -77,7 +77,6 @@ import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalStationImpl; import org.opentripplanner.apis.gtfs.datafetchers.debugOutputImpl; import org.opentripplanner.apis.gtfs.datafetchers.elevationProfileComponentImpl; -import org.opentripplanner.apis.gtfs.datafetchers.fareComponentImpl; import org.opentripplanner.apis.gtfs.datafetchers.fareImpl; import org.opentripplanner.apis.gtfs.datafetchers.placeAtDistanceImpl; import org.opentripplanner.apis.gtfs.datafetchers.serviceTimeRangeImpl; @@ -129,7 +128,6 @@ protected static GraphQLSchema buildSchema() { .type(typeWiring.build(debugOutputImpl.class)) .type(typeWiring.build(DepartureRowImpl.class)) .type(typeWiring.build(elevationProfileComponentImpl.class)) - .type(typeWiring.build(fareComponentImpl.class)) .type(typeWiring.build(fareImpl.class)) .type(typeWiring.build(FeedImpl.class)) .type(typeWiring.build(FeedImpl.class)) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java index 5e0ee6285a8..5399783bee0 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java @@ -3,6 +3,7 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.stream.Collectors; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; @@ -54,7 +55,7 @@ public DataFetcher>> fares() { Map result = new HashMap<>(); result.put("name", fareKey); result.put("fare", fare.getFare(fareKey)); - result.put("details", fare.getComponents(fareKey)); + result.put("details", List.of()); return result; }) .collect(Collectors.toList()); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareComponentImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareComponentImpl.java deleted file mode 100644 index a8c1b4d38f5..00000000000 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareComponentImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.opentripplanner.apis.gtfs.datafetchers; - -import graphql.schema.DataFetcher; -import graphql.schema.DataFetchingEnvironment; -import java.util.stream.Collectors; -import org.opentripplanner.apis.gtfs.GraphQLRequestContext; -import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.routing.core.FareComponent; -import org.opentripplanner.transit.model.network.Route; -import org.opentripplanner.transit.service.TransitService; - -public class fareComponentImpl implements GraphQLDataFetchers.GraphQLFareComponent { - - @Override - public DataFetcher cents() { - return environment -> getSource(environment).price().minorUnitAmount(); - } - - @Override - public DataFetcher currency() { - return environment -> getSource(environment).price().currency().getCurrencyCode(); - } - - @Override - public DataFetcher fareId() { - return environment -> getSource(environment).fareId().toString(); - } - - @Override - public DataFetcher> routes() { - return environment -> { - TransitService transitService = getTransitService(environment); - return getSource(environment) - .routes() - .stream() - .map(transitService::getRouteForId) - .collect(Collectors.toList()); - }; - } - - private TransitService getTransitService(DataFetchingEnvironment environment) { - return environment.getContext().transitService(); - } - - private FareComponent getSource(DataFetchingEnvironment environment) { - return environment.getSource(); - } -} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java index e1986d215be..fb2c6ee184c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java @@ -2,9 +2,9 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; +import java.util.List; import java.util.Map; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.routing.core.FareComponent; import org.opentripplanner.transit.model.basic.Money; public class fareImpl implements GraphQLDataFetchers.GraphQLFare { @@ -15,8 +15,8 @@ public DataFetcher cents() { } @Override - public DataFetcher> components() { - return environment -> (Iterable) getSource(environment).get("details"); + public DataFetcher> components() { + return environment -> List.of(); } @Override diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index d89453be056..cd002ec187b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -40,7 +40,6 @@ import org.opentripplanner.model.plan.WalkStep; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.api.response.RoutingError; -import org.opentripplanner.routing.core.FareComponent; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.routing.graphfinder.PatternAtStop; import org.opentripplanner.routing.graphfinder.PlaceAtDistance; @@ -1239,7 +1238,7 @@ public interface GraphQLElevationProfileComponent { public interface GraphQLFare { public DataFetcher cents(); - public DataFetcher> components(); + public DataFetcher> components(); public DataFetcher currency(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 68901bdccef..c720fc5a119 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -55,7 +55,6 @@ config: elevationProfileComponent: org.opentripplanner.model.plan.ElevationProfile.Step Emissions: org.opentripplanner.model.plan.Emissions#Emissions fare: java.util.Map#Map - fareComponent: org.opentripplanner.routing.core.FareComponent#FareComponent Feed: String Geometry: org.locationtech.jts.geom.Geometry#Geometry InputField: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField#GraphQLInputField diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index 0f9f815efe6..3443c01a062 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -1,6 +1,5 @@ package org.opentripplanner.model.fare; -import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; @@ -11,12 +10,10 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.core.FareComponent; import org.opentripplanner.routing.core.FareType; import org.opentripplanner.transit.model.basic.Money; @@ -41,19 +38,6 @@ public class ItineraryFares { */ private final Multimap legProducts = LinkedHashMultimap.create(); - /** - * The fares V1 fare "components" that apply to individual legs (not the entire price of the - * itinerary). - *

      - * This is an ill-thought-out concept that was bolted onto the existing implementation in 2016 and - * is going to be removed once HSL has migrated off it. - *

      - * Note: LinkedHashMultimap keeps the insertion order - * @deprecated Exists only for backwards compatibility and will be removed in the future. - */ - @Deprecated - private final Multimap components = LinkedHashMultimap.create(); - /** * Holds the "fares" for the entire itinerary. The definition of a fare is not clear so * this is deprecated. @@ -93,19 +77,6 @@ public void addFare(FareType fareType, Money money) { fares.put(fareType, money); } - /** - * Add a collection of "fare components" for a type. These concepts are ill-defined and will be - * removed in the future. - *

      - * @deprecated Only exitst for backwards compatibility. - * Use @{link {@link ItineraryFares#addItineraryProducts(Collection)}}, - * {@link ItineraryFares#addFareProduct(Leg, FareProduct)} or - */ - @Deprecated - public void addFareComponent(FareType fareType, List components) { - this.components.replaceValues(fareType, components); - } - /** * Add fare products that cover the entire itinerary, i.e. are valid for all legs. */ @@ -127,17 +98,6 @@ public Money getFare(FareType type) { return fares.get(type); } - /** - * Get the "components" of a fare for a specific type. - *

      - * Use {@link ItineraryFares#getItineraryProducts()} or {@link ItineraryFares#getLegProducts()} - * instead. - */ - @Deprecated - public List getComponents(FareType type) { - return List.copyOf(components.get(type)); - } - /** * Return the set of {@link FareType}s that are contained in this instance. */ @@ -148,7 +108,7 @@ public Set getFareTypes() { @Override public int hashCode() { - return Objects.hash(itineraryProducts, legProducts, components); + return Objects.hash(itineraryProducts, legProducts); } @Override @@ -188,32 +148,11 @@ public void addFareProduct(Leg leg, Collection fareProduct) { fareProduct.forEach(fp -> addFareProduct(leg, fp)); } - /** - * Convert the fare received via the deprecated {@link FareComponent} to leg products. This - * inverts the relationship: - * - fare component has several legs - * - leg product is a mapping from leg to a list of fare products - */ - @Nonnull - public Multimap legProductsFromComponents() { - Multimap legProductsFromComponents = HashMultimap.create(); - for (var type : getFareTypes()) { - var components = getComponents(type); - - for (var c : components) { - var firstLegStartTime = c.legs().get(0).getStartTime(); - for (var leg : c.legs()) { - final FareProduct fareProduct = FareProduct - .of(c.fareId(), type.name(), c.price()) - .build(); - - legProductsFromComponents.put( - leg, - new FareProductUse(fareProduct.uniqueInstanceId(firstLegStartTime), fareProduct) - ); - } - } - } - return legProductsFromComponents; + public void addFareProducts(Multimap fareProducts) { + fareProducts.forEach((leg, fp) -> addFareProduct(leg, fp)); + } + + public void addFareProductUses(Multimap fareProducts) { + legProducts.putAll(fareProducts); } } diff --git a/src/main/java/org/opentripplanner/routing/core/FareComponent.java b/src/main/java/org/opentripplanner/routing/core/FareComponent.java deleted file mode 100644 index 4c609a80f19..00000000000 --- a/src/main/java/org/opentripplanner/routing/core/FareComponent.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.opentripplanner.routing.core; - -import java.util.List; -import org.opentripplanner.model.fare.FareProduct; -import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.transit.model.basic.Money; -import org.opentripplanner.transit.model.framework.FeedScopedId; - -/** - *

      - * FareComponent is a sequence of routes for a particular fare. - *

      - * @deprecated Because it exists only for backwards compatibility, and you should use the Fares V2 - * type, namely {@link FareProduct}. - */ -@Deprecated -public record FareComponent(FeedScopedId fareId, Money price, List legs) { - public List routes() { - return legs.stream().map(l -> l.getRoute().getId()).toList(); - } -} diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index a65c46b12fe..6e99e096c2c 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -61,7 +61,6 @@ import org.opentripplanner.routing.alertpatch.TimePeriod; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.api.request.RouteRequest; -import org.opentripplanner.routing.core.FareComponent; import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.GraphFinder; @@ -185,10 +184,6 @@ static void setup() { var fares = new ItineraryFares(); fares.addFare(FareType.regular, Money.euros(3.1f)); - fares.addFareComponent( - FareType.regular, - List.of(new FareComponent(id("AB"), Money.euros(3.1f), List.of(busLeg))) - ); var dayPass = fareProduct("day-pass"); fares.addItineraryProducts(List.of(dayPass)); From 673415cbae447b24503e2a65de099b4ada1efe32 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 16:33:01 +0100 Subject: [PATCH 0252/1688] Update test assertion --- .../ext/fares/FaresToItineraryMapper.java | 9 +- .../__snapshots__/BikeRentalSnapshotTest.snap | 600 +++++++++--------- .../__snapshots__/ElevationSnapshotTest.snap | 300 +++++---- .../__snapshots__/TransitSnapshotTest.snap | 572 +++++++++-------- 4 files changed, 734 insertions(+), 747 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java b/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java index f4a871b3ceb..c545cbbb858 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java +++ b/src/ext/java/org/opentripplanner/ext/fares/FaresToItineraryMapper.java @@ -4,7 +4,6 @@ import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; /** * Takes fares and applies them to the legs of an itinerary. @@ -21,13 +20,9 @@ public static void addFaresToLegs(ItineraryFares fares, Itinerary i) { }) .toList(); - final Multimap legProductsFromComponents = fares.legProductsFromComponents(); - i.transformTransitLegs(leg -> { - var legInstances = fares.getLegProducts().get(leg); - leg.setFareProducts( - ListUtils.combine(itineraryFareUses, legProductsFromComponents.get(leg), legInstances) - ); + var legUses = fares.getLegProducts().get(leg); + leg.setFareProducts(ListUtils.combine(itineraryFareUses, legUses)); return leg; }); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap index d99f479ac16..36c56471be1 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap @@ -22,31 +22,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "17" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -57,7 +33,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 3 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2209, "legs" : [ @@ -510,31 +508,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -545,7 +519,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2539, "legs" : [ @@ -956,31 +952,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "77" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -991,7 +963,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 1805, "legs" : [ @@ -1298,31 +1292,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "17" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -1333,7 +1303,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 3 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2209, "legs" : [ @@ -1786,31 +1778,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "17" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -1821,7 +1789,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 3 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2209, "legs" : [ @@ -2274,31 +2264,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "77" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -2309,7 +2275,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 1805, "legs" : [ @@ -3291,31 +3279,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "17" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -3326,7 +3290,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2119, "legs" : [ @@ -3831,31 +3817,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -3866,7 +3828,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2503, "legs" : [ @@ -4251,31 +4235,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "77" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -4286,7 +4246,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2351, "legs" : [ @@ -4645,31 +4627,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "17" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -4680,7 +4638,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2119, "legs" : [ @@ -5185,31 +5165,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -5220,7 +5176,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2563, "legs" : [ @@ -5605,31 +5583,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "77" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -5640,7 +5594,29 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2351, "legs" : [ diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap index b5e40b383e4..5baa72515ec 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap @@ -550,31 +550,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "17" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -585,7 +561,29 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2305, "legs" : [ @@ -946,31 +944,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -981,7 +955,29 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2465, "legs" : [ @@ -1368,31 +1364,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "77" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -1403,7 +1375,29 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2396, "legs" : [ @@ -1764,31 +1758,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "15" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -1799,7 +1769,29 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2787, "legs" : [ @@ -2238,31 +2230,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "17" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -2273,7 +2241,29 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2305, "legs" : [ @@ -2634,31 +2624,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -2669,7 +2635,29 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2525, "legs" : [ diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap index f67c75f44ec..8c36afa32e6 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap @@ -250,31 +250,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -285,7 +261,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 4281, "legs" : [ @@ -735,31 +733,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "15" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -770,7 +744,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2315, "legs" : [ @@ -1285,31 +1281,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -1320,7 +1292,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 4295, "legs" : [ @@ -1770,31 +1764,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "15" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -1805,7 +1775,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2385, "legs" : [ @@ -2320,35 +2312,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "70" - }, - { - "feedId" : "prt", - "id" : "77" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -2359,7 +2323,49 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + }, + { + "legIndices" : [ + 2 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 3375, "legs" : [ @@ -3053,31 +3059,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -3088,7 +3070,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2895, "legs" : [ @@ -3541,31 +3545,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -3576,7 +3556,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2925, "legs" : [ @@ -4029,31 +4031,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -4064,7 +4042,29 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2895, "legs" : [ @@ -4517,35 +4517,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "70" - }, - { - "feedId" : "prt", - "id" : "77" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -4556,7 +4528,49 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + }, + { + "legIndices" : [ + 2 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 2957, "legs" : [ @@ -5029,35 +5043,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "name" : "regular" } ], - "details" : { - "regular" : [ - { - "fareId" : { - "feedId" : "prt", - "id" : "8" - }, - "price" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "routes" : [ - { - "feedId" : "prt", - "id" : "20" - }, - { - "feedId" : "prt", - "id" : "15" - } - ] - } - ] - }, + "details" : { }, "fare" : { "regular" : { "cents" : 200, @@ -5068,7 +5054,49 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "symbol" : "$" } } - } + }, + "legProducts" : [ + { + "legIndices" : [ + 1 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + }, + { + "legIndices" : [ + 2 + ], + "products" : [ + { + "amount" : { + "cents" : 200, + "currency" : { + "currency" : "USD", + "currencyCode" : "USD", + "defaultFractionDigits" : 2, + "symbol" : "$" + } + }, + "id" : "prt:8", + "name" : "prt:8" + } + ] + } + ] }, "generalizedCost" : 3015, "legs" : [ From f5b95975e82e6e5868438249f75a8728b4ce5dbb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Jan 2024 17:26:53 +0100 Subject: [PATCH 0253/1688] Remove fare component tests --- .../ext/fares/impl/FaresIntegrationTest.java | 119 ------------------ .../ext/restapi/mapping/FareMapperTest.java | 2 - .../ext/fares/impl/farecomponents.gtfs.zip | Bin 2266 -> 0 bytes .../apis/gtfs/expectations/plan-fares.json | 30 +---- 4 files changed, 1 insertion(+), 150 deletions(-) delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/fares/impl/farecomponents.gtfs.zip diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index ecf06c6b7df..d6a1432a75b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -22,7 +22,6 @@ import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.standalone.api.OtpServerRequestContext; -import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.service.TransitModel; @@ -105,124 +104,6 @@ public void testPortland() { // assertEquals(cost.getFare(FareType.regular), new Money(new WrappedCurrency("USD"), 430)); } - @Test - public void testFareComponent() { - TestOtpModel model = ConstantsForTests.buildGtfsGraph( - ResourceLoader.of(this).file("farecomponents.gtfs.zip") - ); - Graph graph = model.graph(); - TransitModel transitModel = model.transitModel(); - String feedId = transitModel.getFeedIds().iterator().next(); - - var serverContext = TestServerContext.createServerContext(graph, transitModel); - - Money tenUSD = Money.usDollars(10); - - var dateTime = LocalDateTime - .of(2009, 8, 7, 0, 0, 0) - .atZone(ZoneId.of("America/Los_Angeles")) - .toInstant(); - - // A -> B, base case - - var from = GenericLocation.fromStopId("Origin", feedId, "A"); - var to = GenericLocation.fromStopId("Destination", feedId, "B"); - - var fare = getFare(from, to, dateTime, serverContext); - /* - var fareComponents = fare.getComponents(FareType.regular); - assertEquals(fareComponents.size(), 1); - assertEquals(fareComponents.get(0).price(), tenUSD); - assertEquals(fareComponents.get(0).fareId(), new FeedScopedId(feedId, "AB")); - assertEquals(fareComponents.get(0).routes().get(0), new FeedScopedId(feedId, "1")); - - // D -> E, null case - - from = GenericLocation.fromStopId("Origin", feedId, "D"); - to = GenericLocation.fromStopId("Destination", feedId, "E"); - fare = getFare(from, to, dateTime, serverContext); - assertEquals(ItineraryFares.empty(), fare); - - // A -> C, 2 components in a path - - from = GenericLocation.fromStopId("Origin", feedId, "A"); - to = GenericLocation.fromStopId("Destination", feedId, "C"); - fare = getFare(from, to, dateTime, serverContext); - - fareComponents = fare.getComponents(FareType.regular); - assertEquals(fareComponents.size(), 2); - assertEquals(fareComponents.get(0).price(), tenUSD); - assertEquals(fareComponents.get(0).fareId(), new FeedScopedId(feedId, "AB")); - assertEquals(fareComponents.get(0).routes().get(0), new FeedScopedId(feedId, "1")); - assertEquals(fareComponents.get(1).price(), tenUSD); - assertEquals(fareComponents.get(1).fareId(), new FeedScopedId(feedId, "BC")); - assertEquals(fareComponents.get(1).routes().get(0), new FeedScopedId(feedId, "2")); - - // B -> D, 2 fully connected components - from = GenericLocation.fromStopId("Origin", feedId, "B"); - to = GenericLocation.fromStopId("Destination", feedId, "D"); - fare = getFare(from, to, dateTime, serverContext); - - fareComponents = fare.getComponents(FareType.regular); - assertEquals(fareComponents.size(), 1); - assertEquals(fareComponents.get(0).price(), tenUSD); - assertEquals(fareComponents.get(0).fareId(), new FeedScopedId(feedId, "BD")); - assertEquals(fareComponents.get(0).routes().get(0), new FeedScopedId(feedId, "2")); - assertEquals(fareComponents.get(0).routes().get(1), new FeedScopedId(feedId, "3")); - - // E -> G, missing in between fare - from = GenericLocation.fromStopId("Origin", feedId, "E"); - to = GenericLocation.fromStopId("Destination", feedId, "G"); - fare = getFare(from, to, dateTime, serverContext); - - fareComponents = fare.getComponents(FareType.regular); - assertEquals(fareComponents.size(), 1); - assertEquals(tenUSD, fareComponents.get(0).price()); - assertEquals(fareComponents.get(0).fareId(), new FeedScopedId(feedId, "EG")); - assertEquals(fareComponents.get(0).routes().get(0), new FeedScopedId(feedId, "5")); - assertEquals(fareComponents.get(0).routes().get(1), new FeedScopedId(feedId, "6")); - - // C -> E, missing fare after - from = GenericLocation.fromStopId("Origin", feedId, "C"); - to = GenericLocation.fromStopId("Destination", feedId, "E"); - fare = getFare(from, to, dateTime, serverContext); - - fareComponents = fare.getComponents(FareType.regular); - assertEquals(fareComponents.size(), 1); - assertEquals(fareComponents.get(0).price(), tenUSD); - assertEquals(fareComponents.get(0).fareId(), new FeedScopedId(feedId, "CD")); - assertEquals(fareComponents.get(0).routes().get(0), new FeedScopedId(feedId, "3")); - - // D -> G, missing fare before - from = GenericLocation.fromStopId("Origin", feedId, "D"); - to = GenericLocation.fromStopId("Destination", feedId, "G"); - fare = getFare(from, to, dateTime, serverContext); - - fareComponents = fare.getComponents(FareType.regular); - assertEquals(fareComponents.size(), 1); - assertEquals(fareComponents.get(0).price(), tenUSD); - assertEquals(fareComponents.get(0).fareId(), new FeedScopedId(feedId, "EG")); - assertEquals(fareComponents.get(0).routes().get(0), new FeedScopedId(feedId, "5")); - assertEquals(fareComponents.get(0).routes().get(1), new FeedScopedId(feedId, "6")); - - // A -> D, use individual component parts - from = GenericLocation.fromStopId("Origin", feedId, "A"); - to = GenericLocation.fromStopId("Destination", feedId, "D"); - fare = getFare(from, to, dateTime, serverContext); - - fareComponents = fare.getComponents(FareType.regular); - assertEquals(fareComponents.size(), 2); - assertEquals(fareComponents.get(0).price(), tenUSD); - assertEquals(fareComponents.get(0).fareId(), new FeedScopedId(feedId, "AB")); - assertEquals(fareComponents.get(0).routes().get(0), new FeedScopedId(feedId, "1")); - assertEquals(fareComponents.get(1).price(), tenUSD); - assertEquals(fareComponents.get(1).fareId(), new FeedScopedId(feedId, "BD")); - assertEquals(fareComponents.get(1).routes().get(0), new FeedScopedId(feedId, "2")); - assertEquals(fareComponents.get(1).routes().get(1), new FeedScopedId(feedId, "3")); - - */ - } - private static ItineraryFares getFare( GenericLocation from, GenericLocation to, diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java index bd1bd07aa43..4b455cce0f7 100644 --- a/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java @@ -3,7 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import java.util.List; import java.util.Locale; import org.junit.jupiter.api.Test; import org.opentripplanner.model.fare.ItineraryFares; @@ -29,6 +28,5 @@ public void emptyDetails() { var apiMoney = apiFare.fare().get(FareType.regular.name()); assertEquals(500, apiMoney.cents()); assertEquals("USD", apiMoney.currency().currency()); - assertEquals(List.of(), apiFare.details().get(FareType.regular.name())); } } diff --git a/src/ext-test/resources/org/opentripplanner/ext/fares/impl/farecomponents.gtfs.zip b/src/ext-test/resources/org/opentripplanner/ext/fares/impl/farecomponents.gtfs.zip deleted file mode 100644 index 4f7625f55c5c4ec6cbacf603709360eb6f4d0a7f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2266 zcmWIWW@Zs#-~d8~m@sPwD98oUTnq{fiRr0%$(4E~6(yk|ybSCU)E;=1+V>`Ys540_ zt>9*0WO>2NzyKz^ef-aQuj@JQbJ4S9!zZEQ;KVnV7Rg9#Rxvi;s%5V~mHW{3Lhmzv zp#?1)jJ>?L)_nPTxxuMwrD*3)R?C%DCx7m=>f5=}b>_*=Uv(>=ew_Hz^=1r1fHylw zLh|aHAwbuFToeFz>yL=lZcwK(GyoYqK({6*=A`DOBo@J4n^G7Mio>;`r#Esn81S%M z*n9tyqNvQDSwcQXn!-GSj_$vH#WQaQ`*F?Fk!j~zAJv5%vW`mrx^KoS_2}6pIzf9x z)_S_X<~J2N-EwTAb}7r9ZRM9{)JZa^c|4FfC@2SV@D_{PvEe``ft-bKa9h4Feew4<{-JYpc1ERWse^Ox|YY`Vs-jY z?;Fz$+7uam^(QF2%m480UTB*2Vx!}`>v|;1zpTAAPjv4ZiQPpSGAmXzCMEH;b^qGu zeQLsqPmCbv_44IOI0GF3asthhkYXHiCl50^uN<>JqncJ1Uj|2B)PIIubp8r|jGhy37wxn%a7%wj0?#h2!ChZ5`=JL4YnH%Td zy=449%=fSTj)z;H#4J~xs@peb+s-ZQTK+4=^EU3k-owAWX3vDCL%9c@)*UTynbD5M@T%k0_=hyVMGzFl%3Ds&~I|Wc{s>cp_6i%|CO_p%eK(=Djezyt(_WuXWHdKS$Q};!-C#(s%!U z6H>AJM`!=~ Date: Tue, 9 Jan 2024 18:02:37 +0100 Subject: [PATCH 0254/1688] Update more tests --- .../impl/CombinedInterlinedLegsFareServiceTest.java | 4 ++-- .../ext/fares/impl/DefaultFareServiceTest.java | 9 ++------- .../ext/fares/impl/HSLFareServiceTest.java | 4 ++-- .../HighestFareInFreeTransferWindowFareServiceTest.java | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java index dde40e06cef..350bae04dce 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java @@ -92,14 +92,14 @@ void legFares() { var uses = List.copyOf(fare.getLegProducts().get(firstLeg)); assertEquals(1, uses.size()); - var firstLegUse = uses.get(0); + var firstLegUse = uses.getFirst(); assertEquals(tenDollars, firstLegUse.product().price()); var secondLeg = itinerary.getTransitLeg(1); uses = List.copyOf(fare.getLegProducts().get(secondLeg)); assertEquals(1, uses.size()); - var secondLegUse = uses.get(0); + var secondLegUse = uses.getFirst(); assertEquals(tenDollars, secondLegUse.product().price()); // the same far product is used for both legs as you only need to buy one diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index c0daa7bd3c0..04836ea2b52 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -172,16 +172,11 @@ void multipleFeedsWithTransfersWithinFeed() { .build(); var result = service.calculateFares(itin); - var resultComponents = result - .getLegProducts() - .values() - .stream() - .map(r -> r.product().id()) - .toList(); + var legProducts = result.getLegProducts().values().stream().map(r -> r.product().id()).toList(); assertEquals( List.of(INSIDE_CITY_CENTER_SET.getFareAttribute().getId(), OTHER_FEED_ATTRIBUTE.getId()), - resultComponents + legProducts ); var resultPrice = result.getFare(FareType.regular); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java index a094a01412b..ae78a820661 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.fares.impl; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; import static org.opentripplanner.transit.model._data.TransitModelForTest.FEED_ID; @@ -7,7 +8,6 @@ import java.util.LinkedList; import java.util.List; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -38,7 +38,7 @@ public void canCalculateHSLFares( Itinerary i, List expectedFareIds ) { - Assertions.assertArrayEquals( + assertArrayEquals( expectedFareIds.toArray(), fareService .calculateFares(i) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java index 48dd6b520c5..0e667f1b986 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java @@ -46,7 +46,7 @@ public void canCalculateFare( assertEquals(expectedFare, fares.getFare(FareType.regular)); for (var type : fares.getFareTypes()) { - assertFalse(fares.getLegProducts().isEmpty()); + assertFalse(fares.getItineraryProducts().isEmpty()); var prices = fares .getItineraryProducts() From f2bcbb4b258e07fa71bc5a4d5b165ec1d81c39c9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 10:53:14 +0100 Subject: [PATCH 0255/1688] Fix price calculation of combined interlined legs --- .../ext/fares/impl/DefaultFareService.java | 23 +++++++------------ .../model/fare/ItineraryFares.java | 2 +- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index a39ccebe0e7..f0d957bf4ff 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -148,11 +148,6 @@ public ItineraryFares calculateFares(Itinerary itinerary) { fareProducts.putAll(currentFare.getLegProducts()); fare.addFare(fareType, currentFare.getFare(fareType)); - currentFare - .getLegProducts() - .entries() - .forEach(entry -> fare.addFareProduct(entry.getKey(), entry.getValue().product())); - fares.add(currentFare.getFare(fareType)); // If all the legs are from one feed, consider itinerary products @@ -246,7 +241,7 @@ protected boolean populateFare( ) { FareSearch r = performSearch(fareType, legs, fareRules); - Multimap legProducts = LinkedHashMultimap.create(); + Multimap fareProductUses = LinkedHashMultimap.create(); int count = 0; int start = 0; int end = legs.size() - 1; @@ -263,34 +258,32 @@ protected boolean populateFare( int via = r.next[start][r.endOfComponent[start]]; float cost = r.resultTable[start][via]; FeedScopedId fareId = r.fareIds[start][via]; + var product = FareProduct + .of(fareId, fareId.toString(), Money.ofFractionalAmount(currency, cost)) + .build(); - var componentLegs = new ArrayList(); for (int i = start; i <= via; ++i) { final var leg = legs.get(i); + final var use = new FareProductUse(product.uniqueInstanceId(leg.getStartTime()), product); // if we have a leg that is combined for the purpose of fare calculation we need to // retrieve the original legs so that the fare products are assigned back to the original // legs that the combined one originally consisted of. // (remember that the combined leg only exists during fare calculation and is thrown away // afterwards to associating fare products with it will result in the API not showing any.) if (leg instanceof CombinedInterlinedTransitLeg combinedLeg) { - componentLegs.addAll(combinedLeg.originalLegs()); + combinedLeg.originalLegs().forEach(l -> fareProductUses.put(l, use)); } else { - componentLegs.add(leg); + fareProductUses.put(leg, use); } } - var product = FareProduct - .of(fareId, fareId.toString(), Money.ofFractionalAmount(currency, cost)) - .build(); - componentLegs.forEach(l -> legProducts.put(l, product)); - ++count; start = via + 1; } var amount = r.resultTable[0][legs.size() - 1]; fare.addFare(fareType, Money.ofFractionalAmount(currency, amount)); - fare.addFareProducts(legProducts); + fare.addFareProductUses(fareProductUses); return count > 0; } diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index 3443c01a062..8bb3e349b60 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -149,7 +149,7 @@ public void addFareProduct(Leg leg, Collection fareProduct) { } public void addFareProducts(Multimap fareProducts) { - fareProducts.forEach((leg, fp) -> addFareProduct(leg, fp)); + fareProducts.forEach(this::addFareProduct); } public void addFareProductUses(Multimap fareProducts) { From 55ee6fff8f0b27347b99fcc0e226548f4e15f149 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 11:38:19 +0100 Subject: [PATCH 0256/1688] Update expecations for mulitple feed fares --- .../ext/fares/impl/DefaultFareServiceTest.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index 04836ea2b52..3111b584ec8 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -172,11 +172,23 @@ void multipleFeedsWithTransfersWithinFeed() { .build(); var result = service.calculateFares(itin); - var legProducts = result.getLegProducts().values().stream().map(r -> r.product().id()).toList(); + var legProducts = result.getLegProducts(); + var firstBusLeg = itin.getTransitLeg(0); + var secondBusLeg = itin.getTransitLeg(2); + var finalBusLeg = itin.getTransitLeg(4); + + assertEquals( + "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", + legProducts.get(firstBusLeg).toString() + ); + assertEquals( + "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + legProducts.get(secondBusLeg).toString() + ); assertEquals( - List.of(INSIDE_CITY_CENTER_SET.getFareAttribute().getId(), OTHER_FEED_ATTRIBUTE.getId()), - legProducts + "[FareProductUse[id=678d201c-e839-35c3-ae7b-1bc3834da5e5, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", + legProducts.get(finalBusLeg).toString() ); var resultPrice = result.getFare(FareType.regular); From af5d0497752cc622f2511d750427647b5ad13675 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 12:09:11 +0100 Subject: [PATCH 0257/1688] Update assertions for HSL fares --- .../org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java | 2 +- .../impl/HighestFareInFreeTransferWindowFareServiceTest.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java index ae78a820661..4e1347cae16 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java @@ -382,7 +382,7 @@ private static List createTestCases() { "Bus ride within zone A, then another one outside of HSL's area", hslFareService, A1_A2_F, - List.of(fareAttributeAB.getId()) + List.of(fareAttributeAB.getId(), fareAttributeAB.getId()) ) ); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java index 0e667f1b986..5664dcc765d 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java @@ -44,10 +44,9 @@ public void canCalculateFare( ) { var fares = fareService.calculateFares(i); assertEquals(expectedFare, fares.getFare(FareType.regular)); + assertFalse(fares.getItineraryProducts().isEmpty()); for (var type : fares.getFareTypes()) { - assertFalse(fares.getItineraryProducts().isEmpty()); - var prices = fares .getItineraryProducts() .stream() From 6527828515b7902dfe4cfcb6840796abdc351795 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 12:33:31 +0100 Subject: [PATCH 0258/1688] Remove 'component' from variable names --- .../ext/fares/impl/DefaultFareServiceTest.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index 3111b584ec8..f306b61ee50 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -87,15 +87,15 @@ void shouldNotCombineInterlinedLegs() { assertEquals(TWENTY_DOLLARS, price); - var legProductsFromComponents = fare.getLegProducts(); + var legProducts = fare.getLegProducts(); var firstLeg = itin.getLegs().get(0); - var products = List.copyOf(legProductsFromComponents.get(firstLeg)); + var products = List.copyOf(legProducts.get(firstLeg)); assertEquals(TEN_DOLLARS, products.get(0).product().price()); var secondLeg = itin.getLegs().get(1); - products = List.copyOf(legProductsFromComponents.get(secondLeg)); + products = List.copyOf(legProducts.get(secondLeg)); assertEquals(TEN_DOLLARS, products.get(0).product().price()); assertEquals(1, fare.getItineraryProducts().size()); @@ -143,7 +143,7 @@ void multipleFeeds() { .build(); var result = service.calculateFares(itin); - var resultComponents = result + var fareProductIds = result .getLegProducts() .values() .stream() @@ -152,7 +152,7 @@ void multipleFeeds() { assertEquals( List.of(AIRPORT_TO_CITY_CENTER_SET.getFareAttribute().getId(), OTHER_FEED_ATTRIBUTE.getId()), - resultComponents + fareProductIds ); var resultPrice = result.getFare(FareType.regular); @@ -205,14 +205,14 @@ void multipleFeedsWithUnknownFareLegs() { .bus(OTHER_FEED_ROUTE, 2, T11_20, T11_32, Place.forStop(OTHER_FEED_STOP)) .build(); var result = service.calculateFares(itin); - var resultComponents = result + var resultProductIds = result .getLegProducts() .values() .stream() .map(r -> r.product().id()) .toList(); var resultPrice = result.getFare(FareType.regular); - assertEquals(List.of(OTHER_FEED_ATTRIBUTE.getId()), resultComponents); + assertEquals(List.of(OTHER_FEED_ATTRIBUTE.getId()), resultProductIds); assertEquals(Money.usDollars(-0.01f), resultPrice); } } From cc317540655a8d930698a01cad6810912b6a5991 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 12:47:50 +0100 Subject: [PATCH 0259/1688] Simplify mapping code --- .../opentripplanner/ext/restapi/mapping/FareMapper.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java index 7eb0d26339e..e8582607ce5 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java @@ -11,7 +11,6 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import org.opentripplanner.ext.restapi.model.ApiCurrency; -import org.opentripplanner.ext.restapi.model.ApiFareComponent; import org.opentripplanner.ext.restapi.model.ApiFareProduct; import org.opentripplanner.ext.restapi.model.ApiFareQualifier; import org.opentripplanner.ext.restapi.model.ApiItineraryFares; @@ -37,11 +36,10 @@ public FareMapper(Locale locale) { public ApiItineraryFares mapFare(Itinerary itinerary) { var fares = itinerary.getFares(); Map apiFare = toApiMoneys(fares); - Map> apiComponent = toApiFareComponents(fares); return new ApiItineraryFares( apiFare, - apiComponent, + Map.of(), toApiFareProducts(fares.getItineraryProducts()), toApiLegProducts(itinerary, fares.getLegProducts()) ); @@ -104,10 +102,6 @@ private List toApiFareProducts(Collection product) } } - private Map> toApiFareComponents(ItineraryFares fare) { - return Map.of(); - } - private Map toApiMoneys(ItineraryFares fare) { return fare .getFareTypes() From 8c14a6fd6cbf4939be58f41dc61dbd426a84caca Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Jan 2024 14:35:10 +0100 Subject: [PATCH 0260/1688] Clean up --- .../org/opentripplanner/ext/fares/impl/OrcaFareService.java | 4 ---- .../org/opentripplanner/ext/fares/impl/OrcaFaresData.java | 2 -- .../java/org/opentripplanner/model/fare/ItineraryFares.java | 4 ---- 3 files changed, 10 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index 42736472767..4879d858e86 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -23,13 +23,9 @@ import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class OrcaFareService extends DefaultFareService { - private static final Logger LOG = LoggerFactory.getLogger(OrcaFareService.class); - private static final Duration MAX_TRANSFER_DISCOUNT_DURATION = Duration.ofHours(2); public static final String COMM_TRANS_AGENCY_ID = "29"; diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java index e970cb51718..acef59a7c03 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFaresData.java @@ -1,7 +1,5 @@ package org.opentripplanner.ext.fares.impl; -import static org.opentripplanner.transit.model.basic.Money.USD; - import java.util.Map; import org.opentripplanner.routing.core.FareType; import org.opentripplanner.transit.model.basic.Money; diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index 8bb3e349b60..80af574636a 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -148,10 +148,6 @@ public void addFareProduct(Leg leg, Collection fareProduct) { fareProduct.forEach(fp -> addFareProduct(leg, fp)); } - public void addFareProducts(Multimap fareProducts) { - fareProducts.forEach(this::addFareProduct); - } - public void addFareProductUses(Multimap fareProducts) { legProducts.putAll(fareProducts); } From 060e210ec8a7609721f3b07f19388cb6a0af77b0 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 11 Jan 2024 14:01:27 +0100 Subject: [PATCH 0261/1688] refactor: Convert RemoveItinerariesWithShortStreetLeg to RemoveItineraryFlagger. This also fixes a minor bug. The filter did not plug into framework, hence would not show up when using the filter chain debug freature. --- .../ItineraryListFilterChainBuilder.java | 4 ++-- .../RemoveItinerariesWithShortStreetLeg.java | 23 +++++++++++------- ...moveItinerariesWithShortStreetLegTest.java | 24 +++++++++---------- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java index ec14286e6ca..e8b8ed43c1c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java @@ -382,8 +382,8 @@ public ItineraryListFilterChain build() { } if (minBikeParkingDistance > 0) { - // TODO: use addRmFilter() here - filters.add( + addRemoveFilter( + filters, new RemoveItinerariesWithShortStreetLeg(minBikeParkingDistance, TraverseMode.BICYCLE) ); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java index 3f587840690..0014d8925a9 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java @@ -1,9 +1,9 @@ package org.opentripplanner.routing.algorithm.filterchain.filters.transit; -import java.util.List; +import java.util.function.Predicate; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.street.search.TraverseMode; /** @@ -18,10 +18,10 @@ * to reach a train station. A user would not expect to see a bike+transit shorted than 200m leg when it's * presented right next to a walk+transit leg of the same length. *

      - * In other words, this offloads the comparison part of the filter chain to a system outside of OTP and + * In other words, this offloads the comparison part of the filter chain to a system outside of OTP and * that is the reason for this non-standard approach. */ -public class RemoveItinerariesWithShortStreetLeg implements ItineraryListFilter { +public class RemoveItinerariesWithShortStreetLeg implements RemoveItineraryFlagger { private final double minDistance; private final TraverseMode traverseMode; @@ -32,11 +32,16 @@ public RemoveItinerariesWithShortStreetLeg(double minDistance, TraverseMode trav } @Override - public List filter(List itineraries) { - return itineraries.stream().filter(this::filterItinerariesWithShortStreetLeg).toList(); + public String name() { + return "remove-itineraries-with-short-street-leg"; } - private boolean filterItinerariesWithShortStreetLeg(Itinerary itinerary) { + @Override + public Predicate shouldBeFlaggedForRemoval() { + return this::removeItineraryWithShortStreetLeg; + } + + private boolean removeItineraryWithShortStreetLeg(Itinerary itinerary) { var hasLegsOfMode = itinerary.getStreetLegs().anyMatch(l -> l.getMode().equals(traverseMode)); if (hasLegsOfMode && itinerary.hasTransit()) { var distance = itinerary @@ -45,9 +50,9 @@ private boolean filterItinerariesWithShortStreetLeg(Itinerary itinerary) { .mapToDouble(Leg::getDistanceMeters) .sum(); - return distance > minDistance; + return distance <= minDistance; } else { - return true; + return false; } } } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java index 7949b6ab086..92a11485055 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLegTest.java @@ -1,16 +1,17 @@ package org.opentripplanner.routing.algorithm.filterchain.filters.transit; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; import static org.opentripplanner.street.search.TraverseMode.BICYCLE; -import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.model.plan.PlanTestConstants; class RemoveItinerariesWithShortStreetLegTest implements PlanTestConstants { - RemoveItinerariesWithShortStreetLeg filter = new RemoveItinerariesWithShortStreetLeg( + private final RemoveItinerariesWithShortStreetLeg subject = new RemoveItinerariesWithShortStreetLeg( 500, BICYCLE ); @@ -19,16 +20,15 @@ class RemoveItinerariesWithShortStreetLegTest implements PlanTestConstants { void noBikeDoesNothing() { var regularTransit = newItinerary(A).bus(30, T11_16, T11_20, C).build(); - var result = filter.filter(List.of(regularTransit, regularTransit, regularTransit)); - assertEquals(List.of(regularTransit, regularTransit, regularTransit), result); + assertFalse(subject.shouldBeFlaggedForRemoval().test(regularTransit), regularTransit.toStr()); } @Test void justBikeDoesNothing() { var itin = newItinerary(A).bicycle(T11_05, T11_06, B).build(); assertEquals(300, itin.getLegs().get(0).getDistanceMeters()); - var result = filter.filter(List.of(itin)); - assertEquals(List.of(itin), result); + + assertFalse(subject.shouldBeFlaggedForRemoval().test(itin), itin.toStr()); } @Test @@ -36,23 +36,23 @@ void zeroMinDoesNothing() { var filter = new RemoveItinerariesWithShortStreetLeg(0, BICYCLE); var itin = newItinerary(A).bicycle(T11_05, T11_06, B).rail(30, T11_16, T11_20, C).build(); assertEquals(300, itin.getLegs().get(0).getDistanceMeters()); - var result = filter.filter(List.of(itin)); - assertEquals(List.of(itin), result); + + assertFalse(filter.shouldBeFlaggedForRemoval().test(itin), itin.toStr()); } @Test void shortBike() { var itin = newItinerary(A).bicycle(T11_05, T11_06, B).rail(30, T11_16, T11_20, C).build(); assertEquals(300, itin.getLegs().get(0).getDistanceMeters()); - var result = filter.filter(List.of(itin, itin, itin)); - assertEquals(List.of(), result); + + assertTrue(subject.shouldBeFlaggedForRemoval().test(itin), itin.toStr()); } @Test void longBike() { var itin = newItinerary(A).bicycle(T11_05, T11_30, B).rail(30, T11_33, T11_50, C).build(); assertEquals(7500, itin.getLegs().get(0).getDistanceMeters()); - var result = filter.filter(List.of(itin, itin)); - assertEquals(List.of(itin, itin), result); + + assertFalse(subject.shouldBeFlaggedForRemoval().test(itin), itin.toStr()); } } From c4eb78c44f87c5668e9d26cbe91e0ce95a7851c2 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 11 Jan 2024 13:07:49 +0000 Subject: [PATCH 0262/1688] Upgrade debug client to version 2024/01/2024-01-11T13:07 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index dfb4915efcc..d9bf3a2af16 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From c225e1ec88722b25a9cb0d96386477a2f2f7870b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Thu, 11 Jan 2024 14:26:17 +0100 Subject: [PATCH 0263/1688] Assign all debug ui renovate PRs to testower --- renovate.json5 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index 19f2c097e21..ac50333d01d 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -34,7 +34,13 @@ "matchFiles": ["client-next/package.json"], "matchUpdateTypes": ["patch", "minor"], "groupName": "Debug UI dependencies (non-major)", - "schedule": ["on the first day of the week"] + "schedule": ["on the first day of the week"], + "assignees": ["testower"] + }, + { + "matchFiles": ["client-next/package.json"], + "matchUpdateTypes": ["major"], + "assignees": ["testower"] }, // gbfs-java-model patch releases are automatic dependency upgrades so we automerge { From 24d5929747795ab39bb820683ceb3d51a6fabeea Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 14:33:38 +0100 Subject: [PATCH 0264/1688] Remove extra function definition --- client-next/src/components/MapView/MapView.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 1b17e31cb88..57e718ff187 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -39,7 +39,6 @@ export function MapView({ e: mapboxgl.MapMouseEvent & { features?: mapboxgl.MapboxGeoJSONFeature[] | undefined; }, - setShowPropsPopup: (value: ((prevState: PopupData | null) => PopupData | null) | PopupData | null) => void, ) => { if (e.features) { // if you click on a cluster of map features it's possible that there are multiple @@ -64,7 +63,7 @@ export function MapView({ }} interactiveLayerIds={['regular-stop']} onClick={(e) => { - showFeaturePropPopup(e, setShowPropsPopup); + showFeaturePropPopup(e); }} // put lat/long in URL and pan to it on page reload hash={true} From b59ca33166f0ded3acabcebd43e84c401c48ca9e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 11 Jan 2024 15:18:16 +0100 Subject: [PATCH 0265/1688] doc: Update package documentation for the itinerary filter chain --- .../ItineraryListFilterChain.excalidraw | 721 +++++++++++++----- .../images/ItineraryListFilterChain.svg | 11 +- .../routing/algorithm/filterchain/package.md | 41 +- 3 files changed, 564 insertions(+), 209 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw index 3c1701f2dba..76c71874be5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw @@ -5,8 +5,8 @@ "elements": [ { "type": "arrow", - "version": 2390, - "versionNonce": 369632805, + "version": 2479, + "versionNonce": 2086276447, "isDeleted": false, "id": "uTKhXBXl80XXPjGsftdJa", "fillStyle": "hachure", @@ -15,16 +15,22 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 566.848335090324, + "x": 564.2990304950548, "y": 564.1295357290845, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 3.2043051907536437, - "height": 74.45005932341121, + "width": 0.35168042093721397, + "height": 74.3498281379907, "seed": 1822339590, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982418479, + "link": null, + "locked": false, "startBinding": { "elementId": "M76RD0PeJrkYP9LuS_Kxu", "gap": 6.688129479084512, @@ -44,15 +50,15 @@ 0 ], [ - 3.2043051907536437, - 74.45005932341121 + -0.35168042093721397, + 74.3498281379907 ] ] }, { "type": "ellipse", - "version": 919, - "versionNonce": 1250982571, + "version": 964, + "versionNonce": 465602847, "isDeleted": false, "id": "oV4YIjz-w-0HS_dvr7ZoB", "fillStyle": "hachure", @@ -61,23 +67,30 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 438.08984375, + "x": 411.91796875, "y": 643.015625, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 274.64453125, - "height": 282.50781250000006, + "width": 300.81640625000006, + "height": 317.625, "seed": 1296092422, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "uTKhXBXl80XXPjGsftdJa" - ] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "uTKhXBXl80XXPjGsftdJa" + } + ], + "updated": 1704982418479, + "link": null, + "locked": false }, { "type": "ellipse", - "version": 138, - "versionNonce": 1712254071, + "version": 139, + "versionNonce": 297704337, "isDeleted": false, "id": "iXHhu1-MD9tXNfoZZ8Rcq", "fillStyle": "hachure", @@ -94,15 +107,22 @@ "height": 170.08984375, "seed": 1752922886, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "i6hMn3CPVbRxyPcniV7yb" - ] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "i6hMn3CPVbRxyPcniV7yb" + } + ], + "updated": 1704982135037, + "link": null, + "locked": false }, { "type": "arrow", - "version": 362, - "versionNonce": 1362745241, + "version": 363, + "versionNonce": 1672962559, "isDeleted": false, "id": "i6hMn3CPVbRxyPcniV7yb", "fillStyle": "hachure", @@ -119,8 +139,14 @@ "height": 79.85129297487731, "seed": 398792602, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "startBinding": { "elementId": "NLnBzR8OLk5gbeRQGwI9f", "focus": -0.18252063102968885, @@ -147,8 +173,8 @@ }, { "type": "text", - "version": 91, - "versionNonce": 839585881, + "version": 108, + "versionNonce": 2108178065, "isDeleted": false, "id": "nJRU39yv_4LYhT-kVxv_t", "fillStyle": "hachure", @@ -157,27 +183,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 760.2421875, - "y": 705.248046875, + "x": 754.1171875, + "y": 708.740234375, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 113, + "width": 112.73989868164062, "height": 50, "seed": 1641529222, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982458252, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "Comparator\n", - "baseline": 43, "textAlign": "center", - "verticalAlign": "middle" + "verticalAlign": "middle", + "containerId": null, + "originalText": "Comparator\n", + "lineHeight": 1.25, + "baseline": 43 }, { "type": "text", - "version": 259, - "versionNonce": 505668230, + "version": 260, + "versionNonce": 1872284191, "isDeleted": false, "id": "D8AYLA3h4ksepFAEqkC7G", "fillStyle": "hachure", @@ -194,19 +227,26 @@ "height": 50, "seed": 1478178009, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "ItineraryList\nFilterChain", - "baseline": 43, "textAlign": "center", - "verticalAlign": "top" + "verticalAlign": "top", + "containerId": null, + "originalText": "ItineraryList\nFilterChain", + "lineHeight": 1.25, + "baseline": 43 }, { "type": "arrow", - "version": 589, - "versionNonce": 1147854854, + "version": 590, + "versionNonce": 180857681, "isDeleted": false, "id": "abNnvFw7GnSsRXaqnRUYs", "fillStyle": "hachure", @@ -223,8 +263,14 @@ "height": 6.933497082758379, "seed": 273649111, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "startBinding": { "elementId": "bA4uoIjQQ5b7VTjNXnYCH", "focus": 0.083136294577077, @@ -251,8 +297,8 @@ }, { "type": "rectangle", - "version": 179, - "versionNonce": 1070362266, + "version": 180, + "versionNonce": 660090431, "isDeleted": false, "id": "bA4uoIjQQ5b7VTjNXnYCH", "fillStyle": "hachure", @@ -269,15 +315,22 @@ "height": 88.37109375, "seed": 1943497081, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "abNnvFw7GnSsRXaqnRUYs" - ] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "abNnvFw7GnSsRXaqnRUYs" + } + ], + "updated": 1704982135037, + "link": null, + "locked": false }, { "type": "text", - "version": 138, - "versionNonce": 463485399, + "version": 139, + "versionNonce": 1010309425, "isDeleted": false, "id": "A4ZjgRaXH3lARCAtxxyGH", "fillStyle": "hachure", @@ -294,19 +347,26 @@ "height": 25, "seed": 770881047, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "*", - "baseline": 18, "textAlign": "left", - "verticalAlign": "top" + "verticalAlign": "top", + "containerId": null, + "originalText": "*", + "lineHeight": 1.25, + "baseline": 18 }, { "type": "line", - "version": 130, - "versionNonce": 1350932407, + "version": 131, + "versionNonce": 1440091743, "isDeleted": false, "id": "xPF7fs9PPAG3FCbgCedlx", "fillStyle": "hachure", @@ -323,8 +383,14 @@ "height": 54.202357687428616, "seed": 1466164567, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "startBinding": null, "endBinding": null, "lastCommittedPoint": null, @@ -343,8 +409,8 @@ }, { "type": "freedraw", - "version": 165, - "versionNonce": 164708486, + "version": 166, + "versionNonce": 622840593, "isDeleted": false, "id": "v7Du5WLNb590wL5Uam6Ta", "fillStyle": "hachure", @@ -361,8 +427,14 @@ "height": 19.62890625, "seed": 571266967, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "points": [ [ 0, @@ -608,8 +680,8 @@ }, { "type": "rectangle", - "version": 213, - "versionNonce": 363355223, + "version": 214, + "versionNonce": 367192703, "isDeleted": false, "id": "bXMUStvEb709SPfYF07CW", "fillStyle": "hachure", @@ -626,21 +698,26 @@ "height": 136.52343750000003, "seed": 1747224151, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "abNnvFw7GnSsRXaqnRUYs", - "DNUdRQjUxwIlQOGRroKjy", - "pRACykcqHnF03bgQc5Tc7", - "sBj3XDz6N2sSDfDg1hlEA", - "5o3WS1bjYB_SRMLHGEwV1", - "Qt7CHy0OYZwkEloLT2tU-", - "hhODwDUSnKDNHxeWgdBRh" - ] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "abNnvFw7GnSsRXaqnRUYs" + }, + { + "type": "arrow", + "id": "hhODwDUSnKDNHxeWgdBRh" + } + ], + "updated": 1704982135037, + "link": null, + "locked": false }, { "type": "arrow", - "version": 638, - "versionNonce": 1491667819, + "version": 639, + "versionNonce": 1576419569, "isDeleted": false, "id": "hhODwDUSnKDNHxeWgdBRh", "fillStyle": "hachure", @@ -657,8 +734,14 @@ "height": 236.4110879594133, "seed": 413129015, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "startBinding": { "elementId": "gL_hDnXZ2lRjaViYaG2rV", "gap": 4.0451591623761765, @@ -693,8 +776,8 @@ }, { "type": "text", - "version": 119, - "versionNonce": 992742379, + "version": 120, + "versionNonce": 1413431967, "isDeleted": false, "id": "svSoLS4U9UhcZVccLd8Kz", "fillStyle": "hachure", @@ -711,22 +794,31 @@ "height": 75, "seed": 736680902, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "PigWa1tRUEcK9ZGLifHF3", - "hhODwDUSnKDNHxeWgdBRh" + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "hhODwDUSnKDNHxeWgdBRh" + } ], + "updated": 1704982135037, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "GroupByFilter\n\n", - "baseline": 68, "textAlign": "center", - "verticalAlign": "top" + "verticalAlign": "top", + "containerId": null, + "originalText": "GroupByFilter\n\n", + "lineHeight": 1.25, + "baseline": 68 }, { "type": "ellipse", - "version": 233, - "versionNonce": 461103578, + "version": 234, + "versionNonce": 71498449, "isDeleted": false, "id": "1H3J1TVatGqsTmeb03PzM", "fillStyle": "hachure", @@ -743,13 +835,17 @@ "height": 21.5234375, "seed": 145370007, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [] + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false }, { "type": "text", - "version": 541, - "versionNonce": 1246878711, + "version": 542, + "versionNonce": 295409343, "isDeleted": false, "id": "eMUtrGSf4_tdjT-SgVl6r", "fillStyle": "hachure", @@ -766,19 +862,26 @@ "height": 25, "seed": 276931526, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "nestedFilters", - "baseline": 18, "textAlign": "left", - "verticalAlign": "top" + "verticalAlign": "top", + "containerId": null, + "originalText": "nestedFilters", + "lineHeight": 1.25, + "baseline": 18 }, { "type": "text", - "version": 199, - "versionNonce": 1740659001, + "version": 200, + "versionNonce": 412973233, "isDeleted": false, "id": "I00FPxjJzkybs748xvxYQ", "fillStyle": "hachure", @@ -795,21 +898,26 @@ "height": 25, "seed": 654279366, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "Qt7CHy0OYZwkEloLT2tU-" - ], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135037, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "*", - "baseline": 18, "textAlign": "left", - "verticalAlign": "top" + "verticalAlign": "top", + "containerId": null, + "originalText": "*", + "lineHeight": 1.25, + "baseline": 18 }, { "type": "text", - "version": 115, - "versionNonce": 1382233690, + "version": 116, + "versionNonce": 1687709407, "isDeleted": false, "id": "MNcWXxi6VbZaulu3K670q", "fillStyle": "hachure", @@ -826,19 +934,26 @@ "height": 75, "seed": 1687297177, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "Itinarary\nList\nFilter", - "baseline": 68, "textAlign": "center", - "verticalAlign": "middle" + "verticalAlign": "middle", + "containerId": null, + "originalText": "Itinarary\nList\nFilter", + "lineHeight": 1.25, + "baseline": 68 }, { "type": "rectangle", - "version": 495, - "versionNonce": 1318057157, + "version": 496, + "versionNonce": 481114769, "isDeleted": false, "id": "gL_hDnXZ2lRjaViYaG2rV", "fillStyle": "hachure", @@ -855,19 +970,22 @@ "height": 98.89843749999999, "seed": 1515944921, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "pRACykcqHnF03bgQc5Tc7", - "sBj3XDz6N2sSDfDg1hlEA", - "5o3WS1bjYB_SRMLHGEwV1", - "Qt7CHy0OYZwkEloLT2tU-", - "hhODwDUSnKDNHxeWgdBRh" - ] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "hhODwDUSnKDNHxeWgdBRh" + } + ], + "updated": 1704982135038, + "link": null, + "locked": false }, { "type": "line", - "version": 119, - "versionNonce": 311957830, + "version": 120, + "versionNonce": 1002844927, "isDeleted": false, "id": "gF_BvGrwKBQV_s0LLt7II", "fillStyle": "hachure", @@ -884,8 +1002,14 @@ "height": 65.39966988721864, "seed": 810609625, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "startBinding": null, "endBinding": null, "lastCommittedPoint": null, @@ -904,8 +1028,8 @@ }, { "type": "line", - "version": 89, - "versionNonce": 9693367, + "version": 90, + "versionNonce": 1898561649, "isDeleted": false, "id": "6V31n7Wzh9bRD4MWf72QE", "fillStyle": "hachure", @@ -922,8 +1046,14 @@ "height": 79.91170934028924, "seed": 641892473, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "startBinding": null, "endBinding": null, "lastCommittedPoint": null, @@ -942,8 +1072,8 @@ }, { "type": "line", - "version": 151, - "versionNonce": 651803289, + "version": 152, + "versionNonce": 1604680479, "isDeleted": false, "id": "jItuiRV-cqbnZuN1BUg5k", "fillStyle": "hachure", @@ -960,8 +1090,14 @@ "height": 66.58413111448289, "seed": 583293079, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "startBinding": null, "endBinding": null, "lastCommittedPoint": null, @@ -980,8 +1116,8 @@ }, { "type": "line", - "version": 122, - "versionNonce": 312292279, + "version": 123, + "versionNonce": 1943702097, "isDeleted": false, "id": "YXFr7rhGIICmJAWKZ5eUK", "fillStyle": "hachure", @@ -998,8 +1134,14 @@ "height": 60.49037211317568, "seed": 2016803833, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "startBinding": null, "endBinding": null, "lastCommittedPoint": null, @@ -1018,8 +1160,8 @@ }, { "type": "rectangle", - "version": 355, - "versionNonce": 2063763525, + "version": 356, + "versionNonce": 883343167, "isDeleted": false, "id": "M76RD0PeJrkYP9LuS_Kxu", "fillStyle": "hachure", @@ -1036,16 +1178,22 @@ "height": 95.359375, "seed": 1486134679, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "DNUdRQjUxwIlQOGRroKjy", - "uTKhXBXl80XXPjGsftdJa" - ] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "uTKhXBXl80XXPjGsftdJa" + } + ], + "updated": 1704982135038, + "link": null, + "locked": false }, { "type": "rectangle", - "version": 132, - "versionNonce": 662378169, + "version": 133, + "versionNonce": 1570183217, "isDeleted": false, "id": "NLnBzR8OLk5gbeRQGwI9f", "fillStyle": "hachure", @@ -1062,16 +1210,22 @@ "height": 95.359375, "seed": 1267074617, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [ - "ZiK53Ibs5EcfnOH3MWUmX", - "i6hMn3CPVbRxyPcniV7yb" - ] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "i6hMn3CPVbRxyPcniV7yb" + } + ], + "updated": 1704982135038, + "link": null, + "locked": false }, { "type": "text", - "version": 76, - "versionNonce": 206050586, + "version": 80, + "versionNonce": 448341841, "isDeleted": false, "id": "QxjDVUdnC9uReskEwKjsd", "fillStyle": "hachure", @@ -1080,27 +1234,39 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1183.578125, + "x": 1189.9781188964844, "y": 506.0703125, "strokeColor": "#000000", "backgroundColor": "#868e96", - "width": 157, + "width": 143.79986572265625, "height": 25, "seed": 2048669126, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "3FvznihDEqVpPp0WjjZ26", + "type": "arrow" + } + ], + "updated": 1704982138417, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, - "text": "DecoratingFilter", - "baseline": 18, + "text": "DecorateFilter", "textAlign": "center", - "verticalAlign": "middle" + "verticalAlign": "middle", + "containerId": null, + "originalText": "DecorateFilter", + "lineHeight": 1.25, + "baseline": 18 }, { "type": "text", - "version": 77, - "versionNonce": 1299176613, + "version": 80, + "versionNonce": 1615260177, "isDeleted": false, "id": "zcbS0wgQbYVDRmrAUTDaV", "fillStyle": "hachure", @@ -1109,27 +1275,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 467.625, + "x": 509.32505798339844, "y": 500.16796875, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 205, + "width": 121.59988403320312, "height": 25, "seed": 1535284294, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, - "text": "DeletionFlaggingFilter", - "baseline": 18, + "text": "RemoveFilter", "textAlign": "center", - "verticalAlign": "top" + "verticalAlign": "top", + "containerId": null, + "originalText": "RemoveFilter", + "lineHeight": 1.25, + "baseline": 18 }, { "type": "rectangle", - "version": 224, - "versionNonce": 1434841862, + "version": 226, + "versionNonce": 832812785, "isDeleted": false, "id": "sVoxOi_goA0Vz9JvN_EuG", "fillStyle": "hachure", @@ -1146,13 +1319,22 @@ "height": 95.359375, "seed": 1742969881, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [] + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "3FvznihDEqVpPp0WjjZ26", + "type": "arrow" + } + ], + "updated": 1704982142587, + "link": null, + "locked": false }, { "type": "text", - "version": 71, - "versionNonce": 617977913, + "version": 72, + "versionNonce": 81887217, "isDeleted": false, "id": "5bXiMRSAbkBVDNzuMHYjg", "fillStyle": "hachure", @@ -1169,19 +1351,26 @@ "height": 25, "seed": 926646726, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, "text": "SortingFilter", - "baseline": 18, "textAlign": "center", - "verticalAlign": "middle" + "verticalAlign": "middle", + "containerId": null, + "originalText": "SortingFilter", + "lineHeight": 1.25, + "baseline": 18 }, { "type": "line", - "version": 154, - "versionNonce": 182849495, + "version": 155, + "versionNonce": 1407939487, "isDeleted": false, "id": "Ugnzj7K6hXFkke4frMlUY", "fillStyle": "hachure", @@ -1198,8 +1387,14 @@ "height": 3.082508331146073, "seed": 787790041, "groupIds": [], - "strokeSharpness": "round", - "boundElementIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982135038, + "link": null, + "locked": false, "startBinding": null, "endBinding": null, "lastCommittedPoint": null, @@ -1218,8 +1413,8 @@ }, { "type": "text", - "version": 451, - "versionNonce": 768155173, + "version": 681, + "versionNonce": 1609777361, "isDeleted": false, "id": "5pmOYWhziuLQ_DZANfOzI", "fillStyle": "hachure", @@ -1228,26 +1423,154 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 487.65625, - "y": 677.744140625, + "x": 418.52866278754334, + "y": 718.146484375, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 179, - "height": 225, + "width": 289.0015563964844, + "height": 145.5729166666666, "seed": 2016628486, "groupIds": [], - "strokeSharpness": "sharp", - "boundElementIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982452010, + "link": null, + "locked": false, + "fontSize": 19.409722222222214, + "fontFamily": 1, + "text": "RemoveItineraryFlagger\n---\nname()\nshouldBeFlaggedForRemoval()\nskipAlreadyFlaggedItineraries()\n", + "textAlign": "center", + "verticalAlign": "top", + "containerId": null, + "originalText": "RemoveItineraryFlagger\n---\nname()\nshouldBeFlaggedForRemoval()\nskipAlreadyFlaggedItineraries()\n", + "lineHeight": 1.25, + "baseline": 138 + }, + { + "type": "ellipse", + "version": 377, + "versionNonce": 1136001105, + "isDeleted": false, + "id": "-Wb1113k5o16q_0IwIAB8", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1156.7592311487206, + "y": 671.1135670590127, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 208.52734375, + "height": 199.65234375000003, + "seed": 1166357119, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "type": "arrow", + "id": "3FvznihDEqVpPp0WjjZ26" + } + ], + "updated": 1704982236097, + "link": null, + "locked": false + }, + { + "type": "arrow", + "version": 907, + "versionNonce": 1010622481, + "isDeleted": false, + "id": "3FvznihDEqVpPp0WjjZ26", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1258.7430659828142, + "y": 573.1253432215196, + "strokeColor": "#000000", + "backgroundColor": "#868e96", + "width": 1.9333557957434095, + "height": 93.76169170168737, + "seed": 1750633119, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1704982236097, + "link": null, + "locked": false, + "startBinding": { + "elementId": "sVoxOi_goA0Vz9JvN_EuG", + "gap": 4.390968221519643, + "focus": 0.06426443161706548 + }, + "endBinding": { + "elementId": "-Wb1113k5o16q_0IwIAB8", + "gap": 4.227062776875528, + "focus": 0.017251680890168403 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1.9333557957434095, + 93.76169170168737 + ] + ] + }, + { + "type": "text", + "version": 396, + "versionNonce": 8009937, + "isDeleted": false, + "id": "mO-wquP1JTkteitq9b6D4", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1165.4773936853417, + "y": 728.7756764340127, + "strokeColor": "#000000", + "backgroundColor": "transparent", + "width": 189.45982360839844, + "height": 75, + "seed": 1665916607, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1704982474848, + "link": null, + "locked": false, "fontSize": 20, "fontFamily": 1, - "text": "Itinerary\nDeletionFlagger\n-------\npredicate()\ngetFlagged\nItineraries(List)\nskipAlreadyFlagged\nItineraries()\n", - "baseline": 218, + "text": "ItineraryDecorator\n---\ndecorate(Itinerary)", "textAlign": "center", - "verticalAlign": "top" + "verticalAlign": "middle", + "containerId": null, + "originalText": "ItineraryDecorator\n---\ndecorate(Itinerary)", + "lineHeight": 1.25, + "baseline": 68 } ], "appState": { "gridSize": null, "viewBackgroundColor": "#ffffff" - } + }, + "files": {} } \ No newline at end of file diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg index 06f65809fab..087866ea971 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg @@ -1,8 +1,8 @@ - + - - Comparator<Itinerary>ItineraryListFilterChain*GroupByFilter<GroupId>nestedFilters*ItinararyListFilterDecoratingFilterDeletionFlaggingFilterSortingFilterItineraryDeletionFlagger-------predicate()getFlaggedItineraries(List)skipAlreadyFlaggedItineraries() \ No newline at end of file + Comparator<Itinerary>ItineraryListFilterChain*GroupByFilter<GroupId>nestedFilters*ItinararyListFilterDecorateFilterRemoveFilterSortingFilterRemoveItineraryFlagger---name()shouldBeFlaggedForRemoval()skipAlreadyFlaggedItineraries()ItineraryDecorator---decorate(Itinerary) \ No newline at end of file diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md index 7441e5f0849..ed8ca0d4d7b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md @@ -1,17 +1,17 @@ # ItineraryListFilterChain -ItineraryListFilterChain is a mechanism for post-processing itinerary results. It contains a list of -Each of which contains different business logic for a different operation. They not only remove -itineraries, but can be also used for sorting, decorating or even adding new itineraries. The filter -chain is also responsible for creating routing errors, if no itineraries remain after filtering. -Itineraries are flagged for deletion, but not actually deleted when debugging is turned on. When -debugging is off, the chain actually removes those itineraries that were flagged for deletion. +ItineraryListFilterChain is a mechanism for post-processing itinerary results. There are filters +for removing itineraries, sorting them and for decorating itineraries with more information like +fares. The filter chain is also responsible for creating routing errors, if no itineraries remain +after filtering. Itineraries are flagged for deletion, but not deleted when debugging is turned on. +When debugging is off, the chain removes those itineraries after all filters are complete. ![Architecture diagram](images/ItineraryListFilterChain.svg) There are four types of filters, which can be included in the filter chain. The same type of filter can appear multiple times. + ## DeletionFlaggingFilter DeletionFlaggingFilter is responsible for flagging itineraries for deletion. It does not remove any @@ -22,19 +22,46 @@ selecting if the filter should skip already flagged itineraries to the flagger. disable, in case already removed itineraries are useful in comparing whether other itineraries should be flagged for removal. + ## SortingFilter SortingFilter is responsible for sorting the itineraries. It does this by having a Comparator, which is used for sorting. + ## GroupByFilter GroupByFilter is used to group itineraries together using a `GroupId`, and running a set of filters on that subset of itineraries. This is used eg. to remove almost similar search results and to sort them, so that only the best are shown to the user. + ## DecoratingFilter DecorationgFilter can be used to decorate the itineraries. This can be used eg to add information about ticketing and fares for each itinerary, and refining the routing cost of the itinerary, which -might affect the sorting order of the itineraries, depending on the order of the filters. \ No newline at end of file +might affect the sorting order of the itineraries, depending on the order of the filters. + + +## Package structure + +We try to separate use-case specific code (`filters`) and the generic filter chain implementation. +Here is an overview of the packages and their responsibilities. + +``` +filterchain +├── api Request parameters passed into the filter chain +├── filters Concreate filter implementations +│ ├── street For decorating/filtering street itineraries +│ ├── system Mainly support for otp features like paging and search-window crop +│ └── transit For decorating/filtering itineraries with transit +│ └── group Transit group filters +├── framework Generic filter chain implementation +│ ├── filter Filter implementation +│ ├── filterchain Domain logic used by the `FilterChain` (agreagate root). +│ ├── groupids Generic groupId implementations. These can be used to as lego to build specific group-by filters. +│ ├── sort Sorting implementation +│ └── spi The interfaces to extend to plug into the filter-chain +└── images Images used in the doc + +``` From bdffc557f115126147506c8f793d2797abe2891c Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 11 Jan 2024 14:43:21 +0000 Subject: [PATCH 0266/1688] Add changelog entry for #5604 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 7458295b9ba..fa3615b90b3 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -72,6 +72,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Adding situation-version to TransmodelGraphQL API [#5592](https://github.com/opentripplanner/OpenTripPlanner/pull/5592) - Move REST API into sandbox [#5580](https://github.com/opentripplanner/OpenTripPlanner/pull/5580) - Fix high walk reluctance leading to zero egress results for rental searches [#5605](https://github.com/opentripplanner/OpenTripPlanner/pull/5605) +- Remove GTFS-RT websocket updater [#5604](https://github.com/opentripplanner/OpenTripPlanner/pull/5604) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From b554800ebf90b66628590e79b7ce2702a6325a5f Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Thu, 11 Jan 2024 14:43:37 +0000 Subject: [PATCH 0267/1688] Bump serialization version id for #5604 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6567356b392..abd70a60749 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 135 + 136 30.1 2.50 From cf5d875fbf4dd003023e4a506ac8a84d0175d8a7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 15:50:30 +0100 Subject: [PATCH 0268/1688] Remove extra method call indirection --- client-next/src/components/MapView/MapView.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 57e718ff187..5b6223a5dee 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -62,9 +62,7 @@ export function MapView({ setShowContextPopup(e.lngLat); }} interactiveLayerIds={['regular-stop']} - onClick={(e) => { - showFeaturePropPopup(e); - }} + onClick={showFeaturePropPopup} // put lat/long in URL and pan to it on page reload hash={true} // disable pitching and rotating the map From 6ab81142e4a17029e3a86a5b41e7cbab96af69f2 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 11 Jan 2024 16:03:16 +0000 Subject: [PATCH 0269/1688] Add changelog entry for #5602 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index fa3615b90b3..50846c3fce7 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -73,6 +73,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Move REST API into sandbox [#5580](https://github.com/opentripplanner/OpenTripPlanner/pull/5580) - Fix high walk reluctance leading to zero egress results for rental searches [#5605](https://github.com/opentripplanner/OpenTripPlanner/pull/5605) - Remove GTFS-RT websocket updater [#5604](https://github.com/opentripplanner/OpenTripPlanner/pull/5604) +- Add stop layer to new Debug UI [#5602](https://github.com/opentripplanner/OpenTripPlanner/pull/5602) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From ab694b8efb80bf856a1fb468ef03a9d97c514cfe Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 11 Jan 2024 16:04:27 +0000 Subject: [PATCH 0270/1688] Upgrade debug client to version 2024/01/2024-01-11T16:03 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index d9bf3a2af16..5f77418dbe6 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From c39c366b27d50602e5507c9206cd18696e3f6d48 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 16:19:11 +0100 Subject: [PATCH 0271/1688] Add documentation about MQTT updater --- doc-templates/UpdaterConfig.md | 13 ++- docs/RouterConfiguration.md | 7 ++ docs/UpdaterConfig.md | 82 +++++++++++++++++-- docs/sandbox/SiriUpdater.md | 30 +++---- .../standalone/config/router-config.json | 8 ++ 5 files changed, 115 insertions(+), 25 deletions(-) diff --git a/doc-templates/UpdaterConfig.md b/doc-templates/UpdaterConfig.md index a239317f244..57152671ec7 100644 --- a/doc-templates/UpdaterConfig.md +++ b/doc-templates/UpdaterConfig.md @@ -8,8 +8,8 @@ # Updater configuration -This section covers all options that can be set in the *router-config.json* in the -[updaters](RouterConfiguration.md) section. +This section covers options that can be set in the updaters section of `router-config.json`. +See the parameter summary and examples in the router configuration documentation Real-time data are those that are not added to OTP during the graph build phase but during runtime. @@ -44,6 +44,15 @@ The information is downloaded in a single HTTP request and polled regularly. +### Streaming TripUpdates via MQTT + +This updater connects to an MQTT broker and processes TripUpdates in a streaming fashion. This means +that they will be applied individually in near-realtime rather than in batches at a certain interval. + +This system powers the realtime updates in Helsinki and more information can be found +[on Github](https://github.com/HSLdevcom/transitdata). + + ### Vehicle Positions diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 30e423f29b1..5ca87a2aefa 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -727,6 +727,13 @@ Used to group requests when monitoring OTP. "Authorization" : "A-Token" } }, + { + "type" : "mqtt-gtfs-rt-updater", + "url" : "tcp://pred.rt.hsl.fi", + "topic" : "gtfsrt/v2/fi/hsl/tu", + "feedId" : "HSL", + "fuzzyTripMatching" : true + }, { "type" : "vehicle-positions", "url" : "https://s3.amazonaws.com/kcm-alerts-realtime-prod/vehiclepositions.pb", diff --git a/docs/UpdaterConfig.md b/docs/UpdaterConfig.md index 6c219d07ddf..212a2d55370 100644 --- a/docs/UpdaterConfig.md +++ b/docs/UpdaterConfig.md @@ -8,8 +8,8 @@ # Updater configuration -This section covers all options that can be set in the *router-config.json* in the -[updaters](RouterConfiguration.md) section. +This section covers options that can be set in the updaters section of `router-config.json`. +See the parameter summary and examples in the router configuration documentation Real-time data are those that are not added to OTP during the graph build phase but during runtime. @@ -164,6 +164,72 @@ HTTP headers to add to the request. Any header key, value can be inserted. +### Streaming TripUpdates via MQTT + +This updater connects to an MQTT broker and processes TripUpdates in a streaming fashion. This means +that they will be applied individually in near-realtime rather than in batches at a certain interval. + +This system powers the realtime updates in Helsinki and more information can be found +[on Github](https://github.com/HSLdevcom/transitdata). + + + + +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|-----------------------------------------------------------------------|:---------:|----------------------------------------------|:----------:|----------------------|:-----:| +| type = "mqtt-gtfs-rt-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [backwardsDelayPropagationType](#u__6__backwardsDelayPropagationType) | `enum` | How backwards propagation should be handled. | *Optional* | `"required-no-data"` | 2.2 | +| feedId | `string` | The feed id to apply the updates to. | *Required* | | na | +| fuzzyTripMatching | `boolean` | Whether to match trips fuzzily. | *Optional* | `false` | na | +| qos | `integer` | QOS level. | *Optional* | `0` | na | +| topic | `string` | The topic to subscribe to. | *Required* | | na | +| url | `string` | URL of the MQTT broker. | *Required* | | na | + + +##### Parameter details + +

      backwardsDelayPropagationType

      + +**Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"required-no-data"` +**Path:** /updaters/[6] +**Enum values:** `required-no-data` | `required` | `always` + +How backwards propagation should be handled. + + REQUIRED_NO_DATA: + Default value. Only propagates delays backwards when it is required to ensure that the times + are increasing, and it sets the NO_DATA flag on the stops so these automatically updated times + are not exposed through APIs. + + REQUIRED: + Only propagates delays backwards when it is required to ensure that the times are increasing. + The updated times are exposed through APIs. + + ALWAYS: + Propagates delays backwards on stops with no estimates regardless if it's required or not. + The updated times are exposed through APIs. + + + + +##### Example configuration + +```JSON +// router-config.json +{ + "updaters" : [ + { + "type" : "mqtt-gtfs-rt-updater", + "url" : "tcp://pred.rt.hsl.fi", + "topic" : "gtfsrt/v2/fi/hsl/tu", + "feedId" : "HSL", + "fuzzyTripMatching" : true + } + ] +} +``` + + ### Vehicle Positions @@ -181,24 +247,24 @@ The information is downloaded in a single HTTP request and polled regularly. | frequency | `duration` | How often the positions should be updated. | *Optional* | `"PT1M"` | 2.2 | | fuzzyTripMatching | `boolean` | Whether to match trips fuzzily. | *Optional* | `false` | 2.5 | | url | `uri` | The URL of GTFS-RT protobuf HTTP resource to download the positions from. | *Required* | | 2.2 | -| [features](#u__6__features) | `enum set` | Which features of GTFS RT vehicle positions should be loaded into OTP. | *Optional* | | 2.5 | -| [headers](#u__6__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [features](#u__7__features) | `enum set` | Which features of GTFS RT vehicle positions should be loaded into OTP. | *Optional* | | 2.5 | +| [headers](#u__7__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

      features

      +

      features

      **Since version:** `2.5` ∙ **Type:** `enum set` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[6] +**Path:** /updaters/[7] **Enum values:** `position` | `stop-position` | `occupancy` Which features of GTFS RT vehicle positions should be loaded into OTP. -

      headers

      +

      headers

      **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[6] +**Path:** /updaters/[7] HTTP headers to add to the request. Any header key, value can be inserted. diff --git a/docs/sandbox/SiriUpdater.md b/docs/sandbox/SiriUpdater.md index 7730df67d12..f6c4c3f999f 100644 --- a/docs/sandbox/SiriUpdater.md +++ b/docs/sandbox/SiriUpdater.md @@ -37,16 +37,16 @@ To enable the SIRI updater you need to add it to the updaters section of the `ro | previewInterval | `duration` | TODO | *Optional* | | 2.0 | | requestorRef | `string` | The requester reference. | *Optional* | | 2.0 | | timeout | `duration` | The HTTP timeout to download the updates. | *Optional* | `"PT15S"` | 2.0 | -| [url](#u__7__url) | `string` | The URL to send the HTTP requests to. | *Required* | | 2.0 | -| [headers](#u__7__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [url](#u__8__url) | `string` | The URL to send the HTTP requests to. | *Required* | | 2.0 | +| [headers](#u__8__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

      url

      +

      url

      **Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /updaters/[7] +**Path:** /updaters/[8] The URL to send the HTTP requests to. @@ -58,10 +58,10 @@ renamed by the loader when processed: -

      headers

      +

      headers

      **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[7] +**Path:** /updaters/[8] HTTP headers to add to the request. Any header key, value can be inserted. @@ -97,21 +97,21 @@ HTTP headers to add to the request. Any header key, value can be inserted. |---------------------------------|:---------------:|--------------------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| | type = "siri-sx-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | | blockReadinessUntilInitialized | `boolean` | Whether catching up with the updates should block the readiness check from returning a 'ready' result. | *Optional* | `false` | 2.0 | -| [earlyStart](#u__8__earlyStart) | `duration` | This value is subtracted from the actual validity defined in the message. | *Optional* | `"PT0S"` | 2.0 | +| [earlyStart](#u__9__earlyStart) | `duration` | This value is subtracted from the actual validity defined in the message. | *Optional* | `"PT0S"` | 2.0 | | feedId | `string` | The ID of the feed to apply the updates to. | *Required* | | 2.0 | | frequency | `duration` | How often the updates should be retrieved. | *Optional* | `"PT1M"` | 2.0 | | requestorRef | `string` | The requester reference. | *Optional* | | 2.0 | | timeout | `duration` | The HTTP timeout to download the updates. | *Optional* | `"PT15S"` | 2.0 | -| [url](#u__8__url) | `string` | The URL to send the HTTP requests to. Supports http/https and file protocol. | *Required* | | 2.0 | -| [headers](#u__8__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [url](#u__9__url) | `string` | The URL to send the HTTP requests to. Supports http/https and file protocol. | *Required* | | 2.0 | +| [headers](#u__9__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

      earlyStart

      +

      earlyStart

      **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` -**Path:** /updaters/[8] +**Path:** /updaters/[9] This value is subtracted from the actual validity defined in the message. @@ -119,10 +119,10 @@ Normally the planned departure time is used, so setting this to 10s will cause t SX-message to be included in trip-results 10 seconds before the the planned departure time. -

      url

      +

      url

      **Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /updaters/[8] +**Path:** /updaters/[9] The URL to send the HTTP requests to. Supports http/https and file protocol. @@ -135,10 +135,10 @@ renamed by the loader when processed: -

      headers

      +

      headers

      **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[8] +**Path:** /updaters/[9] HTTP headers to add to the request. Any header key, value can be inserted. diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 1a5eec22a28..5abb5ef87a6 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -283,6 +283,14 @@ "Authorization": "A-Token" } }, + // Streaming GTFS-RT TripUpdates through an MQTT broker + { + "type": "mqtt-gtfs-rt-updater", + "url": "tcp://pred.rt.hsl.fi", + "topic": "gtfsrt/v2/fi/hsl/tu", + "feedId": "HSL", + "fuzzyTripMatching": true + }, // Polling for GTFS-RT Vehicle Positions - output can be fetched via trip pattern GraphQL API { "type": "vehicle-positions", From 31896ea58e69190f6520fc39e268f9c9509f7501 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 02:09:23 +0000 Subject: [PATCH 0272/1688] Update dependency org.mockito:mockito-core to v5.9.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index abd70a60749..e5f86fe5b66 100644 --- a/pom.xml +++ b/pom.xml @@ -713,7 +713,7 @@ org.mockito mockito-core - 5.8.0 + 5.9.0 test From 28a46b4898828145b00e53ee8d9d8da28c578bda Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Jan 2024 23:16:02 +0100 Subject: [PATCH 0273/1688] Add debug vector layer for displaying edges --- .../src/components/MapView/MapView.tsx | 18 +++--- .../apis/vectortiles/DebugStyleSpec.java | 61 ++++++++++++++++--- .../GraphInspectorVectorTileResource.java | 22 ++++--- .../vectortiles/model/LayerStyleBuilder.java | 33 ++++++++++ .../apis/vectortiles/model/LayerType.java | 1 + .../vector/edges/EdgeLayerBuilder.java | 34 +++++++++++ .../vector/edges/EdgePropertyMapper.java | 30 +++++++++ .../apis/vectortiles/DebugStyleSpecTest.java | 3 +- 8 files changed, 178 insertions(+), 24 deletions(-) create mode 100644 src/main/java/org/opentripplanner/inspector/vector/edges/EdgeLayerBuilder.java create mode 100644 src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 5b6223a5dee..87c8a61e256 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -1,12 +1,12 @@ -import { LngLat, Map, MapboxGeoJSONFeature, NavigationControl } from 'react-map-gl'; +import {LngLat, Map, MapboxGeoJSONFeature, NavigationControl} from 'react-map-gl'; import 'maplibre-gl/dist/maplibre-gl.css'; -import { TripPattern, TripQuery, TripQueryVariables } from '../../gql/graphql.ts'; -import { NavigationMarkers } from './NavigationMarkers.tsx'; -import { LegLines } from './LegLines.tsx'; -import { useMapDoubleClick } from './useMapDoubleClick.ts'; -import { useState } from 'react'; -import { ContextMenuPopup } from './ContextMenuPopup.tsx'; -import { GeometryPropertyPopup } from './GeometryPropertyPopup.tsx'; +import {TripPattern, TripQuery, TripQueryVariables} from '../../gql/graphql.ts'; +import {NavigationMarkers} from './NavigationMarkers.tsx'; +import {LegLines} from './LegLines.tsx'; +import {useMapDoubleClick} from './useMapDoubleClick.ts'; +import {useState} from 'react'; +import {ContextMenuPopup} from './ContextMenuPopup.tsx'; +import {GeometryPropertyPopup} from './GeometryPropertyPopup.tsx'; // TODO: this should be configurable const initialViewState = { @@ -61,7 +61,7 @@ export function MapView({ onContextMenu={(e) => { setShowContextPopup(e.lngLat); }} - interactiveLayerIds={['regular-stop']} + interactiveLayerIds={['regular-stop', 'edge-fallback', 'edge', 'link']} onClick={showFeaturePropPopup} // put lat/long in URL and pan to it on page reload hash={true} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index ff933901cf8..47ad5d5be36 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -6,6 +6,14 @@ import org.opentripplanner.apis.vectortiles.model.TileSource; import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; +import org.opentripplanner.street.model.edge.AreaEdge; +import org.opentripplanner.street.model.edge.BoardingLocationToStopLink; +import org.opentripplanner.street.model.edge.EscalatorEdge; +import org.opentripplanner.street.model.edge.StreetEdge; +import org.opentripplanner.street.model.edge.StreetTransitEntranceLink; +import org.opentripplanner.street.model.edge.StreetTransitStopLink; +import org.opentripplanner.street.model.edge.TemporaryFreeEdge; +import org.opentripplanner.street.model.edge.TemporaryPartialStreetEdge; /** * A Mapbox/Mapblibre style specification for rendering debug information about transit and @@ -19,21 +27,60 @@ public class DebugStyleSpec { 256, "© OpenStreetMap Contributors" ); + private static final String MAGENTA = "#f21d52"; + private static final String YELLOW = "#e2d40d"; + private static final String GREY = "#8e8e89"; + private static final int MAX_ZOOM = 23; public record VectorSourceLayer(VectorSource vectorSource, String vectorLayer) {} - static StyleSpec build(VectorSource debugSource, VectorSourceLayer regularStops) { + static StyleSpec build( + VectorSource debugSource, + VectorSourceLayer regularStops, + VectorSourceLayer edges + ) { List sources = List.of(BACKGROUND_SOURCE, debugSource); return new StyleSpec( "OTP Debug Tiles", sources, List.of( + LayerStyleBuilder.ofId("background").typeRaster().source(BACKGROUND_SOURCE).minZoom(0), LayerStyleBuilder - .ofId("background") - .typeRaster() - .source(BACKGROUND_SOURCE) - .minZoom(0) - .maxZoom(22), + .ofId("edge-fallback") + .typeLine() + .vectorSourceLayer(edges) + .lineColor(GREY) + .lineWidth(3) + .minZoom(15) + .maxZoom(MAX_ZOOM), + LayerStyleBuilder + .ofId("edge") + .typeLine() + .vectorSourceLayer(edges) + .lineColor(MAGENTA) + .edgeFilter( + StreetEdge.class, + AreaEdge.class, + EscalatorEdge.class, + TemporaryPartialStreetEdge.class, + TemporaryFreeEdge.class + ) + .lineWidth(3) + .minZoom(13) + .maxZoom(MAX_ZOOM), + LayerStyleBuilder + .ofId("link") + .typeLine() + .vectorSourceLayer(edges) + .lineColor(YELLOW) + .edgeFilter( + StreetTransitStopLink.class, + StreetTransitEntranceLink.class, + BoardingLocationToStopLink.class + ) + .lineWidth(3) + .minZoom(13) + .maxZoom(MAX_ZOOM), LayerStyleBuilder .ofId("regular-stop") .typeCircle() @@ -41,7 +88,7 @@ static StyleSpec build(VectorSource debugSource, VectorSourceLayer regularStops) .circleStroke("#140d0e", 2) .circleColor("#fcf9fa") .minZoom(13) - .maxZoom(22) + .maxZoom(MAX_ZOOM) ) ); } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 67f92f01ee3..e2008eaea29 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -1,5 +1,8 @@ package org.opentripplanner.apis.vectortiles; +import static org.opentripplanner.apis.vectortiles.model.LayerType.Edges; +import static org.opentripplanner.apis.vectortiles.model.LayerType.GeofencingZones; +import static org.opentripplanner.apis.vectortiles.model.LayerType.RegularStop; import static org.opentripplanner.framework.io.HttpUtils.APPLICATION_X_PROTOBUF; import jakarta.ws.rs.GET; @@ -28,6 +31,7 @@ import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.inspector.vector.VectorTileResponseFactory; +import org.opentripplanner.inspector.vector.edges.EdgeLayerBuilder; import org.opentripplanner.inspector.vector.geofencing.GeofencingZonesLayerBuilder; import org.opentripplanner.inspector.vector.stop.StopLayerBuilder; import org.opentripplanner.model.FeedInfo; @@ -40,19 +44,18 @@ @Path("/routers/{ignoreRouterId}/inspector/vectortile") public class GraphInspectorVectorTileResource { - private static final LayerParams REGULAR_STOPS = new LayerParams( - "regularStops", - LayerType.RegularStop - ); + private static final LayerParams REGULAR_STOPS = new LayerParams("regularStops", RegularStop); private static final LayerParams AREA_STOPS = new LayerParams("areaStops", LayerType.AreaStop); private static final LayerParams GEOFENCING_ZONES = new LayerParams( "geofencingZones", - LayerType.GeofencingZones + GeofencingZones ); + private static final LayerParams EDGES = new LayerParams("edges", Edges); private static final List> DEBUG_LAYERS = List.of( REGULAR_STOPS, AREA_STOPS, - GEOFENCING_ZONES + GEOFENCING_ZONES, + EDGES ); private final OtpServerRequestContext serverContext; @@ -131,7 +134,11 @@ public StyleSpec getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) ); var vectorSource = new VectorSource("debug", url); - return DebugStyleSpec.build(vectorSource, REGULAR_STOPS.toVectorSourceLayer(vectorSource)); + return DebugStyleSpec.build( + vectorSource, + REGULAR_STOPS.toVectorSourceLayer(vectorSource), + EDGES.toVectorSourceLayer(vectorSource) + ); } @Nonnull @@ -162,6 +169,7 @@ private static LayerBuilder createLayerBuilder( e -> context.transitService().findAreaStops(e) ); case GeofencingZones -> new GeofencingZonesLayerBuilder(context.graph(), layerParameters); + case Edges -> new EdgeLayerBuilder(context.graph(), layerParameters); }; } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index 41144611f92..52455102ccd 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -2,12 +2,16 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.Arrays; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Stream; import org.opentripplanner.apis.vectortiles.DebugStyleSpec.VectorSourceLayer; +import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.json.ObjectMappers; +import org.opentripplanner.street.model.edge.Edge; /** * Builds a Maplibre/Mapbox vector tile @@ -20,6 +24,7 @@ public class LayerStyleBuilder { private static final String SOURCE_LAYER = "source-layer"; private final Map props = new HashMap<>(); private final Map paint = new HashMap<>(); + private List filter = List.of(); public static LayerStyleBuilder ofId(String id) { return new LayerStyleBuilder(id); @@ -32,6 +37,7 @@ public LayerStyleBuilder vectorSourceLayer(VectorSourceLayer source) { public enum LayerType { Circle, + Line, Raster, } @@ -75,6 +81,10 @@ public LayerStyleBuilder typeCircle() { return type(LayerType.Circle); } + public LayerStyleBuilder typeLine() { + return type(LayerType.Line); + } + private LayerStyleBuilder type(LayerType type) { props.put(TYPE, type.name().toLowerCase()); return this; @@ -91,6 +101,26 @@ public LayerStyleBuilder circleStroke(String color, int width) { return this; } + // Line styling + + public LayerStyleBuilder lineColor(String color) { + paint.put("line-color", validateColor(color)); + return this; + } + + public LayerStyleBuilder lineWidth(float width) { + paint.put("line-width", width); + return this; + } + + // filtering edge + @SafeVarargs + public final LayerStyleBuilder edgeFilter(Class... classToFilter) { + var clazzes = Arrays.stream(classToFilter).map(Class::getSimpleName).toList(); + filter = ListUtils.combine(List.of("in", "class"), clazzes); + return this; + } + public JsonNode toJson() { validate(); @@ -98,6 +128,9 @@ public JsonNode toJson() { if (!paint.isEmpty()) { copy.put("paint", paint); } + if (!filter.isEmpty()) { + copy.put("filter", filter); + } return OBJECT_MAPPER.valueToTree(copy); } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java index f4cb7a636fa..4324a511a6b 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java @@ -4,4 +4,5 @@ public enum LayerType { RegularStop, AreaStop, GeofencingZones, + Edges, } diff --git a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgeLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/edges/EdgeLayerBuilder.java new file mode 100644 index 00000000000..60e65f7b35a --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/edges/EdgeLayerBuilder.java @@ -0,0 +1,34 @@ +package org.opentripplanner.inspector.vector.edges; + +import java.util.List; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.inspector.vector.LayerBuilder; +import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.routing.graph.Graph; +import org.opentripplanner.routing.graph.index.StreetIndex; +import org.opentripplanner.street.model.edge.Edge; + +public class EdgeLayerBuilder extends LayerBuilder { + + private final StreetIndex streetIndex; + + public EdgeLayerBuilder(Graph graph, LayerParameters layerParameters) { + super(new EdgePropertyMapper(), layerParameters.name(), layerParameters.expansionFactor()); + this.streetIndex = graph.getStreetIndex(); + } + + @Override + protected List getGeometries(Envelope query) { + return streetIndex + .getEdgesForEnvelope(query) + .stream() + .filter(e -> e.getGeometry() != null) + .map(edge -> { + Geometry geometry = edge.getGeometry(); + geometry.setUserData(edge); + return geometry; + }) + .toList(); + } +} diff --git a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java new file mode 100644 index 00000000000..393f7132798 --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java @@ -0,0 +1,30 @@ +package org.opentripplanner.inspector.vector.edges; + +import static org.opentripplanner.inspector.vector.KeyValue.kv; + +import java.util.Collection; +import java.util.List; +import org.opentripplanner.apis.support.mapping.PropertyMapper; +import org.opentripplanner.framework.collection.ListUtils; +import org.opentripplanner.inspector.vector.KeyValue; +import org.opentripplanner.street.model.edge.Edge; +import org.opentripplanner.street.model.edge.EscalatorEdge; +import org.opentripplanner.street.model.edge.StreetEdge; + +public class EdgePropertyMapper extends PropertyMapper { + + @Override + protected Collection map(Edge input) { + List baseProps = List.of(kv("class", input.getClass().getSimpleName())); + List properties = + switch (input) { + case StreetEdge e -> List.of( + kv("permission", e.getPermission().toString()), + kv("bicycleSafetyFactor", e.getBicycleSafetyFactor()) + ); + case EscalatorEdge e -> List.of(kv("distance", e.getDistanceMeters())); + default -> List.of(); + }; + return ListUtils.combine(baseProps, properties); + } +} diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index d685e07a2f2..5cca178550a 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -16,7 +16,8 @@ class DebugStyleSpecTest { void spec() { var vectorSource = new VectorSource("vectorSource", "https://example.com"); var regularStops = new VectorSourceLayer(vectorSource, "regularStops"); - var spec = DebugStyleSpec.build(vectorSource, regularStops); + var edges = new VectorSourceLayer(vectorSource, "edges"); + var spec = DebugStyleSpec.build(vectorSource, regularStops, edges); var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); var expectation = RES.fileToString("style.json"); From a74d878b70426f3c8a46ef075729978b8020b35f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 12 Jan 2024 00:00:43 +0100 Subject: [PATCH 0274/1688] Finetune edge styling --- .../apis/vectortiles/DebugStyleSpec.java | 20 ++- .../vectortiles/model/LayerStyleBuilder.java | 29 +++- .../vector/edges/EdgePropertyMapper.java | 3 +- .../apis/vectortiles/DebugStyleSpecTest.java | 4 +- .../apis/vectortiles/style.json | 145 ++++++++++++++---- 5 files changed, 161 insertions(+), 40 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 47ad5d5be36..1508575d336 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -2,16 +2,20 @@ import java.util.List; import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder; +import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder.ZoomDependentNumber; +import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder.ZoomStop; import org.opentripplanner.apis.vectortiles.model.StyleSpec; import org.opentripplanner.apis.vectortiles.model.TileSource; import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; +import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; import org.opentripplanner.street.model.edge.AreaEdge; import org.opentripplanner.street.model.edge.BoardingLocationToStopLink; import org.opentripplanner.street.model.edge.EscalatorEdge; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.StreetTransitEntranceLink; import org.opentripplanner.street.model.edge.StreetTransitStopLink; +import org.opentripplanner.street.model.edge.StreetVehicleParkingLink; import org.opentripplanner.street.model.edge.TemporaryFreeEdge; import org.opentripplanner.street.model.edge.TemporaryPartialStreetEdge; @@ -31,6 +35,10 @@ public class DebugStyleSpec { private static final String YELLOW = "#e2d40d"; private static final String GREY = "#8e8e89"; private static final int MAX_ZOOM = 23; + private static final ZoomDependentNumber LINE_WIDTH = new ZoomDependentNumber( + 1.3f, + List.of(new ZoomStop(13, 1), new ZoomStop(MAX_ZOOM, 10)) + ); public record VectorSourceLayer(VectorSource vectorSource, String vectorLayer) {} @@ -50,7 +58,7 @@ static StyleSpec build( .typeLine() .vectorSourceLayer(edges) .lineColor(GREY) - .lineWidth(3) + .lineWidth(LINE_WIDTH) .minZoom(15) .maxZoom(MAX_ZOOM), LayerStyleBuilder @@ -65,7 +73,7 @@ static StyleSpec build( TemporaryPartialStreetEdge.class, TemporaryFreeEdge.class ) - .lineWidth(3) + .lineWidth(LINE_WIDTH) .minZoom(13) .maxZoom(MAX_ZOOM), LayerStyleBuilder @@ -76,9 +84,11 @@ static StyleSpec build( .edgeFilter( StreetTransitStopLink.class, StreetTransitEntranceLink.class, - BoardingLocationToStopLink.class + BoardingLocationToStopLink.class, + StreetVehicleRentalLink.class, + StreetVehicleParkingLink.class ) - .lineWidth(3) + .lineWidth(LINE_WIDTH) .minZoom(13) .maxZoom(MAX_ZOOM), LayerStyleBuilder @@ -87,7 +97,7 @@ static StyleSpec build( .vectorSourceLayer(regularStops) .circleStroke("#140d0e", 2) .circleColor("#fcf9fa") - .minZoom(13) + .minZoom(11) .maxZoom(MAX_ZOOM) ) ); diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index 52455102ccd..ea93bdde6a2 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -3,7 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Arrays; -import java.util.HashMap; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Objects; @@ -22,8 +22,8 @@ public class LayerStyleBuilder { private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); private static final String TYPE = "type"; private static final String SOURCE_LAYER = "source-layer"; - private final Map props = new HashMap<>(); - private final Map paint = new HashMap<>(); + private final Map props = new LinkedHashMap<>(); + private final Map paint = new LinkedHashMap<>(); private List filter = List.of(); public static LayerStyleBuilder ofId(String id) { @@ -113,6 +113,11 @@ public LayerStyleBuilder lineWidth(float width) { return this; } + public LayerStyleBuilder lineWidth(ZoomDependentNumber zoomStops) { + paint.put("line-width", zoomStops.toJson()); + return this; + } + // filtering edge @SafeVarargs public final LayerStyleBuilder edgeFilter(Class... classToFilter) { @@ -124,7 +129,7 @@ public final LayerStyleBuilder edgeFilter(Class... classToFilter public JsonNode toJson() { validate(); - var copy = new HashMap<>(props); + var copy = new LinkedHashMap<>(props); if (!paint.isEmpty()) { copy.put("paint", paint); } @@ -146,4 +151,20 @@ private void validate() { .of(TYPE) .forEach(p -> Objects.requireNonNull(props.get(p), "%s must be set".formatted(p))); } + + public record ZoomStop(int zoom, float value) { + public List toList() { + return List.of(zoom, value); + } + } + + public record ZoomDependentNumber(float base, List stops) { + public JsonNode toJson() { + var props = new LinkedHashMap<>(); + props.put("base", base); + var vals = stops.stream().map(ZoomStop::toList).toList(); + props.put("stops", vals); + return OBJECT_MAPPER.valueToTree(props); + } + } } diff --git a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java index 393f7132798..5bfc2dc6df7 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java @@ -1,5 +1,6 @@ package org.opentripplanner.inspector.vector.edges; +import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; import static org.opentripplanner.inspector.vector.KeyValue.kv; import java.util.Collection; @@ -20,7 +21,7 @@ protected Collection map(Edge input) { switch (input) { case StreetEdge e -> List.of( kv("permission", e.getPermission().toString()), - kv("bicycleSafetyFactor", e.getBicycleSafetyFactor()) + kv("bicycleSafetyFactor", roundTo2Decimals(e.getBicycleSafetyFactor())) ); case EscalatorEdge e -> List.of(kv("distance", e.getDistanceMeters())); default -> List.of(); diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index 5cca178550a..9a18da3e5c9 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -10,7 +10,7 @@ class DebugStyleSpecTest { - private final ResourceLoader RES = ResourceLoader.of(this); + private final ResourceLoader RESOURCES = ResourceLoader.of(this); @Test void spec() { @@ -20,7 +20,7 @@ void spec() { var spec = DebugStyleSpec.build(vectorSource, regularStops, edges); var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); - var expectation = RES.fileToString("style.json"); + var expectation = RESOURCES.fileToString("style.json"); assertEqualJson(expectation, json); } } diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index f5bb18f6f6a..df9f73c3f26 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -1,42 +1,131 @@ { - "name": "OTP Debug Tiles", - "sources": { - "background": { - "id": "background", - "tiles": [ + "name" : "OTP Debug Tiles", + "sources" : { + "background" : { + "id" : "background", + "tiles" : [ "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png" ], - "tileSize": 256, + "tileSize" : 256, "attribution" : "© OpenStreetMap Contributors", - "type": "raster" + "type" : "raster" }, - "vectorSource": { - "id": "vectorSource", - "url": "https://example.com", - "type": "vector" + "vectorSource" : { + "id" : "vectorSource", + "url" : "https://example.com", + "type" : "vector" } }, - "layers": [ + "layers" : [ { - "id": "background", - "source": "background", - "type": "raster", - "maxzoom": 22, - "minzoom": 0 + "id" : "background", + "type" : "raster", + "source" : "background", + "minzoom" : 0 }, { - "maxzoom": 22, - "paint": { - "circle-stroke-width": 2, - "circle-color": "#fcf9fa", - "circle-stroke-color": "#140d0e" + "id" : "edge-fallback", + "type" : "line", + "source" : "vectorSource", + "source-layer" : "edges", + "minzoom" : 15, + "maxzoom" : 23, + "paint" : { + "line-color" : "#8e8e89", + "line-width" : { + "base" : 1.3, + "stops" : [ + [ + 13, + 2.0 + ], + [ + 23, + 10.0 + ] + ] + } + } + }, + { + "id" : "edge", + "type" : "line", + "source" : "vectorSource", + "source-layer" : "edges", + "minzoom" : 13, + "maxzoom" : 23, + "paint" : { + "line-color" : "#f21d52", + "line-width" : { + "base" : 1.3, + "stops" : [ + [ + 13, + 2.0 + ], + [ + 23, + 10.0 + ] + ] + } }, - "id": "regular-stop", - "source": "vectorSource", - "source-layer": "regularStops", - "type": "circle", - "minzoom": 13 + "filter" : [ + "in", + "class", + "StreetEdge", + "AreaEdge", + "EscalatorEdge", + "TemporaryPartialStreetEdge", + "TemporaryFreeEdge" + ] + }, + { + "id" : "link", + "type" : "line", + "source" : "vectorSource", + "source-layer" : "edges", + "minzoom" : 13, + "maxzoom" : 23, + "paint" : { + "line-color" : "#e2d40d", + "line-width" : { + "base" : 1.3, + "stops" : [ + [ + 13, + 2.0 + ], + [ + 23, + 10.0 + ] + ] + } + }, + "filter" : [ + "in", + "class", + "StreetTransitStopLink", + "StreetTransitEntranceLink", + "BoardingLocationToStopLink", + "StreetVehicleRentalLink", + "StreetVehicleParkingLink" + ] + }, + { + "id" : "regular-stop", + "type" : "circle", + "source" : "vectorSource", + "source-layer" : "regularStops", + "minzoom" : 11, + "maxzoom" : 23, + "paint" : { + "circle-stroke-color" : "#140d0e", + "circle-stroke-width" : 2, + "circle-color" : "#fcf9fa" + } } ], - "version": 8 + "version" : 8 } From b6fde751915e5178040f79da64d073935205ad11 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 12 Jan 2024 13:20:52 +0100 Subject: [PATCH 0275/1688] Add more styles --- .../MapView/GeometryPropertyPopup.tsx | 8 ++++++- .../src/components/MapView/MapView.tsx | 16 ++++++------- .../apis/vectortiles/DebugStyleSpec.java | 3 ++- .../vectortiles/model/LayerStyleBuilder.java | 24 ++++++++++++++++++- 4 files changed, 40 insertions(+), 11 deletions(-) diff --git a/client-next/src/components/MapView/GeometryPropertyPopup.tsx b/client-next/src/components/MapView/GeometryPropertyPopup.tsx index d2b55689270..5492d15d472 100644 --- a/client-next/src/components/MapView/GeometryPropertyPopup.tsx +++ b/client-next/src/components/MapView/GeometryPropertyPopup.tsx @@ -11,7 +11,13 @@ export function GeometryPropertyPopup({ onClose: () => void; }) { return ( - onClose()}> + onClose()} + maxWidth="350px" + > {Object.entries(properties).map(([key, value]) => ( diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 87c8a61e256..47193658bb0 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -1,12 +1,12 @@ -import {LngLat, Map, MapboxGeoJSONFeature, NavigationControl} from 'react-map-gl'; +import { LngLat, Map, MapboxGeoJSONFeature, NavigationControl } from 'react-map-gl'; import 'maplibre-gl/dist/maplibre-gl.css'; -import {TripPattern, TripQuery, TripQueryVariables} from '../../gql/graphql.ts'; -import {NavigationMarkers} from './NavigationMarkers.tsx'; -import {LegLines} from './LegLines.tsx'; -import {useMapDoubleClick} from './useMapDoubleClick.ts'; -import {useState} from 'react'; -import {ContextMenuPopup} from './ContextMenuPopup.tsx'; -import {GeometryPropertyPopup} from './GeometryPropertyPopup.tsx'; +import { TripPattern, TripQuery, TripQueryVariables } from '../../gql/graphql.ts'; +import { NavigationMarkers } from './NavigationMarkers.tsx'; +import { LegLines } from './LegLines.tsx'; +import { useMapDoubleClick } from './useMapDoubleClick.ts'; +import { useState } from 'react'; +import { ContextMenuPopup } from './ContextMenuPopup.tsx'; +import { GeometryPropertyPopup } from './GeometryPropertyPopup.tsx'; // TODO: this should be configurable const initialViewState = { diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 1508575d336..b3470ed579e 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -37,7 +37,7 @@ public class DebugStyleSpec { private static final int MAX_ZOOM = 23; private static final ZoomDependentNumber LINE_WIDTH = new ZoomDependentNumber( 1.3f, - List.of(new ZoomStop(13, 1), new ZoomStop(MAX_ZOOM, 10)) + List.of(new ZoomStop(13, 0.5f), new ZoomStop(MAX_ZOOM, 10)) ); public record VectorSourceLayer(VectorSource vectorSource, String vectorLayer) {} @@ -96,6 +96,7 @@ static StyleSpec build( .typeCircle() .vectorSourceLayer(regularStops) .circleStroke("#140d0e", 2) + .circleRadius(new ZoomDependentNumber(1, List.of(new ZoomStop(11,1), new ZoomStop(MAX_ZOOM, 10)))) .circleColor("#fcf9fa") .minZoom(11) .maxZoom(MAX_ZOOM) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index ea93bdde6a2..96ad10a644c 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -24,6 +24,8 @@ public class LayerStyleBuilder { private static final String SOURCE_LAYER = "source-layer"; private final Map props = new LinkedHashMap<>(); private final Map paint = new LinkedHashMap<>(); + private final Map layout = new LinkedHashMap<>(); + private final Map line = new LinkedHashMap<>(); private List filter = List.of(); public static LayerStyleBuilder ofId(String id) { @@ -35,6 +37,8 @@ public LayerStyleBuilder vectorSourceLayer(VectorSourceLayer source) { return sourceLayer(source.vectorLayer()); } + + public enum LayerType { Circle, Line, @@ -82,7 +86,9 @@ public LayerStyleBuilder typeCircle() { } public LayerStyleBuilder typeLine() { - return type(LayerType.Line); + type(LayerType.Line); + line.put("line-cap", "round"); + return this; } private LayerStyleBuilder type(LayerType type) { @@ -101,6 +107,11 @@ public LayerStyleBuilder circleStroke(String color, int width) { return this; } + public LayerStyleBuilder circleRadius(ZoomDependentNumber radius) { + paint.put("circle-radius", radius.toJson()); + return this; + } + // Line styling public LayerStyleBuilder lineColor(String color) { @@ -118,6 +129,11 @@ public LayerStyleBuilder lineWidth(ZoomDependentNumber zoomStops) { return this; } + public LayerStyleBuilder intiallyHidden() { + layout.put("visibility", "none"); + return this; + } + // filtering edge @SafeVarargs public final LayerStyleBuilder edgeFilter(Class... classToFilter) { @@ -136,6 +152,12 @@ public JsonNode toJson() { if (!filter.isEmpty()) { copy.put("filter", filter); } + if (!layout.isEmpty()) { + copy.put("layout", layout); + } + if (!line.isEmpty()) { + copy.put("line", line); + } return OBJECT_MAPPER.valueToTree(copy); } From f49b2160f2fe070629cdf2e17fbe8c01317a8dc4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 13 Jan 2024 21:23:42 +0100 Subject: [PATCH 0276/1688] Finetune layer selector --- client-next/package-lock.json | 56 ++++++------- client-next/package.json | 2 +- .../components/MapView/ContextMenuPopup.tsx | 2 +- .../MapView/GeometryPropertyPopup.tsx | 2 +- .../src/components/MapView/LayerControl.tsx | 78 +++++++++++++++++++ .../src/components/MapView/MapView.tsx | 10 ++- .../components/MapView/useMapDoubleClick.ts | 2 +- client-next/src/style.css | 9 +++ .../apis/vectortiles/DebugStyleSpec.java | 11 ++- 9 files changed, 133 insertions(+), 39 deletions(-) create mode 100644 client-next/src/components/MapView/LayerControl.tsx diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 19909ba109d..11894b5b246 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -12,7 +12,7 @@ "bootstrap": "5.3.1", "graphql": "16.8.0", "graphql-request": "6.1.0", - "maplibre-gl": "3.3.0", + "maplibre-gl": "3.6.2", "react": "18.2.0", "react-bootstrap": "2.8.0", "react-dom": "18.2.0", @@ -2864,9 +2864,9 @@ } }, "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "19.3.0", - "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.0.tgz", - "integrity": "sha512-ZbhX9CTV+Z7vHwkRIasDOwTSzr76e8Q6a55RMsAibjyX6+P0ZNL1qAKNzOjjBDP3+aEfNMl7hHo5knuY6pTAUQ==", + "version": "19.3.3", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz", + "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==", "dependencies": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/unitbezier": "^0.0.1", @@ -3306,9 +3306,9 @@ } }, "node_modules/@types/geojson": { - "version": "7946.0.10", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz", - "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==" + "version": "7946.0.13", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", + "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" }, "node_modules/@types/js-yaml": { "version": "4.0.5", @@ -3335,14 +3335,14 @@ "dev": true }, "node_modules/@types/mapbox__point-geometry": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.2.tgz", - "integrity": "sha512-D0lgCq+3VWV85ey1MZVkE8ZveyuvW5VAfuahVTQRpXFQTxw03SuIf1/K4UQ87MMIXVKzpFjXFiFMZzLj2kU+iA==" + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", + "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==" }, "node_modules/@types/mapbox__vector-tile": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.0.tgz", - "integrity": "sha512-kDwVreQO5V4c8yAxzZVQLE5tyWF+IPToAanloQaSnwfXmIcJ7cyOrv8z4Ft4y7PsLYmhWXmON8MBV8RX0Rgr8g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz", + "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==", "dependencies": { "@types/geojson": "*", "@types/mapbox__point-geometry": "*", @@ -3364,9 +3364,9 @@ "dev": true }, "node_modules/@types/pbf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.2.tgz", - "integrity": "sha512-EDrLIPaPXOZqDjrkzxxbX7UlJSeQVgah3i0aA4pOSzmK9zq3BIh7/MZIQxED7slJByvKM4Gc6Hypyu2lJzh3SQ==" + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz", + "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==" }, "node_modules/@types/prop-types": { "version": "15.7.5", @@ -3412,9 +3412,9 @@ "dev": true }, "node_modules/@types/supercluster": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.0.tgz", - "integrity": "sha512-6JapQ2GmEkH66r23BK49I+u6zczVDGTtiJEVvKDYZVSm/vepWaJuTq6BXzJ6I4agG5s8vA1KM7m/gXWDg03O4Q==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz", + "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==", "dependencies": { "@types/geojson": "*" } @@ -7379,9 +7379,9 @@ } }, "node_modules/maplibre-gl": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.3.0.tgz", - "integrity": "sha512-LDia3b8u2S8qtl50n8TYJM0IPLzfc01KDc71LNuydvDiEXAGBI5togty+juVtUipRZZjs4dAW6xhgrabc6lIgw==", + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.6.2.tgz", + "integrity": "sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -7390,12 +7390,12 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", - "@maplibre/maplibre-gl-style-spec": "^19.3.0", - "@types/geojson": "^7946.0.10", - "@types/mapbox__point-geometry": "^0.1.2", - "@types/mapbox__vector-tile": "^1.3.0", - "@types/pbf": "^3.0.2", - "@types/supercluster": "^7.1.0", + "@maplibre/maplibre-gl-style-spec": "^19.3.3", + "@types/geojson": "^7946.0.13", + "@types/mapbox__point-geometry": "^0.1.4", + "@types/mapbox__vector-tile": "^1.3.4", + "@types/pbf": "^3.0.5", + "@types/supercluster": "^7.1.3", "earcut": "^2.2.4", "geojson-vt": "^3.2.1", "gl-matrix": "^3.4.3", diff --git a/client-next/package.json b/client-next/package.json index 79d2c7942f1..6388122befc 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -19,7 +19,7 @@ "bootstrap": "5.3.1", "graphql": "16.8.0", "graphql-request": "6.1.0", - "maplibre-gl": "3.3.0", + "maplibre-gl": "3.6.2", "react": "18.2.0", "react-bootstrap": "2.8.0", "react-dom": "18.2.0", diff --git a/client-next/src/components/MapView/ContextMenuPopup.tsx b/client-next/src/components/MapView/ContextMenuPopup.tsx index 52dd3858298..7d51a4c21ad 100644 --- a/client-next/src/components/MapView/ContextMenuPopup.tsx +++ b/client-next/src/components/MapView/ContextMenuPopup.tsx @@ -1,5 +1,5 @@ import { TripQueryVariables } from '../../gql/graphql.ts'; -import { LngLat, Popup } from 'react-map-gl'; +import { LngLat, Popup } from 'react-map-gl/maplibre'; import { Button, ButtonGroup } from 'react-bootstrap'; export function ContextMenuPopup({ diff --git a/client-next/src/components/MapView/GeometryPropertyPopup.tsx b/client-next/src/components/MapView/GeometryPropertyPopup.tsx index 5492d15d472..3ecedb2c67d 100644 --- a/client-next/src/components/MapView/GeometryPropertyPopup.tsx +++ b/client-next/src/components/MapView/GeometryPropertyPopup.tsx @@ -1,4 +1,4 @@ -import { LngLat, Popup } from 'react-map-gl'; +import { LngLat, Popup } from 'react-map-gl/maplibre'; import { Table } from 'react-bootstrap'; export function GeometryPropertyPopup({ diff --git a/client-next/src/components/MapView/LayerControl.tsx b/client-next/src/components/MapView/LayerControl.tsx new file mode 100644 index 00000000000..783d0411673 --- /dev/null +++ b/client-next/src/components/MapView/LayerControl.tsx @@ -0,0 +1,78 @@ +import type { ControlPosition } from 'react-map-gl'; +import { useControl } from 'react-map-gl'; +import { Map } from 'maplibre-gl'; + +type LayerControlProps = { + position?: ControlPosition; +}; + +class LayerList { + private map: Map | null = null; + private _container: HTMLDivElement; + + onAdd(map: Map) { + this.map = map; + this._container = document.createElement('div'); + this._container.className = 'maplibregl-ctrl maplibregl-ctrl-group layer-select'; + + map?.on('load', () => { + while (this._container.firstChild) { + this._container.removeChild(this._container.firstChild); + } + + const h3 = document.createElement('h6'); + h3.textContent = 'Debug layers'; + this._container.appendChild(h3); + + map + ?.getLayersOrder() + .map((l) => map.getLayer(l)) + .filter((s) => s?.type !== 'raster') + .reverse() + .forEach((layer) => { + const div = document.createElement('div'); + const input = document.createElement('input'); + input.type = 'checkbox'; + input.value = layer?.id; + input.onchange = (e) => { + e.preventDefault(); + e.stopPropagation(); + + if (this.layerVisible(layer)) { + map.setLayoutProperty(layer.id, 'visibility', 'none'); + } else { + map.setLayoutProperty(layer.id, 'visibility', 'visible'); + } + }; + const visible = map.getLayoutProperty(layer.id, 'visibility') !== 'none'; + input.checked = visible; + const label = document.createElement('label'); + label.textContent = layer.id; + div.appendChild(input); + div.appendChild(label); + this._container.appendChild(div); + }); + }); + + return this._container; + } + + private layerVisible(layer: { id: string }) { + return this.map?.getLayoutProperty(layer.id, 'visibility') !== 'none'; + } + + onCreate() {} + + onRemove() { + this._container.parentNode.removeChild(this._container); + this.map = undefined; + } +} + +export default function LayerListControl(props: LayerControlProps) { + useControl(() => new LayerList(), { + position: props.position, + }); + + return null; +} diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 47193658bb0..b192fb6fdad 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -1,4 +1,4 @@ -import { LngLat, Map, MapboxGeoJSONFeature, NavigationControl } from 'react-map-gl'; +import { LngLat, Map, MapGeoJSONFeature, MapMouseEvent, NavigationControl } from 'react-map-gl/maplibre'; import 'maplibre-gl/dist/maplibre-gl.css'; import { TripPattern, TripQuery, TripQueryVariables } from '../../gql/graphql.ts'; import { NavigationMarkers } from './NavigationMarkers.tsx'; @@ -7,6 +7,7 @@ import { useMapDoubleClick } from './useMapDoubleClick.ts'; import { useState } from 'react'; import { ContextMenuPopup } from './ContextMenuPopup.tsx'; import { GeometryPropertyPopup } from './GeometryPropertyPopup.tsx'; +import LayerListControl from './LayerControl.tsx'; // TODO: this should be configurable const initialViewState = { @@ -17,7 +18,7 @@ const initialViewState = { const styleUrl = import.meta.env.VITE_DEBUG_STYLE_URL; -type PopupData = { coordinates: LngLat; feature: MapboxGeoJSONFeature }; +type PopupData = { coordinates: LngLat; feature: MapGeoJSONFeature }; export function MapView({ tripQueryVariables, @@ -36,8 +37,8 @@ export function MapView({ const [showContextPopup, setShowContextPopup] = useState(null); const [showPropsPopup, setShowPropsPopup] = useState(null); const showFeaturePropPopup = ( - e: mapboxgl.MapMouseEvent & { - features?: mapboxgl.MapboxGeoJSONFeature[] | undefined; + e: MapMouseEvent & { + features?: MapGeoJSONFeature[] | undefined; }, ) => { if (e.features) { @@ -75,6 +76,7 @@ export function MapView({ setTripQueryVariables={setTripQueryVariables} loading={loading} /> + {tripQueryResult?.trip.tripPatterns.length && ( )} diff --git a/client-next/src/components/MapView/useMapDoubleClick.ts b/client-next/src/components/MapView/useMapDoubleClick.ts index 35cb1d76a62..eb9217aa167 100644 --- a/client-next/src/components/MapView/useMapDoubleClick.ts +++ b/client-next/src/components/MapView/useMapDoubleClick.ts @@ -1,6 +1,6 @@ import { useCallback } from 'react'; import { TripQueryVariables } from '../../gql/graphql.ts'; -import { LngLat, MapLayerMouseEvent } from 'react-map-gl'; +import { LngLat, MapLayerMouseEvent } from 'react-map-gl/maplibre'; const setCoordinates = (tripQueryVariables: TripQueryVariables, lngLat: LngLat, key: 'from' | 'to') => ({ ...tripQueryVariables, diff --git a/client-next/src/style.css b/client-next/src/style.css index b7661779991..9a538686043 100644 --- a/client-next/src/style.css +++ b/client-next/src/style.css @@ -119,3 +119,12 @@ font-size: 14px; padding-left: 2px; } + +/* debug layer selector */ + +.maplibregl-ctrl-group.layer-select { + padding: 10px; +} +.maplibregl-ctrl-group.layer-select label { + margin-left: 6px; +} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index b3470ed579e..e9dc771932d 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -11,7 +11,9 @@ import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; import org.opentripplanner.street.model.edge.AreaEdge; import org.opentripplanner.street.model.edge.BoardingLocationToStopLink; +import org.opentripplanner.street.model.edge.ElevatorHopEdge; import org.opentripplanner.street.model.edge.EscalatorEdge; +import org.opentripplanner.street.model.edge.PathwayEdge; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.StreetTransitEntranceLink; import org.opentripplanner.street.model.edge.StreetTransitStopLink; @@ -60,7 +62,8 @@ static StyleSpec build( .lineColor(GREY) .lineWidth(LINE_WIDTH) .minZoom(15) - .maxZoom(MAX_ZOOM), + .maxZoom(MAX_ZOOM) + .intiallyHidden(), LayerStyleBuilder .ofId("edge") .typeLine() @@ -70,12 +73,14 @@ static StyleSpec build( StreetEdge.class, AreaEdge.class, EscalatorEdge.class, + PathwayEdge.class, + ElevatorHopEdge.class, TemporaryPartialStreetEdge.class, TemporaryFreeEdge.class ) .lineWidth(LINE_WIDTH) .minZoom(13) - .maxZoom(MAX_ZOOM), + .maxZoom(MAX_ZOOM).intiallyHidden(), LayerStyleBuilder .ofId("link") .typeLine() @@ -90,7 +95,7 @@ static StyleSpec build( ) .lineWidth(LINE_WIDTH) .minZoom(13) - .maxZoom(MAX_ZOOM), + .maxZoom(MAX_ZOOM).intiallyHidden(), LayerStyleBuilder .ofId("regular-stop") .typeCircle() From 32d070d01634f5c7c87810046ee5ce5567ba11ff Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 13 Jan 2024 23:48:16 +0100 Subject: [PATCH 0277/1688] Finetune layer selector --- .../apis/vectortiles/DebugStyleSpec.java | 10 +++++++--- .../apis/vectortiles/model/LayerStyleBuilder.java | 2 -- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index e9dc771932d..7c14e66d475 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -80,7 +80,8 @@ static StyleSpec build( ) .lineWidth(LINE_WIDTH) .minZoom(13) - .maxZoom(MAX_ZOOM).intiallyHidden(), + .maxZoom(MAX_ZOOM) + .intiallyHidden(), LayerStyleBuilder .ofId("link") .typeLine() @@ -95,13 +96,16 @@ static StyleSpec build( ) .lineWidth(LINE_WIDTH) .minZoom(13) - .maxZoom(MAX_ZOOM).intiallyHidden(), + .maxZoom(MAX_ZOOM) + .intiallyHidden(), LayerStyleBuilder .ofId("regular-stop") .typeCircle() .vectorSourceLayer(regularStops) .circleStroke("#140d0e", 2) - .circleRadius(new ZoomDependentNumber(1, List.of(new ZoomStop(11,1), new ZoomStop(MAX_ZOOM, 10)))) + .circleRadius( + new ZoomDependentNumber(1, List.of(new ZoomStop(11, 1), new ZoomStop(MAX_ZOOM, 10))) + ) .circleColor("#fcf9fa") .minZoom(11) .maxZoom(MAX_ZOOM) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java index 96ad10a644c..585e3bce2e1 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java @@ -37,8 +37,6 @@ public LayerStyleBuilder vectorSourceLayer(VectorSourceLayer source) { return sourceLayer(source.vectorLayer()); } - - public enum LayerType { Circle, Line, From 73ec23ebf42aa4225963e680af080cabe488b5ed Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 14 Jan 2024 11:24:09 +0100 Subject: [PATCH 0278/1688] Improve TypeScript --- .../src/components/MapView/LayerControl.tsx | 69 ++++++++++--------- .../src/components/MapView/MapView.tsx | 2 +- 2 files changed, 36 insertions(+), 35 deletions(-) diff --git a/client-next/src/components/MapView/LayerControl.tsx b/client-next/src/components/MapView/LayerControl.tsx index 783d0411673..4d9974f66e2 100644 --- a/client-next/src/components/MapView/LayerControl.tsx +++ b/client-next/src/components/MapView/LayerControl.tsx @@ -3,58 +3,59 @@ import { useControl } from 'react-map-gl'; import { Map } from 'maplibre-gl'; type LayerControlProps = { - position?: ControlPosition; + position: ControlPosition; }; class LayerList { private map: Map | null = null; - private _container: HTMLDivElement; + private readonly container: HTMLDivElement = document.createElement('div'); onAdd(map: Map) { this.map = map; - this._container = document.createElement('div'); - this._container.className = 'maplibregl-ctrl maplibregl-ctrl-group layer-select'; + this.container.className = 'maplibregl-ctrl maplibregl-ctrl-group layer-select'; - map?.on('load', () => { - while (this._container.firstChild) { - this._container.removeChild(this._container.firstChild); + map.on('load', () => { + // clean on + while (this.container.firstChild) { + this.container.removeChild(this.container.firstChild); } - const h3 = document.createElement('h6'); - h3.textContent = 'Debug layers'; - this._container.appendChild(h3); + const title = document.createElement('h6'); + title.textContent = 'Debug layers'; + this.container.appendChild(title); map - ?.getLayersOrder() + .getLayersOrder() .map((l) => map.getLayer(l)) .filter((s) => s?.type !== 'raster') .reverse() .forEach((layer) => { - const div = document.createElement('div'); - const input = document.createElement('input'); - input.type = 'checkbox'; - input.value = layer?.id; - input.onchange = (e) => { - e.preventDefault(); - e.stopPropagation(); + if (layer) { + const div = document.createElement('div'); + const input = document.createElement('input'); + input.type = 'checkbox'; + input.value = layer?.id; + input.onchange = (e) => { + e.preventDefault(); + e.stopPropagation(); - if (this.layerVisible(layer)) { - map.setLayoutProperty(layer.id, 'visibility', 'none'); - } else { - map.setLayoutProperty(layer.id, 'visibility', 'visible'); - } - }; - const visible = map.getLayoutProperty(layer.id, 'visibility') !== 'none'; - input.checked = visible; - const label = document.createElement('label'); - label.textContent = layer.id; - div.appendChild(input); - div.appendChild(label); - this._container.appendChild(div); + if (this.layerVisible(layer)) { + map.setLayoutProperty(layer.id, 'visibility', 'none'); + } else { + map.setLayoutProperty(layer.id, 'visibility', 'visible'); + } + }; + input.checked = this.layerVisible(layer); + const label = document.createElement('label'); + label.textContent = layer.id; + div.appendChild(input); + div.appendChild(label); + this.container.appendChild(div); + } }); }); - return this._container; + return this.container; } private layerVisible(layer: { id: string }) { @@ -64,8 +65,8 @@ class LayerList { onCreate() {} onRemove() { - this._container.parentNode.removeChild(this._container); - this.map = undefined; + this.container.parentNode?.removeChild(this.container); + this.map = null; } } diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index b192fb6fdad..a3c925a2519 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -76,7 +76,7 @@ export function MapView({ setTripQueryVariables={setTripQueryVariables} loading={loading} /> - + {tripQueryResult?.trip.tripPatterns.length && ( )} From 95e4d1559f2645ef9957bea2f7361504743a3074 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 14 Jan 2024 23:23:38 +0100 Subject: [PATCH 0279/1688] Finetune map layers --- .../src/components/MapView/LayerControl.tsx | 21 ++++++++----------- .../apis/vectortiles/DebugStyleSpec.java | 11 +--------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/client-next/src/components/MapView/LayerControl.tsx b/client-next/src/components/MapView/LayerControl.tsx index 4d9974f66e2..4566c3679fc 100644 --- a/client-next/src/components/MapView/LayerControl.tsx +++ b/client-next/src/components/MapView/LayerControl.tsx @@ -1,17 +1,15 @@ import type { ControlPosition } from 'react-map-gl'; import { useControl } from 'react-map-gl'; -import { Map } from 'maplibre-gl'; +import { IControl, Map} from 'maplibre-gl'; type LayerControlProps = { position: ControlPosition; }; -class LayerList { - private map: Map | null = null; +class LayerList implements IControl { private readonly container: HTMLDivElement = document.createElement('div'); onAdd(map: Map) { - this.map = map; this.container.className = 'maplibregl-ctrl maplibregl-ctrl-group layer-select'; map.on('load', () => { @@ -34,20 +32,22 @@ class LayerList { const div = document.createElement('div'); const input = document.createElement('input'); input.type = 'checkbox'; - input.value = layer?.id; + input.value = layer.id; + input.id = layer.id; input.onchange = (e) => { e.preventDefault(); e.stopPropagation(); - if (this.layerVisible(layer)) { + if (this.layerVisible(map, layer)) { map.setLayoutProperty(layer.id, 'visibility', 'none'); } else { map.setLayoutProperty(layer.id, 'visibility', 'visible'); } }; - input.checked = this.layerVisible(layer); + input.checked = this.layerVisible(map, layer); const label = document.createElement('label'); label.textContent = layer.id; + label.htmlFor = layer.id; div.appendChild(input); div.appendChild(label); this.container.appendChild(div); @@ -58,15 +58,12 @@ class LayerList { return this.container; } - private layerVisible(layer: { id: string }) { - return this.map?.getLayoutProperty(layer.id, 'visibility') !== 'none'; + private layerVisible(map: Map, layer: { id: string }) { + return map.getLayoutProperty(layer.id, 'visibility') !== 'none'; } - onCreate() {} - onRemove() { this.container.parentNode?.removeChild(this.container); - this.map = null; } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 7c14e66d475..05e91d9e6b7 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -55,15 +55,6 @@ static StyleSpec build( sources, List.of( LayerStyleBuilder.ofId("background").typeRaster().source(BACKGROUND_SOURCE).minZoom(0), - LayerStyleBuilder - .ofId("edge-fallback") - .typeLine() - .vectorSourceLayer(edges) - .lineColor(GREY) - .lineWidth(LINE_WIDTH) - .minZoom(15) - .maxZoom(MAX_ZOOM) - .intiallyHidden(), LayerStyleBuilder .ofId("edge") .typeLine() @@ -107,7 +98,7 @@ static StyleSpec build( new ZoomDependentNumber(1, List.of(new ZoomStop(11, 1), new ZoomStop(MAX_ZOOM, 10))) ) .circleColor("#fcf9fa") - .minZoom(11) + .minZoom(10) .maxZoom(MAX_ZOOM) ) ); From 58781d940adaf3526e699342344d2d93dd89d6be Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 15 Jan 2024 10:24:50 +0100 Subject: [PATCH 0280/1688] Rename to StyleBuilder --- .../apis/vectortiles/DebugStyleSpec.java | 41 ++++++----- .../GraphInspectorVectorTileResource.java | 39 +++++++---- .../apis/vectortiles/model/LayerParams.java | 1 - ...yerStyleBuilder.java => StyleBuilder.java} | 68 ++++++++----------- .../apis/vectortiles/model/StyleSpec.java | 7 +- .../apis/vectortiles/model/TileSource.java | 2 +- .../vectortiles/model/VectorSourceLayer.java | 8 +++ .../model/ZoomDependentNumber.java | 31 +++++++++ .../apis/vectortiles/DebugStyleSpecTest.java | 6 +- .../apis/vectortiles/style.json | 65 +++++++++--------- 10 files changed, 153 insertions(+), 115 deletions(-) rename src/main/java/org/opentripplanner/apis/vectortiles/model/{LayerStyleBuilder.java => StyleBuilder.java} (67%) create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java create mode 100644 src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 05e91d9e6b7..2393125f780 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -1,13 +1,15 @@ package org.opentripplanner.apis.vectortiles; import java.util.List; -import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder; -import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder.ZoomDependentNumber; -import org.opentripplanner.apis.vectortiles.model.LayerStyleBuilder.ZoomStop; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.opentripplanner.apis.vectortiles.model.StyleBuilder; import org.opentripplanner.apis.vectortiles.model.StyleSpec; import org.opentripplanner.apis.vectortiles.model.TileSource; import org.opentripplanner.apis.vectortiles.model.TileSource.RasterSource; -import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; +import org.opentripplanner.apis.vectortiles.model.VectorSourceLayer; +import org.opentripplanner.apis.vectortiles.model.ZoomDependentNumber; +import org.opentripplanner.apis.vectortiles.model.ZoomDependentNumber.ZoomStop; import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; import org.opentripplanner.street.model.edge.AreaEdge; import org.opentripplanner.street.model.edge.BoardingLocationToStopLink; @@ -27,35 +29,32 @@ */ public class DebugStyleSpec { - private static final RasterSource BACKGROUND_SOURCE = new RasterSource( + private static final TileSource BACKGROUND_SOURCE = new RasterSource( "background", List.of("https://a.tile.openstreetmap.org/{z}/{x}/{y}.png"), + 19, 256, "© OpenStreetMap Contributors" ); private static final String MAGENTA = "#f21d52"; - private static final String YELLOW = "#e2d40d"; - private static final String GREY = "#8e8e89"; + private static final String GREEN = "#22DD9E"; private static final int MAX_ZOOM = 23; private static final ZoomDependentNumber LINE_WIDTH = new ZoomDependentNumber( 1.3f, List.of(new ZoomStop(13, 0.5f), new ZoomStop(MAX_ZOOM, 10)) ); - public record VectorSourceLayer(VectorSource vectorSource, String vectorLayer) {} - - static StyleSpec build( - VectorSource debugSource, - VectorSourceLayer regularStops, - VectorSourceLayer edges - ) { - List sources = List.of(BACKGROUND_SOURCE, debugSource); + static StyleSpec build(VectorSourceLayer regularStops, VectorSourceLayer edges) { + var vectorSources = Stream.of(regularStops, edges).map(VectorSourceLayer::vectorSource); + var allSources = Stream + .concat(Stream.of(BACKGROUND_SOURCE), vectorSources) + .collect(Collectors.toSet()); return new StyleSpec( "OTP Debug Tiles", - sources, + allSources, List.of( - LayerStyleBuilder.ofId("background").typeRaster().source(BACKGROUND_SOURCE).minZoom(0), - LayerStyleBuilder + StyleBuilder.ofId("background").typeRaster().source(BACKGROUND_SOURCE).minZoom(0), + StyleBuilder .ofId("edge") .typeLine() .vectorSourceLayer(edges) @@ -73,11 +72,11 @@ static StyleSpec build( .minZoom(13) .maxZoom(MAX_ZOOM) .intiallyHidden(), - LayerStyleBuilder + StyleBuilder .ofId("link") .typeLine() .vectorSourceLayer(edges) - .lineColor(YELLOW) + .lineColor(GREEN) .edgeFilter( StreetTransitStopLink.class, StreetTransitEntranceLink.class, @@ -89,7 +88,7 @@ static StyleSpec build( .minZoom(13) .maxZoom(MAX_ZOOM) .intiallyHidden(), - LayerStyleBuilder + StyleBuilder .ofId("regular-stop") .typeCircle() .vectorSourceLayer(regularStops) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index e2008eaea29..b43cd5c109f 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -122,25 +122,36 @@ public TileJson getTileJson( @Produces(MediaType.APPLICATION_JSON) public StyleSpec getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) { var base = HttpUtils.getBaseAddress(uri, headers); - final String allLayers = DEBUG_LAYERS - .stream() - .map(LayerParameters::name) - .collect(Collectors.joining(",")); - var url = - "%s/otp/routers/%s/inspector/vectortile/%s/tilejson.json".formatted( - base, - ignoreRouterId, - allLayers - ); - var vectorSource = new VectorSource("debug", url); + // these two could also be loaded together but are put into separate sources because + // the stops are fast and the edges are relatively slow + var stopsSource = new VectorSource( + "stops", + tileJsonUrl(base, List.of(REGULAR_STOPS, AREA_STOPS)) + ); + var streetSource = new VectorSource( + "street", + tileJsonUrl(base, List.of(EDGES, GEOFENCING_ZONES)) + ); + return DebugStyleSpec.build( - vectorSource, - REGULAR_STOPS.toVectorSourceLayer(vectorSource), - EDGES.toVectorSourceLayer(vectorSource) + REGULAR_STOPS.toVectorSourceLayer(stopsSource), + EDGES.toVectorSourceLayer(streetSource) ); } + private String tileJsonUrl(String base, List> layers) { + final String allLayers = layers + .stream() + .map(LayerParameters::name) + .collect(Collectors.joining(",")); + return "%s/otp/routers/%s/inspector/vectortile/%s/tilejson.json".formatted( + base, + ignoreRouterId, + allLayers + ); + } + @Nonnull private List feedInfos() { return serverContext diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java index 7365e8972da..4ae7691db23 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerParams.java @@ -1,6 +1,5 @@ package org.opentripplanner.apis.vectortiles.model; -import org.opentripplanner.apis.vectortiles.DebugStyleSpec.VectorSourceLayer; import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; import org.opentripplanner.inspector.vector.LayerParameters; diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java similarity index 67% rename from src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java rename to src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java index 585e3bce2e1..f60531b461a 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerStyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java @@ -8,7 +8,6 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Stream; -import org.opentripplanner.apis.vectortiles.DebugStyleSpec.VectorSourceLayer; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.street.model.edge.Edge; @@ -17,7 +16,7 @@ * Builds a Maplibre/Mapbox vector tile * layer style. */ -public class LayerStyleBuilder { +public class StyleBuilder { private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); private static final String TYPE = "type"; @@ -28,11 +27,11 @@ public class LayerStyleBuilder { private final Map line = new LinkedHashMap<>(); private List filter = List.of(); - public static LayerStyleBuilder ofId(String id) { - return new LayerStyleBuilder(id); + public static StyleBuilder ofId(String id) { + return new StyleBuilder(id); } - public LayerStyleBuilder vectorSourceLayer(VectorSourceLayer source) { + public StyleBuilder vectorSourceLayer(VectorSourceLayer source) { source(source.vectorSource()); return sourceLayer(source.vectorLayer()); } @@ -43,16 +42,16 @@ public enum LayerType { Raster, } - private LayerStyleBuilder(String id) { + private StyleBuilder(String id) { props.put("id", id); } - public LayerStyleBuilder minZoom(int i) { + public StyleBuilder minZoom(int i) { props.put("minzoom", i); return this; } - public LayerStyleBuilder maxZoom(int i) { + public StyleBuilder maxZoom(int i) { props.put("maxzoom", i); return this; } @@ -60,7 +59,7 @@ public LayerStyleBuilder maxZoom(int i) { /** * Which vector tile source this should apply to. */ - public LayerStyleBuilder source(TileSource source) { + public StyleBuilder source(TileSource source) { props.put("source", source.id()); return this; } @@ -70,71 +69,76 @@ public LayerStyleBuilder source(TileSource source) { * There is an unfortunate collision in the name "layer" as it can both refer to a styling layer * and the layer inside the vector tile. */ - public LayerStyleBuilder sourceLayer(String source) { + public StyleBuilder sourceLayer(String source) { props.put(SOURCE_LAYER, source); return this; } - public LayerStyleBuilder typeRaster() { + public StyleBuilder typeRaster() { return type(LayerType.Raster); } - public LayerStyleBuilder typeCircle() { + public StyleBuilder typeCircle() { return type(LayerType.Circle); } - public LayerStyleBuilder typeLine() { + public StyleBuilder typeLine() { type(LayerType.Line); - line.put("line-cap", "round"); + layout.put("line-cap", "round"); return this; } - private LayerStyleBuilder type(LayerType type) { + private StyleBuilder type(LayerType type) { props.put(TYPE, type.name().toLowerCase()); return this; } - public LayerStyleBuilder circleColor(String color) { + public StyleBuilder circleColor(String color) { paint.put("circle-color", validateColor(color)); return this; } - public LayerStyleBuilder circleStroke(String color, int width) { + public StyleBuilder circleStroke(String color, int width) { paint.put("circle-stroke-color", validateColor(color)); paint.put("circle-stroke-width", width); return this; } - public LayerStyleBuilder circleRadius(ZoomDependentNumber radius) { + public StyleBuilder circleRadius(ZoomDependentNumber radius) { paint.put("circle-radius", radius.toJson()); return this; } // Line styling - public LayerStyleBuilder lineColor(String color) { + public StyleBuilder lineColor(String color) { paint.put("line-color", validateColor(color)); return this; } - public LayerStyleBuilder lineWidth(float width) { + public StyleBuilder lineWidth(float width) { paint.put("line-width", width); return this; } - public LayerStyleBuilder lineWidth(ZoomDependentNumber zoomStops) { + public StyleBuilder lineWidth(ZoomDependentNumber zoomStops) { paint.put("line-width", zoomStops.toJson()); return this; } - public LayerStyleBuilder intiallyHidden() { + /** + * Hide this layer when the debug client starts. It can be made visible in the UI later. + */ + public StyleBuilder intiallyHidden() { layout.put("visibility", "none"); return this; } - // filtering edge + /** + * Only apply the style to the given edges. + */ @SafeVarargs - public final LayerStyleBuilder edgeFilter(Class... classToFilter) { + public final StyleBuilder edgeFilter(Class... classToFilter) { var clazzes = Arrays.stream(classToFilter).map(Class::getSimpleName).toList(); filter = ListUtils.combine(List.of("in", "class"), clazzes); return this; @@ -171,20 +175,4 @@ private void validate() { .of(TYPE) .forEach(p -> Objects.requireNonNull(props.get(p), "%s must be set".formatted(p))); } - - public record ZoomStop(int zoom, float value) { - public List toList() { - return List.of(zoom, value); - } - } - - public record ZoomDependentNumber(float base, List stops) { - public JsonNode toJson() { - var props = new LinkedHashMap<>(); - props.put("base", base); - var vals = stops.stream().map(ZoomStop::toList).toList(); - props.put("stops", vals); - return OBJECT_MAPPER.valueToTree(props); - } - } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java index 84e19f25364..64f680ed202 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -15,13 +16,13 @@ public final class StyleSpec { private final String name; - private final List sources; + private final Collection sources; private final List layers; - public StyleSpec(String name, List sources, List layers) { + public StyleSpec(String name, Collection sources, List layers) { this.name = name; this.sources = sources; - this.layers = layers.stream().map(LayerStyleBuilder::toJson).toList(); + this.layers = layers.stream().map(StyleBuilder::toJson).toList(); } @JsonSerialize diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java index 06af294a4f0..088ce63d10a 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/TileSource.java @@ -26,7 +26,7 @@ public String type() { * Represents a raster-based source for map tiles. These are used mainly for background * map layers with vector data being rendered on top of it. */ - record RasterSource(String id, List tiles, int tileSize, String attribution) + record RasterSource(String id, List tiles, int maxzoom, int tileSize, String attribution) implements TileSource { @Override public String type() { diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java new file mode 100644 index 00000000000..61f1b852d5a --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/VectorSourceLayer.java @@ -0,0 +1,8 @@ +package org.opentripplanner.apis.vectortiles.model; + +/** + * A vector source layer for use in a Maplibre style spec. It contains both the name of the layer + * inside the tile and a reference to the source (which in turn has the URL where to fetch the + * data). + */ +public record VectorSourceLayer(TileSource.VectorSource vectorSource, String vectorLayer) {} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java new file mode 100644 index 00000000000..d83c4b63495 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/ZoomDependentNumber.java @@ -0,0 +1,31 @@ +package org.opentripplanner.apis.vectortiles.model; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.LinkedHashMap; +import java.util.List; +import org.opentripplanner.framework.json.ObjectMappers; + +/** + * A style parameter that allows you to specify a number that changes dependent on the zoom level. + */ +public record ZoomDependentNumber(float base, List stops) { + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); + public JsonNode toJson() { + var props = new LinkedHashMap<>(); + props.put("base", base); + var vals = stops.stream().map(ZoomStop::toList).toList(); + props.put("stops", vals); + return OBJECT_MAPPER.valueToTree(props); + } + + /** + * @param zoom The zoom level. + * @param value What the value should be at the specified zoom. + */ + public record ZoomStop(int zoom, float value) { + public List toList() { + return List.of(zoom, value); + } + } +} diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index 9a18da3e5c9..693ddbc2d79 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -3,8 +3,8 @@ import static org.opentripplanner.test.support.JsonAssertions.assertEqualJson; import org.junit.jupiter.api.Test; -import org.opentripplanner.apis.vectortiles.DebugStyleSpec.VectorSourceLayer; import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource; +import org.opentripplanner.apis.vectortiles.model.VectorSourceLayer; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.test.support.ResourceLoader; @@ -15,9 +15,9 @@ class DebugStyleSpecTest { @Test void spec() { var vectorSource = new VectorSource("vectorSource", "https://example.com"); - var regularStops = new VectorSourceLayer(vectorSource, "regularStops"); + var stops = new VectorSourceLayer(vectorSource, "stops"); var edges = new VectorSourceLayer(vectorSource, "edges"); - var spec = DebugStyleSpec.build(vectorSource, regularStops, edges); + var spec = DebugStyleSpec.build(stops, edges); var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); var expectation = RESOURCES.fileToString("style.json"); diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index df9f73c3f26..06a602a8cd3 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -1,4 +1,5 @@ { + "name" : "OTP Debug Tiles", "sources" : { "background" : { @@ -6,6 +7,7 @@ "tiles" : [ "https://a.tile.openstreetmap.org/{z}/{x}/{y}.png" ], + "maxzoom" : 19, "tileSize" : 256, "attribution" : "© OpenStreetMap Contributors", "type" : "raster" @@ -23,30 +25,6 @@ "source" : "background", "minzoom" : 0 }, - { - "id" : "edge-fallback", - "type" : "line", - "source" : "vectorSource", - "source-layer" : "edges", - "minzoom" : 15, - "maxzoom" : 23, - "paint" : { - "line-color" : "#8e8e89", - "line-width" : { - "base" : 1.3, - "stops" : [ - [ - 13, - 2.0 - ], - [ - 23, - 10.0 - ] - ] - } - } - }, { "id" : "edge", "type" : "line", @@ -61,7 +39,7 @@ "stops" : [ [ 13, - 2.0 + 0.5 ], [ 23, @@ -76,9 +54,15 @@ "StreetEdge", "AreaEdge", "EscalatorEdge", + "PathwayEdge", + "ElevatorHopEdge", "TemporaryPartialStreetEdge", "TemporaryFreeEdge" - ] + ], + "layout" : { + "line-cap" : "round", + "visibility" : "none" + } }, { "id" : "link", @@ -88,13 +72,13 @@ "minzoom" : 13, "maxzoom" : 23, "paint" : { - "line-color" : "#e2d40d", + "line-color" : "#22DD9E", "line-width" : { "base" : 1.3, "stops" : [ [ 13, - 2.0 + 0.5 ], [ 23, @@ -111,21 +95,38 @@ "BoardingLocationToStopLink", "StreetVehicleRentalLink", "StreetVehicleParkingLink" - ] + ], + "layout" : { + "line-cap" : "round", + "visibility" : "none" + } }, { "id" : "regular-stop", "type" : "circle", "source" : "vectorSource", - "source-layer" : "regularStops", - "minzoom" : 11, + "source-layer" : "stops", + "minzoom" : 10, "maxzoom" : 23, "paint" : { "circle-stroke-color" : "#140d0e", "circle-stroke-width" : 2, + "circle-radius" : { + "base" : 1.0, + "stops" : [ + [ + 11, + 1.0 + ], + [ + 23, + 10.0 + ] + ] + }, "circle-color" : "#fcf9fa" } } ], "version" : 8 -} +} \ No newline at end of file From 760f939fb8a2febb6a5f19c3450444b1cdec5c30 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 15 Jan 2024 11:15:56 +0100 Subject: [PATCH 0281/1688] Rename class, document --- .../src/components/MapView/LayerControl.tsx | 14 ++++++++++---- client-next/src/components/MapView/MapView.tsx | 4 ++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/client-next/src/components/MapView/LayerControl.tsx b/client-next/src/components/MapView/LayerControl.tsx index 4566c3679fc..237ea8ab150 100644 --- a/client-next/src/components/MapView/LayerControl.tsx +++ b/client-next/src/components/MapView/LayerControl.tsx @@ -1,12 +1,18 @@ import type { ControlPosition } from 'react-map-gl'; import { useControl } from 'react-map-gl'; -import { IControl, Map} from 'maplibre-gl'; +import { IControl, Map } from 'maplibre-gl'; type LayerControlProps = { position: ControlPosition; }; -class LayerList implements IControl { +/** + * A maplibre control that allows you to switch vector tile layers on and off. + * + * It appears that you cannot use React elements but have to drop down to raw DOM. Please correct + * me if I'm wrong. + */ +class LayerControl implements IControl { private readonly container: HTMLDivElement = document.createElement('div'); onAdd(map: Map) { @@ -67,8 +73,8 @@ class LayerList implements IControl { } } -export default function LayerListControl(props: LayerControlProps) { - useControl(() => new LayerList(), { +export default function DebugLayerControl(props: LayerControlProps) { + useControl(() => new LayerControl(), { position: props.position, }); diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index a3c925a2519..930c9ff9a58 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -7,7 +7,7 @@ import { useMapDoubleClick } from './useMapDoubleClick.ts'; import { useState } from 'react'; import { ContextMenuPopup } from './ContextMenuPopup.tsx'; import { GeometryPropertyPopup } from './GeometryPropertyPopup.tsx'; -import LayerListControl from './LayerControl.tsx'; +import DebugLayerControl from './LayerControl.tsx'; // TODO: this should be configurable const initialViewState = { @@ -76,7 +76,7 @@ export function MapView({ setTripQueryVariables={setTripQueryVariables} loading={loading} /> - + {tripQueryResult?.trip.tripPatterns.length && ( )} From 92a4b0c4f7f47cef3c3e5d84f2c6906a85270b34 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 15 Jan 2024 11:27:51 +0100 Subject: [PATCH 0282/1688] Automatically pan to correct world envelope --- .../src/components/MapView/MapView.tsx | 30 +++++++++++++------ 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 930c9ff9a58..074c699ad0c 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -1,4 +1,12 @@ -import { LngLat, Map, MapGeoJSONFeature, MapMouseEvent, NavigationControl } from 'react-map-gl/maplibre'; +import { + LngLat, + Map, + MapEvent, + MapGeoJSONFeature, + MapMouseEvent, + NavigationControl, + VectorTileSource, +} from 'react-map-gl/maplibre'; import 'maplibre-gl/dist/maplibre-gl.css'; import { TripPattern, TripQuery, TripQueryVariables } from '../../gql/graphql.ts'; import { NavigationMarkers } from './NavigationMarkers.tsx'; @@ -9,13 +17,6 @@ import { ContextMenuPopup } from './ContextMenuPopup.tsx'; import { GeometryPropertyPopup } from './GeometryPropertyPopup.tsx'; import DebugLayerControl from './LayerControl.tsx'; -// TODO: this should be configurable -const initialViewState = { - latitude: 60.7554885, - longitude: 10.2332855, - zoom: 4, -}; - const styleUrl = import.meta.env.VITE_DEBUG_STYLE_URL; type PopupData = { coordinates: LngLat; feature: MapGeoJSONFeature }; @@ -49,6 +50,17 @@ export function MapView({ setShowPropsPopup({ coordinates: e.lngLat, feature: feature }); } }; + const panToWorldEnvelopeIfRequired = (e: MapEvent) => { + const map = e.target; + // if we are really far zoomed out and show the entire world it means that we are not starting + // in a location selected from the URL hash. + // in such a case we pan to the area that is specified in the stop's tile bounds, which is + // provided by the WorldEnvelopeService + if (map.getZoom() < 2) { + const source = map.getSource('stops') as VectorTileSource; + map.fitBounds(source.bounds, { maxDuration: 50, linear: true }); + } + }; return (
      @@ -57,7 +69,6 @@ export function MapView({ mapLib={import('maplibre-gl')} // @ts-ignore mapStyle={styleUrl} - initialViewState={initialViewState} onDblClick={onMapDoubleClick} onContextMenu={(e) => { setShowContextPopup(e.lngLat); @@ -69,6 +80,7 @@ export function MapView({ // disable pitching and rotating the map touchPitch={false} dragRotate={false} + onLoad={panToWorldEnvelopeIfRequired} > Date: Mon, 15 Jan 2024 11:38:05 +0100 Subject: [PATCH 0283/1688] Last polishing --- client-next/src/components/MapView/MapView.tsx | 4 +++- .../apis/vectortiles/GraphInspectorVectorTileResource.java | 2 +- .../inspector/vector/{edges => edge}/EdgeLayerBuilder.java | 5 ++++- .../inspector/vector/{edges => edge}/EdgePropertyMapper.java | 2 +- 4 files changed, 9 insertions(+), 4 deletions(-) rename src/main/java/org/opentripplanner/inspector/vector/{edges => edge}/EdgeLayerBuilder.java (90%) rename src/main/java/org/opentripplanner/inspector/vector/{edges => edge}/EdgePropertyMapper.java (95%) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 074c699ad0c..fa0bfbd022b 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -54,7 +54,7 @@ export function MapView({ const map = e.target; // if we are really far zoomed out and show the entire world it means that we are not starting // in a location selected from the URL hash. - // in such a case we pan to the area that is specified in the stop's tile bounds, which is + // in such a case we pan to the area that is specified in the tile bounds, which is // provided by the WorldEnvelopeService if (map.getZoom() < 2) { const source = map.getSource('stops') as VectorTileSource; @@ -73,6 +73,8 @@ export function MapView({ onContextMenu={(e) => { setShowContextPopup(e.lngLat); }} + // it's unfortunate that you have to list these layers here. + // maybe there is a way around it: https://github.com/visgl/react-map-gl/discussions/2343 interactiveLayerIds={['regular-stop', 'edge-fallback', 'edge', 'link']} onClick={showFeaturePropPopup} // put lat/long in URL and pan to it on page reload diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index b43cd5c109f..c8cd3a089f3 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -31,7 +31,7 @@ import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.inspector.vector.VectorTileResponseFactory; -import org.opentripplanner.inspector.vector.edges.EdgeLayerBuilder; +import org.opentripplanner.inspector.vector.edge.EdgeLayerBuilder; import org.opentripplanner.inspector.vector.geofencing.GeofencingZonesLayerBuilder; import org.opentripplanner.inspector.vector.stop.StopLayerBuilder; import org.opentripplanner.model.FeedInfo; diff --git a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgeLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java similarity index 90% rename from src/main/java/org/opentripplanner/inspector/vector/edges/EdgeLayerBuilder.java rename to src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java index 60e65f7b35a..3823f91f039 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgeLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgeLayerBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.inspector.vector.edges; +package org.opentripplanner.inspector.vector.edge; import java.util.List; import org.locationtech.jts.geom.Envelope; @@ -9,6 +9,9 @@ import org.opentripplanner.routing.graph.index.StreetIndex; import org.opentripplanner.street.model.edge.Edge; +/** + * Selects all edges to be displayed for debugging. + */ public class EdgeLayerBuilder extends LayerBuilder { private final StreetIndex streetIndex; diff --git a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java similarity index 95% rename from src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java rename to src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java index 5bfc2dc6df7..fb65d0b5d3b 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/edges/EdgePropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java @@ -1,4 +1,4 @@ -package org.opentripplanner.inspector.vector.edges; +package org.opentripplanner.inspector.vector.edge; import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; import static org.opentripplanner.inspector.vector.KeyValue.kv; From 8af89a0d21f558bacdf16dab488b68a4082d2611 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 15 Jan 2024 13:08:25 +0100 Subject: [PATCH 0284/1688] Fix leg based fares --- .../fares/impl/DefaultFareServiceTest.java | 40 ++++++++++++++--- .../ext/fares/impl/FareModelForTest.java | 44 +++++++++++++------ .../ext/fares/impl/DefaultFareService.java | 18 ++++++-- .../ext/fares/model/FareRuleSet.java | 22 ++-------- .../model/fare/ItineraryFares.java | 1 + .../__snapshots__/BikeRentalSnapshotTest.snap | 24 +++++----- .../__snapshots__/ElevationSnapshotTest.snap | 12 ++--- .../__snapshots__/TransitSnapshotTest.snap | 26 +++++------ 8 files changed, 115 insertions(+), 72 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index f306b61ee50..c5e26cc3c9b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -7,6 +7,8 @@ import static org.opentripplanner.ext.fares.impl.FareModelForTest.AIRPORT_TO_CITY_CENTER_SET; import static org.opentripplanner.ext.fares.impl.FareModelForTest.CITY_CENTER_A_STOP; import static org.opentripplanner.ext.fares.impl.FareModelForTest.CITY_CENTER_B_STOP; +import static org.opentripplanner.ext.fares.impl.FareModelForTest.CITY_CENTER_C_STOP; +import static org.opentripplanner.ext.fares.impl.FareModelForTest.FREE_TRANSFERS_IN_CITY_SET; import static org.opentripplanner.ext.fares.impl.FareModelForTest.INSIDE_CITY_CENTER_SET; import static org.opentripplanner.ext.fares.impl.FareModelForTest.OTHER_FEED_ATTRIBUTE; import static org.opentripplanner.ext.fares.impl.FareModelForTest.OTHER_FEED_ROUTE; @@ -61,6 +63,34 @@ void simpleZoneBasedFare() { assertEquals(TEN_DOLLARS, product.price()); } + @Test + void applyToSeveralLegs() { + var service = new DefaultFareService(); + service.addFareRules(FareType.regular, List.of(FREE_TRANSFERS_IN_CITY_SET)); + var itin = newItinerary(Place.forStop(CITY_CENTER_A_STOP), T11_00) + .bus(1, T11_00, T11_12, Place.forStop(CITY_CENTER_B_STOP)) + .bus(1, T11_16, T11_20, Place.forStop(CITY_CENTER_C_STOP)) + .build(); + + var fare = service.calculateFares(itin); + assertNotNull(fare); + + var legProducts = fare.getLegProducts(); + + var firstLeg = itin.getTransitLeg(0); + var secondLeg = itin.getTransitLeg(1); + + var firstProducts = legProducts.get(firstLeg); + var secondProducts = legProducts.get(secondLeg); + + assertEquals(firstProducts, secondProducts); + + assertEquals( + "[FareProductUse[id=ddbf1572-18bc-3724-8b64-e1c7d5c8b6c6, product=FareProduct{id: 'F:free-transfers', amount: $20.00}]]", + firstProducts.toString() + ); + } + @Test void shouldNotCombineInterlinedLegs() { var service = new DefaultFareService(); @@ -89,17 +119,17 @@ void shouldNotCombineInterlinedLegs() { var legProducts = fare.getLegProducts(); - var firstLeg = itin.getLegs().get(0); + var firstLeg = itin.getLegs().getFirst(); var products = List.copyOf(legProducts.get(firstLeg)); - assertEquals(TEN_DOLLARS, products.get(0).product().price()); + assertEquals(TEN_DOLLARS, products.getFirst().product().price()); var secondLeg = itin.getLegs().get(1); products = List.copyOf(legProducts.get(secondLeg)); - assertEquals(TEN_DOLLARS, products.get(0).product().price()); + assertEquals(TEN_DOLLARS, products.getFirst().product().price()); assertEquals(1, fare.getItineraryProducts().size()); - assertEquals(TWENTY_DOLLARS, fare.getItineraryProducts().get(0).price()); + assertEquals(TWENTY_DOLLARS, fare.getItineraryProducts().getFirst().price()); } @Test @@ -187,7 +217,7 @@ void multipleFeedsWithTransfersWithinFeed() { legProducts.get(secondBusLeg).toString() ); assertEquals( - "[FareProductUse[id=678d201c-e839-35c3-ae7b-1bc3834da5e5, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", + "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", legProducts.get(finalBusLeg).toString() ); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java index 200220587a6..e498588d00f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FareModelForTest.java @@ -6,6 +6,7 @@ import org.opentripplanner.ext.fares.model.FareAttribute; import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.framework.geometry.WgsCoordinate; +import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.basic.TransitMode; @@ -27,44 +28,56 @@ public class FareModelForTest { private static final StopModelBuilder STOP_MODEL_BUILDER = StopModel.of(); - static RegularStop AIRPORT_STOP = STOP_MODEL_BUILDER + static final RegularStop AIRPORT_STOP = STOP_MODEL_BUILDER .regularStop(id("airport")) .withCoordinate(new WgsCoordinate(1, 1)) .addFareZones(AIRPORT_ZONE) - .withName(new NonLocalizedString("Airport")) + .withName(I18NString.of("Airport")) .build(); - static RegularStop CITY_CENTER_A_STOP = STOP_MODEL_BUILDER + static final RegularStop CITY_CENTER_A_STOP = STOP_MODEL_BUILDER .regularStop(id("city-center-a")) .withCoordinate(new WgsCoordinate(1, 2)) .addFareZones(CITY_CENTER_ZONE) - .withName(new NonLocalizedString("City center: stop A")) + .withName(I18NString.of("City center: stop A")) .build(); - static RegularStop CITY_CENTER_B_STOP = STOP_MODEL_BUILDER + static final RegularStop CITY_CENTER_B_STOP = STOP_MODEL_BUILDER .regularStop(id("city-center-b")) .withCoordinate(new WgsCoordinate(1, 3)) .addFareZones(CITY_CENTER_ZONE) - .withName(new NonLocalizedString("City center: stop B")) + .withName(I18NString.of("City center: stop B")) .build(); - static RegularStop SUBURB_STOP = STOP_MODEL_BUILDER + static final RegularStop CITY_CENTER_C_STOP = STOP_MODEL_BUILDER + .regularStop(id("city-center-c")) + .withCoordinate(new WgsCoordinate(1, 4)) + .addFareZones(CITY_CENTER_ZONE) + .withName(I18NString.of("City center: stop C")) + .build(); + static final RegularStop SUBURB_STOP = STOP_MODEL_BUILDER .regularStop(id("suburb")) .withCoordinate(new WgsCoordinate(1, 4)) - .withName(new NonLocalizedString("Suburb")) + .withName(I18NString.of("Suburb")) .build(); - static RegularStop OTHER_FEED_STOP = STOP_MODEL_BUILDER + static final RegularStop OTHER_FEED_STOP = STOP_MODEL_BUILDER .regularStop(FeedScopedId.ofNullable("F2", "other-feed-stop")) .withCoordinate(new WgsCoordinate(1, 5)) - .withName(new NonLocalizedString("Other feed stop")) + .withName(I18NString.of("Other feed stop")) .addFareZones(OTHER_FEED_ZONE) .build(); - static FareAttribute TEN_DOLLARS = FareAttribute + static final FareAttribute TEN_DOLLARS = FareAttribute .of(id("airport-to-city-center")) .setPrice(Money.usDollars(10)) .setTransfers(0) .build(); - static FareAttribute OTHER_FEED_ATTRIBUTE = FareAttribute + static final FareAttribute FREE_TRANSFERS = FareAttribute + .of(id("free-transfers")) + .setPrice(Money.usDollars(20)) + .setTransfers(10) + .build(); + + static final FareAttribute OTHER_FEED_ATTRIBUTE = FareAttribute .of(FeedScopedId.ofNullable("F2", "other-feed-attribute")) .setPrice(Money.usDollars(10)) .setTransfers(1) @@ -74,6 +87,7 @@ public class FareModelForTest { // Fare rule sets static FareRuleSet AIRPORT_TO_CITY_CENTER_SET = new FareRuleSet(TEN_DOLLARS); static FareRuleSet INSIDE_CITY_CENTER_SET = new FareRuleSet(TEN_DOLLARS); + static FareRuleSet FREE_TRANSFERS_IN_CITY_SET = new FareRuleSet(FREE_TRANSFERS); static FareRuleSet OTHER_FEED_SET = new FareRuleSet(OTHER_FEED_ATTRIBUTE); @@ -82,6 +96,10 @@ public class FareModelForTest { AIRPORT_ZONE.getId().getId(), CITY_CENTER_ZONE.getId().getId() ); + FREE_TRANSFERS_IN_CITY_SET.addOriginDestination( + CITY_CENTER_ZONE.getId().getId(), + CITY_CENTER_ZONE.getId().getId() + ); INSIDE_CITY_CENTER_SET.addOriginDestination( CITY_CENTER_ZONE.getId().getId(), CITY_CENTER_ZONE.getId().getId() @@ -95,7 +113,7 @@ public class FareModelForTest { static Route OTHER_FEED_ROUTE = Route .of(new FeedScopedId("F2", "other-feed-route")) .withAgency(OTHER_FEED_AGENCY) - .withLongName(new NonLocalizedString("other-feed-route")) + .withLongName(I18NString.of("other-feed-route")) .withMode(TransitMode.BUS) .build(); } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index f0d957bf4ff..0bc4408b635 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -259,24 +259,34 @@ protected boolean populateFare( float cost = r.resultTable[start][via]; FeedScopedId fareId = r.fareIds[start][via]; var product = FareProduct - .of(fareId, fareId.toString(), Money.ofFractionalAmount(currency, cost)) + .of(fareId, fareType.name(), Money.ofFractionalAmount(currency, cost)) .build(); + List applicableLegs = new ArrayList<>(); for (int i = start; i <= via; ++i) { final var leg = legs.get(i); - final var use = new FareProductUse(product.uniqueInstanceId(leg.getStartTime()), product); // if we have a leg that is combined for the purpose of fare calculation we need to // retrieve the original legs so that the fare products are assigned back to the original // legs that the combined one originally consisted of. // (remember that the combined leg only exists during fare calculation and is thrown away // afterwards to associating fare products with it will result in the API not showing any.) if (leg instanceof CombinedInterlinedTransitLeg combinedLeg) { - combinedLeg.originalLegs().forEach(l -> fareProductUses.put(l, use)); + applicableLegs.addAll(combinedLeg.originalLegs()); } else { - fareProductUses.put(leg, use); + applicableLegs.add(leg); } } + if (!applicableLegs.isEmpty()) { + final var use = new FareProductUse( + product.uniqueInstanceId(applicableLegs.getFirst().getStartTime()), + product + ); + applicableLegs.forEach(leg -> { + fareProductUses.put(leg, use); + }); + } + ++count; start = via + 1; } diff --git a/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java b/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java index 61e813e6ea4..30119631216 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java +++ b/src/ext/java/org/opentripplanner/ext/fares/model/FareRuleSet.java @@ -15,7 +15,6 @@ public class FareRuleSet implements Serializable { private final Set routeOriginDestinations; private final Set contains; private final FareAttribute fareAttribute; - private final Set trips; public FareRuleSet(FareAttribute fareAttribute) { this.fareAttribute = fareAttribute; @@ -23,7 +22,6 @@ public FareRuleSet(FareAttribute fareAttribute) { originDestinations = new HashSet<>(); routeOriginDestinations = new HashSet<>(); contains = new HashSet<>(); - trips = new HashSet<>(); } public void addOriginDestination(String origin, String destination) { @@ -62,14 +60,6 @@ public FareAttribute getFareAttribute() { return fareAttribute; } - public void addTrip(FeedScopedId trip) { - trips.add(trip); - } - - public Set getTrips() { - return trips; - } - public boolean matches( String startZone, String endZone, @@ -81,7 +71,7 @@ public boolean matches( Duration journeyTime ) { //check for matching origin/destination, if this ruleset has any origin/destination restrictions - if (originDestinations.size() > 0) { + if (!originDestinations.isEmpty()) { var od = new OriginDestination(startZone, endZone); if (!originDestinations.contains(od)) { var od2 = new OriginDestination(od.origin, null); @@ -95,25 +85,19 @@ public boolean matches( } //check for matching contains, if this ruleset has any containment restrictions - if (contains.size() > 0) { + if (!contains.isEmpty()) { if (!zonesVisited.equals(contains)) { return false; } } //check for matching routes - if (routes.size() != 0) { + if (!routes.isEmpty()) { if (!routes.containsAll(routesVisited)) { return false; } } - //check for matching trips - if (trips.size() != 0) { - if (!trips.containsAll(tripsVisited)) { - return false; - } - } if (fareAttribute.isTransfersSet() && fareAttribute.getTransfers() < transfersUsed) { return false; } diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index 80af574636a..d60dbfb249e 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -94,6 +94,7 @@ public void addItineraryProducts(Collection products) { * instead. */ @Nullable + @Deprecated public Money getFare(FareType type) { return fares.get(type); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap index 36c56471be1..41bc4278ca1 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap @@ -51,7 +51,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -537,7 +537,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -981,7 +981,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -1321,7 +1321,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -1807,7 +1807,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -2293,7 +2293,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -3308,7 +3308,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -3846,7 +3846,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -4264,7 +4264,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -4656,7 +4656,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -5194,7 +5194,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -5612,7 +5612,7 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap index 5baa72515ec..6579e4bbd37 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap @@ -579,7 +579,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -973,7 +973,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -1393,7 +1393,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -1787,7 +1787,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -2259,7 +2259,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -2653,7 +2653,7 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap index 8c36afa32e6..d5da342f9a6 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap @@ -279,7 +279,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -762,7 +762,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -1310,7 +1310,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -1793,7 +1793,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -2341,7 +2341,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] }, @@ -2361,7 +2361,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -3088,7 +3088,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -3574,7 +3574,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -4060,7 +4060,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -4546,7 +4546,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] }, @@ -4566,7 +4566,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } @@ -5072,7 +5072,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] }, @@ -5092,7 +5092,7 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan } }, "id" : "prt:8", - "name" : "prt:8" + "name" : "regular" } ] } From 61ab71e1bffb7c68038a01e242bfd6965ffbf9ad Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 15 Jan 2024 17:35:17 +0100 Subject: [PATCH 0285/1688] Add vertices layer builder --- .../GraphInspectorVectorTileResource.java | 3 ++ .../apis/vectortiles/model/LayerType.java | 1 + .../vector/vertex/VertexLayerBuilder.java | 37 +++++++++++++++++++ .../vector/vertex/VertexPropertyMapper.java | 29 +++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java create mode 100644 src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index c8cd3a089f3..6870f523fcf 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -34,6 +34,7 @@ import org.opentripplanner.inspector.vector.edge.EdgeLayerBuilder; import org.opentripplanner.inspector.vector.geofencing.GeofencingZonesLayerBuilder; import org.opentripplanner.inspector.vector.stop.StopLayerBuilder; +import org.opentripplanner.inspector.vector.vertex.VertexLayerBuilder; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.standalone.api.OtpServerRequestContext; @@ -51,6 +52,7 @@ public class GraphInspectorVectorTileResource { GeofencingZones ); private static final LayerParams EDGES = new LayerParams("edges", Edges); + private static final LayerParams VERTICES = new LayerParams("vertices", Edges); private static final List> DEBUG_LAYERS = List.of( REGULAR_STOPS, AREA_STOPS, @@ -181,6 +183,7 @@ private static LayerBuilder createLayerBuilder( ); case GeofencingZones -> new GeofencingZonesLayerBuilder(context.graph(), layerParameters); case Edges -> new EdgeLayerBuilder(context.graph(), layerParameters); + case Vertices -> new VertexLayerBuilder(context.graph(), layerParameters); }; } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java index 4324a511a6b..4d73b0a14bd 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java @@ -5,4 +5,5 @@ public enum LayerType { AreaStop, GeofencingZones, Edges, + Vertices } diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java new file mode 100644 index 00000000000..e7aadb6be9e --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java @@ -0,0 +1,37 @@ +package org.opentripplanner.inspector.vector.vertex; + +import java.util.List; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.inspector.vector.LayerBuilder; +import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.routing.graph.Graph; +import org.opentripplanner.routing.graph.index.StreetIndex; +import org.opentripplanner.street.model.vertex.Vertex; + +/** + * Selects all vertices to be displayed for debugging. + */ +public class VertexLayerBuilder extends LayerBuilder { + + private final StreetIndex streetIndex; + + public VertexLayerBuilder(Graph graph, LayerParameters layerParameters) { + super(new VertexPropertyMapper(), layerParameters.name(), layerParameters.expansionFactor()); + this.streetIndex = graph.getStreetIndex(); + } + + @Override + protected List getGeometries(Envelope query) { + return streetIndex + .getEdgesForEnvelope(query) + .stream() + .filter(e -> e.getGeometry() != null) + .map(edge -> { + Geometry geometry = edge.getGeometry(); + geometry.setUserData(edge); + return geometry; + }) + .toList(); + } +} diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java new file mode 100644 index 00000000000..b2deda9647c --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java @@ -0,0 +1,29 @@ +package org.opentripplanner.inspector.vector.vertex; + +import static org.opentripplanner.inspector.vector.KeyValue.kv; + +import java.util.Collection; +import java.util.List; +import org.opentripplanner.apis.support.mapping.PropertyMapper; +import org.opentripplanner.framework.collection.ListUtils; +import org.opentripplanner.inspector.vector.KeyValue; +import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; +import org.opentripplanner.street.model.vertex.BarrierVertex; +import org.opentripplanner.street.model.vertex.Vertex; + +public class VertexPropertyMapper extends PropertyMapper { + + @Override + protected Collection map(Vertex input) { + List baseProps = List.of(kv("class", input.getClass().getSimpleName())); + List properties = + switch (input) { + case BarrierVertex v -> List.of( + kv("permission", v.getBarrierPermissions().toString()) + ); + case VehicleRentalPlaceVertex v -> List.of(kv("rentalId", v.getStation().getId())); + default -> List.of(); + }; + return ListUtils.combine(baseProps, properties); + } +} From c9bbc7d75b26eae9b2c537741d83c418e9abe4a1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 07:20:07 +0100 Subject: [PATCH 0286/1688] Add vertices to debug tiles --- .../src/components/MapView/MapView.tsx | 4 +-- .../apis/vectortiles/DebugStyleSpec.java | 25 ++++++++++++++++--- .../GraphInspectorVectorTileResource.java | 19 ++++++++------ .../apis/vectortiles/model/LayerType.java | 4 +-- .../vector/vertex/VertexLayerBuilder.java | 10 ++++---- .../vector/vertex/VertexPropertyMapper.java | 9 ++++--- .../apis/vectortiles/DebugStyleSpecTest.java | 2 +- 7 files changed, 48 insertions(+), 25 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index fa0bfbd022b..11aa41476d3 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -58,7 +58,7 @@ export function MapView({ // provided by the WorldEnvelopeService if (map.getZoom() < 2) { const source = map.getSource('stops') as VectorTileSource; - map.fitBounds(source.bounds, { maxDuration: 50, linear: true }); + map.fitBounds(source.bounds, { maxDuration: 50, linear: true}); } }; @@ -75,7 +75,7 @@ export function MapView({ }} // it's unfortunate that you have to list these layers here. // maybe there is a way around it: https://github.com/visgl/react-map-gl/discussions/2343 - interactiveLayerIds={['regular-stop', 'edge-fallback', 'edge', 'link']} + interactiveLayerIds={['regular-stop', 'vertex', 'edge', 'link']} onClick={showFeaturePropPopup} // put lat/long in URL and pan to it on page reload hash={true} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 2393125f780..fd3254bdb05 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -38,14 +38,22 @@ public class DebugStyleSpec { ); private static final String MAGENTA = "#f21d52"; private static final String GREEN = "#22DD9E"; + private static final String PURPLE = "#BC55F2"; private static final int MAX_ZOOM = 23; private static final ZoomDependentNumber LINE_WIDTH = new ZoomDependentNumber( 1.3f, List.of(new ZoomStop(13, 0.5f), new ZoomStop(MAX_ZOOM, 10)) ); + private static final String BLACK = "#140d0e"; - static StyleSpec build(VectorSourceLayer regularStops, VectorSourceLayer edges) { - var vectorSources = Stream.of(regularStops, edges).map(VectorSourceLayer::vectorSource); + static StyleSpec build( + VectorSourceLayer regularStops, + VectorSourceLayer edges, + VectorSourceLayer vertices + ) { + var vectorSources = Stream + .of(regularStops, edges, vertices) + .map(VectorSourceLayer::vectorSource); var allSources = Stream .concat(Stream.of(BACKGROUND_SOURCE), vectorSources) .collect(Collectors.toSet()); @@ -88,11 +96,22 @@ static StyleSpec build(VectorSourceLayer regularStops, VectorSourceLayer edges) .minZoom(13) .maxZoom(MAX_ZOOM) .intiallyHidden(), + StyleBuilder + .ofId("vertex") + .typeCircle() + .vectorSourceLayer(vertices) + .circleStroke(BLACK, 2) + .circleRadius( + new ZoomDependentNumber(1, List.of(new ZoomStop(15, 1), new ZoomStop(MAX_ZOOM, 5))) + ) + .circleColor(PURPLE) + .minZoom(15) + .maxZoom(MAX_ZOOM), StyleBuilder .ofId("regular-stop") .typeCircle() .vectorSourceLayer(regularStops) - .circleStroke("#140d0e", 2) + .circleStroke(BLACK, 2) .circleRadius( new ZoomDependentNumber(1, List.of(new ZoomStop(11, 1), new ZoomStop(MAX_ZOOM, 10))) ) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 6870f523fcf..5d0778eae6d 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -1,8 +1,9 @@ package org.opentripplanner.apis.vectortiles; -import static org.opentripplanner.apis.vectortiles.model.LayerType.Edges; +import static org.opentripplanner.apis.vectortiles.model.LayerType.Edge; import static org.opentripplanner.apis.vectortiles.model.LayerType.GeofencingZones; import static org.opentripplanner.apis.vectortiles.model.LayerType.RegularStop; +import static org.opentripplanner.apis.vectortiles.model.LayerType.Vertex; import static org.opentripplanner.framework.io.HttpUtils.APPLICATION_X_PROTOBUF; import jakarta.ws.rs.GET; @@ -51,13 +52,14 @@ public class GraphInspectorVectorTileResource { "geofencingZones", GeofencingZones ); - private static final LayerParams EDGES = new LayerParams("edges", Edges); - private static final LayerParams VERTICES = new LayerParams("vertices", Edges); + private static final LayerParams EDGES = new LayerParams("edges", Edge); + private static final LayerParams VERTICES = new LayerParams("vertices", Vertex); private static final List> DEBUG_LAYERS = List.of( REGULAR_STOPS, AREA_STOPS, GEOFENCING_ZONES, - EDGES + EDGES, + VERTICES ); private final OtpServerRequestContext serverContext; @@ -133,12 +135,13 @@ public StyleSpec getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) ); var streetSource = new VectorSource( "street", - tileJsonUrl(base, List.of(EDGES, GEOFENCING_ZONES)) + tileJsonUrl(base, List.of(EDGES, GEOFENCING_ZONES, VERTICES)) ); return DebugStyleSpec.build( REGULAR_STOPS.toVectorSourceLayer(stopsSource), - EDGES.toVectorSourceLayer(streetSource) + EDGES.toVectorSourceLayer(streetSource), + VERTICES.toVectorSourceLayer(streetSource) ); } @@ -182,8 +185,8 @@ private static LayerBuilder createLayerBuilder( e -> context.transitService().findAreaStops(e) ); case GeofencingZones -> new GeofencingZonesLayerBuilder(context.graph(), layerParameters); - case Edges -> new EdgeLayerBuilder(context.graph(), layerParameters); - case Vertices -> new VertexLayerBuilder(context.graph(), layerParameters); + case Edge -> new EdgeLayerBuilder(context.graph(), layerParameters); + case Vertex -> new VertexLayerBuilder(context.graph(), layerParameters); }; } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java index 4d73b0a14bd..ece75f29b60 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java @@ -4,6 +4,6 @@ public enum LayerType { RegularStop, AreaStop, GeofencingZones, - Edges, - Vertices + Edge, + Vertex, } diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java index e7aadb6be9e..0b3bb79b72e 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java +++ b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexLayerBuilder.java @@ -3,6 +3,7 @@ import java.util.List; import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.routing.graph.Graph; @@ -24,12 +25,11 @@ public VertexLayerBuilder(Graph graph, LayerParameters layerParameters) { @Override protected List getGeometries(Envelope query) { return streetIndex - .getEdgesForEnvelope(query) + .getVerticesForEnvelope(query) .stream() - .filter(e -> e.getGeometry() != null) - .map(edge -> { - Geometry geometry = edge.getGeometry(); - geometry.setUserData(edge); + .map(vertex -> { + Geometry geometry = GeometryUtils.getGeometryFactory().createPoint(vertex.getCoordinate()); + geometry.setUserData(vertex); return geometry; }) .toList(); diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java index b2deda9647c..a493269cc3b 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java @@ -15,12 +15,13 @@ public class VertexPropertyMapper extends PropertyMapper { @Override protected Collection map(Vertex input) { - List baseProps = List.of(kv("class", input.getClass().getSimpleName())); + List baseProps = List.of( + kv("class", input.getClass().getSimpleName()), + kv("label", input.getLabel().toString()) + ); List properties = switch (input) { - case BarrierVertex v -> List.of( - kv("permission", v.getBarrierPermissions().toString()) - ); + case BarrierVertex v -> List.of(kv("permission", v.getBarrierPermissions().toString())); case VehicleRentalPlaceVertex v -> List.of(kv("rentalId", v.getStation().getId())); default -> List.of(); }; diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index 693ddbc2d79..af7598285e1 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -17,7 +17,7 @@ void spec() { var vectorSource = new VectorSource("vectorSource", "https://example.com"); var stops = new VectorSourceLayer(vectorSource, "stops"); var edges = new VectorSourceLayer(vectorSource, "edges"); - var spec = DebugStyleSpec.build(stops, edges); + var spec = DebugStyleSpec.build(stops, edges, VERTICES.toVectorSourceLayer(streetSource)); var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); var expectation = RESOURCES.fileToString("style.json"); From c6306b8bd0eb50f9e4d02a5a75159c9d99d07f45 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 11:24:05 +0100 Subject: [PATCH 0287/1688] Set 2.0 as the version the MQTT updater was added --- docs/UpdaterConfig.md | 10 +++++----- .../updaters/MqttGtfsRealtimeUpdaterConfig.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/UpdaterConfig.md b/docs/UpdaterConfig.md index 212a2d55370..a819a898240 100644 --- a/docs/UpdaterConfig.md +++ b/docs/UpdaterConfig.md @@ -179,11 +179,11 @@ This system powers the realtime updates in Helsinki and more information can be |-----------------------------------------------------------------------|:---------:|----------------------------------------------|:----------:|----------------------|:-----:| | type = "mqtt-gtfs-rt-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | | [backwardsDelayPropagationType](#u__6__backwardsDelayPropagationType) | `enum` | How backwards propagation should be handled. | *Optional* | `"required-no-data"` | 2.2 | -| feedId | `string` | The feed id to apply the updates to. | *Required* | | na | -| fuzzyTripMatching | `boolean` | Whether to match trips fuzzily. | *Optional* | `false` | na | -| qos | `integer` | QOS level. | *Optional* | `0` | na | -| topic | `string` | The topic to subscribe to. | *Required* | | na | -| url | `string` | URL of the MQTT broker. | *Required* | | na | +| feedId | `string` | The feed id to apply the updates to. | *Required* | | 2.0 | +| fuzzyTripMatching | `boolean` | Whether to match trips fuzzily. | *Optional* | `false` | 2.0 | +| qos | `integer` | QOS level. | *Optional* | `0` | 2.0 | +| topic | `string` | The topic to subscribe to. | *Required* | | 2.0 | +| url | `string` | URL of the MQTT broker. | *Required* | | 2.0 | ##### Parameter details diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java index 372bd36227e..ccc4ca5e80f 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/MqttGtfsRealtimeUpdaterConfig.java @@ -1,6 +1,6 @@ package org.opentripplanner.standalone.config.routerconfig.updaters; -import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; @@ -12,13 +12,13 @@ public class MqttGtfsRealtimeUpdaterConfig { public static MqttGtfsRealtimeUpdaterParameters create(String configRef, NodeAdapter c) { return new MqttGtfsRealtimeUpdaterParameters( configRef, - c.of("feedId").since(NA).summary("The feed id to apply the updates to.").asString(), - c.of("url").since(NA).summary("URL of the MQTT broker.").asString(), - c.of("topic").since(NA).summary("The topic to subscribe to.").asString(), - c.of("qos").since(NA).summary("QOS level.").asInt(0), + c.of("feedId").since(V2_0).summary("The feed id to apply the updates to.").asString(), + c.of("url").since(V2_0).summary("URL of the MQTT broker.").asString(), + c.of("topic").since(V2_0).summary("The topic to subscribe to.").asString(), + c.of("qos").since(V2_0).summary("QOS level.").asInt(0), c .of("fuzzyTripMatching") - .since(NA) + .since(V2_0) .summary("Whether to match trips fuzzily.") .asBoolean(false), c From cec3655f5e55b2b2666fe554b407f6322c52f15d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 13:02:03 +0100 Subject: [PATCH 0288/1688] Add comment to visualizer [ci skip] --- .../java/org/opentripplanner/visualizer/GraphVisualizer.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java index 73516b0348f..9f8bbffb22d 100644 --- a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java +++ b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java @@ -157,6 +157,10 @@ public DisplayVertex getElementAt(int index) { * TransitStops only, and allows a user to select stops, examine incoming and outgoing edges, and * examine trip patterns. It's meant mainly for debugging, so it's totally OK if it develops (say) a * bunch of weird buttons designed to debug specific cases. + *

      + * 2024-01-26: We talked about the visualizer in the developer meeting and while the code is a bit + * dusty, we decided that we want to keep the option open to build make the visualization of routing + * steps work again in the future and won't delete it. */ public class GraphVisualizer extends JFrame implements VertexSelectionListener { From f1a9be02e20373fa33776e9d38d3478ede8f6932 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 13:17:30 +0100 Subject: [PATCH 0289/1688] Update vertex styles --- .../src/components/MapView/MapView.tsx | 2 +- .../apis/vectortiles/DebugStyleSpec.java | 13 ++++-- .../apis/vectortiles/model/StyleBuilder.java | 6 +++ .../apis/vectortiles/DebugStyleSpecTest.java | 3 +- .../apis/vectortiles/style.json | 44 ++++++++++++++++++- 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 11aa41476d3..51cb39068f8 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -58,7 +58,7 @@ export function MapView({ // provided by the WorldEnvelopeService if (map.getZoom() < 2) { const source = map.getSource('stops') as VectorTileSource; - map.fitBounds(source.bounds, { maxDuration: 50, linear: true}); + map.fitBounds(source.bounds, { maxDuration: 50, linear: true }); } }; diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index fd3254bdb05..f7ca564b149 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -39,12 +39,16 @@ public class DebugStyleSpec { private static final String MAGENTA = "#f21d52"; private static final String GREEN = "#22DD9E"; private static final String PURPLE = "#BC55F2"; + private static final String BLACK = "#140d0e"; private static final int MAX_ZOOM = 23; private static final ZoomDependentNumber LINE_WIDTH = new ZoomDependentNumber( 1.3f, List.of(new ZoomStop(13, 0.5f), new ZoomStop(MAX_ZOOM, 10)) ); - private static final String BLACK = "#140d0e"; + private static final ZoomDependentNumber CIRCLE_STROKE = new ZoomDependentNumber( + 1, + List.of(new ZoomStop(15, 0.2f), new ZoomStop(MAX_ZOOM, 3)) + ); static StyleSpec build( VectorSourceLayer regularStops, @@ -100,13 +104,14 @@ static StyleSpec build( .ofId("vertex") .typeCircle() .vectorSourceLayer(vertices) - .circleStroke(BLACK, 2) + .circleStroke(BLACK, CIRCLE_STROKE) .circleRadius( - new ZoomDependentNumber(1, List.of(new ZoomStop(15, 1), new ZoomStop(MAX_ZOOM, 5))) + new ZoomDependentNumber(1, List.of(new ZoomStop(15, 1), new ZoomStop(MAX_ZOOM, 7))) ) .circleColor(PURPLE) .minZoom(15) - .maxZoom(MAX_ZOOM), + .maxZoom(MAX_ZOOM) + .intiallyHidden(), StyleBuilder .ofId("regular-stop") .typeCircle() diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java index f60531b461a..3b2f36d3156 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java @@ -104,6 +104,12 @@ public StyleBuilder circleStroke(String color, int width) { return this; } + public StyleBuilder circleStroke(String color, ZoomDependentNumber width) { + paint.put("circle-stroke-color", validateColor(color)); + paint.put("circle-stroke-width", width.toJson()); + return this; + } + public StyleBuilder circleRadius(ZoomDependentNumber radius) { paint.put("circle-radius", radius.toJson()); return this; diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index af7598285e1..befd34a3b38 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -17,7 +17,8 @@ void spec() { var vectorSource = new VectorSource("vectorSource", "https://example.com"); var stops = new VectorSourceLayer(vectorSource, "stops"); var edges = new VectorSourceLayer(vectorSource, "edges"); - var spec = DebugStyleSpec.build(stops, edges, VERTICES.toVectorSourceLayer(streetSource)); + var vertices = new VectorSourceLayer(vectorSource, "vertices"); + var spec = DebugStyleSpec.build(stops, edges, vertices); var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); var expectation = RESOURCES.fileToString("style.json"); diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index 06a602a8cd3..9555f32c1e5 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -1,5 +1,4 @@ { - "name" : "OTP Debug Tiles", "sources" : { "background" : { @@ -101,6 +100,47 @@ "visibility" : "none" } }, + { + "id" : "vertex", + "type" : "circle", + "source" : "vectorSource", + "source-layer" : "vertices", + "minzoom" : 15, + "maxzoom" : 23, + "paint" : { + "circle-stroke-color" : "#140d0e", + "circle-stroke-width" : { + "base" : 1.0, + "stops" : [ + [ + 15, + 0.2 + ], + [ + 23, + 3.0 + ] + ] + }, + "circle-radius" : { + "base" : 1.0, + "stops" : [ + [ + 15, + 1.0 + ], + [ + 23, + 7.0 + ] + ] + }, + "circle-color" : "#BC55F2" + }, + "layout" : { + "visibility" : "none" + } + }, { "id" : "regular-stop", "type" : "circle", @@ -129,4 +169,4 @@ } ], "version" : 8 -} \ No newline at end of file +} From 9e806f7957f7c487d6647b80fd11166cbdbff80f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 14:41:09 +0100 Subject: [PATCH 0290/1688] Move fallback class into framework.time package --- .../opentripplanner/ext/restapi/resources/RoutingResource.java | 2 +- .../opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java | 2 +- .../{api/support => framework/time}/ZoneIdFallback.java | 2 +- .../routing/algorithm/mapping/GraphPathToItineraryMapper.java | 2 +- .../opentripplanner/routing/service/DefaultRoutingService.java | 2 +- .../{api/support => framework/time}/ZoneIdFallbackTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename src/main/java/org/opentripplanner/{api/support => framework/time}/ZoneIdFallback.java (96%) rename src/test/java/org/opentripplanner/{api/support => framework/time}/ZoneIdFallbackTest.java (89%) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java index ae63a95feaa..bfb3d6ed15a 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java @@ -19,11 +19,11 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import org.opentripplanner.api.parameter.QualifiedModeSet; -import org.opentripplanner.api.support.ZoneIdFallback; import org.opentripplanner.ext.dataoverlay.api.DataOverlayParameters; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.framework.time.ZoneIdFallback; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index e4094aaa888..2eeaf229b11 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -15,9 +15,9 @@ import org.opentripplanner.api.common.LocationStringParser; import org.opentripplanner.api.parameter.QualifiedMode; import org.opentripplanner.api.parameter.QualifiedModeSet; -import org.opentripplanner.api.support.ZoneIdFallback; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.framework.graphql.GraphQLUtils; +import org.opentripplanner.framework.time.ZoneIdFallback; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/src/main/java/org/opentripplanner/api/support/ZoneIdFallback.java b/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java similarity index 96% rename from src/main/java/org/opentripplanner/api/support/ZoneIdFallback.java rename to src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java index 0175337e2d4..2d43216e4b2 100644 --- a/src/main/java/org/opentripplanner/api/support/ZoneIdFallback.java +++ b/src/main/java/org/opentripplanner/framework/time/ZoneIdFallback.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.support; +package org.opentripplanner.framework.time; import java.time.ZoneId; import javax.annotation.Nullable; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java index ee86f8de720..11302098f25 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/GraphPathToItineraryMapper.java @@ -12,13 +12,13 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; -import org.opentripplanner.api.support.ZoneIdFallback; import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.framework.time.ZoneIdFallback; import org.opentripplanner.model.plan.ElevationProfile; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; diff --git a/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java b/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java index dd5d5615be8..01736aac80e 100644 --- a/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java +++ b/src/main/java/org/opentripplanner/routing/service/DefaultRoutingService.java @@ -1,8 +1,8 @@ package org.opentripplanner.routing.service; import java.time.ZoneId; -import org.opentripplanner.api.support.ZoneIdFallback; import org.opentripplanner.framework.application.OTPRequestTimeoutException; +import org.opentripplanner.framework.time.ZoneIdFallback; import org.opentripplanner.framework.tostring.MultiLineToStringBuilder; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.RoutingWorker; diff --git a/src/test/java/org/opentripplanner/api/support/ZoneIdFallbackTest.java b/src/test/java/org/opentripplanner/framework/time/ZoneIdFallbackTest.java similarity index 89% rename from src/test/java/org/opentripplanner/api/support/ZoneIdFallbackTest.java rename to src/test/java/org/opentripplanner/framework/time/ZoneIdFallbackTest.java index 02013f0856b..b69e3ee2ff1 100644 --- a/src/test/java/org/opentripplanner/api/support/ZoneIdFallbackTest.java +++ b/src/test/java/org/opentripplanner/framework/time/ZoneIdFallbackTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.support; +package org.opentripplanner.framework.time; import static org.junit.jupiter.api.Assertions.assertEquals; From 83dd2282948c083ddd64653b617ed3fd0d8cb14b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 14:46:55 +0100 Subject: [PATCH 0291/1688] Allow dependency on logging package --- .../opentripplanner/framework/FrameworkArchitectureTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java b/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java index e1e00076a73..9e44dd05dda 100644 --- a/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java +++ b/src/test/java/org/opentripplanner/framework/FrameworkArchitectureTest.java @@ -97,7 +97,7 @@ void enforceTextPackageDependencies() { @Test void enforceTimePackageDependencies() { - TIME.verify(); + TIME.dependsOn(LOGGING).verify(); } @Test From 216bea8239631ef9c99e72b7180f7c50a55b8127 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 17:21:50 +0100 Subject: [PATCH 0292/1688] Change path of GTFS API to /otp/gtfs/v1 --- docs/apis/GTFS-GraphQL-API.md | 4 +- magidoc.mjs | 2 +- src/client/graphiql/index.html | 2 +- .../opentripplanner/apis/APIEndpoints.java | 2 + .../apis/gtfs/GtfsGraphQLAPI.java | 94 ++++--------------- .../graphql/GraphQLResponseSerializer.java | 26 ----- 6 files changed, 23 insertions(+), 107 deletions(-) diff --git a/docs/apis/GTFS-GraphQL-API.md b/docs/apis/GTFS-GraphQL-API.md index a9937afc6b2..b67b2882ec9 100644 --- a/docs/apis/GTFS-GraphQL-API.md +++ b/docs/apis/GTFS-GraphQL-API.md @@ -6,7 +6,7 @@ used heavily by [digitransit-ui](https://github.com/HSLdevcom/digitransit-ui). [otp-react-redux](https://github.com/opentripplanner/otp-react-redux) has also migrated to this API in 2023. ## URLs - - GraphQL endpoint: [`http://localhost:8080/otp/routers/default/index/graphql`](http://localhost:8080/otp/routers/default/index/graphql) + - GraphQL endpoint: [`http://localhost:8080/otp/gtfs/v1`](http://localhost:8080/otp/gtfs/v1) - HTML schema documentation: [https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/](https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/) - Built-in visual GraphQL client: [http://localhost:8080/graphiql](http://localhost:8080/graphiql) @@ -22,7 +22,7 @@ A complete example that fetches the list of all stops from OTP is: ``` curl --request POST \ - --url http://localhost:8080/otp/routers/default/index/graphql \ + --url http://localhost:8080/otp/gtfs/v1 \ --header 'Content-Type: application/json' \ --header 'OTPTimeout: 180000' \ --data '{"query":"query stops {\n stops {\n gtfsId\n name\n }\n}\n","operationName":"stops"}' diff --git a/magidoc.mjs b/magidoc.mjs index 44997e3fc9d..a02976f4bcc 100644 --- a/magidoc.mjs +++ b/magidoc.mjs @@ -17,7 +17,7 @@ export default { This is the static documentation of the OTP GraphQL GTFS API. The GraphQL endpoint of your instance, which you should point your tooling to, is -\`http://localhost:8080/otp/routers/default/index/graphql\` +\`http://localhost:8080/otp/gtfs/v1\` Please also check out the interactive API explorer built into every instance and available at http://localhost:8080/graphiql diff --git a/src/client/graphiql/index.html b/src/client/graphiql/index.html index 44016557a92..d96f736b287 100644 --- a/src/client/graphiql/index.html +++ b/src/client/graphiql/index.html @@ -152,7 +152,7 @@ let apiFlavor = parameters.flavor || "gtfs"; let urls = { - gtfs: '/otp/routers/default/index/graphql', + gtfs: '/otp/gtfs/v1', transmodel: '/otp/routers/default/transmodel/index/graphql' } diff --git a/src/main/java/org/opentripplanner/apis/APIEndpoints.java b/src/main/java/org/opentripplanner/apis/APIEndpoints.java index fc49c02431f..00fcb61f439 100644 --- a/src/main/java/org/opentripplanner/apis/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/apis/APIEndpoints.java @@ -51,6 +51,8 @@ private APIEndpoints() { addIfEnabled(APIServerInfo, ServerInfo.class); addIfEnabled(APIUpdaterStatus, UpdaterStatusResource.class); addIfEnabled(GtfsGraphQlApi, GtfsGraphQLAPI.class); + // scheduled to be removed and only here for backwards compatibility + addIfEnabled(GtfsGraphQlApi, GtfsGraphQLAPI.GtfsGraphQLAPIOldPath.class); addIfEnabled(TransmodelGraphQlApi, TransmodelAPI.class); // Sandbox extension APIs diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java index b9b93190816..fd135d05544 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLAPI.java @@ -1,7 +1,6 @@ package org.opentripplanner.apis.gtfs; import com.fasterxml.jackson.databind.ObjectMapper; -import graphql.ExecutionResult; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.HeaderParam; @@ -14,39 +13,40 @@ import jakarta.ws.rs.core.MediaType; import jakarta.ws.rs.core.Response; import java.io.IOException; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; -import org.opentripplanner.framework.graphql.GraphQLResponseSerializer; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -@Path("/routers/{ignoreRouterId}/index/graphql") -@Produces(MediaType.APPLICATION_JSON) // One @Produces annotation for all endpoints. +@Path("/gtfs/v1/") +@Produces(MediaType.APPLICATION_JSON) public class GtfsGraphQLAPI { - @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger(GtfsGraphQLAPI.class); private final OtpServerRequestContext serverContext; private final ObjectMapper deserializer = new ObjectMapper(); - public GtfsGraphQLAPI( - @Context OtpServerRequestContext serverContext, - /** - * @deprecated The support for multiple routers are removed from OTP2. - * See https://github.com/opentripplanner/OpenTripPlanner/issues/2760 - */ - @Deprecated @PathParam("ignoreRouterId") String ignoreRouterId - ) { + public GtfsGraphQLAPI(@Context OtpServerRequestContext serverContext) { this.serverContext = serverContext; } + /** + * This class is only here for backwards-compatibility. It will be removed in the future. + */ + @Path("/routers/{ignoreRouterId}/index/graphql") + public static class GtfsGraphQLAPIOldPath extends GtfsGraphQLAPI { + + public GtfsGraphQLAPIOldPath( + @Context OtpServerRequestContext serverContext, + @PathParam("ignoreRouterId") String ignore + ) { + super(serverContext); + } + } + @POST @Consumes(MediaType.APPLICATION_JSON) public Response getGraphQL( @@ -120,64 +120,4 @@ public Response getGraphQL( GraphQLRequestContext.ofServerContext(serverContext) ); } - - @POST - @Path("/batch") - @Consumes(MediaType.APPLICATION_JSON) - public Response getGraphQLBatch( - List> queries, - @HeaderParam("OTPTimeout") @DefaultValue("30000") int timeout, - @HeaderParam("OTPMaxResolves") @DefaultValue("1000000") int maxResolves, - @Context HttpHeaders headers - ) { - List> futures = new ArrayList<>(); - Locale locale = headers.getAcceptableLanguages().size() > 0 - ? headers.getAcceptableLanguages().get(0) - : serverContext.defaultLocale(); - - for (HashMap query : queries) { - Map variables; - if (query.get("variables") instanceof Map) { - variables = (Map) query.get("variables"); - } else if ( - query.get("variables") instanceof String && ((String) query.get("variables")).length() > 0 - ) { - try { - variables = deserializer.readValue((String) query.get("variables"), Map.class); - } catch (IOException e) { - return Response - .status(Response.Status.BAD_REQUEST) - .type(MediaType.TEXT_PLAIN_TYPE) - .entity("Variables must be a valid json object") - .build(); - } - } else { - variables = null; - } - String operationName = (String) query.getOrDefault("operationName", null); - - futures.add(() -> - GtfsGraphQLIndex.getGraphQLExecutionResult( - (String) query.get("query"), - variables, - operationName, - maxResolves, - timeout, - locale, - GraphQLRequestContext.ofServerContext(serverContext) - ) - ); - } - - try { - List> results = GtfsGraphQLIndex.threadPool.invokeAll(futures); - return Response - .status(Response.Status.OK) - .entity(GraphQLResponseSerializer.serializeBatch(queries, results)) - .build(); - } catch (InterruptedException e) { - LOG.error("Batch query interrupted", e); - throw new RuntimeException(e); - } - } } diff --git a/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java b/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java index cb3b146a113..1497f63285d 100644 --- a/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java +++ b/src/main/java/org/opentripplanner/framework/graphql/GraphQLResponseSerializer.java @@ -33,30 +33,4 @@ public static String serialize(ExecutionResult executionResult) { throw new RuntimeException(e); } } - - public static String serializeBatch( - List> queries, - List> futures - ) { - List> responses = new LinkedList<>(); - for (int i = 0; i < queries.size(); i++) { - ExecutionResult executionResult; - // Try each request separately, returning both completed and failed responses is ok - try { - executionResult = futures.get(i).get(); - } catch (InterruptedException | ExecutionException e) { - executionResult = new AbortExecutionException(e).toExecutionResult(); - } - responses.add( - Map.of("id", queries.get(i).get("id"), "payload", executionResult.toSpecification()) - ); - } - - try { - return objectMapper.writeValueAsString(responses); - } catch (JsonProcessingException e) { - LOG.error("Unable to serialize response", e); - throw new RuntimeException(e); - } - } } From 91609ec3c7127ac6b3f53f7e152fcd1600d2a2e8 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 22:59:31 +0100 Subject: [PATCH 0293/1688] Remove VehicleToStopHeuristics from examples [ci skip] --- docs/examples/ibi/atlanta/otp-config.json | 1 - docs/examples/ibi/portland/otp-config.json | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/docs/examples/ibi/atlanta/otp-config.json b/docs/examples/ibi/atlanta/otp-config.json index b1c4b530cf2..2269e35d6ec 100644 --- a/docs/examples/ibi/atlanta/otp-config.json +++ b/docs/examples/ibi/atlanta/otp-config.json @@ -2,7 +2,6 @@ "otpFeatures" : { "FlexRouting": true, "GtfsGraphQlApi": true, - "VehicleToStopHeuristics": true, "ParallelRouting": true } } diff --git a/docs/examples/ibi/portland/otp-config.json b/docs/examples/ibi/portland/otp-config.json index 3227d4d90ca..2f4b1f586cc 100644 --- a/docs/examples/ibi/portland/otp-config.json +++ b/docs/examples/ibi/portland/otp-config.json @@ -1,6 +1,5 @@ { "otpFeatures" : { - "GtfsGraphQlApi": true, - "VehicleToStopHeuristics": true + "GtfsGraphQlApi": true } } From 25c7fc85607298c7eb3654d23d40f099a9cad373 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 17 Jan 2024 10:41:04 +0000 Subject: [PATCH 0294/1688] Add changelog entry for #4652 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 50846c3fce7..b26ab6ba080 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -74,6 +74,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix high walk reluctance leading to zero egress results for rental searches [#5605](https://github.com/opentripplanner/OpenTripPlanner/pull/5605) - Remove GTFS-RT websocket updater [#5604](https://github.com/opentripplanner/OpenTripPlanner/pull/5604) - Add stop layer to new Debug UI [#5602](https://github.com/opentripplanner/OpenTripPlanner/pull/5602) +- Use fallback timezone if no transit data is loaded [#4652](https://github.com/opentripplanner/OpenTripPlanner/pull/4652) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 7826c0dc2074bb59716f73c74b93ae5d257828d4 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 17 Jan 2024 11:49:59 +0000 Subject: [PATCH 0295/1688] Add changelog entry for #5581 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index b26ab6ba080..4af1393c748 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -75,6 +75,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Remove GTFS-RT websocket updater [#5604](https://github.com/opentripplanner/OpenTripPlanner/pull/5604) - Add stop layer to new Debug UI [#5602](https://github.com/opentripplanner/OpenTripPlanner/pull/5602) - Use fallback timezone if no transit data is loaded [#4652](https://github.com/opentripplanner/OpenTripPlanner/pull/4652) +- Add new path for GTFS GraphQL API, remove batch feature [#5581](https://github.com/opentripplanner/OpenTripPlanner/pull/5581) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 5a4cb9a67023fb0eadf556d98004d3e620ed6c8f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 14:08:01 +0100 Subject: [PATCH 0296/1688] Introduce extra layer for vector tiles config --- docs/RouterConfiguration.md | 108 +++++------ docs/sandbox/MapboxVectorTilesApi.md | 176 +++++++++--------- .../standalone/config/RouterConfig.java | 9 +- .../config/routerconfig/VectorTileConfig.java | 32 +++- .../configure/ConstructApplicationModule.java | 2 +- .../server/DefaultServerRequestContext.java | 13 +- .../opentripplanner/TestServerContext.java | 2 +- .../mapping/TripRequestMapperTest.java | 2 +- .../doc/RouterConfigurationDocTest.java | 2 +- .../transit/speed_test/SpeedTest.java | 3 +- .../standalone/config/router-config.json | 146 ++++++++------- 11 files changed, 267 insertions(+), 228 deletions(-) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 5ca87a2aefa..351c582d72d 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -67,7 +67,7 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md). |    [hideFeedId](#transmodelApi_hideFeedId) | `boolean` | Hide the FeedId in all API output, and add it to input. | *Optional* | `false` | na | |    [tracingHeaderTags](#transmodelApi_tracingHeaderTags) | `string[]` | Used to group requests when monitoring OTP. | *Optional* | | na | | [updaters](UpdaterConfig.md) | `object[]` | Configuration for the updaters that import various types of data into OTP. | *Optional* | | 1.5 | -| [vectorTileLayers](sandbox/MapboxVectorTilesApi.md) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | +| [vectorTiles](sandbox/MapboxVectorTilesApi.md) | `object` | TODO: Add short summary. | *Optional* | | na | | [vehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md) | `object` | Configuration for the vehicle rental service directory. | *Optional* | | 2.0 | @@ -602,58 +602,60 @@ Used to group requests when monitoring OTP. "transmodelApi" : { "hideFeedId" : true }, - "vectorTileLayers" : [ - { - "name" : "stops", - "type" : "Stop", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 600 - }, - { - "name" : "stations", - "type" : "Station", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 12, - "cacheMaxSeconds" : 600 - }, - { - "name" : "rentalPlaces", - "type" : "VehicleRental", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 60, - "expansionFactor" : 0.25 - }, - { - "name" : "rentalVehicle", - "type" : "VehicleRentalVehicle", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 60 - }, - { - "name" : "rentalStation", - "type" : "VehicleRentalStation", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 600 - }, - { - "name" : "vehicleParking", - "type" : "VehicleParking", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 60, - "expansionFactor" : 0.25 - } - ], + "vectorTiles" : { + "layers" : [ + { + "name" : "stops", + "type" : "Stop", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 600 + }, + { + "name" : "stations", + "type" : "Station", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 12, + "cacheMaxSeconds" : 600 + }, + { + "name" : "rentalPlaces", + "type" : "VehicleRental", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 60, + "expansionFactor" : 0.25 + }, + { + "name" : "rentalVehicle", + "type" : "VehicleRentalVehicle", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 60 + }, + { + "name" : "rentalStation", + "type" : "VehicleRentalStation", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 600 + }, + { + "name" : "vehicleParking", + "type" : "VehicleParking", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 60, + "expansionFactor" : 0.25 + } + ] + }, "timetableUpdates" : { "purgeExpiredData" : false, "maxSnapshotFrequency" : "2s" diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 8ef8ee179e7..0904bd1fef6 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -35,93 +35,95 @@ The feature must be configured in `router-config.json` as follows ```JSON { - "vectorTileLayers": [ - { - "name": "stops", - "type": "Stop", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 600 - }, - { - "name": "stations", - "type": "Station", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 12, - "cacheMaxSeconds": 600 - }, - // all rental places: stations and free-floating vehicles - { - "name": "citybikes", - "type": "VehicleRental", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60, - "expansionFactor": 0.25 - }, - // just free-floating vehicles - { - "name": "rentalVehicles", - "type": "VehicleRentalVehicle", - "mapper": "DigitransitRealtime", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60 - }, - // just rental stations - { - "name": "rentalStations", - "type": "VehicleRentalStation", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 600 - }, - // Contains just stations and real-time information for them - { - "name": "realtimeRentalStations", - "type": "VehicleRentalStation", - "mapper": "DigitransitRealtime", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60 - }, - // This exists for backwards compatibility. At some point, we might want - // to add a new real-time parking mapper with better translation support - // and less unnecessary fields. - { - "name": "stadtnaviVehicleParking", - "type": "VehicleParking", - "mapper": "Stadtnavi", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60, - "expansionFactor": 0.25 - }, - // no real-time, translatable fields are translated based on accept-language header - // and contains less fields than the Stadtnavi mapper - { - "name": "vehicleParking", - "type": "VehicleParking", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 600, - "expansionFactor": 0.25 - }, - { - "name": "vehicleParkingGroups", - "type": "VehicleParkingGroup", - "mapper": "Digitransit", - "maxZoom": 17, - "minZoom": 14, - "cacheMaxSeconds": 600, - "expansionFactor": 0.25 - } - ] + "vectorTiles": + "layers": [ + { + "name": "stops", + "type": "Stop", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, + { + "name": "stations", + "type": "Station", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 12, + "cacheMaxSeconds": 600 + }, + // all rental places: stations and free-floating vehicles + { + "name": "citybikes", + "type": "VehicleRental", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0.25 + }, + // just free-floating vehicles + { + "name": "rentalVehicles", + "type": "VehicleRentalVehicle", + "mapper": "DigitransitRealtime", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60 + }, + // just rental stations + { + "name": "rentalStations", + "type": "VehicleRentalStation", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, + // Contains just stations and real-time information for them + { + "name": "realtimeRentalStations", + "type": "VehicleRentalStation", + "mapper": "DigitransitRealtime", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60 + }, + // This exists for backwards compatibility. At some point, we might want + // to add a new real-time parking mapper with better translation support + // and less unnecessary fields. + { + "name": "stadtnaviVehicleParking", + "type": "VehicleParking", + "mapper": "Stadtnavi", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0.25 + }, + // no real-time, translatable fields are translated based on accept-language header + // and contains less fields than the Stadtnavi mapper + { + "name": "vehicleParking", + "type": "VehicleParking", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600, + "expansionFactor": 0.25 + }, + { + "name": "vehicleParkingGroups", + "type": "VehicleParkingGroup", + "mapper": "Digitransit", + "maxZoom": 17, + "minZoom": 14, + "cacheMaxSeconds": 600, + "expansionFactor": 0.25 + } + ] + } } ``` diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java index ae92486037d..bf97155b747 100644 --- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java @@ -9,7 +9,6 @@ import java.io.Serializable; import java.util.List; import org.opentripplanner.ext.ridehailing.RideHailingServiceParameters; -import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.routerconfig.RideHailingServicesConfig; @@ -48,7 +47,7 @@ public class RouterConfig implements Serializable { private final RideHailingServicesConfig rideHailingConfig; private final FlexConfig flexConfig; private final TransmodelAPIConfig transmodelApi; - private final VectorTileConfig vectorTileLayers; + private final VectorTileConfig vectorTileConfig; public RouterConfig(JsonNode node, String source, boolean logUnusedParams) { this(new NodeAdapter(node, source), logUnusedParams); @@ -72,7 +71,7 @@ public RouterConfig(JsonNode node, String source, boolean logUnusedParams) { this.routingRequestDefaults.setMaxSearchWindow(transitConfig.maxSearchWindow()); this.updatersParameters = new UpdatersConfig(root); this.rideHailingConfig = new RideHailingServicesConfig(root); - this.vectorTileLayers = VectorTileConfig.mapVectorTilesParameters(root, "vectorTileLayers"); + this.vectorTileConfig = VectorTileConfig.mapVectorTilesParameters(root, "vectorTiles"); this.flexConfig = new FlexConfig(root, "flex"); if (logUnusedParams && LOG.isWarnEnabled()) { @@ -124,8 +123,8 @@ public List rideHailingServiceParameters() { return rideHailingConfig.rideHailingServiceParameters(); } - public VectorTilesResource.LayersParameters vectorTileLayers() { - return vectorTileLayers; + public VectorTileConfig vectorTileConfig() { + return vectorTileConfig; } public FlexConfig flexConfig() { diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index a0342910be9..b3b48e19c23 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -5,22 +5,32 @@ import static org.opentripplanner.inspector.vector.LayerParameters.MAX_ZOOM; import static org.opentripplanner.inspector.vector.LayerParameters.MIN_ZOOM; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5; import java.util.Collection; import java.util.List; +import javax.annotation.Nullable; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; +import org.opentripplanner.standalone.config.framework.json.ParameterBuilder; public class VectorTileConfig implements VectorTilesResource.LayersParameters { - List> layers; + public static final VectorTileConfig DEFAULT = new VectorTileConfig(List.of(), null); + private final List> layers; - public VectorTileConfig( - Collection> layers + @Nullable + private final String basePath; + + VectorTileConfig( + Collection> layers, + @Nullable String basePath ) { this.layers = List.copyOf(layers); + this.basePath = basePath; } @Override @@ -28,16 +38,20 @@ public List> layers() { return layers; } - public static VectorTileConfig mapVectorTilesParameters( - NodeAdapter root, - String vectorTileLayers - ) { + @Nullable + public String basePath() { + return basePath; + } + + public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String paramName) { + var root = node.of(paramName).asObject(); return new VectorTileConfig( root - .of(vectorTileLayers) + .of("layers") .since(V2_0) .summary("Configuration of the individual layers for the Mapbox vector tiles.") - .asObjects(VectorTileConfig::mapLayer) + .asObjects(VectorTileConfig::mapLayer), + root.of("basePath").since(V2_5).asString(null) ); } diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java index c9d7253b0be..5d8efcd3a5b 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java @@ -49,7 +49,7 @@ OtpServerRequestContext providesServerContext( graph, transitService, Metrics.globalRegistry, - routerConfig.vectorTileLayers(), + routerConfig.vectorTileConfig(), worldEnvelopeService, realtimeVehicleService, vehicleRentalService, diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index f14fea66693..c0ac70309e6 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -24,6 +24,7 @@ import org.opentripplanner.standalone.api.HttpRequestScoped; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.routerconfig.TransitRoutingConfig; +import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.service.TransitService; @@ -39,7 +40,7 @@ public class DefaultServerRequestContext implements OtpServerRequestContext { private final MeterRegistry meterRegistry; private final RaptorConfig raptorConfig; private final TileRendererManager tileRendererManager; - private final VectorTilesResource.LayersParameters vectorTileLayers; + private final VectorTileConfig vectorTileConfig; private final FlexConfig flexConfig; private final TraverseVisitor traverseVisitor; private final WorldEnvelopeService worldEnvelopeService; @@ -59,7 +60,7 @@ private DefaultServerRequestContext( MeterRegistry meterRegistry, RaptorConfig raptorConfig, TileRendererManager tileRendererManager, - VectorTilesResource.LayersParameters vectorTileLayers, + VectorTileConfig vectorTileConfig, WorldEnvelopeService worldEnvelopeService, RealtimeVehicleService realtimeVehicleService, VehicleRentalService vehicleRentalService, @@ -75,7 +76,7 @@ private DefaultServerRequestContext( this.meterRegistry = meterRegistry; this.raptorConfig = raptorConfig; this.tileRendererManager = tileRendererManager; - this.vectorTileLayers = vectorTileLayers; + this.vectorTileConfig = vectorTileConfig; this.vehicleRentalService = vehicleRentalService; this.flexConfig = flexConfig; this.traverseVisitor = traverseVisitor; @@ -97,7 +98,7 @@ public static DefaultServerRequestContext create( Graph graph, TransitService transitService, MeterRegistry meterRegistry, - VectorTilesResource.LayersParameters vectorTileLayers, + VectorTileConfig vectorTileConfig, WorldEnvelopeService worldEnvelopeService, RealtimeVehicleService realtimeVehicleService, VehicleRentalService vehicleRentalService, @@ -115,7 +116,7 @@ public static DefaultServerRequestContext create( meterRegistry, raptorConfig, new TileRendererManager(graph, routeRequestDefaults.preferences()), - vectorTileLayers, + vectorTileConfig, worldEnvelopeService, realtimeVehicleService, vehicleRentalService, @@ -221,7 +222,7 @@ public FlexConfig flexConfig() { @Override public VectorTilesResource.LayersParameters vectorTileLayers() { - return vectorTileLayers; + return vectorTileConfig; } @Override diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index 1f3e6491232..dd640c1f000 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -42,7 +42,7 @@ public static OtpServerRequestContext createServerContext( graph, new DefaultTransitService(transitModel), Metrics.globalRegistry, - routerConfig.vectorTileLayers(), + routerConfig.vectorTileConfig(), createWorldEnvelopeService(), createRealtimeVehicleService(transitService), createVehicleRentalService(), diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 3058f622281..a59b3e3f4bc 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -124,7 +124,7 @@ public class TripRequestMapperTest implements PlanTestConstants { graph, transitService, Metrics.globalRegistry, - RouterConfig.DEFAULT.vectorTileLayers(), + RouterConfig.DEFAULT.vectorTileConfig(), new DefaultWorldEnvelopeService(new DefaultWorldEnvelopeRepository()), new DefaultRealtimeVehicleService(transitService), new DefaultVehicleRentalService(), diff --git a/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java b/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java index d13f423ffc4..a48374e755c 100644 --- a/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java @@ -33,7 +33,7 @@ public class RouterConfigurationDocTest { .skip("flex", "sandbox/Flex.md") .skip("routingDefaults", "RouteRequest.md") .skip("updaters", "UpdaterConfig.md") - .skip("vectorTileLayers", "sandbox/MapboxVectorTilesApi.md") + .skip("vectorTiles", "sandbox/MapboxVectorTilesApi.md") .skipNestedElements("transferCacheRequests", "RouteRequest.md") .skip("rideHailingServices", "sandbox/RideHailing.md") .skip("vehicleRentalServiceDirectory", "sandbox/VehicleRentalServiceDirectory.md") diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index 642e192539c..7a11c35bace 100644 --- a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -29,6 +29,7 @@ import org.opentripplanner.standalone.config.BuildConfig; import org.opentripplanner.standalone.config.ConfigModel; import org.opentripplanner.standalone.config.OtpConfigLoader; +import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; @@ -111,7 +112,7 @@ public SpeedTest( graph, new DefaultTransitService(transitModel), timer.getRegistry(), - List::of, + VectorTileConfig.DEFAULT, TestServerContext.createWorldEnvelopeService(), TestServerContext.createRealtimeVehicleService(transitService), TestServerContext.createVehicleRentalService(), diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 5abb5ef87a6..f64a3b0f3b9 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -55,11 +55,14 @@ "accessEgress": { "maxDuration": "45m", "maxDurationForMode": { - "BIKE_RENTAL": "20m" + "BIKE_RENTAL": "20m" }, "maxStopCount": 500, "penalty": { - "FLEXIBLE" : { "timePenalty": "2m + 1.1t", "costFactor": 1.7 } + "FLEXIBLE": { + "timePenalty": "2m + 1.1t", + "costFactor": 1.7 + } } }, "itineraryFilters": { @@ -80,8 +83,12 @@ "geoidElevation": false, "maxJourneyDuration": "36h", "unpreferred": { - "agencies": ["HSL:123"], - "routes": ["HSL:456"] + "agencies": [ + "HSL:123" + ], + "routes": [ + "HSL:456" + ] }, "unpreferredCost": "10m + 2.0 x", "streetRoutingTimeout": "5s", @@ -135,8 +142,15 @@ "PREFERRED": 0 }, "transferCacheRequests": [ - { "modes": "WALK" }, - { "modes": "WALK", "wheelchairAccessibility": { "enabled": true } } + { + "modes": "WALK" + }, + { + "modes": "WALK", + "wheelchairAccessibility": { + "enabled": true + } + } ] }, "vehicleRentalServiceDirectory": { @@ -151,61 +165,63 @@ "transmodelApi": { "hideFeedId": true }, - "vectorTileLayers": [ - { - "name": "stops", - "type": "Stop", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 600 - }, - { - "name": "stations", - "type": "Station", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 12, - "cacheMaxSeconds": 600 - }, - { - "name": "rentalPlaces", - // all rental places: stations and free-floating vehicles - "type": "VehicleRental", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60, - "expansionFactor": 0.25 - }, - { - "name": "rentalVehicle", - // just free-floating vehicles - "type": "VehicleRentalVehicle", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60 - }, - { - "name": "rentalStation", - // just rental stations - "type": "VehicleRentalStation", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 600 - }, - { - "name": "vehicleParking", - "type": "VehicleParking", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60, - "expansionFactor": 0.25 - } - ], + "vectorTiles": { + "layers": [ + { + "name": "stops", + "type": "Stop", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, + { + "name": "stations", + "type": "Station", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 12, + "cacheMaxSeconds": 600 + }, + { + "name": "rentalPlaces", + // all rental places: stations and free-floating vehicles + "type": "VehicleRental", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0.25 + }, + { + "name": "rentalVehicle", + // just free-floating vehicles + "type": "VehicleRentalVehicle", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60 + }, + { + "name": "rentalStation", + // just rental stations + "type": "VehicleRentalStation", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, + { + "name": "vehicleParking", + "type": "VehicleParking", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0.25 + } + ] + }, "timetableUpdates": { "purgeExpiredData": false, "maxSnapshotFrequency": "2s" @@ -301,7 +317,9 @@ "Header-Name": "Header-Value" }, "fuzzyTripMatching": false, - "features": ["position"] + "features": [ + "position" + ] }, // Siri-ET over HTTP { @@ -345,8 +363,10 @@ "clientSecret": "very-secret", "wheelchairAccessibleProductId": "545de0c4-659f-49c6-be65-0d5e448dffd5", "bannedProductIds": [ - "1196d0dd-423b-4a81-a1d8-615367d3a365", "f58761e5-8dd5-4940-a472-872f1236c596" + "1196d0dd-423b-4a81-a1d8-615367d3a365", + "f58761e5-8dd5-4940-a472-872f1236c596" ] } ] } + From 2d31331fe0914fa99b0fb226159f29abea8f5d1e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 14:38:45 +0100 Subject: [PATCH 0297/1688] Add test for base path --- .../VehicleParkingGroupsLayerTest.java | 26 ++++++------ .../ext/vectortiles/VectorTilesResource.java | 9 ++-- .../apis/support/TileJson.java | 42 ++++++++++++++----- .../GraphInspectorVectorTileResource.java | 7 ++-- .../api/OtpServerRequestContext.java | 4 +- .../config/routerconfig/VectorTileConfig.java | 6 +-- .../server/DefaultServerRequestContext.java | 3 +- .../apis/support/TileJsonTest.java | 23 ++++++++++ 8 files changed, 81 insertions(+), 39 deletions(-) create mode 100644 src/test/java/org/opentripplanner/apis/support/TileJsonTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java index 1442b57fd60..66afc530e76 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java @@ -97,21 +97,23 @@ public void vehicleParkingGroupGeometryTest() { var config = """ { - "vectorTileLayers": [ - { - "name": "vehicleParkingGroups", - "type": "VehicleParkingGroup", - "mapper": "Digitransit", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 600, - "expansionFactor": 0 - } - ] + "vectorTiles": { + "layers" :[ + { + "name": "vehicleParkingGroups", + "type": "VehicleParkingGroup", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600, + "expansionFactor": 0 + } + ] + } } """; var nodeAdapter = newNodeAdapterForTest(config); - var tiles = VectorTileConfig.mapVectorTilesParameters(nodeAdapter, "vectorTileLayers"); + var tiles = VectorTileConfig.mapVectorTilesParameters(nodeAdapter, "vectorTiles"); assertEquals(1, tiles.layers().size()); var builder = new VehicleParkingGroupsLayerBuilderWithPublicGeometry( graph, diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index af2715d6928..0f04e26c833 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -66,7 +66,7 @@ public Response tileGet( z, locale, Arrays.asList(requestedLayers.split(",")), - serverContext.vectorTileLayers().layers(), + serverContext.vectorTileConfig().layers(), VectorTilesResource::crateLayerBuilder, serverContext ); @@ -89,15 +89,14 @@ public TileJson getTileJson( .filter(Predicate.not(Objects::isNull)) .toList(); - return new TileJson( + var url = TileJson.tileUrl( uri, headers, requestedLayers, ignoreRouterId, - "vectorTiles", - envelope, - feedInfos + "vectorTiles" ); + return new TileJson(url, envelope, feedInfos); } private static LayerBuilder crateLayerBuilder( diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index 2259d72d828..0975f7eb7b8 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -5,6 +5,7 @@ import java.io.Serializable; import java.util.Collection; import java.util.stream.Collectors; +import org.apache.commons.lang3.StringUtils; import org.opentripplanner.framework.io.HttpUtils; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.service.worldenvelope.model.WorldEnvelope; @@ -35,11 +36,7 @@ public class TileJson implements Serializable { public final double[] center; public TileJson( - UriInfo uri, - HttpHeaders headers, - String layers, - String ignoreRouterId, - String path, + String tileUrl, WorldEnvelope envelope, Collection feedInfos ) { @@ -53,12 +50,7 @@ public TileJson( tiles = new String[] { - "%s/otp/routers/%s/%s/%s/{z}/{x}/{y}.pbf".formatted( - HttpUtils.getBaseAddress(uri, headers), - ignoreRouterId, - path, - layers - ), + tileUrl }; bounds = @@ -72,4 +64,32 @@ public TileJson( var c = envelope.center(); center = new double[] { c.longitude(), c.latitude(), 9 }; } + + public static String tileUrl( + UriInfo uri, + HttpHeaders headers, + String layers, + String ignoreRouterId, + String path + ) { + return "%s/otp/routers/%s/%s/%s/{z}/{x}/{y}.pbf".formatted( + HttpUtils.getBaseAddress(uri, headers), + ignoreRouterId, + path, + layers + ); + } + public static String tileUrl( + UriInfo uri, + HttpHeaders headers, + String overridePath, + String layers + ) { + var strippedPath = StringUtils.stripStart(overridePath, "/"); + return "%s/%s/%s/{z}/{x}/{y}.pbf".formatted( + HttpUtils.getBaseAddress(uri, headers), + strippedPath, + layers + ); + } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 67f92f01ee3..17cd44c1328 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -103,15 +103,14 @@ public TileJson getTileJson( var envelope = serverContext.worldEnvelopeService().envelope().orElseThrow(); List feedInfos = feedInfos(); - return new TileJson( + var url = TileJson.tileUrl( uri, headers, requestedLayers, ignoreRouterId, - "inspector/vectortile", - envelope, - feedInfos + "inspector/vectortile" ); + return new TileJson(url, envelope, feedInfos); } @GET diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index fa6ead99c5e..fa3a7069e2d 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -9,7 +9,6 @@ import org.opentripplanner.ext.emissions.EmissionsService; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; -import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.inspector.raster.TileRendererManager; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; @@ -23,6 +22,7 @@ import org.opentripplanner.service.realtimevehicles.RealtimeVehicleService; import org.opentripplanner.service.vehiclerental.VehicleRentalService; import org.opentripplanner.service.worldenvelope.WorldEnvelopeService; +import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.search.state.State; @@ -119,7 +119,7 @@ default GraphFinder graphFinder() { FlexConfig flexConfig(); - VectorTilesResource.LayersParameters vectorTileLayers(); + VectorTileConfig vectorTileConfig(); default DataOverlayContext dataOverlayContext(RouteRequest request) { return OTPFeature.DataOverlay.isOnElseNull(() -> diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index b3b48e19c23..288ca5dbb49 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -10,6 +10,7 @@ import java.util.Collection; import java.util.List; +import java.util.Optional; import javax.annotation.Nullable; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.LayerParameters; @@ -38,9 +39,8 @@ public List> layers() { return layers; } - @Nullable - public String basePath() { - return basePath; + public Optional basePath() { + return Optional.ofNullable(basePath); } public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String paramName) { diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index c0ac70309e6..9a586219ba1 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -8,7 +8,6 @@ import org.opentripplanner.ext.emissions.EmissionsService; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; -import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.raster.TileRendererManager; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.configure.RaptorConfig; @@ -221,7 +220,7 @@ public FlexConfig flexConfig() { } @Override - public VectorTilesResource.LayersParameters vectorTileLayers() { + public VectorTileConfig vectorTileConfig() { return vectorTileConfig; } diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java new file mode 100644 index 00000000000..00c9a94aa24 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -0,0 +1,23 @@ +package org.opentripplanner.apis.support; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.net.URI; +import java.net.URISyntaxException; +import org.glassfish.jersey.internal.MapPropertiesDelegate; +import org.glassfish.jersey.server.ContainerRequest; +import org.glassfish.jersey.server.internal.routing.UriRoutingContext; +import org.junit.jupiter.api.Test; + +class TileJsonTest { + + @Test + void url() throws URISyntaxException { + + var uri= new URI("https://localhost:8080"); + var header = new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); + var uriInfo =new UriRoutingContext(header); + assertEquals("", TileJson.tileUrl(uriInfo, header, "/OTP_CT/some/config/path/", "foo,bar")); + } + +} \ No newline at end of file From 18e1ce6abe54016b2ce8acc392ce109a7dadf1f6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 18:23:03 +0100 Subject: [PATCH 0298/1688] Fix tests --- .../VehicleParkingGroupsLayerTest.java | 2 +- .../VehicleParkingsLayerTest.java | 28 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java index 66afc530e76..1ec7d042894 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java @@ -98,7 +98,7 @@ public void vehicleParkingGroupGeometryTest() { """ { "vectorTiles": { - "layers" :[ + "layers" :[ { "name": "vehicleParkingGroups", "type": "VehicleParkingGroup", diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java index b4988ab398d..fdb723b3dc7 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java @@ -93,23 +93,25 @@ public void vehicleParkingGeometryTest() { var config = """ { - "vectorTileLayers": [ - { - "name": "vehicleParking", - "type": "VehicleParking", - "mapper": "Stadtnavi", - "maxZoom": 20, - "minZoom": 14, - "cacheMaxSeconds": 60, - "expansionFactor": 0 - } - ] + "vectorTiles": { + "layers" : [ + { + "name": "vehicleParking", + "type": "VehicleParking", + "mapper": "Stadtnavi", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0 + } + ] + } } """; var nodeAdapter = newNodeAdapterForTest(config); - var tiles = VectorTileConfig.mapVectorTilesParameters(nodeAdapter, "vectorTileLayers"); + var tiles = VectorTileConfig.mapVectorTilesParameters(nodeAdapter, "vectorTiles"); assertEquals(1, tiles.layers().size()); - var builder = new VehicleParkingsLayerBuilder(graph, tiles.layers().get(0), Locale.US); + var builder = new VehicleParkingsLayerBuilder(graph, tiles.layers().getFirst(), Locale.US); List geometries = builder.getGeometries(new Envelope(0.99, 1.01, 1.99, 2.01)); From 5dac9ddf8c3359e3686c37771ed6309a8280b101 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 22:51:53 +0100 Subject: [PATCH 0299/1688] Add parameter documentation for vector tiles --- doc-templates/sandbox/MapboxVectorTilesApi.md | 198 ++++++++++++ docs/sandbox/MapboxVectorTilesApi.md | 297 ++++++++++++++++++ .../vectortiles/VectorTilesConfigDocTest.java | 80 +++++ 3 files changed, 575 insertions(+) create mode 100644 doc-templates/sandbox/MapboxVectorTilesApi.md create mode 100644 src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md new file mode 100644 index 00000000000..dfba427919a --- /dev/null +++ b/doc-templates/sandbox/MapboxVectorTilesApi.md @@ -0,0 +1,198 @@ +# Mapbox Vector Tiles API + +## Contact Info + +- HSL, Finland +- Kyyti Group Oy, Finland +- Hannes Junnila + +## Documentation + +This API produces [Mapbox vector tiles](https://docs.mapbox.com/vector-tiles/reference/), which are +used by eg. [Digitransit-ui](https://github.com/HSLdevcom/digitransit-ui) to show information about +public transit entities on the map. + +The tiles can be fetched from `/otp/routers/{routerId}/vectorTiles/{layers}/{z}/{x}/{y}.pbf`, +where `layers` is a comma separated list of layer names from the configuration. + +Translatable fields in the tiles are translated based on the `accept-language` header in requests. +Currently, only the language with the highest priority from the header is used. + +### Configuration + +To enable this you need to add the feature `otp-config.json`. + +```json +// otp-config.json +{ + "otpFeatures": { + "SandboxAPIMapboxVectorTilesApi": true + } +} +``` + +The feature must be configured in `router-config.json` as follows + +```JSON +{ + "vectorTiles": + "layers": [ + { + "name": "stops", + "type": "Stop", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, + { + "name": "stations", + "type": "Station", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 12, + "cacheMaxSeconds": 600 + }, + // all rental places: stations and free-floating vehicles + { + "name": "citybikes", + "type": "VehicleRental", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0.25 + }, + // just free-floating vehicles + { + "name": "rentalVehicles", + "type": "VehicleRentalVehicle", + "mapper": "DigitransitRealtime", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60 + }, + // just rental stations + { + "name": "rentalStations", + "type": "VehicleRentalStation", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, + // Contains just stations and real-time information for them + { + "name": "realtimeRentalStations", + "type": "VehicleRentalStation", + "mapper": "DigitransitRealtime", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60 + }, + // This exists for backwards compatibility. At some point, we might want + // to add a new real-time parking mapper with better translation support + // and less unnecessary fields. + { + "name": "stadtnaviVehicleParking", + "type": "VehicleParking", + "mapper": "Stadtnavi", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0.25 + }, + // no real-time, translatable fields are translated based on accept-language header + // and contains less fields than the Stadtnavi mapper + { + "name": "vehicleParking", + "type": "VehicleParking", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600, + "expansionFactor": 0.25 + }, + { + "name": "vehicleParkingGroups", + "type": "VehicleParkingGroup", + "mapper": "Digitransit", + "maxZoom": 17, + "minZoom": 14, + "cacheMaxSeconds": 600, + "expansionFactor": 0.25 + } + ] + } +} +``` + +For each layer, the configuration includes: + +- `name` which is used in the url to fetch tiles, and as the layer name in the vector tiles. +- `type` which tells the type of the layer. Currently supported: + - `Stop` + - `Station` + - `VehicleRental`: all rental places: stations and free-floating vehicles + - `VehicleRentalVehicle`: free-floating rental vehicles + - `VehicleRentalStation`: rental stations + - `VehicleParking` + - `VehicleParkingGroup` +- `mapper` which describes the mapper converting the properties from the OTP model entities to the + vector tile properties. Currently `Digitransit` is supported for all layer types. +- `minZoom` and `maxZoom` which describe the zoom levels the layer is active for. +- `cacheMaxSeconds` which sets the cache header in the response. The lowest value of the layers + included is selected. +- `expansionFactor` How far outside its boundaries should the tile contain information. The value is + a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile + edges, then increase this number. + +### Extending + +If more generic layers are created for this API, it should be moved out from the sandbox, into the +core code, with potentially leaving specific property mappers in place. + +#### Creating a new layer + +In order to create a new type of layer, you need to create a new class extending `LayerBuilder`. +You need to implement two methods, `List getGeometries(Envelope query)`, which returns a +list of geometries, with an object of type `T` as their userData in the geometry, +and `double getExpansionFactor()`, which describes how much information outside the tile bounds +should be included. This layer then needs to be added into `VectorTilesResource.layers`, with a +new `LayerType` enum as the key, and the class constructor as the value. + +A new mapper needs to be added every time a new layer is added. See below for information. + + + + +#### Creating a new mapper + +The mapping contains information of what data to include in the vector tiles. The mappers are +defined per layer. + +In order to create a new mapper for a layer, you need to create a new class +extending `PropertyMapper`. In that class, you need to implement the +method `Collection> map(T input)`. The type T is dependent on the layer for which +you implement the mapper for. It needs to return a list of attributes, as key-value pairs which will +be written into the vector tile. + +The mapper needs to be added to the `mappers` map in the layer, with a new `MapperType` enum as the +key, and a function to create the mapper, with a `Graph` object as a parameter, as the value. + +## Changelog + +- 2020-07-09: Initial version of Mapbox vector tiles API +- 2021-05-12: Make expansion factor configurable +- 2021-09-07: Rename `BikeRental` to `VehicleRental` +- 2021-10-13: Correctly serialize the vehicle rental name [#3648](https://github.com/opentripplanner/OpenTripPlanner/pull/3648) +- 2022-01-03: Add support for VehicleParking entities +- 2022-04-27: Read the headsign for frequency-only patterns correctly [#4122](https://github.com/opentripplanner/OpenTripPlanner/pull/4122) +- 2022-08-23: Remove patterns and add route gtfsTypes to stop layer [#4404](https://github.com/opentripplanner/OpenTripPlanner/pull/4404) +- 2022-10-11: Added layer for VehicleParkingGroups [#4510](https://github.com/opentripplanner/OpenTripPlanner/pull/4510) +- 2022-10-14: Add separate layers for vehicle rental place types [#4516](https://github.com/opentripplanner/OpenTripPlanner/pull/4516) +- 2022-10-19 [#4529](https://github.com/opentripplanner/OpenTripPlanner/pull/4529): + * Translatable fields are now translated based on accept-language header + * Added DigitransitRealtime for vehicle rental stations + * Changed old vehicle parking mapper to be Stadtnavi + * Added a new Digitransit vehicle parking mapper with no real-time information and less fields diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 0904bd1fef6..e11fe320ef8 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -163,6 +163,303 @@ new `LayerType` enum as the key, and the class constructor as the value. A new mapper needs to be added every time a new layer is added. See below for information. + + + + +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|------------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| basePath | `string` | TODO: Add short summary. | *Optional* | | 2.5 | +| [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "station" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers_1_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers_1_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers_1_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerental" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__2__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__2__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__2__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerentalvehicle" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__3__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__3__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__3__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerentalstation" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__4__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__4__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__4__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehicleparking" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__5__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__5__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__5__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | + + +#### Details + +

      layers

      + +**Since version:** `2.0` ∙ **Type:** `object[]` ∙ **Cardinality:** `Optional` +**Path:** /vectorTiles + +Configuration of the individual layers for the Mapbox vector tiles. + +

      cacheMaxSeconds

      + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` +**Path:** /vectorTiles/layers/[0] + +Sets the cache header in the response. + +The lowest value of the layers included is selected. + +

      expansionFactor

      + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` +**Path:** /vectorTiles/layers/[0] + +How far outside its boundaries should the tile contain information. + +The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. + +

      mapper

      + +**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /vectorTiles/layers/[0] + +Describes the mapper converting from the OTP model entities to the vector tile properties. + +Currently `Digitransit` is supported for all layer types. + +

      cacheMaxSeconds

      + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` +**Path:** /vectorTiles/layers/[1] + +Sets the cache header in the response. + +The lowest value of the layers included is selected. + +

      expansionFactor

      + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` +**Path:** /vectorTiles/layers/[1] + +How far outside its boundaries should the tile contain information. + +The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. + +

      mapper

      + +**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /vectorTiles/layers/[1] + +Describes the mapper converting from the OTP model entities to the vector tile properties. + +Currently `Digitransit` is supported for all layer types. + +

      cacheMaxSeconds

      + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` +**Path:** /vectorTiles/layers/[2] + +Sets the cache header in the response. + +The lowest value of the layers included is selected. + +

      expansionFactor

      + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` +**Path:** /vectorTiles/layers/[2] + +How far outside its boundaries should the tile contain information. + +The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. + +

      mapper

      + +**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /vectorTiles/layers/[2] + +Describes the mapper converting from the OTP model entities to the vector tile properties. + +Currently `Digitransit` is supported for all layer types. + +

      cacheMaxSeconds

      + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` +**Path:** /vectorTiles/layers/[3] + +Sets the cache header in the response. + +The lowest value of the layers included is selected. + +

      expansionFactor

      + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` +**Path:** /vectorTiles/layers/[3] + +How far outside its boundaries should the tile contain information. + +The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. + +

      mapper

      + +**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /vectorTiles/layers/[3] + +Describes the mapper converting from the OTP model entities to the vector tile properties. + +Currently `Digitransit` is supported for all layer types. + +

      cacheMaxSeconds

      + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` +**Path:** /vectorTiles/layers/[4] + +Sets the cache header in the response. + +The lowest value of the layers included is selected. + +

      expansionFactor

      + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` +**Path:** /vectorTiles/layers/[4] + +How far outside its boundaries should the tile contain information. + +The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. + +

      mapper

      + +**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /vectorTiles/layers/[4] + +Describes the mapper converting from the OTP model entities to the vector tile properties. + +Currently `Digitransit` is supported for all layer types. + +

      cacheMaxSeconds

      + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` +**Path:** /vectorTiles/layers/[5] + +Sets the cache header in the response. + +The lowest value of the layers included is selected. + +

      expansionFactor

      + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` +**Path:** /vectorTiles/layers/[5] + +How far outside its boundaries should the tile contain information. + +The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. + +

      mapper

      + +**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /vectorTiles/layers/[5] + +Describes the mapper converting from the OTP model entities to the vector tile properties. + +Currently `Digitransit` is supported for all layer types. + + + +##### Example configuration + +```JSON +// router-config.json +{ + "updaters" : [ + { + "layers" : [ + { + "name" : "stops", + "type" : "Stop", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 600 + }, + { + "name" : "stations", + "type" : "Station", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 12, + "cacheMaxSeconds" : 600 + }, + { + "name" : "rentalPlaces", + "type" : "VehicleRental", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 60, + "expansionFactor" : 0.25 + }, + { + "name" : "rentalVehicle", + "type" : "VehicleRentalVehicle", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 60 + }, + { + "name" : "rentalStation", + "type" : "VehicleRentalStation", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 600 + }, + { + "name" : "vehicleParking", + "type" : "VehicleParking", + "mapper" : "Digitransit", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 60, + "expansionFactor" : 0.25 + } + ] + } + ] +} +``` + + + #### Creating a new mapper The mapping contains information of what data to include in the vector tiles. The mappers are diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java new file mode 100644 index 00000000000..50dbd24008f --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java @@ -0,0 +1,80 @@ +package org.opentripplanner.ext.vectortiles; + +import static org.opentripplanner.framework.application.OtpFileNames.ROUTER_CONFIG_FILENAME; +import static org.opentripplanner.framework.io.FileUtils.assertFileEquals; +import static org.opentripplanner.framework.io.FileUtils.readFile; +import static org.opentripplanner.framework.io.FileUtils.writeFile; +import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_4; +import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT; +import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT; +import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection; +import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromResource; + +import java.io.File; +import org.junit.jupiter.api.Test; +import org.opentripplanner.generate.doc.framework.DocBuilder; +import org.opentripplanner.generate.doc.framework.GeneratesDocumentation; +import org.opentripplanner.generate.doc.framework.ParameterDetailsList; +import org.opentripplanner.generate.doc.framework.ParameterSummaryTable; +import org.opentripplanner.generate.doc.framework.SkipNodes; +import org.opentripplanner.standalone.config.RouterConfig; +import org.opentripplanner.standalone.config.framework.json.NodeAdapter; + +@GeneratesDocumentation +public class VectorTilesConfigDocTest { + + private static final String DOCUMENT = "sandbox/MapboxVectorTilesApi.md"; + private static final File TEMPLATE = new File(TEMPLATE_ROOT, DOCUMENT); + private static final File OUT_FILE = new File(DOCS_ROOT, DOCUMENT); + private static final SkipNodes SKIP_NODES = SkipNodes.of().build(); + private static final String ROUTER_CONFIG_PATH = "standalone/config/" + ROUTER_CONFIG_FILENAME; + + @Test + public void updateDoc() { + NodeAdapter node = readVectorTiles(); + + // Read and close inout file (same as output file) + String template = readFile(TEMPLATE); + String original = readFile(OUT_FILE); + + template = replaceSection(template, "parameters", updaterDoc(node)); + + writeFile(OUT_FILE, template); + assertFileEquals(original, OUT_FILE); + } + + private NodeAdapter readVectorTiles() { + var json = jsonNodeFromResource(ROUTER_CONFIG_PATH); + var conf = new RouterConfig(json, ROUTER_CONFIG_PATH, false); + return conf.asNodeAdapter().child("vectorTiles"); + } + + private String updaterDoc(NodeAdapter node) { + DocBuilder buf = new DocBuilder(); + addParameterSummaryTable(buf, node); + addDetailsSection(buf, node); + addExample(buf, node); + return buf.toString(); + } + + private void addParameterSummaryTable(DocBuilder buf, NodeAdapter node) { + buf.addSection(new ParameterSummaryTable(SKIP_NODES).createTable(node).toMarkdownTable()); + } + + private void addDetailsSection(DocBuilder buf, NodeAdapter node) { + String details = getParameterDetailsTable(node); + + if (!details.isBlank()) { + buf.header(4, "Details", null).addSection(details); + } + } + + private String getParameterDetailsTable(NodeAdapter node) { + return ParameterDetailsList.listParametersWithDetails(node, SKIP_NODES, HEADER_4); + } + + private void addExample(DocBuilder buf, NodeAdapter node) { + buf.addSection("##### Example configuration"); + buf.addUpdaterExample(ROUTER_CONFIG_FILENAME, node.rawNode()); + } +} From 6bd6e08d6574df857506922e8b4c150b6e596065 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 11:56:58 +0100 Subject: [PATCH 0300/1688] Generate docs for vector tiles --- docs/sandbox/MapboxVectorTilesApi.md | 104 +++++++++--------- .../ext/vectortiles/VectorTilesResource.java | 8 +- .../apis/support/TileJson.java | 30 ++--- .../GraphInspectorVectorTileResource.java | 2 +- .../config/routerconfig/VectorTileConfig.java | 21 ++-- .../apis/support/TileJsonTest.java | 10 +- 6 files changed, 80 insertions(+), 95 deletions(-) diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index e11fe320ef8..5f86af742f0 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -167,58 +167,58 @@ A new mapper needs to be added every time a new layer is added. See below for in -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|------------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| -| basePath | `string` | TODO: Add short summary. | *Optional* | | 2.5 | -| [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "station" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers_1_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers_1_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers_1_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerental" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__2__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__2__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__2__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerentalvehicle" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__3__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__3__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__3__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerentalstation" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__4__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__4__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__4__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehicleparking" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__5__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__5__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__5__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|------------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|--------------------------------------|:-----:| +| basePath | `string` | TODO: Add short summary. | *Optional* | `"/otp/routers/default/vectorTiles"` | 2.5 | +| [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "station" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers_1_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers_1_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers_1_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerental" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__2__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__2__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__2__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerentalvehicle" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__3__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__3__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__3__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerentalstation" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__4__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__4__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__4__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehicleparking" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__5__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__5__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__5__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | #### Details diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index 0f04e26c833..d2796bf63d3 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -89,13 +89,7 @@ public TileJson getTileJson( .filter(Predicate.not(Objects::isNull)) .toList(); - var url = TileJson.tileUrl( - uri, - headers, - requestedLayers, - ignoreRouterId, - "vectorTiles" - ); + var url = TileJson.tileUrl(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles"); return new TileJson(url, envelope, feedInfos); } diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index 0975f7eb7b8..b8f8fc8d27c 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -35,11 +35,7 @@ public class TileJson implements Serializable { public final double[] bounds; public final double[] center; - public TileJson( - String tileUrl, - WorldEnvelope envelope, - Collection feedInfos - ) { + public TileJson(String tileUrl, WorldEnvelope envelope, Collection feedInfos) { attribution = feedInfos .stream() @@ -48,10 +44,7 @@ public TileJson( ) .collect(Collectors.joining(", ")); - tiles = - new String[] { - tileUrl - }; + tiles = new String[] { tileUrl }; bounds = new double[] { @@ -73,12 +66,13 @@ public static String tileUrl( String path ) { return "%s/otp/routers/%s/%s/%s/{z}/{x}/{y}.pbf".formatted( - HttpUtils.getBaseAddress(uri, headers), - ignoreRouterId, - path, - layers - ); + HttpUtils.getBaseAddress(uri, headers), + ignoreRouterId, + path, + layers + ); } + public static String tileUrl( UriInfo uri, HttpHeaders headers, @@ -87,9 +81,9 @@ public static String tileUrl( ) { var strippedPath = StringUtils.stripStart(overridePath, "/"); return "%s/%s/%s/{z}/{x}/{y}.pbf".formatted( - HttpUtils.getBaseAddress(uri, headers), - strippedPath, - layers - ); + HttpUtils.getBaseAddress(uri, headers), + strippedPath, + layers + ); } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 17cd44c1328..4015d3073ac 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -108,7 +108,7 @@ public TileJson getTileJson( headers, requestedLayers, ignoreRouterId, - "inspector/vectortile" + "inspector/vectortile" ); return new TileJson(url, envelope, feedInfos); } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index 288ca5dbb49..e4905d0f63b 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -5,33 +5,32 @@ import static org.opentripplanner.inspector.vector.LayerParameters.MAX_ZOOM; import static org.opentripplanner.inspector.vector.LayerParameters.MIN_ZOOM; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0; -import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5; import java.util.Collection; import java.util.List; -import java.util.Optional; -import javax.annotation.Nullable; +import java.util.Objects; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; -import org.opentripplanner.standalone.config.framework.json.ParameterBuilder; public class VectorTileConfig implements VectorTilesResource.LayersParameters { - public static final VectorTileConfig DEFAULT = new VectorTileConfig(List.of(), null); + public static final VectorTileConfig DEFAULT = new VectorTileConfig( + List.of(), + "/otp/routers/default/vectorTiles" + ); private final List> layers; - @Nullable private final String basePath; VectorTileConfig( Collection> layers, - @Nullable String basePath + String basePath ) { this.layers = List.copyOf(layers); - this.basePath = basePath; + this.basePath = Objects.requireNonNull(basePath); } @Override @@ -39,8 +38,8 @@ public List> layers() { return layers; } - public Optional basePath() { - return Optional.ofNullable(basePath); + public String basePath() { + return basePath; } public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String paramName) { @@ -51,7 +50,7 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String .since(V2_0) .summary("Configuration of the individual layers for the Mapbox vector tiles.") .asObjects(VectorTileConfig::mapLayer), - root.of("basePath").since(V2_5).asString(null) + root.of("basePath").since(V2_5).asString(DEFAULT.basePath) ); } diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index 00c9a94aa24..4d21ee315ea 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -13,11 +13,9 @@ class TileJsonTest { @Test void url() throws URISyntaxException { - - var uri= new URI("https://localhost:8080"); + var uri = new URI("https://localhost:8080"); var header = new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); - var uriInfo =new UriRoutingContext(header); - assertEquals("", TileJson.tileUrl(uriInfo, header, "/OTP_CT/some/config/path/", "foo,bar")); + var uriInfo = new UriRoutingContext(header); + assertEquals("", TileJson.tileUrl(uriInfo, header, "/OTP_CT/some/config/path/", "foo,bar")); } - -} \ No newline at end of file +} From 586f692922b259a19eaf621e8b2e1538803e6dab Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 12:19:18 +0100 Subject: [PATCH 0301/1688] Use new config option in resource --- docs/sandbox/MapboxVectorTilesApi.md | 104 +++++++++--------- .../ext/vectortiles/VectorTilesResource.java | 11 +- .../apis/support/TileJson.java | 5 +- .../GraphInspectorVectorTileResource.java | 2 +- .../config/routerconfig/VectorTileConfig.java | 16 +-- .../apis/support/TileJsonTest.java | 20 +++- 6 files changed, 90 insertions(+), 68 deletions(-) diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 5f86af742f0..e11fe320ef8 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -167,58 +167,58 @@ A new mapper needs to be added every time a new layer is added. See below for in -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|------------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|--------------------------------------|:-----:| -| basePath | `string` | TODO: Add short summary. | *Optional* | `"/otp/routers/default/vectorTiles"` | 2.5 | -| [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "station" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers_1_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers_1_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers_1_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerental" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__2__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__2__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__2__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerentalvehicle" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__3__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__3__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__3__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerentalstation" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__4__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__4__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__4__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehicleparking" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__5__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__5__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__5__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|------------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| basePath | `string` | TODO: Add short summary. | *Optional* | | 2.5 | +| [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "station" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers_1_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers_1_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers_1_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerental" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__2__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__2__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__2__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerentalvehicle" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__3__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__3__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__3__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehiclerentalstation" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__4__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__4__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__4__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | +|       type = "vehicleparking" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers__5__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers__5__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers__5__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | #### Details diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index d2796bf63d3..e1c119713d1 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -89,7 +89,16 @@ public TileJson getTileJson( .filter(Predicate.not(Objects::isNull)) .toList(); - var url = TileJson.tileUrl(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles"); + var url = serverContext + .vectorTileConfig() + .basePath() + .map(overrideBasePath -> + TileJson.overrideBasePath(uri, headers, overrideBasePath, requestedLayers) + ) + .orElseGet(() -> + TileJson.defaultBasePath(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles") + ); + return new TileJson(url, envelope, feedInfos); } diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index b8f8fc8d27c..840542d68a8 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -58,7 +58,7 @@ public TileJson(String tileUrl, WorldEnvelope envelope, Collection fee center = new double[] { c.longitude(), c.latitude(), 9 }; } - public static String tileUrl( + public static String defaultBasePath( UriInfo uri, HttpHeaders headers, String layers, @@ -73,13 +73,14 @@ public static String tileUrl( ); } - public static String tileUrl( + public static String overrideBasePath( UriInfo uri, HttpHeaders headers, String overridePath, String layers ) { var strippedPath = StringUtils.stripStart(overridePath, "/"); + strippedPath = StringUtils.stripEnd(strippedPath, "/"); return "%s/%s/%s/{z}/{x}/{y}.pbf".formatted( HttpUtils.getBaseAddress(uri, headers), strippedPath, diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 4015d3073ac..ada9381ec1d 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -103,7 +103,7 @@ public TileJson getTileJson( var envelope = serverContext.worldEnvelopeService().envelope().orElseThrow(); List feedInfos = feedInfos(); - var url = TileJson.tileUrl( + var url = TileJson.defaultBasePath( uri, headers, requestedLayers, diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index e4905d0f63b..df353f40079 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -10,6 +10,8 @@ import java.util.Collection; import java.util.List; import java.util.Objects; +import java.util.Optional; +import javax.annotation.Nullable; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; @@ -17,20 +19,18 @@ public class VectorTileConfig implements VectorTilesResource.LayersParameters { - public static final VectorTileConfig DEFAULT = new VectorTileConfig( - List.of(), - "/otp/routers/default/vectorTiles" - ); + public static final VectorTileConfig DEFAULT = new VectorTileConfig(List.of(), null); private final List> layers; + @Nullable private final String basePath; VectorTileConfig( Collection> layers, - String basePath + @Nullable String basePath ) { this.layers = List.copyOf(layers); - this.basePath = Objects.requireNonNull(basePath); + this.basePath = basePath; } @Override @@ -38,8 +38,8 @@ public List> layers() { return layers; } - public String basePath() { - return basePath; + public Optional basePath() { + return Optional.ofNullable(basePath); } public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String paramName) { diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index 4d21ee315ea..890dc09aa92 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -7,15 +7,27 @@ import org.glassfish.jersey.internal.MapPropertiesDelegate; import org.glassfish.jersey.server.ContainerRequest; import org.glassfish.jersey.server.internal.routing.UriRoutingContext; -import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; class TileJsonTest { - @Test - void url() throws URISyntaxException { + @ParameterizedTest + @ValueSource( + strings = { + "/otp_ct/vectorTiles", + "otp_ct/vectorTiles/", + "otp_ct/vectorTiles///", + "///otp_ct/vectorTiles/", + } + ) + void overrideBasePath(String basePath) throws URISyntaxException { var uri = new URI("https://localhost:8080"); var header = new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); var uriInfo = new UriRoutingContext(header); - assertEquals("", TileJson.tileUrl(uriInfo, header, "/OTP_CT/some/config/path/", "foo,bar")); + assertEquals( + "https://localhost:8080/otp_ct/vectorTiles/stops,rentalVehicles/{z}/{x}/{y}.pbf", + TileJson.overrideBasePath(uriInfo, header, basePath, "stops,rentalVehicles") + ); } } From bf4605b7f509965a1aba27792cb887b394e000e7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 12:46:54 +0100 Subject: [PATCH 0302/1688] Improve documentation --- docs/sandbox/MapboxVectorTilesApi.md | 261 +----------------- .../vectortiles/VectorTilesConfigDocTest.java | 19 +- .../ext/vectortiles/router-config.json | 16 ++ .../standalone/config/router-config.json | 1 + 4 files changed, 35 insertions(+), 262 deletions(-) create mode 100644 src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index e11fe320ef8..547eb3501c1 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -167,58 +167,17 @@ A new mapper needs to be added every time a new layer is added. See below for in -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|------------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| -| basePath | `string` | TODO: Add short summary. | *Optional* | | 2.5 | -| [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "station" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers_1_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers_1_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers_1_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerental" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__2__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__2__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__2__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerentalvehicle" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__3__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__3__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__3__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehiclerentalstation" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__4__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__4__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__4__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | -|    { object } | `object` | Nested object in array. The object type is determined by the parameters. | *Optional* | | 2.0 | -|       type = "vehicleparking" | `enum` | Type of the layer. | *Required* | | 2.0 | -|       [cacheMaxSeconds](#vectorTiles_layers__5__cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | -|       [expansionFactor](#vectorTiles_layers__5__expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | -|       [mapper](#vectorTiles_layers__5__mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | -|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | -|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | -|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|----------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| basePath | `string` | TODO: Add short summary. | *Optional* | | 2.5 | +| [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | +|       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | +|       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | +|       [expansionFactor](#vectorTiles_layers_0_expansionFactor) | `double` | How far outside its boundaries should the tile contain information. | *Optional* | `0.25` | 2.0 | +|       [mapper](#vectorTiles_layers_0_mapper) | `string` | Describes the mapper converting from the OTP model entities to the vector tile properties. | *Required* | | 2.0 | +|       maxZoom | `integer` | Maximum zoom levels the layer is active for. | *Optional* | `20` | 2.0 | +|       minZoom | `integer` | Minimum zoom levels the layer is active for. | *Optional* | `9` | 2.0 | +|       name | `string` | Used in the url to fetch tiles, and as the layer name in the vector tiles. | *Required* | | 2.0 | #### Details @@ -257,206 +216,8 @@ Describes the mapper converting from the OTP model entities to the vector tile p Currently `Digitransit` is supported for all layer types. -

      cacheMaxSeconds

      -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` -**Path:** /vectorTiles/layers/[1] - -Sets the cache header in the response. - -The lowest value of the layers included is selected. - -

      expansionFactor

      - -**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` -**Path:** /vectorTiles/layers/[1] - -How far outside its boundaries should the tile contain information. - -The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. - -

      mapper

      - -**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /vectorTiles/layers/[1] - -Describes the mapper converting from the OTP model entities to the vector tile properties. - -Currently `Digitransit` is supported for all layer types. - -

      cacheMaxSeconds

      - -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` -**Path:** /vectorTiles/layers/[2] - -Sets the cache header in the response. - -The lowest value of the layers included is selected. - -

      expansionFactor

      - -**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` -**Path:** /vectorTiles/layers/[2] - -How far outside its boundaries should the tile contain information. - -The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. - -

      mapper

      - -**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /vectorTiles/layers/[2] - -Describes the mapper converting from the OTP model entities to the vector tile properties. - -Currently `Digitransit` is supported for all layer types. - -

      cacheMaxSeconds

      - -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` -**Path:** /vectorTiles/layers/[3] - -Sets the cache header in the response. - -The lowest value of the layers included is selected. - -

      expansionFactor

      - -**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` -**Path:** /vectorTiles/layers/[3] - -How far outside its boundaries should the tile contain information. - -The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. - -

      mapper

      -**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /vectorTiles/layers/[3] - -Describes the mapper converting from the OTP model entities to the vector tile properties. - -Currently `Digitransit` is supported for all layer types. - -

      cacheMaxSeconds

      - -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` -**Path:** /vectorTiles/layers/[4] - -Sets the cache header in the response. - -The lowest value of the layers included is selected. - -

      expansionFactor

      - -**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` -**Path:** /vectorTiles/layers/[4] - -How far outside its boundaries should the tile contain information. - -The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. - -

      mapper

      - -**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /vectorTiles/layers/[4] - -Describes the mapper converting from the OTP model entities to the vector tile properties. - -Currently `Digitransit` is supported for all layer types. - -

      cacheMaxSeconds

      - -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `-1` -**Path:** /vectorTiles/layers/[5] - -Sets the cache header in the response. - -The lowest value of the layers included is selected. - -

      expansionFactor

      - -**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.25` -**Path:** /vectorTiles/layers/[5] - -How far outside its boundaries should the tile contain information. - -The value is a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile edges, then increase this number. - -

      mapper

      - -**Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /vectorTiles/layers/[5] - -Describes the mapper converting from the OTP model entities to the vector tile properties. - -Currently `Digitransit` is supported for all layer types. - - - -##### Example configuration - -```JSON -// router-config.json -{ - "updaters" : [ - { - "layers" : [ - { - "name" : "stops", - "type" : "Stop", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 600 - }, - { - "name" : "stations", - "type" : "Station", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 12, - "cacheMaxSeconds" : 600 - }, - { - "name" : "rentalPlaces", - "type" : "VehicleRental", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 60, - "expansionFactor" : 0.25 - }, - { - "name" : "rentalVehicle", - "type" : "VehicleRentalVehicle", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 60 - }, - { - "name" : "rentalStation", - "type" : "VehicleRentalStation", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 600 - }, - { - "name" : "vehicleParking", - "type" : "VehicleParking", - "mapper" : "Digitransit", - "maxZoom" : 20, - "minZoom" : 14, - "cacheMaxSeconds" : 60, - "expansionFactor" : 0.25 - } - ] - } - ] -} -``` diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java index 50dbd24008f..c0adbbd143b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java @@ -1,6 +1,5 @@ package org.opentripplanner.ext.vectortiles; -import static org.opentripplanner.framework.application.OtpFileNames.ROUTER_CONFIG_FILENAME; import static org.opentripplanner.framework.io.FileUtils.assertFileEquals; import static org.opentripplanner.framework.io.FileUtils.readFile; import static org.opentripplanner.framework.io.FileUtils.writeFile; @@ -8,7 +7,7 @@ import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT; import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT; import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection; -import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromResource; +import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromPath; import java.io.File; import org.junit.jupiter.api.Test; @@ -19,6 +18,7 @@ import org.opentripplanner.generate.doc.framework.SkipNodes; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; +import org.opentripplanner.test.support.ResourceLoader; @GeneratesDocumentation public class VectorTilesConfigDocTest { @@ -27,7 +27,6 @@ public class VectorTilesConfigDocTest { private static final File TEMPLATE = new File(TEMPLATE_ROOT, DOCUMENT); private static final File OUT_FILE = new File(DOCS_ROOT, DOCUMENT); private static final SkipNodes SKIP_NODES = SkipNodes.of().build(); - private static final String ROUTER_CONFIG_PATH = "standalone/config/" + ROUTER_CONFIG_FILENAME; @Test public void updateDoc() { @@ -37,23 +36,23 @@ public void updateDoc() { String template = readFile(TEMPLATE); String original = readFile(OUT_FILE); - template = replaceSection(template, "parameters", updaterDoc(node)); + template = replaceSection(template, "parameters", vectorTilesDoc(node)); writeFile(OUT_FILE, template); assertFileEquals(original, OUT_FILE); } private NodeAdapter readVectorTiles() { - var json = jsonNodeFromResource(ROUTER_CONFIG_PATH); - var conf = new RouterConfig(json, ROUTER_CONFIG_PATH, false); + var path = ResourceLoader.of(this).file("router-config.json").toPath(); + var json = jsonNodeFromPath(path); + var conf = new RouterConfig(json, path.toString(), false); return conf.asNodeAdapter().child("vectorTiles"); } - private String updaterDoc(NodeAdapter node) { + private String vectorTilesDoc(NodeAdapter node) { DocBuilder buf = new DocBuilder(); addParameterSummaryTable(buf, node); addDetailsSection(buf, node); - addExample(buf, node); return buf.toString(); } @@ -73,8 +72,4 @@ private String getParameterDetailsTable(NodeAdapter node) { return ParameterDetailsList.listParametersWithDetails(node, SKIP_NODES, HEADER_4); } - private void addExample(DocBuilder buf, NodeAdapter node) { - buf.addSection("##### Example configuration"); - buf.addUpdaterExample(ROUTER_CONFIG_FILENAME, node.rawNode()); - } } diff --git a/src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json b/src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json new file mode 100644 index 00000000000..df325d076a3 --- /dev/null +++ b/src/ext/resources/org/opentripplanner/ext/vectortiles/router-config.json @@ -0,0 +1,16 @@ +{ + "vectorTiles": { + "basePath": "/otp_ct/vectorTiles", + "layers": [ + { + "name": "stops", + "type": "Stop", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + } + ] + } +} + diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index f64a3b0f3b9..ced4564ca8a 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -166,6 +166,7 @@ "hideFeedId": true }, "vectorTiles": { + "basePath": "/otp_ct/vectorTiles", "layers": [ { "name": "stops", From 9ab2afd1d6d5910ea14d481c9e1626b79606985d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 14:00:03 +0100 Subject: [PATCH 0303/1688] Improve tests --- doc-templates/sandbox/MapboxVectorTilesApi.md | 3 +-- docs/RouterConfiguration.md | 1 + docs/sandbox/MapboxVectorTilesApi.md | 3 +-- .../vectortiles/VectorTilesConfigDocTest.java | 1 - .../ext/vectortiles/VectorTilesResource.java | 2 +- .../apis/support/TileJson.java | 2 +- .../GraphInspectorVectorTileResource.java | 2 +- .../apis/support/TileJsonTest.java | 27 ++++++++++++++++--- 8 files changed, 29 insertions(+), 12 deletions(-) diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md index dfba427919a..7fa1fefa56d 100644 --- a/doc-templates/sandbox/MapboxVectorTilesApi.md +++ b/doc-templates/sandbox/MapboxVectorTilesApi.md @@ -3,8 +3,7 @@ ## Contact Info - HSL, Finland -- Kyyti Group Oy, Finland -- Hannes Junnila +- IBI Arcardis, US ## Documentation diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 351c582d72d..556e672e482 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -603,6 +603,7 @@ Used to group requests when monitoring OTP. "hideFeedId" : true }, "vectorTiles" : { + "basePath" : "/otp_ct/vectorTiles", "layers" : [ { "name" : "stops", diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 547eb3501c1..75ab5008124 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -3,8 +3,7 @@ ## Contact Info - HSL, Finland -- Kyyti Group Oy, Finland -- Hannes Junnila +- IBI Arcardis, US ## Documentation diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java index c0adbbd143b..e758026d02b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java @@ -71,5 +71,4 @@ private void addDetailsSection(DocBuilder buf, NodeAdapter node) { private String getParameterDetailsTable(NodeAdapter node) { return ParameterDetailsList.listParametersWithDetails(node, SKIP_NODES, HEADER_4); } - } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index e1c119713d1..3182936b281 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -96,7 +96,7 @@ public TileJson getTileJson( TileJson.overrideBasePath(uri, headers, overrideBasePath, requestedLayers) ) .orElseGet(() -> - TileJson.defaultBasePath(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles") + TileJson.defaultPath(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles") ); return new TileJson(url, envelope, feedInfos); diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index 840542d68a8..feedf1657ef 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -58,7 +58,7 @@ public TileJson(String tileUrl, WorldEnvelope envelope, Collection fee center = new double[] { c.longitude(), c.latitude(), 9 }; } - public static String defaultBasePath( + public static String defaultPath( UriInfo uri, HttpHeaders headers, String layers, diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index ada9381ec1d..f5839cdabc2 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -103,7 +103,7 @@ public TileJson getTileJson( var envelope = serverContext.worldEnvelopeService().envelope().orElseThrow(); List feedInfos = feedInfos(); - var url = TileJson.defaultBasePath( + var url = TileJson.defaultPath( uri, headers, requestedLayers, diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index 890dc09aa92..e9a7fe39eba 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -4,14 +4,18 @@ import java.net.URI; import java.net.URISyntaxException; +import javax.annotation.Nonnull; import org.glassfish.jersey.internal.MapPropertiesDelegate; import org.glassfish.jersey.server.ContainerRequest; import org.glassfish.jersey.server.internal.routing.UriRoutingContext; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; class TileJsonTest { + private static final String LAYERS = "stops,rentalVehicles"; + @ParameterizedTest @ValueSource( strings = { @@ -22,12 +26,27 @@ class TileJsonTest { } ) void overrideBasePath(String basePath) throws URISyntaxException { - var uri = new URI("https://localhost:8080"); - var header = new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); - var uriInfo = new UriRoutingContext(header); + var req = container(); + var uriInfo = new UriRoutingContext(req); assertEquals( "https://localhost:8080/otp_ct/vectorTiles/stops,rentalVehicles/{z}/{x}/{y}.pbf", - TileJson.overrideBasePath(uriInfo, header, basePath, "stops,rentalVehicles") + TileJson.overrideBasePath(uriInfo, req, basePath, LAYERS) ); } + + @Test + void defaultPath() throws URISyntaxException { + var req = container(); + var uriInfo = new UriRoutingContext(req); + assertEquals( + "https://localhost:8080/otp/routers/default/vectorTiles/stops,rentalVehicles/{z}/{x}/{y}.pbf", + TileJson.defaultPath(uriInfo, req, LAYERS, "default", "vectorTiles") + ); + } + + @Nonnull + private static ContainerRequest container() throws URISyntaxException { + var uri = new URI("https://localhost:8080"); + return new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); + } } From b542cb2970b3e5b1f3c48a94754d392d3feb696e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 17 Jan 2024 12:21:54 +0100 Subject: [PATCH 0304/1688] doc+test: Add JavaDoc and UnitTest to DecorateFilter --- .../framework/filter/DecorateFilter.java | 6 +- .../framework/filter/DecorateFilterTest.java | 60 +++++++++++++++++++ 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java index b2101c0ebfc..f0d44872db8 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilter.java @@ -5,7 +5,11 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryListFilter; -public class DecorateFilter implements ItineraryListFilter { +/** + * This is the decorator filter implementation. To add a decorator, you should implement + * the {@link ItineraryDecorator}. + */ +public final class DecorateFilter implements ItineraryListFilter { private final ItineraryDecorator decorator; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java new file mode 100644 index 00000000000..9ae8e0da7df --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java @@ -0,0 +1,60 @@ +package org.opentripplanner.routing.algorithm.filterchain.framework.filter; + +import static org.junit.jupiter.api.Assertions.*; +import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; + +import java.util.Iterator; +import java.util.List; +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.PlanTestConstants; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; + +class DecorateFilterTest implements ItineraryDecorator, PlanTestConstants { + + private static final Itinerary i1 = newItinerary(A, 6).walk(1, B).build(); + private static final Itinerary i2 = newItinerary(A).bicycle(6, 8, B).build(); + + private Iterator expectedQueue; + + @Override + public void decorate(Itinerary itinerary) { + if (expectedQueue == null) { + fail("The expected queue is null, this method should not be called."); + } + + if (!expectedQueue.hasNext()) { + fail("No itineraries in list of expected, but filter is still processing: " + itinerary); + } + + var current = expectedQueue.next(); + assertEquals(current, itinerary); + } + + @Test + void filterEmptyList() { + // Make sure the filter does nothing and do not crash on empty lists + new DecorateFilter(this).filter(List.of()); + } + + @Test + void filterOneElement() { + var input = List.of(i1); + expectedQueue = input.iterator(); + new DecorateFilter(this).filter(input); + assertTrue(!expectedQueue.hasNext(), "All elements are processed"); + } + + @Test + void filterTwoElements() { + var input = List.of(i1, i2); + expectedQueue = input.iterator(); + new DecorateFilter(this).filter(input); + assertTrue(!expectedQueue.hasNext(), "All elements are processed"); + } +} From 3f47b57d0f8b3cb40aaa49a329a10febcd87ed64 Mon Sep 17 00:00:00 2001 From: eibakke Date: Wed, 17 Jan 2024 15:43:14 +0100 Subject: [PATCH 0305/1688] Adds EncompassingAreaGeometry to the GroupStop and makes it queryable in the flexibleArea on the QuayType. --- .../apis/transmodel/model/stop/QuayType.java | 17 +++++++++-------- .../netex/mapping/FlexStopsMapper.java | 5 ++++- .../transit/model/site/GroupStop.java | 7 +++++++ .../transit/model/site/GroupStopBuilder.java | 19 +++++++++++++++++++ .../apis/transmodel/schema.graphql | 2 +- 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index b80efab77b5..a15bf2f838e 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -380,20 +380,21 @@ public static GraphQLObjectType create( .name("flexibleArea") .description("Geometry for flexible area.") .type(GeoJSONCoordinatesScalar.getGraphQGeoJSONCoordinatesScalar()) - .dataFetcher(environment -> - ( - environment.getSource() instanceof AreaStop areaStop - ? areaStop.getGeometry().getCoordinates() - : null - ) - ) + .dataFetcher(environment -> { + if (environment.getSource() instanceof AreaStop areaStop) { + return areaStop.getGeometry().getCoordinates(); + } else if (environment.getSource() instanceof GroupStop groupStop) { + return groupStop.getEncompassingAreaGeometry().getCoordinates(); + } + return null; + }) .build() ) .field( GraphQLFieldDefinition .newFieldDefinition() .name("flexibleGroup") - .description("the Quays part of an flexible group.") + .description("the Quays part of a flexible group.") .type(GraphQLList.list(REF)) .dataFetcher(environment -> ( diff --git a/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java b/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java index 1e6eb1979bb..5bc8d63679a 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java @@ -62,6 +62,7 @@ StopLocation map(FlexibleStopPlace flexibleStopPlace) { List stops = new ArrayList<>(); TransitMode flexibleStopTransitMode = mapTransitMode(flexibleStopPlace); var areas = flexibleStopPlace.getAreas().getFlexibleAreaOrFlexibleAreaRefOrHailAndRideArea(); + ArrayList areaGeometries = new ArrayList<>(); for (var area : areas) { if (!(area instanceof FlexibleArea flexibleArea)) { issueStore.add( @@ -76,6 +77,7 @@ StopLocation map(FlexibleStopPlace flexibleStopPlace) { } Geometry flexibleAreaGeometry = mapGeometry(flexibleArea); + areaGeometries.add(flexibleAreaGeometry); if (shouldAddStopsFromArea(flexibleArea, flexibleStopPlace)) { stops.addAll( @@ -100,7 +102,8 @@ StopLocation map(FlexibleStopPlace flexibleStopPlace) { // get the ids for the area and stop place correct var builder = stopModelBuilder .groupStop(idFactory.createId(flexibleStopPlace.getId())) - .withName(new NonLocalizedString(flexibleStopPlace.getName().getValue())); + .withName(new NonLocalizedString(flexibleStopPlace.getName().getValue())) + .withEncompassingAreaGeometries(areaGeometries); stops.forEach(builder::addLocation); return builder.build(); } diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index ac3cca3dd13..f2baf84b5c3 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -24,6 +24,8 @@ public class GroupStop private final I18NString name; private final GeometryCollection geometry; + private final GeometryCollection encompassingAreaGeometry; + private final WgsCoordinate centroid; GroupStop(GroupStopBuilder builder) { @@ -33,6 +35,7 @@ public class GroupStop this.geometry = builder.geometry(); this.centroid = Objects.requireNonNull(builder.centroid()); this.stopLocations = builder.stopLocations(); + this.encompassingAreaGeometry = builder.encompassingAreaGeometry(); } public static GroupStopBuilder of(FeedScopedId id, IntSupplier indexCounter) { @@ -79,6 +82,10 @@ public Geometry getGeometry() { return geometry; } + public Geometry getEncompassingAreaGeometry() { + return encompassingAreaGeometry; + } + @Override public boolean isPartOfStation() { return false; diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index 5e0dc596eba..b474658f5ec 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -1,5 +1,6 @@ package org.opentripplanner.transit.model.site; +import java.util.ArrayList; import java.util.HashSet; import java.util.Set; import java.util.function.IntSupplier; @@ -26,6 +27,11 @@ public class GroupStopBuilder extends AbstractEntityBuilder geometries) { + this.encompassingAreaGeometry = + new GeometryCollection( + geometries.toArray(new Geometry[0]), + GeometryUtils.getGeometryFactory() + ); + return this; + } + public I18NString name() { return name; } @@ -90,6 +105,10 @@ public GeometryCollection geometry() { return geometry; } + public GeometryCollection encompassingAreaGeometry() { + return encompassingAreaGeometry; + } + public WgsCoordinate centroid() { return centroid; } diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 9b49283c180..25cf95ca2f9 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -579,7 +579,7 @@ type Quay implements PlaceInterface { ): [EstimatedCall!]! @timingData "Geometry for flexible area." flexibleArea: Coordinates - "the Quays part of an flexible group." + "the Quays part of a flexible group." flexibleGroup: [Quay] id: ID! "List of journey patterns servicing this quay" From b4eb8de32538fb6b1c8c1c8be926b0e0ceb3e481 Mon Sep 17 00:00:00 2001 From: eibakke Date: Wed, 17 Jan 2024 15:43:14 +0100 Subject: [PATCH 0306/1688] Adds EncompassingAreaGeometry to the GroupStop and makes it queryable in the flexibleArea on the QuayType. --- .../apis/transmodel/model/stop/QuayType.java | 17 +++++++++-------- .../netex/mapping/FlexStopsMapper.java | 5 ++++- .../transit/model/site/GroupStop.java | 7 +++++++ .../transit/model/site/GroupStopBuilder.java | 19 +++++++++++++++++++ .../apis/transmodel/schema.graphql | 2 +- 5 files changed, 40 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index b80efab77b5..a15bf2f838e 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -380,20 +380,21 @@ public static GraphQLObjectType create( .name("flexibleArea") .description("Geometry for flexible area.") .type(GeoJSONCoordinatesScalar.getGraphQGeoJSONCoordinatesScalar()) - .dataFetcher(environment -> - ( - environment.getSource() instanceof AreaStop areaStop - ? areaStop.getGeometry().getCoordinates() - : null - ) - ) + .dataFetcher(environment -> { + if (environment.getSource() instanceof AreaStop areaStop) { + return areaStop.getGeometry().getCoordinates(); + } else if (environment.getSource() instanceof GroupStop groupStop) { + return groupStop.getEncompassingAreaGeometry().getCoordinates(); + } + return null; + }) .build() ) .field( GraphQLFieldDefinition .newFieldDefinition() .name("flexibleGroup") - .description("the Quays part of an flexible group.") + .description("the Quays part of a flexible group.") .type(GraphQLList.list(REF)) .dataFetcher(environment -> ( diff --git a/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java b/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java index 1e6eb1979bb..7e06db882f1 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/FlexStopsMapper.java @@ -62,6 +62,7 @@ StopLocation map(FlexibleStopPlace flexibleStopPlace) { List stops = new ArrayList<>(); TransitMode flexibleStopTransitMode = mapTransitMode(flexibleStopPlace); var areas = flexibleStopPlace.getAreas().getFlexibleAreaOrFlexibleAreaRefOrHailAndRideArea(); + List areaGeometries = new ArrayList<>(); for (var area : areas) { if (!(area instanceof FlexibleArea flexibleArea)) { issueStore.add( @@ -76,6 +77,7 @@ StopLocation map(FlexibleStopPlace flexibleStopPlace) { } Geometry flexibleAreaGeometry = mapGeometry(flexibleArea); + areaGeometries.add(flexibleAreaGeometry); if (shouldAddStopsFromArea(flexibleArea, flexibleStopPlace)) { stops.addAll( @@ -100,7 +102,8 @@ StopLocation map(FlexibleStopPlace flexibleStopPlace) { // get the ids for the area and stop place correct var builder = stopModelBuilder .groupStop(idFactory.createId(flexibleStopPlace.getId())) - .withName(new NonLocalizedString(flexibleStopPlace.getName().getValue())); + .withName(new NonLocalizedString(flexibleStopPlace.getName().getValue())) + .withEncompassingAreaGeometries(areaGeometries); stops.forEach(builder::addLocation); return builder.build(); } diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index ac3cca3dd13..f2baf84b5c3 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -24,6 +24,8 @@ public class GroupStop private final I18NString name; private final GeometryCollection geometry; + private final GeometryCollection encompassingAreaGeometry; + private final WgsCoordinate centroid; GroupStop(GroupStopBuilder builder) { @@ -33,6 +35,7 @@ public class GroupStop this.geometry = builder.geometry(); this.centroid = Objects.requireNonNull(builder.centroid()); this.stopLocations = builder.stopLocations(); + this.encompassingAreaGeometry = builder.encompassingAreaGeometry(); } public static GroupStopBuilder of(FeedScopedId id, IntSupplier indexCounter) { @@ -79,6 +82,10 @@ public Geometry getGeometry() { return geometry; } + public Geometry getEncompassingAreaGeometry() { + return encompassingAreaGeometry; + } + @Override public boolean isPartOfStation() { return false; diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index 5e0dc596eba..0c7b1f644d0 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -1,6 +1,7 @@ package org.opentripplanner.transit.model.site; import java.util.HashSet; +import java.util.List; import java.util.Set; import java.util.function.IntSupplier; import javax.annotation.Nonnull; @@ -26,6 +27,11 @@ public class GroupStopBuilder extends AbstractEntityBuilder geometries) { + this.encompassingAreaGeometry = + new GeometryCollection( + geometries.toArray(new Geometry[0]), + GeometryUtils.getGeometryFactory() + ); + return this; + } + public I18NString name() { return name; } @@ -90,6 +105,10 @@ public GeometryCollection geometry() { return geometry; } + public GeometryCollection encompassingAreaGeometry() { + return encompassingAreaGeometry; + } + public WgsCoordinate centroid() { return centroid; } diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 9b49283c180..25cf95ca2f9 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -579,7 +579,7 @@ type Quay implements PlaceInterface { ): [EstimatedCall!]! @timingData "Geometry for flexible area." flexibleArea: Coordinates - "the Quays part of an flexible group." + "the Quays part of a flexible group." flexibleGroup: [Quay] id: ID! "List of journey patterns servicing this quay" From f290e95b5f38973c5e8a7d4079ca698e59dfc78d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Wed, 17 Jan 2024 17:24:46 +0200 Subject: [PATCH 0307/1688] Move public methods up --- .../TriangleOptimizationConfig.java | 20 +++++++++---------- .../routerequest/VehicleParkingConfig.java | 18 ++++++++--------- .../routerequest/VehicleRentalConfig.java | 15 ++++++++------ .../routerequest/VehicleWalkingConfig.java | 18 ++++++++--------- 4 files changed, 37 insertions(+), 34 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java index 361e591891c..e6da735a4ac 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TriangleOptimizationConfig.java @@ -8,6 +8,16 @@ public class TriangleOptimizationConfig { + static void mapOptimizationTriangle(NodeAdapter c, TimeSlopeSafetyTriangle.Builder preferences) { + var optimizationTriangle = c + .of("triangle") + .since(V2_5) + .summary("Triangle optimization criteria.") + .description("Optimization type doesn't need to be defined if these values are defined.") + .asObject(); + mapTriangleParameters(optimizationTriangle, preferences); + } + private static void mapTriangleParameters( NodeAdapter c, TimeSlopeSafetyTriangle.Builder builder @@ -41,14 +51,4 @@ private static void mapTriangleParameters( .asDouble(builder.safety()) ); } - - static void mapOptimizationTriangle(NodeAdapter c, TimeSlopeSafetyTriangle.Builder preferences) { - var optimizationTriangle = c - .of("triangle") - .since(V2_5) - .summary("Triangle optimization criteria.") - .description("Optimization type doesn't need to be defined if these values are defined.") - .asObject(); - mapTriangleParameters(optimizationTriangle, preferences); - } } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java index b4afc67e31c..218ac3b33df 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleParkingConfig.java @@ -11,6 +11,15 @@ public class VehicleParkingConfig { + static void mapParking(NodeAdapter c, VehicleParkingPreferences.Builder preferences) { + var vehicleParking = c + .of("parking") + .since(V2_5) + .summary("Preferences for parking a vehicle.") + .asObject(); + mapParkingPreferences(vehicleParking, preferences); + } + private static void mapParkingPreferences( NodeAdapter c, VehicleParkingPreferences.Builder builder @@ -81,13 +90,4 @@ Vehicle parking tags can originate from different places depending on the origin .asStringSet(List.of()) ); } - - static void mapParking(NodeAdapter c, VehicleParkingPreferences.Builder preferences) { - var vehicleParking = c - .of("parking") - .since(V2_5) - .summary("Preferences for parking a vehicle.") - .asObject(); - mapParkingPreferences(vehicleParking, preferences); - } } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java index f862e9b9628..401d977762d 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleRentalConfig.java @@ -10,7 +10,15 @@ public class VehicleRentalConfig { - static void mapRentalPreferences(NodeAdapter c, VehicleRentalPreferences.Builder builder) { + static void mapRental(NodeAdapter c, VehicleRentalPreferences.Builder preferences) { + var vehicleRental = c.of("rental").since(V2_3).summary("Vehicle rental options").asObject(); + mapRentalPreferences(vehicleRental, preferences); + } + + private static void mapRentalPreferences( + NodeAdapter c, + VehicleRentalPreferences.Builder builder + ) { var dft = builder.original(); builder .withDropOffCost( @@ -87,9 +95,4 @@ static void mapRentalPreferences(NodeAdapter c, VehicleRentalPreferences.Builder .asStringSet(dft.bannedNetworks()) ); } - - static void mapRental(NodeAdapter c, VehicleRentalPreferences.Builder preferences) { - var vehicleRental = c.of("rental").since(V2_3).summary("Vehicle rental options").asObject(); - mapRentalPreferences(vehicleRental, preferences); - } } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java index 6bc3bd3ffca..f2ba922c8e3 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java @@ -10,6 +10,15 @@ public class VehicleWalkingConfig { + static void mapVehicleWalking(NodeAdapter c, VehicleWalkingPreferences.Builder preferences) { + var vehicleWalking = c + .of("walk") + .since(V2_5) + .summary("Preferences for walking a vehicle.") + .asObject(); + mapVehicleWalkingPreferences(vehicleWalking, preferences); + } + private static void mapVehicleWalkingPreferences( NodeAdapter c, VehicleWalkingPreferences.Builder builder @@ -70,13 +79,4 @@ private static void mapVehicleWalkingPreferences( .asDouble(dft.stairsReluctance()) ); } - - static void mapVehicleWalking(NodeAdapter c, VehicleWalkingPreferences.Builder preferences) { - var vehicleWalking = c - .of("walk") - .since(V2_5) - .summary("Preferences for walking a vehicle.") - .asObject(); - mapVehicleWalkingPreferences(vehicleWalking, preferences); - } } From 7dbffd0122fa65b7bf5b0a3e03fc2c5208076153 Mon Sep 17 00:00:00 2001 From: eibakke Date: Wed, 17 Jan 2024 16:26:49 +0100 Subject: [PATCH 0308/1688] Adds docstring to getEncompassingAreaGeometry and getGeometry methods of the GroupStop. --- .../org/opentripplanner/transit/model/site/GroupStop.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index f2baf84b5c3..2f2ddca044f 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -77,11 +77,17 @@ public WgsCoordinate getCoordinate() { return centroid; } + /** + * Returns the geometry of all stops and areas belonging to this location group. + */ @Override public Geometry getGeometry() { return geometry; } + /** + * Returns the geometry of the area that encompasses the bounds of this location group. + */ public Geometry getEncompassingAreaGeometry() { return encompassingAreaGeometry; } From 103c498130c9845532b5075d1fbb94b6de4f4082 Mon Sep 17 00:00:00 2001 From: eibakke Date: Wed, 17 Jan 2024 16:34:21 +0100 Subject: [PATCH 0309/1688] Defaults encompassingAreaGeometry in GroupStopBuilder (and therefore also GroupStop) to null instead of an empty GeometryCollection. --- .../opentripplanner/transit/model/site/GroupStopBuilder.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index 0c7b1f644d0..b574eb8c9ea 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -27,10 +27,7 @@ public class GroupStopBuilder extends AbstractEntityBuilder Date: Wed, 17 Jan 2024 17:37:57 +0200 Subject: [PATCH 0310/1688] Rename variables --- .../routerequest/RouteRequestConfig.java | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 6ee164f0083..ed3fa29cc8e 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -334,19 +334,19 @@ The board time is added to the time when going from the stop (offboard) to onboa ); } - private static void mapBikePreferences(NodeAdapter c, BikePreferences.Builder builder) { + private static void mapBikePreferences(NodeAdapter root, BikePreferences.Builder builder) { var dft = builder.original(); - NodeAdapter cb = c.of("bicycle").since(V2_5).summary("Bicycle preferences.").asObject(); + NodeAdapter c = root.of("bicycle").since(V2_5).summary("Bicycle preferences.").asObject(); builder .withSpeed( - cb + c .of("speed") .since(V2_0) .summary("Max bicycle speed along streets, in meters per second") .asDouble(dft.speed()) ) .withReluctance( - cb + c .of("reluctance") .since(V2_0) .summary( @@ -355,7 +355,7 @@ private static void mapBikePreferences(NodeAdapter c, BikePreferences.Builder bu .asDouble(dft.reluctance()) ) .withBoardCost( - cb + c .of("boardCost") .since(V2_0) .summary( @@ -368,7 +368,7 @@ private static void mapBikePreferences(NodeAdapter c, BikePreferences.Builder bu .asInt(dft.boardCost()) ) .withOptimizeType( - cb + c .of("optimization") .since(V2_0) .summary("The set of characteristics that the user wants to optimize for.") @@ -378,10 +378,10 @@ private static void mapBikePreferences(NodeAdapter c, BikePreferences.Builder bu .asEnum(dft.optimizeType()) ) // triangle overrides the optimization type if defined - .withForcedOptimizeTriangle(it -> mapOptimizationTriangle(cb, it)) - .withWalking(it -> mapVehicleWalking(cb, it)) - .withParking(it -> mapParking(cb, it)) - .withRental(it -> mapRental(cb, it)); + .withForcedOptimizeTriangle(it -> mapOptimizationTriangle(c, it)) + .withWalking(it -> mapVehicleWalking(c, it)) + .withParking(it -> mapParking(c, it)) + .withRental(it -> mapRental(c, it)); } private static void mapStreetPreferences(NodeAdapter c, StreetPreferences.Builder builder) { @@ -570,19 +570,19 @@ The street search(AStar) aborts after this duration and any paths found are retu ); } - private static void mapCarPreferences(NodeAdapter c, CarPreferences.Builder builder) { + private static void mapCarPreferences(NodeAdapter root, CarPreferences.Builder builder) { var dft = builder.original(); - NodeAdapter cc = c.of("car").since(V2_5).summary("Car preferences.").asObject(); + NodeAdapter c = root.of("car").since(V2_5).summary("Car preferences.").asObject(); builder .withSpeed( - cc + c .of("speed") .since(V2_0) .summary("Max car speed along streets, in meters per second") .asDouble(dft.speed()) ) .withReluctance( - cc + c .of("reluctance") .since(V2_0) .summary( @@ -591,35 +591,35 @@ private static void mapCarPreferences(NodeAdapter c, CarPreferences.Builder buil .asDouble(dft.reluctance()) ) .withPickupCost( - cc + c .of("pickupCost") .since(V2_1) .summary("Add a cost for car pickup changes when a pickup or drop off takes place") .asInt(dft.pickupCost().toSeconds()) ) .withPickupTime( - cc + c .of("pickupTime") .since(V2_1) .summary("Add a time for car pickup changes when a pickup or drop off takes place") .asDuration(dft.pickupTime()) ) .withAccelerationSpeed( - cc + c .of("accelerationSpeed") .since(V2_0) .summary("The acceleration speed of an automobile, in meters per second per second.") .asDouble(dft.accelerationSpeed()) ) .withDecelerationSpeed( - cc + c .of("decelerationSpeed") .since(V2_0) .summary("The deceleration speed of an automobile, in meters per second per second.") .asDouble(dft.decelerationSpeed()) ) - .withParking(it -> mapParking(cc, it)) - .withRental(it -> mapRental(cc, it)); + .withParking(it -> mapParking(c, it)) + .withRental(it -> mapRental(c, it)); } private static void mapSystemPreferences(NodeAdapter c, SystemPreferences.Builder builder) { @@ -670,19 +670,19 @@ private static void mapSystemPreferences(NodeAdapter c, SystemPreferences.Builde } } - private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder walk) { + private static void mapWalkPreferences(NodeAdapter root, WalkPreferences.Builder walk) { var dft = walk.original(); - NodeAdapter cw = c.of("walk").since(V2_5).summary("Walking preferences.").asObject(); + NodeAdapter c = root.of("walk").since(V2_5).summary("Walking preferences.").asObject(); walk .withSpeed( - cw + c .of("speed") .since(V2_0) .summary("The user's walking speed in meters/second.") .asDouble(dft.speed()) ) .withReluctance( - cw + c .of("reluctance") .since(V2_0) .summary( @@ -700,7 +700,7 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asDouble(dft.reluctance()) ) .withBoardCost( - cw + c .of("boardCost") .since(V2_0) .summary( @@ -712,14 +712,14 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asInt(dft.boardCost()) ) .withStairsReluctance( - cw + c .of("stairsReluctance") .since(V2_0) .summary("Used instead of walkReluctance for stairs.") .asDouble(dft.stairsReluctance()) ) .withStairsTimeFactor( - cw + c .of("stairsTimeFactor") .since(V2_1) .summary( @@ -734,7 +734,7 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asDouble(dft.stairsTimeFactor()) ) .withSafetyFactor( - cw + c .of("safetyFactor") .since(V2_2) .summary("Factor for how much the walk safety is considered in routing.") @@ -744,7 +744,7 @@ private static void mapWalkPreferences(NodeAdapter c, WalkPreferences.Builder wa .asDouble(dft.safetyFactor()) ) .withEscalatorReluctance( - cw + c .of("escalatorReluctance") .since(V2_4) .summary( From ba16135dee31b74d722419cb483b0a449235b030 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 14 Jan 2024 12:41:02 +0100 Subject: [PATCH 0311/1688] refactor: Code cleanup Throttle --- .../opentripplanner/framework/logging/Throttle.java | 12 ++++++++---- .../framework/logging/ThrottleTest.java | 5 +++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/logging/Throttle.java b/src/main/java/org/opentripplanner/framework/logging/Throttle.java index 631d59a2697..ed8a2c1bef4 100644 --- a/src/main/java/org/opentripplanner/framework/logging/Throttle.java +++ b/src/main/java/org/opentripplanner/framework/logging/Throttle.java @@ -1,5 +1,6 @@ package org.opentripplanner.framework.logging; +import java.time.Duration; import org.opentripplanner.framework.time.TimeUtils; /** @@ -26,17 +27,20 @@ public class Throttle { private long timeout = Long.MIN_VALUE; private final String setupInfo; - Throttle(int quietPeriodMilliseconds) { - this.quietPeriodMilliseconds = quietPeriodMilliseconds; + /** + * Package local to be able to unit test. + */ + Throttle(Duration quietPeriod) { + this.quietPeriodMilliseconds = (int) quietPeriod.toMillis(); this.setupInfo = "(throttle " + TimeUtils.msToString(quietPeriodMilliseconds) + " interval)"; } public static Throttle ofOneSecond() { - return new Throttle(1000); + return new Throttle(Duration.ofSeconds(1)); } public static Throttle ofOneMinute() { - return new Throttle(1000 * 60); + return new Throttle(Duration.ofMinutes(1)); } public String setupInfo() { diff --git a/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java b/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java index 91f1667486d..c9155992daa 100644 --- a/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java +++ b/src/test/java/org/opentripplanner/framework/logging/ThrottleTest.java @@ -1,5 +1,6 @@ package org.opentripplanner.framework.logging; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.Locale; @@ -36,8 +37,8 @@ void smokeTest() { @Test @Disabled("Run this test manually") void manualTest() { - double quietPeriodMs = 50.0; - var subject = new Throttle((int) quietPeriodMs); + var quietPeriod = Duration.ofMillis(50); + var subject = new Throttle(quietPeriod); List events = createIntegerSequence(20_000_000); long start = System.currentTimeMillis(); From 1a0e3739b7c61d060348de3186bb329087ee1e6f Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 17 Jan 2024 16:58:02 +0100 Subject: [PATCH 0312/1688] refactor: Reduce dependency scope for PriorityGroupConfigurator This will make it simpler to build a report later --- .../transit/request/PriorityGroupConfigurator.java | 12 +++++------- .../RaptorRoutingRequestTransitDataCreator.java | 2 +- .../request/PriorityGroupConfiguratorTest.java | 12 ++++++------ 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfigurator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfigurator.java index 826b9c09a13..6ef82786b99 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfigurator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfigurator.java @@ -11,7 +11,7 @@ import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.network.RoutingTripPattern; +import org.opentripplanner.transit.model.network.TripPattern; /** * This class dynamically builds an index of transit-group-ids from the @@ -94,16 +94,14 @@ public static PriorityGroupConfigurator of( *

      * @throws IllegalArgumentException if more than 32 group-ids are requested. */ - public int lookupTransitGroupPriorityId(RoutingTripPattern tripPattern) { + public int lookupTransitGroupPriorityId(TripPattern tripPattern) { if (!enabled || tripPattern == null) { return baseGroupId; } - var p = tripPattern.getPattern(); - for (var it : agencyMatchersIds) { - if (it.matcher().match(p)) { - var agencyId = p.getRoute().getAgency().getId(); + if (it.matcher().match(tripPattern)) { + var agencyId = tripPattern.getRoute().getAgency().getId(); int groupId = it.ids().get(agencyId); if (groupId < 0) { @@ -115,7 +113,7 @@ public int lookupTransitGroupPriorityId(RoutingTripPattern tripPattern) { } for (var it : globalMatchersIds) { - if (it.matcher.match(p)) { + if (it.matcher.match(tripPattern)) { return it.groupId(); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java index b8f915d6eb4..863a4ca9ae8 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java @@ -147,7 +147,7 @@ static List merge( tripPattern.getAlightingPossible(), BoardAlight.ALIGHT ), - priorityGroupConfigurator.lookupTransitGroupPriorityId(tripPattern) + priorityGroupConfigurator.lookupTransitGroupPriorityId(tripPattern.getPattern()) ) ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java index cc4bb09f01e..7f974927c1b 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect; import org.opentripplanner.transit.model.basic.TransitMode; -import org.opentripplanner.transit.model.network.RoutingTripPattern; +import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.RegularStop; class PriorityGroupConfiguratorTest { @@ -60,11 +60,11 @@ class PriorityGroupConfiguratorTest { "10:00 10:10" ); - private final RoutingTripPattern railR1 = routeR1.getTripPattern().getRoutingTripPattern(); - private final RoutingTripPattern busB2 = routeB2.getTripPattern().getRoutingTripPattern(); - private final RoutingTripPattern railR3 = routeR3.getTripPattern().getRoutingTripPattern(); - private final RoutingTripPattern ferryF3 = routeF3.getTripPattern().getRoutingTripPattern(); - private final RoutingTripPattern busB3 = routeB3.getTripPattern().getRoutingTripPattern(); + private final TripPattern railR1 = routeR1.getTripPattern(); + private final TripPattern busB2 = routeB2.getTripPattern(); + private final TripPattern railR3 = routeR3.getTripPattern(); + private final TripPattern ferryF3 = routeF3.getTripPattern(); + private final TripPattern busB3 = routeB3.getTripPattern(); @Test void emptyConfigurationShouldReturnGroupZero() { From 390fe32ec826a99bc41e0cd7f96eabd84857e14a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 17 Jan 2024 16:59:25 +0100 Subject: [PATCH 0313/1688] feature: Add a report for transit groups to the report API --- .../model/TransitGroupPriorityReport.java | 86 +++++++++++++++++++ .../reportapi/resource/ReportResource.java | 14 +++ 2 files changed, 100 insertions(+) create mode 100644 src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java new file mode 100644 index 00000000000..635469cb3a2 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java @@ -0,0 +1,86 @@ +package org.opentripplanner.ext.reportapi.model; + +import java.util.Collection; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.stream.Collectors; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.PriorityGroupConfigurator; +import org.opentripplanner.routing.api.request.request.TransitRequest; +import org.opentripplanner.transit.model.network.TripPattern; + +/** + * This class is used to report all transit-groups used for transit-group-priority. The report is + * useful when configuring/debugging this functionality. + *

      + * The format is pure text. + */ +public class TransitGroupPriorityReport { + + public static String build(Collection patterns, TransitRequest request) { + var c = PriorityGroupConfigurator.of( + request.priorityGroupsByAgency(), + request.priorityGroupsGlobal() + ); + + var map = new TreeMap(); + for (var it : patterns) { + int groupId = c.lookupTransitGroupPriorityId(it); + var de = map.computeIfAbsent(groupId, DebugEntity::new); + de.add( + it.getRoute().getAgency().getId().toString(), + it.getMode().name(), + it.getNetexSubmode().name() + ); + } + return ( + "TRANSIT GROUPS PRIORITY" + + map.values().stream().map(DebugEntity::toString).sorted().collect(Collectors.joining("")) + ); + } + + private static class DebugEntity { + + private final int groupId; + private final TreeMap agencies = new TreeMap<>(); + + public DebugEntity(int groupId) { + this.groupId = groupId; + } + + void add(String agency, String mode, String submode) { + agencies.computeIfAbsent(agency, AgencyEntry::new).add(mode, submode); + } + + @Override + public String toString() { + var buf = new StringBuilder("\n %#010x".formatted(groupId)); + for (var it : agencies.values()) { + buf.append("\n ").append(it.toString()); + } + return buf.toString(); + } + } + + private record AgencyEntry(String agency, TreeMap> modes) { + private AgencyEntry(String agency) { + this(agency, new TreeMap<>()); + } + + void add(String mode, String submode) { + modes.computeIfAbsent(mode, m -> new TreeSet<>()).add(submode); + } + + @Override + public String toString() { + var buf = new StringBuilder(); + for (var it : modes.entrySet()) { + buf.append(", "); + buf.append(it.getKey()); + if (!it.getValue().isEmpty()) { + buf.append(" (").append(String.join(", ", it.getValue())).append(")"); + } + } + return agency + " ~ " + buf.substring(2); + } + } +} diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java b/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java index 6ccb728800e..a859b4ff78a 100644 --- a/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java +++ b/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java @@ -17,8 +17,10 @@ import org.opentripplanner.ext.reportapi.model.GraphReportBuilder; import org.opentripplanner.ext.reportapi.model.GraphReportBuilder.GraphStats; import org.opentripplanner.ext.reportapi.model.TransfersReport; +import org.opentripplanner.ext.reportapi.model.TransitGroupPriorityReport; import org.opentripplanner.model.transfer.TransferService; import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource; +import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.transit.service.TransitService; @@ -33,11 +35,13 @@ public class ReportResource { private final TransferService transferService; private final TransitService transitService; + private final RouteRequest defaultRequest; @SuppressWarnings("unused") public ReportResource(@Context OtpServerRequestContext requestContext) { this.transferService = requestContext.transitService().getTransferService(); this.transitService = requestContext.transitService(); + this.defaultRequest = requestContext.defaultRouteRequest(); } @GET @@ -80,6 +84,16 @@ public Response getBicycleSafetyAsCsv( .build(); } + @GET + @Path("/transit/group/priorities") + @Produces(MediaType.TEXT_PLAIN) + public String getTransitGroupPriorities() { + return TransitGroupPriorityReport.build( + transitService.getAllTripPatterns(), + defaultRequest.journey().transit() + ); + } + @GET @Path("/graph.json") public Response stats(@Context OtpServerRequestContext serverRequestContext) { From 90eb73cea489823295bcce368a7a3a2778217ba1 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 17 Jan 2024 17:08:48 +0100 Subject: [PATCH 0314/1688] doc: Add sandbox report doc. --- docs/sandbox/ReportApi.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/sandbox/ReportApi.md b/docs/sandbox/ReportApi.md index fdb6c2d3146..1a0668d1740 100644 --- a/docs/sandbox/ReportApi.md +++ b/docs/sandbox/ReportApi.md @@ -32,6 +32,8 @@ This module mounts an endpoint for generating reports under `otp/report`. Availa - [German version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=germany) - [UK version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=uk) - [Finnish version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=finland) +- [/otp/report/transit/group/priorities](http://localhost:8080/otp/report/transit/group/priorities): + List all transit groups used for transit-group-priority (Competition neutral planning). ### Configuration From 66f3fc59f4ff247b8c521177ed2318aff9591b48 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 16:49:52 +0100 Subject: [PATCH 0315/1688] Improve documentation --- doc-templates/sandbox/MapboxVectorTilesApi.md | 18 ++--- docs/sandbox/MapboxVectorTilesApi.md | 66 +++++++++++-------- .../apis/support/TileJson.java | 8 +++ .../config/routerconfig/VectorTileConfig.java | 20 +++++- 4 files changed, 71 insertions(+), 41 deletions(-) diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md index 7fa1fefa56d..4e3e047fedb 100644 --- a/doc-templates/sandbox/MapboxVectorTilesApi.md +++ b/doc-templates/sandbox/MapboxVectorTilesApi.md @@ -14,6 +14,9 @@ public transit entities on the map. The tiles can be fetched from `/otp/routers/{routerId}/vectorTiles/{layers}/{z}/{x}/{y}.pbf`, where `layers` is a comma separated list of layer names from the configuration. +Maplibre/Mapbox GL JS also require a tilejson.json endpoint which is available at +`/otp/routers/{routerId}/vectorTiles/{layers}/tilejson.json`. + Translatable fields in the tiles are translated based on the `accept-language` header in requests. Currently, only the language with the highest priority from the header is used. @@ -137,14 +140,8 @@ For each layer, the configuration includes: - `VehicleRentalStation`: rental stations - `VehicleParking` - `VehicleParkingGroup` -- `mapper` which describes the mapper converting the properties from the OTP model entities to the - vector tile properties. Currently `Digitransit` is supported for all layer types. -- `minZoom` and `maxZoom` which describe the zoom levels the layer is active for. -- `cacheMaxSeconds` which sets the cache header in the response. The lowest value of the layers - included is selected. -- `expansionFactor` How far outside its boundaries should the tile contain information. The value is - a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile - edges, then increase this number. + + ### Extending @@ -162,9 +159,6 @@ new `LayerType` enum as the key, and the class constructor as the value. A new mapper needs to be added every time a new layer is added. See below for information. - - - #### Creating a new mapper The mapping contains information of what data to include in the vector tiles. The mappers are @@ -172,7 +166,7 @@ defined per layer. In order to create a new mapper for a layer, you need to create a new class extending `PropertyMapper`. In that class, you need to implement the -method `Collection> map(T input)`. The type T is dependent on the layer for which +method `Collection> map(T input)`. The type T is dependent on the layer for which you implement the mapper for. It needs to return a list of attributes, as key-value pairs which will be written into the vector tile. diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 75ab5008124..cfb9a634129 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -14,6 +14,9 @@ public transit entities on the map. The tiles can be fetched from `/otp/routers/{routerId}/vectorTiles/{layers}/{z}/{x}/{y}.pbf`, where `layers` is a comma separated list of layer names from the configuration. +Maplibre/Mapbox GL JS also require a tilejson.json endpoint which is available at +`/otp/routers/{routerId}/vectorTiles/{layers}/tilejson.json`. + Translatable fields in the tiles are translated based on the `accept-language` header in requests. Currently, only the language with the highest priority from the header is used. @@ -137,38 +140,13 @@ For each layer, the configuration includes: - `VehicleRentalStation`: rental stations - `VehicleParking` - `VehicleParkingGroup` -- `mapper` which describes the mapper converting the properties from the OTP model entities to the - vector tile properties. Currently `Digitransit` is supported for all layer types. -- `minZoom` and `maxZoom` which describe the zoom levels the layer is active for. -- `cacheMaxSeconds` which sets the cache header in the response. The lowest value of the layers - included is selected. -- `expansionFactor` How far outside its boundaries should the tile contain information. The value is - a fraction of the tile size. If you are having problem with icons and shapes being clipped at tile - edges, then increase this number. - -### Extending - -If more generic layers are created for this API, it should be moved out from the sandbox, into the -core code, with potentially leaving specific property mappers in place. - -#### Creating a new layer - -In order to create a new type of layer, you need to create a new class extending `LayerBuilder`. -You need to implement two methods, `List getGeometries(Envelope query)`, which returns a -list of geometries, with an object of type `T` as their userData in the geometry, -and `double getExpansionFactor()`, which describes how much information outside the tile bounds -should be included. This layer then needs to be added into `VectorTilesResource.layers`, with a -new `LayerType` enum as the key, and the class constructor as the value. - -A new mapper needs to be added every time a new layer is added. See below for information. - | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |----------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| -| basePath | `string` | TODO: Add short summary. | *Optional* | | 2.5 | +| [basePath](#vectorTiles_basePath) | `string` | The path of the vector tile source URLs in `tilejson.json`. | *Optional* | | 2.5 | | [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | |       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | |       [cacheMaxSeconds](#vectorTiles_layers_0_cacheMaxSeconds) | `integer` | Sets the cache header in the response. | *Optional* | `-1` | 2.0 | @@ -181,6 +159,24 @@ A new mapper needs to be added every time a new layer is added. See below for in #### Details +

      basePath

      + +**Since version:** `2.5` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` +**Path:** /vectorTiles + +The path of the vector tile source URLs in `tilejson.json`. + +This is useful if you have a proxy setup and rewrite the path that is passed to OTP. + +If you don't configure this optional value then the path returned in `tilejson.json` is +`/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you set a value of +`/otp_test/tiles` then the returned path changes to `/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. + +The protocol and host are read from the incoming HTTP request. If you run OTP behind a proxy +then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP +return the protocol and host for the original request and not the proxied one. + +

      layers

      **Since version:** `2.0` ∙ **Type:** `object[]` ∙ **Cardinality:** `Optional` @@ -220,6 +216,22 @@ Currently `Digitransit` is supported for all layer types. +### Extending + +If more generic layers are created for this API, it should be moved out from the sandbox, into the +core code, with potentially leaving specific property mappers in place. + +#### Creating a new layer + +In order to create a new type of layer, you need to create a new class extending `LayerBuilder`. +You need to implement two methods, `List getGeometries(Envelope query)`, which returns a +list of geometries, with an object of type `T` as their userData in the geometry, +and `double getExpansionFactor()`, which describes how much information outside the tile bounds +should be included. This layer then needs to be added into `VectorTilesResource.layers`, with a +new `LayerType` enum as the key, and the class constructor as the value. + +A new mapper needs to be added every time a new layer is added. See below for information. + #### Creating a new mapper The mapping contains information of what data to include in the vector tiles. The mappers are @@ -227,7 +239,7 @@ defined per layer. In order to create a new mapper for a layer, you need to create a new class extending `PropertyMapper`. In that class, you need to implement the -method `Collection> map(T input)`. The type T is dependent on the layer for which +method `Collection> map(T input)`. The type T is dependent on the layer for which you implement the mapper for. It needs to return a list of attributes, as key-value pairs which will be written into the vector tile. diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index feedf1657ef..c30e4809533 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -58,6 +58,10 @@ public TileJson(String tileUrl, WorldEnvelope envelope, Collection fee center = new double[] { c.longitude(), c.latitude(), 9 }; } + /** + * Creates a vector source layer URL from a hard-coded path plus information from the incoming + * HTTP request. + */ public static String defaultPath( UriInfo uri, HttpHeaders headers, @@ -73,6 +77,10 @@ public static String defaultPath( ); } + /** + * Creates a vector source layer URL from a configured base path plus information from the incoming + * HTTP request. + */ public static String overrideBasePath( UriInfo uri, HttpHeaders headers, diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index df353f40079..67fd2496e3c 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -9,7 +9,6 @@ import java.util.Collection; import java.util.List; -import java.util.Objects; import java.util.Optional; import javax.annotation.Nullable; import org.opentripplanner.ext.vectortiles.VectorTilesResource; @@ -50,7 +49,24 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String .since(V2_0) .summary("Configuration of the individual layers for the Mapbox vector tiles.") .asObjects(VectorTileConfig::mapLayer), - root.of("basePath").since(V2_5).asString(DEFAULT.basePath) + root + .of("basePath") + .since(V2_5) + .summary("The path of the vector tile source URLs in `tilejson.json`.") + .description( + """ + This is useful if you have a proxy setup and rewrite the path that is passed to OTP. + + If you don't configure this optional value then the path returned in `tilejson.json` is + `/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you set a value of + `/otp_test/tiles` then the returned path changes to `/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. + + The protocol and host are read from the incoming HTTP request. If you run OTP behind a proxy + then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP + return the protocol and host for the original request and not the proxied one. + """ + ) + .asString(DEFAULT.basePath) ); } From 7c9958b2fe10f55c626fa4bb715185f471e58eae Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 21:10:52 +0100 Subject: [PATCH 0316/1688] Add test for resource --- .../vectortiles/VectorTilesResourceTest.java | 31 +++++++++++++++++++ .../opentripplanner/TestServerContext.java | 10 +++++- .../apis/support/TileJsonTest.java | 20 +++--------- .../test/support/HttpForTest.java | 18 +++++++++++ 4 files changed, 63 insertions(+), 16 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java create mode 100644 src/test/java/org/opentripplanner/test/support/HttpForTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java new file mode 100644 index 00000000000..ff9509a8474 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesResourceTest.java @@ -0,0 +1,31 @@ +package org.opentripplanner.ext.vectortiles; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.glassfish.grizzly.http.server.Request; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.opentripplanner.TestServerContext; +import org.opentripplanner.routing.graph.Graph; +import org.opentripplanner.test.support.HttpForTest; +import org.opentripplanner.transit.service.TransitModel; + +class VectorTilesResourceTest { + + @Test + void tileJson() { + // the Grizzly request is awful to instantiate, using Mockito + var grizzlyRequest = Mockito.mock(Request.class); + var resource = new VectorTilesResource( + TestServerContext.createServerContext(new Graph(), new TransitModel()), + grizzlyRequest, + "default" + ); + var req = HttpForTest.containerRequest(); + var tileJson = resource.getTileJson(req.getUriInfo(), req, "layer1,layer2"); + assertEquals( + "https://localhost:8080/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{y}.pbf", + tileJson.tiles[0] + ); + } +} diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index dd640c1f000..5d74dbba240 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -16,6 +16,7 @@ import org.opentripplanner.service.worldenvelope.WorldEnvelopeService; import org.opentripplanner.service.worldenvelope.internal.DefaultWorldEnvelopeRepository; import org.opentripplanner.service.worldenvelope.internal.DefaultWorldEnvelopeService; +import org.opentripplanner.service.worldenvelope.model.WorldEnvelope; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; @@ -58,7 +59,14 @@ public static OtpServerRequestContext createServerContext( /** Static factory method to create a service for test purposes. */ public static WorldEnvelopeService createWorldEnvelopeService() { - return new DefaultWorldEnvelopeService(new DefaultWorldEnvelopeRepository()); + var repository = new DefaultWorldEnvelopeRepository(); + var envelope = WorldEnvelope + .of() + .expandToIncludeStreetEntities(0, 0) + .expandToIncludeStreetEntities(1, 1) + .build(); + repository.saveEnvelope(envelope); + return new DefaultWorldEnvelopeService(repository); } public static RealtimeVehicleService createRealtimeVehicleService(TransitService transitService) { diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index e9a7fe39eba..053b6ee89ef 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -2,15 +2,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import java.net.URI; -import java.net.URISyntaxException; -import javax.annotation.Nonnull; -import org.glassfish.jersey.internal.MapPropertiesDelegate; -import org.glassfish.jersey.server.ContainerRequest; import org.glassfish.jersey.server.internal.routing.UriRoutingContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opentripplanner.test.support.HttpForTest; class TileJsonTest { @@ -25,8 +21,8 @@ class TileJsonTest { "///otp_ct/vectorTiles/", } ) - void overrideBasePath(String basePath) throws URISyntaxException { - var req = container(); + void overrideBasePath(String basePath) { + var req = HttpForTest.containerRequest(); var uriInfo = new UriRoutingContext(req); assertEquals( "https://localhost:8080/otp_ct/vectorTiles/stops,rentalVehicles/{z}/{x}/{y}.pbf", @@ -35,18 +31,12 @@ void overrideBasePath(String basePath) throws URISyntaxException { } @Test - void defaultPath() throws URISyntaxException { - var req = container(); + void defaultPath() { + var req = HttpForTest.containerRequest(); var uriInfo = new UriRoutingContext(req); assertEquals( "https://localhost:8080/otp/routers/default/vectorTiles/stops,rentalVehicles/{z}/{x}/{y}.pbf", TileJson.defaultPath(uriInfo, req, LAYERS, "default", "vectorTiles") ); } - - @Nonnull - private static ContainerRequest container() throws URISyntaxException { - var uri = new URI("https://localhost:8080"); - return new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); - } } diff --git a/src/test/java/org/opentripplanner/test/support/HttpForTest.java b/src/test/java/org/opentripplanner/test/support/HttpForTest.java new file mode 100644 index 00000000000..b130a2f3fde --- /dev/null +++ b/src/test/java/org/opentripplanner/test/support/HttpForTest.java @@ -0,0 +1,18 @@ +package org.opentripplanner.test.support; + +import java.net.URI; +import java.net.URISyntaxException; +import org.glassfish.jersey.internal.MapPropertiesDelegate; +import org.glassfish.jersey.server.ContainerRequest; + +public class HttpForTest { + + public static ContainerRequest containerRequest() { + try { + URI uri = new URI("https://localhost:8080"); + return new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } +} From 34793eb6a8e4eb9b2de25adff5f6e6cb97f684d5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 21:58:21 +0100 Subject: [PATCH 0317/1688] Rename methods --- .../opentripplanner/ext/vectortiles/VectorTilesResource.java | 4 ++-- src/main/java/org/opentripplanner/apis/support/TileJson.java | 4 ++-- .../apis/vectortiles/GraphInspectorVectorTileResource.java | 2 +- .../java/org/opentripplanner/apis/support/TileJsonTest.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index 3182936b281..d87c60836de 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -93,10 +93,10 @@ public TileJson getTileJson( .vectorTileConfig() .basePath() .map(overrideBasePath -> - TileJson.overrideBasePath(uri, headers, overrideBasePath, requestedLayers) + TileJson.urlFromOverriddenBasePath(uri, headers, overrideBasePath, requestedLayers) ) .orElseGet(() -> - TileJson.defaultPath(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles") + TileJson.urlWithDefaultPath(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles") ); return new TileJson(url, envelope, feedInfos); diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index c30e4809533..09261e295e0 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -62,7 +62,7 @@ public TileJson(String tileUrl, WorldEnvelope envelope, Collection fee * Creates a vector source layer URL from a hard-coded path plus information from the incoming * HTTP request. */ - public static String defaultPath( + public static String urlWithDefaultPath( UriInfo uri, HttpHeaders headers, String layers, @@ -81,7 +81,7 @@ public static String defaultPath( * Creates a vector source layer URL from a configured base path plus information from the incoming * HTTP request. */ - public static String overrideBasePath( + public static String urlFromOverriddenBasePath( UriInfo uri, HttpHeaders headers, String overridePath, diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index f5839cdabc2..666adebbbf7 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -103,7 +103,7 @@ public TileJson getTileJson( var envelope = serverContext.worldEnvelopeService().envelope().orElseThrow(); List feedInfos = feedInfos(); - var url = TileJson.defaultPath( + var url = TileJson.urlWithDefaultPath( uri, headers, requestedLayers, diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index 053b6ee89ef..6b78042bf29 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -26,7 +26,7 @@ void overrideBasePath(String basePath) { var uriInfo = new UriRoutingContext(req); assertEquals( "https://localhost:8080/otp_ct/vectorTiles/stops,rentalVehicles/{z}/{x}/{y}.pbf", - TileJson.overrideBasePath(uriInfo, req, basePath, LAYERS) + TileJson.urlFromOverriddenBasePath(uriInfo, req, basePath, LAYERS) ); } @@ -36,7 +36,7 @@ void defaultPath() { var uriInfo = new UriRoutingContext(req); assertEquals( "https://localhost:8080/otp/routers/default/vectorTiles/stops,rentalVehicles/{z}/{x}/{y}.pbf", - TileJson.defaultPath(uriInfo, req, LAYERS, "default", "vectorTiles") + TileJson.urlWithDefaultPath(uriInfo, req, LAYERS, "default", "vectorTiles") ); } } From ded7050e670e3e3b5268cc81e0e489415c2a91c2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 22:19:17 +0100 Subject: [PATCH 0318/1688] Reuse helper class --- .../standalone/server/EtagRequestFilterTest.java | 11 +++-------- .../org/opentripplanner/test/support/HttpForTest.java | 8 ++++++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java b/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java index 1451a218852..5adf8264d8e 100644 --- a/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java +++ b/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java @@ -8,7 +8,6 @@ import java.nio.charset.StandardCharsets; import java.util.stream.Stream; import javax.annotation.Nonnull; -import org.glassfish.jersey.internal.MapPropertiesDelegate; import org.glassfish.jersey.message.internal.OutboundJaxrsResponse; import org.glassfish.jersey.message.internal.OutboundMessageContext; import org.glassfish.jersey.message.internal.Statuses; @@ -17,6 +16,7 @@ import org.jets3t.service.utils.Mimetypes; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.opentripplanner.test.support.HttpForTest; import org.opentripplanner.test.support.VariableSource; class EtagRequestFilterTest { @@ -44,7 +44,7 @@ void writeEtag( byte[] entity, String expectedEtag ) throws IOException { - var request = request(method); + var request = HttpForTest.containerRequest(method); var response = response(status, request); var headers = response.getHeaders(); headers.add(EtagRequestFilter.HEADER_CONTENT_TYPE, responseContentType); @@ -65,7 +65,7 @@ void writeEtag( @VariableSource("ifNoneMatchCases") void ifNoneMatch(String ifNoneMatch, int expectedStatus, byte[] expectedEntity) throws IOException { - var request = request("GET"); + var request = HttpForTest.containerRequest("GET"); request.header(EtagRequestFilter.HEADER_IF_NONE_MATCH, ifNoneMatch); var response = response(200, request); var headers = response.getHeaders(); @@ -92,9 +92,4 @@ private static ContainerResponse response(int status, ContainerRequest request) private static byte[] bytes(String input) { return input.getBytes(StandardCharsets.UTF_8); } - - @Nonnull - private static ContainerRequest request(String method) { - return new ContainerRequest(null, null, method, null, new MapPropertiesDelegate(), null); - } } diff --git a/src/test/java/org/opentripplanner/test/support/HttpForTest.java b/src/test/java/org/opentripplanner/test/support/HttpForTest.java index b130a2f3fde..7bbe272572d 100644 --- a/src/test/java/org/opentripplanner/test/support/HttpForTest.java +++ b/src/test/java/org/opentripplanner/test/support/HttpForTest.java @@ -7,12 +7,16 @@ public class HttpForTest { - public static ContainerRequest containerRequest() { + public static ContainerRequest containerRequest(String method) { try { URI uri = new URI("https://localhost:8080"); - return new ContainerRequest(uri, uri, "GET", null, new MapPropertiesDelegate(), null); + return new ContainerRequest(uri, uri, method, null, new MapPropertiesDelegate(), null); } catch (URISyntaxException e) { throw new RuntimeException(e); } } + + public static ContainerRequest containerRequest() { + return containerRequest("GET"); + } } From fc1225926a42f2716a6e61d17cbd39788a19c647 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Jan 2024 01:43:24 +0000 Subject: [PATCH 0319/1688] Update dependency org.entur.gbfs:gbfs-java-model to v3.0.20 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e5f86fe5b66..c3f7392bb42 100644 --- a/pom.xml +++ b/pom.xml @@ -688,7 +688,7 @@ org.entur.gbfs gbfs-java-model - 3.0.16 + 3.0.20 From 71decf9e3849e0bc11776d2fbd4f45c06fa9969c Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 18 Jan 2024 06:10:41 +0000 Subject: [PATCH 0320/1688] Upgrade debug client to version 2024/01/2024-01-18T06:10 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 5f77418dbe6..e9443e240c4 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From ac45106c7956d15ca7b5cb0621664ca48f7c8b42 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 18 Jan 2024 08:59:17 +0100 Subject: [PATCH 0321/1688] Revert REST API spelling of real-time --- .../ext/restapi/mapping/TripTimeMapper.java | 8 ++++---- .../ext/restapi/model/ApiTripTimeShort.java | 8 ++++---- .../ext/restapi/model/ApiVehicleParkingWithEntrance.java | 4 ++-- .../algorithm/mapping/__snapshots__/CarSnapshotTest.snap | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java index f1f37e6d8b4..46607cccb6a 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java @@ -29,13 +29,13 @@ public static ApiTripTimeShort mapToApi(TripTimeOnDate domain) { api.stopCount = domain.getStopCount(); api.scheduledArrival = domain.getScheduledArrival(); api.scheduledDeparture = domain.getScheduledDeparture(); - api.realTimeArrival = domain.getRealtimeArrival(); - api.realTimeDeparture = domain.getRealtimeDeparture(); + api.realimeArrival = domain.getRealtimeArrival(); + api.realtimeDeparture = domain.getRealtimeDeparture(); api.arrivalDelay = domain.getArrivalDelay(); api.departureDelay = domain.getDepartureDelay(); api.timepoint = domain.isTimepoint(); - api.realTime = domain.isRealtime(); - api.realTimeState = ApiRealTimeState.RealTimeState(domain.getRealTimeState()); + api.realtime = domain.isRealtime(); + api.realtimeState = ApiRealTimeState.RealTimeState(domain.getRealTimeState()); api.blockId = domain.getBlockId(); api.headsign = I18NStringMapper.mapToApi(domain.getHeadsign(), null); api.tripId = FeedScopedIdMapper.mapToApi(domain.getTrip().getId()); diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java index 21c6010c5a2..c0337ba18d4 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java @@ -11,13 +11,13 @@ public class ApiTripTimeShort implements Serializable { public int stopCount; public int scheduledArrival = UNDEFINED; public int scheduledDeparture = UNDEFINED; - public int realTimeArrival = UNDEFINED; - public int realTimeDeparture = UNDEFINED; + public int realimeArrival = UNDEFINED; + public int realtimeDeparture = UNDEFINED; public int arrivalDelay = UNDEFINED; public int departureDelay = UNDEFINED; public boolean timepoint = false; - public boolean realTime = false; - public ApiRealTimeState realTimeState = ApiRealTimeState.SCHEDULED; + public boolean realtime = false; + public ApiRealTimeState realtimeState = ApiRealTimeState.SCHEDULED; public long serviceDay; public String tripId; public String blockId; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java index 68a9f37dfe4..79c5decbaeb 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiVehicleParkingWithEntrance.java @@ -81,7 +81,7 @@ public class ApiVehicleParkingWithEntrance { /** * True if real-time information is used for checking availability. */ - public final boolean realTime; + public final boolean realtime; ApiVehicleParkingWithEntrance( String id, @@ -114,7 +114,7 @@ public class ApiVehicleParkingWithEntrance { this.hasWheelchairAccessibleCarPlaces = hasWheelchairAccessibleCarPlaces; this.capacity = capacity; this.availability = availability; - this.realTime = realTime; + this.realtime = realTime; } public static ApiVehicleParkingWithEntranceBuilder builder() { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap index 31d59483807..8f527b15bf7 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap @@ -106,7 +106,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "hasWheelchairAccessibleCarPlaces" : false, "id" : "OSM:OSMWay/-102488", "name" : "P+R", - "realTime" : false, + "realtime" : false, "tags" : [ "osm:amenity=parking" ] @@ -137,7 +137,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "hasWheelchairAccessibleCarPlaces" : false, "id" : "OSM:OSMWay/-102488", "name" : "P+R", - "realTime" : false, + "realtime" : false, "tags" : [ "osm:amenity=parking" ] From 5451b6de87b07ff3cb6a77ce3186d6348086d1ed Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 18 Jan 2024 09:06:21 +0100 Subject: [PATCH 0322/1688] Remove mention of REST in README [ci skip] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 582511ce7f2..4486818745b 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ OpenTripPlanner (OTP) is an open source multi-modal trip planner, focusing on travel by scheduled public transportation in combination with bicycling, walking, and mobility services including bike share and ride hailing. Its server component runs on any platform with a Java virtual machine ( -including Linux, Mac, and Windows). It exposes REST and GraphQL APIs that can be accessed by various +including Linux, Mac, and Windows). It exposes GraphQL APIs that can be accessed by various clients including open source Javascript components and native mobile applications. It builds its representation of the transportation network from open data in open standard file formats (primarily GTFS and OpenStreetMap). It applies real-time updates and alerts with immediate visibility to From aaff0ecb45aa8efe5efd09f43ed1ec945806b446 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 18 Jan 2024 11:51:39 +0200 Subject: [PATCH 0323/1688] Make builder field private --- .../routing/api/request/preference/BikePreferences.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java index 2d887eba596..26da1476b38 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java @@ -166,8 +166,7 @@ public static class Builder { private VehicleRentalPreferences rental; private BicycleOptimizeType optimizeType; private TimeSlopeSafetyTriangle optimizeTriangle; - - public VehicleWalkingPreferences walking; + private VehicleWalkingPreferences walking; public Builder(BikePreferences original) { this.original = original; From ed51e526f1c026503cd9ea5d2b861304d9b43ed6 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 18 Jan 2024 15:56:10 +0200 Subject: [PATCH 0324/1688] Move class to correct package --- .../ext/restapi/mapping}/LegacyBicycleOptimizeType.java | 2 +- .../ext/restapi/resources/RequestToPreferencesMapper.java | 2 +- .../opentripplanner/ext/restapi/resources/RoutingResource.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/{main/java/org/opentripplanner/framework/i18n => ext/java/org/opentripplanner/ext/restapi/mapping}/LegacyBicycleOptimizeType.java (93%) diff --git a/src/main/java/org/opentripplanner/framework/i18n/LegacyBicycleOptimizeType.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyBicycleOptimizeType.java similarity index 93% rename from src/main/java/org/opentripplanner/framework/i18n/LegacyBicycleOptimizeType.java rename to src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyBicycleOptimizeType.java index 1cc262ad720..ff50a03534b 100644 --- a/src/main/java/org/opentripplanner/framework/i18n/LegacyBicycleOptimizeType.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyBicycleOptimizeType.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.mapping; +package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.routing.core.BicycleOptimizeType; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index d8ebeb30f63..2236e7fbcaa 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -2,7 +2,7 @@ import jakarta.validation.constraints.NotNull; import java.util.function.Consumer; -import org.opentripplanner.api.mapping.LegacyBicycleOptimizeType; +import org.opentripplanner.ext.restapi.mapping.LegacyBicycleOptimizeType; import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java index 49659cfe940..0cd16217ca7 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java @@ -18,9 +18,9 @@ import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.opentripplanner.api.mapping.LegacyBicycleOptimizeType; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.ext.dataoverlay.api.DataOverlayParameters; +import org.opentripplanner.ext.restapi.mapping.LegacyBicycleOptimizeType; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.framework.time.DurationUtils; From b50c1276acd2cfc6ddf48ae54ba3b8cdcf357dba Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 18 Jan 2024 18:08:43 +0100 Subject: [PATCH 0325/1688] Apply suggestions from code review Co-authored-by: Eivind Morris Bakke --- .../transit/RemoveItinerariesWithShortStreetLeg.java | 2 +- .../filterchain/framework/filter/RemoveFilter.java | 2 +- .../filterchain/framework/spi/ItineraryDecorator.java | 2 +- .../routing/algorithm/filterchain/package.md | 6 +++--- .../filterchain/framework/filter/DecorateFilterTest.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java index 0014d8925a9..713775911b3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveItinerariesWithShortStreetLeg.java @@ -15,7 +15,7 @@ * several queries are combined in the frontend. *

      * Example: you have two queries for bike+transit and walk+transit each. Both give you very short legs - * to reach a train station. A user would not expect to see a bike+transit shorted than 200m leg when it's + * to reach a train station. A user would not expect to see a bike+transit shorter than 200m leg when it's * presented right next to a walk+transit leg of the same length. *

      * In other words, this offloads the comparison part of the filter chain to a system outside of OTP and diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java index b53edf05a79..e83aa237cab 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/RemoveFilter.java @@ -10,7 +10,7 @@ /** * This class is responsible for flagging itineraries for deletion based on a predicate in the - * supplied ItineraryDeletionFlagger. The itineraries are not actually deleted at this point, just + * supplied RemoveItineraryFlagger. The itineraries are not actually deleted at this point, just * flagged. They are typically deleted later if debug mode is disabled. */ public class RemoveFilter implements ItineraryListFilter { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java index f1df247f296..4df14c7f5ab 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryDecorator.java @@ -7,7 +7,7 @@ */ public interface ItineraryDecorator { /** - * Implement this do decorate each itinerary in the result. + * Implement this to decorate each itinerary in the result. */ void decorate(Itinerary itinerary); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md index ed8ca0d4d7b..3ea8ceb54c8 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/package.md @@ -51,15 +51,15 @@ Here is an overview of the packages and their responsibilities. ``` filterchain ├── api Request parameters passed into the filter chain -├── filters Concreate filter implementations +├── filters Concrete filter implementations │ ├── street For decorating/filtering street itineraries │ ├── system Mainly support for otp features like paging and search-window crop │ └── transit For decorating/filtering itineraries with transit │ └── group Transit group filters ├── framework Generic filter chain implementation │ ├── filter Filter implementation -│ ├── filterchain Domain logic used by the `FilterChain` (agreagate root). -│ ├── groupids Generic groupId implementations. These can be used to as lego to build specific group-by filters. +│ ├── filterchain Domain logic used by the `FilterChain` (aggregate root). +│ ├── groupids Generic groupId implementations. These can be used as lego to build specific group-by filters. │ ├── sort Sorting implementation │ └── spi The interfaces to extend to plug into the filter-chain └── images Images used in the doc diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java index 9ae8e0da7df..7439acd6d12 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/framework/filter/DecorateFilterTest.java @@ -38,7 +38,7 @@ public void decorate(Itinerary itinerary) { @Test void filterEmptyList() { - // Make sure the filter does nothing and do not crash on empty lists + // Make sure the filter does nothing and does not crash on empty lists new DecorateFilter(this).filter(List.of()); } From 5fa7d6100f17daac91563350f544546f72b1dd56 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 14 Jan 2024 03:22:13 +0100 Subject: [PATCH 0326/1688] fix: Follow dash notation for filter names in SameFirstOrLastTripFilter --- .../transit/group/RemoveIfFirstOrLastTripIsTheSame.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java index f076586f487..bc72aada043 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveIfFirstOrLastTripIsTheSame.java @@ -8,15 +8,14 @@ /** * This filter ensures that no more than one itinerary begins or ends with the same trip. - * It loops through itineraries from top to bottom. If itinerary matches with any other itinerary - * from above, it is removed from list. - * Uses {@link GroupBySameFirstOrLastTrip}. + * It loops through itineraries from top to bottom. If an itinerary matches another itinerary, then + * it is removed from the list. Uses {@link GroupBySameFirstOrLastTrip}. */ public class RemoveIfFirstOrLastTripIsTheSame implements RemoveItineraryFlagger { @Override public String name() { - return "SameFirstOrLastTripFilter"; + return "same-first-or-last-trip-filter"; } @Override From c52680e0b272477fe8fcbdd8bafb9d1b8fea5fb8 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 18 Jan 2024 18:45:47 +0100 Subject: [PATCH 0327/1688] review: Fix JavaDoc refs and language --- .../TransitGeneralizedCostFilterParams.java | 4 +- ...veOtherThanSameLegsMaxGeneralizedCost.java | 5 +- .../framework/spi/ItineraryListFilter.java | 7 +- .../ItineraryListFilterChain.excalidraw | 228 +++++++++--------- .../images/ItineraryListFilterChain.svg | 2 +- 5 files changed, 122 insertions(+), 124 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java index c909ff00db0..a173f6b454b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/api/TransitGeneralizedCostFilterParams.java @@ -1,11 +1,11 @@ package org.opentripplanner.routing.algorithm.filterchain.api; import org.opentripplanner.framework.lang.DoubleUtils; -import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** - * Input parameters for {@link TransitGeneralizedCostFilter} + * Input parameters for + * {@link org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter} * * @param costLimitFunction Describes the function to calculate the limit for an itinerary based * on the generalized cost diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java index becac712445..0194cfa2bbc 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java @@ -7,7 +7,6 @@ import java.util.stream.Collectors; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.filter.GroupByFilter; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; import org.opentripplanner.transit.model.timetable.Trip; @@ -15,8 +14,8 @@ /** * This filter remove itineraries, which use the same trips for most of their legs, but where some * itineraries have a much higher cost for the other legs. This is similar to {@link - * TransitGeneralizedCostFilter}, but is used together with {@link GroupByFilter} to filter within - * the groups. + * org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter}, + * but is used together with {@link GroupByFilter} to filter within the groups. */ public class RemoveOtherThanSameLegsMaxGeneralizedCost implements RemoveItineraryFlagger { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java index b0a67ab147f..7d795e6c7fb 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/spi/ItineraryListFilter.java @@ -2,7 +2,6 @@ import java.util.List; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimit; /** * Filter, sort or decorate itineraries. A filter can modify the elements in the list, but not the @@ -13,9 +12,9 @@ * in the same filter. Instead, create two filters and insert them after each other in the filter * chain. *

      - * This allows decoration of each filter and makes it easier to reuse logic. Like the {@link - * MaxLimit} is reused in - * several places. + * This allows decoration of each filter and makes it easier to reuse logic. Like the + * {@link org.opentripplanner.routing.algorithm.filterchain.framework.filter.MaxLimit} is reused + * in several places. */ public interface ItineraryListFilter { /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw index 76c71874be5..37e3f8de7b2 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.excalidraw @@ -5,8 +5,8 @@ "elements": [ { "type": "arrow", - "version": 2479, - "versionNonce": 2086276447, + "version": 2483, + "versionNonce": 773348709, "isDeleted": false, "id": "uTKhXBXl80XXPjGsftdJa", "fillStyle": "hachure", @@ -28,7 +28,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982418479, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": { @@ -57,8 +57,8 @@ }, { "type": "ellipse", - "version": 964, - "versionNonce": 465602847, + "version": 968, + "versionNonce": 607278955, "isDeleted": false, "id": "oV4YIjz-w-0HS_dvr7ZoB", "fillStyle": "hachure", @@ -83,14 +83,14 @@ "id": "uTKhXBXl80XXPjGsftdJa" } ], - "updated": 1704982418479, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "ellipse", - "version": 139, - "versionNonce": 297704337, + "version": 143, + "versionNonce": 810641605, "isDeleted": false, "id": "iXHhu1-MD9tXNfoZZ8Rcq", "fillStyle": "hachure", @@ -115,14 +115,14 @@ "id": "i6hMn3CPVbRxyPcniV7yb" } ], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "arrow", - "version": 363, - "versionNonce": 1672962559, + "version": 367, + "versionNonce": 1181364747, "isDeleted": false, "id": "i6hMn3CPVbRxyPcniV7yb", "fillStyle": "hachure", @@ -144,7 +144,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": { @@ -173,8 +173,8 @@ }, { "type": "text", - "version": 108, - "versionNonce": 2108178065, + "version": 114, + "versionNonce": 1376913445, "isDeleted": false, "id": "nJRU39yv_4LYhT-kVxv_t", "fillStyle": "hachure", @@ -194,7 +194,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982458252, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -209,8 +209,8 @@ }, { "type": "text", - "version": 260, - "versionNonce": 1872284191, + "version": 267, + "versionNonce": 369997995, "isDeleted": false, "id": "D8AYLA3h4ksepFAEqkC7G", "fillStyle": "hachure", @@ -219,18 +219,18 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 592.552734375, + "x": 592.4027938842773, "y": 214.466796875, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 125, + "width": 125.29988098144531, "height": 50, "seed": 1478178009, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -245,8 +245,8 @@ }, { "type": "arrow", - "version": 590, - "versionNonce": 180857681, + "version": 594, + "versionNonce": 1699199877, "isDeleted": false, "id": "abNnvFw7GnSsRXaqnRUYs", "fillStyle": "hachure", @@ -268,7 +268,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": { @@ -297,8 +297,8 @@ }, { "type": "rectangle", - "version": 180, - "versionNonce": 660090431, + "version": 184, + "versionNonce": 1086810955, "isDeleted": false, "id": "bA4uoIjQQ5b7VTjNXnYCH", "fillStyle": "hachure", @@ -323,14 +323,14 @@ "id": "abNnvFw7GnSsRXaqnRUYs" } ], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "text", - "version": 139, - "versionNonce": 1010309425, + "version": 146, + "versionNonce": 573571813, "isDeleted": false, "id": "A4ZjgRaXH3lARCAtxxyGH", "fillStyle": "hachure", @@ -343,14 +343,14 @@ "y": 200.08984375, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 10, + "width": 10.319992065429688, "height": 25, "seed": 770881047, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -365,8 +365,8 @@ }, { "type": "line", - "version": 131, - "versionNonce": 1440091743, + "version": 135, + "versionNonce": 1525795307, "isDeleted": false, "id": "xPF7fs9PPAG3FCbgCedlx", "fillStyle": "hachure", @@ -388,7 +388,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": null, @@ -409,8 +409,8 @@ }, { "type": "freedraw", - "version": 166, - "versionNonce": 622840593, + "version": 170, + "versionNonce": 1566072389, "isDeleted": false, "id": "v7Du5WLNb590wL5Uam6Ta", "fillStyle": "hachure", @@ -432,7 +432,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "points": [ @@ -680,8 +680,8 @@ }, { "type": "rectangle", - "version": 214, - "versionNonce": 367192703, + "version": 218, + "versionNonce": 160912523, "isDeleted": false, "id": "bXMUStvEb709SPfYF07CW", "fillStyle": "hachure", @@ -710,14 +710,14 @@ "id": "hhODwDUSnKDNHxeWgdBRh" } ], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "arrow", - "version": 639, - "versionNonce": 1576419569, + "version": 643, + "versionNonce": 2107526565, "isDeleted": false, "id": "hhODwDUSnKDNHxeWgdBRh", "fillStyle": "hachure", @@ -739,7 +739,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": { @@ -776,8 +776,8 @@ }, { "type": "text", - "version": 120, - "versionNonce": 1413431967, + "version": 127, + "versionNonce": 1819446059, "isDeleted": false, "id": "svSoLS4U9UhcZVccLd8Kz", "fillStyle": "hachure", @@ -786,11 +786,11 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 954.3359375, + "x": 954.5559997558594, "y": 483.53125, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 133, + "width": 132.55987548828125, "height": 75, "seed": 736680902, "groupIds": [], @@ -802,7 +802,7 @@ "id": "hhODwDUSnKDNHxeWgdBRh" } ], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -817,8 +817,8 @@ }, { "type": "ellipse", - "version": 234, - "versionNonce": 71498449, + "version": 238, + "versionNonce": 841961733, "isDeleted": false, "id": "1H3J1TVatGqsTmeb03PzM", "fillStyle": "hachure", @@ -838,14 +838,14 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "text", - "version": 542, - "versionNonce": 295409343, + "version": 549, + "versionNonce": 1206775243, "isDeleted": false, "id": "eMUtrGSf4_tdjT-SgVl6r", "fillStyle": "hachure", @@ -858,14 +858,14 @@ "y": 216.8515625, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 128, + "width": 127.57986450195312, "height": 25, "seed": 276931526, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -880,8 +880,8 @@ }, { "type": "text", - "version": 200, - "versionNonce": 412973233, + "version": 207, + "versionNonce": 1753802853, "isDeleted": false, "id": "I00FPxjJzkybs748xvxYQ", "fillStyle": "hachure", @@ -894,14 +894,14 @@ "y": 210.4375, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 10, + "width": 10.319992065429688, "height": 25, "seed": 654279366, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135037, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -916,8 +916,8 @@ }, { "type": "text", - "version": 116, - "versionNonce": 1687709407, + "version": 125, + "versionNonce": 247892555, "isDeleted": false, "id": "MNcWXxi6VbZaulu3K670q", "fillStyle": "hachure", @@ -926,34 +926,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 901.361328125, + "x": 902.5613327026367, "y": 215.78125, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 89, + "width": 86.77992248535156, "height": 75, "seed": 1687297177, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135038, + "updated": 1705598138238, "link": null, "locked": false, "fontSize": 20, "fontFamily": 1, - "text": "Itinarary\nList\nFilter", + "text": "Itinerary\nList\nFilter", "textAlign": "center", "verticalAlign": "middle", "containerId": null, - "originalText": "Itinarary\nList\nFilter", + "originalText": "Itinerary\nList\nFilter", "lineHeight": 1.25, "baseline": 68 }, { "type": "rectangle", - "version": 496, - "versionNonce": 481114769, + "version": 500, + "versionNonce": 41456581, "isDeleted": false, "id": "gL_hDnXZ2lRjaViYaG2rV", "fillStyle": "hachure", @@ -978,14 +978,14 @@ "id": "hhODwDUSnKDNHxeWgdBRh" } ], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "line", - "version": 120, - "versionNonce": 1002844927, + "version": 124, + "versionNonce": 1843345163, "isDeleted": false, "id": "gF_BvGrwKBQV_s0LLt7II", "fillStyle": "hachure", @@ -1007,7 +1007,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": null, @@ -1028,8 +1028,8 @@ }, { "type": "line", - "version": 90, - "versionNonce": 1898561649, + "version": 94, + "versionNonce": 1276891941, "isDeleted": false, "id": "6V31n7Wzh9bRD4MWf72QE", "fillStyle": "hachure", @@ -1051,7 +1051,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": null, @@ -1072,8 +1072,8 @@ }, { "type": "line", - "version": 152, - "versionNonce": 1604680479, + "version": 156, + "versionNonce": 1922702763, "isDeleted": false, "id": "jItuiRV-cqbnZuN1BUg5k", "fillStyle": "hachure", @@ -1095,7 +1095,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": null, @@ -1116,8 +1116,8 @@ }, { "type": "line", - "version": 123, - "versionNonce": 1943702097, + "version": 127, + "versionNonce": 836773509, "isDeleted": false, "id": "YXFr7rhGIICmJAWKZ5eUK", "fillStyle": "hachure", @@ -1139,7 +1139,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false, "startBinding": null, @@ -1160,8 +1160,8 @@ }, { "type": "rectangle", - "version": 356, - "versionNonce": 883343167, + "version": 360, + "versionNonce": 2021601355, "isDeleted": false, "id": "M76RD0PeJrkYP9LuS_Kxu", "fillStyle": "hachure", @@ -1186,14 +1186,14 @@ "id": "uTKhXBXl80XXPjGsftdJa" } ], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "rectangle", - "version": 133, - "versionNonce": 1570183217, + "version": 137, + "versionNonce": 914558437, "isDeleted": false, "id": "NLnBzR8OLk5gbeRQGwI9f", "fillStyle": "hachure", @@ -1218,14 +1218,14 @@ "id": "i6hMn3CPVbRxyPcniV7yb" } ], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false }, { "type": "text", - "version": 80, - "versionNonce": 448341841, + "version": 86, + "versionNonce": 828960491, "isDeleted": false, "id": "QxjDVUdnC9uReskEwKjsd", "fillStyle": "hachure", @@ -1250,7 +1250,7 @@ "type": "arrow" } ], - "updated": 1704982138417, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -1265,8 +1265,8 @@ }, { "type": "text", - "version": 80, - "versionNonce": 1615260177, + "version": 86, + "versionNonce": 689047877, "isDeleted": false, "id": "zcbS0wgQbYVDRmrAUTDaV", "fillStyle": "hachure", @@ -1286,7 +1286,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135038, + "updated": 1705593960293, "link": null, "locked": false, "fontSize": 20, @@ -1301,8 +1301,8 @@ }, { "type": "rectangle", - "version": 226, - "versionNonce": 832812785, + "version": 230, + "versionNonce": 803330443, "isDeleted": false, "id": "sVoxOi_goA0Vz9JvN_EuG", "fillStyle": "hachure", @@ -1327,14 +1327,14 @@ "type": "arrow" } ], - "updated": 1704982142587, + "updated": 1705593960294, "link": null, "locked": false }, { "type": "text", - "version": 72, - "versionNonce": 81887217, + "version": 79, + "versionNonce": 451582117, "isDeleted": false, "id": "5bXiMRSAbkBVDNzuMHYjg", "fillStyle": "hachure", @@ -1347,14 +1347,14 @@ "y": 500.25, "strokeColor": "#000000", "backgroundColor": "transparent", - "width": 119, + "width": 118.83987426757812, "height": 25, "seed": 926646726, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982135038, + "updated": 1705593960294, "link": null, "locked": false, "fontSize": 20, @@ -1369,8 +1369,8 @@ }, { "type": "line", - "version": 155, - "versionNonce": 1407939487, + "version": 159, + "versionNonce": 1361342507, "isDeleted": false, "id": "Ugnzj7K6hXFkke4frMlUY", "fillStyle": "hachure", @@ -1392,7 +1392,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982135038, + "updated": 1705593960294, "link": null, "locked": false, "startBinding": null, @@ -1413,8 +1413,8 @@ }, { "type": "text", - "version": 681, - "versionNonce": 1609777361, + "version": 687, + "versionNonce": 364526597, "isDeleted": false, "id": "5pmOYWhziuLQ_DZANfOzI", "fillStyle": "hachure", @@ -1434,7 +1434,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982452010, + "updated": 1705593960294, "link": null, "locked": false, "fontSize": 19.409722222222214, @@ -1449,8 +1449,8 @@ }, { "type": "ellipse", - "version": 377, - "versionNonce": 1136001105, + "version": 381, + "versionNonce": 1729835723, "isDeleted": false, "id": "-Wb1113k5o16q_0IwIAB8", "fillStyle": "hachure", @@ -1475,14 +1475,14 @@ "id": "3FvznihDEqVpPp0WjjZ26" } ], - "updated": 1704982236097, + "updated": 1705593960294, "link": null, "locked": false }, { "type": "arrow", - "version": 907, - "versionNonce": 1010622481, + "version": 911, + "versionNonce": 293499749, "isDeleted": false, "id": "3FvznihDEqVpPp0WjjZ26", "fillStyle": "hachure", @@ -1504,7 +1504,7 @@ "type": 2 }, "boundElements": [], - "updated": 1704982236097, + "updated": 1705593960294, "link": null, "locked": false, "startBinding": { @@ -1533,8 +1533,8 @@ }, { "type": "text", - "version": 396, - "versionNonce": 8009937, + "version": 402, + "versionNonce": 576758123, "isDeleted": false, "id": "mO-wquP1JTkteitq9b6D4", "fillStyle": "hachure", @@ -1554,7 +1554,7 @@ "frameId": null, "roundness": null, "boundElements": [], - "updated": 1704982474848, + "updated": 1705593960294, "link": null, "locked": false, "fontSize": 20, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg index 087866ea971..6cf23afb7a3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/images/ItineraryListFilterChain.svg @@ -18,4 +18,4 @@ - Comparator<Itinerary>ItineraryListFilterChain*GroupByFilter<GroupId>nestedFilters*ItinararyListFilterDecorateFilterRemoveFilterSortingFilterRemoveItineraryFlagger---name()shouldBeFlaggedForRemoval()skipAlreadyFlaggedItineraries()ItineraryDecorator---decorate(Itinerary) \ No newline at end of file + Comparator<Itinerary>ItineraryListFilterChain*GroupByFilter<GroupId>nestedFilters*ItineraryListFilterDecorateFilterRemoveFilterSortingFilterRemoveItineraryFlagger---name()shouldBeFlaggedForRemoval()skipAlreadyFlaggedItineraries()ItineraryDecorator---decorate(Itinerary) \ No newline at end of file From 88955a789e8e21e73e760722a833849b9fe63a98 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 18 Jan 2024 19:19:40 +0100 Subject: [PATCH 0328/1688] Fix computation of accessibility score [ci skip] --- .../ext/accessibilityscore/AccessibilityScoreFilter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java b/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java index 46862b020d5..d31d30e29fa 100644 --- a/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java +++ b/src/ext/java/org/opentripplanner/ext/accessibilityscore/AccessibilityScoreFilter.java @@ -37,7 +37,7 @@ public static Float compute(List legs) { public static float compute(ScheduledTransitLeg leg) { var fromStop = leg.getFrom().stop.getWheelchairAccessibility(); - var toStop = leg.getFrom().stop.getWheelchairAccessibility(); + var toStop = leg.getTo().stop.getWheelchairAccessibility(); var trip = leg.getTripWheelchairAccessibility(); var values = List.of(trip, fromStop, toStop); From dcd0a5e4ae927a7b8e8c2a1513e3660d96ad8393 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 18 Jan 2024 20:52:15 +0000 Subject: [PATCH 0329/1688] Add changelog entry for #5582 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 4af1393c748..97561c64ec2 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -76,6 +76,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add stop layer to new Debug UI [#5602](https://github.com/opentripplanner/OpenTripPlanner/pull/5602) - Use fallback timezone if no transit data is loaded [#4652](https://github.com/opentripplanner/OpenTripPlanner/pull/4652) - Add new path for GTFS GraphQL API, remove batch feature [#5581](https://github.com/opentripplanner/OpenTripPlanner/pull/5581) +- Restructure walk/bicycle/car preferences in router-config.json [#5582](https://github.com/opentripplanner/OpenTripPlanner/pull/5582) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 1832b6740b3c507144d3f928650647db5f5710bd Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Thu, 18 Jan 2024 20:52:38 +0000 Subject: [PATCH 0330/1688] Bump serialization version id for #5582 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c3f7392bb42..34b5a9c7d79 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 136 + 137 30.1 2.50 From 86cffd6d492c61f42dba31f3ec9b91a1be0ee412 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 18 Jan 2024 20:53:22 +0000 Subject: [PATCH 0331/1688] Add changelog entry for #5629 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 97561c64ec2..6f27f60d947 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -77,6 +77,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Use fallback timezone if no transit data is loaded [#4652](https://github.com/opentripplanner/OpenTripPlanner/pull/4652) - Add new path for GTFS GraphQL API, remove batch feature [#5581](https://github.com/opentripplanner/OpenTripPlanner/pull/5581) - Restructure walk/bicycle/car preferences in router-config.json [#5582](https://github.com/opentripplanner/OpenTripPlanner/pull/5582) +- Revert REST API spelling change of real-time [#5629](https://github.com/opentripplanner/OpenTripPlanner/pull/5629) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 323df422b8b29f639887857dbee8600122951ddc Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 00:05:13 +0000 Subject: [PATCH 0332/1688] Update dependency com.hubspot.maven.plugins:prettier-maven-plugin to v0.22 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34b5a9c7d79..34f4365b580 100644 --- a/pom.xml +++ b/pom.xml @@ -78,7 +78,7 @@ When running `mvn jacoco:prepare-agent test` argLine is replaced with the one activating the agent. --> - 0.21 + 0.22 write From b7f02fc9a6f9c9c4fc6e491f98b2a4da831b124d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 19 Jan 2024 10:20:27 +0100 Subject: [PATCH 0333/1688] Update docs --- docs/sandbox/MapboxVectorTilesApi.md | 9 +++++---- .../standalone/config/routerconfig/VectorTileConfig.java | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index cfb9a634129..92cd867ecce 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -169,11 +169,12 @@ The path of the vector tile source URLs in `tilejson.json`. This is useful if you have a proxy setup and rewrite the path that is passed to OTP. If you don't configure this optional value then the path returned in `tilejson.json` is -`/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you set a value of -`/otp_test/tiles` then the returned path changes to `/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. +`/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you, for example, set +a value of `/otp_test/tiles` then the returned path changes to +`/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. -The protocol and host are read from the incoming HTTP request. If you run OTP behind a proxy -then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP +The protocol and host are always read from the incoming HTTP request. If you run OTP behind +a proxy then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP return the protocol and host for the original request and not the proxied one. diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index 67fd2496e3c..0abc046282d 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -58,11 +58,12 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String This is useful if you have a proxy setup and rewrite the path that is passed to OTP. If you don't configure this optional value then the path returned in `tilejson.json` is - `/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you set a value of - `/otp_test/tiles` then the returned path changes to `/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. + `/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you, for example, set + a value of `/otp_test/tiles` then the returned path changes to + `/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. - The protocol and host are read from the incoming HTTP request. If you run OTP behind a proxy - then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP + The protocol and host are always read from the incoming HTTP request. If you run OTP behind + a proxy then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP return the protocol and host for the original request and not the proxied one. """ ) From e140b3ebfae764548bbc2f08f5f0cbd16ec6fdfb Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 19 Jan 2024 14:43:30 +0200 Subject: [PATCH 0334/1688] Remove scooter walking --- .../opentripplanner/apis/gtfs/schema.graphqls | 35 ++----------------- 1 file changed, 3 insertions(+), 32 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 5281632629a..005f6854c28 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -2619,7 +2619,7 @@ enum PlanAccessMode { vehicles which are not linked to a rental station. Note, if there are no rental options available, access will include only walking. Also, this can include walking before picking up or after dropping off the - scooter or when it's needed to walk the scooter. + scooter. """ SCOOTER_RENTAL @@ -2687,7 +2687,7 @@ enum PlanDirectMode { vehicles which are not linked to a rental station. Note, if there are no rental options available, itinerary will include only walking. Also, this can include walking before picking up or after dropping off the - scooter or when it's needed to walk the scooter. + scooter. """ SCOOTER_RENTAL @@ -2745,7 +2745,7 @@ enum PlanEgressMode { vehicles which are not linked to a rental station. Note, if there are no rental options available, egress will include only walking. Also, this can include walking before picking up or after dropping off the - scooter or when it's needed to walk the scooter. + scooter. """ SCOOTER_RENTAL @@ -4631,11 +4631,6 @@ input ScooterPreferencesInput { """ reluctance: Reluctance - """ - Walking preferences when walking a scooter. - """ - walk: ScooterWalkPreferencesInput - """ Maximum speed on flat ground while riding a scooter. Note, this speed is higher than the average speed will be in itineraries as this is the maximum speed but there are @@ -5479,30 +5474,6 @@ input BicycleWalkPreferencesInput { hopTime: Duration } -""" -Preferences for walking a scooter. -""" -input ScooterWalkPreferencesInput { - """ - Maximum walk speed on flat ground. Note, this speed is higher than the average speed - will be in itineraries as this is the maximum speed but there are - factors that slow down walking such as crossings, intersections and elevation changes. - """ - speed: Speed - - """ - Costs related to walking a scooter. - """ - cost: ScooterWalkPreferencesCostInput - - """" - How long it takes to hop on or off a scooter when switching to walking the scooter - or when getting on the scooter again. However, this is not applied when getting - on a rented scooter for the first time or off the scooter when returning the scooter. - """ - hopTime: Duration -} - """ Costs related to walking a bicycle. """ From a65ff0d69c671480157eca8c0a547a84acf4fb00 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 18 Dec 2023 17:30:07 +0200 Subject: [PATCH 0335/1688] Introduce vehicle walking preferences --- .../ext/restapi/resources/RequestToPreferencesMapper.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index bfac498ff8c..30f834ae0bd 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -70,7 +70,6 @@ private void mapBike() { setIfNotNull( req.bikeOptimizeType, optimizeType -> bike.withOptimizeType(LegacyBicycleOptimizeType.map(optimizeType)) - ); if (req.bikeOptimizeType == LegacyBicycleOptimizeType.TRIANGLE) { bike.withOptimizeTriangle(triangle -> { From 5efaaf786eb855c7cea970e41b0bbffe45e9ba2f Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 4 Jan 2024 11:49:35 +0200 Subject: [PATCH 0336/1688] Add scooter preferences class --- .../preference/ScooterPreferences.java | 221 ++++++++++++++++++ .../preference/ScooterPreferencesTest.java | 99 ++++++++ 2 files changed, 320 insertions(+) create mode 100644 src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java create mode 100644 src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java new file mode 100644 index 00000000000..a6a878424a6 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java @@ -0,0 +1,221 @@ +package org.opentripplanner.routing.api.request.preference; + +import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; +import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; +import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE_STREETS; +import static org.opentripplanner.routing.core.BicycleOptimizeType.TRIANGLE; + +import java.io.Serializable; +import java.util.Objects; +import java.util.function.Consumer; +import org.opentripplanner.framework.model.Units; +import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.routing.core.BicycleOptimizeType; + +/** + * The scooter preferences contain all speed, reluctance, cost and factor preferences for scooter + * related to street and transit routing. The values are normalized(rounded) so the class can used + * as a cache key. + * + * Scooter rental is only supported currently. + *

      + * THIS CLASS IS IMMUTABLE AND THREAD-SAFE. + */ +public final class ScooterPreferences implements Serializable { + + public static final ScooterPreferences DEFAULT = new ScooterPreferences(); + + private final double speed; + private final double reluctance; + private final VehicleRentalPreferences rental; + private final BicycleOptimizeType optimizeType; + private final TimeSlopeSafetyTriangle optimizeTriangle; + private final VehicleWalkingPreferences walking; + + private ScooterPreferences() { + this.speed = 5; + this.reluctance = 2.0; + this.rental = VehicleRentalPreferences.DEFAULT; + this.optimizeType = SAFE_STREETS; + this.optimizeTriangle = TimeSlopeSafetyTriangle.DEFAULT; + this.walking = VehicleWalkingPreferences.DEFAULT; + } + + private ScooterPreferences(Builder builder) { + this.speed = Units.speed(builder.speed); + this.reluctance = Units.reluctance(builder.reluctance); + this.rental = builder.rental; + this.optimizeType = Objects.requireNonNull(builder.optimizeType); + this.optimizeTriangle = Objects.requireNonNull(builder.optimizeTriangle); + this.walking = builder.walking; + } + + public static ScooterPreferences.Builder of() { + return new Builder(DEFAULT); + } + + public ScooterPreferences.Builder copyOf() { + return new Builder(this); + } + + /** + * Default: 5 m/s, ~11 mph, a random scooter speed + */ + public double speed() { + return speed; + } + + public double reluctance() { + return reluctance; + } + + /** Rental preferences that can be different per request */ + public VehicleRentalPreferences rental() { + return rental; + } + + /** + * The set of characteristics that the user wants to optimize for -- defaults to SAFE_STREETS. + */ + public BicycleOptimizeType optimizeType() { + return optimizeType; + } + + public TimeSlopeSafetyTriangle optimizeTriangle() { + return optimizeTriangle; + } + + /** Scooter walking preferences that can be different per request */ + public VehicleWalkingPreferences walking() { + return walking; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + ScooterPreferences that = (ScooterPreferences) o; + return ( + doubleEquals(that.speed, speed) && + doubleEquals(that.reluctance, reluctance) && + Objects.equals(rental, that.rental) && + optimizeType == that.optimizeType && + optimizeTriangle.equals(that.optimizeTriangle) && + Objects.equals(walking, that.walking) + ); + } + + @Override + public int hashCode() { + return Objects.hash(speed, reluctance, rental, optimizeType, optimizeTriangle, walking); + } + + @Override + public String toString() { + return ToStringBuilder + .of(ScooterPreferences.class) + .addNum("speed", speed, DEFAULT.speed) + .addNum("reluctance", reluctance, DEFAULT.reluctance) + .addObj("rental", rental, DEFAULT.rental) + .addEnum("optimizeType", optimizeType, DEFAULT.optimizeType) + .addObj("optimizeTriangle", optimizeTriangle, DEFAULT.optimizeTriangle) + .addObj("walking", walking, DEFAULT.walking) + .toString(); + } + + @SuppressWarnings("UnusedReturnValue") + public static class Builder { + + private final ScooterPreferences original; + private double speed; + private double reluctance; + private VehicleRentalPreferences rental; + private BicycleOptimizeType optimizeType; + private TimeSlopeSafetyTriangle optimizeTriangle; + + public VehicleWalkingPreferences walking; + + public Builder(ScooterPreferences original) { + this.original = original; + this.speed = original.speed; + this.reluctance = original.reluctance; + this.rental = original.rental; + this.optimizeType = original.optimizeType; + this.optimizeTriangle = original.optimizeTriangle; + this.walking = original.walking; + } + + public ScooterPreferences original() { + return original; + } + + public double speed() { + return speed; + } + + public Builder withSpeed(double speed) { + this.speed = speed; + return this; + } + + public double reluctance() { + return reluctance; + } + + public Builder withReluctance(double reluctance) { + this.reluctance = reluctance; + return this; + } + + public Builder withRental(Consumer body) { + this.rental = ifNotNull(this.rental, original.rental).copyOf().apply(body).build(); + return this; + } + + public BicycleOptimizeType optimizeType() { + return optimizeType; + } + + public Builder withOptimizeType(BicycleOptimizeType optimizeType) { + this.optimizeType = optimizeType; + return this; + } + + public TimeSlopeSafetyTriangle optimizeTriangle() { + return optimizeTriangle; + } + + /** This also sets the optimization type as TRIANGLE if triangle parameters are defined */ + public Builder withForcedOptimizeTriangle(Consumer body) { + var builder = TimeSlopeSafetyTriangle.of(); + body.accept(builder); + this.optimizeTriangle = builder.buildOrDefault(this.optimizeTriangle); + if (!builder.isEmpty()) { + this.optimizeType = TRIANGLE; + } + return this; + } + + public Builder withOptimizeTriangle(Consumer body) { + var builder = TimeSlopeSafetyTriangle.of(); + body.accept(builder); + this.optimizeTriangle = builder.buildOrDefault(this.optimizeTriangle); + return this; + } + + public Builder withWalking(Consumer body) { + this.walking = ifNotNull(this.walking, original.walking).copyOf().apply(body).build(); + return this; + } + + public Builder apply(Consumer body) { + body.accept(this); + return this; + } + + public ScooterPreferences build() { + var value = new ScooterPreferences(this); + return original.equals(value) ? original : value; + } + } +} diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java new file mode 100644 index 00000000000..11ec7f3be79 --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java @@ -0,0 +1,99 @@ +package org.opentripplanner.routing.api.request.preference; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.opentripplanner.routing.api.request.preference.ImmutablePreferencesAsserts.assertEqualsAndHashCode; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.routing.core.BicycleOptimizeType; + +class ScooterPreferencesTest { + + public static final double SPEED = 2.0; + public static final double RELUCTANCE = 1.2; + public static final TimeSlopeSafetyTriangle TRIANGLE = TimeSlopeSafetyTriangle + .of() + .withSlope(1) + .build(); + public static final BicycleOptimizeType OPTIMIZE_TYPE = BicycleOptimizeType.TRIANGLE; + + private final ScooterPreferences subject = ScooterPreferences + .of() + .withSpeed(SPEED) + .withReluctance(RELUCTANCE) + .withOptimizeType(OPTIMIZE_TYPE) + .withOptimizeTriangle(it -> it.withSlope(1).build()) + .build(); + + @Test + void speed() { + assertEquals(SPEED, subject.speed()); + } + + @Test + void reluctance() { + assertEquals(RELUCTANCE, subject.reluctance()); + } + + @Test + void optimizeType() { + assertEquals(OPTIMIZE_TYPE, subject.optimizeType()); + } + + @Test + void optimizeTriangle() { + assertEquals(TRIANGLE, subject.optimizeTriangle()); + } + + @Test + void testOfAndCopyOf() { + // Return same object if no value is set + assertSame(ScooterPreferences.DEFAULT, ScooterPreferences.of().build()); + assertSame(subject, subject.copyOf().build()); + } + + @Test + void testCopyOfEqualsAndHashCode() { + // Create a copy, make a change and set it back again to force creating a new object + var other = subject.copyOf().withSpeed(0.7).build(); + var same = other.copyOf().withSpeed(SPEED).build(); + assertEqualsAndHashCode(subject, other, same); + } + + @Test + void testToString() { + assertEquals("ScooterPreferences{}", ScooterPreferences.DEFAULT.toString()); + assertEquals( + "ScooterPreferences{" + + "speed: 2.0, " + + "reluctance: 1.2, " + + "optimizeType: TRIANGLE, " + + "optimizeTriangle: TimeSlopeSafetyTriangle[time=0.0, slope=1.0, safety=0.0]" + + "}", + subject.toString() + ); + } + + @Test + void testForcedTriangleOptimization() { + var trianglePreferences = ScooterPreferences + .of() + .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) + .build(); + assertEquals(BicycleOptimizeType.TRIANGLE, trianglePreferences.optimizeType()); + + var conflictingPreferences = ScooterPreferences + .of() + .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) + .build(); + assertEquals(BicycleOptimizeType.TRIANGLE, conflictingPreferences.optimizeType()); + + var emptyTrianglePreferences = ScooterPreferences + .of() + .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withForcedOptimizeTriangle(it -> it.build()) + .build(); + assertEquals(BicycleOptimizeType.SAFE_STREETS, emptyTrianglePreferences.optimizeType()); + } +} From 04b87514467e07829c561562598f93379313dc2d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 4 Jan 2024 12:02:25 +0200 Subject: [PATCH 0337/1688] Rename optimization type and update comments --- .../mapping/LegacyBicycleOptimizeType.java | 24 ------------------ .../resources/RequestToPreferencesMapper.java | 7 +++--- .../restapi/resources/RoutingResource.java | 10 +++----- .../LegacyVehicleRoutingOptimizeType.java | 25 +++++++++++++++++++ .../gtfs/mapping/OptimizationTypeMapper.java | 14 +++++------ .../apis/gtfs/mapping/RouteRequestMapper.java | 4 +-- .../preferences/BikePreferencesMapper.java | 4 +-- .../apis/transmodel/model/EnumTypes.java | 12 ++++----- .../apis/transmodel/model/plan/TripQuery.java | 7 ++++-- .../request/preference/BikePreferences.java | 16 ++++++------ .../preference/ScooterPreferences.java | 16 ++++++------ .../preference/TimeSlopeSafetyTriangle.java | 17 +++++++------ ...e.java => VehicleRoutingOptimizeType.java} | 12 ++++----- .../visualizer/GraphVisualizer.java | 14 +++++------ .../gtfs/mapping/RouteRequestMapperTest.java | 4 +-- .../mapping/TripRequestMapperTest.java | 12 ++++----- .../BikePreferencesMapperTest.java | 6 ++--- .../mapping/ElevationSnapshotTest.java | 4 +-- .../preference/BikePreferencesTest.java | 15 +++++------ .../preference/ScooterPreferencesTest.java | 15 +++++------ .../integration/BicycleRoutingTest.java | 4 +-- .../street/model/edge/StreetEdgeTest.java | 4 +-- 22 files changed, 126 insertions(+), 120 deletions(-) delete mode 100644 src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyBicycleOptimizeType.java create mode 100644 src/main/java/org/opentripplanner/api/mapping/LegacyVehicleRoutingOptimizeType.java rename src/main/java/org/opentripplanner/routing/core/{BicycleOptimizeType.java => VehicleRoutingOptimizeType.java} (52%) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyBicycleOptimizeType.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyBicycleOptimizeType.java deleted file mode 100644 index ff50a03534b..00000000000 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyBicycleOptimizeType.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.opentripplanner.ext.restapi.mapping; - -import org.opentripplanner.routing.core.BicycleOptimizeType; - -/** - * Bicycle optimization types that are only meant to be used by the REST API. Related to {@link org.opentripplanner.routing.core.BicycleOptimizeType} - */ -public enum LegacyBicycleOptimizeType { - QUICK, - SAFE, - FLAT, - GREENWAYS, - TRIANGLE; - - public static BicycleOptimizeType map(LegacyBicycleOptimizeType type) { - return switch (type) { - case QUICK -> BicycleOptimizeType.SHORTEST_DURATION; - case FLAT -> BicycleOptimizeType.FLAT_STREETS; - case SAFE -> BicycleOptimizeType.SAFE_STREETS; - case GREENWAYS -> BicycleOptimizeType.SAFEST_STREETS; - case TRIANGLE -> BicycleOptimizeType.TRIANGLE; - }; - } -} diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index 30f834ae0bd..2208ec13a14 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -2,7 +2,7 @@ import jakarta.validation.constraints.NotNull; import java.util.function.Consumer; -import org.opentripplanner.ext.restapi.mapping.LegacyBicycleOptimizeType; +import org.opentripplanner.api.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; @@ -69,9 +69,10 @@ private void mapBike() { setIfNotNull(req.bikeBoardCost, bike::withBoardCost); setIfNotNull( req.bikeOptimizeType, - optimizeType -> bike.withOptimizeType(LegacyBicycleOptimizeType.map(optimizeType)) + optimizeType -> bike.withOptimizeType(LegacyVehicleRoutingOptimizeType.map(optimizeType)) + ); - if (req.bikeOptimizeType == LegacyBicycleOptimizeType.TRIANGLE) { + if (req.bikeOptimizeType == LegacyVehicleRoutingOptimizeType.TRIANGLE) { bike.withOptimizeTriangle(triangle -> { setIfNotNull(req.triangleTimeFactor, triangle::withTime); setIfNotNull(req.triangleSlopeFactor, triangle::withSlope); diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java index 1c234e3ff9e..53464940a9e 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java @@ -18,9 +18,9 @@ import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; +import org.opentripplanner.api.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.ext.dataoverlay.api.DataOverlayParameters; -import org.opentripplanner.ext.restapi.mapping.LegacyBicycleOptimizeType; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.framework.time.DurationUtils; @@ -239,17 +239,15 @@ public abstract class RoutingResource { protected Double triangleTimeFactor; /** - * The set of characteristics that the user wants to optimize for. @See OptimizeType. + * The set of characteristics that the user wants to optimize for in bicycle and scooter routing. + * @See OptimizeType. * * @deprecated TODO OTP2 this should be completely removed and done only with individual cost * parameters - * Also: apparently OptimizeType only affects BICYCLE mode traversal of - * street segments. If this is the case it should be very well - * documented and carried over into the Enum name. */ @Deprecated @QueryParam("optimize") - protected LegacyBicycleOptimizeType bikeOptimizeType; + protected LegacyVehicleRoutingOptimizeType bikeOptimizeType; /** * The set of modes that a user is willing to use, with qualifiers stating whether vehicles should diff --git a/src/main/java/org/opentripplanner/api/mapping/LegacyVehicleRoutingOptimizeType.java b/src/main/java/org/opentripplanner/api/mapping/LegacyVehicleRoutingOptimizeType.java new file mode 100644 index 00000000000..0cb2ae38bcc --- /dev/null +++ b/src/main/java/org/opentripplanner/api/mapping/LegacyVehicleRoutingOptimizeType.java @@ -0,0 +1,25 @@ +package org.opentripplanner.api.mapping; + +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; + +/** + * Bicycle and scooter optimization types that are only meant to be used by the REST API. Related to + * {@link VehicleRoutingOptimizeType} + */ +public enum LegacyVehicleRoutingOptimizeType { + QUICK, + SAFE, + FLAT, + GREENWAYS, + TRIANGLE; + + public static VehicleRoutingOptimizeType map(LegacyVehicleRoutingOptimizeType type) { + return switch (type) { + case QUICK -> VehicleRoutingOptimizeType.SHORTEST_DURATION; + case FLAT -> VehicleRoutingOptimizeType.FLAT_STREETS; + case SAFE -> VehicleRoutingOptimizeType.SAFE_STREETS; + case GREENWAYS -> VehicleRoutingOptimizeType.SAFEST_STREETS; + case TRIANGLE -> VehicleRoutingOptimizeType.TRIANGLE; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java index 1f53652f7b7..7f4f5200256 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java @@ -2,18 +2,18 @@ import javax.annotation.Nonnull; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; public final class OptimizationTypeMapper { @Nonnull - public static BicycleOptimizeType map(GraphQLTypes.GraphQLOptimizeType optimizeType) { + public static VehicleRoutingOptimizeType map(GraphQLTypes.GraphQLOptimizeType optimizeType) { return switch (optimizeType) { - case QUICK -> BicycleOptimizeType.SHORTEST_DURATION; - case FLAT -> BicycleOptimizeType.FLAT_STREETS; - case SAFE -> BicycleOptimizeType.SAFE_STREETS; - case GREENWAYS -> BicycleOptimizeType.SAFEST_STREETS; - case TRIANGLE -> BicycleOptimizeType.TRIANGLE; + case QUICK -> VehicleRoutingOptimizeType.SHORTEST_DURATION; + case FLAT -> VehicleRoutingOptimizeType.FLAT_STREETS; + case SAFE -> VehicleRoutingOptimizeType.SAFE_STREETS; + case GREENWAYS -> VehicleRoutingOptimizeType.SAFEST_STREETS; + case TRIANGLE -> VehicleRoutingOptimizeType.TRIANGLE; }; } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 212bfbcf380..5cdae33850f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -28,7 +28,7 @@ import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; @@ -79,7 +79,7 @@ public static RouteRequest toRouteRequest( ) ); } - if (bike.optimizeType() == BicycleOptimizeType.TRIANGLE) { + if (bike.optimizeType() == VehicleRoutingOptimizeType.TRIANGLE) { bike.withOptimizeTriangle(triangle -> { callWith.argument("triangle.timeFactor", triangle::withTime); callWith.argument("triangle.slopeFactor", triangle::withSlope); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java index 1179c034e93..76826d31e2d 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapper.java @@ -4,7 +4,7 @@ import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator; import org.opentripplanner.routing.api.request.preference.BikePreferences; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; public class BikePreferencesMapper { @@ -37,7 +37,7 @@ public static void mapBikePreferences( // bike.withWalkingReluctance(WALK_BIKE_RELATIVE_RELUCTANCE * (double)r ); //}); - if (bike.optimizeType() == BicycleOptimizeType.TRIANGLE) { + if (bike.optimizeType() == VehicleRoutingOptimizeType.TRIANGLE) { bike.withOptimizeTriangle(triangle -> { callWith.argument("triangleFactors.time", triangle::withTime); callWith.argument("triangleFactors.slope", triangle::withSlope); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java index e2897d868c9..b85d4ce19b9 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java @@ -17,7 +17,7 @@ import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.api.response.InputField; import org.opentripplanner.routing.api.response.RoutingErrorCode; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.stoptimes.ArrivalDeparture; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model.basic.Accessibility; @@ -64,11 +64,11 @@ public class EnumTypes { public static final GraphQLEnumType BICYCLE_OPTIMISATION_METHOD = GraphQLEnumType .newEnum() .name("BicycleOptimisationMethod") - .value("quick", BicycleOptimizeType.SHORTEST_DURATION) - .value("safe", BicycleOptimizeType.SAFE_STREETS) - .value("flat", BicycleOptimizeType.FLAT_STREETS) - .value("greenways", BicycleOptimizeType.SAFEST_STREETS) - .value("triangle", BicycleOptimizeType.TRIANGLE) + .value("quick", VehicleRoutingOptimizeType.SHORTEST_DURATION) + .value("safe", VehicleRoutingOptimizeType.SAFE_STREETS) + .value("flat", VehicleRoutingOptimizeType.FLAT_STREETS) + .value("greenways", VehicleRoutingOptimizeType.SAFEST_STREETS) + .value("triangle", VehicleRoutingOptimizeType.TRIANGLE) .build(); public static final GraphQLEnumType BIKES_ALLOWED = GraphQLEnumType diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index abeeb187342..bf34d9928e4 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -20,7 +20,7 @@ import org.opentripplanner.apis.transmodel.model.framework.PenaltyForStreetModeType; import org.opentripplanner.apis.transmodel.support.GqlUtil; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; public class TripQuery { @@ -371,7 +371,10 @@ public static GraphQLFieldDefinition create( "When setting the " + EnumTypes.BICYCLE_OPTIMISATION_METHOD.getName() + " to '" + - enumValAsString(EnumTypes.BICYCLE_OPTIMISATION_METHOD, BicycleOptimizeType.TRIANGLE) + + enumValAsString( + EnumTypes.BICYCLE_OPTIMISATION_METHOD, + VehicleRoutingOptimizeType.TRIANGLE + ) + "', use these values to tell the routing engine how important each of the factors is compared to the others. All values should add up to 1." ) .type(TriangleFactorsInputType.INPUT_TYPE) diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java index 26da1476b38..5767b74eaa8 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/BikePreferences.java @@ -2,8 +2,8 @@ import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; -import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE_STREETS; -import static org.opentripplanner.routing.core.BicycleOptimizeType.TRIANGLE; +import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.SAFE_STREETS; +import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.TRIANGLE; import java.io.Serializable; import java.util.Objects; @@ -11,7 +11,7 @@ import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; import org.opentripplanner.framework.tostring.ToStringBuilder; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; /** * The bike preferences contain all speed, reluctance, cost and factor preferences for biking @@ -29,7 +29,7 @@ public final class BikePreferences implements Serializable { private final Cost boardCost; private final VehicleParkingPreferences parking; private final VehicleRentalPreferences rental; - private final BicycleOptimizeType optimizeType; + private final VehicleRoutingOptimizeType optimizeType; private final TimeSlopeSafetyTriangle optimizeTriangle; private final VehicleWalkingPreferences walking; @@ -96,7 +96,7 @@ public VehicleRentalPreferences rental() { /** * The set of characteristics that the user wants to optimize for -- defaults to SAFE_STREETS. */ - public BicycleOptimizeType optimizeType() { + public VehicleRoutingOptimizeType optimizeType() { return optimizeType; } @@ -164,7 +164,7 @@ public static class Builder { private Cost boardCost; private VehicleParkingPreferences parking; private VehicleRentalPreferences rental; - private BicycleOptimizeType optimizeType; + private VehicleRoutingOptimizeType optimizeType; private TimeSlopeSafetyTriangle optimizeTriangle; private VehicleWalkingPreferences walking; @@ -221,11 +221,11 @@ public Builder withRental(Consumer body) { return this; } - public BicycleOptimizeType optimizeType() { + public VehicleRoutingOptimizeType optimizeType() { return optimizeType; } - public Builder withOptimizeType(BicycleOptimizeType optimizeType) { + public Builder withOptimizeType(VehicleRoutingOptimizeType optimizeType) { this.optimizeType = optimizeType; return this; } diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java index a6a878424a6..10b9c01e686 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java @@ -2,15 +2,15 @@ import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; import static org.opentripplanner.framework.lang.ObjectUtils.ifNotNull; -import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE_STREETS; -import static org.opentripplanner.routing.core.BicycleOptimizeType.TRIANGLE; +import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.SAFE_STREETS; +import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.TRIANGLE; import java.io.Serializable; import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Units; import org.opentripplanner.framework.tostring.ToStringBuilder; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; /** * The scooter preferences contain all speed, reluctance, cost and factor preferences for scooter @@ -28,7 +28,7 @@ public final class ScooterPreferences implements Serializable { private final double speed; private final double reluctance; private final VehicleRentalPreferences rental; - private final BicycleOptimizeType optimizeType; + private final VehicleRoutingOptimizeType optimizeType; private final TimeSlopeSafetyTriangle optimizeTriangle; private final VehicleWalkingPreferences walking; @@ -77,7 +77,7 @@ public VehicleRentalPreferences rental() { /** * The set of characteristics that the user wants to optimize for -- defaults to SAFE_STREETS. */ - public BicycleOptimizeType optimizeType() { + public VehicleRoutingOptimizeType optimizeType() { return optimizeType; } @@ -130,7 +130,7 @@ public static class Builder { private double speed; private double reluctance; private VehicleRentalPreferences rental; - private BicycleOptimizeType optimizeType; + private VehicleRoutingOptimizeType optimizeType; private TimeSlopeSafetyTriangle optimizeTriangle; public VehicleWalkingPreferences walking; @@ -172,11 +172,11 @@ public Builder withRental(Consumer body) { return this; } - public BicycleOptimizeType optimizeType() { + public VehicleRoutingOptimizeType optimizeType() { return optimizeType; } - public Builder withOptimizeType(BicycleOptimizeType optimizeType) { + public Builder withOptimizeType(VehicleRoutingOptimizeType optimizeType) { this.optimizeType = optimizeType; return this; } diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java index 99925a441fd..ae4f1039f32 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangle.java @@ -4,13 +4,14 @@ import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; /** - * Sets the (bicycle) triangle routing parameters -- the relative importance of safety, flatness, - * and speed. These three fields should have values between 0 and 1, and should add up to 1. + * Sets the (bicycle or scooter) triangle routing parameters -- the relative importance of safety, + * flatness, and speed. These three fields should have values between 0 and 1, and should add up to + * 1. *

      * The constructor accepts any three numbers and will normalize them to add up to 1. {@code time} * and {@code slope} are rounded to the closest two decimal number, then - * {@code safety := 1.0 - (time + slope)}. This is done to make the rounding predictable and - * to allways add up to one. This allows this class to be used in an index of a cache. For example: + * {@code safety := 1.0 - (time + slope)}. This is done to make the rounding predictable and to + * allways add up to one. This allows this class to be used in an index of a cache. For example: * 

        *   ( 1.0, 1.0, 1.0 ) => ( time: 0.33, slope: 0.33, safety: 0.34 )
  *
      @@ -25,10 +26,10 @@ public record TimeSlopeSafetyTriangle(double time, double slope, double safety) public static final TimeSlopeSafetyTriangle DEFAULT = new TimeSlopeSafetyTriangle(1, 1, 1); /** - * Sets the bicycle triangle routing parameters -- the relative importance of safety, flatness, - * and speed. These three fields of the RouteRequest should have values between 0 and 1, and - * should add up to 1. This setter function accepts any three numbers and will normalize them to - * add up to 1. + * Sets the bicycle or scooter triangle routing parameters -- the relative importance of safety, + * flatness, and speed. These three fields of the RouteRequest should have values between 0 and 1, + * and should add up to 1. This setter function accepts any three numbers and will normalize them + * to add up to 1. */ public TimeSlopeSafetyTriangle(double time, double slope, double safety) { safety = positiveValueOrZero(safety); diff --git a/src/main/java/org/opentripplanner/routing/core/BicycleOptimizeType.java b/src/main/java/org/opentripplanner/routing/core/VehicleRoutingOptimizeType.java similarity index 52% rename from src/main/java/org/opentripplanner/routing/core/BicycleOptimizeType.java rename to src/main/java/org/opentripplanner/routing/core/VehicleRoutingOptimizeType.java index 1d639e0af8b..cb8436b83b3 100644 --- a/src/main/java/org/opentripplanner/routing/core/BicycleOptimizeType.java +++ b/src/main/java/org/opentripplanner/routing/core/VehicleRoutingOptimizeType.java @@ -5,10 +5,10 @@ import java.util.Set; /** - * When planning a bicycle route what should be optimized for. Optimize types are basically - * combined presets of routing parameters, except for triangle. + * When planning a bicycle or scooter route what should be optimized for. Optimize types are + * basically combined presets of routing parameters, except for triangle. */ -public enum BicycleOptimizeType { +public enum VehicleRoutingOptimizeType { /** This was previously called QUICK */ SHORTEST_DURATION, /** This was previously called SAFE */ @@ -19,14 +19,14 @@ public enum BicycleOptimizeType { SAFEST_STREETS, TRIANGLE; - private static final Set NON_TRIANGLE_VALUES = Collections.unmodifiableSet( + private static final Set NON_TRIANGLE_VALUES = Collections.unmodifiableSet( EnumSet.complementOf(EnumSet.of(TRIANGLE)) ); /** - * Return all values that are not {@link BicycleOptimizeType#TRIANGLE}. + * Return all values that are not {@link VehicleRoutingOptimizeType#TRIANGLE}. */ - public static Set nonTriangleValues() { + public static Set nonTriangleValues() { return NON_TRIANGLE_VALUES; } } diff --git a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java index f15aff9048b..338423df961 100644 --- a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java +++ b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java @@ -64,7 +64,7 @@ import org.opentripplanner.astar.spi.TraverseVisitor; import org.opentripplanner.graph_builder.issue.api.DataImportIssue; import org.opentripplanner.routing.api.request.RouteRequest; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.impl.GraphPathFinder; import org.opentripplanner.street.model.edge.Edge; @@ -547,20 +547,20 @@ protected void route(String from, String to) { } } - BicycleOptimizeType getSelectedOptimizeType() { + VehicleRoutingOptimizeType getSelectedOptimizeType() { if (opQuick.isSelected()) { - return BicycleOptimizeType.SHORTEST_DURATION; + return VehicleRoutingOptimizeType.SHORTEST_DURATION; } if (opSafe.isSelected()) { - return BicycleOptimizeType.SAFE_STREETS; + return VehicleRoutingOptimizeType.SAFE_STREETS; } if (opFlat.isSelected()) { - return BicycleOptimizeType.FLAT_STREETS; + return VehicleRoutingOptimizeType.FLAT_STREETS; } if (opGreenways.isSelected()) { - return BicycleOptimizeType.SAFEST_STREETS; + return VehicleRoutingOptimizeType.SAFEST_STREETS; } - return BicycleOptimizeType.SHORTEST_DURATION; + return VehicleRoutingOptimizeType.SHORTEST_DURATION; } private Container makeDiffTab() { diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java index b05dd77e2a9..92b91a141bd 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java @@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.params.provider.Arguments.of; -import static org.opentripplanner.routing.core.BicycleOptimizeType.SAFE_STREETS; -import static org.opentripplanner.routing.core.BicycleOptimizeType.TRIANGLE; +import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.SAFE_STREETS; +import static org.opentripplanner.routing.core.VehicleRoutingOptimizeType.TRIANGLE; import graphql.ExecutionInput; import graphql.execution.ExecutionId; diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 9a01a36cbcb..1e0d5a36f53 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -40,7 +40,7 @@ import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.preference.StreetPreferences; import org.opentripplanner.routing.api.request.preference.TimeSlopeSafetyTriangle; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService; import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService; @@ -255,14 +255,14 @@ public void testMaxDirectDurationForFlexWithTooLongDuration() { public void testBikeTriangleFactors() { Map arguments = Map.of( "bicycleOptimisationMethod", - BicycleOptimizeType.TRIANGLE, + VehicleRoutingOptimizeType.TRIANGLE, "triangleFactors", Map.of("safety", 0.1, "slope", 0.1, "time", 0.8) ); var req1 = TripRequestMapper.createRequest(executionContext(arguments)); - assertEquals(BicycleOptimizeType.TRIANGLE, req1.preferences().bike().optimizeType()); + assertEquals(VehicleRoutingOptimizeType.TRIANGLE, req1.preferences().bike().optimizeType()); assertEquals( new TimeSlopeSafetyTriangle(0.8, 0.1, 0.1), req1.preferences().bike().optimizeTriangle() @@ -272,18 +272,18 @@ public void testBikeTriangleFactors() { @Test void testDefaultTriangleFactors() { var req2 = TripRequestMapper.createRequest(executionContext(Map.of())); - assertEquals(BicycleOptimizeType.SAFE_STREETS, req2.preferences().bike().optimizeType()); + assertEquals(VehicleRoutingOptimizeType.SAFE_STREETS, req2.preferences().bike().optimizeType()); assertEquals(TimeSlopeSafetyTriangle.DEFAULT, req2.preferences().bike().optimizeTriangle()); } - static Stream noTriangleCases = BicycleOptimizeType + static Stream noTriangleCases = VehicleRoutingOptimizeType .nonTriangleValues() .stream() .map(Arguments::of); @ParameterizedTest @VariableSource("noTriangleCases") - public void testBikeTriangleFactorsHasNoEffect(BicycleOptimizeType bot) { + public void testBikeTriangleFactorsHasNoEffect(VehicleRoutingOptimizeType bot) { Map arguments = Map.of( "bicycleOptimisationMethod", bot, diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java index a72fd25cbfa..786ddc5c198 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/BikePreferencesMapperTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.apis.transmodel._support.TestDataFetcherDecorator; import org.opentripplanner.routing.api.request.preference.BikePreferences; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; class BikePreferencesMapperTest { @@ -23,7 +23,7 @@ static List mapBikePreferencesTestCases() { Arguments.of("bikeSpeed", 10.0, "BikePreferences{speed: 10.0}"), Arguments.of( "bicycleOptimisationMethod", - BicycleOptimizeType.TRIANGLE, + VehicleRoutingOptimizeType.TRIANGLE, "BikePreferences{optimizeType: TRIANGLE}" ), // No effect unless BicycleOptimize is TRIANGLE @@ -64,7 +64,7 @@ static List mapBikePreferencesOptimizeTriangleTestCases() { @ParameterizedTest @MethodSource("mapBikePreferencesOptimizeTriangleTestCases") void testMapBikePreferencesOptimizeTriangle(String field, Object value, String expected) { - var preferences = BikePreferences.of().withOptimizeType(BicycleOptimizeType.TRIANGLE); + var preferences = BikePreferences.of().withOptimizeType(VehicleRoutingOptimizeType.TRIANGLE); mapBikePreferences(preferences, TestDataFetcherDecorator.of(field, value)); assertEquals( "BikePreferences{optimizeType: TRIANGLE, optimizeTriangle: " + expected + "}", diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java index 9027b0a0dd5..677edfcbabf 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/ElevationSnapshotTest.java @@ -19,7 +19,7 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.error.RoutingValidationException; @ExtendWith(SnapshotExtension.class) @@ -98,7 +98,7 @@ public void directBike() { request.withPreferences(pref -> pref.withBike(bike -> bike - .withOptimizeType(BicycleOptimizeType.TRIANGLE) + .withOptimizeType(VehicleRoutingOptimizeType.TRIANGLE) .withOptimizeTriangle(b -> b.withTime(0.3).withSlope(0.4).withSafety(0.3)) ) ); diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java index 8a6ac3f4f45..3bbaf0105e5 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/BikePreferencesTest.java @@ -5,7 +5,7 @@ import static org.opentripplanner.routing.api.request.preference.ImmutablePreferencesAsserts.assertEqualsAndHashCode; import org.junit.jupiter.api.Test; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; class BikePreferencesTest { @@ -16,7 +16,8 @@ class BikePreferencesTest { .of() .withSlope(1) .build(); - public static final BicycleOptimizeType OPTIMIZE_TYPE = BicycleOptimizeType.TRIANGLE; + public static final VehicleRoutingOptimizeType OPTIMIZE_TYPE = + VehicleRoutingOptimizeType.TRIANGLE; public static final int RENTAL_PICKUP_TIME = 30; public static final int PARK_COST = 30; @@ -106,20 +107,20 @@ void testForcedTriangleOptimization() { .of() .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) .build(); - assertEquals(BicycleOptimizeType.TRIANGLE, trianglePreferences.optimizeType()); + assertEquals(VehicleRoutingOptimizeType.TRIANGLE, trianglePreferences.optimizeType()); var conflictingPreferences = BikePreferences .of() - .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withOptimizeType(VehicleRoutingOptimizeType.SAFE_STREETS) .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) .build(); - assertEquals(BicycleOptimizeType.TRIANGLE, conflictingPreferences.optimizeType()); + assertEquals(VehicleRoutingOptimizeType.TRIANGLE, conflictingPreferences.optimizeType()); var emptyTrianglePreferences = BikePreferences .of() - .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withOptimizeType(VehicleRoutingOptimizeType.SAFE_STREETS) .withForcedOptimizeTriangle(it -> it.build()) .build(); - assertEquals(BicycleOptimizeType.SAFE_STREETS, emptyTrianglePreferences.optimizeType()); + assertEquals(VehicleRoutingOptimizeType.SAFE_STREETS, emptyTrianglePreferences.optimizeType()); } } diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java index 11ec7f3be79..4b6554cbe07 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java @@ -5,7 +5,7 @@ import static org.opentripplanner.routing.api.request.preference.ImmutablePreferencesAsserts.assertEqualsAndHashCode; import org.junit.jupiter.api.Test; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; class ScooterPreferencesTest { @@ -15,7 +15,8 @@ class ScooterPreferencesTest { .of() .withSlope(1) .build(); - public static final BicycleOptimizeType OPTIMIZE_TYPE = BicycleOptimizeType.TRIANGLE; + public static final VehicleRoutingOptimizeType OPTIMIZE_TYPE = + VehicleRoutingOptimizeType.TRIANGLE; private final ScooterPreferences subject = ScooterPreferences .of() @@ -80,20 +81,20 @@ void testForcedTriangleOptimization() { .of() .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) .build(); - assertEquals(BicycleOptimizeType.TRIANGLE, trianglePreferences.optimizeType()); + assertEquals(VehicleRoutingOptimizeType.TRIANGLE, trianglePreferences.optimizeType()); var conflictingPreferences = ScooterPreferences .of() - .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withOptimizeType(VehicleRoutingOptimizeType.SAFE_STREETS) .withForcedOptimizeTriangle(it -> it.withSlope(1).build()) .build(); - assertEquals(BicycleOptimizeType.TRIANGLE, conflictingPreferences.optimizeType()); + assertEquals(VehicleRoutingOptimizeType.TRIANGLE, conflictingPreferences.optimizeType()); var emptyTrianglePreferences = ScooterPreferences .of() - .withOptimizeType(BicycleOptimizeType.SAFE_STREETS) + .withOptimizeType(VehicleRoutingOptimizeType.SAFE_STREETS) .withForcedOptimizeTriangle(it -> it.build()) .build(); - assertEquals(BicycleOptimizeType.SAFE_STREETS, emptyTrianglePreferences.optimizeType()); + assertEquals(VehicleRoutingOptimizeType.SAFE_STREETS, emptyTrianglePreferences.optimizeType()); } } diff --git a/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java b/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java index d5b7733f3e8..db937ff2a6e 100644 --- a/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java +++ b/src/test/java/org/opentripplanner/street/integration/BicycleRoutingTest.java @@ -16,7 +16,7 @@ import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.impl.GraphPathFinder; import org.opentripplanner.street.search.TemporaryVerticesContainer; @@ -76,7 +76,7 @@ private static String computePolyline(Graph graph, GenericLocation from, Generic request.setFrom(from); request.setTo(to); request.withPreferences(p -> - p.withBike(it -> it.withOptimizeType(BicycleOptimizeType.SHORTEST_DURATION)) + p.withBike(it -> it.withOptimizeType(VehicleRoutingOptimizeType.SHORTEST_DURATION)) ); request.journey().direct().setMode(StreetMode.BIKE); diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 42d841b9fa3..60e8cf58952 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -18,7 +18,7 @@ import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.routing.core.BicycleOptimizeType; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.util.ElevationUtils; import org.opentripplanner.routing.util.SlopeCosts; import org.opentripplanner.street.model.StreetTraversalPermission; @@ -357,7 +357,7 @@ public void testBikeOptimizeTriangle() { .withBike(bike -> bike .withSpeed(SPEED) - .withOptimizeType(BicycleOptimizeType.TRIANGLE) + .withOptimizeType(VehicleRoutingOptimizeType.TRIANGLE) .withOptimizeTriangle(it -> it.withTime(1)) .withReluctance(1) ) From a7c92a96caee8d18437af7a2f4ede260c731b464 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 18 Jan 2024 11:46:16 +0200 Subject: [PATCH 0338/1688] Use scooter preferences --- .../routing/api/request/StreetMode.java | 32 ++++++++------ .../preference/RoutingPreferences.java | 43 ++++++++++++++++--- .../street/StreetVehicleRentalLink.java | 5 ++- .../street/model/edge/StreetEdge.java | 29 +++++++------ .../edge/StreetEdgeReluctanceCalculator.java | 1 + .../model/edge/StreetTransitEntityLink.java | 14 +++--- .../street/model/edge/TemporaryFreeEdge.java | 14 +++--- .../street/search/state/StateData.java | 8 +++- .../EuclideanRemainingWeightHeuristic.java | 3 ++ 9 files changed, 102 insertions(+), 47 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java index 0f5d65305b3..bb5dc4b7f04 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java +++ b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java @@ -7,63 +7,63 @@ public enum StreetMode implements DocumentedEnum { * No street mode is set. This option is used if we do not want street routing at all in this part * of the search. */ - NOT_SET(true, true, true, false, false, false, false, false, false), + NOT_SET(true, true, true, false, false, false, false, false, false, false), /** * Walk only */ - WALK(true, true, true, true, false, false, false, false, false), + WALK(true, true, true, true, false, false, false, false, false, false), /** * Bike only */ - BIKE(true, true, true, false, true, false, false, false, false), + BIKE(true, true, true, false, true, false, false, false, false, false), /** * Bike to a bike parking area, then walk the rest of the way. *

      * Direct mode and access mode only. */ - BIKE_TO_PARK(true, false, false, true, true, false, false, true, false), + BIKE_TO_PARK(true, false, false, true, true, false, false, false, true, false), /** * Walk to a bike rental point, bike to a bike rental drop-off point, and walk the rest of the * way. This can include bike rental at fixed locations or free-floating services. */ - BIKE_RENTAL(true, true, true, true, true, false, true, false, false), + BIKE_RENTAL(true, true, true, true, true, false, false, true, false, false), /** * Walk to a scooter rental point, ride a scooter to a scooter rental drop-off point, and walk the * rest of the way. This can include scooter rental at fixed locations or free-floating services. */ - SCOOTER_RENTAL(true, true, true, true, true, false, true, false, false), + SCOOTER_RENTAL(true, true, true, true, false, false, true, true, false, false), /** * Car only *

      * Direct mode only. */ - CAR(true, false, false, false, false, true, false, false, false), + CAR(true, false, false, false, false, true, false, false, false, false), /** * Start in the car, drive to a parking area, and walk the rest of the way. *

      * Direct mode and access mode only. */ - CAR_TO_PARK(true, false, false, true, false, true, false, true, false), + CAR_TO_PARK(true, false, false, true, false, true, false, false, true, false), /** * Walk to a pickup point along the road, drive to a drop-off point along the road, and walk the * rest of the way. This can include various taxi-services or kiss & ride. */ - CAR_PICKUP(true, false, true, true, false, true, false, false, true), + CAR_PICKUP(true, false, true, true, false, true, false, false, false, true), /** * Walk to a car rental point, drive to a car rental drop-off point and walk the rest of the way. * This can include car rental at fixed locations or free-floating services. */ - CAR_RENTAL(true, true, true, true, false, true, true, false, false), + CAR_RENTAL(true, true, true, true, false, true, false, true, false, false), /** * Using a car hailing app like Uber or Lyft to get to a train station or all the way to the destination. */ - CAR_HAILING(true, false, true, false, false, true, false, false, true), + CAR_HAILING(true, false, true, false, false, true, false, false, false, true), /** * Encompasses all types of on-demand and flexible transportation. */ - FLEXIBLE(true, false, true, true, false, false, false, false, false); + FLEXIBLE(true, false, true, true, false, false, false, false, false, false); final boolean access; @@ -77,6 +77,8 @@ public enum StreetMode implements DocumentedEnum { final boolean includesDriving; + final boolean includesScooter; + final boolean includesRenting; final boolean includesParking; @@ -90,6 +92,7 @@ public enum StreetMode implements DocumentedEnum { boolean includesWalking, boolean includesBiking, boolean includesDriving, + boolean includesScooter, boolean includesRenting, boolean includesParking, boolean includesPickup @@ -100,6 +103,7 @@ public enum StreetMode implements DocumentedEnum { this.includesWalking = includesWalking; this.includesBiking = includesBiking; this.includesDriving = includesDriving; + this.includesScooter = includesScooter; this.includesRenting = includesRenting; this.includesParking = includesParking; this.includesPickup = includesPickup; @@ -117,6 +121,10 @@ public boolean includesDriving() { return includesDriving; } + public boolean includesScooter() { + return includesScooter; + } + public boolean includesRenting() { return includesRenting; } diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java index d3d22160935..3fec7a9e46e 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java @@ -7,6 +7,7 @@ import java.util.Objects; import java.util.function.Consumer; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.search.TraverseMode; @@ -23,6 +24,7 @@ public final class RoutingPreferences implements Serializable { private final WheelchairPreferences wheelchair; private final BikePreferences bike; private final CarPreferences car; + private final ScooterPreferences scooter; private final SystemPreferences system; private final ItineraryFilterPreferences itineraryFilter; @@ -34,6 +36,7 @@ public RoutingPreferences() { this.wheelchair = WheelchairPreferences.DEFAULT; this.bike = BikePreferences.DEFAULT; this.car = CarPreferences.DEFAULT; + this.scooter = ScooterPreferences.DEFAULT; this.system = SystemPreferences.DEFAULT; this.itineraryFilter = ItineraryFilterPreferences.DEFAULT; } @@ -46,6 +49,7 @@ private RoutingPreferences(Builder builder) { this.street = requireNonNull(builder.street()); this.bike = requireNonNull(builder.bike()); this.car = requireNonNull(builder.car()); + this.scooter = requireNonNull(builder.scooter()); this.system = requireNonNull(builder.system()); this.itineraryFilter = requireNonNull(builder.itineraryFilter()); } @@ -90,6 +94,10 @@ public CarPreferences car() { return car; } + public ScooterPreferences scooter() { + return scooter; + } + /** * Get parking preferences for the traverse mode. Note, only car and bike are supported. */ @@ -99,20 +107,28 @@ public VehicleParkingPreferences parking(TraverseMode mode) { /** * Get rental preferences for the traverse mode. Note, only car, scooter and bike are supported. - * - * TODO make scooter preferences independent of bike */ + @Nonnull public VehicleRentalPreferences rental(TraverseMode mode) { - return mode == TraverseMode.CAR ? car.rental() : bike.rental(); + return switch (mode) { + case BICYCLE -> bike.rental(); + case CAR -> car.rental(); + case SCOOTER -> scooter.rental(); + default -> throw new IllegalArgumentException("rental(): Invalid mode " + mode); + }; } /** * Get rental preferences for the traverse mode. Note, only car, scooter and bike are supported. - * - * TODO make scooter preferences independent of bike */ + @Nullable public VehicleRentalPreferences rental(StreetMode mode) { - return mode == StreetMode.CAR_RENTAL ? car.rental() : bike.rental(); + return switch (mode) { + case BIKE_RENTAL -> bike.rental(); + case CAR_RENTAL -> car.rental(); + case SCOOTER_RENTAL -> scooter.rental(); + default -> null; + }; } @Nonnull @@ -126,12 +142,15 @@ public SystemPreferences system() { /** * The road speed for a specific traverse mode. + * + * NOTE, this is only used for tests and doesn't support scooter walking */ public double getSpeed(TraverseMode mode, boolean walkingBike) { return switch (mode) { case WALK -> walkingBike ? bike.walking().speed() : walk.speed(); case BICYCLE -> bike.speed(); case CAR -> car.speed(); + case SCOOTER -> scooter.speed(); default -> throw new IllegalArgumentException("getSpeed(): Invalid mode " + mode); }; } @@ -149,6 +168,7 @@ public boolean equals(Object o) { Objects.equals(wheelchair, that.wheelchair) && Objects.equals(bike, that.bike) && Objects.equals(car, that.car) && + Objects.equals(scooter, that.scooter) && Objects.equals(system, that.system) && Objects.equals(itineraryFilter, that.itineraryFilter) ); @@ -164,6 +184,7 @@ public int hashCode() { wheelchair, bike, car, + scooter, system, itineraryFilter ); @@ -179,6 +200,7 @@ public static class Builder { private WheelchairPreferences wheelchair = null; private BikePreferences bike = null; private CarPreferences car = null; + private ScooterPreferences scooter = null; private SystemPreferences system = null; private ItineraryFilterPreferences itineraryFilter = null; @@ -259,6 +281,15 @@ public Builder withCar(Consumer body) { return this; } + public ScooterPreferences scooter() { + return scooter == null ? original.scooter : scooter; + } + + public Builder withScooter(Consumer body) { + this.scooter = ifNotNull(this.scooter, original.scooter).copyOf().apply(body).build(); + return this; + } + public SystemPreferences system() { return system == null ? original.system : system; } diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java b/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java index 4a18aae03c2..385b347d24a 100644 --- a/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java +++ b/src/main/java/org/opentripplanner/service/vehiclerental/street/StreetVehicleRentalLink.java @@ -53,7 +53,10 @@ public State[] traverse(State s0) { } var preferences = s0.getPreferences().rental(s0.getRequest().mode()); - if (vehicleRentalPlaceVertex.getStation().networkIsNotAllowed(preferences)) { + // preferences will be null while finding nearest places with WALK mode + if ( + preferences != null && vehicleRentalPlaceVertex.getStation().networkIsNotAllowed(preferences) + ) { return State.empty(); } diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java b/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java index 1e3594ee04b..ca33396b0a3 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/StreetEdge.java @@ -234,8 +234,9 @@ public double calculateSpeed( case WALK -> walkingBike ? preferences.bike().walking().speed() : preferences.walk().speed(); - case BICYCLE, SCOOTER -> preferences.bike().speed(); + case BICYCLE -> preferences.bike().speed(); case CAR -> getCarSpeed(); + case SCOOTER -> preferences.scooter().speed(); case FLEX -> throw new IllegalArgumentException("getSpeed(): Invalid mode " + traverseMode); }; @@ -1098,7 +1099,7 @@ private StateEditor doTraverse(State s0, TraverseMode traverseMode, boolean walk var traversalCosts = switch (traverseMode) { - case BICYCLE, SCOOTER -> bicycleTraversalCost(preferences, speed); + case BICYCLE, SCOOTER -> bicycleOrScooterTraversalCost(preferences, traverseMode, speed); case WALK -> walkingTraversalCosts( preferences, traverseMode, @@ -1213,10 +1214,17 @@ private TraversalCosts otherTraversalCosts( } @Nonnull - private TraversalCosts bicycleTraversalCost(RoutingPreferences pref, double speed) { + private TraversalCosts bicycleOrScooterTraversalCost( + RoutingPreferences pref, + TraverseMode mode, + double speed + ) { double time = getEffectiveBikeDistance() / speed; double weight; - switch (pref.bike().optimizeType()) { + var optimizeType = mode == TraverseMode.BICYCLE + ? pref.bike().optimizeType() + : pref.scooter().optimizeType(); + switch (optimizeType) { case SAFEST_STREETS -> { weight = bicycleSafetyFactor * getDistanceMeters() / speed; if (bicycleSafetyFactor <= SAFEST_STREETS_SAFETY_FACTOR) { @@ -1232,20 +1240,17 @@ private TraversalCosts bicycleTraversalCost(RoutingPreferences pref, double spee double quick = getEffectiveBikeDistance(); double safety = getEffectiveBicycleSafetyDistance(); double slope = getEffectiveBikeDistanceForWorkCost(); - weight = - quick * - pref.bike().optimizeTriangle().time() + - slope * - pref.bike().optimizeTriangle().slope() + - safety * - pref.bike().optimizeTriangle().safety(); + var triangle = mode == TraverseMode.BICYCLE + ? pref.bike().optimizeTriangle() + : pref.scooter().optimizeTriangle(); + weight = quick * triangle.time() + slope * triangle.slope() + safety * triangle.safety(); weight /= speed; } default -> weight = getDistanceMeters() / speed; } var reluctance = StreetEdgeReluctanceCalculator.computeReluctance( pref, - TraverseMode.BICYCLE, + mode, false, isStairs() ); diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java b/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java index ee2f3d833ee..a6fdf4ce6f1 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java +++ b/src/main/java/org/opentripplanner/street/model/edge/StreetEdgeReluctanceCalculator.java @@ -25,6 +25,7 @@ static double computeReluctance( case WALK -> walkingBike ? pref.bike().walking().reluctance() : pref.walk().reluctance(); case BICYCLE -> pref.bike().reluctance(); case CAR -> pref.car().reluctance(); + case SCOOTER -> pref.scooter().reluctance(); default -> throw new IllegalArgumentException( "getReluctance(): Invalid mode " + traverseMode ); diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java b/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java index df5b24a5928..dabd70bf28d 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java +++ b/src/main/java/org/opentripplanner/street/model/edge/StreetTransitEntityLink.java @@ -137,13 +137,13 @@ else if ( @Nonnull private State[] buildState(State s0, StateEditor s1, RoutingPreferences pref) { - var rentalPreferences = s0.getRequest().preferences().rental(s0.getRequest().mode()); - if ( - s0.isRentingVehicleFromStation() && - s0.mayKeepRentedVehicleAtDestination() && - rentalPreferences.allowArrivingInRentedVehicleAtDestination() - ) { - s1.incrementWeight(rentalPreferences.arrivingInRentalVehicleAtDestinationCost().toSeconds()); + if (s0.isRentingVehicleFromStation() && s0.mayKeepRentedVehicleAtDestination()) { + var rentalPreferences = s0.getRequest().preferences().rental(s0.getRequest().mode()); + if (rentalPreferences.allowArrivingInRentedVehicleAtDestination()) { + s1.incrementWeight( + rentalPreferences.arrivingInRentalVehicleAtDestinationCost().toSeconds() + ); + } } s1.setBackMode(null); diff --git a/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java b/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java index d825a8fcbea..e93c6523d89 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/TemporaryFreeEdge.java @@ -42,13 +42,13 @@ public State[] traverse(State s0) { s1.incrementWeight(1); s1.setBackMode(null); - var rentalPreferences = s0.getPreferences().rental(s0.getRequest().mode()); - if ( - s0.isRentingVehicleFromStation() && - s0.mayKeepRentedVehicleAtDestination() && - rentalPreferences.allowArrivingInRentedVehicleAtDestination() - ) { - s1.incrementWeight(rentalPreferences.arrivingInRentalVehicleAtDestinationCost().toSeconds()); + if (s0.isRentingVehicleFromStation() && s0.mayKeepRentedVehicleAtDestination()) { + var rentalPreferences = s0.getPreferences().rental(s0.getRequest().mode()); + if (rentalPreferences.allowArrivingInRentedVehicleAtDestination()) { + s1.incrementWeight( + rentalPreferences.arrivingInRentalVehicleAtDestinationCost().toSeconds() + ); + } } return s1.makeStateArray(); diff --git a/src/main/java/org/opentripplanner/street/search/state/StateData.java b/src/main/java/org/opentripplanner/street/search/state/StateData.java index cc2bfa5a57a..d1db14d91f4 100644 --- a/src/main/java/org/opentripplanner/street/search/state/StateData.java +++ b/src/main/java/org/opentripplanner/street/search/state/StateData.java @@ -87,7 +87,9 @@ public static List getInitialStateDatas( return getInitialStateDatas( request.mode(), request.arriveBy(), - rentalPreferences.allowArrivingInRentedVehicleAtDestination(), + rentalPreferences != null + ? rentalPreferences.allowArrivingInRentedVehicleAtDestination() + : false, stateDataConstructor ); } @@ -102,7 +104,9 @@ public static StateData getBaseCaseStateData(StreetSearchRequest request) { var stateDatas = getInitialStateDatas( request.mode(), request.arriveBy(), - rentalPreferences.allowArrivingInRentedVehicleAtDestination(), + rentalPreferences != null + ? rentalPreferences.allowArrivingInRentedVehicleAtDestination() + : false, StateData::new ); diff --git a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java index e43278901d4..7bccdbb94df 100644 --- a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java +++ b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java @@ -55,6 +55,9 @@ private double getStreetSpeedUpperBound(RoutingPreferences preferences, StreetMo if (streetMode.includesBiking()) { return preferences.bike().speed(); } + if (streetMode.includesScooter()) { + return preferences.scooter().speed(); + } return preferences.walk().speed(); } From 07f9c170422760418d6fc7472994e38cd21c390c Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 18 Jan 2024 11:46:38 +0200 Subject: [PATCH 0339/1688] Add scooter preferences to router-config --- docs/RouteRequest.md | 108 ++++++++++++++++++ docs/RouterConfiguration.md | 18 +++ .../routerequest/RouteRequestConfig.java | 38 ++++++ .../standalone/config/router-config.json | 18 +++ 4 files changed, 182 insertions(+) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 199eda8a332..0bdae72fd30 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -125,6 +125,30 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       [costLimitFunction](#rd_if_transitGeneralizedCostLimit_costLimitFunction) | `cost-linear-function` | The base function used by the filter. | *Optional* | `"15m + 1.50 t"` | 2.2 | |       [intervalRelaxFactor](#rd_if_transitGeneralizedCostLimit_intervalRelaxFactor) | `double` | How much the filter should be relaxed for itineraries that do not overlap in time. | *Optional* | `0.4` | 2.2 | | [maxDirectStreetDurationForMode](#rd_maxDirectStreetDurationForMode) | `enum map of duration` | Limit direct route duration per street mode. | *Optional* | | 2.2 | +| scooter | `object` | Scooter preferences. | *Optional* | | 2.5 | +|    [optimization](#rd_scooter_optimization) | `enum` | The set of characteristics that the user wants to optimize for. | *Optional* | `"safe-streets"` | 2.0 | +|    reluctance | `double` | A multiplier for how bad scooter travel is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | +|    speed | `double` | Max scooter speed along streets, in meters per second | *Optional* | `5.0` | 2.0 | +|    rental | `object` | Vehicle rental options | *Optional* | | 2.3 | +|       allowKeepingAtDestination | `boolean` | If a vehicle should be allowed to be kept at the end of a station-based rental. | *Optional* | `false` | 2.2 | +|       dropOffCost | `integer` | Cost to drop-off a rented vehicle. | *Optional* | `30` | 2.0 | +|       dropOffTime | `duration` | Time to drop-off a rented vehicle. | *Optional* | `"PT30S"` | 2.0 | +|       keepingAtDestinationCost | `integer` | The cost of arriving at the destination with the rented vehicle, to discourage doing so. | *Optional* | `0` | 2.2 | +|       pickupCost | `integer` | Cost to rent a vehicle. | *Optional* | `120` | 2.0 | +|       pickupTime | `duration` | Time to rent a vehicle. | *Optional* | `"PT1M"` | 2.0 | +|       useAvailabilityInformation | `boolean` | Whether or not vehicle rental availability information will be used to plan vehicle rental trips. | *Optional* | `false` | 2.0 | +|       [allowedNetworks](#rd_scooter_rental_allowedNetworks) | `string[]` | The vehicle rental networks which may be used. If empty all networks may be used. | *Optional* | | 2.1 | +|       [bannedNetworks](#rd_scooter_rental_bannedNetworks) | `string[]` | The vehicle rental networks which may not be used. If empty, no networks are banned. | *Optional* | | 2.1 | +|    [triangle](#rd_scooter_triangle) | `object` | Triangle optimization criteria. | *Optional* | | 2.5 | +|       flatness | `double` | Relative importance of flat terrain (range 0-1). | *Optional* | `0.0` | 2.0 | +|       [safety](#rd_scooter_triangle_safety) | `double` | Relative importance of safety (range 0-1). | *Optional* | `0.0` | 2.0 | +|       time | `double` | Relative importance of duration of travel (range 0-1). | *Optional* | `0.0` | 2.0 | +|    walk | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | +|       [hopCost](#rd_scooter_walk_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | +|       [hopTime](#rd_scooter_walk_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle in seconds. | *Optional* | `"PT0S"` | 2.0 | +|       reluctance | `double` | A multiplier for how bad walking with a vehicle is, compared to being in transit for equal lengths of time. | *Optional* | `5.0` | 2.1 | +|       speed | `double` | The user's vehicle walking speed in meters/second. Defaults to approximately 3 MPH. | *Optional* | `1.33` | 2.1 | +|       stairsReluctance | `double` | How bad is it to walk the vehicle up/down a flight of stairs compared to taking a detour. | *Optional* | `10.0` | 2.3 | | [transferOptimization](#rd_transferOptimization) | `object` | Optimize where a transfer between to trip happens. | *Optional* | | 2.1 | |    [backTravelWaitTimeFactor](#rd_to_backTravelWaitTimeFactor) | `double` | To reduce back-travel we favor waiting, this reduces the cost of waiting. | *Optional* | `1.0` | 2.1 | |    [extraStopBoardAlightCostsFactor](#rd_to_extraStopBoardAlightCostsFactor) | `double` | Add an extra board- and alight-cost for prioritized stops. | *Optional* | `0.0` | 2.1 | @@ -827,6 +851,72 @@ Override the settings in `maxDirectStreetDuration` for specific street modes. Th done because some street modes searches are much more resource intensive than others. +

      optimization

      + +**Since version:** `2.0` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"safe-streets"` +**Path:** /routingDefaults/scooter +**Enum values:** `shortest-duration` | `safe-streets` | `flat-streets` | `safest-streets` | `triangle` + +The set of characteristics that the user wants to optimize for. + +If the triangle optimization is used, it's enough to just define the triangle parameters + +

      allowedNetworks

      + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/scooter/rental + +The vehicle rental networks which may be used. If empty all networks may be used. + +

      bannedNetworks

      + +**Since version:** `2.1` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/scooter/rental + +The vehicle rental networks which may not be used. If empty, no networks are banned. + +

      triangle

      + +**Since version:** `2.5` ∙ **Type:** `object` ∙ **Cardinality:** `Optional` +**Path:** /routingDefaults/scooter + +Triangle optimization criteria. + +Optimization type doesn't need to be defined if these values are defined. + +

      safety

      + +**Since version:** `2.0` ∙ **Type:** `double` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0.0` +**Path:** /routingDefaults/scooter/triangle + +Relative importance of safety (range 0-1). + +This factor can also include other concerns such as convenience and general cyclist +preferences by taking into account road surface etc. + + +

      hopCost

      + +**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` +**Path:** /routingDefaults/scooter/walk + +The cost of hopping on or off a vehicle. + +There are different parameters for the cost of renting or parking a vehicle and this is +not meant for controlling the cost of those events. + + +

      hopTime

      + +**Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` +**Path:** /routingDefaults/scooter/walk + +The time it takes the user to hop on or off a vehicle in seconds. + +Time it takes to rent or park a vehicle have their own parameters and this is not meant +for controlling the duration of those events. + +

      transferOptimization

      **Since version:** `2.1` ∙ **Type:** `object` ∙ **Cardinality:** `Optional` @@ -1093,6 +1183,24 @@ include stairs as a last result. "cost" : 600 } }, + "scooter" : { + "speed" : 5, + "reluctance" : 5.0, + "walk" : { + "reluctance" : 10.0, + "stairsReluctance" : 150.0 + }, + "rental" : { + "pickupCost" : 120, + "dropOffTime" : "30s", + "dropOffCost" : 30 + }, + "triangle" : { + "safety" : 0.4, + "flatness" : 0.3, + "time" : 0.3 + } + }, "walk" : { "speed" : 1.3, "reluctance" : 4.0, diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 23e2e3763d4..dfe3c3f9750 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -496,6 +496,24 @@ Used to group requests when monitoring OTP. "cost" : 600 } }, + "scooter" : { + "speed" : 5, + "reluctance" : 5.0, + "walk" : { + "reluctance" : 10.0, + "stairsReluctance" : 150.0 + }, + "rental" : { + "pickupCost" : 120, + "dropOffTime" : "30s", + "dropOffCost" : 30 + }, + "triangle" : { + "safety" : 0.4, + "flatness" : 0.3, + "time" : 0.3 + } + }, "walk" : { "speed" : 1.3, "reluctance" : 4.0, diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 4538f6de84d..ac2a73aead4 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -24,6 +24,7 @@ import org.opentripplanner.routing.api.request.preference.BikePreferences; import org.opentripplanner.routing.api.request.preference.CarPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; +import org.opentripplanner.routing.api.request.preference.ScooterPreferences; import org.opentripplanner.routing.api.request.preference.StreetPreferences; import org.opentripplanner.routing.api.request.preference.SystemPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; @@ -181,6 +182,7 @@ private static void mapPreferences(NodeAdapter c, RoutingPreferences.Builder pre preferences.withBike(it -> mapBikePreferences(c, it)); preferences.withStreet(it -> mapStreetPreferences(c, it)); preferences.withCar(it -> mapCarPreferences(c, it)); + preferences.withScooter(it -> mapScooterPreferences(c, it)); preferences.withSystem(it -> mapSystemPreferences(c, it)); preferences.withTransfer(it -> mapTransferPreferences(c, it)); preferences.withWalk(it -> mapWalkPreferences(c, it)); @@ -621,6 +623,42 @@ private static void mapCarPreferences(NodeAdapter root, CarPreferences.Builder b .withRental(it -> mapRental(c, it)); } + private static void mapScooterPreferences(NodeAdapter root, ScooterPreferences.Builder builder) { + var dft = builder.original(); + NodeAdapter c = root.of("scooter").since(V2_5).summary("Scooter preferences.").asObject(); + builder + .withSpeed( + c + .of("speed") + .since(V2_0) + .summary("Max scooter speed along streets, in meters per second") + .asDouble(dft.speed()) + ) + .withReluctance( + c + .of("reluctance") + .since(V2_0) + .summary( + "A multiplier for how bad scooter travel is, compared to being in transit for equal lengths of time." + ) + .asDouble(dft.reluctance()) + ) + .withOptimizeType( + c + .of("optimization") + .since(V2_0) + .summary("The set of characteristics that the user wants to optimize for.") + .description( + "If the triangle optimization is used, it's enough to just define the triangle parameters" + ) + .asEnum(dft.optimizeType()) + ) + // triangle overrides the optimization type if defined + .withForcedOptimizeTriangle(it -> mapOptimizationTriangle(c, it)) + .withWalking(it -> mapVehicleWalking(c, it)) + .withRental(it -> mapRental(c, it)); + } + private static void mapSystemPreferences(NodeAdapter c, SystemPreferences.Builder builder) { var dft = builder.original(); builder diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 863b9bec279..0a6cb6ee831 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -57,6 +57,24 @@ "cost": 600 } }, + "scooter": { + "speed": 5, + "reluctance": 5.0, + "walk": { + "reluctance": 10.0, + "stairsReluctance": 150.0 + }, + "rental": { + "pickupCost": 120, + "dropOffTime": "30s", + "dropOffCost": 30 + }, + "triangle": { + "safety": 0.4, + "flatness": 0.3, + "time": 0.3 + } + }, "walk": { "speed": 1.3, "reluctance": 4.0, From 545315c92c94462e521291f0bf5a660277d4c7d4 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 19 Jan 2024 15:14:33 +0200 Subject: [PATCH 0340/1688] Remove scooter walking preferences --- docs/RouteRequest.md | 28 ------------------- .../preference/ScooterPreferences.java | 22 ++------------- .../routerequest/RouteRequestConfig.java | 1 - .../standalone/config/router-config.json | 4 --- 4 files changed, 2 insertions(+), 53 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 0bdae72fd30..70fa0d26e49 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -143,12 +143,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       flatness | `double` | Relative importance of flat terrain (range 0-1). | *Optional* | `0.0` | 2.0 | |       [safety](#rd_scooter_triangle_safety) | `double` | Relative importance of safety (range 0-1). | *Optional* | `0.0` | 2.0 | |       time | `double` | Relative importance of duration of travel (range 0-1). | *Optional* | `0.0` | 2.0 | -|    walk | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | -|       [hopCost](#rd_scooter_walk_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | -|       [hopTime](#rd_scooter_walk_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle in seconds. | *Optional* | `"PT0S"` | 2.0 | -|       reluctance | `double` | A multiplier for how bad walking with a vehicle is, compared to being in transit for equal lengths of time. | *Optional* | `5.0` | 2.1 | -|       speed | `double` | The user's vehicle walking speed in meters/second. Defaults to approximately 3 MPH. | *Optional* | `1.33` | 2.1 | -|       stairsReluctance | `double` | How bad is it to walk the vehicle up/down a flight of stairs compared to taking a detour. | *Optional* | `10.0` | 2.3 | | [transferOptimization](#rd_transferOptimization) | `object` | Optimize where a transfer between to trip happens. | *Optional* | | 2.1 | |    [backTravelWaitTimeFactor](#rd_to_backTravelWaitTimeFactor) | `double` | To reduce back-travel we favor waiting, this reduces the cost of waiting. | *Optional* | `1.0` | 2.1 | |    [extraStopBoardAlightCostsFactor](#rd_to_extraStopBoardAlightCostsFactor) | `double` | Add an extra board- and alight-cost for prioritized stops. | *Optional* | `0.0` | 2.1 | @@ -895,28 +889,6 @@ This factor can also include other concerns such as convenience and general cycl preferences by taking into account road surface etc. -

      hopCost

      - -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` -**Path:** /routingDefaults/scooter/walk - -The cost of hopping on or off a vehicle. - -There are different parameters for the cost of renting or parking a vehicle and this is -not meant for controlling the cost of those events. - - -

      hopTime

      - -**Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` -**Path:** /routingDefaults/scooter/walk - -The time it takes the user to hop on or off a vehicle in seconds. - -Time it takes to rent or park a vehicle have their own parameters and this is not meant -for controlling the duration of those events. - -

      transferOptimization

      **Since version:** `2.1` ∙ **Type:** `object` ∙ **Cardinality:** `Optional` diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java index 10b9c01e686..7c139c08730 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java @@ -30,7 +30,6 @@ public final class ScooterPreferences implements Serializable { private final VehicleRentalPreferences rental; private final VehicleRoutingOptimizeType optimizeType; private final TimeSlopeSafetyTriangle optimizeTriangle; - private final VehicleWalkingPreferences walking; private ScooterPreferences() { this.speed = 5; @@ -38,7 +37,6 @@ private ScooterPreferences() { this.rental = VehicleRentalPreferences.DEFAULT; this.optimizeType = SAFE_STREETS; this.optimizeTriangle = TimeSlopeSafetyTriangle.DEFAULT; - this.walking = VehicleWalkingPreferences.DEFAULT; } private ScooterPreferences(Builder builder) { @@ -47,7 +45,6 @@ private ScooterPreferences(Builder builder) { this.rental = builder.rental; this.optimizeType = Objects.requireNonNull(builder.optimizeType); this.optimizeTriangle = Objects.requireNonNull(builder.optimizeTriangle); - this.walking = builder.walking; } public static ScooterPreferences.Builder of() { @@ -85,11 +82,6 @@ public TimeSlopeSafetyTriangle optimizeTriangle() { return optimizeTriangle; } - /** Scooter walking preferences that can be different per request */ - public VehicleWalkingPreferences walking() { - return walking; - } - @Override public boolean equals(Object o) { if (this == o) return true; @@ -100,14 +92,13 @@ public boolean equals(Object o) { doubleEquals(that.reluctance, reluctance) && Objects.equals(rental, that.rental) && optimizeType == that.optimizeType && - optimizeTriangle.equals(that.optimizeTriangle) && - Objects.equals(walking, that.walking) + optimizeTriangle.equals(that.optimizeTriangle) ); } @Override public int hashCode() { - return Objects.hash(speed, reluctance, rental, optimizeType, optimizeTriangle, walking); + return Objects.hash(speed, reluctance, rental, optimizeType, optimizeTriangle); } @Override @@ -119,7 +110,6 @@ public String toString() { .addObj("rental", rental, DEFAULT.rental) .addEnum("optimizeType", optimizeType, DEFAULT.optimizeType) .addObj("optimizeTriangle", optimizeTriangle, DEFAULT.optimizeTriangle) - .addObj("walking", walking, DEFAULT.walking) .toString(); } @@ -133,8 +123,6 @@ public static class Builder { private VehicleRoutingOptimizeType optimizeType; private TimeSlopeSafetyTriangle optimizeTriangle; - public VehicleWalkingPreferences walking; - public Builder(ScooterPreferences original) { this.original = original; this.speed = original.speed; @@ -142,7 +130,6 @@ public Builder(ScooterPreferences original) { this.rental = original.rental; this.optimizeType = original.optimizeType; this.optimizeTriangle = original.optimizeTriangle; - this.walking = original.walking; } public ScooterPreferences original() { @@ -203,11 +190,6 @@ public Builder withOptimizeTriangle(Consumer bo return this; } - public Builder withWalking(Consumer body) { - this.walking = ifNotNull(this.walking, original.walking).copyOf().apply(body).build(); - return this; - } - public Builder apply(Consumer body) { body.accept(this); return this; diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index ac2a73aead4..c0dcede55a7 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -655,7 +655,6 @@ private static void mapScooterPreferences(NodeAdapter root, ScooterPreferences.B ) // triangle overrides the optimization type if defined .withForcedOptimizeTriangle(it -> mapOptimizationTriangle(c, it)) - .withWalking(it -> mapVehicleWalking(c, it)) .withRental(it -> mapRental(c, it)); } diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 0a6cb6ee831..a3082e0a13a 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -60,10 +60,6 @@ "scooter": { "speed": 5, "reluctance": 5.0, - "walk": { - "reluctance": 10.0, - "stairsReluctance": 150.0 - }, "rental": { "pickupCost": 120, "dropOffTime": "30s", From e28230f7d1e2113ece71e1ad6ee7202a37072885 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 19 Jan 2024 15:17:44 +0200 Subject: [PATCH 0341/1688] Improve tests --- .../api/request/preference/ScooterPreferencesTest.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java index 4b6554cbe07..01a12ef5cbb 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/ScooterPreferencesTest.java @@ -17,12 +17,14 @@ class ScooterPreferencesTest { .build(); public static final VehicleRoutingOptimizeType OPTIMIZE_TYPE = VehicleRoutingOptimizeType.TRIANGLE; + public static final int RENTAL_PICKUP_TIME = 30; private final ScooterPreferences subject = ScooterPreferences .of() .withSpeed(SPEED) .withReluctance(RELUCTANCE) .withOptimizeType(OPTIMIZE_TYPE) + .withRental(rental -> rental.withPickupTime(RENTAL_PICKUP_TIME).build()) .withOptimizeTriangle(it -> it.withSlope(1).build()) .build(); @@ -46,6 +48,12 @@ void optimizeTriangle() { assertEquals(TRIANGLE, subject.optimizeTriangle()); } + @Test + void rental() { + var vehicleRental = VehicleRentalPreferences.of().withPickupTime(RENTAL_PICKUP_TIME).build(); + assertEquals(vehicleRental, subject.rental()); + } + @Test void testOfAndCopyOf() { // Return same object if no value is set @@ -68,6 +76,7 @@ void testToString() { "ScooterPreferences{" + "speed: 2.0, " + "reluctance: 1.2, " + + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + "optimizeType: TRIANGLE, " + "optimizeTriangle: TimeSlopeSafetyTriangle[time=0.0, slope=1.0, safety=0.0]" + "}", From e2ba239751b9b4bd557804c9b393e2fd38828011 Mon Sep 17 00:00:00 2001 From: eibakke Date: Fri, 19 Jan 2024 15:07:11 +0100 Subject: [PATCH 0342/1688] Gets rid of instanceof in QuayType to differentiate between the types of StopLocation. This is done mainly by moving method signatures into the StopLocation interface from the implementing classes. --- .../opentripplanner/ext/flex/FlexIndex.java | 2 +- .../ext/flex/trip/ScheduledDeviatedTrip.java | 6 +- .../ext/flex/trip/UnscheduledTrip.java | 6 +- .../apis/transmodel/model/stop/QuayType.java | 83 ++++++------------- .../module/StreetLinkerModule.java | 2 +- .../netex/mapping/NetexMapper.java | 2 +- .../transit/model/site/AreaStop.java | 14 ++++ .../transit/model/site/GroupStop.java | 21 ++++- .../transit/model/site/GroupStopBuilder.java | 2 +- .../transit/model/site/RegularStop.java | 6 ++ .../transit/model/site/StopLocation.java | 21 +++++ .../gtfs/mapping/StopTimeMapperTest.java | 2 +- .../netex/mapping/FlexStopsMapperTest.java | 2 +- .../transit/model/site/GroupStopTest.java | 2 +- 14 files changed, 99 insertions(+), 72 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java b/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java index 5cab995d419..a875ba0f516 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexIndex.java @@ -33,7 +33,7 @@ public FlexIndex(TransitModel transitModel) { tripById.put(flexTrip.getTrip().getId(), flexTrip); for (StopLocation stop : flexTrip.getStops()) { if (stop instanceof GroupStop groupStop) { - for (StopLocation stopElement : groupStop.getLocations()) { + for (StopLocation stopElement : groupStop.getChildLocations()) { flexTripsByStop.put(stopElement, flexTrip); } } else { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index edff0860933..e16e1e5e1f7 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -248,7 +248,7 @@ public TransitBuilder copy( private Collection expandStops(StopLocation stop) { return stop instanceof GroupStop groupStop - ? groupStop.getLocations() + ? groupStop.getChildLocations() : Collections.singleton(stop); } @@ -259,7 +259,7 @@ private int getFromIndex(NearbyStop accessEgress) { } StopLocation stop = stopTimes[i].stop; if (stop instanceof GroupStop groupStop) { - if (groupStop.getLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(accessEgress.stop)) { return i; } } else { @@ -278,7 +278,7 @@ private int getToIndex(NearbyStop accessEgress) { } StopLocation stop = stopTimes[i].stop; if (stop instanceof GroupStop groupStop) { - if (groupStop.getLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(accessEgress.stop)) { return i; } } else { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 71a77eee5e7..c5968507676 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -300,7 +300,7 @@ public TransitBuilder copy() { private Stream expandStops(int index) { var stop = stopTimes[index].stop(); return stop instanceof GroupStop groupStop - ? groupStop.getLocations().stream().map(s -> new IndexedStopLocation(index, s)) + ? groupStop.getChildLocations().stream().map(s -> new IndexedStopLocation(index, s)) : Stream.of(new IndexedStopLocation(index, stop)); } @@ -311,7 +311,7 @@ private int getFromIndex(NearbyStop accessEgress) { } StopLocation stop = stopTimes[i].stop(); if (stop instanceof GroupStop groupStop) { - if (groupStop.getLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(accessEgress.stop)) { return i; } } else { @@ -330,7 +330,7 @@ private int getToIndex(NearbyStop accessEgress) { } StopLocation stop = stopTimes[i].stop(); if (stop instanceof GroupStop groupStop) { - if (groupStop.getLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(accessEgress.stop)) { return i; } } else { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index a15bf2f838e..6dd9fc5e31c 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -25,9 +25,6 @@ import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.site.AreaStop; -import org.opentripplanner.transit.model.site.GroupStop; -import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; @@ -80,11 +77,8 @@ public static GraphQLObjectType create( .type(Scalars.GraphQLString) .build() ) - .dataFetcher(environment -> - ( - ((StopLocation) environment.getSource()).getName() - .toString(GqlUtil.getLocale(environment)) - ) + .dataFetcher(env -> + (((StopLocation) env.getSource()).getName().toString(GqlUtil.getLocale(env))) ) .build() ) @@ -93,7 +87,7 @@ public static GraphQLObjectType create( .newFieldDefinition() .name("latitude") .type(Scalars.GraphQLFloat) - .dataFetcher(environment -> (((StopLocation) environment.getSource()).getLat())) + .dataFetcher(env -> (((StopLocation) env.getSource()).getLat())) .build() ) .field( @@ -101,7 +95,7 @@ public static GraphQLObjectType create( .newFieldDefinition() .name("longitude") .type(Scalars.GraphQLFloat) - .dataFetcher(environment -> (((StopLocation) environment.getSource()).getLon())) + .dataFetcher(env -> (((StopLocation) env.getSource()).getLon())) .build() ) .field( @@ -109,11 +103,8 @@ public static GraphQLObjectType create( .newFieldDefinition() .name("description") .type(Scalars.GraphQLString) - .dataFetcher(environment -> - GraphQLUtils.getTranslation( - ((StopLocation) environment.getSource()).getDescription(), - environment - ) + .dataFetcher(env -> + GraphQLUtils.getTranslation(((StopLocation) env.getSource()).getDescription(), env) ) .build() ) @@ -123,12 +114,12 @@ public static GraphQLObjectType create( .name("stopPlace") .description("The stop place to which this quay belongs to.") .type(stopPlaceType) - .dataFetcher(environment -> { - Station station = ((StopLocation) environment.getSource()).getParentStation(); + .dataFetcher(env -> { + Station station = ((StopLocation) env.getSource()).getParentStation(); if (station != null) { return new MonoOrMultiModalStation( station, - GqlUtil.getTransitService(environment).getMultiModalStationForStation(station) + GqlUtil.getTransitService(env).getMultiModalStationForStation(station) ); } else { return null; @@ -142,9 +133,9 @@ public static GraphQLObjectType create( .name("wheelchairAccessible") .type(EnumTypes.WHEELCHAIR_BOARDING) .description("Whether this quay is suitable for wheelchair boarding.") - .dataFetcher(environment -> + .dataFetcher(env -> Objects.requireNonNullElse( - (((StopLocation) environment.getSource()).getWheelchairAccessibility()), + (((StopLocation) env.getSource()).getWheelchairAccessibility()), Accessibility.NO_INFORMATION ) ) @@ -155,10 +146,8 @@ public static GraphQLObjectType create( .newFieldDefinition() .name("timeZone") .type(Scalars.GraphQLString) - .dataFetcher(environment -> - Optional - .ofNullable(((StopLocation) environment.getSource()).getTimeZone()) - .map(ZoneId::getId) + .dataFetcher(env -> + Optional.ofNullable(((StopLocation) env.getSource()).getTimeZone()).map(ZoneId::getId) ) .build() ) @@ -170,7 +159,7 @@ public static GraphQLObjectType create( .description( "Public code used to identify this quay within the stop place. For instance a platform code." ) - .dataFetcher(environment -> (((StopLocation) environment.getSource()).getPlatformCode())) + .dataFetcher(env -> (((StopLocation) env.getSource()).getPlatformCode())) .build() ) .field( @@ -180,10 +169,10 @@ public static GraphQLObjectType create( .withDirective(gqlUtil.timingData) .description("List of lines servicing this quay") .type(new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(lineType)))) - .dataFetcher(environment -> + .dataFetcher(env -> GqlUtil - .getTransitService(environment) - .getPatternsForStop(environment.getSource(), true) + .getTransitService(env) + .getPatternsForStop(env.getSource(), true) .stream() .map(TripPattern::getRoute) .distinct() @@ -198,8 +187,8 @@ public static GraphQLObjectType create( .withDirective(gqlUtil.timingData) .description("List of journey patterns servicing this quay") .type(new GraphQLNonNull(new GraphQLList(journeyPatternType))) - .dataFetcher(environment -> - GqlUtil.getTransitService(environment).getPatternsForStop(environment.getSource(), true) + .dataFetcher(env -> + GqlUtil.getTransitService(env).getPatternsForStop(env.getSource(), true) ) .build() ) @@ -361,17 +350,7 @@ public static GraphQLObjectType create( .newFieldDefinition() .name("stopType") .type(Scalars.GraphQLString) - .dataFetcher(environment -> { - StopLocation stopLocation = environment.getSource(); - if (stopLocation instanceof RegularStop) { - return "regular"; - } else if (stopLocation instanceof AreaStop) { - return "flexible_area"; - } else if (stopLocation instanceof GroupStop) { - return "flexible_group"; - } - return null; - }) + .dataFetcher(env -> ((StopLocation) env.getSource()).getStopType()) .build() ) .field( @@ -380,13 +359,11 @@ public static GraphQLObjectType create( .name("flexibleArea") .description("Geometry for flexible area.") .type(GeoJSONCoordinatesScalar.getGraphQGeoJSONCoordinatesScalar()) - .dataFetcher(environment -> { - if (environment.getSource() instanceof AreaStop areaStop) { - return areaStop.getGeometry().getCoordinates(); - } else if (environment.getSource() instanceof GroupStop groupStop) { - return groupStop.getEncompassingAreaGeometry().getCoordinates(); - } - return null; + .dataFetcher(env -> { + StopLocation stopLocation = env.getSource(); + return stopLocation.getEncompassingAreaGeometry() == null + ? null + : stopLocation.getEncompassingAreaGeometry().getCoordinates(); }) .build() ) @@ -396,13 +373,7 @@ public static GraphQLObjectType create( .name("flexibleGroup") .description("the Quays part of a flexible group.") .type(GraphQLList.list(REF)) - .dataFetcher(environment -> - ( - environment.getSource() instanceof GroupStop groupStop - ? groupStop.getLocations() - : null - ) - ) + .dataFetcher(env -> ((StopLocation) env.getSource()).getChildLocations()) .build() ) .field( @@ -410,7 +381,7 @@ public static GraphQLObjectType create( .newFieldDefinition() .name("tariffZones") .type(new GraphQLNonNull(new GraphQLList(tariffZoneType))) - .dataFetcher(environment -> ((StopLocation) environment.getSource()).getFareZones()) + .dataFetcher(env -> ((StopLocation) env.getSource()).getFareZones()) .build() ) .build(); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java b/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java index 7ec84763d81..37334161b0a 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java @@ -97,7 +97,7 @@ public void linkTransitStops(Graph graph, TransitModel transitModel) { .stream() .filter(GroupStop.class::isInstance) .map(GroupStop.class::cast) - .flatMap(g -> g.getLocations().stream().filter(RegularStop.class::isInstance)) + .flatMap(g -> g.getChildLocations().stream().filter(RegularStop.class::isInstance)) .toList() ); } diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java index 30bd04eea73..c3c9ad2d0ae 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java @@ -374,7 +374,7 @@ private void mapFlexibleStopPlaces() { transitBuilder.stopModel().withAreaStop(areaStop); } else if (stopLocation instanceof GroupStop groupStop) { transitBuilder.stopModel().withGroupStop(groupStop); - for (var child : groupStop.getLocations()) { + for (var child : groupStop.getChildLocations()) { if (child instanceof AreaStop areaStop) { transitBuilder.stopModel().withAreaStop(areaStop); } diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index c369c995f09..a398a7dae1c 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -84,6 +84,12 @@ public I18NString getUrl() { return url; } + @Nonnull + @Override + public String getStopType() { + return "flexible_area"; + } + @Override public String getFirstZoneAsString() { return zoneId; @@ -103,6 +109,14 @@ public Geometry getGeometry() { return geometry; } + /** + * Returns the geometry of area that defines the stop, in this case the same as getGeometry. + */ + @Override + public Geometry getEncompassingAreaGeometry() { + return geometry; + } + @Override public boolean isPartOfStation() { return false; diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index 2f2ddca044f..d42a1eb121d 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -63,6 +63,12 @@ public I18NString getUrl() { return null; } + @Override + @Nonnull + public String getStopType() { + return "flexible_group"; + } + @Override public String getFirstZoneAsString() { return null; @@ -86,9 +92,16 @@ public Geometry getGeometry() { } /** - * Returns the geometry of the area that encompasses the bounds of this location group. + * Returns the geometry of the area that encompasses the bounds of this StopLocation group. If the + * group is defined only as a list of stops, this will return the same as getGeometry. If on the + * other hand the group is defined as an area and the stops are inferred from that area, then this + * will return the geometry of the area. */ + @Override public Geometry getEncompassingAreaGeometry() { + if (encompassingAreaGeometry == null) { + return geometry; + } return encompassingAreaGeometry; } @@ -105,7 +118,9 @@ public boolean isPartOfSameStationAs(StopLocation alternativeStop) { /** * Returns all the locations belonging to this location group. */ - public Set getLocations() { + @Override + @Nonnull + public Set getChildLocations() { return stopLocations; } @@ -114,7 +129,7 @@ public boolean sameAs(@Nonnull GroupStop other) { return ( getId().equals(other.getId()) && Objects.equals(name, other.getName()) && - Objects.equals(stopLocations, other.getLocations()) + Objects.equals(stopLocations, other.getChildLocations()) ); } diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index b574eb8c9ea..0dc22d20512 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -41,7 +41,7 @@ public class GroupStopBuilder extends AbstractEntityBuilder(original.getLocations()); + this.stopLocations = new HashSet<>(original.getChildLocations()); this.geometry = (GeometryCollection) original.getGeometry(); this.centroid = original.getCoordinate(); } diff --git a/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java b/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java index 5d5760337ff..88fafab17e8 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java @@ -81,6 +81,12 @@ public I18NString getUrl() { return url; } + @Nonnull + @Override + public String getStopType() { + return "regular"; + } + @Override @Nullable public ZoneId getTimeZone() { diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java index 84658c16be8..0d42519d663 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java @@ -3,6 +3,7 @@ import java.time.ZoneId; import java.util.Collection; import java.util.List; +import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; @@ -43,6 +44,9 @@ public interface StopLocation extends LogInfo { @Nullable I18NString getUrl(); + @Nonnull + String getStopType(); + /** * Short text or a number that identifies the location for riders. These codes are often used in * phone-based reservation systems to make it easier for riders to specify a particular location. @@ -121,6 +125,15 @@ default String getFirstZoneAsString() { @Nullable Geometry getGeometry(); + /** + * The geometry of the area that encompasses the bounds of the stop area. If the stop is defined + * as a point, this is null. + */ + @Nullable + default Geometry getEncompassingAreaGeometry() { + return null; + } + @Nullable default ZoneId getTimeZone() { return null; @@ -135,6 +148,14 @@ default StopTransferPriority getPriority() { boolean isPartOfSameStationAs(StopLocation alternativeStop); + /** + * Returns the child locations of this location, for example StopLocations within a GroupStop. + */ + @Nullable + default Set getChildLocations() { + return null; + } + @Override default String logName() { return ObjectUtils.ifNotNull(getName(), Object::toString, null); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java index 6e082d9e98d..94c203c76ae 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java @@ -228,6 +228,6 @@ public void testFlexLocationGroup() { assertInstanceOf(GroupStop.class, mapped.getStop()); var groupStop = (GroupStop) mapped.getStop(); - assertEquals("[RegularStop{A:1 Stop}]", groupStop.getLocations().toString()); + assertEquals("[RegularStop{A:1 Stop}]", groupStop.getChildLocations().toString()); } } diff --git a/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java index b59f3c1b58a..e4bba2b729d 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java @@ -258,7 +258,7 @@ private void assertGroupStopMapping(FlexibleStopPlace flexibleStopPlace) { assertNotNull(groupStop); // Only one of the stops should be inside the polygon - Set locations = groupStop.getLocations(); + Set locations = groupStop.getChildLocations(); assertEquals(1, locations.size()); assertEquals(stop1.getId(), locations.stream().findFirst().orElseThrow().getId()); } diff --git a/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java b/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java index fa073404e39..17938131eef 100644 --- a/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java +++ b/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java @@ -44,7 +44,7 @@ void copy() { assertEquals(subject, copy); assertEquals(ID, copy.getId().getId()); - assertEquals(STOP_LOCATION, copy.getLocations().iterator().next()); + assertEquals(STOP_LOCATION, copy.getChildLocations().iterator().next()); assertEquals("v2", copy.getName().toString()); } From 9ae66d363fb71354c98a7e6ed1a429a899e1f512 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 19 Jan 2024 17:26:53 +0200 Subject: [PATCH 0343/1688] Set scooter preferences to be equal to bike preferences in apis --- docs/RouteRequest.md | 4 -- docs/RouterConfiguration.md | 4 -- .../resources/RequestToPreferencesMapper.java | 22 ++++++ .../apis/gtfs/mapping/RouteRequestMapper.java | 22 ++++++ .../transmodel/mapping/PreferencesMapper.java | 2 + .../preferences/ScooterPreferencesMapper.java | 36 ++++++++++ .../visualizer/GraphVisualizer.java | 6 ++ .../ScooterPreferencesMapperTest.java | 70 +++++++++++++++++++ .../module/osm/TriangleInequalityTest.java | 1 + .../routing/algorithm/TurnCostTest.java | 1 + 10 files changed, 160 insertions(+), 8 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java create mode 100644 src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 70fa0d26e49..d478bb01c6e 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -1158,10 +1158,6 @@ include stairs as a last result. "scooter" : { "speed" : 5, "reluctance" : 5.0, - "walk" : { - "reluctance" : 10.0, - "stairsReluctance" : 150.0 - }, "rental" : { "pickupCost" : 120, "dropOffTime" : "30s", diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index dfe3c3f9750..abf338c44e5 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -499,10 +499,6 @@ Used to group requests when monitoring OTP. "scooter" : { "speed" : 5, "reluctance" : 5.0, - "walk" : { - "reluctance" : 10.0, - "stairsReluctance" : 150.0 - }, "rental" : { "pickupCost" : 120, "dropOffTime" : "30s", diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index 2208ec13a14..009d1c03c1f 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -32,6 +32,7 @@ void map() { mapCar(); mapWalk(); mapBike(); + mapScooter(); var boardAndAlightSlack = mapTransit(); @@ -95,6 +96,27 @@ private void mapBike() { }); } + private void mapScooter() { + preferences.withScooter(scooter -> { + setIfNotNull(req.bikeSpeed, scooter::withSpeed); + setIfNotNull(req.bikeReluctance, scooter::withReluctance); + setIfNotNull( + req.bikeOptimizeType, + optimizeType -> scooter.withOptimizeType(LegacyVehicleRoutingOptimizeType.map(optimizeType)) + ); + + if (req.bikeOptimizeType == LegacyVehicleRoutingOptimizeType.TRIANGLE) { + scooter.withOptimizeTriangle(triangle -> { + setIfNotNull(req.triangleTimeFactor, triangle::withTime); + setIfNotNull(req.triangleSlopeFactor, triangle::withSlope); + setIfNotNull(req.triangleSafetyFactor, triangle::withSafety); + }); + } + + scooter.withRental(this::mapRental); + }); + } + private BoardAndAlightSlack mapTransit() { preferences.withTransit(tr -> { setIfNotNull(req.boardSlack, tr::withDefaultBoardSlackSec); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 5cdae33850f..d9a190ccf5d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -98,6 +98,28 @@ public static RouteRequest toRouteRequest( car.withRental(rental -> setRentalPreferences(callWith, request, rental)); }); + preferences.withScooter(scooter -> { + callWith.argument("bikeReluctance", scooter::withReluctance); + callWith.argument("bikeSpeed", scooter::withSpeed); + + if (environment.getArgument("optimize") != null) { + scooter.withOptimizeType( + OptimizationTypeMapper.map( + GraphQLTypes.GraphQLOptimizeType.valueOf(environment.getArgument("optimize")) + ) + ); + } + if (scooter.optimizeType() == VehicleRoutingOptimizeType.TRIANGLE) { + scooter.withOptimizeTriangle(triangle -> { + callWith.argument("triangle.timeFactor", triangle::withTime); + callWith.argument("triangle.slopeFactor", triangle::withSlope); + callWith.argument("triangle.safetyFactor", triangle::withSafety); + }); + } + + scooter.withRental(rental -> setRentalPreferences(callWith, request, rental)); + }); + preferences.withWalk(b -> { callWith.argument("walkReluctance", b::withReluctance); callWith.argument("walkSpeed", b::withSpeed); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java index 846437952e4..a86193553f2 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java @@ -3,6 +3,7 @@ import static org.opentripplanner.apis.transmodel.mapping.preferences.BikePreferencesMapper.mapBikePreferences; import static org.opentripplanner.apis.transmodel.mapping.preferences.CarPreferencesMapper.mapCarPreferences; import static org.opentripplanner.apis.transmodel.mapping.preferences.ItineraryFilterPreferencesMapper.mapItineraryFilterPreferences; +import static org.opentripplanner.apis.transmodel.mapping.preferences.ScooterPreferencesMapper.mapScooterPreferences; import static org.opentripplanner.apis.transmodel.mapping.preferences.StreetPreferencesMapper.mapStreetPreferences; import static org.opentripplanner.apis.transmodel.mapping.preferences.TransferPreferencesMapper.mapTransferPreferences; import static org.opentripplanner.apis.transmodel.mapping.preferences.TransitPreferencesMapper.mapTransitPreferences; @@ -24,6 +25,7 @@ static void mapPreferences( preferences.withWalk(walk -> mapWalkPreferences(walk, callWith)); preferences.withBike(bike -> mapBikePreferences(bike, callWith)); preferences.withCar(car -> mapCarPreferences(car, callWith)); + preferences.withScooter(scooter -> mapScooterPreferences(scooter, callWith)); preferences.withTransfer(transfer -> mapTransferPreferences(transfer, environment, callWith)); preferences.withTransit(transit -> mapTransitPreferences(transit, environment, callWith)); preferences.withItineraryFilter(itineraryFilter -> diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java new file mode 100644 index 00000000000..d7d5c019f93 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapper.java @@ -0,0 +1,36 @@ +package org.opentripplanner.apis.transmodel.mapping.preferences; + +import static org.opentripplanner.apis.transmodel.mapping.preferences.RentalPreferencesMapper.mapRentalPreferences; + +import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator; +import org.opentripplanner.routing.api.request.preference.ScooterPreferences; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; + +public class ScooterPreferencesMapper { + + public static void mapScooterPreferences( + ScooterPreferences.Builder scooter, + DataFetcherDecorator callWith + ) { + callWith.argument("bikeSpeed", scooter::withSpeed); + callWith.argument("bicycleOptimisationMethod", scooter::withOptimizeType); + + // WALK reluctance is used for backwards compatibility, then overridden + callWith.argument( + "walkReluctance", + r -> { + scooter.withReluctance((double) r); + } + ); + + if (scooter.optimizeType() == VehicleRoutingOptimizeType.TRIANGLE) { + scooter.withOptimizeTriangle(triangle -> { + callWith.argument("triangleFactors.time", triangle::withTime); + callWith.argument("triangleFactors.slope", triangle::withSlope); + callWith.argument("triangleFactors.safety", triangle::withSafety); + }); + } + + scooter.withRental(rental -> mapRentalPreferences(rental, callWith)); + } +} diff --git a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java index 338423df961..6ab7d86917c 100644 --- a/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java +++ b/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java @@ -490,6 +490,12 @@ protected void route(String from, String to) { // there should be a ui element for walk distance and optimize type .withOptimizeType(getSelectedOptimizeType()) ); + preferences.withScooter(scooter -> + scooter + .withSpeed(Float.parseFloat(bikeSpeed.getText())) + // there should be a ui element for walk distance and optimize type + .withOptimizeType(getSelectedOptimizeType()) + ); }); System.out.println("--------"); diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java new file mode 100644 index 00000000000..2b5c7563ac2 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/preferences/ScooterPreferencesMapperTest.java @@ -0,0 +1,70 @@ +package org.opentripplanner.apis.transmodel.mapping.preferences; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.apis.transmodel.mapping.preferences.ScooterPreferencesMapper.mapScooterPreferences; + +import java.util.List; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.apis.transmodel._support.TestDataFetcherDecorator; +import org.opentripplanner.routing.api.request.preference.ScooterPreferences; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; + +class ScooterPreferencesMapperTest { + + static List mapScooterPreferencesTestCases() { + return List.of( + Arguments.of("walkReluctance", 10.0, "ScooterPreferences{reluctance: 10.0}"), + Arguments.of("bikeSpeed", 10.0, "ScooterPreferences{speed: 10.0}"), + Arguments.of( + "bicycleOptimisationMethod", + VehicleRoutingOptimizeType.TRIANGLE, + "ScooterPreferences{optimizeType: TRIANGLE}" + ), + // No effect unless BicycleOptimize is TRIANGLE + Arguments.of("triangleFactors.time", 0.17, "ScooterPreferences{}"), + Arguments.of("triangleFactors.slope", 0.12, "ScooterPreferences{}"), + Arguments.of("triangleFactors.safety", 0.13, "ScooterPreferences{}") + ); + } + + @ParameterizedTest + @MethodSource("mapScooterPreferencesTestCases") + void testMapScooterPreferences(String field, Object value, String expected) { + var preferences = ScooterPreferences.of(); + mapScooterPreferences(preferences, TestDataFetcherDecorator.of(field, value)); + assertEquals(expected, preferences.build().toString()); + } + + static List mapScooterPreferencesOptimizeTriangleTestCases() { + return List.of( + Arguments.of( + "triangleFactors.time", + 0.17, + "TimeSlopeSafetyTriangle[time=1.0, slope=0.0, safety=0.0]" + ), + Arguments.of( + "triangleFactors.slope", + 0.12, + "TimeSlopeSafetyTriangle[time=0.0, slope=1.0, safety=0.0]" + ), + Arguments.of( + "triangleFactors.safety", + 0.13, + "TimeSlopeSafetyTriangle[time=0.0, slope=0.0, safety=1.0]" + ) + ); + } + + @ParameterizedTest + @MethodSource("mapScooterPreferencesOptimizeTriangleTestCases") + void testMapScooterPreferencesOptimizeTriangle(String field, Object value, String expected) { + var preferences = ScooterPreferences.of().withOptimizeType(VehicleRoutingOptimizeType.TRIANGLE); + mapScooterPreferences(preferences, TestDataFetcherDecorator.of(field, value)); + assertEquals( + "ScooterPreferences{optimizeType: TRIANGLE, optimizeTriangle: " + expected + "}", + preferences.build().toString() + ); + } +} diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java b/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java index 4cdada95e4b..52069a7a72e 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java @@ -182,6 +182,7 @@ private void checkTriangleInequality(RequestModes modes, List fil .withStreet(street -> street.withTurnReluctance(1.0)) .withCar(car -> car.withSpeed(1.0).withReluctance(1.0)) .withBike(bike -> bike.withSpeed(1.0).withReluctance(1.0)) + .withScooter(scooter -> scooter.withSpeed(1.0).withReluctance(1.0)) ); if (modes != null) { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java b/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java index 53e340dcc63..dfb062226a4 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java @@ -94,6 +94,7 @@ public void before() { preferences .withCar(it -> it.withSpeed(1.0).withReluctance(1.0)) .withBike(bike -> bike.withSpeed(1.0).withReluctance(1.0)) + .withScooter(scooter -> scooter.withSpeed(1.0).withReluctance(1.0)) .withWalk(walk -> walk.withSpeed(1.0).withStairsReluctance(1.0).withReluctance(1.0)) .withStreet(it -> it.withTurnReluctance(1.0)) ); From b22d9e406da07635bab51956149f6ee0f43f1526 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 19 Jan 2024 17:27:36 +0200 Subject: [PATCH 0344/1688] Disable scooter arrival to destination in access requests --- .../routing/algorithm/raptoradapter/router/TransitRouter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 1b5c836c832..62b655cfc18 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -232,6 +232,8 @@ private Collection fetchAccessEgresses(AccessEgressType typ accessRequest.withPreferences(p -> { p.withBike(b -> b.withRental(r -> r.withAllowArrivingInRentedVehicleAtDestination(false))); p.withCar(c -> c.withRental(r -> r.withAllowArrivingInRentedVehicleAtDestination(false))); + p.withScooter(s -> s.withRental(r -> r.withAllowArrivingInRentedVehicleAtDestination(false)) + ); }); } From dcf811e80ce793e3dba4a69cef27b8b569fe3b10 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 19 Jan 2024 16:36:27 +0100 Subject: [PATCH 0345/1688] Update Portland config example --- docs/examples/ibi/portland/build-config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/examples/ibi/portland/build-config.json b/docs/examples/ibi/portland/build-config.json index 4b3a232ffba..46309d21c59 100644 --- a/docs/examples/ibi/portland/build-config.json +++ b/docs/examples/ibi/portland/build-config.json @@ -6,7 +6,7 @@ "transitFeeds": [ { "type": "gtfs", - "feedId": "trimet", + "feedId": "TriMet", "source": "https://developer.trimet.org/schedule/gtfs.zip" } ] From 3d38d4a15932c58fb82bdc67882fc294d2d8b615 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 19 Jan 2024 17:40:05 +0200 Subject: [PATCH 0346/1688] Move class to correct package --- .../ext/restapi}/mapping/LegacyVehicleRoutingOptimizeType.java | 2 +- .../ext/restapi/resources/RequestToPreferencesMapper.java | 2 +- .../opentripplanner/ext/restapi/resources/RoutingResource.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/{main/java/org/opentripplanner/api => ext/java/org/opentripplanner/ext/restapi}/mapping/LegacyVehicleRoutingOptimizeType.java (93%) diff --git a/src/main/java/org/opentripplanner/api/mapping/LegacyVehicleRoutingOptimizeType.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyVehicleRoutingOptimizeType.java similarity index 93% rename from src/main/java/org/opentripplanner/api/mapping/LegacyVehicleRoutingOptimizeType.java rename to src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyVehicleRoutingOptimizeType.java index 0cb2ae38bcc..675e8541048 100644 --- a/src/main/java/org/opentripplanner/api/mapping/LegacyVehicleRoutingOptimizeType.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegacyVehicleRoutingOptimizeType.java @@ -1,4 +1,4 @@ -package org.opentripplanner.api.mapping; +package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index 009d1c03c1f..91e7b790ba7 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -2,7 +2,7 @@ import jakarta.validation.constraints.NotNull; import java.util.function.Consumer; -import org.opentripplanner.api.mapping.LegacyVehicleRoutingOptimizeType; +import org.opentripplanner.ext.restapi.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.routing.algorithm.filterchain.api.TransitGeneralizedCostFilterParams; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java index 53464940a9e..1d985f0e555 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java @@ -18,9 +18,9 @@ import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; -import org.opentripplanner.api.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.ext.dataoverlay.api.DataOverlayParameters; +import org.opentripplanner.ext.restapi.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.framework.time.DurationUtils; From 242b3fbbf694ab550985963ac14859fdaee6abea Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 19 Jan 2024 18:09:21 +0100 Subject: [PATCH 0347/1688] Return agencies and feed publisher in geocoding --- docs/apis/Apis.md | 2 +- docs/sandbox/GeocoderAPI.md | 8 ++--- .../ext/geocoder/LuceneIndexTest.java | 1 + .../ext/geocoder/GeocoderResource.java | 24 ++++++++------ .../ext/geocoder/LuceneIndex.java | 28 ++++++++++++---- .../ext/geocoder/StopCluster.java | 15 ++++++++- .../ext/geocoder/StopClusterMapper.java | 32 +++++++++++++++++-- .../opentripplanner/apis/APIEndpoints.java | 2 ++ .../service/DefaultTransitService.java | 5 +++ .../transit/service/TransitService.java | 2 ++ 10 files changed, 96 insertions(+), 23 deletions(-) diff --git a/docs/apis/Apis.md b/docs/apis/Apis.md index 48b530a57e1..d9f0467bbca 100644 --- a/docs/apis/Apis.md +++ b/docs/apis/Apis.md @@ -18,7 +18,7 @@ entities on a vector map. The [Actuator API](../sandbox/ActuatorAPI.md) provides endpoints for checking the health status of the OTP instance and reading live application metrics. -The [Geocoder API](../sandbox/GeocoderAPI.md) allows you to geocode street corners and stop names. +The [Geocoder API](../sandbox/GeocoderAPI.md) allows you to geocode stop names and codes. ## Legacy APIs (to be removed) diff --git a/docs/sandbox/GeocoderAPI.md b/docs/sandbox/GeocoderAPI.md index 0405724fff6..f7a1be3f293 100644 --- a/docs/sandbox/GeocoderAPI.md +++ b/docs/sandbox/GeocoderAPI.md @@ -26,7 +26,7 @@ To enable this you need to add the feature to `otp-config.json`. The required geocode API for Stop and From/To searches in the debug client. -Path: `/otp/routers/{routerId}/geocode` +Path: `/otp/geocode` It supports the following URL parameters: @@ -40,12 +40,12 @@ It supports the following URL parameters: #### Stop clusters A stop cluster is a deduplicated groups of stops. This means that for any stop that has a parent -station only the parent is returned and for stops that have identical names and are very close +station only the parent is returned and for stops that have _identical_ names and are very close to each other, only one is returned. -This is useful for a general purpose fuzzy "stop" search. +This is useful for a general purpose fuzzy stop search. -Path: `/otp/routers/{routerId}/geocode/stopClusters` +Path: `/otp/geocode/stopClusters` It supports the following URL parameters: diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 371bcb249b6..178b8b6fd67 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -105,6 +105,7 @@ static void setup() { .of(ALEXANDERPLATZ_STATION, BERLIN_HAUPTBAHNHOF_STATION, FIVE_POINTS_STATION) .forEach(stopModel::withStation); var transitModel = new TransitModel(stopModel.build(), new Deduplicator()); + transitModel.index(); var transitService = new DefaultTransitService(transitModel) { private final Multimap modes = ImmutableMultimap .builder() diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java index 39ed6da297c..f5d1f950632 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java @@ -21,24 +21,30 @@ /** * OTP simple built-in geocoder used by the debug client. */ -@Path("/routers/{ignoreRouterId}/geocode") +@Path("/geocode") @Produces(MediaType.APPLICATION_JSON) public class GeocoderResource { private final OtpServerRequestContext serverContext; - /** - * @deprecated The support for multiple routers are removed from OTP2. See - * https://github.com/opentripplanner/OpenTripPlanner/issues/2760 - */ - @Deprecated - @PathParam("ignoreRouterId") - private String ignoreRouterId; - public GeocoderResource(@Context OtpServerRequestContext requestContext) { serverContext = requestContext; } + /** + * This class is only here for backwards-compatibility. It will be removed in the future. + */ + @Path("/routers/{ignoreRouterId}/geocode") + public static class GeocoderResourceOldPath extends GeocoderResource { + + public GeocoderResourceOldPath( + @Context OtpServerRequestContext serverContext, + @PathParam("ignoreRouterId") String ignore + ) { + super(serverContext); + } + } + /** * Geocode using data using the OTP graph for stops, clusters and street names * diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 71b0cf67b34..e390c900377 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -42,7 +42,6 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.opentripplanner.ext.geocoder.StopCluster.Coordinate; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; @@ -67,6 +66,7 @@ public class LuceneIndex implements Serializable { public LuceneIndex(TransitService transitService) { this.transitService = transitService; + var stopClusterMapper = new StopClusterMapper(transitService); this.analyzer = new PerFieldAnalyzerWrapper( @@ -80,7 +80,6 @@ public LuceneIndex(TransitService transitService) { var directory = new ByteBuffersDirectory(); - var stopClusterMapper = new StopClusterMapper(transitService); try { try ( var directoryWriter = new IndexWriter( @@ -128,7 +127,7 @@ public LuceneIndex(TransitService transitService) { directoryWriter, StopCluster.class, stopCluster.id().toString(), - new NonLocalizedString(stopCluster.name()), + I18NString.of(stopCluster.name()), stopCluster.code(), stopCluster.coordinate().lat(), stopCluster.coordinate().lon(), @@ -176,17 +175,34 @@ public Stream queryStopLocationGroups(String query, boolean * one of those is chosen at random and returned. */ public Stream queryStopClusters(String query) { - return matchingDocuments(StopCluster.class, query, false).map(LuceneIndex::toStopCluster); + return matchingDocuments(StopCluster.class, query, false).map(this::toStopCluster); } - private static StopCluster toStopCluster(Document document) { + private StopCluster toStopCluster(Document document) { var id = FeedScopedId.parse(document.get(ID)); var name = document.get(NAME); var code = document.get(CODE); var lat = document.getField(LAT).numericValue().doubleValue(); var lon = document.getField(LON).numericValue().doubleValue(); var modes = Arrays.asList(document.getValues(MODE)); - return new StopCluster(id, code, name, new Coordinate(lat, lon), modes); + var stopLocation = transitService.getStopLocation(id); + var agencies = transitService + .getAgenciesForStopLocation(stopLocation) + .stream() + .map(StopClusterMapper::toAgency) + .toList(); + var feedPublisher = StopClusterMapper.toFeedPublisher( + transitService.getFeedInfo(id.getFeedId()) + ); + return new StopCluster( + id, + code, + name, + new Coordinate(lat, lon), + modes, + agencies, + feedPublisher + ); } static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, final Set suggestFields) { diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java index afb60960ed4..8ffd44511fd 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.geocoder; import java.util.Collection; +import java.util.List; import javax.annotation.Nullable; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -18,10 +19,22 @@ record StopCluster( @Nullable String code, String name, Coordinate coordinate, - Collection modes + Collection modes, + List agencies, + @Nullable FeedPublisher feedPublisher ) { /** * Easily serializable version of a coordinate */ public record Coordinate(double lat, double lon) {} + + /** + * Easily serializable version of an agency + */ + public record Agency(FeedScopedId id, String name) {} + + /** + * Easily serializable version of a feed publisher + */ + public record FeedPublisher(String name) {} } diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index bc2f4f7022b..186d6d6b57e 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -6,6 +6,8 @@ import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.model.FeedInfo; +import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.site.StopLocationsGroup; import org.opentripplanner.transit.service.TransitService; @@ -62,7 +64,15 @@ StopCluster map(StopLocationsGroup g) { null, g.getName().toString(), toCoordinate(g.getCoordinate()), - modes + modes, + g + .getChildStops() + .stream() + .flatMap(sl -> transitService.getAgenciesForStopLocation(sl).stream()) + .distinct() + .map(StopClusterMapper::toAgency) + .toList(), + toFeedPublisher(transitService.getFeedInfo(g.getId().getFeedId())) ); } @@ -76,7 +86,13 @@ Optional map(StopLocation sl) { sl.getCode(), name.toString(), toCoordinate(sl.getCoordinate()), - modes + modes, + transitService + .getAgenciesForStopLocation(sl) + .stream() + .map(StopClusterMapper::toAgency) + .toList(), + toFeedPublisher(transitService.getFeedInfo(sl.getId().getFeedId())) ); }); } @@ -85,5 +101,17 @@ private static StopCluster.Coordinate toCoordinate(WgsCoordinate c) { return new StopCluster.Coordinate(c.latitude(), c.longitude()); } + static StopCluster.Agency toAgency(Agency a) { + return new StopCluster.Agency(a.getId(), a.getName()); + } + + static StopCluster.FeedPublisher toFeedPublisher(FeedInfo fi) { + if (fi == null) { + return null; + } else { + return new StopCluster.FeedPublisher(fi.getPublisherName()); + } + } + private record DeduplicationKey(I18NString name, WgsCoordinate coordinate) {} } diff --git a/src/main/java/org/opentripplanner/apis/APIEndpoints.java b/src/main/java/org/opentripplanner/apis/APIEndpoints.java index 68f6bda3d3a..555ea1659f1 100644 --- a/src/main/java/org/opentripplanner/apis/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/apis/APIEndpoints.java @@ -61,6 +61,8 @@ private APIEndpoints() { addIfEnabled(SandboxAPIMapboxVectorTilesApi, VectorTilesResource.class); addIfEnabled(SandboxAPIParkAndRideApi, ParkAndRideResource.class); addIfEnabled(SandboxAPIGeocoder, GeocoderResource.class); + // scheduled to be removed and only here for backwards compatibility + addIfEnabled(SandboxAPIGeocoder, GeocoderResource.GeocoderResourceOldPath.class); addIfEnabled(SandboxAPITravelTime, TravelTimeResource.class); // scheduled to be removed diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java index 0d08bcf34b2..91d129e0a0c 100644 --- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -572,6 +572,11 @@ public List getModesOfStopLocation(StopLocation stop) { return sortByOccurrenceAndReduce(getPatternModesOfStop(stop)).toList(); } + @Override + public List getAgenciesForStopLocation(StopLocation stop) { + return getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList(); + } + /** * For each pattern visiting this {@link StopLocation} return its {@link TransitMode} */ diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java index d0664aa292d..5006ed93f30 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -215,4 +215,6 @@ List stopTimesForPatternAtStop( * So, if more patterns of mode BUS than RAIL visit the stop, the result will be [BUS,RAIL]. */ List getModesOfStopLocation(StopLocation stop); + + List getAgenciesForStopLocation(StopLocation stop); } From d4d7c5518f04318c0770d0d96924c49478c2e583 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 20 Jan 2024 09:13:51 +0100 Subject: [PATCH 0348/1688] Serialize agencies in Lucene index --- .../ext/geocoder/LuceneIndexTest.java | 13 ++++---- .../ext/geocoder/LuceneIndex.java | 31 +++++++++++------- .../ext/geocoder/LuceneStopCluster.java | 19 +++++++++++ .../ext/geocoder/StopClusterMapper.java | 32 +++++++------------ 4 files changed, 56 insertions(+), 39 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 178b8b6fd67..01b62a63891 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -175,14 +175,15 @@ class StopClusters { } ) void stopClustersWithTypos(String searchTerm) { - var result1 = index.queryStopClusters(searchTerm).toList(); - assertEquals(List.of(mapper.map(ALEXANDERPLATZ_STATION)), result1); + var results = index.queryStopClusters(searchTerm).toList(); + var ids = results.stream().map(StopCluster::id).toList(); + assertEquals(List.of(ALEXANDERPLATZ_STATION.getId()), ids); } @Test void fuzzyStopClusters() { - var result1 = index.queryStopClusters("arts").toList(); - assertEquals(List.of(mapper.map(ARTS_CENTER).get()), result1); + var result1 = index.queryStopClusters("arts").map(StopCluster::id).toList(); + assertEquals(List.of(ARTS_CENTER.getId()), result1); } @Test @@ -221,8 +222,8 @@ void deduplicatedStopClusters() { } ) void stopClustersWithSpace(String query) { - var result = index.queryStopClusters(query).toList(); - assertEquals(List.of(mapper.map(FIVE_POINTS_STATION)), result); + var result = index.queryStopClusters(query).map(StopCluster::id).toList(); + assertEquals(List.of(FIVE_POINTS_STATION.getId()), result); } @ParameterizedTest diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index e390c900377..26c4d34ce25 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -59,14 +59,16 @@ public class LuceneIndex implements Serializable { private static final String LAT = "latitude"; private static final String LON = "longitude"; private static final String MODE = "mode"; + private static final String AGENCY_IDS= "agency_ids"; private final TransitService transitService; private final Analyzer analyzer; private final SuggestIndexSearcher searcher; + private final StopClusterMapper stopClusterMapper; public LuceneIndex(TransitService transitService) { this.transitService = transitService; - var stopClusterMapper = new StopClusterMapper(transitService); + this.stopClusterMapper = new StopClusterMapper(transitService); this.analyzer = new PerFieldAnalyzerWrapper( @@ -98,6 +100,7 @@ public LuceneIndex(TransitService transitService) { stopLocation.getCode(), stopLocation.getCoordinate().latitude(), stopLocation.getCoordinate().longitude(), + Set.of(), Set.of() ) ); @@ -113,6 +116,7 @@ public LuceneIndex(TransitService transitService) { null, stopLocationsGroup.getCoordinate().latitude(), stopLocationsGroup.getCoordinate().longitude(), + Set.of(), Set.of() ) ); @@ -131,7 +135,8 @@ public LuceneIndex(TransitService transitService) { stopCluster.code(), stopCluster.coordinate().lat(), stopCluster.coordinate().lon(), - stopCluster.modes() + stopCluster.modes(), + stopCluster.agencies() ) ); } @@ -179,23 +184,21 @@ public Stream queryStopClusters(String query) { } private StopCluster toStopCluster(Document document) { - var id = FeedScopedId.parse(document.get(ID)); + var clusterId = FeedScopedId.parse(document.get(ID)); var name = document.get(NAME); var code = document.get(CODE); var lat = document.getField(LAT).numericValue().doubleValue(); var lon = document.getField(LON).numericValue().doubleValue(); var modes = Arrays.asList(document.getValues(MODE)); - var stopLocation = transitService.getStopLocation(id); - var agencies = transitService - .getAgenciesForStopLocation(stopLocation) - .stream() - .map(StopClusterMapper::toAgency) - .toList(); + var agencies = Arrays.stream(document.getValues(AGENCY_IDS)).map(id -> { + var fsid = FeedScopedId.parse(id); + return transitService.getAgencyForId(fsid); + }).filter(Objects::nonNull).map(StopClusterMapper::toAgency).toList(); var feedPublisher = StopClusterMapper.toFeedPublisher( - transitService.getFeedInfo(id.getFeedId()) + transitService.getFeedInfo(clusterId.getFeedId()) ); return new StopCluster( - id, + clusterId, code, name, new Coordinate(lat, lon), @@ -230,7 +233,8 @@ private static void addToIndex( @Nullable String code, double latitude, double longitude, - Collection modes + Collection modes, + Collection agencyIds ) { String typeName = type.getSimpleName(); @@ -251,6 +255,9 @@ private static void addToIndex( for (var mode : modes) { document.add(new TextField(MODE, mode, Store.YES)); } + for (var ids : agencyIds) { + document.add(new TextField(AGENCY_IDS, ids, Store.YES)); + } try { writer.addDocument(document); diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java new file mode 100644 index 00000000000..3f916186430 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -0,0 +1,19 @@ +package org.opentripplanner.ext.geocoder; + +import java.util.Collection; +import javax.annotation.Nullable; +import org.opentripplanner.transit.model.framework.FeedScopedId; + +/** + * A package-private helper type for transporting + */ +record LuceneStopCluster( + FeedScopedId id, + @Nullable + String code, + String name, + StopCluster.Coordinate coordinate, + Collection modes, + Collection agencies + ){ +} diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 186d6d6b57e..c1a6d216ff0 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -13,7 +13,7 @@ import org.opentripplanner.transit.service.TransitService; /** - * Mappers for generating {@link StopCluster} from the transit model. + * Mappers for generating {@link LuceneStopCluster} from the transit model. */ class StopClusterMapper { @@ -23,6 +23,7 @@ class StopClusterMapper { this.transitService = transitService; } + /** * De-duplicates collections of {@link StopLocation} and {@link StopLocationsGroup} into a stream * of {@link StopCluster}. @@ -31,7 +32,7 @@ class StopClusterMapper { * - of "identical" stops which are very close to each other and have an identical name, only one * is chosen (at random) */ - Iterable generateStopClusters( + Iterable generateStopClusters( Collection stopLocations, Collection stopLocationsGroups ) { @@ -57,42 +58,31 @@ Iterable generateStopClusters( return Iterables.concat(deduplicatedStops, stations); } - StopCluster map(StopLocationsGroup g) { + LuceneStopCluster map(StopLocationsGroup g) { var modes = transitService.getModesOfStopLocationsGroup(g).stream().map(Enum::name).toList(); - return new StopCluster( + var agencies = g.getChildStops().stream().flatMap(s -> transitService.getAgenciesForStopLocation(s).stream()).distinct().map(s ->s.getId().toString()).toList(); + return new LuceneStopCluster( g.getId(), null, g.getName().toString(), toCoordinate(g.getCoordinate()), modes, - g - .getChildStops() - .stream() - .flatMap(sl -> transitService.getAgenciesForStopLocation(sl).stream()) - .distinct() - .map(StopClusterMapper::toAgency) - .toList(), - toFeedPublisher(transitService.getFeedInfo(g.getId().getFeedId())) + agencies ); } - Optional map(StopLocation sl) { + Optional map(StopLocation sl) { + var agencies = transitService.getAgenciesForStopLocation(sl).stream().map(a -> a.getId().toString()).toList(); return Optional .ofNullable(sl.getName()) .map(name -> { var modes = transitService.getModesOfStopLocation(sl).stream().map(Enum::name).toList(); - return new StopCluster( + return new LuceneStopCluster( sl.getId(), sl.getCode(), name.toString(), toCoordinate(sl.getCoordinate()), - modes, - transitService - .getAgenciesForStopLocation(sl) - .stream() - .map(StopClusterMapper::toAgency) - .toList(), - toFeedPublisher(transitService.getFeedInfo(sl.getId().getFeedId())) + modes, agencies ); }); } From 8726b2fe10a7e48ed5de4e702b8cc3207897f22f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 20 Jan 2024 10:01:25 +0100 Subject: [PATCH 0349/1688] Add test for agencies --- .../ext/geocoder/LuceneIndexTest.java | 52 +++++++++++++++---- .../ext/geocoder/LuceneIndex.java | 18 ++++--- .../ext/geocoder/LuceneStopCluster.java | 6 +-- .../ext/geocoder/StopClusterMapper.java | 18 +++++-- 4 files changed, 69 insertions(+), 25 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 01b62a63891..348586377d4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -18,6 +18,8 @@ import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; @@ -28,57 +30,63 @@ class LuceneIndexTest { private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + static final Agency BVG = Agency + .of(id("bvg")) + .withName("BVG") + .withTimezone("Europe/Berlin") + .build(); + // Berlin - static Station BERLIN_HAUPTBAHNHOF_STATION = TEST_MODEL + static final Station BERLIN_HAUPTBAHNHOF_STATION = TEST_MODEL .station("Hauptbahnhof") .withCoordinate(52.52495, 13.36952) .build(); - static Station ALEXANDERPLATZ_STATION = TEST_MODEL + static final Station ALEXANDERPLATZ_STATION = TEST_MODEL .station("Alexanderplatz") .withCoordinate(52.52277, 13.41046) .build(); - static RegularStop ALEXANDERPLATZ_BUS = TEST_MODEL + static final RegularStop ALEXANDERPLATZ_BUS = TEST_MODEL .stop("Alexanderplatz Bus") .withCoordinate(52.52277, 13.41046) .withVehicleType(BUS) .withParentStation(ALEXANDERPLATZ_STATION) .build(); - static RegularStop ALEXANDERPLATZ_RAIL = TEST_MODEL + static final RegularStop ALEXANDERPLATZ_RAIL = TEST_MODEL .stop("Alexanderplatz S-Bahn") .withCoordinate(52.52157, 13.41123) .withVehicleType(TransitMode.RAIL) .withParentStation(ALEXANDERPLATZ_STATION) .build(); - static RegularStop LICHTERFELDE_OST_1 = TEST_MODEL + static final RegularStop LICHTERFELDE_OST_1 = TEST_MODEL .stop("Lichterfelde Ost") .withId(id("lichterfelde-gleis-1")) .withCoordinate(52.42986, 13.32808) .build(); - static RegularStop LICHTERFELDE_OST_2 = TEST_MODEL + static final RegularStop LICHTERFELDE_OST_2 = TEST_MODEL .stop("Lichterfelde Ost") .withId(id("lichterfelde-gleis-2")) .withCoordinate(52.42985, 13.32807) .build(); - static RegularStop WESTHAFEN = TEST_MODEL + static final RegularStop WESTHAFEN = TEST_MODEL .stop("Westhafen") .withVehicleType(null) .withCoordinate(52.42985, 13.32807) .build(); // Atlanta - static Station FIVE_POINTS_STATION = TEST_MODEL + static final Station FIVE_POINTS_STATION = TEST_MODEL .station("Five Points") .withCoordinate(33.753899, -84.39156) .build(); - static RegularStop ARTS_CENTER = TEST_MODEL + static final RegularStop ARTS_CENTER = TEST_MODEL .stop("Arts Center") .withCode("4456") .withCoordinate(52.52277, 13.41046) .build(); - static RegularStop ARTHUR = TEST_MODEL + static final RegularStop ARTHUR = TEST_MODEL .stop("Arthur Langford Jr Pl SW at 220") .withCoordinate(52.52277, 13.41046) .build(); @@ -120,6 +128,23 @@ public List getModesOfStopLocation(StopLocation stop) { return List.copyOf(modes.get(stop)); } } + + @Override + public List getAgenciesForStopLocation(StopLocation stop) { + if (stop.equals(ALEXANDERPLATZ_BUS)) { + return List.of(BVG); + } else { + return List.of(); + } + } + + @Override + public Agency getAgencyForId(FeedScopedId id) { + if (id.equals(BVG.getId())) { + return BVG; + } + return null; + } }; index = new LuceneIndex(transitService); mapper = new StopClusterMapper(transitService); @@ -242,5 +267,12 @@ void modes() { assertEquals(WESTHAFEN.getName().toString(), stop.name()); assertEquals(List.of(FERRY.name(), BUS.name()), stop.modes()); } + + @Test + void agencies() { + var result = index.queryStopClusters("alexanderplatz").toList().getFirst(); + assertEquals(ALEXANDERPLATZ_STATION.getName().toString(), result.name()); + assertEquals(List.of(StopClusterMapper.toAgency(BVG)), result.agencies()); + } } } diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 26c4d34ce25..75e0fc3333a 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -59,16 +59,15 @@ public class LuceneIndex implements Serializable { private static final String LAT = "latitude"; private static final String LON = "longitude"; private static final String MODE = "mode"; - private static final String AGENCY_IDS= "agency_ids"; + private static final String AGENCY_IDS = "agency_ids"; private final TransitService transitService; private final Analyzer analyzer; private final SuggestIndexSearcher searcher; - private final StopClusterMapper stopClusterMapper; public LuceneIndex(TransitService transitService) { this.transitService = transitService; - this.stopClusterMapper = new StopClusterMapper(transitService); + StopClusterMapper stopClusterMapper = new StopClusterMapper(transitService); this.analyzer = new PerFieldAnalyzerWrapper( @@ -190,10 +189,15 @@ private StopCluster toStopCluster(Document document) { var lat = document.getField(LAT).numericValue().doubleValue(); var lon = document.getField(LON).numericValue().doubleValue(); var modes = Arrays.asList(document.getValues(MODE)); - var agencies = Arrays.stream(document.getValues(AGENCY_IDS)).map(id -> { - var fsid = FeedScopedId.parse(id); - return transitService.getAgencyForId(fsid); - }).filter(Objects::nonNull).map(StopClusterMapper::toAgency).toList(); + var agencies = Arrays + .stream(document.getValues(AGENCY_IDS)) + .map(id -> { + var fsid = FeedScopedId.parse(id); + return transitService.getAgencyForId(fsid); + }) + .filter(Objects::nonNull) + .map(StopClusterMapper::toAgency) + .toList(); var feedPublisher = StopClusterMapper.toFeedPublisher( transitService.getFeedInfo(clusterId.getFeedId()) ); diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index 3f916186430..25776e1d39f 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -9,11 +9,9 @@ */ record LuceneStopCluster( FeedScopedId id, - @Nullable - String code, + @Nullable String code, String name, StopCluster.Coordinate coordinate, Collection modes, Collection agencies - ){ -} +) {} diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index c1a6d216ff0..d231765b66d 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -23,7 +23,6 @@ class StopClusterMapper { this.transitService = transitService; } - /** * De-duplicates collections of {@link StopLocation} and {@link StopLocationsGroup} into a stream * of {@link StopCluster}. @@ -60,7 +59,13 @@ Iterable generateStopClusters( LuceneStopCluster map(StopLocationsGroup g) { var modes = transitService.getModesOfStopLocationsGroup(g).stream().map(Enum::name).toList(); - var agencies = g.getChildStops().stream().flatMap(s -> transitService.getAgenciesForStopLocation(s).stream()).distinct().map(s ->s.getId().toString()).toList(); + var agencies = g + .getChildStops() + .stream() + .flatMap(s -> transitService.getAgenciesForStopLocation(s).stream()) + .distinct() + .map(s -> s.getId().toString()) + .toList(); return new LuceneStopCluster( g.getId(), null, @@ -72,7 +77,11 @@ LuceneStopCluster map(StopLocationsGroup g) { } Optional map(StopLocation sl) { - var agencies = transitService.getAgenciesForStopLocation(sl).stream().map(a -> a.getId().toString()).toList(); + var agencies = transitService + .getAgenciesForStopLocation(sl) + .stream() + .map(a -> a.getId().toString()) + .toList(); return Optional .ofNullable(sl.getName()) .map(name -> { @@ -82,7 +91,8 @@ Optional map(StopLocation sl) { sl.getCode(), name.toString(), toCoordinate(sl.getCoordinate()), - modes, agencies + modes, + agencies ); }); } From 1db3ac13d8c5a2b3685087494883f2709407a64b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 20 Jan 2024 17:35:11 +0100 Subject: [PATCH 0350/1688] Add test for feed publisher --- .../ext/geocoder/LuceneIndexTest.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 348586377d4..0b5933c2a52 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -7,6 +7,7 @@ import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; +import java.time.LocalDate; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -15,6 +16,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opentripplanner.model.FeedInfo; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.Deduplicator; @@ -145,6 +147,11 @@ public Agency getAgencyForId(FeedScopedId id) { } return null; } + + @Override + public FeedInfo getFeedInfo(String feedId) { + return new FeedInfo("F", "A Publisher", "http://example.com", "de", LocalDate.MIN, LocalDate.MIN, "1"); + } }; index = new LuceneIndex(transitService); mapper = new StopClusterMapper(transitService); @@ -154,7 +161,7 @@ public Agency getAgencyForId(FeedScopedId id) { void stopLocations() { var result1 = index.queryStopLocations("lich", true).toList(); assertEquals(1, result1.size()); - assertEquals(LICHTERFELDE_OST_1.getName().toString(), result1.get(0).getName().toString()); + assertEquals(LICHTERFELDE_OST_1.getName().toString(), result1.getFirst().getName().toString()); var result2 = index.queryStopLocations("alexan", true).collect(Collectors.toSet()); assertEquals(Set.of(ALEXANDERPLATZ_BUS, ALEXANDERPLATZ_RAIL), result2); @@ -215,7 +222,7 @@ void fuzzyStopClusters() { void deduplicatedStopClusters() { var result = index.queryStopClusters("lich").toList(); assertEquals(1, result.size()); - assertEquals(LICHTERFELDE_OST_1.getName().toString(), result.get(0).name()); + assertEquals(LICHTERFELDE_OST_1.getName().toString(), result.getFirst().name()); } @ParameterizedTest @@ -256,23 +263,24 @@ void stopClustersWithSpace(String query) { void fuzzyStopCode(String query) { var result = index.queryStopClusters(query).toList(); assertEquals(1, result.size()); - assertEquals(ARTS_CENTER.getName().toString(), result.get(0).name()); + assertEquals(ARTS_CENTER.getName().toString(), result.getFirst().name()); } @Test void modes() { var result = index.queryStopClusters("westh").toList(); assertEquals(1, result.size()); - var stop = result.get(0); + var stop = result.getFirst(); assertEquals(WESTHAFEN.getName().toString(), stop.name()); assertEquals(List.of(FERRY.name(), BUS.name()), stop.modes()); } @Test - void agencies() { + void agenciesAndFeedPublisher() { var result = index.queryStopClusters("alexanderplatz").toList().getFirst(); assertEquals(ALEXANDERPLATZ_STATION.getName().toString(), result.name()); assertEquals(List.of(StopClusterMapper.toAgency(BVG)), result.agencies()); + assertEquals("A Publisher", result.feedPublisher().name()); } } } From 1182afd9f95d1c03b38bc89cfc6cb6238f7de15c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 21 Jan 2024 00:02:20 +0100 Subject: [PATCH 0351/1688] Add documentation --- .../opentripplanner/ext/geocoder/LuceneIndexTest.java | 10 +++++++++- .../ext/geocoder/LuceneStopCluster.java | 2 +- .../transit/service/TransitService.java | 4 ++++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 0b5933c2a52..8dc3ff77a01 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -150,7 +150,15 @@ public Agency getAgencyForId(FeedScopedId id) { @Override public FeedInfo getFeedInfo(String feedId) { - return new FeedInfo("F", "A Publisher", "http://example.com", "de", LocalDate.MIN, LocalDate.MIN, "1"); + return new FeedInfo( + "F", + "A Publisher", + "http://example.com", + "de", + LocalDate.MIN, + LocalDate.MIN, + "1" + ); } }; index = new LuceneIndex(transitService); diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index 25776e1d39f..49f1a7ee5c3 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -5,7 +5,7 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; /** - * A package-private helper type for transporting + * A package-private helper type for transporting data before serializing. */ record LuceneStopCluster( FeedScopedId id, diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java index 5006ed93f30..c16b928d2bd 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -216,5 +216,9 @@ List stopTimesForPatternAtStop( */ List getModesOfStopLocation(StopLocation stop); + /** + * Iterates over all routes that visit this stop location and return a de-duplicated list + * of their agencies. + */ List getAgenciesForStopLocation(StopLocation stop); } From 0e529c74808670b8579ae0f5499ef7d83a5260bf Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 21 Jan 2024 11:35:18 +0100 Subject: [PATCH 0352/1688] Add tests --- .../org/opentripplanner/ext/geocoder/LuceneIndex.java | 2 +- .../ext/geocoder/LuceneStopCluster.java | 2 +- .../ext/geocoder/StopClusterMapper.java | 6 ++---- .../transit/service/DefaultTransitService.java | 10 ++++++++++ .../transit/service/TransitService.java | 6 ++++++ .../transit/service/DefaultTransitServiceTest.java | 9 +++++++++ 6 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 75e0fc3333a..b92b36f5a59 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -135,7 +135,7 @@ public LuceneIndex(TransitService transitService) { stopCluster.coordinate().lat(), stopCluster.coordinate().lon(), stopCluster.modes(), - stopCluster.agencies() + stopCluster.agencyIds() ) ); } diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index 49f1a7ee5c3..f58d7aa9af9 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -13,5 +13,5 @@ record LuceneStopCluster( String name, StopCluster.Coordinate coordinate, Collection modes, - Collection agencies + Collection agencyIds ) {} diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index d231765b66d..10243665ac8 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -59,11 +59,9 @@ Iterable generateStopClusters( LuceneStopCluster map(StopLocationsGroup g) { var modes = transitService.getModesOfStopLocationsGroup(g).stream().map(Enum::name).toList(); - var agencies = g - .getChildStops() + var agencies = transitService + .getAgenciesForStopLocationsGroup(g) .stream() - .flatMap(s -> transitService.getAgenciesForStopLocation(s).stream()) - .distinct() .map(s -> s.getId().toString()) .toList(); return new LuceneStopCluster( diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java index 91d129e0a0c..f38499bfd68 100644 --- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -577,6 +577,16 @@ public List getAgenciesForStopLocation(StopLocation stop) { return getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList(); } + @Override + public List getAgenciesForStopLocationsGroup(StopLocationsGroup group) { + return group + .getChildStops() + .stream() + .flatMap(sl -> getAgenciesForStopLocation(sl).stream()) + .distinct() + .toList(); + } + /** * For each pattern visiting this {@link StopLocation} return its {@link TransitMode} */ diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java index c16b928d2bd..156a3c8dd1a 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -216,6 +216,12 @@ List stopTimesForPatternAtStop( */ List getModesOfStopLocation(StopLocation stop); + /** + * Iterates over all child stops, the routes that visit this stop and return a de-duplicated list + * of their agencies. + */ + List getAgenciesForStopLocationsGroup(StopLocationsGroup group); + /** * Iterates over all routes that visit this stop location and return a de-duplicated list * of their agencies. diff --git a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java index 2a26dc681be..ab3d5c8ae0a 100644 --- a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java +++ b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java @@ -43,6 +43,8 @@ static void setup() { .build(); var transitModel = new TransitModel(stopModel, new Deduplicator()); + transitModel.addTripPattern(RAIL_PATTERN.getId(), RAIL_PATTERN); + transitModel.index(); service = new DefaultTransitService(transitModel) { @@ -74,4 +76,11 @@ void stationModes() { var modes = service.getModesOfStopLocationsGroup(STATION); assertEquals(List.of(RAIL, FERRY, TRAM), modes); } + + @Test + void stopAgencies() { + var stop = RAIL_PATTERN.getStopPattern().getStop(0); + var agencies = service.getAgenciesForStopLocation(stop); + assertEquals("[Agency{F:A1 Agency Test}]", agencies.toString()); + } } From a0e40e354167d886e963c3b2662e942dc8ced5ae Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 21 Jan 2024 22:04:56 +0100 Subject: [PATCH 0353/1688] Inline code --- .../java/org/opentripplanner/ext/geocoder/LuceneIndex.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index b92b36f5a59..56769db0028 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -191,10 +191,7 @@ private StopCluster toStopCluster(Document document) { var modes = Arrays.asList(document.getValues(MODE)); var agencies = Arrays .stream(document.getValues(AGENCY_IDS)) - .map(id -> { - var fsid = FeedScopedId.parse(id); - return transitService.getAgencyForId(fsid); - }) + .map(id -> transitService.getAgencyForId(FeedScopedId.parse(id))) .filter(Objects::nonNull) .map(StopClusterMapper::toAgency) .toList(); From cb59e3dd2d8982a2efde8d810322a3057910dcf0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 09:55:25 +0100 Subject: [PATCH 0354/1688] Make the layers param a List --- .../ext/vectortiles/VectorTilesResource.java | 6 ++++-- .../java/org/opentripplanner/apis/support/TileJson.java | 9 +++++---- .../vectortiles/GraphInspectorVectorTileResource.java | 3 ++- .../org/opentripplanner/apis/support/TileJsonTest.java | 3 ++- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index d87c60836de..772db7394f3 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -89,14 +89,16 @@ public TileJson getTileJson( .filter(Predicate.not(Objects::isNull)) .toList(); + List rLayers = Arrays.asList(requestedLayers.split(",")); + var url = serverContext .vectorTileConfig() .basePath() .map(overrideBasePath -> - TileJson.urlFromOverriddenBasePath(uri, headers, overrideBasePath, requestedLayers) + TileJson.urlFromOverriddenBasePath(uri, headers, overrideBasePath, rLayers) ) .orElseGet(() -> - TileJson.urlWithDefaultPath(uri, headers, requestedLayers, ignoreRouterId, "vectorTiles") + TileJson.urlWithDefaultPath(uri, headers, rLayers, ignoreRouterId, "vectorTiles") ); return new TileJson(url, envelope, feedInfos); diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index 09261e295e0..75aabb2b6c6 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -4,6 +4,7 @@ import jakarta.ws.rs.core.UriInfo; import java.io.Serializable; import java.util.Collection; +import java.util.List; import java.util.stream.Collectors; import org.apache.commons.lang3.StringUtils; import org.opentripplanner.framework.io.HttpUtils; @@ -65,7 +66,7 @@ public TileJson(String tileUrl, WorldEnvelope envelope, Collection fee public static String urlWithDefaultPath( UriInfo uri, HttpHeaders headers, - String layers, + List layers, String ignoreRouterId, String path ) { @@ -73,7 +74,7 @@ public static String urlWithDefaultPath( HttpUtils.getBaseAddress(uri, headers), ignoreRouterId, path, - layers + String.join(",", layers) ); } @@ -85,14 +86,14 @@ public static String urlFromOverriddenBasePath( UriInfo uri, HttpHeaders headers, String overridePath, - String layers + List layers ) { var strippedPath = StringUtils.stripStart(overridePath, "/"); strippedPath = StringUtils.stripEnd(strippedPath, "/"); return "%s/%s/%s/{z}/{x}/{y}.pbf".formatted( HttpUtils.getBaseAddress(uri, headers), strippedPath, - layers + String.join(",", layers) ); } } diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 666adebbbf7..08008b4fe82 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -102,11 +102,12 @@ public TileJson getTileJson( ) { var envelope = serverContext.worldEnvelopeService().envelope().orElseThrow(); List feedInfos = feedInfos(); + List rlayer = Arrays.asList(requestedLayers.split(",")); var url = TileJson.urlWithDefaultPath( uri, headers, - requestedLayers, + rlayer, ignoreRouterId, "inspector/vectortile" ); diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index 6b78042bf29..ac3b7bca522 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import java.util.List; import org.glassfish.jersey.server.internal.routing.UriRoutingContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -10,7 +11,7 @@ class TileJsonTest { - private static final String LAYERS = "stops,rentalVehicles"; + private static final List LAYERS = List.of("stops", "rentalVehicles"); @ParameterizedTest @ValueSource( From de355dd3683281ea59220b7737b2c98b071e2b60 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 10:11:20 +0100 Subject: [PATCH 0355/1688] Incorporate review feedback --- doc-templates/sandbox/MapboxVectorTilesApi.md | 14 +++++++------ docs/sandbox/MapboxVectorTilesApi.md | 20 ++++++++++--------- .../vectortiles/VectorTilesConfigDocTest.java | 2 +- ...leRentalServiceDirectoryConfigDocTest.java | 2 +- .../config/routerconfig/VectorTileConfig.java | 6 +++--- .../doc/BuildConfigurationDocTest.java | 2 +- .../generate/doc/ConfigurationDocTest.java | 2 +- .../doc/FlexConfigurationDocTest.java | 2 +- .../generate/doc/GraphQLTutorialDocTest.java | 2 +- .../generate/doc/RouteRequestDocTest.java | 2 +- .../doc/RouterConfigurationDocTest.java | 2 +- .../generate/doc/RoutingModeDocTest.java | 2 +- .../generate/doc/UpdaterConfigDocTest.java | 2 +- .../generate/doc/VehicleParkingDocTest.java | 2 +- 14 files changed, 33 insertions(+), 29 deletions(-) diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md index 4e3e047fedb..879ea3755d6 100644 --- a/doc-templates/sandbox/MapboxVectorTilesApi.md +++ b/doc-templates/sandbox/MapboxVectorTilesApi.md @@ -3,18 +3,19 @@ ## Contact Info - HSL, Finland -- IBI Arcardis, US +- Arcadis, US ## Documentation This API produces [Mapbox vector tiles](https://docs.mapbox.com/vector-tiles/reference/), which are -used by eg. [Digitransit-ui](https://github.com/HSLdevcom/digitransit-ui) to show information about +used by [Digitransit-ui](https://github.com/HSLdevcom/digitransit-ui) and +[`otp-react-redux`](https://github.com/opentripplanner/otp-react-redux) to show information about public transit entities on the map. The tiles can be fetched from `/otp/routers/{routerId}/vectorTiles/{layers}/{z}/{x}/{y}.pbf`, where `layers` is a comma separated list of layer names from the configuration. -Maplibre/Mapbox GL JS also require a tilejson.json endpoint which is available at +Maplibre/Mapbox GL JS also requires a tilejson.json endpoint which is available at `/otp/routers/{routerId}/vectorTiles/{layers}/tilejson.json`. Translatable fields in the tiles are translated based on the `accept-language` header in requests. @@ -37,7 +38,8 @@ The feature must be configured in `router-config.json` as follows ```JSON { - "vectorTiles": + "vectorTiles": { + "basePath": "/only/configure/if/required", "layers": [ { "name": "stops", @@ -145,8 +147,8 @@ For each layer, the configuration includes: ### Extending -If more generic layers are created for this API, it should be moved out from the sandbox, into the -core code, with potentially leaving specific property mappers in place. +If more generic layers are created for this API, the code should be moved out from the sandbox, into +the core, perhaps potentially leaving specific property mappers in place. #### Creating a new layer diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 92cd867ecce..a58bd3c30f0 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -3,18 +3,19 @@ ## Contact Info - HSL, Finland -- IBI Arcardis, US +- Arcadis, US ## Documentation This API produces [Mapbox vector tiles](https://docs.mapbox.com/vector-tiles/reference/), which are -used by eg. [Digitransit-ui](https://github.com/HSLdevcom/digitransit-ui) to show information about +used by [Digitransit-ui](https://github.com/HSLdevcom/digitransit-ui) and +[`otp-react-redux`](https://github.com/opentripplanner/otp-react-redux) to show information about public transit entities on the map. The tiles can be fetched from `/otp/routers/{routerId}/vectorTiles/{layers}/{z}/{x}/{y}.pbf`, where `layers` is a comma separated list of layer names from the configuration. -Maplibre/Mapbox GL JS also require a tilejson.json endpoint which is available at +Maplibre/Mapbox GL JS also requires a tilejson.json endpoint which is available at `/otp/routers/{routerId}/vectorTiles/{layers}/tilejson.json`. Translatable fields in the tiles are translated based on the `accept-language` header in requests. @@ -37,7 +38,8 @@ The feature must be configured in `router-config.json` as follows ```JSON { - "vectorTiles": + "vectorTiles": { + "basePath": "/only/configure/if/required", "layers": [ { "name": "stops", @@ -168,9 +170,9 @@ The path of the vector tile source URLs in `tilejson.json`. This is useful if you have a proxy setup and rewrite the path that is passed to OTP. -If you don't configure this optional value then the path returned in `tilejson.json` is -`/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you, for example, set -a value of `/otp_test/tiles` then the returned path changes to +If you don't configure this optional value then the path returned in `tilejson.json` is in +the format `/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. +If you, for example, set a value of `/otp_test/tiles` then the returned path changes to `/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. The protocol and host are always read from the incoming HTTP request. If you run OTP behind @@ -219,8 +221,8 @@ Currently `Digitransit` is supported for all layer types. ### Extending -If more generic layers are created for this API, it should be moved out from the sandbox, into the -core code, with potentially leaving specific property mappers in place. +If more generic layers are created for this API, the code should be moved out from the sandbox, into +the core, perhaps potentially leaving specific property mappers in place. #### Creating a new layer diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java index e758026d02b..233e3fa3737 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/VectorTilesConfigDocTest.java @@ -32,7 +32,7 @@ public class VectorTilesConfigDocTest { public void updateDoc() { NodeAdapter node = readVectorTiles(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String template = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java b/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java index 51f72c05e3e..4936bb4dd44 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vehiclerentalservicedirectory/generatedoc/VehicleRentalServiceDirectoryConfigDocTest.java @@ -37,7 +37,7 @@ public class VehicleRentalServiceDirectoryConfigDocTest { public void updateConfigurationDoc() { NodeAdapter node = readConfigDefaults(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String doc = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index 0abc046282d..ad2f109ac8e 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -57,9 +57,9 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String """ This is useful if you have a proxy setup and rewrite the path that is passed to OTP. - If you don't configure this optional value then the path returned in `tilejson.json` is - `/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. If you, for example, set - a value of `/otp_test/tiles` then the returned path changes to + If you don't configure this optional value then the path returned in `tilejson.json` is in + the format `/otp/routers/default/vectorTiles/layer1,layer2/{z}/{x}/{x}.pbf`. + If you, for example, set a value of `/otp_test/tiles` then the returned path changes to `/otp_test/tiles/layer1,layer2/{z}/{x}/{x}.pbf`. The protocol and host are always read from the incoming HTTP request. If you run OTP behind diff --git a/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java b/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java index 287b0145292..4009a455abe 100644 --- a/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/BuildConfigurationDocTest.java @@ -49,7 +49,7 @@ public class BuildConfigurationDocTest { public void updateBuildConfigurationDoc() { NodeAdapter node = readBuildConfig(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String doc = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java b/src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java index 2f972e8300a..19a562d8b3f 100644 --- a/src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/ConfigurationDocTest.java @@ -36,7 +36,7 @@ public class ConfigurationDocTest { */ @Test public void updateConfigurationDoc() { - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String doc = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java b/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java index 2b440d7545a..fd2d7092dc5 100644 --- a/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/FlexConfigurationDocTest.java @@ -33,7 +33,7 @@ public class FlexConfigurationDocTest { public void updateFlexDoc() { NodeAdapter node = readFlexConfig(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String template = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java b/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java index bf2b092e092..5e858ff4d61 100644 --- a/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java @@ -33,7 +33,7 @@ public class GraphQLTutorialDocTest { */ @Test public void updateTutorialDoc() throws IOException { - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String doc = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java b/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java index 9a39b3cfa3f..76642db3e5a 100644 --- a/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/RouteRequestDocTest.java @@ -44,7 +44,7 @@ public class RouteRequestDocTest { public void updateRouteRequestConfigurationDoc() { NodeAdapter node = readRoutingDefaults(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String doc = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java b/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java index a48374e755c..90cdd9de975 100644 --- a/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/RouterConfigurationDocTest.java @@ -51,7 +51,7 @@ public class RouterConfigurationDocTest { public void updateBuildConfigurationDoc() { NodeAdapter node = readRouterConfig(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String doc = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java b/src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java index e08de453630..0c6edc7e16b 100644 --- a/src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/RoutingModeDocTest.java @@ -24,7 +24,7 @@ public class RoutingModeDocTest { @Test public void updateDocs() { - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String doc = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java b/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java index 3d0cb547b7a..fa5abca7814 100644 --- a/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java @@ -50,7 +50,7 @@ public class UpdaterConfigDocTest { public void updateRouterConfigurationDoc() { NodeAdapter node = readBuildConfig(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String template = readFile(TEMPLATE); String original = readFile(OUT_FILE); diff --git a/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java b/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java index de9b921c27a..abc9ceee806 100644 --- a/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/VehicleParkingDocTest.java @@ -33,7 +33,7 @@ public class VehicleParkingDocTest { public void updateVehicleParkingDoc() { NodeAdapter node = readVehicleUpdaters(); - // Read and close inout file (same as output file) + // Read and close input file (same as output file) String template = readFile(TEMPLATE); String original = readFile(OUT_FILE); From b2e14f25fc70c5e775bb972483a5de1ea98b3fc0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 10:24:20 +0100 Subject: [PATCH 0356/1688] Add changelog entry --- doc-templates/sandbox/MapboxVectorTilesApi.md | 1 + docs/sandbox/MapboxVectorTilesApi.md | 1 + 2 files changed, 2 insertions(+) diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md index 879ea3755d6..dfec1ed085a 100644 --- a/doc-templates/sandbox/MapboxVectorTilesApi.md +++ b/doc-templates/sandbox/MapboxVectorTilesApi.md @@ -191,3 +191,4 @@ key, and a function to create the mapper, with a `Graph` object as a parameter, * Added DigitransitRealtime for vehicle rental stations * Changed old vehicle parking mapper to be Stadtnavi * Added a new Digitransit vehicle parking mapper with no real-time information and less fields +- 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) \ No newline at end of file diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index a58bd3c30f0..8b7af296228 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -265,3 +265,4 @@ key, and a function to create the mapper, with a `Graph` object as a parameter, * Added DigitransitRealtime for vehicle rental stations * Changed old vehicle parking mapper to be Stadtnavi * Added a new Digitransit vehicle parking mapper with no real-time information and less fields +- 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) \ No newline at end of file From 3beffe3ca8ba21e40f52f3ec49eb043be8f82586 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 22 Jan 2024 12:00:02 +0200 Subject: [PATCH 0357/1688] Use scooter speed in direct street router --- .../raptoradapter/router/street/DirectStreetRouter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java index 2c6b09c2fb2..6229cbb022c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java @@ -96,6 +96,8 @@ private static double calculateDistanceMaxLimit(RouteRequest request) { distanceLimit = durationLimit * preferences.car().speed(); } else if (mode.includesBiking()) { distanceLimit = durationLimit * preferences.bike().speed(); + } else if (mode.includesScooter()) { + distanceLimit = durationLimit * preferences.scooter().speed(); } else if (mode.includesWalking()) { distanceLimit = durationLimit * preferences.walk().speed(); } else { From 3db40a775d78b35ab25dc97fce16f987a59ac58c Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 22 Jan 2024 12:08:47 +0200 Subject: [PATCH 0358/1688] Add scooter to some more router-cofig examples --- docs/examples/entur/router-config.json | 9 +++++++++ docs/examples/ibi/atlanta/router-config.json | 11 +++++++++++ 2 files changed, 20 insertions(+) diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index ffdec9ded79..1fc56bd8401 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -36,6 +36,15 @@ "dropOffCost": 30 } }, + "scooter": { + "speed": 5, + "reluctance": 5.0, + "rental": { + "pickupCost": 120, + "dropOffTime": "30s", + "dropOffCost": 30 + } + }, "walk": { "speed": 1.3, "reluctance": 4.0, diff --git a/docs/examples/ibi/atlanta/router-config.json b/docs/examples/ibi/atlanta/router-config.json index 909c164ec43..7d6e7272fcd 100644 --- a/docs/examples/ibi/atlanta/router-config.json +++ b/docs/examples/ibi/atlanta/router-config.json @@ -17,6 +17,17 @@ "pickupCost": 850 } }, + "scooter": { + "triangle": { + "time": 0.3, + "flatness": 0.3, + "safety": 0.4 + }, + "rental": { + "pickupTime": "3m", + "pickupCost": 850 + } + }, "itineraryFilters": { // only show non-transit (ie. walking) when it's at least as good as the transit option "nonTransitGeneralizedCostLimit": "0 + 1.0 x", From 01f1576599a0a653002b19a0419763476c3dd266 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 22 Jan 2024 12:26:42 +0200 Subject: [PATCH 0359/1688] Add test for scooter in routing preferences --- .../routing/core/RoutingPreferencesTest.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java b/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java index c67d539e902..c3cff43b1a9 100644 --- a/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java @@ -48,6 +48,16 @@ public void copyOfWithBikeChanges() { assertSame(pref.walk(), copy.walk()); } + @Test + public void copyOfWithScooterChanges() { + var pref = new RoutingPreferences(); + var copy = pref.copyOf().withScooter(b -> b.withReluctance(2.5)).build(); + + assertNotSame(pref, copy); + assertNotSame(pref.scooter(), copy.scooter()); + assertSame(pref.walk(), copy.walk()); + } + @Test public void copyOfWithWalkChanges() { var pref = new RoutingPreferences(); From a5fe85e8f1c4fd0b2fee76c09472e63a27df94cf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:13:03 +0000 Subject: [PATCH 0360/1688] fix(deps): update dependency com.google.guava:guava to v33 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34f4365b580..72b13f5854b 100644 --- a/pom.xml +++ b/pom.xml @@ -739,7 +739,7 @@ com.google.guava guava - 32.1.3-jre + 33.0.0-jre From 5159265161cf836016aa9825a9eaf930a68c7552 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 22 Jan 2024 13:26:04 +0200 Subject: [PATCH 0361/1688] Add tests for vehicle rental edge --- .../model/edge/VehicleRentalEdgeTest.java | 138 ++++++++++++++++-- 1 file changed, 124 insertions(+), 14 deletions(-) diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java index 84f5efcc1c5..c490e315933 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java @@ -30,7 +30,7 @@ class VehicleRentalEdgeTest { VehicleRentalPlaceVertex vertex; @Test - void testRentingWithAvailableVehicles() { + void testRentingWithAvailableBikes() { initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3); var s1 = rent(); @@ -49,7 +49,7 @@ void testRentingWithNoAvailableVehicles() { @Test void testRentingWithNoAvailableVehiclesAndNoRealtimeUsage() { - initEdgeAndRequest(StreetMode.BIKE_RENTAL, 0, 3, false, true, false); + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 0, 3, false, true, false, false); var s1 = rent(); @@ -76,7 +76,7 @@ void testReturningWithNoAvailableSpaces() { @Test void testReturningWithNoAvailableSpacesAndOverloading() { - initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 0, true, true, true); + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 0, true, true, true, false); var s1 = rentAndDropOff(); @@ -85,7 +85,7 @@ void testReturningWithNoAvailableSpacesAndOverloading() { @Test void testReturningWithNoAvailableSpacesAndNoRealtimeUsage() { - initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 0, false, true, false); + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 0, false, true, false, false); var s1 = rentAndDropOff(); @@ -94,7 +94,7 @@ void testReturningWithNoAvailableSpacesAndNoRealtimeUsage() { @Test void testRentingFromClosedStation() { - initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 0, true, false, true); + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 0, true, false, true, false); var s1 = rent(); @@ -103,13 +103,13 @@ void testRentingFromClosedStation() { @Test void testReturningToClosedStation() { - initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3, true, true, true); + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3, true, true, true, false); var s1 = rent(); assertFalse(State.isEmpty(s1)); - initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3, true, false, true); + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3, true, false, true, false); var s2 = dropOff(s1[0]); @@ -118,15 +118,78 @@ void testReturningToClosedStation() { @Test void testReturningAndReturningToClosedStationWithNoRealtimeUsage() { - initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3, false, true, false); + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3, false, true, false, false); var s1 = rentAndDropOff(); assertFalse(State.isEmpty(s1)); } + @Test + void testRentingWithFreeFloatingBicycle() { + initFreeFloatingEdgeAndRequest(StreetMode.BIKE_RENTAL, RentalFormFactor.BICYCLE, false); + + var s1 = rent(); + + assertFalse(State.isEmpty(s1)); + } + + @Test + void testRentingWithFreeFloatingScooter() { + initFreeFloatingEdgeAndRequest(StreetMode.SCOOTER_RENTAL, RentalFormFactor.SCOOTER, false); + + var s1 = rent(); + + assertFalse(State.isEmpty(s1)); + } + + @Test + void testRentingWithFreeFloatingCar() { + initFreeFloatingEdgeAndRequest(StreetMode.CAR_RENTAL, RentalFormFactor.CAR, false); + + var s1 = rent(); + + assertFalse(State.isEmpty(s1)); + } + + @Test + void testBannedBicycleNetworkStation() { + initEdgeAndRequest(StreetMode.BIKE_RENTAL, 3, 3, false, true, true, true); + + var s1 = rent(); + + assertTrue(State.isEmpty(s1)); + } + + @Test + void testBannedBicycleNetworkFreeFloating() { + initFreeFloatingEdgeAndRequest(StreetMode.BIKE_RENTAL, RentalFormFactor.BICYCLE, true); + + var s1 = rent(); + + assertTrue(State.isEmpty(s1)); + } + + @Test + void testBannedScooterNetworkFreeFloating() { + initFreeFloatingEdgeAndRequest(StreetMode.SCOOTER_RENTAL, RentalFormFactor.SCOOTER, true); + + var s1 = rent(); + + assertTrue(State.isEmpty(s1)); + } + + @Test + void testBannedCarNetworkFreeFloating() { + initFreeFloatingEdgeAndRequest(StreetMode.CAR_RENTAL, RentalFormFactor.CAR, true); + + var s1 = rent(); + + assertTrue(State.isEmpty(s1)); + } + private void initEdgeAndRequest(StreetMode mode, int vehicles, int spaces) { - initEdgeAndRequest(mode, vehicles, spaces, false, true, true); + initEdgeAndRequest(mode, vehicles, spaces, false, true, true, false); } @Nested @@ -204,7 +267,8 @@ private void initEdgeAndRequest( int spaces, boolean overloadingAllowed, boolean stationOn, - boolean useRealtime + boolean useRealtime, + boolean banNetwork ) { var station = TestVehicleRentalStationBuilder .of() @@ -218,17 +282,63 @@ private void initEdgeAndRequest( vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(vertex, RentalFormFactor.BICYCLE); + Set bannedNetworks = banNetwork ? Set.of(station.getNetwork()) : Set.of(); + this.request = StreetSearchRequest .of() .withMode(mode) .withPreferences(preferences -> preferences - .withCar(car -> - car.withRental(rental -> rental.withUseAvailabilityInformation(useRealtime)) - ) .withBike(bike -> - bike.withRental(rental -> rental.withUseAvailabilityInformation(useRealtime)) + bike.withRental(rental -> + rental + .withUseAvailabilityInformation(useRealtime) + .withBannedNetworks(bannedNetworks) + ) + ) + .build() + ) + .build(); + } + + private void initFreeFloatingEdgeAndRequest( + StreetMode mode, + RentalFormFactor formFactor, + boolean banNetwork + ) { + var network = "1"; + + VehicleRentalVehicle rentalVehicle = new VehicleRentalVehicle(); + + rentalVehicle.latitude = 1; + rentalVehicle.longitude = 1; + rentalVehicle.id = new FeedScopedId(network, "123"); + rentalVehicle.vehicleType = + new RentalVehicleType( + new FeedScopedId(network, "type"), + "type", + formFactor, + RentalVehicleType.PropulsionType.ELECTRIC, + 100000d + ); + + this.vertex = new VehicleRentalPlaceVertex(rentalVehicle); + + vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(vertex, formFactor); + + Set bannedNetworks = banNetwork ? Set.of(network) : Set.of(); + + this.request = + StreetSearchRequest + .of() + .withMode(mode) + .withPreferences(preferences -> + preferences + .withCar(car -> car.withRental(rental -> rental.withBannedNetworks(bannedNetworks))) + .withBike(bike -> bike.withRental(rental -> rental.withBannedNetworks(bannedNetworks))) + .withScooter(scooter -> + scooter.withRental(rental -> rental.withBannedNetworks(bannedNetworks)) ) .build() ) From 6901346f1f461da4e6b14002b4817ff857685945 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 22 Jan 2024 15:11:38 +0200 Subject: [PATCH 0362/1688] Add scooter street edge traversal tests --- .../street/model/edge/StreetEdgeTest.java | 220 ++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 60e8cf58952..0435ca16c82 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -21,6 +21,12 @@ import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.util.ElevationUtils; import org.opentripplanner.routing.util.SlopeCosts; +import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; +import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; +import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; +import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge; +import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; +import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.TurnRestriction; import org.opentripplanner.street.model._data.StreetModelForTest; @@ -33,6 +39,7 @@ import org.opentripplanner.street.search.request.StreetSearchRequestBuilder; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.StateData; +import org.opentripplanner.transit.model.framework.FeedScopedId; public class StreetEdgeTest { @@ -121,6 +128,88 @@ public void testTraverseAsCar() { assertEquals(expectedWeight, s1.getWeight(), 0.0); } + @Test + public void testTraverseFloatingScooter() { + // This test does not depend on the setup method - and can probably be simplified + Coordinate c1 = new Coordinate(-122.575033, 45.456773); + Coordinate c2 = new Coordinate(-122.576668, 45.451426); + + var formFactor = RentalFormFactor.SCOOTER; + var rentalVertex = createRentalVertex(formFactor); + var vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(rentalVertex, formFactor); + + StreetVertex v1 = StreetModelForTest.intersectionVertex("v1", c1.x, c1.y); + StreetVertex v2 = StreetModelForTest.intersectionVertex("v2", c2.x, c2.y); + + var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(rentalVertex, v1); + + GeometryFactory factory = new GeometryFactory(); + LineString geometry = factory.createLineString(new Coordinate[] { c1, c2 }); + + double length = 650.0; + + StreetEdge testStreet = new StreetEdgeBuilder<>() + .withFromVertex(v1) + .withToVertex(v2) + .withGeometry(geometry) + .withName("Test Lane") + .withMeterLength(length) + .withPermission(StreetTraversalPermission.ALL) + .withBack(false) + .buildAndConnect(); + + var request = StreetSearchRequest.of().withMode(StreetMode.SCOOTER_RENTAL); + + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withSpeed(5))); + + State slowResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withSpeed(10))); + + State fastResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + + // Cost and time should be less when scooter speed is higher. + assertTrue(slowResult.getWeight() > fastResult.getWeight() + DELTA); + assertTrue(slowResult.getElapsedTimeSeconds() > fastResult.getElapsedTimeSeconds()); + + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withReluctance(1))); + State lowReluctanceResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withReluctance(5))); + + State highReluctanceResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + // Cost should be more when reluctance is higher but the time should be the same. + assertTrue(highReluctanceResult.getWeight() > lowReluctanceResult.getWeight() + DELTA); + + assertEquals( + highReluctanceResult.getElapsedTimeSeconds(), + lowReluctanceResult.getElapsedTimeSeconds() + ); + } + @Test public void testModeSetCanTraverse() { StreetEdge e = streetEdge(v1, v2, 1.0, StreetTraversalPermission.ALL); @@ -400,4 +489,135 @@ public void testBikeOptimizeTriangle() { double expectedWeight = timeWeight * 0.33 + slopeWeight * 0.33 + safetyWeight * 0.34; assertEquals(expectedWeight, result.getWeight(), DELTA); } + + @Test + public void testScooterOptimizeTriangle() { + // This test does not depend on the setup method - and can probably be simplified + Coordinate c1 = new Coordinate(-122.575033, 45.456773); + Coordinate c2 = new Coordinate(-122.576668, 45.451426); + + var formFactor = RentalFormFactor.SCOOTER; + + var rentalVertex = createRentalVertex(formFactor); + var vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(rentalVertex, formFactor); + + StreetVertex v1 = StreetModelForTest.intersectionVertex("v1", c1.x, c1.y); + StreetVertex v2 = StreetModelForTest.intersectionVertex("v2", c2.x, c2.y); + + var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(rentalVertex, v1); + + GeometryFactory factory = new GeometryFactory(); + LineString geometry = factory.createLineString(new Coordinate[] { c1, c2 }); + + double length = 650.0; + + StreetEdge testStreet = new StreetEdgeBuilder<>() + .withFromVertex(v1) + .withToVertex(v2) + .withGeometry(geometry) + .withName("Test Lane") + .withMeterLength(length) + .withPermission(StreetTraversalPermission.ALL) + .withBack(false) + // a safe street + .withBicycleSafetyFactor(0.74f) + .buildAndConnect(); + + Coordinate[] profile = new Coordinate[] { + new Coordinate(0, 0), // slope = 0.1 + new Coordinate(length / 2, length / 20.0), + new Coordinate(length, 0), // slope = -0.1 + }; + PackedCoordinateSequence elev = new PackedCoordinateSequence.Double(profile); + StreetElevationExtensionBuilder + .of(testStreet) + .withElevationProfile(elev) + .withComputed(false) + .build() + .ifPresent(testStreet::setElevationExtension); + + SlopeCosts costs = ElevationUtils.getSlopeCosts(elev, true); + double trueLength = costs.lengthMultiplier * length; + double slopeWorkLength = testStreet.getEffectiveBikeDistanceForWorkCost(); + double slopeSpeedLength = testStreet.getEffectiveBikeDistance(); + + var request = StreetSearchRequest.of().withMode(StreetMode.SCOOTER_RENTAL); + + request.withPreferences(pref -> + pref + .withScooter(scooter -> + scooter + .withSpeed(SPEED) + .withOptimizeType(VehicleRoutingOptimizeType.TRIANGLE) + .withOptimizeTriangle(it -> it.withTime(1)) + .withReluctance(1) + ) + .withWalk(walk -> walk.withReluctance(1)) + .withCar(car -> car.withReluctance(1)) + ); + + var rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); + var startState = link.traverse(rentedState[0])[0]; + + State result = testStreet.traverse(startState)[0]; + double expectedTimeWeight = slopeSpeedLength / SPEED; + assertEquals(TraverseMode.SCOOTER, result.currentMode()); + assertEquals(expectedTimeWeight, result.getWeight() - startState.getWeight(), DELTA); + + request.withPreferences(p -> + p.withScooter(scooter -> scooter.withOptimizeTriangle(it -> it.withSlope(1))) + ); + rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); + startState = link.traverse(rentedState[0])[0]; + + result = testStreet.traverse(startState)[0]; + double slopeWeight = result.getWeight(); + double expectedSlopeWeight = slopeWorkLength / SPEED; + assertEquals(expectedSlopeWeight, slopeWeight - startState.getWeight(), DELTA); + assertTrue(length * 1.5 / SPEED < slopeWeight); + assertTrue(length * 1.5 * 10 / SPEED > slopeWeight); + + request.withPreferences(p -> + p.withScooter(scooter -> scooter.withOptimizeTriangle(it -> it.withSafety(1))) + ); + rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); + startState = link.traverse(rentedState[0])[0]; + + result = testStreet.traverse(startState)[0]; + double slopeSafety = costs.slopeSafetyCost; + double safetyWeight = result.getWeight(); + double expectedSafetyWeight = (trueLength * 0.74 + slopeSafety) / SPEED; + assertEquals(expectedSafetyWeight, safetyWeight - startState.getWeight(), DELTA); + } + + private VehicleRentalPlaceVertex createRentalVertex(RentalFormFactor formFactor) { + VehicleRentalVehicle rentalVehicle = new VehicleRentalVehicle(); + + var network = "1"; + rentalVehicle.latitude = -122.575133; + rentalVehicle.longitude = 45.456773; + rentalVehicle.id = new FeedScopedId(network, "123"); + rentalVehicle.vehicleType = + new RentalVehicleType( + new FeedScopedId(network, "type"), + "type", + formFactor, + RentalVehicleType.PropulsionType.ELECTRIC, + 100000d + ); + + return new VehicleRentalPlaceVertex(rentalVehicle); + } + + private State traverseStreetFromRental( + StreetEdge streetEdge, + VehicleRentalEdge rentalEdge, + StreetVehicleRentalLink link, + VehicleRentalPlaceVertex rentalVertex, + StreetSearchRequest request + ) { + var rentedState = rentalEdge.traverse(new State(rentalVertex, request)); + var startState = link.traverse(rentedState[0])[0]; + return streetEdge.traverse(startState)[0]; + } } From 79bd73cd45b91963a77dc9a513bd1186deeb3f08 Mon Sep 17 00:00:00 2001 From: eibakke Date: Mon, 22 Jan 2024 14:18:36 +0100 Subject: [PATCH 0363/1688] Adds AreaStop layer to new debug frontend --- .../src/components/MapView/MapView.tsx | 2 +- .../apis/vectortiles/DebugStyleSpec.java | 10 +++++++++ .../GraphInspectorVectorTileResource.java | 4 +++- .../apis/vectortiles/model/StyleBuilder.java | 21 +++++++++++++++++++ .../apis/vectortiles/DebugStyleSpecTest.java | 5 +++-- .../apis/vectortiles/style.json | 13 ++++++++++++ 6 files changed, 51 insertions(+), 4 deletions(-) diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 51cb39068f8..96b4e820bae 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -75,7 +75,7 @@ export function MapView({ }} // it's unfortunate that you have to list these layers here. // maybe there is a way around it: https://github.com/visgl/react-map-gl/discussions/2343 - interactiveLayerIds={['regular-stop', 'vertex', 'edge', 'link']} + interactiveLayerIds={['regular-stop', 'area-stop', 'vertex', 'edge', 'link']} onClick={showFeaturePropPopup} // put lat/long in URL and pan to it on page reload hash={true} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index f7ca564b149..f45d7d36413 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -52,6 +52,7 @@ public class DebugStyleSpec { static StyleSpec build( VectorSourceLayer regularStops, + VectorSourceLayer areaStops, VectorSourceLayer edges, VectorSourceLayer vertices ) { @@ -112,6 +113,15 @@ static StyleSpec build( .minZoom(15) .maxZoom(MAX_ZOOM) .intiallyHidden(), + StyleBuilder + .ofId("area-stop") + .typeFill() + .vectorSourceLayer(areaStops) + .fillColor(GREEN) + .fillOpacity(0.5f) + .fillOutlineColor(BLACK) + .minZoom(6) + .maxZoom(MAX_ZOOM), StyleBuilder .ofId("regular-stop") .typeCircle() diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 5d0778eae6d..b94482af711 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -1,5 +1,6 @@ package org.opentripplanner.apis.vectortiles; +import static org.opentripplanner.apis.vectortiles.model.LayerType.AreaStop; import static org.opentripplanner.apis.vectortiles.model.LayerType.Edge; import static org.opentripplanner.apis.vectortiles.model.LayerType.GeofencingZones; import static org.opentripplanner.apis.vectortiles.model.LayerType.RegularStop; @@ -47,7 +48,7 @@ public class GraphInspectorVectorTileResource { private static final LayerParams REGULAR_STOPS = new LayerParams("regularStops", RegularStop); - private static final LayerParams AREA_STOPS = new LayerParams("areaStops", LayerType.AreaStop); + private static final LayerParams AREA_STOPS = new LayerParams("areaStops", AreaStop); private static final LayerParams GEOFENCING_ZONES = new LayerParams( "geofencingZones", GeofencingZones @@ -140,6 +141,7 @@ public StyleSpec getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) return DebugStyleSpec.build( REGULAR_STOPS.toVectorSourceLayer(stopsSource), + AREA_STOPS.toVectorSourceLayer(stopsSource), EDGES.toVectorSourceLayer(streetSource), VERTICES.toVectorSourceLayer(streetSource) ); diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java index 3b2f36d3156..07efe376968 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java @@ -40,6 +40,7 @@ public enum LayerType { Circle, Line, Raster, + Fill, } private StyleBuilder(String id) { @@ -88,6 +89,11 @@ public StyleBuilder typeLine() { return this; } + public StyleBuilder typeFill() { + type(LayerType.Fill); + return this; + } + private StyleBuilder type(LayerType type) { props.put(TYPE, type.name().toLowerCase()); return this; @@ -132,6 +138,21 @@ public StyleBuilder lineWidth(ZoomDependentNumber zoomStops) { return this; } + public StyleBuilder fillColor(String color) { + paint.put("fill-color", validateColor(color)); + return this; + } + + public StyleBuilder fillOpacity(float opacity) { + paint.put("fill-opacity", opacity); + return this; + } + + public StyleBuilder fillOutlineColor(String color) { + paint.put("fill-outline-color", validateColor(color)); + return this; + } + /** * Hide this layer when the debug client starts. It can be made visible in the UI later. */ diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index befd34a3b38..f2c3ebf49de 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -15,10 +15,11 @@ class DebugStyleSpecTest { @Test void spec() { var vectorSource = new VectorSource("vectorSource", "https://example.com"); - var stops = new VectorSourceLayer(vectorSource, "stops"); + var regularStops = new VectorSourceLayer(vectorSource, "stops"); + var areaStops = new VectorSourceLayer(vectorSource, "stops"); var edges = new VectorSourceLayer(vectorSource, "edges"); var vertices = new VectorSourceLayer(vectorSource, "vertices"); - var spec = DebugStyleSpec.build(stops, edges, vertices); + var spec = DebugStyleSpec.build(regularStops, areaStops, edges, vertices); var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); var expectation = RESOURCES.fileToString("style.json"); diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index 9555f32c1e5..e62c3968924 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -141,6 +141,19 @@ "visibility" : "none" } }, + { + "id" : "area-stop", + "type" : "fill", + "source" : "vectorSource", + "source-layer" : "stops", + "minzoom" : 6, + "maxzoom" : 23, + "paint" : { + "fill-color" : "#22DD9E", + "fill-opacity" : 0.5, + "fill-outline-color" : "#140d0e" + } + }, { "id" : "regular-stop", "type" : "circle", From fe388c785c56d9c277e7f70cec89482dce2fb9c3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 22 Jan 2024 15:35:54 +0200 Subject: [PATCH 0364/1688] Add test for walking before rental --- .../street/model/edge/StreetEdgeTest.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 0435ca16c82..743cfa673ba 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -210,6 +210,33 @@ public void testTraverseFloatingScooter() { ); } + @Test + public void testWalkingBeforeScooter() { + StreetEdge e1 = streetEdgeBuilder(v1, v2, 100.0, StreetTraversalPermission.ALL) + .withCarSpeed(10.0f) + .buildAndConnect(); + + var request = StreetSearchRequest + .copyOf(proto) + .withPreferences(pref -> pref.withWalk(walk -> walk.withReluctance(1))) + .withMode(StreetMode.SCOOTER_RENTAL); + + State s0 = new State(v1, request.build()); + State result = e1.traverse(s0)[0]; + + request.withPreferences(pref -> + pref.withScooter(scooter -> scooter.withReluctance(5).withSpeed(8.5)) + ); + + s0 = new State(v1, request.build()); + var scooterReluctanceResult = e1.traverse(s0)[0]; + + // Scooter preferences shouldn't affect walking when SCOOTER_RENTAL is used as mode + assertEquals(TraverseMode.WALK, result.currentMode()); + assertEquals(result.getWeight(), scooterReluctanceResult.getWeight(), DELTA); + assertEquals(result.getElapsedTimeSeconds(), scooterReluctanceResult.getElapsedTimeSeconds()); + } + @Test public void testModeSetCanTraverse() { StreetEdge e = streetEdge(v1, v2, 1.0, StreetTraversalPermission.ALL); From 696c587e679169437a7c4f17a179f763ed7e0fed Mon Sep 17 00:00:00 2001 From: eibakke Date: Mon, 22 Jan 2024 15:17:17 +0100 Subject: [PATCH 0365/1688] Makes the ChildLocations of a GroupStop a List instead of a Set. --- .../opentripplanner/transit/model/site/GroupStop.java | 6 +++--- .../transit/model/site/GroupStopBuilder.java | 11 +++++------ .../transit/model/site/StopLocation.java | 3 +-- .../netex/mapping/FlexStopsMapperTest.java | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index d42a1eb121d..c5aa3fa028f 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -1,7 +1,7 @@ package org.opentripplanner.transit.model.site; +import java.util.List; import java.util.Objects; -import java.util.Set; import java.util.function.IntSupplier; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -20,7 +20,7 @@ public class GroupStop implements StopLocation { private final int index; - private final Set stopLocations; + private final List stopLocations; private final I18NString name; private final GeometryCollection geometry; @@ -120,7 +120,7 @@ public boolean isPartOfSameStationAs(StopLocation alternativeStop) { */ @Override @Nonnull - public Set getChildLocations() { + public List getChildLocations() { return stopLocations; } diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index 0dc22d20512..8873e6ede99 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -1,8 +1,7 @@ package org.opentripplanner.transit.model.site; -import java.util.HashSet; +import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.function.IntSupplier; import javax.annotation.Nonnull; import org.locationtech.jts.geom.Envelope; @@ -20,7 +19,7 @@ public class GroupStopBuilder extends AbstractEntityBuilder stopLocations = new HashSet<>(); + private List stopLocations = new ArrayList<>(); private GeometryCollection geometry = new GeometryCollection( null, @@ -41,7 +40,7 @@ public class GroupStopBuilder extends AbstractEntityBuilder(original.getChildLocations()); + this.stopLocations = new ArrayList<>(original.getChildLocations()); this.geometry = (GeometryCollection) original.getGeometry(); this.centroid = original.getCoordinate(); } @@ -94,8 +93,8 @@ public GroupStopBuilder addLocation(StopLocation location) { return this; } - public Set stopLocations() { - return Set.copyOf(stopLocations); + public List stopLocations() { + return List.copyOf(stopLocations); } public GeometryCollection geometry() { diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java index 0d42519d663..bff327302af 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java @@ -3,7 +3,6 @@ import java.time.ZoneId; import java.util.Collection; import java.util.List; -import java.util.Set; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; @@ -152,7 +151,7 @@ default StopTransferPriority getPriority() { * Returns the child locations of this location, for example StopLocations within a GroupStop. */ @Nullable - default Set getChildLocations() { + default List getChildLocations() { return null; } diff --git a/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java index e4bba2b729d..3167d64e766 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java @@ -258,7 +258,7 @@ private void assertGroupStopMapping(FlexibleStopPlace flexibleStopPlace) { assertNotNull(groupStop); // Only one of the stops should be inside the polygon - Set locations = groupStop.getChildLocations(); + List locations = groupStop.getChildLocations(); assertEquals(1, locations.size()); assertEquals(stop1.getId(), locations.stream().findFirst().orElseThrow().getId()); } From e6d30052860ebb0c750419dd7d0e679769939ec8 Mon Sep 17 00:00:00 2001 From: eibakke Date: Mon, 22 Jan 2024 15:56:38 +0100 Subject: [PATCH 0366/1688] Makes the getEncompassingAreaGeometry method return Optional instead of being nullable. --- .../apis/transmodel/model/stop/QuayType.java | 4 ++-- .../org/opentripplanner/transit/model/site/AreaStop.java | 5 +++-- .../org/opentripplanner/transit/model/site/GroupStop.java | 7 ++++--- .../opentripplanner/transit/model/site/StopLocation.java | 6 +++--- .../opentripplanner/netex/mapping/FlexStopsMapperTest.java | 1 - 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index 6dd9fc5e31c..74a2d0c153e 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -361,9 +361,9 @@ public static GraphQLObjectType create( .type(GeoJSONCoordinatesScalar.getGraphQGeoJSONCoordinatesScalar()) .dataFetcher(env -> { StopLocation stopLocation = env.getSource(); - return stopLocation.getEncompassingAreaGeometry() == null + return stopLocation.getEncompassingAreaGeometry().isEmpty() ? null - : stopLocation.getEncompassingAreaGeometry().getCoordinates(); + : stopLocation.getEncompassingAreaGeometry().get().getCoordinates(); }) .build() ) diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index a398a7dae1c..41a522f595a 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -1,6 +1,7 @@ package org.opentripplanner.transit.model.site; import java.util.Objects; +import java.util.Optional; import java.util.function.IntSupplier; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -113,8 +114,8 @@ public Geometry getGeometry() { * Returns the geometry of area that defines the stop, in this case the same as getGeometry. */ @Override - public Geometry getEncompassingAreaGeometry() { - return geometry; + public Optional getEncompassingAreaGeometry() { + return Optional.of(geometry); } @Override diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index c5aa3fa028f..fa23c8999ef 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -2,6 +2,7 @@ import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.function.IntSupplier; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -98,11 +99,11 @@ public Geometry getGeometry() { * will return the geometry of the area. */ @Override - public Geometry getEncompassingAreaGeometry() { + public Optional getEncompassingAreaGeometry() { if (encompassingAreaGeometry == null) { - return geometry; + return Optional.of(geometry); } - return encompassingAreaGeometry; + return Optional.of(encompassingAreaGeometry); } @Override diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java index bff327302af..1e4a1cc4033 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java @@ -3,6 +3,7 @@ import java.time.ZoneId; import java.util.Collection; import java.util.List; +import java.util.Optional; import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; @@ -128,9 +129,8 @@ default String getFirstZoneAsString() { * The geometry of the area that encompasses the bounds of the stop area. If the stop is defined * as a point, this is null. */ - @Nullable - default Geometry getEncompassingAreaGeometry() { - return null; + default Optional getEncompassingAreaGeometry() { + return Optional.empty(); } @Nullable diff --git a/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java index 3167d64e766..7529ae52a34 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/FlexStopsMapperTest.java @@ -9,7 +9,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; -import java.util.Set; import net.opengis.gml._3.AbstractRingPropertyType; import net.opengis.gml._3.DirectPositionListType; import net.opengis.gml._3.LinearRingType; From 0a512fdb743c703f81752f670091bf09c38d97a5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 22 Jan 2024 21:09:08 +0200 Subject: [PATCH 0367/1688] Apply suggestions from code review Co-authored-by: Leonard Ehrenfried --- .../opentripplanner/apis/gtfs/schema.graphqls | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 005f6854c28..62e0a9fc156 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -360,8 +360,7 @@ come with an extra cost. """ input DestinationBicyclePolicyInput { """ - Is it possible to arrive to the destination without dropping off the rental - bicycle first. + For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental bicycle first. """ allowKeeping: Boolean @@ -379,8 +378,7 @@ come with an extra cost. """ input DestinationCarPolicyInput { """ - Is it possible to arrive to the destination without dropping off the rental - car first. + For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental car first. """ allowKeeping: Boolean @@ -398,8 +396,7 @@ come with an extra cost. """ input DestinationScooterPolicyInput { """ - Is it possible to arrive to the destination without dropping off the rental - scooter first. + For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental scooter first. """ allowKeeping: Boolean @@ -1064,7 +1061,7 @@ input PlanDateTimeInput @oneOf { Latest arrival time date time. The returned itineraries should not arrive to the destination after this instant unless one is using paging to find later itineraries. Note, it is not currently possible - to define both `earliestDeparture` and `latestArrival`. + to define both `earliestDeparture` and `latestArrival`. """ latestArrival: OffsetDateTime } @@ -1394,7 +1391,7 @@ input InputPreferred { } """ -Locale in string format. For example, `en` or `en-US`. +Locale in the format defined in [RFC5646](https://datatracker.ietf.org/doc/html/rfc5646). For example, `en` or `en-US`. """ scalar Locale @@ -1507,8 +1504,8 @@ input ParkingFilter { } """ -Settings that control the behavior of itinerary filtering. These are advanced settings and -should not be set by a user through user preferences. +Settings that control the behavior of itinerary filtering. **These are advanced settings and +should not be set by a user through user preferences.** """ input PlanItineraryFilterInput { """ From 5c419e5d7e1a275cb84e0eb1dd700c9271088616 Mon Sep 17 00:00:00 2001 From: Eivind Morris Bakke Date: Tue, 23 Jan 2024 09:12:02 +0100 Subject: [PATCH 0368/1688] Update src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java Co-authored-by: Leonard Ehrenfried --- .../opentripplanner/apis/transmodel/model/stop/QuayType.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index 74a2d0c153e..cc5a9baf6e4 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -361,9 +361,7 @@ public static GraphQLObjectType create( .type(GeoJSONCoordinatesScalar.getGraphQGeoJSONCoordinatesScalar()) .dataFetcher(env -> { StopLocation stopLocation = env.getSource(); - return stopLocation.getEncompassingAreaGeometry().isEmpty() - ? null - : stopLocation.getEncompassingAreaGeometry().get().getCoordinates(); + return stopLocation.getEncompassingAreaGeometry().map(g -> g.getCoordinates()).orElse(null); }) .build() ) From f446f3e941f18dc2f35e734d563c50e2c5f8502f Mon Sep 17 00:00:00 2001 From: Eivind Morris Bakke Date: Tue, 23 Jan 2024 09:12:22 +0100 Subject: [PATCH 0369/1688] Update src/main/java/org/opentripplanner/transit/model/site/GroupStop.java Co-authored-by: Leonard Ehrenfried --- .../org/opentripplanner/transit/model/site/GroupStop.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index fa23c8999ef..2ee6e98a2c6 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -100,10 +100,7 @@ public Geometry getGeometry() { */ @Override public Optional getEncompassingAreaGeometry() { - if (encompassingAreaGeometry == null) { - return Optional.of(geometry); - } - return Optional.of(encompassingAreaGeometry); + return Optional.ofNullable(encompassingGeometry).or(Optional.of(geometry)); } @Override From f27c900069089584519f7cb1f629b520cbd06386 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 18:32:28 +0100 Subject: [PATCH 0370/1688] Introduce new path for Transmodel API --- .../opentripplanner/apis/APIEndpoints.java | 2 + .../apis/transmodel/TransmodelAPI.java | 41 ++++++++----------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/APIEndpoints.java b/src/main/java/org/opentripplanner/apis/APIEndpoints.java index 68f6bda3d3a..959815f1716 100644 --- a/src/main/java/org/opentripplanner/apis/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/apis/APIEndpoints.java @@ -54,6 +54,8 @@ private APIEndpoints() { // scheduled to be removed and only here for backwards compatibility addIfEnabled(GtfsGraphQlApi, GtfsGraphQLAPI.GtfsGraphQLAPIOldPath.class); addIfEnabled(TransmodelGraphQlApi, TransmodelAPI.class); + // scheduled to be removed and only here for backwards compatibility + addIfEnabled(TransmodelGraphQlApi, TransmodelAPI.TransmodelAPIOldPath.class); // Sandbox extension APIs addIfEnabled(ActuatorAPI, ActuatorAPI.class); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java index 6af4ab1953c..5944fb2d2c4 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java @@ -6,7 +6,6 @@ import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; import jakarta.ws.rs.HeaderParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; @@ -22,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; +import org.opentripplanner.apis.gtfs.GtfsGraphQLAPI; import org.opentripplanner.apis.transmodel.mapping.TransitIdMapper; import org.opentripplanner.apis.transmodel.support.GqlUtil; import org.opentripplanner.routing.api.request.RouteRequest; @@ -30,11 +30,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -// TODO move to org.opentripplanner.api.resource, this is a Jersey resource class - -@Path("/routers/{ignoreRouterId}/transmodel/index") -// It would be nice to get rid of the final /index. -@Produces(MediaType.APPLICATION_JSON) // One @Produces annotation for all endpoints. +@Path("/transmodel/v3") +@Produces(MediaType.APPLICATION_JSON) public class TransmodelAPI { @SuppressWarnings("unused") @@ -48,17 +45,26 @@ public class TransmodelAPI { private final ObjectMapper deserializer = new ObjectMapper(); public TransmodelAPI( - @Context OtpServerRequestContext serverContext, - /** - * @deprecated The support for multiple routers are removed from OTP2. - * See https://github.com/opentripplanner/OpenTripPlanner/issues/2760 - */ - @Deprecated @PathParam("ignoreRouterId") String ignoreRouterId + @Context OtpServerRequestContext serverContext ) { this.serverContext = serverContext; this.index = new TransmodelGraph(schema); } + /** + * This class is only here for backwards-compatibility. It will be removed in the future. + */ + @Path("/routers/{ignoreRouterId}/transmodel/index/graphql") + public static class TransmodelAPIOldPath extends GtfsGraphQLAPI { + + public TransmodelAPIOldPath( + @Context OtpServerRequestContext serverContext, + @PathParam("ignoreRouterId") String ignore + ) { + super(serverContext); + } + } + /** * This method should be called BEFORE the Web-Container is started and load new instances of this * class. This is a hack, and it would be better if the configuration was done more explicit and @@ -77,17 +83,7 @@ public static void setUp( schema = TransmodelGraphQLSchema.create(defaultRouteRequest, gqlUtil); } - /** - * Return 200 when service is loaded. - */ - @GET - @Path("/live") - public Response isAlive() { - return Response.status(Response.Status.NO_CONTENT).build(); - } - @POST - @Path("/graphql") @Consumes(MediaType.APPLICATION_JSON) public Response getGraphQL( HashMap queryParameters, @@ -130,7 +126,6 @@ public Response getGraphQL( } @POST - @Path("/graphql") @Consumes("application/graphql") public Response getGraphQL( String query, From d434086fda090e0fafda3971c245d47d2ff86da6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 23 Jan 2024 12:45:52 +0100 Subject: [PATCH 0371/1688] Simplify Transmodel API path --- docs/apis/TransmodelApi.md | 5 ++--- src/client/graphiql/index.html | 2 +- .../opentripplanner/apis/transmodel/TransmodelAPI.java | 8 ++------ 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/docs/apis/TransmodelApi.md b/docs/apis/TransmodelApi.md index ce772734276..5a669b8cae5 100644 --- a/docs/apis/TransmodelApi.md +++ b/docs/apis/TransmodelApi.md @@ -13,12 +13,11 @@ Transmodel (NeTEx) with some limitations/simplification. It provides both a rout Entur provides a [GraphQL explorer](https://api.entur.io/graphql-explorer) where you may browse the GraphQL schema and try your own queries. -When running OTP locally the endpoint is available at: `http://localhost:8080/otp/routers/default/transmodel/index/graphql` +When running OTP locally the endpoint is available at: `http://localhost:8080/otp/transmodel/v3` ### Configuration -To turn this API off, add the feature `TransmodelGraphQlApi : false` in _otp-config.json_. - +To turn this API off, add the feature `TransmodelGraphQlApi : false` in `otp-config.json`. ## Changelog - old diff --git a/src/client/graphiql/index.html b/src/client/graphiql/index.html index d96f736b287..0e8d4afd1ea 100644 --- a/src/client/graphiql/index.html +++ b/src/client/graphiql/index.html @@ -153,7 +153,7 @@ let apiFlavor = parameters.flavor || "gtfs"; let urls = { gtfs: '/otp/gtfs/v1', - transmodel: '/otp/routers/default/transmodel/index/graphql' + transmodel: '/otp/transmodel/v3' } let defaultQueries = { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java index 5944fb2d2c4..3df6e1d6a51 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import java.util.stream.Collectors; -import org.opentripplanner.apis.gtfs.GtfsGraphQLAPI; import org.opentripplanner.apis.transmodel.mapping.TransitIdMapper; import org.opentripplanner.apis.transmodel.support.GqlUtil; import org.opentripplanner.routing.api.request.RouteRequest; @@ -34,7 +33,6 @@ @Produces(MediaType.APPLICATION_JSON) public class TransmodelAPI { - @SuppressWarnings("unused") private static final Logger LOG = LoggerFactory.getLogger(TransmodelAPI.class); private static GraphQLSchema schema; @@ -44,9 +42,7 @@ public class TransmodelAPI { private final TransmodelGraph index; private final ObjectMapper deserializer = new ObjectMapper(); - public TransmodelAPI( - @Context OtpServerRequestContext serverContext - ) { + public TransmodelAPI(@Context OtpServerRequestContext serverContext) { this.serverContext = serverContext; this.index = new TransmodelGraph(schema); } @@ -55,7 +51,7 @@ public TransmodelAPI( * This class is only here for backwards-compatibility. It will be removed in the future. */ @Path("/routers/{ignoreRouterId}/transmodel/index/graphql") - public static class TransmodelAPIOldPath extends GtfsGraphQLAPI { + public static class TransmodelAPIOldPath extends TransmodelAPI { public TransmodelAPIOldPath( @Context OtpServerRequestContext serverContext, From da95a92b0602d1a5c3b69bfbdcf8cca9fc1678d3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 23 Jan 2024 14:21:42 +0200 Subject: [PATCH 0372/1688] Update src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java Co-authored-by: Leonard Ehrenfried --- .../routing/api/request/preference/ScooterPreferences.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java index 7c139c08730..1d5cf83a54b 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/ScooterPreferences.java @@ -17,7 +17,7 @@ * related to street and transit routing. The values are normalized(rounded) so the class can used * as a cache key. * - * Scooter rental is only supported currently. + * Only Scooter rental is supported currently. *

      * THIS CLASS IS IMMUTABLE AND THREAD-SAFE. */ From cdc84e2943a921b41b8216782b32165c7ea752c2 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 23 Jan 2024 15:12:14 +0200 Subject: [PATCH 0373/1688] Apply suggestions from code review Co-authored-by: Leonard Ehrenfried --- .../org/opentripplanner/street/model/edge/StreetEdgeTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 743cfa673ba..a346baf3cb9 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -155,7 +155,6 @@ public void testTraverseFloatingScooter() { .withName("Test Lane") .withMeterLength(length) .withPermission(StreetTraversalPermission.ALL) - .withBack(false) .buildAndConnect(); var request = StreetSearchRequest.of().withMode(StreetMode.SCOOTER_RENTAL); @@ -545,7 +544,6 @@ public void testScooterOptimizeTriangle() { .withName("Test Lane") .withMeterLength(length) .withPermission(StreetTraversalPermission.ALL) - .withBack(false) // a safe street .withBicycleSafetyFactor(0.74f) .buildAndConnect(); From ae61117ad6ae5f0b1e56cf60b6e0546a0b13b43f Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 23 Jan 2024 15:45:10 +0200 Subject: [PATCH 0374/1688] Refactor tests --- .../model/_data/StreetModelForTest.java | 16 ++ .../edge/StreetEdgeScooterTraversalTest.java | 249 ++++++++++++++++++ .../street/model/edge/StreetEdgeTest.java | 245 ----------------- .../model/edge/VehicleRentalEdgeTest.java | 21 +- 4 files changed, 268 insertions(+), 263 deletions(-) create mode 100644 src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java index 1f3dbf8c4c9..cd0ad900311 100644 --- a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java +++ b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java @@ -9,6 +9,9 @@ import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; +import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; +import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.StreetEdgeBuilder; @@ -93,4 +96,17 @@ public static StreetEdge streetEdge( ) { return streetEdge(from, to, 1, permissions); } + + public static VehicleRentalPlaceVertex rentalVertex(RentalFormFactor formFactor) { + var rentalVehicleBuilder = TestFreeFloatingRentalVehicleBuilder.of().withLatitude(-122.575133).withLongitude(45.456773); + if (formFactor == RentalFormFactor.SCOOTER) { + rentalVehicleBuilder.withVehicleScooter(); + } else if (formFactor == RentalFormFactor.BICYCLE) { + rentalVehicleBuilder.withVehicleBicycle(); + } else if (formFactor == RentalFormFactor.CAR) { + rentalVehicleBuilder.withVehicleCar(); + } + return new VehicleRentalPlaceVertex(rentalVehicleBuilder.build()); + } + } diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java new file mode 100644 index 00000000000..215b3cb6467 --- /dev/null +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java @@ -0,0 +1,249 @@ +package org.opentripplanner.street.model.edge; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.GeometryFactory; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.impl.PackedCoordinateSequence; +import org.opentripplanner.routing.api.request.StreetMode; +import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; +import org.opentripplanner.routing.util.ElevationUtils; +import org.opentripplanner.routing.util.SlopeCosts; +import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; +import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge; +import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; +import org.opentripplanner.street.model.RentalFormFactor; +import org.opentripplanner.street.model.StreetTraversalPermission; +import org.opentripplanner.street.model._data.StreetModelForTest; +import org.opentripplanner.street.model.vertex.StreetVertex; +import org.opentripplanner.street.search.TraverseMode; +import org.opentripplanner.street.search.request.StreetSearchRequest; +import org.opentripplanner.street.search.state.State; + +public class StreetEdgeScooterTraversalTest { + + private static final double DELTA = 0.00001; + private static final double SPEED = 6.0; + + @Test + public void testTraverseFloatingScooter() { + // This test does not depend on the setup method - and can probably be simplified + Coordinate c1 = new Coordinate(-122.575033, 45.456773); + Coordinate c2 = new Coordinate(-122.576668, 45.451426); + + var formFactor = RentalFormFactor.SCOOTER; + var rentalVertex = StreetModelForTest.rentalVertex(formFactor); + var vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(rentalVertex, formFactor); + + StreetVertex v1 = StreetModelForTest.intersectionVertex("v1", c1.x, c1.y); + StreetVertex v2 = StreetModelForTest.intersectionVertex("v2", c2.x, c2.y); + + var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(rentalVertex, v1); + + GeometryFactory factory = new GeometryFactory(); + LineString geometry = factory.createLineString(new Coordinate[] { c1, c2 }); + + double length = 650.0; + + StreetEdge testStreet = new StreetEdgeBuilder<>() + .withFromVertex(v1) + .withToVertex(v2) + .withGeometry(geometry) + .withName("Test Lane") + .withMeterLength(length) + .withPermission(StreetTraversalPermission.ALL) + .buildAndConnect(); + + var request = StreetSearchRequest.of().withMode(StreetMode.SCOOTER_RENTAL); + + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withSpeed(5))); + + State slowResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withSpeed(10))); + + State fastResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + + // Cost and time should be less when scooter speed is higher. + assertTrue(slowResult.getWeight() > fastResult.getWeight() + DELTA); + assertTrue(slowResult.getElapsedTimeSeconds() > fastResult.getElapsedTimeSeconds()); + + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withReluctance(1))); + State lowReluctanceResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + + request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withReluctance(5))); + + State highReluctanceResult = traverseStreetFromRental( + testStreet, + vehicleRentalEdge, + link, + rentalVertex, + request.build() + ); + // Cost should be more when reluctance is higher but the time should be the same. + assertTrue(highReluctanceResult.getWeight() > lowReluctanceResult.getWeight() + DELTA); + + assertEquals( + highReluctanceResult.getElapsedTimeSeconds(), + lowReluctanceResult.getElapsedTimeSeconds() + ); + } + + @Test + public void testWalkingBeforeScooter() { + StreetEdge e1 = StreetModelForTest.streetEdgeBuilder(StreetModelForTest.V1, StreetModelForTest.V2, 100.0, StreetTraversalPermission.ALL) + .withCarSpeed(10.0f) + .buildAndConnect(); + + var request = StreetSearchRequest + .of() + .withPreferences(pref -> pref.withWalk(walk -> walk.withReluctance(1))) + .withMode(StreetMode.SCOOTER_RENTAL); + + State s0 = new State(StreetModelForTest.V1, request.build()); + State result = e1.traverse(s0)[0]; + + request.withPreferences(pref -> + pref.withScooter(scooter -> scooter.withReluctance(5).withSpeed(8.5)) + ); + + s0 = new State(StreetModelForTest.V1, request.build()); + var scooterReluctanceResult = e1.traverse(s0)[0]; + + // Scooter preferences shouldn't affect walking when SCOOTER_RENTAL is used as mode + assertEquals(TraverseMode.WALK, result.currentMode()); + assertEquals(result.getWeight(), scooterReluctanceResult.getWeight(), DELTA); + assertEquals(result.getElapsedTimeSeconds(), scooterReluctanceResult.getElapsedTimeSeconds()); + } + + @Test + public void testScooterOptimizeTriangle() { + // This test does not depend on the setup method - and can probably be simplified + Coordinate c1 = new Coordinate(-122.575033, 45.456773); + Coordinate c2 = new Coordinate(-122.576668, 45.451426); + + var formFactor = RentalFormFactor.SCOOTER; + + var rentalVertex = StreetModelForTest.rentalVertex(formFactor); + var vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(rentalVertex, formFactor); + + StreetVertex v1 = StreetModelForTest.intersectionVertex("v1", c1.x, c1.y); + StreetVertex v2 = StreetModelForTest.intersectionVertex("v2", c2.x, c2.y); + + var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(rentalVertex, v1); + + GeometryFactory factory = new GeometryFactory(); + LineString geometry = factory.createLineString(new Coordinate[] { c1, c2 }); + + double length = 650.0; + + StreetEdge testStreet = new StreetEdgeBuilder<>() + .withFromVertex(v1) + .withToVertex(v2) + .withGeometry(geometry) + .withName("Test Lane") + .withMeterLength(length) + .withPermission(StreetTraversalPermission.ALL) + // a safe street + .withBicycleSafetyFactor(0.74f) + .buildAndConnect(); + + Coordinate[] profile = new Coordinate[] { + new Coordinate(0, 0), // slope = 0.1 + new Coordinate(length / 2, length / 20.0), + new Coordinate(length, 0), // slope = -0.1 + }; + PackedCoordinateSequence elev = new PackedCoordinateSequence.Double(profile); + StreetElevationExtensionBuilder + .of(testStreet) + .withElevationProfile(elev) + .withComputed(false) + .build() + .ifPresent(testStreet::setElevationExtension); + + SlopeCosts costs = ElevationUtils.getSlopeCosts(elev, true); + double trueLength = costs.lengthMultiplier * length; + double slopeWorkLength = testStreet.getEffectiveBikeDistanceForWorkCost(); + double slopeSpeedLength = testStreet.getEffectiveBikeDistance(); + + var request = StreetSearchRequest.of().withMode(StreetMode.SCOOTER_RENTAL); + + request.withPreferences(pref -> + pref + .withScooter(scooter -> + scooter + .withSpeed(SPEED) + .withOptimizeType(VehicleRoutingOptimizeType.TRIANGLE) + .withOptimizeTriangle(it -> it.withTime(1)) + .withReluctance(1) + ) + .withWalk(walk -> walk.withReluctance(1)) + .withCar(car -> car.withReluctance(1)) + ); + + var rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); + var startState = link.traverse(rentedState[0])[0]; + + State result = testStreet.traverse(startState)[0]; + double expectedTimeWeight = slopeSpeedLength / SPEED; + assertEquals(TraverseMode.SCOOTER, result.currentMode()); + assertEquals(expectedTimeWeight, result.getWeight() - startState.getWeight(), DELTA); + + request.withPreferences(p -> + p.withScooter(scooter -> scooter.withOptimizeTriangle(it -> it.withSlope(1))) + ); + rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); + startState = link.traverse(rentedState[0])[0]; + + result = testStreet.traverse(startState)[0]; + double slopeWeight = result.getWeight(); + double expectedSlopeWeight = slopeWorkLength / SPEED; + assertEquals(expectedSlopeWeight, slopeWeight - startState.getWeight(), DELTA); + assertTrue(length * 1.5 / SPEED < slopeWeight); + assertTrue(length * 1.5 * 10 / SPEED > slopeWeight); + + request.withPreferences(p -> + p.withScooter(scooter -> scooter.withOptimizeTriangle(it -> it.withSafety(1))) + ); + rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); + startState = link.traverse(rentedState[0])[0]; + + result = testStreet.traverse(startState)[0]; + double slopeSafety = costs.slopeSafetyCost; + double safetyWeight = result.getWeight(); + double expectedSafetyWeight = (trueLength * 0.74 + slopeSafety) / SPEED; + assertEquals(expectedSafetyWeight, safetyWeight - startState.getWeight(), DELTA); + } + + private State traverseStreetFromRental( + StreetEdge streetEdge, + VehicleRentalEdge rentalEdge, + StreetVehicleRentalLink link, + VehicleRentalPlaceVertex rentalVertex, + StreetSearchRequest request + ) { + var rentedState = rentalEdge.traverse(new State(rentalVertex, request)); + var startState = link.traverse(rentedState[0])[0]; + return streetEdge.traverse(startState)[0]; + } +} diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index a346baf3cb9..60e8cf58952 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -21,12 +21,6 @@ import org.opentripplanner.routing.core.VehicleRoutingOptimizeType; import org.opentripplanner.routing.util.ElevationUtils; import org.opentripplanner.routing.util.SlopeCosts; -import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; -import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; -import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; -import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge; -import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; -import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.TurnRestriction; import org.opentripplanner.street.model._data.StreetModelForTest; @@ -39,7 +33,6 @@ import org.opentripplanner.street.search.request.StreetSearchRequestBuilder; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.StateData; -import org.opentripplanner.transit.model.framework.FeedScopedId; public class StreetEdgeTest { @@ -128,114 +121,6 @@ public void testTraverseAsCar() { assertEquals(expectedWeight, s1.getWeight(), 0.0); } - @Test - public void testTraverseFloatingScooter() { - // This test does not depend on the setup method - and can probably be simplified - Coordinate c1 = new Coordinate(-122.575033, 45.456773); - Coordinate c2 = new Coordinate(-122.576668, 45.451426); - - var formFactor = RentalFormFactor.SCOOTER; - var rentalVertex = createRentalVertex(formFactor); - var vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(rentalVertex, formFactor); - - StreetVertex v1 = StreetModelForTest.intersectionVertex("v1", c1.x, c1.y); - StreetVertex v2 = StreetModelForTest.intersectionVertex("v2", c2.x, c2.y); - - var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(rentalVertex, v1); - - GeometryFactory factory = new GeometryFactory(); - LineString geometry = factory.createLineString(new Coordinate[] { c1, c2 }); - - double length = 650.0; - - StreetEdge testStreet = new StreetEdgeBuilder<>() - .withFromVertex(v1) - .withToVertex(v2) - .withGeometry(geometry) - .withName("Test Lane") - .withMeterLength(length) - .withPermission(StreetTraversalPermission.ALL) - .buildAndConnect(); - - var request = StreetSearchRequest.of().withMode(StreetMode.SCOOTER_RENTAL); - - request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withSpeed(5))); - - State slowResult = traverseStreetFromRental( - testStreet, - vehicleRentalEdge, - link, - rentalVertex, - request.build() - ); - request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withSpeed(10))); - - State fastResult = traverseStreetFromRental( - testStreet, - vehicleRentalEdge, - link, - rentalVertex, - request.build() - ); - - // Cost and time should be less when scooter speed is higher. - assertTrue(slowResult.getWeight() > fastResult.getWeight() + DELTA); - assertTrue(slowResult.getElapsedTimeSeconds() > fastResult.getElapsedTimeSeconds()); - - request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withReluctance(1))); - State lowReluctanceResult = traverseStreetFromRental( - testStreet, - vehicleRentalEdge, - link, - rentalVertex, - request.build() - ); - - request.withPreferences(pref -> pref.withScooter(scooter -> scooter.withReluctance(5))); - - State highReluctanceResult = traverseStreetFromRental( - testStreet, - vehicleRentalEdge, - link, - rentalVertex, - request.build() - ); - // Cost should be more when reluctance is higher but the time should be the same. - assertTrue(highReluctanceResult.getWeight() > lowReluctanceResult.getWeight() + DELTA); - - assertEquals( - highReluctanceResult.getElapsedTimeSeconds(), - lowReluctanceResult.getElapsedTimeSeconds() - ); - } - - @Test - public void testWalkingBeforeScooter() { - StreetEdge e1 = streetEdgeBuilder(v1, v2, 100.0, StreetTraversalPermission.ALL) - .withCarSpeed(10.0f) - .buildAndConnect(); - - var request = StreetSearchRequest - .copyOf(proto) - .withPreferences(pref -> pref.withWalk(walk -> walk.withReluctance(1))) - .withMode(StreetMode.SCOOTER_RENTAL); - - State s0 = new State(v1, request.build()); - State result = e1.traverse(s0)[0]; - - request.withPreferences(pref -> - pref.withScooter(scooter -> scooter.withReluctance(5).withSpeed(8.5)) - ); - - s0 = new State(v1, request.build()); - var scooterReluctanceResult = e1.traverse(s0)[0]; - - // Scooter preferences shouldn't affect walking when SCOOTER_RENTAL is used as mode - assertEquals(TraverseMode.WALK, result.currentMode()); - assertEquals(result.getWeight(), scooterReluctanceResult.getWeight(), DELTA); - assertEquals(result.getElapsedTimeSeconds(), scooterReluctanceResult.getElapsedTimeSeconds()); - } - @Test public void testModeSetCanTraverse() { StreetEdge e = streetEdge(v1, v2, 1.0, StreetTraversalPermission.ALL); @@ -515,134 +400,4 @@ public void testBikeOptimizeTriangle() { double expectedWeight = timeWeight * 0.33 + slopeWeight * 0.33 + safetyWeight * 0.34; assertEquals(expectedWeight, result.getWeight(), DELTA); } - - @Test - public void testScooterOptimizeTriangle() { - // This test does not depend on the setup method - and can probably be simplified - Coordinate c1 = new Coordinate(-122.575033, 45.456773); - Coordinate c2 = new Coordinate(-122.576668, 45.451426); - - var formFactor = RentalFormFactor.SCOOTER; - - var rentalVertex = createRentalVertex(formFactor); - var vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(rentalVertex, formFactor); - - StreetVertex v1 = StreetModelForTest.intersectionVertex("v1", c1.x, c1.y); - StreetVertex v2 = StreetModelForTest.intersectionVertex("v2", c2.x, c2.y); - - var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(rentalVertex, v1); - - GeometryFactory factory = new GeometryFactory(); - LineString geometry = factory.createLineString(new Coordinate[] { c1, c2 }); - - double length = 650.0; - - StreetEdge testStreet = new StreetEdgeBuilder<>() - .withFromVertex(v1) - .withToVertex(v2) - .withGeometry(geometry) - .withName("Test Lane") - .withMeterLength(length) - .withPermission(StreetTraversalPermission.ALL) - // a safe street - .withBicycleSafetyFactor(0.74f) - .buildAndConnect(); - - Coordinate[] profile = new Coordinate[] { - new Coordinate(0, 0), // slope = 0.1 - new Coordinate(length / 2, length / 20.0), - new Coordinate(length, 0), // slope = -0.1 - }; - PackedCoordinateSequence elev = new PackedCoordinateSequence.Double(profile); - StreetElevationExtensionBuilder - .of(testStreet) - .withElevationProfile(elev) - .withComputed(false) - .build() - .ifPresent(testStreet::setElevationExtension); - - SlopeCosts costs = ElevationUtils.getSlopeCosts(elev, true); - double trueLength = costs.lengthMultiplier * length; - double slopeWorkLength = testStreet.getEffectiveBikeDistanceForWorkCost(); - double slopeSpeedLength = testStreet.getEffectiveBikeDistance(); - - var request = StreetSearchRequest.of().withMode(StreetMode.SCOOTER_RENTAL); - - request.withPreferences(pref -> - pref - .withScooter(scooter -> - scooter - .withSpeed(SPEED) - .withOptimizeType(VehicleRoutingOptimizeType.TRIANGLE) - .withOptimizeTriangle(it -> it.withTime(1)) - .withReluctance(1) - ) - .withWalk(walk -> walk.withReluctance(1)) - .withCar(car -> car.withReluctance(1)) - ); - - var rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); - var startState = link.traverse(rentedState[0])[0]; - - State result = testStreet.traverse(startState)[0]; - double expectedTimeWeight = slopeSpeedLength / SPEED; - assertEquals(TraverseMode.SCOOTER, result.currentMode()); - assertEquals(expectedTimeWeight, result.getWeight() - startState.getWeight(), DELTA); - - request.withPreferences(p -> - p.withScooter(scooter -> scooter.withOptimizeTriangle(it -> it.withSlope(1))) - ); - rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); - startState = link.traverse(rentedState[0])[0]; - - result = testStreet.traverse(startState)[0]; - double slopeWeight = result.getWeight(); - double expectedSlopeWeight = slopeWorkLength / SPEED; - assertEquals(expectedSlopeWeight, slopeWeight - startState.getWeight(), DELTA); - assertTrue(length * 1.5 / SPEED < slopeWeight); - assertTrue(length * 1.5 * 10 / SPEED > slopeWeight); - - request.withPreferences(p -> - p.withScooter(scooter -> scooter.withOptimizeTriangle(it -> it.withSafety(1))) - ); - rentedState = vehicleRentalEdge.traverse(new State(rentalVertex, request.build())); - startState = link.traverse(rentedState[0])[0]; - - result = testStreet.traverse(startState)[0]; - double slopeSafety = costs.slopeSafetyCost; - double safetyWeight = result.getWeight(); - double expectedSafetyWeight = (trueLength * 0.74 + slopeSafety) / SPEED; - assertEquals(expectedSafetyWeight, safetyWeight - startState.getWeight(), DELTA); - } - - private VehicleRentalPlaceVertex createRentalVertex(RentalFormFactor formFactor) { - VehicleRentalVehicle rentalVehicle = new VehicleRentalVehicle(); - - var network = "1"; - rentalVehicle.latitude = -122.575133; - rentalVehicle.longitude = 45.456773; - rentalVehicle.id = new FeedScopedId(network, "123"); - rentalVehicle.vehicleType = - new RentalVehicleType( - new FeedScopedId(network, "type"), - "type", - formFactor, - RentalVehicleType.PropulsionType.ELECTRIC, - 100000d - ); - - return new VehicleRentalPlaceVertex(rentalVehicle); - } - - private State traverseStreetFromRental( - StreetEdge streetEdge, - VehicleRentalEdge rentalEdge, - StreetVehicleRentalLink link, - VehicleRentalPlaceVertex rentalVertex, - StreetSearchRequest request - ) { - var rentedState = rentalEdge.traverse(new State(rentalVertex, request)); - var startState = link.traverse(rentedState[0])[0]; - return streetEdge.traverse(startState)[0]; - } } diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java index c490e315933..0e68ea0da78 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java @@ -18,6 +18,7 @@ import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge; import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; import org.opentripplanner.street.model.RentalFormFactor; +import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.VehicleRentalState; @@ -307,27 +308,11 @@ private void initFreeFloatingEdgeAndRequest( RentalFormFactor formFactor, boolean banNetwork ) { - var network = "1"; - - VehicleRentalVehicle rentalVehicle = new VehicleRentalVehicle(); - - rentalVehicle.latitude = 1; - rentalVehicle.longitude = 1; - rentalVehicle.id = new FeedScopedId(network, "123"); - rentalVehicle.vehicleType = - new RentalVehicleType( - new FeedScopedId(network, "type"), - "type", - formFactor, - RentalVehicleType.PropulsionType.ELECTRIC, - 100000d - ); - - this.vertex = new VehicleRentalPlaceVertex(rentalVehicle); + this.vertex = StreetModelForTest.rentalVertex(formFactor); vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(vertex, formFactor); - Set bannedNetworks = banNetwork ? Set.of(network) : Set.of(); + Set bannedNetworks = banNetwork ? Set.of(this.vertex.getStation().getNetwork()) : Set.of(); this.request = StreetSearchRequest From a3090d2dc3962a81570acbae5365055a771efdd5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 23 Jan 2024 16:02:06 +0200 Subject: [PATCH 0375/1688] Fix formatting --- .../street/model/_data/StreetModelForTest.java | 6 ++++-- .../street/model/edge/StreetEdgeScooterTraversalTest.java | 8 +++++++- .../street/model/edge/VehicleRentalEdgeTest.java | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java index cd0ad900311..d50c8a74dfc 100644 --- a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java +++ b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java @@ -98,7 +98,10 @@ public static StreetEdge streetEdge( } public static VehicleRentalPlaceVertex rentalVertex(RentalFormFactor formFactor) { - var rentalVehicleBuilder = TestFreeFloatingRentalVehicleBuilder.of().withLatitude(-122.575133).withLongitude(45.456773); + var rentalVehicleBuilder = TestFreeFloatingRentalVehicleBuilder + .of() + .withLatitude(-122.575133) + .withLongitude(45.456773); if (formFactor == RentalFormFactor.SCOOTER) { rentalVehicleBuilder.withVehicleScooter(); } else if (formFactor == RentalFormFactor.BICYCLE) { @@ -108,5 +111,4 @@ public static VehicleRentalPlaceVertex rentalVertex(RentalFormFactor formFactor) } return new VehicleRentalPlaceVertex(rentalVehicleBuilder.build()); } - } diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java index 215b3cb6467..734b1efa2b9 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeScooterTraversalTest.java @@ -111,7 +111,13 @@ public void testTraverseFloatingScooter() { @Test public void testWalkingBeforeScooter() { - StreetEdge e1 = StreetModelForTest.streetEdgeBuilder(StreetModelForTest.V1, StreetModelForTest.V2, 100.0, StreetTraversalPermission.ALL) + StreetEdge e1 = StreetModelForTest + .streetEdgeBuilder( + StreetModelForTest.V1, + StreetModelForTest.V2, + 100.0, + StreetTraversalPermission.ALL + ) .withCarSpeed(10.0f) .buildAndConnect(); diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java index 0e68ea0da78..a3fbfcb018e 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleRentalEdgeTest.java @@ -312,7 +312,9 @@ private void initFreeFloatingEdgeAndRequest( vehicleRentalEdge = VehicleRentalEdge.createVehicleRentalEdge(vertex, formFactor); - Set bannedNetworks = banNetwork ? Set.of(this.vertex.getStation().getNetwork()) : Set.of(); + Set bannedNetworks = banNetwork + ? Set.of(this.vertex.getStation().getNetwork()) + : Set.of(); this.request = StreetSearchRequest From 81c8fcd74ce1606be8f7142f5c581e3d0e86c138 Mon Sep 17 00:00:00 2001 From: eibakke Date: Tue, 23 Jan 2024 15:54:54 +0100 Subject: [PATCH 0376/1688] Makes the getEncompassingAreaGeometry in StopLocation return an Optional in order to allow returns of both GeometryCollection and Geometry. --- .../apis/transmodel/model/stop/QuayType.java | 6 +++++- .../org/opentripplanner/transit/model/site/GroupStop.java | 4 ++-- .../opentripplanner/transit/model/site/StopLocation.java | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index cc5a9baf6e4..a8390e23197 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -15,6 +15,7 @@ import java.util.Collection; import java.util.Objects; import java.util.Optional; +import org.locationtech.jts.geom.Geometry; import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.model.plan.JourneyWhiteListed; import org.opentripplanner.apis.transmodel.model.scalars.GeoJSONCoordinatesScalar; @@ -361,7 +362,10 @@ public static GraphQLObjectType create( .type(GeoJSONCoordinatesScalar.getGraphQGeoJSONCoordinatesScalar()) .dataFetcher(env -> { StopLocation stopLocation = env.getSource(); - return stopLocation.getEncompassingAreaGeometry().map(g -> g.getCoordinates()).orElse(null); + return stopLocation + .getEncompassingAreaGeometry() + .map(Geometry::getCoordinates) + .orElse(null); }) .build() ) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index 2ee6e98a2c6..20a5afb4070 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -99,8 +99,8 @@ public Geometry getGeometry() { * will return the geometry of the area. */ @Override - public Optional getEncompassingAreaGeometry() { - return Optional.ofNullable(encompassingGeometry).or(Optional.of(geometry)); + public Optional getEncompassingAreaGeometry() { + return Optional.ofNullable(encompassingAreaGeometry).or(() -> Optional.of(geometry)); } @Override diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java index 1e4a1cc4033..1f2ca33d460 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java @@ -129,7 +129,7 @@ default String getFirstZoneAsString() { * The geometry of the area that encompasses the bounds of the stop area. If the stop is defined * as a point, this is null. */ - default Optional getEncompassingAreaGeometry() { + default Optional getEncompassingAreaGeometry() { return Optional.empty(); } From 31a621b3d71b4db00a83768e4b7526f1709a263d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 23 Jan 2024 15:19:23 +0100 Subject: [PATCH 0377/1688] Fix: Make pass-trough override transit-group-priority --- .../transit/mappers/RaptorRequestMapper.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java index 5f3b4b13746..c46e5a907cc 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java @@ -119,12 +119,14 @@ private RaptorRequest doMap() { builder.withMultiCriteria(mcBuilder -> { var pt = preferences.transit(); var r = pt.raptor(); - if (!pt.relaxTransitGroupPriority().isNormal()) { - mcBuilder.withTransitPriorityCalculator(TransitGroupPriority32n.priorityCalculator()); - mcBuilder.withRelaxC1(mapRelaxCost(pt.relaxTransitGroupPriority())); - } else { + + // Note! If a pass-through-point exists, then the transit-group-priority feature is disabled + if (!request.getPassThroughPoints().isEmpty()) { mcBuilder.withPassThroughPoints(mapPassThroughPoints()); r.relaxGeneralizedCostAtDestination().ifPresent(mcBuilder::withRelaxCostAtDestination); + } else if (!pt.relaxTransitGroupPriority().isNormal()) { + mcBuilder.withTransitPriorityCalculator(TransitGroupPriority32n.priorityCalculator()); + mcBuilder.withRelaxC1(mapRelaxCost(pt.relaxTransitGroupPriority())); } }); From 3a37e98b8c0bec5af50480096c84997ff9a5d18c Mon Sep 17 00:00:00 2001 From: eibakke Date: Tue, 23 Jan 2024 16:08:50 +0100 Subject: [PATCH 0378/1688] Introduces the StopType Enum and StopTypeMapper for the Transmodel GraphQL API. --- .../apis/transmodel/model/stop/QuayType.java | 2 +- .../transmodel/model/stop/StopTypeMapper.java | 15 +++++++++++++++ .../transit/model/site/AreaStop.java | 4 ++-- .../transit/model/site/GroupStop.java | 4 ++-- .../transit/model/site/RegularStop.java | 4 ++-- .../transit/model/site/StopLocation.java | 2 +- .../transit/model/site/StopType.java | 7 +++++++ .../apis/transmodel/schema.graphql | 8 +++++++- 8 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java create mode 100644 src/main/java/org/opentripplanner/transit/model/site/StopType.java diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index a8390e23197..46b09956eb2 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -350,7 +350,7 @@ public static GraphQLObjectType create( GraphQLFieldDefinition .newFieldDefinition() .name("stopType") - .type(Scalars.GraphQLString) + .type(StopTypeMapper.STOP_TYPE) .dataFetcher(env -> ((StopLocation) env.getSource()).getStopType()) .build() ) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java new file mode 100644 index 00000000000..4725f5ac4f9 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java @@ -0,0 +1,15 @@ +package org.opentripplanner.apis.transmodel.model.stop; + +import graphql.schema.GraphQLEnumType; +import org.opentripplanner.transit.model.site.StopType; + +public class StopTypeMapper { + + public static final GraphQLEnumType STOP_TYPE = GraphQLEnumType + .newEnum() + .name("StopType") + .value("regular", StopType.REGULAR) + .value("flexible_area", StopType.FLEXIBLE_AREA) + .value("flexible_group", StopType.FLEXIBLE_GROUP) + .build(); +} diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index 41a522f595a..35576e0c42f 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -87,8 +87,8 @@ public I18NString getUrl() { @Nonnull @Override - public String getStopType() { - return "flexible_area"; + public StopType getStopType() { + return StopType.FLEXIBLE_AREA; } @Override diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index 20a5afb4070..edee00e27e1 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -66,8 +66,8 @@ public I18NString getUrl() { @Override @Nonnull - public String getStopType() { - return "flexible_group"; + public StopType getStopType() { + return StopType.FLEXIBLE_GROUP; } @Override diff --git a/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java b/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java index 88fafab17e8..4c1638e7bae 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java @@ -83,8 +83,8 @@ public I18NString getUrl() { @Nonnull @Override - public String getStopType() { - return "regular"; + public StopType getStopType() { + return StopType.REGULAR; } @Override diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java index 1f2ca33d460..a3cbd1a8014 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java @@ -45,7 +45,7 @@ public interface StopLocation extends LogInfo { I18NString getUrl(); @Nonnull - String getStopType(); + StopType getStopType(); /** * Short text or a number that identifies the location for riders. These codes are often used in diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopType.java b/src/main/java/org/opentripplanner/transit/model/site/StopType.java new file mode 100644 index 00000000000..29a859fdd1c --- /dev/null +++ b/src/main/java/org/opentripplanner/transit/model/site/StopType.java @@ -0,0 +1,7 @@ +package org.opentripplanner.transit.model.site; + +public enum StopType { + REGULAR, + FLEXIBLE_AREA, + FLEXIBLE_GROUP, +} diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 25cf95ca2f9..f0053e2a806 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -600,7 +600,7 @@ type Quay implements PlaceInterface { situations: [PtSituationElement!]! "The stop place to which this quay belongs to." stopPlace: StopPlace - stopType: String + stopType: StopType tariffZones: [TariffZone]! timeZone: String "Whether this quay is suitable for wheelchair boarding." @@ -1697,6 +1697,12 @@ enum StopCondition { startPoint } +enum StopType { + flexible_area + flexible_group + regular +} + enum StreetMode { "Bike only. This can be used as access/egress, but transfers will still be walk only." bicycle From 65e47e61ce7d998d7fddcf4c099df88871176a88 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 23 Jan 2024 17:04:38 +0100 Subject: [PATCH 0379/1688] test: Add unit test for pass-through-points in RaptorRequestMapper --- .../raptoradapter/router/TransitRouter.java | 2 +- .../transit/mappers/RaptorRequestMapper.java | 27 ++++---- .../mappers/RaptorRequestMapperTest.java | 61 +++++++++++++++++++ 3 files changed, 77 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 1b5c836c832..c9e7f92263f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -121,7 +121,7 @@ private TransitRouterResult route() { ); // Prepare transit search - var raptorRequest = RaptorRequestMapper.mapRequest( + var raptorRequest = RaptorRequestMapper.mapRequest( request, transitSearchTimeZero, serverContext.raptorConfig().isMultiThreaded(), diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java index c46e5a907cc..91547b1f62f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java @@ -12,6 +12,7 @@ import org.opentripplanner.raptor.api.model.GeneralizedCostRelaxFunction; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.model.RelaxFunction; import org.opentripplanner.raptor.api.request.DebugRequestBuilder; import org.opentripplanner.raptor.api.request.Optimization; @@ -28,7 +29,7 @@ import org.opentripplanner.routing.api.request.framework.CostLinearFunction; import org.opentripplanner.transit.model.site.StopLocation; -public class RaptorRequestMapper { +public class RaptorRequestMapper { private final RouteRequest request; private final Collection accessPaths; @@ -56,7 +57,7 @@ private RaptorRequestMapper( this.meterRegistry = meterRegistry; } - public static RaptorRequest mapRequest( + public static RaptorRequest mapRequest( RouteRequest request, ZonedDateTime transitSearchTimeZero, boolean isMultiThreaded, @@ -65,7 +66,7 @@ public static RaptorRequest mapRequest( Duration searchWindowAccessSlack, MeterRegistry meterRegistry ) { - return new RaptorRequestMapper( + return new RaptorRequestMapper( request, isMultiThreaded, accessPaths, @@ -77,8 +78,8 @@ public static RaptorRequest mapRequest( .doMap(); } - private RaptorRequest doMap() { - var builder = new RaptorRequestBuilder(); + private RaptorRequest doMap() { + var builder = new RaptorRequestBuilder(); var searchParams = builder.searchParams(); var preferences = request.preferences(); @@ -176,13 +177,15 @@ private RaptorRequest doMap() { } // Add this last, it depends on generating an alias from the set values - builder.performanceTimers( - new PerformanceTimersForRaptor( - builder.generateAlias(), - preferences.system().tags(), - meterRegistry - ) - ); + if (meterRegistry != null) { + builder.performanceTimers( + new PerformanceTimersForRaptor( + builder.generateAlias(), + preferences.system().tags(), + meterRegistry + ) + ); + } return builder.build(); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java index 11c59030180..89348be5c89 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java @@ -1,15 +1,33 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import java.time.Duration; +import java.time.ZonedDateTime; import java.util.List; +import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.raptor._data.transit.TestAccessEgress; +import org.opentripplanner.raptor._data.transit.TestTripSchedule; +import org.opentripplanner.raptor.api.model.RaptorAccessEgress; +import org.opentripplanner.raptor.api.request.RaptorRequest; +import org.opentripplanner.routing.api.request.PassThroughPoint; +import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.site.StopLocation; class RaptorRequestMapperTest { + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final StopLocation STOP_A = TEST_MODEL.stop("Stop:A").build(); + private static final List ACCESS = List.of(TestAccessEgress.walk(12, 45)); + private static final List EGRESS = List.of(TestAccessEgress.walk(144, 54)); + private static final Duration D0s = Duration.ofSeconds(0); + private static final CostLinearFunction R1 = CostLinearFunction.of("50 + 1.0x"); private static final CostLinearFunction R2 = CostLinearFunction.of("0 + 1.5x"); private static final CostLinearFunction R3 = CostLinearFunction.of("30 + 2.0x"); @@ -33,4 +51,47 @@ void mapRelaxCost(CostLinearFunction input, int cost, int expected) { var calcCost = RaptorRequestMapper.mapRelaxCost(input); assertEquals(expected, calcCost.relax(cost)); } + + @Test + void testPassThroughPoints() { + var req = new RouteRequest(); + + req.setPassThroughPoints(List.of(new PassThroughPoint(List.of(STOP_A), "Via A"))); + + var result = map(req); + + assertTrue(result.multiCriteria().hasPassThroughPoints()); + assertEquals( + "[(Via A, stops: " + STOP_A.getIndex() + ")]", + result.multiCriteria().passThroughPoints().toString() + ); + } + + @Test + void testPassThroughPointsTurnTransitGroupPriorityOff() { + var req = new RouteRequest(); + + // Set pass-through and relax transit-group-priority + req.setPassThroughPoints(List.of(new PassThroughPoint(List.of(STOP_A), "Via A"))); + req.withPreferences(p -> + p.withTransit(t -> t.withRelaxTransitGroupPriority(CostLinearFunction.of("30m + 1.2t"))) + ); + + var result = map(req); + + // transit-group-priority CANNOT be used with pass-through and is turned off... + assertTrue(result.multiCriteria().transitPriorityCalculator().isEmpty()); + } + + private static RaptorRequest map(RouteRequest request) { + return RaptorRequestMapper.mapRequest( + request, + ZonedDateTime.now(), + false, + ACCESS, + EGRESS, + D0s, + null + ); + } } From 4e14a55c4454e8dced9e2c158ab3929c3f1e9ca3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 01:46:02 +0000 Subject: [PATCH 0380/1688] fix(deps): update geotools.version to v30.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34f4365b580..681d3b015a0 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 137 - 30.1 + 30.2 2.50 2.16.1 3.1.5 From d31a84e986ef4ef25aa8fee84092b41de36a3ea7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 24 Jan 2024 10:21:20 +0100 Subject: [PATCH 0381/1688] Update docs/apis/TransmodelApi.md Co-authored-by: Thomas Gran --- docs/apis/TransmodelApi.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/apis/TransmodelApi.md b/docs/apis/TransmodelApi.md index 5a669b8cae5..c6d3a16a99c 100644 --- a/docs/apis/TransmodelApi.md +++ b/docs/apis/TransmodelApi.md @@ -15,6 +15,8 @@ queries. When running OTP locally the endpoint is available at: `http://localhost:8080/otp/transmodel/v3` +Note! Version `v1` and `v2` does not exist in the main OTP git repository, but in the (Entur fork)[https://github.com/entur/OpenTripPlanner] from which this code originate from. + ### Configuration To turn this API off, add the feature `TransmodelGraphQlApi : false` in `otp-config.json`. From 6d0780928917705dbccf4659e050a30bfcc8be35 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 24 Jan 2024 10:22:59 +0100 Subject: [PATCH 0382/1688] Improve documentation --- docs/apis/TransmodelApi.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/apis/TransmodelApi.md b/docs/apis/TransmodelApi.md index c6d3a16a99c..6f99847798a 100644 --- a/docs/apis/TransmodelApi.md +++ b/docs/apis/TransmodelApi.md @@ -15,7 +15,8 @@ queries. When running OTP locally the endpoint is available at: `http://localhost:8080/otp/transmodel/v3` -Note! Version `v1` and `v2` does not exist in the main OTP git repository, but in the (Entur fork)[https://github.com/entur/OpenTripPlanner] from which this code originate from. +**Note!** Versions `v1` and `v2` do not exist in the main OTP git repository, but in +the [Entur fork](https://github.com/entur/OpenTripPlanner) from which this code originates from. ### Configuration From 6a087d15e2baf48bac7038dba8d6c81eacc2e5e1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 24 Jan 2024 10:53:24 +0100 Subject: [PATCH 0383/1688] Clarify documentation --- docs/RouterConfiguration.md | 2 +- docs/sandbox/MapboxVectorTilesApi.md | 4 ++++ .../standalone/config/routerconfig/VectorTileConfig.java | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index be4be9d34ff..62fb5d9617a 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -67,7 +67,7 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md). |    [hideFeedId](#transmodelApi_hideFeedId) | `boolean` | Hide the FeedId in all API output, and add it to input. | *Optional* | `false` | na | |    [tracingHeaderTags](#transmodelApi_tracingHeaderTags) | `string[]` | Used to group requests when monitoring OTP. | *Optional* | | na | | [updaters](UpdaterConfig.md) | `object[]` | Configuration for the updaters that import various types of data into OTP. | *Optional* | | 1.5 | -| [vectorTiles](sandbox/MapboxVectorTilesApi.md) | `object` | TODO: Add short summary. | *Optional* | | na | +| [vectorTiles](sandbox/MapboxVectorTilesApi.md) | `object` | Vector tile configuration | *Optional* | | na | | [vehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md) | `object` | Configuration for the vehicle rental service directory. | *Optional* | | 2.0 | diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 8b7af296228..da9fd1120e1 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -179,6 +179,10 @@ The protocol and host are always read from the incoming HTTP request. If you run a proxy then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP return the protocol and host for the original request and not the proxied one. +**Note:** This does _not_ change the path that OTP itself serves the tiles or `tilejson.json` +responses but simply changes the URLs listed in `tilejson.json`. The rewriting of the path +is expected to be handled by a proxy. +

      layers

      diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index ad2f109ac8e..6f7d6967ce8 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -42,7 +42,7 @@ public Optional basePath() { } public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String paramName) { - var root = node.of(paramName).asObject(); + var root = node.of(paramName).summary("Vector tile configuration").asObject(); return new VectorTileConfig( root .of("layers") @@ -65,6 +65,10 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String The protocol and host are always read from the incoming HTTP request. If you run OTP behind a proxy then make sure to set the headers `X-Forwarded-Proto` and `X-Forwarded-Host` to make OTP return the protocol and host for the original request and not the proxied one. + + **Note:** This does _not_ change the path that OTP itself serves the tiles or `tilejson.json` + responses but simply changes the URLs listed in `tilejson.json`. The rewriting of the path + is expected to be handled by a proxy. """ ) .asString(DEFAULT.basePath) From 0b8dfc69817bc19bef947ed7d191d8b6de54fdb8 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 16 Dec 2023 03:02:54 +0800 Subject: [PATCH 0384/1688] add javadoc to some realtime classes --- .../routing/alertpatch/TransitAlert.java | 8 +++ .../updater/spi/GraphUpdater.java | 52 +++++++++++-------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java index d5d260a8218..0d188df5ef4 100644 --- a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java +++ b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java @@ -15,6 +15,14 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.TransitBuilder; +/** + * Internal representation of a GTFS-RT Service Alert or SIRI Situation Exchange (SX) message. + * These are text descriptions of problems affecting specific stops, routes, or other components + * of the transit system which will be displayed to users as text. + * Although they have flags describing the effect of the problem described in the text, convention + * is that these messages do not modify routing behavior on their own. They must be accompanied by + * other messages such as + */ public class TransitAlert extends AbstractTransitEntity { private final I18NString headerText; diff --git a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java index 959827813cb..022d37537b1 100644 --- a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java +++ b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java @@ -1,39 +1,46 @@ package org.opentripplanner.updater.spi; /** - * Interface for graph updaters. Objects that implement this interface should always be configured - * via PreferencesConfigurable.configure after creating the object. GraphUpdaterConfigurator should - * take care of that. Beware that updaters run in separate threads at the same time. + * Interface for classes that fetch or receive information while the OTP instance is running and + * make changes to the Graph and associated transit data to reflect the current situation. This is + * typically information about disruptions to service, bicycle or parking availability, etc. *

      - * The only allowed way to make changes to the graph in an updater is by executing (anonymous) - * GraphWriterRunnable objects via GraphUpdaterManager.execute. + * Each GraphUpdater implementation will be run in a separate thread, allowing it to make blocking + * calls to fetch data or even sleep between periodic polling operations without affecting the rest + * of the OTP instance. *

      - * Example implementations can be found in ExampleGraphUpdater and ExamplePollingGraphUpdater. + * GraphUpdater implementations are instantiated by UpdaterConfigurator. Each updater configuration + * item in the router-config for a ThingUpdater is mapped to a corresponding configuration class + * ThingUpdaterParameters, which is passed to the ThingUpdater constructor. + *

      + * GraphUpdater implementations are only allowed to make changes to the Graph and related structures + * by submitting instances implementing GraphWriterRunnable (often anonymous functions) to the + * Graph writing callback function supplied to them by the GraphUpdaterManager after they're + * constructed. In this way, changes are queued up by many GraphUpdaters running in parallel on + * different threads, but are applied sequentially in a single-threaded manner to simplify reasoning + * about concurrent reads and writes to the Graph. */ public interface GraphUpdater { - /** - * Graph updaters must be aware of their manager to be able to execute GraphWriterRunnables. - * GraphUpdaterConfigurator should take care of calling this function. - */ - void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph); /** - * Here the updater can be initialized. If it throws, the updater won't be started (i.e. the run - * method won't be called). All updaters' setup methods will be run sequentially in a - * single-threaded manner before updates begin, in order to avoid concurrent reads/writes. + * After a GraphUpdater is instantiated, the GraphUpdaterManager that instantiated it will + * immediately supply a callback via this method. The GraphUpdater will employ that callback + * every time it wants to queue up a write modification to the Graph or related data structures. */ - //void setup(Graph graph, TransitModel transitModel) throws Exception; + void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph); /** - * This method will run in its own thread. It pulls or receives updates and applies them to the - * graph. It must perform any writes to the graph by passing GraphWriterRunnables to - * GraphUpdaterManager.execute(). This queues up the write operations, ensuring that only one - * updater performs writes at a time. + * The GraphUpdaterManager will run this method in its own long-running thread. This method then + * pulls or receives updates and applies them to the graph. It must perform any writes to the + * graph by passing GraphWriterRunnables to the WriteToGraphCallback, which queues up the write + * operations, ensuring that only one submitted update performs writes at a time. */ void run() throws Exception; /** - * Here the updater can clean up after itself. + * When the GraphUpdaterManager wants to stop all GraphUpdaters (for example when OTP is shutting + * down) it will call this method, allowing the GraphUpdater implementation to shut down cleanly + * and release resources. */ default void teardown() {} @@ -49,8 +56,9 @@ default boolean isPrimed() { } /** - * This is the updater "type" used in the configuration file. It should ONLY be used to provide - * human friendly messages while logging and debugging. + * A GraphUpdater implementation uses this method to report its corresponding value of the "type" + * field in the configuration file. This value should ONLY be used when providing human-friendly + * messages while logging and debugging. Association of configuration to particular types is */ String getConfigRef(); } From 2bb60a0cbbc4a07a33e4072e157771ed93b3af22 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 16 Dec 2023 03:04:11 +0800 Subject: [PATCH 0385/1688] add a few incomplete javadoc ideas --- .../ext/siri/SiriTimetableSnapshotSource.java | 2 ++ .../ext/siri/updater/EstimatedTimetableSource.java | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 345f8deba20..683c4615292 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -133,10 +133,12 @@ public TimetableSnapshot getTimetableSnapshot() { /** * Method to apply a trip update list to the most recent version of the timetable snapshot. + * FIXME TripUpdate is the GTFS term, and these SIRI ETs are never converted into that same internal model. * * @param fullDataset true iff the list with updates represent all updates that are active right * now, i.e. all previous updates should be disregarded * @param updates SIRI VehicleMonitoringDeliveries that should be applied atomically + * FIXME aren't these ET deliveries, not VM? */ public UpdateResult applyEstimatedTimetable( @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher, diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java index ac98839fb42..3c5a387ca09 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java @@ -3,6 +3,11 @@ import java.util.Optional; import uk.org.siri.siri20.Siri; +/** + * Interface for a blocking, polling approach + * TODO should the methods return as fast as possible? + * Or do they intentionally wait for refreshed data? + */ public interface EstimatedTimetableSource { /** * Wait for one message to arrive, and decode it into a List of TripUpdates. Blocking call. From 3f79a1db3dd6fedb4af5717798a1150b096a7dc8 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Mon, 18 Dec 2023 23:19:59 +0800 Subject: [PATCH 0386/1688] javadoc and code comment updates --- .../ext/siri/SiriTimetableSnapshotSource.java | 5 +- .../ext/siri/SiriTripPatternCache.java | 124 ++++++++++++------ .../ext/siri/SiriTripPatternIdGenerator.java | 15 +-- .../org/opentripplanner/model/Timetable.java | 9 +- .../model/TimetableSnapshot.java | 106 +++++++++++---- .../model/TimetableSnapshotProvider.java | 10 +- .../transit/model/network/StopPattern.java | 1 + .../transit/model/network/TripPattern.java | 40 +++++- .../updater/spi/GraphUpdater.java | 9 +- .../updater/trip/TripPatternCache.java | 24 +++- 10 files changed, 239 insertions(+), 104 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 683c4615292..08752a50b89 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -375,11 +375,10 @@ private Result addTripToGraphAndBuffer(TripUpdate tr serviceDate ); - // Add new trip times to the buffer and return success + // Add new trip times to the buffer and return result with success or error. The update method + // will perform protective copies as needed whether TripPattern is from realtime data or not. var result = buffer.update(pattern, tripUpdate.tripTimes(), serviceDate); - LOG.debug("Applied real-time data for trip {} on {}", trip, serviceDate); - return result; } diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index 8b33d71ab96..bb2de82a281 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -12,7 +12,6 @@ import javax.annotation.Nonnull; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.network.TripPatternBuilder; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; @@ -20,23 +19,42 @@ import org.slf4j.LoggerFactory; /** - * A synchronized cache of trip patterns that are added to the graph due to GTFS-realtime messages. + * Threadsafe mechanism for tracking any TripPatterns added to the graph via SIRI realtime messages. + * This tracks only patterns added by realtime messages, not ones that already existed from the + * scheduled NeTEx. This is a "cache" in the sense that it will keep returning the same TripPattern + * when presented with the same StopPattern, so if realtime messages add many trips passing through + * the same sequence of stops, they will all end up on this same TripPattern. + *

      + * Note that there are two versions of this class, this one for GTFS-RT and another for SIRI. + * See additional comments in the Javadoc of the GTFS-RT version of this class. */ public class SiriTripPatternCache { private static final Logger log = LoggerFactory.getLogger(SiriTripPatternCache.class); + // Seems to be the primary collection of added TripPatterns, with other collections serving as + // indexes. Similar to TripPatternCache.cache but with service date as part of the key. private final Map cache = new HashMap<>(); + // Apparently a SIRI-specific index for use in GraphQL APIs (missing on GTFS-RT version). private final ListMultimap patternsForStop = Multimaps.synchronizedListMultimap( ArrayListMultimap.create() ); + // TODO clarify name and add documentation to this field private final Map updatedTripPatternsForTripCache = new HashMap<>(); + // TODO generalize this so we can generate IDs for SIRI or GTFS-RT sources private final SiriTripPatternIdGenerator tripPatternIdGenerator; + + // TODO clarify name and add documentation to this field, and why it's constructor injected private final Function getPatternForTrip; + /** + * Constructor. + * TODO: clarify why the ID generator and pattern fetching function are injected. Potentially + * make the class usable for GTFS-RT cases by injecting different ID generator etc. + */ public SiriTripPatternCache( SiriTripPatternIdGenerator tripPatternIdGenerator, Function getPatternForTrip @@ -45,9 +63,15 @@ public SiriTripPatternCache( this.getPatternForTrip = getPatternForTrip; } + // Below was clearly derived from a method from TripPatternCache, down to the obsolete Javadoc + // mentioning transit vertices and edges (which don't exist since raptor was adopted). + // Note that this is the only non-dead-code public method on this class, and mirrors the only + // public method on the GTFS-RT version of TripPatternCache. + // It also explains why this class is called a "cache". It allows reusing the same TripPattern + // instance when many different trips are created or updated with the same pattern. + /** - * Get cached trip pattern or create one if it doesn't exist yet. If a trip pattern is created, - * vertices and edges for this trip pattern are also created in the transitModel. + * Get cached trip pattern or create one if it doesn't exist yet. * * @param stopPattern stop pattern to retrieve/create trip pattern * @param trip Trip containing route of new trip pattern in case a new trip pattern will be @@ -61,6 +85,9 @@ public synchronized TripPattern getOrCreateTripPattern( ) { TripPattern originalTripPattern = getPatternForTrip.apply(trip); + // TODO: verify, this is different than GTFS-RT version + // It can return a TripPattern from the scheduled data, but protective copies are handled + // in TimetableSnapshot.update. Document better this aspect of the contract in this method's Javadoc. if (originalTripPattern.getStopPattern().equals(stopPattern)) { return originalTripPattern; } @@ -90,38 +117,41 @@ public synchronized TripPattern getOrCreateTripPattern( cache.put(key, tripPattern); } - /** - * - * When the StopPattern is first modified (e.g. change of platform), then updated (or vice versa), the stopPattern is altered, and - * the StopPattern-object for the different states will not be equal. - * - * This causes both tripPatterns to be added to all unchanged stops along the route, which again causes duplicate results - * in departureRow-searches (one departure for "updated", one for "modified"). - * - * Full example: - * Planned stops: Stop 1 - Platform 1, Stop 2 - Platform 1 - * - * StopPattern #rt1: "updated" stopPattern cached in 'patternsForStop': - * - Stop 1, Platform 1 - * - StopPattern #rt1 - * - Stop 2, Platform 1 - * - StopPattern #rt1 - * - * "modified" stopPattern: Stop 1 - Platform 1, Stop 2 - Platform 2 - * - * StopPattern #rt2: "modified" stopPattern cached in 'patternsForStop' will then be: - * - Stop 1, Platform 1 - * - StopPattern #rt1, StopPattern #rt2 - * - Stop 2, Platform 1 - * - StopPattern #rt1 - * - Stop 2, Platform 2 - * - StopPattern #rt2 - * - * - * Therefore, we must cleanup the duplicates by deleting the previously added (and thus outdated) - * tripPattern for all affected stops. In example above, "StopPattern #rt1" should be removed from all stops - * - */ + /* + When the StopPattern is first modified (e.g. change of platform), then updated (or vice + versa), the stopPattern is altered, and the StopPattern-object for the different states will + not be equal. + + This causes both tripPatterns to be added to all unchanged stops along the route, which again + causes duplicate results in departureRow-searches (one departure for "updated", one for + "modified"). + + Full example: + Planned stops: Stop 1 - Platform 1, Stop 2 - Platform 1 + + StopPattern #rt1: "updated" stopPattern cached in 'patternsForStop': + - Stop 1, Platform 1 + - StopPattern #rt1 + - Stop 2, Platform 1 + - StopPattern #rt1 + + "modified" stopPattern: Stop 1 - Platform 1, Stop 2 - Platform 2 + + StopPattern #rt2: "modified" stopPattern cached in 'patternsForStop' will then be: + - Stop 1, Platform 1 + - StopPattern #rt1, StopPattern #rt2 + - Stop 2, Platform 1 + - StopPattern #rt1 + - Stop 2, Platform 2 + - StopPattern #rt2 + + Therefore, we must clean up the duplicates by deleting the previously added (and thus + outdated) tripPattern for all affected stops. In example above, "StopPattern #rt1" should be + removed from all stops. + + TODO explore why this particular case is handled in an ad-hoc manner. It seems like all such + indexes should be constantly rebuilt and versioned along with the TimetableSnapshot. + */ TripServiceDateKey tripServiceDateKey = new TripServiceDateKey(trip, serviceDate); if (updatedTripPatternsForTripCache.containsKey(tripServiceDateKey)) { // Remove previously added TripPatterns for the trip currently being updated - if the stopPattern does not match @@ -138,10 +168,8 @@ public synchronized TripPattern getOrCreateTripPattern( (System.currentTimeMillis() - t1), trip.getId() ); - /* - TODO: Also remove previously updated - now outdated - TripPattern from cache ? - cache.remove(new StopPatternServiceDateKey(cachedTripPattern.stopPattern, serviceDate)); - */ + // TODO: Also remove previously updated - now outdated - TripPattern from cache ? + // cache.remove(new StopPatternServiceDateKey(cachedTripPattern.stopPattern, serviceDate)); } } @@ -160,6 +188,7 @@ public synchronized TripPattern getOrCreateTripPattern( /** * Returns any new TripPatterns added by real time information for a given stop. + * TODO: this appears to be currently unused. Perhaps remove it if the API has changed. * * @param stop the stop * @return list of TripPatterns created by real time sources for the stop. @@ -169,6 +198,16 @@ public List getAddedTripPatternsForStop(RegularStop stop) { } } +//// Below here are multiple additional private classes defined in the same top-level class file. +//// TODO: move these private classes inside the above class as private static inner classes. + +/** + * Serves as the key for the collection of realtime-added TripPatterns. + * Must define hashcode and equals to confer semantic identity. + * It seems like there's a separate TripPattern instance for each StopPattern and service date, + * rather a single TripPattern instance associated with a separate timetable for each date. + * TODO: clarify why each date has a different TripPattern instead of a different Timetable. + */ class StopPatternServiceDateKey { StopPattern stopPattern; @@ -194,6 +233,11 @@ public boolean equals(Object thatObject) { } } +/** + * An alternative key for looking up realtime-added TripPatterns by trip and service date instead + * of stop pattern and service date. Must define hashcode and equals to confer semantic identity. + * TODO verify whether one map is considered the definitive collection and the other an index. + */ class TripServiceDateKey { Trip trip; diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java index dc03550086f..e0882bd6215 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java @@ -8,20 +8,19 @@ import org.opentripplanner.transit.model.timetable.Trip; /** - * This class generate a new id for new TripPatterns created real-time by the SIRI updaters. It is - * important to creat only on instance of this class, and inject it where it is needed. - *

      - * The id generation is thread-safe, even if that is probably not needed. + * This class generates new unique IDs for TripPatterns created in response to real-time updates + * from the SIRI updaters. It is important to create only one instance of this class, and inject + * that single instance wherever it is needed. The ID generation is threadsafe, even if that is + * probably not needed. */ class SiriTripPatternIdGenerator { private final AtomicInteger counter = new AtomicInteger(0); /** - * Generate unique trip pattern code for real-time added trip pattern. This function roughly - * follows the format of {@link GenerateTripPatternsOperation}. - *

      - * The generator add a postfix 'RT' to indicate that this trip pattern is generated at REAL-TIME. + * Generate a unique ID for a trip pattern added in response to a realtime message. This function + * roughly follows the format of {@link GenerateTripPatternsOperation}. The generator suffixes the + * ID with 'RT' to indicate that this trip pattern is generated in response to a realtime message. */ FeedScopedId generateUniqueTripPatternId(Trip trip) { Route route = trip.getRoute(); diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/src/main/java/org/opentripplanner/model/Timetable.java index a8f0f1bbf44..53b4a24678f 100644 --- a/src/main/java/org/opentripplanner/model/Timetable.java +++ b/src/main/java/org/opentripplanner/model/Timetable.java @@ -42,14 +42,15 @@ import org.slf4j.LoggerFactory; /** + * A Timetable is a TripTimes (stop-level details like arrival and departure times) for each of the + * trips on a particular TripPattern. * Timetables provide most of the TripPattern functionality. Each TripPattern may possess more than * one Timetable when stop time updates are being applied: one for the scheduled stop times, one for * each snapshot of updated stop times, another for a working buffer of updated stop times, etc. *

      - * TODO OTP2 - Move this to package: org.opentripplanner.model - * - after as Entur NeTEx PRs are merged. - * - Also consider moving its dependencies in: org.opentripplanner.routing - * - The NEW Timetable should not have any dependencies to + * TODO OTP2 - Move this to package: org.opentripplanner.model after as Entur NeTEx PRs are merged. + * Also consider moving its dependencies into package org.opentripplanner.routing. The NEW + * Timetable should not have any dependencies to [?] */ public class Timetable implements Serializable { diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index 066a27ba15a..3c5beddb322 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -20,7 +20,6 @@ import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate; -import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateSuccess; @@ -28,59 +27,107 @@ import org.slf4j.LoggerFactory; /** - * Part of concurrency control for stoptime updates. + * A TimetableSnapshot holds a set of realtime-updated Timetables frozen at a moment in time. It + * can return a Timetable for any TripPattern in the public transit network considering all + * accumulated realtime updates, falling back on the scheduled Timetable if no updates have been + * applied for a given TripPattern. *

      - * All updates should be performed on a snapshot before it is handed off to any searches. A single + * This is a central part of managing concurrency when many routing searches may be happening, but + * realtime updates are also streaming in which change the vehicle arrival and departure times. + * Any given request will only see one unchanging TimetableSnapshot over the course of its search. + *

      + * An instance of TimetableSnapshot first serves as a buffer to accumulate a batch of incoming + * updates on top of any already known updates to the base schedules. From time to time such a batch + * of updates is committed (like a database transaction). At this point the TimetableSnapshot is + * treated as immutable and becomes available for use by new incoming routing requests. + *

      + * All updates to a snapshot must be completed before it is handed off to any searches. A single * snapshot should be used for an entire search, and should remain unchanged for that duration to * provide a consistent view not only of trips that have been boarded, but of relative arrival and * departure times of other trips that have not necessarily been boarded. *

      - * At this point, only one writing thread at a time is supported. + * A TimetableSnapshot instance may only be modified by a single thread. This makes it easier to + * reason about how the snapshot is built up and used. Write operation are applied one by one in + * order with no concurrent access, then read operations are allowed concurrently by many threads + * once writing is forbidden. *

      + * The fact that TripPattern instances carry a reference only to their scheduled Timetable and not + * to their realtime timetable is largely due to historical path-dependence in OTP development. + * Streaming realtime support was added around 2013 as a sort of sandbox feature that was switched + * off by default. Looking up realtime timetables during routing was a fringe feature that needed + * to impose near-zero cost and avoid introducing complexity into the primary codebase. Now over + * ten years later, the principles of how this system operates are rather stable, but the + * implementation would benefit from some deduplication and cleanup. Once that is complete, looking + * up timetables on this class could conceivably be replaced with snapshotting entire views of the + * transit network. It would also be possible to make the realtime version of Timetables or + * TripTimes the primary view, and include references back to their scheduled versions. */ public class TimetableSnapshot { private static final Logger LOG = LoggerFactory.getLogger(TimetableSnapshot.class); /** - * A set of all timetables which have been modified and are waiting to be indexed. When - * dirty is null, it indicates that the snapshot is read-only. + * During the construction phase of the TimetableSnapshot, before it is considered immutable and + * used in routing, this Set holds all timetables that have been modified and are waiting to be + * indexed. This field will be set to null when the TimetableSnapshot becomes read-only. */ private final Set dirtyTimetables = new HashSet<>(); /** - * The timetables for different days, for each TripPattern (each sequence of stops on a particular - * Route) for which we have an updated Timetable. The keys include both TripPatterns from the - * scheduled GTFS, and TripPatterns added by realtime messages and tracked by the - * TripPatternCache. Note that the keys will not include all scheduled TripPatterns, only those - * for which we've got an update. We use a HashMap rather than a Map so we can clone it. If this - * turns out to be slow/spacious we can use an array with integer pattern indexes. The SortedSet - * members are copy-on-write. - * FIXME: this could be made into a flat hashtable with compound keys. + * For each TripPattern (sequence of stops on a particular Route) for which we have received a + * realtime update, an ordered set of timetables on different days. The key TripPatterns may + * include ones from the scheduled GTFS, as well as ones added by realtime messages and + * tracked by the TripPatternCache.

      + * Note that the keys do not include all scheduled TripPatterns, only those for which we have at + * least one update. The type of the field is specifically HashMap (rather than the more general + * Map interface) because we need to efficiently clone it.

      + * The members of the SortedSet (the Timetable for a particular day) are treated as copy-on-write + * when we're updating them. If an update will modify the timetable for a particular day, that + * timetable is replicated before any modifications are applied to avoid affecting any previous + * TimetableSnapshots still in circulation which reference that same Timetable instance.

      + * Alternative implementations: A. This could be an array indexed using the integer pattern + * indexes. B. It could be made into a flat hashtable with compound keys (TripPattern, LocalDate). + * The compound key approach better reflects the fact that there should be only one Timetable per + * TripPattern and date. */ private HashMap> timetables = new HashMap(); /** - *

      - * Map containing the current trip pattern given a trip id and a service date, if it has been - * changed from the scheduled pattern with an update, for which the stopPattern is different. - *

      - *

      - * This is a HashMap and not a Map so the clone function is available. + * For cases where the trip pattern (sequence of stops visited) has been changed by a realtime + * update, a Map associating the updated trip pattern with a compound key of the feed-scoped + * trip ID and the service date. The type of this field is HashMap rather than the more general + * Map interface because we need to efficiently clone it whenever we start building up a new + * snapshot. TODO: clarify if this is an index or the original source of truth. */ private HashMap realtimeAddedTripPattern = new HashMap<>(); /** - * This maps contains all of the new or updated TripPatterns added by realtime data indexed on - * stop. This has to be kept in order for them to be included in the stop times api call on a - * specific stop. - *

      - * This is a SetMultimap, so that each pattern can only be added once. - *

      - * TODO Find a generic way to keep all realtime indexes. + * This is an index of TripPatterns, not the primary collection. + * It tracks which TripPatterns that were updated or newly created by realtime messages contain + * which stops. This allows them to be readily found and included in API responses containing + * stop times at a specific stop. This is a SetMultimap, so that each pattern is only retained + * once per stop even if it's added more than once. + * TODO: Better, more general handling of all realtime indexes outside primary data structures. */ private SetMultimap patternsForStop = HashMultimap.create(); + /** + * This is an as-yet unused alternative to the current boolean fields readOnly and dirty, as well + * as setting dirtyTimetables to null. A given instance of TimetableSnapshot should progress + * through all these states in order, and cannot return to a previous state. + */ + private enum TimetableSnapshotState { + WRITABLE_CLEAN, WRITBLE_DIRTY, INDEXING, READ_ONLY + } + + /** + * Which stage of existence this TimetableSnapshot is in, which determines whether it's read-only. + * Writing to TimetableSnapshots is not concurrent and does not happen in hot methods. On the + * other hand, reading is expected to be highly concurrent and happens during core routing + * processes. Therefore, any assertions about state should be concentrated in the writing methods. + */ + private TimetableSnapshotState state; + /** * Boolean value indicating that timetable snapshot is read only if true. Once it is true, it * shouldn't be possible to change it to false anymore. @@ -164,8 +211,9 @@ public boolean hasRealtimeAddedTripPatterns() { } /** - * Update the trip times of one trip in a timetable of a trip pattern. If the trip of the trip - * times does not exist yet in the timetable, add it. + * Update the TripTimes of one Trip in a Timetable of a TripPattern. If the Trip of the TripTimes + * does not exist yet in the Timetable, add it. This method will make a protective copy + * of the Timetable if such a copy has not already been made while building up this snapshot. * * @param pattern trip pattern * @param updatedTripTimes updated trip times diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java b/src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java index 3f3e54dbc30..047f0301141 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshotProvider.java @@ -1,9 +1,13 @@ package org.opentripplanner.model; /** - * This interface is used to retrieve the current instance of the TimetableSnapshot. Any provider - * implementing this interface is responsible for thread-safe access to the latest valid instance of - * the {@code TimetableSnapshot}. + * This interface is used to retrieve the latest available instance of TimetableSnapshot + * that is ready for use in routing. Slightly newer TimetableSnapshots may be available, but still + * in the process of accumulating updates or being indexed and finalized for read-only routing use. + *

      + * Any provider implementing this interface is responsible for ensuring access to the latest + * {@code TimetableSnapshot} is handled in a thread-safe manner, as this method can be called by + * any number of concurrent routing requests at once. *

      * Note that in the long run we don't necessarily want multiple snapshot providers. Ideally we'll * just have one way of handling these concurrency concerns, so no need for an interface and diff --git a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java index fe1bb84cf3f..c1173994ac7 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java @@ -84,6 +84,7 @@ public static StopPatternBuilder create(int length) { return new StopPatternBuilder(new StopPattern(length)); } + // TODO: name is deceptive as this does not mutate the object in place, it mutates a copy public StopPatternBuilder mutate() { return new StopPatternBuilder(this); } diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index 7057d9fd56e..aff20e9a1ba 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -56,29 +56,55 @@ public final class TripPattern private static final Logger LOG = LoggerFactory.getLogger(TripPattern.class); private final Route route; + /** - * The stop-pattern help us reuse the same stops in several trip-patterns; Hence saving memory. - * The field should not be accessible outside the class, and all access is done through method - * delegation, like the {@link #numberOfStops()} and {@link #canBoard(int)} methods. + * The Route and StopPattern together form the primary key of the TripPattern. They are the shared + * set of characteristics that group many trips together into one TripPattern. This grouping saves + * memory by not replicating any details shared across all trips in the TripPattern, but it is + * also essential to some optimizations in routing algorithms like Raptor. + *

      + * This field should not be accessed outside this class. All access to the StopPattern is + * performed through method delegation, like the {@link #numberOfStops()} and + * {@link #canBoard(int)} methods. */ private final StopPattern stopPattern; + + /** + * TripPatterns hold a reference to a Timetable (i.e. TripTimes for all Trips in the pattern) for + * only scheduled trips from the GTFS or NeTEx data. If any trips were later updated in real time, + * there will be another Timetable holding those updates and reading through to the scheduled one. + * This realtime Timetable is retrieved from a TimetableSnapshot. + * Also see end of Javadoc on TimetableSnapshot for more details. + */ private final Timetable scheduledTimetable; + + // This TransitMode is a redundant replication/memoization of information on the Route. + // It appears that in the TripPatternBuilder it is only ever set from a Trip which is itself set + // from a Route. TODO confirm whether there is any reason this doesn't just read through to Route. private final TransitMode mode; + private final SubMode netexSubMode; private final boolean containsMultipleModes; private String name; - /** - * Geometries of each inter-stop segment of the tripPattern. - */ + + /** Geometries of each inter-stop segment of the tripPattern. */ private final byte[][] hopGeometries; /** * The original TripPattern this replaces at least for one modified trip. + * + * Currently this seems to only be set (via TripPatternBuilder) from TripPatternCache and + * SiriTripPatternCache. + * + * FIXME this is only used rarely, make that obvious from comments. */ private final TripPattern originalTripPattern; /** - * Has the TripPattern been created by a real-time update. + * When a trip is added or rerouted by a realtime update, this may give rise to a new TripPattern + * that did not exist in the scheduled data. For such TripPatterns this field will be true. If on + * the other hand this TripPattern instance was created from the schedule data, this field will be + * false. */ private final boolean createdByRealtimeUpdater; diff --git a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java index 022d37537b1..5c8490ae9bb 100644 --- a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java +++ b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java @@ -3,16 +3,13 @@ /** * Interface for classes that fetch or receive information while the OTP instance is running and * make changes to the Graph and associated transit data to reflect the current situation. This is - * typically information about disruptions to service, bicycle or parking availability, etc. - *

      + * typically information about disruptions to service, bicycle or parking availability, etc.

      * Each GraphUpdater implementation will be run in a separate thread, allowing it to make blocking * calls to fetch data or even sleep between periodic polling operations without affecting the rest - * of the OTP instance. - *

      + * of the OTP instance.

      * GraphUpdater implementations are instantiated by UpdaterConfigurator. Each updater configuration * item in the router-config for a ThingUpdater is mapped to a corresponding configuration class - * ThingUpdaterParameters, which is passed to the ThingUpdater constructor. - *

      + * ThingUpdaterParameters, which is passed to the ThingUpdater constructor.

      * GraphUpdater implementations are only allowed to make changes to the Graph and related structures * by submitting instances implementing GraphWriterRunnable (often anonymous functions) to the * Graph writing callback function supplied to them by the GraphUpdaterManager after they're diff --git a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java index b2bf7dc410f..4b92ef6861d 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java +++ b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java @@ -13,9 +13,18 @@ import org.opentripplanner.transit.model.timetable.Trip; /** - * A synchronized cache of trip patterns that are added to the graph due to GTFS-realtime messages. + * Threadsafe mechanism for tracking any TripPatterns added to the graph via GTFS realtime messages. * This tracks only patterns added by realtime messages, not ones that already existed from the - * scheduled GTFS. + * scheduled GTFS. This is a "cache" in the sense that it will keep returning the same TripPattern + * when presented with the same StopPattern, so if realtime messages add many trips passing through + * the same sequence of stops, they will all end up on this same TripPattern. + *

      + * Note that there are two versions of this class, this one for GTFS-RT and another for SIRI. + * TODO: consolidate TripPatternCache and SiriTripPatternCache. They seem to only be separate + * because SIRI- or GTFS-specific indexes of the added TripPatterns seem to have been added to + * this primary collection. + * FIXME: the name does not make it clear that this has anything to do with elements that are only + * added due to realtime updates, and it is only loosely a cache. RealtimeAddedTripPatterns? */ public class TripPatternCache { @@ -24,11 +33,12 @@ public class TripPatternCache { * already existed from the scheduled GTFS. */ private final Map cache = new HashMap<>(); + + /** Used for producing sequential integers to ensure each added pattern has a unique name. */ private int counter = 0; /** - * Get cached trip pattern or create one if it doesn't exist yet. If a trip pattern is created, - * vertices and edges for this trip pattern are also created in the graph. + * Get cached trip pattern or create one if it doesn't exist yet. * * @param stopPattern stop pattern to retrieve/create trip pattern * @param trip the trip the new trip pattern will be created for @@ -72,6 +82,12 @@ public synchronized TripPattern getOrCreateTripPattern( /** * Generate unique trip pattern code for real-time added trip pattern. This function roughly * follows the format of the {@link GenerateTripPatternsOperation}. + * In the SIRI version of this class, this is provided by a SiriTripPatternIdGenerator. If the + * GTFS-RT and SIRI version of these classes are merged, this function could become a second + * implementation of TripPatternIdGenerator. + * This method is not static because it references a monotonically increasing integer counter. + * But like in SiriTripPatternIdGenerator, this could be encapsulated outside the cache object. + * TODO: create GtfsRtTripPatternIdGenerator as part of merging the two TripPatternCaches */ private FeedScopedId generateUniqueTripPatternCode(Trip trip) { FeedScopedId routeId = trip.getRoute().getId(); From 7a0b56d7f3dd0871de7f0a14d958629060ec6a64 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Mon, 18 Dec 2023 23:27:43 +0800 Subject: [PATCH 0387/1688] chain builder methods also capitalize constant identifier --- .../ext/siri/SiriTripPatternCache.java | 17 +++++++---------- .../updater/trip/TripPatternCache.java | 12 +++++------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index bb2de82a281..165feee7513 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -30,7 +30,7 @@ */ public class SiriTripPatternCache { - private static final Logger log = LoggerFactory.getLogger(SiriTripPatternCache.class); + private static final Logger LOG = LoggerFactory.getLogger(SiriTripPatternCache.class); // Seems to be the primary collection of added TripPatterns, with other collections serving as // indexes. Similar to TripPatternCache.cache but with service date as part of the key. @@ -99,20 +99,17 @@ public synchronized TripPattern getOrCreateTripPattern( // Create TripPattern if it doesn't exist yet if (tripPattern == null) { var id = tripPatternIdGenerator.generateUniqueTripPatternId(trip); - TripPatternBuilder tripPatternBuilder = TripPattern + tripPattern = TripPattern .of(id) .withRoute(trip.getRoute()) .withMode(trip.getMode()) .withNetexSubmode(trip.getNetexSubMode()) - .withStopPattern(stopPattern); - + .withStopPattern(stopPattern) + .withCreatedByRealtimeUpdater(true) + .withOriginalTripPattern(originalTripPattern) + .build(); // TODO - SIRI: Add pattern to transitModel index? - tripPatternBuilder.withCreatedByRealtimeUpdater(true); - tripPatternBuilder.withOriginalTripPattern(originalTripPattern); - - tripPattern = tripPatternBuilder.build(); - // Add pattern to cache cache.put(key, tripPattern); } @@ -162,7 +159,7 @@ Therefore, we must clean up the duplicates by deleting the previously added (and patternsForStop.values().removeAll(Arrays.asList(cachedTripPattern)); int sizeAfter = patternsForStop.values().size(); - log.debug( + LOG.debug( "Removed outdated TripPattern for {} stops in {} ms - tripId: {}", (sizeBefore - sizeAfter), (System.currentTimeMillis() - t1), diff --git a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java index 4b92ef6861d..c4f437dabde 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java +++ b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java @@ -60,17 +60,15 @@ public synchronized TripPattern getOrCreateTripPattern( // Generate unique code for trip pattern var id = generateUniqueTripPatternCode(trip); - TripPatternBuilder tripPatternBuilder = TripPattern + tripPattern = TripPattern .of(id) .withRoute(route) .withMode(trip.getMode()) .withNetexSubmode(trip.getNetexSubMode()) - .withStopPattern(stopPattern); - - tripPatternBuilder.withCreatedByRealtimeUpdater(true); - tripPatternBuilder.withOriginalTripPattern(originalTripPattern); - - tripPattern = tripPatternBuilder.build(); + .withStopPattern(stopPattern) + .withCreatedByRealtimeUpdater(true) + .withOriginalTripPattern(originalTripPattern) + .build(); // Add pattern to cache cache.put(stopPattern, tripPattern); From a0c18f4e468394614341eb542a6a418fb29531a8 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Wed, 20 Dec 2023 22:29:02 +0800 Subject: [PATCH 0388/1688] add javadoc (incl. uncertain and open questions) --- .../raptoradapter/transit/TransitLayer.java | 10 ++++ .../transit/mappers/TransitLayerMapper.java | 16 ++--- .../transit/mappers/TransitLayerUpdater.java | 5 ++ .../opentripplanner/routing/graph/Graph.java | 58 +++++++++++++------ .../services/notes/StreetNotesService.java | 12 ++-- .../api/OtpServerRequestContext.java | 8 ++- .../ConstructApplicationFactory.java | 3 +- .../transit/service/TransitModel.java | 50 +++++++++++++--- .../transit/service/TransitService.java | 15 ++++- .../updater/trip/TimetableSnapshotSource.java | 21 +++---- 10 files changed, 145 insertions(+), 53 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java index 60cfb72ef7d..4188d5e569b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java @@ -17,6 +17,16 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.StopModel; +/** + * This is a replica of public transportation data already present in TransitModel, but rearranged + * and indexed differently for efficient use by the Raptor router. + * Patterns and trips are split out by days, retaining only the services actually running on any + * particular day. + * + * TODO rename - this name appears to be modeled after R5, where the TransportNetwork is split into + * two layers: one for the streets and one for the public transit data. But here, this seems to be + * an indexed and rearranged copy of the main transit data collected under a TransitModel instance. + */ public class TransitLayer { /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java index d74e2fbcbdb..6c9bd67a7f5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java @@ -32,15 +32,15 @@ import org.slf4j.LoggerFactory; /** - * Maps the TransitLayer object from the OTP Graph object. The ServiceDay hierarchy is reversed, + * Maps the TransitLayer object from the TransitModel object. The ServiceDay hierarchy is reversed, * with service days at the top level, which contains TripPatternForDate objects that contain only * TripSchedules running on that particular date. This makes it faster to filter out TripSchedules * when doing Range Raptor searches. *

      - * CONCURRENCY: This mapper run part of the mapping in parallel using parallel streams. This improve - * startup time on the Norwegian graph by 20 seconds; reducing the this mapper from 36 seconds to 15 - * seconds, and the total startup time from 80 seconds to 60 seconds. (JAN 2020, MacBook Pro, 3.1 - * GHz i7) + * CONCURRENCY: This mapper runs part of the mapping in parallel using parallel streams. This + * improves startup time on the Norwegian network by 20 seconds, by reducing this mapper from 36 + * seconds to 15 seconds, and the total startup time from 80 seconds to 60 seconds. (JAN 2020, + * MacBook Pro, 3.1 GHz i7) */ public class TransitLayerMapper { @@ -59,8 +59,8 @@ public static TransitLayer map( return new TransitLayerMapper(transitModel).map(tuningParameters); } - // TODO We can save time by either pre-sorting these or use a sorting algorithm that is - // optimized for sorting nearly sorted list + // TODO We could save time by either pre-sorting these, or by using a sorting algorithm that is + // optimized for sorting nearly-sorted lists. static List getSortedTripTimes(Timetable timetable) { return timetable .getTripTimes() @@ -75,7 +75,7 @@ private TransitLayer map(TransitTuningParameters tuningParameters) { ConstrainedTransfersForPatterns constrainedTransfers = null; StopModel stopModel = transitModel.getStopModel(); - LOG.info("Mapping transitLayer from Graph..."); + LOG.info("Mapping transitLayer from TransitModel..."); Collection allTripPatterns = transitModel.getAllTripPatterns(); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java index bed27497587..9b9cc9f0c7f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java @@ -30,6 +30,11 @@ * id and replaced by their updated versions. The realtime TransitLayer is then switched out with * the updated copy in an atomic operation. This ensures that any TransitLayer that is referenced * from the Graph is never changed. + * + * This is a way of keeping the TransitLayer up to date (in sync with the TransitModel plus its most + * recent TimetableSnapshot) without repeatedly deriving it from scratch every few seconds. The same + * incremental changes are applied to both the TimetableSnapshot and the TransitLayer and they are + * published together. */ public class TransitLayerUpdater { diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java index 4b2ca75b1a7..42909952178 100644 --- a/src/main/java/org/opentripplanner/routing/graph/Graph.java +++ b/src/main/java/org/opentripplanner/routing/graph/Graph.java @@ -37,18 +37,41 @@ import org.slf4j.LoggerFactory; /** - * A graph is really just one or more indexes into a set of vertexes. It used to keep edgelists for - * each vertex, but those are in the vertex now. + * This is one of the main data structures in OpenTripPlanner. It represents a mathematical object + * called a graph (https://en.wikipedia.org/wiki/Graph_theory) relative to which many routing + * algorithms are defined. A graph is made up of vertices and edges. These are also referred to as + * nodes and arcs or links, but in OTP we always use the vertices and edges terminology. + *

      + * In OTP1, the Graph contained vertices and edges representing the entire transportation network, + * including edges representing both street segments and public transit lines connecting stops. In + * OTP2, the Graph edges now represent only the street network. Transit routing is performed on + * other data structures suited to the Raptor algorithm (the TransitModel). Some transit-related + * vertices are still present in the Graph, specifically those representing transit stops, + * entrances, and elevators. Their presence in the street graph creates a connection between the two + * routable data structures (identifying where stops in the TransitModel are located relative to + * roads). + *

      + * Other data structures related to street routing, such as elevation data and vehicle parking + * information, are also collected here as fields of the Graph. For historical reasons the Graph + * sometimes serves as a catch-all, as it used to be the root of the object tree representing the + * whole transportation network. + *

      + * In some sense the Graph is just some indexes into a set of vertices. The Graph used to hold lists + * of edges for each vertex, but those lists are now attached to the vertices themselves. + *

      + * TODO rename to StreetGraph to emphasize what it represents? */ public class Graph implements Serializable { private static final Logger LOG = LoggerFactory.getLogger(Graph.class); + /** Attaches text notes to street edges, which do not affect routing. */ public final StreetNotesService streetNotesService = new StreetNotesService(); - /* Ideally we could just get rid of vertex labels, but they're used in tests and graph building. */ + // Ideally we could just get rid of vertex labels, but they're used in tests and graph building. private final Map vertices = new ConcurrentHashMap<>(); + /** Conserve memory by reusing immutable instances of Strings, integer arrays, etc. */ public final transient Deduplicator deduplicator; public final Instant buildTime = Instant.now(); @@ -58,10 +81,10 @@ public class Graph implements Serializable { private transient StreetIndex streetIndex; - //ConvexHull of all the graph vertices. Generated at Graph build time. + /** The convex hull of all the graph vertices. Generated at the time the Graph is built. */ private Geometry convexHull = null; - /* The preferences that were used for graph building. */ + /** The preferences that were used for building this Graph instance. */ public Preferences preferences = null; /** True if OSM data was loaded into this Graph. */ @@ -71,26 +94,27 @@ public class Graph implements Serializable { * Have bike parks already been linked to the graph. As the linking happens twice if a base graph * is used, we store information on whether bike park linking should be skipped. */ + public boolean hasLinkedBikeParks = false; /** * The difference in meters between the WGS84 ellipsoid height and geoid height at the graph's * center */ public Double ellipsoidToGeoidDifference = 0.0; - /** - * Does this graph contain elevation data? - */ + + /** True if this graph contains elevation data. */ public boolean hasElevation = false; - /** - * If this graph contains elevation data, the minimum value. - */ + + /** If this graph contains elevation data, the minimum elevation value. Otherwise null. */ public Double minElevation = null; - /** - * If this graph contains elevation data, the maximum value. - */ + + /** If this graph contains elevation data, the maximum elevation value. Otherwise null. */ public Double maxElevation = null; - /** The distance between elevation samples used in CompactElevationProfile. */ + /** + * The horizontal distance across the ground between successive elevation samples in + * CompactElevationProfile. + */ // TODO refactoring transit model: remove and instead always serialize directly from and to the // static variable in CompactElevationProfile in SerializedGraphObject private double distanceBetweenElevationSamples; @@ -132,9 +156,7 @@ public Graph() { this(new Deduplicator(), null); } - /** - * Add the given vertex to the graph. - */ + /** Add the given vertex to the graph. */ public void addVertex(Vertex v) { Vertex old = vertices.put(v.getLabel(), v); if (old != null) { diff --git a/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java b/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java index 9dd24182461..92d73574530 100644 --- a/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java +++ b/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java @@ -15,11 +15,11 @@ import org.slf4j.LoggerFactory; /** - * This service manage street edge notes. An edge note is an free-format alert (text) attached to an - * edge, which is returned in the itinerary when this edge is used, and which *does not have any - * impact on routing*. The last restriction is necessary as the edge do not know which notes it is - * attached to (this to prevent having to store note lists in the edge, which is memory consuming as - * only few edges will have notes). + * This service manages street edge notes. An edge note is a free-format alert (text) attached to an + * edge, which is returned along with any itinerary where this edge is used, and which does not have any + * impact on routing. Notes cannot affect routing because edges do not know which notes are + * attached to them. This avoids storing references to notes on the edge, which would probably not + * be worth the memory consumption as only few edges have notes. *

      * The service owns a list of StreetNotesSource, with a single static one used for graph building. * "Dynamic" notes can be returned by classes implementing StreetNoteSource, added to this service @@ -32,7 +32,7 @@ * traversed, ie "state back edge"). Usually matcher will match note based on the mode (cycling, * driving) or if a wheelchair access is requested. * - * @author laurent + * @author Laurent Grégoire */ public class StreetNotesService implements Serializable { diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index fa6ead99c5e..ac9da31d00e 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -30,10 +30,16 @@ /** * The purpose of this class is to allow APIs (HTTP Resources) to access the OTP Server Context. + * FIXME circular definition (OtpServerRequestContext provides access to OTP Server Context). + * What exactly does "Server Context" mean here? What does "access" mean? Does this mean it + * "allows individual requests to call a limited number of methods on the components of the server + * without direct access to their internals?" * By using an interface, and not injecting each service class we avoid giving the resources access * to the server implementation. The context is injected by Jersey. An alternative to injecting this * interface is to inject each individual component in the context - hence reducing the dependencies - * further. But there is not a "real" need for this. For example, we do not have unit tests on the + * further. + * TODO clarify how injecting more individual components would "reduce dependencies further". + * But there is not a "real" need for this. For example, we do not have unit tests on the * Resources. If we in the future would decide to write unit tests for the APIs, then we could * eliminate this interface and just inject the components. See the bind method in OTPServer. *

      diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index a4f0ee49652..dc04c6220c2 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -35,7 +35,8 @@ import org.opentripplanner.visualizer.GraphVisualizer; /** - * Dagger dependency injection Factory to create components for the OTP construct application phase. + * A Factory used by the Dagger dependency injection system to create the components of OTP, which + * are then wired up to construct the application. */ @Singleton @Component( diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java index 2f0162aa8b1..1f90764dda5 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitModel.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitModel.java @@ -55,7 +55,25 @@ import org.slf4j.LoggerFactory; /** - * Repository for Transit entities. + * The TransitModel groups together all instances making up OTP's primary internal representation + * of the public transportation network. Although the names of many entities are derived from + * GTFS concepts, these are actually independent of the data source from which they are loaded. + * Both GTFS and NeTEx entities are mapped to these same internal OTP entities. + * + * A TransitModel instance also includes references to some transient indexes of its contents, to + * the TransitLayer derived from it, and to some other services and utilities that operate upon + * its contents. + * + * The TransitModel stands in opposition to two other aggregates: the Graph (representing the + * street network) and the TransitLayer (representing many of the same things in the TransitModel + * but rearranged to be more efficient for Raptor routing). + * + * At this point the TransitModel is not often read directly. Many requests will look at the + * TransitLayer rather than the TransitModel it's derived from. Both are often accessed via the + * TransitService rather than directly reading the fields of TransitModel or TransitLayer. + * + * TODO rename, as this is not really the model, but a top-level object grouping together instances + * of model classes with things that operate on and map those instances. */ public class TransitModel implements Serializable { @@ -79,6 +97,25 @@ public class TransitModel implements Serializable { private ZonedDateTime transitServiceStarts = LocalDate.MAX.atStartOfDay(ZoneId.systemDefault()); private ZonedDateTime transitServiceEnds = LocalDate.MIN.atStartOfDay(ZoneId.systemDefault()); + /** + * The TransitLayer representation (optimized and rearranged for Raptor) of this TransitModel's + * scheduled (non-realtime) contents. + */ + private transient TransitLayer transitLayer; + + /** + * This updater applies realtime changes queued up for the next TimetableSnapshot such that + * this TransitModel.realtimeSnapshot remains aligned with the service represented in + * (this TransitModel instance + that next TimetableSnapshot). This is a way of keeping the + * TransitLayer up to date without repeatedly deriving it from scratch every few seconds. The + * same incremental changes are applied to both sets of data and they are published together. + */ + private transient TransitLayerUpdater transitLayerUpdater; + + /** + * An optionally present second TransitLayer representing the contents of this TransitModel plus + * the results of realtime updates in the latest TimetableSnapshot. + */ private final transient ConcurrentPublished realtimeTransitLayer = new ConcurrentPublished<>(); private final transient Deduplicator deduplicator; @@ -102,9 +139,6 @@ public class TransitModel implements Serializable { private final Map> flexTripsById = new HashMap<>(); - private transient TransitLayer transitLayer; - private transient TransitLayerUpdater transitLayerUpdater; - private transient TransitAlertService transitAlertService; @Inject @@ -113,15 +147,15 @@ public TransitModel(StopModel stopModel, Deduplicator deduplicator) { this.deduplicator = deduplicator; } - /** Constructor for deserialization. */ + /** No-argument constructor, required for deserialization. */ public TransitModel() { this(new StopModel(), new Deduplicator()); } /** - * Perform indexing on timetables, and create transient data structures. This used to be done in - * readObject methods upon deserialization, but stand-alone mode now allows passing graphs from - * graphbuilder to server in memory, without a round trip through serialization. + * Perform indexing on timetables, and create transient data structures. This used to be done + * inline in readObject methods upon deserialization, but it is now possible to pass transit data + * from the graph builder to the server in memory, without a round trip through serialization. */ public void index() { if (index == null) { diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java index d0664aa292d..24719239e58 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -43,7 +43,20 @@ import org.opentripplanner.updater.GraphUpdaterStatus; /** - * Entry point for read-only requests towards the transit API. + * TransitService is a read-only interface for retrieving public transport data. It provides a + * frozen view of all these elements at a point in time, which is not affected by incoming realtime + * data, allowing results to remain stable over the course of a request. This can be used for + * fetching tables of specific information like the routes passing through a particular stop, or for + * gaining access to the entirety of the data to perform routing. + *

      + * TODO this interface seems to provide direct access to the TransitLayer but not the TransitModel. + * Is this intentional, because TransitLayer is meant to be read-only and TransitModel is not? + * Should this be renamed TransitDataService since it seems to provide access to the data but + * not to transit routing functionality (which is provided by the RoutingService)? + * The DefaultTransitService implementation has a TransitModel instance and many of its methods + * read through to that TransitModel instance. But that field itself is not exposed, while the + * TransitLayer is here. It seems like exposing the raw TransitLayer is still a risk since it's + * copy-on-write and shares a lot of objects with any other TransitLayer instances. */ public interface TransitService { Collection getFeedIds(); diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 19db2c7e309..7ee181faa15 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -88,20 +88,18 @@ public class TimetableSnapshotSource implements TimetableSnapshotProvider { /** * The working copy of the timetable snapshot. Should not be visible to routing threads. Should * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that - * might modify this buffer will correctly acquire the lock. + * might modify this buffer will correctly acquire the lock. By design, only one thread should + * ever be writing to this buffer. But we need to suspend writes while we're indexing and swapping + * out the buffer (Or do we? Can't we just make a new copy of the buffer first?) + * TODO: research why this lock is needed since only one thread should ever be writing to this buffer. + * Instead we should throw an exception if a writing section is entered by more than one thread. */ private final TimetableSnapshot buffer = new TimetableSnapshot(); - /** - * Lock to indicate that buffer is in use - */ + /** Lock to indicate that buffer is in use. */ private final ReentrantLock bufferLock = new ReentrantLock(true); - /** - * A synchronized cache of trip patterns that are added to the graph due to GTFS-realtime - * messages. - */ - + /** A synchronized cache of trip patterns added to the graph due to GTFS-realtime messages. */ private final TripPatternCache tripPatternCache = new TripPatternCache(); private final ZoneId timeZone; @@ -121,7 +119,10 @@ public class TimetableSnapshotSource implements TimetableSnapshotProvider { */ private volatile TimetableSnapshot snapshot = null; - /** Should expired real-time data be purged from the graph. */ + /** + * Should expired real-time data be purged from the graph. + * TODO clarify exactly what this means? In what circumstances would you want to turn it off? + */ private final boolean purgeExpiredData; protected LocalDate lastPurgeDate = null; From 710b6785cdd3351691938ae0d1ebf135942b5377 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sun, 21 Jan 2024 16:42:18 +0800 Subject: [PATCH 0389/1688] Add more Javadoc and questions to realtime code --- .../ext/siri/SiriAlertsUpdateHandler.java | 26 +++++++++++++++---- .../ext/siri/mapper/AffectsMapper.java | 4 +++ .../ext/siri/updater/SiriSXUpdater.java | 26 +++++++++++++++++++ .../framework/retry/OtpRetry.java | 5 ++++ .../routing/alertpatch/EntityKey.java | 6 +++++ .../routing/alertpatch/EntitySelector.java | 8 ++++++ .../DelegatingTransitAlertServiceImpl.java | 16 +++++++++++- .../routing/impl/TransitAlertServiceImpl.java | 15 +++++++++++ .../routing/services/TransitAlertService.java | 18 +++++++++++++ .../config/framework/json/EnumMapper.java | 11 ++++++++ .../framework/json/ParameterBuilder.java | 4 +++ .../updater/alert/TransitAlertProvider.java | 7 +++++ 12 files changed, 140 insertions(+), 6 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java b/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java index 68b055bda46..9568684105b 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java @@ -35,9 +35,11 @@ import uk.org.siri.siri20.WorkflowStatusEnumeration; /** - * This updater applies the equivalent of GTFS Alerts, but from SIRI Situation Exchange feeds. NOTE - * this cannot handle situations where there are multiple feeds with different IDs (for now it may - * only work in single-feed regions). + * This updater applies the equivalent of GTFS Alerts, but from SIRI Situation Exchange feeds. + * TODO REALTIME: The name should be clarified, as there is no such thing as "SIRI Alerts", and it + * is referencing the internal model concept of "Alerts" which are derived from GTFS terminology. + * NOTE this cannot handle situations where there are multiple feeds with different IDs (for now it + * may only work in single-feed regions). */ public class SiriAlertsUpdateHandler { @@ -45,8 +47,14 @@ public class SiriAlertsUpdateHandler { private final String feedId; private final Set alerts = new HashSet<>(); private final TransitAlertService transitAlertService; - /** How long before the posted start of an event it should be displayed to users */ + + /** How long before the posted start of an event it should be displayed to users. */ private final Duration earlyStart; + + /** + * This takes the parts of the SIRI SX message saying which transit entities are affected and + * maps them to multiple OTP internal model entities. + */ private final AffectsMapper affectsMapper; public SiriAlertsUpdateHandler( @@ -120,6 +128,12 @@ public void update(ServiceDelivery delivery) { } } + /** + * FIXME REALTIME This does not just "handle" an alert, it builds an internal model Alert from + * an incoming SIRI situation exchange element. It is a mapper or factory. + * It may return null if all of header, description, and detail text are empty or missing in the + * SIRI message. In all other cases it will return a valid TransitAlert instance. + */ private TransitAlert handleAlert(PtSituationElement situation) { TransitAlertBuilder alert = createAlertWithTexts(situation); @@ -199,7 +213,9 @@ private long getEpochSecond(ZonedDateTime startTime) { } /* - * Creates alert from PtSituation with all textual content + * Creates alert from PtSituation with all textual content. + * The feed scoped ID of this alert will be the single feed ID associated with this update handler + * and the situation number provided in the feed. */ private TransitAlertBuilder createAlertWithTexts(PtSituationElement situation) { return TransitAlert diff --git a/src/ext/java/org/opentripplanner/ext/siri/mapper/AffectsMapper.java b/src/ext/java/org/opentripplanner/ext/siri/mapper/AffectsMapper.java index 734cc8edbd3..a1fb943f60c 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/mapper/AffectsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/siri/mapper/AffectsMapper.java @@ -33,6 +33,10 @@ /** * Maps a {@link AffectsScopeStructure} to a list of {@link EntitySelector}s + * + * Concretely: this takes the parts of the SIRI SX (Alerts) message describing which transit + * entities are concerned by the alert, and maps them to EntitySelectors, which can match multiple + * OTP internal model entities that should be associated with the message. */ public class AffectsMapper { diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java index 014d5b24061..817505d81c0 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java @@ -31,6 +31,7 @@ public class SiriSXUpdater extends PollingGraphUpdater implements TransitAlertPr private final String url; private final String originalRequestorRef; private final TransitAlertService transitAlertService; + // TODO What is this, why does it exist as a persistent instance? private final SiriAlertsUpdateHandler updateHandler; private WriteToGraphCallback saveResultOnGraph; private ZonedDateTime lastTimestamp = ZonedDateTime.now().minusWeeks(1); @@ -85,6 +86,7 @@ public SiriSXUpdater(SiriSXUpdaterParameters config, TransitModel transitModel) @Override public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) { + // TODO REALTIME this callback should have a different name, it is currently too verb-like. this.saveResultOnGraph = saveResultOnGraph; } @@ -101,6 +103,9 @@ protected void runPolling() throws InterruptedException { retry.execute(this::updateSiri); } + /** + * This part has been factored out to allow repeated retries in case the connection fails etc. + */ private void updateSiri() { boolean moreData = false; do { @@ -112,6 +117,27 @@ private void updateSiri() { // primitive, because the object moreData persists across iterations. final boolean markPrimed = !moreData; if (serviceDelivery.getSituationExchangeDeliveries() != null) { + // FIXME REALTIME This is submitting a method on a long-lived instance as a runnable. + // These runnables were intended to be small, disposable self-contained update tasks. + // See org/opentripplanner/updater/trip/PollingTripUpdater.java:90 + // Clarify why that is passing in so many other references. It should only contain + // what's needed to operate on the graph. This should be illustrated in documentation + // as a little box labeled "change trip ABC123 by making stop 53 late by 2 minutes." + // Also clarify how this works without even using the supplied graph or TransitModel: + // there are multiple TransitAlertServices and they are not versioned along with the\ + // Graph, they are attached to updaters. + // This is submitting a runnable to an executor, but that runnable only writes back to + // objects owned by this updater itself with no versioning. Why is this happening? + // If this is an intentional choice to live-patch a single server-wide instance of an + // alerts service/index while it's already in use by routing, we should be clear about + // this and document why it differs from the graph-writer design. Currently the code + // seems to go through the a ritual of following the threadsafe copy-on-write pattern + // without actually doing so. + // It's understandable to defer the list-of-alerts processing to another thread than this + // fetching thread, but I don't think we want that happening on the graph writer thread. + // There seems to be a misunderstanding that the tasks are submitted to get them off the + // updater thread, but the real reason is to ensure consistent transactions in graph + // writing and reading. saveResultOnGraph.execute((graph, transitModel) -> { updateHandler.update(serviceDelivery); if (markPrimed) { diff --git a/src/main/java/org/opentripplanner/framework/retry/OtpRetry.java b/src/main/java/org/opentripplanner/framework/retry/OtpRetry.java index c53250c8fd6..1a9136653fd 100644 --- a/src/main/java/org/opentripplanner/framework/retry/OtpRetry.java +++ b/src/main/java/org/opentripplanner/framework/retry/OtpRetry.java @@ -17,6 +17,11 @@ public class OtpRetry { private final Duration initialRetryInterval; private final int backoffMultiplier; private final Runnable onRetry; + + /** + * A predicate to determine whether a particular exception should end the retry cycle or not. + * If the predicate returns true, retries will continue. False, and the retry cycle is broken. + */ private final Predicate retryableException; OtpRetry( diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java b/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java index 69d5a638e93..00f2bdafcd0 100644 --- a/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java +++ b/src/main/java/org/opentripplanner/routing/alertpatch/EntityKey.java @@ -3,6 +3,12 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.timetable.Direction; +/** + * This encompasses many different kinds of entity keys, all of which are simple record types, all + * grouped together as the only allowed implementations of a sealed marker interface. These key + * types represent various combinations used to look up Alerts that might be associated with a + * particular stop, or a stop on a route, or all routes of a certain type etc. + */ public sealed interface EntityKey { record Agency(FeedScopedId agencyId) implements EntityKey {} diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java b/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java index 9aa44ec8f2f..9fa94a6b795 100644 --- a/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java +++ b/src/main/java/org/opentripplanner/routing/alertpatch/EntitySelector.java @@ -5,6 +5,14 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.timetable.Direction; +/** + * Describes which elements in the internal transit data model are affected by a realtime alert. + * Note that this is specific to alerts and doesn't seem to be used by anything else. + * This is probably because alerts are unique in their ability to attach themselves to many + * different routes, stops, etc. at once, while non-alert elements tend to be associated with very + * specific single other elements. + * @see EntityKey + */ public sealed interface EntitySelector { EntityKey key(); diff --git a/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java b/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java index d8c5dd19f3b..cfa92ffaff3 100644 --- a/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java +++ b/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java @@ -18,11 +18,23 @@ * This class is used to combine alerts from multiple {@link TransitAlertService}s. Each * {@link TransitAlertProvider} has its own service, and all need to be queried in order to fetch * all alerts. + * + * Concretely: every realtime updater receiving GTFS Alerts or SIRI Situation Exchange (SX) + * messages currently maintains its own private index of alerts seperate from all other updaters. + * To make the set of all alerts from all updaters available in a single operaion and associate it + * with the graph as a whole, the various indexes are merged in such a way as to have the same + * index as each individual index. */ public class DelegatingTransitAlertServiceImpl implements TransitAlertService { private final ArrayList transitAlertServices = new ArrayList<>(); + /** + * Constructor which scans over all existing GraphUpdaters associated with a TransitModel + * instance and retains references to all their TransitAlertService instances. + * This implies that these instances are expected to remain in use indefinitely (not be replaced + * with new instances or taken out of service over time). + */ public DelegatingTransitAlertServiceImpl(TransitModel transitModel) { if (transitModel.getUpdaterManager() != null) { transitModel @@ -38,7 +50,9 @@ public DelegatingTransitAlertServiceImpl(TransitModel transitModel) { @Override public void setAlerts(Collection alerts) { - throw new UnsupportedOperationException("Not supported"); + throw new UnsupportedOperationException( + "This delegating TransitAlertService is not intended to hold any TransitAlerts of its own." + ); } @Override diff --git a/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java b/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java index 285b4665c46..b63041d66e7 100644 --- a/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java +++ b/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java @@ -16,6 +16,16 @@ import org.opentripplanner.transit.service.TransitModel; /** + * This is the primary implementation of TransitAlertService, which actually retains its own set + * of TransitAlerts and indexes them for fast lookup by which transit entity is affected. + * The only other implementation exists just to combine several instances of this primary + * implementation into one. + * TODO REALTIME investigate why each updater has its own service instead of taking turns + * sequentially writing to a single service. Original design was for all data and indexes to be + * associated with the Graph or transit model (i.e. the object graph of instances of the transit + * model) and for updaters to submit write tasks that would patch the current version in a + * sequential way, e.g. "add these 10 alerts", "remove these 5 alerts", etc. + * * When an alert is added with more than one transit entity, e.g. a Stop and a Trip, both conditions * must be met for the alert to be displayed. This is the case in both the Norwegian interpretation * of SIRI, and the GTFS-RT alerts specification. @@ -32,6 +42,11 @@ public TransitAlertServiceImpl(TransitModel transitModel) { @Override public void setAlerts(Collection alerts) { + // NOTE this is being patched live by updaters while in use (being read) by other threads + // performing trip planning. The single-action assignment helps a bit, but the map can be + // swapped out while the delegating service is in the middle of multiple calls that read from it. + // The consistent approach would be to duplicate the entire service, update it copy-on write, + // and swap in the entire service after the update. Multimap newAlerts = HashMultimap.create(); for (TransitAlert alert : alerts) { for (EntitySelector entity : alert.entities()) { diff --git a/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java b/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java index e80d56e039e..6dd1423ea8c 100644 --- a/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java +++ b/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java @@ -8,6 +8,24 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.timetable.Direction; +/** + * The TransitAlertService stores a set of alerts (passenger-facing textual information associated + * with transit entities such as stops or routes) which are currently active and should be provided + * to end users when their itineraries include the relevant stop, route, etc. + * + * Its primary purpose is to index those alerts, which may be numerous, so they can be looked up + * rapidly and attached to the various pieces of an itinerary as it's being returned to the user. + * + * Most elements in an itinerary will have no alerts attached, so those cases need to return + * quickly. For example, no alerts on board stop A, no alerts on route 1 ridden, no alerts on alight + * stop B, no alerts on route 2 ridden, yes one alert found on alight stop C. + * + * The fact that alerts are relatively sparse (at the scale of the entire transportation system) + * is central to this implementation. Adding a list of alerts to every element in the system would + * mean storing large amounts of null or empty list references. Instead, alerts are looked up in + * maps allowing them to be attached to any object with minimal space overhead, but requiring some + * careful indexing to ensure their presence or absence on each object can be determined quickly. + */ public interface TransitAlertService { void setAlerts(Collection alerts); diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java index ce880058005..381799bd121 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java @@ -4,6 +4,14 @@ import java.util.Optional; import org.opentripplanner.framework.doc.DocumentedEnum; +/** + * This converts strings appearing in configuration files into enum values. + * The values appearing in config files are case-insensitive and can use either dashes + * or underscores indiscriminately. + * Dashes are replaced with underscores, and the string is converted to upper case. + * In practice, this serves to convert from kebab-case to SCREAMING_SNAKE_CASE (which is + * conventional for Java enum values), leaving the latter unchanged if it's used in the config file. + */ public class EnumMapper { @SuppressWarnings("unchecked") @@ -11,6 +19,9 @@ public static > Optional mapToEnum(String text, Class ty return (Optional) mapToEnum2(text, type); } + /** + * Maps an individual value from a config file into its corresponding enum value. + */ public static Optional> mapToEnum2(String text, Class> type) { if (text == null) { return Optional.empty(); diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index f1d90d0ec40..ab19f08e25b 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -42,6 +42,10 @@ import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.framework.FeedScopedId; +/** + * TODO clarify whether this is building a declarative representation of the parameter, or building + * a concrete key-value pair for a parameter in a config file being read at server startup, or both. + */ public class ParameterBuilder { private static final Object UNDEFINED = new Object(); diff --git a/src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java b/src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java index e7c3bbc5bf6..deae4557c3e 100644 --- a/src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java +++ b/src/main/java/org/opentripplanner/updater/alert/TransitAlertProvider.java @@ -2,6 +2,13 @@ import org.opentripplanner.routing.services.TransitAlertService; +/** + * Interface for things that maintain their own individual index associating TransitAlerts with the + * transit entities they affect. In practice, these are always realtime updaters handling GTFS-RT + * Alerts or Siri SX messages. This interface appears to exist only to allow merging multiple such + * services together, which appears to be a workaround for not maintaining snapshots of a single + * instance-wide index. + */ public interface TransitAlertProvider { TransitAlertService getTransitAlertService(); } From 3b94c8f54793dbb84597a044144ab9ee28241ff3 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Wed, 24 Jan 2024 20:18:50 +0800 Subject: [PATCH 0390/1688] code formatting with mvn prettier:write --- .../ext/siri/SiriTripPatternCache.java | 19 ++++++++++--------- .../model/TimetableSnapshot.java | 5 ++++- .../updater/spi/GraphUpdater.java | 1 - .../updater/trip/TripPatternCache.java | 19 ++++++++++--------- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index 165feee7513..497aadf0c9a 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -99,15 +99,16 @@ public synchronized TripPattern getOrCreateTripPattern( // Create TripPattern if it doesn't exist yet if (tripPattern == null) { var id = tripPatternIdGenerator.generateUniqueTripPatternId(trip); - tripPattern = TripPattern - .of(id) - .withRoute(trip.getRoute()) - .withMode(trip.getMode()) - .withNetexSubmode(trip.getNetexSubMode()) - .withStopPattern(stopPattern) - .withCreatedByRealtimeUpdater(true) - .withOriginalTripPattern(originalTripPattern) - .build(); + tripPattern = + TripPattern + .of(id) + .withRoute(trip.getRoute()) + .withMode(trip.getMode()) + .withNetexSubmode(trip.getNetexSubMode()) + .withStopPattern(stopPattern) + .withCreatedByRealtimeUpdater(true) + .withOriginalTripPattern(originalTripPattern) + .build(); // TODO - SIRI: Add pattern to transitModel index? // Add pattern to cache diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index 3c5beddb322..dfb1975d818 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -117,7 +117,10 @@ public class TimetableSnapshot { * through all these states in order, and cannot return to a previous state. */ private enum TimetableSnapshotState { - WRITABLE_CLEAN, WRITBLE_DIRTY, INDEXING, READ_ONLY + WRITABLE_CLEAN, + WRITBLE_DIRTY, + INDEXING, + READ_ONLY, } /** diff --git a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java index 5c8490ae9bb..d8edc651e7e 100644 --- a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java +++ b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java @@ -18,7 +18,6 @@ * about concurrent reads and writes to the Graph. */ public interface GraphUpdater { - /** * After a GraphUpdater is instantiated, the GraphUpdaterManager that instantiated it will * immediately supply a callback via this method. The GraphUpdater will employ that callback diff --git a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java index c4f437dabde..f43bf5e3b99 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java +++ b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java @@ -60,15 +60,16 @@ public synchronized TripPattern getOrCreateTripPattern( // Generate unique code for trip pattern var id = generateUniqueTripPatternCode(trip); - tripPattern = TripPattern - .of(id) - .withRoute(route) - .withMode(trip.getMode()) - .withNetexSubmode(trip.getNetexSubMode()) - .withStopPattern(stopPattern) - .withCreatedByRealtimeUpdater(true) - .withOriginalTripPattern(originalTripPattern) - .build(); + tripPattern = + TripPattern + .of(id) + .withRoute(route) + .withMode(trip.getMode()) + .withNetexSubmode(trip.getNetexSubMode()) + .withStopPattern(stopPattern) + .withCreatedByRealtimeUpdater(true) + .withOriginalTripPattern(originalTripPattern) + .build(); // Add pattern to cache cache.put(stopPattern, tripPattern); From 264ab35db7ccb53db042ea0256f1f2f09a6f73bd Mon Sep 17 00:00:00 2001 From: eibakke Date: Wed, 24 Jan 2024 16:11:57 +0100 Subject: [PATCH 0391/1688] Adds documentation to the new enums and mapper. --- .../transmodel/model/stop/StopTypeMapper.java | 17 ++++++++++++++--- .../transit/model/site/StopType.java | 12 ++++++++++++ .../apis/transmodel/schema.graphql | 3 +++ 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java index 4725f5ac4f9..bde676bec59 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java @@ -3,13 +3,24 @@ import graphql.schema.GraphQLEnumType; import org.opentripplanner.transit.model.site.StopType; +/** + * Maps the StopType enum to a GraphQL enum. + */ public class StopTypeMapper { public static final GraphQLEnumType STOP_TYPE = GraphQLEnumType .newEnum() .name("StopType") - .value("regular", StopType.REGULAR) - .value("flexible_area", StopType.FLEXIBLE_AREA) - .value("flexible_group", StopType.FLEXIBLE_GROUP) + .value("regular", StopType.REGULAR, "A regular stop defined geographically as a point.") + .value( + "flexible_area", + StopType.FLEXIBLE_AREA, + "Boarding and alighting is allowed anywhere within the geographic area of this stop." + ) + .value( + "flexible_group", + StopType.FLEXIBLE_GROUP, + "A stop that consists of multiple other stops, area or regular." + ) .build(); } diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopType.java b/src/main/java/org/opentripplanner/transit/model/site/StopType.java index 29a859fdd1c..69f11bb6b39 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopType.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopType.java @@ -1,7 +1,19 @@ package org.opentripplanner.transit.model.site; +/** + * The type of a stop location. + */ public enum StopType { + /** + * A regular stop defined geographically as a point. + */ REGULAR, + /** + * Boarding and alighting is allowed anywhere within the geographic area of this stop. + */ FLEXIBLE_AREA, + /** + * A stop that consists of multiple other stops, area or regular. + */ FLEXIBLE_GROUP, } diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index f0053e2a806..a1e971d66ef 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -1698,8 +1698,11 @@ enum StopCondition { } enum StopType { + "Boarding and alighting is allowed anywhere within the geographic area of this stop." flexible_area + "A stop that consists of multiple other stops, area or regular." flexible_group + "A regular stop defined geographically as a point." regular } From 47e2b94fb58e00535b9f567b9e5aa1ef535bbd2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Jan 2024 18:38:46 +0000 Subject: [PATCH 0392/1688] fix(deps): update dependency org.apache.httpcomponents.client5:httpclient5 to v5.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34f4365b580..06f002ff5c0 100644 --- a/pom.xml +++ b/pom.xml @@ -876,7 +876,7 @@ org.apache.httpcomponents.client5 httpclient5 - 5.3 + 5.3.1 commons-cli From d72ebf043c02d1a68591ae2bf59ebbad150aa49d Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 24 Jan 2024 19:07:39 +0000 Subject: [PATCH 0393/1688] Add changelog entry for #5613 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 6f27f60d947..4cfb1176773 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -78,6 +78,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add new path for GTFS GraphQL API, remove batch feature [#5581](https://github.com/opentripplanner/OpenTripPlanner/pull/5581) - Restructure walk/bicycle/car preferences in router-config.json [#5582](https://github.com/opentripplanner/OpenTripPlanner/pull/5582) - Revert REST API spelling change of real-time [#5629](https://github.com/opentripplanner/OpenTripPlanner/pull/5629) +- Remove `FareComponent` [#5613](https://github.com/opentripplanner/OpenTripPlanner/pull/5613) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From d0c552bffc56642a2dc9c279780875378325bf04 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Wed, 24 Jan 2024 19:07:57 +0000 Subject: [PATCH 0394/1688] Bump serialization version id for #5613 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34f4365b580..3f7fc0dd2bb 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 137 + 138 30.1 2.50 From a437720287650f5408aba4d6abeb226feeb38418 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Jan 2024 23:51:14 +0100 Subject: [PATCH 0395/1688] Remove 'fare' --- ...reInFreeTransferWindowFareServiceTest.java | 5 --- .../ext/fares/impl/DefaultFareService.java | 45 ++----------------- ...stFareInFreeTransferWindowFareService.java | 2 - .../ext/restapi/mapping/FareMapper.java | 18 +------- .../apis/gtfs/datafetchers/ItineraryImpl.java | 12 +---- 5 files changed, 6 insertions(+), 76 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java index 5664dcc765d..5d7615c49e3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java @@ -18,7 +18,6 @@ import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.fares.FareService; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.basic.TransitMode; @@ -43,18 +42,14 @@ public void canCalculateFare( Money expectedFare ) { var fares = fareService.calculateFares(i); - assertEquals(expectedFare, fares.getFare(FareType.regular)); assertFalse(fares.getItineraryProducts().isEmpty()); - for (var type : fares.getFareTypes()) { var prices = fares .getItineraryProducts() .stream() - .filter(fp -> fp.name().equals(type.name())) .map(FareProduct::price) .toList(); assertEquals(List.of(expectedFare), prices); - } } private static List createTestCases() { diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index 0bc4408b635..9f3bb2094b0 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -122,9 +122,7 @@ public ItineraryFares calculateFares(Itinerary itinerary) { boolean hasFare = false; for (FareType fareType : fareRulesPerType.keySet()) { final Multimap fareProducts = LinkedHashMultimap.create(); - List fares = new ArrayList<>(); - boolean legWithoutRulesFound = false; - boolean legsWithoutMatchingRulesFound = false; + List itineraryProducts = new ArrayList<>(); for (String feedId : fareLegsByFeed.keySet()) { ItineraryFares currentFare = ItineraryFares.empty(); var fareRules = fareRulesForFeed(fareType, feedId); @@ -140,57 +138,23 @@ public ItineraryFares calculateFares(Itinerary itinerary) { fareRules ); - if (!feedHasFare) { - legsWithoutMatchingRulesFound = true; - } hasFare = feedHasFare || hasFare; // Other feeds might still have fare for some legs fareProducts.putAll(currentFare.getLegProducts()); - fare.addFare(fareType, currentFare.getFare(fareType)); - - fares.add(currentFare.getFare(fareType)); - - // If all the legs are from one feed, consider itinerary products - if (fareLegs.equals(fareLegsByFeed.get(feedId))) { - currentFare - .getFareTypes() - .forEach(type -> { - var money = currentFare.getFare(type); - var fareProduct = FareProduct - .of(new FeedScopedId(feedId, type.name()), type.name(), money) - .build(); - fare.addItineraryProducts(List.of(fareProduct)); - }); - } + itineraryProducts.addAll(currentFare.getItineraryProducts()); + } else { - legWithoutRulesFound = true; } } fare.addFareProductUses(fareProducts); + fare.addItineraryProducts(itineraryProducts); // No fares will be discovered after this point if (!hasFare) { continue; } - // Accumulate the final price of the fare or indicate that no final fare could be found - if (legWithoutRulesFound || legsWithoutMatchingRulesFound) { - fare.addFare( - fareType, - Money.ofFractionalAmount(fares.get(0).currency(), UNKNOWN_FARE_PRICE) - ); - } else { - fare.addFare( - fareType, - fares - .stream() - .reduce( - Money.ofFractionalAmount(fare.getFare(fareType).currency(), 0), - (r1, r2) -> r1.plus(r2) - ) - ); - } } return hasFare ? fare : null; } @@ -292,7 +256,6 @@ protected boolean populateFare( } var amount = r.resultTable[0][legs.size() - 1]; - fare.addFare(fareType, Money.ofFractionalAmount(currency, amount)); fare.addFareProductUses(fareProductUses); return count > 0; } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java index 1f1c112e63c..cbb50fd57b9 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java @@ -85,7 +85,6 @@ protected boolean populateFare( currentTransferWindowCost = Money.max(currentTransferWindowCost, rideCost.orElse(zero)); } cost = cost.plus(currentTransferWindowCost); - fare.addFare(fareType, cost); var fp = new FareProduct( new FeedScopedId("fares", fareType.name()), fareType.name(), @@ -95,7 +94,6 @@ protected boolean populateFare( null ); fare.addItineraryProducts(List.of(fp)); - fare.addFare(fareType, cost); return cost.greaterThan(zero); } diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java index e8582607ce5..0e9f452b5c1 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/FareMapper.java @@ -1,14 +1,11 @@ package org.opentripplanner.ext.restapi.mapping; import com.google.common.collect.Multimap; -import java.util.AbstractMap.SimpleEntry; import java.util.Collection; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Map.Entry; import java.util.Optional; -import java.util.stream.Collectors; import javax.annotation.Nullable; import org.opentripplanner.ext.restapi.model.ApiCurrency; import org.opentripplanner.ext.restapi.model.ApiFareProduct; @@ -19,7 +16,6 @@ import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.FareProductUse; -import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.fare.RiderCategory; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; @@ -35,10 +31,9 @@ public FareMapper(Locale locale) { public ApiItineraryFares mapFare(Itinerary itinerary) { var fares = itinerary.getFares(); - Map apiFare = toApiMoneys(fares); return new ApiItineraryFares( - apiFare, + Map.of(), Map.of(), toApiFareProducts(fares.getItineraryProducts()), toApiLegProducts(itinerary, fares.getLegProducts()) @@ -102,17 +97,6 @@ private List toApiFareProducts(Collection product) } } - private Map toApiMoneys(ItineraryFares fare) { - return fare - .getFareTypes() - .stream() - .map(key -> { - var money = toApiMoney(fare.getFare(key)); - return new SimpleEntry<>(key, money); - }) - .collect(Collectors.toMap(e -> e.getKey().name(), Entry::getValue)); - } - private ApiMoney toApiMoney(Money m) { var c = m.currency(); return new ApiMoney( diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java index 5399783bee0..a7ae7954cd6 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java @@ -48,17 +48,7 @@ public DataFetcher>> fares() { if (fare == null) { return null; } - return fare - .getFareTypes() - .stream() - .map(fareKey -> { - Map result = new HashMap<>(); - result.put("name", fareKey); - result.put("fare", fare.getFare(fareKey)); - result.put("details", List.of()); - return result; - }) - .collect(Collectors.toList()); + return List.of(); }; } From d273717d91584370164cee65ea36d9f8b6ac0168 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 00:07:48 +0100 Subject: [PATCH 0396/1688] Remove more fares --- .../flex/trip/ScheduledDeviatedTripTest.java | 2 +- .../ext/fares/impl/AtlantaFareService.java | 29 +++++++------------ .../model/fare/ItineraryFares.java | 17 ----------- .../apis/gtfs/GraphQLIntegrationTest.java | 1 - 4 files changed, 12 insertions(+), 37 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 3523a6e5c5e..a922886c3b1 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -149,7 +149,7 @@ void calculateDirectFare() { var itineraries = router.createFlexOnlyItineraries().stream().peek(filter::decorate).toList(); var itinerary = itineraries.iterator().next(); - assertFalse(itinerary.getFares().getFareTypes().isEmpty()); + assertFalse(itinerary.getFares().getItineraryProducts().isEmpty()); assertEquals(Money.usDollars(2.5f), itinerary.getFares().getFare(FareType.regular)); diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java index d2d9d3e2a1b..019edd5d30a 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java @@ -1,8 +1,11 @@ package org.opentripplanner.ext.fares.impl; +import static org.opentripplanner.transit.model.basic.Money.ZERO_USD; import static org.opentripplanner.transit.model.basic.Money.usDollars; +import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; +import com.google.common.collect.Multimap; import java.time.Duration; import java.time.ZoneId; import java.util.ArrayList; @@ -69,7 +72,7 @@ public boolean routeNamesContains(@Nullable String s) { private static class ATLTransfer { List legs = new ArrayList<>(); - List fares = new ArrayList<>(); + Multimap fares = ArrayListMultimap.create(); final FareType fareType; final Currency currency; Money lastFareWithTransfer; @@ -89,12 +92,10 @@ public ATLTransfer(Currency currency, FareType fareType) { */ public boolean addLeg(Leg leg, Money defaultFare) { // A transfer will always contain at least one ride. - ItineraryFares fare = new ItineraryFares(); RideType toRideType = classify(leg); if (legs.size() == 0) { legs.add(leg); - fare.addFare(fareType, defaultFare); - fares.add(fare); + fares.put(fareType, defaultFare); lastFareWithTransfer = defaultFare; maxRides = getMaxTransfers(toRideType); transferWindow = getTransferWindow(toRideType); @@ -128,12 +129,8 @@ public boolean addLeg(Leg leg, Money defaultFare) { } } - // The transfer is valid for this ride, so create a fare object. - // TODO: Change this fare object out for the one on the Ride object when Fare-by-leg is added - fares.add(fare); - if (transferClassification.type.equals(TransferType.NO_TRANSFER)) { - fare.addFare(fareType, defaultFare); + fares.put(fareType, defaultFare); // Full fare is charged, but transfer is still valid. // Ride is not added to rides list since it doesn't count towards transfer limit. // NOTE: Rides and fares list will not always be in sync because of this. @@ -143,7 +140,7 @@ public boolean addLeg(Leg leg, Money defaultFare) { // All conditions below this point "use" the transfer, so we add the ride. legs.add(leg); if (transferClassification.type.equals(TransferType.FREE_TRANSFER)) { - fare.addFare(fareType, Money.ofFractionalAmount(currency, 0)); + fares.put(fareType, Money.ofFractionalAmount(currency, 0)); lastFareWithTransfer = defaultFare; return true; } else if (transferClassification.type.equals(TransferType.TRANSFER_PAY_DIFFERENCE)) { @@ -151,11 +148,11 @@ public boolean addLeg(Leg leg, Money defaultFare) { if (defaultFare.greaterThan(lastFareWithTransfer)) { newCost = defaultFare.minus(lastFareWithTransfer); } - fare.addFare(fareType, newCost); + fares.put(fareType, newCost); lastFareWithTransfer = defaultFare; return true; } else if (transferClassification.type.equals(TransferType.TRANSFER_WITH_UPCHARGE)) { - fare.addFare(fareType, transferClassification.upcharge); + fares.put(fareType, transferClassification.upcharge); lastFareWithTransfer = defaultFare; return true; } @@ -163,11 +160,8 @@ public boolean addLeg(Leg leg, Money defaultFare) { } public Money getTotal() { - Money total = Money.ZERO_USD; - for (ItineraryFares f : fares) { - total = total.plus(f.getFare(fareType)); - } - return total; + return fares.get(fareType).stream().reduce(ZERO_USD, Money::plus); + } } @@ -420,7 +414,6 @@ public boolean populateFare( null ); fare.addItineraryProducts(List.of(fareProduct)); - fare.addFare(fareType, cost); return true; } diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index d60dbfb249e..a8ed13418ad 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -38,14 +38,6 @@ public class ItineraryFares { */ private final Multimap legProducts = LinkedHashMultimap.create(); - /** - * Holds the "fares" for the entire itinerary. The definition of a fare is not clear so - * this is deprecated. - * @deprecated Exists only for backwards compatibility and will be removed in the future. - */ - @Deprecated - private final Map fares = new HashMap<>(); - public static ItineraryFares empty() { return new ItineraryFares(); } @@ -74,7 +66,6 @@ public Multimap getLegProducts() { */ @Deprecated public void addFare(FareType fareType, Money money) { - fares.put(fareType, money); } /** @@ -99,14 +90,6 @@ public Money getFare(FareType type) { return fares.get(type); } - /** - * Return the set of {@link FareType}s that are contained in this instance. - */ - @Deprecated - public Set getFareTypes() { - return fares.keySet(); - } - @Override public int hashCode() { return Objects.hash(itineraryProducts, legProducts); diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index 6e99e096c2c..d89afea6f9d 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -183,7 +183,6 @@ static void setup() { var railLeg = (ScheduledTransitLeg) i1.getTransitLeg(2); var fares = new ItineraryFares(); - fares.addFare(FareType.regular, Money.euros(3.1f)); var dayPass = fareProduct("day-pass"); fares.addItineraryProducts(List.of(dayPass)); From d28b42b3b39f0767a7ac066f798b525138466ce6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Jan 2024 09:37:39 +0100 Subject: [PATCH 0397/1688] Remove more fares --- .../fares/impl/AtlantaFareServiceTest.java | 2 +- .../fares/impl/DefaultFareServiceTest.java | 12 ------- ...reInFreeTransferWindowFareServiceTest.java | 8 ++--- .../ext/fares/impl/OrcaFareServiceTest.java | 2 +- .../flex/trip/ScheduledDeviatedTripTest.java | 2 +- .../ext/fares/impl/AtlantaFareService.java | 3 +- .../ext/fares/impl/DefaultFareService.java | 5 +-- .../ext/fares/impl/OrcaFareService.java | 3 +- .../model/fare/ItineraryFares.java | 32 ------------------- 9 files changed, 9 insertions(+), 60 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java index b75c58923e1..d0055990782 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java @@ -228,7 +228,7 @@ void fullItinerary() { private static void calculateFare(List rides, Money expectedFare) { ItineraryFares fare = new ItineraryFares(); atlFareService.populateFare(fare, USD, FareType.electronicRegular, rides, null); - assertEquals(expectedFare, fare.getFare(FareType.electronicRegular)); + assertEquals(expectedFare, fare.getItineraryProducts().stream().filter(fp -> fp.name().equals(FareType.electronicRegular.name())).findFirst().get().price(); var fareProducts = fare .getItineraryProducts() diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index c5e26cc3c9b..6e92373854d 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -113,10 +113,6 @@ void shouldNotCombineInterlinedLegs() { var fare = service.calculateFares(itin); assertNotNull(fare); - var price = fare.getFare(FareType.regular); - - assertEquals(TWENTY_DOLLARS, price); - var legProducts = fare.getLegProducts(); var firstLeg = itin.getLegs().getFirst(); @@ -145,9 +141,6 @@ void unknownLeg() { var fare = service.calculateFares(itin); assertNotNull(fare); - var price = fare.getFare(FareType.regular); - assertEquals(Money.usDollars(-0.01f), price); - var fareProducts = List.copyOf(fare.getLegProducts().values()); assertEquals(1, fareProducts.size()); @@ -220,9 +213,6 @@ void multipleFeedsWithTransfersWithinFeed() { "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", legProducts.get(finalBusLeg).toString() ); - - var resultPrice = result.getFare(FareType.regular); - assertEquals(TWENTY_DOLLARS, resultPrice); } @Test @@ -241,8 +231,6 @@ void multipleFeedsWithUnknownFareLegs() { .stream() .map(r -> r.product().id()) .toList(); - var resultPrice = result.getFare(FareType.regular); assertEquals(List.of(OTHER_FEED_ATTRIBUTE.getId()), resultProductIds); - assertEquals(Money.usDollars(-0.01f), resultPrice); } } diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java index 5d7615c49e3..e9aa17ba35f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareServiceTest.java @@ -44,12 +44,8 @@ public void canCalculateFare( var fares = fareService.calculateFares(i); assertFalse(fares.getItineraryProducts().isEmpty()); - var prices = fares - .getItineraryProducts() - .stream() - .map(FareProduct::price) - .toList(); - assertEquals(List.of(expectedFare), prices); + var prices = fares.getItineraryProducts().stream().map(FareProduct::price).toList(); + assertEquals(List.of(expectedFare), prices); } private static List createTestCases() { diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java index e30fb2d8b18..158e9feeac3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java @@ -81,7 +81,7 @@ public static void setUpClass() { private static void calculateFare(List legs, FareType fareType, Money expectedPrice) { var itinerary = new Itinerary(legs); var itineraryFares = orcaFareService.calculateFares(itinerary); - assertEquals(expectedPrice, itineraryFares.getFare(fareType)); + assertEquals(expectedPrice, itineraryFares.getItineraryProducts().stream().filter(fareProduct -> fareProduct.name().equals(fareType.name()))); } private static void assertLegFareEquals( diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index a922886c3b1..e9c4bebe069 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -151,7 +151,7 @@ void calculateDirectFare() { var itinerary = itineraries.iterator().next(); assertFalse(itinerary.getFares().getItineraryProducts().isEmpty()); - assertEquals(Money.usDollars(2.5f), itinerary.getFares().getFare(FareType.regular)); + assertEquals(Money.usDollars(2.5f), itinerary.getFares().getItineraryProducts().getFirst().price()); OTPFeature.enableFeatures(Map.of(OTPFeature.FlexRouting, false)); } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java index 019edd5d30a..799e7ef37d7 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java @@ -160,8 +160,7 @@ public boolean addLeg(Leg leg, Money defaultFare) { } public Money getTotal() { - return fares.get(fareType).stream().reduce(ZERO_USD, Money::plus); - + return fares.get(fareType).stream().reduce(ZERO_USD, Money::plus); } } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index 9f3bb2094b0..c6ab951dc86 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -142,9 +142,7 @@ public ItineraryFares calculateFares(Itinerary itinerary) { fareProducts.putAll(currentFare.getLegProducts()); itineraryProducts.addAll(currentFare.getItineraryProducts()); - - } else { - } + } else {} } fare.addFareProductUses(fareProducts); @@ -154,7 +152,6 @@ public ItineraryFares calculateFares(Itinerary itinerary) { if (!hasFare) { continue; } - } return hasFare ? fare : null; } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index 4879d858e86..d9bfb952e6d 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -480,7 +480,8 @@ public boolean populateFare( } cost = cost.plus(orcaFareDiscount); if (cost.fractionalAmount().floatValue() < Float.MAX_VALUE) { - fare.addFare(fareType, cost); + var fp = FareProduct.of(new FeedScopedId(FEED_ID, fareType.name()), fareType.name(), cost).build(); + fare.addItineraryProducts(List.of(fp)); return true; } else { return false; diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index a8ed13418ad..530c48914c6 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -4,18 +4,13 @@ import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; import java.util.Collection; -import java.util.HashMap; import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Set; -import javax.annotation.Nullable; import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.routing.core.FareType; -import org.opentripplanner.transit.model.basic.Money; /** * @@ -56,18 +51,6 @@ public Multimap getLegProducts() { return ImmutableMultimap.copyOf(legProducts); } - /** - * Add a "fare". This is an ill-defined concept (is it for the entire itinerary or only some - * legs?) from the early days of OTP which will be removed in the future. - *

      - * @deprecated It only exists for backwards-compatibility. - * Use {@link ItineraryFares#addFareProduct(Leg, FareProduct)}, - * {@link ItineraryFares#addItineraryProducts(Collection)} instead. - */ - @Deprecated - public void addFare(FareType fareType, Money money) { - } - /** * Add fare products that cover the entire itinerary, i.e. are valid for all legs. */ @@ -75,21 +58,6 @@ public void addItineraryProducts(Collection products) { itineraryProducts.addAll(products); } - /** - * - * Get the "fare" for a specific fare type. - *

      - * It is ill-defined what this actually means (entire itinerary?, some legs?). - *

      - * Use {@link ItineraryFares#getItineraryProducts()} or {@link ItineraryFares#getLegProducts()} - * instead. - */ - @Nullable - @Deprecated - public Money getFare(FareType type) { - return fares.get(type); - } - @Override public int hashCode() { return Objects.hash(itineraryProducts, legProducts); From ab253d9ba7d1db806170bfa6d914e60548c7c7f8 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 12:53:38 +0100 Subject: [PATCH 0398/1688] Fix more tests --- .../java/org/opentripplanner/ext/fares/FaresFilterTest.java | 2 -- .../ext/fares/impl/AtlantaFareServiceTest.java | 2 +- .../fares/impl/CombinedInterlinedLegsFareServiceTest.java | 3 --- .../ext/fares/impl/DefaultFareServiceTest.java | 5 +---- .../opentripplanner/ext/fares/impl/OrcaFareServiceTest.java | 4 ++-- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java index 90468b091f9..ac11886c208 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/FaresFilterTest.java @@ -12,7 +12,6 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.fares.FareService; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.Money; @@ -34,7 +33,6 @@ void shouldAddFare() { assertEquals(ItineraryFares.empty(), i1.getFares()); var fares = new ItineraryFares(); - fares.addFare(FareType.regular, Money.euros(2.80f)); var leg = i1.getLegs().get(1); var fp = new FareProduct(id("fp"), "fare product", Money.euros(10.00f), null, null, null); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java index d0055990782..e7d5b60c023 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java @@ -228,7 +228,7 @@ void fullItinerary() { private static void calculateFare(List rides, Money expectedFare) { ItineraryFares fare = new ItineraryFares(); atlFareService.populateFare(fare, USD, FareType.electronicRegular, rides, null); - assertEquals(expectedFare, fare.getItineraryProducts().stream().filter(fp -> fp.name().equals(FareType.electronicRegular.name())).findFirst().get().price(); + assertEquals(expectedFare, fare.getItineraryProducts().stream().filter(fp -> fp.name().equals(FareType.electronicRegular.name())).findFirst().get().price()); var fareProducts = fare .getItineraryProducts() diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java index 350bae04dce..53295486128 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java @@ -65,9 +65,6 @@ void modes(CombinationMode mode, Itinerary itinerary, Money totalPrice, String h var fare = service.calculateFares(itinerary); assertNotNull(fare); - var price = fare.getFare(FareType.regular); - assertEquals(totalPrice, price); - var firstLeg = itinerary.getTransitLeg(0); var uses = fare.getLegProducts().get(firstLeg); assertEquals(1, uses.size()); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index 6e92373854d..d9dc59b898f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -49,14 +49,11 @@ void simpleZoneBasedFare() { var fare = service.calculateFares(itin); assertNotNull(fare); - var price = fare.getFare(FareType.regular); - - assertEquals(TEN_DOLLARS, price); - var fp = fare.getItineraryProducts().get(0); assertEquals(TEN_DOLLARS, fp.price()); assertEquals("F:regular", fp.id().toString()); + // todo var lp = fare.getLegProducts(); assertEquals(1, lp.size()); var product = lp.values().iterator().next().product(); diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java index 158e9feeac3..88fbff9c69c 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java @@ -491,7 +491,7 @@ void nullLongName(FareType type) { var fare = new ItineraryFares(); orcaFareService.populateFare(fare, USD, type, legs, null); - assertNotNull(fare.getFare(type)); + assertFalse(fare.getLegProducts().isEmpty()); } @ParameterizedTest @@ -513,7 +513,7 @@ void nullShortName(FareType type) { var fare = new ItineraryFares(); orcaFareService.populateFare(fare, USD, type, legs, null); - assertNotNull(fare.getFare(type)); + assertFalse(fare.getLegProducts().isEmpty()); } @Test From 5cf0b59fb27df3e32c51131734e1e578566d410c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 13:42:31 +0100 Subject: [PATCH 0399/1688] Fix tests after fare removal --- .../fares/impl/AtlantaFareServiceTest.java | 11 +- ...CombinedInterlinedLegsFareServiceTest.java | 9 + .../fares/impl/DefaultFareServiceTest.java | 42 ++- .../ext/fares/impl/FaresIntegrationTest.java | 12 +- .../ext/fares/impl/OrcaFareServiceTest.java | 11 +- .../flex/trip/ScheduledDeviatedTripTest.java | 5 +- .../ext/restapi/mapping/FareMapperTest.java | 32 -- .../ext/fares/impl/DefaultFareService.java | 9 +- .../ext/fares/impl/OrcaFareService.java | 4 +- .../__snapshots__/BikeRentalSnapshotTest.snap | 324 +----------------- .../__snapshots__/ElevationSnapshotTest.snap | 162 +-------- .../__snapshots__/TransitSnapshotTest.snap | 270 +-------------- 12 files changed, 97 insertions(+), 794 deletions(-) delete mode 100644 src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java index e7d5b60c023..2d26bf711e4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java @@ -228,7 +228,16 @@ void fullItinerary() { private static void calculateFare(List rides, Money expectedFare) { ItineraryFares fare = new ItineraryFares(); atlFareService.populateFare(fare, USD, FareType.electronicRegular, rides, null); - assertEquals(expectedFare, fare.getItineraryProducts().stream().filter(fp -> fp.name().equals(FareType.electronicRegular.name())).findFirst().get().price()); + assertEquals( + expectedFare, + fare + .getItineraryProducts() + .stream() + .filter(fp -> fp.name().equals(FareType.electronicRegular.name())) + .findFirst() + .get() + .price() + ); var fareProducts = fare .getItineraryProducts() diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java index 53295486128..3f237cf509f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java @@ -72,6 +72,15 @@ void modes(CombinationMode mode, Itinerary itinerary, Money totalPrice, String h var secondLeg = itinerary.getTransitLeg(1); uses = fare.getLegProducts().get(secondLeg); assertEquals(1, uses.size()); + + var sum = fare + .getLegProducts() + .values() + .stream() + .distinct() + .map(p -> p.product().price()) + .reduce(Money.ZERO_USD, Money::plus); + assertEquals(totalPrice, sum); } @Test diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index d9dc59b898f..cc56556c4dd 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -49,15 +49,11 @@ void simpleZoneBasedFare() { var fare = service.calculateFares(itin); assertNotNull(fare); - var fp = fare.getItineraryProducts().get(0); - assertEquals(TEN_DOLLARS, fp.price()); - assertEquals("F:regular", fp.id().toString()); - - // todo - var lp = fare.getLegProducts(); - assertEquals(1, lp.size()); - var product = lp.values().iterator().next().product(); - assertEquals(TEN_DOLLARS, product.price()); + var legProducts = fare.getLegProducts().get(itin.getTransitLeg(0)); + assertEquals( + "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + legProducts.toString() + ); } @Test @@ -113,16 +109,17 @@ void shouldNotCombineInterlinedLegs() { var legProducts = fare.getLegProducts(); var firstLeg = itin.getLegs().getFirst(); - var products = List.copyOf(legProducts.get(firstLeg)); - assertEquals(TEN_DOLLARS, products.getFirst().product().price()); + assertEquals( + "[FareProductUse[id=ccadd1d3-f284-31a4-9d58-0a300198950f, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + legProducts.get(firstLeg).toString() + ); var secondLeg = itin.getLegs().get(1); - products = List.copyOf(legProducts.get(secondLeg)); - assertEquals(TEN_DOLLARS, products.getFirst().product().price()); - - assertEquals(1, fare.getItineraryProducts().size()); - assertEquals(TWENTY_DOLLARS, fare.getItineraryProducts().getFirst().price()); + assertEquals( + "[FareProductUse[id=c58974dd-9a2f-3f42-90ec-c62a7b0dfd51, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + legProducts.get(secondLeg).toString() + ); } @Test @@ -175,8 +172,17 @@ void multipleFeeds() { fareProductIds ); - var resultPrice = result.getFare(FareType.regular); - assertEquals(TWENTY_DOLLARS, resultPrice); + var legProducts = result.getLegProducts(); + var firstBusLeg = itin.getTransitLeg(0); + assertEquals( + "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + legProducts.get(firstBusLeg).toString() + ); + var secondBusLeg = itin.getTransitLeg(2); + assertEquals( + "[FareProductUse[id=678d201c-e839-35c3-ae7b-1bc3834da5e5, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", + legProducts.get(secondBusLeg).toString() + ); } @Test diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index d6a1432a75b..7efdeaff083 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -19,10 +19,8 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; -import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.standalone.api.OtpServerRequestContext; -import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.service.TransitModel; public class FaresIntegrationTest { @@ -45,7 +43,10 @@ public void testBasic() { var to = GenericLocation.fromStopId("Destination", feedId, "Mountain View Caltrain"); ItineraryFares fare = getFare(from, to, start, serverContext); - assertEquals(fare.getFare(FareType.regular), Money.usDollars(4.25f)); + assertEquals( + "[FareProductUse[id=eec97231-e931-3584-8cc3-e7657a1ff14d, product=FareProduct{id: '1:OW_2', amount: $4.25}]]", + fare.getLegProducts().values().toString() + ); } @Test @@ -76,7 +77,10 @@ public void testPortland() { ItineraryFares fare = getFare(from, to, startTime, serverContext); - assertEquals(Money.usDollars(2), fare.getFare(FareType.regular)); + assertEquals( + "[FareProductUse[id=26a5a5ee-c7db-37ad-be09-fa3afdce748b, product=FareProduct{id: 'prt:19', amount: $2.00}]]", + fare.getLegProducts().values().toString() + ); // long trip diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java index 88fbff9c69c..0058fd6b9df 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java @@ -81,7 +81,16 @@ public static void setUpClass() { private static void calculateFare(List legs, FareType fareType, Money expectedPrice) { var itinerary = new Itinerary(legs); var itineraryFares = orcaFareService.calculateFares(itinerary); - assertEquals(expectedPrice, itineraryFares.getItineraryProducts().stream().filter(fareProduct -> fareProduct.name().equals(fareType.name()))); + assertEquals( + expectedPrice, + itineraryFares + .getItineraryProducts() + .stream() + .filter(fareProduct -> fareProduct.name().equals(fareType.name())) + .findFirst() + .get() + .price() + ); } private static void assertLegFareEquals( diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index e9c4bebe069..c93eed50ebd 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -151,7 +151,10 @@ void calculateDirectFare() { var itinerary = itineraries.iterator().next(); assertFalse(itinerary.getFares().getItineraryProducts().isEmpty()); - assertEquals(Money.usDollars(2.5f), itinerary.getFares().getItineraryProducts().getFirst().price()); + assertEquals( + Money.usDollars(2.5f), + itinerary.getFares().getItineraryProducts().getFirst().price() + ); OTPFeature.enableFeatures(Map.of(OTPFeature.FlexRouting, false)); } diff --git a/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java deleted file mode 100644 index 4b455cce0f7..00000000000 --- a/src/ext-test/java/org/opentripplanner/ext/restapi/mapping/FareMapperTest.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.opentripplanner.ext.restapi.mapping; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; - -import java.util.Locale; -import org.junit.jupiter.api.Test; -import org.opentripplanner.model.fare.ItineraryFares; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.PlanTestConstants; -import org.opentripplanner.routing.core.FareType; -import org.opentripplanner.transit.model.basic.Money; - -class FareMapperTest implements PlanTestConstants { - - @Test - public void emptyDetails() { - var fare = new ItineraryFares(); - fare.addFare(FareType.regular, Money.usDollars(5)); - - Itinerary itinerary = newItinerary(A, 30).bus(1, 30, 60, B).bus(2, 90, 120, C).build(); - - itinerary.setFare(fare); - - var mapper = new FareMapper(Locale.US); - var apiFare = mapper.mapFare(itinerary); - - var apiMoney = apiFare.fare().get(FareType.regular.name()); - assertEquals(500, apiMoney.cents()); - assertEquals("USD", apiMoney.currency().currency()); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index c6ab951dc86..92b1b562611 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -75,8 +75,6 @@ public class DefaultFareService implements FareService { private static final Logger LOG = LoggerFactory.getLogger(DefaultFareService.class); - private final float UNKNOWN_FARE_PRICE = -0.01f; - /** For each fare type (regular, student, etc...) the collection of rules that apply. */ protected Map> fareRulesPerType; @@ -142,16 +140,11 @@ public ItineraryFares calculateFares(Itinerary itinerary) { fareProducts.putAll(currentFare.getLegProducts()); itineraryProducts.addAll(currentFare.getItineraryProducts()); - } else {} + } } fare.addFareProductUses(fareProducts); fare.addItineraryProducts(itineraryProducts); - - // No fares will be discovered after this point - if (!hasFare) { - continue; - } } return hasFare ? fare : null; } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index d9bfb952e6d..c55e059de7b 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -480,7 +480,9 @@ public boolean populateFare( } cost = cost.plus(orcaFareDiscount); if (cost.fractionalAmount().floatValue() < Float.MAX_VALUE) { - var fp = FareProduct.of(new FeedScopedId(FEED_ID, fareType.name()), fareType.name(), cost).build(); + var fp = FareProduct + .of(new FeedScopedId(FEED_ID, fareType.name()), fareType.name(), cost) + .build(); fare.addItineraryProducts(List.of(fp)); return true; } else { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap index 41bc4278ca1..5e2a04c07d7 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/BikeRentalSnapshotTest.snap @@ -7,33 +7,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:32:24.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -493,33 +468,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:38:09.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -937,33 +887,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:40:10.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -1277,33 +1202,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:45:24.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -1763,33 +1663,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:54:24.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -2249,33 +2124,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.accessBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:56:10.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -3264,33 +3114,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:28:51.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -3802,33 +3627,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:35:24.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -4220,33 +4020,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:37:21.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -4612,33 +4387,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:43:51.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -5150,33 +4900,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:51:24.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -5568,33 +5293,8 @@ org.opentripplanner.routing.algorithm.mapping.BikeRentalSnapshotTest.egressBikeR "elevationLost" : 0.0, "endTime" : "2009-10-21T23:56:21.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap index 6579e4bbd37..390185cd96f 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/ElevationSnapshotTest.snap @@ -535,33 +535,8 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "elevationLost" : 4.23, "endTime" : "2009-10-21T23:31:21.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -929,33 +904,8 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "elevationLost" : 23.58, "endTime" : "2009-10-21T23:35:04.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -1349,33 +1299,8 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "elevationLost" : 1.09, "endTime" : "2009-10-21T23:37:44.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -1743,33 +1668,8 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "elevationLost" : 4.76, "endTime" : "2009-10-21T23:46:18.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -2215,33 +2115,8 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "elevationLost" : 4.23, "endTime" : "2009-10-21T23:46:21.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -2609,33 +2484,8 @@ org.opentripplanner.routing.algorithm.mapping.ElevationSnapshotTest.transit=[ "elevationLost" : 23.58, "endTime" : "2009-10-21T23:51:04.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap index d5da342f9a6..adc5ee69635 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/TransitSnapshotTest.snap @@ -235,33 +235,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T18:38:41.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -718,33 +693,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T18:39:22.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -1266,33 +1216,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T18:53:55.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -1749,33 +1674,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T18:55:32.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -2297,33 +2197,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T19:08:19.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -3044,33 +2919,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T18:38:40.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -3530,33 +3380,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T18:54:10.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -4016,33 +3841,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T19:09:40.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -4502,33 +4302,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T19:11:51.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ @@ -5028,33 +4803,8 @@ org.opentripplanner.routing.algorithm.mapping.TransitSnapshotTest.test_trip_plan "elevationLost" : 0.0, "endTime" : "2009-11-17T19:25:05.000+00:00", "fare" : { - "coveringItinerary" : [ - { - "amount" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - }, - "id" : "prt:regular", - "name" : "regular" - } - ], "details" : { }, - "fare" : { - "regular" : { - "cents" : 200, - "currency" : { - "currency" : "USD", - "currencyCode" : "USD", - "defaultFractionDigits" : 2, - "symbol" : "$" - } - } - }, + "fare" : { }, "legProducts" : [ { "legIndices" : [ From 2d4cf94698eb523826c857e012de3f3df5f95cf8 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 21:59:44 +0100 Subject: [PATCH 0400/1688] Update more tests --- .../ext/fares/impl/FaresIntegrationTest.java | 5 +++-- .../ext/flex/trip/ScheduledDeviatedTripTest.java | 8 +++----- .../ext/fares/impl/DefaultFareService.java | 6 +++--- .../apis/gtfs/expectations/plan-fares.json | 9 +-------- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index 7efdeaff083..6265dc60c1e 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -14,6 +14,7 @@ import org.opentripplanner.TestServerContext; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.model.GenericLocation; +import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.api.request.RouteRequest; @@ -44,8 +45,8 @@ public void testBasic() { ItineraryFares fare = getFare(from, to, start, serverContext); assertEquals( - "[FareProductUse[id=eec97231-e931-3584-8cc3-e7657a1ff14d, product=FareProduct{id: '1:OW_2', amount: $4.25}]]", - fare.getLegProducts().values().toString() + "[FareProduct{id: '1:OW_2', amount: $4.25}]", + fare.getLegProducts().values().stream().map(FareProductUse::product).toList().toString() ); } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index c93eed50ebd..378d18d7bb4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -33,7 +33,6 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.TransitRouter; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; -import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.framework.DebugTimingAggregator; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.NearbyStop; @@ -42,7 +41,6 @@ import org.opentripplanner.street.model.vertex.StreetLocation; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.DefaultTransitService; @@ -149,11 +147,11 @@ void calculateDirectFare() { var itineraries = router.createFlexOnlyItineraries().stream().peek(filter::decorate).toList(); var itinerary = itineraries.iterator().next(); - assertFalse(itinerary.getFares().getItineraryProducts().isEmpty()); + assertFalse(itinerary.getFares().getLegProducts().isEmpty()); assertEquals( - Money.usDollars(2.5f), - itinerary.getFares().getItineraryProducts().getFirst().price() + "[FareProductUse[id=1532715d-bffe-310c-9c76-842f3c74bbd3, product=FareProduct{id: '1:flex-adult', amount: $2.50}]]", + itinerary.getFares().getLegProducts().values().toString() ); OTPFeature.enableFeatures(Map.of(OTPFeature.FlexRouting, false)); diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index 92b1b562611..e1d0200aff6 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -119,7 +119,7 @@ public ItineraryFares calculateFares(Itinerary itinerary) { ItineraryFares fare = ItineraryFares.empty(); boolean hasFare = false; for (FareType fareType : fareRulesPerType.keySet()) { - final Multimap fareProducts = LinkedHashMultimap.create(); + final Multimap legProducts = LinkedHashMultimap.create(); List itineraryProducts = new ArrayList<>(); for (String feedId : fareLegsByFeed.keySet()) { ItineraryFares currentFare = ItineraryFares.empty(); @@ -138,12 +138,12 @@ public ItineraryFares calculateFares(Itinerary itinerary) { hasFare = feedHasFare || hasFare; // Other feeds might still have fare for some legs - fareProducts.putAll(currentFare.getLegProducts()); + legProducts.putAll(currentFare.getLegProducts()); itineraryProducts.addAll(currentFare.getItineraryProducts()); } } - fare.addFareProductUses(fareProducts); + fare.addFareProductUses(legProducts); fare.addItineraryProducts(itineraryProducts); } return hasFare ? fare : null; diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-fares.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-fares.json index 9ee3d4706b3..1defc81ded1 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-fares.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-fares.json @@ -183,14 +183,7 @@ "fareProducts" : [ ] } ], - "fares" : [ - { - "type" : "regular", - "cents" : 310, - "currency" : "EUR", - "components" : [] - } - ] + "fares" : [ ] } ] } From a346d9c1478a64681ef60b401be1e00e3e977073 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 22 Jan 2024 22:15:57 +0100 Subject: [PATCH 0401/1688] Remove fareImpl from GTFS API --- .../apis/gtfs/GtfsGraphQLIndex.java | 2 -- .../apis/gtfs/datafetchers/fareImpl.java | 35 ------------------- .../apis/gtfs/generated/graphql-codegen.yml | 1 - 3 files changed, 38 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 7101d132834..ff3e8681ce8 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -77,7 +77,6 @@ import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalStationImpl; import org.opentripplanner.apis.gtfs.datafetchers.debugOutputImpl; import org.opentripplanner.apis.gtfs.datafetchers.elevationProfileComponentImpl; -import org.opentripplanner.apis.gtfs.datafetchers.fareImpl; import org.opentripplanner.apis.gtfs.datafetchers.placeAtDistanceImpl; import org.opentripplanner.apis.gtfs.datafetchers.serviceTimeRangeImpl; import org.opentripplanner.apis.gtfs.datafetchers.stepImpl; @@ -128,7 +127,6 @@ protected static GraphQLSchema buildSchema() { .type(typeWiring.build(debugOutputImpl.class)) .type(typeWiring.build(DepartureRowImpl.class)) .type(typeWiring.build(elevationProfileComponentImpl.class)) - .type(typeWiring.build(fareImpl.class)) .type(typeWiring.build(FeedImpl.class)) .type(typeWiring.build(FeedImpl.class)) .type(typeWiring.build(GeometryImpl.class)) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java deleted file mode 100644 index fb2c6ee184c..00000000000 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/fareImpl.java +++ /dev/null @@ -1,35 +0,0 @@ -package org.opentripplanner.apis.gtfs.datafetchers; - -import graphql.schema.DataFetcher; -import graphql.schema.DataFetchingEnvironment; -import java.util.List; -import java.util.Map; -import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.transit.model.basic.Money; - -public class fareImpl implements GraphQLDataFetchers.GraphQLFare { - - @Override - public DataFetcher cents() { - return environment -> ((Money) getSource(environment).get("fare")).minorUnitAmount(); - } - - @Override - public DataFetcher> components() { - return environment -> List.of(); - } - - @Override - public DataFetcher currency() { - return environment -> ((Money) getSource(environment).get("fare")).currency().getCurrencyCode(); - } - - @Override - public DataFetcher type() { - return environment -> getSource(environment).get("name").toString(); - } - - private Map getSource(DataFetchingEnvironment environment) { - return environment.getSource(); - } -} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index c720fc5a119..c141266d2e6 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -54,7 +54,6 @@ config: DepartureRow: org.opentripplanner.routing.graphfinder.PatternAtStop#PatternAtStop elevationProfileComponent: org.opentripplanner.model.plan.ElevationProfile.Step Emissions: org.opentripplanner.model.plan.Emissions#Emissions - fare: java.util.Map#Map Feed: String Geometry: org.locationtech.jts.geom.Geometry#Geometry InputField: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField#GraphQLInputField From e5e599703cd9472ada47761e762b8c95538fa530 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 24 Jan 2024 21:29:33 +0100 Subject: [PATCH 0402/1688] Remove unused fare types --- src/main/java/org/opentripplanner/routing/core/FareType.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/core/FareType.java b/src/main/java/org/opentripplanner/routing/core/FareType.java index 8efe12246d2..007f9e2cef6 100644 --- a/src/main/java/org/opentripplanner/routing/core/FareType.java +++ b/src/main/java/org/opentripplanner/routing/core/FareType.java @@ -10,10 +10,7 @@ @Deprecated public enum FareType implements Serializable { regular, - student, senior, - tram, - special, youth, electronicRegular, electronicSenior, From 451c1d3b44cfe6ce6642f177c2222ce3c64d3b51 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 00:05:35 +0100 Subject: [PATCH 0403/1688] Update tests --- .../fares/impl/AtlantaFareServiceTest.java | 7 ++--- .../fares/impl/DefaultFareServiceTest.java | 5 ++-- .../ext/fares/impl/HSLFareServiceTest.java | 3 ++- .../ext/fares/impl/OrcaFareServiceTest.java | 9 +++---- .../ext/fares/impl/AtlantaFareService.java | 11 ++++---- .../ext/fares/impl/DefaultFareService.java | 26 +++++-------------- ...stFareInFreeTransferWindowFareService.java | 10 ++++--- .../ext/fares/impl/OrcaFareService.java | 8 +++--- .../model/fare/FareProduct.java | 1 + .../model/fare/ItineraryFares.java | 9 +++++++ 10 files changed, 39 insertions(+), 50 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java index 2d26bf711e4..39b80deace1 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java @@ -21,7 +21,6 @@ import org.opentripplanner.ext.fares.model.FareRuleSet; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.Place; @@ -226,8 +225,7 @@ void fullItinerary() { * used. This will be the same for all cash fare types except when overriden above. */ private static void calculateFare(List rides, Money expectedFare) { - ItineraryFares fare = new ItineraryFares(); - atlFareService.populateFare(fare, USD, FareType.electronicRegular, rides, null); + var fare = atlFareService.populateFare(USD, FareType.electronicRegular, rides, null); assertEquals( expectedFare, fare @@ -293,10 +291,9 @@ private static Itinerary createItinerary(String agencyId, String shortName, long .build(); int start = (int) (T11_00 + (startTimeMins * 60)); - var itin = newItinerary(Place.forStop(firstStop), start) + return newItinerary(Place.forStop(firstStop), start) .bus(route, 1, start, T11_12, Place.forStop(lastStop)) .build(); - return itin; } private static class TestAtlantaFareService extends AtlantaFareService { diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index cc56556c4dd..32a15f2be0a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.opentripplanner.ext.fares.impl.FareModelForTest.AIRPORT_STOP; import static org.opentripplanner.ext.fares.impl.FareModelForTest.AIRPORT_TO_CITY_CENTER_SET; import static org.opentripplanner.ext.fares.impl.FareModelForTest.CITY_CENTER_A_STOP; @@ -19,6 +18,7 @@ import java.util.List; import org.junit.jupiter.api.Test; +import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.core.FareType; @@ -28,7 +28,6 @@ class DefaultFareServiceTest implements PlanTestConstants { private static final Money TEN_DOLLARS = Money.usDollars(10); - private static final Money TWENTY_DOLLARS = Money.usDollars(20); @Test void noRules() { @@ -36,7 +35,7 @@ void noRules() { service.addFareRules(FareType.regular, List.of()); var itin = newItinerary(A, T11_00).bus(1, T11_05, T11_12, B).build(); var fare = service.calculateFares(itin); - assertNull(fare); + assertEquals(ItineraryFares.empty(), fare); } @Test diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java index 4e1347cae16..17c381f1bd6 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/HSLFareServiceTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertArrayEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; import static org.opentripplanner.transit.model._data.TransitModelForTest.FEED_ID; import static org.opentripplanner.transit.model.basic.Money.euros; @@ -450,6 +451,6 @@ void unknownFare() { .bus(1, T11_20, T11_30, PlanTestConstants.E) .build(); var result = service.calculateFares(outsideHsl); - assertNull(result); + assertTrue(result.isEmpty()); } } diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java index 0058fd6b9df..ae8df72dd6a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java @@ -176,8 +176,7 @@ void calculateFareWithNoFreeTransfer() { @Test void calculateFareByLeg() { List rides = List.of(getLeg(KITSAP_TRANSIT_AGENCY_ID, 0), getLeg(COMM_TRANS_AGENCY_ID, 2)); - ItineraryFares fares = new ItineraryFares(); - orcaFareService.populateFare(fares, USD, FareType.electronicRegular, rides, null); + var fares = orcaFareService.populateFare(USD, FareType.electronicRegular, rides, null); assertLegFareEquals(349, rides.get(0), fares, false); assertLegFareEquals(0, rides.get(1), fares, true); @@ -498,8 +497,7 @@ void nullLongName(FareType type) { ) ); - var fare = new ItineraryFares(); - orcaFareService.populateFare(fare, USD, type, legs, null); + var fare = orcaFareService.populateFare(USD, type, legs, null); assertFalse(fare.getLegProducts().isEmpty()); } @@ -520,8 +518,7 @@ void nullShortName(FareType type) { ) ); - var fare = new ItineraryFares(); - orcaFareService.populateFare(fare, USD, type, legs, null); + var fare = orcaFareService.populateFare(USD, type, legs, null); assertFalse(fare.getLegProducts().isEmpty()); } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java index 799e7ef37d7..6c22db217cc 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java @@ -378,15 +378,14 @@ protected Collection fareRulesForFeed(FareType fareType, String fee } @Override - public boolean populateFare( - ItineraryFares fare, + public ItineraryFares populateFare( Currency currency, FareType fareType, - List rides, + List legs, Collection fareRules ) { List transfers = new ArrayList<>(); - for (var ride : rides) { + for (var ride : legs) { Money defaultFare = getLegPrice(ride, fareType, fareRules); if (transfers.isEmpty()) { transfers.add(new ATLTransfer(currency, fareType)); @@ -412,8 +411,8 @@ public boolean populateFare( null, null ); + var fare = ItineraryFares.empty(); fare.addItineraryProducts(List.of(fareProduct)); - - return true; + return fare; } } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index e1d0200aff6..5e8fa6de195 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -117,36 +117,25 @@ public ItineraryFares calculateFares(Itinerary itinerary) { var fareLegsByFeed = fareLegsByFeed(fareLegs); ItineraryFares fare = ItineraryFares.empty(); - boolean hasFare = false; for (FareType fareType : fareRulesPerType.keySet()) { - final Multimap legProducts = LinkedHashMultimap.create(); - List itineraryProducts = new ArrayList<>(); for (String feedId : fareLegsByFeed.keySet()) { - ItineraryFares currentFare = ItineraryFares.empty(); var fareRules = fareRulesForFeed(fareType, feedId); // Get the currency from the first fareAttribute, assuming that all tickets use the same currency. if (fareRules != null && !fareRules.isEmpty()) { Currency currency = fareRules.iterator().next().getFareAttribute().getPrice().currency(); - boolean feedHasFare = populateFare( - currentFare, + ItineraryFares computedFaresForType = populateFare( currency, fareType, fareLegsByFeed.get(feedId), fareRules ); - hasFare = feedHasFare || hasFare; // Other feeds might still have fare for some legs - - legProducts.putAll(currentFare.getLegProducts()); - itineraryProducts.addAll(currentFare.getItineraryProducts()); + fare.add(computedFaresForType); } } - - fare.addFareProductUses(legProducts); - fare.addItineraryProducts(itineraryProducts); } - return hasFare ? fare : null; + return fare; } /** @@ -186,8 +175,7 @@ protected Collection fareRulesForFeed(FareType fareType, String fee * If our only rule were A-B with a fare of 10, we would have no lowest fare, but we will still * have one fare detail with fare 10 for the route A-B. B-C will not just not be listed at all. */ - protected boolean populateFare( - ItineraryFares fare, + protected ItineraryFares populateFare( Currency currency, FareType fareType, List legs, @@ -196,7 +184,6 @@ protected boolean populateFare( FareSearch r = performSearch(fareType, legs, fareRules); Multimap fareProductUses = LinkedHashMultimap.create(); - int count = 0; int start = 0; int end = legs.size() - 1; while (start <= end) { @@ -241,13 +228,12 @@ protected boolean populateFare( }); } - ++count; start = via + 1; } - var amount = r.resultTable[0][legs.size() - 1]; + var fare = ItineraryFares.empty(); fare.addFareProductUses(fareProductUses); - return count > 0; + return fare; } protected Optional calculateCost( diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java index cbb50fd57b9..bd4afb29315 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java @@ -48,8 +48,7 @@ public Duration freeTransferWindow() { * additional free transfers from there. */ @Override - protected boolean populateFare( - ItineraryFares fare, + protected ItineraryFares populateFare( Currency currency, FareType fareType, List legs, @@ -93,8 +92,11 @@ protected boolean populateFare( null, null ); - fare.addItineraryProducts(List.of(fp)); - return cost.greaterThan(zero); + var fare = ItineraryFares.empty(); + if (cost.greaterThan(zero)) { + fare.addItineraryProducts(List.of(fp)); + } + return fare; } @Override diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index c55e059de7b..5e76ec934d7 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -396,13 +396,13 @@ protected Optional getRidePrice( * one. */ @Override - public boolean populateFare( - ItineraryFares fare, + public ItineraryFares populateFare( Currency currency, FareType fareType, List legs, Collection fareRules ) { + var fare = ItineraryFares.empty(); ZonedDateTime freeTransferStartTime = null; Money cost = Money.ZERO_USD; Money orcaFareDiscount = Money.ZERO_USD; @@ -484,10 +484,8 @@ public boolean populateFare( .of(new FeedScopedId(FEED_ID, fareType.name()), fareType.name(), cost) .build(); fare.addItineraryProducts(List.of(fp)); - return true; - } else { - return false; } + return fare; } /** diff --git a/src/main/java/org/opentripplanner/model/fare/FareProduct.java b/src/main/java/org/opentripplanner/model/fare/FareProduct.java index c82e128f550..189b73807e7 100644 --- a/src/main/java/org/opentripplanner/model/fare/FareProduct.java +++ b/src/main/java/org/opentripplanner/model/fare/FareProduct.java @@ -51,6 +51,7 @@ public String toString() { return ToStringBuilder .of(FareProduct.class) .addStr("id", id.toString()) + .addStr("name", name) .addObj("amount", price) .addDuration("duration", validity) .addObj("category", category) diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index 530c48914c6..3f4cb04e01c 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -103,4 +103,13 @@ public void addFareProduct(Leg leg, Collection fareProduct) { public void addFareProductUses(Multimap fareProducts) { legProducts.putAll(fareProducts); } + + public void add(ItineraryFares fare) { + itineraryProducts.addAll(fare.itineraryProducts); + legProducts.putAll(fare.legProducts); + } + + public boolean isEmpty() { + return itineraryProducts.isEmpty() && legProducts.isEmpty(); + } } From ab426d84ed121d75e4d269616f2017de1bb9c865 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 09:53:56 +0100 Subject: [PATCH 0404/1688] Update expectations --- .../ext/fares/impl/DefaultFareServiceTest.java | 18 +++++++++--------- .../ext/fares/impl/FaresIntegrationTest.java | 4 ++-- .../flex/trip/ScheduledDeviatedTripTest.java | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index 32a15f2be0a..3fca4b949e4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -50,7 +50,7 @@ void simpleZoneBasedFare() { var legProducts = fare.getLegProducts().get(itin.getTransitLeg(0)); assertEquals( - "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", legProducts.toString() ); } @@ -78,7 +78,7 @@ void applyToSeveralLegs() { assertEquals(firstProducts, secondProducts); assertEquals( - "[FareProductUse[id=ddbf1572-18bc-3724-8b64-e1c7d5c8b6c6, product=FareProduct{id: 'F:free-transfers', amount: $20.00}]]", + "[FareProductUse[id=ddbf1572-18bc-3724-8b64-e1c7d5c8b6c6, product=FareProduct{id: 'F:free-transfers', name: 'regular', amount: $20.00}]]", firstProducts.toString() ); } @@ -110,13 +110,13 @@ void shouldNotCombineInterlinedLegs() { var firstLeg = itin.getLegs().getFirst(); assertEquals( - "[FareProductUse[id=ccadd1d3-f284-31a4-9d58-0a300198950f, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + "[FareProductUse[id=ccadd1d3-f284-31a4-9d58-0a300198950f, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", legProducts.get(firstLeg).toString() ); var secondLeg = itin.getLegs().get(1); assertEquals( - "[FareProductUse[id=c58974dd-9a2f-3f42-90ec-c62a7b0dfd51, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + "[FareProductUse[id=c58974dd-9a2f-3f42-90ec-c62a7b0dfd51, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", legProducts.get(secondLeg).toString() ); } @@ -174,12 +174,12 @@ void multipleFeeds() { var legProducts = result.getLegProducts(); var firstBusLeg = itin.getTransitLeg(0); assertEquals( - "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", legProducts.get(firstBusLeg).toString() ); var secondBusLeg = itin.getTransitLeg(2); assertEquals( - "[FareProductUse[id=678d201c-e839-35c3-ae7b-1bc3834da5e5, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", + "[FareProductUse[id=678d201c-e839-35c3-ae7b-1bc3834da5e5, product=FareProduct{id: 'F2:other-feed-attribute', name: 'regular', amount: $10.00}]]", legProducts.get(secondBusLeg).toString() ); } @@ -204,15 +204,15 @@ void multipleFeedsWithTransfersWithinFeed() { var finalBusLeg = itin.getTransitLeg(4); assertEquals( - "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", + "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', name: 'regular', amount: $10.00}]]", legProducts.get(firstBusLeg).toString() ); assertEquals( - "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', amount: $10.00}]]", + "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", legProducts.get(secondBusLeg).toString() ); assertEquals( - "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', amount: $10.00}]]", + "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', name: 'regular', amount: $10.00}]]", legProducts.get(finalBusLeg).toString() ); } diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index 6265dc60c1e..344cd2e58b2 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -45,7 +45,7 @@ public void testBasic() { ItineraryFares fare = getFare(from, to, start, serverContext); assertEquals( - "[FareProduct{id: '1:OW_2', amount: $4.25}]", + "[FareProduct{id: '1:OW_2', name: 'regular', amount: $4.25}]", fare.getLegProducts().values().stream().map(FareProductUse::product).toList().toString() ); } @@ -79,7 +79,7 @@ public void testPortland() { ItineraryFares fare = getFare(from, to, startTime, serverContext); assertEquals( - "[FareProductUse[id=26a5a5ee-c7db-37ad-be09-fa3afdce748b, product=FareProduct{id: 'prt:19', amount: $2.00}]]", + "[FareProductUse[id=26a5a5ee-c7db-37ad-be09-fa3afdce748b, product=FareProduct{id: 'prt:19', name: 'regular', amount: $2.00}]]", fare.getLegProducts().values().toString() ); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 378d18d7bb4..85b533cbf69 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -146,11 +146,10 @@ void calculateDirectFare() { var itineraries = router.createFlexOnlyItineraries().stream().peek(filter::decorate).toList(); - var itinerary = itineraries.iterator().next(); - assertFalse(itinerary.getFares().getLegProducts().isEmpty()); + var itinerary = itineraries.getFirst(); assertEquals( - "[FareProductUse[id=1532715d-bffe-310c-9c76-842f3c74bbd3, product=FareProduct{id: '1:flex-adult', amount: $2.50}]]", + "[FareProductUse[id=1532715d-bffe-310c-9c76-842f3c74bbd3, product=FareProduct{id: '1:flex-adult', name: 'regular', amount: $2.50}]]", itinerary.getFares().getLegProducts().values().toString() ); From 6d7936f624bde3b339a17adeb527a80ce7788d51 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 10:08:16 +0100 Subject: [PATCH 0405/1688] Rename methods --- .../ext/fares/impl/AtlantaFareServiceTest.java | 2 +- .../ext/fares/impl/FaresIntegrationTest.java | 9 ++++----- .../ext/fares/impl/OrcaFareServiceTest.java | 6 +++--- .../ext/fares/impl/AtlantaFareService.java | 2 +- .../ext/fares/impl/DefaultFareService.java | 4 ++-- .../impl/HighestFareInFreeTransferWindowFareService.java | 2 +- .../opentripplanner/ext/fares/impl/OrcaFareService.java | 2 +- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java index 39b80deace1..3662d45affa 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/AtlantaFareServiceTest.java @@ -225,7 +225,7 @@ void fullItinerary() { * used. This will be the same for all cash fare types except when overriden above. */ private static void calculateFare(List rides, Money expectedFare) { - var fare = atlFareService.populateFare(USD, FareType.electronicRegular, rides, null); + var fare = atlFareService.calculateFaresForType(USD, FareType.electronicRegular, rides, null); assertEquals( expectedFare, fare diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index 344cd2e58b2..90df7481720 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -14,7 +14,6 @@ import org.opentripplanner.TestServerContext; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.model.GenericLocation; -import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.api.request.RouteRequest; @@ -22,6 +21,7 @@ import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.standalone.api.OtpServerRequestContext; +import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.service.TransitModel; public class FaresIntegrationTest { @@ -44,10 +44,9 @@ public void testBasic() { var to = GenericLocation.fromStopId("Destination", feedId, "Mountain View Caltrain"); ItineraryFares fare = getFare(from, to, start, serverContext); - assertEquals( - "[FareProduct{id: '1:OW_2', name: 'regular', amount: $4.25}]", - fare.getLegProducts().values().stream().map(FareProductUse::product).toList().toString() - ); + var product = fare.getLegProducts().values().iterator().next().product(); + assertEquals(Money.usDollars(4.25f), product.price()); + assertEquals("1:OW_2", product.id().toString()); } @Test diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java index ae8df72dd6a..4d04281ebb6 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java @@ -176,7 +176,7 @@ void calculateFareWithNoFreeTransfer() { @Test void calculateFareByLeg() { List rides = List.of(getLeg(KITSAP_TRANSIT_AGENCY_ID, 0), getLeg(COMM_TRANS_AGENCY_ID, 2)); - var fares = orcaFareService.populateFare(USD, FareType.electronicRegular, rides, null); + var fares = orcaFareService.calculateFaresForType(USD, FareType.electronicRegular, rides, null); assertLegFareEquals(349, rides.get(0), fares, false); assertLegFareEquals(0, rides.get(1), fares, true); @@ -497,7 +497,7 @@ void nullLongName(FareType type) { ) ); - var fare = orcaFareService.populateFare(USD, type, legs, null); + var fare = orcaFareService.calculateFaresForType(USD, type, legs, null); assertFalse(fare.getLegProducts().isEmpty()); } @@ -518,7 +518,7 @@ void nullShortName(FareType type) { ) ); - var fare = orcaFareService.populateFare(USD, type, legs, null); + var fare = orcaFareService.calculateFaresForType(USD, type, legs, null); assertFalse(fare.getLegProducts().isEmpty()); } diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java index 6c22db217cc..fdeb7a975d2 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/AtlantaFareService.java @@ -378,7 +378,7 @@ protected Collection fareRulesForFeed(FareType fareType, String fee } @Override - public ItineraryFares populateFare( + public ItineraryFares calculateFaresForType( Currency currency, FareType fareType, List legs, diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java index 5e8fa6de195..03e6eeff9fd 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/DefaultFareService.java @@ -124,7 +124,7 @@ public ItineraryFares calculateFares(Itinerary itinerary) { // Get the currency from the first fareAttribute, assuming that all tickets use the same currency. if (fareRules != null && !fareRules.isEmpty()) { Currency currency = fareRules.iterator().next().getFareAttribute().getPrice().currency(); - ItineraryFares computedFaresForType = populateFare( + ItineraryFares computedFaresForType = calculateFaresForType( currency, fareType, fareLegsByFeed.get(feedId), @@ -175,7 +175,7 @@ protected Collection fareRulesForFeed(FareType fareType, String fee * If our only rule were A-B with a fare of 10, we would have no lowest fare, but we will still * have one fare detail with fare 10 for the route A-B. B-C will not just not be listed at all. */ - protected ItineraryFares populateFare( + protected ItineraryFares calculateFaresForType( Currency currency, FareType fareType, List legs, diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java index bd4afb29315..3cc9398f7c7 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/HighestFareInFreeTransferWindowFareService.java @@ -48,7 +48,7 @@ public Duration freeTransferWindow() { * additional free transfers from there. */ @Override - protected ItineraryFares populateFare( + protected ItineraryFares calculateFaresForType( Currency currency, FareType fareType, List legs, diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index 5e76ec934d7..a02f37417ec 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -396,7 +396,7 @@ protected Optional getRidePrice( * one. */ @Override - public ItineraryFares populateFare( + public ItineraryFares calculateFaresForType( Currency currency, FareType fareType, List legs, From dd827066cf0a0bae0d6d5ffd27d15c84b3e0f3f4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 1 Nov 2023 15:03:38 +0100 Subject: [PATCH 0406/1688] Subtract generalized cost that was previously added --- .../org/opentripplanner/model/plan/Itinerary.java | 14 +++++++++++++- ...onTransitItinerariesBasedOnGeneralizedCost.java | 4 ++-- .../transit/RemoveTransitIfStreetOnlyIsBetter.java | 4 ++-- .../transit/RemoveTransitIfWalkingIsBetter.java | 2 +- .../transit/TransitGeneralizedCostFilter.java | 1 + .../mapping/RaptorPathToItineraryMapper.java | 2 +- 6 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index 903e04c8b0c..8c8981b833d 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -489,7 +489,7 @@ public void setElevationGained(Double elevationGained) { /** * If a generalized cost is used in the routing algorithm, this should be the total cost computed - * by the algorithm. This is relevant for anyone who want to debug an search and tuning the + * by the algorithm. This is relevant for anyone who want to debug a search and tuning the * system. The unit should be equivalent to the cost of "one second of transit". *

      * -1 indicate that the cost is not set/computed. @@ -498,6 +498,10 @@ public int getGeneralizedCost() { return generalizedCost; } + public int getGeneralizedCostIncludingPenalty() { + return generalizedCost - penaltyCost(accessPenalty) - penaltyCost(egressPenalty); + } + public void setGeneralizedCost(int generalizedCost) { this.generalizedCost = generalizedCost; } @@ -663,4 +667,12 @@ public void setEmissionsPerPerson(Emissions emissionsPerPerson) { public Emissions getEmissionsPerPerson() { return this.emissionsPerPerson; } + + private static int penaltyCost(TimeAndCost penalty) { + if (penalty == null) { + return 0; + } else { + return penalty.cost().toSeconds(); + } + } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java index 427084a55f6..1980838bec0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java @@ -43,7 +43,7 @@ public List flagForRemoval(List itineraries) { // ALL itineraries are considered here. Both transit and non-transit OptionalInt minGeneralizedCost = itineraries .stream() - .mapToInt(Itinerary::getGeneralizedCost) + .mapToInt(Itinerary::getGeneralizedCostIncludingPenalty) .min(); if (minGeneralizedCost.isEmpty()) { @@ -58,7 +58,7 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() - .filter(it -> !it.hasTransit() && it.getGeneralizedCost() > maxLimit) + .filter(it -> !it.hasTransit() && it.getGeneralizedCostIncludingPenalty() > maxLimit) .collect(Collectors.toList()); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index bddf5238f23..0e60836ae1c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -38,7 +38,7 @@ public List flagForRemoval(List itineraries) { OptionalInt minStreetCost = itineraries .stream() .filter(Itinerary::isOnStreetAllTheWay) - .mapToInt(Itinerary::getGeneralizedCost) + .mapToInt(Itinerary::getGeneralizedCostIncludingPenalty) .min(); if (minStreetCost.isEmpty()) { @@ -52,7 +52,7 @@ public List flagForRemoval(List itineraries) { // Filter away itineraries that have higher cost than limit cost computed above return itineraries .stream() - .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCost() >= limit) + .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCostIncludingPenalty() >= limit) .collect(Collectors.toList()); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java index cf4d102c11a..f37743af0eb 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java @@ -38,7 +38,7 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() - .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCost() >= limit) + .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCostIncludingPenalty() >= limit) .collect(Collectors.toList()); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java index 4d7ffffa13a..f4516421889 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java @@ -11,6 +11,7 @@ import org.opentripplanner.routing.api.request.framework.CostLinearFunction; /** + * This filter removes all transit results which have a generalized-cost higher than the max-limit * This filter removes all transit results that have a generalized-cost higher than the max-limit * computed by the {@link #costLimitFunction} plus the wait cost given by * {@link TransitGeneralizedCostFilter#getWaitTimeCost}. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java index fe20592576e..a399047271c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java @@ -151,7 +151,7 @@ else if (pathLeg.isTransferLeg()) { } if (egressPathLeg.egress() instanceof DefaultAccessEgress ae) { - itinerary.setAccessPenalty(ae.penalty()); + itinerary.setEgressPenalty(ae.penalty()); } if (path.isC2Set()) { itinerary.setGeneralizedCost2(path.c2()); From 022f51bf133ae9429d8d3bc8043133991af17633 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 Nov 2023 14:17:10 +0100 Subject: [PATCH 0407/1688] Add documentation for newly added method --- .../org/opentripplanner/model/plan/Itinerary.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index 8c8981b833d..f54a5067f89 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -498,6 +498,18 @@ public int getGeneralizedCost() { return generalizedCost; } + /** + * If a generalized cost is used in the routing algorithm, this should be the cost computed minus + * the artificial penalty added for car access/egresses. This is useful so that itineraries + * using only on-street legs don't have an unfair advantage over those combining access/egress with + * transit and using a penalty when being processed by the itinerary filter chain. + * + * @see Itinerary#getGeneralizedCost() + * @see org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressPenaltyDecorator + * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NonTransitGeneralizedCostFilter + * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfStreetOnlyIsBetterFilter + * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfWalkingIsBetterFilter + */ public int getGeneralizedCostIncludingPenalty() { return generalizedCost - penaltyCost(accessPenalty) - penaltyCost(egressPenalty); } From d8e018ce59ffafdd3cfc255a89bcefc068f43ba3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 Nov 2023 14:28:31 +0100 Subject: [PATCH 0408/1688] Add test for subtracting penalties --- .../model/plan/ItineraryTest.java | 73 ++++++++++++++++--- 1 file changed, 62 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index df67e3c2f44..15b1978dea8 100644 --- a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -10,7 +10,10 @@ import static org.opentripplanner.model.plan.TestItineraryBuilder.newTime; import java.time.Duration; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -18,8 +21,10 @@ public class ItineraryTest implements PlanTestConstants { + private static final int DEFAULT_COST = 720; + @Test - public void testDerivedFieldsWithWalkingOnly() { + void testDerivedFieldsWithWalkingOnly() { Itinerary result = newItinerary(A, T11_00).walk(D5m, B).build(); // Expected fields on itinerary set @@ -43,12 +48,12 @@ public void testDerivedFieldsWithWalkingOnly() { } @Test - public void testDerivedFieldsWithBusAllTheWay() { + void testDerivedFieldsWithBusAllTheWay() { Itinerary result = newItinerary(A).bus(55, T11_00, T11_10, B).build(); assertEquals(ofMinutes(10), result.getDuration()); assertEquals(0, result.getNumberOfTransfers()); - assertEquals(720, result.getGeneralizedCost()); + assertEquals(DEFAULT_COST, result.getGeneralizedCost()); assertEquals(ofMinutes(10), result.getTransitDuration()); assertEquals(ZERO, result.getNonTransitDuration()); assertEquals(ZERO, result.getWaitingDuration()); @@ -67,12 +72,12 @@ public void testDerivedFieldsWithBusAllTheWay() { } @Test - public void testDerivedFieldsWithTrainAllTheWay() { + void testDerivedFieldsWithTrainAllTheWay() { Itinerary result = newItinerary(A).rail(20, T11_05, T11_15, B).build(); assertEquals(ofMinutes(10), result.getDuration()); assertEquals(0, result.getNumberOfTransfers()); - assertEquals(720, result.getGeneralizedCost()); + assertEquals(DEFAULT_COST, result.getGeneralizedCost()); assertEquals(ofMinutes(10), result.getTransitDuration()); assertEquals(ZERO, result.getNonTransitDuration()); assertEquals(ZERO, result.getWaitingDuration()); @@ -91,7 +96,7 @@ public void testDerivedFieldsWithTrainAllTheWay() { } @Test - public void testDerivedFieldsWithWalAccessAndTwoTransitLegs() { + void testDerivedFieldsWithWalAccessAndTwoTransitLegs() { Itinerary itinerary = TestItineraryBuilder .newItinerary(A, T11_02) .walk(D1m, B) @@ -112,7 +117,7 @@ public void testDerivedFieldsWithWalAccessAndTwoTransitLegs() { } @Test - public void testDerivedFieldsWithBusAndWalkingAccessAndEgress() { + void testDerivedFieldsWithBusAndWalkingAccessAndEgress() { Itinerary result = newItinerary(A, T11_05) .walk(D2m, B) // 3 minutes wait @@ -133,7 +138,7 @@ public void testDerivedFieldsWithBusAndWalkingAccessAndEgress() { } @Test - public void walkBusBusWalkTrainWalk() { + void walkBusBusWalkTrainWalk() { Itinerary result = newItinerary(A, T11_00) .walk(D2m, B) .bus(55, T11_04, T11_14, C) @@ -148,7 +153,7 @@ public void walkBusBusWalkTrainWalk() { assertEquals(ofMinutes(34), result.getTransitDuration()); assertEquals(ofMinutes(6), result.getNonTransitDuration()); assertEquals(ofMinutes(11), result.getWaitingDuration()); - assertEquals(720 + 528 + 360 + 2040, result.getGeneralizedCost()); + assertEquals(DEFAULT_COST + 528 + 360 + 2040, result.getGeneralizedCost()); assertFalse(result.isWalkOnly()); assertSameLocation(A, result.firstLeg().getFrom()); assertSameLocation(G, result.lastLeg().getTo()); @@ -161,7 +166,7 @@ public void walkBusBusWalkTrainWalk() { } @Test - public void legIndex() { + void legIndex() { var itinerary = newItinerary(A, T11_00) .walk(D2m, B) .bus(55, T11_04, T11_14, C) @@ -181,12 +186,58 @@ public void legIndex() { } @Test - public void hasSystemTag() { + void hasSystemTag() { var subject = newItinerary(A).bus(1, T11_04, T11_14, B).build(); subject.flagForDeletion(new SystemNotice("MY-TAG", "Text")); assertTrue(subject.hasSystemNoticeTag("MY-TAG")); } + @Nested + class AccessEgressPenalty { + + private static final TimeAndCost PENALTY = new TimeAndCost( + Duration.ofMinutes(10), + Cost.costOfMinutes(2) + ); + private static final int COST_MINUS_TWO_MINUTES = DEFAULT_COST - 120; + + @Test + void noPenalty() { + var subject = itinerary(); + assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); + assertEquals(DEFAULT_COST, subject.getGeneralizedCostIncludingPenalty()); + } + + @Test + void accessPenalty() { + var subject = itinerary(); + subject.setAccessPenalty(PENALTY); + assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); + assertEquals(COST_MINUS_TWO_MINUTES, subject.getGeneralizedCostIncludingPenalty()); + } + + @Test + void egressPenalty() { + var subject = itinerary(); + subject.setEgressPenalty(PENALTY); + assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); + assertEquals(COST_MINUS_TWO_MINUTES, subject.getGeneralizedCostIncludingPenalty()); + } + + @Test + void bothPenalties() { + var subject = itinerary(); + subject.setAccessPenalty(PENALTY); + subject.setEgressPenalty(PENALTY); + assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); + assertEquals(480, subject.getGeneralizedCostIncludingPenalty()); + } + + private static Itinerary itinerary() { + return newItinerary(A).bus(1, T11_04, T11_14, B).build(); + } + } + private void assertSameLocation(Place expected, Place actual) { assertTrue( expected.sameLocation(actual), From bee9dcd8a85cf8639b80fba1c0656cbbeec63b84 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 Nov 2023 15:27:44 +0100 Subject: [PATCH 0409/1688] Add test for RemoveTransitIfStreetOnlyIsBetterFilter --- .../RemoveTransitIfStreetOnlyIsBetter.java | 2 ++ .../RemoveTransitIfWalkingIsBetter.java | 2 ++ ...RemoveTransitIfStreetOnlyIsBetterTest.java | 28 +++++++++++++++++-- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index 0e60836ae1c..df40bd47e27 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -52,6 +52,8 @@ public List flagForRemoval(List itineraries) { // Filter away itineraries that have higher cost than limit cost computed above return itineraries .stream() + // we use the cost including the access/egress penalty since we don't want to give + // searches that are only on the street network an unfair advantage .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCostIncludingPenalty() >= limit) .collect(Collectors.toList()); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java index f37743af0eb..e51e17a72e5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java @@ -38,6 +38,8 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() + // we use the cost including the access/egress penalty since we don't want to give + // searches that are only on the street network an unfair advantage .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCostIncludingPenalty() >= limit) .collect(Collectors.toList()); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index df45bcf4538..ea4ca272304 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -7,6 +7,8 @@ import java.time.Duration; import java.util.List; import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; @@ -15,7 +17,7 @@ public class RemoveTransitIfStreetOnlyIsBetterTest implements PlanTestConstants { @Test - public void filterAwayNothingIfNoWalking() { + void filterAwayNothingIfNoWalking() { // Given: Itinerary i1 = newItinerary(A).bus(21, 6, 7, E).build(); Itinerary i2 = newItinerary(A).rail(110, 6, 9, E).build(); @@ -31,7 +33,7 @@ public void filterAwayNothingIfNoWalking() { } @Test - public void filterAwayLongTravelTimeWithoutWaitTime() { + void filterAwayLongTravelTimeWithoutWaitTime() { // Given: a walk itinerary with high cost - do not have any effect on filtering Itinerary walk = newItinerary(A, 6).walk(1, E).build(); walk.setGeneralizedCost(300); @@ -57,4 +59,26 @@ public void filterAwayLongTravelTimeWithoutWaitTime() { // Then: assertEquals(toStr(List.of(bicycle, walk, i1)), toStr(result)); } + + @Test + void considerPenalties() { + Itinerary walk = newItinerary(A, 6).walk(1, E).build(); + walk.setGeneralizedCost(300); + + // transit has a much higher cost than walking, however it also has a high penalty which is + // subtracted when comparing the itineraries + Itinerary busWithPenalty = newItinerary(A).bus(21, 6, 8, E).build(); + busWithPenalty.setGeneralizedCost(600); + busWithPenalty.setAccessPenalty(new TimeAndCost(Duration.ZERO, Cost.costOfSeconds(400))); + + // When: + var itineraries = List.of(walk, busWithPenalty); + List result = DeletionFlaggerTestHelper.process( + itineraries, + new RemoveTransitIfStreetOnlyIsBetterFilter(CostLinearFunction.of(Duration.ZERO, 1.0)) + ); + + // Then: + assertEquals(toStr(itineraries), toStr(result)); + } } From 8059506a3f2208e50c58f7dd6029920c994c86f3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 7 Nov 2023 16:44:50 +0100 Subject: [PATCH 0410/1688] Invert relationship of generalized cost and penalty --- .../opentripplanner/model/plan/Itinerary.java | 8 ++--- ...nsitItinerariesBasedOnGeneralizedCost.java | 4 +-- .../RemoveTransitIfStreetOnlyIsBetter.java | 4 +-- .../RemoveTransitIfWalkingIsBetter.java | 2 +- .../mapping/RaptorPathToItineraryMapper.java | 6 +++- .../model/plan/ItineraryTest.java | 13 ++++---- .../raptor/_data/api/TestPathBuilder.java | 9 ++++-- .../_data/transit/TestAccessEgress.java | 18 +++++++++++ ...RemoveTransitIfStreetOnlyIsBetterTest.java | 6 ++-- .../RaptorPathToItineraryMapperTest.java | 30 ++++++++++++++++--- 10 files changed, 76 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index f54a5067f89..9854facdf5e 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -499,8 +499,8 @@ public int getGeneralizedCost() { } /** - * If a generalized cost is used in the routing algorithm, this should be the cost computed minus - * the artificial penalty added for car access/egresses. This is useful so that itineraries + * If a generalized cost is used in the routing algorithm, this is the cost computed plus + * the artificial penalty added for access/egresses. This is useful so that itineraries * using only on-street legs don't have an unfair advantage over those combining access/egress with * transit and using a penalty when being processed by the itinerary filter chain. * @@ -510,8 +510,8 @@ public int getGeneralizedCost() { * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfStreetOnlyIsBetterFilter * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfWalkingIsBetterFilter */ - public int getGeneralizedCostIncludingPenalty() { - return generalizedCost - penaltyCost(accessPenalty) - penaltyCost(egressPenalty); + public int getGeneralizedCostPlusPenalty() { + return generalizedCost + penaltyCost(accessPenalty) + penaltyCost(egressPenalty); } public void setGeneralizedCost(int generalizedCost) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java index 1980838bec0..427084a55f6 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java @@ -43,7 +43,7 @@ public List flagForRemoval(List itineraries) { // ALL itineraries are considered here. Both transit and non-transit OptionalInt minGeneralizedCost = itineraries .stream() - .mapToInt(Itinerary::getGeneralizedCostIncludingPenalty) + .mapToInt(Itinerary::getGeneralizedCost) .min(); if (minGeneralizedCost.isEmpty()) { @@ -58,7 +58,7 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() - .filter(it -> !it.hasTransit() && it.getGeneralizedCostIncludingPenalty() > maxLimit) + .filter(it -> !it.hasTransit() && it.getGeneralizedCost() > maxLimit) .collect(Collectors.toList()); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index df40bd47e27..535676f4574 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -38,7 +38,7 @@ public List flagForRemoval(List itineraries) { OptionalInt minStreetCost = itineraries .stream() .filter(Itinerary::isOnStreetAllTheWay) - .mapToInt(Itinerary::getGeneralizedCostIncludingPenalty) + .mapToInt(Itinerary::getGeneralizedCost) .min(); if (minStreetCost.isEmpty()) { @@ -54,7 +54,7 @@ public List flagForRemoval(List itineraries) { .stream() // we use the cost including the access/egress penalty since we don't want to give // searches that are only on the street network an unfair advantage - .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCostIncludingPenalty() >= limit) + .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCost() >= limit) .collect(Collectors.toList()); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java index e51e17a72e5..19f6970affb 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java @@ -40,7 +40,7 @@ public List flagForRemoval(List itineraries) { .stream() // we use the cost including the access/egress penalty since we don't want to give // searches that are only on the street network an unfair advantage - .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCostIncludingPenalty() >= limit) + .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCost() >= limit) .collect(Collectors.toList()); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java index a399047271c..6e365b4cd49 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java @@ -134,7 +134,6 @@ else if (pathLeg.isTransferLeg()) { Itinerary itinerary = new Itinerary(legs); // Map general itinerary fields - itinerary.setGeneralizedCost(toOtpDomainCost(path.c1())); itinerary.setArrivedAtDestinationWithRentedVehicle( mapped != null && mapped.isArrivedAtDestinationWithRentedVehicle() ); @@ -146,17 +145,22 @@ else if (pathLeg.isTransferLeg()) { itinerary.setTransferPriorityCost(toOtpDomainCost(optimizedPath.transferPriorityCost())); } + var penaltyCost = 0; if (accessPathLeg.access() instanceof DefaultAccessEgress ae) { itinerary.setAccessPenalty(ae.penalty()); + penaltyCost += ae.penalty().cost().toSeconds(); } if (egressPathLeg.egress() instanceof DefaultAccessEgress ae) { itinerary.setEgressPenalty(ae.penalty()); + penaltyCost += ae.penalty().cost().toSeconds(); } if (path.isC2Set()) { itinerary.setGeneralizedCost2(path.c2()); } + itinerary.setGeneralizedCost(toOtpDomainCost(path.c1()) - penaltyCost); + return itinerary; } diff --git a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index 15b1978dea8..ee8f776c7ab 100644 --- a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -199,13 +199,13 @@ class AccessEgressPenalty { Duration.ofMinutes(10), Cost.costOfMinutes(2) ); - private static final int COST_MINUS_TWO_MINUTES = DEFAULT_COST - 120; + private static final int COST_PLUS_TWO_MINUTES = DEFAULT_COST + 120; @Test void noPenalty() { var subject = itinerary(); assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); - assertEquals(DEFAULT_COST, subject.getGeneralizedCostIncludingPenalty()); + assertEquals(DEFAULT_COST, subject.getGeneralizedCostPlusPenalty()); } @Test @@ -213,7 +213,7 @@ void accessPenalty() { var subject = itinerary(); subject.setAccessPenalty(PENALTY); assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); - assertEquals(COST_MINUS_TWO_MINUTES, subject.getGeneralizedCostIncludingPenalty()); + assertEquals(COST_PLUS_TWO_MINUTES, subject.getGeneralizedCostPlusPenalty()); } @Test @@ -221,7 +221,7 @@ void egressPenalty() { var subject = itinerary(); subject.setEgressPenalty(PENALTY); assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); - assertEquals(COST_MINUS_TWO_MINUTES, subject.getGeneralizedCostIncludingPenalty()); + assertEquals(COST_PLUS_TWO_MINUTES, subject.getGeneralizedCostPlusPenalty()); } @Test @@ -230,7 +230,10 @@ void bothPenalties() { subject.setAccessPenalty(PENALTY); subject.setEgressPenalty(PENALTY); assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); - assertEquals(480, subject.getGeneralizedCostIncludingPenalty()); + assertEquals( + DEFAULT_COST + PENALTY.cost().toSeconds() + PENALTY.cost().toSeconds(), + subject.getGeneralizedCostPlusPenalty() + ); } private static Itinerary itinerary() { diff --git a/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java b/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java index 19d9904cd5b..007018ca6c4 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java +++ b/src/test/java/org/opentripplanner/raptor/_data/api/TestPathBuilder.java @@ -122,8 +122,13 @@ public RaptorPath egress(int duration) { ); } - public RaptorPath egress(TestAccessEgress transfer) { - builder.egress(transfer); + public PathBuilder access(TestAccessEgress access) { + builder.access(access); + return builder; + } + + public RaptorPath egress(TestAccessEgress egress) { + builder.egress(egress); builder.c2(c2); return builder.build(); } diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java index 56957e2e33a..ed0702f39d5 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java +++ b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java @@ -9,6 +9,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; @@ -32,6 +33,7 @@ public class TestAccessEgress implements RaptorAccessEgress { private final Integer opening; private final Integer closing; private final boolean closed; + private final TimeAndCost penalty; private TestAccessEgress(Builder builder) { this.stop = builder.stop; @@ -43,6 +45,7 @@ private TestAccessEgress(Builder builder) { this.opening = builder.opening; this.closing = builder.closing; this.closed = builder.closed; + this.penalty = builder.penalty; if (free) { assertEquals(0, durationInSeconds); @@ -119,6 +122,14 @@ public static TestAccessEgress flexAndWalk(int stop, int durationInSeconds, int return flexAndWalk(stop, durationInSeconds, nRides, walkCost(durationInSeconds)); } + public static TestAccessEgress car(int stop, int durationInSeconds, TimeAndCost penalty) { + return new Builder(stop, durationInSeconds) + .withFree() + .withCost(durationInSeconds) + .withPenalty(penalty) + .build(); + } + /** Create a flex access arriving at given stop by walking. */ public static TestAccessEgress flexAndWalk( int stop, @@ -272,6 +283,7 @@ protected static class Builder { Integer closing = null; private boolean free = false; private boolean closed = false; + private TimeAndCost penalty; Builder(int stop, int durationInSeconds) { this.stop = stop; @@ -289,6 +301,7 @@ protected static class Builder { this.opening = original.opening; this.closing = original.closing; this.closed = original.closed; + this.penalty = original.penalty; } Builder withFree() { @@ -312,6 +325,11 @@ Builder stopReachedOnBoard() { return this; } + Builder withPenalty(TimeAndCost penalty) { + this.penalty = penalty; + return this; + } + Builder withOpeningHours(int opening, int closing) { if (opening > closing) { throw new IllegalStateException( diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index ea4ca272304..ee9e347c5a0 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -65,10 +65,10 @@ void considerPenalties() { Itinerary walk = newItinerary(A, 6).walk(1, E).build(); walk.setGeneralizedCost(300); - // transit has a much higher cost than walking, however it also has a high penalty which is - // subtracted when comparing the itineraries + // transit slightly lower cost, however it also has a high penalty which is + // not taken into account when comparing the itineraries Itinerary busWithPenalty = newItinerary(A).bus(21, 6, 8, E).build(); - busWithPenalty.setGeneralizedCost(600); + busWithPenalty.setGeneralizedCost(299); busWithPenalty.setAccessPenalty(new TimeAndCost(Duration.ZERO, Cost.costOfSeconds(400))); // When: diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index ffd2a5f8591..674a57ccd15 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -1,9 +1,11 @@ package org.opentripplanner.routing.algorithm.mapping; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.opentripplanner.raptor._data.RaptorTestConstants.BOARD_SLACK; +import java.time.Duration; import java.time.Instant; import java.time.LocalDateTime; import java.time.Month; @@ -14,6 +16,8 @@ import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.ext.flex.FlexAccessEgress; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; @@ -82,13 +86,13 @@ public class RaptorPathToItineraryMapperTest { private static final RegularStop S2 = TEST_MODEL.stop("STOP2", 1.0, 1.0).build(); @ParameterizedTest - @ValueSource(strings = { "0", "3000", "-3000" }) - public void createItineraryTestZeroDurationEgress(int LAST_LEG_COST) { + @ValueSource(ints = { 0, 3000, -3000 }) + void createItineraryTestZeroDurationEgress(int lastLegCost) { // Arrange RaptorPathToItineraryMapper mapper = getRaptorPathToItineraryMapper(); RaptorPath path = createTestTripSchedulePath(getTestTripSchedule()) - .egress(TestAccessEgress.free(2, RaptorCostConverter.toRaptorCost(LAST_LEG_COST))); + .egress(TestAccessEgress.free(2, RaptorCostConverter.toRaptorCost(lastLegCost))); int transitLegCost = path.accessLeg().nextLeg().c1(); int egressLegCost = path.accessLeg().nextLeg().nextLeg().c1(); @@ -106,12 +110,30 @@ public void createItineraryTestZeroDurationEgress(int LAST_LEG_COST) { ); } + @Test + void penalty() { + // Arrange + RaptorPathToItineraryMapper mapper = getRaptorPathToItineraryMapper(); + + var penalty = new TimeAndCost(Duration.ofMinutes(10), Cost.costOfMinutes(10)); + RaptorPath path = createTestTripSchedulePath(getTestTripSchedule()) + .egress(TestAccessEgress.car(2, RaptorCostConverter.toRaptorCost(1000), penalty)); + + // Act + var itinerary = mapper.createItinerary(path); + + // Assert + assertNotNull(itinerary); + assertEquals(4708, itinerary.getGeneralizedCost()); + assertNotEquals(4708, itinerary.getGeneralizedCostPlusPenalty()); + } + /** * Create a minimalist path FlexAccess-->Transfer-->Egress (without transit) and check that the 3 legs * are properly mapped in the itinerary. */ @Test - public void createItineraryWithOnBoardFlexAccess() { + void createItineraryWithOnBoardFlexAccess() { RaptorPathToItineraryMapper mapper = getRaptorPathToItineraryMapper(); State state = TestStateBuilder.ofWalking().streetEdge().streetEdge().build(); From 984d5804f6b971a785922608484376b87193588b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Dec 2023 13:14:07 +0100 Subject: [PATCH 0411/1688] Document fix tests --- .../transit/RemoveTransitIfStreetOnlyIsBetter.java | 5 +++-- .../filters/transit/RemoveTransitIfWalkingIsBetter.java | 2 +- .../transit/RemoveTransitIfStreetOnlyIsBetterTest.java | 9 +++++---- .../mapping/RaptorPathToItineraryMapperTest.java | 2 ++ 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index 535676f4574..1cea1d1f2ba 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -52,8 +52,9 @@ public List flagForRemoval(List itineraries) { // Filter away itineraries that have higher cost than limit cost computed above return itineraries .stream() - // we use the cost including the access/egress penalty since we don't want to give - // searches that are only on the street network an unfair advantage + // we use the cost without the access/egress penalty since we don't want to give + // searches that are only on the street network an unfair advantage (they don't have + // access/egress so cannot have these penalties) .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCost() >= limit) .collect(Collectors.toList()); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java index 19f6970affb..01ffef0efa4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfWalkingIsBetter.java @@ -38,7 +38,7 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() - // we use the cost including the access/egress penalty since we don't want to give + // we use the cost without the access/egress penalty since we don't want to give // searches that are only on the street network an unfair advantage .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCost() >= limit) .collect(Collectors.toList()); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index ee9e347c5a0..91ab7cfcea6 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -65,7 +65,7 @@ void considerPenalties() { Itinerary walk = newItinerary(A, 6).walk(1, E).build(); walk.setGeneralizedCost(300); - // transit slightly lower cost, however it also has a high penalty which is + // transit has slightly lower cost, however it also has a high penalty which is // not taken into account when comparing the itineraries Itinerary busWithPenalty = newItinerary(A).bus(21, 6, 8, E).build(); busWithPenalty.setGeneralizedCost(299); @@ -73,11 +73,12 @@ void considerPenalties() { // When: var itineraries = List.of(walk, busWithPenalty); - List result = DeletionFlaggerTestHelper.process( - itineraries, - new RemoveTransitIfStreetOnlyIsBetterFilter(CostLinearFunction.of(Duration.ZERO, 1.0)) + var flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( + CostLinearFunction.of(Duration.ZERO, 1.0) ); + List result = flagger.removeMatchesForTest(itineraries); + // Then: assertEquals(toStr(itineraries), toStr(result)); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index 674a57ccd15..87566172b1a 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -11,6 +11,7 @@ import java.time.Month; import java.util.ArrayList; import java.util.HashMap; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -111,6 +112,7 @@ void createItineraryTestZeroDurationEgress(int lastLegCost) { } @Test + @Disabled("Need to write a general test framework to enable this.") void penalty() { // Arrange RaptorPathToItineraryMapper mapper = getRaptorPathToItineraryMapper(); From d0be3015bdd46c372b3b7cea5f5f2050a102501f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Dec 2023 13:23:23 +0100 Subject: [PATCH 0412/1688] Flesh out test --- ...RemoveTransitIfStreetOnlyIsBetterTest.java | 57 +++++++++++++------ 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index 91ab7cfcea6..a2759a3bac4 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -6,6 +6,7 @@ import java.time.Duration; import java.util.List; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; @@ -60,26 +61,50 @@ void filterAwayLongTravelTimeWithoutWaitTime() { assertEquals(toStr(List.of(bicycle, walk, i1)), toStr(result)); } - @Test - void considerPenalties() { - Itinerary walk = newItinerary(A, 6).walk(1, E).build(); - walk.setGeneralizedCost(300); - - // transit has slightly lower cost, however it also has a high penalty which is - // not taken into account when comparing the itineraries - Itinerary busWithPenalty = newItinerary(A).bus(21, 6, 8, E).build(); - busWithPenalty.setGeneralizedCost(299); - busWithPenalty.setAccessPenalty(new TimeAndCost(Duration.ZERO, Cost.costOfSeconds(400))); + @Nested + class AccessEgressPenalties { - // When: - var itineraries = List.of(walk, busWithPenalty); - var flagger = new RemoveTransitIfStreetOnlyIsBetterFilter( + private static final RemoveTransitIfStreetOnlyIsBetterFilter FLAGGER = new RemoveTransitIfStreetOnlyIsBetterFilter( CostLinearFunction.of(Duration.ZERO, 1.0) ); - List result = flagger.removeMatchesForTest(itineraries); + @Test + void keepBusWithLowCostAndPenalty() { + Itinerary walk = newItinerary(A, 6).walk(1, E).build(); + walk.setGeneralizedCost(300); - // Then: - assertEquals(toStr(itineraries), toStr(result)); + // transit has slightly lower cost, however it also has a high penalty which is + // not taken into account when comparing the itineraries + Itinerary busWithPenalty = newItinerary(A).bus(21, 6, 8, E).build(); + busWithPenalty.setGeneralizedCost(299); + busWithPenalty.setAccessPenalty(new TimeAndCost(Duration.ZERO, Cost.costOfSeconds(360))); + + // When: + var itineraries = List.of(walk, busWithPenalty); + + List result = FLAGGER.removeMatchesForTest(itineraries); + + // Then: + assertEquals(toStr(itineraries), toStr(result)); + } + + @Test + void removeBusWithHighCostAndNoPenalty() { + Itinerary walk = newItinerary(A, 6).walk(1, E).build(); + walk.setGeneralizedCost(300); + + // transit has slightly lower cost, however it also has a high penalty which is + // not taken into account when comparing the itineraries + Itinerary bus = newItinerary(A).bus(21, 6, 8, E).build(); + bus.setGeneralizedCost(301); + + // When: + var itineraries = List.of(walk, bus); + + List result = FLAGGER.removeMatchesForTest(itineraries); + + // Then: + assertEquals(toStr(List.of(walk)), toStr(result)); + } } } From b766ff9bac925a2b1070d7dc6a0c17ab8354a825 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Dec 2023 22:20:27 +0100 Subject: [PATCH 0413/1688] Fix transmodel API type --- .../transmodel/model/framework/PenaltyForStreetModeType.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java index 9fd91832117..6d945ae912f 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/framework/PenaltyForStreetModeType.java @@ -2,6 +2,7 @@ import graphql.Scalars; import graphql.language.ArrayValue; +import graphql.language.EnumValue; import graphql.language.FloatValue; import graphql.language.ObjectField; import graphql.language.ObjectValue; @@ -139,7 +140,7 @@ private static Value mapPenaltyForStreetMode( ObjectField .newObjectField() .name(FIELD_STREET_MODE) - .value((Value) streetModeGQL.getValue()) + .value(EnumValue.of(streetModeGQL.getName())) .build() ) .objectField( From 37a5d12b7aa561342b6ea275ff02babe85c8d6a3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 11:08:26 +0100 Subject: [PATCH 0414/1688] Update all relevant filters to use correct method --- .../org/opentripplanner/model/plan/Itinerary.java | 9 +++++---- .../model/plan/ItinerarySortKey.java | 4 ++-- .../plan/paging/cursor/DeduplicationPageCut.java | 2 +- .../plan/paging/cursor/PageCursorSerializer.java | 2 +- .../RemoveTransitIfStreetOnlyIsBetter.java | 2 +- .../transit/TransitGeneralizedCostFilter.java | 6 +++--- ...RemoveOtherThanSameLegsMaxGeneralizedCost.java | 6 +++--- .../framework/sort/SortOnGeneralizedCost.java | 15 --------------- .../framework/sort/SortOrderComparator.java | 2 +- .../opentripplanner/model/plan/ItineraryTest.java | 8 ++++---- .../RemoveTransitIfStreetOnlyIsBetterTest.java | 2 +- .../mapping/RaptorPathToItineraryMapperTest.java | 2 +- 12 files changed, 23 insertions(+), 37 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCost.java diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index 9854facdf5e..3da1b20e4db 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -506,11 +506,12 @@ public int getGeneralizedCost() { * * @see Itinerary#getGeneralizedCost() * @see org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressPenaltyDecorator - * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.NonTransitGeneralizedCostFilter - * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfStreetOnlyIsBetterFilter - * @see org.opentripplanner.routing.algorithm.filterchain.deletionflagger.RemoveTransitIfWalkingIsBetterFilter + * @see org.opentripplanner.routing.algorithm.filterchain.filters.street.RemoveNonTransitItinerariesBasedOnGeneralizedCost + * @see org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfStreetOnlyIsBetter + * @see org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfWalkingIsBetter */ - public int getGeneralizedCostPlusPenalty() { + @Override + public int getGeneralizedCostIncludingPenalty() { return generalizedCost + penaltyCost(accessPenalty) + penaltyCost(egressPenalty); } diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java index 0ad62927d9a..18939c95f8c 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerarySortKey.java @@ -16,7 +16,7 @@ public interface ItinerarySortKey { Instant startTimeAsInstant(); Instant endTimeAsInstant(); - int getGeneralizedCost(); + int getGeneralizedCostIncludingPenalty(); int getNumberOfTransfers(); boolean isOnStreetAllTheWay(); @@ -28,7 +28,7 @@ default String keyAsString() { .addText(", ") .addTime(endTimeAsInstant()) .addText(", ") - .addCost(getGeneralizedCost()) + .addCost(getGeneralizedCostIncludingPenalty()) .addText(", Tx") .addNum(getNumberOfTransfers()) .addText(", ") diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java b/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java index 611b8116b8b..8fb32e6291a 100644 --- a/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java +++ b/src/main/java/org/opentripplanner/model/plan/paging/cursor/DeduplicationPageCut.java @@ -29,7 +29,7 @@ public Instant endTimeAsInstant() { } @Override - public int getGeneralizedCost() { + public int getGeneralizedCostIncludingPenalty() { return generalizedCost; } diff --git a/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java b/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java index 98f64c68062..396c7499d2f 100644 --- a/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java +++ b/src/main/java/org/opentripplanner/model/plan/paging/cursor/PageCursorSerializer.java @@ -58,7 +58,7 @@ public static String encode(PageCursor cursor) { .withTimeInstant(CUT_DEPARTURE_TIME_FIELD, cut.startTimeAsInstant()) .withTimeInstant(CUT_ARRIVAL_TIME_FIELD, cut.endTimeAsInstant()) .withInt(CUT_N_TRANSFERS_FIELD, cut.getNumberOfTransfers()) - .withInt(CUT_COST_FIELD, cut.getGeneralizedCost()); + .withInt(CUT_COST_FIELD, cut.getGeneralizedCostIncludingPenalty()); } return tokenBuilder.build(); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java index 1cea1d1f2ba..5fa57ee0801 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetter.java @@ -56,7 +56,7 @@ public List flagForRemoval(List itineraries) { // searches that are only on the street network an unfair advantage (they don't have // access/egress so cannot have these penalties) .filter(it -> !it.isOnStreetAllTheWay() && it.getGeneralizedCost() >= limit) - .collect(Collectors.toList()); + .toList(); } @Override diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java index f4516421889..14670038512 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java @@ -37,7 +37,7 @@ public List flagForRemoval(List itineraries) { List transitItineraries = itineraries .stream() .filter(Itinerary::hasTransit) - .sorted(Comparator.comparingInt(Itinerary::getGeneralizedCost)) + .sorted(Comparator.comparingInt(Itinerary::getGeneralizedCostIncludingPenalty)) .toList(); return transitItineraries @@ -47,13 +47,13 @@ public List flagForRemoval(List itineraries) { } private boolean generalizedCostExceedsLimit(Itinerary subject, Itinerary transitItinerary) { - return subject.getGeneralizedCost() > calculateLimit(subject, transitItinerary); + return subject.getGeneralizedCostIncludingPenalty() > calculateLimit(subject, transitItinerary); } private int calculateLimit(Itinerary subject, Itinerary transitItinerary) { return ( costLimitFunction - .calculate(Cost.costOfSeconds(transitItinerary.getGeneralizedCost())) + .calculate(Cost.costOfSeconds(transitItinerary.getGeneralizedCostIncludingPenalty())) .toSeconds() + getWaitTimeCost(transitItinerary, subject) ); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java index 0194cfa2bbc..52d09161947 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/group/RemoveOtherThanSameLegsMaxGeneralizedCost.java @@ -12,7 +12,7 @@ import org.opentripplanner.transit.model.timetable.Trip; /** - * This filter remove itineraries, which use the same trips for most of their legs, but where some + * This filter removes itineraries, which use the same trips for most of their legs, but where some * itineraries have a much higher cost for the other legs. This is similar to {@link * org.opentripplanner.routing.algorithm.filterchain.filters.transit.TransitGeneralizedCostFilter}, * but is used together with {@link GroupByFilter} to filter within the groups. @@ -79,7 +79,7 @@ public List flagForRemoval(List itineraries) { // Find the lowest cost for any itinerary OptionalInt minimumCost = itineraries .stream() - .mapToInt(itinerary -> itinerary.getGeneralizedCost()) + .mapToInt(Itinerary::getGeneralizedCostIncludingPenalty) .min(); if (minimumCost.isEmpty()) { @@ -93,7 +93,7 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() - .filter(it -> it.getGeneralizedCost() > maxLimit) + .filter(it -> it.getGeneralizedCostIncludingPenalty() > maxLimit) .collect(Collectors.toList()); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCost.java deleted file mode 100644 index 10c10362c46..00000000000 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOnGeneralizedCost.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.opentripplanner.routing.algorithm.filterchain.framework.sort; - -import org.opentripplanner.framework.collection.CompositeComparator; -import org.opentripplanner.model.plan.ItinerarySortKey; - -/** - * This comparator sorts itineraries based on the generalized-cost. If the cost is the same then the - * filter pick the itinerary with the lowest number-of-transfers. - */ -public class SortOnGeneralizedCost extends CompositeComparator { - - public SortOnGeneralizedCost() { - super(SortOrderComparator.GENERALIZED_COST_COMP, SortOrderComparator.NUM_OF_TRANSFERS_COMP); - } -} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java index 475309eeae4..f11caf5ceaa 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/sort/SortOrderComparator.java @@ -36,7 +36,7 @@ public class SortOrderComparator extends CompositeComparator { .reversed(); static final Comparator GENERALIZED_COST_COMP = comparingInt( - ItinerarySortKey::getGeneralizedCost + ItinerarySortKey::getGeneralizedCostIncludingPenalty ); static final Comparator NUM_OF_TRANSFERS_COMP = comparingInt( diff --git a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index ee8f776c7ab..952479353c2 100644 --- a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -205,7 +205,7 @@ class AccessEgressPenalty { void noPenalty() { var subject = itinerary(); assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); - assertEquals(DEFAULT_COST, subject.getGeneralizedCostPlusPenalty()); + assertEquals(DEFAULT_COST, subject.getGeneralizedCostIncludingPenalty()); } @Test @@ -213,7 +213,7 @@ void accessPenalty() { var subject = itinerary(); subject.setAccessPenalty(PENALTY); assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); - assertEquals(COST_PLUS_TWO_MINUTES, subject.getGeneralizedCostPlusPenalty()); + assertEquals(COST_PLUS_TWO_MINUTES, subject.getGeneralizedCostIncludingPenalty()); } @Test @@ -221,7 +221,7 @@ void egressPenalty() { var subject = itinerary(); subject.setEgressPenalty(PENALTY); assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); - assertEquals(COST_PLUS_TWO_MINUTES, subject.getGeneralizedCostPlusPenalty()); + assertEquals(COST_PLUS_TWO_MINUTES, subject.getGeneralizedCostIncludingPenalty()); } @Test @@ -232,7 +232,7 @@ void bothPenalties() { assertEquals(DEFAULT_COST, subject.getGeneralizedCost()); assertEquals( DEFAULT_COST + PENALTY.cost().toSeconds() + PENALTY.cost().toSeconds(), - subject.getGeneralizedCostPlusPenalty() + subject.getGeneralizedCostIncludingPenalty() ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java index a2759a3bac4..4da3e83b460 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/RemoveTransitIfStreetOnlyIsBetterTest.java @@ -64,7 +64,7 @@ void filterAwayLongTravelTimeWithoutWaitTime() { @Nested class AccessEgressPenalties { - private static final RemoveTransitIfStreetOnlyIsBetterFilter FLAGGER = new RemoveTransitIfStreetOnlyIsBetterFilter( + private static final RemoveTransitIfStreetOnlyIsBetter FLAGGER = new RemoveTransitIfStreetOnlyIsBetter( CostLinearFunction.of(Duration.ZERO, 1.0) ); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index 87566172b1a..2b8f792a455 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -127,7 +127,7 @@ void penalty() { // Assert assertNotNull(itinerary); assertEquals(4708, itinerary.getGeneralizedCost()); - assertNotEquals(4708, itinerary.getGeneralizedCostPlusPenalty()); + assertNotEquals(4708, itinerary.getGeneralizedCostIncludingPenalty()); } /** From 37986ea733b1805e178c8e4c4f40a57375d34289 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 11:10:25 +0100 Subject: [PATCH 0415/1688] Update documentation --- src/main/java/org/opentripplanner/model/plan/Itinerary.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index 3da1b20e4db..f4b3b8b4f67 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -504,11 +504,7 @@ public int getGeneralizedCost() { * using only on-street legs don't have an unfair advantage over those combining access/egress with * transit and using a penalty when being processed by the itinerary filter chain. * - * @see Itinerary#getGeneralizedCost() * @see org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressPenaltyDecorator - * @see org.opentripplanner.routing.algorithm.filterchain.filters.street.RemoveNonTransitItinerariesBasedOnGeneralizedCost - * @see org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfStreetOnlyIsBetter - * @see org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveTransitIfWalkingIsBetter */ @Override public int getGeneralizedCostIncludingPenalty() { From 6346062fd6f0c52b712bad5f69b142564d23ae91 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 11:44:25 +0100 Subject: [PATCH 0416/1688] Add tests and documentation --- .../org/opentripplanner/model/fare/ItineraryFares.java | 6 ++++++ .../opentripplanner/routing/core/ItineraryFaresTest.java | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java index 3f4cb04e01c..1a64f21c41b 100644 --- a/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java +++ b/src/main/java/org/opentripplanner/model/fare/ItineraryFares.java @@ -104,11 +104,17 @@ public void addFareProductUses(Multimap fareProducts) { legProducts.putAll(fareProducts); } + /** + * Add the contents of another instance to this one. + */ public void add(ItineraryFares fare) { itineraryProducts.addAll(fare.itineraryProducts); legProducts.putAll(fare.legProducts); } + /** + * Does this instance contain any fare products? + */ public boolean isEmpty() { return itineraryProducts.isEmpty() && legProducts.isEmpty(); } diff --git a/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java b/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java index 2b22bc9e41f..43bad94131f 100644 --- a/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java +++ b/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java @@ -1,6 +1,7 @@ package org.opentripplanner.routing.core; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.model.plan.PlanTestConstants.A; import static org.opentripplanner.model.plan.PlanTestConstants.B; import static org.opentripplanner.model.plan.PlanTestConstants.C; @@ -59,6 +60,12 @@ void legProduct() { ); } + @Test + void empty(){ + assertTrue(ItineraryFares.empty().isEmpty()); + } + + @Nonnull private static FareProduct fareProduct(String id) { return new FareProduct(id(id), id, Money.euros(10), null, null, null); From 73e66d987654fca6cfad9217763367ab14dfd52b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 12:04:48 +0100 Subject: [PATCH 0417/1688] Simplify GraphQL data fetcher --- .../apis/gtfs/datafetchers/ItineraryImpl.java | 14 ++------------ .../apis/gtfs/generated/GraphQLDataFetchers.java | 2 +- .../routing/core/ItineraryFaresTest.java | 3 +-- 3 files changed, 4 insertions(+), 15 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java index a7ae7954cd6..a93360e920d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java @@ -2,14 +2,10 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.mapping.NumberMapper; import org.opentripplanner.model.SystemNotice; -import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Emissions; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; @@ -42,14 +38,8 @@ public DataFetcher endTime() { } @Override - public DataFetcher>> fares() { - return environment -> { - ItineraryFares fare = getSource(environment).getFares(); - if (fare == null) { - return null; - } - return List.of(); - }; + public DataFetcher> fares() { + return environment -> List.of(); } @Override diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index cd002ec187b..2f39f7f4030 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -402,7 +402,7 @@ public interface GraphQLItinerary { public DataFetcher endTime(); - public DataFetcher>> fares(); + public DataFetcher> fares(); public DataFetcher generalizedCost(); diff --git a/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java b/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java index 43bad94131f..3ad3b918ce1 100644 --- a/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java +++ b/src/test/java/org/opentripplanner/routing/core/ItineraryFaresTest.java @@ -61,11 +61,10 @@ void legProduct() { } @Test - void empty(){ + void empty() { assertTrue(ItineraryFares.empty().isEmpty()); } - @Nonnull private static FareProduct fareProduct(String id) { return new FareProduct(id(id), id, Money.euros(10), null, null, null); From 5b52c8b56681ac6f37ad70cea939cbdf68320535 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 12:09:40 +0100 Subject: [PATCH 0418/1688] Update tests --- .../opentripplanner/ext/fares/impl/FaresIntegrationTest.java | 2 +- .../ext/flex/trip/ScheduledDeviatedTripTest.java | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index 90df7481720..7e114dae5ce 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -46,7 +46,7 @@ public void testBasic() { ItineraryFares fare = getFare(from, to, start, serverContext); var product = fare.getLegProducts().values().iterator().next().product(); assertEquals(Money.usDollars(4.25f), product.price()); - assertEquals("1:OW_2", product.id().toString()); + assertEquals("OW_2", product.id().getId().toString()); } @Test diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 85b533cbf69..e0f85676034 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -148,10 +148,7 @@ void calculateDirectFare() { var itinerary = itineraries.getFirst(); - assertEquals( - "[FareProductUse[id=1532715d-bffe-310c-9c76-842f3c74bbd3, product=FareProduct{id: '1:flex-adult', name: 'regular', amount: $2.50}]]", - itinerary.getFares().getLegProducts().values().toString() - ); + assertFalse(itinerary.getFares().getLegProducts().isEmpty()); OTPFeature.enableFeatures(Map.of(OTPFeature.FlexRouting, false)); } From bc8ac75b4a9182d3bd646940339e2ab3df76bdb3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 25 Jan 2024 12:14:16 +0100 Subject: [PATCH 0419/1688] Add schema documentation --- .../org/opentripplanner/apis/gtfs/schema.graphqls | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index ac2413caeae..daeb57d655e 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -933,6 +933,10 @@ type Emissions { co2: Grams } +""" +This type is only here for backwards-compatibility and this API will never return it anymore. +Please use the leg's `fareProducts` instead. +""" type fare { type: String @deprecated @@ -949,7 +953,10 @@ type fare { components: [fareComponent] @deprecated } -"""Component of the fare (i.e. ticket) for a part of the itinerary""" +""" +This type is only here for backwards-compatibility and this API will never return it anymore. +Please use the leg's `fareProducts` instead. +""" type fareComponent { """ID of the ticket type. Corresponds to `fareId` in **TicketType**.""" fareId: String @deprecated @@ -1574,7 +1581,7 @@ type Itinerary { """ Information about the fares for this itinerary. This is primarily a GTFS Fares V1 interface - will be removed in the future. + and always returns an empty list. Use the leg's `fareProducts` instead. """ fares: [fare] @deprecated(reason: "Use the leg's `fareProducts`.") } From fa33a47dfe7423a2cab56f70d899b77d7c7c38fb Mon Sep 17 00:00:00 2001 From: eibakke Date: Thu, 25 Jan 2024 13:20:55 +0100 Subject: [PATCH 0420/1688] Changes the StopType field in the GraphQL API from enum to String. This allows for backward compatibility. --- .../apis/transmodel/model/stop/QuayType.java | 6 +++-- .../transmodel/model/stop/StopTypeMapper.java | 25 ++++++------------- .../apis/transmodel/schema.graphql | 11 +------- 3 files changed, 13 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index 46b09956eb2..0b22086dfaf 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -350,8 +350,10 @@ public static GraphQLObjectType create( GraphQLFieldDefinition .newFieldDefinition() .name("stopType") - .type(StopTypeMapper.STOP_TYPE) - .dataFetcher(env -> ((StopLocation) env.getSource()).getStopType()) + .type(Scalars.GraphQLString) + .dataFetcher(env -> + StopTypeMapper.getStopType(((StopLocation) env.getSource()).getStopType()) + ) .build() ) .field( diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java index bde676bec59..e94347b72e5 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopTypeMapper.java @@ -1,26 +1,17 @@ package org.opentripplanner.apis.transmodel.model.stop; -import graphql.schema.GraphQLEnumType; import org.opentripplanner.transit.model.site.StopType; /** - * Maps the StopType enum to a GraphQL enum. + * Maps the StopType enum to a String used in the GraphQL API. */ public class StopTypeMapper { - public static final GraphQLEnumType STOP_TYPE = GraphQLEnumType - .newEnum() - .name("StopType") - .value("regular", StopType.REGULAR, "A regular stop defined geographically as a point.") - .value( - "flexible_area", - StopType.FLEXIBLE_AREA, - "Boarding and alighting is allowed anywhere within the geographic area of this stop." - ) - .value( - "flexible_group", - StopType.FLEXIBLE_GROUP, - "A stop that consists of multiple other stops, area or regular." - ) - .build(); + public static String getStopType(StopType stopType) { + return switch (stopType) { + case REGULAR -> "regular"; + case FLEXIBLE_AREA -> "flexible_area"; + case FLEXIBLE_GROUP -> "flexible_group"; + }; + } } diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index a1e971d66ef..25cf95ca2f9 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -600,7 +600,7 @@ type Quay implements PlaceInterface { situations: [PtSituationElement!]! "The stop place to which this quay belongs to." stopPlace: StopPlace - stopType: StopType + stopType: String tariffZones: [TariffZone]! timeZone: String "Whether this quay is suitable for wheelchair boarding." @@ -1697,15 +1697,6 @@ enum StopCondition { startPoint } -enum StopType { - "Boarding and alighting is allowed anywhere within the geographic area of this stop." - flexible_area - "A stop that consists of multiple other stops, area or regular." - flexible_group - "A regular stop defined geographically as a point." - regular -} - enum StreetMode { "Bike only. This can be used as access/egress, but transfers will still be walk only." bicycle From 1696118f2cec9ab721436586456f7a5038e6c812 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 25 Jan 2024 12:43:12 +0000 Subject: [PATCH 0421/1688] Add changelog entry for #5636 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 4cfb1176773..981f453fced 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -79,6 +79,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Restructure walk/bicycle/car preferences in router-config.json [#5582](https://github.com/opentripplanner/OpenTripPlanner/pull/5582) - Revert REST API spelling change of real-time [#5629](https://github.com/opentripplanner/OpenTripPlanner/pull/5629) - Remove `FareComponent` [#5613](https://github.com/opentripplanner/OpenTripPlanner/pull/5613) +- Add AreaStop layer to new debug frontend [#5636](https://github.com/opentripplanner/OpenTripPlanner/pull/5636) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 317960b34986fbf689fb2653e2283166177d1983 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 25 Jan 2024 12:44:17 +0000 Subject: [PATCH 0422/1688] Upgrade debug client to version 2024/01/2024-01-25T12:43 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index e9443e240c4..2653fdf36c2 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From fa484cbc519ccf93557ba96ee821a29ebf56066e Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 25 Jan 2024 21:33:39 +0000 Subject: [PATCH 0423/1688] Add changelog entry for #5627 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 981f453fced..7fc6a512c7a 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -80,6 +80,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Revert REST API spelling change of real-time [#5629](https://github.com/opentripplanner/OpenTripPlanner/pull/5629) - Remove `FareComponent` [#5613](https://github.com/opentripplanner/OpenTripPlanner/pull/5613) - Add AreaStop layer to new debug frontend [#5636](https://github.com/opentripplanner/OpenTripPlanner/pull/5636) +- Allow configuration of vector tiles base path [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From f38447c98f37215702300ce91f2e54ba56cab9c1 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Thu, 25 Jan 2024 21:33:56 +0000 Subject: [PATCH 0424/1688] Bump serialization version id for #5627 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f7fc0dd2bb..c4737cc592b 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 138 + 139 30.1 2.50 From 3b9dd5b438db2baa068fb8ca4bf59b20edd38c2c Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 26 Jan 2024 11:39:55 +0100 Subject: [PATCH 0425/1688] fix: Log trip and pattern id when negative trip-times occurs in routing. --- .../framework/lang/ObjectUtils.java | 13 ++++++++++++ .../framework/tostring/ToStringBuilder.java | 14 +++++++++++-- .../request/TripScheduleWithOffset.java | 4 +++- .../model/network/RoutingTripPattern.java | 2 +- .../framework/lang/ObjectUtilsTest.java | 13 ++++++++++++ .../tostring/ToStringBuilderTest.java | 20 +++++++++++++++++++ 6 files changed, 62 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java b/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java index 1e67b8f253e..a3f18748987 100644 --- a/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java +++ b/src/main/java/org/opentripplanner/framework/lang/ObjectUtils.java @@ -1,6 +1,7 @@ package org.opentripplanner.framework.lang; import java.util.function.Function; +import java.util.function.Supplier; import javax.annotation.Nullable; /** @@ -33,6 +34,18 @@ public static T ifNotNull( return ifNotNull(getter.apply(entity), defaultValue); } + /** + * Get the value or {@code null}, ignore any exceptions. This is useful if you must traverse + * a long call-chain like {@code a.b().c().d()...} when e.g. logging. + */ + public static T safeGetOrNull(Supplier body) { + try { + return body.get(); + } catch (Exception ignore) { + return null; + } + } + public static T requireNotInitialized(T oldValue, T newValue) { return requireNotInitialized(null, oldValue, newValue); } diff --git a/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java b/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java index cb5d26294db..6480b6f1187 100644 --- a/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java +++ b/src/main/java/org/opentripplanner/framework/tostring/ToStringBuilder.java @@ -13,9 +13,11 @@ import java.util.Collection; import java.util.Objects; import java.util.function.Function; +import java.util.function.Supplier; import java.util.stream.Collectors; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.opentripplanner.framework.lang.ObjectUtils; import org.opentripplanner.framework.lang.OtpNumberFormat; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.TimeUtils; @@ -134,12 +136,20 @@ public ToStringBuilder addObj(String name, Object value, @Nullable Object ignore return addIfNotIgnored(name, value, ignoreValue, Object::toString); } + /** + * Add the result of the given supplier. If the supplier return {@code null} or an exceptions + * is thrown, then nothing is added - the result is ignored. + */ + public ToStringBuilder addObjOpSafe(String name, Supplier body) { + return addObj(name, ObjectUtils.safeGetOrNull(body)); + } + /** * Use this if you would like a custom toString function to convert the value. If the given value * is null, then the value is not printed. *

      * Implementation note! The "Op" (Operation) suffix is necessary to separate this from - * {@link #addObj(String, Object, Object)}, when the last argument is null. + * {@link #addObj(String, Object, Object)}, when the last argument is null. */ public ToStringBuilder addObjOp( String name, @@ -176,7 +186,7 @@ public ToStringBuilder addDoubles(String name, double[] value, double ignoreValu return addIt(name, Arrays.toString(value)); } - /** Add collection if not null or not empty, all elements are added */ + /** Add the collection if not null or not empty, all elements are added */ public ToStringBuilder addCol(String name, Collection c) { return addIfNotNull(name, c == null || c.isEmpty() ? null : c); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java index 3eb26150d97..642dbd2d6e5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java @@ -107,7 +107,9 @@ public int getSecondsOffset() { public String toString() { return ToStringBuilder .of(TripScheduleWithOffset.class) - .addObj("trip", pattern.debugInfo()) + .addObj("info", pattern.debugInfo()) + .addObjOpSafe("id", () -> tripTimes.getTrip().getId()) + .addObjOpSafe("pattern.id", () -> pattern.getTripPattern().getPattern().getId()) .addServiceTime("depart", secondsOffset + getOriginalTripTimes().getDepartureTime(0)) .toString(); } diff --git a/src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java index 00033b5f798..98d30432b32 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/RoutingTripPattern.java @@ -117,7 +117,7 @@ public Route route() { @Override public String debugInfo() { - return pattern.logName() + " @" + index; + return pattern.logName() + " #" + index; } @Override diff --git a/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java index 9237b221fe5..274fb3e8700 100644 --- a/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/lang/ObjectUtilsTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import java.time.Duration; import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; @@ -48,6 +49,18 @@ void requireNotInitialized() { assertEquals("Field is already set! Old value: old, new value: new.", ex.getMessage()); } + @Test + void safeGetOrNull() { + assertEquals("test", ObjectUtils.safeGetOrNull(() -> "test")); + assertEquals(3000, ObjectUtils.safeGetOrNull(() -> Duration.ofSeconds(3).toMillis())); + assertNull(ObjectUtils.safeGetOrNull(() -> null)); + assertNull( + ObjectUtils.safeGetOrNull(() -> { + throw new NullPointerException("Something went wrong - ignore"); + }) + ); + } + @Test void toStringTest() { assertEquals("1", ObjectUtils.toString(1)); diff --git a/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java b/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java index 3e87006e953..90254c321a1 100644 --- a/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java +++ b/src/test/java/org/opentripplanner/framework/tostring/ToStringBuilderTest.java @@ -111,6 +111,26 @@ public void addObj() { ); } + @Test + public void addObjOpSafe() { + assertEquals( + "ToStringBuilderTest{obj: Foo{a: 5, b: 'X'}}", + subject().addObjOpSafe("obj", () -> new Foo(5, "X")).toString() + ); + assertEquals("ToStringBuilderTest{}", subject().addObjOpSafe("obj", () -> null).toString()); + assertEquals( + "ToStringBuilderTest{}", + subject() + .addObjOpSafe( + "obj", + () -> { + throw new IllegalStateException("Ignore"); + } + ) + .toString() + ); + } + @Test public void addObjOp() { var duration = Duration.ofMinutes(1); From 273309ec3fb8bfec800a1d6d210bb9210a02cd53 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 26 Jan 2024 19:32:54 +0100 Subject: [PATCH 0426/1688] Update src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java Co-authored-by: Thomas Gran --- .../filters/transit/TransitGeneralizedCostFilter.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java index 14670038512..430f00372d0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/transit/TransitGeneralizedCostFilter.java @@ -12,7 +12,6 @@ /** * This filter removes all transit results which have a generalized-cost higher than the max-limit - * This filter removes all transit results that have a generalized-cost higher than the max-limit * computed by the {@link #costLimitFunction} plus the wait cost given by * {@link TransitGeneralizedCostFilter#getWaitTimeCost}. */ From b0a400f7b67afea3c6e8d6860bef4086797c136e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 26 Jan 2024 19:33:35 +0100 Subject: [PATCH 0427/1688] Simplify penalty calculation --- .../org/opentripplanner/model/plan/Itinerary.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index f4b3b8b4f67..34a8117b58e 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -5,6 +5,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Function; @@ -45,8 +46,8 @@ public class Itinerary implements ItinerarySortKey { private Double elevationGained = 0.0; private int generalizedCost = UNKNOWN; private Integer generalizedCost2 = null; - private TimeAndCost accessPenalty = null; - private TimeAndCost egressPenalty = null; + private TimeAndCost accessPenalty = TimeAndCost.ZERO; + private TimeAndCost egressPenalty = TimeAndCost.ZERO; private int waitTimeOptimizedCost = UNKNOWN; private int transferPriorityCost = UNKNOWN; private boolean tooSloped = false; @@ -539,6 +540,7 @@ public TimeAndCost getAccessPenalty() { } public void setAccessPenalty(TimeAndCost accessPenalty) { + Objects.requireNonNull(accessPenalty); this.accessPenalty = accessPenalty; } @@ -548,6 +550,7 @@ public TimeAndCost getEgressPenalty() { } public void setEgressPenalty(TimeAndCost egressPenalty) { + Objects.requireNonNull(egressPenalty); this.egressPenalty = egressPenalty; } @@ -678,10 +681,6 @@ public Emissions getEmissionsPerPerson() { } private static int penaltyCost(TimeAndCost penalty) { - if (penalty == null) { - return 0; - } else { - return penalty.cost().toSeconds(); - } + return penalty.cost().toSeconds(); } } From dd9ec7000f49332e6ff39ad867b48e69a6ed7589 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 26 Jan 2024 19:16:49 +0000 Subject: [PATCH 0428/1688] Add changelog entry for #5637 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 7fc6a512c7a..28a5e9b8ee5 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -81,6 +81,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Remove `FareComponent` [#5613](https://github.com/opentripplanner/OpenTripPlanner/pull/5613) - Add AreaStop layer to new debug frontend [#5636](https://github.com/opentripplanner/OpenTripPlanner/pull/5636) - Allow configuration of vector tiles base path [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) +- Change Transmodel API path to `/otp/transmodel/v3` [#5637](https://github.com/opentripplanner/OpenTripPlanner/pull/5637) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 4412c7fe3ab1ad36f5b5d27dafcaee6c47a0f6eb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 26 Jan 2024 22:33:05 +0100 Subject: [PATCH 0429/1688] Update chat badge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4486818745b..2f2e910862c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ ## Overview -[![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner) +[![Join the chat at https://gitter.im/opentripplanner/OpenTripPlanner](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Gitter%20chat&color=%2342ac8c +)](https://gitter.im/opentripplanner/OpenTripPlanner) [![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner) [![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner) From 5e05d21ccb1e2f43069efe2929fcad45a823748d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 26 Jan 2024 22:34:18 +0100 Subject: [PATCH 0430/1688] Revert "Update chat badge" This reverts commit 4412c7fe3ab1ad36f5b5d27dafcaee6c47a0f6eb. --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f2e910862c..4486818745b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ ## Overview -[![Join the chat at https://gitter.im/opentripplanner/OpenTripPlanner](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Gitter%20chat&color=%2342ac8c -)](https://gitter.im/opentripplanner/OpenTripPlanner) +[![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner) [![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner) [![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner) From 40c99421cf4f8336ffaaefb2f211fb9174423251 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 27 Jan 2024 10:40:09 +0100 Subject: [PATCH 0431/1688] Update Github Actions --- .github/workflows/cibuild.yml | 28 +++++++++++++------------- .github/workflows/debug-client.yml | 2 +- .github/workflows/performance-test.yml | 4 ++-- .github/workflows/post-merge.yml | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index c2979504992..28a84953af2 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -20,20 +20,20 @@ jobs: timeout-minutes: 20 steps: # Starting in v2.2 checkout action fetches all tags when fetch-depth=0, for auto-versioning. - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v4 with: fetch-depth: 0 # nodejs is needed because the dynamic download of it via the prettier maven plugin often # times out # Example: https://github.com/opentripplanner/OpenTripPlanner/actions/runs/4490450225/jobs/7897533439 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 # Java setup step completes very fast, no need to run in a preconfigured docker container - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: temurin @@ -65,9 +65,9 @@ jobs: timeout-minutes: 20 runs-on: windows-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: temurin @@ -91,7 +91,7 @@ jobs: steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v4 # this is necessary so that the correct credentials are put into the git configuration # when we push to dev-2.x and push the HTML to the git repo if: github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x' || github.ref == 'refs/heads/master') @@ -101,7 +101,7 @@ jobs: # was modified last fetch-depth: 1000 - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v4 # for a simple PR where we don't push, we don't need any credentials if: github.event_name == 'pull_request' @@ -113,7 +113,7 @@ jobs: if: github.event_name == 'pull_request' run: mkdocs build - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 @@ -174,8 +174,8 @@ jobs: if: github.repository_owner == 'opentripplanner' runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3.1.0 - - uses: actions/setup-node@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 with: node-version: 16 - name: Run code generator @@ -184,7 +184,7 @@ jobs: yarn install yarn generate - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: temurin @@ -199,16 +199,16 @@ jobs: - build-windows - build-linux steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Set up JDK 21 - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: temurin cache: maven - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 - name: Build container image with Jib, push to Dockerhub diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml index aed7943e63a..de92c121db7 100644 --- a/.github/workflows/debug-client.yml +++ b/.github/workflows/debug-client.yml @@ -30,7 +30,7 @@ jobs: - uses: actions/checkout@v4 if: github.event_name == 'pull_request' - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: 18 diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index a5274d9839f..1b8201a01ae 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -60,14 +60,14 @@ jobs: profile: extended steps: - - uses: actions/checkout@v3.1.0 + - uses: actions/checkout@v4 if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x' with: fetch-depth: 0 - name: Set up JDK if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x' - uses: actions/setup-java@v3 + uses: actions/setup-java@v4 with: java-version: 21 distribution: temurin diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml index 1500a0f9d9e..a2f29f0d1b0 100644 --- a/.github/workflows/post-merge.yml +++ b/.github/workflows/post-merge.yml @@ -16,7 +16,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v4 with: token: ${{ secrets.CHANGELOG_TOKEN }} @@ -62,7 +62,7 @@ jobs: git config --global user.email 'serialization-version-bot@opentripplanner.org' - name: Checkout - uses: actions/checkout@v3.1.0 + uses: actions/checkout@v4 with: token: ${{ secrets.CHANGELOG_TOKEN }} From 4ecf8de9c7cb182832be747ac7fcdd1b8d9293b4 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 29 Jan 2024 07:45:26 +0000 Subject: [PATCH 0432/1688] Add changelog entry for #5625 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 28a5e9b8ee5..40b91bf47a6 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -82,6 +82,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add AreaStop layer to new debug frontend [#5636](https://github.com/opentripplanner/OpenTripPlanner/pull/5636) - Allow configuration of vector tiles base path [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) - Change Transmodel API path to `/otp/transmodel/v3` [#5637](https://github.com/opentripplanner/OpenTripPlanner/pull/5637) +- Add flexibleArea to GroupStop Quays [#5625](https://github.com/opentripplanner/OpenTripPlanner/pull/5625) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 7d36193a16a97dbdca89ad24afe4a6736f659b49 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Mon, 29 Jan 2024 07:45:46 +0000 Subject: [PATCH 0433/1688] Bump serialization version id for #5625 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c4737cc592b..ce77a303d7d 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 139 + 140 30.1 2.50 From 773ed216c401a754e5ea57357bd1f2ce6cde232a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 29 Jan 2024 12:59:18 +0100 Subject: [PATCH 0434/1688] Remove 'street corners' [ci skip] --- docs/apis/Apis.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/apis/Apis.md b/docs/apis/Apis.md index 48b530a57e1..dd9280a047f 100644 --- a/docs/apis/Apis.md +++ b/docs/apis/Apis.md @@ -18,7 +18,7 @@ entities on a vector map. The [Actuator API](../sandbox/ActuatorAPI.md) provides endpoints for checking the health status of the OTP instance and reading live application metrics. -The [Geocoder API](../sandbox/GeocoderAPI.md) allows you to geocode street corners and stop names. +The [Geocoder API](../sandbox/GeocoderAPI.md) allows you to geocode stop names. ## Legacy APIs (to be removed) @@ -26,4 +26,4 @@ The OTP REST API used to power many apps and frontends. For years it was the onl OTP programmatically. Over time it has been replaced by the GraphQL APIs and is scheduled to be disabled by default -and eventually removed completely. It's therefore not recommended to use it. \ No newline at end of file +and eventually removed completely. It's therefore not recommended to use it. From 9e7c9bfe9bd5f481255261e71654346935544efa Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 29 Jan 2024 13:26:46 +0100 Subject: [PATCH 0435/1688] Update docs, closes #5500 [ci skip] --- doc-templates/Configuration.md | 4 ++-- docs/Configuration.md | 4 ++-- docs/SandboxExtension.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/doc-templates/Configuration.md b/doc-templates/Configuration.md index eabd4895a1f..6344e270570 100644 --- a/doc-templates/Configuration.md +++ b/doc-templates/Configuration.md @@ -128,8 +128,8 @@ you can run the following bash command: - `head -c 29 Graph.obj ==> OpenTripPlannerGraph;0000007;` (file header) - `head -c 28 Graph.obj | tail -c 7 ==> 0000007` (version id) -The Maven _pom.xml_, the _META-INF/MANIFEST.MF_, the OTP command line(`--serVerId`), log start-up -messages and all OTP APIs can be used to get the OTP Serialization Version Id. +The Maven _pom.xml_, the _META-INF/MANIFEST.MF_, the OTP command line(`--serializationVersionId`), +log start-up messages and all OTP APIs can be used to get the OTP Serialization Version Id. ## Include file directive diff --git a/docs/Configuration.md b/docs/Configuration.md index d43ff150926..858edf0f9b4 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -155,8 +155,8 @@ you can run the following bash command: - `head -c 29 Graph.obj ==> OpenTripPlannerGraph;0000007;` (file header) - `head -c 28 Graph.obj | tail -c 7 ==> 0000007` (version id) -The Maven _pom.xml_, the _META-INF/MANIFEST.MF_, the OTP command line(`--serVerId`), log start-up -messages and all OTP APIs can be used to get the OTP Serialization Version Id. +The Maven _pom.xml_, the _META-INF/MANIFEST.MF_, the OTP command line(`--serializationVersionId`), +log start-up messages and all OTP APIs can be used to get the OTP Serialization Version Id. ## Include file directive diff --git a/docs/SandboxExtension.md b/docs/SandboxExtension.md index 38988f8245f..4b978313ca6 100644 --- a/docs/SandboxExtension.md +++ b/docs/SandboxExtension.md @@ -11,7 +11,7 @@ provided "as is". - [Google Cloud Storage](sandbox/GoogleCloudStorage.md) - Enable Google Cloud Storage as a OTP Data Source - [Actuator API](sandbox/ActuatorAPI.md) - API used to check the health status of the OTP instance. -- [Geocoder API](sandbox/GeocoderAPI.md) - Adds an API to search for corners, stops and stations. +- [Geocoder API](sandbox/GeocoderAPI.md) - Adds an API to search for stops and stations. - [Transfer analyser](sandbox/transferanalyzer.md) - Module used for analyzing the transfers between nearby stops generated by routing via OSM data. - [SIRI Updater](sandbox/SiriUpdater.md) - Update OTP with real-time information from a Transmodel SIRI data source. From bb2e7530f380d599dac479c1d769a673a8195b3b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 29 Jan 2024 13:47:15 +0100 Subject: [PATCH 0436/1688] Separate walk from non-transit time --- .../apis/gtfs/datafetchers/ItineraryImpl.java | 4 ++-- .../model/plan/TripPatternType.java | 2 +- .../plan/ItinerariesCalculateLegTotals.java | 9 ++++++++- .../opentripplanner/model/plan/Itinerary.java | 19 +++++++++++++++++++ .../apis/gtfs/expectations/plan-extended.json | 2 ++ .../apis/gtfs/queries/plan-extended.graphql | 2 ++ 6 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java index 5399783bee0..63104ecc79a 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java @@ -94,12 +94,12 @@ public DataFetcher waitingTime() { @Override public DataFetcher walkDistance() { - return environment -> getSource(environment).getNonTransitDistanceMeters(); + return environment -> getSource(environment).walkDistanceMeters(); } @Override public DataFetcher walkTime() { - return environment -> (long) getSource(environment).getNonTransitDuration().toSeconds(); + return environment -> (long) getSource(environment).walkDuration().toSeconds(); } @Override diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java index 158d6a9a042..bbef4172c69 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java @@ -158,7 +158,7 @@ public static GraphQLObjectType create( .name("walkDistance") .deprecate("Replaced by `streetDistance`.") .type(Scalars.GraphQLFloat) - .dataFetcher(env -> itinerary(env).getNonTransitDistanceMeters()) + .dataFetcher(env -> itinerary(env).walkDistanceMeters()) .build() ) .field( diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java index c512e47d732..50d859d821d 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java @@ -13,6 +13,8 @@ class ItinerariesCalculateLegTotals { int nTransitLegs = 0; Duration nonTransitDuration = Duration.ZERO; double nonTransitDistanceMeters = 0.0; + Duration walkDuration = Duration.ZERO; + double walkDistanceMeters = 0.0; Duration waitingDuration = Duration.ZERO; boolean walkOnly = true; boolean streetOnly = true; @@ -42,9 +44,14 @@ private void calculate(List legs) { if (!leg.isInterlinedWithPreviousLeg()) { ++nTransitLegs; } - } else if (leg.isStreetLeg()) { + } else if (leg instanceof StreetLeg streetLeg){ nonTransitDuration = nonTransitDuration.plus(dt); nonTransitDistanceMeters += leg.getDistanceMeters(); + + if(streetLeg.isWalkingLeg()){ + walkDuration = walkDuration.plus(streetLeg.getDuration()); + walkDistanceMeters = walkDistanceMeters + streetLeg.getDistanceMeters(); + } } else if (leg instanceof UnknownTransitPathLeg unknownTransitPathLeg) { nTransitLegs += unknownTransitPathLeg.getNumberOfTransfers() + 1; } diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index 903e04c8b0c..2addae47413 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -39,6 +39,9 @@ public class Itinerary implements ItinerarySortKey { private final boolean walkOnly; private final boolean streetOnly; private final Duration nonTransitDuration; + private final Duration walkDuration; + private final double walkDistanceMeters; + /* mutable primitive properties */ private Double elevationLost = 0.0; @@ -75,6 +78,8 @@ public Itinerary(List legs) { this.transitDuration = totals.transitDuration; this.nonTransitDuration = totals.nonTransitDuration; this.nonTransitDistanceMeters = DoubleUtils.roundTo2Decimals(totals.nonTransitDistanceMeters); + this.walkDuration = totals.walkDuration; + this.walkDistanceMeters = totals.walkDistanceMeters; this.waitingDuration = totals.waitingDuration; this.walkOnly = totals.walkOnly; this.streetOnly = totals.streetOnly; @@ -663,4 +668,18 @@ public void setEmissionsPerPerson(Emissions emissionsPerPerson) { public Emissions getEmissionsPerPerson() { return this.emissionsPerPerson; } + + /** + * How much walking this itinerary contains, in meters. + */ + public double walkDistanceMeters() { + return walkDistanceMeters; + } + + /** + * How long the walking is contained in this itinerary. + */ + public Duration walkDuration() { + return walkDuration; + } } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index 681bb4715ab..557cdec8659 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -11,6 +11,8 @@ "co2" : 123.0 }, "numberOfTransfers" : 1, + "walkDistance" : 28.0, + "walkTime" : 20, "legs" : [ { "mode" : "WALK", diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index 76c8590ab30..db30d8489ef 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -24,6 +24,8 @@ co2 } numberOfTransfers + walkDistance + walkTime legs { mode from { From 04c6949ef3e2f004ca27b335dc0789287f110361 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 29 Jan 2024 13:49:10 +0100 Subject: [PATCH 0437/1688] Separate non-transit from walk time --- .../plan/ItinerariesCalculateLegTotals.java | 4 ++-- .../opentripplanner/model/plan/Itinerary.java | 3 +-- .../model/plan/ItineraryTest.java | 16 ++++++++-------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java index 50d859d821d..9bfd6d0757b 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java @@ -44,11 +44,11 @@ private void calculate(List legs) { if (!leg.isInterlinedWithPreviousLeg()) { ++nTransitLegs; } - } else if (leg instanceof StreetLeg streetLeg){ + } else if (leg instanceof StreetLeg streetLeg) { nonTransitDuration = nonTransitDuration.plus(dt); nonTransitDistanceMeters += leg.getDistanceMeters(); - if(streetLeg.isWalkingLeg()){ + if (streetLeg.isWalkingLeg()) { walkDuration = walkDuration.plus(streetLeg.getDuration()); walkDistanceMeters = walkDistanceMeters + streetLeg.getDistanceMeters(); } diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java index 2addae47413..2ccbb55235b 100644 --- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java +++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java @@ -42,7 +42,6 @@ public class Itinerary implements ItinerarySortKey { private final Duration walkDuration; private final double walkDistanceMeters; - /* mutable primitive properties */ private Double elevationLost = 0.0; private Double elevationGained = 0.0; @@ -673,7 +672,7 @@ public Emissions getEmissionsPerPerson() { * How much walking this itinerary contains, in meters. */ public double walkDistanceMeters() { - return walkDistanceMeters; + return walkDistanceMeters; } /** diff --git a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index df67e3c2f44..b7f07e0cd0c 100644 --- a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -19,7 +19,7 @@ public class ItineraryTest implements PlanTestConstants { @Test - public void testDerivedFieldsWithWalkingOnly() { + void testDerivedFieldsWithWalkingOnly() { Itinerary result = newItinerary(A, T11_00).walk(D5m, B).build(); // Expected fields on itinerary set @@ -43,7 +43,7 @@ public void testDerivedFieldsWithWalkingOnly() { } @Test - public void testDerivedFieldsWithBusAllTheWay() { + void testDerivedFieldsWithBusAllTheWay() { Itinerary result = newItinerary(A).bus(55, T11_00, T11_10, B).build(); assertEquals(ofMinutes(10), result.getDuration()); @@ -67,7 +67,7 @@ public void testDerivedFieldsWithBusAllTheWay() { } @Test - public void testDerivedFieldsWithTrainAllTheWay() { + void testDerivedFieldsWithTrainAllTheWay() { Itinerary result = newItinerary(A).rail(20, T11_05, T11_15, B).build(); assertEquals(ofMinutes(10), result.getDuration()); @@ -91,7 +91,7 @@ public void testDerivedFieldsWithTrainAllTheWay() { } @Test - public void testDerivedFieldsWithWalAccessAndTwoTransitLegs() { + void testDerivedFieldsWithWalAccessAndTwoTransitLegs() { Itinerary itinerary = TestItineraryBuilder .newItinerary(A, T11_02) .walk(D1m, B) @@ -112,7 +112,7 @@ public void testDerivedFieldsWithWalAccessAndTwoTransitLegs() { } @Test - public void testDerivedFieldsWithBusAndWalkingAccessAndEgress() { + void testDerivedFieldsWithBusAndWalkingAccessAndEgress() { Itinerary result = newItinerary(A, T11_05) .walk(D2m, B) // 3 minutes wait @@ -133,7 +133,7 @@ public void testDerivedFieldsWithBusAndWalkingAccessAndEgress() { } @Test - public void walkBusBusWalkTrainWalk() { + void walkBusBusWalkTrainWalk() { Itinerary result = newItinerary(A, T11_00) .walk(D2m, B) .bus(55, T11_04, T11_14, C) @@ -161,7 +161,7 @@ public void walkBusBusWalkTrainWalk() { } @Test - public void legIndex() { + void legIndex() { var itinerary = newItinerary(A, T11_00) .walk(D2m, B) .bus(55, T11_04, T11_14, C) @@ -181,7 +181,7 @@ public void legIndex() { } @Test - public void hasSystemTag() { + void hasSystemTag() { var subject = newItinerary(A).bus(1, T11_04, T11_14, B).build(); subject.flagForDeletion(new SystemNotice("MY-TAG", "Text")); assertTrue(subject.hasSystemNoticeTag("MY-TAG")); From aab15b63053f90d7a32a02120a346d6bc71c8788 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 29 Jan 2024 13:57:11 +0100 Subject: [PATCH 0438/1688] Add tests --- .../model/plan/ItineraryTest.java | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index b7f07e0cd0c..595da58de5a 100644 --- a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -160,6 +160,28 @@ void walkBusBusWalkTrainWalk() { ); } + @Test + void walkSeparateFromBike() { + var itin = newItinerary(A, T11_00).walk(D2m, B).bicycle(T11_05, T11_15, D).walk(D3m, E).build(); + + assertEquals(ofMinutes(15), itin.getNonTransitDuration()); + assertEquals(ofMinutes(5), itin.walkDuration()); + + assertEquals(420, itin.walkDistanceMeters()); + assertEquals(3420, itin.getNonTransitDistanceMeters()); + } + + @Test + void walkSeparateFromCar() { + var itin = newItinerary(A, T11_00).walk(D2m, B).carHail(D10m, D).walk(D3m, E).build(); + + assertEquals(ofMinutes(15), itin.getNonTransitDuration()); + assertEquals(ofMinutes(5), itin.walkDuration()); + + assertEquals(420, itin.walkDistanceMeters()); + assertEquals(15420.0, itin.getNonTransitDistanceMeters()); + } + @Test void legIndex() { var itinerary = newItinerary(A, T11_00) From c7631ff7e89d21b17a1d1f2bf2dc960bbf2db73d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 29 Jan 2024 16:18:40 +0100 Subject: [PATCH 0439/1688] Use getFirst and getLast --- .../model/plan/ItinerariesCalculateLegTotals.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java index 9bfd6d0757b..5274b005be3 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java @@ -33,8 +33,7 @@ int transfers() { } private void calculate(List legs) { - totalDuration = - Duration.between(legs.get(0).getStartTime(), legs.get(legs.size() - 1).getEndTime()); + totalDuration = Duration.between(legs.getFirst().getStartTime(), legs.getLast().getEndTime()); for (Leg leg : legs) { Duration dt = leg.getDuration(); From a8762307d6ad1daae85737de58a67d2039e983c7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 29 Jan 2024 21:16:14 +0100 Subject: [PATCH 0440/1688] Replace toString with full objects --- .../fares/impl/DefaultFareServiceTest.java | 73 ++++++++++++------- .../ext/fares/impl/FaresIntegrationTest.java | 8 +- 2 files changed, 52 insertions(+), 29 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index 3fca4b949e4..5f4317a5f4f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -18,6 +18,8 @@ import java.util.List; import org.junit.jupiter.api.Test; +import org.opentripplanner.model.fare.FareProduct; +import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.fare.ItineraryFares; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; @@ -28,6 +30,12 @@ class DefaultFareServiceTest implements PlanTestConstants { private static final Money TEN_DOLLARS = Money.usDollars(10); + private static final FareProduct OTHER_FEED_PRODUCT = FareProduct + .of(OTHER_FEED_ATTRIBUTE.getId(), "regular", TEN_DOLLARS) + .build(); + private static final FareProduct AIRPORT_TO_CITY_CENTER_PRODUCT = FareProduct + .of(AIRPORT_TO_CITY_CENTER_SET.getFareAttribute().getId(), "regular", TEN_DOLLARS) + .build(); @Test void noRules() { @@ -50,8 +58,10 @@ void simpleZoneBasedFare() { var legProducts = fare.getLegProducts().get(itin.getTransitLeg(0)); assertEquals( - "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", - legProducts.toString() + List.of( + new FareProductUse("1d270201-412b-3b86-80f6-92ab144fa2e5", AIRPORT_TO_CITY_CENTER_PRODUCT) + ), + legProducts ); } @@ -76,10 +86,20 @@ void applyToSeveralLegs() { var secondProducts = legProducts.get(secondLeg); assertEquals(firstProducts, secondProducts); - assertEquals( - "[FareProductUse[id=ddbf1572-18bc-3724-8b64-e1c7d5c8b6c6, product=FareProduct{id: 'F:free-transfers', name: 'regular', amount: $20.00}]]", - firstProducts.toString() + List.of( + new FareProductUse( + "ddbf1572-18bc-3724-8b64-e1c7d5c8b6c6", + FareProduct + .of( + FREE_TRANSFERS_IN_CITY_SET.getFareAttribute().getId(), + "regular", + TEN_DOLLARS.plus(TEN_DOLLARS) + ) + .build() + ) + ), + firstProducts ); } @@ -108,16 +128,18 @@ void shouldNotCombineInterlinedLegs() { var legProducts = fare.getLegProducts(); var firstLeg = itin.getLegs().getFirst(); - + var secondLeg = itin.getLegs().get(1); assertEquals( - "[FareProductUse[id=ccadd1d3-f284-31a4-9d58-0a300198950f, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", - legProducts.get(firstLeg).toString() + List.of( + new FareProductUse("ccadd1d3-f284-31a4-9d58-0a300198950f", AIRPORT_TO_CITY_CENTER_PRODUCT) + ), + legProducts.get(firstLeg) ); - - var secondLeg = itin.getLegs().get(1); assertEquals( - "[FareProductUse[id=c58974dd-9a2f-3f42-90ec-c62a7b0dfd51, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", - legProducts.get(secondLeg).toString() + List.of( + new FareProductUse("c58974dd-9a2f-3f42-90ec-c62a7b0dfd51", AIRPORT_TO_CITY_CENTER_PRODUCT) + ), + legProducts.get(secondLeg) ); } @@ -141,9 +163,6 @@ void unknownLeg() { assertEquals(AIRPORT_TO_CITY_CENTER_SET.getFareAttribute().getId(), fp.id()); assertEquals(TEN_DOLLARS, fp.price()); - var firstBusLeg = itin.firstTransitLeg().get(); - //assertEquals(List.of(firstBusLeg), fp.legs()); - var legProducts = fare.getLegProducts(); assertEquals(1, legProducts.size()); } @@ -174,13 +193,15 @@ void multipleFeeds() { var legProducts = result.getLegProducts(); var firstBusLeg = itin.getTransitLeg(0); assertEquals( - "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", - legProducts.get(firstBusLeg).toString() + List.of( + new FareProductUse("1d270201-412b-3b86-80f6-92ab144fa2e5", AIRPORT_TO_CITY_CENTER_PRODUCT) + ), + legProducts.get(firstBusLeg) ); var secondBusLeg = itin.getTransitLeg(2); assertEquals( - "[FareProductUse[id=678d201c-e839-35c3-ae7b-1bc3834da5e5, product=FareProduct{id: 'F2:other-feed-attribute', name: 'regular', amount: $10.00}]]", - legProducts.get(secondBusLeg).toString() + List.of(new FareProductUse("678d201c-e839-35c3-ae7b-1bc3834da5e5", OTHER_FEED_PRODUCT)), + legProducts.get(secondBusLeg) ); } @@ -204,16 +225,18 @@ void multipleFeedsWithTransfersWithinFeed() { var finalBusLeg = itin.getTransitLeg(4); assertEquals( - "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', name: 'regular', amount: $10.00}]]", - legProducts.get(firstBusLeg).toString() + List.of(new FareProductUse("5d0d58f4-b97a-38db-921c-8b5fc6392b54", OTHER_FEED_PRODUCT)), + legProducts.get(firstBusLeg) ); assertEquals( - "[FareProductUse[id=1d270201-412b-3b86-80f6-92ab144fa2e5, product=FareProduct{id: 'F:airport-to-city-center', name: 'regular', amount: $10.00}]]", - legProducts.get(secondBusLeg).toString() + List.of( + new FareProductUse("1d270201-412b-3b86-80f6-92ab144fa2e5", AIRPORT_TO_CITY_CENTER_PRODUCT) + ), + legProducts.get(secondBusLeg) ); assertEquals( - "[FareProductUse[id=5d0d58f4-b97a-38db-921c-8b5fc6392b54, product=FareProduct{id: 'F2:other-feed-attribute', name: 'regular', amount: $10.00}]]", - legProducts.get(finalBusLeg).toString() + List.of(new FareProductUse("5d0d58f4-b97a-38db-921c-8b5fc6392b54", OTHER_FEED_PRODUCT)), + legProducts.get(finalBusLeg) ); } diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index 7e114dae5ce..a7dd4a92311 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -76,11 +76,11 @@ public void testPortland() { .toInstant(); ItineraryFares fare = getFare(from, to, startTime, serverContext); + var fpu = List.copyOf(fare.getLegProducts().values()).getFirst(); + assertEquals(List.of(fpu), List.copyOf(fare.getLegProducts().values())); - assertEquals( - "[FareProductUse[id=26a5a5ee-c7db-37ad-be09-fa3afdce748b, product=FareProduct{id: 'prt:19', name: 'regular', amount: $2.00}]]", - fare.getLegProducts().values().toString() - ); + assertEquals(Money.usDollars(2f), fpu.product().price()); + assertEquals("prt:19", fpu.product().id().toString()); // long trip From 79218be5aa8fb8d74fd7c3bbd5d335225180f997 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 30 Jan 2024 10:25:39 +0100 Subject: [PATCH 0441/1688] Use walkDuration in Transmodel API --- .../apis/transmodel/model/plan/TripPatternType.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java index bbef4172c69..2238a39c139 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java @@ -136,8 +136,7 @@ public static GraphQLObjectType create( .name("walkTime") .description("How much time is spent walking, in seconds.") .type(ExtendedScalars.GraphQLLong) - // TODO This unfortunately include BIKE and CAR - .dataFetcher(env -> itinerary(env).getNonTransitDuration().toSeconds()) + .dataFetcher(env -> itinerary(env).walkDuration().toSeconds()) .build() ) .field( From 698076700bc9d54e615892e6c94f7104510b675d Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 30 Jan 2024 10:01:00 +0000 Subject: [PATCH 0442/1688] Add changelog entry for #5638 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 40b91bf47a6..35fc86ec3bc 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -83,6 +83,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Allow configuration of vector tiles base path [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) - Change Transmodel API path to `/otp/transmodel/v3` [#5637](https://github.com/opentripplanner/OpenTripPlanner/pull/5637) - Add flexibleArea to GroupStop Quays [#5625](https://github.com/opentripplanner/OpenTripPlanner/pull/5625) +- Pass-through should override transit-group-priority [#5638](https://github.com/opentripplanner/OpenTripPlanner/pull/5638) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 1180b48cf969b81042ff60b9f83feb7d2d3c7db5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 30 Jan 2024 12:26:07 +0200 Subject: [PATCH 0443/1688] Remove old type --- .../opentripplanner/apis/gtfs/schema.graphqls | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 62e0a9fc156..12ab3145c14 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -5489,24 +5489,6 @@ input BicycleWalkPreferencesCostInput { reluctance: Reluctance } -""" -Costs related to walking a scooter. -""" -input ScooterWalkPreferencesCostInput { - """ - A static cost that is added each time hopping on or off a scooter to start or end - scooter walking. However, this cost is not applied when getting on a rented scooter - for the first time or when getting off the scooter when returning the scooter. - """ - hopCost: Cost - - """ - A cost multiplier of scooter walking travel time. The multiplier is for how bad - walking the scooter is compared to being in transit for equal lengths of time. - """ - reluctance: Reluctance -} - """ Preferences related to walking (excluding walking a bicycle or a scooter). """ From 2813c8b0becb508d029321d4865a682107b7b19d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 30 Jan 2024 12:33:04 +0200 Subject: [PATCH 0444/1688] Rename hopCost/time -> mountDismountCost/Time --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 12ab3145c14..f01f7ae05c4 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -5468,7 +5468,7 @@ input BicycleWalkPreferencesInput { or when getting on the bicycle again. However, this is not applied when getting on a rented bicycle for the first time or off the bicycle when returning the bicycle. """ - hopTime: Duration + mountDismountTime: Duration } """ @@ -5480,7 +5480,7 @@ input BicycleWalkPreferencesCostInput { bicycle walking. However, this cost is not applied when getting on a rented bicycle for the first time or when getting off the bicycle when returning the bicycle. """ - hopCost: Cost + mountDismountCost: Cost """ A cost multiplier of bicycle walking travel time. The multiplier is for how bad From 391b643f436635c3d883290375a0046107309aa4 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Tue, 30 Jan 2024 14:30:28 +0100 Subject: [PATCH 0445/1688] Siri azure updaters: Reduce some log levels --- .../ext/siri/updater/azure/SiriAzureETUpdater.java | 4 ++-- .../ext/siri/updater/azure/SiriAzureSXUpdater.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java index 4ceaa0d3106..4b9a86618a5 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java @@ -57,7 +57,7 @@ protected void messageConsumer(ServiceBusReceivedMessageContext messageContext) MESSAGE_COUNTER.incrementAndGet(); if (MESSAGE_COUNTER.get() % 100 == 0) { - LOG.info("Total SIRI-ET messages received={}", MESSAGE_COUNTER.get()); + LOG.debug("Total SIRI-ET messages received={}", MESSAGE_COUNTER.get()); } processMessage(message.getBody().toString(), message.getMessageId()); @@ -169,7 +169,7 @@ private List getUpdates(String message, Str siri.getServiceDelivery().getEstimatedTimetableDeliveries().isEmpty() ) { if (siri.getHeartbeatNotification() != null) { - LOG.info("Received SIRI heartbeat message"); + LOG.debug("Received SIRI heartbeat message"); } else { LOG.warn("Empty Siri message {}: {}", id, message); } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java index a86145e79ea..8d33035b971 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java @@ -111,7 +111,7 @@ private Siri getSiri(String message, String id) throws XMLStreamException, JAXBE siri.getServiceDelivery().getSituationExchangeDeliveries().isEmpty() ) { if (siri.getHeartbeatNotification() != null) { - LOG.info("Received SIRI heartbeat message"); + LOG.debug("Received SIRI heartbeat message"); } else { LOG.warn("Empty Siri message for messageId {}", id); LOG.debug(message); From 4410fb10d519007e0c45a87928e00022149cac73 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 30 Jan 2024 16:08:42 +0200 Subject: [PATCH 0446/1688] Rename hopCost/Time -> mountDismountCost/Time in prefs --- docs/RouteRequest.md | 8 +-- .../resources/RequestToPreferencesMapper.java | 4 +- .../apis/gtfs/mapping/RouteRequestMapper.java | 4 +- .../preference/VehicleWalkingPreferences.java | 50 +++++++++---------- .../routerequest/VehicleWalkingConfig.java | 12 ++--- .../street/model/edge/BikeWalkableEdge.java | 12 +++-- .../VehicleWalkingPreferencesTest.java | 20 ++++---- .../street/integration/BikeWalkingTest.java | 5 +- .../street/model/edge/StreetEdgeTest.java | 4 +- 9 files changed, 63 insertions(+), 56 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 199eda8a332..4cae701db57 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -78,8 +78,8 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |       [safety](#rd_bicycle_triangle_safety) | `double` | Relative importance of safety (range 0-1). | *Optional* | `0.0` | 2.0 | |       time | `double` | Relative importance of duration of travel (range 0-1). | *Optional* | `0.0` | 2.0 | |    walk | `object` | Preferences for walking a vehicle. | *Optional* | | 2.5 | -|       [hopCost](#rd_bicycle_walk_hopCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | -|       [hopTime](#rd_bicycle_walk_hopTime) | `duration` | The time it takes the user to hop on or off a vehicle. | *Optional* | `"PT0S"` | 2.0 | +|       [mountDismountCost](#rd_bicycle_walk_mountDismountCost) | `integer` | The cost of hopping on or off a vehicle. | *Optional* | `0` | 2.0 | +|       [mountDismountTime](#rd_bicycle_walk_mountDismountTime) | `duration` | The time it takes the user to hop on or off a vehicle. | *Optional* | `"PT0S"` | 2.0 | |       reluctance | `double` | A multiplier for how bad walking with a vehicle is, compared to being in transit for equal lengths of time. | *Optional* | `5.0` | 2.1 | |       speed | `double` | The user's vehicle walking speed in meters/second. Defaults to approximately 3 MPH. | *Optional* | `1.33` | 2.1 | |       stairsReluctance | `double` | How bad is it to walk the vehicle up/down a flight of stairs compared to taking a detour. | *Optional* | `10.0` | 2.3 | @@ -525,7 +525,7 @@ This factor can also include other concerns such as convenience and general cycl preferences by taking into account road surface etc. -

      hopCost

      +

      mountDismountCost

      **Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` **Path:** /routingDefaults/bicycle/walk @@ -536,7 +536,7 @@ There are different parameters for the cost of renting or parking a vehicle and not meant for controlling the cost of those events. -

      hopTime

      +

      mountDismountTime

      **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` **Path:** /routingDefaults/bicycle/walk diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index bfac498ff8c..bf44da6be00 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -89,8 +89,8 @@ private void mapBike() { bike.withWalking(walk -> { setIfNotNull(req.bikeWalkingSpeed, walk::withSpeed); setIfNotNull(req.bikeWalkingReluctance, walk::withReluctance); - setIfNotNull(req.bikeSwitchTime, walk::withHopTime); - setIfNotNull(req.bikeSwitchCost, walk::withHopCost); + setIfNotNull(req.bikeSwitchTime, walk::withMountDismountTime); + setIfNotNull(req.bikeSwitchCost, walk::withMountDismountCost); }); }); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 212bfbcf380..5bc00cb7a85 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -340,8 +340,8 @@ private static void setVehicleWalkingPreferences( ) { callWith.argument("bikeWalkingReluctance", walking::withReluctance); callWith.argument("bikeWalkingSpeed", walking::withSpeed); - callWith.argument("bikeSwitchTime", time -> walking.withHopTime((int) time)); - callWith.argument("bikeSwitchCost", cost -> walking.withHopCost((int) cost)); + callWith.argument("bikeSwitchTime", time -> walking.withMountDismountTime((int) time)); + callWith.argument("bikeSwitchCost", cost -> walking.withMountDismountCost((int) cost)); } private static class CallerWithEnvironment { diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java index aa3631e1c6b..b7adc04df1c 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferences.java @@ -19,15 +19,15 @@ public class VehicleWalkingPreferences implements Serializable { private final double speed; private final double reluctance; - private final Duration hopTime; - private final Cost hopCost; + private final Duration mountDismountTime; + private final Cost mountDismountCost; private final double stairsReluctance; private VehicleWalkingPreferences() { this.speed = 1.33; this.reluctance = 5.0; - this.hopTime = Duration.ZERO; - this.hopCost = Cost.ZERO; + this.mountDismountTime = Duration.ZERO; + this.mountDismountCost = Cost.ZERO; // very high reluctance to carry the bike up/down a flight of stairs this.stairsReluctance = 10; } @@ -39,8 +39,8 @@ private VehicleWalkingPreferences() { private VehicleWalkingPreferences(Builder builder) { this.speed = Units.speed(builder.speed); this.reluctance = Units.reluctance(builder.reluctance); - this.hopTime = Duration.ofSeconds(Units.duration(builder.hopTime)); - this.hopCost = Cost.costOfSeconds(builder.hopCost); + this.mountDismountTime = Duration.ofSeconds(Units.duration(builder.mountDismountTime)); + this.mountDismountCost = Cost.costOfSeconds(builder.mountDismountCost); this.stairsReluctance = Units.reluctance(builder.stairsReluctance); } @@ -73,13 +73,13 @@ public double reluctance() { } /** Time to get on and off your own vehicle. */ - public Duration hopTime() { - return hopTime; + public Duration mountDismountTime() { + return mountDismountTime; } /** Cost of getting on and off your own vehicle. */ - public Cost hopCost() { - return hopCost; + public Cost mountDismountCost() { + return mountDismountCost; } /** Reluctance of walking carrying a vehicle up a flight of stairs. */ @@ -95,15 +95,15 @@ public boolean equals(Object o) { return ( speed == that.speed && reluctance == that.reluctance && - Objects.equals(hopTime, that.hopTime) && - Objects.equals(hopCost, that.hopCost) && + Objects.equals(mountDismountTime, that.mountDismountTime) && + Objects.equals(mountDismountCost, that.mountDismountCost) && stairsReluctance == that.stairsReluctance ); } @Override public int hashCode() { - return Objects.hash(speed, reluctance, hopTime, hopCost, stairsReluctance); + return Objects.hash(speed, reluctance, mountDismountTime, mountDismountCost, stairsReluctance); } @Override @@ -112,8 +112,8 @@ public String toString() { .of(VehicleWalkingPreferences.class) .addNum("speed", speed, DEFAULT.speed) .addNum("reluctance", reluctance, DEFAULT.reluctance) - .addObj("hopTime", hopTime, DEFAULT.hopTime) - .addObj("hopCost", hopCost, DEFAULT.hopCost) + .addObj("mountDismountTime", mountDismountTime, DEFAULT.mountDismountTime) + .addObj("mountDismountCost", mountDismountCost, DEFAULT.mountDismountCost) .addNum("stairsReluctance", stairsReluctance, DEFAULT.stairsReluctance) .toString(); } @@ -123,16 +123,16 @@ public static class Builder { private final VehicleWalkingPreferences original; private double speed; private double reluctance; - private int hopTime; - private int hopCost; + private int mountDismountTime; + private int mountDismountCost; private double stairsReluctance; private Builder(VehicleWalkingPreferences original) { this.original = original; this.speed = original.speed; this.reluctance = original.reluctance; - this.hopTime = (int) original.hopTime.toSeconds(); - this.hopCost = original.hopCost.toSeconds(); + this.mountDismountTime = (int) original.mountDismountTime.toSeconds(); + this.mountDismountCost = original.mountDismountCost.toSeconds(); this.stairsReluctance = original.stairsReluctance; } @@ -146,18 +146,18 @@ public VehicleWalkingPreferences.Builder withReluctance(double reluctance) { return this; } - public VehicleWalkingPreferences.Builder withHopTime(Duration hopTime) { - this.hopTime = (int) hopTime.toSeconds(); + public VehicleWalkingPreferences.Builder withMountDismountTime(Duration mountDismountTime) { + this.mountDismountTime = (int) mountDismountTime.toSeconds(); return this; } - public VehicleWalkingPreferences.Builder withHopTime(int hopTime) { - this.hopTime = hopTime; + public VehicleWalkingPreferences.Builder withMountDismountTime(int mountDismountTime) { + this.mountDismountTime = mountDismountTime; return this; } - public VehicleWalkingPreferences.Builder withHopCost(int hopCost) { - this.hopCost = hopCost; + public VehicleWalkingPreferences.Builder withMountDismountCost(int mountDismountCost) { + this.mountDismountCost = mountDismountCost; return this; } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java index f2ba922c8e3..2b20e12f755 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/VehicleWalkingConfig.java @@ -43,9 +43,9 @@ private static void mapVehicleWalkingPreferences( ) .asDouble(dft.reluctance()) ) - .withHopTime( + .withMountDismountTime( c - .of("hopTime") + .of("mountDismountTime") .since(V2_0) .summary("The time it takes the user to hop on or off a vehicle.") .description( @@ -54,11 +54,11 @@ private static void mapVehicleWalkingPreferences( for controlling the duration of those events. """ ) - .asDuration(dft.hopTime()) + .asDuration(dft.mountDismountTime()) ) - .withHopCost( + .withMountDismountCost( c - .of("hopCost") + .of("mountDismountCost") .since(V2_0) .summary("The cost of hopping on or off a vehicle.") .description( @@ -67,7 +67,7 @@ private static void mapVehicleWalkingPreferences( not meant for controlling the cost of those events. """ ) - .asInt(dft.hopCost().toSeconds()) + .asInt(dft.mountDismountCost().toSeconds()) ) .withStairsReluctance( c diff --git a/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java b/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java index 799a5b006e6..7f61982434d 100644 --- a/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java +++ b/src/main/java/org/opentripplanner/street/model/edge/BikeWalkableEdge.java @@ -17,8 +17,10 @@ default void switchToWalkingBike(RoutingPreferences preferences, StateEditor edi editor.setBackWalkingBike(true); if (shouldIncludeCost) { - editor.incrementWeight(preferences.bike().walking().hopCost().toSeconds()); - editor.incrementTimeInSeconds((int) preferences.bike().walking().hopTime().toSeconds()); + editor.incrementWeight(preferences.bike().walking().mountDismountCost().toSeconds()); + editor.incrementTimeInSeconds( + (int) preferences.bike().walking().mountDismountTime().toSeconds() + ); } } @@ -28,8 +30,10 @@ default void switchToBiking(RoutingPreferences preferences, StateEditor editor) editor.setBackWalkingBike(false); if (shouldIncludeCost) { - editor.incrementWeight(preferences.bike().walking().hopCost().toSeconds()); - editor.incrementTimeInSeconds((int) preferences.bike().walking().hopTime().toSeconds()); + editor.incrementWeight(preferences.bike().walking().mountDismountCost().toSeconds()); + editor.incrementTimeInSeconds( + (int) preferences.bike().walking().mountDismountTime().toSeconds() + ); } } diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java index 9571eee8cc5..fdc416d7c0f 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/VehicleWalkingPreferencesTest.java @@ -11,8 +11,8 @@ class VehicleWalkingPreferencesTest { private static final double SPEED = 1.45; private static final double RELUCTANCE = 5.5; - private static final Duration HOP_TIME = Duration.ofSeconds(15); - private static final Cost HOP_COST = Cost.costOfSeconds(20); + private static final Duration MOUNT_DISMOUNT_TIME = Duration.ofSeconds(15); + private static final Cost MOUNT_DISMOUNT_COST = Cost.costOfSeconds(20); private static final double STAIRS_RELUCTANCE = 11; private final VehicleWalkingPreferences subject = createPreferences(); @@ -28,13 +28,13 @@ void reluctance() { } @Test - void hopTime() { - assertEquals(HOP_TIME, subject.hopTime()); + void mountDismountTime() { + assertEquals(MOUNT_DISMOUNT_TIME, subject.mountDismountTime()); } @Test - void hopCost() { - assertEquals(HOP_COST, subject.hopCost()); + void mountDismountCost() { + assertEquals(MOUNT_DISMOUNT_COST, subject.mountDismountCost()); } @Test @@ -57,8 +57,8 @@ void testToString() { "VehicleWalkingPreferences{" + "speed: 1.45, " + "reluctance: 5.5, " + - "hopTime: PT15S, " + - "hopCost: $20, " + + "mountDismountTime: PT15S, " + + "mountDismountCost: $20, " + "stairsReluctance: 11.0}", subject.toString() ); @@ -69,8 +69,8 @@ private VehicleWalkingPreferences createPreferences() { .of() .withSpeed(SPEED) .withReluctance(RELUCTANCE) - .withHopTime(HOP_TIME) - .withHopCost(HOP_COST.toSeconds()) + .withMountDismountTime(MOUNT_DISMOUNT_TIME) + .withMountDismountCost(MOUNT_DISMOUNT_COST.toSeconds()) .withStairsReluctance(STAIRS_RELUCTANCE) .build(); } diff --git a/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java b/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java index 417f1b87347..41ec677b3bb 100644 --- a/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java +++ b/src/test/java/org/opentripplanner/street/integration/BikeWalkingTest.java @@ -375,7 +375,10 @@ private List runStreetSearchAndCreateDescriptor( preferences .withWalk(w -> w.withSpeed(10)) .withBike(it -> - it.withSpeed(20d).withWalking(w -> w.withSpeed(5d).withHopTime(100).withHopCost(1000)) + it + .withSpeed(20d) + .withWalking(w -> w.withSpeed(5d).withMountDismountTime(100).withMountDismountCost(1000) + ) ) ); request.setArriveBy(arriveBy); diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 42d841b9fa3..ed5768d4a1a 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -221,7 +221,7 @@ public void testBikeSwitch() { StreetSearchRequestBuilder noPenalty = StreetSearchRequest.copyOf(proto); noPenalty.withPreferences(p -> - p.withBike(it -> it.withWalking(w -> w.withHopTime(0).withHopCost(0))) + p.withBike(it -> it.withWalking(w -> w.withMountDismountTime(0).withMountDismountCost(0))) ); State s0 = new State(v0, noPenalty.withMode(StreetMode.BIKE).build()); @@ -231,7 +231,7 @@ public void testBikeSwitch() { StreetSearchRequestBuilder withPenalty = StreetSearchRequest.copyOf(proto); withPenalty.withPreferences(p -> - p.withBike(it -> it.withWalking(w -> w.withHopTime(42).withHopCost(23))) + p.withBike(it -> it.withWalking(w -> w.withMountDismountTime(42).withMountDismountCost(23))) ); State s4 = new State(v0, withPenalty.withMode(StreetMode.BIKE).build()); From 923551847bfd2aea2971ef5fadaf72b8d6872cfd Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 30 Jan 2024 23:36:22 +0100 Subject: [PATCH 0447/1688] Fix spelling of realtimeArrival --- .../org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java | 2 +- .../org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java index 46607cccb6a..38041304c1c 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripTimeMapper.java @@ -29,7 +29,7 @@ public static ApiTripTimeShort mapToApi(TripTimeOnDate domain) { api.stopCount = domain.getStopCount(); api.scheduledArrival = domain.getScheduledArrival(); api.scheduledDeparture = domain.getScheduledDeparture(); - api.realimeArrival = domain.getRealtimeArrival(); + api.realtimeArrival = domain.getRealtimeArrival(); api.realtimeDeparture = domain.getRealtimeDeparture(); api.arrivalDelay = domain.getArrivalDelay(); api.departureDelay = domain.getDepartureDelay(); diff --git a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java index c0337ba18d4..bab8e9a6977 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/model/ApiTripTimeShort.java @@ -11,7 +11,7 @@ public class ApiTripTimeShort implements Serializable { public int stopCount; public int scheduledArrival = UNDEFINED; public int scheduledDeparture = UNDEFINED; - public int realimeArrival = UNDEFINED; + public int realtimeArrival = UNDEFINED; public int realtimeDeparture = UNDEFINED; public int arrivalDelay = UNDEFINED; public int departureDelay = UNDEFINED; From 4596d2d78675e9b7ed2ee5556d7c3b64027bea38 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 31 Jan 2024 14:24:11 +0100 Subject: [PATCH 0448/1688] Remove instanceOf --- .../model/plan/ItinerariesCalculateLegTotals.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java index 5274b005be3..77287990496 100644 --- a/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java +++ b/src/main/java/org/opentripplanner/model/plan/ItinerariesCalculateLegTotals.java @@ -43,13 +43,13 @@ private void calculate(List legs) { if (!leg.isInterlinedWithPreviousLeg()) { ++nTransitLegs; } - } else if (leg instanceof StreetLeg streetLeg) { + } else if (leg.isStreetLeg()) { nonTransitDuration = nonTransitDuration.plus(dt); nonTransitDistanceMeters += leg.getDistanceMeters(); - if (streetLeg.isWalkingLeg()) { - walkDuration = walkDuration.plus(streetLeg.getDuration()); - walkDistanceMeters = walkDistanceMeters + streetLeg.getDistanceMeters(); + if (leg.isWalkingLeg()) { + walkDuration = walkDuration.plus(leg.getDuration()); + walkDistanceMeters = walkDistanceMeters + leg.getDistanceMeters(); } } else if (leg instanceof UnknownTransitPathLeg unknownTransitPathLeg) { nTransitLegs += unknownTransitPathLeg.getNumberOfTransfers() + 1; From 961013204cbea9df1239d32bad16a1684bfe24b4 Mon Sep 17 00:00:00 2001 From: eibakke Date: Wed, 31 Jan 2024 15:46:53 +0100 Subject: [PATCH 0449/1688] Refactors GroupStopBuilder addLocation method. It now simply adds the geometry of the location to the geometry collection of the GroupStop. It was unclear what the large (100x100 degree) envelopes around regular stops were doing. It looked like a bug, and the geometry of GroupStops appears unused so it should be safe to change. --- .../transit/model/site/GroupStopBuilder.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index 8873e6ede99..a8db22b1368 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.function.IntSupplier; import javax.annotation.Nonnull; -import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; import org.opentripplanner.framework.geometry.GeometryUtils; @@ -69,6 +68,17 @@ public I18NString name() { } public GroupStopBuilder addLocation(StopLocation location) { + if ( + !( + location.getStopType() == StopType.REGULAR || + location.getStopType() == StopType.FLEXIBLE_AREA + ) + ) { + throw new RuntimeException( + "Unsupported location for GroupStop. Must be Regular or FlexibleArea." + ); + } + stopLocations.add(location); int numGeometries = geometry.getNumGeometries(); @@ -76,17 +86,8 @@ public GroupStopBuilder addLocation(StopLocation location) { for (int i = 0; i < numGeometries; i++) { newGeometries[i] = geometry.getGeometryN(i); } - if (location instanceof RegularStop) { - WgsCoordinate coordinate = location.getCoordinate(); - Envelope envelope = new Envelope(coordinate.asJtsCoordinate()); - double xscale = Math.cos(coordinate.latitude() * Math.PI / 180); - envelope.expandBy(100 / xscale, 100); - newGeometries[numGeometries] = GeometryUtils.getGeometryFactory().toGeometry(envelope); - } else if (location instanceof AreaStop) { - newGeometries[numGeometries] = location.getGeometry(); - } else { - throw new RuntimeException("Unknown location type"); - } + newGeometries[numGeometries] = location.getGeometry(); + geometry = new GeometryCollection(newGeometries, GeometryUtils.getGeometryFactory()); centroid = new WgsCoordinate(geometry.getCentroid()); From 195bb633401b3f400bc112303f866805b49a7d7d Mon Sep 17 00:00:00 2001 From: eibakke Date: Wed, 31 Jan 2024 15:46:53 +0100 Subject: [PATCH 0450/1688] Refactors GroupStopBuilder addLocation method. It now simply adds the geometry of the location to the geometry collection of the GroupStop. It was unclear what the large (100x100 degree) envelopes around regular stops were doing. It looked like a bug, and the geometry of GroupStops appears unused so it should be safe to change. --- .../transit/model/site/GroupStopBuilder.java | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index 8873e6ede99..a8db22b1368 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -4,7 +4,6 @@ import java.util.List; import java.util.function.IntSupplier; import javax.annotation.Nonnull; -import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.GeometryCollection; import org.opentripplanner.framework.geometry.GeometryUtils; @@ -69,6 +68,17 @@ public I18NString name() { } public GroupStopBuilder addLocation(StopLocation location) { + if ( + !( + location.getStopType() == StopType.REGULAR || + location.getStopType() == StopType.FLEXIBLE_AREA + ) + ) { + throw new RuntimeException( + "Unsupported location for GroupStop. Must be Regular or FlexibleArea." + ); + } + stopLocations.add(location); int numGeometries = geometry.getNumGeometries(); @@ -76,17 +86,8 @@ public GroupStopBuilder addLocation(StopLocation location) { for (int i = 0; i < numGeometries; i++) { newGeometries[i] = geometry.getGeometryN(i); } - if (location instanceof RegularStop) { - WgsCoordinate coordinate = location.getCoordinate(); - Envelope envelope = new Envelope(coordinate.asJtsCoordinate()); - double xscale = Math.cos(coordinate.latitude() * Math.PI / 180); - envelope.expandBy(100 / xscale, 100); - newGeometries[numGeometries] = GeometryUtils.getGeometryFactory().toGeometry(envelope); - } else if (location instanceof AreaStop) { - newGeometries[numGeometries] = location.getGeometry(); - } else { - throw new RuntimeException("Unknown location type"); - } + newGeometries[numGeometries] = location.getGeometry(); + geometry = new GeometryCollection(newGeometries, GeometryUtils.getGeometryFactory()); centroid = new WgsCoordinate(geometry.getCentroid()); From c0ebcbef4a88af8752ad3dd26bc866932edd5bf2 Mon Sep 17 00:00:00 2001 From: eibakke Date: Thu, 1 Feb 2024 13:56:49 +0100 Subject: [PATCH 0451/1688] Adds unit test for GroupStop's geometry and encompassingAreaGeometry. --- .../transit/model/site/GroupStopBuilder.java | 7 ++- .../transit/model/site/GroupStopTest.java | 58 ++++++++++++++++++- 2 files changed, 63 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java index a8db22b1368..64cad9325d1 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStopBuilder.java @@ -75,7 +75,12 @@ public GroupStopBuilder addLocation(StopLocation location) { ) ) { throw new RuntimeException( - "Unsupported location for GroupStop. Must be Regular or FlexibleArea." + String.format( + "Unsupported location for %s. Must be %s or %s.", + GroupStop.class.getSimpleName(), + StopType.REGULAR, + StopType.FLEXIBLE_AREA + ) ); } diff --git a/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java b/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java index 17938131eef..dcf9bc3aeed 100644 --- a/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java +++ b/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java @@ -6,7 +6,12 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; +import java.util.List; +import java.util.Objects; import org.junit.jupiter.api.Test; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -14,7 +19,7 @@ class GroupStopTest { - private static TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); private static final String ID = "1"; private static final I18NString NAME = new NonLocalizedString("name"); @@ -27,6 +32,57 @@ class GroupStopTest { .addLocation(STOP_LOCATION) .build(); + @Test + void testGroupStopGeometry() { + StopLocation stopLocation1 = TEST_MODEL.stop("1:stop", 1d, 1d).build(); + StopLocation stopLocation2 = TEST_MODEL.stop("2:stop", 2d, 2d).build(); + + GroupStop groupStop = StopModel + .of() + .groupStop(TransitModelForTest.id(ID)) + .withName(NAME) + .addLocation(stopLocation1) + .addLocation(stopLocation2) + .build(); + + Geometry groupStopGeometry1 = Objects.requireNonNull(groupStop.getGeometry()).getGeometryN(0); + assertEquals(stopLocation1.getGeometry(), groupStopGeometry1); + + Geometry groupStopGeometry2 = Objects.requireNonNull(groupStop.getGeometry()).getGeometryN(1); + assertEquals(stopLocation2.getGeometry(), groupStopGeometry2); + } + + @Test + void testGroupStopEncompassingAreaGeometry() { + Geometry encompassingAreaGeometry = GeometryUtils + .getGeometryFactory() + .toGeometry(new Envelope(1d, 2d, 1d, 2d)); + + StopLocation stopLocation = TEST_MODEL + .stop( + "1:stop", + encompassingAreaGeometry.getCentroid().getX(), + encompassingAreaGeometry.getCentroid().getY() + ) + .build(); + + GroupStop groupStop = StopModel + .of() + .groupStop(TransitModelForTest.id(ID)) + .withName(NAME) + .addLocation(stopLocation) + .withEncompassingAreaGeometries(List.of(encompassingAreaGeometry)) + .build(); + + Geometry groupStopGeometry = Objects.requireNonNull(groupStop.getGeometry()).getGeometryN(0); + assertEquals(stopLocation.getGeometry(), groupStopGeometry); + + assertEquals( + encompassingAreaGeometry, + groupStop.getEncompassingAreaGeometry().orElseThrow().getGeometryN(0) + ); + } + @Test void copy() { assertEquals(ID, subject.getId().getId()); From 006bcbec5695eb1e09fdf2df9888ea8c36827158 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 1 Feb 2024 13:05:35 +0000 Subject: [PATCH 0452/1688] Add changelog entry for #5483 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 35fc86ec3bc..59d762fb58c 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -84,6 +84,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Change Transmodel API path to `/otp/transmodel/v3` [#5637](https://github.com/opentripplanner/OpenTripPlanner/pull/5637) - Add flexibleArea to GroupStop Quays [#5625](https://github.com/opentripplanner/OpenTripPlanner/pull/5625) - Pass-through should override transit-group-priority [#5638](https://github.com/opentripplanner/OpenTripPlanner/pull/5638) +- Introduce `generalizedCostPlusPenalty` to make cost comparsion fairer [#5483](https://github.com/opentripplanner/OpenTripPlanner/pull/5483) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 34bd9bb35e1f30ba2f19be2e0ed4f11c1316039f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 28 Sep 2023 10:58:23 +0200 Subject: [PATCH 0453/1688] Remove VehicleToStopHeuristics --- docs/Configuration.md | 1 - docs/SandboxExtension.md | 1 - docs/examples/entur/otp-config.json | 3 +- docs/sandbox/VehicleToStopHeuristics.md | 77 ------------- mkdocs.yml | 1 - .../BikeToStopSkipEdgeStrategy.java | 58 ---------- .../VehicleToStopSkipEdgeStrategy.java | 109 ------------------ .../framework/application/OTPFeature.java | 3 +- .../module/NearbyStopFinder.java | 47 ++------ 9 files changed, 9 insertions(+), 291 deletions(-) delete mode 100644 docs/sandbox/VehicleToStopHeuristics.md delete mode 100644 src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/BikeToStopSkipEdgeStrategy.java delete mode 100644 src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/VehicleToStopSkipEdgeStrategy.java diff --git a/docs/Configuration.md b/docs/Configuration.md index 858edf0f9b4..93ca1fa6c1e 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -250,7 +250,6 @@ Here is a list of all features which can be toggled on/off and their default val | `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ | | `SandboxAPITravelTime` | Enable the isochrone/travel time surface API. | | ✓️ | | `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ | -| `VehicleToStopHeuristics` | Enable improved heuristic for park-and-ride queries. | | ✓️ | diff --git a/docs/SandboxExtension.md b/docs/SandboxExtension.md index 4b978313ca6..914be238da4 100644 --- a/docs/SandboxExtension.md +++ b/docs/SandboxExtension.md @@ -23,7 +23,6 @@ nearby stops generated by routing via OSM data. - [Park and Ride API](sandbox/ParkAndRideApi.md) - Park and Ride API - [Data Overlay](sandbox/DataOverlay.md) - StreetEdge grid data populating affecting the route planning - [Vehicle Parking](sandbox/VehicleParking.md) - Vehicle Parking updaters -- [Vehicle-to-stop heuristics](sandbox/VehicleToStopHeuristics.md) - Speeding up Park+Ride, Bike+Ride and Bike+Transit searches - [Travel Time (Isochrone & Surface) API](sandbox/TravelTime.md) - Travel Time API - [IBI accessibility score](sandbox/IBIAccessibilityScore.md) - IBI accessibility score - [Fares](sandbox/Fares.md) - Fare calculation diff --git a/docs/examples/entur/otp-config.json b/docs/examples/entur/otp-config.json index 1746cd186d4..a072a3d4f30 100644 --- a/docs/examples/entur/otp-config.json +++ b/docs/examples/entur/otp-config.json @@ -6,7 +6,6 @@ "OptimizeTransfers": true, "TransferConstraints": true, "ParallelRouting": false, - "ReportApi" : true, - "VehicleToStopHeuristics": true + "ReportApi" : true } } \ No newline at end of file diff --git a/docs/sandbox/VehicleToStopHeuristics.md b/docs/sandbox/VehicleToStopHeuristics.md deleted file mode 100644 index 3197bbdca9d..00000000000 --- a/docs/sandbox/VehicleToStopHeuristics.md +++ /dev/null @@ -1,77 +0,0 @@ -# Vehicle-to-Stop heuristics - OTP Sandbox Extension - -## Contact Info - -- Leonard Ehrenfried ([mail@leonard.io](mailto:mail@leonard.io)) - -## Changelog - -- Create initial - implementation [#3906](https://github.com/opentripplanner/OpenTripPlanner/pull/3906) - -## Documentation - -This feature is meant to improve the performance and result quality for routing requests where a -vehicle (car, bike, scooter) is ridden to a stop where transit is boarded. - -Before this feature existed a search for nearby stops was executed finding all candidate stops for -boarding transit. For walking this yields a low number of stops but when driving a car this can -easily mean to an entire city of stops, since the default was a drive of 45 minutes. - -Having a very long driving time has several problems: - -- the access search itself is comparatively slow -- having many candidate stops slows down the transit search as many routes have to be checked -- often the quickest route would be to drive almost all the way to the destination and board transit - for a single stop - -We did not want to lower the maximum access time since in rural regions 45 minutes might be a useful -maximum, but we want it to scale with the density of well-connected stops. - -### Vehicle-to-stop heuristic - -In order to improve the Park+Ride and Bike+Ride results we reduced the number of candidate stops -with the following heuristic: - -1. When a stop is encountered check which routes depart from it -2. Each route adds to an "importance score" -3. Modes which are fast (RAIL, SUBWAY, FERRY) have a higher score than for example BUS -4. Once a maximum score is reached, the search is complete - -The code for this is located in `VehicleToStopSkipEdgeStrategy.java`. - -### Bicycle-on-transit heuristic - -This heuristic works slightly differently in that it doesn't assign a score but simply stops the -access search when a certain number of routes were encountered that allow you to take your bike onto -transit. - -The code for this is located in `BikeToStopSkipEdgeStrategy.java`. - -### Configuration - -Enable the feature by adding it to the ```otp-config.json```: - -```json -// otp-config.json -{ - "otpFeatures": { - "VehicleToStopHeuristics": true - } -} -``` - -### Collaborators wanted - -Since the current settings, scores and weights are hardcoded in the source code we are looking for -collaborators that can help to make it more adaptable for different environments. - -These are some the goals for the future: - -- make the scores that are assigned for routes of a certain mode configurable in JSON -- pre-calculate stop importance scores during the graph build - -If you want to help making this feature more flexible, please -contact [Leonard Ehrenfried](mailto:mail@leonard.io) -or use the regular channels of communication outlined -in [CONTRIBUTING.md](https://github.com/opentripplanner/OpenTripPlanner/blob/dev-2.x/CONTRIBUTING.md#primary-channels-of-communication) \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index e4341b296fc..c4717d4d2e0 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -106,7 +106,6 @@ nav: - Park and Ride API: 'sandbox/ParkAndRideApi.md' - Data Overlay: 'sandbox/DataOverlay.md' - Vehicle Parking Updaters: 'sandbox/VehicleParking.md' - - Vehicle-to-stop Heuristics: 'sandbox/VehicleToStopHeuristics.md' - Geocoder API: 'sandbox/GeocoderAPI.md' - Travel Time Isochrones: 'sandbox/TravelTime.md' - IBI Accessibility Score: 'sandbox/IBIAccessibilityScore.md' diff --git a/src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/BikeToStopSkipEdgeStrategy.java b/src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/BikeToStopSkipEdgeStrategy.java deleted file mode 100644 index ad503b1212d..00000000000 --- a/src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/BikeToStopSkipEdgeStrategy.java +++ /dev/null @@ -1,58 +0,0 @@ -package org.opentripplanner.ext.vehicletostopheuristics; - -import java.util.Collection; -import java.util.function.Function; -import org.opentripplanner.astar.spi.SkipEdgeStrategy; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.search.state.State; -import org.opentripplanner.transit.model.network.BikeAccess; -import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.model.timetable.Trip; - -/** - * When wanting to take a bike onto transit we want to improve the performance by limiting the - * number of accesses to those stops which actually have trips where you can take the bike on. Once - * we have reached enough of trips we skip all further edges. - */ -public class BikeToStopSkipEdgeStrategy implements SkipEdgeStrategy { - - private static final int LIMIT = 100; - private static final double MAX_FACTOR = 1.2; - - private final Function> getTripsForStop; - - int numberOfBikeableTripsReached = 0; - double distanceLimit = Double.MAX_VALUE; - - public BikeToStopSkipEdgeStrategy(Function> getTripsForStop) { - this.getTripsForStop = getTripsForStop; - } - - public static boolean bikeAccessForTrip(Trip trip) { - if (trip.getBikesAllowed() != BikeAccess.UNKNOWN) { - return trip.getBikesAllowed() == BikeAccess.ALLOWED; - } - - return trip.getRoute().getBikesAllowed() == BikeAccess.ALLOWED; - } - - @Override - public boolean shouldSkipEdge(State current, Edge edge) { - if ( - current.getVertex() instanceof TransitStopVertex stopVertex && - distanceLimit == Double.MAX_VALUE - ) { - numberOfBikeableTripsReached += - getTripsForStop - .apply(stopVertex.getStop()) - .stream() - .filter(BikeToStopSkipEdgeStrategy::bikeAccessForTrip) - .count(); - if (numberOfBikeableTripsReached >= LIMIT) { - distanceLimit = current.getWalkDistance() * MAX_FACTOR; - } - } - return current.getWalkDistance() > distanceLimit; - } -} diff --git a/src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/VehicleToStopSkipEdgeStrategy.java b/src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/VehicleToStopSkipEdgeStrategy.java deleted file mode 100644 index 3eb466f97b9..00000000000 --- a/src/ext/java/org/opentripplanner/ext/vehicletostopheuristics/VehicleToStopSkipEdgeStrategy.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.opentripplanner.ext.vehicletostopheuristics; - -import static org.opentripplanner.routing.api.request.StreetMode.BIKE_RENTAL; -import static org.opentripplanner.routing.api.request.StreetMode.BIKE_TO_PARK; -import static org.opentripplanner.routing.api.request.StreetMode.CAR_HAILING; -import static org.opentripplanner.routing.api.request.StreetMode.CAR_PICKUP; -import static org.opentripplanner.routing.api.request.StreetMode.CAR_RENTAL; -import static org.opentripplanner.routing.api.request.StreetMode.CAR_TO_PARK; -import static org.opentripplanner.routing.api.request.StreetMode.SCOOTER_RENTAL; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.function.Function; -import org.opentripplanner.astar.spi.SkipEdgeStrategy; -import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.routing.api.request.request.filter.TransitFilter; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.search.state.State; -import org.opentripplanner.transit.model.basic.TransitMode; -import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.site.RegularStop; - -/** - * This strategy terminates when enough "important" stops are found. - *

      - * The definition of important is a stop where many routes of mode RAIL, SUBWAY or FERRY depart. - *

      - * This means that the search radius scales with density of "important" stops: - *

      - *

    2. in a city the radius is quite small - *
    3. in more rural regions the radius is bigger and stops further away are considered - *

      - * The strategy is useful when you want to limit the number of accesses of Park+Ride, Bike+Ride and - * Bike+Transit: it improves both performance the quality of results. - *

      - * {@see https://github.com/opentripplanner/OpenTripPlanner/pull/3906} - */ -public class VehicleToStopSkipEdgeStrategy implements SkipEdgeStrategy { - - public static final Set applicableModes = Set.of( - BIKE_TO_PARK, - BIKE_RENTAL, - CAR_TO_PARK, - CAR_PICKUP, - CAR_HAILING, - CAR_RENTAL, - SCOOTER_RENTAL - ); - private final Function> getPatternsForStop; - private final int maxScore; - private final List filters; - private double sumOfScores; - - private final Set stopsCounted = new HashSet<>(); - - public VehicleToStopSkipEdgeStrategy( - Function> getPatternsForStop, - Collection filters - ) { - this.filters = new ArrayList<>(filters); - this.maxScore = 300; - this.getPatternsForStop = getPatternsForStop; - } - - @Override - public boolean shouldSkipEdge(State current, Edge edge) { - if (current.currentMode().isWalking()) { - if ( - current.getVertex() instanceof TransitStopVertex stopVertex && - !stopsCounted.contains(stopVertex.getStop().getId()) - ) { - // TODO: 2022-12-05 filters: check performance on that and verify that this is right. Previously we were filtering just on modes - var stop = stopVertex.getStop(); - - // Not using streams. Performance is important here - var patterns = getPatternsForStop.apply(stop); - var score = 0; - for (var pattern : patterns) { - for (var filter : filters) { - if (filter.matchTripPattern(pattern)) { - score += VehicleToStopSkipEdgeStrategy.score(pattern.getMode()); - break; - } - } - } - - stopsCounted.add(stop.getId()); - - sumOfScores = sumOfScores + score; - } - return false; - } else { - return sumOfScores >= maxScore; - } - } - - private static int score(TransitMode mode) { - return switch (mode) { - case RAIL, FERRY, SUBWAY -> 20; - case BUS -> 1; - default -> 2; - }; - } -} diff --git a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java index 4847b204077..4ae5004cf6b 100644 --- a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java +++ b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java @@ -105,8 +105,7 @@ public enum OTPFeature { SandboxAPIMapboxVectorTilesApi(false, true, "Enable Mapbox vector tiles API."), SandboxAPIParkAndRideApi(false, true, "Enable park-and-ride endpoint."), SandboxAPITravelTime(false, true, "Enable the isochrone/travel time surface API."), - TransferAnalyzer(false, true, "Analyze transfers during graph build."), - VehicleToStopHeuristics(false, true, "Enable improved heuristic for park-and-ride queries."); + TransferAnalyzer(false, true, "Analyze transfers during graph build."); private static final Object TEST_LOCK = new Object(); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index 360cdaee363..0cac2a21308 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -18,8 +18,6 @@ import org.opentripplanner.astar.strategy.MaxCountSkipEdgeStrategy; import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; import org.opentripplanner.ext.flex.trip.FlexTrip; -import org.opentripplanner.ext.vehicletostopheuristics.BikeToStopSkipEdgeStrategy; -import org.opentripplanner.ext.vehicletostopheuristics.VehicleToStopSkipEdgeStrategy; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.routing.api.request.RouteRequest; @@ -205,7 +203,7 @@ public List findNearbyStopsViaStreets( ShortestPathTree spt = StreetSearchBuilder .of() - .setSkipEdgeStrategy(getSkipEdgeStrategy(reverseDirection, request)) + .setSkipEdgeStrategy(getSkipEdgeStrategy()) .setDominanceFunction(new DominanceFunctions.MinimumWeight()) .setRequest(request) .setArriveBy(reverseDirection) @@ -271,48 +269,17 @@ private List findNearbyStopsViaDirectTransfers(Vertex vertex) { return directGraphFinder.findClosestStops(c0, limitMeters); } - private SkipEdgeStrategy getSkipEdgeStrategy( - boolean reverseDirection, - RouteRequest routingRequest - ) { + private SkipEdgeStrategy getSkipEdgeStrategy() { var durationSkipEdgeStrategy = new DurationSkipEdgeStrategy(durationLimit); - // if we compute the accesses for Park+Ride, Bike+Ride and Bike+Transit we don't want to - // search the full durationLimit as this returns way too many stops. - // this is both slow and returns suboptimal results as it favours long drives with short - // transit legs. - // therefore, we use a heuristic based on the number of routes and their mode to determine - // what are "good" stops for those accesses. if we have reached a threshold of "good" stops - // we stop the access search. - if ( - !reverseDirection && - OTPFeature.VehicleToStopHeuristics.isOn() && - VehicleToStopSkipEdgeStrategy.applicableModes.contains( - routingRequest.journey().access().mode() - ) - ) { - var strategy = new VehicleToStopSkipEdgeStrategy( - transitService::getPatternsForStop, - routingRequest.journey().transit().filters() + if (maxStopCount > 0) { + var strategy = new MaxCountSkipEdgeStrategy<>( + maxStopCount, + NearbyStopFinder::hasReachedStop ); - - return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); - } else if ( - OTPFeature.VehicleToStopHeuristics.isOn() && - routingRequest.journey().access().mode() == StreetMode.BIKE - ) { - var strategy = new BikeToStopSkipEdgeStrategy(transitService::getTripsForStop); return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); - } else { - if (maxStopCount > 0) { - var strategy = new MaxCountSkipEdgeStrategy<>( - maxStopCount, - NearbyStopFinder::hasReachedStop - ); - return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); - } - return durationSkipEdgeStrategy; } + return durationSkipEdgeStrategy; } private static List createDirectlyConnectedStops( From fa30c9c069883a910f14933c2d89b89df79320ce Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 16 Oct 2023 18:24:27 +0200 Subject: [PATCH 0454/1688] Set default cost for penalty --- .../framework/TimeAndCostPenaltyForEnum.java | 7 +++++++ .../preference/AccessEgressPreferences.java | 16 ++++++++++++++-- .../config/framework/json/ParameterBuilder.java | 5 +++-- .../config/routerequest/RouteRequestConfig.java | 6 +++++- .../config/framework/json/NodeAdapterTest.java | 12 ++++++++++-- 5 files changed, 39 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java b/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java index 60bd4d4c769..c45fc3e33a8 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java +++ b/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java @@ -81,6 +81,13 @@ private EnumMap copyValues() { return values.isEmpty() ? new EnumMap<>(type) : new EnumMap<>(values); } + /** + * Convert the values to an {@link EnumMap}. + */ + public EnumMap asEnumMap() { + return copyValues(); + } + private static > String toString( Class clazz, Map values diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java index db8845e7c41..54d761d1030 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java @@ -7,12 +7,12 @@ import java.util.Map; import java.util.Objects; import java.util.function.Consumer; -import org.opentripplanner.framework.model.Units; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.DurationForEnum; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenalty; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenaltyForEnum; +import org.opentripplanner.routing.api.request.framework.TimePenalty; /** * Preferences for access/egress routing on street network @@ -21,14 +21,26 @@ */ public final class AccessEgressPreferences implements Serializable { + private static final TimeAndCostPenalty DEFAULT_PENALTY = TimeAndCostPenalty.of( + TimePenalty.of(ofMinutes(10), 1.5f), + 2.5 + ); + private static final TimeAndCostPenaltyForEnum DEFAULT_TIME_AND_COST = TimeAndCostPenaltyForEnum + .of(StreetMode.class) + .with(StreetMode.CAR_TO_PARK, DEFAULT_PENALTY) + .with(StreetMode.CAR_HAILING, DEFAULT_PENALTY) + .with(StreetMode.CAR_RENTAL, DEFAULT_PENALTY) + .build(); + public static final AccessEgressPreferences DEFAULT = new AccessEgressPreferences(); + private final TimeAndCostPenaltyForEnum penalty; private final DurationForEnum maxDuration; private final int maxStopCount; private AccessEgressPreferences() { this.maxDuration = durationForStreetModeOf(ofMinutes(45)); - this.penalty = TimeAndCostPenaltyForEnum.ofDefault(StreetMode.class); + this.penalty = DEFAULT_TIME_AND_COST; this.maxStopCount = 500; } diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index f1d90d0ec40..088a7794585 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -303,14 +303,15 @@ public > Map asEnumMap(Class enumType, Class el */ public > Map asEnumMap( Class enumType, - Function typeMapper + Function typeMapper, + Map defaultValue ) { info.withOptional().withEnumMap(enumType, OBJECT); var mapNode = buildObject(); if (mapNode.isEmpty()) { - return Map.of(); + return defaultValue; } EnumMap result = new EnumMap<>(enumType); diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 4538f6de84d..264e50a6df1 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -472,7 +472,11 @@ the access legs used. In other cases where the access(CAR) is faster than transi extra cost, while 1.0 will add the same amount to both time and cost. """ ) - .asEnumMap(StreetMode.class, TimeAndCostPenaltyMapper::map) + .asEnumMap( + StreetMode.class, + TimeAndCostPenaltyMapper::map, + dftAccessEgress.penalty().asEnumMap() + ) ) .withMaxDuration( cae diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index f975579cbf5..be44d1ea86f 100644 --- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -225,15 +225,23 @@ public void asEnumMapWithCustomType() { NodeAdapter subject = newNodeAdapterForTest("{ key : { A: {a:'Foo'} } }"); assertEquals( Map.of(AnEnum.A, new ARecord("Foo")), - subject.of("key").asEnumMap(AnEnum.class, ARecord::fromJson) + subject.of("key").asEnumMap(AnEnum.class, ARecord::fromJson, Map.of()) ); assertEquals( Collections.emptyMap(), - subject.of("missing-key").asEnumMap(AnEnum.class, ARecord::fromJson) + subject.of("missing-key").asEnumMap(AnEnum.class, ARecord::fromJson, Map.of()) ); assertEquals(NON_UNUSED_PARAMETERS, unusedParams(subject)); } + @Test + public void asEnumMapWithDefaultValue() { + var subject = newNodeAdapterForTest("{}"); + final Map dflt = Map.of(AnEnum.A, new ARecord("Foo")); + assertEquals(dflt, subject.of("key").asEnumMap(AnEnum.class, ARecord::fromJson, dflt)); + assertEquals(NON_UNUSED_PARAMETERS, unusedParams(subject)); + } + @Test public void asEnumMapWithUnknownKey() { NodeAdapter subject = newNodeAdapterForTest("{ enumMap : { unknown : 7 } }"); From 2a63edf8c22cc44668c8261cdd78458a5ce39012 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 16 Oct 2023 23:27:19 +0200 Subject: [PATCH 0455/1688] Finetune default values --- docs/RouteRequest.md | 6 +++++- .../preference/AccessEgressPreferences.java | 4 ++-- .../config/routerequest/RouteRequestConfig.java | 16 ++++++++++++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 199eda8a332..791df446c89 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -406,7 +406,11 @@ since the search-window is increased with the same amount as the maximum penalty the access legs used. In other cases where the access(CAR) is faster than transit the performance will be better. -The default is no penalty, if not configured. +The default values are + +- CAR_TO_PARK = (timePenalty: 30m + 2.0 t, costFactor: 2.0) +- CAR_RENTAL = (timePenalty: 30m + 2.0 t, costFactor: 2.0) +- CAR_HAILING = (timePenalty: 30m + 2.0 t, costFactor: 2.0) Example: `"car-to-park" : { "timePenalty": "10m + 1.5t", "costFactor": 2.5 }` diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java index 54d761d1030..b967bd34f58 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java @@ -22,8 +22,8 @@ public final class AccessEgressPreferences implements Serializable { private static final TimeAndCostPenalty DEFAULT_PENALTY = TimeAndCostPenalty.of( - TimePenalty.of(ofMinutes(10), 1.5f), - 2.5 + TimePenalty.of(ofMinutes(30), 2f), + 2 ); private static final TimeAndCostPenaltyForEnum DEFAULT_TIME_AND_COST = TimeAndCostPenaltyForEnum .of(StreetMode.class) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 264e50a6df1..49596759063 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -15,6 +15,8 @@ import static org.opentripplanner.standalone.config.routerequest.WheelchairConfig.mapWheelchairPreferences; import java.time.Duration; +import java.util.List; +import java.util.stream.Collectors; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.routing.api.request.RequestModes; @@ -455,7 +457,9 @@ private static void mapStreetPreferences(NodeAdapter c, StreetPreferences.Builde the access legs used. In other cases where the access(CAR) is faster than transit the performance will be better. - The default is no penalty, if not configured. + The default values are + + %s Example: `"car-to-park" : { "timePenalty": "10m + 1.5t", "costFactor": 2.5 }` @@ -470,7 +474,15 @@ the access legs used. In other cases where the access(CAR) is faster than transi The `costFactor` is used to add an additional cost to the leg´s generalized-cost. The time-penalty is multiplied with the cost-factor. A cost-factor of zero, gives no extra cost, while 1.0 will add the same amount to both time and cost. - """ + """.formatted( + dftAccessEgress + .penalty() + .asEnumMap() + .entrySet() + .stream() + .map(s -> "- %s = %s".formatted(s.getKey(), s.getValue())) + .collect(Collectors.joining("\n")) + ) ) .asEnumMap( StreetMode.class, From f5e7caef0b778c9279f29c75ca9bf7c1b4feed92 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 16 Oct 2023 23:52:57 +0200 Subject: [PATCH 0456/1688] Improve tests and documentation --- docs/RouteRequest.md | 6 +++--- .../org/opentripplanner/framework/lang/StringUtils.java | 9 +++++++++ .../standalone/config/framework/json/EnumMapper.java | 7 ++----- .../standalone/config/framework/json/NodeInfo.java | 3 ++- .../config/routerequest/RouteRequestConfig.java | 8 +++++++- .../api/request/preference/StreetPreferencesTest.java | 5 ++--- 6 files changed, 25 insertions(+), 13 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 791df446c89..e90ea91b549 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -408,9 +408,9 @@ performance will be better. The default values are -- CAR_TO_PARK = (timePenalty: 30m + 2.0 t, costFactor: 2.0) -- CAR_RENTAL = (timePenalty: 30m + 2.0 t, costFactor: 2.0) -- CAR_HAILING = (timePenalty: 30m + 2.0 t, costFactor: 2.0) +- `car-to-park` = (timePenalty: 30m + 2.0 t, costFactor: 2.0) +- `car-rental` = (timePenalty: 30m + 2.0 t, costFactor: 2.0) +- `car-hailing` = (timePenalty: 30m + 2.0 t, costFactor: 2.0) Example: `"car-to-park" : { "timePenalty": "10m + 1.5t", "costFactor": 2.5 }` diff --git a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java index c726d03c66c..87613d61294 100644 --- a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java +++ b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java @@ -110,4 +110,13 @@ public static String padRight(String value, char ch, int width) { public static String quoteReplace(@Nonnull String text) { return text.replace('\'', '\"'); } + + /** + * Convert "HELLO_WORLD" or "Hello_World" to "hello-world". + *

      + * https://developer.mozilla.org/en-US/docs/Glossary/Kebab_case + */ + public static String kebabCase(String input) { + return input.toLowerCase().replace('_', '-'); + } } diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java index ce880058005..0e048a2e3e7 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/EnumMapper.java @@ -3,6 +3,7 @@ import java.util.Arrays; import java.util.Optional; import org.opentripplanner.framework.doc.DocumentedEnum; +import org.opentripplanner.framework.lang.StringUtils; public class EnumMapper { @@ -23,11 +24,7 @@ public static Optional> mapToEnum2(String text, Class en) { - return kebabCase(en.name()); - } - - public static String kebabCase(String input) { - return input.toLowerCase().replace('_', '-'); + return StringUtils.kebabCase(en.name()); } /** diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java index 296c07805f9..06675475fd1 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeInfo.java @@ -7,6 +7,7 @@ import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.framework.tostring.ValueObjectToStringBuilder; /** @@ -137,7 +138,7 @@ public List> enumTypeValues() { */ public String toMarkdownString(Object value) { if (enumType != null) { - value = EnumMapper.kebabCase(value.toString()); + value = StringUtils.kebabCase(value.toString()); } return type.quote(value); } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 49596759063..600579f5513 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -19,6 +19,7 @@ import java.util.stream.Collectors; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.framework.application.OTPFeature; +import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.routing.api.request.RequestModes; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; @@ -480,7 +481,12 @@ the access legs used. In other cases where the access(CAR) is faster than transi .asEnumMap() .entrySet() .stream() - .map(s -> "- %s = %s".formatted(s.getKey(), s.getValue())) + .map(s -> + "- `%s` = %s".formatted( + StringUtils.kebabCase(s.getKey().toString()), + s.getValue() + ) + ) .collect(Collectors.joining("\n")) ) ) diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java index 1d47337a312..08b102ea1bb 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java @@ -109,10 +109,9 @@ void testToString() { "routingTimeout: 3s, " + "elevator: ElevatorPreferences{boardTime: 2m}, " + "intersectionTraversalModel: CONSTANT, " + - "accessEgress: AccessEgressPreferences{" + - "penalty: TimeAndCostPenaltyForEnum{CAR_TO_PARK: " + + "accessEgress: AccessEgressPreferences{penalty: TimeAndCostPenaltyForEnum{CAR_TO_PARK: " + CAR_PENALTY + - "}, " + + ", CAR_RENTAL: (timePenalty: 30m + 2.0 t, costFactor: 2.0), CAR_HAILING: (timePenalty: 30m + 2.0 t, costFactor: 2.0)}, " + "maxDuration: DurationForStreetMode{default:5m}" + "}, " + "maxDirectDuration: DurationForStreetMode{default:10m}" + From 0ba3b9067b051a1e6a1ff6708acec0b186c4c587 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 18 Oct 2023 15:08:48 +0200 Subject: [PATCH 0457/1688] Decorate direct itineraries with accessEgressPenalty --- docs/RouteRequest.md | 7 +-- .../framework/lang/StringUtils.java | 2 +- .../DirectItineraryPenaltyDecorator.java | 54 +++++++++++++++++++ .../router/street/DirectStreetRouter.java | 7 ++- .../preference/AccessEgressPreferences.java | 5 +- .../__snapshots__/CarSnapshotTest.snap | 6 +-- 6 files changed, 71 insertions(+), 10 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index e90ea91b549..6e19d72564b 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -408,9 +408,10 @@ performance will be better. The default values are -- `car-to-park` = (timePenalty: 30m + 2.0 t, costFactor: 2.0) -- `car-rental` = (timePenalty: 30m + 2.0 t, costFactor: 2.0) -- `car-hailing` = (timePenalty: 30m + 2.0 t, costFactor: 2.0) +- `car-to-park` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) +- `car-rental` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) +- `car-hailing` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) +- `flexible` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) Example: `"car-to-park" : { "timePenalty": "10m + 1.5t", "costFactor": 2.5 }` diff --git a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java index 87613d61294..cbb32b9eaca 100644 --- a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java +++ b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java @@ -112,7 +112,7 @@ public static String quoteReplace(@Nonnull String text) { } /** - * Convert "HELLO_WORLD" or "Hello_World" to "hello-world". + * Convert "HELLO_WORLD" or "HellO_WorlD" to "hello-world". *

      * https://developer.mozilla.org/en-US/docs/Glossary/Kebab_case */ diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java new file mode 100644 index 00000000000..ec6a89ee64a --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java @@ -0,0 +1,54 @@ +package org.opentripplanner.routing.algorithm.raptoradapter.router.street; + +import java.util.List; +import java.util.Objects; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.model.plan.StreetLegBuilder; +import org.opentripplanner.routing.api.request.StreetMode; +import org.opentripplanner.routing.api.request.framework.TimeAndCostPenaltyForEnum; + +public class DirectItineraryPenaltyDecorator { + + private final StreetMode directMode; + private final TimeAndCostPenaltyForEnum penalty; + + public DirectItineraryPenaltyDecorator( + StreetMode directMode, + TimeAndCostPenaltyForEnum penalty + ) { + Objects.requireNonNull(directMode); + Objects.requireNonNull(penalty); + this.directMode = directMode; + this.penalty = penalty; + } + + public List applyPenalty(List itineraries) { + return itineraries + .stream() + .map(itin -> { + if (itin.hasTransit()) { + throw new IllegalArgumentException( + "The itinerary %s contains transit legs. No direct penalty can be applied.".formatted( + itin + ) + ); + } + var penalty = this.penalty.valueOf(directMode); + if (!penalty.isEmpty()) { + itin.transformStreetLegs(sl -> + StreetLegBuilder + .of(sl) + .withGeneralizedCost((int) (sl.getGeneralizedCost() * penalty.costFactor())) + .build() + ); + + var cost = itin.getLegs().stream().mapToInt(Leg::getGeneralizedCost).sum(); + + itin.setGeneralizedCost(cost); + } + return itin; + }) + .toList(); + } +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java index 2c6b09c2fb2..af004a66b1f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java @@ -61,7 +61,12 @@ public static List route(OtpServerRequestContext serverContext, Route directRequest.wheelchair(), directRequest.preferences().wheelchair() ); - return response; + + var decorator = new DirectItineraryPenaltyDecorator( + request.journey().modes().directMode, + request.preferences().street().accessEgress().penalty() + ); + return decorator.applyPenalty(response); } catch (PathNotFoundException e) { return Collections.emptyList(); } diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java index b967bd34f58..ada495b19ba 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java @@ -22,14 +22,15 @@ public final class AccessEgressPreferences implements Serializable { private static final TimeAndCostPenalty DEFAULT_PENALTY = TimeAndCostPenalty.of( - TimePenalty.of(ofMinutes(30), 2f), - 2 + TimePenalty.of(ofMinutes(20), 2f), + 1.5 ); private static final TimeAndCostPenaltyForEnum DEFAULT_TIME_AND_COST = TimeAndCostPenaltyForEnum .of(StreetMode.class) .with(StreetMode.CAR_TO_PARK, DEFAULT_PENALTY) .with(StreetMode.CAR_HAILING, DEFAULT_PENALTY) .with(StreetMode.CAR_RENTAL, DEFAULT_PENALTY) + .with(StreetMode.FLEXIBLE, DEFAULT_PENALTY) .build(); public static final AccessEgressPreferences DEFAULT = new AccessEgressPreferences(); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap index 8f527b15bf7..0ae0e948250 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap @@ -10,7 +10,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "details" : { }, "fare" : { } }, - "generalizedCost" : 467, + "generalizedCost": 518, "legs" : [ { "agencyTimeZoneOffset" : -25200000, @@ -25,7 +25,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "name" : "NW Pettygrove Ave. & NW 24th Ave. (P1)", "vertexType" : "NORMAL" }, - "generalizedCost" : 61, + "generalizedCost": 91, "interlineWithPreviousLeg" : false, "legGeometry" : { "length" : 5, @@ -144,7 +144,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ }, "vertexType" : "BIKEPARK" }, - "generalizedCost" : 285, + "generalizedCost": 427, "interlineWithPreviousLeg" : false, "legGeometry" : { "length" : 5, From 64cff4a6198d02e909e34b3681759b351d6a09ad Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 19 Oct 2023 11:30:33 +0200 Subject: [PATCH 0458/1688] Use correct enum value in Transmodel schema --- .../org/opentripplanner/apis/transmodel/schema.graphql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 25cf95ca2f9..dad106418fe 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -774,7 +774,7 @@ type QueryType { "Input type for executing a travel search for a trip between two locations. Returns trip patterns describing suggested alternatives for the trip." trip( "Time and cost penalty on access/egress modes." - accessEgressPenalty: [PenaltyForStreetMode!] = [], + accessEgressPenalty: [PenaltyForStreetMode!] = [{streetMode : car_park, timePenalty : "20m + 2.0 t", costFactor : 1.5}, {streetMode : flexible, timePenalty : "20m + 2.0 t", costFactor : 1.5}], "The alightSlack is the minimum extra time after exiting a public transport vehicle. This is the default value used, if not overridden by the 'alightSlackList'." alightSlackDefault: Int = 0, "List of alightSlack for a given set of modes. Defaults: []" From a4fed172e1fd507dc49c3842e6c22551be46f15f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 20 Oct 2023 10:47:05 +0200 Subject: [PATCH 0459/1688] Remove penalty for direct itineraries --- .../DirectItineraryPenaltyDecorator.java | 54 ------------------- .../router/street/DirectStreetRouter.java | 6 +-- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java deleted file mode 100644 index ec6a89ee64a..00000000000 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectItineraryPenaltyDecorator.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.opentripplanner.routing.algorithm.raptoradapter.router.street; - -import java.util.List; -import java.util.Objects; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.StreetLegBuilder; -import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.routing.api.request.framework.TimeAndCostPenaltyForEnum; - -public class DirectItineraryPenaltyDecorator { - - private final StreetMode directMode; - private final TimeAndCostPenaltyForEnum penalty; - - public DirectItineraryPenaltyDecorator( - StreetMode directMode, - TimeAndCostPenaltyForEnum penalty - ) { - Objects.requireNonNull(directMode); - Objects.requireNonNull(penalty); - this.directMode = directMode; - this.penalty = penalty; - } - - public List applyPenalty(List itineraries) { - return itineraries - .stream() - .map(itin -> { - if (itin.hasTransit()) { - throw new IllegalArgumentException( - "The itinerary %s contains transit legs. No direct penalty can be applied.".formatted( - itin - ) - ); - } - var penalty = this.penalty.valueOf(directMode); - if (!penalty.isEmpty()) { - itin.transformStreetLegs(sl -> - StreetLegBuilder - .of(sl) - .withGeneralizedCost((int) (sl.getGeneralizedCost() * penalty.costFactor())) - .build() - ); - - var cost = itin.getLegs().stream().mapToInt(Leg::getGeneralizedCost).sum(); - - itin.setGeneralizedCost(cost); - } - return itin; - }) - .toList(); - } -} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java index af004a66b1f..3c51f84fda4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java @@ -62,11 +62,7 @@ public static List route(OtpServerRequestContext serverContext, Route directRequest.preferences().wheelchair() ); - var decorator = new DirectItineraryPenaltyDecorator( - request.journey().modes().directMode, - request.preferences().street().accessEgress().penalty() - ); - return decorator.applyPenalty(response); + return response; } catch (PathNotFoundException e) { return Collections.emptyList(); } From a2d84d72176702190cf9c79426cfcd2ed761c5a2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 20 Oct 2023 10:53:06 +0200 Subject: [PATCH 0460/1688] Extract method for formatting default values --- .../routerequest/RouteRequestConfig.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 600579f5513..c4b0b0bd8cb 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -24,6 +24,7 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.CostLinearFunction; +import org.opentripplanner.routing.api.request.preference.AccessEgressPreferences; import org.opentripplanner.routing.api.request.preference.BikePreferences; import org.opentripplanner.routing.api.request.preference.CarPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; @@ -476,18 +477,7 @@ the access legs used. In other cases where the access(CAR) is faster than transi time-penalty is multiplied with the cost-factor. A cost-factor of zero, gives no extra cost, while 1.0 will add the same amount to both time and cost. """.formatted( - dftAccessEgress - .penalty() - .asEnumMap() - .entrySet() - .stream() - .map(s -> - "- `%s` = %s".formatted( - StringUtils.kebabCase(s.getKey().toString()), - s.getValue() - ) - ) - .collect(Collectors.joining("\n")) + formatPenaltyDefaultValues(dftAccessEgress) ) ) .asEnumMap( @@ -591,6 +581,16 @@ The street search(AStar) aborts after this duration and any paths found are retu ); } + private static String formatPenaltyDefaultValues(AccessEgressPreferences dftAccessEgress) { + return dftAccessEgress + .penalty() + .asEnumMap() + .entrySet() + .stream() + .map(s -> "- `%s` = %s".formatted(StringUtils.kebabCase(s.getKey().toString()), s.getValue())) + .collect(Collectors.joining("\n")); + } + private static void mapCarPreferences(NodeAdapter root, CarPreferences.Builder builder) { var dft = builder.original(); NodeAdapter c = root.of("car").since(V2_5).summary("Car preferences.").asObject(); From 3f909f03b37dc3757878d0c58ece31e93567e007 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 20 Oct 2023 11:06:14 +0200 Subject: [PATCH 0461/1688] Set penalty to zero in test --- .../org/opentripplanner/ext/flex/FlexIntegrationTest.java | 6 ++++++ .../api/request/preference/StreetPreferencesTest.java | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java index a0585a9e6f2..f414572ecf2 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java @@ -32,6 +32,7 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.api.RoutingService; import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.routing.api.request.framework.TimeAndCostPenalty; import org.opentripplanner.routing.api.request.request.filter.AllowAllTransitFilter; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.transit.service.TransitModel; @@ -224,6 +225,11 @@ private static List getItineraries( request.setTo(to); request.setNumItineraries(10); request.setSearchWindow(Duration.ofHours(2)); + request.withPreferences(p -> + p.withStreet(s -> + s.withAccessEgress(ae -> ae.withPenalty(Map.of(FLEXIBLE, TimeAndCostPenalty.ZERO))) + ) + ); var modes = request.journey().modes().copyOf(); modes.withEgressMode(FLEXIBLE); diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java index 08b102ea1bb..0289c24e837 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java @@ -111,7 +111,8 @@ void testToString() { "intersectionTraversalModel: CONSTANT, " + "accessEgress: AccessEgressPreferences{penalty: TimeAndCostPenaltyForEnum{CAR_TO_PARK: " + CAR_PENALTY + - ", CAR_RENTAL: (timePenalty: 30m + 2.0 t, costFactor: 2.0), CAR_HAILING: (timePenalty: 30m + 2.0 t, costFactor: 2.0)}, " + + ", CAR_RENTAL: (timePenalty: 20m + 2.0 t, costFactor: 1.50), CAR_HAILING: (timePenalty: 20m + 2.0 t, costFactor: 1.50), " + + "FLEXIBLE: (timePenalty: 20m + 2.0 t, costFactor: 1.50)}, " + "maxDuration: DurationForStreetMode{default:5m}" + "}, " + "maxDirectDuration: DurationForStreetMode{default:10m}" + From 3f2084fc0c5c0f0dd110f7e1c7a56bd116964ce4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 1 Nov 2023 15:03:38 +0100 Subject: [PATCH 0462/1688] Subtract generalized cost that was previously added --- .../RemoveNonTransitItinerariesBasedOnGeneralizedCost.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java index 427084a55f6..1980838bec0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java @@ -43,7 +43,7 @@ public List flagForRemoval(List itineraries) { // ALL itineraries are considered here. Both transit and non-transit OptionalInt minGeneralizedCost = itineraries .stream() - .mapToInt(Itinerary::getGeneralizedCost) + .mapToInt(Itinerary::getGeneralizedCostIncludingPenalty) .min(); if (minGeneralizedCost.isEmpty()) { @@ -58,7 +58,7 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() - .filter(it -> !it.hasTransit() && it.getGeneralizedCost() > maxLimit) + .filter(it -> !it.hasTransit() && it.getGeneralizedCostIncludingPenalty() > maxLimit) .collect(Collectors.toList()); } } From 16f21df832748a4eba7bcc49121f7ce392eacc7f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 30 Jan 2024 22:24:11 +0100 Subject: [PATCH 0463/1688] Fix merge artifacts --- .../graph_builder/module/NearbyStopFinder.java | 5 +---- .../algorithm/mapping/__snapshots__/CarSnapshotTest.snap | 6 +++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index 0cac2a21308..22a00258e87 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -273,10 +273,7 @@ private SkipEdgeStrategy getSkipEdgeStrategy() { var durationSkipEdgeStrategy = new DurationSkipEdgeStrategy(durationLimit); if (maxStopCount > 0) { - var strategy = new MaxCountSkipEdgeStrategy<>( - maxStopCount, - NearbyStopFinder::hasReachedStop - ); + var strategy = new MaxCountSkipEdgeStrategy<>(maxStopCount, NearbyStopFinder::hasReachedStop); return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } return durationSkipEdgeStrategy; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap index 0ae0e948250..8f527b15bf7 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap @@ -10,7 +10,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "details" : { }, "fare" : { } }, - "generalizedCost": 518, + "generalizedCost" : 467, "legs" : [ { "agencyTimeZoneOffset" : -25200000, @@ -25,7 +25,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ "name" : "NW Pettygrove Ave. & NW 24th Ave. (P1)", "vertexType" : "NORMAL" }, - "generalizedCost": 91, + "generalizedCost" : 61, "interlineWithPreviousLeg" : false, "legGeometry" : { "length" : 5, @@ -144,7 +144,7 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[ }, "vertexType" : "BIKEPARK" }, - "generalizedCost": 427, + "generalizedCost" : 285, "interlineWithPreviousLeg" : false, "legGeometry" : { "length" : 5, From d06a4dbb6c59ad3a355269bb276750e3eb3aa0ed Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 1 Feb 2024 14:27:11 +0100 Subject: [PATCH 0464/1688] Revert changes, done in other PR --- .../RemoveNonTransitItinerariesBasedOnGeneralizedCost.java | 4 ++-- .../raptoradapter/router/street/DirectStreetRouter.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java index 1980838bec0..427084a55f6 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/street/RemoveNonTransitItinerariesBasedOnGeneralizedCost.java @@ -43,7 +43,7 @@ public List flagForRemoval(List itineraries) { // ALL itineraries are considered here. Both transit and non-transit OptionalInt minGeneralizedCost = itineraries .stream() - .mapToInt(Itinerary::getGeneralizedCostIncludingPenalty) + .mapToInt(Itinerary::getGeneralizedCost) .min(); if (minGeneralizedCost.isEmpty()) { @@ -58,7 +58,7 @@ public List flagForRemoval(List itineraries) { return itineraries .stream() - .filter(it -> !it.hasTransit() && it.getGeneralizedCostIncludingPenalty() > maxLimit) + .filter(it -> !it.hasTransit() && it.getGeneralizedCost() > maxLimit) .collect(Collectors.toList()); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java index 3c51f84fda4..2c6b09c2fb2 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java @@ -61,7 +61,6 @@ public static List route(OtpServerRequestContext serverContext, Route directRequest.wheelchair(), directRequest.preferences().wheelchair() ); - return response; } catch (PathNotFoundException e) { return Collections.emptyList(); From 7fc2e8767dca535fca6e2fb35ede82b80f2b74b3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 1 Feb 2024 14:42:50 +0100 Subject: [PATCH 0465/1688] Resolve merge artifact --- src/test/java/org/opentripplanner/model/plan/ItineraryTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java index a406ef69dcb..142ced31504 100644 --- a/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java +++ b/src/test/java/org/opentripplanner/model/plan/ItineraryTest.java @@ -166,7 +166,6 @@ void walkBusBusWalkTrainWalk() { } @Test - void legIndex() { void walkSeparateFromBike() { var itin = newItinerary(A, T11_00).walk(D2m, B).bicycle(T11_05, T11_15, D).walk(D3m, E).build(); From 488f34589d76a54bb307f98797330b3e0dc7eff7 Mon Sep 17 00:00:00 2001 From: eibakke Date: Thu, 1 Feb 2024 15:32:51 +0100 Subject: [PATCH 0466/1688] Uses BERLIN coordinates and polygon instead of non-sense ones in GroupStopTest. --- .../transit/model/site/GroupStopTest.java | 30 +++++++++---------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java b/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java index dcf9bc3aeed..b57566b68ed 100644 --- a/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java +++ b/src/test/java/org/opentripplanner/transit/model/site/GroupStopTest.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.Objects; import org.junit.jupiter.api.Test; -import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.framework.geometry.GeometryUtils; +import org.opentripplanner._support.geometry.Coordinates; +import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -24,7 +24,9 @@ class GroupStopTest { private static final String ID = "1"; private static final I18NString NAME = new NonLocalizedString("name"); - private static final StopLocation STOP_LOCATION = TEST_MODEL.stop("1:stop", 1d, 1d).build(); + private static final StopLocation STOP_LOCATION = TEST_MODEL + .stop("1:stop", Coordinates.BERLIN.getX(), Coordinates.BERLIN.getY()) + .build(); private static final GroupStop subject = StopModel .of() .groupStop(TransitModelForTest.id(ID)) @@ -34,8 +36,12 @@ class GroupStopTest { @Test void testGroupStopGeometry() { - StopLocation stopLocation1 = TEST_MODEL.stop("1:stop", 1d, 1d).build(); - StopLocation stopLocation2 = TEST_MODEL.stop("2:stop", 2d, 2d).build(); + StopLocation stopLocation1 = TEST_MODEL + .stop("1:stop", Coordinates.BERLIN.getX(), Coordinates.BERLIN.getY()) + .build(); + StopLocation stopLocation2 = TEST_MODEL + .stop("2:stop", Coordinates.HAMBURG.getX(), Coordinates.HAMBURG.getY()) + .build(); GroupStop groupStop = StopModel .of() @@ -54,16 +60,8 @@ void testGroupStopGeometry() { @Test void testGroupStopEncompassingAreaGeometry() { - Geometry encompassingAreaGeometry = GeometryUtils - .getGeometryFactory() - .toGeometry(new Envelope(1d, 2d, 1d, 2d)); - StopLocation stopLocation = TEST_MODEL - .stop( - "1:stop", - encompassingAreaGeometry.getCentroid().getX(), - encompassingAreaGeometry.getCentroid().getY() - ) + .stop("1:stop", Coordinates.BERLIN.getX(), Coordinates.BERLIN.getY()) .build(); GroupStop groupStop = StopModel @@ -71,14 +69,14 @@ void testGroupStopEncompassingAreaGeometry() { .groupStop(TransitModelForTest.id(ID)) .withName(NAME) .addLocation(stopLocation) - .withEncompassingAreaGeometries(List.of(encompassingAreaGeometry)) + .withEncompassingAreaGeometries(List.of(Polygons.BERLIN)) .build(); Geometry groupStopGeometry = Objects.requireNonNull(groupStop.getGeometry()).getGeometryN(0); assertEquals(stopLocation.getGeometry(), groupStopGeometry); assertEquals( - encompassingAreaGeometry, + Polygons.BERLIN, groupStop.getEncompassingAreaGeometry().orElseThrow().getGeometryN(0) ); } From f35d8ca9b56e89c63d5414f7d3e25809f0cee364 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 31 Jan 2024 14:22:22 +0100 Subject: [PATCH 0467/1688] Swap out stop code --- .../DecorateConsolidatedStopNames.java | 21 +++++++++++++++++-- .../model/ConsolidatedStopLeg.java | 14 ++++++------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index 8fcba82a357..99c56bb3622 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -5,6 +5,10 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; +import org.opentripplanner.transit.model.organization.Agency; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.RegularStopBuilder; +import org.opentripplanner.transit.model.site.StopLocation; /** * A decorating filter that checks if a transit leg contains any primary stops and if it does, @@ -34,10 +38,12 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { i.transformTransitLegs(leg -> { if (leg instanceof ScheduledTransitLeg stl && needsToRenameStops(stl)) { var agency = leg.getAgency(); + var from= modify(stl.getFrom().stop, agency); + var to = modify(stl.getTo().stop, agency); return new ConsolidatedStopLeg( stl, - service.agencySpecificName(stl.getFrom().stop, agency), - service.agencySpecificName(stl.getTo().stop, agency) + from, + to ); } else { return leg; @@ -45,6 +51,17 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { }); } + private StopLocation modify(StopLocation stop, Agency agency) { + if(stop instanceof RegularStop rs){ + return rs.copy() + .withName(service.agencySpecificName(stop, agency)) + .withCode("XXXXX").build(); + } + else { + return stop; + } + } + private boolean needsToRenameStops(ScheduledTransitLeg stl) { return (service.isPrimaryStop(stl.getFrom().stop) || service.isPrimaryStop(stl.getTo().stop)); } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java index e201c7ed805..1ad12adee26 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java @@ -1,28 +1,28 @@ package org.opentripplanner.ext.stopconsolidation.model; -import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.ScheduledTransitLegBuilder; +import org.opentripplanner.transit.model.site.StopLocation; public class ConsolidatedStopLeg extends ScheduledTransitLeg { - private final I18NString fromName; - private final I18NString toName; + private final StopLocation fromName; + private final StopLocation toName; - public ConsolidatedStopLeg(ScheduledTransitLeg original, I18NString fromName, I18NString toName) { + public ConsolidatedStopLeg(ScheduledTransitLeg original, StopLocation fromName, StopLocation toName) { super(new ScheduledTransitLegBuilder<>(original)); - this.fromName = fromName; + this.fromName= fromName; this.toName = toName; } @Override public Place getFrom() { - return Place.forStop(super.getFrom().stop, fromName); + return Place.forStop(fromName); } @Override public Place getTo() { - return Place.forStop(super.getTo().stop, toName); + return Place.forStop(toName); } } From 7a7b35af7085bd7f9d13f8fafce8baed9800accc Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 31 Jan 2024 18:32:17 +0100 Subject: [PATCH 0468/1688] Add agency-specific stop code --- .../DecorateConsolidatedStopNames.java | 20 +++++------ .../StopConsolidationService.java | 1 + .../DefaultStopConsolidationService.java | 34 +++++++++++++------ .../model/ConsolidatedStopLeg.java | 14 ++++---- .../org/opentripplanner/model/plan/Place.java | 6 +--- 5 files changed, 41 insertions(+), 34 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index 99c56bb3622..887125697f9 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -7,7 +7,6 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.model.site.RegularStopBuilder; import org.opentripplanner.transit.model.site.StopLocation; /** @@ -38,13 +37,9 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { i.transformTransitLegs(leg -> { if (leg instanceof ScheduledTransitLeg stl && needsToRenameStops(stl)) { var agency = leg.getAgency(); - var from= modify(stl.getFrom().stop, agency); + var from = modify(stl.getFrom().stop, agency); var to = modify(stl.getTo().stop, agency); - return new ConsolidatedStopLeg( - stl, - from, - to - ); + return new ConsolidatedStopLeg(stl, from, to); } else { return leg; } @@ -52,12 +47,13 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { } private StopLocation modify(StopLocation stop, Agency agency) { - if(stop instanceof RegularStop rs){ - return rs.copy() + if (stop instanceof RegularStop rs) { + return rs + .copy() .withName(service.agencySpecificName(stop, agency)) - .withCode("XXXXX").build(); - } - else { + .withCode(service.agencySpecificCode(stop, agency)) + .build(); + } else { return stop; } } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index 2418d8f5625..4f03095b0dc 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -33,4 +33,5 @@ public interface StopConsolidationService { * For a given primary stop look up the name as it was originally defined in the agency's feed. */ I18NString agencySpecificName(StopLocation stop, Agency agency); + String agencySpecificCode(StopLocation stop, Agency agency); } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index 54bd960d078..ee395df9497 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -2,7 +2,9 @@ import java.util.List; import java.util.Objects; +import java.util.Optional; import java.util.stream.Stream; +import javax.annotation.Nonnull; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; @@ -71,16 +73,28 @@ public I18NString agencySpecificName(StopLocation stop, Agency agency) { if (agency.getId().getFeedId().equals(stop.getId().getFeedId())) { return stop.getName(); } else { - return repo - .groups() - .stream() - .filter(r -> r.primary().equals(stop.getId())) - .flatMap(g -> g.secondaries().stream()) - .filter(secondary -> secondary.getFeedId().equals(agency.getId().getFeedId())) - .findAny() - .map(id -> transitModel.getStopModel().getRegularStop(id)) - .map(RegularStop::getName) - .orElseGet(stop::getName); + return agencySpecificStop(stop, agency).map(RegularStop::getName).orElseGet(stop::getName); } } + + @Override + public String agencySpecificCode(StopLocation stop, Agency agency) { + if (agency.getId().getFeedId().equals(stop.getId().getFeedId())) { + return stop.getCode(); + } else { + return agencySpecificStop(stop, agency).map(RegularStop::getCode).orElseGet(stop::getCode); + } + } + + @Nonnull + private Optional agencySpecificStop(StopLocation stop, Agency agency) { + return repo + .groups() + .stream() + .filter(r -> r.primary().equals(stop.getId())) + .flatMap(g -> g.secondaries().stream()) + .filter(secondary -> secondary.getFeedId().equals(agency.getId().getFeedId())) + .findAny() + .map(id -> transitModel.getStopModel().getRegularStop(id)); + } } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java index 1ad12adee26..39f06bd6347 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java @@ -7,22 +7,22 @@ public class ConsolidatedStopLeg extends ScheduledTransitLeg { - private final StopLocation fromName; - private final StopLocation toName; + private final StopLocation from; + private final StopLocation to; - public ConsolidatedStopLeg(ScheduledTransitLeg original, StopLocation fromName, StopLocation toName) { + public ConsolidatedStopLeg(ScheduledTransitLeg original, StopLocation from, StopLocation to) { super(new ScheduledTransitLegBuilder<>(original)); - this.fromName= fromName; - this.toName = toName; + this.from = from; + this.to = to; } @Override public Place getFrom() { - return Place.forStop(fromName); + return Place.forStop(from); } @Override public Place getTo() { - return Place.forStop(toName); + return Place.forStop(to); } } diff --git a/src/main/java/org/opentripplanner/model/plan/Place.java b/src/main/java/org/opentripplanner/model/plan/Place.java index 71c6d9bc188..fe3a9dee420 100644 --- a/src/main/java/org/opentripplanner/model/plan/Place.java +++ b/src/main/java/org/opentripplanner/model/plan/Place.java @@ -90,11 +90,7 @@ public static Place normal(Vertex vertex, I18NString name) { } public static Place forStop(StopLocation stop) { - return forStop(stop, stop.getName()); - } - - public static Place forStop(StopLocation stop, I18NString nameOverride) { - return new Place(nameOverride, stop.getCoordinate(), VertexType.TRANSIT, stop, null, null); + return new Place(stop.getName(), stop.getCoordinate(), VertexType.TRANSIT, stop, null, null); } public static Place forFlexStop(StopLocation stop, Vertex vertex) { From 866bc90a729ec28bae8778c92077659f36a727bd Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 31 Jan 2024 21:21:00 +0100 Subject: [PATCH 0469/1688] Implement logic for fetching primary stop --- .../stopconsolidation/DecorateConsolidatedStopNames.java | 2 +- .../ext/stopconsolidation/StopConsolidationService.java | 2 ++ .../internal/DefaultStopConsolidationService.java | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index 887125697f9..c05223d2fb4 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -37,7 +37,7 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { i.transformTransitLegs(leg -> { if (leg instanceof ScheduledTransitLeg stl && needsToRenameStops(stl)) { var agency = leg.getAgency(); - var from = modify(stl.getFrom().stop, agency); + var from = service.primaryStop(stl.getFrom().stop.getId()); var to = modify(stl.getTo().stop, agency); return new ConsolidatedStopLeg(stl, from, to); } else { diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index 4f03095b0dc..7dcea13f420 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -34,4 +34,6 @@ public interface StopConsolidationService { */ I18NString agencySpecificName(StopLocation stop, Agency agency); String agencySpecificCode(StopLocation stop, Agency agency); + + StopLocation primaryStop(FeedScopedId id); } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index ee395df9497..ea8dd5b7f99 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -7,6 +7,7 @@ import javax.annotation.Nonnull; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; +import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -97,4 +98,10 @@ private Optional agencySpecificStop(StopLocation stop, Agency agenc .findAny() .map(id -> transitModel.getStopModel().getRegularStop(id)); } + + @Override + public StopLocation primaryStop(FeedScopedId id) { + var primaryId = repo.groups().stream().filter(g -> g.secondaries().contains(id)).map(ConsolidatedStopGroup::primary).findAny().orElse(id); + return transitModel.getStopModel().getRegularStop(primaryId); + } } From c9ef9628b1a1a9391b5c7dac9c45c6c3f163b718 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 31 Jan 2024 21:40:36 +0100 Subject: [PATCH 0470/1688] Adapt check for when names should be swapped --- .../ext/stopconsolidation/DecorateConsolidatedStopNames.java | 2 +- .../ext/stopconsolidation/StopConsolidationService.java | 3 +++ .../internal/DefaultStopConsolidationService.java | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index c05223d2fb4..8dcb558b361 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -59,6 +59,6 @@ private StopLocation modify(StopLocation stop, Agency agency) { } private boolean needsToRenameStops(ScheduledTransitLeg stl) { - return (service.isPrimaryStop(stl.getFrom().stop) || service.isPrimaryStop(stl.getTo().stop)); + return (service.isSecondaryStop(stl.getFrom().stop) || service.isPrimaryStop(stl.getTo().stop)); } } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index 7dcea13f420..969276c9a28 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -24,6 +24,8 @@ public interface StopConsolidationService { */ boolean isPrimaryStop(StopLocation stop); + boolean isSecondaryStop(StopLocation stop); + /** * Are any stop consolidations defined? */ @@ -36,4 +38,5 @@ public interface StopConsolidationService { String agencySpecificCode(StopLocation stop, Agency agency); StopLocation primaryStop(FeedScopedId id); + } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index ea8dd5b7f99..7d93433ea01 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -64,6 +64,11 @@ public boolean isPrimaryStop(StopLocation stop) { return repo.groups().stream().anyMatch(r -> r.primary().equals(stop.getId())); } + @Override + public boolean isSecondaryStop(StopLocation stop) { + return repo.groups().stream().anyMatch(r -> r.secondaries().contains(stop.getId())); + } + @Override public boolean isActive() { return !repo.groups().isEmpty(); From 6e2cfffbe497c16d4be8acb8d4962e6a737b2650 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 1 Feb 2024 13:03:46 +0100 Subject: [PATCH 0471/1688] Use more general version of agencySpecific methods --- .../DecorateConsolidatedStopNamesTest.java | 4 +-- .../DecorateConsolidatedStopNames.java | 17 +----------- .../StopConsolidationService.java | 4 +-- .../DefaultStopConsolidationService.java | 27 ++++++++----------- 4 files changed, 15 insertions(+), 37 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java index 38af8ea7187..d823a55cc4a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java @@ -37,8 +37,8 @@ void changeNames() { filter.decorate(itinerary); - var updatedLeg = itinerary.getLegs().get(0); - assertEquals(STOP_D.getName(), updatedLeg.getFrom().name); + var updatedLeg = itinerary.getLegs().getFirst(); + assertEquals(STOP_C.getName(), updatedLeg.getFrom().name); assertEquals(STOP_D.getName(), updatedLeg.getTo().name); } } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index 8dcb558b361..2a09bb64255 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -5,9 +5,6 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; -import org.opentripplanner.transit.model.organization.Agency; -import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.model.site.StopLocation; /** * A decorating filter that checks if a transit leg contains any primary stops and if it does, @@ -38,7 +35,7 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { if (leg instanceof ScheduledTransitLeg stl && needsToRenameStops(stl)) { var agency = leg.getAgency(); var from = service.primaryStop(stl.getFrom().stop.getId()); - var to = modify(stl.getTo().stop, agency); + var to = service.agencySpecificStop(stl.getTo().stop, agency); return new ConsolidatedStopLeg(stl, from, to); } else { return leg; @@ -46,18 +43,6 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { }); } - private StopLocation modify(StopLocation stop, Agency agency) { - if (stop instanceof RegularStop rs) { - return rs - .copy() - .withName(service.agencySpecificName(stop, agency)) - .withCode(service.agencySpecificCode(stop, agency)) - .build(); - } else { - return stop; - } - } - private boolean needsToRenameStops(ScheduledTransitLeg stl) { return (service.isSecondaryStop(stl.getFrom().stop) || service.isPrimaryStop(stl.getTo().stop)); } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index 969276c9a28..036e99610f8 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -34,9 +34,7 @@ public interface StopConsolidationService { /** * For a given primary stop look up the name as it was originally defined in the agency's feed. */ - I18NString agencySpecificName(StopLocation stop, Agency agency); - String agencySpecificCode(StopLocation stop, Agency agency); + StopLocation agencySpecificStop(StopLocation stop, Agency agency); StopLocation primaryStop(FeedScopedId id); - } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index 7d93433ea01..5011a848210 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -9,10 +9,8 @@ import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; -import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.organization.Agency; -import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitModel; import org.slf4j.Logger; @@ -75,25 +73,16 @@ public boolean isActive() { } @Override - public I18NString agencySpecificName(StopLocation stop, Agency agency) { + public StopLocation agencySpecificStop(StopLocation stop, Agency agency) { if (agency.getId().getFeedId().equals(stop.getId().getFeedId())) { - return stop.getName(); + return stop; } else { - return agencySpecificStop(stop, agency).map(RegularStop::getName).orElseGet(stop::getName); - } - } - - @Override - public String agencySpecificCode(StopLocation stop, Agency agency) { - if (agency.getId().getFeedId().equals(stop.getId().getFeedId())) { - return stop.getCode(); - } else { - return agencySpecificStop(stop, agency).map(RegularStop::getCode).orElseGet(stop::getCode); + return agencySpecificStopOpt(stop, agency).orElse(stop); } } @Nonnull - private Optional agencySpecificStop(StopLocation stop, Agency agency) { + private Optional agencySpecificStopOpt(StopLocation stop, Agency agency) { return repo .groups() .stream() @@ -106,7 +95,13 @@ private Optional agencySpecificStop(StopLocation stop, Agency agenc @Override public StopLocation primaryStop(FeedScopedId id) { - var primaryId = repo.groups().stream().filter(g -> g.secondaries().contains(id)).map(ConsolidatedStopGroup::primary).findAny().orElse(id); + var primaryId = repo + .groups() + .stream() + .filter(g -> g.secondaries().contains(id)) + .map(ConsolidatedStopGroup::primary) + .findAny() + .orElse(id); return transitModel.getStopModel().getRegularStop(primaryId); } } From 85d762a17b0895abd1e040369e28487401d7e991 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 1 Feb 2024 17:25:50 +0100 Subject: [PATCH 0472/1688] Improve documentation --- .../ext/stopconsolidation/StopConsolidationService.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index 036e99610f8..a829a905e27 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -2,7 +2,6 @@ import java.util.List; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; -import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.StopLocation; @@ -24,6 +23,9 @@ public interface StopConsolidationService { */ boolean isPrimaryStop(StopLocation stop); + /** + * Is the given stop a secondary stop as defined by the stop consolidation configuration? + */ boolean isSecondaryStop(StopLocation stop); /** @@ -32,9 +34,12 @@ public interface StopConsolidationService { boolean isActive(); /** - * For a given primary stop look up the name as it was originally defined in the agency's feed. + * For a given primary stop look up secondary feed as it was originally defined in the agency's feed. */ StopLocation agencySpecificStop(StopLocation stop, Agency agency); + /** + * For a given stop id return the primary stop if it is part of a consolidated stop group. + */ StopLocation primaryStop(FeedScopedId id); } From bd51be9ed1694f195186e5ba0ea576491509aab2 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 1 Feb 2024 18:23:29 +0000 Subject: [PATCH 0473/1688] Add changelog entry for #5648 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 59d762fb58c..c6bb826884c 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -85,6 +85,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add flexibleArea to GroupStop Quays [#5625](https://github.com/opentripplanner/OpenTripPlanner/pull/5625) - Pass-through should override transit-group-priority [#5638](https://github.com/opentripplanner/OpenTripPlanner/pull/5638) - Introduce `generalizedCostPlusPenalty` to make cost comparsion fairer [#5483](https://github.com/opentripplanner/OpenTripPlanner/pull/5483) +- Separate walk time from non-transit time [#5648](https://github.com/opentripplanner/OpenTripPlanner/pull/5648) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 464a440545eac3211cbe331c0e8c112a2c68c873 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 1 Feb 2024 17:54:59 +0100 Subject: [PATCH 0474/1688] Update to newest version of GTFS Flex location groups --- pom.xml | 2 +- .../gtfs/mapping/LocationGroupMapperTest.java | 51 +++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java diff --git a/pom.xml b/pom.xml index ce77a303d7d..7c7f30988b2 100644 --- a/pom.xml +++ b/pom.xml @@ -831,7 +831,7 @@ org.onebusaway onebusaway-gtfs - 1.4.10 + 1.4.15 org.slf4j diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java new file mode 100644 index 00000000000..f8fe52c4731 --- /dev/null +++ b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java @@ -0,0 +1,51 @@ +package org.opentripplanner.gtfs.mapping; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Set; +import java.util.stream.Collectors; +import javax.annotation.Nonnull; +import org.junit.jupiter.api.Test; +import org.onebusaway.gtfs.model.AgencyAndId; +import org.onebusaway.gtfs.model.LocationGroup; +import org.onebusaway.gtfs.model.Stop; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.service.StopModel; + +class LocationGroupMapperTest { + + private static final String NAME = "A GROUP"; + + @Test + void map() { + var builder = StopModel.of(); + var mapper = new LocationGroupMapper( + new StopMapper(new TranslationHelper(), id -> null, builder), + new LocationMapper(builder), + builder + ); + + var lg = new LocationGroup(); + lg.setId(id("group-1")); + lg.setName(NAME); + + var stop = new Stop(); + stop.setId(id("stop-1")); + stop.setLat(1); + stop.setLon(1); + + lg.addLocation(stop); + var groupStop = mapper.map(lg); + assertEquals(NAME, groupStop.getName().toString()); + assertEquals( + Set.of(new FeedScopedId("1", "stop-1")), + groupStop.getChildLocations().stream().map(StopLocation::getId).collect(Collectors.toSet()) + ); + } + + @Nonnull + private static AgencyAndId id(String id) { + return new AgencyAndId("1", id); + } +} From a16d3c1dc464d7575bdf6c694c7741c181fef475 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 1 Feb 2024 18:05:07 +0100 Subject: [PATCH 0475/1688] Update documentation about which specific version is supported --- doc-templates/Flex.md | 4 ++-- docs/sandbox/Flex.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc-templates/Flex.md b/doc-templates/Flex.md index 0811ee03f1e..2015e898cae 100644 --- a/doc-templates/Flex.md +++ b/doc-templates/Flex.md @@ -10,8 +10,8 @@ To enable this turn on `FlexRouting` as a feature in `otp-config.json`. -The GTFS feeds should conform to -the [GTFS-Flex v2.1 draft](https://github.com/MobilityData/gtfs-flex/blob/master/spec/reference.md) +The GTFS feeds should conform to the +[GTFS-Flex v2 draft PR](https://github.com/google/transit/pull/388) ## Configuration diff --git a/docs/sandbox/Flex.md b/docs/sandbox/Flex.md index cafbc7956bf..61d15851a56 100644 --- a/docs/sandbox/Flex.md +++ b/docs/sandbox/Flex.md @@ -10,8 +10,8 @@ To enable this turn on `FlexRouting` as a feature in `otp-config.json`. -The GTFS feeds should conform to -the [GTFS-Flex v2.1 draft](https://github.com/MobilityData/gtfs-flex/blob/master/spec/reference.md) +The GTFS feeds should conform to the +[GTFS-Flex v2 draft PR](https://github.com/google/transit/pull/388) ## Configuration From c48bb220949d1080742cc2723c86a5c1fb81ae0d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 2 Feb 2024 08:08:20 +0100 Subject: [PATCH 0476/1688] Incorporate review feedback --- .../ext/fares/impl/DefaultFareServiceTest.java | 2 ++ .../ext/fares/impl/FaresIntegrationTest.java | 9 +++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java index 5f4317a5f4f..cae23f60800 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/DefaultFareServiceTest.java @@ -59,6 +59,8 @@ void simpleZoneBasedFare() { var legProducts = fare.getLegProducts().get(itin.getTransitLeg(0)); assertEquals( List.of( + // reminder: the FareProductUse's id are a (non-random) UUID computed from the start time of the leg + // plus some properties from the product itself like the id, price, rider category and medium new FareProductUse("1d270201-412b-3b86-80f6-92ab144fa2e5", AIRPORT_TO_CITY_CENTER_PRODUCT) ), legProducts diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java index a7dd4a92311..7b822b03059 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/FaresIntegrationTest.java @@ -76,11 +76,12 @@ public void testPortland() { .toInstant(); ItineraryFares fare = getFare(from, to, startTime, serverContext); - var fpu = List.copyOf(fare.getLegProducts().values()).getFirst(); - assertEquals(List.of(fpu), List.copyOf(fare.getLegProducts().values())); + var fpu = List.copyOf(fare.getLegProducts().values()); + assertEquals(1, fpu.size()); - assertEquals(Money.usDollars(2f), fpu.product().price()); - assertEquals("prt:19", fpu.product().id().toString()); + var fp = fpu.getFirst(); + assertEquals(Money.usDollars(2f), fp.product().price()); + assertEquals("prt:19", fp.product().id().toString()); // long trip From b2349c34a6c861ba5633a5cd0d8b2c7e1d1d594e Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 2 Feb 2024 07:55:54 +0000 Subject: [PATCH 0477/1688] Add changelog entry for #5645 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index c6bb826884c..c58b751e355 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -86,6 +86,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Pass-through should override transit-group-priority [#5638](https://github.com/opentripplanner/OpenTripPlanner/pull/5638) - Introduce `generalizedCostPlusPenalty` to make cost comparsion fairer [#5483](https://github.com/opentripplanner/OpenTripPlanner/pull/5483) - Separate walk time from non-transit time [#5648](https://github.com/opentripplanner/OpenTripPlanner/pull/5648) +- Remove [#5645](https://github.com/opentripplanner/OpenTripPlanner/pull/5645) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 3b667020e270cebf96e9ed3ab70cc0ef6eca4cc3 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Fri, 2 Feb 2024 07:56:09 +0000 Subject: [PATCH 0478/1688] Bump serialization version id for #5645 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce77a303d7d..38d646623b2 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 140 + 141 30.1 2.50 From e523ff93797a18b732998ba865d475ea09d6eb73 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 2 Feb 2024 10:04:00 +0100 Subject: [PATCH 0479/1688] Update changelog [ci skip] --- docs/Changelog.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Changelog.md b/docs/Changelog.md index c58b751e355..37c8d26053e 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -86,7 +86,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Pass-through should override transit-group-priority [#5638](https://github.com/opentripplanner/OpenTripPlanner/pull/5638) - Introduce `generalizedCostPlusPenalty` to make cost comparsion fairer [#5483](https://github.com/opentripplanner/OpenTripPlanner/pull/5483) - Separate walk time from non-transit time [#5648](https://github.com/opentripplanner/OpenTripPlanner/pull/5648) -- Remove [#5645](https://github.com/opentripplanner/OpenTripPlanner/pull/5645) +- Remove "fare" [#5645](https://github.com/opentripplanner/OpenTripPlanner/pull/5645) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From cb4a34e40c8111182793de386c1edb500a558d64 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 2 Feb 2024 18:16:23 +0200 Subject: [PATCH 0480/1688] Replace determine max car speed during graph build and use it for heuristics --- docs/RouteRequest.md | 2 - docs/RouterConfiguration.md | 1 - docs/examples/entur/router-config.json | 1 - .../model/DefaultRouteRequestType.java | 3 +- .../graph_builder/GraphBuilder.java | 3 + .../module/configure/GraphBuilderFactory.java | 5 ++ .../module/configure/GraphBuilderModules.java | 8 +- .../graph_builder/module/osm/OsmModule.java | 19 +++++ .../module/osm/OsmModuleBuilder.java | 8 ++ .../openstreetmap/OsmProvider.java | 14 +++- .../tagmapping/AtlantaMapper.java | 3 + .../tagmapping/ConstantSpeedMapper.java | 2 + .../tagmapping/DefaultMapper.java | 4 +- .../tagmapping/FinlandMapper.java | 8 +- .../tagmapping/GermanyMapper.java | 1 + .../tagmapping/HoustonMapper.java | 4 + .../tagmapping/NorwayMapper.java | 13 ++-- .../tagmapping/PortlandMapper.java | 4 + .../openstreetmap/tagmapping/UKMapper.java | 2 + .../wayproperty/WayPropertySet.java | 76 ++++++++++++++----- .../router/street/DirectStreetRouter.java | 17 +++-- .../request/preference/CarPreferences.java | 22 ------ .../preference/RoutingPreferences.java | 1 - .../routing/graph/SerializedGraphObject.java | 6 +- .../routing/impl/GraphPathFinder.java | 10 ++- .../opentripplanner/standalone/OTPMain.java | 3 +- .../api/OtpServerRequestContext.java | 3 + .../routerequest/RouteRequestConfig.java | 7 -- .../configure/ConstructApplication.java | 10 ++- .../ConstructApplicationFactory.java | 6 ++ .../configure/ConstructApplicationModule.java | 3 + .../standalone/configure/LoadApplication.java | 13 +++- .../configure/LoadApplicationFactory.java | 4 + .../server/DefaultServerRequestContext.java | 11 +++ .../model/StreetLimitationParameters.java | 35 +++++++++ .../EuclideanRemainingWeightHeuristic.java | 13 +++- .../apis/transmodel/schema.graphql | 2 +- .../opentripplanner/ConstantsForTests.java | 7 +- .../opentripplanner/TestServerContext.java | 2 + .../mapping/TripRequestMapperTest.java | 2 + .../module/osm/OsmModuleTest.java | 7 +- .../module/osm/TriangleInequalityTest.java | 2 +- .../tagmapping/DefaultMapperTest.java | 2 +- .../routing/algorithm/TurnCostTest.java | 2 +- .../preference/CarPreferencesTest.java | 13 +--- .../routing/graph/GraphSerializationTest.java | 6 +- .../street/model/TurnRestrictionTest.java | 5 +- .../street/model/edge/StreetEdgeTest.java | 2 +- .../transit/speed_test/SpeedTest.java | 2 + .../standalone/config/router-config.json | 1 - 50 files changed, 289 insertions(+), 111 deletions(-) create mode 100644 src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 199eda8a332..19d7e49124c 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -90,7 +90,6 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe |    pickupCost | `integer` | Add a cost for car pickup changes when a pickup or drop off takes place | *Optional* | `120` | 2.1 | |    pickupTime | `duration` | Add a time for car pickup changes when a pickup or drop off takes place | *Optional* | `"PT1M"` | 2.1 | |    reluctance | `double` | A multiplier for how bad driving is, compared to being in transit for equal lengths of time. | *Optional* | `2.0` | 2.0 | -|    speed | `double` | Max car speed along streets, in meters per second | *Optional* | `40.0` | 2.0 | |    parking | `object` | Preferences for parking a vehicle. | *Optional* | | 2.5 | |       cost | `integer` | Cost to park a vehicle. | *Optional* | `120` | 2.0 | |       time | `duration` | Time to park a vehicle. | *Optional* | `"PT1M"` | 2.0 | @@ -1079,7 +1078,6 @@ include stairs as a last result. } }, "car" : { - "speed" : 40, "reluctance" : 10, "decelerationSpeed" : 2.9, "accelerationSpeed" : 2.9, diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 62fb5d9617a..71c34c1b31a 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -482,7 +482,6 @@ Used to group requests when monitoring OTP. } }, "car" : { - "speed" : 40, "reluctance" : 10, "decelerationSpeed" : 2.9, "accelerationSpeed" : 2.9, diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index ffdec9ded79..a4091a8918e 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -26,7 +26,6 @@ } }, "car": { - "speed": 40, "reluctance": 4.0, "decelerationSpeed": 2.9, "accelerationSpeed": 2.9, diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java index 80b6418c314..ea1600864db 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java @@ -44,9 +44,10 @@ private GraphQLObjectType createGraphQLType() { GraphQLFieldDefinition .newFieldDefinition() .name("carSpeed") + .deprecate("This parameter is no longer configurable.") .description("Max car speed along streets, in meters per second") .type(Scalars.GraphQLFloat) - .dataFetcher(env -> preferences.car().speed()) + .dataFetcher(env -> 0) .build() ) .field( diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java b/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java index 8b2e55ffc2f..c036c113e26 100644 --- a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java @@ -23,6 +23,7 @@ import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository; import org.opentripplanner.standalone.config.BuildConfig; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TransitModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -65,6 +66,7 @@ public static GraphBuilder create( WorldEnvelopeRepository worldEnvelopeRepository, @Nullable EmissionsDataModel emissionsDataModel, @Nullable StopConsolidationRepository stopConsolidationRepository, + StreetLimitationParameters streetLimitationParameters, boolean loadStreetGraph, boolean saveStreetGraph ) { @@ -82,6 +84,7 @@ public static GraphBuilder create( .transitModel(transitModel) .worldEnvelopeRepository(worldEnvelopeRepository) .stopConsolidationRepository(stopConsolidationRepository) + .streetLimitationParameters(streetLimitationParameters) .dataSources(dataSources) .timeZoneId(transitModel.getTimeZone()); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java b/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java index 9fd99d35ea0..9c778481d4d 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderFactory.java @@ -31,6 +31,7 @@ import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository; import org.opentripplanner.standalone.config.BuildConfig; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TransitModel; @Singleton @@ -55,6 +56,7 @@ public interface GraphBuilderFactory { EdgeUpdaterModule dataOverlayFactory(); DataImportIssueReporter dataImportIssueReporter(); CalculateWorldEnvelopeModule calculateWorldEnvelopeModule(); + StreetLimitationParameters streetLimitationParameters(); @Nullable StopConsolidationModule stopConsolidationModule(); @@ -81,6 +83,9 @@ Builder stopConsolidationRepository( @Nullable StopConsolidationRepository stopConsolidationRepository ); + @BindsInstance + Builder streetLimitationParameters(StreetLimitationParameters streetLimitationParameters); + @BindsInstance Builder dataSources(GraphBuilderDataSources graphBuilderDataSources); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java b/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java index 444adb5b727..6f458bd8ca1 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java @@ -43,6 +43,7 @@ import org.opentripplanner.routing.api.request.preference.WalkPreferences; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.standalone.config.BuildConfig; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TransitModel; /** @@ -57,7 +58,8 @@ static OsmModule provideOpenStreetMapModule( GraphBuilderDataSources dataSources, BuildConfig config, Graph graph, - DataImportIssueStore issueStore + DataImportIssueStore issueStore, + StreetLimitationParameters streetLimitationParameters ) { List providers = new ArrayList<>(); for (ConfiguredDataSource osmConfiguredDataSource : dataSources.getOsmConfiguredDatasource()) { @@ -66,7 +68,8 @@ static OsmModule provideOpenStreetMapModule( osmConfiguredDataSource.dataSource(), osmConfiguredDataSource.config().osmTagMapper(), osmConfiguredDataSource.config().timeZone(), - config.osmCacheDataInMem + config.osmCacheDataInMem, + issueStore ) ); } @@ -81,6 +84,7 @@ static OsmModule provideOpenStreetMapModule( .withMaxAreaNodes(config.maxAreaNodes) .withBoardingAreaRefTags(config.boardingLocationTags) .withIssueStore(issueStore) + .withStreetLimitationParameters(streetLimitationParameters) .build(); } diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index 9cc15d191fc..44133624ac1 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -7,6 +7,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nullable; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; @@ -27,6 +28,7 @@ import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.util.ElevationUtils; import org.opentripplanner.routing.vehicle_parking.VehicleParking; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.edge.StreetEdgeBuilder; @@ -55,11 +57,13 @@ public class OsmModule implements GraphBuilderModule { private final SafetyValueNormalizer normalizer; private final VertexGenerator vertexGenerator; private final OsmDatabase osmdb; + private final StreetLimitationParameters streetLimitationParameters; OsmModule( Collection providers, Graph graph, DataImportIssueStore issueStore, + @Nullable StreetLimitationParameters streetLimitationParameters, OsmProcessingParameters params ) { this.providers = List.copyOf(providers); @@ -69,6 +73,7 @@ public class OsmModule implements GraphBuilderModule { this.osmdb = new OsmDatabase(issueStore); this.vertexGenerator = new VertexGenerator(osmdb, graph, params.boardingAreaRefTags()); this.normalizer = new SafetyValueNormalizer(graph, issueStore); + this.streetLimitationParameters = streetLimitationParameters; } public static OsmModuleBuilder of(Collection providers, Graph graph) { @@ -94,6 +99,9 @@ public void buildGraph() { LOG.info("Building street graph from OSM"); build(); graph.hasStreets = true; + if (streetLimitationParameters != null) { + streetLimitationParameters.initMaxCarSpeed(getMaxCarSpeed()); + } } @Override @@ -551,4 +559,15 @@ private StreetEdge getEdgeForStreet( return street; } + + private float getMaxCarSpeed() { + float maxSpeed = 0f; + for (OsmProvider provider : providers) { + var wps = provider.getWayPropertySet(); + if (wps.maxUsedCarSpeed > maxSpeed) { + maxSpeed = wps.maxUsedCarSpeed; + } + } + return maxSpeed; + } } diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java index a99752ca2b9..144399d81f6 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java @@ -8,6 +8,7 @@ import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.openstreetmap.OsmProvider; import org.opentripplanner.routing.graph.Graph; +import org.opentripplanner.street.model.StreetLimitationParameters; /** * Builder for the {@link OsmModule} @@ -24,6 +25,7 @@ public class OsmModuleBuilder { private boolean staticParkAndRide = false; private boolean staticBikeParkAndRide = false; private int maxAreaNodes; + private StreetLimitationParameters streetLimitationParameters; OsmModuleBuilder(Collection providers, Graph graph) { this.providers = providers; @@ -70,11 +72,17 @@ public OsmModuleBuilder withMaxAreaNodes(int maxAreaNodes) { return this; } + public OsmModuleBuilder withStreetLimitationParameters(StreetLimitationParameters parameters) { + this.streetLimitationParameters = parameters; + return this; + } + public OsmModule build() { return new OsmModule( providers, graph, issueStore, + streetLimitationParameters, new OsmProcessingParameters( boardingAreaRefTags, edgeNamer, diff --git a/src/main/java/org/opentripplanner/openstreetmap/OsmProvider.java b/src/main/java/org/opentripplanner/openstreetmap/OsmProvider.java index cfe6713dd74..e35a846cbbd 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/OsmProvider.java +++ b/src/main/java/org/opentripplanner/openstreetmap/OsmProvider.java @@ -12,6 +12,7 @@ import org.opentripplanner.framework.application.OtpFileNames; import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.module.osm.OsmDatabase; import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapper; import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource; @@ -41,19 +42,26 @@ public class OsmProvider { /** For tests */ public OsmProvider(File file, boolean cacheDataInMem) { - this(new FileDataSource(file, FileType.OSM), OsmTagMapperSource.DEFAULT, null, cacheDataInMem); + this( + new FileDataSource(file, FileType.OSM), + OsmTagMapperSource.DEFAULT, + null, + cacheDataInMem, + DataImportIssueStore.NOOP + ); } public OsmProvider( DataSource dataSource, OsmTagMapperSource tagMapperSource, ZoneId zoneId, - boolean cacheDataInMem + boolean cacheDataInMem, + DataImportIssueStore issueStore ) { this.source = dataSource; this.zoneId = zoneId; this.osmTagMapper = tagMapperSource.getInstance(); - this.wayPropertySet = new WayPropertySet(); + this.wayPropertySet = new WayPropertySet(issueStore); osmTagMapper.populateProperties(wayPropertySet); this.cacheDataInMem = cacheDataInMem; } diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/AtlantaMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/AtlantaMapper.java index b7e60e0f008..f9539188904 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/AtlantaMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/AtlantaMapper.java @@ -24,6 +24,9 @@ public void populateProperties(WayPropertySet props) { props.setProperties("highway=trunk_link", withModes(ALL).bicycleSafety(2.5)); props.setProperties("highway=trunk", withModes(ALL).bicycleSafety(2.5)); + // Max speed limit in Georgia is 70 mph ~= 113kmh ~= 31.3m/s + props.maxPossibleCarSpeed = 31.4f; + // Read the rest from the default set new DefaultMapper().populateProperties(props); } diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java index 58cff2e9a3d..48a3c2ac9bf 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java @@ -31,6 +31,8 @@ public ConstantSpeedFinlandMapper(float speed) { @Override public void populateProperties(WayPropertySet props) { props.setCarSpeed("highway=*", speed); + props.maxPossibleCarSpeed = 22.22f; + props.maxUsedCarSpeed = 22.22f; // Read the rest from the default set new FinlandMapper().populateProperties(props); } diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java index 01cf213b03b..1463313203d 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java @@ -547,7 +547,9 @@ public void populateProperties(WayPropertySet props) { props.setCarSpeed("highway=road", 11.2f); // ~= 25 mph // default ~= 25 mph - props.defaultSpeed = 11.2f; + props.defaultCarSpeed = 11.2f; + // 38 m/s ~= 85 mph ~= 137 kph + props.maxPossibleCarSpeed = 38f; /* special situations */ diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java index 253bb385aa3..9bafe133f2a 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java @@ -163,9 +163,11 @@ else if (speedLimit <= 16.65f) { props.setProperties("highway=service;tunnel=yes;access=destination", withModes(NONE)); props.setProperties("highway=service;access=destination", withModes(ALL).bicycleSafety(1.1)); - /* - * Automobile speeds in Finland. General speed limit is 80kph unless signs says otherwise. - */ + // Automobile speeds in Finland. + // General speed limit is 80kph unless signs says otherwise. + props.defaultCarSpeed = 22.22f; + // 120kph is the max speed limit in Finland + props.maxPossibleCarSpeed = 33.34f; // = 100kph. Varies between 80 - 120 kph depending on road and season. props.setCarSpeed("highway=motorway", 27.77f); // = 54kph diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/GermanyMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/GermanyMapper.java index c3d4c7fec8a..908d9838f53 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/GermanyMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/GermanyMapper.java @@ -26,6 +26,7 @@ public void populateProperties(WayPropertySet props) { // Automobile speeds in Germany. General speed limit is 50kph in settlements, 100kph outside settlements. // For motorways, there (currently still) is no limit. Nevertheless 120kph is assumed to reflect varying // traffic conditions. + props.maxPossibleCarSpeed = 33.34f; props.setCarSpeed("highway=motorway", 33.33f); // = 120kph. Varies between 80 - 120 kph depending on road and season. props.setCarSpeed("highway=motorway_link", 15); // = 54kph props.setCarSpeed("highway=trunk", 27.27f); // 100kph diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HoustonMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HoustonMapper.java index e1e7aaf83df..7fdde133465 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HoustonMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HoustonMapper.java @@ -26,6 +26,10 @@ public void populateProperties(WayPropertySet props) { new ExactMatchSpecifier("highway=footway;layer=-1;tunnel=yes;indoor=yes"), withModes(NONE) ); + + // Max speed limit in Texas is 38 m/s ~= 85 mph ~= 137 kph + props.maxPossibleCarSpeed = 38f; + // Read the rest from the default set new DefaultMapper().populateProperties(props); } diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java index d2cd2f3cf96..9de824a145b 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java @@ -608,17 +608,18 @@ else if (speedLimit >= 11.1f) { 13.89f // 50 km/t ); - props.setCarSpeed("highway=residential", 13.89f); // 50 km/t - props.setCarSpeed("highway=service", 13.89f); // 50 km/t + props.setCarSpeed("highway=residential", 13.89f); // 50 km/h + props.setCarSpeed("highway=service", 13.89f); // 50 km/h - props.setCarSpeed("highway=service;service=driveway", 8.33f); // 30 km/t + props.setCarSpeed("highway=service;service=driveway", 8.33f); // 30 km/h props.setCarSpeed("highway=service;service=parking_aisle", 8.33f); props.setCarSpeed("highway=track", 8.33f); - props.setCarSpeed("highway=living_street", 1.94f); // 7 km/t - props.setCarSpeed("highway=pedestrian", 1.94f); // 7 km/t + props.setCarSpeed("highway=living_street", 1.94f); // 7 km/h + props.setCarSpeed("highway=pedestrian", 1.94f); // 7 km/h - props.defaultSpeed = 22.22f; // 80 km/t + props.defaultCarSpeed = 22.22f; // 80 km/h + props.maxPossibleCarSpeed = 30.56f; // 110 km/h new DefaultMapper().populateNotesAndNames(props); diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java index 29b17921540..a532d279ba4 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java @@ -40,6 +40,10 @@ public void populateProperties(WayPropertySet props) { props.setMixinProperties(exact("sidewalk=no;maxspeed=40 mph"), ofWalkSafety(3)); props.setMixinProperties(exact("sidewalk=no;maxspeed=35 mph"), ofWalkSafety(2)); props.setMixinProperties(exact("sidewalk=no;maxspeed=30 mph"), ofWalkSafety(1.5)); + + // Max speed limit in Oregon is 70 mph ~= 113kmh ~= 31.3m/s + props.maxPossibleCarSpeed = 31.4f; + // Read the rest from the default set new DefaultMapper().populateProperties(props); } diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/UKMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/UKMapper.java index cd809197559..7639c6594b2 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/UKMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/UKMapper.java @@ -61,6 +61,8 @@ public void populateProperties(WayPropertySet props) { * my (marcusyoung) personal experience in obtaining realistic routes. * */ + // Max speed limit is 70 mph ~113kmh ~31.3m/s + props.maxPossibleCarSpeed = 31.4f; props.setCarSpeed("highway=motorway", 30.4f); // ~=68mph props.setCarSpeed("highway=motorway_link", 22.4f); // ~= 50mph props.setCarSpeed("highway=trunk", 22.4f); // ~=50mph diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java index 376614b1093..e867654a104 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java +++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java @@ -14,6 +14,7 @@ import java.util.regex.Pattern; import org.opentripplanner.framework.functional.FunctionUtils.TriFunction; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.openstreetmap.model.OSMWithTags; import org.opentripplanner.openstreetmap.wayproperty.specifier.BestMatchSpecifier; import org.opentripplanner.openstreetmap.wayproperty.specifier.OsmSpecifier; @@ -51,13 +52,21 @@ public class WayPropertySet { private final List notes; private final Pattern maxSpeedPattern; /** The automobile speed for street segments that do not match any SpeedPicker. */ - public Float defaultSpeed; + public Float defaultCarSpeed; + /** The maximum automobile speed that is possible. */ + public Float maxPossibleCarSpeed; + /** + * The maximum automobile speed that has been used. This can be used in heuristics later on to + * determine the minimum travel time. + */ + public float maxUsedCarSpeed = 0f; /** Resolves walk safety value for each {@link StreetTraversalPermission}. */ private TriFunction defaultWalkSafetyForPermission; /** Resolves bicycle safety value for each {@link StreetTraversalPermission}. */ private TriFunction defaultBicycleSafetyForPermission; /** The WayProperties applied to all ways that do not match any WayPropertyPicker. */ private final WayProperties defaultProperties; + private final DataImportIssueStore issueStore; public List getMixins() { return mixins; @@ -66,8 +75,15 @@ public List getMixins() { private final List mixins = new ArrayList<>(); public WayPropertySet() { + this(DataImportIssueStore.NOOP); + } + + public WayPropertySet(DataImportIssueStore issueStore) { /* sensible defaults */ - defaultSpeed = 11.2f; // 11.2 m/s ~= 25 mph ~= 40 kph, standard speed limit in the US + // 11.2 m/s ~= 25 mph ~= 40 kph, standard speed limit in the US + defaultCarSpeed = 11.2f; + // 38 m/s ~= 85 mph ~= 137 kph, max speed limit in the US + maxPossibleCarSpeed = 38f; defaultProperties = withModes(ALL).build(); wayProperties = new ArrayList<>(); creativeNamers = new ArrayList<>(); @@ -79,6 +95,7 @@ public WayPropertySet() { maxSpeedPattern = Pattern.compile("^([0-9][.0-9]*)\\s*(kmh|km/h|kmph|kph|mph|knots)?$"); defaultWalkSafetyForPermission = DEFAULT_SAFETY_RESOLVER; defaultBicycleSafetyForPermission = DEFAULT_SAFETY_RESOLVER; + this.issueStore = issueStore; } /** @@ -193,37 +210,53 @@ public float getCarSpeedForWay(OSMWithTags way, boolean backward) { Float speed = null; Float currentSpeed; - if (way.hasTag("maxspeed:motorcar")) speed = - getMetersSecondFromSpeed(way.getTag("maxspeed:motorcar")); + if (way.hasTag("maxspeed:motorcar")) { + speed = getMetersSecondFromSpeed(way.getTag("maxspeed:motorcar")); + } - if (speed == null && !backward && way.hasTag("maxspeed:forward")) speed = - getMetersSecondFromSpeed(way.getTag("maxspeed:forward")); + if (speed == null && !backward && way.hasTag("maxspeed:forward")) { + speed = getMetersSecondFromSpeed(way.getTag("maxspeed:forward")); + } - if (speed == null && backward && way.hasTag("maxspeed:backward")) speed = - getMetersSecondFromSpeed(way.getTag("maxspeed:backward")); + if (speed == null && backward && way.hasTag("maxspeed:backward")) { + speed = getMetersSecondFromSpeed(way.getTag("maxspeed:backward")); + } if (speed == null && way.hasTag("maxspeed:lanes")) { for (String lane : way.getTag("maxspeed:lanes").split("\\|")) { currentSpeed = getMetersSecondFromSpeed(lane); // Pick the largest speed from the tag // currentSpeed might be null if it was invalid, for instance 10|fast|20 - if (currentSpeed != null && (speed == null || currentSpeed > speed)) speed = currentSpeed; + if (currentSpeed != null && (speed == null || currentSpeed > speed)) { + speed = currentSpeed; + } } } if (way.hasTag("maxspeed") && speed == null) speed = getMetersSecondFromSpeed(way.getTag("maxspeed")); - // this would be bad, as the segment could never be traversed by an automobile - // The small epsilon is to account for possible rounding errors - if (speed != null && speed < 0.0001) LOG.warn( - "Zero or negative automobile speed detected at {} based on OSM " + - "maxspeed tags; ignoring these tags", - this - ); - - // if there was a defined speed and it's not 0, we're done - if (speed != null && speed > 0.0001) return speed; + if (speed != null) { + // Too low or too high speed limit indicates an error in the data, we use default speed + // limits for the way type in that case. + // The small epsilon is to account for possible rounding errors. + if (speed < 0.0001 || speed > maxPossibleCarSpeed + 0.0001) { + var id = way.getId(); + var link = way.url(); + issueStore.add( + "InvalidCarSpeedLimit", + "OSM object with id '%s' (%s) has an invalid maxspeed value (%f), that speed will be ignored", + id, + link, + speed + ); + } else { + if (speed > maxUsedCarSpeed) { + maxUsedCarSpeed = speed; + } + return speed; + } + } // otherwise, we use the speedPickers @@ -243,9 +276,12 @@ public float getCarSpeedForWay(OSMWithTags way, boolean backward) { } if (bestSpeed != null) { + if (bestSpeed > maxUsedCarSpeed) { + maxUsedCarSpeed = bestSpeed; + } return bestSpeed; } else { - return this.defaultSpeed; + return this.defaultCarSpeed; } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java index 2c6b09c2fb2..e2ce8c113c1 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java @@ -35,14 +35,18 @@ public static List route(OtpServerRequestContext serverContext, Route request.journey().direct().mode() ) ) { - if (!straightLineDistanceIsWithinLimit(directRequest, temporaryVertices)) { + var maxCarSpeed = serverContext.streetLimitationParameters().maxCarSpeed() != null + ? serverContext.streetLimitationParameters().maxCarSpeed() + : 40f; + if (!straightLineDistanceIsWithinLimit(directRequest, temporaryVertices, maxCarSpeed)) { return Collections.emptyList(); } // we could also get a persistent router-scoped GraphPathFinder but there's no setup cost here GraphPathFinder gpFinder = new GraphPathFinder( serverContext.traverseVisitor(), - serverContext.dataOverlayContext(request) + serverContext.dataOverlayContext(request), + maxCarSpeed ); List> paths = gpFinder.graphPathFinderEntryPoint( directRequest, @@ -69,7 +73,8 @@ public static List route(OtpServerRequestContext serverContext, Route private static boolean straightLineDistanceIsWithinLimit( RouteRequest request, - TemporaryVerticesContainer vertexContainer + TemporaryVerticesContainer vertexContainer, + float maxCarSpeed ) { // TODO This currently only calculates the distances between the first fromVertex // and the first toVertex @@ -77,7 +82,7 @@ private static boolean straightLineDistanceIsWithinLimit( vertexContainer.getFromVertices().iterator().next().getCoordinate(), vertexContainer.getToVertices().iterator().next().getCoordinate() ); - return distance < calculateDistanceMaxLimit(request); + return distance < calculateDistanceMaxLimit(request, maxCarSpeed); } /** @@ -85,7 +90,7 @@ private static boolean straightLineDistanceIsWithinLimit( * fastest mode available. This assumes that it is not possible to exceed the speed defined in the * RouteRequest. */ - private static double calculateDistanceMaxLimit(RouteRequest request) { + private static double calculateDistanceMaxLimit(RouteRequest request, float maxCarSpeed) { var preferences = request.preferences(); double distanceLimit; StreetMode mode = request.journey().direct().mode(); @@ -93,7 +98,7 @@ private static double calculateDistanceMaxLimit(RouteRequest request) { double durationLimit = preferences.street().maxDirectDuration().valueOf(mode).toSeconds(); if (mode.includesDriving()) { - distanceLimit = durationLimit * preferences.car().speed(); + distanceLimit = durationLimit * maxCarSpeed; } else if (mode.includesBiking()) { distanceLimit = durationLimit * preferences.bike().speed(); } else if (mode.includesWalking()) { diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java index b2f226cf307..cc9b7ba62d8 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/CarPreferences.java @@ -22,7 +22,6 @@ public final class CarPreferences implements Serializable { public static final CarPreferences DEFAULT = new CarPreferences(); - private final double speed; private final double reluctance; private final VehicleParkingPreferences parking; private final VehicleRentalPreferences rental; @@ -33,7 +32,6 @@ public final class CarPreferences implements Serializable { /** Create a new instance with default values. */ private CarPreferences() { - this.speed = 40.0; this.reluctance = 2.0; this.parking = VehicleParkingPreferences.DEFAULT; this.rental = VehicleRentalPreferences.DEFAULT; @@ -44,7 +42,6 @@ private CarPreferences() { } private CarPreferences(Builder builder) { - this.speed = Units.speed(builder.speed); this.reluctance = Units.reluctance(builder.reluctance); this.parking = builder.parking; this.rental = builder.rental; @@ -62,15 +59,6 @@ public CarPreferences.Builder copyOf() { return new Builder(this); } - /** - * Max car speed along streets, in meters per second. - *

      - * Default: 40 m/s, 144 km/h, above the maximum (finite) driving speed limit worldwide. - */ - public double speed() { - return speed; - } - public double reluctance() { return reluctance; } @@ -117,7 +105,6 @@ public boolean equals(Object o) { if (o == null || getClass() != o.getClass()) return false; CarPreferences that = (CarPreferences) o; return ( - DoubleUtils.doubleEquals(that.speed, speed) && DoubleUtils.doubleEquals(that.reluctance, reluctance) && parking.equals(that.parking) && rental.equals(that.rental) && @@ -131,7 +118,6 @@ public boolean equals(Object o) { @Override public int hashCode() { return Objects.hash( - speed, reluctance, parking, rental, @@ -146,7 +132,6 @@ public int hashCode() { public String toString() { return ToStringBuilder .of(CarPreferences.class) - .addNum("speed", speed, DEFAULT.speed) .addNum("reluctance", reluctance, DEFAULT.reluctance) .addObj("parking", parking, DEFAULT.parking) .addObj("rental", rental, DEFAULT.rental) @@ -161,7 +146,6 @@ public String toString() { public static class Builder { private final CarPreferences original; - private double speed; private double reluctance; private VehicleParkingPreferences parking; private VehicleRentalPreferences rental; @@ -172,7 +156,6 @@ public static class Builder { public Builder(CarPreferences original) { this.original = original; - this.speed = original.speed; this.reluctance = original.reluctance; this.parking = original.parking; this.rental = original.rental; @@ -186,11 +169,6 @@ public CarPreferences original() { return original; } - public Builder withSpeed(double speed) { - this.speed = speed; - return this; - } - public Builder withReluctance(double reluctance) { this.reluctance = reluctance; return this; diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java index d3d22160935..b2ff61efcff 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/RoutingPreferences.java @@ -131,7 +131,6 @@ public double getSpeed(TraverseMode mode, boolean walkingBike) { return switch (mode) { case WALK -> walkingBike ? bike.walking().speed() : walk.speed(); case BICYCLE -> bike.speed(); - case CAR -> car.speed(); default -> throw new IllegalArgumentException("getSpeed(): Invalid mode " + mode); }; } diff --git a/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java b/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java index 690c4c7e821..b2404adc5d1 100644 --- a/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java +++ b/src/main/java/org/opentripplanner/routing/graph/SerializedGraphObject.java @@ -30,6 +30,7 @@ import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository; import org.opentripplanner.standalone.config.BuildConfig; import org.opentripplanner.standalone.config.RouterConfig; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.transit.model.basic.SubMode; @@ -77,6 +78,7 @@ public class SerializedGraphObject implements Serializable { public final StopConsolidationRepository stopConsolidationRepository; private final int routingTripPatternCounter; public final EmissionsDataModel emissionsDataModel; + public final StreetLimitationParameters streetLimitationParameters; public SerializedGraphObject( Graph graph, @@ -86,7 +88,8 @@ public SerializedGraphObject( RouterConfig routerConfig, DataImportIssueSummary issueSummary, EmissionsDataModel emissionsDataModel, - StopConsolidationRepository stopConsolidationRepository + StopConsolidationRepository stopConsolidationRepository, + StreetLimitationParameters streetLimitationParameters ) { this.graph = graph; this.edges = graph.getEdges(); @@ -99,6 +102,7 @@ public SerializedGraphObject( this.allTransitSubModes = SubMode.listAllCachedSubModes(); this.routingTripPatternCounter = RoutingTripPattern.indexCounter(); this.stopConsolidationRepository = stopConsolidationRepository; + this.streetLimitationParameters = streetLimitationParameters; } public static void verifyTheOutputGraphIsWritableIfDataSourceExist(DataSource graphOutput) { diff --git a/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java b/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java index 0e47901dcef..74d34a8d505 100644 --- a/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java +++ b/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java @@ -56,16 +56,20 @@ public class GraphPathFinder { private final DataOverlayContext dataOverlayContext; + private final Float maxCarSpeed; + public GraphPathFinder(@Nullable TraverseVisitor traverseVisitor) { - this(traverseVisitor, null); + this(traverseVisitor, null, null); } public GraphPathFinder( @Nullable TraverseVisitor traverseVisitor, - @Nullable DataOverlayContext dataOverlayContext + @Nullable DataOverlayContext dataOverlayContext, + @Nullable Float maxCarSpeed ) { this.traverseVisitor = traverseVisitor; this.dataOverlayContext = dataOverlayContext; + this.maxCarSpeed = maxCarSpeed; } /** @@ -81,7 +85,7 @@ public List> getPaths( StreetSearchBuilder aStar = StreetSearchBuilder .of() - .setHeuristic(new EuclideanRemainingWeightHeuristic()) + .setHeuristic(new EuclideanRemainingWeightHeuristic(maxCarSpeed)) .setSkipEdgeStrategy( new DurationSkipEdgeStrategy( preferences.maxDirectDuration().valueOf(request.journey().direct().mode()) diff --git a/src/main/java/org/opentripplanner/standalone/OTPMain.java b/src/main/java/org/opentripplanner/standalone/OTPMain.java index 365e1fb49c8..51172d5d90a 100644 --- a/src/main/java/org/opentripplanner/standalone/OTPMain.java +++ b/src/main/java/org/opentripplanner/standalone/OTPMain.java @@ -153,7 +153,8 @@ private static void startOTPServer(CommandLineParameters cli) { config.routerConfig(), DataImportIssueSummary.combine(graphBuilder.issueSummary(), app.dataImportIssueSummary()), app.emissionsDataModel(), - app.stopConsolidationRepository() + app.stopConsolidationRepository(), + app.streetLimitationParameters() ) .save(app.graphOutputDataSource()); // Log size info for the deduplicator diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index fa3a7069e2d..3bc847d7833 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -24,6 +24,7 @@ import org.opentripplanner.service.worldenvelope.WorldEnvelopeService; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.service.TransitService; @@ -98,6 +99,8 @@ public interface OtpServerRequestContext { @Nullable StopConsolidationService stopConsolidationService(); + StreetLimitationParameters streetLimitationParameters(); + MeterRegistry meterRegistry(); @Nullable diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 4538f6de84d..1f12e63ee39 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -573,13 +573,6 @@ private static void mapCarPreferences(NodeAdapter root, CarPreferences.Builder b var dft = builder.original(); NodeAdapter c = root.of("car").since(V2_5).summary("Car preferences.").asObject(); builder - .withSpeed( - c - .of("speed") - .since(V2_0) - .summary("Max car speed along streets, in meters per second") - .asDouble(dft.speed()) - ) .withReluctance( c .of("reluctance") diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java index 487e8489128..72a46254b58 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -31,6 +31,7 @@ import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.GrizzlyServer; import org.opentripplanner.standalone.server.OTPWebApplication; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.model.elevation.ElevationUtils; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.updater.configure.UpdaterConfigurator; @@ -74,7 +75,8 @@ public class ConstructApplication { GraphBuilderDataSources graphBuilderDataSources, DataImportIssueSummary issueSummary, EmissionsDataModel emissionsDataModel, - @Nullable StopConsolidationRepository stopConsolidationRepository + @Nullable StopConsolidationRepository stopConsolidationRepository, + StreetLimitationParameters streetLimitationParameters ) { this.cli = cli; this.graphBuilderDataSources = graphBuilderDataSources; @@ -94,6 +96,7 @@ public class ConstructApplication { .emissionsDataModel(emissionsDataModel) .dataImportIssueSummary(issueSummary) .stopConsolidationRepository(stopConsolidationRepository) + .streetLimitationParameters(streetLimitationParameters) .build(); } @@ -126,6 +129,7 @@ public GraphBuilder createGraphBuilder() { factory.worldEnvelopeRepository(), factory.emissionsDataModel(), factory.stopConsolidationRepository(), + factory.streetLimitationParameters(), cli.doLoadStreetGraph(), cli.doSaveStreetGraph() ); @@ -304,4 +308,8 @@ private void createMetricsLogging() { public EmissionsDataModel emissionsDataModel() { return factory.emissionsDataModel(); } + + public StreetLimitationParameters streetLimitationParameters() { + return factory.streetLimitationParameters(); + } } diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index a4f0ee49652..719cf37ec0e 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -29,6 +29,7 @@ import org.opentripplanner.standalone.config.ConfigModel; import org.opentripplanner.standalone.config.configure.ConfigModule; import org.opentripplanner.standalone.server.MetricsLogging; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.configure.TransitModule; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; @@ -81,6 +82,8 @@ public interface ConstructApplicationFactory { @Nullable StopConsolidationRepository stopConsolidationRepository(); + StreetLimitationParameters streetLimitationParameters(); + @Component.Builder interface Builder { @BindsInstance @@ -109,6 +112,9 @@ Builder stopConsolidationRepository( @BindsInstance Builder emissionsDataModel(EmissionsDataModel emissionsDataModel); + @BindsInstance + Builder streetLimitationParameters(StreetLimitationParameters streetLimitationParameters); + ConstructApplicationFactory build(); } } diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java index 5d8efcd3a5b..88cce81423f 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java @@ -19,6 +19,7 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.visualizer.GraphVisualizer; @@ -36,6 +37,7 @@ OtpServerRequestContext providesServerContext( VehicleRentalService vehicleRentalService, List rideHailingServices, @Nullable StopConsolidationService stopConsolidationService, + StreetLimitationParameters streetLimitationParameters, @Nullable TraverseVisitor traverseVisitor, EmissionsService emissionsService, LauncherRequestDecorator launcherRequestDecorator @@ -57,6 +59,7 @@ OtpServerRequestContext providesServerContext( routerConfig.flexConfig(), rideHailingServices, stopConsolidationService, + streetLimitationParameters, traverseVisitor ); } diff --git a/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java b/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java index f22c5ab80ec..19415e489b4 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java +++ b/src/main/java/org/opentripplanner/standalone/configure/LoadApplication.java @@ -11,6 +11,7 @@ import org.opentripplanner.service.worldenvelope.WorldEnvelopeRepository; import org.opentripplanner.standalone.config.CommandLineParameters; import org.opentripplanner.standalone.config.ConfigModel; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TransitModel; /** @@ -57,7 +58,8 @@ public ConstructApplication appConstruction(SerializedGraphObject obj) { obj.worldEnvelopeRepository, obj.issueSummary, obj.emissionsDataModel, - obj.stopConsolidationRepository + obj.stopConsolidationRepository, + obj.streetLimitationParameters ); } @@ -69,7 +71,8 @@ public ConstructApplication appConstruction() { factory.emptyWorldEnvelopeRepository(), DataImportIssueSummary.empty(), factory.emptyEmissionsDataModel(), - factory.emptyStopConsolidationRepository() + factory.emptyStopConsolidationRepository(), + factory.emptyStreetLimitationParameters() ); } @@ -90,7 +93,8 @@ private ConstructApplication createAppConstruction( WorldEnvelopeRepository worldEnvelopeRepository, DataImportIssueSummary issueSummary, @Nullable EmissionsDataModel emissionsDataModel, - @Nullable StopConsolidationRepository stopConsolidationRepository + @Nullable StopConsolidationRepository stopConsolidationRepository, + StreetLimitationParameters streetLimitationParameters ) { return new ConstructApplication( cli, @@ -101,7 +105,8 @@ private ConstructApplication createAppConstruction( graphBuilderDataSources(), issueSummary, emissionsDataModel, - stopConsolidationRepository + stopConsolidationRepository, + streetLimitationParameters ); } } diff --git a/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java index ca90c613db5..aacb42c4336 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java +++ b/src/main/java/org/opentripplanner/standalone/configure/LoadApplicationFactory.java @@ -16,6 +16,7 @@ import org.opentripplanner.standalone.config.CommandLineParameters; import org.opentripplanner.standalone.config.ConfigModel; import org.opentripplanner.standalone.config.configure.LoadConfigModule; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TransitModel; /** @@ -54,6 +55,9 @@ public interface LoadApplicationFactory { @Singleton StopConsolidationRepository emptyStopConsolidationRepository(); + @Singleton + StreetLimitationParameters emptyStreetLimitationParameters(); + @Component.Builder interface Builder { @BindsInstance diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index 9a586219ba1..7cb5392ce8b 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -25,6 +25,7 @@ import org.opentripplanner.standalone.config.routerconfig.TransitRoutingConfig; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.TransitService; @HttpRequestScoped @@ -47,6 +48,7 @@ public class DefaultServerRequestContext implements OtpServerRequestContext { private final VehicleRentalService vehicleRentalService; private final EmissionsService emissionsService; private final StopConsolidationService stopConsolidationService; + private final StreetLimitationParameters streetLimitationParameters; /** * Make sure all mutable components are copied/cloned before calling this constructor. @@ -66,6 +68,7 @@ private DefaultServerRequestContext( EmissionsService emissionsService, List rideHailingServices, StopConsolidationService stopConsolidationService, + StreetLimitationParameters streetLimitationParameters, FlexConfig flexConfig, TraverseVisitor traverseVisitor ) { @@ -85,6 +88,7 @@ private DefaultServerRequestContext( this.rideHailingServices = rideHailingServices; this.emissionsService = emissionsService; this.stopConsolidationService = stopConsolidationService; + this.streetLimitationParameters = streetLimitationParameters; } /** @@ -105,6 +109,7 @@ public static DefaultServerRequestContext create( FlexConfig flexConfig, List rideHailingServices, @Nullable StopConsolidationService stopConsolidationService, + StreetLimitationParameters streetLimitationParameters, @Nullable TraverseVisitor traverseVisitor ) { return new DefaultServerRequestContext( @@ -122,6 +127,7 @@ public static DefaultServerRequestContext create( emissionsService, rideHailingServices, stopConsolidationService, + streetLimitationParameters, flexConfig, traverseVisitor ); @@ -199,6 +205,11 @@ public StopConsolidationService stopConsolidationService() { return stopConsolidationService; } + @Override + public StreetLimitationParameters streetLimitationParameters() { + return streetLimitationParameters; + } + @Override public MeterRegistry meterRegistry() { return meterRegistry; diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java new file mode 100644 index 00000000000..a10fe77144c --- /dev/null +++ b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java @@ -0,0 +1,35 @@ +package org.opentripplanner.street.model; + +import jakarta.inject.Inject; +import jakarta.inject.Singleton; +import java.io.Serializable; +import javax.annotation.Nullable; + +/** + * Holds limits of the street graph. + *

      + * TODO this can be expanded to include some fields from the {@link org.opentripplanner.routing.graph.Graph}. + */ +@Singleton +public class StreetLimitationParameters implements Serializable { + + private Float maxCarSpeed = null; + + @Inject + public StreetLimitationParameters() {} + + /** + * Initiliaze the maximum speed limit in m/s. + */ + public void initMaxCarSpeed(float maxCarSpeed) { + this.maxCarSpeed = maxCarSpeed; + } + + /** + * If this graph contains car routable streets, this value is the maximum speed limit in m/s. + */ + @Nullable + public Float maxCarSpeed() { + return maxCarSpeed; + } +} diff --git a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java index e43278901d4..5891f60bed1 100644 --- a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java +++ b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java @@ -16,11 +16,22 @@ */ public class EuclideanRemainingWeightHeuristic implements RemainingWeightHeuristic { + private static final Float DEFAULT_MAX_CAR_SPEED = 40f; + private double lat; private double lon; private double maxStreetSpeed; private double walkingSpeed; private boolean arriveBy; + private float maxCarSpeed; + + public EuclideanRemainingWeightHeuristic() { + this(DEFAULT_MAX_CAR_SPEED); + } + + public EuclideanRemainingWeightHeuristic(Float maxCarSpeed) { + this.maxCarSpeed = maxCarSpeed != null ? maxCarSpeed : DEFAULT_MAX_CAR_SPEED; + } // TODO This currently only uses the first toVertex. If there are multiple toVertices, it will // not work correctly. @@ -50,7 +61,7 @@ public void initialize( private double getStreetSpeedUpperBound(RoutingPreferences preferences, StreetMode streetMode) { // Assume carSpeed > bikeSpeed > walkSpeed if (streetMode.includesDriving()) { - return preferences.car().speed(); + return maxCarSpeed; } if (streetMode.includesBiking()) { return preferences.bike().speed(); diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 25cf95ca2f9..c759ce25be9 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -997,7 +997,7 @@ type RoutingParameters { "Time to park a car in a park and ride, w/o taking into account driving and walking cost." carDropOffTime: Int "Max car speed along streets, in meters per second" - carSpeed: Float + carSpeed: Float @deprecated(reason : "This parameter is no longer configurable.") compactLegsByReversedSearch: Boolean @deprecated(reason : "NOT IN USE IN OTP2.") debugItineraryFilter: Boolean @deprecated(reason : "Use `itineraryFilter.debug` instead.") "Option to disable the default filtering of GTFS-RT alerts by time." diff --git a/src/test/java/org/opentripplanner/ConstantsForTests.java b/src/test/java/org/opentripplanner/ConstantsForTests.java index e74c66e527b..53b2bf9b396 100644 --- a/src/test/java/org/opentripplanner/ConstantsForTests.java +++ b/src/test/java/org/opentripplanner/ConstantsForTests.java @@ -38,6 +38,7 @@ import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; import org.opentripplanner.standalone.config.BuildConfig; import org.opentripplanner.standalone.config.OtpConfigLoader; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.TraverseModeSet; import org.opentripplanner.test.support.ResourceLoader; @@ -132,6 +133,7 @@ public static TestOtpModel buildNewPortlandGraph(boolean withElevation) { .of(osmProvider, graph) .withStaticParkAndRide(true) .withStaticBikeParkAndRide(true) + .withStreetLimitationParameters(new StreetLimitationParameters()) .build(); osmModule.buildGraph(); } @@ -172,7 +174,10 @@ public static TestOtpModel buildOsmGraph(File osmFile) { var transitModel = new TransitModel(stopModel, deduplicator); // Add street data from OSM OsmProvider osmProvider = new OsmProvider(osmFile, true); - OsmModule osmModule = OsmModule.of(osmProvider, graph).build(); + OsmModule osmModule = OsmModule + .of(osmProvider, graph) + .withStreetLimitationParameters(new StreetLimitationParameters()) + .build(); osmModule.buildGraph(); return new TestOtpModel(graph, transitModel); } catch (Exception e) { diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index 5d74dbba240..f80795c2155 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -20,6 +20,7 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; @@ -51,6 +52,7 @@ public static OtpServerRequestContext createServerContext( routerConfig.flexConfig(), List.of(), null, + new StreetLimitationParameters(), null ); creatTransitLayerForRaptor(transitModel, routerConfig.transitTuningConfig()); diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 127fe66f0ea..f4d4f5b005f 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -48,6 +48,7 @@ import org.opentripplanner.service.worldenvelope.internal.DefaultWorldEnvelopeService; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; @@ -132,6 +133,7 @@ public class TripRequestMapperTest implements PlanTestConstants { RouterConfig.DEFAULT.flexConfig(), List.of(), null, + new StreetLimitationParameters(), null ), null, diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java index 091652a2dbf..99ac1554134 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java @@ -33,6 +33,7 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.impl.GraphPathFinder; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.vertex.BarrierVertex; @@ -356,7 +357,11 @@ private void testBuildingAreas(boolean skipVisibility) { File file = RESOURCE_LOADER.file("usf_area.osm.pbf"); OsmProvider provider = new OsmProvider(file, false); - OsmModule loader = OsmModule.of(provider, graph).withAreaVisibility(!skipVisibility).build(); + OsmModule loader = OsmModule + .of(provider, graph) + .withAreaVisibility(!skipVisibility) + .withStreetLimitationParameters(new StreetLimitationParameters()) + .build(); loader.buildGraph(); diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java b/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java index 4cdada95e4b..7d83ec9c87c 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/osm/TriangleInequalityTest.java @@ -180,7 +180,7 @@ private void checkTriangleInequality(RequestModes modes, List fil preferences .withWalk(walk -> walk.withStairsReluctance(1.0).withSpeed(1.0).withReluctance(1.0)) .withStreet(street -> street.withTurnReluctance(1.0)) - .withCar(car -> car.withSpeed(1.0).withReluctance(1.0)) + .withCar(car -> car.withReluctance(1.0)) .withBike(bike -> bike.withSpeed(1.0).withReluctance(1.0)) ); diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java index cbaccb87f84..5f95436833d 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java @@ -69,7 +69,7 @@ public void testCarSpeeds() { wps.addSpeedPicker(getSpeedPicker("highway=motorway", kmhAsMs(100))); wps.addSpeedPicker(getSpeedPicker("highway=*", kmhAsMs(35))); wps.addSpeedPicker(getSpeedPicker("surface=gravel", kmhAsMs(10))); - wps.defaultSpeed = kmhAsMs(25); + wps.defaultCarSpeed = kmhAsMs(25); way = new OSMWithTags(); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java b/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java index 53e340dcc63..f3febc38cbf 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/TurnCostTest.java @@ -92,7 +92,7 @@ public void before() { proto = new RouteRequest(); proto.withPreferences(preferences -> preferences - .withCar(it -> it.withSpeed(1.0).withReluctance(1.0)) + .withCar(it -> it.withReluctance(1.0)) .withBike(bike -> bike.withSpeed(1.0).withReluctance(1.0)) .withWalk(walk -> walk.withSpeed(1.0).withStairsReluctance(1.0).withReluctance(1.0)) .withStreet(it -> it.withTurnReluctance(1.0)) diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java index 4359ed9b33d..6b03873b80d 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/CarPreferencesTest.java @@ -10,8 +10,6 @@ class CarPreferencesTest { - private static final double SPEED = 20.111; - private static final double EXPECTED_SPEED = 20.0; private static final double RELUCTANCE = 5.111; private static final double EXPECTED_RELUCTANCE = 5.1; private static final int PICKUP_TIME = 600; @@ -23,7 +21,6 @@ class CarPreferencesTest { private final CarPreferences subject = CarPreferences .of() - .withSpeed(SPEED) .withReluctance(RELUCTANCE) .withPickupTime(Duration.ofSeconds(PICKUP_TIME)) .withPickupCost(PICKUP_COST) @@ -33,11 +30,6 @@ class CarPreferencesTest { .withParking(parking -> parking.withCost(PARK_COST).build()) .build(); - @Test - void speed() { - assertEquals(EXPECTED_SPEED, subject.speed()); - } - @Test void reluctance() { assertEquals(EXPECTED_RELUCTANCE, subject.reluctance()); @@ -82,8 +74,8 @@ void testCopyOfEqualsAndHashCode() { assertSame(subject, subject.copyOf().build()); // Create a copy, make a change and set it back again to force creating a new object - var other = subject.copyOf().withSpeed(0.0).build(); - var same = other.copyOf().withSpeed(SPEED).build(); + var other = subject.copyOf().withReluctance(0.0).build(); + var same = other.copyOf().withReluctance(RELUCTANCE).build(); assertEqualsAndHashCode(subject, other, same); } @@ -92,7 +84,6 @@ void testToString() { assertEquals("CarPreferences{}", CarPreferences.DEFAULT.toString()); assertEquals( "CarPreferences{" + - "speed: 20.0, " + "reluctance: 5.1, " + "parking: VehicleParkingPreferences{cost: $30}, " + "rental: VehicleRentalPreferences{pickupTime: 30s}, " + diff --git a/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java b/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java index 818efb67d41..f1f9ff8bfe6 100644 --- a/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java +++ b/src/test/java/org/opentripplanner/routing/graph/GraphSerializationTest.java @@ -27,6 +27,7 @@ import org.opentripplanner.service.worldenvelope.internal.DefaultWorldEnvelopeRepository; import org.opentripplanner.standalone.config.BuildConfig; import org.opentripplanner.standalone.config.RouterConfig; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.service.TransitModel; @@ -180,6 +181,8 @@ private void testRoundTrip( ) throws Exception { // Now round-trip the graph through serialization. File tempFile = TempFile.createTempFile("graph", "pdx"); + var streetLimitationParameters = new StreetLimitationParameters(); + streetLimitationParameters.initMaxCarSpeed(40); SerializedGraphObject serializedObj = new SerializedGraphObject( originalGraph, originalTransitModel, @@ -188,7 +191,8 @@ private void testRoundTrip( RouterConfig.DEFAULT, DataImportIssueSummary.empty(), emissionsDataModel, - null + null, + streetLimitationParameters ); serializedObj.save(new FileDataSource(tempFile, FileType.GRAPH)); SerializedGraphObject deserializedGraph = SerializedGraphObject.load(tempFile); diff --git a/src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java b/src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java index d40930f8bdc..f5d660e5d88 100644 --- a/src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java +++ b/src/test/java/org/opentripplanner/street/model/TurnRestrictionTest.java @@ -94,9 +94,7 @@ public void testHasExplicitTurnRestrictions() { public void testForwardDefault() { var request = new RouteRequest(); - request.withPreferences(preferences -> - preferences.withCar(it -> it.withSpeed(1.0)).withWalk(w -> w.withSpeed(1.0)) - ); + request.withPreferences(preferences -> preferences.withWalk(w -> w.withSpeed(1.0))); ShortestPathTree tree = StreetSearchBuilder .of() @@ -156,7 +154,6 @@ public void testForwardAsPedestrian() { @Test public void testForwardAsCar() { var request = new RouteRequest(); - request.withPreferences(p -> p.withCar(it -> it.withSpeed(1.0))); ShortestPathTree tree = StreetSearchBuilder .of() diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 42d841b9fa3..eb60517735a 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -58,7 +58,7 @@ public void before() { .withBike(it -> it.withSpeed(5.0f).withReluctance(1.0).withWalking(w -> w.withSpeed(0.8)) ) - .withCar(c -> c.withSpeed(15.0f).withReluctance(1.0)) + .withCar(c -> c.withReluctance(1.0)) ) .build(); } diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index 7a11c35bace..e66e828856a 100644 --- a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -31,6 +31,7 @@ import org.opentripplanner.standalone.config.OtpConfigLoader; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; +import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.speed_test.model.SpeedTestProfile; @@ -120,6 +121,7 @@ public SpeedTest( config.flexConfig, List.of(), null, + new StreetLimitationParameters(), null ); // Creating transitLayerForRaptor should be integrated into the TransitModel, but for now diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 9293cfad8f4..b4c76b7261c 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -43,7 +43,6 @@ } }, "car": { - "speed": 40, "reluctance": 10, "decelerationSpeed": 2.9, "accelerationSpeed": 2.9, From 634b3398a033c247ac625bead890280cc3bebb60 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Mon, 5 Feb 2024 06:52:01 +0000 Subject: [PATCH 0481/1688] Bump serialization version id for #5640 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bc8ee82b7ec..2bbfec9490a 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 141 + 142 30.2 2.50 From 9f66f5db54ed12a6b426d50b2f7f5acb1c7db1d2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 5 Feb 2024 09:35:30 +0100 Subject: [PATCH 0482/1688] Move method into sandbox --- .../ext/geocoder/LuceneIndexTest.java | 15 +++++------- .../ext/geocoder/StopClusterMapper.java | 24 +++++++++++++------ .../service/DefaultTransitService.java | 15 ------------ .../transit/service/TransitService.java | 12 ---------- .../service/DefaultTransitServiceTest.java | 7 ------ 5 files changed, 23 insertions(+), 50 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 8dc3ff77a01..b1fb33dfdd3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -21,6 +21,7 @@ import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.Station; @@ -131,15 +132,6 @@ public List getModesOfStopLocation(StopLocation stop) { } } - @Override - public List getAgenciesForStopLocation(StopLocation stop) { - if (stop.equals(ALEXANDERPLATZ_BUS)) { - return List.of(BVG); - } else { - return List.of(); - } - } - @Override public Agency getAgencyForId(FeedScopedId id) { if (id.equals(BVG.getId())) { @@ -148,6 +140,11 @@ public Agency getAgencyForId(FeedScopedId id) { return null; } + @Override + public Set getRoutesForStop(StopLocation stop) { + return Set.of(TransitModelForTest.route("route1").withAgency(BVG).build()); + } + @Override public FeedInfo getFeedInfo(String feedId) { return new FeedInfo( diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 10243665ac8..6f16d4a0cce 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -2,11 +2,13 @@ import com.google.common.collect.Iterables; import java.util.Collection; +import java.util.List; import java.util.Optional; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.model.FeedInfo; +import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.site.StopLocationsGroup; @@ -59,8 +61,7 @@ Iterable generateStopClusters( LuceneStopCluster map(StopLocationsGroup g) { var modes = transitService.getModesOfStopLocationsGroup(g).stream().map(Enum::name).toList(); - var agencies = transitService - .getAgenciesForStopLocationsGroup(g) + var agencies = agenciesForStopLocationsGroup(g) .stream() .map(s -> s.getId().toString()) .toList(); @@ -75,11 +76,7 @@ LuceneStopCluster map(StopLocationsGroup g) { } Optional map(StopLocation sl) { - var agencies = transitService - .getAgenciesForStopLocation(sl) - .stream() - .map(a -> a.getId().toString()) - .toList(); + var agencies = agenciesForStopLocation(sl).stream().map(a -> a.getId().toString()).toList(); return Optional .ofNullable(sl.getName()) .map(name -> { @@ -95,6 +92,19 @@ Optional map(StopLocation sl) { }); } + private List agenciesForStopLocation(StopLocation stop) { + return transitService.getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList(); + } + + private List agenciesForStopLocationsGroup(StopLocationsGroup group) { + return group + .getChildStops() + .stream() + .flatMap(sl -> agenciesForStopLocation(sl).stream()) + .distinct() + .toList(); + } + private static StopCluster.Coordinate toCoordinate(WgsCoordinate c) { return new StopCluster.Coordinate(c.latitude(), c.longitude()); } diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java index f38499bfd68..0d08bcf34b2 100644 --- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -572,21 +572,6 @@ public List getModesOfStopLocation(StopLocation stop) { return sortByOccurrenceAndReduce(getPatternModesOfStop(stop)).toList(); } - @Override - public List getAgenciesForStopLocation(StopLocation stop) { - return getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList(); - } - - @Override - public List getAgenciesForStopLocationsGroup(StopLocationsGroup group) { - return group - .getChildStops() - .stream() - .flatMap(sl -> getAgenciesForStopLocation(sl).stream()) - .distinct() - .toList(); - } - /** * For each pattern visiting this {@link StopLocation} return its {@link TransitMode} */ diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java index 156a3c8dd1a..d0664aa292d 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -215,16 +215,4 @@ List stopTimesForPatternAtStop( * So, if more patterns of mode BUS than RAIL visit the stop, the result will be [BUS,RAIL]. */ List getModesOfStopLocation(StopLocation stop); - - /** - * Iterates over all child stops, the routes that visit this stop and return a de-duplicated list - * of their agencies. - */ - List getAgenciesForStopLocationsGroup(StopLocationsGroup group); - - /** - * Iterates over all routes that visit this stop location and return a de-duplicated list - * of their agencies. - */ - List getAgenciesForStopLocation(StopLocation stop); } diff --git a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java index ab3d5c8ae0a..f04fe782a0a 100644 --- a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java +++ b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java @@ -76,11 +76,4 @@ void stationModes() { var modes = service.getModesOfStopLocationsGroup(STATION); assertEquals(List.of(RAIL, FERRY, TRAM), modes); } - - @Test - void stopAgencies() { - var stop = RAIL_PATTERN.getStopPattern().getStop(0); - var agencies = service.getAgenciesForStopLocation(stop); - assertEquals("[Agency{F:A1 Agency Test}]", agencies.toString()); - } } From eaaf758208c26902f79bce952d334036b4441a5b Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 5 Feb 2024 12:05:52 +0000 Subject: [PATCH 0483/1688] Add changelog entry for #5651 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 37c8d26053e..05731e6fbeb 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -87,6 +87,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Introduce `generalizedCostPlusPenalty` to make cost comparsion fairer [#5483](https://github.com/opentripplanner/OpenTripPlanner/pull/5483) - Separate walk time from non-transit time [#5648](https://github.com/opentripplanner/OpenTripPlanner/pull/5648) - Remove "fare" [#5645](https://github.com/opentripplanner/OpenTripPlanner/pull/5645) +- Refactor GroupStopBuilder addLocation method [#5651](https://github.com/opentripplanner/OpenTripPlanner/pull/5651) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 190f745d089da47672814a01c10834085a0e49f7 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Mon, 5 Feb 2024 12:06:13 +0000 Subject: [PATCH 0484/1688] Bump serialization version id for #5651 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c0b2ca4292a..be1e49f2a16 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 142 + 143 30.2 2.50 From 4f5c5900a652c5e1e8851f234bd070940bcaeb46 Mon Sep 17 00:00:00 2001 From: eibakke Date: Mon, 5 Feb 2024 14:21:45 +0100 Subject: [PATCH 0485/1688] Fixes a few typos and improves documentation in the TransitService interface. --- .../parkAndRideApi/ParkAndRideResource.java | 2 +- .../ext/restapi/resources/IndexAPI.java | 4 ++-- .../layers/stops/StopsLayerBuilder.java | 2 +- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 3 +-- .../transmodel/TransmodelGraphQLSchema.java | 2 +- .../transmodel/model/stop/StopPlaceType.java | 2 +- .../GraphInspectorVectorTileResource.java | 2 +- .../graph_builder/module/NearbyStopFinder.java | 2 +- .../routing/linking/FlexLocationAdder.java | 2 +- .../api/OtpServerRequestContext.java | 2 +- .../transit/service/DefaultTransitService.java | 4 ++-- .../transit/service/StopModel.java | 18 +++++++++++++++--- .../transit/service/TransitService.java | 2 +- .../gtfs/mapping/RouteRequestMapperTest.java | 2 +- 14 files changed, 30 insertions(+), 19 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java b/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java index 02dfc1bef5d..4a577433bfe 100644 --- a/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java +++ b/src/ext/java/org/opentripplanner/ext/parkAndRideApi/ParkAndRideResource.java @@ -42,7 +42,7 @@ public ParkAndRideResource( // - serverContext.graphFinder(). This needs at least a comment! // - This can be replaced with a search done with the StopModel // - if we have a radius search there. - this.graphFinder = new DirectGraphFinder(serverContext.transitService()::findRegularStop); + this.graphFinder = new DirectGraphFinder(serverContext.transitService()::findRegularStops); } /** Envelopes are in latitude, longitude format */ diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java index 5bdda8a57a2..cab2be13ad0 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/IndexAPI.java @@ -200,7 +200,7 @@ public List getStopsInRadius( radius = Math.min(radius, MAX_STOP_SEARCH_RADIUS); - return new DirectGraphFinder(serverContext.transitService()::findRegularStop) + return new DirectGraphFinder(serverContext.transitService()::findRegularStops) .findClosestStops(new Coordinate(lon, lat), radius) .stream() .map(it -> StopMapper.mapToApiShort(it.stop, it.distance)) @@ -221,7 +221,7 @@ public List getStopsInRadius( new Coordinate(maxLon, maxLat) ); - var stops = transitService().findRegularStop(envelope); + var stops = transitService().findRegularStops(envelope); return stops .stream() .filter(stop -> envelope.contains(stop.getCoordinate().asJtsCoordinate())) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java index 6d15816669e..2ad85587fe5 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java @@ -37,7 +37,7 @@ public StopsLayerBuilder( protected List getGeometries(Envelope query) { return transitService - .findRegularStop(query) + .findRegularStops(query) .stream() .map(stop -> { Geometry point = stop.getGeometry(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index d749987384c..a4f5cb00e2f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import java.util.Objects; -import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; import org.locationtech.jts.geom.Coordinate; @@ -710,7 +709,7 @@ public DataFetcher> stopsByBbox() { ); Stream stopStream = getTransitService(environment) - .findRegularStop(envelope) + .findRegularStops(envelope) .stream() .filter(stop -> envelope.contains(stop.getCoordinate().asJtsCoordinate())); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java index 00bf98c703f..638d7783e9a 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java @@ -687,7 +687,7 @@ private GraphQLSchema create() { ); return GqlUtil .getTransitService(environment) - .findRegularStop(envelope) + .findRegularStops(envelope) .stream() .filter(stop -> envelope.contains(stop.getCoordinate().asJtsCoordinate())) .filter(stop -> diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java index accaf1e35fb..d178e5125b5 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java @@ -531,7 +531,7 @@ public static Collection fetchStopPlaces( ); Stream stations = transitService - .findRegularStop(envelope) + .findRegularStops(envelope) .stream() .filter(stop -> envelope.contains(stop.getCoordinate().asJtsCoordinate())) .map(StopLocation::getParentStation) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index 03f4357e540..dc6ba627e0e 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -179,7 +179,7 @@ private static LayerBuilder createLayerBuilder( case RegularStop -> new StopLayerBuilder<>( layerParameters, locale, - e -> context.transitService().findRegularStop(e) + e -> context.transitService().findRegularStops(e) ); case AreaStop -> new StopLayerBuilder<>( layerParameters, diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index 360cdaee363..1fbfffcec5f 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -85,7 +85,7 @@ public NearbyStopFinder( // We need to accommodate straight line distance (in meters) but when streets are present we // use an earliest arrival search, which optimizes on time. Ideally we'd specify in meters, // but we don't have much of a choice here. Use the default walking speed to convert. - this.directGraphFinder = new DirectGraphFinder(transitService::findRegularStop); + this.directGraphFinder = new DirectGraphFinder(transitService::findRegularStops); } } diff --git a/src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java b/src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java index 830a80c39a5..047e44f229a 100644 --- a/src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java +++ b/src/main/java/org/opentripplanner/routing/linking/FlexLocationAdder.java @@ -16,7 +16,7 @@ static void addFlexLocations(StreetEdge edge, IntersectionVertex v0, StopModel s if (edge.getPermission().allows(StreetTraversalPermission.PEDESTRIAN_AND_CAR)) { Point p = GeometryUtils.getGeometryFactory().createPoint(v0.getCoordinate()); Envelope env = p.getEnvelopeInternal(); - for (AreaStop areaStop : stopModel.queryLocationIndex(env)) { + for (AreaStop areaStop : stopModel.findAreaStops(env)) { if (!areaStop.getGeometry().disjoint(p)) { v0.addAreaStops(Set.of(areaStop)); } diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index fa3a7069e2d..bbc6733a40c 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -114,7 +114,7 @@ public interface OtpServerRequestContext { TraverseVisitor traverseVisitor(); default GraphFinder graphFinder() { - return GraphFinder.getInstance(graph(), transitService()::findRegularStop); + return GraphFinder.getInstance(graph(), transitService()::findRegularStops); } FlexConfig flexConfig(); diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java index 0d08bcf34b2..3050fca6a3d 100644 --- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -543,7 +543,7 @@ public ZonedDateTime getTransitServiceStarts() { } @Override - public Collection findRegularStop(Envelope envelope) { + public Collection findRegularStops(Envelope envelope) { OTPRequestTimeoutException.checkForTimeout(); return transitModel.getStopModel().findRegularStops(envelope); } @@ -551,7 +551,7 @@ public Collection findRegularStop(Envelope envelope) { @Override public Collection findAreaStops(Envelope envelope) { OTPRequestTimeoutException.checkForTimeout(); - return transitModel.getStopModel().queryLocationIndex(envelope); + return transitModel.getStopModel().findAreaStops(envelope); } @Override diff --git a/src/main/java/org/opentripplanner/transit/service/StopModel.java b/src/main/java/org/opentripplanner/transit/service/StopModel.java index dd6b65e5b33..763aa504c40 100644 --- a/src/main/java/org/opentripplanner/transit/service/StopModel.java +++ b/src/main/java/org/opentripplanner/transit/service/StopModel.java @@ -108,7 +108,7 @@ public StopModelBuilder withContext() { } /** - * Return a regular transit stop if found(not flex stops). + * Return a regular transit stop if found (not flex stops). */ public RegularStop getRegularStop(FeedScopedId id) { return regularStopById.get(id); @@ -121,6 +121,9 @@ public Collection listRegularStops() { return regularStopById.values(); } + /** + * Find regular stops within a geographical area. + */ public Collection findRegularStops(Envelope envelope) { return index.findRegularStops(envelope); } @@ -131,21 +134,30 @@ public boolean hasAreaStops() { /** * Flex locations are generated by GTFS graph builder, but consumed only after the street graph is - * built + * built. */ @Nullable public AreaStop getAreaStop(FeedScopedId id) { return areaStopById.get(id); } + /** + * Return all flex stops, not regular transit stops and flex group of stops. + */ public Collection listAreaStops() { return areaStopById.values(); } - public Collection queryLocationIndex(Envelope envelope) { + /** + * Find flex stops within a geographical area. + */ + public Collection findAreaStops(Envelope envelope) { return index.findAreaStops(envelope); } + /** + * Return all flex groups of stops. + */ public Collection listGroupStops() { return groupStopById.values(); } diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java index d0664aa292d..fdb6dda8749 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -187,7 +187,7 @@ List stopTimesForPatternAtStop( boolean transitFeedCovers(Instant dateTime); - Collection findRegularStop(Envelope envelope); + Collection findRegularStops(Envelope envelope); Collection findAreaStops(Envelope envelope); diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java index b05dd77e2a9..85736291ada 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java @@ -55,7 +55,7 @@ class RouteRequestMapperTest implements PlanTestConstants { graph.getVehicleParkingService(), new DefaultVehicleRentalService(), new DefaultRealtimeVehicleService(transitService), - GraphFinder.getInstance(graph, transitService::findRegularStop), + GraphFinder.getInstance(graph, transitService::findRegularStops), new RouteRequest() ); } From 8a7bbc08f603a961511ec5c8a255a80927fb45c3 Mon Sep 17 00:00:00 2001 From: eibakke Date: Mon, 5 Feb 2024 14:36:26 +0100 Subject: [PATCH 0486/1688] Changes the GroupStop's getEncompassingAreaGeometry method to return an empty optional if the group stop is not defined as an area. This was an oversight earlier. --- .../org/opentripplanner/transit/model/site/GroupStop.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java index edee00e27e1..c674d588238 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupStop.java @@ -94,13 +94,12 @@ public Geometry getGeometry() { /** * Returns the geometry of the area that encompasses the bounds of this StopLocation group. If the - * group is defined only as a list of stops, this will return the same as getGeometry. If on the - * other hand the group is defined as an area and the stops are inferred from that area, then this - * will return the geometry of the area. + * group is defined as all the stops within an area, then this will return the geometry of the + * area. If the group is defined simply as a list of stops, this will return an empty optional. */ @Override public Optional getEncompassingAreaGeometry() { - return Optional.ofNullable(encompassingAreaGeometry).or(() -> Optional.of(geometry)); + return Optional.ofNullable(encompassingAreaGeometry); } @Override From 6d5be573ea5e88713a19c3551f6470890601f913 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 12:40:25 +0200 Subject: [PATCH 0487/1688] Add ISO date times to GraphQL API --- .../apis/gtfs/GraphQLScalars.java | 32 +++++++++++++++++++ .../apis/gtfs/datafetchers/LegImpl.java | 13 ++++++++ .../gtfs/generated/GraphQLDataFetchers.java | 4 +++ .../apis/gtfs/generated/graphql-codegen.yml | 1 + .../opentripplanner/apis/gtfs/schema.graphqls | 5 +++ .../apis/gtfs/queries/plan-extended.graphql | 2 ++ 6 files changed, 57 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 6280ac28ac2..0e21df48dc1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -10,6 +10,10 @@ import graphql.schema.CoercingParseValueException; import graphql.schema.CoercingSerializeException; import graphql.schema.GraphQLScalarType; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import javax.annotation.Nonnull; import org.locationtech.jts.geom.Geometry; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; @@ -50,6 +54,34 @@ public String parseLiteral(Object input) { ) .build(); + public static GraphQLScalarType dateTimeScalar = GraphQLScalarType + .newScalar() + .name("DateTime") + .coercing( + new Coercing() { + @Override + public String serialize(@Nonnull Object dataFetcherResult) + throws CoercingSerializeException { + if (dataFetcherResult instanceof ZonedDateTime zdt) { + return zdt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); + } else if (dataFetcherResult instanceof OffsetDateTime odt) { + return odt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); + } else return null; + } + + @Override + public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { + return null; + } + + @Override + public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { + return null; + } + } + ) + .build(); + public static GraphQLScalarType geoJsonScalar = GraphQLScalarType .newScalar() .name("GeoJson") diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 639cb95bf28..94cda56b652 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -2,6 +2,7 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; +import java.time.OffsetDateTime; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -78,6 +79,12 @@ public DataFetcher duration() { } @Override + public DataFetcher end() { + return environment -> getSource(environment).getStartTime().toOffsetDateTime(); + } + + @Override + @Deprecated public DataFetcher endTime() { return environment -> getSource(environment).getEndTime().toInstant().toEpochMilli(); } @@ -216,6 +223,12 @@ public DataFetcher serviceDate() { } @Override + public DataFetcher start() { + return environment -> getSource(environment).getStartTime().toOffsetDateTime(); + } + + @Override + @Deprecated public DataFetcher startTime() { return environment -> getSource(environment).getStartTime().toInstant().toEpochMilli(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 2f39f7f4030..8194a0c5f4f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -440,6 +440,8 @@ public interface GraphQLLeg { public DataFetcher duration(); + public DataFetcher end(); + public DataFetcher endTime(); public DataFetcher> fareProducts(); @@ -480,6 +482,8 @@ public interface GraphQLLeg { public DataFetcher serviceDate(); + public DataFetcher start(); + public DataFetcher startTime(); public DataFetcher> steps(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index c141266d2e6..24cde3afe43 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -26,6 +26,7 @@ config: Polyline: String GeoJson: org.locationtech.jts.geom.Geometry Grams: org.opentripplanner.framework.model.Grams + DateTime: java.time.OffsetDateTime Duration: java.time.Duration mappers: AbsoluteDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAbsoluteDirection#GraphQLAbsoluteDirection diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index daeb57d655e..2576dcf6441 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1640,12 +1640,17 @@ type RideHailingEstimate { productName: String } +scalar DateTime + type Leg { """ The date and time when this leg begins. Format: Unix timestamp in milliseconds. """ startTime: Long + start: DateTime + end: DateTime + """ The date and time when this leg ends. Format: Unix timestamp in milliseconds. """ diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index db30d8489ef..7eb4552b63d 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -28,6 +28,8 @@ walkTime legs { mode + start + end from { name lat From 67cf67ee842e2bdccc787e957563575d1fe4352d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 12:40:36 +0200 Subject: [PATCH 0488/1688] Add scalar --- .../java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index ff3e8681ce8..5ddfb2ba6d1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -111,6 +111,7 @@ protected static GraphQLSchema buildSchema() { .scalar(GraphQLScalars.geoJsonScalar) .scalar(GraphQLScalars.graphQLIDScalar) .scalar(GraphQLScalars.gramsScalar) + .scalar(GraphQLScalars.dateTimeScalar) .scalar(ExtendedScalars.GraphQLLong) .type("Node", type -> type.typeResolver(new NodeTypeResolver())) .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver())) From 5835324d8e9226e007e8cfc28e13c462b94be843 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 12:51:37 +0200 Subject: [PATCH 0489/1688] Implement start/end for Itinerary --- .../apis/gtfs/datafetchers/ItineraryImpl.java | 12 ++++++++++++ .../apis/gtfs/generated/GraphQLDataFetchers.java | 4 +++- .../org/opentripplanner/apis/gtfs/schema.graphqls | 9 ++++++--- .../apis/gtfs/expectations/plan-extended.json | 10 ++++++++++ .../apis/gtfs/queries/plan-extended.graphql | 3 +++ 5 files changed, 34 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java index c7ae82a2355..5396f66024f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java @@ -2,6 +2,7 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; +import java.time.OffsetDateTime; import java.util.List; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.mapping.NumberMapper; @@ -32,6 +33,11 @@ public DataFetcher elevationLost() { return environment -> getSource(environment).getElevationLost(); } + @Override + public DataFetcher end() { + return environment -> getSource(environment).endTime().toOffsetDateTime(); + } + @Override public DataFetcher endTime() { return environment -> getSource(environment).endTime().toInstant().toEpochMilli(); @@ -57,6 +63,12 @@ public DataFetcher numberOfTransfers() { return environment -> getSource(environment).getNumberOfTransfers(); } + @Override + public DataFetcher start() { + return environment -> getSource(environment).startTime().toOffsetDateTime(); + } + + @Override public DataFetcher startTime() { return environment -> getSource(environment).startTime().toInstant().toEpochMilli(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 8194a0c5f4f..87ab5ad7b1d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -398,7 +398,7 @@ public interface GraphQLItinerary { public DataFetcher elevationLost(); - public DataFetcher emissionsPerPerson(); + public DataFetcher end(); public DataFetcher endTime(); @@ -408,6 +408,8 @@ public interface GraphQLItinerary { public DataFetcher> legs(); + public DataFetcher start(); + public DataFetcher numberOfTransfers(); public DataFetcher startTime(); diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 2576dcf6441..d77b63a0956 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1500,12 +1500,15 @@ type Itinerary { """ Time when the user leaves from the origin. Format: Unix timestamp in milliseconds. """ - startTime: Long + startTime: Long @deprecated(reason: "Use `start` instead which includes timezone information.") """ - Time when the user arrives to the destination.. Format: Unix timestamp in milliseconds. + Time when the user arrives to the destination. Format: Unix timestamp in milliseconds. """ - endTime: Long + endTime: Long @deprecated(reason: "Use `end` instead which includes timezone information.") + + start: DateTime + end: DateTime """Duration of the trip on this itinerary, in seconds.""" duration: Long diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index 557cdec8659..378e87838e9 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -3,6 +3,8 @@ "plan" : { "itineraries" : [ { + "start" : "2020-02-02T11:00:00Z", + "end" : "2020-02-02T12:00:00Z", "startTime" : 1580641200000, "endTime" : 1580644800000, "generalizedCost" : 4072, @@ -16,6 +18,8 @@ "legs" : [ { "mode" : "WALK", + "start" : "2020-02-02T11:00:00Z", + "end" : "2020-02-02T11:00:00Z", "from" : { "name" : "A", "lat" : 5.0, @@ -41,6 +45,8 @@ }, { "mode" : "BUS", + "start" : "2020-02-02T11:01:00Z", + "end" : "2020-02-02T11:01:00Z", "from" : { "name" : "B", "lat" : 6.0, @@ -68,6 +74,8 @@ }, { "mode" : "RAIL", + "start" : "2020-02-02T11:30:00Z", + "end" : "2020-02-02T11:30:00Z", "from" : { "name" : "C", "lat" : 7.0, @@ -115,6 +123,8 @@ }, { "mode" : "CAR", + "start" : "2020-02-02T11:50:00Z", + "end" : "2020-02-02T11:50:00Z", "from" : { "name" : "D", "lat" : 8.0, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index 7eb4552b63d..cde918e43b0 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -16,6 +16,9 @@ } ]) { itineraries { + start + end + # next two are deprecated startTime endTime generalizedCost From 8a966c2fd44cd478ac8f071dbe5a8b8d25850d5e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 12:54:02 +0200 Subject: [PATCH 0490/1688] Use correct times for leg --- .../apis/gtfs/datafetchers/LegImpl.java | 2 +- .../apis/gtfs/expectations/plan-extended.json | 8 ++++---- .../apis/gtfs/expectations/plan.json | 20 +++++++++---------- .../apis/gtfs/queries/plan.graphql | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 94cda56b652..50e935ce7ea 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -80,7 +80,7 @@ public DataFetcher duration() { @Override public DataFetcher end() { - return environment -> getSource(environment).getStartTime().toOffsetDateTime(); + return environment -> getSource(environment).getEndTime().toOffsetDateTime(); } @Override diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index 378e87838e9..739e0453e08 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -19,7 +19,7 @@ { "mode" : "WALK", "start" : "2020-02-02T11:00:00Z", - "end" : "2020-02-02T11:00:00Z", + "end" : "2020-02-02T11:00:20Z", "from" : { "name" : "A", "lat" : 5.0, @@ -46,7 +46,7 @@ { "mode" : "BUS", "start" : "2020-02-02T11:01:00Z", - "end" : "2020-02-02T11:01:00Z", + "end" : "2020-02-02T11:15:00Z", "from" : { "name" : "B", "lat" : 6.0, @@ -75,7 +75,7 @@ { "mode" : "RAIL", "start" : "2020-02-02T11:30:00Z", - "end" : "2020-02-02T11:30:00Z", + "end" : "2020-02-02T11:50:00Z", "from" : { "name" : "C", "lat" : 7.0, @@ -124,7 +124,7 @@ { "mode" : "CAR", "start" : "2020-02-02T11:50:00Z", - "end" : "2020-02-02T11:50:00Z", + "end" : "2020-02-02T12:00:00Z", "from" : { "name" : "D", "lat" : 8.0, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index 06fd20be150..408b1c17ed5 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -3,13 +3,13 @@ "plan" : { "itineraries" : [ { - "startTime" : 1580641200000, - "endTime" : 1580644800000, + "start" : "2020-02-02T11:00:00Z", + "end" : "2020-02-02T12:00:00Z", "legs" : [ { "mode" : "WALK", - "startTime" : 1580641200000, - "endTime" : 1580641220000, + "start" : "2020-02-02T11:00:00Z", + "end" : "2020-02-02T11:00:20Z", "from" : { "name" : "A", "lat" : 5.0, @@ -29,8 +29,8 @@ }, { "mode" : "BUS", - "startTime" : 1580641260000, - "endTime" : 1580642100000, + "start" : "2020-02-02T11:01:00Z", + "end" : "2020-02-02T11:15:00Z", "from" : { "name" : "B", "lat" : 6.0, @@ -56,8 +56,8 @@ }, { "mode" : "RAIL", - "startTime" : 1580643000000, - "endTime" : 1580644200000, + "start" : "2020-02-02T11:30:00Z", + "end" : "2020-02-02T11:50:00Z", "from" : { "name" : "C", "lat" : 7.0, @@ -83,8 +83,8 @@ }, { "mode" : "CAR", - "startTime" : 1580644200000, - "endTime" : 1580644800000, + "start" : "2020-02-02T11:50:00Z", + "end" : "2020-02-02T12:00:00Z", "from" : { "name" : "D", "lat" : 8.0, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index d71c991234d..4e638d93759 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -17,12 +17,12 @@ }, ]) { itineraries { - startTime - endTime + start + end legs { mode - startTime - endTime + start + end from { name lat From ed766e651d5a9b602ea9ca053850dad4c1ddbc59 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 13:25:27 +0200 Subject: [PATCH 0491/1688] Add iso time to Place --- docs/apis/GraphQL-Tutorial.md | 16 +++---- .../apis/gtfs/datafetchers/ItineraryImpl.java | 3 +- .../apis/gtfs/datafetchers/PlaceImpl.java | 13 ++++++ .../gtfs/generated/GraphQLDataFetchers.java | 4 ++ .../opentripplanner/apis/gtfs/schema.graphqls | 43 +++++++++++-------- .../apis/gtfs/expectations/plan.json | 32 +++++++------- .../apis/gtfs/queries/plan.graphql | 8 ++-- 7 files changed, 72 insertions(+), 47 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index 8df6d6f38ee..480e2ef10ee 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -88,25 +88,25 @@ Most people want to get routing results out of OTP, so lets see the query for th }, ]) { itineraries { - startTime - endTime + start + end legs { mode - startTime - endTime + start + end from { name lat lon - departureTime - arrivalTime + departure + arrival } to { name lat lon - departureTime - arrivalTime + departure + arrival } route { gtfsId diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java index 5396f66024f..20d5a9c348d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/ItineraryImpl.java @@ -38,6 +38,7 @@ public DataFetcher end() { return environment -> getSource(environment).endTime().toOffsetDateTime(); } + @Deprecated @Override public DataFetcher endTime() { return environment -> getSource(environment).endTime().toInstant().toEpochMilli(); @@ -68,7 +69,7 @@ public DataFetcher start() { return environment -> getSource(environment).startTime().toOffsetDateTime(); } - + @Deprecated @Override public DataFetcher startTime() { return environment -> getSource(environment).startTime().toInstant().toEpochMilli(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java index ce3ca0986b1..28cd088cf86 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java @@ -2,6 +2,7 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; +import java.time.OffsetDateTime; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLVertexType; import org.opentripplanner.apis.gtfs.model.StopPosition; @@ -17,6 +18,12 @@ public class PlaceImpl implements GraphQLDataFetchers.GraphQLPlace { + @Override + public DataFetcher arrival() { + return environment -> getSource(environment).arrival.toOffsetDateTime(); + } + + @Deprecated @Override public DataFetcher arrivalTime() { return environment -> getSource(environment).arrival.toInstant().toEpochMilli(); @@ -45,6 +52,12 @@ public DataFetcher carPark() { return this::getCarPark; } + @Deprecated + @Override + public DataFetcher departure() { + return environment -> getSource(environment).departure.toOffsetDateTime(); + } + @Override public DataFetcher departureTime() { return environment -> getSource(environment).departure.toInstant().toEpochMilli(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 87ab5ad7b1d..431cf874152 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -582,6 +582,8 @@ public interface GraphQLPattern { } public interface GraphQLPlace { + public DataFetcher arrival(); + public DataFetcher arrivalTime(); public DataFetcher bikePark(); @@ -590,6 +592,8 @@ public interface GraphQLPlace { public DataFetcher carPark(); + public DataFetcher departure(); + public DataFetcher departureTime(); public DataFetcher lat(); diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index d77b63a0956..f6abf30aacb 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1646,19 +1646,9 @@ type RideHailingEstimate { scalar DateTime type Leg { - """ - The date and time when this leg begins. Format: Unix timestamp in milliseconds. - """ - startTime: Long - start: DateTime end: DateTime - """ - The date and time when this leg ends. Format: Unix timestamp in milliseconds. - """ - endTime: Long - """ For transit leg, the offset from the scheduled departure time of the boarding stop in this leg, i.e. scheduled time of departure at boarding stop = @@ -1833,6 +1823,17 @@ type Leg { that applies to multiple legs can appear several times. """ fareProducts: [FareProductUse] + + """ + The date and time when this leg begins. Format: Unix timestamp in milliseconds. + """ + startTime: Long @deprecated(reason: "Use `start` instead which contains timezone information.") + + """ + The date and time when this leg ends. Format: Unix timestamp in milliseconds. + """ + endTime: Long @deprecated(reason: "Use `end` instead which contains timezone information.") + } """A span of time.""" @@ -2267,15 +2268,11 @@ type Place { """Longitude of the place (WGS 84)""" lon: Float! - """ - The time the rider will arrive at the place. Format: Unix timestamp in milliseconds. - """ - arrivalTime: Long! + "The time the rider will arrive at the place." + arrival: DateTime - """ - The time the rider will depart the place. Format: Unix timestamp in milliseconds. - """ - departureTime: Long! + "The time the rider will depart the place." + departure: DateTime """The stop related to the place.""" stop: Stop @@ -2313,6 +2310,16 @@ type Place { """The car parking related to the place""" carPark: CarPark @deprecated(reason: "carPark is deprecated. Use vehicleParking instead.") + + """ + The time the rider will arrive at the place. Format: Unix timestamp in milliseconds. + """ + arrivalTime: Long! @deprecated(reason: "Use `arrival` which includes timezone information.") + + """ + The time the rider will depart the place. Format: Unix timestamp in milliseconds. + """ + departureTime: Long! @deprecated(reason: "Use `departure` which includes timezone information.") } type placeAtDistance implements Node { diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index 408b1c17ed5..1a4d09f5756 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -14,15 +14,15 @@ "name" : "A", "lat" : 5.0, "lon" : 8.0, - "departureTime" : 1580641200000, - "arrivalTime" : 1580641200000 + "departure" : "2020-02-02T11:00:00Z", + "arrival" : "2020-02-02T11:00:00Z" }, "to" : { "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departureTime" : 1580641220000, - "arrivalTime" : 1580641220000 + "departure" : "2020-02-02T11:00:20Z", + "arrival" : "2020-02-02T11:00:20Z" }, "route" : null, "legGeometry" : null @@ -35,15 +35,15 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departureTime" : 1580641260000, - "arrivalTime" : 1580641260000 + "departure" : "2020-02-02T11:01:00Z", + "arrival" : "2020-02-02T11:01:00Z" }, "to" : { "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departureTime" : 1580642100000, - "arrivalTime" : 1580642100000 + "departure" : "2020-02-02T11:15:00Z", + "arrival" : "2020-02-02T11:15:00Z" }, "route" : { "gtfsId" : "F:BUS", @@ -62,15 +62,15 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departureTime" : 1580643000000, - "arrivalTime" : 1580643000000 + "departure" : "2020-02-02T11:30:00Z", + "arrival" : "2020-02-02T11:30:00Z" }, "to" : { "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departureTime" : 1580644200000, - "arrivalTime" : 1580644200000 + "departure" : "2020-02-02T11:50:00Z", + "arrival" : "2020-02-02T11:50:00Z" }, "route" : { "gtfsId" : "F:2", @@ -89,15 +89,15 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departureTime" : 1580644200000, - "arrivalTime" : 1580644200000 + "departure" : "2020-02-02T11:50:00Z", + "arrival" : "2020-02-02T11:50:00Z" }, "to" : { "name" : "E", "lat" : 9.0, "lon" : 10.0, - "departureTime" : 1580644800000, - "arrivalTime" : 1580644800000 + "departure" : "2020-02-02T12:00:00Z", + "arrival" : "2020-02-02T12:00:00Z" }, "route" : null, "legGeometry" : null diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index 4e638d93759..c37499eb5e7 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -27,15 +27,15 @@ name lat lon - departureTime - arrivalTime + departure + arrival } to { name lat lon - departureTime - arrivalTime + departure + arrival } route { gtfsId From cb938be6c488c06666bf69c36e4fb326fe6f9830 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 14:35:52 +0200 Subject: [PATCH 0492/1688] Introduce consolidated times for legs --- docs/apis/GraphQL-Tutorial.md | 12 ++++- .../impl/CombinedInterlinedTransitLeg.java | 11 +++++ .../ext/flex/FlexibleTransitLeg.java | 11 +++++ .../apis/gtfs/datafetchers/LegImpl.java | 10 ++-- .../gtfs/generated/GraphQLDataFetchers.java | 13 ++++- .../apis/gtfs/generated/graphql-codegen.yml | 1 + .../org/opentripplanner/model/plan/Leg.java | 3 ++ .../opentripplanner/model/plan/LegTime.java | 17 +++++++ .../model/plan/ScheduledTransitLeg.java | 10 ++++ .../opentripplanner/model/plan/StreetLeg.java | 10 ++++ .../model/plan/UnknownTransitPathLeg.java | 10 ++++ .../opentripplanner/apis/gtfs/schema.graphqls | 11 ++++- .../apis/gtfs/expectations/plan-extended.json | 48 +++++++++++++++---- .../apis/gtfs/expectations/plan.json | 48 +++++++++++++++---- .../apis/gtfs/queries/plan-extended.graphql | 12 ++++- .../apis/gtfs/queries/plan.graphql | 12 ++++- 16 files changed, 208 insertions(+), 31 deletions(-) create mode 100644 src/main/java/org/opentripplanner/model/plan/LegTime.java diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index 480e2ef10ee..c98411fd20d 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -92,8 +92,16 @@ Most people want to get routing results out of OTP, so lets see the query for th end legs { mode - start - end + start { + scheduled + actual + delay + } + end { + scheduled + actual + delay + } from { name lat diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java index 0e9c10de7eb..43266f8e35f 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java @@ -9,6 +9,7 @@ import org.locationtech.jts.geom.LineString; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.model.fare.FareProductUse; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; @@ -56,6 +57,16 @@ public Trip getTrip() { return first.getTrip(); } + @Override + public LegTime start() { + return LegTime.of(getEndTime(), getDepartureDelay()); + } + + @Override + public LegTime end() { + return LegTime.of(getStartTime(), getArrivalDelay()); + } + @Override public ZonedDateTime getStartTime() { return first.getStartTime(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index 0e83372175a..e0bdb6cc899 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -16,6 +16,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.TransitLeg; @@ -84,6 +85,16 @@ public Accessibility getTripWheelchairAccessibility() { return edge.getFlexTrip().getTrip().getWheelchairBoarding(); } + @Override + public LegTime start() { + return LegTime.of(startTime, getArrivalDelay()); + } + + @Override + public LegTime end() { + return LegTime.of(endTime, getDepartureDelay()); + } + @Override @Nonnull public TransitMode getMode() { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 50e935ce7ea..093f6bda5e1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -2,7 +2,6 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; -import java.time.OffsetDateTime; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; @@ -19,6 +18,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.StreetLeg; @@ -79,8 +79,8 @@ public DataFetcher duration() { } @Override - public DataFetcher end() { - return environment -> getSource(environment).getEndTime().toOffsetDateTime(); + public DataFetcher end() { + return environment -> getSource(environment).end(); } @Override @@ -223,8 +223,8 @@ public DataFetcher serviceDate() { } @Override - public DataFetcher start() { - return environment -> getSource(environment).getStartTime().toOffsetDateTime(); + public DataFetcher start() { + return environment -> getSource(environment).start(); } @Override diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 431cf874152..c1d9df3678d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -36,6 +36,7 @@ import org.opentripplanner.model.plan.Emissions; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.WalkStep; import org.opentripplanner.routing.alertpatch.TransitAlert; @@ -442,7 +443,7 @@ public interface GraphQLLeg { public DataFetcher duration(); - public DataFetcher end(); + public DataFetcher end(); public DataFetcher endTime(); @@ -484,7 +485,7 @@ public interface GraphQLLeg { public DataFetcher serviceDate(); - public DataFetcher start(); + public DataFetcher start(); public DataFetcher startTime(); @@ -499,6 +500,14 @@ public interface GraphQLLeg { public DataFetcher walkingBike(); } + public interface GraphQLLegTime { + public DataFetcher actual(); + + public DataFetcher delay(); + + public DataFetcher scheduled(); + } + /** A span of time. */ public interface GraphQLLocalTimeSpan { public DataFetcher from(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 24cde3afe43..f1d984a9ecd 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -60,6 +60,7 @@ config: InputField: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField#GraphQLInputField Itinerary: org.opentripplanner.model.plan.Itinerary#Itinerary Leg: org.opentripplanner.model.plan.Leg#Leg + LegTime: org.opentripplanner.model.plan.LegTime#LegTime Mode: String OccupancyStatus: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLOccupancyStatus#GraphQLOccupancyStatus TransitMode: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode#GraphQLTransitMode diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 05213dbdf5e..1e6ca916a63 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -200,6 +200,9 @@ default Accessibility getTripWheelchairAccessibility() { return null; } + LegTime start(); + LegTime end(); + /** * The date and time this leg begins. */ diff --git a/src/main/java/org/opentripplanner/model/plan/LegTime.java b/src/main/java/org/opentripplanner/model/plan/LegTime.java new file mode 100644 index 00000000000..a65a3109987 --- /dev/null +++ b/src/main/java/org/opentripplanner/model/plan/LegTime.java @@ -0,0 +1,17 @@ +package org.opentripplanner.model.plan; + +import java.time.Duration; +import java.time.ZonedDateTime; +import javax.annotation.Nonnull; + +public record LegTime(ZonedDateTime scheduled, ZonedDateTime actual, Duration delay) { + @Nonnull + public static LegTime of(ZonedDateTime realtime, int delaySecs) { + var delay = Duration.ofSeconds(delaySecs); + return new LegTime(realtime.minus(delay), realtime, delay); + } + @Nonnull + public static LegTime ofStatic(ZonedDateTime staticTime) { + return new LegTime(staticTime, staticTime, Duration.ZERO); + } +} diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 876567035dd..0e4923f9de1 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -162,6 +162,16 @@ public Accessibility getTripWheelchairAccessibility() { return tripTimes.getWheelchairAccessibility(); } + @Override + public LegTime start() { + return LegTime.of(startTime, getDepartureDelay()); + } + + @Override + public LegTime end() { + return LegTime.of(endTime, getArrivalDelay()); + } + @Override @Nonnull public TransitMode getMode() { diff --git a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java index 319c9e01f69..6384159a4ec 100644 --- a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java @@ -156,6 +156,16 @@ public boolean hasSameMode(Leg other) { return other instanceof StreetLeg oSL && mode.equals(oSL.mode); } + @Override + public LegTime start() { + return LegTime.ofStatic(startTime); + } + + @Override + public LegTime end() { + return LegTime.ofStatic(endTime); + } + @Override public Leg withTimeShift(Duration duration) { return StreetLegBuilder diff --git a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java index 382a09d34e2..df43bbcb411 100644 --- a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java @@ -68,6 +68,16 @@ public boolean hasSameMode(Leg other) { return false; } + @Override + public LegTime start() { + return LegTime.ofStatic(startTime); + } + + @Override + public LegTime end() { + return LegTime.ofStatic(endTime); + } + @Override public double getDistanceMeters() { return UNKNOWN; diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index f6abf30aacb..0f4bba3de18 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1645,9 +1645,16 @@ type RideHailingEstimate { scalar DateTime +type LegTime { + scheduled: DateTime + actual: DateTime + delay: Duration +} + type Leg { - start: DateTime - end: DateTime + + start: LegTime + end: LegTime """ For transit leg, the offset from the scheduled departure time of the boarding diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index 739e0453e08..5ccd1e7bdea 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -18,8 +18,16 @@ "legs" : [ { "mode" : "WALK", - "start" : "2020-02-02T11:00:00Z", - "end" : "2020-02-02T11:00:20Z", + "start" : { + "scheduled" : "2020-02-02T11:00:00Z", + "actual" : "2020-02-02T11:00:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T11:00:20Z", + "actual" : "2020-02-02T11:00:20Z", + "delay" : "PT0S" + }, "from" : { "name" : "A", "lat" : 5.0, @@ -45,8 +53,16 @@ }, { "mode" : "BUS", - "start" : "2020-02-02T11:01:00Z", - "end" : "2020-02-02T11:15:00Z", + "start" : { + "scheduled" : "2020-02-02T11:01:00Z", + "actual" : "2020-02-02T11:01:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T11:15:00Z", + "actual" : "2020-02-02T11:15:00Z", + "delay" : "PT0S" + }, "from" : { "name" : "B", "lat" : 6.0, @@ -74,8 +90,16 @@ }, { "mode" : "RAIL", - "start" : "2020-02-02T11:30:00Z", - "end" : "2020-02-02T11:50:00Z", + "start" : { + "scheduled" : "2020-02-02T11:30:00Z", + "actual" : "2020-02-02T11:30:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T11:50:00Z", + "actual" : "2020-02-02T11:50:00Z", + "delay" : "PT0S" + }, "from" : { "name" : "C", "lat" : 7.0, @@ -123,8 +147,16 @@ }, { "mode" : "CAR", - "start" : "2020-02-02T11:50:00Z", - "end" : "2020-02-02T12:00:00Z", + "start" : { + "scheduled" : "2020-02-02T11:50:00Z", + "actual" : "2020-02-02T11:50:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T12:00:00Z", + "actual" : "2020-02-02T12:00:00Z", + "delay" : "PT0S" + }, "from" : { "name" : "D", "lat" : 8.0, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index 1a4d09f5756..6865eb282d4 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -8,8 +8,16 @@ "legs" : [ { "mode" : "WALK", - "start" : "2020-02-02T11:00:00Z", - "end" : "2020-02-02T11:00:20Z", + "start" : { + "scheduled" : "2020-02-02T11:00:00Z", + "actual" : "2020-02-02T11:00:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T11:00:20Z", + "actual" : "2020-02-02T11:00:20Z", + "delay" : "PT0S" + }, "from" : { "name" : "A", "lat" : 5.0, @@ -29,8 +37,16 @@ }, { "mode" : "BUS", - "start" : "2020-02-02T11:01:00Z", - "end" : "2020-02-02T11:15:00Z", + "start" : { + "scheduled" : "2020-02-02T11:01:00Z", + "actual" : "2020-02-02T11:01:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T11:15:00Z", + "actual" : "2020-02-02T11:15:00Z", + "delay" : "PT0S" + }, "from" : { "name" : "B", "lat" : 6.0, @@ -56,8 +72,16 @@ }, { "mode" : "RAIL", - "start" : "2020-02-02T11:30:00Z", - "end" : "2020-02-02T11:50:00Z", + "start" : { + "scheduled" : "2020-02-02T11:30:00Z", + "actual" : "2020-02-02T11:30:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T11:50:00Z", + "actual" : "2020-02-02T11:50:00Z", + "delay" : "PT0S" + }, "from" : { "name" : "C", "lat" : 7.0, @@ -83,8 +107,16 @@ }, { "mode" : "CAR", - "start" : "2020-02-02T11:50:00Z", - "end" : "2020-02-02T12:00:00Z", + "start" : { + "scheduled" : "2020-02-02T11:50:00Z", + "actual" : "2020-02-02T11:50:00Z", + "delay" : "PT0S" + }, + "end" : { + "scheduled" : "2020-02-02T12:00:00Z", + "actual" : "2020-02-02T12:00:00Z", + "delay" : "PT0S" + }, "from" : { "name" : "D", "lat" : 8.0, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index cde918e43b0..3d4ec134b47 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -31,8 +31,16 @@ walkTime legs { mode - start - end + start { + scheduled + actual + delay + } + end { + scheduled + actual + delay + } from { name lat diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index c37499eb5e7..5af473c7323 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -21,8 +21,16 @@ end legs { mode - start - end + start { + scheduled + actual + delay + } + end { + scheduled + actual + delay + } from { name lat From 6e620e77b671873e5abf8adad121f951dccc9214 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 14:54:37 +0200 Subject: [PATCH 0493/1688] Update deprecation notice --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 0f4bba3de18..8fdfd0133d8 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1834,12 +1834,12 @@ type Leg { """ The date and time when this leg begins. Format: Unix timestamp in milliseconds. """ - startTime: Long @deprecated(reason: "Use `start` instead which contains timezone information.") + startTime: Long @deprecated(reason: "Use `start.actual` instead which contains timezone information.") """ The date and time when this leg ends. Format: Unix timestamp in milliseconds. """ - endTime: Long @deprecated(reason: "Use `end` instead which contains timezone information.") + endTime: Long @deprecated(reason: "Use `end.actual` instead which contains timezone information.") } From d1a123acdb0b99408c86322e897502681a6e0a63 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 8 Aug 2023 15:38:36 +0200 Subject: [PATCH 0494/1688] Add ISO times to stop time --- .../apis/gtfs/datafetchers/StoptimeImpl.java | 23 ++++++++++++ .../gtfs/generated/GraphQLDataFetchers.java | 4 ++ .../opentripplanner/model/TripTimeOnDate.java | 37 +++++++++++++++++++ .../opentripplanner/model/plan/LegTime.java | 3 +- .../opentripplanner/apis/gtfs/schema.graphqls | 4 ++ 5 files changed, 70 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java index faf59ef9d6e..e7881aea867 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java @@ -2,20 +2,39 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; +import java.time.ZoneId; +import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TripTimeOnDate; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.Trip; public class StoptimeImpl implements GraphQLDataFetchers.GraphQLStoptime { + @Override + public DataFetcher arrival() { + return environment -> { + var tripTime = getSource(environment); + return tripTime.arrival(getZoneId(environment)); + }; + } + @Override public DataFetcher arrivalDelay() { return environment -> missingValueToNull(getSource(environment).getArrivalDelay()); } + @Override + public DataFetcher departure() { + return environment -> { + var tripTime = getSource(environment); + return tripTime.departure(getZoneId(environment)); + }; + } + @Override public DataFetcher departureDelay() { return environment -> getSource(environment).getDepartureDelay(); @@ -113,6 +132,10 @@ private TripTimeOnDate getSource(DataFetchingEnvironment environment) { return environment.getSource(); } + private ZoneId getZoneId(DataFetchingEnvironment environment) { + return environment.getContext().transitService().getTimeZone(); + } + /** * Generally the missing values are removed during the graph build. However, for flex trips they * are not and have to be converted to null here. diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index c1d9df3678d..832d3c65d31 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -980,8 +980,12 @@ public interface GraphQLStopRelationship { /** Stoptime represents the time when a specific trip arrives to or departs from a specific stop. */ public interface GraphQLStoptime { + public DataFetcher arrival(); + public DataFetcher arrivalDelay(); + public DataFetcher departure(); + public DataFetcher departureDelay(); public DataFetcher dropoffType(); diff --git a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 9ba85d6b532..24f33cf35b6 100644 --- a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -1,11 +1,16 @@ package org.opentripplanner.model; +import java.time.Duration; import java.time.Instant; import java.time.LocalDate; +import java.time.ZoneId; +import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Comparator; import java.util.List; +import javax.annotation.Nonnull; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; @@ -268,4 +273,36 @@ public BookingInfo getPickupBookingInfo() { public BookingInfo getDropOffBookingInfo() { return tripTimes.getDropOffBookingInfo(stopIndex); } + + public LegTime arrival(ZoneId zoneId) { + var delay = getArrivalDelay(); + var scheduled = getScheduledArrival(); + var actual = getActualDeparture(); + return buildLegTime(zoneId, scheduled, actual, delay); + } + + public LegTime departure(ZoneId zoneId) { + var delay = getDepartureDelay(); + var scheduled = getScheduledDeparture(); + var actual = getActualDeparture(); + return buildLegTime(zoneId, scheduled, actual, delay); + } + + @Nonnull + private LegTime buildLegTime( + ZoneId zoneId, + int scheduled, + int actual, + int delay + ) { + var midnight = serviceDate.atStartOfDay(zoneId); + var scheduledTime = midnight.plusSeconds(scheduled); + ZonedDateTime actualTime; + if (actual == UNDEFINED) { + actualTime = null; + } else { + actualTime = midnight.plusSeconds(actual); + } + return new LegTime(scheduledTime, actualTime, Duration.ofSeconds(delay)); + } } diff --git a/src/main/java/org/opentripplanner/model/plan/LegTime.java b/src/main/java/org/opentripplanner/model/plan/LegTime.java index a65a3109987..5a940a40b2c 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTime.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTime.java @@ -3,8 +3,9 @@ import java.time.Duration; import java.time.ZonedDateTime; import javax.annotation.Nonnull; +import javax.annotation.Nullable; -public record LegTime(ZonedDateTime scheduled, ZonedDateTime actual, Duration delay) { +public record LegTime(@Nonnull ZonedDateTime scheduled, @Nullable ZonedDateTime actual, Duration delay) { @Nonnull public static LegTime of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 8fdfd0133d8..9e04f493c1a 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3896,6 +3896,10 @@ type Stoptime { """ stopPosition: Int + + departure: LegTime + arrival: LegTime + """ Scheduled arrival time. Format: seconds since midnight of the departure date """ From d5f4926545eaf8d533a059fdb16410ec0efa07f5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 Nov 2023 18:24:10 +0100 Subject: [PATCH 0495/1688] Rename LegTime to LegTimes --- .../impl/CombinedInterlinedTransitLeg.java | 10 ++++----- .../ext/flex/FlexibleTransitLeg.java | 10 ++++----- .../apis/gtfs/datafetchers/LegImpl.java | 6 ++--- .../apis/gtfs/datafetchers/StoptimeImpl.java | 6 ++--- .../gtfs/generated/GraphQLDataFetchers.java | 11 +++++----- .../opentripplanner/model/TripTimeOnDate.java | 15 +++++-------- .../org/opentripplanner/model/plan/Leg.java | 4 ++-- .../opentripplanner/model/plan/LegTime.java | 18 --------------- .../opentripplanner/model/plan/LegTimes.java | 22 +++++++++++++++++++ .../model/plan/ScheduledTransitLeg.java | 8 +++---- .../opentripplanner/model/plan/StreetLeg.java | 8 +++---- .../model/plan/UnknownTransitPathLeg.java | 8 +++---- 12 files changed, 62 insertions(+), 64 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/model/plan/LegTime.java create mode 100644 src/main/java/org/opentripplanner/model/plan/LegTimes.java diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java index 43266f8e35f..c1497373851 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java @@ -9,8 +9,8 @@ import org.locationtech.jts.geom.LineString; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.model.fare.FareProductUse; -import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.Leg; +import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.TransitLeg; @@ -58,13 +58,13 @@ public Trip getTrip() { } @Override - public LegTime start() { - return LegTime.of(getEndTime(), getDepartureDelay()); + public LegTimes start() { + return LegTimes.of(getEndTime(), getDepartureDelay()); } @Override - public LegTime end() { - return LegTime.of(getStartTime(), getArrivalDelay()); + public LegTimes end() { + return LegTimes.of(getStartTime(), getArrivalDelay()); } @Override diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index e0bdb6cc899..25caa9089e9 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -16,7 +16,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTime; +import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.TransitLeg; @@ -86,13 +86,13 @@ public Accessibility getTripWheelchairAccessibility() { } @Override - public LegTime start() { - return LegTime.of(startTime, getArrivalDelay()); + public LegTimes start() { + return LegTimes.of(startTime, getArrivalDelay()); } @Override - public LegTime end() { - return LegTime.of(endTime, getDepartureDelay()); + public LegTimes end() { + return LegTimes.of(endTime, getDepartureDelay()); } @Override diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 093f6bda5e1..239ba0e28cf 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -18,7 +18,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTime; +import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.StreetLeg; @@ -79,7 +79,7 @@ public DataFetcher duration() { } @Override - public DataFetcher end() { + public DataFetcher end() { return environment -> getSource(environment).end(); } @@ -223,7 +223,7 @@ public DataFetcher serviceDate() { } @Override - public DataFetcher start() { + public DataFetcher start() { return environment -> getSource(environment).start(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java index e7881aea867..85ef1608771 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java @@ -8,14 +8,14 @@ import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TripTimeOnDate; -import org.opentripplanner.model.plan.LegTime; +import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.Trip; public class StoptimeImpl implements GraphQLDataFetchers.GraphQLStoptime { @Override - public DataFetcher arrival() { + public DataFetcher arrival() { return environment -> { var tripTime = getSource(environment); return tripTime.arrival(getZoneId(environment)); @@ -28,7 +28,7 @@ public DataFetcher arrivalDelay() { } @Override - public DataFetcher departure() { + public DataFetcher departure() { return environment -> { var tripTime = getSource(environment); return tripTime.departure(getZoneId(environment)); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 832d3c65d31..9ab6f39bb77 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -36,7 +36,7 @@ import org.opentripplanner.model.plan.Emissions; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTime; +import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.WalkStep; import org.opentripplanner.routing.alertpatch.TransitAlert; @@ -51,7 +51,6 @@ import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopRelationship; import org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; -import org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeCount; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; @@ -443,7 +442,7 @@ public interface GraphQLLeg { public DataFetcher duration(); - public DataFetcher end(); + public DataFetcher end(); public DataFetcher endTime(); @@ -485,7 +484,7 @@ public interface GraphQLLeg { public DataFetcher serviceDate(); - public DataFetcher start(); + public DataFetcher start(); public DataFetcher startTime(); @@ -980,11 +979,11 @@ public interface GraphQLStopRelationship { /** Stoptime represents the time when a specific trip arrives to or departs from a specific stop. */ public interface GraphQLStoptime { - public DataFetcher arrival(); + public DataFetcher arrival(); public DataFetcher arrivalDelay(); - public DataFetcher departure(); + public DataFetcher departure(); public DataFetcher departureDelay(); diff --git a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 24f33cf35b6..c1c916eb33f 100644 --- a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -10,7 +10,7 @@ import java.util.List; import javax.annotation.Nonnull; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.plan.LegTime; +import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; @@ -274,14 +274,14 @@ public BookingInfo getDropOffBookingInfo() { return tripTimes.getDropOffBookingInfo(stopIndex); } - public LegTime arrival(ZoneId zoneId) { + public LegTimes arrival(ZoneId zoneId) { var delay = getArrivalDelay(); var scheduled = getScheduledArrival(); var actual = getActualDeparture(); return buildLegTime(zoneId, scheduled, actual, delay); } - public LegTime departure(ZoneId zoneId) { + public LegTimes departure(ZoneId zoneId) { var delay = getDepartureDelay(); var scheduled = getScheduledDeparture(); var actual = getActualDeparture(); @@ -289,12 +289,7 @@ public LegTime departure(ZoneId zoneId) { } @Nonnull - private LegTime buildLegTime( - ZoneId zoneId, - int scheduled, - int actual, - int delay - ) { + private LegTimes buildLegTime(ZoneId zoneId, int scheduled, int actual, int delay) { var midnight = serviceDate.atStartOfDay(zoneId); var scheduledTime = midnight.plusSeconds(scheduled); ZonedDateTime actualTime; @@ -303,6 +298,6 @@ private LegTime buildLegTime( } else { actualTime = midnight.plusSeconds(actual); } - return new LegTime(scheduledTime, actualTime, Duration.ofSeconds(delay)); + return new LegTimes(scheduledTime, actualTime, Duration.ofSeconds(delay)); } } diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 1e6ca916a63..906e09989c5 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -200,8 +200,8 @@ default Accessibility getTripWheelchairAccessibility() { return null; } - LegTime start(); - LegTime end(); + LegTimes start(); + LegTimes end(); /** * The date and time this leg begins. diff --git a/src/main/java/org/opentripplanner/model/plan/LegTime.java b/src/main/java/org/opentripplanner/model/plan/LegTime.java deleted file mode 100644 index 5a940a40b2c..00000000000 --- a/src/main/java/org/opentripplanner/model/plan/LegTime.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.opentripplanner.model.plan; - -import java.time.Duration; -import java.time.ZonedDateTime; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -public record LegTime(@Nonnull ZonedDateTime scheduled, @Nullable ZonedDateTime actual, Duration delay) { - @Nonnull - public static LegTime of(ZonedDateTime realtime, int delaySecs) { - var delay = Duration.ofSeconds(delaySecs); - return new LegTime(realtime.minus(delay), realtime, delay); - } - @Nonnull - public static LegTime ofStatic(ZonedDateTime staticTime) { - return new LegTime(staticTime, staticTime, Duration.ZERO); - } -} diff --git a/src/main/java/org/opentripplanner/model/plan/LegTimes.java b/src/main/java/org/opentripplanner/model/plan/LegTimes.java new file mode 100644 index 00000000000..e6614b2ed01 --- /dev/null +++ b/src/main/java/org/opentripplanner/model/plan/LegTimes.java @@ -0,0 +1,22 @@ +package org.opentripplanner.model.plan; + +import java.time.Duration; +import java.time.ZonedDateTime; +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + +public record LegTimes( + @Nonnull ZonedDateTime scheduled, + @Nullable ZonedDateTime actual, + @Nullable Duration delay +) { + @Nonnull + public static LegTimes of(ZonedDateTime realtime, int delaySecs) { + var delay = Duration.ofSeconds(delaySecs); + return new LegTimes(realtime.minus(delay), realtime, delay); + } + @Nonnull + public static LegTimes ofStatic(ZonedDateTime staticTime) { + return new LegTimes(staticTime, staticTime, Duration.ZERO); + } +} diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 0e4923f9de1..4f6bf98def3 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -163,13 +163,13 @@ public Accessibility getTripWheelchairAccessibility() { } @Override - public LegTime start() { - return LegTime.of(startTime, getDepartureDelay()); + public LegTimes start() { + return LegTimes.of(startTime, getDepartureDelay()); } @Override - public LegTime end() { - return LegTime.of(endTime, getArrivalDelay()); + public LegTimes end() { + return LegTimes.of(endTime, getArrivalDelay()); } @Override diff --git a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java index 6384159a4ec..41062995cf4 100644 --- a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java @@ -157,13 +157,13 @@ public boolean hasSameMode(Leg other) { } @Override - public LegTime start() { - return LegTime.ofStatic(startTime); + public LegTimes start() { + return LegTimes.ofStatic(startTime); } @Override - public LegTime end() { - return LegTime.ofStatic(endTime); + public LegTimes end() { + return LegTimes.ofStatic(endTime); } @Override diff --git a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java index df43bbcb411..4dfefb086e3 100644 --- a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java @@ -69,13 +69,13 @@ public boolean hasSameMode(Leg other) { } @Override - public LegTime start() { - return LegTime.ofStatic(startTime); + public LegTimes start() { + return LegTimes.ofStatic(startTime); } @Override - public LegTime end() { - return LegTime.ofStatic(endTime); + public LegTimes end() { + return LegTimes.ofStatic(endTime); } @Override From 2b21e8f11bd269787a9de3c22aa61df5ab9d6c35 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 Nov 2023 18:31:33 +0100 Subject: [PATCH 0496/1688] Move deprecated methods to bottom --- .../opentripplanner/apis/gtfs/schema.graphqls | 34 +++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 9e04f493c1a..2d454d6a3e8 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1645,7 +1645,7 @@ type RideHailingEstimate { scalar DateTime -type LegTime { +type LegTimes { scheduled: DateTime actual: DateTime delay: Duration @@ -1653,22 +1653,8 @@ type LegTime { type Leg { - start: LegTime - end: LegTime - - """ - For transit leg, the offset from the scheduled departure time of the boarding - stop in this leg, i.e. scheduled time of departure at boarding stop = - `startTime - departureDelay` - """ - departureDelay: Int - - """ - For transit leg, the offset from the scheduled arrival time of the alighting - stop in this leg, i.e. scheduled time of arrival at alighting stop = `endTime - - arrivalDelay` - """ - arrivalDelay: Int + start: LegTimes + end: LegTimes """The mode (e.g. `WALK`) used when traversing this leg.""" mode: Mode @@ -1841,6 +1827,20 @@ type Leg { """ endTime: Long @deprecated(reason: "Use `end.actual` instead which contains timezone information.") + """ + For transit leg, the offset from the scheduled departure time of the boarding + stop in this leg, i.e. scheduled time of departure at boarding stop = + `startTime - departureDelay` + """ + departureDelay: Int @deprecated(reason: "Use `end.delay` instead.") + + """ + For transit leg, the offset from the scheduled arrival time of the alighting + stop in this leg, i.e. scheduled time of arrival at alighting stop = `endTime + - arrivalDelay` + """ + arrivalDelay: Int @deprecated(reason: "Use `start.delay` instead.") + } """A span of time.""" From e12ecfbb1f80811a374cda06912f2aa2bf2eb61d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 7 Nov 2023 09:21:51 +0100 Subject: [PATCH 0497/1688] Rename LegTime to LegTimes --- .../apis/gtfs/generated/GraphQLDataFetchers.java | 3 ++- .../opentripplanner/apis/gtfs/generated/graphql-codegen.yml | 2 +- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 9ab6f39bb77..f95496990a2 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -51,6 +51,7 @@ import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle.StopRelationship; import org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; +import org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeCount; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; @@ -499,7 +500,7 @@ public interface GraphQLLeg { public DataFetcher walkingBike(); } - public interface GraphQLLegTime { + public interface GraphQLLegTimes { public DataFetcher actual(); public DataFetcher delay(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index f1d984a9ecd..c248d787088 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -60,7 +60,7 @@ config: InputField: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField#GraphQLInputField Itinerary: org.opentripplanner.model.plan.Itinerary#Itinerary Leg: org.opentripplanner.model.plan.Leg#Leg - LegTime: org.opentripplanner.model.plan.LegTime#LegTime + LegTimes: org.opentripplanner.model.plan.LegTimes#LegTimes Mode: String OccupancyStatus: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLOccupancyStatus#GraphQLOccupancyStatus TransitMode: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode#GraphQLTransitMode diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 2d454d6a3e8..82c0fb9c207 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3897,8 +3897,8 @@ type Stoptime { stopPosition: Int - departure: LegTime - arrival: LegTime + departure: LegTimes + arrival: LegTimes """ Scheduled arrival time. Format: seconds since midnight of the departure date From 644dbcb86d9d85a1c53da3f7323bd873707aebeb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 7 Nov 2023 09:40:29 +0100 Subject: [PATCH 0498/1688] Remove changes to StopTime --- .../apis/gtfs/datafetchers/StoptimeImpl.java | 23 ------------- .../gtfs/generated/GraphQLDataFetchers.java | 4 --- .../opentripplanner/model/TripTimeOnDate.java | 32 ------------------- .../opentripplanner/apis/gtfs/schema.graphqls | 4 --- 4 files changed, 63 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java index 85ef1608771..faf59ef9d6e 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/StoptimeImpl.java @@ -2,39 +2,20 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; -import java.time.ZoneId; -import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TripTimeOnDate; -import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.Trip; public class StoptimeImpl implements GraphQLDataFetchers.GraphQLStoptime { - @Override - public DataFetcher arrival() { - return environment -> { - var tripTime = getSource(environment); - return tripTime.arrival(getZoneId(environment)); - }; - } - @Override public DataFetcher arrivalDelay() { return environment -> missingValueToNull(getSource(environment).getArrivalDelay()); } - @Override - public DataFetcher departure() { - return environment -> { - var tripTime = getSource(environment); - return tripTime.departure(getZoneId(environment)); - }; - } - @Override public DataFetcher departureDelay() { return environment -> getSource(environment).getDepartureDelay(); @@ -132,10 +113,6 @@ private TripTimeOnDate getSource(DataFetchingEnvironment environment) { return environment.getSource(); } - private ZoneId getZoneId(DataFetchingEnvironment environment) { - return environment.getContext().transitService().getTimeZone(); - } - /** * Generally the missing values are removed during the graph build. However, for flex trips they * are not and have to be converted to null here. diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index f95496990a2..d9991d9dff3 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -980,12 +980,8 @@ public interface GraphQLStopRelationship { /** Stoptime represents the time when a specific trip arrives to or departs from a specific stop. */ public interface GraphQLStoptime { - public DataFetcher arrival(); - public DataFetcher arrivalDelay(); - public DataFetcher departure(); - public DataFetcher departureDelay(); public DataFetcher dropoffType(); diff --git a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index c1c916eb33f..9ba85d6b532 100644 --- a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -1,16 +1,11 @@ package org.opentripplanner.model; -import java.time.Duration; import java.time.Instant; import java.time.LocalDate; -import java.time.ZoneId; -import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import javax.annotation.Nonnull; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; @@ -273,31 +268,4 @@ public BookingInfo getPickupBookingInfo() { public BookingInfo getDropOffBookingInfo() { return tripTimes.getDropOffBookingInfo(stopIndex); } - - public LegTimes arrival(ZoneId zoneId) { - var delay = getArrivalDelay(); - var scheduled = getScheduledArrival(); - var actual = getActualDeparture(); - return buildLegTime(zoneId, scheduled, actual, delay); - } - - public LegTimes departure(ZoneId zoneId) { - var delay = getDepartureDelay(); - var scheduled = getScheduledDeparture(); - var actual = getActualDeparture(); - return buildLegTime(zoneId, scheduled, actual, delay); - } - - @Nonnull - private LegTimes buildLegTime(ZoneId zoneId, int scheduled, int actual, int delay) { - var midnight = serviceDate.atStartOfDay(zoneId); - var scheduledTime = midnight.plusSeconds(scheduled); - ZonedDateTime actualTime; - if (actual == UNDEFINED) { - actualTime = null; - } else { - actualTime = midnight.plusSeconds(actual); - } - return new LegTimes(scheduledTime, actualTime, Duration.ofSeconds(delay)); - } } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 82c0fb9c207..490228ad01c 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3896,10 +3896,6 @@ type Stoptime { """ stopPosition: Int - - departure: LegTimes - arrival: LegTimes - """ Scheduled arrival time. Format: seconds since midnight of the departure date """ From f69ca284e3f37b4922e629dc348f5008785280f4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 7 Nov 2023 10:03:29 +0100 Subject: [PATCH 0499/1688] Rename to OffsetDateTime --- .../opentripplanner/apis/gtfs/GraphQLScalars.java | 4 ++-- .../apis/gtfs/GtfsGraphQLIndex.java | 2 +- .../org/opentripplanner/apis/gtfs/schema.graphqls | 14 +++++++------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 0e21df48dc1..3e376b60b35 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -54,9 +54,9 @@ public String parseLiteral(Object input) { ) .build(); - public static GraphQLScalarType dateTimeScalar = GraphQLScalarType + public static GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType .newScalar() - .name("DateTime") + .name("OffsetDateTime") .coercing( new Coercing() { @Override diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 5ddfb2ba6d1..0d76de16dc1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -111,7 +111,7 @@ protected static GraphQLSchema buildSchema() { .scalar(GraphQLScalars.geoJsonScalar) .scalar(GraphQLScalars.graphQLIDScalar) .scalar(GraphQLScalars.gramsScalar) - .scalar(GraphQLScalars.dateTimeScalar) + .scalar(GraphQLScalars.offsetDateTimeScalar) .scalar(ExtendedScalars.GraphQLLong) .type("Node", type -> type.typeResolver(new NodeTypeResolver())) .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver())) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 490228ad01c..0ca9d2e8011 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1507,8 +1507,8 @@ type Itinerary { """ endTime: Long @deprecated(reason: "Use `end` instead which includes timezone information.") - start: DateTime - end: DateTime + start: OffsetDateTime + end: OffsetDateTime """Duration of the trip on this itinerary, in seconds.""" duration: Long @@ -1643,11 +1643,11 @@ type RideHailingEstimate { productName: String } -scalar DateTime +scalar OffsetDateTime type LegTimes { - scheduled: DateTime - actual: DateTime + scheduled: OffsetDateTime + actual: OffsetDateTime delay: Duration } @@ -2276,10 +2276,10 @@ type Place { lon: Float! "The time the rider will arrive at the place." - arrival: DateTime + arrival: OffsetDateTime "The time the rider will depart the place." - departure: DateTime + departure: OffsetDateTime """The stop related to the place.""" stop: Stop From f2e394fbc1742469aba55ca37e383517c7267705 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 6 Jan 2024 14:35:46 +0100 Subject: [PATCH 0500/1688] Regenerate types, move deprecated fields to the bottom --- .../gtfs/generated/GraphQLDataFetchers.java | 6 ++++-- .../apis/gtfs/generated/graphql-codegen.yml | 2 +- .../opentripplanner/apis/gtfs/schema.graphqls | 20 +++++++++---------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index d9991d9dff3..639ba7c8744 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -399,6 +399,8 @@ public interface GraphQLItinerary { public DataFetcher elevationLost(); + public DataFetcher emissionsPerPerson(); + public DataFetcher end(); public DataFetcher endTime(); @@ -409,10 +411,10 @@ public interface GraphQLItinerary { public DataFetcher> legs(); - public DataFetcher start(); - public DataFetcher numberOfTransfers(); + public DataFetcher start(); + public DataFetcher startTime(); public DataFetcher> systemNotices(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index c248d787088..ecc7a89fb44 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -26,7 +26,7 @@ config: Polyline: String GeoJson: org.locationtech.jts.geom.Geometry Grams: org.opentripplanner.framework.model.Grams - DateTime: java.time.OffsetDateTime + OffsetDateTime: java.time.OffsetDateTime Duration: java.time.Duration mappers: AbsoluteDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAbsoluteDirection#GraphQLAbsoluteDirection diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 0ca9d2e8011..15cd4ae8ed3 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1497,16 +1497,6 @@ type DefaultFareProduct implements FareProduct { } type Itinerary { - """ - Time when the user leaves from the origin. Format: Unix timestamp in milliseconds. - """ - startTime: Long @deprecated(reason: "Use `start` instead which includes timezone information.") - - """ - Time when the user arrives to the destination. Format: Unix timestamp in milliseconds. - """ - endTime: Long @deprecated(reason: "Use `end` instead which includes timezone information.") - start: OffsetDateTime end: OffsetDateTime @@ -1587,6 +1577,16 @@ type Itinerary { and always returns an empty list. Use the leg's `fareProducts` instead. """ fares: [fare] @deprecated(reason: "Use the leg's `fareProducts`.") + + """ + Time when the user leaves from the origin. Format: Unix timestamp in milliseconds. + """ + startTime: Long @deprecated(reason: "Use `start` instead which includes timezone information.") + + """ + Time when the user arrives to the destination. Format: Unix timestamp in milliseconds. + """ + endTime: Long @deprecated(reason: "Use `end` instead which includes timezone information.") } "A currency" From dc7521e9694bc4810582ad705ee80175e7f12a95 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 6 Jan 2024 14:56:50 +0100 Subject: [PATCH 0501/1688] Add tests for Duration --- .../opentripplanner/apis/gtfs/schema.graphqls | 7 ++++++ .../apis/gtfs/GraphQLScalarsTest.java | 22 +++++++++++++++---- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 15cd4ae8ed3..ff60ed183cb 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1621,6 +1621,8 @@ type Money { """" An ISO-8601-formatted duration, i.e. `PT2H30M` for 2 hours and 30 minutes. + +Negative durations are formatted like `PT-10M`. """ scalar Duration @@ -1648,6 +1650,11 @@ scalar OffsetDateTime type LegTimes { scheduled: OffsetDateTime actual: OffsetDateTime + """ + The delay of the vehicle at a certain place. + + If the vehicle is early then this is a negative duration. + """ delay: Duration } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java index 90b35a31b9f..1c4472827c5 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java @@ -1,22 +1,36 @@ package org.opentripplanner.apis.gtfs; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.of; import com.fasterxml.jackson.core.JsonProcessingException; import graphql.schema.CoercingSerializeException; import java.time.Duration; +import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.opentripplanner.framework.json.ObjectMappers; class GraphQLScalarsTest { - @Test - void duration() { - var string = GraphQLScalars.durationScalar.getCoercing().serialize(Duration.ofMinutes(30)); - assertEquals("PT30M", string); + static List durationCases() { + return List.of( + of(Duration.ofMinutes(30), "PT30M"), + of(Duration.ofHours(23), "PT23H"), + of(Duration.ofMinutes(-10), "PT-10M") + ); + } + + @ParameterizedTest + @MethodSource("durationCases") + void duration(Duration duration, String expected) { + var string = GraphQLScalars.durationScalar.getCoercing().serialize(duration); + assertEquals(expected, string); } @Test From d319e5ba67a2e7349bd74197cc61e9dc6047cfa2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 6 Jan 2024 20:10:46 +0100 Subject: [PATCH 0502/1688] Add nullability check --- src/main/java/org/opentripplanner/model/plan/LegTimes.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/opentripplanner/model/plan/LegTimes.java b/src/main/java/org/opentripplanner/model/plan/LegTimes.java index e6614b2ed01..06b2fb3662b 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTimes.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTimes.java @@ -2,6 +2,7 @@ import java.time.Duration; import java.time.ZonedDateTime; +import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; @@ -10,6 +11,9 @@ public record LegTimes( @Nullable ZonedDateTime actual, @Nullable Duration delay ) { + public LegTimes { + Objects.requireNonNull(scheduled); + } @Nonnull public static LegTimes of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); From 67895bee4eb0b1d8313e5010848145c834ad49f2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 5 Feb 2024 17:12:19 +0100 Subject: [PATCH 0503/1688] Add documentation for OffsetDateTime --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index ff60ed183cb..3b6bdad5fa4 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1645,6 +1645,9 @@ type RideHailingEstimate { productName: String } +""" +An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. +""" scalar OffsetDateTime type LegTimes { From 4f757dae87d3f67ec9622df8e49c6894c6445029 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 5 Feb 2024 17:19:29 +0100 Subject: [PATCH 0504/1688] Add test for intermediate places --- .../apis/gtfs/expectations/plan-extended.json | 20 +++++++++++++++++++ .../apis/gtfs/queries/plan-extended.graphql | 7 +++++++ 2 files changed, 27 insertions(+) diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index 5ccd1e7bdea..fde24b8697a 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -47,6 +47,7 @@ "generalizedCost" : 40, "headsign" : null, "trip" : null, + "intermediatePlaces" : null, "alerts" : [ ], "rideHailingEstimate" : null, "accessibilityScore" : null @@ -84,6 +85,15 @@ "trip" : { "tripHeadsign" : "Trip headsign 122" }, + "intermediatePlaces" : [ + { + "arrival" : "2020-02-02T11:01:00Z", + "departure" : "2020-02-02T11:01:00Z", + "stop" : { + "name" : "B" + } + } + ], "alerts" : [ ], "rideHailingEstimate" : null, "accessibilityScore" : null @@ -121,6 +131,15 @@ "trip" : { "tripHeadsign" : "Trip headsign 439" }, + "intermediatePlaces" : [ + { + "arrival" : "2020-02-02T11:30:00Z", + "departure" : "2020-02-02T11:30:00Z", + "stop" : { + "name" : "C" + } + } + ], "alerts" : [ { "id" : "QWxlcnQ6Rjphbi1hbGVydA", @@ -176,6 +195,7 @@ "generalizedCost" : 1000, "headsign" : null, "trip" : null, + "intermediatePlaces" : null, "alerts" : [ ], "rideHailingEstimate" : { "provider" : { diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index 3d4ec134b47..1c90f773677 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -63,6 +63,13 @@ trip { tripHeadsign } + intermediatePlaces { + arrival + departure + stop { + name + } + } alerts { id alertHeaderText From 980d620e7ba9104720a6b4ef33c0c3ee91ab3f95 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 5 Feb 2024 17:28:20 +0100 Subject: [PATCH 0505/1688] Add test cases --- .../apis/gtfs/GraphQLScalarsTest.java | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java index 1c4472827c5..079749f3ccc 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java @@ -6,6 +6,10 @@ import com.fasterxml.jackson.core.JsonProcessingException; import graphql.schema.CoercingSerializeException; import java.time.Duration; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; @@ -14,10 +18,17 @@ import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; +import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.framework.json.ObjectMappers; class GraphQLScalarsTest { + private static final OffsetDateTime OFFSET_DATE_TIME = OffsetDateTime.of( + LocalDate.of(2024, 2, 4), + LocalTime.MIDNIGHT, + ZoneOffset.UTC + ); + static List durationCases() { return List.of( of(Duration.ofMinutes(30), "PT30M"), @@ -59,4 +70,26 @@ void geoJson() throws JsonProcessingException { .readTree("{\"type\":\"Polygon\",\"coordinates\":[[[0,0],[1,1],[2,2],[0,0]]]}"); assertEquals(jsonNode.toString(), geoJson.toString()); } + + static List offsetDateTimeCases() { + return List.of( + of(OFFSET_DATE_TIME, "2024-02-04T00:00:00Z"), + of(OFFSET_DATE_TIME.plusHours(12).plusMinutes(8).plusSeconds(22), "2024-02-04T12:08:22Z"), + of( + OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.BERLIN).toOffsetDateTime(), + "2024-02-04T01:00:00+01:00" + ), + of( + OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.NEW_YORK).toOffsetDateTime(), + "2024-02-03T19:00:00-05:00" + ) + ); + } + + @ParameterizedTest + @MethodSource("offsetDateTimeCases") + void duration(OffsetDateTime odt, String expected) { + var string = GraphQLScalars.offsetDateTimeScalar.getCoercing().serialize(odt); + assertEquals(expected, string); + } } From dcaa04a41bd5cd8afd2a34605256d08e5415840c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 5 Feb 2024 18:06:02 +0100 Subject: [PATCH 0506/1688] Add example for OffsetDateTime --- magidoc.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/magidoc.mjs b/magidoc.mjs index a02976f4bcc..bb138f3c87d 100644 --- a/magidoc.mjs +++ b/magidoc.mjs @@ -35,7 +35,8 @@ To learn how to deactivate it, read the appTitle: 'OTP GTFS GraphQL API', queryGenerationFactories: { 'Polyline': '<>', - 'GeoJson': '<>' + 'GeoJson': '<>', + 'OffsetDateTime': '2024-02-05T18:04:23+0100' }, } }, From 645d3244f51416b217aa6d13ddeb558c0c20a7d3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:10:26 +0000 Subject: [PATCH 0507/1688] Update junit5 monorepo to v5.10.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index be1e49f2a16..32b977f0efd 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,7 @@ 2.50 2.16.1 3.1.5 - 5.10.1 + 5.10.2 1.12.1 5.5.3 1.4.14 From 7705301832a0edd3a62930096eaf43a22a5907f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 22:10:20 +0000 Subject: [PATCH 0508/1688] Update dependency org.slf4j:jul-to-slf4j to v2.0.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 32b977f0efd..5476adbe49c 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 5.5.3 1.4.14 9.9.1 - 2.0.11 + 2.0.12 2.0.15 1.26 4.0.4 From 31cb93ca668022bbb65b3dcf7f9f2983c6ab9ba6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 6 Feb 2024 03:28:59 +0000 Subject: [PATCH 0509/1688] Update dependency org.mockito:mockito-core to v5.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5476adbe49c..67595a4ec1e 100644 --- a/pom.xml +++ b/pom.xml @@ -713,7 +713,7 @@ org.mockito mockito-core - 5.9.0 + 5.10.0 test From 22dad32bea0ad075fbdf17d02a083d19bf5b4090 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Tue, 6 Feb 2024 09:25:34 +0000 Subject: [PATCH 0510/1688] Bump serialization version id for #5650 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 67595a4ec1e..844fc4e7f97 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 143 + 144 30.2 2.50 From 3ddaf01525fc2ad22439dceb2732433248265247 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 6 Feb 2024 16:55:38 +0200 Subject: [PATCH 0511/1688] Refactor SteetMode --- .../routing/api/request/RequestModes.java | 10 +- .../routing/api/request/StreetMode.java | 124 ++++++++++-------- 2 files changed, 71 insertions(+), 63 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java b/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java index 5253bb2018d..72b06f62979 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java +++ b/src/main/java/org/opentripplanner/routing/api/request/RequestModes.java @@ -2,12 +2,9 @@ import static org.opentripplanner.routing.api.request.StreetMode.NOT_SET; -import java.util.Collection; -import java.util.List; import java.util.Objects; import javax.annotation.Nonnull; import org.opentripplanner.framework.tostring.ToStringBuilder; -import org.opentripplanner.transit.model.basic.MainAndSubMode; public class RequestModes { @@ -39,10 +36,11 @@ private RequestModes( StreetMode directMode, StreetMode transferMode ) { - this.accessMode = (accessMode != null && accessMode.access) ? accessMode : NOT_SET; - this.egressMode = (egressMode != null && egressMode.egress) ? egressMode : NOT_SET; + this.accessMode = (accessMode != null && accessMode.accessAllowed()) ? accessMode : NOT_SET; + this.egressMode = (egressMode != null && egressMode.egressAllowed()) ? egressMode : NOT_SET; this.directMode = directMode != null ? directMode : NOT_SET; - this.transferMode = (transferMode != null && transferMode.transfer) ? transferMode : NOT_SET; + this.transferMode = + (transferMode != null && transferMode.transferAllowed()) ? transferMode : NOT_SET; } public RequestModes(RequestModesBuilder builder) { diff --git a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java index bb5dc4b7f04..041a6fbb247 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java +++ b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java @@ -1,5 +1,7 @@ package org.opentripplanner.routing.api.request; +import java.util.EnumSet; +import java.util.Set; import org.opentripplanner.framework.doc.DocumentedEnum; public enum StreetMode implements DocumentedEnum { @@ -7,134 +9,142 @@ public enum StreetMode implements DocumentedEnum { * No street mode is set. This option is used if we do not want street routing at all in this part * of the search. */ - NOT_SET(true, true, true, false, false, false, false, false, false, false), + NOT_SET(Feature.ACCESS, Feature.TRANSFER, Feature.EGRESS), /** * Walk only */ - WALK(true, true, true, true, false, false, false, false, false, false), + WALK(Feature.ACCESS, Feature.TRANSFER, Feature.EGRESS, Feature.WALKING), /** * Bike only */ - BIKE(true, true, true, false, true, false, false, false, false, false), + BIKE(Feature.ACCESS, Feature.TRANSFER, Feature.EGRESS, Feature.CYCLING), /** * Bike to a bike parking area, then walk the rest of the way. *

      * Direct mode and access mode only. */ - BIKE_TO_PARK(true, false, false, true, true, false, false, false, true, false), + BIKE_TO_PARK(Feature.ACCESS, Feature.WALKING, Feature.CYCLING, Feature.PARKING), /** * Walk to a bike rental point, bike to a bike rental drop-off point, and walk the rest of the * way. This can include bike rental at fixed locations or free-floating services. */ - BIKE_RENTAL(true, true, true, true, true, false, false, true, false, false), + BIKE_RENTAL( + Feature.ACCESS, + Feature.TRANSFER, + Feature.EGRESS, + Feature.WALKING, + Feature.CYCLING, + Feature.RENTING + ), /** * Walk to a scooter rental point, ride a scooter to a scooter rental drop-off point, and walk the * rest of the way. This can include scooter rental at fixed locations or free-floating services. */ - SCOOTER_RENTAL(true, true, true, true, false, false, true, true, false, false), + SCOOTER_RENTAL( + Feature.ACCESS, + Feature.TRANSFER, + Feature.EGRESS, + Feature.WALKING, + Feature.SCOOTER, + Feature.RENTING + ), /** * Car only *

      * Direct mode only. */ - CAR(true, false, false, false, false, true, false, false, false, false), + CAR(Feature.ACCESS, Feature.DRIVING), /** * Start in the car, drive to a parking area, and walk the rest of the way. *

      * Direct mode and access mode only. */ - CAR_TO_PARK(true, false, false, true, false, true, false, false, true, false), + CAR_TO_PARK(Feature.ACCESS, Feature.WALKING, Feature.DRIVING, Feature.PARKING), /** * Walk to a pickup point along the road, drive to a drop-off point along the road, and walk the * rest of the way. This can include various taxi-services or kiss & ride. */ - CAR_PICKUP(true, false, true, true, false, true, false, false, false, true), + CAR_PICKUP(Feature.ACCESS, Feature.EGRESS, Feature.WALKING, Feature.DRIVING, Feature.PICKUP), /** * Walk to a car rental point, drive to a car rental drop-off point and walk the rest of the way. * This can include car rental at fixed locations or free-floating services. */ - CAR_RENTAL(true, true, true, true, false, true, false, true, false, false), + CAR_RENTAL( + Feature.ACCESS, + Feature.TRANSFER, + Feature.EGRESS, + Feature.WALKING, + Feature.DRIVING, + Feature.RENTING + ), /** * Using a car hailing app like Uber or Lyft to get to a train station or all the way to the destination. */ - CAR_HAILING(true, false, true, false, false, true, false, false, false, true), + CAR_HAILING(Feature.ACCESS, Feature.EGRESS, Feature.DRIVING, Feature.PICKUP), /** * Encompasses all types of on-demand and flexible transportation. */ - FLEXIBLE(true, false, true, true, false, false, false, false, false, false); - - final boolean access; - - final boolean transfer; - - final boolean egress; - - final boolean includesWalking; - - final boolean includesBiking; - - final boolean includesDriving; + FLEXIBLE(Feature.ACCESS, Feature.EGRESS, Feature.WALKING); + + private enum Feature { + ACCESS, + EGRESS, + TRANSFER, + WALKING, + CYCLING, + DRIVING, + SCOOTER, + RENTING, + PARKING, + PICKUP, + } - final boolean includesScooter; + private final Set features; - final boolean includesRenting; + StreetMode(Feature first, Feature... rest) { + this.features = EnumSet.of(first, rest); + } - final boolean includesParking; + public boolean accessAllowed() { + return features.contains(Feature.ACCESS); + } - final boolean includesPickup; + public boolean transferAllowed() { + return features.contains(Feature.TRANSFER); + } - StreetMode( - boolean access, - boolean transfer, - boolean egress, - boolean includesWalking, - boolean includesBiking, - boolean includesDriving, - boolean includesScooter, - boolean includesRenting, - boolean includesParking, - boolean includesPickup - ) { - this.access = access; - this.transfer = transfer; - this.egress = egress; - this.includesWalking = includesWalking; - this.includesBiking = includesBiking; - this.includesDriving = includesDriving; - this.includesScooter = includesScooter; - this.includesRenting = includesRenting; - this.includesParking = includesParking; - this.includesPickup = includesPickup; + public boolean egressAllowed() { + return features.contains(Feature.EGRESS); } public boolean includesWalking() { - return includesWalking; + return features.contains(Feature.WALKING); } public boolean includesBiking() { - return includesBiking; + return features.contains(Feature.CYCLING); } public boolean includesDriving() { - return includesDriving; + return features.contains(Feature.DRIVING); } public boolean includesScooter() { - return includesScooter; + return features.contains(Feature.SCOOTER); } public boolean includesRenting() { - return includesRenting; + return features.contains(Feature.RENTING); } public boolean includesParking() { - return includesParking; + return features.contains(Feature.PARKING); } public boolean includesPickup() { - return includesPickup; + return features.contains(Feature.PICKUP); } @Override From aa32eb753952153d4b0fc0f073487f20fc7965f1 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 6 Feb 2024 17:32:47 +0200 Subject: [PATCH 0512/1688] Remove transfer from rental modes as it's not possible --- .../routing/api/request/StreetMode.java | 27 +++---------------- 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java index 041a6fbb247..47073aa7eeb 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java +++ b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java @@ -28,26 +28,12 @@ public enum StreetMode implements DocumentedEnum { * Walk to a bike rental point, bike to a bike rental drop-off point, and walk the rest of the * way. This can include bike rental at fixed locations or free-floating services. */ - BIKE_RENTAL( - Feature.ACCESS, - Feature.TRANSFER, - Feature.EGRESS, - Feature.WALKING, - Feature.CYCLING, - Feature.RENTING - ), + BIKE_RENTAL(Feature.ACCESS, Feature.EGRESS, Feature.WALKING, Feature.CYCLING, Feature.RENTING), /** * Walk to a scooter rental point, ride a scooter to a scooter rental drop-off point, and walk the * rest of the way. This can include scooter rental at fixed locations or free-floating services. */ - SCOOTER_RENTAL( - Feature.ACCESS, - Feature.TRANSFER, - Feature.EGRESS, - Feature.WALKING, - Feature.SCOOTER, - Feature.RENTING - ), + SCOOTER_RENTAL(Feature.ACCESS, Feature.EGRESS, Feature.WALKING, Feature.SCOOTER, Feature.RENTING), /** * Car only *

      @@ -69,14 +55,7 @@ public enum StreetMode implements DocumentedEnum { * Walk to a car rental point, drive to a car rental drop-off point and walk the rest of the way. * This can include car rental at fixed locations or free-floating services. */ - CAR_RENTAL( - Feature.ACCESS, - Feature.TRANSFER, - Feature.EGRESS, - Feature.WALKING, - Feature.DRIVING, - Feature.RENTING - ), + CAR_RENTAL(Feature.ACCESS, Feature.EGRESS, Feature.WALKING, Feature.DRIVING, Feature.RENTING), /** * Using a car hailing app like Uber or Lyft to get to a train station or all the way to the destination. From 5184fa0ddedb36c8796f000158c64eed0e66e314 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 00:55:02 +0000 Subject: [PATCH 0513/1688] Update graphqlcodegenerator monorepo to v5.0.2 --- .../apis/gtfs/generated/package.json | 4 +- .../apis/gtfs/generated/yarn.lock | 172 ++++++++++++++---- 2 files changed, 141 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json b/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json index 6a2eb3343b9..db865eaa003 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json @@ -10,8 +10,8 @@ }, "license": "LGPL-3.0", "dependencies": { - "@graphql-codegen/add": "5.0.0", - "@graphql-codegen/cli": "5.0.0", + "@graphql-codegen/add": "5.0.2", + "@graphql-codegen/cli": "5.0.2", "@graphql-codegen/java": "4.0.0", "@graphql-codegen/java-resolvers": "3.0.0", "graphql": "16.8.1" diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock b/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock index 7e3c815cfb1..fffe602db18 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock @@ -264,7 +264,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9" integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ== -"@babel/helper-plugin-utils@^7.22.5": +"@babel/helper-plugin-utils@^7.20.2", "@babel/helper-plugin-utils@^7.22.5": version "7.22.5" resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz#dd7ee3735e8a313b9f7b05a773d892e88e6d7295" integrity sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg== @@ -699,24 +699,25 @@ "@babel/helper-validator-identifier" "^7.19.1" to-fast-properties "^2.0.0" -"@graphql-codegen/add@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-5.0.0.tgz#578ebaf4fa87c1e934c381cd679bcedcf79feaba" - integrity sha512-ynWDOsK2yxtFHwcJTB9shoSkUd7YXd6ZE57f0nk7W5cu/nAgxZZpEsnTPEpZB/Mjf14YRGe2uJHQ7AfElHjqUQ== +"@graphql-codegen/add@5.0.2", "@graphql-codegen/add@^5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@graphql-codegen/add/-/add-5.0.2.tgz#71b3ae0465a4537172dddb84531b6967ca5545f2" + integrity sha512-ouBkSvMFUhda5VoKumo/ZvsZM9P5ZTyDsI8LW18VxSNWOjrTeLXBWHG8Gfaai0HwhflPtCYVABbriEcOmrRShQ== dependencies: - "@graphql-codegen/plugin-helpers" "^5.0.0" - tslib "~2.5.0" + "@graphql-codegen/plugin-helpers" "^5.0.3" + tslib "~2.6.0" -"@graphql-codegen/cli@5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-5.0.0.tgz#761dcf08cfee88bbdd9cdf8097b2343445ec6f0a" - integrity sha512-A7J7+be/a6e+/ul2KI5sfJlpoqeqwX8EzktaKCeduyVKgOLA6W5t+NUGf6QumBDXU8PEOqXk3o3F+RAwCWOiqA== +"@graphql-codegen/cli@5.0.2": + version "5.0.2" + resolved "https://registry.yarnpkg.com/@graphql-codegen/cli/-/cli-5.0.2.tgz#07ff691c16da4c3dcc0e1995d3231530379ab317" + integrity sha512-MBIaFqDiLKuO4ojN6xxG9/xL9wmfD3ZjZ7RsPjwQnSHBCUXnEkdKvX+JVpx87Pq29Ycn8wTJUguXnTZ7Di0Mlw== dependencies: "@babel/generator" "^7.18.13" "@babel/template" "^7.18.10" "@babel/types" "^7.18.13" - "@graphql-codegen/core" "^4.0.0" - "@graphql-codegen/plugin-helpers" "^5.0.1" + "@graphql-codegen/client-preset" "^4.2.2" + "@graphql-codegen/core" "^4.0.2" + "@graphql-codegen/plugin-helpers" "^5.0.3" "@graphql-tools/apollo-engine-loader" "^8.0.0" "@graphql-tools/code-file-loader" "^8.0.0" "@graphql-tools/git-loader" "^8.0.0" @@ -747,15 +748,45 @@ yaml "^2.3.1" yargs "^17.0.0" -"@graphql-codegen/core@^4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-4.0.0.tgz#b29c911746a532a675e33720acb4eb2119823e01" - integrity sha512-JAGRn49lEtSsZVxeIlFVIRxts2lWObR+OQo7V2LHDJ7ohYYw3ilv7nJ8pf8P4GTg/w6ptcYdSdVVdkI8kUHB/Q== +"@graphql-codegen/client-preset@^4.2.2": + version "4.2.2" + resolved "https://registry.yarnpkg.com/@graphql-codegen/client-preset/-/client-preset-4.2.2.tgz#545c62789a5687bee5df8b4738b4911e72ea8051" + integrity sha512-DF9pNWj3TEdA90E9FH5SsUIqiZfr872vqaQOspLVuVXGsaDx8F/JLLzaN+7ucmoo0ff/bLW8munVXYXTmgwwEA== dependencies: - "@graphql-codegen/plugin-helpers" "^5.0.0" + "@babel/helper-plugin-utils" "^7.20.2" + "@babel/template" "^7.20.7" + "@graphql-codegen/add" "^5.0.2" + "@graphql-codegen/gql-tag-operations" "4.0.4" + "@graphql-codegen/plugin-helpers" "^5.0.3" + "@graphql-codegen/typed-document-node" "^5.0.4" + "@graphql-codegen/typescript" "^4.0.4" + "@graphql-codegen/typescript-operations" "^4.1.2" + "@graphql-codegen/visitor-plugin-common" "^4.1.2" + "@graphql-tools/documents" "^1.0.0" + "@graphql-tools/utils" "^10.0.0" + "@graphql-typed-document-node/core" "3.2.0" + tslib "~2.6.0" + +"@graphql-codegen/core@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@graphql-codegen/core/-/core-4.0.2.tgz#7e6ec266276f54bbf02f60599d9e518f4a59d85e" + integrity sha512-IZbpkhwVqgizcjNiaVzNAzm/xbWT6YnGgeOLwVjm4KbJn3V2jchVtuzHH09G5/WkkLSk2wgbXNdwjM41JxO6Eg== + dependencies: + "@graphql-codegen/plugin-helpers" "^5.0.3" "@graphql-tools/schema" "^10.0.0" "@graphql-tools/utils" "^10.0.0" - tslib "~2.5.0" + tslib "~2.6.0" + +"@graphql-codegen/gql-tag-operations@4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.4.tgz#572be5db804af5efdc3ca24e4bcac815448730c5" + integrity sha512-dypul0iDLjb07yv+/cRb6qPbn42cFPcwlsJertVl9G6qkS4+3V4806WwSfUht4QVMWnvGfgDkJJqG0yUVKOHwA== + dependencies: + "@graphql-codegen/plugin-helpers" "^5.0.3" + "@graphql-codegen/visitor-plugin-common" "4.1.2" + "@graphql-tools/utils" "^10.0.0" + auto-bind "~4.0.0" + tslib "~2.6.0" "@graphql-codegen/java-common@^3.0.0": version "3.0.0" @@ -813,29 +844,59 @@ lodash "~4.17.0" tslib "~2.4.0" -"@graphql-codegen/plugin-helpers@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.0.tgz#40c18217454af5cf8317e5f46cf4d38e8cc78ae4" - integrity sha512-suL2ZMkBAU2a4YbBHaZvUPsV1z0q3cW6S96Z/eYYfkRIsJoe2vN+wNZ9Xdzmqx0JLmeeFCBSoBGC0imFyXlkDQ== +"@graphql-codegen/plugin-helpers@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.3.tgz#7027b9d911d7cb594663590fcf5d63e9cf7ec2ff" + integrity sha512-yZ1rpULIWKBZqCDlvGIJRSyj1B2utkEdGmXZTBT/GVayP4hyRYlkd36AJV/LfEsVD8dnsKL5rLz2VTYmRNlJ5Q== dependencies: "@graphql-tools/utils" "^10.0.0" change-case-all "1.0.15" common-tags "1.8.2" import-from "4.0.0" lodash "~4.17.0" - tslib "~2.5.0" + tslib "~2.6.0" -"@graphql-codegen/plugin-helpers@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.1.tgz#e2429fcfba3f078d5aa18aa062d46c922bbb0d55" - integrity sha512-6L5sb9D8wptZhnhLLBcheSPU7Tg//DGWgc5tQBWX46KYTOTQHGqDpv50FxAJJOyFVJrveN9otWk9UT9/yfY4ww== +"@graphql-codegen/schema-ast@^4.0.2": + version "4.0.2" + resolved "https://registry.yarnpkg.com/@graphql-codegen/schema-ast/-/schema-ast-4.0.2.tgz#aeaa104e4555cca73a058f0a9350b4b0e290b377" + integrity sha512-5mVAOQQK3Oz7EtMl/l3vOQdc2aYClUzVDHHkMvZlunc+KlGgl81j8TLa+X7ANIllqU4fUEsQU3lJmk4hXP6K7Q== dependencies: + "@graphql-codegen/plugin-helpers" "^5.0.3" "@graphql-tools/utils" "^10.0.0" + tslib "~2.6.0" + +"@graphql-codegen/typed-document-node@^5.0.4": + version "5.0.4" + resolved "https://registry.yarnpkg.com/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.4.tgz#06e286caacdd66c3566f98433dcb8f1a9c9a9f1d" + integrity sha512-t66Z6erQ4Dh1j6f9pRZmc8uYtHoUI3A49tLmJAlg9/3IV0kCmwrWKJut/G8SeOefDLG8cXBTVtI/YuZOe1Te+w== + dependencies: + "@graphql-codegen/plugin-helpers" "^5.0.3" + "@graphql-codegen/visitor-plugin-common" "4.1.2" + auto-bind "~4.0.0" change-case-all "1.0.15" - common-tags "1.8.2" - import-from "4.0.0" - lodash "~4.17.0" - tslib "~2.5.0" + tslib "~2.6.0" + +"@graphql-codegen/typescript-operations@^4.1.2": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript-operations/-/typescript-operations-4.1.2.tgz#a0f455ae19e16961e5870420ca7515bbe51b5568" + integrity sha512-CtCWK+gW7hS+Ely3lohr8CL1HVLswQzMcaUk3k1sxdWCWKTNq7abMsWa31rTVwRCJ+WNEkM/7S8sIBTpEG683A== + dependencies: + "@graphql-codegen/plugin-helpers" "^5.0.3" + "@graphql-codegen/typescript" "^4.0.4" + "@graphql-codegen/visitor-plugin-common" "4.1.2" + auto-bind "~4.0.0" + tslib "~2.6.0" + +"@graphql-codegen/typescript@^4.0.4": + version "4.0.4" + resolved "https://registry.yarnpkg.com/@graphql-codegen/typescript/-/typescript-4.0.4.tgz#e791c61f675ae454951ea077b0ae519ae352cc3e" + integrity sha512-x79CKLfP9UQCX+/I78qxQlMs2Mmq3pF1lKafZo7lAno0f/fvJ+qWUduzdgjRNz+YL+5blGeWcC0pWEDxniO7hw== + dependencies: + "@graphql-codegen/plugin-helpers" "^5.0.3" + "@graphql-codegen/schema-ast" "^4.0.2" + "@graphql-codegen/visitor-plugin-common" "4.1.2" + auto-bind "~4.0.0" + tslib "~2.6.0" "@graphql-codegen/visitor-plugin-common@2.13.1": version "2.13.1" @@ -853,6 +914,22 @@ parse-filepath "^1.0.2" tslib "~2.4.0" +"@graphql-codegen/visitor-plugin-common@4.1.2", "@graphql-codegen/visitor-plugin-common@^4.1.2": + version "4.1.2" + resolved "https://registry.yarnpkg.com/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.1.2.tgz#674c5d5813f6c00dd65e1ee148a62536879e65e2" + integrity sha512-yk7iEAL1kYZ2Gi/pvVjdsZhul5WsYEM4Zcgh2Ev15VicMdJmPHsMhNUsZWyVJV0CaQCYpNOFlGD/11Ea3pn4GA== + dependencies: + "@graphql-codegen/plugin-helpers" "^5.0.3" + "@graphql-tools/optimize" "^2.0.0" + "@graphql-tools/relay-operation-optimizer" "^7.0.0" + "@graphql-tools/utils" "^10.0.0" + auto-bind "~4.0.0" + change-case-all "1.0.15" + dependency-graph "^0.11.0" + graphql-tag "^2.11.0" + parse-filepath "^1.0.2" + tslib "~2.6.0" + "@graphql-tools/apollo-engine-loader@^8.0.0": version "8.0.0" resolved "https://registry.yarnpkg.com/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.0.tgz#ac1f351cbe41508411784f25757f5557b0f27489" @@ -897,6 +974,14 @@ tslib "^2.5.0" value-or-promise "^1.0.12" +"@graphql-tools/documents@^1.0.0": + version "1.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/documents/-/documents-1.0.0.tgz#e3ed97197cc22ec830ca227fd7d17e86d8424bdf" + integrity sha512-rHGjX1vg/nZ2DKqRGfDPNC55CWZBMldEVcH+91BThRa6JeT80NqXknffLLEZLRUxyikCfkwMsk6xR3UNMqG0Rg== + dependencies: + lodash.sortby "^4.7.0" + tslib "^2.4.0" + "@graphql-tools/executor-graphql-ws@^1.0.0": version "1.0.2" resolved "https://registry.yarnpkg.com/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.0.2.tgz#29890f9370c5bebd4a2380e29904f8eaf9f013ca" @@ -1036,6 +1121,13 @@ dependencies: tslib "^2.4.0" +"@graphql-tools/optimize@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/optimize/-/optimize-2.0.0.tgz#7a9779d180824511248a50c5a241eff6e7a2d906" + integrity sha512-nhdT+CRGDZ+bk68ic+Jw1OZ99YCDIKYA5AlVAnBHJvMawSx9YQqQAIj4refNc1/LRieGiuWvhbG3jvPVYho0Dg== + dependencies: + tslib "^2.4.0" + "@graphql-tools/prisma-loader@^8.0.0": version "8.0.1" resolved "https://registry.yarnpkg.com/@graphql-tools/prisma-loader/-/prisma-loader-8.0.1.tgz#0a013c69b04e0779b5be15757173d458cdf94e35" @@ -1069,6 +1161,15 @@ "@graphql-tools/utils" "9.1.1" tslib "^2.4.0" +"@graphql-tools/relay-operation-optimizer@^7.0.0": + version "7.0.0" + resolved "https://registry.yarnpkg.com/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.0.tgz#24367666af87bc5a81748de5e8e9b3c523fd4207" + integrity sha512-UNlJi5y3JylhVWU4MBpL0Hun4Q7IoJwv9xYtmAz+CgRa066szzY7dcuPfxrA7cIGgG/Q6TVsKsYaiF4OHPs1Fw== + dependencies: + "@ardatan/relay-compiler" "12.0.0" + "@graphql-tools/utils" "^10.0.0" + tslib "^2.4.0" + "@graphql-tools/schema@^10.0.0": version "10.0.0" resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-10.0.0.tgz#7b5f6b6a59f51c927de8c9069bde4ebbfefc64b3" @@ -2374,6 +2475,11 @@ locate-path@^5.0.0: dependencies: p-locate "^4.1.0" +lodash.sortby@^4.7.0: + version "4.7.0" + resolved "https://registry.yarnpkg.com/lodash.sortby/-/lodash.sortby-4.7.0.tgz#edd14c824e2cc9c1e0b0a1b42bb5210516a42438" + integrity sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA== + lodash@^4.17.20, lodash@^4.17.21, lodash@~4.17.0: version "4.17.21" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" @@ -3049,7 +3155,7 @@ ts-log@^2.2.3: resolved "https://registry.yarnpkg.com/ts-log/-/ts-log-2.2.3.tgz#4da5640fe25a9fb52642cd32391c886721318efb" integrity sha512-XvB+OdKSJ708Dmf9ore4Uf/q62AYDTzFcAdxc8KNML1mmAWywRFVt/dn1KYJH8Agt5UJNujfM3znU5PxgAzA2w== -tslib@^2.0.0, tslib@^2.3.1, tslib@^2.4.1, tslib@~2.5.0: +tslib@^2.0.0, tslib@^2.3.1, tslib@^2.4.1: version "2.5.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== From 5904d2ee51aca36dca243de88b13de6237e9042b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 04:01:36 +0000 Subject: [PATCH 0514/1688] Update micrometer.version to v1.12.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 844fc4e7f97..aae99297d39 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 2.16.1 3.1.5 5.10.2 - 1.12.1 + 1.12.2 5.5.3 1.4.14 9.9.1 From 1d4f70f663ee4043cb2ebc1235c25bce3f5f6255 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Feb 2024 06:42:15 +0000 Subject: [PATCH 0515/1688] Update dependency com.google.cloud:libraries-bom to v26.31.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 844fc4e7f97..db06b8eb6dc 100644 --- a/pom.xml +++ b/pom.xml @@ -545,7 +545,7 @@ com.google.cloud libraries-bom - 26.27.0 + 26.31.0 pom import From 46b00abf9028152c9c82914aaeeec0a7998c8240 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 7 Feb 2024 09:06:02 +0000 Subject: [PATCH 0516/1688] Add changelog entry for #5381 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 05731e6fbeb..df2ecd4b8fc 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -88,6 +88,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Separate walk time from non-transit time [#5648](https://github.com/opentripplanner/OpenTripPlanner/pull/5648) - Remove "fare" [#5645](https://github.com/opentripplanner/OpenTripPlanner/pull/5645) - Refactor GroupStopBuilder addLocation method [#5651](https://github.com/opentripplanner/OpenTripPlanner/pull/5651) +- Remove `VehicleToStopHeuristics` [#5381](https://github.com/opentripplanner/OpenTripPlanner/pull/5381) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 7812ba537312904ba1a915391c0fb89421a1412f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 10:25:33 +0100 Subject: [PATCH 0517/1688] Resolve merge artifacts --- .../java/org/opentripplanner/ext/flex/FlexTest.java | 4 +--- .../org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java index 423ad143b69..26cedae79ee 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java @@ -25,9 +25,7 @@ public abstract class FlexTest { private static final ResourceLoader RES = ResourceLoader.of(FlexTest.class); protected static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs"); - protected static final File COBB_FLEX_GTFS = RES.file( - "cobblinc-scheduled-deviated-flex.gtfs" - ); + protected static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); protected static final File COBB_BUS_30_GTFS = RES.file("cobblinc-bus-30-only.gtfs.zip"); protected static final File MARTA_BUS_856_GTFS = RES.file("marta-bus-856-only.gtfs.zip"); protected static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java index c2051aff7e1..2218be9cf30 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/FareLegRuleMapper.java @@ -27,13 +27,13 @@ public Collection map( .stream() .map(r -> { var fareProductId = mapAgencyAndId(r.getFareProductId()); - var productForRule = fareProductMapper.getByFareProductId(fareProductId); + var productsForRule = fareProductMapper.getByFareProductId(fareProductId); - if (productForRule != null) { + if (!productsForRule.isEmpty()) { FareDistance fareDistance = createFareDistance(r); var ruleId = new FeedScopedId(fareProductId.getFeedId(), r.getId()); return FareLegRule - .of(ruleId, productForRule) + .of(ruleId, productsForRule) .withLegGroupId(mapAgencyAndId(r.getLegGroupId())) .withNetworkId(r.getNetworkId()) .withFromAreaId(areaId(r.getFromArea())) From 19769540b4edd065a94c13de9761ae33b0b4ed2e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 10:35:02 +0100 Subject: [PATCH 0518/1688] Add documentation --- .../org/opentripplanner/gtfs/mapping/StopAreaMapper.java | 9 +++++++++ .../org/opentripplanner/gtfs/mapping/StopTimeMapper.java | 1 + 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java index a16da70ac71..b3362cd7b6f 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java @@ -13,6 +13,15 @@ import org.opentripplanner.transit.model.site.GroupStopBuilder; import org.opentripplanner.transit.service.StopModelBuilder; +/** + * For a while GTFS Flex location groups were replaced by GTFS Fares v2 stop areas. After a few + * months, this decision was reverted and a new style of location groups we re-added to the Flex + * spec. + *

      + * Arcadis tooling still produces stop areas and for a while we will support both. Please don't rely + * on this as the class will be removed in the future! + */ +@Deprecated public class StopAreaMapper { private final StopMapper stopMapper; diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index 6441cb5e9e2..211b891a8cf 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -71,6 +71,7 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) { case Stop stop -> lhs.setStop(stopMapper.map(stop)); case Location location -> lhs.setStop(locationMapper.map(location)); case LocationGroup locGroup -> lhs.setStop(locationGroupMapper.map(locGroup)); + // only here for backwards compatibility, this will be removed in the future case StopArea area -> lhs.setStop(stopAreaMapper.map(area)); default -> throw new IllegalArgumentException( "Unknown location type: %s".formatted(stopLocation) From 1a8386876fbe7d40ae277c6361b56d882cffbf88 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 11:13:40 +0100 Subject: [PATCH 0519/1688] Update documentation --- .../gtfs/mapping/GTFSToOtpTransitServiceMapper.java | 4 ++-- .../org/opentripplanner/_support/geometry/Polygons.java | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index ed6a1c1055c..4d5fe6bd051 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -111,9 +111,9 @@ public GTFSToOtpTransitServiceMapper( pathwayNodeMapper = new PathwayNodeMapper(translationHelper, stationLookup); boardingAreaMapper = new BoardingAreaMapper(translationHelper, stopLookup); locationMapper = new LocationMapper(builder.stopModel()); - // location groups were replaced by stop areas in the spec - // this code will go away, please migrate now! locationGroupMapper = new LocationGroupMapper(stopMapper, locationMapper, builder.stopModel()); + // the use of stop areas were reverted in the spec + // this code will go away, please migrate now! stopAreaMapper = new StopAreaMapper(stopMapper, locationMapper, builder.stopModel()); pathwayMapper = new PathwayMapper(stopMapper, entranceMapper, pathwayNodeMapper, boardingAreaMapper); diff --git a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java index 4c5e226e4c5..efedd74499c 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java @@ -1,14 +1,8 @@ package org.opentripplanner._support.geometry; -import com.google.common.collect.Lists; import java.util.Arrays; -import java.util.List; -import org.geojson.GeoJsonObject; -import org.geojson.LineString; import org.geojson.LngLatAlt; -import org.geojson.Point; import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.Polygon; import org.opentripplanner.framework.geometry.GeometryUtils; From 7692ef10fa9d8a5d51b371c7585ecbb9df4a4f2d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 12:25:44 +0100 Subject: [PATCH 0520/1688] Apply review feedback --- .../DecorateConsolidatedStopNames.java | 34 ++++++++++++++----- .../DefaultStopConsolidationService.java | 4 +-- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index 2a09bb64255..a287e6a7d66 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -7,9 +7,9 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.ItineraryDecorator; /** - * A decorating filter that checks if a transit leg contains any primary stops and if it does, - * then replaces it with the secondary, agency-specific stop name. This is so that the in-vehicle - * display matches what OTP returns as a board/alight stop name. + * A decorating filter that checks if a transit leg contains any consolidated stops and if it does, + * then replaces it with the appropriate, agency-specific stop name. This is so that the physical + * signage and in-vehicle display matches what OTP returns as a board/alight stop name. */ public class DecorateConsolidatedStopNames implements ItineraryDecorator { @@ -21,20 +21,28 @@ public DecorateConsolidatedStopNames(StopConsolidationService service) { @Override public void decorate(Itinerary itinerary) { - replacePrimaryNamesWithSecondary(itinerary); + replaceConsolidatedStops(itinerary); } /** - * If the itinerary has a from/to that is the primary stop of a {@link org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup} - * then we replace its name with the secondary name of the agency that is - * operating the route, so that the name in the result matches the name in the in-vehicle - * display. + * If the itinerary has a "from" stop that is the secondary stop of a + * {@link org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup} + * then we replace its name with the primary name of the agency that is + * operating the route, so that the name in the result matches the physical signage on the stop. + *

      + * If the leg has a "to" stop that is a primary stop, then we don't want to show the stop that's on + * the signage but what is shown _inside_ the vehicle. That's why we use the agency-specific (aka + * secondary) stop. + *

      + * This follows the somewhat idiosyncratic logic of the consolidated stops feature. */ - private void replacePrimaryNamesWithSecondary(Itinerary i) { + private void replaceConsolidatedStops(Itinerary i) { i.transformTransitLegs(leg -> { if (leg instanceof ScheduledTransitLeg stl && needsToRenameStops(stl)) { var agency = leg.getAgency(); + // to show the name on the stop signage we use the primary stop's name var from = service.primaryStop(stl.getFrom().stop.getId()); + // to show the name that's on the display inside the vehicle we use the agency-specific name var to = service.agencySpecificStop(stl.getTo().stop, agency); return new ConsolidatedStopLeg(stl, from, to); } else { @@ -43,6 +51,14 @@ private void replacePrimaryNamesWithSecondary(Itinerary i) { }); } + /** + * Figures out if the from/to stops are part of a consolidated stop group and therefore + * some stops need to be replaced. + *

      + * Please consult the Javadoc of {@link DecorateConsolidatedStopNames#replaceConsolidatedStops(Itinerary)} + * for details of this idiosyncratic business logic and in particular why the logic is not the same + * for the from/to stops. + */ private boolean needsToRenameStops(ScheduledTransitLeg stl) { return (service.isSecondaryStop(stl.getFrom().stop) || service.isPrimaryStop(stl.getTo().stop)); } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index 5011a848210..51a57028121 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -77,12 +77,12 @@ public StopLocation agencySpecificStop(StopLocation stop, Agency agency) { if (agency.getId().getFeedId().equals(stop.getId().getFeedId())) { return stop; } else { - return agencySpecificStopOpt(stop, agency).orElse(stop); + return findAgencySpecificStop(stop, agency).orElse(stop); } } @Nonnull - private Optional agencySpecificStopOpt(StopLocation stop, Agency agency) { + private Optional findAgencySpecificStop(StopLocation stop, Agency agency) { return repo .groups() .stream() From 056d7585fb86eebb6a6456e259fc9cf63885a646 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 14:11:32 +0100 Subject: [PATCH 0521/1688] Allow configuring a custom attribution for vector tiles --- docs/sandbox/MapboxVectorTilesApi.md | 1 + .../ext/vectortiles/VectorTilesResource.java | 6 +++- .../apis/support/TileJson.java | 27 +++++++++++------ .../config/routerconfig/VectorTileConfig.java | 20 +++++++++++-- .../apis/support/TileJsonTest.java | 30 +++++++++++++++++++ 5 files changed, 71 insertions(+), 13 deletions(-) diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index da9fd1120e1..8e4af296155 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -148,6 +148,7 @@ For each layer, the configuration includes: | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |----------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| attribution | `string` | Set a custom attribution to be returned in `tilejson.json` | *Optional* | | 2.5 | | [basePath](#vectorTiles_basePath) | `string` | The path of the vector tile source URLs in `tilejson.json`. | *Optional* | | 2.5 | | [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | |       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index 772db7394f3..b4e59dc49e5 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -101,7 +101,11 @@ public TileJson getTileJson( TileJson.urlWithDefaultPath(uri, headers, rLayers, ignoreRouterId, "vectorTiles") ); - return new TileJson(url, envelope, feedInfos); + return serverContext + .vectorTileConfig() + .attribution() + .map(attr -> new TileJson(url, envelope, attr)) + .orElseGet(() -> new TileJson(url, envelope, feedInfos)); } private static LayerBuilder crateLayerBuilder( diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index 75aabb2b6c6..72fe1ac3140 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -6,6 +6,7 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; +import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; import org.opentripplanner.framework.io.HttpUtils; import org.opentripplanner.model.FeedInfo; @@ -36,15 +37,8 @@ public class TileJson implements Serializable { public final double[] bounds; public final double[] center; - public TileJson(String tileUrl, WorldEnvelope envelope, Collection feedInfos) { - attribution = - feedInfos - .stream() - .map(feedInfo -> - "" + feedInfo.getPublisherName() + "" - ) - .collect(Collectors.joining(", ")); - + public TileJson(String tileUrl, WorldEnvelope envelope, String attribution) { + this.attribution = attribution; tiles = new String[] { tileUrl }; bounds = @@ -59,6 +53,21 @@ public TileJson(String tileUrl, WorldEnvelope envelope, Collection fee center = new double[] { c.longitude(), c.latitude(), 9 }; } + public TileJson(String tileUrl, WorldEnvelope envelope, Collection feedInfos) { + this(tileUrl, envelope, attributionFromFeedInfo(feedInfos)); + } + + @Nonnull + private static String attributionFromFeedInfo(Collection feedInfos) { + var attribution = feedInfos + .stream() + .map(feedInfo -> + "" + feedInfo.getPublisherName() + "" + ) + .collect(Collectors.joining(", ")); + return attribution; + } + /** * Creates a vector source layer URL from a hard-coded path plus information from the incoming * HTTP request. diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index 6f7d6967ce8..4afc14a4ea7 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -18,18 +18,23 @@ public class VectorTileConfig implements VectorTilesResource.LayersParameters { - public static final VectorTileConfig DEFAULT = new VectorTileConfig(List.of(), null); + public static final VectorTileConfig DEFAULT = new VectorTileConfig(List.of(), null, null); private final List> layers; @Nullable private final String basePath; + @Nullable + private final String attribution; + VectorTileConfig( Collection> layers, - @Nullable String basePath + @Nullable String basePath, + @Nullable String attribution ) { this.layers = List.copyOf(layers); this.basePath = basePath; + this.attribution = attribution; } @Override @@ -41,6 +46,10 @@ public Optional basePath() { return Optional.ofNullable(basePath); } + public Optional attribution() { + return Optional.ofNullable(attribution); + } + public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String paramName) { var root = node.of(paramName).summary("Vector tile configuration").asObject(); return new VectorTileConfig( @@ -71,7 +80,12 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String is expected to be handled by a proxy. """ ) - .asString(DEFAULT.basePath) + .asString(DEFAULT.basePath), + root + .of("attribution") + .since(V2_5) + .summary("Set a custom attribution to be returned in `tilejson.json`") + .asString(DEFAULT.attribution) ); } diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index ac3b7bca522..f5f0401cf86 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -2,16 +2,24 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import java.time.LocalDate; import java.util.List; import org.glassfish.jersey.server.internal.routing.UriRoutingContext; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opentripplanner.model.FeedInfo; +import org.opentripplanner.service.worldenvelope.model.WorldEnvelope; import org.opentripplanner.test.support.HttpForTest; class TileJsonTest { private static final List LAYERS = List.of("stops", "rentalVehicles"); + private static final WorldEnvelope ENVELOPE = WorldEnvelope + .of() + .expandToIncludeStreetEntities(1, 1) + .expandToIncludeStreetEntities(2, 2) + .build(); @ParameterizedTest @ValueSource( @@ -40,4 +48,26 @@ void defaultPath() { TileJson.urlWithDefaultPath(uriInfo, req, LAYERS, "default", "vectorTiles") ); } + + @Test + void attributionFromFeedInfo() { + var feedInfo = new FeedInfo( + "1", + "Trimet", + "https://trimet.org", + "en", + LocalDate.MIN, + LocalDate.MIN, + "1" + ); + var tileJson = new TileJson("http://example.com", ENVELOPE, List.of(feedInfo)); + assertEquals("Trimet", tileJson.attribution); + } + + @Test + void attributionFromOverride() { + final String override = "OVERRIDE"; + var tileJson = new TileJson("http://example.com", ENVELOPE, override); + assertEquals(override, tileJson.attribution); + } } From c7e8e0d60e39b3cd44723f4809cfa2dae5c86fbe Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 16:38:05 +0100 Subject: [PATCH 0522/1688] Refactor attribution handling --- .../ext/vectortiles/VectorTilesResource.java | 23 +++++++++------ .../apis/support/TileJson.java | 22 +++++++-------- .../apis/support/TileJsonTest.java | 28 +++++++++++-------- 3 files changed, 42 insertions(+), 31 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index b4e59dc49e5..a1e9a83c85a 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -28,6 +28,7 @@ import org.opentripplanner.inspector.vector.LayerBuilder; import org.opentripplanner.inspector.vector.LayerParameters; import org.opentripplanner.inspector.vector.VectorTileResponseFactory; +import org.opentripplanner.model.FeedInfo; import org.opentripplanner.standalone.api.OtpServerRequestContext; @Path("/routers/{ignoreRouterId}/vectorTiles") @@ -81,13 +82,6 @@ public TileJson getTileJson( @PathParam("layers") String requestedLayers ) { var envelope = serverContext.worldEnvelopeService().envelope().orElseThrow(); - var feedInfos = serverContext - .transitService() - .getFeedIds() - .stream() - .map(serverContext.transitService()::getFeedInfo) - .filter(Predicate.not(Objects::isNull)) - .toList(); List rLayers = Arrays.asList(requestedLayers.split(",")); @@ -105,7 +99,20 @@ public TileJson getTileJson( .vectorTileConfig() .attribution() .map(attr -> new TileJson(url, envelope, attr)) - .orElseGet(() -> new TileJson(url, envelope, feedInfos)); + .orElseGet(() -> { + var feedInfos = getFeedInfos(); + return new TileJson(url, envelope, feedInfos); + }); + } + + private List getFeedInfos() { + return serverContext + .transitService() + .getFeedIds() + .stream() + .map(serverContext.transitService()::getFeedInfo) + .filter(Predicate.not(Objects::isNull)) + .toList(); } private static LayerBuilder crateLayerBuilder( diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index 72fe1ac3140..fcd6e84cc06 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -6,7 +6,6 @@ import java.util.Collection; import java.util.List; import java.util.stream.Collectors; -import javax.annotation.Nonnull; import org.apache.commons.lang3.StringUtils; import org.opentripplanner.framework.io.HttpUtils; import org.opentripplanner.model.FeedInfo; @@ -57,17 +56,6 @@ public TileJson(String tileUrl, WorldEnvelope envelope, Collection fee this(tileUrl, envelope, attributionFromFeedInfo(feedInfos)); } - @Nonnull - private static String attributionFromFeedInfo(Collection feedInfos) { - var attribution = feedInfos - .stream() - .map(feedInfo -> - "" + feedInfo.getPublisherName() + "" - ) - .collect(Collectors.joining(", ")); - return attribution; - } - /** * Creates a vector source layer URL from a hard-coded path plus information from the incoming * HTTP request. @@ -105,4 +93,14 @@ public static String urlFromOverriddenBasePath( String.join(",", layers) ); } + + private static String attributionFromFeedInfo(Collection feedInfos) { + return feedInfos + .stream() + .map(feedInfo -> + "" + feedInfo.getPublisherName() + "" + ) + .distinct() + .collect(Collectors.joining(", ")); + } } diff --git a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java index f5f0401cf86..73c8cd1369e 100644 --- a/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java +++ b/src/test/java/org/opentripplanner/apis/support/TileJsonTest.java @@ -20,6 +20,15 @@ class TileJsonTest { .expandToIncludeStreetEntities(1, 1) .expandToIncludeStreetEntities(2, 2) .build(); + private static final FeedInfo FEED_INFO = new FeedInfo( + "1", + "Trimet", + "https://trimet.org", + "en", + LocalDate.MIN, + LocalDate.MIN, + "1" + ); @ParameterizedTest @ValueSource( @@ -51,22 +60,19 @@ void defaultPath() { @Test void attributionFromFeedInfo() { - var feedInfo = new FeedInfo( - "1", - "Trimet", - "https://trimet.org", - "en", - LocalDate.MIN, - LocalDate.MIN, - "1" - ); - var tileJson = new TileJson("http://example.com", ENVELOPE, List.of(feedInfo)); + var tileJson = new TileJson("http://example.com", ENVELOPE, List.of(FEED_INFO)); + assertEquals("Trimet", tileJson.attribution); + } + + @Test + void duplicateAttribution() { + var tileJson = new TileJson("http://example.com", ENVELOPE, List.of(FEED_INFO, FEED_INFO)); assertEquals("Trimet", tileJson.attribution); } @Test void attributionFromOverride() { - final String override = "OVERRIDE"; + var override = "OVERRIDE"; var tileJson = new TileJson("http://example.com", ENVELOPE, override); assertEquals(override, tileJson.attribution); } From db5eb9e915a0e463fd4593df7e111cea977a1e39 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 16:48:43 +0100 Subject: [PATCH 0523/1688] Flesh out documentation --- docs/sandbox/MapboxVectorTilesApi.md | 17 ++++++++++++++++- .../config/routerconfig/VectorTileConfig.java | 12 +++++++++++- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 8e4af296155..11bd195a9d8 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -148,7 +148,7 @@ For each layer, the configuration includes: | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |----------------------------------------------------------------|:----------:|--------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| -| attribution | `string` | Set a custom attribution to be returned in `tilejson.json` | *Optional* | | 2.5 | +| [attribution](#vectorTiles_attribution) | `string` | Custom attribution to be returned in `tilejson.json` | *Optional* | | 2.5 | | [basePath](#vectorTiles_basePath) | `string` | The path of the vector tile source URLs in `tilejson.json`. | *Optional* | | 2.5 | | [layers](#vectorTiles_layers) | `object[]` | Configuration of the individual layers for the Mapbox vector tiles. | *Optional* | | 2.0 | |       type = "stop" | `enum` | Type of the layer. | *Required* | | 2.0 | @@ -162,6 +162,21 @@ For each layer, the configuration includes: #### Details +

      attribution

      + +**Since version:** `2.5` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` +**Path:** /vectorTiles + +Custom attribution to be returned in `tilejson.json` + +By default the `attribution` property in `tilejson.json` is computed from the names and +URLs of the feed publishers. +If the OTP deployment contains many fields, this can become very unwieldy. + +This configuration parameter allows you to set the `attribution` to any string you wish, +for example `TriMet, C-Tran, SMART and Friends`. + +

      basePath

      **Since version:** `2.5` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index 4afc14a4ea7..f0c6cb7d9b0 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -84,7 +84,17 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String root .of("attribution") .since(V2_5) - .summary("Set a custom attribution to be returned in `tilejson.json`") + .summary("Custom attribution to be returned in `tilejson.json`") + .description( + """ + By default the `attribution` property in `tilejson.json` is computed from the names and + URLs of the feed publishers. + If the OTP deployment contains many fields, this can become very unwieldy. + + This configuration parameter allows you to set the `attribution` to any string you wish, + for example `TriMet, C-Tran, SMART and Friends`. + """ + ) .asString(DEFAULT.attribution) ); } From 8640e08095402b16204dba8b410bc3dacf6da195 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 8 Feb 2024 14:24:09 +0200 Subject: [PATCH 0524/1688] Add service for street limitation parameters --- .../router/street/DirectStreetRouter.java | 4 +--- .../routing/impl/GraphPathFinder.java | 6 +++--- .../api/OtpServerRequestContext.java | 4 ++-- .../ConstructApplicationFactory.java | 2 ++ .../configure/ConstructApplicationModule.java | 6 +++--- .../server/DefaultServerRequestContext.java | 16 +++++++------- ...aultStreetLimitationParametersService.java | 20 ++++++++++++++++++ .../model/StreetLimitationParameters.java | 7 +++---- .../StreetLimitationParametersService.java | 13 ++++++++++++ ...reetLimitationParametersServiceModule.java | 21 +++++++++++++++++++ .../opentripplanner/TestServerContext.java | 8 ++++++- .../mapping/TripRequestMapperTest.java | 3 ++- .../transit/speed_test/SpeedTest.java | 3 +-- 13 files changed, 86 insertions(+), 27 deletions(-) create mode 100644 src/main/java/org/opentripplanner/street/model/DefaultStreetLimitationParametersService.java create mode 100644 src/main/java/org/opentripplanner/street/model/StreetLimitationParametersService.java create mode 100644 src/main/java/org/opentripplanner/street/model/StreetLimitationParametersServiceModule.java diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java index e2ce8c113c1..f895425f1c7 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectStreetRouter.java @@ -35,9 +35,7 @@ public static List route(OtpServerRequestContext serverContext, Route request.journey().direct().mode() ) ) { - var maxCarSpeed = serverContext.streetLimitationParameters().maxCarSpeed() != null - ? serverContext.streetLimitationParameters().maxCarSpeed() - : 40f; + var maxCarSpeed = serverContext.streetLimitationParametersService().getMaxCarSpeed(); if (!straightLineDistanceIsWithinLimit(directRequest, temporaryVertices, maxCarSpeed)) { return Collections.emptyList(); } diff --git a/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java b/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java index 74d34a8d505..0145eacd5ac 100644 --- a/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java +++ b/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java @@ -56,16 +56,16 @@ public class GraphPathFinder { private final DataOverlayContext dataOverlayContext; - private final Float maxCarSpeed; + private final float maxCarSpeed; public GraphPathFinder(@Nullable TraverseVisitor traverseVisitor) { - this(traverseVisitor, null, null); + this(traverseVisitor, null, 40f); } public GraphPathFinder( @Nullable TraverseVisitor traverseVisitor, @Nullable DataOverlayContext dataOverlayContext, - @Nullable Float maxCarSpeed + float maxCarSpeed ) { this.traverseVisitor = traverseVisitor; this.dataOverlayContext = dataOverlayContext; diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index 3bc847d7833..99f6c5af3f1 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -24,7 +24,7 @@ import org.opentripplanner.service.worldenvelope.WorldEnvelopeService; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; -import org.opentripplanner.street.model.StreetLimitationParameters; +import org.opentripplanner.street.model.StreetLimitationParametersService; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.service.TransitService; @@ -99,7 +99,7 @@ public interface OtpServerRequestContext { @Nullable StopConsolidationService stopConsolidationService(); - StreetLimitationParameters streetLimitationParameters(); + StreetLimitationParametersService streetLimitationParametersService(); MeterRegistry meterRegistry(); diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index 719cf37ec0e..10ad5ad8baa 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -30,6 +30,7 @@ import org.opentripplanner.standalone.config.configure.ConfigModule; import org.opentripplanner.standalone.server.MetricsLogging; import org.opentripplanner.street.model.StreetLimitationParameters; +import org.opentripplanner.street.model.StreetLimitationParametersServiceModule; import org.opentripplanner.transit.configure.TransitModule; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; @@ -53,6 +54,7 @@ EmissionsServiceModule.class, StopConsolidationServiceModule.class, InteractiveLauncherModule.class, + StreetLimitationParametersServiceModule.class, } ) public interface ConstructApplicationFactory { diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java index 88cce81423f..aa55ef3e2ad 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java @@ -19,7 +19,7 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; -import org.opentripplanner.street.model.StreetLimitationParameters; +import org.opentripplanner.street.model.StreetLimitationParametersService; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.visualizer.GraphVisualizer; @@ -37,7 +37,7 @@ OtpServerRequestContext providesServerContext( VehicleRentalService vehicleRentalService, List rideHailingServices, @Nullable StopConsolidationService stopConsolidationService, - StreetLimitationParameters streetLimitationParameters, + StreetLimitationParametersService streetLimitationParametersService, @Nullable TraverseVisitor traverseVisitor, EmissionsService emissionsService, LauncherRequestDecorator launcherRequestDecorator @@ -59,7 +59,7 @@ OtpServerRequestContext providesServerContext( routerConfig.flexConfig(), rideHailingServices, stopConsolidationService, - streetLimitationParameters, + streetLimitationParametersService, traverseVisitor ); } diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index 7cb5392ce8b..42c9538fe08 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -25,7 +25,7 @@ import org.opentripplanner.standalone.config.routerconfig.TransitRoutingConfig; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; -import org.opentripplanner.street.model.StreetLimitationParameters; +import org.opentripplanner.street.model.StreetLimitationParametersService; import org.opentripplanner.transit.service.TransitService; @HttpRequestScoped @@ -48,7 +48,7 @@ public class DefaultServerRequestContext implements OtpServerRequestContext { private final VehicleRentalService vehicleRentalService; private final EmissionsService emissionsService; private final StopConsolidationService stopConsolidationService; - private final StreetLimitationParameters streetLimitationParameters; + private final StreetLimitationParametersService streetLimitationParametersService; /** * Make sure all mutable components are copied/cloned before calling this constructor. @@ -68,7 +68,7 @@ private DefaultServerRequestContext( EmissionsService emissionsService, List rideHailingServices, StopConsolidationService stopConsolidationService, - StreetLimitationParameters streetLimitationParameters, + StreetLimitationParametersService streetLimitationParametersService, FlexConfig flexConfig, TraverseVisitor traverseVisitor ) { @@ -88,7 +88,7 @@ private DefaultServerRequestContext( this.rideHailingServices = rideHailingServices; this.emissionsService = emissionsService; this.stopConsolidationService = stopConsolidationService; - this.streetLimitationParameters = streetLimitationParameters; + this.streetLimitationParametersService = streetLimitationParametersService; } /** @@ -109,7 +109,7 @@ public static DefaultServerRequestContext create( FlexConfig flexConfig, List rideHailingServices, @Nullable StopConsolidationService stopConsolidationService, - StreetLimitationParameters streetLimitationParameters, + StreetLimitationParametersService streetLimitationParametersService, @Nullable TraverseVisitor traverseVisitor ) { return new DefaultServerRequestContext( @@ -127,7 +127,7 @@ public static DefaultServerRequestContext create( emissionsService, rideHailingServices, stopConsolidationService, - streetLimitationParameters, + streetLimitationParametersService, flexConfig, traverseVisitor ); @@ -206,8 +206,8 @@ public StopConsolidationService stopConsolidationService() { } @Override - public StreetLimitationParameters streetLimitationParameters() { - return streetLimitationParameters; + public StreetLimitationParametersService streetLimitationParametersService() { + return streetLimitationParametersService; } @Override diff --git a/src/main/java/org/opentripplanner/street/model/DefaultStreetLimitationParametersService.java b/src/main/java/org/opentripplanner/street/model/DefaultStreetLimitationParametersService.java new file mode 100644 index 00000000000..d6cafa320e2 --- /dev/null +++ b/src/main/java/org/opentripplanner/street/model/DefaultStreetLimitationParametersService.java @@ -0,0 +1,20 @@ +package org.opentripplanner.street.model; + +import jakarta.inject.Inject; + +public class DefaultStreetLimitationParametersService implements StreetLimitationParametersService { + + private final StreetLimitationParameters streetLimitationParameters; + + @Inject + public DefaultStreetLimitationParametersService( + StreetLimitationParameters streetLimitationParameters + ) { + this.streetLimitationParameters = streetLimitationParameters; + } + + @Override + public float getMaxCarSpeed() { + return streetLimitationParameters.maxCarSpeed(); + } +} diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java index a10fe77144c..18937abad9b 100644 --- a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java +++ b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java @@ -3,7 +3,6 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; import java.io.Serializable; -import javax.annotation.Nullable; /** * Holds limits of the street graph. @@ -13,7 +12,7 @@ @Singleton public class StreetLimitationParameters implements Serializable { - private Float maxCarSpeed = null; + private float maxCarSpeed = 40f; @Inject public StreetLimitationParameters() {} @@ -27,9 +26,9 @@ public void initMaxCarSpeed(float maxCarSpeed) { /** * If this graph contains car routable streets, this value is the maximum speed limit in m/s. + * Defaults to 40 m/s == 144 km/h. */ - @Nullable - public Float maxCarSpeed() { + public float maxCarSpeed() { return maxCarSpeed; } } diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersService.java b/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersService.java new file mode 100644 index 00000000000..9065924b49b --- /dev/null +++ b/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersService.java @@ -0,0 +1,13 @@ +package org.opentripplanner.street.model; + +/** + * A service for fetching limitation parameters of the street graph. + */ +public interface StreetLimitationParametersService { + /** + * Get the graph wide maximum car speed. + * + * @return Maximum car speed in meters per second. + */ + float getMaxCarSpeed(); +} diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersServiceModule.java b/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersServiceModule.java new file mode 100644 index 00000000000..f034b48f313 --- /dev/null +++ b/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersServiceModule.java @@ -0,0 +1,21 @@ +package org.opentripplanner.street.model; + +import dagger.Module; +import dagger.Provides; +import jakarta.inject.Singleton; + +/** + * The service is used during application serve phase, not loading, so we need to provide + * a module for the service without the repository, which is injected from the loading phase. + */ +@Module +public class StreetLimitationParametersServiceModule { + + @Provides + @Singleton + public StreetLimitationParametersService provideEmissionsService( + StreetLimitationParameters streetLimitationParameters + ) { + return new DefaultStreetLimitationParametersService(streetLimitationParameters) {}; + } +} diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index f80795c2155..4ed451b3db3 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -20,7 +20,9 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; +import org.opentripplanner.street.model.DefaultStreetLimitationParametersService; import org.opentripplanner.street.model.StreetLimitationParameters; +import org.opentripplanner.street.model.StreetLimitationParametersService; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; @@ -52,7 +54,7 @@ public static OtpServerRequestContext createServerContext( routerConfig.flexConfig(), List.of(), null, - new StreetLimitationParameters(), + createStreetLimitationParametersService(), null ); creatTransitLayerForRaptor(transitModel, routerConfig.transitTuningConfig()); @@ -82,4 +84,8 @@ public static VehicleRentalService createVehicleRentalService() { public static EmissionsService createEmissionsService() { return new DefaultEmissionsService(new EmissionsDataModel()); } + + public static StreetLimitationParametersService createStreetLimitationParametersService() { + return new DefaultStreetLimitationParametersService(new StreetLimitationParameters()); + } } diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index f4d4f5b005f..4ccb1627e7f 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -48,6 +48,7 @@ import org.opentripplanner.service.worldenvelope.internal.DefaultWorldEnvelopeService; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; +import org.opentripplanner.street.model.DefaultStreetLimitationParametersService; import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -133,7 +134,7 @@ public class TripRequestMapperTest implements PlanTestConstants { RouterConfig.DEFAULT.flexConfig(), List.of(), null, - new StreetLimitationParameters(), + new DefaultStreetLimitationParametersService(new StreetLimitationParameters()), null ), null, diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index e66e828856a..e045f49c01d 100644 --- a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -31,7 +31,6 @@ import org.opentripplanner.standalone.config.OtpConfigLoader; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; -import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.speed_test.model.SpeedTestProfile; @@ -121,7 +120,7 @@ public SpeedTest( config.flexConfig, List.of(), null, - new StreetLimitationParameters(), + TestServerContext.createStreetLimitationParametersService(), null ); // Creating transitLayerForRaptor should be integrated into the TransitModel, but for now From 18b94fc34272724ec9619cd82952ee2f47b28487 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 8 Feb 2024 13:33:02 +0100 Subject: [PATCH 0525/1688] Reduce flex default penalty --- docs/RouteRequest.md | 2 +- .../api/request/preference/AccessEgressPreferences.java | 6 +++++- .../org/opentripplanner/apis/transmodel/schema.graphql | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 4ef1e17a7d8..81f4dd396f6 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -411,7 +411,7 @@ The default values are - `car-to-park` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) - `car-rental` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) - `car-hailing` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) -- `flexible` = (timePenalty: 20m + 2.0 t, costFactor: 1.50) +- `flexible` = (timePenalty: 10m + 1.30 t, costFactor: 1.30) Example: `"car-to-park" : { "timePenalty": "10m + 1.5t", "costFactor": 2.5 }` diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java index ada495b19ba..9998f0a3b1c 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/AccessEgressPreferences.java @@ -25,12 +25,16 @@ public final class AccessEgressPreferences implements Serializable { TimePenalty.of(ofMinutes(20), 2f), 1.5 ); + private static final TimeAndCostPenalty FLEX_DEFAULT_PENALTY = TimeAndCostPenalty.of( + TimePenalty.of(ofMinutes(10), 1.3f), + 1.3 + ); private static final TimeAndCostPenaltyForEnum DEFAULT_TIME_AND_COST = TimeAndCostPenaltyForEnum .of(StreetMode.class) .with(StreetMode.CAR_TO_PARK, DEFAULT_PENALTY) .with(StreetMode.CAR_HAILING, DEFAULT_PENALTY) .with(StreetMode.CAR_RENTAL, DEFAULT_PENALTY) - .with(StreetMode.FLEXIBLE, DEFAULT_PENALTY) + .with(StreetMode.FLEXIBLE, FLEX_DEFAULT_PENALTY) .build(); public static final AccessEgressPreferences DEFAULT = new AccessEgressPreferences(); diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index dad106418fe..9c0eae88fa1 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -774,7 +774,7 @@ type QueryType { "Input type for executing a travel search for a trip between two locations. Returns trip patterns describing suggested alternatives for the trip." trip( "Time and cost penalty on access/egress modes." - accessEgressPenalty: [PenaltyForStreetMode!] = [{streetMode : car_park, timePenalty : "20m + 2.0 t", costFactor : 1.5}, {streetMode : flexible, timePenalty : "20m + 2.0 t", costFactor : 1.5}], + accessEgressPenalty: [PenaltyForStreetMode!] = [{streetMode : car_park, timePenalty : "20m + 2.0 t", costFactor : 1.5}, {streetMode : flexible, timePenalty : "10m + 1.30 t", costFactor : 1.3}], "The alightSlack is the minimum extra time after exiting a public transport vehicle. This is the default value used, if not overridden by the 'alightSlackList'." alightSlackDefault: Int = 0, "List of alightSlack for a given set of modes. Defaults: []" From 6ca07cfb17e6a0a99dae5e127333932d4182ca23 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 8 Feb 2024 13:43:10 +0100 Subject: [PATCH 0526/1688] Fix test --- .../routing/api/request/preference/StreetPreferencesTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java index 0289c24e837..a318474eab7 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/StreetPreferencesTest.java @@ -112,7 +112,7 @@ void testToString() { "accessEgress: AccessEgressPreferences{penalty: TimeAndCostPenaltyForEnum{CAR_TO_PARK: " + CAR_PENALTY + ", CAR_RENTAL: (timePenalty: 20m + 2.0 t, costFactor: 1.50), CAR_HAILING: (timePenalty: 20m + 2.0 t, costFactor: 1.50), " + - "FLEXIBLE: (timePenalty: 20m + 2.0 t, costFactor: 1.50)}, " + + "FLEXIBLE: (timePenalty: 10m + 1.30 t, costFactor: 1.30)}, " + "maxDuration: DurationForStreetMode{default:5m}" + "}, " + "maxDirectDuration: DurationForStreetMode{default:10m}" + From 479aa20578f8bc83ff8c5e09a8d27f6031f9c927 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 8 Feb 2024 15:06:22 +0200 Subject: [PATCH 0527/1688] Add tests for WayPropertySet --- .../wayproperty/WayPropertySetTest.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java index c5ae8b86f7d..e8f5b6e51d3 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java @@ -31,6 +31,44 @@ public void carTunnel() { assertEquals(CAR, wps.getDataForWay(tunnel).getPermission()); } + @Test + public void carMaxSpeed() { + var delta = 0.001f; + var motorWaySpeed = 35f; + WayPropertySet wps = wps(); + wps.setCarSpeed("highway=motorway", motorWaySpeed); + + // Test that there are default values + assertEquals(38f, wps.maxPossibleCarSpeed, delta); + assertEquals(0f, wps.maxUsedCarSpeed, delta); + + // Speed limit that is within limits should be used as the max used car speed + OSMWithTags streetWithSpeedLimit = new OSMWithTags(); + streetWithSpeedLimit.addTag("highway", "motorway"); + streetWithSpeedLimit.addTag("maxspeed", "120"); + var waySpeed = wps.getCarSpeedForWay(streetWithSpeedLimit, false); + assertEquals(33.33336, waySpeed, delta); + assertEquals(33.33336, wps.maxUsedCarSpeed, delta); + + // Speed limit that is higher than maxPossibleCarSpeed should be ignored and regular motorway + // speed limit should be used instead + OSMWithTags streetWithTooHighSpeedLimit = new OSMWithTags(); + streetWithTooHighSpeedLimit.addTag("highway", "motorway"); + streetWithTooHighSpeedLimit.addTag("maxspeed", "200"); + waySpeed = wps.getCarSpeedForWay(streetWithTooHighSpeedLimit, false); + assertEquals(motorWaySpeed, waySpeed, delta); + assertEquals(motorWaySpeed, wps.maxUsedCarSpeed, delta); + + // Speed limit that is too low should be ignored and regular motorway speed limit should + // be used instead + OSMWithTags streetWithTooLowSpeedLimit = new OSMWithTags(); + streetWithTooLowSpeedLimit.addTag("highway", "motorway"); + streetWithTooLowSpeedLimit.addTag("maxspeed", "0"); + waySpeed = wps.getCarSpeedForWay(streetWithTooLowSpeedLimit, false); + assertEquals(motorWaySpeed, waySpeed, delta); + assertEquals(motorWaySpeed, wps.maxUsedCarSpeed, delta); + } + @Test void pedestrianTunnelSpecificity() { var tunnel = WayTestData.pedestrianTunnel(); From 1faa689d33d11fc27746cb0c88f6f527882cf643 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 7 Feb 2024 17:43:50 +0100 Subject: [PATCH 0528/1688] Optionally abort the startup if configuration is invalid --- .../java/org/opentripplanner/standalone/OTPMain.java | 8 ++++++++ .../standalone/config/BuildConfig.java | 4 ++++ .../standalone/config/CommandLineParameters.java | 6 ++++++ .../standalone/config/ConfigModel.java | 11 +++++++++++ .../opentripplanner/standalone/config/OtpConfig.java | 4 ++++ .../standalone/config/RouterConfig.java | 4 ++++ .../standalone/config/framework/json/NodeAdapter.java | 4 ++++ 7 files changed, 41 insertions(+) diff --git a/src/main/java/org/opentripplanner/standalone/OTPMain.java b/src/main/java/org/opentripplanner/standalone/OTPMain.java index 365e1fb49c8..badfb73443d 100644 --- a/src/main/java/org/opentripplanner/standalone/OTPMain.java +++ b/src/main/java/org/opentripplanner/standalone/OTPMain.java @@ -113,6 +113,14 @@ private static void startOTPServer(CommandLineParameters cli) { var loadApp = new LoadApplication(cli); var config = loadApp.config(); + // optionally check if the config is valid and if not abort the startup process + if (cli.configCheck && config.hasInvalidProperties()) { + throw new OtpAppException( + "Configuration contains invalid properties (see above for details). " + + "Please fix your configuration or remove --configCheck from your OTP CLI parameters." + ); + } + // Validate data sources, command line arguments and config before loading and // processing input data to fail early loadApp.validateConfigAndDataSources(); diff --git a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java index d62aa1bf41f..97b3c0de9f2 100644 --- a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java @@ -719,4 +719,8 @@ public int getSubwayAccessTimeSeconds() { public NodeAdapter asNodeAdapter() { return root; } + + public boolean hasInvalidProperties() { + return root.hasInvalidProperties(); + } } diff --git a/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java b/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java index fb26db4877d..57446d0942e 100644 --- a/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java +++ b/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java @@ -133,6 +133,12 @@ public class CommandLineParameters { ) public boolean visualize; + @Parameter( + names = { "--configCheck" }, + description = "Abort the startup if configuration files are found to be invalid." + ) + public boolean configCheck = false; + /** * The remaining single parameter after the switches is the directory with the configuration * files. This directory may contain other files like the graph, input data and report files. diff --git a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java index 48966aefc7b..df798dca672 100644 --- a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java +++ b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java @@ -105,4 +105,15 @@ public static void initializeOtpFeatures(OtpConfig otpConfig) { OTPFeature.enableFeatures(otpConfig.otpFeatures); OTPFeature.logFeatureSetup(); } + + /** + * Checks if any unknown or invalid properties were encountered while loading of the configuration. + */ + public boolean hasInvalidProperties() { + return ( + otpConfig.hasInvalidProperties() || + buildConfig.hasInvalidProperties() || + routerConfig.hasInvalidProperties() + ); + } } diff --git a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java index 40a659df1ab..22845b60ad1 100644 --- a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java @@ -71,4 +71,8 @@ public OtpConfig(NodeAdapter nodeAdapter, boolean logUnusedParams) { root.logAllWarnings(LOG::warn); } } + + public boolean hasInvalidProperties() { + return root.hasInvalidProperties(); + } } diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java index bf97155b747..c7c20ca065a 100644 --- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java @@ -150,4 +150,8 @@ public String toString() { // Print ONLY the values set, not default values return root.toPrettyString(); } + + public boolean hasInvalidProperties() { + return root.hasInvalidProperties(); + } } diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java index 69d9937582b..52079d9f5a8 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java @@ -172,6 +172,10 @@ public void logAllWarnings(Consumer logger) { allWarnings().forEach(logger); } + public boolean hasInvalidProperties() { + return !unusedParams().isEmpty() || !allWarnings().toList().isEmpty(); + } + /** * Be careful when using this method - this bypasses the NodeAdaptor, and we loose * track of unused parameters and cannot generate documentation for the children. From a6d7518fe254e8de657935e172ec2ac5575a1232 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 8 Feb 2024 14:10:12 +0100 Subject: [PATCH 0529/1688] Add documentation --- .../org/opentripplanner/standalone/config/BuildConfig.java | 3 +++ .../org/opentripplanner/standalone/config/ConfigModel.java | 2 +- .../java/org/opentripplanner/standalone/config/OtpConfig.java | 3 +++ .../org/opentripplanner/standalone/config/RouterConfig.java | 4 +++- .../standalone/config/framework/json/NodeAdapter.java | 3 +++ 5 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java index 97b3c0de9f2..6ebd15019eb 100644 --- a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java @@ -720,6 +720,9 @@ public NodeAdapter asNodeAdapter() { return root; } + /** + * Checks if any unknown or invalid properties were encountered while loading the configuration. + */ public boolean hasInvalidProperties() { return root.hasInvalidProperties(); } diff --git a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java index df798dca672..820737ec8f9 100644 --- a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java +++ b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java @@ -107,7 +107,7 @@ public static void initializeOtpFeatures(OtpConfig otpConfig) { } /** - * Checks if any unknown or invalid properties were encountered while loading of the configuration. + * Checks if any unknown or invalid properties were encountered while loading the configuration. */ public boolean hasInvalidProperties() { return ( diff --git a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java index 22845b60ad1..bb361c15d4f 100644 --- a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java @@ -72,6 +72,9 @@ public OtpConfig(NodeAdapter nodeAdapter, boolean logUnusedParams) { } } + /** + * Checks if any unknown or invalid properties were encountered while loading the configuration. + */ public boolean hasInvalidProperties() { return root.hasInvalidProperties(); } diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java index c7c20ca065a..bea05936de7 100644 --- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java @@ -150,7 +150,9 @@ public String toString() { // Print ONLY the values set, not default values return root.toPrettyString(); } - + /** + * Checks if any unknown or invalid properties were encountered while loading the configuration. + */ public boolean hasInvalidProperties() { return root.hasInvalidProperties(); } diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java index 52079d9f5a8..7a097b2edff 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java @@ -172,6 +172,9 @@ public void logAllWarnings(Consumer logger) { allWarnings().forEach(logger); } + /** + * Checks if any unknown or invalid properties were encountered while loading the configuration. + */ public boolean hasInvalidProperties() { return !unusedParams().isEmpty() || !allWarnings().toList().isEmpty(); } From 57243b0f2eac7435fdd2a2f94be376a93c841607 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 8 Feb 2024 14:10:56 +0100 Subject: [PATCH 0530/1688] Remove 'public' modifier --- .../framework/json/NodeAdapterTest.java | 90 +++++++++---------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index be44d1ea86f..f414f6e7b34 100644 --- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -34,7 +34,7 @@ public class NodeAdapterTest { public static final String NON_UNUSED_PARAMETERS = "EXPECTED_NONE"; @Test - public void testAsRawNode() { + void testAsRawNode() { NodeAdapter subject = newNodeAdapterForTest("{ child : { foo : 'bar' } }"); // Define child @@ -53,7 +53,7 @@ public void testAsRawNode() { } @Test - public void isEmpty() { + void isEmpty() { NodeAdapter subject = newNodeAdapterForTest(""); assertTrue(subject.of("alf").asObject().isEmpty()); @@ -64,7 +64,7 @@ public void isEmpty() { } @Test - public void path() { + void path() { NodeAdapter subject = newNodeAdapterForTest("{ foo : 'bar' }"); assertFalse(subject.of("foo").asObject().isEmpty()); assertTrue(subject.of("missingObject").asObject().isEmpty()); @@ -72,7 +72,7 @@ public void path() { } @Test - public void docInfo() { + void docInfo() { NodeAdapter subject = newNodeAdapterForTest("{ bool: false }"); subject.of("bool").since(V2_0).summary("B Summary").description("Ddd").asBoolean(); subject.of("en").since(V2_1).summary("EN Summary").asEnum(SECONDS); @@ -95,7 +95,7 @@ public void docInfo() { } @Test - public void asBoolean() { + void asBoolean() { NodeAdapter subject = newNodeAdapterForTest("{ aBoolean : true }"); assertTrue(subject.of("aBoolean").asBoolean()); assertTrue(subject.of("aBoolean").asBoolean(false)); @@ -103,7 +103,7 @@ public void asBoolean() { } @Test - public void asDouble() { + void asDouble() { NodeAdapter subject = newNodeAdapterForTest("{ aDouble : 7.0 }"); assertEquals(7.0, subject.of("aDouble").asDouble(-1d), 0.01); assertEquals(7.0, subject.of("aDouble").asDouble(), 0.01); @@ -111,28 +111,28 @@ public void asDouble() { } @Test - public void asDoubles() { + void asDoubles() { NodeAdapter subject = newNodeAdapterForTest("{ key : [ 2.0, 3.0, 5.0 ] }"); assertEquals(List.of(2d, 3d, 5d), subject.of("key").asDoubles(null)); assertEquals(NON_UNUSED_PARAMETERS, unusedParams(subject)); } @Test - public void asInt() { + void asInt() { NodeAdapter subject = newNodeAdapterForTest("{ aInt : 5 }"); assertEquals(5, subject.of("aInt").asInt(-1)); assertEquals(-1, subject.of("missingField").asInt(-1)); } @Test - public void asLong() { + void asLong() { NodeAdapter subject = newNodeAdapterForTest("{ key : 5 }"); assertEquals(5, subject.of("key").asLong(-1)); assertEquals(-1, subject.of("missingField").asLong(-1)); } @Test - public void asText() { + void asText() { NodeAdapter subject = newNodeAdapterForTest("{ aText : 'TEXT' }"); assertEquals("TEXT", subject.of("aText").asString("DEFAULT")); assertEquals("DEFAULT", subject.of("missingField").asString("DEFAULT")); @@ -142,19 +142,19 @@ public void asText() { } @Test - public void requiredAsText() { + void requiredAsText() { NodeAdapter subject = newNodeAdapterForTest("{ }"); assertThrows(OtpAppException.class, () -> subject.of("missingField").asString()); } @Test - public void rawAsText() { + void rawAsText() { NodeAdapter subject = newNodeAdapterForTest("{ aText : 'TEXT' }"); assertEquals("TEXT", subject.of("aText").asObject().asText()); } @Test - public void asEnum() { + void asEnum() { // Given NodeAdapter subject = newNodeAdapterForTest("{ a : 'A', abc : 'a-b-c' }"); @@ -169,7 +169,7 @@ public void asEnum() { } @Test - public void asEnumWithIllegalPropertySet() { + void asEnumWithIllegalPropertySet() { // Given NodeAdapter subject = newNodeAdapterForTest( """ @@ -205,7 +205,7 @@ public void asEnumWithIllegalPropertySet() { } @Test - public void asEnumMap() { + void asEnumMap() { // With optional enum values in map NodeAdapter subject = newNodeAdapterForTest("{ key : { A: true, B: false } }"); assertEquals( @@ -220,7 +220,7 @@ public void asEnumMap() { } @Test - public void asEnumMapWithCustomType() { + void asEnumMapWithCustomType() { // With optional enum values in map NodeAdapter subject = newNodeAdapterForTest("{ key : { A: {a:'Foo'} } }"); assertEquals( @@ -235,7 +235,7 @@ public void asEnumMapWithCustomType() { } @Test - public void asEnumMapWithDefaultValue() { + void asEnumMapWithDefaultValue() { var subject = newNodeAdapterForTest("{}"); final Map dflt = Map.of(AnEnum.A, new ARecord("Foo")); assertEquals(dflt, subject.of("key").asEnumMap(AnEnum.class, ARecord::fromJson, dflt)); @@ -243,7 +243,7 @@ public void asEnumMapWithDefaultValue() { } @Test - public void asEnumMapWithUnknownKey() { + void asEnumMapWithUnknownKey() { NodeAdapter subject = newNodeAdapterForTest("{ enumMap : { unknown : 7 } }"); subject.of("enumMap").asEnumMap(AnEnum.class, Double.class); @@ -261,7 +261,7 @@ public void asEnumMapWithUnknownKey() { } @Test - public void asEnumMapAllKeysRequired() { + void asEnumMapAllKeysRequired() { var subject = newNodeAdapterForTest("{ key : { A: true, b: false, a_B_c: true } }"); assertEquals( Map.of(AnEnum.A, true, AnEnum.B, false, AnEnum.A_B_C, true), @@ -280,7 +280,7 @@ public void asEnumMapAllKeysRequired() { } @Test - public void asEnumMapWithRequiredMissingValue() { + void asEnumMapWithRequiredMissingValue() { // A value for C is missing in map NodeAdapter subject = newNodeAdapterForTest("{ key : { A: true, B: false } }"); @@ -291,7 +291,7 @@ public void asEnumMapWithRequiredMissingValue() { } @Test - public void asEnumSet() { + void asEnumSet() { NodeAdapter subject = newNodeAdapterForTest("{ key : [ 'A', 'B' ] }"); assertEquals(Set.of(AnEnum.A, AnEnum.B), subject.of("key").asEnumSet(AnEnum.class)); assertEquals(Set.of(), subject.of("missing-key").asEnumSet(AnEnum.class)); @@ -299,13 +299,13 @@ public void asEnumSet() { } @Test - public void asEnumSetFailsUsingWrongFormat() { + void asEnumSetFailsUsingWrongFormat() { NodeAdapter subject = newNodeAdapterForTest("{ key : 'A,B' }"); assertThrows(OtpAppException.class, () -> subject.of("key").asEnumSet(AnEnum.class)); } @Test - public void asFeedScopedId() { + void asFeedScopedId() { NodeAdapter subject = newNodeAdapterForTest("{ key1: 'A:23', key2: 'B:12' }"); assertEquals("A:23", subject.of("key1").asFeedScopedId(null).toString()); assertEquals("B:12", subject.of("key2").asFeedScopedId(null).toString()); @@ -316,7 +316,7 @@ public void asFeedScopedId() { } @Test - public void asFeedScopedIds() { + void asFeedScopedIds() { NodeAdapter subject = newNodeAdapterForTest("{ routes: ['A:23', 'B:12']}"); assertEquals("[A:23, B:12]", subject.of("routes").asFeedScopedIds(List.of()).toString()); assertEquals("[]", subject.of("missing-key").asFeedScopedIds(List.of()).toString()); @@ -328,7 +328,7 @@ public void asFeedScopedIds() { } @Test - public void asFeedScopedIdSet() { + void asFeedScopedIdSet() { NodeAdapter subject = newNodeAdapterForTest("{ routes: ['A:23', 'B:12', 'A:23']}"); assertEquals( List.of( @@ -342,7 +342,7 @@ public void asFeedScopedIdSet() { } @Test - public void asDateOrRelativePeriod() { + void asDateOrRelativePeriod() { // Given var subject = newNodeAdapterForTest("{ 'a' : '2020-02-28', 'b' : '-P3Y' }"); var utc = ZoneIds.UTC; @@ -362,7 +362,7 @@ public void asDateOrRelativePeriod() { } @Test - public void testParsePeriodDateThrowsException() { + void testParsePeriodDateThrowsException() { // Given NodeAdapter subject = newNodeAdapterForTest("{ 'foo' : 'bar' }"); @@ -374,7 +374,7 @@ public void testParsePeriodDateThrowsException() { } @Test - public void asDuration() { + void asDuration() { NodeAdapter subject = newNodeAdapterForTest("{ k1:'PT1s', k2:'3h2m1s', k3:7 }"); // as required duration @@ -390,13 +390,13 @@ public void asDuration() { } @Test - public void requiredAsDuration() { + void requiredAsDuration() { NodeAdapter subject = newNodeAdapterForTest("{ }"); assertThrows(OtpAppException.class, () -> subject.of("missingField").asDuration()); } @Test - public void asDurations() { + void asDurations() { NodeAdapter subject = newNodeAdapterForTest("{ key1 : ['PT1s', '2h'] }"); assertEquals("[PT1S, PT2H]", subject.of("key1").asDurations(List.of()).toString()); assertEquals("[PT3H]", subject.of("missing-key").asDurations(List.of(D3h)).toString()); @@ -404,7 +404,7 @@ public void asDurations() { } @Test - public void asLocale() { + void asLocale() { NodeAdapter subject = newNodeAdapterForTest( "{ key1 : 'no', key2 : 'no_NO', key3 : 'no_NO_NY' }" ); @@ -415,14 +415,14 @@ public void asLocale() { } @Test - public void asPattern() { + void asPattern() { NodeAdapter subject = newNodeAdapterForTest("{ key : 'Ab*a' }"); assertEquals("Ab*a", subject.of("key").asPattern("ABC").toString()); assertEquals("ABC", subject.of("missingField").asPattern("ABC").toString()); } @Test - public void uri() { + void uri() { var URL = "gs://bucket/a.obj"; NodeAdapter subject = newNodeAdapterForTest("{ aUri : '" + URL + "' }"); @@ -433,14 +433,14 @@ public void uri() { } @Test - public void uriSyntaxException() { + void uriSyntaxException() { NodeAdapter subject = newNodeAdapterForTest("{ aUri : 'error$%uri' }"); assertThrows(OtpAppException.class, () -> subject.of("aUri").asUri(null), "error$%uri"); } @Test - public void uriRequiredValueMissing() { + void uriRequiredValueMissing() { NodeAdapter subject = newNodeAdapterForTest("{ }"); assertThrows( @@ -451,7 +451,7 @@ public void uriRequiredValueMissing() { } @Test - public void uris() { + void uris() { NodeAdapter subject = newNodeAdapterForTest("{ foo : ['gs://a/b', 'gs://c/d'] }"); assertEquals("[gs://a/b, gs://c/d]", subject.of("foo").asUris().toString()); @@ -461,7 +461,7 @@ public void uris() { } @Test - public void urisNotAnArrayException() { + void urisNotAnArrayException() { NodeAdapter subject = newNodeAdapterForTest("{ 'uris': 'no array' }"); assertThrows( @@ -472,7 +472,7 @@ public void urisNotAnArrayException() { } @Test - public void objectAsList() { + void objectAsList() { NodeAdapter subject = newNodeAdapterForTest("{ key : [{ a: 'I' }, { a: '2' } ] }"); List result = subject @@ -487,21 +487,21 @@ public void objectAsList() { } @Test - public void asCostLinearFunction() { + void asCostLinearFunction() { NodeAdapter subject = newNodeAdapterForTest("{ key : '400+8x' }"); assertEquals("6m40s + 8.0 t", subject.of("key").asCostLinearFunction(null).toString()); assertNull(subject.of("no-key").asCostLinearFunction(null)); } @Test - public void asTimePenalty() { + void asTimePenalty() { NodeAdapter subject = newNodeAdapterForTest("{ key : '400+8x' }"); assertEquals("6m40s + 8.0 t", subject.of("key").asTimePenalty(null).toString()); assertNull(subject.of("no-key").asTimePenalty(null)); } @Test - public void asZoneId() { + void asZoneId() { NodeAdapter subject = newNodeAdapterForTest( "{ key1 : 'UTC', key2 : 'Europe/Oslo', key3 : '+02:00', key4: 'invalid' }" ); @@ -515,7 +515,7 @@ public void asZoneId() { } @Test - public void asTextSet() { + void asTextSet() { NodeAdapter subject = newNodeAdapterForTest("{ ids : ['A', 'C', 'F'] }"); assertEquals( Set.of("A", "C", "F"), @@ -528,7 +528,7 @@ public void asTextSet() { } @Test - public void isNonEmptyArray() { + void isNonEmptyArray() { NodeAdapter subject = newNodeAdapterForTest("{ foo : ['A'], bar: [], foobar: true }"); assertTrue(subject.of("foo").asObject().isNonEmptyArray()); assertFalse(subject.of("bar").asObject().isNonEmptyArray()); @@ -538,13 +538,13 @@ public void isNonEmptyArray() { } @Test - public void deduplicateChildren() { + void deduplicateChildren() { NodeAdapter subject = newNodeAdapterForTest("{ foo : { enabled: true } }"); assertSame(subject.of("foo").asObject(), subject.of("foo").asObject()); } @Test - public void unusedParams() { + void unusedParams() { // Given: two parameters a and b NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); var buf = new StringBuilder(); From a7733a2eefb4af6dd7461a04f53c1258c38d818d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 8 Feb 2024 15:21:40 +0200 Subject: [PATCH 0531/1688] Create own package for services --- .../standalone/api/OtpServerRequestContext.java | 2 +- .../standalone/configure/ConstructApplicationFactory.java | 2 +- .../standalone/configure/ConstructApplicationModule.java | 2 +- .../standalone/server/DefaultServerRequestContext.java | 2 +- .../DefaultStreetLimitationParametersService.java | 3 ++- .../{model => service}/StreetLimitationParametersService.java | 2 +- .../StreetLimitationParametersServiceModule.java | 3 ++- src/test/java/org/opentripplanner/TestServerContext.java | 4 ++-- .../apis/transmodel/mapping/TripRequestMapperTest.java | 2 +- 9 files changed, 12 insertions(+), 10 deletions(-) rename src/main/java/org/opentripplanner/street/{model => service}/DefaultStreetLimitationParametersService.java (81%) rename src/main/java/org/opentripplanner/street/{model => service}/StreetLimitationParametersService.java (86%) rename src/main/java/org/opentripplanner/street/{model => service}/StreetLimitationParametersServiceModule.java (84%) diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index 99f6c5af3f1..082ae4515c8 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -24,9 +24,9 @@ import org.opentripplanner.service.worldenvelope.WorldEnvelopeService; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; -import org.opentripplanner.street.model.StreetLimitationParametersService; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.search.state.State; +import org.opentripplanner.street.service.StreetLimitationParametersService; import org.opentripplanner.transit.service.TransitService; /** diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index 10ad5ad8baa..4e9f50607ac 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -30,7 +30,7 @@ import org.opentripplanner.standalone.config.configure.ConfigModule; import org.opentripplanner.standalone.server.MetricsLogging; import org.opentripplanner.street.model.StreetLimitationParameters; -import org.opentripplanner.street.model.StreetLimitationParametersServiceModule; +import org.opentripplanner.street.service.StreetLimitationParametersServiceModule; import org.opentripplanner.transit.configure.TransitModule; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java index aa55ef3e2ad..93158f87cff 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java @@ -19,7 +19,7 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; -import org.opentripplanner.street.model.StreetLimitationParametersService; +import org.opentripplanner.street.service.StreetLimitationParametersService; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.visualizer.GraphVisualizer; diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index 42c9538fe08..019b7267015 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -25,7 +25,7 @@ import org.opentripplanner.standalone.config.routerconfig.TransitRoutingConfig; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.standalone.config.sandbox.FlexConfig; -import org.opentripplanner.street.model.StreetLimitationParametersService; +import org.opentripplanner.street.service.StreetLimitationParametersService; import org.opentripplanner.transit.service.TransitService; @HttpRequestScoped diff --git a/src/main/java/org/opentripplanner/street/model/DefaultStreetLimitationParametersService.java b/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java similarity index 81% rename from src/main/java/org/opentripplanner/street/model/DefaultStreetLimitationParametersService.java rename to src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java index d6cafa320e2..6b42cef4b58 100644 --- a/src/main/java/org/opentripplanner/street/model/DefaultStreetLimitationParametersService.java +++ b/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java @@ -1,6 +1,7 @@ -package org.opentripplanner.street.model; +package org.opentripplanner.street.service; import jakarta.inject.Inject; +import org.opentripplanner.street.model.StreetLimitationParameters; public class DefaultStreetLimitationParametersService implements StreetLimitationParametersService { diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersService.java b/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersService.java similarity index 86% rename from src/main/java/org/opentripplanner/street/model/StreetLimitationParametersService.java rename to src/main/java/org/opentripplanner/street/service/StreetLimitationParametersService.java index 9065924b49b..dcbc53cf406 100644 --- a/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersService.java +++ b/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersService.java @@ -1,4 +1,4 @@ -package org.opentripplanner.street.model; +package org.opentripplanner.street.service; /** * A service for fetching limitation parameters of the street graph. diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersServiceModule.java b/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java similarity index 84% rename from src/main/java/org/opentripplanner/street/model/StreetLimitationParametersServiceModule.java rename to src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java index f034b48f313..48552ed3ea3 100644 --- a/src/main/java/org/opentripplanner/street/model/StreetLimitationParametersServiceModule.java +++ b/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java @@ -1,8 +1,9 @@ -package org.opentripplanner.street.model; +package org.opentripplanner.street.service; import dagger.Module; import dagger.Provides; import jakarta.inject.Singleton; +import org.opentripplanner.street.model.StreetLimitationParameters; /** * The service is used during application serve phase, not loading, so we need to provide diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index 4ed451b3db3..bf6a8d2bbd3 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -20,9 +20,9 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; -import org.opentripplanner.street.model.DefaultStreetLimitationParametersService; import org.opentripplanner.street.model.StreetLimitationParameters; -import org.opentripplanner.street.model.StreetLimitationParametersService; +import org.opentripplanner.street.service.DefaultStreetLimitationParametersService; +import org.opentripplanner.street.service.StreetLimitationParametersService; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 4ccb1627e7f..0fe594543c0 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -48,8 +48,8 @@ import org.opentripplanner.service.worldenvelope.internal.DefaultWorldEnvelopeService; import org.opentripplanner.standalone.config.RouterConfig; import org.opentripplanner.standalone.server.DefaultServerRequestContext; -import org.opentripplanner.street.model.DefaultStreetLimitationParametersService; import org.opentripplanner.street.model.StreetLimitationParameters; +import org.opentripplanner.street.service.DefaultStreetLimitationParametersService; import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; From 4e92d8343459e5c67d32c0c7c6c7d684058c3d2d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 8 Feb 2024 15:21:57 +0200 Subject: [PATCH 0532/1688] Add tests for service --- ...StreetLimitationParametersServiceTest.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java diff --git a/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java b/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java new file mode 100644 index 00000000000..27cf531a4fc --- /dev/null +++ b/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java @@ -0,0 +1,25 @@ +package org.opentripplanner.street.service; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.street.model.StreetLimitationParameters; + +public class DefaultStreetLimitationParametersServiceTest { + + @Test + public void getMaxCarSpeed() { + var maxSpeed = 25f; + var model = new StreetLimitationParameters(); + model.initMaxCarSpeed(maxSpeed); + var service = new DefaultStreetLimitationParametersService(model); + assertEquals(maxSpeed, service.getMaxCarSpeed()); + } + + @Test + public void getDefaultMaxCarSpeed() { + var model = new StreetLimitationParameters(); + var service = new DefaultStreetLimitationParametersService(model); + assertEquals(40f, service.getMaxCarSpeed()); + } +} From 43a682662b4caf6379d8f320efc29054dc13d0ef Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 8 Feb 2024 14:24:44 +0100 Subject: [PATCH 0533/1688] Add test --- .../standalone/config/RouterConfig.java | 1 + .../framework/json/ParameterBuilder.java | 4 --- .../framework/json/NodeAdapterTest.java | 28 +++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java index bea05936de7..d4df555c600 100644 --- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java @@ -150,6 +150,7 @@ public String toString() { // Print ONLY the values set, not default values return root.toPrettyString(); } + /** * Checks if any unknown or invalid properties were encountered while loading the configuration. */ diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index 088a7794585..3ecc4d484cb 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -120,10 +120,6 @@ public Boolean asBoolean(boolean defaultValue) { return ofOptional(BOOLEAN, defaultValue, JsonNode::asBoolean); } - public Map asBooleanMap() { - return ofOptionalMap(BOOLEAN, JsonNode::asBoolean); - } - /** @throws OtpAppException if parameter is missing. */ public double asDouble() { return ofRequired(DOUBLE).asDouble(); diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index f414f6e7b34..71bb9d380a2 100644 --- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -23,6 +23,7 @@ import java.util.Locale; import java.util.Map; import java.util.Set; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.framework.application.OtpAppException; @@ -557,6 +558,33 @@ void unusedParams() { assertEquals("Unexpected config parameter: 'foo.b:false' in 'Test'", buf.toString()); } + @Nested + class Validation { + + @Test + void invalidProperties() { + // Given: two parameters a and b + NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); + + // When: Access ONLY parameter 'a', but not 'b' + subject.of("foo").asObject().of("a").asBoolean(); + + assertTrue(subject.hasInvalidProperties()); + } + + @Test + void valid() { + // Given: two parameters a and b + NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); + + var object = subject.of("foo").asObject(); + object.of("a").asBoolean(); + object.of("b").asBoolean(); + + assertFalse(subject.hasInvalidProperties()); + } + } + private static String unusedParams(NodeAdapter subject) { var buf = new StringBuilder(); subject.logAllWarnings(m -> buf.append('\n').append(m)); From 567ddaaf3c3769612ed1c9aa48bc3f18713be026 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 8 Feb 2024 15:25:47 +0200 Subject: [PATCH 0534/1688] Clarify comment --- .../openstreetmap/wayproperty/WayPropertySet.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java index e867654a104..f3be186f917 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java +++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java @@ -53,7 +53,10 @@ public class WayPropertySet { private final Pattern maxSpeedPattern; /** The automobile speed for street segments that do not match any SpeedPicker. */ public Float defaultCarSpeed; - /** The maximum automobile speed that is possible. */ + /** + * The maximum automobile speed that can be defined through OSM speed limit tagging. Car speed + * defaults for different way types can be higher than this. + */ public Float maxPossibleCarSpeed; /** * The maximum automobile speed that has been used. This can be used in heuristics later on to From c3da460ce0f90b290ad5feedcea3b1b42e448116 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 8 Feb 2024 14:44:29 +0100 Subject: [PATCH 0535/1688] Add documentation --- docs/Migrating-Configuration.md | 27 +++++++++++++++++++++++++++ mkdocs.yml | 1 + 2 files changed, 28 insertions(+) create mode 100644 docs/Migrating-Configuration.md diff --git a/docs/Migrating-Configuration.md b/docs/Migrating-Configuration.md new file mode 100644 index 00000000000..5517d0c272e --- /dev/null +++ b/docs/Migrating-Configuration.md @@ -0,0 +1,27 @@ +While OTP's GraphQL APIs are very, very stable even across versions, the JSON configuration schema +is not. Changes to it are relatively frequent and you can see all PRs that change it with +the [Github tag 'config change'](https://github.com/opentripplanner/OpenTripPlanner/pulls?q=label%3A%22config+change%22). + +### Migrating the JSON configuration + +OTP validates the configuration and prints warnings during startup. This means that when you +migrate to a newer version, you should carefully inspect the logs. If you see messages like + +``` +(NodeAdapter.java:170) Unexpected config parameter: 'routingDefaults.stairsReluctance:1.65' in 'router-config.json' +``` + +this means there are properties in your configuration that are unknown to OTP and therefore likely +to be a configuration error, perhaps because the schema was changed. In such a case you should +consult the [feature](Configuration.md#otp-features), [router](RouterConfiguration.md) or +[build configuration documentation](BuildConfiguration.md) to find out what he new schema looks like. + +### Aborting on invalid configuration + +If you want OTP to abort the startup when encountering invalid configuration, you can add the flag +`--configCheck` to your regular OTP CLI commands. + +This should of course be used wisely as it can also accidentally make your production instances refuse +to start up. +Therefore, we recommend that you use it only in a separate pre-production step, perhaps during graph +build. \ No newline at end of file diff --git a/mkdocs.yml b/mkdocs.yml index c4717d4d2e0..36ea39050ac 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -75,6 +75,7 @@ nav: - Router: 'RouterConfiguration.md' - "Route Request": 'RouteRequest.md' - "Realtime Updaters": 'UpdaterConfig.md' + - "Migrating Configuration": 'Migrating-Configuration.md' - Features explained: - "Routing modes": 'RoutingModes.md' - "In-station navigation": 'In-Station-Navigation.md' From f499a455b6c0597daac112a4855cf35374fc0d3c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 9 Feb 2024 10:19:30 +0100 Subject: [PATCH 0536/1688] Fix typo --- docs/Migrating-Configuration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Migrating-Configuration.md b/docs/Migrating-Configuration.md index 5517d0c272e..0d40faf74e8 100644 --- a/docs/Migrating-Configuration.md +++ b/docs/Migrating-Configuration.md @@ -14,7 +14,7 @@ migrate to a newer version, you should carefully inspect the logs. If you see me this means there are properties in your configuration that are unknown to OTP and therefore likely to be a configuration error, perhaps because the schema was changed. In such a case you should consult the [feature](Configuration.md#otp-features), [router](RouterConfiguration.md) or -[build configuration documentation](BuildConfiguration.md) to find out what he new schema looks like. +[build configuration documentation](BuildConfiguration.md) to find out what the new schema looks like. ### Aborting on invalid configuration From 65ee548c4f38bb490f027e95c7caef30f58c5302 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 1 Feb 2024 14:13:50 +0100 Subject: [PATCH 0537/1688] Use proper lookup for consolidation data source --- .../org/opentripplanner/datastore/OtpDataStore.java | 7 +++++++ .../datastore/api/OtpDataStoreConfig.java | 7 +++++++ .../graph_builder/GraphBuilderDataSources.java | 10 ++-------- .../module/configure/GraphBuilderModules.java | 2 +- .../standalone/config/BuildConfig.java | 13 ++++++++++--- 5 files changed, 27 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java index 0bfec084b2c..fd63eb7f8dd 100644 --- a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java +++ b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java @@ -18,6 +18,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Optional; import java.util.function.Function; import java.util.stream.Collectors; import javax.annotation.Nonnull; @@ -59,6 +60,7 @@ public class OtpDataStore { /* Named resources available for both reading and writing. */ private DataSource streetGraph; private DataSource graph; + private DataSource stopConsolidation; private CompositeDataSource buildReportDir; private boolean opened = false; @@ -102,6 +104,7 @@ public void open() { streetGraph = findSingleSource(config.streetGraph(), STREET_GRAPH_FILENAME, GRAPH); graph = findSingleSource(config.graph(), GRAPH_FILENAME, GRAPH); + stopConsolidation = findSingleSource(config.stopConsolidation(), "", CONFIG); buildReportDir = findCompositeSource(config.reportDirectory(), BUILD_REPORT_DIR, REPORT); addAll(Arrays.asList(streetGraph, graph, buildReportDir)); @@ -152,6 +155,10 @@ public CompositeDataSource getBuildReportDir() { return buildReportDir; } + public Optional stopConsolidation() { + return Optional.ofNullable(stopConsolidation); + } + /* private methods */ private void add(DataSource source) { if (source != null) { diff --git a/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java b/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java index 7441b754103..984d66de2e9 100644 --- a/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java +++ b/src/main/java/org/opentripplanner/datastore/api/OtpDataStoreConfig.java @@ -4,6 +4,7 @@ import java.util.List; import java.util.regex.Pattern; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.opentripplanner.datastore.OtpDataStore; /** @@ -68,6 +69,12 @@ public interface OtpDataStoreConfig { */ URI streetGraph(); + /** + * The URI to the stop consolidation data source. + */ + @Nullable + URI stopConsolidation(); + /** * * A pattern to lookup local GTFS files diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java b/src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java index eaa61fea139..3ed675c0da8 100644 --- a/src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java +++ b/src/main/java/org/opentripplanner/graph_builder/GraphBuilderDataSources.java @@ -19,7 +19,6 @@ import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.api.OtpBaseDirectory; -import org.opentripplanner.datastore.file.FileDataSource; import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.graph_builder.module.ned.parameter.DemExtractParameters; import org.opentripplanner.graph_builder.module.ned.parameter.DemExtractParametersBuilder; @@ -186,13 +185,8 @@ public NetexFeedParameters getNetexConfig(DataSource dataSource) { /** * Returns the optional data source for the stop consolidation configuration. */ - public Optional stopConsolidationDataSource() { - return Optional - .ofNullable(buildConfig.stopConsolidationFile) - .map(fileName -> { - var f = baseDirectory.toPath().resolve(fileName).toFile(); - return new FileDataSource(f, FileType.CONFIG); - }); + public Optional stopConsolidation() { + return store.stopConsolidation(); } /** diff --git a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java b/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java index 444adb5b727..857edca2b8e 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/configure/GraphBuilderModules.java @@ -293,7 +293,7 @@ static StopConsolidationModule providesStopConsolidationModule( GraphBuilderDataSources dataSources ) { return dataSources - .stopConsolidationDataSource() + .stopConsolidation() .map(ds -> StopConsolidationModule.of(transitModel, repo, ds)) .orElse(null); } diff --git a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java index d62aa1bf41f..a542c330afe 100644 --- a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java @@ -17,6 +17,7 @@ import java.util.Set; import java.util.regex.Pattern; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.opentripplanner.datastore.api.OtpDataStoreConfig; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayConfig; import org.opentripplanner.ext.emissions.EmissionsConfig; @@ -182,7 +183,7 @@ public class BuildConfig implements OtpDataStoreConfig { public final LocalDate transitServiceEnd; public final ZoneId transitModelTimeZone; - public final String stopConsolidationFile; + public final URI stopConsolidation; /** * Set all parameters from the given Jackson JSON tree, applying defaults. Supplying @@ -602,14 +603,14 @@ that we support remote input files (cloud storage or arbitrary URLs) not all dat ) .asUri(null); - stopConsolidationFile = + stopConsolidation = root .of("stopConsolidationFile") .since(V2_5) .summary( "Name of the CSV-formatted file in the build directory which contains the configuration for stop consolidation." ) - .asString(null); + .asUri(null); osmDefaults = OsmConfig.mapOsmDefaults(root, "osmDefaults"); osm = OsmConfig.mapOsmConfig(root, "osm", osmDefaults); @@ -676,6 +677,12 @@ public URI streetGraph() { return streetGraph; } + @Override + @Nullable + public URI stopConsolidation() { + return stopConsolidation; + } + @Override public Pattern gtfsLocalFilePattern() { return gtfsLocalFilePattern; From 4386def509693893edeff707a4c54bf008d95fb7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 9 Feb 2024 12:48:36 +0100 Subject: [PATCH 0538/1688] Update docs --- docs/BuildConfiguration.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index 05da4cf4d0a..4340195b28c 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -40,7 +40,7 @@ Sections follow that describe particular settings in more depth. | [readCachedElevations](#readCachedElevations) | `boolean` | Whether to read cached elevation data. | *Optional* | `true` | 2.0 | | staticBikeParkAndRide | `boolean` | Whether we should create bike P+R stations from OSM data. | *Optional* | `false` | 1.5 | | staticParkAndRide | `boolean` | Whether we should create car P+R stations from OSM data. | *Optional* | `true` | 1.5 | -| stopConsolidationFile | `string` | Name of the CSV-formatted file in the build directory which contains the configuration for stop consolidation. | *Optional* | | 2.5 | +| stopConsolidationFile | `uri` | Name of the CSV-formatted file in the build directory which contains the configuration for stop consolidation. | *Optional* | | 2.5 | | [streetGraph](#streetGraph) | `uri` | URI to the street graph object file for reading and writing. | *Optional* | | 2.0 | | [subwayAccessTime](#subwayAccessTime) | `double` | Minutes necessary to reach stops served by trips on routes of route_type=1 (subway) from the street. | *Optional* | `2.0` | 1.5 | | [transitModelTimeZone](#transitModelTimeZone) | `time-zone` | Time zone for the graph. | *Optional* | | 2.2 | From 691bdd4735e2bdba6fd5372edd5f68c606dc6cfa Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 9 Feb 2024 14:55:24 +0100 Subject: [PATCH 0539/1688] Put realtime information into separate object --- .../gtfs/generated/GraphQLDataFetchers.java | 19 +++++++++++---- .../opentripplanner/model/plan/LegTimes.java | 12 ++++------ .../model/plan/ScheduledTransitLeg.java | 12 ++++++++-- .../opentripplanner/apis/gtfs/schema.graphqls | 18 +++++++++----- .../apis/gtfs/expectations/plan-extended.json | 24 +++++++------------ .../apis/gtfs/expectations/plan.json | 24 +++++++------------ .../apis/gtfs/queries/plan-extended.graphql | 12 ++++++---- .../apis/gtfs/queries/plan.graphql | 12 ++++++---- 8 files changed, 74 insertions(+), 59 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 639ba7c8744..fbb246168e1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -503,9 +503,7 @@ public interface GraphQLLeg { } public interface GraphQLLegTimes { - public DataFetcher actual(); - - public DataFetcher delay(); + public DataFetcher realTime(); public DataFetcher scheduled(); } @@ -761,6 +759,12 @@ public interface GraphQLQueryType { public DataFetcher viewer(); } + public interface GraphQLRealtimeInformation { + public DataFetcher predicted(); + + public DataFetcher scheduleOffset(); + } + /** Rental vehicle represents a vehicle that belongs to a rental network. */ public interface GraphQLRentalVehicle { public DataFetcher allowPickupNow(); @@ -1256,6 +1260,10 @@ public interface GraphQLElevationProfileComponent { public DataFetcher elevation(); } + /** + * This type is only here for backwards-compatibility and this API will never return it anymore. + * Please use the leg's `fareProducts` instead. + */ public interface GraphQLFare { public DataFetcher cents(); @@ -1266,7 +1274,10 @@ public interface GraphQLFare { public DataFetcher type(); } - /** Component of the fare (i.e. ticket) for a part of the itinerary */ + /** + * This type is only here for backwards-compatibility and this API will never return it anymore. + * Please use the leg's `fareProducts` instead. + */ public interface GraphQLFareComponent { public DataFetcher cents(); diff --git a/src/main/java/org/opentripplanner/model/plan/LegTimes.java b/src/main/java/org/opentripplanner/model/plan/LegTimes.java index 06b2fb3662b..f3ffe66e0e2 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTimes.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTimes.java @@ -1,26 +1,24 @@ package org.opentripplanner.model.plan; import java.time.Duration; +import java.time.OffsetDateTime; import java.time.ZonedDateTime; import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public record LegTimes( - @Nonnull ZonedDateTime scheduled, - @Nullable ZonedDateTime actual, - @Nullable Duration delay -) { +public record LegTimes(@Nonnull ZonedDateTime scheduled, @Nullable Realtime realTime) { public LegTimes { Objects.requireNonNull(scheduled); } @Nonnull public static LegTimes of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); - return new LegTimes(realtime.minus(delay), realtime, delay); + return new LegTimes(realtime.minus(delay), new Realtime(realtime, delay)); } @Nonnull public static LegTimes ofStatic(ZonedDateTime staticTime) { - return new LegTimes(staticTime, staticTime, Duration.ZERO); + return new LegTimes(staticTime, null); } + record Realtime(ZonedDateTime predicted, Duration scheduleOffset) {} } diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 4f6bf98def3..7a1fcacbf31 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -164,12 +164,20 @@ public Accessibility getTripWheelchairAccessibility() { @Override public LegTimes start() { - return LegTimes.of(startTime, getDepartureDelay()); + if (getRealTime()) { + return LegTimes.of(startTime, getDepartureDelay()); + } else { + return LegTimes.ofStatic(startTime); + } } @Override public LegTimes end() { - return LegTimes.of(endTime, getArrivalDelay()); + if (getRealTime()) { + return LegTimes.of(endTime, getArrivalDelay()); + } else { + return LegTimes.ofStatic(endTime); + } } @Override diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 3b6bdad5fa4..3ee9cebe030 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1647,18 +1647,24 @@ type RideHailingEstimate { """ An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. + +ISO-8601 allows many different formats but OTP will only return the profile specified in RFC3339. """ -scalar OffsetDateTime +scalar OffsetDateTime @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") -type LegTimes { - scheduled: OffsetDateTime - actual: OffsetDateTime +type RealtimeInformation { + predicted: OffsetDateTime """ - The delay of the vehicle at a certain place. + The delay or "earliness" of the vehicle at a certain place. If the vehicle is early then this is a negative duration. """ - delay: Duration + scheduleOffset: Duration +} + +type LegTimes { + scheduled: OffsetDateTime + realTime: RealtimeInformation } type Leg { diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index fde24b8697a..ade6fa4465d 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -20,13 +20,11 @@ "mode" : "WALK", "start" : { "scheduled" : "2020-02-02T11:00:00Z", - "actual" : "2020-02-02T11:00:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T11:00:20Z", - "actual" : "2020-02-02T11:00:20Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "A", @@ -56,13 +54,11 @@ "mode" : "BUS", "start" : { "scheduled" : "2020-02-02T11:01:00Z", - "actual" : "2020-02-02T11:01:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T11:15:00Z", - "actual" : "2020-02-02T11:15:00Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "B", @@ -102,13 +98,11 @@ "mode" : "RAIL", "start" : { "scheduled" : "2020-02-02T11:30:00Z", - "actual" : "2020-02-02T11:30:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T11:50:00Z", - "actual" : "2020-02-02T11:50:00Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "C", @@ -168,13 +162,11 @@ "mode" : "CAR", "start" : { "scheduled" : "2020-02-02T11:50:00Z", - "actual" : "2020-02-02T11:50:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T12:00:00Z", - "actual" : "2020-02-02T12:00:00Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "D", diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index 6865eb282d4..522f43723df 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -10,13 +10,11 @@ "mode" : "WALK", "start" : { "scheduled" : "2020-02-02T11:00:00Z", - "actual" : "2020-02-02T11:00:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T11:00:20Z", - "actual" : "2020-02-02T11:00:20Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "A", @@ -39,13 +37,11 @@ "mode" : "BUS", "start" : { "scheduled" : "2020-02-02T11:01:00Z", - "actual" : "2020-02-02T11:01:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T11:15:00Z", - "actual" : "2020-02-02T11:15:00Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "B", @@ -74,13 +70,11 @@ "mode" : "RAIL", "start" : { "scheduled" : "2020-02-02T11:30:00Z", - "actual" : "2020-02-02T11:30:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T11:50:00Z", - "actual" : "2020-02-02T11:50:00Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "C", @@ -109,13 +103,11 @@ "mode" : "CAR", "start" : { "scheduled" : "2020-02-02T11:50:00Z", - "actual" : "2020-02-02T11:50:00Z", - "delay" : "PT0S" + "realTime" : null }, "end" : { "scheduled" : "2020-02-02T12:00:00Z", - "actual" : "2020-02-02T12:00:00Z", - "delay" : "PT0S" + "realTime" : null }, "from" : { "name" : "D", diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index 1c90f773677..8b3e0c6db16 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -33,13 +33,17 @@ mode start { scheduled - actual - delay + realTime { + predicted + scheduleOffset + } } end { scheduled - actual - delay + realTime { + predicted + scheduleOffset + } } from { name diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index 5af473c7323..e21a24737ea 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -23,13 +23,17 @@ mode start { scheduled - actual - delay + realTime { + predicted + scheduleOffset + } } end { scheduled - actual - delay + realTime { + predicted + scheduleOffset + } } from { name From ce002b8da60044966f42ff675507399cf6164578 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 9 Feb 2024 14:58:33 +0100 Subject: [PATCH 0540/1688] Fix combined leg --- .../ext/fares/impl/CombinedInterlinedTransitLeg.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java index c1497373851..0b192a9ec77 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java @@ -59,12 +59,12 @@ public Trip getTrip() { @Override public LegTimes start() { - return LegTimes.of(getEndTime(), getDepartureDelay()); + return first.start(); } @Override public LegTimes end() { - return LegTimes.of(getStartTime(), getArrivalDelay()); + return second.end(); } @Override From afb53e193e9f528b8f58430806e329d1ce2845bb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 9 Feb 2024 15:09:45 +0100 Subject: [PATCH 0541/1688] Fix tutorial docs --- docs/apis/GraphQL-Tutorial.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index c98411fd20d..0eff55fff7b 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -94,13 +94,17 @@ Most people want to get routing results out of OTP, so lets see the query for th mode start { scheduled - actual - delay + realTime { + predicted + scheduleOffset + } } end { scheduled - actual - delay + realTime { + predicted + scheduleOffset + } } from { name From b7d037ee5c6caf33ab61b2c9cd6d4d928b0382ff Mon Sep 17 00:00:00 2001 From: Eivind Morris Bakke Date: Fri, 9 Feb 2024 15:28:38 +0100 Subject: [PATCH 0542/1688] Set defaults of the modes WALK, even if one and not the others are set (#5675) * Sets modes only if they are set in the request. Setting them to null overrides the default of WALK, which leads to no results. * Adds comment to the RequestModesMapper explaining defaults. * Adds unittest for RequestModesMapper and removes an unneeded unchecked warning suppression. * Makes keys constants in RequestModesMapper and changes map initialization in RequestModesMapperTest. * Makes use of Map.of everywhere in RequestModesMapperTest. --- .../mapping/RequestModesMapper.java | 33 ++++++----- .../mapping/RequestModesMapperTest.java | 57 +++++++++++++++++++ 2 files changed, 77 insertions(+), 13 deletions(-) create mode 100644 src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java index d02e251f4e2..59259905944 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java @@ -7,23 +7,30 @@ class RequestModesMapper { + private static final String accessModeKey = "accessMode"; + private static final String egressModeKey = "egressMode"; + private static final String directModeKey = "directMode"; + /** - * Maps a GraphQL Modes input type to a RequestModes. - * - * This only maps access, egress, direct & transfer. - * Transport modes are now part of filters. - * Only in case filters are not present we will use this mapping + * Maps GraphQL Modes input type to RequestModes. + *

      + * This only maps access, egress, direct & transfer modes. Transport modes are set using filters. + * Default modes are WALK for access, egress, direct & transfer. */ - @SuppressWarnings("unchecked") static RequestModes mapRequestModes(Map modesInput) { - StreetMode accessMode = (StreetMode) modesInput.get("accessMode"); - RequestModesBuilder mBuilder = RequestModes - .of() - .withAccessMode(accessMode) - .withEgressMode((StreetMode) modesInput.get("egressMode")) - .withDirectMode((StreetMode) modesInput.get("directMode")); + RequestModesBuilder mBuilder = RequestModes.of(); - mBuilder.withTransferMode(accessMode == StreetMode.BIKE ? StreetMode.BIKE : StreetMode.WALK); + if (modesInput.containsKey(accessModeKey)) { + StreetMode accessMode = (StreetMode) modesInput.get(accessModeKey); + mBuilder.withAccessMode(accessMode); + mBuilder.withTransferMode(accessMode == StreetMode.BIKE ? StreetMode.BIKE : StreetMode.WALK); + } + if (modesInput.containsKey(egressModeKey)) { + mBuilder.withEgressMode((StreetMode) modesInput.get(egressModeKey)); + } + if (modesInput.containsKey(directModeKey)) { + mBuilder.withDirectMode((StreetMode) modesInput.get(directModeKey)); + } return mBuilder.build(); } diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java new file mode 100644 index 00000000000..160014213d3 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java @@ -0,0 +1,57 @@ +package org.opentripplanner.apis.transmodel.mapping; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.opentripplanner.routing.api.request.RequestModes; +import org.opentripplanner.routing.api.request.StreetMode; + +class RequestModesMapperTest { + + @Test + void testMapRequestModesEmptyMapReturnsDefaults() { + Map inputModes = Map.of(); + + RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); + + assertEquals(RequestModes.of().build(), mappedModes); + } + + @Test + void testMapRequestModesAccessSetReturnsDefaultsForOthers() { + Map inputModes = Map.of("accessMode", StreetMode.BIKE); + + RequestModes wantModes = RequestModes + .of() + .withAccessMode(StreetMode.BIKE) + .withTransferMode(StreetMode.BIKE) + .build(); + + RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); + + assertEquals(wantModes, mappedModes); + } + + @Test + void testMapRequestModesEgressSetReturnsDefaultsForOthers() { + Map inputModes = Map.of("egressMode", StreetMode.CAR); + + RequestModes wantModes = RequestModes.of().withEgressMode(StreetMode.CAR).build(); + + RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); + + assertEquals(wantModes, mappedModes); + } + + @Test + void testMapRequestModesDirectSetReturnsDefaultsForOthers() { + Map inputModes = Map.of("directMode", StreetMode.CAR); + + RequestModes wantModes = RequestModes.of().withDirectMode(StreetMode.CAR).build(); + + RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); + + assertEquals(wantModes, mappedModes); + } +} From 16108a9867159bb2fb6b70370f3ea791d34ad697 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 9 Feb 2024 14:28:53 +0000 Subject: [PATCH 0543/1688] Add changelog entry for #5675 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index df2ecd4b8fc..5fa9a3ee0b3 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -89,6 +89,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Remove "fare" [#5645](https://github.com/opentripplanner/OpenTripPlanner/pull/5645) - Refactor GroupStopBuilder addLocation method [#5651](https://github.com/opentripplanner/OpenTripPlanner/pull/5651) - Remove `VehicleToStopHeuristics` [#5381](https://github.com/opentripplanner/OpenTripPlanner/pull/5381) +- Set defaults of the modes WALK, even if one and not the others are set [#5675](https://github.com/opentripplanner/OpenTripPlanner/pull/5675) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From e2e6446942a686e24eba6bcf6e8ee5479ccc3e67 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 9 Feb 2024 16:36:38 +0200 Subject: [PATCH 0544/1688] Add basic wiring --- .../apis/gtfs/GraphQLScalars.java | 80 + .../apis/gtfs/GtfsGraphQLIndex.java | 24 + .../apis/gtfs/datafetchers/QueryTypeImpl.java | 9 + .../gtfs/generated/GraphQLDataFetchers.java | 78 +- .../apis/gtfs/generated/GraphQLTypes.java | 2707 ++++++++++++++--- .../apis/gtfs/generated/graphql-codegen.yml | 11 + .../apis/gtfs/model/PlanLocation.java | 12 + 7 files changed, 2415 insertions(+), 506 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 6280ac28ac2..2361ef4141b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -10,6 +10,10 @@ import graphql.schema.CoercingParseValueException; import graphql.schema.CoercingSerializeException; import graphql.schema.GraphQLScalarType; +import java.time.OffsetDateTime; +import java.time.ZonedDateTime; +import java.time.format.DateTimeFormatter; +import javax.annotation.Nonnull; import org.locationtech.jts.geom.Geometry; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; @@ -50,6 +54,58 @@ public String parseLiteral(Object input) { ) .build(); + public static GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType + .newScalar() + .name("OffsetDateTime") + .coercing( + new Coercing() { + @Override + public String serialize(@Nonnull Object dataFetcherResult) + throws CoercingSerializeException { + if (dataFetcherResult instanceof ZonedDateTime zdt) { + return zdt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); + } else if (dataFetcherResult instanceof OffsetDateTime odt) { + return odt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); + } else return null; + } + + @Override + public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { + return null; + } + + @Override + public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { + return null; + } + } + ) + .build(); + + public static GraphQLScalarType coordinateValueScalar = GraphQLScalarType + .newScalar() + .name("CoordinateValue") + .coercing( + new Coercing() { + @Override + public String serialize(@Nonnull Object dataFetcherResult) + throws CoercingSerializeException { + return null; + } + + @Override + public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { + return null; + } + + @Override + public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { + return null; + } + } + ) + .build(); + public static GraphQLScalarType geoJsonScalar = GraphQLScalarType .newScalar() .name("GeoJson") @@ -152,4 +208,28 @@ public Grams parseLiteral(Object input) throws CoercingParseLiteralException { } ) .build(); + + public static GraphQLScalarType ratioScalar = GraphQLScalarType + .newScalar() + .name("Ratio") + .coercing( + new Coercing() { + @Override + public String serialize(@Nonnull Object dataFetcherResult) + throws CoercingSerializeException { + return null; + } + + @Override + public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { + return null; + } + + @Override + public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { + return null; + } + } + ) + .build(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index ff3e8681ce8..5e065b8227b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -81,6 +81,7 @@ import org.opentripplanner.apis.gtfs.datafetchers.serviceTimeRangeImpl; import org.opentripplanner.apis.gtfs.datafetchers.stepImpl; import org.opentripplanner.apis.gtfs.datafetchers.stopAtDistanceImpl; +import org.opentripplanner.apis.gtfs.model.PlanLocation; import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation; import org.opentripplanner.framework.application.OTPFeature; @@ -111,12 +112,35 @@ protected static GraphQLSchema buildSchema() { .scalar(GraphQLScalars.geoJsonScalar) .scalar(GraphQLScalars.graphQLIDScalar) .scalar(GraphQLScalars.gramsScalar) + .scalar(GraphQLScalars.offsetDateTimeScalar) + .scalar(GraphQLScalars.ratioScalar) + .scalar(GraphQLScalars.coordinateValueScalar) .scalar(ExtendedScalars.GraphQLLong) + .scalar(ExtendedScalars.Locale) + .scalar( + ExtendedScalars + .newAliasedScalar("Cost") + .aliasedScalar(ExtendedScalars.NonNegativeInt) + .build() + ) + .scalar( + ExtendedScalars + .newAliasedScalar("Speed") + .aliasedScalar(ExtendedScalars.NonNegativeFloat) + .build() + ) + .scalar( + ExtendedScalars + .newAliasedScalar("Reluctance") + .aliasedScalar(ExtendedScalars.NonNegativeFloat) + .build() + ) .type("Node", type -> type.typeResolver(new NodeTypeResolver())) .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver())) .type("StopPosition", type -> type.typeResolver(new StopPosition() {})) .type("FareProduct", type -> type.typeResolver(new FareProductTypeResolver())) .type("AlertEntity", type -> type.typeResolver(new AlertEntityTypeResolver())) + .type("PlanLocation", type -> type.typeResolver(new PlanLocation() {})) .type(typeWiring.build(AgencyImpl.class)) .type(typeWiring.build(AlertImpl.class)) .type(typeWiring.build(BikeParkImpl.class)) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index a4f5cb00e2f..b7a85b96c73 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -39,6 +39,7 @@ import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.model.TripTimeOnDate; +import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.api.request.RouteRequest; @@ -490,6 +491,14 @@ public DataFetcher> plan() { }; } + @Override + public DataFetcher> planConnection() { + return environment -> { + List itineraries = List.of(); + return new SimpleListConnection<>(itineraries).get(environment); + }; + } + @Override public DataFetcher rentalVehicle() { return environment -> { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 2f39f7f4030..7ded260c70f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -20,6 +20,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode; +import org.opentripplanner.apis.gtfs.model.PlanLocation; import org.opentripplanner.apis.gtfs.model.RideHailingProvider; import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.apis.gtfs.model.TripOccupancy; @@ -284,6 +285,16 @@ public interface GraphQLContactInfo { public DataFetcher phoneNumber(); } + /** + * Coordinate (often referred as coordinates), which is used to specify a location using in the + * WGS84 coordinate system. + */ + public interface GraphQLCoordinate { + public DataFetcher latitude(); + + public DataFetcher longitude(); + } + public interface GraphQLCoordinates { public DataFetcher lat(); @@ -648,6 +659,60 @@ public interface GraphQLPlan { public DataFetcher to(); } + /** + * Plan (result of an itinerary search) that follows + * [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + */ + public interface GraphQLPlanConnection { + public DataFetcher destination(); + + public DataFetcher>> edges(); + + public DataFetcher origin(); + + public DataFetcher pageInfo(); + + public DataFetcher> routingErrors(); + + public DataFetcher searchDateTime(); + } + + /** + * Edge outputted by a plan search. Part of the + * [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + */ + public interface GraphQLPlanEdge { + public DataFetcher cursor(); + + public DataFetcher node(); + } + + /** Location that was used in the itinerary search as a origin or destination. */ + public interface GraphQLPlanLabeledLocation { + public DataFetcher label(); + + public DataFetcher location(); + } + + /** Union of locations types that could be used in a plan query. */ + public interface GraphQLPlanLocation extends TypeResolver {} + + /** + * Information about pagination in a connection. Part of the + * [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + */ + public interface GraphQLPlanPageInfo { + public DataFetcher endCursor(); + + public DataFetcher hasNextPage(); + + public DataFetcher hasPreviousPage(); + + public DataFetcher searchWindowUsed(); + + public DataFetcher startCursor(); + } + /** Stop position at a specific stop. */ public interface GraphQLPositionAtStop { public DataFetcher position(); @@ -701,6 +766,8 @@ public interface GraphQLQueryType { public DataFetcher> plan(); + public DataFetcher> planConnection(); + public DataFetcher rentalVehicle(); public DataFetcher> rentalVehicles(); @@ -1147,7 +1214,7 @@ public interface GraphQLVehicleParkingSpaces { public DataFetcher wheelchairAccessibleCarSpaces(); } - /** Realtime vehicle position */ + /** Real-time vehicle position */ public interface GraphQLVehiclePosition { public DataFetcher heading(); @@ -1235,6 +1302,10 @@ public interface GraphQLElevationProfileComponent { public DataFetcher elevation(); } + /** + * This type is only here for backwards-compatibility and this API will never return it anymore. + * Please use the leg's `fareProducts` instead. + */ public interface GraphQLFare { public DataFetcher cents(); @@ -1245,7 +1316,10 @@ public interface GraphQLFare { public DataFetcher type(); } - /** Component of the fare (i.e. ticket) for a part of the itinerary */ + /** + * This type is only here for backwards-compatibility and this API will never return it anymore. + * Please use the leg's `fareProducts` instead. + */ public interface GraphQLFareComponent { public DataFetcher cents(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index ecc038fec18..c528f023cdf 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -19,6 +19,26 @@ public enum GraphQLAbsoluteDirection { WEST, } + public static class GraphQLAccessibilityPreferencesInput { + + private GraphQLWheelchairPreferencesInput wheelchair; + + public GraphQLAccessibilityPreferencesInput(Map args) { + if (args != null) { + this.wheelchair = + new GraphQLWheelchairPreferencesInput((Map) args.get("wheelchair")); + } + } + + public GraphQLWheelchairPreferencesInput getGraphQLWheelchair() { + return this.wheelchair; + } + + public void setGraphQLWheelchair(GraphQLWheelchairPreferencesInput wheelchair) { + this.wheelchair = wheelchair; + } + } + public static class GraphQLAgencyAlertsArgs { private List types; @@ -94,826 +114,1904 @@ public enum GraphQLAlertSeverityLevelType { WARNING, } - public static class GraphQLBikeParkNameArgs { + public static class GraphQLAlightPreferencesInput { - private String language; + private java.time.Duration slack; - public GraphQLBikeParkNameArgs(Map args) { + public GraphQLAlightPreferencesInput(Map args) { if (args != null) { - this.language = (String) args.get("language"); + this.slack = (java.time.Duration) args.get("slack"); } } - public String getGraphQLLanguage() { - return this.language; + public java.time.Duration getGraphQLSlack() { + return this.slack; } - public void setGraphQLLanguage(String language) { - this.language = language; + public void setGraphQLSlack(java.time.Duration slack) { + this.slack = slack; } } - public enum GraphQLBikesAllowed { - ALLOWED, - NOT_ALLOWED, - NO_INFORMATION, - } - - public static class GraphQLCarParkNameArgs { + public static class GraphQLBicycleParkingPreferencesInput { - private String language; + private List filters; + private List preferred; + private Integer unpreferredCost; - public GraphQLCarParkNameArgs(Map args) { + public GraphQLBicycleParkingPreferencesInput(Map args) { if (args != null) { - this.language = (String) args.get("language"); + if (args.get("filters") != null) { + this.filters = (List) args.get("filters"); + } + if (args.get("preferred") != null) { + this.preferred = (List) args.get("preferred"); + } + this.unpreferredCost = (Integer) args.get("unpreferredCost"); } } - public String getGraphQLLanguage() { - return this.language; + public List getGraphQLFilters() { + return this.filters; } - public void setGraphQLLanguage(String language) { - this.language = language; + public List getGraphQLPreferred() { + return this.preferred; + } + + public Integer getGraphQLUnpreferredCost() { + return this.unpreferredCost; + } + + public void setGraphQLFilters(List filters) { + this.filters = filters; + } + + public void setGraphQLPreferred(List preferred) { + this.preferred = preferred; + } + + public void setGraphQLUnpreferredCost(Integer unpreferredCost) { + this.unpreferredCost = unpreferredCost; } } - public static class GraphQLDepartureRowStoptimesArgs { + public static class GraphQLBicyclePreferencesInput { - private Integer numberOfDepartures; - private Boolean omitCanceled; - private Boolean omitNonPickups; - private Long startTime; - private Integer timeRange; + private org.opentripplanner.framework.model.Cost boardCost; + private GraphQLCyclingOptimizationInput optimization; + private GraphQLBicycleParkingPreferencesInput parking; + private Double reluctance; + private GraphQLBicycleRentalPreferencesInput rental; + private Double speed; + private GraphQLBicycleWalkPreferencesInput walk; - public GraphQLDepartureRowStoptimesArgs(Map args) { + public GraphQLBicyclePreferencesInput(Map args) { if (args != null) { - this.numberOfDepartures = (Integer) args.get("numberOfDepartures"); - this.omitCanceled = (Boolean) args.get("omitCanceled"); - this.omitNonPickups = (Boolean) args.get("omitNonPickups"); - this.startTime = (Long) args.get("startTime"); - this.timeRange = (Integer) args.get("timeRange"); + this.boardCost = (org.opentripplanner.framework.model.Cost) args.get("boardCost"); + this.optimization = + new GraphQLCyclingOptimizationInput((Map) args.get("optimization")); + this.parking = + new GraphQLBicycleParkingPreferencesInput((Map) args.get("parking")); + this.reluctance = (Double) args.get("reluctance"); + this.rental = + new GraphQLBicycleRentalPreferencesInput((Map) args.get("rental")); + this.speed = (Double) args.get("speed"); + this.walk = new GraphQLBicycleWalkPreferencesInput((Map) args.get("walk")); } } - public Integer getGraphQLNumberOfDepartures() { - return this.numberOfDepartures; + public org.opentripplanner.framework.model.Cost getGraphQLBoardCost() { + return this.boardCost; } - public Boolean getGraphQLOmitCanceled() { - return this.omitCanceled; + public GraphQLCyclingOptimizationInput getGraphQLOptimization() { + return this.optimization; } - public Boolean getGraphQLOmitNonPickups() { - return this.omitNonPickups; + public GraphQLBicycleParkingPreferencesInput getGraphQLParking() { + return this.parking; } - public Long getGraphQLStartTime() { - return this.startTime; + public Double getGraphQLReluctance() { + return this.reluctance; } - public Integer getGraphQLTimeRange() { - return this.timeRange; + public GraphQLBicycleRentalPreferencesInput getGraphQLRental() { + return this.rental; } - public void setGraphQLNumberOfDepartures(Integer numberOfDepartures) { - this.numberOfDepartures = numberOfDepartures; + public Double getGraphQLSpeed() { + return this.speed; } - public void setGraphQLOmitCanceled(Boolean omitCanceled) { - this.omitCanceled = omitCanceled; + public GraphQLBicycleWalkPreferencesInput getGraphQLWalk() { + return this.walk; } - public void setGraphQLOmitNonPickups(Boolean omitNonPickups) { - this.omitNonPickups = omitNonPickups; + public void setGraphQLBoardCost(org.opentripplanner.framework.model.Cost boardCost) { + this.boardCost = boardCost; } - public void setGraphQLStartTime(Long startTime) { - this.startTime = startTime; + public void setGraphQLOptimization(GraphQLCyclingOptimizationInput optimization) { + this.optimization = optimization; } - public void setGraphQLTimeRange(Integer timeRange) { - this.timeRange = timeRange; + public void setGraphQLParking(GraphQLBicycleParkingPreferencesInput parking) { + this.parking = parking; } - } - - public static class GraphQLFeedAlertsArgs { - - private List types; - public GraphQLFeedAlertsArgs(Map args) { - if (args != null) { - if (args.get("types") != null) { - this.types = - ((List) args.get("types")).stream() - .map(item -> - item instanceof GraphQLFeedAlertType - ? item - : GraphQLFeedAlertType.valueOf((String) item) - ) - .map(GraphQLFeedAlertType.class::cast) - .collect(Collectors.toList()); - } - } + public void setGraphQLReluctance(Double reluctance) { + this.reluctance = reluctance; } - public List getGraphQLTypes() { - return this.types; + public void setGraphQLRental(GraphQLBicycleRentalPreferencesInput rental) { + this.rental = rental; } - public void setGraphQLTypes(List types) { - this.types = types; + public void setGraphQLSpeed(Double speed) { + this.speed = speed; } - } - - /** Entities, which are relevant for a feed and can contain alerts */ - public enum GraphQLFeedAlertType { - AGENCIES, - ROUTE_TYPES, - } - - public enum GraphQLFilterPlaceType { - BICYCLE_RENT, - BIKE_PARK, - CAR_PARK, - DEPARTURE_ROW, - STATION, - STOP, - VEHICLE_RENT, - } - public enum GraphQLFormFactor { - BICYCLE, - CAR, - CARGO_BICYCLE, - MOPED, - OTHER, - SCOOTER, - SCOOTER_SEATED, - SCOOTER_STANDING, + public void setGraphQLWalk(GraphQLBicycleWalkPreferencesInput walk) { + this.walk = walk; + } } - public static class GraphQLInputBannedInput { + public static class GraphQLBicycleRentalPreferencesInput { - private String agencies; - private String routes; - private String stops; - private String stopsHard; - private String trips; + private List allowedNetworks; + private List bannedNetworks; + private GraphQLDestinationBicyclePolicyInput destinationBicyclePolicy; - public GraphQLInputBannedInput(Map args) { + public GraphQLBicycleRentalPreferencesInput(Map args) { if (args != null) { - this.agencies = (String) args.get("agencies"); - this.routes = (String) args.get("routes"); - this.stops = (String) args.get("stops"); - this.stopsHard = (String) args.get("stopsHard"); - this.trips = (String) args.get("trips"); + this.allowedNetworks = (List) args.get("allowedNetworks"); + this.bannedNetworks = (List) args.get("bannedNetworks"); + this.destinationBicyclePolicy = + new GraphQLDestinationBicyclePolicyInput( + (Map) args.get("destinationBicyclePolicy") + ); } } - public String getGraphQLAgencies() { - return this.agencies; + public List getGraphQLAllowedNetworks() { + return this.allowedNetworks; } - public String getGraphQLRoutes() { - return this.routes; + public List getGraphQLBannedNetworks() { + return this.bannedNetworks; } - public String getGraphQLStops() { - return this.stops; + public GraphQLDestinationBicyclePolicyInput getGraphQLDestinationBicyclePolicy() { + return this.destinationBicyclePolicy; } - public String getGraphQLStopsHard() { - return this.stopsHard; + public void setGraphQLAllowedNetworks(List allowedNetworks) { + this.allowedNetworks = allowedNetworks; } - public String getGraphQLTrips() { - return this.trips; + public void setGraphQLBannedNetworks(List bannedNetworks) { + this.bannedNetworks = bannedNetworks; } - public void setGraphQLAgencies(String agencies) { - this.agencies = agencies; + public void setGraphQLDestinationBicyclePolicy( + GraphQLDestinationBicyclePolicyInput destinationBicyclePolicy + ) { + this.destinationBicyclePolicy = destinationBicyclePolicy; } + } - public void setGraphQLRoutes(String routes) { - this.routes = routes; + public static class GraphQLBicycleWalkPreferencesCostInput { + + private org.opentripplanner.framework.model.Cost mountDismountCost; + private Double reluctance; + + public GraphQLBicycleWalkPreferencesCostInput(Map args) { + if (args != null) { + this.mountDismountCost = + (org.opentripplanner.framework.model.Cost) args.get("mountDismountCost"); + this.reluctance = (Double) args.get("reluctance"); + } } - public void setGraphQLStops(String stops) { - this.stops = stops; + public org.opentripplanner.framework.model.Cost getGraphQLMountDismountCost() { + return this.mountDismountCost; } - public void setGraphQLStopsHard(String stopsHard) { - this.stopsHard = stopsHard; + public Double getGraphQLReluctance() { + return this.reluctance; } - public void setGraphQLTrips(String trips) { - this.trips = trips; + public void setGraphQLMountDismountCost( + org.opentripplanner.framework.model.Cost mountDismountCost + ) { + this.mountDismountCost = mountDismountCost; + } + + public void setGraphQLReluctance(Double reluctance) { + this.reluctance = reluctance; } } - public static class GraphQLInputCoordinatesInput { + public static class GraphQLBicycleWalkPreferencesInput { - private String address; - private Double lat; - private Integer locationSlack; - private Double lon; + private GraphQLBicycleWalkPreferencesCostInput cost; + private java.time.Duration mountDismountTime; + private Double speed; - public GraphQLInputCoordinatesInput(Map args) { + public GraphQLBicycleWalkPreferencesInput(Map args) { if (args != null) { - this.address = (String) args.get("address"); - this.lat = (Double) args.get("lat"); - this.locationSlack = (Integer) args.get("locationSlack"); - this.lon = (Double) args.get("lon"); + this.cost = + new GraphQLBicycleWalkPreferencesCostInput((Map) args.get("cost")); + this.mountDismountTime = (java.time.Duration) args.get("mountDismountTime"); + this.speed = (Double) args.get("speed"); } } - public String getGraphQLAddress() { - return this.address; + public GraphQLBicycleWalkPreferencesCostInput getGraphQLCost() { + return this.cost; } - public Double getGraphQLLat() { - return this.lat; + public java.time.Duration getGraphQLMountDismountTime() { + return this.mountDismountTime; } - public Integer getGraphQLLocationSlack() { - return this.locationSlack; + public Double getGraphQLSpeed() { + return this.speed; } - public Double getGraphQLLon() { - return this.lon; + public void setGraphQLCost(GraphQLBicycleWalkPreferencesCostInput cost) { + this.cost = cost; } - public void setGraphQLAddress(String address) { - this.address = address; + public void setGraphQLMountDismountTime(java.time.Duration mountDismountTime) { + this.mountDismountTime = mountDismountTime; } - public void setGraphQLLat(Double lat) { - this.lat = lat; + public void setGraphQLSpeed(Double speed) { + this.speed = speed; } + } - public void setGraphQLLocationSlack(Integer locationSlack) { - this.locationSlack = locationSlack; + public static class GraphQLBikeParkNameArgs { + + private String language; + + public GraphQLBikeParkNameArgs(Map args) { + if (args != null) { + this.language = (String) args.get("language"); + } } - public void setGraphQLLon(Double lon) { - this.lon = lon; + public String getGraphQLLanguage() { + return this.language; + } + + public void setGraphQLLanguage(String language) { + this.language = language; } } - public enum GraphQLInputField { - DATE_TIME, - FROM, - TO, + public enum GraphQLBikesAllowed { + ALLOWED, + NOT_ALLOWED, + NO_INFORMATION, } - public static class GraphQLInputFiltersInput { + public static class GraphQLBoardPreferencesInput { - private List bikeParks; - private List bikeRentalStations; - private List carParks; - private List routes; - private List stations; - private List stops; + private java.time.Duration slack; + private Double waitReluctance; - public GraphQLInputFiltersInput(Map args) { + public GraphQLBoardPreferencesInput(Map args) { if (args != null) { - this.bikeParks = (List) args.get("bikeParks"); - this.bikeRentalStations = (List) args.get("bikeRentalStations"); - this.carParks = (List) args.get("carParks"); - this.routes = (List) args.get("routes"); - this.stations = (List) args.get("stations"); - this.stops = (List) args.get("stops"); + this.slack = (java.time.Duration) args.get("slack"); + this.waitReluctance = (Double) args.get("waitReluctance"); } } - public List getGraphQLBikeParks() { - return this.bikeParks; + public java.time.Duration getGraphQLSlack() { + return this.slack; } - public List getGraphQLBikeRentalStations() { - return this.bikeRentalStations; + public Double getGraphQLWaitReluctance() { + return this.waitReluctance; } - public List getGraphQLCarParks() { - return this.carParks; + public void setGraphQLSlack(java.time.Duration slack) { + this.slack = slack; } - public List getGraphQLRoutes() { - return this.routes; + public void setGraphQLWaitReluctance(Double waitReluctance) { + this.waitReluctance = waitReluctance; } + } - public List getGraphQLStations() { - return this.stations; + public static class GraphQLCarParkNameArgs { + + private String language; + + public GraphQLCarParkNameArgs(Map args) { + if (args != null) { + this.language = (String) args.get("language"); + } } - public List getGraphQLStops() { - return this.stops; + public String getGraphQLLanguage() { + return this.language; } - public void setGraphQLBikeParks(List bikeParks) { - this.bikeParks = bikeParks; + public void setGraphQLLanguage(String language) { + this.language = language; } + } - public void setGraphQLBikeRentalStations(List bikeRentalStations) { - this.bikeRentalStations = bikeRentalStations; + public static class GraphQLCarParkingPreferencesInput { + + private List filters; + private List preferred; + private Integer unpreferredCost; + + public GraphQLCarParkingPreferencesInput(Map args) { + if (args != null) { + if (args.get("filters") != null) { + this.filters = (List) args.get("filters"); + } + if (args.get("preferred") != null) { + this.preferred = (List) args.get("preferred"); + } + this.unpreferredCost = (Integer) args.get("unpreferredCost"); + } } - public void setGraphQLCarParks(List carParks) { - this.carParks = carParks; + public List getGraphQLFilters() { + return this.filters; } - public void setGraphQLRoutes(List routes) { - this.routes = routes; + public List getGraphQLPreferred() { + return this.preferred; } - public void setGraphQLStations(List stations) { - this.stations = stations; + public Integer getGraphQLUnpreferredCost() { + return this.unpreferredCost; } - public void setGraphQLStops(List stops) { - this.stops = stops; + public void setGraphQLFilters(List filters) { + this.filters = filters; + } + + public void setGraphQLPreferred(List preferred) { + this.preferred = preferred; + } + + public void setGraphQLUnpreferredCost(Integer unpreferredCost) { + this.unpreferredCost = unpreferredCost; } } - public static class GraphQLInputModeWeightInput { + public static class GraphQLCarPreferencesInput { - private Double AIRPLANE; - private Double BUS; - private Double CABLE_CAR; - private Double FERRY; - private Double FUNICULAR; - private Double GONDOLA; - private Double RAIL; - private Double SUBWAY; - private Double TRAM; + private GraphQLCarParkingPreferencesInput parking; + private Double reluctance; + private GraphQLCarRentalPreferencesInput rental; - public GraphQLInputModeWeightInput(Map args) { + public GraphQLCarPreferencesInput(Map args) { if (args != null) { - this.AIRPLANE = (Double) args.get("AIRPLANE"); - this.BUS = (Double) args.get("BUS"); - this.CABLE_CAR = (Double) args.get("CABLE_CAR"); - this.FERRY = (Double) args.get("FERRY"); - this.FUNICULAR = (Double) args.get("FUNICULAR"); - this.GONDOLA = (Double) args.get("GONDOLA"); - this.RAIL = (Double) args.get("RAIL"); - this.SUBWAY = (Double) args.get("SUBWAY"); - this.TRAM = (Double) args.get("TRAM"); + this.parking = + new GraphQLCarParkingPreferencesInput((Map) args.get("parking")); + this.reluctance = (Double) args.get("reluctance"); + this.rental = + new GraphQLCarRentalPreferencesInput((Map) args.get("rental")); } } - public Double getGraphQLAirplane() { - return this.AIRPLANE; + public GraphQLCarParkingPreferencesInput getGraphQLParking() { + return this.parking; } - public Double getGraphQLBus() { - return this.BUS; + public Double getGraphQLReluctance() { + return this.reluctance; } - public Double getGraphQLCable_Car() { - return this.CABLE_CAR; + public GraphQLCarRentalPreferencesInput getGraphQLRental() { + return this.rental; } - public Double getGraphQLFerry() { - return this.FERRY; + public void setGraphQLParking(GraphQLCarParkingPreferencesInput parking) { + this.parking = parking; } - public Double getGraphQLFunicular() { - return this.FUNICULAR; + public void setGraphQLReluctance(Double reluctance) { + this.reluctance = reluctance; } - public Double getGraphQLGondola() { - return this.GONDOLA; + public void setGraphQLRental(GraphQLCarRentalPreferencesInput rental) { + this.rental = rental; } + } - public Double getGraphQLRail() { - return this.RAIL; + public static class GraphQLCarRentalPreferencesInput { + + private List allowedNetworks; + private List bannedNetworks; + private GraphQLDestinationCarPolicyInput destinationCarPolicy; + + public GraphQLCarRentalPreferencesInput(Map args) { + if (args != null) { + this.allowedNetworks = (List) args.get("allowedNetworks"); + this.bannedNetworks = (List) args.get("bannedNetworks"); + this.destinationCarPolicy = + new GraphQLDestinationCarPolicyInput( + (Map) args.get("destinationCarPolicy") + ); + } } - public Double getGraphQLSubway() { - return this.SUBWAY; + public List getGraphQLAllowedNetworks() { + return this.allowedNetworks; } - public Double getGraphQLTram() { - return this.TRAM; + public List getGraphQLBannedNetworks() { + return this.bannedNetworks; } - public void setGraphQLAirplane(Double AIRPLANE) { - this.AIRPLANE = AIRPLANE; + public GraphQLDestinationCarPolicyInput getGraphQLDestinationCarPolicy() { + return this.destinationCarPolicy; } - public void setGraphQLBus(Double BUS) { - this.BUS = BUS; + public void setGraphQLAllowedNetworks(List allowedNetworks) { + this.allowedNetworks = allowedNetworks; } - public void setGraphQLCable_Car(Double CABLE_CAR) { - this.CABLE_CAR = CABLE_CAR; + public void setGraphQLBannedNetworks(List bannedNetworks) { + this.bannedNetworks = bannedNetworks; } - public void setGraphQLFerry(Double FERRY) { - this.FERRY = FERRY; + public void setGraphQLDestinationCarPolicy( + GraphQLDestinationCarPolicyInput destinationCarPolicy + ) { + this.destinationCarPolicy = destinationCarPolicy; } + } - public void setGraphQLFunicular(Double FUNICULAR) { - this.FUNICULAR = FUNICULAR; + public static class GraphQLCyclingOptimizationInput { + + private GraphQLTriangleCyclingFactorsInput triangle; + private GraphQLCyclingOptimizationType type; + + public GraphQLCyclingOptimizationInput(Map args) { + if (args != null) { + this.triangle = + new GraphQLTriangleCyclingFactorsInput((Map) args.get("triangle")); + if (args.get("type") instanceof GraphQLCyclingOptimizationType) { + this.type = (GraphQLCyclingOptimizationType) args.get("type"); + } else { + this.type = GraphQLCyclingOptimizationType.valueOf((String) args.get("type")); + } + } } - public void setGraphQLGondola(Double GONDOLA) { - this.GONDOLA = GONDOLA; + public GraphQLTriangleCyclingFactorsInput getGraphQLTriangle() { + return this.triangle; } - public void setGraphQLRail(Double RAIL) { - this.RAIL = RAIL; + public GraphQLCyclingOptimizationType getGraphQLType() { + return this.type; } - public void setGraphQLSubway(Double SUBWAY) { - this.SUBWAY = SUBWAY; + public void setGraphQLTriangle(GraphQLTriangleCyclingFactorsInput triangle) { + this.triangle = triangle; } - public void setGraphQLTram(Double TRAM) { - this.TRAM = TRAM; + public void setGraphQLType(GraphQLCyclingOptimizationType type) { + this.type = type; } } - public static class GraphQLInputPreferredInput { + /** + * Predefined optimization alternatives for bicycling routing. For more customization, + * one can use the triangle factors. + */ + public enum GraphQLCyclingOptimizationType { + FLAT_STREETS, + SAFEST_STREETS, + SAFE_STREETS, + SHORTEST_DURATION, + } - private String agencies; - private Integer otherThanPreferredRoutesPenalty; - private String routes; + public static class GraphQLDepartureRowStoptimesArgs { - public GraphQLInputPreferredInput(Map args) { + private Integer numberOfDepartures; + private Boolean omitCanceled; + private Boolean omitNonPickups; + private Long startTime; + private Integer timeRange; + + public GraphQLDepartureRowStoptimesArgs(Map args) { if (args != null) { - this.agencies = (String) args.get("agencies"); - this.otherThanPreferredRoutesPenalty = - (Integer) args.get("otherThanPreferredRoutesPenalty"); - this.routes = (String) args.get("routes"); + this.numberOfDepartures = (Integer) args.get("numberOfDepartures"); + this.omitCanceled = (Boolean) args.get("omitCanceled"); + this.omitNonPickups = (Boolean) args.get("omitNonPickups"); + this.startTime = (Long) args.get("startTime"); + this.timeRange = (Integer) args.get("timeRange"); } } - public String getGraphQLAgencies() { - return this.agencies; + public Integer getGraphQLNumberOfDepartures() { + return this.numberOfDepartures; } - public Integer getGraphQLOtherThanPreferredRoutesPenalty() { - return this.otherThanPreferredRoutesPenalty; + public Boolean getGraphQLOmitCanceled() { + return this.omitCanceled; } - public String getGraphQLRoutes() { - return this.routes; + public Boolean getGraphQLOmitNonPickups() { + return this.omitNonPickups; } - public void setGraphQLAgencies(String agencies) { - this.agencies = agencies; + public Long getGraphQLStartTime() { + return this.startTime; } - public void setGraphQLOtherThanPreferredRoutesPenalty(Integer otherThanPreferredRoutesPenalty) { - this.otherThanPreferredRoutesPenalty = otherThanPreferredRoutesPenalty; + public Integer getGraphQLTimeRange() { + return this.timeRange; } - public void setGraphQLRoutes(String routes) { - this.routes = routes; + public void setGraphQLNumberOfDepartures(Integer numberOfDepartures) { + this.numberOfDepartures = numberOfDepartures; } - } - public static class GraphQLInputTriangleInput { + public void setGraphQLOmitCanceled(Boolean omitCanceled) { + this.omitCanceled = omitCanceled; + } - private Double safetyFactor; - private Double slopeFactor; - private Double timeFactor; + public void setGraphQLOmitNonPickups(Boolean omitNonPickups) { + this.omitNonPickups = omitNonPickups; + } - public GraphQLInputTriangleInput(Map args) { - if (args != null) { - this.safetyFactor = (Double) args.get("safetyFactor"); - this.slopeFactor = (Double) args.get("slopeFactor"); - this.timeFactor = (Double) args.get("timeFactor"); - } + public void setGraphQLStartTime(Long startTime) { + this.startTime = startTime; } - public Double getGraphQLSafetyFactor() { - return this.safetyFactor; + public void setGraphQLTimeRange(Integer timeRange) { + this.timeRange = timeRange; } + } - public Double getGraphQLSlopeFactor() { - return this.slopeFactor; + public static class GraphQLDestinationBicyclePolicyInput { + + private Boolean allowKeeping; + private org.opentripplanner.framework.model.Cost keepingCost; + + public GraphQLDestinationBicyclePolicyInput(Map args) { + if (args != null) { + this.allowKeeping = (Boolean) args.get("allowKeeping"); + this.keepingCost = (org.opentripplanner.framework.model.Cost) args.get("keepingCost"); + } } - public Double getGraphQLTimeFactor() { - return this.timeFactor; + public Boolean getGraphQLAllowKeeping() { + return this.allowKeeping; } - public void setGraphQLSafetyFactor(Double safetyFactor) { - this.safetyFactor = safetyFactor; + public org.opentripplanner.framework.model.Cost getGraphQLKeepingCost() { + return this.keepingCost; } - public void setGraphQLSlopeFactor(Double slopeFactor) { - this.slopeFactor = slopeFactor; + public void setGraphQLAllowKeeping(Boolean allowKeeping) { + this.allowKeeping = allowKeeping; } - public void setGraphQLTimeFactor(Double timeFactor) { - this.timeFactor = timeFactor; + public void setGraphQLKeepingCost(org.opentripplanner.framework.model.Cost keepingCost) { + this.keepingCost = keepingCost; } } - public static class GraphQLInputUnpreferredInput { + public static class GraphQLDestinationCarPolicyInput { - private String agencies; - private String routes; - private String unpreferredCost; - private Integer useUnpreferredRoutesPenalty; + private Boolean allowKeeping; + private org.opentripplanner.framework.model.Cost keepingCost; - public GraphQLInputUnpreferredInput(Map args) { + public GraphQLDestinationCarPolicyInput(Map args) { if (args != null) { - this.agencies = (String) args.get("agencies"); - this.routes = (String) args.get("routes"); - this.unpreferredCost = (String) args.get("unpreferredCost"); - this.useUnpreferredRoutesPenalty = (Integer) args.get("useUnpreferredRoutesPenalty"); + this.allowKeeping = (Boolean) args.get("allowKeeping"); + this.keepingCost = (org.opentripplanner.framework.model.Cost) args.get("keepingCost"); } } - public String getGraphQLAgencies() { - return this.agencies; + public Boolean getGraphQLAllowKeeping() { + return this.allowKeeping; } - public String getGraphQLRoutes() { - return this.routes; + public org.opentripplanner.framework.model.Cost getGraphQLKeepingCost() { + return this.keepingCost; } - public String getGraphQLUnpreferredCost() { - return this.unpreferredCost; + public void setGraphQLAllowKeeping(Boolean allowKeeping) { + this.allowKeeping = allowKeeping; } - public Integer getGraphQLUseUnpreferredRoutesPenalty() { - return this.useUnpreferredRoutesPenalty; + public void setGraphQLKeepingCost(org.opentripplanner.framework.model.Cost keepingCost) { + this.keepingCost = keepingCost; } + } - public void setGraphQLAgencies(String agencies) { - this.agencies = agencies; - } + public static class GraphQLDestinationScooterPolicyInput { - public void setGraphQLRoutes(String routes) { - this.routes = routes; - } + private Boolean allowKeeping; + private org.opentripplanner.framework.model.Cost keepingCost; + + public GraphQLDestinationScooterPolicyInput(Map args) { + if (args != null) { + this.allowKeeping = (Boolean) args.get("allowKeeping"); + this.keepingCost = (org.opentripplanner.framework.model.Cost) args.get("keepingCost"); + } + } + + public Boolean getGraphQLAllowKeeping() { + return this.allowKeeping; + } + + public org.opentripplanner.framework.model.Cost getGraphQLKeepingCost() { + return this.keepingCost; + } + + public void setGraphQLAllowKeeping(Boolean allowKeeping) { + this.allowKeeping = allowKeeping; + } + + public void setGraphQLKeepingCost(org.opentripplanner.framework.model.Cost keepingCost) { + this.keepingCost = keepingCost; + } + } + + public static class GraphQLFeedAlertsArgs { + + private List types; + + public GraphQLFeedAlertsArgs(Map args) { + if (args != null) { + if (args.get("types") != null) { + this.types = + ((List) args.get("types")).stream() + .map(item -> + item instanceof GraphQLFeedAlertType + ? item + : GraphQLFeedAlertType.valueOf((String) item) + ) + .map(GraphQLFeedAlertType.class::cast) + .collect(Collectors.toList()); + } + } + } + + public List getGraphQLTypes() { + return this.types; + } + + public void setGraphQLTypes(List types) { + this.types = types; + } + } + + /** Entities, which are relevant for a feed and can contain alerts */ + public enum GraphQLFeedAlertType { + AGENCIES, + ROUTE_TYPES, + } + + public enum GraphQLFilterPlaceType { + BICYCLE_RENT, + BIKE_PARK, + CAR_PARK, + DEPARTURE_ROW, + STATION, + STOP, + VEHICLE_RENT, + } + + public enum GraphQLFormFactor { + BICYCLE, + CAR, + CARGO_BICYCLE, + MOPED, + OTHER, + SCOOTER, + SCOOTER_SEATED, + SCOOTER_STANDING, + } + + public static class GraphQLInputBannedInput { + + private String agencies; + private String routes; + private String stops; + private String stopsHard; + private String trips; + + public GraphQLInputBannedInput(Map args) { + if (args != null) { + this.agencies = (String) args.get("agencies"); + this.routes = (String) args.get("routes"); + this.stops = (String) args.get("stops"); + this.stopsHard = (String) args.get("stopsHard"); + this.trips = (String) args.get("trips"); + } + } + + public String getGraphQLAgencies() { + return this.agencies; + } + + public String getGraphQLRoutes() { + return this.routes; + } + + public String getGraphQLStops() { + return this.stops; + } + + public String getGraphQLStopsHard() { + return this.stopsHard; + } + + public String getGraphQLTrips() { + return this.trips; + } + + public void setGraphQLAgencies(String agencies) { + this.agencies = agencies; + } + + public void setGraphQLRoutes(String routes) { + this.routes = routes; + } + + public void setGraphQLStops(String stops) { + this.stops = stops; + } + + public void setGraphQLStopsHard(String stopsHard) { + this.stopsHard = stopsHard; + } + + public void setGraphQLTrips(String trips) { + this.trips = trips; + } + } + + public static class GraphQLInputCoordinatesInput { + + private String address; + private Double lat; + private Integer locationSlack; + private Double lon; + + public GraphQLInputCoordinatesInput(Map args) { + if (args != null) { + this.address = (String) args.get("address"); + this.lat = (Double) args.get("lat"); + this.locationSlack = (Integer) args.get("locationSlack"); + this.lon = (Double) args.get("lon"); + } + } + + public String getGraphQLAddress() { + return this.address; + } + + public Double getGraphQLLat() { + return this.lat; + } + + public Integer getGraphQLLocationSlack() { + return this.locationSlack; + } + + public Double getGraphQLLon() { + return this.lon; + } + + public void setGraphQLAddress(String address) { + this.address = address; + } + + public void setGraphQLLat(Double lat) { + this.lat = lat; + } + + public void setGraphQLLocationSlack(Integer locationSlack) { + this.locationSlack = locationSlack; + } + + public void setGraphQLLon(Double lon) { + this.lon = lon; + } + } + + public enum GraphQLInputField { + DATE_TIME, + FROM, + TO, + } + + public static class GraphQLInputFiltersInput { + + private List bikeParks; + private List bikeRentalStations; + private List carParks; + private List routes; + private List stations; + private List stops; + + public GraphQLInputFiltersInput(Map args) { + if (args != null) { + this.bikeParks = (List) args.get("bikeParks"); + this.bikeRentalStations = (List) args.get("bikeRentalStations"); + this.carParks = (List) args.get("carParks"); + this.routes = (List) args.get("routes"); + this.stations = (List) args.get("stations"); + this.stops = (List) args.get("stops"); + } + } + + public List getGraphQLBikeParks() { + return this.bikeParks; + } + + public List getGraphQLBikeRentalStations() { + return this.bikeRentalStations; + } + + public List getGraphQLCarParks() { + return this.carParks; + } + + public List getGraphQLRoutes() { + return this.routes; + } + + public List getGraphQLStations() { + return this.stations; + } + + public List getGraphQLStops() { + return this.stops; + } + + public void setGraphQLBikeParks(List bikeParks) { + this.bikeParks = bikeParks; + } + + public void setGraphQLBikeRentalStations(List bikeRentalStations) { + this.bikeRentalStations = bikeRentalStations; + } + + public void setGraphQLCarParks(List carParks) { + this.carParks = carParks; + } + + public void setGraphQLRoutes(List routes) { + this.routes = routes; + } + + public void setGraphQLStations(List stations) { + this.stations = stations; + } + + public void setGraphQLStops(List stops) { + this.stops = stops; + } + } + + public static class GraphQLInputModeWeightInput { + + private Double AIRPLANE; + private Double BUS; + private Double CABLE_CAR; + private Double FERRY; + private Double FUNICULAR; + private Double GONDOLA; + private Double RAIL; + private Double SUBWAY; + private Double TRAM; + + public GraphQLInputModeWeightInput(Map args) { + if (args != null) { + this.AIRPLANE = (Double) args.get("AIRPLANE"); + this.BUS = (Double) args.get("BUS"); + this.CABLE_CAR = (Double) args.get("CABLE_CAR"); + this.FERRY = (Double) args.get("FERRY"); + this.FUNICULAR = (Double) args.get("FUNICULAR"); + this.GONDOLA = (Double) args.get("GONDOLA"); + this.RAIL = (Double) args.get("RAIL"); + this.SUBWAY = (Double) args.get("SUBWAY"); + this.TRAM = (Double) args.get("TRAM"); + } + } + + public Double getGraphQLAirplane() { + return this.AIRPLANE; + } + + public Double getGraphQLBus() { + return this.BUS; + } + + public Double getGraphQLCable_Car() { + return this.CABLE_CAR; + } + + public Double getGraphQLFerry() { + return this.FERRY; + } + + public Double getGraphQLFunicular() { + return this.FUNICULAR; + } + + public Double getGraphQLGondola() { + return this.GONDOLA; + } + + public Double getGraphQLRail() { + return this.RAIL; + } + + public Double getGraphQLSubway() { + return this.SUBWAY; + } + + public Double getGraphQLTram() { + return this.TRAM; + } + + public void setGraphQLAirplane(Double AIRPLANE) { + this.AIRPLANE = AIRPLANE; + } + + public void setGraphQLBus(Double BUS) { + this.BUS = BUS; + } + + public void setGraphQLCable_Car(Double CABLE_CAR) { + this.CABLE_CAR = CABLE_CAR; + } + + public void setGraphQLFerry(Double FERRY) { + this.FERRY = FERRY; + } + + public void setGraphQLFunicular(Double FUNICULAR) { + this.FUNICULAR = FUNICULAR; + } + + public void setGraphQLGondola(Double GONDOLA) { + this.GONDOLA = GONDOLA; + } + + public void setGraphQLRail(Double RAIL) { + this.RAIL = RAIL; + } + + public void setGraphQLSubway(Double SUBWAY) { + this.SUBWAY = SUBWAY; + } + + public void setGraphQLTram(Double TRAM) { + this.TRAM = TRAM; + } + } + + public static class GraphQLInputPreferredInput { + + private String agencies; + private Integer otherThanPreferredRoutesPenalty; + private String routes; + + public GraphQLInputPreferredInput(Map args) { + if (args != null) { + this.agencies = (String) args.get("agencies"); + this.otherThanPreferredRoutesPenalty = + (Integer) args.get("otherThanPreferredRoutesPenalty"); + this.routes = (String) args.get("routes"); + } + } + + public String getGraphQLAgencies() { + return this.agencies; + } + + public Integer getGraphQLOtherThanPreferredRoutesPenalty() { + return this.otherThanPreferredRoutesPenalty; + } + + public String getGraphQLRoutes() { + return this.routes; + } + + public void setGraphQLAgencies(String agencies) { + this.agencies = agencies; + } + + public void setGraphQLOtherThanPreferredRoutesPenalty(Integer otherThanPreferredRoutesPenalty) { + this.otherThanPreferredRoutesPenalty = otherThanPreferredRoutesPenalty; + } + + public void setGraphQLRoutes(String routes) { + this.routes = routes; + } + } + + public static class GraphQLInputTriangleInput { + + private Double safetyFactor; + private Double slopeFactor; + private Double timeFactor; + + public GraphQLInputTriangleInput(Map args) { + if (args != null) { + this.safetyFactor = (Double) args.get("safetyFactor"); + this.slopeFactor = (Double) args.get("slopeFactor"); + this.timeFactor = (Double) args.get("timeFactor"); + } + } + + public Double getGraphQLSafetyFactor() { + return this.safetyFactor; + } + + public Double getGraphQLSlopeFactor() { + return this.slopeFactor; + } + + public Double getGraphQLTimeFactor() { + return this.timeFactor; + } + + public void setGraphQLSafetyFactor(Double safetyFactor) { + this.safetyFactor = safetyFactor; + } + + public void setGraphQLSlopeFactor(Double slopeFactor) { + this.slopeFactor = slopeFactor; + } + + public void setGraphQLTimeFactor(Double timeFactor) { + this.timeFactor = timeFactor; + } + } + + public static class GraphQLInputUnpreferredInput { + + private String agencies; + private String routes; + private String unpreferredCost; + private Integer useUnpreferredRoutesPenalty; + + public GraphQLInputUnpreferredInput(Map args) { + if (args != null) { + this.agencies = (String) args.get("agencies"); + this.routes = (String) args.get("routes"); + this.unpreferredCost = (String) args.get("unpreferredCost"); + this.useUnpreferredRoutesPenalty = (Integer) args.get("useUnpreferredRoutesPenalty"); + } + } + + public String getGraphQLAgencies() { + return this.agencies; + } + + public String getGraphQLRoutes() { + return this.routes; + } + + public String getGraphQLUnpreferredCost() { + return this.unpreferredCost; + } + + public Integer getGraphQLUseUnpreferredRoutesPenalty() { + return this.useUnpreferredRoutesPenalty; + } + + public void setGraphQLAgencies(String agencies) { + this.agencies = agencies; + } + + public void setGraphQLRoutes(String routes) { + this.routes = routes; + } public void setGraphQLUnpreferredCost(String unpreferredCost) { this.unpreferredCost = unpreferredCost; } - public void setGraphQLUseUnpreferredRoutesPenalty(Integer useUnpreferredRoutesPenalty) { - this.useUnpreferredRoutesPenalty = useUnpreferredRoutesPenalty; + public void setGraphQLUseUnpreferredRoutesPenalty(Integer useUnpreferredRoutesPenalty) { + this.useUnpreferredRoutesPenalty = useUnpreferredRoutesPenalty; + } + } + + /** + * Enable this to attach a system notice to itineraries instead of removing them. This is very + * convenient when tuning the itinerary-filter-chain. + */ + public enum GraphQLItineraryFilterDebugProfile { + LIMIT_TO_NUMBER_OF_ITINERARIES, + LIMIT_TO_SEARCH_WINDOW, + LIST_ALL, + OFF, + } + + public static class GraphQLLegNextLegsArgs { + + private List destinationModesWithParentStation; + private Integer numberOfLegs; + private List originModesWithParentStation; + + public GraphQLLegNextLegsArgs(Map args) { + if (args != null) { + if (args.get("destinationModesWithParentStation") != null) { + this.destinationModesWithParentStation = + ((List) args.get("destinationModesWithParentStation")).stream() + .map(item -> + item instanceof GraphQLTransitMode + ? item + : GraphQLTransitMode.valueOf((String) item) + ) + .map(GraphQLTransitMode.class::cast) + .collect(Collectors.toList()); + } + this.numberOfLegs = (Integer) args.get("numberOfLegs"); + if (args.get("originModesWithParentStation") != null) { + this.originModesWithParentStation = + ((List) args.get("originModesWithParentStation")).stream() + .map(item -> + item instanceof GraphQLTransitMode + ? item + : GraphQLTransitMode.valueOf((String) item) + ) + .map(GraphQLTransitMode.class::cast) + .collect(Collectors.toList()); + } + } + } + + public List getGraphQLDestinationModesWithParentStation() { + return this.destinationModesWithParentStation; + } + + public Integer getGraphQLNumberOfLegs() { + return this.numberOfLegs; + } + + public List getGraphQLOriginModesWithParentStation() { + return this.originModesWithParentStation; + } + + public void setGraphQLDestinationModesWithParentStation( + List destinationModesWithParentStation + ) { + this.destinationModesWithParentStation = destinationModesWithParentStation; + } + + public void setGraphQLNumberOfLegs(Integer numberOfLegs) { + this.numberOfLegs = numberOfLegs; + } + + public void setGraphQLOriginModesWithParentStation( + List originModesWithParentStation + ) { + this.originModesWithParentStation = originModesWithParentStation; + } + } + + /** Identifies whether this stop represents a stop or station. */ + public enum GraphQLLocationType { + ENTRANCE, + STATION, + STOP, + } + + public enum GraphQLMode { + AIRPLANE, + BICYCLE, + BUS, + CABLE_CAR, + CAR, + CARPOOL, + COACH, + FERRY, + FLEX, + FLEXIBLE, + FUNICULAR, + GONDOLA, + LEG_SWITCH, + MONORAIL, + RAIL, + SCOOTER, + SUBWAY, + TAXI, + TRAM, + TRANSIT, + TROLLEYBUS, + WALK, + } + + /** Occupancy status of a vehicle. */ + public enum GraphQLOccupancyStatus { + CRUSHED_STANDING_ROOM_ONLY, + EMPTY, + FEW_SEATS_AVAILABLE, + FULL, + MANY_SEATS_AVAILABLE, + NOT_ACCEPTING_PASSENGERS, + NO_DATA_AVAILABLE, + STANDING_ROOM_ONLY, + } + + public static class GraphQLOpeningHoursDatesArgs { + + private List dates; + + public GraphQLOpeningHoursDatesArgs(Map args) { + if (args != null) { + this.dates = (List) args.get("dates"); + } + } + + public List getGraphQLDates() { + return this.dates; + } + + public void setGraphQLDates(List dates) { + this.dates = dates; + } + } + + /** Optimization type for bicycling legs */ + public enum GraphQLOptimizeType { + FLAT, + GREENWAYS, + QUICK, + SAFE, + TRIANGLE, + } + + public static class GraphQLParkingFilterInput { + + private List not; + private List select; + + public GraphQLParkingFilterInput(Map args) { + if (args != null) { + if (args.get("not") != null) { + this.not = (List) args.get("not"); + } + if (args.get("select") != null) { + this.select = (List) args.get("select"); + } + } + } + + public List getGraphQLNot() { + return this.not; + } + + public List getGraphQLSelect() { + return this.select; + } + + public void setGraphQLNot(List not) { + this.not = not; + } + + public void setGraphQLSelect(List select) { + this.select = select; } } - public static class GraphQLLegNextLegsArgs { + public static class GraphQLParkingFilterOperationInput { - private List destinationModesWithParentStation; - private Integer numberOfLegs; - private List originModesWithParentStation; + private List tags; - public GraphQLLegNextLegsArgs(Map args) { + public GraphQLParkingFilterOperationInput(Map args) { if (args != null) { - if (args.get("destinationModesWithParentStation") != null) { - this.destinationModesWithParentStation = - ((List) args.get("destinationModesWithParentStation")).stream() - .map(item -> - item instanceof GraphQLTransitMode - ? item - : GraphQLTransitMode.valueOf((String) item) - ) - .map(GraphQLTransitMode.class::cast) - .collect(Collectors.toList()); - } - this.numberOfLegs = (Integer) args.get("numberOfLegs"); - if (args.get("originModesWithParentStation") != null) { - this.originModesWithParentStation = - ((List) args.get("originModesWithParentStation")).stream() + this.tags = (List) args.get("tags"); + } + } + + public List getGraphQLTags() { + return this.tags; + } + + public void setGraphQLTags(List tags) { + this.tags = tags; + } + } + + public static class GraphQLPatternAlertsArgs { + + private List types; + + public GraphQLPatternAlertsArgs(Map args) { + if (args != null) { + if (args.get("types") != null) { + this.types = + ((List) args.get("types")).stream() .map(item -> - item instanceof GraphQLTransitMode + item instanceof GraphQLPatternAlertType ? item - : GraphQLTransitMode.valueOf((String) item) + : GraphQLPatternAlertType.valueOf((String) item) ) - .map(GraphQLTransitMode.class::cast) + .map(GraphQLPatternAlertType.class::cast) .collect(Collectors.toList()); } } } - public List getGraphQLDestinationModesWithParentStation() { - return this.destinationModesWithParentStation; + public List getGraphQLTypes() { + return this.types; } - public Integer getGraphQLNumberOfLegs() { - return this.numberOfLegs; + public void setGraphQLTypes(List types) { + this.types = types; } + } - public List getGraphQLOriginModesWithParentStation() { - return this.originModesWithParentStation; + public static class GraphQLPatternTripsForDateArgs { + + private String serviceDate; + + public GraphQLPatternTripsForDateArgs(Map args) { + if (args != null) { + this.serviceDate = (String) args.get("serviceDate"); + } } - public void setGraphQLDestinationModesWithParentStation( - List destinationModesWithParentStation - ) { - this.destinationModesWithParentStation = destinationModesWithParentStation; + public String getGraphQLServiceDate() { + return this.serviceDate; } - public void setGraphQLNumberOfLegs(Integer numberOfLegs) { - this.numberOfLegs = numberOfLegs; + public void setGraphQLServiceDate(String serviceDate) { + this.serviceDate = serviceDate; } + } - public void setGraphQLOriginModesWithParentStation( - List originModesWithParentStation - ) { - this.originModesWithParentStation = originModesWithParentStation; + /** Entities, which are relevant for a pattern and can contain alerts */ + public enum GraphQLPatternAlertType { + AGENCY, + PATTERN, + ROUTE, + ROUTE_TYPE, + STOPS_ON_PATTERN, + STOPS_ON_TRIPS, + TRIPS, + } + + public enum GraphQLPickupDropoffType { + CALL_AGENCY, + COORDINATE_WITH_DRIVER, + NONE, + SCHEDULED, + } + + /** Street modes that can be used for access to the transit network from origin. */ + public enum GraphQLPlanAccessMode { + BICYCLE, + BICYCLE_PARKING, + BICYCLE_RENTAL, + CAR_DROP_OFF, + CAR_PARKING, + CAR_RENTAL, + FLEX, + SCOOTER_RENTAL, + WALK, + } + + public static class GraphQLPlanCoordinateInput { + + private Double latitude; + private Double longitude; + + public GraphQLPlanCoordinateInput(Map args) { + if (args != null) { + this.latitude = (Double) args.get("latitude"); + this.longitude = (Double) args.get("longitude"); + } + } + + public Double getGraphQLLatitude() { + return this.latitude; + } + + public Double getGraphQLLongitude() { + return this.longitude; + } + + public void setGraphQLLatitude(Double latitude) { + this.latitude = latitude; + } + + public void setGraphQLLongitude(Double longitude) { + this.longitude = longitude; } } - /** Identifies whether this stop represents a stop or station. */ - public enum GraphQLLocationType { - ENTRANCE, - STATION, - STOP, + public static class GraphQLPlanDateTimeInput { + + private java.time.OffsetDateTime earliestDeparture; + private java.time.OffsetDateTime latestArrival; + + public GraphQLPlanDateTimeInput(Map args) { + if (args != null) { + this.earliestDeparture = (java.time.OffsetDateTime) args.get("earliestDeparture"); + this.latestArrival = (java.time.OffsetDateTime) args.get("latestArrival"); + } + } + + public java.time.OffsetDateTime getGraphQLEarliestDeparture() { + return this.earliestDeparture; + } + + public java.time.OffsetDateTime getGraphQLLatestArrival() { + return this.latestArrival; + } + + public void setGraphQLEarliestDeparture(java.time.OffsetDateTime earliestDeparture) { + this.earliestDeparture = earliestDeparture; + } + + public void setGraphQLLatestArrival(java.time.OffsetDateTime latestArrival) { + this.latestArrival = latestArrival; + } } - public enum GraphQLMode { - AIRPLANE, + /** Street mode that is used when searching for itineraries that don't use any transit. */ + public enum GraphQLPlanDirectMode { BICYCLE, - BUS, - CABLE_CAR, + BICYCLE_PARKING, + BICYCLE_RENTAL, CAR, - CARPOOL, - COACH, - FERRY, + CAR_PARKING, + CAR_RENTAL, FLEX, - FLEXIBLE, - FUNICULAR, - GONDOLA, - LEG_SWITCH, - MONORAIL, - RAIL, - SCOOTER, - SUBWAY, - TAXI, - TRAM, - TRANSIT, - TROLLEYBUS, + SCOOTER_RENTAL, + WALK, + } + + /** Street modes that can be used for egress from the transit network to destination. */ + public enum GraphQLPlanEgressMode { + BICYCLE, + BICYCLE_RENTAL, + CAR_PICKUP, + CAR_RENTAL, + FLEX, + SCOOTER_RENTAL, WALK, } - /** Occupancy status of a vehicle. */ - public enum GraphQLOccupancyStatus { - CRUSHED_STANDING_ROOM_ONLY, - EMPTY, - FEW_SEATS_AVAILABLE, - FULL, - MANY_SEATS_AVAILABLE, - NOT_ACCEPTING_PASSENGERS, - NO_DATA_AVAILABLE, - STANDING_ROOM_ONLY, + public static class GraphQLPlanItineraryFilterInput { + + private Double groupSimilarityKeepOne; + private Double groupSimilarityKeepThree; + private Double groupedOtherThanSameLegsMaxCostMultiplier; + private GraphQLItineraryFilterDebugProfile itineraryFilterDebugProfile; + + public GraphQLPlanItineraryFilterInput(Map args) { + if (args != null) { + this.groupSimilarityKeepOne = (Double) args.get("groupSimilarityKeepOne"); + this.groupSimilarityKeepThree = (Double) args.get("groupSimilarityKeepThree"); + this.groupedOtherThanSameLegsMaxCostMultiplier = + (Double) args.get("groupedOtherThanSameLegsMaxCostMultiplier"); + if (args.get("itineraryFilterDebugProfile") instanceof GraphQLItineraryFilterDebugProfile) { + this.itineraryFilterDebugProfile = + (GraphQLItineraryFilterDebugProfile) args.get("itineraryFilterDebugProfile"); + } else { + this.itineraryFilterDebugProfile = + GraphQLItineraryFilterDebugProfile.valueOf( + (String) args.get("itineraryFilterDebugProfile") + ); + } + } + } + + public Double getGraphQLGroupSimilarityKeepOne() { + return this.groupSimilarityKeepOne; + } + + public Double getGraphQLGroupSimilarityKeepThree() { + return this.groupSimilarityKeepThree; + } + + public Double getGraphQLGroupedOtherThanSameLegsMaxCostMultiplier() { + return this.groupedOtherThanSameLegsMaxCostMultiplier; + } + + public GraphQLItineraryFilterDebugProfile getGraphQLItineraryFilterDebugProfile() { + return this.itineraryFilterDebugProfile; + } + + public void setGraphQLGroupSimilarityKeepOne(Double groupSimilarityKeepOne) { + this.groupSimilarityKeepOne = groupSimilarityKeepOne; + } + + public void setGraphQLGroupSimilarityKeepThree(Double groupSimilarityKeepThree) { + this.groupSimilarityKeepThree = groupSimilarityKeepThree; + } + + public void setGraphQLGroupedOtherThanSameLegsMaxCostMultiplier( + Double groupedOtherThanSameLegsMaxCostMultiplier + ) { + this.groupedOtherThanSameLegsMaxCostMultiplier = groupedOtherThanSameLegsMaxCostMultiplier; + } + + public void setGraphQLItineraryFilterDebugProfile( + GraphQLItineraryFilterDebugProfile itineraryFilterDebugProfile + ) { + this.itineraryFilterDebugProfile = itineraryFilterDebugProfile; + } + } + + public static class GraphQLPlanLabeledLocationInput { + + private String label; + private GraphQLPlanLocationInput location; + + public GraphQLPlanLabeledLocationInput(Map args) { + if (args != null) { + this.label = (String) args.get("label"); + this.location = new GraphQLPlanLocationInput((Map) args.get("location")); + } + } + + public String getGraphQLLabel() { + return this.label; + } + + public GraphQLPlanLocationInput getGraphQLLocation() { + return this.location; + } + + public void setGraphQLLabel(String label) { + this.label = label; + } + + public void setGraphQLLocation(GraphQLPlanLocationInput location) { + this.location = location; + } + } + + public static class GraphQLPlanLocationInput { + + private GraphQLPlanCoordinateInput coordinate; + private GraphQLPlanStopLocationInput stopLocation; + + public GraphQLPlanLocationInput(Map args) { + if (args != null) { + this.coordinate = + new GraphQLPlanCoordinateInput((Map) args.get("coordinate")); + this.stopLocation = + new GraphQLPlanStopLocationInput((Map) args.get("stopLocation")); + } + } + + public GraphQLPlanCoordinateInput getGraphQLCoordinate() { + return this.coordinate; + } + + public GraphQLPlanStopLocationInput getGraphQLStopLocation() { + return this.stopLocation; + } + + public void setGraphQLCoordinate(GraphQLPlanCoordinateInput coordinate) { + this.coordinate = coordinate; + } + + public void setGraphQLStopLocation(GraphQLPlanStopLocationInput stopLocation) { + this.stopLocation = stopLocation; + } + } + + public static class GraphQLPlanModesInput { + + private List direct; + private Boolean directOnly; + private GraphQLPlanTransitModesInput transit; + private Boolean transitOnly; + + public GraphQLPlanModesInput(Map args) { + if (args != null) { + if (args.get("direct") != null) { + this.direct = + ((List) args.get("direct")).stream() + .map(item -> + item instanceof GraphQLPlanDirectMode + ? item + : GraphQLPlanDirectMode.valueOf((String) item) + ) + .map(GraphQLPlanDirectMode.class::cast) + .collect(Collectors.toList()); + } + this.directOnly = (Boolean) args.get("directOnly"); + this.transit = new GraphQLPlanTransitModesInput((Map) args.get("transit")); + this.transitOnly = (Boolean) args.get("transitOnly"); + } + } + + public List getGraphQLDirect() { + return this.direct; + } + + public Boolean getGraphQLDirectOnly() { + return this.directOnly; + } + + public GraphQLPlanTransitModesInput getGraphQLTransit() { + return this.transit; + } + + public Boolean getGraphQLTransitOnly() { + return this.transitOnly; + } + + public void setGraphQLDirect(List direct) { + this.direct = direct; + } + + public void setGraphQLDirectOnly(Boolean directOnly) { + this.directOnly = directOnly; + } + + public void setGraphQLTransit(GraphQLPlanTransitModesInput transit) { + this.transit = transit; + } + + public void setGraphQLTransitOnly(Boolean transitOnly) { + this.transitOnly = transitOnly; + } } - public static class GraphQLOpeningHoursDatesArgs { + public static class GraphQLPlanPreferencesInput { - private List dates; + private GraphQLAccessibilityPreferencesInput accessibility; + private GraphQLPlanStreetPreferencesInput street; + private GraphQLTransitPreferencesInput transit; - public GraphQLOpeningHoursDatesArgs(Map args) { + public GraphQLPlanPreferencesInput(Map args) { if (args != null) { - this.dates = (List) args.get("dates"); + this.accessibility = + new GraphQLAccessibilityPreferencesInput((Map) args.get("accessibility")); + this.street = + new GraphQLPlanStreetPreferencesInput((Map) args.get("street")); + this.transit = + new GraphQLTransitPreferencesInput((Map) args.get("transit")); } } - public List getGraphQLDates() { - return this.dates; + public GraphQLAccessibilityPreferencesInput getGraphQLAccessibility() { + return this.accessibility; } - public void setGraphQLDates(List dates) { - this.dates = dates; + public GraphQLPlanStreetPreferencesInput getGraphQLStreet() { + return this.street; + } + + public GraphQLTransitPreferencesInput getGraphQLTransit() { + return this.transit; + } + + public void setGraphQLAccessibility(GraphQLAccessibilityPreferencesInput accessibility) { + this.accessibility = accessibility; + } + + public void setGraphQLStreet(GraphQLPlanStreetPreferencesInput street) { + this.street = street; + } + + public void setGraphQLTransit(GraphQLTransitPreferencesInput transit) { + this.transit = transit; } } - /** Optimization type for bicycling legs */ - public enum GraphQLOptimizeType { - FLAT, - GREENWAYS, - QUICK, - SAFE, - TRIANGLE, + public static class GraphQLPlanStopLocationInput { + + private String stopLocationId; + private Boolean strict; + + public GraphQLPlanStopLocationInput(Map args) { + if (args != null) { + this.stopLocationId = (String) args.get("stopLocationId"); + this.strict = (Boolean) args.get("strict"); + } + } + + public String getGraphQLStopLocationId() { + return this.stopLocationId; + } + + public Boolean getGraphQLStrict() { + return this.strict; + } + + public void setGraphQLStopLocationId(String stopLocationId) { + this.stopLocationId = stopLocationId; + } + + public void setGraphQLStrict(Boolean strict) { + this.strict = strict; + } } - public static class GraphQLParkingFilterInput { + public static class GraphQLPlanStreetPreferencesInput { - private List not; - private List select; + private GraphQLBicyclePreferencesInput bicycle; + private GraphQLCarPreferencesInput car; + private GraphQLScooterPreferencesInput scooter; + private GraphQLWalkPreferencesInput walk; - public GraphQLParkingFilterInput(Map args) { + public GraphQLPlanStreetPreferencesInput(Map args) { if (args != null) { - if (args.get("not") != null) { - this.not = (List) args.get("not"); - } - if (args.get("select") != null) { - this.select = (List) args.get("select"); - } + this.bicycle = + new GraphQLBicyclePreferencesInput((Map) args.get("bicycle")); + this.car = new GraphQLCarPreferencesInput((Map) args.get("car")); + this.scooter = + new GraphQLScooterPreferencesInput((Map) args.get("scooter")); + this.walk = new GraphQLWalkPreferencesInput((Map) args.get("walk")); } } - public List getGraphQLNot() { - return this.not; + public GraphQLBicyclePreferencesInput getGraphQLBicycle() { + return this.bicycle; } - public List getGraphQLSelect() { - return this.select; + public GraphQLCarPreferencesInput getGraphQLCar() { + return this.car; } - public void setGraphQLNot(List not) { - this.not = not; + public GraphQLScooterPreferencesInput getGraphQLScooter() { + return this.scooter; } - public void setGraphQLSelect(List select) { - this.select = select; + public GraphQLWalkPreferencesInput getGraphQLWalk() { + return this.walk; + } + + public void setGraphQLBicycle(GraphQLBicyclePreferencesInput bicycle) { + this.bicycle = bicycle; + } + + public void setGraphQLCar(GraphQLCarPreferencesInput car) { + this.car = car; + } + + public void setGraphQLScooter(GraphQLScooterPreferencesInput scooter) { + this.scooter = scooter; + } + + public void setGraphQLWalk(GraphQLWalkPreferencesInput walk) { + this.walk = walk; } } - public static class GraphQLParkingFilterOperationInput { + public enum GraphQLPlanTransferMode { + BICYCLE, + WALK, + } - private List tags; + public static class GraphQLPlanTransitModePreferenceInput { - public GraphQLParkingFilterOperationInput(Map args) { + private GraphQLTransitModePreferenceCostInput cost; + private GraphQLTransitMode mode; + + public GraphQLPlanTransitModePreferenceInput(Map args) { if (args != null) { - this.tags = (List) args.get("tags"); + this.cost = + new GraphQLTransitModePreferenceCostInput((Map) args.get("cost")); + if (args.get("mode") instanceof GraphQLTransitMode) { + this.mode = (GraphQLTransitMode) args.get("mode"); + } else { + this.mode = GraphQLTransitMode.valueOf((String) args.get("mode")); + } } } - public List getGraphQLTags() { - return this.tags; + public GraphQLTransitModePreferenceCostInput getGraphQLCost() { + return this.cost; } - public void setGraphQLTags(List tags) { - this.tags = tags; + public GraphQLTransitMode getGraphQLMode() { + return this.mode; + } + + public void setGraphQLCost(GraphQLTransitModePreferenceCostInput cost) { + this.cost = cost; + } + + public void setGraphQLMode(GraphQLTransitMode mode) { + this.mode = mode; } } - public static class GraphQLPatternAlertsArgs { + public static class GraphQLPlanTransitModesInput { - private List types; + private List access; + private List egress; + private List transfer; + private List transit; - public GraphQLPatternAlertsArgs(Map args) { + public GraphQLPlanTransitModesInput(Map args) { if (args != null) { - if (args.get("types") != null) { - this.types = - ((List) args.get("types")).stream() + if (args.get("access") != null) { + this.access = + ((List) args.get("access")).stream() .map(item -> - item instanceof GraphQLPatternAlertType + item instanceof GraphQLPlanAccessMode ? item - : GraphQLPatternAlertType.valueOf((String) item) + : GraphQLPlanAccessMode.valueOf((String) item) ) - .map(GraphQLPatternAlertType.class::cast) + .map(GraphQLPlanAccessMode.class::cast) + .collect(Collectors.toList()); + } + if (args.get("egress") != null) { + this.egress = + ((List) args.get("egress")).stream() + .map(item -> + item instanceof GraphQLPlanEgressMode + ? item + : GraphQLPlanEgressMode.valueOf((String) item) + ) + .map(GraphQLPlanEgressMode.class::cast) + .collect(Collectors.toList()); + } + if (args.get("transfer") != null) { + this.transfer = + ((List) args.get("transfer")).stream() + .map(item -> + item instanceof GraphQLPlanTransferMode + ? item + : GraphQLPlanTransferMode.valueOf((String) item) + ) + .map(GraphQLPlanTransferMode.class::cast) .collect(Collectors.toList()); } + if (args.get("transit") != null) { + this.transit = (List) args.get("transit"); + } } } - public List getGraphQLTypes() { - return this.types; + public List getGraphQLAccess() { + return this.access; } - public void setGraphQLTypes(List types) { - this.types = types; + public List getGraphQLEgress() { + return this.egress; } - } - - public static class GraphQLPatternTripsForDateArgs { - private String serviceDate; + public List getGraphQLTransfer() { + return this.transfer; + } - public GraphQLPatternTripsForDateArgs(Map args) { - if (args != null) { - this.serviceDate = (String) args.get("serviceDate"); - } + public List getGraphQLTransit() { + return this.transit; } - public String getGraphQLServiceDate() { - return this.serviceDate; + public void setGraphQLAccess(List access) { + this.access = access; } - public void setGraphQLServiceDate(String serviceDate) { - this.serviceDate = serviceDate; + public void setGraphQLEgress(List egress) { + this.egress = egress; } - } - /** Entities, which are relevant for a pattern and can contain alerts */ - public enum GraphQLPatternAlertType { - AGENCY, - PATTERN, - ROUTE, - ROUTE_TYPE, - STOPS_ON_PATTERN, - STOPS_ON_TRIPS, - TRIPS, - } + public void setGraphQLTransfer(List transfer) { + this.transfer = transfer; + } - public enum GraphQLPickupDropoffType { - CALL_AGENCY, - COORDINATE_WITH_DRIVER, - NONE, - SCHEDULED, + public void setGraphQLTransit(List transit) { + this.transit = transit; + } } public enum GraphQLPropulsionType { @@ -2146,44 +3244,186 @@ public void setGraphQLTransportModes(List transportMo this.transportModes = transportModes; } - public void setGraphQLTriangle(GraphQLInputTriangleInput triangle) { - this.triangle = triangle; + public void setGraphQLTriangle(GraphQLInputTriangleInput triangle) { + this.triangle = triangle; + } + + public void setGraphQLUnpreferred(GraphQLInputUnpreferredInput unpreferred) { + this.unpreferred = unpreferred; + } + + public void setGraphQLWaitAtBeginningFactor(Double waitAtBeginningFactor) { + this.waitAtBeginningFactor = waitAtBeginningFactor; + } + + public void setGraphQLWaitReluctance(Double waitReluctance) { + this.waitReluctance = waitReluctance; + } + + public void setGraphQLWalkBoardCost(Integer walkBoardCost) { + this.walkBoardCost = walkBoardCost; + } + + public void setGraphQLWalkOnStreetReluctance(Double walkOnStreetReluctance) { + this.walkOnStreetReluctance = walkOnStreetReluctance; + } + + public void setGraphQLWalkReluctance(Double walkReluctance) { + this.walkReluctance = walkReluctance; + } + + public void setGraphQLWalkSafetyFactor(Double walkSafetyFactor) { + this.walkSafetyFactor = walkSafetyFactor; + } + + public void setGraphQLWalkSpeed(Double walkSpeed) { + this.walkSpeed = walkSpeed; + } + + public void setGraphQLWheelchair(Boolean wheelchair) { + this.wheelchair = wheelchair; + } + } + + public static class GraphQLQueryTypePlanConnectionArgs { + + private String after; + private String before; + private GraphQLPlanDateTimeInput dateTime; + private GraphQLPlanLabeledLocationInput destination; + private Integer first; + private GraphQLPlanItineraryFilterInput itineraryFilter; + private Integer last; + private java.util.Locale locale; + private GraphQLPlanModesInput modes; + private Integer numberOfItineraries; + private GraphQLPlanLabeledLocationInput origin; + private GraphQLPlanPreferencesInput preferences; + private java.time.Duration searchWindow; + + public GraphQLQueryTypePlanConnectionArgs(Map args) { + if (args != null) { + this.after = (String) args.get("after"); + this.before = (String) args.get("before"); + this.dateTime = new GraphQLPlanDateTimeInput((Map) args.get("dateTime")); + this.destination = + new GraphQLPlanLabeledLocationInput((Map) args.get("destination")); + this.first = (Integer) args.get("first"); + this.itineraryFilter = + new GraphQLPlanItineraryFilterInput((Map) args.get("itineraryFilter")); + this.last = (Integer) args.get("last"); + this.locale = (java.util.Locale) args.get("locale"); + this.modes = new GraphQLPlanModesInput((Map) args.get("modes")); + this.numberOfItineraries = (Integer) args.get("numberOfItineraries"); + this.origin = new GraphQLPlanLabeledLocationInput((Map) args.get("origin")); + this.preferences = + new GraphQLPlanPreferencesInput((Map) args.get("preferences")); + this.searchWindow = (java.time.Duration) args.get("searchWindow"); + } + } + + public String getGraphQLAfter() { + return this.after; + } + + public String getGraphQLBefore() { + return this.before; + } + + public GraphQLPlanDateTimeInput getGraphQLDateTime() { + return this.dateTime; + } + + public GraphQLPlanLabeledLocationInput getGraphQLDestination() { + return this.destination; + } + + public Integer getGraphQLFirst() { + return this.first; + } + + public GraphQLPlanItineraryFilterInput getGraphQLItineraryFilter() { + return this.itineraryFilter; + } + + public Integer getGraphQLLast() { + return this.last; + } + + public java.util.Locale getGraphQLLocale() { + return this.locale; + } + + public GraphQLPlanModesInput getGraphQLModes() { + return this.modes; + } + + public Integer getGraphQLNumberOfItineraries() { + return this.numberOfItineraries; + } + + public GraphQLPlanLabeledLocationInput getGraphQLOrigin() { + return this.origin; + } + + public GraphQLPlanPreferencesInput getGraphQLPreferences() { + return this.preferences; + } + + public java.time.Duration getGraphQLSearchWindow() { + return this.searchWindow; + } + + public void setGraphQLAfter(String after) { + this.after = after; + } + + public void setGraphQLBefore(String before) { + this.before = before; + } + + public void setGraphQLDateTime(GraphQLPlanDateTimeInput dateTime) { + this.dateTime = dateTime; + } + + public void setGraphQLDestination(GraphQLPlanLabeledLocationInput destination) { + this.destination = destination; } - public void setGraphQLUnpreferred(GraphQLInputUnpreferredInput unpreferred) { - this.unpreferred = unpreferred; + public void setGraphQLFirst(Integer first) { + this.first = first; } - public void setGraphQLWaitAtBeginningFactor(Double waitAtBeginningFactor) { - this.waitAtBeginningFactor = waitAtBeginningFactor; + public void setGraphQLItineraryFilter(GraphQLPlanItineraryFilterInput itineraryFilter) { + this.itineraryFilter = itineraryFilter; } - public void setGraphQLWaitReluctance(Double waitReluctance) { - this.waitReluctance = waitReluctance; + public void setGraphQLLast(Integer last) { + this.last = last; } - public void setGraphQLWalkBoardCost(Integer walkBoardCost) { - this.walkBoardCost = walkBoardCost; + public void setGraphQLLocale(java.util.Locale locale) { + this.locale = locale; } - public void setGraphQLWalkOnStreetReluctance(Double walkOnStreetReluctance) { - this.walkOnStreetReluctance = walkOnStreetReluctance; + public void setGraphQLModes(GraphQLPlanModesInput modes) { + this.modes = modes; } - public void setGraphQLWalkReluctance(Double walkReluctance) { - this.walkReluctance = walkReluctance; + public void setGraphQLNumberOfItineraries(Integer numberOfItineraries) { + this.numberOfItineraries = numberOfItineraries; } - public void setGraphQLWalkSafetyFactor(Double walkSafetyFactor) { - this.walkSafetyFactor = walkSafetyFactor; + public void setGraphQLOrigin(GraphQLPlanLabeledLocationInput origin) { + this.origin = origin; } - public void setGraphQLWalkSpeed(Double walkSpeed) { - this.walkSpeed = walkSpeed; + public void setGraphQLPreferences(GraphQLPlanPreferencesInput preferences) { + this.preferences = preferences; } - public void setGraphQLWheelchair(Boolean wheelchair) { - this.wheelchair = wheelchair; + public void setGraphQLSearchWindow(java.time.Duration searchWindow) { + this.searchWindow = searchWindow; } } @@ -2772,6 +4012,146 @@ public enum GraphQLRoutingErrorCode { WALKING_BETTER_THAN_TRANSIT, } + public static class GraphQLScooterOptimizationInput { + + private GraphQLTriangleScooterFactorsInput triangle; + private GraphQLScooterOptimizationType type; + + public GraphQLScooterOptimizationInput(Map args) { + if (args != null) { + this.triangle = + new GraphQLTriangleScooterFactorsInput((Map) args.get("triangle")); + if (args.get("type") instanceof GraphQLScooterOptimizationType) { + this.type = (GraphQLScooterOptimizationType) args.get("type"); + } else { + this.type = GraphQLScooterOptimizationType.valueOf((String) args.get("type")); + } + } + } + + public GraphQLTriangleScooterFactorsInput getGraphQLTriangle() { + return this.triangle; + } + + public GraphQLScooterOptimizationType getGraphQLType() { + return this.type; + } + + public void setGraphQLTriangle(GraphQLTriangleScooterFactorsInput triangle) { + this.triangle = triangle; + } + + public void setGraphQLType(GraphQLScooterOptimizationType type) { + this.type = type; + } + } + + /** + * Predefined optimization alternatives for scooter routing. For more customization, + * one can use the triangle factors. + */ + public enum GraphQLScooterOptimizationType { + FLAT_STREETS, + SAFEST_STREETS, + SAFE_STREETS, + SHORTEST_DURATION, + } + + public static class GraphQLScooterPreferencesInput { + + private GraphQLScooterOptimizationInput optimization; + private Double reluctance; + private GraphQLScooterRentalPreferencesInput rental; + private Double speed; + + public GraphQLScooterPreferencesInput(Map args) { + if (args != null) { + this.optimization = + new GraphQLScooterOptimizationInput((Map) args.get("optimization")); + this.reluctance = (Double) args.get("reluctance"); + this.rental = + new GraphQLScooterRentalPreferencesInput((Map) args.get("rental")); + this.speed = (Double) args.get("speed"); + } + } + + public GraphQLScooterOptimizationInput getGraphQLOptimization() { + return this.optimization; + } + + public Double getGraphQLReluctance() { + return this.reluctance; + } + + public GraphQLScooterRentalPreferencesInput getGraphQLRental() { + return this.rental; + } + + public Double getGraphQLSpeed() { + return this.speed; + } + + public void setGraphQLOptimization(GraphQLScooterOptimizationInput optimization) { + this.optimization = optimization; + } + + public void setGraphQLReluctance(Double reluctance) { + this.reluctance = reluctance; + } + + public void setGraphQLRental(GraphQLScooterRentalPreferencesInput rental) { + this.rental = rental; + } + + public void setGraphQLSpeed(Double speed) { + this.speed = speed; + } + } + + public static class GraphQLScooterRentalPreferencesInput { + + private List allowedNetworks; + private List bannedNetworks; + private GraphQLDestinationScooterPolicyInput destinationScooterPolicy; + + public GraphQLScooterRentalPreferencesInput(Map args) { + if (args != null) { + this.allowedNetworks = (List) args.get("allowedNetworks"); + this.bannedNetworks = (List) args.get("bannedNetworks"); + this.destinationScooterPolicy = + new GraphQLDestinationScooterPolicyInput( + (Map) args.get("destinationScooterPolicy") + ); + } + } + + public List getGraphQLAllowedNetworks() { + return this.allowedNetworks; + } + + public List getGraphQLBannedNetworks() { + return this.bannedNetworks; + } + + public GraphQLDestinationScooterPolicyInput getGraphQLDestinationScooterPolicy() { + return this.destinationScooterPolicy; + } + + public void setGraphQLAllowedNetworks(List allowedNetworks) { + this.allowedNetworks = allowedNetworks; + } + + public void setGraphQLBannedNetworks(List bannedNetworks) { + this.bannedNetworks = bannedNetworks; + } + + public void setGraphQLDestinationScooterPolicy( + GraphQLDestinationScooterPolicyInput destinationScooterPolicy + ) { + this.destinationScooterPolicy = destinationScooterPolicy; + } + } + public static class GraphQLStopAlertsArgs { private List types; @@ -3133,6 +4513,99 @@ public void setGraphQLLanguage(String language) { } } + public static class GraphQLTimetablePreferencesInput { + + private Boolean excludeRealTimeUpdates; + private Boolean includePlannedCancellations; + private Boolean includeRealTimeCancellations; + + public GraphQLTimetablePreferencesInput(Map args) { + if (args != null) { + this.excludeRealTimeUpdates = (Boolean) args.get("excludeRealTimeUpdates"); + this.includePlannedCancellations = (Boolean) args.get("includePlannedCancellations"); + this.includeRealTimeCancellations = (Boolean) args.get("includeRealTimeCancellations"); + } + } + + public Boolean getGraphQLExcludeRealTimeUpdates() { + return this.excludeRealTimeUpdates; + } + + public Boolean getGraphQLIncludePlannedCancellations() { + return this.includePlannedCancellations; + } + + public Boolean getGraphQLIncludeRealTimeCancellations() { + return this.includeRealTimeCancellations; + } + + public void setGraphQLExcludeRealTimeUpdates(Boolean excludeRealTimeUpdates) { + this.excludeRealTimeUpdates = excludeRealTimeUpdates; + } + + public void setGraphQLIncludePlannedCancellations(Boolean includePlannedCancellations) { + this.includePlannedCancellations = includePlannedCancellations; + } + + public void setGraphQLIncludeRealTimeCancellations(Boolean includeRealTimeCancellations) { + this.includeRealTimeCancellations = includeRealTimeCancellations; + } + } + + public static class GraphQLTransferPreferencesInput { + + private org.opentripplanner.framework.model.Cost cost; + private Integer maximumAdditionalTransfers; + private Integer maximumTransfers; + private java.time.Duration slack; + + public GraphQLTransferPreferencesInput(Map args) { + if (args != null) { + this.cost = (org.opentripplanner.framework.model.Cost) args.get("cost"); + this.maximumAdditionalTransfers = (Integer) args.get("maximumAdditionalTransfers"); + this.maximumTransfers = (Integer) args.get("maximumTransfers"); + this.slack = (java.time.Duration) args.get("slack"); + } + } + + public org.opentripplanner.framework.model.Cost getGraphQLCost() { + return this.cost; + } + + public Integer getGraphQLMaximumAdditionalTransfers() { + return this.maximumAdditionalTransfers; + } + + public Integer getGraphQLMaximumTransfers() { + return this.maximumTransfers; + } + + public java.time.Duration getGraphQLSlack() { + return this.slack; + } + + public void setGraphQLCost(org.opentripplanner.framework.model.Cost cost) { + this.cost = cost; + } + + public void setGraphQLMaximumAdditionalTransfers(Integer maximumAdditionalTransfers) { + this.maximumAdditionalTransfers = maximumAdditionalTransfers; + } + + public void setGraphQLMaximumTransfers(Integer maximumTransfers) { + this.maximumTransfers = maximumTransfers; + } + + public void setGraphQLSlack(java.time.Duration slack) { + this.slack = slack; + } + } + + /** + * Transit modes include modes that are used within organized transportation networks + * run by public transportation authorities, taxi companies etc. + * Equivalent to GTFS route_type or to NeTEx TransportMode. + */ public enum GraphQLTransitMode { AIRPLANE, BUS, @@ -3150,6 +4623,86 @@ public enum GraphQLTransitMode { TROLLEYBUS, } + public static class GraphQLTransitModePreferenceCostInput { + + private org.opentripplanner.framework.model.Cost cost; + private Double reluctance; + + public GraphQLTransitModePreferenceCostInput(Map args) { + if (args != null) { + this.cost = (org.opentripplanner.framework.model.Cost) args.get("cost"); + this.reluctance = (Double) args.get("reluctance"); + } + } + + public org.opentripplanner.framework.model.Cost getGraphQLCost() { + return this.cost; + } + + public Double getGraphQLReluctance() { + return this.reluctance; + } + + public void setGraphQLCost(org.opentripplanner.framework.model.Cost cost) { + this.cost = cost; + } + + public void setGraphQLReluctance(Double reluctance) { + this.reluctance = reluctance; + } + } + + public static class GraphQLTransitPreferencesInput { + + private GraphQLAlightPreferencesInput alight; + private GraphQLBoardPreferencesInput board; + private GraphQLTimetablePreferencesInput timetable; + private GraphQLTransferPreferencesInput transfer; + + public GraphQLTransitPreferencesInput(Map args) { + if (args != null) { + this.alight = new GraphQLAlightPreferencesInput((Map) args.get("alight")); + this.board = new GraphQLBoardPreferencesInput((Map) args.get("board")); + this.timetable = + new GraphQLTimetablePreferencesInput((Map) args.get("timetable")); + this.transfer = + new GraphQLTransferPreferencesInput((Map) args.get("transfer")); + } + } + + public GraphQLAlightPreferencesInput getGraphQLAlight() { + return this.alight; + } + + public GraphQLBoardPreferencesInput getGraphQLBoard() { + return this.board; + } + + public GraphQLTimetablePreferencesInput getGraphQLTimetable() { + return this.timetable; + } + + public GraphQLTransferPreferencesInput getGraphQLTransfer() { + return this.transfer; + } + + public void setGraphQLAlight(GraphQLAlightPreferencesInput alight) { + this.alight = alight; + } + + public void setGraphQLBoard(GraphQLBoardPreferencesInput board) { + this.board = board; + } + + public void setGraphQLTimetable(GraphQLTimetablePreferencesInput timetable) { + this.timetable = timetable; + } + + public void setGraphQLTransfer(GraphQLTransferPreferencesInput transfer) { + this.transfer = transfer; + } + } + public static class GraphQLTransportModeInput { private GraphQLMode mode; @@ -3187,6 +4740,84 @@ public void setGraphQLQualifier(GraphQLQualifier qualifier) { } } + public static class GraphQLTriangleCyclingFactorsInput { + + private Double flatness; + private Double safety; + private Double time; + + public GraphQLTriangleCyclingFactorsInput(Map args) { + if (args != null) { + this.flatness = (Double) args.get("flatness"); + this.safety = (Double) args.get("safety"); + this.time = (Double) args.get("time"); + } + } + + public Double getGraphQLFlatness() { + return this.flatness; + } + + public Double getGraphQLSafety() { + return this.safety; + } + + public Double getGraphQLTime() { + return this.time; + } + + public void setGraphQLFlatness(Double flatness) { + this.flatness = flatness; + } + + public void setGraphQLSafety(Double safety) { + this.safety = safety; + } + + public void setGraphQLTime(Double time) { + this.time = time; + } + } + + public static class GraphQLTriangleScooterFactorsInput { + + private Double flatness; + private Double safety; + private Double time; + + public GraphQLTriangleScooterFactorsInput(Map args) { + if (args != null) { + this.flatness = (Double) args.get("flatness"); + this.safety = (Double) args.get("safety"); + this.time = (Double) args.get("time"); + } + } + + public Double getGraphQLFlatness() { + return this.flatness; + } + + public Double getGraphQLSafety() { + return this.safety; + } + + public Double getGraphQLTime() { + return this.time; + } + + public void setGraphQLFlatness(Double flatness) { + this.flatness = flatness; + } + + public void setGraphQLSafety(Double safety) { + this.safety = safety; + } + + public void setGraphQLTime(Double time) { + this.time = time; + } + } + public static class GraphQLTripAlertsArgs { private List types; @@ -3408,9 +5039,77 @@ public enum GraphQLVertexType { TRANSIT, } + public static class GraphQLWalkPreferencesInput { + + private org.opentripplanner.framework.model.Cost boardCost; + private Double reluctance; + private Double speed; + private Double walkSafetyFactor; + + public GraphQLWalkPreferencesInput(Map args) { + if (args != null) { + this.boardCost = (org.opentripplanner.framework.model.Cost) args.get("boardCost"); + this.reluctance = (Double) args.get("reluctance"); + this.speed = (Double) args.get("speed"); + this.walkSafetyFactor = (Double) args.get("walkSafetyFactor"); + } + } + + public org.opentripplanner.framework.model.Cost getGraphQLBoardCost() { + return this.boardCost; + } + + public Double getGraphQLReluctance() { + return this.reluctance; + } + + public Double getGraphQLSpeed() { + return this.speed; + } + + public Double getGraphQLWalkSafetyFactor() { + return this.walkSafetyFactor; + } + + public void setGraphQLBoardCost(org.opentripplanner.framework.model.Cost boardCost) { + this.boardCost = boardCost; + } + + public void setGraphQLReluctance(Double reluctance) { + this.reluctance = reluctance; + } + + public void setGraphQLSpeed(Double speed) { + this.speed = speed; + } + + public void setGraphQLWalkSafetyFactor(Double walkSafetyFactor) { + this.walkSafetyFactor = walkSafetyFactor; + } + } + public enum GraphQLWheelchairBoarding { NOT_POSSIBLE, NO_INFORMATION, POSSIBLE, } + + public static class GraphQLWheelchairPreferencesInput { + + private Boolean enabled; + + public GraphQLWheelchairPreferencesInput(Map args) { + if (args != null) { + this.enabled = (Boolean) args.get("enabled"); + } + } + + public Boolean getGraphQLEnabled() { + return this.enabled; + } + + public void setGraphQLEnabled(Boolean enabled) { + this.enabled = enabled; + } + } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index c141266d2e6..ccc33e2617b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -27,6 +27,14 @@ config: GeoJson: org.locationtech.jts.geom.Geometry Grams: org.opentripplanner.framework.model.Grams Duration: java.time.Duration + Cost: org.opentripplanner.framework.model.Cost + CoordinateValue: Double + Locale: java.util.Locale + OffsetDateTime: java.time.OffsetDateTime + Speed: Double + Reluctance: Double + Ratio: Double + mappers: AbsoluteDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAbsoluteDirection#GraphQLAbsoluteDirection Agency: org.opentripplanner.transit.model.organization.Agency#Agency @@ -70,6 +78,9 @@ config: placeAtDistanceConnection: graphql.relay.Connection#Connection placeAtDistanceEdge: graphql.relay.Edge#Edge Plan: graphql.execution.DataFetcherResult + PlanConnection: graphql.relay.Connection#Connection + PlanEdge: graphql.relay.Edge#Edge + PlanLocation: org.opentripplanner.apis.gtfs.model.PlanLocation#PlanLocation RealtimeState: String RelativeDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection#GraphQLRelativeDirection Route: org.opentripplanner.transit.model.network.Route#Route diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java new file mode 100644 index 00000000000..d7d80f12687 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java @@ -0,0 +1,12 @@ +package org.opentripplanner.apis.gtfs.model; + +import graphql.TypeResolutionEnvironment; +import graphql.schema.GraphQLObjectType; +import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; + +public interface PlanLocation extends GraphQLDataFetchers.GraphQLPlanLocation { + @Override + default GraphQLObjectType getType(TypeResolutionEnvironment env) { + return null; + } +} From e3b97a8bdedeec8cb4ce6da7ba7206d39999b9cd Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 9 Feb 2024 16:46:01 +0200 Subject: [PATCH 0545/1688] Fix copypaste naming mistake --- .../street/service/StreetLimitationParametersServiceModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java b/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java index 48552ed3ea3..b9cd8aa6abe 100644 --- a/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java +++ b/src/main/java/org/opentripplanner/street/service/StreetLimitationParametersServiceModule.java @@ -14,7 +14,7 @@ public class StreetLimitationParametersServiceModule { @Provides @Singleton - public StreetLimitationParametersService provideEmissionsService( + public StreetLimitationParametersService provideStreetLimitationParametersService( StreetLimitationParameters streetLimitationParameters ) { return new DefaultStreetLimitationParametersService(streetLimitationParameters) {}; From 198a1966b7195138cc2b6f735fcb1768ae802160 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 9 Feb 2024 16:59:25 +0200 Subject: [PATCH 0546/1688] Make streetLimitationParameter nonnull in OsmModule --- .../graph_builder/module/osm/OsmModule.java | 11 +++++------ .../graph_builder/module/osm/OsmModuleBuilder.java | 2 +- .../java/org/opentripplanner/ConstantsForTests.java | 7 +------ .../graph_builder/module/osm/OsmModuleTest.java | 7 +------ 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index 44133624ac1..0685b739c7e 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -7,7 +7,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.annotation.Nullable; +import java.util.Objects; +import javax.annotation.Nonnull; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; @@ -63,7 +64,7 @@ public class OsmModule implements GraphBuilderModule { Collection providers, Graph graph, DataImportIssueStore issueStore, - @Nullable StreetLimitationParameters streetLimitationParameters, + @Nonnull StreetLimitationParameters streetLimitationParameters, OsmProcessingParameters params ) { this.providers = List.copyOf(providers); @@ -73,7 +74,7 @@ public class OsmModule implements GraphBuilderModule { this.osmdb = new OsmDatabase(issueStore); this.vertexGenerator = new VertexGenerator(osmdb, graph, params.boardingAreaRefTags()); this.normalizer = new SafetyValueNormalizer(graph, issueStore); - this.streetLimitationParameters = streetLimitationParameters; + this.streetLimitationParameters = Objects.requireNonNull(streetLimitationParameters); } public static OsmModuleBuilder of(Collection providers, Graph graph) { @@ -99,9 +100,7 @@ public void buildGraph() { LOG.info("Building street graph from OSM"); build(); graph.hasStreets = true; - if (streetLimitationParameters != null) { - streetLimitationParameters.initMaxCarSpeed(getMaxCarSpeed()); - } + streetLimitationParameters.initMaxCarSpeed(getMaxCarSpeed()); } @Override diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java index 144399d81f6..f0a40fa678f 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModuleBuilder.java @@ -25,7 +25,7 @@ public class OsmModuleBuilder { private boolean staticParkAndRide = false; private boolean staticBikeParkAndRide = false; private int maxAreaNodes; - private StreetLimitationParameters streetLimitationParameters; + private StreetLimitationParameters streetLimitationParameters = new StreetLimitationParameters(); OsmModuleBuilder(Collection providers, Graph graph) { this.providers = providers; diff --git a/src/test/java/org/opentripplanner/ConstantsForTests.java b/src/test/java/org/opentripplanner/ConstantsForTests.java index 53b2bf9b396..e74c66e527b 100644 --- a/src/test/java/org/opentripplanner/ConstantsForTests.java +++ b/src/test/java/org/opentripplanner/ConstantsForTests.java @@ -38,7 +38,6 @@ import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; import org.opentripplanner.standalone.config.BuildConfig; import org.opentripplanner.standalone.config.OtpConfigLoader; -import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.TraverseModeSet; import org.opentripplanner.test.support.ResourceLoader; @@ -133,7 +132,6 @@ public static TestOtpModel buildNewPortlandGraph(boolean withElevation) { .of(osmProvider, graph) .withStaticParkAndRide(true) .withStaticBikeParkAndRide(true) - .withStreetLimitationParameters(new StreetLimitationParameters()) .build(); osmModule.buildGraph(); } @@ -174,10 +172,7 @@ public static TestOtpModel buildOsmGraph(File osmFile) { var transitModel = new TransitModel(stopModel, deduplicator); // Add street data from OSM OsmProvider osmProvider = new OsmProvider(osmFile, true); - OsmModule osmModule = OsmModule - .of(osmProvider, graph) - .withStreetLimitationParameters(new StreetLimitationParameters()) - .build(); + OsmModule osmModule = OsmModule.of(osmProvider, graph).build(); osmModule.buildGraph(); return new TestOtpModel(graph, transitModel); } catch (Exception e) { diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java index 99ac1554134..091652a2dbf 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/osm/OsmModuleTest.java @@ -33,7 +33,6 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.impl.GraphPathFinder; -import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.vertex.BarrierVertex; @@ -357,11 +356,7 @@ private void testBuildingAreas(boolean skipVisibility) { File file = RESOURCE_LOADER.file("usf_area.osm.pbf"); OsmProvider provider = new OsmProvider(file, false); - OsmModule loader = OsmModule - .of(provider, graph) - .withAreaVisibility(!skipVisibility) - .withStreetLimitationParameters(new StreetLimitationParameters()) - .build(); + OsmModule loader = OsmModule.of(provider, graph).withAreaVisibility(!skipVisibility).build(); loader.buildGraph(); From d2f1a794c11f0c9c5d80c048cc06593f56baacac Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 10 Feb 2024 19:58:12 +0800 Subject: [PATCH 0547/1688] add documentation page about OTP frontends --- docs/Frontends.md | 76 ++++++++++++++++++++++++++++++++++++++++++++ docs/README-DOCS.txt | 2 ++ mkdocs.yml | 1 + 3 files changed, 79 insertions(+) create mode 100644 docs/Frontends.md diff --git a/docs/Frontends.md b/docs/Frontends.md new file mode 100644 index 00000000000..7ad318b599c --- /dev/null +++ b/docs/Frontends.md @@ -0,0 +1,76 @@ +# Frontends (User Interfaces) for OpenTripPlanner + +## Introduction + +OpenTripPlanner is a client-server system. A backend service written in Java is accessed over an API by some client software, which is generally embedded in a web page or a mobile app. When OpenTripPlanner developers refer to OpenTripPlanner or OTP, they often specifically mean the Java backend service. But for this service to be useful to end users who want to plan their journeys, you will typically also want to deploy a user interface as well as a few other components providing mapping capabilities and address lookup functionality. + +For the purposes of this document and in many OpenTripPlanner development discussions, the terms frontend, UI, and client will be used interchangeably. In reality many kinds of clients are possible, not all of them being user interfaces (UIs). The OpenTripPlanner API may be called by various scripts and microservices, potentially all within what would traditionally be called a "backend" with no user interface at all. For example, updates to trip plans could be requested, summarized and sent as text messages over a mobile network. But in this documentation page, we are exclusively talking about graphical user interfaces, usually written in Javascript for execution and display in web browsers. + +## Two Kinds of Frontends + +Broadly speaking there are two kinds of frontends for OTP: debug frontends and production frontends. + +**Debug frontends** are included in the main OpenTripPlanner repository, and are intended to work "out of the box" with little to no configuration. They are served by OTP itself or a simple local web server, or set up such that a single deployment is usable by anyone via a content delivery network (CDN). The primary purpose of debug frontends is to allow OTP developers (as well as people evaluating OpenTripPlanner for their organization) to observe, test, and debug an OTP instance they're working on. Debug frontends will expose some internal details of OTP operation such as graph nodes and edges, traversal permissions, or transit data entity identifiers. Their primary role is as a development and deployment tool. + +On the other hand, **production frontends** are intended to be a component of larger public-facing deployments of OTP, with a more polished appearance and user experience. They generally do not work "out of the box", and require a significant amount of configuration and coordination with external components such as map tile servers and geocoders. They are designed to be components of a large professionally maintained and managed OTP deployment, and present a simpler view of OpenTripPlanner options and results to a non-technical audience of end users. + +## Debug Frontends + +The main OpenTripPlanner repository currently contains two debug web frontends: the original one in [`/src/client`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/src/client) and a newer one currently under development at [`/client-next`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/client-next). + +The **original debug client** is a jQuery and Backbone based UI whose history can be traced back over a decade to the first days of the OTP project. It connects to the OTP Java backend via a REST API using the GTFS vocabulary. Historically this was the default OTP interface, and it continues to be available by default on any running OTP instance at the root URL. + +The **new debug client** is a React/TypeScript Single Page App (SPA) that can be served locally or accessed over a content delivery network (CDN). Unlike the original debug client, it connects to the OTP Java backend via the GraphQL API using the Transmodel vocabulary. It is currently under development, but expected to replace the original debug client once it reaches effective feature parity. + +There is a third piece of software that might qualify as an OTP client: a Java Swing application making use of the Processing visualization library, located in the [GraphVisualizer class](https://github.com/opentripplanner/OpenTripPlanner/blob/dev-2.x/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java). While it would not be accurate to call this a "native" desktop application (as it's cross-platform Java) it is not a web app. This very developer-centric UI is also over a decade old and has been very sparsely maintained, but continues to exist because it can visualize the progress of searches through the street network, providing some insight into the internals of the routing algorithms that are not otherwise visible. + +## Working with Debug Frontends + +While the "classic" (i.e. old) debug frontend is enabled by default as of this writing, it may not be in the future, or you may wish to disable it if you've chosen to use a different frontend. Also, to get full use of the existing debug frontends you may want to enable OTP's built-in simple testing geocoder which performs fuzzy searches for transit stops by name, supplying their coordinates to the routing engine. Without it, you will be limited to origins and destinations selected on a map or specified in terms of latitude and longitude coordinates. The debug frontend and the geocoder can be toggled in `otp-config.json`: + +```json5 +// otp-config.json +{ + "otpFeatures": { + "DebugClient": true, + "SandboxAPIGeocoder": true + } +} +``` + +## Production Frontends + +Many different production OTP frontends exist. Any number of agencies and consultancies may have built new frontends, whether in Javascript or as native mobile apps, without the OpenTripPlanner development team even being aware of them. + +That said, there are two main Javascript-based web user interfaces that are generally recommended by members of the OTP development team who also work on professional, public-facing OpenTripPlanner deployments: +- The [Digitransit UI](https://github.com/HSLdevcom/digitransit-ui), part of the Finnish Digitransit project. +- The [OpenTripPlanner React UI](https://github.com/opentripplanner/otp-react-redux), developed and maintained by [Arcadis IBI](https://www.ibigroup.com)'s [transit routing team](https://www.ibigroup.com/ibi-products/transit-routing/). + +**Digitransit** is an open-source public transportation project, originally created in Finland to replace existing nationwide and regional journey planning solutions in 2014. Digitransit has since been used around the world in other projects, for example in Germany. It is a joint project of Helsinki Transit Authority (HSL), Fintraffic, and Waltti Solutions. + +**Arcadis IBI** has for several years actively developed, deployed, and maintained instances of the React-based OTP UI, systematically contributing their improvements back to the original repositories under the OpenTripPlanner organization: +- https://github.com/opentripplanner/otp-ui +- https://github.com/opentripplanner/otp-react-redux + +Both major frontend projects mentioned above support internationalization and have several translations already available. + +## Deploying a Production Frontend + +Deploying a full OpenTripPlanner-based system including a web UI can be quite complex, as there are many "moving parts". Such a system needs to remain responsive and function smoothly under load that varies wildly from one time of day to another, constantly refresh input data, and meet customer expectations in recognizing addresses and names of landmarks etc. Because deployment and management of such a system demands long term commitment by a professional team with sufficient experience and knowledge about the component parts, the major production frontend projects do not really aim to work "out of the box". There's a working assumption that they'll be actively customized for any large regional deployment. + +This understandably creates a bit of a barrier for organizations evaluating such components. Please don't hesitate to join the OpenTripPlanner Gitter chat and ask if you need any information on this subject. Several organizations that manage multiple large OTP deployments are active there and will be happy to engage with you. + +While you are welcome to stand up an instance of one of these UIs for testing or evaluation, and there has been some effort to make this more straightforward especially on the Arcadis IBI projects, it is still strongly recommended to collaborate with a specialist. The process of tailoring a deployment to a specific region and deployment environment is estimated to take at least several full days even for an experienced professional, and while it may start off looking deceptively simple, can rapidly grow into a seemingly never-ending project for those who are not aware of hidden pitfalls. The goal here is not by any means to discourage you from using or learning about any of these projects, but to set expectations that the process will be much smoother if you work with someone who's done it before. + +If you do decide to take on this task, be aware that both of these systems rely on multiple additional backend services other than the OTP Java backend. To get either one working, you will need to configure a source of map tiles and a geocoder that translates geographic names to latitude and longitude coordinates, among other components. + +## Historical Background + +The history of the more widely used OpenTripPlanner interfaces is roughly as follows: + +- From the beginning, OpenTripPlanner included a Javascript UI module. This jQuery and Backbone based UI was deployed as the main interface in several locations in the early to mid 2010s. +- As of early 2024, this UI is still present in the main OpenTripPlanner repository under `src/client`, but is not intended for use by the general public. It has long been regarded as a "debug" UI, serving as a built-in, readily available and familiar interface for OTP developers to test and debug the behavior of the backend. It uses the older OTP REST API which is slated for deprecation. +- In the late 2010s people started developing a new React-based UI as a more modular, modern interface for public consumption. This project is located at https://github.com/opentripplanner/otp-react-redux under the OpenTripPlanner Github organization, and is developed and maintainted by Arcadis IBI. +- Some React components were factored out of that UI project, allowing them to be integrated in different ways with different OTP deployments. This component library is in a separate repository at https://github.com/opentripplanner/otp-ui. Likewise, it is developed and maintained by Arcadis IBI. +- Meanwhile, starting in 2014, HSL (the Helsinki transit authority) and Finntrafic (the Finnish national transportation authority) began the Digitransit project, a set of open-source microservices to replace their existing national and regional scale trip planners. This includes a Javascript web UI module. In addition to Finland, the Digitransit system has been deployed in various places around the world including Germany. +- As of 2024, a completely new debug UI (again, intended for developer use rather than public consumption) is being developed in the main OpenTripPlanner repository under `src/debug-client-preview`. This new UI follows a more conventional contemporary Javascript development style, and uses the most recent OpenTripPlanner GraphQL API which is expected to fully replace the older REST API. diff --git a/docs/README-DOCS.txt b/docs/README-DOCS.txt index 3450a616124..52f7aa1a62d 100644 --- a/docs/README-DOCS.txt +++ b/docs/README-DOCS.txt @@ -8,3 +8,5 @@ In short, to preview the documentation as you work on it: $ pip install -r docs/requirements.txt $ mkdocs serve + +If you create any new documentation pages, be sure to update the `nav:` section of `mkdocs.yml` in the root of the repository to ensure that your page is included in the table of contents and documentation navigation tree. diff --git a/mkdocs.yml b/mkdocs.yml index e4341b296fc..82646fafb1c 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -64,6 +64,7 @@ nav: - Netex and SIRI: 'Netex-Norway.md' - Troubleshooting: 'Troubleshooting-Routing.md' - Comparing OTP2 to OTP1: 'Version-Comparison.md' + - Frontends: 'Frontends.md' - APIs: - Introduction: 'apis/Apis.md' - GraphQL Tutorial: 'apis/GraphQL-Tutorial.md' From ffd8828b93b4fb552b1c4770fa2ab4e26ebfbeb9 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 10 Feb 2024 20:14:15 +0800 Subject: [PATCH 0548/1688] update overview and accessibility docs --- docs/Accessibility.md | 21 +++++++++++++++++---- docs/Product-Overview.md | 7 ++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/docs/Accessibility.md b/docs/Accessibility.md index cc45a56d776..eed127bbe58 100644 --- a/docs/Accessibility.md +++ b/docs/Accessibility.md @@ -2,10 +2,23 @@ ## Preamble -GTFS and Netex define accessibility primarily in terms of binary access for wheelchair users: it's -either on or off. Whilst it is the desire of the OTP developers to broaden the scope of -accessibility the lack of data limits us to use this definition in the implementation and in this -document. +In this document and in OTP, the term "accessibility" is used with what has become its most common +meaning: design of products, devices, services, vehicles, or environments to ensure they are usable by +people with disabilities. It has other meanings in other contexts (see below). +While accessibility is a complex subject, at this point GTFS and Netex mostly represent it very +simply as a yes/no possibility of wheelchair use. While OTP developers hope to broaden the +scope and nuance of accessibility support in OTP, the lack of detailed data from data producers +currently limits implementation and discussion in this document to this binary +"wheelchair accessible" definition. + +The term "accessibility" has a completely separate, unrelated definition in the fields of +spatial analysis, urban transportation planning, and associated social sciences, where it refers to +quantitative indicators of how well-connected a particular location is to people or opportunities. +OpenTripPlanner has been widely used in research settings for the calculation of such accessibility +indicators. If this is what you're looking for, see the [documentation section on isochrones](sandbox/TravelTime.md). +Although this meaning of the term dates back many decades, it is less well known and has become a +source of confusion, so the academic and planning communities are gradually shifting to the +expression "access to opportunities", often shortened to "access". ## Unknown data diff --git a/docs/Product-Overview.md b/docs/Product-Overview.md index cbf9dc3a1b8..dc0cfcc25a1 100644 --- a/docs/Product-Overview.md +++ b/docs/Product-Overview.md @@ -3,8 +3,9 @@ ## OpenTripPlanner project OpenTripPlanner is a group of open source software applications that help individuals and organizations -calculate and deliver multimodal trip plans based on OpenStreetMap (OSM) and other standardized data -sources (e.g. GTFS, GBFS, NeTEx). +calculate and deliver multimodal trip plans based on a combination of open-standard data sources. +These include public transit services and schedules (GTFS and NeTEx) and OpenStreetMap (OSM), as +well as sources describing bicycle sharing or rental, ride hailing, and other services (e.g. GBFS). A community of dozens of individuals and organizations work on OpenTripPlanner collaboratively to improve multimodal trip planning best practices and to make it easier for public transit agencies and @@ -12,7 +13,7 @@ public transit riders to publish and access information about transit services. OpenTripPlanner deployments are locally managed in many different ways by many different types of organizations. OpenTripPlanner consistently and dependably delivers multimodal trip plans to millions of riders -everyday in dozens of countries around the globe. The project is actively maintained by the community, +every day in dozens of countries around the globe. The project is actively maintained by the community, with more than 50 commits most weeks during 2022, and 20 different developers having made 50 or more commits during the life of the project. From 28dd158615056b47160593122f56e2e4f1d5d0dc Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 10 Feb 2024 20:35:13 +0800 Subject: [PATCH 0549/1688] add link to analysis section --- docs/Accessibility.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Accessibility.md b/docs/Accessibility.md index eed127bbe58..c5820facc40 100644 --- a/docs/Accessibility.md +++ b/docs/Accessibility.md @@ -15,7 +15,7 @@ The term "accessibility" has a completely separate, unrelated definition in the spatial analysis, urban transportation planning, and associated social sciences, where it refers to quantitative indicators of how well-connected a particular location is to people or opportunities. OpenTripPlanner has been widely used in research settings for the calculation of such accessibility -indicators. If this is what you're looking for, see the [documentation section on isochrones](sandbox/TravelTime.md). +indicators. If this is what you're looking for, see the documentation sections [on isochrones](sandbox/TravelTime.md) and [analysis](Version-Comparison.md/#analysis). Although this meaning of the term dates back many decades, it is less well known and has become a source of confusion, so the academic and planning communities are gradually shifting to the expression "access to opportunities", often shortened to "access". From 4197aed06d652c52aa2667cb3e9618f91560f260 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 11 Feb 2024 22:24:06 +0100 Subject: [PATCH 0550/1688] Set transit delay --- .../apis/gtfs/GraphQLIntegrationTest.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index d89afea6f9d..4ce1c181f97 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -52,6 +52,7 @@ import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.RelativeDirection; import org.opentripplanner.model.plan.ScheduledTransitLeg; +import org.opentripplanner.model.plan.ScheduledTransitLegBuilder; import org.opentripplanner.model.plan.WalkStep; import org.opentripplanner.model.plan.WalkStepBuilder; import org.opentripplanner.routing.alertpatch.AlertCause; @@ -61,7 +62,6 @@ import org.opentripplanner.routing.alertpatch.TimePeriod; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.api.request.RouteRequest; -import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.GraphFinder; import org.opentripplanner.routing.graphfinder.NearbyStop; @@ -86,6 +86,7 @@ import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.RealTimeTripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; @@ -179,6 +180,23 @@ static void setup() { .carHail(D10m, E) .build(); + i1.transformTransitLegs(tl -> { + if(tl instanceof ScheduledTransitLeg stl){ + var x= new ScheduledTransitLegBuilder<>(stl); + var rtt = (RealTimeTripTimes) stl.getTripTimes(); + + for(var i=0; i < rtt.getNumStops();i++){ + + var time = rtt.getArrivalTime(i); + rtt.updateArrivalTime(i, time + 10*60); + + } + return x.withTripTimes(rtt).build(); + + } + else return tl; + }); + var busLeg = i1.getTransitLeg(1); var railLeg = (ScheduledTransitLeg) i1.getTransitLeg(2); From 0159b8d6851b3e26b9edd0c9e1476bcdc9a697f3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 12 Feb 2024 10:36:38 +0200 Subject: [PATCH 0551/1688] Remove duplicate issue store entry and adjust minimum speed limit --- .../issues/StreetCarSpeedZero.java | 19 ------------------- .../graph_builder/module/osm/OsmModule.java | 5 ----- .../wayproperty/WayPropertySet.java | 6 +++--- 3 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/graph_builder/issues/StreetCarSpeedZero.java diff --git a/src/main/java/org/opentripplanner/graph_builder/issues/StreetCarSpeedZero.java b/src/main/java/org/opentripplanner/graph_builder/issues/StreetCarSpeedZero.java deleted file mode 100644 index 1107486af97..00000000000 --- a/src/main/java/org/opentripplanner/graph_builder/issues/StreetCarSpeedZero.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.opentripplanner.graph_builder.issues; - -import org.opentripplanner.graph_builder.issue.api.DataImportIssue; -import org.opentripplanner.openstreetmap.model.OSMWithTags; - -public record StreetCarSpeedZero(OSMWithTags entity) implements DataImportIssue { - private static final String FMT = "Way %s has car speed zero"; - private static final String HTMLFMT = "Way '%s' has car speed zero"; - - @Override - public String getMessage() { - return String.format(FMT, entity.getId()); - } - - @Override - public String getHTMLMessage() { - return String.format(HTMLFMT, entity.url(), entity.getId()); - } -} diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index 0685b739c7e..a365d2dc3eb 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -548,11 +548,6 @@ private StreetEdge getEdgeForStreet( seb.withBogusName(true); } - // < 0.04: account for - if (carSpeed < 0.04) { - issueStore.add(new StreetCarSpeedZero(way)); - } - StreetEdge street = seb.buildAndConnect(); params.edgeNamer().recordEdge(way, street); diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java index f3be186f917..004bb5d5b0f 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java +++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java @@ -240,10 +240,10 @@ public float getCarSpeedForWay(OSMWithTags way, boolean backward) { getMetersSecondFromSpeed(way.getTag("maxspeed")); if (speed != null) { - // Too low or too high speed limit indicates an error in the data, we use default speed - // limits for the way type in that case. + // Too low (less than 5 km/h or too high speed limit indicates an error in the data, + // we use default speed limits for the way type in that case. // The small epsilon is to account for possible rounding errors. - if (speed < 0.0001 || speed > maxPossibleCarSpeed + 0.0001) { + if (speed < 1.387 || speed > maxPossibleCarSpeed + 0.0001) { var id = way.getId(); var link = way.url(); issueStore.add( From e5d58062ccc7d60d3e232b293b1910a5a28f6d08 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 12 Feb 2024 10:39:11 +0200 Subject: [PATCH 0552/1688] Fix comment --- .../openstreetmap/wayproperty/WayPropertySet.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java index 004bb5d5b0f..9a414a56080 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java +++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySet.java @@ -240,7 +240,7 @@ public float getCarSpeedForWay(OSMWithTags way, boolean backward) { getMetersSecondFromSpeed(way.getTag("maxspeed")); if (speed != null) { - // Too low (less than 5 km/h or too high speed limit indicates an error in the data, + // Too low (less than 5 km/h) or too high speed limit indicates an error in the data, // we use default speed limits for the way type in that case. // The small epsilon is to account for possible rounding errors. if (speed < 1.387 || speed > maxPossibleCarSpeed + 0.0001) { From f4ffb4fabc321b61711d96669ec79fd48a8db8dc Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 12 Feb 2024 10:47:38 +0200 Subject: [PATCH 0553/1688] Remove import --- .../org/opentripplanner/graph_builder/module/osm/OsmModule.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index a365d2dc3eb..b279a4088f0 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -17,7 +17,6 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.graph_builder.issues.StreetCarSpeedZero; import org.opentripplanner.graph_builder.model.GraphBuilderModule; import org.opentripplanner.graph_builder.module.osm.parameters.OsmProcessingParameters; import org.opentripplanner.openstreetmap.OsmProvider; From edac0d0ed2f9280c9a905ba417f2e69780fb7445 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 12 Feb 2024 10:18:01 +0100 Subject: [PATCH 0554/1688] Apply review feedback --- .../org/opentripplanner/gtfs/mapping/StopAreaMapper.java | 5 ++--- .../org/opentripplanner/gtfs/mapping/StopTimeMapper.java | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java index b3362cd7b6f..55c836aa458 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java @@ -15,10 +15,9 @@ /** * For a while GTFS Flex location groups were replaced by GTFS Fares v2 stop areas. After a few - * months, this decision was reverted and a new style of location groups we re-added to the Flex + * months, this decision was reverted and a new style of location groups were re-added to the Flex * spec. - *

      - * Arcadis tooling still produces stop areas and for a while we will support both. Please don't rely + * @deprecated Arcadis tooling still produces stop areas and for a while we will support both. Please don't rely * on this as the class will be removed in the future! */ @Deprecated diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index 211b891a8cf..fc75236f4e4 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -71,7 +71,7 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) { case Stop stop -> lhs.setStop(stopMapper.map(stop)); case Location location -> lhs.setStop(locationMapper.map(location)); case LocationGroup locGroup -> lhs.setStop(locationGroupMapper.map(locGroup)); - // only here for backwards compatibility, this will be removed in the future + // TODO: only here for backwards compatibility, this will be removed in the future case StopArea area -> lhs.setStop(stopAreaMapper.map(area)); default -> throw new IllegalArgumentException( "Unknown location type: %s".formatted(stopLocation) From 03f9f28d05a79b80c31a8fe571faafb2d46a592e Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 12 Feb 2024 12:54:10 +0200 Subject: [PATCH 0555/1688] Add @oneOf back to schema and don't use it for optimization inputs @oneOf can't be used if we want to set default values for input fields --- .../apis/gtfs/generated/GraphQLTypes.java | 2 ++ .../opentripplanner/apis/gtfs/schema.graphqls | 31 +++++++++++++++---- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index c528f023cdf..238490ea304 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -618,6 +618,7 @@ public enum GraphQLCyclingOptimizationType { SAFEST_STREETS, SAFE_STREETS, SHORTEST_DURATION, + TRIANGLE, } public static class GraphQLDepartureRowStoptimesArgs { @@ -4055,6 +4056,7 @@ public enum GraphQLScooterOptimizationType { SAFEST_STREETS, SAFE_STREETS, SHORTEST_DURATION, + TRIANGLE, } public static class GraphQLScooterPreferencesInput { diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 8dcae649bd6..07d8c9a0c30 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -8,6 +8,11 @@ This is only worth it when the execution is long running, i.e. more than ~50 mil """ directive @async on FIELD_DEFINITION +""" +Exactly one of the fields on an input object must be set and non-null while all others are omitted. +""" +directive @oneOf on INPUT_OBJECT + schema { query: QueryType } @@ -3011,14 +3016,15 @@ type BookingInfo { """ What criteria should be used when optimizing a cycling route. """ -input CyclingOptimizationInput @oneOf { +input CyclingOptimizationInput { """ Use one of the predefined optimization types. """ - type: CyclingOptimizationType + type: CyclingOptimizationType! """ - Define optimization by weighing three criteria. + Define optimization by weighing three criteria. This should only be used when + optimization type is `TRIANGLE`. """ triangle: TriangleCyclingFactorsInput } @@ -3055,19 +3061,26 @@ enum CyclingOptimizationType { by taking into account road surface etc. This option was previously called `GREENWAYS`. """ SAFEST_STREETS + + """ + Allows more fine-tuned configuration of how much different optimization criteria are considered in + routing. If this is defined, `triangle` values should be set as well. + """ + TRIANGLE } """ What criteria should be used when optimizing a scooter route. """ -input ScooterOptimizationInput @oneOf { +input ScooterOptimizationInput { """ Use one of the predefined optimization types. """ - type: ScooterOptimizationType + type: ScooterOptimizationType! """ - Define optimization by weighing three criteria. + Define optimization by weighing three criteria. This should only be used when + optimization type is `TRIANGLE`. """ triangle: TriangleScooterFactorsInput } @@ -3108,6 +3121,12 @@ enum ScooterOptimizationType { This option was previously called `GREENWAYS`. """ SAFEST_STREETS + + """ + Allows more fine-tuned configuration of how much different optimization criteria are considered in + routing. If this is defined, `triangle` values should be set as well. + """ + TRIANGLE } """ From a534dd34e8dc7b65bce6632e5f46094812e6e470 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 12 Feb 2024 13:16:57 +0100 Subject: [PATCH 0556/1688] Use 'estimated' instead of 'realTime' --- docs/apis/GraphQL-Tutorial.md | 8 ++-- .../gtfs/generated/GraphQLDataFetchers.java | 8 ++-- .../opentripplanner/model/plan/LegTimes.java | 7 ++- .../opentripplanner/apis/gtfs/schema.graphqls | 6 +-- .../apis/gtfs/GraphQLIntegrationTest.java | 33 +++++++------- .../apis/gtfs/expectations/plan-extended.json | 44 ++++++++++++------- .../apis/gtfs/expectations/plan.json | 36 ++++++++++----- .../apis/gtfs/queries/plan-extended.graphql | 8 ++-- .../apis/gtfs/queries/plan.graphql | 8 ++-- 9 files changed, 90 insertions(+), 68 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index 0eff55fff7b..5701ea20954 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -94,15 +94,15 @@ Most people want to get routing results out of OTP, so lets see the query for th mode start { scheduled - realTime { - predicted + estimated { + time scheduleOffset } } end { scheduled - realTime { - predicted + estimated { + time scheduleOffset } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index fbb246168e1..b2d37626cf2 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -503,7 +503,7 @@ public interface GraphQLLeg { } public interface GraphQLLegTimes { - public DataFetcher realTime(); + public DataFetcher estimated(); public DataFetcher scheduled(); } @@ -759,10 +759,10 @@ public interface GraphQLQueryType { public DataFetcher viewer(); } - public interface GraphQLRealtimeInformation { - public DataFetcher predicted(); - + public interface GraphQLRealtimeEstimate { public DataFetcher scheduleOffset(); + + public DataFetcher time(); } /** Rental vehicle represents a vehicle that belongs to a rental network. */ diff --git a/src/main/java/org/opentripplanner/model/plan/LegTimes.java b/src/main/java/org/opentripplanner/model/plan/LegTimes.java index f3ffe66e0e2..9206d00b4e3 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTimes.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTimes.java @@ -1,24 +1,23 @@ package org.opentripplanner.model.plan; import java.time.Duration; -import java.time.OffsetDateTime; import java.time.ZonedDateTime; import java.util.Objects; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public record LegTimes(@Nonnull ZonedDateTime scheduled, @Nullable Realtime realTime) { +public record LegTimes(@Nonnull ZonedDateTime scheduled, @Nullable RealtimeEstimate estimated) { public LegTimes { Objects.requireNonNull(scheduled); } @Nonnull public static LegTimes of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); - return new LegTimes(realtime.minus(delay), new Realtime(realtime, delay)); + return new LegTimes(realtime.minus(delay), new RealtimeEstimate(realtime, delay)); } @Nonnull public static LegTimes ofStatic(ZonedDateTime staticTime) { return new LegTimes(staticTime, null); } - record Realtime(ZonedDateTime predicted, Duration scheduleOffset) {} + record RealtimeEstimate(ZonedDateTime time, Duration scheduleOffset) {} } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 3ee9cebe030..dc2f61133bf 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1652,8 +1652,8 @@ ISO-8601 allows many different formats but OTP will only return the profile spec """ scalar OffsetDateTime @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") -type RealtimeInformation { - predicted: OffsetDateTime +type RealtimeEstimate { + time: OffsetDateTime """ The delay or "earliness" of the vehicle at a certain place. @@ -1664,7 +1664,7 @@ type RealtimeInformation { type LegTimes { scheduled: OffsetDateTime - realTime: RealtimeInformation + estimated: RealtimeEstimate } type Leg { diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index 4ce1c181f97..f630e0cee3c 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -52,7 +52,6 @@ import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.RelativeDirection; import org.opentripplanner.model.plan.ScheduledTransitLeg; -import org.opentripplanner.model.plan.ScheduledTransitLegBuilder; import org.opentripplanner.model.plan.WalkStep; import org.opentripplanner.model.plan.WalkStepBuilder; import org.opentripplanner.routing.alertpatch.AlertCause; @@ -116,6 +115,7 @@ class GraphQLIntegrationTest { .parse("2023-02-15T12:03:28+01:00") .toInstant(); static final Instant ALERT_END_TIME = ALERT_START_TIME.plus(1, ChronoUnit.DAYS); + private static final int TEN_MINUTES = 10 * 60; private static GraphQLRequestContext context; @@ -180,22 +180,7 @@ static void setup() { .carHail(D10m, E) .build(); - i1.transformTransitLegs(tl -> { - if(tl instanceof ScheduledTransitLeg stl){ - var x= new ScheduledTransitLegBuilder<>(stl); - var rtt = (RealTimeTripTimes) stl.getTripTimes(); - - for(var i=0; i < rtt.getNumStops();i++){ - - var time = rtt.getArrivalTime(i); - rtt.updateArrivalTime(i, time + 10*60); - - } - return x.withTripTimes(rtt).build(); - - } - else return tl; - }); + add10MinuteDelay(i1); var busLeg = i1.getTransitLeg(1); var railLeg = (ScheduledTransitLeg) i1.getTransitLeg(2); @@ -298,6 +283,20 @@ public TransitAlertService getTransitAlertService() { ); } + private static void add10MinuteDelay(Itinerary i1) { + i1.transformTransitLegs(tl -> { + if (tl instanceof ScheduledTransitLeg stl) { + var rtt = (RealTimeTripTimes) stl.getTripTimes(); + + for (var i = 0; i < rtt.getNumStops(); i++) { + rtt.updateArrivalTime(i, rtt.getArrivalTime(i) + TEN_MINUTES); + rtt.updateDepartureTime(i, rtt.getDepartureTime(i) + TEN_MINUTES); + } + } + return tl; + }); + } + @FilePatternSource(pattern = "src/test/resources/org/opentripplanner/apis/gtfs/queries/*.graphql") @ParameterizedTest(name = "Check GraphQL query in {0}") void graphQL(Path path) throws IOException { diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index ade6fa4465d..5a76c7be06e 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -20,11 +20,11 @@ "mode" : "WALK", "start" : { "scheduled" : "2020-02-02T11:00:00Z", - "realTime" : null + "estimated" : null }, "end" : { "scheduled" : "2020-02-02T11:00:20Z", - "realTime" : null + "estimated" : null }, "from" : { "name" : "A", @@ -53,12 +53,18 @@ { "mode" : "BUS", "start" : { - "scheduled" : "2020-02-02T11:01:00Z", - "realTime" : null + "scheduled" : "2020-02-02T10:51:00Z", + "estimated" : { + "time" : "2020-02-02T11:01:00Z", + "scheduleOffset" : "PT10M" + } }, "end" : { - "scheduled" : "2020-02-02T11:15:00Z", - "realTime" : null + "scheduled" : "2020-02-02T11:05:00Z", + "estimated" : { + "time" : "2020-02-02T11:15:00Z", + "scheduleOffset" : "PT10M" + } }, "from" : { "name" : "B", @@ -83,8 +89,8 @@ }, "intermediatePlaces" : [ { - "arrival" : "2020-02-02T11:01:00Z", - "departure" : "2020-02-02T11:01:00Z", + "arrival" : "2020-02-02T11:11:00Z", + "departure" : "2020-02-02T11:11:00Z", "stop" : { "name" : "B" } @@ -97,12 +103,18 @@ { "mode" : "RAIL", "start" : { - "scheduled" : "2020-02-02T11:30:00Z", - "realTime" : null + "scheduled" : "2020-02-02T11:20:00Z", + "estimated" : { + "time" : "2020-02-02T11:30:00Z", + "scheduleOffset" : "PT10M" + } }, "end" : { - "scheduled" : "2020-02-02T11:50:00Z", - "realTime" : null + "scheduled" : "2020-02-02T11:40:00Z", + "estimated" : { + "time" : "2020-02-02T11:50:00Z", + "scheduleOffset" : "PT10M" + } }, "from" : { "name" : "C", @@ -127,8 +139,8 @@ }, "intermediatePlaces" : [ { - "arrival" : "2020-02-02T11:30:00Z", - "departure" : "2020-02-02T11:30:00Z", + "arrival" : "2020-02-02T11:40:00Z", + "departure" : "2020-02-02T11:40:00Z", "stop" : { "name" : "C" } @@ -162,11 +174,11 @@ "mode" : "CAR", "start" : { "scheduled" : "2020-02-02T11:50:00Z", - "realTime" : null + "estimated" : null }, "end" : { "scheduled" : "2020-02-02T12:00:00Z", - "realTime" : null + "estimated" : null }, "from" : { "name" : "D", diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index 522f43723df..8076a4887d3 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -10,11 +10,11 @@ "mode" : "WALK", "start" : { "scheduled" : "2020-02-02T11:00:00Z", - "realTime" : null + "estimated" : null }, "end" : { "scheduled" : "2020-02-02T11:00:20Z", - "realTime" : null + "estimated" : null }, "from" : { "name" : "A", @@ -36,12 +36,18 @@ { "mode" : "BUS", "start" : { - "scheduled" : "2020-02-02T11:01:00Z", - "realTime" : null + "scheduled" : "2020-02-02T10:51:00Z", + "estimated" : { + "time" : "2020-02-02T11:01:00Z", + "scheduleOffset" : "PT10M" + } }, "end" : { - "scheduled" : "2020-02-02T11:15:00Z", - "realTime" : null + "scheduled" : "2020-02-02T11:05:00Z", + "estimated" : { + "time" : "2020-02-02T11:15:00Z", + "scheduleOffset" : "PT10M" + } }, "from" : { "name" : "B", @@ -69,12 +75,18 @@ { "mode" : "RAIL", "start" : { - "scheduled" : "2020-02-02T11:30:00Z", - "realTime" : null + "scheduled" : "2020-02-02T11:20:00Z", + "estimated" : { + "time" : "2020-02-02T11:30:00Z", + "scheduleOffset" : "PT10M" + } }, "end" : { - "scheduled" : "2020-02-02T11:50:00Z", - "realTime" : null + "scheduled" : "2020-02-02T11:40:00Z", + "estimated" : { + "time" : "2020-02-02T11:50:00Z", + "scheduleOffset" : "PT10M" + } }, "from" : { "name" : "C", @@ -103,11 +115,11 @@ "mode" : "CAR", "start" : { "scheduled" : "2020-02-02T11:50:00Z", - "realTime" : null + "estimated" : null }, "end" : { "scheduled" : "2020-02-02T12:00:00Z", - "realTime" : null + "estimated" : null }, "from" : { "name" : "D", diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index 8b3e0c6db16..b805a94a3c2 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -33,15 +33,15 @@ mode start { scheduled - realTime { - predicted + estimated { + time scheduleOffset } } end { scheduled - realTime { - predicted + estimated { + time scheduleOffset } } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index e21a24737ea..4bff431420c 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -23,15 +23,15 @@ mode start { scheduled - realTime { - predicted + estimated { + time scheduleOffset } } end { scheduled - realTime { - predicted + estimated { + time scheduleOffset } } From 01b04e0e7b5cb337523ab303cc10d4a822c1a968 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 12 Feb 2024 13:54:40 +0100 Subject: [PATCH 0557/1688] Use LegTimes for intermediate stops --- docs/apis/GraphQL-Tutorial.md | 24 +++++- .../flex/trip/ScheduledDeviatedTripTest.java | 2 +- .../ext/restapi/mapping/PlaceMapper.java | 10 +-- .../apis/gtfs/datafetchers/LegImpl.java | 10 +-- .../apis/gtfs/datafetchers/PlaceImpl.java | 38 ++++----- .../gtfs/generated/GraphQLDataFetchers.java | 4 +- .../apis/transmodel/model/plan/LegType.java | 2 +- .../model/plan/FrequencyTransitLeg.java | 11 +-- .../org/opentripplanner/model/plan/Leg.java | 2 +- .../opentripplanner/model/plan/LegTimes.java | 9 ++ .../model/plan/ScheduledTransitLeg.java | 23 ++++- .../model/plan/StopArrival.java | 56 ++++--------- .../algorithm/mapping/AlertToLegMapper.java | 6 +- .../opentripplanner/apis/gtfs/schema.graphqls | 4 +- .../apis/gtfs/expectations/plan-extended.json | 32 ++++++- .../apis/gtfs/expectations/plan.json | 84 +++++++++++++++---- .../apis/gtfs/queries/plan-extended.graphql | 16 +++- .../apis/gtfs/queries/plan.graphql | 24 +++++- 18 files changed, 237 insertions(+), 120 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index 5701ea20954..863aa8bd57c 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -110,15 +110,31 @@ Most people want to get routing results out of OTP, so lets see the query for th name lat lon - departure - arrival + departure { + scheduled + estimated { + time + scheduleOffset + } + } + arrival { + scheduled + estimated { + time + scheduleOffset + } + } } to { name lat lon - departure - arrival + departure { + scheduled + } + arrival { + scheduled + } } route { gtfsId diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index e0f85676034..c8450a2e7cb 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -185,7 +185,7 @@ void flexTripInTransitMode() { var intermediateStops = leg.getIntermediateStops(); assertEquals(1, intermediateStops.size()); - assertEquals("zone_1", intermediateStops.get(0).place.stop.getId().getId()); + assertEquals("zone_1", intermediateStops.get(0).place().stop.getId().getId()); EncodedPolyline legGeometry = EncodedPolyline.encode(leg.getLegGeometry()); assertThatPolylinesAreEqual( diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java index b1eb3410af8..95669d4b7ca 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java @@ -38,11 +38,11 @@ public List mapStopArrivals(Collection domain) { public ApiPlace mapStopArrival(StopArrival domain) { return mapPlace( - domain.place, - domain.arrival, - domain.departure, - domain.stopPosInPattern, - domain.gtfsStopSequence + domain.place(), + domain.arrival().time(), + domain.departure().time(), + domain.stopPosInPattern(), + domain.gtfsStopSequence() ); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 239ba0e28cf..9a6076ecd08 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -100,8 +100,8 @@ public DataFetcher from() { Leg source = getSource(environment); return new StopArrival( source.getFrom(), - source.getStartTime(), - source.getStartTime(), + source.start(), + source.start(), source.getBoardStopPosInPattern(), source.getBoardingGtfsStopSequence() ); @@ -144,7 +144,7 @@ public DataFetcher> intermediateStops() { } return intermediateStops .stream() - .map(intermediateStop -> intermediateStop.place.stop) + .map(intermediateStop -> intermediateStop.place().stop) .filter(Objects::nonNull) .collect(Collectors.toList()); }; @@ -244,8 +244,8 @@ public DataFetcher to() { Leg source = getSource(environment); return new StopArrival( source.getTo(), - source.getEndTime(), - source.getEndTime(), + source.end(), + source.end(), source.getAlightStopPosInPattern(), source.getAlightGtfsStopSequence() ); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java index 28cd088cf86..8d1434a033c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java @@ -2,12 +2,12 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; -import java.time.OffsetDateTime; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLVertexType; import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.apis.gtfs.model.StopPosition.PositionAtStop; import org.opentripplanner.framework.graphql.GraphQLUtils; +import org.opentripplanner.model.plan.LegTimes; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.VertexType; @@ -19,14 +19,14 @@ public class PlaceImpl implements GraphQLDataFetchers.GraphQLPlace { @Override - public DataFetcher arrival() { - return environment -> getSource(environment).arrival.toOffsetDateTime(); + public DataFetcher arrival() { + return environment -> getSource(environment).arrival(); } @Deprecated @Override public DataFetcher arrivalTime() { - return environment -> getSource(environment).arrival.toInstant().toEpochMilli(); + return environment -> getSource(environment).arrival().time().toInstant().toEpochMilli(); } @Override @@ -37,7 +37,7 @@ public DataFetcher bikePark() { @Override public DataFetcher bikeRentalStation() { return environment -> { - Place place = getSource(environment).place; + Place place = getSource(environment).place(); if (!place.vertexType.equals(VertexType.VEHICLERENTAL)) { return null; @@ -54,35 +54,35 @@ public DataFetcher carPark() { @Deprecated @Override - public DataFetcher departure() { - return environment -> getSource(environment).departure.toOffsetDateTime(); + public DataFetcher departure() { + return environment -> getSource(environment).departure(); } @Override public DataFetcher departureTime() { - return environment -> getSource(environment).departure.toInstant().toEpochMilli(); + return environment -> getSource(environment).departure().time().toInstant().toEpochMilli(); } @Override public DataFetcher lat() { - return environment -> getSource(environment).place.coordinate.latitude(); + return environment -> getSource(environment).place().coordinate.latitude(); } @Override public DataFetcher lon() { - return environment -> getSource(environment).place.coordinate.longitude(); + return environment -> getSource(environment).place().coordinate.longitude(); } @Override public DataFetcher name() { return environment -> - GraphQLUtils.getTranslation(getSource(environment).place.name, environment); + GraphQLUtils.getTranslation(getSource(environment).place().name, environment); } @Override public DataFetcher rentalVehicle() { return environment -> { - Place place = getSource(environment).place; + Place place = getSource(environment).place(); if ( !place.vertexType.equals(VertexType.VEHICLERENTAL) || @@ -97,13 +97,13 @@ public DataFetcher rentalVehicle() { @Override public DataFetcher stop() { - return environment -> getSource(environment).place.stop; + return environment -> getSource(environment).place().stop; } @Override public DataFetcher stopPosition() { return environment -> { - var seq = getSource(environment).gtfsStopSequence; + var seq = getSource(environment).gtfsStopSequence(); if (seq != null) { return new PositionAtStop(seq); } else { @@ -120,7 +120,7 @@ public DataFetcher vehicleParking() { @Override public DataFetcher vehicleRentalStation() { return environment -> { - Place place = getSource(environment).place; + Place place = getSource(environment).place(); if ( !place.vertexType.equals(VertexType.VEHICLERENTAL) || @@ -136,7 +136,7 @@ public DataFetcher vehicleRentalStation() { @Override public DataFetcher vertexType() { return environment -> { - var place = getSource(environment).place; + var place = getSource(environment).place(); return switch (place.vertexType) { case NORMAL -> GraphQLVertexType.NORMAL.name(); case TRANSIT -> GraphQLVertexType.TRANSIT.name(); @@ -147,7 +147,7 @@ public DataFetcher vertexType() { } private VehicleParking getBikePark(DataFetchingEnvironment environment) { - var vehicleParkingWithEntrance = getSource(environment).place.vehicleParkingWithEntrance; + var vehicleParkingWithEntrance = getSource(environment).place().vehicleParkingWithEntrance; if ( vehicleParkingWithEntrance == null || !vehicleParkingWithEntrance.getVehicleParking().hasBicyclePlaces() @@ -159,7 +159,7 @@ private VehicleParking getBikePark(DataFetchingEnvironment environment) { } private VehicleParking getCarPark(DataFetchingEnvironment environment) { - var vehicleParkingWithEntrance = getSource(environment).place.vehicleParkingWithEntrance; + var vehicleParkingWithEntrance = getSource(environment).place().vehicleParkingWithEntrance; if ( vehicleParkingWithEntrance == null || !vehicleParkingWithEntrance.getVehicleParking().hasAnyCarPlaces() @@ -171,7 +171,7 @@ private VehicleParking getCarPark(DataFetchingEnvironment environment) { } private VehicleParking getVehicleParking(DataFetchingEnvironment environment) { - var vehicleParkingWithEntrance = getSource(environment).place.vehicleParkingWithEntrance; + var vehicleParkingWithEntrance = getSource(environment).place().vehicleParkingWithEntrance; if (vehicleParkingWithEntrance == null) { return null; } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index b2d37626cf2..ec8556c45b0 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -591,7 +591,7 @@ public interface GraphQLPattern { } public interface GraphQLPlace { - public DataFetcher arrival(); + public DataFetcher arrival(); public DataFetcher arrivalTime(); @@ -601,7 +601,7 @@ public interface GraphQLPlace { public DataFetcher carPark(); - public DataFetcher departure(); + public DataFetcher departure(); public DataFetcher departureTime(); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java index be05d00e16d..99ead9fd8c0 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java @@ -340,7 +340,7 @@ public static GraphQLObjectType create( return ( stops .stream() - .map(stop -> stop.place.stop) + .map(stop -> stop.place().stop) .filter(Objects::nonNull) .collect(Collectors.toList()) ); diff --git a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java index d2188fb1b0b..31ccbe31a53 100644 --- a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java @@ -1,16 +1,9 @@ package org.opentripplanner.model.plan; -import java.time.LocalDate; -import java.time.ZoneId; -import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; import org.opentripplanner.framework.time.ServiceDateUtils; -import org.opentripplanner.model.transfer.ConstrainedTransfer; -import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.model.timetable.TripTimes; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a @@ -62,8 +55,8 @@ public List getIntermediateStops() { StopArrival visit = new StopArrival( Place.forStop(stop), - ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, arrivalTime), - ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, departureTime), + LegTimes.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, arrivalTime)), + LegTimes.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, departureTime)), i, tripTimes.gtfsSequenceOfStopIndex(i) ); diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 906e09989c5..139d60b5171 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -455,7 +455,7 @@ default Leg withTimeShift(Duration duration) { default Set getFareZones() { var intermediate = getIntermediateStops() .stream() - .flatMap(stopArrival -> stopArrival.place.stop.getFareZones().stream()); + .flatMap(stopArrival -> stopArrival.place().stop.getFareZones().stream()); var start = getFareZones(this.getFrom()); var end = getFareZones(this.getTo()); diff --git a/src/main/java/org/opentripplanner/model/plan/LegTimes.java b/src/main/java/org/opentripplanner/model/plan/LegTimes.java index 9206d00b4e3..5e0802c6e4f 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTimes.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTimes.java @@ -19,5 +19,14 @@ public static LegTimes of(ZonedDateTime realtime, int delaySecs) { public static LegTimes ofStatic(ZonedDateTime staticTime) { return new LegTimes(staticTime, null); } + + public ZonedDateTime time() { + if (estimated == null) { + return scheduled; + } else { + return estimated.time; + } + } + record RealtimeEstimate(ZonedDateTime time, Duration scheduleOffset) {} } diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 7a1fcacbf31..0babb9a652f 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -279,10 +279,29 @@ public List getIntermediateStops() { for (int i = boardStopPosInPattern + 1; i < alightStopPosInPattern; i++) { StopLocation stop = tripPattern.getStop(i); + final var arrivalTime = ServiceDateUtils.toZonedDateTime( + serviceDate, + zoneId, + tripTimes.getArrivalTime(i) + ); + final var departureTime = ServiceDateUtils.toZonedDateTime( + serviceDate, + zoneId, + tripTimes.getDepartureTime(i) + ); + + var arrival = LegTimes.ofStatic(arrivalTime); + var departure = LegTimes.ofStatic(departureTime); + + if (getRealTime()) { + arrival = LegTimes.of(arrivalTime, tripTimes.getArrivalDelay(i)); + departure = LegTimes.of(departureTime, tripTimes.getDepartureDelay(i)); + } + StopArrival visit = new StopArrival( Place.forStop(stop), - ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, tripTimes.getArrivalTime(i)), - ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, tripTimes.getDepartureTime(i)), + arrival, + departure, i, tripTimes.gtfsSequenceOfStopIndex(i) ); diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrival.java b/src/main/java/org/opentripplanner/model/plan/StopArrival.java index 10398768c85..9f5f058ee86 100644 --- a/src/main/java/org/opentripplanner/model/plan/StopArrival.java +++ b/src/main/java/org/opentripplanner/model/plan/StopArrival.java @@ -1,55 +1,31 @@ package org.opentripplanner.model.plan; -import java.time.ZonedDateTime; import org.opentripplanner.framework.tostring.ToStringBuilder; /** * This class is used to represent a stop arrival event mostly for intermediate visits to a stops * along a route. + * + * @param arrival The time the rider will arrive at the place. + * @param departure The time the rider will depart the place. + * @param stopPosInPattern For transit trips, the stop index (numbered from zero from the start of + * the trip). + * @param gtfsStopSequence For transit trips, the sequence number of the stop. Per GTFS, these + * numbers are increasing. */ -public class StopArrival { - - public final Place place; - /** - * The time the rider will arrive at the place. - */ - public final ZonedDateTime arrival; - - /** - * The time the rider will depart the place. - */ - public final ZonedDateTime departure; - - /** - * For transit trips, the stop index (numbered from zero from the start of the trip). - */ - public final Integer stopPosInPattern; - - /** - * For transit trips, the sequence number of the stop. Per GTFS, these numbers are increasing. - */ - public final Integer gtfsStopSequence; - - public StopArrival( - Place place, - ZonedDateTime arrival, - ZonedDateTime departure, - Integer stopPosInPattern, - Integer gtfsStopSequence - ) { - this.place = place; - this.arrival = arrival; - this.departure = departure; - this.stopPosInPattern = stopPosInPattern; - this.gtfsStopSequence = gtfsStopSequence; - } - +public record StopArrival( + Place place, + LegTimes arrival, + LegTimes departure, + Integer stopPosInPattern, + Integer gtfsStopSequence +) { @Override public String toString() { return ToStringBuilder .of(StopArrival.class) - .addTime("arrival", arrival) - .addTime("departure", departure) + .addObj("arrival", arrival) + .addObj("departure", departure) .addObj("place", place) .toString(); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java index dd08ab6095d..425bbf27e35 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java @@ -81,7 +81,7 @@ public void addTransitAlertsToLeg(Leg leg, boolean isFirstLeg) { if (leg.getIntermediateStops() != null) { Set stopConditions = StopCondition.PASSING; for (StopArrival visit : leg.getIntermediateStops()) { - if (visit.place.stop instanceof RegularStop stop) { + if (visit.place().stop instanceof RegularStop stop) { Collection alerts = getAlertsForStopAndRoute(stop, routeId, stopConditions); alerts.addAll(getAlertsForStopAndTrip(stop, tripId, serviceDate, stopConditions)); alerts.addAll( @@ -91,8 +91,8 @@ public void addTransitAlertsToLeg(Leg leg, boolean isFirstLeg) { ) ); - ZonedDateTime stopArrival = visit.arrival; - ZonedDateTime stopDeparture = visit.departure; + ZonedDateTime stopArrival = visit.arrival().time(); + ZonedDateTime stopDeparture = visit.departure().time(); addTransitAlertsToLeg(leg, alerts, stopArrival, stopDeparture); } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index dc2f61133bf..4fd0a1c3d10 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -2292,10 +2292,10 @@ type Place { lon: Float! "The time the rider will arrive at the place." - arrival: OffsetDateTime + arrival: LegTimes "The time the rider will depart the place." - departure: OffsetDateTime + departure: LegTimes """The stop related to the place.""" stop: Stop diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index 5a76c7be06e..6090cdfbf48 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -89,8 +89,20 @@ }, "intermediatePlaces" : [ { - "arrival" : "2020-02-02T11:11:00Z", - "departure" : "2020-02-02T11:11:00Z", + "arrival" : { + "scheduled" : "2020-02-02T11:01:00Z", + "estimated" : { + "time" : "2020-02-02T11:11:00Z", + "scheduleOffset" : "PT10M" + } + }, + "departure" : { + "scheduled" : "2020-02-02T11:01:00Z", + "estimated" : { + "time" : "2020-02-02T11:11:00Z", + "scheduleOffset" : "PT10M" + } + }, "stop" : { "name" : "B" } @@ -139,8 +151,20 @@ }, "intermediatePlaces" : [ { - "arrival" : "2020-02-02T11:40:00Z", - "departure" : "2020-02-02T11:40:00Z", + "arrival" : { + "scheduled" : "2020-02-02T11:30:00Z", + "estimated" : { + "time" : "2020-02-02T11:40:00Z", + "scheduleOffset" : "PT10M" + } + }, + "departure" : { + "scheduled" : "2020-02-02T11:30:00Z", + "estimated" : { + "time" : "2020-02-02T11:40:00Z", + "scheduleOffset" : "PT10M" + } + }, "stop" : { "name" : "C" } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index 8076a4887d3..a150bd8bf04 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -20,15 +20,25 @@ "name" : "A", "lat" : 5.0, "lon" : 8.0, - "departure" : "2020-02-02T11:00:00Z", - "arrival" : "2020-02-02T11:00:00Z" + "departure" : { + "scheduled" : "2020-02-02T11:00:00Z", + "estimated" : null + }, + "arrival" : { + "scheduled" : "2020-02-02T11:00:00Z", + "estimated" : null + } }, "to" : { "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departure" : "2020-02-02T11:00:20Z", - "arrival" : "2020-02-02T11:00:20Z" + "departure" : { + "scheduled" : "2020-02-02T11:00:20Z" + }, + "arrival" : { + "scheduled" : "2020-02-02T11:00:20Z" + } }, "route" : null, "legGeometry" : null @@ -53,15 +63,31 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departure" : "2020-02-02T11:01:00Z", - "arrival" : "2020-02-02T11:01:00Z" + "departure" : { + "scheduled" : "2020-02-02T10:51:00Z", + "estimated" : { + "time" : "2020-02-02T11:01:00Z", + "scheduleOffset" : "PT10M" + } + }, + "arrival" : { + "scheduled" : "2020-02-02T10:51:00Z", + "estimated" : { + "time" : "2020-02-02T11:01:00Z", + "scheduleOffset" : "PT10M" + } + } }, "to" : { "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departure" : "2020-02-02T11:15:00Z", - "arrival" : "2020-02-02T11:15:00Z" + "departure" : { + "scheduled" : "2020-02-02T11:05:00Z" + }, + "arrival" : { + "scheduled" : "2020-02-02T11:05:00Z" + } }, "route" : { "gtfsId" : "F:BUS", @@ -92,15 +118,31 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departure" : "2020-02-02T11:30:00Z", - "arrival" : "2020-02-02T11:30:00Z" + "departure" : { + "scheduled" : "2020-02-02T11:20:00Z", + "estimated" : { + "time" : "2020-02-02T11:30:00Z", + "scheduleOffset" : "PT10M" + } + }, + "arrival" : { + "scheduled" : "2020-02-02T11:20:00Z", + "estimated" : { + "time" : "2020-02-02T11:30:00Z", + "scheduleOffset" : "PT10M" + } + } }, "to" : { "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departure" : "2020-02-02T11:50:00Z", - "arrival" : "2020-02-02T11:50:00Z" + "departure" : { + "scheduled" : "2020-02-02T11:40:00Z" + }, + "arrival" : { + "scheduled" : "2020-02-02T11:40:00Z" + } }, "route" : { "gtfsId" : "F:2", @@ -125,15 +167,25 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departure" : "2020-02-02T11:50:00Z", - "arrival" : "2020-02-02T11:50:00Z" + "departure" : { + "scheduled" : "2020-02-02T11:50:00Z", + "estimated" : null + }, + "arrival" : { + "scheduled" : "2020-02-02T11:50:00Z", + "estimated" : null + } }, "to" : { "name" : "E", "lat" : 9.0, "lon" : 10.0, - "departure" : "2020-02-02T12:00:00Z", - "arrival" : "2020-02-02T12:00:00Z" + "departure" : { + "scheduled" : "2020-02-02T12:00:00Z" + }, + "arrival" : { + "scheduled" : "2020-02-02T12:00:00Z" + } }, "route" : null, "legGeometry" : null diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index b805a94a3c2..e877e05ffe4 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -68,8 +68,20 @@ tripHeadsign } intermediatePlaces { - arrival - departure + arrival { + scheduled + estimated { + time + scheduleOffset + } + } + departure { + scheduled + estimated { + time + scheduleOffset + } + } stop { name } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index 4bff431420c..4a9d7a174ba 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -39,15 +39,31 @@ name lat lon - departure - arrival + departure { + scheduled + estimated { + time + scheduleOffset + } + } + arrival { + scheduled + estimated { + time + scheduleOffset + } + } } to { name lat lon - departure - arrival + departure { + scheduled + } + arrival { + scheduled + } } route { gtfsId From 6c7ab863d437447f3166ee9896f6f01aa4b27e34 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Mon, 12 Feb 2024 22:23:45 +0800 Subject: [PATCH 0558/1688] add brief OTP-RR setup hints --- docs/Frontends.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docs/Frontends.md b/docs/Frontends.md index 7ad318b599c..f1a2499511d 100644 --- a/docs/Frontends.md +++ b/docs/Frontends.md @@ -58,12 +58,20 @@ Both major frontend projects mentioned above support internationalization and ha Deploying a full OpenTripPlanner-based system including a web UI can be quite complex, as there are many "moving parts". Such a system needs to remain responsive and function smoothly under load that varies wildly from one time of day to another, constantly refresh input data, and meet customer expectations in recognizing addresses and names of landmarks etc. Because deployment and management of such a system demands long term commitment by a professional team with sufficient experience and knowledge about the component parts, the major production frontend projects do not really aim to work "out of the box". There's a working assumption that they'll be actively customized for any large regional deployment. -This understandably creates a bit of a barrier for organizations evaluating such components. Please don't hesitate to join the OpenTripPlanner Gitter chat and ask if you need any information on this subject. Several organizations that manage multiple large OTP deployments are active there and will be happy to engage with you. +Unfortunately this creates a bit of a barrier for organizations evaluating such components. Please don't hesitate to join the OpenTripPlanner Gitter chat and ask if you need any information on this subject. Several organizations that manage multiple large OTP deployments are active there and will be happy to engage with you. -While you are welcome to stand up an instance of one of these UIs for testing or evaluation, and there has been some effort to make this more straightforward especially on the Arcadis IBI projects, it is still strongly recommended to collaborate with a specialist. The process of tailoring a deployment to a specific region and deployment environment is estimated to take at least several full days even for an experienced professional, and while it may start off looking deceptively simple, can rapidly grow into a seemingly never-ending project for those who are not aware of hidden pitfalls. The goal here is not by any means to discourage you from using or learning about any of these projects, but to set expectations that the process will be much smoother if you work with someone who's done it before. +While you are welcome to stand up an instance of one of these UIs for testing or evaluation, and there has been some effort to make this more straightforward especially on the Arcadis IBI projects, it is still strongly recommended to collaborate with a specialist. The process of tailoring a deployment to a specific region and deployment environment is estimated to take at least several full days even for an experienced professional, and while it may start off looking deceptively simple, can rapidly grow into a seemingly never-ending project for those who are not aware of the pitfalls. The goal here is not by any means to discourage you from using or learning about any of these projects, but to set expectations that the process will be much smoother if you work with someone who's done it before. If you do decide to take on this task, be aware that both of these systems rely on multiple additional backend services other than the OTP Java backend. To get either one working, you will need to configure a source of map tiles and a geocoder that translates geographic names to latitude and longitude coordinates, among other components. +### Evaluating OTP-React-Redux + +At the time of this writing (early 2024) it is possible to try out the OTP-React-Redux production frontend maintained by Arcadis IBI with only a few adjustments to the example configuration file, so long as you are working on a **non-production test deployment**. To do so, you can use the map tile sets pre-configured in the map.baseLayers section of its `example-config.yml`, along with a test account from the maintainers of the Pelias geocoder at https://geocode.earth. They provide a free temporary geocoding account lasting about two weeks, which should be sufficient for testing out the system. You'll need to substitute their Pelias server URL and your temporary API key into the OTP-React-Redux `example-config.yml` in the geocoder.apiKey and geocoder.baseUrl sections. You'll also want to update the geocoder boundary rectangle and focusPoint. + +Finally, but perhaps most importantly, you need to update the `host` and `port` items at the beginning of that configuration file to point to host `http://localhost` and port 8080, and also uncomment the `v2: true` item, ensuring that it remains indented under the `api` section. OTP-React-Redux no longer supports the v1 API and will fail with a (somewhat invisible) Javascript console error if this v2 item is not enabled. + +Once configured and launched with `yarn install ; yarn start`, you should be able to access the UI in your browser. It supports several different languages out of the box, and will first check the `lang` key in `window.localstorage` then the `navigator.language` for ISO language codes such as `fr` or `es` before falling back on the `localization.defaultLocale` item defined in `example-config.yml`. + ## Historical Background The history of the more widely used OpenTripPlanner interfaces is roughly as follows: From 38d00209ed99bf7d6a355fd3bcc65bb515847397 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 12 Feb 2024 17:38:31 +0200 Subject: [PATCH 0559/1688] Update magidoc and remove @oneOf definition from schema --- .github/workflows/cibuild.yml | 2 +- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index 28a84953af2..df994a7af73 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -119,7 +119,7 @@ jobs: - name: Build GTFS GraphQL API documentation run: | - npm install -g @magidoc/cli@4.0.0 + npm install -g @magidoc/cli@4.1.4 magidoc generate - name: Deploy compiled HTML to Github pages diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 07d8c9a0c30..943c2a34227 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -8,11 +8,6 @@ This is only worth it when the execution is long running, i.e. more than ~50 mil """ directive @async on FIELD_DEFINITION -""" -Exactly one of the fields on an input object must be set and non-null while all others are omitted. -""" -directive @oneOf on INPUT_OBJECT - schema { query: QueryType } From 0631e8e4d89f8aa44154d1628a665e6a3604c308 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Tue, 13 Feb 2024 18:55:53 +0800 Subject: [PATCH 0560/1688] Update HSL to "Regional Transport Authority" in docs Co-authored-by: Joel Lappalainen --- docs/Frontends.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Frontends.md b/docs/Frontends.md index f1a2499511d..ee42f0d25bb 100644 --- a/docs/Frontends.md +++ b/docs/Frontends.md @@ -80,5 +80,5 @@ The history of the more widely used OpenTripPlanner interfaces is roughly as fol - As of early 2024, this UI is still present in the main OpenTripPlanner repository under `src/client`, but is not intended for use by the general public. It has long been regarded as a "debug" UI, serving as a built-in, readily available and familiar interface for OTP developers to test and debug the behavior of the backend. It uses the older OTP REST API which is slated for deprecation. - In the late 2010s people started developing a new React-based UI as a more modular, modern interface for public consumption. This project is located at https://github.com/opentripplanner/otp-react-redux under the OpenTripPlanner Github organization, and is developed and maintainted by Arcadis IBI. - Some React components were factored out of that UI project, allowing them to be integrated in different ways with different OTP deployments. This component library is in a separate repository at https://github.com/opentripplanner/otp-ui. Likewise, it is developed and maintained by Arcadis IBI. -- Meanwhile, starting in 2014, HSL (the Helsinki transit authority) and Finntrafic (the Finnish national transportation authority) began the Digitransit project, a set of open-source microservices to replace their existing national and regional scale trip planners. This includes a Javascript web UI module. In addition to Finland, the Digitransit system has been deployed in various places around the world including Germany. +- Meanwhile, starting in 2014, HSL (the Helsinki Regional Transport Authority) and Finntrafic (the Finnish national transportation authority) began the Digitransit project, a set of open-source microservices to replace their existing national and regional scale trip planners. This includes a Javascript web UI module. In addition to Finland, the Digitransit system has been deployed in various places around the world including Germany. - As of 2024, a completely new debug UI (again, intended for developer use rather than public consumption) is being developed in the main OpenTripPlanner repository under `src/debug-client-preview`. This new UI follows a more conventional contemporary Javascript development style, and uses the most recent OpenTripPlanner GraphQL API which is expected to fully replace the older REST API. From 15287e5dd8b6cb924dd1f0c78957bf2502e2f056 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Tue, 13 Feb 2024 18:56:03 +0800 Subject: [PATCH 0561/1688] Update HSL to "Regional Transport Authority" in docs Co-authored-by: Joel Lappalainen --- docs/Frontends.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Frontends.md b/docs/Frontends.md index ee42f0d25bb..3e671af6157 100644 --- a/docs/Frontends.md +++ b/docs/Frontends.md @@ -46,7 +46,7 @@ That said, there are two main Javascript-based web user interfaces that are gene - The [Digitransit UI](https://github.com/HSLdevcom/digitransit-ui), part of the Finnish Digitransit project. - The [OpenTripPlanner React UI](https://github.com/opentripplanner/otp-react-redux), developed and maintained by [Arcadis IBI](https://www.ibigroup.com)'s [transit routing team](https://www.ibigroup.com/ibi-products/transit-routing/). -**Digitransit** is an open-source public transportation project, originally created in Finland to replace existing nationwide and regional journey planning solutions in 2014. Digitransit has since been used around the world in other projects, for example in Germany. It is a joint project of Helsinki Transit Authority (HSL), Fintraffic, and Waltti Solutions. +**Digitransit** is an open-source public transportation project, originally created in Finland to replace existing nationwide and regional journey planning solutions in 2014. Digitransit has since been used around the world in other projects, for example in Germany. It is a joint project of Helsinki Regional Transport Authority (HSL), Fintraffic, and Waltti Solutions. **Arcadis IBI** has for several years actively developed, deployed, and maintained instances of the React-based OTP UI, systematically contributing their improvements back to the original repositories under the OpenTripPlanner organization: - https://github.com/opentripplanner/otp-ui From b836c3b664a20d5ac0341c438cef2a7b1bafd110 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 13 Feb 2024 17:23:13 +0100 Subject: [PATCH 0562/1688] Apply review feedback --- .../impl/CombinedInterlinedTransitLeg.java | 6 +-- .../ext/flex/FlexibleTransitLeg.java | 10 ++--- .../apis/gtfs/datafetchers/LegImpl.java | 6 +-- .../apis/gtfs/datafetchers/PlaceImpl.java | 6 +-- .../gtfs/generated/GraphQLDataFetchers.java | 12 +++--- .../apis/gtfs/generated/graphql-codegen.yml | 2 +- .../model/plan/FrequencyTransitLeg.java | 4 +- .../org/opentripplanner/model/plan/Leg.java | 4 +- .../plan/{LegTimes.java => LegTimeEvent.java} | 12 +++--- .../model/plan/ScheduledTransitLeg.java | 20 +++++----- .../model/plan/StopArrival.java | 4 +- .../opentripplanner/model/plan/StreetLeg.java | 8 ++-- .../model/plan/UnknownTransitPathLeg.java | 8 ++-- .../opentripplanner/apis/gtfs/schema.graphqls | 38 +++++++++++++++---- 14 files changed, 81 insertions(+), 59 deletions(-) rename src/main/java/org/opentripplanner/model/plan/{LegTimes.java => LegTimeEvent.java} (56%) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java index 0b192a9ec77..27a9685b560 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java @@ -10,7 +10,7 @@ import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimes; +import org.opentripplanner.model.plan.LegTimeEvent; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.TransitLeg; @@ -58,12 +58,12 @@ public Trip getTrip() { } @Override - public LegTimes start() { + public LegTimeEvent start() { return first.start(); } @Override - public LegTimes end() { + public LegTimeEvent end() { return second.end(); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index 25caa9089e9..d793ad1956d 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -16,7 +16,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimes; +import org.opentripplanner.model.plan.LegTimeEvent; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.TransitLeg; @@ -86,13 +86,13 @@ public Accessibility getTripWheelchairAccessibility() { } @Override - public LegTimes start() { - return LegTimes.of(startTime, getArrivalDelay()); + public LegTimeEvent start() { + return LegTimeEvent.of(startTime, getArrivalDelay()); } @Override - public LegTimes end() { - return LegTimes.of(endTime, getDepartureDelay()); + public LegTimeEvent end() { + return LegTimeEvent.of(endTime, getDepartureDelay()); } @Override diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 9a6076ecd08..7dc9492fbe3 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -18,7 +18,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimes; +import org.opentripplanner.model.plan.LegTimeEvent; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.StreetLeg; @@ -79,7 +79,7 @@ public DataFetcher duration() { } @Override - public DataFetcher end() { + public DataFetcher end() { return environment -> getSource(environment).end(); } @@ -223,7 +223,7 @@ public DataFetcher serviceDate() { } @Override - public DataFetcher start() { + public DataFetcher start() { return environment -> getSource(environment).start(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java index 8d1434a033c..c4908b40aec 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java @@ -7,7 +7,7 @@ import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.apis.gtfs.model.StopPosition.PositionAtStop; import org.opentripplanner.framework.graphql.GraphQLUtils; -import org.opentripplanner.model.plan.LegTimes; +import org.opentripplanner.model.plan.LegTimeEvent; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.VertexType; @@ -19,7 +19,7 @@ public class PlaceImpl implements GraphQLDataFetchers.GraphQLPlace { @Override - public DataFetcher arrival() { + public DataFetcher arrival() { return environment -> getSource(environment).arrival(); } @@ -54,7 +54,7 @@ public DataFetcher carPark() { @Deprecated @Override - public DataFetcher departure() { + public DataFetcher departure() { return environment -> getSource(environment).departure(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index ec8556c45b0..e84ecfc20f4 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -36,7 +36,7 @@ import org.opentripplanner.model.plan.Emissions; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimes; +import org.opentripplanner.model.plan.LegTimeEvent; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.WalkStep; import org.opentripplanner.routing.alertpatch.TransitAlert; @@ -445,7 +445,7 @@ public interface GraphQLLeg { public DataFetcher duration(); - public DataFetcher end(); + public DataFetcher end(); public DataFetcher endTime(); @@ -487,7 +487,7 @@ public interface GraphQLLeg { public DataFetcher serviceDate(); - public DataFetcher start(); + public DataFetcher start(); public DataFetcher startTime(); @@ -502,7 +502,7 @@ public interface GraphQLLeg { public DataFetcher walkingBike(); } - public interface GraphQLLegTimes { + public interface GraphQLLegTimeEvent { public DataFetcher estimated(); public DataFetcher scheduled(); @@ -591,7 +591,7 @@ public interface GraphQLPattern { } public interface GraphQLPlace { - public DataFetcher arrival(); + public DataFetcher arrival(); public DataFetcher arrivalTime(); @@ -601,7 +601,7 @@ public interface GraphQLPlace { public DataFetcher carPark(); - public DataFetcher departure(); + public DataFetcher departure(); public DataFetcher departureTime(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index ecc7a89fb44..fee61cee936 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -60,7 +60,7 @@ config: InputField: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField#GraphQLInputField Itinerary: org.opentripplanner.model.plan.Itinerary#Itinerary Leg: org.opentripplanner.model.plan.Leg#Leg - LegTimes: org.opentripplanner.model.plan.LegTimes#LegTimes + LegTimeEvent: org.opentripplanner.model.plan.LegTimeEvent#LegTimeEvent Mode: String OccupancyStatus: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLOccupancyStatus#GraphQLOccupancyStatus TransitMode: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode#GraphQLTransitMode diff --git a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java index 31ccbe31a53..0a620e6c681 100644 --- a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java @@ -55,8 +55,8 @@ public List getIntermediateStops() { StopArrival visit = new StopArrival( Place.forStop(stop), - LegTimes.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, arrivalTime)), - LegTimes.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, departureTime)), + LegTimeEvent.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, arrivalTime)), + LegTimeEvent.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, departureTime)), i, tripTimes.gtfsSequenceOfStopIndex(i) ); diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 139d60b5171..cfb60519572 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -200,8 +200,8 @@ default Accessibility getTripWheelchairAccessibility() { return null; } - LegTimes start(); - LegTimes end(); + LegTimeEvent start(); + LegTimeEvent end(); /** * The date and time this leg begins. diff --git a/src/main/java/org/opentripplanner/model/plan/LegTimes.java b/src/main/java/org/opentripplanner/model/plan/LegTimeEvent.java similarity index 56% rename from src/main/java/org/opentripplanner/model/plan/LegTimes.java rename to src/main/java/org/opentripplanner/model/plan/LegTimeEvent.java index 5e0802c6e4f..b5256429b1f 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTimes.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTimeEvent.java @@ -6,18 +6,18 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -public record LegTimes(@Nonnull ZonedDateTime scheduled, @Nullable RealtimeEstimate estimated) { - public LegTimes { +public record LegTimeEvent(@Nonnull ZonedDateTime scheduled, @Nullable RealtimeEstimate estimated) { + public LegTimeEvent { Objects.requireNonNull(scheduled); } @Nonnull - public static LegTimes of(ZonedDateTime realtime, int delaySecs) { + public static LegTimeEvent of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); - return new LegTimes(realtime.minus(delay), new RealtimeEstimate(realtime, delay)); + return new LegTimeEvent(realtime.minus(delay), new RealtimeEstimate(realtime, delay)); } @Nonnull - public static LegTimes ofStatic(ZonedDateTime staticTime) { - return new LegTimes(staticTime, null); + public static LegTimeEvent ofStatic(ZonedDateTime staticTime) { + return new LegTimeEvent(staticTime, null); } public ZonedDateTime time() { diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 0babb9a652f..a537e9b81f8 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -163,20 +163,20 @@ public Accessibility getTripWheelchairAccessibility() { } @Override - public LegTimes start() { + public LegTimeEvent start() { if (getRealTime()) { - return LegTimes.of(startTime, getDepartureDelay()); + return LegTimeEvent.of(startTime, getDepartureDelay()); } else { - return LegTimes.ofStatic(startTime); + return LegTimeEvent.ofStatic(startTime); } } @Override - public LegTimes end() { + public LegTimeEvent end() { if (getRealTime()) { - return LegTimes.of(endTime, getArrivalDelay()); + return LegTimeEvent.of(endTime, getArrivalDelay()); } else { - return LegTimes.ofStatic(endTime); + return LegTimeEvent.ofStatic(endTime); } } @@ -290,12 +290,12 @@ public List getIntermediateStops() { tripTimes.getDepartureTime(i) ); - var arrival = LegTimes.ofStatic(arrivalTime); - var departure = LegTimes.ofStatic(departureTime); + var arrival = LegTimeEvent.ofStatic(arrivalTime); + var departure = LegTimeEvent.ofStatic(departureTime); if (getRealTime()) { - arrival = LegTimes.of(arrivalTime, tripTimes.getArrivalDelay(i)); - departure = LegTimes.of(departureTime, tripTimes.getDepartureDelay(i)); + arrival = LegTimeEvent.of(arrivalTime, tripTimes.getArrivalDelay(i)); + departure = LegTimeEvent.of(departureTime, tripTimes.getDepartureDelay(i)); } StopArrival visit = new StopArrival( diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrival.java b/src/main/java/org/opentripplanner/model/plan/StopArrival.java index 9f5f058ee86..a1186fb4461 100644 --- a/src/main/java/org/opentripplanner/model/plan/StopArrival.java +++ b/src/main/java/org/opentripplanner/model/plan/StopArrival.java @@ -15,8 +15,8 @@ */ public record StopArrival( Place place, - LegTimes arrival, - LegTimes departure, + LegTimeEvent arrival, + LegTimeEvent departure, Integer stopPosInPattern, Integer gtfsStopSequence ) { diff --git a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java index 41062995cf4..372c987a5e4 100644 --- a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java @@ -157,13 +157,13 @@ public boolean hasSameMode(Leg other) { } @Override - public LegTimes start() { - return LegTimes.ofStatic(startTime); + public LegTimeEvent start() { + return LegTimeEvent.ofStatic(startTime); } @Override - public LegTimes end() { - return LegTimes.ofStatic(endTime); + public LegTimeEvent end() { + return LegTimeEvent.ofStatic(endTime); } @Override diff --git a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java index 4dfefb086e3..8d1e1c134dd 100644 --- a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java @@ -69,13 +69,13 @@ public boolean hasSameMode(Leg other) { } @Override - public LegTimes start() { - return LegTimes.ofStatic(startTime); + public LegTimeEvent start() { + return LegTimeEvent.ofStatic(startTime); } @Override - public LegTimes end() { - return LegTimes.ofStatic(endTime); + public LegTimeEvent end() { + return LegTimeEvent.ofStatic(endTime); } @Override diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 4fd0a1c3d10..4b43dc091e5 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1497,7 +1497,10 @@ type DefaultFareProduct implements FareProduct { } type Itinerary { + "Time when the user leaves from the origin." start: OffsetDateTime + + "Time when the user leaves arrives at the destination." end: OffsetDateTime """Duration of the trip on this itinerary, in seconds.""" @@ -1662,15 +1665,28 @@ type RealtimeEstimate { scheduleOffset: Duration } -type LegTimes { - scheduled: OffsetDateTime +""" +Time information about a passenger at a certain place. May contain real-time information if +available. +""" +type LegTimeEvent { + "The scheduled time of the event." + scheduled: OffsetDateTime! + "The estimated time of the event, if available." estimated: RealtimeEstimate } type Leg { - start: LegTimes - end: LegTimes + """ + The time when the leg starts including real-time information, if available. + """ + start: LegTimeEvent + + """ + The time when the leg ends including real-time information, if available. + """ + end: LegTimeEvent """The mode (e.g. `WALK`) used when traversing this leg.""" mode: Mode @@ -2291,11 +2307,17 @@ type Place { """Longitude of the place (WGS 84)""" lon: Float! - "The time the rider will arrive at the place." - arrival: LegTimes + """ + The time the rider will arrive at the place. This also includes real-time information + if available. + """ + arrival: LegTimeEvent - "The time the rider will depart the place." - departure: LegTimes + """ + The time the rider will depart the place. This also includes real-time information + if available. + """ + departure: LegTimeEvent """The stop related to the place.""" stop: Stop From 151354b05e774000ed7a3ac6c9894352b7d3cd35 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 13 Feb 2024 18:42:37 +0100 Subject: [PATCH 0563/1688] fix: Save changes to the startup model when InteractiveOtpMain starts up. This is a regression. The bug was introduced when the controller was added. The startUpView is saved if the user start OTP, while the controller models are saved if changed. --- .../ext/interactivelauncher/InteractiveOtpMain.java | 1 + .../java/org/opentripplanner/ext/interactivelauncher/Model.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java index 43061ee2b62..a58b8f617c2 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/InteractiveOtpMain.java @@ -31,6 +31,7 @@ private void run() { } private void startOtp() { + model.save(); startDebugControllerAndSetupRequestInterceptor(); System.out.println("Start OTP: " + model + "\n"); diff --git a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java index 59682082b90..d4e55ac6992 100644 --- a/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java +++ b/src/ext/java/org/opentripplanner/ext/interactivelauncher/Model.java @@ -55,7 +55,7 @@ private static Model readFromFile() { } } - private void save() { + void save() { try { var mapper = new ObjectMapper().configure(SerializationFeature.INDENT_OUTPUT, true); mapper.writeValue(MODEL_FILE, this); From 593ae40eb66dbfdf35a0d2b32454b12a2b37bbd4 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Wed, 14 Feb 2024 12:57:05 +0800 Subject: [PATCH 0564/1688] remove OTP-RR specific configuration details --- docs/Frontends.md | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docs/Frontends.md b/docs/Frontends.md index 3e671af6157..e8b299a52ac 100644 --- a/docs/Frontends.md +++ b/docs/Frontends.md @@ -60,17 +60,9 @@ Deploying a full OpenTripPlanner-based system including a web UI can be quite co Unfortunately this creates a bit of a barrier for organizations evaluating such components. Please don't hesitate to join the OpenTripPlanner Gitter chat and ask if you need any information on this subject. Several organizations that manage multiple large OTP deployments are active there and will be happy to engage with you. -While you are welcome to stand up an instance of one of these UIs for testing or evaluation, and there has been some effort to make this more straightforward especially on the Arcadis IBI projects, it is still strongly recommended to collaborate with a specialist. The process of tailoring a deployment to a specific region and deployment environment is estimated to take at least several full days even for an experienced professional, and while it may start off looking deceptively simple, can rapidly grow into a seemingly never-ending project for those who are not aware of the pitfalls. The goal here is not by any means to discourage you from using or learning about any of these projects, but to set expectations that the process will be much smoother if you work with someone who's done it before. +While you are welcome to stand up an instance of one of these UIs for testing or evaluation, and there has been some effort to make this more straightforward especially on the Arcadis IBI projects, it is still strongly recommended to collaborate with a specialist. The process of tailoring a deployment to a specific region and deployment environment is estimated to take at least several full days even for an experienced professional, and while it may start off looking deceptively simple, can rapidly grow into a seemingly never-ending project for those who are not aware of the pitfalls. The goal here is not by any means to discourage you from using or learning about any of these projects, but to set expectations that the process will be much smoother if you work with someone who's done it before. Be aware that both of these systems rely on multiple additional backend services other than the OTP Java backend. To get either one working, you will need to configure a source of map tiles and a geocoder that translates geographic names to latitude and longitude coordinates, among other components. -If you do decide to take on this task, be aware that both of these systems rely on multiple additional backend services other than the OTP Java backend. To get either one working, you will need to configure a source of map tiles and a geocoder that translates geographic names to latitude and longitude coordinates, among other components. - -### Evaluating OTP-React-Redux - -At the time of this writing (early 2024) it is possible to try out the OTP-React-Redux production frontend maintained by Arcadis IBI with only a few adjustments to the example configuration file, so long as you are working on a **non-production test deployment**. To do so, you can use the map tile sets pre-configured in the map.baseLayers section of its `example-config.yml`, along with a test account from the maintainers of the Pelias geocoder at https://geocode.earth. They provide a free temporary geocoding account lasting about two weeks, which should be sufficient for testing out the system. You'll need to substitute their Pelias server URL and your temporary API key into the OTP-React-Redux `example-config.yml` in the geocoder.apiKey and geocoder.baseUrl sections. You'll also want to update the geocoder boundary rectangle and focusPoint. - -Finally, but perhaps most importantly, you need to update the `host` and `port` items at the beginning of that configuration file to point to host `http://localhost` and port 8080, and also uncomment the `v2: true` item, ensuring that it remains indented under the `api` section. OTP-React-Redux no longer supports the v1 API and will fail with a (somewhat invisible) Javascript console error if this v2 item is not enabled. - -Once configured and launched with `yarn install ; yarn start`, you should be able to access the UI in your browser. It supports several different languages out of the box, and will first check the `lang` key in `window.localstorage` then the `navigator.language` for ISO language codes such as `fr` or `es` before falling back on the `localization.defaultLocale` item defined in `example-config.yml`. +That said, as of this writing (early 2024) it may now be possible to get a minimal, non-production test deployment of OTP-React-Redux working with only a few adjustments to the example configuration file. See the README and `example-config.yml` in [the OTP-RR repo](https://github.com/opentripplanner/otp-react-redux). ## Historical Background From bf7dc55191a5cfcd24c853b703769120ccf51eaa Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 14 Feb 2024 08:11:44 +0100 Subject: [PATCH 0565/1688] Implement OffsetDateTimeParser --- .../apis/gtfs/GraphQLScalars.java | 39 ++++++++++++---- .../model/scalars/DateTimeScalarFactory.java | 19 +------- .../framework/time/OffsetDateTimeParser.java | 42 +++++++++++++++++ .../time/OffsetDateTimeParserTest.java | 45 +++++++++++++++++++ 4 files changed, 120 insertions(+), 25 deletions(-) create mode 100644 src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java create mode 100644 src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 3e376b60b35..82ef8090d86 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -18,6 +18,7 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; import org.opentripplanner.framework.model.Grams; +import org.opentripplanner.framework.time.OffsetDateTimeParser; public class GraphQLScalars { @@ -25,7 +26,7 @@ public class GraphQLScalars { .registerModule(new JtsModule(GeometryUtils.getGeometryFactory())); public static GraphQLScalarType durationScalar = DurationScalarFactory.createDurationScalar(); - public static GraphQLScalarType polylineScalar = GraphQLScalarType + public static final GraphQLScalarType polylineScalar = GraphQLScalarType .newScalar() .name("Polyline") .description( @@ -54,7 +55,7 @@ public String parseLiteral(Object input) { ) .build(); - public static GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType + public static final GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType .newScalar() .name("OffsetDateTime") .coercing( @@ -66,23 +67,45 @@ public String serialize(@Nonnull Object dataFetcherResult) return zdt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); } else if (dataFetcherResult instanceof OffsetDateTime odt) { return odt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); - } else return null; + } else { + throw new CoercingSerializeException( + "Cannot serialize object of class %s".formatted( + dataFetcherResult.getClass().getSimpleName() + ) + ); + } } @Override public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { - return null; + if (input instanceof CharSequence cs) { + return OffsetDateTimeParser.parseLeniently(cs).orElseThrow(() -> valueException(input)); + } + throw valueException(input); } @Override public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { - return null; + if (input instanceof StringValue sv) { + return OffsetDateTimeParser + .parseLeniently(sv.getValue()) + .orElseThrow(() -> literalException(input)); + } + throw literalException(input); + } + + private static CoercingParseValueException valueException(Object input) { + return new CoercingParseValueException("Cannot parse %s".formatted(input)); + } + + private static CoercingParseLiteralException literalException(Object input) { + return new CoercingParseLiteralException("Cannot parse %s".formatted(input)); } } ) .build(); - public static GraphQLScalarType geoJsonScalar = GraphQLScalarType + public static final GraphQLScalarType geoJsonScalar = GraphQLScalarType .newScalar() .name("GeoJson") .description("Geographic data structures in JSON format. See: https://geojson.org/") @@ -110,7 +133,7 @@ public Geometry parseLiteral(Object input) throws CoercingParseLiteralException ) .build(); - public static GraphQLScalarType graphQLIDScalar = GraphQLScalarType + public static final GraphQLScalarType graphQLIDScalar = GraphQLScalarType .newScalar() .name("ID") .coercing( @@ -150,7 +173,7 @@ public Relay.ResolvedGlobalId parseLiteral(Object input) ) .build(); - public static GraphQLScalarType gramsScalar = GraphQLScalarType + public static final GraphQLScalarType gramsScalar = GraphQLScalarType .newScalar() .name("Grams") .coercing( diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java b/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java index 706adc81704..9738a277a41 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactory.java @@ -10,10 +10,10 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; import java.time.temporal.TemporalAccessor; import javax.annotation.Nonnull; +import org.opentripplanner.framework.time.OffsetDateTimeParser; public final class DateTimeScalarFactory { @@ -25,22 +25,7 @@ public final class DateTimeScalarFactory { Example: `2017-04-23T18:25:43+02:00` or `2017-04-23T16:25:43Z`"""; - // We need to have two offsets, in order to parse both "+0200" and "+02:00". The first is not - // really ISO-8601 compatible with the extended date and time. We need to make parsing strict, in - // order to keep the minute mandatory, otherwise we would be left with an unparsed minute - private static final DateTimeFormatter PARSER = new DateTimeFormatterBuilder() - .parseCaseInsensitive() - .parseLenient() - .append(DateTimeFormatter.ISO_LOCAL_DATE_TIME) - .optionalStart() - .parseStrict() - .appendOffset("+HH:MM:ss", "Z") - .parseLenient() - .optionalEnd() - .optionalStart() - .appendOffset("+HHmmss", "Z") - .optionalEnd() - .toFormatter(); + private static final DateTimeFormatter PARSER = OffsetDateTimeParser.LENIENT_PARSER; private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_OFFSET_DATE_TIME; diff --git a/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java b/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java new file mode 100644 index 00000000000..11652d797a7 --- /dev/null +++ b/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java @@ -0,0 +1,42 @@ +package org.opentripplanner.framework.time; + +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.DateTimeParseException; +import java.util.Optional; + +public class OffsetDateTimeParser { + + /** + * We need to have two offsets, in order to parse both "+0200" and "+02:00". The first is not + * really ISO-8601 compatible with the extended date and time. We need to make parsing strict, in + * order to keep the minute mandatory, otherwise we would be left with an unparsed minute + */ + public static final DateTimeFormatter LENIENT_PARSER = new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .parseLenient() + .append(DateTimeFormatter.ISO_LOCAL_DATE_TIME) + .optionalStart() + .parseStrict() + .appendOffset("+HH:MM:ss", "Z") + .parseLenient() + .optionalEnd() + .optionalStart() + .appendOffset("+HHmmss", "Z") + .optionalEnd() + .toFormatter(); + + /** + * Parses a ISO-8601 string into am OffsetDateTime instance allowing the offset to be both in + * '02:00' and '0200' format. + */ + public static Optional parseLeniently(CharSequence input) { + try { + var result = OffsetDateTime.parse(input, LENIENT_PARSER); + return Optional.of(result); + } catch (DateTimeParseException e) { + return Optional.empty(); + } + } +} diff --git a/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java b/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java new file mode 100644 index 00000000000..1f164ada783 --- /dev/null +++ b/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java @@ -0,0 +1,45 @@ +package org.opentripplanner.framework.time; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.OffsetDateTime; +import java.util.List; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; + +class OffsetDateTimeParserTest { + + private static final String TIME_STRING = "2023-01-27T12:59:00+01:00"; + private static final OffsetDateTime TIME = OffsetDateTime.parse(TIME_STRING); + + static List successfulCases() { + return List.of( + TIME_STRING, + "2023-01-27T12:59:00.000+01:00", + "2023-01-27T12:59:00+0100", + "2023-01-27T12:59:00+01", + "2023-01-27T11:59:00Z", + "2023-01-27T11:59Z", + "2023-01-27T06:59:00-05:00", + "2023-01-27T06:59:00-0500" + ); + } + + @ParameterizedTest + @MethodSource("successfulCases") + void parse(String input) { + var res = OffsetDateTimeParser.parseLeniently(input); + assertTrue(res.get().isEqual(TIME)); + } + + static List failedCases() { + return List.of("2023-01-27T11:59:00", "2023-01-27T11", "2023-01-27T11:00"); + } + + @ParameterizedTest + @MethodSource("failedCases") + void failed(String input) { + var res = OffsetDateTimeParser.parseLeniently(input); + assertTrue(res.isEmpty()); + } +} From 9cb7445f47330e7eb9ea511e6b325fe95f3b2b58 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 14 Feb 2024 08:43:30 +0000 Subject: [PATCH 0566/1688] Add changelog entry for #5674 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 5fa9a3ee0b3..86f6355f37f 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -90,6 +90,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Refactor GroupStopBuilder addLocation method [#5651](https://github.com/opentripplanner/OpenTripPlanner/pull/5651) - Remove `VehicleToStopHeuristics` [#5381](https://github.com/opentripplanner/OpenTripPlanner/pull/5381) - Set defaults of the modes WALK, even if one and not the others are set [#5675](https://github.com/opentripplanner/OpenTripPlanner/pull/5675) +- Reduce flex default access/egress penalty [#5674](https://github.com/opentripplanner/OpenTripPlanner/pull/5674) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 0f63b2fbc8e7443ea2246ecbe5121d167dc8e651 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Thu, 11 Jan 2024 13:57:02 +0100 Subject: [PATCH 0567/1688] Smoke tests wip Due to huge issues with mocking mapbox-gl, smoke tests on search bar and itinerary list. --- .github/workflows/debug-client.yml | 1 + client-next/package-lock.json | 6637 ++++++++--------- client-next/package.json | 8 +- .../ItineraryList/ItineraryList.test.tsx | 2394 ++++++ .../components/SearchBar/SearchBar.test.tsx | 14 + client-next/vite.config.ts | 4 + 6 files changed, 5737 insertions(+), 3321 deletions(-) create mode 100644 client-next/src/components/ItineraryList/ItineraryList.test.tsx create mode 100644 client-next/src/components/SearchBar/SearchBar.test.tsx diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml index de92c121db7..56304db88f2 100644 --- a/.github/workflows/debug-client.yml +++ b/.github/workflows/debug-client.yml @@ -42,6 +42,7 @@ jobs: run: | npm install npm run build -- --base https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/${VERSION}/ + npm run coverage - name: Deploy compiled assets to repo if: github.event_name == 'push' && github.ref == 'refs/heads/dev-2.x' diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 11894b5b246..b1dcfecb817 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -23,11 +23,13 @@ "@graphql-codegen/client-preset": "4.1.0", "@graphql-codegen/introspection": "4.0.0", "@parcel/watcher": "2.3.0", + "@testing-library/react": "14.1.2", "@types/react": "18.2.21", "@types/react-dom": "18.2.7", "@typescript-eslint/eslint-plugin": "6.5.0", "@typescript-eslint/parser": "6.5.0", "@vitejs/plugin-react": "4.0.4", + "@vitest/coverage-v8": "1.1.3", "eslint": "8.48.0", "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.28.1", @@ -35,25 +37,25 @@ "eslint-plugin-react": "7.33.2", "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-refresh": "0.4.3", + "jsdom": "23.2.0", "prettier": "3.0.3", "typescript": "5.2.2", - "vite": "4.4.9" + "vite": "4.4.9", + "vitest": "1.1.3" } }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", - "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", - "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -64,9 +66,8 @@ }, "node_modules/@ardatan/relay-compiler": { "version": "12.0.0", - "resolved": "https://registry.npmjs.org/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz", - "integrity": "sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.14.0", "@babel/generator": "^7.14.0", @@ -93,71 +94,20 @@ "graphql": "*" } }, - "node_modules/@ardatan/relay-compiler/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@ardatan/relay-compiler/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, "node_modules/@ardatan/relay-compiler/node_modules/cliui": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^6.2.0" } }, - "node_modules/@ardatan/relay-compiler/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@ardatan/relay-compiler/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/@ardatan/relay-compiler/node_modules/find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -166,20 +116,10 @@ "node": ">=8" } }, - "node_modules/@ardatan/relay-compiler/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@ardatan/relay-compiler/node_modules/locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -189,9 +129,8 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, + "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -204,9 +143,8 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -214,29 +152,15 @@ "node": ">=8" } }, - "node_modules/@ardatan/relay-compiler/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@ardatan/relay-compiler/node_modules/y18n": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/@ardatan/relay-compiler/node_modules/yargs": { "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", @@ -256,9 +180,8 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/yargs-parser": { "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, + "license": "ISC", "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -269,9 +192,8 @@ }, "node_modules/@ardatan/sync-fetch": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz", - "integrity": "sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA==", "dev": true, + "license": "MIT", "dependencies": { "node-fetch": "^2.6.1" }, @@ -279,45 +201,116 @@ "node": ">=14" } }, + "node_modules/@asamuzakjp/dom-selector": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "bidi-js": "^1.0.3", + "css-tree": "^2.3.1", + "is-potential-custom-element-name": "^1.0.1" + } + }, "node_modules/@babel/code-frame": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.22.13.tgz", - "integrity": "sha512-XktuhWlJ5g+3TJXc5upd9Ks1HutSArik6jf2eAjYFyIOf4ej3RN+184cZbzDvbPnuTJIUhPKKJE3cIsYTiAT3w==", + "version": "7.23.5", "dev": true, + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.22.13", + "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" }, "engines": { "node": ">=6.9.0" } }, + "node_modules/@babel/code-frame/node_modules/ansi-styles": { + "version": "3.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/chalk": { + "version": "2.4.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/color-convert": { + "version": "1.9.3", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/code-frame/node_modules/color-name": { + "version": "1.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/code-frame/node_modules/has-flag": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/code-frame/node_modules/supports-color": { + "version": "5.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/compat-data": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.22.9.tgz", - "integrity": "sha512-5UamI7xkUcJ3i9qVDS+KFDEK8/7oJ55/sJMB1Ge7IEapr7KfdfV/HErR+koZwOfd+SgtFKOKRhRakdg++DcJpQ==", + "version": "7.23.5", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.22.11.tgz", - "integrity": "sha512-lh7RJrtPdhibbxndr6/xx0w8+CVlY5FJZiaSz908Fpy+G0xkBFTvwLcKJFF4PJxVfGhVWNebikpWGnOoC71juQ==", + "version": "7.23.7", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-compilation-targets": "^7.22.10", - "@babel/helper-module-transforms": "^7.22.9", - "@babel/helpers": "^7.22.11", - "@babel/parser": "^7.22.11", - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.11", - "@babel/types": "^7.22.11", - "convert-source-map": "^1.7.0", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-module-transforms": "^7.23.3", + "@babel/helpers": "^7.23.7", + "@babel/parser": "^7.23.6", + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.7", + "@babel/types": "^7.23.6", + "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", "json5": "^2.2.3", @@ -331,22 +324,12 @@ "url": "https://opencollective.com/babel" } }, - "node_modules/@babel/core/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/generator": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.22.10.tgz", - "integrity": "sha512-79KIf7YiWjjdZ81JnLujDRApWtl7BxTqWD88+FFdQEIOG8LJ0etDOM7CXuIgGJa55sGOwZVwuEsaLEm0PJ5/+A==", + "version": "7.23.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.10", + "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" @@ -357,9 +340,8 @@ }, "node_modules/@babel/helper-annotate-as-pure": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", - "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -368,14 +350,13 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.22.10.tgz", - "integrity": "sha512-JMSwHD4J7SLod0idLq5PKgI+6g/hLD/iuWBq08ZX49xE14VpVEojJ5rHWptpirV2j020MvypRLAXAO50igCJ5Q==", + "version": "7.23.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.22.9", - "@babel/helper-validator-option": "^7.22.5", - "browserslist": "^4.21.9", + "@babel/compat-data": "^7.23.5", + "@babel/helper-validator-option": "^7.23.5", + "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" }, @@ -383,27 +364,17 @@ "node": ">=6.9.0" } }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.22.11.tgz", - "integrity": "sha512-y1grdYL4WzmUDBRGK0pDbIoFd7UZKoDurDzWEoNMYoj1EL+foGRQNyPWDcC+YyegN5y1DUsFFmzjGijB3nSVAQ==", + "version": "7.23.7", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.9", + "@babel/helper-replace-supers": "^7.22.20", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", "semver": "^6.3.1" @@ -415,32 +386,21 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.5.tgz", - "integrity": "sha512-XGmhECfVA/5sAt+H+xpSg0mfrHq6FzNr9Oxh7PSEBBRUb/mL7Kz3NICXb194rCqAEdxkhPT1a88teizAFyvk8Q==", + "version": "7.22.20", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.22.5.tgz", - "integrity": "sha512-wtHSq6jMRE3uF2otvfuD3DIvVhOsSNshQl0Qrd7qC9oQJzHvOL4qQXlQn2916+CXGywIjpGuIkoyZRRxHPiNQQ==", + "version": "7.23.0", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/template": "^7.22.15", + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" @@ -448,9 +408,8 @@ }, "node_modules/@babel/helper-hoist-variables": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -459,40 +418,37 @@ } }, "node_modules/@babel/helper-member-expression-to-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.22.5.tgz", - "integrity": "sha512-aBiH1NKMG0H2cGZqspNvsaBe6wNGjbJjuLy29aU+eDZjSbbN53BaxlpB02xm9v34pLTZ1nIQPFYn2qMZoa5BQQ==", + "version": "7.23.0", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.23.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.5.tgz", - "integrity": "sha512-8Dl6+HD/cKifutF5qGd/8ZJi84QeAKh+CEe1sBzz8UayBBGg1dAIJrdHOcOM5b2MpzWL2yuotJTtGjETq0qjXg==", + "version": "7.22.15", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.22.9.tgz", - "integrity": "sha512-t+WA2Xn5K+rTeGtC8jCsdAH52bjggG5TKRuRrAGNM/mjIbO4GxvlLMFOEz9wXY5I2XQ60PMFsAG2WIcG82dQMQ==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-simple-access": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.5" + "@babel/helper-validator-identifier": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -503,9 +459,8 @@ }, "node_modules/@babel/helper-optimise-call-expression": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", - "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -515,21 +470,19 @@ }, "node_modules/@babel/helper-plugin-utils": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", - "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.9", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.9.tgz", - "integrity": "sha512-LJIKvvpgPOPUThdYqcX6IXRuIcTkcAub0IaDRGCZH0p5GPUp7PhRU9QVgFcDDd51BaPkk77ZjqFwh6DZTAEmGg==", + "version": "7.22.20", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-member-expression-to-functions": "^7.22.5", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-member-expression-to-functions": "^7.22.15", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -541,9 +494,8 @@ }, "node_modules/@babel/helper-simple-access": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -553,9 +505,8 @@ }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", - "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -565,9 +516,8 @@ }, "node_modules/@babel/helper-split-export-declaration": { "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, + "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -576,53 +526,48 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz", - "integrity": "sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw==", + "version": "7.23.4", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.5.tgz", - "integrity": "sha512-aJXu+6lErq8ltp+JhkJUfk1MTGyuA4v7f3pA+BJ5HLfNC6nAQ0Cpi9uOquUj8Hehg0aUiHzWQbOVJGao6ztBAQ==", + "version": "7.22.20", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.22.5.tgz", - "integrity": "sha512-R3oB6xlIVKUnxNUxbmgq7pKjxpru24zlimpE8WK47fACIlM0II/Hm1RS8IaOI7NgCr6LNS+jl5l75m20npAziw==", + "version": "7.23.5", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.22.11.tgz", - "integrity": "sha512-vyOXC8PBWaGc5h7GMsNx68OH33cypkEDJCHvYVVgVbbxJDROYVtexSk0gK5iCF1xNjRIN2s8ai7hwkWDq5szWg==", + "version": "7.23.8", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.22.5", - "@babel/traverse": "^7.22.11", - "@babel/types": "^7.22.11" + "@babel/template": "^7.22.15", + "@babel/traverse": "^7.23.7", + "@babel/types": "^7.23.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.22.13.tgz", - "integrity": "sha512-C/BaXcnnvBCmHTpz/VGZ8jgtE2aYlW4hxDhseJAWZb7gqGM/qtCK6iZUb0TyKFf7BOUsBH7Q7fkRsDRhg1XklQ==", + "version": "7.23.4", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", "js-tokens": "^4.0.0" }, @@ -630,11 +575,74 @@ "node": ">=6.9.0" } }, + "node_modules/@babel/highlight/node_modules/ansi-styles": { + "version": "3.2.1", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^1.9.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/chalk": { + "version": "2.4.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/color-convert": { + "version": "1.9.3", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "1.1.3" + } + }, + "node_modules/@babel/highlight/node_modules/color-name": { + "version": "1.1.3", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/highlight/node_modules/escape-string-regexp": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/@babel/highlight/node_modules/has-flag": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/@babel/highlight/node_modules/supports-color": { + "version": "5.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/@babel/parser": { - "version": "7.22.13", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.22.13.tgz", - "integrity": "sha512-3l6+4YOvc9wx7VlCSw4yQfcBo01ECA8TicQfbnCPuCEpRQrf+gTUyGdxNw+pyTUyywp6JRD1w0YQs9TpBXYlkw==", + "version": "7.23.6", "dev": true, + "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -644,9 +652,8 @@ }, "node_modules/@babel/plugin-proposal-class-properties": { "version": "7.18.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", - "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.18.6", "@babel/helper-plugin-utils": "^7.18.6" @@ -660,9 +667,8 @@ }, "node_modules/@babel/plugin-proposal-object-rest-spread": { "version": "7.20.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", - "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/compat-data": "^7.20.5", "@babel/helper-compilation-targets": "^7.20.7", @@ -679,9 +685,8 @@ }, "node_modules/@babel/plugin-syntax-class-properties": { "version": "7.12.13", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", - "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -690,10 +695,9 @@ } }, "node_modules/@babel/plugin-syntax-flow": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.22.5.tgz", - "integrity": "sha512-9RdCl0i+q0QExayk2nOS7853w08yLucnnPML6EN9S8fgMPVtdLDCdx/cOQ/i44Lb9UeQX9A35yaqBBOMMZxPxQ==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -705,10 +709,9 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.22.5.tgz", - "integrity": "sha512-rdV97N7KqsRzeNGoWUOK6yUsWarLjE5Su/Snk9IYPU9CwkWHs4t+rTGOvffTR8XGkJMTAdLfO0xVnXm8wugIJg==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -720,10 +723,9 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.22.5.tgz", - "integrity": "sha512-gvyP4hZrgrs/wWMaocvxZ44Hw0b3W8Pe+cMxc8V1ULQ07oh8VNbIRaoD1LRZVTvD+0nieDKjfgKg89sD7rrKrg==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -736,9 +738,8 @@ }, "node_modules/@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", - "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -747,10 +748,9 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.22.5.tgz", - "integrity": "sha512-26lTNXoVRdAnsaDXPpvCNUq+OVWEVC6bx7Vvz9rC53F2bagUWW4u4ii2+h8Fejfh7RYqPxn+libeFBBck9muEw==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -762,10 +762,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.22.5.tgz", - "integrity": "sha512-tdXZ2UdknEKQWKJP1KMNmuF5Lx3MymtMN/pvA+p/VEkhK8jVcQ1fzSy8KM9qRYhAf2/lV33hoMPKI/xaI9sADA==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -777,10 +776,9 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.22.10.tgz", - "integrity": "sha512-1+kVpGAOOI1Albt6Vse7c8pHzcZQdQKW+wJH+g8mCaszOdDVwRXa/slHPqIw+oJAJANTKDMuM2cBdV0Dg618Vg==", + "version": "7.23.4", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -792,18 +790,16 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.22.6.tgz", - "integrity": "sha512-58EgM6nuPNG6Py4Z3zSuu0xWu2VfodiMi72Jt5Kj2FECmaYk1RrTXA45z6KBFsu9tRgwQDwIiY4FXTt+YsSFAQ==", + "version": "7.23.8", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-compilation-targets": "^7.22.6", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", - "@babel/helper-optimise-call-expression": "^7.22.5", + "@babel/helper-compilation-targets": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5", + "@babel/helper-replace-supers": "^7.22.20", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -815,13 +811,12 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.22.5.tgz", - "integrity": "sha512-4GHWBgRf0krxPX+AaPtgBAlTgTeZmqDynokHOX7aqqAB4tHs3U2Y02zH6ETFdLZGcg9UQSD1WCmkVrE9ErHeOg==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/template": "^7.22.5" + "@babel/template": "^7.22.15" }, "engines": { "node": ">=6.9.0" @@ -831,10 +826,9 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.22.10", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.22.10.tgz", - "integrity": "sha512-dPJrL0VOyxqLM9sritNbMSGx/teueHF/htMKrPT7DNxccXxRDPYqlgPFFdr8u+F+qUZOkZoXue/6rL5O5GduEw==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -846,13 +840,12 @@ } }, "node_modules/@babel/plugin-transform-flow-strip-types": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.22.5.tgz", - "integrity": "sha512-tujNbZdxdG0/54g/oua8ISToaXTFBf8EnSb5PgQSciIXWOWKX3S4+JR7ZE9ol8FZwf9kxitzkGQ+QWeov/mCiA==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-flow": "^7.22.5" + "@babel/plugin-syntax-flow": "^7.23.3" }, "engines": { "node": ">=6.9.0" @@ -862,12 +855,12 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.22.5.tgz", - "integrity": "sha512-3kxQjX1dU9uudwSshyLeEipvrLjBCVthCgeTp6CzE/9JYrlAIaeekVxRpCWsDDfYTfRZRoCeZatCQvwo+wvK8A==", + "version": "7.23.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { "node": ">=6.9.0" @@ -877,13 +870,12 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.22.5.tgz", - "integrity": "sha512-UIzQNMS0p0HHiQm3oelztj+ECwFnj+ZRV4KnguvlsD2of1whUeM6o7wGNj6oLwcDoAXQ8gEqfgC24D+VdIcevg==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-plugin-utils": "^7.22.5" }, "engines": { @@ -894,10 +886,9 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.22.5.tgz", - "integrity": "sha512-fTLj4D79M+mepcw3dgFBTIDYpbcB9Sm0bpm4ppXPaO+U+PKFFyV9MGRvS0gvGw62sd10kT5lRMKXAADb9pWy8g==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -909,10 +900,9 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.22.5.tgz", - "integrity": "sha512-RZEdkNtzzYCFl9SE9ATaUMTj2hqMb4StarOJLrZRbqqU4HSBE7UlBw9WBWQiDzrJZJdUWiMTVDI6Gv/8DPvfew==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -924,12 +914,11 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.22.11.tgz", - "integrity": "sha512-o2+bg7GDS60cJMgz9jWqRUsWkMzLCxp+jFDeDUT5sjRlAxcJWZ2ylNdI7QQ2+CH5hWu7OnN+Cv3htt7AkSf96g==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-module-transforms": "^7.22.9", + "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-simple-access": "^7.22.5" }, @@ -941,13 +930,12 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.22.5.tgz", - "integrity": "sha512-klXqyaT9trSjIUrcsYIfETAzmOEZL3cBYqOYLJxBHfMFFggmXOv+NYSX/Jbs9mzMVESw/WycLFPRx8ba/b2Ipw==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.5" + "@babel/helper-replace-supers": "^7.22.20" }, "engines": { "node": ">=6.9.0" @@ -957,10 +945,9 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.22.5.tgz", - "integrity": "sha512-AVkFUBurORBREOmHRKo06FjHYgjrabpdqRSwq6+C7R5iTCZOsM4QbcB27St0a4U6fffyAOqh3s/qEfybAhfivg==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -972,10 +959,9 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.22.5.tgz", - "integrity": "sha512-TiOArgddK3mK/x1Qwf5hay2pxI6wCZnvQqrFSqbtg1GLl2JcNMitVH/YnqjP+M31pLUeTfzY1HAXFDnUBV30rQ==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -987,10 +973,9 @@ } }, "node_modules/@babel/plugin-transform-react-display-name": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.22.5.tgz", - "integrity": "sha512-PVk3WPYudRF5z4GKMEYUrLjPl38fJSKNaEOkFuoprioowGuWN6w2RKznuFNSlJx7pzzXXStPUnNSOEO0jL5EVw==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1002,16 +987,15 @@ } }, "node_modules/@babel/plugin-transform-react-jsx": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.22.5.tgz", - "integrity": "sha512-rog5gZaVbUip5iWDMTYbVM15XQq+RkUKhET/IHR6oizR+JEoN6CAfTTuHcK4vwUyzca30qqHqEpzBOnaRMWYMA==", + "version": "7.23.4", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", - "@babel/helper-module-imports": "^7.22.5", + "@babel/helper-module-imports": "^7.22.15", "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-jsx": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/plugin-syntax-jsx": "^7.23.3", + "@babel/types": "^7.23.4" }, "engines": { "node": ">=6.9.0" @@ -1021,10 +1005,9 @@ } }, "node_modules/@babel/plugin-transform-react-jsx-self": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.22.5.tgz", - "integrity": "sha512-nTh2ogNUtxbiSbxaT4Ds6aXnXEipHweN9YRgOX/oNXdf0cCrGn/+2LozFa3lnPV5D90MkjhgckCPBrsoSc1a7g==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1036,10 +1019,9 @@ } }, "node_modules/@babel/plugin-transform-react-jsx-source": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.22.5.tgz", - "integrity": "sha512-yIiRO6yobeEIaI0RTbIr8iAK9FcBHLtZq0S89ZPjDLQXBA4xvghaKqI0etp/tF3htTM0sazJKKLz9oEiGRtu7w==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1051,10 +1033,9 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.22.5.tgz", - "integrity": "sha512-vM4fq9IXHscXVKzDv5itkO1X52SmdFBFcMIBZ2FRn2nqVYqw6dBexUgMvAjHW+KXpPPViD/Yo3GrDEBaRC0QYA==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1066,10 +1047,9 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.22.5.tgz", - "integrity": "sha512-5ZzDQIGyvN4w8+dMmpohL6MBo+l2G7tfC/O2Dg7/hjpgeWvUx8FzfeOKxGog9IimPa4YekaQ9PlDqTLOljkcxg==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" @@ -1082,10 +1062,9 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.22.5.tgz", - "integrity": "sha512-5ciOehRNf+EyUeewo8NkbQiUs4d6ZxiHo6BcBcnFlgiJfu16q0bQUw9Jvo0b0gBKFG1SMhDSjeKXSYuJLeFSMA==", + "version": "7.23.3", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1097,9 +1076,8 @@ } }, "node_modules/@babel/runtime": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.22.11.tgz", - "integrity": "sha512-ee7jVNlWN09+KftVOu9n7S8gQzD/Z6hN/I8VBRXW4P1+Xe7kJGXMwu8vds4aGIMHZnNbdpSWCfZZtinytpcAvA==", + "version": "7.23.8", + "license": "MIT", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -1108,34 +1086,32 @@ } }, "node_modules/@babel/template": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.22.5.tgz", - "integrity": "sha512-X7yV7eiwAxdj9k94NEylvbVHLiVG1nvzCV2EAowhxLTwODV1jl9UzZ48leOC0sH7OnuHrIkllaBgneUykIcZaw==", + "version": "7.22.15", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.22.5", - "@babel/parser": "^7.22.5", - "@babel/types": "^7.22.5" + "@babel/code-frame": "^7.22.13", + "@babel/parser": "^7.22.15", + "@babel/types": "^7.22.15" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.22.11.tgz", - "integrity": "sha512-mzAenteTfomcB7mfPtyi+4oe5BZ6MXxWcn4CX+h4IRJ+OOGXBrWU6jDQavkQI9Vuc5P+donFabBfFCcmWka9lQ==", + "version": "7.23.7", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.22.10", - "@babel/generator": "^7.22.10", - "@babel/helper-environment-visitor": "^7.22.5", - "@babel/helper-function-name": "^7.22.5", + "@babel/code-frame": "^7.23.5", + "@babel/generator": "^7.23.6", + "@babel/helper-environment-visitor": "^7.22.20", + "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.22.11", - "@babel/types": "^7.22.11", - "debug": "^4.1.0", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", + "debug": "^4.3.1", "globals": "^11.1.0" }, "engines": { @@ -1143,400 +1119,64 @@ } }, "node_modules/@babel/types": { - "version": "7.22.11", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.22.11.tgz", - "integrity": "sha512-siazHiGuZRz9aB9NpHy9GOs9xiQPKnMzgdr493iI1M67vRXpnEq8ZOOKzezC5q7zwuQ6sDhdSp4SD9ixKSqKZg==", + "version": "7.23.6", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.22.5", - "@babel/helper-validator-identifier": "^7.22.5", + "@babel/helper-string-parser": "^7.23.4", + "@babel/helper-validator-identifier": "^7.22.20", "to-fast-properties": "^2.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", - "cpu": [ - "arm" - ], + "node_modules/@bcoe/v8-coverage": { + "version": "0.2.3", "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } + "license": "MIT" }, - "node_modules/@esbuild/android-arm64": { + "node_modules/@esbuild/darwin-x64": { "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", "cpu": [ - "arm64" + "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ - "android" + "darwin" ], "engines": { "node": ">=12" } }, - "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", - "cpu": [ - "x64" - ], + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", "dev": true, - "optional": true, - "os": [ - "android" - ], + "license": "MIT", + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, "engines": { - "node": ">=12" + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" } }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", - "cpu": [ - "arm64" - ], + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", "dev": true, - "optional": true, - "os": [ - "darwin" - ], + "license": "MIT", "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", - "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", - "dev": true, - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" - } - }, - "node_modules/@eslint-community/regexpp": { - "version": "4.8.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.8.0.tgz", - "integrity": "sha512-JylOEEzDiOryeUnFbQz+oViCXS0KsvR1mvHkoMiu5+UiBvy+RYX7tzlIIIEstF/gVa2tj9AQXk3dgnxv6KxhFg==", - "dev": true, - "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } }, "node_modules/@eslint/eslintrc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz", - "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==", + "version": "2.1.4", "dev": true, + "license": "MIT", "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -1556,10 +1196,9 @@ } }, "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.21.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", - "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", + "version": "13.24.0", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -1570,25 +1209,33 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "dev": true, + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@eslint/js": { "version": "8.48.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz", - "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==", "dev": true, + "license": "MIT", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } }, "node_modules/@googlemaps/polyline-codec": { "version": "1.0.28", - "resolved": "https://registry.npmjs.org/@googlemaps/polyline-codec/-/polyline-codec-1.0.28.tgz", - "integrity": "sha512-m7rh8sbxlrHvebXEweBHX8r1uPtToPRYxWDD6p6k2YG8hyhBe0Wi6xRUVFpxpEseMNgF+OBotFQC5senj8K7TQ==" + "license": "Apache-2.0" }, "node_modules/@graphql-codegen/add": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/add/-/add-5.0.0.tgz", - "integrity": "sha512-ynWDOsK2yxtFHwcJTB9shoSkUd7YXd6ZE57f0nk7W5cu/nAgxZZpEsnTPEpZB/Mjf14YRGe2uJHQ7AfElHjqUQ==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "tslib": "~2.5.0" @@ -1599,15 +1246,13 @@ }, "node_modules/@graphql-codegen/add/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/cli": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-5.0.0.tgz", - "integrity": "sha512-A7J7+be/a6e+/ul2KI5sfJlpoqeqwX8EzktaKCeduyVKgOLA6W5t+NUGf6QumBDXU8PEOqXk3o3F+RAwCWOiqA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/generator": "^7.18.13", "@babel/template": "^7.18.10", @@ -1660,81 +1305,10 @@ } } }, - "node_modules/@graphql-codegen/cli/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@graphql-codegen/cli/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/@graphql-codegen/cli/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/@graphql-codegen/cli/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@graphql-codegen/cli/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/@graphql-codegen/cli/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/@graphql-codegen/client-preset": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.1.0.tgz", - "integrity": "sha512-/3Ymb/fjxIF1+HGmaI1YwSZbWsrZAWMSQjh3dU425eBjctjsVQ6gzGRr+l/gE5F1mtmCf+vlbTAT03heAc/QIw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", @@ -1756,15 +1330,13 @@ }, "node_modules/@graphql-codegen/client-preset/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/core": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-4.0.0.tgz", - "integrity": "sha512-JAGRn49lEtSsZVxeIlFVIRxts2lWObR+OQo7V2LHDJ7ohYYw3ilv7nJ8pf8P4GTg/w6ptcYdSdVVdkI8kUHB/Q==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-tools/schema": "^10.0.0", @@ -1777,15 +1349,13 @@ }, "node_modules/@graphql-codegen/core/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/gql-tag-operations": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.1.tgz", - "integrity": "sha512-qF6wIbBzW8BNT+wiVsBxrYOs2oYcsxQ7mRvCpfEI3HnNZMAST/uX76W8MqFEJvj4mw7NIDv7xYJAcAZIWM5LWw==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-codegen/visitor-plugin-common": "4.0.1", @@ -1799,15 +1369,13 @@ }, "node_modules/@graphql-codegen/gql-tag-operations/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/introspection": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/introspection/-/introspection-4.0.0.tgz", - "integrity": "sha512-t9g3AkK99dfHblMWtG4ynUM9+A7JrWq5110zSpNV2wlSnv0+bRKagDW8gozwgXfR5i1IIG8QDjJZ6VgXQVqCZw==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-codegen/visitor-plugin-common": "^4.0.0", @@ -1819,15 +1387,13 @@ }, "node_modules/@graphql-codegen/introspection/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/plugin-helpers": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.1.tgz", - "integrity": "sha512-6L5sb9D8wptZhnhLLBcheSPU7Tg//DGWgc5tQBWX46KYTOTQHGqDpv50FxAJJOyFVJrveN9otWk9UT9/yfY4ww==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "change-case-all": "1.0.15", @@ -1842,15 +1408,13 @@ }, "node_modules/@graphql-codegen/plugin-helpers/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/schema-ast": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/schema-ast/-/schema-ast-4.0.0.tgz", - "integrity": "sha512-WIzkJFa9Gz28FITAPILbt+7A8+yzOyd1NxgwFh7ie+EmO9a5zQK6UQ3U/BviirguXCYnn+AR4dXsoDrSrtRA1g==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-tools/utils": "^10.0.0", @@ -1862,15 +1426,13 @@ }, "node_modules/@graphql-codegen/schema-ast/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/typed-document-node": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.1.tgz", - "integrity": "sha512-VFkhCuJnkgtbbgzoCAwTdJe2G1H6sd3LfCrDqWUrQe53y2ukfSb5Ov1PhAIkCBStKCMQBUY9YgGz9GKR40qQ8g==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-codegen/visitor-plugin-common": "4.0.1", @@ -1884,15 +1446,13 @@ }, "node_modules/@graphql-codegen/typed-document-node/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/typescript": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.1.tgz", - "integrity": "sha512-3YziQ21dCVdnHb+Us1uDb3pA6eG5Chjv0uTK+bt9dXeMlwYBU8MbtzvQTo4qvzWVC1AxSOKj0rgfNu1xCXqJyA==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-codegen/schema-ast": "^4.0.0", @@ -1906,9 +1466,8 @@ }, "node_modules/@graphql-codegen/typescript-operations": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.0.1.tgz", - "integrity": "sha512-GpUWWdBVUec/Zqo23aFLBMrXYxN2irypHqDcKjN78JclDPdreasAEPcIpMfqf4MClvpmvDLy4ql+djVAwmkjbw==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-codegen/typescript": "^4.0.1", @@ -1922,21 +1481,18 @@ }, "node_modules/@graphql-codegen/typescript-operations/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/typescript/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-codegen/visitor-plugin-common": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.0.1.tgz", - "integrity": "sha512-Bi/1z0nHg4QMsAqAJhds+ForyLtk7A3HQOlkrZNm3xEkY7lcBzPtiOTLBtvziwopBsXUxqeSwVjOOFPLS5Yw1Q==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-tools/optimize": "^2.0.0", @@ -1955,15 +1511,13 @@ }, "node_modules/@graphql-codegen/visitor-plugin-common/node_modules/tslib": { "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", - "dev": true + "dev": true, + "license": "0BSD" }, "node_modules/@graphql-tools/apollo-engine-loader": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.0.tgz", - "integrity": "sha512-axQTbN5+Yxs1rJ6cWQBOfw3AEeC+fvIuZSfJLPLLvFJLj4pUm9fhxey/g6oQZAAQJqKPfw+tLDUQvnfvRK8Kmg==", "dev": true, + "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", "@graphql-tools/utils": "^10.0.0", @@ -1979,20 +1533,18 @@ }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", - "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, + "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.9.tgz", - "integrity": "sha512-OTVoDm039CNyAWSRc2WBimMl/N9J4Fk2le21Xzcf+3OiWPNNSIbMnpWKBUyraPh2d9SAEgoBdQxTfVNihXgiUw==", + "version": "0.9.15", "dev": true, + "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.4.8", + "@whatwg-node/node-fetch": "^0.5.0", "urlpattern-polyfill": "^9.0.0" }, "engines": { @@ -2000,15 +1552,14 @@ } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.14.tgz", - "integrity": "sha512-ii/eZz2PcjLGj9D6WfsmfzlTzZV1Kz6MxYpq2Vc5P21J8vkKfENWC9B2ISsFCKovxElLukIwPg8HTrHFsLNflg==", + "version": "0.5.4", "dev": true, + "license": "MIT", "dependencies": { + "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", "busboy": "^1.6.0", "fast-querystring": "^1.1.1", - "fast-url-parser": "^1.1.3", "tslib": "^2.3.1" }, "engines": { @@ -2017,15 +1568,13 @@ }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/urlpattern-polyfill": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@graphql-tools/batch-execute": { "version": "9.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-9.0.2.tgz", - "integrity": "sha512-Y2uwdZI6ZnatopD/SYfZ1eGuQFI7OU2KGZ2/B/7G9ISmgMl5K+ZZWz/PfIEXeiHirIDhyk54s4uka5rj2xwKqQ==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.5", "dataloader": "^2.2.2", @@ -2040,12 +1589,11 @@ } }, "node_modules/@graphql-tools/code-file-loader": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-8.0.2.tgz", - "integrity": "sha512-AKNpkElUL2cWocYpC4DzNEpo6qJw8Lp+L3bKQ/mIfmbsQxgLz5uve6zHBMhDaFPdlwfIox41N3iUSvi77t9e8A==", + "version": "8.0.3", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-tools/graphql-tag-pluck": "8.0.2", + "@graphql-tools/graphql-tag-pluck": "8.1.0", "@graphql-tools/utils": "^10.0.0", "globby": "^11.0.3", "tslib": "^2.4.0", @@ -2059,10 +1607,9 @@ } }, "node_modules/@graphql-tools/delegate": { - "version": "10.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.2.tgz", - "integrity": "sha512-ZU7VnR2xFgHrGnsuw6+nRJkcvSucn7w5ooxb/lTKlVfrNJfTwJevNcNKMnbtPUSajG3+CaFym/nU6v44GXCmNw==", + "version": "10.0.3", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/batch-execute": "^9.0.1", "@graphql-tools/executor": "^1.0.0", @@ -2080,9 +1627,8 @@ }, "node_modules/@graphql-tools/documents": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/documents/-/documents-1.0.0.tgz", - "integrity": "sha512-rHGjX1vg/nZ2DKqRGfDPNC55CWZBMldEVcH+91BThRa6JeT80NqXknffLLEZLRUxyikCfkwMsk6xR3UNMqG0Rg==", "dev": true, + "license": "MIT", "dependencies": { "lodash.sortby": "^4.7.0", "tslib": "^2.4.0" @@ -2096,9 +1642,8 @@ }, "node_modules/@graphql-tools/executor": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.2.0.tgz", - "integrity": "sha512-SKlIcMA71Dha5JnEWlw4XxcaJ+YupuXg0QCZgl2TOLFz4SkGCwU/geAsJvUJFwK2RbVLpQv/UMq67lOaBuwDtg==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "@graphql-typed-document-node/core": "3.2.0", @@ -2115,9 +1660,8 @@ }, "node_modules/@graphql-tools/executor-graphql-ws": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.0.tgz", - "integrity": "sha512-yM67SzwE8rYRpm4z4AuGtABlOp9mXXVy6sxXnTJRoYIdZrmDbKVfIY+CpZUJCqS0FX3xf2+GoHlsj7Qswaxgcg==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.2", "@types/ws": "^8.0.0", @@ -2134,10 +1678,9 @@ } }, "node_modules/@graphql-tools/executor-http": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.2.tgz", - "integrity": "sha512-JKTB4E3kdQM2/1NEcyrVPyQ8057ZVthCV5dFJiKktqY9IdmF00M8gupFcW3jlbM/Udn78ickeUBsUzA3EouqpA==", + "version": "1.0.7", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.2", "@repeaterjs/repeater": "^3.0.4", @@ -2156,20 +1699,18 @@ }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/events": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", - "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, + "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/fetch": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.9.tgz", - "integrity": "sha512-OTVoDm039CNyAWSRc2WBimMl/N9J4Fk2le21Xzcf+3OiWPNNSIbMnpWKBUyraPh2d9SAEgoBdQxTfVNihXgiUw==", + "version": "0.9.15", "dev": true, + "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.4.8", + "@whatwg-node/node-fetch": "^0.5.0", "urlpattern-polyfill": "^9.0.0" }, "engines": { @@ -2177,15 +1718,14 @@ } }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/node-fetch": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.14.tgz", - "integrity": "sha512-ii/eZz2PcjLGj9D6WfsmfzlTzZV1Kz6MxYpq2Vc5P21J8vkKfENWC9B2ISsFCKovxElLukIwPg8HTrHFsLNflg==", + "version": "0.5.4", "dev": true, + "license": "MIT", "dependencies": { + "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", "busboy": "^1.6.0", "fast-querystring": "^1.1.1", - "fast-url-parser": "^1.1.3", "tslib": "^2.3.1" }, "engines": { @@ -2194,21 +1734,19 @@ }, "node_modules/@graphql-tools/executor-http/node_modules/urlpattern-polyfill": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@graphql-tools/executor-legacy-ws": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.1.tgz", - "integrity": "sha512-PQrTJ+ncHMEQspBARc2lhwiQFfRAX/z/CsOdZTFjIljOHgRWGAA1DAx7pEN0j6PflbLCfZ3NensNq2jCBwF46w==", + "version": "1.0.5", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "@types/ws": "^8.0.0", - "isomorphic-ws": "5.0.0", + "isomorphic-ws": "^5.0.0", "tslib": "^2.4.0", - "ws": "8.13.0" + "ws": "^8.15.0" }, "engines": { "node": ">=16.0.0" @@ -2218,12 +1756,11 @@ } }, "node_modules/@graphql-tools/git-loader": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/git-loader/-/git-loader-8.0.2.tgz", - "integrity": "sha512-AuCB0nlPvsHh8u42zRZdlD/ZMaWP9A44yAkQUVCZir1E/LG63fsZ9svTWJ+CbusW3Hd0ZP9qpxEhlHxnd4Tlsg==", + "version": "8.0.3", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-tools/graphql-tag-pluck": "8.0.2", + "@graphql-tools/graphql-tag-pluck": "8.1.0", "@graphql-tools/utils": "^10.0.0", "is-glob": "4.0.3", "micromatch": "^4.0.4", @@ -2239,9 +1776,8 @@ }, "node_modules/@graphql-tools/github-loader": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/github-loader/-/github-loader-8.0.0.tgz", - "integrity": "sha512-VuroArWKcG4yaOWzV0r19ElVIV6iH6UKDQn1MXemND0xu5TzrFme0kf3U9o0YwNo0kUYEk9CyFM0BYg4he17FA==", "dev": true, + "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", "@graphql-tools/executor-http": "^1.0.0", @@ -2260,20 +1796,18 @@ }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", - "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, + "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.9.tgz", - "integrity": "sha512-OTVoDm039CNyAWSRc2WBimMl/N9J4Fk2le21Xzcf+3OiWPNNSIbMnpWKBUyraPh2d9SAEgoBdQxTfVNihXgiUw==", + "version": "0.9.15", "dev": true, + "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.4.8", + "@whatwg-node/node-fetch": "^0.5.0", "urlpattern-polyfill": "^9.0.0" }, "engines": { @@ -2281,15 +1815,14 @@ } }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.14.tgz", - "integrity": "sha512-ii/eZz2PcjLGj9D6WfsmfzlTzZV1Kz6MxYpq2Vc5P21J8vkKfENWC9B2ISsFCKovxElLukIwPg8HTrHFsLNflg==", + "version": "0.5.4", "dev": true, + "license": "MIT", "dependencies": { + "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", "busboy": "^1.6.0", "fast-querystring": "^1.1.1", - "fast-url-parser": "^1.1.3", "tslib": "^2.3.1" }, "engines": { @@ -2298,15 +1831,13 @@ }, "node_modules/@graphql-tools/github-loader/node_modules/urlpattern-polyfill": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@graphql-tools/graphql-file-loader": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.0.0.tgz", - "integrity": "sha512-wRXj9Z1IFL3+zJG1HWEY0S4TXal7+s1vVhbZva96MSp0kbb/3JBF7j0cnJ44Eq0ClccMgGCDFqPFXty4JlpaPg==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/import": "7.0.0", "@graphql-tools/utils": "^10.0.0", @@ -2322,10 +1853,9 @@ } }, "node_modules/@graphql-tools/graphql-tag-pluck": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.0.2.tgz", - "integrity": "sha512-U6fE4yEHxuk/nqmPixHpw1WhqdS6aYuaV60m1bEmUmGJNbpAhaMBy01JncpvpF15yZR5LZ0UjkHg+A3Lhoc8YQ==", + "version": "8.1.0", "dev": true, + "license": "MIT", "dependencies": { "@babel/core": "^7.22.9", "@babel/parser": "^7.16.8", @@ -2344,9 +1874,8 @@ }, "node_modules/@graphql-tools/import": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-7.0.0.tgz", - "integrity": "sha512-NVZiTO8o1GZs6OXzNfjB+5CtQtqsZZpQOq+Uu0w57kdUkT4RlQKlwhT8T81arEsbV55KpzkpFsOZP7J1wdmhBw==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "resolve-from": "5.0.0", @@ -2359,20 +1888,10 @@ "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, - "node_modules/@graphql-tools/import/node_modules/resolve-from": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", - "dev": true, - "engines": { - "node": ">=8" - } - }, "node_modules/@graphql-tools/json-file-loader": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-8.0.0.tgz", - "integrity": "sha512-ki6EF/mobBWJjAAC84xNrFMhNfnUFD6Y0rQMGXekrUgY0NdeYXHU0ZUgHzC9O5+55FslqUmAUHABePDHTyZsLg==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "globby": "^11.0.3", @@ -2387,13 +1906,12 @@ } }, "node_modules/@graphql-tools/load": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-8.0.0.tgz", - "integrity": "sha512-Cy874bQJH0FP2Az7ELPM49iDzOljQmK1PPH6IuxsWzLSTxwTqd8dXA09dcVZrI7/LsN26heTY2R8q2aiiv0GxQ==", + "version": "8.0.1", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.11", "p-limit": "3.1.0", "tslib": "^2.4.0" }, @@ -2405,12 +1923,11 @@ } }, "node_modules/@graphql-tools/merge": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-9.0.0.tgz", - "integrity": "sha512-J7/xqjkGTTwOJmaJQJ2C+VDBDOWJL3lKrHJN4yMaRLAJH3PosB7GiPRaSDZdErs0+F77sH2MKs2haMMkywzx7Q==", + "version": "9.0.1", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.10", "tslib": "^2.4.0" }, "engines": { @@ -2422,9 +1939,8 @@ }, "node_modules/@graphql-tools/optimize": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/optimize/-/optimize-2.0.0.tgz", - "integrity": "sha512-nhdT+CRGDZ+bk68ic+Jw1OZ99YCDIKYA5AlVAnBHJvMawSx9YQqQAIj4refNc1/LRieGiuWvhbG3jvPVYho0Dg==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.4.0" }, @@ -2436,13 +1952,12 @@ } }, "node_modules/@graphql-tools/prisma-loader": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/@graphql-tools/prisma-loader/-/prisma-loader-8.0.1.tgz", - "integrity": "sha512-bl6e5sAYe35Z6fEbgKXNrqRhXlCJYeWKBkarohgYA338/SD9eEhXtg3Cedj7fut3WyRLoQFpHzfiwxKs7XrgXg==", + "version": "8.0.2", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/url-loader": "^8.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.8", "@types/js-yaml": "^4.0.0", "@types/json-stable-stringify": "^1.0.32", "@whatwg-node/fetch": "^0.9.0", @@ -2452,7 +1967,7 @@ "graphql-request": "^6.0.0", "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.0", - "jose": "^4.11.4", + "jose": "^5.0.0", "js-yaml": "^4.0.0", "json-stable-stringify": "^1.0.1", "lodash": "^4.17.20", @@ -2462,130 +1977,55 @@ }, "engines": { "node": ">=16.0.0" - }, - "peerDependencies": { - "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" - } - }, - "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/events": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", - "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", - "dev": true, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.9.tgz", - "integrity": "sha512-OTVoDm039CNyAWSRc2WBimMl/N9J4Fk2le21Xzcf+3OiWPNNSIbMnpWKBUyraPh2d9SAEgoBdQxTfVNihXgiUw==", - "dev": true, - "dependencies": { - "@whatwg-node/node-fetch": "^0.4.8", - "urlpattern-polyfill": "^9.0.0" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.14.tgz", - "integrity": "sha512-ii/eZz2PcjLGj9D6WfsmfzlTzZV1Kz6MxYpq2Vc5P21J8vkKfENWC9B2ISsFCKovxElLukIwPg8HTrHFsLNflg==", - "dev": true, - "dependencies": { - "@whatwg-node/events": "^0.1.0", - "busboy": "^1.6.0", - "fast-querystring": "^1.1.1", - "fast-url-parser": "^1.1.3", - "tslib": "^2.3.1" - }, - "engines": { - "node": ">=16.0.0" - } - }, - "node_modules/@graphql-tools/prisma-loader/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/@graphql-tools/prisma-loader/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + }, + "peerDependencies": { + "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, - "node_modules/@graphql-tools/prisma-loader/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/events": { + "version": "0.1.1", "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, + "license": "MIT", "engines": { - "node": ">=7.0.0" + "node": ">=16.0.0" } }, - "node_modules/@graphql-tools/prisma-loader/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/@graphql-tools/prisma-loader/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/fetch": { + "version": "0.9.15", "dev": true, + "license": "MIT", + "dependencies": { + "@whatwg-node/node-fetch": "^0.5.0", + "urlpattern-polyfill": "^9.0.0" + }, "engines": { - "node": ">=8" + "node": ">=16.0.0" } }, - "node_modules/@graphql-tools/prisma-loader/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/node-fetch": { + "version": "0.5.4", "dev": true, + "license": "MIT", "dependencies": { - "has-flag": "^4.0.0" + "@kamilkisiela/fast-url-parser": "^1.1.4", + "@whatwg-node/events": "^0.1.0", + "busboy": "^1.6.0", + "fast-querystring": "^1.1.1", + "tslib": "^2.3.1" }, "engines": { - "node": ">=8" + "node": ">=16.0.0" } }, "node_modules/@graphql-tools/prisma-loader/node_modules/urlpattern-polyfill": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@graphql-tools/relay-operation-optimizer": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.0.tgz", - "integrity": "sha512-UNlJi5y3JylhVWU4MBpL0Hun4Q7IoJwv9xYtmAz+CgRa066szzY7dcuPfxrA7cIGgG/Q6TVsKsYaiF4OHPs1Fw==", "dev": true, + "license": "MIT", "dependencies": { "@ardatan/relay-compiler": "12.0.0", "@graphql-tools/utils": "^10.0.0", @@ -2599,13 +2039,12 @@ } }, "node_modules/@graphql-tools/schema": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-10.0.0.tgz", - "integrity": "sha512-kf3qOXMFcMs2f/S8Y3A8fm/2w+GaHAkfr3Gnhh2LOug/JgpY/ywgFVxO3jOeSpSEdoYcDKLcXVjMigNbY4AdQg==", + "version": "10.0.2", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-tools/merge": "^9.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/merge": "^9.0.1", + "@graphql-tools/utils": "^10.0.10", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, @@ -2617,15 +2056,14 @@ } }, "node_modules/@graphql-tools/url-loader": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-8.0.0.tgz", - "integrity": "sha512-rPc9oDzMnycvz+X+wrN3PLrhMBQkG4+sd8EzaFN6dypcssiefgWKToXtRKI8HHK68n2xEq1PyrOpkjHFJB+GwA==", + "version": "8.0.1", "dev": true, + "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", "@graphql-tools/delegate": "^10.0.0", "@graphql-tools/executor-graphql-ws": "^1.0.0", - "@graphql-tools/executor-http": "^1.0.0", + "@graphql-tools/executor-http": "^1.0.5", "@graphql-tools/executor-legacy-ws": "^1.0.0", "@graphql-tools/utils": "^10.0.0", "@graphql-tools/wrap": "^10.0.0", @@ -2645,20 +2083,18 @@ }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", - "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, + "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.9.tgz", - "integrity": "sha512-OTVoDm039CNyAWSRc2WBimMl/N9J4Fk2le21Xzcf+3OiWPNNSIbMnpWKBUyraPh2d9SAEgoBdQxTfVNihXgiUw==", + "version": "0.9.15", "dev": true, + "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.4.8", + "@whatwg-node/node-fetch": "^0.5.0", "urlpattern-polyfill": "^9.0.0" }, "engines": { @@ -2666,15 +2102,14 @@ } }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.4.14", - "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.4.14.tgz", - "integrity": "sha512-ii/eZz2PcjLGj9D6WfsmfzlTzZV1Kz6MxYpq2Vc5P21J8vkKfENWC9B2ISsFCKovxElLukIwPg8HTrHFsLNflg==", + "version": "0.5.4", "dev": true, + "license": "MIT", "dependencies": { + "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", "busboy": "^1.6.0", "fast-querystring": "^1.1.1", - "fast-url-parser": "^1.1.3", "tslib": "^2.3.1" }, "engines": { @@ -2683,17 +2118,16 @@ }, "node_modules/@graphql-tools/url-loader/node_modules/urlpattern-polyfill": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-9.0.0.tgz", - "integrity": "sha512-WHN8KDQblxd32odxeIgo83rdVDE2bvdkb86it7bMhYZwWKJz0+O0RK/eZiHYnM+zgt/U7hAHOlCQGfjjvSkw2g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@graphql-tools/utils": { - "version": "10.0.5", - "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.5.tgz", - "integrity": "sha512-ZTioQqg9z9eCG3j+KDy54k1gp6wRIsLqkx5yi163KVvXVkfjsrdErCyZjrEug21QnKE9piP4tyxMpMMOT1RuRw==", + "version": "10.0.12", "dev": true, + "license": "MIT", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", + "cross-inspect": "1.0.0", "dset": "^3.1.2", "tslib": "^2.4.0" }, @@ -2705,12 +2139,11 @@ } }, "node_modules/@graphql-tools/wrap": { - "version": "10.0.0", - "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-10.0.0.tgz", - "integrity": "sha512-HDOeUUh6UhpiH0WPJUQl44ODt1x5pnMUbOJZ7GjTdGQ7LK0AgVt3ftaAQ9duxLkiAtYJmu5YkULirfZGj4HzDg==", + "version": "10.0.1", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-tools/delegate": "^10.0.0", + "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/schema": "^10.0.0", "@graphql-tools/utils": "^10.0.0", "tslib": "^2.4.0", @@ -2725,20 +2158,18 @@ }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", - "integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==", + "license": "MIT", "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "node_modules/@humanwhocodes/config-array": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.10.tgz", - "integrity": "sha512-KVVjQmNUepDVGXNuoRRdmmEjruj0KfiGSbS8LVc12LMsWDQzRXJ0qdhN8L8uUigKpfEHRhlaQFY0ib1tnUbNeQ==", + "version": "0.11.14", "dev": true, + "license": "Apache-2.0", "dependencies": { - "@humanwhocodes/object-schema": "^1.2.1", - "debug": "^4.1.1", + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", "minimatch": "^3.0.5" }, "engines": { @@ -2747,9 +2178,8 @@ }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, + "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -2759,16 +2189,33 @@ } }, "node_modules/@humanwhocodes/object-schema": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz", - "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", - "dev": true + "version": "2.0.2", + "dev": true, + "license": "BSD-3-Clause" + }, + "node_modules/@istanbuljs/schema": { + "version": "0.1.3", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", - "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -2780,42 +2227,42 @@ }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", - "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", - "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", - "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz", - "integrity": "sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw==", + "version": "0.3.21", "dev": true, + "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" } }, + "node_modules/@kamilkisiela/fast-url-parser": { + "version": "1.1.4", + "dev": true, + "license": "MIT" + }, "node_modules/@mapbox/geojson-rewind": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", - "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==", + "license": "ISC", "dependencies": { "get-stream": "^6.0.1", "minimist": "^1.2.6" @@ -2826,47 +2273,39 @@ }, "node_modules/@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", - "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==", "engines": { "node": ">= 0.6" } }, "node_modules/@mapbox/point-geometry": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", - "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==" + "license": "ISC" }, "node_modules/@mapbox/tiny-sdf": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz", - "integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==" + "license": "BSD-2-Clause" }, "node_modules/@mapbox/unitbezier": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz", - "integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==" + "license": "BSD-2-Clause" }, "node_modules/@mapbox/vector-tile": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz", - "integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==", + "license": "BSD-3-Clause", "dependencies": { "@mapbox/point-geometry": "~0.1.0" } }, "node_modules/@mapbox/whoots-js": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz", - "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==", + "license": "ISC", "engines": { "node": ">=6.0.0" } }, "node_modules/@maplibre/maplibre-gl-style-spec": { "version": "19.3.3", - "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz", - "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==", + "license": "ISC", "dependencies": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/unitbezier": "^0.0.1", @@ -2883,9 +2322,8 @@ }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", "run-parallel": "^1.1.9" @@ -2896,18 +2334,16 @@ }, "node_modules/@nodelib/fs.stat": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/@nodelib/fs.walk": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" @@ -2918,10 +2354,8 @@ }, "node_modules/@parcel/watcher": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.3.0.tgz", - "integrity": "sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ==", "dev": true, - "hasInstallScript": true, + "license": "MIT", "dependencies": { "detect-libc": "^1.0.3", "is-glob": "^4.0.3", @@ -2950,54 +2384,13 @@ "@parcel/watcher-win32-x64": "2.3.0" } }, - "node_modules/@parcel/watcher-android-arm64": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.3.0.tgz", - "integrity": "sha512-f4o9eA3dgk0XRT3XhB0UWpWpLnKgrh1IwNJKJ7UJek7eTYccQ8LR7XUWFKqw6aEq5KUNlCcGvSzKqSX/vtWVVA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-darwin-arm64": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz", - "integrity": "sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@parcel/watcher-darwin-x64": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.3.0.tgz", - "integrity": "sha512-20oBj8LcEOnLE3mgpy6zuOq8AplPu9NcSSSfyVKgfOhNAc4eF4ob3ldj0xWjGGbOF7Dcy1Tvm6ytvgdjlfUeow==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -3010,202 +2403,20 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher-freebsd-x64": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.3.0.tgz", - "integrity": "sha512-7LftKlaHunueAEiojhCn+Ef2CTXWsLgTl4hq0pkhkTBFI3ssj2bJXmH2L67mKpiAD5dz66JYk4zS66qzdnIOgw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm-glibc": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.3.0.tgz", - "integrity": "sha512-1apPw5cD2xBv1XIHPUlq0cO6iAaEUQ3BcY0ysSyD9Kuyw4MoWm1DV+W9mneWI+1g6OeP6dhikiFE6BlU+AToTQ==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm64-glibc": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.3.0.tgz", - "integrity": "sha512-mQ0gBSQEiq1k/MMkgcSB0Ic47UORZBmWoAWlMrTW6nbAGoLZP+h7AtUM7H3oDu34TBFFvjy4JCGP43JlylkTQA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-arm64-musl": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.3.0.tgz", - "integrity": "sha512-LXZAExpepJew0Gp8ZkJ+xDZaTQjLHv48h0p0Vw2VMFQ8A+RKrAvpFuPVCVwKJCr5SE+zvaG+Etg56qXvTDIedw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-x64-glibc": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.3.0.tgz", - "integrity": "sha512-P7Wo91lKSeSgMTtG7CnBS6WrA5otr1K7shhSjKHNePVmfBHDoAOHYRXgUmhiNfbcGk0uMCHVcdbfxtuiZCHVow==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-linux-x64-musl": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.3.0.tgz", - "integrity": "sha512-+kiRE1JIq8QdxzwoYY+wzBs9YbJ34guBweTK8nlzLKimn5EQ2b2FSC+tAOpq302BuIMjyuUGvBiUhEcLIGMQ5g==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-arm64": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.3.0.tgz", - "integrity": "sha512-35gXCnaz1AqIXpG42evcoP2+sNL62gZTMZne3IackM+6QlfMcJLy3DrjuL6Iks7Czpd3j4xRBzez3ADCj1l7Aw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-ia32": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.3.0.tgz", - "integrity": "sha512-FJS/IBQHhRpZ6PiCjFt1UAcPr0YmCLHRbTc00IBTrelEjlmmgIVLeOx4MSXzx2HFEy5Jo5YdhGpxCuqCyDJ5ow==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/@parcel/watcher-win32-x64": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.3.0.tgz", - "integrity": "sha512-dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 10.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, "node_modules/@peculiar/asn1-schema": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.6.tgz", - "integrity": "sha512-izNRxPoaeJeg/AyH8hER6s+H7p4itk+03QCa4sbxI3lNdseQYCuxzgsuNK8bTXChtLTjpJz6NmXKA73qLa3rCA==", + "version": "2.3.8", "dev": true, + "license": "MIT", "dependencies": { "asn1js": "^3.0.5", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" + "pvtsutils": "^1.3.5", + "tslib": "^2.6.2" } }, "node_modules/@peculiar/json-schema": { "version": "1.1.12", - "resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz", - "integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, @@ -3215,9 +2426,8 @@ }, "node_modules/@peculiar/webcrypto": { "version": "1.4.3", - "resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.4.3.tgz", - "integrity": "sha512-VtaY4spKTdN5LjJ04im/d/joXuvLbQdgy5Z4DXF4MFZhQ+MTrejbNMkfZBp1Bs3O5+bFqnJgyGdPuZQflvIa5A==", "dev": true, + "license": "MIT", "dependencies": { "@peculiar/asn1-schema": "^2.3.6", "@peculiar/json-schema": "^1.1.12", @@ -3231,17 +2441,15 @@ }, "node_modules/@popperjs/core": { "version": "2.11.8", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", - "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", + "license": "MIT", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" } }, "node_modules/@react-aria/ssr": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.7.1.tgz", - "integrity": "sha512-ovVPSD1WlRpZHt7GI9DqJrWG3OIYS+NXQ9y5HIewMJpSe+jPQmMQfyRmgX4EnvmxSlp0u04Wg/7oItcoSIb/RA==", + "version": "3.9.1", + "license": "Apache-2.0", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -3253,15 +2461,13 @@ } }, "node_modules/@repeaterjs/repeater": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.4.tgz", - "integrity": "sha512-AW8PKd6iX3vAZ0vA43nOUOnbq/X5ihgU+mSXXqunMkeQADGiqw/PY0JNeYtD5sr0PAy51YPgAPbDoeapv9r8WA==", - "dev": true + "version": "3.0.5", + "dev": true, + "license": "MIT" }, "node_modules/@restart/hooks": { - "version": "0.4.11", - "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.11.tgz", - "integrity": "sha512-Ft/ncTULZN6ldGHiF/k5qt72O8JyRMOeg0tApvCni8LkoiEahO+z3TNxfXIVGy890YtWVDvJAl662dVJSJXvMw==", + "version": "0.4.15", + "license": "MIT", "dependencies": { "dequal": "^2.0.3" }, @@ -3271,8 +2477,7 @@ }, "node_modules/@restart/ui": { "version": "1.6.6", - "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.6.tgz", - "integrity": "sha512-eC3puKuWE1SRYbojWHXnvCNHGgf3uzHCb6JOhnF4OXPibOIPEkR1sqDSkL643ydigxwh+ruCa1CmYHlzk7ikKA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.21.0", "@popperjs/core": "^2.11.6", @@ -3289,60 +2494,118 @@ "react-dom": ">=16.14.0" } }, - "node_modules/@restart/ui/node_modules/uncontrollable": { - "version": "8.0.4", - "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-8.0.4.tgz", - "integrity": "sha512-ulRWYWHvscPFc0QQXvyJjY6LIXU56f0h8pQFvhxiKk5V1fcI8gp9Ht9leVAhrVjzqMw0BgjspBINx9r6oyJUvQ==", - "peerDependencies": { - "react": ">=16.14.0" + "node_modules/@restart/ui/node_modules/uncontrollable": { + "version": "8.0.4", + "license": "MIT", + "peerDependencies": { + "react": ">=16.14.0" + } + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.9.5", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "dev": true, + "license": "MIT" + }, + "node_modules/@swc/helpers": { + "version": "0.5.3", + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@testing-library/dom": { + "version": "9.3.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.1.3", + "chalk": "^4.1.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "pretty-format": "^27.0.2" + }, + "engines": { + "node": ">=14" } }, - "node_modules/@swc/helpers": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.1.tgz", - "integrity": "sha512-sJ902EfIzn1Fa+qYmjdQqh8tPsoxyBz+8yBKC2HKUxyezKJFwPGOn7pv4WY6QuQW//ySQi5lJjA/ZT9sNWWNTg==", + "node_modules/@testing-library/react": { + "version": "14.1.2", + "dev": true, + "license": "MIT", "dependencies": { - "tslib": "^2.4.0" + "@babel/runtime": "^7.12.5", + "@testing-library/dom": "^9.0.0", + "@types/react-dom": "^18.0.0" + }, + "engines": { + "node": ">=14" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" } }, + "node_modules/@types/aria-query": { + "version": "5.0.4", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/estree": { + "version": "1.0.5", + "dev": true, + "license": "MIT" + }, "node_modules/@types/geojson": { "version": "7946.0.13", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.13.tgz", - "integrity": "sha512-bmrNrgKMOhM3WsafmbGmC+6dsF2Z308vLFsQ3a/bT8X8Sv5clVYpPars/UPq+sAaJP+5OoLAYgwbkS5QEJdLUQ==" + "license": "MIT" + }, + "node_modules/@types/istanbul-lib-coverage": { + "version": "2.0.6", + "dev": true, + "license": "MIT" }, "node_modules/@types/js-yaml": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.5.tgz", - "integrity": "sha512-FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA==", - "dev": true + "version": "4.0.9", + "dev": true, + "license": "MIT" }, "node_modules/@types/json-schema": { - "version": "7.0.12", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.12.tgz", - "integrity": "sha512-Hr5Jfhc9eYOQNPYO5WLDq/n4jqijdHNlDXjuAQkkt+mWdQR+XJToOHrsD4cPaMXpn6KO7y2+wM8AZEs8VpBLVA==", - "dev": true + "version": "7.0.15", + "dev": true, + "license": "MIT" }, "node_modules/@types/json-stable-stringify": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.34.tgz", - "integrity": "sha512-s2cfwagOQAS8o06TcwKfr9Wx11dNGbH2E9vJz1cqV+a/LOyhWNLUNd6JSRYNzvB4d29UuJX2M0Dj9vE1T8fRXw==", - "dev": true + "version": "1.0.36", + "dev": true, + "license": "MIT" }, "node_modules/@types/json5": { "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@types/mapbox__point-geometry": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", - "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==" + "license": "MIT" }, "node_modules/@types/mapbox__vector-tile": { "version": "1.3.4", - "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz", - "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==", + "license": "MIT", "dependencies": { "@types/geojson": "*", "@types/mapbox__point-geometry": "*", @@ -3350,33 +2613,31 @@ } }, "node_modules/@types/mapbox-gl": { - "version": "2.7.13", - "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.13.tgz", - "integrity": "sha512-qNffhTdYkeFl8QG9Q1zPPJmcs8PvHgmLa1PcwP1rxvcfMsIgcFr/FnrCttG0ZnH7Kzdd7xfECSRNTWSr4jC3PQ==", + "version": "2.7.19", + "license": "MIT", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/node": { - "version": "20.5.7", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.5.7.tgz", - "integrity": "sha512-dP7f3LdZIysZnmvP3ANJYTSwg+wLLl8p7RqniVlV7j+oXSXAbt9h0WIBFmJy5inWZoX9wZN6eXx+YXd9Rh3RBA==", - "dev": true + "version": "20.11.0", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~5.26.4" + } }, "node_modules/@types/pbf": { "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz", - "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==" + "license": "MIT" }, "node_modules/@types/prop-types": { - "version": "15.7.5", - "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz", - "integrity": "sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==" + "version": "15.7.11", + "license": "MIT" }, "node_modules/@types/react": { "version": "18.2.21", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.21.tgz", - "integrity": "sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==", + "license": "MIT", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -3385,59 +2646,51 @@ }, "node_modules/@types/react-dom": { "version": "18.2.7", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", - "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", "dev": true, + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-transition-group": { - "version": "4.4.6", - "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.6.tgz", - "integrity": "sha512-VnCdSxfcm08KjsJVQcfBmhEQAPnLB8G08hAxn39azX1qYBQ/5RVQuoHuKIcfKOdncuaUvEpFKFzEvbtIMsfVew==", + "version": "4.4.10", + "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { - "version": "0.16.3", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.3.tgz", - "integrity": "sha512-5cJ8CB4yAx7BH1oMvdU0Jh9lrEXyPkar6F9G/ERswkCuvP4KQZfZkSjcMbAICCpQTN4OuZn8tz0HiKv9TGZgrQ==" + "version": "0.16.8", + "license": "MIT" }, "node_modules/@types/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-cJRQXpObxfNKkFAZbJl2yjWtJCqELQIdShsogr1d2MilP8dKD9TE/nEKHkJgUNHdGKCQaf9HbIynuV2csLGVLg==", - "dev": true + "version": "7.5.6", + "dev": true, + "license": "MIT" }, "node_modules/@types/supercluster": { "version": "7.1.3", - "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz", - "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==", + "license": "MIT", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/warning": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.0.tgz", - "integrity": "sha512-t/Tvs5qR47OLOr+4E9ckN8AmP2Tf16gWq+/qA4iUGS/OOyHVO8wv2vjJuX8SNOUTJyWb+2t7wJm6cXILFnOROA==" + "version": "3.0.3", + "license": "MIT" }, "node_modules/@types/ws": { - "version": "8.5.5", - "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.5.tgz", - "integrity": "sha512-lwhs8hktwxSjf9UaZ9tG5M03PGogvFaH8gUgLNbN9HKIg0dvv6q+gkSuJ8HN4/VbyxkuLzCjlN7GquQ0gUJfIg==", + "version": "8.5.10", "dev": true, + "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz", - "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.5.1", "@typescript-eslint/scope-manager": "6.5.0", @@ -3468,11 +2721,40 @@ } } }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { + "version": "7.5.4", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC" + }, "node_modules/@typescript-eslint/parser": { "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz", - "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "6.5.0", "@typescript-eslint/types": "6.5.0", @@ -3490,167 +2772,391 @@ "peerDependencies": { "eslint": "^7.0.0 || ^8.0.0" }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "6.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "6.5.0", + "@typescript-eslint/visitor-keys": "6.5.0" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "6.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/typescript-estree": "6.5.0", + "@typescript-eslint/utils": "6.5.0", + "debug": "^4.3.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "6.5.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "6.5.0", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "@typescript-eslint/types": "6.5.0", + "@typescript-eslint/visitor-keys": "6.5.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.5.4", + "ts-api-utils": "^1.0.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { + "version": "7.5.4", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/@typescript-eslint/utils": { + "version": "6.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@eslint-community/eslint-utils": "^4.4.0", + "@types/json-schema": "^7.0.12", + "@types/semver": "^7.5.0", + "@typescript-eslint/scope-manager": "6.5.0", + "@typescript-eslint/types": "6.5.0", + "@typescript-eslint/typescript-estree": "6.5.0", + "semver": "^7.5.4" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/semver": { + "version": "7.5.4", + "dev": true, + "license": "ISC", + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/yallist": { + "version": "4.0.0", + "dev": true, + "license": "ISC" + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "6.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "6.5.0", + "eslint-visitor-keys": "^3.4.1" + }, + "engines": { + "node": "^16.0.0 || >=18.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@vitejs/plugin-react": { + "version": "4.0.4", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/core": "^7.22.9", + "@babel/plugin-transform-react-jsx-self": "^7.22.5", + "@babel/plugin-transform-react-jsx-source": "^7.22.5", + "react-refresh": "^0.14.0" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "peerDependencies": { + "vite": "^4.2.0" + } + }, + "node_modules/@vitest/coverage-v8": { + "version": "1.1.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@ampproject/remapping": "^2.2.1", + "@bcoe/v8-coverage": "^0.2.3", + "debug": "^4.3.4", + "istanbul-lib-coverage": "^3.2.2", + "istanbul-lib-report": "^3.0.1", + "istanbul-lib-source-maps": "^4.0.1", + "istanbul-reports": "^3.1.6", + "magic-string": "^0.30.5", + "magicast": "^0.3.2", + "picocolors": "^1.0.0", + "std-env": "^3.5.0", + "test-exclude": "^6.0.0", + "v8-to-istanbul": "^9.2.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "vitest": "^1.0.0" } }, - "node_modules/@typescript-eslint/scope-manager": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz", - "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==", + "node_modules/@vitest/expect": { + "version": "1.1.3", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "6.5.0", - "@typescript-eslint/visitor-keys": "6.5.0" + "@vitest/spy": "1.1.3", + "@vitest/utils": "1.1.3", + "chai": "^4.3.10" }, - "engines": { - "node": "^16.0.0 || >=18.0.0" + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/runner": { + "version": "1.1.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/utils": "1.1.3", + "p-limit": "^5.0.0", + "pathe": "^1.1.1" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://opencollective.com/vitest" } }, - "node_modules/@typescript-eslint/type-utils": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz", - "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==", + "node_modules/@vitest/runner/node_modules/p-limit": { + "version": "5.0.0", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "6.5.0", - "@typescript-eslint/utils": "6.5.0", - "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" + "yocto-queue": "^1.0.0" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">=18" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@typescript-eslint/types": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz", - "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==", + "node_modules/@vitest/runner/node_modules/yocto-queue": { + "version": "1.0.0", "dev": true, + "license": "MIT", "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">=12.20" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz", - "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==", + "node_modules/@vitest/snapshot": { + "version": "1.1.3", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "6.5.0", - "@typescript-eslint/visitor-keys": "6.5.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "magic-string": "^0.30.5", + "pathe": "^1.1.1", + "pretty-format": "^29.7.0" }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/snapshot/node_modules/ansi-styles": { + "version": "5.2.0", + "dev": true, + "license": "MIT", "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@typescript-eslint/utils": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz", - "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==", + "node_modules/@vitest/snapshot/node_modules/pretty-format": { + "version": "29.7.0", "dev": true, + "license": "MIT", "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.5.0", - "@typescript-eslint/types": "6.5.0", - "@typescript-eslint/typescript-estree": "6.5.0", - "semver": "^7.5.4" + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@vitest/snapshot/node_modules/react-is": { + "version": "18.2.0", + "dev": true, + "license": "MIT" + }, + "node_modules/@vitest/spy": { + "version": "1.1.3", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyspy": "^2.2.0" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "url": "https://opencollective.com/vitest" } }, - "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz", - "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==", + "node_modules/@vitest/utils": { + "version": "1.1.3", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "6.5.0", - "eslint-visitor-keys": "^3.4.1" + "diff-sequences": "^29.6.3", + "estree-walker": "^3.0.3", + "loupe": "^2.3.7", + "pretty-format": "^29.7.0" }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/utils/node_modules/ansi-styles": { + "version": "5.2.0", + "dev": true, + "license": "MIT", "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": ">=10" }, "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/@vitejs/plugin-react": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.0.4.tgz", - "integrity": "sha512-7wU921ABnNYkETiMaZy7XqpueMnpu5VxvVps13MjmCo+utBdD79sZzrApHawHtVX66cCJQQTXFcjH0y9dSUK8g==", + "node_modules/@vitest/utils/node_modules/pretty-format": { + "version": "29.7.0", "dev": true, + "license": "MIT", "dependencies": { - "@babel/core": "^7.22.9", - "@babel/plugin-transform-react-jsx-self": "^7.22.5", - "@babel/plugin-transform-react-jsx-source": "^7.22.5", - "react-refresh": "^0.14.0" + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" }, "engines": { - "node": "^14.18.0 || >=16.0.0" - }, - "peerDependencies": { - "vite": "^4.2.0" + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, + "node_modules/@vitest/utils/node_modules/react-is": { + "version": "18.2.0", + "dev": true, + "license": "MIT" + }, "node_modules/@whatwg-node/events": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.0.3.tgz", - "integrity": "sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@whatwg-node/fetch": { "version": "0.8.8", - "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.8.8.tgz", - "integrity": "sha512-CdcjGC2vdKhc13KKxgsc6/616BQ7ooDIgPeTuAiE8qfCnS0mGzcfCOoZXypQSz73nxI+GWc7ZReIAVhxoE1KCg==", "dev": true, + "license": "MIT", "dependencies": { "@peculiar/webcrypto": "^1.4.0", "@whatwg-node/node-fetch": "^0.3.6", @@ -3661,9 +3167,8 @@ }, "node_modules/@whatwg-node/node-fetch": { "version": "0.3.6", - "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.3.6.tgz", - "integrity": "sha512-w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA==", "dev": true, + "license": "MIT", "dependencies": { "@whatwg-node/events": "^0.0.3", "busboy": "^1.6.0", @@ -3673,10 +3178,9 @@ } }, "node_modules/acorn": { - "version": "8.10.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz", - "integrity": "sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==", + "version": "8.11.3", "dev": true, + "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -3686,18 +3190,24 @@ }, "node_modules/acorn-jsx": { "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, + "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, + "node_modules/acorn-walk": { + "version": "8.3.2", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/agent-base": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", - "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^4.3.4" }, @@ -3707,9 +3217,8 @@ }, "node_modules/aggregate-error": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, + "license": "MIT", "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -3720,9 +3229,8 @@ }, "node_modules/ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, + "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3736,9 +3244,8 @@ }, "node_modules/ansi-escapes": { "version": "4.3.2", - "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", - "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -3749,67 +3256,52 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", - "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "version": "4.3.0", "dev": true, + "license": "MIT", "dependencies": { - "color-convert": "^1.9.0" + "color-convert": "^2.0.1" }, "engines": { - "node": ">=4" + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, "node_modules/argparse": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true + "dev": true, + "license": "Python-2.0" }, "node_modules/aria-query": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "version": "5.1.3", "dev": true, + "license": "Apache-2.0", "dependencies": { - "dequal": "^2.0.3" + "deep-equal": "^2.0.5" } }, "node_modules/arr-union": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/array-buffer-byte-length": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.0.tgz", - "integrity": "sha512-LPuwb2P+NrQw3XhxGc36+XSvuBPopovXYTR9Ew++Du9Yb/bx5AzBfrIsBoj0EZUifjQU+sHL21sseZ3jerWO/A==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "is-array-buffer": "^3.0.1" @@ -3819,15 +3311,14 @@ } }, "node_modules/array-includes": { - "version": "3.1.6", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.6.tgz", - "integrity": "sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==", + "version": "3.1.7", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "is-string": "^1.0.7" }, "engines": { @@ -3839,18 +3330,16 @@ }, "node_modules/array-union": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/array.prototype.findlastindex": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.3.tgz", - "integrity": "sha512-LzLoiOMAxvy+Gd3BAq3B7VeIgPdo+Q8hthvKtXybMvRV0jrXfJM/t8mw7nNlpEcVlVUnCnM2KSX4XU5HmpodOA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3866,14 +3355,13 @@ } }, "node_modules/array.prototype.flat": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.1.tgz", - "integrity": "sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==", + "version": "1.3.2", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -3884,14 +3372,13 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.1.tgz", - "integrity": "sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==", + "version": "1.3.2", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0" }, "engines": { @@ -3902,27 +3389,26 @@ } }, "node_modules/array.prototype.tosorted": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.1.tgz", - "integrity": "sha512-pZYPXPRl2PqWcsUs6LOMn+1f1532nEoPTYowBtqLwAW+W8vSVhkIGnmOX1t/UQjD6YGI0vcD2B1U7ZFGQH9jnQ==", + "version": "1.1.2", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.1.3" + "get-intrinsic": "^1.2.1" } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.1.tgz", - "integrity": "sha512-09x0ZWFEjj4WD8PDbykUwo3t9arLn8NIzmmYEJFpYekOAQjpkGSyrQhNoRTcwwcFRu+ycWF78QZ63oWTqSjBcw==", + "version": "1.0.2", "dev": true, + "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.2", "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", "get-intrinsic": "^1.2.1", "is-array-buffer": "^3.0.2", "is-shared-array-buffer": "^1.0.2" @@ -3936,15 +3422,13 @@ }, "node_modules/asap": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/asn1js": { "version": "3.0.5", - "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.5.tgz", - "integrity": "sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "pvtsutils": "^1.3.2", "pvutils": "^1.1.3", @@ -3954,43 +3438,51 @@ "node": ">=12.0.0" } }, + "node_modules/assertion-error": { + "version": "1.1.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/assign-symbols": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/ast-types-flow": { "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", - "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/astral-regex": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", - "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/asynciterator.prototype": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", - "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", "dev": true, + "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" } }, + "node_modules/asynckit": { + "version": "0.4.0", + "dev": true, + "license": "MIT" + }, "node_modules/auto-bind": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz", - "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -4000,9 +3492,8 @@ }, "node_modules/available-typed-arrays": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz", - "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -4011,34 +3502,30 @@ } }, "node_modules/axe-core": { - "version": "4.7.2", - "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.2.tgz", - "integrity": "sha512-zIURGIS1E1Q4pcrMjp+nnEh+16G56eG/MUllJH8yEvw7asDo7Ac9uhC9KIH5jzpITueEZolfYglnCGIuSBz39g==", + "version": "4.8.3", "dev": true, + "license": "MPL-2.0", "engines": { "node": ">=4" } }, "node_modules/axobject-query": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", - "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "dequal": "^2.0.3" } }, "node_modules/babel-plugin-syntax-trailing-function-commas": { "version": "7.0.0-beta.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz", - "integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/babel-preset-fbjs": { "version": "3.4.0", - "resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz", - "integrity": "sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==", "dev": true, + "license": "MIT", "dependencies": { "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", @@ -4074,14 +3561,11 @@ }, "node_modules/balanced-match": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/base64-js": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "funding": [ { @@ -4096,13 +3580,21 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" + }, + "node_modules/bidi-js": { + "version": "1.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "require-from-string": "^2.0.2" + } }, "node_modules/bl": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", - "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, + "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -4111,8 +3603,6 @@ }, "node_modules/bootstrap": { "version": "5.3.1", - "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz", - "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==", "funding": [ { "type": "github", @@ -4123,15 +3613,15 @@ "url": "https://opencollective.com/bootstrap" } ], + "license": "MIT", "peerDependencies": { "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4139,9 +3629,8 @@ }, "node_modules/braces": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, + "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -4150,9 +3639,7 @@ } }, "node_modules/browserslist": { - "version": "4.21.10", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz", - "integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==", + "version": "4.22.2", "dev": true, "funding": [ { @@ -4168,11 +3655,12 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001517", - "electron-to-chromium": "^1.4.477", - "node-releases": "^2.0.13", - "update-browserslist-db": "^1.0.11" + "caniuse-lite": "^1.0.30001565", + "electron-to-chromium": "^1.4.601", + "node-releases": "^2.0.14", + "update-browserslist-db": "^1.0.13" }, "bin": { "browserslist": "cli.js" @@ -4183,17 +3671,14 @@ }, "node_modules/bser": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", - "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, + "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" } }, "node_modules/buffer": { "version": "5.7.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", - "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "funding": [ { @@ -4209,6 +3694,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -4216,8 +3702,6 @@ }, "node_modules/busboy": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", - "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", "dev": true, "dependencies": { "streamsearch": "^1.1.0" @@ -4228,8 +3712,7 @@ }, "node_modules/bytewise": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz", - "integrity": "sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ==", + "license": "MIT", "dependencies": { "bytewise-core": "^1.2.2", "typewise": "^1.0.3" @@ -4237,20 +3720,27 @@ }, "node_modules/bytewise-core": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz", - "integrity": "sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA==", + "license": "MIT", "dependencies": { "typewise-core": "^1.2" } }, + "node_modules/cac": { + "version": "6.7.14", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, "node_modules/call-bind": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", - "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "version": "1.0.5", "dev": true, + "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "get-intrinsic": "^1.0.2" + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.1", + "set-function-length": "^1.1.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -4258,18 +3748,16 @@ }, "node_modules/callsites": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/camel-case": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", - "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", "dev": true, + "license": "MIT", "dependencies": { "pascal-case": "^3.1.2", "tslib": "^2.0.3" @@ -4277,17 +3765,14 @@ }, "node_modules/camelcase": { "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001524", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001524.tgz", - "integrity": "sha512-Jj917pJtYg9HSJBF95HVX3Cdr89JUyLT4IZ8SvM5aDRni95swKgYi3TgYLH5hnGfPE/U1dg6IfZ50UsIlLkwSA==", + "version": "1.0.30001576", "dev": true, "funding": [ { @@ -4302,38 +3787,55 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ] + ], + "license": "CC-BY-4.0" }, "node_modules/capital-case": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", - "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", "dev": true, + "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", "upper-case-first": "^2.0.2" } }, - "node_modules/chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "node_modules/chai": { + "version": "4.4.0", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" + "assertion-error": "^1.1.0", + "check-error": "^1.0.3", + "deep-eql": "^4.1.3", + "get-func-name": "^2.0.2", + "loupe": "^2.3.6", + "pathval": "^1.1.1", + "type-detect": "^4.0.8" }, "engines": { "node": ">=4" } }, + "node_modules/chalk": { + "version": "4.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, "node_modules/change-case": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", - "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", "dev": true, + "license": "MIT", "dependencies": { "camel-case": "^4.1.2", "capital-case": "^1.0.4", @@ -4351,9 +3853,8 @@ }, "node_modules/change-case-all": { "version": "1.0.15", - "resolved": "https://registry.npmjs.org/change-case-all/-/change-case-all-1.0.15.tgz", - "integrity": "sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==", "dev": true, + "license": "MIT", "dependencies": { "change-case": "^4.1.2", "is-lower-case": "^2.0.2", @@ -4369,29 +3870,36 @@ }, "node_modules/chardet": { "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/check-error": { + "version": "1.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.2" + }, + "engines": { + "node": "*" + } }, "node_modules/classnames": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.3.2.tgz", - "integrity": "sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw==" + "version": "2.5.1", + "license": "MIT" }, "node_modules/clean-stack": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/cli-cursor": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", - "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, + "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" }, @@ -4400,10 +3908,9 @@ } }, "node_modules/cli-spinners": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.0.tgz", - "integrity": "sha512-4/aL9X3Wh0yiMQlE+eeRhWP6vclO3QRtw1JHKIT0FFUs5FjpFmESqtMvYZ0+lbzBw900b95mS0hohy+qn2VK/g==", + "version": "2.9.2", "dev": true, + "license": "MIT", "engines": { "node": ">=6" }, @@ -4413,9 +3920,8 @@ }, "node_modules/cli-truncate": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", - "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "dev": true, + "license": "MIT", "dependencies": { "slice-ansi": "^3.0.0", "string-width": "^4.2.0" @@ -4429,65 +3935,29 @@ }, "node_modules/cli-width": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true, + "license": "ISC", "engines": { "node": ">= 10" } }, - "node_modules/cliui": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "dev": true, - "dependencies": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.1", - "wrap-ansi": "^7.0.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/cliui/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/cliui/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/cliui": { + "version": "8.0.1", "dev": true, + "license": "ISC", "dependencies": { - "color-name": "~1.1.4" + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=12" } }, - "node_modules/cliui/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -4502,54 +3972,61 @@ }, "node_modules/clone": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8" } }, "node_modules/color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "version": "2.0.1", "dev": true, + "license": "MIT", "dependencies": { - "color-name": "1.1.3" + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" } }, "node_modules/color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "version": "1.1.4", + "dev": true, + "license": "MIT" }, "node_modules/colorette": { "version": "2.0.20", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", - "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "dev": true, + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } }, "node_modules/common-tags": { "version": "1.8.2", - "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", - "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4.0.0" } }, "node_modules/concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/constant-case": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", - "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", "dev": true, + "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -4557,20 +4034,18 @@ } }, "node_modules/convert-source-map": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", - "dev": true + "version": "2.0.0", + "dev": true, + "license": "MIT" }, "node_modules/cosmiconfig": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.2.0.tgz", - "integrity": "sha512-3rTMnFJA1tCOPwRxtgF4wd7Ab2qvDbL8jX+3smjIbS4HlZBagTlpERbdN7iAbWlrfxE3M8c27kTwTawQ7st+OQ==", + "version": "8.3.6", "dev": true, + "license": "MIT", "dependencies": { - "import-fresh": "^3.2.1", + "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", - "parse-json": "^5.0.0", + "parse-json": "^5.2.0", "path-type": "^4.0.0" }, "engines": { @@ -4578,21 +4053,38 @@ }, "funding": { "url": "https://github.com/sponsors/d-fischer" + }, + "peerDependencies": { + "typescript": ">=4.9.5" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } } }, "node_modules/cross-fetch": { "version": "3.1.8", - "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", - "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "license": "MIT", "dependencies": { "node-fetch": "^2.6.12" } }, + "node_modules/cross-inspect": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=16.0.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, + "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -4602,34 +4094,64 @@ "node": ">= 8" } }, + "node_modules/css-tree": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "dependencies": { + "mdn-data": "2.0.30", + "source-map-js": "^1.0.1" + }, + "engines": { + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" + } + }, + "node_modules/cssstyle": { + "version": "4.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "rrweb-cssom": "^0.6.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/csstype": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.2.tgz", - "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ==" + "version": "3.1.3", + "license": "MIT" }, "node_modules/damerau-levenshtein": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", - "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", - "dev": true + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/data-urls": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0" + }, + "engines": { + "node": ">=18" + } }, "node_modules/dataloader": { "version": "2.2.2", - "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.2.2.tgz", - "integrity": "sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/debounce": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", - "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/debug": { "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -4644,24 +4166,68 @@ }, "node_modules/decamelize": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, + "node_modules/decimal.js": { + "version": "10.4.3", + "dev": true, + "license": "MIT" + }, + "node_modules/deep-eql": { + "version": "4.1.3", + "dev": true, + "license": "MIT", + "dependencies": { + "type-detect": "^4.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/deep-equal": { + "version": "2.2.3", + "dev": true, + "license": "MIT", + "dependencies": { + "array-buffer-byte-length": "^1.0.0", + "call-bind": "^1.0.5", + "es-get-iterator": "^1.1.3", + "get-intrinsic": "^1.2.2", + "is-arguments": "^1.1.1", + "is-array-buffer": "^3.0.2", + "is-date-object": "^1.0.5", + "is-regex": "^1.1.4", + "is-shared-array-buffer": "^1.0.2", + "isarray": "^2.0.5", + "object-is": "^1.1.5", + "object-keys": "^1.1.1", + "object.assign": "^4.1.4", + "regexp.prototype.flags": "^1.5.1", + "side-channel": "^1.0.4", + "which-boxed-primitive": "^1.0.2", + "which-collection": "^1.0.1", + "which-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/deep-is": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/defaults": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", - "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, + "license": "MIT", "dependencies": { "clone": "^1.0.2" }, @@ -4669,12 +4235,25 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/define-data-property": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/define-properties": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", - "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "version": "1.2.1", "dev": true, + "license": "MIT", "dependencies": { + "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" }, @@ -4685,37 +4264,41 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/dependency-graph": { "version": "0.11.0", - "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", - "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.6.0" } }, "node_modules/dequal": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/detect-indent": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", - "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/detect-libc": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", - "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", "dev": true, + "license": "Apache-2.0", "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -4723,11 +4306,18 @@ "node": ">=0.10" } }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "dev": true, + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, "node_modules/dir-glob": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, + "license": "MIT", "dependencies": { "path-type": "^4.0.0" }, @@ -4737,9 +4327,8 @@ }, "node_modules/doctrine": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", - "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -4747,10 +4336,14 @@ "node": ">=6.0.0" } }, + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "dev": true, + "license": "MIT" + }, "node_modules/dom-helpers": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", - "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" @@ -4758,9 +4351,8 @@ }, "node_modules/dot-case": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", - "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", "dev": true, + "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" @@ -4768,9 +4360,8 @@ }, "node_modules/dotenv": { "version": "16.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.3.1.tgz", - "integrity": "sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -4779,61 +4370,66 @@ } }, "node_modules/dset": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.2.tgz", - "integrity": "sha512-g/M9sqy3oHe477Ar4voQxWtaPIFw1jTdKZuomOjhCcBx9nHUNn0pu6NopuFFrTh/TRZIKEj+76vLWFu9BNKk+Q==", + "version": "3.1.3", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/earcut": { "version": "2.2.4", - "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", - "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==" + "license": "ISC" }, "node_modules/electron-to-chromium": { - "version": "1.4.504", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.504.tgz", - "integrity": "sha512-cSMwIAd8yUh54VwitVRVvHK66QqHWE39C3DRj8SWiXitEpVSY3wNPD9y1pxQtLIi4w3UdzF9klLsmuPshz09DQ==", - "dev": true + "version": "1.4.629", + "dev": true, + "license": "ISC" }, "node_modules/emoji-regex": { - "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "version": "9.2.2", + "dev": true, + "license": "MIT" + }, + "node_modules/entities": { + "version": "4.5.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } }, "node_modules/error-ex": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, + "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } }, "node_modules/es-abstract": { - "version": "1.22.1", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.1.tgz", - "integrity": "sha512-ioRRcXMO6OFyRpyzV3kE1IIBd4WG5/kltnzdxSCqoP8CMGs/Li+M1uF5o7lOkZVFjDs+NLesthnF66Pg/0q0Lw==", + "version": "1.22.3", "dev": true, + "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.2", "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.5", "es-set-tostringtag": "^2.0.1", "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.5", - "get-intrinsic": "^1.2.1", + "function.prototype.name": "^1.1.6", + "get-intrinsic": "^1.2.2", "get-symbol-description": "^1.0.0", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has": "^1.0.3", "has-property-descriptors": "^1.0.0", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", + "hasown": "^2.0.0", "internal-slot": "^1.0.5", "is-array-buffer": "^3.0.2", "is-callable": "^1.2.7", @@ -4841,23 +4437,23 @@ "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.10", + "is-typed-array": "^1.1.12", "is-weakref": "^1.0.2", - "object-inspect": "^1.12.3", + "object-inspect": "^1.13.1", "object-keys": "^1.1.1", "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.0", - "safe-array-concat": "^1.0.0", + "regexp.prototype.flags": "^1.5.1", + "safe-array-concat": "^1.0.1", "safe-regex-test": "^1.0.0", - "string.prototype.trim": "^1.2.7", - "string.prototype.trimend": "^1.0.6", - "string.prototype.trimstart": "^1.0.6", + "string.prototype.trim": "^1.2.8", + "string.prototype.trimend": "^1.0.7", + "string.prototype.trimstart": "^1.0.7", "typed-array-buffer": "^1.0.0", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.10" + "which-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -4866,15 +4462,33 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-get-iterator": { + "version": "1.1.3", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.3", + "has-symbols": "^1.0.3", + "is-arguments": "^1.1.1", + "is-map": "^2.0.2", + "is-set": "^2.0.2", + "is-string": "^1.0.7", + "isarray": "^2.0.5", + "stop-iteration-iterator": "^1.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/es-iterator-helpers": { - "version": "1.0.14", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.14.tgz", - "integrity": "sha512-JgtVnwiuoRuzLvqelrvN3Xu7H9bu2ap/kQ2CrM62iidP8SKuD99rWU3CJy++s7IVL2qb/AjXPGR/E7i9ngd/Cw==", + "version": "1.0.15", "dev": true, + "license": "MIT", "dependencies": { "asynciterator.prototype": "^1.0.0", "call-bind": "^1.0.2", - "define-properties": "^1.2.0", + "define-properties": "^1.2.1", "es-abstract": "^1.22.1", "es-set-tostringtag": "^2.0.1", "function-bind": "^1.1.1", @@ -4884,38 +4498,35 @@ "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "internal-slot": "^1.0.5", - "iterator.prototype": "^1.1.0", - "safe-array-concat": "^1.0.0" + "iterator.prototype": "^1.1.2", + "safe-array-concat": "^1.0.1" } }, "node_modules/es-set-tostringtag": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.1.tgz", - "integrity": "sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==", + "version": "2.0.2", "dev": true, + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.1.3", - "has": "^1.0.3", - "has-tostringtag": "^1.0.0" + "get-intrinsic": "^1.2.2", + "has-tostringtag": "^1.0.0", + "hasown": "^2.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-shim-unscopables": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.0.tgz", - "integrity": "sha512-Jm6GPcCdC30eMLbZ2x8z2WuRwAws3zTBBKuusffYVUrNj/GVSUAZ+xKMaUpfNDR5IbyNA5LJbaecoUVbmUcB1w==", + "version": "1.0.2", "dev": true, + "license": "MIT", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, + "license": "MIT", "dependencies": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -4930,10 +4541,9 @@ }, "node_modules/esbuild": { "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -4967,27 +4577,27 @@ }, "node_modules/escalade": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz", - "integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "version": "4.0.0", "dev": true, + "license": "MIT", "engines": { - "node": ">=0.8.0" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/eslint": { "version": "8.48.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz", - "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -5039,9 +4649,8 @@ }, "node_modules/eslint-config-prettier": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", - "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", "dev": true, + "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -5051,9 +4660,8 @@ }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", - "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", - "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.13.0", @@ -5062,18 +4670,16 @@ }, "node_modules/eslint-import-resolver-node/node_modules/debug": { "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-module-utils": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", - "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, + "license": "MIT", "dependencies": { "debug": "^3.2.7" }, @@ -5088,18 +4694,16 @@ }, "node_modules/eslint-module-utils/node_modules/debug": { "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import": { "version": "2.28.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", - "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "dev": true, + "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.findlastindex": "^1.2.2", @@ -5128,18 +4732,16 @@ }, "node_modules/eslint-plugin-import/node_modules/debug": { "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, + "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import/node_modules/doctrine": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -5147,20 +4749,10 @@ "node": ">=0.10.0" } }, - "node_modules/eslint-plugin-import/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/eslint-plugin-jsx-a11y": { "version": "6.7.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz", - "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==", "dev": true, + "license": "MIT", "dependencies": { "@babel/runtime": "^7.20.7", "aria-query": "^5.1.3", @@ -5186,26 +4778,10 @@ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" } }, - "node_modules/eslint-plugin-jsx-a11y/node_modules/emoji-regex": { - "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", - "dev": true - }, - "node_modules/eslint-plugin-jsx-a11y/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/eslint-plugin-react": { "version": "7.33.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", - "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, + "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.flatmap": "^1.3.1", @@ -5233,9 +4809,8 @@ }, "node_modules/eslint-plugin-react-hooks": { "version": "4.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -5245,18 +4820,16 @@ }, "node_modules/eslint-plugin-react-refresh": { "version": "0.4.3", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz", - "integrity": "sha512-Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA==", "dev": true, + "license": "MIT", "peerDependencies": { "eslint": ">=7" } }, "node_modules/eslint-plugin-react/node_modules/doctrine": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", - "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -5265,12 +4838,11 @@ } }, "node_modules/eslint-plugin-react/node_modules/resolve": { - "version": "2.0.0-next.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.4.tgz", - "integrity": "sha512-iMDbmAWtfU+MHpxt/I5iWI7cY6YVEZUQ3MBgPQ++XD1PELuJHIl82xBmObyP2KyQmkNB2dsqF7seoQQiAn5yDQ==", + "version": "2.0.0-next.5", "dev": true, + "license": "MIT", "dependencies": { - "is-core-module": "^2.9.0", + "is-core-module": "^2.13.0", "path-parse": "^1.0.7", "supports-preserve-symlinks-flag": "^1.0.0" }, @@ -5281,20 +4853,10 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/eslint-plugin-react/node_modules/semver": { - "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", - "dev": true, - "bin": { - "semver": "bin/semver.js" - } - }, "node_modules/eslint-scope": { "version": "7.2.2", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", - "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -5308,9 +4870,8 @@ }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, + "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -5318,72 +4879,10 @@ "url": "https://opencollective.com/eslint" } }, - "node_modules/eslint/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/eslint/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/eslint/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/eslint/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/eslint/node_modules/escape-string-regexp": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", - "dev": true, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/eslint/node_modules/globals": { - "version": "13.21.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-13.21.0.tgz", - "integrity": "sha512-ybyme3s4yy/t/3s35bewwXKOf7cvzfreG2lH0lZl0JB7I4GxRP2ghxOK/Nb9EkRXdbBXZLfq/p/0W2JUONB/Gg==", + "version": "13.24.0", "dev": true, + "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -5394,32 +4893,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/eslint/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/eslint/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/eslint/node_modules/type-fest": { + "version": "0.20.2", "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, + "license": "(MIT OR CC0-1.0)", "engines": { - "node": ">=8" + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/espree": { "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -5434,9 +4922,8 @@ }, "node_modules/esquery": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", - "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -5446,9 +4933,8 @@ }, "node_modules/esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -5458,26 +4944,100 @@ }, "node_modules/estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, + "node_modules/estree-walker": { + "version": "3.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } + }, "node_modules/esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, + "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, + "node_modules/execa": { + "version": "8.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "cross-spawn": "^7.0.3", + "get-stream": "^8.0.1", + "human-signals": "^5.0.0", + "is-stream": "^3.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^5.1.0", + "onetime": "^6.0.0", + "signal-exit": "^4.1.0", + "strip-final-newline": "^3.0.0" + }, + "engines": { + "node": ">=16.17" + }, + "funding": { + "url": "https://github.com/sindresorhus/execa?sponsor=1" + } + }, + "node_modules/execa/node_modules/get-stream": { + "version": "8.0.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/mimic-fn": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/onetime": { + "version": "6.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "mimic-fn": "^4.0.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/execa/node_modules/signal-exit": { + "version": "4.1.0", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/extend-shallow": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", + "license": "MIT", "dependencies": { "is-extendable": "^0.1.0" }, @@ -5487,9 +5047,8 @@ }, "node_modules/external-editor": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, + "license": "MIT", "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -5501,9 +5060,8 @@ }, "node_modules/extract-files": { "version": "11.0.0", - "resolved": "https://registry.npmjs.org/extract-files/-/extract-files-11.0.0.tgz", - "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==", "dev": true, + "license": "MIT", "engines": { "node": "^12.20 || >= 14.13" }, @@ -5513,21 +5071,18 @@ }, "node_modules/fast-decode-uri-component": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz", - "integrity": "sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-glob": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.1.tgz", - "integrity": "sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==", + "version": "3.3.2", "dev": true, + "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -5541,9 +5096,8 @@ }, "node_modules/fast-glob/node_modules/glob-parent": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -5553,63 +5107,50 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/fast-querystring": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.2.tgz", - "integrity": "sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==", "dev": true, + "license": "MIT", "dependencies": { "fast-decode-uri-component": "^1.0.1" } }, "node_modules/fast-url-parser": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", - "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==", "dev": true, + "license": "MIT", "dependencies": { "punycode": "^1.3.2" } }, - "node_modules/fast-url-parser/node_modules/punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", - "dev": true - }, "node_modules/fastq": { - "version": "1.15.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.15.0.tgz", - "integrity": "sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==", + "version": "1.16.0", "dev": true, + "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, "node_modules/fb-watchman": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", - "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, + "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" } }, "node_modules/fbjs": { "version": "3.0.5", - "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz", - "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==", "dev": true, + "license": "MIT", "dependencies": { "cross-fetch": "^3.1.5", "fbjs-css-vars": "^1.0.0", @@ -5622,15 +5163,13 @@ }, "node_modules/fbjs-css-vars": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", - "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/figures": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", - "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, + "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -5641,11 +5180,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/figures/node_modules/escape-string-regexp": { + "version": "1.0.5", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, "node_modules/file-entry-cache": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", - "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, + "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" }, @@ -5655,9 +5201,8 @@ }, "node_modules/fill-range": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, + "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -5667,9 +5212,8 @@ }, "node_modules/find-up": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, + "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -5682,46 +5226,53 @@ } }, "node_modules/flat-cache": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.1.0.tgz", - "integrity": "sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==", + "version": "3.2.0", "dev": true, + "license": "MIT", "dependencies": { - "flatted": "^3.2.7", + "flatted": "^3.2.9", "keyv": "^4.5.3", "rimraf": "^3.0.2" }, "engines": { - "node": ">=12.0.0" + "node": "^10.12.0 || >=12.0.0" } }, "node_modules/flatted": { - "version": "3.2.7", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.7.tgz", - "integrity": "sha512-5nqDSxl8nn5BSNxyR3n4I6eDmbolI6WT+QqR547RwxQapgjQBmtktdP+HTBb/a/zLsbzERTONyUB5pefh5TtjQ==", - "dev": true + "version": "3.2.9", + "dev": true, + "license": "ISC" }, "node_modules/for-each": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", - "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, + "license": "MIT", "dependencies": { "is-callable": "^1.1.3" } }, + "node_modules/form-data": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "hasInstallScript": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -5731,16 +5282,17 @@ } }, "node_modules/function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true + "version": "1.1.2", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } }, "node_modules/function.prototype.name": { "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -5756,46 +5308,49 @@ }, "node_modules/functions-have-names": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/gensync": { "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/geojson-vt": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", - "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==" + "license": "ISC" }, "node_modules/get-caller-file": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } }, + "node_modules/get-func-name": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/get-intrinsic": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz", - "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==", + "version": "1.2.2", "dev": true, + "license": "MIT", "dependencies": { - "function-bind": "^1.1.1", - "has": "^1.0.3", + "function-bind": "^1.1.2", "has-proto": "^1.0.1", - "has-symbols": "^1.0.3" + "has-symbols": "^1.0.3", + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5803,8 +5358,7 @@ }, "node_modules/get-stream": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", - "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -5814,9 +5368,8 @@ }, "node_modules/get-symbol-description": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", - "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" @@ -5830,22 +5383,19 @@ }, "node_modules/get-value": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/gl-matrix": { "version": "3.4.3", - "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", - "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==" + "license": "MIT" }, "node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, + "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5863,9 +5413,8 @@ }, "node_modules/glob-parent": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, + "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -5875,8 +5424,7 @@ }, "node_modules/global-prefix": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", - "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", + "license": "MIT", "dependencies": { "ini": "^1.3.5", "kind-of": "^6.0.2", @@ -5888,8 +5436,7 @@ }, "node_modules/global-prefix/node_modules/which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -5899,18 +5446,16 @@ }, "node_modules/globals": { "version": "11.12.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", - "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/globalthis": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", - "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", "dev": true, + "license": "MIT", "dependencies": { "define-properties": "^1.1.3" }, @@ -5923,9 +5468,8 @@ }, "node_modules/globby": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", - "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, + "license": "MIT", "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -5943,9 +5487,8 @@ }, "node_modules/gopd": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, + "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -5955,23 +5498,20 @@ }, "node_modules/graphemer": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", - "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/graphql": { "version": "16.8.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.0.tgz", - "integrity": "sha512-0oKGaR+y3qcS5mCu1vb7KG+a89vjn06C7Ihq/dDl3jA+A8B3TKomvi3CiEcVLJQGalbu8F52LxkOym7U5sSfbg==", + "license": "MIT", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } }, "node_modules/graphql-config": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/graphql-config/-/graphql-config-5.0.2.tgz", - "integrity": "sha512-7TPxOrlbiG0JplSZYCyxn2XQtqVhXomEjXUmWJVSS5ET1nPhOJSsIb/WTwqWhcYX6G0RlHXSj9PLtGTKmxLNGg==", + "version": "5.0.3", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/graphql-file-loader": "^8.0.0", "@graphql-tools/json-file-loader": "^8.0.0", @@ -6000,9 +5540,8 @@ }, "node_modules/graphql-config/node_modules/minimatch": { "version": "4.2.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.3.tgz", - "integrity": "sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -6012,8 +5551,7 @@ }, "node_modules/graphql-request": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-6.1.0.tgz", - "integrity": "sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==", + "license": "MIT", "dependencies": { "@graphql-typed-document-node/core": "^3.2.0", "cross-fetch": "^3.1.5" @@ -6024,9 +5562,8 @@ }, "node_modules/graphql-tag": { "version": "2.12.6", - "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz", - "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.1.0" }, @@ -6038,10 +5575,9 @@ } }, "node_modules/graphql-ws": { - "version": "5.14.0", - "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.14.0.tgz", - "integrity": "sha512-itrUTQZP/TgswR4GSSYuwWUzrE/w5GhbwM2GX3ic2U7aw33jgEsayfIlvaj7/GcIvZgNMzsPTrE5hqPuFUiE5g==", + "version": "5.14.3", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -6050,42 +5586,35 @@ } }, "node_modules/has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "version": "1.0.4", "dev": true, - "dependencies": { - "function-bind": "^1.1.1" - }, + "license": "MIT", "engines": { "node": ">= 0.4.0" } }, "node_modules/has-bigints": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "version": "4.0.0", "dev": true, + "license": "MIT", "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/has-property-descriptors": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", - "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "version": "1.0.1", "dev": true, + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.1.1" + "get-intrinsic": "^1.2.2" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6093,9 +5622,8 @@ }, "node_modules/has-proto": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", - "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6105,9 +5633,8 @@ }, "node_modules/has-symbols": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6117,9 +5644,8 @@ }, "node_modules/has-tostringtag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", - "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", "dev": true, + "license": "MIT", "dependencies": { "has-symbols": "^1.0.2" }, @@ -6130,21 +5656,46 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/hasown": { + "version": "2.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/header-case": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", - "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", "dev": true, + "license": "MIT", "dependencies": { "capital-case": "^1.0.4", "tslib": "^2.0.3" } }, + "node_modules/html-encoding-sniffer": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-encoding": "^3.1.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/html-escaper": { + "version": "2.0.2", + "dev": true, + "license": "MIT" + }, "node_modules/http-proxy-agent": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.0.tgz", - "integrity": "sha512-+ZT+iBxVUQ1asugqnD6oWoRiS25AkjNfG085dKJGtGxkdwLQrMKU5wJr2bOOFAXzKcTuqq+7fZlTMgG3SRfIYQ==", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -6154,10 +5705,9 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.1.tgz", - "integrity": "sha512-Eun8zV0kcYS1g19r78osiQLEFIRspRUDd9tIfBCTBPBeMieF/EsJNL8VI3xOIdYRDEkjQnqOYPsZ2DsWsVsFwQ==", + "version": "7.0.2", "dev": true, + "license": "MIT", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -6166,11 +5716,18 @@ "node": ">= 14" } }, + "node_modules/human-signals": { + "version": "5.0.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=16.17.0" + } + }, "node_modules/iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, + "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -6180,8 +5737,6 @@ }, "node_modules/ieee754": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "funding": [ { "type": "github", @@ -6195,31 +5750,29 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/ignore": { - "version": "5.2.4", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", - "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "version": "5.3.0", "dev": true, + "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/immutable": { "version": "3.7.6", - "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", - "integrity": "sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.8.0" } }, "node_modules/import-fresh": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", - "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, + "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -6231,11 +5784,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/import-fresh/node_modules/resolve-from": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/import-from": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz", - "integrity": "sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=12.2" }, @@ -6245,27 +5805,24 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.19" } }, "node_modules/indent-string": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, + "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -6273,20 +5830,17 @@ }, "node_modules/inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/ini": { "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" + "license": "ISC" }, "node_modules/inquirer": { "version": "8.2.6", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", - "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", "dev": true, + "license": "MIT", "dependencies": { "ansi-escapes": "^4.2.1", "chalk": "^4.1.1", @@ -6308,84 +5862,13 @@ "node": ">=12.0.0" } }, - "node_modules/inquirer/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/inquirer/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/inquirer/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/inquirer/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/inquirer/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/internal-slot": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.5.tgz", - "integrity": "sha512-Y+R5hJrzs52QCG2laLn4udYVnxsfny9CpOhNhUvk/SSSVyF6T27FzRbF0sroPidSu3X8oEAkOn2K804mjpt6UQ==", + "version": "1.0.6", "dev": true, + "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.0", - "has": "^1.0.3", + "get-intrinsic": "^1.2.2", + "hasown": "^2.0.0", "side-channel": "^1.0.4" }, "engines": { @@ -6394,17 +5877,15 @@ }, "node_modules/invariant": { "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "license": "MIT", "dependencies": { "loose-envify": "^1.0.0" } }, "node_modules/is-absolute": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", - "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "dev": true, + "license": "MIT", "dependencies": { "is-relative": "^1.0.0", "is-windows": "^1.0.1" @@ -6413,11 +5894,25 @@ "node": ">=0.10.0" } }, + "node_modules/is-arguments": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "has-tostringtag": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-array-buffer": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz", - "integrity": "sha512-y+FyyR/w8vfIRq4eQcM1EYgSTnmHXPqaF+IgzgraytCFq5Xh8lllDVmAZolPJiZttZLeFSINPYMaEJ7/vWUa1w==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.0", @@ -6429,15 +5924,13 @@ }, "node_modules/is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/is-async-function": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", "dev": true, + "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6450,9 +5943,8 @@ }, "node_modules/is-bigint": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, + "license": "MIT", "dependencies": { "has-bigints": "^1.0.1" }, @@ -6462,9 +5954,8 @@ }, "node_modules/is-boolean-object": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -6478,9 +5969,8 @@ }, "node_modules/is-callable": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6489,12 +5979,11 @@ } }, "node_modules/is-core-module": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.0.tgz", - "integrity": "sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ==", + "version": "2.13.1", "dev": true, + "license": "MIT", "dependencies": { - "has": "^1.0.3" + "hasown": "^2.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6502,9 +5991,8 @@ }, "node_modules/is-date-object": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, + "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6517,26 +6005,23 @@ }, "node_modules/is-extendable": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/is-extglob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/is-finalizationregistry": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6546,18 +6031,16 @@ }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-generator-function": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", "dev": true, + "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6570,9 +6053,8 @@ }, "node_modules/is-glob": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, + "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -6582,36 +6064,32 @@ }, "node_modules/is-interactive": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", - "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-lower-case": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-2.0.2.tgz", - "integrity": "sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/is-map": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", - "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-negative-zero": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", - "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6621,18 +6099,16 @@ }, "node_modules/is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/is-number-object": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, + "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6645,17 +6121,15 @@ }, "node_modules/is-path-inside": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", - "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-plain-object": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "license": "MIT", "dependencies": { "isobject": "^3.0.1" }, @@ -6663,11 +6137,15 @@ "node": ">=0.10.0" } }, + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "dev": true, + "license": "MIT" + }, "node_modules/is-regex": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -6681,9 +6159,8 @@ }, "node_modules/is-relative": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", - "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "dev": true, + "license": "MIT", "dependencies": { "is-unc-path": "^1.0.0" }, @@ -6693,18 +6170,16 @@ }, "node_modules/is-set": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", - "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-shared-array-buffer": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", - "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6712,11 +6187,21 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-stream": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/is-string": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, + "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6729,9 +6214,8 @@ }, "node_modules/is-symbol": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, + "license": "MIT", "dependencies": { "has-symbols": "^1.0.2" }, @@ -6744,9 +6228,8 @@ }, "node_modules/is-typed-array": { "version": "1.1.12", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz", - "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==", "dev": true, + "license": "MIT", "dependencies": { "which-typed-array": "^1.1.11" }, @@ -6759,9 +6242,8 @@ }, "node_modules/is-unc-path": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", - "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "dev": true, + "license": "MIT", "dependencies": { "unc-path-regex": "^0.1.2" }, @@ -6771,9 +6253,8 @@ }, "node_modules/is-unicode-supported": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, @@ -6783,27 +6264,24 @@ }, "node_modules/is-upper-case": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-2.0.2.tgz", - "integrity": "sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/is-weakmap": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", - "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-weakref": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6813,9 +6291,8 @@ }, "node_modules/is-weakset": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", - "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" @@ -6826,82 +6303,118 @@ }, "node_modules/is-windows": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/isarray": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" + "license": "ISC" }, "node_modules/isobject": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/isomorphic-ws": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz", - "integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==", "dev": true, - "peerDependencies": { - "ws": "*" + "license": "MIT", + "peerDependencies": { + "ws": "*" + } + }, + "node_modules/istanbul-lib-coverage": { + "version": "3.2.2", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=8" + } + }, + "node_modules/istanbul-lib-report": { + "version": "3.0.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^4.0.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-lib-source-maps": { + "version": "4.0.1", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/istanbul-reports": { + "version": "3.1.6", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + }, + "engines": { + "node": ">=8" } }, "node_modules/iterator.prototype": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.0.tgz", - "integrity": "sha512-rjuhAk1AJ1fssphHD0IFV6TWL40CwRZ53FrztKx43yk2v6rguBYsY4Bj1VU4HmoMmKwZUlx7mfnhDf9cOp4YTw==", + "version": "1.1.2", "dev": true, + "license": "MIT", "dependencies": { - "define-properties": "^1.1.4", - "get-intrinsic": "^1.1.3", + "define-properties": "^1.2.1", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", - "has-tostringtag": "^1.0.0", - "reflect.getprototypeof": "^1.0.3" + "reflect.getprototypeof": "^1.0.4", + "set-function-name": "^2.0.1" } }, "node_modules/jiti": { - "version": "1.19.3", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.19.3.tgz", - "integrity": "sha512-5eEbBDQT/jF1xg6l36P+mWGGoH9Spuy0PCdSr2dtWRDGC6ph/w9ZCL4lmESW8f8F7MwT3XKescfP0wnZWAKL9w==", + "version": "1.21.0", "dev": true, + "license": "MIT", "bin": { "jiti": "bin/jiti.js" } }, "node_modules/jose": { - "version": "4.14.4", - "resolved": "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz", - "integrity": "sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==", + "version": "5.2.0", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/panva" } }, "node_modules/js-tokens": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + "license": "MIT" }, "node_modules/js-yaml": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", - "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -6909,11 +6422,49 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsdom": { + "version": "23.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "@asamuzakjp/dom-selector": "^2.0.1", + "cssstyle": "^4.0.1", + "data-urls": "^5.0.0", + "decimal.js": "^10.4.3", + "form-data": "^4.0.0", + "html-encoding-sniffer": "^4.0.0", + "http-proxy-agent": "^7.0.0", + "https-proxy-agent": "^7.0.2", + "is-potential-custom-element-name": "^1.0.1", + "parse5": "^7.1.2", + "rrweb-cssom": "^0.6.0", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.1.3", + "w3c-xmlserializer": "^5.0.0", + "webidl-conversions": "^7.0.0", + "whatwg-encoding": "^3.1.1", + "whatwg-mimetype": "^4.0.0", + "whatwg-url": "^14.0.0", + "ws": "^8.16.0", + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "canvas": "^2.11.2" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, "node_modules/jsesc": { "version": "2.5.2", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", - "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, + "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -6923,29 +6474,31 @@ }, "node_modules/json-buffer": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stable-stringify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.2.tgz", - "integrity": "sha512-eunSSaEnxV12z+Z73y/j5N37/In40GK4GmsSy+tEHJMxknvqnA7/djeYtAgW0GsWHUfg+847WJjKaEylk2y09g==", + "version": "1.1.0", "dev": true, + "license": "MIT", "dependencies": { - "jsonify": "^0.0.1" + "call-bind": "^1.0.5", + "isarray": "^2.0.5", + "jsonify": "^0.0.1", + "object-keys": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6953,20 +6506,17 @@ }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/json-stringify-pretty-compact": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz", - "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==" + "license": "MIT" }, "node_modules/json-to-pretty-yaml": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz", - "integrity": "sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==", "dev": true, + "license": "Apache-2.0", "dependencies": { "remedial": "^1.0.7", "remove-trailing-spaces": "^1.0.6" @@ -6977,9 +6527,8 @@ }, "node_modules/json5": { "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -6987,20 +6536,23 @@ "node": ">=6" } }, + "node_modules/jsonc-parser": { + "version": "3.2.0", + "dev": true, + "license": "MIT" + }, "node_modules/jsonify": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", - "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", "dev": true, + "license": "Public Domain", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/jsx-ast-utils": { "version": "3.3.5", - "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", - "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", "dev": true, + "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.flat": "^1.3.1", @@ -7013,46 +6565,40 @@ }, "node_modules/kdbush": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", - "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==" + "license": "ISC" }, "node_modules/keyv": { - "version": "4.5.3", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.3.tgz", - "integrity": "sha512-QCiSav9WaX1PgETJ+SpNnx2PRRapJ/oRSXM4VO5OGYGSjrxbKPVFVhB3l2OCbLCk329N8qyAtsJjSjvVBWzEug==", + "version": "4.5.4", "dev": true, + "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } }, "node_modules/kind-of": { "version": "6.0.3", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", - "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/language-subtag-registry": { "version": "0.3.22", - "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", - "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==", - "dev": true + "dev": true, + "license": "CC0-1.0" }, "node_modules/language-tags": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz", - "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==", "dev": true, + "license": "MIT", "dependencies": { "language-subtag-registry": "~0.3.2" } }, "node_modules/levn": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -7063,15 +6609,13 @@ }, "node_modules/lines-and-columns": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/listr2": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", - "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", "dev": true, + "license": "MIT", "dependencies": { "cli-truncate": "^2.1.0", "colorette": "^2.0.16", @@ -7094,61 +6638,41 @@ } } }, - "node_modules/listr2/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/listr2/node_modules/wrap-ansi": { + "version": "7.0.0", "dev": true, + "license": "MIT", "dependencies": { - "color-convert": "^2.0.1" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/listr2/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, - "node_modules/listr2/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/listr2/node_modules/wrap-ansi": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "node_modules/local-pkg": { + "version": "0.5.0", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "mlly": "^1.4.2", + "pkg-types": "^1.0.3" }, "engines": { - "node": ">=10" + "node": ">=14" }, "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + "url": "https://github.com/sponsors/antfu" } }, "node_modules/locate-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, + "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -7161,27 +6685,23 @@ }, "node_modules/lodash": { "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/lodash.sortby": { "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/log-symbols": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -7193,187 +6713,158 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-symbols/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/log-update": { + "version": "4.0.0", "dev": true, + "license": "MIT", "dependencies": { - "color-convert": "^2.0.1" + "ansi-escapes": "^4.3.0", + "cli-cursor": "^3.1.0", + "slice-ansi": "^4.0.0", + "wrap-ansi": "^6.2.0" }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/log-symbols/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/log-update/node_modules/slice-ansi": { + "version": "4.0.0", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" }, "engines": { "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "url": "https://github.com/chalk/slice-ansi?sponsor=1" } }, - "node_modules/log-symbols/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, + "node_modules/loose-envify": { + "version": "1.4.0", + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "js-tokens": "^3.0.0 || ^4.0.0" }, - "engines": { - "node": ">=7.0.0" + "bin": { + "loose-envify": "cli.js" } }, - "node_modules/log-symbols/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/log-symbols/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "node_modules/loupe": { + "version": "2.3.7", "dev": true, - "engines": { - "node": ">=8" + "license": "MIT", + "dependencies": { + "get-func-name": "^2.0.1" } }, - "node_modules/log-symbols/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "node_modules/lower-case": { + "version": "2.0.2", "dev": true, + "license": "MIT", "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" + "tslib": "^2.0.3" } }, - "node_modules/log-update": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", - "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", + "node_modules/lower-case-first": { + "version": "2.0.2", "dev": true, + "license": "MIT", "dependencies": { - "ansi-escapes": "^4.3.0", - "cli-cursor": "^3.1.0", - "slice-ansi": "^4.0.0", - "wrap-ansi": "^6.2.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "tslib": "^2.0.3" } }, - "node_modules/log-update/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "node_modules/lru-cache": { + "version": "5.1.1", "dev": true, + "license": "ISC", "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" + "yallist": "^3.0.2" } }, - "node_modules/log-update/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/lz-string": { + "version": "1.5.0", + "dev": true, + "license": "MIT", + "bin": { + "lz-string": "bin/bin.js" + } + }, + "node_modules/magic-string": { + "version": "0.30.5", "dev": true, + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "@jridgewell/sourcemap-codec": "^1.4.15" }, "engines": { - "node": ">=7.0.0" + "node": ">=12" } }, - "node_modules/log-update/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true + "node_modules/magicast": { + "version": "0.3.2", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/parser": "^7.23.3", + "@babel/types": "^7.23.3", + "source-map-js": "^1.0.2" + } }, - "node_modules/log-update/node_modules/slice-ansi": { + "node_modules/make-dir": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", - "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "astral-regex": "^2.0.0", - "is-fullwidth-code-point": "^3.0.0" + "semver": "^7.5.3" }, "engines": { "node": ">=10" }, "funding": { - "url": "https://github.com/chalk/slice-ansi?sponsor=1" - } - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" + "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lower-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", - "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "node_modules/make-dir/node_modules/lru-cache": { + "version": "6.0.0", "dev": true, + "license": "ISC", "dependencies": { - "tslib": "^2.0.3" + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" } }, - "node_modules/lower-case-first": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-2.0.2.tgz", - "integrity": "sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==", + "node_modules/make-dir/node_modules/semver": { + "version": "7.5.4", "dev": true, + "license": "ISC", "dependencies": { - "tslib": "^2.0.3" + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" } }, - "node_modules/lru-cache": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "node_modules/make-dir/node_modules/yallist": { + "version": "4.0.0", "dev": true, - "dependencies": { - "yallist": "^3.0.2" - } + "license": "ISC" }, "node_modules/map-cache": { "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -7417,20 +6908,28 @@ "url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1" } }, + "node_modules/mdn-data": { + "version": "2.0.30", + "dev": true, + "license": "CC0-1.0" + }, + "node_modules/merge-stream": { + "version": "2.0.0", + "dev": true, + "license": "MIT" + }, "node_modules/merge2": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/meros": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/meros/-/meros-1.3.0.tgz", - "integrity": "sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==", "dev": true, + "license": "MIT", "engines": { "node": ">=13" }, @@ -7445,9 +6944,8 @@ }, "node_modules/micromatch": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", - "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, + "license": "MIT", "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -7456,20 +6954,37 @@ "node": ">=8.6" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "dev": true, + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/mimic-fn": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", - "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -7479,33 +6994,38 @@ }, "node_modules/minimist": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/mlly": { + "version": "1.5.0", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.11.3", + "pathe": "^1.1.2", + "pkg-types": "^1.0.3", + "ufo": "^1.3.2" + } + }, "node_modules/ms": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/murmurhash-js": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz", - "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==" + "license": "MIT" }, "node_modules/mute-stream": { "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/nanoid": { - "version": "3.3.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz", - "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==", + "version": "3.3.7", "dev": true, "funding": [ { @@ -7513,6 +7033,7 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -7522,15 +7043,13 @@ }, "node_modules/natural-compare": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/no-case": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", - "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", "dev": true, + "license": "MIT", "dependencies": { "lower-case": "^2.0.2", "tslib": "^2.0.3" @@ -7538,14 +7057,12 @@ }, "node_modules/node-addon-api": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.0.0.tgz", - "integrity": "sha512-vgbBJTS4m5/KkE16t5Ly0WW9hz46swAstv0hYYwMtbG7AznRhNyfLRe8HZAiWIpcHzoO7HxhLuBQj9rJ/Ho0ZA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "license": "MIT", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -7561,70 +7078,118 @@ } } }, + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "license": "MIT" + }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "license": "BSD-2-Clause" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/node-int64": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", - "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/node-releases": { - "version": "2.0.13", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz", - "integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ==", - "dev": true + "version": "2.0.14", + "dev": true, + "license": "MIT" }, "node_modules/normalize-path": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==", "dev": true, + "license": "MIT", "dependencies": { "remove-trailing-separator": "^1.0.1" }, - "engines": { - "node": ">=0.10.0" + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/npm-run-path": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "dependencies": { + "path-key": "^4.0.0" + }, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/npm-run-path/node_modules/path-key": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/nullthrows": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz", - "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/object-inspect": { - "version": "1.12.3", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz", - "integrity": "sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==", + "version": "1.13.1", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/object-is": { + "version": "1.1.5", "dev": true, + "license": "MIT", + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.1.3" + }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/object.assign": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.4.tgz", - "integrity": "sha512-1mxKf0e58bvyjSCtKYY4sRe9itRk3PJpquJOjeIkz885CczcI4IvJJDLPS72oowuSh+pBxUFROpX+TU++hxhZQ==", + "version": "4.1.5", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.4", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", "has-symbols": "^1.0.3", "object-keys": "^1.1.1" }, @@ -7637,9 +7202,8 @@ }, "node_modules/object.entries": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", - "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -7651,9 +7215,8 @@ }, "node_modules/object.fromentries": { "version": "2.0.7", - "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", - "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -7668,9 +7231,8 @@ }, "node_modules/object.groupby": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.1.tgz", - "integrity": "sha512-HqaQtqLnp/8Bn4GL16cj+CUYbnpe1bh0TtEaWvybszDG4tgxCJuRpV8VGuvNaI1fAnI4lUJzDG55MXcOH4JZcQ==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -7680,9 +7242,8 @@ }, "node_modules/object.hasown": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", - "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", "dev": true, + "license": "MIT", "dependencies": { "define-properties": "^1.2.0", "es-abstract": "^1.22.1" @@ -7693,9 +7254,8 @@ }, "node_modules/object.values": { "version": "1.1.7", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", - "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -7710,18 +7270,16 @@ }, "node_modules/once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, + "license": "ISC", "dependencies": { "wrappy": "1" } }, "node_modules/onetime": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", - "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, + "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -7734,9 +7292,8 @@ }, "node_modules/optionator": { "version": "0.9.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", - "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, + "license": "MIT", "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -7751,9 +7308,8 @@ }, "node_modules/ora": { "version": "5.4.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", - "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, + "license": "MIT", "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -7772,90 +7328,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/ora/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/ora/node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "dev": true, - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" - } - }, - "node_modules/ora/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/ora/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, - "node_modules/ora/node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/ora/node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/os-tmpdir": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/p-limit": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, + "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -7868,9 +7352,8 @@ }, "node_modules/p-locate": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, + "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -7883,9 +7366,8 @@ }, "node_modules/p-map": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, + "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -7898,18 +7380,16 @@ }, "node_modules/p-try": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/param-case": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", - "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", "dev": true, + "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -7917,9 +7397,8 @@ }, "node_modules/parent-module": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, + "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -7929,9 +7408,8 @@ }, "node_modules/parse-filepath": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", - "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", "dev": true, + "license": "MIT", "dependencies": { "is-absolute": "^1.0.0", "map-cache": "^0.2.0", @@ -7943,9 +7421,8 @@ }, "node_modules/parse-json": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, + "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -7959,11 +7436,21 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/parse5": { + "version": "7.1.2", + "dev": true, + "license": "MIT", + "dependencies": { + "entities": "^4.4.0" + }, + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" + } + }, "node_modules/pascal-case": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", - "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", "dev": true, + "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" @@ -7971,9 +7458,8 @@ }, "node_modules/path-case": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", - "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", "dev": true, + "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -7981,42 +7467,37 @@ }, "node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-parse": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/path-root": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", - "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", "dev": true, + "license": "MIT", "dependencies": { "path-root-regex": "^0.1.0" }, @@ -8026,26 +7507,36 @@ }, "node_modules/path-root-regex": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", - "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-type": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, + "node_modules/pathe": { + "version": "1.1.2", + "dev": true, + "license": "MIT" + }, + "node_modules/pathval": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/pbf": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", - "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", + "license": "BSD-3-Clause", "dependencies": { "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" @@ -8056,15 +7547,13 @@ }, "node_modules/picocolors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", - "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, + "license": "MIT", "engines": { "node": ">=8.6" }, @@ -8072,10 +7561,18 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/pkg-types": { + "version": "1.0.3", + "dev": true, + "license": "MIT", + "dependencies": { + "jsonc-parser": "^3.2.0", + "mlly": "^1.2.0", + "pathe": "^1.1.0" + } + }, "node_modules/postcss": { - "version": "8.4.28", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.28.tgz", - "integrity": "sha512-Z7V5j0cq8oEKyejIKfpD8b4eBy9cwW2JWPk0+fB1HOAMsfHbnAXLLS+PfVWlzMSLQaWttKDt607I0XHmpE67Vw==", + "version": "8.4.33", "dev": true, "funding": [ { @@ -8091,8 +7588,9 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "nanoid": "^3.3.6", + "nanoid": "^3.3.7", "picocolors": "^1.0.0", "source-map-js": "^1.0.2" }, @@ -8102,23 +7600,20 @@ }, "node_modules/potpack": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz", - "integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==" + "license": "ISC" }, "node_modules/prelude-ls": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.8.0" } }, "node_modules/prettier": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", - "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -8129,19 +7624,41 @@ "url": "https://github.com/prettier/prettier?sponsor=1" } }, + "node_modules/pretty-format": { + "version": "27.5.1", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, "node_modules/promise": { "version": "7.3.1", - "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", - "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dev": true, + "license": "MIT", "dependencies": { "asap": "~2.0.3" } }, "node_modules/prop-types": { "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", + "license": "MIT", "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -8150,8 +7667,7 @@ }, "node_modules/prop-types-extra": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz", - "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", + "license": "MIT", "dependencies": { "react-is": "^16.3.2", "warning": "^4.0.0" @@ -8160,42 +7676,51 @@ "react": ">=0.14.0" } }, + "node_modules/prop-types-extra/node_modules/react-is": { + "version": "16.13.1", + "license": "MIT" + }, + "node_modules/prop-types/node_modules/react-is": { + "version": "16.13.1", + "license": "MIT" + }, "node_modules/protocol-buffers-schema": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz", - "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==" + "license": "MIT" + }, + "node_modules/psl": { + "version": "1.9.0", + "dev": true, + "license": "MIT" }, "node_modules/punycode": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", - "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==", + "version": "1.4.1", "dev": true, - "engines": { - "node": ">=6" - } + "license": "MIT" }, "node_modules/pvtsutils": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.5.tgz", - "integrity": "sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.6.1" } }, "node_modules/pvutils": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz", - "integrity": "sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.0.0" } }, + "node_modules/querystringify": { + "version": "2.2.0", + "dev": true, + "license": "MIT" + }, "node_modules/queue-microtask": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, "funding": [ { @@ -8210,17 +7735,16 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/quickselect": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz", - "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==" + "license": "ISC" }, "node_modules/react": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" }, @@ -8230,8 +7754,7 @@ }, "node_modules/react-bootstrap": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.8.0.tgz", - "integrity": "sha512-e/aNtxl0Z2ozrIaR82jr6Zz7ss9GSoaXpQaxmvtDUsTZIq/XalkduR/ZXP6vbQHz2T4syvjA+4FbtwELxxmpww==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.21.0", "@restart/hooks": "^0.4.9", @@ -8259,8 +7782,7 @@ }, "node_modules/react-dom": { "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -8270,19 +7792,17 @@ } }, "node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" + "version": "17.0.2", + "dev": true, + "license": "MIT" }, "node_modules/react-lifecycles-compat": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" + "license": "MIT" }, "node_modules/react-map-gl": { "version": "7.1.5", - "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.5.tgz", - "integrity": "sha512-YS2u2cSLlZVGjfa394f0snO6f6ZwZVTKqQwjbq/jj0w7fHU01Mn+Xqvm/Qr7nZChoT3OG7kh8JluDcXeBrDG/g==", + "license": "MIT", "dependencies": { "@maplibre/maplibre-gl-style-spec": "^19.2.1", "@types/mapbox-gl": ">=1.0.0" @@ -8304,17 +7824,15 @@ }, "node_modules/react-refresh": { "version": "0.14.0", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", - "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/react-transition-group": { "version": "4.4.5", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", - "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", + "license": "BSD-3-Clause", "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -8328,9 +7846,8 @@ }, "node_modules/readable-stream": { "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -8341,15 +7858,14 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.3.tgz", - "integrity": "sha512-TTAOZpkJ2YLxl7mVHWrNo3iDMEkYlva/kgFcXndqMgbo/AZUmmavEkdXV+hXtE4P8xdyEKRzalaFqZVuwIk/Nw==", + "version": "1.0.4", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4", - "get-intrinsic": "^1.1.1", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "get-intrinsic": "^1.2.1", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" }, @@ -8361,19 +7877,17 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.0.tgz", - "integrity": "sha512-srw17NI0TUWHuGa5CFGGmhfNIeja30WMBfbslPNhf6JrqQlLN5gcrvig1oqPxiVaXb0oW0XRKtH6Nngs5lKCIA==" + "version": "0.14.1", + "license": "MIT" }, "node_modules/regexp.prototype.flags": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", - "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "version": "1.5.1", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", - "functions-have-names": "^1.2.3" + "set-function-name": "^2.0.0" }, "engines": { "node": ">= 0.4" @@ -8384,9 +7898,8 @@ }, "node_modules/relay-runtime": { "version": "12.0.0", - "resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-12.0.0.tgz", - "integrity": "sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==", "dev": true, + "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", "fbjs": "^3.0.0", @@ -8395,45 +7908,52 @@ }, "node_modules/remedial": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/remedial/-/remedial-1.0.8.tgz", - "integrity": "sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==", "dev": true, + "license": "(MIT OR Apache-2.0)", "engines": { "node": "*" } }, "node_modules/remove-trailing-separator": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/remove-trailing-spaces": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz", - "integrity": "sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/require-directory": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/require-from-string": { + "version": "2.0.2", + "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/require-main-filename": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", - "dev": true + "dev": true, + "license": "ISC" + }, + "node_modules/requires-port": { + "version": "1.0.0", + "dev": true, + "license": "MIT" }, "node_modules/resolve": { - "version": "1.22.4", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.4.tgz", - "integrity": "sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg==", + "version": "1.22.8", "dev": true, + "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -8447,27 +7967,24 @@ } }, "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "version": "5.0.0", "dev": true, + "license": "MIT", "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/resolve-protobuf-schema": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz", - "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==", + "license": "MIT", "dependencies": { "protocol-buffers-schema": "^3.3.1" } }, "node_modules/restore-cursor": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", - "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, + "license": "MIT", "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -8478,9 +7995,8 @@ }, "node_modules/reusify": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, + "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -8488,15 +8004,13 @@ }, "node_modules/rfdc": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz", - "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/rimraf": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, + "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -8508,10 +8022,9 @@ } }, "node_modules/rollup": { - "version": "3.28.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.28.1.tgz", - "integrity": "sha512-R9OMQmIHJm9znrU3m3cpE8uhN0fGdXiawME7aZIpQqvpS/85+Vt1Hq1/yVIcYfOmaQiHjvXkQAoJukvLpau6Yw==", + "version": "3.29.4", "dev": true, + "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -8523,19 +8036,21 @@ "fsevents": "~2.3.2" } }, + "node_modules/rrweb-cssom": { + "version": "0.6.0", + "dev": true, + "license": "MIT" + }, "node_modules/run-async": { "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/run-parallel": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "funding": [ { @@ -8551,32 +8066,30 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/rw": { "version": "1.3.3", - "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", - "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==" + "license": "BSD-3-Clause" }, "node_modules/rxjs": { "version": "7.8.1", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", - "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, + "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/safe-array-concat": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.0.0.tgz", - "integrity": "sha512-9dVEFruWIsnie89yym+xWTAYASdpw3CJV7Li/6zBewGf9z2i1j31rP6jnY0pHEO4QZh6N0K11bFjWmdR8UGdPQ==", + "version": "1.0.1", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", + "get-intrinsic": "^1.2.1", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -8589,8 +8102,6 @@ }, "node_modules/safe-buffer": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true, "funding": [ { @@ -8605,80 +8116,65 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/safe-regex-test": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.0.tgz", - "integrity": "sha512-JBUUzyOgEwXQY1NuPtvcj/qcBDbDmEvWufhlnXZIm75DEHp+afM1r1ujJpJsV/gSM4t59tpDyPi1sd6ZaPFfsA==", + "version": "1.0.2", "dev": true, + "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", "is-regex": "^1.1.4" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/saxes": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=v12.22.7" + } }, "node_modules/scheduler": { "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "license": "MIT", "dependencies": { "loose-envify": "^1.1.0" } }, "node_modules/scuid": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/scuid/-/scuid-1.1.0.tgz", - "integrity": "sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "6.3.1", "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, + "license": "ISC", "bin": { "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/semver/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" } }, - "node_modules/semver/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/sentence-case": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", - "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", "dev": true, + "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -8687,14 +8183,39 @@ }, "node_modules/set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", - "dev": true + "dev": true, + "license": "ISC" + }, + "node_modules/set-function-length": { + "version": "1.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.1.1", + "get-intrinsic": "^1.2.1", + "gopd": "^1.0.1", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/set-function-name": { + "version": "2.0.1", + "dev": true, + "license": "MIT", + "dependencies": { + "define-data-property": "^1.0.1", + "functions-have-names": "^1.2.3", + "has-property-descriptors": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } }, "node_modules/set-value": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", - "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "license": "MIT", "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -8707,15 +8228,13 @@ }, "node_modules/setimmediate": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, + "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -8725,27 +8244,24 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/shell-quote": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", - "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", "dev": true, + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/side-channel": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", - "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.0", "get-intrinsic": "^1.0.2", @@ -8755,32 +8271,33 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/siginfo": { + "version": "2.0.0", + "dev": true, + "license": "ISC" + }, "node_modules/signal-exit": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/signedsource": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/signedsource/-/signedsource-1.0.0.tgz", - "integrity": "sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==", - "dev": true + "dev": true, + "license": "BSD-3-Clause" }, "node_modules/slash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/slice-ansi": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", - "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -8790,44 +8307,10 @@ "node": ">=8" } }, - "node_modules/slice-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" - }, - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" - } - }, - "node_modules/slice-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "dev": true, - "dependencies": { - "color-name": "~1.1.4" - }, - "engines": { - "node": ">=7.0.0" - } - }, - "node_modules/slice-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/snake-case": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", - "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", "dev": true, + "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -8835,24 +8318,21 @@ }, "node_modules/sort-asc": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz", - "integrity": "sha512-umMGhjPeHAI6YjABoSTrFp2zaBtXBej1a0yKkuMUyjjqu6FJsTF+JYwCswWDg+zJfk/5npWUUbd33HH/WLzpaA==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/sort-desc": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.2.0.tgz", - "integrity": "sha512-NqZqyvL4VPW+RAxxXnB8gvE1kyikh8+pR+T+CXLksVRN9eiQqkQlPwqWYU0mF9Jm7UnctShlxLyAt1CaBOTL1w==", + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/sort-object": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-3.0.3.tgz", - "integrity": "sha512-nK7WOY8jik6zaG9CRwZTaD5O7ETWDLZYMM12pqY8htll+7dYeqGfEUPcUBHOpSJg2vJOrvFIY2Dl5cX2ih1hAQ==", + "license": "MIT", "dependencies": { "bytewise": "^1.1.0", "get-value": "^2.0.2", @@ -8865,19 +8345,25 @@ "node": ">=0.10.0" } }, + "node_modules/source-map": { + "version": "0.6.1", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/source-map-js": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, + "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/split-string": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "license": "MIT", "dependencies": { "extend-shallow": "^3.0.0" }, @@ -8887,8 +8373,7 @@ }, "node_modules/split-string/node_modules/extend-shallow": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", + "license": "MIT", "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -8899,8 +8384,7 @@ }, "node_modules/split-string/node_modules/is-extendable": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "license": "MIT", "dependencies": { "is-plain-object": "^2.0.4" }, @@ -8910,17 +8394,35 @@ }, "node_modules/sponge-case": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/sponge-case/-/sponge-case-1.0.1.tgz", - "integrity": "sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, + "node_modules/stackback": { + "version": "0.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/std-env": { + "version": "3.7.0", + "dev": true, + "license": "MIT" + }, + "node_modules/stop-iteration-iterator": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "internal-slot": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/streamsearch": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", - "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "dev": true, "engines": { "node": ">=10.0.0" @@ -8928,24 +8430,21 @@ }, "node_modules/string_decoder": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } }, "node_modules/string-env-interpolation": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz", - "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/string-width": { "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -8955,11 +8454,15 @@ "node": ">=8" } }, + "node_modules/string-width/node_modules/emoji-regex": { + "version": "8.0.0", + "dev": true, + "license": "MIT" + }, "node_modules/string.prototype.matchall": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.9.tgz", - "integrity": "sha512-6i5hL3MqG/K2G43mWXWgP+qizFW/QH/7kCNN13JrJS5q48FN5IKksLDscexKP3dnmB6cdm9jlNgAsWNLpSykmA==", + "version": "4.0.10", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8968,6 +8471,7 @@ "has-symbols": "^1.0.3", "internal-slot": "^1.0.5", "regexp.prototype.flags": "^1.5.0", + "set-function-name": "^2.0.0", "side-channel": "^1.0.4" }, "funding": { @@ -8975,14 +8479,13 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.7.tgz", - "integrity": "sha512-p6TmeT1T3411M8Cgg9wBTMRtY2q9+PNy9EV1i2lIXUN/btt763oIfxwN3RR8VU6wHX8j/1CFy0L+YuThm6bgOg==", + "version": "1.2.8", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "engines": { "node": ">= 0.4" @@ -8992,28 +8495,26 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.6.tgz", - "integrity": "sha512-JySq+4mrPf9EsDBEDYMOb/lM7XQLulwg5R/m1r0PXEFqrV0qHvl58sdTilSXtKOflCsK2E8jxf+GKC0T07RWwQ==", + "version": "1.0.7", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.6.tgz", - "integrity": "sha512-omqjMDaY92pbn5HOX7f9IccLA+U1tA9GvtU4JrodiXFfYB7jPzzHpRzpglLAjtUV6bB557zwClJezTqnAiYnQA==", + "version": "1.0.7", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "define-properties": "^1.1.4", - "es-abstract": "^1.20.4" + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9021,9 +8522,8 @@ }, "node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -9033,18 +8533,27 @@ }, "node_modules/strip-bom": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, + "node_modules/strip-final-newline": { + "version": "3.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/strip-json-comments": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, + "license": "MIT", "engines": { "node": ">=8" }, @@ -9052,31 +8561,39 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/strip-literal": { + "version": "1.3.0", + "dev": true, + "license": "MIT", + "dependencies": { + "acorn": "^8.10.0" + }, + "funding": { + "url": "https://github.com/sponsors/antfu" + } + }, "node_modules/supercluster": { "version": "8.0.1", - "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz", - "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==", + "license": "ISC", "dependencies": { "kdbush": "^4.0.2" } }, "node_modules/supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "version": "7.2.0", "dev": true, + "license": "MIT", "dependencies": { - "has-flag": "^3.0.0" + "has-flag": "^4.0.0" }, "engines": { - "node": ">=4" + "node": ">=8" } }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -9086,44 +8603,77 @@ }, "node_modules/swap-case": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-2.0.2.tgz", - "integrity": "sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "dev": true, + "license": "MIT" + }, + "node_modules/test-exclude": { + "version": "6.0.0", + "dev": true, + "license": "ISC", + "dependencies": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/text-table": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", - "dev": true + "dev": true, + "license": "MIT" + }, + "node_modules/tinybench": { + "version": "2.5.1", + "dev": true, + "license": "MIT" + }, + "node_modules/tinypool": { + "version": "0.8.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } }, "node_modules/tinyqueue": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", - "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" + "license": "ISC" + }, + "node_modules/tinyspy": { + "version": "2.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=14.0.0" + } }, "node_modules/title-case": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz", - "integrity": "sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==", "dev": true, + "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/tmp": { "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, + "license": "MIT", "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -9133,18 +8683,16 @@ }, "node_modules/to-fast-properties": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", - "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, + "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -9152,16 +8700,51 @@ "node": ">=8.0" } }, + "node_modules/tough-cookie": { + "version": "4.1.3", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tough-cookie/node_modules/punycode": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/tr46/node_modules/punycode": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } }, "node_modules/ts-api-utils": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.0.2.tgz", - "integrity": "sha512-Cbu4nIqnEdd+THNEsBdkolnOXhg0I8XteoHaEKgvsxpsbWda4IsUut2c187HxywQCvveojow0Dgw/amxtSKVkQ==", + "version": "1.0.3", "dev": true, + "license": "MIT", "engines": { "node": ">=16.13.0" }, @@ -9171,15 +8754,13 @@ }, "node_modules/ts-log": { "version": "2.2.5", - "resolved": "https://registry.npmjs.org/ts-log/-/ts-log-2.2.5.tgz", - "integrity": "sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/tsconfig-paths": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.14.2.tgz", - "integrity": "sha512-o/9iXgCYc5L/JxCHPe3Hvh8Q/2xm5Z+p18PESBU6Ff33695QnCHBEjcytY2q19ua7Mbl/DavtBOLq+oG0RCL+g==", + "version": "3.15.0", "dev": true, + "license": "MIT", "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", @@ -9189,9 +8770,8 @@ }, "node_modules/tsconfig-paths/node_modules/json5": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", - "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, + "license": "MIT", "dependencies": { "minimist": "^1.2.0" }, @@ -9201,14 +8781,12 @@ }, "node_modules/tslib": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", - "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" + "license": "0BSD" }, "node_modules/type-check": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, + "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -9216,11 +8794,18 @@ "node": ">= 0.8.0" } }, + "node_modules/type-detect": { + "version": "4.0.8", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=4" + } + }, "node_modules/type-fest": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", - "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "version": "0.21.3", "dev": true, + "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -9230,9 +8815,8 @@ }, "node_modules/typed-array-buffer": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.0.tgz", - "integrity": "sha512-Y8KTSIglk9OZEr8zywiIHG/kmQ7KWyjseXs1CbSo8vC42w7hg2HgYTxSWwP0+is7bWDc1H+Fo026CpHFwm8tkw==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1", @@ -9244,9 +8828,8 @@ }, "node_modules/typed-array-byte-length": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", - "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "for-each": "^0.3.3", @@ -9262,9 +8845,8 @@ }, "node_modules/typed-array-byte-offset": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", - "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", "dev": true, + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", @@ -9281,9 +8863,8 @@ }, "node_modules/typed-array-length": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", - "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "for-each": "^0.3.3", @@ -9295,9 +8876,8 @@ }, "node_modules/typescript": { "version": "5.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", - "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, + "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -9308,21 +8888,17 @@ }, "node_modules/typewise": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz", - "integrity": "sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ==", + "license": "MIT", "dependencies": { "typewise-core": "^1.2.0" } }, "node_modules/typewise-core": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz", - "integrity": "sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg==" + "license": "MIT" }, "node_modules/ua-parser-js": { - "version": "1.0.35", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.35.tgz", - "integrity": "sha512-fKnGuqmTBnIE+/KXSzCn4db8RTigUzw1AN0DmdU6hJovUTbYJKyqj+8Mt1c4VfRDnOVJnENmfYkIPZ946UrSAA==", + "version": "1.0.37", "dev": true, "funding": [ { @@ -9332,17 +8908,26 @@ { "type": "paypal", "url": "https://paypal.me/faisalman" + }, + { + "type": "github", + "url": "https://github.com/sponsors/faisalman" } ], + "license": "MIT", "engines": { "node": "*" } }, + "node_modules/ufo": { + "version": "1.3.2", + "dev": true, + "license": "MIT" + }, "node_modules/unbox-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-bigints": "^1.0.2", @@ -9355,17 +8940,15 @@ }, "node_modules/unc-path-regex": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", - "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/uncontrollable": { "version": "7.2.1", - "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz", - "integrity": "sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==", + "license": "MIT", "dependencies": { "@babel/runtime": "^7.6.3", "@types/react": ">=16.9.11", @@ -9376,10 +8959,14 @@ "react": ">=15.0.0" } }, + "node_modules/undici-types": { + "version": "5.26.5", + "dev": true, + "license": "MIT" + }, "node_modules/union-value": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", - "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "license": "MIT", "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -9390,120 +8977,509 @@ "node": ">=0.10.0" } }, - "node_modules/unixify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz", - "integrity": "sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==", + "node_modules/universalify": { + "version": "0.2.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 4.0.0" + } + }, + "node_modules/unixify": { + "version": "1.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "normalize-path": "^2.1.1" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/update-browserslist-db": { + "version": "1.0.13", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/browserslist" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/browserslist" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "escalade": "^3.1.1", + "picocolors": "^1.0.0" + }, + "bin": { + "update-browserslist-db": "cli.js" + }, + "peerDependencies": { + "browserslist": ">= 4.21.0" + } + }, + "node_modules/upper-case": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/upper-case-first": { + "version": "2.0.2", + "dev": true, + "license": "MIT", + "dependencies": { + "tslib": "^2.0.3" + } + }, + "node_modules/uri-js": { + "version": "4.4.1", + "dev": true, + "license": "BSD-2-Clause", + "dependencies": { + "punycode": "^2.1.0" + } + }, + "node_modules/uri-js/node_modules/punycode": { + "version": "2.3.1", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/url-parse": { + "version": "1.5.10", + "dev": true, + "license": "MIT", + "dependencies": { + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" + } + }, + "node_modules/urlpattern-polyfill": { + "version": "8.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "dev": true, + "license": "MIT" + }, + "node_modules/v8-to-istanbul": { + "version": "9.2.0", + "dev": true, + "license": "ISC", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.12", + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^2.0.0" + }, + "engines": { + "node": ">=10.12.0" + } + }, + "node_modules/value-or-promise": { + "version": "1.0.12", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, + "node_modules/vite": { + "version": "4.4.9", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.18.10", + "postcss": "^8.4.27", + "rollup": "^3.27.1" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^14.18.0 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.2" + }, + "peerDependencies": { + "@types/node": ">= 14", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } + } + }, + "node_modules/vite-node": { + "version": "1.1.3", "dev": true, + "license": "MIT", "dependencies": { - "normalize-path": "^2.1.1" + "cac": "^6.7.14", + "debug": "^4.3.4", + "pathe": "^1.1.1", + "picocolors": "^1.0.0", + "vite": "^5.0.0" + }, + "bin": { + "vite-node": "vite-node.mjs" }, "engines": { - "node": ">=0.10.0" + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" } }, - "node_modules/update-browserslist-db": { - "version": "1.0.11", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz", - "integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==", + "node_modules/vite-node/node_modules/@esbuild/darwin-x64": { + "version": "0.19.11", + "cpu": [ + "x64" + ], "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/browserslist" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/browserslist" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } + "license": "MIT", + "optional": true, + "os": [ + "darwin" ], - "dependencies": { - "escalade": "^3.1.1", - "picocolors": "^1.0.0" + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/esbuild": { + "version": "0.19.11", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.19.11", + "@esbuild/android-arm": "0.19.11", + "@esbuild/android-arm64": "0.19.11", + "@esbuild/android-x64": "0.19.11", + "@esbuild/darwin-arm64": "0.19.11", + "@esbuild/darwin-x64": "0.19.11", + "@esbuild/freebsd-arm64": "0.19.11", + "@esbuild/freebsd-x64": "0.19.11", + "@esbuild/linux-arm": "0.19.11", + "@esbuild/linux-arm64": "0.19.11", + "@esbuild/linux-ia32": "0.19.11", + "@esbuild/linux-loong64": "0.19.11", + "@esbuild/linux-mips64el": "0.19.11", + "@esbuild/linux-ppc64": "0.19.11", + "@esbuild/linux-riscv64": "0.19.11", + "@esbuild/linux-s390x": "0.19.11", + "@esbuild/linux-x64": "0.19.11", + "@esbuild/netbsd-x64": "0.19.11", + "@esbuild/openbsd-x64": "0.19.11", + "@esbuild/sunos-x64": "0.19.11", + "@esbuild/win32-arm64": "0.19.11", + "@esbuild/win32-ia32": "0.19.11", + "@esbuild/win32-x64": "0.19.11" + } + }, + "node_modules/vite-node/node_modules/rollup": { + "version": "4.9.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.5" }, "bin": { - "update-browserslist-db": "cli.js" + "rollup": "dist/bin/rollup" }, - "peerDependencies": { - "browserslist": ">= 4.21.0" + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.9.5", + "@rollup/rollup-android-arm64": "4.9.5", + "@rollup/rollup-darwin-arm64": "4.9.5", + "@rollup/rollup-darwin-x64": "4.9.5", + "@rollup/rollup-linux-arm-gnueabihf": "4.9.5", + "@rollup/rollup-linux-arm64-gnu": "4.9.5", + "@rollup/rollup-linux-arm64-musl": "4.9.5", + "@rollup/rollup-linux-riscv64-gnu": "4.9.5", + "@rollup/rollup-linux-x64-gnu": "4.9.5", + "@rollup/rollup-linux-x64-musl": "4.9.5", + "@rollup/rollup-win32-arm64-msvc": "4.9.5", + "@rollup/rollup-win32-ia32-msvc": "4.9.5", + "@rollup/rollup-win32-x64-msvc": "4.9.5", + "fsevents": "~2.3.2" } }, - "node_modules/upper-case": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", - "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", + "node_modules/vite-node/node_modules/vite": { + "version": "5.0.11", "dev": true, + "license": "MIT", "dependencies": { - "tslib": "^2.0.3" + "esbuild": "^0.19.3", + "postcss": "^8.4.32", + "rollup": "^4.2.0" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^18.0.0 || >=20.0.0", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.4.0" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + } } }, - "node_modules/upper-case-first": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", - "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", + "node_modules/vitest": { + "version": "1.1.3", "dev": true, + "license": "MIT", "dependencies": { - "tslib": "^2.0.3" + "@vitest/expect": "1.1.3", + "@vitest/runner": "1.1.3", + "@vitest/snapshot": "1.1.3", + "@vitest/spy": "1.1.3", + "@vitest/utils": "1.1.3", + "acorn-walk": "^8.3.1", + "cac": "^6.7.14", + "chai": "^4.3.10", + "debug": "^4.3.4", + "execa": "^8.0.1", + "local-pkg": "^0.5.0", + "magic-string": "^0.30.5", + "pathe": "^1.1.1", + "picocolors": "^1.0.0", + "std-env": "^3.5.0", + "strip-literal": "^1.3.0", + "tinybench": "^2.5.1", + "tinypool": "^0.8.1", + "vite": "^5.0.0", + "vite-node": "1.1.3", + "why-is-node-running": "^2.2.2" + }, + "bin": { + "vitest": "vitest.mjs" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "@edge-runtime/vm": "*", + "@types/node": "^18.0.0 || >=20.0.0", + "@vitest/browser": "^1.0.0", + "@vitest/ui": "^1.0.0", + "happy-dom": "*", + "jsdom": "*" + }, + "peerDependenciesMeta": { + "@edge-runtime/vm": { + "optional": true + }, + "@types/node": { + "optional": true + }, + "@vitest/browser": { + "optional": true + }, + "@vitest/ui": { + "optional": true + }, + "happy-dom": { + "optional": true + }, + "jsdom": { + "optional": true + } } }, - "node_modules/uri-js": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "node_modules/vitest/node_modules/@esbuild/darwin-x64": { + "version": "0.19.11", + "cpu": [ + "x64" + ], "dev": true, - "dependencies": { - "punycode": "^2.1.0" + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" } }, - "node_modules/urlpattern-polyfill": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz", - "integrity": "sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==", - "dev": true - }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "dev": true - }, - "node_modules/value-or-promise": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.12.tgz", - "integrity": "sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==", + "node_modules/vitest/node_modules/esbuild": { + "version": "0.19.11", "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, "engines": { "node": ">=12" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.19.11", + "@esbuild/android-arm": "0.19.11", + "@esbuild/android-arm64": "0.19.11", + "@esbuild/android-x64": "0.19.11", + "@esbuild/darwin-arm64": "0.19.11", + "@esbuild/darwin-x64": "0.19.11", + "@esbuild/freebsd-arm64": "0.19.11", + "@esbuild/freebsd-x64": "0.19.11", + "@esbuild/linux-arm": "0.19.11", + "@esbuild/linux-arm64": "0.19.11", + "@esbuild/linux-ia32": "0.19.11", + "@esbuild/linux-loong64": "0.19.11", + "@esbuild/linux-mips64el": "0.19.11", + "@esbuild/linux-ppc64": "0.19.11", + "@esbuild/linux-riscv64": "0.19.11", + "@esbuild/linux-s390x": "0.19.11", + "@esbuild/linux-x64": "0.19.11", + "@esbuild/netbsd-x64": "0.19.11", + "@esbuild/openbsd-x64": "0.19.11", + "@esbuild/sunos-x64": "0.19.11", + "@esbuild/win32-arm64": "0.19.11", + "@esbuild/win32-ia32": "0.19.11", + "@esbuild/win32-x64": "0.19.11" + } + }, + "node_modules/vitest/node_modules/rollup": { + "version": "4.9.5", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.5" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.9.5", + "@rollup/rollup-android-arm64": "4.9.5", + "@rollup/rollup-darwin-arm64": "4.9.5", + "@rollup/rollup-darwin-x64": "4.9.5", + "@rollup/rollup-linux-arm-gnueabihf": "4.9.5", + "@rollup/rollup-linux-arm64-gnu": "4.9.5", + "@rollup/rollup-linux-arm64-musl": "4.9.5", + "@rollup/rollup-linux-riscv64-gnu": "4.9.5", + "@rollup/rollup-linux-x64-gnu": "4.9.5", + "@rollup/rollup-linux-x64-musl": "4.9.5", + "@rollup/rollup-win32-arm64-msvc": "4.9.5", + "@rollup/rollup-win32-ia32-msvc": "4.9.5", + "@rollup/rollup-win32-x64-msvc": "4.9.5", + "fsevents": "~2.3.2" } }, - "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "node_modules/vitest/node_modules/vite": { + "version": "5.0.11", "dev": true, + "license": "MIT", "dependencies": { - "esbuild": "^0.18.10", - "postcss": "^8.4.27", - "rollup": "^3.27.1" + "esbuild": "^0.19.3", + "postcss": "^8.4.32", + "rollup": "^4.2.0" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "^18.0.0 || >=20.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" }, "optionalDependencies": { - "fsevents": "~2.3.2" + "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": ">= 14", + "@types/node": "^18.0.0 || >=20.0.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", @@ -9537,45 +9513,51 @@ }, "node_modules/vt-pbf": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", - "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==", + "license": "MIT", "dependencies": { "@mapbox/point-geometry": "0.1.0", "@mapbox/vector-tile": "^1.3.1", "pbf": "^3.2.1" } }, + "node_modules/w3c-xmlserializer": { + "version": "5.0.0", + "dev": true, + "license": "MIT", + "dependencies": { + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/warning": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", - "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", + "license": "MIT", "dependencies": { "loose-envify": "^1.0.0" } }, "node_modules/wcwidth": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", - "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", "dev": true, + "license": "MIT", "dependencies": { "defaults": "^1.0.3" } }, "node_modules/web-streams-polyfill": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz", - "integrity": "sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==", + "version": "3.3.2", "dev": true, + "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/webcrypto-core": { "version": "1.7.7", - "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.7.tgz", - "integrity": "sha512-7FjigXNsBfopEj+5DV2nhNpfic2vumtjjgPmeDKk45z+MJwXKKfhPB7118Pfzrmh4jqOMST6Ch37iPAHoImg5g==", "dev": true, + "license": "MIT", "dependencies": { "@peculiar/asn1-schema": "^2.3.6", "@peculiar/json-schema": "^1.1.12", @@ -9585,24 +9567,59 @@ } }, "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "version": "7.0.0", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + } + }, + "node_modules/whatwg-encoding": { + "version": "3.1.1", + "dev": true, + "license": "MIT", + "dependencies": { + "iconv-lite": "0.6.3" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/whatwg-encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "dev": true, + "license": "MIT", + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/whatwg-mimetype": { + "version": "4.0.0", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } }, "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "version": "14.0.0", + "dev": true, + "license": "MIT", "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" + "tr46": "^5.0.0", + "webidl-conversions": "^7.0.0" + }, + "engines": { + "node": ">=18" } }, "node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, + "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -9615,9 +9632,8 @@ }, "node_modules/which-boxed-primitive": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, + "license": "MIT", "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -9631,9 +9647,8 @@ }, "node_modules/which-builtin-type": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", - "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", "dev": true, + "license": "MIT", "dependencies": { "function.prototype.name": "^1.1.5", "has-tostringtag": "^1.0.0", @@ -9657,9 +9672,8 @@ }, "node_modules/which-collection": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", - "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", "dev": true, + "license": "MIT", "dependencies": { "is-map": "^2.0.1", "is-set": "^2.0.1", @@ -9672,18 +9686,16 @@ }, "node_modules/which-module": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", - "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/which-typed-array": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz", - "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==", + "version": "1.1.13", "dev": true, + "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "call-bind": "^1.0.4", "for-each": "^0.3.3", "gopd": "^1.0.1", "has-tostringtag": "^1.0.0" @@ -9695,64 +9707,43 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", + "node_modules/why-is-node-running": { + "version": "2.2.2", "dev": true, + "license": "MIT", "dependencies": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" + "siginfo": "^2.0.0", + "stackback": "0.0.2" }, - "engines": { - "node": ">=8" - } - }, - "node_modules/wrap-ansi/node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "dev": true, - "dependencies": { - "color-convert": "^2.0.1" + "bin": { + "why-is-node-running": "cli.js" }, "engines": { "node": ">=8" - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/wrap-ansi/node_modules/color-convert": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/wrap-ansi": { + "version": "6.2.0", "dev": true, + "license": "MIT", "dependencies": { - "color-name": "~1.1.4" + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" }, "engines": { - "node": ">=7.0.0" + "node": ">=8" } }, - "node_modules/wrap-ansi/node_modules/color-name": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true - }, "node_modules/wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/ws": { - "version": "8.13.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", - "integrity": "sha512-x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==", + "version": "8.16.0", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -9769,41 +9760,49 @@ } } }, + "node_modules/xml-name-validator": { + "version": "5.0.0", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "dev": true, + "license": "MIT" + }, "node_modules/y18n": { "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, + "license": "ISC", "engines": { "node": ">=10" } }, "node_modules/yallist": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", - "dev": true + "dev": true, + "license": "ISC" }, "node_modules/yaml": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.2.tgz", - "integrity": "sha512-N/lyzTPaJasoDmfV7YTrYCI0G/3ivm/9wdG0aHuheKowWQwGTsK0Eoiw6utmzAnI6pkJa0DUVygvp3spqqEKXg==", + "version": "2.3.4", "dev": true, + "license": "ISC", "engines": { "node": ">= 14" } }, "node_modules/yaml-ast-parser": { "version": "0.0.43", - "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz", - "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==", - "dev": true + "dev": true, + "license": "Apache-2.0" }, "node_modules/yargs": { "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -9819,18 +9818,16 @@ }, "node_modules/yargs-parser": { "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, + "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/yocto-queue": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=10" }, diff --git a/client-next/package.json b/client-next/package.json index 6388122befc..3f8f303cc79 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -6,6 +6,8 @@ "scripts": { "dev": "vite", "build": "tsc && vite build", + "test": "vitest --root src/", + "coverage": "vitest run --root src/ --coverage", "lint": "eslint . --report-unused-disable-directives --max-warnings 0", "check-format": "prettier --check \"**/*.{js,jsx,ts,tsx,json,css,scss,md}\"", "format": "prettier --write \"**/*.{js,jsx,ts,tsx,json,css,scss,md}\"", @@ -30,11 +32,13 @@ "@graphql-codegen/client-preset": "4.1.0", "@graphql-codegen/introspection": "4.0.0", "@parcel/watcher": "2.3.0", + "@testing-library/react": "14.1.2", "@types/react": "18.2.21", "@types/react-dom": "18.2.7", "@typescript-eslint/eslint-plugin": "6.5.0", "@typescript-eslint/parser": "6.5.0", "@vitejs/plugin-react": "4.0.4", + "@vitest/coverage-v8": "1.1.3", "eslint": "8.48.0", "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.28.1", @@ -42,8 +46,10 @@ "eslint-plugin-react": "7.33.2", "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-refresh": "0.4.3", + "jsdom": "23.2.0", "prettier": "3.0.3", "typescript": "5.2.2", - "vite": "4.4.9" + "vite": "4.4.9", + "vitest": "1.1.3" } } diff --git a/client-next/src/components/ItineraryList/ItineraryList.test.tsx b/client-next/src/components/ItineraryList/ItineraryList.test.tsx new file mode 100644 index 00000000000..d1d13b36bf3 --- /dev/null +++ b/client-next/src/components/ItineraryList/ItineraryList.test.tsx @@ -0,0 +1,2394 @@ +import { it } from 'vitest'; +import { ItineraryListContainer } from './ItineraryListContainer'; +import { render } from '@testing-library/react'; +import { QueryType } from '../../gql/graphql.ts'; + +const tripQueryResult = { + trip: { + previousPageCursor: + 'MXxQUkVWSU9VU19QQUdFfDIwMjQtMDEtMTJUMTA6MzI6MThafHwxaHxTVFJFRVRfQU5EX0FSUklWQUxfVElNRXxmYWxzZXwyMDI0LTAxLTEyVDExOjQxOjAwWnwyMDI0LTAxLTEyVDEzOjE4OjUwWnwzfDExMTM0fA==', + nextPageCursor: + 'MXxORVhUX1BBR0V8MjAyNC0wMS0xMlQxMTozOTowN1p8fDFofFNUUkVFVF9BTkRfQVJSSVZBTF9USU1FfGZhbHNlfDIwMjQtMDEtMTJUMTE6NDE6MDBafDIwMjQtMDEtMTJUMTM6MTg6NTBafDN8MTExMzR8', + tripPatterns: [ + { + aimedStartTime: '2024-01-12T12:39:07+01:00', + aimedEndTime: '2024-01-12T13:54:09+01:00', + expectedEndTime: '2024-01-12T13:54:09+01:00', + expectedStartTime: '2024-01-12T12:39:07+01:00', + duration: 4502, + distance: 26616.219999999998, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:39:07+01:00', + aimedEndTime: '2024-01-12T12:50:00+01:00', + expectedEndTime: '2024-01-12T12:50:00+01:00', + expectedStartTime: '2024-01-12T12:39:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAB0AAAAmABBSQjpOU1I6UXVheTo3OTQ0ABFSQjpOU1I6UXVheToxMTk2OQA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6ODIyMzhhN2VmZmNhMzY2YzAwZmNkYmJjMWU2MWQ2N2E=', + mode: 'bus', + aimedStartTime: '2024-01-12T12:50:00+01:00', + aimedEndTime: '2024-01-12T13:13:00+01:00', + expectedEndTime: '2024-01-12T13:13:00+01:00', + expectedStartTime: '2024-01-12T12:50:00+01:00', + realtime: true, + distance: 17846.09, + duration: 1380, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA??EMIU]{@MYKOMOEIIKIGAK?GCGCGGIECM?GIEIGOWy@EKEKCGIKCCCCOQCCAA[a@QSQU_@c@QU[_@i@o@KMCEOQIKkAyAMQY]KMAAAAACKKCEcAmAUU?M?IAOGyGAg@AQHQDK`AuBx@gB@Eh@cAh@gA??`@y@JSHSHWFOHWJ_@Lg@Pw@Lu@H_@De@Dg@Ba@@s@?s@Eq@GuAEs@MsBGqAEm@E}@C}@AcBAgA?e@?]?Q?U@_@@k@HoANiAT}B@SHu@F]D[J_@H[j@uBBK@EDOFe@@EDYH[VaAJ]@CFODIFG`AwAZa@??@AHKLOFC?A@?DA@?FA@?B?H@??D@F@NBF?D?FADCFCHGl@m@\\[LOFGFEBEDCDE@APMFChC_ALCNEDDB@F?BADEBIBK@OAOJy@VwCBWL_BD[DEBI@I?IAKB]Fi@JsAD{@HiALoAJ_AFg@@G??LeBLyANkBBSBQHk@BEBG@I?I?G?IAGCIACCAECA?C?C@C@ADCDAHAH?H?H@HBF?F?NAL?RMRILEHABINATKhAIbAIbAO`BALE`@ABGt@KlAKvAAL', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:13:00+01:00', + aimedEndTime: '2024-01-12T13:16:42+01:00', + expectedEndTime: '2024-01-12T13:16:42+01:00', + expectedStartTime: '2024-01-12T13:13:00+01:00', + realtime: false, + distance: 213.19, + duration: 222, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'sptlJm|s`A??LoAB[@EPqB@MBa@JD@@FQ??D@HDJsA@@B@DBB@DBDB@@Fu@LwAHwA??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAAAAAANABFSQjpOU1I6UXVheToxMTk2MAARUkI6TlNSOlF1YXk6MTE0NDIAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmY0M2E3ZDUxNmY5ZDljMzUyMDFlYzU2ZDk4NjM5M2Jh', + mode: 'bus', + aimedStartTime: '2024-01-12T13:20:00+01:00', + aimedEndTime: '2024-01-12T13:39:00+01:00', + expectedEndTime: '2024-01-12T13:39:00+01:00', + expectedStartTime: '2024-01-12T13:20:00+01:00', + realtime: false, + distance: 6755.19, + duration: 1140, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Alfaset', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Kjeller', + }, + }, + line: { + publicCode: '100', + name: 'Kjeller - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '}ktlJynt`ADi@BQBSBQHk@BEBG@I?I?G?IAG@QBQBKH_@Ji@BNBN?DDUBGJm@BM?ARy@d@{Bt@mDZ{ANo@H[@E`@oBt@mDFUBM?CJe@DSFU@KHc@?GDe@Nq@TgAj@mC@A@KBMFa@x@wE@E??F_@l@iDXcB`@eCV_BDYV_@BE??LUBM?OOaBBa@VuC`@}D@KZwCb@iEZgDFk@BUKa@CKGWWqAe@{BOu@EMIc@C_@G[YwAAGM[EQI]EQMm@ScAG[Mq@??OaAKo@Ik@Is@Io@MqAQ_BC]YeCs@}GEi@Gi@KeAEY??E[Iu@Gc@Ga@G]Ic@Kc@i@aCa@aBMk@Kc@[sAIa@Kc@S_A?C??I[C_@AKAa@?W@G@E?GHSBMFYN_@Rm@FUDUBOBQ@O@Q@O?MD]@g@?_@BG@I@KAIAICIEEEAE?EDADADO?I?E?C?E@C@CBEFCBCDSd@EHEFCDEDCBE@E@A@C?I?EAIEECs@q@Uw@WcAe@qBeD_OS{ASgAOiAEy@Ca@?U?O@I@G?IAKCICECCCAA?C?CBEIKUKc@COG[Ge@OkAEU??AIGg@M_AIc@K]GUMc@Uo@q@gBo@yA{B_G_BeEeCyGiBaFeAqC]_Ae@qAY_AMa@??IWSu@Mi@Ke@Mk@Oq@Ki@[iB[cBk@iDqAyHc@eCMs@??Ii@i@wCKi@Ke@COMk@Ou@YsAk@oCoAcGBUGk@Ce@Ao@Ao@AWA[AQC]CWIe@COOgAMo@OaAGWcA}FCMUgA??AESaASu@WaA[gAUu@]cAWy@W{@K]wAsEIYKWMa@Qo@K_@I[CIAMCKAQ@M?Q@Y@QA]KKEGEEEIEOM_@AOK_AKaAIw@Ek@??CSGgAEy@Cs@AaAAs@Ay@As@?q@@yA@gDBsD@wD@_C?oDByD?_@@iB@gB@i@@m@@[@Y?EHg@@U@A@E@E?EAEAEACAAA?A?IIECGCOBG?C?[@[BYB_@FSDy@J??C@OBSEE?KAI?AEACCEEACAC@A@KIGKEGUa@KYQ_@o@oAeAuBiAyBS[MW]o@Wc@[c@[c@i@q@EG??c@i@[_@[]s@w@GIIIYc@EIGKIMGMAAAKAGCEEEEAC@A@KIGEEGQOYk@]s@[w@Um@Sk@IYIUESIYEWGYEYEWE_@Ge@Gk@Ec@C]C_@C_@A]GcBC_@A[Ca@EWCWE]G[G]Qy@Qy@e@yBS_AMq@GSCOEQCMKe@S_AAC', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:39:00+01:00', + aimedEndTime: '2024-01-12T13:54:09+01:00', + expectedEndTime: '2024-01-12T13:54:09+01:00', + expectedStartTime: '2024-01-12T13:39:00+01:00', + realtime: false, + distance: 1074.54, + duration: 909, + fromPlace: { + name: 'Alfaset', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'egxlJeigaA@A?BRz@DZA@ILEDA@}@aEAECIACCGAE?IUiA?CAEMaA_Br@KBI?GBGHKNW^w@jA]f@ORSRQLMHMBAbD@fA@`ADtADv@s@?ODm@l@SPGJENGNEPI\\GGC?C?ORGZHLCJ?BV\\BDBH@J@NANAJEJEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:39:07+01:00', + aimedEndTime: '2024-01-12T14:03:50+01:00', + expectedEndTime: '2024-01-12T14:03:50+01:00', + expectedStartTime: '2024-01-12T12:39:07+01:00', + duration: 5083, + distance: 30479.82, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:39:07+01:00', + aimedEndTime: '2024-01-12T12:50:00+01:00', + expectedEndTime: '2024-01-12T12:50:00+01:00', + expectedStartTime: '2024-01-12T12:39:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAB0AAAAmABBSQjpOU1I6UXVheTo3OTQ0ABFSQjpOU1I6UXVheToxMTk2OQA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6ODIyMzhhN2VmZmNhMzY2YzAwZmNkYmJjMWU2MWQ2N2E=', + mode: 'bus', + aimedStartTime: '2024-01-12T12:50:00+01:00', + aimedEndTime: '2024-01-12T13:13:00+01:00', + expectedEndTime: '2024-01-12T13:13:00+01:00', + expectedStartTime: '2024-01-12T12:50:00+01:00', + realtime: true, + distance: 17846.09, + duration: 1380, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA??EMIU]{@MYKOMOEIIKIGAK?GCGCGGIECM?GIEIGOWy@EKEKCGIKCCCCOQCCAA[a@QSQU_@c@QU[_@i@o@KMCEOQIKkAyAMQY]KMAAAAACKKCEcAmAUU?M?IAOGyGAg@AQHQDK`AuBx@gB@Eh@cAh@gA??`@y@JSHSHWFOHWJ_@Lg@Pw@Lu@H_@De@Dg@Ba@@s@?s@Eq@GuAEs@MsBGqAEm@E}@C}@AcBAgA?e@?]?Q?U@_@@k@HoANiAT}B@SHu@F]D[J_@H[j@uBBK@EDOFe@@EDYH[VaAJ]@CFODIFG`AwAZa@??@AHKLOFC?A@?DA@?FA@?B?H@??D@F@NBF?D?FADCFCHGl@m@\\[LOFGFEBEDCDE@APMFChC_ALCNEDDB@F?BADEBIBK@OAOJy@VwCBWL_BD[DEBI@I?IAKB]Fi@JsAD{@HiALoAJ_AFg@@G??LeBLyANkBBSBQHk@BEBG@I?I?G?IAGCIACCAECA?C?C@C@ADCDAHAH?H?H@HBF?F?NAL?RMRILEHABINATKhAIbAIbAO`BALE`@ABGt@KlAKvAAL', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:13:00+01:00', + aimedEndTime: '2024-01-12T13:13:39+01:00', + expectedEndTime: '2024-01-12T13:13:39+01:00', + expectedStartTime: '2024-01-12T13:13:00+01:00', + realtime: false, + distance: 30.41, + duration: 39, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'sptlJm|s`A@@@SAAGCGC?ACACACA@W@K', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAAAAAANABFSQjpOU1I6UXVheToxMTk3OQARUkI6TlNSOlF1YXk6MTA2NDMAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OjY3YzVkMTllZmMyOWI1MDdmMzkxYmYzY2Q3NDRiZDY1', + mode: 'bus', + aimedStartTime: '2024-01-12T13:25:00+01:00', + aimedEndTime: '2024-01-12T13:44:00+01:00', + expectedEndTime: '2024-01-12T13:44:00+01:00', + expectedStartTime: '2024-01-12T13:25:00+01:00', + realtime: false, + distance: 8619.48, + duration: 1140, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Rødtvet T', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Hellerudhaugen', + }, + }, + line: { + publicCode: '390', + name: 'Kongskog/Hellerudhaugen - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'qqtlJu~s`A??Be@AKIMCWJwA@UBUBW@SBWBW@WBU@UBUBW@WBU@I@M@UBUBW@UBUDE^W@AZUNDH@D?@?D?FAB?BABBB@B?@?BABCBEBG@I?I?G?IAGCIACCAECA?C?C@C@ADGAE?MEc@UEAGAIBIFGBC@EDEDEHCLENCLCTYpDSfCId@ENELELGJEBCFKAI?KCGCIEKIYUWSmBaB_BuA]YYYSSY[QSGGOQEE??EEKMACEIEIKSAKCIEGECEAGKCGGKGQI]K[W_AyAiFGUQo@_@wAc@cBKUIUEOEOE_@I]Su@Wo@GSCMCOEW]sAQ_@CICMIY_AjAI@G?EACAECIGW_@cAiBqCeF}C}FOe@EIGIIOGIEGKOSO{BoCKWGKSYMKGEKISK{@gAGIGO??KSIOGKIOOUGK]]IOyAwC_@s@mAcCMc@GQEI_AgBGKCGIQEIAIAOAOAK?IAC?I?Wc@G{AKyBQIAWAOCYIIAiAIMCCAEC@]AKAGACACG?YCC?C@ABADAB?BIKIGKKc@[MK??m@c@[UIIQKYUeAq@eAm@YOYQYOIEKCEAICKAMAyEe@[EgAKm@G??[C_@EoAKg@Cm@CoAK_@Ce@E]CWCWEMAIAGCAEAIAIAIEIEIEEEEGAE@G@EBCBCFQEg@UiAo@gAk@}@q@SQa@a@UUm@y@_@q@g@aAEGo@yBs@{BIS??IS_@iAyAkEw@}BG[Ie@?OAQCOEUIQIOKGGCI?A?S[OYK[m@iBWu@??Ma@_@oAY}@q@sBm@cDSoAUsAWaBQiAYqBYsBK{BQ{AUcCCu@C}@Gs@MqAUeBYqCQgBSkBGk@??AIGm@QkAGa@a@qB{@{IyBeTUaCMyAY_DIiDCaBI}CIyCCyA?k@?_@@c@Fo@@C@E?E?I?ICGAEECAAC?C?EEGKK[I_@OiAKw@OiA??SeBs@{DqAgKgAiIk@qEKq@??Ge@MiAI{@GcAE}@CaAA{@AcA@cAB}@BmAHgAJkANsAJu@N_AVgA~@mDXgAR{@Lo@PmALkAHiAFeABoA@oA?yAAoAAo@C_@??A]KoBK}AMaBWyBi@aFIy@Iw@IcAG{AGuACcBByB?}B?cA??AcAEyCGoBI_BCi@AQIw@SeBQkAO{@SeA[sAu@{FeB}Mm@mEUmBGc@??c@gD_@sCQcAMs@WkAQu@Sy@y@sCcAwDcCaJi@kBUu@Sq@Wm@Wi@We@U]_@e@[]a@g@Y]W]SWUa@S_@Q]Qe@Wq@So@Qo@Og@Ou@Os@O_AMs@K{@KaAIu@IaAGkAEy@C}@GqA', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:44:00+01:00', + aimedEndTime: '2024-01-12T13:49:09+01:00', + expectedEndTime: '2024-01-12T13:49:09+01:00', + expectedStartTime: '2024-01-12T13:44:00+01:00', + realtime: false, + distance: 367.92, + duration: 309, + fromPlace: { + name: 'Rødtvet T', + }, + toPlace: { + name: 'Kalbakkstubben', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'cd|lJ}ghaA??DWGw@Cm@Co@MsDAs@?m@AcA?e@Ci@Cs@E}@GaAGo@Ei@K{@SgBAQ@IBIDKFEFAJ?D?N@J@d@F??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAMAAAAIABFSQjpOU1I6UXVheToxMDY2OAARUkI6TlNSOlF1YXk6MTAyNTkAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmQ5OTFhMTk1NGQzYjkyNjRhMTk5ZGY1OTA5YTBlMmE5', + mode: 'bus', + aimedStartTime: '2024-01-12T13:55:00+01:00', + aimedEndTime: '2024-01-12T13:59:00+01:00', + expectedEndTime: '2024-01-12T13:59:00+01:00', + expectedStartTime: '2024-01-12T13:55:00+01:00', + realtime: false, + distance: 2578.69, + duration: 240, + fromPlace: { + name: 'Kalbakkstubben', + }, + toPlace: { + name: 'Postnord', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Helsfyr', + }, + }, + line: { + publicCode: '68', + name: 'Helsfyr T - Grorud T via Alfaset', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'sc|lJijiaA@?HBPNHBHBDBFBJBDBFBXDHFf@b@JLHHNPTXRZXd@`@r@^l@`@r@T`@PXPVTXNRVTZTVPTLZLXJVFVDVDz@JNBx@H^DRHH@l@B??J@X@RBH?LBHBT@`@TVN\\VVRXVTTLNNPX`@\\f@T`@Zn@Rd@lCnGR`@P^PZR\\PVJLNPNN??B@LLFDNF\\JXRFBFBFDDHDFLR?FBD@DBDD@DABC@C`@[TIH@ZErAL|@Jp@FlAHh@BH@RJHFHHJLDJBFFFD@FADCDEDKBKHIHGHCNMF?PARANANAPCd@Ib@Gh@K^Il@@PCjA[TG??`A[JALCH?RBBDBBBVBT@HBPDb@?TBbABlBFvBBf@Fr@Dh@Ht@Jr@Np@Lj@Nd@N`@Rb@Td@PZh@x@NP~@nAzAjBHLVZRVNVI\\Sd@Q^GN??KTcApBmA`CIPKREREX@XBXDPdAxCJ\\l@bB', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:59:00+01:00', + aimedEndTime: '2024-01-12T14:03:50+01:00', + expectedEndTime: '2024-01-12T14:03:50+01:00', + expectedStartTime: '2024-01-12T13:59:00+01:00', + realtime: false, + distance: 310.02, + duration: 290, + fromPlace: { + name: 'Postnord', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'q|xlJmweaACFA?m@aBBEDKK]eAyCEQSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T14:03:50+01:00', + expectedEndTime: '2024-01-12T14:03:50+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + duration: 4183, + distance: 27503.719999999998, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T13:05:00+01:00', + expectedEndTime: '2024-01-12T13:05:00+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeRABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAADUAAAA7ABBSQjpOU1I6UXVheTo3OTQ0ABBSQjpOU1I6UXVheTo3MzczADtSQjpSVVQ6RGF0ZWRTZXJ2aWNlSm91cm5leTplNjBjM2M1ODE2ZjUxNGExZjk2NTdiZjEwYmQ3ZmJhNw==', + mode: 'bus', + aimedStartTime: '2024-01-12T13:05:00+01:00', + aimedEndTime: '2024-01-12T13:21:00+01:00', + expectedEndTime: '2024-01-12T13:21:00+01:00', + expectedStartTime: '2024-01-12T13:05:00+01:00', + realtime: true, + distance: 15329.9, + duration: 960, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Nationaltheatret', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:21:00+01:00', + aimedEndTime: '2024-01-12T13:24:57+01:00', + expectedEndTime: '2024-01-12T13:24:57+01:00', + expectedStartTime: '2024-01-12T13:21:00+01:00', + realtime: false, + distance: 234.7, + duration: 237, + fromPlace: { + name: 'Nationaltheatret', + }, + toPlace: { + name: 'Nationaltheatret', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'u~tlJ{}n`A??GYEKIS[w@GKMSOUGKAEAE?G?G@EAECGCGACAAACCGAC?AAECECGAEFOTo@ISEKAFKl@IJO^GRCAIRGRc@p@??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAABAAAAAWABBSQjpOU1I6UXVheTo3MzMzABFSQjpOU1I6UXVheToxMTEzNAA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6YzRjM2QwMjI1YWI5OGFhYjQ4NWNmZjAwZDExM2E0NzA=', + mode: 'metro', + aimedStartTime: '2024-01-12T13:27:00+01:00', + aimedEndTime: '2024-01-12T13:37:00+01:00', + expectedEndTime: '2024-01-12T13:37:00+01:00', + expectedStartTime: '2024-01-12T13:27:00+01:00', + realtime: true, + distance: 4410.74, + duration: 600, + fromPlace: { + name: 'Nationaltheatret', + }, + toPlace: { + name: 'Helsfyr', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Mortensrud', + }, + }, + line: { + publicCode: '3', + name: 'Kolsås - Mortensrud', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'seulJ{co`AHMTm@FKBa@@KJu@NuAL{@Jw@Lu@Ls@Hk@Lo@?AVyAf@oCLs@Lw@Ho@Js@Fs@Hu@HwADaADkAD}@?WP{EDo@Fm@LiELeD??By@NmEBy@Du@Bk@JgAJcAL_APeAX{A\\aBd@iCL_AJ{@H{@Bi@@g@@e@FgCBcA?OHuD??@[JyE@uA@oAAiAGaAGy@Iy@M{@{@sEOeAIo@IiAEkAAeA?qAH}H??@i@D}DDqC@y@@e@B{@Be@H_ArAeMR}BFuA@yAEwAIsAO{ASqAWgAa@mAe@_Ag@m@mByB]k@[q@Yy@YkASkAQsAYkCKy@Ko@Ms@Ka@Me@Ma@O_@O_@Sa@Yi@uAeCa@u@??w@yAQc@Oa@K[K_@Ma@Mg@g@uBOk@Oi@Mc@Oa@O[Q[QYEc@Cs@Am@Am@@o@@g@@g@Bi@Di@De@Fc@Fc@Hg@Nm@Ja@La@N_@N]R_@RYPYVUTSRMPIPIl@WRITKNKNMLKNQPSRYLULUHSJUHUJYHUNc@Lg@Pk@Lg@Lg@P{@Ha@n@{CH]R}@??`@mBH_@Lq@DYDYD]Da@B]Dg@@_@Bi@@g@?c@?c@Ae@A_@Ck@Eo@?AWwCEq@Eq@Cu@Cw@Cc@Ao@?m@?k@?q@?y@@k@B{@j@oOD}@FgAHw@LuANgAn@uFHw@', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:37:00+01:00', + aimedEndTime: '2024-01-12T13:37:32+01:00', + expectedEndTime: '2024-01-12T13:37:32+01:00', + expectedStartTime: '2024-01-12T13:37:00+01:00', + realtime: false, + distance: 33.93, + duration: 32, + fromPlace: { + name: 'Helsfyr', + }, + toPlace: { + name: 'Helsfyr T', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '_utlJws|`ABBAb@i@G??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAIAAAAFABFSQjpOU1I6UXVheToxMTE0MgARUkI6TlNSOlF1YXk6MTA0MDIAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmIzNDRjZDFmM2FjZWU2MTE5ZGE2N2M3MDNjMTViYmQ1', + mode: 'bus', + aimedStartTime: '2024-01-12T13:40:00+01:00', + aimedEndTime: '2024-01-12T13:44:00+01:00', + expectedEndTime: '2024-01-12T13:44:00+01:00', + expectedStartTime: '2024-01-12T13:40:00+01:00', + realtime: false, + distance: 4040.73, + duration: 240, + fromPlace: { + name: 'Helsfyr T', + }, + toPlace: { + name: 'Trosterud', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Blystadlia', + }, + }, + line: { + publicCode: '300', + name: 'Blystadlia - Ahus - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'wvtlJsr|`AAIGg@M_AIc@K]GUMc@Uo@q@gBo@yA{B_G_BeEeCyGiBaFeAqC]_Ae@qAY_AMa@??IWSu@Mi@Ke@Mk@Oq@Ki@[iB[cBk@iDqAyHc@eCMs@??Ii@i@wCKi@Ke@COMk@Ou@YsAk@oCoAcGo@{CWiAYiAcAmDqBeHgBiGqBcHc@cBc@eBUgASiAQoAIi@Gi@ScCKaBKmBMuBCw@CiB?{BAiBAuA?yA?sA@yB@gC@{D?{A?{A?qA?sAAuAAqACuACqAEwAEkACiAGmAGqAI{AKkBKsAKoAKqAMmAMqAGm@K{@MgAM{@UeBWaBSsAc@oCa@kCSwAYsBQqAQ}AQ{AMqAMkAQuBm@yGOcB]cDMoAYwBWmBc@mC_@qB_@mBi@sDSiAe@}BOu@Oq@YeAOk@Qg@Wu@Oe@Q[M[Wk@We@EI', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:44:00+01:00', + aimedEndTime: '2024-01-12T13:47:21+01:00', + expectedEndTime: '2024-01-12T13:47:21+01:00', + expectedStartTime: '2024-01-12T13:44:00+01:00', + realtime: false, + distance: 178.32, + duration: 201, + fromPlace: { + name: 'Trosterud', + }, + toPlace: { + name: 'Trosterudkrysset', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'sywlJw}haA?A?ECOAM@K?G@E@I@EBCBEFCPEBABCBC@E@G@K@YBSBSDKJQ`@y@HMVv@DPBJ@LBXU[??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAIAAAAFABFSQjpOU1I6UXVheToxMDM3NQARUkI6TlNSOlF1YXk6MTAzOTYAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OjliZTdhODEwN2RjMGEyODQ5NGVkNTRhNzQ3ZThjYzZi', + mode: 'bus', + aimedStartTime: '2024-01-12T13:51:00+01:00', + aimedEndTime: '2024-01-12T13:53:00+01:00', + expectedEndTime: '2024-01-12T13:53:00+01:00', + expectedStartTime: '2024-01-12T13:51:00+01:00', + realtime: false, + distance: 1203.14, + duration: 120, + fromPlace: { + name: 'Trosterudkrysset', + }, + toPlace: { + name: 'Alfasetveien', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Majorstuen', + }, + }, + line: { + publicCode: '25', + name: 'Majorstuen-Haugerud', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'iuwlJ_diaAEIOg@Us@EKIWOi@IQKIKIIEMCCGCECACAE?C@C@ABCDADADAFORQTKNKNMVMZ??MXO\\qAbDGLMXGNKLKPE@CBCDCDAHAFAF?HGRGVGTMZqBbFm@vASh@A???Sf@OZMVKTMVQVKJKJMHQHE?E@GBCFEHAJAD?DGPGHGHKH]TIFSH[LQDWDc@HwCh@uB^qDz@i@JM@MAQ?GKGCGAGBGFEJCNKNIHIFMDODo@RcAZE@', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:53:00+01:00', + aimedEndTime: '2024-01-12T13:55:31+01:00', + expectedEndTime: '2024-01-12T13:55:31+01:00', + expectedStartTime: '2024-01-12T13:53:00+01:00', + realtime: false, + distance: 162.35, + duration: 151, + fromPlace: { + name: 'Alfasetveien', + }, + toPlace: { + name: 'Alfasetveien', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'wnylJqygaA??^QTIHAPGTG@?f@S@P?B@FAJ?J?LAFADEHCHUFk@RAEJO??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAYAAAAIABFSQjpOU1I6UXVheToxMDM5NAARUkI6TlNSOlF1YXk6MTAyNTkAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmQ5OTFhMTk1NGQzYjkyNjRhMTk5ZGY1OTA5YTBlMmE5', + mode: 'bus', + aimedStartTime: '2024-01-12T13:58:00+01:00', + aimedEndTime: '2024-01-12T13:59:00+01:00', + expectedEndTime: '2024-01-12T13:59:00+01:00', + expectedStartTime: '2024-01-12T13:58:00+01:00', + realtime: false, + distance: 872.68, + duration: 60, + fromPlace: { + name: 'Alfasetveien', + }, + toPlace: { + name: 'Postnord', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Helsfyr', + }, + }, + line: { + publicCode: '68', + name: 'Helsfyr T - Grorud T via Alfaset', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'elylJaygaA`A[JALCH?RBBDBBBVBT@HBPDb@?TBbABlBFvBBf@Fr@Dh@Ht@Jr@Np@Lj@Nd@N`@Rb@Td@PZh@x@NP~@nAzAjBHLVZRVNVI\\Sd@Q^GN??KTcApBmA`CIPKREREX@XBXDPdAxCJ\\l@bB', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:59:00+01:00', + aimedEndTime: '2024-01-12T14:03:50+01:00', + expectedEndTime: '2024-01-12T14:03:50+01:00', + expectedStartTime: '2024-01-12T13:59:00+01:00', + realtime: false, + distance: 310.02, + duration: 290, + fromPlace: { + name: 'Postnord', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'q|xlJmweaACFA?m@aBBEDKK]eAyCEQSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T14:07:28+01:00', + expectedEndTime: '2024-01-12T14:07:28+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + duration: 4401, + distance: 26472.179999999997, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T13:05:00+01:00', + expectedEndTime: '2024-01-12T13:05:00+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeRABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAADUAAAA7ABBSQjpOU1I6UXVheTo3OTQ0ABBSQjpOU1I6UXVheTo3MzczADtSQjpSVVQ6RGF0ZWRTZXJ2aWNlSm91cm5leTplNjBjM2M1ODE2ZjUxNGExZjk2NTdiZjEwYmQ3ZmJhNw==', + mode: 'bus', + aimedStartTime: '2024-01-12T13:05:00+01:00', + aimedEndTime: '2024-01-12T13:21:00+01:00', + expectedEndTime: '2024-01-12T13:21:00+01:00', + expectedStartTime: '2024-01-12T13:05:00+01:00', + realtime: true, + distance: 15329.9, + duration: 960, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Nationaltheatret', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:21:00+01:00', + aimedEndTime: '2024-01-12T13:24:57+01:00', + expectedEndTime: '2024-01-12T13:24:57+01:00', + expectedStartTime: '2024-01-12T13:21:00+01:00', + realtime: false, + distance: 234.7, + duration: 237, + fromPlace: { + name: 'Nationaltheatret', + }, + toPlace: { + name: 'Nationaltheatret', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'u~tlJ{}n`A??GYEKIS[w@GKMSOUGKAEAE?G?G@EAECGCGACAAACCGAC?AAECECGAEFOTo@ISEKAFKl@IJO^GRCAIRGRc@p@??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAABAAAAAWABBSQjpOU1I6UXVheTo3MzMzABFSQjpOU1I6UXVheToxMTEzNAA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6YzRjM2QwMjI1YWI5OGFhYjQ4NWNmZjAwZDExM2E0NzA=', + mode: 'metro', + aimedStartTime: '2024-01-12T13:27:00+01:00', + aimedEndTime: '2024-01-12T13:37:00+01:00', + expectedEndTime: '2024-01-12T13:37:00+01:00', + expectedStartTime: '2024-01-12T13:27:00+01:00', + realtime: true, + distance: 4410.74, + duration: 600, + fromPlace: { + name: 'Nationaltheatret', + }, + toPlace: { + name: 'Helsfyr', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Mortensrud', + }, + }, + line: { + publicCode: '3', + name: 'Kolsås - Mortensrud', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'seulJ{co`AHMTm@FKBa@@KJu@NuAL{@Jw@Lu@Ls@Hk@Lo@?AVyAf@oCLs@Lw@Ho@Js@Fs@Hu@HwADaADkAD}@?WP{EDo@Fm@LiELeD??By@NmEBy@Du@Bk@JgAJcAL_APeAX{A\\aBd@iCL_AJ{@H{@Bi@@g@@e@FgCBcA?OHuD??@[JyE@uA@oAAiAGaAGy@Iy@M{@{@sEOeAIo@IiAEkAAeA?qAH}H??@i@D}DDqC@y@@e@B{@Be@H_ArAeMR}BFuA@yAEwAIsAO{ASqAWgAa@mAe@_Ag@m@mByB]k@[q@Yy@YkASkAQsAYkCKy@Ko@Ms@Ka@Me@Ma@O_@O_@Sa@Yi@uAeCa@u@??w@yAQc@Oa@K[K_@Ma@Mg@g@uBOk@Oi@Mc@Oa@O[Q[QYEc@Cs@Am@Am@@o@@g@@g@Bi@Di@De@Fc@Fc@Hg@Nm@Ja@La@N_@N]R_@RYPYVUTSRMPIPIl@WRITKNKNMLKNQPSRYLULUHSJUHUJYHUNc@Lg@Pk@Lg@Lg@P{@Ha@n@{CH]R}@??`@mBH_@Lq@DYDYD]Da@B]Dg@@_@Bi@@g@?c@?c@Ae@A_@Ck@Eo@?AWwCEq@Eq@Cu@Cw@Cc@Ao@?m@?k@?q@?y@@k@B{@j@oOD}@FgAHw@LuANgAn@uFHw@', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:37:00+01:00', + aimedEndTime: '2024-01-12T13:37:32+01:00', + expectedEndTime: '2024-01-12T13:37:32+01:00', + expectedStartTime: '2024-01-12T13:37:00+01:00', + realtime: false, + distance: 33.93, + duration: 32, + fromPlace: { + name: 'Helsfyr', + }, + toPlace: { + name: 'Helsfyr T', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '_utlJws|`ABBAb@i@G??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAIAAAAFABFSQjpOU1I6UXVheToxMTE0MgARUkI6TlNSOlF1YXk6MTA0MDIAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmIzNDRjZDFmM2FjZWU2MTE5ZGE2N2M3MDNjMTViYmQ1', + mode: 'bus', + aimedStartTime: '2024-01-12T13:40:00+01:00', + aimedEndTime: '2024-01-12T13:44:00+01:00', + expectedEndTime: '2024-01-12T13:44:00+01:00', + expectedStartTime: '2024-01-12T13:40:00+01:00', + realtime: false, + distance: 4040.73, + duration: 240, + fromPlace: { + name: 'Helsfyr T', + }, + toPlace: { + name: 'Trosterud', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Blystadlia', + }, + }, + line: { + publicCode: '300', + name: 'Blystadlia - Ahus - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'wvtlJsr|`AAIGg@M_AIc@K]GUMc@Uo@q@gBo@yA{B_G_BeEeCyGiBaFeAqC]_Ae@qAY_AMa@??IWSu@Mi@Ke@Mk@Oq@Ki@[iB[cBk@iDqAyHc@eCMs@??Ii@i@wCKi@Ke@COMk@Ou@YsAk@oCoAcGo@{CWiAYiAcAmDqBeHgBiGqBcHc@cBc@eBUgASiAQoAIi@Gi@ScCKaBKmBMuBCw@CiB?{BAiBAuA?yA?sA@yB@gC@{D?{A?{A?qA?sAAuAAqACuACqAEwAEkACiAGmAGqAI{AKkBKsAKoAKqAMmAMqAGm@K{@MgAM{@UeBWaBSsAc@oCa@kCSwAYsBQqAQ}AQ{AMqAMkAQuBm@yGOcB]cDMoAYwBWmBc@mC_@qB_@mBi@sDSiAe@}BOu@Oq@YeAOk@Qg@Wu@Oe@Q[M[Wk@We@EI', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:44:00+01:00', + aimedEndTime: '2024-01-12T14:07:28+01:00', + expectedEndTime: '2024-01-12T14:07:28+01:00', + expectedStartTime: '2024-01-12T13:44:00+01:00', + realtime: false, + distance: 1694.97, + duration: 1408, + fromPlace: { + name: 'Trosterud', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'sywlJw}haA?A?ECOAM@K?G@E@I@EBCBEFCPEBABCBC@E@G@K@YBSBSDKJQIMCCCCCAE?G@k@JG?IAKESMGCK?I?GDGFGLYt@_@|@Ul@c@bAOZCFAFAFAFAPAVCZAF?HCNGAI@IFIHILKTUh@iA`Cc@dAw@rBQd@M^Od@Mh@Mh@Mb@GPGNINGDI@i@b@YPC@OHQFUHUHu@TBz@BlALADAD?DBFBJHHPCHIx@ABK`AIh@CNIb@Ir@Y~CO~BAbD@fA@`ADtADv@s@?ODm@l@SPGJENGNEPI\\GGC?C?ORGZHLCJ?BV\\BDBH@J@NANAJEJEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:42:00+01:00', + aimedEndTime: '2024-01-12T14:09:19+01:00', + expectedEndTime: '2024-01-12T14:09:19+01:00', + expectedStartTime: '2024-01-12T12:42:00+01:00', + duration: 5239, + distance: 28576.019999999997, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:42:00+01:00', + aimedEndTime: '2024-01-12T12:59:00+01:00', + expectedEndTime: '2024-01-12T12:59:00+01:00', + expectedStartTime: '2024-01-12T12:42:00+01:00', + realtime: false, + distance: 1019.02, + duration: 1020, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'Slependen stasjon', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@REDCDMLAFERQSy@a@_@IM@sAHkDJcADa@B]Hg@Va@Zc@b@u@n@_ChCcA|@_@h@w@rAA@CICIu@jAq@bAQX_@d@QVMFWFG?GAGCIGCQAI?ICO[iDCQCSEe@AEQHKD_@@??', + }, + }, + { + id: 'rO0ABXeFABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAUAAAAQABBSQjpOU1I6UXVheToxMDYxAA9SQjpOU1I6UXVheTo1MDQAMFJCOk5TQjpEYXRlZFNlcnZpY2VKb3VybmV5OjIxMzRfQVNSLUxMU18yNC0wMS0xMg==', + mode: 'rail', + aimedStartTime: '2024-01-12T12:59:00+01:00', + aimedEndTime: '2024-01-12T13:36:00+01:00', + expectedEndTime: '2024-01-12T13:35:30+01:00', + expectedStartTime: '2024-01-12T12:59:00+01:00', + realtime: true, + distance: 25116.17, + duration: 2190, + fromPlace: { + name: 'Slependen stasjon', + }, + toPlace: { + name: 'Nyland stasjon', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Lillestrøm', + }, + }, + line: { + publicCode: 'L1', + name: 'Spikkestad-Oslo S-Lillestrøm', + }, + authority: { + name: 'Vy', + }, + pointsOnLink: { + points: + 'glolJ}ib_AC@aA^IBUJUHWFYHUFWBUBY?Y?YA[CYGg@K[IWIm@M]K[M[OYQYSYW[_@Y]U_@Ua@[m@Um@Yu@Oe@Me@Mk@Me@Ki@Ms@Ks@Gk@Im@Gw@Em@G_AEu@Co@QcEC]??Q}DEiACw@C}@AmAA_AAqAAcH?mHAoB?uCAiA?m@Am@As@C}@Cw@EcAEgAIkAG}@Gs@Gw@Iu@Gq@McAKu@Ku@Kk@Kk@Ik@Mm@Os@Mo@Ki@??[yAYqA[sAc@mBaAgE????kBeIi@_C]yAYmAc@kBWgAYoAaBkH{@oDmAmFUcAu@_D_@}A??u@gDi@yBEWOq@YkAUaA{@iDc@eBU{@WcAOo@Mm@Mq@Kk@Ig@Ii@Im@Io@I{@I_AEs@Es@Ew@CeACgAAy@?s@@w@@y@@o@By@B}@F}@F}@F{@Hy@J{@Ju@RqAz@iFRkAJm@Js@De@Fc@De@Dc@Dm@Fo@Bo@Ds@@k@Bk@@m@@k@?i@?m@?i@Ak@Au@Cq@Cq@Cu@Es@Gw@AI????Iy@Gi@Gg@Gi@Ig@Ig@Ie@Kg@G]Ka@K]W_AQm@Qi@c@qAQk@M]Ka@K_@Ke@Mg@I_@Ki@Kk@Ik@Im@Gi@Gm@Gm@Ek@Cm@Eo@Cy@Cw@Aq@Am@?_A?q@?{@HeTFyO@i@F}L?_A?o@?o@Ai@Ak@Ck@Ag@Ce@Ck@Cg@Ek@Gi@Ei@Iq@M_AO_AIg@SuAO{@CUw@gFa@mCm@kEMy@mByM????q@mEk@}DQkAQgA]qBUuAWsAUuAIc@g@uCQgAQiAk@aE??a@wC]gCSoASoAMy@Q}@UoAQw@Qy@Sw@U{@W}@Sq@Og@Qk@Oc@Wq@Si@Uk@i@sAUk@Ys@Um@Qe@Oe@Sm@Om@Sq@Oi@Qu@Oo@Ou@Mq@Mo@Kq@Ms@Ks@K{@[{Bo@aFWkBSaBUgBMy@My@Ku@Ku@Mw@O_AO}@Ms@Q}@UkACK????ESOm@Qq@Mi@Og@_@mASs@Uw@a@wAUy@]kAs@cC]kAQs@]oAYeAWiAyA{F}AgGwAuFYmAUy@Sw@a@aB{AcGuAqFyA}F[kAWaAS{@Qq@U{@GYQq@[mAMe@I]Kc@Ka@Ig@Ke@Gc@Ii@Gg@Io@Ee@Gw@Ek@Cm@Ag@Ak@As@As@?s@@s@Bu@@m@Dm@Bq@Fu@Do@Fq@Fo@Fg@Hq@Z{B??JaAFk@Dg@??Jg@DWHc@Jm@??Js@Hq@RsAPsAJu@NiALgAHmAHoADkABeA@iA?E?????u@?aAAs@Cs@Cm@Ce@A_@Ce@Ei@IaAKgAG{@YmDK_AI}@Is@Iu@IcAYcDEo@KiAKcAIs@Kq@MaAQgASoAO{@SeAWkAc@qBm@eC[iAQs@Oo@Om@Mm@Kg@Mo@Ko@Ku@Ks@Iu@I}@I_AGeAEw@GiAEcAIyBEs@Eq@GcAIy@Ek@Iw@Ii@Im@Ig@O{@Km@S_AUaAU}@[aAY{@Ww@u@yBQi@Wo@k@cBe@wAYy@Y{@sAwD{@eCSm@??Sm@I_@Ka@IYMc@Si@??Mi@IYI[EU??Oc@GQMa@i@{AmEoMe@qA[}@Qo@Oc@Oo@Ka@Mk@Kg@Mk@G[E[M_A??Ig@Ic@CO??AOCYC]Kw@OsAE_@Ec@Eo@Ac@Cg@Ao@A}@A_A@cA?}@Bw@@o@??D}@Dy@H_AHy@H{@Hk@Ju@L}@x@cFJq@????BMDQj@eD|@kFX}AZgBXcBf@qCVuAN}@Nu@Nu@R{@XqA`@iBLo@Lm@??VsANu@RgAJm@Jq@NaANmAR_BN_BNeBL_BHqADeAD}@DgABu@B{@@_A@y@@y@@cA?iAA{AAeAA_AAy@C_ACy@C_AMsDKkCGiB??KyCKiDE_BC{AAkA?eAAeA@oA@kA@gABwADoAD_BH{AFaAFiAHgAFaAl@}Jn@}JPoCLuBPeCLuALsALoALkANkATaBn@oE|@_GfAqH@KVcBNaAP}@f@kCTmAVsA??XyAb@aCLo@NcALw@Ho@Hq@Hw@HgAHaADu@Dw@H}Ab@_K????d@gKF_BBs@Dw@DaBBaABs@Bm@Bm@@_@B[B_@Bg@Do@B_@D]Fu@??Fs@Fq@J_AJw@Fk@Hk@Jo@Jq@F_@Lu@Nw@??ZcBPeA\\gBN_ANu@Lu@L{@Jm@Ly@L_ANkAHw@Hs@H_AL}AHqAHkAFsAF{ADoABmAHgDDuABgADcAFy@F_AF}@H_AH{@LqAJ{@??@[B]@]??F[DUFa@Fe@Hs@He@L{@Ny@??RuALw@Jk@Jg@Ji@\\{AR}@Ns@N{@L_AVcB??^gCf@cD????p@qE|@eGh@iD??j@uDb@yCn@aE`@oCNaANgALiAJiADi@Fo@Dw@LwBFiA??Fm@Hu@PcBLsARoB??Z}CH}@`@wDXcDb@}DH_A??Dc@B_@Dq@@]Fk@H}@??Z{C??Ba@D_@@WB]@WDm@??TqBViCTgCL{ALyANiBLaBJqAHuAD_AHkADgADgADeAFqB@[Bu@BoA@y@BcA@mA@uA@}A?aA?_A?{A?}HAsF?mJA_F?qH?qBAsC?aB?oC?{BAoC?eH?mD?sD?gBAoB?kA?qB?qA?}@?k@Ak@?m@Aq@Ai@Ag@As@Cw@Cs@Cs@Ew@Eu@Ci@Gq@Eu@G{@KmAQmBYkDO_BOkBQuBw@aJScCQqBS_CS{BKwAOyAa@eFEe@??C_@C[Cq@AUCY??I_AGu@KmAGq@Gw@KaAIy@Go@Io@Im@ES????G_@Ko@Ke@[sAMg@Mk@Ok@Og@Qi@Sm@Oc@Oc@O]O_@Qa@Sa@Qa@k@kAQ_@u@{A??]o@Uc@S_@]m@Wc@OWEGYe@QW[c@W]QWSUMQSSUYOOo@o@c@a@[W[UWS]U[SUM_@Ue@Wq@][QYQYM_Ag@}BoAsEaCwC}AcAi@s@_@c@Wc@Uk@Yk@[u@a@w@a@cFkCyEgC??gCsA_B{@w@_@e@S]O]OWKWKSGsBs@SGWI[K[I[I_@GUEWE[C[C[C[AU?[@Y?W@a@BWD]DUBwATy@NoB\\a@F[Fa@F_@DO@I@W@[@Y?YAUAYCWE]G_@IYK]Ma@O_@Sa@Si@[MIQKu@c@yD}B????]S}D_Ci@]c@Y_@Wa@[_@Y[[_@[e@g@WYSUSYW]W]U_@Wa@Yc@Yg@Yi@Wi@Wi@Uk@Ug@Qe@Si@Um@Qi@Qk@So@Qo@Mc@Kc@EQKa@Mk@Sy@Qw@ScASaAOu@Qy@QaAO{@O_AOaAMy@MgAM_AKgAMkAIaAI_AIeAIcAImAIwAs@iL_BoXMuBK}AG{@Em@Gs@Gq@I_AIu@E_@Gi@Kw@Iq@Iq@M}@M}@Oy@QgAQcAk@yCWoA]gBI_@??u@}DmDwQcEkTMm@QaA_@iBSaAOw@CI??', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:35:30+01:00', + aimedEndTime: '2024-01-12T14:09:19+01:00', + expectedEndTime: '2024-01-12T14:09:19+01:00', + expectedStartTime: '2024-01-12T13:35:30+01:00', + realtime: false, + distance: 2440.83, + duration: 2029, + fromPlace: { + name: 'Nyland stasjon', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'kxzlJakjaA??~@`EPfAJf@BNUDA?K?GCIGMXIXc@tACNBLFJNZJNFFHHD@FBFANd@Pb@Ph@Lf@Pr@Pt@Nt@VrAhGp[DXL|@BPBPp@hDDVDZ?H@JA`@@D@DBDANEJCHEHEDGFWRIFGHGJGLENENCLCRUhBCPB@@?r@LB?xBZ|@Ll@FlAH^@R@J?BABCBCDIDN?D?H?H?B?DAF?FAHETDBJJBDBDDDBDD@B@B@B?B?B?B?BABCBABEBCBCDCBADA?E?C@C@CBCDEBAFAFAb@APAPAPCb@Id@Ih@MRGLCF?RBJ?N?LAPEt@Uj@STGPAFTLf@HVHRJTMp@ITAX@ZLlAJhA?rA\\bDVrAXlAh@r@Tl@Zb@f@d@^LnAzAj@|@h@jAd@jAEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T14:10:09+01:00', + expectedEndTime: '2024-01-12T14:10:09+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + duration: 4562, + distance: 26424.149999999998, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T13:05:00+01:00', + expectedEndTime: '2024-01-12T13:05:00+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeRABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAADUAAAA7ABBSQjpOU1I6UXVheTo3OTQ0ABBSQjpOU1I6UXVheTo3MzczADtSQjpSVVQ6RGF0ZWRTZXJ2aWNlSm91cm5leTplNjBjM2M1ODE2ZjUxNGExZjk2NTdiZjEwYmQ3ZmJhNw==', + mode: 'bus', + aimedStartTime: '2024-01-12T13:05:00+01:00', + aimedEndTime: '2024-01-12T13:21:00+01:00', + expectedEndTime: '2024-01-12T13:21:00+01:00', + expectedStartTime: '2024-01-12T13:05:00+01:00', + realtime: true, + distance: 15329.9, + duration: 960, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Nationaltheatret', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:21:00+01:00', + aimedEndTime: '2024-01-12T13:24:57+01:00', + expectedEndTime: '2024-01-12T13:24:57+01:00', + expectedStartTime: '2024-01-12T13:21:00+01:00', + realtime: false, + distance: 234.7, + duration: 237, + fromPlace: { + name: 'Nationaltheatret', + }, + toPlace: { + name: 'Nationaltheatret', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'u~tlJ{}n`A??GYEKIS[w@GKMSOUGKAEAE?G?G@EAECGCGACAAACCGAC?AAECECGAEFOTo@ISEKAFKl@IJO^GRCAIRGRc@p@??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAABAAAAAWABBSQjpOU1I6UXVheTo3MzMzABFSQjpOU1I6UXVheToxMTEzNAA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6YzRjM2QwMjI1YWI5OGFhYjQ4NWNmZjAwZDExM2E0NzA=', + mode: 'metro', + aimedStartTime: '2024-01-12T13:27:00+01:00', + aimedEndTime: '2024-01-12T13:37:00+01:00', + expectedEndTime: '2024-01-12T13:37:00+01:00', + expectedStartTime: '2024-01-12T13:27:00+01:00', + realtime: true, + distance: 4410.74, + duration: 600, + fromPlace: { + name: 'Nationaltheatret', + }, + toPlace: { + name: 'Helsfyr', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Mortensrud', + }, + }, + line: { + publicCode: '3', + name: 'Kolsås - Mortensrud', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'seulJ{co`AHMTm@FKBa@@KJu@NuAL{@Jw@Lu@Ls@Hk@Lo@?AVyAf@oCLs@Lw@Ho@Js@Fs@Hu@HwADaADkAD}@?WP{EDo@Fm@LiELeD??By@NmEBy@Du@Bk@JgAJcAL_APeAX{A\\aBd@iCL_AJ{@H{@Bi@@g@@e@FgCBcA?OHuD??@[JyE@uA@oAAiAGaAGy@Iy@M{@{@sEOeAIo@IiAEkAAeA?qAH}H??@i@D}DDqC@y@@e@B{@Be@H_ArAeMR}BFuA@yAEwAIsAO{ASqAWgAa@mAe@_Ag@m@mByB]k@[q@Yy@YkASkAQsAYkCKy@Ko@Ms@Ka@Me@Ma@O_@O_@Sa@Yi@uAeCa@u@??w@yAQc@Oa@K[K_@Ma@Mg@g@uBOk@Oi@Mc@Oa@O[Q[QYEc@Cs@Am@Am@@o@@g@@g@Bi@Di@De@Fc@Fc@Hg@Nm@Ja@La@N_@N]R_@RYPYVUTSRMPIPIl@WRITKNKNMLKNQPSRYLULUHSJUHUJYHUNc@Lg@Pk@Lg@Lg@P{@Ha@n@{CH]R}@??`@mBH_@Lq@DYDYD]Da@B]Dg@@_@Bi@@g@?c@?c@Ae@A_@Ck@Eo@?AWwCEq@Eq@Cu@Cw@Cc@Ao@?m@?k@?q@?y@@k@B{@j@oOD}@FgAHw@LuANgAn@uFHw@', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:37:00+01:00', + aimedEndTime: '2024-01-12T13:37:47+01:00', + expectedEndTime: '2024-01-12T13:37:47+01:00', + expectedStartTime: '2024-01-12T13:37:00+01:00', + realtime: false, + distance: 57.17, + duration: 47, + fromPlace: { + name: 'Helsfyr', + }, + toPlace: { + name: 'Helsfyr T', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '_utlJws|`ABBOtBPhA??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAAAAAAJABFSQjpOU1I6UXVheToxMTE0OAARUkI6TlNSOlF1YXk6MTE0NDIAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmM4MzJiNGVkODUyYmE0ZDQwMTc0YmM3ODRkNWZkZGVm', + mode: 'bus', + aimedStartTime: '2024-01-12T13:45:00+01:00', + aimedEndTime: '2024-01-12T13:55:00+01:00', + expectedEndTime: '2024-01-12T13:55:00+01:00', + expectedStartTime: '2024-01-12T13:45:00+01:00', + realtime: false, + distance: 4589.89, + duration: 600, + fromPlace: { + name: 'Helsfyr T', + }, + toPlace: { + name: 'Alfaset', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Grorud T via Ikea', + }, + }, + line: { + publicCode: '66', + name: 'Helsfyr T - Grorud T', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'yttlJun|`A?@Jn@DZ?N?J?JC?CBCDCHAL?J@JBFDFD@DADCBG@I@GDUFWFs@?AFk@Bi@Bi@@W@S?]?e@CeA?c@Ci@Ae@C]CYKiAGe@CMEa@Cc@AEl@yGDq@Be@B_@Di@Bc@DM@O?OAQEKGGEAC?E@GGEGCICKCMAQiAsNIoA?AG{@Co@Am@Ai@@e@?g@@[Bi@\\eH??HcB@_@D{@DaA@m@@]@cABi@@Q@IFa@@ADEBK?K?KAGCECCCAG_@AQASA[Aa@CiDA]AqA?KA}@EuC?Q????As@?ACg@Ae@C}@GsAGeAMoCMoCC_@?g@@W?Q?CBa@BK@M?K?MAMEKGIGEA?E?GDEFCHI?GEECECCAAEEEGKGOQe@EKQSM_@ISK]M[GO??IQIMEMQWSYUW[YYSWO[KSEUEm@EaAGOCQCQEMEQIQMOMMOMQ[i@iAyB??CC]m@MSQWYa@QSY_@]a@A?Y[g@e@SQeAy@kAcAwAeAa@_@QMe@_@????UOUMQK[MQGECWGe@Ia@G}AOKA}C]k@Ii@GUC[EKKEGEEEIEOM_@AOK_AKaAIw@Ek@??CSGgAEy@Cs@AaAAs@Ay@As@?q@@yA@gDBsD@wD@_C?oDByD?_@@iB@gB@i@@m@@[@Y?EHg@@U@A@E@E?EAEAEACAAA?A?IIECGCOBG?C?[@[BYB_@FSDy@J??C@OBSEE?KAI?AEACCEEACAC@A@KIGKEGUa@KYQ_@o@oAeAuBiAyBS[MW]o@Wc@[c@[c@i@q@EG??c@i@[_@[]s@w@GIIIYc@EIGKIMGMAAAKAGCEEEEAC@A@KIGEEGQOYk@]s@[w@Um@Sk@IYIUESIYEWGYEYEWE_@Ge@Gk@Ec@C]C_@C_@A]GcBC_@A[Ca@EWCWE]G[G]Qy@Qy@e@yBS_AMq@GSCOEQCMKe@S_AAC', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:55:00+01:00', + aimedEndTime: '2024-01-12T14:10:09+01:00', + expectedEndTime: '2024-01-12T14:10:09+01:00', + expectedStartTime: '2024-01-12T13:55:00+01:00', + realtime: false, + distance: 1074.54, + duration: 909, + fromPlace: { + name: 'Alfaset', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'egxlJeigaA@A?BRz@DZA@ILEDA@}@aEAECIACCGAE?IUiA?CAEMaA_Br@KBI?GBGHKNW^w@jA]f@ORSRQLMHMBAbD@fA@`ADtADv@s@?ODm@l@SPGJENGNEPI\\GGC?C?ORGZHLCJ?BV\\BDBH@J@NANAJEJEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T14:13:28+01:00', + expectedEndTime: '2024-01-12T14:13:28+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + duration: 4761, + distance: 27352.32, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T13:05:00+01:00', + expectedEndTime: '2024-01-12T13:05:00+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAADUAAAA-ABBSQjpOU1I6UXVheTo3OTQ0ABFSQjpOU1I6UXVheToxMTk2OQA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6ZTYwYzNjNTgxNmY1MTRhMWY5NjU3YmYxMGJkN2ZiYTc=', + mode: 'bus', + aimedStartTime: '2024-01-12T13:05:00+01:00', + aimedEndTime: '2024-01-12T13:28:00+01:00', + expectedEndTime: '2024-01-12T13:28:00+01:00', + expectedStartTime: '2024-01-12T13:05:00+01:00', + realtime: true, + distance: 17846.09, + duration: 1380, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA??EMIU]{@MYKOMOEIIKIGAK?GCGCGGIECM?GIEIGOWy@EKEKCGIKCCCCOQCCAA[a@QSQU_@c@QU[_@i@o@KMCEOQIKkAyAMQY]KMAAAAACKKCEcAmAUU?M?IAOGyGAg@AQHQDK`AuBx@gB@Eh@cAh@gA??`@y@JSHSHWFOHWJ_@Lg@Pw@Lu@H_@De@Dg@Ba@@s@?s@Eq@GuAEs@MsBGqAEm@E}@C}@AcBAgA?e@?]?Q?U@_@@k@HoANiAT}B@SHu@F]D[J_@H[j@uBBK@EDOFe@@EDYH[VaAJ]@CFODIFG`AwAZa@??@AHKLOFC?A@?DA@?FA@?B?H@??D@F@NBF?D?FADCFCHGl@m@\\[LOFGFEBEDCDE@APMFChC_ALCNEDDB@F?BADEBIBK@OAOJy@VwCBWL_BD[DEBI@I?IAKB]Fi@JsAD{@HiALoAJ_AFg@@G??LeBLyANkBBSBQHk@BEBG@I?I?G?IAGCIACCAECA?C?C@C@ADCDAHAH?H?H@HBF?F?NAL?RMRILEHABINATKhAIbAIbAO`BALE`@ABGt@KlAKvAAL', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:28:00+01:00', + aimedEndTime: '2024-01-12T13:31:42+01:00', + expectedEndTime: '2024-01-12T13:31:42+01:00', + expectedStartTime: '2024-01-12T13:28:00+01:00', + realtime: false, + distance: 213.19, + duration: 222, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'sptlJm|s`A??LoAB[@EPqB@MBa@JD@@FQ??D@HDJsA@@B@DBB@DBDB@@Fu@LwAHwA??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAAAAAAJABFSQjpOU1I6UXVheToxMTk2MAARUkI6TlNSOlF1YXk6MTA0MDIAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmY4MDE0ZDY1OWI3ZWY3ODNhZTdjYjU4NjBiMWMyNzg3', + mode: 'bus', + aimedStartTime: '2024-01-12T13:35:00+01:00', + aimedEndTime: '2024-01-12T13:50:00+01:00', + expectedEndTime: '2024-01-12T13:50:00+01:00', + expectedStartTime: '2024-01-12T13:35:00+01:00', + realtime: false, + distance: 6870.86, + duration: 900, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Trosterud', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Lillestrøm', + }, + }, + line: { + publicCode: '110', + name: 'Lillestrøm - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '}ktlJynt`ADi@BQBSBQHk@BEBG@I?I?G?IAG@QBQBKH_@Ji@BNBN?DDUBGJm@BM?ARy@d@{Bt@mDZ{ANo@H[@E`@oBt@mDFUBM?CJe@DSFU@KHc@?GDe@Nq@TgAj@mC@A@KBMFa@x@wE@E??F_@l@iDXcB`@eCV_BDYV_@BE??LUBM?OOaBBa@VuC`@}D@KZwCb@iEZgDFk@BUKa@CKGWWqAe@{BOu@EMIc@C_@G[YwAAGM[EQI]EQMm@ScAG[Mq@??OaAKo@Ik@Is@Io@MqAQ_BC]YeCs@}GEi@Gi@KeAEY??E[Iu@Gc@Ga@G]Ic@Kc@i@aCa@aBMk@Kc@[sAIa@Kc@S_A?C??I[C_@AKAa@?W@G@E?GHSBMFYN_@Rm@FUDUBOBQ@O@Q@O?MD]@g@?_@BG@I@KAIAICIEEEAE?EDADADO?I?E?C?E@C@CBEFCBCDSd@EHEFCDEDCBE@E@A@C?I?EAIEECs@q@Uw@WcAe@qBeD_OS{ASgAOiAEy@Ca@?U?O@I@G?IAKCICECCCAA?C?CBEIKUKc@COG[Ge@OkAEU??AIGg@M_AIc@K]GUMc@Uo@q@gBo@yA{B_G_BeEeCyGiBaFeAqC]_Ae@qAY_AMa@??IWSu@Mi@Ke@Mk@Oq@Ki@[iB[cBk@iDqAyHc@eCMs@??Ii@i@wCKi@Ke@COMk@Ou@YsAk@oCoAcGo@{CWiAYiAcAmDqBeHgBiGqBcHc@cBc@eBUgASiAQoAIi@Gi@ScCKaBKmBMuBCw@CiB?{BAiBAuA?yA?sA@yB@gC@{D?{A?{A?qA?sAAuAAqACuACqAEwAEkACiAGmAGqAI{AKkBKsAKoAKqAMmAMqAGm@K{@MgAM{@UeBWaBSsAc@oCa@kCSwAYsBQqAQ}AQ{AMqAMkAQuBm@yGOcB]cDMoAYwBWmBc@mC_@qB_@mBi@sDSiAe@}BOu@Oq@YeAOk@Qg@Wu@Oe@Q[M[Wk@We@EI', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:50:00+01:00', + aimedEndTime: '2024-01-12T14:13:28+01:00', + expectedEndTime: '2024-01-12T14:13:28+01:00', + expectedStartTime: '2024-01-12T13:50:00+01:00', + realtime: false, + distance: 1694.97, + duration: 1408, + fromPlace: { + name: 'Trosterud', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'sywlJw}haA?A?ECOAM@K?G@E@I@EBCBEFCPEBABCBC@E@G@K@YBSBSDKJQIMCCCCCAE?G@k@JG?IAKESMGCK?I?GDGFGLYt@_@|@Ul@c@bAOZCFAFAFAFAPAVCZAF?HCNGAI@IFIHILKTUh@iA`Cc@dAw@rBQd@M^Od@Mh@Mh@Mb@GPGNINGDI@i@b@YPC@OHQFUHUHu@TBz@BlALADAD?DBFBJHHPCHIx@ABK`AIh@CNIb@Ir@Y~CO~BAbD@fA@`ADtADv@s@?ODm@l@SPGJENGNEPI\\GGC?C?ORGZHLCJ?BV\\BDBH@J@NANAJEJEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T14:13:45+01:00', + expectedEndTime: '2024-01-12T14:13:45+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + duration: 4778, + distance: 30258.55, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T13:05:00+01:00', + expectedEndTime: '2024-01-12T13:05:00+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAADUAAAA-ABBSQjpOU1I6UXVheTo3OTQ0ABFSQjpOU1I6UXVheToxMTk2OQA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6ZTYwYzNjNTgxNmY1MTRhMWY5NjU3YmYxMGJkN2ZiYTc=', + mode: 'bus', + aimedStartTime: '2024-01-12T13:05:00+01:00', + aimedEndTime: '2024-01-12T13:28:00+01:00', + expectedEndTime: '2024-01-12T13:28:00+01:00', + expectedStartTime: '2024-01-12T13:05:00+01:00', + realtime: true, + distance: 17846.09, + duration: 1380, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA??EMIU]{@MYKOMOEIIKIGAK?GCGCGGIECM?GIEIGOWy@EKEKCGIKCCCCOQCCAA[a@QSQU_@c@QU[_@i@o@KMCEOQIKkAyAMQY]KMAAAAACKKCEcAmAUU?M?IAOGyGAg@AQHQDK`AuBx@gB@Eh@cAh@gA??`@y@JSHSHWFOHWJ_@Lg@Pw@Lu@H_@De@Dg@Ba@@s@?s@Eq@GuAEs@MsBGqAEm@E}@C}@AcBAgA?e@?]?Q?U@_@@k@HoANiAT}B@SHu@F]D[J_@H[j@uBBK@EDOFe@@EDYH[VaAJ]@CFODIFG`AwAZa@??@AHKLOFC?A@?DA@?FA@?B?H@??D@F@NBF?D?FADCFCHGl@m@\\[LOFGFEBEDCDE@APMFChC_ALCNEDDB@F?BADEBIBK@OAOJy@VwCBWL_BD[DEBI@I?IAKB]Fi@JsAD{@HiALoAJ_AFg@@G??LeBLyANkBBSBQHk@BEBG@I?I?G?IAGCIACCAECA?C?C@C@ADCDAHAH?H?H@HBF?F?NAL?RMRILEHABINATKhAIbAIbAO`BALE`@ABGt@KlAKvAAL', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:28:00+01:00', + aimedEndTime: '2024-01-12T13:28:32+01:00', + expectedEndTime: '2024-01-12T13:28:32+01:00', + expectedStartTime: '2024-01-12T13:28:00+01:00', + realtime: false, + distance: 24.25, + duration: 32, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'sptlJm|s`A@@@SAAGCGC?A?W@A??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAAAAAAMABFSQjpOU1I6UXVheToxMTk4NQARUkI6TlNSOlF1YXk6MTA5NDMAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OjU0ZTUxNjljOTBiOTVlZTA0Y2JkMTliOTkzNTA2MGMz', + mode: 'bus', + aimedStartTime: '2024-01-12T13:36:00+01:00', + aimedEndTime: '2024-01-12T13:54:00+01:00', + expectedEndTime: '2024-01-12T13:54:00+01:00', + expectedStartTime: '2024-01-12T13:36:00+01:00', + realtime: false, + distance: 7593.08, + duration: 1080, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Veitvet', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Lillestrøm', + }, + }, + line: { + publicCode: '380', + name: 'Lillestrøm - Rv4 - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'gqtlJg~s`A@[CMCIAKIMCWJwA@UBUBW@SBWBW@WBU@UBUBW@WBU@I@M@UBUBW@UBUDE^W@AZUNDH@D?@?D?FAB?BABBB@B?@?BABCBEBG@I?I?G?IAGCIACCAECA?C?C@C@ADGAE?MEc@UEAGAIBIFGBC@EDEDEHCLENCLCTYpDSfCId@ENELELGJEBCFKAI?KCGCIEKIYUWSmBaB_BuA]YYYSSY[QSGGOQEE??EEKMACEIEIKSAKCIEGECEAGKCGGKGQI]K[W_AyAiFGUQo@_@wAc@cBKUIUEOEOE_@I]Su@Wo@GSCMCOEW]sAQ_@CICMIY_AjAI@G?EACAECIGW_@cAiBqCeF}C}FOe@EIGIIOGIEGKOSO{BoCKWGKSYMKGEKISK{@gAGIGO??KSIOGKIOOUGK]]IOyAwC_@s@mAcCMc@GQEI_AgBGKCGIQEIAIAOAOAK?IAC?I?Wc@G{AKyBQIAWAOCYIIAiAIMCCAEC@]AKAGACACG?YCC?C@ABADAB?BIKIGKKc@[MK??m@c@[UIIQKYUeAq@eAm@YOYQYOIEKCEAICKAMAyEe@[EgAKm@G??[C_@EoAKg@Cm@CoAK_@Ce@E]CWCWEMAIAGCAEAIAIAIEIEIEEEEGAE@G@EBCBCFQEg@UiAo@gAk@}@q@SQa@a@UUm@y@_@q@g@aAEGo@yBs@{BIS??IS_@iAyAkEw@}BG[Ie@?OAQCOEUIQIOKGGCI?A?S[OYK[m@iBWu@??Ma@_@oAY}@q@sBm@cDSoAUsAWaBQiAYqBYsBK{BQ{AUcCCu@C}@Gs@MqAUeBYqCQgBSkBGk@??AIGm@QkAGa@a@qB{@{IyBeTUaCMyAY_DIiDCaBI}CIyCCyA?k@?_@@c@Fo@@C@E?E?I?ICGAEECAAC?C?EEGKK[I_@OiAKw@OiA??SeBs@{DqAgKgAiIk@qEKq@??Ge@MiAI{@GcAE}@CaAA{@AcA@cAB}@BmAHgAJkANsAJu@N_AVgA~@mDXgAR{@Lo@PmALkAHiAFeABoA@oA?yAAoAAo@C_@??A]KoBK}AMaBWyBi@aFIy@Iw@IcAG{AGuACcBByB?}B?cA??AcAEyCGoBI_BCi@AQIw@SeBQkAO{@SeA[sAu@{FeB}Mm@mEUmBGc@', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAACMAAAAoABFSQjpOU1I6UXVheToxMDk0MwARUkI6TlNSOlF1YXk6MTAzOTQAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OjQyM2U4OWFhYjNjOTM2MzUwOTlkNzJkOWFiYmVkY2M0', + mode: 'bus', + aimedStartTime: '2024-01-12T13:56:00+01:00', + aimedEndTime: '2024-01-12T14:01:00+01:00', + expectedEndTime: '2024-01-12T14:01:00+01:00', + expectedStartTime: '2024-01-12T13:56:00+01:00', + realtime: false, + distance: 3132.07, + duration: 300, + fromPlace: { + name: 'Veitvet', + }, + toPlace: { + name: 'Alfasetveien', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Haugerud T', + }, + }, + line: { + publicCode: '25', + name: 'Majorstuen-Haugerud', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'uc{lJmkeaAc@gD_@sCQcAMs@WkAQu@Sy@y@sCcAwDcCaJi@kBUu@Sq@Wm@Wi@We@U]_@e@[]a@g@Y]W]SWUa@S_@Q]Qe@Wq@So@Qo@Og@Ou@Os@O_AMs@K{@KaAIu@IaAGkAEy@C}@GqA????]{J@gCAcAC{@Cq@Co@Gu@Iq@OqAGi@Is@AMAMAOAS?Y@E@E?E@EFCDCF?PBF@HCFAd@LRD??@?HBPNHBHBDBFBJBDBFBXDHFf@b@JLHHNPTXRZXd@`@r@^l@`@r@T`@PXPVTXNRVTZTVPTLZLXJVFVDVDz@JNBx@H^DRHH@l@B??J@X@RBH?LBHBT@`@TVN\\VVRXVTTLNNPX`@\\f@T`@Zn@Rd@lCnGR`@P^PZR\\PVJLNPNN??B@LLFDNF\\JXRFBFBFDDHDFLR?FBD@DBDD@DABC@C`@[TIH@ZErAL|@Jp@FlAHh@BH@RJHFHHJLDJBFFFD@FADCDEDKBKHIHGHCNMF?PARANANAPCd@Ib@Gh@K^Il@@PCjA[TG', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T14:01:00+01:00', + aimedEndTime: '2024-01-12T14:13:45+01:00', + expectedEndTime: '2024-01-12T14:13:45+01:00', + expectedStartTime: '2024-01-12T14:01:00+01:00', + realtime: false, + distance: 935.85, + duration: 765, + fromPlace: { + name: 'Alfasetveien', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'ilylJgxgaA??KN@Dj@STGPAFTLf@HVHRJTMp@ITAX@ZLlAJhA?rA\\bDVrAXlAh@r@Tl@Zb@f@d@^LnAzAj@|@h@jAd@jAEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T14:14:09+01:00', + expectedEndTime: '2024-01-12T14:14:09+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + duration: 4802, + distance: 26616.219999999998, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:54:07+01:00', + aimedEndTime: '2024-01-12T13:05:00+01:00', + expectedEndTime: '2024-01-12T13:05:00+01:00', + expectedStartTime: '2024-01-12T12:54:07+01:00', + realtime: false, + distance: 727.21, + duration: 653, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'IKEA Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA\\b@JTAHGVCJ@LBHDPP`@Tb@Xp@f@zAj@nBLd@Hj@@`ACz@@J?JDR@H?D?BAD?BEPAF?D?D@HBCNQDA@BBLDEHKd@a@BAD??O?M@KBKBGBIFGdAeA@?HIZ[??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAADUAAAA-ABBSQjpOU1I6UXVheTo3OTQ0ABFSQjpOU1I6UXVheToxMTk2OQA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6ZTYwYzNjNTgxNmY1MTRhMWY5NjU3YmYxMGJkN2ZiYTc=', + mode: 'bus', + aimedStartTime: '2024-01-12T13:05:00+01:00', + aimedEndTime: '2024-01-12T13:28:00+01:00', + expectedEndTime: '2024-01-12T13:28:00+01:00', + expectedStartTime: '2024-01-12T13:05:00+01:00', + realtime: true, + distance: 17846.09, + duration: 1380, + fromPlace: { + name: 'IKEA Slependen', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Oslo bussterminal', + }, + }, + line: { + publicCode: '250', + name: 'Sætre - Slemmestad - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '{lmlJa|a_AFEJKHEFEH?FEFKBM@MASDSLe@@KFSHWFYH[F[Nw@JSHWFMDKDIDABABEL@F@FBDBHHDJFPBP?P@RARERCNGNGFIFI@K@KAw@Sg@o@c@k@m@q@o@m@aA_Aq@o@s@s@k@m@c@e@e@i@]c@]g@U_@S_@Q_@Ue@Uc@]y@[{@_@gA[gA_@qAa@{A[sAmAyEs@uCaAgDwAmEqC{G}DaIgGkKmBiDcAcBcBqCqFeJc@q@U_@mAwB{@wA}@cBO[mA_CcAqB[q@Ys@k@uAQa@GOYs@o@iBe@wAg@{AY_Ag@iBYeAYeAS_A]}A_@_BYyAWqAQeAQcAO}@{@_GaAeIgAiKmAwLaAgJ{@qGmA{H]kBc@_CaAgFYgBMeAIk@Io@Gs@Gy@Gy@Ey@Cw@Ey@A}@Cu@C_BCkDAiACgAAaAE_AC{@Ew@Gy@G{@MsACQUaCuB}SmAoLOyAcBuP}@eIk@mEmA}Iy@_Iu@wLKaBKmAK_AK_AM_AS}ASmASkAMm@ScAq@_DY}A[_BKs@My@Iq@QkAOqAKcAE_@KiAIiAIiAGcAOaCa@sHS_DIwAGsAImAG{@Gu@KgAIcAK}@I_AK{@WsBaAuGcA}GaBaLwBwN{@gGKmAAk@CeCAoACs@E}@MiASsASwA_@yC]}B_@aCEc@Im@SuAM_AKq@CQEWOmAUwBOeBc@qFO_CKkBa@gFo@gFiBsL}A_KoBwMg@iFMuA[}FCY??Iu@QaASe@AGo@oBq@iBg@qBe@yCw@wEm@}Dq@mE_@eCO_A[uBO{@QaAUcAk@}BSw@Uw@e@cB}@sCeB_G}@yCWy@]wAI[[gAK]SaAOs@McAMyA_AyMSiCKyA??OsBKwAG}@Ea@UsBWuBUqBm@qES{AoAsJS}ASmASmAUkA_@mBg@_CYsAYyAYkBQkAMkAKcAKeAWcCIcA??EYKiAYyCUaCUoCSoBUuBKeAQyAW}BYyBc@gDa@_D[wBeC}PSqAMaAIg@Iy@Gm@Ei@Ek@EaAEcAG_BGoAEm@Ec@I{@Ee@EYE_@Mu@Kk@Ki@Mm@Qk@I[Sq@aAsDSm@W{@W}@U{@Sy@Qy@Mq@Ii@Ee@Ge@C_@Ea@Ce@Ci@K_BGwAOkCA[AO?Q@U@U@E@E?G?G?GAEAEAO@K?MBk@JsBFsA???KB]Ba@Dq@Dq@D]D{@LaBr@yFLy@PcAReAVaAPa@Pe@P[n@gAh@}@`@s@Tc@Vm@DOHUZqALq@PgAJ}@D}@DeABeA?eA?iA?q@Ay@Cm@Ew@GqAM}AEo@Aa@Ac@@c@Bk@Fk@D]DYLg@LYJYLSRWd@c@~@gA`AgAPUNSPYP]\\u@Rk@Pe@Le@Pu@Nw@Hc@Jy@LgAHsAF{@H}BF_AFy@NqAPkAVqA^mAf@{AVm@Zm@fB_DpJcP\\k@Tc@d@aAh@}AV{@d@uBZqAXsAJm@Lq@Hm@LaANsAJkAP}BRwCr@iL^eGT_DNmCHsADgA@i@@i@@y@?s@HwADgA?yA?i@Ac@A[A[Ca@E]Ky@_@iCG]EQESKUu@aBGMM[EQGYKc@CSESAO@M?O?MCKCKEGEEAAC?E[EYCY?Y?q@Ac@D{A@o@????Be@BaA@_A?a@?u@Ae@AUAKASCSEa@Ge@G]Ic@GWI[Uq@a@gAcAmCCGGEECCAGOACGOKUQKY{@EIu@kBUq@Oc@KWCEKUMWO_@KWAGGMiA}CiAwCEMGOUo@KWWq@Sk@AA??EMIU]{@MYKOMOEIIKIGAK?GCGCGGIECM?GIEIGOWy@EKEKCGIKCCCCOQCCAA[a@QSQU_@c@QU[_@i@o@KMCEOQIKkAyAMQY]KMAAAAACKKCEcAmAUU?M?IAOGyGAg@AQHQDK`AuBx@gB@Eh@cAh@gA??`@y@JSHSHWFOHWJ_@Lg@Pw@Lu@H_@De@Dg@Ba@@s@?s@Eq@GuAEs@MsBGqAEm@E}@C}@AcBAgA?e@?]?Q?U@_@@k@HoANiAT}B@SHu@F]D[J_@H[j@uBBK@EDOFe@@EDYH[VaAJ]@CFODIFG`AwAZa@??@AHKLOFC?A@?DA@?FA@?B?H@??D@F@NBF?D?FADCFCHGl@m@\\[LOFGFEBEDCDE@APMFChC_ALCNEDDB@F?BADEBIBK@OAOJy@VwCBWL_BD[DEBI@I?IAKB]Fi@JsAD{@HiALoAJ_AFg@@G??LeBLyANkBBSBQHk@BEBG@I?I?G?IAGCIACCAECA?C?C@C@ADCDAHAH?H?H@HBF?F?NAL?RMRILEHABINATKhAIbAIbAO`BALE`@ABGt@KlAKvAAL', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:28:00+01:00', + aimedEndTime: '2024-01-12T13:31:42+01:00', + expectedEndTime: '2024-01-12T13:31:42+01:00', + expectedStartTime: '2024-01-12T13:28:00+01:00', + realtime: false, + distance: 213.19, + duration: 222, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Oslo bussterminal', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'sptlJm|s`A??LoAB[@EPqB@MBa@JD@@FQ??D@HDJsA@@B@DBB@DBDB@@Fu@LwAHwA??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAAAAAANABFSQjpOU1I6UXVheToxMTk2MAARUkI6TlNSOlF1YXk6MTE0NDIAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OjZlMjFkOWY5OGIyYmQ4MDg4YjlhN2M4ZjUzNGExOTg2', + mode: 'bus', + aimedStartTime: '2024-01-12T13:40:00+01:00', + aimedEndTime: '2024-01-12T13:59:00+01:00', + expectedEndTime: '2024-01-12T13:59:00+01:00', + expectedStartTime: '2024-01-12T13:40:00+01:00', + realtime: false, + distance: 6755.19, + duration: 1140, + fromPlace: { + name: 'Oslo bussterminal', + }, + toPlace: { + name: 'Alfaset', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Kjeller', + }, + }, + line: { + publicCode: '100', + name: 'Kjeller - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + '}ktlJynt`ADi@BQBSBQHk@BEBG@I?I?G?IAG@QBQBKH_@Ji@BNBN?DDUBGJm@BM?ARy@d@{Bt@mDZ{ANo@H[@E`@oBt@mDFUBM?CJe@DSFU@KHc@?GDe@Nq@TgAj@mC@A@KBMFa@x@wE@E??F_@l@iDXcB`@eCV_BDYV_@BE??LUBM?OOaBBa@VuC`@}D@KZwCb@iEZgDFk@BUKa@CKGWWqAe@{BOu@EMIc@C_@G[YwAAGM[EQI]EQMm@ScAG[Mq@??OaAKo@Ik@Is@Io@MqAQ_BC]YeCs@}GEi@Gi@KeAEY??E[Iu@Gc@Ga@G]Ic@Kc@i@aCa@aBMk@Kc@[sAIa@Kc@S_A?C??I[C_@AKAa@?W@G@E?GHSBMFYN_@Rm@FUDUBOBQ@O@Q@O?MD]@g@?_@BG@I@KAIAICIEEEAE?EDADADO?I?E?C?E@C@CBEFCBCDSd@EHEFCDEDCBE@E@A@C?I?EAIEECs@q@Uw@WcAe@qBeD_OS{ASgAOiAEy@Ca@?U?O@I@G?IAKCICECCCAA?C?CBEIKUKc@COG[Ge@OkAEU??AIGg@M_AIc@K]GUMc@Uo@q@gBo@yA{B_G_BeEeCyGiBaFeAqC]_Ae@qAY_AMa@??IWSu@Mi@Ke@Mk@Oq@Ki@[iB[cBk@iDqAyHc@eCMs@??Ii@i@wCKi@Ke@COMk@Ou@YsAk@oCoAcGBUGk@Ce@Ao@Ao@AWA[AQC]CWIe@COOgAMo@OaAGWcA}FCMUgA??AESaASu@WaA[gAUu@]cAWy@W{@K]wAsEIYKWMa@Qo@K_@I[CIAMCKAQ@M?Q@Y@QA]KKEGEEEIEOM_@AOK_AKaAIw@Ek@??CSGgAEy@Cs@AaAAs@Ay@As@?q@@yA@gDBsD@wD@_C?oDByD?_@@iB@gB@i@@m@@[@Y?EHg@@U@A@E@E?EAEAEACAAA?A?IIECGCOBG?C?[@[BYB_@FSDy@J??C@OBSEE?KAI?AEACCEEACAC@A@KIGKEGUa@KYQ_@o@oAeAuBiAyBS[MW]o@Wc@[c@[c@i@q@EG??c@i@[_@[]s@w@GIIIYc@EIGKIMGMAAAKAGCEEEEAC@A@KIGEEGQOYk@]s@[w@Um@Sk@IYIUESIYEWGYEYEWE_@Ge@Gk@Ec@C]C_@C_@A]GcBC_@A[Ca@EWCWE]G[G]Qy@Qy@e@yBS_AMq@GSCOEQCMKe@S_AAC', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:59:00+01:00', + aimedEndTime: '2024-01-12T14:14:09+01:00', + expectedEndTime: '2024-01-12T14:14:09+01:00', + expectedStartTime: '2024-01-12T13:59:00+01:00', + realtime: false, + distance: 1074.54, + duration: 909, + fromPlace: { + name: 'Alfaset', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'egxlJeigaA@A?BRz@DZA@ILEDA@}@aEAECIACCGAE?IUiA?CAEMaA_Br@KBI?GBGHKNW^w@jA]f@ORSRQLMHMBAbD@fA@`ADtADv@s@?ODm@l@SPGJENGNEPI\\GGC?C?ORGZHLCJ?BV\\BDBH@J@NANAJEJEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:56:02+01:00', + aimedEndTime: '2024-01-12T14:14:09+01:00', + expectedEndTime: '2024-01-12T14:14:09+01:00', + expectedStartTime: '2024-01-12T12:56:02+01:00', + duration: 4687, + distance: 26193.91, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:56:02+01:00', + aimedEndTime: '2024-01-12T13:00:09+01:00', + expectedEndTime: '2024-01-12T13:00:09+01:00', + expectedStartTime: '2024-01-12T12:56:02+01:00', + realtime: false, + distance: 291.84, + duration: 247, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA??', + }, + }, + { + id: 'rO0ABXeRABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAABkAAAAeABBSQjpOU1I6UXVheTo3OTI4ABBSQjpOU1I6UXVheTo3MjYzADtSQjpSVVQ6RGF0ZWRTZXJ2aWNlSm91cm5leToyOWIyODMyMDdlZDg3YmRmZjJlYWM4ODdiMTNlZGE2OA==', + mode: 'bus', + aimedStartTime: '2024-01-12T13:00:00+01:00', + aimedEndTime: '2024-01-12T13:07:00+01:00', + expectedEndTime: '2024-01-12T13:07:09+01:00', + expectedStartTime: '2024-01-12T13:00:09+01:00', + realtime: true, + distance: 3475.48, + duration: 420, + fromPlace: { + name: 'Slependen', + }, + toPlace: { + name: 'Sandvika bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Sandvika', + }, + }, + line: { + publicCode: '265', + name: 'Sandvika - Nesøya - Sandvika', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'yzmlJelb_A[a@QUo@y@WYIKIKQUGKCCEIIOQ]GKEKAGCEAEAICQMi@@I@MAOCKGIK_@E[AYCY?[?_@Dc@Di@LaAJs@B_@BYBY@k@AgAAa@Gi@CUEWG_@EOCMe@{ASq@GUGUMk@EUCSKs@G_@Ek@K_BGiAGg@G_@E[IYEWISO_@KQGKIIMQMKQOWSYSe@]WQOQIKQSOSU]Yg@QYOW??S[]m@y@wAq@mAa@s@Ua@Q_@MUQ[Wo@Yo@M[Ug@Q[CGCCCECEOQOSCKYWMIECCAKEMAIAOAS?I?KBM@]LWLCHe@PODMDQDG@G?K@M?I?IAMAMAKEKCICIE[MCKYOIEECCC?IAGAGCECECCA?C?A?EKCICGCICKIWEKCIUa@??aEaI[k@S]EKEKCIAGGMGK?GAOCMGKGEG?GBGHCHAJAJKLML}@jAe@\\EMGGGAEk@AS?S@QBOFO~AoDzAoDz@wBP]HBHCFIDM@Q?QAOEMGIICIBOOOSSQQ_@Q_@???AO[O]o@eBWu@Ws@k@iBe@aBMYEIIMGEEAEAG@GDIFUV??UZKHSHKBO?SCQGKGKMOQKYK_@E]C[ASA[A}BB[@_@@]?M?MAKEKEECAE?EBCFCFALMPU\\WLUPYV[\\e@l@s@lAq@nAmAnBY\\_@Zc@^[V]@WJCCEAE?C@EFCHCL?F?D@F@F@FBFBBD@D?PX\\l@b@nBRDFDFNd@hB^xALb@d@nBBL?LALCJCFEBE@E?EGEIi@_CI_@[kA]uA', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:07:09+01:00', + aimedEndTime: '2024-01-12T13:09:59+01:00', + expectedEndTime: '2024-01-12T13:09:59+01:00', + expectedStartTime: '2024-01-12T13:07:09+01:00', + realtime: false, + distance: 189.05, + duration: 170, + fromPlace: { + name: 'Sandvika bussterminal', + }, + toPlace: { + name: 'Sandvika stasjon', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'm{plJ}uf_A??nAbD@DB?@DH?L?LOVYS_As@_E@?', + }, + }, + { + id: 'rO0ABXeDABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAEAAAAEAA9SQjpOU1I6UXVheTo5OTMAD1JCOk5TUjpRdWF5OjQ3NwAvUkI6TlNCOkRhdGVkU2VydmljZUpvdXJuZXk6MzE5X0FTUi1MSE1fMjQtMDEtMTI=', + mode: 'rail', + aimedStartTime: '2024-01-12T13:15:00+01:00', + aimedEndTime: '2024-01-12T13:27:00+01:00', + expectedEndTime: '2024-01-12T13:27:10+01:00', + expectedStartTime: '2024-01-12T13:15:00+01:00', + realtime: true, + distance: 12466.92, + duration: 730, + fromPlace: { + name: 'Sandvika stasjon', + }, + toPlace: { + name: 'Nationaltheatret stasjon', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Lillehammer', + }, + }, + line: { + publicCode: 'RE10', + name: 'Drammen-Oslo S-Lillehammer', + }, + authority: { + name: 'Vy', + }, + pointsOnLink: { + points: + '{xplJ{yf_AAEo@kC_@yA]uAo@aC_@wAYgAc@gBWiAWmAa@aBGYQu@q@uCe@oB??e@sB[yAUeAOs@UkA]cBQcAOw@O}@My@o@}Dk@sDuA{I{B{NqAoIe@yCq@{DcAoFs@aDq@iCs@mCw@eCi@cBs@qByAsD}DqI}CgGiAyB}@gB{@kBu@cBs@_By@qBu@kBm@_B{@cCo@kBs@wBq@uBcAiDq@aCe@iBe@kBg@qBe@oBk@iCe@wBc@wB_@sBY{Ae@iCm@qDi@oD_@eCi@}De@uDi@aFi@gF_@eEi@_Hq@wJeCy]k@iIqNarBc@yGWaFUqEMuCMeDIeDI}CGiCGkCCcCEwDGcGs@ax@EsGCwBAqB@_A?w@@o@B{@Bk@@o@Du@Do@Fw@Fq@Fs@Fm@Fi@Ju@Z{B\\iC`@{CJq@Js@NmAPsAHw@JeAHmALgBF}ABsABsA?G?????u@?_AAuAAy@Ai@Ac@Cq@A_@Ci@Ck@Ei@G{@IgAOgBOqB[}D??YcDEo@KiAKcAIs@Kq@MaAQgASoAO{@SeAWkAc@qBm@eC[iAQs@Oo@Om@Mm@Kg@Mo@Ko@Ku@Ks@Iu@I}@I_AGeAEw@GiAEcAIyBEs@Eq@GcAIy@Ek@Iw@Ii@Im@Ig@O{@Km@S_AUaAU}@[aAY{@Ww@u@yBQi@Wo@k@cBe@wAYy@Y{@??a@sAOg@uA_F_@oAYeAi@mBi@iBi@gBe@wA[}@qDoKc@qAY_Aa@sASw@Qu@Oo@Om@Ms@O{@Mq@Ii@MaAKw@Gk@Ee@C]Ee@Cc@Ci@Co@Cs@?[Aa@??AaA?o@?i@@]@q@@m@D}@F{@H}@Hy@Ju@PeARmA~@cFLo@????BMp@wD^uBN}@PcARmARwAZ_CPuAPiAPcARgAVuATmAHa@Lq@Lo@ReALo@Lm@??VsANu@RgAJm@Jq@NaANmAR_BN_BNeBL_BHqADeAD}@DgABu@B{@@_A@y@@y@@cA?iAA{AAeAA_AAy@C_ACy@C_AMsDKkCGiB??KyCKiDE_BC{AAkA?eAAeA@oA@kA@gABwADoAD_BH{AFaAFiAHgAFaAl@}Jn@}JPoCLuBPeCLuALsALoALkANkATaBn@oE|@_GfAqH@KVcBNaAP}@f@kCTmAVsA??XyAb@aCLo@NcALw@Ho@Hq@Hw@HgAHaADu@Dw@H}Ab@_K??', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:27:10+01:00', + aimedEndTime: '2024-01-12T13:32:00+01:00', + expectedEndTime: '2024-01-12T13:32:00+01:00', + expectedStartTime: '2024-01-12T13:27:10+01:00', + realtime: false, + distance: 326.35, + duration: 290, + fromPlace: { + name: 'Nationaltheatret stasjon', + }, + toPlace: { + name: 'Nationaltheatret', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '_fulJefn`A??l@yJNqD@OCSCWWeCCQKcAEOEQ]f@SCt@cB??', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAsAAAARABBSQjpOU1I6UXVheTo3MzMzABFSQjpOU1I6UXVheToxMTEzNAA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6NzQzMTQyMWUzM2FlNDU2YmMzOTQ5OWEyMTAyN2M2Mzg=', + mode: 'metro', + aimedStartTime: '2024-01-12T13:34:00+01:00', + aimedEndTime: '2024-01-12T13:44:00+01:00', + expectedEndTime: '2024-01-12T13:44:00+01:00', + expectedStartTime: '2024-01-12T13:34:00+01:00', + realtime: true, + distance: 4410.74, + duration: 600, + fromPlace: { + name: 'Nationaltheatret', + }, + toPlace: { + name: 'Helsfyr', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Ellingsrudåsen', + }, + }, + line: { + publicCode: '2', + name: 'Østerås - Ellingsrudåsen', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'seulJ{co`AHMTm@FKBa@@KJu@NuAL{@Jw@Lu@Ls@Hk@Lo@?AVyAf@oCLs@Lw@Ho@Js@Fs@Hu@HwADaADkAD}@?WP{EDo@Fm@LiELeD??By@NmEBy@Du@Bk@JgAJcAL_APeAX{A\\aBd@iCL_AJ{@H{@Bi@@g@@e@FgCBcA?OHuD??@[JyE@uA@oAAiAGaAGy@Iy@M{@{@sEOeAIo@IiAEkAAeA?qAH}H??@i@D}DDqC@y@@e@B{@Be@H_ArAeMR}BFuA@yAEwAIsAO{ASqAWgAa@mAe@_Ag@m@mByB]k@[q@Yy@YkASkAQsAYkCKy@Ko@Ms@Ka@Me@Ma@O_@O_@Sa@Yi@uAeCa@u@??w@yAQc@Oa@K[K_@Ma@Mg@g@uBOk@Oi@Mc@Oa@O[Q[QYEc@Cs@Am@Am@@o@@g@@g@Bi@Di@De@Fc@Fc@Hg@Nm@Ja@La@N_@N]R_@RYPYVUTSRMPIPIl@WRITKNKNMLKNQPSRYLULUHSJUHUJYHUNc@Lg@Pk@Lg@Lg@P{@Ha@n@{CH]R}@??`@mBH_@Lq@DYDYD]Da@B]Dg@@_@Bi@@g@?c@?c@Ae@A_@Ck@Eo@?AWwCEq@Eq@Cu@Cw@Cc@Ao@?m@?k@?q@?y@@k@B{@j@oOD}@FgAHw@LuANgAn@uFHw@', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:44:00+01:00', + aimedEndTime: '2024-01-12T13:44:32+01:00', + expectedEndTime: '2024-01-12T13:44:32+01:00', + expectedStartTime: '2024-01-12T13:44:00+01:00', + realtime: false, + distance: 33.93, + duration: 32, + fromPlace: { + name: 'Helsfyr', + }, + toPlace: { + name: 'Helsfyr T', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '_utlJws|`ABBAb@i@G??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAYAAAANABFSQjpOU1I6UXVheToxMTE0MgARUkI6TlNSOlF1YXk6MTE0NDIAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OjZlMjFkOWY5OGIyYmQ4MDg4YjlhN2M4ZjUzNGExOTg2', + mode: 'bus', + aimedStartTime: '2024-01-12T13:49:00+01:00', + aimedEndTime: '2024-01-12T13:59:00+01:00', + expectedEndTime: '2024-01-12T13:59:00+01:00', + expectedStartTime: '2024-01-12T13:49:00+01:00', + realtime: false, + distance: 3925.06, + duration: 600, + fromPlace: { + name: 'Helsfyr T', + }, + toPlace: { + name: 'Alfaset', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Kjeller', + }, + }, + line: { + publicCode: '100', + name: 'Kjeller - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'wvtlJsr|`AAIGg@M_AIc@K]GUMc@Uo@q@gBo@yA{B_G_BeEeCyGiBaFeAqC]_Ae@qAY_AMa@??IWSu@Mi@Ke@Mk@Oq@Ki@[iB[cBk@iDqAyHc@eCMs@??Ii@i@wCKi@Ke@COMk@Ou@YsAk@oCoAcGBUGk@Ce@Ao@Ao@AWA[AQC]CWIe@COOgAMo@OaAGWcA}FCMUgA??AESaASu@WaA[gAUu@]cAWy@W{@K]wAsEIYKWMa@Qo@K_@I[CIAMCKAQ@M?Q@Y@QA]KKEGEEEIEOM_@AOK_AKaAIw@Ek@??CSGgAEy@Cs@AaAAs@Ay@As@?q@@yA@gDBsD@wD@_C?oDByD?_@@iB@gB@i@@m@@[@Y?EHg@@U@A@E@E?EAEAEACAAA?A?IIECGCOBG?C?[@[BYB_@FSDy@J??C@OBSEE?KAI?AEACCEEACAC@A@KIGKEGUa@KYQ_@o@oAeAuBiAyBS[MW]o@Wc@[c@[c@i@q@EG??c@i@[_@[]s@w@GIIIYc@EIGKIMGMAAAKAGCEEEEAC@A@KIGEEGQOYk@]s@[w@Um@Sk@IYIUESIYEWGYEYEWE_@Ge@Gk@Ec@C]C_@C_@A]GcBC_@A[Ca@EWCWE]G[G]Qy@Qy@e@yBS_AMq@GSCOEQCMKe@S_AAC', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:59:00+01:00', + aimedEndTime: '2024-01-12T14:14:09+01:00', + expectedEndTime: '2024-01-12T14:14:09+01:00', + expectedStartTime: '2024-01-12T13:59:00+01:00', + realtime: false, + distance: 1074.54, + duration: 909, + fromPlace: { + name: 'Alfaset', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'egxlJeigaA@A?BRz@DZA@ILEDA@}@aEAECIACCGAE?IUiA?CAEMaA_Br@KBI?GBGHKNW^w@jA]f@ORSRQLMHMBAbD@fA@`ADtADv@s@?ODm@l@SPGJENGNEPI\\GGC?C?ORGZHLCJ?BV\\BDBH@J@NANAJEJEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:56:02+01:00', + aimedEndTime: '2024-01-12T14:17:28+01:00', + expectedEndTime: '2024-01-12T14:17:28+01:00', + expectedStartTime: '2024-01-12T12:56:02+01:00', + duration: 4886, + distance: 28471.820000000003, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:56:02+01:00', + aimedEndTime: '2024-01-12T13:00:09+01:00', + expectedEndTime: '2024-01-12T13:00:09+01:00', + expectedStartTime: '2024-01-12T12:56:02+01:00', + realtime: false, + distance: 291.84, + duration: 247, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA??', + }, + }, + { + id: 'rO0ABXeRABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAABkAAAAeABBSQjpOU1I6UXVheTo3OTI4ABBSQjpOU1I6UXVheTo3MjYzADtSQjpSVVQ6RGF0ZWRTZXJ2aWNlSm91cm5leToyOWIyODMyMDdlZDg3YmRmZjJlYWM4ODdiMTNlZGE2OA==', + mode: 'bus', + aimedStartTime: '2024-01-12T13:00:00+01:00', + aimedEndTime: '2024-01-12T13:07:00+01:00', + expectedEndTime: '2024-01-12T13:07:09+01:00', + expectedStartTime: '2024-01-12T13:00:09+01:00', + realtime: true, + distance: 3475.48, + duration: 420, + fromPlace: { + name: 'Slependen', + }, + toPlace: { + name: 'Sandvika bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Sandvika', + }, + }, + line: { + publicCode: '265', + name: 'Sandvika - Nesøya - Sandvika', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'yzmlJelb_A[a@QUo@y@WYIKIKQUGKCCEIIOQ]GKEKAGCEAEAICQMi@@I@MAOCKGIK_@E[AYCY?[?_@Dc@Di@LaAJs@B_@BYBY@k@AgAAa@Gi@CUEWG_@EOCMe@{ASq@GUGUMk@EUCSKs@G_@Ek@K_BGiAGg@G_@E[IYEWISO_@KQGKIIMQMKQOWSYSe@]WQOQIKQSOSU]Yg@QYOW??S[]m@y@wAq@mAa@s@Ua@Q_@MUQ[Wo@Yo@M[Ug@Q[CGCCCECEOQOSCKYWMIECCAKEMAIAOAS?I?KBM@]LWLCHe@PODMDQDG@G?K@M?I?IAMAMAKEKCICIE[MCKYOIEECCC?IAGAGCECECCA?C?A?EKCICGCICKIWEKCIUa@??aEaI[k@S]EKEKCIAGGMGK?GAOCMGKGEG?GBGHCHAJAJKLML}@jAe@\\EMGGGAEk@AS?S@QBOFO~AoDzAoDz@wBP]HBHCFIDM@Q?QAOEMGIICIBOOOSSQQ_@Q_@???AO[O]o@eBWu@Ws@k@iBe@aBMYEIIMGEEAEAG@GDIFUV??UZKHSHKBO?SCQGKGKMOQKYK_@E]C[ASA[A}BB[@_@@]?M?MAKEKEECAE?EBCFCFALMPU\\WLUPYV[\\e@l@s@lAq@nAmAnBY\\_@Zc@^[V]@WJCCEAE?C@EFCHCL?F?D@F@F@FBFBBD@D?PX\\l@b@nBRDFDFNd@hB^xALb@d@nBBL?LALCJCFEBE@E?EGEIi@_CI_@[kA]uA', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:07:09+01:00', + aimedEndTime: '2024-01-12T13:09:59+01:00', + expectedEndTime: '2024-01-12T13:09:59+01:00', + expectedStartTime: '2024-01-12T13:07:09+01:00', + realtime: false, + distance: 189.05, + duration: 170, + fromPlace: { + name: 'Sandvika bussterminal', + }, + toPlace: { + name: 'Sandvika stasjon', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'm{plJ}uf_A??nAbD@DB?@DH?L?LOVYS_As@_E@?', + }, + }, + { + id: 'rO0ABXeDABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAEAAAAFAA9SQjpOU1I6UXVheTo5OTMAD1JCOk5TUjpRdWF5OjU3MQAvUkI6TlNCOkRhdGVkU2VydmljZUpvdXJuZXk6MzE5X0FTUi1MSE1fMjQtMDEtMTI=', + mode: 'rail', + aimedStartTime: '2024-01-12T13:15:00+01:00', + aimedEndTime: '2024-01-12T13:31:00+01:00', + expectedEndTime: '2024-01-12T13:31:00+01:00', + expectedStartTime: '2024-01-12T13:15:00+01:00', + realtime: true, + distance: 14113.62, + duration: 960, + fromPlace: { + name: 'Sandvika stasjon', + }, + toPlace: { + name: 'Oslo S', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Lillehammer', + }, + }, + line: { + publicCode: 'RE10', + name: 'Drammen-Oslo S-Lillehammer', + }, + authority: { + name: 'Vy', + }, + pointsOnLink: { + points: + '{xplJ{yf_AAEo@kC_@yA]uAo@aC_@wAYgAc@gBWiAWmAa@aBGYQu@q@uCe@oB??e@sB[yAUeAOs@UkA]cBQcAOw@O}@My@o@}Dk@sDuA{I{B{NqAoIe@yCq@{DcAoFs@aDq@iCs@mCw@eCi@cBs@qByAsD}DqI}CgGiAyB}@gB{@kBu@cBs@_By@qBu@kBm@_B{@cCo@kBs@wBq@uBcAiDq@aCe@iBe@kBg@qBe@oBk@iCe@wBc@wB_@sBY{Ae@iCm@qDi@oD_@eCi@}De@uDi@aFi@gF_@eEi@_Hq@wJeCy]k@iIqNarBc@yGWaFUqEMuCMeDIeDI}CGiCGkCCcCEwDGcGs@ax@EsGCwBAqB@_A?w@@o@B{@Bk@@o@Du@Do@Fw@Fq@Fs@Fm@Fi@Ju@Z{B\\iC`@{CJq@Js@NmAPsAHw@JeAHmALgBF}ABsABsA?G?????u@?_AAuAAy@Ai@Ac@Cq@A_@Ci@Ck@Ei@G{@IgAOgBOqB[}D??YcDEo@KiAKcAIs@Kq@MaAQgASoAO{@SeAWkAc@qBm@eC[iAQs@Oo@Om@Mm@Kg@Mo@Ko@Ku@Ks@Iu@I}@I_AGeAEw@GiAEcAIyBEs@Eq@GcAIy@Ek@Iw@Ii@Im@Ig@O{@Km@S_AUaAU}@[aAY{@Ww@u@yBQi@Wo@k@cBe@wAYy@Y{@??a@sAOg@uA_F_@oAYeAi@mBi@iBi@gBe@wA[}@qDoKc@qAY_Aa@sASw@Qu@Oo@Om@Ms@O{@Mq@Ii@MaAKw@Gk@Ee@C]Ee@Cc@Ci@Co@Cs@?[Aa@??AaA?o@?i@@]@q@@m@D}@F{@H}@Hy@Ju@PeARmA~@cFLo@????BMp@wD^uBN}@PcARmARwAZ_CPuAPiAPcARgAVuATmAHa@Lq@Lo@ReALo@Lm@??VsANu@RgAJm@Jq@NaANmAR_BN_BNeBL_BHqADeAD}@DgABu@B{@@_A@y@@y@@cA?iAA{AAeAA_AAy@C_ACy@C_AMsDKkCGiB??KyCKiDE_BC{AAkA?eAAeA@oA@kA@gABwADoAD_BH{AFaAFiAHgAFaAl@}Jn@}JPoCLuBPeCLuALsALoALkANkATaBn@oE|@_GfAqH@KVcBNaAP}@f@kCTmAVsA??XyAb@aCLo@NcALw@Ho@Hq@Hw@HgAHaADu@Dw@H}Ab@_K????d@gKF_BBs@Dw@DaBBaABs@Bm@Bm@@_@B[B_@Bg@Do@B_@D]Fu@??Fs@Fq@J_AJw@Fk@Hk@Jo@Jq@F_@Lu@Nw@??ZcBPeA\\gBN_ANu@Lu@L{@Jm@Ly@L_ANkAHw@Hs@H_AL}AHqAHkAFsAF{ADoABmAHgDDuABgADcAFy@F_AF}@H_AH{@LqAJ{@??@[B]@]??F[DUFa@Fe@Hs@He@L{@Ny@??P_AJg@Lk@Lk@Rs@Po@J_@H[J]Nk@Lo@Pq@Jm@Lm@Lw@??^iCf@_D??', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:31:00+01:00', + aimedEndTime: '2024-01-12T13:38:59+01:00', + expectedEndTime: '2024-01-12T13:38:59+01:00', + expectedStartTime: '2024-01-12T13:31:00+01:00', + realtime: false, + distance: 436.66, + duration: 479, + fromPlace: { + name: 'Oslo S', + }, + toPlace: { + name: 'Bjørvika', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + '_gtlJuqs`A??FHER?BCH\\ZZXZXXXBG?EDSb@{B@@@OB@D?F?B?b@yCBMDSXqALFP@BAD?DCDEBGBKBKBIB?@?NJHHLNHH@@@@?@?@BB?BAFADNJp@`@NJ@K?CFc@?G??CC?A?A@A@A?A?ACC????AAAAFc@FYF]AA', + }, + }, + { + id: 'rO0ABXeSABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAEAAAAFABBSQjpOU1I6UXVheTo3MTY5ABFSQjpOU1I6UXVheToxMDQwMgA7UkI6UlVUOkRhdGVkU2VydmljZUpvdXJuZXk6YzA3MTEwYjI3YjM5N2VmZmUwMTRjZDgxYTEzNzhhODI=', + mode: 'bus', + aimedStartTime: '2024-01-12T13:43:00+01:00', + aimedEndTime: '2024-01-12T13:54:00+01:00', + expectedEndTime: '2024-01-12T13:54:00+01:00', + expectedStartTime: '2024-01-12T13:43:00+01:00', + realtime: false, + distance: 8270.2, + duration: 660, + fromPlace: { + name: 'Bjørvika', + }, + toPlace: { + name: 'Trosterud', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Blystadlia', + }, + }, + line: { + publicCode: '300', + name: 'Blystadlia - Ahus - Oslo bussterminal', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'wwslJe~s`ADU`@oCF[`@mCRuAFa@Hg@XeBPiAFc@Fc@ZsBPgAHk@PJr@`@lHhEJFxEnCLHPHPJNFNDHBH@PBP@ZCPCNEPEFANGPIRKZQv@a@pCyAVMHCDABAB?BAD?DFDBD@DADCDGBK@KXQ\\ID?Z?VGBGDI\\s@b@gAl@oB^yAXwARkAPuAL_AJaALwBHwBBmBAoBEuCKmBWcDMoAKqA}BeToAsLg@mEi@wFm@iF[wBi@cCi@sBg@yAe@eAKQk@cAeDyD[]IKSU_BgBs@y@{@cAe@k@k@m@a@e@a@g@uAkB]e@_@m@a@w@Wq@So@WaAM{@QkAM{AKeBMwCQiGGuBG_BKyAMiAOw@Os@Ws@[q@_@i@]]]UYMWEYCW?UDSDUJSLULWT}AtA[VWPYLUFG@]DUCMCMG[SWWSYUa@Qc@Uw@WcAe@qBeD_OS{ASgAOiAEy@Ca@?U?O@I@G?IAKCICECCCAA?C?CBEIKUKc@COG[Ge@OkAEU??AIGg@M_AIc@K]GUMc@Uo@q@gBo@yA{B_G_BeEeCyGiBaFeAqC]_Ae@qAY_AMa@??IWSu@Mi@Ke@Mk@Oq@Ki@[iB[cBk@iDqAyHc@eCMs@??Ii@i@wCKi@Ke@COMk@Ou@YsAk@oCoAcGo@{CWiAYiAcAmDqBeHgBiGqBcHc@cBc@eBUgASiAQoAIi@Gi@ScCKaBKmBMuBCw@CiB?{BAiBAuA?yA?sA@yB@gC@{D?{A?{A?qA?sAAuAAqACuACqAEwAEkACiAGmAGqAI{AKkBKsAKoAKqAMmAMqAGm@K{@MgAM{@UeBWaBSsAc@oCa@kCSwAYsBQqAQ}AQ{AMqAMkAQuBm@yGOcB]cDMoAYwBWmBc@mC_@qB_@mBi@sDSiAe@}BOu@Oq@YeAOk@Qg@Wu@Oe@Q[M[Wk@We@EI', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:54:00+01:00', + aimedEndTime: '2024-01-12T14:17:28+01:00', + expectedEndTime: '2024-01-12T14:17:28+01:00', + expectedStartTime: '2024-01-12T13:54:00+01:00', + realtime: false, + distance: 1694.97, + duration: 1408, + fromPlace: { + name: 'Trosterud', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: + 'sywlJw}haA?A?ECOAM@K?G@E@I@EBCBEFCPEBABCBC@E@G@K@YBSBSDKJQIMCCCCCAE?G@k@JG?IAKESMGCK?I?GDGFGLYt@_@|@Ul@c@bAOZCFAFAFAFAPAVCZAF?HCNGAI@IFIHILKTUh@iA`Cc@dAw@rBQd@M^Od@Mh@Mh@Mb@GPGNINGDI@i@b@YPC@OHQFUHUHu@TBz@BlALADAD?DBFBJHHPCHIx@ABK`AIh@CNIb@Ir@Y~CO~BAbD@fA@`ADtADv@s@?ODm@l@SPGJENGNEPI\\GGC?C?ORGZHLCJ?BV\\BDBH@J@NANAJEJEJUf@IN@@DLcApBmA`CIPKREREX@XBXSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + { + aimedStartTime: '2024-01-12T12:41:00+01:00', + aimedEndTime: '2024-01-12T14:18:50+01:00', + expectedEndTime: '2024-01-12T14:18:50+01:00', + expectedStartTime: '2024-01-12T12:41:00+01:00', + duration: 5870, + distance: 35115.93, + legs: [ + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:41:00+01:00', + aimedEndTime: '2024-01-12T12:45:07+01:00', + expectedEndTime: '2024-01-12T12:45:07+01:00', + expectedStartTime: '2024-01-12T12:41:00+01:00', + realtime: false, + distance: 291.84, + duration: 247, + fromPlace: { + name: 'Origin', + }, + toPlace: { + name: 'Slependen', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'o`nlJaac_AZ|@\\z@On@MAk@~@UZ@J@HEX@RLv@@DJVVd@LRNR\\^p@t@|@fA??', + }, + }, + { + id: 'rO0ABXeRABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAA8AAAAUABBSQjpOU1I6UXVheTo3OTI4ABBSQjpOU1I6UXVheTo3MjY1ADtSQjpSVVQ6RGF0ZWRTZXJ2aWNlSm91cm5leTpiYzAwOGYwN2YxYzRhMDQ1YzE5ZjEwY2Q3MTQyZDliMQ==', + mode: 'bus', + aimedStartTime: '2024-01-12T12:43:00+01:00', + aimedEndTime: '2024-01-12T12:48:00+01:00', + expectedEndTime: '2024-01-12T12:50:07+01:00', + expectedStartTime: '2024-01-12T12:45:07+01:00', + realtime: true, + distance: 3232.21, + duration: 300, + fromPlace: { + name: 'Slependen', + }, + toPlace: { + name: 'Sandvika bussterminal', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Sandvika', + }, + }, + line: { + publicCode: '270', + name: 'Asker - Sandvika (- Fornebu)', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'yzmlJelb_A[a@QUo@y@WYIKIKQUGKCCEIIOQ]GKEKAGCEAEAICQMi@@I@MAOCKGIK_@E[AYCY?[?_@Dc@Di@LaAJs@B_@BYBY@k@AgAAa@Gi@CUEWG_@EOCMe@{ASq@GUGUMk@EUCSKs@G_@Ek@K_BGiAGg@G_@E[IYEWISO_@KQGKIIMQMKQOWSYSe@]WQOQIKQSOSU]Yg@QYOW??S[]m@y@wAq@mAa@s@Ua@Q_@MUQ[Wo@Yo@M[Ug@Q[CGCCCECEOQOSCKYWMIECCAKEMAIAOAS?I?KBM@]LWLCHe@PODMDQDG@G?K@M?I?IAMAMAKEKCICIE[MCKYOIEECCC?IAGAGCECECCA?C?A?EKCICGCICKIWEKCIUa@??aEaI[k@S]EKEKCIAGGMGK?GAOCMGKGEG?GBGHCHAJAJKLML}@jAe@\\EMGGGAMDEJEPAPBV[jAYzA]nB]bBs@lCYv@E@EBEHCJCL?L@F?D@DEVCNEP{@jCm@|A??O\\MZKRIRCDKGMKOQ?A?AAAAC?AAECUCUAM?A??C_@AIASCY]}E?MC]AKEm@AOCa@ASAKAUCUCQCQAMAKIk@_@cCMy@Eg@?C@C?GAEAEAAEOM_AU{ASuAKi@K_@IUUUMOI?{@aBWi@M_@I[GSK]Qw@UcAYuAQy@IYIUKUGq@EY@MLWnA_BNQBBD@D?PX\\l@b@nBRDFDFNd@hB^xABJ', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T12:50:07+01:00', + aimedEndTime: '2024-01-12T12:52:07+01:00', + expectedEndTime: '2024-01-12T12:52:07+01:00', + expectedStartTime: '2024-01-12T12:50:07+01:00', + realtime: false, + distance: 125.59, + duration: 120, + fromPlace: { + name: 'Sandvika bussterminal', + }, + toPlace: { + name: 'Sandvika stasjon', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '}xplJ{pf_A?@@DB?@DH?L?LOVYS_A_AqD??', + }, + }, + { + id: 'rO0ABXeEABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAYAAAARAA9SQjpOU1I6UXVheTo5OTAAD1JCOk5TUjpRdWF5OjYwNAAwUkI6TlNCOkRhdGVkU2VydmljZUpvdXJuZXk6MjEzNF9BU1ItTExTXzI0LTAxLTEy', + mode: 'rail', + aimedStartTime: '2024-01-12T13:02:00+01:00', + aimedEndTime: '2024-01-12T13:37:00+01:00', + expectedEndTime: '2024-01-12T13:37:20+01:00', + expectedStartTime: '2024-01-12T13:02:00+01:00', + realtime: true, + distance: 24463.5, + duration: 2120, + fromPlace: { + name: 'Sandvika stasjon', + }, + toPlace: { + name: 'Grorud stasjon', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Lillestrøm', + }, + }, + line: { + publicCode: 'L1', + name: 'Spikkestad-Oslo S-Lillestrøm', + }, + authority: { + name: 'Vy', + }, + pointsOnLink: { + points: + 'qyplJcyf_AkBeIi@_C]yAYmAc@kBWgAYoAaBkH{@oDmAmFUcAu@_D_@}A??u@gDi@yBEWOq@YkAUaA{@iDc@eBU{@WcAOo@Mm@Mq@Kk@Ig@Ii@Im@Io@I{@I_AEs@Es@Ew@CeACgAAy@?s@@w@@y@@o@By@B}@F}@F}@F{@Hy@J{@Ju@RqAz@iFRkAJm@Js@De@Fc@De@Dc@Dm@Fo@Bo@Ds@@k@Bk@@m@@k@?i@?m@?i@Ak@Au@Cq@Cq@Cu@Es@Gw@AI????Iy@Gi@Gg@Gi@Ig@Ig@Ie@Kg@G]Ka@K]W_AQm@Qi@c@qAQk@M]Ka@K_@Ke@Mg@I_@Ki@Kk@Ik@Im@Gi@Gm@Gm@Ek@Cm@Eo@Cy@Cw@Aq@Am@?_A?q@?{@HeTFyO@i@F}L?_A?o@?o@Ai@Ak@Ck@Ag@Ce@Ck@Cg@Ek@Gi@Ei@Iq@M_AO_AIg@SuAO{@CUw@gFa@mCm@kEMy@mByM????q@mEk@}DQkAQgA]qBUuAWsAUuAIc@g@uCQgAQiAk@aE??a@wC]gCSoASoAMy@Q}@UoAQw@Qy@Sw@U{@W}@Sq@Og@Qk@Oc@Wq@Si@Uk@i@sAUk@Ys@Um@Qe@Oe@Sm@Om@Sq@Oi@Qu@Oo@Ou@Mq@Mo@Kq@Ms@Ks@K{@[{Bo@aFWkBSaBUgBMy@My@Ku@Ku@Mw@O_AO}@Ms@Q}@UkACK????ESOm@Qq@Mi@Og@_@mASs@Uw@a@wAUy@]kAs@cC]kAQs@]oAYeAWiAyA{F}AgGwAuFYmAUy@Sw@a@aB{AcGuAqFyA}F[kAWaAS{@Qq@U{@GYQq@[mAMe@I]Kc@Ka@Ig@Ke@Gc@Ii@Gg@Io@Ee@Gw@Ek@Cm@Ag@Ak@As@As@?s@@s@Bu@@m@Dm@Bq@Fu@Do@Fq@Fo@Fg@Hq@Z{B??JaAFk@Dg@??Jg@DWHc@Jm@??Js@Hq@RsAPsAJu@NiALgAHmAHoADkABeA@iA?E?????u@?aAAs@Cs@Cm@Ce@A_@Ce@Ei@IaAKgAG{@YmDK_AI}@Is@Iu@IcAYcDEo@KiAKcAIs@Kq@MaAQgASoAO{@SeAWkAc@qBm@eC[iAQs@Oo@Om@Mm@Kg@Mo@Ko@Ku@Ks@Iu@I}@I_AGeAEw@GiAEcAIyBEs@Eq@GcAIy@Ek@Iw@Ii@Im@Ig@O{@Km@S_AUaAU}@[aAY{@Ww@u@yBQi@Wo@k@cBe@wAYy@Y{@sAwD{@eCSm@??Sm@I_@Ka@IYMc@Si@??Mi@IYI[EU??Oc@GQMa@i@{AmEoMe@qA[}@Qo@Oc@Oo@Ka@Mk@Kg@Mk@G[E[M_A??Ig@Ic@CO??AOCYC]Kw@OsAE_@Ec@Eo@Ac@Cg@Ao@A}@A_A@cA?}@Bw@@o@??D}@Dy@H_AHy@H{@Hk@Ju@L}@x@cFJq@????BMDQj@eD|@kFX}AZgBXcBf@qCVuAN}@Nu@Nu@R{@XqA`@iBLo@Lm@??VsANu@RgAJm@Jq@NaANmAR_BN_BNeBL_BHqADeAD}@DgABu@B{@@_A@y@@y@@cA?iAA{AAeAA_AAy@C_ACy@C_AMsDKkCGiB??KyCKiDE_BC{AAkA?eAAeA@oA@kA@gABwADoAD_BH{AFaAFiAHgAFaAl@}Jn@}JPoCLuBPeCLuALsALoALkANkATaBn@oE|@_GfAqH@KVcBNaAP}@f@kCTmAVsA??XyAb@aCLo@NcALw@Ho@Hq@Hw@HgAHaADu@Dw@H}Ab@_K????d@gKF_BBs@Dw@DaBBaABs@Bm@Bm@@_@B[B_@Bg@Do@B_@D]Fu@??Fs@Fq@J_AJw@Fk@Hk@Jo@Jq@F_@Lu@Nw@??ZcBPeA\\gBN_ANu@Lu@L{@Jm@Ly@L_ANkAHw@Hs@H_AL}AHqAHkAFsAF{ADoABmAHgDDuABgADcAFy@F_AF}@H_AH{@LqAJ{@??@[B]@]??F[DUFa@Fe@Hs@He@L{@Ny@??RuALw@Jk@Jg@Ji@\\{AR}@Ns@N{@L_AVcB??^gCf@cD????p@qE|@eGh@iD??j@uDb@yCn@aE`@oCNaANgALiAJiADi@Fo@Dw@LwBFiA??Fm@Hu@PcBLsARoB??Z}CH}@`@wDXcDb@}DH_A??Dc@B_@Dq@@]Fk@H}@??Z{C??Ba@D_@@WB]@WDm@??TqBViCTgCL{ALyANiBLaBJqAHuAD_AHkADgADgADeAFqB@[Bu@BoA@y@BcA@mA@uA@}A?aA?_A?{A?}HAsF?mJA_F?qH?qBAsC?aB?oC?{BAoC?eH?mD?sD?gBAoB?kA?qB?qA?}@?k@Ak@?m@Aq@Ai@Ag@As@Cw@Cs@Cs@Ew@Eu@Ci@Gq@Eu@G{@KmAQmBYkDO_BOkBQuBw@aJScCQqBS_CS{BKwAOyAa@eFEe@??C_@C[Cq@AUCY??I_AGu@KmAGq@Gw@KaAIy@Go@Io@Im@ES????G_@Ko@Ke@[sAMg@Mk@Ok@Og@Qi@Sm@Oc@Oc@O]O_@Qa@Sa@Qa@k@kAQ_@u@{A??]o@Uc@S_@]m@Wc@OWEGYe@QW[c@W]QWSUMQSSUYOOo@o@c@a@[W[UWS]U[SUM_@Ue@Wq@][QYQYM_Ag@}BoAsEaCwC}AcAi@s@_@c@Wc@Uk@Yk@[u@a@w@a@cFkCyEgC??gCsA_B{@w@_@e@S]O]OWKWKSGsBs@SGWI[K[I[I_@GUEWE[C[C[C[AU?[@Y?W@a@BWD]DUBwATy@NoB\\a@F[Fa@F_@DO@I@W@[@Y?YAUAYCWE]G_@IYK]Ma@O_@Sa@Si@[MIQKu@c@yD}B????]S}D_Ci@]c@Y_@Wa@[_@Y[[_@[e@g@WYSUSYW]W]U_@Wa@Yc@Yg@Yi@Wi@Wi@Uk@Ug@Qe@Si@Um@Qi@Qk@So@Qo@Mc@Kc@EQKa@Mk@Sy@Qw@ScASaAOu@Qy@QaAO{@O_AOaAMy@MgAM_AKgAMkAIaAI_AIeAIcAImAIwAs@iL_BoXMuBK}AG{@Em@Gs@Gq@I_AIu@E_@Gi@Kw@Iq@Iq@M}@M}@Oy@QgAQcAk@yCWoA]gBI_@??u@}DmDwQcEkTMm@QaA_@iBSaAOw@CI????Kg@]aBQs@Qs@Oo@Oi@Ok@Mi@Sq@Qm@Sw@]iAgBeGe@_Be@aBW{@Qs@Qk@Ok@Mi@Kc@Mk@Qu@Mk@Ow@Mm@Kq@Kg@Mu@Kq@Ik@Ks@Ky@EWGe@YuBOeAKw@UuAEY??I]ESGSK_@EOK]Mc@GWOg@Kc@GQ??So@ESGQGYIUUo@??IQ[q@Q_@Sa@U_@w@oAY_@UYMQ??', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:37:20+01:00', + aimedEndTime: '2024-01-12T13:39:50+01:00', + expectedEndTime: '2024-01-12T13:39:50+01:00', + expectedStartTime: '2024-01-12T13:37:20+01:00', + realtime: false, + distance: 144.57, + duration: 150, + fromPlace: { + name: 'Grorud stasjon', + }, + toPlace: { + name: 'Stjerneblokkveien', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '}|{lJaomaA??c@m@Y[He@ACEEEEACFSHSLUR[V[DGBEBE@G@E@I?I?I?K?C??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAADYAAAA7ABFSQjpOU1I6UXVheToxMDMyNgARUkI6TlNSOlF1YXk6MTA3MjcAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OjZiZjc4NDcxYThmNmMxZTA3YzUyZmM0MmU1NmM5YmI0', + mode: 'bus', + aimedStartTime: '2024-01-12T13:45:00+01:00', + aimedEndTime: '2024-01-12T13:50:00+01:00', + expectedEndTime: '2024-01-12T13:50:00+01:00', + expectedStartTime: '2024-01-12T13:45:00+01:00', + realtime: false, + distance: 2078.2, + duration: 300, + fromPlace: { + name: 'Stjerneblokkveien', + }, + toPlace: { + name: 'Grorud T', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Grorud T', + }, + }, + line: { + publicCode: '79', + name: 'Grorud T - Åsbråten', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'w{{lJ_zmaA?FCd@@N?J@RA?KNKHKJKJQVMTGNGTERERc@dCKXEPGTINCBCDAFMZQZINQZKHMFQHQF??A?QDS?Y@gBFsBH]BO@G?O@K@A?m@B??M?e@BI@G@IDGFGJIPGPETGVEVY~AE\\APCR?N?T@TBJDLDNDJ`@v@NXDLHRJZJ\\d@lBH\\DZB^?V?ZAVEXEPIXGNIPKRKNORONKHGBCBMFSJMDQHIB??GDEBIFMJKJOTGFGLMVK\\CJAFEVEVC\\?JARGAA?E@MBMFLGLCDAH@?`@?v@E^CRADCHCFCDCBEDEBGFG?GCKGMIKKIKIKKSIQGQGWEOAGEWAUE]IsAG_AAUCYCUCOCKEKGGGGGGKEMAcACM?IAGCCAGEIGGKGMEOEQEUC[MaCC[CYEWESIQGMIIIEKCK?M@w@JOBI@G@o@FUB????C?WBi@BS?SGGAIAGAA?C?_@D[BS@S@W?S@MAG@I@I@mA?U??]Ag@?kA?a@M@QBK@I@BrB?V@R', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T13:50:00+01:00', + aimedEndTime: '2024-01-12T13:50:20+01:00', + expectedEndTime: '2024-01-12T13:50:20+01:00', + expectedStartTime: '2024-01-12T13:50:00+01:00', + realtime: false, + distance: 12.76, + duration: 20, + fromPlace: { + name: 'Grorud T', + }, + toPlace: { + name: 'Grorud T', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: '}a~lJ_qlaA??CDC?A?C@A?C??E??', + }, + }, + { + id: 'rO0ABXeTABhTQ0hFRFVMRURfVFJBTlNJVF9MRUdfVjMAAAAKMjAyNC0wMS0xMgAAAAAAAAAIABFSQjpOU1I6UXVheToxMDcyNAARUkI6TlNSOlF1YXk6MTAyNTkAO1JCOlJVVDpEYXRlZFNlcnZpY2VKb3VybmV5OmVhYzk2YWEyZjg0ZmY1ZTdmNDEzYTk5YjRmY2RlMzBk', + mode: 'bus', + aimedStartTime: '2024-01-12T14:07:00+01:00', + aimedEndTime: '2024-01-12T14:14:00+01:00', + expectedEndTime: '2024-01-12T14:14:00+01:00', + expectedStartTime: '2024-01-12T14:07:00+01:00', + realtime: false, + distance: 4457.24, + duration: 420, + fromPlace: { + name: 'Grorud T', + }, + toPlace: { + name: 'Postnord', + }, + toEstimatedCall: { + destinationDisplay: { + frontText: 'Helsfyr', + }, + }, + line: { + publicCode: '68', + name: 'Helsfyr T - Grorud T via Alfaset', + }, + authority: { + name: 'Ruter', + }, + pointsOnLink: { + points: + 'mb~lJcplaA???TH?H?F?DAH?JHL@?W?]Ag@?kA?a@?_C?OAS?O?}@?O@K@IBEBG@IHEFALENCHAFAH?F?HBDDDFDFBHFZBJBTBb@NrHHlDF|BBx@D|@Dp@D~@HvAJzAFt@Fz@LrALpAPxARdBRxAVzAPbAN~@XtAR~@Pv@Pt@Nl@ZjATx@Ph@FPPjALp@BJ??Jd@HNFNd@nAJVNTRTRRb@\\b@t@^n@x@tAr@dApAnBhA`BT\\PVRXRZ^b@NN??XZb@\\`@ZVLX`@\\XTNd@Vt@\\\\L\\NRJPFVFR@R@TAZCTCH?HB@BBD@BDBD@DADCDG@E@E?E@EFCDC@?D?PBF@HCFAd@LRD??@?HBPNHBHBDBFBJBDBFBXDHFf@b@JLHHNPTXRZXd@`@r@^l@`@r@T`@PXPVTXNRVTZTVPTLZLXJVFVDVDz@JNBx@H^DRHH@l@B??J@X@RBH?LBHBT@`@TVN\\VVRXVTTLNNPX`@\\f@T`@Zn@Rd@lCnGR`@P^PZR\\PVJLNPNN??B@LLFDNF\\JXRFBFBFDDHDFLR?FBD@DBDD@DABC@C`@[TIH@ZErAL|@Jp@FlAHh@BH@RJHFHHJLDJBFFFD@FADCDEDKBKHIHGHCNMF?PARANANAPCd@Ib@Gh@K^Il@@PCjA[TG??`A[JALCH?RBBDBBBVBT@HBPDb@?TBbABlBFvBBf@Fr@Dh@Ht@Jr@Np@Lj@Nd@N`@Rb@Td@PZh@x@NP~@nAzAjBHLVZRVNVI\\Sd@Q^GN??KTcApBmA`CIPKREREX@XBXDPdAxCJ\\l@bB', + }, + }, + { + id: null, + mode: 'foot', + aimedStartTime: '2024-01-12T14:14:00+01:00', + aimedEndTime: '2024-01-12T14:18:50+01:00', + expectedEndTime: '2024-01-12T14:18:50+01:00', + expectedStartTime: '2024-01-12T14:14:00+01:00', + realtime: false, + distance: 310.02, + duration: 290, + fromPlace: { + name: 'Postnord', + }, + toPlace: { + name: 'Destination', + }, + toEstimatedCall: null, + line: null, + authority: null, + pointsOnLink: { + points: 'q|xlJmweaACFA?m@aBBEDKK]eAyCEQSm@}@iCaAmCgAaE', + }, + }, + ], + systemNotices: [], + }, + ], + }, +}; + +it('renders without crashing', () => { + render( + {}} + pageResults={() => {}} + loading={false} + />, + ); +}); diff --git a/client-next/src/components/SearchBar/SearchBar.test.tsx b/client-next/src/components/SearchBar/SearchBar.test.tsx new file mode 100644 index 00000000000..88932190288 --- /dev/null +++ b/client-next/src/components/SearchBar/SearchBar.test.tsx @@ -0,0 +1,14 @@ +import { it } from 'vitest'; +import { render } from '@testing-library/react'; +import { SearchBar } from './SearchBar.tsx'; +import { TripQueryVariables } from '../../gql/graphql.ts'; + +const variables: TripQueryVariables = { + from: { coordinates: { longitude: 9.795206, latitude: 60.13776 } }, + to: { coordinates: { longitude: 11.50907, latitude: 59.85208 } }, + dateTime: new Date().toISOString(), +}; + +it('renders without crashing', () => { + render( {}} setTripQueryVariables={() => {}} tripQueryVariables={variables} />); +}); diff --git a/client-next/vite.config.ts b/client-next/vite.config.ts index 8d3ba8000c7..69bfec7f396 100644 --- a/client-next/vite.config.ts +++ b/client-next/vite.config.ts @@ -9,4 +9,8 @@ export default defineConfig({ outDir: 'output', emptyOutDir: true, }, + // @ts-ignore + test: { + environment: 'jsdom', + }, }); From 840ab9ce823acfda7529f3ec1f2898b48560bc74 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 14 Feb 2024 10:10:03 +0100 Subject: [PATCH 0568/1688] Account for a comma-separated list of X-Forwarded-Host --- .../framework/io/HttpUtils.java | 11 +++++- .../framework/io/HttpUtilsTest.java | 38 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java diff --git a/src/main/java/org/opentripplanner/framework/io/HttpUtils.java b/src/main/java/org/opentripplanner/framework/io/HttpUtils.java index 4981a8ab91b..d8b3dc542a6 100644 --- a/src/main/java/org/opentripplanner/framework/io/HttpUtils.java +++ b/src/main/java/org/opentripplanner/framework/io/HttpUtils.java @@ -3,6 +3,7 @@ import jakarta.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.UriInfo; import java.nio.charset.StandardCharsets; +import java.util.Arrays; import org.apache.hc.core5.http.ContentType; public final class HttpUtils { @@ -31,7 +32,7 @@ public static String getBaseAddress(UriInfo uri, HttpHeaders headers) { String host; if (headers.getRequestHeader(HEADER_X_FORWARDED_HOST) != null) { - host = headers.getRequestHeader(HEADER_X_FORWARDED_HOST).getFirst(); + host = extractHost(headers.getRequestHeader(HEADER_X_FORWARDED_HOST).getFirst()); } else if (headers.getRequestHeader(HEADER_HOST) != null) { host = headers.getRequestHeader(HEADER_HOST).getFirst(); } else { @@ -40,4 +41,12 @@ public static String getBaseAddress(UriInfo uri, HttpHeaders headers) { return protocol + "://" + host; } + + /** + * The X-Forwarded-Host header can contain a comma-separated list so we account for that. + * https://stackoverflow.com/questions/66042952/http-proxy-behavior-for-x-forwarded-host-header + */ + private static String extractHost(String xForwardedFor) { + return Arrays.stream(xForwardedFor.split(",")).map(String::strip).toList().getFirst(); + } } diff --git a/src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java b/src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java new file mode 100644 index 00000000000..ac8ae52848c --- /dev/null +++ b/src/test/java/org/opentripplanner/framework/io/HttpUtilsTest.java @@ -0,0 +1,38 @@ +package org.opentripplanner.framework.io; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; +import java.util.Map; +import org.glassfish.jersey.server.internal.routing.UriRoutingContext; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.test.support.HttpForTest; + +class HttpUtilsTest { + + private static final String HOSTNAME = "example.com"; + + static List testCases() { + return List.of( + HOSTNAME, + "example.com,", + " example.com ,", + "example.com,example.com", + "example.com, example.com", + "example.com, example.net", + "example.com, example.net, example.com", + " example.com, example.net, example.com" + ); + } + + @ParameterizedTest + @MethodSource("testCases") + void extractHost(String headerValue) { + var req = HttpForTest.containerRequest(); + req.headers(Map.of("X-Forwarded-Host", List.of(headerValue))); + var uriInfo = new UriRoutingContext(req); + var baseAddress = HttpUtils.getBaseAddress(uriInfo, req); + assertEquals("https://" + HOSTNAME, baseAddress); + } +} From da66cb11497395a5c99c13b3f3b33e16a8a6abf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Wed, 14 Feb 2024 10:21:39 +0100 Subject: [PATCH 0569/1688] Fix package-lock --- client-next/package-lock.json | 5386 +++++++++++++++++++++++---------- 1 file changed, 3851 insertions(+), 1535 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index b1dcfecb817..a6c92c55374 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -46,16 +46,18 @@ }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", + "integrity": "sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@jridgewell/gen-mapping": "^0.3.0", "@jridgewell/trace-mapping": "^0.3.9" @@ -66,8 +68,9 @@ }, "node_modules/@ardatan/relay-compiler": { "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz", + "integrity": "sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.14.0", "@babel/generator": "^7.14.0", @@ -96,8 +99,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/cliui": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -106,8 +110,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/find-up": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -118,8 +123,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/locate-path": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -129,8 +135,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/p-limit": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, - "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -143,8 +150,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/p-locate": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -154,13 +162,15 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/y18n": { "version": "4.0.3", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true }, "node_modules/@ardatan/relay-compiler/node_modules/yargs": { "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, - "license": "MIT", "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", @@ -180,8 +190,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/yargs-parser": { "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, - "license": "ISC", "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -192,8 +203,9 @@ }, "node_modules/@ardatan/sync-fetch": { "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz", + "integrity": "sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA==", "dev": true, - "license": "MIT", "dependencies": { "node-fetch": "^2.6.1" }, @@ -203,8 +215,9 @@ }, "node_modules/@asamuzakjp/dom-selector": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-2.0.2.tgz", + "integrity": "sha512-x1KXOatwofR6ZAYzXRBL5wrdV0vwNxlTCK9NCuLqAzQYARqGcvFwiJA6A1ERuh+dgeA4Dxm3JBYictIes+SqUQ==", "dev": true, - "license": "MIT", "dependencies": { "bidi-js": "^1.0.3", "css-tree": "^2.3.1", @@ -213,8 +226,9 @@ }, "node_modules/@babel/code-frame": { "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", + "integrity": "sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/highlight": "^7.23.4", "chalk": "^2.4.2" @@ -225,8 +239,9 @@ }, "node_modules/@babel/code-frame/node_modules/ansi-styles": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -236,8 +251,9 @@ }, "node_modules/@babel/code-frame/node_modules/chalk": { "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -249,37 +265,42 @@ }, "node_modules/@babel/code-frame/node_modules/color-convert": { "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "node_modules/@babel/code-frame/node_modules/color-name": { "version": "1.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true }, "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/@babel/code-frame/node_modules/has-flag": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/@babel/code-frame/node_modules/supports-color": { "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -289,27 +310,29 @@ }, "node_modules/@babel/compat-data": { "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.23.5.tgz", + "integrity": "sha512-uU27kfDRlhfKl+w1U6vp16IuvSLtjAxdArVXPa9BvLkrr7CYIsxH5adpHObeAGY/41+syctUWOZ140a2Rvkgjw==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.7", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.23.9.tgz", + "integrity": "sha512-5q0175NOjddqpvvzU+kDiSOAk4PfdO6FvwCWoQ6RO7rTzEe8vlo+4HVfcnAREhD4npMs0e9uZypjTwzZPCf/cw==", "dev": true, - "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.7", - "@babel/parser": "^7.23.6", - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.7", - "@babel/types": "^7.23.6", + "@babel/helpers": "^7.23.9", + "@babel/parser": "^7.23.9", + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -326,8 +349,9 @@ }, "node_modules/@babel/generator": { "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.23.6.tgz", + "integrity": "sha512-qrSfCYxYQB5owCmGLbl8XRpX1ytXlpueOb0N0UmQwA073KZxejgQTzAmJezxvpwQD9uGtK2shHdi55QT+MbjIw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.23.6", "@jridgewell/gen-mapping": "^0.3.2", @@ -340,8 +364,9 @@ }, "node_modules/@babel/helper-annotate-as-pure": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -351,8 +376,9 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-validator-option": "^7.23.5", @@ -365,9 +391,10 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.23.7", + "version": "7.23.10", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz", + "integrity": "sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-environment-visitor": "^7.22.20", @@ -388,16 +415,18 @@ }, "node_modules/@babel/helper-environment-visitor": { "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/template": "^7.22.15", "@babel/types": "^7.23.0" @@ -408,8 +437,9 @@ }, "node_modules/@babel/helper-hoist-variables": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -419,8 +449,9 @@ }, "node_modules/@babel/helper-member-expression-to-functions": { "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.23.0" }, @@ -430,8 +461,9 @@ }, "node_modules/@babel/helper-module-imports": { "version": "7.22.15", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.22.15.tgz", + "integrity": "sha512-0pYVBnDKZO2fnSPCrgM/6WMc7eS20Fbok+0r88fp+YtWVLZrp4CkafFGIp+W0VKw4a22sgebPT99y+FDNMdP4w==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.15" }, @@ -441,8 +473,9 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -459,8 +492,9 @@ }, "node_modules/@babel/helper-optimise-call-expression": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", + "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -470,16 +504,18 @@ }, "node_modules/@babel/helper-plugin-utils": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.22.5.tgz", + "integrity": "sha512-uLls06UVKgFG9QD4OeFYLEGteMIAa5kpTPcFL28yuCIIzsf6ZyKZMllKVOCZFhiZ5ptnwX4mtKdWCBE/uT4amg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-replace-supers": { "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.22.20.tgz", + "integrity": "sha512-qsW0In3dbwQUbK8kejJ4R7IHVGwHJlV6lpG6UA7a9hSa2YEiAib+N1T2kr6PEeUT+Fl7najmSOS6SmAwCHK6Tw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-member-expression-to-functions": "^7.22.15", @@ -494,8 +530,9 @@ }, "node_modules/@babel/helper-simple-access": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -505,8 +542,9 @@ }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", + "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -516,8 +554,9 @@ }, "node_modules/@babel/helper-split-export-declaration": { "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -527,36 +566,40 @@ }, "node_modules/@babel/helper-string-parser": { "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.23.4.tgz", + "integrity": "sha512-803gmbQdqwdf4olxrX4AJyFBV/RTr3rSmOj0rKwesmzlfhYNDEs+/iOcznzpNWlJlIlTJC2QfPFcHB6DlzdVLQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.23.8", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.23.9.tgz", + "integrity": "sha512-87ICKgU5t5SzOT7sBMfCOZQ2rHjRU+Pcb9BoILMYz600W6DkVRLFBPwQ18gwUVvggqXivaUakpnxWQGbpywbBQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/template": "^7.22.15", - "@babel/traverse": "^7.23.7", - "@babel/types": "^7.23.6" + "@babel/template": "^7.23.9", + "@babel/traverse": "^7.23.9", + "@babel/types": "^7.23.9" }, "engines": { "node": ">=6.9.0" @@ -564,8 +607,9 @@ }, "node_modules/@babel/highlight": { "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.23.4.tgz", + "integrity": "sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", @@ -577,8 +621,9 @@ }, "node_modules/@babel/highlight/node_modules/ansi-styles": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -588,8 +633,9 @@ }, "node_modules/@babel/highlight/node_modules/chalk": { "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -601,37 +647,42 @@ }, "node_modules/@babel/highlight/node_modules/color-convert": { "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "node_modules/@babel/highlight/node_modules/color-name": { "version": "1.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true }, "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/@babel/highlight/node_modules/has-flag": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/@babel/highlight/node_modules/supports-color": { "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -640,9 +691,10 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.6", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.23.9.tgz", + "integrity": "sha512-9tcKgqKbs3xGJ+NtKF2ndOBBLVwPjl1SHxPQkd36r3Dlirw3xWUeGaTbqr7uGZcTaxkVNwc+03SVP7aCdWrTlA==", "dev": true, - "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -652,8 +704,10 @@ }, "node_modules/@babel/plugin-proposal-class-properties": { "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", + "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.18.6", "@babel/helper-plugin-utils": "^7.18.6" @@ -667,8 +721,10 @@ }, "node_modules/@babel/plugin-proposal-object-rest-spread": { "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", + "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.", "dev": true, - "license": "MIT", "dependencies": { "@babel/compat-data": "^7.20.5", "@babel/helper-compilation-targets": "^7.20.7", @@ -685,8 +741,9 @@ }, "node_modules/@babel/plugin-syntax-class-properties": { "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -696,8 +753,9 @@ }, "node_modules/@babel/plugin-syntax-flow": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.23.3.tgz", + "integrity": "sha512-YZiAIpkJAwQXBJLIQbRFayR5c+gJ35Vcz3bg954k7cd73zqjvhacJuL9RbrzPz8qPmZdgqP6EUKwy0PCNhaaPA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -710,8 +768,9 @@ }, "node_modules/@babel/plugin-syntax-import-assertions": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.23.3.tgz", + "integrity": "sha512-lPgDSU+SJLK3xmFDTV2ZRQAiM7UuUjGidwBywFavObCiZc1BeAAcMtHJKUya92hPHO+at63JJPLygilZard8jw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -724,8 +783,9 @@ }, "node_modules/@babel/plugin-syntax-jsx": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.23.3.tgz", + "integrity": "sha512-EB2MELswq55OHUoRZLGg/zC7QWUKfNLpE57m/S2yr1uEneIgsTgrSzXP3NXEsMkVn76OlaVVnzN+ugObuYGwhg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -738,8 +798,9 @@ }, "node_modules/@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -749,8 +810,9 @@ }, "node_modules/@babel/plugin-transform-arrow-functions": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.23.3.tgz", + "integrity": "sha512-NzQcQrzaQPkaEwoTm4Mhyl8jI1huEL/WWIEvudjTCMJ9aBZNpsJbMASx7EQECtQQPS/DcnFpo0FIh3LvEO9cxQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -763,8 +825,9 @@ }, "node_modules/@babel/plugin-transform-block-scoped-functions": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.23.3.tgz", + "integrity": "sha512-vI+0sIaPIO6CNuM9Kk5VmXcMVRiOpDh7w2zZt9GXzmE/9KD70CUEVhvPR/etAeNK/FAEkhxQtXOzVF3EuRL41A==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -777,8 +840,9 @@ }, "node_modules/@babel/plugin-transform-block-scoping": { "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.23.4.tgz", + "integrity": "sha512-0QqbP6B6HOh7/8iNR4CQU2Th/bbRtBp4KS9vcaZd1fZ0wSh5Fyssg0UCIHwxh+ka+pNDREbVLQnHCMHKZfPwfw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -791,8 +855,9 @@ }, "node_modules/@babel/plugin-transform-classes": { "version": "7.23.8", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.23.8.tgz", + "integrity": "sha512-yAYslGsY1bX6Knmg46RjiCiNSwJKv2IUC8qOdYKqMMr0491SXFhcHqOdRDeCRohOOIzwN/90C6mQ9qAKgrP7dg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-compilation-targets": "^7.23.6", @@ -812,8 +877,9 @@ }, "node_modules/@babel/plugin-transform-computed-properties": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.23.3.tgz", + "integrity": "sha512-dTj83UVTLw/+nbiHqQSFdwO9CbTtwq1DsDqm3CUEtDrZNET5rT5E6bIdTlOftDTDLMYxvxHNEYO4B9SLl8SLZw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/template": "^7.22.15" @@ -827,8 +893,9 @@ }, "node_modules/@babel/plugin-transform-destructuring": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.23.3.tgz", + "integrity": "sha512-n225npDqjDIr967cMScVKHXJs7rout1q+tt50inyBCPkyZ8KxeI6d+GIbSBTT/w/9WdlWDOej3V9HE5Lgk57gw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -841,8 +908,9 @@ }, "node_modules/@babel/plugin-transform-flow-strip-types": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.23.3.tgz", + "integrity": "sha512-26/pQTf9nQSNVJCrLB1IkHUKyPxR+lMrH2QDPG89+Znu9rAMbtrybdbWeE9bb7gzjmE5iXHEY+e0HUwM6Co93Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/plugin-syntax-flow": "^7.23.3" @@ -856,8 +924,9 @@ }, "node_modules/@babel/plugin-transform-for-of": { "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.23.6.tgz", + "integrity": "sha512-aYH4ytZ0qSuBbpfhuofbg/e96oQ7U2w1Aw/UQmKT+1l39uEhUPoFS3fHevDc1G0OvewyDudfMKY1OulczHzWIw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" @@ -871,8 +940,9 @@ }, "node_modules/@babel/plugin-transform-function-name": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.23.3.tgz", + "integrity": "sha512-I1QXp1LxIvt8yLaib49dRW5Okt7Q4oaxao6tFVKS/anCdEOMtYwWVKoiOA1p34GOWIZjUK0E+zCp7+l1pfQyiw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-compilation-targets": "^7.22.15", "@babel/helper-function-name": "^7.23.0", @@ -887,8 +957,9 @@ }, "node_modules/@babel/plugin-transform-literals": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.23.3.tgz", + "integrity": "sha512-wZ0PIXRxnwZvl9AYpqNUxpZ5BiTGrYt7kueGQ+N5FiQ7RCOD4cm8iShd6S6ggfVIWaJf2EMk8eRzAh52RfP4rQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -901,8 +972,9 @@ }, "node_modules/@babel/plugin-transform-member-expression-literals": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.23.3.tgz", + "integrity": "sha512-sC3LdDBDi5x96LA+Ytekz2ZPk8i/Ck+DEuDbRAll5rknJ5XRTSaPKEYwomLcs1AA8wg9b3KjIQRsnApj+q51Ag==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -915,8 +987,9 @@ }, "node_modules/@babel/plugin-transform-modules-commonjs": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.23.3.tgz", + "integrity": "sha512-aVS0F65LKsdNOtcz6FRCpE4OgsP2OFnW46qNxNIX9h3wuzaNcSQsJysuMwqSibC98HPrf2vCgtxKNwS0DAlgcA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.23.3", "@babel/helper-plugin-utils": "^7.22.5", @@ -931,8 +1004,9 @@ }, "node_modules/@babel/plugin-transform-object-super": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.23.3.tgz", + "integrity": "sha512-BwQ8q0x2JG+3lxCVFohg+KbQM7plfpBwThdW9A6TMtWwLsbDA01Ek2Zb/AgDN39BiZsExm4qrXxjk+P1/fzGrA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-replace-supers": "^7.22.20" @@ -946,8 +1020,9 @@ }, "node_modules/@babel/plugin-transform-parameters": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.23.3.tgz", + "integrity": "sha512-09lMt6UsUb3/34BbECKVbVwrT9bO6lILWln237z7sLaWnMsTi7Yc9fhX5DLpkJzAGfaReXI22wP41SZmnAA3Vw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -960,8 +1035,9 @@ }, "node_modules/@babel/plugin-transform-property-literals": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.23.3.tgz", + "integrity": "sha512-jR3Jn3y7cZp4oEWPFAlRsSWjxKe4PZILGBSd4nis1TsC5qeSpb+nrtihJuDhNI7QHiVbUaiXa0X2RZY3/TI6Nw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -974,8 +1050,9 @@ }, "node_modules/@babel/plugin-transform-react-display-name": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.23.3.tgz", + "integrity": "sha512-GnvhtVfA2OAtzdX58FJxU19rhoGeQzyVndw3GgtdECQvQFXPEZIOVULHVZGAYmOgmqjXpVpfocAbSjh99V/Fqw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -988,8 +1065,9 @@ }, "node_modules/@babel/plugin-transform-react-jsx": { "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz", + "integrity": "sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-module-imports": "^7.22.15", @@ -1006,8 +1084,9 @@ }, "node_modules/@babel/plugin-transform-react-jsx-self": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.23.3.tgz", + "integrity": "sha512-qXRvbeKDSfwnlJnanVRp0SfuWE5DQhwQr5xtLBzp56Wabyo+4CMosF6Kfp+eOD/4FYpql64XVJ2W0pVLlJZxOQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1020,8 +1099,9 @@ }, "node_modules/@babel/plugin-transform-react-jsx-source": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.23.3.tgz", + "integrity": "sha512-91RS0MDnAWDNvGC6Wio5XYkyWI39FMFO+JK9+4AlgaTH+yWwVTsw7/sn6LK0lH7c5F+TFkpv/3LfCJ1Ydwof/g==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1034,8 +1114,9 @@ }, "node_modules/@babel/plugin-transform-shorthand-properties": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.23.3.tgz", + "integrity": "sha512-ED2fgqZLmexWiN+YNFX26fx4gh5qHDhn1O2gvEhreLW2iI63Sqm4llRLCXALKrCnbN4Jy0VcMQZl/SAzqug/jg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1048,8 +1129,9 @@ }, "node_modules/@babel/plugin-transform-spread": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.23.3.tgz", + "integrity": "sha512-VvfVYlrlBVu+77xVTOAoxQ6mZbnIq5FM0aGBSFEcIh03qHf+zNqA4DC/3XMUozTg7bZV3e3mZQ0i13VB6v5yUg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" @@ -1063,8 +1145,9 @@ }, "node_modules/@babel/plugin-transform-template-literals": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.23.3.tgz", + "integrity": "sha512-Flok06AYNp7GV2oJPZZcP9vZdszev6vPBkHLwxwSpaIqx75wn6mUd3UFWsSsA0l8nXAKkyCmL/sR02m8RYGeHg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.22.5" }, @@ -1076,8 +1159,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.23.8", - "license": "MIT", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.23.9.tgz", + "integrity": "sha512-0CX6F+BI2s9dkUqr08KFrAIZgNFj75rdBU/DjCyYLIaV/quFjkk6T+EJ2LkZHyZTbEV4L5p97mNkUsHl2wLFAw==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -1086,22 +1170,24 @@ } }, "node_modules/@babel/template": { - "version": "7.22.15", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.23.9.tgz", + "integrity": "sha512-+xrD2BWLpvHKNmX2QbpdpsBaWnRxahMwJjO+KZk2JOElj5nSmKezyS1B4u+QbHMTX69t4ukm6hh9lsYQ7GHCKA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.22.13", - "@babel/parser": "^7.22.15", - "@babel/types": "^7.22.15" + "@babel/code-frame": "^7.23.5", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.7", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.23.9.tgz", + "integrity": "sha512-I/4UJ9vs90OkBtY6iiiTORVMyIhJ4kAVmsKo9KFc8UOxMeUfi2hvtIBsET5u9GizXE6/GFSuKCTNfgCswuEjRg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.23.5", "@babel/generator": "^7.23.6", @@ -1109,8 +1195,8 @@ "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.6", - "@babel/types": "^7.23.6", + "@babel/parser": "^7.23.9", + "@babel/types": "^7.23.9", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1119,9 +1205,10 @@ } }, "node_modules/@babel/types": { - "version": "7.23.6", + "version": "7.23.9", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.23.9.tgz", + "integrity": "sha512-dQjSq/7HaSjRM43FFGnv5keM2HsxpmyV1PfaSVm0nzzjwwTmjOe6J4bC8e3+pTEIgHaHj+1ZlLThRJ2auc/w1Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", @@ -1133,229 +1220,586 @@ }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", + "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", + "cpu": [ + "ppc64" + ], "dev": true, - "license": "MIT" + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } }, - "node_modules/@esbuild/darwin-x64": { + "node_modules/@esbuild/android-arm": { "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", + "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", "cpu": [ - "x64" + "arm" ], "dev": true, - "license": "MIT", "optional": true, "os": [ - "darwin" + "android" ], "engines": { "node": ">=12" } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", + "node_modules/@esbuild/android-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", + "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, + "optional": true, + "os": [ + "android" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + "node": ">=12" } }, - "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", + "node_modules/@esbuild/android-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", + "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=12" } }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", + "node_modules/@esbuild/darwin-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", + "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=12" } }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.24.0", + "node_modules/@esbuild/darwin-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", + "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { - "version": "0.20.2", + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", + "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "(MIT OR CC0-1.0)", + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/@eslint/js": { - "version": "8.48.0", + "node_modules/@esbuild/freebsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", + "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=12" } }, - "node_modules/@googlemaps/polyline-codec": { - "version": "1.0.28", - "license": "Apache-2.0" - }, - "node_modules/@graphql-codegen/add": { - "version": "5.0.0", + "node_modules/@esbuild/linux-arm": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", + "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "cpu": [ + "arm" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "tslib": "~2.5.0" - }, - "peerDependencies": { - "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" } }, - "node_modules/@graphql-codegen/add/node_modules/tslib": { - "version": "2.5.3", + "node_modules/@esbuild/linux-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", + "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "0BSD" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } }, - "node_modules/@graphql-codegen/cli": { - "version": "5.0.0", + "node_modules/@esbuild/linux-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", + "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@babel/generator": "^7.18.13", - "@babel/template": "^7.18.10", - "@babel/types": "^7.18.13", - "@graphql-codegen/core": "^4.0.0", - "@graphql-codegen/plugin-helpers": "^5.0.1", - "@graphql-tools/apollo-engine-loader": "^8.0.0", - "@graphql-tools/code-file-loader": "^8.0.0", - "@graphql-tools/git-loader": "^8.0.0", - "@graphql-tools/github-loader": "^8.0.0", - "@graphql-tools/graphql-file-loader": "^8.0.0", - "@graphql-tools/json-file-loader": "^8.0.0", - "@graphql-tools/load": "^8.0.0", - "@graphql-tools/prisma-loader": "^8.0.0", - "@graphql-tools/url-loader": "^8.0.0", - "@graphql-tools/utils": "^10.0.0", - "@whatwg-node/fetch": "^0.8.0", - "chalk": "^4.1.0", - "cosmiconfig": "^8.1.3", - "debounce": "^1.2.0", - "detect-indent": "^6.0.0", - "graphql-config": "^5.0.2", - "inquirer": "^8.0.0", - "is-glob": "^4.0.1", - "jiti": "^1.17.1", - "json-to-pretty-yaml": "^1.2.2", - "listr2": "^4.0.5", - "log-symbols": "^4.0.0", - "micromatch": "^4.0.5", - "shell-quote": "^1.7.3", - "string-env-interpolation": "^1.0.1", - "ts-log": "^2.2.3", - "tslib": "^2.4.0", - "yaml": "^2.3.1", - "yargs": "^17.0.0" - }, - "bin": { - "gql-gen": "cjs/bin.js", - "graphql-code-generator": "cjs/bin.js", - "graphql-codegen": "cjs/bin.js", - "graphql-codegen-esm": "esm/bin.js" - }, - "peerDependencies": { - "@parcel/watcher": "^2.1.0", - "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" - }, - "peerDependenciesMeta": { - "@parcel/watcher": { - "optional": true - } + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" } }, - "node_modules/@graphql-codegen/client-preset": { - "version": "4.1.0", + "node_modules/@esbuild/linux-loong64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", + "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "cpu": [ + "loong64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.20.2", - "@babel/template": "^7.20.7", - "@graphql-codegen/add": "^5.0.0", - "@graphql-codegen/gql-tag-operations": "4.0.1", - "@graphql-codegen/plugin-helpers": "^5.0.1", - "@graphql-codegen/typed-document-node": "^5.0.1", - "@graphql-codegen/typescript": "^4.0.1", - "@graphql-codegen/typescript-operations": "^4.0.1", - "@graphql-codegen/visitor-plugin-common": "^4.0.1", - "@graphql-tools/documents": "^1.0.0", - "@graphql-tools/utils": "^10.0.0", - "@graphql-typed-document-node/core": "3.2.0", - "tslib": "~2.5.0" - }, - "peerDependencies": { - "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" } }, - "node_modules/@graphql-codegen/client-preset/node_modules/tslib": { - "version": "2.5.3", + "node_modules/@esbuild/linux-mips64el": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", + "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "cpu": [ + "mips64el" + ], "dev": true, - "license": "0BSD" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } }, - "node_modules/@graphql-codegen/core": { - "version": "4.0.0", + "node_modules/@esbuild/linux-ppc64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", + "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "cpu": [ + "ppc64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", + "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", + "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", + "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", + "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", + "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", + "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", + "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", + "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.18.20", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", + "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "8.48.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz", + "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@googlemaps/polyline-codec": { + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/@googlemaps/polyline-codec/-/polyline-codec-1.0.28.tgz", + "integrity": "sha512-m7rh8sbxlrHvebXEweBHX8r1uPtToPRYxWDD6p6k2YG8hyhBe0Wi6xRUVFpxpEseMNgF+OBotFQC5senj8K7TQ==" + }, + "node_modules/@graphql-codegen/add": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/add/-/add-5.0.2.tgz", + "integrity": "sha512-ouBkSvMFUhda5VoKumo/ZvsZM9P5ZTyDsI8LW18VxSNWOjrTeLXBWHG8Gfaai0HwhflPtCYVABbriEcOmrRShQ==", + "dev": true, + "dependencies": { + "@graphql-codegen/plugin-helpers": "^5.0.3", + "tslib": "~2.6.0" + }, + "peerDependencies": { + "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + } + }, + "node_modules/@graphql-codegen/cli": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-5.0.0.tgz", + "integrity": "sha512-A7J7+be/a6e+/ul2KI5sfJlpoqeqwX8EzktaKCeduyVKgOLA6W5t+NUGf6QumBDXU8PEOqXk3o3F+RAwCWOiqA==", + "dev": true, + "dependencies": { + "@babel/generator": "^7.18.13", + "@babel/template": "^7.18.10", + "@babel/types": "^7.18.13", + "@graphql-codegen/core": "^4.0.0", + "@graphql-codegen/plugin-helpers": "^5.0.1", + "@graphql-tools/apollo-engine-loader": "^8.0.0", + "@graphql-tools/code-file-loader": "^8.0.0", + "@graphql-tools/git-loader": "^8.0.0", + "@graphql-tools/github-loader": "^8.0.0", + "@graphql-tools/graphql-file-loader": "^8.0.0", + "@graphql-tools/json-file-loader": "^8.0.0", + "@graphql-tools/load": "^8.0.0", + "@graphql-tools/prisma-loader": "^8.0.0", + "@graphql-tools/url-loader": "^8.0.0", + "@graphql-tools/utils": "^10.0.0", + "@whatwg-node/fetch": "^0.8.0", + "chalk": "^4.1.0", + "cosmiconfig": "^8.1.3", + "debounce": "^1.2.0", + "detect-indent": "^6.0.0", + "graphql-config": "^5.0.2", + "inquirer": "^8.0.0", + "is-glob": "^4.0.1", + "jiti": "^1.17.1", + "json-to-pretty-yaml": "^1.2.2", + "listr2": "^4.0.5", + "log-symbols": "^4.0.0", + "micromatch": "^4.0.5", + "shell-quote": "^1.7.3", + "string-env-interpolation": "^1.0.1", + "ts-log": "^2.2.3", + "tslib": "^2.4.0", + "yaml": "^2.3.1", + "yargs": "^17.0.0" + }, + "bin": { + "gql-gen": "cjs/bin.js", + "graphql-code-generator": "cjs/bin.js", + "graphql-codegen": "cjs/bin.js", + "graphql-codegen-esm": "esm/bin.js" + }, + "peerDependencies": { + "@parcel/watcher": "^2.1.0", + "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + }, + "peerDependenciesMeta": { + "@parcel/watcher": { + "optional": true + } + } + }, + "node_modules/@graphql-codegen/client-preset": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.1.0.tgz", + "integrity": "sha512-/3Ymb/fjxIF1+HGmaI1YwSZbWsrZAWMSQjh3dU425eBjctjsVQ6gzGRr+l/gE5F1mtmCf+vlbTAT03heAc/QIw==", + "dev": true, + "dependencies": { + "@babel/helper-plugin-utils": "^7.20.2", + "@babel/template": "^7.20.7", + "@graphql-codegen/add": "^5.0.0", + "@graphql-codegen/gql-tag-operations": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.1", + "@graphql-codegen/typed-document-node": "^5.0.1", + "@graphql-codegen/typescript": "^4.0.1", + "@graphql-codegen/typescript-operations": "^4.0.1", + "@graphql-codegen/visitor-plugin-common": "^4.0.1", + "@graphql-tools/documents": "^1.0.0", + "@graphql-tools/utils": "^10.0.0", + "@graphql-typed-document-node/core": "3.2.0", + "tslib": "~2.5.0" + }, + "peerDependencies": { + "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + } + }, + "node_modules/@graphql-codegen/client-preset/node_modules/tslib": { + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", + "dev": true + }, + "node_modules/@graphql-codegen/core": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-4.0.2.tgz", + "integrity": "sha512-IZbpkhwVqgizcjNiaVzNAzm/xbWT6YnGgeOLwVjm4KbJn3V2jchVtuzHH09G5/WkkLSk2wgbXNdwjM41JxO6Eg==", + "dev": true, + "dependencies": { + "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/schema": "^10.0.0", "@graphql-tools/utils": "^10.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/core/node_modules/tslib": { - "version": "2.5.3", - "dev": true, - "license": "0BSD" - }, "node_modules/@graphql-codegen/gql-tag-operations": { "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.1.tgz", + "integrity": "sha512-qF6wIbBzW8BNT+wiVsBxrYOs2oYcsxQ7mRvCpfEI3HnNZMAST/uX76W8MqFEJvj4mw7NIDv7xYJAcAZIWM5LWw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-codegen/visitor-plugin-common": "4.0.1", @@ -1367,15 +1811,38 @@ "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, + "node_modules/@graphql-codegen/gql-tag-operations/node_modules/@graphql-codegen/visitor-plugin-common": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.0.1.tgz", + "integrity": "sha512-Bi/1z0nHg4QMsAqAJhds+ForyLtk7A3HQOlkrZNm3xEkY7lcBzPtiOTLBtvziwopBsXUxqeSwVjOOFPLS5Yw1Q==", + "dev": true, + "dependencies": { + "@graphql-codegen/plugin-helpers": "^5.0.0", + "@graphql-tools/optimize": "^2.0.0", + "@graphql-tools/relay-operation-optimizer": "^7.0.0", + "@graphql-tools/utils": "^10.0.0", + "auto-bind": "~4.0.0", + "change-case-all": "1.0.15", + "dependency-graph": "^0.11.0", + "graphql-tag": "^2.11.0", + "parse-filepath": "^1.0.2", + "tslib": "~2.5.0" + }, + "peerDependencies": { + "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + } + }, "node_modules/@graphql-codegen/gql-tag-operations/node_modules/tslib": { "version": "2.5.3", - "dev": true, - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", + "dev": true }, "node_modules/@graphql-codegen/introspection": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/introspection/-/introspection-4.0.0.tgz", + "integrity": "sha512-t9g3AkK99dfHblMWtG4ynUM9+A7JrWq5110zSpNV2wlSnv0+bRKagDW8gozwgXfR5i1IIG8QDjJZ6VgXQVqCZw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.0", "@graphql-codegen/visitor-plugin-common": "^4.0.0", @@ -1387,114 +1854,96 @@ }, "node_modules/@graphql-codegen/introspection/node_modules/tslib": { "version": "2.5.3", - "dev": true, - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==", + "dev": true }, "node_modules/@graphql-codegen/plugin-helpers": { - "version": "5.0.1", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.3.tgz", + "integrity": "sha512-yZ1rpULIWKBZqCDlvGIJRSyj1B2utkEdGmXZTBT/GVayP4hyRYlkd36AJV/LfEsVD8dnsKL5rLz2VTYmRNlJ5Q==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "change-case-all": "1.0.15", "common-tags": "1.8.2", "import-from": "4.0.0", "lodash": "~4.17.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/plugin-helpers/node_modules/tslib": { - "version": "2.5.3", - "dev": true, - "license": "0BSD" - }, "node_modules/@graphql-codegen/schema-ast": { - "version": "4.0.0", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/schema-ast/-/schema-ast-4.0.2.tgz", + "integrity": "sha512-5mVAOQQK3Oz7EtMl/l3vOQdc2aYClUzVDHHkMvZlunc+KlGgl81j8TLa+X7ANIllqU4fUEsQU3lJmk4hXP6K7Q==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", + "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/utils": "^10.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/schema-ast/node_modules/tslib": { - "version": "2.5.3", - "dev": true, - "license": "0BSD" - }, "node_modules/@graphql-codegen/typed-document-node": { - "version": "5.0.1", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.4.tgz", + "integrity": "sha512-t66Z6erQ4Dh1j6f9pRZmc8uYtHoUI3A49tLmJAlg9/3IV0kCmwrWKJut/G8SeOefDLG8cXBTVtI/YuZOe1Te+w==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "@graphql-codegen/visitor-plugin-common": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/visitor-plugin-common": "4.1.2", "auto-bind": "~4.0.0", "change-case-all": "1.0.15", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/typed-document-node/node_modules/tslib": { - "version": "2.5.3", - "dev": true, - "license": "0BSD" - }, "node_modules/@graphql-codegen/typescript": { - "version": "4.0.1", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.4.tgz", + "integrity": "sha512-x79CKLfP9UQCX+/I78qxQlMs2Mmq3pF1lKafZo7lAno0f/fvJ+qWUduzdgjRNz+YL+5blGeWcC0pWEDxniO7hw==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "@graphql-codegen/schema-ast": "^4.0.0", - "@graphql-codegen/visitor-plugin-common": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/schema-ast": "^4.0.2", + "@graphql-codegen/visitor-plugin-common": "4.1.2", "auto-bind": "~4.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, "node_modules/@graphql-codegen/typescript-operations": { - "version": "4.0.1", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.1.2.tgz", + "integrity": "sha512-CtCWK+gW7hS+Ely3lohr8CL1HVLswQzMcaUk3k1sxdWCWKTNq7abMsWa31rTVwRCJ+WNEkM/7S8sIBTpEG683A==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", - "@graphql-codegen/typescript": "^4.0.1", - "@graphql-codegen/visitor-plugin-common": "4.0.1", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/typescript": "^4.0.4", + "@graphql-codegen/visitor-plugin-common": "4.1.2", "auto-bind": "~4.0.0", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/typescript-operations/node_modules/tslib": { - "version": "2.5.3", - "dev": true, - "license": "0BSD" - }, - "node_modules/@graphql-codegen/typescript/node_modules/tslib": { - "version": "2.5.3", - "dev": true, - "license": "0BSD" - }, "node_modules/@graphql-codegen/visitor-plugin-common": { - "version": "4.0.1", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.1.2.tgz", + "integrity": "sha512-yk7iEAL1kYZ2Gi/pvVjdsZhul5WsYEM4Zcgh2Ev15VicMdJmPHsMhNUsZWyVJV0CaQCYpNOFlGD/11Ea3pn4GA==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.0", + "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/optimize": "^2.0.0", "@graphql-tools/relay-operation-optimizer": "^7.0.0", "@graphql-tools/utils": "^10.0.0", @@ -1503,21 +1952,17 @@ "dependency-graph": "^0.11.0", "graphql-tag": "^2.11.0", "parse-filepath": "^1.0.2", - "tslib": "~2.5.0" + "tslib": "~2.6.0" }, "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" } }, - "node_modules/@graphql-codegen/visitor-plugin-common/node_modules/tslib": { - "version": "2.5.3", - "dev": true, - "license": "0BSD" - }, "node_modules/@graphql-tools/apollo-engine-loader": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.0.tgz", + "integrity": "sha512-axQTbN5+Yxs1rJ6cWQBOfw3AEeC+fvIuZSfJLPLLvFJLj4pUm9fhxey/g6oQZAAQJqKPfw+tLDUQvnfvRK8Kmg==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", "@graphql-tools/utils": "^10.0.0", @@ -1533,28 +1978,31 @@ }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.15", + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.16.tgz", + "integrity": "sha512-mqasZiUNquRe3ea9+aCAuo81BR6vq5opUKprPilIHTnrg8a21Z1T1OrI+KiMFX8OmwO5HUJe/vro47lpj2JPWQ==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.0", - "urlpattern-polyfill": "^9.0.0" + "@whatwg-node/node-fetch": "^0.5.5", + "urlpattern-polyfill": "^10.0.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.4", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.6.tgz", + "integrity": "sha512-cmAsGMHoI0S3AHi3CmD3ma1Q234ZI2JNmXyDyM9rLtbXejBKxU3ZWdhS+mzRIAyUxZCMGlFW1tHmROv0MDdxpw==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -1567,14 +2015,16 @@ } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/urlpattern-polyfill": { - "version": "9.0.0", - "dev": true, - "license": "MIT" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/batch-execute": { "version": "9.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-9.0.2.tgz", + "integrity": "sha512-Y2uwdZI6ZnatopD/SYfZ1eGuQFI7OU2KGZ2/B/7G9ISmgMl5K+ZZWz/PfIEXeiHirIDhyk54s4uka5rj2xwKqQ==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.5", "dataloader": "^2.2.2", @@ -1589,12 +2039,13 @@ } }, "node_modules/@graphql-tools/code-file-loader": { - "version": "8.0.3", + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-8.1.0.tgz", + "integrity": "sha512-HKWW/B2z15ves8N9+xnVbGmFEVGyHEK80a4ghrjeTa6nwNZaKDVfq5CoYFfF0xpfjtH6gOVUExo2XCOEz4B8mQ==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/graphql-tag-pluck": "8.1.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/graphql-tag-pluck": "8.2.0", + "@graphql-tools/utils": "^10.0.13", "globby": "^11.0.3", "tslib": "^2.4.0", "unixify": "^1.0.0" @@ -1608,8 +2059,9 @@ }, "node_modules/@graphql-tools/delegate": { "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.3.tgz", + "integrity": "sha512-Jor9oazZ07zuWkykD3OOhT/2XD74Zm6Ar0ENZMk75MDD51wB2UWUIMljtHxbJhV5A6UBC2v8x6iY0xdCGiIlyw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/batch-execute": "^9.0.1", "@graphql-tools/executor": "^1.0.0", @@ -1627,8 +2079,9 @@ }, "node_modules/@graphql-tools/documents": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/documents/-/documents-1.0.0.tgz", + "integrity": "sha512-rHGjX1vg/nZ2DKqRGfDPNC55CWZBMldEVcH+91BThRa6JeT80NqXknffLLEZLRUxyikCfkwMsk6xR3UNMqG0Rg==", "dev": true, - "license": "MIT", "dependencies": { "lodash.sortby": "^4.7.0", "tslib": "^2.4.0" @@ -1642,8 +2095,9 @@ }, "node_modules/@graphql-tools/executor": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.2.0.tgz", + "integrity": "sha512-SKlIcMA71Dha5JnEWlw4XxcaJ+YupuXg0QCZgl2TOLFz4SkGCwU/geAsJvUJFwK2RbVLpQv/UMq67lOaBuwDtg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "@graphql-typed-document-node/core": "3.2.0", @@ -1660,8 +2114,9 @@ }, "node_modules/@graphql-tools/executor-graphql-ws": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.0.tgz", + "integrity": "sha512-yM67SzwE8rYRpm4z4AuGtABlOp9mXXVy6sxXnTJRoYIdZrmDbKVfIY+CpZUJCqS0FX3xf2+GoHlsj7Qswaxgcg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.2", "@types/ws": "^8.0.0", @@ -1679,8 +2134,9 @@ }, "node_modules/@graphql-tools/executor-http": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.7.tgz", + "integrity": "sha512-/MoRYzQS50Tz5mxRfq3ZmeZ2SOins9wGZAGetsJ55F3PxL0PmHdSGlCq12KzffZDbwHV5YMlwigBsSGWq4y9Iw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.2", "@repeaterjs/repeater": "^3.0.4", @@ -1699,28 +2155,31 @@ }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/fetch": { - "version": "0.9.15", + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.16.tgz", + "integrity": "sha512-mqasZiUNquRe3ea9+aCAuo81BR6vq5opUKprPilIHTnrg8a21Z1T1OrI+KiMFX8OmwO5HUJe/vro47lpj2JPWQ==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.0", - "urlpattern-polyfill": "^9.0.0" + "@whatwg-node/node-fetch": "^0.5.5", + "urlpattern-polyfill": "^10.0.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.4", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.6.tgz", + "integrity": "sha512-cmAsGMHoI0S3AHi3CmD3ma1Q234ZI2JNmXyDyM9rLtbXejBKxU3ZWdhS+mzRIAyUxZCMGlFW1tHmROv0MDdxpw==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -1733,14 +2192,16 @@ } }, "node_modules/@graphql-tools/executor-http/node_modules/urlpattern-polyfill": { - "version": "9.0.0", - "dev": true, - "license": "MIT" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/executor-legacy-ws": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.5.tgz", + "integrity": "sha512-w54AZ7zkNuvpyV09FH+eGHnnAmaxhBVHg4Yh2ICcsMfRg0brkLt77PlbjBuxZ4HY8XZnKJaYWf+tKazQZtkQtg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "@types/ws": "^8.0.0", @@ -1756,12 +2217,13 @@ } }, "node_modules/@graphql-tools/git-loader": { - "version": "8.0.3", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/git-loader/-/git-loader-8.0.4.tgz", + "integrity": "sha512-fBmKtnOVqzMT2N8L6nggM4skPq3y2t0eBITZJXCOuxeIlIRAeCOdjNLPKgyGb0rezIyGsn55DKMua5101VN0Sg==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/graphql-tag-pluck": "8.1.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/graphql-tag-pluck": "8.2.0", + "@graphql-tools/utils": "^10.0.13", "is-glob": "4.0.3", "micromatch": "^4.0.4", "tslib": "^2.4.0", @@ -1776,8 +2238,9 @@ }, "node_modules/@graphql-tools/github-loader": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/github-loader/-/github-loader-8.0.0.tgz", + "integrity": "sha512-VuroArWKcG4yaOWzV0r19ElVIV6iH6UKDQn1MXemND0xu5TzrFme0kf3U9o0YwNo0kUYEk9CyFM0BYg4he17FA==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", "@graphql-tools/executor-http": "^1.0.0", @@ -1796,28 +2259,31 @@ }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.15", + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.16.tgz", + "integrity": "sha512-mqasZiUNquRe3ea9+aCAuo81BR6vq5opUKprPilIHTnrg8a21Z1T1OrI+KiMFX8OmwO5HUJe/vro47lpj2JPWQ==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.0", - "urlpattern-polyfill": "^9.0.0" + "@whatwg-node/node-fetch": "^0.5.5", + "urlpattern-polyfill": "^10.0.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.4", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.6.tgz", + "integrity": "sha512-cmAsGMHoI0S3AHi3CmD3ma1Q234ZI2JNmXyDyM9rLtbXejBKxU3ZWdhS+mzRIAyUxZCMGlFW1tHmROv0MDdxpw==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -1830,14 +2296,16 @@ } }, "node_modules/@graphql-tools/github-loader/node_modules/urlpattern-polyfill": { - "version": "9.0.0", - "dev": true, - "license": "MIT" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/graphql-file-loader": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.0.0.tgz", + "integrity": "sha512-wRXj9Z1IFL3+zJG1HWEY0S4TXal7+s1vVhbZva96MSp0kbb/3JBF7j0cnJ44Eq0ClccMgGCDFqPFXty4JlpaPg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/import": "7.0.0", "@graphql-tools/utils": "^10.0.0", @@ -1853,16 +2321,17 @@ } }, "node_modules/@graphql-tools/graphql-tag-pluck": { - "version": "8.1.0", + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.2.0.tgz", + "integrity": "sha512-aGIuHxyrJB+LlUfXrH73NVlQTA6LkFbLKQzHojFuwXZJpf7wPkxceN2yp7VjMedARkLJg589IoXgZeMb1EztGQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.22.9", "@babel/parser": "^7.16.8", "@babel/plugin-syntax-import-assertions": "^7.20.0", "@babel/traverse": "^7.16.8", "@babel/types": "^7.16.8", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "engines": { @@ -1874,8 +2343,9 @@ }, "node_modules/@graphql-tools/import": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-7.0.0.tgz", + "integrity": "sha512-NVZiTO8o1GZs6OXzNfjB+5CtQtqsZZpQOq+Uu0w57kdUkT4RlQKlwhT8T81arEsbV55KpzkpFsOZP7J1wdmhBw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "resolve-from": "5.0.0", @@ -1890,8 +2360,9 @@ }, "node_modules/@graphql-tools/json-file-loader": { "version": "8.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-8.0.0.tgz", + "integrity": "sha512-ki6EF/mobBWJjAAC84xNrFMhNfnUFD6Y0rQMGXekrUgY0NdeYXHU0ZUgHzC9O5+55FslqUmAUHABePDHTyZsLg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "globby": "^11.0.3", @@ -1907,8 +2378,9 @@ }, "node_modules/@graphql-tools/load": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-8.0.1.tgz", + "integrity": "sha512-qSMsKngJhDqRbuWyo3NvakEFqFL6+eSjy8ooJ1o5qYD26N7dqXkKzIMycQsX7rBK19hOuINAUSaRcVWH6hTccw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/schema": "^10.0.0", "@graphql-tools/utils": "^10.0.11", @@ -1924,8 +2396,9 @@ }, "node_modules/@graphql-tools/merge": { "version": "9.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-9.0.1.tgz", + "integrity": "sha512-hIEExWO9fjA6vzsVjJ3s0cCQ+Q/BEeMVJZtMXd7nbaVefVy0YDyYlEkeoYYNV3NVVvu1G9lr6DM1Qd0DGo9Caw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.10", "tslib": "^2.4.0" @@ -1939,8 +2412,9 @@ }, "node_modules/@graphql-tools/optimize": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/optimize/-/optimize-2.0.0.tgz", + "integrity": "sha512-nhdT+CRGDZ+bk68ic+Jw1OZ99YCDIKYA5AlVAnBHJvMawSx9YQqQAIj4refNc1/LRieGiuWvhbG3jvPVYho0Dg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.4.0" }, @@ -1953,8 +2427,9 @@ }, "node_modules/@graphql-tools/prisma-loader": { "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/prisma-loader/-/prisma-loader-8.0.2.tgz", + "integrity": "sha512-8d28bIB0bZ9Bj0UOz9sHagVPW+6AHeqvGljjERtwCnWl8OCQw2c2pNboYXISLYUG5ub76r4lDciLLTU+Ks7Q0w==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/url-loader": "^8.0.0", "@graphql-tools/utils": "^10.0.8", @@ -1984,28 +2459,31 @@ }, "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.15", + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.16.tgz", + "integrity": "sha512-mqasZiUNquRe3ea9+aCAuo81BR6vq5opUKprPilIHTnrg8a21Z1T1OrI+KiMFX8OmwO5HUJe/vro47lpj2JPWQ==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.0", - "urlpattern-polyfill": "^9.0.0" + "@whatwg-node/node-fetch": "^0.5.5", + "urlpattern-polyfill": "^10.0.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.4", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.6.tgz", + "integrity": "sha512-cmAsGMHoI0S3AHi3CmD3ma1Q234ZI2JNmXyDyM9rLtbXejBKxU3ZWdhS+mzRIAyUxZCMGlFW1tHmROv0MDdxpw==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -2018,14 +2496,16 @@ } }, "node_modules/@graphql-tools/prisma-loader/node_modules/urlpattern-polyfill": { - "version": "9.0.0", - "dev": true, - "license": "MIT" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/relay-operation-optimizer": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.0.tgz", + "integrity": "sha512-UNlJi5y3JylhVWU4MBpL0Hun4Q7IoJwv9xYtmAz+CgRa066szzY7dcuPfxrA7cIGgG/Q6TVsKsYaiF4OHPs1Fw==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/relay-compiler": "12.0.0", "@graphql-tools/utils": "^10.0.0", @@ -2040,8 +2520,9 @@ }, "node_modules/@graphql-tools/schema": { "version": "10.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-10.0.2.tgz", + "integrity": "sha512-TbPsIZnWyDCLhgPGnDjt4hosiNU2mF/rNtSk5BVaXWnZqvKJ6gzJV4fcHcvhRIwtscDMW2/YTnK6dLVnk8pc4w==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/merge": "^9.0.1", "@graphql-tools/utils": "^10.0.10", @@ -2057,8 +2538,9 @@ }, "node_modules/@graphql-tools/url-loader": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-8.0.1.tgz", + "integrity": "sha512-B2k8KQEkEQmfV1zhurT5GLoXo8jbXP+YQHUayhCSxKYlRV7j/1Fhp1b21PDM8LXIDGlDRXaZ0FbWKOs7eYXDuQ==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", "@graphql-tools/delegate": "^10.0.0", @@ -2083,28 +2565,31 @@ }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.15", + "version": "0.9.16", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.16.tgz", + "integrity": "sha512-mqasZiUNquRe3ea9+aCAuo81BR6vq5opUKprPilIHTnrg8a21Z1T1OrI+KiMFX8OmwO5HUJe/vro47lpj2JPWQ==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.0", - "urlpattern-polyfill": "^9.0.0" + "@whatwg-node/node-fetch": "^0.5.5", + "urlpattern-polyfill": "^10.0.0" }, "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.4", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.6.tgz", + "integrity": "sha512-cmAsGMHoI0S3AHi3CmD3ma1Q234ZI2JNmXyDyM9rLtbXejBKxU3ZWdhS+mzRIAyUxZCMGlFW1tHmROv0MDdxpw==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -2117,14 +2602,16 @@ } }, "node_modules/@graphql-tools/url-loader/node_modules/urlpattern-polyfill": { - "version": "9.0.0", - "dev": true, - "license": "MIT" + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/utils": { - "version": "10.0.12", + "version": "10.0.13", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.0.13.tgz", + "integrity": "sha512-fMILwGr5Dm2zefNItjQ6C2rauigklv69LIwppccICuGTnGaOp3DspLt/6Lxj72cbg5d9z60Sr+Egco3CJKLsNg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "cross-inspect": "1.0.0", @@ -2140,8 +2627,9 @@ }, "node_modules/@graphql-tools/wrap": { "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-10.0.1.tgz", + "integrity": "sha512-Cw6hVrKGM2OKBXeuAGltgy4tzuqQE0Nt7t/uAqnuokSXZhMHXJUb124Bnvxc2gPZn5chfJSDafDe4Cp8ZAVJgg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/delegate": "^10.0.3", "@graphql-tools/schema": "^10.0.0", @@ -2158,15 +2646,17 @@ }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", + "integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==", "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", "debug": "^4.3.1", @@ -2178,8 +2668,9 @@ }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -2190,21 +2681,24 @@ }, "node_modules/@humanwhocodes/object-schema": { "version": "2.0.2", - "dev": true, - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", + "dev": true }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/@jest/schemas": { "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -2214,8 +2708,9 @@ }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.3", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz", + "integrity": "sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/set-array": "^1.0.1", "@jridgewell/sourcemap-codec": "^1.4.10", @@ -2227,29 +2722,33 @@ }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz", + "integrity": "sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz", + "integrity": "sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.21", + "version": "0.3.22", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz", + "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -2257,12 +2756,14 @@ }, "node_modules/@kamilkisiela/fast-url-parser": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@kamilkisiela/fast-url-parser/-/fast-url-parser-1.1.4.tgz", + "integrity": "sha512-gbkePEBupNydxCelHCESvFSFM8XPh1Zs/OAVRW/rKpEqPAl5PbOM90Si8mv9bvnR53uPD2s/FiRxdvSejpRJew==", + "dev": true }, "node_modules/@mapbox/geojson-rewind": { "version": "0.5.2", - "license": "ISC", + "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", + "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==", "dependencies": { "get-stream": "^6.0.1", "minimist": "^1.2.6" @@ -2273,127 +2774,361 @@ }, "node_modules/@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", + "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==", "engines": { "node": ">= 0.6" } }, "node_modules/@mapbox/point-geometry": { "version": "0.1.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", + "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==" }, "node_modules/@mapbox/tiny-sdf": { "version": "2.0.6", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz", + "integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==" }, "node_modules/@mapbox/unitbezier": { "version": "0.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz", + "integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==" }, "node_modules/@mapbox/vector-tile": { "version": "1.3.1", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz", + "integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==", "dependencies": { "@mapbox/point-geometry": "~0.1.0" } }, "node_modules/@mapbox/whoots-js": { "version": "3.1.0", - "license": "ISC", + "resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz", + "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@maplibre/maplibre-gl-style-spec": { + "version": "19.3.3", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz", + "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==", + "dependencies": { + "@mapbox/jsonlint-lines-primitives": "~2.0.2", + "@mapbox/unitbezier": "^0.0.1", + "json-stringify-pretty-compact": "^3.0.0", + "minimist": "^1.2.8", + "rw": "^1.3.3", + "sort-object": "^3.0.3" + }, + "bin": { + "gl-style-format": "dist/gl-style-format.mjs", + "gl-style-migrate": "dist/gl-style-migrate.mjs", + "gl-style-validate": "dist/gl-style-validate.mjs" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.3.0.tgz", + "integrity": "sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.3.0", + "@parcel/watcher-darwin-arm64": "2.3.0", + "@parcel/watcher-darwin-x64": "2.3.0", + "@parcel/watcher-freebsd-x64": "2.3.0", + "@parcel/watcher-linux-arm-glibc": "2.3.0", + "@parcel/watcher-linux-arm64-glibc": "2.3.0", + "@parcel/watcher-linux-arm64-musl": "2.3.0", + "@parcel/watcher-linux-x64-glibc": "2.3.0", + "@parcel/watcher-linux-x64-musl": "2.3.0", + "@parcel/watcher-win32-arm64": "2.3.0", + "@parcel/watcher-win32-ia32": "2.3.0", + "@parcel/watcher-win32-x64": "2.3.0" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.3.0.tgz", + "integrity": "sha512-f4o9eA3dgk0XRT3XhB0UWpWpLnKgrh1IwNJKJ7UJek7eTYccQ8LR7XUWFKqw6aEq5KUNlCcGvSzKqSX/vtWVVA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz", + "integrity": "sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.3.0.tgz", + "integrity": "sha512-20oBj8LcEOnLE3mgpy6zuOq8AplPu9NcSSSfyVKgfOhNAc4eF4ob3ldj0xWjGGbOF7Dcy1Tvm6ytvgdjlfUeow==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.3.0.tgz", + "integrity": "sha512-7LftKlaHunueAEiojhCn+Ef2CTXWsLgTl4hq0pkhkTBFI3ssj2bJXmH2L67mKpiAD5dz66JYk4zS66qzdnIOgw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.3.0.tgz", + "integrity": "sha512-1apPw5cD2xBv1XIHPUlq0cO6iAaEUQ3BcY0ysSyD9Kuyw4MoWm1DV+W9mneWI+1g6OeP6dhikiFE6BlU+AToTQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.3.0.tgz", + "integrity": "sha512-mQ0gBSQEiq1k/MMkgcSB0Ic47UORZBmWoAWlMrTW6nbAGoLZP+h7AtUM7H3oDu34TBFFvjy4JCGP43JlylkTQA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=6.0.0" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "19.3.3", - "license": "ISC", - "dependencies": { - "@mapbox/jsonlint-lines-primitives": "~2.0.2", - "@mapbox/unitbezier": "^0.0.1", - "json-stringify-pretty-compact": "^3.0.0", - "minimist": "^1.2.8", - "rw": "^1.3.3", - "sort-object": "^3.0.3" + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.3.0.tgz", + "integrity": "sha512-LXZAExpepJew0Gp8ZkJ+xDZaTQjLHv48h0p0Vw2VMFQ8A+RKrAvpFuPVCVwKJCr5SE+zvaG+Etg56qXvTDIedw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" }, - "bin": { - "gl-style-format": "dist/gl-style-format.mjs", - "gl-style-migrate": "dist/gl-style-migrate.mjs", - "gl-style-validate": "dist/gl-style-validate.mjs" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.3.0.tgz", + "integrity": "sha512-P7Wo91lKSeSgMTtG7CnBS6WrA5otr1K7shhSjKHNePVmfBHDoAOHYRXgUmhiNfbcGk0uMCHVcdbfxtuiZCHVow==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 8" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.3.0.tgz", + "integrity": "sha512-+kiRE1JIq8QdxzwoYY+wzBs9YbJ34guBweTK8nlzLKimn5EQ2b2FSC+tAOpq302BuIMjyuUGvBiUhEcLIGMQ5g==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 8" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.3.0.tgz", + "integrity": "sha512-35gXCnaz1AqIXpG42evcoP2+sNL62gZTMZne3IackM+6QlfMcJLy3DrjuL6Iks7Czpd3j4xRBzez3ADCj1l7Aw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 8" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher": { + "node_modules/@parcel/watcher-win32-ia32": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.3.0.tgz", + "integrity": "sha512-FJS/IBQHhRpZ6PiCjFt1UAcPr0YmCLHRbTc00IBTrelEjlmmgIVLeOx4MSXzx2HFEy5Jo5YdhGpxCuqCyDJ5ow==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MIT", - "dependencies": { - "detect-libc": "^1.0.3", - "is-glob": "^4.0.3", - "micromatch": "^4.0.5", - "node-addon-api": "^7.0.0" - }, + "optional": true, + "os": [ + "win32" + ], "engines": { "node": ">= 10.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.3.0", - "@parcel/watcher-darwin-arm64": "2.3.0", - "@parcel/watcher-darwin-x64": "2.3.0", - "@parcel/watcher-freebsd-x64": "2.3.0", - "@parcel/watcher-linux-arm-glibc": "2.3.0", - "@parcel/watcher-linux-arm64-glibc": "2.3.0", - "@parcel/watcher-linux-arm64-musl": "2.3.0", - "@parcel/watcher-linux-x64-glibc": "2.3.0", - "@parcel/watcher-linux-x64-musl": "2.3.0", - "@parcel/watcher-win32-arm64": "2.3.0", - "@parcel/watcher-win32-ia32": "2.3.0", - "@parcel/watcher-win32-x64": "2.3.0" } }, - "node_modules/@parcel/watcher-darwin-x64": { + "node_modules/@parcel/watcher-win32-x64": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.3.0.tgz", + "integrity": "sha512-dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA==", "cpu": [ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">= 10.0.0" @@ -2405,8 +3140,9 @@ }, "node_modules/@peculiar/asn1-schema": { "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.8.tgz", + "integrity": "sha512-ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA==", "dev": true, - "license": "MIT", "dependencies": { "asn1js": "^3.0.5", "pvtsutils": "^1.3.5", @@ -2415,8 +3151,9 @@ }, "node_modules/@peculiar/json-schema": { "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz", + "integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, @@ -2425,15 +3162,16 @@ } }, "node_modules/@peculiar/webcrypto": { - "version": "1.4.3", + "version": "1.4.5", + "resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.4.5.tgz", + "integrity": "sha512-oDk93QCDGdxFRM8382Zdminzs44dg3M2+E5Np+JWkpqLDyJC9DviMh8F8mEJkYuUcUOGA5jHO5AJJ10MFWdbZw==", "dev": true, - "license": "MIT", "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", + "@peculiar/asn1-schema": "^2.3.8", "@peculiar/json-schema": "^1.1.12", - "pvtsutils": "^1.3.2", - "tslib": "^2.5.0", - "webcrypto-core": "^1.7.7" + "pvtsutils": "^1.3.5", + "tslib": "^2.6.2", + "webcrypto-core": "^1.7.8" }, "engines": { "node": ">=10.12.0" @@ -2441,7 +3179,8 @@ }, "node_modules/@popperjs/core": { "version": "2.11.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -2449,7 +3188,8 @@ }, "node_modules/@react-aria/ssr": { "version": "3.9.1", - "license": "Apache-2.0", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.1.tgz", + "integrity": "sha512-NqzkLFP8ZVI4GSorS0AYljC13QW2sc8bDqJOkBvkAt3M8gbcAXJWVRGtZBCRscki9RZF+rNlnPdg0G0jYkhJcg==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -2462,12 +3202,14 @@ }, "node_modules/@repeaterjs/repeater": { "version": "3.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.5.tgz", + "integrity": "sha512-l3YHBLAol6d/IKnB9LhpD0cEZWAoe3eFKUyTYWmFmCO2Q/WOckxLQAUyMZWwZV2M/m3+4vgRoaolFqaII82/TA==", + "dev": true }, "node_modules/@restart/hooks": { - "version": "0.4.15", - "license": "MIT", + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.16.tgz", + "integrity": "sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==", "dependencies": { "dequal": "^2.0.3" }, @@ -2477,7 +3219,8 @@ }, "node_modules/@restart/ui": { "version": "1.6.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.6.tgz", + "integrity": "sha512-eC3puKuWE1SRYbojWHXnvCNHGgf3uzHCb6JOhnF4OXPibOIPEkR1sqDSkL643ydigxwh+ruCa1CmYHlzk7ikKA==", "dependencies": { "@babel/runtime": "^7.21.0", "@popperjs/core": "^2.11.6", @@ -2496,39 +3239,200 @@ }, "node_modules/@restart/ui/node_modules/uncontrollable": { "version": "8.0.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-8.0.4.tgz", + "integrity": "sha512-ulRWYWHvscPFc0QQXvyJjY6LIXU56f0h8pQFvhxiKk5V1fcI8gp9Ht9leVAhrVjzqMw0BgjspBINx9r6oyJUvQ==", "peerDependencies": { "react": ">=16.14.0" } }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.10.0.tgz", + "integrity": "sha512-/MeDQmcD96nVoRumKUljsYOLqfv1YFJps+0pTrb2Z9Nl/w5qNUysMaWQsrd1mvAlNT4yza1iVyIu4Q4AgF6V3A==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.10.0.tgz", + "integrity": "sha512-lvu0jK97mZDJdpZKDnZI93I0Om8lSDaiPx3OiCk0RXn3E8CMPJNS/wxjAvSJJzhhZpfjXsjLWL8LnS6qET4VNQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.10.0.tgz", + "integrity": "sha512-uFpayx8I8tyOvDkD7X6n0PriDRWxcqEjqgtlxnUA/G9oS93ur9aZ8c8BEpzFmsed1TH5WZNG5IONB8IiW90TQg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.9.5", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.10.0.tgz", + "integrity": "sha512-nIdCX03qFKoR/MwQegQBK+qZoSpO3LESurVAC6s6jazLA1Mpmgzo3Nj3H1vydXp/JM29bkCiuF7tDuToj4+U9Q==", "cpu": [ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "darwin" ] }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.10.0.tgz", + "integrity": "sha512-Fz7a+y5sYhYZMQFRkOyCs4PLhICAnxRX/GnWYReaAoruUzuRtcf+Qnw+T0CoAWbHCuz2gBUwmWnUgQ67fb3FYw==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.10.0.tgz", + "integrity": "sha512-yPtF9jIix88orwfTi0lJiqINnlWo6p93MtZEoaehZnmCzEmLL0eqjA3eGVeyQhMtxdV+Mlsgfwhh0+M/k1/V7Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.10.0.tgz", + "integrity": "sha512-9GW9yA30ib+vfFiwjX+N7PnjTnCMiUffhWj4vkG4ukYv1kJ4T9gHNg8zw+ChsOccM27G9yXrEtMScf1LaCuoWQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.10.0.tgz", + "integrity": "sha512-X1ES+V4bMq2ws5fF4zHornxebNxMXye0ZZjUrzOrf7UMx1d6wMQtfcchZ8SqUnQPPHdOyOLW6fTcUiFgHFadRA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.10.0.tgz", + "integrity": "sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.10.0.tgz", + "integrity": "sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.10.0.tgz", + "integrity": "sha512-NrR6667wlUfP0BHaEIKgYM/2va+Oj+RjZSASbBMnszM9k+1AmliRjHc3lJIiOehtSSjqYiO7R6KLNrWOX+YNSQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.10.0.tgz", + "integrity": "sha512-FV0Tpt84LPYDduIDcXvEC7HKtyXxdvhdAOvOeWMWbQNulxViH2O07QXkT/FffX4FqEI02jEbCJbr+YcuKdyyMg==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.10.0.tgz", + "integrity": "sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@sinclair/typebox": { "version": "0.27.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true }, "node_modules/@swc/helpers": { - "version": "0.5.3", - "license": "Apache-2.0", + "version": "0.5.6", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.6.tgz", + "integrity": "sha512-aYX01Ke9hunpoCexYAgQucEpARGQ5w/cqHFrIR+e9gdKb1QWTsVJuTJ2ozQzIAxLyRQe/m+2RqzkyOOGiMKRQA==", "dependencies": { "tslib": "^2.4.0" } }, "node_modules/@testing-library/dom": { "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", + "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -2545,8 +3449,9 @@ }, "node_modules/@testing-library/react": { "version": "14.1.2", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.1.2.tgz", + "integrity": "sha512-z4p7DVBTPjKM5qDZ0t5ZjzkpSNb+fZy1u6bzO7kk8oeGagpPCAtgh4cx1syrfp7a+QWkM021jGqjJaxJJnXAZg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/runtime": "^7.12.5", "@testing-library/dom": "^9.0.0", @@ -2562,50 +3467,60 @@ }, "node_modules/@types/aria-query": { "version": "5.0.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true }, "node_modules/@types/estree": { "version": "1.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true }, "node_modules/@types/geojson": { - "version": "7946.0.13", - "license": "MIT" + "version": "7946.0.14", + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", + "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true }, "node_modules/@types/js-yaml": { "version": "4.0.9", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz", + "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==", + "dev": true }, "node_modules/@types/json-schema": { "version": "7.0.15", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true }, "node_modules/@types/json-stable-stringify": { "version": "1.0.36", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.36.tgz", + "integrity": "sha512-b7bq23s4fgBB76n34m2b3RBf6M369B0Z9uRR8aHTMd8kZISRkmDEpPD8hhpYvDFzr3bJCPES96cm3Q6qRNDbQw==", + "dev": true }, "node_modules/@types/json5": { "version": "0.0.29", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true }, "node_modules/@types/mapbox__point-geometry": { "version": "0.1.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", + "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==" }, "node_modules/@types/mapbox__vector-tile": { "version": "1.3.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz", + "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==", "dependencies": { "@types/geojson": "*", "@types/mapbox__point-geometry": "*", @@ -2613,31 +3528,36 @@ } }, "node_modules/@types/mapbox-gl": { - "version": "2.7.19", - "license": "MIT", + "version": "2.7.21", + "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-2.7.21.tgz", + "integrity": "sha512-Dx9MuF2kKgT/N22LsMUB4b3acFZh9clVqz9zv1fomoiPoBrJolwYxpWA/9LPO/2N0xWbKi4V+pkjTaFkkx/4wA==", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/node": { - "version": "20.11.0", + "version": "20.11.17", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.17.tgz", + "integrity": "sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==", "dev": true, - "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } }, "node_modules/@types/pbf": { "version": "3.0.5", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz", + "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==" }, "node_modules/@types/prop-types": { "version": "15.7.11", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.11.tgz", + "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" }, "node_modules/@types/react": { "version": "18.2.21", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.21.tgz", + "integrity": "sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -2646,51 +3566,59 @@ }, "node_modules/@types/react-dom": { "version": "18.2.7", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz", + "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-transition-group": { "version": "4.4.10", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", + "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { "version": "0.16.8", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, "node_modules/@types/semver": { - "version": "7.5.6", - "dev": true, - "license": "MIT" + "version": "7.5.7", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz", + "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==", + "dev": true }, "node_modules/@types/supercluster": { "version": "7.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz", + "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/warning": { "version": "3.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.3.tgz", + "integrity": "sha512-D1XC7WK8K+zZEveUPY+cf4+kgauk8N4eHr/XIHXGlGYkHLud6hK9lYfZk1ry1TNh798cZUCgb6MqGEG8DkJt6Q==" }, "node_modules/@types/ws": { "version": "8.5.10", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", + "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } }, "node_modules/@typescript-eslint/eslint-plugin": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz", + "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.5.1", "@typescript-eslint/scope-manager": "6.5.0", @@ -2723,8 +3651,9 @@ }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -2733,9 +3662,10 @@ } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.5.4", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2748,13 +3678,15 @@ }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/@typescript-eslint/parser": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz", + "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/scope-manager": "6.5.0", "@typescript-eslint/types": "6.5.0", @@ -2780,8 +3712,9 @@ }, "node_modules/@typescript-eslint/scope-manager": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz", + "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.5.0", "@typescript-eslint/visitor-keys": "6.5.0" @@ -2796,8 +3729,9 @@ }, "node_modules/@typescript-eslint/type-utils": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz", + "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/typescript-estree": "6.5.0", "@typescript-eslint/utils": "6.5.0", @@ -2822,8 +3756,9 @@ }, "node_modules/@typescript-eslint/types": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz", + "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==", "dev": true, - "license": "MIT", "engines": { "node": "^16.0.0 || >=18.0.0" }, @@ -2834,8 +3769,9 @@ }, "node_modules/@typescript-eslint/typescript-estree": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz", + "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "@typescript-eslint/types": "6.5.0", "@typescript-eslint/visitor-keys": "6.5.0", @@ -2860,8 +3796,9 @@ }, "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -2870,9 +3807,10 @@ } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.5.4", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2885,13 +3823,15 @@ }, "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/@typescript-eslint/utils": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz", + "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", @@ -2914,8 +3854,9 @@ }, "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -2924,9 +3865,10 @@ } }, "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.5.4", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2939,13 +3881,15 @@ }, "node_modules/@typescript-eslint/utils/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { "version": "6.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz", + "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==", "dev": true, - "license": "MIT", "dependencies": { "@typescript-eslint/types": "6.5.0", "eslint-visitor-keys": "^3.4.1" @@ -2960,8 +3904,9 @@ }, "node_modules/@vitejs/plugin-react": { "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.0.4.tgz", + "integrity": "sha512-7wU921ABnNYkETiMaZy7XqpueMnpu5VxvVps13MjmCo+utBdD79sZzrApHawHtVX66cCJQQTXFcjH0y9dSUK8g==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.22.9", "@babel/plugin-transform-react-jsx-self": "^7.22.5", @@ -2977,8 +3922,9 @@ }, "node_modules/@vitest/coverage-v8": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.1.3.tgz", + "integrity": "sha512-Uput7t3eIcbSTOTQBzGtS+0kah96bX+szW9qQrLeGe3UmgL2Akn8POnyC2lH7XsnREZOds9aCUTxgXf+4HX5RA==", "dev": true, - "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.1", "@bcoe/v8-coverage": "^0.2.3", @@ -3003,8 +3949,9 @@ }, "node_modules/@vitest/expect": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.1.3.tgz", + "integrity": "sha512-MnJqsKc1Ko04lksF9XoRJza0bGGwTtqfbyrsYv5on4rcEkdo+QgUdITenBQBUltKzdxW7K3rWh+nXRULwsdaVg==", "dev": true, - "license": "MIT", "dependencies": { "@vitest/spy": "1.1.3", "@vitest/utils": "1.1.3", @@ -3016,8 +3963,9 @@ }, "node_modules/@vitest/runner": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.1.3.tgz", + "integrity": "sha512-Va2XbWMnhSdDEh/OFxyUltgQuuDRxnarK1hW5QNN4URpQrqq6jtt8cfww/pQQ4i0LjoYxh/3bYWvDFlR9tU73g==", "dev": true, - "license": "MIT", "dependencies": { "@vitest/utils": "1.1.3", "p-limit": "^5.0.0", @@ -3029,8 +3977,9 @@ }, "node_modules/@vitest/runner/node_modules/p-limit": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz", + "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^1.0.0" }, @@ -3043,8 +3992,9 @@ }, "node_modules/@vitest/runner/node_modules/yocto-queue": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", "dev": true, - "license": "MIT", "engines": { "node": ">=12.20" }, @@ -3054,8 +4004,9 @@ }, "node_modules/@vitest/snapshot": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.1.3.tgz", + "integrity": "sha512-U0r8pRXsLAdxSVAyGNcqOU2H3Z4Y2dAAGGelL50O0QRMdi1WWeYHdrH/QWpN1e8juWfVKsb8B+pyJwTC+4Gy9w==", "dev": true, - "license": "MIT", "dependencies": { "magic-string": "^0.30.5", "pathe": "^1.1.1", @@ -3067,8 +4018,9 @@ }, "node_modules/@vitest/snapshot/node_modules/ansi-styles": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -3078,8 +4030,9 @@ }, "node_modules/@vitest/snapshot/node_modules/pretty-format": { "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -3091,13 +4044,15 @@ }, "node_modules/@vitest/snapshot/node_modules/react-is": { "version": "18.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true }, "node_modules/@vitest/spy": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.1.3.tgz", + "integrity": "sha512-Ec0qWyGS5LhATFQtldvChPTAHv08yHIOZfiNcjwRQbFPHpkih0md9KAbs7TfeIfL7OFKoe7B/6ukBTqByubXkQ==", "dev": true, - "license": "MIT", "dependencies": { "tinyspy": "^2.2.0" }, @@ -3107,8 +4062,9 @@ }, "node_modules/@vitest/utils": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.1.3.tgz", + "integrity": "sha512-Dyt3UMcdElTll2H75vhxfpZu03uFpXRCHxWnzcrFjZxT1kTbq8ALUYIeBgGolo1gldVdI0YSlQRacsqxTwNqwg==", "dev": true, - "license": "MIT", "dependencies": { "diff-sequences": "^29.6.3", "estree-walker": "^3.0.3", @@ -3121,8 +4077,9 @@ }, "node_modules/@vitest/utils/node_modules/ansi-styles": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -3132,8 +4089,9 @@ }, "node_modules/@vitest/utils/node_modules/pretty-format": { "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -3145,18 +4103,21 @@ }, "node_modules/@vitest/utils/node_modules/react-is": { "version": "18.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true }, "node_modules/@whatwg-node/events": { "version": "0.0.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.0.3.tgz", + "integrity": "sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA==", + "dev": true }, "node_modules/@whatwg-node/fetch": { "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.8.8.tgz", + "integrity": "sha512-CdcjGC2vdKhc13KKxgsc6/616BQ7ooDIgPeTuAiE8qfCnS0mGzcfCOoZXypQSz73nxI+GWc7ZReIAVhxoE1KCg==", "dev": true, - "license": "MIT", "dependencies": { "@peculiar/webcrypto": "^1.4.0", "@whatwg-node/node-fetch": "^0.3.6", @@ -3167,8 +4128,9 @@ }, "node_modules/@whatwg-node/node-fetch": { "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.3.6.tgz", + "integrity": "sha512-w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA==", "dev": true, - "license": "MIT", "dependencies": { "@whatwg-node/events": "^0.0.3", "busboy": "^1.6.0", @@ -3179,8 +4141,9 @@ }, "node_modules/acorn": { "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true, - "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -3190,24 +4153,27 @@ }, "node_modules/acorn-jsx": { "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "node_modules/acorn-walk": { "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.4.0" } }, "node_modules/agent-base": { "version": "7.1.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", + "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.3.4" }, @@ -3217,8 +4183,9 @@ }, "node_modules/aggregate-error": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, - "license": "MIT", "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -3229,8 +4196,9 @@ }, "node_modules/ajv": { "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3244,8 +4212,9 @@ }, "node_modules/ansi-escapes": { "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, - "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -3258,16 +4227,18 @@ }, "node_modules/ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -3280,31 +4251,38 @@ }, "node_modules/argparse": { "version": "2.0.1", - "dev": true, - "license": "Python-2.0" + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/aria-query": { "version": "5.1.3", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", + "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "deep-equal": "^2.0.5" } }, "node_modules/arr-union": { "version": "3.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", "engines": { "node": ">=0.10.0" } }, "node_modules/array-buffer-byte-length": { - "version": "1.0.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "is-array-buffer": "^3.0.1" + "call-bind": "^1.0.5", + "is-array-buffer": "^3.0.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3312,8 +4290,9 @@ }, "node_modules/array-includes": { "version": "3.1.7", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.7.tgz", + "integrity": "sha512-dlcsNBIiWhPkHdOEEKnehA+RNUWDc4UqFtnIXU4uuYDPtA4LDkr7qip2p0VvFAEXNDr0yWZ9PJyIRiGjRLQzwQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3330,22 +4309,43 @@ }, "node_modules/array-union": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, + "node_modules/array.prototype.filter": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array.prototype.filter/-/array.prototype.filter-1.0.3.tgz", + "integrity": "sha512-VizNcj/RGJiUyQBgzwxzE5oHdeuXY5hSbbmKMlphj1cy1Vl7Pn2asCGbSrru6hSQjmCzqTBPVWAF/whmEOVHbw==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.2", + "define-properties": "^1.2.0", + "es-abstract": "^1.22.1", + "es-array-method-boxes-properly": "^1.0.0", + "is-string": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/array.prototype.findlastindex": { - "version": "1.2.3", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz", + "integrity": "sha512-hzvSHUshSpCflDR1QMUBLHGHP1VIEBegT4pix9H/Z92Xw3ySoy6c2qh7lJWTJnRJ8JCZ9bJNCgTyYaJGcJu6xQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.3.0", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -3356,8 +4356,9 @@ }, "node_modules/array.prototype.flat": { "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3373,8 +4374,9 @@ }, "node_modules/array.prototype.flatmap": { "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3389,28 +4391,31 @@ } }, "node_modules/array.prototype.tosorted": { - "version": "1.1.2", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.1.0", + "es-shim-unscopables": "^1.0.2" } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.2", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, - "license": "MIT", "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", - "is-array-buffer": "^3.0.2", + "array-buffer-byte-length": "^1.0.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.2.1", + "get-intrinsic": "^1.2.3", + "is-array-buffer": "^3.0.4", "is-shared-array-buffer": "^1.0.2" }, "engines": { @@ -3422,13 +4427,15 @@ }, "node_modules/asap": { "version": "2.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", + "dev": true }, "node_modules/asn1js": { "version": "3.0.5", + "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.5.tgz", + "integrity": "sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "pvtsutils": "^1.3.2", "pvutils": "^1.1.3", @@ -3440,49 +4447,56 @@ }, "node_modules/assertion-error": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true, - "license": "MIT", "engines": { "node": "*" } }, "node_modules/assign-symbols": { "version": "1.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", "engines": { "node": ">=0.10.0" } }, "node_modules/ast-types-flow": { "version": "0.0.7", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz", + "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==", + "dev": true }, "node_modules/astral-regex": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/asynciterator.prototype": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/asynciterator.prototype/-/asynciterator.prototype-1.0.0.tgz", + "integrity": "sha512-wwHYEIS0Q80f5mosx3L/dfG5t5rjEa9Ft51GTaNt862EnpyGHpgz2RkZvLPp1oF5TnAiTohkEKVEu8pQPJI7Vg==", "dev": true, - "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" } }, "node_modules/asynckit": { "version": "0.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true }, "node_modules/auto-bind": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz", + "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -3491,9 +4505,10 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.5", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.6.tgz", + "integrity": "sha512-j1QzY8iPNPG4o4xmO3ptzpRxTciqD3MgEHtifP/YnJpIo58Xu+ne4BejlbkuaLfXn/nz6HFiw29bLpj2PNMdGg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -3502,30 +4517,34 @@ } }, "node_modules/axe-core": { - "version": "4.8.3", + "version": "4.8.4", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.4.tgz", + "integrity": "sha512-CZLSKisu/bhJ2awW4kJndluz2HLZYIHh5Uy1+ZwDRkJi69811xgIXXfdU9HSLX0Th+ILrHj8qfL/5wzamsFtQg==", "dev": true, - "license": "MPL-2.0", "engines": { "node": ">=4" } }, "node_modules/axobject-query": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", + "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "dequal": "^2.0.3" } }, "node_modules/babel-plugin-syntax-trailing-function-commas": { "version": "7.0.0-beta.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz", + "integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==", + "dev": true }, "node_modules/babel-preset-fbjs": { "version": "3.4.0", + "resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz", + "integrity": "sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==", "dev": true, - "license": "MIT", "dependencies": { "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", @@ -3561,11 +4580,14 @@ }, "node_modules/balanced-match": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/base64-js": { "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "funding": [ { @@ -3580,21 +4602,22 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/bidi-js": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", + "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==", "dev": true, - "license": "MIT", "dependencies": { "require-from-string": "^2.0.2" } }, "node_modules/bl": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, - "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -3603,6 +4626,8 @@ }, "node_modules/bootstrap": { "version": "5.3.1", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz", + "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==", "funding": [ { "type": "github", @@ -3613,15 +4638,15 @@ "url": "https://opencollective.com/bootstrap" } ], - "license": "MIT", "peerDependencies": { "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -3629,8 +4654,9 @@ }, "node_modules/braces": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, - "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -3639,7 +4665,9 @@ } }, "node_modules/browserslist": { - "version": "4.22.2", + "version": "4.22.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.3.tgz", + "integrity": "sha512-UAp55yfwNv0klWNapjs/ktHoguxuQNGnOzxYmfnXIS+8AsRDZkSDxg7R1AX3GKzn078SBI5dzwzj/Yx0Or0e3A==", "dev": true, "funding": [ { @@ -3655,10 +4683,9 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001565", - "electron-to-chromium": "^1.4.601", + "caniuse-lite": "^1.0.30001580", + "electron-to-chromium": "^1.4.648", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -3671,14 +4698,17 @@ }, "node_modules/bser": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" } }, "node_modules/buffer": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "funding": [ { @@ -3694,7 +4724,6 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -3702,6 +4731,8 @@ }, "node_modules/busboy": { "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", "dev": true, "dependencies": { "streamsearch": "^1.1.0" @@ -3712,7 +4743,8 @@ }, "node_modules/bytewise": { "version": "1.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz", + "integrity": "sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ==", "dependencies": { "bytewise-core": "^1.2.2", "typewise": "^1.0.3" @@ -3720,27 +4752,35 @@ }, "node_modules/bytewise-core": { "version": "1.2.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz", + "integrity": "sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA==", "dependencies": { "typewise-core": "^1.2" } }, "node_modules/cac": { "version": "6.7.14", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/call-bind": { - "version": "1.0.5", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, - "license": "MIT", "dependencies": { + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.1", - "set-function-length": "^1.1.1" + "get-intrinsic": "^1.2.4", + "set-function-length": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -3748,16 +4788,18 @@ }, "node_modules/callsites": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/camel-case": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", "dev": true, - "license": "MIT", "dependencies": { "pascal-case": "^3.1.2", "tslib": "^2.0.3" @@ -3765,14 +4807,17 @@ }, "node_modules/camelcase": { "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001576", + "version": "1.0.30001587", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001587.tgz", + "integrity": "sha512-HMFNotUmLXn71BQxg8cijvqxnIAofforZOwGsxyXJ0qugTdspUF4sPSJ2vhgprHCB996tIDzEq1ubumPDV8ULA==", "dev": true, "funding": [ { @@ -3787,13 +4832,13 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ], - "license": "CC-BY-4.0" + ] }, "node_modules/capital-case": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", + "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -3801,9 +4846,10 @@ } }, "node_modules/chai": { - "version": "4.4.0", + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", + "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", "dev": true, - "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -3819,8 +4865,9 @@ }, "node_modules/chalk": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -3834,8 +4881,9 @@ }, "node_modules/change-case": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", + "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", "dev": true, - "license": "MIT", "dependencies": { "camel-case": "^4.1.2", "capital-case": "^1.0.4", @@ -3853,8 +4901,9 @@ }, "node_modules/change-case-all": { "version": "1.0.15", + "resolved": "https://registry.npmjs.org/change-case-all/-/change-case-all-1.0.15.tgz", + "integrity": "sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==", "dev": true, - "license": "MIT", "dependencies": { "change-case": "^4.1.2", "is-lower-case": "^2.0.2", @@ -3870,13 +4919,15 @@ }, "node_modules/chardet": { "version": "0.7.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true }, "node_modules/check-error": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, - "license": "MIT", "dependencies": { "get-func-name": "^2.0.2" }, @@ -3886,20 +4937,23 @@ }, "node_modules/classnames": { "version": "2.5.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "node_modules/clean-stack": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/cli-cursor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, - "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" }, @@ -3909,8 +4963,9 @@ }, "node_modules/cli-spinners": { "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" }, @@ -3920,8 +4975,9 @@ }, "node_modules/cli-truncate": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "dev": true, - "license": "MIT", "dependencies": { "slice-ansi": "^3.0.0", "string-width": "^4.2.0" @@ -3935,16 +4991,18 @@ }, "node_modules/cli-width": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true, - "license": "ISC", "engines": { "node": ">= 10" } }, "node_modules/cliui": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -3956,8 +5014,9 @@ }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -3972,16 +5031,18 @@ }, "node_modules/clone": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8" } }, "node_modules/color-convert": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -3991,18 +5052,21 @@ }, "node_modules/color-name": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/colorette": { "version": "2.0.20", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "dev": true }, "node_modules/combined-stream": { "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, - "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -4012,21 +5076,24 @@ }, "node_modules/common-tags": { "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4.0.0" } }, "node_modules/concat-map": { "version": "0.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true }, "node_modules/constant-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", + "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -4035,13 +5102,15 @@ }, "node_modules/convert-source-map": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true }, "node_modules/cosmiconfig": { "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, - "license": "MIT", "dependencies": { "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", @@ -4065,15 +5134,17 @@ }, "node_modules/cross-fetch": { "version": "3.1.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", + "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", "dependencies": { "node-fetch": "^2.6.12" } }, "node_modules/cross-inspect": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cross-inspect/-/cross-inspect-1.0.0.tgz", + "integrity": "sha512-4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.4.0" }, @@ -4083,8 +5154,9 @@ }, "node_modules/cross-spawn": { "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -4096,8 +5168,9 @@ }, "node_modules/css-tree": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", + "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", "dev": true, - "license": "MIT", "dependencies": { "mdn-data": "2.0.30", "source-map-js": "^1.0.1" @@ -4108,8 +5181,9 @@ }, "node_modules/cssstyle": { "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", + "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==", "dev": true, - "license": "MIT", "dependencies": { "rrweb-cssom": "^0.6.0" }, @@ -4119,17 +5193,20 @@ }, "node_modules/csstype": { "version": "3.1.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/damerau-levenshtein": { "version": "1.0.8", - "dev": true, - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", + "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", + "dev": true }, "node_modules/data-urls": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", "dev": true, - "license": "MIT", "dependencies": { "whatwg-mimetype": "^4.0.0", "whatwg-url": "^14.0.0" @@ -4140,18 +5217,21 @@ }, "node_modules/dataloader": { "version": "2.2.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.2.2.tgz", + "integrity": "sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==", + "dev": true }, "node_modules/debounce": { "version": "1.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", + "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", + "dev": true }, "node_modules/debug": { "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -4166,21 +5246,24 @@ }, "node_modules/decamelize": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/decimal.js": { "version": "10.4.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true }, "node_modules/deep-eql": { "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", "dev": true, - "license": "MIT", "dependencies": { "type-detect": "^4.0.0" }, @@ -4190,8 +5273,9 @@ }, "node_modules/deep-equal": { "version": "2.2.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", + "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", "dev": true, - "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -4221,13 +5305,15 @@ }, "node_modules/deep-is": { "version": "0.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "node_modules/defaults": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, - "license": "MIT", "dependencies": { "clone": "^1.0.2" }, @@ -4236,22 +5322,27 @@ } }, "node_modules/define-data-property": { - "version": "1.1.1", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, - "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.1", - "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "gopd": "^1.0.1" }, "engines": { "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" } }, "node_modules/define-properties": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, - "license": "MIT", "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -4266,39 +5357,44 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.4.0" } }, "node_modules/dependency-graph": { "version": "0.11.0", + "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", + "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6.0" } }, "node_modules/dequal": { "version": "2.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "engines": { "node": ">=6" } }, "node_modules/detect-indent": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/detect-libc": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", "dev": true, - "license": "Apache-2.0", "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -4308,16 +5404,18 @@ }, "node_modules/diff-sequences": { "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, - "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/dir-glob": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, - "license": "MIT", "dependencies": { "path-type": "^4.0.0" }, @@ -4327,8 +5425,9 @@ }, "node_modules/doctrine": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, - "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -4338,12 +5437,14 @@ }, "node_modules/dom-accessibility-api": { "version": "0.5.16", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true }, "node_modules/dom-helpers": { "version": "5.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" @@ -4351,50 +5452,57 @@ }, "node_modules/dot-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, "node_modules/dotenv": { - "version": "16.3.1", + "version": "16.4.4", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.4.tgz", + "integrity": "sha512-XvPXc8XAQThSjAbY6cQ/9PcBXmFoWuw1sQ3b8HqUCR6ziGXjkTi//kB9SWa2UwqlgdAIuRqAa/9hVljzPehbYg==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=12" }, "funding": { - "url": "https://github.com/motdotla/dotenv?sponsor=1" + "url": "https://dotenvx.com" } }, "node_modules/dset": { "version": "3.1.3", + "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.3.tgz", + "integrity": "sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/earcut": { "version": "2.2.4", - "license": "ISC" + "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", + "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==" }, "node_modules/electron-to-chromium": { - "version": "1.4.629", - "dev": true, - "license": "ISC" + "version": "1.4.668", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.668.tgz", + "integrity": "sha512-ZOBocMYCehr9W31+GpMclR+KBaDZOoAEabLdhpZ8oU1JFDwIaFY0UDbpXVEUFc0BIP2O2Qn3rkfCjQmMR4T/bQ==", + "dev": true }, "node_modules/emoji-regex": { "version": "9.2.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true }, "node_modules/entities": { "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -4404,56 +5512,60 @@ }, "node_modules/error-ex": { "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, - "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } }, "node_modules/es-abstract": { - "version": "1.22.3", - "dev": true, - "license": "MIT", - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "arraybuffer.prototype.slice": "^1.0.2", - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.5", - "es-set-tostringtag": "^2.0.1", + "version": "1.22.4", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.22.4.tgz", + "integrity": "sha512-vZYJlk2u6qHYxBOTjAeg7qUxHdNfih64Uu2J8QqWgXZ2cri0ZpJAkzDUK/q593+mvKwlxyaxr6F1Q+3LKoQRgg==", + "dev": true, + "dependencies": { + "array-buffer-byte-length": "^1.0.1", + "arraybuffer.prototype.slice": "^1.0.3", + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.7", + "es-define-property": "^1.0.0", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.2", - "get-symbol-description": "^1.0.0", + "get-intrinsic": "^1.2.4", + "get-symbol-description": "^1.0.2", "globalthis": "^1.0.3", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0", + "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "hasown": "^2.0.0", - "internal-slot": "^1.0.5", - "is-array-buffer": "^3.0.2", + "hasown": "^2.0.1", + "internal-slot": "^1.0.7", + "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", "is-negative-zero": "^2.0.2", "is-regex": "^1.1.4", "is-shared-array-buffer": "^1.0.2", "is-string": "^1.0.7", - "is-typed-array": "^1.1.12", + "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", "object-inspect": "^1.13.1", "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "safe-array-concat": "^1.0.1", - "safe-regex-test": "^1.0.0", + "object.assign": "^4.1.5", + "regexp.prototype.flags": "^1.5.2", + "safe-array-concat": "^1.1.0", + "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.8", "string.prototype.trimend": "^1.0.7", "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.0", + "typed-array-buffer": "^1.0.1", "typed-array-byte-length": "^1.0.0", "typed-array-byte-offset": "^1.0.0", "typed-array-length": "^1.0.4", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.13" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -4462,10 +5574,38 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", + "integrity": "sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==", + "dev": true + }, + "node_modules/es-define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/es-get-iterator": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -4482,30 +5622,36 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.0.15", + "version": "1.0.17", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.17.tgz", + "integrity": "sha512-lh7BsUqelv4KUbR5a/ZTaGGIMLCjPGPqJ6q+Oq24YP0RdyptX1uzm4vvaqzk7Zx3bpl/76YLTTDj9L7uYQ92oQ==", "dev": true, - "license": "MIT", "dependencies": { "asynciterator.prototype": "^1.0.0", - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.1", - "es-set-tostringtag": "^2.0.1", - "function-bind": "^1.1.1", - "get-intrinsic": "^1.2.1", + "es-abstract": "^1.22.4", + "es-errors": "^1.3.0", + "es-set-tostringtag": "^2.0.2", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.4", "globalthis": "^1.0.3", - "has-property-descriptors": "^1.0.0", + "has-property-descriptors": "^1.0.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", + "internal-slot": "^1.0.7", "iterator.prototype": "^1.1.2", - "safe-array-concat": "^1.0.1" + "safe-array-concat": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/es-set-tostringtag": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.2.tgz", + "integrity": "sha512-BuDyupZt65P9D2D2vA/zqcI3G5xRsklm5N3xCwuiy+/vKy8i0ifdsQP1sLgO4tZDSCaQUSnmC48khknGMV3D2Q==", "dev": true, - "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.2", "has-tostringtag": "^1.0.0", @@ -4517,16 +5663,18 @@ }, "node_modules/es-shim-unscopables": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, - "license": "MIT", "dependencies": { "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, - "license": "MIT", "dependencies": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -4541,9 +5689,10 @@ }, "node_modules/esbuild": { "version": "0.18.20", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", + "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", "dev": true, "hasInstallScript": true, - "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -4576,17 +5725,19 @@ } }, "node_modules/escalade": { - "version": "3.1.1", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/escape-string-regexp": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -4596,8 +5747,9 @@ }, "node_modules/eslint": { "version": "8.48.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz", + "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4649,8 +5801,9 @@ }, "node_modules/eslint-config-prettier": { "version": "9.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz", + "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==", "dev": true, - "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -4660,8 +5813,9 @@ }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.13.0", @@ -4670,16 +5824,18 @@ }, "node_modules/eslint-import-resolver-node/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-module-utils": { "version": "2.8.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.0.tgz", + "integrity": "sha512-aWajIYfsqCKRDgUfjEXNN/JlrzauMuSEy5sbd7WXbtW3EH6A6MpwEh42c7qD+MqQo9QMJ6fWLAeIJynx0g6OAw==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^3.2.7" }, @@ -4694,16 +5850,18 @@ }, "node_modules/eslint-module-utils/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import": { "version": "2.28.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz", + "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==", "dev": true, - "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.findlastindex": "^1.2.2", @@ -4732,16 +5890,18 @@ }, "node_modules/eslint-plugin-import/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import/node_modules/doctrine": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -4751,8 +5911,9 @@ }, "node_modules/eslint-plugin-jsx-a11y": { "version": "6.7.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz", + "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/runtime": "^7.20.7", "aria-query": "^5.1.3", @@ -4780,8 +5941,9 @@ }, "node_modules/eslint-plugin-react": { "version": "7.33.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz", + "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==", "dev": true, - "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.flatmap": "^1.3.1", @@ -4809,8 +5971,9 @@ }, "node_modules/eslint-plugin-react-hooks": { "version": "4.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -4820,16 +5983,18 @@ }, "node_modules/eslint-plugin-react-refresh": { "version": "0.4.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz", + "integrity": "sha512-Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA==", "dev": true, - "license": "MIT", "peerDependencies": { "eslint": ">=7" } }, "node_modules/eslint-plugin-react/node_modules/doctrine": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -4839,8 +6004,9 @@ }, "node_modules/eslint-plugin-react/node_modules/resolve": { "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, - "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -4855,8 +6021,9 @@ }, "node_modules/eslint-scope": { "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -4870,8 +6037,9 @@ }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -4881,8 +6049,9 @@ }, "node_modules/eslint/node_modules/globals": { "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, - "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -4895,8 +6064,9 @@ }, "node_modules/eslint/node_modules/type-fest": { "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -4906,8 +6076,9 @@ }, "node_modules/espree": { "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -4922,8 +6093,9 @@ }, "node_modules/esquery": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -4933,8 +6105,9 @@ }, "node_modules/esrecurse": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -4944,32 +6117,36 @@ }, "node_modules/estraverse": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, "node_modules/estree-walker": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", "dev": true, - "license": "MIT", "dependencies": { "@types/estree": "^1.0.0" } }, "node_modules/esutils": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/execa": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, - "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^8.0.1", @@ -4990,8 +6167,9 @@ }, "node_modules/execa/node_modules/get-stream": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, - "license": "MIT", "engines": { "node": ">=16" }, @@ -5001,8 +6179,9 @@ }, "node_modules/execa/node_modules/mimic-fn": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -5012,8 +6191,9 @@ }, "node_modules/execa/node_modules/onetime": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, - "license": "MIT", "dependencies": { "mimic-fn": "^4.0.0" }, @@ -5026,8 +6206,9 @@ }, "node_modules/execa/node_modules/signal-exit": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "ISC", "engines": { "node": ">=14" }, @@ -5037,7 +6218,8 @@ }, "node_modules/extend-shallow": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "dependencies": { "is-extendable": "^0.1.0" }, @@ -5047,8 +6229,9 @@ }, "node_modules/external-editor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, - "license": "MIT", "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -5060,8 +6243,9 @@ }, "node_modules/extract-files": { "version": "11.0.0", + "resolved": "https://registry.npmjs.org/extract-files/-/extract-files-11.0.0.tgz", + "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==", "dev": true, - "license": "MIT", "engines": { "node": "^12.20 || >= 14.13" }, @@ -5071,18 +6255,21 @@ }, "node_modules/fast-decode-uri-component": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz", + "integrity": "sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==", + "dev": true }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "node_modules/fast-glob": { "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, - "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -5096,8 +6283,9 @@ }, "node_modules/fast-glob/node_modules/glob-parent": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -5107,50 +6295,57 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true }, "node_modules/fast-querystring": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.2.tgz", + "integrity": "sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==", "dev": true, - "license": "MIT", "dependencies": { "fast-decode-uri-component": "^1.0.1" } }, "node_modules/fast-url-parser": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", + "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==", "dev": true, - "license": "MIT", "dependencies": { "punycode": "^1.3.2" } }, "node_modules/fastq": { - "version": "1.16.0", + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, - "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, "node_modules/fb-watchman": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" } }, "node_modules/fbjs": { "version": "3.0.5", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz", + "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==", "dev": true, - "license": "MIT", "dependencies": { "cross-fetch": "^3.1.5", "fbjs-css-vars": "^1.0.0", @@ -5163,13 +6358,15 @@ }, "node_modules/fbjs-css-vars": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", + "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==", + "dev": true }, "node_modules/figures": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, - "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -5182,16 +6379,18 @@ }, "node_modules/figures/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/file-entry-cache": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, - "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" }, @@ -5201,8 +6400,9 @@ }, "node_modules/fill-range": { "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -5212,8 +6412,9 @@ }, "node_modules/find-up": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -5227,8 +6428,9 @@ }, "node_modules/flat-cache": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, - "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -5240,21 +6442,24 @@ }, "node_modules/flatted": { "version": "3.2.9", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz", + "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==", + "dev": true }, "node_modules/for-each": { "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, - "license": "MIT", "dependencies": { "is-callable": "^1.1.3" } }, "node_modules/form-data": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -5266,13 +6471,16 @@ }, "node_modules/fs.realpath": { "version": "1.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true }, "node_modules/fsevents": { "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "license": "MIT", + "hasInstallScript": true, "optional": true, "os": [ "darwin" @@ -5283,16 +6491,18 @@ }, "node_modules/function-bind": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/function.prototype.name": { "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -5308,57 +6518,68 @@ }, "node_modules/functions-have-names": { "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/gensync": { "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/geojson-vt": { "version": "3.2.1", - "license": "ISC" + "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", + "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==" }, "node_modules/get-caller-file": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } }, "node_modules/get-func-name": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, - "license": "MIT", "engines": { "node": "*" } }, "node_modules/get-intrinsic": { - "version": "1.2.2", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, - "license": "MIT", "dependencies": { + "es-errors": "^1.3.0", "function-bind": "^1.1.2", "has-proto": "^1.0.1", "has-symbols": "^1.0.3", "hasown": "^2.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/get-stream": { "version": "6.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "engines": { "node": ">=10" }, @@ -5367,12 +6588,14 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.0", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4" }, "engines": { "node": ">= 0.4" @@ -5383,19 +6606,22 @@ }, "node_modules/get-value": { "version": "2.0.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==", "engines": { "node": ">=0.10.0" } }, "node_modules/gl-matrix": { "version": "3.4.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", + "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==" }, "node_modules/glob": { "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, - "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5413,8 +6639,9 @@ }, "node_modules/glob-parent": { "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -5424,7 +6651,8 @@ }, "node_modules/global-prefix": { "version": "3.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", "dependencies": { "ini": "^1.3.5", "kind-of": "^6.0.2", @@ -5436,7 +6664,8 @@ }, "node_modules/global-prefix/node_modules/which": { "version": "1.3.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dependencies": { "isexe": "^2.0.0" }, @@ -5446,16 +6675,18 @@ }, "node_modules/globals": { "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/globalthis": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", "dev": true, - "license": "MIT", "dependencies": { "define-properties": "^1.1.3" }, @@ -5468,8 +6699,9 @@ }, "node_modules/globby": { "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, - "license": "MIT", "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -5487,8 +6719,9 @@ }, "node_modules/gopd": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, - "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -5498,20 +6731,23 @@ }, "node_modules/graphemer": { "version": "1.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true }, "node_modules/graphql": { "version": "16.8.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.0.tgz", + "integrity": "sha512-0oKGaR+y3qcS5mCu1vb7KG+a89vjn06C7Ihq/dDl3jA+A8B3TKomvi3CiEcVLJQGalbu8F52LxkOym7U5sSfbg==", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } }, "node_modules/graphql-config": { "version": "5.0.3", + "resolved": "https://registry.npmjs.org/graphql-config/-/graphql-config-5.0.3.tgz", + "integrity": "sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/graphql-file-loader": "^8.0.0", "@graphql-tools/json-file-loader": "^8.0.0", @@ -5540,8 +6776,9 @@ }, "node_modules/graphql-config/node_modules/minimatch": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.3.tgz", + "integrity": "sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5551,7 +6788,8 @@ }, "node_modules/graphql-request": { "version": "6.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-6.1.0.tgz", + "integrity": "sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==", "dependencies": { "@graphql-typed-document-node/core": "^3.2.0", "cross-fetch": "^3.1.5" @@ -5562,8 +6800,9 @@ }, "node_modules/graphql-tag": { "version": "2.12.6", + "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz", + "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.1.0" }, @@ -5575,9 +6814,10 @@ } }, "node_modules/graphql-ws": { - "version": "5.14.3", + "version": "5.15.0", + "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.15.0.tgz", + "integrity": "sha512-xWGAtm3fig9TIhSaNsg0FaDZ8Pyn/3re3RFlP4rhQcmjRDIPpk1EhRuNB+YSJtLzttyuToaDiNhwT1OMoGnJnw==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -5587,34 +6827,38 @@ }, "node_modules/has": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz", + "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4.0" } }, "node_modules/has-bigints": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-flag": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/has-property-descriptors": { - "version": "1.0.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, - "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.2" + "es-define-property": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5622,8 +6866,9 @@ }, "node_modules/has-proto": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz", + "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5633,8 +6878,9 @@ }, "node_modules/has-symbols": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5643,11 +6889,12 @@ } }, "node_modules/has-tostringtag": { - "version": "1.0.0", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, - "license": "MIT", "dependencies": { - "has-symbols": "^1.0.2" + "has-symbols": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -5657,9 +6904,10 @@ } }, "node_modules/hasown": { - "version": "2.0.0", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.1.tgz", + "integrity": "sha512-1/th4MHjnwncwXsIW6QMzlvYL9kG5e/CpVvLRZe4XPa8TOUNbCELqmvhDmnkNsAjwaG4+I8gJJL0JBvTTLO9qA==", "dev": true, - "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -5669,8 +6917,9 @@ }, "node_modules/header-case": { "version": "2.0.4", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", + "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", "dev": true, - "license": "MIT", "dependencies": { "capital-case": "^1.0.4", "tslib": "^2.0.3" @@ -5678,8 +6927,9 @@ }, "node_modules/html-encoding-sniffer": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", "dev": true, - "license": "MIT", "dependencies": { "whatwg-encoding": "^3.1.1" }, @@ -5689,13 +6939,15 @@ }, "node_modules/html-escaper": { "version": "2.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true }, "node_modules/http-proxy-agent": { - "version": "7.0.0", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.1.tgz", + "integrity": "sha512-My1KCEPs6A0hb4qCVzYp8iEvA8j8YqcvXLZZH8C9OFuTYpYjHE7N2dtG3mRl1HMD4+VGXpF3XcDVcxGBT7yDZQ==", "dev": true, - "license": "MIT", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -5705,9 +6957,10 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.2", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.3.tgz", + "integrity": "sha512-kCnwztfX0KZJSLOBrcL0emLeFako55NWMovvyPP2AjsghNk9RB1yjSI+jVumPHYZsNXegNoqupSW9IY3afSH8w==", "dev": true, - "license": "MIT", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -5718,16 +6971,18 @@ }, "node_modules/human-signals": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=16.17.0" } }, "node_modules/iconv-lite": { "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -5737,6 +6992,8 @@ }, "node_modules/ieee754": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "funding": [ { "type": "github", @@ -5750,29 +7007,31 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "BSD-3-Clause" + ] }, "node_modules/ignore": { - "version": "5.3.0", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/immutable": { "version": "3.7.6", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", + "integrity": "sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.8.0" } }, "node_modules/import-fresh": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, - "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -5786,16 +7045,18 @@ }, "node_modules/import-fresh/node_modules/resolve-from": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/import-from": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz", + "integrity": "sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=12.2" }, @@ -5805,24 +7066,27 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.19" } }, "node_modules/indent-string": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/inflight": { "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, - "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -5830,17 +7094,20 @@ }, "node_modules/inherits": { "version": "2.0.4", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true }, "node_modules/ini": { "version": "1.3.8", - "license": "ISC" + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/inquirer": { "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", "dev": true, - "license": "MIT", "dependencies": { "ansi-escapes": "^4.2.1", "chalk": "^4.1.1", @@ -5863,11 +7130,12 @@ } }, "node_modules/internal-slot": { - "version": "1.0.6", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, - "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.2", + "es-errors": "^1.3.0", "hasown": "^2.0.0", "side-channel": "^1.0.4" }, @@ -5877,15 +7145,17 @@ }, "node_modules/invariant": { "version": "2.2.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dependencies": { "loose-envify": "^1.0.0" } }, "node_modules/is-absolute": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "dev": true, - "license": "MIT", "dependencies": { "is-relative": "^1.0.0", "is-windows": "^1.0.1" @@ -5896,8 +7166,9 @@ }, "node_modules/is-arguments": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -5910,13 +7181,16 @@ } }, "node_modules/is-array-buffer": { - "version": "3.0.2", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.0", - "is-typed-array": "^1.1.10" + "get-intrinsic": "^1.2.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -5924,13 +7198,15 @@ }, "node_modules/is-arrayish": { "version": "0.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true }, "node_modules/is-async-function": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -5943,8 +7219,9 @@ }, "node_modules/is-bigint": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, - "license": "MIT", "dependencies": { "has-bigints": "^1.0.1" }, @@ -5954,8 +7231,9 @@ }, "node_modules/is-boolean-object": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -5969,8 +7247,9 @@ }, "node_modules/is-callable": { "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5980,8 +7259,9 @@ }, "node_modules/is-core-module": { "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, - "license": "MIT", "dependencies": { "hasown": "^2.0.0" }, @@ -5991,8 +7271,9 @@ }, "node_modules/is-date-object": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6005,23 +7286,26 @@ }, "node_modules/is-extendable": { "version": "0.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", "engines": { "node": ">=0.10.0" } }, "node_modules/is-extglob": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/is-finalizationregistry": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6031,16 +7315,18 @@ }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-generator-function": { "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6053,8 +7339,9 @@ }, "node_modules/is-glob": { "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, - "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -6064,32 +7351,36 @@ }, "node_modules/is-interactive": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-lower-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-2.0.2.tgz", + "integrity": "sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/is-map": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.2.tgz", + "integrity": "sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-negative-zero": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.2.tgz", + "integrity": "sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6099,16 +7390,18 @@ }, "node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/is-number-object": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6121,15 +7414,17 @@ }, "node_modules/is-path-inside": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-plain-object": { "version": "2.0.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dependencies": { "isobject": "^3.0.1" }, @@ -6139,13 +7434,15 @@ }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true }, "node_modules/is-regex": { "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -6159,8 +7456,9 @@ }, "node_modules/is-relative": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "dev": true, - "license": "MIT", "dependencies": { "is-unc-path": "^1.0.0" }, @@ -6170,16 +7468,18 @@ }, "node_modules/is-set": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.2.tgz", + "integrity": "sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-shared-array-buffer": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.2.tgz", + "integrity": "sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6189,8 +7489,9 @@ }, "node_modules/is-stream": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, - "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -6200,8 +7501,9 @@ }, "node_modules/is-string": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6214,8 +7516,9 @@ }, "node_modules/is-symbol": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, - "license": "MIT", "dependencies": { "has-symbols": "^1.0.2" }, @@ -6227,11 +7530,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.12", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, - "license": "MIT", "dependencies": { - "which-typed-array": "^1.1.11" + "which-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -6242,8 +7546,9 @@ }, "node_modules/is-unc-path": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "dev": true, - "license": "MIT", "dependencies": { "unc-path-regex": "^0.1.2" }, @@ -6253,8 +7558,9 @@ }, "node_modules/is-unicode-supported": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -6264,24 +7570,27 @@ }, "node_modules/is-upper-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-2.0.2.tgz", + "integrity": "sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/is-weakmap": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.1.tgz", + "integrity": "sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-weakref": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6291,8 +7600,9 @@ }, "node_modules/is-weakset": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.2.tgz", + "integrity": "sha512-t2yVvttHkQktwnNNmBQ98AhENLdPUTDTE21uPqAQ0ARwQfGeQKRVS0NNurH7bTf7RrvcVn1OOge45CnBeHCSmg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.1" @@ -6303,48 +7613,55 @@ }, "node_modules/is-windows": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/isarray": { "version": "2.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true }, "node_modules/isexe": { "version": "2.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/isobject": { "version": "3.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "engines": { "node": ">=0.10.0" } }, "node_modules/isomorphic-ws": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz", + "integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==", "dev": true, - "license": "MIT", "peerDependencies": { "ws": "*" } }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=8" } }, "node_modules/istanbul-lib-report": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", @@ -6356,8 +7673,9 @@ }, "node_modules/istanbul-lib-source-maps": { "version": "4.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", + "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "debug": "^4.1.1", "istanbul-lib-coverage": "^3.0.0", @@ -6369,8 +7687,9 @@ }, "node_modules/istanbul-reports": { "version": "3.1.6", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.6.tgz", + "integrity": "sha512-TLgnMkKg3iTDsQ9PbPTdpfAK2DzjF9mqUG7RMgcQl8oFjad8ob4laGxv5XV5U9MAfx8D6tSJiUyuAwzLicaxlg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -6381,8 +7700,9 @@ }, "node_modules/iterator.prototype": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", "dev": true, - "license": "MIT", "dependencies": { "define-properties": "^1.2.1", "get-intrinsic": "^1.2.1", @@ -6393,28 +7713,32 @@ }, "node_modules/jiti": { "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", "dev": true, - "license": "MIT", "bin": { "jiti": "bin/jiti.js" } }, "node_modules/jose": { - "version": "5.2.0", + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/jose/-/jose-5.2.2.tgz", + "integrity": "sha512-/WByRr4jDcsKlvMd1dRJnPfS1GVO3WuKyaurJ/vvXcOaUQO8rnNObCQMlv/5uCceVQIq5Q4WLF44ohsdiTohdg==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/panva" } }, "node_modules/js-tokens": { "version": "4.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -6424,8 +7748,9 @@ }, "node_modules/jsdom": { "version": "23.2.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.2.0.tgz", + "integrity": "sha512-L88oL7D/8ufIES+Zjz7v0aes+oBMh2Xnh3ygWvL0OaICOomKEPKuPnIfBJekiXr+BHbbMjrWn/xqrDQuxFTeyA==", "dev": true, - "license": "MIT", "dependencies": { "@asamuzakjp/dom-selector": "^2.0.1", "cssstyle": "^4.0.1", @@ -6463,8 +7788,9 @@ }, "node_modules/jsesc": { "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, - "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -6474,23 +7800,27 @@ }, "node_modules/json-buffer": { "version": "3.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "node_modules/json-stable-stringify": { - "version": "1.1.0", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", + "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "isarray": "^2.0.5", @@ -6506,17 +7836,20 @@ }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true }, "node_modules/json-stringify-pretty-compact": { "version": "3.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz", + "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==" }, "node_modules/json-to-pretty-yaml": { "version": "1.2.2", + "resolved": "https://registry.npmjs.org/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz", + "integrity": "sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==", "dev": true, - "license": "Apache-2.0", "dependencies": { "remedial": "^1.0.7", "remove-trailing-spaces": "^1.0.6" @@ -6527,8 +7860,9 @@ }, "node_modules/json5": { "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, - "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -6537,22 +7871,25 @@ } }, "node_modules/jsonc-parser": { - "version": "3.2.0", - "dev": true, - "license": "MIT" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "dev": true }, "node_modules/jsonify": { "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", "dev": true, - "license": "Public Domain", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/jsx-ast-utils": { "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", "dev": true, - "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.flat": "^1.3.1", @@ -6565,40 +7902,46 @@ }, "node_modules/kdbush": { "version": "4.0.2", - "license": "ISC" + "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", + "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==" }, "node_modules/keyv": { "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, - "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } }, "node_modules/kind-of": { "version": "6.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "engines": { "node": ">=0.10.0" } }, "node_modules/language-subtag-registry": { "version": "0.3.22", - "dev": true, - "license": "CC0-1.0" + "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", + "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==", + "dev": true }, "node_modules/language-tags": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz", + "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==", "dev": true, - "license": "MIT", "dependencies": { "language-subtag-registry": "~0.3.2" } }, "node_modules/levn": { "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -6609,13 +7952,15 @@ }, "node_modules/lines-and-columns": { "version": "1.2.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true }, "node_modules/listr2": { "version": "4.0.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", + "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", "dev": true, - "license": "MIT", "dependencies": { "cli-truncate": "^2.1.0", "colorette": "^2.0.16", @@ -6640,8 +7985,9 @@ }, "node_modules/listr2/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -6656,8 +8002,9 @@ }, "node_modules/local-pkg": { "version": "0.5.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", + "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", "dev": true, - "license": "MIT", "dependencies": { "mlly": "^1.4.2", "pkg-types": "^1.0.3" @@ -6671,8 +8018,9 @@ }, "node_modules/locate-path": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -6685,23 +8033,27 @@ }, "node_modules/lodash": { "version": "4.17.21", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true }, "node_modules/lodash.merge": { "version": "4.6.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/lodash.sortby": { "version": "4.7.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", + "dev": true }, "node_modules/log-symbols": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -6715,8 +8067,9 @@ }, "node_modules/log-update": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, - "license": "MIT", "dependencies": { "ansi-escapes": "^4.3.0", "cli-cursor": "^3.1.0", @@ -6732,8 +8085,9 @@ }, "node_modules/log-update/node_modules/slice-ansi": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -6748,7 +8102,8 @@ }, "node_modules/loose-envify": { "version": "1.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -6758,48 +8113,54 @@ }, "node_modules/loupe": { "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, - "license": "MIT", "dependencies": { "get-func-name": "^2.0.1" } }, "node_modules/lower-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/lower-case-first": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-2.0.2.tgz", + "integrity": "sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/lru-cache": { "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^3.0.2" } }, "node_modules/lz-string": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "dev": true, - "license": "MIT", "bin": { "lz-string": "bin/bin.js" } }, "node_modules/magic-string": { - "version": "0.30.5", + "version": "0.30.7", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.7.tgz", + "integrity": "sha512-8vBuFF/I/+OSLRmdf2wwFCJCz+nSn0m6DPvGH1fS/KiQoSaR+sETbov0eIk9KhEKy8CYqIkIAnbohxT/4H0kuA==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -6808,19 +8169,21 @@ } }, "node_modules/magicast": { - "version": "0.3.2", + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.3.tgz", + "integrity": "sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/parser": "^7.23.3", - "@babel/types": "^7.23.3", + "@babel/parser": "^7.23.6", + "@babel/types": "^7.23.6", "source-map-js": "^1.0.2" } }, "node_modules/make-dir": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, - "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -6833,8 +8196,9 @@ }, "node_modules/make-dir/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -6843,9 +8207,10 @@ } }, "node_modules/make-dir/node_modules/semver": { - "version": "7.5.4", + "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -6858,13 +8223,15 @@ }, "node_modules/make-dir/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/map-cache": { "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -6910,26 +8277,30 @@ }, "node_modules/mdn-data": { "version": "2.0.30", - "dev": true, - "license": "CC0-1.0" + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", + "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", + "dev": true }, "node_modules/merge-stream": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "node_modules/merge2": { "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/meros": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/meros/-/meros-1.3.0.tgz", + "integrity": "sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==", "dev": true, - "license": "MIT", "engines": { "node": ">=13" }, @@ -6944,8 +8315,9 @@ }, "node_modules/micromatch": { "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, - "license": "MIT", "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -6956,16 +8328,18 @@ }, "node_modules/mime-db": { "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, - "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -6975,16 +8349,18 @@ }, "node_modules/mimic-fn": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/minimatch": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -6994,15 +8370,17 @@ }, "node_modules/minimist": { "version": "1.2.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/mlly": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.5.0.tgz", + "integrity": "sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ==", "dev": true, - "license": "MIT", "dependencies": { "acorn": "^8.11.3", "pathe": "^1.1.2", @@ -7012,20 +8390,25 @@ }, "node_modules/ms": { "version": "2.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true }, "node_modules/murmurhash-js": { "version": "1.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz", + "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==" }, "node_modules/mute-stream": { "version": "0.0.8", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true }, "node_modules/nanoid": { "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, "funding": [ { @@ -7033,7 +8416,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -7043,26 +8425,33 @@ }, "node_modules/natural-compare": { "version": "1.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true }, "node_modules/no-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", "dev": true, - "license": "MIT", "dependencies": { "lower-case": "^2.0.2", "tslib": "^2.0.3" } }, "node_modules/node-addon-api": { - "version": "7.0.0", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", + "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", "dev": true, - "license": "MIT" + "engines": { + "node": "^16 || ^18 || >= 20" + } }, "node_modules/node-fetch": { "version": "2.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -7080,15 +8469,18 @@ }, "node_modules/node-fetch/node_modules/tr46": { "version": "0.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/node-fetch/node_modules/webidl-conversions": { "version": "3.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/node-fetch/node_modules/whatwg-url": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -7096,18 +8488,21 @@ }, "node_modules/node-int64": { "version": "0.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true }, "node_modules/node-releases": { "version": "2.0.14", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true }, "node_modules/normalize-path": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==", "dev": true, - "license": "MIT", "dependencies": { "remove-trailing-separator": "^1.0.1" }, @@ -7117,8 +8512,9 @@ }, "node_modules/npm-run-path": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.2.0.tgz", + "integrity": "sha512-W4/tgAXFqFA0iL7fk0+uQ3g7wkL8xJmx3XdK0VGb4cHW//eZTtKGvFBBoRKVTpY7n6ze4NL9ly7rgXcHufqXKg==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^4.0.0" }, @@ -7131,8 +8527,9 @@ }, "node_modules/npm-run-path/node_modules/path-key": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -7142,28 +8539,32 @@ }, "node_modules/nullthrows": { "version": "1.1.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz", + "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==", + "dev": true }, "node_modules/object-assign": { "version": "4.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "engines": { "node": ">=0.10.0" } }, "node_modules/object-inspect": { "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object-is": { "version": "1.1.5", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", + "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -7177,16 +8578,18 @@ }, "node_modules/object-keys": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/object.assign": { "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -7202,8 +8605,9 @@ }, "node_modules/object.entries": { "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.7.tgz", + "integrity": "sha512-jCBs/0plmPsOnrKAfFQXRG2NFjlhZgjjcBLSmTnEhU8U6vVTsVe8ANeQJCHTl3gSsI4J+0emOoCgoKlmQPMgmA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -7215,8 +8619,9 @@ }, "node_modules/object.fromentries": { "version": "2.0.7", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.7.tgz", + "integrity": "sha512-UPbPHML6sL8PI/mOqPwsH4G6iyXcCGzLin8KvEPenOZN5lpCNBZZQ+V62vdjB1mQHrmqGQt5/OJzemUA+KJmEA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -7230,20 +8635,23 @@ } }, "node_modules/object.groupby": { - "version": "1.0.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.2.tgz", + "integrity": "sha512-bzBq58S+x+uo0VjurFT0UktpKHOZmv4/xePiOA1nbB9pMqpGK7rUPNgf+1YC+7mE+0HzhTMqNUuCqvKhj6FnBw==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1" + "array.prototype.filter": "^1.0.3", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0" } }, "node_modules/object.hasown": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.3.tgz", + "integrity": "sha512-fFI4VcYpRHvSLXxP7yiZOMAd331cPfd2p7PFDVbgUsYOfCT3tICVqXWngbjr4m49OvsBwUBQ6O2uQoJvy3RexA==", "dev": true, - "license": "MIT", "dependencies": { "define-properties": "^1.2.0", "es-abstract": "^1.22.1" @@ -7254,8 +8662,9 @@ }, "node_modules/object.values": { "version": "1.1.7", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.7.tgz", + "integrity": "sha512-aU6xnDFYT3x17e/f0IiiwlGPTy2jzMySGfUB4fq6z7CV8l85CWHDk5ErhyhpfDHhrOMwGFhSQkhMGHaIotA6Ng==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -7270,16 +8679,18 @@ }, "node_modules/once": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, - "license": "ISC", "dependencies": { "wrappy": "1" } }, "node_modules/onetime": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, - "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -7292,8 +8703,9 @@ }, "node_modules/optionator": { "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, - "license": "MIT", "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -7308,8 +8720,9 @@ }, "node_modules/ora": { "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, - "license": "MIT", "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -7330,16 +8743,18 @@ }, "node_modules/os-tmpdir": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/p-limit": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -7352,8 +8767,9 @@ }, "node_modules/p-locate": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -7366,8 +8782,9 @@ }, "node_modules/p-map": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, - "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -7380,16 +8797,18 @@ }, "node_modules/p-try": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/param-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", "dev": true, - "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -7397,8 +8816,9 @@ }, "node_modules/parent-module": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, - "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -7408,8 +8828,9 @@ }, "node_modules/parse-filepath": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", "dev": true, - "license": "MIT", "dependencies": { "is-absolute": "^1.0.0", "map-cache": "^0.2.0", @@ -7421,8 +8842,9 @@ }, "node_modules/parse-json": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -7438,8 +8860,9 @@ }, "node_modules/parse5": { "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", "dev": true, - "license": "MIT", "dependencies": { "entities": "^4.4.0" }, @@ -7449,8 +8872,9 @@ }, "node_modules/pascal-case": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" @@ -7458,8 +8882,9 @@ }, "node_modules/path-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", + "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", "dev": true, - "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -7467,37 +8892,42 @@ }, "node_modules/path-exists": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-is-absolute": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-key": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-parse": { "version": "1.0.7", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true }, "node_modules/path-root": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", "dev": true, - "license": "MIT", "dependencies": { "path-root-regex": "^0.1.0" }, @@ -7507,36 +8937,41 @@ }, "node_modules/path-root-regex": { "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-type": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/pathe": { "version": "1.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true }, "node_modules/pathval": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true, - "license": "MIT", "engines": { "node": "*" } }, "node_modules/pbf": { "version": "3.2.1", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", + "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", "dependencies": { "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" @@ -7547,13 +8982,15 @@ }, "node_modules/picocolors": { "version": "1.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, @@ -7563,8 +9000,9 @@ }, "node_modules/pkg-types": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz", + "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==", "dev": true, - "license": "MIT", "dependencies": { "jsonc-parser": "^3.2.0", "mlly": "^1.2.0", @@ -7572,7 +9010,9 @@ } }, "node_modules/postcss": { - "version": "8.4.33", + "version": "8.4.35", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", + "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", "dev": true, "funding": [ { @@ -7588,7 +9028,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", @@ -7600,20 +9039,23 @@ }, "node_modules/potpack": { "version": "2.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz", + "integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==" }, "node_modules/prelude-ls": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8.0" } }, "node_modules/prettier": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz", + "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==", "dev": true, - "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -7626,8 +9068,9 @@ }, "node_modules/pretty-format": { "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -7639,8 +9082,9 @@ }, "node_modules/pretty-format/node_modules/ansi-styles": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -7650,15 +9094,17 @@ }, "node_modules/promise": { "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dev": true, - "license": "MIT", "dependencies": { "asap": "~2.0.3" } }, "node_modules/prop-types": { "version": "15.8.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -7667,7 +9113,8 @@ }, "node_modules/prop-types-extra": { "version": "1.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz", + "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", "dependencies": { "react-is": "^16.3.2", "warning": "^4.0.0" @@ -7678,49 +9125,59 @@ }, "node_modules/prop-types-extra/node_modules/react-is": { "version": "16.13.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/protocol-buffers-schema": { "version": "3.6.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz", + "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==" }, "node_modules/psl": { "version": "1.9.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true }, "node_modules/punycode": { "version": "1.4.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "dev": true }, "node_modules/pvtsutils": { "version": "1.3.5", + "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.5.tgz", + "integrity": "sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.6.1" } }, "node_modules/pvutils": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz", + "integrity": "sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/querystringify": { "version": "2.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true }, "node_modules/queue-microtask": { "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, "funding": [ { @@ -7735,16 +9192,17 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/quickselect": { "version": "2.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz", + "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==" }, "node_modules/react": { "version": "18.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "dependencies": { "loose-envify": "^1.1.0" }, @@ -7754,7 +9212,8 @@ }, "node_modules/react-bootstrap": { "version": "2.8.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.8.0.tgz", + "integrity": "sha512-e/aNtxl0Z2ozrIaR82jr6Zz7ss9GSoaXpQaxmvtDUsTZIq/XalkduR/ZXP6vbQHz2T4syvjA+4FbtwELxxmpww==", "dependencies": { "@babel/runtime": "^7.21.0", "@restart/hooks": "^0.4.9", @@ -7782,7 +9241,8 @@ }, "node_modules/react-dom": { "version": "18.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -7793,16 +9253,19 @@ }, "node_modules/react-is": { "version": "17.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true }, "node_modules/react-lifecycles-compat": { "version": "3.0.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "node_modules/react-map-gl": { "version": "7.1.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.5.tgz", + "integrity": "sha512-YS2u2cSLlZVGjfa394f0snO6f6ZwZVTKqQwjbq/jj0w7fHU01Mn+Xqvm/Qr7nZChoT3OG7kh8JluDcXeBrDG/g==", "dependencies": { "@maplibre/maplibre-gl-style-spec": "^19.2.1", "@types/mapbox-gl": ">=1.0.0" @@ -7824,15 +9287,17 @@ }, "node_modules/react-refresh": { "version": "0.14.0", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", + "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/react-transition-group": { "version": "4.4.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -7846,8 +9311,9 @@ }, "node_modules/readable-stream": { "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, - "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -7858,14 +9324,16 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.4", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.5.tgz", + "integrity": "sha512-62wgfC8dJWrmxv44CA36pLDnP6KKl3Vhxb7PL+8+qrrFMMoJij4vgiMP8zV4O8+CBMXY1mHxI5fITGHXFHVmQQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.5", + "define-properties": "^1.2.1", + "es-abstract": "^1.22.3", + "es-errors": "^1.0.0", + "get-intrinsic": "^1.2.3", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" }, @@ -7878,16 +9346,19 @@ }, "node_modules/regenerator-runtime": { "version": "0.14.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "node_modules/regexp.prototype.flags": { - "version": "1.5.1", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "set-function-name": "^2.0.0" + "call-bind": "^1.0.6", + "define-properties": "^1.2.1", + "es-errors": "^1.3.0", + "set-function-name": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -7898,8 +9369,9 @@ }, "node_modules/relay-runtime": { "version": "12.0.0", + "resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-12.0.0.tgz", + "integrity": "sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==", "dev": true, - "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", "fbjs": "^3.0.0", @@ -7908,52 +9380,60 @@ }, "node_modules/remedial": { "version": "1.0.8", + "resolved": "https://registry.npmjs.org/remedial/-/remedial-1.0.8.tgz", + "integrity": "sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==", "dev": true, - "license": "(MIT OR Apache-2.0)", "engines": { "node": "*" } }, "node_modules/remove-trailing-separator": { "version": "1.1.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", + "dev": true }, "node_modules/remove-trailing-spaces": { "version": "1.0.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz", + "integrity": "sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==", + "dev": true }, "node_modules/require-directory": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/require-from-string": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/require-main-filename": { "version": "2.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true }, "node_modules/requires-port": { "version": "1.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true }, "node_modules/resolve": { "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, - "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -7968,23 +9448,26 @@ }, "node_modules/resolve-from": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/resolve-protobuf-schema": { "version": "2.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz", + "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==", "dependencies": { "protocol-buffers-schema": "^3.3.1" } }, "node_modules/restore-cursor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, - "license": "MIT", "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -7995,22 +9478,25 @@ }, "node_modules/reusify": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, - "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" } }, "node_modules/rfdc": { - "version": "1.3.0", - "dev": true, - "license": "MIT" + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", + "dev": true }, "node_modules/rimraf": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, - "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -8023,8 +9509,9 @@ }, "node_modules/rollup": { "version": "3.29.4", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", + "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", "dev": true, - "license": "MIT", "bin": { "rollup": "dist/bin/rollup" }, @@ -8038,19 +9525,23 @@ }, "node_modules/rrweb-cssom": { "version": "0.6.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", + "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", + "dev": true }, "node_modules/run-async": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/run-parallel": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "funding": [ { @@ -8066,30 +9557,32 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/rw": { "version": "1.3.3", - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==" }, "node_modules/rxjs": { "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/safe-array-concat": { - "version": "1.0.1", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.0.tgz", + "integrity": "sha512-ZdQ0Jeb9Ofti4hbt5lX3T2JcAamT9hfzYU1MNB+z/jaEbB6wfFfPIR/zEORmZqobkCCJhSjodobH6WHNmJ97dg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.5", + "get-intrinsic": "^1.2.2", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -8102,6 +9595,8 @@ }, "node_modules/safe-buffer": { "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true, "funding": [ { @@ -8116,16 +9611,16 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/safe-regex-test": { - "version": "1.0.2", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", - "get-intrinsic": "^1.2.2", + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", "is-regex": "^1.1.4" }, "engines": { @@ -8137,13 +9632,15 @@ }, "node_modules/safer-buffer": { "version": "2.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "node_modules/saxes": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", "dev": true, - "license": "ISC", "dependencies": { "xmlchars": "^2.2.0" }, @@ -8153,28 +9650,32 @@ }, "node_modules/scheduler": { "version": "0.23.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", "dependencies": { "loose-envify": "^1.1.0" } }, "node_modules/scuid": { "version": "1.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/scuid/-/scuid-1.1.0.tgz", + "integrity": "sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==", + "dev": true }, "node_modules/semver": { "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/sentence-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", + "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -8183,18 +9684,22 @@ }, "node_modules/set-blocking": { "version": "2.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "dev": true }, "node_modules/set-function-length": { - "version": "1.1.1", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", + "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", "dev": true, - "license": "MIT", "dependencies": { - "define-data-property": "^1.1.1", - "get-intrinsic": "^1.2.1", + "define-data-property": "^1.1.2", + "es-errors": "^1.3.0", + "function-bind": "^1.1.2", + "get-intrinsic": "^1.2.3", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -8202,8 +9707,9 @@ }, "node_modules/set-function-name": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.1.tgz", + "integrity": "sha512-tMNCiqYVkXIZgc2Hnoy2IvC/f8ezc5koaRFkCjrpWzGpCd3qbZXPzVy9MAZzK1ch/X0jvSkojys3oqJN0qCmdA==", "dev": true, - "license": "MIT", "dependencies": { "define-data-property": "^1.0.1", "functions-have-names": "^1.2.3", @@ -8215,7 +9721,8 @@ }, "node_modules/set-value": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -8228,13 +9735,15 @@ }, "node_modules/setimmediate": { "version": "1.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true }, "node_modules/shebang-command": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -8244,28 +9753,35 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/shell-quote": { "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/side-channel": { - "version": "1.0.4", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.5.tgz", + "integrity": "sha512-QcgiIWV4WV7qWExbN5llt6frQB/lBven9pqliLXfGPB+K9ZYXxDozp0wLkHS24kWCm+6YXH/f0HhnObZnZOBnQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.0", - "get-intrinsic": "^1.0.2", - "object-inspect": "^1.9.0" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", + "object-inspect": "^1.13.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8273,31 +9789,36 @@ }, "node_modules/siginfo": { "version": "2.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true }, "node_modules/signal-exit": { "version": "3.0.7", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true }, "node_modules/signedsource": { "version": "1.0.0", - "dev": true, - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/signedsource/-/signedsource-1.0.0.tgz", + "integrity": "sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==", + "dev": true }, "node_modules/slash": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/slice-ansi": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -8309,8 +9830,9 @@ }, "node_modules/snake-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", "dev": true, - "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -8318,21 +9840,24 @@ }, "node_modules/sort-asc": { "version": "0.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz", + "integrity": "sha512-umMGhjPeHAI6YjABoSTrFp2zaBtXBej1a0yKkuMUyjjqu6FJsTF+JYwCswWDg+zJfk/5npWUUbd33HH/WLzpaA==", "engines": { "node": ">=0.10.0" } }, "node_modules/sort-desc": { "version": "0.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.2.0.tgz", + "integrity": "sha512-NqZqyvL4VPW+RAxxXnB8gvE1kyikh8+pR+T+CXLksVRN9eiQqkQlPwqWYU0mF9Jm7UnctShlxLyAt1CaBOTL1w==", "engines": { "node": ">=0.10.0" } }, "node_modules/sort-object": { "version": "3.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-3.0.3.tgz", + "integrity": "sha512-nK7WOY8jik6zaG9CRwZTaD5O7ETWDLZYMM12pqY8htll+7dYeqGfEUPcUBHOpSJg2vJOrvFIY2Dl5cX2ih1hAQ==", "dependencies": { "bytewise": "^1.1.0", "get-value": "^2.0.2", @@ -8347,23 +9872,26 @@ }, "node_modules/source-map": { "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/source-map-js": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", + "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/split-string": { "version": "3.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dependencies": { "extend-shallow": "^3.0.0" }, @@ -8373,7 +9901,8 @@ }, "node_modules/split-string/node_modules/extend-shallow": { "version": "3.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -8384,7 +9913,8 @@ }, "node_modules/split-string/node_modules/is-extendable": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dependencies": { "is-plain-object": "^2.0.4" }, @@ -8394,26 +9924,30 @@ }, "node_modules/sponge-case": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sponge-case/-/sponge-case-1.0.1.tgz", + "integrity": "sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/stackback": { "version": "0.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true }, "node_modules/std-env": { "version": "3.7.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz", + "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==", + "dev": true }, "node_modules/stop-iteration-iterator": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", "dev": true, - "license": "MIT", "dependencies": { "internal-slot": "^1.0.4" }, @@ -8423,6 +9957,8 @@ }, "node_modules/streamsearch": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "dev": true, "engines": { "node": ">=10.0.0" @@ -8430,21 +9966,24 @@ }, "node_modules/string_decoder": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, - "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } }, "node_modules/string-env-interpolation": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz", + "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==", + "dev": true }, "node_modules/string-width": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -8456,13 +9995,15 @@ }, "node_modules/string-width/node_modules/emoji-regex": { "version": "8.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "node_modules/string.prototype.matchall": { "version": "4.0.10", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.10.tgz", + "integrity": "sha512-rGXbGmOEosIQi6Qva94HUjgPs9vKW+dkG7Y8Q5O2OYkWL6wFaTRZO8zM4mhP94uX55wgyrXzfS2aGtGzUL7EJQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8480,8 +10021,9 @@ }, "node_modules/string.prototype.trim": { "version": "1.2.8", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.8.tgz", + "integrity": "sha512-lfjY4HcixfQXOfaqCvcBuOIapyaroTXhbkfJN3gcB1OtyupngWK4sEET9Knd0cXd28kTUqu/kHoV4HKSJdnjiQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8496,8 +10038,9 @@ }, "node_modules/string.prototype.trimend": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.7.tgz", + "integrity": "sha512-Ni79DqeB72ZFq1uH/L6zJ+DKZTkOtPIHovb3YZHQViE+HDouuU4mBrLOLDn5Dde3RF8qw5qVETEjhu9locMLvA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8509,8 +10052,9 @@ }, "node_modules/string.prototype.trimstart": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.7.tgz", + "integrity": "sha512-NGhtDFu3jCEm7B4Fy0DpLewdJQOZcQ0rGbwQ/+stjnrp2i+rlKeCvos9hOIeCmqwratM47OBxY7uFZzjxHXmrg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -8522,8 +10066,9 @@ }, "node_modules/strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -8533,16 +10078,18 @@ }, "node_modules/strip-bom": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/strip-final-newline": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -8552,8 +10099,9 @@ }, "node_modules/strip-json-comments": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -8563,8 +10111,9 @@ }, "node_modules/strip-literal": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz", + "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==", "dev": true, - "license": "MIT", "dependencies": { "acorn": "^8.10.0" }, @@ -8574,15 +10123,17 @@ }, "node_modules/supercluster": { "version": "8.0.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz", + "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==", "dependencies": { "kdbush": "^4.0.2" } }, "node_modules/supports-color": { "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -8592,8 +10143,9 @@ }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -8603,21 +10155,24 @@ }, "node_modules/swap-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-2.0.2.tgz", + "integrity": "sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/symbol-tree": { "version": "3.2.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true }, "node_modules/test-exclude": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, - "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -8629,51 +10184,59 @@ }, "node_modules/text-table": { "version": "0.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "node_modules/through": { "version": "2.3.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true }, "node_modules/tinybench": { - "version": "2.5.1", - "dev": true, - "license": "MIT" + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.6.0.tgz", + "integrity": "sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==", + "dev": true }, "node_modules/tinypool": { - "version": "0.8.1", + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.2.tgz", + "integrity": "sha512-SUszKYe5wgsxnNOVlBYO6IC+8VGWdVGZWAqUxp3UErNBtptZvWbwyUOyzNL59zigz2rCA92QiL3wvG+JDSdJdQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/tinyqueue": { "version": "2.0.3", - "license": "ISC" + "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", + "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" }, "node_modules/tinyspy": { - "version": "2.2.0", + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz", + "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==", "dev": true, - "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/title-case": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz", + "integrity": "sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/tmp": { "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, - "license": "MIT", "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -8683,16 +10246,18 @@ }, "node_modules/to-fast-properties": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -8702,8 +10267,9 @@ }, "node_modules/tough-cookie": { "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", @@ -8716,16 +10282,18 @@ }, "node_modules/tough-cookie/node_modules/punycode": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/tr46": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", + "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", "dev": true, - "license": "MIT", "dependencies": { "punycode": "^2.3.1" }, @@ -8735,18 +10303,20 @@ }, "node_modules/tr46/node_modules/punycode": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/ts-api-utils": { - "version": "1.0.3", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.2.1.tgz", + "integrity": "sha512-RIYA36cJn2WiH9Hy77hdF9r7oEwxAtB/TS9/S4Qd90Ap4z5FSiin5zEiTL44OII1Y3IIlEvxwxFUVgrHSZ/UpA==", "dev": true, - "license": "MIT", "engines": { - "node": ">=16.13.0" + "node": ">=16" }, "peerDependencies": { "typescript": ">=4.2.0" @@ -8754,13 +10324,15 @@ }, "node_modules/ts-log": { "version": "2.2.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ts-log/-/ts-log-2.2.5.tgz", + "integrity": "sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==", + "dev": true }, "node_modules/tsconfig-paths": { "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, - "license": "MIT", "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", @@ -8770,8 +10342,9 @@ }, "node_modules/tsconfig-paths/node_modules/json5": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, - "license": "MIT", "dependencies": { "minimist": "^1.2.0" }, @@ -8781,12 +10354,14 @@ }, "node_modules/tslib": { "version": "2.6.2", - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/type-check": { "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -8796,16 +10371,18 @@ }, "node_modules/type-detect": { "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/type-fest": { "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -8814,13 +10391,14 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.1.tgz", + "integrity": "sha512-RSqu1UEuSlrBhHTWC8O9FnPjOduNs4M7rJ4pRKoEjtx1zUNOPN2sSXHLDX+Y2WPbHIxbvg4JFo2DNAEfPIKWoQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1", - "is-typed-array": "^1.1.10" + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -8828,8 +10406,9 @@ }, "node_modules/typed-array-byte-length": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.0.tgz", + "integrity": "sha512-Or/+kvLxNpeQ9DtSydonMxCx+9ZXOswtwJn17SNLvhptaXYDJvkFFP5zbfU/uLmvnBJlI4yrnXRxpdWH/M5tNA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "for-each": "^0.3.3", @@ -8845,8 +10424,9 @@ }, "node_modules/typed-array-byte-offset": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.0.tgz", + "integrity": "sha512-RD97prjEt9EL8YgAgpOkf3O4IF9lhJFr9g0htQkm0rchFp/Vx7LW5Q8fSXXub7BXAODyUQohRMyOc3faCPd0hg==", "dev": true, - "license": "MIT", "dependencies": { "available-typed-arrays": "^1.0.5", "call-bind": "^1.0.2", @@ -8863,8 +10443,9 @@ }, "node_modules/typed-array-length": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.4.tgz", + "integrity": "sha512-KjZypGq+I/H7HI5HlOoGHkWUUGq+Q0TPhQurLbyrVrvnKTBgzLhIJ7j6J/XTQOi0d1RjyZ0wdas8bKs2p0x3Ng==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "for-each": "^0.3.3", @@ -8876,8 +10457,9 @@ }, "node_modules/typescript": { "version": "5.2.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz", + "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", "dev": true, - "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -8888,17 +10470,21 @@ }, "node_modules/typewise": { "version": "1.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz", + "integrity": "sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ==", "dependencies": { "typewise-core": "^1.2.0" } }, "node_modules/typewise-core": { "version": "1.2.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz", + "integrity": "sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg==" }, "node_modules/ua-parser-js": { "version": "1.0.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz", + "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==", "dev": true, "funding": [ { @@ -8914,20 +10500,21 @@ "url": "https://github.com/sponsors/faisalman" } ], - "license": "MIT", "engines": { "node": "*" } }, "node_modules/ufo": { - "version": "1.3.2", - "dev": true, - "license": "MIT" + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.4.0.tgz", + "integrity": "sha512-Hhy+BhRBleFjpJ2vchUNN40qgkh0366FWJGqVLYBHev0vpHTrXSA0ryT+74UiW6KWsldNurQMKGqCm1M2zBciQ==", + "dev": true }, "node_modules/unbox-primitive": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-bigints": "^1.0.2", @@ -8940,15 +10527,17 @@ }, "node_modules/unc-path-regex": { "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/uncontrollable": { "version": "7.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz", + "integrity": "sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==", "dependencies": { "@babel/runtime": "^7.6.3", "@types/react": ">=16.9.11", @@ -8961,12 +10550,14 @@ }, "node_modules/undici-types": { "version": "5.26.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true }, "node_modules/union-value": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -8979,16 +10570,18 @@ }, "node_modules/universalify": { "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4.0.0" } }, "node_modules/unixify": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz", + "integrity": "sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==", "dev": true, - "license": "MIT", "dependencies": { "normalize-path": "^2.1.1" }, @@ -8998,6 +10591,8 @@ }, "node_modules/update-browserslist-db": { "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -9013,7 +10608,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -9027,40 +10621,45 @@ }, "node_modules/upper-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", + "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/upper-case-first": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", + "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/uri-js": { "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } }, "node_modules/uri-js/node_modules/punycode": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/url-parse": { "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "dev": true, - "license": "MIT", "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -9068,18 +10667,21 @@ }, "node_modules/urlpattern-polyfill": { "version": "8.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz", + "integrity": "sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==", + "dev": true }, "node_modules/util-deprecate": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true }, "node_modules/v8-to-istanbul": { "version": "9.2.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", + "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==", "dev": true, - "license": "ISC", "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", @@ -9091,16 +10693,18 @@ }, "node_modules/value-or-promise": { "version": "1.0.12", + "resolved": "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.12.tgz", + "integrity": "sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" } }, "node_modules/vite": { "version": "4.4.9", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", + "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.18.10", "postcss": "^8.4.27", @@ -9153,45 +10757,384 @@ }, "node_modules/vite-node": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.1.3.tgz", + "integrity": "sha512-BLSO72YAkIUuNrOx+8uznYICJfTEbvBAmWClY3hpath5+h1mbPS5OMn42lrTxXuyCazVyZoDkSRnju78GiVCqA==", + "dev": true, + "dependencies": { + "cac": "^6.7.14", + "debug": "^4.3.4", + "pathe": "^1.1.1", + "picocolors": "^1.0.0", + "vite": "^5.0.0" + }, + "bin": { + "vite-node": "vite-node.mjs" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/vite-node/node_modules/@esbuild/android-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", + "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/android-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", + "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/android-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", + "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/darwin-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", + "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/darwin-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", + "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/freebsd-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", + "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/freebsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", + "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", + "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", + "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", + "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-loong64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", + "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-mips64el": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", + "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", + "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-riscv64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", + "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-s390x": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", + "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/linux-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", + "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/netbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", + "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/openbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", + "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/sunos-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", + "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/win32-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", + "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vite-node/node_modules/@esbuild/win32-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", + "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MIT", - "dependencies": { - "cac": "^6.7.14", - "debug": "^4.3.4", - "pathe": "^1.1.1", - "picocolors": "^1.0.0", - "vite": "^5.0.0" - }, - "bin": { - "vite-node": "vite-node.mjs" - }, + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://opencollective.com/vitest" + "node": ">=12" } }, - "node_modules/vite-node/node_modules/@esbuild/darwin-x64": { - "version": "0.19.11", + "node_modules/vite-node/node_modules/@esbuild/win32-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", + "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", "cpu": [ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">=12" } }, "node_modules/vite-node/node_modules/esbuild": { - "version": "0.19.11", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", + "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", "dev": true, "hasInstallScript": true, - "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -9199,35 +11142,36 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.11", - "@esbuild/android-arm": "0.19.11", - "@esbuild/android-arm64": "0.19.11", - "@esbuild/android-x64": "0.19.11", - "@esbuild/darwin-arm64": "0.19.11", - "@esbuild/darwin-x64": "0.19.11", - "@esbuild/freebsd-arm64": "0.19.11", - "@esbuild/freebsd-x64": "0.19.11", - "@esbuild/linux-arm": "0.19.11", - "@esbuild/linux-arm64": "0.19.11", - "@esbuild/linux-ia32": "0.19.11", - "@esbuild/linux-loong64": "0.19.11", - "@esbuild/linux-mips64el": "0.19.11", - "@esbuild/linux-ppc64": "0.19.11", - "@esbuild/linux-riscv64": "0.19.11", - "@esbuild/linux-s390x": "0.19.11", - "@esbuild/linux-x64": "0.19.11", - "@esbuild/netbsd-x64": "0.19.11", - "@esbuild/openbsd-x64": "0.19.11", - "@esbuild/sunos-x64": "0.19.11", - "@esbuild/win32-arm64": "0.19.11", - "@esbuild/win32-ia32": "0.19.11", - "@esbuild/win32-x64": "0.19.11" + "@esbuild/aix-ppc64": "0.19.12", + "@esbuild/android-arm": "0.19.12", + "@esbuild/android-arm64": "0.19.12", + "@esbuild/android-x64": "0.19.12", + "@esbuild/darwin-arm64": "0.19.12", + "@esbuild/darwin-x64": "0.19.12", + "@esbuild/freebsd-arm64": "0.19.12", + "@esbuild/freebsd-x64": "0.19.12", + "@esbuild/linux-arm": "0.19.12", + "@esbuild/linux-arm64": "0.19.12", + "@esbuild/linux-ia32": "0.19.12", + "@esbuild/linux-loong64": "0.19.12", + "@esbuild/linux-mips64el": "0.19.12", + "@esbuild/linux-ppc64": "0.19.12", + "@esbuild/linux-riscv64": "0.19.12", + "@esbuild/linux-s390x": "0.19.12", + "@esbuild/linux-x64": "0.19.12", + "@esbuild/netbsd-x64": "0.19.12", + "@esbuild/openbsd-x64": "0.19.12", + "@esbuild/sunos-x64": "0.19.12", + "@esbuild/win32-arm64": "0.19.12", + "@esbuild/win32-ia32": "0.19.12", + "@esbuild/win32-x64": "0.19.12" } }, "node_modules/vite-node/node_modules/rollup": { - "version": "4.9.5", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.10.0.tgz", + "integrity": "sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==", "dev": true, - "license": "MIT", "dependencies": { "@types/estree": "1.0.5" }, @@ -9239,29 +11183,30 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.9.5", - "@rollup/rollup-android-arm64": "4.9.5", - "@rollup/rollup-darwin-arm64": "4.9.5", - "@rollup/rollup-darwin-x64": "4.9.5", - "@rollup/rollup-linux-arm-gnueabihf": "4.9.5", - "@rollup/rollup-linux-arm64-gnu": "4.9.5", - "@rollup/rollup-linux-arm64-musl": "4.9.5", - "@rollup/rollup-linux-riscv64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-musl": "4.9.5", - "@rollup/rollup-win32-arm64-msvc": "4.9.5", - "@rollup/rollup-win32-ia32-msvc": "4.9.5", - "@rollup/rollup-win32-x64-msvc": "4.9.5", + "@rollup/rollup-android-arm-eabi": "4.10.0", + "@rollup/rollup-android-arm64": "4.10.0", + "@rollup/rollup-darwin-arm64": "4.10.0", + "@rollup/rollup-darwin-x64": "4.10.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.10.0", + "@rollup/rollup-linux-arm64-gnu": "4.10.0", + "@rollup/rollup-linux-arm64-musl": "4.10.0", + "@rollup/rollup-linux-riscv64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-musl": "4.10.0", + "@rollup/rollup-win32-arm64-msvc": "4.10.0", + "@rollup/rollup-win32-ia32-msvc": "4.10.0", + "@rollup/rollup-win32-x64-msvc": "4.10.0", "fsevents": "~2.3.2" } }, "node_modules/vite-node/node_modules/vite": { - "version": "5.0.11", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.1.tgz", + "integrity": "sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.19.3", - "postcss": "^8.4.32", + "postcss": "^8.4.35", "rollup": "^4.2.0" }, "bin": { @@ -9311,8 +11256,9 @@ }, "node_modules/vitest": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.1.3.tgz", + "integrity": "sha512-2l8om1NOkiA90/Y207PsEvJLYygddsOyr81wLQ20Ra8IlLKbyQncWsGZjnbkyG2KwwuTXLQjEPOJuxGMG8qJBQ==", "dev": true, - "license": "MIT", "dependencies": { "@vitest/expect": "1.1.3", "@vitest/runner": "1.1.3", @@ -9374,13 +11320,78 @@ } } }, + "node_modules/vitest/node_modules/@esbuild/android-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", + "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/android-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", + "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/android-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", + "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/darwin-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", + "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/vitest/node_modules/@esbuild/darwin-x64": { - "version": "0.19.11", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", + "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", "cpu": [ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ "darwin" @@ -9389,11 +11400,284 @@ "node": ">=12" } }, + "node_modules/vitest/node_modules/@esbuild/freebsd-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", + "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/freebsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", + "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-arm": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", + "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", + "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", + "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-loong64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", + "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-mips64el": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", + "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-ppc64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", + "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-riscv64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", + "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-s390x": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", + "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/linux-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", + "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/netbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", + "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/openbsd-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", + "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/sunos-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", + "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/win32-arm64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", + "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/win32-ia32": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", + "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/vitest/node_modules/@esbuild/win32-x64": { + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", + "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, "node_modules/vitest/node_modules/esbuild": { - "version": "0.19.11", + "version": "0.19.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", + "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", "dev": true, "hasInstallScript": true, - "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -9401,35 +11685,36 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.11", - "@esbuild/android-arm": "0.19.11", - "@esbuild/android-arm64": "0.19.11", - "@esbuild/android-x64": "0.19.11", - "@esbuild/darwin-arm64": "0.19.11", - "@esbuild/darwin-x64": "0.19.11", - "@esbuild/freebsd-arm64": "0.19.11", - "@esbuild/freebsd-x64": "0.19.11", - "@esbuild/linux-arm": "0.19.11", - "@esbuild/linux-arm64": "0.19.11", - "@esbuild/linux-ia32": "0.19.11", - "@esbuild/linux-loong64": "0.19.11", - "@esbuild/linux-mips64el": "0.19.11", - "@esbuild/linux-ppc64": "0.19.11", - "@esbuild/linux-riscv64": "0.19.11", - "@esbuild/linux-s390x": "0.19.11", - "@esbuild/linux-x64": "0.19.11", - "@esbuild/netbsd-x64": "0.19.11", - "@esbuild/openbsd-x64": "0.19.11", - "@esbuild/sunos-x64": "0.19.11", - "@esbuild/win32-arm64": "0.19.11", - "@esbuild/win32-ia32": "0.19.11", - "@esbuild/win32-x64": "0.19.11" + "@esbuild/aix-ppc64": "0.19.12", + "@esbuild/android-arm": "0.19.12", + "@esbuild/android-arm64": "0.19.12", + "@esbuild/android-x64": "0.19.12", + "@esbuild/darwin-arm64": "0.19.12", + "@esbuild/darwin-x64": "0.19.12", + "@esbuild/freebsd-arm64": "0.19.12", + "@esbuild/freebsd-x64": "0.19.12", + "@esbuild/linux-arm": "0.19.12", + "@esbuild/linux-arm64": "0.19.12", + "@esbuild/linux-ia32": "0.19.12", + "@esbuild/linux-loong64": "0.19.12", + "@esbuild/linux-mips64el": "0.19.12", + "@esbuild/linux-ppc64": "0.19.12", + "@esbuild/linux-riscv64": "0.19.12", + "@esbuild/linux-s390x": "0.19.12", + "@esbuild/linux-x64": "0.19.12", + "@esbuild/netbsd-x64": "0.19.12", + "@esbuild/openbsd-x64": "0.19.12", + "@esbuild/sunos-x64": "0.19.12", + "@esbuild/win32-arm64": "0.19.12", + "@esbuild/win32-ia32": "0.19.12", + "@esbuild/win32-x64": "0.19.12" } }, "node_modules/vitest/node_modules/rollup": { - "version": "4.9.5", + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.10.0.tgz", + "integrity": "sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==", "dev": true, - "license": "MIT", "dependencies": { "@types/estree": "1.0.5" }, @@ -9441,29 +11726,30 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.9.5", - "@rollup/rollup-android-arm64": "4.9.5", - "@rollup/rollup-darwin-arm64": "4.9.5", - "@rollup/rollup-darwin-x64": "4.9.5", - "@rollup/rollup-linux-arm-gnueabihf": "4.9.5", - "@rollup/rollup-linux-arm64-gnu": "4.9.5", - "@rollup/rollup-linux-arm64-musl": "4.9.5", - "@rollup/rollup-linux-riscv64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-gnu": "4.9.5", - "@rollup/rollup-linux-x64-musl": "4.9.5", - "@rollup/rollup-win32-arm64-msvc": "4.9.5", - "@rollup/rollup-win32-ia32-msvc": "4.9.5", - "@rollup/rollup-win32-x64-msvc": "4.9.5", + "@rollup/rollup-android-arm-eabi": "4.10.0", + "@rollup/rollup-android-arm64": "4.10.0", + "@rollup/rollup-darwin-arm64": "4.10.0", + "@rollup/rollup-darwin-x64": "4.10.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.10.0", + "@rollup/rollup-linux-arm64-gnu": "4.10.0", + "@rollup/rollup-linux-arm64-musl": "4.10.0", + "@rollup/rollup-linux-riscv64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-gnu": "4.10.0", + "@rollup/rollup-linux-x64-musl": "4.10.0", + "@rollup/rollup-win32-arm64-msvc": "4.10.0", + "@rollup/rollup-win32-ia32-msvc": "4.10.0", + "@rollup/rollup-win32-x64-msvc": "4.10.0", "fsevents": "~2.3.2" } }, "node_modules/vitest/node_modules/vite": { - "version": "5.0.11", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.1.tgz", + "integrity": "sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.19.3", - "postcss": "^8.4.32", + "postcss": "^8.4.35", "rollup": "^4.2.0" }, "bin": { @@ -9513,7 +11799,8 @@ }, "node_modules/vt-pbf": { "version": "3.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", + "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==", "dependencies": { "@mapbox/point-geometry": "0.1.0", "@mapbox/vector-tile": "^1.3.1", @@ -9522,8 +11809,9 @@ }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", "dev": true, - "license": "MIT", "dependencies": { "xml-name-validator": "^5.0.0" }, @@ -9533,51 +11821,57 @@ }, "node_modules/warning": { "version": "4.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "dependencies": { "loose-envify": "^1.0.0" } }, "node_modules/wcwidth": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", "dev": true, - "license": "MIT", "dependencies": { "defaults": "^1.0.3" } }, "node_modules/web-streams-polyfill": { "version": "3.3.2", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.2.tgz", + "integrity": "sha512-3pRGuxRF5gpuZc0W+EpwQRmCD7gRqcDOMt688KmdlDAgAyaB1XlN0zq2njfDNm44XVdIouE7pZ6GzbdyH47uIQ==", "dev": true, - "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/webcrypto-core": { - "version": "1.7.7", + "version": "1.7.8", + "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.8.tgz", + "integrity": "sha512-eBR98r9nQXTqXt/yDRtInszPMjTaSAMJAFDg2AHsgrnczawT1asx9YNBX6k5p+MekbPF4+s/UJJrr88zsTqkSg==", "dev": true, - "license": "MIT", "dependencies": { - "@peculiar/asn1-schema": "^2.3.6", + "@peculiar/asn1-schema": "^2.3.8", "@peculiar/json-schema": "^1.1.12", "asn1js": "^3.0.1", - "pvtsutils": "^1.3.2", - "tslib": "^2.4.0" + "pvtsutils": "^1.3.5", + "tslib": "^2.6.2" } }, "node_modules/webidl-conversions": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=12" } }, "node_modules/whatwg-encoding": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", "dev": true, - "license": "MIT", "dependencies": { "iconv-lite": "0.6.3" }, @@ -9587,8 +11881,9 @@ }, "node_modules/whatwg-encoding/node_modules/iconv-lite": { "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -9598,16 +11893,18 @@ }, "node_modules/whatwg-mimetype": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", "dev": true, - "license": "MIT", "engines": { "node": ">=18" } }, "node_modules/whatwg-url": { "version": "14.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", + "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", "dev": true, - "license": "MIT", "dependencies": { "tr46": "^5.0.0", "webidl-conversions": "^7.0.0" @@ -9618,8 +11915,9 @@ }, "node_modules/which": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, - "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -9632,8 +11930,9 @@ }, "node_modules/which-boxed-primitive": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, - "license": "MIT", "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -9647,8 +11946,9 @@ }, "node_modules/which-builtin-type": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", "dev": true, - "license": "MIT", "dependencies": { "function.prototype.name": "^1.1.5", "has-tostringtag": "^1.0.0", @@ -9672,8 +11972,9 @@ }, "node_modules/which-collection": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.1.tgz", + "integrity": "sha512-W8xeTUwaln8i3K/cY1nGXzdnVZlidBcagyNFtBdD5kxnb4TvGKR7FfSIS3mYpwWS1QUCutfKz8IY8RjftB0+1A==", "dev": true, - "license": "MIT", "dependencies": { "is-map": "^2.0.1", "is-set": "^2.0.1", @@ -9686,19 +11987,21 @@ }, "node_modules/which-module": { "version": "2.0.1", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "dev": true }, "node_modules/which-typed-array": { - "version": "1.1.13", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.14.tgz", + "integrity": "sha512-VnXFiIW8yNn9kIHN88xvZ4yOWchftKDsRJ8fEPacX/wl1lOvBrhsJ/OeJCXq7B0AaijRuqgzSKalJoPk+D8MPg==", "dev": true, - "license": "MIT", "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.4", + "available-typed-arrays": "^1.0.6", + "call-bind": "^1.0.5", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.0" + "has-tostringtag": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -9709,8 +12012,9 @@ }, "node_modules/why-is-node-running": { "version": "2.2.2", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", + "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==", "dev": true, - "license": "MIT", "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" @@ -9724,8 +12028,9 @@ }, "node_modules/wrap-ansi": { "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -9737,13 +12042,15 @@ }, "node_modules/wrappy": { "version": "1.0.2", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true }, "node_modules/ws": { "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -9762,47 +12069,54 @@ }, "node_modules/xml-name-validator": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=18" } }, "node_modules/xmlchars": { "version": "2.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true }, "node_modules/y18n": { "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, - "license": "ISC", "engines": { "node": ">=10" } }, "node_modules/yallist": { "version": "3.1.1", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true }, "node_modules/yaml": { "version": "2.3.4", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz", + "integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==", "dev": true, - "license": "ISC", "engines": { "node": ">= 14" } }, "node_modules/yaml-ast-parser": { "version": "0.0.43", - "dev": true, - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz", + "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==", + "dev": true }, "node_modules/yargs": { "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, - "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -9818,16 +12132,18 @@ }, "node_modules/yargs-parser": { "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, - "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/yocto-queue": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, From e55c2c91d234de98f15dde60401823bf051f23ff Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 14 Feb 2024 17:37:19 +0100 Subject: [PATCH 0570/1688] Apply review feedback --- docs/sandbox/MapboxVectorTilesApi.md | 7 ++++--- .../java/org/opentripplanner/apis/support/TileJson.java | 2 +- .../java/org/opentripplanner/framework/io/HttpUtils.java | 2 +- .../standalone/config/routerconfig/VectorTileConfig.java | 7 ++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 11bd195a9d8..7183bdf8b7f 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -169,12 +169,13 @@ For each layer, the configuration includes: Custom attribution to be returned in `tilejson.json` -By default the `attribution` property in `tilejson.json` is computed from the names and +By default the, `attribution` property in `tilejson.json` is computed from the names and URLs of the feed publishers. If the OTP deployment contains many fields, this can become very unwieldy. -This configuration parameter allows you to set the `attribution` to any string you wish, -for example `TriMet, C-Tran, SMART and Friends`. +This configuration parameter allows you to set the `attribution` to any string you wish +including HTML tags, +for example `Regional Partners`.

      basePath

      diff --git a/src/main/java/org/opentripplanner/apis/support/TileJson.java b/src/main/java/org/opentripplanner/apis/support/TileJson.java index fcd6e84cc06..1f5c090c16d 100644 --- a/src/main/java/org/opentripplanner/apis/support/TileJson.java +++ b/src/main/java/org/opentripplanner/apis/support/TileJson.java @@ -98,7 +98,7 @@ private static String attributionFromFeedInfo(Collection feedInfos) { return feedInfos .stream() .map(feedInfo -> - "" + feedInfo.getPublisherName() + "" + "%s".formatted(feedInfo.getPublisherUrl(), feedInfo.getPublisherName()) ) .distinct() .collect(Collectors.joining(", ")); diff --git a/src/main/java/org/opentripplanner/framework/io/HttpUtils.java b/src/main/java/org/opentripplanner/framework/io/HttpUtils.java index d8b3dc542a6..672c9b9c481 100644 --- a/src/main/java/org/opentripplanner/framework/io/HttpUtils.java +++ b/src/main/java/org/opentripplanner/framework/io/HttpUtils.java @@ -47,6 +47,6 @@ public static String getBaseAddress(UriInfo uri, HttpHeaders headers) { * https://stackoverflow.com/questions/66042952/http-proxy-behavior-for-x-forwarded-host-header */ private static String extractHost(String xForwardedFor) { - return Arrays.stream(xForwardedFor.split(",")).map(String::strip).toList().getFirst(); + return Arrays.stream(xForwardedFor.split(",")).map(String::strip).findFirst().get(); } } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index f0c6cb7d9b0..d6beac6d256 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -87,12 +87,13 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String .summary("Custom attribution to be returned in `tilejson.json`") .description( """ - By default the `attribution` property in `tilejson.json` is computed from the names and + By default the, `attribution` property in `tilejson.json` is computed from the names and URLs of the feed publishers. If the OTP deployment contains many fields, this can become very unwieldy. - This configuration parameter allows you to set the `attribution` to any string you wish, - for example `TriMet, C-Tran, SMART and Friends`. + This configuration parameter allows you to set the `attribution` to any string you wish + including HTML tags, + for example `Regional Partners`. """ ) .asString(DEFAULT.attribution) From 6e7fbdaf5d307d7314331de7920cca38440155c7 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 15 Feb 2024 09:21:33 +0000 Subject: [PATCH 0571/1688] Add changelog entry for #5632 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 86f6355f37f..39aa4b8c329 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -91,6 +91,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Remove `VehicleToStopHeuristics` [#5381](https://github.com/opentripplanner/OpenTripPlanner/pull/5381) - Set defaults of the modes WALK, even if one and not the others are set [#5675](https://github.com/opentripplanner/OpenTripPlanner/pull/5675) - Reduce flex default access/egress penalty [#5674](https://github.com/opentripplanner/OpenTripPlanner/pull/5674) +- Add scooter preferences [#5632](https://github.com/opentripplanner/OpenTripPlanner/pull/5632) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 635ce6786ae71a72dcff786dfdba27cb1eebacd3 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Thu, 15 Feb 2024 09:22:00 +0000 Subject: [PATCH 0572/1688] Bump serialization version id for #5632 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c066d35e112..f12da275eb6 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 144 + 145 30.2 2.50 From 9163978720f51bc5b3e23a683d6885c004a02a23 Mon Sep 17 00:00:00 2001 From: Eivind Morris Bakke Date: Thu, 15 Feb 2024 10:55:26 +0100 Subject: [PATCH 0573/1688] Add GroupStop layer to new debug frontend (#5666) * Adds GroupStop areas to new debug UI. Done with a listing of all GroupStops for now. * Adds comment explaining why we precompute geometries in the GroupStopLayerBuilder. * Adds top level JavaDoc to GroupStopLayerBuilder. --- .../src/components/MapView/MapView.tsx | 2 +- .../apis/vectortiles/DebugStyleSpec.java | 10 ++++ .../GraphInspectorVectorTileResource.java | 15 +++++- .../apis/vectortiles/model/LayerType.java | 1 + .../vector/stop/GroupStopLayerBuilder.java | 50 +++++++++++++++++++ .../service/DefaultTransitService.java | 7 +++ .../transit/service/TransitService.java | 3 ++ .../apis/vectortiles/DebugStyleSpecTest.java | 3 +- .../apis/vectortiles/style.json | 13 +++++ 9 files changed, 100 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java diff --git a/client-next/src/components/MapView/MapView.tsx b/client-next/src/components/MapView/MapView.tsx index 96b4e820bae..36d98be79b6 100644 --- a/client-next/src/components/MapView/MapView.tsx +++ b/client-next/src/components/MapView/MapView.tsx @@ -75,7 +75,7 @@ export function MapView({ }} // it's unfortunate that you have to list these layers here. // maybe there is a way around it: https://github.com/visgl/react-map-gl/discussions/2343 - interactiveLayerIds={['regular-stop', 'area-stop', 'vertex', 'edge', 'link']} + interactiveLayerIds={['regular-stop', 'area-stop', 'group-stop', 'vertex', 'edge', 'link']} onClick={showFeaturePropPopup} // put lat/long in URL and pan to it on page reload hash={true} diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index f45d7d36413..8350a10d670 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -53,6 +53,7 @@ public class DebugStyleSpec { static StyleSpec build( VectorSourceLayer regularStops, VectorSourceLayer areaStops, + VectorSourceLayer groupStops, VectorSourceLayer edges, VectorSourceLayer vertices ) { @@ -122,6 +123,15 @@ static StyleSpec build( .fillOutlineColor(BLACK) .minZoom(6) .maxZoom(MAX_ZOOM), + StyleBuilder + .ofId("group-stop") + .typeFill() + .vectorSourceLayer(groupStops) + .fillColor(GREEN) + .fillOpacity(0.5f) + .fillOutlineColor(BLACK) + .minZoom(6) + .maxZoom(MAX_ZOOM), StyleBuilder .ofId("regular-stop") .typeCircle() diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java index dc6ba627e0e..f97830232bd 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/GraphInspectorVectorTileResource.java @@ -3,6 +3,7 @@ import static org.opentripplanner.apis.vectortiles.model.LayerType.AreaStop; import static org.opentripplanner.apis.vectortiles.model.LayerType.Edge; import static org.opentripplanner.apis.vectortiles.model.LayerType.GeofencingZones; +import static org.opentripplanner.apis.vectortiles.model.LayerType.GroupStop; import static org.opentripplanner.apis.vectortiles.model.LayerType.RegularStop; import static org.opentripplanner.apis.vectortiles.model.LayerType.Vertex; import static org.opentripplanner.framework.io.HttpUtils.APPLICATION_X_PROTOBUF; @@ -35,6 +36,7 @@ import org.opentripplanner.inspector.vector.VectorTileResponseFactory; import org.opentripplanner.inspector.vector.edge.EdgeLayerBuilder; import org.opentripplanner.inspector.vector.geofencing.GeofencingZonesLayerBuilder; +import org.opentripplanner.inspector.vector.stop.GroupStopLayerBuilder; import org.opentripplanner.inspector.vector.stop.StopLayerBuilder; import org.opentripplanner.inspector.vector.vertex.VertexLayerBuilder; import org.opentripplanner.model.FeedInfo; @@ -49,6 +51,7 @@ public class GraphInspectorVectorTileResource { private static final LayerParams REGULAR_STOPS = new LayerParams("regularStops", RegularStop); private static final LayerParams AREA_STOPS = new LayerParams("areaStops", AreaStop); + private static final LayerParams GROUP_STOPS = new LayerParams("groupStops", GroupStop); private static final LayerParams GEOFENCING_ZONES = new LayerParams( "geofencingZones", GeofencingZones @@ -58,6 +61,7 @@ public class GraphInspectorVectorTileResource { private static final List> DEBUG_LAYERS = List.of( REGULAR_STOPS, AREA_STOPS, + GROUP_STOPS, GEOFENCING_ZONES, EDGES, VERTICES @@ -128,11 +132,11 @@ public TileJson getTileJson( public StyleSpec getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) { var base = HttpUtils.getBaseAddress(uri, headers); - // these two could also be loaded together but are put into separate sources because + // these could also be loaded together but are put into separate sources because // the stops are fast and the edges are relatively slow var stopsSource = new VectorSource( "stops", - tileJsonUrl(base, List.of(REGULAR_STOPS, AREA_STOPS)) + tileJsonUrl(base, List.of(REGULAR_STOPS, AREA_STOPS, GROUP_STOPS)) ); var streetSource = new VectorSource( "street", @@ -142,6 +146,7 @@ public StyleSpec getTileJson(@Context UriInfo uri, @Context HttpHeaders headers) return DebugStyleSpec.build( REGULAR_STOPS.toVectorSourceLayer(stopsSource), AREA_STOPS.toVectorSourceLayer(stopsSource), + GROUP_STOPS.toVectorSourceLayer(stopsSource), EDGES.toVectorSourceLayer(streetSource), VERTICES.toVectorSourceLayer(streetSource) ); @@ -186,6 +191,12 @@ private static LayerBuilder createLayerBuilder( locale, e -> context.transitService().findAreaStops(e) ); + case GroupStop -> new GroupStopLayerBuilder( + layerParameters, + locale, + // There are not many GroupStops, so we can just list them all. + context.transitService().listGroupStops() + ); case GeofencingZones -> new GeofencingZonesLayerBuilder(context.graph(), layerParameters); case Edge -> new EdgeLayerBuilder(context.graph(), layerParameters); case Vertex -> new VertexLayerBuilder(context.graph(), layerParameters); diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java index ece75f29b60..585725d0707 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/LayerType.java @@ -3,6 +3,7 @@ public enum LayerType { RegularStop, AreaStop, + GroupStop, GeofencingZones, Edge, Vertex, diff --git a/src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java b/src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java new file mode 100644 index 00000000000..1e66397bc05 --- /dev/null +++ b/src/main/java/org/opentripplanner/inspector/vector/stop/GroupStopLayerBuilder.java @@ -0,0 +1,50 @@ +package org.opentripplanner.inspector.vector.stop; + +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.inspector.vector.LayerBuilder; +import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.transit.model.site.GroupStop; +import org.opentripplanner.transit.model.site.StopLocation; + +/** + * A vector tile layer for {@link GroupStop}s inside the vector tile bounds. The builder does not + * query for the GroupStops to draw, but instead uses the geometries of the GroupStops that are + * passed to the constructor. + */ +public class GroupStopLayerBuilder extends LayerBuilder { + + private final List geometries; + + public GroupStopLayerBuilder( + LayerParameters layerParameters, + Locale locale, + Collection groupStops + ) { + super( + new StopLocationPropertyMapper(locale), + layerParameters.name(), + layerParameters.expansionFactor() + ); + // Because there are very few GroupStops with relevant geometries, we can precompute the + // geometries and store them in a list at the time of construction. + this.geometries = + groupStops + .stream() + .filter(groupStop -> groupStop.getEncompassingAreaGeometry().isPresent()) + .map(stop -> { + Geometry geometry = stop.getEncompassingAreaGeometry().get().copy(); + geometry.setUserData(stop); + return geometry; + }) + .toList(); + } + + @Override + protected List getGeometries(Envelope query) { + return geometries; + } +} diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java index 3050fca6a3d..ca88b7d3130 100644 --- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java @@ -41,6 +41,7 @@ import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.organization.Operator; import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.MultiModalStation; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.Station; @@ -226,6 +227,12 @@ public Collection listRegularStops() { return transitModel.getStopModel().listRegularStops(); } + @Override + public Collection listGroupStops() { + OTPRequestTimeoutException.checkForTimeout(); + return transitModel.getStopModel().listGroupStops(); + } + @Override public StopLocation getStopLocation(FeedScopedId id) { return transitModel.getStopModel().getStopLocation(id); diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java index fdb6dda8749..17354ec4a20 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitService.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java @@ -32,6 +32,7 @@ import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.organization.Operator; import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.MultiModalStation; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.Station; @@ -95,6 +96,8 @@ public interface TransitService { Collection listRegularStops(); + Collection listGroupStops(); + StopLocation getStopLocation(FeedScopedId parseId); Collection getStopOrChildStops(FeedScopedId id); diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java index f2c3ebf49de..d971cefe2e2 100644 --- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java +++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java @@ -17,9 +17,10 @@ void spec() { var vectorSource = new VectorSource("vectorSource", "https://example.com"); var regularStops = new VectorSourceLayer(vectorSource, "stops"); var areaStops = new VectorSourceLayer(vectorSource, "stops"); + var groupStops = new VectorSourceLayer(vectorSource, "stops"); var edges = new VectorSourceLayer(vectorSource, "edges"); var vertices = new VectorSourceLayer(vectorSource, "vertices"); - var spec = DebugStyleSpec.build(regularStops, areaStops, edges, vertices); + var spec = DebugStyleSpec.build(regularStops, areaStops, groupStops, edges, vertices); var json = ObjectMappers.ignoringExtraFields().valueToTree(spec); var expectation = RESOURCES.fileToString("style.json"); diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index e62c3968924..7e611171409 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -154,6 +154,19 @@ "fill-outline-color" : "#140d0e" } }, + { + "id" : "group-stop", + "type" : "fill", + "source" : "vectorSource", + "source-layer" : "stops", + "minzoom" : 6, + "maxzoom" : 23, + "paint" : { + "fill-color" : "#22DD9E", + "fill-opacity" : 0.5, + "fill-outline-color" : "#140d0e" + } + }, { "id" : "regular-stop", "type" : "circle", From f104386016c2aeb6cb58f0aa1243e3a89b9c1621 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 15 Feb 2024 09:55:43 +0000 Subject: [PATCH 0574/1688] Add changelog entry for #5666 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 39aa4b8c329..f67b40f5a3b 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -92,6 +92,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Set defaults of the modes WALK, even if one and not the others are set [#5675](https://github.com/opentripplanner/OpenTripPlanner/pull/5675) - Reduce flex default access/egress penalty [#5674](https://github.com/opentripplanner/OpenTripPlanner/pull/5674) - Add scooter preferences [#5632](https://github.com/opentripplanner/OpenTripPlanner/pull/5632) +- Add GroupStop layer to new debug frontend [#5666](https://github.com/opentripplanner/OpenTripPlanner/pull/5666) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From ad2cf7aefc839879f4dc476b7f2ff6eea5f07d54 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 15 Feb 2024 09:56:46 +0000 Subject: [PATCH 0575/1688] Upgrade debug client to version 2024/02/2024-02-15T09:56 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 2653fdf36c2..d72598680fe 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From 9007ad7d1eb11cc69cae54b1445ef163cb68d6e3 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Thu, 15 Feb 2024 12:10:11 +0000 Subject: [PATCH 0576/1688] Bump serialization version id for #5673 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f12da275eb6..8adaaec352a 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 145 + 146 30.2 2.50 From 821a135f2be346e65080e6b73e9593ca4f4a56c1 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 15 Feb 2024 17:25:20 +0000 Subject: [PATCH 0577/1688] Upgrade debug client to version 2024/02/2024-02-15T17:24 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index d72598680fe..7224399b258 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From 95dcfd70f988d36a05100b4fa3f038d9f2907cba Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 15 Feb 2024 18:33:30 +0100 Subject: [PATCH 0578/1688] Add some defensive code --- .../ext/stopconsolidation/DecorateConsolidatedStopNames.java | 2 +- .../ext/stopconsolidation/StopConsolidationService.java | 3 ++- .../internal/DefaultStopConsolidationService.java | 4 ++-- .../ext/stopconsolidation/model/ConsolidatedStopLeg.java | 5 +++-- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java index a287e6a7d66..1806b3e9e32 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNames.java @@ -41,7 +41,7 @@ private void replaceConsolidatedStops(Itinerary i) { if (leg instanceof ScheduledTransitLeg stl && needsToRenameStops(stl)) { var agency = leg.getAgency(); // to show the name on the stop signage we use the primary stop's name - var from = service.primaryStop(stl.getFrom().stop.getId()); + var from = service.primaryStop(stl.getFrom().stop.getId()).orElse(stl.getFrom().stop); // to show the name that's on the display inside the vehicle we use the agency-specific name var to = service.agencySpecificStop(stl.getTo().stop, agency); return new ConsolidatedStopLeg(stl, from, to); diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index a829a905e27..11ad4be69ff 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.stopconsolidation; import java.util.List; +import java.util.Optional; import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.organization.Agency; @@ -41,5 +42,5 @@ public interface StopConsolidationService { /** * For a given stop id return the primary stop if it is part of a consolidated stop group. */ - StopLocation primaryStop(FeedScopedId id); + Optional primaryStop(FeedScopedId id); } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index 51a57028121..216489512f5 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -94,7 +94,7 @@ private Optional findAgencySpecificStop(StopLocation stop, Agency } @Override - public StopLocation primaryStop(FeedScopedId id) { + public Optional primaryStop(FeedScopedId id) { var primaryId = repo .groups() .stream() @@ -102,6 +102,6 @@ public StopLocation primaryStop(FeedScopedId id) { .map(ConsolidatedStopGroup::primary) .findAny() .orElse(id); - return transitModel.getStopModel().getRegularStop(primaryId); + return Optional.ofNullable(transitModel.getStopModel().getRegularStop(primaryId)); } } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java index 39f06bd6347..a784bb5900e 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.stopconsolidation.model; +import java.util.Objects; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.ScheduledTransitLegBuilder; @@ -12,8 +13,8 @@ public class ConsolidatedStopLeg extends ScheduledTransitLeg { public ConsolidatedStopLeg(ScheduledTransitLeg original, StopLocation from, StopLocation to) { super(new ScheduledTransitLegBuilder<>(original)); - this.from = from; - this.to = to; + this.from = Objects.requireNonNull(from); + this.to = Objects.requireNonNull(to); } @Override From 787a660ce5f628df00dfdd07a240b4db492e45f3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 15 Feb 2024 21:27:31 +0100 Subject: [PATCH 0579/1688] Remove outdated list of sandbox pages [ci skip] --- docs/SandboxExtension.md | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/docs/SandboxExtension.md b/docs/SandboxExtension.md index 914be238da4..0d05518fd56 100644 --- a/docs/SandboxExtension.md +++ b/docs/SandboxExtension.md @@ -4,31 +4,6 @@ - This should not be used for bug fixes and smaller changes. - Consider forking if the feature is valuable to one deployment only. -## Available extensions - -Here is a list of features implemented as OTP Sandbox Extensions. The Sandbox extensions are -provided "as is". - -- [Google Cloud Storage](sandbox/GoogleCloudStorage.md) - Enable Google Cloud Storage as a OTP Data Source -- [Actuator API](sandbox/ActuatorAPI.md) - API used to check the health status of the OTP instance. -- [Geocoder API](sandbox/GeocoderAPI.md) - Adds an API to search for stops and stations. -- [Transfer analyser](sandbox/transferanalyzer.md) - Module used for analyzing the transfers between -nearby stops generated by routing via OSM data. -- [SIRI Updater](sandbox/SiriUpdater.md) - Update OTP with real-time information from a Transmodel SIRI data source. -- [SIRI Azure Updater](sandbox/SiriAzureUpdater.md) - fetch SIRI real-time data through *Azure Service Bus* -- [VehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md) - GBFS service directory endpoint. -- [Smoove Bike Rental Updator Support](sandbox/SmooveBikeRental.md) - Smoove Bike Rental Updator(HSL) -- [Mapbox Vector Tiles API](sandbox/MapboxVectorTilesApi.md) - Mapbox Vector Tiles API -- [Flex Routing](sandbox/Flex.md) - Flexible transit routing for GTFS and Netex data sources -- [Park and Ride API](sandbox/ParkAndRideApi.md) - Park and Ride API -- [Data Overlay](sandbox/DataOverlay.md) - StreetEdge grid data populating affecting the route planning -- [Vehicle Parking](sandbox/VehicleParking.md) - Vehicle Parking updaters -- [Travel Time (Isochrone & Surface) API](sandbox/TravelTime.md) - Travel Time API -- [IBI accessibility score](sandbox/IBIAccessibilityScore.md) - IBI accessibility score -- [Fares](sandbox/Fares.md) - Fare calculation -- [Ride hailing](sandbox/RideHailing.md) - Ride hailing services like Uber - - ## Terminology **Main/core** -- All OTP code and additional files, NOT part of the sandbox. From 2616eaca0828938a1d97af53c15e224eac520da7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 15 Feb 2024 21:31:16 +0100 Subject: [PATCH 0580/1688] Fix grammar, 'fields' -> 'feeds' [ci skip] --- docs/sandbox/MapboxVectorTilesApi.md | 2 +- .../standalone/config/routerconfig/VectorTileConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 7183bdf8b7f..537f1b800dd 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -171,7 +171,7 @@ Custom attribution to be returned in `tilejson.json` By default the, `attribution` property in `tilejson.json` is computed from the names and URLs of the feed publishers. -If the OTP deployment contains many fields, this can become very unwieldy. +If the OTP deployment contains many feeds, this can become very unwieldy. This configuration parameter allows you to set the `attribution` to any string you wish including HTML tags, diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java index d6beac6d256..96cd49b72bb 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/VectorTileConfig.java @@ -89,7 +89,7 @@ public static VectorTileConfig mapVectorTilesParameters(NodeAdapter node, String """ By default the, `attribution` property in `tilejson.json` is computed from the names and URLs of the feed publishers. - If the OTP deployment contains many fields, this can become very unwieldy. + If the OTP deployment contains many feeds, this can become very unwieldy. This configuration parameter allows you to set the `attribution` to any string you wish including HTML tags, From bcfd201dcaf222a3756183f7f28c96778a42f31d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 21:35:23 +0000 Subject: [PATCH 0581/1688] Update dependency graphql to v16.8.1 [SECURITY] --- client-next/package-lock.json | 8 ++++---- client-next/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index a6c92c55374..1d45cf63002 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -10,7 +10,7 @@ "dependencies": { "@googlemaps/polyline-codec": "1.0.28", "bootstrap": "5.3.1", - "graphql": "16.8.0", + "graphql": "16.8.1", "graphql-request": "6.1.0", "maplibre-gl": "3.6.2", "react": "18.2.0", @@ -6736,9 +6736,9 @@ "dev": true }, "node_modules/graphql": { - "version": "16.8.0", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.0.tgz", - "integrity": "sha512-0oKGaR+y3qcS5mCu1vb7KG+a89vjn06C7Ihq/dDl3jA+A8B3TKomvi3CiEcVLJQGalbu8F52LxkOym7U5sSfbg==", + "version": "16.8.1", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz", + "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } diff --git a/client-next/package.json b/client-next/package.json index 3f8f303cc79..c77f54019bd 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -19,7 +19,7 @@ "dependencies": { "@googlemaps/polyline-codec": "1.0.28", "bootstrap": "5.3.1", - "graphql": "16.8.0", + "graphql": "16.8.1", "graphql-request": "6.1.0", "maplibre-gl": "3.6.2", "react": "18.2.0", From 470910e436831810f6580281afff1423f0912738 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 21:35:43 +0000 Subject: [PATCH 0582/1688] Update dependency vite to v4.5.2 [SECURITY] --- client-next/package-lock.json | 8 ++++---- client-next/package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index a6c92c55374..44419cb3efb 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -40,7 +40,7 @@ "jsdom": "23.2.0", "prettier": "3.0.3", "typescript": "5.2.2", - "vite": "4.4.9", + "vite": "4.5.2", "vitest": "1.1.3" } }, @@ -10701,9 +10701,9 @@ } }, "node_modules/vite": { - "version": "4.4.9", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.4.9.tgz", - "integrity": "sha512-2mbUn2LlUmNASWwSCNSJ/EG2HuSRTnVNaydp6vMCm5VIqJsjMfbIWtbH2kDuwUVW5mMUKKZvGPX/rqeqVvv1XA==", + "version": "4.5.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", + "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", "dev": true, "dependencies": { "esbuild": "^0.18.10", diff --git a/client-next/package.json b/client-next/package.json index 3f8f303cc79..6364c2fb7fb 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -49,7 +49,7 @@ "jsdom": "23.2.0", "prettier": "3.0.3", "typescript": "5.2.2", - "vite": "4.4.9", + "vite": "4.5.2", "vitest": "1.1.3" } } From 98d11bd90abc5af94efda9a103d6ef70b3f7cf62 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 00:22:59 +0000 Subject: [PATCH 0583/1688] Update dependency jsdom to v24 --- client-next/package-lock.json | 64 ++++++----------------------------- client-next/package.json | 2 +- 2 files changed, 12 insertions(+), 54 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index a6c92c55374..78130fd3641 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -37,7 +37,7 @@ "eslint-plugin-react": "7.33.2", "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-refresh": "0.4.3", - "jsdom": "23.2.0", + "jsdom": "24.0.0", "prettier": "3.0.3", "typescript": "5.2.2", "vite": "4.4.9", @@ -213,17 +213,6 @@ "node": ">=14" } }, - "node_modules/@asamuzakjp/dom-selector": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-2.0.2.tgz", - "integrity": "sha512-x1KXOatwofR6ZAYzXRBL5wrdV0vwNxlTCK9NCuLqAzQYARqGcvFwiJA6A1ERuh+dgeA4Dxm3JBYictIes+SqUQ==", - "dev": true, - "dependencies": { - "bidi-js": "^1.0.3", - "css-tree": "^2.3.1", - "is-potential-custom-element-name": "^1.0.1" - } - }, "node_modules/@babel/code-frame": { "version": "7.23.5", "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.23.5.tgz", @@ -4604,15 +4593,6 @@ } ] }, - "node_modules/bidi-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", - "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==", - "dev": true, - "dependencies": { - "require-from-string": "^2.0.2" - } - }, "node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", @@ -5166,19 +5146,6 @@ "node": ">= 8" } }, - "node_modules/css-tree": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.3.1.tgz", - "integrity": "sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==", - "dev": true, - "dependencies": { - "mdn-data": "2.0.30", - "source-map-js": "^1.0.1" - }, - "engines": { - "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" - } - }, "node_modules/cssstyle": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", @@ -7747,12 +7714,11 @@ } }, "node_modules/jsdom": { - "version": "23.2.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-23.2.0.tgz", - "integrity": "sha512-L88oL7D/8ufIES+Zjz7v0aes+oBMh2Xnh3ygWvL0OaICOomKEPKuPnIfBJekiXr+BHbbMjrWn/xqrDQuxFTeyA==", + "version": "24.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz", + "integrity": "sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==", "dev": true, "dependencies": { - "@asamuzakjp/dom-selector": "^2.0.1", "cssstyle": "^4.0.1", "data-urls": "^5.0.0", "decimal.js": "^10.4.3", @@ -7761,6 +7727,7 @@ "http-proxy-agent": "^7.0.0", "https-proxy-agent": "^7.0.2", "is-potential-custom-element-name": "^1.0.1", + "nwsapi": "^2.2.7", "parse5": "^7.1.2", "rrweb-cssom": "^0.6.0", "saxes": "^6.0.0", @@ -8275,12 +8242,6 @@ "url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1" } }, - "node_modules/mdn-data": { - "version": "2.0.30", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.30.tgz", - "integrity": "sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==", - "dev": true - }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", @@ -8543,6 +8504,12 @@ "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==", "dev": true }, + "node_modules/nwsapi": { + "version": "2.2.7", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", + "dev": true + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -9408,15 +9375,6 @@ "node": ">=0.10.0" } }, - "node_modules/require-from-string": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", - "dev": true, - "engines": { - "node": ">=0.10.0" - } - }, "node_modules/require-main-filename": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", diff --git a/client-next/package.json b/client-next/package.json index 3f8f303cc79..0f5737d9822 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -46,7 +46,7 @@ "eslint-plugin-react": "7.33.2", "eslint-plugin-react-hooks": "4.6.0", "eslint-plugin-react-refresh": "0.4.3", - "jsdom": "23.2.0", + "jsdom": "24.0.0", "prettier": "3.0.3", "typescript": "5.2.2", "vite": "4.4.9", From ea4c627f52e417cb0fded236917f459b9d1df00a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 16 Feb 2024 07:43:18 +0100 Subject: [PATCH 0584/1688] Mention java client in docs [ci skip] --- docs/apis/GTFS-GraphQL-API.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/apis/GTFS-GraphQL-API.md b/docs/apis/GTFS-GraphQL-API.md index b67b2882ec9..f2cc32e2888 100644 --- a/docs/apis/GTFS-GraphQL-API.md +++ b/docs/apis/GTFS-GraphQL-API.md @@ -5,6 +5,9 @@ used heavily by [digitransit-ui](https://github.com/HSLdevcom/digitransit-ui). [otp-react-redux](https://github.com/opentripplanner/otp-react-redux) has also migrated to this API in 2023. +There is also a [Java client](https://github.com/opentripplanner/otp-java-client) available which +makes it easy to use this API in a Java application. + ## URLs - GraphQL endpoint: [`http://localhost:8080/otp/gtfs/v1`](http://localhost:8080/otp/gtfs/v1) - HTML schema documentation: [https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/](https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/) From 35629821f0ab29e04cfd20702d877a5eade79ad1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 16 Feb 2024 07:58:59 +0100 Subject: [PATCH 0585/1688] Fix finding of data source --- .../java/org/opentripplanner/datastore/OtpDataStore.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java index fd63eb7f8dd..937b4fb8203 100644 --- a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java +++ b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java @@ -104,9 +104,13 @@ public void open() { streetGraph = findSingleSource(config.streetGraph(), STREET_GRAPH_FILENAME, GRAPH); graph = findSingleSource(config.graph(), GRAPH_FILENAME, GRAPH); - stopConsolidation = findSingleSource(config.stopConsolidation(), "", CONFIG); buildReportDir = findCompositeSource(config.reportDirectory(), BUILD_REPORT_DIR, REPORT); + if (config.stopConsolidation() != null) { + stopConsolidation = + findSourceUsingAllRepos(it -> it.findCompositeSource(config.stopConsolidation(), CONFIG)); + } + addAll(Arrays.asList(streetGraph, graph, buildReportDir)); // Also read in unknown sources in case the data input source is miss-spelled, From 95ac495fea7e3a56c7ddb2934b1232330b0b7051 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 16 Feb 2024 10:34:09 +0200 Subject: [PATCH 0586/1688] Bring back @oneOf directive Magidoc version update didn't fix the need for it --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 943c2a34227..07d8c9a0c30 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -8,6 +8,11 @@ This is only worth it when the execution is long running, i.e. more than ~50 mil """ directive @async on FIELD_DEFINITION +""" +Exactly one of the fields on an input object must be set and non-null while all others are omitted. +""" +directive @oneOf on INPUT_OBJECT + schema { query: QueryType } From b178183843d90fd7c146dbddc7768f140f8dd7bf Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 16 Feb 2024 10:57:00 +0200 Subject: [PATCH 0587/1688] Add @specificiedBy to some scalars --- .../org/opentripplanner/apis/gtfs/schema.graphqls | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 07d8c9a0c30..7bf91552932 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1040,7 +1040,7 @@ type Coordinate { """ Either a latitude or a longitude as a WGS84 format floating point number. """ -scalar CoordinateValue +scalar CoordinateValue @specifiedBy(url: "https://earth-info.nga.mil/?dir=wgs84&action=wgs84") type Coordinates { """Latitude (WGS 84)""" @@ -1257,7 +1257,7 @@ type Geometry { points: Polyline } -scalar GeoJson +scalar GeoJson @specifiedBy(url: "https://www.rfcreader.com/#rfc7946") scalar Grams @@ -1418,7 +1418,7 @@ input InputPreferred { """ Locale in the format defined in [RFC5646](https://datatracker.ietf.org/doc/html/rfc5646). For example, `en` or `en-US`. """ -scalar Locale +scalar Locale @specifiedBy(url: "https://www.rfcreader.com/#rfc5646") """ Preferences for car parking facilities used during the routing. @@ -2169,12 +2169,12 @@ type Money { """ An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. """ -scalar OffsetDateTime +scalar OffsetDateTime @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") """ An ISO-8601-formatted duration, i.e. `PT2H30M` for 2 hours and 30 minutes. """ -scalar Duration +scalar Duration @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") type RideHailingProvider { "The ID of the ride hailing provider." @@ -3381,7 +3381,7 @@ List of coordinates in an encoded polyline format (see https://developers.google.com/maps/documentation/utilities/polylinealgorithm). The value appears in JSON as a string. """ -scalar Polyline +scalar Polyline @specifiedBy(url: "https://developers.google.com/maps/documentation/utilities/polylinealgorithm") """ Additional qualifier for a transport mode. From 5d0994c2c4c806a14ff09579c7b5039f10be6878 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Fri, 16 Feb 2024 09:13:10 +0000 Subject: [PATCH 0588/1688] Upgrade debug client to version 2024/02/2024-02-16T09:12 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 7224399b258..dee8b4a8465 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From 9b611daf3062304a9fa365385e0a556b54e3cffa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 09:13:11 +0000 Subject: [PATCH 0589/1688] Update dependency maplibre-gl to v4 --- client-next/package-lock.json | 44 ++++++++++++++++++++++++++++++----- client-next/package.json | 2 +- 2 files changed, 39 insertions(+), 7 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 78130fd3641..a6ce0f1d6b0 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -12,7 +12,7 @@ "bootstrap": "5.3.1", "graphql": "16.8.0", "graphql-request": "6.1.0", - "maplibre-gl": "3.6.2", + "maplibre-gl": "4.0.1", "react": "18.2.0", "react-bootstrap": "2.8.0", "react-dom": "18.2.0", @@ -3471,6 +3471,14 @@ "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, + "node_modules/@types/geojson-vt": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/@types/geojson-vt/-/geojson-vt-3.2.5.tgz", + "integrity": "sha512-qDO7wqtprzlpe8FfQ//ClPV9xiuoh2nkIgiouIptON9w5jvD/fA4szvP9GBlDVdJ5dldAl0kX/sy3URbWwLx0g==", + "dependencies": { + "@types/geojson": "*" + } + }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", @@ -8204,9 +8212,9 @@ } }, "node_modules/maplibre-gl": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-3.6.2.tgz", - "integrity": "sha512-krg2KFIdOpLPngONDhP6ixCoWl5kbdMINP0moMSJFVX7wX1Clm2M9hlNKXS8vBGlVWwR5R3ZfI6IPrYz7c+aCQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.0.1.tgz", + "integrity": "sha512-UF+wI2utIciFXNg6+gYaMe7IGa9fMLzAZM3vdlGilqyWYmuibjcN40yGVgkz2r28//aOLphvtli3TbDEjEqHww==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -8215,8 +8223,9 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", - "@maplibre/maplibre-gl-style-spec": "^19.3.3", - "@types/geojson": "^7946.0.13", + "@maplibre/maplibre-gl-style-spec": "^20.1.1", + "@types/geojson": "^7946.0.14", + "@types/geojson-vt": "3.2.5", "@types/mapbox__point-geometry": "^0.1.4", "@types/mapbox__vector-tile": "^1.3.4", "@types/pbf": "^3.0.5", @@ -8242,6 +8251,29 @@ "url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1" } }, + "node_modules/maplibre-gl/node_modules/@maplibre/maplibre-gl-style-spec": { + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.1.1.tgz", + "integrity": "sha512-z85ARNPCBI2Cs5cPOS3DSbraTN+ue8zrcYVoSWBuNrD/mA+2SKAJ+hIzI22uN7gac6jBMnCdpPKRxS/V0KSZVQ==", + "dependencies": { + "@mapbox/jsonlint-lines-primitives": "~2.0.2", + "@mapbox/unitbezier": "^0.0.1", + "json-stringify-pretty-compact": "^4.0.0", + "minimist": "^1.2.8", + "rw": "^1.3.3", + "sort-object": "^3.0.3" + }, + "bin": { + "gl-style-format": "dist/gl-style-format.mjs", + "gl-style-migrate": "dist/gl-style-migrate.mjs", + "gl-style-validate": "dist/gl-style-validate.mjs" + } + }, + "node_modules/maplibre-gl/node_modules/json-stringify-pretty-compact": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz", + "integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==" + }, "node_modules/merge-stream": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", diff --git a/client-next/package.json b/client-next/package.json index 0f5737d9822..5ec2019a94d 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -21,7 +21,7 @@ "bootstrap": "5.3.1", "graphql": "16.8.0", "graphql-request": "6.1.0", - "maplibre-gl": "3.6.2", + "maplibre-gl": "4.0.1", "react": "18.2.0", "react-bootstrap": "2.8.0", "react-dom": "18.2.0", From c893a8b145078dc810b4cbd00ebfba6957d4ee24 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Fri, 16 Feb 2024 10:03:59 +0000 Subject: [PATCH 0590/1688] Upgrade debug client to version 2024/02/2024-02-16T10:03 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index dee8b4a8465..cbc31d4b96d 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From a950d20ece9c87972872346d5de09022e4d72ff1 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 16 Feb 2024 12:05:02 +0200 Subject: [PATCH 0591/1688] Create class for holding street constants and use it for maxCarSpeed --- .../routing/impl/GraphPathFinder.java | 3 ++- .../street/model/StreetConstants.java | 14 ++++++++++++++ .../street/model/StreetLimitationParameters.java | 2 +- .../EuclideanRemainingWeightHeuristic.java | 3 ++- ...faultStreetLimitationParametersServiceTest.java | 3 ++- 5 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 src/main/java/org/opentripplanner/street/model/StreetConstants.java diff --git a/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java b/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java index 0145eacd5ac..d8de0332238 100644 --- a/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java +++ b/src/main/java/org/opentripplanner/routing/impl/GraphPathFinder.java @@ -15,6 +15,7 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.StreetPreferences; import org.opentripplanner.routing.error.PathNotFoundException; +import org.opentripplanner.street.model.StreetConstants; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.StreetSearchBuilder; @@ -59,7 +60,7 @@ public class GraphPathFinder { private final float maxCarSpeed; public GraphPathFinder(@Nullable TraverseVisitor traverseVisitor) { - this(traverseVisitor, null, 40f); + this(traverseVisitor, null, StreetConstants.DEFAULT_MAX_CAR_SPEED); } public GraphPathFinder( diff --git a/src/main/java/org/opentripplanner/street/model/StreetConstants.java b/src/main/java/org/opentripplanner/street/model/StreetConstants.java new file mode 100644 index 00000000000..e3b01d84e7a --- /dev/null +++ b/src/main/java/org/opentripplanner/street/model/StreetConstants.java @@ -0,0 +1,14 @@ +package org.opentripplanner.street.model; + +/** + * This class holds constant values related to streets. If a value is only accessed from one place, + * it's better to store it there instead of here. + */ +public class StreetConstants { + + /** + * Default car speed that is used when max car speed has not been (yet) determined from the OSM + * data. Unit is m/s and value equals to 144 km/h. + */ + public static final float DEFAULT_MAX_CAR_SPEED = 40f; +} diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java index 18937abad9b..995cf4a30f6 100644 --- a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java +++ b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java @@ -12,7 +12,7 @@ @Singleton public class StreetLimitationParameters implements Serializable { - private float maxCarSpeed = 40f; + private float maxCarSpeed = StreetConstants.DEFAULT_MAX_CAR_SPEED; @Inject public StreetLimitationParameters() {} diff --git a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java index 5891f60bed1..dbc7d48f5da 100644 --- a/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java +++ b/src/main/java/org/opentripplanner/street/search/strategy/EuclideanRemainingWeightHeuristic.java @@ -5,6 +5,7 @@ import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; +import org.opentripplanner.street.model.StreetConstants; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.FreeEdge; import org.opentripplanner.street.model.vertex.Vertex; @@ -16,7 +17,7 @@ */ public class EuclideanRemainingWeightHeuristic implements RemainingWeightHeuristic { - private static final Float DEFAULT_MAX_CAR_SPEED = 40f; + private static final Float DEFAULT_MAX_CAR_SPEED = StreetConstants.DEFAULT_MAX_CAR_SPEED; private double lat; private double lon; diff --git a/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java b/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java index 27cf531a4fc..dd467d6a567 100644 --- a/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java +++ b/src/test/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersServiceTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import org.junit.jupiter.api.Test; +import org.opentripplanner.street.model.StreetConstants; import org.opentripplanner.street.model.StreetLimitationParameters; public class DefaultStreetLimitationParametersServiceTest { @@ -20,6 +21,6 @@ public void getMaxCarSpeed() { public void getDefaultMaxCarSpeed() { var model = new StreetLimitationParameters(); var service = new DefaultStreetLimitationParametersService(model); - assertEquals(40f, service.getMaxCarSpeed()); + assertEquals(StreetConstants.DEFAULT_MAX_CAR_SPEED, service.getMaxCarSpeed()); } } From a8c455320b6ffbfc2f1d2bf67c0a2b91b0f280a2 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 16 Feb 2024 12:05:40 +0200 Subject: [PATCH 0592/1688] Use correct injection annotations --- .../street/model/StreetLimitationParameters.java | 2 -- .../service/DefaultStreetLimitationParametersService.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java index 995cf4a30f6..bc346d9264a 100644 --- a/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java +++ b/src/main/java/org/opentripplanner/street/model/StreetLimitationParameters.java @@ -1,7 +1,6 @@ package org.opentripplanner.street.model; import jakarta.inject.Inject; -import jakarta.inject.Singleton; import java.io.Serializable; /** @@ -9,7 +8,6 @@ *

      * TODO this can be expanded to include some fields from the {@link org.opentripplanner.routing.graph.Graph}. */ -@Singleton public class StreetLimitationParameters implements Serializable { private float maxCarSpeed = StreetConstants.DEFAULT_MAX_CAR_SPEED; diff --git a/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java b/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java index 6b42cef4b58..4cfb52c48b8 100644 --- a/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java +++ b/src/main/java/org/opentripplanner/street/service/DefaultStreetLimitationParametersService.java @@ -1,13 +1,13 @@ package org.opentripplanner.street.service; -import jakarta.inject.Inject; +import jakarta.inject.Singleton; import org.opentripplanner.street.model.StreetLimitationParameters; +@Singleton public class DefaultStreetLimitationParametersService implements StreetLimitationParametersService { private final StreetLimitationParameters streetLimitationParameters; - @Inject public DefaultStreetLimitationParametersService( StreetLimitationParameters streetLimitationParameters ) { From fb014bf05b2484ca46194a4458bc50bc342e839e Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 16 Feb 2024 13:05:21 +0000 Subject: [PATCH 0593/1688] Add changelog entry for #5655 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index f67b40f5a3b..d577d0c469f 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -93,6 +93,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Reduce flex default access/egress penalty [#5674](https://github.com/opentripplanner/OpenTripPlanner/pull/5674) - Add scooter preferences [#5632](https://github.com/opentripplanner/OpenTripPlanner/pull/5632) - Add GroupStop layer to new debug frontend [#5666](https://github.com/opentripplanner/OpenTripPlanner/pull/5666) +- Update to newest version of GTFS Flex location groups [#5655](https://github.com/opentripplanner/OpenTripPlanner/pull/5655) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From c7c035413ae575e28efb51b81210e3704dbab6a6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 18 Feb 2024 00:16:12 +0000 Subject: [PATCH 0594/1688] Update dependency org.entur.gbfs:gbfs-java-model to v3.0.24 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 03d408a4b2e..e11a3fda96b 100644 --- a/pom.xml +++ b/pom.xml @@ -688,7 +688,7 @@ org.entur.gbfs gbfs-java-model - 3.0.20 + 3.0.24 From 29de909ed3119407060c8b30e83419e1b49b494c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 02:12:54 +0000 Subject: [PATCH 0595/1688] Update dependency ch.qos.logback:logback-classic to v1.5.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e11a3fda96b..d9729261ddc 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 5.10.2 1.12.2 5.5.3 - 1.4.14 + 1.5.0 9.9.1 2.0.12 2.0.15 From 5da22683573f94b5d32f4711e29ff2252c28fcac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 19 Feb 2024 03:26:36 +0000 Subject: [PATCH 0596/1688] Update dependency org.apache.commons:commons-compress to v1.26.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d9729261ddc..a621ebb5b00 100644 --- a/pom.xml +++ b/pom.xml @@ -929,7 +929,7 @@ org.apache.commons commons-compress - 1.25.0 + 1.26.0 test From 6cb475c4f701c96f4c9dc3cca13d35b9d82393f0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 19 Feb 2024 11:26:00 +0100 Subject: [PATCH 0597/1688] Revert to 'LegTime' --- .../impl/CombinedInterlinedTransitLeg.java | 6 +++--- .../ext/flex/FlexibleTransitLeg.java | 10 +++++----- .../apis/gtfs/datafetchers/LegImpl.java | 6 +++--- .../apis/gtfs/datafetchers/PlaceImpl.java | 6 +++--- .../gtfs/generated/GraphQLDataFetchers.java | 16 +++++++++------ .../apis/gtfs/generated/graphql-codegen.yml | 2 +- .../model/plan/FrequencyTransitLeg.java | 4 ++-- .../org/opentripplanner/model/plan/Leg.java | 4 ++-- .../plan/{LegTimeEvent.java => LegTime.java} | 15 ++++++++------ .../model/plan/ScheduledTransitLeg.java | 20 +++++++++---------- .../model/plan/StopArrival.java | 4 ++-- .../opentripplanner/model/plan/StreetLeg.java | 8 ++++---- .../model/plan/UnknownTransitPathLeg.java | 8 ++++---- .../opentripplanner/apis/gtfs/schema.graphqls | 10 +++++----- 14 files changed, 63 insertions(+), 56 deletions(-) rename src/main/java/org/opentripplanner/model/plan/{LegTimeEvent.java => LegTime.java} (52%) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java index 27a9685b560..9d10b87bbd6 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedTransitLeg.java @@ -10,7 +10,7 @@ import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimeEvent; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.TransitLeg; @@ -58,12 +58,12 @@ public Trip getTrip() { } @Override - public LegTimeEvent start() { + public LegTime start() { return first.start(); } @Override - public LegTimeEvent end() { + public LegTime end() { return second.end(); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index d793ad1956d..e0bdb6cc899 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -16,7 +16,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimeEvent; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.TransitLeg; @@ -86,13 +86,13 @@ public Accessibility getTripWheelchairAccessibility() { } @Override - public LegTimeEvent start() { - return LegTimeEvent.of(startTime, getArrivalDelay()); + public LegTime start() { + return LegTime.of(startTime, getArrivalDelay()); } @Override - public LegTimeEvent end() { - return LegTimeEvent.of(endTime, getDepartureDelay()); + public LegTime end() { + return LegTime.of(endTime, getDepartureDelay()); } @Override diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 7dc9492fbe3..f7be76481a7 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -18,7 +18,7 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimeEvent; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.ScheduledTransitLeg; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.StreetLeg; @@ -79,7 +79,7 @@ public DataFetcher duration() { } @Override - public DataFetcher end() { + public DataFetcher end() { return environment -> getSource(environment).end(); } @@ -223,7 +223,7 @@ public DataFetcher serviceDate() { } @Override - public DataFetcher start() { + public DataFetcher start() { return environment -> getSource(environment).start(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java index c4908b40aec..16716a393d1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java @@ -7,7 +7,7 @@ import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.apis.gtfs.model.StopPosition.PositionAtStop; import org.opentripplanner.framework.graphql.GraphQLUtils; -import org.opentripplanner.model.plan.LegTimeEvent; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.VertexType; @@ -19,7 +19,7 @@ public class PlaceImpl implements GraphQLDataFetchers.GraphQLPlace { @Override - public DataFetcher arrival() { + public DataFetcher arrival() { return environment -> getSource(environment).arrival(); } @@ -54,7 +54,7 @@ public DataFetcher carPark() { @Deprecated @Override - public DataFetcher departure() { + public DataFetcher departure() { return environment -> getSource(environment).departure(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index e84ecfc20f4..3b4f7889cb4 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -36,7 +36,7 @@ import org.opentripplanner.model.plan.Emissions; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Leg; -import org.opentripplanner.model.plan.LegTimeEvent; +import org.opentripplanner.model.plan.LegTime; import org.opentripplanner.model.plan.StopArrival; import org.opentripplanner.model.plan.WalkStep; import org.opentripplanner.routing.alertpatch.TransitAlert; @@ -445,7 +445,7 @@ public interface GraphQLLeg { public DataFetcher duration(); - public DataFetcher end(); + public DataFetcher end(); public DataFetcher endTime(); @@ -487,7 +487,7 @@ public interface GraphQLLeg { public DataFetcher serviceDate(); - public DataFetcher start(); + public DataFetcher start(); public DataFetcher startTime(); @@ -502,7 +502,11 @@ public interface GraphQLLeg { public DataFetcher walkingBike(); } - public interface GraphQLLegTimeEvent { + /** + * Time information about a passenger at a certain place. May contain real-time information if + * available. + */ + public interface GraphQLLegTime { public DataFetcher estimated(); public DataFetcher scheduled(); @@ -591,7 +595,7 @@ public interface GraphQLPattern { } public interface GraphQLPlace { - public DataFetcher arrival(); + public DataFetcher arrival(); public DataFetcher arrivalTime(); @@ -601,7 +605,7 @@ public interface GraphQLPlace { public DataFetcher carPark(); - public DataFetcher departure(); + public DataFetcher departure(); public DataFetcher departureTime(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index fee61cee936..55f76863cc6 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -60,7 +60,7 @@ config: InputField: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField#GraphQLInputField Itinerary: org.opentripplanner.model.plan.Itinerary#Itinerary Leg: org.opentripplanner.model.plan.Leg#Leg - LegTimeEvent: org.opentripplanner.model.plan.LegTimeEvent#LegTimeEvent + LegTime: org.opentripplanner.model.plan.LegTime#LegTime Mode: String OccupancyStatus: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLOccupancyStatus#GraphQLOccupancyStatus TransitMode: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode#GraphQLTransitMode diff --git a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java index 0a620e6c681..48c4b1b7b87 100644 --- a/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/FrequencyTransitLeg.java @@ -55,8 +55,8 @@ public List getIntermediateStops() { StopArrival visit = new StopArrival( Place.forStop(stop), - LegTimeEvent.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, arrivalTime)), - LegTimeEvent.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, departureTime)), + LegTime.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, arrivalTime)), + LegTime.ofStatic(ServiceDateUtils.toZonedDateTime(serviceDate, zoneId, departureTime)), i, tripTimes.gtfsSequenceOfStopIndex(i) ); diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index cfb60519572..e2d7d951556 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -200,8 +200,8 @@ default Accessibility getTripWheelchairAccessibility() { return null; } - LegTimeEvent start(); - LegTimeEvent end(); + LegTime start(); + LegTime end(); /** * The date and time this leg begins. diff --git a/src/main/java/org/opentripplanner/model/plan/LegTimeEvent.java b/src/main/java/org/opentripplanner/model/plan/LegTime.java similarity index 52% rename from src/main/java/org/opentripplanner/model/plan/LegTimeEvent.java rename to src/main/java/org/opentripplanner/model/plan/LegTime.java index b5256429b1f..c0b76b7486a 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTimeEvent.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTime.java @@ -6,18 +6,21 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; -public record LegTimeEvent(@Nonnull ZonedDateTime scheduled, @Nullable RealtimeEstimate estimated) { - public LegTimeEvent { +/** + * A scheduled time of a transit vehicle at a certain location with a optional realtime information. + */ +public record LegTime(@Nonnull ZonedDateTime scheduled, @Nullable RealtimeEstimate estimated) { + public LegTime { Objects.requireNonNull(scheduled); } @Nonnull - public static LegTimeEvent of(ZonedDateTime realtime, int delaySecs) { + public static LegTime of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); - return new LegTimeEvent(realtime.minus(delay), new RealtimeEstimate(realtime, delay)); + return new LegTime(realtime.minus(delay), new RealtimeEstimate(realtime, delay)); } @Nonnull - public static LegTimeEvent ofStatic(ZonedDateTime staticTime) { - return new LegTimeEvent(staticTime, null); + public static LegTime ofStatic(ZonedDateTime staticTime) { + return new LegTime(staticTime, null); } public ZonedDateTime time() { diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index a537e9b81f8..a4050fc3cb2 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -163,20 +163,20 @@ public Accessibility getTripWheelchairAccessibility() { } @Override - public LegTimeEvent start() { + public LegTime start() { if (getRealTime()) { - return LegTimeEvent.of(startTime, getDepartureDelay()); + return LegTime.of(startTime, getDepartureDelay()); } else { - return LegTimeEvent.ofStatic(startTime); + return LegTime.ofStatic(startTime); } } @Override - public LegTimeEvent end() { + public LegTime end() { if (getRealTime()) { - return LegTimeEvent.of(endTime, getArrivalDelay()); + return LegTime.of(endTime, getArrivalDelay()); } else { - return LegTimeEvent.ofStatic(endTime); + return LegTime.ofStatic(endTime); } } @@ -290,12 +290,12 @@ public List getIntermediateStops() { tripTimes.getDepartureTime(i) ); - var arrival = LegTimeEvent.ofStatic(arrivalTime); - var departure = LegTimeEvent.ofStatic(departureTime); + var arrival = LegTime.ofStatic(arrivalTime); + var departure = LegTime.ofStatic(departureTime); if (getRealTime()) { - arrival = LegTimeEvent.of(arrivalTime, tripTimes.getArrivalDelay(i)); - departure = LegTimeEvent.of(departureTime, tripTimes.getDepartureDelay(i)); + arrival = LegTime.of(arrivalTime, tripTimes.getArrivalDelay(i)); + departure = LegTime.of(departureTime, tripTimes.getDepartureDelay(i)); } StopArrival visit = new StopArrival( diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrival.java b/src/main/java/org/opentripplanner/model/plan/StopArrival.java index a1186fb4461..8a6b55c9346 100644 --- a/src/main/java/org/opentripplanner/model/plan/StopArrival.java +++ b/src/main/java/org/opentripplanner/model/plan/StopArrival.java @@ -15,8 +15,8 @@ */ public record StopArrival( Place place, - LegTimeEvent arrival, - LegTimeEvent departure, + LegTime arrival, + LegTime departure, Integer stopPosInPattern, Integer gtfsStopSequence ) { diff --git a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java index 372c987a5e4..6384159a4ec 100644 --- a/src/main/java/org/opentripplanner/model/plan/StreetLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/StreetLeg.java @@ -157,13 +157,13 @@ public boolean hasSameMode(Leg other) { } @Override - public LegTimeEvent start() { - return LegTimeEvent.ofStatic(startTime); + public LegTime start() { + return LegTime.ofStatic(startTime); } @Override - public LegTimeEvent end() { - return LegTimeEvent.ofStatic(endTime); + public LegTime end() { + return LegTime.ofStatic(endTime); } @Override diff --git a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java index 8d1e1c134dd..df43bbcb411 100644 --- a/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/UnknownTransitPathLeg.java @@ -69,13 +69,13 @@ public boolean hasSameMode(Leg other) { } @Override - public LegTimeEvent start() { - return LegTimeEvent.ofStatic(startTime); + public LegTime start() { + return LegTime.ofStatic(startTime); } @Override - public LegTimeEvent end() { - return LegTimeEvent.ofStatic(endTime); + public LegTime end() { + return LegTime.ofStatic(endTime); } @Override diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 4b43dc091e5..1b1897c5091 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1669,7 +1669,7 @@ type RealtimeEstimate { Time information about a passenger at a certain place. May contain real-time information if available. """ -type LegTimeEvent { +type LegTime { "The scheduled time of the event." scheduled: OffsetDateTime! "The estimated time of the event, if available." @@ -1681,12 +1681,12 @@ type Leg { """ The time when the leg starts including real-time information, if available. """ - start: LegTimeEvent + start: LegTime """ The time when the leg ends including real-time information, if available. """ - end: LegTimeEvent + end: LegTime """The mode (e.g. `WALK`) used when traversing this leg.""" mode: Mode @@ -2311,13 +2311,13 @@ type Place { The time the rider will arrive at the place. This also includes real-time information if available. """ - arrival: LegTimeEvent + arrival: LegTime """ The time the rider will depart the place. This also includes real-time information if available. """ - departure: LegTimeEvent + departure: LegTime """The stop related to the place.""" stop: Stop From 1f112e8a8a5f3e4ef9126bc1a47d9faa81177653 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 19 Feb 2024 12:35:23 +0200 Subject: [PATCH 0598/1688] Update OffsetDateTime scalar and implement coordinate scalar --- .../apis/gtfs/GraphQLScalars.java | 79 ++++++++++++++++--- .../framework/time/OffsetDateTimeParser.java | 42 ++++++++++ 2 files changed, 109 insertions(+), 12 deletions(-) create mode 100644 src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 2361ef4141b..eca5136bd27 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -3,6 +3,8 @@ import com.bedatadriven.jackson.datatype.jts.JtsModule; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import graphql.language.FloatValue; +import graphql.language.IntValue; import graphql.language.StringValue; import graphql.relay.Relay; import graphql.schema.Coercing; @@ -18,6 +20,7 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; import org.opentripplanner.framework.model.Grams; +import org.opentripplanner.framework.time.OffsetDateTimeParser; public class GraphQLScalars { @@ -54,7 +57,7 @@ public String parseLiteral(Object input) { ) .build(); - public static GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType + public static final GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType .newScalar() .name("OffsetDateTime") .coercing( @@ -66,41 +69,93 @@ public String serialize(@Nonnull Object dataFetcherResult) return zdt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); } else if (dataFetcherResult instanceof OffsetDateTime odt) { return odt.format(DateTimeFormatter.ISO_OFFSET_DATE_TIME); - } else return null; + } else { + throw new CoercingSerializeException( + "Cannot serialize object of class %s".formatted( + dataFetcherResult.getClass().getSimpleName() + ) + ); + } } @Override public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { - return null; + if (input instanceof CharSequence cs) { + return OffsetDateTimeParser.parseLeniently(cs).orElseThrow(() -> valueException(input)); + } + throw valueException(input); } @Override public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { - return null; + if (input instanceof StringValue sv) { + return OffsetDateTimeParser + .parseLeniently(sv.getValue()) + .orElseThrow(() -> literalException(input)); + } + throw literalException(input); + } + + private static CoercingParseValueException valueException(Object input) { + return new CoercingParseValueException("Cannot parse %s".formatted(input)); + } + + private static CoercingParseLiteralException literalException(Object input) { + return new CoercingParseLiteralException("Cannot parse %s".formatted(input)); } } ) .build(); - public static GraphQLScalarType coordinateValueScalar = GraphQLScalarType + public static final GraphQLScalarType coordinateValueScalar = GraphQLScalarType .newScalar() .name("CoordinateValue") .coercing( - new Coercing() { + new Coercing() { @Override - public String serialize(@Nonnull Object dataFetcherResult) + public Double serialize(@Nonnull Object dataFetcherResult) throws CoercingSerializeException { - return null; + if (dataFetcherResult instanceof Double doubleValue) { + return doubleValue; + } else if (dataFetcherResult instanceof Float floatValue) { + return floatValue.doubleValue(); + } else { + throw new CoercingSerializeException( + "Cannot serialize object of class %s as a coordinate number".formatted( + dataFetcherResult.getClass().getSimpleName() + ) + ); + } } @Override - public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { - return null; + public Double parseValue(Object input) throws CoercingParseValueException { + if (input instanceof Double doubleValue) { + return validateCoordinate(doubleValue); + } + throw new CoercingParseValueException( + "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) + ); } @Override - public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { - return null; + public Double parseLiteral(Object input) throws CoercingParseLiteralException { + if (input instanceof FloatValue coordinate) { + return validateCoordinate(coordinate.getValue().doubleValue()); + } + if (input instanceof IntValue coordinate) { + return validateCoordinate(coordinate.getValue().doubleValue()); + } + throw new CoercingParseLiteralException( + "Expected a number, got: " + input.getClass().getSimpleName() + ); + } + + private static double validateCoordinate(double coordinate) { + if (coordinate >= -180.001 && coordinate <= 180.001) { + return coordinate; + } + throw new CoercingParseLiteralException("Not a valid WGS84 coordinate value"); } } ) diff --git a/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java b/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java new file mode 100644 index 00000000000..11652d797a7 --- /dev/null +++ b/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java @@ -0,0 +1,42 @@ +package org.opentripplanner.framework.time; + +import java.time.OffsetDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; +import java.time.format.DateTimeParseException; +import java.util.Optional; + +public class OffsetDateTimeParser { + + /** + * We need to have two offsets, in order to parse both "+0200" and "+02:00". The first is not + * really ISO-8601 compatible with the extended date and time. We need to make parsing strict, in + * order to keep the minute mandatory, otherwise we would be left with an unparsed minute + */ + public static final DateTimeFormatter LENIENT_PARSER = new DateTimeFormatterBuilder() + .parseCaseInsensitive() + .parseLenient() + .append(DateTimeFormatter.ISO_LOCAL_DATE_TIME) + .optionalStart() + .parseStrict() + .appendOffset("+HH:MM:ss", "Z") + .parseLenient() + .optionalEnd() + .optionalStart() + .appendOffset("+HHmmss", "Z") + .optionalEnd() + .toFormatter(); + + /** + * Parses a ISO-8601 string into am OffsetDateTime instance allowing the offset to be both in + * '02:00' and '0200' format. + */ + public static Optional parseLeniently(CharSequence input) { + try { + var result = OffsetDateTime.parse(input, LENIENT_PARSER); + return Optional.of(result); + } catch (DateTimeParseException e) { + return Optional.empty(); + } + } +} From 2130da9590ee39926ee828bb5142a012472b8046 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 19 Feb 2024 11:56:51 +0100 Subject: [PATCH 0599/1688] Rename fields --- .../gtfs/generated/GraphQLDataFetchers.java | 4 +- .../opentripplanner/model/plan/LegTime.java | 16 ++- .../algorithm/mapping/AlertToLegMapper.java | 4 +- .../opentripplanner/apis/gtfs/schema.graphqls | 6 +- .../apis/gtfs/expectations/plan-extended.json | 128 +++++++++++++++--- .../apis/gtfs/expectations/plan.json | 104 ++++++-------- .../apis/gtfs/queries/plan-extended.graphql | 44 ++++-- .../apis/gtfs/queries/plan.graphql | 34 ++--- 8 files changed, 217 insertions(+), 123 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 3b4f7889cb4..7fab5720b9a 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -509,7 +509,7 @@ public interface GraphQLLeg { public interface GraphQLLegTime { public DataFetcher estimated(); - public DataFetcher scheduled(); + public DataFetcher scheduledTime(); } /** A span of time. */ @@ -764,7 +764,7 @@ public interface GraphQLQueryType { } public interface GraphQLRealtimeEstimate { - public DataFetcher scheduleOffset(); + public DataFetcher delay(); public DataFetcher time(); } diff --git a/src/main/java/org/opentripplanner/model/plan/LegTime.java b/src/main/java/org/opentripplanner/model/plan/LegTime.java index c0b76b7486a..2dc97b92a11 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTime.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTime.java @@ -9,9 +9,9 @@ /** * A scheduled time of a transit vehicle at a certain location with a optional realtime information. */ -public record LegTime(@Nonnull ZonedDateTime scheduled, @Nullable RealtimeEstimate estimated) { +public record LegTime(@Nonnull ZonedDateTime scheduledTime, @Nullable RealtimeEstimate estimated) { public LegTime { - Objects.requireNonNull(scheduled); + Objects.requireNonNull(scheduledTime); } @Nonnull public static LegTime of(ZonedDateTime realtime, int delaySecs) { @@ -23,13 +23,21 @@ public static LegTime ofStatic(ZonedDateTime staticTime) { return new LegTime(staticTime, null); } + /** + * The most up-to-date time available: if realtime data is available it is returned, if not then + * the scheduled one is. + */ public ZonedDateTime time() { if (estimated == null) { - return scheduled; + return scheduledTime; } else { return estimated.time; } } - record RealtimeEstimate(ZonedDateTime time, Duration scheduleOffset) {} + /** + * Realtime information about a vehicle at a certain place. + * @param delay Delay or "earliness" of a vehicle. Earliness is expressed as a negative number. + */ + record RealtimeEstimate(ZonedDateTime time, Duration delay) {} } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java index 425bbf27e35..4b2b194fbe4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java @@ -91,8 +91,8 @@ public void addTransitAlertsToLeg(Leg leg, boolean isFirstLeg) { ) ); - ZonedDateTime stopArrival = visit.arrival().time(); - ZonedDateTime stopDeparture = visit.departure().time(); + ZonedDateTime stopArrival = visit.arrival().scheduledTime(); + ZonedDateTime stopDeparture = visit.departure().scheduledTime(); addTransitAlertsToLeg(leg, alerts, stopArrival, stopDeparture); } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 1b1897c5091..2f3e2862c01 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1656,13 +1656,13 @@ ISO-8601 allows many different formats but OTP will only return the profile spec scalar OffsetDateTime @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") type RealtimeEstimate { - time: OffsetDateTime + time: OffsetDateTime! """ The delay or "earliness" of the vehicle at a certain place. If the vehicle is early then this is a negative duration. """ - scheduleOffset: Duration + delay: Duration! } """ @@ -1671,7 +1671,7 @@ available. """ type LegTime { "The scheduled time of the event." - scheduled: OffsetDateTime! + scheduledTime: OffsetDateTime! "The estimated time of the event, if available." estimated: RealtimeEstimate } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index 6090cdfbf48..bfb6d969cc7 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -19,17 +19,25 @@ { "mode" : "WALK", "start" : { - "scheduled" : "2020-02-02T11:00:00Z", + "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null }, "end" : { - "scheduled" : "2020-02-02T11:00:20Z", + "scheduledTime" : "2020-02-02T11:00:20Z", "estimated" : null }, "from" : { "name" : "A", "lat" : 5.0, "lon" : 8.0, + "departure" : { + "scheduledTime" : "2020-02-02T11:00:00Z", + "estimated" : null + }, + "arrival" : { + "scheduledTime" : "2020-02-02T11:00:00Z", + "estimated" : null + }, "departureTime" : 1580641200000, "arrivalTime" : 1580641200000 }, @@ -37,6 +45,14 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, + "departure" : { + "scheduledTime" : "2020-02-02T11:00:20Z", + "estimated" : null + }, + "arrival" : { + "scheduledTime" : "2020-02-02T11:00:20Z", + "estimated" : null + }, "departureTime" : 1580641220000, "arrivalTime" : 1580641220000 }, @@ -53,23 +69,37 @@ { "mode" : "BUS", "start" : { - "scheduled" : "2020-02-02T10:51:00Z", + "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { "time" : "2020-02-02T11:01:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "end" : { - "scheduled" : "2020-02-02T11:05:00Z", + "scheduledTime" : "2020-02-02T11:05:00Z", "estimated" : { "time" : "2020-02-02T11:15:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "from" : { "name" : "B", "lat" : 6.0, "lon" : 8.5, + "departure" : { + "scheduledTime" : "2020-02-02T10:51:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:01:00Z" + } + }, + "arrival" : { + "scheduledTime" : "2020-02-02T10:51:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:01:00Z" + } + }, "departureTime" : 1580641260000, "arrivalTime" : 1580641260000 }, @@ -77,6 +107,20 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, + "departure" : { + "scheduledTime" : "2020-02-02T11:05:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:15:00Z" + } + }, + "arrival" : { + "scheduledTime" : "2020-02-02T11:05:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:15:00Z" + } + }, "departureTime" : 1580642100000, "arrivalTime" : 1580642100000 }, @@ -90,17 +134,17 @@ "intermediatePlaces" : [ { "arrival" : { - "scheduled" : "2020-02-02T11:01:00Z", + "scheduledTime" : "2020-02-02T11:01:00Z", "estimated" : { "time" : "2020-02-02T11:11:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "departure" : { - "scheduled" : "2020-02-02T11:01:00Z", + "scheduledTime" : "2020-02-02T11:01:00Z", "estimated" : { "time" : "2020-02-02T11:11:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "stop" : { @@ -115,23 +159,37 @@ { "mode" : "RAIL", "start" : { - "scheduled" : "2020-02-02T11:20:00Z", + "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { "time" : "2020-02-02T11:30:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "end" : { - "scheduled" : "2020-02-02T11:40:00Z", + "scheduledTime" : "2020-02-02T11:40:00Z", "estimated" : { "time" : "2020-02-02T11:50:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "from" : { "name" : "C", "lat" : 7.0, "lon" : 9.0, + "departure" : { + "scheduledTime" : "2020-02-02T11:20:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:30:00Z" + } + }, + "arrival" : { + "scheduledTime" : "2020-02-02T11:20:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:30:00Z" + } + }, "departureTime" : 1580643000000, "arrivalTime" : 1580643000000 }, @@ -139,6 +197,20 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, + "departure" : { + "scheduledTime" : "2020-02-02T11:40:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:50:00Z" + } + }, + "arrival" : { + "scheduledTime" : "2020-02-02T11:40:00Z", + "estimated" : { + "delay" : "PT10M", + "time" : "2020-02-02T11:50:00Z" + } + }, "departureTime" : 1580644200000, "arrivalTime" : 1580644200000 }, @@ -152,17 +224,17 @@ "intermediatePlaces" : [ { "arrival" : { - "scheduled" : "2020-02-02T11:30:00Z", + "scheduledTime" : "2020-02-02T11:30:00Z", "estimated" : { "time" : "2020-02-02T11:40:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "departure" : { - "scheduled" : "2020-02-02T11:30:00Z", + "scheduledTime" : "2020-02-02T11:30:00Z", "estimated" : { "time" : "2020-02-02T11:40:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "stop" : { @@ -197,17 +269,25 @@ { "mode" : "CAR", "start" : { - "scheduled" : "2020-02-02T11:50:00Z", + "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null }, "end" : { - "scheduled" : "2020-02-02T12:00:00Z", + "scheduledTime" : "2020-02-02T12:00:00Z", "estimated" : null }, "from" : { "name" : "D", "lat" : 8.0, "lon" : 9.5, + "departure" : { + "scheduledTime" : "2020-02-02T11:50:00Z", + "estimated" : null + }, + "arrival" : { + "scheduledTime" : "2020-02-02T11:50:00Z", + "estimated" : null + }, "departureTime" : 1580644200000, "arrivalTime" : 1580644200000 }, @@ -215,6 +295,14 @@ "name" : "E", "lat" : 9.0, "lon" : 10.0, + "departure" : { + "scheduledTime" : "2020-02-02T12:00:00Z", + "estimated" : null + }, + "arrival" : { + "scheduledTime" : "2020-02-02T12:00:00Z", + "estimated" : null + }, "departureTime" : 1580644800000, "arrivalTime" : 1580644800000 }, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index a150bd8bf04..72d0cc017fe 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -8,24 +8,16 @@ "legs" : [ { "mode" : "WALK", - "start" : { - "scheduled" : "2020-02-02T11:00:00Z", - "estimated" : null - }, - "end" : { - "scheduled" : "2020-02-02T11:00:20Z", - "estimated" : null - }, "from" : { "name" : "A", "lat" : 5.0, "lon" : 8.0, "departure" : { - "scheduled" : "2020-02-02T11:00:00Z", + "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null }, "arrival" : { - "scheduled" : "2020-02-02T11:00:00Z", + "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null } }, @@ -34,10 +26,12 @@ "lat" : 6.0, "lon" : 8.5, "departure" : { - "scheduled" : "2020-02-02T11:00:20Z" + "scheduledTime" : "2020-02-02T11:00:20Z", + "estimated" : null }, "arrival" : { - "scheduled" : "2020-02-02T11:00:20Z" + "scheduledTime" : "2020-02-02T11:00:20Z", + "estimated" : null } }, "route" : null, @@ -45,36 +39,22 @@ }, { "mode" : "BUS", - "start" : { - "scheduled" : "2020-02-02T10:51:00Z", - "estimated" : { - "time" : "2020-02-02T11:01:00Z", - "scheduleOffset" : "PT10M" - } - }, - "end" : { - "scheduled" : "2020-02-02T11:05:00Z", - "estimated" : { - "time" : "2020-02-02T11:15:00Z", - "scheduleOffset" : "PT10M" - } - }, "from" : { "name" : "B", "lat" : 6.0, "lon" : 8.5, "departure" : { - "scheduled" : "2020-02-02T10:51:00Z", + "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { "time" : "2020-02-02T11:01:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "arrival" : { - "scheduled" : "2020-02-02T10:51:00Z", + "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { "time" : "2020-02-02T11:01:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } } }, @@ -83,10 +63,18 @@ "lat" : 7.0, "lon" : 9.0, "departure" : { - "scheduled" : "2020-02-02T11:05:00Z" + "scheduledTime" : "2020-02-02T11:05:00Z", + "estimated" : { + "time" : "2020-02-02T11:15:00Z", + "delay" : "PT10M" + } }, "arrival" : { - "scheduled" : "2020-02-02T11:05:00Z" + "scheduledTime" : "2020-02-02T11:05:00Z", + "estimated" : { + "time" : "2020-02-02T11:15:00Z", + "delay" : "PT10M" + } } }, "route" : { @@ -100,36 +88,22 @@ }, { "mode" : "RAIL", - "start" : { - "scheduled" : "2020-02-02T11:20:00Z", - "estimated" : { - "time" : "2020-02-02T11:30:00Z", - "scheduleOffset" : "PT10M" - } - }, - "end" : { - "scheduled" : "2020-02-02T11:40:00Z", - "estimated" : { - "time" : "2020-02-02T11:50:00Z", - "scheduleOffset" : "PT10M" - } - }, "from" : { "name" : "C", "lat" : 7.0, "lon" : 9.0, "departure" : { - "scheduled" : "2020-02-02T11:20:00Z", + "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { "time" : "2020-02-02T11:30:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } }, "arrival" : { - "scheduled" : "2020-02-02T11:20:00Z", + "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { "time" : "2020-02-02T11:30:00Z", - "scheduleOffset" : "PT10M" + "delay" : "PT10M" } } }, @@ -138,10 +112,18 @@ "lat" : 8.0, "lon" : 9.5, "departure" : { - "scheduled" : "2020-02-02T11:40:00Z" + "scheduledTime" : "2020-02-02T11:40:00Z", + "estimated" : { + "time" : "2020-02-02T11:50:00Z", + "delay" : "PT10M" + } }, "arrival" : { - "scheduled" : "2020-02-02T11:40:00Z" + "scheduledTime" : "2020-02-02T11:40:00Z", + "estimated" : { + "time" : "2020-02-02T11:50:00Z", + "delay" : "PT10M" + } } }, "route" : { @@ -155,24 +137,16 @@ }, { "mode" : "CAR", - "start" : { - "scheduled" : "2020-02-02T11:50:00Z", - "estimated" : null - }, - "end" : { - "scheduled" : "2020-02-02T12:00:00Z", - "estimated" : null - }, "from" : { "name" : "D", "lat" : 8.0, "lon" : 9.5, "departure" : { - "scheduled" : "2020-02-02T11:50:00Z", + "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null }, "arrival" : { - "scheduled" : "2020-02-02T11:50:00Z", + "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null } }, @@ -181,10 +155,12 @@ "lat" : 9.0, "lon" : 10.0, "departure" : { - "scheduled" : "2020-02-02T12:00:00Z" + "scheduledTime" : "2020-02-02T12:00:00Z", + "estimated" : null }, "arrival" : { - "scheduled" : "2020-02-02T12:00:00Z" + "scheduledTime" : "2020-02-02T12:00:00Z", + "estimated" : null } }, "route" : null, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index e877e05ffe4..dcec1a1026c 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -32,23 +32,37 @@ legs { mode start { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } end { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } from { name lat lon + departure { + scheduledTime + estimated { + delay + time + } + } + arrival { + scheduledTime + estimated { + delay + time + } + } departureTime arrivalTime } @@ -56,6 +70,20 @@ name lat lon + departure { + scheduledTime + estimated { + delay + time + } + } + arrival { + scheduledTime + estimated { + delay + time + } + } departureTime arrivalTime } @@ -69,17 +97,17 @@ } intermediatePlaces { arrival { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } departure { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } stop { diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index 4a9d7a174ba..635b9f1531a 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -21,36 +21,22 @@ end legs { mode - start { - scheduled - estimated { - time - scheduleOffset - } - } - end { - scheduled - estimated { - time - scheduleOffset - } - } from { name lat lon departure { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } arrival { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } } @@ -59,10 +45,18 @@ lat lon departure { - scheduled + scheduledTime + estimated { + time + delay + } } arrival { - scheduled + scheduledTime + estimated { + time + delay + } } } route { From 8187ad5306f37e60181b2fe8bdbc1c4e088e3ee3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 19 Feb 2024 13:03:22 +0200 Subject: [PATCH 0600/1688] Make origin and destination required --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 7bf91552932..f717fb555a2 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -4266,12 +4266,12 @@ type QueryType { """ The origin where the search starts. Usually coordinates but can also be a stop location. """ - origin: PlanLabeledLocationInput + origin: PlanLabeledLocationInput! """ The destination where the search ends. Usually coordinates but can also be a stop location. """ - destination: PlanLabeledLocationInput + destination: PlanLabeledLocationInput! """ Street and transit modes used during the search. This also includes options to only return From 8b37735a018140d703b40f53838b44a7df0cde48 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 19 Feb 2024 12:04:45 +0100 Subject: [PATCH 0601/1688] Improve scalars --- docs/apis/GraphQL-Tutorial.md | 34 +++++----- magidoc.mjs | 2 +- .../apis/gtfs/GraphQLScalars.java | 18 ++---- .../apis/gtfs/GraphQLScalarsTest.java | 62 +++++++++++++------ 4 files changed, 63 insertions(+), 53 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index 863aa8bd57c..1a56d02b6ca 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -92,36 +92,22 @@ Most people want to get routing results out of OTP, so lets see the query for th end legs { mode - start { - scheduled - estimated { - time - scheduleOffset - } - } - end { - scheduled - estimated { - time - scheduleOffset - } - } from { name lat lon departure { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } arrival { - scheduled + scheduledTime estimated { time - scheduleOffset + delay } } } @@ -130,10 +116,18 @@ Most people want to get routing results out of OTP, so lets see the query for th lat lon departure { - scheduled + scheduledTime + estimated { + time + delay + } } arrival { - scheduled + scheduledTime + estimated { + time + delay + } } } route { diff --git a/magidoc.mjs b/magidoc.mjs index bb138f3c87d..a57b17a4308 100644 --- a/magidoc.mjs +++ b/magidoc.mjs @@ -36,7 +36,7 @@ To learn how to deactivate it, read the queryGenerationFactories: { 'Polyline': '<>', 'GeoJson': '<>', - 'OffsetDateTime': '2024-02-05T18:04:23+0100' + 'OffsetDateTime': '2024-02-05T18:04:23+01:00' }, } }, diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 82ef8090d86..e6ab9f7dd5d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -79,9 +79,11 @@ public String serialize(@Nonnull Object dataFetcherResult) @Override public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { if (input instanceof CharSequence cs) { - return OffsetDateTimeParser.parseLeniently(cs).orElseThrow(() -> valueException(input)); + return OffsetDateTimeParser + .parseLeniently(cs) + .orElseThrow(CoercingParseValueException::new); } - throw valueException(input); + throw new CoercingParseValueException(); } @Override @@ -89,17 +91,9 @@ public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralExce if (input instanceof StringValue sv) { return OffsetDateTimeParser .parseLeniently(sv.getValue()) - .orElseThrow(() -> literalException(input)); + .orElseThrow(CoercingParseLiteralException::new); } - throw literalException(input); - } - - private static CoercingParseValueException valueException(Object input) { - return new CoercingParseValueException("Cannot parse %s".formatted(input)); - } - - private static CoercingParseLiteralException literalException(Object input) { - return new CoercingParseLiteralException("Cannot parse %s".formatted(input)); + throw new CoercingParseLiteralException(); } } ) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java index 079749f3ccc..652c72254d9 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.params.provider.Arguments.of; import com.fasterxml.jackson.core.JsonProcessingException; +import graphql.language.StringValue; import graphql.schema.CoercingSerializeException; import java.time.Duration; import java.time.LocalDate; @@ -12,6 +13,7 @@ import java.time.ZoneOffset; import java.util.List; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -23,7 +25,7 @@ class GraphQLScalarsTest { - private static final OffsetDateTime OFFSET_DATE_TIME = OffsetDateTime.of( + static final OffsetDateTime OFFSET_DATE_TIME = OffsetDateTime.of( LocalDate.of(2024, 2, 4), LocalTime.MIDNIGHT, ZoneOffset.UTC @@ -71,25 +73,45 @@ void geoJson() throws JsonProcessingException { assertEquals(jsonNode.toString(), geoJson.toString()); } - static List offsetDateTimeCases() { - return List.of( - of(OFFSET_DATE_TIME, "2024-02-04T00:00:00Z"), - of(OFFSET_DATE_TIME.plusHours(12).plusMinutes(8).plusSeconds(22), "2024-02-04T12:08:22Z"), - of( - OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.BERLIN).toOffsetDateTime(), - "2024-02-04T01:00:00+01:00" - ), - of( - OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.NEW_YORK).toOffsetDateTime(), - "2024-02-03T19:00:00-05:00" - ) - ); - } + @Nested + class OffsetDateTimeTests { - @ParameterizedTest - @MethodSource("offsetDateTimeCases") - void duration(OffsetDateTime odt, String expected) { - var string = GraphQLScalars.offsetDateTimeScalar.getCoercing().serialize(odt); - assertEquals(expected, string); + static List offsetDateTimeCases() { + return List.of( + of(OFFSET_DATE_TIME, "2024-02-04T00:00:00Z"), + of(OFFSET_DATE_TIME.plusHours(12).plusMinutes(8).plusSeconds(22), "2024-02-04T12:08:22Z"), + of( + OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.BERLIN).toOffsetDateTime(), + "2024-02-04T01:00:00+01:00" + ), + of( + OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.NEW_YORK).toOffsetDateTime(), + "2024-02-03T19:00:00-05:00" + ) + ); + } + + @ParameterizedTest + @MethodSource("offsetDateTimeCases") + void serializeOffsetDateTime(OffsetDateTime odt, String expected) { + var string = GraphQLScalars.offsetDateTimeScalar.getCoercing().serialize(odt); + assertEquals(expected, string); + } + + @ParameterizedTest + @MethodSource("offsetDateTimeCases") + void parseOffsetDateTime(OffsetDateTime expected, String input) { + var odt = GraphQLScalars.offsetDateTimeScalar.getCoercing().parseValue(input); + assertEquals(expected, odt); + } + + @ParameterizedTest + @MethodSource("offsetDateTimeCases") + void parseOffsetDateTimeLiteral(OffsetDateTime expected, String input) { + var odt = GraphQLScalars.offsetDateTimeScalar + .getCoercing() + .parseLiteral(new StringValue(input)); + assertEquals(expected, odt); + } } } From 62a68ac070ac31a44944814253d029ae97ebabed Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 19 Feb 2024 13:42:08 +0200 Subject: [PATCH 0602/1688] Rename old route request mapper --- ...per.java => LegacyRouteRequestMapper.java} | 2 +- ...java => LegacyRouteRequestMapperTest.java} | 37 +++++++++++++++---- 2 files changed, 30 insertions(+), 9 deletions(-) rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{RouteRequestMapper.java => LegacyRouteRequestMapper.java} (99%) rename src/test/java/org/opentripplanner/apis/gtfs/mapping/{RouteRequestMapperTest.java => LegacyRouteRequestMapperTest.java} (89%) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java similarity index 99% rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java index 5bc00cb7a85..7355658d89c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java @@ -32,7 +32,7 @@ import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.basic.TransitMode; -public class RouteRequestMapper { +public class LegacyRouteRequestMapper { @Nonnull public static RouteRequest toRouteRequest( diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java similarity index 89% rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java rename to src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java index 85736291ada..58081ea5b4f 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java @@ -83,7 +83,7 @@ void parkingFilters() { var env = executionContext(arguments); - var routeRequest = RouteRequestMapper.toRouteRequest(env, context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest(env, context); assertNotNull(routeRequest); @@ -113,7 +113,10 @@ void parkingFilters() { void banning(Map banned, String expectedFilters) { Map arguments = Map.of("banned", banned); - var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(arguments), + context + ); assertNotNull(routeRequest); assertEquals(expectedFilters, routeRequest.journey().transit().filters().toString()); @@ -137,7 +140,10 @@ void banning(Map banned, String expectedFilters) { void modes(List> modes, String expectedFilters) { Map arguments = Map.of("transportModes", modes); - var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(arguments), + context + ); assertNotNull(routeRequest); assertEquals(expectedFilters, routeRequest.journey().transit().filters().toString()); @@ -150,7 +156,10 @@ private static Map mode(String mode) { @Test void defaultBikeOptimize() { Map arguments = Map.of(); - var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(arguments), + context + ); assertEquals(SAFE_STREETS, routeRequest.preferences().bike().optimizeType()); } @@ -163,7 +172,10 @@ void bikeTriangle() { Map.of("safetyFactor", 0.2, "slopeFactor", 0.1, "timeFactor", 0.7) ); - var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(arguments), + context + ); assertEquals(TRIANGLE, routeRequest.preferences().bike().optimizeType()); assertEquals( @@ -187,7 +199,10 @@ void noTriangle(GraphQLTypes.GraphQLOptimizeType bot) { Map.of("safetyFactor", 0.2, "slopeFactor", 0.1, "timeFactor", 0.7) ); - var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(arguments), + context + ); assertEquals(OptimizationTypeMapper.map(bot), routeRequest.preferences().bike().optimizeType()); assertEquals( @@ -201,10 +216,16 @@ void walkReluctance() { var reluctance = 119d; Map arguments = Map.of("walkReluctance", reluctance); - var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(arguments), + context + ); assertEquals(reluctance, routeRequest.preferences().walk().reluctance()); - var noParamsRequest = RouteRequestMapper.toRouteRequest(executionContext(Map.of()), context); + var noParamsRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(Map.of()), + context + ); assertNotEquals(reluctance, noParamsRequest.preferences().walk().reluctance()); } From cd56144e43964d292935e938c5672492828009f1 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 19 Feb 2024 13:49:13 +0200 Subject: [PATCH 0603/1688] Add basic implementation for planConnection Still need to add support for a lot of input parameters --- .../apis/gtfs/GtfsGraphQLIndex.java | 2 + .../gtfs/datafetchers/PlanConnectionImpl.java | 108 ++++++++++++++++++ .../apis/gtfs/datafetchers/QueryTypeImpl.java | 27 +++-- .../gtfs/generated/GraphQLDataFetchers.java | 13 ++- .../apis/gtfs/generated/graphql-codegen.yml | 6 +- .../apis/gtfs/mapping/RouteRequestMapper.java | 66 +++++++++++ .../apis/gtfs/model/PlanLabeledLocation.java | 3 + .../apis/gtfs/model/PlanLocation.java | 20 +++- .../apis/gtfs/model/PlanPageInfo.java | 12 ++ .../framework/graphql/GraphQLUtils.java | 19 ++- 10 files changed, 254 insertions(+), 22 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 5e065b8227b..07b0f615b25 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -51,6 +51,7 @@ import org.opentripplanner.apis.gtfs.datafetchers.PatternImpl; import org.opentripplanner.apis.gtfs.datafetchers.PlaceImpl; import org.opentripplanner.apis.gtfs.datafetchers.PlaceInterfaceTypeResolver; +import org.opentripplanner.apis.gtfs.datafetchers.PlanConnectionImpl; import org.opentripplanner.apis.gtfs.datafetchers.PlanImpl; import org.opentripplanner.apis.gtfs.datafetchers.QueryTypeImpl; import org.opentripplanner.apis.gtfs.datafetchers.RentalVehicleImpl; @@ -159,6 +160,7 @@ protected static GraphQLSchema buildSchema() { .type(typeWiring.build(PatternImpl.class)) .type(typeWiring.build(PlaceImpl.class)) .type(typeWiring.build(placeAtDistanceImpl.class)) + .type(typeWiring.build(PlanConnectionImpl.class)) .type(typeWiring.build(PlanImpl.class)) .type(typeWiring.build(QueryTypeImpl.class)) .type(typeWiring.build(RouteImpl.class)) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java new file mode 100644 index 00000000000..168f58b3224 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java @@ -0,0 +1,108 @@ +package org.opentripplanner.apis.gtfs.datafetchers; + +import graphql.relay.ConnectionCursor; +import graphql.relay.DefaultConnectionCursor; +import graphql.relay.DefaultEdge; +import graphql.schema.DataFetcher; +import graphql.schema.DataFetchingEnvironment; +import java.time.Duration; +import java.time.OffsetDateTime; +import org.opentripplanner.apis.gtfs.GraphQLRequestContext; +import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; +import org.opentripplanner.apis.gtfs.model.PlanLabeledLocation; +import org.opentripplanner.apis.gtfs.model.PlanPageInfo; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.Place; +import org.opentripplanner.routing.api.response.RoutingError; +import org.opentripplanner.routing.api.response.RoutingResponse; +import org.opentripplanner.transit.service.TransitService; + +public class PlanConnectionImpl implements GraphQLDataFetchers.GraphQLPlanConnection { + + @Override + public DataFetcher searchDateTime() { + return environment -> { + var transitService = getTransitService(environment); + var instant = getSource(environment).getTripPlan().date; + return instant.atOffset(transitService.getTimeZone().getRules().getOffset(instant)); + }; + } + + @Override + public DataFetcher origin() { + return environment -> getLocation(getSource(environment).getTripPlan().from); + } + + @Override + public DataFetcher>> edges() { + return environment -> + getSource(environment) + .getTripPlan() + .itineraries.stream() + .map(itinerary -> new DefaultEdge<>(itinerary, new DefaultConnectionCursor("NoCursor"))) + .toList(); + } + + @Override + public DataFetcher> routingErrors() { + return environment -> getSource(environment).getRoutingErrors(); + } + + @Override + public DataFetcher destination() { + return environment -> getLocation(getSource(environment).getTripPlan().to); + } + + @Override + public DataFetcher pageInfo() { + return environment -> { + var startCursor = getSource(environment).getNextPageCursor() != null + ? getSource(environment).getPreviousPageCursor().encode() + : null; + ConnectionCursor startConnectionCursor = null; + if (startCursor != null) { + startConnectionCursor = new DefaultConnectionCursor(startCursor); + } + var endCursor = getSource(environment).getPreviousPageCursor() != null + ? getSource(environment).getNextPageCursor().encode() + : null; + ConnectionCursor endConnectionCursor = null; + if (endCursor != null) { + endConnectionCursor = new DefaultConnectionCursor(endCursor); + } + Duration searchWindowUsed = null; + var metadata = getSource(environment).getMetadata(); + if (metadata != null) { + searchWindowUsed = metadata.searchWindowUsed; + } + return new PlanPageInfo( + startConnectionCursor, + endConnectionCursor, + startCursor != null, + endCursor != null, + searchWindowUsed + ); + }; + } + + private PlanLabeledLocation getLocation(Place place) { + Object location = null; + var stop = place.stop; + var coordinate = place.coordinate; + if (stop != null) { + location = stop; + } else if (coordinate != null) { + location = coordinate; + } + // TODO make label field that is only the label + return new PlanLabeledLocation(location, place.name.toString()); + } + + private TransitService getTransitService(DataFetchingEnvironment environment) { + return environment.getContext().transitService(); + } + + private RoutingResponse getSource(DataFetchingEnvironment environment) { + return environment.getSource(); + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index b7a85b96c73..c63882561e9 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -30,6 +30,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLQueryTypeStopsByRadiusArgs; +import org.opentripplanner.apis.gtfs.mapping.LegacyRouteRequestMapper; import org.opentripplanner.apis.gtfs.mapping.RouteRequestMapper; import org.opentripplanner.ext.fares.impl.DefaultFareService; import org.opentripplanner.ext.fares.impl.GtfsFaresService; @@ -39,7 +40,6 @@ import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.DirectionMapper; import org.opentripplanner.model.TripTimeOnDate; -import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.api.request.RouteRequest; @@ -481,21 +481,17 @@ public DataFetcher> patterns() { public DataFetcher> plan() { return environment -> { GraphQLRequestContext context = environment.getContext(); - RouteRequest request = RouteRequestMapper.toRouteRequest(environment, context); - RoutingResponse res = context.routingService().route(request); - return DataFetcherResult - .newResult() - .data(res) - .localContext(Map.of("locale", request.locale())) - .build(); + RouteRequest request = LegacyRouteRequestMapper.toRouteRequest(environment, context); + return getPlanResult(context, request); }; } @Override - public DataFetcher> planConnection() { + public DataFetcher> planConnection() { return environment -> { - List itineraries = List.of(); - return new SimpleListConnection<>(itineraries).get(environment); + GraphQLRequestContext context = environment.getContext(); + RouteRequest request = RouteRequestMapper.toRouteRequest(environment, context); + return getPlanResult(context, request); }; } @@ -942,6 +938,15 @@ private GraphFinder getGraphFinder(DataFetchingEnvironment environment) { return environment.getContext().graphFinder(); } + private DataFetcherResult getPlanResult(GraphQLRequestContext context, RouteRequest request) { + RoutingResponse res = context.routingService().route(request); + return DataFetcherResult + .newResult() + .data(res) + .localContext(Map.of("locale", request.locale())) + .build(); + } + protected static List filterAlerts( Collection alerts, GraphQLTypes.GraphQLQueryTypeAlertsArgs args diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 7ded260c70f..c942e771ba6 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -2,6 +2,7 @@ package org.opentripplanner.apis.gtfs.generated; import graphql.relay.Connection; +import graphql.relay.DefaultEdge; import graphql.relay.Edge; import graphql.schema.DataFetcher; import graphql.schema.TypeResolver; @@ -20,7 +21,9 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode; +import org.opentripplanner.apis.gtfs.model.PlanLabeledLocation; import org.opentripplanner.apis.gtfs.model.PlanLocation; +import org.opentripplanner.apis.gtfs.model.PlanPageInfo; import org.opentripplanner.apis.gtfs.model.RideHailingProvider; import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.apis.gtfs.model.TripOccupancy; @@ -664,13 +667,13 @@ public interface GraphQLPlan { * [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). */ public interface GraphQLPlanConnection { - public DataFetcher destination(); + public DataFetcher destination(); - public DataFetcher>> edges(); + public DataFetcher>> edges(); - public DataFetcher origin(); + public DataFetcher origin(); - public DataFetcher pageInfo(); + public DataFetcher pageInfo(); public DataFetcher> routingErrors(); @@ -766,7 +769,7 @@ public interface GraphQLQueryType { public DataFetcher> plan(); - public DataFetcher> planConnection(); + public DataFetcher> planConnection(); public DataFetcher rentalVehicle(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index ccc33e2617b..244ff5fbb61 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -78,9 +78,11 @@ config: placeAtDistanceConnection: graphql.relay.Connection#Connection placeAtDistanceEdge: graphql.relay.Edge#Edge Plan: graphql.execution.DataFetcherResult - PlanConnection: graphql.relay.Connection#Connection - PlanEdge: graphql.relay.Edge#Edge + PlanConnection: graphql.execution.DataFetcherResult + PlanEdge: graphql.relay.DefaultEdge#DefaultEdge + PlanLabeledLocation: org.opentripplanner.apis.gtfs.model.PlanLabeledLocation#PlanLabeledLocation PlanLocation: org.opentripplanner.apis.gtfs.model.PlanLocation#PlanLocation + PlanPageInfo: org.opentripplanner.apis.gtfs.model.PlanPageInfo#PlanPageInfo RealtimeState: String RelativeDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection#GraphQLRelativeDirection Route: org.opentripplanner.transit.model.network.Route#Route diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java new file mode 100644 index 00000000000..82cd5816132 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -0,0 +1,66 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import graphql.schema.DataFetchingEnvironment; +import java.time.Instant; +import javax.annotation.Nonnull; +import org.opentripplanner.apis.gtfs.GraphQLRequestContext; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.framework.graphql.GraphQLUtils; +import org.opentripplanner.model.GenericLocation; +import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.transit.model.framework.FeedScopedId; + +public class RouteRequestMapper { + + @Nonnull + public static RouteRequest toRouteRequest( + DataFetchingEnvironment environment, + GraphQLRequestContext context + ) { + RouteRequest request = context.defaultRouteRequest(); + + var args = new GraphQLTypes.GraphQLQueryTypePlanConnectionArgs(environment.getArguments()); + var dateTime = args.getGraphQLDateTime(); + if (dateTime.getGraphQLEarliestDeparture() != null) { + request.setDateTime(args.getGraphQLDateTime().getGraphQLEarliestDeparture().toInstant()); + } else if (dateTime.getGraphQLLatestArrival() != null) { + request.setDateTime(args.getGraphQLDateTime().getGraphQLLatestArrival().toInstant()); + } else { + request.setDateTime(Instant.now()); + } + request.setFrom(parseGenericLocation(args.getGraphQLOrigin())); + request.setTo(parseGenericLocation(args.getGraphQLDestination())); + request.setLocale(GraphQLUtils.getLocale(environment, args.getGraphQLLocale())); + + return request; + } + + private static GenericLocation parseGenericLocation( + GraphQLTypes.GraphQLPlanLabeledLocationInput locationInput + ) { + var stopLocation = locationInput.getGraphQLLocation().getGraphQLStopLocation(); + if (stopLocation.getGraphQLStopLocationId() != null) { + // TODO implement strict + var stopId = stopLocation.getGraphQLStopLocationId(); + if (FeedScopedId.isValidString(stopId)) { + // TODO make label field that is only the label + return new GenericLocation( + locationInput.getGraphQLLabel(), + FeedScopedId.parse(stopId), + null, + null + ); + } else { + throw new IllegalArgumentException("Stop id %s is not of valid format.".formatted(stopId)); + } + } + + var coordinate = locationInput.getGraphQLLocation().getGraphQLCoordinate(); + return new GenericLocation( + locationInput.getGraphQLLabel(), + null, + coordinate.getGraphQLLatitude(), + coordinate.getGraphQLLongitude() + ); + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java new file mode 100644 index 00000000000..aa316e98058 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java @@ -0,0 +1,3 @@ +package org.opentripplanner.apis.gtfs.model; + +public record PlanLabeledLocation(Object location, String label) {} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java index d7d80f12687..5bf1db4e2f9 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java @@ -2,11 +2,25 @@ import graphql.TypeResolutionEnvironment; import graphql.schema.GraphQLObjectType; -import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; +import graphql.schema.GraphQLSchema; +import graphql.schema.TypeResolver; +import org.opentripplanner.framework.geometry.WgsCoordinate; +import org.opentripplanner.transit.model.site.StopLocation; + +public class PlanLocation implements TypeResolver { -public interface PlanLocation extends GraphQLDataFetchers.GraphQLPlanLocation { @Override - default GraphQLObjectType getType(TypeResolutionEnvironment env) { + public GraphQLObjectType getType(TypeResolutionEnvironment env) { + Object o = env.getObject(); + GraphQLSchema schema = env.getSchema(); + + if (o instanceof StopLocation) { + return schema.getObjectType("Stop"); + } + if (o instanceof WgsCoordinate) { + return schema.getObjectType("Coordinate"); + } + return null; } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java new file mode 100644 index 00000000000..e4953227a6c --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java @@ -0,0 +1,12 @@ +package org.opentripplanner.apis.gtfs.model; + +import graphql.relay.ConnectionCursor; +import java.time.Duration; + +public record PlanPageInfo( + ConnectionCursor startCursor, + ConnectionCursor endCursor, + boolean hasPreviousPage, + boolean hasNextPage, + Duration searchWindowUsed +) {} diff --git a/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java b/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java index 906ba37a892..334513fd419 100644 --- a/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java +++ b/src/main/java/org/opentripplanner/framework/graphql/GraphQLUtils.java @@ -17,7 +17,12 @@ public static String getTranslation(I18NString input, DataFetchingEnvironment en } public static Locale getLocale(DataFetchingEnvironment environment) { - return getLocale(environment, environment.getArgument("language")); + var localeString = environment.getArgument("language"); + if (localeString != null) { + return Locale.forLanguageTag((String) localeString); + } + + return getLocaleFromEnvironment(environment); } public static Locale getLocale(DataFetchingEnvironment environment, String localeString) { @@ -25,6 +30,18 @@ public static Locale getLocale(DataFetchingEnvironment environment, String local return Locale.forLanguageTag(localeString); } + return getLocaleFromEnvironment(environment); + } + + public static Locale getLocale(DataFetchingEnvironment environment, Locale locale) { + if (locale != null) { + return locale; + } + + return getLocaleFromEnvironment(environment); + } + + public static Locale getLocaleFromEnvironment(DataFetchingEnvironment environment) { // This can come from the accept-language header var userLocale = environment.getLocale(); var defaultLocale = getDefaultLocale(environment); From 40405ea821e713faf522c258e8628a5ebcb9d350 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 19 Feb 2024 14:56:06 +0200 Subject: [PATCH 0604/1688] Implement searchWindow, cursor and number of itineraries --- .../apis/gtfs/mapping/RouteRequestMapper.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 82cd5816132..00bf506955f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -31,6 +31,23 @@ public static RouteRequest toRouteRequest( request.setFrom(parseGenericLocation(args.getGraphQLOrigin())); request.setTo(parseGenericLocation(args.getGraphQLDestination())); request.setLocale(GraphQLUtils.getLocale(environment, args.getGraphQLLocale())); + if (args.getGraphQLSearchWindow() != null) { + request.setSearchWindow(args.getGraphQLSearchWindow()); + } + + if (args.getGraphQLBefore() != null) { + request.setPageCursorFromEncoded(args.getGraphQLBefore()); + if (args.getGraphQLLast() != null) { + request.setNumItineraries(args.getGraphQLLast()); + } + } else if (args.getGraphQLAfter() != null) { + request.setPageCursorFromEncoded(args.getGraphQLAfter()); + if (args.getGraphQLFirst() != null) { + request.setNumItineraries(args.getGraphQLFirst()); + } + } else if (args.getGraphQLNumberOfItineraries() != null) { + request.setNumItineraries(args.getGraphQLNumberOfItineraries()); + } return request; } From 4d295da420d2b7d1fb4fabcd88d5c5829a32a3c7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 19 Feb 2024 14:08:52 +0100 Subject: [PATCH 0605/1688] Throw exception in scalar again --- .../opentripplanner/apis/gtfs/GraphQLScalars.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index e6ab9f7dd5d..7d70f4be3b5 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -79,11 +79,9 @@ public String serialize(@Nonnull Object dataFetcherResult) @Override public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { if (input instanceof CharSequence cs) { - return OffsetDateTimeParser - .parseLeniently(cs) - .orElseThrow(CoercingParseValueException::new); + return OffsetDateTimeParser.parseLeniently(cs).orElseThrow(() -> valueException(input)); } - throw new CoercingParseValueException(); + throw valueException(input); } @Override @@ -95,6 +93,12 @@ public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralExce } throw new CoercingParseLiteralException(); } + + private static CoercingParseValueException valueException(Object input) { + return new CoercingParseValueException( + "Cannot parse %s into an OffsetDateTime.".formatted(input) + ); + } } ) .build(); From b66adfc2fcca9fc403c323c82418d87615e070d7 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 19 Feb 2024 16:47:29 +0200 Subject: [PATCH 0606/1688] Implement itinerary filters and ratio scalar --- .../apis/gtfs/GraphQLScalars.java | 58 ++++++++++++++++--- .../ItineraryFilterDebugProfileMapper.java | 21 +++++++ .../apis/gtfs/mapping/RouteRequestMapper.java | 35 +++++++++++ 3 files changed, 106 insertions(+), 8 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/ItineraryFilterDebugProfileMapper.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index eca5136bd27..e91215a765a 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -15,6 +15,7 @@ import java.time.OffsetDateTime; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; +import java.util.Optional; import javax.annotation.Nonnull; import org.locationtech.jts.geom.Geometry; import org.opentripplanner.framework.geometry.GeometryUtils; @@ -264,25 +265,66 @@ public Grams parseLiteral(Object input) throws CoercingParseLiteralException { ) .build(); - public static GraphQLScalarType ratioScalar = GraphQLScalarType + public static final GraphQLScalarType ratioScalar = GraphQLScalarType .newScalar() .name("Ratio") .coercing( - new Coercing() { + new Coercing() { @Override - public String serialize(@Nonnull Object dataFetcherResult) + public Double serialize(@Nonnull Object dataFetcherResult) throws CoercingSerializeException { - return null; + var validationException = new CoercingSerializeException( + "Value is under 0 or greater than 1." + ); + if (dataFetcherResult instanceof Double doubleValue) { + return validateRatio(doubleValue).orElseThrow(() -> validationException); + } else if (dataFetcherResult instanceof Float floatValue) { + return validateRatio(floatValue.doubleValue()).orElseThrow(() -> validationException); + } else { + throw new CoercingSerializeException( + "Cannot serialize object of class %s as a ratio".formatted( + dataFetcherResult.getClass().getSimpleName() + ) + ); + } } @Override - public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { - return null; + public Double parseValue(Object input) throws CoercingParseValueException { + if (input instanceof Double doubleValue) { + return validateRatio(doubleValue) + .orElseThrow(() -> + new CoercingParseValueException("Value is under 0 or greater than 1.") + ); + } + throw new CoercingParseValueException( + "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) + ); } @Override - public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { - return null; + public Double parseLiteral(Object input) throws CoercingParseLiteralException { + var validationException = new CoercingParseLiteralException( + "Value is under 0 or greater than 1." + ); + if (input instanceof FloatValue coordinate) { + return validateRatio(coordinate.getValue().doubleValue()) + .orElseThrow(() -> validationException); + } + if (input instanceof IntValue coordinate) { + return validateRatio(coordinate.getValue().doubleValue()) + .orElseThrow(() -> validationException); + } + throw new CoercingParseLiteralException( + "Expected a number, got: " + input.getClass().getSimpleName() + ); + } + + private static Optional validateRatio(double ratio) { + if (ratio >= -0.001 && ratio <= 1.001) { + return Optional.of(ratio); + } + return Optional.empty(); } } ) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/ItineraryFilterDebugProfileMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/ItineraryFilterDebugProfileMapper.java new file mode 100644 index 00000000000..40242783755 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/ItineraryFilterDebugProfileMapper.java @@ -0,0 +1,21 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; + +/** + * Maps ItineraryFilterDebugProfile from API to internal model. + */ +public class ItineraryFilterDebugProfileMapper { + + public static ItineraryFilterDebugProfile map( + GraphQLTypes.GraphQLItineraryFilterDebugProfile profile + ) { + return switch (profile) { + case LIMIT_TO_NUMBER_OF_ITINERARIES -> ItineraryFilterDebugProfile.LIMIT_TO_NUM_OF_ITINERARIES; + case LIMIT_TO_SEARCH_WINDOW -> ItineraryFilterDebugProfile.LIMIT_TO_SEARCH_WINDOW; + case LIST_ALL -> ItineraryFilterDebugProfile.LIST_ALL; + case OFF -> ItineraryFilterDebugProfile.OFF; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 00bf506955f..e25c887c87c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -8,6 +8,8 @@ import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; +import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.transit.model.framework.FeedScopedId; public class RouteRequestMapper { @@ -49,9 +51,42 @@ public static RouteRequest toRouteRequest( request.setNumItineraries(args.getGraphQLNumberOfItineraries()); } + request.withPreferences(preferences -> setPreferences(preferences, args)); + return request; } + private static void setPreferences( + RoutingPreferences.Builder prefs, + GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args + ) { + prefs.withItineraryFilter(filters -> + setItineraryFilters(filters, args.getGraphQLItineraryFilter()) + ); + } + + private static void setItineraryFilters( + ItineraryFilterPreferences.Builder filterPreferences, + GraphQLTypes.GraphQLPlanItineraryFilterInput filters + ) { + if (filters.getGraphQLItineraryFilterDebugProfile() != null) { + filterPreferences.withDebug( + ItineraryFilterDebugProfileMapper.map(filters.getGraphQLItineraryFilterDebugProfile()) + ); + } + if (filters.getGraphQLGroupSimilarityKeepOne() != null) { + filterPreferences.withGroupSimilarityKeepOne(filters.getGraphQLGroupSimilarityKeepOne()); + } + if (filters.getGraphQLGroupSimilarityKeepThree() != null) { + filterPreferences.withGroupSimilarityKeepThree(filters.getGraphQLGroupSimilarityKeepThree()); + } + if (filters.getGraphQLGroupedOtherThanSameLegsMaxCostMultiplier() != null) { + filterPreferences.withGroupedOtherThanSameLegsMaxCostMultiplier( + filters.getGraphQLGroupedOtherThanSameLegsMaxCostMultiplier() + ); + } + } + private static GenericLocation parseGenericLocation( GraphQLTypes.GraphQLPlanLabeledLocationInput locationInput ) { From 58bd1a49e1f5246a8bb78d9aee66b6b661a78d6b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 19 Feb 2024 17:22:05 +0200 Subject: [PATCH 0607/1688] Refactor so that correct exception is thrown --- .../apis/gtfs/GraphQLScalars.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index e91215a765a..19b511ea7ce 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -132,7 +132,10 @@ public Double serialize(@Nonnull Object dataFetcherResult) @Override public Double parseValue(Object input) throws CoercingParseValueException { if (input instanceof Double doubleValue) { - return validateCoordinate(doubleValue); + return validateCoordinate(doubleValue) + .orElseThrow(() -> + new CoercingParseValueException("Not a valid WGS84 coordinate value") + ); } throw new CoercingParseValueException( "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) @@ -141,22 +144,27 @@ public Double parseValue(Object input) throws CoercingParseValueException { @Override public Double parseLiteral(Object input) throws CoercingParseLiteralException { + var validationException = new CoercingParseLiteralException( + "Not a valid WGS84 coordinate value" + ); if (input instanceof FloatValue coordinate) { - return validateCoordinate(coordinate.getValue().doubleValue()); + return validateCoordinate(coordinate.getValue().doubleValue()) + .orElseThrow(() -> validationException); } if (input instanceof IntValue coordinate) { - return validateCoordinate(coordinate.getValue().doubleValue()); + return validateCoordinate(coordinate.getValue().doubleValue()) + .orElseThrow(() -> validationException); } throw new CoercingParseLiteralException( "Expected a number, got: " + input.getClass().getSimpleName() ); } - private static double validateCoordinate(double coordinate) { + private static Optional validateCoordinate(double coordinate) { if (coordinate >= -180.001 && coordinate <= 180.001) { - return coordinate; + return Optional.of(coordinate); } - throw new CoercingParseLiteralException("Not a valid WGS84 coordinate value"); + return Optional.empty(); } } ) From 257dda2a4e2130f1c059641dbb773a98e1c9ed22 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 19 Feb 2024 15:54:41 +0100 Subject: [PATCH 0608/1688] feature: Remove current time-penalty implementation --- .../raptor/api/model/RaptorConstants.java | 5 + .../mapping/RaptorPathToItineraryMapper.java | 4 - .../transit/DefaultAccessEgress.java | 50 +-------- .../transit/FlexAccessEgressAdapter.java | 10 +- .../AccessEgressPenaltyDecoratorTest.java | 7 +- .../transit/DefaultAccessEgressTest.java | 102 +----------------- 6 files changed, 12 insertions(+), 166 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java index f08b39641ed..5257c49fa35 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java @@ -21,6 +21,11 @@ */ public class RaptorConstants { + /** + * Zero (0) constant used inside Raptor. + */ + public static final int ZERO = 0; + /** * This constant is used to indicate that a value is not set. This applies to parameters of type * {@code generalized-cost}, {@code link min-travel-time} and {@code duration} inside Raptor. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java index 6e365b4cd49..2780cc8ba14 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java @@ -181,10 +181,6 @@ private List mapAccessLeg(AccessPathLeg accessPathLeg) { int fromTime = accessPathLeg.fromTime(); - if (accessPath.hasPenalty()) { - fromTime = accessPath.timeShiftDepartureTimeToActualTime(fromTime); - } - return subItinerary.withTimeShiftToStartAt(createZonedDateTime(fromTime)).getLegs(); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java index e0ca070d76f..34b7c71cf17 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java @@ -1,10 +1,8 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit; import java.util.Objects; -import java.util.function.IntUnaryOperator; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; -import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; import org.opentripplanner.street.search.state.State; @@ -36,7 +34,7 @@ protected DefaultAccessEgress(DefaultAccessEgress other, TimeAndCost penalty) { throw new IllegalStateException("Can not add penalty twice..."); } this.stop = other.stop(); - this.durationInSeconds = other.durationInSeconds() + (int) penalty.time().toSeconds(); + this.durationInSeconds = other.durationInSeconds(); this.generalizedCost = other.c1() + penalty.cost().toCentiSeconds(); this.penalty = penalty; this.lastState = other.getLastState(); @@ -97,10 +95,6 @@ public int latestArrivalTime(int requestedArrivalTime) { return requestedArrivalTime; } - public int timeShiftDepartureTimeToActualTime(int computedDepartureTimeIncludingPenalty) { - return computedDepartureTimeIncludingPenalty + penalty.timeInSeconds(); - } - @Override public String toString() { return asString(true, true, summary()); @@ -129,48 +123,6 @@ public int hashCode() { return Objects.hash(stop, durationInSeconds, generalizedCost, penalty); } - /** - * Allow a subclass to calculate the departureTime if it has opening hours. This method will - * adjust the times to apply the time penalty correct. - *

      - * The penalty must be removed before calculating the departure with the opening hours. - * Then before returning, the penalty must be added back. If the departure is not possible, - * this "state" must be kept. - */ - protected int calculateEarliestDepartureTimeWithOpeningHours( - int requestedDepartureTime, - IntUnaryOperator calculateFirstPossibleDeparture - ) { - int dt = penalty().timeInSeconds(); - int actual = requestedDepartureTime + dt; - int adjusted = calculateFirstPossibleDeparture.applyAsInt(actual); - return ifNotSet(adjusted, v -> v - dt); - } - - /** - * Allow a subclass to calculate the arrivalTime if it has opening hours. This method will adjust - * the times to apply the time penalty correct. - *

      - * The penalty must be removed before calculating the arrival with the opening hours. - * Then before returning, the penalty must be added back. If the arrival is not possible, - * this "state" must be kept. - */ - protected int calculateLatestArrivalTimeWithOpeningHours( - int requestedArrivalTime, - IntUnaryOperator calculateLatestPossibleArrival - ) { - int dt = penalty().timeInSeconds(); - int actual = requestedArrivalTime - dt; - int adjusted = calculateLatestPossibleArrival.applyAsInt(actual); - return ifNotSet(adjusted, v -> v + dt); - } - - protected int ifNotSet(int value, IntUnaryOperator body) { - return value == RaptorConstants.TIME_NOT_SET - ? RaptorConstants.TIME_NOT_SET - : body.applyAsInt(value); - } - /** * Include summary information in toString. We only include information relevant for using this * in routing (not latestState). diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index af602b857ad..0cf95b544f4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -27,18 +27,12 @@ private FlexAccessEgressAdapter(FlexAccessEgressAdapter other, TimeAndCost penal @Override public int earliestDepartureTime(int requestedDepartureTime) { - return calculateEarliestDepartureTimeWithOpeningHours( - requestedDepartureTime, - v -> mapToRaptorTime(flexAccessEgress.earliestDepartureTime(v)) - ); + return mapToRaptorTime(flexAccessEgress.earliestDepartureTime(requestedDepartureTime)); } @Override public int latestArrivalTime(int requestedArrivalTime) { - return calculateLatestArrivalTimeWithOpeningHours( - requestedArrivalTime, - v -> mapToRaptorTime(flexAccessEgress.latestArrivalTime(v)) - ); + return mapToRaptorTime(flexAccessEgress.latestArrivalTime(requestedArrivalTime)); } @Override diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java index e063ddfbb14..7d68c5bfeeb 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java @@ -42,12 +42,9 @@ class AccessEgressPenaltyDecoratorTest { @BeforeAll static void verifyTestSetup() { + assertEquals("Walk 2m15s C₁238_035 w/penalty(13m23s $1606) ~ 1", EXP_WALK_W_PENALTY.toString()); assertEquals( - "Walk 15m38s C₁238_035 w/penalty(13m23s $1606) ~ 1", - EXP_WALK_W_PENALTY.toString() - ); - assertEquals( - "Walk 11m53s C₁237_887 w/penalty(11m8s $1336) ~ 1", + "Walk 45s C₁237_887 w/penalty(11m8s $1336) ~ 1", EXP_CAR_RENTAL_W_PENALTY.toString() ); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java index a9e088a2ad3..494e25df62e 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java @@ -9,7 +9,6 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.TestStateBuilder; @@ -34,7 +33,7 @@ void durationInSeconds() { // TODO - The value is ? int expected = 118215; assertEquals(expected, subject.durationInSeconds()); - assertEquals(expected + TIME_PENALTY.toSeconds(), subjectWithPenalty.durationInSeconds()); + assertEquals(expected, subjectWithPenalty.durationInSeconds()); } @Test @@ -118,106 +117,9 @@ void latestArrivalTime() { assertEquals(89, subject.latestArrivalTime(89)); } - @Test - void timeShiftDepartureTimeToActualTime() { - assertEquals(89, subject.timeShiftDepartureTimeToActualTime(89)); - assertEquals( - 89 + PENALTY.timeInSeconds(), - subjectWithPenalty.timeShiftDepartureTimeToActualTime(89) - ); - } - @Test void testToString() { assertEquals("Walk 1d8h50m15s C₁236_429 ~ 5", subject.toString()); - assertEquals("Walk 1d8h50m16s C₁236_440 w/penalty(1s $11) ~ 5", subjectWithPenalty.toString()); - } - - @Test - void calculateEarliestDepartureTimeWithOpeningHours_NoPenalty() { - final int requestedTime = 100; - final int opensAtTime = 120; - assertEquals( - opensAtTime, - subject.calculateEarliestDepartureTimeWithOpeningHours( - requestedTime, - v -> { - assertEquals(requestedTime, v); - return opensAtTime; - } - ) - ); - } - - @Test - void calculateEarliestDepartureTimeWithOpeningHours_OpensAt() { - final int requestedTime = 100; - final int opensAtTime = 120; - - assertEquals( - opensAtTime - PENALTY.timeInSeconds(), - subjectWithPenalty.calculateEarliestDepartureTimeWithOpeningHours( - requestedTime, - v -> { - assertEquals(requestedTime + PENALTY.timeInSeconds(), v); - return opensAtTime; - } - ) - ); - } - - @Test - void calculateEarliestDepartureTimeWithOpeningHours_Closed() { - assertEquals( - RaptorConstants.TIME_NOT_SET, - subjectWithPenalty.calculateEarliestDepartureTimeWithOpeningHours( - 879789, - v -> RaptorConstants.TIME_NOT_SET - ) - ); - } - - @Test - void calculateLatestArrivalTimeWithOpeningHours_NoPenalty() { - final int requestedTime = 100; - final int closesAtTime = 80; - assertEquals( - closesAtTime, - subject.calculateLatestArrivalTimeWithOpeningHours( - requestedTime, - v -> { - assertEquals(requestedTime, v); - return closesAtTime; - } - ) - ); - } - - @Test - void calculateLatestArrivalTimeWithOpeningHours_ClosesAt() { - final int requestedTime = 100; - final int closesAtTime = 80; - - assertEquals( - closesAtTime + PENALTY.timeInSeconds(), - subjectWithPenalty.calculateLatestArrivalTimeWithOpeningHours( - requestedTime, - v -> { - assertEquals(requestedTime - PENALTY.timeInSeconds(), v); - return closesAtTime; - } - ) - ); - } - - @Test - void calculateLatestArrivalTimeWithOpeningHours_Closed() { - assertEquals( - RaptorConstants.TIME_NOT_SET, - subjectWithPenalty.calculateLatestArrivalTimeWithOpeningHours( - 879789, - v -> RaptorConstants.TIME_NOT_SET - ) - ); + assertEquals("Walk 1d8h50m15s C₁236_440 w/penalty(1s $11) ~ 5", subjectWithPenalty.toString()); } } From fdb1a7d736d544e5c3178741677005cb26b6e73b Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 19 Feb 2024 16:33:23 +0100 Subject: [PATCH 0609/1688] feature: Add time-penalty to RaptorAccessEgress and implement it in the OTP model --- .../raptor/api/model/RaptorAccessEgress.java | 29 +++++++++++++++++++ .../transit/DefaultAccessEgress.java | 5 ++++ .../transit/DefaultAccessEgressTest.java | 7 +++++ 3 files changed, 41 insertions(+) diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java index 16dff3b2e99..de1c91a0b4b 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java @@ -45,6 +45,35 @@ public interface RaptorAccessEgress { */ int durationInSeconds(); + /** + * Raptor can add an optional time-penalty to a access/egress to make it less favourable compared + * with other access/egress/transit options (paths). The penalty is a virtual extra duration of + * time added inside Raptor when comparing time. The penalty does not propagate the c1 or c2 cost + * values. This feature is useful when you want to limit the access/egress and the access/egress + * is FASTER than the preferred option. + *

      + * For example, for Park&Ride, driving all the way to the + * destination is very often the best option when looking at the time criteria. When an + * increasing time-penalty is applied to access/egress with driving then driving less become + * more favorable. This also improves perfomance, since we usually add a very high cost to + * driving - making all park&ride access legs optimal - forcing Raptor to compute a path for + * every option. The short drives are optimal on cost, and the long are optimal on time. In the + * case of park&ride the time-penalty enables Raptor to choose one of the shortest access/egress + * paths over the longer ones. + *

      + * Another example is FLEX, where we in many use-cases want regular transit to win if there is + * an offer. Only in the case where the FLEX is the only solution we want it to be presented. + * To achieve this, we must add an extra duration to the time of the FLEX access/egress - it does + * not help to just edd extra cost - witch makes both FLEX optimal on time and transit optimal on + * cost. Many optimal access paths have an inpact on performance as vell. + *

      + * + * The unit is seconds and default value is 0 seconds. + */ + default int timePenalty() { + return RaptorConstants.ZERO; + } + /* TIME-DEPENDENT ACCESS/TRANSFER/EGRESS */ // The methods below should be only overridden when an RaptorAccessEgress is only available at // specific times, such as flexible transit, TNC or shared vehicle schemes with limited opening diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java index 34b7c71cf17..000e56b300c 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java @@ -54,6 +54,11 @@ public int durationInSeconds() { return durationInSeconds; } + @Override + public int timePenalty() { + return penalty.timeInSeconds(); + } + @Override public int stop() { return stop; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java index 494e25df62e..6037eae74d7 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java @@ -36,6 +36,13 @@ void durationInSeconds() { assertEquals(expected, subjectWithPenalty.durationInSeconds()); } + @Test + void timePenalty() { + int expected = (int) TIME_PENALTY.toSeconds(); + assertEquals(expected, subject.timePenalty()); + assertEquals(expected, subjectWithPenalty.timePenalty()); + } + @Test void stop() { assertEquals(STOP, subject.stop()); From 92c7acd14e5b204c1d82d21ee35c5a2583f246a5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 20 Feb 2024 07:16:51 +0100 Subject: [PATCH 0610/1688] Switch order of arrival, departure --- docs/apis/GraphQL-Tutorial.md | 8 ++--- .../apis/gtfs/expectations/plan-extended.json | 32 +++++++++---------- .../apis/gtfs/expectations/plan.json | 32 +++++++++---------- .../apis/gtfs/queries/plan-extended.graphql | 8 ++--- .../apis/gtfs/queries/plan.graphql | 8 ++--- 5 files changed, 44 insertions(+), 44 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index 1a56d02b6ca..7e1f6b0f6db 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -96,14 +96,14 @@ Most people want to get routing results out of OTP, so lets see the query for th name lat lon - departure { + arrival { scheduledTime estimated { time delay } } - arrival { + departure { scheduledTime estimated { time @@ -115,14 +115,14 @@ Most people want to get routing results out of OTP, so lets see the query for th name lat lon - departure { + arrival { scheduledTime estimated { time delay } } - arrival { + departure { scheduledTime estimated { time diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json index bfb6d969cc7..ea58480be8e 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-extended.json @@ -30,11 +30,11 @@ "name" : "A", "lat" : 5.0, "lon" : 8.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null }, @@ -45,11 +45,11 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:00:20Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:00:20Z", "estimated" : null }, @@ -86,14 +86,14 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { "delay" : "PT10M", "time" : "2020-02-02T11:01:00Z" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { "delay" : "PT10M", @@ -107,14 +107,14 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:05:00Z", "estimated" : { "delay" : "PT10M", "time" : "2020-02-02T11:15:00Z" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:05:00Z", "estimated" : { "delay" : "PT10M", @@ -176,14 +176,14 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { "delay" : "PT10M", "time" : "2020-02-02T11:30:00Z" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { "delay" : "PT10M", @@ -197,14 +197,14 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:40:00Z", "estimated" : { "delay" : "PT10M", "time" : "2020-02-02T11:50:00Z" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:40:00Z", "estimated" : { "delay" : "PT10M", @@ -280,11 +280,11 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null }, @@ -295,11 +295,11 @@ "name" : "E", "lat" : 9.0, "lon" : 10.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T12:00:00Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T12:00:00Z", "estimated" : null }, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index 72d0cc017fe..ec971af5b3c 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -12,11 +12,11 @@ "name" : "A", "lat" : 5.0, "lon" : 8.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null } @@ -25,11 +25,11 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:00:20Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:00:20Z", "estimated" : null } @@ -43,14 +43,14 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { "time" : "2020-02-02T11:01:00Z", "delay" : "PT10M" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { "time" : "2020-02-02T11:01:00Z", @@ -62,14 +62,14 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:05:00Z", "estimated" : { "time" : "2020-02-02T11:15:00Z", "delay" : "PT10M" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:05:00Z", "estimated" : { "time" : "2020-02-02T11:15:00Z", @@ -92,14 +92,14 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { "time" : "2020-02-02T11:30:00Z", "delay" : "PT10M" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { "time" : "2020-02-02T11:30:00Z", @@ -111,14 +111,14 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:40:00Z", "estimated" : { "time" : "2020-02-02T11:50:00Z", "delay" : "PT10M" } }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:40:00Z", "estimated" : { "time" : "2020-02-02T11:50:00Z", @@ -141,11 +141,11 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null } @@ -154,11 +154,11 @@ "name" : "E", "lat" : 9.0, "lon" : 10.0, - "departure" : { + "arrival" : { "scheduledTime" : "2020-02-02T12:00:00Z", "estimated" : null }, - "arrival" : { + "departure" : { "scheduledTime" : "2020-02-02T12:00:00Z", "estimated" : null } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index dcec1a1026c..bcd96892e84 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -49,14 +49,14 @@ name lat lon - departure { + arrival { scheduledTime estimated { delay time } } - arrival { + departure { scheduledTime estimated { delay @@ -70,14 +70,14 @@ name lat lon - departure { + arrival { scheduledTime estimated { delay time } } - arrival { + departure { scheduledTime estimated { delay diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index 635b9f1531a..cc93ffb211c 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -25,14 +25,14 @@ name lat lon - departure { + arrival { scheduledTime estimated { time delay } } - arrival { + departure { scheduledTime estimated { time @@ -44,14 +44,14 @@ name lat lon - departure { + arrival { scheduledTime estimated { time delay } } - arrival { + departure { scheduledTime estimated { time From 39f06dcc5cf026317674917a30de66d53c0bb8e7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 20 Feb 2024 07:32:05 +0100 Subject: [PATCH 0611/1688] Add documentation --- src/main/java/org/opentripplanner/model/plan/Leg.java | 7 +++++++ .../org/opentripplanner/apis/gtfs/schema.graphqls | 7 ++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index e2d7d951556..0063ecf87c2 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -200,7 +200,14 @@ default Accessibility getTripWheelchairAccessibility() { return null; } + /** + * The time (including realtime information) when the leg starts. + */ LegTime start(); + + /** + * The time (including realtime information) when the leg ends.. + */ LegTime end(); /** diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 2f3e2862c01..93de5101451 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1655,6 +1655,7 @@ ISO-8601 allows many different formats but OTP will only return the profile spec """ scalar OffsetDateTime @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") +"Real-time estimates for a vehicle at a certain place." type RealtimeEstimate { time: OffsetDateTime! """ @@ -1672,7 +1673,7 @@ available. type LegTime { "The scheduled time of the event." scheduledTime: OffsetDateTime! - "The estimated time of the event, if available." + "The estimated time of the event. If no real-time information is available, this is null," estimated: RealtimeEstimate } @@ -1681,12 +1682,12 @@ type Leg { """ The time when the leg starts including real-time information, if available. """ - start: LegTime + start: LegTime! """ The time when the leg ends including real-time information, if available. """ - end: LegTime + end: LegTime! """The mode (e.g. `WALK`) used when traversing this leg.""" mode: Mode From b4707ed4c635f2451b3741212e8dbdc61eeef8b8 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 20 Feb 2024 09:00:33 +0100 Subject: [PATCH 0612/1688] Add test for leg times --- .../model/plan/ScheduledTransitLegTest.java | 65 +++++++++++++++---- 1 file changed, 54 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java b/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java index e45beb8ebad..b41ace81e8d 100644 --- a/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java +++ b/src/test/java/org/opentripplanner/model/plan/ScheduledTransitLegTest.java @@ -1,6 +1,8 @@ package org.opentripplanner.model.plan; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.time.OffsetDateTime; @@ -9,33 +11,74 @@ import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.RealTimeTripTimes; +import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; +import org.opentripplanner.transit.model.timetable.Trip; class ScheduledTransitLegTest { static final ZonedDateTime TIME = OffsetDateTime .parse("2023-04-17T17:49:06+02:00") .toZonedDateTime(); + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final Route ROUTE = TransitModelForTest.route(id("2")).build(); + private static final TripPattern PATTERN = TransitModelForTest + .tripPattern("1", ROUTE) + .withStopPattern(TEST_MODEL.stopPattern(3)) + .build(); + private static final Trip TRIP = TransitModelForTest.trip("trip1").build(); + private static final ScheduledTripTimes TRIP_TIMES = ScheduledTripTimes + .of() + .withArrivalTimes("10:00 11:00 12:00") + .withDepartureTimes("10:01 11:02 12:03") + .withTrip(TRIP) + .build(); @Test void defaultFares() { - var testModel = TransitModelForTest.of(); - var route = TransitModelForTest.route(id("2")).build(); - var pattern = TransitModelForTest - .tripPattern("1", route) - .withStopPattern(testModel.stopPattern(3)) + var leg = builder().build(); + + assertEquals(List.of(), leg.fareProducts()); + } + + @Test + void legTimesWithoutRealTime() { + var leg = builder().withTripTimes(TRIP_TIMES).build(); + + assertNull(leg.start().estimated()); + assertNull(leg.end().estimated()); + } + + @Test + void legTimesWithRealTime() { + var tt = ScheduledTripTimes + .of() + .withArrivalTimes("10:00 11:00 12:00") + .withDepartureTimes("10:01 11:02 12:03") + .withTrip(TRIP) .build(); - var leg = new ScheduledTransitLegBuilder() + + var rtt = RealTimeTripTimes.of(tt); + rtt.updateArrivalTime(0, 111); + + var leg = builder().withTripTimes(rtt).build(); + + assertNotNull(leg.start().estimated()); + assertNotNull(leg.end().estimated()); + } + + private static ScheduledTransitLegBuilder builder() { + return new ScheduledTransitLegBuilder() .withTripTimes(null) - .withTripPattern(pattern) + .withTripPattern(PATTERN) .withBoardStopIndexInPattern(0) .withAlightStopIndexInPattern(2) .withStartTime(TIME) .withEndTime(TIME.plusMinutes(10)) .withServiceDate(TIME.toLocalDate()) .withZoneId(ZoneIds.BERLIN) - .withGeneralizedCost(100) - .build(); - - assertEquals(List.of(), leg.fareProducts()); + .withGeneralizedCost(100); } } From 54c21a54a859bc2d692b439932fa67b095cc0137 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 20 Feb 2024 09:04:43 +0100 Subject: [PATCH 0613/1688] Fix flex leg and spelling --- .../org/opentripplanner/ext/flex/FlexibleTransitLeg.java | 4 ++-- src/main/java/org/opentripplanner/model/plan/LegTime.java | 6 +++--- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index e0bdb6cc899..fac1118556f 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -87,12 +87,12 @@ public Accessibility getTripWheelchairAccessibility() { @Override public LegTime start() { - return LegTime.of(startTime, getArrivalDelay()); + return LegTime.ofStatic(startTime); } @Override public LegTime end() { - return LegTime.of(endTime, getDepartureDelay()); + return LegTime.ofStatic(endTime); } @Override diff --git a/src/main/java/org/opentripplanner/model/plan/LegTime.java b/src/main/java/org/opentripplanner/model/plan/LegTime.java index 2dc97b92a11..4b30526ae82 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTime.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTime.java @@ -9,14 +9,14 @@ /** * A scheduled time of a transit vehicle at a certain location with a optional realtime information. */ -public record LegTime(@Nonnull ZonedDateTime scheduledTime, @Nullable RealtimeEstimate estimated) { +public record LegTime(@Nonnull ZonedDateTime scheduledTime, @Nullable RealTimeEstimate estimated) { public LegTime { Objects.requireNonNull(scheduledTime); } @Nonnull public static LegTime of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); - return new LegTime(realtime.minus(delay), new RealtimeEstimate(realtime, delay)); + return new LegTime(realtime.minus(delay), new RealTimeEstimate(realtime, delay)); } @Nonnull public static LegTime ofStatic(ZonedDateTime staticTime) { @@ -39,5 +39,5 @@ public ZonedDateTime time() { * Realtime information about a vehicle at a certain place. * @param delay Delay or "earliness" of a vehicle. Earliness is expressed as a negative number. */ - record RealtimeEstimate(ZonedDateTime time, Duration delay) {} + record RealTimeEstimate(ZonedDateTime time, Duration delay) {} } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 93de5101451..29fcdf42a41 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1656,7 +1656,7 @@ ISO-8601 allows many different formats but OTP will only return the profile spec scalar OffsetDateTime @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") "Real-time estimates for a vehicle at a certain place." -type RealtimeEstimate { +type RealTimeEstimate { time: OffsetDateTime! """ The delay or "earliness" of the vehicle at a certain place. @@ -1674,7 +1674,7 @@ type LegTime { "The scheduled time of the event." scheduledTime: OffsetDateTime! "The estimated time of the event. If no real-time information is available, this is null," - estimated: RealtimeEstimate + estimated: RealTimeEstimate } type Leg { From 3807451a4eae2815ffc6b88440d7c52fce6494e1 Mon Sep 17 00:00:00 2001 From: De Castri Andrea Date: Tue, 20 Feb 2024 10:24:03 +0100 Subject: [PATCH 0614/1688] feat: add short name in agency, use short name if name not exists --- .../netex/mapping/AuthorityToAgencyMapper.java | 6 +++++- .../transit/model/organization/Agency.java | 18 ++++++++++++++++-- .../model/organization/AgencyBuilder.java | 9 +++++++++ 3 files changed, 30 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java index 5e9727f4462..60d77ac2b47 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java @@ -33,9 +33,13 @@ class AuthorityToAgencyMapper { * Map authority and time zone to OTP agency. */ Agency mapAuthorityToAgency(Authority source) { + String agencyName = source.getName() != null ? source.getName().getValue() : null; + String agencyShortName = source.getShortName() != null ? source.getShortName().getValue() : null; + AgencyBuilder target = Agency .of(idFactory.createId(source.getId())) - .withName(source.getName().getValue()) + .withName(agencyName) + .withShortName(agencyShortName) .withTimezone(timeZone); withOptional( diff --git a/src/main/java/org/opentripplanner/transit/model/organization/Agency.java b/src/main/java/org/opentripplanner/transit/model/organization/Agency.java index 62de89e639b..8ed66a97ce1 100644 --- a/src/main/java/org/opentripplanner/transit/model/organization/Agency.java +++ b/src/main/java/org/opentripplanner/transit/model/organization/Agency.java @@ -17,6 +17,7 @@ public final class Agency extends AbstractTransitEntity implements LogInfo { private final String name; + private final String shortName; private final ZoneId timezone; private final String url; private final String lang; @@ -26,9 +27,17 @@ public final class Agency extends AbstractTransitEntity i Agency(AgencyBuilder builder) { super(builder.getId()); + // Fill agency name, if not exists take short name + String nameValue = (builder.getName() != null && !builder.getName().isBlank()) + ? builder.getName() + : builder.getShortName() != null && !builder.getShortName().isBlank() + ? builder.getShortName() + : null; + // Required fields - this.name = - assertHasValue(builder.getName(), "Missing mandatory name on Agency %s", builder.getId()); + this.name = assertHasValue(nameValue, "Missing mandatory name on Agency %s", builder.getId()); + this.shortName = builder.getShortName(); + this.timezone = ZoneId.of( assertHasValue( @@ -54,6 +63,10 @@ public static AgencyBuilder of(@Nonnull FeedScopedId id) { public String getName() { return logName(); } + @Nullable + public String getShortName() { + return shortName; + } @Nonnull public ZoneId getTimezone() { @@ -102,6 +115,7 @@ public boolean sameAs(@Nonnull Agency other) { return ( getId().equals(other.getId()) && Objects.equals(name, other.name) && + Objects.equals(shortName, other.shortName) && Objects.equals(timezone, other.timezone) && Objects.equals(url, other.url) && Objects.equals(lang, other.lang) && diff --git a/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java b/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java index 8411797f888..18c2dd09eb2 100644 --- a/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java @@ -7,6 +7,7 @@ public class AgencyBuilder extends AbstractEntityBuilder { private String name; + private String shortName; private String timezone; private String url; private String lang; @@ -21,6 +22,7 @@ public class AgencyBuilder extends AbstractEntityBuilder AgencyBuilder(@Nonnull Agency original) { super(original); this.name = original.getName(); + this.shortName = original.getShortName(); this.timezone = original.getTimezone().getId(); this.url = original.getUrl(); this.lang = original.getLang(); @@ -32,11 +34,18 @@ public class AgencyBuilder extends AbstractEntityBuilder public String getName() { return name; } + public String getShortName() { + return shortName; + } public AgencyBuilder withName(String name) { this.name = name; return this; } + public AgencyBuilder withShortName(String shortName) { + this.shortName = shortName; + return this; + } public String getTimezone() { return timezone; From 884d6cd201a04dad65b4a20d7ee0880374e2bc8a Mon Sep 17 00:00:00 2001 From: De Castri Andrea Date: Tue, 20 Feb 2024 11:37:39 +0100 Subject: [PATCH 0615/1688] test: test agency short name --- .../netex/mapping/AuthorityToAgencyMapperTest.java | 10 +++++++--- .../transit/model/organization/AgencyTest.java | 4 ++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java index 8ab84a4084a..3a47052b022 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java @@ -14,6 +14,7 @@ public class AuthorityToAgencyMapperTest { private static final String ID = "ID"; private static final String NAME = "Olsen"; + private static final String SHORT_NAME = "Short"; private static final String URL = "http://olsen.no/help"; private static final String PHONE = "+47 88882222"; private static final String TIME_ZONE = "CET"; @@ -24,7 +25,7 @@ public class AuthorityToAgencyMapperTest { @Test public void mapAgency() { // Given - Authority authority = authority(ID, NAME, URL, PHONE); + Authority authority = authority(ID, NAME, SHORT_NAME, URL, PHONE); // When mapped Agency a = mapper.mapAuthorityToAgency(authority); @@ -32,6 +33,7 @@ public void mapAgency() { // Then expect assertEquals(ID, a.getId().getId()); assertEquals(NAME, a.getName()); + assertEquals(SHORT_NAME, a.getShortName()); assertEquals(TIME_ZONE, a.getTimezone().getId()); assertEquals(URL, a.getUrl()); assertEquals(PHONE, a.getPhone()); @@ -40,7 +42,7 @@ public void mapAgency() { @Test public void mapAgencyWithoutOptionalElements() { // Given - Authority authority = authority(ID, NAME, null, null); + Authority authority = authority(ID, NAME, null, null, null); // When mapped Agency a = mapper.mapAuthorityToAgency(authority); @@ -48,6 +50,7 @@ public void mapAgencyWithoutOptionalElements() { // Then expect assertNull(a.getUrl()); assertNull(a.getPhone()); + assertNull(a.getShortName()); } @Test @@ -64,9 +67,10 @@ public void getDefaultAgency() { } @SuppressWarnings("SameParameterValue") - private static Authority authority(String id, String name, String url, String phone) { + private static Authority authority(String id, String name, String shortName, String url, String phone) { return new Authority() .withId(id) + .withShortName(new MultilingualString().withValue(shortName)) .withName(new MultilingualString().withValue(name)) .withContactDetails(new ContactStructure().withUrl(url).withPhone(phone)); } diff --git a/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java b/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java index b2cf1a57db3..ad5f0d9c289 100644 --- a/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java +++ b/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java @@ -14,6 +14,7 @@ class AgencyTest { private static final String ID = "1"; private static final String BRANDING_URL = "http://branding.aaa.com"; private static final String NAME = "name"; + private static final String SHORT_NAME = "shortname"; private static final String URL = "http://info.aaa.com"; private static final String TIMEZONE = "Europe/Oslo"; private static final String PHONE = "+47 95566333"; @@ -23,6 +24,7 @@ class AgencyTest { private static final Agency subject = Agency .of(TransitModelForTest.id(ID)) .withName(NAME) + .withShortName(SHORT_NAME) .withUrl(URL) .withTimezone(TIMEZONE) .withPhone(PHONE) @@ -48,6 +50,7 @@ void copy() { assertEquals(subject, copy); assertEquals(ID, copy.getId().getId()); + assertEquals(SHORT_NAME, copy.getShortName()); assertEquals("v2", copy.getName()); assertEquals(URL, copy.getUrl()); assertEquals(TIMEZONE, copy.getTimezone().getId()); @@ -62,6 +65,7 @@ void sameAs() { assertTrue(subject.sameAs(subject.copy().build())); assertFalse(subject.sameAs(subject.copy().withId(TransitModelForTest.id("X")).build())); assertFalse(subject.sameAs(subject.copy().withName("X").build())); + assertFalse(subject.sameAs(subject.copy().withShortName("X").build())); assertFalse(subject.sameAs(subject.copy().withUrl("X").build())); assertFalse(subject.sameAs(subject.copy().withTimezone("CET").build())); assertFalse(subject.sameAs(subject.copy().withPhone("X").build())); From d45a7a66eb7cec1d2017aea3949e7281ffd6ecf4 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 20 Feb 2024 12:13:13 +0100 Subject: [PATCH 0616/1688] feature: Remove searchWindowAccessSlackInSeconds (used with access time penalty) --- .../raptor/api/model/RaptorAccessEgress.java | 8 +- .../raptor/api/request/SearchParams.java | 36 +----- .../api/request/SearchParamsBuilder.java | 11 -- .../rangeraptor/DefaultRangeRaptorWorker.java | 8 +- .../ForwardRaptorTransitCalculator.java | 4 +- .../ReverseRaptorTransitCalculator.java | 4 +- .../raptoradapter/router/TransitRouter.java | 1 - .../router/street/AccessEgresses.java | 9 -- .../transit/mappers/RaptorRequestMapper.java | 11 -- .../J01_SearchWindowAccessSlack.java | 103 ------------------ .../router/street/AccessEgressesTest.java | 5 - .../transit/DefaultAccessEgressTest.java | 2 +- .../mappers/RaptorRequestMapperTest.java | 1 - 13 files changed, 16 insertions(+), 187 deletions(-) delete mode 100644 src/test/java/org/opentripplanner/raptor/moduletests/J01_SearchWindowAccessSlack.java diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java index de1c91a0b4b..894213315cf 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java @@ -68,7 +68,7 @@ public interface RaptorAccessEgress { * cost. Many optimal access paths have an inpact on performance as vell. *

      * - * The unit is seconds and default value is 0 seconds. + * The unit is seconds and the default value is 0 seconds. */ default int timePenalty() { return RaptorConstants.ZERO; @@ -99,16 +99,16 @@ default int timePenalty() { int latestArrivalTime(int requestedArrivalTime); /** - * This method should return {@code true} if, and only if the instance have restricted + * This method should return {@code true} if, and only if the instance has restricted * opening-hours. */ boolean hasOpeningHours(); /** * Return the opening hours in a short human-readable way for the departure at the origin. Do - * not parse this, this should only be used for things like testing, debugging and logging. + * not parse this. This should only be used for things like testing, debugging and logging. *

      - * This method return {@code null} if there is no opening hours, see {@link #hasOpeningHours()}. + * This method return {@code null} if there are no opening hours, see {@link #hasOpeningHours()}. */ @Nullable default String openingHoursToString() { diff --git a/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java b/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java index 03911e3eb4c..7dabe8e2a1c 100644 --- a/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java +++ b/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java @@ -19,7 +19,6 @@ public class SearchParams { private final int earliestDepartureTime; private final int latestArrivalTime; private final int searchWindowInSeconds; - private final int searchWindowAccessSlackInSeconds; private final boolean preferLateArrival; private final int numberOfAdditionalTransfers; private final int maxNumberOfTransfers; @@ -30,13 +29,12 @@ public class SearchParams { private final boolean allowEmptyAccessEgressPaths; /** - * Default values is defined in the default constructor. + * Default values are defined in the default constructor. */ private SearchParams() { earliestDepartureTime = RaptorConstants.TIME_NOT_SET; latestArrivalTime = RaptorConstants.TIME_NOT_SET; searchWindowInSeconds = RaptorConstants.NOT_SET; - searchWindowAccessSlackInSeconds = 0; preferLateArrival = false; numberOfAdditionalTransfers = 5; maxNumberOfTransfers = RaptorConstants.NOT_SET; @@ -51,7 +49,6 @@ private SearchParams() { this.earliestDepartureTime = builder.earliestDepartureTime(); this.latestArrivalTime = builder.latestArrivalTime(); this.searchWindowInSeconds = builder.searchWindowInSeconds(); - this.searchWindowAccessSlackInSeconds = builder.searchWindowAccessSlackInSeconds(); this.preferLateArrival = builder.preferLateArrival(); this.numberOfAdditionalTransfers = builder.numberOfAdditionalTransfers(); this.maxNumberOfTransfers = builder.maxNumberOfTransfers(); @@ -73,13 +70,6 @@ public int earliestDepartureTime() { return earliestDepartureTime; } - /** - * The {@link #earliestDepartureTime()} including search-window-access-slack. - */ - public int routerEarliestDepartureTime() { - return earliestDepartureTime - searchWindowAccessSlackInSeconds; - } - public boolean isEarliestDepartureTimeSet() { return earliestDepartureTime != RaptorConstants.TIME_NOT_SET; } @@ -102,10 +92,10 @@ public boolean isLatestArrivalTimeSet() { /** * The time window used to search. The unit is seconds. *

      - * For a *depart by search*, this is added to the 'earliestDepartureTime' to find the + * For a *depart-by-search*, this is added to the 'earliestDepartureTime' to find the * 'latestDepartureTime'. *

      - * For a *arrive by search* this is used to calculate the 'earliestArrivalTime'. The algorithm + * For an *arrive-by-search* this is used to calculate the 'earliestArrivalTime'. The algorithm * will find all optimal travels within the given time window. *

      * Set the search window to 0 (zero) to run 1 iteration. @@ -116,26 +106,6 @@ public int searchWindowInSeconds() { return searchWindowInSeconds; } - /** - * The {@link #searchWindowInSeconds()} plus search-window-access-slack. - */ - public int routerSearchWindowInSeconds() { - return searchWindowInSeconds == 0 - ? 0 - : searchWindowInSeconds() + searchWindowAccessSlackInSeconds; - } - - /** - * A slack to force Raptor to start the iterations before the earliest-departure-time. - * This will enable paths starting before the earliest-departure-time to be included in the - * result. This is useful if these paths are used to prune other paths(filtering) or if a - * path only can be time-shifted AFTER the search - this enables us to add a time-penalty - * to access. - */ - public int searchWindowAccessSlackInSeconds() { - return searchWindowAccessSlackInSeconds; - } - public boolean isSearchWindowSet() { return searchWindowInSeconds != RaptorConstants.NOT_SET; } diff --git a/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java b/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java index 587b7b09bd5..517780eb69c 100644 --- a/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java +++ b/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java @@ -24,7 +24,6 @@ public class SearchParamsBuilder { private int earliestDepartureTime; private int latestArrivalTime; private int searchWindowInSeconds; - private int searchWindowAccessSlackInSeconds; private boolean preferLateArrival; private int numberOfAdditionalTransfers; private int maxNumberOfTransfers; @@ -37,7 +36,6 @@ public SearchParamsBuilder(RaptorRequestBuilder parent, SearchParams defaults this.earliestDepartureTime = defaults.earliestDepartureTime(); this.latestArrivalTime = defaults.latestArrivalTime(); this.searchWindowInSeconds = defaults.searchWindowInSeconds(); - this.searchWindowAccessSlackInSeconds = defaults.searchWindowAccessSlackInSeconds(); this.preferLateArrival = defaults.preferLateArrival(); this.numberOfAdditionalTransfers = defaults.numberOfAdditionalTransfers(); this.maxNumberOfTransfers = defaults.maxNumberOfTransfers(); @@ -169,14 +167,6 @@ public SearchParamsBuilder allowEmptyAccessEgressPaths(boolean allowEmptyEgre return this; } - public int searchWindowAccessSlackInSeconds() { - return searchWindowAccessSlackInSeconds; - } - - public void searchWindowAccessSlack(Duration searchWindowAccessSlack) { - this.searchWindowAccessSlackInSeconds = (int) searchWindowAccessSlack.toSeconds(); - } - public boolean allowEmptyAccessEgressPaths() { return allowEmptyAccessEgressPaths; } @@ -197,7 +187,6 @@ public String toString() { .addServiceTime("earliestDepartureTime", earliestDepartureTime, RaptorConstants.TIME_NOT_SET) .addServiceTime("latestArrivalTime", latestArrivalTime, RaptorConstants.TIME_NOT_SET) .addDurationSec("searchWindow", searchWindowInSeconds) - .addDurationSec("searchWindowAccessSlack", searchWindowAccessSlackInSeconds, 0) .addBoolIfTrue("departAsLateAsPossible", preferLateArrival) .addNum("numberOfAdditionalTransfers", numberOfAdditionalTransfers) .addCollection("accessPaths", accessPaths, 5) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java index f0cd4e9628e..1b820e6e654 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java @@ -55,11 +55,11 @@ public final class DefaultRangeRaptorWorker private final RoutingStrategy transitWorker; /** - * The RangeRaptor state - we delegate keeping track of state to the state object, this allows the - * worker implementation to focus on the algorithm, while the state keep track of the result. + * The RangeRaptor state - we delegate keeping track of state to the state object, this allows + * the worker implementation to focus on the algorithm, while the state keep track of the result. *

      - * This also allow us to try out different strategies for storing the result in memory. For a long - * time we had a state which stored all data as int arrays in addition to the current + * This also allows us to try out different strategies for storing the result in memory. For a + * long time, we had a state which stored all data as int arrays in addition to the current * object-oriented approach. There were no performance differences(=> GC is not the bottleneck), * so we dropped the integer array implementation. */ diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java index 48ccd51e992..528c8ca276a 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java @@ -39,8 +39,8 @@ public ForwardRaptorTransitCalculator( @Nullable IntPredicate acceptC2AtDestination ) { this( - s.routerEarliestDepartureTime(), - s.routerSearchWindowInSeconds(), + s.earliestDepartureTime(), + s.searchWindowInSeconds(), s.latestArrivalTime(), t.iterationDepartureStepInSeconds(), acceptC2AtDestination diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java index 9fc80298191..867e04ef680 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java @@ -32,8 +32,8 @@ public ReverseRaptorTransitCalculator(SearchParams s, RaptorTuningParameters t) // goes with destination and 'latestArrivalTime()' match origin. this( s.latestArrivalTime(), - s.routerSearchWindowInSeconds(), - s.routerEarliestDepartureTime(), + s.searchWindowInSeconds(), + s.earliestDepartureTime(), t.iterationDepartureStepInSeconds() ); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index ab11d654ef7..b58af3c8b23 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -127,7 +127,6 @@ private TransitRouterResult route() { serverContext.raptorConfig().isMultiThreaded(), accessEgresses.getAccesses(), accessEgresses.getEgresses(), - accessEgresses.calculateMaxAccessTimePenalty(), serverContext.meterRegistry() ); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java index 09018dc3349..f2e8fe6c9f1 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java @@ -1,6 +1,5 @@ package org.opentripplanner.routing.algorithm.raptoradapter.router.street; -import java.time.Duration; import java.util.Collection; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; @@ -24,12 +23,4 @@ public Collection getAccesses() { public Collection getEgresses() { return egresses; } - - public Duration calculateMaxAccessTimePenalty() { - return accesses - .stream() - .map(it -> it.penalty().time()) - .max(Duration::compareTo) - .orElse(Duration.ZERO); - } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java index 91547b1f62f..879536fdcd0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java @@ -3,7 +3,6 @@ import static org.opentripplanner.raptor.api.request.Optimization.PARALLEL; import io.micrometer.core.instrument.MeterRegistry; -import java.time.Duration; import java.time.Instant; import java.time.ZonedDateTime; import java.util.Collection; @@ -21,7 +20,6 @@ import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; import org.opentripplanner.raptor.rangeraptor.SystemErrDebugLogger; import org.opentripplanner.routing.algorithm.raptoradapter.router.performance.PerformanceTimersForRaptor; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n; import org.opentripplanner.routing.api.request.DebugEventType; @@ -34,7 +32,6 @@ public class RaptorRequestMapper { private final RouteRequest request; private final Collection accessPaths; private final Collection egressPaths; - private final Duration searchWindowAccessSlack; private final long transitSearchTimeZeroEpocSecond; private final boolean isMultiThreadedEnbled; private final MeterRegistry meterRegistry; @@ -44,7 +41,6 @@ private RaptorRequestMapper( boolean isMultiThreaded, Collection accessPaths, Collection egressPaths, - Duration searchWindowAccessSlack, long transitSearchTimeZeroEpocSecond, MeterRegistry meterRegistry ) { @@ -52,7 +48,6 @@ private RaptorRequestMapper( this.isMultiThreadedEnbled = isMultiThreaded; this.accessPaths = accessPaths; this.egressPaths = egressPaths; - this.searchWindowAccessSlack = searchWindowAccessSlack; this.transitSearchTimeZeroEpocSecond = transitSearchTimeZeroEpocSecond; this.meterRegistry = meterRegistry; } @@ -63,7 +58,6 @@ public static RaptorRequest mapRequest( boolean isMultiThreaded, Collection accessPaths, Collection egressPaths, - Duration searchWindowAccessSlack, MeterRegistry meterRegistry ) { return new RaptorRequestMapper( @@ -71,7 +65,6 @@ public static RaptorRequest mapRequest( isMultiThreaded, accessPaths, egressPaths, - searchWindowAccessSlack, transitSearchTimeZero.toEpochSecond(), meterRegistry ) @@ -172,10 +165,6 @@ private RaptorRequest doMap() { builder.searchParams().preferLateArrival(true); } - if (searchWindowAccessSlack.toSeconds() > 0) { - builder.searchParams().searchWindowAccessSlack(searchWindowAccessSlack); - } - // Add this last, it depends on generating an alias from the set values if (meterRegistry != null) { builder.performanceTimers( diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/J01_SearchWindowAccessSlack.java b/src/test/java/org/opentripplanner/raptor/moduletests/J01_SearchWindowAccessSlack.java deleted file mode 100644 index 8caa3a862ca..00000000000 --- a/src/test/java/org/opentripplanner/raptor/moduletests/J01_SearchWindowAccessSlack.java +++ /dev/null @@ -1,103 +0,0 @@ -package org.opentripplanner.raptor.moduletests; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.raptor._data.transit.TestRoute.route; -import static org.opentripplanner.raptor._data.transit.TestTripPattern.pattern; -import static org.opentripplanner.raptor._data.transit.TestTripSchedule.schedule; -import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_MIN_DURATION; -import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_MIN_DURATION_REV; -import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.multiCriteria; -import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.standard; - -import java.time.Duration; -import java.util.List; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.raptor.RaptorService; -import org.opentripplanner.raptor._data.RaptorTestConstants; -import org.opentripplanner.raptor._data.api.PathUtils; -import org.opentripplanner.raptor._data.transit.TestAccessEgress; -import org.opentripplanner.raptor._data.transit.TestTransitData; -import org.opentripplanner.raptor._data.transit.TestTripSchedule; -import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; -import org.opentripplanner.raptor.configure.RaptorConfig; -import org.opentripplanner.raptor.moduletests.support.ModuleTestDebugLogging; -import org.opentripplanner.raptor.moduletests.support.RaptorModuleTestCase; - -/** - * FEATURE UNDER TEST - *

      - * Raptor should return a path starting before the search-window, if a search-window-access-slack - * is used. - */ -public class J01_SearchWindowAccessSlack implements RaptorTestConstants { - - private final TestTransitData data = new TestTransitData(); - private final RaptorRequestBuilder requestBuilder = new RaptorRequestBuilder<>(); - private final RaptorService raptorService = new RaptorService<>( - RaptorConfig.defaultConfigForTest() - ); - - /** - * Schedule: - * Stop: A B - * R1: 00:10 - 00:20 - * - * Access (toStop & duration): - * A 1m - * - * Egress (fromStop & duration): - * B 30s - */ - @BeforeEach - void setup() { - data.withRoute(route(pattern("R1", STOP_A, STOP_B)).withTimetable(schedule("00:10 00:20"))); - requestBuilder - .searchParams() - .addAccessPaths(TestAccessEgress.walk(STOP_A, D1m)) - .addEgressPaths(TestAccessEgress.walk(STOP_B, D30s)) - .latestArrivalTime(T00_30) - .timetable(true); - - ModuleTestDebugLogging.setupDebugLogging(data, requestBuilder); - } - - static List testCases() { - var path = "Walk 1m ~ A ~ BUS R1 0:10 0:20 ~ B ~ Walk 30s [0:09 0:20:30 11m30s Tₓ0 C₁1_380]"; - return RaptorModuleTestCase - .of() - .add(TC_MIN_DURATION, "[0:09 0:20:30 11m30s Tₓ0]") - .add(TC_MIN_DURATION_REV, "[0:18:30 0:30 11m30s Tₓ0]") - .add(standard(), PathUtils.withoutCost(path)) - .add(multiCriteria(), path) - .build(); - } - - @ParameterizedTest - @MethodSource("testCases") - void testRaptor1mSlack(RaptorModuleTestCase testCase) { - requestBuilder - .searchParams() - .earliestDepartureTime(T00_12) - .searchWindowAccessSlack(Duration.ofMinutes(3)); - - assertEquals(testCase.expected(), testCase.run(raptorService, data, requestBuilder)); - } - - @ParameterizedTest - @MethodSource("testCases") - void testRaptorNotEnoughSlack(RaptorModuleTestCase testCase) { - requestBuilder - .searchParams() - .earliestDepartureTime(T00_12) - .searchWindowAccessSlack(DurationUtils.duration("2m59s")); - - if (testCase.config() != TC_MIN_DURATION_REV) { - assertEquals("", testCase.run(raptorService, data, requestBuilder)); - } else { - assertEquals(testCase.expected(), testCase.run(raptorService, data, requestBuilder)); - } - } -} diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java index dfd0a1231c8..1779155a69b 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java @@ -50,9 +50,4 @@ void getAccesses() { void getEgresses() { assertEquals(EGRESSES, subject.getEgresses()); } - - @Test - void calculateMaxAccessTimePenalty() { - assertEquals(D7m, subject.calculateMaxAccessTimePenalty()); - } } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java index 6037eae74d7..0c9f29bc8a4 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java @@ -39,7 +39,7 @@ void durationInSeconds() { @Test void timePenalty() { int expected = (int) TIME_PENALTY.toSeconds(); - assertEquals(expected, subject.timePenalty()); + assertEquals(0, subject.timePenalty()); assertEquals(expected, subjectWithPenalty.timePenalty()); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java index 89348be5c89..47542782884 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapperTest.java @@ -90,7 +90,6 @@ private static RaptorRequest map(RouteRequest request) { false, ACCESS, EGRESS, - D0s, null ); } From 8f0d04ebeff6ad8c3adcb69133aa2181fde3b918 Mon Sep 17 00:00:00 2001 From: De Castri Andrea Date: Tue, 20 Feb 2024 13:55:06 +0100 Subject: [PATCH 0617/1688] chore: prettier --- .../netex/mapping/AuthorityToAgencyMapper.java | 4 +++- .../transit/model/organization/Agency.java | 5 +++-- .../transit/model/organization/AgencyBuilder.java | 2 ++ .../netex/mapping/AuthorityToAgencyMapperTest.java | 8 +++++++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java index 60d77ac2b47..23edb034079 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java @@ -34,7 +34,9 @@ class AuthorityToAgencyMapper { */ Agency mapAuthorityToAgency(Authority source) { String agencyName = source.getName() != null ? source.getName().getValue() : null; - String agencyShortName = source.getShortName() != null ? source.getShortName().getValue() : null; + String agencyShortName = source.getShortName() != null + ? source.getShortName().getValue() + : null; AgencyBuilder target = Agency .of(idFactory.createId(source.getId())) diff --git a/src/main/java/org/opentripplanner/transit/model/organization/Agency.java b/src/main/java/org/opentripplanner/transit/model/organization/Agency.java index 8ed66a97ce1..625078c06a7 100644 --- a/src/main/java/org/opentripplanner/transit/model/organization/Agency.java +++ b/src/main/java/org/opentripplanner/transit/model/organization/Agency.java @@ -31,8 +31,8 @@ public final class Agency extends AbstractTransitEntity i String nameValue = (builder.getName() != null && !builder.getName().isBlank()) ? builder.getName() : builder.getShortName() != null && !builder.getShortName().isBlank() - ? builder.getShortName() - : null; + ? builder.getShortName() + : null; // Required fields this.name = assertHasValue(nameValue, "Missing mandatory name on Agency %s", builder.getId()); @@ -63,6 +63,7 @@ public static AgencyBuilder of(@Nonnull FeedScopedId id) { public String getName() { return logName(); } + @Nullable public String getShortName() { return shortName; diff --git a/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java b/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java index 18c2dd09eb2..d4dd94c71e4 100644 --- a/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java @@ -34,6 +34,7 @@ public class AgencyBuilder extends AbstractEntityBuilder public String getName() { return name; } + public String getShortName() { return shortName; } @@ -42,6 +43,7 @@ public AgencyBuilder withName(String name) { this.name = name; return this; } + public AgencyBuilder withShortName(String shortName) { this.shortName = shortName; return this; diff --git a/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java index 3a47052b022..6d809ae92f0 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java @@ -67,7 +67,13 @@ public void getDefaultAgency() { } @SuppressWarnings("SameParameterValue") - private static Authority authority(String id, String name, String shortName, String url, String phone) { + private static Authority authority( + String id, + String name, + String shortName, + String url, + String phone + ) { return new Authority() .withId(id) .withShortName(new MultilingualString().withValue(shortName)) From aff064c491c2c5453872e32d76c2fbd9292d39f7 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 20 Feb 2024 23:15:06 +0200 Subject: [PATCH 0618/1688] Set default for number of itineraries --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index f717fb555a2..dcaf267c2c6 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -4261,7 +4261,7 @@ type QueryType { is a possibility that more itineraries are used later on (limiting the number of returned itineraries does not affect the performance by a lot but can affect the network bandwidth usage). """ - numberOfItineraries: Int + numberOfItineraries: Int = 50 """ The origin where the search starts. Usually coordinates but can also be a stop location. From 652afe203539fdc52a645198c7643c4f9b4b0ec5 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 20 Feb 2024 14:40:27 +0100 Subject: [PATCH 0619/1688] feature: Use decorators to apply time-penalty in Raptor --- .../model/AbstractAccessEgressDecorator.java | 115 ++++++++++++++++++ .../rangeraptor/DefaultRangeRaptorWorker.java | 2 +- .../rangeraptor/transit/AccessPaths.java | 18 ++- .../transit/AccessWithPenalty.java | 27 ++++ .../rangeraptor/transit/EgressPaths.java | 13 ++ .../transit/EgressWithPenalty.java | 27 ++++ .../transit/DefaultAccessEgress.java | 3 + 7 files changed, 202 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java create mode 100644 src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java create mode 100644 src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java diff --git a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java new file mode 100644 index 00000000000..34c914e6155 --- /dev/null +++ b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java @@ -0,0 +1,115 @@ +package org.opentripplanner.raptor.api.model; + +import java.util.Objects; +import javax.annotation.Nullable; + +/** + * Using delegation to extend the {@link RaptorAccessEgress} functionality is common, so we provide + * a base delegation implementation here. This implementation delegates all operations to the + * delegate. + */ +public class AbstractAccessEgressDecorator implements RaptorAccessEgress { + + private final RaptorAccessEgress delegate; + + public AbstractAccessEgressDecorator(RaptorAccessEgress delegate) { + this.delegate = delegate; + } + + protected RaptorAccessEgress delegate() { + return delegate; + } + + @Override + public int stop() { + return delegate.stop(); + } + + @Override + public int c1() { + return delegate.c1(); + } + + @Override + public int durationInSeconds() { + return delegate.durationInSeconds(); + } + + @Override + public int timePenalty() { + return delegate.timePenalty(); + } + + @Override + public int earliestDepartureTime(int requestedDepartureTime) { + return delegate.earliestDepartureTime(requestedDepartureTime); + } + + @Override + public int latestArrivalTime(int requestedArrivalTime) { + return delegate.latestArrivalTime(requestedArrivalTime); + } + + @Override + public boolean hasOpeningHours() { + return delegate.hasOpeningHours(); + } + + @Nullable + @Override + public String openingHoursToString() { + return delegate.openingHoursToString(); + } + + @Override + public int numberOfRides() { + return delegate.numberOfRides(); + } + + @Override + public boolean hasRides() { + return delegate.hasRides(); + } + + @Override + public boolean stopReachedOnBoard() { + return delegate.stopReachedOnBoard(); + } + + @Override + public boolean stopReachedByWalking() { + return delegate.stopReachedByWalking(); + } + + @Override + public boolean isFree() { + return delegate.isFree(); + } + + @Override + public String defaultToString() { + return delegate.defaultToString(); + } + + @Override + public String asString(boolean includeStop, boolean includeCost, @Nullable String summary) { + return delegate.asString(includeStop, includeCost, summary); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + AbstractAccessEgressDecorator that = (AbstractAccessEgressDecorator) o; + return Objects.equals(delegate, that.delegate); + } + + @Override + public int hashCode() { + return Objects.hash(delegate); + } +} diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java index 1b820e6e654..cc412ddc990 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java @@ -282,7 +282,7 @@ private void addAccessPaths(Collection accessPaths) { // Access must be available after the iteration departure time if (departureTime != RaptorConstants.TIME_NOT_SET) { - transitWorker.setAccessToStop(it, departureTime); + transitWorker.setAccessToStop(it, departureTime - it.timePenalty()); } } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 5c26a10db23..40386c37056 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -49,9 +49,9 @@ public int calculateMaxNumberOfRides() { /** * The multi-criteria state can handle multiple access/egress paths to a single stop, but the - * Standard and BestTime states do not. To get a deterministic behaviour we filter the paths and + * Standard and BestTime states do not. To get a deterministic behavior, we filter the paths and * return the paths with the shortest duration for non-multi-criteria search. If two paths have - * the same duration the first one is picked. Note! If the access/egress paths contains flex as + * the same duration, the first one is picked. Note! If the access/egress paths contains flex as * well, then we need to look at mode for arriving at tha stop as well. A Flex arrive-on-board can * be used with a transfer even if the time is worse compared with walking. *

      @@ -63,12 +63,26 @@ public static AccessPaths create(Collection paths, RaptorPro } else { paths = removeNonOptimalPathsForStandardRaptor(paths); } + + paths = decorateWithTimePenaltyLogic(paths); + return new AccessPaths( groupByRound(paths, RaptorAccessEgress::stopReachedByWalking), groupByRound(paths, RaptorAccessEgress::stopReachedOnBoard) ); } + /** + * Decorate access to implement time-penalty. This decoration will do the necessary + * adjustments to apply the penalty in the raptor algorithm. See the decorator class for more + * info. The original access object is returned if it does not have a time-penalty set. + */ + private static List decorateWithTimePenaltyLogic( + Collection paths + ) { + return paths.stream().map(it -> it.timePenalty() > 0 ? new AccessWithPenalty(it) : it).toList(); + } + /** Raptor uses this information to optimize boarding of the first trip */ public boolean hasTimeDependentAccess() { return ( diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java new file mode 100644 index 00000000000..e6b51f41de9 --- /dev/null +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java @@ -0,0 +1,27 @@ +package org.opentripplanner.raptor.rangeraptor.transit; + +import org.opentripplanner.raptor.api.model.AbstractAccessEgressDecorator; +import org.opentripplanner.raptor.api.model.RaptorAccessEgress; + +/** + * This decorator will add the time penalty to the duration of the access and adjust the + * `requestedDepartureTime` when time-shifting the access according to opening-hours. + * + * TODO PEN - Write more + */ +public class AccessWithPenalty extends AbstractAccessEgressDecorator { + + public AccessWithPenalty(RaptorAccessEgress delegate) { + super(delegate); + } + + @Override + public int durationInSeconds() { + return delegate().durationInSeconds() + delegate().timePenalty(); + } + + @Override + public int earliestDepartureTime(int requestedDepartureTime) { + return delegate().earliestDepartureTime(requestedDepartureTime + delegate().timePenalty()); + } +} diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java index 374fc050782..19c77901af0 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java @@ -32,6 +32,8 @@ private EgressPaths(TIntObjectMap> pathsByStop) { * This method is static and package local to enable unit-testing. */ public static EgressPaths create(Collection paths, RaptorProfile profile) { + paths = decorateWithTimePenaltyLogic(paths); + if (MULTI_CRITERIA.is(profile)) { paths = removeNonOptimalPathsForMcRaptor(paths); } else { @@ -72,6 +74,17 @@ public int[] egressesWitchStartByARide() { return filterPathsAndGetStops(RaptorAccessEgress::stopReachedOnBoard); } + /** + * Decorate egress to implement time-penalty. This decoration will do the necessary + * adjustments to apply the penalty in the raptor algorithm. See the decorator class for more + * info. The original egress object is returned if it does not have a time-penalty set. + */ + private static List decorateWithTimePenaltyLogic( + Collection paths + ) { + return paths.stream().map(it -> it.timePenalty() > 0 ? new EgressWithPenalty(it) : it).toList(); + } + private int[] filterPathsAndGetStops(Predicate filter) { return pathsByStop .valueCollection() diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java new file mode 100644 index 00000000000..fb64fdcf487 --- /dev/null +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java @@ -0,0 +1,27 @@ +package org.opentripplanner.raptor.rangeraptor.transit; + +import org.opentripplanner.raptor.api.model.AbstractAccessEgressDecorator; +import org.opentripplanner.raptor.api.model.RaptorAccessEgress; + +/** + * This decorator will add the time penalty to the duration of the egress and adjust the + * `requestedDepartureTime` when time-shifting the egress according to opening-hours. + * + * TODO PEN - Write more + */ +public class EgressWithPenalty extends AbstractAccessEgressDecorator { + + public EgressWithPenalty(RaptorAccessEgress delegate) { + super(delegate); + } + + @Override + public int durationInSeconds() { + return delegate().durationInSeconds() + delegate().timePenalty(); + } + + @Override + public int latestArrivalTime(int requestedArrivalTime) { + return delegate().latestArrivalTime(requestedArrivalTime - delegate().timePenalty()); + } +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java index 000e56b300c..67f56d0b4ad 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java @@ -35,6 +35,9 @@ protected DefaultAccessEgress(DefaultAccessEgress other, TimeAndCost penalty) { } this.stop = other.stop(); this.durationInSeconds = other.durationInSeconds(); + // In the API we have a cost associated with the time-penalty. In Raptor, there is no + // association between the time-penalty and the cost. So, we add the time-penalty cost to + // the generalized cost here. In logic later on, we will remove it. this.generalizedCost = other.c1() + penalty.cost().toCentiSeconds(); this.penalty = penalty; this.lastState = other.getLastState(); From 367b4025c5e63071eb3be0f38db9ea9705cb11e8 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 20 Feb 2024 23:37:28 +0200 Subject: [PATCH 0620/1688] Remove static transit mode cost from schema --- .../apis/gtfs/generated/GraphQLTypes.java | 10 ---------- .../org/opentripplanner/apis/gtfs/schema.graphqls | 7 +------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index 238490ea304..05957c32b17 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -4627,28 +4627,18 @@ public enum GraphQLTransitMode { public static class GraphQLTransitModePreferenceCostInput { - private org.opentripplanner.framework.model.Cost cost; private Double reluctance; public GraphQLTransitModePreferenceCostInput(Map args) { if (args != null) { - this.cost = (org.opentripplanner.framework.model.Cost) args.get("cost"); this.reluctance = (Double) args.get("reluctance"); } } - public org.opentripplanner.framework.model.Cost getGraphQLCost() { - return this.cost; - } - public Double getGraphQLReluctance() { return this.reluctance; } - public void setGraphQLCost(org.opentripplanner.framework.model.Cost cost) { - this.cost = cost; - } - public void setGraphQLReluctance(Double reluctance) { this.reluctance = reluctance; } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index dcaf267c2c6..691a1e4ac55 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -5231,15 +5231,10 @@ input PlanTransitModePreferenceInput { Costs related to using a transit mode. """ input TransitModePreferenceCostInput { - """ - A static cost that is added each time a transit mode is used. - """ - cost: Cost - """ A cost multiplier of transit leg travel time. """ - reluctance: Reluctance + reluctance: Reluctance! } """ From 41fac36758a7d1441feb6c0b690643c7c0e5edde Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 20 Feb 2024 23:55:40 +0200 Subject: [PATCH 0621/1688] Add basic implementation for modes arguments --- .../apis/gtfs/mapping/AccessModeMapper.java | 24 ++++ .../apis/gtfs/mapping/DirectModeMapper.java | 24 ++++ .../apis/gtfs/mapping/EgressModeMapper.java | 22 ++++ .../apis/gtfs/mapping/RouteRequestMapper.java | 116 +++++++++++++++++- .../apis/gtfs/mapping/TransferModeMapper.java | 17 +++ .../apis/gtfs/mapping/TransitModeMapper.java | 29 +++++ 6 files changed, 230 insertions(+), 2 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/AccessModeMapper.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectModeMapper.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/EgressModeMapper.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/TransferModeMapper.java create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/AccessModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/AccessModeMapper.java new file mode 100644 index 00000000000..5b26c8d5ee1 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/AccessModeMapper.java @@ -0,0 +1,24 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.routing.api.request.StreetMode; + +/** + * Maps access street mode from API to internal model. + */ +public class AccessModeMapper { + + public static StreetMode map(GraphQLTypes.GraphQLPlanAccessMode mode) { + return switch (mode) { + case BICYCLE -> StreetMode.BIKE; + case BICYCLE_RENTAL -> StreetMode.BIKE_RENTAL; + case BICYCLE_PARKING -> StreetMode.BIKE_TO_PARK; + case CAR_RENTAL -> StreetMode.CAR_RENTAL; + case CAR_PARKING -> StreetMode.CAR_TO_PARK; + case CAR_DROP_OFF -> StreetMode.CAR_PICKUP; + case FLEX -> StreetMode.FLEXIBLE; + case SCOOTER_RENTAL -> StreetMode.SCOOTER_RENTAL; + case WALK -> StreetMode.WALK; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectModeMapper.java new file mode 100644 index 00000000000..2e7fcee3d2f --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectModeMapper.java @@ -0,0 +1,24 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.routing.api.request.StreetMode; + +/** + * Maps direct street mode from API to internal model. + */ +public class DirectModeMapper { + + public static StreetMode map(GraphQLTypes.GraphQLPlanDirectMode mode) { + return switch (mode) { + case BICYCLE -> StreetMode.BIKE; + case BICYCLE_RENTAL -> StreetMode.BIKE_RENTAL; + case BICYCLE_PARKING -> StreetMode.BIKE_TO_PARK; + case CAR -> StreetMode.CAR; + case CAR_RENTAL -> StreetMode.CAR_RENTAL; + case CAR_PARKING -> StreetMode.CAR_TO_PARK; + case FLEX -> StreetMode.FLEXIBLE; + case SCOOTER_RENTAL -> StreetMode.SCOOTER_RENTAL; + case WALK -> StreetMode.WALK; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/EgressModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/EgressModeMapper.java new file mode 100644 index 00000000000..4033b3e516d --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/EgressModeMapper.java @@ -0,0 +1,22 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.routing.api.request.StreetMode; + +/** + * Maps egress street mode from API to internal model. + */ +public class EgressModeMapper { + + public static StreetMode map(GraphQLTypes.GraphQLPlanEgressMode mode) { + return switch (mode) { + case BICYCLE -> StreetMode.BIKE; + case BICYCLE_RENTAL -> StreetMode.BIKE_RENTAL; + case CAR_RENTAL -> StreetMode.CAR_RENTAL; + case CAR_PICKUP -> StreetMode.CAR_PICKUP; + case FLEX -> StreetMode.FLEXIBLE; + case SCOOTER_RENTAL -> StreetMode.SCOOTER_RENTAL; + case WALK -> StreetMode.WALK; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index e25c887c87c..b08f4b245f9 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -2,14 +2,22 @@ import graphql.schema.DataFetchingEnvironment; import java.time.Instant; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; import javax.annotation.Nonnull; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; +import org.opentripplanner.routing.api.request.preference.TransitPreferences; +import org.opentripplanner.routing.api.request.request.filter.SelectRequest; +import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; +import org.opentripplanner.transit.model.basic.MainAndSubMode; import org.opentripplanner.transit.model.framework.FeedScopedId; public class RouteRequestMapper { @@ -51,18 +59,22 @@ public static RouteRequest toRouteRequest( request.setNumItineraries(args.getGraphQLNumberOfItineraries()); } - request.withPreferences(preferences -> setPreferences(preferences, args)); + request.withPreferences(preferences -> setPreferences(preferences, args, environment)); + + setModes(request, args.getGraphQLModes(), environment); return request; } private static void setPreferences( RoutingPreferences.Builder prefs, - GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args + GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args, + DataFetchingEnvironment environment ) { prefs.withItineraryFilter(filters -> setItineraryFilters(filters, args.getGraphQLItineraryFilter()) ); + prefs.withTransit(transit -> setTransitPreferences(transit, args, environment)); } private static void setItineraryFilters( @@ -87,6 +99,106 @@ private static void setItineraryFilters( } } + private static void setTransitPreferences( + TransitPreferences.Builder preferences, + GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args, + DataFetchingEnvironment environment + ) { + var modes = args.getGraphQLModes(); + var transit = getTransitModes(environment); + if (!Boolean.TRUE.equals(modes.getGraphQLDirectOnly()) && transit.size() > 0) { + // TODO what to do with the static cost? + var reluctanceForMode = transit + .stream() + .filter(mode -> mode.containsKey("cost")) + .collect( + Collectors.toMap( + mode -> + TransitModeMapper.map( + GraphQLTypes.GraphQLTransitMode.valueOf((String) mode.get("mode")) + ), + mode -> (Double) ((Map) mode.get("cost")).get("reluctance") + ) + ); + preferences.setReluctanceForMode(reluctanceForMode); + } + } + + /** + * TODO this doesn't support multiple street modes yet + */ + private static void setModes( + RouteRequest request, + GraphQLTypes.GraphQLPlanModesInput modesInput, + DataFetchingEnvironment environment + ) { + var direct = modesInput.getGraphQLDirect(); + if (Boolean.TRUE.equals(modesInput.getGraphQLTransitOnly())) { + request.journey().direct().setMode(StreetMode.NOT_SET); + } else if (direct != null && direct.size() > 0) { + request.journey().direct().setMode(DirectModeMapper.map(direct.getFirst())); + } + + var transit = modesInput.getGraphQLTransit(); + if (Boolean.TRUE.equals(modesInput.getGraphQLDirectOnly())) { + request.journey().transit().disable(); + } else if (transit != null) { + var access = transit.getGraphQLAccess(); + if (access != null && access.size() > 0) { + request.journey().access().setMode(AccessModeMapper.map(access.getFirst())); + } + + var egress = transit.getGraphQLEgress(); + if (egress != null && egress.size() > 0) { + request.journey().egress().setMode(EgressModeMapper.map(egress.getFirst())); + } + + var transfer = transit.getGraphQLTransfer(); + if (transfer != null && transfer.size() > 0) { + request.journey().transfer().setMode(TransferModeMapper.map(transfer.getFirst())); + } + + var transitModes = getTransitModes(environment); + if (transitModes.size() > 0) { + var filterRequestBuilder = TransitFilterRequest.of(); + var mainAndSubModes = transitModes + .stream() + .map(mode -> + new MainAndSubMode( + TransitModeMapper.map( + GraphQLTypes.GraphQLTransitMode.valueOf((String) mode.get("mode")) + ) + ) + ) + .toList(); + filterRequestBuilder.addSelect( + SelectRequest.of().withTransportModes(mainAndSubModes).build() + ); + request.journey().transit().setFilters(List.of(filterRequestBuilder.build())); + } + } + } + + /** + * This methods returns list of modes and their costs from the argument structure: + * modes.transit.transit. This methods circumvents a bug in graphql-codegen as getting a list of + * input objects is not possible through using the generated types in {@link GraphQLTypes}. + *

      + * TODO this ugliness can be removed when the bug gets fixed + */ + private static List> getTransitModes(DataFetchingEnvironment environment) { + if (environment.containsArgument("modes")) { + Map modesArgs = environment.getArgument("modes"); + if (modesArgs.containsKey("transit")) { + Map transitArgs = (Map) modesArgs.get("transit"); + if (transitArgs.containsKey("transit")) { + return (List>) transitArgs.get("transit"); + } + } + } + return List.of(); + } + private static GenericLocation parseGenericLocation( GraphQLTypes.GraphQLPlanLabeledLocationInput locationInput ) { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransferModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransferModeMapper.java new file mode 100644 index 00000000000..674a7c08423 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransferModeMapper.java @@ -0,0 +1,17 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.routing.api.request.StreetMode; + +/** + * Maps transfer street mode from API to internal model. + */ +public class TransferModeMapper { + + public static StreetMode map(GraphQLTypes.GraphQLPlanTransferMode mode) { + return switch (mode) { + case BICYCLE -> StreetMode.BIKE; + case WALK -> StreetMode.WALK; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java new file mode 100644 index 00000000000..2128263d8de --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransitModeMapper.java @@ -0,0 +1,29 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.transit.model.basic.TransitMode; + +/** + * Maps transit mode from API to internal model. + */ +public class TransitModeMapper { + + public static TransitMode map(GraphQLTypes.GraphQLTransitMode mode) { + return switch (mode) { + case AIRPLANE -> TransitMode.AIRPLANE; + case BUS -> TransitMode.BUS; + case CABLE_CAR -> TransitMode.CABLE_CAR; + case COACH -> TransitMode.COACH; + case FERRY -> TransitMode.FERRY; + case FUNICULAR -> TransitMode.FUNICULAR; + case GONDOLA -> TransitMode.GONDOLA; + case RAIL -> TransitMode.RAIL; + case SUBWAY -> TransitMode.SUBWAY; + case TRAM -> TransitMode.TRAM; + case CARPOOL -> TransitMode.CARPOOL; + case TAXI -> TransitMode.TAXI; + case TROLLEYBUS -> TransitMode.TROLLEYBUS; + case MONORAIL -> TransitMode.MONORAIL; + }; + } +} From ca49ca609e61c6b0e16ffd5c54a8513665c64948 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 20 Feb 2024 23:02:53 +0100 Subject: [PATCH 0622/1688] feature: Remove access/egress time-penalty decorators when returning out of Raptor --- .../api/model/AbstractAccessEgressDecorator.java | 15 +++++++++++++++ .../raptor/path/PathBuilderLeg.java | 11 ++++++++++- .../rangeraptor/transit/AccessWithPenalty.java | 9 +++++++++ .../rangeraptor/transit/EgressWithPenalty.java | 9 +++++++++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java index 34c914e6155..d01c41dc0ca 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java @@ -112,4 +112,19 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(delegate); } + + /** + * Use this method to remove a decorator of the given type. + */ + public static RaptorAccessEgress removeRaptorDecoratorIfItExist( + RaptorAccessEgress path, + Class decoratorClazz + ) { + if (path == null) { + return null; + } + return path.getClass() == decoratorClazz + ? ((AbstractAccessEgressDecorator) path).delegate() + : path; + } } diff --git a/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java b/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java index 76d49ef4a0a..4c919ca9d7a 100644 --- a/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java +++ b/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java @@ -15,6 +15,8 @@ import org.opentripplanner.raptor.api.path.PathStringBuilder; import org.opentripplanner.raptor.api.path.TransferPathLeg; import org.opentripplanner.raptor.api.path.TransitPathLeg; +import org.opentripplanner.raptor.rangeraptor.transit.AccessWithPenalty; +import org.opentripplanner.raptor.rangeraptor.transit.EgressWithPenalty; import org.opentripplanner.raptor.rangeraptor.transit.ForwardTransitCalculator; import org.opentripplanner.raptor.rangeraptor.transit.TransitCalculator; import org.opentripplanner.raptor.spi.BoardAndAlightTime; @@ -351,6 +353,9 @@ AccessPathLeg createAccessPathLeg( PathLeg nextLeg = next.createPathLeg(costCalculator, slackProvider); var accessPath = asAccessLeg().streetPath; int cost = cost(costCalculator, accessPath); + + accessPath = AccessWithPenalty.removeDecoratorIfItExist(accessPath); + return new AccessPathLeg<>(accessPath, fromTime, toTime, cost, nextLeg); } @@ -447,7 +452,11 @@ private EgressPathLeg createEgressPathLeg( RaptorSlackProvider slackProvider ) { int cost = egressCost(costCalculator, slackProvider); - return new EgressPathLeg<>(asEgressLeg().streetPath, fromTime, toTime, cost); + var egressPath = asEgressLeg().streetPath; + + egressPath = EgressWithPenalty.removeDecoratorIfItExist(egressPath); + + return new EgressPathLeg<>(egressPath, fromTime, toTime, cost); } /** diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java index e6b51f41de9..1226d56c028 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java @@ -24,4 +24,13 @@ public int durationInSeconds() { public int earliestDepartureTime(int requestedDepartureTime) { return delegate().earliestDepartureTime(requestedDepartureTime + delegate().timePenalty()); } + + /** + * This class is used internally in Raptor to decorate an access path. This method removes the + * decorator and returns the original access path if decorated. If not, the given path is + * returned. + */ + public static RaptorAccessEgress removeDecoratorIfItExist(RaptorAccessEgress path) { + return removeRaptorDecoratorIfItExist(path, AccessWithPenalty.class); + } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java index fb64fdcf487..d6a50f7c982 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java @@ -24,4 +24,13 @@ public int durationInSeconds() { public int latestArrivalTime(int requestedArrivalTime) { return delegate().latestArrivalTime(requestedArrivalTime - delegate().timePenalty()); } + + /** + * This class is used internally in Raptor to decorate an access path. This method removes the + * decorator and returns the original access path if decorated. If not, the given path is + * returned. + */ + public static RaptorAccessEgress removeDecoratorIfItExist(RaptorAccessEgress path) { + return removeRaptorDecoratorIfItExist(path, EgressWithPenalty.class); + } } From 567a6a5bf164f38f13b32de0430e79befba983f4 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 21 Feb 2024 00:37:14 +0100 Subject: [PATCH 0623/1688] refactor: Encapsulate access paths in AccessPaths --- .../rangeraptor/DefaultRangeRaptorWorker.java | 8 +-- .../multicriteria/McStopArrivals.java | 14 ++--- .../rangeraptor/transit/AccessPaths.java | 60 ++++++++++++------- 3 files changed, 45 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java index cc412ddc990..a05d6aa832f 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java @@ -261,11 +261,11 @@ private void findTransfersForRound() { } private void findAccessOnStreetForRound() { - addAccessPaths(accessPaths.arrivedOnStreetByNumOfRides().get(round())); + addAccessPaths(accessPaths.arrivedOnStreetByNumOfRides(round())); } private void findAccessOnBoardForRound() { - addAccessPaths(accessPaths.arrivedOnBoardByNumOfRides().get(round())); + addAccessPaths(accessPaths.arrivedOnBoardByNumOfRides(round())); } /** @@ -273,10 +273,6 @@ private void findAccessOnBoardForRound() { * scheduled search at the next-earlier minute. */ private void addAccessPaths(Collection accessPaths) { - if (accessPaths == null) { - return; - } - for (RaptorAccessEgress it : accessPaths) { int departureTime = calculator.departureTime(it, iterationDepartureTime); diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java index 98bb22a46c5..4090890cc82 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/McStopArrivals.java @@ -2,13 +2,10 @@ import static org.opentripplanner.raptor.api.model.PathLegType.TRANSIT; -import gnu.trove.map.TIntObjectMap; import java.util.BitSet; import java.util.Collections; -import java.util.List; import java.util.function.Function; import java.util.stream.Stream; -import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.rangeraptor.debug.DebugHandlerFactory; import org.opentripplanner.raptor.rangeraptor.multicriteria.arrivals.ArrivalParetoSetComparatorFactory; @@ -54,7 +51,7 @@ public McStopArrivals( this.debugHandlerFactory = debugHandlerFactory; this.debugStats = new DebugStopArrivalsStatistics(debugHandlerFactory.debugLogger()); - initAccessArrivals(accessPaths.arrivedOnBoardByNumOfRides()); + initAccessArrivals(accessPaths); glueTogetherEgressStopWithDestinationArrivals(egressPaths, paths); } @@ -142,9 +139,10 @@ private StopArrivalParetoSet findOrCreateSet(final int stop) { return arrivals[stop]; } - private void initAccessArrivals(TIntObjectMap> accessOnBoardByRides) { - for (int round : accessOnBoardByRides.keys()) { - for (var access : accessOnBoardByRides.get(round)) { + private void initAccessArrivals(AccessPaths accessPaths) { + int maxNRides = accessPaths.calculateMaxNumberOfRides(); + for (int nRides = 0; nRides <= maxNRides; ++nRides) { + for (var access : accessPaths.arrivedOnBoardByNumOfRides(nRides)) { int stop = access.stop(); arrivals[stop] = StopArrivalParetoSet.createStopArrivalSet( @@ -157,7 +155,7 @@ private void initAccessArrivals(TIntObjectMap> accessOn /** * This method creates a ParetoSet for the given egress stop. When arrivals are added to the stop, - * the "glue" make sure new destination arrivals is added to the destination arrivals. + * the "glue" make sure new destination arrivals are added to the destination arrivals. */ private void glueTogetherEgressStopWithDestinationArrivals( EgressPaths egressPaths, diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 40386c37056..2e8bd01049a 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -24,29 +24,6 @@ private AccessPaths( this.arrivedOnBoardByNumOfRides = arrivedOnBoardByNumOfRides; } - /** - * Return the transfer arriving at the stop on-street(walking) grouped by Raptor round. The Raptor - * round is calculated from the number of rides in the transfer. - */ - public TIntObjectMap> arrivedOnStreetByNumOfRides() { - return arrivedOnStreetByNumOfRides; - } - - /** - * Return the transfer arriving at the stop on-board a transit(flex) service grouped by Raptor - * round. The Raptor round is calculated from the number of rides in the transfer. - */ - public TIntObjectMap> arrivedOnBoardByNumOfRides() { - return arrivedOnBoardByNumOfRides; - } - - public int calculateMaxNumberOfRides() { - return Math.max( - Arrays.stream(arrivedOnStreetByNumOfRides.keys()).max().orElse(0), - Arrays.stream(arrivedOnBoardByNumOfRides.keys()).max().orElse(0) - ); - } - /** * The multi-criteria state can handle multiple access/egress paths to a single stop, but the * Standard and BestTime states do not. To get a deterministic behavior, we filter the paths and @@ -72,6 +49,33 @@ public static AccessPaths create(Collection paths, RaptorPro ); } + /** + * Return the transfer arriving at the stop on-street(walking) grouped by Raptor round. The Raptor + * round is calculated from the number of rides in the transfer. + *

      + * If no access exists for the given round, an empty list is returned. + */ + public List arrivedOnStreetByNumOfRides(int round) { + return emptyListIfNull(arrivedOnStreetByNumOfRides.get(round)); + } + + /** + * Return the transfer arriving at the stop on-board a transit(flex) service grouped by Raptor + * round. The Raptor round is calculated from the number of rides in the transfer. + *

      + * If no access exists for the given round, an empty list is returned. + */ + public List arrivedOnBoardByNumOfRides(int round) { + return emptyListIfNull(arrivedOnBoardByNumOfRides.get(round)); + } + + public int calculateMaxNumberOfRides() { + return Math.max( + Arrays.stream(arrivedOnStreetByNumOfRides.keys()).max().orElse(0), + Arrays.stream(arrivedOnBoardByNumOfRides.keys()).max().orElse(0) + ); + } + /** * Decorate access to implement time-penalty. This decoration will do the necessary * adjustments to apply the penalty in the raptor algorithm. See the decorator class for more @@ -99,4 +103,14 @@ private static boolean hasTimeDependentAccess(TIntObjectMap emptyListIfNull(List list) { + if (list == null) { + return List.of(); + } + return list; + } } From 99dd26f6a24b94f2b3eceeb1f0c58bda54ff7532 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 21 Feb 2024 01:21:57 +0000 Subject: [PATCH 0624/1688] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a621ebb5b00..a298c1ec462 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ properly if some input files are missing a terminating newline) --> org.apache.maven.plugins maven-shade-plugin - 3.5.1 + 3.5.2 package From 8ba2fb8f782fa5df5caed3e0a8094d145984c9f9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 21 Feb 2024 21:18:31 +0100 Subject: [PATCH 0625/1688] Remove netty-bom [ci skip] --- renovate.json5 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index ac50333d01d..04e0fd14471 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -25,8 +25,7 @@ "com.microsoft.azure:azure-servicebus", "com.azure.resourcemanager:azure-resourcemanager-servicebus", "com.azure:azure-core", - "com.azure:azure-messaging-servicebus", - "io.netty:netty-bom" + "com.azure:azure-messaging-servicebus" ], "enabled": false }, From fa62c058b54c2e32d2ff90390a1bd8e13d2ef938 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 22 Feb 2024 11:46:10 +0200 Subject: [PATCH 0626/1688] Use correct car speed resolver for areas --- .../graph_builder/module/osm/WalkableAreaBuilder.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java index af17593d36a..5562f1df1a3 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java @@ -505,7 +505,7 @@ private Set createSegments( float carSpeed = areaEntity .getOsmProvider() - .getWayPropertySet() + .getOsmTagMapper() .getCarSpeedForWay(areaEntity, false); double length = SphericalDistanceLibrary.distance( From 65cbff9ca4f18884d859186f54d7ee7a23db282c Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 22 Feb 2024 11:53:48 +0200 Subject: [PATCH 0627/1688] Fix maxCarSpeed for ConstantSpeedMapper --- .../graph_builder/module/osm/OsmModule.java | 6 +++--- .../openstreetmap/tagmapping/ConstantSpeedMapper.java | 11 +++++++++-- .../openstreetmap/tagmapping/OsmTagMapper.java | 4 ++++ .../openstreetmap/tagmapping/DefaultMapperTest.java | 4 ++++ 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index b279a4088f0..e831d2ada47 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -556,9 +556,9 @@ private StreetEdge getEdgeForStreet( private float getMaxCarSpeed() { float maxSpeed = 0f; for (OsmProvider provider : providers) { - var wps = provider.getWayPropertySet(); - if (wps.maxUsedCarSpeed > maxSpeed) { - maxSpeed = wps.maxUsedCarSpeed; + var carSpeed = provider.getOsmTagMapper().getMaxUsedCarSpeed(provider.getWayPropertySet()); + if (carSpeed > maxSpeed) { + maxSpeed = carSpeed; } } return maxSpeed; diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java index 48a3c2ac9bf..b233b3f549e 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/ConstantSpeedMapper.java @@ -31,10 +31,9 @@ public ConstantSpeedFinlandMapper(float speed) { @Override public void populateProperties(WayPropertySet props) { props.setCarSpeed("highway=*", speed); - props.maxPossibleCarSpeed = 22.22f; - props.maxUsedCarSpeed = 22.22f; // Read the rest from the default set new FinlandMapper().populateProperties(props); + props.maxPossibleCarSpeed = speed; } @Override @@ -44,4 +43,12 @@ public float getCarSpeedForWay(OSMWithTags way, boolean backward) { */ return speed; } + + @Override + public Float getMaxUsedCarSpeed(WayPropertySet wayPropertySet) { + // This is needed because the way property set uses normal speed limits from Finland mapper + // to set the walk safety limits which resets the maximum used car speed to be something else + // than what is used for the street edge car speeds. + return speed; + } } diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapper.java index 389e3b90ca8..8bcfbfdf65a 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapper.java @@ -26,6 +26,10 @@ default float getCarSpeedForWay(OSMWithTags way, boolean backward) { return way.getOsmProvider().getWayPropertySet().getCarSpeedForWay(way, backward); } + default Float getMaxUsedCarSpeed(WayPropertySet wayPropertySet) { + return wayPropertySet.maxUsedCarSpeed; + } + default boolean isGeneralNoThroughTraffic(OSMWithTags way) { String access = way.getTag("access"); return doesTagValueDisallowThroughTraffic(access); diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java index 5f95436833d..9a16f6a8e2e 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java @@ -17,6 +17,7 @@ public class DefaultMapperTest { private WayPropertySet wps; + private OsmTagMapper mapper; float epsilon = 0.01f; @BeforeEach @@ -25,6 +26,7 @@ public void setup() { DefaultMapper source = new DefaultMapper(); source.populateProperties(wps); this.wps = wps; + this.mapper = source; } /** @@ -108,6 +110,8 @@ public void testCarSpeeds() { assertSpeed(4.305559158325195, "15.5 km/h"); assertSpeed(22.347200393676758, "50 mph"); assertSpeed(22.347200393676758, "50.0 mph"); + + assertEquals(wps.maxUsedCarSpeed, mapper.getMaxUsedCarSpeed(wps)); } @Test From 0a3839b6eab0bb914ee874c5bd18d854d132c00a Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 22 Feb 2024 12:25:22 +0200 Subject: [PATCH 0628/1688] Remove origin and destination from output There were some issues with label and stations --- .../apis/gtfs/GtfsGraphQLIndex.java | 2 -- .../gtfs/datafetchers/PlanConnectionImpl.java | 25 --------------- .../gtfs/generated/GraphQLDataFetchers.java | 16 ---------- .../apis/gtfs/generated/graphql-codegen.yml | 2 -- .../apis/gtfs/model/PlanLabeledLocation.java | 3 -- .../apis/gtfs/model/PlanLocation.java | 26 ---------------- .../opentripplanner/apis/gtfs/schema.graphqls | 31 ------------------- 7 files changed, 105 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java delete mode 100644 src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 07b0f615b25..6de8eca9e9c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -82,7 +82,6 @@ import org.opentripplanner.apis.gtfs.datafetchers.serviceTimeRangeImpl; import org.opentripplanner.apis.gtfs.datafetchers.stepImpl; import org.opentripplanner.apis.gtfs.datafetchers.stopAtDistanceImpl; -import org.opentripplanner.apis.gtfs.model.PlanLocation; import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation; import org.opentripplanner.framework.application.OTPFeature; @@ -141,7 +140,6 @@ protected static GraphQLSchema buildSchema() { .type("StopPosition", type -> type.typeResolver(new StopPosition() {})) .type("FareProduct", type -> type.typeResolver(new FareProductTypeResolver())) .type("AlertEntity", type -> type.typeResolver(new AlertEntityTypeResolver())) - .type("PlanLocation", type -> type.typeResolver(new PlanLocation() {})) .type(typeWiring.build(AgencyImpl.class)) .type(typeWiring.build(AlertImpl.class)) .type(typeWiring.build(BikeParkImpl.class)) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java index 168f58b3224..96a8557683b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlanConnectionImpl.java @@ -9,10 +9,8 @@ import java.time.OffsetDateTime; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.apis.gtfs.model.PlanLabeledLocation; import org.opentripplanner.apis.gtfs.model.PlanPageInfo; import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Place; import org.opentripplanner.routing.api.response.RoutingError; import org.opentripplanner.routing.api.response.RoutingResponse; import org.opentripplanner.transit.service.TransitService; @@ -28,11 +26,6 @@ public DataFetcher searchDateTime() { }; } - @Override - public DataFetcher origin() { - return environment -> getLocation(getSource(environment).getTripPlan().from); - } - @Override public DataFetcher>> edges() { return environment -> @@ -48,11 +41,6 @@ public DataFetcher> routingErrors() { return environment -> getSource(environment).getRoutingErrors(); } - @Override - public DataFetcher destination() { - return environment -> getLocation(getSource(environment).getTripPlan().to); - } - @Override public DataFetcher pageInfo() { return environment -> { @@ -85,19 +73,6 @@ public DataFetcher pageInfo() { }; } - private PlanLabeledLocation getLocation(Place place) { - Object location = null; - var stop = place.stop; - var coordinate = place.coordinate; - if (stop != null) { - location = stop; - } else if (coordinate != null) { - location = coordinate; - } - // TODO make label field that is only the label - return new PlanLabeledLocation(location, place.name.toString()); - } - private TransitService getTransitService(DataFetchingEnvironment environment) { return environment.getContext().transitService(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index c942e771ba6..789bbae3b6b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -21,8 +21,6 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode; -import org.opentripplanner.apis.gtfs.model.PlanLabeledLocation; -import org.opentripplanner.apis.gtfs.model.PlanLocation; import org.opentripplanner.apis.gtfs.model.PlanPageInfo; import org.opentripplanner.apis.gtfs.model.RideHailingProvider; import org.opentripplanner.apis.gtfs.model.StopPosition; @@ -667,12 +665,8 @@ public interface GraphQLPlan { * [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). */ public interface GraphQLPlanConnection { - public DataFetcher destination(); - public DataFetcher>> edges(); - public DataFetcher origin(); - public DataFetcher pageInfo(); public DataFetcher> routingErrors(); @@ -690,16 +684,6 @@ public interface GraphQLPlanEdge { public DataFetcher node(); } - /** Location that was used in the itinerary search as a origin or destination. */ - public interface GraphQLPlanLabeledLocation { - public DataFetcher label(); - - public DataFetcher location(); - } - - /** Union of locations types that could be used in a plan query. */ - public interface GraphQLPlanLocation extends TypeResolver {} - /** * Information about pagination in a connection. Part of the * [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 244ff5fbb61..b90c5810f83 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -80,8 +80,6 @@ config: Plan: graphql.execution.DataFetcherResult PlanConnection: graphql.execution.DataFetcherResult PlanEdge: graphql.relay.DefaultEdge#DefaultEdge - PlanLabeledLocation: org.opentripplanner.apis.gtfs.model.PlanLabeledLocation#PlanLabeledLocation - PlanLocation: org.opentripplanner.apis.gtfs.model.PlanLocation#PlanLocation PlanPageInfo: org.opentripplanner.apis.gtfs.model.PlanPageInfo#PlanPageInfo RealtimeState: String RelativeDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection#GraphQLRelativeDirection diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java deleted file mode 100644 index aa316e98058..00000000000 --- a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLabeledLocation.java +++ /dev/null @@ -1,3 +0,0 @@ -package org.opentripplanner.apis.gtfs.model; - -public record PlanLabeledLocation(Object location, String label) {} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java deleted file mode 100644 index 5bf1db4e2f9..00000000000 --- a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanLocation.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.opentripplanner.apis.gtfs.model; - -import graphql.TypeResolutionEnvironment; -import graphql.schema.GraphQLObjectType; -import graphql.schema.GraphQLSchema; -import graphql.schema.TypeResolver; -import org.opentripplanner.framework.geometry.WgsCoordinate; -import org.opentripplanner.transit.model.site.StopLocation; - -public class PlanLocation implements TypeResolver { - - @Override - public GraphQLObjectType getType(TypeResolutionEnvironment env) { - Object o = env.getObject(); - GraphQLSchema schema = env.getSchema(); - - if (o instanceof StopLocation) { - return schema.getObjectType("Stop"); - } - if (o instanceof WgsCoordinate) { - return schema.getObjectType("Coordinate"); - } - - return null; - } -} diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 691a1e4ac55..6d2d641d8f5 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1563,22 +1563,6 @@ input PlanItineraryFilterInput { groupedOtherThanSameLegsMaxCostMultiplier: Float = 2.0 } -""" -Location that was used in the itinerary search as a origin or destination. -""" -type PlanLabeledLocation { - """ - A location used in a plan query. This can be null if a stop location ID was specified as an input - location but a stop location with that ID does not exist. - """ - location: PlanLocation - - """ - A label that was attached to the location. - """ - label: String -} - """ Plan location settings. Location must be set. Label is optional and used for naming the location. @@ -1596,11 +1580,6 @@ input PlanLabeledLocationInput { label: String } -""" -Union of locations types that could be used in a plan query. -""" -union PlanLocation = Stop | Coordinate - """ Plan location. Either a coordinate or a stop location should be defined. """ @@ -3330,16 +3309,6 @@ type PlanConnection { """ searchDateTime: OffsetDateTime - """ - Origin of the itinerary search. - """ - origin: PlanLabeledLocation! - - """ - Destination of the itinerary search. - """ - destination: PlanLabeledLocation! - """ Errors faced during the routing search. """ From 4a0b03b73bfeb8493e13faf2af997359a79c3b6a Mon Sep 17 00:00:00 2001 From: bartosz Date: Mon, 12 Feb 2024 15:39:22 +0100 Subject: [PATCH 0629/1688] Add configuration switch for Service Bus authentication with Federated Identity --- doc-templates/UpdaterConfig.md | 4 +- .../sandbox/siri}/SiriAzureUpdater.md | 27 ++- .../{ => sandbox/siri}/SiriUpdater.md | 0 docs/RouterConfiguration.md | 14 ++ docs/UpdaterConfig.md | 4 +- docs/examples/skanetrafiken/Readme.md | 3 + .../examples/skanetrafiken/router-config.json | 3 +- docs/sandbox/siri/SiriAzureUpdater.md | 197 ++++++++++++++++++ docs/sandbox/{ => siri}/SiriUpdater.md | 0 mkdocs.yml | 4 +- pom.xml | 11 +- .../azure/AbstractAzureSiriUpdater.java | 20 +- .../updater/azure/AuthenticationType.java | 6 + .../azure/SiriAzureUpdaterParameters.java | 18 ++ .../azure/SiriAzureETUpdaterConfig.java | 24 ++- .../azure/SiriAzureSXUpdaterConfig.java | 31 ++- .../azure/SiriAzureUpdaterConfig.java | 58 +++++- .../generate/doc/SiriAzureConfigDocTest.java | 98 +++++++++ .../generate/doc/SiriConfigDocTest.java | 4 +- .../generate/doc/UpdaterConfigDocTest.java | 1 + .../standalone/config/router-config.json | 15 ++ 21 files changed, 495 insertions(+), 47 deletions(-) rename {docs/sandbox => doc-templates/sandbox/siri}/SiriAzureUpdater.md (60%) rename doc-templates/{ => sandbox/siri}/SiriUpdater.md (100%) create mode 100644 docs/sandbox/siri/SiriAzureUpdater.md rename docs/sandbox/{ => siri}/SiriUpdater.md (100%) create mode 100644 src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java create mode 100644 src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java diff --git a/doc-templates/UpdaterConfig.md b/doc-templates/UpdaterConfig.md index 57152671ec7..b0444f038af 100644 --- a/doc-templates/UpdaterConfig.md +++ b/doc-templates/UpdaterConfig.md @@ -82,7 +82,7 @@ GBFS form factors: ## Other updaters in sandboxes - [Vehicle parking](sandbox/VehicleParking.md) -- [Siri over HTTP](sandbox/SiriUpdater.md) -- [Siri over Azure Message Bus](sandbox/SiriAzureUpdater.md) +- [Siri over HTTP](sandbox/siri/SiriUpdater.md) +- [Siri over Azure Message Bus](sandbox/siri/SiriAzureUpdater.md) - [VehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md) diff --git a/docs/sandbox/SiriAzureUpdater.md b/doc-templates/sandbox/siri/SiriAzureUpdater.md similarity index 60% rename from docs/sandbox/SiriAzureUpdater.md rename to doc-templates/sandbox/siri/SiriAzureUpdater.md index 3af3b7ee854..eb092ddd08d 100644 --- a/docs/sandbox/SiriAzureUpdater.md +++ b/doc-templates/sandbox/siri/SiriAzureUpdater.md @@ -8,17 +8,26 @@ IT also OTP to download historical data from en HTTP endpoint on startup. Skånetrafiken, Sweden developer.otp@skanetrafiken.se +## Documentation + +Documentation available [here](../../examples/skanetrafiken/Readme.md). + +## Configuration + +To enable the SIRI updater you need to add it to the updaters section of the `router-config.json`. + +### Siri Azure ET Updater + + + +### Siri Azure SX Updater + + + ## Changelog -- Added configuration for turning off stop arrival time match feature. +- Added configuration for turning off stop arrival time match feature. - Initial version (April 2022) - Minor changes in logging (November 2022) - Retry fetch from history endpoint if it failed (February 2023) - Solve a bug in SiriAzureETUpdater and improve error logging (March 2023) - -## Documentation - -Documentation available [here](../examples/skanetrafiken/Readme.md). - -### Configuration - -See example configuration in `examples/skanetrafiken/router-config.json`. \ No newline at end of file +- Add support with federated identity authentication (February 2024) \ No newline at end of file diff --git a/doc-templates/SiriUpdater.md b/doc-templates/sandbox/siri/SiriUpdater.md similarity index 100% rename from doc-templates/SiriUpdater.md rename to doc-templates/sandbox/siri/SiriUpdater.md diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 73998f06278..34e9aa2c8d6 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -817,6 +817,20 @@ Used to group requests when monitoring OTP. "toDateTime" : "P1D", "timeout" : 300000 } + }, + { + "type" : "siri-azure-et-updater", + "topic" : "some_topic", + "authenticationType" : "SharedAccessKey", + "fullyQualifiedNamespace" : "fully_qualified_namespace", + "servicebus-url" : "service_bus_url", + "feedId" : "feed_id", + "customMidnight" : 4, + "history" : { + "url" : "endpoint_url", + "fromDateTime" : "-P1D", + "timeout" : 300000 + } } ], "rideHailingServices" : [ diff --git a/docs/UpdaterConfig.md b/docs/UpdaterConfig.md index a819a898240..973874be66a 100644 --- a/docs/UpdaterConfig.md +++ b/docs/UpdaterConfig.md @@ -414,7 +414,7 @@ HTTP headers to add to the request. Any header key, value can be inserted. ## Other updaters in sandboxes - [Vehicle parking](sandbox/VehicleParking.md) -- [Siri over HTTP](sandbox/SiriUpdater.md) -- [Siri over Azure Message Bus](sandbox/SiriAzureUpdater.md) +- [Siri over HTTP](sandbox/siri/SiriUpdater.md) +- [Siri over Azure Message Bus](sandbox/siri/SiriAzureUpdater.md) - [VehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md) diff --git a/docs/examples/skanetrafiken/Readme.md b/docs/examples/skanetrafiken/Readme.md index fc342f4192b..a611c839140 100644 --- a/docs/examples/skanetrafiken/Readme.md +++ b/docs/examples/skanetrafiken/Readme.md @@ -93,6 +93,9 @@ id from the message. In case OTP was not able to find corresponding trip additio performed based on arrival-times/stop-patterns from the ET message. This feature turned off by default but can be activated by adding *fuzzyTripMatching* property to updater configuration. +### FederatedIdentity +It is also possible to connect to Service Bus through FederatedIdentity. Change **authenticationType** to +**FederatedIdentity** and provide **fullyQualifiedNamespace** in router-config. diff --git a/docs/examples/skanetrafiken/router-config.json b/docs/examples/skanetrafiken/router-config.json index d65604aaa00..74042d68e31 100644 --- a/docs/examples/skanetrafiken/router-config.json +++ b/docs/examples/skanetrafiken/router-config.json @@ -44,7 +44,8 @@ "type": "siri-azure-sx-updater", "topic": "", "feedId": "", - "servicebus-url": "", + "authenticationType": "FederatedIdentity", + "fullyQualifiedNamespace": "", "customMidnight": 4, "history": { "url": "", diff --git a/docs/sandbox/siri/SiriAzureUpdater.md b/docs/sandbox/siri/SiriAzureUpdater.md new file mode 100644 index 00000000000..75aa58897ec --- /dev/null +++ b/docs/sandbox/siri/SiriAzureUpdater.md @@ -0,0 +1,197 @@ +# Siri Azure Updater + +It is sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages through *Azure Service Bus*. +IT also OTP to download historical data from en HTTP endpoint on startup. + +## Contact Info + +Skånetrafiken, Sweden +developer.otp@skanetrafiken.se + +## Documentation + +Documentation available [here](../../examples/skanetrafiken/Readme.md). + +## Configuration + +To enable the SIRI updater you need to add it to the updaters section of the `router-config.json`. + +### Siri Azure ET Updater + + + + +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|------------------------------------------------------------|:---------:|----------------------------------------------------------------|:----------:|---------------------|:-----:| +| type = "siri-azure-et-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [authenticationType](#u__11__authenticationType) | `enum` | Which authentication type to use | *Optional* | `"sharedaccesskey"` | 2.5 | +| [customMidnight](#u__11__customMidnight) | `integer` | Time on which time breaks into new day. | *Optional* | `0` | 2.2 | +| feedId | `string` | The ID of the feed to apply the updates to. | *Optional* | | 2.2 | +| [fullyQualifiedNamespace](#u__11__fullyQualifiedNamespace) | `string` | Service Bus fully qualified namespace used for authentication. | *Optional* | | 2.5 | +| fuzzyTripMatching | `boolean` | Whether to apply fuzzyTripMatching on the updates | *Optional* | `false` | 2.2 | +| [servicebus-url](#u__11__servicebus_url) | `string` | Service Bus connection used for authentication. | *Optional* | | 2.2 | +| topic | `string` | Service Bus topic to connect to. | *Optional* | | 2.2 | +| history | `object` | Configuration for fetching historical data on startup | *Optional* | | 2.2 | +|    fromDateTime | `string` | Datetime boundary for historical data | *Optional* | `"-P1D"` | 2.2 | +|    timeout | `integer` | Timeout in milliseconds | *Optional* | `300000` | na | +|    url | `string` | Endpoint to fetch from | *Optional* | | na | + + +##### Parameter details + +

      authenticationType

      + +**Since version:** `2.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"sharedaccesskey"` +**Path:** /updaters/[11] +**Enum values:** `sharedaccesskey` | `federatedidentity` + +Which authentication type to use + +

      customMidnight

      + +**Since version:** `2.2` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` +**Path:** /updaters/[11] + +Time on which time breaks into new day. + +It is common that operating day date breaks a little bit later than midnight so that the switch happens when traffic is at the lowest point. Parameter uses 24-hour format. If the switch happens on 4 am then set this field to 4. + +

      fullyQualifiedNamespace

      + +**Since version:** `2.5` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` +**Path:** /updaters/[11] + +Service Bus fully qualified namespace used for authentication. + +Has to be present for authenticationMethod FederatedIdentity. + +

      servicebus-url

      + +**Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` +**Path:** /updaters/[11] + +Service Bus connection used for authentication. + +Has to be present for authenticationMethod SharedAccessKey. This should be Primary/Secondary connection string from service bus. + + + +##### Example configuration + +```JSON +// router-config.json +{ + "updaters" : [ + { + "type" : "siri-azure-et-updater", + "topic" : "some_topic", + "authenticationType" : "SharedAccessKey", + "fullyQualifiedNamespace" : "fully_qualified_namespace", + "servicebus-url" : "service_bus_url", + "feedId" : "feed_id", + "customMidnight" : 4, + "history" : { + "url" : "endpoint_url", + "fromDateTime" : "-P1D", + "timeout" : 300000 + } + } + ] +} +``` + + + +### Siri Azure SX Updater + + + + +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|------------------------------------------------------------|:---------:|----------------------------------------------------------------|:----------:|---------------------|:-----:| +| type = "siri-azure-sx-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [authenticationType](#u__10__authenticationType) | `enum` | Which authentication type to use | *Optional* | `"sharedaccesskey"` | 2.5 | +| [customMidnight](#u__10__customMidnight) | `integer` | Time on which time breaks into new day. | *Optional* | `0` | 2.2 | +| feedId | `string` | The ID of the feed to apply the updates to. | *Optional* | | 2.2 | +| [fullyQualifiedNamespace](#u__10__fullyQualifiedNamespace) | `string` | Service Bus fully qualified namespace used for authentication. | *Optional* | | 2.5 | +| fuzzyTripMatching | `boolean` | Whether to apply fuzzyTripMatching on the updates | *Optional* | `false` | 2.2 | +| [servicebus-url](#u__10__servicebus_url) | `string` | Service Bus connection used for authentication. | *Optional* | | 2.2 | +| topic | `string` | Service Bus topic to connect to. | *Optional* | | 2.2 | +| history | `object` | Configuration for fetching historical data on startup | *Optional* | | 2.2 | +|    fromDateTime | `string` | Datetime boundary for historical data. | *Optional* | `"-P1D"` | 2.2 | +|    timeout | `integer` | Timeout in milliseconds | *Optional* | `300000` | na | +|    toDateTime | `string` | Datetime boundary for historical data. | *Optional* | `"P1D"` | 2.2 | +|    url | `string` | Endpoint to fetch from | *Optional* | | na | + + +##### Parameter details + +

      authenticationType

      + +**Since version:** `2.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"sharedaccesskey"` +**Path:** /updaters/[10] +**Enum values:** `sharedaccesskey` | `federatedidentity` + +Which authentication type to use + +

      customMidnight

      + +**Since version:** `2.2` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` +**Path:** /updaters/[10] + +Time on which time breaks into new day. + +It is common that operating day date breaks a little bit later than midnight so that the switch happens when traffic is at the lowest point. Parameter uses 24-hour format. If the switch happens on 4 am then set this field to 4. + +

      fullyQualifiedNamespace

      + +**Since version:** `2.5` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` +**Path:** /updaters/[10] + +Service Bus fully qualified namespace used for authentication. + +Has to be present for authenticationMethod FederatedIdentity. + +

      servicebus-url

      + +**Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` +**Path:** /updaters/[10] + +Service Bus connection used for authentication. + +Has to be present for authenticationMethod SharedAccessKey. This should be Primary/Secondary connection string from service bus. + + + +##### Example configuration + +```JSON +// router-config.json +{ + "updaters" : [ + { + "type" : "siri-azure-sx-updater", + "topic" : "some_topic", + "servicebus-url" : "service_bus_url", + "feedId" : "feed_id", + "customMidnight" : 4, + "history" : { + "url" : "endpoint_url", + "fromDateTime" : "-P1D", + "toDateTime" : "P1D", + "timeout" : 300000 + } + } + ] +} +``` + + + +## Changelog +- Added configuration for turning off stop arrival time match feature. +- Initial version (April 2022) +- Minor changes in logging (November 2022) +- Retry fetch from history endpoint if it failed (February 2023) +- Solve a bug in SiriAzureETUpdater and improve error logging (March 2023) +- Add support with federated identity authentication (February 2024) \ No newline at end of file diff --git a/docs/sandbox/SiriUpdater.md b/docs/sandbox/siri/SiriUpdater.md similarity index 100% rename from docs/sandbox/SiriUpdater.md rename to docs/sandbox/siri/SiriUpdater.md diff --git a/mkdocs.yml b/mkdocs.yml index c4717d4d2e0..dd24a6e2dd4 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -95,8 +95,8 @@ nav: - Actuator API: 'sandbox/ActuatorAPI.md' - Direct Transfer Analyzer: 'sandbox/transferanalyzer.md' - Google Cloud Storage: 'sandbox/GoogleCloudStorage.md' - - SIRI Updaters: 'sandbox/SiriUpdater.md' - - SIRI Updater (Azure): 'sandbox/SiriAzureUpdater.md' + - SIRI Updaters: 'sandbox/siri/SiriUpdater.md' + - SIRI Updater (Azure): 'sandbox/siri/SiriAzureUpdater.md' - Vehicle Rental Service Directory API support: 'sandbox/VehicleRentalServiceDirectory.md' - Smoove Bike Rental Updator Support: 'sandbox/SmooveBikeRental.md' - Mapbox Vector Tiles API: 'sandbox/MapboxVectorTilesApi.md' diff --git a/pom.xml b/pom.xml index 03d408a4b2e..faee696b5cb 100644 --- a/pom.xml +++ b/pom.xml @@ -907,17 +907,18 @@ com.azure azure-core - 1.45.0 + 1.46.0 com.azure azure-messaging-servicebus - 7.14.5 + 7.15.0 - com.azure.resourcemanager - azure-resourcemanager-servicebus - 2.32.0 + com.azure + azure-identity + 1.11.2 + compile ch.poole diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java index 0d36233f22b..f96941c7370 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.siri.updater.azure; +import com.azure.identity.DefaultAzureCredentialBuilder; import com.azure.messaging.servicebus.ServiceBusClientBuilder; import com.azure.messaging.servicebus.ServiceBusErrorContext; import com.azure.messaging.servicebus.ServiceBusException; @@ -36,6 +37,8 @@ public abstract class AbstractAzureSiriUpdater implements GraphUpdater { private final Logger LOG = LoggerFactory.getLogger(getClass()); + private final AuthenticationType authenticationType; + private final String fullyQualifiedNamespace; private final String configRef; private final String serviceBusUrl; private final SiriFuzzyTripMatcher fuzzyTripMatcher; @@ -63,6 +66,8 @@ public abstract class AbstractAzureSiriUpdater implements GraphUpdater { public AbstractAzureSiriUpdater(SiriAzureUpdaterParameters config, TransitModel transitModel) { this.configRef = config.configRef(); + this.authenticationType = config.getAuthenticationType(); + this.fullyQualifiedNamespace = config.getFullyQualifiedNamespace(); this.serviceBusUrl = config.getServiceBusUrl(); this.topicName = config.getTopicName(); this.dataInitializationUrl = config.getDataInitializationUrl(); @@ -105,10 +110,17 @@ public void run() { } // Client with permissions to create subscription - serviceBusAdmin = - new ServiceBusAdministrationClientBuilder() - .connectionString(serviceBusUrl) - .buildAsyncClient(); + if (authenticationType == AuthenticationType.FederatedIdentity) { + serviceBusAdmin = + new ServiceBusAdministrationClientBuilder() + .credential(fullyQualifiedNamespace, new DefaultAzureCredentialBuilder().build()) + .buildAsyncClient(); + } else if (authenticationType == AuthenticationType.SharedAccessKey) { + serviceBusAdmin = + new ServiceBusAdministrationClientBuilder() + .connectionString(serviceBusUrl) + .buildAsyncClient(); + } // If Idle more then one day, then delete subscription so we don't have old obsolete subscriptions on Azure Service Bus var options = new CreateSubscriptionOptions(); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java new file mode 100644 index 00000000000..65cf8caac93 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AuthenticationType.java @@ -0,0 +1,6 @@ +package org.opentripplanner.ext.siri.updater.azure; + +public enum AuthenticationType { + SharedAccessKey, + FederatedIdentity, +} diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java index 93e9a6bded8..0d207d27efe 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java @@ -4,6 +4,8 @@ public abstract class SiriAzureUpdaterParameters { private String configRef; private String type; + private AuthenticationType authenticationType; + private String fullyQualifiedNamespace; private String serviceBusUrl; private String topicName; private String dataInitializationUrl; @@ -28,6 +30,22 @@ public String getType() { return type; } + public AuthenticationType getAuthenticationType() { + return authenticationType; + } + + public void setAuthenticationType(AuthenticationType authenticationType) { + this.authenticationType = authenticationType; + } + + public String getFullyQualifiedNamespace() { + return fullyQualifiedNamespace; + } + + public void setFullyQualifiedNamespace(String fullyQualifiedNamespace) { + this.fullyQualifiedNamespace = fullyQualifiedNamespace; + } + public String getServiceBusUrl() { return serviceBusUrl; } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java index 80615acb9b2..791f9a9dadc 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureETUpdaterConfig.java @@ -1,6 +1,7 @@ package org.opentripplanner.standalone.config.routerconfig.updaters.azure; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2; import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdaterParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; @@ -14,13 +15,26 @@ public static SiriAzureETUpdaterParameters create(String configRef, NodeAdapter if (c.exist("history")) { NodeAdapter history = c .of("history") - .since(NA) - .summary("TODO") - .description(/*TODO DOC*/"TODO") + .since(V2_2) + .summary("Configuration for fetching historical data on startup") .asObject(); - String fromDateTime = history.of("fromDateTime").since(NA).summary("TODO").asString("-P1D"); - int customMidnight = c.of("customMidnight").since(NA).summary("TODO").asInt(0); + String fromDateTime = history + .of("fromDateTime") + .since(V2_2) + .summary("Datetime boundary for historical data") + .asString("-P1D"); + + int customMidnight = c + .of("customMidnight") + .since(V2_2) + .summary("Time on which time breaks into new day.") + .description( + "It is common that operating day date breaks a little bit later than midnight so " + + "that the switch happens when traffic is at the lowest point. Parameter uses 24-hour format. " + + "If the switch happens on 4 am then set this field to 4." + ) + .asInt(0); parameters.setFromDateTime(asDateOrRelativePeriod(fromDateTime, customMidnight)); } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java index 7d63657caf8..cf5dacb5976 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureSXUpdaterConfig.java @@ -1,6 +1,7 @@ package org.opentripplanner.standalone.config.routerconfig.updaters.azure; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2; import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdaterParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; @@ -14,14 +15,32 @@ public static SiriAzureSXUpdaterParameters create(String configRef, NodeAdapter if (c.exist("history")) { NodeAdapter history = c .of("history") - .since(NA) - .summary("TODO") - .description(/*TODO DOC*/"TODO") + .since(V2_2) + .summary("Configuration for fetching historical data on startup.") .asObject(); - String fromDateTime = history.of("fromDateTime").since(NA).summary("TODO").asString("-P1D"); - String toDateTime = history.of("toDateTime").since(NA).summary("TODO").asString("P1D"); - int customMidnight = c.of("customMidnight").since(NA).summary("TODO").asInt(0); + String fromDateTime = history + .of("fromDateTime") + .since(V2_2) + .summary("Datetime boundary for historical data.") + .asString("-P1D"); + + String toDateTime = history + .of("toDateTime") + .since(V2_2) + .summary("Datetime boundary for historical data.") + .asString("P1D"); + + int customMidnight = c + .of("customMidnight") + .since(V2_2) + .summary("Time on which time breaks into new day.") + .description( + "It is common that operating day date breaks a little bit later than midnight so " + + "that the switch happens when traffic is at the lowest point. Parameter uses 24-hour format. " + + "If the switch happens on 4 am then set this field to 4." + ) + .asInt(0); parameters.setFromDateTime(asDateOrRelativePeriod(fromDateTime, customMidnight)); parameters.setToDateTime(asDateOrRelativePeriod(toDateTime, customMidnight)); diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java index 319b2d45001..35da716337e 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java @@ -1,12 +1,15 @@ package org.opentripplanner.standalone.config.routerconfig.updaters.azure; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5; import java.time.LocalDate; import java.time.Period; import java.time.ZoneId; import java.time.ZonedDateTime; import java.time.format.DateTimeParseException; +import org.opentripplanner.ext.siri.updater.azure.AuthenticationType; import org.opentripplanner.ext.siri.updater.azure.SiriAzureUpdaterParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; @@ -18,24 +21,61 @@ public static void populateConfig( NodeAdapter c ) { parameters.setConfigRef(configRef); - parameters.setServiceBusUrl(c.of("servicebus-url").since(NA).summary("TODO").asString(null)); - parameters.setTopicName(c.of("topic").since(NA).summary("TODO").asString(null)); - parameters.setFeedId(c.of("feedId").since(NA).summary("TODO").asString(null)); + parameters.setServiceBusUrl( + c + .of("servicebus-url") + .since(V2_2) + .summary("Service Bus connection used for authentication.") + .description( + "Has to be present for authenticationMethod SharedAccessKey. This should be Primary/Secondary connection string from service bus." + ) + .asString(null) + ); + parameters.setTopicName( + c.of("topic").since(V2_2).summary("Service Bus topic to connect to.").asString(null) + ); + parameters.setFeedId( + c + .of("feedId") + .since(V2_2) + .summary("The ID of the feed to apply the updates to.") + .asString(null) + ); parameters.setFuzzyTripMatching( - c.of("fuzzyTripMatching").since(NA).summary("TODO").asBoolean(false) + c + .of("fuzzyTripMatching") + .since(V2_2) + .summary("Whether to apply fuzzyTripMatching on the updates") + .asBoolean(false) + ); + parameters.setFullyQualifiedNamespace( + c + .of("fullyQualifiedNamespace") + .since(V2_5) + .summary("Service Bus fully qualified namespace used for authentication.") + .description("Has to be present for authenticationMethod FederatedIdentity.") + .asString(null) + ); + parameters.setAuthenticationType( + c + .of("authenticationType") + .since(V2_5) + .summary("Which authentication type to use") + .asEnum(AuthenticationType.SharedAccessKey) ); if (c.exist("history")) { NodeAdapter history = c .of("history") - .since(NA) - .summary("TODO") - .description(/*TODO DOC*/"TODO") + .since(V2_2) + .summary("Configuration for fetching historical data on startup") .asObject(); parameters.setDataInitializationUrl( - history.of("url").since(NA).summary("TODO").asString(null) + history.of("url").since(NA).summary("Endpoint to fetch from").asString(null) + ); + parameters.setTimeout( + history.of("timeout").since(NA).summary("Timeout in milliseconds").asInt(300000) ); - parameters.setTimeout(history.of("timeout").since(NA).summary("TODO").asInt(300000)); } } diff --git a/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java b/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java new file mode 100644 index 00000000000..374ac2b4bbb --- /dev/null +++ b/src/test/java/org/opentripplanner/generate/doc/SiriAzureConfigDocTest.java @@ -0,0 +1,98 @@ +package org.opentripplanner.generate.doc; + +import static org.opentripplanner.framework.application.OtpFileNames.ROUTER_CONFIG_FILENAME; +import static org.opentripplanner.framework.io.FileUtils.assertFileEquals; +import static org.opentripplanner.framework.io.FileUtils.readFile; +import static org.opentripplanner.framework.io.FileUtils.writeFile; +import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_4; +import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT; +import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT; +import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection; +import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromResource; + +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.File; +import java.util.Set; +import org.junit.jupiter.api.Test; +import org.opentripplanner.generate.doc.framework.DocBuilder; +import org.opentripplanner.generate.doc.framework.GeneratesDocumentation; +import org.opentripplanner.generate.doc.framework.ParameterDetailsList; +import org.opentripplanner.generate.doc.framework.ParameterSummaryTable; +import org.opentripplanner.generate.doc.framework.SkipNodes; +import org.opentripplanner.standalone.config.RouterConfig; +import org.opentripplanner.standalone.config.framework.json.NodeAdapter; + +@GeneratesDocumentation +public class SiriAzureConfigDocTest { + + private static final File TEMPLATE = new File(TEMPLATE_ROOT, "sandbox/siri/SiriAzureUpdater.md"); + private static final File OUT_FILE = new File(DOCS_ROOT, "sandbox/siri/SiriAzureUpdater.md"); + + private static final String ROUTER_CONFIG_PATH = "standalone/config/" + ROUTER_CONFIG_FILENAME; + private static final Set INCLUDE_UPDATERS = Set.of( + "siri-azure-et-updater", + "siri-azure-sx-updater" + ); + private static final SkipNodes SKIP_NODES = SkipNodes.of().build(); + public static final ObjectMapper mapper = new ObjectMapper(); + + /** + * NOTE! This test updates the {@code docs/sandbox/SiriUpdater.md} document based on the latest + * version of the code. + */ + @Test + public void updateSiriDoc() { + NodeAdapter node = readUpdaterConfig(); + + // Read and close input file (same as output file) + String template = readFile(TEMPLATE); + String original = readFile(OUT_FILE); + + for (String childName : node.listChildrenByName()) { + var child = node.child(childName); + var type = child.typeQualifier(); + + if (INCLUDE_UPDATERS.contains(type)) { + template = replaceSection(template, type, updaterDoc(child)); + } + } + + writeFile(OUT_FILE, template); + assertFileEquals(original, OUT_FILE); + } + + private NodeAdapter readUpdaterConfig() { + var json = jsonNodeFromResource(ROUTER_CONFIG_PATH); + var conf = new RouterConfig(json, ROUTER_CONFIG_PATH, false); + return conf.asNodeAdapter().child("updaters"); + } + + private String updaterDoc(NodeAdapter node) { + DocBuilder buf = new DocBuilder(); + addParameterSummaryTable(buf, node); + addDetailsSection(buf, node); + addExample(buf, node); + return buf.toString(); + } + + private void addParameterSummaryTable(DocBuilder buf, NodeAdapter node) { + buf.addSection(new ParameterSummaryTable(SKIP_NODES).createTable(node).toMarkdownTable()); + } + + private void addDetailsSection(DocBuilder buf, NodeAdapter node) { + String details = getParameterDetailsTable(node); + + if (!details.isBlank()) { + buf.header(5, "Parameter details", null).addSection(details); + } + } + + private String getParameterDetailsTable(NodeAdapter node) { + return ParameterDetailsList.listParametersWithDetails(node, SKIP_NODES, HEADER_4); + } + + private void addExample(DocBuilder buf, NodeAdapter node) { + buf.addSection("##### Example configuration"); + buf.addUpdaterExample(ROUTER_CONFIG_FILENAME, node.rawNode()); + } +} diff --git a/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java b/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java index 1ceb0ab092c..2474f37c402 100644 --- a/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/SiriConfigDocTest.java @@ -25,8 +25,8 @@ @GeneratesDocumentation public class SiriConfigDocTest { - private static final File TEMPLATE = new File(TEMPLATE_ROOT, "SiriUpdater.md"); - private static final File OUT_FILE = new File(DOCS_ROOT, "sandbox/SiriUpdater.md"); + private static final File TEMPLATE = new File(TEMPLATE_ROOT, "sandbox/siri/SiriUpdater.md"); + private static final File OUT_FILE = new File(DOCS_ROOT, "sandbox/siri/SiriUpdater.md"); private static final String ROUTER_CONFIG_PATH = "standalone/config/" + ROUTER_CONFIG_FILENAME; private static final Set INCLUDE_UPDATERS = Set.of("siri-et-updater", "siri-sx-updater"); diff --git a/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java b/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java index fa5abca7814..4bdfe782615 100644 --- a/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java +++ b/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java @@ -31,6 +31,7 @@ public class UpdaterConfigDocTest { private static final String ROUTER_CONFIG_PATH = "standalone/config/" + ROUTER_CONFIG_FILENAME; private static final Set SKIP_UPDATERS = Set.of( "siri-azure-sx-updater", + "siri-azure-et-updater", "vehicle-parking", "siri-et-updater", "siri-sx-updater" diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 2b2449a7415..1a270929947 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -392,6 +392,21 @@ "toDateTime": "P1D", "timeout": 300000 } + }, + // SIRI ET updater for Azure Service Bus + { + "type": "siri-azure-et-updater", + "topic": "some_topic", + "authenticationType": "SharedAccessKey", + "fullyQualifiedNamespace": "fully_qualified_namespace", + "servicebus-url": "service_bus_url", + "feedId": "feed_id", + "customMidnight": 4, + "history": { + "url": "endpoint_url", + "fromDateTime": "-P1D", + "timeout": 300000 + } } ], "rideHailingServices": [ From a02581161afb67fa16f3754786b657983d004805 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 22 Feb 2024 13:40:02 +0200 Subject: [PATCH 0630/1688] Remove strict stop location and some TODOs --- .../apis/gtfs/generated/GraphQLTypes.java | 10 -------- .../apis/gtfs/mapping/RouteRequestMapper.java | 3 --- .../opentripplanner/apis/gtfs/schema.graphqls | 25 ++++++------------- 3 files changed, 8 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index 05957c32b17..5ad7fc87785 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -1818,12 +1818,10 @@ public void setGraphQLTransit(GraphQLTransitPreferencesInput transit) { public static class GraphQLPlanStopLocationInput { private String stopLocationId; - private Boolean strict; public GraphQLPlanStopLocationInput(Map args) { if (args != null) { this.stopLocationId = (String) args.get("stopLocationId"); - this.strict = (Boolean) args.get("strict"); } } @@ -1831,17 +1829,9 @@ public String getGraphQLStopLocationId() { return this.stopLocationId; } - public Boolean getGraphQLStrict() { - return this.strict; - } - public void setGraphQLStopLocationId(String stopLocationId) { this.stopLocationId = stopLocationId; } - - public void setGraphQLStrict(Boolean strict) { - this.strict = strict; - } } public static class GraphQLPlanStreetPreferencesInput { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index b08f4b245f9..ed1304c96d8 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -107,7 +107,6 @@ private static void setTransitPreferences( var modes = args.getGraphQLModes(); var transit = getTransitModes(environment); if (!Boolean.TRUE.equals(modes.getGraphQLDirectOnly()) && transit.size() > 0) { - // TODO what to do with the static cost? var reluctanceForMode = transit .stream() .filter(mode -> mode.containsKey("cost")) @@ -204,10 +203,8 @@ private static GenericLocation parseGenericLocation( ) { var stopLocation = locationInput.getGraphQLLocation().getGraphQLStopLocation(); if (stopLocation.getGraphQLStopLocationId() != null) { - // TODO implement strict var stopId = stopLocation.getGraphQLStopLocationId(); if (FeedScopedId.isValidString(stopId)) { - // TODO make label field that is only the label return new GenericLocation( locationInput.getGraphQLLabel(), FeedScopedId.parse(stopId), diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 6d2d641d8f5..2c81b7f43a5 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1591,12 +1591,10 @@ input PlanLocationInput @oneOf { """ Stop, station, a group of stop places or multimodal stop place that should be used as - a location for the search. The stop place can be used in two ways: - 1. As a location where one should depart from or arrive to on transit depending on if - its used as an origin or a destination - 2. As coordinates where the search can start or end but it's not required to use this stop - place for a direct transit connnection. - Note, either coordinates or a stop location should be defined. + a location for the search. The trip doesn't have to use the given stop location for a + transit connection as it's possible to start walking to another stop from the given + location. If a station or a group of stop places is provided, a stop that makes the most + sense for the journey is picked as the location within the station or group of stop places. """ stopLocation: PlanStopLocationInput } @@ -1625,11 +1623,10 @@ input PlanPreferencesInput { """ Stop, station, a group of stop places or multimodal stop place that should be used as -a location for the search. The stop place can be used in two ways: -1. As a location where one should depart from or arrive to on transit depending on if - its used as an origin or a destination -2. As coordinates where the search can start or end but it's not required to use this stop - place for a direct transit connnection. +a location for the search. The trip doesn't have to use the given stop location for a +transit connection as it's possible to start walking to another stop from the given +location. If a station or a group of stop places is provided, a stop that makes the most +sense for the journey is picked as the location within the station or group of stop places. """ input PlanStopLocationInput { """ @@ -1637,12 +1634,6 @@ input PlanStopLocationInput { should be `FeedId:StopLocationId`. """ stopLocationId: String! - - """ - If set as true, one must either board or alight from this stop location. Otherwise, - it's optional and alternatively one can just walk to or from this location. - """ - strict: Boolean = false } """ From 0893557bfb423ca7fbf9e3aa22bef1b80430e5ac Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 22 Feb 2024 14:00:38 +0200 Subject: [PATCH 0631/1688] Clarify numberOfItineraries --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 2c81b7f43a5..f8aa1cd3bea 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -4219,7 +4219,9 @@ type QueryType { itineraries are either closest to the defined earliest departure time or to the latest arrival time. It can make sense to search for more itineraries that what is immediately needed if there is a possibility that more itineraries are used later on (limiting the number of returned itineraries - does not affect the performance by a lot but can affect the network bandwidth usage). + does not affect the performance by a lot but can affect the network bandwidth usage). During the + search for next or previous pages with `after` or `before` cursors, this field is ignored and + `first` or `last` should be used instead. """ numberOfItineraries: Int = 50 From dd5880c997ec5db8cf6b1b7067a6d3674a686c8f Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 22 Feb 2024 14:01:12 +0200 Subject: [PATCH 0632/1688] Update src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls Co-authored-by: Leonard Ehrenfried --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index f8aa1cd3bea..813f20559ba 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1699,7 +1699,7 @@ input PlanTransitModesInput { transfer: [PlanTransferMode!] """ - Transit modes and reluctancies associated with them. Each defined mode can be used in + Transit modes and reluctances associated with them. Each defined mode can be used in an itinerary but doesn't have to be. If direct search is not disabled, there can be an itinerary without any transit legs. By default, all transit modes are usable. """ From d2cc973bdc8dd9bb612a5d8e78f0389f5c03ed4b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 22 Feb 2024 14:24:09 +0200 Subject: [PATCH 0633/1688] Implement accessibility preferences --- .../apis/gtfs/mapping/RouteRequestMapper.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index ed1304c96d8..ccd94afcd4d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -59,7 +59,7 @@ public static RouteRequest toRouteRequest( request.setNumItineraries(args.getGraphQLNumberOfItineraries()); } - request.withPreferences(preferences -> setPreferences(preferences, args, environment)); + request.withPreferences(preferences -> setPreferences(preferences, request, args, environment)); setModes(request, args.getGraphQLModes(), environment); @@ -68,13 +68,16 @@ public static RouteRequest toRouteRequest( private static void setPreferences( RoutingPreferences.Builder prefs, + RouteRequest request, GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args, DataFetchingEnvironment environment ) { + var preferenceArgs = args.getGraphQLPreferences(); prefs.withItineraryFilter(filters -> setItineraryFilters(filters, args.getGraphQLItineraryFilter()) ); prefs.withTransit(transit -> setTransitPreferences(transit, args, environment)); + setAccessibilityPreferences(request, preferenceArgs.getGraphQLAccessibility()); } private static void setItineraryFilters( @@ -123,6 +126,15 @@ private static void setTransitPreferences( } } + private static void setAccessibilityPreferences( + RouteRequest request, + GraphQLTypes.GraphQLAccessibilityPreferencesInput preferenceArgs + ) { + if (preferenceArgs != null && preferenceArgs.getGraphQLWheelchair() != null) { + request.setWheelchair(preferenceArgs.getGraphQLWheelchair().getGraphQLEnabled()); + } + } + /** * TODO this doesn't support multiple street modes yet */ From f8f6dab50530f47adff26a93e0c6a79bc9267b21 Mon Sep 17 00:00:00 2001 From: Bartosz-Kruba <98400292+Bartosz-Kruba@users.noreply.github.com> Date: Thu, 22 Feb 2024 16:10:51 +0100 Subject: [PATCH 0634/1688] Update docs/sandbox/siri/SiriAzureUpdater.md Co-authored-by: Johan Torin --- docs/sandbox/siri/SiriAzureUpdater.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sandbox/siri/SiriAzureUpdater.md b/docs/sandbox/siri/SiriAzureUpdater.md index 75aa58897ec..fa9442054a4 100644 --- a/docs/sandbox/siri/SiriAzureUpdater.md +++ b/docs/sandbox/siri/SiriAzureUpdater.md @@ -1,7 +1,7 @@ # Siri Azure Updater -It is sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages through *Azure Service Bus*. -IT also OTP to download historical data from en HTTP endpoint on startup. +It is a sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages through *Azure Service Bus*. +It also allows for OTP to download historical real-time data from an HTTP endpoint on startup. ## Contact Info From 873ceec0bd27bf15c3bf54e786118e013814b4c9 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Fri, 23 Feb 2024 00:03:19 +0800 Subject: [PATCH 0635/1688] add realtime updater concurrency diagram and md --- .../images/updater-threads-queues.excalidraw | 4643 +++++++++++++++++ .../updater/images/updater-threads-queues.svg | 21 + .../org/opentripplanner/updater/package.md | 26 + 3 files changed, 4690 insertions(+) create mode 100644 src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw create mode 100644 src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg create mode 100644 src/main/java/org/opentripplanner/updater/package.md diff --git a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw new file mode 100644 index 00000000000..274a194919e --- /dev/null +++ b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw @@ -0,0 +1,4643 @@ +{ + "type": "excalidraw", + "version": 2, + "source": "https://excalidraw.com", + "elements": [ + { + "type": "arrow", + "version": 659, + "versionNonce": 648948858, + "isDeleted": false, + "id": "VM8X0qyPeoxkTBRdLIM5J", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1066.5000002891657, + "y": 804.5844640879644, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 131.56873415422308, + "seed": 734371294, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "AGWy-WRNKq1GRwlq27Uat", + "focus": 0.5550847433121556, + "gap": 3.5844640879644203 + }, + "endBinding": { + "elementId": "ia9PMtL1s9vwB3H7pqe7w", + "focus": -0.9999999981283776, + "gap": 4.3468017578125 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 131.56873415422308 + ] + ] + }, + { + "type": "arrow", + "version": 920, + "versionNonce": 66351142, + "isDeleted": false, + "id": "3GtZ4aSs9ueb9GU2jLsdc", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 401.3685043358803, + "y": 328, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1116.759994506836, + "height": 0, + "seed": 1607395522, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "E-mK9Dz0MlVGI0zCEjmgE", + "focus": 0.04, + "gap": 2.848500063419351 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1116.759994506836, + 0 + ] + ] + }, + { + "type": "arrow", + "version": 611, + "versionNonce": 54677370, + "isDeleted": false, + "id": "ATmo4gWymhk2HAtTZvwr8", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 403.54024888033973, + "y": 406.4884850323545, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1112.2184718299377, + "height": 5.511514967645496, + "seed": 356024450, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594332225, + "link": null, + "locked": false, + "startBinding": { + "elementId": "NxucM5UWiFJSHCUFadK_p", + "focus": 0.03803602904865689, + "gap": 8.840251932097544 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1112.2184718299377, + 5.511514967645496 + ] + ] + }, + { + "type": "arrow", + "version": 587, + "versionNonce": 159349606, + "isDeleted": false, + "id": "zb4NyAsYy13XFu293d0GB", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 400.6507002377508, + "y": 603.6986805801255, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1112, + "height": 0, + "seed": 1629036610, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "D7-QRZxcX9A0a-2HK7Nex", + "focus": 0.41589444641003864, + "gap": 8.950703289508624 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1112, + 0 + ] + ] + }, + { + "type": "arrow", + "version": 992, + "versionNonce": 1825887738, + "isDeleted": false, + "id": "jFldS1dvD1KlUNloJjncO", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 393.004754807949, + "y": 873.6986805801256, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1112, + "height": 0, + "seed": 1867499522, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "8q-Tc9B-UEz9icdriq9yS", + "focus": 0.25589444641004777, + "gap": 10.304757859706797 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1112, + 0 + ] + ] + }, + { + "type": "arrow", + "version": 873, + "versionNonce": 403119782, + "isDeleted": false, + "id": "7LqY4x9DQ6sxq0rqNvLa6", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 395.96104555368424, + "y": 961.6986805801255, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1112, + "height": 0, + "seed": 400259010, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "jb52v3pX5rahA8qitNheB", + "focus": 0.09589444641003865, + "gap": 9.261048605442056 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1112, + 0 + ] + ] + }, + { + "type": "text", + "version": 468, + "versionNonce": 645662394, + "isDeleted": false, + "id": "E-mK9Dz0MlVGI0zCEjmgE", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 226.01998901367188, + "y": 315, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 172.50001525878906, + "height": 25, + "seed": 1746517598, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "3GtZ4aSs9ueb9GU2jLsdc", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Polling Updater 2", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Polling Updater 2", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "text", + "version": 204, + "versionNonce": 1726513530, + "isDeleted": false, + "id": "ZVYycY9GjFTR8gQbd1wot", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 613, + "y": 138, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 573.0200805664062, + "height": 35, + "seed": 1131654366, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594379770, + "link": null, + "locked": false, + "fontSize": 28, + "fontFamily": 1, + "text": "Threads, Queues, and Buffers Over Time", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Threads, Queues, and Buffers Over Time", + "lineHeight": 1.25, + "baseline": 25 + }, + { + "type": "text", + "version": 271, + "versionNonce": 763305850, + "isDeleted": false, + "id": "D7-QRZxcX9A0a-2HK7Nex", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 244.53997802734375, + "y": 586, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 147.16001892089844, + "height": 25, + "seed": 1121505758, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "zb4NyAsYy13XFu293d0GB", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Graph Updater", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Graph Updater", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "text", + "version": 432, + "versionNonce": 1159736614, + "isDeleted": false, + "id": "8q-Tc9B-UEz9icdriq9yS", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 231, + "y": 858, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 151.6999969482422, + "height": 25, + "seed": 883374494, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "jFldS1dvD1KlUNloJjncO", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "HTTP Handler 1", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "HTTP Handler 1", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "text", + "version": 385, + "versionNonce": 1042358330, + "isDeleted": false, + "id": "jb52v3pX5rahA8qitNheB", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 226.17999267578125, + "y": 948, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 160.52000427246094, + "height": 25, + "seed": 2076275522, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "7LqY4x9DQ6sxq0rqNvLa6", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "HTTP Handler 2", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "HTTP Handler 2", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "text", + "version": 287, + "versionNonce": 1088763578, + "isDeleted": false, + "id": "NxucM5UWiFJSHCUFadK_p", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 212.25997924804688, + "y": 393, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 182.4400177001953, + "height": 25, + "seed": 2038655710, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "ATmo4gWymhk2HAtTZvwr8", + "type": "arrow" + } + ], + "updated": 1708594332225, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Streaming Updater", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Streaming Updater", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 1029, + "versionNonce": 340068602, + "isDeleted": false, + "id": "pbgCp_v4XB-4ur4z6O3Bc", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 398.26203282117854, + "y": 246.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1119.5800018310547, + "height": 0, + "seed": 1903169154, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "d9AAv6uLddhWu-tS7LU1d", + "focus": 0.04, + "gap": 1.5620358729363488 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1119.5800018310547, + 0 + ] + ] + }, + { + "type": "text", + "version": 507, + "versionNonce": 86481830, + "isDeleted": false, + "id": "d9AAv6uLddhWu-tS7LU1d", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 233.01998901367188, + "y": 233.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 163.6800079345703, + "height": 25, + "seed": 724495938, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [ + { + "id": "pbgCp_v4XB-4ur4z6O3Bc", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Polling Updater 1", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Polling Updater 1", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 471, + "versionNonce": 2003687866, + "isDeleted": false, + "id": "2Sp_rAnCP5DVtZtanChb6", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 466, + "y": 388.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 43, + "height": 35, + "seed": 1921756702, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "k97D4vwVRWmZjD3yCJXe5" + }, + { + "id": "DCT-vq3X8w4-9CK0i1WK1", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 407, + "versionNonce": 1648441062, + "isDeleted": false, + "id": "k97D4vwVRWmZjD3yCJXe5", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 477.57999992370605, + "y": 393.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 19.84000015258789, + "height": 25, + "seed": 493958302, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "rx", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "2Sp_rAnCP5DVtZtanChb6", + "originalText": "rx", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 266, + "versionNonce": 1186894458, + "isDeleted": false, + "id": "R1aGd7ZcthGGm4ndwxhLB", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 425, + "y": 226, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 221, + "height": 38, + "seed": 559128414, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "_hDI7ak2sTyZPUBS0b8w-" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 191, + "versionNonce": 2013620774, + "isDeleted": false, + "id": "_hDI7ak2sTyZPUBS0b8w-", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 509.5599994659424, + "y": 232.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 51.880001068115234, + "height": 25, + "seed": 1824035934, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "fetch", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "R1aGd7ZcthGGm4ndwxhLB", + "originalText": "fetch", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 439, + "versionNonce": 83505978, + "isDeleted": false, + "id": "RnHvTnp5Odw8X2f_unjuu", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 649, + "y": 226, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 193.00000000000003, + "height": 38, + "seed": 867685982, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "3UyzMOlvG4IIHqPHRbztE" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 408, + "versionNonce": 90256742, + "isDeleted": false, + "id": "3UyzMOlvG4IIHqPHRbztE", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 718.7000007629395, + "y": 232.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 53.599998474121094, + "height": 25, + "seed": 8050462, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "parse", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "RnHvTnp5Odw8X2f_unjuu", + "originalText": "parse", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 629, + "versionNonce": 1686354938, + "isDeleted": false, + "id": "rpCTi5Ye67KDSe26PwR0a", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 578.5, + "y": 307.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 85, + "height": 36, + "seed": 599844702, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "3Pt6BooWESwxB1gZIA-3v" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 639, + "versionNonce": 1671534758, + "isDeleted": false, + "id": "3Pt6BooWESwxB1gZIA-3v", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 595.0599994659424, + "y": 313, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 51.880001068115234, + "height": 25, + "seed": 1747471262, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "fetch", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "rpCTi5Ye67KDSe26PwR0a", + "originalText": "fetch", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 638, + "versionNonce": 1398680762, + "isDeleted": false, + "id": "p6aB7QEw7RUZGP-S1w8uW", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 668.5, + "y": 306.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 70, + "height": 38, + "seed": 714680286, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "VaMUIZ6R7q0fVQIF_1H-m" + }, + { + "id": "fipdoX_2jWMMttHq0biwj", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 641, + "versionNonce": 980653030, + "isDeleted": false, + "id": "VaMUIZ6R7q0fVQIF_1H-m", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 676.7000007629395, + "y": 313, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 53.599998474121094, + "height": 25, + "seed": 1529117726, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "parse", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "p6aB7QEw7RUZGP-S1w8uW", + "originalText": "parse", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 1131, + "versionNonce": 120358266, + "isDeleted": false, + "id": "fipdoX_2jWMMttHq0biwj", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 739.5, + "y": 345.04285714285714, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 143.1040273571428, + "seed": 1526565570, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "p6aB7QEw7RUZGP-S1w8uW", + "focus": -1.0285714285714285, + "gap": 1 + }, + "endBinding": { + "elementId": "uow6_ERpKpHt29RiN9MNZ", + "focus": -0.75, + "gap": 1 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 143.1040273571428 + ] + ] + }, + { + "type": "rectangle", + "version": 497, + "versionNonce": 870590246, + "isDeleted": false, + "id": "nRkSDPyke6S415ANJpqSO", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 696.5, + "y": 393.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 43, + "height": 35, + "seed": 1540799298, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "RHdQtWzei63bDNP8lbDoR" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 434, + "versionNonce": 154256954, + "isDeleted": false, + "id": "RHdQtWzei63bDNP8lbDoR", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 708.079999923706, + "y": 398.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 19.84000015258789, + "height": 25, + "seed": 362939138, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "rx", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "nRkSDPyke6S415ANJpqSO", + "originalText": "rx", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 601, + "versionNonce": 811618918, + "isDeleted": false, + "id": "DYijQiOE-bzqq2gIyWP7y", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 916.25, + "y": 389.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 43, + "height": 35, + "seed": 1425947074, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "OZwQJ1czpEHUJf-5mS2sy" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 538, + "versionNonce": 1112600314, + "isDeleted": false, + "id": "OZwQJ1czpEHUJf-5mS2sy", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 927.829999923706, + "y": 394.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 19.84000015258789, + "height": 25, + "seed": 710259074, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "rx", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "DYijQiOE-bzqq2gIyWP7y", + "originalText": "rx", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 759, + "versionNonce": 2058687910, + "isDeleted": false, + "id": "dRe5zdw_i7ke_ERGqgHJ-", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1184, + "y": 309, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 85, + "height": 36, + "seed": 1594082142, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "F4Lr--RTHsm_N-Lrsm8Mu" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 769, + "versionNonce": 118292410, + "isDeleted": false, + "id": "F4Lr--RTHsm_N-Lrsm8Mu", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1200.5599994659424, + "y": 314.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 51.880001068115234, + "height": 25, + "seed": 1857005470, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "fetch", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "dRe5zdw_i7ke_ERGqgHJ-", + "originalText": "fetch", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 766, + "versionNonce": 2081386726, + "isDeleted": false, + "id": "vPZEUjjPYESqGvFv-Rp4W", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1274, + "y": 308, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 70, + "height": 38, + "seed": 534053854, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "v4M2EX6oGwv9mypkE3nf4" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 771, + "versionNonce": 596179066, + "isDeleted": false, + "id": "v4M2EX6oGwv9mypkE3nf4", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1282.2000007629395, + "y": 314.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 53.599998474121094, + "height": 25, + "seed": 1954863134, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "parse", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "vPZEUjjPYESqGvFv-Rp4W", + "originalText": "parse", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "text", + "version": 174, + "versionNonce": 1878811686, + "isDeleted": false, + "id": "FLqrds_LtrcgMMNkcCu2q", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 232, + "y": 489, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 156.74000549316406, + "height": 25, + "seed": 310320450, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Executor Queue", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Executor Queue", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 976, + "versionNonce": 1736956218, + "isDeleted": false, + "id": "DCT-vq3X8w4-9CK0i1WK1", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 508.98472459870027, + "y": 424.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 0.23213825368219432, + "height": 61.98677459546377, + "seed": 2050105346, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "2Sp_rAnCP5DVtZtanChb6", + "focus": -0.99304009380763, + "gap": 1 + }, + "endBinding": { + "elementId": "vqgYUA0JXn0AfAfEy6BH4", + "focus": -1.0290997398675656, + "gap": 2.6601099045361707 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0.23213825368219432, + 61.98677459546377 + ] + ] + }, + { + "type": "rectangle", + "version": 528, + "versionNonce": 409530214, + "isDeleted": false, + "id": "Y3PoGw9NOC5IBQUKp3cR-", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 406, + "y": 489.64688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 103, + "height": 34, + "seed": 576806082, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "rectangle", + "version": 727, + "versionNonce": 845980154, + "isDeleted": false, + "id": "vqgYUA0JXn0AfAfEy6BH4", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 510, + "y": 489.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 44, + "height": 35, + "seed": 703773406, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "id": "DCT-vq3X8w4-9CK0i1WK1", + "type": "arrow" + }, + { + "id": "CH5dSO6dJ53vGEmqY2aWs", + "type": "arrow" + }, + { + "type": "text", + "id": "xP6C3cArVpheLzV5AFg_E" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 163, + "versionNonce": 1906447014, + "isDeleted": false, + "id": "xP6C3cArVpheLzV5AFg_E", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 529.289999961853, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 5.420000076293945, + "height": 25, + "seed": 226082462, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "1", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "vqgYUA0JXn0AfAfEy6BH4", + "originalText": "1", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 653, + "versionNonce": 2134528698, + "isDeleted": false, + "id": "zrqQOL7PgwaKzxPCDeS4N", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 556, + "y": 489.64688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 176.99999999999997, + "height": 34, + "seed": 1754666306, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "id": "CH5dSO6dJ53vGEmqY2aWs", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "rectangle", + "version": 849, + "versionNonce": 1716833766, + "isDeleted": false, + "id": "uow6_ERpKpHt29RiN9MNZ", + "fillStyle": "cross-hatch", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 734, + "y": 489.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 44, + "height": 35, + "seed": 1164320002, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "sjFWKA8ES33JvxT0dVcvh" + }, + { + "id": "fipdoX_2jWMMttHq0biwj", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 163, + "versionNonce": 1888742266, + "isDeleted": false, + "id": "sjFWKA8ES33JvxT0dVcvh", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 748.8800001144409, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 14.239999771118164, + "height": 25, + "seed": 833466398, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "2", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "uow6_ERpKpHt29RiN9MNZ", + "originalText": "2", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 394, + "versionNonce": 59646246, + "isDeleted": false, + "id": "OdVAxEmxdP0Y8q-094nMN", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 556, + "y": 584.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 221.00000000000003, + "height": 41, + "seed": 773076318, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "ZR6W2CO-B65WopEP2jrS1" + }, + { + "id": "CH5dSO6dJ53vGEmqY2aWs", + "type": "arrow" + }, + { + "id": "twNjmIr9f-l-aubZs4GnI", + "type": "arrow" + }, + { + "id": "5CrHigwwqK1VKc6Ca3gxy", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 283, + "versionNonce": 1555852346, + "isDeleted": false, + "id": "ZR6W2CO-B65WopEP2jrS1", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 642.6499996185303, + "y": 592.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 47.70000076293945, + "height": 25, + "seed": 1923846622, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "apply", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "OdVAxEmxdP0Y8q-094nMN", + "originalText": "apply", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 549, + "versionNonce": 750455910, + "isDeleted": false, + "id": "CH5dSO6dJ53vGEmqY2aWs", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 555, + "y": 525.2500000000001, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 0, + "height": 59.06447963800895, + "seed": 638457026, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "zrqQOL7PgwaKzxPCDeS4N", + "focus": 1.011299435028249, + "gap": 1.6031155000001718 + }, + "endBinding": { + "elementId": "OdVAxEmxdP0Y8q-094nMN", + "focus": -1.009049773755656, + "gap": 1 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 59.06447963800895 + ] + ] + }, + { + "type": "rectangle", + "version": 561, + "versionNonce": 1503057146, + "isDeleted": false, + "id": "hw9PKBQkD_MFDyEU0uuka", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 778.5, + "y": 584.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 233.99999999999997, + "height": 41, + "seed": 1056339102, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "OqBJjQ-07RyubDNHABeyS" + }, + { + "id": "vEyXTRJW7n_hrgPRIt7d3", + "type": "arrow" + }, + { + "id": "rYbr17RAyFgxzOKrfTzeq", + "type": "arrow" + }, + { + "id": "twNjmIr9f-l-aubZs4GnI", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 446, + "versionNonce": 1336446886, + "isDeleted": false, + "id": "OqBJjQ-07RyubDNHABeyS", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 871.6499996185303, + "y": 592.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 47.70000076293945, + "height": 25, + "seed": 934949086, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "apply", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "hw9PKBQkD_MFDyEU0uuka", + "originalText": "apply", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 835, + "versionNonce": 1218848186, + "isDeleted": false, + "id": "hZnDTRiQOaPQLk9O8COl6", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 779.5, + "y": 489.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 65.99999999999997, + "height": 35, + "seed": 377455106, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "RG8D9DfwueruyUSdOLsr5" + }, + { + "id": "uxbykYOvdtL0HYuSmUU6U", + "type": "arrow" + }, + { + "id": "twNjmIr9f-l-aubZs4GnI", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 296, + "versionNonce": 411282150, + "isDeleted": false, + "id": "RG8D9DfwueruyUSdOLsr5", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 809.789999961853, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 5.420000076293945, + "height": 25, + "seed": 1643067138, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "1", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "hZnDTRiQOaPQLk9O8COl6", + "originalText": "1", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 768, + "versionNonce": 1661820538, + "isDeleted": false, + "id": "N9_cITJx4vKH4lSu_tt_A", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 958.5000001636438, + "y": 416.9672055477426, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 71.07538481780904, + "seed": 1586569758, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": { + "elementId": "vpqws0a9Jh-wWPUB3jB4Z", + "focus": 1.0105613645758171, + "gap": 1 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 71.07538481780904 + ] + ] + }, + { + "type": "rectangle", + "version": 794, + "versionNonce": 635002406, + "isDeleted": false, + "id": "-A08osWH4z9kW6phuwwOP", + "fillStyle": "cross-hatch", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 959.5, + "y": 489.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#1971c2", + "width": 52.99999999999995, + "height": 35, + "seed": 338595202, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "vZnROuYPsK34LqIU31yf7" + }, + { + "id": "vEyXTRJW7n_hrgPRIt7d3", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 260, + "versionNonce": 1167032122, + "isDeleted": false, + "id": "vZnROuYPsK34LqIU31yf7", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 979.1900000572205, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 13.619999885559082, + "height": 25, + "seed": 264604994, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "3", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "-A08osWH4z9kW6phuwwOP", + "originalText": "3", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 1147, + "versionNonce": 1016506726, + "isDeleted": false, + "id": "twNjmIr9f-l-aubZs4GnI", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 776.4389828921583, + "y": 524.25, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 0, + "height": 63, + "seed": 787633410, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": { + "elementId": "hZnDTRiQOaPQLk9O8COl6", + "focus": 1.0927580941770225, + "gap": 3.061017107841735 + }, + "endBinding": { + "elementId": "hw9PKBQkD_MFDyEU0uuka", + "focus": -1.0176155308362542, + "gap": 2.061017107841735 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 63 + ] + ] + }, + { + "type": "arrow", + "version": 931, + "versionNonce": 2089781242, + "isDeleted": false, + "id": "uxbykYOvdtL0HYuSmUU6U", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 841.9999996309284, + "y": 238.23901038943114, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 1, + "height": 251.71830357452671, + "seed": 1488393374, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": { + "elementId": "vpqws0a9Jh-wWPUB3jB4Z", + "focus": -1.0695688639425673, + "gap": 4.000000369071586 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 1, + 251.71830357452671 + ] + ] + }, + { + "type": "text", + "version": 217, + "versionNonce": 2080935078, + "isDeleted": false, + "id": "xMxb5iz16pT1UiTIBqPDG", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 168, + "y": 682, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 212.36000061035156, + "height": 25, + "seed": 1947891714, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Buffer Transit Data", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Buffer Transit Data", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "text", + "version": 254, + "versionNonce": 269514938, + "isDeleted": false, + "id": "rUiVeXZmQgBmVGY4bUGiT", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 190, + "y": 769, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 185.24000549316406, + "height": 25, + "seed": 2073208962, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "Live Transit Data", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Live Transit Data", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 938, + "versionNonce": 299632614, + "isDeleted": false, + "id": "vpqws0a9Jh-wWPUB3jB4Z", + "fillStyle": "cross-hatch", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 847, + "y": 488.8531159999999, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 110.91429700000009, + "height": 35.58753700000011, + "seed": 681382082, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "m7L49SlkIqM3UX3pIO0v1" + }, + { + "id": "N9_cITJx4vKH4lSu_tt_A", + "type": "arrow" + }, + { + "id": "uxbykYOvdtL0HYuSmUU6U", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 248, + "versionNonce": 263541114, + "isDeleted": false, + "id": "m7L49SlkIqM3UX3pIO0v1", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 895.3371486144409, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 14.239999771118164, + "height": 25, + "seed": 1912711298, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "2", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "vpqws0a9Jh-wWPUB3jB4Z", + "originalText": "2", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 661, + "versionNonce": 1847466790, + "isDeleted": false, + "id": "YQXusl7FZ5mjVmkwS7nTt", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1014, + "y": 584.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 76.99999999999999, + "height": 41, + "seed": 991711234, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "SbUQ0qpP3hURdF-JpkzcT" + }, + { + "id": "8VmQ5RzV8MqKRX9MrvJ3c", + "type": "arrow" + }, + { + "id": "vEyXTRJW7n_hrgPRIt7d3", + "type": "arrow" + }, + { + "id": "j_qtXumsQfWi0I_VI5PkL", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 547, + "versionNonce": 515969594, + "isDeleted": false, + "id": "SbUQ0qpP3hURdF-JpkzcT", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1028.6499996185303, + "y": 592.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 47.70000076293945, + "height": 25, + "seed": 1222049730, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325688, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "apply", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "YQXusl7FZ5mjVmkwS7nTt", + "originalText": "apply", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 697, + "versionNonce": 2000406118, + "isDeleted": false, + "id": "r6US9SjrUjcRP26-bNJLb", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1093.5, + "y": 584.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 76.99999999999999, + "height": 41, + "seed": 1650600030, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "5HrAXQLJ-WCJb8_C8a4uo" + }, + { + "id": "s1NGF8K9oUvWEXmBzmufP", + "type": "arrow" + }, + { + "id": "8VmQ5RzV8MqKRX9MrvJ3c", + "type": "arrow" + }, + { + "id": "vSrc221actOuf9WusrgZt", + "type": "arrow" + } + ], + "updated": 1708594325688, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 583, + "versionNonce": 1489658, + "isDeleted": false, + "id": "5HrAXQLJ-WCJb8_C8a4uo", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1108.1499996185303, + "y": 592.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 47.70000076293945, + "height": 25, + "seed": 586771614, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "apply", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "r6US9SjrUjcRP26-bNJLb", + "originalText": "apply", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 708, + "versionNonce": 1040320934, + "isDeleted": false, + "id": "ye55wrbQ2ruSrJJx9tXx3", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1173.5, + "y": 584.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 76.99999999999999, + "height": 41, + "seed": 1476901634, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "fbE1QhbN4s8LgICVlAepH" + }, + { + "id": "S736oegZ-NP_Jn8T2r-5l", + "type": "arrow" + }, + { + "id": "s1NGF8K9oUvWEXmBzmufP", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 595, + "versionNonce": 574180282, + "isDeleted": false, + "id": "fbE1QhbN4s8LgICVlAepH", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1188.1499996185303, + "y": 592.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 47.70000076293945, + "height": 25, + "seed": 723323586, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "apply", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "ye55wrbQ2ruSrJJx9tXx3", + "originalText": "apply", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 1014, + "versionNonce": 832431334, + "isDeleted": false, + "id": "oLUKp1kMgqNdxEPEkb372", + "fillStyle": "cross-hatch", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1013.5428514999999, + "y": 488.8531159999999, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 76.91429700000009, + "height": 35.58753700000011, + "seed": 129805314, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "TCgAzrDxcbwYL9YI6wNBf" + }, + { + "id": "8VmQ5RzV8MqKRX9MrvJ3c", + "type": "arrow" + }, + { + "id": "vEyXTRJW7n_hrgPRIt7d3", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 323, + "versionNonce": 726385786, + "isDeleted": false, + "id": "TCgAzrDxcbwYL9YI6wNBf", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1044.880000114441, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 14.239999771118164, + "height": 25, + "seed": 1493949378, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "2", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "oLUKp1kMgqNdxEPEkb372", + "originalText": "2", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 898, + "versionNonce": 1402755110, + "isDeleted": false, + "id": "y5kRBL1VIbCsvey9iszvB", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1091.5, + "y": 488.7499999999999, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 83.01295899999985, + "height": 35.79376900000011, + "seed": 1815920194, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "qGVL3pVMGuja1QEF58BVa" + }, + { + "id": "s1NGF8K9oUvWEXmBzmufP", + "type": "arrow" + }, + { + "id": "8VmQ5RzV8MqKRX9MrvJ3c", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 360, + "versionNonce": 85009722, + "isDeleted": false, + "id": "qGVL3pVMGuja1QEF58BVa", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1130.2964794618529, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 5.420000076293945, + "height": 25, + "seed": 1347397122, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "1", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "y5kRBL1VIbCsvey9iszvB", + "originalText": "1", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 719, + "versionNonce": 1810522982, + "isDeleted": false, + "id": "DwJbh4L0U48rxYKAqNfpB", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1174.512959, + "y": 488.6468844999998, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 168.48704100000006, + "height": 36.000000000000114, + "seed": 1675830494, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "id": "s1NGF8K9oUvWEXmBzmufP", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "rectangle", + "version": 877, + "versionNonce": 1760325114, + "isDeleted": false, + "id": "OIqNLYrG2vKqjdPIBjJEQ", + "fillStyle": "hachure", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1343, + "y": 489.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 32.00000000000001, + "height": 35, + "seed": 1098016542, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "2NpZ0UtU8si40TXPeKtsD" + }, + { + "id": "VJAv_AA4wh9HPi5ElZQsZ", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 322, + "versionNonce": 1020593830, + "isDeleted": false, + "id": "2NpZ0UtU8si40TXPeKtsD", + "fillStyle": "cross-hatch", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1356.289999961853, + "y": 494.14688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "#4dabf7", + "width": 5.420000076293945, + "height": 25, + "seed": 454284126, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "1", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "OIqNLYrG2vKqjdPIBjJEQ", + "originalText": "1", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 893, + "versionNonce": 1809882810, + "isDeleted": false, + "id": "pAR3k0emFpck8rYDIDQXw", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1375.5, + "y": 488.64688449999994, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 118, + "height": 36, + "seed": 1685386718, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "id": "iXoy2RGlWeoP2O-W4w0Ep", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "arrow", + "version": 1002, + "versionNonce": 923353574, + "isDeleted": false, + "id": "vEyXTRJW7n_hrgPRIt7d3", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1012.5000000738087, + "y": 529.0097662199997, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 0, + "height": 54.69153252059971, + "seed": 33441502, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "oLUKp1kMgqNdxEPEkb372", + "focus": 1.0271172322147408, + "gap": 4.5691132199997355 + }, + "endBinding": { + "elementId": "YQXusl7FZ5mjVmkwS7nTt", + "focus": -1.0389610370439306, + "gap": 1.4999999261913217 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 54.69153252059971 + ] + ] + }, + { + "type": "arrow", + "version": 1003, + "versionNonce": 177256314, + "isDeleted": false, + "id": "8VmQ5RzV8MqKRX9MrvJ3c", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1093.1291821802736, + "y": 530.78926145086, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 0, + "height": 52.78203292055082, + "seed": 1506154910, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "y5kRBL1VIbCsvey9iszvB", + "focus": 0.9607487264663421, + "gap": 6.245492450859956 + }, + "endBinding": { + "elementId": "r6US9SjrUjcRP26-bNJLb", + "focus": -1.009631631681206, + "gap": 1 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 52.78203292055082 + ] + ] + }, + { + "type": "arrow", + "version": 1030, + "versionNonce": 764679462, + "isDeleted": false, + "id": "s1NGF8K9oUvWEXmBzmufP", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1174.755011493805, + "y": 529.4119814508599, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 0, + "height": 52.822363078412764, + "seed": 36753182, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "DwJbh4L0U48rxYKAqNfpB", + "focus": 0.9971267523915376, + "gap": 4.76509695085997 + }, + "endBinding": { + "elementId": "ye55wrbQ2ruSrJJx9tXx3", + "focus": -0.967402298862211, + "gap": 2.2656554707273244 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 52.822363078412764 + ] + ] + }, + { + "type": "arrow", + "version": 686, + "versionNonce": 893368378, + "isDeleted": false, + "id": "VJAv_AA4wh9HPi5ElZQsZ", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1342.9999996309284, + "y": 326.00101338943114, + "strokeColor": "#1e1e1e", + "backgroundColor": "#a5d8ff", + "width": 0, + "height": 157.39688450000017, + "seed": 1157064926, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": { + "elementId": "OIqNLYrG2vKqjdPIBjJEQ", + "focus": -1.0000000230669739, + "gap": 5.748986610568636 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 157.39688450000017 + ] + ] + }, + { + "type": "arrow", + "version": 1095, + "versionNonce": 165838950, + "isDeleted": false, + "id": "iXoy2RGlWeoP2O-W4w0Ep", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1374.1675279436915, + "y": 525.0534013985348, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 0.18550849620919507, + "height": 53.44659860146521, + "seed": 1606301918, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "pAR3k0emFpck8rYDIDQXw", + "focus": 1.0225842721408214, + "gap": 1.332472056308461 + }, + "endBinding": { + "elementId": "FG0xyEC6bjrVvfXXFkhGr", + "focus": -0.9752121769956111, + "gap": 1 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0.18550849620919507, + 53.44659860146521 + ] + ] + }, + { + "type": "rectangle", + "version": 829, + "versionNonce": 1540399354, + "isDeleted": false, + "id": "FG0xyEC6bjrVvfXXFkhGr", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1373.5, + "y": 579.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 80.99999999999997, + "height": 43, + "seed": 1211220994, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "7UOhjpWFIqXzoeKvZrdUr" + }, + { + "id": "iXoy2RGlWeoP2O-W4w0Ep", + "type": "arrow" + }, + { + "id": "-QpmtHvCIPviWT2XJZRJV", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 719, + "versionNonce": 2143388582, + "isDeleted": false, + "id": "7UOhjpWFIqXzoeKvZrdUr", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1390.1499996185303, + "y": 588.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 47.70000076293945, + "height": 25, + "seed": 2065560514, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "apply", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "FG0xyEC6bjrVvfXXFkhGr", + "originalText": "apply", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 329, + "versionNonce": 2043048378, + "isDeleted": false, + "id": "20h5C81H-CYI27Tpd74ou", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 402, + "y": 761, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 367.99999999999994, + "height": 42, + "seed": 97377310, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "yz-IQ63iT5cK2GSyekOdh" + }, + { + "id": "F4a-HNfDUp8O41pcv3trV", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 255, + "versionNonce": 1096687334, + "isDeleted": false, + "id": "yz-IQ63iT5cK2GSyekOdh", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 579.4400000572205, + "y": 769.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 13.119999885559082, + "height": 25, + "seed": 2077060638, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "A", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "20h5C81H-CYI27Tpd74ou", + "originalText": "A", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 370, + "versionNonce": 574892666, + "isDeleted": false, + "id": "IqMFPR6D4iUuFlmFg2h3z", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 402, + "y": 676, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 367.99999999999994, + "height": 42, + "seed": 445551618, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "G4Er45oJTuBlpebe08edC" + }, + { + "id": "5CrHigwwqK1VKc6Ca3gxy", + "type": "arrow" + }, + { + "id": "BYY2sqc6N-uTx5iTOoG2R", + "type": "arrow" + }, + { + "id": "dtokkLQC1XKcHX81-QdOg", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 298, + "versionNonce": 860181030, + "isDeleted": false, + "id": "G4Er45oJTuBlpebe08edC", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 578.7300000190735, + "y": 684.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 14.539999961853027, + "height": 25, + "seed": 157336514, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "B", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "IqMFPR6D4iUuFlmFg2h3z", + "originalText": "B", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 454, + "versionNonce": 202165050, + "isDeleted": false, + "id": "5CrHigwwqK1VKc6Ca3gxy", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 668, + "y": 630, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 43, + "seed": 1315250050, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "OdVAxEmxdP0Y8q-094nMN", + "focus": -0.013574660633484162, + "gap": 4.5 + }, + "endBinding": { + "elementId": "IqMFPR6D4iUuFlmFg2h3z", + "focus": 0.44565217391304357, + "gap": 3 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 43 + ] + ] + }, + { + "type": "rectangle", + "version": 458, + "versionNonce": 543432038, + "isDeleted": false, + "id": "VNoc_jPVCooBwfSqYSdhh", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 770, + "y": 759, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 241.99999999999994, + "height": 42, + "seed": 2022920862, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "49TJbaW8lSUjt9MraulEE" + }, + { + "id": "RP9Ow_xaBH5G-VFYLVlAX", + "type": "arrow" + }, + { + "id": "dtokkLQC1XKcHX81-QdOg", + "type": "arrow" + }, + { + "id": "FhwMVCyPxe3HDRW1nTF5C", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 384, + "versionNonce": 495145978, + "isDeleted": false, + "id": "49TJbaW8lSUjt9MraulEE", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 883.7300000190735, + "y": 767.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 14.539999961853027, + "height": 25, + "seed": 638275294, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "B", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "VNoc_jPVCooBwfSqYSdhh", + "originalText": "B", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 564, + "versionNonce": 1845985446, + "isDeleted": false, + "id": "AGWy-WRNKq1GRwlq27Uat", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1014, + "y": 756, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 235.99999999999994, + "height": 45, + "seed": 1481685762, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "ENTILzjLGHiVQxm21FA85" + }, + { + "id": "VM8X0qyPeoxkTBRdLIM5J", + "type": "arrow" + }, + { + "id": "nXrTlzpTYojAwNzux2iX6", + "type": "arrow" + }, + { + "id": "5rqqd0bhXqDAnyrpwoGre", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 489, + "versionNonce": 2024457402, + "isDeleted": false, + "id": "ENTILzjLGHiVQxm21FA85", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1125.5599999427795, + "y": 766, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 12.880000114440918, + "height": 25, + "seed": 977668802, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "C", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "AGWy-WRNKq1GRwlq27Uat", + "originalText": "C", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 508, + "versionNonce": 1339849702, + "isDeleted": false, + "id": "DRdIzIA5aSRPeNpP2pex-", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 770, + "y": 676, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 241.99999999999994, + "height": 42, + "seed": 1884858078, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "ETsUVzbEoDEH6Wh5dDIE_" + }, + { + "id": "rYbr17RAyFgxzOKrfTzeq", + "type": "arrow" + }, + { + "id": "dtokkLQC1XKcHX81-QdOg", + "type": "arrow" + }, + { + "id": "FhwMVCyPxe3HDRW1nTF5C", + "type": "arrow" + }, + { + "id": "nXrTlzpTYojAwNzux2iX6", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 428, + "versionNonce": 119938426, + "isDeleted": false, + "id": "ETsUVzbEoDEH6Wh5dDIE_", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 884.5599999427795, + "y": 684.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 12.880000114440918, + "height": 25, + "seed": 1520179998, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "C", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "DRdIzIA5aSRPeNpP2pex-", + "originalText": "C", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 643, + "versionNonce": 104357434, + "isDeleted": false, + "id": "hWRH46gwh1PqF21q9C4zp", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1013.073454, + "y": 674.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 235.99999999999994, + "height": 45, + "seed": 1774178334, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "0N99yapinSp1_mDnKRh6N" + }, + { + "id": "S736oegZ-NP_Jn8T2r-5l", + "type": "arrow" + }, + { + "id": "j_qtXumsQfWi0I_VI5PkL", + "type": "arrow" + }, + { + "id": "vSrc221actOuf9WusrgZt", + "type": "arrow" + }, + { + "id": "5rqqd0bhXqDAnyrpwoGre", + "type": "arrow" + }, + { + "id": "qxLbNSc9nH3MjXNRGDNpH", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 568, + "versionNonce": 1588542054, + "isDeleted": false, + "id": "0N99yapinSp1_mDnKRh6N", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1123.273453809265, + "y": 684.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 15.600000381469727, + "height": 25, + "seed": 130817118, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "D", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "hWRH46gwh1PqF21q9C4zp", + "originalText": "D", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 506, + "versionNonce": 1323761062, + "isDeleted": false, + "id": "rYbr17RAyFgxzOKrfTzeq", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 893.9011232891656, + "y": 628.5371760879644, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 43, + "seed": 933729730, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "hw9PKBQkD_MFDyEU0uuka", + "focus": 0.013665612913114198, + "gap": 3.03717608796444 + }, + "endBinding": { + "elementId": "DRdIzIA5aSRPeNpP2pex-", + "focus": 0.023976225530294545, + "gap": 4.46282391203556 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 43 + ] + ] + }, + { + "type": "arrow", + "version": 630, + "versionNonce": 894277562, + "isDeleted": false, + "id": "j_qtXumsQfWi0I_VI5PkL", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1059.202579342441, + "y": 629.3859425029369, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 43, + "seed": 1000093698, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "YQXusl7FZ5mjVmkwS7nTt", + "focus": -0.17409296993353024, + "gap": 3.8859425029369277 + }, + "endBinding": { + "elementId": "hWRH46gwh1PqF21q9C4zp", + "focus": -0.6090752089623642, + "gap": 2.1140574970630723 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 43 + ] + ] + }, + { + "type": "arrow", + "version": 612, + "versionNonce": 1103386854, + "isDeleted": false, + "id": "vSrc221actOuf9WusrgZt", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1135.073454342441, + "y": 626.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 42.99999950293693, + "seed": 236078722, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "r6US9SjrUjcRP26-bNJLb", + "focus": -0.07982998292054501, + "gap": 1 + }, + "endBinding": { + "elementId": "hWRH46gwh1PqF21q9C4zp", + "focus": 0.033898307986789215, + "gap": 5.00000049706307 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 42.99999950293693 + ] + ] + }, + { + "type": "arrow", + "version": 639, + "versionNonce": 1844875386, + "isDeleted": false, + "id": "S736oegZ-NP_Jn8T2r-5l", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1210.664620342441, + "y": 630.580001502937, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 42.919998497063034, + "seed": 1800030402, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "ye55wrbQ2ruSrJJx9tXx3", + "focus": 0.03468518591062566, + "gap": 5.080001502936966 + }, + "endBinding": { + "elementId": "hWRH46gwh1PqF21q9C4zp", + "focus": 0.6745014096817041, + "gap": 1 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 42.919998497063034 + ] + ] + }, + { + "type": "rectangle", + "version": 246, + "versionNonce": 2127842342, + "isDeleted": false, + "id": "tCFT7TaS4GWxUTPH3e9dM", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 660, + "y": 853, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 469, + "height": 45, + "seed": 751476638, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "pM0euEcA3O04vH8cF6euv" + }, + { + "id": "F4a-HNfDUp8O41pcv3trV", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 146, + "versionNonce": 1082290490, + "isDeleted": false, + "id": "pM0euEcA3O04vH8cF6euv", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, + "x": 834.689998626709, + "y": 863, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 119.62000274658203, + "height": 25, + "seed": 1366808386, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "routing on A", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "tCFT7TaS4GWxUTPH3e9dM", + "originalText": "routing on A", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 494, + "versionNonce": 1409537894, + "isDeleted": false, + "id": "ia9PMtL1s9vwB3H7pqe7w", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1066.5, + "y": 940.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 309, + "height": 45, + "seed": 1851997342, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "vniZK_pa9hyb8VzJ0L1hw" + }, + { + "id": "VM8X0qyPeoxkTBRdLIM5J", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 393, + "versionNonce": 1079261690, + "isDeleted": false, + "id": "vniZK_pa9hyb8VzJ0L1hw", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 0, + "opacity": 100, + "angle": 0, + "x": 1161.310001373291, + "y": 950.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 119.37999725341797, + "height": 25, + "seed": 1850603742, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "routing on C", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "ia9PMtL1s9vwB3H7pqe7w", + "originalText": "routing on C", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 478, + "versionNonce": 1235221158, + "isDeleted": false, + "id": "F4a-HNfDUp8O41pcv3trV", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 664.5000002891657, + "y": 805.4365820879644, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 43.71661615422306, + "seed": 1694420098, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "20h5C81H-CYI27Tpd74ou", + "focus": -0.42663043635416126, + "gap": 2.436582087964439 + }, + "endBinding": { + "elementId": "tCFT7TaS4GWxUTPH3e9dM", + "focus": -0.9808102333084621, + "gap": 3.8468017578125 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 43.71661615422306 + ] + ] + }, + { + "type": "rectangle", + "version": 555, + "versionNonce": 477031098, + "isDeleted": false, + "id": "9R0Z6nTrFuTnbu8bnCl12", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1250.9169381654642, + "y": 757, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 241.99999999999994, + "height": 44, + "seed": 1289608734, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "4sB5qUMBsDqFPfGtsMHz0" + }, + { + "id": "qxLbNSc9nH3MjXNRGDNpH", + "type": "arrow" + }, + { + "id": "TKQL22FgfD_EaFnrCOSUr", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 481, + "versionNonce": 1448457702, + "isDeleted": false, + "id": "4sB5qUMBsDqFPfGtsMHz0", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1364.1169379747294, + "y": 766.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 15.600000381469727, + "height": 25, + "seed": 939027038, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "D", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "9R0Z6nTrFuTnbu8bnCl12", + "originalText": "D", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "rectangle", + "version": 599, + "versionNonce": 729121658, + "isDeleted": false, + "id": "kX2Vp26fOxXlTY3cVukwK", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1250.9169381654642, + "y": 676, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 241.99999999999994, + "height": 42, + "seed": 813133470, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 3 + }, + "boundElements": [ + { + "type": "text", + "id": "-iIGa2IVrKzgz65Cw-4Tx" + }, + { + "id": "-QpmtHvCIPviWT2XJZRJV", + "type": "arrow" + }, + { + "id": "TKQL22FgfD_EaFnrCOSUr", + "type": "arrow" + } + ], + "updated": 1708594325689, + "link": null, + "locked": false + }, + { + "type": "text", + "version": 523, + "versionNonce": 322046246, + "isDeleted": false, + "id": "-iIGa2IVrKzgz65Cw-4Tx", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1365.176938394346, + "y": 684.5, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 13.479999542236328, + "height": 25, + "seed": 51112670, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 1, + "text": "E", + "textAlign": "center", + "verticalAlign": "middle", + "containerId": "kX2Vp26fOxXlTY3cVukwK", + "originalText": "E", + "lineHeight": 1.25, + "baseline": 18 + }, + { + "type": "arrow", + "version": 672, + "versionNonce": 1872884838, + "isDeleted": false, + "id": "-QpmtHvCIPviWT2XJZRJV", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1413.9999998420708, + "y": 627.7803268401005, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 42.919998497063034, + "seed": 191001374, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "FG0xyEC6bjrVvfXXFkhGr", + "focus": 3.899486604675561e-9, + "gap": 5.2803268401005425 + }, + "endBinding": { + "elementId": "kX2Vp26fOxXlTY3cVukwK", + "focus": 0.3477938981537734, + "gap": 5.2996746628364235 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 42.919998497063034 + ] + ] + }, + { + "type": "arrow", + "version": 895, + "versionNonce": 1702000550, + "isDeleted": false, + "id": "dtokkLQC1XKcHX81-QdOg", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 752.1482077789306, + "y": 725.5228344071656, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 28.727165592834353, + "height": 28.727165592834353, + "seed": 1768552294, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "IqMFPR6D4iUuFlmFg2h3z", + "focus": -0.6713432847403166, + "gap": 7.5228344071656466 + }, + "endBinding": { + "elementId": "VNoc_jPVCooBwfSqYSdhh", + "focus": -0.5941875114664444, + "gap": 4.75 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 28.727165592834353, + 28.727165592834353 + ] + ] + }, + { + "type": "arrow", + "version": 872, + "versionNonce": 986627514, + "isDeleted": false, + "id": "FhwMVCyPxe3HDRW1nTF5C", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 789.6236215285376, + "y": 753.6359425029369, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 28.59168158024795, + "height": 28.591681580247723, + "seed": 148629990, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "VNoc_jPVCooBwfSqYSdhh", + "focus": -0.8995805349896169, + "gap": 5.364057497063072 + }, + "endBinding": { + "elementId": "DRdIzIA5aSRPeNpP2pex-", + "focus": 0.31507349273609164, + "gap": 7.044260922689205 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 28.59168158024795, + -28.591681580247723 + ] + ] + }, + { + "type": "arrow", + "version": 995, + "versionNonce": 751866598, + "isDeleted": false, + "id": "nXrTlzpTYojAwNzux2iX6", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 993.0599579806902, + "y": 723.795967694437, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 28.727165592834353, + "height": 28.727165592834353, + "seed": 1466845030, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "DRdIzIA5aSRPeNpP2pex-", + "focus": -0.5300281006074176, + "gap": 5.795967694436968 + }, + "endBinding": { + "elementId": "AGWy-WRNKq1GRwlq27Uat", + "focus": -0.5995445531227526, + "gap": 3.476866712728679 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 28.727165592834353, + 28.727165592834353 + ] + ] + }, + { + "type": "arrow", + "version": 944, + "versionNonce": 878900858, + "isDeleted": false, + "id": "5rqqd0bhXqDAnyrpwoGre", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1030.5353717302974, + "y": 751.9090757902081, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 28.59168158024795, + "height": 28.591681580247723, + "seed": 1446800038, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "AGWy-WRNKq1GRwlq27Uat", + "focus": -0.9114274197828796, + "gap": 4.090924209791865 + }, + "endBinding": { + "elementId": "hWRH46gwh1PqF21q9C4zp", + "focus": 0.32476161195369313, + "gap": 3.817394209960412 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 28.59168158024795, + -28.591681580247723 + ] + ] + }, + { + "type": "arrow", + "version": 1000, + "versionNonce": 1883850278, + "isDeleted": false, + "id": "qxLbNSc9nH3MjXNRGDNpH", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "dotted", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1230.1984920751363, + "y": 723.795967694437, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 26.829463375617934, + "height": 26.727165592834353, + "seed": 149713658, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "hWRH46gwh1PqF21q9C4zp", + "focus": -0.5137527808081439, + "gap": 4.295967694436968 + }, + "endBinding": { + "elementId": "9R0Z6nTrFuTnbu8bnCl12", + "focus": -0.6031631617717584, + "gap": 6.476866712728679 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 26.829463375617934, + 26.727165592834353 + ] + ] + }, + { + "type": "arrow", + "version": 961, + "versionNonce": 141694778, + "isDeleted": false, + "id": "TKQL22FgfD_EaFnrCOSUr", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1269.8469813268543, + "y": 751.9090757902081, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 27.330342883103867, + "height": 26.591681580247723, + "seed": 2006451130, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708594325689, + "link": null, + "locked": false, + "startBinding": { + "elementId": "9R0Z6nTrFuTnbu8bnCl12", + "focus": -0.904619473082073, + "gap": 5.090924209791865 + }, + "endBinding": { + "elementId": "kX2Vp26fOxXlTY3cVukwK", + "focus": 0.32006279982418195, + "gap": 7.317394209960412 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 27.330342883103867, + -26.591681580247723 + ] + ] + } + ], + "appState": { + "gridSize": null, + "viewBackgroundColor": "#ffffff" + }, + "files": {} +} \ No newline at end of file diff --git a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg new file mode 100644 index 00000000000..36f9fc8ddfe --- /dev/null +++ b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg @@ -0,0 +1,21 @@ + + + + + + + + Polling Updater 2Threads, Queues, and Buffers Over TimeGraph UpdaterHTTP Handler 1HTTP Handler 2Streaming UpdaterPolling Updater 1rxfetchparsefetchparserxrxfetchparseExecutor Queue12applyapply13Buffer Transit DataLive Transit Data2applyapplyapply211applyABBCCDrouting on Arouting on CDE \ No newline at end of file diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md new file mode 100644 index 00000000000..26120cfea9b --- /dev/null +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -0,0 +1,26 @@ +# Realtime Updaters + +## Realtime Concurrency Overview + +The following approach to realtime concurrency was devised around 2013 when OTP first started consuming realtime data that affected routing results rather than just displaying messages. At first, the whole realtime system followed this approach. Some aspects of this system were maintained in subsequent work over the years, but because the details and rationale were not fully documented, misinterpretations and subtle inconsistencies were introduced. + +On 11 January 2024 a team of OTP developers reviewed this realtime concurrency approach together. The conclusion was that this approach remains sound, and that any consistency problems were not due to the approach itself, but rather due to its partial or erroneous implementation in realtime updater classes. Therefore, we decided to continue applying this approach in any new work on the realtime subsystem, at least until we encounter some situation that does not fit within this model. All existing realtime code that is not consistent with this approach should progressively be brought in line with it. + +The following is a sequence diagram showing how threads are intended to communicate. Unlike some common forms of sequence diagrams, time is on the horizontal axis here. Each horizontal line represents either a thread of execution (handling incoming realtime messages or routing requests) or a queue or buffer data structure. Dotted lines represent object references being handed off, and solid lines represent data being copied. + +![Architecture diagram](images/updater-threads-queues.svg) + +At the top of the diagram are the GraphUpdater implementations. These fall broadly into two categories: polling updaters and streaming updaters. Polling updaters periodically send a request to server (often just a simple HTTP server) which returns a file containing the latest version of the updates. Streaming updaters are generally built around libraries implementing message-oriented protocols such as AMQP or WebSockets, which fire a callback each time a new message is received. Polling updaters tend to return a full dataset describing the entire system state on each polling operation, while streaming updaters tend to receive incremental messages targeting individual transit trips. As such, polling updaters execute relatively infrequently (perhaps every minute or two) and process large responses, while streaming updaters execute very frequently (often many times per second) and operate on small messages in short bursts. Polling updaters are simpler in many ways and make use of common HTTP server components, but they introduce significant latency and redundant communication. Streaming updaters require more purpose-built or custom-configured components including message brokers, but bandwidth consumption and latency are lower, allowing routing results to reflect vehicle delays and positions immediately after they're reported. + +The GraphUpdaterManager coordinates all these updaters, and each runs freely in its own thread, receiving, deserializing, and validating data on its own schedule. Importantly, the GraphUpdaters are _not allowed to directly modify the transit data (Graph)_. Instead, they submit instances of GraphWriterRunnable which are queued up using the WriteToGraphCallback interface. These instances are essentially deferred code snippets that _are allowed_ to write to the Graph, but in a very controlled way. In short, there is exactly one thread that is allowed to make changes to the transit data, and those changes are queued up and executed in sequence, one at a time. + +As mentioned above, these GraphWriterRunnable instances must write to the transit data model in a very controlled way, following specific rules. They operate on a buffer containing a shallow copy of the whole transit data structure, and apply a copy-on-write strategy to avoid corrupting existing objects that may be visible to other parts of the system. When an instance is copied for writing, any references to it in parent objects must also be updated. Therefore, writes cause cascading copy operations, and all instances in the object tree back up to the root of the transit data structure must also be copied. As an optimization, if a GraphWriterRunnable is able to determine that the protective copy has already been made in this buffer (the part of the structure it needs to modify is somehow marked as being "dirty") it does not need to make another copy. If the update involves reading the existing data structure before making a change, those reads should be performed within the same contiguous chunk of deferred logic that performs the corresponding write, ensuring that there are no data races between write operations. + +This writable buffer of transit data is periodically made immutable and swapped into the role of a live snapshot, which is ready to be handed off to any incoming routing requests. Each time an immutable snapshot is created, a new writable buffer is created by making a shallow copy of the root instance in the transit data aggreagate. This functions like a double-buffering system, except that any number of snapshots can exist at once, and large subsets of the data can be shared across snapshots. As older snapshots (and their component parts) fall out of use, they are dereferenced and become eligible for garbage collection. Although the buffer swap could in principle occur after every write operation, it can incur significant copying and indexing overhead. When incremental message-oriented updaters are present this overhead would be incurred more often than necesary. Snapshots can be throttled to occur at most every few seconds, thereby reducing the total overhead at no perceptible cost to realtime visibility latency. + +This is essentially a multi-version snapshot concurrency control system, inspired by widely used database engines (and in fact informed by books on transactional database design). The end result is a system where 1) writing operations are simple to reason about and cannot conflict because only one write happens at a time; 2) multiple read operations (including routing requests) can occur concurrently; 3) read operations do not need to pause while writes are happening; 4) read operations see only fully completed write operations, never partial writes; and 5) each read operation sees a consistent, unchanging view of the transit data. + +Importantly, no locking is necessary, though some form of synchronization is applied during the buffer swap operation to impose a consistent view of the whole data structure via a happens-before relationship as defined by the Java memory model. (While pointers to objects can be handed between threads with no read-tearing of the pointer itself, there is no guarantee that the web of objects pointed to will be consistent without some explicit synchronization at the hand-off.) + +Arguably the process of creating an immutable live snapshot (and a corresponding new writable buffer) should be handled by a GraphWriterRunnable on the single graph updater thread. This would serve to defer any queued modifications until the new buffer is in place, without introducing any further locking mechanisms. + From e3b5326e6174b63d8938194fd61229890cd5587c Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Fri, 23 Feb 2024 00:24:10 +0800 Subject: [PATCH 0636/1688] update realtime concurrency diagram add updater reads from buffer add garbage collection --- .../images/updater-threads-queues.excalidraw | 1826 ++++++++++------- .../updater/images/updater-threads-queues.svg | 4 +- 2 files changed, 1099 insertions(+), 731 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw index 274a194919e..beafb30c385 100644 --- a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw +++ b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.excalidraw @@ -5,13 +5,61 @@ "elements": [ { "type": "arrow", - "version": 659, - "versionNonce": 648948858, + "version": 772, + "versionNonce": 1584975214, + "isDeleted": false, + "id": "UiGgSvKQYLhHvq9f8X1v6", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "dashed", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1126.5145762839165, + "y": 900.8500688172288, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 2.2737367544323206e-13, + "height": 134.3999311827714, + "seed": 191626350, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708618510776, + "link": null, + "locked": false, + "startBinding": { + "elementId": "tCFT7TaS4GWxUTPH3e9dM", + "focus": -0.989401178183013, + "gap": 2.8500688172288164 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + -2.2737367544323206e-13, + 134.3999311827714 + ] + ] + }, + { + "type": "arrow", + "version": 673, + "versionNonce": 1878291762, "isDeleted": false, "id": "VM8X0qyPeoxkTBRdLIM5J", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -28,7 +76,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -57,8 +105,8 @@ }, { "type": "arrow", - "version": 920, - "versionNonce": 66351142, + "version": 1012, + "versionNonce": 262024942, "isDeleted": false, "id": "3GtZ4aSs9ueb9GU2jLsdc", "fillStyle": "solid", @@ -80,7 +128,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -105,8 +153,8 @@ }, { "type": "arrow", - "version": 611, - "versionNonce": 54677370, + "version": 718, + "versionNonce": 1674772210, "isDeleted": false, "id": "ATmo4gWymhk2HAtTZvwr8", "fillStyle": "solid", @@ -128,7 +176,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594332225, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -153,8 +201,8 @@ }, { "type": "arrow", - "version": 587, - "versionNonce": 159349606, + "version": 729, + "versionNonce": 1093057326, "isDeleted": false, "id": "zb4NyAsYy13XFu293d0GB", "fillStyle": "solid", @@ -163,11 +211,11 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 400.6507002377508, + "x": 390.4210421860963, "y": 603.6986805801255, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 1112, + "width": 1122.2296580516545, "height": 0, "seed": 1629036610, "groupIds": [], @@ -176,13 +224,13 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618565655, "link": null, "locked": false, "startBinding": { "elementId": "D7-QRZxcX9A0a-2HK7Nex", - "focus": 0.41589444641003864, - "gap": 8.950703289508624 + "focus": 0.10423309392395506, + "gap": 13.586142283752565 }, "endBinding": null, "lastCommittedPoint": null, @@ -194,15 +242,15 @@ 0 ], [ - 1112, + 1122.2296580516545, 0 ] ] }, { "type": "arrow", - "version": 992, - "versionNonce": 1825887738, + "version": 1047, + "versionNonce": 1991921842, "isDeleted": false, "id": "jFldS1dvD1KlUNloJjncO", "fillStyle": "solid", @@ -224,7 +272,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -249,8 +297,8 @@ }, { "type": "arrow", - "version": 873, - "versionNonce": 403119782, + "version": 928, + "versionNonce": 626379630, "isDeleted": false, "id": "7LqY4x9DQ6sxq0rqNvLa6", "fillStyle": "solid", @@ -272,7 +320,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -297,8 +345,8 @@ }, { "type": "text", - "version": 468, - "versionNonce": 645662394, + "version": 539, + "versionNonce": 1548839538, "isDeleted": false, "id": "E-mK9Dz0MlVGI0zCEjmgE", "fillStyle": "solid", @@ -311,8 +359,8 @@ "y": 315, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 172.50001525878906, - "height": 25, + "width": 153.427734375, + "height": 23, "seed": 1746517598, "groupIds": [], "frameId": null, @@ -323,23 +371,23 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "Polling Updater 2", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Polling Updater 2", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "text", - "version": 204, - "versionNonce": 1726513530, + "version": 222, + "versionNonce": 1537617326, "isDeleted": false, "id": "ZVYycY9GjFTR8gQbd1wot", "fillStyle": "solid", @@ -352,30 +400,30 @@ "y": 138, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 573.0200805664062, - "height": 35, + "width": 512.0390625, + "height": 32.199999999999996, "seed": 1131654366, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594379770, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 28, - "fontFamily": 1, + "fontFamily": 2, "text": "Threads, Queues, and Buffers Over Time", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Threads, Queues, and Buffers Over Time", - "lineHeight": 1.25, - "baseline": 25 + "lineHeight": 1.15, + "baseline": 26 }, { "type": "text", - "version": 271, - "versionNonce": 763305850, + "version": 371, + "versionNonce": 2091765806, "isDeleted": false, "id": "D7-QRZxcX9A0a-2HK7Nex", "fillStyle": "solid", @@ -385,11 +433,11 @@ "opacity": 100, "angle": 0, "x": 244.53997802734375, - "y": 586, + "y": 591, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 147.16001892089844, - "height": 25, + "width": 132.294921875, + "height": 23, "seed": 1121505758, "groupIds": [], "frameId": null, @@ -400,23 +448,23 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618547987, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "Graph Updater", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Graph Updater", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "text", - "version": 432, - "versionNonce": 1159736614, + "version": 481, + "versionNonce": 640698350, "isDeleted": false, "id": "8q-Tc9B-UEz9icdriq9yS", "fillStyle": "solid", @@ -429,8 +477,8 @@ "y": 858, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 151.6999969482422, - "height": 25, + "width": 144.140625, + "height": 23, "seed": 883374494, "groupIds": [], "frameId": null, @@ -441,23 +489,23 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "HTTP Handler 1", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "HTTP Handler 1", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "text", - "version": 385, - "versionNonce": 1042358330, + "version": 435, + "versionNonce": 1238038002, "isDeleted": false, "id": "jb52v3pX5rahA8qitNheB", "fillStyle": "solid", @@ -470,8 +518,8 @@ "y": 948, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 160.52000427246094, - "height": 25, + "width": 144.140625, + "height": 23, "seed": 2076275522, "groupIds": [], "frameId": null, @@ -482,23 +530,23 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "HTTP Handler 2", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "HTTP Handler 2", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "text", - "version": 287, - "versionNonce": 1088763578, + "version": 352, + "versionNonce": 1157437998, "isDeleted": false, "id": "NxucM5UWiFJSHCUFadK_p", "fillStyle": "solid", @@ -511,8 +559,8 @@ "y": 393, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 182.4400177001953, - "height": 25, + "width": 167.861328125, + "height": 23, "seed": 2038655710, "groupIds": [], "frameId": null, @@ -523,23 +571,23 @@ "type": "arrow" } ], - "updated": 1708594332225, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "Streaming Updater", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Streaming Updater", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 1029, - "versionNonce": 340068602, + "version": 1104, + "versionNonce": 235388082, "isDeleted": false, "id": "pbgCp_v4XB-4ur4z6O3Bc", "fillStyle": "solid", @@ -548,11 +596,11 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 398.26203282117854, + "x": 396.42104218609643, "y": 246.5, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 1119.5800018310547, + "width": 1121.4209924661368, "height": 0, "seed": 1903169154, "groupIds": [], @@ -561,13 +609,13 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618595764, "link": null, "locked": false, "startBinding": { "elementId": "d9AAv6uLddhWu-tS7LU1d", - "focus": 0.04, - "gap": 1.5620358729363488 + "focus": 0.13043478260869562, + "gap": 14.973318797424554 }, "endBinding": null, "lastCommittedPoint": null, @@ -579,15 +627,15 @@ 0 ], [ - 1119.5800018310547, + 1121.4209924661368, 0 ] ] }, { "type": "text", - "version": 507, - "versionNonce": 86481830, + "version": 562, + "versionNonce": 1398663922, "isDeleted": false, "id": "d9AAv6uLddhWu-tS7LU1d", "fillStyle": "solid", @@ -596,12 +644,12 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 233.01998901367188, + "x": 228.01998901367188, "y": 233.5, "strokeColor": "#1e1e1e", "backgroundColor": "transparent", - "width": 163.6800079345703, - "height": 25, + "width": 153.427734375, + "height": 23, "seed": 724495938, "groupIds": [], "frameId": null, @@ -612,23 +660,23 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618595763, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "Polling Updater 1", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Polling Updater 1", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 471, - "versionNonce": 2003687866, + "version": 483, + "versionNonce": 1073193330, "isDeleted": false, "id": "2Sp_rAnCP5DVtZtanChb6", "fillStyle": "solid", @@ -659,14 +707,14 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 407, - "versionNonce": 1648441062, + "version": 425, + "versionNonce": 367191726, "isDeleted": false, "id": "k97D4vwVRWmZjD3yCJXe5", "fillStyle": "solid", @@ -675,34 +723,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 477.57999992370605, - "y": 393.5, + "x": 479.169921875, + "y": 394.5, "strokeColor": "#1e1e1e", "backgroundColor": "#a5d8ff", - "width": 19.84000015258789, - "height": 25, + "width": 16.66015625, + "height": 23, "seed": 493958302, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "rx", "textAlign": "center", "verticalAlign": "middle", "containerId": "2Sp_rAnCP5DVtZtanChb6", "originalText": "rx", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 266, - "versionNonce": 1186894458, + "version": 295, + "versionNonce": 1529258802, "isDeleted": false, "id": "R1aGd7ZcthGGm4ndwxhLB", "fillStyle": "solid", @@ -729,14 +777,14 @@ "id": "_hDI7ak2sTyZPUBS0b8w-" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 191, - "versionNonce": 2013620774, + "version": 230, + "versionNonce": 1248714990, "isDeleted": false, "id": "_hDI7ak2sTyZPUBS0b8w-", "fillStyle": "solid", @@ -745,34 +793,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 509.5599994659424, - "y": 232.5, + "x": 513.8203125, + "y": 233.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 51.880001068115234, - "height": 25, + "width": 43.359375, + "height": 23, "seed": 1824035934, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "fetch", "textAlign": "center", "verticalAlign": "middle", "containerId": "R1aGd7ZcthGGm4ndwxhLB", "originalText": "fetch", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 439, - "versionNonce": 83505978, + "version": 451, + "versionNonce": 1150250226, "isDeleted": false, "id": "RnHvTnp5Odw8X2f_unjuu", "fillStyle": "solid", @@ -799,14 +847,14 @@ "id": "3UyzMOlvG4IIHqPHRbztE" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 408, - "versionNonce": 90256742, + "version": 426, + "versionNonce": 538940206, "isDeleted": false, "id": "3UyzMOlvG4IIHqPHRbztE", "fillStyle": "solid", @@ -815,34 +863,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 718.7000007629395, - "y": 232.5, + "x": 720.4853515625, + "y": 233.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 53.599998474121094, - "height": 25, + "width": 50.029296875, + "height": 23, "seed": 8050462, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "parse", "textAlign": "center", "verticalAlign": "middle", "containerId": "RnHvTnp5Odw8X2f_unjuu", "originalText": "parse", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 629, - "versionNonce": 1686354938, + "version": 641, + "versionNonce": 565771954, "isDeleted": false, "id": "rpCTi5Ye67KDSe26PwR0a", "fillStyle": "solid", @@ -869,14 +917,14 @@ "id": "3Pt6BooWESwxB1gZIA-3v" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 639, - "versionNonce": 1671534758, + "version": 657, + "versionNonce": 828439918, "isDeleted": false, "id": "3Pt6BooWESwxB1gZIA-3v", "fillStyle": "solid", @@ -885,34 +933,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 595.0599994659424, - "y": 313, + "x": 599.3203125, + "y": 314, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 51.880001068115234, - "height": 25, + "width": 43.359375, + "height": 23, "seed": 1747471262, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "fetch", "textAlign": "center", "verticalAlign": "middle", "containerId": "rpCTi5Ye67KDSe26PwR0a", "originalText": "fetch", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 638, - "versionNonce": 1398680762, + "version": 650, + "versionNonce": 1330272370, "isDeleted": false, "id": "p6aB7QEw7RUZGP-S1w8uW", "fillStyle": "solid", @@ -943,14 +991,14 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 641, - "versionNonce": 980653030, + "version": 659, + "versionNonce": 1669013422, "isDeleted": false, "id": "VaMUIZ6R7q0fVQIF_1H-m", "fillStyle": "solid", @@ -959,39 +1007,39 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 676.7000007629395, - "y": 313, + "x": 678.4853515625, + "y": 314, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 53.599998474121094, - "height": 25, + "width": 50.029296875, + "height": 23, "seed": 1529117726, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "parse", "textAlign": "center", "verticalAlign": "middle", "containerId": "p6aB7QEw7RUZGP-S1w8uW", "originalText": "parse", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 1131, - "versionNonce": 120358266, + "version": 1145, + "versionNonce": 2097838642, "isDeleted": false, "id": "fipdoX_2jWMMttHq0biwj", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -1008,7 +1056,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -1037,8 +1085,8 @@ }, { "type": "rectangle", - "version": 497, - "versionNonce": 870590246, + "version": 509, + "versionNonce": 177666542, "isDeleted": false, "id": "nRkSDPyke6S415ANJpqSO", "fillStyle": "solid", @@ -1065,14 +1113,14 @@ "id": "RHdQtWzei63bDNP8lbDoR" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 434, - "versionNonce": 154256954, + "version": 452, + "versionNonce": 1239442418, "isDeleted": false, "id": "RHdQtWzei63bDNP8lbDoR", "fillStyle": "solid", @@ -1081,34 +1129,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 708.079999923706, - "y": 398.5, + "x": 709.669921875, + "y": 399.5, "strokeColor": "#1e1e1e", "backgroundColor": "#a5d8ff", - "width": 19.84000015258789, - "height": 25, + "width": 16.66015625, + "height": 23, "seed": 362939138, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "rx", "textAlign": "center", "verticalAlign": "middle", "containerId": "nRkSDPyke6S415ANJpqSO", "originalText": "rx", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 601, - "versionNonce": 811618918, + "version": 613, + "versionNonce": 230525998, "isDeleted": false, "id": "DYijQiOE-bzqq2gIyWP7y", "fillStyle": "solid", @@ -1135,14 +1183,14 @@ "id": "OZwQJ1czpEHUJf-5mS2sy" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 538, - "versionNonce": 1112600314, + "version": 556, + "versionNonce": 1607669170, "isDeleted": false, "id": "OZwQJ1czpEHUJf-5mS2sy", "fillStyle": "solid", @@ -1151,34 +1199,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 927.829999923706, - "y": 394.5, + "x": 929.419921875, + "y": 395.5, "strokeColor": "#1e1e1e", "backgroundColor": "#a5d8ff", - "width": 19.84000015258789, - "height": 25, + "width": 16.66015625, + "height": 23, "seed": 710259074, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "rx", "textAlign": "center", "verticalAlign": "middle", "containerId": "DYijQiOE-bzqq2gIyWP7y", "originalText": "rx", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 759, - "versionNonce": 2058687910, + "version": 771, + "versionNonce": 181917294, "isDeleted": false, "id": "dRe5zdw_i7ke_ERGqgHJ-", "fillStyle": "solid", @@ -1205,14 +1253,14 @@ "id": "F4Lr--RTHsm_N-Lrsm8Mu" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 769, - "versionNonce": 118292410, + "version": 787, + "versionNonce": 269062002, "isDeleted": false, "id": "F4Lr--RTHsm_N-Lrsm8Mu", "fillStyle": "solid", @@ -1221,34 +1269,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1200.5599994659424, - "y": 314.5, + "x": 1204.8203125, + "y": 315.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 51.880001068115234, - "height": 25, + "width": 43.359375, + "height": 23, "seed": 1857005470, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "fetch", "textAlign": "center", "verticalAlign": "middle", "containerId": "dRe5zdw_i7ke_ERGqgHJ-", "originalText": "fetch", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 766, - "versionNonce": 2081386726, + "version": 778, + "versionNonce": 2058279086, "isDeleted": false, "id": "vPZEUjjPYESqGvFv-Rp4W", "fillStyle": "solid", @@ -1275,14 +1323,14 @@ "id": "v4M2EX6oGwv9mypkE3nf4" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 771, - "versionNonce": 596179066, + "version": 789, + "versionNonce": 1858785586, "isDeleted": false, "id": "v4M2EX6oGwv9mypkE3nf4", "fillStyle": "solid", @@ -1291,34 +1339,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1282.2000007629395, - "y": 314.5, + "x": 1283.9853515625, + "y": 315.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 53.599998474121094, - "height": 25, + "width": 50.029296875, + "height": 23, "seed": 1954863134, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "parse", "textAlign": "center", "verticalAlign": "middle", "containerId": "vPZEUjjPYESqGvFv-Rp4W", "originalText": "parse", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "text", - "version": 174, - "versionNonce": 1878811686, + "version": 246, + "versionNonce": 1146002094, "isDeleted": false, "id": "FLqrds_LtrcgMMNkcCu2q", "fillStyle": "solid", @@ -1328,38 +1376,38 @@ "opacity": 100, "angle": 0, "x": 232, - "y": 489, + "y": 495, "strokeColor": "#1e1e1e", "backgroundColor": "#a5d8ff", - "width": 156.74000549316406, - "height": 25, + "width": 144.53125, + "height": 23, "seed": 310320450, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618530809, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "Executor Queue", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Executor Queue", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 976, - "versionNonce": 1736956218, + "version": 990, + "versionNonce": 1870519026, "isDeleted": false, "id": "DCT-vq3X8w4-9CK0i1WK1", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -1376,7 +1424,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -1405,8 +1453,8 @@ }, { "type": "rectangle", - "version": 528, - "versionNonce": 409530214, + "version": 540, + "versionNonce": 873923886, "isDeleted": false, "id": "Y3PoGw9NOC5IBQUKp3cR-", "fillStyle": "solid", @@ -1428,14 +1476,14 @@ "type": 3 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "rectangle", - "version": 727, - "versionNonce": 845980154, + "version": 739, + "versionNonce": 11119794, "isDeleted": false, "id": "vqgYUA0JXn0AfAfEy6BH4", "fillStyle": "hachure", @@ -1470,14 +1518,14 @@ "id": "xP6C3cArVpheLzV5AFg_E" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 163, - "versionNonce": 1906447014, + "version": 181, + "versionNonce": 2040147822, "isDeleted": false, "id": "xP6C3cArVpheLzV5AFg_E", "fillStyle": "cross-hatch", @@ -1486,34 +1534,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 529.289999961853, - "y": 494.14688449999994, + "x": 526.4384765625, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 5.420000076293945, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 226082462, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "1", "textAlign": "center", "verticalAlign": "middle", "containerId": "vqgYUA0JXn0AfAfEy6BH4", "originalText": "1", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 653, - "versionNonce": 2134528698, + "version": 665, + "versionNonce": 670385778, "isDeleted": false, "id": "zrqQOL7PgwaKzxPCDeS4N", "fillStyle": "solid", @@ -1540,14 +1588,14 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "rectangle", - "version": 849, - "versionNonce": 1716833766, + "version": 861, + "versionNonce": 1908281774, "isDeleted": false, "id": "uow6_ERpKpHt29RiN9MNZ", "fillStyle": "cross-hatch", @@ -1578,14 +1626,14 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 163, - "versionNonce": 1888742266, + "version": 181, + "versionNonce": 505915442, "isDeleted": false, "id": "sjFWKA8ES33JvxT0dVcvh", "fillStyle": "cross-hatch", @@ -1594,34 +1642,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 748.8800001144409, - "y": 494.14688449999994, + "x": 750.4384765625, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 14.239999771118164, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 833466398, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "2", "textAlign": "center", "verticalAlign": "middle", "containerId": "uow6_ERpKpHt29RiN9MNZ", "originalText": "2", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 394, - "versionNonce": 59646246, + "version": 407, + "versionNonce": 2007739374, "isDeleted": false, "id": "OdVAxEmxdP0Y8q-094nMN", "fillStyle": "solid", @@ -1658,16 +1706,20 @@ { "id": "5CrHigwwqK1VKc6Ca3gxy", "type": "arrow" + }, + { + "id": "f2GbV3PcX4-EuddFNyF8B", + "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 283, - "versionNonce": 1555852346, + "version": 301, + "versionNonce": 1797771762, "isDeleted": false, "id": "ZR6W2CO-B65WopEP2jrS1", "fillStyle": "solid", @@ -1676,39 +1728,39 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 642.6499996185303, - "y": 592.5, + "x": 642.59375, + "y": 593.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 47.70000076293945, - "height": 25, + "width": 47.8125, + "height": 23, "seed": 1923846622, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "apply", "textAlign": "center", "verticalAlign": "middle", "containerId": "OdVAxEmxdP0Y8q-094nMN", "originalText": "apply", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 549, - "versionNonce": 750455910, + "version": 563, + "versionNonce": 426507822, "isDeleted": false, "id": "CH5dSO6dJ53vGEmqY2aWs", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -1725,7 +1777,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": { @@ -1754,8 +1806,8 @@ }, { "type": "rectangle", - "version": 561, - "versionNonce": 1503057146, + "version": 574, + "versionNonce": 33342386, "isDeleted": false, "id": "hw9PKBQkD_MFDyEU0uuka", "fillStyle": "solid", @@ -1792,16 +1844,20 @@ { "id": "twNjmIr9f-l-aubZs4GnI", "type": "arrow" + }, + { + "id": "Ehl2ZfbTr49ll8jA6pvS7", + "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 446, - "versionNonce": 1336446886, + "version": 464, + "versionNonce": 1005062254, "isDeleted": false, "id": "OqBJjQ-07RyubDNHABeyS", "fillStyle": "solid", @@ -1810,34 +1866,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 871.6499996185303, - "y": 592.5, + "x": 871.59375, + "y": 593.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 47.70000076293945, - "height": 25, + "width": 47.8125, + "height": 23, "seed": 934949086, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "apply", "textAlign": "center", "verticalAlign": "middle", "containerId": "hw9PKBQkD_MFDyEU0uuka", "originalText": "apply", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 835, - "versionNonce": 1218848186, + "version": 847, + "versionNonce": 1556970866, "isDeleted": false, "id": "hZnDTRiQOaPQLk9O8COl6", "fillStyle": "hachure", @@ -1872,14 +1928,14 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 296, - "versionNonce": 411282150, + "version": 314, + "versionNonce": 1055443630, "isDeleted": false, "id": "RG8D9DfwueruyUSdOLsr5", "fillStyle": "cross-hatch", @@ -1888,39 +1944,39 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 809.789999961853, - "y": 494.14688449999994, + "x": 806.9384765625, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 5.420000076293945, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 1643067138, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "1", "textAlign": "center", "verticalAlign": "middle", "containerId": "hZnDTRiQOaPQLk9O8COl6", "originalText": "1", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 768, - "versionNonce": 1661820538, + "version": 782, + "versionNonce": 417398578, "isDeleted": false, "id": "N9_cITJx4vKH4lSu_tt_A", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -1937,7 +1993,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": null, @@ -1962,8 +2018,8 @@ }, { "type": "rectangle", - "version": 794, - "versionNonce": 635002406, + "version": 806, + "versionNonce": 555173102, "isDeleted": false, "id": "-A08osWH4z9kW6phuwwOP", "fillStyle": "cross-hatch", @@ -1994,14 +2050,14 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 260, - "versionNonce": 1167032122, + "version": 278, + "versionNonce": 312363250, "isDeleted": false, "id": "vZnROuYPsK34LqIU31yf7", "fillStyle": "cross-hatch", @@ -2010,39 +2066,39 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 979.1900000572205, - "y": 494.14688449999994, + "x": 980.4384765625, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 13.619999885559082, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 264604994, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "3", "textAlign": "center", "verticalAlign": "middle", "containerId": "-A08osWH4z9kW6phuwwOP", "originalText": "3", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 1147, - "versionNonce": 1016506726, + "version": 1169, + "versionNonce": 2071148974, "isDeleted": false, "id": "twNjmIr9f-l-aubZs4GnI", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -2051,7 +2107,7 @@ "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", "width": 0, - "height": 63, + "height": 58, "seed": 787633410, "groupIds": [], "frameId": null, @@ -2059,18 +2115,18 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618578828, "link": null, "locked": false, "startBinding": { "elementId": "hZnDTRiQOaPQLk9O8COl6", - "focus": 1.0927580941770225, + "focus": 1.0927580941770227, "gap": 3.061017107841735 }, "endBinding": { "elementId": "hw9PKBQkD_MFDyEU0uuka", "focus": -1.0176155308362542, - "gap": 2.061017107841735 + "gap": 2.25 }, "lastCommittedPoint": null, "startArrowhead": null, @@ -2082,19 +2138,19 @@ ], [ 0, - 63 + 58 ] ] }, { "type": "arrow", - "version": 931, - "versionNonce": 2089781242, + "version": 945, + "versionNonce": 25975474, "isDeleted": false, "id": "uxbykYOvdtL0HYuSmUU6U", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -2111,7 +2167,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "startBinding": null, @@ -2136,8 +2192,8 @@ }, { "type": "text", - "version": 217, - "versionNonce": 2080935078, + "version": 345, + "versionNonce": 1879138670, "isDeleted": false, "id": "xMxb5iz16pT1UiTIBqPDG", "fillStyle": "cross-hatch", @@ -2146,34 +2202,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 168, + "x": 199, "y": 682, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 212.36000061035156, - "height": 25, + "width": 166.7578125, + "height": 23, "seed": 1947891714, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "Buffer Transit Data", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Buffer Transit Data", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "text", - "version": 254, - "versionNonce": 269514938, + "version": 382, + "versionNonce": 340931698, "isDeleted": false, "id": "rUiVeXZmQgBmVGY4bUGiT", "fillStyle": "cross-hatch", @@ -2182,34 +2238,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 190, + "x": 221, "y": 769, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 185.24000549316406, - "height": 25, + "width": 150.439453125, + "height": 23, "seed": 2073208962, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "Live Transit Data", "textAlign": "left", "verticalAlign": "top", "containerId": null, "originalText": "Live Transit Data", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 938, - "versionNonce": 299632614, + "version": 950, + "versionNonce": 946799534, "isDeleted": false, "id": "vpqws0a9Jh-wWPUB3jB4Z", "fillStyle": "cross-hatch", @@ -2244,14 +2300,14 @@ "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 248, - "versionNonce": 263541114, + "version": 266, + "versionNonce": 213308978, "isDeleted": false, "id": "m7L49SlkIqM3UX3pIO0v1", "fillStyle": "cross-hatch", @@ -2260,34 +2316,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 895.3371486144409, - "y": 494.14688449999994, + "x": 896.8956250625, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 14.239999771118164, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 1912711298, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "2", "textAlign": "center", "verticalAlign": "middle", "containerId": "vpqws0a9Jh-wWPUB3jB4Z", "originalText": "2", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 661, - "versionNonce": 1847466790, + "version": 676, + "versionNonce": 1601068526, "isDeleted": false, "id": "YQXusl7FZ5mjVmkwS7nTt", "fillStyle": "solid", @@ -2324,16 +2380,20 @@ { "id": "j_qtXumsQfWi0I_VI5PkL", "type": "arrow" + }, + { + "id": "PRTeWBK6vtriqNmaS6MK6", + "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 547, - "versionNonce": 515969594, + "version": 565, + "versionNonce": 1537294322, "isDeleted": false, "id": "SbUQ0qpP3hURdF-JpkzcT", "fillStyle": "solid", @@ -2342,34 +2402,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1028.6499996185303, - "y": 592.5, + "x": 1028.59375, + "y": 593.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 47.70000076293945, - "height": 25, + "width": 47.8125, + "height": 23, "seed": 1222049730, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "apply", "textAlign": "center", "verticalAlign": "middle", "containerId": "YQXusl7FZ5mjVmkwS7nTt", "originalText": "apply", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 697, - "versionNonce": 2000406118, + "version": 712, + "versionNonce": 436760622, "isDeleted": false, "id": "r6US9SjrUjcRP26-bNJLb", "fillStyle": "solid", @@ -2406,16 +2466,20 @@ { "id": "vSrc221actOuf9WusrgZt", "type": "arrow" + }, + { + "id": "j_qtXumsQfWi0I_VI5PkL", + "type": "arrow" } ], - "updated": 1708594325688, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 583, - "versionNonce": 1489658, + "version": 601, + "versionNonce": 1025012146, "isDeleted": false, "id": "5HrAXQLJ-WCJb8_C8a4uo", "fillStyle": "solid", @@ -2424,34 +2488,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1108.1499996185303, - "y": 592.5, + "x": 1108.09375, + "y": 593.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 47.70000076293945, - "height": 25, + "width": 47.8125, + "height": 23, "seed": 586771614, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "apply", "textAlign": "center", "verticalAlign": "middle", "containerId": "r6US9SjrUjcRP26-bNJLb", "originalText": "apply", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 708, - "versionNonce": 1040320934, + "version": 723, + "versionNonce": 338049646, "isDeleted": false, "id": "ye55wrbQ2ruSrJJx9tXx3", "fillStyle": "solid", @@ -2484,16 +2548,20 @@ { "id": "s1NGF8K9oUvWEXmBzmufP", "type": "arrow" + }, + { + "id": "vSrc221actOuf9WusrgZt", + "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 595, - "versionNonce": 574180282, + "version": 613, + "versionNonce": 1413704562, "isDeleted": false, "id": "fbE1QhbN4s8LgICVlAepH", "fillStyle": "solid", @@ -2502,34 +2570,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1188.1499996185303, - "y": 592.5, + "x": 1188.09375, + "y": 593.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 47.70000076293945, - "height": 25, + "width": 47.8125, + "height": 23, "seed": 723323586, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "apply", "textAlign": "center", "verticalAlign": "middle", "containerId": "ye55wrbQ2ruSrJJx9tXx3", "originalText": "apply", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 1014, - "versionNonce": 832431334, + "version": 1026, + "versionNonce": 345029806, "isDeleted": false, "id": "oLUKp1kMgqNdxEPEkb372", "fillStyle": "cross-hatch", @@ -2564,14 +2632,14 @@ "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 323, - "versionNonce": 726385786, + "version": 341, + "versionNonce": 1198075186, "isDeleted": false, "id": "TCgAzrDxcbwYL9YI6wNBf", "fillStyle": "cross-hatch", @@ -2580,34 +2648,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1044.880000114441, - "y": 494.14688449999994, + "x": 1046.4384765625, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 14.239999771118164, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 1493949378, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435140, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "2", "textAlign": "center", "verticalAlign": "middle", "containerId": "oLUKp1kMgqNdxEPEkb372", "originalText": "2", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 898, - "versionNonce": 1402755110, + "version": 910, + "versionNonce": 552662766, "isDeleted": false, "id": "y5kRBL1VIbCsvey9iszvB", "fillStyle": "hachure", @@ -2642,14 +2710,14 @@ "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435140, "link": null, "locked": false }, { "type": "text", - "version": 360, - "versionNonce": 85009722, + "version": 378, + "versionNonce": 1542502130, "isDeleted": false, "id": "qGVL3pVMGuja1QEF58BVa", "fillStyle": "cross-hatch", @@ -2658,34 +2726,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1130.2964794618529, - "y": 494.14688449999994, + "x": 1127.4449560624998, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 5.420000076293945, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 1347397122, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "1", "textAlign": "center", "verticalAlign": "middle", "containerId": "y5kRBL1VIbCsvey9iszvB", "originalText": "1", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 719, - "versionNonce": 1810522982, + "version": 731, + "versionNonce": 567273774, "isDeleted": false, "id": "DwJbh4L0U48rxYKAqNfpB", "fillStyle": "solid", @@ -2712,14 +2780,14 @@ "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "rectangle", - "version": 877, - "versionNonce": 1760325114, + "version": 889, + "versionNonce": 308349106, "isDeleted": false, "id": "OIqNLYrG2vKqjdPIBjJEQ", "fillStyle": "hachure", @@ -2750,14 +2818,14 @@ "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 322, - "versionNonce": 1020593830, + "version": 340, + "versionNonce": 110531438, "isDeleted": false, "id": "2NpZ0UtU8si40TXPeKtsD", "fillStyle": "cross-hatch", @@ -2766,34 +2834,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1356.289999961853, - "y": 494.14688449999994, + "x": 1353.4384765625, + "y": 495.14688449999994, "strokeColor": "#1e1e1e", "backgroundColor": "#4dabf7", - "width": 5.420000076293945, - "height": 25, + "width": 11.123046875, + "height": 23, "seed": 454284126, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "1", "textAlign": "center", "verticalAlign": "middle", "containerId": "OIqNLYrG2vKqjdPIBjJEQ", "originalText": "1", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 893, - "versionNonce": 1809882810, + "version": 905, + "versionNonce": 1113662066, "isDeleted": false, "id": "pAR3k0emFpck8rYDIDQXw", "fillStyle": "solid", @@ -2820,19 +2888,19 @@ "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "arrow", - "version": 1002, - "versionNonce": 923353574, + "version": 1016, + "versionNonce": 1770911150, "isDeleted": false, "id": "vEyXTRJW7n_hrgPRIt7d3", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -2849,7 +2917,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { @@ -2878,13 +2946,13 @@ }, { "type": "arrow", - "version": 1003, - "versionNonce": 177256314, + "version": 1017, + "versionNonce": 918029362, "isDeleted": false, "id": "8VmQ5RzV8MqKRX9MrvJ3c", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -2901,7 +2969,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { @@ -2930,13 +2998,13 @@ }, { "type": "arrow", - "version": 1030, - "versionNonce": 764679462, + "version": 1044, + "versionNonce": 870256622, "isDeleted": false, "id": "s1NGF8K9oUvWEXmBzmufP", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -2953,7 +3021,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { @@ -2982,13 +3050,13 @@ }, { "type": "arrow", - "version": 686, - "versionNonce": 893368378, + "version": 700, + "versionNonce": 1229762034, "isDeleted": false, "id": "VJAv_AA4wh9HPi5ElZQsZ", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -3005,7 +3073,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": null, @@ -3030,13 +3098,13 @@ }, { "type": "arrow", - "version": 1095, - "versionNonce": 165838950, + "version": 1109, + "versionNonce": 1100145198, "isDeleted": false, "id": "iXoy2RGlWeoP2O-W4w0Ep", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -3053,7 +3121,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { @@ -3082,8 +3150,8 @@ }, { "type": "rectangle", - "version": 829, - "versionNonce": 1540399354, + "version": 843, + "versionNonce": 2133204914, "isDeleted": false, "id": "FG0xyEC6bjrVvfXXFkhGr", "fillStyle": "solid", @@ -3116,16 +3184,24 @@ { "id": "-QpmtHvCIPviWT2XJZRJV", "type": "arrow" + }, + { + "id": "EOpnxfLaitr0veS9fx-7X", + "type": "arrow" + }, + { + "id": "PRTeWBK6vtriqNmaS6MK6", + "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 719, - "versionNonce": 2143388582, + "version": 737, + "versionNonce": 93482094, "isDeleted": false, "id": "7UOhjpWFIqXzoeKvZrdUr", "fillStyle": "solid", @@ -3134,34 +3210,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1390.1499996185303, - "y": 588.5, + "x": 1390.09375, + "y": 589.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 47.70000076293945, - "height": 25, + "width": 47.8125, + "height": 23, "seed": 2065560514, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "apply", "textAlign": "center", "verticalAlign": "middle", "containerId": "FG0xyEC6bjrVvfXXFkhGr", "originalText": "apply", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 329, - "versionNonce": 2043048378, + "version": 341, + "versionNonce": 611015026, "isDeleted": false, "id": "20h5C81H-CYI27Tpd74ou", "fillStyle": "solid", @@ -3192,14 +3268,14 @@ "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 255, - "versionNonce": 1096687334, + "version": 273, + "versionNonce": 765898414, "isDeleted": false, "id": "yz-IQ63iT5cK2GSyekOdh", "fillStyle": "solid", @@ -3208,34 +3284,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 579.4400000572205, - "y": 769.5, + "x": 579.330078125, + "y": 770.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 13.119999885559082, - "height": 25, + "width": 13.33984375, + "height": 23, "seed": 2077060638, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "A", "textAlign": "center", "verticalAlign": "middle", "containerId": "20h5C81H-CYI27Tpd74ou", "originalText": "A", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 370, - "versionNonce": 574892666, + "version": 383, + "versionNonce": 1751341874, "isDeleted": false, "id": "IqMFPR6D4iUuFlmFg2h3z", "fillStyle": "solid", @@ -3266,22 +3342,22 @@ "type": "arrow" }, { - "id": "BYY2sqc6N-uTx5iTOoG2R", + "id": "dtokkLQC1XKcHX81-QdOg", "type": "arrow" }, { - "id": "dtokkLQC1XKcHX81-QdOg", + "id": "f2GbV3PcX4-EuddFNyF8B", "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 298, - "versionNonce": 860181030, + "version": 316, + "versionNonce": 1182312686, "isDeleted": false, "id": "G4Er45oJTuBlpebe08edC", "fillStyle": "solid", @@ -3290,34 +3366,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 578.7300000190735, - "y": 684.5, + "x": 579.330078125, + "y": 685.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 14.539999961853027, - "height": 25, + "width": 13.33984375, + "height": 23, "seed": 157336514, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "B", "textAlign": "center", "verticalAlign": "middle", "containerId": "IqMFPR6D4iUuFlmFg2h3z", "originalText": "B", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 454, - "versionNonce": 202165050, + "version": 574, + "versionNonce": 2037720306, "isDeleted": false, "id": "5CrHigwwqK1VKc6Ca3gxy", "fillStyle": "solid", @@ -3326,8 +3402,8 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 668, - "y": 630, + "x": 746, + "y": 628, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", "width": 0, @@ -3339,18 +3415,18 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { "elementId": "OdVAxEmxdP0Y8q-094nMN", - "focus": -0.013574660633484162, - "gap": 4.5 + "focus": -0.7194570135746605, + "gap": 2.5 }, "endBinding": { "elementId": "IqMFPR6D4iUuFlmFg2h3z", - "focus": 0.44565217391304357, - "gap": 3 + "focus": 0.8695652173913044, + "gap": 5 }, "lastCommittedPoint": null, "startArrowhead": null, @@ -3368,8 +3444,8 @@ }, { "type": "rectangle", - "version": 458, - "versionNonce": 543432038, + "version": 470, + "versionNonce": 1603361582, "isDeleted": false, "id": "VNoc_jPVCooBwfSqYSdhh", "fillStyle": "solid", @@ -3395,10 +3471,6 @@ "type": "text", "id": "49TJbaW8lSUjt9MraulEE" }, - { - "id": "RP9Ow_xaBH5G-VFYLVlAX", - "type": "arrow" - }, { "id": "dtokkLQC1XKcHX81-QdOg", "type": "arrow" @@ -3408,14 +3480,14 @@ "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 384, - "versionNonce": 495145978, + "version": 402, + "versionNonce": 556250802, "isDeleted": false, "id": "49TJbaW8lSUjt9MraulEE", "fillStyle": "solid", @@ -3424,34 +3496,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 883.7300000190735, - "y": 767.5, + "x": 884.330078125, + "y": 768.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 14.539999961853027, - "height": 25, + "width": 13.33984375, + "height": 23, "seed": 638275294, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "B", "textAlign": "center", "verticalAlign": "middle", "containerId": "VNoc_jPVCooBwfSqYSdhh", "originalText": "B", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 564, - "versionNonce": 1845985446, + "version": 577, + "versionNonce": 794412398, "isDeleted": false, "id": "AGWy-WRNKq1GRwlq27Uat", "fillStyle": "solid", @@ -3484,20 +3556,16 @@ { "id": "nXrTlzpTYojAwNzux2iX6", "type": "arrow" - }, - { - "id": "5rqqd0bhXqDAnyrpwoGre", - "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 489, - "versionNonce": 2024457402, + "version": 507, + "versionNonce": 1612845170, "isDeleted": false, "id": "ENTILzjLGHiVQxm21FA85", "fillStyle": "solid", @@ -3506,34 +3574,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1125.5599999427795, - "y": 766, + "x": 1124.7783203125, + "y": 767, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 12.880000114440918, - "height": 25, + "width": 14.443359375, + "height": 23, "seed": 977668802, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "C", "textAlign": "center", "verticalAlign": "middle", "containerId": "AGWy-WRNKq1GRwlq27Uat", "originalText": "C", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 508, - "versionNonce": 1339849702, + "version": 526, + "versionNonce": 924510126, "isDeleted": false, "id": "DRdIzIA5aSRPeNpP2pex-", "fillStyle": "solid", @@ -3567,23 +3635,31 @@ "id": "dtokkLQC1XKcHX81-QdOg", "type": "arrow" }, + { + "id": "nXrTlzpTYojAwNzux2iX6", + "type": "arrow" + }, { "id": "FhwMVCyPxe3HDRW1nTF5C", "type": "arrow" }, { - "id": "nXrTlzpTYojAwNzux2iX6", + "id": "5CrHigwwqK1VKc6Ca3gxy", + "type": "arrow" + }, + { + "id": "Ehl2ZfbTr49ll8jA6pvS7", "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 428, - "versionNonce": 119938426, + "version": 446, + "versionNonce": 170603058, "isDeleted": false, "id": "ETsUVzbEoDEH6Wh5dDIE_", "fillStyle": "solid", @@ -3592,34 +3668,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 884.5599999427795, - "y": 684.5, + "x": 883.7783203125, + "y": 685.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 12.880000114440918, - "height": 25, + "width": 14.443359375, + "height": 23, "seed": 1520179998, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "C", "textAlign": "center", "verticalAlign": "middle", "containerId": "DRdIzIA5aSRPeNpP2pex-", "originalText": "C", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 643, - "versionNonce": 104357434, + "version": 665, + "versionNonce": 1727906286, "isDeleted": false, "id": "hWRH46gwh1PqF21q9C4zp", "fillStyle": "solid", @@ -3658,22 +3734,22 @@ "type": "arrow" }, { - "id": "5rqqd0bhXqDAnyrpwoGre", + "id": "qxLbNSc9nH3MjXNRGDNpH", "type": "arrow" }, { - "id": "qxLbNSc9nH3MjXNRGDNpH", + "id": "PRTeWBK6vtriqNmaS6MK6", "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 568, - "versionNonce": 1588542054, + "version": 586, + "versionNonce": 1646926834, "isDeleted": false, "id": "0N99yapinSp1_mDnKRh6N", "fillStyle": "solid", @@ -3682,34 +3758,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1123.273453809265, - "y": 684.5, + "x": 1123.8517743124999, + "y": 685.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 15.600000381469727, - "height": 25, + "width": 14.443359375, + "height": 23, "seed": 130817118, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "D", "textAlign": "center", "verticalAlign": "middle", "containerId": "hWRH46gwh1PqF21q9C4zp", "originalText": "D", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 506, - "versionNonce": 1323761062, + "version": 609, + "versionNonce": 1108038702, "isDeleted": false, "id": "rYbr17RAyFgxzOKrfTzeq", "fillStyle": "solid", @@ -3718,7 +3794,7 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 893.9011232891656, + "x": 982.9011232891656, "y": 628.5371760879644, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", @@ -3731,17 +3807,17 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { "elementId": "hw9PKBQkD_MFDyEU0uuka", - "focus": 0.013665612913114198, + "focus": -0.7470181477706465, "gap": 3.03717608796444 }, "endBinding": { "elementId": "DRdIzIA5aSRPeNpP2pex-", - "focus": 0.023976225530294545, + "focus": 0.7595134156129394, "gap": 4.46282391203556 }, "lastCommittedPoint": null, @@ -3760,8 +3836,8 @@ }, { "type": "arrow", - "version": 630, - "versionNonce": 894277562, + "version": 681, + "versionNonce": 908447154, "isDeleted": false, "id": "j_qtXumsQfWi0I_VI5PkL", "fillStyle": "solid", @@ -3770,8 +3846,8 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1059.202579342441, - "y": 629.3859425029369, + "x": 1079.202579342441, + "y": 626.3859425029369, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", "width": 0, @@ -3783,18 +3859,18 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { - "elementId": "YQXusl7FZ5mjVmkwS7nTt", - "focus": -0.17409296993353024, - "gap": 3.8859425029369277 + "elementId": "r6US9SjrUjcRP26-bNJLb", + "focus": 1.3713615755210156, + "gap": 14.297420657559087 }, "endBinding": { "elementId": "hWRH46gwh1PqF21q9C4zp", - "focus": -0.6090752089623642, - "gap": 2.1140574970630723 + "focus": -0.4395836835386352, + "gap": 5.114057497063072 }, "lastCommittedPoint": null, "startArrowhead": null, @@ -3812,8 +3888,8 @@ }, { "type": "arrow", - "version": 612, - "versionNonce": 1103386854, + "version": 654, + "versionNonce": 36478574, "isDeleted": false, "id": "vSrc221actOuf9WusrgZt", "fillStyle": "solid", @@ -3822,7 +3898,7 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1135.073454342441, + "x": 1155.073454342441, "y": 626.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", @@ -3835,17 +3911,17 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { "elementId": "r6US9SjrUjcRP26-bNJLb", - "focus": -0.07982998292054501, + "focus": -0.5993105024010645, "gap": 1 }, "endBinding": { "elementId": "hWRH46gwh1PqF21q9C4zp", - "focus": 0.033898307986789215, + "focus": 0.20338983341051808, "gap": 5.00000049706307 }, "lastCommittedPoint": null, @@ -3864,8 +3940,8 @@ }, { "type": "arrow", - "version": 639, - "versionNonce": 1844875386, + "version": 705, + "versionNonce": 2068137842, "isDeleted": false, "id": "S736oegZ-NP_Jn8T2r-5l", "fillStyle": "solid", @@ -3874,8 +3950,8 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1210.664620342441, - "y": 630.580001502937, + "x": 1233.664620342441, + "y": 627.580001502937, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", "width": 0, @@ -3887,18 +3963,18 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { "elementId": "ye55wrbQ2ruSrJJx9tXx3", - "focus": 0.03468518591062566, - "gap": 5.080001502936966 + "focus": -0.562717411491972, + "gap": 2.080001502936966 }, "endBinding": { "elementId": "hWRH46gwh1PqF21q9C4zp", - "focus": 0.6745014096817041, - "gap": 1 + "focus": 0.8694166639189923, + "gap": 4 }, "lastCommittedPoint": null, "startArrowhead": null, @@ -3916,8 +3992,8 @@ }, { "type": "rectangle", - "version": 246, - "versionNonce": 2127842342, + "version": 259, + "versionNonce": 314292146, "isDeleted": false, "id": "tCFT7TaS4GWxUTPH3e9dM", "fillStyle": "solid", @@ -3946,16 +4022,20 @@ { "id": "F4a-HNfDUp8O41pcv3trV", "type": "arrow" + }, + { + "id": "UiGgSvKQYLhHvq9f8X1v6", + "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618460030, "link": null, "locked": false }, { "type": "text", - "version": 146, - "versionNonce": 1082290490, + "version": 164, + "versionNonce": 1775208754, "isDeleted": false, "id": "pM0euEcA3O04vH8cF6euv", "fillStyle": "solid", @@ -3964,34 +4044,34 @@ "roughness": 0, "opacity": 100, "angle": 0, - "x": 834.689998626709, - "y": 863, + "x": 840.57421875, + "y": 864, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 119.62000274658203, - "height": 25, + "width": 107.8515625, + "height": 23, "seed": 1366808386, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "routing on A", "textAlign": "center", "verticalAlign": "middle", "containerId": "tCFT7TaS4GWxUTPH3e9dM", "originalText": "routing on A", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 494, - "versionNonce": 1409537894, + "version": 507, + "versionNonce": 718043758, "isDeleted": false, "id": "ia9PMtL1s9vwB3H7pqe7w", "fillStyle": "solid", @@ -4020,16 +4100,20 @@ { "id": "VM8X0qyPeoxkTBRdLIM5J", "type": "arrow" + }, + { + "id": "OerFprXRPVst8_BgNyFgG", + "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618485986, "link": null, "locked": false }, { "type": "text", - "version": 393, - "versionNonce": 1079261690, + "version": 411, + "versionNonce": 422286066, "isDeleted": false, "id": "vniZK_pa9hyb8VzJ0L1hw", "fillStyle": "solid", @@ -4038,39 +4122,39 @@ "roughness": 0, "opacity": 100, "angle": 0, - "x": 1161.310001373291, - "y": 950.5, + "x": 1166.5224609375, + "y": 951.5, "strokeColor": "#1e1e1e", "backgroundColor": "#b2f2bb", - "width": 119.37999725341797, - "height": 25, + "width": 108.955078125, + "height": 23, "seed": 1850603742, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "routing on C", "textAlign": "center", "verticalAlign": "middle", "containerId": "ia9PMtL1s9vwB3H7pqe7w", "originalText": "routing on C", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 478, - "versionNonce": 1235221158, + "version": 492, + "versionNonce": 255905070, "isDeleted": false, "id": "F4a-HNfDUp8O41pcv3trV", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -4087,7 +4171,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { @@ -4116,8 +4200,8 @@ }, { "type": "rectangle", - "version": 555, - "versionNonce": 477031098, + "version": 568, + "versionNonce": 467690674, "isDeleted": false, "id": "9R0Z6nTrFuTnbu8bnCl12", "fillStyle": "solid", @@ -4146,20 +4230,16 @@ { "id": "qxLbNSc9nH3MjXNRGDNpH", "type": "arrow" - }, - { - "id": "TKQL22FgfD_EaFnrCOSUr", - "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 481, - "versionNonce": 1448457702, + "version": 499, + "versionNonce": 1548416878, "isDeleted": false, "id": "4sB5qUMBsDqFPfGtsMHz0", "fillStyle": "solid", @@ -4168,34 +4248,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1364.1169379747294, - "y": 766.5, + "x": 1364.6952584779642, + "y": 767.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 15.600000381469727, - "height": 25, + "width": 14.443359375, + "height": 23, "seed": 939027038, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "D", "textAlign": "center", "verticalAlign": "middle", "containerId": "9R0Z6nTrFuTnbu8bnCl12", "originalText": "D", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "rectangle", - "version": 599, - "versionNonce": 729121658, + "version": 618, + "versionNonce": 462749298, "isDeleted": false, "id": "kX2Vp26fOxXlTY3cVukwK", "fillStyle": "solid", @@ -4226,18 +4306,38 @@ "type": "arrow" }, { - "id": "TKQL22FgfD_EaFnrCOSUr", + "id": "LK3pGdePKHmYAtL6fLqtH", + "type": "arrow" + }, + { + "id": "S736oegZ-NP_Jn8T2r-5l", + "type": "arrow" + }, + { + "id": "EOpnxfLaitr0veS9fx-7X", + "type": "arrow" + }, + { + "id": "huWlX3Fayf86PF4taHvva", + "type": "arrow" + }, + { + "id": "GAjbUIvQFGDOdQ6xF1wwe", + "type": "arrow" + }, + { + "id": "PRTeWBK6vtriqNmaS6MK6", "type": "arrow" } ], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false }, { "type": "text", - "version": 523, - "versionNonce": 322046246, + "version": 541, + "versionNonce": 1393940910, "isDeleted": false, "id": "-iIGa2IVrKzgz65Cw-4Tx", "fillStyle": "solid", @@ -4246,34 +4346,34 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1365.176938394346, - "y": 684.5, + "x": 1365.2470162904642, + "y": 685.5, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 13.479999542236328, - "height": 25, + "width": 13.33984375, + "height": 23, "seed": 51112670, "groupIds": [], "frameId": null, "roundness": null, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "fontSize": 20, - "fontFamily": 1, + "fontFamily": 2, "text": "E", "textAlign": "center", "verticalAlign": "middle", "containerId": "kX2Vp26fOxXlTY3cVukwK", "originalText": "E", - "lineHeight": 1.25, + "lineHeight": 1.15, "baseline": 18 }, { "type": "arrow", - "version": 672, - "versionNonce": 1872884838, + "version": 705, + "versionNonce": 1964007474, "isDeleted": false, "id": "-QpmtHvCIPviWT2XJZRJV", "fillStyle": "solid", @@ -4282,8 +4382,8 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 1413.9999998420708, - "y": 627.7803268401005, + "x": 1438.9999998420708, + "y": 625.7803268401005, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", "width": 0, @@ -4295,18 +4395,18 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { "elementId": "FG0xyEC6bjrVvfXXFkhGr", - "focus": 3.899486604675561e-9, - "gap": 5.2803268401005425 + "focus": -0.6172839467177975, + "gap": 3.2803268401005425 }, "endBinding": { "elementId": "kX2Vp26fOxXlTY3cVukwK", - "focus": 0.3477938981537734, - "gap": 5.2996746628364235 + "focus": 0.5544054684017073, + "gap": 7.2996746628364235 }, "lastCommittedPoint": null, "startArrowhead": null, @@ -4324,13 +4424,13 @@ }, { "type": "arrow", - "version": 895, - "versionNonce": 1702000550, + "version": 909, + "versionNonce": 1791652846, "isDeleted": false, "id": "dtokkLQC1XKcHX81-QdOg", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -4347,7 +4447,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { @@ -4376,8 +4476,8 @@ }, { "type": "arrow", - "version": 872, - "versionNonce": 986627514, + "version": 976, + "versionNonce": 1413057010, "isDeleted": false, "id": "FhwMVCyPxe3HDRW1nTF5C", "fillStyle": "solid", @@ -4386,12 +4486,12 @@ "roughness": 1, "opacity": 100, "angle": 0, - "x": 789.6236215285376, - "y": 753.6359425029369, + "x": 755.4210421860963, + "y": 698.0442609226892, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 28.59168158024795, - "height": 28.591681580247723, + "width": 44.794260922689205, + "height": 0, "seed": 148629990, "groupIds": [], "frameId": null, @@ -4399,19 +4499,15 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { - "elementId": "VNoc_jPVCooBwfSqYSdhh", - "focus": -0.8995805349896169, - "gap": 5.364057497063072 - }, - "endBinding": { "elementId": "DRdIzIA5aSRPeNpP2pex-", - "focus": 0.31507349273609164, - "gap": 7.044260922689205 + "focus": 0.04972671060424786, + "gap": 14.578957813903685 }, + "endBinding": null, "lastCommittedPoint": null, "startArrowhead": null, "endArrowhead": "arrow", @@ -4421,20 +4517,20 @@ 0 ], [ - 28.59168158024795, - -28.591681580247723 + 44.794260922689205, + 0 ] ] }, { "type": "arrow", - "version": 995, - "versionNonce": 751866598, + "version": 1009, + "versionNonce": 1299301934, "isDeleted": false, "id": "nXrTlzpTYojAwNzux2iX6", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, @@ -4451,7 +4547,7 @@ "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { @@ -4480,41 +4576,185 @@ }, { "type": "arrow", - "version": 944, - "versionNonce": 878900858, + "version": 1014, + "versionNonce": 2079641710, + "isDeleted": false, + "id": "qxLbNSc9nH3MjXNRGDNpH", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "dashed", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1230.1984920751363, + "y": 723.795967694437, + "strokeColor": "#1e1e1e", + "backgroundColor": "#b2f2bb", + "width": 26.829463375617934, + "height": 26.727165592834353, + "seed": 149713658, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708618435141, + "link": null, + "locked": false, + "startBinding": { + "elementId": "hWRH46gwh1PqF21q9C4zp", + "focus": -0.5137527808081439, + "gap": 4.295967694436968 + }, + "endBinding": { + "elementId": "9R0Z6nTrFuTnbu8bnCl12", + "focus": -0.6031631617717584, + "gap": 6.476866712728679 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 26.829463375617934, + 26.727165592834353 + ] + ] + }, + { + "type": "arrow", + "version": 1024, + "versionNonce": 1914475182, + "isDeleted": false, + "id": "ewxb68pxxmvpvTX8GJKkx", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 996.0022491938748, + "y": 699.5486691975981, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 44.794260922689205, + "height": 0, + "seed": 541981294, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708618435141, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 44.794260922689205, + 0 + ] + ] + }, + { + "type": "arrow", + "version": 1009, + "versionNonce": 967685938, "isDeleted": false, - "id": "5rqqd0bhXqDAnyrpwoGre", + "id": "LK3pGdePKHmYAtL6fLqtH", "fillStyle": "solid", "strokeWidth": 1, "strokeStyle": "solid", "roughness": 1, "opacity": 100, "angle": 0, - "x": 1030.5353717302974, - "y": 751.9090757902081, + "x": 1235.0022491938746, + "y": 697.5486691975981, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 44.794260922689205, + "height": 0, + "seed": 534458606, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708618435141, + "link": null, + "locked": false, + "startBinding": { + "elementId": "kX2Vp26fOxXlTY3cVukwK", + "focus": 0.026127104647527977, + "gap": 15.914688971589612 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 44.794260922689205, + 0 + ] + ] + }, + { + "type": "arrow", + "version": 896, + "versionNonce": 1888162482, + "isDeleted": false, + "id": "PRTeWBK6vtriqNmaS6MK6", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "dashed", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1395.192414170092, + "y": 671.8730478428461, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 28.59168158024795, - "height": 28.591681580247723, - "seed": 1446800038, + "width": 0, + "height": 42.919998497063226, + "seed": 513182898, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { - "elementId": "AGWy-WRNKq1GRwlq27Uat", - "focus": -0.9114274197828796, - "gap": 4.090924209791865 + "elementId": "kX2Vp26fOxXlTY3cVukwK", + "focus": 0.19235930582337, + "gap": 4.126952157153937 }, "endBinding": { - "elementId": "hWRH46gwh1PqF21q9C4zp", - "focus": 0.32476161195369313, - "gap": 3.817394209960412 + "elementId": "FG0xyEC6bjrVvfXXFkhGr", + "focus": 0.46438483530637104, + "gap": 6.4530493457828015 }, "lastCommittedPoint": null, "startArrowhead": null, @@ -4525,48 +4765,48 @@ 0 ], [ - 28.59168158024795, - -28.591681580247723 + 0, + -42.919998497063226 ] ] }, { "type": "arrow", - "version": 1000, - "versionNonce": 1883850278, + "version": 611, + "versionNonce": 2137663854, "isDeleted": false, - "id": "qxLbNSc9nH3MjXNRGDNpH", + "id": "f2GbV3PcX4-EuddFNyF8B", "fillStyle": "solid", - "strokeWidth": 2, - "strokeStyle": "dotted", + "strokeWidth": 1, + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, - "x": 1230.1984920751363, - "y": 723.795967694437, + "x": 585.4763931790178, + "y": 671.5692639960337, "strokeColor": "#1e1e1e", - "backgroundColor": "#b2f2bb", - "width": 26.829463375617934, - "height": 26.727165592834353, - "seed": 149713658, + "backgroundColor": "#ffec99", + "width": 0, + "height": 43.00000000000002, + "seed": 1969796334, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { - "elementId": "hWRH46gwh1PqF21q9C4zp", - "focus": -0.5137527808081439, - "gap": 4.295967694436968 + "elementId": "IqMFPR6D4iUuFlmFg2h3z", + "focus": -0.0028456892444684526, + "gap": 4.430736003966331 }, "endBinding": { - "elementId": "9R0Z6nTrFuTnbu8bnCl12", - "focus": -0.6031631617717584, - "gap": 6.476866712728679 + "elementId": "OdVAxEmxdP0Y8q-094nMN", + "focus": 0.7332453105971238, + "gap": 3.069263996033669 }, "lastCommittedPoint": null, "startArrowhead": null, @@ -4577,49 +4817,93 @@ 0 ], [ - 26.829463375617934, - 26.727165592834353 + 0, + -43.00000000000002 ] ] }, { "type": "arrow", - "version": 961, - "versionNonce": 141694778, + "version": 684, + "versionNonce": 582610034, "isDeleted": false, - "id": "TKQL22FgfD_EaFnrCOSUr", + "id": "Ehl2ZfbTr49ll8jA6pvS7", "fillStyle": "solid", "strokeWidth": 1, - "strokeStyle": "solid", + "strokeStyle": "dashed", "roughness": 1, "opacity": 100, "angle": 0, - "x": 1269.8469813268543, - "y": 751.9090757902081, + "x": 812.3775164681838, + "y": 673.985380034576, "strokeColor": "#1e1e1e", "backgroundColor": "#ffec99", - "width": 27.330342883103867, - "height": 26.591681580247723, - "seed": 2006451130, + "width": 0, + "height": 43.00000000000002, + "seed": 1285547822, "groupIds": [], "frameId": null, "roundness": { "type": 2 }, "boundElements": [], - "updated": 1708594325689, + "updated": 1708618435141, "link": null, "locked": false, "startBinding": { - "elementId": "9R0Z6nTrFuTnbu8bnCl12", - "focus": -0.904619473082073, - "gap": 5.090924209791865 + "elementId": "DRdIzIA5aSRPeNpP2pex-", + "focus": -0.6497725911720351, + "gap": 2.0146199654240036 }, "endBinding": { - "elementId": "kX2Vp26fOxXlTY3cVukwK", - "focus": 0.32006279982418195, - "gap": 7.317394209960412 + "elementId": "hw9PKBQkD_MFDyEU0uuka", + "focus": 0.7104485771950103, + "gap": 5.485380034575996 + }, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + -43.00000000000002 + ] + ] + }, + { + "type": "arrow", + "version": 1101, + "versionNonce": 1098655218, + "isDeleted": false, + "id": "ZlUIWDp6idXzxgON9_x4C", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 393.4210421860963, + "y": 1042.4486805801255, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 1114.4500070296972, + "height": 0, + "seed": 1024031278, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 }, + "boundElements": [], + "updated": 1708618503504, + "link": null, + "locked": false, + "startBinding": null, + "endBinding": null, "lastCommittedPoint": null, "startArrowhead": null, "endArrowhead": "arrow", @@ -4629,8 +4913,92 @@ 0 ], [ - 27.330342883103867, - -26.591681580247723 + 1114.4500070296972, + 0 + ] + ] + }, + { + "type": "text", + "version": 599, + "versionNonce": 849778610, + "isDeleted": false, + "id": "Z5ItqL1_S5-oF1sZwu3my", + "fillStyle": "solid", + "strokeWidth": 2, + "strokeStyle": "solid", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 208.01593017578125, + "y": 1026.75, + "strokeColor": "#1e1e1e", + "backgroundColor": "transparent", + "width": 162.3046875, + "height": 23, + "seed": 108397678, + "groupIds": [], + "frameId": null, + "roundness": null, + "boundElements": [], + "updated": 1708618503504, + "link": null, + "locked": false, + "fontSize": 20, + "fontFamily": 2, + "text": "Garbage Collector", + "textAlign": "left", + "verticalAlign": "top", + "containerId": null, + "originalText": "Garbage Collector", + "lineHeight": 1.15, + "baseline": 18 + }, + { + "type": "arrow", + "version": 582, + "versionNonce": 1642554094, + "isDeleted": false, + "id": "OerFprXRPVst8_BgNyFgG", + "fillStyle": "solid", + "strokeWidth": 1, + "strokeStyle": "dashed", + "roughness": 1, + "opacity": 100, + "angle": 0, + "x": 1372.2508231792017, + "y": 989.1675772818068, + "strokeColor": "#1e1e1e", + "backgroundColor": "#ffec99", + "width": 0, + "height": 46.08242271819347, + "seed": 282180850, + "groupIds": [], + "frameId": null, + "roundness": { + "type": 2 + }, + "boundElements": [], + "updated": 1708618513548, + "link": null, + "locked": false, + "startBinding": { + "elementId": "ia9PMtL1s9vwB3H7pqe7w", + "focus": -0.9789697293152213, + "gap": 3.667577281806757 + }, + "endBinding": null, + "lastCommittedPoint": null, + "startArrowhead": null, + "endArrowhead": "arrow", + "points": [ + [ + 0, + 0 + ], + [ + 0, + 46.08242271819347 ] ] } diff --git a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg index 36f9fc8ddfe..260d8a450d4 100644 --- a/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg +++ b/src/main/java/org/opentripplanner/updater/images/updater-threads-queues.svg @@ -1,4 +1,4 @@ - + @@ -18,4 +18,4 @@ - Polling Updater 2Threads, Queues, and Buffers Over TimeGraph UpdaterHTTP Handler 1HTTP Handler 2Streaming UpdaterPolling Updater 1rxfetchparsefetchparserxrxfetchparseExecutor Queue12applyapply13Buffer Transit DataLive Transit Data2applyapplyapply211applyABBCCDrouting on Arouting on CDE \ No newline at end of file + Polling Updater 2Threads, Queues, and Buffers Over TimeGraph UpdaterHTTP Handler 1HTTP Handler 2Streaming UpdaterPolling Updater 1rxfetchparsefetchparserxrxfetchparseExecutor Queue12applyapply13Buffer Transit DataLive Transit Data2applyapplyapply211applyABBCCDrouting on Arouting on CDEGarbage Collector \ No newline at end of file From 7be0113880b9b61c84ebd3e31fcdb6617164f77c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 22 Feb 2024 19:26:17 +0100 Subject: [PATCH 0637/1688] Fix broken document generation introduced in #5682 --- docs/sandbox/siri/SiriAzureUpdater.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/sandbox/siri/SiriAzureUpdater.md b/docs/sandbox/siri/SiriAzureUpdater.md index fa9442054a4..75aa58897ec 100644 --- a/docs/sandbox/siri/SiriAzureUpdater.md +++ b/docs/sandbox/siri/SiriAzureUpdater.md @@ -1,7 +1,7 @@ # Siri Azure Updater -It is a sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages through *Azure Service Bus*. -It also allows for OTP to download historical real-time data from an HTTP endpoint on startup. +It is sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages through *Azure Service Bus*. +IT also OTP to download historical data from en HTTP endpoint on startup. ## Contact Info From e5b943a4ad5ad1735b88f99cfd80cddb5bc1d0b6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 23 Feb 2024 08:47:45 +0100 Subject: [PATCH 0638/1688] Disable Skanetrafiken speed test [ci skip] --- .github/workflows/performance-test.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index 1b8201a01ae..3c2ffdba465 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -32,10 +32,11 @@ jobs: jfr-delay: "35s" profile: core - - location: skanetrafiken - iterations: 1 - jfr-delay: "50s" - profile: core + # disabled due to https://github.com/opentripplanner/OpenTripPlanner/issues/5702 + #- location: skanetrafiken + # iterations: 1 + # jfr-delay: "50s" + # profile: core # extended locations that are run only after merging to dev-2.x From fb6005697deab6c5643fc81a49db4ea51d248066 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 23 Feb 2024 08:27:56 +0100 Subject: [PATCH 0639/1688] Remove invisible characters when parsing feed ids --- .../framework/lang/StringUtils.java | 21 ++++++++++++++++ .../transit/model/framework/FeedScopedId.java | 9 +++++-- .../framework/lang/StringUtilsTest.java | 7 ++++++ .../model/framework/FeedScopedIdTest.java | 24 +++++++++++++++++++ 4 files changed, 59 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java index cbb32b9eaca..b231f980286 100644 --- a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java +++ b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java @@ -1,5 +1,6 @@ package org.opentripplanner.framework.lang; +import java.util.regex.Pattern; import javax.annotation.Nonnull; /** @@ -7,6 +8,15 @@ */ public class StringUtils { + /** + * Regex to find unprintable characters like newlines and 'ZERO WIDTH SPACE' (U+200B). + */ + private static final String INVISIBLE_CHARS_REGEX = "\\p{C}"; + /** + * Patterns are immutable and thread safe. + */ + private static final Pattern INVISIBLE_CHARS_PATTERN = Pattern.compile(INVISIBLE_CHARS_REGEX); + private StringUtils() {} /** true if the given text is not {@code null} or has at least one none white-space character. */ @@ -119,4 +129,15 @@ public static String quoteReplace(@Nonnull String text) { public static String kebabCase(String input) { return input.toLowerCase().replace('_', '-'); } + + /** + * Removes unprintable control characters like newlines, tabs and invisible whitespace + * like 'ZERO WIDTH SPACE' (U+200B) that don't have an immediate visual representation. + *

      + * Note that "regular" whitespace characters like U+0020 and U+2000 are considered visible and + * therefore not removed. + */ + public static String removeInvisibleChars(String input) { + return INVISIBLE_CHARS_PATTERN.matcher(input).replaceAll(""); + } } diff --git a/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java b/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java index d67ccc3d0e1..a0d7c72b751 100644 --- a/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java +++ b/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java @@ -5,9 +5,9 @@ import java.io.Serializable; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import org.opentripplanner.framework.lang.StringUtils; public final class FeedScopedId implements Serializable, Comparable { @@ -59,7 +59,12 @@ public static FeedScopedId parse(String value) throws IllegalArgumentException { * Parses a string consisting of concatenated FeedScopedIds to a List */ public static List parseList(String s) { - return Arrays.stream(s.split(",")).map(FeedScopedId::parse).collect(Collectors.toList()); + return Arrays + .stream(s.split(",")) + .map(input -> StringUtils.removeInvisibleChars(input).strip()) + .filter(i -> !i.isBlank()) + .map(FeedScopedId::parse) + .toList(); } public static boolean isValidString(String value) throws IllegalArgumentException { diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java index 8998d82a5f2..f65e5da4406 100644 --- a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java @@ -10,6 +10,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.test.support.VariableSource; class StringUtilsTest { @@ -82,4 +83,10 @@ void padRight() { void quoteReplace() { assertEquals("\"key\" : \"value\"", StringUtils.quoteReplace("'key' : 'value'")); } + + @ParameterizedTest + @ValueSource(strings = { "\u200B", "\n", "\t" }) + void removeInvisibleChars(String input) { + assertEquals("", StringUtils.removeInvisibleChars(input)); + } } diff --git a/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java b/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java index 08df670ed62..812c4c87fbf 100644 --- a/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java +++ b/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java @@ -3,13 +3,37 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import java.util.List; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; class FeedScopedIdTest { + private static final List TRIMET_123 = List.of(new FeedScopedId("trimet", "123")); + @Test void ofNullable() { assertEquals(new FeedScopedId("FEED", "ID"), FeedScopedId.ofNullable("FEED", "ID")); assertNull(FeedScopedId.ofNullable("FEED", null)); } + + @ParameterizedTest + @ValueSource( + strings = { + "trimet:123", + "trimet:123 ", + "trimet:123, ", + ",trimet:123 , ", + ",trimet:123 , ,\u200B,", + " trimet:123 ", + "\u200Btrimet:123", + "\u200B\u200Btri\u200Bmet:123\u200B", + "\ntrimet:123\t", + "\ntri\nmet:123\t", + } + ) + void parseList(String input) { + assertEquals(TRIMET_123, FeedScopedId.parseList(input)); + } } From c23038e229e26247846c7762ff23c0d7fe2dc054 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Fri, 23 Feb 2024 17:38:50 +0800 Subject: [PATCH 0640/1688] add data sources and incrementality sections [ci skip] --- .../org/opentripplanner/updater/package.md | 48 +++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md index 26120cfea9b..345431300c6 100644 --- a/src/main/java/org/opentripplanner/updater/package.md +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -1,6 +1,24 @@ # Realtime Updaters -## Realtime Concurrency Overview +## Realtime Data Sources + +Published transit data is broadly divided into two categories, which represent different time scales. On one hand we have scheduled data (also called static or theoretical data), and on the other hand realtime (or dynamic) data. Scheduled data is supplied in GTFS or NeTEx format, with the corresponding realtime data supplied in the [GTFS-RT](https://gtfs.org/realtime/reference/) and [SIRI](https://www.siri-cen.eu/) formats, respectively. This package contains code that retrieves and decodes realtime data, then layers it on top of the static transit data in a live OTP instance while it continues to handle routing requests. + +Different data producers might update their scheduled data every month, week, or day. Realtime data then covers any changes to service at a timescale shorter than that of a given producer's scheduled data. Broadly speaking, realtime data represents short-term unexpected or unplanned changes that modify the planned schedules, and could require changes to journeys that the riders would not expect from the schedule. OpenTripPlanner uses three main categories of realtime data which are summarized in the table below. The SIRI specification includes more types, but OTP handles only these three that correspond to the three GTFS-RT types. + +| GTFS-RT Name | SIRI Name | Description | +|----------------------------------------------------------------------------------|--------------------------|-----------------------------------------------------------------------| +| [Service Alert](https://gtfs.org/realtime/reference/#message-alert) | Situation Exchange (SX) | Text descriptions relevant to riders using a particular route or stop | +| [Trip Update](https://gtfs.org/realtime/reference/#message-tripupdate) | Estimated Timetable (ET) | Observed or expected arrival and departure times for near-term trips | +| [Vehicle Position](https://gtfs.org/realtime/reference/#message-vehicleposition) | Vehicle Monitoring (VM) | Physical location of vehicles currently providing service | + +GTFS-RT takes the form of binary protocol buffer messages that are typically fetched over HTTP. On the other hand, the SIRI specification originally described SOAP remote procedure calls retrieving an XML representation of the messages. Various projects instead adopted simple HTTP GET requests passing parameters in the URL and returning a JSON representation. The latter approach was eventually officially recognized as "SIRI Lite". + +Because OTP handles both GTFS-RT and SIRI data sources, there will often be two equivalent classes for retrieving and interpreting a particular kind of realtime data. For example, there is a SiriAlertsUpdateHandler and an AlertsUpdateHandler. The SIRI variants are typically prefixed with `Siri` while the GTFS-RT ones have no prefix for historical reasons (the GTFS-RT versions were originally the only ones). These should perhaps be renamed with a `GtfsRt` prefix for symmetry. Once the incoming messages have been decoded, they will ideally be mapped into a single internal class that was originally derived from GTFS-RT but has been extended to cover all information afforded by both GTFS and SIRI. For example, both classes mentioned above produce TransitAlert instances. These uniform internal representations can then be applied to the internal transit model using a single mechanism, independent of the message source type. + +In practice, OTP does not yet use a single uniform internal representation for each of the three main message types. Particularly for TripUpdates/SIRI-ET, a lot of custom behavior was introduced for the SIRI case which led to a split between the two implementations. Our aim is to eventually merge the two systems back into one. NOTE: the comments on source code may be deceptive in cases where classes were copied and altered to handle SIRI data. This was sometimes done under time pressure to resolve production bugs. In these situations some comments were inadvertently duplicated without being updated. For example, despite many comments and field names mentioning "trip updates", SIRI estimated timetables are not converted into an internal TripUpdate object. A very notable case is the two implementations of TimetableSnapshotProvider: TimetableSnapshotSource and SiriTimetableSnapshotSource should really be a single implementation operating on internal data types independent of SIRI or GTFS-RT. + +## Realtime Concurrency The following approach to realtime concurrency was devised around 2013 when OTP first started consuming realtime data that affected routing results rather than just displaying messages. At first, the whole realtime system followed this approach. Some aspects of this system were maintained in subsequent work over the years, but because the details and rationale were not fully documented, misinterpretations and subtle inconsistencies were introduced. @@ -8,7 +26,7 @@ On 11 January 2024 a team of OTP developers reviewed this realtime concurrency a The following is a sequence diagram showing how threads are intended to communicate. Unlike some common forms of sequence diagrams, time is on the horizontal axis here. Each horizontal line represents either a thread of execution (handling incoming realtime messages or routing requests) or a queue or buffer data structure. Dotted lines represent object references being handed off, and solid lines represent data being copied. -![Architecture diagram](images/updater-threads-queues.svg) +![Realtime sequence diagram](images/updater-threads-queues.svg) At the top of the diagram are the GraphUpdater implementations. These fall broadly into two categories: polling updaters and streaming updaters. Polling updaters periodically send a request to server (often just a simple HTTP server) which returns a file containing the latest version of the updates. Streaming updaters are generally built around libraries implementing message-oriented protocols such as AMQP or WebSockets, which fire a callback each time a new message is received. Polling updaters tend to return a full dataset describing the entire system state on each polling operation, while streaming updaters tend to receive incremental messages targeting individual transit trips. As such, polling updaters execute relatively infrequently (perhaps every minute or two) and process large responses, while streaming updaters execute very frequently (often many times per second) and operate on small messages in short bursts. Polling updaters are simpler in many ways and make use of common HTTP server components, but they introduce significant latency and redundant communication. Streaming updaters require more purpose-built or custom-configured components including message brokers, but bandwidth consumption and latency are lower, allowing routing results to reflect vehicle delays and positions immediately after they're reported. @@ -20,7 +38,31 @@ This writable buffer of transit data is periodically made immutable and swapped This is essentially a multi-version snapshot concurrency control system, inspired by widely used database engines (and in fact informed by books on transactional database design). The end result is a system where 1) writing operations are simple to reason about and cannot conflict because only one write happens at a time; 2) multiple read operations (including routing requests) can occur concurrently; 3) read operations do not need to pause while writes are happening; 4) read operations see only fully completed write operations, never partial writes; and 5) each read operation sees a consistent, unchanging view of the transit data. -Importantly, no locking is necessary, though some form of synchronization is applied during the buffer swap operation to impose a consistent view of the whole data structure via a happens-before relationship as defined by the Java memory model. (While pointers to objects can be handed between threads with no read-tearing of the pointer itself, there is no guarantee that the web of objects pointed to will be consistent without some explicit synchronization at the hand-off.) +An important characteristic of this approach is that _no locking is necessary_. However, some form of synchronization is used during the buffer swap operation to impose a consistent view of the whole data structure via a happens-before relationship as defined by the Java memory model. While pointers to objects can be handed between threads with no read-tearing of the pointer itself, there is no guarantee that the web of objects pointed to will be consistent without some explicit synchronization at the hand-off. Arguably the process of creating an immutable live snapshot (and a corresponding new writable buffer) should be handled by a GraphWriterRunnable on the single graph updater thread. This would serve to defer any queued modifications until the new buffer is in place, without introducing any further locking mechanisms. +## Full Dataset versus Incremental Messages + +The GTFS-RT specification includes an "incrementality" field. The specification says this field is unsupported and its behavior is undefined, but in practice people have been using this field since around 2013 in a fairly standardized way. An effort is underway to document its usage and update the standard (see https://github.com/google/transit/issues/84). + +GTFS-RT messages are most commonly distributed by HTTP GET polling. In this method, the consumer (OTP) has to make a request each time it wants to check for updates, and will receive all messages about all parts of the transit system at once, including messages it's already seen before. The incrementality field allows for some other options. As used in practice, there are three main aspects: + +- **Differential vs. full-dataset:** The incrementality field can take on two values: differential and full_dataset. In full-dataset mode, you'll get one big FeedMessage containing every update for every trip or vehicle. In differential mode, you'll receive updates for each trip or vehicle as they stream in, either individually or in small blocks. This may include a guarantee that an update will be provided on every entity at least once every n minutes, or alternatively the producer sending the full dataset when you first connect, then sending only changes. Once you're in differential mode, this opens up the possibilities below. + + - **Poll vs. push:** In practice differential messages are usually distributed individually or in small blocks via a message queue. This means the notifications are pushed by the message queueing system as soon as they arrive, rather than pulled by the consumer via occasional polling. It would in principle also be possible to provide differential updates by polling, with the producer actively tracking the last time each consumer polled (sessions), or the consumer including the producer-supplied timestamp of its last fetch, but we are not aware of any such implementations. Combining differential+push means that vehicle positions and trip updates can be received immediately after the vehicles report their positions. In some places vehicles provide updates every few seconds, so their position is genuinely known in real time. + +- **Message filtering:** Message queue systems often allow filtering by topic. A continuous stream of immediate small push messages is already an improvement over full dataset fetching, but if you only care about one route (for an arrival time display panel for example) you don't want to continuously receive and parse thousands of messages per second looking for the relevant ones. So rather than a "firehose" of every message, you subscribe to a topic that includes only messages for that one route. You then receive a single message every few seconds with the latest predictions for the routes you care about. + +The latency and bandwidth advantages of differential message passing systems are evident, particularly in large (national/metropolitan) realtime passenger information systems created through an intentional and thorough design process. + +SIRI allows for both polling and pub-sub approaches to message distribution. These correspond to the full dataset and differential modes described for GTFS-RT. + +## SIRI Resources + +- The official SIRI standardization page: https://www.siri-cen.eu/ +- Entur page on SIRI and GTFS-RT: https://developer.entur.org/pages-real-time-intro +- Original proposal and description of SIRI Lite (in French): http://www.normes-donnees-tc.org/wp-content/uploads/2017/01/Proposition-Profil-SIRI-Lite-initial-v1-2.pdf +- UK Government SIRI VM guidance: https://www.gov.uk/government/publications/technical-guidance-publishing-location-data-using-the-bus-open-data-service-siri-vm/technical-guidance-siri-vm +- Wikipedia page: https://en.wikipedia.org/wiki/Service_Interface_for_Real_Time_Information# + From 7b6f8a87d0688fb420b2258a4db4f12892d23565 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 23 Feb 2024 11:31:07 +0100 Subject: [PATCH 0641/1688] Add vector tile layer for area stops --- .../ext/vectortiles/VectorTilesResource.java | 3 ++ .../areastops/AreaStopsLayerBuilder.java | 53 +++++++++++++++++++ .../DigitransitAreaStopPropertyMapper.java | 45 ++++++++++++++++ 3 files changed, 101 insertions(+) create mode 100644 src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java create mode 100644 src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index a1e9a83c85a..dddf0c2c035 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -18,6 +18,7 @@ import java.util.function.Predicate; import org.glassfish.grizzly.http.server.Request; import org.opentripplanner.apis.support.TileJson; +import org.opentripplanner.ext.vectortiles.layers.areastops.AreaStopsLayerBuilder; import org.opentripplanner.ext.vectortiles.layers.stations.StationsLayerBuilder; import org.opentripplanner.ext.vectortiles.layers.stops.StopsLayerBuilder; import org.opentripplanner.ext.vectortiles.layers.vehicleparkings.VehicleParkingGroupsLayerBuilder; @@ -123,6 +124,7 @@ private static LayerBuilder crateLayerBuilder( return switch (layerParameters.type()) { case Stop -> new StopsLayerBuilder(context.transitService(), layerParameters, locale); case Station -> new StationsLayerBuilder(context.transitService(), layerParameters, locale); + case AreaStop -> new AreaStopsLayerBuilder(context.transitService(), layerParameters, locale); case VehicleRental -> new VehicleRentalPlacesLayerBuilder( context.vehicleRentalService(), layerParameters, @@ -153,6 +155,7 @@ private static LayerBuilder crateLayerBuilder( public enum LayerType { Stop, Station, + AreaStop, VehicleRental, VehicleRentalVehicle, VehicleRentalStation, diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java new file mode 100644 index 00000000000..be03df4decf --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java @@ -0,0 +1,53 @@ +package org.opentripplanner.ext.vectortiles.layers.areastops; + +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.function.BiFunction; +import org.locationtech.jts.geom.Envelope; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.apis.support.mapping.PropertyMapper; +import org.opentripplanner.ext.vectortiles.VectorTilesResource; +import org.opentripplanner.inspector.vector.LayerBuilder; +import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.service.TransitService; + +public class AreaStopsLayerBuilder extends LayerBuilder { + + static Map>> mappers = Map.of( + MapperType.Digitransit, + DigitransitAreaStopPropertyMapper::create + ); + private final TransitService transitService; + + public AreaStopsLayerBuilder( + TransitService transitService, + LayerParameters layerParameters, + Locale locale + ) { + super( + mappers.get(MapperType.valueOf(layerParameters.mapper())).apply(transitService, locale), + layerParameters.name(), + layerParameters.expansionFactor() + ); + this.transitService = transitService; + } + + protected List getGeometries(Envelope query) { + return transitService + .findAreaStops(query) + .stream() + .filter(g -> g.getGeometry() != null) + .map(stop -> { + Geometry point = stop.getGeometry().copy(); + point.setUserData(stop); + return point; + }) + .toList(); + } + + enum MapperType { + Digitransit, + } +} diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java new file mode 100644 index 00000000000..b826c30f38f --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java @@ -0,0 +1,45 @@ +package org.opentripplanner.ext.vectortiles.layers.areastops; + +import java.util.Collection; +import java.util.List; +import java.util.Locale; +import org.opentripplanner.apis.support.mapping.PropertyMapper; +import org.opentripplanner.framework.i18n.I18NStringMapper; +import org.opentripplanner.inspector.vector.KeyValue; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.service.TransitService; + +public class DigitransitAreaStopPropertyMapper extends PropertyMapper { + + private final TransitService transitService; + private final I18NStringMapper i18NStringMapper; + + private DigitransitAreaStopPropertyMapper(TransitService transitService, Locale locale) { + this.transitService = transitService; + this.i18NStringMapper = new I18NStringMapper(locale); + } + + protected static DigitransitAreaStopPropertyMapper create( + TransitService transitService, + Locale locale + ) { + return new DigitransitAreaStopPropertyMapper(transitService, locale); + } + + @Override + protected Collection map(AreaStop stop) { + var routeColors = transitService + .getRoutesForStop(stop) + .stream() + .map(Route::getColor) + .distinct() + .toList(); + return List.of( + new KeyValue("gtfsId", stop.getId().toString()), + new KeyValue("name", i18NStringMapper.mapNonnullToApi(stop.getName())), + new KeyValue("code", stop.getCode()), + new KeyValue("routeColors", routeColors) + ); + } +} From 018806d2b6d24d3522b186b1f59b695785277035 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 22 Feb 2024 16:33:24 +0100 Subject: [PATCH 0642/1688] feat: Add Hamburg OSM mapper --- .../tagmapping/HamburgMapper.java | 32 +++++++++++++ .../tagmapping/OsmTagMapperSource.java | 2 + .../tagmapping/HamburgMapperTest.java | 48 +++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java create mode 100644 src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java new file mode 100644 index 00000000000..ae6ba260cd8 --- /dev/null +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java @@ -0,0 +1,32 @@ +package org.opentripplanner.openstreetmap.tagmapping; + +import org.opentripplanner.openstreetmap.model.OSMWithTags; + +/** + * Modified mapper to allow through traffic for combination access=customers and customers=HVV. + * + * @see GermanyMapper + * @see OsmTagMapper + * @see DefaultMapper + */ +public class HamburgMapper extends GermanyMapper { + + @Override + public boolean isGeneralNoThroughTraffic(OSMWithTags way) { + String access = way.getTag("access"); + boolean isNoThroughTraffic = doesTagValueDisallowThroughTraffic(access); + + if (isNoThroughTraffic && way.hasTag("customers")) { + String customers = way.getTag("customers"); + return !isAllowedThroughTrafficForHVV(access, customers); + } + + return isNoThroughTraffic; + } + + private boolean isAllowedThroughTrafficForHVV(String access, String customers) { + boolean isAccessCustomers = access.equals("customers"); + boolean isHVV = customers.equals("HVV"); + return isAccessCustomers && isHVV; + } +} diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java index 6ed4a701c30..d430ad05f7d 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java @@ -10,6 +10,7 @@ public enum OsmTagMapperSource { UK, FINLAND, GERMANY, + HAMBURG, ATLANTA, HOUSTON, PORTLAND, @@ -22,6 +23,7 @@ public OsmTagMapper getInstance() { case UK -> new UKMapper(); case FINLAND -> new FinlandMapper(); case GERMANY -> new GermanyMapper(); + case HAMBURG -> new HamburgMapper(); case ATLANTA -> new AtlantaMapper(); case HOUSTON -> new HoustonMapper(); case PORTLAND -> new PortlandMapper(); diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java new file mode 100644 index 00000000000..36096d9d698 --- /dev/null +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java @@ -0,0 +1,48 @@ +package org.opentripplanner.openstreetmap.tagmapping; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; +import org.opentripplanner.openstreetmap.model.OSMWithTags; + +public class HamburgMapperTest { + + private HamburgMapper mapper; + + @BeforeEach + void createMapper() { + mapper = new HamburgMapper(); + } + + @Test + public void shouldAllowThroughTraffic_WhenAccessCustomers_AndCustomersHVV() { + OSMWithTags way = new OSMWithTags(); + way.addTag("access", "customers"); + way.addTag("customers", "HVV"); + + boolean generalNoThroughTraffic = mapper.isGeneralNoThroughTraffic(way); + + Assertions.assertFalse(generalNoThroughTraffic, + "access=customers and customers=hvv should not be considered through-traffic"); + } + + @ParameterizedTest + @CsvSource(value = { + "no", + "destination", + "private", + "customers", + "delivery" + }) + public void shouldDisallowThroughTraffic_WhenNoCustomersHVV(String access) { + OSMWithTags way = new OSMWithTags(); + way.addTag("access", access); + + boolean generalNoThroughTraffic = mapper.isGeneralNoThroughTraffic(way); + + Assertions.assertTrue(generalNoThroughTraffic, + "access={no, destination, private, customers, delivery} should be blocked in general"); + } +} From 2ccf86f3c0e9fb36ca085ca25f67554c26e9e55d Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 22 Feb 2024 17:03:40 +0100 Subject: [PATCH 0643/1688] style: Apply style improvements --- .../tagmapping/HamburgMapperTest.java | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java index 36096d9d698..f49771c26a5 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java @@ -24,25 +24,23 @@ public void shouldAllowThroughTraffic_WhenAccessCustomers_AndCustomersHVV() { boolean generalNoThroughTraffic = mapper.isGeneralNoThroughTraffic(way); - Assertions.assertFalse(generalNoThroughTraffic, - "access=customers and customers=hvv should not be considered through-traffic"); + Assertions.assertFalse( + generalNoThroughTraffic, + "access=customers and customers=hvv should not be considered through-traffic" + ); } @ParameterizedTest - @CsvSource(value = { - "no", - "destination", - "private", - "customers", - "delivery" - }) + @CsvSource(value = { "no", "destination", "private", "customers", "delivery" }) public void shouldDisallowThroughTraffic_WhenNoCustomersHVV(String access) { OSMWithTags way = new OSMWithTags(); way.addTag("access", access); boolean generalNoThroughTraffic = mapper.isGeneralNoThroughTraffic(way); - Assertions.assertTrue(generalNoThroughTraffic, - "access={no, destination, private, customers, delivery} should be blocked in general"); + Assertions.assertTrue( + generalNoThroughTraffic, + "access={no, destination, private, customers, delivery} should be blocked in general" + ); } } From 6df6a007a24399153e92a5752be88c1ab81bee00 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Thu, 22 Feb 2024 17:03:52 +0100 Subject: [PATCH 0644/1688] docs: Add enum option --- docs/BuildConfiguration.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index 05da4cf4d0a..b2ab185ef97 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -945,7 +945,7 @@ the local filesystem. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"default"` **Path:** /osm/[0] -**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constant-speed-finland` +**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `hamburg` | `atlanta` | `houston` | `portland` | `constant-speed-finland` The named set of mapping rules applied when parsing OSM tags. Overrides the value specified in `osmDefaults`. @@ -953,7 +953,7 @@ The named set of mapping rules applied when parsing OSM tags. Overrides the valu **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"default"` **Path:** /osmDefaults -**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `atlanta` | `houston` | `portland` | `constant-speed-finland` +**Enum values:** `default` | `norway` | `uk` | `finland` | `germany` | `hamburg` | `atlanta` | `houston` | `portland` | `constant-speed-finland` The named set of mapping rules applied when parsing OSM tags. From c394161e5e24c5ec10e5f452f5723f86e1be1f0b Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Fri, 23 Feb 2024 14:06:40 +0100 Subject: [PATCH 0645/1688] refactor: Apply review suggestions --- .../openstreetmap/tagmapping/HamburgMapperTest.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java index f49771c26a5..0991decea46 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java @@ -1,10 +1,13 @@ package org.opentripplanner.openstreetmap.tagmapping; -import org.junit.jupiter.api.Assertions; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.CsvSource; +import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.openstreetmap.model.OSMWithTags; public class HamburgMapperTest { @@ -24,21 +27,21 @@ public void shouldAllowThroughTraffic_WhenAccessCustomers_AndCustomersHVV() { boolean generalNoThroughTraffic = mapper.isGeneralNoThroughTraffic(way); - Assertions.assertFalse( + assertFalse( generalNoThroughTraffic, "access=customers and customers=hvv should not be considered through-traffic" ); } @ParameterizedTest - @CsvSource(value = { "no", "destination", "private", "customers", "delivery" }) + @ValueSource(strings = { "no", "destination", "private", "customers", "delivery" }) public void shouldDisallowThroughTraffic_WhenNoCustomersHVV(String access) { OSMWithTags way = new OSMWithTags(); way.addTag("access", access); boolean generalNoThroughTraffic = mapper.isGeneralNoThroughTraffic(way); - Assertions.assertTrue( + assertTrue( generalNoThroughTraffic, "access={no, destination, private, customers, delivery} should be blocked in general" ); From cdcea7afcf98ffaf0ee7e92f84b9a366dc83e955 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Fri, 23 Feb 2024 14:27:37 +0100 Subject: [PATCH 0646/1688] refactor: Prevent NPE --- .../openstreetmap/tagmapping/HamburgMapper.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java index ae6ba260cd8..789828e975c 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java @@ -25,8 +25,8 @@ public boolean isGeneralNoThroughTraffic(OSMWithTags way) { } private boolean isAllowedThroughTrafficForHVV(String access, String customers) { - boolean isAccessCustomers = access.equals("customers"); - boolean isHVV = customers.equals("HVV"); + boolean isAccessCustomers = "customers".equals(access); + boolean isHVV = "HVV".equals(customers); return isAccessCustomers && isHVV; } } From f41cc65831ea6e702a20c595397ff0532c80dc2a Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Fri, 23 Feb 2024 14:28:45 +0100 Subject: [PATCH 0647/1688] refactor: Remove obsolete import --- .../openstreetmap/tagmapping/HamburgMapperTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java index 0991decea46..029c1b7c662 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java @@ -6,7 +6,6 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.CsvSource; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.openstreetmap.model.OSMWithTags; From 72cbacec2c6340f5e6cc9a0e219981944bb038d4 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 23 Feb 2024 15:29:59 +0200 Subject: [PATCH 0648/1688] Make some costs Costs --- .../apis/gtfs/generated/GraphQLTypes.java | 22 ++++++++++++------- .../opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index 5ad7fc87785..d2fc0a05e19 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -137,7 +137,7 @@ public static class GraphQLBicycleParkingPreferencesInput { private List filters; private List preferred; - private Integer unpreferredCost; + private org.opentripplanner.framework.model.Cost unpreferredCost; public GraphQLBicycleParkingPreferencesInput(Map args) { if (args != null) { @@ -147,7 +147,8 @@ public GraphQLBicycleParkingPreferencesInput(Map args) { if (args.get("preferred") != null) { this.preferred = (List) args.get("preferred"); } - this.unpreferredCost = (Integer) args.get("unpreferredCost"); + this.unpreferredCost = + (org.opentripplanner.framework.model.Cost) args.get("unpreferredCost"); } } @@ -159,7 +160,7 @@ public List getGraphQLPreferred() { return this.preferred; } - public Integer getGraphQLUnpreferredCost() { + public org.opentripplanner.framework.model.Cost getGraphQLUnpreferredCost() { return this.unpreferredCost; } @@ -171,7 +172,9 @@ public void setGraphQLPreferred(List preferred) { this.preferred = preferred; } - public void setGraphQLUnpreferredCost(Integer unpreferredCost) { + public void setGraphQLUnpreferredCost( + org.opentripplanner.framework.model.Cost unpreferredCost + ) { this.unpreferredCost = unpreferredCost; } } @@ -451,7 +454,7 @@ public static class GraphQLCarParkingPreferencesInput { private List filters; private List preferred; - private Integer unpreferredCost; + private org.opentripplanner.framework.model.Cost unpreferredCost; public GraphQLCarParkingPreferencesInput(Map args) { if (args != null) { @@ -461,7 +464,8 @@ public GraphQLCarParkingPreferencesInput(Map args) { if (args.get("preferred") != null) { this.preferred = (List) args.get("preferred"); } - this.unpreferredCost = (Integer) args.get("unpreferredCost"); + this.unpreferredCost = + (org.opentripplanner.framework.model.Cost) args.get("unpreferredCost"); } } @@ -473,7 +477,7 @@ public List getGraphQLPreferred() { return this.preferred; } - public Integer getGraphQLUnpreferredCost() { + public org.opentripplanner.framework.model.Cost getGraphQLUnpreferredCost() { return this.unpreferredCost; } @@ -485,7 +489,9 @@ public void setGraphQLPreferred(List preferred) { this.preferred = preferred; } - public void setGraphQLUnpreferredCost(Integer unpreferredCost) { + public void setGraphQLUnpreferredCost( + org.opentripplanner.framework.model.Cost unpreferredCost + ) { this.unpreferredCost = unpreferredCost; } } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 813f20559ba..1d73017d7ac 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1435,7 +1435,7 @@ input CarParkingPreferencesInput { at least one of the preferred conditions, will receive this extra cost and therefore avoided if preferred options are available. """ - unpreferredCost: Int + unpreferredCost: Cost """ If non-empty every parking facility that doesn't match this set of conditions will @@ -1459,7 +1459,7 @@ input BicycleParkingPreferencesInput { at least one of the preferred conditions, will receive this extra cost and therefore avoided if preferred options are available. """ - unpreferredCost: Int + unpreferredCost: Cost """ If non-empty every parking facility that doesn't match this set of conditions will From 79de961f916c5ad724c2416b72e0a35199fa10b8 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 24 Feb 2024 01:04:17 +0800 Subject: [PATCH 0649/1688] add design considerations section --- .../org/opentripplanner/updater/package.md | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md index 345431300c6..0a1b6974a1e 100644 --- a/src/main/java/org/opentripplanner/updater/package.md +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -42,6 +42,42 @@ An important characteristic of this approach is that _no locking is necessary_. Arguably the process of creating an immutable live snapshot (and a corresponding new writable buffer) should be handled by a GraphWriterRunnable on the single graph updater thread. This would serve to defer any queued modifications until the new buffer is in place, without introducing any further locking mechanisms. +## Design Considerations + +This section summarizes the rationale behind some of the design decisions. + +### Realtime is Highly Concurrent + +An OTP instance can have multiple sources of realtime data at once. In some cases the transit data includes several feeds of scheduled data from different providers, with one or more types of realtime updates for those different feeds. + +In a large production system, ideally all the scheduled data would be integrated into a single data source with a unified ID namespace, and all the realtime data would also be integrated into a single data source with an exactly matching namespace. This would be the responsibility of a separate piece of software outside (upstream of) OTP. In practice, such an upstream data integration system does not exist in many deployments and OTP must manage several static and realtime data sources at once. Even when data feeds are well-integrated, the different kinds of realtime (arrival time updates, vehicle positions, or text alerts) may be split across multiple feeds as described in the GTFS-RT spec, which implies polling three different files. + +Each OTP instance in such a large configuration is also typically intended to handle several requests concurrently. Each incoming request needs to perform essentially random reads from the same large data structure representing the transit network, so there are efficiency benefits to many concurrent searches happening on the same instance, sharing this one large data structure. In a load-balanced cluster of OTP instances, realtime updates must be received and applied to each copy of the transportation network separately. So sharing each copy of the transportation network between a larger number of concurrent routing requests reduces the number of identical, arguably redundant network update processes going on simultaneously. + +In OTP the combined static and realtime transit data is a relatively large, deeply nested and interconnected data structure. It would take time to copy that structure, and especially to perform a deep copy of every nested object. Within a single instance, making multiple totally independent copies of this structure for different successive snapshots would tend to scatter reads from different routing threads across widely dispersed memory addresses, reducing cache efficiency. It could also lead to high (or highly variable) memory usage. In order to make updates to the transit data available frequently (as often as once every second, or as quickly as possible after each individual message comes in) we do not want to completely replicate the entire transit data structure for each snapshot. This would consume a significant fraction of the instance's available resources and likely degrade the aggregate performance of concurrently handled requests. + +### No Destructive Changes to Scheduled Data + +TripUpdates/SIRI-ET timetables cannot simply replace (overwrite) the original scheduled data. The updated timetables must be stored alongside the original scheduled ones. We need to retain the original data for several reasons. First, some routing requests should not be affected by realtime updates. The most obvious example is searches on future dates, which must use the scheduled trip objects. It is also common to show users delays relative to the originally planned schedule (like `8:30 +5min`). When a realtime disruption is severe enough, users may also expect or need to see the resulting itinerary in comparison with the one they expected to see in the absence of real-time disruptions. + +### Multiple Coexisting Read-only Snapshots + +Routing requests are relatively slow. They may take many seconds to process, and the response time is highly variable. For the duration that OTP is handling a single request, that request should see an effectively immutable, unchanging snapshot of the transit data. Even if new updates are constantly streaming in, each individual request must see a stable and unchanging view that remains internally consistent. Both the incoming realtime updates and the routing requests must behave like transactions that are “serializable” in the database concurrency control sense of the term: from any externally visible perspective, everything appears as if the reads and writes all happened in contiguous blocks in a single non-branching sequence, one after the other, even though much of the work is being done on threads in parallel. + +We take advantage of Java’s garbage collected environment here: once snapshots are no longer in use by any active routing code, they become unreferenced and are candidates for garbage collection. Of course the vast majority of the nested sub-objects used by a snapshot may still be in use, referenced by one or more successive snapshots that did not modify them, and therefore reused indefinitely. As long as each successive snapshot treats the previous ones (and all their nested sub-objects) as immutable, applying a copy-on-write policy to incorporate new information arriving in realtime updates, the garbage collector will weed out and deallocate subtrees as they are invalidated by those incoming realtime updates, once they are no longer needed by any active routing request. + +At any given moment there is a single most recent read-only snapshot of transit data, which is the one that will be handed off to any incoming routing requests. But when that single snapshot is updated, any requests that are currently executing will continue to hold their older snapshots. In this way there is always a single current snapshot, but an unlimited number of concurrently visible snapshots, each of which is being used by an unlimited number of concurrent routing requests. + +### Tolerance for Update Latency + +We don’t need every update for every individual trip to become visible to routing operations and end users independently of all other updates. We can batch updates together to a varying degree, trading off the number of separate snapshots present in memory at a given moment against the rapidity with which updates become visible to routing and to end users. Snapshots could be provided to the routing code on demand: if no requests are coming in, a series of individual updates will apply one after another to the same temporary buffer. As soon as a request comes in and needs a stable snapshot of the transit data to work with, the buffered set of transit data will be handed off to that request and subsequent updates applied to a new buffer in a copy-on-write fashion. However, a typical large system will require several load-balanced OTP instances that are essentially always busy, so such idle periods will rarely or never exist. Instead, we can create the same batching effect even with a continuous stream of incoming requests. For some period of time, typically a few seconds, all incoming requests will continue to be handed the last finalized snapshot and updates will accumulate to the new buffer. A new snapshot is created at regular intervals, independent of how many requests are arriving at the moment. This approach is also better for sparse reqeusts in that any pause or other overhead associated with snapshot creation is not incurred while the client is waiting, but rather proactively on its own thread. Clients always grab the latest available snapshot with no delay at all. + +### Derived Indexes + +In addition to the primary realtime and scheduled data, OTP maintains many derived indexes containing information that is implied by the primary data, but would be too slow to recompute every time it is needed. This includes for example which routes pass through each particular transit stop, or spatial indexes for fast lookups of which entities lie within bounding boxes or within a certain radius of a given point. As realtime data are applied, entities may be added or moved in ways that invalidate the contents of these derived indexes. + +Currently, there are many places in OTP where a single instance-wide index is maintained to be consistent with the latest realtime snapshot. When long-lived routing requests need to make use of these indexes during or at the end of the routing process, the index may have changed with respect to the unchanging snapshots the requests are working with. In fact, the indexes should be maintained using exactly the same strategy as the rest of the realtime transit data. They should first be managed with a copy-on-write strategy in a writable buffer that is only visible to the single-threaded writer actions, then transferred to an immutable snapshot that is handed off to the reading threads. + ## Full Dataset versus Incremental Messages The GTFS-RT specification includes an "incrementality" field. The specification says this field is unsupported and its behavior is undefined, but in practice people have been using this field since around 2013 in a fairly standardized way. An effort is underway to document its usage and update the standard (see https://github.com/google/transit/issues/84). From 9ffc1c00f38fa1ec357d849ceb8fe08b6c9a65f2 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 23 Feb 2024 20:03:00 +0200 Subject: [PATCH 0650/1688] Update @graphql-codegen/java version --- .../org/opentripplanner/apis/gtfs/generated/package.json | 2 +- .../org/opentripplanner/apis/gtfs/generated/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json b/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json index db865eaa003..6a840640ca9 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/package.json @@ -12,7 +12,7 @@ "dependencies": { "@graphql-codegen/add": "5.0.2", "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/java": "4.0.0", + "@graphql-codegen/java": "4.0.1", "@graphql-codegen/java-resolvers": "3.0.0", "graphql": "16.8.1" } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock b/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock index fffe602db18..77829ecc911 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/yarn.lock @@ -810,10 +810,10 @@ "@graphql-codegen/visitor-plugin-common" "2.13.1" tslib "~2.6.0" -"@graphql-codegen/java@4.0.0": - version "4.0.0" - resolved "https://registry.yarnpkg.com/@graphql-codegen/java/-/java-4.0.0.tgz#245e4403f19c390d5b6a03956558e34c3c4d7848" - integrity sha512-7pxwkgm0eFRDpq6PZx3n2tErBLr1wsG75USvCDnkkoz0145UCErk9GMAEfYgGx1mAm9+oUT+1wjZozjEYWjSow== +"@graphql-codegen/java@4.0.1": + version "4.0.1" + resolved "https://registry.yarnpkg.com/@graphql-codegen/java/-/java-4.0.1.tgz#2f62a7361e702691500c83903c6c6f829496fa5c" + integrity sha512-p51hsOgnuJInSNy+X2Vb+Su9U41iK1xU0YeciVx7JSnOyiT5nQRuDzsjDFvUIL9YZTM+KGbsomaRISOPM6Yq/Q== dependencies: "@graphql-codegen/java-common" "^3.0.0" "@graphql-codegen/plugin-helpers" "^3.0.0" From bd304461d770d37bcde06d51cc54991a7d045d2d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 23 Feb 2024 20:04:25 +0200 Subject: [PATCH 0651/1688] Use @oneOf for optimization input again Setting defaults in the schema isn't really feasible for these --- .../apis/gtfs/generated/GraphQLTypes.java | 16 ++++---- .../opentripplanner/apis/gtfs/schema.graphqls | 38 ++++++------------- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index d2fc0a05e19..aedd564545a 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -592,7 +592,7 @@ public GraphQLCyclingOptimizationInput(Map args) { new GraphQLTriangleCyclingFactorsInput((Map) args.get("triangle")); if (args.get("type") instanceof GraphQLCyclingOptimizationType) { this.type = (GraphQLCyclingOptimizationType) args.get("type"); - } else { + } else if (args.get("type") != null) { this.type = GraphQLCyclingOptimizationType.valueOf((String) args.get("type")); } } @@ -624,7 +624,6 @@ public enum GraphQLCyclingOptimizationType { SAFEST_STREETS, SAFE_STREETS, SHORTEST_DURATION, - TRIANGLE, } public static class GraphQLDepartureRowStoptimesArgs { @@ -1614,7 +1613,7 @@ public GraphQLPlanItineraryFilterInput(Map args) { if (args.get("itineraryFilterDebugProfile") instanceof GraphQLItineraryFilterDebugProfile) { this.itineraryFilterDebugProfile = (GraphQLItineraryFilterDebugProfile) args.get("itineraryFilterDebugProfile"); - } else { + } else if (args.get("itineraryFilterDebugProfile") != null) { this.itineraryFilterDebugProfile = GraphQLItineraryFilterDebugProfile.valueOf( (String) args.get("itineraryFilterDebugProfile") @@ -1907,7 +1906,7 @@ public GraphQLPlanTransitModePreferenceInput(Map args) { new GraphQLTransitModePreferenceCostInput((Map) args.get("cost")); if (args.get("mode") instanceof GraphQLTransitMode) { this.mode = (GraphQLTransitMode) args.get("mode"); - } else { + } else if (args.get("mode") != null) { this.mode = GraphQLTransitMode.valueOf((String) args.get("mode")); } } @@ -2739,7 +2738,7 @@ public GraphQLQueryTypePlanArgs(Map args) { this.omitCanceled = (Boolean) args.get("omitCanceled"); if (args.get("optimize") instanceof GraphQLOptimizeType) { this.optimize = (GraphQLOptimizeType) args.get("optimize"); - } else { + } else if (args.get("optimize") != null) { this.optimize = GraphQLOptimizeType.valueOf((String) args.get("optimize")); } this.pageCursor = (String) args.get("pageCursor"); @@ -4020,7 +4019,7 @@ public GraphQLScooterOptimizationInput(Map args) { new GraphQLTriangleScooterFactorsInput((Map) args.get("triangle")); if (args.get("type") instanceof GraphQLScooterOptimizationType) { this.type = (GraphQLScooterOptimizationType) args.get("type"); - } else { + } else if (args.get("type") != null) { this.type = GraphQLScooterOptimizationType.valueOf((String) args.get("type")); } } @@ -4052,7 +4051,6 @@ public enum GraphQLScooterOptimizationType { SAFEST_STREETS, SAFE_STREETS, SHORTEST_DURATION, - TRIANGLE, } public static class GraphQLScooterPreferencesInput { @@ -4700,12 +4698,12 @@ public GraphQLTransportModeInput(Map args) { if (args != null) { if (args.get("mode") instanceof GraphQLMode) { this.mode = (GraphQLMode) args.get("mode"); - } else { + } else if (args.get("mode") != null) { this.mode = GraphQLMode.valueOf((String) args.get("mode")); } if (args.get("qualifier") instanceof GraphQLQualifier) { this.qualifier = (GraphQLQualifier) args.get("qualifier"); - } else { + } else if (args.get("qualifier") != null) { this.qualifier = GraphQLQualifier.valueOf((String) args.get("qualifier")); } } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 1d73017d7ac..8a5286d24f2 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1760,13 +1760,13 @@ input TriangleCyclingFactorsInput { concerns such as convenience and general cyclist preferences by taking into account road surface etc. """ - safety: Ratio + safety: Ratio! """Relative importance of flat terrain""" - flatness: Ratio + flatness: Ratio! """Relative importance of duration""" - time: Ratio + time: Ratio! } """ @@ -1779,13 +1779,13 @@ input TriangleScooterFactorsInput { concerns such as convenience and general scooter preferences by taking into account road surface etc. """ - safety: Ratio + safety: Ratio! """Relative importance of flat terrain""" - flatness: Ratio + flatness: Ratio! """Relative importance of duration""" - time: Ratio + time: Ratio! } input InputUnpreferred { @@ -2986,15 +2986,14 @@ type BookingInfo { """ What criteria should be used when optimizing a cycling route. """ -input CyclingOptimizationInput { +input CyclingOptimizationInput @oneOf { """ Use one of the predefined optimization types. """ - type: CyclingOptimizationType! + type: CyclingOptimizationType """ - Define optimization by weighing three criteria. This should only be used when - optimization type is `TRIANGLE`. + Define optimization by weighing three criteria. """ triangle: TriangleCyclingFactorsInput } @@ -3031,26 +3030,19 @@ enum CyclingOptimizationType { by taking into account road surface etc. This option was previously called `GREENWAYS`. """ SAFEST_STREETS - - """ - Allows more fine-tuned configuration of how much different optimization criteria are considered in - routing. If this is defined, `triangle` values should be set as well. - """ - TRIANGLE } """ What criteria should be used when optimizing a scooter route. """ -input ScooterOptimizationInput { +input ScooterOptimizationInput @oneOf { """ Use one of the predefined optimization types. """ - type: ScooterOptimizationType! + type: ScooterOptimizationType """ - Define optimization by weighing three criteria. This should only be used when - optimization type is `TRIANGLE`. + Define optimization by weighing three criteria. """ triangle: TriangleScooterFactorsInput } @@ -3091,12 +3083,6 @@ enum ScooterOptimizationType { This option was previously called `GREENWAYS`. """ SAFEST_STREETS - - """ - Allows more fine-tuned configuration of how much different optimization criteria are considered in - routing. If this is defined, `triangle` values should be set as well. - """ - TRIANGLE } """ From 1b2a833f4465d45cb2fc06b0057c2da7b8bbdc53 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 23 Feb 2024 20:05:15 +0200 Subject: [PATCH 0652/1688] Implement cost scalar --- .../apis/gtfs/GraphQLScalars.java | 45 +++++++++++++++++++ .../apis/gtfs/GtfsGraphQLIndex.java | 7 +-- 2 files changed, 46 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 19b511ea7ce..f25598499ef 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -20,6 +20,7 @@ import org.locationtech.jts.geom.Geometry; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; +import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Grams; import org.opentripplanner.framework.time.OffsetDateTimeParser; @@ -170,6 +171,50 @@ private static Optional validateCoordinate(double coordinate) { ) .build(); + public static final GraphQLScalarType costScalar = GraphQLScalarType + .newScalar() + .name("Cost") + .coercing( + new Coercing() { + @Override + public Integer serialize(@Nonnull Object dataFetcherResult) + throws CoercingSerializeException { + if (dataFetcherResult instanceof Integer intValue) { + return intValue; + } else if (dataFetcherResult instanceof Cost costValue) { + return costValue.toSeconds(); + } else { + throw new CoercingSerializeException( + "Cannot serialize object of class %s as a cost".formatted( + dataFetcherResult.getClass().getSimpleName() + ) + ); + } + } + + @Override + public Cost parseValue(Object input) throws CoercingParseValueException { + if (input instanceof Integer intValue) { + return Cost.costOfSeconds(intValue); + } + throw new CoercingParseValueException( + "Expected an integer, got %s %s".formatted(input.getClass().getSimpleName(), input) + ); + } + + @Override + public Cost parseLiteral(Object input) throws CoercingParseLiteralException { + if (input instanceof IntValue intValue) { + return Cost.costOfSeconds(intValue.getValue().intValue()); + } + throw new CoercingParseLiteralException( + "Expected an integer, got: " + input.getClass().getSimpleName() + ); + } + } + ) + .build(); + public static GraphQLScalarType geoJsonScalar = GraphQLScalarType .newScalar() .name("GeoJson") diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 6de8eca9e9c..7cc059bf7f4 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -115,14 +115,9 @@ protected static GraphQLSchema buildSchema() { .scalar(GraphQLScalars.offsetDateTimeScalar) .scalar(GraphQLScalars.ratioScalar) .scalar(GraphQLScalars.coordinateValueScalar) + .scalar(GraphQLScalars.costScalar) .scalar(ExtendedScalars.GraphQLLong) .scalar(ExtendedScalars.Locale) - .scalar( - ExtendedScalars - .newAliasedScalar("Cost") - .aliasedScalar(ExtendedScalars.NonNegativeInt) - .build() - ) .scalar( ExtendedScalars .newAliasedScalar("Speed") From 66d61a45251aa7e9375f6a18e8909f9a497d4c0a Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 23 Feb 2024 20:06:40 +0200 Subject: [PATCH 0653/1688] Implement walk and bicycle preferences --- .../BicycleOptimizationTypeMapper.java | 20 ++ .../mapping/LegacyRouteRequestMapper.java | 32 +-- .../apis/gtfs/mapping/RouteRequestMapper.java | 268 +++++++++++++++++- 3 files changed, 290 insertions(+), 30 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/BicycleOptimizationTypeMapper.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/BicycleOptimizationTypeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/BicycleOptimizationTypeMapper.java new file mode 100644 index 00000000000..93718ae3277 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/BicycleOptimizationTypeMapper.java @@ -0,0 +1,20 @@ +package org.opentripplanner.apis.gtfs.mapping; + +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.routing.api.request.StreetMode; +import org.opentripplanner.routing.core.BicycleOptimizeType; + +/** + * Maps bicycle optimization type from API to internal model. + */ +public class BicycleOptimizationTypeMapper { + + public static BicycleOptimizeType map(GraphQLTypes.GraphQLCyclingOptimizationType type) { + return switch (type) { + case SHORTEST_DURATION -> BicycleOptimizeType.SHORTEST_DURATION; + case FLAT_STREETS -> BicycleOptimizeType.FLAT_STREETS; + case SAFE_STREETS -> BicycleOptimizeType.SAFE_STREETS; + case SAFEST_STREETS -> BicycleOptimizeType.SAFEST_STREETS; + }; + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java index 7355658d89c..cf737e59d92 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java @@ -1,5 +1,8 @@ package org.opentripplanner.apis.gtfs.mapping; +import static org.opentripplanner.apis.gtfs.mapping.RouteRequestMapper.parseNotFilters; +import static org.opentripplanner.apis.gtfs.mapping.RouteRequestMapper.parseSelectFilters; + import graphql.schema.DataFetchingEnvironment; import java.time.Duration; import java.util.Arrays; @@ -7,10 +10,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.api.common.LocationStringParser; import org.opentripplanner.api.parameter.QualifiedMode; @@ -234,33 +235,6 @@ public static RouteRequest toRouteRequest( return request; } - private static Set parseNotFilters(Collection> filters) { - return parseFilters(filters, "not"); - } - - private static Set parseSelectFilters(Collection> filters) { - return parseFilters(filters, "select"); - } - - @Nonnull - private static Set parseFilters(Collection> filters, String key) { - return filters - .stream() - .flatMap(f -> - parseOperation((Collection>>) f.getOrDefault(key, List.of())) - ) - .collect(Collectors.toSet()); - } - - private static Stream parseOperation(Collection>> map) { - return map - .stream() - .flatMap(f -> { - var tags = f.getOrDefault("tags", List.of()); - return tags.stream(); - }); - } - private static boolean hasArgument(Map m, String name) { return m.containsKey(name) && m.get(name) != null; } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index ccd94afcd4d..b698fcac831 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -2,19 +2,28 @@ import graphql.schema.DataFetchingEnvironment; import java.time.Instant; +import java.util.Collection; import java.util.List; import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.Stream; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; +import org.opentripplanner.routing.api.request.preference.BikePreferences; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; +import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; +import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; +import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences; +import org.opentripplanner.routing.api.request.preference.WalkPreferences; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; import org.opentripplanner.transit.model.basic.MainAndSubMode; @@ -28,7 +37,6 @@ public static RouteRequest toRouteRequest( GraphQLRequestContext context ) { RouteRequest request = context.defaultRouteRequest(); - var args = new GraphQLTypes.GraphQLQueryTypePlanConnectionArgs(environment.getArguments()); var dateTime = args.getGraphQLDateTime(); if (dateTime.getGraphQLEarliestDeparture() != null) { @@ -66,6 +74,33 @@ public static RouteRequest toRouteRequest( return request; } + static Set parseNotFilters(Collection> filters) { + return parseFilters(filters, "not"); + } + + static Set parseSelectFilters(Collection> filters) { + return parseFilters(filters, "select"); + } + + @Nonnull + private static Set parseFilters(Collection> filters, String key) { + return filters + .stream() + .flatMap(f -> + parseOperation((Collection>>) f.getOrDefault(key, List.of())) + ) + .collect(Collectors.toSet()); + } + + private static Stream parseOperation(Collection>> map) { + return map + .stream() + .flatMap(f -> { + var tags = f.getOrDefault("tags", List.of()); + return tags.stream(); + }); + } + private static void setPreferences( RoutingPreferences.Builder prefs, RouteRequest request, @@ -77,6 +112,7 @@ private static void setPreferences( setItineraryFilters(filters, args.getGraphQLItineraryFilter()) ); prefs.withTransit(transit -> setTransitPreferences(transit, args, environment)); + setStreetPreferences(prefs, preferenceArgs.getGraphQLStreet(), environment); setAccessibilityPreferences(request, preferenceArgs.getGraphQLAccessibility()); } @@ -126,6 +162,236 @@ private static void setTransitPreferences( } } + private static void setStreetPreferences( + RoutingPreferences.Builder preferences, + GraphQLTypes.GraphQLPlanStreetPreferencesInput args, + DataFetchingEnvironment environment + ) { + if (args != null) { + preferences.withBike(bicycle -> + setBicyclePreferences(bicycle, args.getGraphQLBicycle(), environment) + ); + preferences.withWalk(walk -> setWalkPreferences(walk, args.getGraphQLWalk())); + } + } + + private static void setBicyclePreferences( + BikePreferences.Builder preferences, + GraphQLTypes.GraphQLBicyclePreferencesInput args, + DataFetchingEnvironment environment + ) { + if (args != null) { + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); + } + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + var boardCost = args.getGraphQLBoardCost(); + if (boardCost != null) { + preferences.withBoardCost(boardCost.toSeconds()); + } + preferences.withWalking(walk -> setBicycleWalkPreferences(walk, args.getGraphQLWalk())); + preferences.withParking(parking -> + setBicycleParkingPreferences(parking, args.getGraphQLParking(), environment) + ); + preferences.withRental(rental -> setBicycleRentalPreferences(rental, args.getGraphQLRental()) + ); + setBicycleOptimization(preferences, args.getGraphQLOptimization()); + } + } + + private static void setBicycleWalkPreferences( + VehicleWalkingPreferences.Builder preferences, + GraphQLTypes.GraphQLBicycleWalkPreferencesInput args + ) { + if (args != null) { + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); + } + var mountTime = args.getGraphQLMountDismountTime(); + if (mountTime != null) { + preferences.withMountDismountTime(mountTime); + } + var cost = args.getGraphQLCost(); + if (cost != null) { + var reluctance = cost.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + var mountCost = cost.getGraphQLMountDismountCost(); + if (mountCost != null) { + preferences.withMountDismountCost(mountCost.toSeconds()); + } + } + } + } + + private static void setBicycleParkingPreferences( + VehicleParkingPreferences.Builder preferences, + GraphQLTypes.GraphQLBicycleParkingPreferencesInput args, + DataFetchingEnvironment environment + ) { + if (args != null) { + var unpreferredCost = args.getGraphQLUnpreferredCost(); + if (unpreferredCost != null) { + preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds()); + } + var filters = getParkingFilters(environment, "bicycle"); + preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters)); + preferences.withBannedVehicleParkingTags(parseNotFilters(filters)); + var preferred = getParkingPreferred(environment, "bicycle"); + preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred)); + preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred)); + } + } + + /** + * This methods returns required/banned parking tags of the given type from argument structure: + * preferences.street.type.parking.filters. This methods circumvents a bug in graphql-codegen as + * getting a list of input objects is not possible through using the generated types in + * {@link GraphQLTypes}. + *

      + * TODO this ugliness can be removed when the bug gets fixed + */ + @Nonnull + private static Collection> getParkingFilters( + DataFetchingEnvironment environment, + String type + ) { + var parking = getParking(environment, type); + var filters = parking != null && parking.containsKey("filters") + ? getParking(environment, type).get("filters") + : null; + return filters != null ? (Collection>) filters : List.of(); + } + + /** + * This methods returns preferred/unpreferred parking tags of the given type from argument + * structure: preferences.street.type.parking.preferred. This methods circumvents a bug in + * graphql-codegen as getting a list of input objects is not possible through using the generated + * types in {@link GraphQLTypes}. + *

      + * TODO this ugliness can be removed when the bug gets fixed + */ + @Nonnull + private static Collection> getParkingPreferred( + DataFetchingEnvironment environment, + String type + ) { + var parking = getParking(environment, type); + var preferred = parking != null && parking.containsKey("preferred") + ? getParking(environment, type).get("preferred") + : null; + return preferred != null ? (Collection>) preferred : List.of(); + } + + /** + * This methods returns parking preferences of the given type from argument structure: + * preferences.street.type.parking. This methods circumvents a bug in graphql-codegen as getting a + * list of input objects is not possible through using the generated types in + * {@link GraphQLTypes}. + *

      + * TODO this ugliness can be removed when the bug gets fixed + */ + @Nullable + private static Map getParking(DataFetchingEnvironment environment, String type) { + return ( + (Map) ( + (Map) ( + (Map) ((Map) environment.getArgument("preferences")).get( + "street" + ) + ).get(type) + ).get("parking") + ); + } + + private static void setBicycleRentalPreferences( + VehicleRentalPreferences.Builder preferences, + GraphQLTypes.GraphQLBicycleRentalPreferencesInput args + ) { + if (args != null) { + var allowedNetworks = args.getGraphQLAllowedNetworks(); + if (allowedNetworks != null && allowedNetworks.size() > 0) { + preferences.withBannedNetworks(Set.copyOf(allowedNetworks)); + } + var bannedNetworks = args.getGraphQLBannedNetworks(); + if (bannedNetworks != null && bannedNetworks.size() > 0) { + preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + } + var destinationPolicy = args.getGraphQLDestinationBicyclePolicy(); + if (destinationPolicy != null) { + var allowed = destinationPolicy.getGraphQLAllowKeeping(); + preferences.withAllowArrivingInRentedVehicleAtDestination(Boolean.TRUE.equals(allowed)); + var cost = destinationPolicy.getGraphQLKeepingCost(); + if (cost != null) { + preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds()); + } + } + } + } + + private static void setBicycleOptimization( + BikePreferences.Builder preferences, + GraphQLTypes.GraphQLCyclingOptimizationInput args + ) { + if (args != null) { + var type = args.getGraphQLType(); + var mappedType = type != null ? BicycleOptimizationTypeMapper.map(type) : null; + if (mappedType != null) { + preferences.withOptimizeType(mappedType); + } + var triangleArgs = args.getGraphQLTriangle(); + if (isBicycleTriangleSet(triangleArgs)) { + preferences.withForcedOptimizeTriangle(triangle -> { + triangle + .withSlope(triangleArgs.getGraphQLFlatness()) + .withSafety(triangleArgs.getGraphQLSafety()) + .withTime(triangleArgs.getGraphQLTime()); + }); + } + } + } + + private static boolean isBicycleTriangleSet( + GraphQLTypes.GraphQLTriangleCyclingFactorsInput args + ) { + return ( + args != null && + args.getGraphQLFlatness() != null && + args.getGraphQLSafety() != null && + args.getGraphQLTime() != null + ); + } + + private static void setWalkPreferences( + WalkPreferences.Builder preferences, + GraphQLTypes.GraphQLWalkPreferencesInput args + ) { + if (args != null) { + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); + } + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + var walkSafetyFactor = args.getGraphQLWalkSafetyFactor(); + if (walkSafetyFactor != null) { + preferences.withSafetyFactor(walkSafetyFactor); + } + var boardCost = args.getGraphQLBoardCost(); + if (boardCost != null) { + preferences.withBoardCost(boardCost.toSeconds()); + } + } + } + private static void setAccessibilityPreferences( RouteRequest request, GraphQLTypes.GraphQLAccessibilityPreferencesInput preferenceArgs From f0285f372d66d74ac087795cb922bfe0077ef83b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 24 Feb 2024 22:28:12 +0100 Subject: [PATCH 0654/1688] Add test for tile layer --- .../areastops/AreaStopsLayerBuilderTest.java | 54 +++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java new file mode 100644 index 00000000000..9c7a4530f8c --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java @@ -0,0 +1,54 @@ +package org.opentripplanner.ext.vectortiles.layers.areastops; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.List; +import java.util.Locale; +import org.junit.jupiter.api.Test; +import org.opentripplanner._support.geometry.Polygons; +import org.opentripplanner.ext.vectortiles.VectorTilesResource; +import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.StopModel; +import org.opentripplanner.transit.service.StopModelBuilder; +import org.opentripplanner.transit.service.TransitModel; + +class AreaStopsLayerBuilderTest { + + private static final FeedScopedId ID = new FeedScopedId("FEED", "ID"); + private static final I18NString NAME = I18NString.of("Test stop"); + + private final StopModelBuilder stopModelBuilder = StopModel.of(); + + private final AreaStop AREA_STOP = stopModelBuilder + .areaStop(ID) + .withName(NAME) + .withGeometry(Polygons.BERLIN) + .build(); + + private final TransitModel transitModel = new TransitModel(stopModelBuilder.withAreaStop(AREA_STOP).build(), new Deduplicator()); + record Layer( + String name, + VectorTilesResource.LayerType type, + String mapper, + int maxZoom, + int minZoom, + int cacheMaxSeconds, + double expansionFactor + ) + implements LayerParameters {} + @Test + void getAreaStops() { + + transitModel.index(); + + var layer = new Layer("areaStops", VectorTilesResource.LayerType.AreaStop, "Digitransit", 20, 1, 10, .25); + var subject = new AreaStopsLayerBuilder(new DefaultTransitService(transitModel), layer, Locale.ENGLISH); + var geometries = subject.getGeometries(AREA_STOP.getGeometry().getEnvelopeInternal()); + assertEquals(List.of(Polygons.BERLIN), geometries); + } +} \ No newline at end of file From 40864c32db9a64859e8633237beff64bd675d7c0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 25 Feb 2024 08:47:15 +0100 Subject: [PATCH 0655/1688] Add tests --- .../areastops/AreaStopsLayerBuilderTest.java | 27 +++++++++--- ...DigitransitAreaStopPropertyMapperTest.java | 44 +++++++++++++++++++ .../DigitransitAreaStopPropertyMapper.java | 24 +++++++--- 3 files changed, 83 insertions(+), 12 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapperTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java index 9c7a4530f8c..b86336f867c 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java @@ -30,7 +30,11 @@ class AreaStopsLayerBuilderTest { .withGeometry(Polygons.BERLIN) .build(); - private final TransitModel transitModel = new TransitModel(stopModelBuilder.withAreaStop(AREA_STOP).build(), new Deduplicator()); + private final TransitModel transitModel = new TransitModel( + stopModelBuilder.withAreaStop(AREA_STOP).build(), + new Deduplicator() + ); + record Layer( String name, VectorTilesResource.LayerType type, @@ -41,14 +45,27 @@ record Layer( double expansionFactor ) implements LayerParameters {} + @Test void getAreaStops() { - transitModel.index(); - var layer = new Layer("areaStops", VectorTilesResource.LayerType.AreaStop, "Digitransit", 20, 1, 10, .25); - var subject = new AreaStopsLayerBuilder(new DefaultTransitService(transitModel), layer, Locale.ENGLISH); + var layer = new Layer( + "areaStops", + VectorTilesResource.LayerType.AreaStop, + "Digitransit", + 20, + 1, + 10, + .25 + ); + + var subject = new AreaStopsLayerBuilder( + new DefaultTransitService(transitModel), + layer, + Locale.ENGLISH + ); var geometries = subject.getGeometries(AREA_STOP.getGeometry().getEnvelopeInternal()); assertEquals(List.of(Polygons.BERLIN), geometries); } -} \ No newline at end of file +} diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapperTest.java new file mode 100644 index 00000000000..87e10c0ac22 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapperTest.java @@ -0,0 +1,44 @@ +package org.opentripplanner.ext.vectortiles.layers.areastops; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.inspector.vector.KeyValue.kv; + +import java.util.List; +import java.util.Locale; +import org.junit.jupiter.api.Test; +import org.opentripplanner._support.geometry.Polygons; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.service.StopModel; + +class DigitransitAreaStopPropertyMapperTest { + + private static final TransitModelForTest MODEL = new TransitModelForTest(StopModel.of()); + private static final AreaStop STOP = MODEL.areaStopForTest("123", Polygons.BERLIN); + private static final Route ROUTE_WITH_COLOR = TransitModelForTest + .route("123") + .withColor("ffffff") + .build(); + private static final Route ROUTE_WITHOUT_COLOR = TransitModelForTest.route("456").build(); + + @Test + void map() { + var mapper = new DigitransitAreaStopPropertyMapper( + ignored -> List.of(ROUTE_WITH_COLOR, ROUTE_WITHOUT_COLOR), + Locale.ENGLISH + ); + + var kv = mapper.map(STOP); + + assertEquals( + List.of( + kv("gtfsId", "F:123"), + kv("name", "123"), + kv("code", null), + kv("routeColors", "ffffff") + ), + kv + ); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java index b826c30f38f..fe60a2961cf 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java @@ -3,20 +3,27 @@ import java.util.Collection; import java.util.List; import java.util.Locale; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; public class DigitransitAreaStopPropertyMapper extends PropertyMapper { - private final TransitService transitService; + private final Function> getRoutesForStop; private final I18NStringMapper i18NStringMapper; - private DigitransitAreaStopPropertyMapper(TransitService transitService, Locale locale) { - this.transitService = transitService; + protected DigitransitAreaStopPropertyMapper( + Function> getRoutesForStop, + Locale locale + ) { + this.getRoutesForStop = getRoutesForStop; this.i18NStringMapper = new I18NStringMapper(locale); } @@ -24,17 +31,20 @@ protected static DigitransitAreaStopPropertyMapper create( TransitService transitService, Locale locale ) { - return new DigitransitAreaStopPropertyMapper(transitService, locale); + return new DigitransitAreaStopPropertyMapper(transitService::getRoutesForStop, locale); } @Override protected Collection map(AreaStop stop) { - var routeColors = transitService - .getRoutesForStop(stop) + var routeColors = getRoutesForStop + .apply(stop) .stream() .map(Route::getColor) + .filter(Objects::nonNull) .distinct() - .toList(); + // the MVT spec explicitly doesn't cover how to encode arrays + // https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/ + .collect(Collectors.joining(",")); return List.of( new KeyValue("gtfsId", stop.getId().toString()), new KeyValue("name", i18NStringMapper.mapNonnullToApi(stop.getName())), From 672885a403654a9970a0cf51a0c547f92b061449 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 25 Feb 2024 21:45:36 +0100 Subject: [PATCH 0656/1688] Add documentation --- doc-templates/sandbox/MapboxVectorTilesApi.md | 9 +++++++++ docs/sandbox/MapboxVectorTilesApi.md | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md index dfec1ed085a..b8fe4924c48 100644 --- a/doc-templates/sandbox/MapboxVectorTilesApi.md +++ b/doc-templates/sandbox/MapboxVectorTilesApi.md @@ -49,6 +49,14 @@ The feature must be configured in `router-config.json` as follows "minZoom": 14, "cacheMaxSeconds": 600 }, + { + "name": "areaStops", + "type": "AreaStop", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, { "name": "stations", "type": "Station", @@ -136,6 +144,7 @@ For each layer, the configuration includes: - `name` which is used in the url to fetch tiles, and as the layer name in the vector tiles. - `type` which tells the type of the layer. Currently supported: - `Stop` + - `AreaStop` - `Station` - `VehicleRental`: all rental places: stations and free-floating vehicles - `VehicleRentalVehicle`: free-floating rental vehicles diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index 537f1b800dd..ddc3db90ac4 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -49,6 +49,14 @@ The feature must be configured in `router-config.json` as follows "minZoom": 14, "cacheMaxSeconds": 600 }, + { + "name": "areaStops", + "type": "AreaStop", + "mapper": "Digitransit", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, { "name": "stations", "type": "Station", @@ -136,6 +144,7 @@ For each layer, the configuration includes: - `name` which is used in the url to fetch tiles, and as the layer name in the vector tiles. - `type` which tells the type of the layer. Currently supported: - `Stop` + - `AreaStop` - `Station` - `VehicleRental`: all rental places: stations and free-floating vehicles - `VehicleRentalVehicle`: free-floating rental vehicles From 9d31f8baaa549a80e79cd3ae71e13c7daf355720 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Mon, 26 Feb 2024 10:17:16 +0100 Subject: [PATCH 0657/1688] refactor: Simplified code --- .../openstreetmap/tagmapping/HamburgMapper.java | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java index 789828e975c..5bcd4d23380 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java @@ -16,17 +16,6 @@ public boolean isGeneralNoThroughTraffic(OSMWithTags way) { String access = way.getTag("access"); boolean isNoThroughTraffic = doesTagValueDisallowThroughTraffic(access); - if (isNoThroughTraffic && way.hasTag("customers")) { - String customers = way.getTag("customers"); - return !isAllowedThroughTrafficForHVV(access, customers); - } - - return isNoThroughTraffic; - } - - private boolean isAllowedThroughTrafficForHVV(String access, String customers) { - boolean isAccessCustomers = "customers".equals(access); - boolean isHVV = "HVV".equals(customers); - return isAccessCustomers && isHVV; + return isNoThroughTraffic && !way.isTag("customers", "HVV"); } } From d623a9964bf3b76563138a7a0a648727fcf83856 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 26 Feb 2024 14:49:17 +0200 Subject: [PATCH 0658/1688] Implement scooter preferences --- .../apis/gtfs/mapping/RouteRequestMapper.java | 71 +++++++++++++++++++ .../VehicleOptimizationTypeMapper.java | 9 +++ 2 files changed, 80 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index b166dc981fb..3dc851e4cbd 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -19,6 +19,7 @@ import org.opentripplanner.routing.api.request.preference.BikePreferences; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; +import org.opentripplanner.routing.api.request.preference.ScooterPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; @@ -171,6 +172,7 @@ private static void setStreetPreferences( preferences.withBike(bicycle -> setBicyclePreferences(bicycle, args.getGraphQLBicycle(), environment) ); + preferences.withScooter(scooter -> setScooterPreferences(scooter, args.getGraphQLScooter())); preferences.withWalk(walk -> setWalkPreferences(walk, args.getGraphQLWalk())); } } @@ -368,6 +370,75 @@ private static boolean isBicycleTriangleSet( ); } + private static void setScooterPreferences( + ScooterPreferences.Builder preferences, + GraphQLTypes.GraphQLScooterPreferencesInput args + ) { + if (args != null) { + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); + } + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + preferences.withRental(rental -> setScooterRentalPreferences(rental, args.getGraphQLRental()) + ); + setScooterOptimization(preferences, args.getGraphQLOptimization()); + } + } + + private static void setScooterRentalPreferences( + VehicleRentalPreferences.Builder preferences, + GraphQLTypes.GraphQLScooterRentalPreferencesInput args + ) { + if (args != null) { + var allowedNetworks = args.getGraphQLAllowedNetworks(); + if (allowedNetworks != null && allowedNetworks.size() > 0) { + preferences.withBannedNetworks(Set.copyOf(allowedNetworks)); + } + var bannedNetworks = args.getGraphQLBannedNetworks(); + if (bannedNetworks != null && bannedNetworks.size() > 0) { + preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + } + // TODO validate if station based scooter systems work before adding destination policy + } + } + + private static void setScooterOptimization( + ScooterPreferences.Builder preferences, + GraphQLTypes.GraphQLScooterOptimizationInput args + ) { + if (args != null) { + var type = args.getGraphQLType(); + var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null; + if (mappedType != null) { + preferences.withOptimizeType(mappedType); + } + var triangleArgs = args.getGraphQLTriangle(); + if (isScooterTriangleSet(triangleArgs)) { + preferences.withForcedOptimizeTriangle(triangle -> { + triangle + .withSlope(triangleArgs.getGraphQLFlatness()) + .withSafety(triangleArgs.getGraphQLSafety()) + .withTime(triangleArgs.getGraphQLTime()); + }); + } + } + } + + private static boolean isScooterTriangleSet( + GraphQLTypes.GraphQLTriangleScooterFactorsInput args + ) { + return ( + args != null && + args.getGraphQLFlatness() != null && + args.getGraphQLSafety() != null && + args.getGraphQLTime() != null + ); + } + private static void setWalkPreferences( WalkPreferences.Builder preferences, GraphQLTypes.GraphQLWalkPreferencesInput args diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/VehicleOptimizationTypeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/VehicleOptimizationTypeMapper.java index e784588fd35..f908c400b11 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/VehicleOptimizationTypeMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/VehicleOptimizationTypeMapper.java @@ -16,4 +16,13 @@ public static VehicleRoutingOptimizeType map(GraphQLTypes.GraphQLCyclingOptimiza case SAFEST_STREETS -> VehicleRoutingOptimizeType.SAFEST_STREETS; }; } + + public static VehicleRoutingOptimizeType map(GraphQLTypes.GraphQLScooterOptimizationType type) { + return switch (type) { + case SHORTEST_DURATION -> VehicleRoutingOptimizeType.SHORTEST_DURATION; + case FLAT_STREETS -> VehicleRoutingOptimizeType.FLAT_STREETS; + case SAFE_STREETS -> VehicleRoutingOptimizeType.SAFE_STREETS; + case SAFEST_STREETS -> VehicleRoutingOptimizeType.SAFEST_STREETS; + }; + } } From fec949d71609c3a96855fb1ac3ae02d9bbb8f062 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 26 Feb 2024 15:00:30 +0100 Subject: [PATCH 0659/1688] Fix typo --- .../opentripplanner/ext/vectortiles/VectorTilesResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java index dddf0c2c035..29701ee2307 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java @@ -69,7 +69,7 @@ public Response tileGet( locale, Arrays.asList(requestedLayers.split(",")), serverContext.vectorTileConfig().layers(), - VectorTilesResource::crateLayerBuilder, + VectorTilesResource::createLayerBuilder, serverContext ); } @@ -116,7 +116,7 @@ private List getFeedInfos() { .toList(); } - private static LayerBuilder crateLayerBuilder( + private static LayerBuilder createLayerBuilder( LayerParameters layerParameters, Locale locale, OtpServerRequestContext context From fe052e0536150db48b5c66ede3c6ae6f90060f10 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 26 Feb 2024 16:32:41 +0200 Subject: [PATCH 0660/1688] Temporarily use a non-stable graphql-java release --- pom.xml | 6 +++++- .../transmodel/support/AbortOnTimeoutExecutionStrategy.java | 4 +++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 4bf56201d45..4dc4c3be73e 100644 --- a/pom.xml +++ b/pom.xml @@ -866,7 +866,11 @@ com.graphql-java graphql-java - 21.3 + + 0.0.0-2024-02-23T10-00-36-19a50f7 com.graphql-java diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnTimeoutExecutionStrategy.java b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnTimeoutExecutionStrategy.java index d143d65421c..a925aff0a1d 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnTimeoutExecutionStrategy.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnTimeoutExecutionStrategy.java @@ -1,6 +1,7 @@ package org.opentripplanner.apis.transmodel.support; import graphql.execution.AsyncExecutionStrategy; +import graphql.execution.ExecutionStrategyParameters; import graphql.schema.DataFetchingEnvironment; import java.io.Closeable; import java.util.concurrent.CompletableFuture; @@ -27,13 +28,14 @@ public class AbortOnTimeoutExecutionStrategy extends AsyncExecutionStrategy impl @Override protected CompletableFuture handleFetchingException( DataFetchingEnvironment environment, + ExecutionStrategyParameters params, Throwable e ) { if (e instanceof OTPRequestTimeoutException te) { logTimeoutProgress(); throw te; } - return super.handleFetchingException(environment, e); + return super.handleFetchingException(environment, params, e); } @SuppressWarnings("Convert2MethodRef") From 752f08a12027eaf606ff9522dcff953ec85a8a81 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 26 Feb 2024 16:49:45 +0200 Subject: [PATCH 0661/1688] Implement car preferences --- .../apis/gtfs/mapping/RouteRequestMapper.java | 55 +++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 3dc851e4cbd..a45b88cc889 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -17,6 +17,7 @@ import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.preference.BikePreferences; +import org.opentripplanner.routing.api.request.preference.CarPreferences; import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.routing.api.request.preference.ScooterPreferences; @@ -172,6 +173,7 @@ private static void setStreetPreferences( preferences.withBike(bicycle -> setBicyclePreferences(bicycle, args.getGraphQLBicycle(), environment) ); + preferences.withCar(car -> setCarPreferences(car, args.getGraphQLCar(), environment)); preferences.withScooter(scooter -> setScooterPreferences(scooter, args.getGraphQLScooter())); preferences.withWalk(walk -> setWalkPreferences(walk, args.getGraphQLWalk())); } @@ -370,6 +372,59 @@ private static boolean isBicycleTriangleSet( ); } + private static void setCarPreferences( + CarPreferences.Builder preferences, + GraphQLTypes.GraphQLCarPreferencesInput args, + DataFetchingEnvironment environment + ) { + if (args != null) { + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + preferences.withParking(parking -> + setCarParkingPreferences(parking, args.getGraphQLParking(), environment) + ); + preferences.withRental(rental -> setCarRentalPreferences(rental, args.getGraphQLRental())); + } + } + + private static void setCarParkingPreferences( + VehicleParkingPreferences.Builder preferences, + GraphQLTypes.GraphQLCarParkingPreferencesInput args, + DataFetchingEnvironment environment + ) { + if (args != null) { + var unpreferredCost = args.getGraphQLUnpreferredCost(); + if (unpreferredCost != null) { + preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds()); + } + var filters = getParkingFilters(environment, "car"); + preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters)); + preferences.withBannedVehicleParkingTags(parseNotFilters(filters)); + var preferred = getParkingPreferred(environment, "car"); + preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred)); + preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred)); + } + } + + private static void setCarRentalPreferences( + VehicleRentalPreferences.Builder preferences, + GraphQLTypes.GraphQLCarRentalPreferencesInput args + ) { + if (args != null) { + var allowedNetworks = args.getGraphQLAllowedNetworks(); + if (allowedNetworks != null && allowedNetworks.size() > 0) { + preferences.withBannedNetworks(Set.copyOf(allowedNetworks)); + } + var bannedNetworks = args.getGraphQLBannedNetworks(); + if (bannedNetworks != null && bannedNetworks.size() > 0) { + preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + } + // TODO validate if station based car systems work before adding destination policy + } + } + private static void setScooterPreferences( ScooterPreferences.Builder preferences, GraphQLTypes.GraphQLScooterPreferencesInput args From dd135d114fdc9022c5ccaa6518db9c8dfd9b33ec Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 26 Feb 2024 16:19:53 +0100 Subject: [PATCH 0662/1688] bug: Apply real-time changes to StopPatterns on top of planned data, not earlier updates. --- .../ext/siri/ModifiedTripBuilder.java | 28 +++--- .../ext/siri/mapper/PickDropMapper.java | 23 +++-- .../StopConsolidationModule.java | 2 +- .../lang/MemEfficientArrayBuilder.java | 99 +++++++++++++++++++ .../transit/model/network/StopPattern.java | 67 ++++++++----- .../transit/model/network/TripPattern.java | 22 ++++- .../updater/trip/TimetableSnapshotSource.java | 3 +- .../lang/MemEfficientArrayBuilderTest.java | 91 +++++++++++++++++ .../model/TripPatternTest.java | 8 +- .../netex/mapping/ServiceLinkMapperTest.java | 2 +- .../model/_data/TransitModelForTest.java | 12 +-- 11 files changed, 291 insertions(+), 66 deletions(-) create mode 100644 src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java create mode 100644 src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java diff --git a/src/ext/java/org/opentripplanner/ext/siri/ModifiedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/siri/ModifiedTripBuilder.java index df4509eb2d6..5c21be364a5 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/ModifiedTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/siri/ModifiedTripBuilder.java @@ -98,7 +98,7 @@ public ModifiedTripBuilder( public Result build() { RealTimeTripTimes newTimes = existingTripTimes.copyScheduledTimes(); - StopPattern stopPattern = createStopPattern(pattern, calls, entityResolver); + var stopPattern = createStopPattern(pattern, calls, entityResolver); if (cancellation || stopPattern.isAllStopsNonRoutable()) { LOG.debug("Trip is cancelled"); @@ -220,15 +220,12 @@ static StopPattern createStopPattern( EntityResolver entityResolver ) { int numberOfStops = pattern.numberOfStops(); - var builder = pattern.getStopPattern().mutate(); + var builder = pattern.copyPlannedStopPattern(); Set alreadyVisited = new HashSet<>(); // modify updated stop-times for (int i = 0; i < numberOfStops; i++) { - StopLocation stop = pattern.getStop(i); - builder.stops[i] = stop; - builder.dropoffs[i] = pattern.getAlightType(i); - builder.pickups[i] = pattern.getBoardType(i); + StopLocation stop = builder.stops.original(i); for (CallWrapper call : calls) { if (alreadyVisited.contains(call)) { @@ -241,22 +238,25 @@ static StopPattern createStopPattern( continue; } - int stopIndex = i; - builder.stops[stopIndex] = callStop; + // Used in lambda + final int stopIndex = i; + builder.stops.with(stopIndex, callStop); PickDropMapper - .mapPickUpType(call, builder.pickups[stopIndex]) - .ifPresent(value -> builder.pickups[stopIndex] = value); + .mapPickUpType(call, builder.pickups.original(stopIndex)) + .ifPresent(value -> builder.pickups.with(stopIndex, value)); PickDropMapper - .mapDropOffType(call, builder.dropoffs[stopIndex]) - .ifPresent(value -> builder.dropoffs[stopIndex] = value); + .mapDropOffType(call, builder.dropoffs.original(stopIndex)) + .ifPresent(value -> builder.dropoffs.with(stopIndex, value)); alreadyVisited.add(call); break; } } - - return builder.build(); + var newStopPattern = builder.build(); + return (pattern.isModified() && pattern.getStopPattern().equals(newStopPattern)) + ? pattern.getStopPattern() + : newStopPattern; } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/mapper/PickDropMapper.java b/src/ext/java/org/opentripplanner/ext/siri/mapper/PickDropMapper.java index 4feb4dbbd20..d35696ec35e 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/mapper/PickDropMapper.java +++ b/src/ext/java/org/opentripplanner/ext/siri/mapper/PickDropMapper.java @@ -18,12 +18,12 @@ public class PickDropMapper { * The Siri ArrivalBoardingActivity includes less information than the pick drop type, therefore is it only * changed if routability has changed. * - * @param currentValue The current pick drop value on a stopTime + * @param plannedValue The current pick drop value on a stopTime * @param call The incoming call to be mapped * @return Mapped PickDrop type, empty if routability is not changed. */ - public static Optional mapDropOffType(CallWrapper call, PickDrop currentValue) { - if (shouldBeCancelled(currentValue, call.isCancellation(), call.getArrivalStatus())) { + public static Optional mapDropOffType(CallWrapper call, PickDrop plannedValue) { + if (shouldBeCancelled(plannedValue, call.isCancellation(), call.getArrivalStatus())) { return Optional.of(CANCELLED); } @@ -33,7 +33,7 @@ public static Optional mapDropOffType(CallWrapper call, PickDrop curre } return switch (arrivalBoardingActivityEnumeration) { - case ALIGHTING -> currentValue.isNotRoutable() ? Optional.of(SCHEDULED) : Optional.empty(); + case ALIGHTING -> plannedValue.isNotRoutable() ? Optional.of(SCHEDULED) : Optional.empty(); case NO_ALIGHTING -> Optional.of(NONE); case PASS_THRU -> Optional.of(CANCELLED); }; @@ -45,12 +45,12 @@ public static Optional mapDropOffType(CallWrapper call, PickDrop curre * The Siri DepartureBoardingActivity includes less information than the planned data, therefore is it only * changed if routability has changed. * - * @param currentValue The current pick drop value on a stopTime + * @param plannedValue The current pick drop value on a stopTime * @param call The incoming call to be mapped * @return Mapped PickDrop type, empty if routability is not changed. */ - public static Optional mapPickUpType(CallWrapper call, PickDrop currentValue) { - if (shouldBeCancelled(currentValue, call.isCancellation(), call.getDepartureStatus())) { + public static Optional mapPickUpType(CallWrapper call, PickDrop plannedValue) { + if (shouldBeCancelled(plannedValue, call.isCancellation(), call.getDepartureStatus())) { return Optional.of(CANCELLED); } @@ -60,7 +60,7 @@ public static Optional mapPickUpType(CallWrapper call, PickDrop curren } return switch (departureBoardingActivityEnumeration) { - case BOARDING -> currentValue.isNotRoutable() ? Optional.of(SCHEDULED) : Optional.empty(); + case BOARDING -> plannedValue.isNotRoutable() ? Optional.of(SCHEDULED) : Optional.empty(); case NO_BOARDING -> Optional.of(NONE); case PASS_THRU -> Optional.of(CANCELLED); }; @@ -71,17 +71,16 @@ public static Optional mapPickUpType(CallWrapper call, PickDrop curren * * If the existing PickDrop is non-routable, the value is not changed. * - * @param currentValue The current pick drop value on a stopTime + * @param plannedValue The planned pick drop value on a stopTime * @param isCallCancellation The incoming call cancellation-flag * @param callStatus The incoming call arrival/departure status - * @return */ private static boolean shouldBeCancelled( - PickDrop currentValue, + PickDrop plannedValue, Boolean isCallCancellation, CallStatusEnumeration callStatus ) { - if (currentValue.isNotRoutable()) { + if (plannedValue.isNotRoutable()) { return false; } return TRUE.equals(isCallCancellation) || callStatus == CallStatusEnumeration.CANCELLED; diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java index 91cbe5e1856..100941d88d4 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationModule.java @@ -67,7 +67,7 @@ private TripPattern modifyStopsInPattern( TripPattern pattern, List replacements ) { - var updatedStopPattern = pattern.getStopPattern().mutate(); + var updatedStopPattern = pattern.copyPlannedStopPattern(); replacements.forEach(r -> updatedStopPattern.replaceStop(r.secondary(), r.primary())); return pattern.copy().withStopPattern(updatedStopPattern.build()).build(); } diff --git a/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java b/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java new file mode 100644 index 00000000000..161ac5c5cf5 --- /dev/null +++ b/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java @@ -0,0 +1,99 @@ +package org.opentripplanner.framework.lang; + +import java.util.Arrays; +import java.util.Objects; +import javax.annotation.Nonnull; + +/** + * This array builder is used to minimize creating new objects(arrays). It takes an array as base, + * the original array. A new array is created only if there are differences. + *

      + * A common case is that one original is updated several times. In this case, you can use the + * {@link #build(Object[])}, too also make sure the existing update is reused (deduplicated). + *

      + * Arrays are mutable, so be careful this class helps you reuse the original if it has the same + * values. It protects the original while in scope, but you should only use it if you do not + * modify the original or the result on the outside. This builder does not help protect the arrays. + */ +public final class MemEfficientArrayBuilder { + + private final T[] original; + private T[] array = null; + + private MemEfficientArrayBuilder(@Nonnull T[] original) { + this.original = Objects.requireNonNull(original); + } + + /** + * Create a new array with the same size and values as the original. + */ + public static MemEfficientArrayBuilder of(T[] original) { + return new MemEfficientArrayBuilder<>(original); + } + + /** + * The size of the original and new array under construction. + */ + public int size() { + return original.length; + } + + /** + * Set the value at the given index. + */ + public MemEfficientArrayBuilder with(int index, T value) { + if (isNotModified()) { + if (value == original[index]) { + return this; + } + array = Arrays.copyOf(original, original.length); + } else if (value == array[index]) { + return this; + } + array[index] = value; + return this; + } + + /** + * Return the value at the given index from the original array. + */ + public T original(int index) { + return original[index]; + } + + /** + * Return the new value or fallback to the original value at the given index. + */ + public T getOrOriginal(int index) { + return isNotModified() ? original[index] : array[index]; + } + + /** + * There are no changes compared to the original array so far. + */ + public boolean isNotModified() { + return array == null; + } + + /** + * Build a new array. + *

        + *
      1. If no modifications exist the original array is returned
        2. + *
      2. If the new array equals the candidate the candidate is returned
        3. + *
      3. If not, a new array is returned
        4. + *
      + */ + public T[] build(T[] candidate) { + if (isNotModified()) { + return original; + } + return Arrays.equals(candidate, array) ? candidate : array; + } + + /** + * Create a new array or return the original [if not modified] + */ + public T[] build() { + return isNotModified() ? original : array; + } +} diff --git a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java index fe1bb84cf3f..b5f11d387a9 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java @@ -9,6 +9,8 @@ import java.util.Optional; import java.util.function.Predicate; import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import org.opentripplanner.framework.lang.MemEfficientArrayBuilder; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -81,11 +83,19 @@ public StopPattern(Collection stopTimes) { * For creating StopTimes without StopTime, for example for unit testing. */ public static StopPatternBuilder create(int length) { - return new StopPatternBuilder(new StopPattern(length)); + return new StopPatternBuilder(new StopPattern(length), null); } - public StopPatternBuilder mutate() { - return new StopPatternBuilder(this); + /** + * This has package local access since a StopPattern is a part of a TripPattern. To change it + * use the {@link TripPattern#copyPlannedStopPattern()} method. + */ + StopPatternBuilder mutate() { + return new StopPatternBuilder(this, null); + } + + StopPatternBuilder mutate(StopPattern realTime) { + return new StopPatternBuilder(this, realTime); } public int hashCode() { @@ -300,16 +310,20 @@ boolean sameStations(@Nonnull StopPattern other, int index) { public static class StopPatternBuilder { - public final StopLocation[] stops; - public final PickDrop[] pickups; - public final PickDrop[] dropoffs; + public final MemEfficientArrayBuilder stops; + public final MemEfficientArrayBuilder pickups; + public final MemEfficientArrayBuilder dropoffs; private final StopPattern original; - public StopPatternBuilder(StopPattern original) { - stops = Arrays.copyOf(original.stops, original.stops.length); - pickups = Arrays.copyOf(original.pickups, original.pickups.length); - dropoffs = Arrays.copyOf(original.dropoffs, original.dropoffs.length); + @Nullable + private final StopPattern realTime; + + public StopPatternBuilder(StopPattern original, StopPattern realTime) { + stops = MemEfficientArrayBuilder.of(original.stops); + pickups = MemEfficientArrayBuilder.of(original.pickups); + dropoffs = MemEfficientArrayBuilder.of(original.dropoffs); this.original = original; + this.realTime = realTime; } /** @@ -319,8 +333,8 @@ public StopPatternBuilder(StopPattern original) { */ public StopPatternBuilder cancelStops(List cancelledStopIndices) { cancelledStopIndices.forEach(index -> { - pickups[index] = PickDrop.CANCELLED; - dropoffs[index] = PickDrop.CANCELLED; + pickups.with(index, PickDrop.CANCELLED); + dropoffs.with(index, PickDrop.CANCELLED); }); return this; } @@ -331,28 +345,33 @@ public StopPatternBuilder cancelStops(List cancelledStopIndices) { public StopPatternBuilder replaceStop(FeedScopedId old, StopLocation newStop) { Objects.requireNonNull(old); Objects.requireNonNull(newStop); - for (int i = 0; i < stops.length; i++) { - if (stops[i].getId().equals(old)) { - stops[i] = newStop; + for (int i = 0; i < stops.size(); i++) { + if (stops.getOrOriginal(i).getId().equals(old)) { + stops.with(i, newStop); } } return this; } + /** + * We want to deduplicate this as much as we can, since this is done + * millions of times during real-time updates. + */ public StopPattern build() { - boolean sameStops = Arrays.equals(stops, original.stops); - boolean sameDropoffs = Arrays.equals(dropoffs, original.dropoffs); - boolean samePickups = Arrays.equals(pickups, original.pickups); - - if (sameStops && samePickups && sameDropoffs) { + if (stops.isNotModified() && dropoffs.isNotModified() && pickups.isNotModified()) { return original; } - StopLocation[] newStops = sameStops ? original.stops : stops; - PickDrop[] newPickups = samePickups ? original.pickups : pickups; - PickDrop[] newDropoffs = sameDropoffs ? original.dropoffs : dropoffs; + if (realTime != null) { + var newStopPattern = new StopPattern( + stops.build(realTime.stops), + pickups.build(realTime.pickups), + dropoffs.build(realTime.dropoffs) + ); + return realTime.equals(newStopPattern) ? realTime : newStopPattern; + } - return new StopPattern(newStops, newPickups, newDropoffs); + return new StopPattern(stops.build(), pickups.build(), dropoffs.build()); } } } diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index 7057d9fd56e..a439c9fd4fe 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -159,6 +159,20 @@ public StopPattern getStopPattern() { return stopPattern; } + /** + * Return the "original"/planned stop pattern as a builder. This is used when a realtime-update + * contains a full set of stops/pickup/droppoff for a pattern. This will wipe out any changes + * to the stop-pattern from previous updates. + *

      + * Be aware, if the same update is applied twice, then the first instance will be reused to avoid + * unnecessary objects creation and gc. + */ + public StopPattern.StopPatternBuilder copyPlannedStopPattern() { + return isModified() + ? originalTripPattern.stopPattern.mutate(stopPattern) + : stopPattern.mutate(); + } + public LineString getGeometry() { if (hopGeometries == null || hopGeometries.length == 0) { return null; @@ -346,7 +360,7 @@ public void removeTrips(Predicate removeTrip) { */ public boolean isModifiedFromTripPatternWithEqualStops(TripPattern other) { return ( - originalTripPattern != null && + isModified() && originalTripPattern.equals(other) && getStopPattern().stopsEqual(other.getStopPattern()) ); @@ -394,6 +408,10 @@ public TripPattern getOriginalTripPattern() { return originalTripPattern; } + public boolean isModified() { + return originalTripPattern != null; + } + /** * Returns trip headsign from the scheduled timetables or from the original pattern's scheduled * timetables if this pattern is added by realtime and the stop sequence has not changed apart @@ -481,7 +499,7 @@ public TripPatternBuilder copy() { * is added through a realtime update. The pickup and dropoff values don't have to be the same. */ private boolean containsSameStopsAsOriginalPattern() { - return originalTripPattern != null && getStops().equals(originalTripPattern.getStops()); + return isModified() && getStops().equals(originalTripPattern.getStops()); } /** diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 19db2c7e309..049d4933c51 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -467,8 +467,7 @@ private Result handleScheduledTrip( // If there are skipped stops, we need to change the pattern from the scheduled one if (skippedStopIndices.size() > 0) { StopPattern newStopPattern = pattern - .getStopPattern() - .mutate() + .copyPlannedStopPattern() .cancelStops(skippedStopIndices) .build(); diff --git a/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java b/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java new file mode 100644 index 00000000000..16468868fe7 --- /dev/null +++ b/src/test/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilderTest.java @@ -0,0 +1,91 @@ +package org.opentripplanner.framework.lang; + +import static java.time.DayOfWeek.MONDAY; +import static java.time.DayOfWeek.SATURDAY; +import static java.time.DayOfWeek.SUNDAY; +import static java.time.DayOfWeek.TUESDAY; +import static java.time.DayOfWeek.WEDNESDAY; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.DayOfWeek; +import org.junit.jupiter.api.Test; + +class MemEfficientArrayBuilderTest { + + private final DayOfWeek[] WEEKEND = { SATURDAY, SUNDAY }; + + @Test + void size() { + assertEquals(WEEKEND.length, MemEfficientArrayBuilder.of(WEEKEND).size()); + } + + @Test + void with() { + var smallWeekend = MemEfficientArrayBuilder + .of(WEEKEND) + .with(0, DayOfWeek.THURSDAY) + .with(1, DayOfWeek.FRIDAY) + .build(); + assertArrayEquals(new DayOfWeek[] { DayOfWeek.THURSDAY, DayOfWeek.FRIDAY }, smallWeekend); + } + + @Test + void withOutChange() { + var array = MemEfficientArrayBuilder.of(WEEKEND).build(); + assertSame(WEEKEND, array); + + array = MemEfficientArrayBuilder.of(WEEKEND).with(0, SATURDAY).build(); + assertSame(WEEKEND, array); + + array = MemEfficientArrayBuilder.of(WEEKEND).with(1, SUNDAY).with(0, SATURDAY).build(); + assertSame(WEEKEND, array); + } + + @Test + void getOrOriginal() { + var array = MemEfficientArrayBuilder.of(WEEKEND).with(1, MONDAY); + assertEquals(SATURDAY, array.getOrOriginal(0)); + assertEquals(MONDAY, array.getOrOriginal(1)); + } + + @Test + void original() { + // Verify that modifications do not change original + var array = MemEfficientArrayBuilder.of(WEEKEND).with(1, MONDAY); + assertEquals(SATURDAY, array.original(0)); + assertEquals(SUNDAY, array.original(1)); + } + + @Test + void isNotModified() { + var array = MemEfficientArrayBuilder.of(WEEKEND); + assertTrue(array.isNotModified()); + + array.with(0, SATURDAY).with(1, SUNDAY); + assertTrue(array.isNotModified()); + + array.with(0, MONDAY); + assertFalse(array.isNotModified()); + } + + @Test + void testBuildWithCandidate() { + DayOfWeek[] candidate = { TUESDAY, WEDNESDAY }; + var array = MemEfficientArrayBuilder.of(WEEKEND); + + // Without changes, we expect the original to be retuned + assertSame(WEEKEND, array.build(candidate)); + + // Second value set, but not first + array = MemEfficientArrayBuilder.of(WEEKEND).with(1, WEDNESDAY); + assertArrayEquals(new DayOfWeek[] { SATURDAY, WEDNESDAY }, array.build(candidate)); + + // Same as candidate build + array = MemEfficientArrayBuilder.of(WEEKEND).with(1, WEDNESDAY).with(0, TUESDAY); + assertArrayEquals(candidate, array.build(candidate)); + } +} diff --git a/src/test/java/org/opentripplanner/model/TripPatternTest.java b/src/test/java/org/opentripplanner/model/TripPatternTest.java index 0ea509be36b..bad159eb3cd 100644 --- a/src/test/java/org/opentripplanner/model/TripPatternTest.java +++ b/src/test/java/org/opentripplanner/model/TripPatternTest.java @@ -95,11 +95,11 @@ public TripPattern setupTripPattern( List geometry ) { var builder = StopPattern.create(2); - builder.stops[0] = origin; - builder.stops[1] = destination; + builder.stops.with(0, origin); + builder.stops.with(1, destination); for (int i = 0; i < 2; i++) { - builder.pickups[i] = PickDrop.SCHEDULED; - builder.dropoffs[i] = PickDrop.SCHEDULED; + builder.pickups.with(i, PickDrop.SCHEDULED); + builder.dropoffs.with(i, PickDrop.SCHEDULED); } var stopPattern = builder.build(); diff --git a/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java index afd0604a1e5..aa19a436112 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/ServiceLinkMapperTest.java @@ -124,7 +124,7 @@ void setUpTestData() { new NetexMainAndSubMode(TransitMode.BUS, "UNKNOWN"), Accessibility.NO_INFORMATION ); - stopPatternBuilder.stops[i] = stop; + stopPatternBuilder.stops.with(i, stop); stopsById.add(stop); } diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java index f177415d2fc..e01809d2b9f 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java @@ -221,9 +221,9 @@ public List stopTimesEvery5Minutes(int count, Trip trip, int startTime public StopPattern stopPattern(int numberOfStops) { var builder = StopPattern.create(numberOfStops); for (int i = 0; i < numberOfStops; i++) { - builder.stops[i] = stop("Stop_" + i).build(); - builder.pickups[i] = PickDrop.SCHEDULED; - builder.dropoffs[i] = PickDrop.SCHEDULED; + builder.stops.with(i, stop("Stop_" + i).build()); + builder.pickups.with(i, PickDrop.SCHEDULED); + builder.dropoffs.with(i, PickDrop.SCHEDULED); } return builder.build(); } @@ -231,9 +231,9 @@ public StopPattern stopPattern(int numberOfStops) { public static StopPattern stopPattern(RegularStop... stops) { var builder = StopPattern.create(stops.length); for (int i = 0; i < stops.length; i++) { - builder.stops[i] = stops[i]; - builder.pickups[i] = PickDrop.SCHEDULED; - builder.dropoffs[i] = PickDrop.SCHEDULED; + builder.stops.with(i, stops[i]); + builder.pickups.with(i, PickDrop.SCHEDULED); + builder.dropoffs.with(i, PickDrop.SCHEDULED); } return builder.build(); } From 51b24f9533ba1228aa190fc366fb960f24c68f3f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 26 Feb 2024 19:07:11 +0000 Subject: [PATCH 0663/1688] Update typescript-eslint monorepo to v7 --- client-next/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client-next/package.json b/client-next/package.json index f78e8ebb23d..d0461a508b2 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -35,8 +35,8 @@ "@testing-library/react": "14.1.2", "@types/react": "18.2.21", "@types/react-dom": "18.2.7", - "@typescript-eslint/eslint-plugin": "6.5.0", - "@typescript-eslint/parser": "6.5.0", + "@typescript-eslint/eslint-plugin": "7.1.0", + "@typescript-eslint/parser": "7.1.0", "@vitejs/plugin-react": "4.0.4", "@vitest/coverage-v8": "1.1.3", "eslint": "8.48.0", From ef8608a4f0fd694b14360d319e5426f761f5eb78 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 21 Feb 2024 17:13:15 +0100 Subject: [PATCH 0664/1688] refator: Add penalty to Raptor TestAccessEgress --- .../_data/transit/TestAccessEgress.java | 42 +++++++++++-------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java index ed0702f39d5..caff88515ae 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java +++ b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java @@ -9,7 +9,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; @@ -26,26 +25,26 @@ public class TestAccessEgress implements RaptorAccessEgress { private final int stop; private final int durationInSeconds; - private final int cost; + private final int c1; private final int numberOfRides; private final boolean stopReachedOnBoard; private final boolean free; private final Integer opening; private final Integer closing; private final boolean closed; - private final TimeAndCost penalty; + private final int timePenalty; private TestAccessEgress(Builder builder) { this.stop = builder.stop; this.durationInSeconds = builder.durationInSeconds; - this.cost = builder.cost; this.numberOfRides = builder.numberOfRides; this.stopReachedOnBoard = builder.stopReachedOnBoard; this.free = builder.free; this.opening = builder.opening; this.closing = builder.closing; this.closed = builder.closed; - this.penalty = builder.penalty; + this.timePenalty = builder.timePenalty; + this.c1 = builder.c1; if (free) { assertEquals(0, durationInSeconds); @@ -64,7 +63,7 @@ public static TestAccessEgress free(int stop) { } /** - * @deprecated A stop can not be both free and have a cost - This is not a valid + * @deprecated A stop cannot be both free and have a cost - This is not a valid * access/egress. */ @Deprecated @@ -122,11 +121,12 @@ public static TestAccessEgress flexAndWalk(int stop, int durationInSeconds, int return flexAndWalk(stop, durationInSeconds, nRides, walkCost(durationInSeconds)); } - public static TestAccessEgress car(int stop, int durationInSeconds, TimeAndCost penalty) { + // TODO Fix: imeAndCost penalty is an otp model thing - nothing to do with Raptor + public static TestAccessEgress car(int stop, int durationInSeconds, Object penalty) { return new Builder(stop, durationInSeconds) .withFree() .withCost(durationInSeconds) - .withPenalty(penalty) + //.withPenalty(penalty) .build(); } @@ -162,7 +162,7 @@ public static int walkCost(int durationInSeconds, double reluctance) { *

      * Opening and closing is specified as seconds since the start of "RAPTOR time" to limit the * time periods that the access is traversable, which is repeatead every 24 hours. This allows - * the access to only be traversable between for example 08:00 and 16:00 every day. + * access to only be traversable between given times like 08:00 and 16:00 every day. */ public TestAccessEgress openingHours(int opening, int closing) { return copyOf().withOpeningHours(opening, closing).build(); @@ -188,7 +188,7 @@ public int stop() { @Override public int c1() { - return cost; + return c1; } @Override @@ -196,6 +196,11 @@ public int durationInSeconds() { return durationInSeconds; } + @Override + public int timePenalty() { + return timePenalty; + } + @Override public int earliestDepartureTime(int requestedDepartureTime) { if (!hasOpeningHours()) { @@ -276,19 +281,20 @@ protected static class Builder { int stop; int durationInSeconds; - int cost; + int c1; int numberOfRides = DEFAULT_NUMBER_OF_RIDES; boolean stopReachedOnBoard = STOP_REACHED_ON_FOOT; Integer opening = null; Integer closing = null; private boolean free = false; private boolean closed = false; - private TimeAndCost penalty; + private int timePenalty; Builder(int stop, int durationInSeconds) { this.stop = stop; this.durationInSeconds = durationInSeconds; - this.cost = walkCost(durationInSeconds); + this.c1 = walkCost(durationInSeconds); + this.timePenalty = RaptorConstants.ZERO; } Builder(TestAccessEgress original) { @@ -296,12 +302,12 @@ protected static class Builder { this.stop = original.stop; this.durationInSeconds = original.durationInSeconds; this.stopReachedOnBoard = original.stopReachedOnBoard; - this.cost = original.cost; + this.c1 = original.c1; this.numberOfRides = original.numberOfRides; this.opening = original.opening; this.closing = original.closing; this.closed = original.closed; - this.penalty = original.penalty; + this.timePenalty = original.timePenalty; } Builder withFree() { @@ -311,7 +317,7 @@ Builder withFree() { } Builder withCost(int cost) { - this.cost = cost; + this.c1 = cost; return this; } @@ -325,8 +331,8 @@ Builder stopReachedOnBoard() { return this; } - Builder withPenalty(TimeAndCost penalty) { - this.penalty = penalty; + Builder withPenalty(int timePenalty) { + this.timePenalty = timePenalty; return this; } From 02e5c1e5121bf7470b6030a6750ee9c23d01504a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 21 Feb 2024 17:37:24 +0100 Subject: [PATCH 0665/1688] refactor: Remove the car method from Raptor TestAccessEgress Raptor does not care about mode, so there is no difference between walking and driving; Hence having factory methods for CAR are very confusing. We have methods for walking and flex because they serve as "knob" for what to expect and a name to use in conversation. WALK => (simple, time-shiftable, fixed cost and duration) FLEX => (complex, opening-hours, hasRides, may arrive onBoard, multiple transfers) --- .../raptor/_data/transit/TestAccessEgress.java | 9 --------- .../mapping/RaptorPathToItineraryMapperTest.java | 10 +++++++--- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java index caff88515ae..153fb38718f 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java +++ b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java @@ -121,15 +121,6 @@ public static TestAccessEgress flexAndWalk(int stop, int durationInSeconds, int return flexAndWalk(stop, durationInSeconds, nRides, walkCost(durationInSeconds)); } - // TODO Fix: imeAndCost penalty is an otp model thing - nothing to do with Raptor - public static TestAccessEgress car(int stop, int durationInSeconds, Object penalty) { - return new Builder(stop, durationInSeconds) - .withFree() - .withCost(durationInSeconds) - //.withPenalty(penalty) - .build(); - } - /** Create a flex access arriving at given stop by walking. */ public static TestAccessEgress flexAndWalk( int stop, diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index 2b8f792a455..8c0710d7db6 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -118,11 +118,15 @@ void penalty() { RaptorPathToItineraryMapper mapper = getRaptorPathToItineraryMapper(); var penalty = new TimeAndCost(Duration.ofMinutes(10), Cost.costOfMinutes(10)); - RaptorPath path = createTestTripSchedulePath(getTestTripSchedule()) - .egress(TestAccessEgress.car(2, RaptorCostConverter.toRaptorCost(1000), penalty)); + // TODO - The TestAccessEgress is an internal Raptor test dummy class and is not allowed + // to be used outside raptor and optimized transfers. Also, the Itinerary mapper + // expect the generic type DefaultTripSchedule and not TestTripSchedule - it is pure + // luck that it works.. + // RaptorPath path = createTestTripSchedulePath(getTestTripSchedule()) + // .egress(TestAccessEgress.car(2, RaptorCostConverter.toRaptorCost(1000), penalty)); // Act - var itinerary = mapper.createItinerary(path); + var itinerary = mapper.createItinerary(null); // Assert assertNotNull(itinerary); From 049ebc1e031b0007a3c7110d25e8c9d8813595ec Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 22 Feb 2024 13:09:10 +0100 Subject: [PATCH 0666/1688] refactor: Remove time-penalty for time-limit check at destination for both forward and reverse search. Minor cleanup included. --- .../rangeraptor/context/SearchContext.java | 18 ++- .../path/DestinationArrivalPaths.java | 54 +++++++-- .../path/configure/PathConfig.java | 3 +- .../ForwardRaptorTransitCalculator.java | 44 +------ .../transit/RaptorTransitCalculator.java | 11 +- .../ReverseRaptorTransitCalculator.java | 14 --- .../ForwardRaptorTransitCalculatorTest.java | 114 ++++-------------- .../ReverseRaptorTransitCalculatorTest.java | 9 +- 8 files changed, 95 insertions(+), 172 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java index 1706c879a2c..5b4a6db52e2 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java @@ -68,6 +68,9 @@ public class SearchContext { private final AccessPaths accessPaths; private final LifeCycleSubscriptions lifeCycleSubscriptions = new LifeCycleSubscriptions(); + @Nullable + private final IntPredicate acceptC2AtDestination; + /** Lazy initialized */ private RaptorCostCalculator costCalculator = null; @@ -79,14 +82,14 @@ public SearchContext( RaptorRequest request, RaptorTuningParameters tuningParameters, RaptorTransitDataProvider transit, - IntPredicate acceptC2AtDestination + @Nullable IntPredicate acceptC2AtDestination ) { this.request = request; this.tuningParameters = tuningParameters; this.transit = transit; this.accessPaths = accessPaths(request); this.egressPaths = egressPaths(request); - this.calculator = createCalculator(request, tuningParameters, acceptC2AtDestination); + this.calculator = createCalculator(request, tuningParameters); this.roundTracker = new RoundTracker( nRounds(), @@ -94,6 +97,7 @@ public SearchContext( lifeCycle() ); this.debugFactory = new DebugHandlerFactory<>(debugRequest(request), lifeCycle()); + this.acceptC2AtDestination = acceptC2AtDestination; } public AccessPaths accessPaths() { @@ -171,6 +175,11 @@ public RaptorTimers performanceTimers() { return request.performanceTimers(); } + @Nullable + public IntPredicate acceptC2AtDestination() { + return acceptC2AtDestination; + } + /** Number of stops in transit graph. */ public int nStops() { return transit.numberOfStops(); @@ -268,14 +277,13 @@ static Collection accessOrEgressPaths( */ private static RaptorTransitCalculator createCalculator( RaptorRequest r, - RaptorTuningParameters t, - IntPredicate acceptC2AtDestination + RaptorTuningParameters t ) { var forward = r.searchDirection().isForward(); SearchParams s = r.searchParams(); if (forward) { - return new ForwardRaptorTransitCalculator<>(s, t, acceptC2AtDestination); + return new ForwardRaptorTransitCalculator<>(s, t); } else { return new ReverseRaptorTransitCalculator<>(s, t); } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java index 6ed88da4c89..54565679653 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java @@ -2,6 +2,8 @@ import java.util.ArrayList; import java.util.Collection; +import java.util.Optional; +import java.util.function.IntPredicate; import javax.annotation.Nullable; import org.opentripplanner.framework.lang.OtpNumberFormat; import org.opentripplanner.framework.logging.Throttle; @@ -48,6 +50,9 @@ public class DestinationArrivalPaths { @Nullable private final RaptorCostCalculator costCalculator; + @Nullable + private final IntPredicate acceptC2AtDestination; + private final SlackProvider slackProvider; private final PathMapper pathMapper; private final DebugHandler> debugPathHandler; @@ -59,6 +64,7 @@ public DestinationArrivalPaths( ParetoComparator> paretoComparator, RaptorTransitCalculator transitCalculator, @Nullable RaptorCostCalculator costCalculator, + @Nullable IntPredicate acceptC2AtDestination, SlackProvider slackProvider, PathMapper pathMapper, DebugHandlerFactory debugHandlerFactory, @@ -71,6 +77,7 @@ public DestinationArrivalPaths( this.costCalculator = costCalculator; this.slackProvider = slackProvider; this.pathMapper = pathMapper; + this.acceptC2AtDestination = acceptC2AtDestination; this.debugPathHandler = debugHandlerFactory.debugPathArrival(); this.stopNameResolver = stopNameResolver; lifeCycle.onPrepareForNextRound(round -> clearReachedCurrentRoundFlag()); @@ -84,18 +91,26 @@ public void add(ArrivalView stopArrival, RaptorAccessEgress egressPath) { return; } - var errors = transitCalculator.rejectDestinationArrival(destArrival); - if (!errors.isEmpty()) { - debugReject(destArrival, String.join(" ", errors)); + var errors = new ArrayList(); + + rejectArrivalIfItExceedsTimeLimit(destArrival).ifPresent(errors::add); + rejectArrivalIfC2CheckFails(destArrival).ifPresent(errors::add); + + if (errors.isEmpty()) { + addDestinationArrivalToPaths(destArrival); } else { - RaptorPath path = pathMapper.mapToPath(destArrival); + debugReject(destArrival, String.join(" ", errors)); + } + } - assertGeneralizedCostIsCalculatedCorrectByMapper(destArrival, path); + private void addDestinationArrivalToPaths(DestinationArrival destArrival) { + RaptorPath path = pathMapper.mapToPath(destArrival); - boolean added = paths.add(path); - if (added) { - reachedCurrentRound = true; - } + assertGeneralizedCostIsCalculatedCorrectByMapper(destArrival, path); + + boolean added = paths.add(path); + if (added) { + reachedCurrentRound = true; } } @@ -240,4 +255,25 @@ private String raptorCostsAsString(DestinationArrival destArrival) { // Remove decimals if zero return String.join(" ", arrivalCosts).replaceAll("\\.00", ""); } + + private Optional rejectArrivalIfItExceedsTimeLimit(ArrivalView destArrival) { + int arrivalTime = transitCalculator.minusDuration( + destArrival.arrivalTime(), + destArrival.egressPath().egress().timePenalty() + ); + if (transitCalculator.exceedsTimeLimit(arrivalTime)) { + return Optional.of(transitCalculator.exceedsTimeLimitReason()); + } + return Optional.empty(); + } + + /** + * Test if the c2 value is acceptable, or should be rejected. If ok return nothing, if rejected + * returns the reason for the debug event log. + */ + private Optional rejectArrivalIfC2CheckFails(ArrivalView destArrival) { + return acceptC2AtDestination == null || acceptC2AtDestination.test(destArrival.c2()) + ? Optional.empty() + : Optional.of("C2 value rejected: " + destArrival.c2() + "."); + } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java index 89b2f447ca4..673c83e6b78 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/configure/PathConfig.java @@ -26,7 +26,7 @@ /** * This class is responsible for creating a a result collector - the set of paths. *

      - * This class have REQUEST scope, so a new instance should be created for each new request/travel + * This class has REQUEST scope, so a new instance should be created for each new request/travel * search. * * @param The TripSchedule type defined by the user of the raptor API. @@ -57,6 +57,7 @@ public DestinationArrivalPaths createDestArrivalPaths( createPathParetoComparator(costConfig, c2Comp), ctx.calculator(), costConfig.includeC1() ? ctx.costCalculator() : null, + ctx.acceptC2AtDestination(), ctx.slackProvider(), createPathMapper(costConfig.includeC1()), ctx.debugFactory(), diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java index 528c8ca276a..5c50aa030f5 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculator.java @@ -1,11 +1,6 @@ package org.opentripplanner.raptor.rangeraptor.transit; -import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; -import java.util.Optional; -import java.util.function.IntPredicate; -import javax.annotation.Nullable; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransfer; @@ -13,7 +8,6 @@ import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.api.request.SearchParams; -import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.spi.RaptorConstrainedBoardingSearch; import org.opentripplanner.raptor.spi.RaptorTimeTable; @@ -30,20 +24,12 @@ public final class ForwardRaptorTransitCalculator private final int latestAcceptableArrivalTime; private final int iterationStep; - @Nullable - private final IntPredicate acceptC2AtDestination; - - public ForwardRaptorTransitCalculator( - SearchParams s, - RaptorTuningParameters t, - @Nullable IntPredicate acceptC2AtDestination - ) { + public ForwardRaptorTransitCalculator(SearchParams s, RaptorTuningParameters t) { this( s.earliestDepartureTime(), s.searchWindowInSeconds(), s.latestArrivalTime(), - t.iterationDepartureStepInSeconds(), - acceptC2AtDestination + t.iterationDepartureStepInSeconds() ); } @@ -51,8 +37,7 @@ public ForwardRaptorTransitCalculator( int earliestDepartureTime, int searchWindowInSeconds, int latestAcceptableArrivalTime, - int iterationStep, - IntPredicate acceptC2AtDestination + int iterationStep ) { this.earliestDepartureTime = earliestDepartureTime; this.searchWindowInSeconds = searchWindowInSeconds; @@ -61,19 +46,6 @@ public ForwardRaptorTransitCalculator( ? unreachedTime() : latestAcceptableArrivalTime; this.iterationStep = iterationStep; - this.acceptC2AtDestination = acceptC2AtDestination; - } - - @Override - public Collection rejectDestinationArrival(ArrivalView destArrival) { - var errors = new ArrayList(); - - if (exceedsTimeLimit(destArrival.arrivalTime())) { - errors.add(exceedsTimeLimitReason()); - } - rejectC2AtDestination(destArrival).ifPresent(errors::add); - - return errors; } @Override @@ -141,14 +113,4 @@ public RaptorTripScheduleSearch createTripSearch(RaptorTimeTable timeTable public RaptorTripScheduleSearch createExactTripSearch(RaptorTimeTable pattern) { return new TripScheduleExactMatchSearch<>(createTripSearch(pattern), this, iterationStep); } - - /** - * Test if the c2 value is acceptable, or should be rejected. If ok return nothing, if rejected - * return the reason for the debug event log. - */ - private Optional rejectC2AtDestination(ArrivalView destArrival) { - return acceptC2AtDestination == null || acceptC2AtDestination.test(destArrival.c2()) - ? Optional.empty() - : Optional.of("C2 value rejected: " + destArrival.c2() + "."); - } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java index 3e8236d6cd8..2fce438b858 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java @@ -3,13 +3,11 @@ import static org.opentripplanner.framework.time.TimeUtils.hm2time; import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; -import java.util.Collection; import java.util.Iterator; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTransfer; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; -import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.spi.RaptorConstrainedBoardingSearch; import org.opentripplanner.raptor.spi.RaptorTimeTable; @@ -60,17 +58,10 @@ static RaptorTransitCalculator testDummyCalcul boolean forward ) { return forward - ? new ForwardRaptorTransitCalculator<>(hm2time(8, 0), 2 * 60 * 60, TIME_NOT_SET, 60, null) + ? new ForwardRaptorTransitCalculator<>(hm2time(8, 0), 2 * 60 * 60, TIME_NOT_SET, 60) : new ReverseRaptorTransitCalculator<>(hm2time(8, 0), 2 * 60 * 60, TIME_NOT_SET, 60); } - /** - * Check if the destination arrival is a valid/optimal result. if ok, return an empty list, if - * not return a list of reject reasons. The reject messages are used to produce reject events in - * the debug trace log. - */ - Collection rejectDestinationArrival(ArrivalView destArrival); - /** * Stop the search when the time exceeds the latest-acceptable-arrival-time. In a reverse search * this is the earliest acceptable departure time. diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java index 867e04ef680..09ded9fb4b7 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculator.java @@ -1,7 +1,5 @@ package org.opentripplanner.raptor.rangeraptor.transit; -import java.util.ArrayList; -import java.util.Collection; import java.util.Iterator; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.raptor.api.model.RaptorConstants; @@ -10,7 +8,6 @@ import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.api.request.RaptorTuningParameters; import org.opentripplanner.raptor.api.request.SearchParams; -import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.spi.RaptorConstrainedBoardingSearch; import org.opentripplanner.raptor.spi.RaptorTimeTable; @@ -53,17 +50,6 @@ public ReverseRaptorTransitCalculator(SearchParams s, RaptorTuningParameters t) this.iterationStep = iterationStep; } - @Override - public Collection rejectDestinationArrival(ArrivalView destArrival) { - var errors = new ArrayList(); - - if (exceedsTimeLimit(destArrival.arrivalTime())) { - errors.add(exceedsTimeLimitReason()); - } - - return errors; - } - @Override public boolean exceedsTimeLimit(int time) { return isBefore(earliestAcceptableDepartureTime, time); diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java index 0a992cc412d..ad7a269b856 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ForwardRaptorTransitCalculatorTest.java @@ -8,77 +8,41 @@ import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_A; import static org.opentripplanner.raptor._data.RaptorTestConstants.STOP_B; -import javax.annotation.Nullable; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.lang.IntBox; +import org.opentripplanner.raptor._data.transit.TestAccessEgress; import org.opentripplanner.raptor._data.transit.TestTransfer; import org.opentripplanner.raptor._data.transit.TestTransitData; import org.opentripplanner.raptor._data.transit.TestTripSchedule; -import org.opentripplanner.raptor.api.model.PathLegType; import org.opentripplanner.raptor.api.model.RaptorConstants; -import org.opentripplanner.raptor.api.view.ArrivalView; import org.opentripplanner.raptor.spi.IntIterator; public class ForwardRaptorTransitCalculatorTest { + private static final int BIG_TIME = hm2time(100, 0); private int earliestDepartureTime = hm2time(8, 0); private int searchWindowSizeInSeconds = 2 * 60 * 60; private int latestAcceptableArrivalTime = hm2time(16, 0); private int iterationStep = 60; - private int desiredC2 = 0; @Test public void exceedsTimeLimit() { latestAcceptableArrivalTime = 1200; var subject = create(); - assertTrue(subject.rejectDestinationArrival(new TestArrivalView(desiredC2, 0)).isEmpty()); - assertTrue( - subject - .rejectDestinationArrival(new TestArrivalView(desiredC2, latestAcceptableArrivalTime)) - .isEmpty() - ); - assertFalse( - subject - .rejectDestinationArrival(new TestArrivalView(desiredC2, latestAcceptableArrivalTime + 1)) - .isEmpty() - ); + assertFalse(subject.exceedsTimeLimit(latestAcceptableArrivalTime)); + assertTrue(subject.exceedsTimeLimit(latestAcceptableArrivalTime + 1)); latestAcceptableArrivalTime = hm2time(16, 0); - subject = create(); - var errors = subject.rejectDestinationArrival( - new TestArrivalView(desiredC2, latestAcceptableArrivalTime + 1) - ); - assertEquals(1, errors.size()); + assertEquals( "The arrival time exceeds the time limit, arrive to late: 16:00:00.", - errors.stream().findFirst().get() + create().exceedsTimeLimitReason() ); latestAcceptableArrivalTime = RaptorConstants.TIME_NOT_SET; subject = create(); - assertTrue(subject.rejectDestinationArrival(new TestArrivalView(desiredC2, 0)).isEmpty()); - assertTrue( - subject.rejectDestinationArrival(new TestArrivalView(desiredC2, 2_000_000_000)).isEmpty() - ); - } - - @Test - public void rejectC2AtDestination() { - desiredC2 = 1; - var subject = create(); - - var errors = subject.rejectDestinationArrival( - new TestArrivalView(desiredC2, latestAcceptableArrivalTime) - ); - assertTrue(errors.isEmpty()); - - errors = - subject.rejectDestinationArrival( - new TestArrivalView(desiredC2 + 1, latestAcceptableArrivalTime) - ); - assertEquals(1, errors.size()); - assertEquals("C2 value rejected: 2.", errors.stream().findFirst().get()); + assertFalse(subject.exceedsTimeLimit(-BIG_TIME)); + assertFalse(subject.exceedsTimeLimit(BIG_TIME)); } @Test @@ -122,13 +86,28 @@ public void getTransfers() { assertFalse(subject.getTransfers(transitData, STOP_B).hasNext()); } + @Test + void timeMinusPenalty() { + var subject = create(); + var walk200s = TestAccessEgress.walk(15, 200); + int time = 1000; + int penalty = 300; + int expectedTimeWithoutPenalty = time - penalty; + + assertEquals(time, subject.timeMinusPenalty(time, walk200s)); + assertEquals( + expectedTimeWithoutPenalty, + subject.timeMinusPenalty(time, walk200s.withTimePenalty(penalty)) + ); + } + private RaptorTransitCalculator create() { return new ForwardRaptorTransitCalculator<>( earliestDepartureTime, searchWindowSizeInSeconds, latestAcceptableArrivalTime, - iterationStep, - c2 -> c2 == desiredC2 + iterationStep + //c2 -> c2 == desiredC2 ); } @@ -139,47 +118,4 @@ private void assertIntIterator(IntIterator it, int... values) { } assertFalse(it.hasNext()); } - - public record TestArrivalView(int c2, int arrivalTime) implements ArrivalView { - @Override - public int stop() { - return c2; - } - - @Override - public int round() { - return 0; - } - - @Override - public int arrivalTime() { - return arrivalTime; - } - - @Override - public int c1() { - return 0; - } - - @Override - public int c2() { - return c2; - } - - @Nullable - @Override - public ArrivalView previous() { - return null; - } - - @Override - public PathLegType arrivedBy() { - return null; - } - - @Override - public boolean arrivedOnBoard() { - return false; - } - } } diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java index 898a11fafa7..3afecaf3e81 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/ReverseRaptorTransitCalculatorTest.java @@ -12,10 +12,13 @@ import org.opentripplanner.raptor._data.transit.TestTransfer; import org.opentripplanner.raptor._data.transit.TestTransitData; import org.opentripplanner.raptor._data.transit.TestTripSchedule; +import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.spi.IntIterator; public class ReverseRaptorTransitCalculatorTest { + private static final int BIG_TIME = hm2time(100, 0); + private int latestArrivalTime = hm2time(8, 0); private int searchWindowSizeInSeconds = 2 * 60 * 60; private int earliestAcceptableDepartureTime = hm2time(16, 0); @@ -37,10 +40,10 @@ public void exceedsTimeLimit() { create().exceedsTimeLimitReason() ); - earliestAcceptableDepartureTime = -1; + earliestAcceptableDepartureTime = RaptorConstants.TIME_NOT_SET; subject = create(); - assertFalse(subject.exceedsTimeLimit(0)); - assertFalse(subject.exceedsTimeLimit(2_000_000_000)); + assertFalse(subject.exceedsTimeLimit(-BIG_TIME)); + assertFalse(subject.exceedsTimeLimit(BIG_TIME)); } @Test From 770bbc1f97f836939f6415e0406b7fba39b76b0e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 23 Feb 2024 19:13:12 +0100 Subject: [PATCH 0667/1688] refactor: Use TIME_NOT_SET and not ZERO when time-penalty does not exist. --- .../api/model/AbstractAccessEgressDecorator.java | 10 ++++++++++ .../raptor/api/model/RaptorAccessEgress.java | 8 ++++++-- .../raptor/rangeraptor/DefaultRangeRaptorWorker.java | 3 ++- .../rangeraptor/path/DestinationArrivalPaths.java | 6 ++---- .../raptor/rangeraptor/transit/AccessPaths.java | 8 +++++++- .../raptor/rangeraptor/transit/EgressPaths.java | 2 +- .../rangeraptor/transit/RaptorTransitCalculator.java | 8 ++++++++ .../raptoradapter/transit/DefaultAccessEgress.java | 8 +++++++- .../raptor/_data/transit/TestAccessEgress.java | 8 ++++++-- .../raptoradapter/transit/DefaultAccessEgressTest.java | 3 ++- 10 files changed, 51 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java index d01c41dc0ca..35af442576c 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java @@ -40,6 +40,11 @@ public int timePenalty() { return delegate.timePenalty(); } + @Override + public boolean hasTimePenalty() { + return delegate.hasTimePenalty(); + } + @Override public int earliestDepartureTime(int requestedDepartureTime) { return delegate.earliestDepartureTime(requestedDepartureTime); @@ -96,6 +101,11 @@ public String asString(boolean includeStop, boolean includeCost, @Nullable Strin return delegate.asString(includeStop, includeCost, summary); } + @Override + public String toString() { + return delegate.toString(); + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java index 894213315cf..6edd6bfd89c 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java @@ -68,10 +68,14 @@ public interface RaptorAccessEgress { * cost. Many optimal access paths have an inpact on performance as vell. *

      * - * The unit is seconds and the default value is 0 seconds. + * The unit is seconds and the default value is {@link RaptorConstants#TIME_NOT_SET}. */ default int timePenalty() { - return RaptorConstants.ZERO; + return RaptorConstants.TIME_NOT_SET; + } + + default boolean hasTimePenalty() { + return timePenalty() != RaptorConstants.TIME_NOT_SET; } /* TIME-DEPENDENT ACCESS/TRANSFER/EGRESS */ diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java index a05d6aa832f..d15e1ca6ca8 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java @@ -278,7 +278,8 @@ private void addAccessPaths(Collection accessPaths) { // Access must be available after the iteration departure time if (departureTime != RaptorConstants.TIME_NOT_SET) { - transitWorker.setAccessToStop(it, departureTime - it.timePenalty()); + // TODO TP - Is this ok? + transitWorker.setAccessToStop(it, calculator.timeMinusPenalty(departureTime, it)); } } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java index 54565679653..f5e67d593ca 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/DestinationArrivalPaths.java @@ -257,10 +257,8 @@ private String raptorCostsAsString(DestinationArrival destArrival) { } private Optional rejectArrivalIfItExceedsTimeLimit(ArrivalView destArrival) { - int arrivalTime = transitCalculator.minusDuration( - destArrival.arrivalTime(), - destArrival.egressPath().egress().timePenalty() - ); + var egress = destArrival.egressPath().egress(); + int arrivalTime = transitCalculator.timeMinusPenalty(destArrival.arrivalTime(), egress); if (transitCalculator.exceedsTimeLimit(arrivalTime)) { return Optional.of(transitCalculator.exceedsTimeLimitReason()); } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 2e8bd01049a..0e616e60ed1 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -9,12 +9,14 @@ import java.util.Collection; import java.util.List; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; +import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.request.RaptorProfile; public class AccessPaths { private final TIntObjectMap> arrivedOnStreetByNumOfRides; private final TIntObjectMap> arrivedOnBoardByNumOfRides; + private int timePenaltyLimit = RaptorConstants.TIME_NOT_SET; private AccessPaths( TIntObjectMap> arrivedOnStreetByNumOfRides, @@ -84,7 +86,7 @@ public int calculateMaxNumberOfRides() { private static List decorateWithTimePenaltyLogic( Collection paths ) { - return paths.stream().map(it -> it.timePenalty() > 0 ? new AccessWithPenalty(it) : it).toList(); + return paths.stream().map(it -> it.hasTimePenalty() ? new AccessWithPenalty(it) : it).toList(); } /** Raptor uses this information to optimize boarding of the first trip */ @@ -95,6 +97,10 @@ public boolean hasTimeDependentAccess() { ); } + private boolean hasTimePenalty() { + return timePenaltyLimit != RaptorConstants.TIME_NOT_SET; + } + private static boolean hasTimeDependentAccess(TIntObjectMap> map) { for (List list : map.valueCollection()) { if (list.stream().anyMatch(RaptorAccessEgress::hasOpeningHours)) { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java index 19c77901af0..8f1340552a8 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressPaths.java @@ -82,7 +82,7 @@ public int[] egressesWitchStartByARide() { private static List decorateWithTimePenaltyLogic( Collection paths ) { - return paths.stream().map(it -> it.timePenalty() > 0 ? new EgressWithPenalty(it) : it).toList(); + return paths.stream().map(it -> it.hasTimePenalty() ? new EgressWithPenalty(it) : it).toList(); } private int[] filterPathsAndGetStops(Predicate filter) { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java index 2fce438b858..7a309217f0a 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java @@ -147,4 +147,12 @@ Iterator getTransfers( RaptorTransitDataProvider transitDataProvider, int fromStop ); + + default int timePlusPenalty(int time, RaptorAccessEgress accessEgress) { + return accessEgress.hasTimePenalty() ? plusDuration(time, accessEgress.timePenalty()) : time; + } + + default int timeMinusPenalty(int time, RaptorAccessEgress accessEgress) { + return accessEgress.hasTimePenalty() ? minusDuration(time, accessEgress.timePenalty()) : time; + } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java index 67f56d0b4ad..35987c0af7d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java @@ -3,6 +3,7 @@ import java.util.Objects; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; +import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; import org.opentripplanner.street.search.state.State; @@ -14,6 +15,9 @@ public class DefaultAccessEgress implements RaptorAccessEgress { private final int stop; private final int durationInSeconds; private final int generalizedCost; + private final int timePenalty; + + /** Keep this to be able to map back to itinerary */ private final TimeAndCost penalty; /** @@ -26,6 +30,7 @@ public DefaultAccessEgress(int stop, State lastState) { this.durationInSeconds = (int) lastState.getElapsedTimeSeconds(); this.generalizedCost = RaptorCostConverter.toRaptorCost(lastState.getWeight()); this.lastState = lastState; + this.timePenalty = RaptorConstants.TIME_NOT_SET; this.penalty = TimeAndCost.ZERO; } @@ -39,6 +44,7 @@ protected DefaultAccessEgress(DefaultAccessEgress other, TimeAndCost penalty) { // association between the time-penalty and the cost. So, we add the time-penalty cost to // the generalized cost here. In logic later on, we will remove it. this.generalizedCost = other.c1() + penalty.cost().toCentiSeconds(); + this.timePenalty = penalty.isZero() ? RaptorConstants.TIME_NOT_SET : penalty.timeInSeconds(); this.penalty = penalty; this.lastState = other.getLastState(); } @@ -59,7 +65,7 @@ public int durationInSeconds() { @Override public int timePenalty() { - return penalty.timeInSeconds(); + return timePenalty; } @Override diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java index 153fb38718f..f9357380b3d 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java +++ b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java @@ -168,6 +168,10 @@ public TestAccessEgress openingHoursClosed() { return copyOf().withClosed().build(); } + public TestAccessEgress withTimePenalty(int timePenalty) { + return this.copyOf().withTimePenalty(timePenalty).build(); + } + public Builder copyOf() { return new Builder(this); } @@ -285,7 +289,7 @@ protected static class Builder { this.stop = stop; this.durationInSeconds = durationInSeconds; this.c1 = walkCost(durationInSeconds); - this.timePenalty = RaptorConstants.ZERO; + this.timePenalty = RaptorConstants.TIME_NOT_SET; } Builder(TestAccessEgress original) { @@ -322,7 +326,7 @@ Builder stopReachedOnBoard() { return this; } - Builder withPenalty(int timePenalty) { + Builder withTimePenalty(int timePenalty) { this.timePenalty = timePenalty; return this; } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java index 0c9f29bc8a4..92ed7aa4825 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; +import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.TestStateBuilder; @@ -39,7 +40,7 @@ void durationInSeconds() { @Test void timePenalty() { int expected = (int) TIME_PENALTY.toSeconds(); - assertEquals(0, subject.timePenalty()); + assertEquals(RaptorConstants.TIME_NOT_SET, subject.timePenalty()); assertEquals(expected, subjectWithPenalty.timePenalty()); } From 5367130d4ca171c7eea55befaf3de932c849520c Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 26 Feb 2024 19:21:43 +0100 Subject: [PATCH 0668/1688] refactor: Add empty IntIterators --- .../java/org/opentripplanner/raptor/util/IntIterators.java | 7 +++++++ .../org/opentripplanner/raptor/util/IntIteratorsTest.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/main/java/org/opentripplanner/raptor/util/IntIterators.java b/src/main/java/org/opentripplanner/raptor/util/IntIterators.java index 3ab604669d7..cb8c6c38787 100644 --- a/src/main/java/org/opentripplanner/raptor/util/IntIterators.java +++ b/src/main/java/org/opentripplanner/raptor/util/IntIterators.java @@ -117,4 +117,11 @@ public boolean hasNext() { public static IntIterator singleValueIterator(final int value) { return intIncIterator(value, value + 1); } + + /** + * Return an empty iterator. All calls to {@link IntIterator#hasNext()} will return {@code false}. + */ + public static IntIterator empty() { + return intIncIterator(0, 0); + } } diff --git a/src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java b/src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java index ea9785dea26..598287164c2 100644 --- a/src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java +++ b/src/test/java/org/opentripplanner/raptor/util/IntIteratorsTest.java @@ -84,6 +84,11 @@ public void testSingleValueIterator() { assertEquals("[3]", toString(singleValueIterator(3))); } + @Test + public void testEmptyIterator() { + assertEquals("[]", toString(IntIterators.empty())); + } + private static String toString(IntIterator it) { StringBuilder buf = new StringBuilder(); boolean empty = true; From fe4c0044773f8d750d2e4e069ff585ca088b70a4 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 26 Feb 2024 21:05:27 +0100 Subject: [PATCH 0669/1688] refactor: Move SECONDS_IN_A_DAY RaptorConstants to test scope --- .../raptor/api/model/RaptorAccessEgress.java | 4 ++-- .../raptor/api/model/RaptorConstants.java | 9 --------- .../raptor/_data/RaptorTestConstants.java | 7 +++++++ .../raptor/_data/transit/TestAccessEgress.java | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java index 6edd6bfd89c..a1764d42374 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java @@ -1,8 +1,8 @@ package org.opentripplanner.raptor.api.model; -import static org.opentripplanner.raptor.api.model.RaptorConstants.SECONDS_IN_A_DAY; import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; +import java.time.temporal.ChronoUnit; import javax.annotation.Nullable; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.TimeUtils; @@ -123,7 +123,7 @@ default String openingHoursToString() { // assumes the access/egress is a continuous period without gaps withing 24 hours from the // opening. We ignore the access/egress duration. This is ok for test, debugging and logging. int edt = earliestDepartureTime(0); - int lat = latestArrivalTime(edt + SECONDS_IN_A_DAY); + int lat = latestArrivalTime(edt + (int) ChronoUnit.DAYS.getDuration().toSeconds()); if (edt == TIME_NOT_SET || lat == TIME_NOT_SET) { return "closed"; diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java index 5257c49fa35..983e3c75155 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java @@ -1,7 +1,5 @@ package org.opentripplanner.raptor.api.model; -import static java.time.temporal.ChronoUnit.DAYS; - /** * Raptor relies on {@code int} operation to be fast, so in many cases we use a "magic number" to * represent state. In general "magic numbers" should be avoided, at least encapsulated - but in @@ -70,11 +68,4 @@ public class RaptorConstants { /** Alias for {@link #UNREACHED_HIGH} */ public static final int N_TRANSFERS_UNREACHED = UNREACHED_HIGH; - - /** - * There is 86400 seconds in a "normal" day(24 * 60 * 60). This is used for testing, logging - * and debugging, but do not base any important logic on this. A day with changes in - * daylight-saving-time does not have this amount of seconds. - */ - public static final int SECONDS_IN_A_DAY = (int) DAYS.getDuration().toSeconds(); } diff --git a/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java b/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java index d293f7326e6..d1398ea05cd 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java +++ b/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java @@ -27,6 +27,13 @@ public interface RaptorTestConstants { int D20m = durationInSeconds("20m"); int D24h = durationInSeconds("24h"); + /** + * There are 86400 seconds in a "normal" day(24 * 60 * 60). This is used for testing, logging + * and debugging, but does not base any important logic on this. A day with changes in + * daylight-saving-time does not have this number of seconds. + */ + int SECONDS_IN_A_DAY = (int) D24h; + // Time constants, all values are in seconds int T00_00 = hm2time(0, 0); int T00_01 = hm2time(0, 1); diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java index f9357380b3d..8047ec0d4cb 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java +++ b/src/test/java/org/opentripplanner/raptor/_data/transit/TestAccessEgress.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.raptor.api.model.RaptorConstants.SECONDS_IN_A_DAY; +import static org.opentripplanner.raptor._data.RaptorTestConstants.SECONDS_IN_A_DAY; import static org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter.toRaptorCost; import java.util.ArrayList; From a8d7810ab271ed4a26e51d7ea2704b59df481b98 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 26 Feb 2024 21:28:15 +0100 Subject: [PATCH 0670/1688] feature: Do proper time-shift in AccessWithPenalty and EgressWithPenalty This check for TIME_NOT_SET and add unit tests --- .../transit/AccessWithPenalty.java | 7 +- .../transit/EgressWithPenalty.java | 7 +- .../transit/AccessWithPenaltyTest.java | 79 ++++++++++++++++++ .../transit/EgressWithPenaltyTest.java | 82 +++++++++++++++++++ 4 files changed, 173 insertions(+), 2 deletions(-) create mode 100644 src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java create mode 100644 src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java index 1226d56c028..ef17f0b7b68 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java @@ -2,6 +2,7 @@ import org.opentripplanner.raptor.api.model.AbstractAccessEgressDecorator; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; +import org.opentripplanner.raptor.api.model.RaptorConstants; /** * This decorator will add the time penalty to the duration of the access and adjust the @@ -22,7 +23,11 @@ public int durationInSeconds() { @Override public int earliestDepartureTime(int requestedDepartureTime) { - return delegate().earliestDepartureTime(requestedDepartureTime + delegate().timePenalty()); + final int dt = delegate().timePenalty(); + int adjustedTime = delegate().earliestDepartureTime(requestedDepartureTime + dt); + return adjustedTime == RaptorConstants.TIME_NOT_SET + ? RaptorConstants.TIME_NOT_SET + : adjustedTime - dt; } /** diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java index d6a50f7c982..1647f6b7b52 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java @@ -2,6 +2,7 @@ import org.opentripplanner.raptor.api.model.AbstractAccessEgressDecorator; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; +import org.opentripplanner.raptor.api.model.RaptorConstants; /** * This decorator will add the time penalty to the duration of the egress and adjust the @@ -22,7 +23,11 @@ public int durationInSeconds() { @Override public int latestArrivalTime(int requestedArrivalTime) { - return delegate().latestArrivalTime(requestedArrivalTime - delegate().timePenalty()); + int dt = delegate().timePenalty(); + int adjustedTime = delegate().latestArrivalTime(requestedArrivalTime - dt); + return adjustedTime == RaptorConstants.TIME_NOT_SET + ? RaptorConstants.TIME_NOT_SET + : adjustedTime + dt; } /** diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java new file mode 100644 index 00000000000..cedc01e42a1 --- /dev/null +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java @@ -0,0 +1,79 @@ +package org.opentripplanner.raptor.rangeraptor.transit; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.opentripplanner.raptor._data.RaptorTestConstants.SECONDS_IN_A_DAY; +import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.raptor.api.model.RaptorAccessEgress; + +class AccessWithPenaltyTest { + + private static final int STOP = 17; + private static final int DURATION = 400; + private static final int PENALTY = 100; + private static final int OPEN = 600; + private static final int CLOSE = 1800; + private static final int ANY_TIME = 500; + private static final int EXPECTED_OPENING = OPEN - PENALTY; + private static final int EXPECTED_CLOSING = CLOSE - PENALTY; + private static final int ONE_DAY = SECONDS_IN_A_DAY; + + @Test + void durationInSeconds() { + var subject = new AccessWithPenalty(walk(STOP, DURATION).withTimePenalty(PENALTY)); + assertEquals(DURATION + PENALTY, subject.durationInSeconds()); + } + + @Test + void earliestDepartureTimeIsBeforeOpeningHours() { + var subject = new AccessWithPenalty( + walk(STOP, DURATION).openingHours(OPEN, CLOSE).withTimePenalty(PENALTY) + ); + + assertEquals(EXPECTED_OPENING, subject.earliestDepartureTime(EXPECTED_OPENING - 200)); + assertEquals(EXPECTED_OPENING, subject.earliestDepartureTime(EXPECTED_OPENING - 1)); + } + + @Test + void earliestDepartureTimeIsInsideOpeningHours() { + var subject = new AccessWithPenalty( + walk(STOP, DURATION).openingHours(OPEN, CLOSE).withTimePenalty(PENALTY) + ); + + assertEquals(EXPECTED_OPENING, subject.earliestDepartureTime(EXPECTED_OPENING)); + assertEquals(EXPECTED_CLOSING, subject.earliestDepartureTime(EXPECTED_CLOSING)); + } + + @Test + void earliestDepartureTimeIsAfterClosing() { + var subject = new AccessWithPenalty( + walk(STOP, DURATION).openingHours(OPEN, CLOSE).withTimePenalty(PENALTY) + ); + + // If time is after closing, then wait until it opens next day. This is TestAccessEgress + // implementation specific. + assertEquals(EXPECTED_OPENING + ONE_DAY, subject.earliestDepartureTime(EXPECTED_CLOSING + 1)); + } + + @Test + void earliestDepartureTimeWhenServiceIsClosed() { + // Test closed + var subject = new AccessWithPenalty( + walk(STOP, DURATION).openingHoursClosed().withTimePenalty(PENALTY) + ); + assertEquals(TIME_NOT_SET, subject.earliestDepartureTime(ANY_TIME)); + } + + @Test + void removeDecoratorIfItExist() { + var original = walk(STOP, DURATION).withTimePenalty(PENALTY); + RaptorAccessEgress subject = new AccessWithPenalty(original); + + assertSame(original, AccessWithPenalty.removeDecoratorIfItExist(subject)); + assertSame(original, AccessWithPenalty.removeDecoratorIfItExist(original)); + assertSame(null, AccessWithPenalty.removeDecoratorIfItExist(null)); + } +} diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java new file mode 100644 index 00000000000..acc7b642ddc --- /dev/null +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java @@ -0,0 +1,82 @@ +package org.opentripplanner.raptor.rangeraptor.transit; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.opentripplanner.raptor._data.RaptorTestConstants.SECONDS_IN_A_DAY; +import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.raptor.api.model.RaptorAccessEgress; + +class EgressWithPenaltyTest { + + private static final int STOP = 17; + private static final int DURATION = 400; + private static final int PENALTY = 100; + private static final int OPEN = 600; + private static final int CLOSE = 1800; + private static final int ANY_TIME = 500; + + // We are interested in the opening hours at the arrival, not in the beginning of the egress leg. + // Hence, we must add egress duration as well here. + private static final int EXPECTED_OPENING = OPEN + PENALTY + DURATION; + private static final int EXPECTED_CLOSING = CLOSE + PENALTY + DURATION; + private static final int ONE_DAY = SECONDS_IN_A_DAY; + + @Test + void durationInSeconds() { + var subject = new EgressWithPenalty(walk(STOP, DURATION).withTimePenalty(PENALTY)); + assertEquals(DURATION + PENALTY, subject.durationInSeconds()); + } + + @Test + void latestArrivalTimeIsBeforeOpeningHours() { + var subject = new EgressWithPenalty( + walk(STOP, DURATION).openingHours(OPEN, CLOSE).withTimePenalty(PENALTY) + ); + + // If time is before opening, then time-shift to the closing of the previous day. This is + // TestAccessEgress implementation specific. + assertEquals(EXPECTED_CLOSING - ONE_DAY, subject.latestArrivalTime(EXPECTED_OPENING - 1)); + } + + @Test + void latestArrivalTimeIsInsideOpeningHours() { + var subject = new EgressWithPenalty( + walk(STOP, DURATION).openingHours(OPEN, CLOSE).withTimePenalty(PENALTY) + ); + + assertEquals(EXPECTED_OPENING, subject.latestArrivalTime(EXPECTED_OPENING)); + assertEquals(EXPECTED_CLOSING, subject.latestArrivalTime(EXPECTED_CLOSING)); + } + + @Test + void latestArrivalTimeIsAfterClosing() { + var subject = new EgressWithPenalty( + walk(STOP, DURATION).openingHours(OPEN, CLOSE).withTimePenalty(PENALTY) + ); + + assertEquals(EXPECTED_CLOSING, subject.latestArrivalTime(EXPECTED_CLOSING + 1)); + assertEquals(EXPECTED_CLOSING, subject.latestArrivalTime(EXPECTED_CLOSING + 100)); + } + + @Test + void latestArrivalTimeWhenServiceIsClosed() { + // Test closed + var subject = new EgressWithPenalty( + walk(STOP, DURATION).openingHoursClosed().withTimePenalty(PENALTY) + ); + assertEquals(TIME_NOT_SET, subject.latestArrivalTime(ANY_TIME)); + } + + @Test + void removeDecoratorIfItExist() { + var original = walk(STOP, DURATION).withTimePenalty(PENALTY); + RaptorAccessEgress subject = new EgressWithPenalty(original); + + assertSame(original, EgressWithPenalty.removeDecoratorIfItExist(subject)); + assertSame(original, EgressWithPenalty.removeDecoratorIfItExist(original)); + assertSame(null, EgressWithPenalty.removeDecoratorIfItExist(null)); + } +} From 3ae31b78762c4d2a0ee6204fd77490aff9040848 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 21 Feb 2024 01:28:55 +0100 Subject: [PATCH 0671/1688] feature: Include iterations which have enough slack to include access time-penalty before earliest-departure-time --- .../raptor/api/model/RaptorConstants.java | 5 + .../rangeraptor/DefaultRangeRaptorWorker.java | 33 ++- .../rangeraptor/context/SearchContext.java | 6 +- .../rangeraptor/transit/AccessPaths.java | 69 +++++- .../transit/AccessWithPenalty.java | 9 +- .../transit/EgressWithPenalty.java | 4 +- .../transit/RaptorTransitCalculator.java | 12 +- .../rangeraptor/transit/AccessPathsTest.java | 201 ++++++++++++++++++ 8 files changed, 312 insertions(+), 27 deletions(-) create mode 100644 src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java index 983e3c75155..63ec7420db0 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorConstants.java @@ -24,6 +24,11 @@ public class RaptorConstants { */ public static final int ZERO = 0; + /** + * One minute is 60 seconds - iteration departure times are usually increased by one minute. + */ + public static final int ONE_MINUTE = 60; + /** * This constant is used to indicate that a value is not set. This applies to parameters of type * {@code generalized-cost}, {@code link min-travel-time} and {@code duration} inside Raptor. diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java index d15e1ca6ca8..63cc4e2756c 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java @@ -135,10 +135,15 @@ public RaptorWorkerResult route() { // the arrival time given departure at minute t + 1. final IntIterator it = calculator.rangeRaptorMinutes(); while (it.hasNext()) { - OTPRequestTimeoutException.checkForTimeout(); - // Run the raptor search for this particular iteration departure time - iterationDepartureTime = it.next(); - lifeCycle.setupIteration(iterationDepartureTime); + setupIteration(it.next()); + runRaptorForMinute(); + } + + // Iterate over virtual departure times - this is needed to allow access with a time-penalty + // which falls outside the search-window due to the penalty to be added to the result. + final IntIterator as = accessPaths.iterateOverPathsWithPenalty(iterationDepartureTime); + while (as.hasNext()) { + setupIteration(as.next()); runRaptorForMinute(); } }); @@ -260,6 +265,10 @@ private void findTransfersForRound() { }); } + private int round() { + return roundTracker.round(); + } + private void findAccessOnStreetForRound() { addAccessPaths(accessPaths.arrivedOnStreetByNumOfRides(round())); } @@ -268,6 +277,15 @@ private void findAccessOnBoardForRound() { addAccessPaths(accessPaths.arrivedOnBoardByNumOfRides(round())); } + /** + * Run the raptor search for this particular iteration departure time + */ + private void setupIteration(int iterationDepartureTime) { + OTPRequestTimeoutException.checkForTimeout(); + this.iterationDepartureTime = iterationDepartureTime; + lifeCycle.setupIteration(this.iterationDepartureTime); + } + /** * Set the departure time in the scheduled search to the given departure time, and prepare for the * scheduled search at the next-earlier minute. @@ -278,13 +296,8 @@ private void addAccessPaths(Collection accessPaths) { // Access must be available after the iteration departure time if (departureTime != RaptorConstants.TIME_NOT_SET) { - // TODO TP - Is this ok? - transitWorker.setAccessToStop(it, calculator.timeMinusPenalty(departureTime, it)); + transitWorker.setAccessToStop(it, departureTime); } } } - - private int round() { - return roundTracker.round(); - } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java index 5b4a6db52e2..65e0246290c 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java @@ -87,7 +87,7 @@ public SearchContext( this.request = request; this.tuningParameters = tuningParameters; this.transit = transit; - this.accessPaths = accessPaths(request); + this.accessPaths = accessPaths(tuningParameters.iterationDepartureStepInSeconds(), request); this.egressPaths = egressPaths(request); this.calculator = createCalculator(request, tuningParameters); this.roundTracker = @@ -314,11 +314,11 @@ private static ToIntFunction createBoardSlackProvider( : p -> slackProvider.alightSlack(p.slackIndex()); } - private static AccessPaths accessPaths(RaptorRequest request) { + private static AccessPaths accessPaths(int iterationStep, RaptorRequest request) { boolean forward = request.searchDirection().isForward(); var params = request.searchParams(); var paths = forward ? params.accessPaths() : params.egressPaths(); - return AccessPaths.create(paths, request.profile()); + return AccessPaths.create(iterationStep, paths, request.profile()); } private static EgressPaths egressPaths(RaptorRequest request) { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 0e616e60ed1..434c2e3c611 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -11,19 +11,30 @@ import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.request.RaptorProfile; +import org.opentripplanner.raptor.spi.IntIterator; +import org.opentripplanner.raptor.util.IntIterators; public class AccessPaths { + private final int iterationStep; + private final int maxTimePenalty; private final TIntObjectMap> arrivedOnStreetByNumOfRides; private final TIntObjectMap> arrivedOnBoardByNumOfRides; - private int timePenaltyLimit = RaptorConstants.TIME_NOT_SET; + private int iterationTimePenaltyLimit = RaptorConstants.TIME_NOT_SET; private AccessPaths( + int iterationStep, TIntObjectMap> arrivedOnStreetByNumOfRides, TIntObjectMap> arrivedOnBoardByNumOfRides ) { + this.iterationStep = iterationStep; this.arrivedOnStreetByNumOfRides = arrivedOnStreetByNumOfRides; this.arrivedOnBoardByNumOfRides = arrivedOnBoardByNumOfRides; + this.maxTimePenalty = + Math.max( + maxTimePenalty(arrivedOnBoardByNumOfRides), + maxTimePenalty(arrivedOnStreetByNumOfRides) + ); } /** @@ -36,7 +47,11 @@ private AccessPaths( *

      * This method is static and package local to enable unit-testing. */ - public static AccessPaths create(Collection paths, RaptorProfile profile) { + public static AccessPaths create( + int iterationStep, + Collection paths, + RaptorProfile profile + ) { if (profile.is(RaptorProfile.MULTI_CRITERIA)) { paths = removeNonOptimalPathsForMcRaptor(paths); } else { @@ -46,6 +61,7 @@ public static AccessPaths create(Collection paths, RaptorPro paths = decorateWithTimePenaltyLogic(paths); return new AccessPaths( + iterationStep, groupByRound(paths, RaptorAccessEgress::stopReachedByWalking), groupByRound(paths, RaptorAccessEgress::stopReachedOnBoard) ); @@ -58,7 +74,7 @@ public static AccessPaths create(Collection paths, RaptorPro * If no access exists for the given round, an empty list is returned. */ public List arrivedOnStreetByNumOfRides(int round) { - return emptyListIfNull(arrivedOnStreetByNumOfRides.get(round)); + return filterOnTimePenaltyLimitIfExist(arrivedOnStreetByNumOfRides.get(round)); } /** @@ -68,7 +84,7 @@ public List arrivedOnStreetByNumOfRides(int round) { * If no access exists for the given round, an empty list is returned. */ public List arrivedOnBoardByNumOfRides(int round) { - return emptyListIfNull(arrivedOnBoardByNumOfRides.get(round)); + return filterOnTimePenaltyLimitIfExist(arrivedOnBoardByNumOfRides.get(round)); } public int calculateMaxNumberOfRides() { @@ -78,6 +94,39 @@ public int calculateMaxNumberOfRides() { ); } + public IntIterator iterateOverPathsWithPenalty(final int earliestDepartureTime) { + if (!hasTimePenalty()) { + return IntIterators.empty(); + } + // In the first iteration, we want the time-limit to be zero and the raptor-iteration-time + // to be one step before the earliest-departure-time in the search-window. This will include + // all access with a penalty in the first iteration. Then + this.iterationTimePenaltyLimit = -iterationStep; + final int raptorIterationStartTime = earliestDepartureTime - iterationStep; + + return new IntIterator() { + @Override + public boolean hasNext() { + return AccessPaths.this.iterationTimePenaltyLimit + iterationStep < maxTimePenalty; + } + + @Override + public int next() { + AccessPaths.this.iterationTimePenaltyLimit += iterationStep; + return raptorIterationStartTime - AccessPaths.this.iterationTimePenaltyLimit; + } + }; + } + + private int maxTimePenalty(TIntObjectMap> col) { + return col + .valueCollection() + .stream() + .flatMapToInt(it -> it.stream().mapToInt(RaptorAccessEgress::timePenalty)) + .max() + .orElse(RaptorConstants.TIME_NOT_SET); + } + /** * Decorate access to implement time-penalty. This decoration will do the necessary * adjustments to apply the penalty in the raptor algorithm. See the decorator class for more @@ -98,7 +147,7 @@ public boolean hasTimeDependentAccess() { } private boolean hasTimePenalty() { - return timePenaltyLimit != RaptorConstants.TIME_NOT_SET; + return maxTimePenalty != RaptorConstants.TIME_NOT_SET; } private static boolean hasTimeDependentAccess(TIntObjectMap> map) { @@ -111,12 +160,20 @@ private static boolean hasTimeDependentAccess(TIntObjectMap * This method returns an empty list if the given input list is {@code null}. */ - private List emptyListIfNull(List list) { + private List filterOnTimePenaltyLimitIfExist(List list) { if (list == null) { return List.of(); } + if (hasTimePenalty()) { + return list.stream().filter(e -> e.timePenalty() > iterationTimePenaltyLimit).toList(); + } return list; } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java index ef17f0b7b68..8c65270cbb4 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java @@ -7,8 +7,13 @@ /** * This decorator will add the time penalty to the duration of the access and adjust the * `requestedDepartureTime` when time-shifting the access according to opening-hours. - * - * TODO PEN - Write more + *

      + * The time-penalty should be invisible outside the Raptor algorithm and should not be part of the + * leg start and end times in the result. Inside Raptor the time-penalty is included in times used + * for comparing arrivals (comparing paths for optimality). In some cases, we need to exclude the + * time-penalty. Checking for limits like 'arrive-by'(in the forward search) and 'depart-after'(in + * the reverse search) requires that the time is without the time-penalty. This class does not + * do these checks. */ public class AccessWithPenalty extends AbstractAccessEgressDecorator { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java index 1647f6b7b52..6bb7e7bf2c5 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java @@ -7,8 +7,8 @@ /** * This decorator will add the time penalty to the duration of the egress and adjust the * `requestedDepartureTime` when time-shifting the egress according to opening-hours. - * - * TODO PEN - Write more + *

      + * @see AccessWithPenalty for more info on time-penalty. */ public class EgressWithPenalty extends AbstractAccessEgressDecorator { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java index 7a309217f0a..af9cff110d0 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/RaptorTransitCalculator.java @@ -148,10 +148,14 @@ Iterator getTransfers( int fromStop ); - default int timePlusPenalty(int time, RaptorAccessEgress accessEgress) { - return accessEgress.hasTimePenalty() ? plusDuration(time, accessEgress.timePenalty()) : time; - } - + /** + * This method removes the time-penalty from the given time if the provided accessEgress has + * a time-penalty, if not the given time is returned without any change. + *

      + * You may use this method to enforce time constraints like the arriveBy time passed into Raptor. + * This should not be applied to the time Raptor uses for the comparison, like in the ParetoSet. + * The arrival-times used in a pareto-set must include the time-penalty. + */ default int timeMinusPenalty(int time, RaptorAccessEgress accessEgress) { return accessEgress.hasTimePenalty() ? minusDuration(time, accessEgress.timePenalty()) : time; } diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java new file mode 100644 index 00000000000..0371de45bac --- /dev/null +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java @@ -0,0 +1,201 @@ +package org.opentripplanner.raptor.rangeraptor.transit; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flex; +import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flexAndWalk; +import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.raptor.api.request.RaptorProfile.MULTI_CRITERIA; +import static org.opentripplanner.raptor.api.request.RaptorProfile.STANDARD; + +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Objects; +import org.junit.jupiter.api.Test; +import org.opentripplanner.raptor._data.RaptorTestConstants; +import org.opentripplanner.raptor._data.transit.TestAccessEgress; +import org.opentripplanner.raptor.api.model.RaptorAccessEgress; +import org.opentripplanner.raptor.api.request.RaptorProfile; + +class AccessPathsTest implements RaptorTestConstants { + + // Walking paths + public static final TestAccessEgress WALK_FAST = walk(STOP_A, 29, 900); + public static final TestAccessEgress WALK_MEDIUM = walk(STOP_A, 30, 800); + public static final TestAccessEgress WALK_COST = walk(STOP_A, 31, 700); + public static final TestAccessEgress WALK_BAD = walk(STOP_A, 30, 900); + public static final TestAccessEgress WALK_B = walk(STOP_B, 60, 2000); + + // Flex with on board arrival + public static final TestAccessEgress FLEX_FAST = flex(STOP_A, 25, 3, 900); + public static final TestAccessEgress FLEX_COST = flex(STOP_A, 31, 3, 500); + public static final TestAccessEgress FLEX_TX2 = flex(STOP_A, 26, 2, 900); + public static final TestAccessEgress FLEX_BAD = flex(STOP_A, 26, 3, 900); + public static final TestAccessEgress FLEX_B = flex(STOP_B, 50, 3, 2000); + + // Flex with walking + public static final TestAccessEgress FLEX_WALK_FAST = flexAndWalk(STOP_A, 25, 2, 900); + public static final TestAccessEgress FLEX_WALK_COST = flexAndWalk(STOP_A, 31, 2, 400); + public static final TestAccessEgress FLEX_WALK_TX1 = flexAndWalk(STOP_A, 28, 1, 900); + public static final TestAccessEgress FLEX_WALK_BAD = flexAndWalk(STOP_A, 26, 2, 900); + public static final TestAccessEgress FLEX_WALK_B = flexAndWalk(STOP_B, 50, 2, 2000); + + @Test + void arrivedOnStreetByNumOfRides() { + var accessPaths = create(STANDARD); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_FAST, WALK_B); + expect(accessPaths.arrivedOnStreetByNumOfRides(1), FLEX_WALK_TX1); + expect(accessPaths.arrivedOnStreetByNumOfRides(2), FLEX_WALK_FAST, FLEX_WALK_B); + expect(accessPaths.arrivedOnStreetByNumOfRides(3)); + + accessPaths = create(MULTI_CRITERIA); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_FAST, WALK_MEDIUM, WALK_COST, WALK_B); + expect(accessPaths.arrivedOnStreetByNumOfRides(1), FLEX_WALK_TX1); + expect(accessPaths.arrivedOnStreetByNumOfRides(2), FLEX_WALK_FAST, FLEX_WALK_COST, FLEX_WALK_B); + expect(accessPaths.arrivedOnStreetByNumOfRides(3)); + } + + @Test + void arrivedOnBoardByNumOfRides() { + var accessPaths = create(STANDARD); + expect(accessPaths.arrivedOnBoardByNumOfRides(0)); + expect(accessPaths.arrivedOnBoardByNumOfRides(1)); + expect(accessPaths.arrivedOnBoardByNumOfRides(2), FLEX_TX2); + expect(accessPaths.arrivedOnBoardByNumOfRides(3), FLEX_FAST, FLEX_B); + expect(accessPaths.arrivedOnBoardByNumOfRides(4)); + + accessPaths = create(MULTI_CRITERIA); + expect(accessPaths.arrivedOnBoardByNumOfRides(0)); + expect(accessPaths.arrivedOnBoardByNumOfRides(1)); + expect(accessPaths.arrivedOnBoardByNumOfRides(2), FLEX_TX2); + expect(accessPaths.arrivedOnBoardByNumOfRides(3), FLEX_FAST, FLEX_COST, FLEX_B); + expect(accessPaths.arrivedOnBoardByNumOfRides(4)); + } + + @Test + void calculateMaxNumberOfRides() { + assertEquals(3, create(STANDARD).calculateMaxNumberOfRides()); + assertEquals(3, create(MULTI_CRITERIA).calculateMaxNumberOfRides()); + } + + @Test + void iterateOverPathsWithPenalty() { + // Expected at departure 540 + var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60); + + // Expected at departure 540 and 480 + var flexTxWithPenalty = FLEX_TX2.withTimePenalty(61); + var flexCostWithPenalty = FLEX_COST.withTimePenalty(120); + + // Expected at departure 540, 480 and 420 + var walkFastWithPenalty = WALK_FAST.withTimePenalty(121); + var walkCostWithPenalty = WALK_COST.withTimePenalty(180); + + // Without time-penalty, the iterator should be empty + var accessPaths = AccessPaths.create( + 60, + List.of( + flexFastWithPenalty, + flexTxWithPenalty, + flexCostWithPenalty, + walkFastWithPenalty, + walkCostWithPenalty, + // Should be filtered away + WALK_B, + FLEX_B, + FLEX_WALK_B + ), + MULTI_CRITERIA + ); + + var iterator = accessPaths.iterateOverPathsWithPenalty(600); + + // First iteration + assertTrue(iterator.hasNext()); + assertEquals(540, iterator.next()); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty, walkCostWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(1)); + expect(accessPaths.arrivedOnStreetByNumOfRides(1)); + expect(accessPaths.arrivedOnBoardByNumOfRides(2), flexTxWithPenalty); + expect(accessPaths.arrivedOnStreetByNumOfRides(2)); + //expect(accessPaths.arrivedOnBoardByNumOfRides(3), flexFastWithPenalty, flexCostWithPenalty); + expect(accessPaths.arrivedOnStreetByNumOfRides(3)); + expect(accessPaths.arrivedOnBoardByNumOfRides(4)); + expect(accessPaths.arrivedOnStreetByNumOfRides(4)); + + // Second iteration + assertTrue(iterator.hasNext()); + assertEquals(480, iterator.next()); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty, walkCostWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(2), flexTxWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(3), flexCostWithPenalty); + + // Third iteration + assertTrue(iterator.hasNext()); + assertEquals(420, iterator.next()); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty, walkCostWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(2)); + expect(accessPaths.arrivedOnBoardByNumOfRides(3)); + + assertFalse(iterator.hasNext()); + } + + @Test + void hasTimeDependentAccess() { + var accessPaths = AccessPaths.create( + 60, + List.of(WALK_FAST, walk(STOP_A, 20).openingHours(1200, 2400)), + STANDARD + ); + assertTrue(accessPaths.hasTimeDependentAccess(), "Time dependent access is better."); + + accessPaths = + AccessPaths.create( + 60, + List.of(WALK_FAST, walk(STOP_A, 50).openingHours(1200, 2400)), + STANDARD + ); + assertFalse(accessPaths.hasTimeDependentAccess(), "Time dependent access is worse."); + } + + @Test + void hasNoTimeDependentAccess() { + var accessPaths = create(STANDARD); + assertFalse(accessPaths.hasTimeDependentAccess()); + + var it = accessPaths.iterateOverPathsWithPenalty(600); + assertFalse(it.hasNext()); + } + + private static void expect( + Collection result, + RaptorAccessEgress... expected + ) { + var r = result.stream().map(Objects::toString).sorted().toList(); + var e = Arrays.stream(expected).map(Objects::toString).sorted().toList(); + assertEquals(e, r); + } + + private static AccessPaths create(RaptorProfile profile) { + Collection accessPaths = List.of( + WALK_FAST, + WALK_MEDIUM, + WALK_COST, + WALK_BAD, + WALK_B, + FLEX_WALK_FAST, + FLEX_WALK_COST, + FLEX_WALK_TX1, + FLEX_WALK_BAD, + FLEX_WALK_B, + FLEX_FAST, + FLEX_COST, + FLEX_TX2, + FLEX_BAD, + FLEX_B + ); + return AccessPaths.create(60, accessPaths, profile); + } +} From 507f76405bf6a223e0d1d003c12639701882ad05 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Tue, 27 Feb 2024 09:45:33 +0100 Subject: [PATCH 0672/1688] style: Improve wording --- .../openstreetmap/tagmapping/HamburgMapperTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java index 029c1b7c662..8e3dc9afc77 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java @@ -28,7 +28,7 @@ public void shouldAllowThroughTraffic_WhenAccessCustomers_AndCustomersHVV() { assertFalse( generalNoThroughTraffic, - "access=customers and customers=hvv should not be considered through-traffic" + "access=customers and customers=hvv should allow through-traffic" ); } From d99373db26b946b6c93fbc7ac875c6ba2eb52250 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 27 Feb 2024 11:40:38 +0100 Subject: [PATCH 0673/1688] Apply suggestions from code review Co-authored-by: Joel Lappalainen --- src/main/java/org/opentripplanner/model/plan/Leg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 0063ecf87c2..c70c03112d6 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -206,7 +206,7 @@ default Accessibility getTripWheelchairAccessibility() { LegTime start(); /** - * The time (including realtime information) when the leg ends.. + * The time (including realtime information) when the leg ends. */ LegTime end(); From 47d28f1c8380efddad0871e58798313434b36f77 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 27 Feb 2024 11:41:52 +0100 Subject: [PATCH 0674/1688] Update deprecation notices --- .../org/opentripplanner/apis/gtfs/schema.graphqls | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 29fcdf42a41..20f1f39af27 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1853,26 +1853,26 @@ type Leg { """ The date and time when this leg begins. Format: Unix timestamp in milliseconds. """ - startTime: Long @deprecated(reason: "Use `start.actual` instead which contains timezone information.") + startTime: Long @deprecated(reason: "Use `start.estimated.time` instead which contains timezone information.") """ The date and time when this leg ends. Format: Unix timestamp in milliseconds. """ - endTime: Long @deprecated(reason: "Use `end.actual` instead which contains timezone information.") + endTime: Long @deprecated(reason: "Use `end.estimated.time` instead which contains timezone information.") """ For transit leg, the offset from the scheduled departure time of the boarding stop in this leg, i.e. scheduled time of departure at boarding stop = `startTime - departureDelay` """ - departureDelay: Int @deprecated(reason: "Use `end.delay` instead.") + departureDelay: Int @deprecated(reason: "Use `end.estimated.delay` instead.") """ For transit leg, the offset from the scheduled arrival time of the alighting stop in this leg, i.e. scheduled time of arrival at alighting stop = `endTime - arrivalDelay` """ - arrivalDelay: Int @deprecated(reason: "Use `start.delay` instead.") + arrivalDelay: Int @deprecated(reason: "Use `start.estimated.delay` instead.") } From 337b10012d1a05cb3b86f6974c56c856b248aa11 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 27 Feb 2024 11:49:24 +0100 Subject: [PATCH 0675/1688] Add newline --- src/main/java/org/opentripplanner/model/plan/LegTime.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/opentripplanner/model/plan/LegTime.java b/src/main/java/org/opentripplanner/model/plan/LegTime.java index 4b30526ae82..354ce4f4b0b 100644 --- a/src/main/java/org/opentripplanner/model/plan/LegTime.java +++ b/src/main/java/org/opentripplanner/model/plan/LegTime.java @@ -13,11 +13,13 @@ public record LegTime(@Nonnull ZonedDateTime scheduledTime, @Nullable RealTimeEs public LegTime { Objects.requireNonNull(scheduledTime); } + @Nonnull public static LegTime of(ZonedDateTime realtime, int delaySecs) { var delay = Duration.ofSeconds(delaySecs); return new LegTime(realtime.minus(delay), new RealTimeEstimate(realtime, delay)); } + @Nonnull public static LegTime ofStatic(ZonedDateTime staticTime) { return new LegTime(staticTime, null); From 528cb2739bea963aaa9c44d62aa1fca4c03770f5 Mon Sep 17 00:00:00 2001 From: De Castri Andrea Date: Tue, 27 Feb 2024 12:34:18 +0100 Subject: [PATCH 0676/1688] feat: use agency short name as fallback in agency mapper --- .../netex/mapping/AuthorityToAgencyMapper.java | 10 +++++++--- .../transit/model/organization/Agency.java | 18 ++---------------- .../model/organization/AgencyBuilder.java | 11 ----------- .../mapping/AuthorityToAgencyMapperTest.java | 14 ++++++++++++-- .../transit/model/organization/AgencyTest.java | 4 ---- 5 files changed, 21 insertions(+), 36 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java index 23edb034079..cc1190bbc88 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java @@ -34,14 +34,18 @@ class AuthorityToAgencyMapper { */ Agency mapAuthorityToAgency(Authority source) { String agencyName = source.getName() != null ? source.getName().getValue() : null; - String agencyShortName = source.getShortName() != null + + String agencyShortName = source.getShortName() != null && + source.getShortName().getValue() != null && + !source.getShortName().getValue().isBlank() ? source.getShortName().getValue() : null; + String mainName = agencyName != null && !agencyName.isBlank() ? agencyName : agencyShortName; + AgencyBuilder target = Agency .of(idFactory.createId(source.getId())) - .withName(agencyName) - .withShortName(agencyShortName) + .withName(mainName) .withTimezone(timeZone); withOptional( diff --git a/src/main/java/org/opentripplanner/transit/model/organization/Agency.java b/src/main/java/org/opentripplanner/transit/model/organization/Agency.java index 625078c06a7..d72aa6588f3 100644 --- a/src/main/java/org/opentripplanner/transit/model/organization/Agency.java +++ b/src/main/java/org/opentripplanner/transit/model/organization/Agency.java @@ -17,7 +17,6 @@ public final class Agency extends AbstractTransitEntity implements LogInfo { private final String name; - private final String shortName; private final ZoneId timezone; private final String url; private final String lang; @@ -27,16 +26,9 @@ public final class Agency extends AbstractTransitEntity i Agency(AgencyBuilder builder) { super(builder.getId()); - // Fill agency name, if not exists take short name - String nameValue = (builder.getName() != null && !builder.getName().isBlank()) - ? builder.getName() - : builder.getShortName() != null && !builder.getShortName().isBlank() - ? builder.getShortName() - : null; - // Required fields - this.name = assertHasValue(nameValue, "Missing mandatory name on Agency %s", builder.getId()); - this.shortName = builder.getShortName(); + this.name = + assertHasValue(builder.getName(), "Missing mandatory name on Agency %s", builder.getId()); this.timezone = ZoneId.of( @@ -64,11 +56,6 @@ public String getName() { return logName(); } - @Nullable - public String getShortName() { - return shortName; - } - @Nonnull public ZoneId getTimezone() { return timezone; @@ -116,7 +103,6 @@ public boolean sameAs(@Nonnull Agency other) { return ( getId().equals(other.getId()) && Objects.equals(name, other.name) && - Objects.equals(shortName, other.shortName) && Objects.equals(timezone, other.timezone) && Objects.equals(url, other.url) && Objects.equals(lang, other.lang) && diff --git a/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java b/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java index d4dd94c71e4..8411797f888 100644 --- a/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/organization/AgencyBuilder.java @@ -7,7 +7,6 @@ public class AgencyBuilder extends AbstractEntityBuilder { private String name; - private String shortName; private String timezone; private String url; private String lang; @@ -22,7 +21,6 @@ public class AgencyBuilder extends AbstractEntityBuilder AgencyBuilder(@Nonnull Agency original) { super(original); this.name = original.getName(); - this.shortName = original.getShortName(); this.timezone = original.getTimezone().getId(); this.url = original.getUrl(); this.lang = original.getLang(); @@ -35,20 +33,11 @@ public String getName() { return name; } - public String getShortName() { - return shortName; - } - public AgencyBuilder withName(String name) { this.name = name; return this; } - public AgencyBuilder withShortName(String shortName) { - this.shortName = shortName; - return this; - } - public String getTimezone() { return timezone; } diff --git a/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java index 6d809ae92f0..5fa0846bec0 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapperTest.java @@ -33,7 +33,6 @@ public void mapAgency() { // Then expect assertEquals(ID, a.getId().getId()); assertEquals(NAME, a.getName()); - assertEquals(SHORT_NAME, a.getShortName()); assertEquals(TIME_ZONE, a.getTimezone().getId()); assertEquals(URL, a.getUrl()); assertEquals(PHONE, a.getPhone()); @@ -50,7 +49,18 @@ public void mapAgencyWithoutOptionalElements() { // Then expect assertNull(a.getUrl()); assertNull(a.getPhone()); - assertNull(a.getShortName()); + } + + @Test + public void mapAgencyWithShortName() { + // Given + Authority authority = authority(ID, null, SHORT_NAME, null, null); + + // When mapped + Agency a = mapper.mapAuthorityToAgency(authority); + + // Then expect + assertEquals(SHORT_NAME, a.getName()); } @Test diff --git a/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java b/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java index ad5f0d9c289..b2cf1a57db3 100644 --- a/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java +++ b/src/test/java/org/opentripplanner/transit/model/organization/AgencyTest.java @@ -14,7 +14,6 @@ class AgencyTest { private static final String ID = "1"; private static final String BRANDING_URL = "http://branding.aaa.com"; private static final String NAME = "name"; - private static final String SHORT_NAME = "shortname"; private static final String URL = "http://info.aaa.com"; private static final String TIMEZONE = "Europe/Oslo"; private static final String PHONE = "+47 95566333"; @@ -24,7 +23,6 @@ class AgencyTest { private static final Agency subject = Agency .of(TransitModelForTest.id(ID)) .withName(NAME) - .withShortName(SHORT_NAME) .withUrl(URL) .withTimezone(TIMEZONE) .withPhone(PHONE) @@ -50,7 +48,6 @@ void copy() { assertEquals(subject, copy); assertEquals(ID, copy.getId().getId()); - assertEquals(SHORT_NAME, copy.getShortName()); assertEquals("v2", copy.getName()); assertEquals(URL, copy.getUrl()); assertEquals(TIMEZONE, copy.getTimezone().getId()); @@ -65,7 +62,6 @@ void sameAs() { assertTrue(subject.sameAs(subject.copy().build())); assertFalse(subject.sameAs(subject.copy().withId(TransitModelForTest.id("X")).build())); assertFalse(subject.sameAs(subject.copy().withName("X").build())); - assertFalse(subject.sameAs(subject.copy().withShortName("X").build())); assertFalse(subject.sameAs(subject.copy().withUrl("X").build())); assertFalse(subject.sameAs(subject.copy().withTimezone("CET").build())); assertFalse(subject.sameAs(subject.copy().withPhone("X").build())); From fee5f9ab8b4ec3d9c3be130f2e8c674e6482d48d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 27 Feb 2024 13:46:29 +0200 Subject: [PATCH 0677/1688] Add recommendation for using first/last --- .../org/opentripplanner/apis/gtfs/schema.graphqls | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 8a5286d24f2..20d4b4cc477 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -4260,8 +4260,10 @@ type QueryType { after: String """ - How many new itineraries should at maximum be returned in forward pagination. This parameter is - part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) + How many new itineraries should at maximum be returned in forward pagination. It's recommended to + use the same value as was used for the `numberOfItineraries` in the original search for optimal + performance. This parameter is part of the + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) and should be used together with the `after` parameter. """ first: Int @@ -4276,8 +4278,10 @@ type QueryType { before: String """ - How many new itineraries should at maximum be returned in backwards pagination. This parameter is - part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) + How many new itineraries should at maximum be returned in backwards pagination. It's recommended to + use the same value as was used for the `numberOfItineraries` in the original search for optimal + performance. This parameter is part of the + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) and should be used together with the `before` parameter. """ last: Int From 9f031e3dde6015b901b6be0922e88205daf0b2fd Mon Sep 17 00:00:00 2001 From: De Castri Andrea Date: Tue, 27 Feb 2024 12:48:02 +0100 Subject: [PATCH 0678/1688] chore: improve check empty strings --- .../netex/mapping/AuthorityToAgencyMapper.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java index cc1190bbc88..ea9b0cca52b 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java @@ -2,6 +2,7 @@ import static org.opentripplanner.netex.mapping.support.NetexObjectDecorator.withOptional; +import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.organization.AgencyBuilder; @@ -33,15 +34,17 @@ class AuthorityToAgencyMapper { * Map authority and time zone to OTP agency. */ Agency mapAuthorityToAgency(Authority source) { - String agencyName = source.getName() != null ? source.getName().getValue() : null; + String agencyName = source.getName() != null && + StringUtils.hasValue(source.getName().getValue()) + ? source.getName().getValue() + : null; String agencyShortName = source.getShortName() != null && - source.getShortName().getValue() != null && - !source.getShortName().getValue().isBlank() + StringUtils.hasValue(source.getShortName().getValue()) ? source.getShortName().getValue() : null; - String mainName = agencyName != null && !agencyName.isBlank() ? agencyName : agencyShortName; + String mainName = agencyName != null ? agencyName : agencyShortName; AgencyBuilder target = Agency .of(idFactory.createId(source.getId())) From 693b3748ad23103eb9ebf17e2deef6677601f28a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 27 Feb 2024 12:44:41 +0100 Subject: [PATCH 0679/1688] Rename mapper to OTPRR, improve docs --- doc-templates/sandbox/MapboxVectorTilesApi.md | 8 +++++--- docs/RouterConfiguration.md | 8 ++++++++ docs/sandbox/MapboxVectorTilesApi.md | 8 +++++--- ...apperTest.java => AreaStopPropertyMapperTest.java} | 4 ++-- .../layers/areastops/AreaStopsLayerBuilderTest.java | 2 +- ...ropertyMapper.java => AreaStopPropertyMapper.java} | 11 ++++------- .../layers/areastops/AreaStopsLayerBuilder.java | 6 +++--- .../resources/standalone/config/router-config.json | 8 ++++++++ 8 files changed, 36 insertions(+), 19 deletions(-) rename src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/{DigitransitAreaStopPropertyMapperTest.java => AreaStopPropertyMapperTest.java} (92%) rename src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/{DigitransitAreaStopPropertyMapper.java => AreaStopPropertyMapper.java} (82%) diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md index b8fe4924c48..35211eff00b 100644 --- a/doc-templates/sandbox/MapboxVectorTilesApi.md +++ b/doc-templates/sandbox/MapboxVectorTilesApi.md @@ -49,10 +49,11 @@ The feature must be configured in `router-config.json` as follows "minZoom": 14, "cacheMaxSeconds": 600 }, + // flex zones { "name": "areaStops", "type": "AreaStop", - "mapper": "Digitransit", + "mapper": "OTPRR", "maxZoom": 20, "minZoom": 14, "cacheMaxSeconds": 600 @@ -144,7 +145,7 @@ For each layer, the configuration includes: - `name` which is used in the url to fetch tiles, and as the layer name in the vector tiles. - `type` which tells the type of the layer. Currently supported: - `Stop` - - `AreaStop` + - `AreaStop`: Flex zones - `Station` - `VehicleRental`: all rental places: stations and free-floating vehicles - `VehicleRentalVehicle`: free-floating rental vehicles @@ -200,4 +201,5 @@ key, and a function to create the mapper, with a `Graph` object as a parameter, * Added DigitransitRealtime for vehicle rental stations * Changed old vehicle parking mapper to be Stadtnavi * Added a new Digitransit vehicle parking mapper with no real-time information and less fields -- 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) \ No newline at end of file +- 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) +- 2024-02-27: Add layer for flex zones [#5704](https://github.com/opentripplanner/OpenTripPlanner/pull/5704) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 34e9aa2c8d6..73d05a12eda 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -650,6 +650,14 @@ Used to group requests when monitoring OTP. "minZoom" : 14, "cacheMaxSeconds" : 600 }, + { + "name" : "areaStops", + "type" : "AreaStop", + "mapper" : "OTPRR", + "maxZoom" : 20, + "minZoom" : 14, + "cacheMaxSeconds" : 600 + }, { "name" : "stations", "type" : "Station", diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md index ddc3db90ac4..45feec03d47 100644 --- a/docs/sandbox/MapboxVectorTilesApi.md +++ b/docs/sandbox/MapboxVectorTilesApi.md @@ -49,10 +49,11 @@ The feature must be configured in `router-config.json` as follows "minZoom": 14, "cacheMaxSeconds": 600 }, + // flex zones { "name": "areaStops", "type": "AreaStop", - "mapper": "Digitransit", + "mapper": "OTPRR", "maxZoom": 20, "minZoom": 14, "cacheMaxSeconds": 600 @@ -144,7 +145,7 @@ For each layer, the configuration includes: - `name` which is used in the url to fetch tiles, and as the layer name in the vector tiles. - `type` which tells the type of the layer. Currently supported: - `Stop` - - `AreaStop` + - `AreaStop`: Flex zones - `Station` - `VehicleRental`: all rental places: stations and free-floating vehicles - `VehicleRentalVehicle`: free-floating rental vehicles @@ -295,4 +296,5 @@ key, and a function to create the mapper, with a `Graph` object as a parameter, * Added DigitransitRealtime for vehicle rental stations * Changed old vehicle parking mapper to be Stadtnavi * Added a new Digitransit vehicle parking mapper with no real-time information and less fields -- 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) \ No newline at end of file +- 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627) +- 2024-02-27: Add layer for flex zones [#5704](https://github.com/opentripplanner/OpenTripPlanner/pull/5704) diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java similarity index 92% rename from src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapperTest.java rename to src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java index 87e10c0ac22..2cf0804b630 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java @@ -12,7 +12,7 @@ import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.StopModel; -class DigitransitAreaStopPropertyMapperTest { +class AreaStopPropertyMapperTest { private static final TransitModelForTest MODEL = new TransitModelForTest(StopModel.of()); private static final AreaStop STOP = MODEL.areaStopForTest("123", Polygons.BERLIN); @@ -24,7 +24,7 @@ class DigitransitAreaStopPropertyMapperTest { @Test void map() { - var mapper = new DigitransitAreaStopPropertyMapper( + var mapper = new AreaStopPropertyMapper( ignored -> List.of(ROUTE_WITH_COLOR, ROUTE_WITHOUT_COLOR), Locale.ENGLISH ); diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java index b86336f867c..befaa6b886d 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java @@ -53,7 +53,7 @@ void getAreaStops() { var layer = new Layer( "areaStops", VectorTilesResource.LayerType.AreaStop, - "Digitransit", + "OTPRR", 20, 1, 10, diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java similarity index 82% rename from src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java rename to src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java index fe60a2961cf..c91ea2cb6b6 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/DigitransitAreaStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java @@ -14,12 +14,12 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; -public class DigitransitAreaStopPropertyMapper extends PropertyMapper { +public class AreaStopPropertyMapper extends PropertyMapper { private final Function> getRoutesForStop; private final I18NStringMapper i18NStringMapper; - protected DigitransitAreaStopPropertyMapper( + protected AreaStopPropertyMapper( Function> getRoutesForStop, Locale locale ) { @@ -27,11 +27,8 @@ protected DigitransitAreaStopPropertyMapper( this.i18NStringMapper = new I18NStringMapper(locale); } - protected static DigitransitAreaStopPropertyMapper create( - TransitService transitService, - Locale locale - ) { - return new DigitransitAreaStopPropertyMapper(transitService::getRoutesForStop, locale); + protected static AreaStopPropertyMapper create(TransitService transitService, Locale locale) { + return new AreaStopPropertyMapper(transitService::getRoutesForStop, locale); } @Override diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java index be03df4decf..31952752dbc 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilder.java @@ -16,8 +16,8 @@ public class AreaStopsLayerBuilder extends LayerBuilder { static Map>> mappers = Map.of( - MapperType.Digitransit, - DigitransitAreaStopPropertyMapper::create + MapperType.OTPRR, + AreaStopPropertyMapper::create ); private final TransitService transitService; @@ -48,6 +48,6 @@ protected List getGeometries(Envelope query) { } enum MapperType { - Digitransit, + OTPRR, } } diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 1a270929947..6a74e5a9f4e 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -213,6 +213,14 @@ "minZoom": 14, "cacheMaxSeconds": 600 }, + { + "name": "areaStops", + "type": "AreaStop", + "mapper": "OTPRR", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 600 + }, { "name": "stations", "type": "Station", From 4cfa762b63c1b4807b05143012c7f56438ca903f Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 27 Feb 2024 15:22:57 +0200 Subject: [PATCH 0680/1688] Implement transit preferences --- .../apis/gtfs/mapping/RouteRequestMapper.java | 63 ++++++++++++++++++- 1 file changed, 60 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index a45b88cc889..9c42e6db099 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -21,6 +21,7 @@ import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; import org.opentripplanner.routing.api.request.preference.ScooterPreferences; +import org.opentripplanner.routing.api.request.preference.TransferPreferences; import org.opentripplanner.routing.api.request.preference.TransitPreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; @@ -113,7 +114,9 @@ private static void setPreferences( prefs.withItineraryFilter(filters -> setItineraryFilters(filters, args.getGraphQLItineraryFilter()) ); - prefs.withTransit(transit -> setTransitPreferences(transit, args, environment)); + prefs.withTransit(transit -> { + prefs.withTransfer(transfer -> setTransitPreferences(transit, transfer, args, environment)); + }); setStreetPreferences(prefs, preferenceArgs.getGraphQLStreet(), environment); setAccessibilityPreferences(request, preferenceArgs.getGraphQLAccessibility()); } @@ -141,7 +144,8 @@ private static void setItineraryFilters( } private static void setTransitPreferences( - TransitPreferences.Builder preferences, + TransitPreferences.Builder transitPreferences, + TransferPreferences.Builder transferPreferences, GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args, DataFetchingEnvironment environment ) { @@ -160,7 +164,60 @@ private static void setTransitPreferences( mode -> (Double) ((Map) mode.get("cost")).get("reluctance") ) ); - preferences.setReluctanceForMode(reluctanceForMode); + transitPreferences.setReluctanceForMode(reluctanceForMode); + } + var transitArgs = args.getGraphQLPreferences().getGraphQLTransit(); + if (transitArgs != null) { + var board = transitArgs.getGraphQLBoard(); + if (board != null) { + var slack = board.getGraphQLSlack(); + if (slack != null) { + transitPreferences.withDefaultBoardSlackSec((int) slack.toSeconds()); + } + var waitReluctance = board.getGraphQLWaitReluctance(); + if (waitReluctance != null) { + transferPreferences.withWaitReluctance(waitReluctance); + } + } + var alight = transitArgs.getGraphQLAlight(); + if (alight != null) { + var slack = alight.getGraphQLSlack(); + if (slack != null) { + transitPreferences.withDefaultAlightSlackSec((int) slack.toSeconds()); + } + } + var transfer = transitArgs.getGraphQLTransfer(); + if (transfer != null) { + var cost = transfer.getGraphQLCost(); + if (cost != null) { + transferPreferences.withCost(cost.toSeconds()); + } + var slack = transfer.getGraphQLSlack(); + if (slack != null) { + transferPreferences.withSlack((int) slack.toSeconds()); + } + var maxTransfers = transfer.getGraphQLMaximumTransfers(); + if (maxTransfers != null) { + transferPreferences.withMaxTransfers(maxTransfers); + } + var additionalTransfers = transfer.getGraphQLMaximumAdditionalTransfers(); + if (additionalTransfers != null) { + transferPreferences.withMaxAdditionalTransfers(additionalTransfers); + } + } + var timetable = transitArgs.getGraphQLTimetable(); + if (timetable != null) { + var excludeUpdates = timetable.getGraphQLExcludeRealTimeUpdates(); + transitPreferences.setIgnoreRealtimeUpdates(Boolean.TRUE.equals(excludeUpdates)); + var includePlannedCancellations = timetable.getGraphQLIncludePlannedCancellations(); + transitPreferences.setIncludePlannedCancellations( + Boolean.TRUE.equals(includePlannedCancellations) + ); + var includeRealtimeCancellations = timetable.getGraphQLIncludeRealTimeCancellations(); + transitPreferences.setIncludeRealtimeCancellations( + Boolean.TRUE.equals(includeRealtimeCancellations) + ); + } } } From caf12a852df90a2d30c83cd51da8c35b8b18c3ec Mon Sep 17 00:00:00 2001 From: De Castri Andrea Date: Tue, 27 Feb 2024 14:45:02 +0100 Subject: [PATCH 0681/1688] chore: refactor using MultilingualStringMapper --- .../netex/mapping/AuthorityToAgencyMapper.java | 16 ++++------------ .../netex/mapping/MultilingualStringMapper.java | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java index ea9b0cca52b..ec466cc2e27 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/AuthorityToAgencyMapper.java @@ -34,21 +34,13 @@ class AuthorityToAgencyMapper { * Map authority and time zone to OTP agency. */ Agency mapAuthorityToAgency(Authority source) { - String agencyName = source.getName() != null && - StringUtils.hasValue(source.getName().getValue()) - ? source.getName().getValue() - : null; - - String agencyShortName = source.getShortName() != null && - StringUtils.hasValue(source.getShortName().getValue()) - ? source.getShortName().getValue() - : null; - - String mainName = agencyName != null ? agencyName : agencyShortName; + String name = MultilingualStringMapper.nullableValueOf(source.getName()); + String shortName = MultilingualStringMapper.nullableValueOf(source.getShortName()); + String agencyName = StringUtils.hasValue(name) ? name : shortName; AgencyBuilder target = Agency .of(idFactory.createId(source.getId())) - .withName(mainName) + .withName(agencyName) .withTimezone(timeZone); withOptional( diff --git a/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java b/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java index a51b628bcaa..0f0e2336bc7 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/MultilingualStringMapper.java @@ -1,12 +1,22 @@ package org.opentripplanner.netex.mapping; import javax.annotation.Nullable; +import org.opentripplanner.framework.lang.StringUtils; import org.rutebanken.netex.model.MultilingualString; public class MultilingualStringMapper { @Nullable - public static String nullableValueOf(@Nullable MultilingualString string) { - return string == null ? null : string.getValue(); + public static String nullableValueOf(@Nullable MultilingualString multilingualString) { + if (multilingualString == null) { + return null; + } + + String value = multilingualString.getValue(); + if (StringUtils.hasNoValue(value)) { + return null; + } + + return value; } } From 33de97af9eb6b9ef8c48ef6dfab1decf08b2c676 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 27 Feb 2024 17:12:18 +0200 Subject: [PATCH 0682/1688] Validate access/egress/transfer --- .../apis/gtfs/mapping/RouteRequestMapper.java | 36 ++++++++++++++----- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 9c42e6db099..2ab945f4826 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -3,6 +3,7 @@ import graphql.schema.DataFetchingEnvironment; import java.time.Instant; import java.util.Collection; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -27,6 +28,7 @@ import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences; import org.opentripplanner.routing.api.request.preference.WalkPreferences; +import org.opentripplanner.routing.api.request.request.JourneyRequest; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; import org.opentripplanner.transit.model.basic.MainAndSubMode; @@ -72,7 +74,7 @@ public static RouteRequest toRouteRequest( request.withPreferences(preferences -> setPreferences(preferences, request, args, environment)); - setModes(request, args.getGraphQLModes(), environment); + setModes(request.journey(), args.getGraphQLModes(), environment); return request; } @@ -588,35 +590,36 @@ private static void setAccessibilityPreferences( * TODO this doesn't support multiple street modes yet */ private static void setModes( - RouteRequest request, + JourneyRequest journey, GraphQLTypes.GraphQLPlanModesInput modesInput, DataFetchingEnvironment environment ) { var direct = modesInput.getGraphQLDirect(); if (Boolean.TRUE.equals(modesInput.getGraphQLTransitOnly())) { - request.journey().direct().setMode(StreetMode.NOT_SET); + journey.direct().setMode(StreetMode.NOT_SET); } else if (direct != null && direct.size() > 0) { - request.journey().direct().setMode(DirectModeMapper.map(direct.getFirst())); + journey.direct().setMode(DirectModeMapper.map(direct.getFirst())); } var transit = modesInput.getGraphQLTransit(); if (Boolean.TRUE.equals(modesInput.getGraphQLDirectOnly())) { - request.journey().transit().disable(); + journey.transit().disable(); } else if (transit != null) { var access = transit.getGraphQLAccess(); if (access != null && access.size() > 0) { - request.journey().access().setMode(AccessModeMapper.map(access.getFirst())); + journey.access().setMode(AccessModeMapper.map(access.getFirst())); } var egress = transit.getGraphQLEgress(); if (egress != null && egress.size() > 0) { - request.journey().egress().setMode(EgressModeMapper.map(egress.getFirst())); + journey.egress().setMode(EgressModeMapper.map(egress.getFirst())); } var transfer = transit.getGraphQLTransfer(); if (transfer != null && transfer.size() > 0) { - request.journey().transfer().setMode(TransferModeMapper.map(transfer.getFirst())); + journey.transfer().setMode(TransferModeMapper.map(transfer.getFirst())); } + validateStreetModes(journey); var transitModes = getTransitModes(environment); if (transitModes.size() > 0) { @@ -634,11 +637,26 @@ private static void setModes( filterRequestBuilder.addSelect( SelectRequest.of().withTransportModes(mainAndSubModes).build() ); - request.journey().transit().setFilters(List.of(filterRequestBuilder.build())); + journey.transit().setFilters(List.of(filterRequestBuilder.build())); } } } + /** + * TODO this doesn't support multiple street modes yet + */ + private static void validateStreetModes(JourneyRequest journey) { + Set modes = new HashSet(); + modes.add(journey.access().mode()); + modes.add(journey.egress().mode()); + modes.add(journey.transfer().mode()); + if (modes.contains(StreetMode.BIKE) && modes.size() != 1) { + throw new IllegalArgumentException( + "If BICYCLE is used for access, egress or transfer, then it should be used for all." + ); + } + } + /** * This methods returns list of modes and their costs from the argument structure: * modes.transit.transit. This methods circumvents a bug in graphql-codegen as getting a list of From 456e628f9f16f3702d75a0d7d06fa1ad31176f53 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 27 Feb 2024 17:27:58 +0100 Subject: [PATCH 0683/1688] Adapt Bikely updater, reorganise tests --- .../bikely/BikelyUpdaterTest.java | 38 +- .../hslpark/HslParkUpdaterTest.java | 24 +- .../parkapi/ParkAPIUpdaterTest.java | 13 +- .../ext/vehicleparking/bikely/bikely.json | 324 ++ .../vehicleparking/hslpark/facilities.json | 0 .../ext}/vehicleparking/hslpark/hubs.json | 0 .../vehicleparking/hslpark/utilizations.json | 0 .../vehicleparking/parkapi/herrenberg.json | 0 .../parkapi/parkapi-reutlingen.json | 0 .../vehicleparking/bikely/bikely.json | 2809 ----------------- .../vehicleparking/bikely/BikelyUpdater.java | 19 +- .../bikely/BikelyUpdaterParameters.java | 3 +- .../updaters/VehicleParkingUpdaterConfig.java | 2 +- 13 files changed, 367 insertions(+), 2865 deletions(-) create mode 100644 src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json rename src/ext-test/resources/{ => org/opentripplanner/ext}/vehicleparking/hslpark/facilities.json (100%) rename src/ext-test/resources/{ => org/opentripplanner/ext}/vehicleparking/hslpark/hubs.json (100%) rename src/ext-test/resources/{ => org/opentripplanner/ext}/vehicleparking/hslpark/utilizations.json (100%) rename src/ext-test/resources/{ => org/opentripplanner/ext}/vehicleparking/parkapi/herrenberg.json (100%) rename src/ext-test/resources/{ => org/opentripplanner/ext}/vehicleparking/parkapi/parkapi-reutlingen.json (100%) delete mode 100644 src/ext-test/resources/vehicleparking/bikely/bikely.json diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java index 771836c67f2..e56b87e6631 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java @@ -3,14 +3,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Duration; import java.util.Locale; import org.junit.jupiter.api.Test; -import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; +import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.model.basic.Locales; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.updater.spi.HttpHeaders; @@ -19,10 +18,10 @@ public class BikelyUpdaterTest { @Test void parseBikeBoxes() { - var url = "file:src/ext-test/resources/vehicleparking/bikely/bikely.json"; + var uri = ResourceLoader.of(this).uri("bikely.json"); var parameters = new BikelyUpdaterParameters( "", - url, + uri, "bikely", Duration.ofSeconds(30), HttpHeaders.empty() @@ -32,50 +31,37 @@ void parseBikeBoxes() { assertTrue(updater.update()); var parkingLots = updater.getUpdates(); - assertEquals(100, parkingLots.size()); + assertEquals(8, parkingLots.size()); - var first = parkingLots.get(0); - assertEquals(new FeedScopedId("bikely", "164"), first.getId()); - assertEquals("Husebybadet", first.getName().toString()); + var first = parkingLots.getFirst(); + assertEquals(new FeedScopedId("bikely", "7"), first.getId()); + assertEquals("Gjettum T-banestasjon", first.getName().toString()); assertFalse(first.hasAnyCarPlaces()); assertTrue(first.hasBicyclePlaces()); assertEquals( - "First 4 hour(s) is NOK0.00, afterwards NOK10.00 per 1 hour(s)", + "First 12 hour(s) is NOK0.00, afterwards NOK10.00 per 1 hour(s)", first.getNote().toString(Locale.ENGLISH) ); assertEquals( - "Første 4 time(r) er kr 0,00. Deretter kr 10,00 per 1 time(r)", + "Første 12 time(r) er kr 0,00. Deretter kr 10,00 per 1 time(r)", first.getNote().toString(Locales.NORWEGIAN_BOKMAL) ); assertEquals( - "Første 4 time(r) er kr 0,00. Deretter kr 10,00 per 1 time(r)", + "Første 12 time(r) er kr 0,00. Deretter kr 10,00 per 1 time(r)", first.getNote().toString(Locales.NORWAY) ); var availibility = first.getAvailability(); - assertEquals(4, availibility.getBicycleSpaces()); + assertEquals(8, availibility.getBicycleSpaces()); var capacity = first.getCapacity(); assertEquals(10, capacity.getBicycleSpaces()); var freeParkingLots = parkingLots.get(2); - assertEquals("Free of charge", freeParkingLots.getNote().toString(Locale.ENGLISH)); + assertEquals("First 12 hour(s) is NOK0.00, afterwards NOK10.00 per 1 hour(s)", freeParkingLots.getNote().toString(Locale.ENGLISH)); assertEquals(VehicleParkingState.OPERATIONAL, first.getState()); - var last = parkingLots.get(99); - assertEquals("Hamar Stasjon", last.getName().toString()); - assertNull(last.getOpeningHours()); - assertFalse(last.hasAnyCarPlaces()); - assertFalse(last.hasWheelchairAccessibleCarPlaces()); - - var closed = parkingLots - .stream() - .map(VehicleParking::getState) - .filter(x -> x == VehicleParkingState.TEMPORARILY_CLOSED) - .count(); - assertEquals(2, closed); - parkingLots.forEach(lot -> { assertNotNull(lot.getNote().toString()); }); diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java index de7f23922d6..2226a988d20 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdaterTest.java @@ -15,27 +15,30 @@ import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; import org.opentripplanner.model.calendar.openinghours.OsmOpeningHoursSupport; import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; +import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.model.framework.Deduplicator; public class HslParkUpdaterTest { + private static final ResourceLoader LOADER = ResourceLoader.of(HslParkUpdaterTest.class); + private static final String UTILIZATIONS_URL = LOADER.url("utilizations.json").toString(); + private static final String HUBS_URL = LOADER.url("hubs.json").toString(); + private static final String FACILITIES_URL = LOADER.url("facilities.json").toString(); + @Test void parseParks() { - var facilitiesUrl = "file:src/ext-test/resources/vehicleparking/hslpark/facilities.json"; - var hubsUrl = "file:src/ext-test/resources/vehicleparking/hslpark/hubs.json"; - var utilizationsUrl = "file:src/ext-test/resources/vehicleparking/hslpark/utilizations.json"; var timeZone = ZoneIds.HELSINKI; var parameters = new HslParkUpdaterParameters( "", 3000, - facilitiesUrl, + FACILITIES_URL, "hslpark", null, 30, - utilizationsUrl, + UTILIZATIONS_URL, timeZone, - hubsUrl + HUBS_URL ); var openingHoursCalendarService = new OpeningHoursCalendarService( new Deduplicator(), @@ -149,21 +152,18 @@ void parseParks() { @Test void parseParksWithoutTimeZone() { - var facilitiesUrl = "file:src/ext-test/resources/vehicleparking/hslpark/facilities.json"; - var hubsUrl = "file:src/ext-test/resources/vehicleparking/hslpark/hubs.json"; - var utilizationsUrl = "file:src/ext-test/resources/vehicleparking/hslpark/utilizations.json"; ZoneId timeZone = null; var parameters = new HslParkUpdaterParameters( "", 3000, - facilitiesUrl, + FACILITIES_URL, "hslpark", null, 30, - utilizationsUrl, + UTILIZATIONS_URL, timeZone, - hubsUrl + HUBS_URL ); var openingHoursCalendarService = new OpeningHoursCalendarService( new Deduplicator(), diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java index 3fae4eb0f9d..d1e8bfe9c5f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdaterTest.java @@ -13,20 +13,23 @@ import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; import org.opentripplanner.model.calendar.openinghours.OsmOpeningHoursSupport; +import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.updater.spi.HttpHeaders; public class ParkAPIUpdaterTest { private static final Duration FREQUENCY = Duration.ofSeconds(30); + private static final ResourceLoader LOADER = ResourceLoader.of(ParkAPIUpdaterTest.class); + private static final String REUTLINGEN_URL = LOADER.uri("parkapi-reutlingen.json").toString(); + private static final String HERRENBERG_URL = LOADER.uri("herrenberg.json").toString(); @Test void parseCars() { - var url = "file:src/ext-test/resources/vehicleparking/parkapi/parkapi-reutlingen.json"; var timeZone = ZoneIds.BERLIN; var parameters = new ParkAPIUpdaterParameters( "", - url, + REUTLINGEN_URL, "park-api", FREQUENCY, HttpHeaders.empty(), @@ -66,11 +69,10 @@ void parseCars() { @Test void parseCarsWithoutTimeZone() { - var url = "file:src/ext-test/resources/vehicleparking/parkapi/parkapi-reutlingen.json"; ZoneId timeZone = null; var parameters = new ParkAPIUpdaterParameters( "", - url, + REUTLINGEN_URL, "park-api", FREQUENCY, HttpHeaders.empty(), @@ -99,10 +101,9 @@ void parseCarsWithoutTimeZone() { @Test void parseHerrenbergOpeningHours() { - var url = "file:src/ext-test/resources/vehicleparking/parkapi/herrenberg.json"; var parameters = new ParkAPIUpdaterParameters( "", - url, + HERRENBERG_URL, "park-api", FREQUENCY, HttpHeaders.empty(), diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json new file mode 100644 index 00000000000..a3e1e9e2e57 --- /dev/null +++ b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikely/bikely.json @@ -0,0 +1,324 @@ +{ + "result": [ + { + "name": "Gjettum T-banestasjon", + "latitude": 59.908370304935886, + "longitude": 10.531885281680088, + "street": "Kolsåsstien", + "postCode": "1352", + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:00:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": null, + "maintenanceStartTime": null, + "isPrivate": false, + "isGroupMember": false, + "totalStandardSpots": 10, + "hasStandardParking": true, + "availableStandardSpots": 8, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 0, + "startPriceDuration": 12, + "mainPriceAmount": 10, + "mainPriceDuration": 1, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 0, + "startPriceDuration": 12, + "mainPriceAmount": 10, + "mainPriceDuration": 1 + }, + "id": 7 + }, + { + "name": "Lørenskog sykkelhotell", + "latitude": 59.92782951468654, + "longitude": 10.955770147334647, + "street": "Bibliotekgata", + "postCode": "1470", + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:00:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": null, + "maintenanceStartTime": "2021-09-02T12:10:25.957906Z", + "isPrivate": false, + "isGroupMember": true, + "totalStandardSpots": 1, + "hasStandardParking": true, + "availableStandardSpots": 73, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 5, + "startPriceDuration": 12, + "mainPriceAmount": 5, + "mainPriceDuration": 12, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 5, + "startPriceDuration": 12, + "mainPriceAmount": 5, + "mainPriceDuration": 12 + }, + "id": 9 + }, + { + "name": "Østerås T-Banestasjon", + "latitude": 59.939540539600415, + "longitude": 10.608225677856922, + "street": "104 Eiksveien", + "postCode": "1361", + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:00:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": "2022-11-16T14:48:00Z", + "maintenanceStartTime": "2022-11-16T12:49:00.674743Z", + "isPrivate": false, + "isGroupMember": false, + "totalStandardSpots": 10, + "hasStandardParking": true, + "availableStandardSpots": 7, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 0, + "startPriceDuration": 12, + "mainPriceAmount": 10, + "mainPriceDuration": 1, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 0, + "startPriceDuration": 12, + "mainPriceAmount": 10, + "mainPriceDuration": 1 + }, + "id": 10 + }, + { + "name": "Slottet sykkelparkering", + "latitude": 58.147399578615044, + "longitude": 7.987953559998118, + "street": "Tordenskjolds gate 13", + "postCode": "4612", + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:00:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": null, + "maintenanceStartTime": null, + "isPrivate": false, + "isGroupMember": false, + "totalStandardSpots": 10, + "hasStandardParking": true, + "availableStandardSpots": 2, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 0, + "startPriceDuration": 0, + "mainPriceAmount": 15, + "mainPriceDuration": 12, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 0, + "startPriceDuration": 0, + "mainPriceAmount": 15, + "mainPriceDuration": 12 + }, + "id": 20 + }, + { + "name": "AtB Steinkjer Stasjon", + "latitude": 64.01218345882226, + "longitude": 11.495342431116114, + "street": "Strandvegen", + "postCode": "7713", + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:00:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": null, + "maintenanceStartTime": null, + "isPrivate": false, + "isGroupMember": false, + "totalStandardSpots": 4, + "hasStandardParking": true, + "availableStandardSpots": 4, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 0, + "startPriceDuration": 4, + "mainPriceAmount": 20, + "mainPriceDuration": 24, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 0, + "startPriceDuration": 4, + "mainPriceAmount": 20, + "mainPriceDuration": 24 + }, + "id": 21 + }, + { + "name": "Ørjaveita", + "latitude": 63.43390486150696, + "longitude": 10.396437736776587, + "street": "Ørjaveita", + "postCode": "7010", + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:55:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": null, + "maintenanceStartTime": "2022-09-30T07:23:33.102315Z", + "isPrivate": false, + "isGroupMember": true, + "totalStandardSpots": 10, + "hasStandardParking": true, + "availableStandardSpots": 8, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 0, + "startPriceDuration": 4, + "mainPriceAmount": 10, + "mainPriceDuration": 1, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 0, + "startPriceDuration": 4, + "mainPriceAmount": 10, + "mainPriceDuration": 1 + }, + "id": 24 + }, + { + "name": "Porsgrunn Stasjon", + "latitude": 59.1401227511141, + "longitude": 9.658452655675983, + "street": null, + "postCode": null, + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:00:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": null, + "maintenanceStartTime": null, + "isPrivate": false, + "isGroupMember": false, + "totalStandardSpots": 10, + "hasStandardParking": true, + "availableStandardSpots": 9, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 0, + "startPriceDuration": 12, + "mainPriceAmount": 10, + "mainPriceDuration": 12, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 0, + "startPriceDuration": 12, + "mainPriceAmount": 10, + "mainPriceDuration": 12 + }, + "id": 25 + }, + { + "name": "Faktry", + "latitude": 63.39686931503907, + "longitude": 10.401622501039789, + "street": null, + "postCode": null, + "municipality": null, + "openFrom": "2020-01-28T06:00:00Z", + "openTo": "2020-01-28T22:00:00Z", + "isAllDay": true, + "isInMaintenance": false, + "maintenanceEndingTime": null, + "maintenanceStartTime": null, + "isPrivate": false, + "isGroupMember": true, + "totalStandardSpots": 10, + "hasStandardParking": true, + "availableStandardSpots": 4, + "totalCargoSpots": 0, + "hasCargoParking": false, + "availableCargoSpots": 0, + "startPriceAmount": 0, + "startPriceDuration": 0, + "mainPriceAmount": 0, + "mainPriceDuration": 0, + "maxDailyAmount": 0, + "isCluster": false, + "zoomDelta": 0, + "subscriptionId": 0, + "subscribedDoorName": null, + "subscribedLockType": 0, + "locationPricing": { + "locationPaymentType": 1, + "startPriceAmount": 0, + "startPriceDuration": 0, + "mainPriceAmount": 0, + "mainPriceDuration": 0 + }, + "id": 26 + } + ] +} \ No newline at end of file diff --git a/src/ext-test/resources/vehicleparking/hslpark/facilities.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/facilities.json similarity index 100% rename from src/ext-test/resources/vehicleparking/hslpark/facilities.json rename to src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/facilities.json diff --git a/src/ext-test/resources/vehicleparking/hslpark/hubs.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/hubs.json similarity index 100% rename from src/ext-test/resources/vehicleparking/hslpark/hubs.json rename to src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/hubs.json diff --git a/src/ext-test/resources/vehicleparking/hslpark/utilizations.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/utilizations.json similarity index 100% rename from src/ext-test/resources/vehicleparking/hslpark/utilizations.json rename to src/ext-test/resources/org/opentripplanner/ext/vehicleparking/hslpark/utilizations.json diff --git a/src/ext-test/resources/vehicleparking/parkapi/herrenberg.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/herrenberg.json similarity index 100% rename from src/ext-test/resources/vehicleparking/parkapi/herrenberg.json rename to src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/herrenberg.json diff --git a/src/ext-test/resources/vehicleparking/parkapi/parkapi-reutlingen.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/parkapi-reutlingen.json similarity index 100% rename from src/ext-test/resources/vehicleparking/parkapi/parkapi-reutlingen.json rename to src/ext-test/resources/org/opentripplanner/ext/vehicleparking/parkapi/parkapi-reutlingen.json diff --git a/src/ext-test/resources/vehicleparking/bikely/bikely.json b/src/ext-test/resources/vehicleparking/bikely/bikely.json deleted file mode 100644 index ce2b4d87aa6..00000000000 --- a/src/ext-test/resources/vehicleparking/bikely/bikely.json +++ /dev/null @@ -1,2809 +0,0 @@ -{ - "result": [ - { - "name": "Husebybadet", - "availableParkingSpots": 4, - "totalParkingSpots":10, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Blisterhaugvegen 13", - "postCode": "7078", - "postName": "Saupstad", - "municipality": null, - "longitude": 10.351535699801943, - "latitude": 63.365653571508794 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 164 - }, - { - "name": "Sentrum P-Hus", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 199.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Teatergata", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.741571022211218, - "latitude": 59.91600756265333 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 115 - }, - { - "name": "Skien Fritidspark", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Moflatvegen", - "postCode": null, - "postName": null, - "municipality": "Skien", - "longitude": 9.595596391124074, - "latitude": 59.18662360320687 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 112 - }, - { - "name": "Trondheim Spektrum", - "availableParkingSpots": 12, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Trondheim Spektrum", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.378531574243146, - "latitude": 63.42748116576243 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 103 - }, - { - "name": "Amfi Steinkjer", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 24 - }, - "address": { - "street": "Sjøfartsgata 2", - "postCode": "7714 ", - "postName": "Steinkjer", - "municipality": null, - "longitude": 11.493187779423364, - "latitude": 64.01155740883044 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 102 - }, - { - "name": "Tyholmen ", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 8 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 8.763968789298318, - "latitude": 58.45927282561365 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-02-16T07:47:14.369256Z", - "maintenanceEndingTime": "2022-02-16T21:00:52.169Z", - "isUnderMaintenance": true - }, - "id": 101 - }, - { - "name": "AMFI Ullevål Øst", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Kaj Munks vei", - "postCode": null, - "postName": "Oslo", - "municipality": null, - "longitude": 10.736078877999802, - "latitude": 59.94975795585445 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 100 - }, - { - "name": "VikelvfaretPOD", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Strandliveien", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.53595748700983, - "latitude": 63.42116945997451 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-08-11T06:48:54.409897Z", - "maintenanceEndingTime": "2022-08-12T06:48:00Z", - "isUnderMaintenance": false - }, - "id": 99 - }, - { - "name": "Tveita Senter", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Wilhelm Stenersens vei", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.841919396865917, - "latitude": 59.913573733717875 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-27T14:32:43.02938Z", - "maintenanceEndingTime": "2022-09-28T10:00:00Z", - "isUnderMaintenance": false - }, - "id": 98 - }, - { - "name": "Manglerud Senter", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Plogveien", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.812699321967543, - "latitude": 59.89730171094624 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-06-25T21:03:44.175534Z", - "maintenanceEndingTime": "2022-06-27T05:00:00Z", - "isUnderMaintenance": true - }, - "id": 97 - }, - { - "name": "Lambertseter Senter", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Cecilie Thoresens vei", - "postCode": null, - "postName": "Oslo", - "municipality": null, - "longitude": 10.811687688348668, - "latitude": 59.87397901539979 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 95 - }, - { - "name": "test sub", - "availableParkingSpots": 1, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 0.0, - "latitude": 0.0 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 94 - }, - { - "name": "Lagunen Storsenter", - "availableParkingSpots": 9, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 3, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Laguneveien 1", - "postCode": "5239", - "postName": "Rådal", - "municipality": null, - "longitude": 5.329471960391827, - "latitude": 60.29717349679797 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 93 - }, - { - "name": "IMEI Test Telenor", - "availableParkingSpots": 1, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Vikelvfaret 4", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.536120271331493, - "latitude": 63.421001992107435 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2021-09-08T09:50:48.224668Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 92 - }, - { - "name": "Kolsås Sykkelhotell", - "availableParkingSpots": 14, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 24, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Brynsveien", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.50149743216143, - "latitude": 59.91468587108326 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-10-17T03:00:00Z", - "maintenanceEndingTime": "2022-10-20T03:00:00Z", - "isUnderMaintenance": false - }, - "id": 91 - }, - { - "name": "Ranheimsveien", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Ranheimsveien", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.470519111242798, - "latitude": 63.43253182042508 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 89 - }, - { - "name": "Skien LastesykkelHotell", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Hesselbergs gate", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 9.608610388358091, - "latitude": 59.20960955258356 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 85 - }, - { - "name": "Sandefjord Torg", - "availableParkingSpots": 7, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Torget", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.22593781770841, - "latitude": 59.12977259494621 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 84 - }, - { - "name": "Kirkegata", - "availableParkingSpots": 7, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 15.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 15.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Kirkegata", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.661979503627865, - "latitude": 59.43538193911775 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 83 - }, - { - "name": "AMFI Ullevål Nord", - "availableParkingSpots": 9, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Ullevål", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.732811552248286, - "latitude": 59.94971992531088 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-03-02T11:53:34.699437Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 81 - }, - { - "name": "CC Vest", - "availableParkingSpots": 6, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 3, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Lilleakerveien 16", - "postCode": "0283", - "postName": "Oslo", - "municipality": null, - "longitude": 10.636677951126892, - "latitude": 59.91742604033082 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-05-13T22:56:29.291436Z", - "maintenanceEndingTime": "2022-05-20T22:56:00Z", - "isUnderMaintenance": false - }, - "id": 78 - }, - { - "name": "Jekta Storsenter", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Karlsøyvegen 12", - "postCode": "9015", - "postName": "Tromsø", - "municipality": null, - "longitude": 18.923834531786863, - "latitude": 69.67385798911647 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 77 - }, - { - "name": "Bike Fixx", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Filipstad", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.719912502614747, - "latitude": 59.91008276557721 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 118 - }, - { - "name": "Tromsø Havneterminal", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Strandtorget", - "postCode": "9008 ", - "postName": "Tromsø", - "municipality": null, - "longitude": 18.95831396328195, - "latitude": 69.64723042234459 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2021-12-01T13:00:46.591088Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 76 - }, - { - "name": "Punkt Fornebu", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Forneburingen 248", - "postCode": "1364", - "postName": "Fornebu", - "municipality": null, - "longitude": 10.622245451194132, - "latitude": 59.89786621862049 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 119 - }, - { - "name": "Moholt Allmenning Privat", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 199.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Moholt Allmenning", - "postCode": null, - "postName": null, - "municipality": "Trondheim", - "longitude": 10.433525875945952, - "latitude": 63.41153478175877 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 122 - }, - { - "name": "Rådhuskvartalet", - "availableParkingSpots": 10, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Peter Motzfeldts Gate 1a", - "postCode": "5017", - "postName": "Bergen", - "municipality": null, - "longitude": 5.328588666261149, - "latitude": 60.391802464650524 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 152 - }, - { - "name": "Majorstuen test", - "availableParkingSpots": 1, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 0.0, - "latitude": 0.0 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 151 - }, - { - "name": "Vikelvfaret ", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.536375440686458, - "latitude": 63.421421395112496 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 150 - }, - { - "name": "Gjøvik Skysstasjon", - "availableParkingSpots": 19, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 10, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 6 - }, - "address": { - "street": null, - "postCode": "2821", - "postName": " Gjøvik", - "municipality": null, - "longitude": 10.693611705915028, - "latitude": 60.7978828615738 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 147 - }, - { - "name": "Bikely HOME", - "availableParkingSpots": 1, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 0.0, - "latitude": 0.0 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 146 - }, - { - "name": "E-bike Pool", - "availableParkingSpots": 1, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.536298698980348, - "latitude": 63.421120823556926 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 145 - }, - { - "name": "CC Gjøvik Strandgata", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 3, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Jernbanesvingen 6", - "postCode": "2821", - "postName": "Gjøvik", - "municipality": "Innlandet", - "longitude": 10.692266848604755, - "latitude": 60.79934165258753 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 144 - }, - { - "name": "Tranberghallen", - "availableParkingSpots": 10, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 10, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Bjørnsvebakken 2", - "postCode": "2819", - "postName": "Gjøvik", - "municipality": null, - "longitude": 10.674990942984651, - "latitude": 60.81155519367008 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 143 - }, - { - "name": "CC Gjøvik Nord", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 3, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Jernbanesvingen 6", - "postCode": "2821", - "postName": "Gjøvik", - "municipality": null, - "longitude": 10.692767469501572, - "latitude": 60.80095906879147 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 142 - }, - { - "name": "AtB Melhus Skysstasjon", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 24 - }, - "address": { - "street": "Jernbanevegen 12, ", - "postCode": "7224 ", - "postName": "Melhus", - "municipality": null, - "longitude": 10.27720350042717, - "latitude": 63.28464073896281 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 140 - }, - { - "name": "Kvadrat Kjøpesenter NORD", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 2 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 5.721216223802292, - "latitude": 58.87746037465877 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-03-23T14:15:41.744292Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 139 - }, - { - "name": "Prestegaten", - "availableParkingSpots": 9, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Nedre Langgate 37", - "postCode": "3126", - "postName": "Tønsberg", - "municipality": null, - "longitude": 10.406923125009499, - "latitude": 59.26559407972196 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 48 - }, - { - "name": "Epsilon Cities PLC demo", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 5.600301917104393, - "latitude": 51.143920796723506 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 134 - }, - { - "name": "Prinsen Kino", - "availableParkingSpots": 12, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Prinsen Kino", - "postCode": null, - "postName": "Trondheim", - "municipality": "Trondheim", - "longitude": 10.392912861698846, - "latitude": 63.42655470553182 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2021-12-21T14:26:01.518642Z", - "maintenanceEndingTime": "2021-12-22T09:59:00Z", - "isUnderMaintenance": false - }, - "id": 131 - }, - { - "name": "P-Hus Aker Brygge - Felt C", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Sjøgata 4", - "postCode": "0250 ", - "postName": "Oslo", - "municipality": null, - "longitude": 10.723890489730298, - "latitude": 59.91039271039033 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 130 - }, - { - "name": "Kvadrat Kjøpesenter SØR-ØST", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 2 - }, - "address": { - "street": null, - "postCode": null, - "postName": "Sandnes", - "municipality": null, - "longitude": 5.721982699172825, - "latitude": 58.87578295212405 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-03-23T14:15:53.56905Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 129 - }, - { - "name": "Lillestrøm Parkering Storgata", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 20.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Storgata 7", - "postCode": "2000", - "postName": "Lillestrøm", - "municipality": null, - "longitude": 11.047494272702355, - "latitude": 59.9551079846462 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 128 - }, - { - "name": "Kvadrat Kjøpesenter SØR-VEST", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 2 - }, - "address": { - "street": null, - "postCode": null, - "postName": "Sandnes", - "municipality": null, - "longitude": 5.721655395609253, - "latitude": 58.87584612393457 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-03-23T14:16:08.835289Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 127 - }, - { - "name": "City Lade", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 3, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Håkon 7.gt", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.446035404436271, - "latitude": 63.44294160482934 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-01-04T14:25:22.808388Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 126 - }, - { - "name": "Onepark Sentrum P-hus 1B", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 20.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Pilestredet", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.742243366982436, - "latitude": 59.916147524186805 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 124 - }, - { - "name": "Lerkendal Studentby Privat", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 199.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Lerkendal", - "postCode": null, - "postName": null, - "municipality": "Trondheim", - "longitude": 10.400520415564788, - "latitude": 63.41156976316326 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 123 - }, - { - "name": "Nedre Berg Privat", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 199.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Nedre Berg", - "postCode": null, - "postName": null, - "municipality": "Trondheim", - "longitude": 10.412552683911223, - "latitude": 63.41457636233408 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 121 - }, - { - "name": "Bruveien parkering", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Bruveien", - "postCode": "3400", - "postName": "Lier", - "municipality": null, - "longitude": 10.243007215803273, - "latitude": 59.787372973019906 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 47 - }, - { - "name": "Slottet sykkelparkering", - "availableParkingSpots": 1, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 15.00, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Tordenskjolds gate 13", - "postCode": "4612", - "postName": "Kristiansand", - "municipality": null, - "longitude": 7.987953559998118, - "latitude": 58.147399578615044 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 20 - }, - { - "name": "Ibsenhuset", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Hesselbergs gate", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 9.605486702117382, - "latitude": 59.208581031898134 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 30 - }, - { - "name": "Gjettum T-banestasjon", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Kolsåsstien", - "postCode": "1352", - "postName": " Kolsås", - "municipality": null, - "longitude": 10.531885281680088, - "latitude": 59.908370304935886 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-21T08:49:44.620258Z", - "maintenanceEndingTime": "2022-09-26T10:00:00Z", - "isUnderMaintenance": false - }, - "id": 7 - }, - { - "name": "Lager 11 / Grip ", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Sluppenvegen 11", - "postCode": "7037", - "postName": "Trondheim", - "municipality": null, - "longitude": 10.396483571230378, - "latitude": 63.39808834594847 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 64 - }, - { - "name": "Ringerike Rådhus", - "availableParkingSpots": 10, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Benterudgata 1", - "postCode": "3511", - "postName": "Hønefoss", - "municipality": null, - "longitude": 10.255685034595844, - "latitude": 60.16016458363586 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 56 - }, - { - "name": "Leutenhaven ", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Erling Skakkes gate", - "postCode": "7012 ", - "postName": "Trondheim", - "municipality": null, - "longitude": 10.389317891553075, - "latitude": 63.42922275870133 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 40 - }, - { - "name": "Bergen Bystasjon", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 5.333323897536757, - "latitude": 60.38902516311156 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 33 - }, - { - "name": "KLP Teknobyen", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 2, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Abels Gate 5", - "postCode": null, - "postName": "Trondheim", - "municipality": null, - "longitude": 10.394627580519499, - "latitude": 63.41531182507022 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 59 - }, - { - "name": "Moholt Allmenning", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 15.0, - "startPriceDurationHours": 2, - "mainPriceAmount": 15.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.433145179115732, - "latitude": 63.411450813462544 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 70 - }, - { - "name": "Jar T-banestasjon", - "availableParkingSpots": 7, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.619360985274895, - "latitude": 59.92656137276969 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-21T08:49:18.151307Z", - "maintenanceEndingTime": "2022-09-26T10:00:00Z", - "isUnderMaintenance": false - }, - "id": 54 - }, - { - "name": "Bergen Marken", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 5.332616662863372, - "latitude": 60.390714704251785 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 34 - }, - { - "name": "Heggedal Idrettsanlegg", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Øvre Gjellum vei 4", - "postCode": "1389", - "postName": null, - "municipality": null, - "longitude": 10.449085122930573, - "latitude": 59.79219663780587 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 36 - }, - { - "name": "Majorstuen T-bane", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Majorstuen", - "postCode": null, - "postName": "Oslo", - "municipality": null, - "longitude": 10.714455875051554, - "latitude": 59.92966366431081 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-06-25T21:03:12.9946Z", - "maintenanceEndingTime": "2022-06-27T21:03:00Z", - "isUnderMaintenance": false - }, - "id": 75 - }, - { - "name": "Arnestad Idrettsanlegg", - "availableParkingSpots": 9, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Slemmestadveien 468", - "postCode": "1390", - "postName": null, - "municipality": null, - "longitude": 10.486714884883641, - "latitude": 59.802364746495144 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 35 - }, - { - "name": "Risenga Svømmehall", - "availableParkingSpots": 10, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Brages vei 8", - "postCode": "1387", - "postName": null, - "municipality": null, - "longitude": 10.442563632289863, - "latitude": 59.82506989908911 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 37 - }, - { - "name": "Farmannstorvet", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Farmannstorvet", - "postCode": "3126", - "postName": "Tønsberg", - "municipality": null, - "longitude": 10.409131331358115, - "latitude": 59.26949087588371 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 49 - }, - { - "name": "Thon Hotell", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Nedre Langgate 40", - "postCode": "3126", - "postName": "Tønsberg", - "municipality": null, - "longitude": 10.403879519443562, - "latitude": 59.26742751013589 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-08T13:07:32.593017Z", - "maintenanceEndingTime": "2022-09-09T05:30:00Z", - "isUnderMaintenance": false - }, - "id": 158 - }, - { - "name": "Re-torvet", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Kåpeveien 5", - "postCode": "3174", - "postName": "Tønsberg", - "municipality": null, - "longitude": 10.265188655718509, - "latitude": 59.37137931547057 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-08T13:07:11.735986Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 159 - }, - { - "name": "Bikely kontor", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.536038875579834, - "latitude": 63.42140508377716 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 149 - }, - { - "name": "Jernbanebommene", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Jernbanegaten 2", - "postCode": "3110 ", - "postName": "Tønsberg", - "municipality": null, - "longitude": 10.41125267456441, - "latitude": 59.271186192203146 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-08T13:07:48.684408Z", - "maintenanceEndingTime": "2022-09-09T05:30:00Z", - "isUnderMaintenance": false - }, - "id": 157 - }, - { - "name": "Pirbadet", - "availableParkingSpots": 7, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": " Havnegata 12", - "postCode": "7010", - "postName": "Trondheim", - "municipality": null, - "longitude": 10.400604571667476, - "latitude": 63.440104921574346 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-08-23T14:10:21.24962Z", - "maintenanceEndingTime": "2022-08-31T12:00:00Z", - "isUnderMaintenance": false - }, - "id": 155 - }, - { - "name": "Oasen Terminal", - "availableParkingSpots": 16, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Oasen terminal, 5147 Fyllingsdalen", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 5.287504678584067, - "latitude": 60.34898300059523 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 156 - }, - { - "name": "Lerkendal Studentby", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 15.0, - "startPriceDurationHours": 2, - "mainPriceAmount": 15.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.40028702641794, - "latitude": 63.41166855841642 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 68 - }, - { - "name": "NAV Ringerike", - "availableParkingSpots": 7, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Hønefoss Bru 2", - "postCode": "3510", - "postName": "Hønefoss", - "municipality": null, - "longitude": 10.25959259066608, - "latitude": 60.1662774431612 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 57 - }, - { - "name": "Sletten Senter", - "availableParkingSpots": 9, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": " Vilhelm Bjerknes vei", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 5.358242600432832, - "latitude": 60.35640814540556 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 63 - }, - { - "name": "Nedre Berg", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 15.0, - "startPriceDurationHours": 2, - "mainPriceAmount": 15.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.41249315628851, - "latitude": 63.41457139184208 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 72 - }, - { - "name": "Holmen Ishall", - "availableParkingSpots": 11, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Vogellund 26 ", - "postCode": "1394", - "postName": null, - "municipality": null, - "longitude": 10.484556243805073, - "latitude": 59.853488879299015 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 38 - }, - { - "name": "Porsgrunn Stasjon", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 9.658452655675983, - "latitude": 59.1401227511141 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 25 - }, - { - "name": "Faktry", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.401622501039789, - "latitude": 63.39686931503907 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-04-13T08:12:16.611434Z", - "maintenanceEndingTime": "2022-04-19T07:00:00Z", - "isUnderMaintenance": false - }, - "id": 26 - }, - { - "name": "Skjelsvik Terminal", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 9.687602185911448, - "latitude": 59.09468648359441 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 29 - }, - { - "name": "Ørjaveita", - "availableParkingSpots": 9, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Ørjaveita", - "postCode": "7010", - "postName": "Trondheim", - "municipality": null, - "longitude": 10.396437736776587, - "latitude": 63.43390486150696 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-30T07:23:33.102315Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 24 - }, - { - "name": "Botilrud", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Norderhovsveien", - "postCode": "3512", - "postName": "Hønefoss", - "municipality": null, - "longitude": 10.274488364176818, - "latitude": 60.12984784225455 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 43 - }, - { - "name": "Høvik Skole", - "availableParkingSpots": 6, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.239748734466318, - "latitude": 59.75941171762161 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 31 - }, - { - "name": "AtB Steinkjer Stasjon", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 24 - }, - "address": { - "street": "Strandvegen", - "postCode": "7713", - "postName": " Steinkjer", - "municipality": null, - "longitude": 11.495342431116114, - "latitude": 64.01218345882226 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-03-29T10:27:56.349993Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 21 - }, - { - "name": "Bragernes Torg", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 10, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Bragernes torg øvre", - "postCode": null, - "postName": "Drammen", - "municipality": null, - "longitude": 10.203655055754055, - "latitude": 59.74317281589255 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2021-10-24T06:46:15.535931Z", - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 52 - }, - { - "name": "PirSenteret Elsykkel-pool", - "availableParkingSpots": 5, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Havnegata 9", - "postCode": "7010", - "postName": "Trondheim", - "municipality": null, - "longitude": 10.402578587946673, - "latitude": 63.44101099094018 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": "2021-04-29T09:00:00Z", - "isUnderMaintenance": false - }, - "id": 11 - }, - { - "name": "Sirkus Shopping", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 2, - "mainPriceAmount": 20.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Sirkus Shopping", - "postCode": "7044", - "postName": "Trondheim", - "municipality": null, - "longitude": 10.454789422056505, - "latitude": 63.43590131147719 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 46 - }, - { - "name": "Stokke Stasjon", - "availableParkingSpots": 6, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Tassebekkveien 2, 3160 Stokke", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.300562831301017, - "latitude": 59.22144536511286 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 165 - }, - { - "name": "Lørenskog sykkelhotell", - "availableParkingSpots": 74, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 5.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 5.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Bibliotekgata", - "postCode": "1470", - "postName": "Lørenskog", - "municipality": null, - "longitude": 10.955770147334647, - "latitude": 59.92782951468654 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2021-09-02T12:10:25.957906Z", - "maintenanceEndingTime": "2021-09-06T21:55:00Z", - "isUnderMaintenance": false - }, - "id": 9 - }, - { - "name": "Nittedal Stasjon", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 15.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 10.864211782361556, - "latitude": 60.05816419277446 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-22T07:12:14.17422Z", - "maintenanceEndingTime": "2022-09-23T14:01:00Z", - "isUnderMaintenance": false - }, - "id": 50 - }, - { - "name": "Skien Stasjon", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 9.602695726983418, - "latitude": 59.218894232081524 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 27 - }, - { - "name": "Skien SykkelHotell", - "availableParkingSpots": 38, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": null, - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 9.608779312105321, - "latitude": 59.20951432347752 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 61 - }, - { - "name": "Hønefoss Bussteminal", - "availableParkingSpots": 7, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Hønefoss Bussteminal - Stangs gate 9", - "postCode": "3510", - "postName": "Hønefoss", - "municipality": null, - "longitude": 10.2580229269916, - "latitude": 60.1645916747253 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 44 - }, - { - "name": "Østerås T-Banestasjon", - "availableParkingSpots": 3, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "104 Eiksveien", - "postCode": "1361", - "postName": " Østerås", - "municipality": null, - "longitude": 10.608225677856922, - "latitude": 59.939540539600415 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-21T08:50:03.004692Z", - "maintenanceEndingTime": "2022-09-26T10:00:00Z", - "isUnderMaintenance": false - }, - "id": 10 - }, - { - "name": "Pirsenteret", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 1, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Havnegata 9", - "postCode": "7010", - "postName": "Trondheim", - "municipality": null, - "longitude": 10.403231564385752, - "latitude": 63.44068572623346 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 74 - }, - { - "name": "Vefsn VGS", - "availableParkingSpots": 2, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Kirkegata 9", - "postCode": "8656", - "postName": "Mosjøen", - "municipality": null, - "longitude": 13.192551834307421, - "latitude": 65.8375053559191 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 45 - }, - { - "name": "Hvervenkastet", - "availableParkingSpots": 4, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Arnegårdsveien", - "postCode": "3511", - "postName": "Hønefoss", - "municipality": null, - "longitude": 10.251621386917051, - "latitude": 60.148912920668295 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 42 - }, - { - "name": "Universitetsbiblioteket", - "availableParkingSpots": 8, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 4, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 1 - }, - "address": { - "street": "Haakon Sheteligs plass", - "postCode": null, - "postName": null, - "municipality": null, - "longitude": 5.318577002636498, - "latitude": 60.38765367051367 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 62 - }, - { - "name": "KLP EL-pool", - "availableParkingSpots": 1, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Abels Gate 5", - "postCode": null, - "postName": "Trondheim", - "municipality": "Trondheim", - "longitude": 10.394825378437904, - "latitude": 63.41533303540145 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 60 - }, - { - "name": "Lier Bussterminal", - "availableParkingSpots": 7, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 0.0, - "startPriceDurationHours": 0, - "mainPriceAmount": 0.0, - "mainPriceDurationHours": 0 - }, - "address": { - "street": "Lierbyen bussterminal", - "postCode": "3400", - "postName": " Lier", - "municipality": null, - "longitude": 10.242350688317096, - "latitude": 59.787017349097006 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": null, - "maintenanceEndingTime": null, - "isUnderMaintenance": false - }, - "id": 32 - }, - { - "name": "Hamar Stasjon", - "availableParkingSpots": 10, - "totalParkingSpots": 0, - "price": { - "startPriceAmount": 10.0, - "startPriceDurationHours": 12, - "mainPriceAmount": 10.0, - "mainPriceDurationHours": 12 - }, - "address": { - "street": "Stangevegen 34", - "postCode": "2317", - "postName": "Hamar", - "municipality": null, - "longitude": 11.082666445627662, - "latitude": 60.79116600147056 - }, - "workingHours": { - "openFrom": null, - "openTo": null, - "allDay": true, - "maintenanceStartTime": "2022-09-11T17:21:56.166899Z", - "maintenanceEndingTime": "2022-09-12T05:01:00Z", - "isUnderMaintenance": false - }, - "id": 80 - } - ], - "targetUrl": null, - "success": true, - "error": null, - "unAuthorizedRequest": false, - "__abp": true -} \ No newline at end of file diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java index bfa180015e4..8c451a4fd5c 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java @@ -26,7 +26,7 @@ public class BikelyUpdater extends GenericJsonDataSource { private final String feedId; public BikelyUpdater(BikelyUpdaterParameters parameters) { - super(parameters.url(), JSON_PARSE_PATH, parameters.httpHeaders()); + super(parameters.url().toString(), JSON_PARSE_PATH, parameters.httpHeaders()); this.feedId = parameters.feedId(); } @@ -34,20 +34,19 @@ public BikelyUpdater(BikelyUpdaterParameters parameters) { protected VehicleParking parseElement(JsonNode jsonNode) { var vehicleParkId = new FeedScopedId(feedId, jsonNode.get("id").asText()); - var address = jsonNode.get("address"); var workingHours = jsonNode.get("workingHours"); - var lat = address.get("latitude").asDouble(); - var lng = address.get("longitude").asDouble(); + var lat = jsonNode.get("latitude").asDouble(); + var lng = jsonNode.get("longitude").asDouble(); var coord = new WgsCoordinate(lat, lng); var name = new NonLocalizedString(jsonNode.path("name").asText()); - var totalSpots = jsonNode.get("totalParkingSpots").asInt(); - var freeSpots = jsonNode.get("availableParkingSpots").asInt(); - var isUnderMaintenance = workingHours.get("isUnderMaintenance").asBoolean(); + var totalSpots = jsonNode.get("totalStandardSpots").asInt(); + var freeSpots = jsonNode.get("availableStandardSpots").asInt(); + var isUnderMaintenance = jsonNode.get("isInMaintenance").asBoolean(); - LocalizedString note = toNote(jsonNode.get("price")); + LocalizedString note = toNote(jsonNode); VehicleParking.VehicleParkingEntranceCreator entrance = builder -> builder @@ -75,8 +74,8 @@ private static LocalizedString toNote(JsonNode price) { var startPriceAmount = price.get("startPriceAmount").floatValue(); var mainPriceAmount = price.get("mainPriceAmount").floatValue(); - var startPriceDurationHours = price.get("startPriceDurationHours").asInt(); - var mainPriceDurationHours = price.get("mainPriceDurationHours").asInt(); + var startPriceDurationHours = price.get("startPriceDuration").asInt(); + var mainPriceDurationHours = price.get("mainPriceDuration").asInt(); if (startPriceAmount == 0 && mainPriceAmount == 0) { return new LocalizedString("price.free"); diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java index e97444439fa..26e40f4ec4a 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterParameters.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.vehicleparking.bikely; +import java.net.URI; import java.time.Duration; import org.opentripplanner.updater.spi.HttpHeaders; import org.opentripplanner.updater.vehicle_parking.VehicleParkingSourceType; @@ -11,7 +12,7 @@ */ public record BikelyUpdaterParameters( String configRef, - String url, + URI url, String feedId, Duration frequency, HttpHeaders httpHeaders diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java index 1ac2dbf72e0..e808ad6905c 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java @@ -66,7 +66,7 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap ); case BIKELY -> new BikelyUpdaterParameters( updaterRef, - c.of("url").since(V2_3).summary("URL of the locations endpoint.").asString(null), + c.of("url").since(V2_3).summary("URL of the locations endpoint.").asUri(null), feedId, c .of("frequency") From 16d1a8f59e7a60d23e572dfe710f8b261045a97c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 27 Feb 2024 17:46:31 +0100 Subject: [PATCH 0684/1688] Regenerate docs --- docs/sandbox/VehicleParking.md | 2 +- .../ext/vehicleparking/bikely/BikelyUpdaterTest.java | 5 ++++- .../ext/vehicleparking/bikely/BikelyUpdater.java | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/sandbox/VehicleParking.md b/docs/sandbox/VehicleParking.md index a9b32770b95..4bfc2f6bd36 100644 --- a/docs/sandbox/VehicleParking.md +++ b/docs/sandbox/VehicleParking.md @@ -196,7 +196,7 @@ Tags to add to the parking lots. | [feedId](#u__4__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | | frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.3 | | [sourceType](#u__4__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | -| url | `string` | URL of the locations endpoint. | *Optional* | | 2.3 | +| url | `uri` | URL of the locations endpoint. | *Optional* | | 2.3 | | [headers](#u__4__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java index e56b87e6631..569db85f33b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdaterTest.java @@ -58,7 +58,10 @@ void parseBikeBoxes() { assertEquals(10, capacity.getBicycleSpaces()); var freeParkingLots = parkingLots.get(2); - assertEquals("First 12 hour(s) is NOK0.00, afterwards NOK10.00 per 1 hour(s)", freeParkingLots.getNote().toString(Locale.ENGLISH)); + assertEquals( + "First 12 hour(s) is NOK0.00, afterwards NOK10.00 per 1 hour(s)", + freeParkingLots.getNote().toString(Locale.ENGLISH) + ); assertEquals(VehicleParkingState.OPERATIONAL, first.getState()); diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java index 8c451a4fd5c..c788e2314dc 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java @@ -34,8 +34,6 @@ public BikelyUpdater(BikelyUpdaterParameters parameters) { protected VehicleParking parseElement(JsonNode jsonNode) { var vehicleParkId = new FeedScopedId(feedId, jsonNode.get("id").asText()); - var workingHours = jsonNode.get("workingHours"); - var lat = jsonNode.get("latitude").asDouble(); var lng = jsonNode.get("longitude").asDouble(); var coord = new WgsCoordinate(lat, lng); From f4d3478362131d10cec579d371f588eed7d8ea19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:54:14 +0000 Subject: [PATCH 0685/1688] Update google.dagger.version to v2.51 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4bf56201d45..48e03115c17 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 146 30.2 - 2.50 + 2.51 2.16.1 3.1.5 5.10.2 From 20e9550dc0896815a58ce6fd590b0891aa6e19ca Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 27 Feb 2024 23:33:28 +0200 Subject: [PATCH 0686/1688] Remove destination policy from car and implement it for scooter --- .../apis/gtfs/generated/GraphQLTypes.java | 44 ------------------- .../apis/gtfs/mapping/RouteRequestMapper.java | 11 ++++- .../opentripplanner/apis/gtfs/schema.graphqls | 24 ---------- 3 files changed, 9 insertions(+), 70 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index aedd564545a..3cb0eb1e5a2 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -541,16 +541,11 @@ public static class GraphQLCarRentalPreferencesInput { private List allowedNetworks; private List bannedNetworks; - private GraphQLDestinationCarPolicyInput destinationCarPolicy; public GraphQLCarRentalPreferencesInput(Map args) { if (args != null) { this.allowedNetworks = (List) args.get("allowedNetworks"); this.bannedNetworks = (List) args.get("bannedNetworks"); - this.destinationCarPolicy = - new GraphQLDestinationCarPolicyInput( - (Map) args.get("destinationCarPolicy") - ); } } @@ -562,10 +557,6 @@ public List getGraphQLBannedNetworks() { return this.bannedNetworks; } - public GraphQLDestinationCarPolicyInput getGraphQLDestinationCarPolicy() { - return this.destinationCarPolicy; - } - public void setGraphQLAllowedNetworks(List allowedNetworks) { this.allowedNetworks = allowedNetworks; } @@ -573,12 +564,6 @@ public void setGraphQLAllowedNetworks(List allowedNetworks) { public void setGraphQLBannedNetworks(List bannedNetworks) { this.bannedNetworks = bannedNetworks; } - - public void setGraphQLDestinationCarPolicy( - GraphQLDestinationCarPolicyInput destinationCarPolicy - ) { - this.destinationCarPolicy = destinationCarPolicy; - } } public static class GraphQLCyclingOptimizationInput { @@ -714,35 +699,6 @@ public void setGraphQLKeepingCost(org.opentripplanner.framework.model.Cost keepi } } - public static class GraphQLDestinationCarPolicyInput { - - private Boolean allowKeeping; - private org.opentripplanner.framework.model.Cost keepingCost; - - public GraphQLDestinationCarPolicyInput(Map args) { - if (args != null) { - this.allowKeeping = (Boolean) args.get("allowKeeping"); - this.keepingCost = (org.opentripplanner.framework.model.Cost) args.get("keepingCost"); - } - } - - public Boolean getGraphQLAllowKeeping() { - return this.allowKeeping; - } - - public org.opentripplanner.framework.model.Cost getGraphQLKeepingCost() { - return this.keepingCost; - } - - public void setGraphQLAllowKeeping(Boolean allowKeeping) { - this.allowKeeping = allowKeeping; - } - - public void setGraphQLKeepingCost(org.opentripplanner.framework.model.Cost keepingCost) { - this.keepingCost = keepingCost; - } - } - public static class GraphQLDestinationScooterPolicyInput { private Boolean allowKeeping; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 2ab945f4826..accd2f40fb3 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -480,7 +480,6 @@ private static void setCarRentalPreferences( if (bannedNetworks != null && bannedNetworks.size() > 0) { preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); } - // TODO validate if station based car systems work before adding destination policy } } @@ -516,7 +515,15 @@ private static void setScooterRentalPreferences( if (bannedNetworks != null && bannedNetworks.size() > 0) { preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); } - // TODO validate if station based scooter systems work before adding destination policy + var destinationPolicy = args.getGraphQLDestinationScooterPolicy(); + if (destinationPolicy != null) { + var allowed = destinationPolicy.getGraphQLAllowKeeping(); + preferences.withAllowArrivingInRentedVehicleAtDestination(Boolean.TRUE.equals(allowed)); + var cost = destinationPolicy.getGraphQLKeepingCost(); + if (cost != null) { + preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds()); + } + } } } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 20d4b4cc477..453add335ed 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -377,24 +377,6 @@ input DestinationBicyclePolicyInput { keepingCost: Cost } -""" -Is it possible to arrive to the destination with a rented car and does it -come with an extra cost. -""" -input DestinationCarPolicyInput { - """ - For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental car first. - """ - allowKeeping: Boolean - - """ - Cost associated with arriving to the destination with a rented car. - No cost is applied if arriving to the destination after dropping off the rented - car. - """ - keepingCost: Cost -} - """ Is it possible to arrive to the destination with a rented scooter and does it come with an extra cost. @@ -4347,12 +4329,6 @@ input ScooterRentalPreferencesInput { Preferences related to car rental (station based or floating car rental). """ input CarRentalPreferencesInput { - """ - Is it possible to arrive to the destination with a rented car and does it - come with an extra cost. - """ - destinationCarPolicy: DestinationCarPolicyInput - """ Rental networks which can be potentially used as part of an itinerary. """ From fd29a03eb47024c538066608fcef794284c459f4 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 27 Feb 2024 23:37:20 +0200 Subject: [PATCH 0687/1688] Set arriveBy --- .../opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index accd2f40fb3..9d166bf3872 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -48,6 +48,7 @@ public static RouteRequest toRouteRequest( request.setDateTime(args.getGraphQLDateTime().getGraphQLEarliestDeparture().toInstant()); } else if (dateTime.getGraphQLLatestArrival() != null) { request.setDateTime(args.getGraphQLDateTime().getGraphQLLatestArrival().toInstant()); + request.setArriveBy(true); } else { request.setDateTime(Instant.now()); } From 0ee0df01cf6cb1b3a851f1957a079b6d7b6d8d4a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 28 Feb 2024 10:00:43 +0100 Subject: [PATCH 0688/1688] Wait when opening dagger PRs [ci skip] --- renovate.json5 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/renovate.json5 b/renovate.json5 index 04e0fd14471..e2a94318313 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -121,6 +121,13 @@ ], "automerge": true, "schedule": "after 11pm and before 5am every weekday" + }, + { + "description": "give some projects time to publish a changelog before opening the PR", + "matchPackagePrefixes": [ + "com.google.dagger:" + ], + "minimumReleaseAge": "1 week" } ], "timezone": "Europe/Berlin" From dd93de0c83943001060249516b172d93ecaa0b44 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 28 Feb 2024 11:44:41 +0000 Subject: [PATCH 0689/1688] Add changelog entry for #5698 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index d577d0c469f..fec6d606a4b 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -94,6 +94,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add scooter preferences [#5632](https://github.com/opentripplanner/OpenTripPlanner/pull/5632) - Add GroupStop layer to new debug frontend [#5666](https://github.com/opentripplanner/OpenTripPlanner/pull/5666) - Update to newest version of GTFS Flex location groups [#5655](https://github.com/opentripplanner/OpenTripPlanner/pull/5655) +- Use NeTEx authority short name if name is not present [#5698](https://github.com/opentripplanner/OpenTripPlanner/pull/5698) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From eee8618696c6cd11e2a05e770a1ae26e91fd1963 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 28 Feb 2024 13:05:15 +0100 Subject: [PATCH 0690/1688] Send POST request instead of GET --- .../vehicleparking/bikely/BikelyUpdater.java | 125 +++++++++++++----- .../framework/io/OtpHttpClient.java | 58 +++++--- 2 files changed, 133 insertions(+), 50 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java index c788e2314dc..5758d5d99e1 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java @@ -3,69 +3,128 @@ import static org.opentripplanner.routing.vehicle_parking.VehicleParkingState.OPERATIONAL; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.node.ObjectNode; +import java.time.Duration; +import java.util.ArrayList; import java.util.Currency; +import java.util.List; +import java.util.Objects; +import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.LocalizedString; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; import org.opentripplanner.transit.model.basic.LocalizedMoney; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.updater.spi.GenericJsonDataSource; +import org.opentripplanner.updater.spi.DataSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Vehicle parking updater class for the Norwegian bike box provider Bikely: * https://www.safebikely.com/ */ -public class BikelyUpdater extends GenericJsonDataSource { +public class BikelyUpdater implements DataSource { + + private static final Logger LOG = LoggerFactory.getLogger(BikelyUpdater.class); private static final String JSON_PARSE_PATH = "result"; private static final Currency NOK = Currency.getInstance("NOK"); - private final String feedId; + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); + private static final ObjectNode POST_PARAMS = OBJECT_MAPPER + .createObjectNode() + .put("groupPins", true) + .put("lonMin", 0) + .put("lonMax", 0) + .put("latMin", 0) + .put("latMax", 0); + private final OtpHttpClient httpClient = new OtpHttpClient(); + private final BikelyUpdaterParameters parameters; + private List lots; public BikelyUpdater(BikelyUpdaterParameters parameters) { - super(parameters.url().toString(), JSON_PARSE_PATH, parameters.httpHeaders()); - this.feedId = parameters.feedId(); + this.parameters = parameters; } @Override - protected VehicleParking parseElement(JsonNode jsonNode) { - var vehicleParkId = new FeedScopedId(feedId, jsonNode.get("id").asText()); + public boolean update() { + this.lots = + httpClient.postJsonAndMap( + parameters.url(), + POST_PARAMS, + Duration.ofSeconds(30), + parameters.httpHeaders().asMap(), + is -> { + try { + var lots = new ArrayList(); + OBJECT_MAPPER + .readTree(is) + .path(JSON_PARSE_PATH) + .forEach(node -> lots.add(parseElement(node))); + + return lots.stream().filter(Objects::nonNull).toList(); + } catch (Exception e) { + LOG.error("Could not get Bikely updates", e); + } + + return List.of(); + } + ); + + return true; + } - var lat = jsonNode.get("latitude").asDouble(); - var lng = jsonNode.get("longitude").asDouble(); - var coord = new WgsCoordinate(lat, lng); + @Override + public List getUpdates() { + return List.copyOf(lots); + } - var name = new NonLocalizedString(jsonNode.path("name").asText()); + @Nullable + private VehicleParking parseElement(JsonNode jsonNode) { + if (jsonNode.path("hasStandardParking").asBoolean()) { + var vehicleParkId = new FeedScopedId(parameters.feedId(), jsonNode.get("id").asText()); - var totalSpots = jsonNode.get("totalStandardSpots").asInt(); - var freeSpots = jsonNode.get("availableStandardSpots").asInt(); - var isUnderMaintenance = jsonNode.get("isInMaintenance").asBoolean(); + var lat = jsonNode.get("latitude").asDouble(); + var lng = jsonNode.get("longitude").asDouble(); + var coord = new WgsCoordinate(lat, lng); - LocalizedString note = toNote(jsonNode); + var name = new NonLocalizedString(jsonNode.path("name").asText()); - VehicleParking.VehicleParkingEntranceCreator entrance = builder -> - builder - .entranceId(new FeedScopedId(feedId, vehicleParkId.getId() + "/entrance")) + var totalSpots = jsonNode.get("totalStandardSpots").asInt(); + var freeSpots = jsonNode.get("availableStandardSpots").asInt(); + var isUnderMaintenance = jsonNode.get("isInMaintenance").asBoolean(); + + LocalizedString note = toNote(jsonNode); + + VehicleParking.VehicleParkingEntranceCreator entrance = builder -> + builder + .entranceId(new FeedScopedId(parameters.feedId(), vehicleParkId.getId() + "/entrance")) + .name(name) + .coordinate(coord) + .walkAccessible(true) + .carAccessible(false); + + return VehicleParking + .builder() + .id(vehicleParkId) .name(name) + .bicyclePlaces(true) + .capacity(VehicleParkingSpaces.builder().bicycleSpaces(totalSpots).build()) + .availability(VehicleParkingSpaces.builder().bicycleSpaces(freeSpots).build()) + .state(toState(isUnderMaintenance)) .coordinate(coord) - .walkAccessible(true) - .carAccessible(false); - - return VehicleParking - .builder() - .id(vehicleParkId) - .name(name) - .bicyclePlaces(true) - .capacity(VehicleParkingSpaces.builder().bicycleSpaces(totalSpots).build()) - .availability(VehicleParkingSpaces.builder().bicycleSpaces(freeSpots).build()) - .state(toState(isUnderMaintenance)) - .coordinate(coord) - .entrance(entrance) - .note(note) - .build(); + .entrance(entrance) + .note(note) + .build(); + } else { + return null; + } } private static LocalizedString toNote(JsonNode price) { diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java index 0afe431e2c9..d53a1058249 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java @@ -27,6 +27,7 @@ import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.Header; import org.apache.hc.core5.http.HttpEntity; +import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.io.HttpClientResponseHandler; import org.apache.hc.core5.http.io.SocketConfig; @@ -264,23 +265,20 @@ public T getAndMap( Map headers, ResponseMapper contentMapper ) { - URL downloadUrl; - try { - downloadUrl = uri.toURL(); - } catch (MalformedURLException e) { - throw new OtpHttpClientException(e); - } - String proto = downloadUrl.getProtocol(); - if (proto.equals("http") || proto.equals("https")) { - return executeAndMap(new HttpGet(uri), timeout, headers, contentMapper); - } else { - // Local file probably, try standard java - try (InputStream is = downloadUrl.openStream()) { - return contentMapper.apply(is); - } catch (Exception e) { - throw new OtpHttpClientException(e); - } - } + return sendAndMap(new HttpGet(uri), uri, timeout, headers, contentMapper); + } + + public T postJsonAndMap( + URI uri, + JsonNode jsonBody, + Duration timeout, + Map headers, + ResponseMapper contentMapper + ) { + var request = new HttpPost(uri); + request.setEntity(new StringEntity(jsonBody.toString())); + request.setHeader(HttpHeaders.CONTENT_TYPE, ContentType.APPLICATION_JSON); + return sendAndMap(request, uri, timeout, headers, contentMapper); } /** @@ -400,6 +398,32 @@ protected T executeAndMapWithResponseHandler( } } + private T sendAndMap( + HttpUriRequestBase request, + URI uri, + Duration timeout, + Map headers, + ResponseMapper contentMapper + ) { + URL downloadUrl; + try { + downloadUrl = uri.toURL(); + } catch (MalformedURLException e) { + throw new OtpHttpClientException(e); + } + String proto = downloadUrl.getProtocol(); + if (proto.equals("http") || proto.equals("https")) { + return executeAndMap(request, timeout, headers, contentMapper); + } else { + // Local file probably, try standard java + try (InputStream is = downloadUrl.openStream()) { + return contentMapper.apply(is); + } catch (Exception e) { + throw new OtpHttpClientException(e); + } + } + } + /** * Configures the request with a custom timeout. */ From 6d23c57ce1e0bb3ae9e82705978b616f6a298f70 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Wed, 28 Feb 2024 14:32:48 +0200 Subject: [PATCH 0691/1688] Update test class name --- .../apis/gtfs/mapping/LegacyRouteRequestMapperTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java index ff0321bc5db..379338de21d 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java @@ -38,7 +38,7 @@ import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; -class RouteRequestMapperTest implements PlanTestConstants { +class LegacyRouteRequestMapperTest implements PlanTestConstants { static final GraphQLRequestContext context; From 78d916941229cc313452f5b77aba06602a50c2cb Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 28 Feb 2024 15:48:54 +0100 Subject: [PATCH 0692/1688] docs: Add info about maintainer --- .../openstreetmap/tagmapping/HamburgMapper.java | 2 ++ .../openstreetmap/tagmapping/HamburgMapperTest.java | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java index 5bcd4d23380..1c8b68d622d 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java @@ -8,6 +8,8 @@ * @see GermanyMapper * @see OsmTagMapper * @see DefaultMapper + * + * @author Maintained by HBT (geofox-team@hbt.de) */ public class HamburgMapper extends GermanyMapper { diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java index 8e3dc9afc77..1af3eefee18 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapperTest.java @@ -9,6 +9,9 @@ import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.openstreetmap.model.OSMWithTags; +/** + * @author Maintained by HBT (geofox-team@hbt.de) + */ public class HamburgMapperTest { private HamburgMapper mapper; From b38259f95dc67aaad141acfb03a5a223c4de1246 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Wed, 28 Feb 2024 15:52:17 +0100 Subject: [PATCH 0693/1688] style: Fixed formatting --- .../opentripplanner/openstreetmap/tagmapping/HamburgMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java index 1c8b68d622d..f893fbb5519 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/HamburgMapper.java @@ -8,7 +8,7 @@ * @see GermanyMapper * @see OsmTagMapper * @see DefaultMapper - * + * * @author Maintained by HBT (geofox-team@hbt.de) */ public class HamburgMapper extends GermanyMapper { From 6302dc42ebd18684680d2f8cbe9b6300fa0f8836 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 28 Feb 2024 15:09:16 +0000 Subject: [PATCH 0694/1688] Add changelog entry for #5701 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index fec6d606a4b..27e70712e4c 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -95,6 +95,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add GroupStop layer to new debug frontend [#5666](https://github.com/opentripplanner/OpenTripPlanner/pull/5666) - Update to newest version of GTFS Flex location groups [#5655](https://github.com/opentripplanner/OpenTripPlanner/pull/5655) - Use NeTEx authority short name if name is not present [#5698](https://github.com/opentripplanner/OpenTripPlanner/pull/5698) +- Add Hamburg OSM mapper [#5701](https://github.com/opentripplanner/OpenTripPlanner/pull/5701) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 4ead620f1146a91cc984c40b56b1ef323e535186 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 28 Feb 2024 16:55:55 +0100 Subject: [PATCH 0695/1688] Add Javadoc --- .../java/org/opentripplanner/framework/io/OtpHttpClient.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java index d53a1058249..72b67441a18 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java @@ -268,6 +268,10 @@ public T getAndMap( return sendAndMap(new HttpGet(uri), uri, timeout, headers, contentMapper); } + /** + * Send an HTTP POST request with Content-Type: application/json. The body of the request + * is defined by {@code jsonBody}. + */ public T postJsonAndMap( URI uri, JsonNode jsonBody, From 36429c103f78fe1c32ecf22c21f08424a923ca84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Thu, 29 Feb 2024 10:37:20 +0100 Subject: [PATCH 0696/1688] Satisfy peer dependency --- client-next/package-lock.json | 156 ++++++++++++++++++++-------------- client-next/package.json | 2 +- 2 files changed, 95 insertions(+), 63 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 247161948d4..7f01598ad30 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -26,11 +26,11 @@ "@testing-library/react": "14.1.2", "@types/react": "18.2.21", "@types/react-dom": "18.2.7", - "@typescript-eslint/eslint-plugin": "6.5.0", - "@typescript-eslint/parser": "6.5.0", + "@typescript-eslint/eslint-plugin": "7.1.0", + "@typescript-eslint/parser": "7.1.0", "@vitejs/plugin-react": "4.0.4", "@vitest/coverage-v8": "1.1.3", - "eslint": "8.48.0", + "eslint": "8.56.0", "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.28.1", "eslint-plugin-jsx-a11y": "6.7.1", @@ -1656,9 +1656,9 @@ } }, "node_modules/@eslint/js": { - "version": "8.48.0", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.48.0.tgz", - "integrity": "sha512-ZSjtmelB7IJfWD2Fvb7+Z+ChTIKWq6kjda95fLcQKNS5aheVHn4IkfgRQE3sIIzTcSLwLcLZUD9UBt+V7+h+Pw==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz", + "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==", "dev": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" @@ -3584,9 +3584,9 @@ "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, "node_modules/@types/semver": { - "version": "7.5.7", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.7.tgz", - "integrity": "sha512-/wdoPq1QqkSj9/QOeKkFquEuPzQbHTWAMPH/PaUMB+JuR31lXhlWXRZ52IpfDYVlDOUBvX09uBrPwxGT1hjNBg==", + "version": "7.5.8", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", + "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, "node_modules/@types/supercluster": { @@ -3612,16 +3612,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.5.0.tgz", - "integrity": "sha512-2pktILyjvMaScU6iK3925uvGU87E+N9rh372uGZgiMYwafaw9SXq86U04XPq3UH6tzRvNgBsub6x2DacHc33lw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz", + "integrity": "sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "6.5.0", - "@typescript-eslint/type-utils": "6.5.0", - "@typescript-eslint/utils": "6.5.0", - "@typescript-eslint/visitor-keys": "6.5.0", + "@typescript-eslint/scope-manager": "7.1.0", + "@typescript-eslint/type-utils": "7.1.0", + "@typescript-eslint/utils": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -3637,8 +3637,8 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^6.0.0 || ^6.0.0-alpha", - "eslint": "^7.0.0 || ^8.0.0" + "@typescript-eslint/parser": "^7.0.0", + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -3680,15 +3680,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-6.5.0.tgz", - "integrity": "sha512-LMAVtR5GN8nY0G0BadkG0XIe4AcNMeyEy3DyhKGAh9k4pLSMBO7rF29JvDBpZGCmp5Pgz5RLHP6eCpSYZJQDuQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.1.0.tgz", + "integrity": "sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "6.5.0", - "@typescript-eslint/types": "6.5.0", - "@typescript-eslint/typescript-estree": "6.5.0", - "@typescript-eslint/visitor-keys": "6.5.0", + "@typescript-eslint/scope-manager": "7.1.0", + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/typescript-estree": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0", "debug": "^4.3.4" }, "engines": { @@ -3699,7 +3699,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -3708,13 +3708,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-6.5.0.tgz", - "integrity": "sha512-A8hZ7OlxURricpycp5kdPTH3XnjG85UpJS6Fn4VzeoH4T388gQJ/PGP4ole5NfKt4WDVhmLaQ/dBLNDC4Xl/Kw==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz", + "integrity": "sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.5.0", - "@typescript-eslint/visitor-keys": "6.5.0" + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0" }, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -3725,13 +3725,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-6.5.0.tgz", - "integrity": "sha512-f7OcZOkRivtujIBQ4yrJNIuwyCQO1OjocVqntl9dgSIZAdKqicj3xFDqDOzHDlGCZX990LqhLQXWRnQvsapq8A==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz", + "integrity": "sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "6.5.0", - "@typescript-eslint/utils": "6.5.0", + "@typescript-eslint/typescript-estree": "7.1.0", + "@typescript-eslint/utils": "7.1.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -3743,7 +3743,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" }, "peerDependenciesMeta": { "typescript": { @@ -3752,9 +3752,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-6.5.0.tgz", - "integrity": "sha512-eqLLOEF5/lU8jW3Bw+8auf4lZSbbljHR2saKnYqON12G/WsJrGeeDHWuQePoEf9ro22+JkbPfWQwKEC5WwLQ3w==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.1.0.tgz", + "integrity": "sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA==", "dev": true, "engines": { "node": "^16.0.0 || >=18.0.0" @@ -3765,16 +3765,17 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-6.5.0.tgz", - "integrity": "sha512-q0rGwSe9e5Kk/XzliB9h2LBc9tmXX25G0833r7kffbl5437FPWb2tbpIV9wAATebC/018pGa9fwPDuvGN+LxWQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz", + "integrity": "sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.5.0", - "@typescript-eslint/visitor-keys": "6.5.0", + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/visitor-keys": "7.1.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", + "minimatch": "9.0.3", "semver": "^7.5.4", "ts-api-utils": "^1.0.1" }, @@ -3791,6 +3792,15 @@ } } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -3803,6 +3813,21 @@ "node": ">=10" } }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { "version": "7.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", @@ -3825,17 +3850,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-6.5.0.tgz", - "integrity": "sha512-9nqtjkNykFzeVtt9Pj6lyR9WEdd8npPhhIPM992FWVkZuS6tmxHfGVnlUcjpUP2hv8r4w35nT33mlxd+Be1ACQ==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.1.0.tgz", + "integrity": "sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "6.5.0", - "@typescript-eslint/types": "6.5.0", - "@typescript-eslint/typescript-estree": "6.5.0", + "@typescript-eslint/scope-manager": "7.1.0", + "@typescript-eslint/types": "7.1.0", + "@typescript-eslint/typescript-estree": "7.1.0", "semver": "^7.5.4" }, "engines": { @@ -3846,7 +3871,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "eslint": "^7.0.0 || ^8.0.0" + "eslint": "^8.56.0" } }, "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { @@ -3883,12 +3908,12 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-6.5.0.tgz", - "integrity": "sha512-yCB/2wkbv3hPsh02ZS8dFQnij9VVQXJMN/gbQsaaY+zxALkZnxa/wagvLEFsAWMPv7d7lxQmNsIzGU1w/T/WyA==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz", + "integrity": "sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "6.5.0", + "@typescript-eslint/types": "7.1.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -3899,6 +3924,12 @@ "url": "https://opencollective.com/typescript-eslint" } }, + "node_modules/@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, "node_modules/@vitejs/plugin-react": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.0.4.tgz", @@ -5721,18 +5752,19 @@ } }, "node_modules/eslint": { - "version": "8.48.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.48.0.tgz", - "integrity": "sha512-sb6DLeIuRXxeM1YljSe1KEx9/YYeZFQWcV8Rq9HfigmdDEugjLEVEa1ozDjL6YDjBpQHPJxJzze+alxi4T3OLg==", + "version": "8.56.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz", + "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", - "@eslint/eslintrc": "^2.1.2", - "@eslint/js": "8.48.0", - "@humanwhocodes/config-array": "^0.11.10", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.56.0", + "@humanwhocodes/config-array": "^0.11.13", "@humanwhocodes/module-importer": "^1.0.1", "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", "ajv": "^6.12.4", "chalk": "^4.0.0", "cross-spawn": "^7.0.2", diff --git a/client-next/package.json b/client-next/package.json index d0461a508b2..ad3f1fa10a5 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -39,7 +39,7 @@ "@typescript-eslint/parser": "7.1.0", "@vitejs/plugin-react": "4.0.4", "@vitest/coverage-v8": "1.1.3", - "eslint": "8.48.0", + "eslint": "8.56.0", "eslint-config-prettier": "9.0.0", "eslint-plugin-import": "2.28.1", "eslint-plugin-jsx-a11y": "6.7.1", From 5f2323867b01c45c7d163a18ba7087a68d225d64 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 29 Feb 2024 09:50:54 +0000 Subject: [PATCH 0697/1688] Upgrade debug client to version 2024/02/2024-02-29T09:50 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index cbc31d4b96d..a7b15bef13b 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From 6a0298535c51a6d626b0e4c81d7fb6efa8510ed8 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 29 Feb 2024 13:23:09 +0000 Subject: [PATCH 0698/1688] Add changelog entry for #5657 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 27e70712e4c..0b6134e4939 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -96,6 +96,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Update to newest version of GTFS Flex location groups [#5655](https://github.com/opentripplanner/OpenTripPlanner/pull/5655) - Use NeTEx authority short name if name is not present [#5698](https://github.com/opentripplanner/OpenTripPlanner/pull/5698) - Add Hamburg OSM mapper [#5701](https://github.com/opentripplanner/OpenTripPlanner/pull/5701) +- Remove configurable car speed and determine it in graph build [#5657](https://github.com/opentripplanner/OpenTripPlanner/pull/5657) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.4.0 (2023-09-13) From 340ca13b7d2a132d3875c4da475855727b970b01 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 27 Feb 2024 12:28:55 +0100 Subject: [PATCH 0699/1688] Update documentation --- .../framework/lang/StringUtils.java | 7 ++++-- .../transit/model/framework/FeedScopedId.java | 7 +++++- .../framework/lang/StringUtilsTest.java | 15 +++++++++--- .../model/framework/FeedScopedIdTest.java | 23 +++++++++++++------ 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java index b231f980286..1e57fb55027 100644 --- a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java +++ b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java @@ -10,6 +10,9 @@ public class StringUtils { /** * Regex to find unprintable characters like newlines and 'ZERO WIDTH SPACE' (U+200B). + *

      + * \p{C} was chosen over \p{Cntrl} because it also recognises invisible control characters in the + * middle of a word. */ private static final String INVISIBLE_CHARS_REGEX = "\\p{C}"; /** @@ -137,7 +140,7 @@ public static String kebabCase(String input) { * Note that "regular" whitespace characters like U+0020 and U+2000 are considered visible and * therefore not removed. */ - public static String removeInvisibleChars(String input) { - return INVISIBLE_CHARS_PATTERN.matcher(input).replaceAll(""); + public static boolean containsInvisibleCharacters(String input) { + return INVISIBLE_CHARS_PATTERN.matcher(input).find(); } } diff --git a/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java b/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java index a0d7c72b751..b48ff040c28 100644 --- a/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java +++ b/src/main/java/org/opentripplanner/transit/model/framework/FeedScopedId.java @@ -59,9 +59,14 @@ public static FeedScopedId parse(String value) throws IllegalArgumentException { * Parses a string consisting of concatenated FeedScopedIds to a List */ public static List parseList(String s) { + if (StringUtils.containsInvisibleCharacters(s)) { + throw new IllegalArgumentException( + "The input string '%s' contains invisible characters which is not allowed.".formatted(s) + ); + } return Arrays .stream(s.split(",")) - .map(input -> StringUtils.removeInvisibleChars(input).strip()) + .map(String::strip) .filter(i -> !i.isBlank()) .map(FeedScopedId::parse) .toList(); diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java index f65e5da4406..c9a0df963e0 100644 --- a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java @@ -3,6 +3,7 @@ import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -85,8 +86,16 @@ void quoteReplace() { } @ParameterizedTest - @ValueSource(strings = { "\u200B", "\n", "\t" }) - void removeInvisibleChars(String input) { - assertEquals("", StringUtils.removeInvisibleChars(input)); + @ValueSource( + strings = { "\u200B", "\n", "\t", "\thello", "f\noo", "\ntri\nmet:123\t", "tri\u200Bmet:123" } + ) + void containsInvisibleChars(String input) { + assertTrue(StringUtils.containsInvisibleCharacters(input)); + } + + @ParameterizedTest + @ValueSource(strings = { "", " ", "hello", " hello", " fo o " }) + void noInvisibleChars(String input) { + assertFalse(StringUtils.containsInvisibleCharacters(input)); } } diff --git a/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java b/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java index 812c4c87fbf..a7c7c5ff058 100644 --- a/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java +++ b/src/test/java/org/opentripplanner/transit/model/framework/FeedScopedIdTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNull; import java.util.List; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; @@ -18,22 +19,30 @@ void ofNullable() { assertNull(FeedScopedId.ofNullable("FEED", null)); } + @ParameterizedTest + @ValueSource( + strings = { "trimet:123", "trimet:123 ", "trimet:123, ", ",trimet:123 , ", " trimet:123 " } + ) + void parseList(String input) { + assertEquals(TRIMET_123, FeedScopedId.parseList(input)); + } + @ParameterizedTest @ValueSource( strings = { - "trimet:123", - "trimet:123 ", - "trimet:123, ", - ",trimet:123 , ", ",trimet:123 , ,\u200B,", - " trimet:123 ", "\u200Btrimet:123", "\u200B\u200Btri\u200Bmet:123\u200B", "\ntrimet:123\t", "\ntri\nmet:123\t", } ) - void parseList(String input) { - assertEquals(TRIMET_123, FeedScopedId.parseList(input)); + void throwExceptionForInvisibleChar(String input) { + Assertions.assertThrows( + IllegalArgumentException.class, + () -> { + FeedScopedId.parseList(input); + } + ); } } From 6472249a9f7d1aa799ecffab61eb252ba50168b5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 29 Feb 2024 16:21:51 +0100 Subject: [PATCH 0700/1688] Apply review feedback --- src/main/java/org/opentripplanner/datastore/OtpDataStore.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java index 937b4fb8203..0c2e9a6608c 100644 --- a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java +++ b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java @@ -108,7 +108,7 @@ public void open() { if (config.stopConsolidation() != null) { stopConsolidation = - findSourceUsingAllRepos(it -> it.findCompositeSource(config.stopConsolidation(), CONFIG)); + findSourceUsingAllRepos(it -> it.findCompositeSource(config.stopConsolidation(), GTFS)); } addAll(Arrays.asList(streetGraph, graph, buildReportDir)); From a6f1b88fcf9f5b4dfec821973758d0cb45b5d374 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 29 Feb 2024 17:30:23 +0100 Subject: [PATCH 0701/1688] Prevent feed id from being used twice --- .../gtfs/graphbuilder/GtfsModule.java | 36 ++++++++++++++++++- .../graph_builder/module/GtfsModuleTest.java | 33 ++++++++++++----- 2 files changed, 59 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java b/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java index cf9d48c64c5..2f7feb5993e 100644 --- a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java +++ b/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsModule.java @@ -120,12 +120,20 @@ public void buildGraph() { boolean hasTransit = false; + Map feedIdsEncountered = new HashMap<>(); + try { for (GtfsBundle gtfsBundle : gtfsBundles) { GtfsMutableRelationalDao gtfsDao = loadBundle(gtfsBundle); + + final String feedId = gtfsBundle.getFeedId().getId(); + verifyUniqueFeedId(gtfsBundle, feedIdsEncountered, feedId); + + feedIdsEncountered.put(feedId, gtfsBundle); + GTFSToOtpTransitServiceMapper mapper = new GTFSToOtpTransitServiceMapper( new OtpTransitServiceBuilder(transitModel.getStopModel(), issueStore), - gtfsBundle.getFeedId().getId(), + feedId, issueStore, gtfsBundle.discardMinTransferTimes(), gtfsDao, @@ -203,6 +211,32 @@ public void buildGraph() { transitModel.updateCalendarServiceData(hasTransit, calendarServiceData, issueStore); } + /** + * Verifies that a feed id is not assigned twice. + *

      + * Duplicates can happen in the following cases: + * - the feed id is configured twice in build-config.json + * - two GTFS feeds have the same feed_info.feed_id + * - a GTFS feed defines a feed_info.feed_id like '3' that collides with an auto-generated one + *

      + * Debugging these cases is very confusing, so we prevent it from happening. + */ + private static void verifyUniqueFeedId( + GtfsBundle gtfsBundle, + Map feedIdsEncountered, + String feedId + ) { + if (feedIdsEncountered.containsKey(feedId)) { + LOG.error( + "Feed id '{}' has been used for {} but it was already assigned to {}.", + feedId, + gtfsBundle, + feedIdsEncountered.get(feedId) + ); + throw new IllegalArgumentException("Duplicate feed id: '%s'".formatted(feedId)); + } + } + @Override public void checkInputs() { for (GtfsBundle bundle : gtfsBundles) { diff --git a/src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java index c628a14ad43..8123661990e 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/GtfsModuleTest.java @@ -2,6 +2,7 @@ import static graphql.Assert.assertNotNull; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import java.util.List; import java.util.stream.Collectors; @@ -23,7 +24,7 @@ class GtfsModuleTest { @Test - public void addShapesForFrequencyTrips() { + void addShapesForFrequencyTrips() { var model = buildTestModel(); var bundle = new GtfsBundle(ConstantsForTests.SIMPLE_GTFS); @@ -44,7 +45,7 @@ public void addShapesForFrequencyTrips() { assertEquals(1, frequencyTripPattern.size()); - var tripPattern = frequencyTripPattern.get(0); + var tripPattern = frequencyTripPattern.getFirst(); assertNotNull(tripPattern.getGeometry()); assertNotNull(tripPattern.getHopGeometry(0)); @@ -53,6 +54,20 @@ public void addShapesForFrequencyTrips() { assertNotNull(pattern.getHopGeometry(0)); } + @Test + void duplicateFeedId() { + var bundles = List.of(bundle("A"), bundle("A")); + var model = buildTestModel(); + + var module = new GtfsModule( + bundles, + model.transitModel, + model.graph, + ServiceDateInterval.unbounded() + ); + assertThrows(IllegalArgumentException.class, module::buildGraph); + } + private static TestModels buildTestModel() { var deduplicator = new Deduplicator(); var stopModel = new StopModel(); @@ -63,15 +78,15 @@ private static TestModels buildTestModel() { record TestModels(Graph graph, TransitModel transitModel) {} + static GtfsBundle bundle(String feedId) { + var b = new GtfsBundle(ResourceLoader.of(GtfsModuleTest.class).file("/gtfs/interlining")); + b.setFeedId(new GtfsFeedId.Builder().id(feedId).build()); + return b; + } + @Nested class Interlining { - static GtfsBundle bundle(String feedId) { - var b = new GtfsBundle(ResourceLoader.of(GtfsModuleTest.class).file("/gtfs/interlining")); - b.setFeedId(new GtfsFeedId.Builder().id(feedId).build()); - return b; - } - static List interliningCases() { return List.of( Arguments.of(List.of(bundle("A")), 2), @@ -86,7 +101,7 @@ static List interliningCases() { */ @ParameterizedTest(name = "Bundles {0} should generate {1} stay-seated transfers") @MethodSource("interliningCases") - public void interline(List bundles, int expectedTransfers) { + void interline(List bundles, int expectedTransfers) { var model = buildTestModel(); var feedIds = bundles.stream().map(GtfsBundle::getFeedId).collect(Collectors.toSet()); From 0e781bfcee4a17ff8025f167b37fd81f87866d15 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 29 Feb 2024 17:15:31 +0100 Subject: [PATCH 0702/1688] fix: Make access/egress time-penalty decorators in Raptor work with reverse search --- .../model/AbstractAccessEgressDecorator.java | 15 ----- .../raptor/path/PathBuilderLeg.java | 18 ++++-- .../rangeraptor/DefaultRangeRaptorWorker.java | 12 ++-- .../rangeraptor/context/SearchContext.java | 2 +- .../rangeraptor/transit/AccessPaths.java | 42 ++++++++++-- .../transit/AccessWithPenalty.java | 4 +- .../transit/EgressWithPenalty.java | 4 +- .../rangeraptor/transit/AccessPathsTest.java | 64 +++++++++++++++++-- .../transit/AccessWithPenaltyTest.java | 8 +-- .../transit/EgressWithPenaltyTest.java | 8 +-- 10 files changed, 125 insertions(+), 52 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java index 35af442576c..ddb266e0884 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/AbstractAccessEgressDecorator.java @@ -122,19 +122,4 @@ public boolean equals(Object o) { public int hashCode() { return Objects.hash(delegate); } - - /** - * Use this method to remove a decorator of the given type. - */ - public static RaptorAccessEgress removeRaptorDecoratorIfItExist( - RaptorAccessEgress path, - Class decoratorClazz - ) { - if (path == null) { - return null; - } - return path.getClass() == decoratorClazz - ? ((AbstractAccessEgressDecorator) path).delegate() - : path; - } } diff --git a/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java b/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java index 4c919ca9d7a..335d38203b1 100644 --- a/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java +++ b/src/main/java/org/opentripplanner/raptor/path/PathBuilderLeg.java @@ -353,9 +353,6 @@ AccessPathLeg createAccessPathLeg( PathLeg nextLeg = next.createPathLeg(costCalculator, slackProvider); var accessPath = asAccessLeg().streetPath; int cost = cost(costCalculator, accessPath); - - accessPath = AccessWithPenalty.removeDecoratorIfItExist(accessPath); - return new AccessPathLeg<>(accessPath, fromTime, toTime, cost, nextLeg); } @@ -453,9 +450,6 @@ private EgressPathLeg createEgressPathLeg( ) { int cost = egressCost(costCalculator, slackProvider); var egressPath = asEgressLeg().streetPath; - - egressPath = EgressWithPenalty.removeDecoratorIfItExist(egressPath); - return new EgressPathLeg<>(egressPath, fromTime, toTime, cost); } @@ -703,13 +697,23 @@ private abstract static class MyStreetLeg extends AbstractMyLeg { final RaptorAccessEgress streetPath; MyStreetLeg(RaptorAccessEgress streetPath) { - this.streetPath = streetPath; + this.streetPath = removeTimePenaltyDecorator(streetPath); } @Override public boolean hasRides() { return streetPath.hasRides(); } + + private static RaptorAccessEgress removeTimePenaltyDecorator(RaptorAccessEgress path) { + if (path instanceof AccessWithPenalty awp) { + return awp.removeDecorator(); + } + if (path instanceof EgressWithPenalty awp) { + return awp.removeDecorator(); + } + return path; + } } private static class MyAccessLeg extends MyStreetLeg { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java index 63cc4e2756c..0f2ceb9d6e4 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/DefaultRangeRaptorWorker.java @@ -140,11 +140,13 @@ public RaptorWorkerResult route() { } // Iterate over virtual departure times - this is needed to allow access with a time-penalty - // which falls outside the search-window due to the penalty to be added to the result. - final IntIterator as = accessPaths.iterateOverPathsWithPenalty(iterationDepartureTime); - while (as.hasNext()) { - setupIteration(as.next()); - runRaptorForMinute(); + // which falls outside the search-window due to the added time-penalty. + if (!calculator.oneIterationOnly()) { + final IntIterator as = accessPaths.iterateOverPathsWithPenalty(iterationDepartureTime); + while (as.hasNext()) { + setupIteration(as.next()); + runRaptorForMinute(); + } } }); return state.results(); diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java index 65e0246290c..518d02ae3ad 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/context/SearchContext.java @@ -318,7 +318,7 @@ private static AccessPaths accessPaths(int iterationStep, RaptorRequest reque boolean forward = request.searchDirection().isForward(); var params = request.searchParams(); var paths = forward ? params.accessPaths() : params.egressPaths(); - return AccessPaths.create(iterationStep, paths, request.profile()); + return AccessPaths.create(iterationStep, paths, request.profile(), request.searchDirection()); } private static EgressPaths egressPaths(RaptorRequest request) { diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 434c2e3c611..26fb49ec88a 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -8,26 +8,40 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.function.IntUnaryOperator; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.api.request.RaptorProfile; import org.opentripplanner.raptor.spi.IntIterator; import org.opentripplanner.raptor.util.IntIterators; +/** + * This class is responsible for performing Raptor-specific functionality on access-paths. It + * groups paths based on number-of-trips(FLEX mainly) and stop-arrival "mode" (on-board or on-foot). + * This is used to insert the access into the Raptor rounds at the correct moment (round), so + * the number-of-transfers criteria become correct. + *

      + * This class also provides an iterator to iterate over iteration steps in the Raptor algorithm + * to cover extra minutes outside the search-window for access with a time-penalty. + */ public class AccessPaths { private final int iterationStep; private final int maxTimePenalty; + private final IntUnaryOperator iterationOp; private final TIntObjectMap> arrivedOnStreetByNumOfRides; private final TIntObjectMap> arrivedOnBoardByNumOfRides; private int iterationTimePenaltyLimit = RaptorConstants.TIME_NOT_SET; private AccessPaths( int iterationStep, + IntUnaryOperator iterationOp, TIntObjectMap> arrivedOnStreetByNumOfRides, TIntObjectMap> arrivedOnBoardByNumOfRides ) { this.iterationStep = iterationStep; + this.iterationOp = iterationOp; this.arrivedOnStreetByNumOfRides = arrivedOnStreetByNumOfRides; this.arrivedOnBoardByNumOfRides = arrivedOnBoardByNumOfRides; this.maxTimePenalty = @@ -50,7 +64,8 @@ private AccessPaths( public static AccessPaths create( int iterationStep, Collection paths, - RaptorProfile profile + RaptorProfile profile, + SearchDirection searchDirection ) { if (profile.is(RaptorProfile.MULTI_CRITERIA)) { paths = removeNonOptimalPathsForMcRaptor(paths); @@ -62,6 +77,7 @@ public static AccessPaths create( return new AccessPaths( iterationStep, + iterationOp(searchDirection), groupByRound(paths, RaptorAccessEgress::stopReachedByWalking), groupByRound(paths, RaptorAccessEgress::stopReachedOnBoard) ); @@ -100,9 +116,9 @@ public IntIterator iterateOverPathsWithPenalty(final int earliestDepartureTime) } // In the first iteration, we want the time-limit to be zero and the raptor-iteration-time // to be one step before the earliest-departure-time in the search-window. This will include - // all access with a penalty in the first iteration. Then + // all access with a penalty in the first iteration. Then: this.iterationTimePenaltyLimit = -iterationStep; - final int raptorIterationStartTime = earliestDepartureTime - iterationStep; + final int raptorIterationStartTime = earliestDepartureTime - signedIterationStep(iterationStep); return new IntIterator() { @Override @@ -113,7 +129,9 @@ public boolean hasNext() { @Override public int next() { AccessPaths.this.iterationTimePenaltyLimit += iterationStep; - return raptorIterationStartTime - AccessPaths.this.iterationTimePenaltyLimit; + return ( + raptorIterationStartTime - signedIterationStep(AccessPaths.this.iterationTimePenaltyLimit) + ); } }; } @@ -176,4 +194,20 @@ private List filterOnTimePenaltyLimitIfExist(List step : (int step) -> -step; + } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java index 8c65270cbb4..e56b0b6b85e 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenalty.java @@ -40,7 +40,7 @@ public int earliestDepartureTime(int requestedDepartureTime) { * decorator and returns the original access path if decorated. If not, the given path is * returned. */ - public static RaptorAccessEgress removeDecoratorIfItExist(RaptorAccessEgress path) { - return removeRaptorDecoratorIfItExist(path, AccessWithPenalty.class); + public RaptorAccessEgress removeDecorator() { + return delegate(); } } diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java index 6bb7e7bf2c5..0f973d058d7 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenalty.java @@ -35,7 +35,7 @@ public int latestArrivalTime(int requestedArrivalTime) { * decorator and returns the original access path if decorated. If not, the given path is * returned. */ - public static RaptorAccessEgress removeDecoratorIfItExist(RaptorAccessEgress path) { - return removeRaptorDecoratorIfItExist(path, EgressWithPenalty.class); + public RaptorAccessEgress removeDecorator() { + return delegate(); } } diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java index 0371de45bac..bf8e06a73d7 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java @@ -6,6 +6,8 @@ import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flex; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.flexAndWalk; import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.raptor.api.model.SearchDirection.FORWARD; +import static org.opentripplanner.raptor.api.model.SearchDirection.REVERSE; import static org.opentripplanner.raptor.api.request.RaptorProfile.MULTI_CRITERIA; import static org.opentripplanner.raptor.api.request.RaptorProfile.STANDARD; @@ -107,7 +109,8 @@ void iterateOverPathsWithPenalty() { FLEX_B, FLEX_WALK_B ), - MULTI_CRITERIA + MULTI_CRITERIA, + FORWARD ); var iterator = accessPaths.iterateOverPathsWithPenalty(600); @@ -142,12 +145,64 @@ void iterateOverPathsWithPenalty() { assertFalse(iterator.hasNext()); } + @Test + void iterateOverPathsWithPenaltyInReversDirection() { + // Expected at departure 540 + var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60); + + // Expected at departure 540 and 480 + var flexTxWithPenalty = FLEX_TX2.withTimePenalty(61); + + // Expected at departure 540, 480 and 420 + var walkFastWithPenalty = WALK_FAST.withTimePenalty(121); + + // Without time-penalty, the iterator should be empty + var accessPaths = AccessPaths.create( + 60, + List.of(flexFastWithPenalty, flexTxWithPenalty, walkFastWithPenalty, WALK_B, FLEX_B), + STANDARD, + REVERSE + ); + + var iterator = accessPaths.iterateOverPathsWithPenalty(600); + + // First iteration + assertTrue(iterator.hasNext()); + assertEquals(660, iterator.next()); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(1)); + expect(accessPaths.arrivedOnStreetByNumOfRides(1)); + expect(accessPaths.arrivedOnBoardByNumOfRides(2), flexTxWithPenalty); + expect(accessPaths.arrivedOnStreetByNumOfRides(2)); + expect(accessPaths.arrivedOnBoardByNumOfRides(3), flexFastWithPenalty); + expect(accessPaths.arrivedOnStreetByNumOfRides(3)); + expect(accessPaths.arrivedOnBoardByNumOfRides(4)); + expect(accessPaths.arrivedOnStreetByNumOfRides(4)); + + // Second iteration + assertTrue(iterator.hasNext()); + assertEquals(720, iterator.next()); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(2), flexTxWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(3)); + + // Third iteration + assertTrue(iterator.hasNext()); + assertEquals(780, iterator.next()); + expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty); + expect(accessPaths.arrivedOnBoardByNumOfRides(2)); + expect(accessPaths.arrivedOnBoardByNumOfRides(3)); + + assertFalse(iterator.hasNext()); + } + @Test void hasTimeDependentAccess() { var accessPaths = AccessPaths.create( 60, List.of(WALK_FAST, walk(STOP_A, 20).openingHours(1200, 2400)), - STANDARD + STANDARD, + FORWARD ); assertTrue(accessPaths.hasTimeDependentAccess(), "Time dependent access is better."); @@ -155,7 +210,8 @@ void hasTimeDependentAccess() { AccessPaths.create( 60, List.of(WALK_FAST, walk(STOP_A, 50).openingHours(1200, 2400)), - STANDARD + STANDARD, + REVERSE ); assertFalse(accessPaths.hasTimeDependentAccess(), "Time dependent access is worse."); } @@ -196,6 +252,6 @@ private static AccessPaths create(RaptorProfile profile) { FLEX_BAD, FLEX_B ); - return AccessPaths.create(60, accessPaths, profile); + return AccessPaths.create(60, accessPaths, profile, FORWARD); } } diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java index cedc01e42a1..bead5d607c6 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessWithPenaltyTest.java @@ -7,7 +7,6 @@ import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; import org.junit.jupiter.api.Test; -import org.opentripplanner.raptor.api.model.RaptorAccessEgress; class AccessWithPenaltyTest { @@ -70,10 +69,7 @@ void earliestDepartureTimeWhenServiceIsClosed() { @Test void removeDecoratorIfItExist() { var original = walk(STOP, DURATION).withTimePenalty(PENALTY); - RaptorAccessEgress subject = new AccessWithPenalty(original); - - assertSame(original, AccessWithPenalty.removeDecoratorIfItExist(subject)); - assertSame(original, AccessWithPenalty.removeDecoratorIfItExist(original)); - assertSame(null, AccessWithPenalty.removeDecoratorIfItExist(null)); + var subject = new AccessWithPenalty(original); + assertSame(original, subject.removeDecorator()); } } diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java index acc7b642ddc..7277876dec6 100644 --- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java +++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/EgressWithPenaltyTest.java @@ -7,7 +7,6 @@ import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; import org.junit.jupiter.api.Test; -import org.opentripplanner.raptor.api.model.RaptorAccessEgress; class EgressWithPenaltyTest { @@ -73,10 +72,7 @@ void latestArrivalTimeWhenServiceIsClosed() { @Test void removeDecoratorIfItExist() { var original = walk(STOP, DURATION).withTimePenalty(PENALTY); - RaptorAccessEgress subject = new EgressWithPenalty(original); - - assertSame(original, EgressWithPenalty.removeDecoratorIfItExist(subject)); - assertSame(original, EgressWithPenalty.removeDecoratorIfItExist(original)); - assertSame(null, EgressWithPenalty.removeDecoratorIfItExist(null)); + var subject = new EgressWithPenalty(original); + assertSame(original, subject.removeDecorator()); } } From 49096b1a82f5f7b0ec1394a4ddc6fd9b71705835 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 29 Feb 2024 17:44:45 +0100 Subject: [PATCH 0703/1688] fix: Include time-penalty in the startTime/endTime/duration in path criteria comparison --- .../raptor/api/path/RaptorPath.java | 43 +++++++++++++++---- .../org/opentripplanner/raptor/path/Path.java | 29 +++++++++++-- .../path/PathParetoSetComparators.java | 29 ++++++------- .../raptor/spi/UnknownPath.java | 10 +++++ .../raptor/_data/api/TestRaptorPath.java | 19 ++++++-- .../raptor/api/path/RaptorPathTest.java | 9 ++-- .../moduletests/support/ExpectedList.java | 16 +++---- 7 files changed, 112 insertions(+), 43 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java b/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java index ca67599e262..b92d30643ec 100644 --- a/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java +++ b/src/main/java/org/opentripplanner/raptor/api/path/RaptorPath.java @@ -25,15 +25,37 @@ public interface RaptorPath extends Comparable - * {@code null} if the legs in the path is unknown. + * {@code null} if the legs in the path are unknown. */ @Nullable EgressPathLeg egressLeg(); @@ -89,7 +111,7 @@ default boolean isC2Set() { List listStops(); /** - * Aggregated wait-time in seconds. This method compute the total wait time for this path. + * Aggregated wait-time in seconds. This method computes the total wait time for this path. */ int waitTime(); @@ -125,11 +147,11 @@ default boolean isC2Set() { */ @Override default int compareTo(RaptorPath other) { - int c = endTime() - other.endTime(); + int c = endTimeInclusivePenalty() - other.endTimeInclusivePenalty(); if (c != 0) { return c; } - c = other.startTime() - startTime(); + c = other.startTimeInclusivePenalty() - startTimeInclusivePenalty(); if (c != 0) { return c; } @@ -151,14 +173,14 @@ static boolean compareArrivalTime( RaptorPath l, RaptorPath r ) { - return l.endTime() < r.endTime(); + return l.endTimeInclusivePenalty() < r.endTimeInclusivePenalty(); } static boolean compareDepartureTime( RaptorPath l, RaptorPath r ) { - return l.startTime() > r.startTime(); + return l.startTimeInclusivePenalty() > r.startTimeInclusivePenalty(); } static boolean compareIterationDepartureTime( @@ -168,8 +190,11 @@ static boolean compareIterationDepartureTime( return l.rangeRaptorIterationDepartureTime() > r.rangeRaptorIterationDepartureTime(); } - static boolean compareDuration(RaptorPath l, RaptorPath r) { - return l.durationInSeconds() < r.durationInSeconds(); + static boolean compareDurationInclusivePenalty( + RaptorPath l, + RaptorPath r + ) { + return l.durationInclusivePenaltyInSeconds() < r.durationInclusivePenaltyInSeconds(); } static boolean compareNumberOfTransfers( diff --git a/src/main/java/org/opentripplanner/raptor/path/Path.java b/src/main/java/org/opentripplanner/raptor/path/Path.java index a4d7770dd64..15fcf7b34e7 100644 --- a/src/main/java/org/opentripplanner/raptor/path/Path.java +++ b/src/main/java/org/opentripplanner/raptor/path/Path.java @@ -19,7 +19,15 @@ import org.opentripplanner.raptor.api.path.TransitPathLeg; /** - * The result path of a Raptor search describing the one possible journey. + * The result of a Raptor search is a path describing the one possible journey. The path is then + * main DTO part of the Raptor result, but it is also used internally in Raptor. Hence, it is a bit + * more complex, and it has more responsiblilites than it should. + *

      + * To improve the design, Raptor should not use the path internally. Instead, there should + * be a special destination arrival that could take over the Raptor responsibilities. The + * path would still need to be constructed at the time of arrival and then become a part of the + * destination arrival. The reason for this is that the data necessary to create a path is not + * kept in the Raptor state between rounds. * * @param The TripSchedule type defined by the user of the raptor API. */ @@ -27,7 +35,9 @@ public class Path implements RaptorPath { private final int iterationDepartureTime; private final int startTime; + private final int startTimeInclusivePenalty; private final int endTime; + private final int endTimeInclusivePenalty; private final int numberOfTransfers; private final int c1; private final int c2; @@ -44,7 +54,9 @@ private Path( ) { this.iterationDepartureTime = iterationDepartureTime; this.startTime = startTime; + this.startTimeInclusivePenalty = startTime; this.endTime = endTime; + this.endTimeInclusivePenalty = endTime; this.numberOfTransfers = numberOfTransfers; this.c1 = c1; this.accessLeg = null; @@ -55,11 +67,17 @@ private Path( public Path(int iterationDepartureTime, AccessPathLeg accessLeg, int c1, int c2) { this.iterationDepartureTime = iterationDepartureTime; this.startTime = accessLeg.fromTime(); + var access = accessLeg.access(); + this.startTimeInclusivePenalty = + access.hasTimePenalty() ? startTime - access.timePenalty() : startTime; this.c1 = c1; this.accessLeg = accessLeg; this.egressLeg = findEgressLeg(accessLeg); this.numberOfTransfers = countNumberOfTransfers(accessLeg, egressLeg); this.endTime = egressLeg.toTime(); + var egress = egressLeg.egress(); + this.endTimeInclusivePenalty = + egress.hasTimePenalty() ? endTime + egress.timePenalty() : endTime; this.c2 = c2; } @@ -101,14 +119,19 @@ public final int startTime() { return startTime; } + @Override + public int startTimeInclusivePenalty() { + return startTimeInclusivePenalty; + } + @Override public final int endTime() { return endTime; } @Override - public final int durationInSeconds() { - return endTime - startTime; + public int endTimeInclusivePenalty() { + return endTimeInclusivePenalty; } @Override diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java index 00ea6d11fe5..192f957ae8f 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/path/PathParetoSetComparators.java @@ -3,7 +3,7 @@ import static org.opentripplanner.raptor.api.path.RaptorPath.compareArrivalTime; import static org.opentripplanner.raptor.api.path.RaptorPath.compareC1; import static org.opentripplanner.raptor.api.path.RaptorPath.compareDepartureTime; -import static org.opentripplanner.raptor.api.path.RaptorPath.compareDuration; +import static org.opentripplanner.raptor.api.path.RaptorPath.compareDurationInclusivePenalty; import static org.opentripplanner.raptor.api.path.RaptorPath.compareIterationDepartureTime; import static org.opentripplanner.raptor.api.path.RaptorPath.compareNumberOfTransfers; @@ -12,7 +12,6 @@ import org.opentripplanner.raptor.api.model.DominanceFunction; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.model.RelaxFunction; -import org.opentripplanner.raptor.api.model.SearchDirection; import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.raptor.rangeraptor.internalapi.ParetoSetCost; import org.opentripplanner.raptor.rangeraptor.internalapi.ParetoSetTime; @@ -37,7 +36,7 @@ *

    4. Relax c1, if c2 is optimal
      5. * * The {@code travelDuration} is added as a criteria to the pareto comparator in addition to the - * parameters used for each stop arrivals. The {@code travelDuration} is only needed at the + * parameters used for each stop-arrival. The {@code travelDuration} is only needed at the * destination, because Range Raptor works in iterations backwards in time. */ public class PathParetoSetComparators { @@ -123,7 +122,7 @@ > ParetoComparator> comparatorTimetableAndC1() { compareIterationDepartureTime(l, r) || compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(l, r); } @@ -136,7 +135,7 @@ > ParetoComparator> comparatorTimetableAndRelaxedC1( compareIterationDepartureTime(l, r) || compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(relaxCost, l, r); } @@ -146,7 +145,7 @@ > ParetoComparator> comparatorArrivalTimeAndC1() { return (l, r) -> compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(l, r); } @@ -156,7 +155,7 @@ > ParetoComparator> comparatorDepartureTimeAndC1() { return (l, r) -> compareDepartureTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(l, r); } @@ -168,7 +167,7 @@ > ParetoComparator> comparatorArrivalTimeAndRelaxedC1( return (l, r) -> compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(relaxCost, l, r); } @@ -180,7 +179,7 @@ > ParetoComparator> comparatorDepartureTimeAndRelaxedC1( return (l, r) -> compareDepartureTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(relaxCost, l, r); } @@ -193,7 +192,7 @@ > ParetoComparator> comparatorTimetableAndC1AndC2( compareIterationDepartureTime(l, r) || compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(l, r) || c2Comp.leftDominateRight(l.c2(), r.c2()); } @@ -208,7 +207,7 @@ > ParetoComparator> comparatorTimetableAndRelaxedC1IfC2IsOptimal( compareIterationDepartureTime(l, r) || compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1RelaxedIfC2IsOptimal(l, r, relaxCost, c2Comp); } @@ -218,7 +217,7 @@ > ParetoComparator> comparatorWithC1AndC2(@Nonnull DominanceFuncti return (l, r) -> compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(l, r) || c2Comp.leftDominateRight(l.c2(), r.c2()); } @@ -231,7 +230,7 @@ > ParetoComparator> comparatorDepartureTimeAndC1AndC2( return (l, r) -> compareDepartureTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1(l, r) || c2Comp.leftDominateRight(l.c2(), r.c2()); } @@ -245,7 +244,7 @@ > ParetoComparator> comparatorArrivalTimeAndRelaxedC1IfC2IsOptimal return (l, r) -> compareArrivalTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1RelaxedIfC2IsOptimal(l, r, relaxCost, c2Comp); } @@ -258,7 +257,7 @@ > ParetoComparator> comparatorDepartureTimeAndRelaxedC1IfC2IsOptim return (l, r) -> compareDepartureTime(l, r) || compareNumberOfTransfers(l, r) || - compareDuration(l, r) || + compareDurationInclusivePenalty(l, r) || compareC1RelaxedIfC2IsOptimal(l, r, relaxCost, c2Comp); } diff --git a/src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java b/src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java index de6a846f480..24eae14f997 100644 --- a/src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java +++ b/src/main/java/org/opentripplanner/raptor/spi/UnknownPath.java @@ -46,11 +46,21 @@ public int startTime() { return departureTime; } + @Override + public int startTimeInclusivePenalty() { + return departureTime; + } + @Override public int endTime() { return arrivalTime; } + @Override + public int endTimeInclusivePenalty() { + return arrivalTime; + } + @Override public int durationInSeconds() { return arrivalTime - departureTime; diff --git a/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java b/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java index a0ec4523726..dab47a6d18b 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java +++ b/src/test/java/org/opentripplanner/raptor/_data/api/TestRaptorPath.java @@ -3,6 +3,7 @@ import java.util.List; import java.util.stream.Stream; import javax.annotation.Nullable; +import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.api.model.RaptorTripSchedule; import org.opentripplanner.raptor.api.path.AccessPathLeg; import org.opentripplanner.raptor.api.path.EgressPathLeg; @@ -18,9 +19,9 @@ */ public record TestRaptorPath( int rangeRaptorIterationDepartureTime, - int startTime, - int endTime, - int durationInSeconds, + int startTimeInclusivePenalty, + int endTimeInclusivePenalty, + int durationInclusivePenaltyInSeconds, int numberOfTransfers, int c1, int c2 @@ -29,6 +30,18 @@ public record TestRaptorPath( private static final String NOT_IMPLEMENTED_MESSAGE = "Use the real Path implementation if you need legs..."; + @Override + public int startTime() { + // This should not be used in the pareto comparison. + return RaptorConstants.TIME_NOT_SET; + } + + @Override + public int endTime() { + // This should not be used in the pareto comparison. + return RaptorConstants.TIME_NOT_SET; + } + @Override public int numberOfTransfersExAccessEgress() { throw new UnsupportedOperationException(NOT_IMPLEMENTED_MESSAGE); diff --git a/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java b/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java index edd45078086..5684a28c1c1 100644 --- a/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java +++ b/src/test/java/org/opentripplanner/raptor/api/path/RaptorPathTest.java @@ -1,6 +1,5 @@ package org.opentripplanner.raptor.api.path; -import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -112,10 +111,10 @@ void compareArrivalTime() { @Test void compareDuration() { - assertFalse(RaptorPath.compareDuration(subject, subject)); - assertFalse(RaptorPath.compareDuration(subject, same)); - assertFalse(RaptorPath.compareDuration(subject, smallDuration)); - assertTrue(RaptorPath.compareDuration(smallDuration, subject)); + assertFalse(RaptorPath.compareDurationInclusivePenalty(subject, subject)); + assertFalse(RaptorPath.compareDurationInclusivePenalty(subject, same)); + assertFalse(RaptorPath.compareDurationInclusivePenalty(subject, smallDuration)); + assertTrue(RaptorPath.compareDurationInclusivePenalty(smallDuration, subject)); } @Test diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java b/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java index ce4a68b1025..bca2c31ef0e 100644 --- a/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java +++ b/src/test/java/org/opentripplanner/raptor/moduletests/support/ExpectedList.java @@ -22,14 +22,6 @@ public String[] first(int n) { return range(0, n); } - public String get(int index) { - return items[index]; - } - - public String[] get(int... indexes) { - return Arrays.stream(indexes).mapToObj(i -> items[i]).toList().toArray(new String[0]); - } - public String last() { return items[items.length - 1]; } @@ -38,6 +30,14 @@ public String[] last(int n) { return range(items.length - n, items.length); } + public String get(int index) { + return items[index]; + } + + public String[] get(int... indexes) { + return Arrays.stream(indexes).mapToObj(i -> items[i]).toList().toArray(new String[0]); + } + public String[] range(int startInclusive, int endExclusive) { return Arrays.stream(items, startInclusive, endExclusive).toList().toArray(new String[0]); } From 8f363243d31a5304c998ed3d5ac4a67d1eb550a5 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 29 Feb 2024 17:45:59 +0100 Subject: [PATCH 0704/1688] test: Add module tests on access/egress with time-penalty --- .../L01_TimePenaltyAccessTest.java | 153 +++++++++++++++++ .../L01_TimePenaltyEgressTest.java | 158 ++++++++++++++++++ 2 files changed, 311 insertions(+) create mode 100644 src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java create mode 100644 src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java new file mode 100644 index 00000000000..778dd36a227 --- /dev/null +++ b/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyAccessTest.java @@ -0,0 +1,153 @@ +package org.opentripplanner.raptor.moduletests; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.framework.time.TimeUtils.time; +import static org.opentripplanner.raptor._data.api.PathUtils.withoutCost; +import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.raptor._data.transit.TestRoute.route; +import static org.opentripplanner.raptor._data.transit.TestTripSchedule.schedule; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_ONE; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV_ONE; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.multiCriteria; + +import java.time.Duration; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.raptor.RaptorService; +import org.opentripplanner.raptor._data.RaptorTestConstants; +import org.opentripplanner.raptor._data.transit.TestTransitData; +import org.opentripplanner.raptor._data.transit.TestTripSchedule; +import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; +import org.opentripplanner.raptor.configure.RaptorConfig; +import org.opentripplanner.raptor.moduletests.support.ExpectedList; +import org.opentripplanner.raptor.moduletests.support.ModuleTestDebugLogging; +import org.opentripplanner.raptor.moduletests.support.RaptorModuleTestCase; + +/* + * FEATURE UNDER TEST + * + * Raptor should take into account time-penalty for access. This test focuses on checking the + * logic for the time-penalty. The penalty should be included in the access when comparing for + * optimality, but should be excluded when checking for time constraints (arrive-by/depart-after). + * All paths in this test have the same penalty; Hence, we do not compare paths with/without a + * penalty. + */ +public class L01_TimePenaltyAccessTest implements RaptorTestConstants { + + private static final Duration D8m = Duration.ofMinutes(8); + + // There are 5 possible trips + + private final TestTransitData data = new TestTransitData(); + private final RaptorRequestBuilder requestBuilder = new RaptorRequestBuilder<>(); + private final RaptorService raptorService = new RaptorService<>( + RaptorConfig.defaultConfigForTest() + ); + + @BeforeEach + public void setup() { + data.withRoute(route("R1", STOP_A, STOP_B).withTimetable(schedule("0:10 0:40").repeat(10, 60))); + requestBuilder + .searchParams() + .addAccessPaths(walk(STOP_A, D2m).withTimePenalty(D1m)) + .addEgressPaths(walk(STOP_B, D1m)); + + requestBuilder.searchParams().timetable(true); + + ModuleTestDebugLogging.setupDebugLogging(data, requestBuilder); + } + + private static List tripsAtTheEndOfTheSearchWindowTestCase() { + int edt = time("0:01"); + int lat = time("0:42"); + + var expected = new ExpectedList( + "Walk 2m 0:08 0:10 C₁240 ~ A 0s ~ BUS R1 0:10 .. [0:08 0:41 33m Tₓ0 C₁2_760]", + "Walk 2m 0:09 0:11 C₁240 ~ A 0s ~ BUS R1 0:11 .. [0:09 0:42 33m Tₓ0 C₁2_760]" + ); + + return RaptorModuleTestCase + .of() + .withRequest(r -> + r.searchParams().earliestDepartureTime(edt).latestArrivalTime(lat).searchWindow(D8m) + ) + .addMinDuration("34m", TX_0, edt, lat) + .add(TC_STANDARD, withoutCost(expected.all())) + .add(TC_STANDARD_ONE, withoutCost(expected.first())) + .add(TC_STANDARD_REV, withoutCost(expected.all())) + .add(TC_STANDARD_REV_ONE, withoutCost(expected.last())) + .add(multiCriteria(), expected.all()) + .build(); + } + + @ParameterizedTest + @MethodSource("tripsAtTheEndOfTheSearchWindowTestCase") + void tripsAtTheEndOfTheSearchWindowTest(RaptorModuleTestCase testCase) { + assertEquals( + testCase.expected(), + focusOnAccess(testCase.runDetailedResult(raptorService, data, requestBuilder)) + ); + } + + private static List tripsAtTheBeginningOfTheSearchWindowTestCases() { + int edt = time("0:16"); + // The last path arrive at the destination at 0:50, LAT=0:55 will iterate over the last 5 + // paths. + int lat = time("0:55"); + + // The latest buss is at 0:19, so with EDT=0:16 can only reach the last two buses, + // Running this test without the time-penalty confirm this result. + var expected = new ExpectedList( + "Walk 2m 0:16 0:18 C₁240 ~ A 0s ~ BUS R1 0:18 .. [0:16 0:49 33m Tₓ0 C₁2_760]", + "Walk 2m 0:17 0:19 C₁240 ~ A 0s ~ BUS R1 0:19 .. [0:17 0:50 33m Tₓ0 C₁2_760]" + ); + + return RaptorModuleTestCase + .of() + .withRequest(r -> + r.searchParams().earliestDepartureTime(edt).latestArrivalTime(lat).searchWindow(D8m) + ) + .addMinDuration("34m", TX_0, edt, lat) + .add(TC_STANDARD, withoutCost(expected.all())) + // We do not have special support for time-penalty for single iteration Raptor, so the + // first path is missed due to the penalty. + .add(TC_STANDARD_ONE, withoutCost(expected.last())) + // Note! this test that the time-penalty is removed from the "arrive-by" limit in the + // destination + .add(TC_STANDARD_REV, withoutCost(expected.all())) + .add(TC_STANDARD_REV_ONE, withoutCost(expected.last())) + .add(multiCriteria(), expected.all()) + .build(); + } + + @ParameterizedTest + @MethodSource("tripsAtTheBeginningOfTheSearchWindowTestCases") + void tripsAtTheBeginningOfTheSearchWindowTest(RaptorModuleTestCase testCase) { + assertEquals( + testCase.expected(), + focusOnAccess(testCase.runDetailedResult(raptorService, data, requestBuilder)) + ); + } + + public static String focusOnAccess(String path) { + // We are only interested in the access and the first boarding. We include the + // pareto vector as well. + var p = Pattern.compile("(.+BUS R1 \\d+:\\d+).+(\\[.+)"); + + String[] lines = path.split("\n"); + return Stream + .of(lines) + .map(s -> { + var m = p.matcher(s); + return m.find() ? m.group(1) + " .. " + m.group(2) : s; + }) + .collect(Collectors.joining("\n")); + } +} diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java new file mode 100644 index 00000000000..1e6897475f4 --- /dev/null +++ b/src/test/java/org/opentripplanner/raptor/moduletests/L01_TimePenaltyEgressTest.java @@ -0,0 +1,158 @@ +package org.opentripplanner.raptor.moduletests; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.framework.time.TimeUtils.time; +import static org.opentripplanner.raptor._data.api.PathUtils.withoutCost; +import static org.opentripplanner.raptor._data.transit.TestAccessEgress.walk; +import static org.opentripplanner.raptor._data.transit.TestRoute.route; +import static org.opentripplanner.raptor._data.transit.TestTripSchedule.schedule; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_ONE; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.TC_STANDARD_REV_ONE; +import static org.opentripplanner.raptor.moduletests.support.RaptorModuleTestConfig.multiCriteria; + +import java.time.Duration; +import java.util.List; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.raptor.RaptorService; +import org.opentripplanner.raptor._data.RaptorTestConstants; +import org.opentripplanner.raptor._data.api.PathUtils; +import org.opentripplanner.raptor._data.transit.TestTransitData; +import org.opentripplanner.raptor._data.transit.TestTripSchedule; +import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; +import org.opentripplanner.raptor.configure.RaptorConfig; +import org.opentripplanner.raptor.moduletests.support.ExpectedList; +import org.opentripplanner.raptor.moduletests.support.ModuleTestDebugLogging; +import org.opentripplanner.raptor.moduletests.support.RaptorModuleTestCase; + +/* + * FEATURE UNDER TEST + * + * Raptor should take into account time-penalty for egress. This test focuses on checking the + * logic for the time-penalty. The penalty should be included in the egress when comparing for + * optimality, but should be excluded when checking for time constraints (arrive-by/depart-after). + * All paths in this test have the same penalty; Hence, we do not compare paths with/without a + * penalty. + *

      + * Tip! Remove time-penalty from egress and the test should in most cases have the same result. + */ +public class L01_TimePenaltyEgressTest implements RaptorTestConstants { + + private static final Duration D8m = Duration.ofMinutes(8); + + // There are 5 possible trips + + private final TestTransitData data = new TestTransitData(); + private final RaptorRequestBuilder requestBuilder = new RaptorRequestBuilder<>(); + private final RaptorService raptorService = new RaptorService<>( + RaptorConfig.defaultConfigForTest() + ); + + @BeforeEach + public void setup() { + data.withRoute(route("R1", STOP_A, STOP_B).withTimetable(schedule("0:10 0:40").repeat(10, 60))); + requestBuilder + .searchParams() + .addAccessPaths(walk(STOP_A, D1m)) + .addEgressPaths(walk(STOP_B, D2m).withTimePenalty(D1m)); + + requestBuilder.searchParams().timetable(true); + + ModuleTestDebugLogging.setupDebugLogging(data, requestBuilder); + } + + private static List firstTwoPathsArriveBeforeLAT() { + // EDT is set to allow 5 paths - not a limiting factor. + int edt = time("0:05"); + // We limit the search to the two first paths by setting the LAT to 0:43. + int lat = time("0:43"); + + var expected = new ExpectedList( + "BUS R1 0:10 0:40 30m ~ B 0s ~ Walk 2m 0:40 0:42 [0:09 0:42 33m Tₓ0]", + "BUS R1 0:11 0:41 30m ~ B 0s ~ Walk 2m 0:41 0:43 [0:10 0:43 33m Tₓ0]" + ); + + return RaptorModuleTestCase + .of() + .withRequest(r -> + r.searchParams().earliestDepartureTime(edt).latestArrivalTime(lat).searchWindow(D8m) + ) + .addMinDuration("34m", TX_0, edt, lat) + .add(TC_STANDARD, withoutCost(expected.all())) + .add(TC_STANDARD_ONE, withoutCost(expected.first())) + .add(TC_STANDARD_REV, withoutCost(expected.all())) + // The egress time-penalty will cause the first path to be missed (singe iteration) + .add(TC_STANDARD_REV_ONE, withoutCost(expected.first())) + .add(multiCriteria(), expected.all()) + .build(); + } + + @ParameterizedTest + @MethodSource("firstTwoPathsArriveBeforeLAT") + void firstTwoPathsArriveBeforeLAT(RaptorModuleTestCase testCase) { + assertEquals( + testCase.expected(), + focusOnEgress(testCase.runDetailedResult(raptorService, data, requestBuilder)) + ); + } + + private static List lastTwoPathsDepartsAfterEDT() { + // The latest buss is at 0:19, so with EDT=0:17 can only reach the last two buses. + int edt = time("0:17"); + int lat = time("0:51"); + + var expected = new ExpectedList( + "BUS R1 0:18 0:48 30m ~ B 0s ~ Walk 2m 0:48 0:50 [0:17 0:50 33m Tₓ0]", + "BUS R1 0:19 0:49 30m ~ B 0s ~ Walk 2m 0:49 0:51 [0:18 0:51 33m Tₓ0]" + ); + + return RaptorModuleTestCase + .of() + .withRequest(r -> + r.searchParams().earliestDepartureTime(edt).latestArrivalTime(lat).searchWindow(D8m) + ) + .addMinDuration("34m", TX_0, edt, lat) + // Note! this test that the time-penalty is removed from the "arrive-by" limit in the + // destination + .add(TC_STANDARD, withoutCost(expected.all())) + .add(TC_STANDARD_ONE, withoutCost(expected.first())) + .add(TC_STANDARD_REV, withoutCost(expected.all())) + // We do not have special support for time-penalty for single iteration Raptor, so the + // "last" path is missed due to the penalty for a reverse search. + .add(TC_STANDARD_REV_ONE, withoutCost(expected.first())) + .add(multiCriteria(), expected.all()) + .build(); + } + + @ParameterizedTest + @MethodSource("lastTwoPathsDepartsAfterEDT") + void lastTwoPathsDepartsAfterEDT(RaptorModuleTestCase testCase) { + assertEquals( + testCase.expected(), + focusOnEgress(testCase.runDetailedResult(raptorService, data, requestBuilder)) + ); + } + + public static String focusOnEgress(String path) { + // We are only interested in the access and the first boarding. We include the + // pareto vector as well. + var p = Pattern.compile("(BUS R1 .+)(\\[.+)"); + + // BUS R1 0:18 0:48 30m ~ B 0s ~ Walk 1m 0:48 0:49 .. [0:16 0:49 33m Tₓ0] + String[] lines = path.split("\n"); + return Stream + .of(lines) + .map(s -> { + int pos = s.indexOf("BUS"); + return pos > 0 ? s.substring(pos) : s; + }) + .map(PathUtils::withoutCost) + .collect(Collectors.joining("\n")); + } +} From bc56933bd01208569c623281f309f85d115ba440 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 23:19:19 +0000 Subject: [PATCH 0705/1688] chore(deps): update dependency com.google.cloud.tools:jib-maven-plugin to v3.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 48e03115c17..d1b9c8be0ba 100644 --- a/pom.xml +++ b/pom.xml @@ -444,7 +444,7 @@ com.google.cloud.tools jib-maven-plugin - 3.4.0 + 3.4.1 org.opentripplanner.standalone.OTPMain From b833b370e477e5c2bde29911aeea05c3d0dc33c3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 29 Feb 2024 23:19:25 +0000 Subject: [PATCH 0706/1688] fix(deps): update dependency ch.qos.logback:logback-classic to v1.5.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d1b9c8be0ba..9ed632e69d8 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 5.10.2 1.12.2 5.5.3 - 1.5.0 + 1.5.1 9.9.1 2.0.12 2.0.15 From cc0c13d34e4c2054697ec52973027ae626e4b68c Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 1 Mar 2024 12:51:00 +0200 Subject: [PATCH 0707/1688] Fix issue with cancellations on trip patterns that run after midnight --- .../routing/algorithm/raptoradapter/transit/TransitLayer.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java index 60cfb72ef7d..461c15e8f66 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java @@ -119,9 +119,11 @@ public List getTripPatternsRunningOnDateCopy(LocalDate runni public List getTripPatternsStartingOnDateCopy(LocalDate date) { List tripPatternsRunningOnDate = getTripPatternsRunningOnDateCopy(date); + tripPatternsRunningOnDate.addAll(getTripPatternsRunningOnDateCopy(date.plusDays(1))); return tripPatternsRunningOnDate .stream() .filter(t -> t.getLocalDate().equals(date)) + .distinct() .collect(Collectors.toList()); } From 71415a9f2d7c2610614bf33a04fdf0d361b1065f Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 1 Mar 2024 12:16:49 +0100 Subject: [PATCH 0708/1688] Apply suggestions from code review Co-authored-by: Leonard Ehrenfried --- .../opentripplanner/raptor/api/model/RaptorAccessEgress.java | 2 +- .../opentripplanner/raptor/rangeraptor/transit/AccessPaths.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java index a1764d42374..aac389b7af4 100644 --- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java +++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java @@ -55,7 +55,7 @@ public interface RaptorAccessEgress { * For example, for Park&Ride, driving all the way to the * destination is very often the best option when looking at the time criteria. When an * increasing time-penalty is applied to access/egress with driving then driving less become - * more favorable. This also improves perfomance, since we usually add a very high cost to + * more favorable. This also improves performance, since we usually add a very high cost to * driving - making all park&ride access legs optimal - forcing Raptor to compute a path for * every option. The short drives are optimal on cost, and the long are optimal on time. In the * case of park&ride the time-penalty enables Raptor to choose one of the shortest access/egress diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 26fb49ec88a..0e251192bc7 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -179,7 +179,7 @@ private static boolean hasTimeDependentAccess(TIntObjectMap From 2f17a31bd8125800fa2888a4089aac5a6f6a88f2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 1 Mar 2024 12:23:41 +0100 Subject: [PATCH 0709/1688] doc: Add JavaDoc to the AccessPaths#iterateOverPathsWithPenalty method --- .../raptor/rangeraptor/transit/AccessPaths.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java index 0e251192bc7..d070a804f9c 100644 --- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java +++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java @@ -110,6 +110,11 @@ public int calculateMaxNumberOfRides() { ); } + /** + * This is used in the main "minutes" iteration to iterate over the extra minutes needed to + * include access with time-penalty. This method returns an iterator for the minutes in front of + * the normal search window starting at the given {@code earliestDepartureTime}. + */ public IntIterator iterateOverPathsWithPenalty(final int earliestDepartureTime) { if (!hasTimePenalty()) { return IntIterators.empty(); From 4758a77a6b38750bb8fb036b79672561680ff372 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 1 Mar 2024 12:40:40 +0100 Subject: [PATCH 0710/1688] refactor: Use a constant fixed implementation for IntIterator#empty() --- .../opentripplanner/raptor/util/IntIterators.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/raptor/util/IntIterators.java b/src/main/java/org/opentripplanner/raptor/util/IntIterators.java index cb8c6c38787..b0df1e56155 100644 --- a/src/main/java/org/opentripplanner/raptor/util/IntIterators.java +++ b/src/main/java/org/opentripplanner/raptor/util/IntIterators.java @@ -1,9 +1,22 @@ package org.opentripplanner.raptor.util; +import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.raptor.spi.IntIterator; public class IntIterators { + private static final IntIterator EMPTY = new IntIterator() { + @Override + public int next() { + return RaptorConstants.NOT_FOUND; + } + + @Override + public boolean hasNext() { + return false; + } + }; + /** This is private to forbid construction. */ private IntIterators() { /* NOOP*/ @@ -122,6 +135,6 @@ public static IntIterator singleValueIterator(final int value) { * Return an empty iterator. All calls to {@link IntIterator#hasNext()} will return {@code false}. */ public static IntIterator empty() { - return intIncIterator(0, 0); + return EMPTY; } } From 5bd379973e30d31d43aaba66661f07be4afd9e0c Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 1 Mar 2024 12:51:36 +0100 Subject: [PATCH 0711/1688] refactor: Cleanup RaptorTestConstants --- .../opentripplanner/raptor/_data/RaptorTestConstants.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java b/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java index d1398ea05cd..0bca83be8bf 100644 --- a/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java +++ b/src/test/java/org/opentripplanner/raptor/_data/RaptorTestConstants.java @@ -28,18 +28,14 @@ public interface RaptorTestConstants { int D24h = durationInSeconds("24h"); /** - * There are 86400 seconds in a "normal" day(24 * 60 * 60). This is used for testing, logging - * and debugging, but does not base any important logic on this. A day with changes in - * daylight-saving-time does not have this number of seconds. + * There are 86400 seconds in a "normal" day(24 * 60 * 60). */ int SECONDS_IN_A_DAY = (int) D24h; // Time constants, all values are in seconds int T00_00 = hm2time(0, 0); - int T00_01 = hm2time(0, 1); int T00_02 = hm2time(0, 2); int T00_10 = hm2time(0, 10); - int T00_12 = hm2time(0, 12); int T00_30 = hm2time(0, 30); int T00_40 = hm2time(0, 40); int T01_00 = hm2time(1, 0); @@ -49,7 +45,7 @@ public interface RaptorTestConstants { int TX_2 = 2; // Stop indexes - Note! There is no stop defined for index 0(zero)! You must - // account for that in the test if you uses a stop index. + // account for that in the test if you use the stop index. int STOP_A = 1; int STOP_B = 2; int STOP_C = 3; From ed3d05aad648726ce5d3768ddba0167140335e24 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 1 Mar 2024 13:04:01 +0100 Subject: [PATCH 0712/1688] Apply suggestions from code review Co-authored-by: Johan Torin --- .../framework/lang/MemEfficientArrayBuilder.java | 6 +++--- .../opentripplanner/transit/model/network/TripPattern.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java b/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java index 161ac5c5cf5..8b3a6ba6cd0 100644 --- a/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java +++ b/src/main/java/org/opentripplanner/framework/lang/MemEfficientArrayBuilder.java @@ -5,13 +5,13 @@ import javax.annotation.Nonnull; /** - * This array builder is used to minimize creating new objects(arrays). It takes an array as base, + * This array builder is used to minimize the creation of new objects (arrays). It takes an array as base, * the original array. A new array is created only if there are differences. *

      * A common case is that one original is updated several times. In this case, you can use the - * {@link #build(Object[])}, too also make sure the existing update is reused (deduplicated). + * {@link #build(Object[])} method to also make sure that the existing update is reused (deduplicated). *

      - * Arrays are mutable, so be careful this class helps you reuse the original if it has the same + * Arrays are mutable, so be careful as this class helps you reuse the original if it has the same * values. It protects the original while in scope, but you should only use it if you do not * modify the original or the result on the outside. This builder does not help protect the arrays. */ diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index a439c9fd4fe..7e40aa2d13b 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -161,7 +161,7 @@ public StopPattern getStopPattern() { /** * Return the "original"/planned stop pattern as a builder. This is used when a realtime-update - * contains a full set of stops/pickup/droppoff for a pattern. This will wipe out any changes + * contains a full set of stops/pickup/dropoff for a pattern. This will wipe out any changes * to the stop-pattern from previous updates. *

      * Be aware, if the same update is applied twice, then the first instance will be reused to avoid From df0d65b61222bf971e2d3c6daf67fa13132b91ed Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 1 Mar 2024 14:22:55 +0100 Subject: [PATCH 0713/1688] Always put minus as the first sign of a serialized negative duration --- .../graphql/scalar/DurationScalarFactory.java | 2 +- .../framework/time/DurationUtils.java | 18 +++++++++++++ .../opentripplanner/apis/gtfs/schema.graphqls | 4 +-- .../apis/gtfs/GraphQLScalarsTest.java | 4 ++- .../framework/time/DurationUtilsTest.java | 27 +++++++++++++++++++ 5 files changed, 51 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java b/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java index 30dd3754198..50af0fbc759 100644 --- a/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java +++ b/src/main/java/org/opentripplanner/framework/graphql/scalar/DurationScalarFactory.java @@ -33,7 +33,7 @@ private static class DurationCoercing implements Coercing { @Nonnull public String serialize(@Nonnull Object input) throws CoercingSerializeException { if (input instanceof Duration duration) { - return duration.toString(); + return DurationUtils.formatDurationWithLeadingMinus(duration); } throw new CoercingSerializeException(input + " cannot be cast to 'Duration'"); diff --git a/src/main/java/org/opentripplanner/framework/time/DurationUtils.java b/src/main/java/org/opentripplanner/framework/time/DurationUtils.java index bf59964fbb2..9a01d308a1c 100644 --- a/src/main/java/org/opentripplanner/framework/time/DurationUtils.java +++ b/src/main/java/org/opentripplanner/framework/time/DurationUtils.java @@ -196,4 +196,22 @@ public static int toIntMilliseconds(Duration timeout, int defaultValue) { private static String msToSecondsStr(String formatSeconds, double timeMs) { return String.format(ROOT, formatSeconds, timeMs / 1000.0) + " seconds"; } + + /** + * Formats a duration and if it's a negative amount, it places the minus before the "P" rather + * than in the middle of the value. + *

      + * Background: There are multiple ways to express -1.5 hours: "PT-1H-30M" and "-PT1H30M". + *

      + * The first version is what you get when calling toString() but it's quite confusing. Therefore, + * this method makes sure that you get the second form "-PT1H30M". + */ + public static String formatDurationWithLeadingMinus(Duration duration) { + if (duration.isNegative()) { + var positive = duration.abs().toString(); + return "-" + positive; + } else { + return duration.toString(); + } + } } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 20f1f39af27..655a1908a87 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1625,9 +1625,9 @@ type Money { """" An ISO-8601-formatted duration, i.e. `PT2H30M` for 2 hours and 30 minutes. -Negative durations are formatted like `PT-10M`. +Negative durations are formatted like `-PT10M`. """ -scalar Duration +scalar Duration @specifiedBy(url:"https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)") type RideHailingProvider { "The ID of the ride hailing provider." diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java index 652c72254d9..5183279cec7 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java @@ -35,7 +35,9 @@ static List durationCases() { return List.of( of(Duration.ofMinutes(30), "PT30M"), of(Duration.ofHours(23), "PT23H"), - of(Duration.ofMinutes(-10), "PT-10M") + of(Duration.ofMinutes(-10), "-PT10M"), + of(Duration.ofMinutes(-90), "-PT1H30M"), + of(Duration.ofMinutes(-184), "-PT3H4M") ); } diff --git a/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java b/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java index 86953760485..2457aa14b60 100644 --- a/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java @@ -2,6 +2,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.params.provider.Arguments.of; import static org.opentripplanner.framework.time.DurationUtils.requireNonNegative; import static org.opentripplanner.framework.time.DurationUtils.toIntMilliseconds; @@ -13,6 +14,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.parallel.ResourceLock; import org.junit.jupiter.api.parallel.Resources; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; public class DurationUtilsTest { @@ -151,6 +155,29 @@ public void msToSecondsStr() { } } + static List durationCases() { + return List.of( + of(Duration.ofSeconds(30), "PT30S"), + of(Duration.ofMinutes(30), "PT30M"), + of(Duration.ofHours(23), "PT23H"), + of(Duration.ofSeconds(-30), "-PT30S"), + of(Duration.ofMinutes(-10), "-PT10M"), + of(Duration.ofMinutes(-90), "-PT1H30M"), + of(Duration.ofMinutes(-184), "-PT3H4M") + ); + } + + @ParameterizedTest + @MethodSource("durationCases") + void formatDuration(Duration duration, String expected) { + var string = DurationUtils.formatDurationWithLeadingMinus(duration); + + assertEquals(expected, string); + + var parsed = Duration.parse(expected); + assertEquals(parsed, duration); + } + private static int durationSec(int hour, int min, int sec) { return 60 * (60 * hour + min) + sec; } From 7fd489235ca656dff6e5e011221068bb526656bd Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 1 Mar 2024 14:27:31 +0100 Subject: [PATCH 0714/1688] Run apt-get update before install [ci skip] --- .github/workflows/post-merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/post-merge.yml b/.github/workflows/post-merge.yml index a2f29f0d1b0..86f3741aada 100644 --- a/.github/workflows/post-merge.yml +++ b/.github/workflows/post-merge.yml @@ -54,6 +54,7 @@ jobs: - name: Install xmllint run: | + sudo apt-get update sudo apt-get install -y libxml2-utils - name: Configure git user From 2b07ff88f13e6d82db97981fed17492ae35cade0 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 1 Mar 2024 15:56:31 +0200 Subject: [PATCH 0715/1688] Bump serialization version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9ed632e69d8..d746c259a25 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 146 + 147 30.2 2.51 From a6bdc71e25602cec94d4703fbd180e76cff0a30d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 1 Mar 2024 16:30:10 +0200 Subject: [PATCH 0716/1688] Mark old plan query as deprecated --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 453add335ed..70c15ecbda2 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -4152,7 +4152,7 @@ type QueryType { used correctly to get meaningful itineraries). """ startTransitTripId: String @deprecated(reason: "Not implemented in OTP2") - ): Plan @async + ): Plan @async @deprecated(reason: "Use planConnection instead") """ Plan (itinerary) search that follows From 0136bbd59b3f5fd24cfaea9c90d448de6b4c8b12 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 1 Mar 2024 16:03:42 +0100 Subject: [PATCH 0717/1688] Apply review feedback --- .../areastops/AreaStopsLayerBuilderTest.java | 47 ++++++++++--------- .../areastops/AreaStopPropertyMapper.java | 2 +- 2 files changed, 26 insertions(+), 23 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java index befaa6b886d..2e6c4e16c40 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopsLayerBuilderTest.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.vectortiles.layers.areastops; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.standalone.config.framework.json.JsonSupport.newNodeAdapterForTest; import java.util.List; import java.util.Locale; @@ -9,6 +10,7 @@ import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.inspector.vector.LayerParameters; +import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.AreaStop; @@ -21,6 +23,28 @@ class AreaStopsLayerBuilderTest { private static final FeedScopedId ID = new FeedScopedId("FEED", "ID"); private static final I18NString NAME = I18NString.of("Test stop"); + private static final String CONFIG = + """ + { + "vectorTiles": { + "layers" : [ + { + "name": "areaStops", + "type": "AreaStop", + "mapper": "OTPRR", + "maxZoom": 20, + "minZoom": 14, + "cacheMaxSeconds": 60, + "expansionFactor": 0 + } + ] + } + } + """; + private static final LayerParameters LAYER_CONFIG = VectorTileConfig + .mapVectorTilesParameters(newNodeAdapterForTest(CONFIG), "vectorTiles") + .layers() + .getFirst(); private final StopModelBuilder stopModelBuilder = StopModel.of(); @@ -35,34 +59,13 @@ class AreaStopsLayerBuilderTest { new Deduplicator() ); - record Layer( - String name, - VectorTilesResource.LayerType type, - String mapper, - int maxZoom, - int minZoom, - int cacheMaxSeconds, - double expansionFactor - ) - implements LayerParameters {} - @Test void getAreaStops() { transitModel.index(); - var layer = new Layer( - "areaStops", - VectorTilesResource.LayerType.AreaStop, - "OTPRR", - 20, - 1, - 10, - .25 - ); - var subject = new AreaStopsLayerBuilder( new DefaultTransitService(transitModel), - layer, + LAYER_CONFIG, Locale.ENGLISH ); var geometries = subject.getGeometries(AREA_STOP.getGeometry().getEnvelopeInternal()); diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java index c91ea2cb6b6..ea6f9225e11 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapper.java @@ -40,7 +40,7 @@ protected Collection map(AreaStop stop) { .filter(Objects::nonNull) .distinct() // the MVT spec explicitly doesn't cover how to encode arrays - // https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/ + // https://docs.mapbox.com/data/tilesets/guides/vector-tiles-standards/#what-the-spec-doesnt-cover .collect(Collectors.joining(",")); return List.of( new KeyValue("gtfsId", stop.getId().toString()), From f723c25a421b00c58fb7b1e32ca29ee31583e41c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 3 Mar 2024 21:22:17 +0100 Subject: [PATCH 0718/1688] Revert conversion to record --- .../flex/trip/ScheduledDeviatedTripTest.java | 2 +- .../ext/restapi/mapping/PlaceMapper.java | 10 ++-- .../apis/gtfs/datafetchers/LegImpl.java | 2 +- .../apis/gtfs/datafetchers/PlaceImpl.java | 58 ++++++++++++++----- .../apis/transmodel/model/plan/LegType.java | 2 +- .../org/opentripplanner/model/plan/Leg.java | 2 +- .../model/plan/StopArrival.java | 43 +++++++++----- .../algorithm/mapping/AlertToLegMapper.java | 6 +- 8 files changed, 83 insertions(+), 42 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 546f8c411ac..143388cac0f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -185,7 +185,7 @@ void flexTripInTransitMode() { var intermediateStops = leg.getIntermediateStops(); assertEquals(1, intermediateStops.size()); - assertEquals("zone_1", intermediateStops.get(0).place().stop.getId().getId()); + assertEquals("zone_1", intermediateStops.get(0).place.stop.getId().getId()); EncodedPolyline legGeometry = EncodedPolyline.encode(leg.getLegGeometry()); assertThatPolylinesAreEqual( diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java index 95669d4b7ca..28ceb0b84e3 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/PlaceMapper.java @@ -38,11 +38,11 @@ public List mapStopArrivals(Collection domain) { public ApiPlace mapStopArrival(StopArrival domain) { return mapPlace( - domain.place(), - domain.arrival().time(), - domain.departure().time(), - domain.stopPosInPattern(), - domain.gtfsStopSequence() + domain.place, + domain.arrival.time(), + domain.departure.time(), + domain.stopPosInPattern, + domain.gtfsStopSequence ); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index f7be76481a7..975d8d56831 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -144,7 +144,7 @@ public DataFetcher> intermediateStops() { } return intermediateStops .stream() - .map(intermediateStop -> intermediateStop.place().stop) + .map(intermediateStop -> intermediateStop.place.stop) .filter(Objects::nonNull) .collect(Collectors.toList()); }; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java index 16716a393d1..9ce80bcaf7f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java @@ -20,13 +20,16 @@ public class PlaceImpl implements GraphQLDataFetchers.GraphQLPlace { @Override public DataFetcher arrival() { - return environment -> getSource(environment).arrival(); + return environment -> getSource(environment).arrival; } @Deprecated @Override public DataFetcher arrivalTime() { - return environment -> getSource(environment).arrival().time().toInstant().toEpochMilli(); + return environment -> { + StopArrival stopArrival = getSource(environment); + return stopArrival.arrival.time().toInstant().toEpochMilli(); + }; } @Override @@ -37,7 +40,8 @@ public DataFetcher bikePark() { @Override public DataFetcher bikeRentalStation() { return environment -> { - Place place = getSource(environment).place(); + StopArrival stopArrival = getSource(environment); + Place place = stopArrival.place; if (!place.vertexType.equals(VertexType.VEHICLERENTAL)) { return null; @@ -55,34 +59,47 @@ public DataFetcher carPark() { @Deprecated @Override public DataFetcher departure() { - return environment -> getSource(environment).departure(); + return environment -> getSource(environment).departure; } @Override public DataFetcher departureTime() { - return environment -> getSource(environment).departure().time().toInstant().toEpochMilli(); + return environment -> { + StopArrival stopArrival = getSource(environment); + return stopArrival.departure.time().toInstant().toEpochMilli(); + }; } @Override public DataFetcher lat() { - return environment -> getSource(environment).place().coordinate.latitude(); + return environment -> { + StopArrival stopArrival = getSource(environment); + return stopArrival.place.coordinate.latitude(); + }; } @Override public DataFetcher lon() { - return environment -> getSource(environment).place().coordinate.longitude(); + return environment -> { + StopArrival stopArrival = getSource(environment); + return stopArrival.place.coordinate.longitude(); + }; } @Override public DataFetcher name() { return environment -> - GraphQLUtils.getTranslation(getSource(environment).place().name, environment); + { + StopArrival stopArrival = getSource(environment); + return GraphQLUtils.getTranslation(stopArrival.place.name, environment); + }; } @Override public DataFetcher rentalVehicle() { return environment -> { - Place place = getSource(environment).place(); + StopArrival stopArrival = getSource(environment); + Place place = stopArrival.place; if ( !place.vertexType.equals(VertexType.VEHICLERENTAL) || @@ -97,13 +114,17 @@ public DataFetcher rentalVehicle() { @Override public DataFetcher stop() { - return environment -> getSource(environment).place().stop; + return environment -> { + StopArrival stopArrival = getSource(environment); + return stopArrival.place.stop; + }; } @Override public DataFetcher stopPosition() { return environment -> { - var seq = getSource(environment).gtfsStopSequence(); + StopArrival stopArrival = getSource(environment); + var seq = stopArrival.gtfsStopSequence; if (seq != null) { return new PositionAtStop(seq); } else { @@ -120,7 +141,8 @@ public DataFetcher vehicleParking() { @Override public DataFetcher vehicleRentalStation() { return environment -> { - Place place = getSource(environment).place(); + StopArrival stopArrival = getSource(environment); + Place place = stopArrival.place; if ( !place.vertexType.equals(VertexType.VEHICLERENTAL) || @@ -136,7 +158,8 @@ public DataFetcher vehicleRentalStation() { @Override public DataFetcher vertexType() { return environment -> { - var place = getSource(environment).place(); + StopArrival stopArrival = getSource(environment); + var place = stopArrival.place; return switch (place.vertexType) { case NORMAL -> GraphQLVertexType.NORMAL.name(); case TRANSIT -> GraphQLVertexType.TRANSIT.name(); @@ -147,7 +170,8 @@ public DataFetcher vertexType() { } private VehicleParking getBikePark(DataFetchingEnvironment environment) { - var vehicleParkingWithEntrance = getSource(environment).place().vehicleParkingWithEntrance; + StopArrival stopArrival = getSource(environment); + var vehicleParkingWithEntrance = stopArrival.place.vehicleParkingWithEntrance; if ( vehicleParkingWithEntrance == null || !vehicleParkingWithEntrance.getVehicleParking().hasBicyclePlaces() @@ -159,7 +183,8 @@ private VehicleParking getBikePark(DataFetchingEnvironment environment) { } private VehicleParking getCarPark(DataFetchingEnvironment environment) { - var vehicleParkingWithEntrance = getSource(environment).place().vehicleParkingWithEntrance; + StopArrival stopArrival = getSource(environment); + var vehicleParkingWithEntrance = stopArrival.place.vehicleParkingWithEntrance; if ( vehicleParkingWithEntrance == null || !vehicleParkingWithEntrance.getVehicleParking().hasAnyCarPlaces() @@ -171,7 +196,8 @@ private VehicleParking getCarPark(DataFetchingEnvironment environment) { } private VehicleParking getVehicleParking(DataFetchingEnvironment environment) { - var vehicleParkingWithEntrance = getSource(environment).place().vehicleParkingWithEntrance; + StopArrival stopArrival = getSource(environment); + var vehicleParkingWithEntrance = stopArrival.place.vehicleParkingWithEntrance; if (vehicleParkingWithEntrance == null) { return null; } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java index 99ead9fd8c0..be05d00e16d 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/LegType.java @@ -340,7 +340,7 @@ public static GraphQLObjectType create( return ( stops .stream() - .map(stop -> stop.place().stop) + .map(stop -> stop.place.stop) .filter(Objects::nonNull) .collect(Collectors.toList()) ); diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index c70c03112d6..5a032def979 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -462,7 +462,7 @@ default Leg withTimeShift(Duration duration) { default Set getFareZones() { var intermediate = getIntermediateStops() .stream() - .flatMap(stopArrival -> stopArrival.place().stop.getFareZones().stream()); + .flatMap(stopArrival -> stopArrival.place.stop.getFareZones().stream()); var start = getFareZones(this.getFrom()); var end = getFareZones(this.getTo()); diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrival.java b/src/main/java/org/opentripplanner/model/plan/StopArrival.java index 8a6b55c9346..8435013cfb5 100644 --- a/src/main/java/org/opentripplanner/model/plan/StopArrival.java +++ b/src/main/java/org/opentripplanner/model/plan/StopArrival.java @@ -5,21 +5,36 @@ /** * This class is used to represent a stop arrival event mostly for intermediate visits to a stops * along a route. - * - * @param arrival The time the rider will arrive at the place. - * @param departure The time the rider will depart the place. - * @param stopPosInPattern For transit trips, the stop index (numbered from zero from the start of - * the trip). - * @param gtfsStopSequence For transit trips, the sequence number of the stop. Per GTFS, these - * numbers are increasing. */ -public record StopArrival( - Place place, - LegTime arrival, - LegTime departure, - Integer stopPosInPattern, - Integer gtfsStopSequence -) { +public final class StopArrival { + public final Place place; + public final LegTime arrival; + public final LegTime departure; + public final Integer stopPosInPattern; + public final Integer gtfsStopSequence; + + /** + * @param arrival The time the rider will arrive at the place. + * @param departure The time the rider will depart the place. + * @param stopPosInPattern For transit trips, the stop index (numbered from zero from the start of + * the trip). + * @param gtfsStopSequence For transit trips, the sequence number of the stop. Per GTFS, these + * numbers are increasing. + */ + public StopArrival( + Place place, + LegTime arrival, + LegTime departure, + Integer stopPosInPattern, + Integer gtfsStopSequence + ) { + this.place = place; + this.arrival = arrival; + this.departure = departure; + this.stopPosInPattern = stopPosInPattern; + this.gtfsStopSequence = gtfsStopSequence; + } + @Override public String toString() { return ToStringBuilder diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java index 4b2b194fbe4..94630be7600 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/AlertToLegMapper.java @@ -81,7 +81,7 @@ public void addTransitAlertsToLeg(Leg leg, boolean isFirstLeg) { if (leg.getIntermediateStops() != null) { Set stopConditions = StopCondition.PASSING; for (StopArrival visit : leg.getIntermediateStops()) { - if (visit.place().stop instanceof RegularStop stop) { + if (visit.place.stop instanceof RegularStop stop) { Collection alerts = getAlertsForStopAndRoute(stop, routeId, stopConditions); alerts.addAll(getAlertsForStopAndTrip(stop, tripId, serviceDate, stopConditions)); alerts.addAll( @@ -91,8 +91,8 @@ public void addTransitAlertsToLeg(Leg leg, boolean isFirstLeg) { ) ); - ZonedDateTime stopArrival = visit.arrival().scheduledTime(); - ZonedDateTime stopDeparture = visit.departure().scheduledTime(); + ZonedDateTime stopArrival = visit.arrival.scheduledTime(); + ZonedDateTime stopDeparture = visit.departure.scheduledTime(); addTransitAlertsToLeg(leg, alerts, stopArrival, stopDeparture); } From 91989e297ee37707302f09ede6b7ab4c18032c78 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 3 Mar 2024 21:32:41 +0100 Subject: [PATCH 0719/1688] Extract mapper for StopArrivals --- .../apis/gtfs/datafetchers/PlaceImpl.java | 3 +- .../model/plan/ScheduledTransitLeg.java | 29 +---------- .../model/plan/StopArrival.java | 1 + .../model/plan/StopArrivalMapper.java | 52 +++++++++++++++++++ 4 files changed, 56 insertions(+), 29 deletions(-) create mode 100644 src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java index 9ce80bcaf7f..145321f809c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/PlaceImpl.java @@ -88,8 +88,7 @@ public DataFetcher lon() { @Override public DataFetcher name() { - return environment -> - { + return environment -> { StopArrival stopArrival = getSource(environment); return GraphQLUtils.getTranslation(stopArrival.place.name, environment); }; diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index a4050fc3cb2..6bf39d5aa4c 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -275,36 +275,11 @@ public Place getTo() { @Override public List getIntermediateStops() { List visits = new ArrayList<>(); + var mapper = new StopArrivalMapper(zoneId, serviceDate, tripTimes); for (int i = boardStopPosInPattern + 1; i < alightStopPosInPattern; i++) { StopLocation stop = tripPattern.getStop(i); - - final var arrivalTime = ServiceDateUtils.toZonedDateTime( - serviceDate, - zoneId, - tripTimes.getArrivalTime(i) - ); - final var departureTime = ServiceDateUtils.toZonedDateTime( - serviceDate, - zoneId, - tripTimes.getDepartureTime(i) - ); - - var arrival = LegTime.ofStatic(arrivalTime); - var departure = LegTime.ofStatic(departureTime); - - if (getRealTime()) { - arrival = LegTime.of(arrivalTime, tripTimes.getArrivalDelay(i)); - departure = LegTime.of(departureTime, tripTimes.getDepartureDelay(i)); - } - - StopArrival visit = new StopArrival( - Place.forStop(stop), - arrival, - departure, - i, - tripTimes.gtfsSequenceOfStopIndex(i) - ); + final StopArrival visit = mapper.map(i, stop, getRealTime()); visits.add(visit); } return visits; diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrival.java b/src/main/java/org/opentripplanner/model/plan/StopArrival.java index 8435013cfb5..489b122da09 100644 --- a/src/main/java/org/opentripplanner/model/plan/StopArrival.java +++ b/src/main/java/org/opentripplanner/model/plan/StopArrival.java @@ -7,6 +7,7 @@ * along a route. */ public final class StopArrival { + public final Place place; public final LegTime arrival; public final LegTime departure; diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java b/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java new file mode 100644 index 00000000000..3a907e8cffb --- /dev/null +++ b/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java @@ -0,0 +1,52 @@ +package org.opentripplanner.model.plan; + +import java.time.LocalDate; +import java.time.ZoneId; +import org.opentripplanner.framework.time.ServiceDateUtils; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.TripTimes; + +/** + * Maps leg-related information to an instance of {@link StopArrival}. + */ +class StopArrivalMapper { + + private final ZoneId zoneId; + private final LocalDate serviceDate; + private final TripTimes tripTimes; + + public StopArrivalMapper(ZoneId zoneId, LocalDate serviceDate, TripTimes tripTimes) { + this.zoneId = zoneId; + this.serviceDate = serviceDate; + this.tripTimes = tripTimes; + } + + StopArrival map(int i, StopLocation stop, boolean realTime) { + final var arrivalTime = ServiceDateUtils.toZonedDateTime( + serviceDate, + zoneId, + tripTimes.getArrivalTime(i) + ); + final var departureTime = ServiceDateUtils.toZonedDateTime( + serviceDate, + zoneId, + tripTimes.getDepartureTime(i) + ); + + var arrival = LegTime.ofStatic(arrivalTime); + var departure = LegTime.ofStatic(departureTime); + + if (realTime) { + arrival = LegTime.of(arrivalTime, tripTimes.getArrivalDelay(i)); + departure = LegTime.of(departureTime, tripTimes.getDepartureDelay(i)); + } + + return new StopArrival( + Place.forStop(stop), + arrival, + departure, + i, + tripTimes.gtfsSequenceOfStopIndex(i) + ); + } +} From 84083b6476ad1afd52d48405e024838751ecfef9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 3 Mar 2024 21:36:29 +0100 Subject: [PATCH 0720/1688] Separate tests several classes --- .../apis/gtfs/DurationScalarTest.java | 41 ++++++ .../apis/gtfs/GeoJsonScalarTest.java | 31 +++++ .../apis/gtfs/GraphQLScalarsTest.java | 119 ------------------ .../apis/gtfs/OffsetDateTimeScalarTest.java | 62 +++++++++ 4 files changed, 134 insertions(+), 119 deletions(-) create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java delete mode 100644 src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java diff --git a/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java new file mode 100644 index 00000000000..ca87311ac3a --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java @@ -0,0 +1,41 @@ +package org.opentripplanner.apis.gtfs; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.of; + +import graphql.schema.CoercingSerializeException; +import java.time.Duration; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +public class DurationScalarTest { + + static List durationCases() { + return List.of( + of(Duration.ofMinutes(30), "PT30M"), + of(Duration.ofHours(23), "PT23H"), + of(Duration.ofMinutes(-10), "-PT10M"), + of(Duration.ofMinutes(-90), "-PT1H30M"), + of(Duration.ofMinutes(-184), "-PT3H4M") + ); + } + + @ParameterizedTest + @MethodSource("durationCases") + void duration(Duration duration, String expected) { + var string = GraphQLScalars.durationScalar.getCoercing().serialize(duration); + assertEquals(expected, string); + } + + @Test + void nonDuration() { + Assertions.assertThrows( + CoercingSerializeException.class, + () -> GraphQLScalars.durationScalar.getCoercing().serialize(new Object()) + ); + } +} diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java new file mode 100644 index 00000000000..92188e603c4 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java @@ -0,0 +1,31 @@ +package org.opentripplanner.apis.gtfs; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.fasterxml.jackson.core.JsonProcessingException; +import org.junit.jupiter.api.Test; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.GeometryFactory; +import org.opentripplanner.framework.json.ObjectMappers; + +class GeoJsonScalarTest { + + @Test + void geoJson() throws JsonProcessingException { + var gm = new GeometryFactory(); + var polygon = gm.createPolygon( + new Coordinate[] { + new Coordinate(0, 0), + new Coordinate(1, 1), + new Coordinate(2, 2), + new Coordinate(0, 0), + } + ); + var geoJson = GraphQLScalars.geoJsonScalar.getCoercing().serialize(polygon); + + var jsonNode = ObjectMappers + .ignoringExtraFields() + .readTree("{\"type\":\"Polygon\",\"coordinates\":[[[0,0],[1,1],[2,2],[0,0]]]}"); + assertEquals(jsonNode.toString(), geoJson.toString()); + } +} diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java deleted file mode 100644 index 5183279cec7..00000000000 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java +++ /dev/null @@ -1,119 +0,0 @@ -package org.opentripplanner.apis.gtfs; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.params.provider.Arguments.of; - -import com.fasterxml.jackson.core.JsonProcessingException; -import graphql.language.StringValue; -import graphql.schema.CoercingSerializeException; -import java.time.Duration; -import java.time.LocalDate; -import java.time.LocalTime; -import java.time.OffsetDateTime; -import java.time.ZoneOffset; -import java.util.List; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Nested; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.GeometryFactory; -import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.framework.json.ObjectMappers; - -class GraphQLScalarsTest { - - static final OffsetDateTime OFFSET_DATE_TIME = OffsetDateTime.of( - LocalDate.of(2024, 2, 4), - LocalTime.MIDNIGHT, - ZoneOffset.UTC - ); - - static List durationCases() { - return List.of( - of(Duration.ofMinutes(30), "PT30M"), - of(Duration.ofHours(23), "PT23H"), - of(Duration.ofMinutes(-10), "-PT10M"), - of(Duration.ofMinutes(-90), "-PT1H30M"), - of(Duration.ofMinutes(-184), "-PT3H4M") - ); - } - - @ParameterizedTest - @MethodSource("durationCases") - void duration(Duration duration, String expected) { - var string = GraphQLScalars.durationScalar.getCoercing().serialize(duration); - assertEquals(expected, string); - } - - @Test - void nonDuration() { - Assertions.assertThrows( - CoercingSerializeException.class, - () -> GraphQLScalars.durationScalar.getCoercing().serialize(new Object()) - ); - } - - @Test - void geoJson() throws JsonProcessingException { - var gm = new GeometryFactory(); - var polygon = gm.createPolygon( - new Coordinate[] { - new Coordinate(0, 0), - new Coordinate(1, 1), - new Coordinate(2, 2), - new Coordinate(0, 0), - } - ); - var geoJson = GraphQLScalars.geoJsonScalar.getCoercing().serialize(polygon); - - var jsonNode = ObjectMappers - .ignoringExtraFields() - .readTree("{\"type\":\"Polygon\",\"coordinates\":[[[0,0],[1,1],[2,2],[0,0]]]}"); - assertEquals(jsonNode.toString(), geoJson.toString()); - } - - @Nested - class OffsetDateTimeTests { - - static List offsetDateTimeCases() { - return List.of( - of(OFFSET_DATE_TIME, "2024-02-04T00:00:00Z"), - of(OFFSET_DATE_TIME.plusHours(12).plusMinutes(8).plusSeconds(22), "2024-02-04T12:08:22Z"), - of( - OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.BERLIN).toOffsetDateTime(), - "2024-02-04T01:00:00+01:00" - ), - of( - OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.NEW_YORK).toOffsetDateTime(), - "2024-02-03T19:00:00-05:00" - ) - ); - } - - @ParameterizedTest - @MethodSource("offsetDateTimeCases") - void serializeOffsetDateTime(OffsetDateTime odt, String expected) { - var string = GraphQLScalars.offsetDateTimeScalar.getCoercing().serialize(odt); - assertEquals(expected, string); - } - - @ParameterizedTest - @MethodSource("offsetDateTimeCases") - void parseOffsetDateTime(OffsetDateTime expected, String input) { - var odt = GraphQLScalars.offsetDateTimeScalar.getCoercing().parseValue(input); - assertEquals(expected, odt); - } - - @ParameterizedTest - @MethodSource("offsetDateTimeCases") - void parseOffsetDateTimeLiteral(OffsetDateTime expected, String input) { - var odt = GraphQLScalars.offsetDateTimeScalar - .getCoercing() - .parseLiteral(new StringValue(input)); - assertEquals(expected, odt); - } - } -} diff --git a/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java new file mode 100644 index 00000000000..890bf1eeed1 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java @@ -0,0 +1,62 @@ +package org.opentripplanner.apis.gtfs; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.params.provider.Arguments.of; + +import graphql.language.StringValue; +import java.time.LocalDate; +import java.time.LocalTime; +import java.time.OffsetDateTime; +import java.time.ZoneOffset; +import java.util.List; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner._support.time.ZoneIds; + +public class OffsetDateTimeScalarTest { + + static final OffsetDateTime OFFSET_DATE_TIME = OffsetDateTime.of( + LocalDate.of(2024, 2, 4), + LocalTime.MIDNIGHT, + ZoneOffset.UTC + ); + + static List offsetDateTimeCases() { + return List.of( + of(OFFSET_DATE_TIME, "2024-02-04T00:00:00Z"), + of(OFFSET_DATE_TIME.plusHours(12).plusMinutes(8).plusSeconds(22), "2024-02-04T12:08:22Z"), + of( + OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.BERLIN).toOffsetDateTime(), + "2024-02-04T01:00:00+01:00" + ), + of( + OFFSET_DATE_TIME.atZoneSameInstant(ZoneIds.NEW_YORK).toOffsetDateTime(), + "2024-02-03T19:00:00-05:00" + ) + ); + } + + @ParameterizedTest + @MethodSource("offsetDateTimeCases") + void serializeOffsetDateTime(OffsetDateTime odt, String expected) { + var string = GraphQLScalars.offsetDateTimeScalar.getCoercing().serialize(odt); + assertEquals(expected, string); + } + + @ParameterizedTest + @MethodSource("offsetDateTimeCases") + void parseOffsetDateTime(OffsetDateTime expected, String input) { + var odt = GraphQLScalars.offsetDateTimeScalar.getCoercing().parseValue(input); + assertEquals(expected, odt); + } + + @ParameterizedTest + @MethodSource("offsetDateTimeCases") + void parseOffsetDateTimeLiteral(OffsetDateTime expected, String input) { + var odt = GraphQLScalars.offsetDateTimeScalar + .getCoercing() + .parseLiteral(new StringValue(input)); + assertEquals(expected, odt); + } +} From 10fac09bdd9c3481256fd8be7f5682b1dc12ab04 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 3 Mar 2024 22:32:33 +0100 Subject: [PATCH 0721/1688] Make parser return throw an exception --- .../apis/gtfs/GraphQLScalars.java | 31 ++++++++++++------- .../framework/time/OffsetDateTimeParser.java | 10 +++--- .../time/OffsetDateTimeParserTest.java | 14 ++++++--- 3 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 7d70f4be3b5..f0e4f295055 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -10,6 +10,7 @@ import graphql.schema.CoercingParseValueException; import graphql.schema.CoercingSerializeException; import graphql.schema.GraphQLScalarType; +import java.text.ParseException; import java.time.OffsetDateTime; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; @@ -79,26 +80,34 @@ public String serialize(@Nonnull Object dataFetcherResult) @Override public OffsetDateTime parseValue(Object input) throws CoercingParseValueException { if (input instanceof CharSequence cs) { - return OffsetDateTimeParser.parseLeniently(cs).orElseThrow(() -> valueException(input)); + try { + return OffsetDateTimeParser.parseLeniently(cs); + } catch (ParseException e) { + int errorOffset = e.getErrorOffset(); + throw new CoercingParseValueException( + "Cannot parse %s into an OffsetDateTime. Error at character index %s".formatted( + input, + errorOffset + ) + ); + } } - throw valueException(input); + throw new CoercingParseValueException( + "Cannot parse %s into an OffsetDateTime. Must be a string." + ); } @Override public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralException { if (input instanceof StringValue sv) { - return OffsetDateTimeParser - .parseLeniently(sv.getValue()) - .orElseThrow(CoercingParseLiteralException::new); + try { + return OffsetDateTimeParser.parseLeniently(sv.getValue()); + } catch (ParseException e) { + throw new CoercingSerializeException(); + } } throw new CoercingParseLiteralException(); } - - private static CoercingParseValueException valueException(Object input) { - return new CoercingParseValueException( - "Cannot parse %s into an OffsetDateTime.".formatted(input) - ); - } } ) .build(); diff --git a/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java b/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java index 11652d797a7..8b40697977a 100644 --- a/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java +++ b/src/main/java/org/opentripplanner/framework/time/OffsetDateTimeParser.java @@ -1,10 +1,10 @@ package org.opentripplanner.framework.time; +import java.text.ParseException; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; -import java.util.Optional; public class OffsetDateTimeParser { @@ -30,13 +30,13 @@ public class OffsetDateTimeParser { /** * Parses a ISO-8601 string into am OffsetDateTime instance allowing the offset to be both in * '02:00' and '0200' format. + * @throws ParseException if the string cannot be parsed */ - public static Optional parseLeniently(CharSequence input) { + public static OffsetDateTime parseLeniently(CharSequence input) throws ParseException { try { - var result = OffsetDateTime.parse(input, LENIENT_PARSER); - return Optional.of(result); + return OffsetDateTime.parse(input, LENIENT_PARSER); } catch (DateTimeParseException e) { - return Optional.empty(); + throw new ParseException(e.getParsedString(), e.getErrorIndex()); } } } diff --git a/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java b/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java index 1f164ada783..d8944b9a5f0 100644 --- a/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java +++ b/src/test/java/org/opentripplanner/framework/time/OffsetDateTimeParserTest.java @@ -2,8 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; +import java.text.ParseException; import java.time.OffsetDateTime; import java.util.List; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -27,9 +29,9 @@ static List successfulCases() { @ParameterizedTest @MethodSource("successfulCases") - void parse(String input) { + void parse(String input) throws ParseException { var res = OffsetDateTimeParser.parseLeniently(input); - assertTrue(res.get().isEqual(TIME)); + assertTrue(res.isEqual(TIME)); } static List failedCases() { @@ -39,7 +41,11 @@ static List failedCases() { @ParameterizedTest @MethodSource("failedCases") void failed(String input) { - var res = OffsetDateTimeParser.parseLeniently(input); - assertTrue(res.isEmpty()); + Assertions.assertThrows( + ParseException.class, + () -> { + OffsetDateTimeParser.parseLeniently(input); + } + ); } } From 8ea6935f94957402bf3c8164bcc7ff94fff01211 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 01:06:48 +0000 Subject: [PATCH 0722/1688] fix(deps): update dependency ch.qos.logback:logback-classic to v1.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index d746c259a25..7075f575344 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 5.10.2 1.12.2 5.5.3 - 1.5.1 + 1.5.2 9.9.1 2.0.12 2.0.15 From 28865d50f9ea4a14af08f9ff936c585313f41923 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 01:06:54 +0000 Subject: [PATCH 0723/1688] chore(deps): update dependency org.mockito:mockito-core to v5.11.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7075f575344..8764dc0578a 100644 --- a/pom.xml +++ b/pom.xml @@ -713,7 +713,7 @@ org.mockito mockito-core - 5.10.0 + 5.11.0 test From 009eb99f6b8796702ac5112983dbfd4f3dd28a59 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 4 Mar 2024 10:02:44 +0100 Subject: [PATCH 0724/1688] Remove arrival/departure in example --- docs/apis/GraphQL-Tutorial.md | 14 ------ .../apis/gtfs/expectations/plan.json | 44 ------------------- .../apis/gtfs/queries/plan.graphql | 14 ------ 3 files changed, 72 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index 7e1f6b0f6db..92645f9b245 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -96,13 +96,6 @@ Most people want to get routing results out of OTP, so lets see the query for th name lat lon - arrival { - scheduledTime - estimated { - time - delay - } - } departure { scheduledTime estimated { @@ -122,13 +115,6 @@ Most people want to get routing results out of OTP, so lets see the query for th delay } } - departure { - scheduledTime - estimated { - time - delay - } - } } route { gtfsId diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json index ec971af5b3c..d213443f7cd 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json @@ -12,10 +12,6 @@ "name" : "A", "lat" : 5.0, "lon" : 8.0, - "arrival" : { - "scheduledTime" : "2020-02-02T11:00:00Z", - "estimated" : null - }, "departure" : { "scheduledTime" : "2020-02-02T11:00:00Z", "estimated" : null @@ -28,10 +24,6 @@ "arrival" : { "scheduledTime" : "2020-02-02T11:00:20Z", "estimated" : null - }, - "departure" : { - "scheduledTime" : "2020-02-02T11:00:20Z", - "estimated" : null } }, "route" : null, @@ -43,13 +35,6 @@ "name" : "B", "lat" : 6.0, "lon" : 8.5, - "arrival" : { - "scheduledTime" : "2020-02-02T10:51:00Z", - "estimated" : { - "time" : "2020-02-02T11:01:00Z", - "delay" : "PT10M" - } - }, "departure" : { "scheduledTime" : "2020-02-02T10:51:00Z", "estimated" : { @@ -68,13 +53,6 @@ "time" : "2020-02-02T11:15:00Z", "delay" : "PT10M" } - }, - "departure" : { - "scheduledTime" : "2020-02-02T11:05:00Z", - "estimated" : { - "time" : "2020-02-02T11:15:00Z", - "delay" : "PT10M" - } } }, "route" : { @@ -92,13 +70,6 @@ "name" : "C", "lat" : 7.0, "lon" : 9.0, - "arrival" : { - "scheduledTime" : "2020-02-02T11:20:00Z", - "estimated" : { - "time" : "2020-02-02T11:30:00Z", - "delay" : "PT10M" - } - }, "departure" : { "scheduledTime" : "2020-02-02T11:20:00Z", "estimated" : { @@ -117,13 +88,6 @@ "time" : "2020-02-02T11:50:00Z", "delay" : "PT10M" } - }, - "departure" : { - "scheduledTime" : "2020-02-02T11:40:00Z", - "estimated" : { - "time" : "2020-02-02T11:50:00Z", - "delay" : "PT10M" - } } }, "route" : { @@ -141,10 +105,6 @@ "name" : "D", "lat" : 8.0, "lon" : 9.5, - "arrival" : { - "scheduledTime" : "2020-02-02T11:50:00Z", - "estimated" : null - }, "departure" : { "scheduledTime" : "2020-02-02T11:50:00Z", "estimated" : null @@ -157,10 +117,6 @@ "arrival" : { "scheduledTime" : "2020-02-02T12:00:00Z", "estimated" : null - }, - "departure" : { - "scheduledTime" : "2020-02-02T12:00:00Z", - "estimated" : null } }, "route" : null, diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql index cc93ffb211c..39877eef0b7 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql @@ -25,13 +25,6 @@ name lat lon - arrival { - scheduledTime - estimated { - time - delay - } - } departure { scheduledTime estimated { @@ -51,13 +44,6 @@ delay } } - departure { - scheduledTime - estimated { - time - delay - } - } } route { gtfsId From 38f7dfaae5f8f826159e7b05df49be13e6bcf98b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 4 Mar 2024 10:57:42 +0100 Subject: [PATCH 0725/1688] Update docs --- .../java/org/opentripplanner/framework/lang/StringUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java index 1e57fb55027..9eff448d0c7 100644 --- a/src/main/java/org/opentripplanner/framework/lang/StringUtils.java +++ b/src/main/java/org/opentripplanner/framework/lang/StringUtils.java @@ -134,11 +134,10 @@ public static String kebabCase(String input) { } /** - * Removes unprintable control characters like newlines, tabs and invisible whitespace + * Detects unprintable control characters like newlines, tabs and invisible whitespace * like 'ZERO WIDTH SPACE' (U+200B) that don't have an immediate visual representation. *

      - * Note that "regular" whitespace characters like U+0020 and U+2000 are considered visible and - * therefore not removed. + * Note that "regular" whitespace characters like U+0020 and U+2000 are considered visible. */ public static boolean containsInvisibleCharacters(String input) { return INVISIBLE_CHARS_PATTERN.matcher(input).find(); From 5bf60ef3b90547a4016ab84c7800c4d23a205fc7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 1 Mar 2024 23:00:51 +0100 Subject: [PATCH 0726/1688] Migrate from VariableSource to MethodSource --- ...CombinedInterlinedLegsFareServiceTest.java | 18 +- .../ext/fares/model/FareProductTest.java | 42 +-- .../RideHailingAccessShifterTest.java | 44 +-- .../gtfs/mapping/RouteRequestMapperTest.java | 81 ++--- .../mapping/TripRequestMapperTest.java | 11 +- .../scalars/DateTimeScalarFactoryTest.java | 22 +- .../framework/lang/StringUtilsTest.java | 20 +- .../graph_builder/module/GtfsFeedIdTest.java | 8 +- .../OsmBoardingLocationsModuleTest.java | 26 +- .../interlining/InterlineProcessorTest.java | 110 +++---- .../gtfs/mapping/LocationMapperTest.java | 11 +- .../gtfs/mapping/TransitModeMapperTest.java | 24 +- .../opentripplanner/model/plan/PlaceTest.java | 22 +- .../model/plan/RelativeDirectionTest.java | 52 ++-- .../OSMOpeningHoursParserTest.java | 286 +++++++++--------- .../tagmapping/PortlandMapperTest.java | 37 +-- .../specifier/BestMatchSpecifierTest.java | 18 +- .../wayproperty/specifier/ConditionTest.java | 70 +++-- .../transit/TripPatternForDateTest.java | 12 +- .../cost/WheelchairCostCalculatorTest.java | 16 +- ...eRequestTransitDataProviderFilterTest.java | 22 +- .../services/TransferGeneratorTest.java | 32 +- .../request/WheelchairPreferencesTest.java | 82 ++--- .../LinearFunctionSerializationTest.java | 38 +-- .../TimeSlopeSafetyTriangleTest.java | 26 +- .../routing/core/MoneyTest.java | 48 +-- .../routerequest/WheelchairConfigTest.java | 96 +++--- .../server/EtagRequestFilterTest.java | 34 ++- .../server/RequestTraceFilterTest.java | 32 +- .../model/edge/ElevatorHopEdgeTest.java | 30 +- .../street/model/edge/EscalatorEdgeTest.java | 8 +- .../street/model/edge/PathwayEdgeTest.java | 34 ++- .../street/model/edge/StreetEdgeCostTest.java | 80 ++--- .../edge/StreetEdgeRentalTraversalTest.java | 30 +- .../edge/StreetEdgeWheelchairCostTest.java | 82 ++--- .../edge/StreetVehicleParkingLinkTest.java | 24 +- .../street/search/state/StateDataTest.java | 12 +- .../street/search/state/StateTest.java | 44 +-- .../support/VariableArgumentsProvider.java | 55 ---- .../test/support/VariableSource.java | 19 -- .../trip/TimetableSnapshotSourceTest.java | 20 +- .../RealtimeVehicleMatcherTest.java | 16 +- 42 files changed, 905 insertions(+), 889 deletions(-) delete mode 100644 src/test/java/org/opentripplanner/test/support/VariableArgumentsProvider.java delete mode 100644 src/test/java/org/opentripplanner/test/support/VariableSource.java diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java index 3f237cf509f..407cd0f11e9 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/CombinedInterlinedLegsFareServiceTest.java @@ -16,12 +16,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.ext.fares.impl.CombinedInterlinedLegsFareService.CombinationMode; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.core.FareType; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.network.Route; @@ -44,17 +44,19 @@ class CombinedInterlinedLegsFareServiceTest implements PlanTestConstants { static Money tenDollars = Money.usDollars(10); static Money twentyDollars = Money.usDollars(20); - static Stream testCases = Stream.of( - Arguments.of(ALWAYS, interlinedWithSameRoute, tenDollars, "same routes"), - Arguments.of(ALWAYS, interlinedWithDifferentRoute, tenDollars, "different routes"), - Arguments.of(SAME_ROUTE, interlinedWithSameRoute, tenDollars, "same routes"), - Arguments.of(SAME_ROUTE, interlinedWithDifferentRoute, twentyDollars, "different routes") - ); + static Stream testCases() { + return Stream.of( + Arguments.of(ALWAYS, interlinedWithSameRoute, tenDollars, "same routes"), + Arguments.of(ALWAYS, interlinedWithDifferentRoute, tenDollars, "different routes"), + Arguments.of(SAME_ROUTE, interlinedWithSameRoute, tenDollars, "same routes"), + Arguments.of(SAME_ROUTE, interlinedWithDifferentRoute, twentyDollars, "different routes") + ); + } @ParameterizedTest( name = "Itinerary with {3} and combination mode {0} should lead to a fare of {2}" ) - @VariableSource("testCases") + @MethodSource("testCases") void modes(CombinationMode mode, Itinerary itinerary, Money totalPrice, String hint) { var service = new CombinedInterlinedLegsFareService(mode); service.addFareRules( diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java index 9edcecb7567..089bac64c11 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/model/FareProductTest.java @@ -9,10 +9,10 @@ import javax.annotation.Nonnull; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.RiderCategory; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -28,27 +28,29 @@ class FareProductTest { static FareMedium MEDIUM = new FareMedium(new FeedScopedId("1", "app"), "App"); - static Stream testCases = Stream.of( - Arguments.of(fareProduct(null, null, null), ZDT, "b18a083d-ee82-3c83-af07-2b8bb11bff9e"), - Arguments.of( - fareProduct(null, null, null), - ZDT.plusHours(1), - "2a60adcf-3e56-338a-ab7d-8407a3bc529b" - ), - Arguments.of( - fareProduct(Duration.ofHours(2), CATEGORY, null), - ZDT, - "ca4a45b5-b837-34d8-b987-4e06fa5a3317" - ), - Arguments.of( - fareProduct(Duration.ofHours(2), CATEGORY, MEDIUM), - ZDT, - "b59e7eef-c118-37b1-8f53-bf2a97c5dae9" - ) - ); + static Stream testCases() { + return Stream.of( + Arguments.of(fareProduct(null, null, null), ZDT, "b18a083d-ee82-3c83-af07-2b8bb11bff9e"), + Arguments.of( + fareProduct(null, null, null), + ZDT.plusHours(1), + "2a60adcf-3e56-338a-ab7d-8407a3bc529b" + ), + Arguments.of( + fareProduct(Duration.ofHours(2), CATEGORY, null), + ZDT, + "ca4a45b5-b837-34d8-b987-4e06fa5a3317" + ), + Arguments.of( + fareProduct(Duration.ofHours(2), CATEGORY, MEDIUM), + ZDT, + "b59e7eef-c118-37b1-8f53-bf2a97c5dae9" + ) + ); + } @ParameterizedTest - @VariableSource("testCases") + @MethodSource("testCases") void instanceId(FareProduct fareProduct, ZonedDateTime startTime, String expectedInstanceId) { var instanceId = fareProduct.uniqueInstanceId(startTime); diff --git a/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java b/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java index 465697bf197..3e6df7135e5 100644 --- a/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifterTest.java @@ -16,6 +16,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; @@ -24,7 +25,6 @@ import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.TestStateBuilder; -import org.opentripplanner.test.support.VariableSource; class RideHailingAccessShifterTest { @@ -42,21 +42,23 @@ class RideHailingAccessShifterTest { List.of() ); - static Stream testCases = Stream.of( - // leave now, so shift by 10 minutes - Arguments.of(TIME, DEFAULT_ARRIVAL_DURATION), - // only shift by 9 minutes because we are wanting to leave in 1 minute - Arguments.of(TIME.plus(ofMinutes(1)), ofMinutes(9)), - // only shift by 7 minutes because we are wanting to leave in 3 minutes - Arguments.of(TIME.plus(ofMinutes(3)), ofMinutes(7)), - // no shifting because it's far in the future - Arguments.of(TIME.plus(ofMinutes(15)), ZERO), - Arguments.of(TIME.plus(ofMinutes(30)), ZERO), - Arguments.of(TIME.plus(ofMinutes(40)), ZERO) - ); + static Stream testCases() { + return Stream.of( + // leave now, so shift by 10 minutes + Arguments.of(TIME, DEFAULT_ARRIVAL_DURATION), + // only shift by 9 minutes because we are wanting to leave in 1 minute + Arguments.of(TIME.plus(ofMinutes(1)), ofMinutes(9)), + // only shift by 7 minutes because we are wanting to leave in 3 minutes + Arguments.of(TIME.plus(ofMinutes(3)), ofMinutes(7)), + // no shifting because it's far in the future + Arguments.of(TIME.plus(ofMinutes(15)), ZERO), + Arguments.of(TIME.plus(ofMinutes(30)), ZERO), + Arguments.of(TIME.plus(ofMinutes(40)), ZERO) + ); + } @ParameterizedTest - @VariableSource("testCases") + @MethodSource("testCases") void testArrivalDelay(Instant searchTime, Duration expectedArrival) { var req = new RouteRequest(); req.setTo(FROM); @@ -73,14 +75,16 @@ void testArrivalDelay(Instant searchTime, Duration expectedArrival) { assertEquals(expectedArrival, actualArrival); } - static Stream accessShiftCases = Stream.of( - // leave now, so shift by 10 minutes - Arguments.of(TIME, TIME.plus(DEFAULT_ARRIVAL_DURATION)), - Arguments.of(TIME.plus(Duration.ofHours(4)), TIME) - ); + static Stream accessShiftCases() { + return Stream.of( + // leave now, so shift by 10 minutes + Arguments.of(TIME, TIME.plus(DEFAULT_ARRIVAL_DURATION)), + Arguments.of(TIME.plus(Duration.ofHours(4)), TIME) + ); + } @ParameterizedTest - @VariableSource("accessShiftCases") + @MethodSource("accessShiftCases") void shiftAccesses(Instant startTime, Instant expectedStartTime) { var drivingState = TestStateBuilder.ofDriving().streetEdge().streetEdge().build(); var access = new DefaultAccessEgress(0, drivingState); diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java index ecba3320838..22a8583d705 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java @@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.TestRoutingService; @@ -34,7 +35,6 @@ import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService; import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService; import org.opentripplanner.street.search.TraverseMode; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; @@ -91,25 +91,30 @@ void parkingFilters() { testParkingFilters(routeRequest.preferences().parking(TraverseMode.BICYCLE)); } - static Stream banningCases = Stream.of( - of(Map.of(), "[TransitFilterRequest{}]"), - of( - Map.of("routes", "trimet:555"), - "[TransitFilterRequest{not: [SelectRequest{transportModes: [], routes: [trimet:555]}]}]" - ), - of(Map.of("agencies", ""), "[TransitFilterRequest{not: [SelectRequest{transportModes: []}]}]"), - of( - Map.of("agencies", "trimet:666"), - "[TransitFilterRequest{not: [SelectRequest{transportModes: [], agencies: [trimet:666]}]}]" - ), - of( - Map.of("agencies", "trimet:666", "routes", "trimet:444"), - "[TransitFilterRequest{not: [SelectRequest{transportModes: [], routes: [trimet:444]}, SelectRequest{transportModes: [], agencies: [trimet:666]}]}]" - ) - ); + static Stream banningCases() { + return Stream.of( + of(Map.of(), "[TransitFilterRequest{}]"), + of( + Map.of("routes", "trimet:555"), + "[TransitFilterRequest{not: [SelectRequest{transportModes: [], routes: [trimet:555]}]}]" + ), + of( + Map.of("agencies", ""), + "[TransitFilterRequest{not: [SelectRequest{transportModes: []}]}]" + ), + of( + Map.of("agencies", "trimet:666"), + "[TransitFilterRequest{not: [SelectRequest{transportModes: [], agencies: [trimet:666]}]}]" + ), + of( + Map.of("agencies", "trimet:666", "routes", "trimet:444"), + "[TransitFilterRequest{not: [SelectRequest{transportModes: [], routes: [trimet:444]}, SelectRequest{transportModes: [], agencies: [trimet:666]}]}]" + ) + ); + } @ParameterizedTest - @VariableSource("banningCases") + @MethodSource("banningCases") void banning(Map banned, String expectedFilters) { Map arguments = Map.of("banned", banned); @@ -119,21 +124,23 @@ void banning(Map banned, String expectedFilters) { assertEquals(expectedFilters, routeRequest.journey().transit().filters().toString()); } - static Stream transportModesCases = Stream.of( - of(List.of(), "[ExcludeAllTransitFilter{}]"), - of(List.of(mode("BICYCLE")), "[ExcludeAllTransitFilter{}]"), - of( - List.of(mode("BUS")), - "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS, COACH]}]}]" - ), - of( - List.of(mode("BUS"), mode("MONORAIL")), - "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS, COACH, MONORAIL]}]}]" - ) - ); + static Stream transportModesCases() { + return Stream.of( + of(List.of(), "[ExcludeAllTransitFilter{}]"), + of(List.of(mode("BICYCLE")), "[ExcludeAllTransitFilter{}]"), + of( + List.of(mode("BUS")), + "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS, COACH]}]}]" + ), + of( + List.of(mode("BUS"), mode("MONORAIL")), + "[TransitFilterRequest{select: [SelectRequest{transportModes: [BUS, COACH, MONORAIL]}]}]" + ) + ); + } @ParameterizedTest - @VariableSource("transportModesCases") + @MethodSource("transportModesCases") void modes(List> modes, String expectedFilters) { Map arguments = Map.of("transportModes", modes); @@ -172,13 +179,15 @@ void bikeTriangle() { ); } - static Stream noTriangleCases = Arrays - .stream(GraphQLTypes.GraphQLOptimizeType.values()) - .filter(value -> value != GraphQLTypes.GraphQLOptimizeType.TRIANGLE) - .map(Arguments::of); + static Stream noTriangleCases() { + return Arrays + .stream(GraphQLTypes.GraphQLOptimizeType.values()) + .filter(value -> value != GraphQLTypes.GraphQLOptimizeType.TRIANGLE) + .map(Arguments::of); + } @ParameterizedTest - @VariableSource("noTriangleCases") + @MethodSource("noTriangleCases") void noTriangle(GraphQLTypes.GraphQLOptimizeType bot) { Map arguments = Map.of( "optimize", diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index c0bd96b6310..e35f198d16e 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.apis.transmodel.TransmodelRequestContext; import org.opentripplanner.ext.emissions.DefaultEmissionsService; @@ -50,7 +51,6 @@ import org.opentripplanner.standalone.server.DefaultServerRequestContext; import org.opentripplanner.street.model.StreetLimitationParameters; import org.opentripplanner.street.service.DefaultStreetLimitationParametersService; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.network.Route; @@ -279,13 +279,12 @@ void testDefaultTriangleFactors() { assertEquals(TimeSlopeSafetyTriangle.DEFAULT, req2.preferences().bike().optimizeTriangle()); } - static Stream noTriangleCases = VehicleRoutingOptimizeType - .nonTriangleValues() - .stream() - .map(Arguments::of); + static Stream noTriangleCases() { + return VehicleRoutingOptimizeType.nonTriangleValues().stream().map(Arguments::of); + } @ParameterizedTest - @VariableSource("noTriangleCases") + @MethodSource("noTriangleCases") public void testBikeTriangleFactorsHasNoEffect(VehicleRoutingOptimizeType bot) { Map arguments = Map.of( "bicycleOptimisationMethod", diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java b/src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java index 43b44cbd5a6..c46c232751f 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/model/scalars/DateTimeScalarFactoryTest.java @@ -13,7 +13,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; class DateTimeScalarFactoryTest { @@ -32,17 +32,19 @@ void serialize() { assertEquals(DATE_TIME, result); } - static Stream testCases = Stream.of( - Arguments.of(DATE_TIME), - Arguments.of("2023-01-27T12:59:00.000+01:00"), - Arguments.of("2023-01-27T12:59:00+0100"), - Arguments.of("2023-01-27T12:59:00+01"), - Arguments.of("2023-01-27T12:59:00"), - Arguments.of("2023-01-27T11:59:00Z") - ); + static Stream testCases() { + return Stream.of( + Arguments.of(DATE_TIME), + Arguments.of("2023-01-27T12:59:00.000+01:00"), + Arguments.of("2023-01-27T12:59:00+0100"), + Arguments.of("2023-01-27T12:59:00+01"), + Arguments.of("2023-01-27T12:59:00"), + Arguments.of("2023-01-27T11:59:00Z") + ); + } @ParameterizedTest - @VariableSource("testCases") + @MethodSource("testCases") void parse(String input) { var result = subject.getCoercing().parseValue(input); assertEquals(EPOCH_MILLIS, result); diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java index 8998d82a5f2..9a4c30e1329 100644 --- a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java @@ -10,20 +10,22 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; class StringUtilsTest { - static final Stream hasValueTestCases = Stream.of( - Arguments.of("Text", TRUE), - Arguments.of("T", TRUE), - Arguments.of(null, FALSE), - Arguments.of("", FALSE), - Arguments.of("\t\n", FALSE) - ); + static Stream hasValueTestCases() { + return Stream.of( + Arguments.of("Text", TRUE), + Arguments.of("T", TRUE), + Arguments.of(null, FALSE), + Arguments.of("", FALSE), + Arguments.of("\t\n", FALSE) + ); + } @ParameterizedTest - @VariableSource("hasValueTestCases") + @MethodSource("hasValueTestCases") void hasValue(String input, Boolean hasValue) { assertEquals(hasValue, StringUtils.hasValue(input)); assertEquals(!hasValue, StringUtils.hasNoValue(input)); diff --git a/src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java b/src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java index 71a1d382983..133ec71070a 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/GtfsFeedIdTest.java @@ -9,16 +9,18 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; class GtfsFeedIdTest { private static final String NUMBERS_ONLY_REGEX = "^\\d+$"; - static Stream emptyCases = Stream.of(null, "", " ", "\n", " ").map(Arguments::of); + static Stream emptyCases() { + return Stream.of(null, "", " ", "\n", " ").map(Arguments::of); + } @ParameterizedTest - @VariableSource("emptyCases") + @MethodSource("emptyCases") void autogenerateNumber(String id) { String feedId = feedId(id); assertTrue(feedId.matches(NUMBERS_ONLY_REGEX), "'%s' is not an integer.".formatted(feedId)); diff --git a/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java index 41c77f5df6e..1d8d819b5cb 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java @@ -9,6 +9,7 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.OsmModule; import org.opentripplanner.openstreetmap.OsmProvider; @@ -23,7 +24,6 @@ import org.opentripplanner.street.model.vertex.VertexFactory; import org.opentripplanner.street.model.vertex.VertexLabel; import org.opentripplanner.test.support.ResourceLoader; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.Deduplicator; @@ -49,21 +49,23 @@ class OsmBoardingLocationsModuleTest { RegularStop busStop = testModel.stop("de:08115:4512:5:C", 48.59434, 8.86452).build(); RegularStop floatingBusStop = testModel.stop("floating-bus-stop", 48.59417, 8.86464).build(); - static Stream testCases = Stream.of( - Arguments.of( - false, - Stream - .of(302563833L, 3223067049L, 302563836L, 3223067680L, 302563834L, 768590748L, 302563839L) - .map(VertexLabel::osm) - .collect(Collectors.toSet()) - ), - Arguments.of(true, Set.of(VertexLabel.osm(3223067049L), VertexLabel.osm(768590748))) - ); + static Stream testCases() { + return Stream.of( + Arguments.of( + false, + Stream + .of(302563833L, 3223067049L, 302563836L, 3223067680L, 302563834L, 768590748L, 302563839L) + .map(VertexLabel::osm) + .collect(Collectors.toSet()) + ), + Arguments.of(true, Set.of(VertexLabel.osm(3223067049L), VertexLabel.osm(768590748))) + ); + } @ParameterizedTest( name = "add boarding locations and link them to platform edges when skipVisibility={0}" ) - @VariableSource("testCases") + @MethodSource("testCases") void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVertices) { var deduplicator = new Deduplicator(); var graph = new Graph(deduplicator); diff --git a/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java b/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java index 1e931589204..67ca61f0403 100644 --- a/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java +++ b/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java @@ -10,12 +10,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.transfer.DefaultTransferService; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -35,63 +35,65 @@ class InterlineProcessorTest implements PlanTestConstants { tripPattern("trip-5", "block-2", "service-4") ); - static Stream interlineTestCases = Stream.of( - Arguments.of( - List.of( - new FeedScopedId("1", "service-1"), - new FeedScopedId("1", "service-2"), - new FeedScopedId("1", "service-3"), - new FeedScopedId("1", "service-4") + static Stream interlineTestCases() { + return Stream.of( + Arguments.of( + List.of( + new FeedScopedId("1", "service-1"), + new FeedScopedId("1", "service-2"), + new FeedScopedId("1", "service-3"), + new FeedScopedId("1", "service-4") + ), + List.of( + List.of(LocalDate.of(2023, Month.JANUARY, 1), LocalDate.of(2023, Month.JANUARY, 5)), + List.of(LocalDate.of(2023, Month.JANUARY, 1)), + List.of(LocalDate.of(2023, Month.JANUARY, 1)), + List.of(LocalDate.of(2023, Month.JANUARY, 1)) + ), + "[ConstrainedTransfer{from: TripTP{F:trip-2, stopPos 2}, to: TripTP{F:trip-3, stopPos 0}, " + + "constraint: {staySeated}}, ConstrainedTransfer{from: TripTP{F:trip-1, stopPos 2}, " + + "to: TripTP{F:trip-2, stopPos 0}, constraint: {staySeated}}, " + + "ConstrainedTransfer{from: TripTP{F:trip-3, stopPos 2}, to: TripTP{F:trip-4, stopPos 0}, constraint: {staySeated}}]" ), - List.of( - List.of(LocalDate.of(2023, Month.JANUARY, 1), LocalDate.of(2023, Month.JANUARY, 5)), - List.of(LocalDate.of(2023, Month.JANUARY, 1)), - List.of(LocalDate.of(2023, Month.JANUARY, 1)), - List.of(LocalDate.of(2023, Month.JANUARY, 1)) + Arguments.of( + List.of( + new FeedScopedId("1", "service-1"), + new FeedScopedId("1", "service-2"), + new FeedScopedId("1", "service-3"), + new FeedScopedId("1", "service-4") + ), + List.of( + List.of(LocalDate.of(2023, Month.JANUARY, 1), LocalDate.of(2023, Month.JANUARY, 5)), + List.of(LocalDate.of(2023, Month.JANUARY, 1)), + List.of(LocalDate.of(2023, Month.JANUARY, 5)), + List.of(LocalDate.of(2023, Month.JANUARY, 1)) + ), + "[ConstrainedTransfer{from: TripTP{F:trip-2, stopPos 2}, to: TripTP{F:trip-3, stopPos 0}, " + + "constraint: {staySeated}}, ConstrainedTransfer{from: TripTP{F:trip-1, stopPos 2}, " + + "to: TripTP{F:trip-2, stopPos 0}, constraint: {staySeated}}, " + + "ConstrainedTransfer{from: TripTP{F:trip-2, stopPos 2}, to: TripTP{F:trip-4, stopPos 0}, constraint: {staySeated}}]" ), - "[ConstrainedTransfer{from: TripTP{F:trip-2, stopPos 2}, to: TripTP{F:trip-3, stopPos 0}, " + - "constraint: {staySeated}}, ConstrainedTransfer{from: TripTP{F:trip-1, stopPos 2}, " + - "to: TripTP{F:trip-2, stopPos 0}, constraint: {staySeated}}, " + - "ConstrainedTransfer{from: TripTP{F:trip-3, stopPos 2}, to: TripTP{F:trip-4, stopPos 0}, constraint: {staySeated}}]" - ), - Arguments.of( - List.of( - new FeedScopedId("1", "service-1"), - new FeedScopedId("1", "service-2"), - new FeedScopedId("1", "service-3"), - new FeedScopedId("1", "service-4") - ), - List.of( - List.of(LocalDate.of(2023, Month.JANUARY, 1), LocalDate.of(2023, Month.JANUARY, 5)), - List.of(LocalDate.of(2023, Month.JANUARY, 1)), - List.of(LocalDate.of(2023, Month.JANUARY, 5)), - List.of(LocalDate.of(2023, Month.JANUARY, 1)) - ), - "[ConstrainedTransfer{from: TripTP{F:trip-2, stopPos 2}, to: TripTP{F:trip-3, stopPos 0}, " + - "constraint: {staySeated}}, ConstrainedTransfer{from: TripTP{F:trip-1, stopPos 2}, " + - "to: TripTP{F:trip-2, stopPos 0}, constraint: {staySeated}}, " + - "ConstrainedTransfer{from: TripTP{F:trip-2, stopPos 2}, to: TripTP{F:trip-4, stopPos 0}, constraint: {staySeated}}]" - ), - // No common days between services - Arguments.of( - List.of( - new FeedScopedId("1", "service-1"), - new FeedScopedId("1", "service-2"), - new FeedScopedId("1", "service-3"), - new FeedScopedId("1", "service-4") - ), - List.of( - List.of(LocalDate.of(2023, Month.JANUARY, 1), LocalDate.of(2023, Month.JANUARY, 5)), - List.of(LocalDate.of(2023, Month.JANUARY, 2)), - List.of(LocalDate.of(2023, Month.JANUARY, 3)), - List.of(LocalDate.of(2023, Month.JANUARY, 1)) - ), - "[ConstrainedTransfer{from: TripTP{F:trip-1, stopPos 2}, to: TripTP{F:trip-2, stopPos 0}, constraint: {staySeated}}]" - ) - ); + // No common days between services + Arguments.of( + List.of( + new FeedScopedId("1", "service-1"), + new FeedScopedId("1", "service-2"), + new FeedScopedId("1", "service-3"), + new FeedScopedId("1", "service-4") + ), + List.of( + List.of(LocalDate.of(2023, Month.JANUARY, 1), LocalDate.of(2023, Month.JANUARY, 5)), + List.of(LocalDate.of(2023, Month.JANUARY, 2)), + List.of(LocalDate.of(2023, Month.JANUARY, 3)), + List.of(LocalDate.of(2023, Month.JANUARY, 1)) + ), + "[ConstrainedTransfer{from: TripTP{F:trip-1, stopPos 2}, to: TripTP{F:trip-2, stopPos 0}, constraint: {staySeated}}]" + ) + ); + } @ParameterizedTest(name = "{0} services with {1} dates should generate transfers: {2}") - @VariableSource("interlineTestCases") + @MethodSource("interlineTestCases") void testInterline( List serviceIds, List> serviceDates, diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java index e7a291fa976..4461c5a31f1 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java @@ -8,20 +8,19 @@ import org.geojson.Polygon; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Location; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.service.StopModel; class LocationMapperTest { - static Stream testCases = Stream.of( - Arguments.of(null, true), - Arguments.of("a name", false) - ); + static Stream testCases() { + return Stream.of(Arguments.of(null, true), Arguments.of("a name", false)); + } @ParameterizedTest(name = "a name of <{0}> should set bogusName={1}") - @VariableSource("testCases") + @MethodSource("testCases") void testMapping(String name, boolean isBogusName) { var gtfsLocation = new Location(); gtfsLocation.setId(new AgencyAndId("1", "zone-3")); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java index 39973a769c0..b2e5b1a8a4d 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TransitModeMapperTest.java @@ -7,23 +7,25 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.transit.model.basic.TransitMode; class TransitModeMapperTest { - static Stream testCases = Stream.of( - Arguments.of(1500, TAXI), - Arguments.of(1510, TAXI), - Arguments.of(1551, CARPOOL), - Arguments.of(1555, CARPOOL), - Arguments.of(1560, CARPOOL), - Arguments.of(1561, TAXI), - Arguments.of(1580, TAXI) - ); + static Stream testCases() { + return Stream.of( + Arguments.of(1500, TAXI), + Arguments.of(1510, TAXI), + Arguments.of(1551, CARPOOL), + Arguments.of(1555, CARPOOL), + Arguments.of(1560, CARPOOL), + Arguments.of(1561, TAXI), + Arguments.of(1580, TAXI) + ); + } @ParameterizedTest(name = "{0} should map to {1}") - @VariableSource("testCases") + @MethodSource("testCases") void map(int mode, TransitMode expectedMode) { assertEquals(expectedMode, TransitModeMapper.mapMode(mode)); } diff --git a/src/test/java/org/opentripplanner/model/plan/PlaceTest.java b/src/test/java/org/opentripplanner/model/plan/PlaceTest.java index 573e4597e39..95d7cf629a2 100644 --- a/src/test/java/org/opentripplanner/model/plan/PlaceTest.java +++ b/src/test/java/org/opentripplanner/model/plan/PlaceTest.java @@ -9,13 +9,13 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.street.model.vertex.SimpleVertex; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; @@ -65,17 +65,19 @@ public void sameLocationBasedOnStopId() { assertFalse(otherPlace.sameLocation(aPlace), "other place(symmetric)"); } - static Stream flexStopCases = Stream.of( - Arguments.of(null, "an intersection name"), - Arguments.of(new NonLocalizedString("1:stop_id"), "an intersection name (part of 1:stop_id)"), - Arguments.of( - new NonLocalizedString("Flex Zone 123"), - "an intersection name (part of Flex Zone 123)" - ) - ); + static Stream flexStopCases() { + return Stream.of( + Arguments.of(null, "an intersection name"), + Arguments.of(new NonLocalizedString("1:stop_id"), "an intersection name (part of 1:stop_id)"), + Arguments.of( + new NonLocalizedString("Flex Zone 123"), + "an intersection name (part of Flex Zone 123)" + ) + ); + } @ParameterizedTest(name = "Flex stop name of {0} should lead to a place name of {1}") - @VariableSource("flexStopCases") + @MethodSource("flexStopCases") public void flexStop(I18NString stopName, String expectedPlaceName) { var stop = StopModel .of() diff --git a/src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java b/src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java index c60861d28f8..c3cb4e0a78c 100644 --- a/src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java +++ b/src/test/java/org/opentripplanner/model/plan/RelativeDirectionTest.java @@ -15,37 +15,39 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; class RelativeDirectionTest { @SuppressWarnings("unused") - static Stream testCasesNormal = Stream.of( - // Turn Right - tc(0, CONTINUE), - tc(17, CONTINUE), - tc(18, SLIGHTLY_RIGHT), - tc(40, SLIGHTLY_RIGHT), - tc(41, RIGHT), - tc(114, RIGHT), - tc(115, HARD_RIGHT), - tc(179, HARD_RIGHT), - tc(180, HARD_LEFT), - // Turn Left - tc(0, CONTINUE), - tc(-17, CONTINUE), - tc(-18, SLIGHTLY_LEFT), - tc(-40, SLIGHTLY_LEFT), - tc(-41, LEFT), - tc(-114, LEFT), - tc(-115, HARD_LEFT), - tc(-179, HARD_LEFT), - tc(-180, HARD_LEFT), - tc(-181, HARD_RIGHT) - ); + static Stream testCasesNormal() { + return Stream.of( + // Turn Right + tc(0, CONTINUE), + tc(17, CONTINUE), + tc(18, SLIGHTLY_RIGHT), + tc(40, SLIGHTLY_RIGHT), + tc(41, RIGHT), + tc(114, RIGHT), + tc(115, HARD_RIGHT), + tc(179, HARD_RIGHT), + tc(180, HARD_LEFT), + // Turn Left + tc(0, CONTINUE), + tc(-17, CONTINUE), + tc(-18, SLIGHTLY_LEFT), + tc(-40, SLIGHTLY_LEFT), + tc(-41, LEFT), + tc(-114, LEFT), + tc(-115, HARD_LEFT), + tc(-179, HARD_LEFT), + tc(-180, HARD_LEFT), + tc(-181, HARD_RIGHT) + ); + } @ParameterizedTest(name = "Turning {0} degrees should give a relative direction of {1}") - @VariableSource("testCasesNormal") + @MethodSource("testCasesNormal") void testCalculateForNormalIntersections(int thisAngleDegrees, RelativeDirection expected) { assertEquals(expected, RelativeDirection.calculate(angle(thisAngleDegrees), false)); } diff --git a/src/test/java/org/opentripplanner/openstreetmap/OSMOpeningHoursParserTest.java b/src/test/java/org/opentripplanner/openstreetmap/OSMOpeningHoursParserTest.java index f1068bb8220..34f141e8504 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/OSMOpeningHoursParserTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/OSMOpeningHoursParserTest.java @@ -12,9 +12,9 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model.framework.Deduplicator; public class OSMOpeningHoursParserTest { @@ -30,150 +30,152 @@ public class OSMOpeningHoursParserTest { ZoneIds.PARIS ); - static Stream osmOpeningHoursTestCases = Stream.of( - Arguments.of( - "Mo-Fr 14:00-19:00", - List.of("2022-10-25T14:30:00Z"), - List.of("2022-10-25T08:30:00Z", "2022-10-29T14:30:00Z") - ), - Arguments.of( - "Tu 10:00-15:00", - List.of("2022-10-25T10:30:00Z"), - List.of("2022-10-26T00:30:00Z", "2022-10-27T10:30:00Z") - ), - Arguments.of( - "Mo-Fr 08:00-17:00;Sa-Su 10:00-13:00", - List.of("2022-10-25T07:30:00Z", "2022-10-29T10:30:00Z"), - List.of("2022-10-25T03:30:00Z", "2022-10-29T15:30:00Z") - ), - // TODO implement support for public holidays, currently only the first two rules are handled - Arguments.of( - "Mo-Fr 08:00-17:00;Sa-Su 10:00-13:00; PH off", - List.of("2022-10-25T07:30:00Z", "2022-10-29T10:30:00Z"), - List.of("2022-10-25T03:30:00Z", "2022-10-29T15:30:00Z") - ), - // TODO implement support for public holidays, currently only the first two rules are handled - Arguments.of( - "Mo,We,Th,Fr,Su 00:00-24:00; Tu,Sa 00:00-02:00, 14:30-24:00; PH 00:00-24:00", - List.of("2022-10-24T15:30:00Z", "2022-10-24T23:30:00Z", "2022-10-25T15:30:00Z"), - List.of("2022-10-25T05:30:00Z") - ), - // The second rule overrides the first rule for Wednesdays, i.e. on Wednesdays it should only be - // open from 10:00 to 13:00 - Arguments.of( - "Mo-Fr 16:00-02:00; We 10:00-13:00", - List.of("2022-10-25T23:30:00Z", "2022-10-26T10:30:00Z", "2022-10-27T23:30:00Z"), - List.of("2022-10-25T10:30:00Z", "2022-10-26T23:30:00Z") - ), - // The second rule overrides the first rule for Tuesdays, i.e. it should be closed on Tuesdays - Arguments.of( - "Mo - Sa 10:00-18:00; Tu off", - List.of("2022-10-24T15:30:00Z"), - List.of("2022-10-24T05:30:00Z", "2022-10-25T10:30:00Z") - ), - // Even though the following rules are not additive, they should be handled as such because they - // have the off modifier (https://github.com/opening-hours/opening_hours.js/issues/53). - // Therefore, it should be open according to the first rule outside of the defined off periods, - // so for example, on Tuesdays it should be open from 07:30 to 12:00 and from 16:00 to 22:00. - // These different off cases are needed because they overlap slightly differently with the first - // rule and have slightly different handling in code. - Arguments.of( - "Mo-Sa 07:30-22:00; Mo 05:00-23:00 off; Tu 12:00-16:00 off; We 06:00-16:00 off; Th 07:30-16:00 off, Fr 16:00-22:00 off, Sa 16:00-23:00 off", - List.of( - "2022-10-25T07:30:00Z", - "2022-10-25T17:30:00Z", - "2022-10-26T17:30:00Z", - "2022-10-27T17:30:00Z", - "2022-10-28T07:30:00Z", - "2022-10-29T07:30:00Z" - ), - List.of( - "2022-10-24T07:30:00Z", - "2022-10-25T12:30:00Z", - "2022-10-26T07:30:00Z", - "2022-10-27T07:30:00Z", - "2022-10-28T16:30:00Z", - "2022-10-29T16:30:00Z", - "2022-10-30T07:30:00Z" + static Stream osmOpeningHoursTestCases() { + return Stream.of( + Arguments.of( + "Mo-Fr 14:00-19:00", + List.of("2022-10-25T14:30:00Z"), + List.of("2022-10-25T08:30:00Z", "2022-10-29T14:30:00Z") + ), + Arguments.of( + "Tu 10:00-15:00", + List.of("2022-10-25T10:30:00Z"), + List.of("2022-10-26T00:30:00Z", "2022-10-27T10:30:00Z") + ), + Arguments.of( + "Mo-Fr 08:00-17:00;Sa-Su 10:00-13:00", + List.of("2022-10-25T07:30:00Z", "2022-10-29T10:30:00Z"), + List.of("2022-10-25T03:30:00Z", "2022-10-29T15:30:00Z") + ), + // TODO implement support for public holidays, currently only the first two rules are handled + Arguments.of( + "Mo-Fr 08:00-17:00;Sa-Su 10:00-13:00; PH off", + List.of("2022-10-25T07:30:00Z", "2022-10-29T10:30:00Z"), + List.of("2022-10-25T03:30:00Z", "2022-10-29T15:30:00Z") + ), + // TODO implement support for public holidays, currently only the first two rules are handled + Arguments.of( + "Mo,We,Th,Fr,Su 00:00-24:00; Tu,Sa 00:00-02:00, 14:30-24:00; PH 00:00-24:00", + List.of("2022-10-24T15:30:00Z", "2022-10-24T23:30:00Z", "2022-10-25T15:30:00Z"), + List.of("2022-10-25T05:30:00Z") + ), + // The second rule overrides the first rule for Wednesdays, i.e. on Wednesdays it should only be + // open from 10:00 to 13:00 + Arguments.of( + "Mo-Fr 16:00-02:00; We 10:00-13:00", + List.of("2022-10-25T23:30:00Z", "2022-10-26T10:30:00Z", "2022-10-27T23:30:00Z"), + List.of("2022-10-25T10:30:00Z", "2022-10-26T23:30:00Z") + ), + // The second rule overrides the first rule for Tuesdays, i.e. it should be closed on Tuesdays + Arguments.of( + "Mo - Sa 10:00-18:00; Tu off", + List.of("2022-10-24T15:30:00Z"), + List.of("2022-10-24T05:30:00Z", "2022-10-25T10:30:00Z") + ), + // Even though the following rules are not additive, they should be handled as such because they + // have the off modifier (https://github.com/opening-hours/opening_hours.js/issues/53). + // Therefore, it should be open according to the first rule outside of the defined off periods, + // so for example, on Tuesdays it should be open from 07:30 to 12:00 and from 16:00 to 22:00. + // These different off cases are needed because they overlap slightly differently with the first + // rule and have slightly different handling in code. + Arguments.of( + "Mo-Sa 07:30-22:00; Mo 05:00-23:00 off; Tu 12:00-16:00 off; We 06:00-16:00 off; Th 07:30-16:00 off, Fr 16:00-22:00 off, Sa 16:00-23:00 off", + List.of( + "2022-10-25T07:30:00Z", + "2022-10-25T17:30:00Z", + "2022-10-26T17:30:00Z", + "2022-10-27T17:30:00Z", + "2022-10-28T07:30:00Z", + "2022-10-29T07:30:00Z" + ), + List.of( + "2022-10-24T07:30:00Z", + "2022-10-25T12:30:00Z", + "2022-10-26T07:30:00Z", + "2022-10-27T07:30:00Z", + "2022-10-28T16:30:00Z", + "2022-10-29T16:30:00Z", + "2022-10-30T07:30:00Z" + ) + ), + // This tests that it's correctly closed outside with an off rule that extends over midnight + Arguments.of( + "Mo-Fr 12:30-04:00; We 18:00-02:00 off", + List.of( + "2022-10-25T19:30:00Z", + "2022-10-25T23:30:00Z", + "2022-10-26T13:30:00Z", + "2022-10-27T01:30:00Z", + "2022-10-27T23:30:00Z" + ), + List.of("2022-10-26T19:30:00Z", "2022-10-26T23:30:00Z", "2022-10-27T05:30:00Z") + ), + Arguments.of( + "open; Tu 13:00-16:00 off", + List.of("2022-10-24T12:30:00Z", "2022-10-25T07:30:00Z", "2022-10-24T18:30:00Z"), + List.of("2022-10-25T13:30:00Z") + ), + Arguments.of( + "Su-Tu 11:00-02:00, We-Th 11:00-03:00, Fr 11:00-06:00, Sa 11:00-07:00", + List.of("2022-10-25T14:30:00Z", "2022-10-25T23:30:00Z", "2022-10-29T03:30:00Z"), + List.of("2022-10-25T02:30:00Z", "2022-10-27T03:30:00Z") + ), + Arguments.of( + "Sep-Oct: Mo-Sa 10:00-02:00", + List.of("2022-09-30T23:30:00Z", "2022-10-29T10:30:00Z", "2022-10-31T23:30:00Z"), + List.of("2022-10-30T10:30:00Z", "2022-11-26T10:30:00Z") + ), + Arguments.of( + "Oct: Mo 10:00-02:00", + List.of("2022-10-24T10:30:00Z", "2022-10-31T23:30:00Z"), + List.of("2022-09-30T23:30:00Z", "2022-10-30T10:30:00Z", "2022-11-07T10:30:00Z") + ), + // TODO implement support for dates with and without year, this is now completely unparsed + // which means that it's never open + Arguments.of("Oct 23-Jan 3: 10:00-23:00", List.of(), List.of("2022-10-20T12:30:00Z")), + // TODO implement support for nth weekday in a month and offsets + Arguments.of( + "Mar Su[-1]-Oct Su[1] -2 days: 22:00-23:00", + List.of(), + List.of("2022-11-20T12:30:00Z") + ), + Arguments.of("24/7", List.of("2022-10-25T07:30:00Z"), List.of()), + Arguments.of("24/7 closed", List.of(), List.of("2022-10-25T07:30:00Z")), + // TODO implement support for school holidays and special dates, only the first rule is now + // handled + Arguments.of( + "Mo-Su,SH 15:00-03:00; easter -2 days off", + List.of("2022-10-25T15:30:00Z"), + List.of("2022-10-25T05:30:00Z") + ), + // TODO implement support for comment modifiers, this is now interpreted to be always closed + Arguments.of("\"by appointment\"", List.of(), List.of("2022-10-25T07:30:00Z")), + // TODO implement support for fallbacks if feasible, now the last rule is ignored and the first + // rule is respected + Arguments.of( + "Mo-Sa 08:00-13:00,16:00-18:00 || \"by appointment\"", + List.of("2022-10-25T07:30:00Z", "2022-10-25T15:30:00Z"), + List.of("2022-10-25T13:30:00Z", "2022-10-30T07:30:00Z") + ), + // TODO implement support for weeks, these rules are now ignored and it's always closed + Arguments.of( + "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00", + List.of(), + List.of("2022-10-28T07:30:00Z") + ), + // TODO implement support for events, this is now interpreted to be always closed + Arguments.of("sunrise-sunset", List.of(), List.of("2022-10-25T07:30:00Z")), + // This is interpreted to be open on sundays from 10:00 until 23:59 + Arguments.of( + "Su 10:00+", + List.of("2022-10-30T10:30:00Z"), + List.of("2022-10-25T10:30:00Z", "2022-10-30T06:30:00Z") ) - ), - // This tests that it's correctly closed outside with an off rule that extends over midnight - Arguments.of( - "Mo-Fr 12:30-04:00; We 18:00-02:00 off", - List.of( - "2022-10-25T19:30:00Z", - "2022-10-25T23:30:00Z", - "2022-10-26T13:30:00Z", - "2022-10-27T01:30:00Z", - "2022-10-27T23:30:00Z" - ), - List.of("2022-10-26T19:30:00Z", "2022-10-26T23:30:00Z", "2022-10-27T05:30:00Z") - ), - Arguments.of( - "open; Tu 13:00-16:00 off", - List.of("2022-10-24T12:30:00Z", "2022-10-25T07:30:00Z", "2022-10-24T18:30:00Z"), - List.of("2022-10-25T13:30:00Z") - ), - Arguments.of( - "Su-Tu 11:00-02:00, We-Th 11:00-03:00, Fr 11:00-06:00, Sa 11:00-07:00", - List.of("2022-10-25T14:30:00Z", "2022-10-25T23:30:00Z", "2022-10-29T03:30:00Z"), - List.of("2022-10-25T02:30:00Z", "2022-10-27T03:30:00Z") - ), - Arguments.of( - "Sep-Oct: Mo-Sa 10:00-02:00", - List.of("2022-09-30T23:30:00Z", "2022-10-29T10:30:00Z", "2022-10-31T23:30:00Z"), - List.of("2022-10-30T10:30:00Z", "2022-11-26T10:30:00Z") - ), - Arguments.of( - "Oct: Mo 10:00-02:00", - List.of("2022-10-24T10:30:00Z", "2022-10-31T23:30:00Z"), - List.of("2022-09-30T23:30:00Z", "2022-10-30T10:30:00Z", "2022-11-07T10:30:00Z") - ), - // TODO implement support for dates with and without year, this is now completely unparsed - // which means that it's never open - Arguments.of("Oct 23-Jan 3: 10:00-23:00", List.of(), List.of("2022-10-20T12:30:00Z")), - // TODO implement support for nth weekday in a month and offsets - Arguments.of( - "Mar Su[-1]-Oct Su[1] -2 days: 22:00-23:00", - List.of(), - List.of("2022-11-20T12:30:00Z") - ), - Arguments.of("24/7", List.of("2022-10-25T07:30:00Z"), List.of()), - Arguments.of("24/7 closed", List.of(), List.of("2022-10-25T07:30:00Z")), - // TODO implement support for school holidays and special dates, only the first rule is now - // handled - Arguments.of( - "Mo-Su,SH 15:00-03:00; easter -2 days off", - List.of("2022-10-25T15:30:00Z"), - List.of("2022-10-25T05:30:00Z") - ), - // TODO implement support for comment modifiers, this is now interpreted to be always closed - Arguments.of("\"by appointment\"", List.of(), List.of("2022-10-25T07:30:00Z")), - // TODO implement support for fallbacks if feasible, now the last rule is ignored and the first - // rule is respected - Arguments.of( - "Mo-Sa 08:00-13:00,16:00-18:00 || \"by appointment\"", - List.of("2022-10-25T07:30:00Z", "2022-10-25T15:30:00Z"), - List.of("2022-10-25T13:30:00Z", "2022-10-30T07:30:00Z") - ), - // TODO implement support for weeks, these rules are now ignored and it's always closed - Arguments.of( - "week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00", - List.of(), - List.of("2022-10-28T07:30:00Z") - ), - // TODO implement support for events, this is now interpreted to be always closed - Arguments.of("sunrise-sunset", List.of(), List.of("2022-10-25T07:30:00Z")), - // This is interpreted to be open on sundays from 10:00 until 23:59 - Arguments.of( - "Su 10:00+", - List.of("2022-10-30T10:30:00Z"), - List.of("2022-10-25T10:30:00Z", "2022-10-30T06:30:00Z") - ) - ); + ); + } @ParameterizedTest(name = "{0} should be open on {1} but not on {2}") - @VariableSource("osmOpeningHoursTestCases") + @MethodSource("osmOpeningHoursTestCases") void testOSMOpeningHoursParsing( String openingHours, List openTimes, diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapperTest.java index 06369baddc8..26f45fd8c32 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapperTest.java @@ -18,30 +18,33 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.openstreetmap.model.OSMWithTags; import org.opentripplanner.openstreetmap.wayproperty.WayPropertySet; -import org.opentripplanner.test.support.VariableSource; public class PortlandMapperTest { static double delta = 0.1; static WayPropertySet wps = new WayPropertySet(); - static Stream cases = Stream.of( - Arguments.of(southeastLaBonitaWay(), 0.8), - Arguments.of(southwestMayoStreet(), 0.9), - Arguments.of(sidewalkBoth(), 0.96), - Arguments.of(pedestrianTunnel(), 1.0), - Arguments.of(highwayTertiaryWithSidewalk(), 1.056), - Arguments.of(cobblestones(), 1.2), - Arguments.of(noSidewalk(), 1.2), - Arguments.of(carTunnel(), 1.2), - Arguments.of(footwaySidewalk(), 1.32), - Arguments.of(highwayTertiary(), 1.32), - Arguments.of(highwayTrunk(), 1.44), - Arguments.of(fiveLanes(), 1.584), - Arguments.of(noSidewalkHighSpeed(), 7.19) - ); + + static Stream cases() { + return Stream.of( + Arguments.of(southeastLaBonitaWay(), 0.8), + Arguments.of(southwestMayoStreet(), 0.9), + Arguments.of(sidewalkBoth(), 0.96), + Arguments.of(pedestrianTunnel(), 1.0), + Arguments.of(highwayTertiaryWithSidewalk(), 1.056), + Arguments.of(cobblestones(), 1.2), + Arguments.of(noSidewalk(), 1.2), + Arguments.of(carTunnel(), 1.2), + Arguments.of(footwaySidewalk(), 1.32), + Arguments.of(highwayTertiary(), 1.32), + Arguments.of(highwayTrunk(), 1.44), + Arguments.of(fiveLanes(), 1.584), + Arguments.of(noSidewalkHighSpeed(), 7.19) + ); + } static { var source = new PortlandMapper(); @@ -49,7 +52,7 @@ public class PortlandMapperTest { } @ParameterizedTest(name = "way {0} should have walk safety factor {1}") - @VariableSource("cases") + @MethodSource("cases") void walkSafety(OSMWithTags way, double expected) { var score = wps.getDataForWay(way); diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifierTest.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifierTest.java index 19575c9312f..517e4b57bfd 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifierTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifierTest.java @@ -8,8 +8,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.openstreetmap.model.OSMWithTags; -import org.opentripplanner.test.support.VariableSource; class BestMatchSpecifierTest extends SpecifierTest { @@ -48,17 +48,19 @@ void leftRightMatch() { assertEquals(100, result.forward()); } - static Stream leftRightTestCases = Stream.of( - Arguments.of(cyclewayLeft(), bikeLane, 210, 100), - Arguments.of(cyclewayLaneTrack(), cyclewayTrack, 100, 210), - Arguments.of(cyclewayLaneTrack(), highwayFootwayCyclewayLane, 210, 100), - Arguments.of(cyclewayLaneTrack(), cyclewayLane, 110, 0) - ); + static Stream leftRightTestCases() { + return Stream.of( + Arguments.of(cyclewayLeft(), bikeLane, 210, 100), + Arguments.of(cyclewayLaneTrack(), cyclewayTrack, 100, 210), + Arguments.of(cyclewayLaneTrack(), highwayFootwayCyclewayLane, 210, 100), + Arguments.of(cyclewayLaneTrack(), cyclewayLane, 110, 0) + ); + } @ParameterizedTest( name = "way {0} with specifier {1} should have a backward score {2} and forward score {3}" ) - @VariableSource("leftRightTestCases") + @MethodSource("leftRightTestCases") void leftRight(OSMWithTags way, OsmSpecifier spec, int expectedBackward, int expectedForward) { var result = spec.matchScores(way); assertEquals(expectedBackward, result.backward()); diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java index a1d126003a5..def272652f6 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java @@ -25,6 +25,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.openstreetmap.model.OSMWithTags; import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Absent; import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Equals; @@ -34,7 +35,6 @@ import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.LessThan; import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.MatchResult; import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Present; -import org.opentripplanner.test.support.VariableSource; class ConditionTest { @@ -56,18 +56,20 @@ class ConditionTest { ); static Condition noSidewalk = new Condition.EqualsAnyInOrAbsent("sidewalk"); - static Stream equalsCases = Stream.of( - Arguments.of(cyclewayLeft(), cyclewayLane, EXACT, NONE), - Arguments.of(cyclewayLaneTrack(), cyclewayLane, EXACT, NONE), - Arguments.of(cyclewayBoth(), cyclewayLane, EXACT, EXACT), - Arguments.of(cyclewayLaneTrack(), cyclewayTrack, NONE, EXACT), - Arguments.of(tramsForward(), embeddedTrams, NONE, EXACT) - ); + static Stream equalsCases() { + return Stream.of( + Arguments.of(cyclewayLeft(), cyclewayLane, EXACT, NONE), + Arguments.of(cyclewayLaneTrack(), cyclewayLane, EXACT, NONE), + Arguments.of(cyclewayBoth(), cyclewayLane, EXACT, EXACT), + Arguments.of(cyclewayLaneTrack(), cyclewayTrack, NONE, EXACT), + Arguments.of(tramsForward(), embeddedTrams, NONE, EXACT) + ); + } @ParameterizedTest( name = "way {0} with op {1} should have a backward result {2}, forward result {3}" ) - @VariableSource("equalsCases") + @MethodSource("equalsCases") void leftRight( OSMWithTags way, Condition op, @@ -78,32 +80,34 @@ void leftRight( assertEquals(forwardExpectation, op.matchForward(way)); } - static Stream otherCases = Stream.of( - Arguments.of(cycleway(), cyclewayPresent, WILDCARD), - Arguments.of(carTunnel(), cyclewayPresent, NONE), - Arguments.of(carTunnel(), cyclewayAbsent, EXACT), - Arguments.of(cobblestones(), cyclewayAbsent, EXACT), - Arguments.of(cycleway(), cyclewayAbsent, NONE), - Arguments.of(cycleway(), moreThanFourLanes, NONE), - Arguments.of(carTunnel(), moreThanFourLanes, NONE), - Arguments.of(pedestrianTunnel(), moreThanFourLanes, NONE), - Arguments.of(fiveLanes(), moreThanFourLanes, EXACT), - Arguments.of(fiveLanes(), lessThanFourLanes, NONE), - Arguments.of(threeLanes(), lessThanFourLanes, EXACT), - Arguments.of(carTunnel(), lessThanFourLanes, NONE), - Arguments.of(cycleway(), lessThanFourLanes, NONE), - Arguments.of(fiveLanes(), betweenFiveAndThreeLanes, EXACT), - Arguments.of(threeLanes(), betweenFiveAndThreeLanes, EXACT), - Arguments.of(veryBadSmoothness(), smoothnessBadAndWorseThanBad, EXACT), - Arguments.of(cobblestones(), smoothnessBadAndWorseThanBad, NONE), - Arguments.of(excellentSmoothness(), smoothnessBadAndWorseThanBad, NONE), - Arguments.of(noSidewalk(), noSidewalk, EXACT), - Arguments.of(highwayTertiary(), noSidewalk, EXACT), - Arguments.of(sidewalkBoth(), noSidewalk, NONE) - ); + static Stream otherCases() { + return Stream.of( + Arguments.of(cycleway(), cyclewayPresent, WILDCARD), + Arguments.of(carTunnel(), cyclewayPresent, NONE), + Arguments.of(carTunnel(), cyclewayAbsent, EXACT), + Arguments.of(cobblestones(), cyclewayAbsent, EXACT), + Arguments.of(cycleway(), cyclewayAbsent, NONE), + Arguments.of(cycleway(), moreThanFourLanes, NONE), + Arguments.of(carTunnel(), moreThanFourLanes, NONE), + Arguments.of(pedestrianTunnel(), moreThanFourLanes, NONE), + Arguments.of(fiveLanes(), moreThanFourLanes, EXACT), + Arguments.of(fiveLanes(), lessThanFourLanes, NONE), + Arguments.of(threeLanes(), lessThanFourLanes, EXACT), + Arguments.of(carTunnel(), lessThanFourLanes, NONE), + Arguments.of(cycleway(), lessThanFourLanes, NONE), + Arguments.of(fiveLanes(), betweenFiveAndThreeLanes, EXACT), + Arguments.of(threeLanes(), betweenFiveAndThreeLanes, EXACT), + Arguments.of(veryBadSmoothness(), smoothnessBadAndWorseThanBad, EXACT), + Arguments.of(cobblestones(), smoothnessBadAndWorseThanBad, NONE), + Arguments.of(excellentSmoothness(), smoothnessBadAndWorseThanBad, NONE), + Arguments.of(noSidewalk(), noSidewalk, EXACT), + Arguments.of(highwayTertiary(), noSidewalk, EXACT), + Arguments.of(sidewalkBoth(), noSidewalk, NONE) + ); + } @ParameterizedTest(name = "way {0} with op {1} should have a result {2}") - @VariableSource("otherCases") + @MethodSource("otherCases") void otherTests(OSMWithTags way, Condition op, MatchResult expectation) { assertEquals(expectation, op.match(way)); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java index ecd75f5d273..dd9a2fffa66 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDateTest.java @@ -8,9 +8,9 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.model.Frequency; import org.opentripplanner.model.StopTime; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.network.Route; @@ -33,12 +33,14 @@ class TripPatternForDateTest { new Deduplicator() ); - static Stream testCases = Stream - .of(List.of(new FrequencyEntry(new Frequency(), tripTimes)), List.of()) - .map(Arguments::of); + static Stream testCases() { + return Stream + .of(List.of(new FrequencyEntry(new Frequency(), tripTimes)), List.of()) + .map(Arguments::of); + } @ParameterizedTest(name = "trip with frequencies {0} should be correctly filtered") - @VariableSource("testCases") + @MethodSource("testCases") void shouldExcludeAndIncludeBasedOnFrequency(List freqs) { var stopTime = new StopTime(); stopTime.setStop(STOP); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java index 0c2384ebabb..b7d3f255a9d 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/WheelchairCostCalculatorTest.java @@ -5,11 +5,11 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.raptor._data.transit.TestTripSchedule; import org.opentripplanner.raptor.api.model.RaptorTransferConstraint; import org.opentripplanner.raptor.spi.RaptorCostCalculator; import org.opentripplanner.routing.api.request.preference.AccessibilityPreferences; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model.basic.Accessibility; public class WheelchairCostCalculatorTest { @@ -34,14 +34,16 @@ public class WheelchairCostCalculatorTest { ); private final TestTripSchedule.Builder scheduleBuilder = TestTripSchedule.schedule("12:00 12:01"); - static Stream testCases = Stream.of( - Arguments.of(Accessibility.POSSIBLE, 0), - Arguments.of(Accessibility.NO_INFORMATION, UNKNOWN_ACCESSIBILITY_COST), - Arguments.of(Accessibility.NOT_POSSIBLE, INACCESSIBLE_TRIP_COST) - ); + static Stream testCases() { + return Stream.of( + Arguments.of(Accessibility.POSSIBLE, 0), + Arguments.of(Accessibility.NO_INFORMATION, UNKNOWN_ACCESSIBILITY_COST), + Arguments.of(Accessibility.NOT_POSSIBLE, INACCESSIBLE_TRIP_COST) + ); + } @ParameterizedTest(name = "accessibility of {0} should add an extra cost of {1}") - @VariableSource("testCases") + @MethodSource("testCases") public void calculateExtraBoardingCost(Accessibility wcb, int expectedExtraCost) { var schedule = scheduleBuilder.wheelchairBoarding(wcb).build(); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java index 4823ea84300..be6266ccdbe 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RouteRequestTransitDataProviderFilterTest.java @@ -13,6 +13,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.apis.transmodel.model.TransmodelTransportSubmode; import org.opentripplanner.framework.geometry.WgsCoordinate; @@ -25,7 +26,6 @@ import org.opentripplanner.routing.api.request.request.filter.SelectRequest; import org.opentripplanner.routing.api.request.request.filter.TransitFilter; import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.basic.MainAndSubMode; @@ -70,14 +70,16 @@ class RouteRequestTransitDataProviderFilterTest { .withElevator(RELAXED_ACCESSIBILITY_PREFERENCE) .build(); - static Stream wheelchairCases = Stream.of( - Arguments.of(Accessibility.POSSIBLE, DEFAULT_ACCESSIBILITY), - Arguments.of(Accessibility.POSSIBLE, RELAXED_ACCESSIBILITY), - Arguments.of(Accessibility.NOT_POSSIBLE, DEFAULT_ACCESSIBILITY), - Arguments.of(Accessibility.NOT_POSSIBLE, RELAXED_ACCESSIBILITY), - Arguments.of(Accessibility.NO_INFORMATION, DEFAULT_ACCESSIBILITY), - Arguments.of(Accessibility.NO_INFORMATION, RELAXED_ACCESSIBILITY) - ); + static Stream wheelchairCases() { + return Stream.of( + Arguments.of(Accessibility.POSSIBLE, DEFAULT_ACCESSIBILITY), + Arguments.of(Accessibility.POSSIBLE, RELAXED_ACCESSIBILITY), + Arguments.of(Accessibility.NOT_POSSIBLE, DEFAULT_ACCESSIBILITY), + Arguments.of(Accessibility.NOT_POSSIBLE, RELAXED_ACCESSIBILITY), + Arguments.of(Accessibility.NO_INFORMATION, DEFAULT_ACCESSIBILITY), + Arguments.of(Accessibility.NO_INFORMATION, RELAXED_ACCESSIBILITY) + ); + } /** * Test filter for wheelchair access. @@ -85,7 +87,7 @@ class RouteRequestTransitDataProviderFilterTest { * @param wheelchair Accessibility for stops */ @ParameterizedTest - @VariableSource("wheelchairCases") + @MethodSource("wheelchairCases") void testWheelchairAccess(Accessibility wheelchair, WheelchairPreferences accessibility) { var firstStop = stopForTest("TEST:START", wheelchair, 0.0, 0.0); var lastStop = stopForTest("TEST:END", wheelchair, 0.0, 0.0); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java index 230097ebfc3..4283e5cca62 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/services/TransferGeneratorTest.java @@ -15,6 +15,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.model.transfer.TransferConstraint; import org.opentripplanner.raptor._data.RaptorTestConstants; @@ -28,7 +29,6 @@ import org.opentripplanner.raptor.api.path.TransitPathLeg; import org.opentripplanner.raptor.spi.DefaultSlackProvider; import org.opentripplanner.raptor.spi.RaptorSlackProvider; -import org.opentripplanner.test.support.VariableSource; public class TransferGeneratorTest implements RaptorTestConstants { @@ -497,24 +497,26 @@ void findTransferWithLongMinTimeTransfer() { // TODO: here we check that minimum transfer time and slack are NOT added up, but perhaps that is // asserting the wrong behaviour - static Stream minTransferTimeSlackCases = Stream.of( - // transfer takes 1 min plus 0 slack, passenger will make it - Arguments.of(ofMinutes(1), ofMinutes(0), true), - // slack is 30 minutes, passenger won't make the connection - Arguments.of(ofMinutes(1), ofMinutes(30), false), - // tight since 8 minutes slack + 1 min transfer time but still less than the 10 minutes required - Arguments.of(ofMinutes(1), ofMinutes(8), true), - // transfer slack is ignored since minimumTransferTime is short - Arguments.of(ofMinutes(1), ofMinutes(9), true), - Arguments.of(ofMinutes(11), ofMinutes(0), false), - Arguments.of(ofMinutes(9), ofMinutes(1), true), - Arguments.of(ofMinutes(0), ofMinutes(11), false) - ); + static Stream minTransferTimeSlackCases() { + return Stream.of( + // transfer takes 1 min plus 0 slack, passenger will make it + Arguments.of(ofMinutes(1), ofMinutes(0), true), + // slack is 30 minutes, passenger won't make the connection + Arguments.of(ofMinutes(1), ofMinutes(30), false), + // tight since 8 minutes slack + 1 min transfer time but still less than the 10 minutes required + Arguments.of(ofMinutes(1), ofMinutes(8), true), + // transfer slack is ignored since minimumTransferTime is short + Arguments.of(ofMinutes(1), ofMinutes(9), true), + Arguments.of(ofMinutes(11), ofMinutes(0), false), + Arguments.of(ofMinutes(9), ofMinutes(1), true), + Arguments.of(ofMinutes(0), ofMinutes(11), false) + ); + } @ParameterizedTest( name = "minimum transfer time of {0}, transfer slack of {1} should expectTransfer={2} on 10 min transfer window" ) - @VariableSource("minTransferTimeSlackCases") + @MethodSource("minTransferTimeSlackCases") void includeTransferSlackInMinimumTransferTime( Duration minTransferTime, Duration transferSlack, diff --git a/src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java index 157235c4483..9dd533704c7 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/WheelchairPreferencesTest.java @@ -7,20 +7,22 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.preference.WheelchairPreferences; -import org.opentripplanner.test.support.VariableSource; class WheelchairPreferencesTest { - static Stream roundingTestCases = Stream.of( - Arguments.of(0.33333333333, 0.33, 0.333), - Arguments.of(0.77777777777, 0.78, 0.778) - ); + static Stream roundingTestCases() { + return Stream.of( + Arguments.of(0.33333333333, 0.33, 0.333), + Arguments.of(0.77777777777, 0.78, 0.778) + ); + } @ParameterizedTest( name = "Normalize value of {0} to rounded value {1} (maxSlope) and {2} (reluctance fields)" ) - @VariableSource("roundingTestCases") + @MethodSource("roundingTestCases") void testConstructorNormalization(double raw, double rounded2, double rounded3) { var roundedRequest = WheelchairPreferences .of() @@ -39,41 +41,43 @@ void testConstructorNormalization(double raw, double rounded2, double rounded3) assertEquals(roundedRequest.slopeExceededReluctance(), rounded2); } - static Stream toStringTestCases = Stream.of( - Arguments.of(DEFAULT, "WheelchairPreferences{}"), - Arguments.of( - WheelchairPreferences.of().withElevatorOnlyAccessible().build(), - "WheelchairPreferences{elevator: OnlyConsiderAccessible}" - ), - Arguments.of( - WheelchairPreferences.of().withTrip(DEFAULT_COSTS).build(), - "WheelchairPreferences{trip: AccessibilityPreferences{}}" - ), - Arguments.of( - WheelchairPreferences.of().withTrip(it -> it.withInaccessibleCost(100)).build(), - "WheelchairPreferences{trip: AccessibilityPreferences{inaccessibleCost: $100}}" - ), - Arguments.of( - WheelchairPreferences.of().withTripCost(99, 100).build(), - "WheelchairPreferences{trip: AccessibilityPreferences{unknownCost: $99, inaccessibleCost: $100}}" - ), - Arguments.of( - WheelchairPreferences - .of() - .withTripCost(10, 100) - .withStopCost(20, 200) - .withElevatorCost(30, 300) - .withInaccessibleStreetReluctance(1.0) - .withMaxSlope(0.123) - .withSlopeExceededReluctance(3) - .withStairsReluctance(4) - .build(), - "WheelchairPreferences{trip: AccessibilityPreferences{unknownCost: $10, inaccessibleCost: $100}, stop: AccessibilityPreferences{unknownCost: $20, inaccessibleCost: $200}, elevator: AccessibilityPreferences{unknownCost: $30, inaccessibleCost: $300}, inaccessibleStreetReluctance: 1.0, maxSlope: 0.123, slopeExceededReluctance: 3.0, stairsReluctance: 4.0}" - ) - ); + static Stream toStringTestCases() { + return Stream.of( + Arguments.of(DEFAULT, "WheelchairPreferences{}"), + Arguments.of( + WheelchairPreferences.of().withElevatorOnlyAccessible().build(), + "WheelchairPreferences{elevator: OnlyConsiderAccessible}" + ), + Arguments.of( + WheelchairPreferences.of().withTrip(DEFAULT_COSTS).build(), + "WheelchairPreferences{trip: AccessibilityPreferences{}}" + ), + Arguments.of( + WheelchairPreferences.of().withTrip(it -> it.withInaccessibleCost(100)).build(), + "WheelchairPreferences{trip: AccessibilityPreferences{inaccessibleCost: $100}}" + ), + Arguments.of( + WheelchairPreferences.of().withTripCost(99, 100).build(), + "WheelchairPreferences{trip: AccessibilityPreferences{unknownCost: $99, inaccessibleCost: $100}}" + ), + Arguments.of( + WheelchairPreferences + .of() + .withTripCost(10, 100) + .withStopCost(20, 200) + .withElevatorCost(30, 300) + .withInaccessibleStreetReluctance(1.0) + .withMaxSlope(0.123) + .withSlopeExceededReluctance(3) + .withStairsReluctance(4) + .build(), + "WheelchairPreferences{trip: AccessibilityPreferences{unknownCost: $10, inaccessibleCost: $100}, stop: AccessibilityPreferences{unknownCost: $20, inaccessibleCost: $200}, elevator: AccessibilityPreferences{unknownCost: $30, inaccessibleCost: $300}, inaccessibleStreetReluctance: 1.0, maxSlope: 0.123, slopeExceededReluctance: 3.0, stairsReluctance: 4.0}" + ) + ); + } @ParameterizedTest(name = "Verify toString() value is {1}") - @VariableSource("toStringTestCases") + @MethodSource("toStringTestCases") void testToString(WheelchairPreferences subject, String expected) { assertEquals(expected, subject.toString()); } diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java b/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java index 9701fb412cc..e1785db61b1 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java @@ -11,9 +11,9 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.test.support.TestTableParser; -import org.opentripplanner.test.support.VariableSource; class LinearFunctionSerializationTest { @@ -21,25 +21,27 @@ class LinearFunctionSerializationTest { private static final Duration D1h = Duration.ofSeconds(3600); @SuppressWarnings("unused") - static Stream parseTestCases = TestTableParser.of( - """ - # INPUT || EXPECTED - # || CONSTANT | COEFFICIENT - 0+0t || 0s | 0.0 - 1+0.0111 t || 1s | 0.01 - 120 + 0.111 t || 2m | 0.11 - 120 + 0.111 t || 2m | 0.11 - 12.0 + 0 t || 12s | 0.0 - 2h3m + 1.111 t || 2h3m | 1.11 - 2h3m + 2.111 t || 2h3m | 2.1 - 3h + 5.111 t || 3h | 5.1 - 7m + 10.1 x || 7m | 10.0 - PT7s + 10.1 x || 7s | 10.0 - """ - ); + static Stream parseTestCases() { + return TestTableParser.of( + """ + # INPUT || EXPECTED + # || CONSTANT | COEFFICIENT + 0+0t || 0s | 0.0 + 1+0.0111 t || 1s | 0.01 + 120 + 0.111 t || 2m | 0.11 + 120 + 0.111 t || 2m | 0.11 + 12.0 + 0 t || 12s | 0.0 + 2h3m + 1.111 t || 2h3m | 1.11 + 2h3m + 2.111 t || 2h3m | 2.1 + 3h + 5.111 t || 3h | 5.1 + 7m + 10.1 x || 7m | 10.0 + PT7s + 10.1 x || 7s | 10.0 + """ + ); + } @ParameterizedTest - @VariableSource("parseTestCases") + @MethodSource("parseTestCases") void parseTest(String input, String expectedConstant, double expectedCoefficient) { Optional result = LinearFunctionSerialization.parse( input, diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java index 7b2fe416290..2ba7f2569e4 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/TimeSlopeSafetyTriangleTest.java @@ -7,26 +7,28 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; public class TimeSlopeSafetyTriangleTest { float DELTA = 0.001f; @SuppressWarnings("unused") - static Stream testCases = Stream.of( - // Input: time | slope | safety || Expected: time | slope | safety - Arguments.of(0.5, 0.3, 0.2, 0.5, 0.3, 0.2, "Exact"), - Arguments.of(1d, 1d, 1d, 0.33, 0.33, 0.34, "Greater than 1"), - Arguments.of(30d, 10d, 20d, 0.5, 0.17, 0.33, "Greater than 1 - big"), - Arguments.of(1d, 0d, 0d, 1d, 0d, 0d, "Two zeros"), - Arguments.of(0d, 0d, 0d, 0.33, 0.33, 0.34, "All zeros"), - Arguments.of(0.1, -1d, -1d, 1d, 0d, 0d, "Less than zero"), - Arguments.of(0d, 0.07, 0.93, 0d, 0.07, 0.93, "None precise round-off: " + (1.0 - 0.07)) - ); + static Stream testCases() { + return Stream.of( + // Input: time | slope | safety || Expected: time | slope | safety + Arguments.of(0.5, 0.3, 0.2, 0.5, 0.3, 0.2, "Exact"), + Arguments.of(1d, 1d, 1d, 0.33, 0.33, 0.34, "Greater than 1"), + Arguments.of(30d, 10d, 20d, 0.5, 0.17, 0.33, "Greater than 1 - big"), + Arguments.of(1d, 0d, 0d, 1d, 0d, 0d, "Two zeros"), + Arguments.of(0d, 0d, 0d, 0.33, 0.33, 0.34, "All zeros"), + Arguments.of(0.1, -1d, -1d, 1d, 0d, 0d, "Less than zero"), + Arguments.of(0d, 0.07, 0.93, 0d, 0.07, 0.93, "None precise round-off: " + (1.0 - 0.07)) + ); + } @ParameterizedTest(name = "Time/slope/safety: | {0} {1} {2} || {3} {4} {5} | {6}") - @VariableSource("testCases") + @MethodSource("testCases") public void test( double inTime, double inSlope, diff --git a/src/test/java/org/opentripplanner/routing/core/MoneyTest.java b/src/test/java/org/opentripplanner/routing/core/MoneyTest.java index 2323b396d5c..5f197708f1d 100644 --- a/src/test/java/org/opentripplanner/routing/core/MoneyTest.java +++ b/src/test/java/org/opentripplanner/routing/core/MoneyTest.java @@ -14,7 +14,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.transit.model.basic.Money; class MoneyTest { @@ -27,36 +27,40 @@ class MoneyTest { private static final Money twoDollars = Money.usDollars(2); static Money threeEuroTwelve = Money.euros(3.12f); - static Stream testCases = Stream.of( - of(oneDollar, Locale.US, "$1.00"), - of(oneDollar, Locale.GERMANY, "1,00 $"), - of(Money.euros(1), Locale.GERMANY, "1,00 €"), - of(oneDollar, NORWEGIAN_BOKMAL, "USD 1,00"), - //of(oneDollar, NORWEGIAN_NYNORSK, "1.00 USD"), - of(hundredNOK, NORWEGIAN_BOKMAL, "kr 100,00") - //of(hundredNOK, NORWEGIAN_NYNORSK, "100.00 kr") - ); + static Stream testCases() { + return Stream.of( + of(oneDollar, Locale.US, "$1.00"), + of(oneDollar, Locale.GERMANY, "1,00 $"), + of(Money.euros(1), Locale.GERMANY, "1,00 €"), + of(oneDollar, NORWEGIAN_BOKMAL, "USD 1,00"), + //of(oneDollar, NORWEGIAN_NYNORSK, "1.00 USD"), + of(hundredNOK, NORWEGIAN_BOKMAL, "kr 100,00") + //of(hundredNOK, NORWEGIAN_NYNORSK, "100.00 kr") + ); + } @ParameterizedTest(name = "{0} with locale {1} should localise to \"{2}\"") - @VariableSource("testCases") + @MethodSource("testCases") void localize(Money money, Locale locale, String expected) { var localized = money.localize(locale); assertEquals(expected, localized); } - static Stream amountCases = Stream.of( - of(oneDollar, 1.0f), - of(threeEuroTwelve, 3.12f), - of(Money.euros(3.1f), 3.1f), - of(Money.euros(999.99f), 999.99f), - of(hundredNOK, 100.0f), - // Yen doesn't have fractional digits - of(yen(1000), 1000f), - of(yen(9999), 9999f) - ); + static Stream amountCases() { + return Stream.of( + of(oneDollar, 1.0f), + of(threeEuroTwelve, 3.12f), + of(Money.euros(3.1f), 3.1f), + of(Money.euros(999.99f), 999.99f), + of(hundredNOK, 100.0f), + // Yen doesn't have fractional digits + of(yen(1000), 1000f), + of(yen(9999), 9999f) + ); + } @ParameterizedTest - @VariableSource("amountCases") + @MethodSource("amountCases") void fractionalAmount(Money money, float expected) { var fractionalAmount = money.fractionalAmount(); assertEquals(expected, fractionalAmount.floatValue()); diff --git a/src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java b/src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java index 98b18f45d05..64216e5d83f 100644 --- a/src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/routerequest/WheelchairConfigTest.java @@ -11,59 +11,61 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.preference.AccessibilityPreferences; -import org.opentripplanner.test.support.VariableSource; class WheelchairConfigTest { - static Stream mapAccessibilityPreferencesTestCases = Stream.of( - Arguments.of( - "default ofOnlyAccessible()", - "{}", - ofOnlyAccessible(), - DEFAULT_COSTS, - ofOnlyAccessible() - ), - Arguments.of("default cost", "{}", ofCost(100, 200), ofCost(100, 200), ofCost(100, 200)), - Arguments.of( - "onlyConsiderAccessible with default costs", - "{\"onlyConsiderAccessible\": true}", - DEFAULT_COSTS, - DEFAULT_COSTS, - ofOnlyAccessible() - ), - Arguments.of( - "Default costs with default ofOnlyAccessible()", - "{\"onlyConsiderAccessible\": false}", - ofOnlyAccessible(), - DEFAULT_COSTS, - DEFAULT_COSTS - ), - Arguments.of( - "Only unknownCost set with default ofOnlyAccessible()", - "{\"unknownCost\": 100}", - ofOnlyAccessible(), - DEFAULT_COSTS, - ofCost(100, DEFAULT_COSTS.inaccessibleCost()) - ), - Arguments.of( - "Only inaccessibleCost set with default ofOnlyAccessible()", - "{\"inaccessibleCost\": 100}", - ofOnlyAccessible(), - DEFAULT_COSTS, - ofCost(DEFAULT_COSTS.unknownCost(), 100) - ), - Arguments.of( - "All values set", - "{\"unknownCost\": 200, \"inaccessibleCost\": 100, \"onlyConsiderAccessible\": false}", - ofOnlyAccessible(), - DEFAULT_COSTS, - ofCost(200, 100) - ) - ); + static Stream mapAccessibilityPreferencesTestCases() { + return Stream.of( + Arguments.of( + "default ofOnlyAccessible()", + "{}", + ofOnlyAccessible(), + DEFAULT_COSTS, + ofOnlyAccessible() + ), + Arguments.of("default cost", "{}", ofCost(100, 200), ofCost(100, 200), ofCost(100, 200)), + Arguments.of( + "onlyConsiderAccessible with default costs", + "{\"onlyConsiderAccessible\": true}", + DEFAULT_COSTS, + DEFAULT_COSTS, + ofOnlyAccessible() + ), + Arguments.of( + "Default costs with default ofOnlyAccessible()", + "{\"onlyConsiderAccessible\": false}", + ofOnlyAccessible(), + DEFAULT_COSTS, + DEFAULT_COSTS + ), + Arguments.of( + "Only unknownCost set with default ofOnlyAccessible()", + "{\"unknownCost\": 100}", + ofOnlyAccessible(), + DEFAULT_COSTS, + ofCost(100, DEFAULT_COSTS.inaccessibleCost()) + ), + Arguments.of( + "Only inaccessibleCost set with default ofOnlyAccessible()", + "{\"inaccessibleCost\": 100}", + ofOnlyAccessible(), + DEFAULT_COSTS, + ofCost(DEFAULT_COSTS.unknownCost(), 100) + ), + Arguments.of( + "All values set", + "{\"unknownCost\": 200, \"inaccessibleCost\": 100, \"onlyConsiderAccessible\": false}", + ofOnlyAccessible(), + DEFAULT_COSTS, + ofCost(200, 100) + ) + ); + } @ParameterizedTest(name = "{0}") - @VariableSource("mapAccessibilityPreferencesTestCases") + @MethodSource("mapAccessibilityPreferencesTestCases") void testMapAccessibilityPreferences( String name, String json, diff --git a/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java b/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java index 5adf8264d8e..ae19643db72 100644 --- a/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java +++ b/src/test/java/org/opentripplanner/standalone/server/EtagRequestFilterTest.java @@ -16,27 +16,29 @@ import org.jets3t.service.utils.Mimetypes; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.test.support.HttpForTest; -import org.opentripplanner.test.support.VariableSource; class EtagRequestFilterTest { static final String vectorTilesResponse = "some vector tiles"; static final String vectorTilesEtag = "\"20c17790\""; - static Stream etagCases = Stream.of( - Arguments.of("GET", 200, APPLICATION_X_PROTOBUF, bytes(vectorTilesResponse), vectorTilesEtag), - Arguments.of("GET", 404, APPLICATION_X_PROTOBUF, bytes("hello123"), null), - Arguments.of("GET", 200, "application/json", bytes("{}"), null), - Arguments.of("POST", 200, APPLICATION_X_PROTOBUF, bytes("hello123"), null), - Arguments.of("GET", 200, APPLICATION_X_PROTOBUF, bytes(""), null), - Arguments.of("POST", 200, Mimetypes.MIMETYPE_HTML, bytes(""), null) - ); + static Stream etagCases() { + return Stream.of( + Arguments.of("GET", 200, APPLICATION_X_PROTOBUF, bytes(vectorTilesResponse), vectorTilesEtag), + Arguments.of("GET", 404, APPLICATION_X_PROTOBUF, bytes("hello123"), null), + Arguments.of("GET", 200, "application/json", bytes("{}"), null), + Arguments.of("POST", 200, APPLICATION_X_PROTOBUF, bytes("hello123"), null), + Arguments.of("GET", 200, APPLICATION_X_PROTOBUF, bytes(""), null), + Arguments.of("POST", 200, Mimetypes.MIMETYPE_HTML, bytes(""), null) + ); + } @ParameterizedTest( name = "{0} request with response status={1} type={2}, entity={3} produces ETag header {4}" ) - @VariableSource("etagCases") + @MethodSource("etagCases") void writeEtag( String method, int status, @@ -56,13 +58,15 @@ void writeEtag( assertEquals(expectedEtag, response.getHeaderString(EtagRequestFilter.HEADER_ETAG)); } - static Stream ifNoneMatchCases = Stream.of( - Arguments.of("XXX", 200, bytes(vectorTilesResponse)), - Arguments.of(vectorTilesEtag, 304, null) - ); + static Stream ifNoneMatchCases() { + return Stream.of( + Arguments.of("XXX", 200, bytes(vectorTilesResponse)), + Arguments.of(vectorTilesEtag, 304, null) + ); + } @ParameterizedTest(name = "If-None-Match header of {0} should lead to a status code of {2}") - @VariableSource("ifNoneMatchCases") + @MethodSource("ifNoneMatchCases") void ifNoneMatch(String ifNoneMatch, int expectedStatus, byte[] expectedEntity) throws IOException { var request = HttpForTest.containerRequest("GET"); diff --git a/src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java b/src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java index 126ca887cc3..8198444f6be 100644 --- a/src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java +++ b/src/test/java/org/opentripplanner/standalone/server/RequestTraceFilterTest.java @@ -7,7 +7,7 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; -import org.opentripplanner.test.support.VariableSource; +import org.junit.jupiter.params.provider.MethodSource; class RequestTraceFilterTest { @@ -19,22 +19,24 @@ class RequestTraceFilterTest { private static final String A_TOO_LONG_STRING = A_VERY_LONG_STRING + "1"; @SuppressWarnings("unused") - private static final Stream headerCheckTestCases = Stream.of( - Arguments.of(true, "ok"), - Arguments.of(true, "special characters: -_,;.:!#$%&/(){}[]=?+"), - Arguments.of(true, "quote: \"quoted\" 'single' `back` ´forward´"), - Arguments.of(true, "international characters: æøå öâò≈∰🧐"), - Arguments.of(true, A_VERY_LONG_STRING), - Arguments.of(false, A_TOO_LONG_STRING), - Arguments.of(false, "Vertical space new-line: -\n-"), - Arguments.of(false, "Vertical space return: -\r-"), - Arguments.of(false, "Vertical space form-feed: -\f-"), - Arguments.of(false, "Control character 0x01: -\u0001-"), - Arguments.of(false, "Control character 0x19: -\u0019-") - ); + private static final Stream headerCheckTestCases() { + return Stream.of( + Arguments.of(true, "ok"), + Arguments.of(true, "special characters: -_,;.:!#$%&/(){}[]=?+"), + Arguments.of(true, "quote: \"quoted\" 'single' `back` ´forward´"), + Arguments.of(true, "international characters: æøå öâò≈∰🧐"), + Arguments.of(true, A_VERY_LONG_STRING), + Arguments.of(false, A_TOO_LONG_STRING), + Arguments.of(false, "Vertical space new-line: -\n-"), + Arguments.of(false, "Vertical space return: -\r-"), + Arguments.of(false, "Vertical space form-feed: -\f-"), + Arguments.of(false, "Control character 0x01: -\u0001-"), + Arguments.of(false, "Control character 0x19: -\u0019-") + ); + } @ParameterizedTest - @VariableSource("headerCheckTestCases") + @MethodSource("headerCheckTestCases") void headerCheck(boolean expectedMatch, String input) { assertEquals( expectedMatch, diff --git a/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java index 5d7c9d1213f..8efa6940d20 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/ElevatorHopEdgeTest.java @@ -8,13 +8,13 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.preference.AccessibilityPreferences; import org.opentripplanner.routing.api.request.preference.WheelchairPreferences; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model.basic.Accessibility; class ElevatorHopEdgeTest { @@ -22,12 +22,12 @@ class ElevatorHopEdgeTest { Vertex from = intersectionVertex(0, 0); Vertex to = intersectionVertex(1, 1); - static Stream noTraverse = Stream - .of(Accessibility.NO_INFORMATION, Accessibility.NOT_POSSIBLE) - .map(Arguments::of); + static Stream noTraverse() { + return Stream.of(Accessibility.NO_INFORMATION, Accessibility.NOT_POSSIBLE).map(Arguments::of); + } @ParameterizedTest(name = "{0} should be allowed to traverse when requesting onlyAccessible") - @VariableSource("noTraverse") + @MethodSource("noTraverse") void shouldNotTraverse(Accessibility wheelchair) { var req = StreetSearchRequest.of(); AccessibilityPreferences feature = AccessibilityPreferences.ofOnlyAccessible(); @@ -52,17 +52,19 @@ void shouldNotTraverse(Accessibility wheelchair) { assertTrue(State.isEmpty(result)); } - static Stream all = Stream.of( - // no extra cost - Arguments.of(Accessibility.POSSIBLE, 20), - // low extra cost - Arguments.of(Accessibility.NO_INFORMATION, 40), - // high extra cost - Arguments.of(Accessibility.NOT_POSSIBLE, 3620) - ); + static Stream all() { + return Stream.of( + // no extra cost + Arguments.of(Accessibility.POSSIBLE, 20), + // low extra cost + Arguments.of(Accessibility.NO_INFORMATION, 40), + // high extra cost + Arguments.of(Accessibility.NOT_POSSIBLE, 3620) + ); + } @ParameterizedTest(name = "{0} should allowed to traverse with a cost of {1}") - @VariableSource("all") + @MethodSource("all") void allowByDefault(Accessibility wheelchair, double expectedCost) { var req = StreetSearchRequest.of().build(); var result = traverse(wheelchair, req)[0]; diff --git a/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java index 1c7fdba7ae7..60859290646 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/EscalatorEdgeTest.java @@ -7,22 +7,24 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.model.vertex.SimpleVertex; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.test.support.VariableSource; class EscalatorEdgeTest { Vertex from = new SimpleVertex("A", 10, 10); Vertex to = new SimpleVertex("B", 10.001, 10.001); - static Stream args = Stream.of(Arguments.of(1.5, 150), Arguments.of(3.0, 300)); + static Stream args() { + return Stream.of(Arguments.of(1.5, 150), Arguments.of(3.0, 300)); + } @ParameterizedTest(name = "escalatorReluctance of {0} should lead to traversal costs of {1}") - @VariableSource("args") + @MethodSource("args") void testWalking(double escalatorReluctance, double expectedWeight) { var edge = EscalatorEdge.createEscalatorEdge(from, to, 45); var req = StreetSearchRequest diff --git a/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java index 9d4b1ff4fe2..6929f665938 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/PathwayEdgeTest.java @@ -12,6 +12,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.routing.api.request.StreetMode; @@ -19,7 +20,6 @@ import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model.site.PathwayMode; class PathwayEdgeTest { @@ -141,20 +141,22 @@ void wheelchair() { assertEquals(300.0, state.getWeight()); } - static Stream slopeCases = Stream.of( - // no extra cost - Arguments.of(0.07, 120), - // no extra cost - Arguments.of(0.08, 120), - // 1 % above max - Arguments.of(0.09, 239), - // 1.1 % above the max slope, tiny extra cost - Arguments.of(0.091, 251), - // 1.15 % above the max slope, will incur larger cost - Arguments.of(0.0915, 257), - // 3 % above max slope, will incur very large cost - Arguments.of(0.11, 480) - ); + static Stream slopeCases() { + return Stream.of( + // no extra cost + Arguments.of(0.07, 120), + // no extra cost + Arguments.of(0.08, 120), + // 1 % above max + Arguments.of(0.09, 239), + // 1.1 % above the max slope, tiny extra cost + Arguments.of(0.091, 251), + // 1.15 % above the max slope, will incur larger cost + Arguments.of(0.0915, 257), + // 3 % above max slope, will incur very large cost + Arguments.of(0.11, 480) + ); + } /** * This makes sure that when you exceed the max slope in a wheelchair there isn't a hard cut-off @@ -164,7 +166,7 @@ void wheelchair() { * dramatically to the point where it's only used as a last resort. */ @ParameterizedTest(name = "slope of {0} should lead to traversal costs of {1}") - @VariableSource("slopeCases") + @MethodSource("slopeCases") void shouldScaleCostWithMaxSlope(double slope, long expectedCost) { var edge = PathwayEdge.createPathwayEdge( from, diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java index 2ecfa51822a..acd02653941 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeCostTest.java @@ -8,23 +8,25 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.model.StreetTraversalPermission; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.test.support.VariableSource; class StreetEdgeCostTest { - static Stream walkReluctanceCases = Stream.of( - Arguments.of(0.5, 37), - Arguments.of(1, 75), - Arguments.of(2, 150), - Arguments.of(3, 225) - ); + static Stream walkReluctanceCases() { + return Stream.of( + Arguments.of(0.5, 37), + Arguments.of(1, 75), + Arguments.of(2, 150), + Arguments.of(3, 225) + ); + } @ParameterizedTest(name = "walkRelucance of {0} should lead to traversal costs of {1}") - @VariableSource("walkReluctanceCases") + @MethodSource("walkReluctanceCases") public void walkReluctance(double walkReluctance, long expectedCost) { double length = 100; var edge = new StreetEdgeBuilder<>() @@ -45,15 +47,17 @@ public void walkReluctance(double walkReluctance, long expectedCost) { assertEquals(76, result.getElapsedTimeSeconds()); } - static Stream bikeReluctanceCases = Stream.of( - Arguments.of(0.5, 10), - Arguments.of(1, 20), - Arguments.of(2, 40), - Arguments.of(3, 60) - ); + static Stream bikeReluctanceCases() { + return Stream.of( + Arguments.of(0.5, 10), + Arguments.of(1, 20), + Arguments.of(2, 40), + Arguments.of(3, 60) + ); + } @ParameterizedTest(name = "bikeReluctance of {0} should lead to traversal costs of {1}") - @VariableSource("bikeReluctanceCases") + @MethodSource("bikeReluctanceCases") public void bikeReluctance(double bikeReluctance, long expectedCost) { double length = 100; var edge = new StreetEdgeBuilder<>() @@ -75,15 +79,17 @@ public void bikeReluctance(double bikeReluctance, long expectedCost) { assertEquals(20, result.getElapsedTimeSeconds()); } - static Stream carReluctanceCases = Stream.of( - Arguments.of(0.5, 4), - Arguments.of(1, 8), - Arguments.of(2, 17), - Arguments.of(3, 26) - ); + static Stream carReluctanceCases() { + return Stream.of( + Arguments.of(0.5, 4), + Arguments.of(1, 8), + Arguments.of(2, 17), + Arguments.of(3, 26) + ); + } @ParameterizedTest(name = "carReluctance of {0} should lead to traversal costs of {1}") - @VariableSource("carReluctanceCases") + @MethodSource("carReluctanceCases") public void carReluctance(double carReluctance, long expectedCost) { double length = 100; var edge = new StreetEdgeBuilder<>() @@ -105,14 +111,12 @@ public void carReluctance(double carReluctance, long expectedCost) { assertEquals(9, result.getElapsedTimeSeconds()); } - static Stream stairsCases = Stream.of( - Arguments.of(1, 22), - Arguments.of(1.5, 33), - Arguments.of(3, 67) - ); + static Stream stairsCases() { + return Stream.of(Arguments.of(1, 22), Arguments.of(1.5, 33), Arguments.of(3, 67)); + } @ParameterizedTest(name = "stairs reluctance of {0} should lead to traversal costs of {1}") - @VariableSource("stairsCases") + @MethodSource("stairsCases") public void stairsReluctance(double stairsReluctance, long expectedCost) { double length = 10; var stairsEdge = new StreetEdgeBuilder<>() @@ -138,14 +142,12 @@ public void stairsReluctance(double stairsReluctance, long expectedCost) { assertEquals(15, (long) notStairsResult.weight); } - static Stream bikeStairsCases = Stream.of( - Arguments.of(1, 45), - Arguments.of(1.5, 67), - Arguments.of(3, 135) - ); + static Stream bikeStairsCases() { + return Stream.of(Arguments.of(1, 45), Arguments.of(1.5, 67), Arguments.of(3, 135)); + } @ParameterizedTest(name = "bike stairs reluctance of {0} should lead to traversal costs of {1}") - @VariableSource("bikeStairsCases") + @MethodSource("bikeStairsCases") public void bikeStairsReluctance(double stairsReluctance, long expectedCost) { double length = 10; var stairsEdge = new StreetEdgeBuilder<>() @@ -173,14 +175,12 @@ public void bikeStairsReluctance(double stairsReluctance, long expectedCost) { assertEquals(37, (long) notStairsResult.weight); } - static Stream walkSafetyCases = Stream.of( - Arguments.of(0, 15), - Arguments.of(0.5, 22), - Arguments.of(1, 30) - ); + static Stream walkSafetyCases() { + return Stream.of(Arguments.of(0, 15), Arguments.of(0.5, 22), Arguments.of(1, 30)); + } @ParameterizedTest(name = "walk safety factor of {0} should lead to traversal costs of {1}") - @VariableSource("walkSafetyCases") + @MethodSource("walkSafetyCases") public void walkSafetyFactor(double walkSafetyFactor, long expectedCost) { double length = 10; var safeEdge = new StreetEdgeBuilder<>() diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java index 20682b6048b..44de661f327 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeRentalTraversalTest.java @@ -17,6 +17,7 @@ import javax.annotation.Nonnull; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.model.StreetTraversalPermission; @@ -24,7 +25,6 @@ import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.StateEditor; -import org.opentripplanner.test.support.VariableSource; public class StreetEdgeRentalTraversalTest { @@ -42,18 +42,20 @@ private static Stream baseCases(StreetTraversalPermission p) { ); } - static Stream allowedToTraverse = Stream - .of( - StreetTraversalPermission.ALL, - StreetTraversalPermission.PEDESTRIAN_AND_BICYCLE, - StreetTraversalPermission.BICYCLE - ) - .flatMap(StreetEdgeRentalTraversalTest::baseCases); + static Stream allowedToTraverse() { + return Stream + .of( + StreetTraversalPermission.ALL, + StreetTraversalPermission.PEDESTRIAN_AND_BICYCLE, + StreetTraversalPermission.BICYCLE + ) + .flatMap(StreetEdgeRentalTraversalTest::baseCases); + } @ParameterizedTest( name = "Form factor {0}, street mode {1} should be able to traverse edge with permission {2}" ) - @VariableSource("allowedToTraverse") + @MethodSource("allowedToTraverse") void scooterBicycleTraversal( RentalFormFactor formFactor, StreetMode streetMode, @@ -74,14 +76,16 @@ void scooterBicycleTraversal( assertEquals(formFactor.traverseMode, afterTraversal.currentMode()); } - static Stream noTraversal = Stream - .of(StreetTraversalPermission.CAR, StreetTraversalPermission.NONE) - .flatMap(StreetEdgeRentalTraversalTest::baseCases); + static Stream noTraversal() { + return Stream + .of(StreetTraversalPermission.CAR, StreetTraversalPermission.NONE) + .flatMap(StreetEdgeRentalTraversalTest::baseCases); + } @ParameterizedTest( name = "Form factor {0}, street mode {1} should not be able to traverse edge with permission {2}" ) - @VariableSource("noTraversal") + @MethodSource("noTraversal") void noTraversal( RentalFormFactor formFactor, StreetMode streetMode, diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java index ed4b92da779..7c2767a6935 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeWheelchairCostTest.java @@ -7,6 +7,7 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.opentripplanner.routing.api.request.preference.WheelchairPreferences; @@ -14,7 +15,6 @@ import org.opentripplanner.street.model.vertex.StreetVertex; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.test.support.VariableSource; class StreetEdgeWheelchairCostTest { @@ -26,26 +26,28 @@ public StreetEdgeWheelchairCostTest() { V2 = intersectionVertex("V2", 2.0, 0.0); } - static Stream slopeCases = Stream.of( - // no extra cost - Arguments.of(0.07, 1, 5081), - // no extra cost - Arguments.of(0.08, 1, 5945), - // no extra cost - Arguments.of(0.09, 1, 6908), - // 0.1 % above the max slope, tiny extra cost - Arguments.of(0.091, 1, 7708), - // 3 % above max slope, will incur very large cost - Arguments.of(0.091, 3, 9110), - // 0.1 % above the max slope, but high reluctance will large cost - Arguments.of(0.0915, 1, 8116), - // 2 % above max slope, but lowered reluctance - Arguments.of(0.11, 0.5, 17649), - // 2 % above max slope, will incur very large cost - Arguments.of(0.11, 1, 26474), - // 3 % above max slope, will incur very large cost - Arguments.of(0.12, 1, 37978) - ); + static Stream slopeCases() { + return Stream.of( + // no extra cost + Arguments.of(0.07, 1, 5081), + // no extra cost + Arguments.of(0.08, 1, 5945), + // no extra cost + Arguments.of(0.09, 1, 6908), + // 0.1 % above the max slope, tiny extra cost + Arguments.of(0.091, 1, 7708), + // 3 % above max slope, will incur very large cost + Arguments.of(0.091, 3, 9110), + // 0.1 % above the max slope, but high reluctance will large cost + Arguments.of(0.0915, 1, 8116), + // 2 % above max slope, but lowered reluctance + Arguments.of(0.11, 0.5, 17649), + // 2 % above max slope, will incur very large cost + Arguments.of(0.11, 1, 26474), + // 3 % above max slope, will incur very large cost + Arguments.of(0.12, 1, 37978) + ); + } /** * This makes sure that when you exceed the max slope in a wheelchair there isn't a hard cut-off @@ -57,7 +59,7 @@ public StreetEdgeWheelchairCostTest() { @ParameterizedTest( name = "slope of {0} with maxSlopeExceededReluctance of {1} should lead to traversal costs of {2}" ) - @VariableSource("slopeCases") + @MethodSource("slopeCases") public void shouldScaleCostWithMaxSlope(double slope, double reluctance, long expectedCost) { double length = 1000; var edge = new StreetEdgeBuilder<>() @@ -104,16 +106,14 @@ public void shouldScaleCostWithMaxSlope(double slope, double reluctance, long ex assertEquals(expectedCost, (long) result.weight); } - static Stream wheelchairStairsCases = Stream.of( - Arguments.of(1, 22), - Arguments.of(10, 225), - Arguments.of(100, 2255) - ); + static Stream wheelchairStairsCases() { + return Stream.of(Arguments.of(1, 22), Arguments.of(10, 225), Arguments.of(100, 2255)); + } @ParameterizedTest( name = "wheelchair stairs reluctance of {0} should lead to traversal costs of {1}" ) - @VariableSource("wheelchairStairsCases") + @MethodSource("wheelchairStairsCases") public void wheelchairStairsReluctance(double stairsReluctance, long expectedCost) { double length = 10; var stairEdge = new StreetEdgeBuilder<>() @@ -153,16 +153,14 @@ public void wheelchairStairsReluctance(double stairsReluctance, long expectedCos assertEquals(7, (long) notStairsResult.weight); } - static Stream inaccessibleStreetCases = Stream.of( - Arguments.of(1f, 15), - Arguments.of(10f, 150), - Arguments.of(100f, 1503) - ); + static Stream inaccessibleStreetCases() { + return Stream.of(Arguments.of(1f, 15), Arguments.of(10f, 150), Arguments.of(100f, 1503)); + } @ParameterizedTest( name = "an inaccessible street with the reluctance of {0} should lead to traversal costs of {1}" ) - @VariableSource("inaccessibleStreetCases") + @MethodSource("inaccessibleStreetCases") public void inaccessibleStreet(float inaccessibleStreetReluctance, long expectedCost) { double length = 10; var edge = new StreetEdgeBuilder<>() @@ -201,17 +199,19 @@ public void inaccessibleStreet(float inaccessibleStreetReluctance, long expected assertEquals(15, (long) accessibleResult.weight); } - static Stream walkReluctanceCases = Stream.of( - Arguments.of(0.5, 3), - Arguments.of(1, 7), - Arguments.of(10, 75), - Arguments.of(100, 751) - ); + static Stream walkReluctanceCases() { + return Stream.of( + Arguments.of(0.5, 3), + Arguments.of(1, 7), + Arguments.of(10, 75), + Arguments.of(100, 751) + ); + } @ParameterizedTest( name = "walkReluctance of {0} should affect wheelchair users and lead to traversal costs of {1}" ) - @VariableSource("walkReluctanceCases") + @MethodSource("walkReluctanceCases") public void walkReluctance(double walkReluctance, long expectedCost) { double length = 10; var edge = new StreetEdgeBuilder<>() diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java index a2a052d3b5c..99de720a5a2 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java @@ -11,6 +11,7 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.routing.api.request.StreetMode; @@ -20,22 +21,23 @@ import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.test.support.VariableSource; class StreetVehicleParkingLinkTest { - static Stream testCases = Stream.of( - of(Set.of(), Set.of(), Set.of(), true), - of(Set.of("a-tag"), Set.of(), Set.of(), true), - of(Set.of("a"), Set.of("a"), Set.of(), false), - of(Set.of("a"), Set.of("a"), Set.of("a"), false), - of(Set.of("a", "b"), Set.of("b"), Set.of("a"), false), - of(Set.of("a", "b"), Set.of(), Set.of("a"), true), - of(Set.of("a", "b"), Set.of(), Set.of("c"), false) - ); + static Stream testCases() { + return Stream.of( + of(Set.of(), Set.of(), Set.of(), true), + of(Set.of("a-tag"), Set.of(), Set.of(), true), + of(Set.of("a"), Set.of("a"), Set.of(), false), + of(Set.of("a"), Set.of("a"), Set.of("a"), false), + of(Set.of("a", "b"), Set.of("b"), Set.of("a"), false), + of(Set.of("a", "b"), Set.of(), Set.of("a"), true), + of(Set.of("a", "b"), Set.of(), Set.of("c"), false) + ); + } @ParameterizedTest(name = "Parking[tags={0}], Request[not={1}, select={2}] should traverse={3}") - @VariableSource("testCases") + @MethodSource("testCases") void foo(Set parkingTags, Set not, Set select, boolean shouldTraverse) { var streetVertex = intersectionVertex(1, 1); var parking = VehicleParking diff --git a/src/test/java/org/opentripplanner/street/search/state/StateDataTest.java b/src/test/java/org/opentripplanner/street/search/state/StateDataTest.java index 1138fd6cf02..83cec24cd77 100644 --- a/src/test/java/org/opentripplanner/street/search/state/StateDataTest.java +++ b/src/test/java/org/opentripplanner/street/search/state/StateDataTest.java @@ -6,18 +6,20 @@ import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.search.request.StreetSearchRequest; -import org.opentripplanner.test.support.VariableSource; class StateDataTest { - static Stream cases = Arrays - .stream(StreetMode.values()) - .flatMap(mode -> Stream.of(Arguments.of(true, mode), Arguments.of(false, mode))); + static Stream cases() { + return Arrays + .stream(StreetMode.values()) + .flatMap(mode -> Stream.of(Arguments.of(true, mode), Arguments.of(false, mode))); + } @ParameterizedTest(name = "arriveBy={0}, streetMode={1}") - @VariableSource("cases") + @MethodSource("cases") void baseCases(boolean arriveBy, StreetMode streetMode) { var req = StreetSearchRequest.of().withArriveBy(arriveBy).withMode(streetMode).build(); var data = StateData.getBaseCaseStateData(req); diff --git a/src/test/java/org/opentripplanner/street/search/state/StateTest.java b/src/test/java/org/opentripplanner/street/search/state/StateTest.java index 34d3af11b68..9722f1dd785 100644 --- a/src/test/java/org/opentripplanner/street/search/state/StateTest.java +++ b/src/test/java/org/opentripplanner/street/search/state/StateTest.java @@ -31,11 +31,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.request.StreetSearchRequest; -import org.opentripplanner.test.support.VariableSource; class StateTest { @@ -48,30 +48,32 @@ class StateTest { NULL_RENTAL_STATES.add(null); } - static Stream testCases = Stream.of( - of(SCOOTER_RENTAL, false, Set.of(BEFORE_RENTING), Set.of(WALK)), - //FIXME: it's strange that the arriveBy rental searches all start on a bicycle - of(SCOOTER_RENTAL, true, Set.of(HAVE_RENTED, RENTING_FLOATING), Set.of(WALK, BICYCLE)), - of(BIKE_RENTAL, false, Set.of(BEFORE_RENTING), Set.of(WALK)), - of(BIKE_RENTAL, true, Set.of(HAVE_RENTED, RENTING_FLOATING), Set.of(WALK, BICYCLE)), - of(CAR_RENTAL, false, Set.of(BEFORE_RENTING), Set.of(WALK)), - of(CAR_RENTAL, true, Set.of(HAVE_RENTED, RENTING_FLOATING), Set.of(WALK, BICYCLE)), - of(StreetMode.CAR, false, NULL_RENTAL_STATES, Set.of(CAR)), - of(BIKE, false, NULL_RENTAL_STATES, Set.of(BICYCLE)), - of(StreetMode.WALK, false, NULL_RENTAL_STATES, Set.of(TraverseMode.WALK)), - of(BIKE_TO_PARK, false, NULL_RENTAL_STATES, Set.of(BICYCLE)), - of(CAR_TO_PARK, false, NULL_RENTAL_STATES, Set.of(CAR)), - of(FLEXIBLE, false, NULL_RENTAL_STATES, Set.of(WALK)), - of(CAR_PICKUP, false, NULL_RENTAL_STATES, Set.of(CAR, WALK)), - of(CAR_PICKUP, true, NULL_RENTAL_STATES, Set.of(CAR, WALK)), - of(CAR_HAILING, false, NULL_RENTAL_STATES, Set.of(CAR, WALK)), - of(CAR_HAILING, true, NULL_RENTAL_STATES, Set.of(CAR, WALK)) - ); + static Stream testCases() { + return Stream.of( + of(SCOOTER_RENTAL, false, Set.of(BEFORE_RENTING), Set.of(WALK)), + //FIXME: it's strange that the arriveBy rental searches all start on a bicycle + of(SCOOTER_RENTAL, true, Set.of(HAVE_RENTED, RENTING_FLOATING), Set.of(WALK, BICYCLE)), + of(BIKE_RENTAL, false, Set.of(BEFORE_RENTING), Set.of(WALK)), + of(BIKE_RENTAL, true, Set.of(HAVE_RENTED, RENTING_FLOATING), Set.of(WALK, BICYCLE)), + of(CAR_RENTAL, false, Set.of(BEFORE_RENTING), Set.of(WALK)), + of(CAR_RENTAL, true, Set.of(HAVE_RENTED, RENTING_FLOATING), Set.of(WALK, BICYCLE)), + of(StreetMode.CAR, false, NULL_RENTAL_STATES, Set.of(CAR)), + of(BIKE, false, NULL_RENTAL_STATES, Set.of(BICYCLE)), + of(StreetMode.WALK, false, NULL_RENTAL_STATES, Set.of(TraverseMode.WALK)), + of(BIKE_TO_PARK, false, NULL_RENTAL_STATES, Set.of(BICYCLE)), + of(CAR_TO_PARK, false, NULL_RENTAL_STATES, Set.of(CAR)), + of(FLEXIBLE, false, NULL_RENTAL_STATES, Set.of(WALK)), + of(CAR_PICKUP, false, NULL_RENTAL_STATES, Set.of(CAR, WALK)), + of(CAR_PICKUP, true, NULL_RENTAL_STATES, Set.of(CAR, WALK)), + of(CAR_HAILING, false, NULL_RENTAL_STATES, Set.of(CAR, WALK)), + of(CAR_HAILING, true, NULL_RENTAL_STATES, Set.of(CAR, WALK)) + ); + } @ParameterizedTest( name = "street mode {0}, arriveBy={1} should lead to initial states with rentalStates={2}, currentModes={3}" ) - @VariableSource("testCases") + @MethodSource("testCases") void initialStates( StreetMode streetMode, boolean arriveBy, diff --git a/src/test/java/org/opentripplanner/test/support/VariableArgumentsProvider.java b/src/test/java/org/opentripplanner/test/support/VariableArgumentsProvider.java deleted file mode 100644 index 1ae9fb2af84..00000000000 --- a/src/test/java/org/opentripplanner/test/support/VariableArgumentsProvider.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.opentripplanner.test.support; - -import java.lang.reflect.Field; -import java.util.stream.Stream; -import org.junit.jupiter.api.extension.ExtensionContext; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.ArgumentsProvider; -import org.junit.jupiter.params.support.AnnotationConsumer; - -/** - * This annotation processor allows you to provide a variable as the input for a JUnit {@link - * org.junit.jupiter.params.ParameterizedTest}. - * - * Check the usages of {@link VariableSource} to see examples for how to use. - */ -class VariableArgumentsProvider implements ArgumentsProvider, AnnotationConsumer { - - private String variableName; - - @Override - public Stream provideArguments(ExtensionContext context) { - return context - .getTestClass() - .map(this::getField) - .map(this::getValue) - .orElseThrow(() -> new IllegalArgumentException("Failed to load test arguments")); - } - - @Override - public void accept(VariableSource variableSource) { - variableName = variableSource.value(); - } - - private Field getField(Class clazz) { - try { - return clazz.getDeclaredField(variableName); - } catch (Exception e) { - return null; - } - } - - @SuppressWarnings("unchecked") - private Stream getValue(Field field) { - Object value = null; - var accessible = field.isAccessible(); - try { - field.setAccessible(true); - value = field.get(null); - } catch (Exception ignored) {} - - field.setAccessible(accessible); - - return value == null ? null : (Stream) value; - } -} diff --git a/src/test/java/org/opentripplanner/test/support/VariableSource.java b/src/test/java/org/opentripplanner/test/support/VariableSource.java deleted file mode 100644 index 254110cf6d2..00000000000 --- a/src/test/java/org/opentripplanner/test/support/VariableSource.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.opentripplanner.test.support; - -import java.lang.annotation.Documented; -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import org.junit.jupiter.params.provider.ArgumentsSource; - -@Documented -@Target(ElementType.METHOD) -@Retention(RetentionPolicy.RUNTIME) -@ArgumentsSource(VariableArgumentsProvider.class) -public @interface VariableSource { - /** - * The name of the static variable - */ - String value(); -} diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index d25de6ff021..8c28290de66 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -33,6 +33,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner.framework.i18n.NonLocalizedString; @@ -40,7 +41,6 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; @@ -1090,16 +1090,18 @@ SameAssert not() { } } - static Stream purgeExpiredDataTestCases = Stream.of( - // purgeExpiredData maxSnapshotFrequency || snapshots PatternSnapshotA PatternSnapshotB - Arguments.of(Boolean.TRUE, -1, NotSame, NotSame), - Arguments.of(Boolean.FALSE, -1, NotSame, Same), - Arguments.of(Boolean.TRUE, 1000, NotSame, NotSame), - Arguments.of(Boolean.FALSE, 1000, Same, Same) - ); + static Stream purgeExpiredDataTestCases() { + return Stream.of( + // purgeExpiredData maxSnapshotFrequency || snapshots PatternSnapshotA PatternSnapshotB + Arguments.of(Boolean.TRUE, -1, NotSame, NotSame), + Arguments.of(Boolean.FALSE, -1, NotSame, Same), + Arguments.of(Boolean.TRUE, 1000, NotSame, NotSame), + Arguments.of(Boolean.FALSE, 1000, Same, Same) + ); + } @ParameterizedTest(name = "purgeExpired: {0}, maxFrequency: {1} || {2} {3}") - @VariableSource("purgeExpiredDataTestCases") + @MethodSource("purgeExpiredDataTestCases") public void testPurgeExpiredData( boolean purgeExpiredData, int maxSnapshotFrequency, diff --git a/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java b/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java index 29d03844260..ea5d86cd0e1 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_position/RealtimeVehicleMatcherTest.java @@ -23,12 +23,12 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.model.StopTime; import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService; import org.opentripplanner.standalone.config.routerconfig.updaters.VehiclePositionsUpdaterConfig; -import org.opentripplanner.test.support.VariableSource; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -326,14 +326,16 @@ public void clearOldTrips() { assertEquals(0, service.getRealtimeVehicles(pattern2).size()); } - static Stream inferenceTestCases = Stream.of( - Arguments.of("2022-04-05T15:26:04+02:00", "2022-04-05"), - Arguments.of("2022-04-06T00:26:04+02:00", "2022-04-05"), - Arguments.of("2022-04-06T10:26:04+02:00", "2022-04-06") - ); + static Stream inferenceTestCases() { + return Stream.of( + Arguments.of("2022-04-05T15:26:04+02:00", "2022-04-05"), + Arguments.of("2022-04-06T00:26:04+02:00", "2022-04-05"), + Arguments.of("2022-04-06T10:26:04+02:00", "2022-04-06") + ); + } @ParameterizedTest(name = "{0} should resolve to {1}") - @VariableSource("inferenceTestCases") + @MethodSource("inferenceTestCases") void inferServiceDayOfTripAt6(String time, String expectedDate) { var trip = TransitModelForTest.trip(tripId).build(); From 9f3d64d794696201e9593f377b42eb5c1788d798 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 4 Mar 2024 14:24:51 +0200 Subject: [PATCH 0727/1688] Add validation for costs, reluctances and durations --- .../apis/gtfs/GraphQLScalars.java | 90 ++++++++++++++++++- .../apis/gtfs/GtfsGraphQLIndex.java | 7 +- .../apis/gtfs/mapping/RouteRequestMapper.java | 21 +++-- .../framework/time/DurationUtils.java | 64 ++++++++++++- 4 files changed, 168 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index f25598499ef..e807cfecc3b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -176,6 +176,8 @@ private static Optional validateCoordinate(double coordinate) { .name("Cost") .coercing( new Coercing() { + private static final int MAX_COST = 1000000; + @Override public Integer serialize(@Nonnull Object dataFetcherResult) throws CoercingSerializeException { @@ -195,6 +197,14 @@ public Integer serialize(@Nonnull Object dataFetcherResult) @Override public Cost parseValue(Object input) throws CoercingParseValueException { if (input instanceof Integer intValue) { + if (intValue < 0) { + throw new CoercingParseValueException("Cost cannot be negative"); + } + if (intValue > MAX_COST) { + throw new CoercingParseValueException( + "Cost cannot be greater than %d".formatted(MAX_COST) + ); + } return Cost.costOfSeconds(intValue); } throw new CoercingParseValueException( @@ -205,7 +215,16 @@ public Cost parseValue(Object input) throws CoercingParseValueException { @Override public Cost parseLiteral(Object input) throws CoercingParseLiteralException { if (input instanceof IntValue intValue) { - return Cost.costOfSeconds(intValue.getValue().intValue()); + var value = intValue.getValue().intValue(); + if (value < 0) { + throw new CoercingParseLiteralException("Cost cannot be negative"); + } + if (value > MAX_COST) { + throw new CoercingParseLiteralException( + "Cost cannot be greater than %d".formatted(MAX_COST) + ); + } + return Cost.costOfSeconds(value); } throw new CoercingParseLiteralException( "Expected an integer, got: " + input.getClass().getSimpleName() @@ -382,4 +401,73 @@ private static Optional validateRatio(double ratio) { } ) .build(); + + public static final GraphQLScalarType reluctanceScalar = GraphQLScalarType + .newScalar() + .name("Reluctance") + .coercing( + new Coercing() { + private static final double MAX_Reluctance = 100000; + + @Override + public Double serialize(@Nonnull Object dataFetcherResult) + throws CoercingSerializeException { + if (dataFetcherResult instanceof Double doubleValue) { + return doubleValue; + } else if (dataFetcherResult instanceof Float floatValue) { + return floatValue.doubleValue(); + } else { + throw new CoercingSerializeException( + "Cannot serialize object of class %s as a reluctance".formatted( + dataFetcherResult.getClass().getSimpleName() + ) + ); + } + } + + @Override + public Double parseValue(Object input) throws CoercingParseValueException { + if (input instanceof Double doubleValue) { + if (Double.doubleToRawLongBits(doubleValue) < 0) { + throw new CoercingParseValueException("Reluctance cannot be negative"); + } + if (doubleValue > MAX_Reluctance + 0.001) { + throw new CoercingParseValueException( + "Reluctance cannot be greater than %s".formatted(MAX_Reluctance) + ); + } + return doubleValue; + } + throw new CoercingParseValueException( + "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) + ); + } + + @Override + public Double parseLiteral(Object input) throws CoercingParseLiteralException { + if (input instanceof FloatValue reluctance) { + return validateLiteral(reluctance.getValue().doubleValue()); + } + if (input instanceof IntValue reluctance) { + return validateLiteral(reluctance.getValue().doubleValue()); + } + throw new CoercingParseLiteralException( + "Expected a number, got: " + input.getClass().getSimpleName() + ); + } + + private static double validateLiteral(double reluctance) { + if (Double.doubleToRawLongBits(reluctance) < 0) { + throw new CoercingParseLiteralException("Reluctance cannot be negative"); + } + if (reluctance > MAX_Reluctance + 0.001) { + throw new CoercingParseLiteralException( + "Reluctance cannot be greater than %s".formatted(MAX_Reluctance) + ); + } + return reluctance; + } + } + ) + .build(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 7cc059bf7f4..f97f4a7817f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -116,6 +116,7 @@ protected static GraphQLSchema buildSchema() { .scalar(GraphQLScalars.ratioScalar) .scalar(GraphQLScalars.coordinateValueScalar) .scalar(GraphQLScalars.costScalar) + .scalar(GraphQLScalars.reluctanceScalar) .scalar(ExtendedScalars.GraphQLLong) .scalar(ExtendedScalars.Locale) .scalar( @@ -124,12 +125,6 @@ protected static GraphQLSchema buildSchema() { .aliasedScalar(ExtendedScalars.NonNegativeFloat) .build() ) - .scalar( - ExtendedScalars - .newAliasedScalar("Reluctance") - .aliasedScalar(ExtendedScalars.NonNegativeFloat) - .build() - ) .type("Node", type -> type.typeResolver(new NodeTypeResolver())) .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver())) .type("StopPosition", type -> type.typeResolver(new StopPosition() {})) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 9d166bf3872..e2833767d1f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -14,6 +14,7 @@ import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.framework.graphql.GraphQLUtils; +import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.model.GenericLocation; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; @@ -56,7 +57,9 @@ public static RouteRequest toRouteRequest( request.setTo(parseGenericLocation(args.getGraphQLDestination())); request.setLocale(GraphQLUtils.getLocale(environment, args.getGraphQLLocale())); if (args.getGraphQLSearchWindow() != null) { - request.setSearchWindow(args.getGraphQLSearchWindow()); + request.setSearchWindow( + DurationUtils.requireNonNegativeLarge(args.getGraphQLSearchWindow(), "searchWindow") + ); } if (args.getGraphQLBefore() != null) { @@ -175,7 +178,9 @@ private static void setTransitPreferences( if (board != null) { var slack = board.getGraphQLSlack(); if (slack != null) { - transitPreferences.withDefaultBoardSlackSec((int) slack.toSeconds()); + transitPreferences.withDefaultBoardSlackSec( + (int) DurationUtils.requireNonNegativeMedium(slack, "board slack").toSeconds() + ); } var waitReluctance = board.getGraphQLWaitReluctance(); if (waitReluctance != null) { @@ -186,7 +191,9 @@ private static void setTransitPreferences( if (alight != null) { var slack = alight.getGraphQLSlack(); if (slack != null) { - transitPreferences.withDefaultAlightSlackSec((int) slack.toSeconds()); + transitPreferences.withDefaultAlightSlackSec( + (int) DurationUtils.requireNonNegativeMedium(slack, "alight slack").toSeconds() + ); } } var transfer = transitArgs.getGraphQLTransfer(); @@ -197,7 +204,9 @@ private static void setTransitPreferences( } var slack = transfer.getGraphQLSlack(); if (slack != null) { - transferPreferences.withSlack((int) slack.toSeconds()); + transferPreferences.withSlack( + (int) DurationUtils.requireNonNegativeMedium(slack, "transfer slack").toSeconds() + ); } var maxTransfers = transfer.getGraphQLMaximumTransfers(); if (maxTransfers != null) { @@ -278,7 +287,9 @@ private static void setBicycleWalkPreferences( } var mountTime = args.getGraphQLMountDismountTime(); if (mountTime != null) { - preferences.withMountDismountTime(mountTime); + preferences.withMountDismountTime( + DurationUtils.requireNonNegativeShort(mountTime, "bicycle mount dismount time") + ); } var cost = args.getGraphQLCost(); if (cost != null) { diff --git a/src/main/java/org/opentripplanner/framework/time/DurationUtils.java b/src/main/java/org/opentripplanner/framework/time/DurationUtils.java index bf59964fbb2..6f5f3d48df3 100644 --- a/src/main/java/org/opentripplanner/framework/time/DurationUtils.java +++ b/src/main/java/org/opentripplanner/framework/time/DurationUtils.java @@ -14,7 +14,7 @@ /** * This class extend the Java {@link Duration} with utility functionality to parse and convert - * integer and text to a {@link Duration}. + * integer and text to a {@link Duration}. This class also contains methods to validate durations. *

      * OTP make have use of the Duration in a lenient ISO-8601 duration format. For example: * 

      @@ -181,7 +181,67 @@ public static String msToSecondsStr(long timeMs) {
   public static Duration requireNonNegative(Duration value) {
     Objects.requireNonNull(value);
     if (value.isNegative()) {
-      throw new IllegalArgumentException("Duration can no be negative: " + value);
+      throw new IllegalArgumentException("Duration can't be negative: " + value);
+    }
+    return value;
+  }
+
+  /**
+   * Checks that duration is not negative and not over 2 days.
+   *
+   * @param subject used to identify name of the problematic value when throwing an exception.
+   */
+  public static Duration requireNonNegativeLarge(Duration value, String subject) {
+    Objects.requireNonNull(value);
+    if (value.isNegative()) {
+      throw new IllegalArgumentException(
+        "Duration %s can't be negative: %s.".formatted(subject, value)
+      );
+    }
+    if (value.compareTo(Duration.ofDays(2)) > 0) {
+      throw new IllegalArgumentException(
+        "Duration %s can't be longer than two days: %s.".formatted(subject, value)
+      );
+    }
+    return value;
+  }
+
+  /**
+   * Checks that duration is not negative and not over 2 hours.
+   *
+   * @param subject used to identify name of the problematic value when throwing an exception.
+   */
+  public static Duration requireNonNegativeMedium(Duration value, String subject) {
+    Objects.requireNonNull(value);
+    if (value.isNegative()) {
+      throw new IllegalArgumentException(
+        "Duration %s can't be negative: %s.".formatted(subject, value)
+      );
+    }
+    if (value.compareTo(Duration.ofHours(2)) > 0) {
+      throw new IllegalArgumentException(
+        "Duration %s can't be longer than two hours: %s.".formatted(subject, value)
+      );
+    }
+    return value;
+  }
+
+  /**
+   * Checks that duration is not negative and not over 30 minutes.
+   *
+   * @param subject used to identify name of the problematic value when throwing an exception.
+   */
+  public static Duration requireNonNegativeShort(Duration value, String subject) {
+    Objects.requireNonNull(value);
+    if (value.isNegative()) {
+      throw new IllegalArgumentException(
+        "Duration %s can't be negative: %s.".formatted(subject, value)
+      );
+    }
+    if (value.compareTo(Duration.ofMinutes(30)) > 0) {
+      throw new IllegalArgumentException(
+        "Duration %s can't be longer than 30 minutes: %s.".formatted(subject, value)
+      );
     }
     return value;
   }

From 2bd2026116177d6bc0c55f1f5da1eb5bd9fef403 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 4 Mar 2024 14:50:27 +0100
Subject: [PATCH 0728/1688] Add validation

Co-authored-by: Thomas Gran 
---
 .../org/opentripplanner/model/plan/StopArrivalMapper.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java b/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
index 3a907e8cffb..9f8e4f7045a 100644
--- a/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
+++ b/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
@@ -16,9 +16,9 @@ class StopArrivalMapper {
   private final TripTimes tripTimes;
 
   public StopArrivalMapper(ZoneId zoneId, LocalDate serviceDate, TripTimes tripTimes) {
-    this.zoneId = zoneId;
-    this.serviceDate = serviceDate;
-    this.tripTimes = tripTimes;
+    this.zoneId = Objects.requireNonNull(zoneId);
+    this.serviceDate = Objects.requireNonNull(serviceDate);
+    this.tripTimes = Objects.requireNonNull(tripTimes);
   }
 
   StopArrival map(int i, StopLocation stop, boolean realTime) {

From a9406dc1baf835eb69b3539fbbe8b9e5db485ed5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 4 Mar 2024 14:57:31 +0100
Subject: [PATCH 0729/1688] Add import

---
 .../java/org/opentripplanner/model/plan/StopArrivalMapper.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java b/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
index 9f8e4f7045a..25bab2a7c3f 100644
--- a/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
+++ b/src/main/java/org/opentripplanner/model/plan/StopArrivalMapper.java
@@ -2,6 +2,7 @@
 
 import java.time.LocalDate;
 import java.time.ZoneId;
+import java.util.Objects;
 import org.opentripplanner.framework.time.ServiceDateUtils;
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.timetable.TripTimes;

From d54db3b65dfffa4fbcf8c1b37c05f2a162795c21 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Mon, 4 Mar 2024 15:03:16 +0100
Subject: [PATCH 0730/1688] Apply suggestions from code review

Co-authored-by: Vincent Paturet <46598384+vpaturet@users.noreply.github.com>
---
 .../raptor/api/model/RaptorAccessEgress.java              | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java
index aac389b7af4..3a7f48cf743 100644
--- a/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java
+++ b/src/main/java/org/opentripplanner/raptor/api/model/RaptorAccessEgress.java
@@ -54,8 +54,8 @@ public interface RaptorAccessEgress {
    * 
      
    * For example, for Park&Ride, driving all the way to the
    * destination is very often the best option when looking at the time criteria. When an
-   * increasing time-penalty is applied to access/egress with driving then driving less become
-   * more favorable. This also improves performance, since we usually add a very high cost to
+   * increasing time-penalty is applied to a car access/egress, then driving become less
+   * favorable. This also improves performance, since we usually add a very high cost to
    * driving - making all park&ride access legs optimal - forcing Raptor to compute a path for
    * every option. The short drives are optimal on cost, and the long are optimal on time. In the
    * case of park&ride the time-penalty enables Raptor to choose one of the shortest access/egress
@@ -64,8 +64,8 @@ public interface RaptorAccessEgress {
    * Another example is FLEX, where we in many use-cases want regular transit to win if there is
    * an offer. Only in the case where the FLEX is the only solution we want it to be presented.
    * To achieve this, we must add an extra duration to the time of the FLEX access/egress - it does
-   * not help to just edd extra cost - witch makes both FLEX optimal on time and transit optimal on
-   * cost. Many optimal access paths have an inpact on performance as vell.
+   * not help to just add extra cost - which makes both FLEX optimal on time and transit optimal on
+   * cost. Keeping a large number of optimal access paths has a negative impact on performance as well.
    * 
      
    *
    * The unit is seconds and the default value is {@link RaptorConstants#TIME_NOT_SET}.

From 964a3f767d6196524126102fbd46006427a3a7e5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 4 Mar 2024 15:04:40 +0100
Subject: [PATCH 0731/1688] Use uppercase for constants

---
 .../opentripplanner/apis/gtfs/GraphQLScalars.java    | 12 ++++++------
 .../opentripplanner/apis/gtfs/GtfsGraphQLIndex.java  | 12 ++++++------
 .../apis/gtfs/DurationScalarTest.java                |  4 ++--
 .../opentripplanner/apis/gtfs/GeoJsonScalarTest.java |  2 +-
 .../apis/gtfs/OffsetDateTimeScalarTest.java          |  6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
index f0e4f295055..9a9d704afdb 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
@@ -25,9 +25,9 @@ public class GraphQLScalars {
 
   private static final ObjectMapper geoJsonMapper = new ObjectMapper()
     .registerModule(new JtsModule(GeometryUtils.getGeometryFactory()));
-  public static GraphQLScalarType durationScalar = DurationScalarFactory.createDurationScalar();
+  public static GraphQLScalarType DURATION_SCALAR = DurationScalarFactory.createDurationScalar();
 
-  public static final GraphQLScalarType polylineScalar = GraphQLScalarType
+  public static final GraphQLScalarType POLYLINE_SCALAR = GraphQLScalarType
     .newScalar()
     .name("Polyline")
     .description(
@@ -56,7 +56,7 @@ public String parseLiteral(Object input) {
     )
     .build();
 
-  public static final GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType
+  public static final GraphQLScalarType OFFSET_DATETIME_SCALAR = GraphQLScalarType
     .newScalar()
     .name("OffsetDateTime")
     .coercing(
@@ -112,7 +112,7 @@ public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralExce
     )
     .build();
 
-  public static final GraphQLScalarType geoJsonScalar = GraphQLScalarType
+  public static final GraphQLScalarType GEOJSON_SCALAR = GraphQLScalarType
     .newScalar()
     .name("GeoJson")
     .description("Geographic data structures in JSON format. See: https://geojson.org/")
@@ -140,7 +140,7 @@ public Geometry parseLiteral(Object input) throws CoercingParseLiteralException
     )
     .build();
 
-  public static final GraphQLScalarType graphQLIDScalar = GraphQLScalarType
+  public static final GraphQLScalarType GRAPHQLID_SCALAR = GraphQLScalarType
     .newScalar()
     .name("ID")
     .coercing(
@@ -180,7 +180,7 @@ public Relay.ResolvedGlobalId parseLiteral(Object input)
     )
     .build();
 
-  public static final GraphQLScalarType gramsScalar = GraphQLScalarType
+  public static final GraphQLScalarType GRAMS_SCALAR = GraphQLScalarType
     .newScalar()
     .name("Grams")
     .coercing(
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
index 0d76de16dc1..6adadaa40ff 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
@@ -106,12 +106,12 @@ protected static GraphQLSchema buildSchema() {
       IntrospectionTypeWiring typeWiring = new IntrospectionTypeWiring(typeRegistry);
       RuntimeWiring runtimeWiring = RuntimeWiring
         .newRuntimeWiring()
-        .scalar(GraphQLScalars.durationScalar)
-        .scalar(GraphQLScalars.polylineScalar)
-        .scalar(GraphQLScalars.geoJsonScalar)
-        .scalar(GraphQLScalars.graphQLIDScalar)
-        .scalar(GraphQLScalars.gramsScalar)
-        .scalar(GraphQLScalars.offsetDateTimeScalar)
+        .scalar(GraphQLScalars.DURATION_SCALAR)
+        .scalar(GraphQLScalars.POLYLINE_SCALAR)
+        .scalar(GraphQLScalars.GEOJSON_SCALAR)
+        .scalar(GraphQLScalars.GRAPHQLID_SCALAR)
+        .scalar(GraphQLScalars.GRAMS_SCALAR)
+        .scalar(GraphQLScalars.OFFSET_DATETIME_SCALAR)
         .scalar(ExtendedScalars.GraphQLLong)
         .type("Node", type -> type.typeResolver(new NodeTypeResolver()))
         .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver()))
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java
index ca87311ac3a..28d1ad08376 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/DurationScalarTest.java
@@ -27,7 +27,7 @@ static List durationCases() {
   @ParameterizedTest
   @MethodSource("durationCases")
   void duration(Duration duration, String expected) {
-    var string = GraphQLScalars.durationScalar.getCoercing().serialize(duration);
+    var string = GraphQLScalars.DURATION_SCALAR.getCoercing().serialize(duration);
     assertEquals(expected, string);
   }
 
@@ -35,7 +35,7 @@ void duration(Duration duration, String expected) {
   void nonDuration() {
     Assertions.assertThrows(
       CoercingSerializeException.class,
-      () -> GraphQLScalars.durationScalar.getCoercing().serialize(new Object())
+      () -> GraphQLScalars.DURATION_SCALAR.getCoercing().serialize(new Object())
     );
   }
 }
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
index 92188e603c4..cc88e22d074 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
@@ -21,7 +21,7 @@ void geoJson() throws JsonProcessingException {
         new Coordinate(0, 0),
       }
     );
-    var geoJson = GraphQLScalars.geoJsonScalar.getCoercing().serialize(polygon);
+    var geoJson = GraphQLScalars.GEOJSON_SCALAR.getCoercing().serialize(polygon);
 
     var jsonNode = ObjectMappers
       .ignoringExtraFields()
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java
index 890bf1eeed1..45c8e9de837 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/OffsetDateTimeScalarTest.java
@@ -40,21 +40,21 @@ static List offsetDateTimeCases() {
   @ParameterizedTest
   @MethodSource("offsetDateTimeCases")
   void serializeOffsetDateTime(OffsetDateTime odt, String expected) {
-    var string = GraphQLScalars.offsetDateTimeScalar.getCoercing().serialize(odt);
+    var string = GraphQLScalars.OFFSET_DATETIME_SCALAR.getCoercing().serialize(odt);
     assertEquals(expected, string);
   }
 
   @ParameterizedTest
   @MethodSource("offsetDateTimeCases")
   void parseOffsetDateTime(OffsetDateTime expected, String input) {
-    var odt = GraphQLScalars.offsetDateTimeScalar.getCoercing().parseValue(input);
+    var odt = GraphQLScalars.OFFSET_DATETIME_SCALAR.getCoercing().parseValue(input);
     assertEquals(expected, odt);
   }
 
   @ParameterizedTest
   @MethodSource("offsetDateTimeCases")
   void parseOffsetDateTimeLiteral(OffsetDateTime expected, String input) {
-    var odt = GraphQLScalars.offsetDateTimeScalar
+    var odt = GraphQLScalars.OFFSET_DATETIME_SCALAR
       .getCoercing()
       .parseLiteral(new StringValue(input));
     assertEquals(expected, odt);

From cacec850aa1f6d4fe0dbf5f1a7cd9786a9fc2750 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Mon, 4 Mar 2024 15:05:26 +0100
Subject: [PATCH 0732/1688] Apply suggestions from code review

Co-authored-by: Vincent Paturet <46598384+vpaturet@users.noreply.github.com>
---
 src/main/java/org/opentripplanner/raptor/path/Path.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/raptor/path/Path.java b/src/main/java/org/opentripplanner/raptor/path/Path.java
index 15fcf7b34e7..ebade8b2690 100644
--- a/src/main/java/org/opentripplanner/raptor/path/Path.java
+++ b/src/main/java/org/opentripplanner/raptor/path/Path.java
@@ -19,9 +19,9 @@
 import org.opentripplanner.raptor.api.path.TransitPathLeg;
 
 /**
- * The result of a Raptor search is a path describing the one possible journey. The path is then
+ * The result of a Raptor search is a path describing the one possible journey. The path is the
  * main DTO part of the Raptor result, but it is also used internally in Raptor. Hence, it is a bit
- * more complex, and it has more responsiblilites than it should.
+ * more complex, and it has more responsiblilities than it should.
  * 
      
  * To improve the design, Raptor should not use the path internally. Instead, there should
  * be a special destination arrival that could take over the Raptor responsibilities. The

From cd76862ebe81ad33867cfdb2704836f61314d784 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Mon, 4 Mar 2024 14:06:38 +0000
Subject: [PATCH 0733/1688] Add changelog entry for #5705 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 0b6134e4939..1f86690f7ee 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -97,6 +97,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Use NeTEx authority short name if name is not present [#5698](https://github.com/opentripplanner/OpenTripPlanner/pull/5698)
 - Add Hamburg OSM mapper [#5701](https://github.com/opentripplanner/OpenTripPlanner/pull/5701)
 - Remove configurable car speed and determine it in graph build [#5657](https://github.com/opentripplanner/OpenTripPlanner/pull/5657)
+- Avoid cumulative real-time updates [#5705](https://github.com/opentripplanner/OpenTripPlanner/pull/5705)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.4.0 (2023-09-13)

From e432a386df32bc599b43ac27f77f3d807df4a01e Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 4 Mar 2024 22:58:42 +0200
Subject: [PATCH 0734/1688] Fix issue with realtime added patterns persisting
 with DIFFERENTIAL updates

---
 .../ext/siri/SiriTimetableSnapshotSource.java | 23 +----
 .../model/TimetableSnapshot.java              | 94 +++++++++++--------
 .../updater/trip/TimetableSnapshotSource.java | 54 ++++++-----
 3 files changed, 88 insertions(+), 83 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index 345f8deba20..87f100464a5 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -354,7 +354,7 @@ private Result handleModifiedTrip(
 
     // Also check whether trip id has been used for previously ADDED/MODIFIED trip message and
     // remove the previously created trip
-    removePreviousRealtimeUpdate(trip, serviceDate);
+    this.buffer.removePreviousRealtimeUpdate(trip.getId(), serviceDate);
 
     return updateResult;
   }
@@ -410,27 +410,6 @@ private boolean markScheduledTripAsDeleted(Trip trip, final LocalDate serviceDat
     return success;
   }
 
-  /**
-   * Removes previous trip-update from buffer if there is an update with given trip on service date
-   *
-   * @param serviceDate service date
-   * @return true if a previously added trip was removed
-   */
-  private boolean removePreviousRealtimeUpdate(final Trip trip, final LocalDate serviceDate) {
-    boolean success = false;
-
-    final TripPattern pattern = buffer.getRealtimeAddedTripPattern(trip.getId(), serviceDate);
-    if (pattern != null) {
-      // Remove the previous real-time-added TripPattern from buffer.
-      // Only one version of the real-time-update should exist
-      buffer.removeLastAddedTripPattern(trip.getId(), serviceDate);
-      buffer.removeRealtimeUpdatedTripTimes(pattern, trip.getId(), serviceDate);
-      success = true;
-    }
-
-    return success;
-  }
-
   private boolean purgeExpiredData() {
     final LocalDate today = LocalDate.now(transitModel.getTimeZone());
     final LocalDate previously = today.minusDays(2); // Just to be safe...
diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index 066a27ba15a..937c3e13ffd 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -20,7 +20,6 @@
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
-import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.opentripplanner.updater.spi.UpdateError;
 import org.opentripplanner.updater.spi.UpdateSuccess;
@@ -111,38 +110,6 @@ public Timetable resolve(TripPattern pattern, LocalDate serviceDate) {
     return pattern.getScheduledTimetable();
   }
 
-  public void removeRealtimeUpdatedTripTimes(
-    TripPattern tripPattern,
-    FeedScopedId tripId,
-    LocalDate serviceDate
-  ) {
-    SortedSet sortedTimetables = this.timetables.get(tripPattern);
-    if (sortedTimetables != null) {
-      TripTimes tripTimesToRemove = null;
-      for (Timetable timetable : sortedTimetables) {
-        if (timetable.isValidFor(serviceDate)) {
-          final TripTimes tripTimes = timetable.getTripTimes(tripId);
-          if (tripTimes == null) {
-            LOG.debug("No triptimes to remove for trip {}", tripId);
-          } else if (tripTimesToRemove != null) {
-            LOG.debug("Found two triptimes to remove for trip {}", tripId);
-          } else {
-            tripTimesToRemove = tripTimes;
-          }
-        }
-      }
-
-      if (tripTimesToRemove != null) {
-        for (Timetable sortedTimetable : sortedTimetables) {
-          boolean isDirty = sortedTimetable.getTripTimes().remove(tripTimesToRemove);
-          if (isDirty) {
-            dirtyTimetables.add(sortedTimetable);
-          }
-        }
-      }
-    }
-  }
-
   /**
    * Get the current trip pattern given a trip id and a service date, if it has been changed from
    * the scheduled pattern with an update, for which the stopPattern is different.
@@ -295,11 +262,24 @@ public void clear(String feedId) {
   }
 
   /**
-   * Removes the latest added trip pattern from the cache. This should be done when removing the
-   * trip times from the timetable the trip has been added to.
+   * Removes previous trip-update from buffer if there is an update with given trip on service date
+   *
+   * @param serviceDate service date
+   * @return true if a previously added trip was removed
    */
-  public void removeLastAddedTripPattern(FeedScopedId feedScopedTripId, LocalDate serviceDate) {
-    realtimeAddedTripPattern.remove(new TripIdAndServiceDate(feedScopedTripId, serviceDate));
+  public boolean removePreviousRealtimeUpdate(FeedScopedId tripId, LocalDate serviceDate) {
+    boolean success = false;
+
+    final TripPattern pattern = getRealtimeAddedTripPattern(tripId, serviceDate);
+    if (pattern != null) {
+      // Remove the previous real-time-added TripPattern from buffer.
+      // Only one version of the real-time-update should exist
+      removeLastAddedTripPattern(tripId, serviceDate);
+      removeRealtimeUpdatedTripTimes(pattern, tripId, serviceDate);
+      success = true;
+    }
+
+    return success;
   }
 
   /**
@@ -391,6 +371,46 @@ protected boolean clearRealtimeAddedTripPattern(String feedId) {
       );
   }
 
+  private void removeRealtimeUpdatedTripTimes(
+    TripPattern tripPattern,
+    FeedScopedId tripId,
+    LocalDate serviceDate
+  ) {
+    SortedSet sortedTimetables = this.timetables.get(tripPattern);
+    if (sortedTimetables != null) {
+      TripTimes tripTimesToRemove = null;
+      for (Timetable timetable : sortedTimetables) {
+        if (timetable.isValidFor(serviceDate)) {
+          final TripTimes tripTimes = timetable.getTripTimes(tripId);
+          if (tripTimes == null) {
+            LOG.debug("No triptimes to remove for trip {}", tripId);
+          } else if (tripTimesToRemove != null) {
+            LOG.debug("Found two triptimes to remove for trip {}", tripId);
+          } else {
+            tripTimesToRemove = tripTimes;
+          }
+        }
+      }
+
+      if (tripTimesToRemove != null) {
+        for (Timetable sortedTimetable : sortedTimetables) {
+          boolean isDirty = sortedTimetable.getTripTimes().remove(tripTimesToRemove);
+          if (isDirty) {
+            dirtyTimetables.add(sortedTimetable);
+          }
+        }
+      }
+    }
+  }
+
+  /**
+   * Removes the latest added trip pattern from the cache. This should be done when removing the
+   * trip times from the timetable the trip has been added to.
+   */
+  private void removeLastAddedTripPattern(FeedScopedId feedScopedTripId, LocalDate serviceDate) {
+    realtimeAddedTripPattern.remove(new TripIdAndServiceDate(feedScopedTripId, serviceDate));
+  }
+
   /**
    * Add the patterns to the stop index, only if they come from a modified pattern
    */
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index 19db2c7e309..1c2013f789d 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -272,6 +272,17 @@ public UpdateResult applyTripUpdates(
           serviceDate = localDateNow.get();
         }
 
+        // Check whether trip id has been used for previously ADDED trip message and mark previously
+        // created trip as DELETED
+        var canceledPreviouslyAddedTrip = cancelPreviouslyAddedTrip(
+          tripId,
+          serviceDate,
+          CancelationType.DELETE
+        );
+        // Remove previous realtime updates for this trip. This is necessary to avoid previous
+        // stop pattern modifications from persisting
+        this.buffer.removePreviousRealtimeUpdate(tripId, serviceDate);
+
         uIndex += 1;
         LOG.debug("trip update #{} ({} updates) :", uIndex, tripUpdate.getStopTimeUpdateCount());
         LOG.trace("{}", tripUpdate);
@@ -297,8 +308,18 @@ public UpdateResult applyTripUpdates(
                 tripId,
                 serviceDate
               );
-              case CANCELED -> handleCanceledTrip(tripId, serviceDate, CancelationType.CANCEL);
-              case DELETED -> handleCanceledTrip(tripId, serviceDate, CancelationType.DELETE);
+              case CANCELED -> handleCanceledTrip(
+                tripId,
+                serviceDate,
+                CancelationType.CANCEL,
+                canceledPreviouslyAddedTrip
+              );
+              case DELETED -> handleCanceledTrip(
+                tripId,
+                serviceDate,
+                CancelationType.DELETE,
+                canceledPreviouslyAddedTrip
+              );
               case REPLACEMENT -> validateAndHandleModifiedTrip(
                 tripUpdate,
                 tripDescriptor,
@@ -435,11 +456,6 @@ private Result handleScheduledTrip(
       return UpdateError.result(tripId, NO_SERVICE_ON_DATE);
     }
 
-    // If this trip_id has been used for previously ADDED/MODIFIED trip message (e.g. when the
-    // sequence of stops has changed, and is now changing back to the originally scheduled one),
-    // mark that previously created trip as DELETED.
-    cancelPreviouslyAddedTrip(tripId, serviceDate, CancelationType.DELETE);
-
     // Get new TripTimes based on scheduled timetable
     var result = pattern
       .getScheduledTimetable()
@@ -687,10 +703,6 @@ private Result handleAddedTrip(
       "number of stop should match the number of stop time updates"
     );
 
-    // Check whether trip id has been used for previously ADDED trip message and mark previously
-    // created trip as DELETED
-    cancelPreviouslyAddedTrip(tripId, serviceDate, CancelationType.DELETE);
-
     Route route = getOrCreateRoute(tripDescriptor, tripId);
 
     // Create new Trip
@@ -1105,10 +1117,6 @@ private Result handleModifiedTrip(
     var tripId = trip.getId();
     cancelScheduledTrip(tripId, serviceDate, CancelationType.DELETE);
 
-    // Check whether trip id has been used for previously ADDED/REPLACEMENT trip message and mark it
-    // as DELETED
-    cancelPreviouslyAddedTrip(tripId, serviceDate, CancelationType.DELETE);
-
     // Add new trip
     return addTripToGraphAndBuffer(
       trip,
@@ -1123,19 +1131,17 @@ private Result handleModifiedTrip(
   private Result handleCanceledTrip(
     FeedScopedId tripId,
     final LocalDate serviceDate,
-    CancelationType markAsDeleted
+    CancelationType markAsDeleted,
+    boolean canceledPreviouslyAddedTrip
   ) {
+    // if previously a added trip was removed, there can't be a scheduled trip to remove
+    if (canceledPreviouslyAddedTrip) {
+      return Result.success(UpdateSuccess.noWarnings());
+    }
     // Try to cancel scheduled trip
     final boolean cancelScheduledSuccess = cancelScheduledTrip(tripId, serviceDate, markAsDeleted);
 
-    // Try to cancel previously added trip
-    final boolean cancelPreviouslyAddedSuccess = cancelPreviouslyAddedTrip(
-      tripId,
-      serviceDate,
-      markAsDeleted
-    );
-
-    if (!cancelScheduledSuccess && !cancelPreviouslyAddedSuccess) {
+    if (!cancelScheduledSuccess) {
       debug(tripId, "No pattern found for tripId. Skipping cancellation.");
       return UpdateError.result(tripId, NO_TRIP_FOR_CANCELLATION_FOUND);
     }

From 61ab6e066e865c5a8a5f8eac1561e08b4a179d83 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 4 Mar 2024 23:19:55 +0200
Subject: [PATCH 0735/1688] Use uppercase for constants

---
 .../apis/gtfs/GraphQLScalars.java             | 24 +++++++++----------
 .../apis/gtfs/GtfsGraphQLIndex.java           | 20 ++++++++--------
 .../apis/gtfs/GraphQLScalarsTest.java         |  6 ++---
 3 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
index e807cfecc3b..ee49b30b8a8 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
@@ -26,11 +26,11 @@
 
 public class GraphQLScalars {
 
-  private static final ObjectMapper geoJsonMapper = new ObjectMapper()
+  private static final ObjectMapper GEOJSON_MAPPER = new ObjectMapper()
     .registerModule(new JtsModule(GeometryUtils.getGeometryFactory()));
-  public static GraphQLScalarType durationScalar = DurationScalarFactory.createDurationScalar();
+  public static final GraphQLScalarType DURATION_SCALAR = DurationScalarFactory.createDurationScalar();
 
-  public static GraphQLScalarType polylineScalar = GraphQLScalarType
+  public static final GraphQLScalarType POLYLINE_SCALAR = GraphQLScalarType
     .newScalar()
     .name("Polyline")
     .description(
@@ -59,7 +59,7 @@ public String parseLiteral(Object input) {
     )
     .build();
 
-  public static final GraphQLScalarType offsetDateTimeScalar = GraphQLScalarType
+  public static final GraphQLScalarType OFFSET_DATETIME_SCALAR = GraphQLScalarType
     .newScalar()
     .name("OffsetDateTime")
     .coercing(
@@ -109,7 +109,7 @@ private static CoercingParseLiteralException literalException(Object input) {
     )
     .build();
 
-  public static final GraphQLScalarType coordinateValueScalar = GraphQLScalarType
+  public static final GraphQLScalarType COORDINATE_VALUE_SCALAR = GraphQLScalarType
     .newScalar()
     .name("CoordinateValue")
     .coercing(
@@ -171,7 +171,7 @@ private static Optional validateCoordinate(double coordinate) {
     )
     .build();
 
-  public static final GraphQLScalarType costScalar = GraphQLScalarType
+  public static final GraphQLScalarType COST_SCALAR = GraphQLScalarType
     .newScalar()
     .name("Cost")
     .coercing(
@@ -234,7 +234,7 @@ public Cost parseLiteral(Object input) throws CoercingParseLiteralException {
     )
     .build();
 
-  public static GraphQLScalarType geoJsonScalar = GraphQLScalarType
+  public static GraphQLScalarType GEOJSON_SCALAR = GraphQLScalarType
     .newScalar()
     .name("GeoJson")
     .description("Geographic data structures in JSON format. See: https://geojson.org/")
@@ -244,7 +244,7 @@ public Cost parseLiteral(Object input) throws CoercingParseLiteralException {
         public JsonNode serialize(Object dataFetcherResult) throws CoercingSerializeException {
           if (dataFetcherResult instanceof Geometry) {
             var geom = (Geometry) dataFetcherResult;
-            return geoJsonMapper.valueToTree(geom);
+            return GEOJSON_MAPPER.valueToTree(geom);
           }
           return null;
         }
@@ -262,7 +262,7 @@ public Geometry parseLiteral(Object input) throws CoercingParseLiteralException
     )
     .build();
 
-  public static GraphQLScalarType graphQLIDScalar = GraphQLScalarType
+  public static GraphQLScalarType GRAPHQL_ID_SCALAR = GraphQLScalarType
     .newScalar()
     .name("ID")
     .coercing(
@@ -302,7 +302,7 @@ public Relay.ResolvedGlobalId parseLiteral(Object input)
     )
     .build();
 
-  public static GraphQLScalarType gramsScalar = GraphQLScalarType
+  public static GraphQLScalarType GRAMS_SCALAR = GraphQLScalarType
     .newScalar()
     .name("Grams")
     .coercing(
@@ -337,7 +337,7 @@ public Grams parseLiteral(Object input) throws CoercingParseLiteralException {
     )
     .build();
 
-  public static final GraphQLScalarType ratioScalar = GraphQLScalarType
+  public static final GraphQLScalarType RATIO_SCALAR = GraphQLScalarType
     .newScalar()
     .name("Ratio")
     .coercing(
@@ -402,7 +402,7 @@ private static Optional validateRatio(double ratio) {
     )
     .build();
 
-  public static final GraphQLScalarType reluctanceScalar = GraphQLScalarType
+  public static final GraphQLScalarType RELUCTANCE_SCALAR = GraphQLScalarType
     .newScalar()
     .name("Reluctance")
     .coercing(
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
index f97f4a7817f..73f60fdda98 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
@@ -107,16 +107,16 @@ protected static GraphQLSchema buildSchema() {
       IntrospectionTypeWiring typeWiring = new IntrospectionTypeWiring(typeRegistry);
       RuntimeWiring runtimeWiring = RuntimeWiring
         .newRuntimeWiring()
-        .scalar(GraphQLScalars.durationScalar)
-        .scalar(GraphQLScalars.polylineScalar)
-        .scalar(GraphQLScalars.geoJsonScalar)
-        .scalar(GraphQLScalars.graphQLIDScalar)
-        .scalar(GraphQLScalars.gramsScalar)
-        .scalar(GraphQLScalars.offsetDateTimeScalar)
-        .scalar(GraphQLScalars.ratioScalar)
-        .scalar(GraphQLScalars.coordinateValueScalar)
-        .scalar(GraphQLScalars.costScalar)
-        .scalar(GraphQLScalars.reluctanceScalar)
+        .scalar(GraphQLScalars.DURATION_SCALAR)
+        .scalar(GraphQLScalars.POLYLINE_SCALAR)
+        .scalar(GraphQLScalars.GEOJSON_SCALAR)
+        .scalar(GraphQLScalars.GRAPHQL_ID_SCALAR)
+        .scalar(GraphQLScalars.GRAMS_SCALAR)
+        .scalar(GraphQLScalars.OFFSET_DATETIME_SCALAR)
+        .scalar(GraphQLScalars.RATIO_SCALAR)
+        .scalar(GraphQLScalars.COORDINATE_VALUE_SCALAR)
+        .scalar(GraphQLScalars.COST_SCALAR)
+        .scalar(GraphQLScalars.RELUCTANCE_SCALAR)
         .scalar(ExtendedScalars.GraphQLLong)
         .scalar(ExtendedScalars.Locale)
         .scalar(
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java
index 90b35a31b9f..6c6fc104880 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLScalarsTest.java
@@ -15,7 +15,7 @@ class GraphQLScalarsTest {
 
   @Test
   void duration() {
-    var string = GraphQLScalars.durationScalar.getCoercing().serialize(Duration.ofMinutes(30));
+    var string = GraphQLScalars.DURATION_SCALAR.getCoercing().serialize(Duration.ofMinutes(30));
     assertEquals("PT30M", string);
   }
 
@@ -23,7 +23,7 @@ void duration() {
   void nonDuration() {
     Assertions.assertThrows(
       CoercingSerializeException.class,
-      () -> GraphQLScalars.durationScalar.getCoercing().serialize(new Object())
+      () -> GraphQLScalars.DURATION_SCALAR.getCoercing().serialize(new Object())
     );
   }
 
@@ -38,7 +38,7 @@ void geoJson() throws JsonProcessingException {
         new Coordinate(0, 0),
       }
     );
-    var geoJson = GraphQLScalars.geoJsonScalar.getCoercing().serialize(polygon);
+    var geoJson = GraphQLScalars.GEOJSON_SCALAR.getCoercing().serialize(polygon);
 
     var jsonNode = ObjectMappers
       .ignoringExtraFields()

From 573ae93cd62d2a57cf4be92c94dad84fd035f5ad Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 01:21:43 +0000
Subject: [PATCH 0736/1688] fix(deps): update dependency
 ch.qos.logback:logback-classic to v1.5.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 8764dc0578a..a3d2763039c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -65,7 +65,7 @@
         5.10.2
         1.12.2
         5.5.3
-        1.5.2
+        1.5.3
         9.9.1
         2.0.12
         2.0.15

From 1fc6f5c95078afef0b293f60b8e675e708f6a808 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 01:21:49 +0000
Subject: [PATCH 0737/1688] chore(deps): update dependency
 io.github.git-commit-id:git-commit-id-maven-plugin to v8

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a3d2763039c..ddc19f4528b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@
                   but we need the Maven project version as well, so we perform substitution. -->
                 io.github.git-commit-id
                 git-commit-id-maven-plugin
-                7.0.0
+                8.0.0
                 
                     
                         

From bfb7c37a49a122bfcd6e2cfc82cc8cfbdd46444a Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Tue, 5 Mar 2024 10:49:28 +0000
Subject: [PATCH 0738/1688] Add changelog entry for #5715 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 1f86690f7ee..9e2e515c463 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -98,6 +98,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Add Hamburg OSM mapper [#5701](https://github.com/opentripplanner/OpenTripPlanner/pull/5701)
 - Remove configurable car speed and determine it in graph build [#5657](https://github.com/opentripplanner/OpenTripPlanner/pull/5657)
 - Avoid cumulative real-time updates [#5705](https://github.com/opentripplanner/OpenTripPlanner/pull/5705)
+- Fix time penalty [#5715](https://github.com/opentripplanner/OpenTripPlanner/pull/5715)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.4.0 (2023-09-13)

From 6fc4f608a8f710d68d56c3febafe16f6932cf532 Mon Sep 17 00:00:00 2001
From: OTP Serialization Version Bot
 
Date: Tue, 5 Mar 2024 10:49:51 +0000
Subject: [PATCH 0739/1688] Bump serialization version id for #5715

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ddc19f4528b..f809bae08c6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 
     
-        147
+        148
         
         30.2
         2.51

From 993bdb15884fbb23ef828b1ff580c70bb4d286e4 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 4 Mar 2024 17:03:10 +0100
Subject: [PATCH 0740/1688] Add user agent to OTP HTTP client

---
 .../java/org/opentripplanner/framework/io/OtpHttpClient.java    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
index 72b67441a18..2d53861f523 100644
--- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
+++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
@@ -36,6 +36,7 @@
 import org.apache.hc.core5.pool.PoolReusePolicy;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
+import org.opentripplanner.model.projectinfo.OtpProjectInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -138,6 +139,7 @@ private OtpHttpClient(Duration timeout, Duration connectionTtl, int maxConnectio
 
     HttpClientBuilder httpClientBuilder = HttpClients
       .custom()
+      .setUserAgent("OpenTripPlanner %s".formatted(OtpProjectInfo.projectInfo().version.toString()))
       .setConnectionManager(connectionManager)
       .setDefaultRequestConfig(requestConfig(timeout));
 

From 6c956b86f392865fc2e7a82425e195c62374f015 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 5 Mar 2024 12:07:32 +0100
Subject: [PATCH 0741/1688] Remove version number

---
 .../java/org/opentripplanner/framework/io/OtpHttpClient.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
index 2d53861f523..c922cfcc4be 100644
--- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
+++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
@@ -36,7 +36,6 @@
 import org.apache.hc.core5.pool.PoolReusePolicy;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
-import org.opentripplanner.model.projectinfo.OtpProjectInfo;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -139,7 +138,7 @@ private OtpHttpClient(Duration timeout, Duration connectionTtl, int maxConnectio
 
     HttpClientBuilder httpClientBuilder = HttpClients
       .custom()
-      .setUserAgent("OpenTripPlanner %s".formatted(OtpProjectInfo.projectInfo().version.toString()))
+      .setUserAgent("OpenTripPlanner")
       .setConnectionManager(connectionManager)
       .setDefaultRequestConfig(requestConfig(timeout));
 

From 2f763e9626a89164f09d73030bdccb09590650d1 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 5 Mar 2024 12:30:19 +0100
Subject: [PATCH 0742/1688] Rename constant

---
 src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java | 2 +-
 .../java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
index 9a9d704afdb..42ffe992539 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
@@ -140,7 +140,7 @@ public Geometry parseLiteral(Object input) throws CoercingParseLiteralException
     )
     .build();
 
-  public static final GraphQLScalarType GRAPHQLID_SCALAR = GraphQLScalarType
+  public static final GraphQLScalarType GRAPHQL_ID_SCALAR = GraphQLScalarType
     .newScalar()
     .name("ID")
     .coercing(
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
index 6adadaa40ff..1fd78765a07 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
@@ -109,7 +109,7 @@ protected static GraphQLSchema buildSchema() {
         .scalar(GraphQLScalars.DURATION_SCALAR)
         .scalar(GraphQLScalars.POLYLINE_SCALAR)
         .scalar(GraphQLScalars.GEOJSON_SCALAR)
-        .scalar(GraphQLScalars.GRAPHQLID_SCALAR)
+        .scalar(GraphQLScalars.GRAPHQL_ID_SCALAR)
         .scalar(GraphQLScalars.GRAMS_SCALAR)
         .scalar(GraphQLScalars.OFFSET_DATETIME_SCALAR)
         .scalar(ExtendedScalars.GraphQLLong)

From ed2c083c48ad917b8ca3da1073e352881cb34a65 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 5 Mar 2024 12:41:42 +0100
Subject: [PATCH 0743/1688] Revert back to using CONFIG icon [ci skip]

---
 src/main/java/org/opentripplanner/datastore/OtpDataStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
index 0c2e9a6608c..937b4fb8203 100644
--- a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
+++ b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
@@ -108,7 +108,7 @@ public void open() {
 
     if (config.stopConsolidation() != null) {
       stopConsolidation =
-        findSourceUsingAllRepos(it -> it.findCompositeSource(config.stopConsolidation(), GTFS));
+        findSourceUsingAllRepos(it -> it.findCompositeSource(config.stopConsolidation(), CONFIG));
     }
 
     addAll(Arrays.asList(streetGraph, graph, buildReportDir));

From 0e9c32869dba575fe1e30aee51640eb200610d43 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 5 Mar 2024 13:02:10 +0100
Subject: [PATCH 0744/1688] Fix finding of stop consolidation file [ci skip]

---
 src/main/java/org/opentripplanner/datastore/OtpDataStore.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
index 937b4fb8203..397d3f64c70 100644
--- a/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
+++ b/src/main/java/org/opentripplanner/datastore/OtpDataStore.java
@@ -108,7 +108,7 @@ public void open() {
 
     if (config.stopConsolidation() != null) {
       stopConsolidation =
-        findSourceUsingAllRepos(it -> it.findCompositeSource(config.stopConsolidation(), CONFIG));
+        findSingleSource(config.stopConsolidation(), config.stopConsolidation().toString(), GTFS);
     }
 
     addAll(Arrays.asList(streetGraph, graph, buildReportDir));

From 4cdd8be12443cc134f2285d64fb5636ce10cf585 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 5 Mar 2024 16:04:06 +0100
Subject: [PATCH 0745/1688] Update logback-classic only once a month [ci skip]

---
 renovate.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renovate.json5 b/renovate.json5
index e2a94318313..29e51863384 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -44,7 +44,8 @@
     // gbfs-java-model patch releases are automatic dependency upgrades so we automerge
     {
       "matchPackageNames": [
-        "org.entur.gbfs:gbfs-java-model"
+        "org.entur.gbfs:gbfs-java-model",
+        "ch.qos.logback:logback-classic"
       ],
       "matchUpdateTypes": ["patch"],
       "schedule": "on the 18th day of the month",
@@ -104,7 +105,6 @@
         "org.apache.maven.plugins:maven-surefire-plugin",
         "org.jacoco:jacoco-maven-plugin", // coverage plugin
         "org.apache.commons:commons-compress", // only used by tests
-        "ch.qos.logback:logback-classic",
         // maven plugins
         "org.codehaus.mojo:build-helper-maven-plugin",
         "org.apache.maven.plugins:maven-gpg-plugin",

From 5e0b927ea7e4906a80ae61772950d2b8cdc4af9c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 01:41:50 +0000
Subject: [PATCH 0746/1688] chore(deps): update micrometer.version to v1.12.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index f809bae08c6..97697b6896f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         2.16.1
         3.1.5
         5.10.2
-        1.12.2
+        1.12.3
         5.5.3
         1.5.3
         9.9.1

From f2d7d1183aeab35df33a67f8201715cbf4ed34b5 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Thu, 7 Mar 2024 11:29:28 +0100
Subject: [PATCH 0747/1688] Fix direct routing on roundabout

---
 .../edge/TemporaryPartialStreetEdge.java      |  11 ---
 .../street/integration/WalkRoutingTest.java   |  74 ++++++++++++++++++
 .../street/integration/roundabout.osm.pbf     | Bin 0 -> 3985 bytes
 3 files changed, 74 insertions(+), 11 deletions(-)
 create mode 100644 src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
 create mode 100644 src/test/resources/org/opentripplanner/street/integration/roundabout.osm.pbf

diff --git a/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java b/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java
index 09846bb3aa1..8c797f1f492 100644
--- a/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java
+++ b/src/main/java/org/opentripplanner/street/model/edge/TemporaryPartialStreetEdge.java
@@ -40,17 +40,6 @@ public boolean isEquivalentTo(Edge e) {
     return (e == this || e == parentEdge);
   }
 
-  @Override
-  public boolean isReverseOf(Edge e) {
-    Edge other = e;
-    if (e instanceof TemporaryPartialStreetEdge) {
-      other = ((TemporaryPartialStreetEdge) e).parentEdge;
-    }
-
-    // TODO(flamholz): is there a case where a partial edge has a reverse of its own?
-    return parentEdge.isReverseOf(other);
-  }
-
   /**
    * Returns true if this edge is trivial - beginning and ending at the same point.
    */
diff --git a/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java b/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
new file mode 100644
index 00000000000..3fbb546c3f7
--- /dev/null
+++ b/src/test/java/org/opentripplanner/street/integration/WalkRoutingTest.java
@@ -0,0 +1,74 @@
+package org.opentripplanner.street.integration;
+
+import java.time.Instant;
+import java.util.List;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.ConstantsForTests;
+import org.opentripplanner.TestOtpModel;
+import org.opentripplanner.astar.model.GraphPath;
+import org.opentripplanner.model.GenericLocation;
+import org.opentripplanner.routing.api.request.RouteRequest;
+import org.opentripplanner.routing.api.request.StreetMode;
+import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.impl.GraphPathFinder;
+import org.opentripplanner.street.model.edge.Edge;
+import org.opentripplanner.street.model.vertex.Vertex;
+import org.opentripplanner.street.search.TemporaryVerticesContainer;
+import org.opentripplanner.street.search.state.State;
+import org.opentripplanner.test.support.ResourceLoader;
+
+class WalkRoutingTest {
+
+  static final Instant dateTime = Instant.now();
+  private final Graph roundabout;
+
+  {
+    TestOtpModel model = ConstantsForTests.buildOsmGraph(
+      ResourceLoader.of(WalkRoutingTest.class).file("roundabout.osm.pbf")
+    );
+    roundabout = model.graph();
+
+    model.transitModel().index();
+    roundabout.index(model.transitModel().getStopModel());
+  }
+
+  /**
+   * Both https://www.openstreetmap.org/way/146988098 and
+   * https://www.openstreetmap.org/way/146988099 are routable for pedestrians, the routing engine
+   * should return a path from any point of the first way to any point of the second.
+   * 
      
+   * See also issue
+   * #5706
+   */
+  @Test
+  void shouldRouteAroundRoundabout() {
+    var start = new GenericLocation(59.94646, 10.77511);
+    var end = new GenericLocation(59.94641, 10.77522);
+    Assertions.assertDoesNotThrow(() -> route(roundabout, start, end));
+  }
+
+  private static List> route(
+    Graph graph,
+    GenericLocation from,
+    GenericLocation to
+  ) {
+    RouteRequest request = new RouteRequest();
+    request.setDateTime(dateTime);
+    request.setFrom(from);
+    request.setTo(to);
+    request.journey().direct().setMode(StreetMode.WALK);
+
+    try (
+      var temporaryVertices = new TemporaryVerticesContainer(
+        graph,
+        request,
+        request.journey().direct().mode(),
+        request.journey().direct().mode()
+      )
+    ) {
+      var gpf = new GraphPathFinder(null);
+      return gpf.graphPathFinderEntryPoint(request, temporaryVertices);
+    }
+  }
+}
diff --git a/src/test/resources/org/opentripplanner/street/integration/roundabout.osm.pbf b/src/test/resources/org/opentripplanner/street/integration/roundabout.osm.pbf
new file mode 100644
index 0000000000000000000000000000000000000000..17a899bd4427f51ba1d1df75c2b41b1cae7d5f79
GIT binary patch
literal 3985
zcmV;C4{q=P000gO2~Sf^NM&JUWpWs|0T8VL8nFR*oa2(>XgL3RaezR>ji*ZjBpRB(
zUfjp5(D3Wmg?-FQeE!9`!O0n^xrw@A26|>nTrR13#i@SzDXGO;g2DMkC3+#11*!2R
z8L4^ko-SH)C7HRY#U+Wk1-3>8Mkcxj#<~V(AqECkU=-EFD41WIo1C9lmReMzV4!EA
zXK2{PsFG1qQedU8UtV6WmtO!hzoaNNwInyOKrg>2T|coPQy*w^15?A3dF$B#?9)A#
z0000C3I|V9O+;aIVHnL05Rwxb#}0U$ol|>IRM#2jocr8wm*r8wN31Mpe6p}FSRS=l
zqqZ1L#0N2H8+zG2vUk|syL0bFe9hEx6dzc%SW^vBZG4VK#hRJ`wnoiFO-y2Z3qFdq
z>R6*#qb70Gp1XoDPX5T`%$<9_^E==3_k9QEn;-^w$>$@Q2FwhifgpuQSk`BN5Rudh
zIb05+Pl`xB17h6HJV@v~=KBJYT5f2d>~5%E)}*o^@dL^OW-1}T1*I881#EW$8>ZgD
zHc?kp#ir4}M#4H#ZFXC^6bg}`Zj0Chl^Tdjgs2j|2h$`uL~P?}DqyY*`-xhvDs+cf
zl}yc#sH9xhr~_b~Zl{}Osw$dhWMruf`;@S*DnTO?ODA4Rt$>?J%2Wx2fLtD^l4by}
zDV3^^09$5Qf=V=9s#K-04m{Nh`vSm469&#W`hgu)u7trFJ>*x(6|!H_B@m09uDo22
zI~U@*ZX(1lOOQ;$`G$>cP?v9QFn}*Wd=;hCngF;QF1Ou5KMx4LN|`20phrZWIa4Yq
zt5nO0S`Z?VUJ#L}0|38F^!#b0Tna;6r%ZH7l_|iHkR%5o)}U7zPH5cButGZ_O$WLB+7~j71OYh#qS-wyGL}*wHmC|vRy6R8Q|yxhHm4)s;jp{h^j}~bt=cC_
zoscIAO{}yzozGN&iv$!}K=*hK5Ot}7NCx9V6)DqXTDBvg>k%zKE32xiDzhWitS*v>
znx$w#B`aD=WDYneso0HSE&KSM*&&^ov+GJ866Om
z1F=ysqG-BL@zZuYJh^T#M?p&_NGLz8PSq3YD4^
zQFKxPredep;qkhh*~nU_OmfJzDML)nGHj
z_Kas|p26!=LS2r$oV*+d2*w)-hv-B)UD;lmCM~VBOqmY+cq-8f=uGB1v%L-{By>Kg
zu7R~iUrsZo)`;r8YN6dA;85k=KOD9*{r$<56LRtqQ*`ce#316TL9$~
zUUvsCKe6#4cbsW|xZybeIa+t%`u>#1bM8boe7WO>aO?d2diG}Ho*caA-3^Ob`~w&N
zbo1bg8}}VVUHFZbwGHUNqkE$+zk>1Bi>>vj<=p)9!j@})|CW8c`TTyWn$)3c`5w1t
z&u{7G46`Tyj5?x?_#AK8dajv0GNvhezwNVu?E|jxjqyqMg(sdp&#-}F9$wz3WQJLWz1ZQOuvptEQbw-@bkd^Ky!
z^tRcXpv~H}8nvxJEro5?1;W=aJm6Z*_xV-mBdU24?L{}yerDD#^aW}~pQ6PuVZKGN
z_ih#*wn6IfLfmcbMzwV`d?9fSI*kJjktQwsE!S0aRzyqSG1I
zdaU9ZW-_9+SyI!
z6ZmS%>^juQAHq%i4*Q*cF>eWl%g_b!0zQYHpgP=&>d{)XIdMOJ!feFHTw9ne%wFag
zbCo&99b!iB>@lRlwB7PYbV)diPMF7>#viY1n_3t5uQwhgyg#%JEfQCiKJ0T;XcbnM
z%$dAAy+u6azB~3W;}!_lO#jZQed#^>>h#9`$BR$H_KZ`nEiGBuyCMBi+_KSUn2%;{
zp1s@J5PCA@RP1*P&@O3r)|!G_sTT`&WjxHP?Q?U)`x)yK>WiB3ThfA-
zn5z3+#q;o76kCUC2G%l{(;nb$%r0hk#!=>P+;#5gi+k8jY_-r}J(EzwA7Vcg`yR(F
zcrJfks1}=;OX6+uOY^70{};D+aP!M+(4Qu@nrnv4=kDOuDCVU2c)T4;yu?5WHe;T_Ww;c(KWtj}V1
z361PV_CI3r$kXUNQ;o;Od@%j5Xd!AxfAHRbE{^V7bmwzTwq
z{a+j~aL`~p1P{%yXJ$F9PM160=E=^%-rT(Wn1Y`T`+4E;UyLw>mkLKx!LS`gZAYj5
zvfr2QN
z{cqp=p08{DAC*_^R{#J23@5JKX!t7RP9j#_7&{;IQtOW1MAGP?_uf31qoj#>qrR;ftUQK}tZV})WJ
zK@qLBRYpa8*D5Obeqhzwo||B`PWQ*R*>k@8-E+Qkg3epe8%UH@b7ol1BPe#dsp*iAtb=3tf+{O(BdMregKJ^plmhJRFs$L;r~`rL>&a;i)zq|i6*S4DyW!-KZ?EXqYeEe~XZG~;-&2mzH8
z64gM=NF-*s(^LIvejhjkJ7dr@)+{B`5kg?15(>*E$woYN14v!1B4m(|PC}6!i1@tF
zfgf2yx(wwzx)f%|n>;kM2`gw5Ihqd!hCZ?}++cZ5xH7o0o2y%+B8e$gQFQ{E7H*!CI%2@8Rl|fO&gQ
z`s0cuZ$M*t6R0tf=Oz{Dpm2slD+PwBx%}wZ)ZGs{HjHB&OKvax
zuKQDZKTZ@c?>{@p$+>U>=5X&sDQ407yBCE4t=rC)TksI^Y9yQFf^46pM9EcMUc0OJ
z{X0!3daR?2Jrv?_vN&hw;!LNtZ-19%a6%lm_8Ty8kUepT6u+VENN3EJFJ?co)IgU<
z<}O~&;9+9P|Fh$2DZ6U^!CK$96kPZNv3@sDdDmd5kH>Z>(0{)2>QT$`mdfU-Y(sO|
zz9}cqx9^>@m$p|=;WX{{czI*3?+S%$6dqFGuup7wU2V|3Q@?b^T%v8%Q&_zcn144_
z9UFa*YM0S#M5uT_J;;I$EVzJIQ;#g$S3hseVE(+aZi62!tEj7-dTJ$u`-%ttrQ$>>
z?r|%O{`aR~K*n!tYpN&X0piu4Xc0q)y*(WBZw*gQkQ}x1e(j8@zV}1*hZb{gDvgwE|4JU|o>q?589Ot!R&XYP)vVL86y*-m*@IbNUeq|Noze~h%NJDiz147SUr)ICQFYT6rfZyO&`4YrHJq<}u%m6#ssoK1{WwXy
zvhsN|>lB8jXSf0hSV;Ey{K<)u<#0>YV-FP8va@y@=VUn>X8BQ)rFDMI-LbGIOD`-v
z&N-PB%#4;2s&1{=K7nP~fh>LESV!c|3gF|iS9ravyLj|DNR8)?QiLxTo*{nu3UyL_
zgj!X0=$3O01(vO(uL=sQDSSmiSU|Ca!fU@+b|HQB!hOW$5nawTm~K4y)a`7vjJ6er
zwvNF)#M0=!!!R>O5=w8=9PTAnJa0Mu>M2XaUHJc$H9R;6^s$&3C)ppAHb0!mI-?E8
z!m;vb7Q}{2wnsE;XW8!H8z>Ir|&m&2O!;D?BeKt1|W&~J^n!R@+@nYx1Cl^bqXbQ)RKSnZ)3p4LYmPMB!
zj(duAFX^xZ!V((hpz}RZafk0N&=xz!L2wYPf^H>kZ%as;8}7Yn@dZTGNwD|^
zx~cErq~NS?;2XGznAjGTmNOl`-}k|X01MG2+QcIv1!b*Vu9?;rC_d&xLS2v>A;%Q5
zlfOQ6T&H7m8doU5(lw+n#dcXM6tjjV<}
Date: Thu, 7 Mar 2024 14:20:41 +0100
Subject: [PATCH 0748/1688] fix: Access without time-penalty is removed when
 access with exits.

---
 .../rangeraptor/transit/AccessPaths.java      |  2 +-
 .../rangeraptor/transit/AccessPathsTest.java  | 36 +++++++++++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
index d070a804f9c..66b7227584d 100644
--- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
+++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
@@ -194,7 +194,7 @@ private List filterOnTimePenaltyLimitIfExist(List e.timePenalty() > iterationTimePenaltyLimit).toList();
     }
     return list;
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
index bf8e06a73d7..5b4c0c89bc2 100644
--- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
+++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
@@ -83,7 +83,7 @@ void calculateMaxNumberOfRides() {
   }
 
   @Test
-  void iterateOverPathsWithPenalty() {
+  void iterateOverPathsWithTimePenalty() {
     // Expected at departure 540
     var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60);
 
@@ -146,7 +146,7 @@ void iterateOverPathsWithPenalty() {
   }
 
   @Test
-  void iterateOverPathsWithPenaltyInReversDirection() {
+  void iterateOverPathsWithTimePenaltyInReversDirection() {
     // Expected at departure 540
     var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60);
 
@@ -164,6 +164,10 @@ void iterateOverPathsWithPenaltyInReversDirection() {
       REVERSE
     );
 
+    // Make sure standard iterator works
+    expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_B, walkFastWithPenalty);
+    expect(accessPaths.arrivedOnBoardByNumOfRides(3), FLEX_B, flexFastWithPenalty);
+
     var iterator = accessPaths.iterateOverPathsWithPenalty(600);
 
     // First iteration
@@ -196,6 +200,34 @@ void iterateOverPathsWithPenaltyInReversDirection() {
     assertFalse(iterator.hasNext());
   }
 
+  @Test
+  void testRegularIteratorsAndIteratorWithPenaltyWorksTogether() {
+    var walkFastWithPenalty = WALK_FAST.withTimePenalty(60);
+
+    // Without time-penalty, the iterator should be empty
+    var accessPaths = AccessPaths.create(
+      60,
+      List.of(walkFastWithPenalty, WALK_COST),
+      MULTI_CRITERIA,
+      FORWARD
+    );
+
+    // Both accesses are expected before with enter the "time-penalty" iteration
+    expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_COST, walkFastWithPenalty);
+    expect(accessPaths.arrivedOnBoardByNumOfRides(0));
+
+    var iterator = accessPaths.iterateOverPathsWithPenalty(600);
+
+    // First iteration - only access with time-penalty is expected
+    assertTrue(iterator.hasNext());
+    assertEquals(540, iterator.next());
+    expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty);
+    expect(accessPaths.arrivedOnBoardByNumOfRides(0));
+
+    // Second iteration - Done
+    assertFalse(iterator.hasNext());
+  }
+
   @Test
   void hasTimeDependentAccess() {
     var accessPaths = AccessPaths.create(

From c82b91e7b86a635d57dd05c87e40c685ecf767cb Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 7 Mar 2024 14:26:04 +0100
Subject: [PATCH 0749/1688] Revert "fix: Access without time-penalty is removed
 when access with exits."

This reverts commit b9aa5b16ad9a7d90f5b3ad1cf77c67d8a57e687f.
---
 .../rangeraptor/transit/AccessPaths.java      |  2 +-
 .../rangeraptor/transit/AccessPathsTest.java  | 36 ++-----------------
 2 files changed, 3 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
index 66b7227584d..d070a804f9c 100644
--- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
+++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
@@ -194,7 +194,7 @@ private List filterOnTimePenaltyLimitIfExist(List e.timePenalty() > iterationTimePenaltyLimit).toList();
     }
     return list;
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
index 5b4c0c89bc2..bf8e06a73d7 100644
--- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
+++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
@@ -83,7 +83,7 @@ void calculateMaxNumberOfRides() {
   }
 
   @Test
-  void iterateOverPathsWithTimePenalty() {
+  void iterateOverPathsWithPenalty() {
     // Expected at departure 540
     var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60);
 
@@ -146,7 +146,7 @@ void iterateOverPathsWithTimePenalty() {
   }
 
   @Test
-  void iterateOverPathsWithTimePenaltyInReversDirection() {
+  void iterateOverPathsWithPenaltyInReversDirection() {
     // Expected at departure 540
     var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60);
 
@@ -164,10 +164,6 @@ void iterateOverPathsWithTimePenaltyInReversDirection() {
       REVERSE
     );
 
-    // Make sure standard iterator works
-    expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_B, walkFastWithPenalty);
-    expect(accessPaths.arrivedOnBoardByNumOfRides(3), FLEX_B, flexFastWithPenalty);
-
     var iterator = accessPaths.iterateOverPathsWithPenalty(600);
 
     // First iteration
@@ -200,34 +196,6 @@ void iterateOverPathsWithTimePenaltyInReversDirection() {
     assertFalse(iterator.hasNext());
   }
 
-  @Test
-  void testRegularIteratorsAndIteratorWithPenaltyWorksTogether() {
-    var walkFastWithPenalty = WALK_FAST.withTimePenalty(60);
-
-    // Without time-penalty, the iterator should be empty
-    var accessPaths = AccessPaths.create(
-      60,
-      List.of(walkFastWithPenalty, WALK_COST),
-      MULTI_CRITERIA,
-      FORWARD
-    );
-
-    // Both accesses are expected before with enter the "time-penalty" iteration
-    expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_COST, walkFastWithPenalty);
-    expect(accessPaths.arrivedOnBoardByNumOfRides(0));
-
-    var iterator = accessPaths.iterateOverPathsWithPenalty(600);
-
-    // First iteration - only access with time-penalty is expected
-    assertTrue(iterator.hasNext());
-    assertEquals(540, iterator.next());
-    expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty);
-    expect(accessPaths.arrivedOnBoardByNumOfRides(0));
-
-    // Second iteration - Done
-    assertFalse(iterator.hasNext());
-  }
-
   @Test
   void hasTimeDependentAccess() {
     var accessPaths = AccessPaths.create(

From 87b2108bb8aee4ab9bcb1388553b3cefc0db3283 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 7 Mar 2024 14:20:41 +0100
Subject: [PATCH 0750/1688] fix: Access without time-penalty is removed when
 access with exits.

---
 .../rangeraptor/transit/AccessPaths.java      |  2 +-
 .../rangeraptor/transit/AccessPathsTest.java  | 55 ++++++++++++++++++-
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
index d070a804f9c..66b7227584d 100644
--- a/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
+++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPaths.java
@@ -194,7 +194,7 @@ private List filterOnTimePenaltyLimitIfExist(List e.timePenalty() > iterationTimePenaltyLimit).toList();
     }
     return list;
diff --git a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
index bf8e06a73d7..8611a046a5b 100644
--- a/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
+++ b/src/test/java/org/opentripplanner/raptor/rangeraptor/transit/AccessPathsTest.java
@@ -83,7 +83,7 @@ void calculateMaxNumberOfRides() {
   }
 
   @Test
-  void iterateOverPathsWithPenalty() {
+  void iterateOverPathsWithTimePenalty() {
     // Expected at departure 540
     var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60);
 
@@ -113,6 +113,25 @@ void iterateOverPathsWithPenalty() {
       FORWARD
     );
 
+    // Make sure standard iterator works
+    expect(
+      accessPaths.arrivedOnStreetByNumOfRides(0),
+      WALK_B,
+      walkFastWithPenalty,
+      walkCostWithPenalty
+    );
+    expect(accessPaths.arrivedOnBoardByNumOfRides(1));
+    expect(accessPaths.arrivedOnStreetByNumOfRides(1));
+    expect(accessPaths.arrivedOnBoardByNumOfRides(2), flexTxWithPenalty);
+    expect(accessPaths.arrivedOnStreetByNumOfRides(2), FLEX_WALK_B);
+    expect(
+      accessPaths.arrivedOnBoardByNumOfRides(3),
+      FLEX_B,
+      flexFastWithPenalty,
+      flexCostWithPenalty
+    );
+    expect(accessPaths.arrivedOnStreetByNumOfRides(3));
+
     var iterator = accessPaths.iterateOverPathsWithPenalty(600);
 
     // First iteration
@@ -146,7 +165,7 @@ void iterateOverPathsWithPenalty() {
   }
 
   @Test
-  void iterateOverPathsWithPenaltyInReversDirection() {
+  void iterateOverPathsWithTimePenaltyInReversDirection() {
     // Expected at departure 540
     var flexFastWithPenalty = FLEX_FAST.withTimePenalty(60);
 
@@ -164,6 +183,10 @@ void iterateOverPathsWithPenaltyInReversDirection() {
       REVERSE
     );
 
+    // Make sure standard iterator works
+    expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_B, walkFastWithPenalty);
+    expect(accessPaths.arrivedOnBoardByNumOfRides(3), FLEX_B, flexFastWithPenalty);
+
     var iterator = accessPaths.iterateOverPathsWithPenalty(600);
 
     // First iteration
@@ -196,6 +219,34 @@ void iterateOverPathsWithPenaltyInReversDirection() {
     assertFalse(iterator.hasNext());
   }
 
+  @Test
+  void testRegularIteratorsAndIteratorWithPenaltyWorksTogether() {
+    var walkFastWithPenalty = WALK_FAST.withTimePenalty(60);
+
+    // Without time-penalty, the iterator should be empty
+    var accessPaths = AccessPaths.create(
+      60,
+      List.of(walkFastWithPenalty, WALK_COST),
+      MULTI_CRITERIA,
+      FORWARD
+    );
+
+    // Both accesses are expected before with enter the "time-penalty" iteration
+    expect(accessPaths.arrivedOnStreetByNumOfRides(0), WALK_COST, walkFastWithPenalty);
+    expect(accessPaths.arrivedOnBoardByNumOfRides(0));
+
+    var iterator = accessPaths.iterateOverPathsWithPenalty(600);
+
+    // First iteration - only access with time-penalty is expected
+    assertTrue(iterator.hasNext());
+    assertEquals(540, iterator.next());
+    expect(accessPaths.arrivedOnStreetByNumOfRides(0), walkFastWithPenalty);
+    expect(accessPaths.arrivedOnBoardByNumOfRides(0));
+
+    // Second iteration - Done
+    assertFalse(iterator.hasNext());
+  }
+
   @Test
   void hasTimeDependentAccess() {
     var accessPaths = AccessPaths.create(

From 3934161330b392b7263bc610c65920e7a03cc9ff Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 13:43:13 +0000
Subject: [PATCH 0751/1688] fix(deps): update dependency
 org.glassfish.jaxb:jaxb-runtime to v4.0.5

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 97697b6896f..3248cfede87 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,7 +70,7 @@
         2.0.12
         2.0.15
         1.26
-        4.0.4
+        4.0.5
         
         UTF-8
         opentripplanner/OpenTripPlanner

From 70f6fe40f4058e4c1d728c4bebfa685b2a4f70a5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 7 Mar 2024 18:31:11 +0100
Subject: [PATCH 0752/1688] Don't update Azure dependency [ci skip]

---
 renovate.json5 | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/renovate.json5 b/renovate.json5
index 29e51863384..8ecbbeb565e 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -25,7 +25,8 @@
         "com.microsoft.azure:azure-servicebus",
         "com.azure.resourcemanager:azure-resourcemanager-servicebus",
         "com.azure:azure-core",
-        "com.azure:azure-messaging-servicebus"
+        "com.azure:azure-messaging-servicebus",
+        "com.azure:azure-identity"
       ],
       "enabled": false
     },

From a58862dbe628b3fcf28e87dbdbee376cd1de1591 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 7 Mar 2024 18:31:59 +0100
Subject: [PATCH 0753/1688] Fix formatting

---
 .../org/opentripplanner/framework/lang/StringUtilsTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java
index 249fe4a611e..0e67344b2bb 100644
--- a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java
+++ b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java
@@ -11,8 +11,8 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.ValueSource;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.junit.jupiter.params.provider.ValueSource;
 
 class StringUtilsTest {
 

From 961f49967c9ac615c11a17eff7cf99282744ec32 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 23:26:46 +0000
Subject: [PATCH 0754/1688] fix(deps): update dependency
 com.google.cloud:libraries-bom to v26.34.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 97697b6896f..1df69006218 100644
--- a/pom.xml
+++ b/pom.xml
@@ -545,7 +545,7 @@
                 
                 com.google.cloud
                 libraries-bom
-                26.31.0
+                26.34.0
                 pom
                 import
             

From 78a3e9cc0690df9ee0d90d60f4df74b79e0837b0 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 7 Mar 2024 18:44:59 +0100
Subject: [PATCH 0755/1688] Add srcipt to compile otp, build a graph, run
 server and perform a API call and test result

---
 script/Readme.md        |  30 ++++++++++++
 script/run-and-test-otp | 102 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 132 insertions(+)
 create mode 100644 script/Readme.md
 create mode 100755 script/run-and-test-otp

diff --git a/script/Readme.md b/script/Readme.md
new file mode 100644
index 00000000000..e750e47b595
--- /dev/null
+++ b/script/Readme.md
@@ -0,0 +1,30 @@
+# Scripts
+
+This folder is intended for various scripts used during the OTP development. They are provided 
+"as is" and the "owner" may do whatever she/he likes with it. 
+
+If you want to submit your own scripts, you need to include:
+ - A header at the beginning of the script stating who the owner is.
+ - The scrip should print some usage documentation if invoked with `--help` and `-h`.
+
+The regular pull-request approval process is required for submitting new scripts and changing 
+existing one. The reviewers are responsible for:
+ - [ ] Is this script relevant for OTP and at least one active member of the OTP community?
+ - [ ] Is the script harmful?
+ - [ ] Does the script have sufficient documentation?
+   - [ ] Owner section
+   - [ ] Print help with `-h` and `--help`
+
+### Example
+```
+# Owner: J. Brown, Fun & Fast Transit Inc
+
+if [ "$1" == "-h" ]  || [ "$1" == "--help" ]; then
+  echo "The purpouse of the script is .."
+  echo "Usage: ..."
+  echo "Parameters: "
+  :
+fi
+
+```
+
diff --git a/script/run-and-test-otp b/script/run-and-test-otp
new file mode 100755
index 00000000000..53257736531
--- /dev/null
+++ b/script/run-and-test-otp
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+## Owner: Thomas Gran, Entur AS
+
+# [ EDIT HERE ] ----------------------------------------------------------
+
+# Match or NOT Match. The script return success 0 - Good if a match is found(-l) or not found(-L)
+#   -l : Match
+#   -L : Not match
+MATCH="-L"
+
+
+# The HTTP URL query to call using curl"
+QUERY="http://localhost:8080/otp/routers/default/plan?"
+QUERY+="fromPlace=63.30959874454729%2C9.858169555664064&"
+QUERY+="toPlace=63.26723697045908%2C9.811992645263674&"
+QUERY+="time=14%3A50&date=03-07-2024&"
+QUERY+="mode=FLEX_ACCESS%2CFLEX_EGRESS%2CTRANSIT&"
+QUERY+="searchWindow=780"
+
+ACCEPT_HEADER="accept: application/json, */*"
+
+# The string token to search for"
+SEARCH_FOR="No trip found"
+
+# File catalog where the the OTP config files is (build-config.json & router-config.json)
+DATA_DIR=../data/fix-error-access
+
+# ----------------------------------------------------------- [ EDIT END ]
+
+if [ "$1" == "-h" ]  || [ "$1" == "--help" ]; then
+  echo "This script: "
+  echo "  1. Compile OTP"
+  echo "  2. Run OTP - build a graph and start the server"
+  echo "  3. Send a request using curl"
+  echo "  4. Test the response, search for a unexpected token. If the token is"
+  echo "     NOT present the test is GOOD, if not it is BAD"
+  echo ""
+  echo "You need to edit the following variables in the beginning of the script:"
+  echo "  - QUERY - the HTTP URL query to call using curl"
+  echo "  - SEARCH_FOR - The string token to search for - if it is present the test FAILS!"
+  echo "  - DATA_DIR - File catalog where the the OTP config files is (build-config.json & router-config.json)"
+  echo ""
+  echo "This script is intended used together with 'git bisect' (binary search for good and bad"
+  echo "commits), but it works well with manual changes in the code as well. When you have found"
+  echo "the bad commit, you may manually undo it line by line to find the problem."
+  echo ""
+  echo "ARGUMENTS"
+  echo "  --help | -h        : Help"
+  echo "  --skipCompile | -c : Skip Maven compile"
+  exit 0
+fi
+
+# Files used to store intermediate results - check the files if the script
+# is not working as expected.
+OTP_LOG=target/otp.log
+RESPONSE_FILE=target/response.json
+
+
+if [ "$1" != "--skipCompile" ] && [ "$1" != "-c" ]; then
+  echo "Build project with maven"
+  mvn clean package -Dps -DskipTests
+fi
+
+echo "Start OTP, output: $OTP_LOG"
+mv target/otp-*-shaded.jar target/otp-shaded.jar
+java -Xmx16G -jar target/otp-shaded.jar ${DATA_DIR}  --build --save --serve > ${OTP_LOG} &
+OTP_PID=$!
+
+tail -F ${OTP_LOG} &
+TAIL_PID=$!
+
+while ! grep "Grizzly server running" ${OTP_LOG};do echo "#";sleep 1;done
+
+echo "OTP Server up and running"
+
+echo "Query: $QUERY"
+curl -s -o ${RESPONSE_FILE} "$QUERY" -H "$ACCEPT_HEADER"
+
+echo "Test results does NOT match (-L) or match (-l)"
+grep ${MATCH} "${SEARCH_FOR}" ${RESPONSE_FILE}
+OK=$?
+
+echo "Shutdown..."
+echo "Kill Otp Server PID: ${OTP_PID}"
+kill $OTP_PID
+
+# Allow OTP to shutdown before we kill the tail and return, this is not critical it is just
+# a bit confusing if the script is done, while OTP is still writing to the console.
+sleep 3
+echo "Kill Tail PID: ${TAIL_PID}"
+kill $TAIL_PID
+
+echo ""
+
+if [ "$OK" == 0 ]; then
+  echo "Test is OK - GOOD"
+  exit 0
+else
+  echo "Test failed - BAD"
+  exit 1
+fi

From f47cface35418a26e4c394395e4d964a285847ea Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 9 Mar 2024 18:53:20 +0000
Subject: [PATCH 0756/1688] fix(deps): update dependency
 ch.poole:openinghoursparser to v0.28.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3248cfede87..59f4579f633 100644
--- a/pom.xml
+++ b/pom.xml
@@ -923,7 +923,7 @@
         
             ch.poole
             OpeningHoursParser
-            0.28.1
+            0.28.2
         
 
         

From 3a7c610c9b8efddf5d897c4de523b507730072e1 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 11 Mar 2024 10:40:19 +0000
Subject: [PATCH 0757/1688] fix(deps): update jackson.version to v2.16.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a087b091d46..d74b767a060 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         
         30.2
         2.51
-        2.16.1
+        2.16.2
         3.1.5
         5.10.2
         1.12.3

From 747246e79218fca148f9975e414e69b8d7988792 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Fri, 8 Mar 2024 17:46:32 +0100
Subject: [PATCH 0758/1688] Fix two bugs in the WorldEnvelope
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - The envelope calculation was wrong when envelope included0º (Greenwich)
 - The medianCenter was wrong when the envelope included 180º
---
 .../worldenvelope/model/WorldEnvelope.java    |  23 ++-
 .../model/WorldEnvelopeBuilder.java           |  44 ++++--
 .../model/WorldEnvelopeTest.java              | 142 ++++++++++--------
 3 files changed, 126 insertions(+), 83 deletions(-)

diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java b/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java
index 8d211fd33db..27a1fb4d30f 100644
--- a/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java
+++ b/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelope.java
@@ -6,8 +6,7 @@
 import org.opentripplanner.framework.tostring.ToStringBuilder;
 
 /**
- * This class calculates borders of envelopes that can be also on 180th meridian The same way as it
- * was previously calculated in GraphMetadata constructor
+ * This class calculates borders of envelopes that can be also on 180th meridian.
  */
 public class WorldEnvelope implements Serializable {
 
@@ -53,14 +52,6 @@ public WgsCoordinate upperRight() {
     return upperRight;
   }
 
-  /**
-   * This is the center of the Envelope including both street vertexes and transit stops
-   * if they exist.
-   */
-  public WgsCoordinate meanCenter() {
-    return meanCenter;
-  }
-
   /**
    * If transit data exist, then this is the median center of the transit stops. The median
    * is computed independently for the longitude and latitude.
@@ -68,13 +59,21 @@ public WgsCoordinate meanCenter() {
    * If not transit data exist this return `empty`.
    */
   public WgsCoordinate center() {
-    return transitMedianCenter().orElse(meanCenter);
+    return medianCenter().orElse(meanCenter);
+  }
+
+  /**
+   * This is the center of the Envelope including both street vertexes and transit stops
+   * if they exist.
+   */
+  public WgsCoordinate meanCenter() {
+    return meanCenter;
   }
 
   /**
    * Return the transit median center [if it exist] or the mean center.
    */
-  public Optional transitMedianCenter() {
+  public Optional medianCenter() {
     return Optional.ofNullable(transitMedianCenter);
   }
 
diff --git a/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java b/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java
index abddba9c5fd..7c5bf13d5e5 100644
--- a/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java
+++ b/src/main/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeBuilder.java
@@ -58,8 +58,23 @@ public  WorldEnvelopeBuilder expandToIncludeTransitEntities(
 
     var medianCalculator = new MedianCalcForDoubles(collection.size());
 
-    collection.forEach(v -> medianCalculator.add(lonProvider.apply(v)));
-    double lon = medianCalculator.median();
+    double lon = 0.0;
+    if (includeLongitude180()) {
+      collection.forEach(v -> {
+        double c = lonProvider.apply(v);
+        if (c < 0) {
+          c += 360.0;
+        }
+        medianCalculator.add(c);
+      });
+      lon = medianCalculator.median();
+      if (lon > 180.0) {
+        lon -= 180;
+      }
+    } else {
+      collection.forEach(v -> medianCalculator.add(lonProvider.apply(v)));
+      lon = medianCalculator.median();
+    }
 
     medianCalculator.reset();
     collection.forEach(v -> medianCalculator.add(latProvider.apply(v)));
@@ -79,19 +94,26 @@ public WorldEnvelope build() {
     if (minLonEast == MIN_NOT_SET) {
       return new WorldEnvelope(minLat, minLonWest, maxLat, maxLonWest, transitMedianCenter);
     }
-    // Envelope intersects with either 0º or 180º
-    double dist0 = minLonEast - minLonWest;
-    double dist180 = 360d - maxLonEast + minLonWest;
-
-    // A small gap between the east and west longitude at 0 degrees implies that the Envelope
-    // should include the 0 degrees longitude(meridian), and be split at 180 degrees.
-    if (dist0 < dist180) {
-      return new WorldEnvelope(minLat, maxLonWest, maxLat, maxLonEast, transitMedianCenter);
-    } else {
+    if (includeLongitude180()) {
       return new WorldEnvelope(minLat, minLonEast, maxLat, minLonWest, transitMedianCenter);
+    } else {
+      return new WorldEnvelope(minLat, minLonWest, maxLat, maxLonEast, transitMedianCenter);
     }
   }
 
+  /**
+   * A small gap between the east and west longitude at 180º degrees implies that the Envelope
+   * should include the 180º longitude, and be split at 0 degrees.
+   */
+  boolean includeLongitude180() {
+    if (minLonWest == MIN_NOT_SET || minLonEast == MIN_NOT_SET) {
+      return false;
+    }
+    double dist0 = minLonEast - minLonWest;
+    double dist180 = 360d - maxLonEast + minLonWest;
+    return dist180 < dist0;
+  }
+
   private WorldEnvelopeBuilder expandToInclude(double latitude, double longitude) {
     minLat = Math.min(minLat, latitude);
     maxLat = Math.max(maxLat, latitude);
diff --git a/src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java b/src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java
index bff99800fdb..136caf31a5b 100644
--- a/src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java
+++ b/src/test/java/org/opentripplanner/service/worldenvelope/model/WorldEnvelopeTest.java
@@ -5,6 +5,9 @@
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 
 class WorldEnvelopeTest {
@@ -18,83 +21,102 @@ class WorldEnvelopeTest {
   private static final int W60 = -60;
   private static final int W170 = -170;
 
-  private static final WorldEnvelope EAST = WorldEnvelope
-    .of()
-    .expandToIncludeStreetEntities(S10, E50)
-    .expandToIncludeStreetEntities(S20, E160)
-    .build();
-  private static final WorldEnvelope WEST = WorldEnvelope
-    .of()
-    .expandToIncludeStreetEntities(N30, W60)
-    .expandToIncludeStreetEntities(N40, W170)
-    .build();
-  private static final WorldEnvelope GREENWICH = WorldEnvelope
-    .of()
-    .expandToIncludeStreetEntities(N30, W60)
-    .expandToIncludeStreetEntities(S10, E50)
-    .build();
-  private static final WorldEnvelope MERIDIAN_180 = WorldEnvelope
-    .of()
-    .expandToIncludeStreetEntities(N40, W170)
-    .expandToIncludeStreetEntities(S20, E160)
-    .build();
-
-  @Test
-  void testEast() {
-    var expectedCenter = new WgsCoordinate(-15d, 105d);
-
-    assertEquals(S20, EAST.lowerLeft().latitude());
-    assertEquals(E50, EAST.lowerLeft().longitude());
-    assertEquals(S10, EAST.upperRight().latitude());
-    assertEquals(E160, EAST.upperRight().longitude());
-    assertEquals(expectedCenter, EAST.meanCenter());
-    assertEquals(expectedCenter, EAST.center());
-    assertTrue(EAST.transitMedianCenter().isEmpty());
+  /**
+   * To make sure we cover all cases we add a case for each combination of:
+   *  - latitude
+   *    - south hemisphere
+   *    - north hemisphere
+   *    - both sides of the equator
+   *  - longitude
+   *    - east side of 0º (Greenwich)
+   *    - west side of 0º
+   *    - both sides of 0º
+   *    - both sides of 180º
+   * Skip cases for North- and South-pole - not relevant - obscure cases)
+   */
+  static List testCases() {
+    return List.of(
+      // name, lower-lat, left-lon, upper-lat, right-lon, center-lat, center-lon
+      Arguments.of("South-East", S20, E50, S10, E160, -15d, 105d),
+      Arguments.of("Equator-East", S10, E50, N30, E160, 10d, 105d),
+      Arguments.of("North-East", N30, E50, N40, E160, 35d, 105d),
+      Arguments.of("South-West", S20, W170, S10, W60, -15d, -115d),
+      Arguments.of("Equator-West", S10, W170, N30, W60, 10d, -115d),
+      Arguments.of("North-West", N30, W170, N40, W60, 35d, -115d),
+      Arguments.of("North-Greenwich", N30, W60, N40, E50, 35d, -5d),
+      Arguments.of("Equator-Greenwich", S10, W60, N30, E50, 10d, -5d),
+      Arguments.of("South-Greenwich", S20, W60, S10, E50, -15d, -5d),
+      Arguments.of("North-180º", N30, E160, N40, W170, 35d, 175d),
+      Arguments.of("Equator-180º", S10, E160, N30, W170, 10d, 175d),
+      Arguments.of("South-180º", S20, E160, S10, W170, -15d, 175d)
+    );
   }
 
-  @Test
-  void transitMedianCenter() {
-    var expectedCenter = new WgsCoordinate(S10, E50);
+  @ParameterizedTest
+  @MethodSource("testCases")
+  void testWorldEnvelope(
+    String name,
+    double lowerLat,
+    double leftLon,
+    double upperLat,
+    double rightLon,
+    double centerLat,
+    double centerLon
+  ) {
+    // Add a point close to the center
+    var median = new WgsCoordinate(centerLat + 1.0, centerLon + 1.0);
 
-    var subject = WorldEnvelope
+    // WorldEnvelope should normalize to lower-left and upper-right
+    // Add lower-right & upper-left the world-envelope
+    var subjectWithoutMedian = WorldEnvelope
+      .of()
+      .expandToIncludeStreetEntities(lowerLat, rightLon)
+      .expandToIncludeStreetEntities(upperLat, leftLon)
+      .build();
+    // Add the ~middle point between each corner of the envelope + median point
+    // We offset the one center value to the "other" side of the median by adding 2.0
+    var subjectWithMedian = WorldEnvelope
       .of()
       .expandToIncludeTransitEntities(
         List.of(
-          new WgsCoordinate(S10, E50),
-          new WgsCoordinate(S20, E160),
-          new WgsCoordinate(N40, W60)
+          new WgsCoordinate(upperLat, centerLon),
+          new WgsCoordinate(lowerLat, centerLon + 2d),
+          new WgsCoordinate(centerLat, rightLon),
+          new WgsCoordinate(centerLat + 2d, leftLon),
+          median
         ),
         WgsCoordinate::latitude,
         WgsCoordinate::longitude
       )
       .build();
 
-    assertTrue(subject.transitMedianCenter().isPresent(), subject.transitMedianCenter().toString());
-    assertEquals(expectedCenter, subject.transitMedianCenter().get());
-    assertEquals(expectedCenter, subject.center());
-    assertEquals(
-      "WorldEnvelope{lowerLeft: (-20.0, -60.0), upperRight: (40.0, 160.0), meanCenter: (10.0, 50.0), transitMedianCenter: (-10.0, 50.0)}",
-      subject.toString()
+    for (WorldEnvelope subject : List.of(subjectWithoutMedian, subjectWithMedian)) {
+      assertEquals(lowerLat, subject.lowerLeft().latitude(), name + " lower-latitude");
+      assertEquals(leftLon, subject.lowerLeft().longitude(), name + " left-longitude");
+      assertEquals(upperLat, subject.upperRight().latitude(), name + " upper-latitude");
+      assertEquals(rightLon, subject.upperRight().longitude(), name + " right-longitude");
+      assertEquals(centerLat, subject.meanCenter().latitude(), name + " center-latitude");
+      assertEquals(centerLon, subject.meanCenter().longitude(), name + " center-longitude");
+    }
+
+    assertTrue(
+      subjectWithoutMedian.medianCenter().isEmpty(),
+      "First envelope does not have a median"
     );
+    assertTrue(subjectWithMedian.medianCenter().isPresent(), "Second envelope does have a median");
+    assertEquals(median, subjectWithMedian.medianCenter().get(), name + " median");
   }
 
   @Test
-  void testToString() {
-    assertEquals(
-      "WorldEnvelope{lowerLeft: (-20.0, 50.0), upperRight: (-10.0, 160.0), meanCenter: (-15.0, 105.0)}",
-      EAST.toString()
-    );
-    assertEquals(
-      "WorldEnvelope{lowerLeft: (30.0, -170.0), upperRight: (40.0, -60.0), meanCenter: (35.0, -115.0)}",
-      WEST.toString()
-    );
-    assertEquals(
-      "WorldEnvelope{lowerLeft: (-10.0, -60.0), upperRight: (30.0, 50.0), meanCenter: (10.0, -5.0)}",
-      GREENWICH.toString()
-    );
+  void testWorldEnvelopeToString() {
     assertEquals(
-      "WorldEnvelope{lowerLeft: (-20.0, 160.0), upperRight: (40.0, -170.0), meanCenter: (10.0, 175.0)}",
-      MERIDIAN_180.toString()
+      "WorldEnvelope{lowerLeft: (-10.0, -60.0), upperRight: (40.0, 50.0), meanCenter: (15.0, -5.0)}",
+      WorldEnvelope
+        .of()
+        .expandToIncludeStreetEntities(S10, E50)
+        .expandToIncludeStreetEntities(N40, W60)
+        .build()
+        .toString()
     );
   }
 }

From bd702cda23caf0b09aa342c932268f955a11469b Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 11 Mar 2024 12:58:43 +0100
Subject: [PATCH 0759/1688] Apply review feedback

---
 .../opentripplanner/standalone/OTPMain.java   | 21 ++++++++++++-------
 .../standalone/config/BuildConfig.java        |  4 ++--
 .../standalone/config/ConfigModel.java        |  8 +++----
 .../standalone/config/OtpConfig.java          |  4 ++--
 .../standalone/config/RouterConfig.java       |  4 ++--
 .../config/framework/json/NodeAdapter.java    |  2 +-
 .../framework/json/NodeAdapterTest.java       |  4 ++--
 7 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/opentripplanner/standalone/OTPMain.java b/src/main/java/org/opentripplanner/standalone/OTPMain.java
index badfb73443d..eef7415644d 100644
--- a/src/main/java/org/opentripplanner/standalone/OTPMain.java
+++ b/src/main/java/org/opentripplanner/standalone/OTPMain.java
@@ -13,6 +13,7 @@
 import org.opentripplanner.raptor.configure.RaptorConfig;
 import org.opentripplanner.routing.graph.SerializedGraphObject;
 import org.opentripplanner.standalone.config.CommandLineParameters;
+import org.opentripplanner.standalone.config.ConfigModel;
 import org.opentripplanner.standalone.configure.ConstructApplication;
 import org.opentripplanner.standalone.configure.LoadApplication;
 import org.opentripplanner.standalone.server.GrizzlyServer;
@@ -113,13 +114,7 @@ private static void startOTPServer(CommandLineParameters cli) {
     var loadApp = new LoadApplication(cli);
     var config = loadApp.config();
 
-    // optionally check if the config is valid and if not abort the startup process
-    if (cli.configCheck && config.hasInvalidProperties()) {
-      throw new OtpAppException(
-        "Configuration contains invalid properties (see above for details). " +
-        "Please fix your configuration or remove --configCheck from your OTP CLI parameters."
-      );
-    }
+    detectUnusedConfigParams(cli, config);
 
     // Validate data sources, command line arguments and config before loading and
     // processing input data to fail early
@@ -180,6 +175,18 @@ private static void startOTPServer(CommandLineParameters cli) {
     }
   }
 
+  /**
+   * Optionally, check if the config is valid and if not abort the startup process.
+   */
+  private static void detectUnusedConfigParams(CommandLineParameters cli, ConfigModel config) {
+    if (cli.configCheck && config.hasIUnknownProperties()) {
+      throw new OtpAppException(
+        "Configuration contains invalid properties (see above for details). " +
+        "Please fix your configuration or remove --configCheck from your OTP CLI parameters."
+      );
+    }
+  }
+
   private static void startOtpWebServer(CommandLineParameters params, ConstructApplication app) {
     // Index graph for travel search
     app.transitModel().index();
diff --git a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
index 6ebd15019eb..b6912488173 100644
--- a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
@@ -723,7 +723,7 @@ public NodeAdapter asNodeAdapter() {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasInvalidProperties() {
-    return root.hasInvalidProperties();
+  public boolean hasUnknownProperties() {
+    return root.hasUnknownProperties();
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
index 820737ec8f9..a9506ed514e 100644
--- a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
+++ b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
@@ -109,11 +109,11 @@ public static void initializeOtpFeatures(OtpConfig otpConfig) {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasInvalidProperties() {
+  public boolean hasIUnknownProperties() {
     return (
-      otpConfig.hasInvalidProperties() ||
-      buildConfig.hasInvalidProperties() ||
-      routerConfig.hasInvalidProperties()
+      otpConfig.hasUnknownProperties() ||
+      buildConfig.hasUnknownProperties() ||
+      routerConfig.hasUnknownProperties()
     );
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
index bb361c15d4f..29f866123e3 100644
--- a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
@@ -75,7 +75,7 @@ public OtpConfig(NodeAdapter nodeAdapter, boolean logUnusedParams) {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasInvalidProperties() {
-    return root.hasInvalidProperties();
+  public boolean hasUnknownProperties() {
+    return root.hasUnknownProperties();
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
index d4df555c600..ee8c46aa447 100644
--- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
@@ -154,7 +154,7 @@ public String toString() {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasInvalidProperties() {
-    return root.hasInvalidProperties();
+  public boolean hasUnknownProperties() {
+    return root.hasUnknownProperties();
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
index 7a097b2edff..930b5c1799f 100644
--- a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
+++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
@@ -175,7 +175,7 @@ public void logAllWarnings(Consumer logger) {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasInvalidProperties() {
+  public boolean hasUnknownProperties() {
     return !unusedParams().isEmpty() || !allWarnings().toList().isEmpty();
   }
 
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
index 71bb9d380a2..4ab5545cc23 100644
--- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
+++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
@@ -569,7 +569,7 @@ void invalidProperties() {
       // When: Access ONLY parameter 'a', but not 'b'
       subject.of("foo").asObject().of("a").asBoolean();
 
-      assertTrue(subject.hasInvalidProperties());
+      assertTrue(subject.hasUnknownProperties());
     }
 
     @Test
@@ -581,7 +581,7 @@ void valid() {
       object.of("a").asBoolean();
       object.of("b").asBoolean();
 
-      assertFalse(subject.hasInvalidProperties());
+      assertFalse(subject.hasUnknownProperties());
     }
   }
 

From d3f467d1ab3567aac9c609918e70cfc88fbf1643 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 11 Mar 2024 14:31:28 +0200
Subject: [PATCH 0760/1688] Only run removal of old leftovers if DIFFERENTIAL
 update

---
 .../updater/trip/TimetableSnapshotSource.java | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index 1c2013f789d..eefa704b43d 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -271,17 +271,16 @@ public UpdateResult applyTripUpdates(
           // starts for example at 40:00, yesterday would probably be a better guess.
           serviceDate = localDateNow.get();
         }
-
-        // Check whether trip id has been used for previously ADDED trip message and mark previously
-        // created trip as DELETED
-        var canceledPreviouslyAddedTrip = cancelPreviouslyAddedTrip(
-          tripId,
-          serviceDate,
-          CancelationType.DELETE
-        );
-        // Remove previous realtime updates for this trip. This is necessary to avoid previous
-        // stop pattern modifications from persisting
-        this.buffer.removePreviousRealtimeUpdate(tripId, serviceDate);
+        var canceledPreviouslyAddedTrip = false;
+        if (!fullDataset) {
+          // Check whether trip id has been used for previously ADDED trip message and mark previously
+          // created trip as DELETED
+          canceledPreviouslyAddedTrip =
+            cancelPreviouslyAddedTrip(tripId, serviceDate, CancelationType.DELETE);
+          // Remove previous realtime updates for this trip. This is necessary to avoid previous
+          // stop pattern modifications from persisting
+          this.buffer.removePreviousRealtimeUpdate(tripId, serviceDate);
+        }
 
         uIndex += 1;
         LOG.debug("trip update #{} ({} updates) :", uIndex, tripUpdate.getStopTimeUpdateCount());

From e6ba88e461f5220a97a1ea6f3165850ac4eabef5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 11 Mar 2024 13:14:56 +0100
Subject: [PATCH 0761/1688] Update documentation

---
 docs/Migrating-Configuration.md | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/Migrating-Configuration.md b/docs/Migrating-Configuration.md
index 0d40faf74e8..54b34ae4719 100644
--- a/docs/Migrating-Configuration.md
+++ b/docs/Migrating-Configuration.md
@@ -16,10 +16,20 @@ to be a configuration error, perhaps because the schema was changed. In such a c
 consult the [feature](Configuration.md#otp-features), [router](RouterConfiguration.md) or 
 [build configuration documentation](BuildConfiguration.md) to find out what the new schema looks like.
 
+By default, OTP starts up even when unknown configuration parameters have been found. This is there
+to support the style deployment where old config parameters remain in the file for a certain migration 
+period.  
+
+This allows you to roll back the OTP version without the need to roll back the OTP configuration. 
+
+An example: you change the location of the graphs, a critical error occurs afterwards and you need to 
+roll back. Any member of the dev-ops team should then be confident that they can roll back without 
+risk - even if the environment changed.
+
 ### Aborting on invalid configuration
 
-If you want OTP to abort the startup when encountering invalid configuration, you can add the flag
-`--configCheck` to your regular OTP CLI commands.
+If you want OTP to abort the startup when encountering unknown configuration parameters, you can add 
+the flag `--configCheck` to your regular OTP CLI commands.
 
 This should of course be used wisely as it can also accidentally make your production instances refuse 
 to start up.

From d1fb0707cf0d92d089706466febd447fbbc22895 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 11 Mar 2024 17:54:21 +0200
Subject: [PATCH 0762/1688] Apply suggestions from code review

Co-authored-by: Leonard Ehrenfried 
---
 .../java/org/opentripplanner/apis/gtfs/GraphQLScalars.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
index ee49b30b8a8..d71582e651c 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
@@ -346,7 +346,7 @@ public Grams parseLiteral(Object input) throws CoercingParseLiteralException {
         public Double serialize(@Nonnull Object dataFetcherResult)
           throws CoercingSerializeException {
           var validationException = new CoercingSerializeException(
-            "Value is under 0 or greater than 1."
+            "Value is less than 0 or greater than 1."
           );
           if (dataFetcherResult instanceof Double doubleValue) {
             return validateRatio(doubleValue).orElseThrow(() -> validationException);
@@ -366,7 +366,7 @@ public Double parseValue(Object input) throws CoercingParseValueException {
           if (input instanceof Double doubleValue) {
             return validateRatio(doubleValue)
               .orElseThrow(() ->
-                new CoercingParseValueException("Value is under 0 or greater than 1.")
+                new CoercingParseValueException("Value is less than 0 or greater than 1.")
               );
           }
           throw new CoercingParseValueException(

From e5f1d23dd13f43eb48f7e4b9e9b57589fb403a45 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 11 Mar 2024 17:55:43 +0200
Subject: [PATCH 0763/1688] Make new plan deprecated temporarily instead of the
 old one

---
 .../resources/org/opentripplanner/apis/gtfs/schema.graphqls   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 70c15ecbda2..c1c5c0d2b92 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -4152,7 +4152,7 @@ type QueryType {
         used correctly to get meaningful itineraries).
         """
         startTransitTripId: String @deprecated(reason: "Not implemented in OTP2")
-    ): Plan @async @deprecated(reason: "Use planConnection instead")
+    ): Plan @async
 
     """
     Plan (itinerary) search that follows
@@ -4267,7 +4267,7 @@ type QueryType {
         and should be used together with the `before` parameter.
         """
         last: Int
-    ): PlanConnection @async
+    ): PlanConnection @async @deprecated(reason: "Experimental and can include breaking changes, use plan instead")
 }
 
 enum RealtimeState {

From 539b3dedb11b8570ad03d1f7b93472ef37748961 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 11 Mar 2024 18:14:45 +0200
Subject: [PATCH 0764/1688] Use CollectionUtils isEmpty

---
 .../apis/gtfs/mapping/RouteRequestMapper.java | 25 ++++++++++---------
 .../framework/collection/CollectionUtils.java | 13 ++++++++++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
index e2833767d1f..830fb5390f9 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
@@ -13,6 +13,7 @@
 import javax.annotation.Nullable;
 import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.framework.collection.CollectionUtils;
 import org.opentripplanner.framework.graphql.GraphQLUtils;
 import org.opentripplanner.framework.time.DurationUtils;
 import org.opentripplanner.model.GenericLocation;
@@ -157,7 +158,7 @@ private static void setTransitPreferences(
   ) {
     var modes = args.getGraphQLModes();
     var transit = getTransitModes(environment);
-    if (!Boolean.TRUE.equals(modes.getGraphQLDirectOnly()) && transit.size() > 0) {
+    if (!Boolean.TRUE.equals(modes.getGraphQLDirectOnly()) && !CollectionUtils.isEmpty(transit)) {
       var reluctanceForMode = transit
         .stream()
         .filter(mode -> mode.containsKey("cost"))
@@ -391,11 +392,11 @@ private static void setBicycleRentalPreferences(
   ) {
     if (args != null) {
       var allowedNetworks = args.getGraphQLAllowedNetworks();
-      if (allowedNetworks != null && allowedNetworks.size() > 0) {
+      if (!CollectionUtils.isEmpty(allowedNetworks)) {
         preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
       }
       var bannedNetworks = args.getGraphQLBannedNetworks();
-      if (bannedNetworks != null && bannedNetworks.size() > 0) {
+      if (!CollectionUtils.isEmpty(bannedNetworks)) {
         preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
       }
       var destinationPolicy = args.getGraphQLDestinationBicyclePolicy();
@@ -485,11 +486,11 @@ private static void setCarRentalPreferences(
   ) {
     if (args != null) {
       var allowedNetworks = args.getGraphQLAllowedNetworks();
-      if (allowedNetworks != null && allowedNetworks.size() > 0) {
+      if (!CollectionUtils.isEmpty(allowedNetworks)) {
         preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
       }
       var bannedNetworks = args.getGraphQLBannedNetworks();
-      if (bannedNetworks != null && bannedNetworks.size() > 0) {
+      if (!CollectionUtils.isEmpty(bannedNetworks)) {
         preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
       }
     }
@@ -520,11 +521,11 @@ private static void setScooterRentalPreferences(
   ) {
     if (args != null) {
       var allowedNetworks = args.getGraphQLAllowedNetworks();
-      if (allowedNetworks != null && allowedNetworks.size() > 0) {
+      if (!CollectionUtils.isEmpty(allowedNetworks)) {
         preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
       }
       var bannedNetworks = args.getGraphQLBannedNetworks();
-      if (bannedNetworks != null && bannedNetworks.size() > 0) {
+      if (!CollectionUtils.isEmpty(bannedNetworks)) {
         preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
       }
       var destinationPolicy = args.getGraphQLDestinationScooterPolicy();
@@ -616,7 +617,7 @@ private static void setModes(
     var direct = modesInput.getGraphQLDirect();
     if (Boolean.TRUE.equals(modesInput.getGraphQLTransitOnly())) {
       journey.direct().setMode(StreetMode.NOT_SET);
-    } else if (direct != null && direct.size() > 0) {
+    } else if (!CollectionUtils.isEmpty(direct)) {
       journey.direct().setMode(DirectModeMapper.map(direct.getFirst()));
     }
 
@@ -625,23 +626,23 @@ private static void setModes(
       journey.transit().disable();
     } else if (transit != null) {
       var access = transit.getGraphQLAccess();
-      if (access != null && access.size() > 0) {
+      if (!CollectionUtils.isEmpty(access)) {
         journey.access().setMode(AccessModeMapper.map(access.getFirst()));
       }
 
       var egress = transit.getGraphQLEgress();
-      if (egress != null && egress.size() > 0) {
+      if (!CollectionUtils.isEmpty(egress)) {
         journey.egress().setMode(EgressModeMapper.map(egress.getFirst()));
       }
 
       var transfer = transit.getGraphQLTransfer();
-      if (transfer != null && transfer.size() > 0) {
+      if (!CollectionUtils.isEmpty(transfer)) {
         journey.transfer().setMode(TransferModeMapper.map(transfer.getFirst()));
       }
       validateStreetModes(journey);
 
       var transitModes = getTransitModes(environment);
-      if (transitModes.size() > 0) {
+      if (!CollectionUtils.isEmpty(transitModes)) {
         var filterRequestBuilder = TransitFilterRequest.of();
         var mainAndSubModes = transitModes
           .stream()
diff --git a/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java b/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java
index 1edbfc527d1..b34db13e270 100644
--- a/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java
+++ b/src/main/java/org/opentripplanner/framework/collection/CollectionUtils.java
@@ -32,4 +32,17 @@ public static  String toString(@Nullable Collection c, String nullText) {
     }
     return stream.collect(Collectors.joining(", ", "[", "]"));
   }
+
+  /**
+   * A null-safe version of isEmpty() for a collection.
+   * 
      
+   * If the collection is {@code null} then {@code true} is returned.
+   * 
      
+   * If the collection is empty then {@code true} is returned.
+   * 
      
+   * Otherwise {@code false} is returned.
+   */
+  public static boolean isEmpty(@Nullable Collection c) {
+    return c == null || c.isEmpty();
+  }
 }

From ba773384e38be52d846f34b061f703cb1e3c9a13 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 11 Mar 2024 18:23:53 +0200
Subject: [PATCH 0765/1688] Don't override existing preferences if undefined in
 request

---
 .../apis/gtfs/mapping/RouteRequestMapper.java | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
index 830fb5390f9..de167ff281c 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
@@ -221,15 +221,17 @@ private static void setTransitPreferences(
       var timetable = transitArgs.getGraphQLTimetable();
       if (timetable != null) {
         var excludeUpdates = timetable.getGraphQLExcludeRealTimeUpdates();
-        transitPreferences.setIgnoreRealtimeUpdates(Boolean.TRUE.equals(excludeUpdates));
+        if (excludeUpdates != null) {
+          transitPreferences.setIgnoreRealtimeUpdates(excludeUpdates);
+        }
         var includePlannedCancellations = timetable.getGraphQLIncludePlannedCancellations();
-        transitPreferences.setIncludePlannedCancellations(
-          Boolean.TRUE.equals(includePlannedCancellations)
-        );
+        if (includePlannedCancellations != null) {
+          transitPreferences.setIncludePlannedCancellations(includePlannedCancellations);
+        }
         var includeRealtimeCancellations = timetable.getGraphQLIncludeRealTimeCancellations();
-        transitPreferences.setIncludeRealtimeCancellations(
-          Boolean.TRUE.equals(includeRealtimeCancellations)
-        );
+        if (includeRealtimeCancellations != null) {
+          transitPreferences.setIncludeRealtimeCancellations(includeRealtimeCancellations);
+        }
       }
     }
   }
@@ -402,7 +404,9 @@ private static void setBicycleRentalPreferences(
       var destinationPolicy = args.getGraphQLDestinationBicyclePolicy();
       if (destinationPolicy != null) {
         var allowed = destinationPolicy.getGraphQLAllowKeeping();
-        preferences.withAllowArrivingInRentedVehicleAtDestination(Boolean.TRUE.equals(allowed));
+        if (allowed != null) {
+          preferences.withAllowArrivingInRentedVehicleAtDestination(allowed);
+        }
         var cost = destinationPolicy.getGraphQLKeepingCost();
         if (cost != null) {
           preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds());
@@ -531,7 +535,9 @@ private static void setScooterRentalPreferences(
       var destinationPolicy = args.getGraphQLDestinationScooterPolicy();
       if (destinationPolicy != null) {
         var allowed = destinationPolicy.getGraphQLAllowKeeping();
-        preferences.withAllowArrivingInRentedVehicleAtDestination(Boolean.TRUE.equals(allowed));
+        if (allowed != null) {
+          preferences.withAllowArrivingInRentedVehicleAtDestination(allowed);
+        }
         var cost = destinationPolicy.getGraphQLKeepingCost();
         if (cost != null) {
           preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds());

From 163b0aaa2c9ff630b263cf9ac4a148a111e3594e Mon Sep 17 00:00:00 2001
From: Johan Torin 
Date: Mon, 4 Dec 2023 11:45:41 +0100
Subject: [PATCH 0766/1688] Adjust SIRI ServiceBus-client parameters to improve
 performance

* Move to ServiceBusReceiveMode.RECEIVE_AND_DELETE instead of PEEK_LOCK.
  In this mode the message is deleted from the subscription as soon as
  it has been delivered. In case of an error this means that the message
  is lost but 1) the data is applied to the graph in another thread anyway
  and 2) there is nothing that indicates that a second attempt on the same
  message data would be more successful.
* Fetch more than one message at a time, greatly improving message throughput
  even with small values. Roundtrip latency of the message fetching can
  in some situations otherwise lead to the client falling behind.
  Add config parameter 'prefetchCount' with a default value of 10 messages.
* Lower the AutoDeleteOnIdle of subscriptions from one day to default one hour,
  still a conservative value. Despite having automatic removal of subscriptions on
  shutdown, lingering subscriptions may still happen, for example if the JVM dies.
  Add config parameter 'autoDeleteOnIdle' with a default value of one hour.
---
 docs/sandbox/siri/SiriAzureUpdater.md         | 62 ++++++++++---------
 .../azure/AbstractAzureSiriUpdater.java       | 17 +++--
 .../azure/SiriAzureUpdaterParameters.java     | 20 ++++++
 .../azure/SiriAzureUpdaterConfig.java         | 15 +++++
 4 files changed, 81 insertions(+), 33 deletions(-)

diff --git a/docs/sandbox/siri/SiriAzureUpdater.md b/docs/sandbox/siri/SiriAzureUpdater.md
index 75aa58897ec..3b5c536946d 100644
--- a/docs/sandbox/siri/SiriAzureUpdater.md
+++ b/docs/sandbox/siri/SiriAzureUpdater.md
@@ -21,20 +21,22 @@ To enable the SIRI updater you need to add it to the updaters section of the `ro
 
 
 
-| Config Parameter                                           |    Type   | Summary                                                        |  Req./Opt. | Default Value       | Since |
-|------------------------------------------------------------|:---------:|----------------------------------------------------------------|:----------:|---------------------|:-----:|
-| type = "siri-azure-et-updater"                             |   `enum`  | The type of the updater.                                       | *Required* |                     |  1.5  |
-| [authenticationType](#u__11__authenticationType)           |   `enum`  | Which authentication type to use                               | *Optional* | `"sharedaccesskey"` |  2.5  |
-| [customMidnight](#u__11__customMidnight)                   | `integer` | Time on which time breaks into new day.                        | *Optional* | `0`                 |  2.2  |
-| feedId                                                     |  `string` | The ID of the feed to apply the updates to.                    | *Optional* |                     |  2.2  |
-| [fullyQualifiedNamespace](#u__11__fullyQualifiedNamespace) |  `string` | Service Bus fully qualified namespace used for authentication. | *Optional* |                     |  2.5  |
-| fuzzyTripMatching                                          | `boolean` | Whether to apply fuzzyTripMatching on the updates              | *Optional* | `false`             |  2.2  |
-| [servicebus-url](#u__11__servicebus_url)                   |  `string` | Service Bus connection used for authentication.                | *Optional* |                     |  2.2  |
-| topic                                                      |  `string` | Service Bus topic to connect to.                               | *Optional* |                     |  2.2  |
-| history                                                    |  `object` | Configuration for fetching historical data on startup          | *Optional* |                     |  2.2  |
-|    fromDateTime                                            |  `string` | Datetime boundary for historical data                          | *Optional* | `"-P1D"`            |  2.2  |
-|    timeout                                                 | `integer` | Timeout in milliseconds                                        | *Optional* | `300000`            |   na  |
-|    url                                                     |  `string` | Endpoint to fetch from                                         | *Optional* |                     |   na  |
+| Config Parameter                                           |    Type    | Summary                                                          |  Req./Opt. | Default Value       | Since |
+|------------------------------------------------------------|:----------:|------------------------------------------------------------------|:----------:|---------------------|:-----:|
+| type = "siri-azure-et-updater"                             |   `enum`   | The type of the updater.                                         | *Required* |                     |  1.5  |
+| [authenticationType](#u__11__authenticationType)           |   `enum`   | Which authentication type to use                                 | *Optional* | `"sharedaccesskey"` |  2.5  |
+| autoDeleteOnIdle                                           | `duration` | The time after which an inactive subscription is removed.        | *Optional* | `"PT1H"`            |  2.5  |
+| [customMidnight](#u__11__customMidnight)                   |  `integer` | Time on which time breaks into new day.                          | *Optional* | `0`                 |  2.2  |
+| feedId                                                     |  `string`  | The ID of the feed to apply the updates to.                      | *Optional* |                     |  2.2  |
+| [fullyQualifiedNamespace](#u__11__fullyQualifiedNamespace) |  `string`  | Service Bus fully qualified namespace used for authentication.   | *Optional* |                     |  2.5  |
+| fuzzyTripMatching                                          |  `boolean` | Whether to apply fuzzyTripMatching on the updates                | *Optional* | `false`             |  2.2  |
+| prefetchCount                                              |  `integer` | The number of messages to fetch from the subscription at a time. | *Optional* | `10`                |  2.5  |
+| [servicebus-url](#u__11__servicebus_url)                   |  `string`  | Service Bus connection used for authentication.                  | *Optional* |                     |  2.2  |
+| topic                                                      |  `string`  | Service Bus topic to connect to.                                 | *Optional* |                     |  2.2  |
+| history                                                    |  `object`  | Configuration for fetching historical data on startup            | *Optional* |                     |  2.2  |
+|    fromDateTime                                            |  `string`  | Datetime boundary for historical data                            | *Optional* | `"-P1D"`            |  2.2  |
+|    timeout                                                 |  `integer` | Timeout in milliseconds                                          | *Optional* | `300000`            |   na  |
+|    url                                                     |  `string`  | Endpoint to fetch from                                           | *Optional* |                     |   na  |
 
 
 ##### Parameter details
@@ -107,21 +109,23 @@ Has to be present for authenticationMethod SharedAccessKey. This should be Prima
 
 
 
-| Config Parameter                                           |    Type   | Summary                                                        |  Req./Opt. | Default Value       | Since |
-|------------------------------------------------------------|:---------:|----------------------------------------------------------------|:----------:|---------------------|:-----:|
-| type = "siri-azure-sx-updater"                             |   `enum`  | The type of the updater.                                       | *Required* |                     |  1.5  |
-| [authenticationType](#u__10__authenticationType)           |   `enum`  | Which authentication type to use                               | *Optional* | `"sharedaccesskey"` |  2.5  |
-| [customMidnight](#u__10__customMidnight)                   | `integer` | Time on which time breaks into new day.                        | *Optional* | `0`                 |  2.2  |
-| feedId                                                     |  `string` | The ID of the feed to apply the updates to.                    | *Optional* |                     |  2.2  |
-| [fullyQualifiedNamespace](#u__10__fullyQualifiedNamespace) |  `string` | Service Bus fully qualified namespace used for authentication. | *Optional* |                     |  2.5  |
-| fuzzyTripMatching                                          | `boolean` | Whether to apply fuzzyTripMatching on the updates              | *Optional* | `false`             |  2.2  |
-| [servicebus-url](#u__10__servicebus_url)                   |  `string` | Service Bus connection used for authentication.                | *Optional* |                     |  2.2  |
-| topic                                                      |  `string` | Service Bus topic to connect to.                               | *Optional* |                     |  2.2  |
-| history                                                    |  `object` | Configuration for fetching historical data on startup          | *Optional* |                     |  2.2  |
-|    fromDateTime                                            |  `string` | Datetime boundary for historical data.                         | *Optional* | `"-P1D"`            |  2.2  |
-|    timeout                                                 | `integer` | Timeout in milliseconds                                        | *Optional* | `300000`            |   na  |
-|    toDateTime                                              |  `string` | Datetime boundary for historical data.                         | *Optional* | `"P1D"`             |  2.2  |
-|    url                                                     |  `string` | Endpoint to fetch from                                         | *Optional* |                     |   na  |
+| Config Parameter                                           |    Type    | Summary                                                          |  Req./Opt. | Default Value       | Since |
+|------------------------------------------------------------|:----------:|------------------------------------------------------------------|:----------:|---------------------|:-----:|
+| type = "siri-azure-sx-updater"                             |   `enum`   | The type of the updater.                                         | *Required* |                     |  1.5  |
+| [authenticationType](#u__10__authenticationType)           |   `enum`   | Which authentication type to use                                 | *Optional* | `"sharedaccesskey"` |  2.5  |
+| autoDeleteOnIdle                                           | `duration` | The time after which an inactive subscription is removed.        | *Optional* | `"PT1H"`            |  2.5  |
+| [customMidnight](#u__10__customMidnight)                   |  `integer` | Time on which time breaks into new day.                          | *Optional* | `0`                 |  2.2  |
+| feedId                                                     |  `string`  | The ID of the feed to apply the updates to.                      | *Optional* |                     |  2.2  |
+| [fullyQualifiedNamespace](#u__10__fullyQualifiedNamespace) |  `string`  | Service Bus fully qualified namespace used for authentication.   | *Optional* |                     |  2.5  |
+| fuzzyTripMatching                                          |  `boolean` | Whether to apply fuzzyTripMatching on the updates                | *Optional* | `false`             |  2.2  |
+| prefetchCount                                              |  `integer` | The number of messages to fetch from the subscription at a time. | *Optional* | `10`                |  2.5  |
+| [servicebus-url](#u__10__servicebus_url)                   |  `string`  | Service Bus connection used for authentication.                  | *Optional* |                     |  2.2  |
+| topic                                                      |  `string`  | Service Bus topic to connect to.                                 | *Optional* |                     |  2.2  |
+| history                                                    |  `object`  | Configuration for fetching historical data on startup            | *Optional* |                     |  2.2  |
+|    fromDateTime                                            |  `string`  | Datetime boundary for historical data.                           | *Optional* | `"-P1D"`            |  2.2  |
+|    timeout                                                 |  `integer` | Timeout in milliseconds                                          | *Optional* | `300000`            |   na  |
+|    toDateTime                                              |  `string`  | Datetime boundary for historical data.                           | *Optional* | `"P1D"`             |  2.2  |
+|    url                                                     |  `string`  | Endpoint to fetch from                                           | *Optional* |                     |   na  |
 
 
 ##### Parameter details
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
index f96941c7370..3a600a755b1 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
@@ -10,6 +10,7 @@
 import com.azure.messaging.servicebus.administration.ServiceBusAdministrationAsyncClient;
 import com.azure.messaging.servicebus.administration.ServiceBusAdministrationClientBuilder;
 import com.azure.messaging.servicebus.administration.models.CreateSubscriptionOptions;
+import com.azure.messaging.servicebus.models.ServiceBusReceiveMode;
 import com.google.common.base.Preconditions;
 import com.google.common.io.CharStreams;
 import java.io.InputStreamReader;
@@ -46,6 +47,8 @@ public abstract class AbstractAzureSiriUpdater implements GraphUpdater {
   private final Consumer messageConsumer = this::messageConsumer;
   private final Consumer errorConsumer = this::errorConsumer;
   private final String topicName;
+  private final Duration autoDeleteOnIdle;
+  private final int prefetchCount;
 
   protected WriteToGraphCallback saveResultOnGraph;
   private ServiceBusProcessorClient eventProcessor;
@@ -73,6 +76,8 @@ public AbstractAzureSiriUpdater(SiriAzureUpdaterParameters config, TransitModel
     this.dataInitializationUrl = config.getDataInitializationUrl();
     this.timeout = config.getTimeout();
     this.feedId = config.feedId();
+    this.autoDeleteOnIdle = config.getAutoDeleteOnIdle();
+    this.prefetchCount = config.getPrefetchCount();
     TransitService transitService = new DefaultTransitService(transitModel);
     this.entityResolver = new EntityResolver(transitService, feedId);
     this.fuzzyTripMatcher =
@@ -122,10 +127,11 @@ public void run() {
           .buildAsyncClient();
     }
 
-    // If Idle more then one day, then delete subscription so we don't have old obsolete subscriptions on Azure Service Bus
+    // Set options
     var options = new CreateSubscriptionOptions();
     options.setDefaultMessageTimeToLive(Duration.of(25, ChronoUnit.HOURS));
-    options.setAutoDeleteOnIdle(Duration.ofDays(1));
+    // Set subscription to be deleted if idle for a certain time, so that orphaned instances doesn't linger.
+    options.setAutoDeleteOnIdle(autoDeleteOnIdle);
 
     // Make sure there is no old subscription on serviceBus
     if (
@@ -150,15 +156,18 @@ public void run() {
         .processor()
         .topicName(topicName)
         .subscriptionName(subscriptionName)
+        .receiveMode(ServiceBusReceiveMode.RECEIVE_AND_DELETE)
+        .prefetchCount(prefetchCount)
         .processError(errorConsumer)
         .processMessage(messageConsumer)
         .buildProcessorClient();
 
     eventProcessor.start();
     LOG.info(
-      "Service Bus processor started for topic {} and subscription {}",
+      "Service Bus processor started for topic '{}' and subscription '{}', prefetching {} messages.",
       topicName,
-      subscriptionName
+      subscriptionName,
+      prefetchCount
     );
 
     ApplicationShutdownSupport.addShutdownHook(
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java
index 0d207d27efe..4b8406da896 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureUpdaterParameters.java
@@ -1,5 +1,7 @@
 package org.opentripplanner.ext.siri.updater.azure;
 
+import java.time.Duration;
+
 public abstract class SiriAzureUpdaterParameters {
 
   private String configRef;
@@ -13,6 +15,8 @@ public abstract class SiriAzureUpdaterParameters {
   private int timeout;
 
   private boolean fuzzyTripMatching;
+  private Duration autoDeleteOnIdle;
+  private int prefetchCount;
 
   public SiriAzureUpdaterParameters(String type) {
     this.type = type;
@@ -93,4 +97,20 @@ public boolean isFuzzyTripMatching() {
   public void setFuzzyTripMatching(boolean fuzzyTripMatching) {
     this.fuzzyTripMatching = fuzzyTripMatching;
   }
+
+  public Duration getAutoDeleteOnIdle() {
+    return autoDeleteOnIdle;
+  }
+
+  public void setAutoDeleteOnIdle(Duration autoDeleteOnIdle) {
+    this.autoDeleteOnIdle = autoDeleteOnIdle;
+  }
+
+  public int getPrefetchCount() {
+    return prefetchCount;
+  }
+
+  public void setPrefetchCount(int prefetchCount) {
+    this.prefetchCount = prefetchCount;
+  }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java
index 35da716337e..ddb6a967f92 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/azure/SiriAzureUpdaterConfig.java
@@ -4,6 +4,7 @@
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2;
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5;
 
+import java.time.Duration;
 import java.time.LocalDate;
 import java.time.Period;
 import java.time.ZoneId;
@@ -41,6 +42,20 @@ public static void populateConfig(
         .summary("The ID of the feed to apply the updates to.")
         .asString(null)
     );
+    parameters.setAutoDeleteOnIdle(
+      c
+        .of("autoDeleteOnIdle")
+        .since(V2_5)
+        .summary("The time after which an inactive subscription is removed.")
+        .asDuration(Duration.ofHours(1))
+    );
+    parameters.setPrefetchCount(
+      c
+        .of("prefetchCount")
+        .since(V2_5)
+        .summary("The number of messages to fetch from the subscription at a time.")
+        .asInt(10)
+    );
     parameters.setFuzzyTripMatching(
       c
         .of("fuzzyTripMatching")

From 089a2caff2d07c1ff34b1358ade63fd2d3375551 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 11 Mar 2024 23:00:14 +0200
Subject: [PATCH 0767/1688] Fix copypaste mistake

---
 .../org/opentripplanner/apis/gtfs/GraphQLScalars.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
index d71582e651c..a889f63ea90 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
@@ -379,12 +379,12 @@ public Double parseLiteral(Object input) throws CoercingParseLiteralException {
           var validationException = new CoercingParseLiteralException(
             "Value is under 0 or greater than 1."
           );
-          if (input instanceof FloatValue coordinate) {
-            return validateRatio(coordinate.getValue().doubleValue())
+          if (input instanceof FloatValue ratio) {
+            return validateRatio(ratio.getValue().doubleValue())
               .orElseThrow(() -> validationException);
           }
-          if (input instanceof IntValue coordinate) {
-            return validateRatio(coordinate.getValue().doubleValue())
+          if (input instanceof IntValue ratio) {
+            return validateRatio(ratio.getValue().doubleValue())
               .orElseThrow(() -> validationException);
           }
           throw new CoercingParseLiteralException(

From 3c9e438c1f9850f1b8b98b3d803018d0851326d5 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 11 Mar 2024 23:11:58 +0200
Subject: [PATCH 0768/1688] Add tests for scalars

---
 .../apis/gtfs/CoordinateValueTest.java        | 98 +++++++++++++++++++
 .../apis/gtfs/CostScalarTest.java             | 78 +++++++++++++++
 .../apis/gtfs/RatioScalarTest.java            | 89 +++++++++++++++++
 .../apis/gtfs/ReluctanceScalarTest.java       | 84 ++++++++++++++++
 4 files changed, 349 insertions(+)
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueTest.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueTest.java b/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueTest.java
new file mode 100644
index 00000000000..60028174b5c
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueTest.java
@@ -0,0 +1,98 @@
+package org.opentripplanner.apis.gtfs;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import graphql.language.FloatValue;
+import graphql.language.IntValue;
+import graphql.language.StringValue;
+import graphql.schema.CoercingParseLiteralException;
+import graphql.schema.CoercingParseValueException;
+import graphql.schema.CoercingSerializeException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import org.junit.jupiter.api.Test;
+
+class CoordinateValueScalarTest {
+
+  private static final Double COORDINATE = 10.0;
+  private static final double COORDINATE_MAX = 180.0;
+  private static final double COORDINATE_MIN = 180.0;
+  private static final double TOO_HIGH = 190;
+  private static final double TOO_LOW = -190;
+  private static final String TEXT = "foo";
+  private static final double DELTA = 0.0001;
+
+  @Test
+  void testSerialize() {
+    var coordinate = (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR
+      .getCoercing()
+      .serialize(COORDINATE);
+    assertEquals(COORDINATE, coordinate, DELTA);
+    coordinate =
+      (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR
+        .getCoercing()
+        .serialize(COORDINATE.floatValue());
+    assertEquals(COORDINATE, coordinate, DELTA);
+    assertThrows(
+      CoercingSerializeException.class,
+      () -> GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().serialize(TEXT)
+    );
+  }
+
+  @Test
+  void testParseValue() {
+    var coordinate = (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR
+      .getCoercing()
+      .parseValue(COORDINATE);
+    assertEquals(COORDINATE, coordinate, DELTA);
+    coordinate =
+      (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(COORDINATE_MIN);
+    assertEquals(COORDINATE_MIN, coordinate, DELTA);
+    coordinate =
+      (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(COORDINATE_MAX);
+    assertEquals(COORDINATE_MAX, coordinate, DELTA);
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(TEXT)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(TOO_LOW)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(TOO_HIGH)
+    );
+  }
+
+  @Test
+  void testParseLiteral() {
+    var coordinateDouble = (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR
+      .getCoercing()
+      .parseLiteral(new FloatValue(BigDecimal.valueOf(COORDINATE)));
+    assertEquals(COORDINATE, coordinateDouble, DELTA);
+    var coordinateInt = (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR
+      .getCoercing()
+      .parseLiteral(new IntValue(BigInteger.valueOf(COORDINATE.intValue())));
+    assertEquals(COORDINATE, coordinateInt, DELTA);
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () -> GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseLiteral(new StringValue(TEXT))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.COORDINATE_VALUE_SCALAR
+          .getCoercing()
+          .parseLiteral(new FloatValue(BigDecimal.valueOf(TOO_HIGH)))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.COORDINATE_VALUE_SCALAR
+          .getCoercing()
+          .parseLiteral(new FloatValue(BigDecimal.valueOf(TOO_LOW)))
+    );
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java
new file mode 100644
index 00000000000..bb8b5bfe445
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/CostScalarTest.java
@@ -0,0 +1,78 @@
+package org.opentripplanner.apis.gtfs;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import graphql.language.IntValue;
+import graphql.language.StringValue;
+import graphql.schema.CoercingParseLiteralException;
+import graphql.schema.CoercingParseValueException;
+import graphql.schema.CoercingSerializeException;
+import java.math.BigInteger;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.framework.model.Cost;
+
+class CostScalarTest {
+
+  private static final Cost COST_THIRTY = Cost.costOfSeconds(30);
+  private static final int THIRTY = 30;
+  private static final int NEGATIVE_THIRTY = -30;
+  private static final int TOO_HIGH = 300000000;
+  private static final String TEXT = "foo";
+
+  @Test
+  void testSerialize() {
+    var cost = GraphQLScalars.COST_SCALAR.getCoercing().serialize(COST_THIRTY);
+    assertEquals(THIRTY, cost);
+    var costNumber = GraphQLScalars.COST_SCALAR.getCoercing().serialize(THIRTY);
+    assertEquals(THIRTY, costNumber);
+    assertThrows(
+      CoercingSerializeException.class,
+      () -> GraphQLScalars.COST_SCALAR.getCoercing().serialize(TEXT)
+    );
+  }
+
+  @Test
+  void testParseValue() {
+    var cost = GraphQLScalars.COST_SCALAR.getCoercing().parseValue(THIRTY);
+    assertEquals(COST_THIRTY, cost);
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.COST_SCALAR.getCoercing().parseValue(TEXT)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.COST_SCALAR.getCoercing().parseValue(NEGATIVE_THIRTY)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.COST_SCALAR.getCoercing().parseValue(TOO_HIGH)
+    );
+  }
+
+  @Test
+  void testParseLiteral() {
+    var cost = GraphQLScalars.COST_SCALAR
+      .getCoercing()
+      .parseLiteral(new IntValue(BigInteger.valueOf(THIRTY)));
+    assertEquals(COST_THIRTY, cost);
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () -> GraphQLScalars.COST_SCALAR.getCoercing().parseLiteral(new StringValue(TEXT))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.COST_SCALAR
+          .getCoercing()
+          .parseLiteral(new IntValue(BigInteger.valueOf(NEGATIVE_THIRTY)))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.COST_SCALAR
+          .getCoercing()
+          .parseLiteral(new IntValue(BigInteger.valueOf(TOO_HIGH)))
+    );
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java
new file mode 100644
index 00000000000..5af93dcef1d
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java
@@ -0,0 +1,89 @@
+package org.opentripplanner.apis.gtfs;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import graphql.language.FloatValue;
+import graphql.language.IntValue;
+import graphql.language.StringValue;
+import graphql.schema.CoercingParseLiteralException;
+import graphql.schema.CoercingParseValueException;
+import graphql.schema.CoercingSerializeException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import org.junit.jupiter.api.Test;
+
+class RatioScalarTest {
+
+  private static final Double HALF = 0.5;
+  private static final double ZERO = 0;
+  private static final double ONE = 1;
+  private static final double TOO_HIGH = 1.1;
+  private static final double TOO_LOW = -1.1;
+  private static final String TEXT = "foo";
+  private static final double DELTA = 0.0001;
+
+  @Test
+  void testSerialize() {
+    var ratio = (Double) GraphQLScalars.RATIO_SCALAR.getCoercing().serialize(HALF);
+    assertEquals(HALF, ratio, DELTA);
+    ratio = (Double) GraphQLScalars.RATIO_SCALAR.getCoercing().serialize(HALF.floatValue());
+    assertEquals(HALF, ratio, DELTA);
+    assertThrows(
+      CoercingSerializeException.class,
+      () -> GraphQLScalars.RATIO_SCALAR.getCoercing().serialize(TEXT)
+    );
+  }
+
+  @Test
+  void testParseValue() {
+    var ratio = (Double) GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(HALF);
+    assertEquals(HALF, ratio, DELTA);
+    ratio = (Double) GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(ZERO);
+    assertEquals(ZERO, ratio, DELTA);
+    ratio = (Double) GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(ONE);
+    assertEquals(ONE, ratio, DELTA);
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(TEXT)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(TOO_LOW)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.RATIO_SCALAR.getCoercing().parseValue(TOO_HIGH)
+    );
+  }
+
+  @Test
+  void testParseLiteral() {
+    var ratioDouble = (Double) GraphQLScalars.RATIO_SCALAR
+      .getCoercing()
+      .parseLiteral(new FloatValue(BigDecimal.valueOf(HALF)));
+    assertEquals(HALF, ratioDouble, DELTA);
+    var ratioInt = (Double) GraphQLScalars.RATIO_SCALAR
+      .getCoercing()
+      .parseLiteral(new IntValue(BigInteger.valueOf(HALF.intValue())));
+    assertEquals(HALF.intValue(), ratioInt, DELTA);
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () -> GraphQLScalars.RATIO_SCALAR.getCoercing().parseLiteral(new StringValue(TEXT))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.RATIO_SCALAR
+          .getCoercing()
+          .parseLiteral(new FloatValue(BigDecimal.valueOf(TOO_HIGH)))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.RATIO_SCALAR
+          .getCoercing()
+          .parseLiteral(new FloatValue(BigDecimal.valueOf(TOO_LOW)))
+    );
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
new file mode 100644
index 00000000000..c5965cdeec6
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
@@ -0,0 +1,84 @@
+package org.opentripplanner.apis.gtfs;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import graphql.language.FloatValue;
+import graphql.language.IntValue;
+import graphql.language.StringValue;
+import graphql.schema.CoercingParseLiteralException;
+import graphql.schema.CoercingParseValueException;
+import graphql.schema.CoercingSerializeException;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import org.junit.jupiter.api.Test;
+
+class ReluctanceScalarTest {
+
+  private static final Double HALF = 0.5;
+  private static final double TOO_HIGH = 100001;
+  private static final double TOO_LOW = -0.1;
+  private static final String TEXT = "foo";
+  private static final double DELTA = 0.0001;
+
+  @Test
+  void testSerialize() {
+    var reluctance = (Double) GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().serialize(HALF);
+    assertEquals(HALF, reluctance, DELTA);
+    reluctance =
+      (Double) GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().serialize(HALF.floatValue());
+    assertEquals(HALF, reluctance, DELTA);
+    assertThrows(
+      CoercingSerializeException.class,
+      () -> GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().serialize(TEXT)
+    );
+  }
+
+  @Test
+  void testParseValue() {
+    var reluctance = (Double) GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(HALF);
+    assertEquals(HALF, reluctance, DELTA);
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(TEXT)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(TOO_LOW)
+    );
+    assertThrows(
+      CoercingParseValueException.class,
+      () -> GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(TOO_HIGH)
+    );
+  }
+
+  @Test
+  void testParseLiteral() {
+    var reluctanceDouble = (Double) GraphQLScalars.RELUCTANCE_SCALAR
+      .getCoercing()
+      .parseLiteral(new FloatValue(BigDecimal.valueOf(HALF)));
+    assertEquals(HALF, reluctanceDouble, DELTA);
+    var reluctanceInt = (Double) GraphQLScalars.RELUCTANCE_SCALAR
+      .getCoercing()
+      .parseLiteral(new IntValue(BigInteger.valueOf(HALF.intValue())));
+    assertEquals(HALF.intValue(), reluctanceInt, DELTA);
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () -> GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseLiteral(new StringValue(TEXT))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.RELUCTANCE_SCALAR
+          .getCoercing()
+          .parseLiteral(new FloatValue(BigDecimal.valueOf(TOO_HIGH)))
+    );
+    assertThrows(
+      CoercingParseLiteralException.class,
+      () ->
+        GraphQLScalars.RELUCTANCE_SCALAR
+          .getCoercing()
+          .parseLiteral(new FloatValue(BigDecimal.valueOf(TOO_LOW)))
+    );
+  }
+}

From 0bd241c55d9b4b84dbbd6be76a8e92c6018a29e9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 12 Mar 2024 01:01:35 +0000
Subject: [PATCH 0769/1688] chore(deps): update debug ui dependencies
 (non-major)

---
 client-next/package-lock.json | 999 +++++++++++++++++++++-------------
 client-next/package.json      |  48 +-
 2 files changed, 630 insertions(+), 417 deletions(-)

diff --git a/client-next/package-lock.json b/client-next/package-lock.json
index 7f01598ad30..944da10aa11 100644
--- a/client-next/package-lock.json
+++ b/client-next/package-lock.json
@@ -9,39 +9,39 @@
       "version": "0.0.0",
       "dependencies": {
         "@googlemaps/polyline-codec": "1.0.28",
-        "bootstrap": "5.3.1",
+        "bootstrap": "5.3.3",
         "graphql": "16.8.1",
         "graphql-request": "6.1.0",
-        "maplibre-gl": "4.0.1",
+        "maplibre-gl": "4.1.0",
         "react": "18.2.0",
-        "react-bootstrap": "2.8.0",
+        "react-bootstrap": "2.10.1",
         "react-dom": "18.2.0",
-        "react-map-gl": "7.1.5"
+        "react-map-gl": "7.1.7"
       },
       "devDependencies": {
-        "@graphql-codegen/cli": "5.0.0",
-        "@graphql-codegen/client-preset": "4.1.0",
-        "@graphql-codegen/introspection": "4.0.0",
-        "@parcel/watcher": "2.3.0",
-        "@testing-library/react": "14.1.2",
-        "@types/react": "18.2.21",
-        "@types/react-dom": "18.2.7",
-        "@typescript-eslint/eslint-plugin": "7.1.0",
-        "@typescript-eslint/parser": "7.1.0",
-        "@vitejs/plugin-react": "4.0.4",
-        "@vitest/coverage-v8": "1.1.3",
-        "eslint": "8.56.0",
-        "eslint-config-prettier": "9.0.0",
-        "eslint-plugin-import": "2.28.1",
-        "eslint-plugin-jsx-a11y": "6.7.1",
-        "eslint-plugin-react": "7.33.2",
+        "@graphql-codegen/cli": "5.0.2",
+        "@graphql-codegen/client-preset": "4.2.4",
+        "@graphql-codegen/introspection": "4.0.3",
+        "@parcel/watcher": "2.4.1",
+        "@testing-library/react": "14.2.1",
+        "@types/react": "18.2.65",
+        "@types/react-dom": "18.2.21",
+        "@typescript-eslint/eslint-plugin": "7.2.0",
+        "@typescript-eslint/parser": "7.2.0",
+        "@vitejs/plugin-react": "4.2.1",
+        "@vitest/coverage-v8": "1.3.1",
+        "eslint": "8.57.0",
+        "eslint-config-prettier": "9.1.0",
+        "eslint-plugin-import": "2.29.1",
+        "eslint-plugin-jsx-a11y": "6.8.0",
+        "eslint-plugin-react": "7.34.0",
         "eslint-plugin-react-hooks": "4.6.0",
-        "eslint-plugin-react-refresh": "0.4.3",
+        "eslint-plugin-react-refresh": "0.4.5",
         "jsdom": "24.0.0",
-        "prettier": "3.0.3",
-        "typescript": "5.2.2",
+        "prettier": "3.2.5",
+        "typescript": "5.4.2",
         "vite": "4.5.2",
-        "vitest": "1.1.3"
+        "vitest": "1.3.1"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -380,9 +380,9 @@
       }
     },
     "node_modules/@babel/helper-create-class-features-plugin": {
-      "version": "7.23.10",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.23.10.tgz",
-      "integrity": "sha512-2XpP2XhkXzgxecPNEEK8Vz8Asj9aRxt08oKOqtiZoqV2UGZ5T+EkyP9sXQ9nwMxBIG34a7jmasVqoMop7VdPUw==",
+      "version": "7.24.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.0.tgz",
+      "integrity": "sha512-QAH+vfvts51BCsNZ2PhY6HAggnlS6omLLFTsIpeqZk/MmJ6cW7tgz5yRv0fMJThcr6FmbMrENh1RgrWPTYA76g==",
       "dev": true,
       "dependencies": {
         "@babel/helper-annotate-as-pure": "^7.22.5",
@@ -1656,9 +1656,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.56.0.tgz",
-      "integrity": "sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz",
+      "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -1683,16 +1683,17 @@
       }
     },
     "node_modules/@graphql-codegen/cli": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-5.0.0.tgz",
-      "integrity": "sha512-A7J7+be/a6e+/ul2KI5sfJlpoqeqwX8EzktaKCeduyVKgOLA6W5t+NUGf6QumBDXU8PEOqXk3o3F+RAwCWOiqA==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-5.0.2.tgz",
+      "integrity": "sha512-MBIaFqDiLKuO4ojN6xxG9/xL9wmfD3ZjZ7RsPjwQnSHBCUXnEkdKvX+JVpx87Pq29Ycn8wTJUguXnTZ7Di0Mlw==",
       "dev": true,
       "dependencies": {
         "@babel/generator": "^7.18.13",
         "@babel/template": "^7.18.10",
         "@babel/types": "^7.18.13",
-        "@graphql-codegen/core": "^4.0.0",
-        "@graphql-codegen/plugin-helpers": "^5.0.1",
+        "@graphql-codegen/client-preset": "^4.2.2",
+        "@graphql-codegen/core": "^4.0.2",
+        "@graphql-codegen/plugin-helpers": "^5.0.3",
         "@graphql-tools/apollo-engine-loader": "^8.0.0",
         "@graphql-tools/code-file-loader": "^8.0.0",
         "@graphql-tools/git-loader": "^8.0.0",
@@ -1740,35 +1741,29 @@
       }
     },
     "node_modules/@graphql-codegen/client-preset": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.1.0.tgz",
-      "integrity": "sha512-/3Ymb/fjxIF1+HGmaI1YwSZbWsrZAWMSQjh3dU425eBjctjsVQ6gzGRr+l/gE5F1mtmCf+vlbTAT03heAc/QIw==",
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.4.tgz",
+      "integrity": "sha512-k1c8v2YxJhhITGQGxViG9asLAoop9m7X9duU7Zztqjc98ooxsUzXICfvAWsH3mLAUibXAx4Ax6BPzKsTtQmBPg==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/template": "^7.20.7",
-        "@graphql-codegen/add": "^5.0.0",
-        "@graphql-codegen/gql-tag-operations": "4.0.1",
-        "@graphql-codegen/plugin-helpers": "^5.0.1",
-        "@graphql-codegen/typed-document-node": "^5.0.1",
-        "@graphql-codegen/typescript": "^4.0.1",
-        "@graphql-codegen/typescript-operations": "^4.0.1",
-        "@graphql-codegen/visitor-plugin-common": "^4.0.1",
+        "@graphql-codegen/add": "^5.0.2",
+        "@graphql-codegen/gql-tag-operations": "4.0.6",
+        "@graphql-codegen/plugin-helpers": "^5.0.3",
+        "@graphql-codegen/typed-document-node": "^5.0.6",
+        "@graphql-codegen/typescript": "^4.0.6",
+        "@graphql-codegen/typescript-operations": "^4.2.0",
+        "@graphql-codegen/visitor-plugin-common": "^5.1.0",
         "@graphql-tools/documents": "^1.0.0",
         "@graphql-tools/utils": "^10.0.0",
         "@graphql-typed-document-node/core": "3.2.0",
-        "tslib": "~2.5.0"
+        "tslib": "~2.6.0"
       },
       "peerDependencies": {
         "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/@graphql-codegen/client-preset/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==",
-      "dev": true
-    },
     "node_modules/@graphql-codegen/core": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-4.0.2.tgz",
@@ -1785,68 +1780,35 @@
       }
     },
     "node_modules/@graphql-codegen/gql-tag-operations": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.1.tgz",
-      "integrity": "sha512-qF6wIbBzW8BNT+wiVsBxrYOs2oYcsxQ7mRvCpfEI3HnNZMAST/uX76W8MqFEJvj4mw7NIDv7xYJAcAZIWM5LWw==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.6.tgz",
+      "integrity": "sha512-y6iXEDpDNjwNxJw3WZqX1/Znj0QHW7+y8O+t2V8qvbTT+3kb2lr9ntc8By7vCr6ctw9tXI4XKaJgpTstJDOwFA==",
       "dev": true,
       "dependencies": {
-        "@graphql-codegen/plugin-helpers": "^5.0.0",
-        "@graphql-codegen/visitor-plugin-common": "4.0.1",
-        "@graphql-tools/utils": "^10.0.0",
-        "auto-bind": "~4.0.0",
-        "tslib": "~2.5.0"
-      },
-      "peerDependencies": {
-        "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
-      }
-    },
-    "node_modules/@graphql-codegen/gql-tag-operations/node_modules/@graphql-codegen/visitor-plugin-common": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.0.1.tgz",
-      "integrity": "sha512-Bi/1z0nHg4QMsAqAJhds+ForyLtk7A3HQOlkrZNm3xEkY7lcBzPtiOTLBtvziwopBsXUxqeSwVjOOFPLS5Yw1Q==",
-      "dev": true,
-      "dependencies": {
-        "@graphql-codegen/plugin-helpers": "^5.0.0",
-        "@graphql-tools/optimize": "^2.0.0",
-        "@graphql-tools/relay-operation-optimizer": "^7.0.0",
+        "@graphql-codegen/plugin-helpers": "^5.0.3",
+        "@graphql-codegen/visitor-plugin-common": "5.1.0",
         "@graphql-tools/utils": "^10.0.0",
         "auto-bind": "~4.0.0",
-        "change-case-all": "1.0.15",
-        "dependency-graph": "^0.11.0",
-        "graphql-tag": "^2.11.0",
-        "parse-filepath": "^1.0.2",
-        "tslib": "~2.5.0"
+        "tslib": "~2.6.0"
       },
       "peerDependencies": {
         "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/@graphql-codegen/gql-tag-operations/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==",
-      "dev": true
-    },
     "node_modules/@graphql-codegen/introspection": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/introspection/-/introspection-4.0.0.tgz",
-      "integrity": "sha512-t9g3AkK99dfHblMWtG4ynUM9+A7JrWq5110zSpNV2wlSnv0+bRKagDW8gozwgXfR5i1IIG8QDjJZ6VgXQVqCZw==",
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/introspection/-/introspection-4.0.3.tgz",
+      "integrity": "sha512-4cHRG15Zu4MXMF4wTQmywNf4+fkDYv5lTbzraVfliDnB8rJKcaurQpRBi11KVuQUe24YTq/Cfk4uwewfNikWoA==",
       "dev": true,
       "dependencies": {
-        "@graphql-codegen/plugin-helpers": "^5.0.0",
-        "@graphql-codegen/visitor-plugin-common": "^4.0.0",
-        "tslib": "~2.5.0"
+        "@graphql-codegen/plugin-helpers": "^5.0.3",
+        "@graphql-codegen/visitor-plugin-common": "^5.0.0",
+        "tslib": "~2.6.0"
       },
       "peerDependencies": {
         "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/@graphql-codegen/introspection/node_modules/tslib": {
-      "version": "2.5.3",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz",
-      "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==",
-      "dev": true
-    },
     "node_modules/@graphql-codegen/plugin-helpers": {
       "version": "5.0.3",
       "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.3.tgz",
@@ -1879,13 +1841,13 @@
       }
     },
     "node_modules/@graphql-codegen/typed-document-node": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.4.tgz",
-      "integrity": "sha512-t66Z6erQ4Dh1j6f9pRZmc8uYtHoUI3A49tLmJAlg9/3IV0kCmwrWKJut/G8SeOefDLG8cXBTVtI/YuZOe1Te+w==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.6.tgz",
+      "integrity": "sha512-US0J95hOE2/W/h42w4oiY+DFKG7IetEN1mQMgXXeat1w6FAR5PlIz4JrRrEkiVfVetZ1g7K78SOwBD8/IJnDiA==",
       "dev": true,
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.3",
-        "@graphql-codegen/visitor-plugin-common": "4.1.2",
+        "@graphql-codegen/visitor-plugin-common": "5.1.0",
         "auto-bind": "~4.0.0",
         "change-case-all": "1.0.15",
         "tslib": "~2.6.0"
@@ -1895,14 +1857,14 @@
       }
     },
     "node_modules/@graphql-codegen/typescript": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.4.tgz",
-      "integrity": "sha512-x79CKLfP9UQCX+/I78qxQlMs2Mmq3pF1lKafZo7lAno0f/fvJ+qWUduzdgjRNz+YL+5blGeWcC0pWEDxniO7hw==",
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.6.tgz",
+      "integrity": "sha512-IBG4N+Blv7KAL27bseruIoLTjORFCT3r+QYyMC3g11uY3/9TPpaUyjSdF70yBe5GIQ6dAgDU+ENUC1v7EPi0rw==",
       "dev": true,
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.3",
         "@graphql-codegen/schema-ast": "^4.0.2",
-        "@graphql-codegen/visitor-plugin-common": "4.1.2",
+        "@graphql-codegen/visitor-plugin-common": "5.1.0",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
       },
@@ -1911,14 +1873,14 @@
       }
     },
     "node_modules/@graphql-codegen/typescript-operations": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.1.2.tgz",
-      "integrity": "sha512-CtCWK+gW7hS+Ely3lohr8CL1HVLswQzMcaUk3k1sxdWCWKTNq7abMsWa31rTVwRCJ+WNEkM/7S8sIBTpEG683A==",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.0.tgz",
+      "integrity": "sha512-lmuwYb03XC7LNRS8oo9M4/vlOrq/wOKmTLBHlltK2YJ1BO/4K/Q9Jdv/jDmJpNydHVR1fmeF4wAfsIp1f9JibA==",
       "dev": true,
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.3",
-        "@graphql-codegen/typescript": "^4.0.4",
-        "@graphql-codegen/visitor-plugin-common": "4.1.2",
+        "@graphql-codegen/typescript": "^4.0.6",
+        "@graphql-codegen/visitor-plugin-common": "5.1.0",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
       },
@@ -1927,9 +1889,9 @@
       }
     },
     "node_modules/@graphql-codegen/visitor-plugin-common": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-4.1.2.tgz",
-      "integrity": "sha512-yk7iEAL1kYZ2Gi/pvVjdsZhul5WsYEM4Zcgh2Ev15VicMdJmPHsMhNUsZWyVJV0CaQCYpNOFlGD/11Ea3pn4GA==",
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.1.0.tgz",
+      "integrity": "sha512-eamQxtA9bjJqI2lU5eYoA1GbdMIRT2X8m8vhWYsVQVWD3qM7sx/IqJU0kx0J3Vd4/CSd36BzL6RKwksibytDIg==",
       "dev": true,
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.3",
@@ -2491,13 +2453,13 @@
       "dev": true
     },
     "node_modules/@graphql-tools/relay-operation-optimizer": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.0.tgz",
-      "integrity": "sha512-UNlJi5y3JylhVWU4MBpL0Hun4Q7IoJwv9xYtmAz+CgRa066szzY7dcuPfxrA7cIGgG/Q6TVsKsYaiF4OHPs1Fw==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.1.tgz",
+      "integrity": "sha512-y0ZrQ/iyqWZlsS/xrJfSir3TbVYJTYmMOu4TaSz6F4FRDTQ3ie43BlKkhf04rC28pnUOS4BO9pDcAo1D30l5+A==",
       "dev": true,
       "dependencies": {
         "@ardatan/relay-compiler": "12.0.0",
-        "@graphql-tools/utils": "^10.0.0",
+        "@graphql-tools/utils": "^10.0.13",
         "tslib": "^2.4.0"
       },
       "engines": {
@@ -2854,11 +2816,10 @@
       }
     },
     "node_modules/@parcel/watcher": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.3.0.tgz",
-      "integrity": "sha512-pW7QaFiL11O0BphO+bq3MgqeX/INAk9jgBldVDYjlQPO4VddoZnF22TcF9onMhnLVHuNqBJeRf+Fj7eezi/+rQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz",
+      "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==",
       "dev": true,
-      "hasInstallScript": true,
       "dependencies": {
         "detect-libc": "^1.0.3",
         "is-glob": "^4.0.3",
@@ -2873,24 +2834,24 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "@parcel/watcher-android-arm64": "2.3.0",
-        "@parcel/watcher-darwin-arm64": "2.3.0",
-        "@parcel/watcher-darwin-x64": "2.3.0",
-        "@parcel/watcher-freebsd-x64": "2.3.0",
-        "@parcel/watcher-linux-arm-glibc": "2.3.0",
-        "@parcel/watcher-linux-arm64-glibc": "2.3.0",
-        "@parcel/watcher-linux-arm64-musl": "2.3.0",
-        "@parcel/watcher-linux-x64-glibc": "2.3.0",
-        "@parcel/watcher-linux-x64-musl": "2.3.0",
-        "@parcel/watcher-win32-arm64": "2.3.0",
-        "@parcel/watcher-win32-ia32": "2.3.0",
-        "@parcel/watcher-win32-x64": "2.3.0"
+        "@parcel/watcher-android-arm64": "2.4.1",
+        "@parcel/watcher-darwin-arm64": "2.4.1",
+        "@parcel/watcher-darwin-x64": "2.4.1",
+        "@parcel/watcher-freebsd-x64": "2.4.1",
+        "@parcel/watcher-linux-arm-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-glibc": "2.4.1",
+        "@parcel/watcher-linux-arm64-musl": "2.4.1",
+        "@parcel/watcher-linux-x64-glibc": "2.4.1",
+        "@parcel/watcher-linux-x64-musl": "2.4.1",
+        "@parcel/watcher-win32-arm64": "2.4.1",
+        "@parcel/watcher-win32-ia32": "2.4.1",
+        "@parcel/watcher-win32-x64": "2.4.1"
       }
     },
     "node_modules/@parcel/watcher-android-arm64": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.3.0.tgz",
-      "integrity": "sha512-f4o9eA3dgk0XRT3XhB0UWpWpLnKgrh1IwNJKJ7UJek7eTYccQ8LR7XUWFKqw6aEq5KUNlCcGvSzKqSX/vtWVVA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz",
+      "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==",
       "cpu": [
         "arm64"
       ],
@@ -2908,9 +2869,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-arm64": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.3.0.tgz",
-      "integrity": "sha512-mKY+oijI4ahBMc/GygVGvEdOq0L4DxhYgwQqYAz/7yPzuGi79oXrZG52WdpGA1wLBPrYb0T8uBaGFo7I6rvSKw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz",
+      "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==",
       "cpu": [
         "arm64"
       ],
@@ -2928,9 +2889,9 @@
       }
     },
     "node_modules/@parcel/watcher-darwin-x64": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.3.0.tgz",
-      "integrity": "sha512-20oBj8LcEOnLE3mgpy6zuOq8AplPu9NcSSSfyVKgfOhNAc4eF4ob3ldj0xWjGGbOF7Dcy1Tvm6ytvgdjlfUeow==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz",
+      "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==",
       "cpu": [
         "x64"
       ],
@@ -2948,9 +2909,9 @@
       }
     },
     "node_modules/@parcel/watcher-freebsd-x64": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.3.0.tgz",
-      "integrity": "sha512-7LftKlaHunueAEiojhCn+Ef2CTXWsLgTl4hq0pkhkTBFI3ssj2bJXmH2L67mKpiAD5dz66JYk4zS66qzdnIOgw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz",
+      "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==",
       "cpu": [
         "x64"
       ],
@@ -2968,9 +2929,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm-glibc": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.3.0.tgz",
-      "integrity": "sha512-1apPw5cD2xBv1XIHPUlq0cO6iAaEUQ3BcY0ysSyD9Kuyw4MoWm1DV+W9mneWI+1g6OeP6dhikiFE6BlU+AToTQ==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz",
+      "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==",
       "cpu": [
         "arm"
       ],
@@ -2988,9 +2949,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-glibc": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.3.0.tgz",
-      "integrity": "sha512-mQ0gBSQEiq1k/MMkgcSB0Ic47UORZBmWoAWlMrTW6nbAGoLZP+h7AtUM7H3oDu34TBFFvjy4JCGP43JlylkTQA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz",
+      "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==",
       "cpu": [
         "arm64"
       ],
@@ -3008,9 +2969,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-arm64-musl": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.3.0.tgz",
-      "integrity": "sha512-LXZAExpepJew0Gp8ZkJ+xDZaTQjLHv48h0p0Vw2VMFQ8A+RKrAvpFuPVCVwKJCr5SE+zvaG+Etg56qXvTDIedw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz",
+      "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==",
       "cpu": [
         "arm64"
       ],
@@ -3028,9 +2989,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-glibc": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.3.0.tgz",
-      "integrity": "sha512-P7Wo91lKSeSgMTtG7CnBS6WrA5otr1K7shhSjKHNePVmfBHDoAOHYRXgUmhiNfbcGk0uMCHVcdbfxtuiZCHVow==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz",
+      "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==",
       "cpu": [
         "x64"
       ],
@@ -3048,9 +3009,9 @@
       }
     },
     "node_modules/@parcel/watcher-linux-x64-musl": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.3.0.tgz",
-      "integrity": "sha512-+kiRE1JIq8QdxzwoYY+wzBs9YbJ34guBweTK8nlzLKimn5EQ2b2FSC+tAOpq302BuIMjyuUGvBiUhEcLIGMQ5g==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz",
+      "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==",
       "cpu": [
         "x64"
       ],
@@ -3068,9 +3029,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-arm64": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.3.0.tgz",
-      "integrity": "sha512-35gXCnaz1AqIXpG42evcoP2+sNL62gZTMZne3IackM+6QlfMcJLy3DrjuL6Iks7Czpd3j4xRBzez3ADCj1l7Aw==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz",
+      "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==",
       "cpu": [
         "arm64"
       ],
@@ -3088,9 +3049,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-ia32": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.3.0.tgz",
-      "integrity": "sha512-FJS/IBQHhRpZ6PiCjFt1UAcPr0YmCLHRbTc00IBTrelEjlmmgIVLeOx4MSXzx2HFEy5Jo5YdhGpxCuqCyDJ5ow==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz",
+      "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==",
       "cpu": [
         "ia32"
       ],
@@ -3108,9 +3069,9 @@
       }
     },
     "node_modules/@parcel/watcher-win32-x64": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.3.0.tgz",
-      "integrity": "sha512-dLx+0XRdMnVI62kU3wbXvbIRhLck4aE28bIGKbRGS7BJNt54IIj9+c/Dkqb+7DJEbHUZAX1bwaoM8PqVlHJmCA==",
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz",
+      "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==",
       "cpu": [
         "x64"
       ],
@@ -3437,9 +3398,9 @@
       }
     },
     "node_modules/@testing-library/react": {
-      "version": "14.1.2",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.1.2.tgz",
-      "integrity": "sha512-z4p7DVBTPjKM5qDZ0t5ZjzkpSNb+fZy1u6bzO7kk8oeGagpPCAtgh4cx1syrfp7a+QWkM021jGqjJaxJJnXAZg==",
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.1.tgz",
+      "integrity": "sha512-sGdjws32ai5TLerhvzThYFbpnF9XtL65Cjf+gB0Dhr29BGqK+mAeN7SURSdu+eqgET4ANcWoC7FQpkaiGvBr+A==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
@@ -3460,6 +3421,47 @@
       "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
       "dev": true
     },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.6.8",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz",
+      "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz",
+      "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==",
+      "dev": true,
+      "dependencies": {
+        "@babel/types": "^7.20.7"
+      }
+    },
     "node_modules/@types/estree": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz",
@@ -3552,9 +3554,9 @@
       "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/react": {
-      "version": "18.2.21",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.21.tgz",
-      "integrity": "sha512-neFKG/sBAwGxHgXiIxnbm3/AAVQ/cMRS93hvBpg8xYRbeQSPVABp9U2bRnPf0iI4+Ucdv3plSxKK+3CW2ENJxA==",
+      "version": "18.2.65",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.65.tgz",
+      "integrity": "sha512-98TsY0aW4jqx/3RqsUXwMDZSWR1Z4CUlJNue8ueS2/wcxZOsz4xmW1X8ieaWVRHcmmQM3R8xVA4XWB3dJnWwDQ==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -3562,9 +3564,9 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.2.7",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.7.tgz",
-      "integrity": "sha512-GRaAEriuT4zp9N4p1i8BDBYmEyfo+xQ3yHjJU4eiK5NDa1RmUZG+unZABUTK4/Ox/M+GaHwb6Ow8rUITrtjszA==",
+      "version": "18.2.21",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.21.tgz",
+      "integrity": "sha512-gnvBA/21SA4xxqNXEwNiVcP0xSGHh/gi1VhWv9Bl46a0ItbTT5nFY+G9VSQpaG/8N/qdJpJ+vftQ4zflTtnjLw==",
       "dev": true,
       "dependencies": {
         "@types/react": "*"
@@ -3612,16 +3614,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.1.0.tgz",
-      "integrity": "sha512-j6vT/kCulhG5wBmGtstKeiVr1rdXE4nk+DT1k6trYkwlrvW9eOF5ZbgKnd/YR6PcM4uTEXa0h6Fcvf6X7Dxl0w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz",
+      "integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "7.1.0",
-        "@typescript-eslint/type-utils": "7.1.0",
-        "@typescript-eslint/utils": "7.1.0",
-        "@typescript-eslint/visitor-keys": "7.1.0",
+        "@typescript-eslint/scope-manager": "7.2.0",
+        "@typescript-eslint/type-utils": "7.2.0",
+        "@typescript-eslint/utils": "7.2.0",
+        "@typescript-eslint/visitor-keys": "7.2.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -3680,15 +3682,15 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.1.0.tgz",
-      "integrity": "sha512-V1EknKUubZ1gWFjiOZhDSNToOjs63/9O0puCgGS8aDOgpZY326fzFu15QAUjwaXzRZjf/qdsdBrckYdv9YxB8w==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz",
+      "integrity": "sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.1.0",
-        "@typescript-eslint/types": "7.1.0",
-        "@typescript-eslint/typescript-estree": "7.1.0",
-        "@typescript-eslint/visitor-keys": "7.1.0",
+        "@typescript-eslint/scope-manager": "7.2.0",
+        "@typescript-eslint/types": "7.2.0",
+        "@typescript-eslint/typescript-estree": "7.2.0",
+        "@typescript-eslint/visitor-keys": "7.2.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3708,13 +3710,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.1.0.tgz",
-      "integrity": "sha512-6TmN4OJiohHfoOdGZ3huuLhpiUgOGTpgXNUPJgeZOZR3DnIpdSgtt83RS35OYNNXxM4TScVlpVKC9jyQSETR1A==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
+      "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.1.0",
-        "@typescript-eslint/visitor-keys": "7.1.0"
+        "@typescript-eslint/types": "7.2.0",
+        "@typescript-eslint/visitor-keys": "7.2.0"
       },
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3725,13 +3727,13 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.1.0.tgz",
-      "integrity": "sha512-UZIhv8G+5b5skkcuhgvxYWHjk7FW7/JP5lPASMEUoliAPwIH/rxoUSQPia2cuOj9AmDZmwUl1usKm85t5VUMew==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz",
+      "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.1.0",
-        "@typescript-eslint/utils": "7.1.0",
+        "@typescript-eslint/typescript-estree": "7.2.0",
+        "@typescript-eslint/utils": "7.2.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
@@ -3752,9 +3754,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.1.0.tgz",
-      "integrity": "sha512-qTWjWieJ1tRJkxgZYXx6WUYtWlBc48YRxgY2JN1aGeVpkhmnopq+SUC8UEVGNXIvWH7XyuTjwALfG6bFEgCkQA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
+      "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
       "dev": true,
       "engines": {
         "node": "^16.0.0 || >=18.0.0"
@@ -3765,13 +3767,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.1.0.tgz",
-      "integrity": "sha512-k7MyrbD6E463CBbSpcOnwa8oXRdHzH1WiVzOipK3L5KSML92ZKgUBrTlehdi7PEIMT8k0bQixHUGXggPAlKnOQ==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
+      "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.1.0",
-        "@typescript-eslint/visitor-keys": "7.1.0",
+        "@typescript-eslint/types": "7.2.0",
+        "@typescript-eslint/visitor-keys": "7.2.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -3850,17 +3852,17 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.1.0.tgz",
-      "integrity": "sha512-WUFba6PZC5OCGEmbweGpnNJytJiLG7ZvDBJJoUcX4qZYf1mGZ97mO2Mps6O2efxJcJdRNpqweCistDbZMwIVHw==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
+      "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "7.1.0",
-        "@typescript-eslint/types": "7.1.0",
-        "@typescript-eslint/typescript-estree": "7.1.0",
+        "@typescript-eslint/scope-manager": "7.2.0",
+        "@typescript-eslint/types": "7.2.0",
+        "@typescript-eslint/typescript-estree": "7.2.0",
         "semver": "^7.5.4"
       },
       "engines": {
@@ -3908,12 +3910,12 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.1.0.tgz",
-      "integrity": "sha512-FhUqNWluiGNzlvnDZiXad4mZRhtghdoKW6e98GoEOYSu5cND+E39rG5KwJMUzeENwm1ztYBRqof8wMLP+wNPIA==",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
+      "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.1.0",
+        "@typescript-eslint/types": "7.2.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
@@ -3931,27 +3933,28 @@
       "dev": true
     },
     "node_modules/@vitejs/plugin-react": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.0.4.tgz",
-      "integrity": "sha512-7wU921ABnNYkETiMaZy7XqpueMnpu5VxvVps13MjmCo+utBdD79sZzrApHawHtVX66cCJQQTXFcjH0y9dSUK8g==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz",
+      "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==",
       "dev": true,
       "dependencies": {
-        "@babel/core": "^7.22.9",
-        "@babel/plugin-transform-react-jsx-self": "^7.22.5",
-        "@babel/plugin-transform-react-jsx-source": "^7.22.5",
+        "@babel/core": "^7.23.5",
+        "@babel/plugin-transform-react-jsx-self": "^7.23.3",
+        "@babel/plugin-transform-react-jsx-source": "^7.23.3",
+        "@types/babel__core": "^7.20.5",
         "react-refresh": "^0.14.0"
       },
       "engines": {
         "node": "^14.18.0 || >=16.0.0"
       },
       "peerDependencies": {
-        "vite": "^4.2.0"
+        "vite": "^4.2.0 || ^5.0.0"
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.1.3.tgz",
-      "integrity": "sha512-Uput7t3eIcbSTOTQBzGtS+0kah96bX+szW9qQrLeGe3UmgL2Akn8POnyC2lH7XsnREZOds9aCUTxgXf+4HX5RA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.3.1.tgz",
+      "integrity": "sha512-UuBnkSJUNE9rdHjDCPyJ4fYuMkoMtnghes1XohYa4At0MS3OQSAo97FrbwSLRshYsXThMZy1+ybD/byK5llyIg==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.1",
@@ -3962,7 +3965,7 @@
         "istanbul-lib-source-maps": "^4.0.1",
         "istanbul-reports": "^3.1.6",
         "magic-string": "^0.30.5",
-        "magicast": "^0.3.2",
+        "magicast": "^0.3.3",
         "picocolors": "^1.0.0",
         "std-env": "^3.5.0",
         "test-exclude": "^6.0.0",
@@ -3972,17 +3975,17 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "^1.0.0"
+        "vitest": "1.3.1"
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.1.3.tgz",
-      "integrity": "sha512-MnJqsKc1Ko04lksF9XoRJza0bGGwTtqfbyrsYv5on4rcEkdo+QgUdITenBQBUltKzdxW7K3rWh+nXRULwsdaVg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.3.1.tgz",
+      "integrity": "sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "1.1.3",
-        "@vitest/utils": "1.1.3",
+        "@vitest/spy": "1.3.1",
+        "@vitest/utils": "1.3.1",
         "chai": "^4.3.10"
       },
       "funding": {
@@ -3990,12 +3993,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.1.3.tgz",
-      "integrity": "sha512-Va2XbWMnhSdDEh/OFxyUltgQuuDRxnarK1hW5QNN4URpQrqq6jtt8cfww/pQQ4i0LjoYxh/3bYWvDFlR9tU73g==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.3.1.tgz",
+      "integrity": "sha512-5FzF9c3jG/z5bgCnjr8j9LNq/9OxV2uEBAITOXfoe3rdZJTdO7jzThth7FXv/6b+kdY65tpRQB7WaKhNZwX+Kg==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "1.1.3",
+        "@vitest/utils": "1.3.1",
         "p-limit": "^5.0.0",
         "pathe": "^1.1.1"
       },
@@ -4031,9 +4034,9 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.1.3.tgz",
-      "integrity": "sha512-U0r8pRXsLAdxSVAyGNcqOU2H3Z4Y2dAAGGelL50O0QRMdi1WWeYHdrH/QWpN1e8juWfVKsb8B+pyJwTC+4Gy9w==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.3.1.tgz",
+      "integrity": "sha512-EF++BZbt6RZmOlE3SuTPu/NfwBF6q4ABS37HHXzs2LUVPBLx2QoY/K0fKpRChSo8eLiuxcbCVfqKgx/dplCDuQ==",
       "dev": true,
       "dependencies": {
         "magic-string": "^0.30.5",
@@ -4077,9 +4080,9 @@
       "dev": true
     },
     "node_modules/@vitest/spy": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.1.3.tgz",
-      "integrity": "sha512-Ec0qWyGS5LhATFQtldvChPTAHv08yHIOZfiNcjwRQbFPHpkih0md9KAbs7TfeIfL7OFKoe7B/6ukBTqByubXkQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.3.1.tgz",
+      "integrity": "sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^2.2.0"
@@ -4089,9 +4092,9 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.1.3.tgz",
-      "integrity": "sha512-Dyt3UMcdElTll2H75vhxfpZu03uFpXRCHxWnzcrFjZxT1kTbq8ALUYIeBgGolo1gldVdI0YSlQRacsqxTwNqwg==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.3.1.tgz",
+      "integrity": "sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==",
       "dev": true,
       "dependencies": {
         "diff-sequences": "^29.6.3",
@@ -4363,6 +4366,25 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.findlast": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.4.tgz",
+      "integrity": "sha512-BMtLxpV+8BD+6ZPFIWmnUBpQoy+A+ujcg4rhp2iwCRJYA7PEh2MS4NL3lz8EiDlLrJPp2hg9qWihr5pd//jcGw==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.5",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.22.3",
+        "es-errors": "^1.3.0",
+        "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/array.prototype.findlastindex": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.4.tgz",
@@ -4418,6 +4440,18 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array.prototype.toreversed": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz",
+      "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "define-properties": "^1.2.0",
+        "es-abstract": "^1.22.1",
+        "es-shim-unscopables": "^1.0.0"
+      }
+    },
     "node_modules/array.prototype.tosorted": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz",
@@ -4491,9 +4525,9 @@
       }
     },
     "node_modules/ast-types-flow": {
-      "version": "0.0.7",
-      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
-      "integrity": "sha512-eBvWn1lvIApYMhzQMsu9ciLfkBY499mFZlNqG+/9WR7PVlroQw0vG30cOQQbaKz3sCEc44TAOu2ykzqXSNnwag==",
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz",
+      "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==",
       "dev": true
     },
     "node_modules/astral-regex": {
@@ -4544,15 +4578,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/axe-core": {
-      "version": "4.8.4",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.8.4.tgz",
-      "integrity": "sha512-CZLSKisu/bhJ2awW4kJndluz2HLZYIHh5Uy1+ZwDRkJi69811xgIXXfdU9HSLX0Th+ILrHj8qfL/5wzamsFtQg==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/axobject-query": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
@@ -4644,9 +4669,9 @@
       }
     },
     "node_modules/bootstrap": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.1.tgz",
-      "integrity": "sha512-jzwza3Yagduci2x0rr9MeFSORjcHpt0lRZukZPZQJT1Dth5qzV7XcgGqYzi39KGAVYR8QEDVoO0ubFKOxzMG+g==",
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz",
+      "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==",
       "funding": [
         {
           "type": "github",
@@ -5752,16 +5777,16 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.56.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.56.0.tgz",
-      "integrity": "sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==",
+      "version": "8.57.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz",
+      "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.56.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/js": "8.57.0",
+        "@humanwhocodes/config-array": "^0.11.14",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
         "@ungap/structured-clone": "^1.2.0",
@@ -5807,9 +5832,9 @@
       }
     },
     "node_modules/eslint-config-prettier": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz",
-      "integrity": "sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw==",
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+      "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
       "dev": true,
       "bin": {
         "eslint-config-prettier": "bin/cli.js"
@@ -5865,28 +5890,28 @@
       }
     },
     "node_modules/eslint-plugin-import": {
-      "version": "2.28.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.28.1.tgz",
-      "integrity": "sha512-9I9hFlITvOV55alzoKBI+K9q74kv0iKMeY6av5+umsNwayt59fz692daGyjR+oStBQgx6nwR9rXldDev3Clw+A==",
+      "version": "2.29.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz",
+      "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.findlastindex": "^1.2.2",
-        "array.prototype.flat": "^1.3.1",
-        "array.prototype.flatmap": "^1.3.1",
+        "array-includes": "^3.1.7",
+        "array.prototype.findlastindex": "^1.2.3",
+        "array.prototype.flat": "^1.3.2",
+        "array.prototype.flatmap": "^1.3.2",
         "debug": "^3.2.7",
         "doctrine": "^2.1.0",
-        "eslint-import-resolver-node": "^0.3.7",
+        "eslint-import-resolver-node": "^0.3.9",
         "eslint-module-utils": "^2.8.0",
-        "has": "^1.0.3",
-        "is-core-module": "^2.13.0",
+        "hasown": "^2.0.0",
+        "is-core-module": "^2.13.1",
         "is-glob": "^4.0.3",
         "minimatch": "^3.1.2",
-        "object.fromentries": "^2.0.6",
-        "object.groupby": "^1.0.0",
-        "object.values": "^1.1.6",
+        "object.fromentries": "^2.0.7",
+        "object.groupby": "^1.0.1",
+        "object.values": "^1.1.7",
         "semver": "^6.3.1",
-        "tsconfig-paths": "^3.14.2"
+        "tsconfig-paths": "^3.15.0"
       },
       "engines": {
         "node": ">=4"
@@ -5917,27 +5942,27 @@
       }
     },
     "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.7.1",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.7.1.tgz",
-      "integrity": "sha512-63Bog4iIethyo8smBklORknVjB0T2dwB8Mr/hIC+fBS0uyHdYYpzM/Ed+YC8VxTjlXHEWFOdmgwcDn1U2L9VCA==",
-      "dev": true,
-      "dependencies": {
-        "@babel/runtime": "^7.20.7",
-        "aria-query": "^5.1.3",
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "ast-types-flow": "^0.0.7",
-        "axe-core": "^4.6.2",
-        "axobject-query": "^3.1.1",
+      "version": "6.8.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz",
+      "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==",
+      "dev": true,
+      "dependencies": {
+        "@babel/runtime": "^7.23.2",
+        "aria-query": "^5.3.0",
+        "array-includes": "^3.1.7",
+        "array.prototype.flatmap": "^1.3.2",
+        "ast-types-flow": "^0.0.8",
+        "axe-core": "=4.7.0",
+        "axobject-query": "^3.2.1",
         "damerau-levenshtein": "^1.0.8",
         "emoji-regex": "^9.2.2",
-        "has": "^1.0.3",
-        "jsx-ast-utils": "^3.3.3",
-        "language-tags": "=1.0.5",
+        "es-iterator-helpers": "^1.0.15",
+        "hasown": "^2.0.0",
+        "jsx-ast-utils": "^3.3.5",
+        "language-tags": "^1.0.9",
         "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "semver": "^6.3.0"
+        "object.entries": "^1.1.7",
+        "object.fromentries": "^2.0.7"
       },
       "engines": {
         "node": ">=4.0"
@@ -5946,28 +5971,48 @@
         "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
+      "dev": true,
+      "dependencies": {
+        "dequal": "^2.0.3"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/axe-core": {
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
+      "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/eslint-plugin-react": {
-      "version": "7.33.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.33.2.tgz",
-      "integrity": "sha512-73QQMKALArI8/7xGLNI/3LylrEYrlKZSb5C9+q3OtOewTnMQi5cT+aE9E41sLCmli3I9PGGmD1yiZydyo4FEPw==",
+      "version": "7.34.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.0.tgz",
+      "integrity": "sha512-MeVXdReleBTdkz/bvcQMSnCXGi+c9kvy51IpinjnJgutl3YTHWsDdke7Z1ufZpGfDG8xduBDKyjtB9JH1eBKIQ==",
       "dev": true,
       "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flatmap": "^1.3.1",
-        "array.prototype.tosorted": "^1.1.1",
+        "array-includes": "^3.1.7",
+        "array.prototype.findlast": "^1.2.4",
+        "array.prototype.flatmap": "^1.3.2",
+        "array.prototype.toreversed": "^1.1.2",
+        "array.prototype.tosorted": "^1.1.3",
         "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.0.12",
+        "es-iterator-helpers": "^1.0.17",
         "estraverse": "^5.3.0",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
         "minimatch": "^3.1.2",
-        "object.entries": "^1.1.6",
-        "object.fromentries": "^2.0.6",
-        "object.hasown": "^1.1.2",
-        "object.values": "^1.1.6",
+        "object.entries": "^1.1.7",
+        "object.fromentries": "^2.0.7",
+        "object.hasown": "^1.1.3",
+        "object.values": "^1.1.7",
         "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.4",
+        "resolve": "^2.0.0-next.5",
         "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.8"
+        "string.prototype.matchall": "^4.0.10"
       },
       "engines": {
         "node": ">=4"
@@ -5989,9 +6034,9 @@
       }
     },
     "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.3.tgz",
-      "integrity": "sha512-Hh0wv8bUNY877+sI0BlCUlsS0TYYQqvzEwJsJJPM2WF4RnTStSnSR3zdJYa2nPOJgg3UghXi54lVyMSmpCalzA==",
+      "version": "0.4.5",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.5.tgz",
+      "integrity": "sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w==",
       "dev": true,
       "peerDependencies": {
         "eslint": ">=7"
@@ -6832,15 +6877,6 @@
         "graphql": ">=0.11 <=16"
       }
     },
-    "node_modules/has": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
-      "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-bigints": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz",
@@ -7936,12 +7972,15 @@
       "dev": true
     },
     "node_modules/language-tags": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
-      "integrity": "sha512-qJhlO9cGXi6hBGKoxEG/sKZDAHD5Hnu9Hs4WbOY3pCWXDhw0N8x1NenNzm2EnNLkLkk7J2SdxAkDSbb6ftT+UQ==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz",
+      "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==",
       "dev": true,
       "dependencies": {
-        "language-subtag-registry": "~0.3.2"
+        "language-subtag-registry": "^0.3.20"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
     "node_modules/levn": {
@@ -8244,9 +8283,9 @@
       }
     },
     "node_modules/maplibre-gl": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.0.1.tgz",
-      "integrity": "sha512-UF+wI2utIciFXNg6+gYaMe7IGa9fMLzAZM3vdlGilqyWYmuibjcN40yGVgkz2r28//aOLphvtli3TbDEjEqHww==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.0.tgz",
+      "integrity": "sha512-4RQFJSroo/JAJml6Rj2FFIZOfnjsqPp0O9kSp8aVXQUY0HGXNupltzPKbBZeucqi7ynRQHFeu+onTM3hY0Makw==",
       "dependencies": {
         "@mapbox/geojson-rewind": "^0.5.2",
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -9083,9 +9122,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
-      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
+      "version": "3.2.5",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz",
+      "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -9242,14 +9281,14 @@
       }
     },
     "node_modules/react-bootstrap": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.8.0.tgz",
-      "integrity": "sha512-e/aNtxl0Z2ozrIaR82jr6Zz7ss9GSoaXpQaxmvtDUsTZIq/XalkduR/ZXP6vbQHz2T4syvjA+4FbtwELxxmpww==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.1.tgz",
+      "integrity": "sha512-J3OpRZIvCTQK+Tg/jOkRUvpYLHMdGeU9KqFUBQrV0d/Qr/3nsINpiOJyZMWnM5SJ3ctZdhPA6eCIKpEJR3Ellg==",
       "dependencies": {
-        "@babel/runtime": "^7.21.0",
+        "@babel/runtime": "^7.22.5",
         "@restart/hooks": "^0.4.9",
-        "@restart/ui": "^1.6.3",
-        "@types/react-transition-group": "^4.4.5",
+        "@restart/ui": "^1.6.6",
+        "@types/react-transition-group": "^4.4.6",
         "classnames": "^2.3.2",
         "dom-helpers": "^5.2.1",
         "invariant": "^2.2.4",
@@ -9294,9 +9333,9 @@
       "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
     },
     "node_modules/react-map-gl": {
-      "version": "7.1.5",
-      "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.5.tgz",
-      "integrity": "sha512-YS2u2cSLlZVGjfa394f0snO6f6ZwZVTKqQwjbq/jj0w7fHU01Mn+Xqvm/Qr7nZChoT3OG7kh8JluDcXeBrDG/g==",
+      "version": "7.1.7",
+      "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.7.tgz",
+      "integrity": "sha512-mwjc0obkBJOXCcoXQr3VoLqmqwo9vS4bXfbGsdxXzEgVCv/PM0v+1QggL7W0d/ccIy+VCjbXNlGij+PENz6VNg==",
       "dependencies": {
         "@maplibre/maplibre-gl-style-spec": "^19.2.1",
         "@types/mapbox-gl": ">=1.0.0"
@@ -10132,17 +10171,23 @@
       }
     },
     "node_modules/strip-literal": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-1.3.0.tgz",
-      "integrity": "sha512-PugKzOsyXpArk0yWmUwqOZecSO0GH0bPoctLcqNDH9J04pVW3lflYE0ujElBGTloevcxF5MofAOZ7C5l2b+wLg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.0.0.tgz",
+      "integrity": "sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==",
       "dev": true,
       "dependencies": {
-        "acorn": "^8.10.0"
+        "js-tokens": "^8.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/strip-literal/node_modules/js-tokens": {
+      "version": "8.0.3",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.3.tgz",
+      "integrity": "sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==",
+      "dev": true
+    },
     "node_modules/supercluster": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
@@ -10478,9 +10523,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.2.2.tgz",
-      "integrity": "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==",
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
+      "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
       "dev": true,
       "bin": {
         "tsc": "bin/tsc",
@@ -10778,9 +10823,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.1.3.tgz",
-      "integrity": "sha512-BLSO72YAkIUuNrOx+8uznYICJfTEbvBAmWClY3hpath5+h1mbPS5OMn42lrTxXuyCazVyZoDkSRnju78GiVCqA==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.3.1.tgz",
+      "integrity": "sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
@@ -11277,18 +11322,17 @@
       }
     },
     "node_modules/vitest": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.1.3.tgz",
-      "integrity": "sha512-2l8om1NOkiA90/Y207PsEvJLYygddsOyr81wLQ20Ra8IlLKbyQncWsGZjnbkyG2KwwuTXLQjEPOJuxGMG8qJBQ==",
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.3.1.tgz",
+      "integrity": "sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==",
       "dev": true,
       "dependencies": {
-        "@vitest/expect": "1.1.3",
-        "@vitest/runner": "1.1.3",
-        "@vitest/snapshot": "1.1.3",
-        "@vitest/spy": "1.1.3",
-        "@vitest/utils": "1.1.3",
-        "acorn-walk": "^8.3.1",
-        "cac": "^6.7.14",
+        "@vitest/expect": "1.3.1",
+        "@vitest/runner": "1.3.1",
+        "@vitest/snapshot": "1.3.1",
+        "@vitest/spy": "1.3.1",
+        "@vitest/utils": "1.3.1",
+        "acorn-walk": "^8.3.2",
         "chai": "^4.3.10",
         "debug": "^4.3.4",
         "execa": "^8.0.1",
@@ -11297,11 +11341,11 @@
         "pathe": "^1.1.1",
         "picocolors": "^1.0.0",
         "std-env": "^3.5.0",
-        "strip-literal": "^1.3.0",
+        "strip-literal": "^2.0.0",
         "tinybench": "^2.5.1",
-        "tinypool": "^0.8.1",
+        "tinypool": "^0.8.2",
         "vite": "^5.0.0",
-        "vite-node": "1.1.3",
+        "vite-node": "1.3.1",
         "why-is-node-running": "^2.2.2"
       },
       "bin": {
@@ -11316,8 +11360,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "^1.0.0",
-        "@vitest/ui": "^1.0.0",
+        "@vitest/browser": "1.3.1",
+        "@vitest/ui": "1.3.1",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -11694,6 +11738,175 @@
         "node": ">=12"
       }
     },
+    "node_modules/vitest/node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.1.tgz",
+      "integrity": "sha512-iU2Sya8hNn1LhsYyf0N+L4Gf9Qc+9eBTJJJsaOGUp+7x4n2M9dxTt8UvhJl3oeftSjblSlpCfvjA/IfP3g5VjQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.1.tgz",
+      "integrity": "sha512-wlzcWiH2Ir7rdMELxFE5vuM7D6TsOcJ2Yw0c3vaBR3VOsJFVTx9xvwnAvhgU5Ii8Gd6+I11qNHwndDscIm0HXg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.1.tgz",
+      "integrity": "sha512-YRXa1+aZIFN5BaImK+84B3uNK8C6+ynKLPgvn29X9s0LTVCByp54TB7tdSMHDR7GTV39bz1lOmlLDuedgTwwHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.1.tgz",
+      "integrity": "sha512-opjWJ4MevxeA8FhlngQWPBOvVWYNPFkq6/25rGgG+KOy0r8clYwL1CFd+PGwRqqMFVQ4/Qd3sQu5t7ucP7C/Uw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.1.tgz",
+      "integrity": "sha512-uBkwaI+gBUlIe+EfbNnY5xNyXuhZbDSx2nzzW8tRMjUmpScd6lCQYKY2V9BATHtv5Ef2OBq6SChEP8h+/cxifQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.1.tgz",
+      "integrity": "sha512-0bK9aG1kIg0Su7OcFTlexkVeNZ5IzEsnz1ept87a0TUgZ6HplSgkJAnFpEVRW7GRcikT4GlPV0pbtVedOaXHQQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.1.tgz",
+      "integrity": "sha512-qB6AFRXuP8bdkBI4D7UPUbE7OQf7u5OL+R94JE42Z2Qjmyj74FtDdLGeriRyBDhm4rQSvqAGCGC01b8Fu2LthQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.1.tgz",
+      "integrity": "sha512-sHig3LaGlpNgDj5o8uPEoGs98RII8HpNIqFtAI8/pYABO8i0nb1QzT0JDoXF/pxzqO+FkxvwkHZo9k0NJYDedg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.1.tgz",
+      "integrity": "sha512-nD3YcUv6jBJbBNFvSbp0IV66+ba/1teuBcu+fBBPZ33sidxitc6ErhON3JNavaH8HlswhWMC3s5rgZpM4MtPqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-linux-x64-musl": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.1.tgz",
+      "integrity": "sha512-7/XVZqgBby2qp/cO0TQ8uJK+9xnSdJ9ct6gSDdEr4MfABrjTyrW6Bau7HQ73a2a5tPB7hno49A0y1jhWGDN9OQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.1.tgz",
+      "integrity": "sha512-CYc64bnICG42UPL7TrhIwsJW4QcKkIt9gGlj21gq3VV0LL6XNb1yAdHVp1pIi9gkts9gGcT3OfUYHjGP7ETAiw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.1.tgz",
+      "integrity": "sha512-LN+vnlZ9g0qlHGlS920GR4zFCqAwbv2lULrR29yGaWP9u7wF5L7GqWu9Ah6/kFZPXPUkpdZwd//TNR+9XC9hvA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/vitest/node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.1.tgz",
+      "integrity": "sha512-n+vkrSyphvmU0qkQ6QBNXCGr2mKjhP08mPRM/Xp5Ck2FV4NrHU+y6axzDeixUrCBHVUS51TZhjqrKBBsHLKb2Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/vitest/node_modules/esbuild": {
       "version": "0.19.12",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz",
@@ -11733,9 +11946,9 @@
       }
     },
     "node_modules/vitest/node_modules/rollup": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.10.0.tgz",
-      "integrity": "sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==",
+      "version": "4.12.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.1.tgz",
+      "integrity": "sha512-ggqQKvx/PsB0FaWXhIvVkSWh7a/PCLQAsMjBc+nA2M8Rv2/HG0X6zvixAB7KyZBRtifBUhy5k8voQX/mRnABPg==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -11748,26 +11961,26 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.10.0",
-        "@rollup/rollup-android-arm64": "4.10.0",
-        "@rollup/rollup-darwin-arm64": "4.10.0",
-        "@rollup/rollup-darwin-x64": "4.10.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.10.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.10.0",
-        "@rollup/rollup-linux-arm64-musl": "4.10.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.10.0",
-        "@rollup/rollup-linux-x64-gnu": "4.10.0",
-        "@rollup/rollup-linux-x64-musl": "4.10.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.10.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.10.0",
-        "@rollup/rollup-win32-x64-msvc": "4.10.0",
+        "@rollup/rollup-android-arm-eabi": "4.12.1",
+        "@rollup/rollup-android-arm64": "4.12.1",
+        "@rollup/rollup-darwin-arm64": "4.12.1",
+        "@rollup/rollup-darwin-x64": "4.12.1",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.12.1",
+        "@rollup/rollup-linux-arm64-gnu": "4.12.1",
+        "@rollup/rollup-linux-arm64-musl": "4.12.1",
+        "@rollup/rollup-linux-riscv64-gnu": "4.12.1",
+        "@rollup/rollup-linux-x64-gnu": "4.12.1",
+        "@rollup/rollup-linux-x64-musl": "4.12.1",
+        "@rollup/rollup-win32-arm64-msvc": "4.12.1",
+        "@rollup/rollup-win32-ia32-msvc": "4.12.1",
+        "@rollup/rollup-win32-x64-msvc": "4.12.1",
         "fsevents": "~2.3.2"
       }
     },
     "node_modules/vitest/node_modules/vite": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.1.tgz",
-      "integrity": "sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.6.tgz",
+      "integrity": "sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==",
       "dev": true,
       "dependencies": {
         "esbuild": "^0.19.3",
diff --git a/client-next/package.json b/client-next/package.json
index ad3f1fa10a5..df70e5baf28 100644
--- a/client-next/package.json
+++ b/client-next/package.json
@@ -18,38 +18,38 @@
   },
   "dependencies": {
     "@googlemaps/polyline-codec": "1.0.28",
-    "bootstrap": "5.3.1",
+    "bootstrap": "5.3.3",
     "graphql": "16.8.1",
     "graphql-request": "6.1.0",
-    "maplibre-gl": "4.0.1",
+    "maplibre-gl": "4.1.0",
     "react": "18.2.0",
-    "react-bootstrap": "2.8.0",
+    "react-bootstrap": "2.10.1",
     "react-dom": "18.2.0",
-    "react-map-gl": "7.1.5"
+    "react-map-gl": "7.1.7"
   },
   "devDependencies": {
-    "@graphql-codegen/cli": "5.0.0",
-    "@graphql-codegen/client-preset": "4.1.0",
-    "@graphql-codegen/introspection": "4.0.0",
-    "@parcel/watcher": "2.3.0",
-    "@testing-library/react": "14.1.2",
-    "@types/react": "18.2.21",
-    "@types/react-dom": "18.2.7",
-    "@typescript-eslint/eslint-plugin": "7.1.0",
-    "@typescript-eslint/parser": "7.1.0",
-    "@vitejs/plugin-react": "4.0.4",
-    "@vitest/coverage-v8": "1.1.3",
-    "eslint": "8.56.0",
-    "eslint-config-prettier": "9.0.0",
-    "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-jsx-a11y": "6.7.1",
-    "eslint-plugin-react": "7.33.2",
+    "@graphql-codegen/cli": "5.0.2",
+    "@graphql-codegen/client-preset": "4.2.4",
+    "@graphql-codegen/introspection": "4.0.3",
+    "@parcel/watcher": "2.4.1",
+    "@testing-library/react": "14.2.1",
+    "@types/react": "18.2.65",
+    "@types/react-dom": "18.2.21",
+    "@typescript-eslint/eslint-plugin": "7.2.0",
+    "@typescript-eslint/parser": "7.2.0",
+    "@vitejs/plugin-react": "4.2.1",
+    "@vitest/coverage-v8": "1.3.1",
+    "eslint": "8.57.0",
+    "eslint-config-prettier": "9.1.0",
+    "eslint-plugin-import": "2.29.1",
+    "eslint-plugin-jsx-a11y": "6.8.0",
+    "eslint-plugin-react": "7.34.0",
     "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-react-refresh": "0.4.3",
+    "eslint-plugin-react-refresh": "0.4.5",
     "jsdom": "24.0.0",
-    "prettier": "3.0.3",
-    "typescript": "5.2.2",
+    "prettier": "3.2.5",
+    "typescript": "5.4.2",
     "vite": "4.5.2",
-    "vitest": "1.1.3"
+    "vitest": "1.3.1"
   }
 }

From dbc00eecb4e86aa6c173d3a01298d505fd108bbd Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Mon, 11 Mar 2024 15:09:33 +0200
Subject: [PATCH 0770/1688] Stop layer with alert information

---
 .../layers/stops/StopsLayerTest.java          | 67 +++++++++++++-
 .../ext/vectortiles/VectorTilesResource.java  |  4 +-
 ...DigitransitRealtimeStopPropertyMapper.java | 90 +++++++++++++++++++
 .../stops/DigitransitStopPropertyMapper.java  |  2 +-
 .../layers/stops/StopsBaseLayerBuilder.java   | 30 +++++++
 .../layers/stops/StopsLayerBuilder.java       |  9 +-
 6 files changed, 194 insertions(+), 8 deletions(-)
 create mode 100644 src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
 create mode 100644 src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java

diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
index 91d9009e2f0..ac05842a70d 100644
--- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
@@ -1,15 +1,28 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.framework.time.TimeUtils.time;
+import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.opentripplanner.ext.realtimeresolver.RealtimeResolver;
 import org.opentripplanner.framework.i18n.TranslatedString;
+import org.opentripplanner.model.plan.Place;
+import org.opentripplanner.routing.alertpatch.AlertEffect;
+import org.opentripplanner.routing.alertpatch.EntitySelector;
+import org.opentripplanner.routing.alertpatch.TimePeriod;
+import org.opentripplanner.routing.alertpatch.TransitAlert;
+import org.opentripplanner.routing.impl.TransitAlertServiceImpl;
+import org.opentripplanner.routing.services.TransitAlertService;
+import org.opentripplanner.transit.model._data.TransitModelForTest;
 import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.StopModel;
@@ -18,9 +31,10 @@
 public class StopsLayerTest {
 
   private RegularStop stop;
+  private RegularStop stop2;
 
   @BeforeEach
-  public void setUp() {
+  public final void setUp() {
     var nameTranslations = TranslatedString.getI18NString(
       new HashMap<>() {
         {
@@ -49,6 +63,14 @@ public void setUp() {
         .withDescription(descTranslations)
         .withCoordinate(50, 10)
         .build();
+    stop2 =
+      StopModel
+        .of()
+        .regularStop(new FeedScopedId("F", "name"))
+        .withName(nameTranslations)
+        .withDescription(descTranslations)
+        .withCoordinate(51, 10)
+        .build();
   }
 
   @Test
@@ -89,4 +111,47 @@ public void digitransitStopPropertyMapperTranslationTest() {
     assertEquals("nameDE", map.get("name"));
     assertEquals("descDE", map.get("desc"));
   }
+
+  @Test
+  public void digitransitRealtimeStopPropertyMapperTest() {
+    var deduplicator = new Deduplicator();
+    var transitModel = new TransitModel(new StopModel(), deduplicator);
+    transitModel.index();
+    var alertService = new TransitAlertServiceImpl(transitModel);
+    var transitService = new DefaultTransitService(transitModel) {
+      @Override
+      public TransitAlertService getTransitAlertService() {
+        return alertService;
+      }
+    };
+
+    Route route = TransitModelForTest.route("route").build();
+    var itinerary = newItinerary(Place.forStop(stop), time("11:00"))
+      .bus(route, 1, time("11:05"), time("11:20"), Place.forStop(stop2))
+      .build();
+
+    var alert = TransitAlert
+      .of(stop.getId())
+      .addEntity(new EntitySelector.Stop(stop.getId()))
+      .addTimePeriod(new TimePeriod(0, 0))
+      .withEffect(AlertEffect.NO_SERVICE)
+      .build();
+    transitService.getTransitAlertService().setAlerts(List.of(alert));
+
+    var itineraries = List.of(itinerary);
+    RealtimeResolver.populateLegsWithRealtime(itineraries, transitService);
+
+    DigitransitRealtimeStopPropertyMapper mapper = DigitransitRealtimeStopPropertyMapper.create(
+      transitService,
+      new Locale("en-US")
+    );
+
+    Map map = new HashMap<>();
+    mapper.map(stop).forEach(o -> map.put(o.key(), o.value()));
+
+    assertEquals("F:name", map.get("gtfsId"));
+    assertEquals("name", map.get("name"));
+    assertEquals("desc", map.get("desc"));
+    assertEquals("[{\"alertEffect\":\"NO_SERVICE\"}]", map.get("alerts"));
+  }
 }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
index 29701ee2307..8622e96e2ff 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
@@ -20,7 +20,7 @@
 import org.opentripplanner.apis.support.TileJson;
 import org.opentripplanner.ext.vectortiles.layers.areastops.AreaStopsLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.stations.StationsLayerBuilder;
-import org.opentripplanner.ext.vectortiles.layers.stops.StopsLayerBuilder;
+import org.opentripplanner.ext.vectortiles.layers.stops.StopsBaseLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.vehicleparkings.VehicleParkingGroupsLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.vehicleparkings.VehicleParkingsLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.vehiclerental.VehicleRentalPlacesLayerBuilder;
@@ -122,7 +122,7 @@ private static LayerBuilder createLayerBuilder(
     OtpServerRequestContext context
   ) {
     return switch (layerParameters.type()) {
-      case Stop -> new StopsLayerBuilder(context.transitService(), layerParameters, locale);
+      case Stop -> new StopsBaseLayerBuilder(context.transitService(), layerParameters, locale);
       case Station -> new StationsLayerBuilder(context.transitService(), layerParameters, locale);
       case AreaStop -> new AreaStopsLayerBuilder(context.transitService(), layerParameters, locale);
       case VehicleRental -> new VehicleRentalPlacesLayerBuilder(
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
new file mode 100644
index 00000000000..a2b3c055552
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -0,0 +1,90 @@
+package org.opentripplanner.ext.vectortiles.layers.stops;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.opentripplanner.apis.support.mapping.PropertyMapper;
+import org.opentripplanner.framework.i18n.I18NStringMapper;
+import org.opentripplanner.inspector.vector.KeyValue;
+import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.site.RegularStop;
+import org.opentripplanner.transit.service.TransitService;
+
+public class DigitransitRealtimeStopPropertyMapper extends PropertyMapper {
+
+  private final TransitService transitService;
+  private final I18NStringMapper i18NStringMapper;
+
+  public DigitransitRealtimeStopPropertyMapper(TransitService transitService, Locale locale) {
+    this.transitService = transitService;
+    this.i18NStringMapper = new I18NStringMapper(locale);
+  }
+
+  protected static DigitransitRealtimeStopPropertyMapper create(
+    TransitService transitService,
+    Locale locale
+  ) {
+    return new DigitransitRealtimeStopPropertyMapper(transitService, locale);
+  }
+
+  @Override
+  protected Collection map(RegularStop stop) {
+    Collection patternsForStop = transitService.getPatternsForStop(stop);
+
+    String type = patternsForStop
+      .stream()
+      .map(TripPattern::getMode)
+      .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
+      .entrySet()
+      .stream()
+      .max(Map.Entry.comparingByValue())
+      .map(Map.Entry::getKey)
+      .map(Enum::name)
+      .orElse(null);
+
+    String routes = JSONArray.toJSONString(
+      transitService
+        .getRoutesForStop(stop)
+        .stream()
+        .map(route -> {
+          JSONObject routeObject = new JSONObject();
+          routeObject.put("gtfsType", route.getGtfsType());
+          return routeObject;
+        })
+        .toList()
+    );
+
+    String alerts = JSONArray.toJSONString(
+      transitService
+        .getTransitAlertService()
+        .getStopAlerts(stop.getId())
+        .stream()
+        .map(alert -> {
+          JSONObject alertObject = new JSONObject();
+          alertObject.put("alertEffect", alert.effect().toString());
+          return alertObject;
+        })
+        .toList()
+    );
+
+    return List.of(
+      new KeyValue("gtfsId", stop.getId().toString()),
+      new KeyValue("name", i18NStringMapper.mapNonnullToApi(stop.getName())),
+      new KeyValue("code", stop.getCode()),
+      new KeyValue("platform", stop.getPlatformCode()),
+      new KeyValue("desc", i18NStringMapper.mapToApi(stop.getDescription())),
+      new KeyValue(
+        "parentStation",
+        stop.getParentStation() != null ? stop.getParentStation().getId() : "null"
+      ),
+      new KeyValue("type", type),
+      new KeyValue("routes", routes),
+      new KeyValue("alerts", alerts)
+    );
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
index 2c5a4519e96..1634e6b0584 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
@@ -20,7 +20,7 @@ public class DigitransitStopPropertyMapper extends PropertyMapper {
   private final TransitService transitService;
   private final I18NStringMapper i18NStringMapper;
 
-  private DigitransitStopPropertyMapper(TransitService transitService, Locale locale) {
+  DigitransitStopPropertyMapper(TransitService transitService, Locale locale) {
     this.transitService = transitService;
     this.i18NStringMapper = new I18NStringMapper(locale);
   }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java
new file mode 100644
index 00000000000..43dd499c9c0
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java
@@ -0,0 +1,30 @@
+package org.opentripplanner.ext.vectortiles.layers.stops;
+
+import static java.util.Map.entry;
+
+import java.util.Locale;
+import java.util.Map;
+import org.opentripplanner.ext.vectortiles.VectorTilesResource;
+import org.opentripplanner.inspector.vector.LayerParameters;
+import org.opentripplanner.transit.service.TransitService;
+
+public class StopsBaseLayerBuilder extends StopsLayerBuilder {
+
+  public StopsBaseLayerBuilder(
+    TransitService service,
+    LayerParameters layerParameters,
+    Locale locale
+  ) {
+    super(
+      service,
+      Map.ofEntries(
+        entry(MapperType.Digitransit, new DigitransitStopPropertyMapper(service, locale)),
+        entry(
+          MapperType.DigitransitRealtime,
+          new DigitransitRealtimeStopPropertyMapper(service, locale)
+        )
+      ),
+      layerParameters
+    );
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
index 2ad85587fe5..fa7036efd52 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
@@ -14,7 +14,7 @@
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.TransitService;
 
-public class StopsLayerBuilder extends LayerBuilder {
+public class StopsLayerBuilder extends LayerBuilder {
 
   static Map>> mappers = Map.of(
     MapperType.Digitransit,
@@ -24,11 +24,11 @@ public class StopsLayerBuilder extends LayerBuilder {
 
   public StopsLayerBuilder(
     TransitService transitService,
-    LayerParameters layerParameters,
-    Locale locale
+    Map> mappers,
+    LayerParameters layerParameters
   ) {
     super(
-      mappers.get(MapperType.valueOf(layerParameters.mapper())).apply(transitService, locale),
+      mappers.get(MapperType.valueOf(layerParameters.mapper())),
       layerParameters.name(),
       layerParameters.expansionFactor()
     );
@@ -51,5 +51,6 @@ protected List getGeometries(Envelope query) {
 
   enum MapperType {
     Digitransit,
+    DigitransitRealtime,
   }
 }

From c9774252f1ff1ccc6a24fa1daa66519f89cf8a44 Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Tue, 12 Mar 2024 12:15:26 +0200
Subject: [PATCH 0771/1688] Repeated code cleaned up

---
 ...DigitransitRealtimeStopPropertyMapper.java | 36 ++----------
 .../stops/DigitransitStopPropertyMapper.java  | 57 ++++++++++---------
 2 files changed, 36 insertions(+), 57 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index a2b3c055552..08506f86975 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -1,17 +1,16 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
+import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getRoutes;
+import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getType;
+
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.opentripplanner.apis.support.mapping.PropertyMapper;
 import org.opentripplanner.framework.i18n.I18NStringMapper;
 import org.opentripplanner.inspector.vector.KeyValue;
-import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.TransitService;
 
@@ -34,31 +33,6 @@ protected static DigitransitRealtimeStopPropertyMapper create(
 
   @Override
   protected Collection map(RegularStop stop) {
-    Collection patternsForStop = transitService.getPatternsForStop(stop);
-
-    String type = patternsForStop
-      .stream()
-      .map(TripPattern::getMode)
-      .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
-      .entrySet()
-      .stream()
-      .max(Map.Entry.comparingByValue())
-      .map(Map.Entry::getKey)
-      .map(Enum::name)
-      .orElse(null);
-
-    String routes = JSONArray.toJSONString(
-      transitService
-        .getRoutesForStop(stop)
-        .stream()
-        .map(route -> {
-          JSONObject routeObject = new JSONObject();
-          routeObject.put("gtfsType", route.getGtfsType());
-          return routeObject;
-        })
-        .toList()
-    );
-
     String alerts = JSONArray.toJSONString(
       transitService
         .getTransitAlertService()
@@ -82,8 +56,8 @@ protected Collection map(RegularStop stop) {
         "parentStation",
         stop.getParentStation() != null ? stop.getParentStation().getId() : "null"
       ),
-      new KeyValue("type", type),
-      new KeyValue("routes", routes),
+      new KeyValue("type", getType(transitService, stop)),
+      new KeyValue("routes", getRoutes(transitService, stop)),
       new KeyValue("alerts", alerts)
     );
   }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
index 1634e6b0584..2b6d7536f1c 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
@@ -34,30 +34,6 @@ protected static DigitransitStopPropertyMapper create(
 
   @Override
   protected Collection map(RegularStop stop) {
-    Collection patternsForStop = transitService.getPatternsForStop(stop);
-
-    String type = patternsForStop
-      .stream()
-      .map(TripPattern::getMode)
-      .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
-      .entrySet()
-      .stream()
-      .max(Map.Entry.comparingByValue())
-      .map(Map.Entry::getKey)
-      .map(Enum::name)
-      .orElse(null);
-
-    String routes = JSONArray.toJSONString(
-      transitService
-        .getRoutesForStop(stop)
-        .stream()
-        .map(route -> {
-          JSONObject routeObject = new JSONObject();
-          routeObject.put("gtfsType", route.getGtfsType());
-          return routeObject;
-        })
-        .toList()
-    );
     return List.of(
       new KeyValue("gtfsId", stop.getId().toString()),
       new KeyValue("name", i18NStringMapper.mapNonnullToApi(stop.getName())),
@@ -68,8 +44,37 @@ protected Collection map(RegularStop stop) {
         "parentStation",
         stop.getParentStation() != null ? stop.getParentStation().getId() : "null"
       ),
-      new KeyValue("type", type),
-      new KeyValue("routes", routes)
+      new KeyValue("type", getType(transitService, stop)),
+      new KeyValue("routes", getRoutes(transitService, stop))
     );
   }
+
+  protected static String getRoutes(TransitService transitService, RegularStop stop) {
+    return JSONArray.toJSONString(
+      transitService
+        .getRoutesForStop(stop)
+        .stream()
+        .map(route -> {
+          JSONObject routeObject = new JSONObject();
+          routeObject.put("gtfsType", route.getGtfsType());
+          return routeObject;
+        })
+        .toList()
+    );
+  }
+
+  protected static String getType(TransitService transitService, RegularStop stop) {
+    Collection patternsForStop = transitService.getPatternsForStop(stop);
+
+    return patternsForStop
+      .stream()
+      .map(TripPattern::getMode)
+      .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()))
+      .entrySet()
+      .stream()
+      .max(Map.Entry.comparingByValue())
+      .map(Map.Entry::getKey)
+      .map(Enum::name)
+      .orElse(null);
+  }
 }

From b2ee65f2d9d8f1fc87324c220784910a5eac9574 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 12 Mar 2024 12:00:21 +0100
Subject: [PATCH 0772/1688] Make the isReverseOf() method final

---
 src/main/java/org/opentripplanner/street/model/edge/Edge.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/street/model/edge/Edge.java b/src/main/java/org/opentripplanner/street/model/edge/Edge.java
index dfeba0577d0..00130265cf4 100644
--- a/src/main/java/org/opentripplanner/street/model/edge/Edge.java
+++ b/src/main/java/org/opentripplanner/street/model/edge/Edge.java
@@ -65,7 +65,7 @@ public boolean isEquivalentTo(Edge e) {
   /**
    * Returns true if this edge is the reverse of another.
    */
-  public boolean isReverseOf(Edge e) {
+  public final boolean isReverseOf(Edge e) {
     return (this.getFromVertex() == e.getToVertex() && this.getToVertex() == e.getFromVertex());
   }
 

From 50bd9db583f6d9e31fa0860e2f58a40e453ae21b Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Tue, 12 Mar 2024 13:51:55 +0100
Subject: [PATCH 0773/1688] Apply suggestions from code review

Co-authored-by: Johan Torin 
---
 script/Readme.md        | 2 +-
 script/run-and-test-otp | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/script/Readme.md b/script/Readme.md
index e750e47b595..76e8be9e5e2 100644
--- a/script/Readme.md
+++ b/script/Readme.md
@@ -5,7 +5,7 @@ This folder is intended for various scripts used during the OTP development. The
 
 If you want to submit your own scripts, you need to include:
  - A header at the beginning of the script stating who the owner is.
- - The scrip should print some usage documentation if invoked with `--help` and `-h`.
+ - The script should print some usage documentation if invoked with `--help` and `-h`.
 
 The regular pull-request approval process is required for submitting new scripts and changing 
 existing one. The reviewers are responsible for:
diff --git a/script/run-and-test-otp b/script/run-and-test-otp
index 53257736531..62da27c62bc 100755
--- a/script/run-and-test-otp
+++ b/script/run-and-test-otp
@@ -36,10 +36,13 @@ if [ "$1" == "-h" ]  || [ "$1" == "--help" ]; then
   echo "  4. Test the response, search for a unexpected token. If the token is"
   echo "     NOT present the test is GOOD, if not it is BAD"
   echo ""
-  echo "You need to edit the following variables in the beginning of the script:"
+  echo "Before using this script you should copy it to a folder which is NOT"
+  echo "under version control and then edit it. You must provide a query, a test and the"
+  echo "path to the otp data root directory with the OTP configuration files. You need to"
+  echo "edit the following variables in the beginning of the script:"
   echo "  - QUERY - the HTTP URL query to call using curl"
   echo "  - SEARCH_FOR - The string token to search for - if it is present the test FAILS!"
-  echo "  - DATA_DIR - File catalog where the the OTP config files is (build-config.json & router-config.json)"
+  echo "  - DATA_DIR - File catalog where the OTP config files is (build-config.json & router-config.json)"
   echo ""
   echo "This script is intended used together with 'git bisect' (binary search for good and bad"
   echo "commits), but it works well with manual changes in the code as well. When you have found"

From 4ce0cdd974d6587df3d2c900284ef31935530c96 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Tue, 12 Mar 2024 14:00:32 +0100
Subject: [PATCH 0774/1688] Apply suggestions from code review

Co-authored-by: Leonard Ehrenfried 
---
 script/Readme.md        | 2 +-
 script/run-and-test-otp | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/script/Readme.md b/script/Readme.md
index 76e8be9e5e2..ee10be50e50 100644
--- a/script/Readme.md
+++ b/script/Readme.md
@@ -20,7 +20,7 @@ existing one. The reviewers are responsible for:
 # Owner: J. Brown, Fun & Fast Transit Inc
 
 if [ "$1" == "-h" ]  || [ "$1" == "--help" ]; then
-  echo "The purpouse of the script is .."
+  echo "The purpose of the script is .."
   echo "Usage: ..."
   echo "Parameters: "
   :
diff --git a/script/run-and-test-otp b/script/run-and-test-otp
index 62da27c62bc..0fc322e3a86 100755
--- a/script/run-and-test-otp
+++ b/script/run-and-test-otp
@@ -30,10 +30,10 @@ DATA_DIR=../data/fix-error-access
 
 if [ "$1" == "-h" ]  || [ "$1" == "--help" ]; then
   echo "This script: "
-  echo "  1. Compile OTP"
-  echo "  2. Run OTP - build a graph and start the server"
-  echo "  3. Send a request using curl"
-  echo "  4. Test the response, search for a unexpected token. If the token is"
+  echo "  1. Compiles OTP"
+  echo "  2. Runs OTP - build a graph and start the server"
+  echo "  3. Sends a request using curl"
+  echo "  4. Tests the response, search for a unexpected token. If the token is"
   echo "     NOT present the test is GOOD, if not it is BAD"
   echo ""
   echo "Before using this script you should copy it to a folder which is NOT"

From 2e201f7cef0fa432401fe866ea03a7c4fb862e87 Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Tue, 12 Mar 2024 16:08:15 +0200
Subject: [PATCH 0775/1688] added check for validityperiod, cleaned up
 unnecessary parts

---
 .../layers/stops/StopsLayerTest.java          | 14 ++++++---
 .../ext/vectortiles/VectorTilesResource.java  |  4 +--
 ...DigitransitRealtimeStopPropertyMapper.java | 23 +++++++++-----
 .../stops/DigitransitStopPropertyMapper.java  |  2 +-
 .../layers/stops/StopsBaseLayerBuilder.java   | 30 -------------------
 .../layers/stops/StopsLayerBuilder.java       | 16 ++++++++--
 6 files changed, 41 insertions(+), 48 deletions(-)
 delete mode 100644 src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java

diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
index ac05842a70d..79a95d2883d 100644
--- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
@@ -4,12 +4,16 @@
 import static org.opentripplanner.framework.time.TimeUtils.time;
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
 
+import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZonedDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.opentripplanner._support.time.ZoneIds;
 import org.opentripplanner.ext.realtimeresolver.RealtimeResolver;
 import org.opentripplanner.framework.i18n.TranslatedString;
 import org.opentripplanner.model.plan.Place;
@@ -34,7 +38,7 @@ public class StopsLayerTest {
   private RegularStop stop2;
 
   @BeforeEach
-  public final void setUp() {
+  public void setUp() {
     var nameTranslations = TranslatedString.getI18NString(
       new HashMap<>() {
         {
@@ -116,6 +120,7 @@ public void digitransitStopPropertyMapperTranslationTest() {
   public void digitransitRealtimeStopPropertyMapperTest() {
     var deduplicator = new Deduplicator();
     var transitModel = new TransitModel(new StopModel(), deduplicator);
+    transitModel.initTimeZone(ZoneIds.HELSINKI);
     transitModel.index();
     var alertService = new TransitAlertServiceImpl(transitModel);
     var transitService = new DefaultTransitService(transitModel) {
@@ -129,11 +134,12 @@ public TransitAlertService getTransitAlertService() {
     var itinerary = newItinerary(Place.forStop(stop), time("11:00"))
       .bus(route, 1, time("11:05"), time("11:20"), Place.forStop(stop2))
       .build();
-
+    var startDate = ZonedDateTime.now(ZoneIds.HELSINKI).minusDays(1).toEpochSecond();
+    var endDate = ZonedDateTime.now(ZoneIds.HELSINKI).plusDays(1).toEpochSecond();
     var alert = TransitAlert
       .of(stop.getId())
       .addEntity(new EntitySelector.Stop(stop.getId()))
-      .addTimePeriod(new TimePeriod(0, 0))
+      .addTimePeriod(new TimePeriod(startDate, endDate))
       .withEffect(AlertEffect.NO_SERVICE)
       .build();
     transitService.getTransitAlertService().setAlerts(List.of(alert));
@@ -141,7 +147,7 @@ public TransitAlertService getTransitAlertService() {
     var itineraries = List.of(itinerary);
     RealtimeResolver.populateLegsWithRealtime(itineraries, transitService);
 
-    DigitransitRealtimeStopPropertyMapper mapper = DigitransitRealtimeStopPropertyMapper.create(
+    DigitransitRealtimeStopPropertyMapper mapper = new DigitransitRealtimeStopPropertyMapper(
       transitService,
       new Locale("en-US")
     );
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
index 8622e96e2ff..29701ee2307 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/VectorTilesResource.java
@@ -20,7 +20,7 @@
 import org.opentripplanner.apis.support.TileJson;
 import org.opentripplanner.ext.vectortiles.layers.areastops.AreaStopsLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.stations.StationsLayerBuilder;
-import org.opentripplanner.ext.vectortiles.layers.stops.StopsBaseLayerBuilder;
+import org.opentripplanner.ext.vectortiles.layers.stops.StopsLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.vehicleparkings.VehicleParkingGroupsLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.vehicleparkings.VehicleParkingsLayerBuilder;
 import org.opentripplanner.ext.vectortiles.layers.vehiclerental.VehicleRentalPlacesLayerBuilder;
@@ -122,7 +122,7 @@ private static LayerBuilder createLayerBuilder(
     OtpServerRequestContext context
   ) {
     return switch (layerParameters.type()) {
-      case Stop -> new StopsBaseLayerBuilder(context.transitService(), layerParameters, locale);
+      case Stop -> new StopsLayerBuilder(context.transitService(), layerParameters, locale);
       case Station -> new StationsLayerBuilder(context.transitService(), layerParameters, locale);
       case AreaStop -> new AreaStopsLayerBuilder(context.transitService(), layerParameters, locale);
       case VehicleRental -> new VehicleRentalPlacesLayerBuilder(
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index 08506f86975..2bae5074a78 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -3,6 +3,8 @@
 import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getRoutes;
 import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getType;
 
+import java.time.Instant;
+import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
@@ -24,13 +26,6 @@ public DigitransitRealtimeStopPropertyMapper(TransitService transitService, Loca
     this.i18NStringMapper = new I18NStringMapper(locale);
   }
 
-  protected static DigitransitRealtimeStopPropertyMapper create(
-    TransitService transitService,
-    Locale locale
-  ) {
-    return new DigitransitRealtimeStopPropertyMapper(transitService, locale);
-  }
-
   @Override
   protected Collection map(RegularStop stop) {
     String alerts = JSONArray.toJSONString(
@@ -40,7 +35,19 @@ protected Collection map(RegularStop stop) {
         .stream()
         .map(alert -> {
           JSONObject alertObject = new JSONObject();
-          alertObject.put("alertEffect", alert.effect().toString());
+          Instant currentTime = ZonedDateTime.now(transitService.getTimeZone()).toInstant();
+          if (
+            (
+              alert.getEffectiveStartDate() != null &&
+              alert.getEffectiveStartDate().isBefore(currentTime)
+            ) &&
+            (
+              alert.getEffectiveEndDate() != null &&
+              alert.getEffectiveEndDate().isAfter(currentTime)
+            )
+          ) {
+            alertObject.put("alertEffect", alert.effect().toString());
+          }
           return alertObject;
         })
         .toList()
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
index 2b6d7536f1c..8f9c427468e 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
@@ -42,7 +42,7 @@ protected Collection map(RegularStop stop) {
       new KeyValue("desc", i18NStringMapper.mapToApi(stop.getDescription())),
       new KeyValue(
         "parentStation",
-        stop.getParentStation() != null ? stop.getParentStation().getId() : "null"
+        stop.getParentStation() != null ? stop.getParentStation().getId() : null
       ),
       new KeyValue("type", getType(transitService, stop)),
       new KeyValue("routes", getRoutes(transitService, stop))
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java
deleted file mode 100644
index 43dd499c9c0..00000000000
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsBaseLayerBuilder.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.opentripplanner.ext.vectortiles.layers.stops;
-
-import static java.util.Map.entry;
-
-import java.util.Locale;
-import java.util.Map;
-import org.opentripplanner.ext.vectortiles.VectorTilesResource;
-import org.opentripplanner.inspector.vector.LayerParameters;
-import org.opentripplanner.transit.service.TransitService;
-
-public class StopsBaseLayerBuilder extends StopsLayerBuilder {
-
-  public StopsBaseLayerBuilder(
-    TransitService service,
-    LayerParameters layerParameters,
-    Locale locale
-  ) {
-    super(
-      service,
-      Map.ofEntries(
-        entry(MapperType.Digitransit, new DigitransitStopPropertyMapper(service, locale)),
-        entry(
-          MapperType.DigitransitRealtime,
-          new DigitransitRealtimeStopPropertyMapper(service, locale)
-        )
-      ),
-      layerParameters
-    );
-  }
-}
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
index fa7036efd52..aa664497728 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerBuilder.java
@@ -1,5 +1,7 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
+import static java.util.Map.entry;
+
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -24,11 +26,19 @@ public class StopsLayerBuilder extends LayerBuilder {
 
   public StopsLayerBuilder(
     TransitService transitService,
-    Map> mappers,
-    LayerParameters layerParameters
+    LayerParameters layerParameters,
+    Locale locale
   ) {
     super(
-      mappers.get(MapperType.valueOf(layerParameters.mapper())),
+      (PropertyMapper) Map
+        .ofEntries(
+          entry(MapperType.Digitransit, new DigitransitStopPropertyMapper(transitService, locale)),
+          entry(
+            MapperType.DigitransitRealtime,
+            new DigitransitRealtimeStopPropertyMapper(transitService, locale)
+          )
+        )
+        .get(MapperType.valueOf(layerParameters.mapper())),
       layerParameters.name(),
       layerParameters.expansionFactor()
     );

From 94fea1d3e1da8174a8612d72a02ae25c01b536e8 Mon Sep 17 00:00:00 2001
From: Andrew Byrd 
Date: Tue, 12 Mar 2024 22:14:54 +0800
Subject: [PATCH 0776/1688] More cleanup of all RT comments

Uniformly add RT_AB to all TODO and FIXME comments
---
 .../ext/siri/SiriAlertsUpdateHandler.java     | 20 +++---
 .../ext/siri/SiriTimetableSnapshotSource.java |  7 +-
 .../ext/siri/SiriTripPatternCache.java        | 64 ++++++++++---------
 .../updater/EstimatedTimetableSource.java     |  6 +-
 .../ext/siri/updater/SiriSXUpdater.java       | 50 +++++++++------
 .../model/TimetableSnapshot.java              | 24 +++----
 .../routing/alertpatch/TransitAlert.java      |  2 +-
 .../raptoradapter/transit/TransitLayer.java   | 12 ++--
 .../opentripplanner/routing/graph/Graph.java  |  2 +-
 .../DelegatingTransitAlertServiceImpl.java    |  4 +-
 .../routing/impl/TransitAlertServiceImpl.java | 13 ++--
 .../routing/services/TransitAlertService.java |  2 +-
 .../services/notes/StreetNotesService.java    |  8 +--
 .../api/OtpServerRequestContext.java          | 10 +--
 .../framework/json/ParameterBuilder.java      |  5 +-
 .../transit/model/network/TripPattern.java    |  5 +-
 .../transit/service/TransitModel.java         |  5 +-
 .../transit/service/TransitService.java       |  2 +-
 .../updater/spi/GraphUpdater.java             |  1 +
 .../updater/trip/TimetableSnapshotSource.java | 12 ++--
 .../updater/trip/TripPatternCache.java        | 12 ++--
 21 files changed, 145 insertions(+), 121 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java b/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java
index 9568684105b..d4df702bc19 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java
@@ -36,10 +36,10 @@
 
 /**
  * This updater applies the equivalent of GTFS Alerts, but from SIRI Situation Exchange feeds.
- * TODO REALTIME: The name should be clarified, as there is no such thing as "SIRI Alerts", and it
+ * TODO RT_AB: The name should be clarified, as there is no such thing as "SIRI Alerts", and it
  *   is referencing the internal model concept of "Alerts" which are derived from GTFS terminology.
- * NOTE this cannot handle situations where there are multiple feeds with different IDs (for now it
- * may only work in single-feed regions).
+ * NOTE this cannot handle situations where incoming messages are being applied to multiple static
+ * feeds with different IDs (for now it may only work in single-feed regions).
  */
 public class SiriAlertsUpdateHandler {
 
@@ -48,12 +48,12 @@ public class SiriAlertsUpdateHandler {
   private final Set alerts = new HashSet<>();
   private final TransitAlertService transitAlertService;
 
-  /** How long before the posted start of an event it should be displayed to users. */
+  /** The alert should be displayed to users this long before the activePeriod begins. */
   private final Duration earlyStart;
 
   /**
    * This takes the parts of the SIRI SX message saying which transit entities are affected and
-   * maps them to multiple OTP internal model entities.
+   * maps them to the corresponding OTP internal model entity or entities.
    */
   private final AffectsMapper affectsMapper;
 
@@ -129,9 +129,9 @@ public void update(ServiceDelivery delivery) {
   }
 
   /**
-   * FIXME REALTIME This does not just "handle" an alert, it builds an internal model Alert from
+   * FIXME RT_AB: This does not just "handle" an alert, it builds an internal model Alert from
    *   an incoming SIRI situation exchange element. It is a mapper or factory.
-   * It may return null if all of header, description, and detail text are empty or missing in the
+   * It may return null if the header, description, and detail text are all empty or missing in the
    * SIRI message. In all other cases it will return a valid TransitAlert instance.
    */
   private TransitAlert handleAlert(PtSituationElement situation) {
@@ -213,9 +213,9 @@ private long getEpochSecond(ZonedDateTime startTime) {
   }
 
   /*
-   * Creates alert from PtSituation with all textual content.
-   * The feed scoped ID of this alert will be the single feed ID associated with this update handler
-   * and the situation number provided in the feed.
+   * Creates a builder for an internal model TransitAlert, including all textual content from the
+   * supplied SIRI PtSituation. The feed scoped ID of this TransitAlert will be the single feed ID
+   * associated with this update handler, plus the situation number provided in the SIRI feed.
    */
   private TransitAlertBuilder createAlertWithTexts(PtSituationElement situation) {
     return TransitAlert
diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index 08752a50b89..d7b096adabe 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -133,12 +133,13 @@ public TimetableSnapshot getTimetableSnapshot() {
 
   /**
    * Method to apply a trip update list to the most recent version of the timetable snapshot.
-   * FIXME TripUpdate is the GTFS term, and these SIRI ETs are never converted into that same internal model.
+   * FIXME RT_AB: TripUpdate is the GTFS term, and these SIRI ETs are never converted into that
+   *              same internal model.
    *
    * @param fullDataset  true iff the list with updates represent all updates that are active right
    *                     now, i.e. all previous updates should be disregarded
    * @param updates      SIRI VehicleMonitoringDeliveries that should be applied atomically
-   *                     FIXME aren't these ET deliveries, not VM?
+   *                     FIXME RT_AB: aren't these ET deliveries, not VM?
    */
   public UpdateResult applyEstimatedTimetable(
     @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher,
@@ -376,7 +377,7 @@ private Result addTripToGraphAndBuffer(TripUpdate tr
     );
 
     // Add new trip times to the buffer and return result with success or error. The update method
-    // will perform protective copies as needed whether TripPattern is from realtime data or not.
+    // will perform protective copies as needed, whether pattern is created by realtime data or not.
     var result = buffer.update(pattern, tripUpdate.tripTimes(), serviceDate);
     LOG.debug("Applied real-time data for trip {} on {}", trip, serviceDate);
     return result;
diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java
index 497aadf0c9a..a803764c2c4 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java
@@ -26,34 +26,39 @@
  * the same sequence of stops, they will all end up on this same TripPattern.
  * 
      
  * Note that there are two versions of this class, this one for GTFS-RT and another for SIRI.
- * See additional comments in the Javadoc of the GTFS-RT version of this class.
+ * See additional comments in the Javadoc of the GTFS-RT version of this class, whose name is
+ * simply TripPatternCache.
+ * TODO RT_AB: To the extent that double SIRI/GTFS implementations are kept, prefix all names
+ *             with GTFS or SIRI or NETEX rather than having no prefix on the GTFS versions.
  */
 public class SiriTripPatternCache {
 
   private static final Logger LOG = LoggerFactory.getLogger(SiriTripPatternCache.class);
 
-  // Seems to be the primary collection of added TripPatterns, with other collections serving as
-  // indexes. Similar to TripPatternCache.cache but with service date as part of the key.
+  // TODO RT_AB: Improve documentation. This seems to be the primary collection of added
+  //   TripPatterns, with other collections serving as indexes. Similar to TripPatternCache.cache
+  //   in the GTFS version of this class, but with service date as part of the key.
   private final Map cache = new HashMap<>();
 
-  // Apparently a SIRI-specific index for use in GraphQL APIs (missing on GTFS-RT version).
+  // This appears to be a SIRI-specific index for use in GraphQL APIs.
+  // It is not present on the GTFS-RT version of this class.
   private final ListMultimap patternsForStop = Multimaps.synchronizedListMultimap(
     ArrayListMultimap.create()
   );
 
-  // TODO clarify name and add documentation to this field
+  // TODO RT_AB: clarify name and add documentation to this field.
   private final Map updatedTripPatternsForTripCache = new HashMap<>();
 
-  // TODO generalize this so we can generate IDs for SIRI or GTFS-RT sources
+  // TODO RT_AB: generalize this so we can generate IDs for SIRI or GTFS-RT sources.
   private final SiriTripPatternIdGenerator tripPatternIdGenerator;
 
-  // TODO clarify name and add documentation to this field, and why it's constructor injected
+  // TODO RT_AB: clarify name and add documentation to this field, and why it's constructor injected
   private final Function getPatternForTrip;
 
   /**
    * Constructor.
-   * TODO: clarify why the ID generator and pattern fetching function are injected. Potentially
-   *     make the class usable for GTFS-RT cases by injecting different ID generator etc.
+   * TODO RT_AB: clarify why the ID generator and pattern fetching function are injected here.
+   *   Potentially make the class usable for GTFS-RT cases by injecting different ID generator etc.
    */
   public SiriTripPatternCache(
     SiriTripPatternIdGenerator tripPatternIdGenerator,
@@ -63,16 +68,17 @@ public SiriTripPatternCache(
     this.getPatternForTrip = getPatternForTrip;
   }
 
-  // Below was clearly derived from a method from TripPatternCache, down to the obsolete Javadoc
-  // mentioning transit vertices and edges (which don't exist since raptor was adopted).
-  // Note that this is the only non-dead-code public method on this class, and mirrors the only
-  // public method on the GTFS-RT version of TripPatternCache.
-  // It also explains why this class is called a "cache". It allows reusing the same TripPattern
-  // instance when many different trips are created or updated with the same pattern.
+  //
 
   /**
    * Get cached trip pattern or create one if it doesn't exist yet.
    *
+   * TODO RT_AB: Improve documentation and/or merge with GTFS version of this class.
+   *  This was clearly derived from a method from TripPatternCache. This is the only non-dead-code
+   *  public method on this class, and mirrors the only public method on the GTFS-RT version of
+   *  TripPatternCache. It also explains why this class is called a "cache". It allows reusing the
+   *  same TripPattern instance when many different trips are created or updated with the same pattern.
+   *
    * @param stopPattern stop pattern to retrieve/create trip pattern
    * @param trip        Trip containing route of new trip pattern in case a new trip pattern will be
    *                    created
@@ -85,9 +91,9 @@ public synchronized TripPattern getOrCreateTripPattern(
   ) {
     TripPattern originalTripPattern = getPatternForTrip.apply(trip);
 
-    // TODO: verify, this is different than GTFS-RT version
-    //   It can return a TripPattern from the scheduled data, but protective copies are handled
-    //   in TimetableSnapshot.update. Document better this aspect of the contract in this method's Javadoc.
+    // TODO RT_AB: Verify implementation, which is different than the GTFS-RT version.
+    //   It can return a TripPattern from the scheduled data, but protective copies are handled in
+    //   TimetableSnapshot.update. Better document this aspect of the contract in this method's Javadoc.
     if (originalTripPattern.getStopPattern().equals(stopPattern)) {
       return originalTripPattern;
     }
@@ -109,7 +115,7 @@ public synchronized TripPattern getOrCreateTripPattern(
           .withCreatedByRealtimeUpdater(true)
           .withOriginalTripPattern(originalTripPattern)
           .build();
-      // TODO - SIRI: Add pattern to transitModel index?
+      // TODO: Add pattern to transitModel index?
 
       // Add pattern to cache
       cache.put(key, tripPattern);
@@ -147,8 +153,8 @@ Therefore, we must clean up the duplicates by deleting the previously added (and
      outdated) tripPattern for all affected stops. In example above, "StopPattern #rt1" should be
      removed from all stops.
 
-     TODO explore why this particular case is handled in an ad-hoc manner. It seems like all such
-       indexes should be constantly rebuilt and versioned along with the TimetableSnapshot.
+     TODO RT_AB: review why this particular case is handled in an ad-hoc manner. It seems like all
+       such indexes should be constantly rebuilt and versioned along with the TimetableSnapshot.
     */
     TripServiceDateKey tripServiceDateKey = new TripServiceDateKey(trip, serviceDate);
     if (updatedTripPatternsForTripCache.containsKey(tripServiceDateKey)) {
@@ -186,7 +192,7 @@ Therefore, we must clean up the duplicates by deleting the previously added (and
 
   /**
    * Returns any new TripPatterns added by real time information for a given stop.
-   * TODO: this appears to be currently unused. Perhaps remove it if the API has changed.
+   * TODO RT_AB: this appears to be currently unused. Perhaps remove it if the API has changed.
    *
    * @param stop the stop
    * @return list of TripPatterns created by real time sources for the stop.
@@ -196,15 +202,15 @@ public List getAddedTripPatternsForStop(RegularStop stop) {
   }
 }
 
-//// Below here are multiple additional private classes defined in the same top-level class file.
-//// TODO: move these private classes inside the above class as private static inner classes.
+// TODO RT_AB: move the below classes inside the above class as private static inner classes.
+//   Defining these additional classes in the same top-level class file is unconventional.
 
 /**
- * Serves as the key for the collection of realtime-added TripPatterns.
+ * Serves as the key for the collection of TripPatterns added by realtime messages.
  * Must define hashcode and equals to confer semantic identity.
- * It seems like there's a separate TripPattern instance for each StopPattern and service date,
- * rather a single TripPattern instance associated with a separate timetable for each date.
- * TODO: clarify why each date has a different TripPattern instead of a different Timetable.
+ * TODO RT_AB: clarify why each date has a different TripPattern instead of a different Timetable.
+ *   It seems like there's a separate TripPattern instance for each StopPattern and service date,
+ *   rather a single TripPattern instance associated with a separate timetable for each date.
  */
 class StopPatternServiceDateKey {
 
@@ -234,7 +240,7 @@ public boolean equals(Object thatObject) {
 /**
  * An alternative key for looking up realtime-added TripPatterns by trip and service date instead
  * of stop pattern and service date. Must define hashcode and equals to confer semantic identity.
- * TODO verify whether one map is considered the definitive collection and the other an index.
+ * TODO RT_AB: verify whether one map is considered the definitive collection and the other an index.
  */
 class TripServiceDateKey {
 
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java
index 3c5a387ca09..83edebe3911 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java
@@ -4,9 +4,9 @@
 import uk.org.siri.siri20.Siri;
 
 /**
- * Interface for a blocking, polling approach
- * TODO should the methods return as fast as possible?
- * Or do they intentionally wait for refreshed data?
+ * Interface for a blocking, polling approach to retrieving SIRI realtime timetable updates.
+ * TODO RT_AB: Clearly document whether the methods should return as fast as possible, or if they
+ *  should intentionally block and wait for refreshed data, and how this fits into the design.
  */
 public interface EstimatedTimetableSource {
   /**
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java
index 817505d81c0..77ccddfc736 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java
@@ -31,7 +31,9 @@ public class SiriSXUpdater extends PollingGraphUpdater implements TransitAlertPr
   private final String url;
   private final String originalRequestorRef;
   private final TransitAlertService transitAlertService;
-  // TODO What is this, why does it exist as a persistent instance?
+
+  // TODO RT_AB: Document why SiriAlertsUpdateHandler is a separate instance that persists across
+  //  many graph update operations.
   private final SiriAlertsUpdateHandler updateHandler;
   private WriteToGraphCallback saveResultOnGraph;
   private ZonedDateTime lastTimestamp = ZonedDateTime.now().minusWeeks(1);
@@ -86,7 +88,7 @@ public SiriSXUpdater(SiriSXUpdaterParameters config, TransitModel transitModel)
 
   @Override
   public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) {
-    // TODO REALTIME this callback should have a different name, it is currently too verb-like.
+    // TODO RT_AB: Consider renaming this callback. Its name is currently like an imperative verb.
     this.saveResultOnGraph = saveResultOnGraph;
   }
 
@@ -104,7 +106,8 @@ protected void runPolling() throws InterruptedException {
   }
 
   /**
-   * This part has been factored out to allow repeated retries in case the connection fails etc.
+   * This part of the update process has been factored out to allow repeated retries of the HTTP
+   * fetching operation in case the connection fails or some other disruption happens.
    */
   private void updateSiri() {
     boolean moreData = false;
@@ -117,27 +120,36 @@ private void updateSiri() {
         // primitive, because the object moreData persists across iterations.
         final boolean markPrimed = !moreData;
         if (serviceDelivery.getSituationExchangeDeliveries() != null) {
-          // FIXME REALTIME This is submitting a method on a long-lived instance as a runnable.
-          //   These runnables were intended to be small, disposable self-contained update tasks.
+          // FIXME RT_AB: This is submitting a reference to a method on a long-lived instance as a
+          //   GraphWriterRunnable. These runnables were originally intended to be small,
+          //   self-contained, throw-away update tasks.
           //   See org/opentripplanner/updater/trip/PollingTripUpdater.java:90
-          //   Clarify why that is passing in so many other references. It should only contain
-          //   what's needed to operate on the graph. This should be illustrated in documentation
-          //   as a little box labeled "change trip ABC123 by making stop 53 late by 2 minutes."
-          //   Also clarify how this works without even using the supplied graph or TransitModel:
-          //   there are multiple TransitAlertServices and they are not versioned along with the\
-          //   Graph, they are attached to updaters.
+          //   Clarify why the long-lived instance is capturing and holding so many references.
+          //   The runnable should only contain the minimum needed to operate on the graph.
+          //   Such runnables should be illustrated in documentation as e.g. a little box labeled
+          //   "change trip ABC123 by making stop 53 late by 2 minutes."
+          //   Also clarify how this runnable works without even using the supplied
+          //   (graph, transitModel) parameters. There are multiple TransitAlertServices and they
+          //   are not versioned along with the Graph, they are attached to updaters.
+          //
           // This is submitting a runnable to an executor, but that runnable only writes back to
-          // objects owned by this updater itself with no versioning. Why is this happening?
+          // objects referenced by updateHandler itself, rather than the graph or transitModel
+          // supplied for writing, and apparently with no versioning. This seems like a
+          // misinterpretation of the realtime design.
           // If this is an intentional choice to live-patch a single server-wide instance of an
           // alerts service/index while it's already in use by routing, we should be clear about
           // this and document why it differs from the graph-writer design. Currently the code
-          // seems to go through the a ritual of following the threadsafe copy-on-write pattern
-          // without actually doing so.
-          // It's understandable to defer the list-of-alerts processing to another thread than this
-          // fetching thread, but I don't think we want that happening on the graph writer thread.
-          // There seems to be a misunderstanding that the tasks are submitted to get them off the
-          // updater thread, but the real reason is to ensure consistent transactions in graph
-          // writing and reading.
+          // seems to follow some surface conventions of the threadsafe copy-on-write pattern
+          // without actually providing threadsafe behavior.
+          // It's a reasonable choice to defer processing the list of alerts to another thread than
+          // this fetching thread, but we probably don't want to defer any such processing to the
+          // graph writer thread, as that's explicitly restricted to be one single shared thread for
+          // the entire application. There seems to be a misunderstanding that the tasks are
+          // submitted to get them off the updater thread, but the real reason is to ensure
+          // consistent transactions in graph writing and reading.
+          // All that said, out of all the update types, Alerts (and SIRI SX) are probably the ones
+          // that would be most tolerant of non-versioned application-wide storage since they don't
+          // participate in routing and are tacked on to already-completed routing responses.
           saveResultOnGraph.execute((graph, transitModel) -> {
             updateHandler.update(serviceDelivery);
             if (markPrimed) {
diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index dfb1975d818..a176debbe13 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -47,9 +47,9 @@
  * departure times of other trips that have not necessarily been boarded.
  * 
      
  * A TimetableSnapshot instance may only be modified by a single thread. This makes it easier to
- * reason about how the snapshot is built up and used. Write operation are applied one by one in
- * order with no concurrent access, then read operations are allowed concurrently by many threads
- * once writing is forbidden.
+ * reason about how the snapshot is built up and used. Write operations are applied one by one, in
+ * order, with no concurrent access. Read operations are then allowed concurrently by many threads
+ * after writing is forbidden.
  * 
      
  * The fact that TripPattern instances carry a reference only to their scheduled Timetable and not
  * to their realtime timetable is largely due to historical path-dependence in OTP development.
@@ -97,22 +97,22 @@ public class TimetableSnapshot {
    * update, a Map associating the updated trip pattern with a compound key of the feed-scoped
    * trip ID and the service date. The type of this field is HashMap rather than the more general
    * Map interface because we need to efficiently clone it whenever we start building up a new
-   * snapshot. TODO: clarify if this is an index or the original source of truth.
+   * snapshot. TODO RT_AB: clarify if this is an index or the original source of truth.
    */
   private HashMap realtimeAddedTripPattern = new HashMap<>();
 
   /**
-   * This is an index of TripPatterns, not the primary collection.
-   * It tracks which TripPatterns that were updated or newly created by realtime messages contain
-   * which stops. This allows them to be readily found and included in API responses containing
-   * stop times at a specific stop. This is a SetMultimap, so that each pattern is only retained
-   * once per stop even if it's added more than once.
-   * TODO: Better, more general handling of all realtime indexes outside primary data structures.
+   * This is an index of TripPatterns, not the primary collection. It tracks which TripPatterns
+   * that were updated or newly created by realtime messages contain which stops. This allows them
+   * to be readily found and included in API responses containing stop times at a specific stop.
+   * This is a SetMultimap, so that each pattern is only retained once per stop even if it's added
+   * more than once.
+   * TODO RT_AB: More general handling of all realtime indexes outside primary data structures.
    */
   private SetMultimap patternsForStop = HashMultimap.create();
 
   /**
-   * This is an as-yet unused alternative to the current boolean fields readOnly and dirty, as well
+   * This is an AS YET UNUSED alternative to the current boolean fields readOnly and dirty, as well
    * as setting dirtyTimetables to null. A given instance of TimetableSnapshot should progress
    * through all these states in order, and cannot return to a previous state.
    */
@@ -129,7 +129,7 @@ private enum TimetableSnapshotState {
    * other hand, reading is expected to be highly concurrent and happens during core routing
    * processes. Therefore, any assertions about state should be concentrated in the writing methods.
    */
-  private TimetableSnapshotState state;
+  // private TimetableSnapshotState state;
 
   /**
    * Boolean value indicating that timetable snapshot is read only if true. Once it is true, it
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
index 0d188df5ef4..4a7ef91a8ea 100644
--- a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
+++ b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
@@ -21,7 +21,7 @@
  * of the transit system which will be displayed to users as text.
  * Although they have flags describing the effect of the problem described in the text, convention
  * is that these messages do not modify routing behavior on their own. They must be accompanied by
- * other messages such as
+ * messages of other types to actually impact routing.
  */
 public class TransitAlert extends AbstractTransitEntity {
 
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
index 4188d5e569b..6757dbccae0 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
@@ -19,13 +19,13 @@
 
 /**
  * This is a replica of public transportation data already present in TransitModel, but rearranged
- * and indexed differently for efficient use by the Raptor router.
- * Patterns and trips are split out by days, retaining only the services actually running on any
- * particular day.
+ * and indexed differently for efficient use by the Raptor router. Patterns and trips are split out
+ * by days, retaining only the services actually running on any particular day.
  *
- * TODO rename - this name appears to be modeled after R5, where the TransportNetwork is split into
- *  two layers: one for the streets and one for the public transit data. But here, this seems to be
- *  an indexed and rearranged copy of the main transit data collected under a TransitModel instance.
+ * TODO RT_AB: this name is apparently modeled after R5, where the TransportNetwork is split into
+ *  two layers (one for the streets and one for the public transit data). Here the situation is
+ *  different: this seems to be an indexed and rearranged copy of the main transit data (a
+ *  TransitModel instance).
  */
 public class TransitLayer {
 
diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java
index 42909952178..3e47046aab9 100644
--- a/src/main/java/org/opentripplanner/routing/graph/Graph.java
+++ b/src/main/java/org/opentripplanner/routing/graph/Graph.java
@@ -59,7 +59,7 @@
  * In some sense the Graph is just some indexes into a set of vertices. The Graph used to hold lists
  * of edges for each vertex, but those lists are now attached to the vertices themselves.
  * 
      
- * TODO rename to StreetGraph to emphasize what it represents?
+ * TODO RT_AB: rename to StreetGraph to emphasize what it represents?
  */
 public class Graph implements Serializable {
 
diff --git a/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java b/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java
index cfa92ffaff3..8da6fc21aa7 100644
--- a/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java
+++ b/src/main/java/org/opentripplanner/routing/impl/DelegatingTransitAlertServiceImpl.java
@@ -20,8 +20,8 @@
  * all alerts.
  *
  * Concretely: every realtime updater receiving GTFS Alerts or SIRI Situation Exchange (SX)
- * messages currently maintains its own private index of alerts seperate from all other updaters.
- * To make the set of all alerts from all updaters available in a single operaion and associate it
+ * messages currently maintains its own private index of alerts separately from all other updaters.
+ * To make the set of all alerts from all updaters available in a single operation and associate it
  * with the graph as a whole, the various indexes are merged in such a way as to have the same
  * index as each individual index.
  */
diff --git a/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java b/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java
index b63041d66e7..0cc24c691e9 100644
--- a/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java
+++ b/src/main/java/org/opentripplanner/routing/impl/TransitAlertServiceImpl.java
@@ -20,7 +20,7 @@
  * of TransitAlerts and indexes them for fast lookup by which transit entity is affected.
  * The only other implementation exists just to combine several instances of this primary
  * implementation into one.
- * TODO REALTIME investigate why each updater has its own service instead of taking turns
+ * TODO RT_AB: investigate why each updater has its own service instead of taking turns
  *   sequentially writing to a single service. Original design was for all data and indexes to be
  *   associated with the Graph or transit model (i.e. the object graph of instances of the transit
  *   model) and for updaters to submit write tasks that would patch the current version in a
@@ -42,18 +42,17 @@ public TransitAlertServiceImpl(TransitModel transitModel) {
 
   @Override
   public void setAlerts(Collection alerts) {
-    // NOTE this is being patched live by updaters while in use (being read) by other threads
-    // performing trip planning. The single-action assignment helps a bit, but the map can be
-    // swapped out while the delegating service is in the middle of multiple calls that read from it.
-    // The consistent approach would be to duplicate the entire service, update it copy-on write,
-    // and swap in the entire service after the update.
+    // FIXME RT_AB: this is patched live by updaters while in use (being read) by other threads
+    //   performing trip planning. The single-action assignment helps a bit, but the map can be
+    //   swapped out while the delegating service is in the middle of multiple calls that read from
+    //   it. The consistent approach would be to duplicate the entire service, update it
+    //   copy-on-write, and swap in the entire service after the update.
     Multimap newAlerts = HashMultimap.create();
     for (TransitAlert alert : alerts) {
       for (EntitySelector entity : alert.entities()) {
         newAlerts.put(entity.key(), alert);
       }
     }
-
     this.alerts = newAlerts;
   }
 
diff --git a/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java b/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java
index 6dd1423ea8c..7b037192c77 100644
--- a/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java
+++ b/src/main/java/org/opentripplanner/routing/services/TransitAlertService.java
@@ -9,7 +9,7 @@
 import org.opentripplanner.transit.model.timetable.Direction;
 
 /**
- * The TransitAlertService stores a set of alerts (passenger-facing textual information associated
+ * A TransitAlertService stores a set of alerts (passenger-facing textual information associated
  * with transit entities such as stops or routes) which are currently active and should be provided
  * to end users when their itineraries include the relevant stop, route, etc.
  *
diff --git a/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java b/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java
index 92d73574530..966ac72c7d8 100644
--- a/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java
+++ b/src/main/java/org/opentripplanner/routing/services/notes/StreetNotesService.java
@@ -16,10 +16,10 @@
 
 /**
  * This service manages street edge notes. An edge note is a free-format alert (text) attached to an
- * edge, which is returned along with any itinerary where this edge is used, and which does not have any
- * impact on routing. Notes cannot affect routing because edges do not know which notes are
- * attached to them. This avoids storing references to notes on the edge, which would probably not
- * be worth the memory consumption as only few edges have notes.
+ * edge, which is returned along with any itinerary where this edge is used, and which does not
+ * have any impact on routing. Notes cannot affect routing because edges do not know which notes
+ * are attached to them. This avoids storing references to notes on the edge, which would probably
+ * not be worth the memory consumption as only a few edges have notes.
  * 
      
  * The service owns a list of StreetNotesSource, with a single static one used for graph building.
  * "Dynamic" notes can be returned by classes implementing StreetNoteSource, added to this service
diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java
index 98377eb285d..d1d565eeb0d 100644
--- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java
+++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java
@@ -31,15 +31,15 @@
 
 /**
  * The purpose of this class is to allow APIs (HTTP Resources) to access the OTP Server Context.
- * FIXME circular definition (OtpServerRequestContext provides access to OTP Server Context).
- *   What exactly does "Server Context" mean here? What does "access" mean? Does this mean it
- *   "allows individual requests to call a limited number of methods on the components of the server
- *   without direct access to their internals?"
+ * FIXME RT_AB: Expand and clarify descriptions, which are circular (OtpServerRequestContext
+ *   provides access to OTP Server Context). What exactly does "Server Context" mean here?
+ *   What does "access" mean? Does this mean it "allows individual requests to call a limited
+ *   number of methods on the components of the server without direct access to their internals?"
  * By using an interface, and not injecting each service class we avoid giving the resources access
  * to the server implementation. The context is injected by Jersey. An alternative to injecting this
  * interface is to inject each individual component in the context - hence reducing the dependencies
  * further.
- * TODO clarify how injecting more individual components would "reduce dependencies further".
+ * TODO RT_AB: clarify how injecting more individual components would "reduce dependencies further".
  * But there is not a "real" need for this. For example, we do not have unit tests on the
  * Resources. If we in the future would decide to write unit tests for the APIs, then we could
  * eliminate this interface and just inject the components. See the bind method in OTPServer.
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java
index cdf386b8cbb..ee68159cdff 100644
--- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java
+++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java
@@ -43,8 +43,9 @@
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 
 /**
- * TODO clarify whether this is building a declarative representation of the parameter, or building
- *  a concrete key-value pair for a parameter in a config file being read at server startup, or both.
+ * TODO RT_AB: add Javadoc to clarify whether this is building a declarative representation of the
+ *   parameter, or building a concrete key-value pair for a parameter in a config file being read
+ *   at server startup, or both.
  */
 public class ParameterBuilder {
 
diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java
index 13b600a26eb..2d64160de2d 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java
@@ -80,7 +80,8 @@ public final class TripPattern
 
   // This TransitMode is a redundant replication/memoization of information on the Route.
   // It appears that in the TripPatternBuilder it is only ever set from a Trip which is itself set
-  // from a Route. TODO confirm whether there is any reason this doesn't just read through to Route.
+  // from a Route.
+  // TODO RT_AB: confirm whether there is any reason this doesn't just read through to Route.
   private final TransitMode mode;
 
   private final SubMode netexSubMode;
@@ -96,7 +97,7 @@ public final class TripPattern
    * Currently this seems to only be set (via TripPatternBuilder) from TripPatternCache and
    * SiriTripPatternCache.
    *
-   * FIXME this is only used rarely, make that obvious from comments.
+   * FIXME RT_AB: Revise comments to make it clear how this is used (it is only used rarely).
    */
   private final TripPattern originalTripPattern;
 
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
index 1f90764dda5..3d2f2d5424e 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitModel.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
@@ -72,8 +72,9 @@
  * TransitLayer rather than the TransitModel it's derived from. Both are often accessed via the
  * TransitService rather than directly reading the fields of TransitModel or TransitLayer.
  *
- * TODO rename, as this is not really the model, but a top-level object grouping together instances
- *   of model classes with things that operate on and map those instances.
+ * TODO RT_AB: consider renaming. By some definitions this is not really the model, but a top-level
+ *   object grouping together instances of model classes with things that operate on and map those
+ *   instances.
  */
 public class TransitModel implements Serializable {
 
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java
index b3b80cf6742..83b65c44d12 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java
@@ -50,7 +50,7 @@
  * fetching tables of specific information like the routes passing through a particular stop, or for
  * gaining access to the entirety of the data to perform routing.
  * 
      
- * TODO this interface seems to provide direct access to the TransitLayer but not the TransitModel.
+ * TODO RT_AB: this interface seems to provide direct access to TransitLayer but not TransitModel.
  *   Is this intentional, because TransitLayer is meant to be read-only and TransitModel is not?
  *   Should this be renamed TransitDataService since it seems to provide access to the data but
  *   not to transit routing functionality (which is provided by the RoutingService)?
diff --git a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java
index d8edc651e7e..e0eed54a6de 100644
--- a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java
@@ -55,6 +55,7 @@ default boolean isPrimed() {
    * A GraphUpdater implementation uses this method to report its corresponding value of the "type"
    * field in the configuration file. This value should ONLY be used when providing human-friendly
    * messages while logging and debugging. Association of configuration to particular types is
+   * performed by the UpdatersConfig.Type constructor calling factory methods.
    */
   String getConfigRef();
 }
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index 2a95fb47e56..9cc0cab52a9 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -89,10 +89,12 @@ public class TimetableSnapshotSource implements TimetableSnapshotProvider {
    * The working copy of the timetable snapshot. Should not be visible to routing threads. Should
    * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that
    * might modify this buffer will correctly acquire the lock. By design, only one thread should
-   * ever be writing to this buffer. But we need to suspend writes while we're indexing and swapping
-   * out the buffer (Or do we? Can't we just make a new copy of the buffer first?)
-   * TODO: research why this lock is needed since only one thread should ever be writing to this buffer.
-   *   Instead we should throw an exception if a writing section is entered by more than one thread.
+   * ever be writing to this buffer.
+   * TODO RT_AB: research and document why this lock is needed since only one thread should ever be
+   *   writing to this buffer. One possible reason may be a need to suspend writes while indexing
+   *   and swapping out the buffer. But the original idea was to make a new copy of the buffer
+   *   before re-indexing it. While refactoring or rewriting parts of this system, we could throw
+   *   an exception if a writing section is entered by more than one thread.
    */
   private final TimetableSnapshot buffer = new TimetableSnapshot();
 
@@ -121,7 +123,7 @@ public class TimetableSnapshotSource implements TimetableSnapshotProvider {
 
   /**
    * Should expired real-time data be purged from the graph.
-   * TODO clarify exactly what this means? In what circumstances would you want to turn it off?
+   * TODO RT_AB: Clarify exactly what "purge" means and in what circumstances would one turn it off.
    */
   private final boolean purgeExpiredData;
 
diff --git a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java
index f43bf5e3b99..bf8e75418ae 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TripPatternCache.java
@@ -20,11 +20,11 @@
  * the same sequence of stops, they will all end up on this same TripPattern.
  * 
      
  * Note that there are two versions of this class, this one for GTFS-RT and another for SIRI.
- * TODO: consolidate TripPatternCache and SiriTripPatternCache. They seem to only be separate
- *     because SIRI- or GTFS-specific indexes of the added TripPatterns seem to have been added to
- *     this primary collection.
- * FIXME: the name does not make it clear that this has anything to do with elements that are only
- *     added due to realtime updates, and it is only loosely a cache. RealtimeAddedTripPatterns?
+ * TODO RT_AB: consolidate TripPatternCache and SiriTripPatternCache. They seem to only be separate
+ *    because SIRI- or GTFS-specific indexes of the added TripPatterns seem to have been added to
+ *    this primary collection.
+ * FIXME RT_AB: the name does not make it clear that this has anything to do with elements that are
+ *    only added due to realtime updates, and it is only loosely a cache. RealtimeAddedTripPatterns?
  */
 public class TripPatternCache {
 
@@ -86,7 +86,7 @@ public synchronized TripPattern getOrCreateTripPattern(
    * implementation of TripPatternIdGenerator.
    * This method is not static because it references a monotonically increasing integer counter.
    * But like in SiriTripPatternIdGenerator, this could be encapsulated outside the cache object.
-   * TODO: create GtfsRtTripPatternIdGenerator as part of merging the two TripPatternCaches
+   * TODO RT_AB: create GtfsRtTripPatternIdGenerator as part of merging the two TripPatternCaches.
    */
   private FeedScopedId generateUniqueTripPatternCode(Trip trip) {
     FeedScopedId routeId = trip.getRoute().getId();

From 69377e4a9477356fd5dd494c0c0f9d5617c1060c Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Tue, 12 Mar 2024 14:26:01 +0000
Subject: [PATCH 0777/1688] Add changelog entry for #5731 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 9e2e515c463..5c5a9e6aa99 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -99,6 +99,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Remove configurable car speed and determine it in graph build [#5657](https://github.com/opentripplanner/OpenTripPlanner/pull/5657)
 - Avoid cumulative real-time updates [#5705](https://github.com/opentripplanner/OpenTripPlanner/pull/5705)
 - Fix time penalty [#5715](https://github.com/opentripplanner/OpenTripPlanner/pull/5715)
+- Fix world envelope builder when crossing Greenwich meridian [#5731](https://github.com/opentripplanner/OpenTripPlanner/pull/5731)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.4.0 (2023-09-13)

From ba8e563a5f3e0572808d1ed41a4dcbea6dd7b23c Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 12 Mar 2024 15:41:02 +0100
Subject: [PATCH 0778/1688] Apply review feedback

---
 docs/Migrating-Configuration.md                               | 2 +-
 mkdocs.yml                                                    | 2 +-
 src/main/java/org/opentripplanner/standalone/OTPMain.java     | 4 ++--
 .../standalone/config/CommandLineParameters.java              | 4 ++--
 .../org/opentripplanner/standalone/config/ConfigModel.java    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/Migrating-Configuration.md b/docs/Migrating-Configuration.md
index 54b34ae4719..ab36ebf4fa0 100644
--- a/docs/Migrating-Configuration.md
+++ b/docs/Migrating-Configuration.md
@@ -29,7 +29,7 @@ risk - even if the environment changed.
 ### Aborting on invalid configuration
 
 If you want OTP to abort the startup when encountering unknown configuration parameters, you can add 
-the flag `--configCheck` to your regular OTP CLI commands.
+the flag `--abortOnUnknownConfig` to your regular OTP CLI commands.
 
 This should of course be used wisely as it can also accidentally make your production instances refuse 
 to start up.
diff --git a/mkdocs.yml b/mkdocs.yml
index 3fbcf849a03..c14e451a906 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -76,7 +76,7 @@ nav:
     - Router: 'RouterConfiguration.md'
     - "Route Request": 'RouteRequest.md'
     - "Realtime Updaters": 'UpdaterConfig.md'
-    - "Migrating Configuration": 'Migrating-Configuration.md'
+    - "Migrating between versions/builds": 'Migrating-Configuration.md'
 - Features explained:
     - "Routing modes": 'RoutingModes.md'
     - "In-station navigation": 'In-Station-Navigation.md'
diff --git a/src/main/java/org/opentripplanner/standalone/OTPMain.java b/src/main/java/org/opentripplanner/standalone/OTPMain.java
index c2adc1d9db2..133024dcaa8 100644
--- a/src/main/java/org/opentripplanner/standalone/OTPMain.java
+++ b/src/main/java/org/opentripplanner/standalone/OTPMain.java
@@ -180,10 +180,10 @@ private static void startOTPServer(CommandLineParameters cli) {
    * Optionally, check if the config is valid and if not abort the startup process.
    */
   private static void detectUnusedConfigParams(CommandLineParameters cli, ConfigModel config) {
-    if (cli.configCheck && config.hasIUnknownProperties()) {
+    if (cli.abortOnUnknownConfig && config.hasUnknownProperties()) {
       throw new OtpAppException(
         "Configuration contains invalid properties (see above for details). " +
-        "Please fix your configuration or remove --configCheck from your OTP CLI parameters."
+        "Please fix your configuration or remove --abortOnUnknownConfig from your OTP CLI parameters."
       );
     }
   }
diff --git a/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java b/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
index 57446d0942e..2cdd8ed5c1b 100644
--- a/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
+++ b/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
@@ -134,10 +134,10 @@ public class CommandLineParameters {
   public boolean visualize;
 
   @Parameter(
-    names = { "--configCheck" },
+    names = { "--abortOnUnknownConfig" },
     description = "Abort the startup if configuration files are found to be invalid."
   )
-  public boolean configCheck = false;
+  public boolean abortOnUnknownConfig = false;
 
   /**
    * The remaining single parameter after the switches is the directory with the configuration
diff --git a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
index a9506ed514e..b03f6b4f959 100644
--- a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
+++ b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
@@ -109,7 +109,7 @@ public static void initializeOtpFeatures(OtpConfig otpConfig) {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasIUnknownProperties() {
+  public boolean hasUnknownProperties() {
     return (
       otpConfig.hasUnknownProperties() ||
       buildConfig.hasUnknownProperties() ||

From 9630a4ad83f1aa068f91b28ab18eda75b161fd04 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Tue, 12 Mar 2024 17:20:05 +0200
Subject: [PATCH 0779/1688] Set added trip as canceled again if canceled update

---
 .../updater/trip/TimetableSnapshotSource.java   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index eefa704b43d..63d8cf92283 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -271,12 +271,20 @@ public UpdateResult applyTripUpdates(
           // starts for example at 40:00, yesterday would probably be a better guess.
           serviceDate = localDateNow.get();
         }
+        // Determine what kind of trip update this is
+        final TripDescriptor.ScheduleRelationship tripScheduleRelationship = determineTripScheduleRelationship(
+          tripDescriptor
+        );
         var canceledPreviouslyAddedTrip = false;
         if (!fullDataset) {
           // Check whether trip id has been used for previously ADDED trip message and mark previously
-          // created trip as DELETED
+          // created trip as DELETED unless schedule relationship is CANCELED, then as CANCEL
+          var cancelationType = tripScheduleRelationship ==
+            TripDescriptor.ScheduleRelationship.CANCELED
+            ? CancelationType.CANCEL
+            : CancelationType.DELETE;
           canceledPreviouslyAddedTrip =
-            cancelPreviouslyAddedTrip(tripId, serviceDate, CancelationType.DELETE);
+            cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType);
           // Remove previous realtime updates for this trip. This is necessary to avoid previous
           // stop pattern modifications from persisting
           this.buffer.removePreviousRealtimeUpdate(tripId, serviceDate);
@@ -286,11 +294,6 @@ public UpdateResult applyTripUpdates(
         LOG.debug("trip update #{} ({} updates) :", uIndex, tripUpdate.getStopTimeUpdateCount());
         LOG.trace("{}", tripUpdate);
 
-        // Determine what kind of trip update this is
-        final TripDescriptor.ScheduleRelationship tripScheduleRelationship = determineTripScheduleRelationship(
-          tripDescriptor
-        );
-
         Result result;
         try {
           result =

From 0177fb4f074bd116543ecb641453d87a1d4395ef Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Tue, 12 Mar 2024 18:03:12 +0200
Subject: [PATCH 0780/1688] Add test for removing skipped update

---
 .../updater/trip/TimetableSnapshotSource.java |  36 +++---
 .../trip/TimetableSnapshotSourceTest.java     | 111 ++++++++++++++++++
 2 files changed, 131 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index 63d8cf92283..21fcbfd2d6e 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -370,6 +370,26 @@ public UpdateResult applyTripUpdates(
     return updateResult;
   }
 
+  /**
+   * This shouldn't be used outside of this class for other purposes than testing where the forced
+   * snapshot commit can guarantee consistent behaviour.
+   */
+  TimetableSnapshot getTimetableSnapshot(final boolean force) {
+    final long now = System.currentTimeMillis();
+    if (force || now - lastSnapshotTime > maxSnapshotFrequency.toMillis()) {
+      if (force || buffer.isDirty()) {
+        LOG.debug("Committing {}", buffer);
+        snapshot = buffer.commit(transitLayerUpdater, force);
+      } else {
+        LOG.debug("Buffer was unchanged, keeping old snapshot.");
+      }
+      lastSnapshotTime = System.currentTimeMillis();
+    } else {
+      LOG.debug("Snapshot frequency exceeded. Reusing snapshot {}", snapshot);
+    }
+    return snapshot;
+  }
+
   private static void logUpdateResult(
     String feedId,
     Map failuresByRelationship,
@@ -390,22 +410,6 @@ private static void logUpdateResult(
       });
   }
 
-  private TimetableSnapshot getTimetableSnapshot(final boolean force) {
-    final long now = System.currentTimeMillis();
-    if (force || now - lastSnapshotTime > maxSnapshotFrequency.toMillis()) {
-      if (force || buffer.isDirty()) {
-        LOG.debug("Committing {}", buffer);
-        snapshot = buffer.commit(transitLayerUpdater, force);
-      } else {
-        LOG.debug("Buffer was unchanged, keeping old snapshot.");
-      }
-      lastSnapshotTime = System.currentTimeMillis();
-    } else {
-      LOG.debug("Snapshot frequency exceeded. Reusing snapshot {}", snapshot);
-    }
-    return snapshot;
-  }
-
   /**
    * Determine how the trip update should be handled.
    *
diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
index d25de6ff021..10952d0bde9 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
@@ -849,6 +849,117 @@ public void scheduledTripWithSkippedAndScheduled() {
         assertFalse(newTripTimes.isNoDataStop(2));
       }
     }
+
+    @Test
+    public void scheduledTripWithPreviouslySkipped() {
+      // Create update with a skipped stop at first
+      String scheduledTripId = "1.1";
+
+      var skippedBuilder = new TripUpdateBuilder(
+        scheduledTripId,
+        SERVICE_DATE,
+        SCHEDULED,
+        transitModel.getTimeZone()
+      )
+        .addDelayedStopTime(1, 0)
+        .addSkippedStop(2)
+        .addDelayedStopTime(3, 90);
+
+      var tripUpdate = skippedBuilder.build();
+
+      var updater = defaultUpdater();
+
+      // apply the update with a skipped stop
+      updater.applyTripUpdates(
+        TRIP_MATCHER_NOOP,
+        REQUIRED_NO_DATA,
+        false,
+        List.of(tripUpdate),
+        feedId
+      );
+
+      // Force a snapshot commit. This is done to mimic normal behaviour where a new update arrives
+      // after the original snapshot has been committed
+      updater.getTimetableSnapshot(true);
+
+      // Create update to the same trip but now the skipped stop is no longer skipped
+      var scheduledBuilder = new TripUpdateBuilder(
+        scheduledTripId,
+        SERVICE_DATE,
+        SCHEDULED,
+        transitModel.getTimeZone()
+      )
+        .addDelayedStopTime(1, 0)
+        .addDelayedStopTime(2, 60, 80)
+        .addDelayedStopTime(3, 90, 90);
+
+      tripUpdate = scheduledBuilder.build();
+
+      // apply the update with the previously skipped stop now scheduled
+      updater.applyTripUpdates(
+        TRIP_MATCHER_NOOP,
+        REQUIRED_NO_DATA,
+        false,
+        List.of(tripUpdate),
+        feedId
+      );
+
+      // Check that the there is no longer a realtime added trip pattern for the trip and that the
+      // stoptime updates have gone through
+      var snapshot = updater.getTimetableSnapshot(true);
+      {
+        final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern(
+          new FeedScopedId(feedId, scheduledTripId),
+          SERVICE_DATE
+        );
+        assertNull(newTripPattern);
+
+        final FeedScopedId tripId = new FeedScopedId(feedId, scheduledTripId);
+        final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId);
+        final TripPattern originalTripPattern = transitModel
+          .getTransitModelIndex()
+          .getPatternForTrip()
+          .get(trip);
+
+        final Timetable originalTimetableForToday = snapshot.resolve(
+          originalTripPattern,
+          SERVICE_DATE
+        );
+        final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null);
+
+        assertNotSame(originalTimetableForToday, originalTimetableScheduled);
+
+        final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId);
+        assertTrue(
+          originalTripIndexScheduled > -1,
+          "Original trip should be found in scheduled time table"
+        );
+        final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes(
+          originalTripIndexScheduled
+        );
+        assertFalse(
+          originalTripTimesScheduled.isCanceledOrDeleted(),
+          "Original trip times should not be canceled in scheduled time table"
+        );
+        assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState());
+
+        final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId);
+        assertTrue(
+          originalTripIndexForToday > -1,
+          "Original trip should be found in time table for service date"
+        );
+        final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes(
+          originalTripIndexForToday
+        );
+        assertEquals(RealTimeState.UPDATED, originalTripTimesForToday.getRealTimeState());
+        assertEquals(0, originalTripTimesForToday.getArrivalDelay(0));
+        assertEquals(0, originalTripTimesForToday.getDepartureDelay(0));
+        assertEquals(60, originalTripTimesForToday.getArrivalDelay(1));
+        assertEquals(80, originalTripTimesForToday.getDepartureDelay(1));
+        assertEquals(90, originalTripTimesForToday.getArrivalDelay(2));
+        assertEquals(90, originalTripTimesForToday.getDepartureDelay(2));
+      }
+    }
   }
 
   @Nested

From b456b4474c47bc7597c94a6fe002e88d6eef578f Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Tue, 12 Mar 2024 18:24:28 +0000
Subject: [PATCH 0781/1688] Upgrade debug client to version
 2024/03/2024-03-12T18:23

---
 src/client/debug-client-preview/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html
index a7b15bef13b..84d1084320f 100644
--- a/src/client/debug-client-preview/index.html
+++ b/src/client/debug-client-preview/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
      

From 94512daf2fd931c112d50639acf3accc01a5542e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 01:08:35 +0000
Subject: [PATCH 0782/1688] chore(deps): update dependency
 io.github.git-commit-id:git-commit-id-maven-plugin to v8.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fb81075d4de..9a50e577ad8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@
                   but we need the Maven project version as well, so we perform substitution. -->
                 io.github.git-commit-id
                 git-commit-id-maven-plugin
-                8.0.0
+                8.0.1
                 
                     
                         

From 800c758b4abaecc0992af56c83dcbbf4fbe95d92 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 01:08:43 +0000
Subject: [PATCH 0783/1688] chore(deps): update dependency
 org.apache.commons:commons-compress to v1.26.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 9a50e577ad8..82567188005 100644
--- a/pom.xml
+++ b/pom.xml
@@ -930,7 +930,7 @@
         
             org.apache.commons
             commons-compress
-            1.26.0
+            1.26.1
             test
         
     

From c38e648486382999a6f7f0ab665908632b632d4b Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Wed, 13 Mar 2024 09:55:58 +0200
Subject: [PATCH 0784/1688] Show stop status instead of alerts

---
 .../layers/stops/StopsLayerTest.java          |  2 +-
 ...DigitransitRealtimeStopPropertyMapper.java | 50 +++++++++----------
 2 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
index 79a95d2883d..d2b604e0705 100644
--- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
@@ -158,6 +158,6 @@ public TransitAlertService getTransitAlertService() {
     assertEquals("F:name", map.get("gtfsId"));
     assertEquals("name", map.get("name"));
     assertEquals("desc", map.get("desc"));
-    assertEquals("[{\"alertEffect\":\"NO_SERVICE\"}]", map.get("alerts"));
+    assertEquals("OUT_OF_SERVICE", map.get("state"));
   }
 }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index 2bae5074a78..9581731a1ca 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -8,11 +8,10 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
 import org.opentripplanner.apis.support.mapping.PropertyMapper;
 import org.opentripplanner.framework.i18n.I18NStringMapper;
 import org.opentripplanner.inspector.vector.KeyValue;
+import org.opentripplanner.routing.alertpatch.AlertEffect;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.TransitService;
 
@@ -28,30 +27,19 @@ public DigitransitRealtimeStopPropertyMapper(TransitService transitService, Loca
 
   @Override
   protected Collection map(RegularStop stop) {
-    String alerts = JSONArray.toJSONString(
-      transitService
-        .getTransitAlertService()
-        .getStopAlerts(stop.getId())
-        .stream()
-        .map(alert -> {
-          JSONObject alertObject = new JSONObject();
-          Instant currentTime = ZonedDateTime.now(transitService.getTimeZone()).toInstant();
-          if (
-            (
-              alert.getEffectiveStartDate() != null &&
-              alert.getEffectiveStartDate().isBefore(currentTime)
-            ) &&
-            (
-              alert.getEffectiveEndDate() != null &&
-              alert.getEffectiveEndDate().isAfter(currentTime)
-            )
-          ) {
-            alertObject.put("alertEffect", alert.effect().toString());
-          }
-          return alertObject;
-        })
-        .toList()
-    );
+    Instant currentTime = ZonedDateTime.now(transitService.getTimeZone()).toInstant();
+    boolean noService = transitService
+      .getTransitAlertService()
+      .getStopAlerts(stop.getId())
+      .stream()
+      .anyMatch(alert ->
+        alert.effect().equals(AlertEffect.NO_SERVICE) &&
+        (
+          alert.getEffectiveStartDate() != null &&
+          alert.getEffectiveStartDate().isBefore(currentTime)
+        ) &&
+        (alert.getEffectiveEndDate() != null && alert.getEffectiveEndDate().isAfter(currentTime))
+      );
 
     return List.of(
       new KeyValue("gtfsId", stop.getId().toString()),
@@ -65,7 +53,15 @@ protected Collection map(RegularStop stop) {
       ),
       new KeyValue("type", getType(transitService, stop)),
       new KeyValue("routes", getRoutes(transitService, stop)),
-      new KeyValue("alerts", alerts)
+      new KeyValue(
+        "state",
+        noService ? StopState.OUT_OF_SERVICE.toString() : StopState.OPERATIONAL.toString()
+      )
     );
   }
+
+  enum StopState {
+    OPERATIONAL,
+    OUT_OF_SERVICE,
+  }
 }

From f80544b9eb21564575eaa37cda51118f9c3dde76 Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Wed, 13 Mar 2024 10:16:27 +0200
Subject: [PATCH 0785/1688] Show if there is a no service alert

---
 .../ext/vectortiles/layers/stops/StopsLayerTest.java |  2 +-
 .../stops/DigitransitRealtimeStopPropertyMapper.java | 12 ++----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
index d2b604e0705..dcb7f0db31a 100644
--- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
@@ -158,6 +158,6 @@ public TransitAlertService getTransitAlertService() {
     assertEquals("F:name", map.get("gtfsId"));
     assertEquals("name", map.get("name"));
     assertEquals("desc", map.get("desc"));
-    assertEquals("OUT_OF_SERVICE", map.get("state"));
+    assertEquals(true, map.get("noServiceAlert"));
   }
 }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index 9581731a1ca..543246acac9 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -28,7 +28,7 @@ public DigitransitRealtimeStopPropertyMapper(TransitService transitService, Loca
   @Override
   protected Collection map(RegularStop stop) {
     Instant currentTime = ZonedDateTime.now(transitService.getTimeZone()).toInstant();
-    boolean noService = transitService
+    boolean noServiceAlert = transitService
       .getTransitAlertService()
       .getStopAlerts(stop.getId())
       .stream()
@@ -53,15 +53,7 @@ protected Collection map(RegularStop stop) {
       ),
       new KeyValue("type", getType(transitService, stop)),
       new KeyValue("routes", getRoutes(transitService, stop)),
-      new KeyValue(
-        "state",
-        noService ? StopState.OUT_OF_SERVICE.toString() : StopState.OPERATIONAL.toString()
-      )
+      new KeyValue("noServiceAlert", noServiceAlert)
     );
   }
-
-  enum StopState {
-    OPERATIONAL,
-    OUT_OF_SERVICE,
-  }
 }

From 5aeeffa2a953c9e80e4c66d2cec7ca83afe58114 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 10:56:34 +0100
Subject: [PATCH 0786/1688] 'property' -> 'parameter'

---
 .../java/org/opentripplanner/standalone/OTPMain.java   |  4 ++--
 .../opentripplanner/standalone/config/BuildConfig.java |  6 +++---
 .../standalone/config/CommandLineParameters.java       |  2 +-
 .../opentripplanner/standalone/config/ConfigModel.java | 10 +++++-----
 .../opentripplanner/standalone/config/OtpConfig.java   |  6 +++---
 .../standalone/config/RouterConfig.java                |  6 +++---
 .../standalone/config/framework/json/NodeAdapter.java  |  2 +-
 .../config/framework/json/NodeAdapterTest.java         |  4 ++--
 8 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/main/java/org/opentripplanner/standalone/OTPMain.java b/src/main/java/org/opentripplanner/standalone/OTPMain.java
index 133024dcaa8..de5ccd7057c 100644
--- a/src/main/java/org/opentripplanner/standalone/OTPMain.java
+++ b/src/main/java/org/opentripplanner/standalone/OTPMain.java
@@ -180,9 +180,9 @@ private static void startOTPServer(CommandLineParameters cli) {
    * Optionally, check if the config is valid and if not abort the startup process.
    */
   private static void detectUnusedConfigParams(CommandLineParameters cli, ConfigModel config) {
-    if (cli.abortOnUnknownConfig && config.hasUnknownProperties()) {
+    if (cli.abortOnUnknownConfig && config.hasUnknownParameters()) {
       throw new OtpAppException(
-        "Configuration contains invalid properties (see above for details). " +
+        "Configuration contains unknown parameters (see above for details). " +
         "Please fix your configuration or remove --abortOnUnknownConfig from your OTP CLI parameters."
       );
     }
diff --git a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
index 1019a945c58..a3c6f313799 100644
--- a/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/BuildConfig.java
@@ -728,9 +728,9 @@ public NodeAdapter asNodeAdapter() {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
-    return root.hasUnknownProperties();
+  public boolean hasUnknownParameters() {
+    return root.hasUnknownParameters();
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java b/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
index 2cdd8ed5c1b..3513ec252ea 100644
--- a/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
+++ b/src/main/java/org/opentripplanner/standalone/config/CommandLineParameters.java
@@ -135,7 +135,7 @@ public class CommandLineParameters {
 
   @Parameter(
     names = { "--abortOnUnknownConfig" },
-    description = "Abort the startup if configuration files are found to be invalid."
+    description = "Abort the startup if configuration files are found to contain unknown parameters."
   )
   public boolean abortOnUnknownConfig = false;
 
diff --git a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
index b03f6b4f959..8cffa5002e4 100644
--- a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
+++ b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java
@@ -107,13 +107,13 @@ public static void initializeOtpFeatures(OtpConfig otpConfig) {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
+  public boolean hasUnknownParameters() {
     return (
-      otpConfig.hasUnknownProperties() ||
-      buildConfig.hasUnknownProperties() ||
-      routerConfig.hasUnknownProperties()
+      otpConfig.hasUnknownParameters() ||
+      buildConfig.hasUnknownParameters() ||
+      routerConfig.hasUnknownParameters()
     );
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
index 29f866123e3..2918cbc3884 100644
--- a/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/OtpConfig.java
@@ -73,9 +73,9 @@ public OtpConfig(NodeAdapter nodeAdapter, boolean logUnusedParams) {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
-    return root.hasUnknownProperties();
+  public boolean hasUnknownParameters() {
+    return root.hasUnknownParameters();
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
index ee8c46aa447..4ac0688a759 100644
--- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java
@@ -152,9 +152,9 @@ public String toString() {
   }
 
   /**
-   * Checks if any unknown or invalid properties were encountered while loading the configuration.
+   * Checks if any unknown or invalid parameters were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
-    return root.hasUnknownProperties();
+  public boolean hasUnknownParameters() {
+    return root.hasUnknownParameters();
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
index 930b5c1799f..9523e330eca 100644
--- a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
+++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java
@@ -175,7 +175,7 @@ public void logAllWarnings(Consumer logger) {
   /**
    * Checks if any unknown or invalid properties were encountered while loading the configuration.
    */
-  public boolean hasUnknownProperties() {
+  public boolean hasUnknownParameters() {
     return !unusedParams().isEmpty() || !allWarnings().toList().isEmpty();
   }
 
diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
index 4ab5545cc23..5a1aa2f0063 100644
--- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
+++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java
@@ -569,7 +569,7 @@ void invalidProperties() {
       // When: Access ONLY parameter 'a', but not 'b'
       subject.of("foo").asObject().of("a").asBoolean();
 
-      assertTrue(subject.hasUnknownProperties());
+      assertTrue(subject.hasUnknownParameters());
     }
 
     @Test
@@ -581,7 +581,7 @@ void valid() {
       object.of("a").asBoolean();
       object.of("b").asBoolean();
 
-      assertFalse(subject.hasUnknownProperties());
+      assertFalse(subject.hasUnknownParameters());
     }
   }
 

From ea159d544f6a8c3835b3826371e52a1dd87cbafc Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 11:06:49 +0100
Subject: [PATCH 0787/1688] Update actions version [ci skip]

---
 .github/workflows/cibuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 28a84953af2..64f2fb8075f 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -75,7 +75,7 @@ jobs:
       # on windows there are frequent failures caused by page files being too small
       # https://github.com/actions/virtual-environments/issues/785
       - name: Configure Windows Pagefile
-        uses: al-cheb/configure-pagefile-action@v1.3
+        uses: al-cheb/configure-pagefile-action@v1.4
       - name: Run tests
         run: mvn --batch-mode test -P prettierSkip
 

From dd4db6078ba45e4df29504e6bee21c45b7111f7f Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Wed, 13 Mar 2024 13:46:50 +0200
Subject: [PATCH 0788/1688] refactoring, validity logic fixed

---
 .../layers/stops/StopsLayerTest.java          |  2 +-
 ...DigitransitRealtimeStopPropertyMapper.java | 39 +++++++------------
 .../stops/DigitransitStopPropertyMapper.java  | 24 ++++++++++--
 .../routing/alertpatch/TransitAlert.java      | 13 +++++++
 4 files changed, 49 insertions(+), 29 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
index dcb7f0db31a..a914cf9db6c 100644
--- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java
@@ -158,6 +158,6 @@ public TransitAlertService getTransitAlertService() {
     assertEquals("F:name", map.get("gtfsId"));
     assertEquals("name", map.get("name"));
     assertEquals("desc", map.get("desc"));
-    assertEquals(true, map.get("noServiceAlert"));
+    assertEquals(true, map.get("closedByServiceAlert"));
   }
 }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index 543246acac9..5c4f774bb20 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -1,17 +1,17 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
+import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getKeyValues;
 import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getRoutes;
 import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getType;
 
 import java.time.Instant;
-import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.List;
 import java.util.Locale;
 import org.opentripplanner.apis.support.mapping.PropertyMapper;
+import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.framework.i18n.I18NStringMapper;
 import org.opentripplanner.inspector.vector.KeyValue;
-import org.opentripplanner.routing.alertpatch.AlertEffect;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.TransitService;
 
@@ -27,33 +27,24 @@ public DigitransitRealtimeStopPropertyMapper(TransitService transitService, Loca
 
   @Override
   protected Collection map(RegularStop stop) {
-    Instant currentTime = ZonedDateTime.now(transitService.getTimeZone()).toInstant();
+    Instant currentTime = Instant.now();
     boolean noServiceAlert = transitService
       .getTransitAlertService()
       .getStopAlerts(stop.getId())
       .stream()
-      .anyMatch(alert ->
-        alert.effect().equals(AlertEffect.NO_SERVICE) &&
-        (
-          alert.getEffectiveStartDate() != null &&
-          alert.getEffectiveStartDate().isBefore(currentTime)
-        ) &&
-        (alert.getEffectiveEndDate() != null && alert.getEffectiveEndDate().isAfter(currentTime))
-      );
+      .anyMatch(alert -> alert.noServiceOn(currentTime));
 
-    return List.of(
-      new KeyValue("gtfsId", stop.getId().toString()),
-      new KeyValue("name", i18NStringMapper.mapNonnullToApi(stop.getName())),
-      new KeyValue("code", stop.getCode()),
-      new KeyValue("platform", stop.getPlatformCode()),
-      new KeyValue("desc", i18NStringMapper.mapToApi(stop.getDescription())),
-      new KeyValue(
-        "parentStation",
-        stop.getParentStation() != null ? stop.getParentStation().getId() : "null"
-      ),
-      new KeyValue("type", getType(transitService, stop)),
-      new KeyValue("routes", getRoutes(transitService, stop)),
-      new KeyValue("noServiceAlert", noServiceAlert)
+    Collection sharedKeyValues = getKeyValues(
+      stop,
+      i18NStringMapper.mapNonnullToApi(stop.getName()),
+      i18NStringMapper.mapToApi(stop.getDescription()),
+      getType(transitService, stop),
+      getRoutes(transitService, stop)
     );
+    Collection keyValues = ListUtils.combine(
+      sharedKeyValues,
+      List.of(new KeyValue("closedByServiceAlert", noServiceAlert))
+    );
+    return keyValues;
   }
 }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
index 8f9c427468e..998e125ce9d 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
@@ -34,18 +34,34 @@ protected static DigitransitStopPropertyMapper create(
 
   @Override
   protected Collection map(RegularStop stop) {
+    return getKeyValues(
+      stop,
+      i18NStringMapper.mapNonnullToApi(stop.getName()),
+      i18NStringMapper.mapToApi(stop.getDescription()),
+      getType(transitService, stop),
+      getRoutes(transitService, stop)
+    );
+  }
+
+  protected static Collection getKeyValues(
+    RegularStop stop,
+    String name,
+    String description,
+    String type,
+    String routes
+  ) {
     return List.of(
       new KeyValue("gtfsId", stop.getId().toString()),
-      new KeyValue("name", i18NStringMapper.mapNonnullToApi(stop.getName())),
+      new KeyValue("name", name),
       new KeyValue("code", stop.getCode()),
       new KeyValue("platform", stop.getPlatformCode()),
-      new KeyValue("desc", i18NStringMapper.mapToApi(stop.getDescription())),
+      new KeyValue("desc", description),
       new KeyValue(
         "parentStation",
         stop.getParentStation() != null ? stop.getParentStation().getId() : null
       ),
-      new KeyValue("type", getType(transitService, stop)),
-      new KeyValue("routes", getRoutes(transitService, stop))
+      new KeyValue("type", type),
+      new KeyValue("routes", routes)
     );
   }
 
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
index d5d260a8218..ac278a44a5c 100644
--- a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
+++ b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
@@ -191,6 +191,19 @@ public Instant getEffectiveEndDate() {
       .orElse(null);
   }
 
+  /**
+   * Checks if the alert has a NO_SERVICE alert active at the requested time.
+   * @param instant
+   * @return
+   */
+  public boolean noServiceOn(Instant instant) {
+    return (
+      effect.equals(AlertEffect.NO_SERVICE) &&
+      (getEffectiveStartDate() != null && getEffectiveStartDate().isBefore(instant)) &&
+      (getEffectiveEndDate() == null || getEffectiveEndDate().isAfter(instant))
+    );
+  }
+
   @Override
   public boolean sameAs(@Nonnull TransitAlert other) {
     return (

From b57e52922552c1b651766be83290712b3250ee11 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 13:08:50 +0100
Subject: [PATCH 0789/1688] Update documentation for 2.5.0 release

---
 README.md                      |  2 +-
 doc-templates/Configuration.md |  4 +-
 docs/Basic-Tutorial.md         | 16 ++++----
 docs/Changelog.md              | 69 +++++++++++++---------------------
 docs/Configuration.md          |  4 +-
 docs/Getting-OTP.md            | 12 +++---
 docs/RouterConfiguration.md    |  2 +-
 docs/index.md                  |  3 +-
 8 files changed, 49 insertions(+), 63 deletions(-)

diff --git a/README.md b/README.md
index 4486818745b..953aa02b731 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ GTFS and OpenStreetMap). It applies real-time updates and alerts with immediate
 clients, finding itineraries that account for disruptions and service changes.
 
 Note that this branch contains **OpenTripPlanner 2**, the second major version of OTP, which has
-been under development since 2018. The latest version of OTP is v2.4.0, released in September 2023.
+been under development since 2018. The latest version of OTP is v2.5.0, released in March 2024.
 
 If you do not want to use this version, please switch to the final 1.x release
 tag `v1.5.0` or the `dev-1.x` branch.
diff --git a/doc-templates/Configuration.md b/doc-templates/Configuration.md
index 6344e270570..e06adc46dc5 100644
--- a/doc-templates/Configuration.md
+++ b/doc-templates/Configuration.md
@@ -146,7 +146,7 @@ text inserted is valid JSON (starts with `{` and ends with `}`).
 Variable substitution is performed on configuration file after the include file directive; Hence
 variable substitution is also performed on the text in the injected file.
 
-Here is an example including variable substitution, assuming version 2.4.0 of OTP:
+Here is an example including variable substitution, assuming version 2.5.0 of OTP:
 
 ```JSON
 // build-config.json
@@ -170,7 +170,7 @@ The result will look like this:
 {
       "transitFeeds": [
         {
-          "source": "netex-v2.4.0.obj"
+          "source": "netex-v2.5.0.obj"
         }
       ]
 } 
diff --git a/docs/Basic-Tutorial.md b/docs/Basic-Tutorial.md
index 3d99d96f4da..a7a69b8a3bb 100644
--- a/docs/Basic-Tutorial.md
+++ b/docs/Basic-Tutorial.md
@@ -18,9 +18,9 @@ JAR containing all other libraries needed for OTP to work, and is available from
 repository. You will be able to go
 to [the OTP directory at Maven Central](https://repo1.maven.org/maven2/org/opentripplanner/otp/),
 navigate to
-the [directory of releases](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.4.0/),
+the [directory of releases](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.5.0/),
 and download
-the [file with `shaded.jar` suffix](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.4.0/otp-2.4.0-shaded.jar)
+the [file with `shaded.jar` suffix](https://repo1.maven.org/maven2/org/opentripplanner/otp/2.5.0/otp-2.5.0-shaded.jar)
 .
 
 You may also want to get your own copy of the OTP source code
@@ -129,7 +129,7 @@ below and in other tutorials.
 The simplest way to use OTP is to build a graph in a single step and start a server immediately,
 without saving it to disk. The command to do so is:
 
-    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --build --serve /home/username/otp
+    $ java -Xmx2G -jar otp-2.5.0-shaded.jar --build --serve /home/username/otp
 
 where `/home/username/otp` should be the directory where you put your configuration and input files.
 
@@ -154,13 +154,13 @@ build a graph from street and transit data then save it to a file using the `--b
 command line parameters together. If for example your current working directory (`.`) contains the
 input files and the OTP JAR file, you can use this command:
 
-    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --build --save .
+    $ java -Xmx2G -jar otp-2.5.0-shaded.jar --build --save .
 
 This will produce a file called `graph.obj` in the same directory as the inputs. The server can then
 be started later using the `--load` parameter, and will read this file instead of building the graph
 from scratch:
 
-    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --load .
+    $ java -Xmx2G -jar otp-2.5.0-shaded.jar --load .
 
 Another reason to perform these two phases separately is that the building process loads the entire
 GTFS and OSM data sets into memory, so can require significantly more memory than just running a
@@ -177,16 +177,16 @@ graph once, and then layer transit data on top of the streets to make the final
 Again assuming the input files and OTP JAR file are in the current working directory, you can build
 a street graph with OSM and elevation data only (ignoring transit input files) with this command:
 
-    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --buildStreet .
+    $ java -Xmx2G -jar otp-2.5.0-shaded.jar --buildStreet .
 
 Then, to build a graph layering transit data on top of the saved street graph (built using the
 previous command):
 
-    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --loadStreet --save .
+    $ java -Xmx2G -jar otp-2.5.0-shaded.jar --loadStreet --save .
 
 Finally, the server can be started using the `--load` parameter:
 
-    $ java -Xmx2G -jar otp-2.4.0-shaded.jar --load .
+    $ java -Xmx2G -jar otp-2.5.0-shaded.jar --load .
 
 ## Command Line Switches
 
diff --git a/docs/Changelog.md b/docs/Changelog.md
index 5c5a9e6aa99..8ca70f59191 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -3,25 +3,39 @@
 The changelog lists most feature changes between each release. The list is automatically created
 based on merged pull requests. Search GitHub issues and pull requests for smaller issues.
 
-## 2.5.0 (under development)
+## 2.6.0-SNAPSHOT (under development)
+
+[](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
+
+## 2.5.0 (2024-03-13)
+
+### Notable Changes
+
+- Make GTFS GraphQL API an official API [#5339](https://github.com/opentripplanner/OpenTripPlanner/pull/5339)
+- Make Transmodel GraphQl API an official API [#5573](https://github.com/opentripplanner/OpenTripPlanner/pull/5573), [#5637](https://github.com/opentripplanner/OpenTripPlanner/pull/5637)
+- Deprecate REST API [#5580](https://github.com/opentripplanner/OpenTripPlanner/pull/5580)
+- Transit group priority [#4999](https://github.com/opentripplanner/OpenTripPlanner/pull/4999), [#5583](https://github.com/opentripplanner/OpenTripPlanner/pull/5583), [#5638](https://github.com/opentripplanner/OpenTripPlanner/pull/5638)
+- Transmodel GraphQL API for pass-through searches [#5320](https://github.com/opentripplanner/OpenTripPlanner/pull/5320)
+- Migrate to Java 21 [#5421](https://github.com/opentripplanner/OpenTripPlanner/pull/5421)
+- New debug client [#5334](https://github.com/opentripplanner/OpenTripPlanner/pull/5334)
+- Update to latest GTFS Flex spec draft [#5564](https://github.com/opentripplanner/OpenTripPlanner/pull/5564), [#5655](https://github.com/opentripplanner/OpenTripPlanner/pull/5655)
+- Restructure walk/bicycle/car preferences in router-config.json [#5582](https://github.com/opentripplanner/OpenTripPlanner/pull/5582)
+
+### Detailed changes by Pull Request
 
 - Gracefully handle nullable fields in TransitAlert [#5349](https://github.com/opentripplanner/OpenTripPlanner/pull/5349)
 - Remove transit with higher cost than best on-street itinerary filter [#5222](https://github.com/opentripplanner/OpenTripPlanner/pull/5222)
-- Remove banDiscouragedCycling and banDiscouragedWalking [#5341](https://github.com/opentripplanner/OpenTripPlanner/pull/5341)
+- Remove `banDiscouragedCycling` and `banDiscouragedWalking` [#5341](https://github.com/opentripplanner/OpenTripPlanner/pull/5341)
 - Fix rental scooter access [#5361](https://github.com/opentripplanner/OpenTripPlanner/pull/5361)
 - De-duplicate stops returned by `stopsByRadius` [#5366](https://github.com/opentripplanner/OpenTripPlanner/pull/5366)
-- Fix value mapping for bikesAllowed in GTFS GraphQL API [#5368](https://github.com/opentripplanner/OpenTripPlanner/pull/5368)
+- Fix value mapping for `bikesAllowed` in GTFS GraphQL API [#5368](https://github.com/opentripplanner/OpenTripPlanner/pull/5368)
 - Apply correct traversal permissions to barrier vertex [#5369](https://github.com/opentripplanner/OpenTripPlanner/pull/5369)
-- Move GTFS GraphQL API out of the sandbox [#5339](https://github.com/opentripplanner/OpenTripPlanner/pull/5339)
-- Transmodel GraphQL API for pass-through searches [#5320](https://github.com/opentripplanner/OpenTripPlanner/pull/5320)
 - Fix check for OSM relation members not being present in the extract [#5379](https://github.com/opentripplanner/OpenTripPlanner/pull/5379)
 - Add a configurable limit for the search window [#5293](https://github.com/opentripplanner/OpenTripPlanner/pull/5293)
-- Fix fare calculation for combined interlined legs [#5408](https://github.com/opentripplanner/OpenTripPlanner/pull/5408)
 - Fix board slack list mapping in Transmodel API [#5420](https://github.com/opentripplanner/OpenTripPlanner/pull/5420)
 - Fix flexible quay querying in Transmodel API [#5417](https://github.com/opentripplanner/OpenTripPlanner/pull/5417)
 - Add validation for missing calls in SIRI update [#5403](https://github.com/opentripplanner/OpenTripPlanner/pull/5403)
 - Import Occupancy Status from GTFS-RT Vehicle Positions [#5372](https://github.com/opentripplanner/OpenTripPlanner/pull/5372)
-- Add Roadmap epic template [#5413](https://github.com/opentripplanner/OpenTripPlanner/pull/5413)
 - Allow multiple zones in an unscheduled flex trip [#5376](https://github.com/opentripplanner/OpenTripPlanner/pull/5376)
 - Filter out null, empty and blank elements when mapping feed-scoped ids [#5428](https://github.com/opentripplanner/OpenTripPlanner/pull/5428)
 - Validate stop id in Transit leg reference [#5440](https://github.com/opentripplanner/OpenTripPlanner/pull/5440)
@@ -30,77 +44,48 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Add stricter validation for flex areas [#5457](https://github.com/opentripplanner/OpenTripPlanner/pull/5457)
 - Remove HTTPS handling and its documentation [#5439](https://github.com/opentripplanner/OpenTripPlanner/pull/5439)
 - Add support for DSJ in transit leg reference [#5455](https://github.com/opentripplanner/OpenTripPlanner/pull/5455)
-- Ignore negative travel-times in Raptor [#5443](https://github.com/opentripplanner/OpenTripPlanner/pull/5443)
 - Fix sort order bug in optimized transfers [#5446](https://github.com/opentripplanner/OpenTripPlanner/pull/5446)
-- Siri file loader [#5460](https://github.com/opentripplanner/OpenTripPlanner/pull/5460)
+- SIRI file loader [#5460](https://github.com/opentripplanner/OpenTripPlanner/pull/5460)
 - Calculate CO₂ emissions of itineraries [#5278](https://github.com/opentripplanner/OpenTripPlanner/pull/5278)
-- Update NeTEx Java Model 2.0.15 [#5466](https://github.com/opentripplanner/OpenTripPlanner/pull/5466)
-- Migrate to Java 21 [#5421](https://github.com/opentripplanner/OpenTripPlanner/pull/5421)
-- Add Roadmap setup docs [#5468](https://github.com/opentripplanner/OpenTripPlanner/pull/5468)
 - Interpolate increasing stop times for GTFS-RT cancelled trips [#5348](https://github.com/opentripplanner/OpenTripPlanner/pull/5348)
 - Remove itineraries outside the search window in arriveBy search [#5433](https://github.com/opentripplanner/OpenTripPlanner/pull/5433)
-- Add back walk-reluctance in Transmodel API [#5471](https://github.com/opentripplanner/OpenTripPlanner/pull/5471)
-- Make `feedId` required for real-time updaters [#5502](https://github.com/opentripplanner/OpenTripPlanner/pull/5502)
-- Fix serialization of `AtomicInteger` [#5508](https://github.com/opentripplanner/OpenTripPlanner/pull/5508)
+- Add back walk reluctance in Transmodel API [#5471](https://github.com/opentripplanner/OpenTripPlanner/pull/5471)
 - Improve linking of fixed stops used by flex trips [#5503](https://github.com/opentripplanner/OpenTripPlanner/pull/5503)
 - Keep min transfer filter is not local to group-by-filters [#5436](https://github.com/opentripplanner/OpenTripPlanner/pull/5436)
 - Add paging deduplication when cropping [#5458](https://github.com/opentripplanner/OpenTripPlanner/pull/5458)
-- Consolidate equivalent stops from several feeds  [#5429](https://github.com/opentripplanner/OpenTripPlanner/pull/5429)
 - Check transport mode when mapping GroupStops [#5518](https://github.com/opentripplanner/OpenTripPlanner/pull/5518)
-- Cleanup trip times - Part A [#5437](https://github.com/opentripplanner/OpenTripPlanner/pull/5437)
 - Transfer cost limit [#5516](https://github.com/opentripplanner/OpenTripPlanner/pull/5516)
 - Fix missed trip when arrive-by search-window is off by one minute [#5520](https://github.com/opentripplanner/OpenTripPlanner/pull/5520)
-- Transit group priority - Part 1 [#4999](https://github.com/opentripplanner/OpenTripPlanner/pull/4999)
 - Remove `matchBusRoutesToStreets` [#5523](https://github.com/opentripplanner/OpenTripPlanner/pull/5523)
-- Rename realtime to real-time in docs [#5535](https://github.com/opentripplanner/OpenTripPlanner/pull/5535)
 - Add same submode in alternative legs filter [#5548](https://github.com/opentripplanner/OpenTripPlanner/pull/5548)
 - Fix issue where stop points are sometimes added twice to index [#5552](https://github.com/opentripplanner/OpenTripPlanner/pull/5552)
 - Improve shutdown logic [#5514](https://github.com/opentripplanner/OpenTripPlanner/pull/5514)
-- Create TripOnServiceDate for new siri realtime servicejourneys [#5542](https://github.com/opentripplanner/OpenTripPlanner/pull/5542)
-- New debug client [#5334](https://github.com/opentripplanner/OpenTripPlanner/pull/5334)
+- Create TripOnServiceDate for new SIRI real-time servicejourneys [#5542](https://github.com/opentripplanner/OpenTripPlanner/pull/5542)
 - Improve paging - avoid duplicates and missed itineraries when paging [#5551](https://github.com/opentripplanner/OpenTripPlanner/pull/5551)
-- Create own parking preferences for bike and car in the internal model [#5521](https://github.com/opentripplanner/OpenTripPlanner/pull/5521)
-- Make Transmodel GraphQl API an official OTP API [#5573](https://github.com/opentripplanner/OpenTripPlanner/pull/5573)
 - Add option to include stations in `nearest` search [#5390](https://github.com/opentripplanner/OpenTripPlanner/pull/5390)
-- GTFS Flex spec update: separate columns for `location_id`, `location_group_id` [#5564](https://github.com/opentripplanner/OpenTripPlanner/pull/5564)
-- Report NO_TRANSIT_CONNECTION when search-window is set. [#5570](https://github.com/opentripplanner/OpenTripPlanner/pull/5570)
-- Transit priority  - part 3 [#5583](https://github.com/opentripplanner/OpenTripPlanner/pull/5583)
+- Report NO_TRANSIT_CONNECTION when search-window is set [#5570](https://github.com/opentripplanner/OpenTripPlanner/pull/5570)
 - Fix preference cost comparisons [#5586](https://github.com/opentripplanner/OpenTripPlanner/pull/5586)
-- Report and throw away trip-times which fail sanity check [#5587](https://github.com/opentripplanner/OpenTripPlanner/pull/5587)
 - Consider escalator edges in island pruning [#5591](https://github.com/opentripplanner/OpenTripPlanner/pull/5591)
-- Create own rental preferences for bike and car in the internal model [#5562](https://github.com/opentripplanner/OpenTripPlanner/pull/5562)
 - Adding situation-version to TransmodelGraphQL API [#5592](https://github.com/opentripplanner/OpenTripPlanner/pull/5592)
-- Move REST API into sandbox [#5580](https://github.com/opentripplanner/OpenTripPlanner/pull/5580)
 - Fix high walk reluctance leading to zero egress results for rental searches [#5605](https://github.com/opentripplanner/OpenTripPlanner/pull/5605)
 - Remove GTFS-RT websocket updater [#5604](https://github.com/opentripplanner/OpenTripPlanner/pull/5604)
-- Add stop layer to new Debug UI [#5602](https://github.com/opentripplanner/OpenTripPlanner/pull/5602)
 - Use fallback timezone if no transit data is loaded [#4652](https://github.com/opentripplanner/OpenTripPlanner/pull/4652)
 - Add new path for GTFS GraphQL API, remove batch feature [#5581](https://github.com/opentripplanner/OpenTripPlanner/pull/5581)
-- Restructure walk/bicycle/car preferences in router-config.json [#5582](https://github.com/opentripplanner/OpenTripPlanner/pull/5582)
-- Revert REST API spelling change of real-time [#5629](https://github.com/opentripplanner/OpenTripPlanner/pull/5629)
 - Remove `FareComponent` [#5613](https://github.com/opentripplanner/OpenTripPlanner/pull/5613)
-- Add AreaStop layer to new debug frontend [#5636](https://github.com/opentripplanner/OpenTripPlanner/pull/5636)
-- Allow configuration of vector tiles base path [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627)
-- Change Transmodel API path to `/otp/transmodel/v3` [#5637](https://github.com/opentripplanner/OpenTripPlanner/pull/5637)
 - Add flexibleArea to GroupStop Quays [#5625](https://github.com/opentripplanner/OpenTripPlanner/pull/5625)
-- Pass-through should override transit-group-priority [#5638](https://github.com/opentripplanner/OpenTripPlanner/pull/5638)
-- Introduce `generalizedCostPlusPenalty` to make cost comparsion fairer [#5483](https://github.com/opentripplanner/OpenTripPlanner/pull/5483)
+- Introduce `generalizedCostPlusPenalty` to make cost comparison fairer [#5483](https://github.com/opentripplanner/OpenTripPlanner/pull/5483)
 - Separate walk time from non-transit time [#5648](https://github.com/opentripplanner/OpenTripPlanner/pull/5648)
 - Remove "fare" [#5645](https://github.com/opentripplanner/OpenTripPlanner/pull/5645)
-- Refactor GroupStopBuilder addLocation method [#5651](https://github.com/opentripplanner/OpenTripPlanner/pull/5651)
 - Remove `VehicleToStopHeuristics` [#5381](https://github.com/opentripplanner/OpenTripPlanner/pull/5381)
 - Set defaults of the modes WALK, even if one and not the others are set [#5675](https://github.com/opentripplanner/OpenTripPlanner/pull/5675)
 - Reduce flex default access/egress penalty [#5674](https://github.com/opentripplanner/OpenTripPlanner/pull/5674)
-- Add scooter preferences  [#5632](https://github.com/opentripplanner/OpenTripPlanner/pull/5632)
-- Add GroupStop layer to new debug frontend [#5666](https://github.com/opentripplanner/OpenTripPlanner/pull/5666)
-- Update to newest version of GTFS Flex location groups [#5655](https://github.com/opentripplanner/OpenTripPlanner/pull/5655)
+- Add scooter preferences [#5632](https://github.com/opentripplanner/OpenTripPlanner/pull/5632)
 - Use NeTEx authority short name if name is not present [#5698](https://github.com/opentripplanner/OpenTripPlanner/pull/5698)
 - Add Hamburg OSM mapper [#5701](https://github.com/opentripplanner/OpenTripPlanner/pull/5701)
 - Remove configurable car speed and determine it in graph build [#5657](https://github.com/opentripplanner/OpenTripPlanner/pull/5657)
 - Avoid cumulative real-time updates [#5705](https://github.com/opentripplanner/OpenTripPlanner/pull/5705)
 - Fix time penalty [#5715](https://github.com/opentripplanner/OpenTripPlanner/pull/5715)
 - Fix world envelope builder when crossing Greenwich meridian [#5731](https://github.com/opentripplanner/OpenTripPlanner/pull/5731)
-[](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.4.0 (2023-09-13)
 
diff --git a/docs/Configuration.md b/docs/Configuration.md
index 93ca1fa6c1e..ed58f13fa6e 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -173,7 +173,7 @@ text inserted is valid JSON (starts with `{` and ends with `}`).
 Variable substitution is performed on configuration file after the include file directive; Hence
 variable substitution is also performed on the text in the injected file.
 
-Here is an example including variable substitution, assuming version 2.4.0 of OTP:
+Here is an example including variable substitution, assuming version 2.5.0 of OTP:
 
 ```JSON
 // build-config.json
@@ -197,7 +197,7 @@ The result will look like this:
 {
       "transitFeeds": [
         {
-          "source": "netex-v2.4.0.obj"
+          "source": "netex-v2.5.0.obj"
         }
       ]
 } 
diff --git a/docs/Getting-OTP.md b/docs/Getting-OTP.md
index 1186209854b..a71bc02b5d8 100644
--- a/docs/Getting-OTP.md
+++ b/docs/Getting-OTP.md
@@ -9,8 +9,8 @@ the [release pages on GitHub](https://github.com/opentripplanner/OpenTripPlanner
 or [the OTP directory at Maven Central](https://repo1.maven.org/maven2/org/opentripplanner/otp/),
 navigate to the highest version number, and download the file whose name ends with `shaded.jar`.
 
-Note that version numbers like `v2.1.0-rc1` or `v2.4.0-SNAPSHOT` refer to development builds _
-before_ the release version `v2.4.0`. The existence of a build `vX.Y.Z-SNAPSHOT` does not mean
+Note that version numbers like `v2.1.0-rc1` or `v2.5.0-SNAPSHOT` refer to development builds _
+before_ the release version `v2.5.0`. The existence of a build `vX.Y.Z-SNAPSHOT` does not mean
 that `vX.Y.Z` has been released yet.
 
 We use the [Github Actions CI system](https://github.com/opentripplanner/OpenTripPlanner/actions) to
@@ -87,7 +87,7 @@ For example, you could do the following:
 
 ```bash
 cd OpenTripPlanner
-git checkout v2.4.0
+git checkout v2.5.0
 git clean -df
 mvn clean package -DskipTests
 ```
@@ -110,8 +110,8 @@ file) to the Maven repository, from which it can be automatically included in ot
 
 This repository is machine-readable (by Maven or other build systems) and also provides human
 readable directory listings via HTTP. You can fetch an OTP JAR from this repository by constructing
-the proper URL for the release you want. For example, release 2.4.0 will be found
-at `https://repo1.maven.org/maven2/org/opentripplanner/otp/2.4.0/otp-2.4.0-shaded.jar`.
+the proper URL for the release you want. For example, release 2.5.0 will be found
+at `https://repo1.maven.org/maven2/org/opentripplanner/otp/2.5.0/otp-2.5.0-shaded.jar`.
 
 To make use of OTP in another Maven project, you must specify it as a dependency in that
 project's `pom.xml`:
@@ -120,6 +120,6 @@ project's `pom.xml`:
 
   org.opentripplanner
   otp
-  2.4.0
+  2.5.0
 
 ```
diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md
index 503b8c7370f..30d7c414bfd 100644
--- a/docs/RouterConfiguration.md
+++ b/docs/RouterConfiguration.md
@@ -438,7 +438,7 @@ Used to group requests when monitoring OTP.
 ```JSON
 // router-config.json
 {
-  "configVersion" : "v2.4.0-EN000121",
+  "configVersion" : "v2.5.0-EN000121",
   "server" : {
     "apiProcessingTimeout" : "7s",
     "traceParameters" : [
diff --git a/docs/index.md b/docs/index.md
index b70c99e4d52..f1ddc791212 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -26,7 +26,8 @@ the selector in the upper left of the published documentation.
 
 **Releases**
  
-- [Latest](http://docs.opentripplanner.org/en/latest) - Version 2.4.0 (the git master branch)
+- [Latest](http://docs.opentripplanner.org/en/latest) - Version 2.5 (the git master branch)
+- [v2.4.0](http://docs.opentripplanner.org/en/v2.4.0) - Version 2.4
 - [v2.3.0](http://docs.opentripplanner.org/en/v2.3.0) - Version 2.3
 - [v2.2.0](http://docs.opentripplanner.org/en/v2.2.0) - Version 2.2
 - [v2.1.0](http://docs.opentripplanner.org/en/v2.1.0) - Version 2.1

From 6596982b8a8e4bf959b76590bfc681e257158d31 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 13:09:35 +0100
Subject: [PATCH 0790/1688] Update MASTER_BRANCH_VERSION

---
 .github/workflows/cibuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 64f2fb8075f..5a48da6bc44 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -87,7 +87,7 @@ jobs:
       LOCAL_BRANCH: local-pages
       REMOTE_BRANCH: main
       TOKEN: ${{ secrets.CHANGELOG_TOKEN }}
-      MASTER_BRANCH_VERSION: 2.4.0
+      MASTER_BRANCH_VERSION: 2.5.0
 
     steps:
 

From fc4a4292b2385560208ba5a3a25e515983e57573 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 13:18:58 +0100
Subject: [PATCH 0791/1688] Fix documentation output

---
 docs/RouterConfiguration.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md
index 30d7c414bfd..503b8c7370f 100644
--- a/docs/RouterConfiguration.md
+++ b/docs/RouterConfiguration.md
@@ -438,7 +438,7 @@ Used to group requests when monitoring OTP.
 ```JSON
 // router-config.json
 {
-  "configVersion" : "v2.5.0-EN000121",
+  "configVersion" : "v2.4.0-EN000121",
   "server" : {
     "apiProcessingTimeout" : "7s",
     "traceParameters" : [

From b301ea7c70f2ce7bb22c7f8e7fba6f8654cea3a5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 13:24:41 +0100
Subject: [PATCH 0792/1688] Prepare release 2.5.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 82567188005..865bd206900 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     https://opentripplanner.org
     org.opentripplanner
     otp
-    2.5.0-SNAPSHOT
+    2.5.0
     jar
 
     

From e7872c17845dbeb98110048c193c4dc777abf971 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 13:43:43 +0100
Subject: [PATCH 0793/1688] Switch order of release tasks

---
 docs/ReleaseChecklist.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/ReleaseChecklist.md b/docs/ReleaseChecklist.md
index 7702a60e51c..c74f0662964 100644
--- a/docs/ReleaseChecklist.md
+++ b/docs/ReleaseChecklist.md
@@ -69,12 +69,6 @@ manually is more tedious, but keeps eyes on each step and is less prone to failu
     * Apply the changes recorded
       in https://github.com/opentripplanner/OpenTripPlanner/tree/signed-deploy-to-central
     * While still on the tag commit, run `mvn deploy -Prelease`.
-* Set up next development iteration
-    * Add a new section header to `docs/Changelog.md` like `x.y+1.0-SNAPSHOT (in progress)`
-    * Edit minor version in `pom.xml` to `x.y+1.0-SNAPSHOT`
-    * `git add pom.xml docs/Changelog.md`
-    * `git commit -m "Prepare next development iteration x.y+1.0-SNAPSHOT"`
-    * `git push`
 * Check that Maven artifact appears on Maven Central
     * [Directory listing of OTP releases on Maven Central](https://repo1.maven.org/maven2/org/opentripplanner/otp/)
     * It may take a while (half an hour) for releases to show up in the central repo after Travis
@@ -83,6 +77,12 @@ manually is more tedious, but keeps eyes on each step and is less prone to failu
     * `git checkout dev-2.x`
     * `git merge master`
     * `git push`
+* Set up next development iteration
+    * Add a new section header to `docs/Changelog.md` like `x.y+1.0-SNAPSHOT (in progress)`
+    * Edit minor version in `pom.xml` to `x.y+1.0-SNAPSHOT`
+    * `git add pom.xml docs/Changelog.md`
+    * `git commit -m "Prepare next development iteration x.y+1.0-SNAPSHOT"`
+    * `git push`
 * Email the OTP dev and users mailing lists
     * Mention the new version number.
     * Provide links to the new developer documentation.

From 3796cfd32cc57b2820bd6acd618ebd7063c806ec Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 13:44:35 +0100
Subject: [PATCH 0794/1688] Prepare next development iteration 2.6.0-SNAPSHOT

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 865bd206900..4197a9c20aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     https://opentripplanner.org
     org.opentripplanner
     otp
-    2.5.0
+    2.6.0-SNAPSHOT
     jar
 
     

From 8c78db1c2f6798d0334443ed99c211c9585b5d6f Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 13:46:04 +0100
Subject: [PATCH 0795/1688] Update release checklist [ci skip]

---
 docs/ReleaseChecklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ReleaseChecklist.md b/docs/ReleaseChecklist.md
index c74f0662964..0f7c0667762 100644
--- a/docs/ReleaseChecklist.md
+++ b/docs/ReleaseChecklist.md
@@ -83,7 +83,7 @@ manually is more tedious, but keeps eyes on each step and is less prone to failu
     * `git add pom.xml docs/Changelog.md`
     * `git commit -m "Prepare next development iteration x.y+1.0-SNAPSHOT"`
     * `git push`
-* Email the OTP dev and users mailing lists
+* Send a message in Gitter and email the OTP users mailing lists
     * Mention the new version number.
     * Provide links to the new developer documentation.
     * Provide links to the artifacts directory on Maven Central.

From 17a36915ef205e804b129cbde5ef5c55dcad744d Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Wed, 13 Mar 2024 12:57:47 +0000
Subject: [PATCH 0796/1688] Add changelog entry for #5660 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 8ca70f59191..cfe8cde5133 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -5,6 +5,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 
 ## 2.6.0-SNAPSHOT (under development)
 
+- ISO-8601 date time for GTFS API itinerary responses [#5660](https://github.com/opentripplanner/OpenTripPlanner/pull/5660)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 60aeb8cddcbce0f73cd517d2b3c2d6158965cc55 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 13 Mar 2024 14:13:01 +0100
Subject: [PATCH 0797/1688] Remove extra quote [ci skip]

---
 .../resources/org/opentripplanner/apis/gtfs/schema.graphqls     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 655a1908a87..c1189f21ba1 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -1622,7 +1622,7 @@ type Money {
     amount: Float!
 }
 
-""""
+"""
 An ISO-8601-formatted duration, i.e. `PT2H30M` for 2 hours and 30 minutes.
 
 Negative durations are formatted like `-PT10M`.

From 30afb705a2e2633f4de9c645fd185f23841befeb Mon Sep 17 00:00:00 2001
From: Henrik Abrahamsson 
Date: Wed, 13 Mar 2024 15:53:02 +0100
Subject: [PATCH 0798/1688] Fix skanetrafiken performance test

---
 .github/workflows/performance-test.yml           | 9 ++++-----
 test/performance/skanetrafiken/build-config.json | 8 ++++----
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml
index 3c2ffdba465..1b8201a01ae 100644
--- a/.github/workflows/performance-test.yml
+++ b/.github/workflows/performance-test.yml
@@ -32,11 +32,10 @@ jobs:
             jfr-delay: "35s"
             profile: core
 
-          # disabled due to https://github.com/opentripplanner/OpenTripPlanner/issues/5702
-          #- location: skanetrafiken
-          #  iterations: 1
-          #  jfr-delay: "50s"
-          #  profile: core
+          - location: skanetrafiken
+            iterations: 1
+            jfr-delay: "50s"
+            profile: core
 
           # extended locations that are run only after merging to dev-2.x
 
diff --git a/test/performance/skanetrafiken/build-config.json b/test/performance/skanetrafiken/build-config.json
index 925d9ac3046..f1da63fbe15 100644
--- a/test/performance/skanetrafiken/build-config.json
+++ b/test/performance/skanetrafiken/build-config.json
@@ -25,21 +25,21 @@
   "transitFeeds": [
     {
       "type": "netex",
-      "source": "https://ressapublic.blob.core.windows.net/ressapub/ST_netex.zip",
+      "source": "https://jpsapubdev.blob.core.windows.net/resesok-pub/ST_netex.zip",
       "feedId": "ST"
     },
     {
       "type": "gtfs",
-      "source": "https://ressapublic.blob.core.windows.net/ressapub/GTFS-filtered.zip",
+      "source": "https://jpsapubdev.blob.core.windows.net/resesok-pub/GTFS-filtered.zip",
       "feedId": "DK"
     }
   ],
   "osm": [
     {
-      "source": "https://ressapublic.blob.core.windows.net/ressapub/denmark-oresund.osm.pbf"
+      "source": "https://jpsapubdev.blob.core.windows.net/resesok-pub/denmark-oresund.osm.pbf"
     },
     {
-      "source": "https://ressapublic.blob.core.windows.net/ressapub/sweden-filtered.osm.pbf"
+      "source": "https://jpsapubdev.blob.core.windows.net/resesok-pub/sweden-filtered.osm.pbf"
     }
   ]
 }

From 378ccebfa62e0587f185fd943ad6be9f272d0156 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 22:30:21 +0000
Subject: [PATCH 0799/1688] chore(deps): update dependency
 org.apache.maven.plugins:maven-gpg-plugin to v3.2.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4197a9c20aa..66ee281d482 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1007,7 +1007,7 @@
                     
                         org.apache.maven.plugins
                         maven-gpg-plugin
-                        3.1.0
+                        3.2.0
                         
                             
                                 sign-artifacts

From 816fba9aef50c2f1fe8bdb06c9264cbf2f25c8aa Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Thu, 14 Mar 2024 08:25:11 +0200
Subject: [PATCH 0800/1688] refactoring

---
 ...DigitransitRealtimeStopPropertyMapper.java | 12 ++--------
 .../stops/DigitransitStopPropertyMapper.java  | 22 ++++++-------------
 .../routing/alertpatch/TransitAlert.java      |  2 +-
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index 5c4f774bb20..0cce00bb385 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -1,8 +1,6 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
 import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getKeyValues;
-import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getRoutes;
-import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getType;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -32,15 +30,9 @@ protected Collection map(RegularStop stop) {
       .getTransitAlertService()
       .getStopAlerts(stop.getId())
       .stream()
-      .anyMatch(alert -> alert.noServiceOn(currentTime));
+      .anyMatch(alert -> alert.noServiceAt(currentTime));
 
-    Collection sharedKeyValues = getKeyValues(
-      stop,
-      i18NStringMapper.mapNonnullToApi(stop.getName()),
-      i18NStringMapper.mapToApi(stop.getDescription()),
-      getType(transitService, stop),
-      getRoutes(transitService, stop)
-    );
+    Collection sharedKeyValues = getKeyValues(stop, i18NStringMapper, transitService);
     Collection keyValues = ListUtils.combine(
       sharedKeyValues,
       List.of(new KeyValue("closedByServiceAlert", noServiceAlert))
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
index 998e125ce9d..94569de1ce5 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
@@ -34,34 +34,26 @@ protected static DigitransitStopPropertyMapper create(
 
   @Override
   protected Collection map(RegularStop stop) {
-    return getKeyValues(
-      stop,
-      i18NStringMapper.mapNonnullToApi(stop.getName()),
-      i18NStringMapper.mapToApi(stop.getDescription()),
-      getType(transitService, stop),
-      getRoutes(transitService, stop)
-    );
+    return getKeyValues(stop, i18NStringMapper, transitService);
   }
 
   protected static Collection getKeyValues(
     RegularStop stop,
-    String name,
-    String description,
-    String type,
-    String routes
+    I18NStringMapper i18NStringMapper,
+    TransitService transitService
   ) {
     return List.of(
       new KeyValue("gtfsId", stop.getId().toString()),
-      new KeyValue("name", name),
+      new KeyValue("name", i18NStringMapper.mapNonnullToApi(stop.getName())),
       new KeyValue("code", stop.getCode()),
       new KeyValue("platform", stop.getPlatformCode()),
-      new KeyValue("desc", description),
+      new KeyValue("desc", i18NStringMapper.mapToApi(stop.getDescription())),
       new KeyValue(
         "parentStation",
         stop.getParentStation() != null ? stop.getParentStation().getId() : null
       ),
-      new KeyValue("type", type),
-      new KeyValue("routes", routes)
+      new KeyValue("type", getType(transitService, stop)),
+      new KeyValue("routes", getRoutes(transitService, stop))
     );
   }
 
diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
index ac278a44a5c..17a307ed205 100644
--- a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
+++ b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java
@@ -196,7 +196,7 @@ public Instant getEffectiveEndDate() {
    * @param instant
    * @return
    */
-  public boolean noServiceOn(Instant instant) {
+  public boolean noServiceAt(Instant instant) {
     return (
       effect.equals(AlertEffect.NO_SERVICE) &&
       (getEffectiveStartDate() != null && getEffectiveStartDate().isBefore(instant)) &&

From f518363685913c97d65dba4272cd60e9b90447c6 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 14 Mar 2024 11:48:37 +0200
Subject: [PATCH 0801/1688] Add tests for canceling/deleting added trips

---
 .../trip/TimetableSnapshotSourceTest.java     | 173 +++++++++++++++++-
 1 file changed, 166 insertions(+), 7 deletions(-)

diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
index 10952d0bde9..4936b522d87 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
@@ -992,17 +992,18 @@ public void addedTrip() {
       );
 
       // THEN
-      assertAddedTrip(SERVICE_DATE, this.addedTripId, updater);
+      assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, false);
     }
 
     private TripPattern assertAddedTrip(
       LocalDate serviceDate,
       String tripId,
-      TimetableSnapshotSource updater
+      TimetableSnapshotSource updater,
+      boolean forceSnapshotCommit
     ) {
       var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A"));
       // Get trip pattern of last (most recently added) outgoing edge
-      var snapshot = updater.getTimetableSnapshot();
+      var snapshot = updater.getTimetableSnapshot(forceSnapshotCommit);
       var patternsAtA = snapshot.getPatternsForStop(stopA);
 
       assertNotNull(patternsAtA, "Added trip pattern should be found");
@@ -1064,7 +1065,7 @@ public void addedTripWithNewRoute() {
 
       assertTrue(result.warnings().isEmpty());
 
-      var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater);
+      var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false);
 
       var route = pattern.getRoute();
       assertEquals(TripUpdateBuilder.ROUTE_URL, route.getUrl());
@@ -1117,7 +1118,7 @@ public void addedWithUnknownStop() {
 
       assertEquals(List.of(WarningType.UNKNOWN_STOPS_REMOVED_FROM_ADDED_TRIP), result.warnings());
 
-      var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater);
+      var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false);
 
       assertEquals(2, pattern.getStops().size());
     }
@@ -1152,7 +1153,7 @@ public void repeatedlyAddedTripWithNewRoute() {
         List.of(tripUpdate),
         feedId
       );
-      var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater);
+      var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false);
       var firstRoute = pattern.getRoute();
 
       // apply the update a second time to check that no new route instance is created but the old one is reused
@@ -1163,7 +1164,7 @@ public void repeatedlyAddedTripWithNewRoute() {
         List.of(tripUpdate),
         feedId
       );
-      var secondPattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater);
+      var secondPattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false);
       var secondRoute = secondPattern.getRoute();
 
       // THEN
@@ -1171,6 +1172,164 @@ public void repeatedlyAddedTripWithNewRoute() {
       assertSame(firstRoute, secondRoute);
       assertNotNull(transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId()));
     }
+
+    @Test
+    public void cancelingAddedTrip() {
+      // TODO we might want to change the behaviour so that only the trip without pattern is
+      // persisted if the added trip is cancelled
+      var builder = new TripUpdateBuilder(
+        addedTripId,
+        SERVICE_DATE,
+        ADDED,
+        transitModel.getTimeZone()
+      );
+
+      builder.addStopTime("A", 30).addStopTime("C", 40).addStopTime("E", 55);
+
+      var tripUpdate = builder.build();
+
+      var updater = defaultUpdater();
+
+      // WHEN
+      updater.applyTripUpdates(
+        TRIP_MATCHER_NOOP,
+        REQUIRED_NO_DATA,
+        fullDataset,
+        List.of(tripUpdate),
+        feedId
+      );
+
+      // THEN
+      assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, true);
+
+      builder = new TripUpdateBuilder(
+        addedTripId,
+        SERVICE_DATE,
+        ADDED,
+        transitModel.getTimeZone()
+      );
+
+      var tripDescriptorBuilder = TripDescriptor.newBuilder();
+      tripDescriptorBuilder.setTripId(addedTripId);
+      tripDescriptorBuilder.setScheduleRelationship(ScheduleRelationship.CANCELED);
+
+      tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE));
+      tripUpdate = TripUpdate.newBuilder().setTrip(tripDescriptorBuilder).build();
+
+      // WHEN
+      updater.applyTripUpdates(
+        TRIP_MATCHER_NOOP,
+        REQUIRED_NO_DATA,
+        fullDataset,
+        List.of(tripUpdate),
+        feedId
+      );
+
+      // THEN
+      // Get trip pattern of last (most recently added) outgoing edge
+      var snapshot = updater.getTimetableSnapshot(true);
+      var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A"));
+      var patternsAtA = snapshot.getPatternsForStop(stopA);
+
+      assertNotNull(patternsAtA, "Added trip pattern should be found");
+      var tripPattern = patternsAtA.stream().findFirst().get();
+
+      final Timetable forToday = snapshot.resolve(tripPattern, SERVICE_DATE);
+      final Timetable schedule = snapshot.resolve(tripPattern, null);
+
+      assertNotSame(forToday, schedule);
+
+      final int forTodayAddedTripIndex = forToday.getTripIndex(addedTripId);
+      assertTrue(
+        forTodayAddedTripIndex > -1,
+        "Added trip should not be found in time table for service date"
+      );
+      assertEquals(
+        RealTimeState.CANCELED,
+        forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState()
+      );
+
+      final int scheduleTripIndex = schedule.getTripIndex(addedTripId);
+      assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table");
+    }
+
+    @Test
+    public void deletingAddedTrip() {
+      var builder = new TripUpdateBuilder(
+        addedTripId,
+        SERVICE_DATE,
+        ADDED,
+        transitModel.getTimeZone()
+      );
+
+      builder.addStopTime("A", 30).addStopTime("C", 40).addStopTime("E", 55);
+
+      var tripUpdate = builder.build();
+
+      var updater = defaultUpdater();
+
+      // WHEN
+      updater.applyTripUpdates(
+        TRIP_MATCHER_NOOP,
+        REQUIRED_NO_DATA,
+        fullDataset,
+        List.of(tripUpdate),
+        feedId
+      );
+
+      // THEN
+      assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, true);
+
+      builder = new TripUpdateBuilder(
+        addedTripId,
+        SERVICE_DATE,
+        ADDED,
+        transitModel.getTimeZone()
+      );
+
+      var tripDescriptorBuilder = TripDescriptor.newBuilder();
+      tripDescriptorBuilder.setTripId(addedTripId);
+      tripDescriptorBuilder.setScheduleRelationship(ScheduleRelationship.DELETED);
+
+      tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE));
+      tripUpdate = TripUpdate.newBuilder().setTrip(tripDescriptorBuilder).build();
+
+      // WHEN
+      updater.applyTripUpdates(
+        TRIP_MATCHER_NOOP,
+        REQUIRED_NO_DATA,
+        fullDataset,
+        List.of(tripUpdate),
+        feedId
+      );
+
+      // THEN
+      // Get trip pattern of last (most recently added) outgoing edge
+      var snapshot = updater.getTimetableSnapshot(true);
+      var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A"));
+      var patternsAtA = snapshot.getPatternsForStop(stopA);
+
+      assertNotNull(patternsAtA, "Added trip pattern should be found");
+      var tripPattern = patternsAtA.stream().findFirst().get();
+
+      final Timetable forToday = snapshot.resolve(tripPattern, SERVICE_DATE);
+      final Timetable schedule = snapshot.resolve(tripPattern, null);
+
+      assertNotSame(forToday, schedule);
+
+      final int forTodayAddedTripIndex = forToday.getTripIndex(addedTripId);
+      assertTrue(
+        forTodayAddedTripIndex > -1,
+        "Added trip should not be found in time table for service date"
+      );
+      assertEquals(
+        RealTimeState.DELETED,
+        forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState()
+      );
+
+      final int scheduleTripIndex = schedule.getTripIndex(addedTripId);
+      assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table");
+    }
   }
 
   @Nonnull

From dfe08afe9b1ad51e0f238b5e73caedea1360f1e5 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 14 Mar 2024 11:51:46 +0200
Subject: [PATCH 0802/1688] Fix formatting

---
 .../updater/trip/TimetableSnapshotSourceTest.java  | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
index 4936b522d87..bf6759e8969 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
@@ -1202,12 +1202,7 @@ public void cancelingAddedTrip() {
       // THEN
       assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, true);
 
-      builder = new TripUpdateBuilder(
-        addedTripId,
-        SERVICE_DATE,
-        ADDED,
-        transitModel.getTimeZone()
-      );
+      builder = new TripUpdateBuilder(addedTripId, SERVICE_DATE, ADDED, transitModel.getTimeZone());
 
       var tripDescriptorBuilder = TripDescriptor.newBuilder();
       tripDescriptorBuilder.setTripId(addedTripId);
@@ -1280,12 +1275,7 @@ public void deletingAddedTrip() {
       // THEN
       assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, true);
 
-      builder = new TripUpdateBuilder(
-        addedTripId,
-        SERVICE_DATE,
-        ADDED,
-        transitModel.getTimeZone()
-      );
+      builder = new TripUpdateBuilder(addedTripId, SERVICE_DATE, ADDED, transitModel.getTimeZone());
 
       var tripDescriptorBuilder = TripDescriptor.newBuilder();
       tripDescriptorBuilder.setTripId(addedTripId);

From 7cdbe3d35978ea05b545e031c86642f8854ed247 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 14 Mar 2024 14:02:07 +0200
Subject: [PATCH 0803/1688] Use parametrized test

---
 .../trip/TimetableSnapshotSourceTest.java     | 96 ++++---------------
 1 file changed, 17 insertions(+), 79 deletions(-)

diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
index bf6759e8969..ec46cd5b93b 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
@@ -1,6 +1,8 @@
 package org.opentripplanner.updater.trip;
 
 import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.ADDED;
+import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.CANCELED;
+import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.DELETED;
 import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED;
 import static com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.SKIPPED;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -33,6 +35,7 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.ConstantsForTests;
 import org.opentripplanner.TestOtpModel;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
@@ -1173,83 +1176,21 @@ public void repeatedlyAddedTripWithNewRoute() {
       assertNotNull(transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId()));
     }
 
-    @Test
-    public void cancelingAddedTrip() {
-      // TODO we might want to change the behaviour so that only the trip without pattern is
-      // persisted if the added trip is cancelled
-      var builder = new TripUpdateBuilder(
-        addedTripId,
-        SERVICE_DATE,
-        ADDED,
-        transitModel.getTimeZone()
-      );
-
-      builder.addStopTime("A", 30).addStopTime("C", 40).addStopTime("E", 55);
-
-      var tripUpdate = builder.build();
-
-      var updater = defaultUpdater();
-
-      // WHEN
-      updater.applyTripUpdates(
-        TRIP_MATCHER_NOOP,
-        REQUIRED_NO_DATA,
-        fullDataset,
-        List.of(tripUpdate),
-        feedId
-      );
-
-      // THEN
-      assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, true);
-
-      builder = new TripUpdateBuilder(addedTripId, SERVICE_DATE, ADDED, transitModel.getTimeZone());
-
-      var tripDescriptorBuilder = TripDescriptor.newBuilder();
-      tripDescriptorBuilder.setTripId(addedTripId);
-      tripDescriptorBuilder.setScheduleRelationship(ScheduleRelationship.CANCELED);
-
-      tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE));
-      tripUpdate = TripUpdate.newBuilder().setTrip(tripDescriptorBuilder).build();
-
-      // WHEN
-      updater.applyTripUpdates(
-        TRIP_MATCHER_NOOP,
-        REQUIRED_NO_DATA,
-        fullDataset,
-        List.of(tripUpdate),
-        feedId
-      );
-
-      // THEN
-      // Get trip pattern of last (most recently added) outgoing edge
-      var snapshot = updater.getTimetableSnapshot(true);
-      var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A"));
-      var patternsAtA = snapshot.getPatternsForStop(stopA);
-
-      assertNotNull(patternsAtA, "Added trip pattern should be found");
-      var tripPattern = patternsAtA.stream().findFirst().get();
-
-      final Timetable forToday = snapshot.resolve(tripPattern, SERVICE_DATE);
-      final Timetable schedule = snapshot.resolve(tripPattern, null);
-
-      assertNotSame(forToday, schedule);
-
-      final int forTodayAddedTripIndex = forToday.getTripIndex(addedTripId);
-      assertTrue(
-        forTodayAddedTripIndex > -1,
-        "Added trip should not be found in time table for service date"
-      );
-      assertEquals(
-        RealTimeState.CANCELED,
-        forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState()
+    static List addedRemovalTestCase() {
+      return List.of(
+        // TODO we might want to change the behaviour so that only the trip without pattern is
+        // persisted if the added trip is cancelled
+        Arguments.of(CANCELED, RealTimeState.CANCELED),
+        Arguments.of(DELETED, RealTimeState.DELETED)
       );
-
-      final int scheduleTripIndex = schedule.getTripIndex(addedTripId);
-      assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table");
     }
 
-    @Test
-    public void deletingAddedTrip() {
+    @ParameterizedTest
+    @MethodSource("addedRemovalTestCase")
+    public void cancelingAddedTrip(
+      ScheduleRelationship scheduleRelationship,
+      RealTimeState expectedState
+    ) {
       var builder = new TripUpdateBuilder(
         addedTripId,
         SERVICE_DATE,
@@ -1279,7 +1220,7 @@ public void deletingAddedTrip() {
 
       var tripDescriptorBuilder = TripDescriptor.newBuilder();
       tripDescriptorBuilder.setTripId(addedTripId);
-      tripDescriptorBuilder.setScheduleRelationship(ScheduleRelationship.DELETED);
+      tripDescriptorBuilder.setScheduleRelationship(scheduleRelationship);
 
       tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE));
       tripUpdate = TripUpdate.newBuilder().setTrip(tripDescriptorBuilder).build();
@@ -1312,10 +1253,7 @@ public void deletingAddedTrip() {
         forTodayAddedTripIndex > -1,
         "Added trip should not be found in time table for service date"
       );
-      assertEquals(
-        RealTimeState.DELETED,
-        forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState()
-      );
+      assertEquals(expectedState, forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState());
 
       final int scheduleTripIndex = schedule.getTripIndex(addedTripId);
       assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table");

From a92917bbcd9c795784ddfca2d305b670bf898ef3 Mon Sep 17 00:00:00 2001
From: Andrew Byrd 
Date: Thu, 14 Mar 2024 20:17:38 +0800
Subject: [PATCH 0804/1688] remove draft code

---
 .../model/TimetableSnapshot.java              | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index a176debbe13..cf254472a43 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -111,26 +111,6 @@ public class TimetableSnapshot {
    */
   private SetMultimap patternsForStop = HashMultimap.create();
 
-  /**
-   * This is an AS YET UNUSED alternative to the current boolean fields readOnly and dirty, as well
-   * as setting dirtyTimetables to null. A given instance of TimetableSnapshot should progress
-   * through all these states in order, and cannot return to a previous state.
-   */
-  private enum TimetableSnapshotState {
-    WRITABLE_CLEAN,
-    WRITBLE_DIRTY,
-    INDEXING,
-    READ_ONLY,
-  }
-
-  /**
-   * Which stage of existence this TimetableSnapshot is in, which determines whether it's read-only.
-   * Writing to TimetableSnapshots is not concurrent and does not happen in hot methods. On the
-   * other hand, reading is expected to be highly concurrent and happens during core routing
-   * processes. Therefore, any assertions about state should be concentrated in the writing methods.
-   */
-  // private TimetableSnapshotState state;
-
   /**
    * Boolean value indicating that timetable snapshot is read only if true. Once it is true, it
    * shouldn't be possible to change it to false anymore.

From d675274e992f4139d130959f8bcb7b26d8c74b50 Mon Sep 17 00:00:00 2001
From: Andrew Byrd 
Date: Sat, 16 Dec 2023 03:05:43 +0800
Subject: [PATCH 0805/1688] make logging of different updaters more uniform

---
 .../updater/alert/GtfsRealtimeAlertsUpdater.java   |  2 +-
 .../updater/trip/MqttGtfsRealtimeUpdater.java      | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
index da10324dd86..cea08e7a3df 100644
--- a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
@@ -52,7 +52,7 @@ public GtfsRealtimeAlertsUpdater(
     this.updateHandler.setFuzzyTripMatcher(fuzzyTripMatcher);
     this.otpHttpClient = new OtpHttpClient();
     LOG.info(
-      "Creating real-time alert updater running every {} seconds : {}",
+      "Creating real-time alert updater running every {}: {}",
       pollingPeriod(),
       url
     );
diff --git a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
index 0e231186077..b13b7a9b4f2 100644
--- a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
@@ -78,6 +78,9 @@ public MqttGtfsRealtimeUpdater(
         new GtfsRealtimeFuzzyTripMatcher(new DefaultTransitService(transitModel));
     }
     this.recordMetrics = TripUpdateMetrics.streaming(parameters);
+    LOG.info(
+      "Creating streaming GTFS-RT TripUpdate updater subscribing to MQTT broker at {}", url
+    );
   }
 
   @Override
@@ -187,4 +190,15 @@ public void messageArrived(String topic, MqttMessage message) {
     @Override
     public void deliveryComplete(IMqttDeliveryToken token) {}
   }
+
+  @Override
+  public String toString() {
+    return "MqttGtfsRealtimeUpdater{" +
+      "url='" + url + '\'' +
+      ", topic='" + topic + '\'' +
+      ", feedId='" + feedId + '\'' +
+      '}';
+  }
+
 }
+

From 652e83b268d1965d3e35cb34e93e70a95e45d450 Mon Sep 17 00:00:00 2001
From: Andrew Byrd 
Date: Wed, 24 Jan 2024 20:24:46 +0800
Subject: [PATCH 0806/1688] format code with mvn prettier:write

Unfortunately the resulting toString method following formatting rules
is harder to read.
---
 .../alert/GtfsRealtimeAlertsUpdater.java      |  6 +----
 .../updater/trip/MqttGtfsRealtimeUpdater.java | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
index cea08e7a3df..21f6c81bc67 100644
--- a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java
@@ -51,11 +51,7 @@ public GtfsRealtimeAlertsUpdater(
     this.updateHandler.setTransitAlertService(transitAlertService);
     this.updateHandler.setFuzzyTripMatcher(fuzzyTripMatcher);
     this.otpHttpClient = new OtpHttpClient();
-    LOG.info(
-      "Creating real-time alert updater running every {}: {}",
-      pollingPeriod(),
-      url
-    );
+    LOG.info("Creating real-time alert updater running every {}: {}", pollingPeriod(), url);
   }
 
   @Override
diff --git a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
index b13b7a9b4f2..c1e88bbee2c 100644
--- a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
@@ -78,9 +78,7 @@ public MqttGtfsRealtimeUpdater(
         new GtfsRealtimeFuzzyTripMatcher(new DefaultTransitService(transitModel));
     }
     this.recordMetrics = TripUpdateMetrics.streaming(parameters);
-    LOG.info(
-      "Creating streaming GTFS-RT TripUpdate updater subscribing to MQTT broker at {}", url
-    );
+    LOG.info("Creating streaming GTFS-RT TripUpdate updater subscribing to MQTT broker at {}", url);
   }
 
   @Override
@@ -193,12 +191,18 @@ public void deliveryComplete(IMqttDeliveryToken token) {}
 
   @Override
   public String toString() {
-    return "MqttGtfsRealtimeUpdater{" +
-      "url='" + url + '\'' +
-      ", topic='" + topic + '\'' +
-      ", feedId='" + feedId + '\'' +
-      '}';
+    return (
+      "MqttGtfsRealtimeUpdater{" +
+      "url='" +
+      url +
+      '\'' +
+      ", topic='" +
+      topic +
+      '\'' +
+      ", feedId='" +
+      feedId +
+      '\'' +
+      '}'
+    );
   }
-
 }
-

From 5165c6b83da107bcbffdf570c78ce22aa0378055 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 14 Mar 2024 15:22:18 +0200
Subject: [PATCH 0807/1688] Remove duplicate OffsetDateTime codegen

---
 .../apis/gtfs/generated/GraphQLDataFetchers.java               | 3 ++-
 .../opentripplanner/apis/gtfs/generated/graphql-codegen.yml    | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
index 39e1919dfeb..6ac26fe51b1 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
@@ -817,7 +817,8 @@ public interface GraphQLQueryType {
     public DataFetcher viewer();
   }
 
-  public interface GraphQLRealtimeEstimate {
+  /** Real-time estimates for a vehicle at a certain place. */
+  public interface GraphQLRealTimeEstimate {
     public DataFetcher delay();
 
     public DataFetcher time();
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
index 555331c114b..6fff500d137 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
@@ -26,7 +26,6 @@ config:
     Polyline: String
     GeoJson: org.locationtech.jts.geom.Geometry
     Grams: org.opentripplanner.framework.model.Grams
-    OffsetDateTime: java.time.OffsetDateTime
     Duration: java.time.Duration
     Cost: org.opentripplanner.framework.model.Cost
     CoordinateValue: Double

From c80651c389840c5c72b991f1cc0abc6d9449f64d Mon Sep 17 00:00:00 2001
From: Andrew Byrd 
Date: Thu, 14 Mar 2024 21:34:48 +0800
Subject: [PATCH 0808/1688] use ToStringBuilder and reformat

---
 .../updater/trip/MqttGtfsRealtimeUpdater.java | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
index c1e88bbee2c..24474b6cdb3 100644
--- a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java
@@ -13,6 +13,7 @@
 import org.eclipse.paho.client.mqttv3.MqttException;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
+import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher;
@@ -191,18 +192,11 @@ public void deliveryComplete(IMqttDeliveryToken token) {}
 
   @Override
   public String toString() {
-    return (
-      "MqttGtfsRealtimeUpdater{" +
-      "url='" +
-      url +
-      '\'' +
-      ", topic='" +
-      topic +
-      '\'' +
-      ", feedId='" +
-      feedId +
-      '\'' +
-      '}'
-    );
+    return ToStringBuilder
+      .of(MqttGtfsRealtimeUpdater.class)
+      .addStr("url", url)
+      .addStr("topic", topic)
+      .addStr("feedId", feedId)
+      .toString();
   }
 }

From bd8e498094943df0f7936508f9b0a39248be2565 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 14 Mar 2024 21:58:14 +0200
Subject: [PATCH 0809/1688] Remove some defaults that should be injected later
 on from code/conf

---
 .../org/opentripplanner/apis/gtfs/schema.graphqls         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 9ef893574ad..1011c98c91b 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -4247,7 +4247,7 @@ type QueryType {
         search for next or previous pages with `after` or `before` cursors, this field is ignored and
         `first` or `last` should be used instead.
         """
-        numberOfItineraries: Int = 50
+        numberOfItineraries: Int
 
         """
         The origin where the search starts. Usually coordinates but can also be a stop location.
@@ -5145,7 +5145,7 @@ input TimetablePreferencesInput {
     realistic as the transfers could be invalid due to delays,
     trips can be cancelled or stops can be skipped.
     """
-    excludeRealTimeUpdates: Boolean = false
+    excludeRealTimeUpdates: Boolean
 
     """
     When true, departures that have been cancelled ahead of time will be
@@ -5154,7 +5154,7 @@ input TimetablePreferencesInput {
     could be filtered out as the alternative containing a cancellation would normally
     be better.
     """
-    includePlannedCancellations: Boolean = false
+    includePlannedCancellations: Boolean
 
     """
     When true, departures that have been cancelled through a real-time feed will be
@@ -5163,7 +5163,7 @@ input TimetablePreferencesInput {
     could be filtered out as the alternative containing a cancellation would normally
     be better. This option can't be set to true while `includeRealTimeUpdates` is false.
     """
-    includeRealTimeCancellations: Boolean = false
+    includeRealTimeCancellations: Boolean
 }
 
 """

From f969bd9071331a481906480e22167405865d505d Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 14 Mar 2024 23:36:06 +0200
Subject: [PATCH 0810/1688] Refactor scalars and make min reluctance 0.1

---
 .../apis/gtfs/GraphQLScalars.java             | 95 ++++++++-----------
 .../apis/gtfs/ReluctanceScalarTest.java       |  7 +-
 2 files changed, 42 insertions(+), 60 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
index a45acc372d3..29d3e2c5575 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java
@@ -121,6 +121,8 @@ public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralExce
     .name("CoordinateValue")
     .coercing(
       new Coercing() {
+        private static final String VALIDATION_ERROR_MESSAGE = "Not a valid WGS84 coordinate value";
+
         @Override
         public Double serialize(@Nonnull Object dataFetcherResult)
           throws CoercingSerializeException {
@@ -141,9 +143,7 @@ public Double serialize(@Nonnull Object dataFetcherResult)
         public Double parseValue(Object input) throws CoercingParseValueException {
           if (input instanceof Double doubleValue) {
             return validateCoordinate(doubleValue)
-              .orElseThrow(() ->
-                new CoercingParseValueException("Not a valid WGS84 coordinate value")
-              );
+              .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseValueException(
             "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input)
@@ -152,16 +152,13 @@ public Double parseValue(Object input) throws CoercingParseValueException {
 
         @Override
         public Double parseLiteral(Object input) throws CoercingParseLiteralException {
-          var validationException = new CoercingParseLiteralException(
-            "Not a valid WGS84 coordinate value"
-          );
           if (input instanceof FloatValue coordinate) {
             return validateCoordinate(coordinate.getValue().doubleValue())
-              .orElseThrow(() -> validationException);
+              .orElseThrow(() -> new CoercingParseLiteralException(VALIDATION_ERROR_MESSAGE));
           }
           if (input instanceof IntValue coordinate) {
             return validateCoordinate(coordinate.getValue().doubleValue())
-              .orElseThrow(() -> validationException);
+              .orElseThrow(() -> new CoercingParseLiteralException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseLiteralException(
             "Expected a number, got: " + input.getClass().getSimpleName()
@@ -184,6 +181,8 @@ private static Optional validateCoordinate(double coordinate) {
     .coercing(
       new Coercing() {
         private static final int MAX_COST = 1000000;
+        private static final String VALIDATION_ERROR_MESSAGE =
+          "Cost cannot be negative or greater than %d".formatted(MAX_COST);
 
         @Override
         public Integer serialize(@Nonnull Object dataFetcherResult)
@@ -204,15 +203,8 @@ public Integer serialize(@Nonnull Object dataFetcherResult)
         @Override
         public Cost parseValue(Object input) throws CoercingParseValueException {
           if (input instanceof Integer intValue) {
-            if (intValue < 0) {
-              throw new CoercingParseValueException("Cost cannot be negative");
-            }
-            if (intValue > MAX_COST) {
-              throw new CoercingParseValueException(
-                "Cost cannot be greater than %d".formatted(MAX_COST)
-              );
-            }
-            return Cost.costOfSeconds(intValue);
+            return validateCost(intValue)
+              .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseValueException(
             "Expected an integer, got %s %s".formatted(input.getClass().getSimpleName(), input)
@@ -223,20 +215,20 @@ public Cost parseValue(Object input) throws CoercingParseValueException {
         public Cost parseLiteral(Object input) throws CoercingParseLiteralException {
           if (input instanceof IntValue intValue) {
             var value = intValue.getValue().intValue();
-            if (value < 0) {
-              throw new CoercingParseLiteralException("Cost cannot be negative");
-            }
-            if (value > MAX_COST) {
-              throw new CoercingParseLiteralException(
-                "Cost cannot be greater than %d".formatted(MAX_COST)
-              );
-            }
-            return Cost.costOfSeconds(value);
+            return validateCost(value)
+              .orElseThrow(() -> new CoercingParseLiteralException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseLiteralException(
             "Expected an integer, got: " + input.getClass().getSimpleName()
           );
         }
+
+        private static Optional validateCost(int cost) {
+          if (cost >= 0 && cost <= MAX_COST) {
+            return Optional.of(Cost.costOfSeconds(cost));
+          }
+          return Optional.empty();
+        }
       }
     )
     .build();
@@ -349,12 +341,13 @@ public Grams parseLiteral(Object input) throws CoercingParseLiteralException {
     .name("Ratio")
     .coercing(
       new Coercing() {
+        private static final String VALIDATION_ERROR_MESSAGE =
+          "Value is under 0 or greater than 1.";
+
         @Override
         public Double serialize(@Nonnull Object dataFetcherResult)
           throws CoercingSerializeException {
-          var validationException = new CoercingSerializeException(
-            "Value is less than 0 or greater than 1."
-          );
+          var validationException = new CoercingSerializeException(VALIDATION_ERROR_MESSAGE);
           if (dataFetcherResult instanceof Double doubleValue) {
             return validateRatio(doubleValue).orElseThrow(() -> validationException);
           } else if (dataFetcherResult instanceof Float floatValue) {
@@ -372,9 +365,7 @@ public Double serialize(@Nonnull Object dataFetcherResult)
         public Double parseValue(Object input) throws CoercingParseValueException {
           if (input instanceof Double doubleValue) {
             return validateRatio(doubleValue)
-              .orElseThrow(() ->
-                new CoercingParseValueException("Value is less than 0 or greater than 1.")
-              );
+              .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseValueException(
             "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input)
@@ -383,16 +374,13 @@ public Double parseValue(Object input) throws CoercingParseValueException {
 
         @Override
         public Double parseLiteral(Object input) throws CoercingParseLiteralException {
-          var validationException = new CoercingParseLiteralException(
-            "Value is under 0 or greater than 1."
-          );
           if (input instanceof FloatValue ratio) {
             return validateRatio(ratio.getValue().doubleValue())
-              .orElseThrow(() -> validationException);
+              .orElseThrow(() -> new CoercingParseLiteralException(VALIDATION_ERROR_MESSAGE));
           }
           if (input instanceof IntValue ratio) {
             return validateRatio(ratio.getValue().doubleValue())
-              .orElseThrow(() -> validationException);
+              .orElseThrow(() -> new CoercingParseLiteralException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseLiteralException(
             "Expected a number, got: " + input.getClass().getSimpleName()
@@ -414,7 +402,10 @@ private static Optional validateRatio(double ratio) {
     .name("Reluctance")
     .coercing(
       new Coercing() {
+        private static final double MIN_Reluctance = 0.1;
         private static final double MAX_Reluctance = 100000;
+        private static final String VALIDATION_ERROR_MESSAGE =
+          "Reluctance needs to be between %s and %s".formatted(MIN_Reluctance, MAX_Reluctance);
 
         @Override
         public Double serialize(@Nonnull Object dataFetcherResult)
@@ -435,15 +426,8 @@ public Double serialize(@Nonnull Object dataFetcherResult)
         @Override
         public Double parseValue(Object input) throws CoercingParseValueException {
           if (input instanceof Double doubleValue) {
-            if (Double.doubleToRawLongBits(doubleValue) < 0) {
-              throw new CoercingParseValueException("Reluctance cannot be negative");
-            }
-            if (doubleValue > MAX_Reluctance + 0.001) {
-              throw new CoercingParseValueException(
-                "Reluctance cannot be greater than %s".formatted(MAX_Reluctance)
-              );
-            }
-            return doubleValue;
+            return validateReluctance(doubleValue)
+              .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseValueException(
             "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input)
@@ -453,26 +437,23 @@ public Double parseValue(Object input) throws CoercingParseValueException {
         @Override
         public Double parseLiteral(Object input) throws CoercingParseLiteralException {
           if (input instanceof FloatValue reluctance) {
-            return validateLiteral(reluctance.getValue().doubleValue());
+            return validateReluctance(reluctance.getValue().doubleValue())
+              .orElseThrow(() -> new CoercingParseLiteralException(VALIDATION_ERROR_MESSAGE));
           }
           if (input instanceof IntValue reluctance) {
-            return validateLiteral(reluctance.getValue().doubleValue());
+            return validateReluctance(reluctance.getValue().doubleValue())
+              .orElseThrow(() -> new CoercingParseLiteralException(VALIDATION_ERROR_MESSAGE));
           }
           throw new CoercingParseLiteralException(
             "Expected a number, got: " + input.getClass().getSimpleName()
           );
         }
 
-        private static double validateLiteral(double reluctance) {
-          if (Double.doubleToRawLongBits(reluctance) < 0) {
-            throw new CoercingParseLiteralException("Reluctance cannot be negative");
+        private static Optional validateReluctance(double reluctance) {
+          if (reluctance >= MIN_Reluctance - 0.001 && reluctance <= MAX_Reluctance + 0.001) {
+            return Optional.of(reluctance);
           }
-          if (reluctance > MAX_Reluctance + 0.001) {
-            throw new CoercingParseLiteralException(
-              "Reluctance cannot be greater than %s".formatted(MAX_Reluctance)
-            );
-          }
-          return reluctance;
+          return Optional.empty();
         }
       }
     )
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
index c5965cdeec6..6a1bb7124a9 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java
@@ -16,8 +16,9 @@
 class ReluctanceScalarTest {
 
   private static final Double HALF = 0.5;
+  private static final int ONE = 1;
   private static final double TOO_HIGH = 100001;
-  private static final double TOO_LOW = -0.1;
+  private static final double TOO_LOW = 0;
   private static final String TEXT = "foo";
   private static final double DELTA = 0.0001;
 
@@ -60,8 +61,8 @@ void testParseLiteral() {
     assertEquals(HALF, reluctanceDouble, DELTA);
     var reluctanceInt = (Double) GraphQLScalars.RELUCTANCE_SCALAR
       .getCoercing()
-      .parseLiteral(new IntValue(BigInteger.valueOf(HALF.intValue())));
-    assertEquals(HALF.intValue(), reluctanceInt, DELTA);
+      .parseLiteral(new IntValue(BigInteger.valueOf(ONE)));
+    assertEquals(ONE, reluctanceInt, DELTA);
     assertThrows(
       CoercingParseLiteralException.class,
       () -> GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseLiteral(new StringValue(TEXT))

From bde1bd126ea1209bb37a41cc86bd9e16466570f1 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 15 Mar 2024 12:16:28 +0200
Subject: [PATCH 0811/1688] Add integration test

---
 .../gtfs/expectations/planConnection.json     |  38 ++++
 .../apis/gtfs/queries/planConnection.graphql  | 163 ++++++++++++++++++
 2 files changed, 201 insertions(+)
 create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection.json
 create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql

diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection.json
new file mode 100644
index 00000000000..53ab016cc93
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/planConnection.json
@@ -0,0 +1,38 @@
+{
+  "data" : {
+    "planConnection" : {
+      "searchDateTime" : "2023-01-27T21:08:35+01:00",
+      "routingErrors" : [ ],
+      "pageInfo" : {
+        "hasNextPage" : false,
+        "hasPreviousPage" : false,
+        "startCursor" : null,
+        "endCursor" : null,
+        "searchWindowUsed" : null
+      },
+      "edges" : [
+        {
+          "cursor" : "NoCursor",
+          "node" : {
+            "start" : "2020-02-02T11:00:00Z",
+            "end" : "2020-02-02T12:00:00Z",
+            "legs" : [
+              {
+                "mode" : "WALK"
+              },
+              {
+                "mode" : "BUS"
+              },
+              {
+                "mode" : "RAIL"
+              },
+              {
+                "mode" : "CAR"
+              }
+            ]
+          }
+        }
+      ]
+    }
+  }
+}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql
new file mode 100644
index 00000000000..39691b349f8
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql
@@ -0,0 +1,163 @@
+{
+  planConnection(
+    dateTime: {
+      earliestDeparture: "2023-06-13T14:30+03:00"
+    }
+    searchWindow: "PT2H30M"
+    numberOfItineraries: 5
+    origin: {
+      location: {
+        coordinate: {
+          latitude: 45.5552
+          longitude: -122.6534
+        }
+      }
+      label: "Home"
+    }
+    destination: {
+      location: {
+        coordinate: {
+          latitude: 45.4908
+          longitude: -122.5519
+        }
+      }
+      label: "Work"
+    }
+    modes: {
+      directOnly: false
+      transitOnly: false
+      direct: [WALK]
+      transit: {
+        access: [BICYCLE_RENTAL]
+        transfer: [WALK]
+        egress: [BICYCLE_RENTAL]
+        transit: [
+          {
+            mode: TRAM
+            cost: {
+              reluctance: 1.3
+            }
+          },
+          {
+            mode: BUS
+          }
+        ]
+      }
+    }
+    preferences: {
+      accessibility: {
+        wheelchair: {
+          enabled: true
+        }
+      }
+      street: {
+        car: {
+          reluctance: 6.5
+          rental: {
+            allowedNetworks: ["foo", "bar"]
+            bannedNetworks: ["foobar"]
+          }
+          parking: {
+            unpreferredCost: 200
+            preferred: [{
+              select: [{
+                tags: ["best-park"]
+              }]
+            }]
+            filters: [{
+              not: [{
+                tags: ["worst-park"]
+              }]
+            }]
+          }
+        }
+        bicycle: {
+          reluctance: 3.0
+          speed: 7.4
+          optimization: {
+            type: SAFEST_STREETS
+          }
+          boardCost: 200
+          walk: {
+            speed: 1.3
+            cost: {
+              mountDismountCost: 100
+              reluctance: 3.5
+            }
+            mountDismountTime: "PT5S"
+          }
+          rental: {
+            destinationBicyclePolicy: {
+              allowKeeping: true
+              keepingCost: 300
+            }
+            allowedNetworks: ["foo", "bar"]
+            bannedNetworks: ["foobar"]
+          }
+          parking: {
+            unpreferredCost: 200
+            preferred: [{
+              select: [{
+                tags: ["best-park"]
+              }]
+            }]
+            filters: [{
+              not: [{
+                tags: ["worst-park"]
+              }]
+            }]
+          }
+        }
+        walk: {
+          speed: 2.4
+          reluctance: 1.5
+          walkSafetyFactor: 0.5
+          boardCost: 200
+        }
+      }
+      transit: {
+        board: {
+          waitReluctance: 3.2
+          slack: "PT1M30S"
+        }
+        alight: {
+          slack: "PT0S"
+        }
+        transfer: {
+          cost: 200
+          slack: "PT2M"
+          maximumAdditionalTransfers: 2
+          maximumTransfers: 5
+        }
+        timetable: {
+          excludeRealTimeUpdates: false
+          includePlannedCancellations: false
+          includeRealTimeCancellations: true
+        }
+      }
+    }
+    locale: "en"
+  ) {
+    searchDateTime
+    routingErrors {
+      code
+    }
+    pageInfo {
+      hasNextPage
+      hasPreviousPage
+      startCursor
+      endCursor
+      searchWindowUsed
+    }
+    edges {
+      cursor
+      node {
+        start
+        end
+        legs {
+          mode
+        }
+      }
+    }
+  }
+}
\ No newline at end of file

From 02323394c323547a49133036f01dec233bfe11a1 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 15 Mar 2024 17:09:49 +0200
Subject: [PATCH 0812/1688] Add some tests for RouteRequestMapper

---
 .../gtfs/mapping/RouteRequestMapperTest.java  | 360 ++++++++++++++++++
 1 file changed, 360 insertions(+)
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
new file mode 100644
index 00000000000..fb40c9e7d7f
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
@@ -0,0 +1,360 @@
+package org.opentripplanner.apis.gtfs.mapping;
+
+import static graphql.Assert.assertTrue;
+import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder;
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+import graphql.ExecutionInput;
+import graphql.execution.ExecutionId;
+import graphql.schema.DataFetchingEnvironment;
+import graphql.schema.DataFetchingEnvironmentImpl;
+import java.time.Duration;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.OffsetDateTime;
+import java.time.ZoneOffset;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.locationtech.jts.geom.Coordinate;
+import org.opentripplanner._support.time.ZoneIds;
+import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
+import org.opentripplanner.apis.gtfs.TestRoutingService;
+import org.opentripplanner.ext.fares.impl.DefaultFareService;
+import org.opentripplanner.model.plan.paging.cursor.PageCursor;
+import org.opentripplanner.routing.api.request.RouteRequest;
+import org.opentripplanner.routing.api.request.StreetMode;
+import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile;
+import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.graphfinder.GraphFinder;
+import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
+import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService;
+import org.opentripplanner.transit.model.basic.TransitMode;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TransitModel;
+
+class RouteRequestMapperTest {
+
+  private static final Coordinate ORIGIN = new Coordinate(1.0, 2.0);
+  private static final Coordinate DESTINATION = new Coordinate(2.0, 1.0);
+  private static final Locale LOCALE = Locale.GERMAN;
+  private static final GraphQLRequestContext context;
+  private static final Map args = new HashMap<>();
+
+  static {
+    args.put(
+      "origin",
+      Map.ofEntries(
+        entry("location", Map.of("coordinate", Map.of("latitude", ORIGIN.x, "longitude", ORIGIN.y)))
+      )
+    );
+    args.put(
+      "destination",
+      Map.ofEntries(
+        entry(
+          "location",
+          Map.of("coordinate", Map.of("latitude", DESTINATION.x, "longitude", DESTINATION.y))
+        )
+      )
+    );
+
+    Graph graph = new Graph();
+    var transitModel = new TransitModel();
+    transitModel.initTimeZone(ZoneIds.BERLIN);
+    final DefaultTransitService transitService = new DefaultTransitService(transitModel);
+    context =
+      new GraphQLRequestContext(
+        new TestRoutingService(List.of()),
+        transitService,
+        new DefaultFareService(),
+        graph.getVehicleParkingService(),
+        new DefaultVehicleRentalService(),
+        new DefaultRealtimeVehicleService(transitService),
+        GraphFinder.getInstance(graph, transitService::findRegularStops),
+        new RouteRequest()
+      );
+  }
+
+  @Test
+  void testMinimalArgs() {
+    var env = executionContext(args);
+    var defaultRequest = new RouteRequest();
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(ORIGIN.x, routeRequest.from().lat);
+    assertEquals(ORIGIN.y, routeRequest.from().lng);
+    assertEquals(DESTINATION.x, routeRequest.to().lat);
+    assertEquals(DESTINATION.y, routeRequest.to().lng);
+    assertEquals(LOCALE, routeRequest.locale());
+    assertEquals(defaultRequest.preferences(), routeRequest.preferences());
+    assertEquals(defaultRequest.wheelchair(), routeRequest.wheelchair());
+    assertEquals(defaultRequest.arriveBy(), routeRequest.arriveBy());
+    assertEquals(defaultRequest.isTripPlannedForNow(), routeRequest.isTripPlannedForNow());
+    assertEquals(defaultRequest.numItineraries(), routeRequest.numItineraries());
+    assertEquals(defaultRequest.searchWindow(), routeRequest.searchWindow());
+    assertEquals(defaultRequest.journey().modes(), routeRequest.journey().modes());
+    assertTrue(defaultRequest.journey().transit().filters().size() == 1);
+    assertTrue(routeRequest.journey().transit().filters().size() == 1);
+    assertTrue(routeRequest.journey().transit().enabled());
+    assertEquals(
+      defaultRequest.journey().transit().filters().getFirst(),
+      routeRequest.journey().transit().filters().getFirst()
+    );
+    assertTrue(
+      Duration
+        .between(defaultRequest.dateTime(), routeRequest.dateTime())
+        .compareTo(Duration.ofSeconds(10)) <
+      0
+    );
+  }
+
+  @Test
+  void testEarliestDeparture() {
+    var dateTimeArgs = createArgsCopy();
+    var dateTime = OffsetDateTime.of(LocalDate.of(2020, 3, 15), LocalTime.MIDNIGHT, ZoneOffset.UTC);
+    dateTimeArgs.put("dateTime", Map.ofEntries(entry("earliestDeparture", dateTime)));
+    var env = executionContext(dateTimeArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(dateTime.toInstant(), routeRequest.dateTime());
+    assertFalse(routeRequest.arriveBy());
+    assertFalse(routeRequest.isTripPlannedForNow());
+  }
+
+  @Test
+  void testLatestArrival() {
+    var dateTimeArgs = createArgsCopy();
+    var dateTime = OffsetDateTime.of(LocalDate.of(2020, 3, 15), LocalTime.MIDNIGHT, ZoneOffset.UTC);
+    dateTimeArgs.put("dateTime", Map.ofEntries(entry("latestArrival", dateTime)));
+    var env = executionContext(dateTimeArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(dateTime.toInstant(), routeRequest.dateTime());
+    assertTrue(routeRequest.arriveBy());
+    assertFalse(routeRequest.isTripPlannedForNow());
+  }
+
+  @Test
+  void testStopLocationAndLabel() {
+    Map stopLocationArgs = new HashMap<>();
+    var stopA = "foo:1";
+    var stopB = "foo:2";
+    var originLabel = "start";
+    var destinationLabel = "end";
+    stopLocationArgs.put(
+      "origin",
+      Map.ofEntries(
+        entry("location", Map.of("stopLocation", Map.of("stopLocationId", stopA))),
+        entry("label", originLabel)
+      )
+    );
+    stopLocationArgs.put(
+      "destination",
+      Map.ofEntries(
+        entry("location", Map.of("stopLocation", Map.of("stopLocationId", stopB))),
+        entry("label", destinationLabel)
+      )
+    );
+    var env = executionContext(stopLocationArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(FeedScopedId.parse(stopA), routeRequest.from().stopId);
+    assertEquals(originLabel, routeRequest.from().label);
+    assertEquals(FeedScopedId.parse(stopB), routeRequest.to().stopId);
+    assertEquals(destinationLabel, routeRequest.to().label);
+  }
+
+  @Test
+  void testLocale() {
+    var englishLocale = Locale.ENGLISH;
+    var localeArgs = createArgsCopy();
+    localeArgs.put("locale", englishLocale);
+    var env = executionContext(localeArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(englishLocale, routeRequest.locale());
+  }
+
+  @Test
+  void testSearchWindow() {
+    var searchWindow = Duration.ofHours(5);
+    var searchWindowArgs = createArgsCopy();
+    searchWindowArgs.put("searchWindow", searchWindow);
+    var env = executionContext(searchWindowArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(searchWindow, routeRequest.searchWindow());
+  }
+
+  @Test
+  void testBefore() {
+    var before = PageCursor.decode(
+      "MXxQUkVWSU9VU19QQUdFfDIwMjQtMDMtMTVUMTM6MzU6MzlafHw0MG18U1RSRUVUX0FORF9BUlJJVkFMX1RJTUV8ZmFsc2V8MjAyNC0wMy0xNVQxNDoyODoxNFp8MjAyNC0wMy0xNVQxNToxNDoyMlp8MXw0MjUzfA=="
+    );
+    var last = 8;
+    var beforeArgs = createArgsCopy();
+    beforeArgs.put("before", before.encode());
+    beforeArgs.put("first", 3);
+    beforeArgs.put("last", last);
+    beforeArgs.put("numberOfItineraries", 3);
+    var env = executionContext(beforeArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(before, routeRequest.pageCursor());
+    assertEquals(last, routeRequest.numItineraries());
+  }
+
+  @Test
+  void testAfter() {
+    var after = PageCursor.decode(
+      "MXxORVhUX1BBR0V8MjAyNC0wMy0xNVQxNDo0MzoxNFp8fDQwbXxTVFJFRVRfQU5EX0FSUklWQUxfVElNRXxmYWxzZXwyMDI0LTAzLTE1VDE0OjI4OjE0WnwyMDI0LTAzLTE1VDE1OjE0OjIyWnwxfDQyNTN8"
+    );
+    var first = 8;
+    var afterArgs = createArgsCopy();
+    afterArgs.put("after", after.encode());
+    afterArgs.put("first", first);
+    afterArgs.put("last", 3);
+    afterArgs.put("numberOfItineraries", 3);
+    var env = executionContext(afterArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(after, routeRequest.pageCursor());
+    assertEquals(first, routeRequest.numItineraries());
+  }
+
+  @Test
+  void testNumberOfItineraries() {
+    var itineraries = 8;
+    var itinArgs = createArgsCopy();
+    itinArgs.put("numberOfItineraries", itineraries);
+    var env = executionContext(itinArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(itineraries, routeRequest.numItineraries());
+  }
+
+  @Test
+  void testDirectOnly() {
+    var modesArgs = createArgsCopy();
+    modesArgs.put("modes", Map.ofEntries(entry("directOnly", true)));
+    var env = executionContext(modesArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertFalse(routeRequest.journey().transit().enabled());
+  }
+
+  @Test
+  void testTransitOnly() {
+    var modesArgs = createArgsCopy();
+    modesArgs.put("modes", Map.ofEntries(entry("transitOnly", true)));
+    var env = executionContext(modesArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(StreetMode.NOT_SET, routeRequest.journey().direct().mode());
+  }
+
+  @Test
+  void testStreetModes() {
+    var modesArgs = createArgsCopy();
+    var bicycle = List.of("BICYCLE");
+    modesArgs.put(
+      "modes",
+      Map.ofEntries(
+        entry("direct", List.of("CAR")),
+        entry(
+          "transit",
+          Map.ofEntries(
+            entry("access", bicycle),
+            entry("egress", bicycle),
+            entry("transfer", bicycle)
+          )
+        )
+      )
+    );
+    var env = executionContext(modesArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    assertEquals(StreetMode.CAR, routeRequest.journey().direct().mode());
+    assertEquals(StreetMode.BIKE, routeRequest.journey().access().mode());
+    assertEquals(StreetMode.BIKE, routeRequest.journey().egress().mode());
+    assertEquals(StreetMode.BIKE, routeRequest.journey().transfer().mode());
+  }
+
+  @Test
+  void testTransitModes() {
+    var modesArgs = createArgsCopy();
+    var tramCost = 1.5;
+    modesArgs.put(
+      "modes",
+      Map.ofEntries(
+        entry(
+          "transit",
+          Map.ofEntries(
+            entry(
+              "transit",
+              List.of(
+                Map.ofEntries(
+                  entry("mode", "TRAM"),
+                  entry("cost", Map.ofEntries(entry("reluctance", tramCost)))
+                ),
+                Map.ofEntries(entry("mode", "FERRY"))
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(modesArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var reluctanceForMode = routeRequest.preferences().transit().reluctanceForMode();
+    assertEquals(tramCost, reluctanceForMode.get(TransitMode.TRAM));
+    assertNull(reluctanceForMode.get(TransitMode.FERRY));
+    assertEquals(1, routeRequest.journey().transit().filters().size());
+    // TODO somehow test which modes are enabled
+  }
+
+  @Test
+  void testItineraryFilters() {
+    var filterArgs = createArgsCopy();
+    var profile = ItineraryFilterDebugProfile.LIMIT_TO_NUM_OF_ITINERARIES;
+    var keepOne = 0.4;
+    var keepThree = 0.6;
+    var multiplier = 3.5;
+    filterArgs.put(
+      "itineraryFilter",
+      Map.ofEntries(
+        entry("itineraryFilterDebugProfile", "LIMIT_TO_NUMBER_OF_ITINERARIES"),
+        entry("groupSimilarityKeepOne", keepOne),
+        entry("groupSimilarityKeepThree", keepThree),
+        entry("groupedOtherThanSameLegsMaxCostMultiplier", multiplier)
+      )
+    );
+    var env = executionContext(filterArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var itinFilter = routeRequest.preferences().itineraryFilter();
+    assertEquals(profile, itinFilter.debug());
+    assertEquals(keepOne, itinFilter.groupSimilarityKeepOne());
+    assertEquals(keepThree, itinFilter.groupSimilarityKeepThree());
+    assertEquals(multiplier, itinFilter.groupedOtherThanSameLegsMaxCostMultiplier());
+  }
+
+  private Map createArgsCopy() {
+    Map newArgs = new HashMap<>();
+    newArgs.putAll(args);
+    return newArgs;
+  }
+
+  private DataFetchingEnvironment executionContext(Map arguments) {
+    ExecutionInput executionInput = ExecutionInput
+      .newExecutionInput()
+      .query("")
+      .operationName("planConnection")
+      .context(context)
+      .locale(LOCALE)
+      .build();
+
+    var executionContext = newExecutionContextBuilder()
+      .executionInput(executionInput)
+      .executionId(ExecutionId.from(this.getClass().getName()))
+      .build();
+    return DataFetchingEnvironmentImpl
+      .newDataFetchingEnvironment(executionContext)
+      .arguments(arguments)
+      .localContext(Map.of("locale", LOCALE))
+      .build();
+  }
+}

From a8fb7900b325eab83fa5003fdcfb42d0686810a3 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Sat, 16 Mar 2024 11:20:58 +0100
Subject: [PATCH 0813/1688] Make testower a reviewer not assignee [ci skip]

---
 renovate.json5 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/renovate.json5 b/renovate.json5
index 8ecbbeb565e..c24cfc32829 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -35,12 +35,12 @@
       "matchUpdateTypes": ["patch", "minor"],
       "groupName": "Debug UI dependencies (non-major)",
       "schedule": ["on the first day of the week"],
-      "assignees": ["testower"]
+      "reviewers": ["testower"]
     },
     {
       "matchFiles": ["client-next/package.json"],
       "matchUpdateTypes": ["major"],
-      "assignees": ["testower"]
+      "reviewers": ["testower"]
     },
     // gbfs-java-model patch releases are automatic dependency upgrades so we automerge
     {

From f34cb2d66f2557a5164861cf8968a012fadc8d39 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 17 Mar 2024 23:19:47 +0000
Subject: [PATCH 0814/1688] fix(deps): update dependency
 org.entur.gbfs:gbfs-java-model to v3.0.25

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 66ee281d482..ead5ed3afdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -688,7 +688,7 @@
         
             org.entur.gbfs
             gbfs-java-model
-            3.0.24
+            3.0.25
         
 
         

From 7b62605abed479f3a652655941b3cd06cb4331d9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 04:34:23 +0000
Subject: [PATCH 0815/1688] chore(deps): update debug ui dependencies
 (non-major)

---
 client-next/package-lock.json | 270 +++++++++++++++++-----------------
 client-next/package.json      |  16 +-
 2 files changed, 139 insertions(+), 147 deletions(-)

diff --git a/client-next/package-lock.json b/client-next/package-lock.json
index 944da10aa11..0f9f836e54e 100644
--- a/client-next/package-lock.json
+++ b/client-next/package-lock.json
@@ -12,9 +12,9 @@
         "bootstrap": "5.3.3",
         "graphql": "16.8.1",
         "graphql-request": "6.1.0",
-        "maplibre-gl": "4.1.0",
+        "maplibre-gl": "4.1.1",
         "react": "18.2.0",
-        "react-bootstrap": "2.10.1",
+        "react-bootstrap": "2.10.2",
         "react-dom": "18.2.0",
         "react-map-gl": "7.1.7"
       },
@@ -24,24 +24,24 @@
         "@graphql-codegen/introspection": "4.0.3",
         "@parcel/watcher": "2.4.1",
         "@testing-library/react": "14.2.1",
-        "@types/react": "18.2.65",
-        "@types/react-dom": "18.2.21",
+        "@types/react": "18.2.66",
+        "@types/react-dom": "18.2.22",
         "@typescript-eslint/eslint-plugin": "7.2.0",
         "@typescript-eslint/parser": "7.2.0",
         "@vitejs/plugin-react": "4.2.1",
-        "@vitest/coverage-v8": "1.3.1",
+        "@vitest/coverage-v8": "1.4.0",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",
         "eslint-plugin-jsx-a11y": "6.8.0",
-        "eslint-plugin-react": "7.34.0",
+        "eslint-plugin-react": "7.34.1",
         "eslint-plugin-react-hooks": "4.6.0",
-        "eslint-plugin-react-refresh": "0.4.5",
+        "eslint-plugin-react-refresh": "0.4.6",
         "jsdom": "24.0.0",
         "prettier": "3.2.5",
         "typescript": "5.4.2",
         "vite": "4.5.2",
-        "vitest": "1.3.1"
+        "vitest": "1.4.0"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -2696,9 +2696,9 @@
       "dev": true
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.22.tgz",
-      "integrity": "sha512-Wf963MzWtA2sjrNt+g18IAln9lKnlRp+K2eH4jjIoF1wYeq3aMREpG09xhlhdzS0EjwU7qmUJYangWa+151vZw==",
+      "version": "0.3.25",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
+      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
       "dev": true,
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -3168,9 +3168,9 @@
       }
     },
     "node_modules/@restart/ui": {
-      "version": "1.6.6",
-      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.6.tgz",
-      "integrity": "sha512-eC3puKuWE1SRYbojWHXnvCNHGgf3uzHCb6JOhnF4OXPibOIPEkR1sqDSkL643ydigxwh+ruCa1CmYHlzk7ikKA==",
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.8.tgz",
+      "integrity": "sha512-6ndCv3oZ7r9vuP1Ok9KH55TM1/UkdBnP/fSraW0DFDMbPMzWKhVKeFAIEUCRCSdzayjZDcFYK6xbMlipN9dmMA==",
       "dependencies": {
         "@babel/runtime": "^7.21.0",
         "@popperjs/core": "^2.11.6",
@@ -3554,9 +3554,9 @@
       "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/react": {
-      "version": "18.2.65",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.65.tgz",
-      "integrity": "sha512-98TsY0aW4jqx/3RqsUXwMDZSWR1Z4CUlJNue8ueS2/wcxZOsz4xmW1X8ieaWVRHcmmQM3R8xVA4XWB3dJnWwDQ==",
+      "version": "18.2.66",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.66.tgz",
+      "integrity": "sha512-OYTmMI4UigXeFMF/j4uv0lBBEbongSgptPrHBxqME44h9+yNov+oL6Z3ocJKo0WyXR84sQUNeyIp9MRfckvZpg==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -3564,9 +3564,9 @@
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "18.2.21",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.21.tgz",
-      "integrity": "sha512-gnvBA/21SA4xxqNXEwNiVcP0xSGHh/gi1VhWv9Bl46a0ItbTT5nFY+G9VSQpaG/8N/qdJpJ+vftQ4zflTtnjLw==",
+      "version": "18.2.22",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.22.tgz",
+      "integrity": "sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==",
       "dev": true,
       "dependencies": {
         "@types/react": "*"
@@ -3952,9 +3952,9 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.3.1.tgz",
-      "integrity": "sha512-UuBnkSJUNE9rdHjDCPyJ4fYuMkoMtnghes1XohYa4At0MS3OQSAo97FrbwSLRshYsXThMZy1+ybD/byK5llyIg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.4.0.tgz",
+      "integrity": "sha512-4hDGyH1SvKpgZnIByr9LhGgCEuF9DKM34IBLCC/fVfy24Z3+PZ+Ii9hsVBsHvY1umM1aGPEjceRkzxCfcQ10wg==",
       "dev": true,
       "dependencies": {
         "@ampproject/remapping": "^2.2.1",
@@ -3962,12 +3962,13 @@
         "debug": "^4.3.4",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
-        "istanbul-lib-source-maps": "^4.0.1",
+        "istanbul-lib-source-maps": "^5.0.4",
         "istanbul-reports": "^3.1.6",
         "magic-string": "^0.30.5",
         "magicast": "^0.3.3",
         "picocolors": "^1.0.0",
         "std-env": "^3.5.0",
+        "strip-literal": "^2.0.0",
         "test-exclude": "^6.0.0",
         "v8-to-istanbul": "^9.2.0"
       },
@@ -3975,17 +3976,17 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "1.3.1"
+        "vitest": "1.4.0"
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.3.1.tgz",
-      "integrity": "sha512-xofQFwIzfdmLLlHa6ag0dPV8YsnKOCP1KdAeVVh34vSjN2dcUiXYCD9htu/9eM7t8Xln4v03U9HLxLpPlsXdZw==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.4.0.tgz",
+      "integrity": "sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==",
       "dev": true,
       "dependencies": {
-        "@vitest/spy": "1.3.1",
-        "@vitest/utils": "1.3.1",
+        "@vitest/spy": "1.4.0",
+        "@vitest/utils": "1.4.0",
         "chai": "^4.3.10"
       },
       "funding": {
@@ -3993,12 +3994,12 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.3.1.tgz",
-      "integrity": "sha512-5FzF9c3jG/z5bgCnjr8j9LNq/9OxV2uEBAITOXfoe3rdZJTdO7jzThth7FXv/6b+kdY65tpRQB7WaKhNZwX+Kg==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.4.0.tgz",
+      "integrity": "sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==",
       "dev": true,
       "dependencies": {
-        "@vitest/utils": "1.3.1",
+        "@vitest/utils": "1.4.0",
         "p-limit": "^5.0.0",
         "pathe": "^1.1.1"
       },
@@ -4034,9 +4035,9 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.3.1.tgz",
-      "integrity": "sha512-EF++BZbt6RZmOlE3SuTPu/NfwBF6q4ABS37HHXzs2LUVPBLx2QoY/K0fKpRChSo8eLiuxcbCVfqKgx/dplCDuQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.4.0.tgz",
+      "integrity": "sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==",
       "dev": true,
       "dependencies": {
         "magic-string": "^0.30.5",
@@ -4080,9 +4081,9 @@
       "dev": true
     },
     "node_modules/@vitest/spy": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.3.1.tgz",
-      "integrity": "sha512-xAcW+S099ylC9VLU7eZfdT9myV67Nor9w9zhf0mGCYJSO+zM2839tOeROTdikOi/8Qeusffvxb/MyBSOja1Uig==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.4.0.tgz",
+      "integrity": "sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==",
       "dev": true,
       "dependencies": {
         "tinyspy": "^2.2.0"
@@ -4092,9 +4093,9 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.3.1.tgz",
-      "integrity": "sha512-d3Waie/299qqRyHTm2DjADeTaNdNSVsnwHPWrs20JMpjh6eiVq7ggggweO8rc4arhf6rRkWuHKwvxGvejUXZZQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.4.0.tgz",
+      "integrity": "sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==",
       "dev": true,
       "dependencies": {
         "diff-sequences": "^29.6.3",
@@ -5990,9 +5991,9 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.34.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.0.tgz",
-      "integrity": "sha512-MeVXdReleBTdkz/bvcQMSnCXGi+c9kvy51IpinjnJgutl3YTHWsDdke7Z1ufZpGfDG8xduBDKyjtB9JH1eBKIQ==",
+      "version": "7.34.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz",
+      "integrity": "sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw==",
       "dev": true,
       "dependencies": {
         "array-includes": "^3.1.7",
@@ -6034,9 +6035,9 @@
       }
     },
     "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.5",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.5.tgz",
-      "integrity": "sha512-D53FYKJa+fDmZMtriODxvhwrO+IOqrxoEo21gMA0sjHdU6dPVH4OhyFip9ypl8HOF5RV5KdTo+rBQLvnY2cO8w==",
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.6.tgz",
+      "integrity": "sha512-NjGXdm7zgcKRkKMua34qVO9doI7VOxZ6ancSvBELJSSoX97jyndXcSoa8XBh69JoB31dNz3EEzlMcizZl7LaMA==",
       "dev": true,
       "peerDependencies": {
         "eslint": ">=7"
@@ -7715,14 +7716,14 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.4.tgz",
+      "integrity": "sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==",
       "dev": true,
       "dependencies": {
+        "@jridgewell/trace-mapping": "^0.3.23",
         "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
+        "istanbul-lib-coverage": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
@@ -8283,9 +8284,9 @@
       }
     },
     "node_modules/maplibre-gl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.0.tgz",
-      "integrity": "sha512-4RQFJSroo/JAJml6Rj2FFIZOfnjsqPp0O9kSp8aVXQUY0HGXNupltzPKbBZeucqi7ynRQHFeu+onTM3hY0Makw==",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.1.tgz",
+      "integrity": "sha512-DmHru9FTHCOngNHzIx9W2+MlUziYPfPxd2qjyeWwczBYNx2SDpmH394MkuCvSgnfUm5Zvs4NaYCqMu44jUga1Q==",
       "dependencies": {
         "@mapbox/geojson-rewind": "^0.5.2",
         "@mapbox/jsonlint-lines-primitives": "^2.0.2",
@@ -9281,13 +9282,13 @@
       }
     },
     "node_modules/react-bootstrap": {
-      "version": "2.10.1",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.1.tgz",
-      "integrity": "sha512-J3OpRZIvCTQK+Tg/jOkRUvpYLHMdGeU9KqFUBQrV0d/Qr/3nsINpiOJyZMWnM5SJ3ctZdhPA6eCIKpEJR3Ellg==",
+      "version": "2.10.2",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.2.tgz",
+      "integrity": "sha512-UvB7mRqQjivdZNxJNEA2yOQRB7L9N43nBnKc33K47+cH90/ujmnMwatTCwQLu83gLhrzAl8fsa6Lqig/KLghaA==",
       "dependencies": {
         "@babel/runtime": "^7.22.5",
         "@restart/hooks": "^0.4.9",
-        "@restart/ui": "^1.6.6",
+        "@restart/ui": "^1.6.8",
         "@types/react-transition-group": "^4.4.6",
         "classnames": "^2.3.2",
         "dom-helpers": "^5.2.1",
@@ -9931,15 +9932,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/source-map-js": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz",
@@ -10823,9 +10815,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.3.1.tgz",
-      "integrity": "sha512-azbRrqRxlWTJEVbzInZCTchx0X69M/XPTCz4H+TLvlTcR/xH/3hkRqhOakT41fMJCMzXTu4UvegkZiEoJAWvng==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.4.0.tgz",
+      "integrity": "sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==",
       "dev": true,
       "dependencies": {
         "cac": "^6.7.14",
@@ -11322,16 +11314,16 @@
       }
     },
     "node_modules/vitest": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.3.1.tgz",
-      "integrity": "sha512-/1QJqXs8YbCrfv/GPQ05wAZf2eakUPLPa18vkJAKE7RXOKfVHqMZZ1WlTjiwl6Gcn65M5vpNUB6EFLnEdRdEXQ==",
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.4.0.tgz",
+      "integrity": "sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==",
       "dev": true,
       "dependencies": {
-        "@vitest/expect": "1.3.1",
-        "@vitest/runner": "1.3.1",
-        "@vitest/snapshot": "1.3.1",
-        "@vitest/spy": "1.3.1",
-        "@vitest/utils": "1.3.1",
+        "@vitest/expect": "1.4.0",
+        "@vitest/runner": "1.4.0",
+        "@vitest/snapshot": "1.4.0",
+        "@vitest/spy": "1.4.0",
+        "@vitest/utils": "1.4.0",
         "acorn-walk": "^8.3.2",
         "chai": "^4.3.10",
         "debug": "^4.3.4",
@@ -11345,7 +11337,7 @@
         "tinybench": "^2.5.1",
         "tinypool": "^0.8.2",
         "vite": "^5.0.0",
-        "vite-node": "1.3.1",
+        "vite-node": "1.4.0",
         "why-is-node-running": "^2.2.2"
       },
       "bin": {
@@ -11360,8 +11352,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "1.3.1",
-        "@vitest/ui": "1.3.1",
+        "@vitest/browser": "1.4.0",
+        "@vitest/ui": "1.4.0",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -11739,9 +11731,9 @@
       }
     },
     "node_modules/vitest/node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.12.1.tgz",
-      "integrity": "sha512-iU2Sya8hNn1LhsYyf0N+L4Gf9Qc+9eBTJJJsaOGUp+7x4n2M9dxTt8UvhJl3oeftSjblSlpCfvjA/IfP3g5VjQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz",
+      "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==",
       "cpu": [
         "arm"
       ],
@@ -11752,9 +11744,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.12.1.tgz",
-      "integrity": "sha512-wlzcWiH2Ir7rdMELxFE5vuM7D6TsOcJ2Yw0c3vaBR3VOsJFVTx9xvwnAvhgU5Ii8Gd6+I11qNHwndDscIm0HXg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz",
+      "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==",
       "cpu": [
         "arm64"
       ],
@@ -11765,9 +11757,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.12.1.tgz",
-      "integrity": "sha512-YRXa1+aZIFN5BaImK+84B3uNK8C6+ynKLPgvn29X9s0LTVCByp54TB7tdSMHDR7GTV39bz1lOmlLDuedgTwwHg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz",
+      "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==",
       "cpu": [
         "arm64"
       ],
@@ -11778,9 +11770,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.12.1.tgz",
-      "integrity": "sha512-opjWJ4MevxeA8FhlngQWPBOvVWYNPFkq6/25rGgG+KOy0r8clYwL1CFd+PGwRqqMFVQ4/Qd3sQu5t7ucP7C/Uw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz",
+      "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==",
       "cpu": [
         "x64"
       ],
@@ -11791,9 +11783,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.12.1.tgz",
-      "integrity": "sha512-uBkwaI+gBUlIe+EfbNnY5xNyXuhZbDSx2nzzW8tRMjUmpScd6lCQYKY2V9BATHtv5Ef2OBq6SChEP8h+/cxifQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz",
+      "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==",
       "cpu": [
         "arm"
       ],
@@ -11804,9 +11796,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.12.1.tgz",
-      "integrity": "sha512-0bK9aG1kIg0Su7OcFTlexkVeNZ5IzEsnz1ept87a0TUgZ6HplSgkJAnFpEVRW7GRcikT4GlPV0pbtVedOaXHQQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==",
       "cpu": [
         "arm64"
       ],
@@ -11817,9 +11809,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.12.1.tgz",
-      "integrity": "sha512-qB6AFRXuP8bdkBI4D7UPUbE7OQf7u5OL+R94JE42Z2Qjmyj74FtDdLGeriRyBDhm4rQSvqAGCGC01b8Fu2LthQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz",
+      "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==",
       "cpu": [
         "arm64"
       ],
@@ -11830,9 +11822,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.12.1.tgz",
-      "integrity": "sha512-sHig3LaGlpNgDj5o8uPEoGs98RII8HpNIqFtAI8/pYABO8i0nb1QzT0JDoXF/pxzqO+FkxvwkHZo9k0NJYDedg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz",
+      "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==",
       "cpu": [
         "riscv64"
       ],
@@ -11843,9 +11835,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.12.1.tgz",
-      "integrity": "sha512-nD3YcUv6jBJbBNFvSbp0IV66+ba/1teuBcu+fBBPZ33sidxitc6ErhON3JNavaH8HlswhWMC3s5rgZpM4MtPqQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz",
+      "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==",
       "cpu": [
         "x64"
       ],
@@ -11856,9 +11848,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.12.1.tgz",
-      "integrity": "sha512-7/XVZqgBby2qp/cO0TQ8uJK+9xnSdJ9ct6gSDdEr4MfABrjTyrW6Bau7HQ73a2a5tPB7hno49A0y1jhWGDN9OQ==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz",
+      "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==",
       "cpu": [
         "x64"
       ],
@@ -11869,9 +11861,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.12.1.tgz",
-      "integrity": "sha512-CYc64bnICG42UPL7TrhIwsJW4QcKkIt9gGlj21gq3VV0LL6XNb1yAdHVp1pIi9gkts9gGcT3OfUYHjGP7ETAiw==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz",
+      "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==",
       "cpu": [
         "arm64"
       ],
@@ -11882,9 +11874,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.12.1.tgz",
-      "integrity": "sha512-LN+vnlZ9g0qlHGlS920GR4zFCqAwbv2lULrR29yGaWP9u7wF5L7GqWu9Ah6/kFZPXPUkpdZwd//TNR+9XC9hvA==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz",
+      "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==",
       "cpu": [
         "ia32"
       ],
@@ -11895,9 +11887,9 @@
       ]
     },
     "node_modules/vitest/node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.12.1.tgz",
-      "integrity": "sha512-n+vkrSyphvmU0qkQ6QBNXCGr2mKjhP08mPRM/Xp5Ck2FV4NrHU+y6axzDeixUrCBHVUS51TZhjqrKBBsHLKb2Q==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz",
+      "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==",
       "cpu": [
         "x64"
       ],
@@ -11946,9 +11938,9 @@
       }
     },
     "node_modules/vitest/node_modules/rollup": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.12.1.tgz",
-      "integrity": "sha512-ggqQKvx/PsB0FaWXhIvVkSWh7a/PCLQAsMjBc+nA2M8Rv2/HG0X6zvixAB7KyZBRtifBUhy5k8voQX/mRnABPg==",
+      "version": "4.13.0",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz",
+      "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==",
       "dev": true,
       "dependencies": {
         "@types/estree": "1.0.5"
@@ -11961,19 +11953,19 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.12.1",
-        "@rollup/rollup-android-arm64": "4.12.1",
-        "@rollup/rollup-darwin-arm64": "4.12.1",
-        "@rollup/rollup-darwin-x64": "4.12.1",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.12.1",
-        "@rollup/rollup-linux-arm64-gnu": "4.12.1",
-        "@rollup/rollup-linux-arm64-musl": "4.12.1",
-        "@rollup/rollup-linux-riscv64-gnu": "4.12.1",
-        "@rollup/rollup-linux-x64-gnu": "4.12.1",
-        "@rollup/rollup-linux-x64-musl": "4.12.1",
-        "@rollup/rollup-win32-arm64-msvc": "4.12.1",
-        "@rollup/rollup-win32-ia32-msvc": "4.12.1",
-        "@rollup/rollup-win32-x64-msvc": "4.12.1",
+        "@rollup/rollup-android-arm-eabi": "4.13.0",
+        "@rollup/rollup-android-arm64": "4.13.0",
+        "@rollup/rollup-darwin-arm64": "4.13.0",
+        "@rollup/rollup-darwin-x64": "4.13.0",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.13.0",
+        "@rollup/rollup-linux-arm64-gnu": "4.13.0",
+        "@rollup/rollup-linux-arm64-musl": "4.13.0",
+        "@rollup/rollup-linux-riscv64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-gnu": "4.13.0",
+        "@rollup/rollup-linux-x64-musl": "4.13.0",
+        "@rollup/rollup-win32-arm64-msvc": "4.13.0",
+        "@rollup/rollup-win32-ia32-msvc": "4.13.0",
+        "@rollup/rollup-win32-x64-msvc": "4.13.0",
         "fsevents": "~2.3.2"
       }
     },
diff --git a/client-next/package.json b/client-next/package.json
index df70e5baf28..2638a71a2c4 100644
--- a/client-next/package.json
+++ b/client-next/package.json
@@ -21,9 +21,9 @@
     "bootstrap": "5.3.3",
     "graphql": "16.8.1",
     "graphql-request": "6.1.0",
-    "maplibre-gl": "4.1.0",
+    "maplibre-gl": "4.1.1",
     "react": "18.2.0",
-    "react-bootstrap": "2.10.1",
+    "react-bootstrap": "2.10.2",
     "react-dom": "18.2.0",
     "react-map-gl": "7.1.7"
   },
@@ -33,23 +33,23 @@
     "@graphql-codegen/introspection": "4.0.3",
     "@parcel/watcher": "2.4.1",
     "@testing-library/react": "14.2.1",
-    "@types/react": "18.2.65",
-    "@types/react-dom": "18.2.21",
+    "@types/react": "18.2.66",
+    "@types/react-dom": "18.2.22",
     "@typescript-eslint/eslint-plugin": "7.2.0",
     "@typescript-eslint/parser": "7.2.0",
     "@vitejs/plugin-react": "4.2.1",
-    "@vitest/coverage-v8": "1.3.1",
+    "@vitest/coverage-v8": "1.4.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "6.8.0",
-    "eslint-plugin-react": "7.34.0",
+    "eslint-plugin-react": "7.34.1",
     "eslint-plugin-react-hooks": "4.6.0",
-    "eslint-plugin-react-refresh": "0.4.5",
+    "eslint-plugin-react-refresh": "0.4.6",
     "jsdom": "24.0.0",
     "prettier": "3.2.5",
     "typescript": "5.4.2",
     "vite": "4.5.2",
-    "vitest": "1.3.1"
+    "vitest": "1.4.0"
   }
 }

From 92b96200ce2e276335ebf6d0fa8992ac7a8cb026 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 04:34:30 +0000
Subject: [PATCH 0816/1688] fix(deps): update dependency
 org.entur.gbfs:gbfs-java-model to v3.0.26

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ead5ed3afdc..4ffeb92d887 100644
--- a/pom.xml
+++ b/pom.xml
@@ -688,7 +688,7 @@
         
             org.entur.gbfs
             gbfs-java-model
-            3.0.25
+            3.0.26
         
 
         

From 6a5d463cdb14ca4afeec462bdbea3d203b76e73f Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Mon, 18 Mar 2024 05:49:21 +0000
Subject: [PATCH 0817/1688] Upgrade debug client to version
 2024/03/2024-03-18T05:48

---
 src/client/debug-client-preview/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html
index 84d1084320f..add4c49aadc 100644
--- a/src/client/debug-client-preview/index.html
+++ b/src/client/debug-client-preview/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
      

From c148dafc8f292138d6bbf458b9b3980544dc0a6e Mon Sep 17 00:00:00 2001
From: sharhio <113033056+sharhio@users.noreply.github.com>
Date: Mon, 18 Mar 2024 12:53:03 +0200
Subject: [PATCH 0818/1688] Update
 src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java

Co-authored-by: Leonard Ehrenfried 
---
 .../layers/stops/DigitransitRealtimeStopPropertyMapper.java    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index 0cce00bb385..ad31855d501 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -33,10 +33,9 @@ protected Collection map(RegularStop stop) {
       .anyMatch(alert -> alert.noServiceAt(currentTime));
 
     Collection sharedKeyValues = getKeyValues(stop, i18NStringMapper, transitService);
-    Collection keyValues = ListUtils.combine(
+    return ListUtils.combine(
       sharedKeyValues,
       List.of(new KeyValue("closedByServiceAlert", noServiceAlert))
     );
-    return keyValues;
   }
 }

From 796d542109b10ca1fc703da04f1d204cebc1ca2d Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Mon, 18 Mar 2024 13:11:07 +0200
Subject: [PATCH 0819/1688] naming

---
 .../layers/stops/DigitransitRealtimeStopPropertyMapper.java   | 4 ++--
 .../layers/stops/DigitransitStopPropertyMapper.java           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index ad31855d501..55d67d28d71 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -1,6 +1,6 @@
 package org.opentripplanner.ext.vectortiles.layers.stops;
 
-import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getKeyValues;
+import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getBaseKeyValues;
 
 import java.time.Instant;
 import java.util.Collection;
@@ -32,7 +32,7 @@ protected Collection map(RegularStop stop) {
       .stream()
       .anyMatch(alert -> alert.noServiceAt(currentTime));
 
-    Collection sharedKeyValues = getKeyValues(stop, i18NStringMapper, transitService);
+    Collection sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService);
     return ListUtils.combine(
       sharedKeyValues,
       List.of(new KeyValue("closedByServiceAlert", noServiceAlert))
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
index 94569de1ce5..2568f1fbc9b 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
@@ -34,10 +34,10 @@ protected static DigitransitStopPropertyMapper create(
 
   @Override
   protected Collection map(RegularStop stop) {
-    return getKeyValues(stop, i18NStringMapper, transitService);
+    return getBaseKeyValues(stop, i18NStringMapper, transitService);
   }
 
-  protected static Collection getKeyValues(
+  protected static Collection getBaseKeyValues(
     RegularStop stop,
     I18NStringMapper i18NStringMapper,
     TransitService transitService

From 5120e12483b8acc2b0509af41e7a9036386e2b8a Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Mon, 18 Mar 2024 13:18:33 +0200
Subject: [PATCH 0820/1688] documentation

---
 docs/sandbox/MapboxVectorTilesApi.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md
index 45feec03d47..11a09176d3b 100644
--- a/docs/sandbox/MapboxVectorTilesApi.md
+++ b/docs/sandbox/MapboxVectorTilesApi.md
@@ -103,6 +103,15 @@ The feature must be configured in `router-config.json` as follows
         "minZoom": 14,
         "cacheMaxSeconds": 60
       },
+      // Contains just stops and real-time information for them
+      {
+        "name": "realtimeStops",
+        "type": "Stop",
+        "mapper": "DigitransitRealtime",
+        "maxZoom": 20,
+        "minZoom": 14,
+        "cacheMaxSeconds": 600
+      },
       // This exists for backwards compatibility. At some point, we might want
       // to add a new real-time parking mapper with better translation support
       // and less unnecessary fields.

From 89e82e96567f2a72531f75e74a03a0bde845b239 Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Mon, 18 Mar 2024 13:47:22 +0200
Subject: [PATCH 0821/1688] docs generation

---
 docs/sandbox/MapboxVectorTilesApi.md           |  9 ---------
 .../gtfs/generated/GraphQLDataFetchers.java    | 18 +++++++++++++++++-
 .../apis/gtfs/generated/GraphQLTypes.java      |  1 +
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md
index 11a09176d3b..45feec03d47 100644
--- a/docs/sandbox/MapboxVectorTilesApi.md
+++ b/docs/sandbox/MapboxVectorTilesApi.md
@@ -103,15 +103,6 @@ The feature must be configured in `router-config.json` as follows
         "minZoom": 14,
         "cacheMaxSeconds": 60
       },
-      // Contains just stops and real-time information for them
-      {
-        "name": "realtimeStops",
-        "type": "Stop",
-        "mapper": "DigitransitRealtime",
-        "maxZoom": 20,
-        "minZoom": 14,
-        "cacheMaxSeconds": 600
-      },
       // This exists for backwards compatibility. At some point, we might want
       // to add a new real-time parking mapper with better translation support
       // and less unnecessary fields.
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
index 2f39f7f4030..8bc83ce1108 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
@@ -2,6 +2,8 @@
 package org.opentripplanner.apis.gtfs.generated;
 
 import graphql.relay.Connection;
+import graphql.relay.Connection;
+import graphql.relay.Edge;
 import graphql.relay.Edge;
 import graphql.schema.DataFetcher;
 import graphql.schema.TypeResolver;
@@ -21,8 +23,12 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode;
 import org.opentripplanner.apis.gtfs.model.RideHailingProvider;
+import org.opentripplanner.apis.gtfs.model.RouteTypeModel;
+import org.opentripplanner.apis.gtfs.model.StopOnRouteModel;
+import org.opentripplanner.apis.gtfs.model.StopOnTripModel;
 import org.opentripplanner.apis.gtfs.model.StopPosition;
 import org.opentripplanner.apis.gtfs.model.TripOccupancy;
+import org.opentripplanner.apis.gtfs.model.UnknownModel;
 import org.opentripplanner.ext.fares.model.FareRuleSet;
 import org.opentripplanner.ext.ridehailing.model.RideEstimate;
 import org.opentripplanner.model.StopTimesInPattern;
@@ -44,6 +50,8 @@
 import org.opentripplanner.routing.graphfinder.PatternAtStop;
 import org.opentripplanner.routing.graphfinder.PlaceAtDistance;
 import org.opentripplanner.routing.vehicle_parking.VehicleParking;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingState;
 import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle;
@@ -54,6 +62,7 @@
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle;
 import org.opentripplanner.transit.model.basic.Money;
 import org.opentripplanner.transit.model.network.Route;
@@ -1235,6 +1244,10 @@ public interface GraphQLElevationProfileComponent {
     public DataFetcher elevation();
   }
 
+  /**
+   * This type is only here for backwards-compatibility and this API will never return it anymore.
+   * Please use the leg's `fareProducts` instead.
+   */
   public interface GraphQLFare {
     public DataFetcher cents();
 
@@ -1245,7 +1258,10 @@ public interface GraphQLFare {
     public DataFetcher type();
   }
 
-  /** Component of the fare (i.e. ticket) for a part of the itinerary */
+  /**
+   * This type is only here for backwards-compatibility and this API will never return it anymore.
+   * Please use the leg's `fareProducts` instead.
+   */
   public interface GraphQLFareComponent {
     public DataFetcher cents();
 
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
index ecc038fec18..ffe37e77284 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
@@ -1,6 +1,7 @@
 // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 package org.opentripplanner.apis.gtfs.generated;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

From 20dee5fce998b3f05f26221ea90ce646c303f165 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:32:06 +0000
Subject: [PATCH 0822/1688] chore(deps): update dependency
 io.github.git-commit-id:git-commit-id-maven-plugin to v8.0.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4ffeb92d887..80bd7c813b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@
                   but we need the Maven project version as well, so we perform substitution. -->
                 io.github.git-commit-id
                 git-commit-id-maven-plugin
-                8.0.1
+                8.0.2
                 
                     
                         

From 2c36456623158f5ab7213d99d9dcd39817491776 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 18 Mar 2024 22:32:11 +0000
Subject: [PATCH 0823/1688] chore(deps): update dependency
 org.apache.maven.plugins:maven-gpg-plugin to v3.2.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 80bd7c813b2..1403d4e71bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1007,7 +1007,7 @@
                     
                         org.apache.maven.plugins
                         maven-gpg-plugin
-                        3.2.0
+                        3.2.1
                         
                             
                                 sign-artifacts

From d75df7fb6ba3c0cf7c554f2a78eb2bd0a8f6907d Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Tue, 19 Mar 2024 09:20:41 +0200
Subject: [PATCH 0824/1688] documentation

---
 doc-templates/sandbox/MapboxVectorTilesApi.md | 9 +++++++++
 docs/sandbox/MapboxVectorTilesApi.md          | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md
index 35211eff00b..9fd3b9e4ba2 100644
--- a/doc-templates/sandbox/MapboxVectorTilesApi.md
+++ b/doc-templates/sandbox/MapboxVectorTilesApi.md
@@ -103,6 +103,15 @@ The feature must be configured in `router-config.json` as follows
         "minZoom": 14,
         "cacheMaxSeconds": 60
       },
+      // Contains just stops and real-time information for them
+      {
+        "name": "realtimeStops",
+        "type": "Stop",
+        "mapper": "DigitransitRealtime",
+        "maxZoom": 20,
+        "minZoom": 14,
+        "cacheMaxSeconds": 600
+      },
       // This exists for backwards compatibility. At some point, we might want
       // to add a new real-time parking mapper with better translation support
       // and less unnecessary fields.
diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md
index 45feec03d47..11a09176d3b 100644
--- a/docs/sandbox/MapboxVectorTilesApi.md
+++ b/docs/sandbox/MapboxVectorTilesApi.md
@@ -103,6 +103,15 @@ The feature must be configured in `router-config.json` as follows
         "minZoom": 14,
         "cacheMaxSeconds": 60
       },
+      // Contains just stops and real-time information for them
+      {
+        "name": "realtimeStops",
+        "type": "Stop",
+        "mapper": "DigitransitRealtime",
+        "maxZoom": 20,
+        "minZoom": 14,
+        "cacheMaxSeconds": 600
+      },
       // This exists for backwards compatibility. At some point, we might want
       // to add a new real-time parking mapper with better translation support
       // and less unnecessary fields.

From 03b5b27c02c717b9a9b95ad3a0acedfc923443e3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 13 Mar 2024 06:39:29 +0000
Subject: [PATCH 0825/1688] fix(deps): update jackson.version to v2.17.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1403d4e71bd..24b6b574946 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         
         30.2
         2.51
-        2.16.2
+        2.17.0
         3.1.5
         5.10.2
         1.12.3

From 8916e75fa1004fa9dc177c5409e16fe7f6ff1a3b Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 19 Mar 2024 12:31:21 +0100
Subject: [PATCH 0826/1688] Update test

---
 .../org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
index cc88e22d074..9890b2d5398 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GeoJsonScalarTest.java
@@ -23,9 +23,11 @@ void geoJson() throws JsonProcessingException {
     );
     var geoJson = GraphQLScalars.GEOJSON_SCALAR.getCoercing().serialize(polygon);
 
-    var jsonNode = ObjectMappers
+    var expected = ObjectMappers
       .ignoringExtraFields()
-      .readTree("{\"type\":\"Polygon\",\"coordinates\":[[[0,0],[1,1],[2,2],[0,0]]]}");
-    assertEquals(jsonNode.toString(), geoJson.toString());
+      .readTree(
+        "{\"type\":\"Polygon\",\"coordinates\":[[[0.0,0.0],[1.0,1.0],[2.0,2.0],[0.0,0.0]]]}"
+      );
+    assertEquals(expected.toString(), geoJson.toString());
   }
 }

From 2ae56a39e0aa65c938ce4bc5c132ea7b362aa685 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 03:24:03 +0000
Subject: [PATCH 0827/1688] chore(deps): update dependency
 org.apache.maven.plugins:maven-compiler-plugin to v3.13.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1403d4e71bd..a2b54cfedf3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -142,7 +142,7 @@
             
                 org.apache.maven.plugins
                 maven-compiler-plugin
-                3.12.1
+                3.13.0
                 
                     
                     21

From 2dbc66979081da5ab45e1447e8923eb44892847b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:32:53 +0000
Subject: [PATCH 0828/1688] fix(deps): update dependency
 com.graphql-java:graphql-java to v21.4

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a2b54cfedf3..43568d2e1e0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -866,7 +866,7 @@
         
             com.graphql-java
             graphql-java
-            21.3
+            21.4
         
         
             com.graphql-java

From df51ece89326a2ac9f5bbb3f8fc3db91774ee469 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 19 Mar 2024 11:33:02 +0000
Subject: [PATCH 0829/1688] fix(deps): update geotools.version to v31

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index a2b54cfedf3..a704c936f51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     
         148
         
-        30.2
+        31.0
         2.51
         2.16.2
         3.1.5

From ddbec9b4a35bc6eddbba6a525c561b9c02dbf40a Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 19 Mar 2024 12:37:47 +0100
Subject: [PATCH 0830/1688] Slow down some dependency updates [ci skip]

---
 renovate.json5 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/renovate.json5 b/renovate.json5
index c24cfc32829..8a7f57e6764 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -42,11 +42,13 @@
       "matchUpdateTypes": ["major"],
       "reviewers": ["testower"]
     },
-    // gbfs-java-model patch releases are automatic dependency upgrades so we automerge
+    // some dependencies that we auto-merge release very often and even the auto-merges create a lot of
+    // noise, so we slow it down a bit
     {
       "matchPackageNames": [
         "org.entur.gbfs:gbfs-java-model",
-        "ch.qos.logback:logback-classic"
+        "ch.qos.logback:logback-classic",
+        "io.github.git-commit-id:git-commit-id-maven-plugin"
       ],
       "matchUpdateTypes": ["patch"],
       "schedule": "on the 18th day of the month",
@@ -110,7 +112,6 @@
         "org.codehaus.mojo:build-helper-maven-plugin",
         "org.apache.maven.plugins:maven-gpg-plugin",
         "org.apache.maven.plugins:maven-source-plugin",
-        "io.github.git-commit-id:git-commit-id-maven-plugin",
         "com.hubspot.maven.plugins:prettier-maven-plugin",
         "com.google.cloud.tools:jib-maven-plugin",
         "org.apache.maven.plugins:maven-shade-plugin",

From 6f8d31b3ebee3234dfdceb97357866c76e179a8b Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Tue, 19 Mar 2024 23:54:46 +0200
Subject: [PATCH 0831/1688] Add test for transit modes

---
 .../apis/gtfs/mapping/RouteRequestMapperTest.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
index fb40c9e7d7f..ae2e3c57105 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
@@ -102,8 +102,8 @@ void testMinimalArgs() {
     assertTrue(routeRequest.journey().transit().filters().size() == 1);
     assertTrue(routeRequest.journey().transit().enabled());
     assertEquals(
-      defaultRequest.journey().transit().filters().getFirst(),
-      routeRequest.journey().transit().filters().getFirst()
+      defaultRequest.journey().transit().filters().toString(),
+      routeRequest.journey().transit().filters().toString()
     );
     assertTrue(
       Duration
@@ -303,8 +303,10 @@ void testTransitModes() {
     var reluctanceForMode = routeRequest.preferences().transit().reluctanceForMode();
     assertEquals(tramCost, reluctanceForMode.get(TransitMode.TRAM));
     assertNull(reluctanceForMode.get(TransitMode.FERRY));
-    assertEquals(1, routeRequest.journey().transit().filters().size());
-    // TODO somehow test which modes are enabled
+    assertEquals(
+      "[TransitFilterRequest{select: [SelectRequest{transportModes: [FERRY, TRAM]}]}]",
+      routeRequest.journey().transit().filters().toString()
+    );
   }
 
   @Test

From c3c5def534a80c123a06cec1150953194f7672c0 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Wed, 20 Mar 2024 07:49:55 +0000
Subject: [PATCH 0832/1688] Add changelog entry for #5732 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index cfe8cde5133..da24aae7a35 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -6,6 +6,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 ## 2.6.0-SNAPSHOT (under development)
 
 - ISO-8601 date time for GTFS API itinerary responses [#5660](https://github.com/opentripplanner/OpenTripPlanner/pull/5660)
+- Fix street routing on roundabout [#5732](https://github.com/opentripplanner/OpenTripPlanner/pull/5732)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 48e04c98debe7ace8640e40950ba337b253f7726 Mon Sep 17 00:00:00 2001
From: Max Buchholz 
Date: Wed, 20 Mar 2024 11:22:17 +0100
Subject: [PATCH 0833/1688] Update Link in README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 953aa02b731..8d7e3968cb1 100644
--- a/README.md
+++ b/README.md
@@ -71,5 +71,5 @@ found in the main documentation.
 
 ## OTP Ecosystem
 
-- [awesome-transit](https://github.com/CUTR-at-USF/awesome-transit) Community list of transit APIs,
+- [awesome-transit](https://github.com/MobilityData/awesome-transit) Community list of transit APIs,
   apps, datasets, research, and software.

From 2b7a431866937a6be15e8b72eefcf0e1b8b6e809 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Wed, 20 Mar 2024 10:30:35 +0000
Subject: [PATCH 0834/1688] Add changelog entry for #5758 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index da24aae7a35..a307eeabae9 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -7,6 +7,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 
 - ISO-8601 date time for GTFS API itinerary responses [#5660](https://github.com/opentripplanner/OpenTripPlanner/pull/5660)
 - Fix street routing on roundabout [#5732](https://github.com/opentripplanner/OpenTripPlanner/pull/5732)
+- Update Link in README.md [ci skip] [#5758](https://github.com/opentripplanner/OpenTripPlanner/pull/5758)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 07d8e877b4cdffbbb8fbce0226fd49982f2bd0f5 Mon Sep 17 00:00:00 2001
From: Henrik Abrahamsson 
Date: Wed, 20 Mar 2024 11:31:09 +0100
Subject: [PATCH 0835/1688] SiriAzureUpdaters: refactor initialization logic

- Remove duplicate retry logic
- Make sure that primed status is set correctly
---
 .../azure/AbstractAzureSiriUpdater.java       |  36 +++++-
 .../updater/azure/SiriAzureETUpdater.java     | 120 +++++++-----------
 .../SiriAzureInitializationException.java     |   8 ++
 .../updater/azure/SiriAzureSXUpdater.java     | 113 +++++++----------
 4 files changed, 129 insertions(+), 148 deletions(-)
 create mode 100644 src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java

diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
index 3a600a755b1..f24999eb521 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
@@ -13,15 +13,18 @@
 import com.azure.messaging.servicebus.models.ServiceBusReceiveMode;
 import com.google.common.base.Preconditions;
 import com.google.common.io.CharStreams;
+import jakarta.xml.bind.JAXBException;
 import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
+import javax.xml.stream.XMLStreamException;
 import org.opentripplanner.ext.siri.EntityResolver;
 import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher;
 import org.opentripplanner.framework.application.ApplicationShutdownSupport;
@@ -32,8 +35,10 @@
 import org.opentripplanner.updater.spi.GraphUpdater;
 import org.opentripplanner.updater.spi.HttpHeaders;
 import org.opentripplanner.updater.spi.WriteToGraphCallback;
+import org.rutebanken.siri20.util.SiriXml;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import uk.org.siri.siri20.ServiceDelivery;
 
 public abstract class AbstractAzureSiriUpdater implements GraphUpdater {
 
@@ -157,6 +162,7 @@ public void run() {
         .topicName(topicName)
         .subscriptionName(subscriptionName)
         .receiveMode(ServiceBusReceiveMode.RECEIVE_AND_DELETE)
+        .disableAutoComplete() // Receive and delete does not need autocomplete
         .prefetchCount(prefetchCount)
         .processError(errorConsumer)
         .processMessage(messageConsumer)
@@ -170,6 +176,8 @@ public void run() {
       prefetchCount
     );
 
+    setPrimed();
+
     ApplicationShutdownSupport.addShutdownHook(
       "azure-siri-updater-shutdown",
       () -> {
@@ -186,8 +194,8 @@ public boolean isPrimed() {
     return this.isPrimed;
   }
 
-  public void setPrimed(boolean primed) {
-    isPrimed = primed;
+  private void setPrimed() {
+    isPrimed = true;
   }
 
   @Override
@@ -195,11 +203,16 @@ public String getConfigRef() {
     return this.configRef;
   }
 
-  protected String fetchInitialData(URI uri) {
+  /**
+   * Returns None for empty result
+   */
+  protected Optional fetchInitialSiriData(URI uri) {
     // Maybe put this in the config?
     HttpHeaders rh = HttpHeaders.of().acceptApplicationXML().build();
     String initialData;
+
     try (OtpHttpClient otpHttpClient = new OtpHttpClient()) {
+      var t1 = System.currentTimeMillis();
       initialData =
         otpHttpClient.getAndMap(
           uri,
@@ -207,8 +220,21 @@ protected String fetchInitialData(URI uri) {
           rh.asMap(),
           is -> CharStreams.toString(new InputStreamReader(is))
         );
+      final long t2 = System.currentTimeMillis();
+
+      LOG.info(
+        "Fetching initial data - finished after {} ms, got {} bytes",
+        (t2 - t1),
+        initialData.length()
+      );
+    }
+
+    try {
+      var serviceDelivery = SiriXml.parseXml(initialData).getServiceDelivery();
+      return Optional.ofNullable(serviceDelivery);
+    } catch (JAXBException | XMLStreamException e) {
+      throw new SiriAzureInitializationException("Could not parse history message", e);
     }
-    return initialData;
   }
 
   SiriFuzzyTripMatcher fuzzyTripMatcher() {
@@ -232,7 +258,7 @@ private void initializeData() {
         initializeData(dataInitializationUrl, messageConsumer);
         break;
       } catch (Exception e) {
-        sleepPeriod = sleepPeriod * 2;
+        sleepPeriod = Math.min(sleepPeriod * 2, 60 * 1000);
 
         LOG.warn(
           "Caught exception while initializing data will retry after {} ms - attempt {}. ({})",
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
index 4b9a86618a5..76d75cd5576 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
@@ -5,19 +5,17 @@
 import jakarta.xml.bind.JAXBException;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.time.Duration;
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import javax.xml.stream.XMLStreamException;
 import org.apache.hc.core5.net.URIBuilder;
 import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource;
-import org.opentripplanner.framework.time.DurationUtils;
 import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.updater.spi.ResultLogger;
 import org.opentripplanner.updater.spi.UpdateResult;
@@ -26,6 +24,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure;
+import uk.org.siri.siri20.ServiceDelivery;
 
 public class SiriAzureETUpdater extends AbstractAzureSiriUpdater {
 
@@ -36,8 +35,6 @@ public class SiriAzureETUpdater extends AbstractAzureSiriUpdater {
   private final LocalDate fromDateTime;
   private final SiriTimetableSnapshotSource snapshotSource;
 
-  private Instant startTime;
-
   private final Consumer recordMetrics;
 
   public SiriAzureETUpdater(
@@ -60,7 +57,14 @@ protected void messageConsumer(ServiceBusReceivedMessageContext messageContext)
       LOG.debug("Total SIRI-ET messages received={}", MESSAGE_COUNTER.get());
     }
 
-    processMessage(message.getBody().toString(), message.getMessageId());
+    try {
+      var updates = parseSiriEt(message.getBody().toString(), message.getMessageId());
+      if (!updates.isEmpty()) {
+        processMessage(updates);
+      }
+    } catch (JAXBException | XMLStreamException e) {
+      LOG.error(e.getLocalizedMessage(), e);
+    }
   }
 
   @Override
@@ -80,89 +84,53 @@ protected void initializeData(String url, Consumer updates = getUpdates(message, id);
+  private Future processMessage(List updates) {
+    return super.saveResultOnGraph.execute((graph, transitModel) -> {
+      var result = snapshotSource.applyEstimatedTimetable(
+        fuzzyTripMatcher(),
+        entityResolver(),
+        feedId,
+        false,
+        updates
+      );
+      ResultLogger.logUpdateResultErrors(feedId, "siri-et", result);
+      recordMetrics.accept(result);
+    });
+  }
 
-      if (updates.isEmpty()) {
-        return;
-      }
+  private void processHistory(ServiceDelivery siri) {
+    var updates = siri.getEstimatedTimetableDeliveries();
 
-      super.saveResultOnGraph.execute((graph, transitModel) -> {
-        var result = snapshotSource.applyEstimatedTimetable(
-          fuzzyTripMatcher(),
-          entityResolver(),
-          feedId,
-          false,
-          updates
-        );
-        ResultLogger.logUpdateResultErrors(feedId, "siri-et", result);
-        recordMetrics.accept(result);
-      });
-    } catch (JAXBException | XMLStreamException e) {
-      LOG.error(e.getLocalizedMessage(), e);
+    if (updates == null || updates.isEmpty()) {
+      LOG.info("Did not receive any ET messages from history endpoint");
+      return;
     }
-  }
 
-  private void processHistory(String message, String id) {
     try {
-      List updates = getUpdates(message, id);
-
-      if (updates.isEmpty()) {
-        LOG.info("Did not receive any ET messages from history endpoint");
-        return;
-      }
-
-      var f = super.saveResultOnGraph.execute((graph, transitModel) -> {
-        try {
-          long t1 = System.currentTimeMillis();
-          var result = snapshotSource.applyEstimatedTimetable(
-            fuzzyTripMatcher(),
-            entityResolver(),
-            feedId,
-            false,
-            updates
-          );
-          ResultLogger.logUpdateResultErrors(feedId, "siri-et", result);
-          recordMetrics.accept(result);
-
-          setPrimed(true);
-          LOG.info(
-            "Azure ET updater initialized after {} ms: [time since startup: {}]",
-            (System.currentTimeMillis() - t1),
-            DurationUtils.durationToStr(Duration.between(startTime, Instant.now()))
-          );
-        } catch (Exception e) {
-          LOG.error("Could not process ET history", e);
-        }
-      });
+      long t1 = System.currentTimeMillis();
+      var f = processMessage(updates);
       f.get();
-    } catch (JAXBException | XMLStreamException | ExecutionException | InterruptedException e) {
-      LOG.error(e.getLocalizedMessage(), e);
+      LOG.info("Azure ET updater initialized after {} ms", (System.currentTimeMillis() - t1));
+    } catch (ExecutionException | InterruptedException e) {
+      throw new SiriAzureInitializationException("Error applying history", e);
     }
   }
 
-  private List getUpdates(String message, String id)
+  private List parseSiriEt(String siriXmlMessage, String id)
     throws JAXBException, XMLStreamException {
-    var siri = SiriXml.parseXml(message);
+    var siri = SiriXml.parseXml(siriXmlMessage);
     if (
       siri.getServiceDelivery() == null ||
       siri.getServiceDelivery().getEstimatedTimetableDeliveries() == null ||
@@ -171,7 +139,7 @@ private List getUpdates(String message, Str
       if (siri.getHeartbeatNotification() != null) {
         LOG.debug("Received SIRI heartbeat message");
       } else {
-        LOG.warn("Empty Siri message {}: {}", id, message);
+        LOG.info("Empty Siri message {}: {}", id, siriXmlMessage);
       }
       return new ArrayList<>();
     }
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java
new file mode 100644
index 00000000000..ced913404b6
--- /dev/null
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureInitializationException.java
@@ -0,0 +1,8 @@
+package org.opentripplanner.ext.siri.updater.azure;
+
+public class SiriAzureInitializationException extends RuntimeException {
+
+  public SiriAzureInitializationException(String message, Throwable cause) {
+    super(message, cause);
+  }
+}
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
index 8d33035b971..1766b0ba1a3 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureSXUpdater.java
@@ -6,16 +6,16 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.Consumer;
 import javax.xml.stream.XMLStreamException;
 import org.apache.hc.core5.net.URIBuilder;
 import org.opentripplanner.ext.siri.SiriAlertsUpdateHandler;
-import org.opentripplanner.framework.time.DurationUtils;
 import org.opentripplanner.routing.impl.TransitAlertServiceImpl;
 import org.opentripplanner.routing.services.TransitAlertService;
 import org.opentripplanner.transit.service.TransitModel;
@@ -23,7 +23,7 @@
 import org.rutebanken.siri20.util.SiriXml;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import uk.org.siri.siri20.Siri;
+import uk.org.siri.siri20.ServiceDelivery;
 
 public class SiriAzureSXUpdater extends AbstractAzureSiriUpdater implements TransitAlertProvider {
 
@@ -34,7 +34,6 @@ public class SiriAzureSXUpdater extends AbstractAzureSiriUpdater implements Tran
   private static final transient AtomicLong messageCounter = new AtomicLong(0);
   private final LocalDate fromDateTime;
   private final LocalDate toDateTime;
-  private Instant startTime;
 
   public SiriAzureSXUpdater(SiriAzureSXUpdaterParameters config, TransitModel transitModel) {
     super(config, transitModel);
@@ -63,7 +62,16 @@ protected void messageConsumer(ServiceBusReceivedMessageContext messageContext)
     );
 
     messageCounter.incrementAndGet();
-    processMessage(message.getBody().toString(), message.getMessageId());
+
+    try {
+      var siriSx = parseSiriSx(message.getBody().toString(), message.getMessageId());
+      if (siriSx.isEmpty()) {
+        return;
+      }
+      processMessage(siriSx.get());
+    } catch (JAXBException | XMLStreamException e) {
+      LOG.error(e.getLocalizedMessage(), e);
+    }
   }
 
   @Override
@@ -75,36 +83,30 @@ protected void errorConsumer(ServiceBusErrorContext errorContext) {
   protected void initializeData(String url, Consumer consumer)
     throws URISyntaxException {
     if (url == null) {
-      LOG.info("No history url set up for Siri Azure Sx Updater");
+      LOG.info("No history url set up for Siri Azure SX Updater");
       return;
     }
-    while (!isPrimed()) {
-      startTime = Instant.now();
 
-      URI uri = new URIBuilder(url)
-        .addParameter("publishFromDateTime", fromDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE))
-        .addParameter("publishToDateTime", toDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE))
-        .build();
+    URI uri = new URIBuilder(url)
+      .addParameter("publishFromDateTime", fromDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE))
+      .addParameter("publishToDateTime", toDateTime.format(DateTimeFormatter.ISO_LOCAL_DATE))
+      .build();
 
-      LOG.info("Fetching initial Siri SX data from {}, timeout is {}ms", uri, timeout);
+    LOG.info("Fetching initial Siri SX data from {}, timeout is {}ms", uri, timeout);
+    var siri = fetchInitialSiriData(uri);
 
-      final long t1 = System.currentTimeMillis();
-      String string = fetchInitialData(uri);
-      final long t2 = System.currentTimeMillis();
-
-      LOG.info(
-        "Fetching initial data - finished after {} ms, got {} bytes",
-        (t2 - t1),
-        string.length()
-      );
-
-      // This is fine since runnables are scheduled after each other
-      processHistory(string, "SX-INITIAL-1");
+    if (siri.isEmpty()) {
+      LOG.info("Got empty SX response from history endpoint");
+      return;
     }
+
+    // This is fine since runnables are scheduled after each other
+    processHistory(siri.get());
   }
 
-  private Siri getSiri(String message, String id) throws XMLStreamException, JAXBException {
-    var siri = SiriXml.parseXml(message);
+  private Optional parseSiriSx(String xmlMessage, String id)
+    throws XMLStreamException, JAXBException {
+    var siri = SiriXml.parseXml(xmlMessage);
     if (
       siri.getServiceDelivery() == null ||
       siri.getServiceDelivery().getSituationExchangeDeliveries() == null ||
@@ -113,55 +115,32 @@ private Siri getSiri(String message, String id) throws XMLStreamException, JAXBE
       if (siri.getHeartbeatNotification() != null) {
         LOG.debug("Received SIRI heartbeat message");
       } else {
-        LOG.warn("Empty Siri message for messageId {}", id);
-        LOG.debug(message);
+        LOG.info("Empty Siri message for messageId {}", id);
       }
-      return null;
+      return Optional.empty();
     }
-    return siri;
+    return Optional.of(siri.getServiceDelivery());
   }
 
-  private void processMessage(String message, String id) {
-    try {
-      Siri siri = getSiri(message, id);
-      if (siri == null) {
-        return;
-      }
+  private Future processMessage(ServiceDelivery siriSx) {
+    return super.saveResultOnGraph.execute((graph, transitModel) -> updateHandler.update(siriSx));
+  }
 
-      super.saveResultOnGraph.execute((graph, transitModel) ->
-        updateHandler.update(siri.getServiceDelivery())
-      );
-    } catch (JAXBException | XMLStreamException e) {
-      LOG.error(e.getLocalizedMessage(), e);
+  private void processHistory(ServiceDelivery siri) {
+    var sx = siri.getSituationExchangeDeliveries();
+
+    if (sx == null || sx.isEmpty()) {
+      LOG.info("Did not receive any SX messages from history endpoint");
+      return;
     }
-  }
 
-  private void processHistory(String message, String id) {
     try {
-      Siri siri = getSiri(message, id);
-      if (siri == null) {
-        LOG.info("Did not receive any SX messages from history endpoint.");
-        return;
-      }
-
-      var f = super.saveResultOnGraph.execute((graph, transitModel) -> {
-        try {
-          long t1 = System.currentTimeMillis();
-          updateHandler.update(siri.getServiceDelivery());
-
-          LOG.info(
-            "Azure SX updater initialized after {} ms: [time since startup: {}]",
-            (System.currentTimeMillis() - t1),
-            DurationUtils.durationToStr(Duration.between(startTime, Instant.now()))
-          );
-          setPrimed(true);
-        } catch (Exception e) {
-          LOG.error("Could not process SX history", e);
-        }
-      });
+      var t1 = System.currentTimeMillis();
+      var f = processMessage(siri);
       f.get();
-    } catch (JAXBException | XMLStreamException | ExecutionException | InterruptedException e) {
-      LOG.error(e.getLocalizedMessage(), e);
+      LOG.info("Azure SX updater initialized. Took {} ms", (System.currentTimeMillis() - t1));
+    } catch (ExecutionException | InterruptedException e) {
+      throw new SiriAzureInitializationException("Error applying SX history", e);
     }
   }
 

From d93adc75a518431415c9d5d15ddbce185f6920ae Mon Sep 17 00:00:00 2001
From: Henrik Abrahamsson 
Date: Wed, 20 Mar 2024 14:15:27 +0100
Subject: [PATCH 0836/1688] Handle 204 No Response status in SiriAzure updaters

---
 .../updater/azure/AbstractAzureSiriUpdater.java   |  8 ++++++++
 .../framework/io/OtpHttpClient.java               |  4 +---
 .../io/OtpHttpClientStatusCodeException.java      | 15 +++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java

diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
index f24999eb521..f2ea647465c 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
@@ -29,6 +29,7 @@
 import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher;
 import org.opentripplanner.framework.application.ApplicationShutdownSupport;
 import org.opentripplanner.framework.io.OtpHttpClient;
+import org.opentripplanner.framework.io.OtpHttpClientStatusCodeException;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.transit.service.TransitService;
@@ -227,6 +228,13 @@ protected Optional fetchInitialSiriData(URI uri) {
         (t2 - t1),
         initialData.length()
       );
+    } catch (OtpHttpClientStatusCodeException e) {
+      // 204 No Response status is ok.
+      if (e.getStatusCode() == 204) {
+        LOG.info("Got status 204 No Response");
+        return Optional.empty();
+      }
+      throw e;
     }
 
     try {
diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
index c922cfcc4be..33ef72b121e 100644
--- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
+++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
@@ -320,9 +320,7 @@ public  T executeAndMap(
       headers,
       response -> {
         if (isFailedRequest(response)) {
-          throw new OtpHttpClientException(
-            "HTTP request failed with status code " + response.getCode()
-          );
+          throw new OtpHttpClientStatusCodeException(response.getCode());
         }
         if (response.getEntity() == null || response.getEntity().getContent() == null) {
           throw new OtpHttpClientException("HTTP request failed: empty response");
diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java
new file mode 100644
index 00000000000..e001f23b05e
--- /dev/null
+++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java
@@ -0,0 +1,15 @@
+package org.opentripplanner.framework.io;
+
+public class OtpHttpClientStatusCodeException extends OtpHttpClientException {
+
+  private final int statusCode;
+
+  public OtpHttpClientStatusCodeException(int statusCode) {
+    super("HTTP request failed with status code " + statusCode);
+    this.statusCode = statusCode;
+  }
+
+  public int getStatusCode() {
+    return statusCode;
+  }
+}

From 332d390e5b8aa8c3e262e7dd8660fbaa83284dcf Mon Sep 17 00:00:00 2001
From: Henrik Abrahamsson
 <127481124+habrahamsson-skanetrafiken@users.noreply.github.com>
Date: Wed, 20 Mar 2024 16:16:20 +0100
Subject: [PATCH 0837/1688] Apply logging suggestions from code review

Co-authored-by: Johan Torin 
---
 .../ext/siri/updater/azure/AbstractAzureSiriUpdater.java    | 6 +++---
 .../ext/siri/updater/azure/SiriAzureETUpdater.java          | 4 ++--
 .../ext/siri/updater/azure/SiriAzureSXUpdater.java          | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
index f2ea647465c..3301d625854 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
@@ -224,14 +224,14 @@ protected Optional fetchInitialSiriData(URI uri) {
       final long t2 = System.currentTimeMillis();
 
       LOG.info(
-        "Fetching initial data - finished after {} ms, got {} bytes",
+        "Fetching initial data, received {} bytes in {} ms.",
         (t2 - t1),
         initialData.length()
       );
     } catch (OtpHttpClientStatusCodeException e) {
-      // 204 No Response status is ok.
+      // 204 No Content status is ok.
       if (e.getStatusCode() == 204) {
-        LOG.info("Got status 204 No Response");
+        LOG.info("Got status 204 'No Content', handling gracefully.");
         return Optional.empty();
       }
       throw e;
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
index 76d75cd5576..699a89ddb4b 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java
@@ -84,7 +84,7 @@ protected void initializeData(String url, Consumer
Date: Wed, 20 Mar 2024 22:20:23 +0200
Subject: [PATCH 0838/1688] Add tests for TransitLayer

---
 .../transit/TransitLayerTest.java             | 201 ++++++++++++++++++
 1 file changed, 201 insertions(+)
 create mode 100644 src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java

diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
new file mode 100644
index 00000000000..9886ab5b9fc
--- /dev/null
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
@@ -0,0 +1,201 @@
+package org.opentripplanner.routing.algorithm.raptoradapter.transit;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.model.StopTime;
+import org.opentripplanner.transit.model._data.TransitModelForTest;
+import org.opentripplanner.transit.model.framework.Deduplicator;
+import org.opentripplanner.transit.model.network.RoutingTripPattern;
+import org.opentripplanner.transit.model.network.StopPattern;
+import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.timetable.TripTimes;
+import org.opentripplanner.transit.model.timetable.TripTimesFactory;
+
+class TransitLayerTest {
+
+  private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of();
+  private static final TripTimes TRIP_TIMES;
+
+  private static final RoutingTripPattern TRIP_PATTERN;
+
+  static {
+    var stop = TEST_MODEL.stop("TEST:STOP", 0, 0).build();
+    var stopTime = new StopTime();
+    stopTime.setStop(stop);
+    var stopPattern = new StopPattern(List.of(stopTime));
+    var route = TransitModelForTest.route("1").build();
+    TRIP_PATTERN =
+      TripPattern
+        .of(TransitModelForTest.id("P1"))
+        .withRoute(route)
+        .withStopPattern(stopPattern)
+        .build()
+        .getRoutingTripPattern();
+    TRIP_TIMES =
+      TripTimesFactory.tripTimes(
+        TransitModelForTest.trip("1").withRoute(route).build(),
+        List.of(new StopTime()),
+        new Deduplicator()
+      );
+  }
+
+  @Test
+  void testGetTripPatternsRunningOnDateCopy() {
+    var date = LocalDate.of(2024, 1, 1);
+
+    var tripPatternForDate = new TripPatternForDate(
+      TRIP_PATTERN,
+      List.of(TRIP_TIMES),
+      List.of(),
+      date
+    );
+    var tripPatterns = List.of(tripPatternForDate);
+    var transitLayer = new TransitLayer(
+      Map.of(date, tripPatterns),
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
+    var runningOnDate = transitLayer.getTripPatternsRunningOnDateCopy(date);
+    assertEquals(1, runningOnDate.size());
+    assertEquals(tripPatterns, runningOnDate);
+    assertFalse(tripPatterns == runningOnDate);
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.minusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.plusDays(1)).size());
+  }
+
+  @Test
+  void testGetTripPatternsForDate() {
+    var date = LocalDate.of(2024, 1, 1);
+
+    var tripPatternForDate = new TripPatternForDate(
+      TRIP_PATTERN,
+      List.of(TRIP_TIMES),
+      List.of(),
+      date
+    );
+    var tripPatterns = List.of(tripPatternForDate);
+    var transitLayer = new TransitLayer(
+      Map.of(date, tripPatterns),
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
+    var runningOnDate = transitLayer.getTripPatternsForDate(date);
+    assertEquals(1, runningOnDate.size());
+    assertEquals(tripPatterns, runningOnDate);
+    assertTrue(tripPatterns == runningOnDate);
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.minusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.plusDays(1)).size());
+  }
+
+  @Test
+  void testGetTripPatternsStartingOnDateCopyWithSameRunningAndServiceDate() {
+    var date = LocalDate.of(2024, 1, 1);
+
+    var tripPatternForDate = new TripPatternForDate(
+      TRIP_PATTERN,
+      List.of(TRIP_TIMES),
+      List.of(),
+      date
+    );
+    var transitLayer = new TransitLayer(
+      Map.of(date, List.of(tripPatternForDate)),
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
+    var startingOnDate = transitLayer.getTripPatternsStartingOnDateCopy(date);
+    assertEquals(1, startingOnDate.size());
+    assertEquals(tripPatternForDate, startingOnDate.getFirst());
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.minusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.plusDays(1)).size());
+  }
+
+  @Test
+  void testGetTripPatternsStartingOnDateCopyWithServiceRunningAfterMidnight() {
+    var runningDate = LocalDate.of(2024, 1, 1);
+    var serviceDate = runningDate.minusDays(1);
+
+    var tripPatternForDate = new TripPatternForDate(
+      TRIP_PATTERN,
+      List.of(TRIP_TIMES),
+      List.of(),
+      serviceDate
+    );
+    var transitLayer = new TransitLayer(
+      Map.of(runningDate, List.of(tripPatternForDate)),
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
+    var startingOnDate = transitLayer.getTripPatternsStartingOnDateCopy(serviceDate);
+    // starting date should be determined by service date, not running date which refers to the
+    // normal calendar date that the trip pattern is running on
+    assertEquals(1, startingOnDate.size());
+    assertEquals(tripPatternForDate, startingOnDate.getFirst());
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(runningDate).size());
+  }
+
+  @Test
+  void testGetTripPatternsStartingOnDateCopyWithServiceRunningBeforeAndAfterMidnight() {
+    // This is same as the service date
+    var firstRunningDate = LocalDate.of(2024, 1, 1);
+    var secondRunningDate = firstRunningDate.plusDays(1);
+
+    var tripPatternForDate = new TripPatternForDate(
+      TRIP_PATTERN,
+      List.of(TRIP_TIMES),
+      List.of(),
+      firstRunningDate
+    );
+    var transitLayer = new TransitLayer(
+      Map.ofEntries(
+        entry(firstRunningDate, List.of(tripPatternForDate)),
+        entry(secondRunningDate, List.of(tripPatternForDate))
+      ),
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null
+    );
+    var startingOnDate = transitLayer.getTripPatternsStartingOnDateCopy(firstRunningDate);
+    // Transit layer indexes trip patterns by running date and to get trip patterns for certain
+    // service date, we need to look up the trip patterns for the next running date as well, but
+    // we don't want to return duplicates
+    assertEquals(1, startingOnDate.size());
+    assertEquals(tripPatternForDate, startingOnDate.getFirst());
+    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(secondRunningDate).size());
+  }
+}

From a3d0e67ced2b8d3be6c6c8e9f98b8bf6f2a7b1ab Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Wed, 20 Mar 2024 22:51:39 +0200
Subject: [PATCH 0839/1688] Rename methods/fields and add docs

---
 .../raptoradapter/transit/TransitLayer.java   | 30 +++++++++---
 .../transit/TripPatternForDate.java           | 49 ++++++++++++-------
 .../frequency/TripFrequencyAlightSearch.java  |  2 +-
 .../frequency/TripFrequencyBoardSearch.java   |  2 +-
 .../transit/mappers/TransitLayerUpdater.java  |  6 +--
 ...aptorRoutingRequestTransitDataCreator.java |  6 ++-
 .../request/TripScheduleWithOffset.java       |  2 +-
 .../transit/TransitLayerTest.java             | 32 ++++++------
 .../support/AssertSpeedTestSetup.java         |  2 +-
 9 files changed, 83 insertions(+), 48 deletions(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
index 461c15e8f66..288f429a861 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java
@@ -22,6 +22,8 @@ public class TransitLayer {
   /**
    * Transit data required for routing, indexed by each local date(Graph TimeZone) it runs through.
    * A Trip "runs through" a date if any of its arrivals or departures is happening on that date.
+   * The same trip pattern can therefore have multiple running dates and trip pattern is not
+   * required to "run" on its service date.
    */
   private final HashMap> tripPatternsRunningOnDate;
 
@@ -94,7 +96,12 @@ public StopLocation getStopByIndex(int stop) {
     return stop == -1 ? null : this.stopModel.stopByIndex(stop);
   }
 
-  public Collection getTripPatternsForDate(LocalDate date) {
+  /**
+   * Returns trip patterns for the given running date. Running date is not necessarily the same
+   * as the service date. A Trip "runs through" a date if any of its arrivals or departures is
+   * happening on that date. Trip pattern can have multiple running dates.
+   */
+  public Collection getTripPatternsForRunningDate(LocalDate date) {
     return tripPatternsRunningOnDate.getOrDefault(date, List.of());
   }
 
@@ -112,17 +119,28 @@ public int getStopCount() {
     return stopModel.stopIndexSize();
   }
 
+  /**
+   * Returns a copy of the list of trip patterns for the given running date. Running date is not
+   * necessarily the same as the service date. A Trip "runs through" a date if any of its arrivals
+   * or departures is happening on that date. Trip pattern can have multiple running dates.
+   */
   public List getTripPatternsRunningOnDateCopy(LocalDate runningPeriodDate) {
     List tripPatternForDate = tripPatternsRunningOnDate.get(runningPeriodDate);
     return tripPatternForDate != null ? new ArrayList<>(tripPatternForDate) : new ArrayList<>();
   }
 
-  public List getTripPatternsStartingOnDateCopy(LocalDate date) {
-    List tripPatternsRunningOnDate = getTripPatternsRunningOnDateCopy(date);
-    tripPatternsRunningOnDate.addAll(getTripPatternsRunningOnDateCopy(date.plusDays(1)));
-    return tripPatternsRunningOnDate
+  /**
+   * Returns a copy of the list of trip patterns for the given service date. Service date is not
+   * necessarily the same as any of the trip pattern's running dates.
+   */
+  public List getTripPatternsOnServiceDateCopy(LocalDate date) {
+    List tripPatternsRunningOnDates = getTripPatternsRunningOnDateCopy(date);
+    // Trip pattern can run only after midnight. Therefore, we need to get the trip pattern's for
+    // the next running date as well and filter out duplicates.
+    tripPatternsRunningOnDates.addAll(getTripPatternsRunningOnDateCopy(date.plusDays(1)));
+    return tripPatternsRunningOnDates
       .stream()
-      .filter(t -> t.getLocalDate().equals(date))
+      .filter(t -> t.getServiceDate().equals(date))
       .distinct()
       .collect(Collectors.toList());
   }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
index b86314aa42c..1411424dfc6 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TripPatternForDate.java
@@ -43,16 +43,16 @@ public class TripPatternForDate implements Comparable {
    */
   private final FrequencyEntry[] frequencies;
 
-  /** The date for which the filtering was performed. */
-  private final LocalDate localDate;
+  /** The service date of the trip pattern. */
+  private final LocalDate serviceDate;
 
   /**
-   * The date on which the first trip departs.
+   * The running date on which the first trip departs. Not necessarily the same as the service date.
    */
   private final LocalDate startOfRunningPeriod;
 
   /**
-   * The date on which the last trip arrives.
+   * The running date on which the last trip arrives.
    */
   private final LocalDate endOfRunningPeriod;
 
@@ -60,19 +60,19 @@ public TripPatternForDate(
     RoutingTripPattern tripPattern,
     List tripTimes,
     List frequencies,
-    LocalDate localDate
+    LocalDate serviceDate
   ) {
     this.tripPattern = tripPattern;
     this.tripTimes = tripTimes.toArray(new TripTimes[0]);
     this.frequencies = frequencies.toArray(new FrequencyEntry[0]);
-    this.localDate = localDate;
+    this.serviceDate = serviceDate;
 
     // TODO: We expect a pattern only containing trips or frequencies, fix ability to merge
     if (hasFrequencies()) {
       this.startOfRunningPeriod =
         ServiceDateUtils
           .asDateTime(
-            localDate,
+            serviceDate,
             frequencies
               .stream()
               .mapToInt(frequencyEntry -> frequencyEntry.startTime)
@@ -84,7 +84,7 @@ public TripPatternForDate(
       this.endOfRunningPeriod =
         ServiceDateUtils
           .asDateTime(
-            localDate,
+            serviceDate,
             frequencies
               .stream()
               .mapToInt(frequencyEntry -> frequencyEntry.endTime)
@@ -96,11 +96,11 @@ public TripPatternForDate(
       // These depend on the tripTimes array being sorted
       var first = tripTimes.get(0);
       this.startOfRunningPeriod =
-        ServiceDateUtils.asDateTime(localDate, first.getDepartureTime(0)).toLocalDate();
+        ServiceDateUtils.asDateTime(serviceDate, first.getDepartureTime(0)).toLocalDate();
       var last = tripTimes.get(tripTimes.size() - 1);
       this.endOfRunningPeriod =
         ServiceDateUtils
-          .asDateTime(localDate, last.getArrivalTime(last.getNumStops() - 1))
+          .asDateTime(serviceDate, last.getArrivalTime(last.getNumStops() - 1))
           .toLocalDate();
       assertValidRunningPeriod(startOfRunningPeriod, endOfRunningPeriod, first, last);
     }
@@ -126,18 +126,31 @@ public TripTimes getTripTimes(int i) {
     return tripTimes[i];
   }
 
-  public LocalDate getLocalDate() {
-    return localDate;
+  /**
+   * The service date for which the trip pattern belongs to. Not necessarily the same as the start
+   * of the running period in cases where the trip pattern only runs after midnight.
+   */
+  public LocalDate getServiceDate() {
+    return serviceDate;
   }
 
   public int numberOfTripSchedules() {
     return tripTimes.length;
   }
 
+  /**
+   * The start of the running period. This is determined by the first departure time for this
+   * pattern. Not necessarily the same as the service date if the pattern runs after midnight.
+   */
   public LocalDate getStartOfRunningPeriod() {
     return startOfRunningPeriod;
   }
 
+  /**
+   * Returns the running dates. A Trip "runs through" a date if any of its arrivals or departures is
+   * happening on that date. The same trip pattern can therefore have multiple running dates and
+   * trip pattern is not required to "run" on its service date.
+   */
   public List getRunningPeriodDates() {
     // Add one day to ensure last day is included
     return startOfRunningPeriod
@@ -151,14 +164,14 @@ public boolean hasFrequencies() {
 
   @Override
   public int compareTo(TripPatternForDate other) {
-    return localDate.compareTo(other.localDate);
+    return serviceDate.compareTo(other.serviceDate);
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(
       tripPattern,
-      localDate,
+      serviceDate,
       Arrays.hashCode(tripTimes),
       Arrays.hashCode(frequencies)
     );
@@ -176,7 +189,7 @@ public boolean equals(Object o) {
 
     return (
       tripPattern.equals(that.tripPattern) &&
-      localDate.equals(that.localDate) &&
+      serviceDate.equals(that.serviceDate) &&
       Arrays.equals(tripTimes, that.tripTimes) &&
       Arrays.equals(frequencies, that.frequencies)
     );
@@ -184,7 +197,9 @@ public boolean equals(Object o) {
 
   @Override
   public String toString() {
-    return "TripPatternForDate{" + "tripPattern=" + tripPattern + ", localDate=" + localDate + '}';
+    return (
+      "TripPatternForDate{" + "tripPattern=" + tripPattern + ", serviceDate=" + serviceDate + '}'
+    );
   }
 
   @Nullable
@@ -214,7 +229,7 @@ public TripPatternForDate newWithFilteredTripTimes(Predicate filter)
       return this;
     }
 
-    return new TripPatternForDate(tripPattern, filteredTripTimes, filteredFrequencies, localDate);
+    return new TripPatternForDate(tripPattern, filteredTripTimes, filteredFrequencies, serviceDate);
   }
 
   private static void assertValidRunningPeriod(
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
index 451f51b2aa5..2f020e22cf5 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyAlightSearch.java
@@ -55,7 +55,7 @@ public RaptorBoardOrAlightEvent search(
             arrivalTime + headway,
             headway,
             offset,
-            pattern.getLocalDate()
+            pattern.getServiceDate()
           );
         }
       }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
index 897ce370a93..ea58e870547 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/frequency/TripFrequencyBoardSearch.java
@@ -54,7 +54,7 @@ public RaptorBoardOrAlightEvent search(
             departureTime - headway,
             headway,
             offset,
-            pattern.getLocalDate()
+            pattern.getServiceDate()
           );
         }
       }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
index bed27497587..fad5de83de0 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
@@ -96,7 +96,7 @@ public void update(
 
       if (!tripPatternsStartingOnDateMapCache.containsKey(date)) {
         Map map = realtimeTransitLayer
-          .getTripPatternsStartingOnDateCopy(date)
+          .getTripPatternsOnServiceDateCopy(date)
           .stream()
           .collect(Collectors.toMap(t -> t.getTripPattern().getPattern(), t -> t));
         tripPatternsStartingOnDateMapCache.put(date, map);
@@ -146,7 +146,7 @@ public void update(
           } else {
             LOG.debug(
               "NEW TripPatternForDate: {} - {}",
-              newTripPatternForDate.getLocalDate(),
+              newTripPatternForDate.getServiceDate(),
               newTripPatternForDate.getTripPattern().debugInfo()
             );
           }
@@ -179,7 +179,7 @@ public void update(
       }
 
       for (TripPatternForDate tripPatternForDate : previouslyUsedPatterns) {
-        if (tripPatternForDate.getLocalDate().equals(date)) {
+        if (tripPatternForDate.getServiceDate().equals(date)) {
           TripPattern pattern = tripPatternForDate.getTripPattern().getPattern();
           if (!pattern.isCreatedByRealtimeUpdater()) {
             continue;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
index 863a4ca9ae8..f987e4f7a21 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
@@ -120,7 +120,7 @@ static List merge(
       // Calculate offsets per date
       int[] offsets = new int[patternsSorted.length];
       for (int i = 0; i < patternsSorted.length; i++) {
-        LocalDate serviceDate = patternsSorted[i].getLocalDate();
+        LocalDate serviceDate = patternsSorted[i].getServiceDate();
         if (offsetCache.containsKey(serviceDate)) {
           offsets[i] = offsetCache.get(serviceDate);
         } else {
@@ -185,7 +185,9 @@ private static List filterActiveTripPatterns(
       filter.tripTimesPredicate(tripTimes, filter.hasSubModeFilters());
     Predicate tripTimesWithoutSubmodesPredicate = tripTimes ->
       filter.tripTimesPredicate(tripTimes, false);
-    Collection tripPatternsForDate = transitLayer.getTripPatternsForDate(date);
+    Collection tripPatternsForDate = transitLayer.getTripPatternsForRunningDate(
+      date
+    );
     List result = new ArrayList<>(tripPatternsForDate.size());
     for (TripPatternForDate p : tripPatternsForDate) {
       if (firstDay || p.getStartOfRunningPeriod().equals(date)) {
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
index 642dbd2d6e5..aca998b24ca 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/TripScheduleWithOffset.java
@@ -124,7 +124,7 @@ private void findTripTimes() {
 
       if (index < numSchedules) {
         this.tripTimes = tripPatternForDate.getTripTimes(index);
-        this.serviceDate = tripPatternForDate.getLocalDate();
+        this.serviceDate = tripPatternForDate.getServiceDate();
         this.secondsOffset = pattern.tripPatternForDateOffsets(i);
         return;
       }
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
index 9886ab5b9fc..7c674252e6a 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayerTest.java
@@ -72,12 +72,12 @@ void testGetTripPatternsRunningOnDateCopy() {
     assertEquals(1, runningOnDate.size());
     assertEquals(tripPatterns, runningOnDate);
     assertFalse(tripPatterns == runningOnDate);
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.minusDays(1)).size());
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.plusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsRunningOnDateCopy(date.minusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsRunningOnDateCopy(date.plusDays(1)).size());
   }
 
   @Test
-  void testGetTripPatternsForDate() {
+  void testGetTripPatternsForRunningDate() {
     var date = LocalDate.of(2024, 1, 1);
 
     var tripPatternForDate = new TripPatternForDate(
@@ -98,16 +98,16 @@ void testGetTripPatternsForDate() {
       null,
       null
     );
-    var runningOnDate = transitLayer.getTripPatternsForDate(date);
+    var runningOnDate = transitLayer.getTripPatternsForRunningDate(date);
     assertEquals(1, runningOnDate.size());
     assertEquals(tripPatterns, runningOnDate);
     assertTrue(tripPatterns == runningOnDate);
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.minusDays(1)).size());
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.plusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsForRunningDate(date.minusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsForRunningDate(date.plusDays(1)).size());
   }
 
   @Test
-  void testGetTripPatternsStartingOnDateCopyWithSameRunningAndServiceDate() {
+  void testGetTripPatternsOnServiceDateCopyWithSameRunningAndServiceDate() {
     var date = LocalDate.of(2024, 1, 1);
 
     var tripPatternForDate = new TripPatternForDate(
@@ -127,15 +127,15 @@ void testGetTripPatternsStartingOnDateCopyWithSameRunningAndServiceDate() {
       null,
       null
     );
-    var startingOnDate = transitLayer.getTripPatternsStartingOnDateCopy(date);
+    var startingOnDate = transitLayer.getTripPatternsOnServiceDateCopy(date);
     assertEquals(1, startingOnDate.size());
     assertEquals(tripPatternForDate, startingOnDate.getFirst());
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.minusDays(1)).size());
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(date.plusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(date.minusDays(1)).size());
+    assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(date.plusDays(1)).size());
   }
 
   @Test
-  void testGetTripPatternsStartingOnDateCopyWithServiceRunningAfterMidnight() {
+  void testGetTripPatternsOnServiceDateCopyWithServiceRunningAfterMidnight() {
     var runningDate = LocalDate.of(2024, 1, 1);
     var serviceDate = runningDate.minusDays(1);
 
@@ -156,16 +156,16 @@ void testGetTripPatternsStartingOnDateCopyWithServiceRunningAfterMidnight() {
       null,
       null
     );
-    var startingOnDate = transitLayer.getTripPatternsStartingOnDateCopy(serviceDate);
+    var startingOnDate = transitLayer.getTripPatternsOnServiceDateCopy(serviceDate);
     // starting date should be determined by service date, not running date which refers to the
     // normal calendar date that the trip pattern is running on
     assertEquals(1, startingOnDate.size());
     assertEquals(tripPatternForDate, startingOnDate.getFirst());
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(runningDate).size());
+    assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(runningDate).size());
   }
 
   @Test
-  void testGetTripPatternsStartingOnDateCopyWithServiceRunningBeforeAndAfterMidnight() {
+  void testGetTripPatternsOnServiceDateCopyWithServiceRunningBeforeAndAfterMidnight() {
     // This is same as the service date
     var firstRunningDate = LocalDate.of(2024, 1, 1);
     var secondRunningDate = firstRunningDate.plusDays(1);
@@ -190,12 +190,12 @@ void testGetTripPatternsStartingOnDateCopyWithServiceRunningBeforeAndAfterMidnig
       null,
       null
     );
-    var startingOnDate = transitLayer.getTripPatternsStartingOnDateCopy(firstRunningDate);
+    var startingOnDate = transitLayer.getTripPatternsOnServiceDateCopy(firstRunningDate);
     // Transit layer indexes trip patterns by running date and to get trip patterns for certain
     // service date, we need to look up the trip patterns for the next running date as well, but
     // we don't want to return duplicates
     assertEquals(1, startingOnDate.size());
     assertEquals(tripPatternForDate, startingOnDate.getFirst());
-    assertEquals(0, transitLayer.getTripPatternsStartingOnDateCopy(secondRunningDate).size());
+    assertEquals(0, transitLayer.getTripPatternsOnServiceDateCopy(secondRunningDate).size());
   }
 }
diff --git a/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java b/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
index 031df343a9a..4113d5979b1 100644
--- a/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
+++ b/src/test/java/org/opentripplanner/transit/speed_test/support/AssertSpeedTestSetup.java
@@ -15,7 +15,7 @@ public static void assertTestDateHasData(
   ) {
     int numberOfPatternForTestDate = transitModel
       .getTransitLayer()
-      .getTripPatternsForDate(config.testDate)
+      .getTripPatternsForRunningDate(config.testDate)
       .size();
 
     if (numberOfPatternForTestDate < 10) {

From 5132bf2be807378306ec41499b825abaae90f954 Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Thu, 21 Mar 2024 14:10:20 +0200
Subject: [PATCH 0840/1688] config doc fix, parentstation not shared

---
 doc-templates/sandbox/MapboxVectorTilesApi.md    |  2 +-
 .../DigitransitRealtimeStopPropertyMapper.java   |  8 +++++++-
 .../stops/DigitransitStopPropertyMapper.java     | 16 +++++++++++-----
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md
index 9fd3b9e4ba2..d64d9700da4 100644
--- a/doc-templates/sandbox/MapboxVectorTilesApi.md
+++ b/doc-templates/sandbox/MapboxVectorTilesApi.md
@@ -110,7 +110,7 @@ The feature must be configured in `router-config.json` as follows
         "mapper": "DigitransitRealtime",
         "maxZoom": 20,
         "minZoom": 14,
-        "cacheMaxSeconds": 600
+        "cacheMaxSeconds": 60
       },
       // This exists for backwards compatibility. At some point, we might want
       // to add a new real-time parking mapper with better translation support
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
index 55d67d28d71..47cf7210274 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java
@@ -35,7 +35,13 @@ protected Collection map(RegularStop stop) {
     Collection sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService);
     return ListUtils.combine(
       sharedKeyValues,
-      List.of(new KeyValue("closedByServiceAlert", noServiceAlert))
+      List.of(
+        new KeyValue("closedByServiceAlert", noServiceAlert),
+        new KeyValue(
+          "parentStation",
+          stop.getParentStation() != null ? stop.getParentStation().getId() : null
+        )
+      )
     );
   }
 }
diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
index 2568f1fbc9b..e9c40e43ba8 100644
--- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
+++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java
@@ -9,6 +9,7 @@
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.opentripplanner.apis.support.mapping.PropertyMapper;
+import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.framework.i18n.I18NStringMapper;
 import org.opentripplanner.inspector.vector.KeyValue;
 import org.opentripplanner.transit.model.network.TripPattern;
@@ -34,7 +35,16 @@ protected static DigitransitStopPropertyMapper create(
 
   @Override
   protected Collection map(RegularStop stop) {
-    return getBaseKeyValues(stop, i18NStringMapper, transitService);
+    Collection sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService);
+    return ListUtils.combine(
+      sharedKeyValues,
+      List.of(
+        new KeyValue(
+          "parentStation",
+          stop.getParentStation() != null ? stop.getParentStation().getId() : "null"
+        )
+      )
+    );
   }
 
   protected static Collection getBaseKeyValues(
@@ -48,10 +58,6 @@ protected static Collection getBaseKeyValues(
       new KeyValue("code", stop.getCode()),
       new KeyValue("platform", stop.getPlatformCode()),
       new KeyValue("desc", i18NStringMapper.mapToApi(stop.getDescription())),
-      new KeyValue(
-        "parentStation",
-        stop.getParentStation() != null ? stop.getParentStation().getId() : null
-      ),
       new KeyValue("type", getType(transitService, stop)),
       new KeyValue("routes", getRoutes(transitService, stop))
     );

From a408f01d4c8b935ad65bc6f89fd1ef0acea2fd5e Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Thu, 21 Mar 2024 14:10:56 +0200
Subject: [PATCH 0841/1688] Revert "docs generation"

This reverts commit 89e82e96567f2a72531f75e74a03a0bde845b239.
---
 .../gtfs/generated/GraphQLDataFetchers.java    | 18 +-----------------
 .../apis/gtfs/generated/GraphQLTypes.java      |  1 -
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
index 8bc83ce1108..2f39f7f4030 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
@@ -2,8 +2,6 @@
 package org.opentripplanner.apis.gtfs.generated;
 
 import graphql.relay.Connection;
-import graphql.relay.Connection;
-import graphql.relay.Edge;
 import graphql.relay.Edge;
 import graphql.schema.DataFetcher;
 import graphql.schema.TypeResolver;
@@ -23,12 +21,8 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode;
 import org.opentripplanner.apis.gtfs.model.RideHailingProvider;
-import org.opentripplanner.apis.gtfs.model.RouteTypeModel;
-import org.opentripplanner.apis.gtfs.model.StopOnRouteModel;
-import org.opentripplanner.apis.gtfs.model.StopOnTripModel;
 import org.opentripplanner.apis.gtfs.model.StopPosition;
 import org.opentripplanner.apis.gtfs.model.TripOccupancy;
-import org.opentripplanner.apis.gtfs.model.UnknownModel;
 import org.opentripplanner.ext.fares.model.FareRuleSet;
 import org.opentripplanner.ext.ridehailing.model.RideEstimate;
 import org.opentripplanner.model.StopTimesInPattern;
@@ -50,8 +44,6 @@
 import org.opentripplanner.routing.graphfinder.PatternAtStop;
 import org.opentripplanner.routing.graphfinder.PlaceAtDistance;
 import org.opentripplanner.routing.vehicle_parking.VehicleParking;
-import org.opentripplanner.routing.vehicle_parking.VehicleParking;
-import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingState;
 import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle;
@@ -62,7 +54,6 @@
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
-import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle;
 import org.opentripplanner.transit.model.basic.Money;
 import org.opentripplanner.transit.model.network.Route;
@@ -1244,10 +1235,6 @@ public interface GraphQLElevationProfileComponent {
     public DataFetcher elevation();
   }
 
-  /**
-   * This type is only here for backwards-compatibility and this API will never return it anymore.
-   * Please use the leg's `fareProducts` instead.
-   */
   public interface GraphQLFare {
     public DataFetcher cents();
 
@@ -1258,10 +1245,7 @@ public interface GraphQLFare {
     public DataFetcher type();
   }
 
-  /**
-   * This type is only here for backwards-compatibility and this API will never return it anymore.
-   * Please use the leg's `fareProducts` instead.
-   */
+  /** Component of the fare (i.e. ticket) for a part of the itinerary */
   public interface GraphQLFareComponent {
     public DataFetcher cents();
 
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
index ffe37e77284..ecc038fec18 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
@@ -1,7 +1,6 @@
 // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 package org.opentripplanner.apis.gtfs.generated;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;

From e8f94883577d846917911698c36e406a53d9b023 Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Thu, 21 Mar 2024 14:20:16 +0200
Subject: [PATCH 0842/1688] docs generation

---
 docs/sandbox/MapboxVectorTilesApi.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md
index 11a09176d3b..a78b47e92ae 100644
--- a/docs/sandbox/MapboxVectorTilesApi.md
+++ b/docs/sandbox/MapboxVectorTilesApi.md
@@ -110,7 +110,7 @@ The feature must be configured in `router-config.json` as follows
         "mapper": "DigitransitRealtime",
         "maxZoom": 20,
         "minZoom": 14,
-        "cacheMaxSeconds": 600
+        "cacheMaxSeconds": 60
       },
       // This exists for backwards compatibility. At some point, we might want
       // to add a new real-time parking mapper with better translation support

From 678e2389e5bcc27ece62d1100d49d00a97eea969 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 21 Mar 2024 16:12:53 +0200
Subject: [PATCH 0843/1688] Fix allowedNetworks

---
 .../opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
index de167ff281c..3361e8a4410 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
@@ -395,7 +395,7 @@ private static void setBicycleRentalPreferences(
     if (args != null) {
       var allowedNetworks = args.getGraphQLAllowedNetworks();
       if (!CollectionUtils.isEmpty(allowedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
+        preferences.withAllowedNetworks(Set.copyOf(allowedNetworks));
       }
       var bannedNetworks = args.getGraphQLBannedNetworks();
       if (!CollectionUtils.isEmpty(bannedNetworks)) {

From 36809bee6a8a3590c80ec662e6558c1a291fe51a Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 21 Mar 2024 16:13:40 +0200
Subject: [PATCH 0844/1688] Add tests for bike preferences

---
 .../gtfs/mapping/RouteRequestMapperTest.java  | 253 ++++++++++++++++++
 1 file changed, 253 insertions(+)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
index ae2e3c57105..9704d6ca122 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
@@ -20,16 +20,19 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.opentripplanner._support.time.ZoneIds;
 import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
 import org.opentripplanner.apis.gtfs.TestRoutingService;
 import org.opentripplanner.ext.fares.impl.DefaultFareService;
+import org.opentripplanner.framework.model.Cost;
 import org.opentripplanner.model.plan.paging.cursor.PageCursor;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile;
+import org.opentripplanner.routing.core.VehicleRoutingOptimizeType;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graphfinder.GraphFinder;
 import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
@@ -334,6 +337,256 @@ void testItineraryFilters() {
     assertEquals(multiplier, itinFilter.groupedOtherThanSameLegsMaxCostMultiplier());
   }
 
+  @Test
+  void testBasicBikePreferences() {
+    var bicycleArgs = createArgsCopy();
+    var reluctance = 7.5;
+    var speed = 15d;
+    var boardCost = Cost.costOfSeconds(50);
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry("reluctance", reluctance),
+                entry("speed", speed),
+                entry("boardCost", boardCost)
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikePreferences = routeRequest.preferences().bike();
+    assertEquals(reluctance, bikePreferences.reluctance());
+    assertEquals(speed, bikePreferences.speed());
+    assertEquals(boardCost.toSeconds(), bikePreferences.boardCost());
+  }
+
+  @Test
+  void testBikeWalkPreferences() {
+    var bicycleArgs = createArgsCopy();
+    var walkSpeed = 7d;
+    var mountDismountTime = Duration.ofSeconds(23);
+    var mountDismountCost = Cost.costOfSeconds(35);
+    var walkReluctance = 6.3;
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "walk",
+                  Map.ofEntries(
+                    entry("speed", walkSpeed),
+                    entry("mountDismountTime", mountDismountTime),
+                    entry(
+                      "cost",
+                      Map.ofEntries(
+                        entry("mountDismountCost", mountDismountCost),
+                        entry("reluctance", walkReluctance)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikeWalkingPreferences = routeRequest.preferences().bike().walking();
+    assertEquals(walkSpeed, bikeWalkingPreferences.speed());
+    assertEquals(mountDismountTime, bikeWalkingPreferences.mountDismountTime());
+    assertEquals(mountDismountCost, bikeWalkingPreferences.mountDismountCost());
+    assertEquals(walkReluctance, bikeWalkingPreferences.reluctance());
+  }
+
+  @Test
+  void testBikeTrianglePreferences() {
+    var bicycleArgs = createArgsCopy();
+    var bikeSafety = 0.3;
+    var bikeFlatness = 0.5;
+    var bikeTime = 0.2;
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "optimization",
+                  Map.ofEntries(
+                    entry(
+                      "triangle",
+                      Map.ofEntries(
+                        entry("safety", bikeSafety),
+                        entry("flatness", bikeFlatness),
+                        entry("time", bikeTime)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikePreferences = routeRequest.preferences().bike();
+    assertEquals(VehicleRoutingOptimizeType.TRIANGLE, bikePreferences.optimizeType());
+    var bikeTrianglePreferences = bikePreferences.optimizeTriangle();
+    assertEquals(bikeSafety, bikeTrianglePreferences.safety());
+    assertEquals(bikeFlatness, bikeTrianglePreferences.slope());
+    assertEquals(bikeTime, bikeTrianglePreferences.time());
+  }
+
+  @Test
+  void testBikeOptimizationPreferences() {
+    var bicycleArgs = createArgsCopy();
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(entry("optimization", Map.ofEntries(entry("type", "SAFEST_STREETS"))))
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikePreferences = routeRequest.preferences().bike();
+    assertEquals(VehicleRoutingOptimizeType.SAFEST_STREETS, bikePreferences.optimizeType());
+  }
+
+  @Test
+  void testBikeRentalPreferences() {
+    var bicycleArgs = createArgsCopy();
+    var allowed = Set.of("foo", "bar");
+    var banned = Set.of("not");
+    var allowKeeping = true;
+    var keepingCost = Cost.costOfSeconds(150);
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "rental",
+                  Map.ofEntries(
+                    entry("allowedNetworks", allowed.stream().toList()),
+                    entry("bannedNetworks", banned.stream().toList()),
+                    entry(
+                      "destinationBicyclePolicy",
+                      Map.ofEntries(
+                        entry("allowKeeping", allowKeeping),
+                        entry("keepingCost", keepingCost)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikeRentalPreferences = routeRequest.preferences().bike().rental();
+    assertEquals(allowed, bikeRentalPreferences.allowedNetworks());
+    assertEquals(banned, bikeRentalPreferences.bannedNetworks());
+    assertEquals(allowKeeping, bikeRentalPreferences.allowArrivingInRentedVehicleAtDestination());
+    assertEquals(keepingCost, bikeRentalPreferences.arrivingInRentalVehicleAtDestinationCost());
+  }
+
+  @Test
+  void testBikeParkingPreferences() {
+    var bicycleArgs = createArgsCopy();
+    var unpreferredCost = Cost.costOfSeconds(150);
+    var notFilter = List.of("wheelbender");
+    var selectFilter = List.of("locker", "roof");
+    var unpreferred = List.of("bad");
+    var preferred = List.of("a", "b");
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "parking",
+                  Map.ofEntries(
+                    entry("unpreferredCost", unpreferredCost),
+                    entry(
+                      "filters",
+                      List.of(
+                        Map.ofEntries(
+                          entry("not", List.of(Map.of("tags", notFilter))),
+                          entry("select", List.of(Map.of("tags", selectFilter)))
+                        )
+                      )
+                    ),
+                    entry(
+                      "preferred",
+                      List.of(
+                        Map.ofEntries(
+                          entry("not", List.of(Map.of("tags", unpreferred))),
+                          entry("select", List.of(Map.of("tags", preferred)))
+                        )
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikeParkingPreferences = routeRequest.preferences().bike().parking();
+    assertEquals(unpreferredCost, bikeParkingPreferences.unpreferredVehicleParkingTagCost());
+    assertEquals(
+      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(notFilter, selectFilter),
+      bikeParkingPreferences.filter().toString()
+    );
+    assertEquals(
+      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(unpreferred, preferred),
+      bikeParkingPreferences.preferred().toString()
+    );
+  }
+
   private Map createArgsCopy() {
     Map newArgs = new HashMap<>();
     newArgs.putAll(args);

From 92c12647063e007e62129eb11a70e6b2fc47a7f5 Mon Sep 17 00:00:00 2001
From: OTP Serialization Version Bot
 
Date: Thu, 21 Mar 2024 15:01:33 +0000
Subject: [PATCH 0845/1688] Bump serialization version id for #5757

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 94c46d598a2..7f3e2a02692 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 
     
-        148
+        149
         
         31.0
         2.51

From ccc95e6eef1ef006b7d110b46e93212fb8eb6841 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 22 Mar 2024 09:32:06 +0100
Subject: [PATCH 0846/1688] Remove changelog itme [ci skip]

---
 docs/Changelog.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index a307eeabae9..da24aae7a35 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -7,7 +7,6 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 
 - ISO-8601 date time for GTFS API itinerary responses [#5660](https://github.com/opentripplanner/OpenTripPlanner/pull/5660)
 - Fix street routing on roundabout [#5732](https://github.com/opentripplanner/OpenTripPlanner/pull/5732)
-- Update Link in README.md [ci skip] [#5758](https://github.com/opentripplanner/OpenTripPlanner/pull/5758)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From aa8efd2e1778d087af97a0765f2c2ddc77eb2e9c Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 22 Mar 2024 10:02:36 +0100
Subject: [PATCH 0847/1688] Add validation of routeSortOrder

---
 .../opentripplanner/framework/lang/IntUtils.java    | 13 +++++++++++++
 .../transit/model/network/Route.java                |  9 ++++++++-
 .../framework/lang/IntUtilsTest.java                | 10 ++++++++++
 .../transit/model/network/RouteTest.java            |  2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/framework/lang/IntUtils.java b/src/main/java/org/opentripplanner/framework/lang/IntUtils.java
index 7be155308f9..de4904dcd7c 100644
--- a/src/main/java/org/opentripplanner/framework/lang/IntUtils.java
+++ b/src/main/java/org/opentripplanner/framework/lang/IntUtils.java
@@ -104,6 +104,19 @@ public static int requireInRange(int value, int minInclusive, int maxInclusive)
     return requireInRange(value, minInclusive, maxInclusive, null);
   }
 
+  /**
+   * Check if the given {@code value} is null or a non-negative integer.
+   *
+   * @throws IllegalArgumentException
+   */
+  public static Integer requireNullOrNotNegative(Integer value, String field) {
+    if (value == null) {
+      return null;
+    } else {
+      return requireNotNegative(value, field);
+    }
+  }
+
   public static int requireNotNegative(int value, String field) {
     if (value < 0) {
       throw new IllegalArgumentException(
diff --git a/src/main/java/org/opentripplanner/transit/model/network/Route.java b/src/main/java/org/opentripplanner/transit/model/network/Route.java
index 8101a430af6..721c6098ac8 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/Route.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/Route.java
@@ -10,6 +10,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import org.opentripplanner.framework.i18n.I18NString;
+import org.opentripplanner.framework.lang.IntUtils;
 import org.opentripplanner.transit.model.basic.SubMode;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
@@ -55,7 +56,7 @@ public final class Route extends AbstractTransitEntity impl
     this.branding = builder.getBranding();
     this.groupsOfRoutes = listOfNullSafe(builder.getGroupsOfRoutes());
     this.gtfsType = builder.getGtfsType();
-    this.gtfsSortOrder = builder.getGtfsSortOrder();
+    this.gtfsSortOrder = IntUtils.requireNullOrNotNegative(builder.getGtfsSortOrder(), "sortOrder");
     this.netexSubmode = SubMode.getOrBuildAndCacheForever(builder.getNetexSubmode());
     this.flexibleLineType = builder.getFlexibleLineType();
     this.description = builder.getDescription();
@@ -148,6 +149,12 @@ public Integer getGtfsType() {
     return gtfsType;
   }
 
+  /**
+   * The visual sort priority of this route when displayed in a graphical interface.
+   * A lower number means that the route has a higher priority.
+   * 
      
+   * Pass-through information from GTFS. This information is not used by OTP.
+   */
   @Nullable
   public Integer getGtfsSortOrder() {
     return gtfsSortOrder;
diff --git a/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java
index aa15e806fe6..3d5c92c9258 100644
--- a/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java
+++ b/src/test/java/org/opentripplanner/framework/lang/IntUtilsTest.java
@@ -2,6 +2,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.opentripplanner.framework.lang.IntUtils.concat;
 import static org.opentripplanner.framework.lang.IntUtils.intArray;
@@ -9,6 +10,7 @@
 import static org.opentripplanner.framework.lang.IntUtils.intToString;
 import static org.opentripplanner.framework.lang.IntUtils.requireInRange;
 import static org.opentripplanner.framework.lang.IntUtils.requireNotNegative;
+import static org.opentripplanner.framework.lang.IntUtils.requireNullOrNotNegative;
 import static org.opentripplanner.framework.lang.IntUtils.shiftArray;
 import static org.opentripplanner.framework.lang.IntUtils.standardDeviation;
 
@@ -102,6 +104,14 @@ void testRequireNotNegative() {
     assertEquals("Negative value not expected for value: -1", ex.getMessage());
   }
 
+  @Test
+  void testRequireNotNegativeOrNull() {
+    assertNull(requireNullOrNotNegative(null, "ok"));
+    assertEquals(5, requireNullOrNotNegative(5, "ok"));
+    assertEquals(0, requireNullOrNotNegative(0, "ok"));
+    assertThrows(IllegalArgumentException.class, () -> requireNullOrNotNegative(-5, "ok"));
+  }
+
   @Test
   void testRequireInRange() {
     // OK
diff --git a/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java b/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java
index d57ae8e3688..e21465547a1 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/RouteTest.java
@@ -128,7 +128,7 @@ void sameAs() {
     assertFalse(subject.sameAs(subject.copy().withColor("X").build()));
     assertFalse(subject.sameAs(subject.copy().withTextColor("X").build()));
     assertFalse(subject.sameAs(subject.copy().withGtfsType(-1).build()));
-    assertFalse(subject.sameAs(subject.copy().withGtfsSortOrder(-1).build()));
+    assertFalse(subject.sameAs(subject.copy().withGtfsSortOrder(99).build()));
     assertFalse(subject.sameAs(subject.copy().withFlexibleLineType("X").build()));
     assertFalse(subject.sameAs(subject.copy().withUrl("X").build()));
   }

From 02b6804a487188907492df3161a96c3d5bf61848 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 22 Mar 2024 10:18:38 +0100
Subject: [PATCH 0848/1688] Add sortOrder to schema and add tests

---
 docs/apis/GraphQL-Tutorial.md                 |   1 -
 .../apis/gtfs/datafetchers/RouteImpl.java     |   5 +
 .../gtfs/generated/GraphQLDataFetchers.java   |   5 +-
 .../opentripplanner/apis/gtfs/schema.graphqls |   6 +
 .../apis/gtfs/GraphQLIntegrationTest.java     |  12 ++
 .../gtfs/expectations/routes-extended.json    | 160 ++++++++++++++++++
 .../apis/gtfs/queries/routes-extended.graphql |  14 ++
 .../apis/gtfs/queries/routes.graphql          |   1 -
 8 files changed, 201 insertions(+), 3 deletions(-)
 create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
 create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql

diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md
index 92645f9b245..e8bf41032b9 100644
--- a/docs/apis/GraphQL-Tutorial.md
+++ b/docs/apis/GraphQL-Tutorial.md
@@ -41,7 +41,6 @@ GraphQL query in the left hand panel of the page:
             name
         }
         mode
-        bikesAllowed
     }
 }
 ```
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
index 56775024e0b..9f9b3c60b31 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
@@ -183,6 +183,11 @@ public DataFetcher shortName() {
     return environment -> getSource(environment).getShortName();
   }
 
+  @Override
+  public DataFetcher sortOrder() {
+    return env -> getSource(env).getGtfsSortOrder();
+  }
+
   @Override
   public DataFetcher> stops() {
     return this::getStops;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
index 7fab5720b9a..559acac920d 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
@@ -763,7 +763,8 @@ public interface GraphQLQueryType {
     public DataFetcher viewer();
   }
 
-  public interface GraphQLRealtimeEstimate {
+  /** Real-time estimates for a vehicle at a certain place. */
+  public interface GraphQLRealTimeEstimate {
     public DataFetcher delay();
 
     public DataFetcher time();
@@ -864,6 +865,8 @@ public interface GraphQLRoute {
 
     public DataFetcher shortName();
 
+    public DataFetcher sortOrder();
+
     public DataFetcher> stops();
 
     public DataFetcher textColor();
diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index c1189f21ba1..eb608f34c39 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -3426,6 +3426,12 @@ type Route implements Node {
         """
         types: [RouteAlertType]
     ): [Alert]
+
+    """
+    Orders the routes in a way which is ideal for presentation to passengers.
+    Routes with smaller values should be displayed first.
+    """
+    sortOrder: Int
 }
 
 """Entities that are relevant for routes that can contain alerts"""
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index f630e0cee3c..9fafac0b352 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -159,6 +159,7 @@ static void setup() {
           .route(m.name())
           .withMode(m)
           .withLongName(I18NString.of("Long name for %s".formatted(m)))
+          .withGtfsSortOrder(sortOrder(m))
           .build()
       )
       .toList();
@@ -283,6 +284,17 @@ public TransitAlertService getTransitAlertService() {
       );
   }
 
+  /**
+   * We want to provide a variety of numbers and null.
+   */
+  private static Integer sortOrder(TransitMode m) {
+    if (m.ordinal() == 0) {
+      return null;
+    } else {
+      return m.ordinal();
+    }
+  }
+
   private static void add10MinuteDelay(Itinerary i1) {
     i1.transformTransitLegs(tl -> {
       if (tl instanceof ScheduledTransitLeg stl) {
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
new file mode 100644
index 00000000000..d0528a51257
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
@@ -0,0 +1,160 @@
+{
+  "data" : {
+    "routes" : [
+      {
+        "longName" : "Long name for CARPOOL",
+        "shortName" : "RCARPOOL",
+        "gtfsId" : "F:CARPOOL",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "CARPOOL",
+        "sortOrder" : 12
+      },
+      {
+        "longName" : "Long name for SUBWAY",
+        "shortName" : "RSUBWAY",
+        "gtfsId" : "F:SUBWAY",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "SUBWAY",
+        "sortOrder" : 2
+      },
+      {
+        "longName" : "Long name for BUS",
+        "shortName" : "RBUS",
+        "gtfsId" : "F:BUS",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "BUS",
+        "sortOrder" : 3
+      },
+      {
+        "longName" : "Long name for FERRY",
+        "shortName" : "RFERRY",
+        "gtfsId" : "F:FERRY",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "FERRY",
+        "sortOrder" : 5
+      },
+      {
+        "longName" : "Long name for COACH",
+        "shortName" : "RCOACH",
+        "gtfsId" : "F:COACH",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "COACH",
+        "sortOrder" : 1
+      },
+      {
+        "longName" : "Long name for TRAM",
+        "shortName" : "RTRAM",
+        "gtfsId" : "F:TRAM",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "TRAM",
+        "sortOrder" : 4
+      },
+      {
+        "longName" : "Long name for CABLE_CAR",
+        "shortName" : "RCABLE_CAR",
+        "gtfsId" : "F:CABLE_CAR",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "CABLE_CAR",
+        "sortOrder" : 7
+      },
+      {
+        "longName" : "Long name for FUNICULAR",
+        "shortName" : "RFUNICULAR",
+        "gtfsId" : "F:FUNICULAR",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "FUNICULAR",
+        "sortOrder" : 9
+      },
+      {
+        "longName" : "Long name for RAIL",
+        "shortName" : "RRAIL",
+        "gtfsId" : "F:RAIL",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "RAIL",
+        "sortOrder" : null
+      },
+      {
+        "longName" : "Long name for MONORAIL",
+        "shortName" : "RMONORAIL",
+        "gtfsId" : "F:MONORAIL",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "MONORAIL",
+        "sortOrder" : 11
+      },
+      {
+        "longName" : "Long name for GONDOLA",
+        "shortName" : "RGONDOLA",
+        "gtfsId" : "F:GONDOLA",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "GONDOLA",
+        "sortOrder" : 8
+      },
+      {
+        "longName" : "Long name for TROLLEYBUS",
+        "shortName" : "RTROLLEYBUS",
+        "gtfsId" : "F:TROLLEYBUS",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "TROLLEYBUS",
+        "sortOrder" : 10
+      },
+      {
+        "longName" : "Long name for AIRPLANE",
+        "shortName" : "RAIRPLANE",
+        "gtfsId" : "F:AIRPLANE",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "AIRPLANE",
+        "sortOrder" : 6
+      },
+      {
+        "longName" : "Long name for TAXI",
+        "shortName" : "RTAXI",
+        "gtfsId" : "F:TAXI",
+        "agency" : {
+          "gtfsId" : "F:A1",
+          "name" : "Agency Test"
+        },
+        "mode" : "TAXI",
+        "sortOrder" : 13
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
new file mode 100644
index 00000000000..50d89980442
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
@@ -0,0 +1,14 @@
+{
+    routes {
+        longName
+        shortName
+        gtfsId
+        agency {
+            gtfsId
+            name
+        }
+        mode
+        sortOrder
+        bikesAllowed
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes.graphql
index 38585d6a836..66d7f370c3f 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes.graphql
@@ -8,6 +8,5 @@
             name
         }
         mode
-        bikesAllowed
     }
 }
\ No newline at end of file

From d2a0126ef39515ec6b7dcfd4dbeab89bde3dc7f5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 22 Mar 2024 10:34:04 +0100
Subject: [PATCH 0849/1688] Rename tutorial files

---
 .../resources/org/opentripplanner/apis/gtfs/schema.graphqls   | 2 +-
 .../opentripplanner/generate/doc/GraphQLTutorialDocTest.java  | 4 ++--
 .../apis/gtfs/expectations/{plan.json => plan-tutorial.json}  | 0
 .../gtfs/expectations/{routes.json => routes-tutorial.json}   | 0
 .../apis/gtfs/queries/{plan.graphql => plan-tutorial.graphql} | 0
 .../gtfs/queries/{routes.graphql => routes-tutorial.graphql}  | 0
 6 files changed, 3 insertions(+), 3 deletions(-)
 rename src/test/resources/org/opentripplanner/apis/gtfs/expectations/{plan.json => plan-tutorial.json} (100%)
 rename src/test/resources/org/opentripplanner/apis/gtfs/expectations/{routes.json => routes-tutorial.json} (100%)
 rename src/test/resources/org/opentripplanner/apis/gtfs/queries/{plan.graphql => plan-tutorial.graphql} (100%)
 rename src/test/resources/org/opentripplanner/apis/gtfs/queries/{routes.graphql => routes-tutorial.graphql} (100%)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index eb608f34c39..cfa764b615e 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -3428,7 +3428,7 @@ type Route implements Node {
     ): [Alert]
 
     """
-    Orders the routes in a way which is ideal for presentation to passengers.
+    Orders the routes in a way which is useful for presentation to passengers.
     Routes with smaller values should be displayed first.
     """
     sortOrder: Int
diff --git a/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java b/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java
index 5e858ff4d61..3597844a027 100644
--- a/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/GraphQLTutorialDocTest.java
@@ -37,8 +37,8 @@ public void updateTutorialDoc() throws IOException {
     String doc = readFile(TEMPLATE);
     String original = readFile(OUT_FILE);
 
-    var routeQuery = getGraphQlQuery("routes.graphql");
-    var planQuery = getGraphQlQuery("plan.graphql");
+    var routeQuery = getGraphQlQuery("routes-tutorial.graphql");
+    var planQuery = getGraphQlQuery("plan-tutorial.graphql");
 
     doc = replaceSection(doc, "route-query", routeQuery);
     doc = replaceSection(doc, "plan-query", planQuery);
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-tutorial.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan.json
rename to src/test/resources/org/opentripplanner/apis/gtfs/expectations/plan-tutorial.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes.json
rename to src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-tutorial.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/plan.graphql
rename to src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-tutorial.graphql
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql
similarity index 100%
rename from src/test/resources/org/opentripplanner/apis/gtfs/queries/routes.graphql
rename to src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql

From 4f73e2b26c4af98e6ebb52ee12a0ce52a5d00d09 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 22 Mar 2024 10:53:25 +0100
Subject: [PATCH 0850/1688] Add variety to bikesAllowed values

---
 .../apis/gtfs/GraphQLIntegrationTest.java     | 10 +++++
 .../gtfs/expectations/routes-extended.json    | 42 ++++++++++++-------
 .../gtfs/expectations/routes-tutorial.json    | 42 +++++++------------
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index 9fafac0b352..2f26dc34dc8 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -82,6 +82,7 @@
 import org.opentripplanner.transit.model.framework.AbstractBuilder;
 import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.network.BikeAccess;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.StopLocation;
@@ -160,6 +161,7 @@ static void setup() {
           .withMode(m)
           .withLongName(I18NString.of("Long name for %s".formatted(m)))
           .withGtfsSortOrder(sortOrder(m))
+          .withBikesAllowed(bikesAllowed(m))
           .build()
       )
       .toList();
@@ -284,6 +286,14 @@ public TransitAlertService getTransitAlertService() {
       );
   }
 
+  private static BikeAccess bikesAllowed(TransitMode m) {
+    return switch (m.ordinal() % 3) {
+      case 0 -> BikeAccess.ALLOWED;
+      case 1 -> BikeAccess.NOT_ALLOWED;
+      default -> BikeAccess.UNKNOWN;
+    };
+  }
+
   /**
    * We want to provide a variety of numbers and null.
    */
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
index d0528a51257..8739eab0045 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json
@@ -10,7 +10,8 @@
           "name" : "Agency Test"
         },
         "mode" : "CARPOOL",
-        "sortOrder" : 12
+        "sortOrder" : 12,
+        "bikesAllowed" : "ALLOWED"
       },
       {
         "longName" : "Long name for SUBWAY",
@@ -21,7 +22,8 @@
           "name" : "Agency Test"
         },
         "mode" : "SUBWAY",
-        "sortOrder" : 2
+        "sortOrder" : 2,
+        "bikesAllowed" : "NO_INFORMATION"
       },
       {
         "longName" : "Long name for BUS",
@@ -32,7 +34,8 @@
           "name" : "Agency Test"
         },
         "mode" : "BUS",
-        "sortOrder" : 3
+        "sortOrder" : 3,
+        "bikesAllowed" : "ALLOWED"
       },
       {
         "longName" : "Long name for FERRY",
@@ -43,7 +46,8 @@
           "name" : "Agency Test"
         },
         "mode" : "FERRY",
-        "sortOrder" : 5
+        "sortOrder" : 5,
+        "bikesAllowed" : "NO_INFORMATION"
       },
       {
         "longName" : "Long name for COACH",
@@ -54,7 +58,8 @@
           "name" : "Agency Test"
         },
         "mode" : "COACH",
-        "sortOrder" : 1
+        "sortOrder" : 1,
+        "bikesAllowed" : "NOT_ALLOWED"
       },
       {
         "longName" : "Long name for TRAM",
@@ -65,7 +70,8 @@
           "name" : "Agency Test"
         },
         "mode" : "TRAM",
-        "sortOrder" : 4
+        "sortOrder" : 4,
+        "bikesAllowed" : "NOT_ALLOWED"
       },
       {
         "longName" : "Long name for CABLE_CAR",
@@ -76,7 +82,8 @@
           "name" : "Agency Test"
         },
         "mode" : "CABLE_CAR",
-        "sortOrder" : 7
+        "sortOrder" : 7,
+        "bikesAllowed" : "NOT_ALLOWED"
       },
       {
         "longName" : "Long name for FUNICULAR",
@@ -87,7 +94,8 @@
           "name" : "Agency Test"
         },
         "mode" : "FUNICULAR",
-        "sortOrder" : 9
+        "sortOrder" : 9,
+        "bikesAllowed" : "ALLOWED"
       },
       {
         "longName" : "Long name for RAIL",
@@ -98,7 +106,8 @@
           "name" : "Agency Test"
         },
         "mode" : "RAIL",
-        "sortOrder" : null
+        "sortOrder" : null,
+        "bikesAllowed" : "ALLOWED"
       },
       {
         "longName" : "Long name for MONORAIL",
@@ -109,7 +118,8 @@
           "name" : "Agency Test"
         },
         "mode" : "MONORAIL",
-        "sortOrder" : 11
+        "sortOrder" : 11,
+        "bikesAllowed" : "NO_INFORMATION"
       },
       {
         "longName" : "Long name for GONDOLA",
@@ -120,7 +130,8 @@
           "name" : "Agency Test"
         },
         "mode" : "GONDOLA",
-        "sortOrder" : 8
+        "sortOrder" : 8,
+        "bikesAllowed" : "NO_INFORMATION"
       },
       {
         "longName" : "Long name for TROLLEYBUS",
@@ -131,7 +142,8 @@
           "name" : "Agency Test"
         },
         "mode" : "TROLLEYBUS",
-        "sortOrder" : 10
+        "sortOrder" : 10,
+        "bikesAllowed" : "NOT_ALLOWED"
       },
       {
         "longName" : "Long name for AIRPLANE",
@@ -142,7 +154,8 @@
           "name" : "Agency Test"
         },
         "mode" : "AIRPLANE",
-        "sortOrder" : 6
+        "sortOrder" : 6,
+        "bikesAllowed" : "ALLOWED"
       },
       {
         "longName" : "Long name for TAXI",
@@ -153,7 +166,8 @@
           "name" : "Agency Test"
         },
         "mode" : "TAXI",
-        "sortOrder" : 13
+        "sortOrder" : 13,
+        "bikesAllowed" : "NOT_ALLOWED"
       }
     ]
   }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
index d6cb1b481ed..e2bdb289c32 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-tutorial.json
@@ -9,8 +9,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "CARPOOL",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "CARPOOL"
       },
       {
         "longName" : "Long name for SUBWAY",
@@ -20,8 +19,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "SUBWAY",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "SUBWAY"
       },
       {
         "longName" : "Long name for BUS",
@@ -31,8 +29,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "BUS",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "BUS"
       },
       {
         "longName" : "Long name for FERRY",
@@ -42,8 +39,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "FERRY",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "FERRY"
       },
       {
         "longName" : "Long name for COACH",
@@ -53,8 +49,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "COACH",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "COACH"
       },
       {
         "longName" : "Long name for TRAM",
@@ -64,8 +59,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "TRAM",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "TRAM"
       },
       {
         "longName" : "Long name for CABLE_CAR",
@@ -75,8 +69,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "CABLE_CAR",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "CABLE_CAR"
       },
       {
         "longName" : "Long name for FUNICULAR",
@@ -86,8 +79,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "FUNICULAR",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "FUNICULAR"
       },
       {
         "longName" : "Long name for RAIL",
@@ -97,8 +89,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "RAIL",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "RAIL"
       },
       {
         "longName" : "Long name for MONORAIL",
@@ -108,8 +99,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "MONORAIL",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "MONORAIL"
       },
       {
         "longName" : "Long name for GONDOLA",
@@ -119,8 +109,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "GONDOLA",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "GONDOLA"
       },
       {
         "longName" : "Long name for TROLLEYBUS",
@@ -130,8 +119,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "TROLLEYBUS",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "TROLLEYBUS"
       },
       {
         "longName" : "Long name for AIRPLANE",
@@ -141,8 +129,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "AIRPLANE",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "AIRPLANE"
       },
       {
         "longName" : "Long name for TAXI",
@@ -152,8 +139,7 @@
           "gtfsId" : "F:A1",
           "name" : "Agency Test"
         },
-        "mode" : "TAXI",
-        "bikesAllowed" : "NO_INFORMATION"
+        "mode" : "TAXI"
       }
     ]
   }

From 6f105e98243a9a23192fbcd7034b016a517477ee Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 22 Mar 2024 11:08:25 +0100
Subject: [PATCH 0851/1688] Improve documentation about taking bikes on transit
 [ci skip]

---
 docs/RoutingModes.md                                       | 4 ++++
 .../opentripplanner/routing/api/request/StreetMode.java    | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docs/RoutingModes.md b/docs/RoutingModes.md
index 6267b4b0321..0895e019716 100644
--- a/docs/RoutingModes.md
+++ b/docs/RoutingModes.md
@@ -13,6 +13,10 @@ Routing modes on streets, including walking, biking, driving, and car-sharing.
 
 Cycling for the entirety of the route or taking a bicycle onto the public transport and cycling from the arrival station to the destination.
 
+Taking a bicycle onto transit is only possible if information about the permission to do so is supplied in the source data. In GTFS this field
+is called `bikesAllowed`.
+
+
 
      BIKE_RENTAL
      
 
 Taking a rented, shared-mobility bike for part or the entirety of the route.
diff --git a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java
index 47073aa7eeb..56e716d9d62 100644
--- a/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java
+++ b/src/main/java/org/opentripplanner/routing/api/request/StreetMode.java
@@ -143,7 +143,12 @@ public String enumValueDescription() {
     return switch (this) {
       case NOT_SET -> "";
       case WALK -> "Walking some or all of the way of the route.";
-      case BIKE -> "Cycling for the entirety of the route or taking a bicycle onto the public transport and cycling from the arrival station to the destination.";
+      case BIKE -> """
+        Cycling for the entirety of the route or taking a bicycle onto the public transport and cycling from the arrival station to the destination.
+
+        Taking a bicycle onto transit is only possible if information about the permission to do so is supplied in the source data. In GTFS this field
+        is called `bikesAllowed`.
+        """;
       case BIKE_TO_PARK -> """
         Leaving the bicycle at the departure station and walking from the arrival station to the destination.
         This mode needs to be combined with at least one transit mode otherwise it behaves like an ordinary bicycle journey.

From d52c5c42a7c6acf258d7241c3a15e56766a942c9 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 22 Mar 2024 14:32:45 +0200
Subject: [PATCH 0852/1688] Create own package for route request mapping

---
 .../apis/gtfs/datafetchers/QueryTypeImpl.java               | 4 ++--
 .../gtfs/mapping/{ => routerequest}/AccessModeMapper.java   | 2 +-
 .../gtfs/mapping/{ => routerequest}/DirectModeMapper.java   | 2 +-
 .../gtfs/mapping/{ => routerequest}/EgressModeMapper.java   | 2 +-
 .../ItineraryFilterDebugProfileMapper.java                  | 2 +-
 .../{ => routerequest}/LegacyRouteRequestMapper.java        | 6 +++---
 .../mapping/{ => routerequest}/OptimizationTypeMapper.java  | 2 +-
 .../gtfs/mapping/{ => routerequest}/RouteRequestMapper.java | 3 ++-
 .../gtfs/mapping/{ => routerequest}/TransferModeMapper.java | 2 +-
 .../{ => routerequest}/VehicleOptimizationTypeMapper.java   | 2 +-
 .../{ => routerequest}/LegacyRouteRequestMapperTest.java    | 2 +-
 .../mapping/{ => routerequest}/RouteRequestMapperTest.java  | 2 +-
 12 files changed, 16 insertions(+), 15 deletions(-)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/AccessModeMapper.java (92%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/DirectModeMapper.java (92%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/EgressModeMapper.java (91%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/ItineraryFilterDebugProfileMapper.java (92%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/LegacyRouteRequestMapper.java (98%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/OptimizationTypeMapper.java (91%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/RouteRequestMapper.java (99%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/TransferModeMapper.java (87%)
 rename src/main/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/VehicleOptimizationTypeMapper.java (94%)
 rename src/test/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/LegacyRouteRequestMapperTest.java (99%)
 rename src/test/java/org/opentripplanner/apis/gtfs/mapping/{ => routerequest}/RouteRequestMapperTest.java (99%)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
index c63882561e9..eae4bc2ad33 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
@@ -30,8 +30,8 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLQueryTypeStopsByRadiusArgs;
-import org.opentripplanner.apis.gtfs.mapping.LegacyRouteRequestMapper;
-import org.opentripplanner.apis.gtfs.mapping.RouteRequestMapper;
+import org.opentripplanner.apis.gtfs.mapping.routerequest.LegacyRouteRequestMapper;
+import org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapper;
 import org.opentripplanner.ext.fares.impl.DefaultFareService;
 import org.opentripplanner.ext.fares.impl.GtfsFaresService;
 import org.opentripplanner.ext.fares.model.FareRuleSet;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/AccessModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java
similarity index 92%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/AccessModeMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java
index 5b26c8d5ee1..ac4c90a1a56 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/AccessModeMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/AccessModeMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.routing.api.request.StreetMode;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/DirectModeMapper.java
similarity index 92%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectModeMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/DirectModeMapper.java
index 2e7fcee3d2f..e34e7ad2aed 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/DirectModeMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/DirectModeMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.routing.api.request.StreetMode;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/EgressModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java
similarity index 91%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/EgressModeMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java
index 4033b3e516d..f03b160ac97 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/EgressModeMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/EgressModeMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.routing.api.request.StreetMode;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/ItineraryFilterDebugProfileMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ItineraryFilterDebugProfileMapper.java
similarity index 92%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/ItineraryFilterDebugProfileMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ItineraryFilterDebugProfileMapper.java
index 40242783755..7a83388ff1e 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/ItineraryFilterDebugProfileMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ItineraryFilterDebugProfileMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
similarity index 98%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
index c790fa72656..22c3ef628e2 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
@@ -1,7 +1,7 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
-import static org.opentripplanner.apis.gtfs.mapping.RouteRequestMapper.parseNotFilters;
-import static org.opentripplanner.apis.gtfs.mapping.RouteRequestMapper.parseSelectFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapper.parseNotFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapper.parseSelectFilters;
 
 import graphql.schema.DataFetchingEnvironment;
 import java.time.Duration;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/OptimizationTypeMapper.java
similarity index 91%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/OptimizationTypeMapper.java
index 7f4f5200256..dc17891f9d2 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/OptimizationTypeMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/OptimizationTypeMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import javax.annotation.Nonnull;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
similarity index 99%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
index 3361e8a4410..e729cd32821 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import graphql.schema.DataFetchingEnvironment;
 import java.time.Instant;
@@ -13,6 +13,7 @@
 import javax.annotation.Nullable;
 import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper;
 import org.opentripplanner.framework.collection.CollectionUtils;
 import org.opentripplanner.framework.graphql.GraphQLUtils;
 import org.opentripplanner.framework.time.DurationUtils;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransferModeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java
similarity index 87%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/TransferModeMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java
index 674a7c08423..ffa7363e3a7 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/TransferModeMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransferModeMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.routing.api.request.StreetMode;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/VehicleOptimizationTypeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/VehicleOptimizationTypeMapper.java
similarity index 94%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/VehicleOptimizationTypeMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/VehicleOptimizationTypeMapper.java
index f908c400b11..c47cbd3cf7a 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/VehicleOptimizationTypeMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/VehicleOptimizationTypeMapper.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.routing.core.VehicleRoutingOptimizeType;
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
similarity index 99%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java
rename to src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
index bc976b26248..382543fc501 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LegacyRouteRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder;
 import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
similarity index 99%
rename from src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
rename to src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
index 9704d6ca122..740ec2bc373 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
 import static graphql.Assert.assertTrue;
 import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder;

From 267d3b775562470ef50a89bc7a2e5e0bd7ad94dc Mon Sep 17 00:00:00 2001
From: Henrik Abrahamsson 
Date: Fri, 22 Mar 2024 13:30:59 +0100
Subject: [PATCH 0853/1688] Add 204 optional handling to OtpHttpClient

---
 .../azure/AbstractAzureSiriUpdater.java       | 42 +++++----------
 .../framework/io/OtpHttpClient.java           | 54 +++++++++++++++----
 .../io/OtpHttpClientStatusCodeException.java  | 15 ------
 3 files changed, 55 insertions(+), 56 deletions(-)
 delete mode 100644 src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java

diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
index 3301d625854..bf5f8a6113a 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
@@ -12,9 +12,6 @@
 import com.azure.messaging.servicebus.administration.models.CreateSubscriptionOptions;
 import com.azure.messaging.servicebus.models.ServiceBusReceiveMode;
 import com.google.common.base.Preconditions;
-import com.google.common.io.CharStreams;
-import jakarta.xml.bind.JAXBException;
-import java.io.InputStreamReader;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Duration;
@@ -24,12 +21,11 @@
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
-import javax.xml.stream.XMLStreamException;
+import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.opentripplanner.ext.siri.EntityResolver;
 import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher;
 import org.opentripplanner.framework.application.ApplicationShutdownSupport;
 import org.opentripplanner.framework.io.OtpHttpClient;
-import org.opentripplanner.framework.io.OtpHttpClientStatusCodeException;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.transit.service.TransitService;
@@ -208,40 +204,26 @@ public String getConfigRef() {
    * Returns None for empty result
    */
   protected Optional fetchInitialSiriData(URI uri) {
-    // Maybe put this in the config?
-    HttpHeaders rh = HttpHeaders.of().acceptApplicationXML().build();
-    String initialData;
+    var headers = HttpHeaders.of().acceptApplicationXML().build().asMap();
 
     try (OtpHttpClient otpHttpClient = new OtpHttpClient()) {
       var t1 = System.currentTimeMillis();
-      initialData =
-        otpHttpClient.getAndMap(
-          uri,
-          Duration.ofMillis(timeout),
-          rh.asMap(),
-          is -> CharStreams.toString(new InputStreamReader(is))
-        );
-      final long t2 = System.currentTimeMillis();
-
-      LOG.info(
-        "Fetching initial data, received {} bytes in {} ms.",
-        (t2 - t1),
-        initialData.length()
+      var siriOptional = otpHttpClient.executeAndMapOptional(
+        new HttpGet(uri),
+        Duration.ofMillis(timeout),
+        headers,
+        SiriXml::parseXml
       );
-    } catch (OtpHttpClientStatusCodeException e) {
-      // 204 No Content status is ok.
-      if (e.getStatusCode() == 204) {
+      var t2 = System.currentTimeMillis();
+      LOG.info("Fetched initial data in {} ms", (t2 - t1));
+
+      if (siriOptional.isEmpty()) {
         LOG.info("Got status 204 'No Content', handling gracefully.");
         return Optional.empty();
       }
-      throw e;
-    }
 
-    try {
-      var serviceDelivery = SiriXml.parseXml(initialData).getServiceDelivery();
+      var serviceDelivery = siriOptional.get().getServiceDelivery();
       return Optional.ofNullable(serviceDelivery);
-    } catch (JAXBException | XMLStreamException e) {
-      throw new SiriAzureInitializationException("Could not parse history message", e);
     }
   }
 
diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
index 33ef72b121e..1ac8891553c 100644
--- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
+++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java
@@ -13,6 +13,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
 import org.apache.hc.client5.http.classic.methods.HttpGet;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase;
@@ -24,6 +25,7 @@
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.core5.http.ClassicHttpResponse;
 import org.apache.hc.core5.http.ContentType;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
@@ -313,23 +315,34 @@ public  T executeAndMap(
     Duration timeout,
     Map headers,
     ResponseMapper contentMapper
+  ) {
+    return executeAndMapWithResponseHandler(
+      httpRequest,
+      timeout,
+      headers,
+      response -> mapResponse(response, contentMapper)
+    );
+  }
+
+  /**
+   * Executes an HTTP request and returns the body mapped according to the provided content mapper.
+   * Returns empty result on http status 204 "No Content"
+   */
+  public  Optional executeAndMapOptional(
+    HttpUriRequestBase httpRequest,
+    Duration timeout,
+    Map headers,
+    ResponseMapper contentMapper
   ) {
     return executeAndMapWithResponseHandler(
       httpRequest,
       timeout,
       headers,
       response -> {
-        if (isFailedRequest(response)) {
-          throw new OtpHttpClientStatusCodeException(response.getCode());
-        }
-        if (response.getEntity() == null || response.getEntity().getContent() == null) {
-          throw new OtpHttpClientException("HTTP request failed: empty response");
-        }
-        try (InputStream is = response.getEntity().getContent()) {
-          return contentMapper.apply(is);
-        } catch (Exception e) {
-          throw new OtpHttpClientException(e);
+        if (response.getCode() == 204) {
+          return Optional.empty();
         }
+        return Optional.of(mapResponse(response, contentMapper));
       }
     );
   }
@@ -401,6 +414,25 @@ protected  T executeAndMapWithResponseHandler(
     }
   }
 
+  private  T mapResponse(ClassicHttpResponse response, ResponseMapper contentMapper) {
+    if (isFailedRequest(response)) {
+      throw new OtpHttpClientException(
+        "HTTP request failed with status code " + response.getCode()
+      );
+    }
+    if (response.getEntity() == null) {
+      throw new OtpHttpClientException("HTTP request failed: empty response");
+    }
+    try (InputStream is = response.getEntity().getContent()) {
+      if (is == null) {
+        throw new OtpHttpClientException("HTTP request failed: empty response");
+      }
+      return contentMapper.apply(is);
+    } catch (Exception e) {
+      throw new OtpHttpClientException(e);
+    }
+  }
+
   private  T sendAndMap(
     HttpUriRequestBase request,
     URI uri,
@@ -443,7 +475,7 @@ private static RequestConfig requestConfig(Duration timeout) {
    * Returns true if the HTTP status code is not 200.
    */
   private static boolean isFailedRequest(HttpResponse response) {
-    return response.getCode() != 200;
+    return response.getCode() < 200 || response.getCode() >= 300;
   }
 
   /**
diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java
deleted file mode 100644
index e001f23b05e..00000000000
--- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientStatusCodeException.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package org.opentripplanner.framework.io;
-
-public class OtpHttpClientStatusCodeException extends OtpHttpClientException {
-
-  private final int statusCode;
-
-  public OtpHttpClientStatusCodeException(int statusCode) {
-    super("HTTP request failed with status code " + statusCode);
-    this.statusCode = statusCode;
-  }
-
-  public int getStatusCode() {
-    return statusCode;
-  }
-}

From fef0e7958afcecb0017e9e1446f083bc10fb1ca4 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 22 Mar 2024 16:07:12 +0200
Subject: [PATCH 0854/1688] Split RouteRequestMapper

---
 .../mapping/routerequest/ArgumentUtils.java   | 123 ++++
 .../BicyclePreferencesMapper.java             | 155 +++++
 .../routerequest/CarPreferencesMapper.java    |  69 ++
 .../LegacyRouteRequestMapper.java             |   4 +-
 .../routerequest/ModePreferencesMapper.java   |  90 +++
 .../routerequest/RouteRequestMapper.java      | 587 +-----------------
 .../ScooterPreferencesMapper.java             |  89 +++
 .../TransitPreferencesMapper.java             | 102 +++
 .../routerequest/WalkPreferencesMapper.java   |  31 +
 9 files changed, 668 insertions(+), 582 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java
new file mode 100644
index 00000000000..c9235afe185
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java
@@ -0,0 +1,123 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import graphql.schema.DataFetchingEnvironment;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+
+public class ArgumentUtils {
+
+  /**
+   * This methods returns list of modes and their costs from the argument structure:
+   * modes.transit.transit. This methods circumvents a bug in graphql-codegen as getting a list of
+   * input objects is not possible through using the generated types in {@link GraphQLTypes}.
+   * 
      
+   * TODO this ugliness can be removed when the bug gets fixed
+   */
+  static List> getTransitModes(DataFetchingEnvironment environment) {
+    if (environment.containsArgument("modes")) {
+      Map modesArgs = environment.getArgument("modes");
+      if (modesArgs.containsKey("transit")) {
+        Map transitArgs = (Map) modesArgs.get("transit");
+        if (transitArgs.containsKey("transit")) {
+          return (List>) transitArgs.get("transit");
+        }
+      }
+    }
+    return List.of();
+  }
+
+  /**
+   * This methods returns parking preferences of the given type from argument structure:
+   * preferences.street.type.parking. This methods circumvents a bug in graphql-codegen as getting a
+   * list of input objects is not possible through using the generated types in
+   * {@link GraphQLTypes}.
+   * 
      
+   * TODO this ugliness can be removed when the bug gets fixed
+   */
+  @Nullable
+  static Map getParking(DataFetchingEnvironment environment, String type) {
+    return (
+      (Map) (
+        (Map) (
+          (Map) ((Map) environment.getArgument("preferences")).get(
+              "street"
+            )
+        ).get(type)
+      ).get("parking")
+    );
+  }
+
+  /**
+   * This methods returns required/banned parking tags of the given type from argument structure:
+   * preferences.street.type.parking.filters. This methods circumvents a bug in graphql-codegen as
+   * getting a list of input objects is not possible through using the generated types in
+   * {@link GraphQLTypes}.
+   * 
      
+   * TODO this ugliness can be removed when the bug gets fixed
+   */
+  @Nonnull
+  static Collection> getParkingFilters(
+    DataFetchingEnvironment environment,
+    String type
+  ) {
+    var parking = getParking(environment, type);
+    var filters = parking != null && parking.containsKey("filters")
+      ? getParking(environment, type).get("filters")
+      : null;
+    return filters != null ? (Collection>) filters : List.of();
+  }
+
+  /**
+   * This methods returns preferred/unpreferred parking tags of the given type from argument
+   * structure: preferences.street.type.parking.preferred. This methods circumvents a bug in
+   * graphql-codegen as getting a list of input objects is not possible through using the generated
+   * types in {@link GraphQLTypes}.
+   * 
      
+   * TODO this ugliness can be removed when the bug gets fixed
+   */
+  @Nonnull
+  static Collection> getParkingPreferred(
+    DataFetchingEnvironment environment,
+    String type
+  ) {
+    var parking = getParking(environment, type);
+    var preferred = parking != null && parking.containsKey("preferred")
+      ? getParking(environment, type).get("preferred")
+      : null;
+    return preferred != null ? (Collection>) preferred : List.of();
+  }
+
+  static Set parseNotFilters(Collection> filters) {
+    return parseFilters(filters, "not");
+  }
+
+  static Set parseSelectFilters(Collection> filters) {
+    return parseFilters(filters, "select");
+  }
+
+  @Nonnull
+  private static Set parseFilters(Collection> filters, String key) {
+    return filters
+      .stream()
+      .flatMap(f ->
+        parseOperation((Collection>>) f.getOrDefault(key, List.of()))
+      )
+      .collect(Collectors.toSet());
+  }
+
+  private static Stream parseOperation(Collection>> map) {
+    return map
+      .stream()
+      .flatMap(f -> {
+        var tags = f.getOrDefault("tags", List.of());
+        return tags.stream();
+      });
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java
new file mode 100644
index 00000000000..cd0f1ef16da
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java
@@ -0,0 +1,155 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.getParkingFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.getParkingPreferred;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.parseNotFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.parseSelectFilters;
+
+import graphql.schema.DataFetchingEnvironment;
+import java.util.Set;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.framework.collection.CollectionUtils;
+import org.opentripplanner.framework.time.DurationUtils;
+import org.opentripplanner.routing.api.request.preference.BikePreferences;
+import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences;
+import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences;
+import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences;
+
+public class BicyclePreferencesMapper {
+
+  static void setBicyclePreferences(
+    BikePreferences.Builder preferences,
+    GraphQLTypes.GraphQLBicyclePreferencesInput args,
+    DataFetchingEnvironment environment
+  ) {
+    if (args != null) {
+      var speed = args.getGraphQLSpeed();
+      if (speed != null) {
+        preferences.withSpeed(speed);
+      }
+      var reluctance = args.getGraphQLReluctance();
+      if (reluctance != null) {
+        preferences.withReluctance(reluctance);
+      }
+      var boardCost = args.getGraphQLBoardCost();
+      if (boardCost != null) {
+        preferences.withBoardCost(boardCost.toSeconds());
+      }
+      preferences.withWalking(walk -> setBicycleWalkPreferences(walk, args.getGraphQLWalk()));
+      preferences.withParking(parking ->
+        setBicycleParkingPreferences(parking, args.getGraphQLParking(), environment)
+      );
+      preferences.withRental(rental -> setBicycleRentalPreferences(rental, args.getGraphQLRental())
+      );
+      setBicycleOptimization(preferences, args.getGraphQLOptimization());
+    }
+  }
+
+  private static void setBicycleWalkPreferences(
+    VehicleWalkingPreferences.Builder preferences,
+    GraphQLTypes.GraphQLBicycleWalkPreferencesInput args
+  ) {
+    if (args != null) {
+      var speed = args.getGraphQLSpeed();
+      if (speed != null) {
+        preferences.withSpeed(speed);
+      }
+      var mountTime = args.getGraphQLMountDismountTime();
+      if (mountTime != null) {
+        preferences.withMountDismountTime(
+          DurationUtils.requireNonNegativeShort(mountTime, "bicycle mount dismount time")
+        );
+      }
+      var cost = args.getGraphQLCost();
+      if (cost != null) {
+        var reluctance = cost.getGraphQLReluctance();
+        if (reluctance != null) {
+          preferences.withReluctance(reluctance);
+        }
+        var mountCost = cost.getGraphQLMountDismountCost();
+        if (mountCost != null) {
+          preferences.withMountDismountCost(mountCost.toSeconds());
+        }
+      }
+    }
+  }
+
+  private static void setBicycleParkingPreferences(
+    VehicleParkingPreferences.Builder preferences,
+    GraphQLTypes.GraphQLBicycleParkingPreferencesInput args,
+    DataFetchingEnvironment environment
+  ) {
+    if (args != null) {
+      var unpreferredCost = args.getGraphQLUnpreferredCost();
+      if (unpreferredCost != null) {
+        preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds());
+      }
+      var filters = getParkingFilters(environment, "bicycle");
+      preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters));
+      preferences.withBannedVehicleParkingTags(parseNotFilters(filters));
+      var preferred = getParkingPreferred(environment, "bicycle");
+      preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred));
+      preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred));
+    }
+  }
+
+  private static void setBicycleRentalPreferences(
+    VehicleRentalPreferences.Builder preferences,
+    GraphQLTypes.GraphQLBicycleRentalPreferencesInput args
+  ) {
+    if (args != null) {
+      var allowedNetworks = args.getGraphQLAllowedNetworks();
+      if (!CollectionUtils.isEmpty(allowedNetworks)) {
+        preferences.withAllowedNetworks(Set.copyOf(allowedNetworks));
+      }
+      var bannedNetworks = args.getGraphQLBannedNetworks();
+      if (!CollectionUtils.isEmpty(bannedNetworks)) {
+        preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
+      }
+      var destinationPolicy = args.getGraphQLDestinationBicyclePolicy();
+      if (destinationPolicy != null) {
+        var allowed = destinationPolicy.getGraphQLAllowKeeping();
+        if (allowed != null) {
+          preferences.withAllowArrivingInRentedVehicleAtDestination(allowed);
+        }
+        var cost = destinationPolicy.getGraphQLKeepingCost();
+        if (cost != null) {
+          preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds());
+        }
+      }
+    }
+  }
+
+  private static void setBicycleOptimization(
+    BikePreferences.Builder preferences,
+    GraphQLTypes.GraphQLCyclingOptimizationInput args
+  ) {
+    if (args != null) {
+      var type = args.getGraphQLType();
+      var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null;
+      if (mappedType != null) {
+        preferences.withOptimizeType(mappedType);
+      }
+      var triangleArgs = args.getGraphQLTriangle();
+      if (isBicycleTriangleSet(triangleArgs)) {
+        preferences.withForcedOptimizeTriangle(triangle -> {
+          triangle
+            .withSlope(triangleArgs.getGraphQLFlatness())
+            .withSafety(triangleArgs.getGraphQLSafety())
+            .withTime(triangleArgs.getGraphQLTime());
+        });
+      }
+    }
+  }
+
+  private static boolean isBicycleTriangleSet(
+    GraphQLTypes.GraphQLTriangleCyclingFactorsInput args
+  ) {
+    return (
+      args != null &&
+      args.getGraphQLFlatness() != null &&
+      args.getGraphQLSafety() != null &&
+      args.getGraphQLTime() != null
+    );
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
new file mode 100644
index 00000000000..b815144c1d0
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
@@ -0,0 +1,69 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.getParkingFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.getParkingPreferred;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.parseNotFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.parseSelectFilters;
+
+import graphql.schema.DataFetchingEnvironment;
+import java.util.Set;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.framework.collection.CollectionUtils;
+import org.opentripplanner.routing.api.request.preference.CarPreferences;
+import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences;
+import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences;
+
+public class CarPreferencesMapper {
+
+  static void setCarPreferences(
+    CarPreferences.Builder preferences,
+    GraphQLTypes.GraphQLCarPreferencesInput args,
+    DataFetchingEnvironment environment
+  ) {
+    if (args != null) {
+      var reluctance = args.getGraphQLReluctance();
+      if (reluctance != null) {
+        preferences.withReluctance(reluctance);
+      }
+      preferences.withParking(parking ->
+        setCarParkingPreferences(parking, args.getGraphQLParking(), environment)
+      );
+      preferences.withRental(rental -> setCarRentalPreferences(rental, args.getGraphQLRental()));
+    }
+  }
+
+  private static void setCarParkingPreferences(
+    VehicleParkingPreferences.Builder preferences,
+    GraphQLTypes.GraphQLCarParkingPreferencesInput args,
+    DataFetchingEnvironment environment
+  ) {
+    if (args != null) {
+      var unpreferredCost = args.getGraphQLUnpreferredCost();
+      if (unpreferredCost != null) {
+        preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds());
+      }
+      var filters = getParkingFilters(environment, "car");
+      preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters));
+      preferences.withBannedVehicleParkingTags(parseNotFilters(filters));
+      var preferred = getParkingPreferred(environment, "car");
+      preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred));
+      preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred));
+    }
+  }
+
+  private static void setCarRentalPreferences(
+    VehicleRentalPreferences.Builder preferences,
+    GraphQLTypes.GraphQLCarRentalPreferencesInput args
+  ) {
+    if (args != null) {
+      var allowedNetworks = args.getGraphQLAllowedNetworks();
+      if (!CollectionUtils.isEmpty(allowedNetworks)) {
+        preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
+      }
+      var bannedNetworks = args.getGraphQLBannedNetworks();
+      if (!CollectionUtils.isEmpty(bannedNetworks)) {
+        preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
+      }
+    }
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
index 22c3ef628e2..f602871162f 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapper.java
@@ -1,7 +1,7 @@
 package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
-import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapper.parseNotFilters;
-import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapper.parseSelectFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.parseNotFilters;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.parseSelectFilters;
 
 import graphql.schema.DataFetchingEnvironment;
 import java.time.Duration;
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java
new file mode 100644
index 00000000000..28e884acbde
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java
@@ -0,0 +1,90 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.getTransitModes;
+
+import graphql.schema.DataFetchingEnvironment;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper;
+import org.opentripplanner.framework.collection.CollectionUtils;
+import org.opentripplanner.routing.api.request.StreetMode;
+import org.opentripplanner.routing.api.request.request.JourneyRequest;
+import org.opentripplanner.routing.api.request.request.filter.SelectRequest;
+import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest;
+import org.opentripplanner.transit.model.basic.MainAndSubMode;
+
+public class ModePreferencesMapper {
+
+  /**
+   * TODO this doesn't support multiple street modes yet
+   */
+  static void setModes(
+    JourneyRequest journey,
+    GraphQLTypes.GraphQLPlanModesInput modesInput,
+    DataFetchingEnvironment environment
+  ) {
+    var direct = modesInput.getGraphQLDirect();
+    if (Boolean.TRUE.equals(modesInput.getGraphQLTransitOnly())) {
+      journey.direct().setMode(StreetMode.NOT_SET);
+    } else if (!CollectionUtils.isEmpty(direct)) {
+      journey.direct().setMode(DirectModeMapper.map(direct.getFirst()));
+    }
+
+    var transit = modesInput.getGraphQLTransit();
+    if (Boolean.TRUE.equals(modesInput.getGraphQLDirectOnly())) {
+      journey.transit().disable();
+    } else if (transit != null) {
+      var access = transit.getGraphQLAccess();
+      if (!CollectionUtils.isEmpty(access)) {
+        journey.access().setMode(AccessModeMapper.map(access.getFirst()));
+      }
+
+      var egress = transit.getGraphQLEgress();
+      if (!CollectionUtils.isEmpty(egress)) {
+        journey.egress().setMode(EgressModeMapper.map(egress.getFirst()));
+      }
+
+      var transfer = transit.getGraphQLTransfer();
+      if (!CollectionUtils.isEmpty(transfer)) {
+        journey.transfer().setMode(TransferModeMapper.map(transfer.getFirst()));
+      }
+      validateStreetModes(journey);
+
+      var transitModes = getTransitModes(environment);
+      if (!CollectionUtils.isEmpty(transitModes)) {
+        var filterRequestBuilder = TransitFilterRequest.of();
+        var mainAndSubModes = transitModes
+          .stream()
+          .map(mode ->
+            new MainAndSubMode(
+              TransitModeMapper.map(
+                GraphQLTypes.GraphQLTransitMode.valueOf((String) mode.get("mode"))
+              )
+            )
+          )
+          .toList();
+        filterRequestBuilder.addSelect(
+          SelectRequest.of().withTransportModes(mainAndSubModes).build()
+        );
+        journey.transit().setFilters(List.of(filterRequestBuilder.build()));
+      }
+    }
+  }
+
+  /**
+   * TODO this doesn't support multiple street modes yet
+   */
+  private static void validateStreetModes(JourneyRequest journey) {
+    Set modes = new HashSet();
+    modes.add(journey.access().mode());
+    modes.add(journey.egress().mode());
+    modes.add(journey.transfer().mode());
+    if (modes.contains(StreetMode.BIKE) && modes.size() != 1) {
+      throw new IllegalArgumentException(
+        "If BICYCLE is used for access, egress or transfer, then it should be used for all."
+      );
+    }
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
index e729cd32821..3044577258f 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java
@@ -1,40 +1,23 @@
 package org.opentripplanner.apis.gtfs.mapping.routerequest;
 
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.BicyclePreferencesMapper.setBicyclePreferences;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.CarPreferencesMapper.setCarPreferences;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ModePreferencesMapper.setModes;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ScooterPreferencesMapper.setScooterPreferences;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.TransitPreferencesMapper.setTransitPreferences;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.WalkPreferencesMapper.setWalkPreferences;
+
 import graphql.schema.DataFetchingEnvironment;
 import java.time.Instant;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
 import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
-import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper;
-import org.opentripplanner.framework.collection.CollectionUtils;
 import org.opentripplanner.framework.graphql.GraphQLUtils;
 import org.opentripplanner.framework.time.DurationUtils;
 import org.opentripplanner.model.GenericLocation;
 import org.opentripplanner.routing.api.request.RouteRequest;
-import org.opentripplanner.routing.api.request.StreetMode;
-import org.opentripplanner.routing.api.request.preference.BikePreferences;
-import org.opentripplanner.routing.api.request.preference.CarPreferences;
 import org.opentripplanner.routing.api.request.preference.ItineraryFilterPreferences;
 import org.opentripplanner.routing.api.request.preference.RoutingPreferences;
-import org.opentripplanner.routing.api.request.preference.ScooterPreferences;
-import org.opentripplanner.routing.api.request.preference.TransferPreferences;
-import org.opentripplanner.routing.api.request.preference.TransitPreferences;
-import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences;
-import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences;
-import org.opentripplanner.routing.api.request.preference.VehicleWalkingPreferences;
-import org.opentripplanner.routing.api.request.preference.WalkPreferences;
-import org.opentripplanner.routing.api.request.request.JourneyRequest;
-import org.opentripplanner.routing.api.request.request.filter.SelectRequest;
-import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest;
-import org.opentripplanner.transit.model.basic.MainAndSubMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 
 public class RouteRequestMapper {
@@ -85,33 +68,6 @@ public static RouteRequest toRouteRequest(
     return request;
   }
 
-  static Set parseNotFilters(Collection> filters) {
-    return parseFilters(filters, "not");
-  }
-
-  static Set parseSelectFilters(Collection> filters) {
-    return parseFilters(filters, "select");
-  }
-
-  @Nonnull
-  private static Set parseFilters(Collection> filters, String key) {
-    return filters
-      .stream()
-      .flatMap(f ->
-        parseOperation((Collection>>) f.getOrDefault(key, List.of()))
-      )
-      .collect(Collectors.toSet());
-  }
-
-  private static Stream parseOperation(Collection>> map) {
-    return map
-      .stream()
-      .flatMap(f -> {
-        var tags = f.getOrDefault("tags", List.of());
-        return tags.stream();
-      });
-  }
-
   private static void setPreferences(
     RoutingPreferences.Builder prefs,
     RouteRequest request,
@@ -151,92 +107,6 @@ private static void setItineraryFilters(
     }
   }
 
-  private static void setTransitPreferences(
-    TransitPreferences.Builder transitPreferences,
-    TransferPreferences.Builder transferPreferences,
-    GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args,
-    DataFetchingEnvironment environment
-  ) {
-    var modes = args.getGraphQLModes();
-    var transit = getTransitModes(environment);
-    if (!Boolean.TRUE.equals(modes.getGraphQLDirectOnly()) && !CollectionUtils.isEmpty(transit)) {
-      var reluctanceForMode = transit
-        .stream()
-        .filter(mode -> mode.containsKey("cost"))
-        .collect(
-          Collectors.toMap(
-            mode ->
-              TransitModeMapper.map(
-                GraphQLTypes.GraphQLTransitMode.valueOf((String) mode.get("mode"))
-              ),
-            mode -> (Double) ((Map) mode.get("cost")).get("reluctance")
-          )
-        );
-      transitPreferences.setReluctanceForMode(reluctanceForMode);
-    }
-    var transitArgs = args.getGraphQLPreferences().getGraphQLTransit();
-    if (transitArgs != null) {
-      var board = transitArgs.getGraphQLBoard();
-      if (board != null) {
-        var slack = board.getGraphQLSlack();
-        if (slack != null) {
-          transitPreferences.withDefaultBoardSlackSec(
-            (int) DurationUtils.requireNonNegativeMedium(slack, "board slack").toSeconds()
-          );
-        }
-        var waitReluctance = board.getGraphQLWaitReluctance();
-        if (waitReluctance != null) {
-          transferPreferences.withWaitReluctance(waitReluctance);
-        }
-      }
-      var alight = transitArgs.getGraphQLAlight();
-      if (alight != null) {
-        var slack = alight.getGraphQLSlack();
-        if (slack != null) {
-          transitPreferences.withDefaultAlightSlackSec(
-            (int) DurationUtils.requireNonNegativeMedium(slack, "alight slack").toSeconds()
-          );
-        }
-      }
-      var transfer = transitArgs.getGraphQLTransfer();
-      if (transfer != null) {
-        var cost = transfer.getGraphQLCost();
-        if (cost != null) {
-          transferPreferences.withCost(cost.toSeconds());
-        }
-        var slack = transfer.getGraphQLSlack();
-        if (slack != null) {
-          transferPreferences.withSlack(
-            (int) DurationUtils.requireNonNegativeMedium(slack, "transfer slack").toSeconds()
-          );
-        }
-        var maxTransfers = transfer.getGraphQLMaximumTransfers();
-        if (maxTransfers != null) {
-          transferPreferences.withMaxTransfers(maxTransfers);
-        }
-        var additionalTransfers = transfer.getGraphQLMaximumAdditionalTransfers();
-        if (additionalTransfers != null) {
-          transferPreferences.withMaxAdditionalTransfers(additionalTransfers);
-        }
-      }
-      var timetable = transitArgs.getGraphQLTimetable();
-      if (timetable != null) {
-        var excludeUpdates = timetable.getGraphQLExcludeRealTimeUpdates();
-        if (excludeUpdates != null) {
-          transitPreferences.setIgnoreRealtimeUpdates(excludeUpdates);
-        }
-        var includePlannedCancellations = timetable.getGraphQLIncludePlannedCancellations();
-        if (includePlannedCancellations != null) {
-          transitPreferences.setIncludePlannedCancellations(includePlannedCancellations);
-        }
-        var includeRealtimeCancellations = timetable.getGraphQLIncludeRealTimeCancellations();
-        if (includeRealtimeCancellations != null) {
-          transitPreferences.setIncludeRealtimeCancellations(includeRealtimeCancellations);
-        }
-      }
-    }
-  }
-
   private static void setStreetPreferences(
     RoutingPreferences.Builder preferences,
     GraphQLTypes.GraphQLPlanStreetPreferencesInput args,
@@ -252,358 +122,6 @@ private static void setStreetPreferences(
     }
   }
 
-  private static void setBicyclePreferences(
-    BikePreferences.Builder preferences,
-    GraphQLTypes.GraphQLBicyclePreferencesInput args,
-    DataFetchingEnvironment environment
-  ) {
-    if (args != null) {
-      var speed = args.getGraphQLSpeed();
-      if (speed != null) {
-        preferences.withSpeed(speed);
-      }
-      var reluctance = args.getGraphQLReluctance();
-      if (reluctance != null) {
-        preferences.withReluctance(reluctance);
-      }
-      var boardCost = args.getGraphQLBoardCost();
-      if (boardCost != null) {
-        preferences.withBoardCost(boardCost.toSeconds());
-      }
-      preferences.withWalking(walk -> setBicycleWalkPreferences(walk, args.getGraphQLWalk()));
-      preferences.withParking(parking ->
-        setBicycleParkingPreferences(parking, args.getGraphQLParking(), environment)
-      );
-      preferences.withRental(rental -> setBicycleRentalPreferences(rental, args.getGraphQLRental())
-      );
-      setBicycleOptimization(preferences, args.getGraphQLOptimization());
-    }
-  }
-
-  private static void setBicycleWalkPreferences(
-    VehicleWalkingPreferences.Builder preferences,
-    GraphQLTypes.GraphQLBicycleWalkPreferencesInput args
-  ) {
-    if (args != null) {
-      var speed = args.getGraphQLSpeed();
-      if (speed != null) {
-        preferences.withSpeed(speed);
-      }
-      var mountTime = args.getGraphQLMountDismountTime();
-      if (mountTime != null) {
-        preferences.withMountDismountTime(
-          DurationUtils.requireNonNegativeShort(mountTime, "bicycle mount dismount time")
-        );
-      }
-      var cost = args.getGraphQLCost();
-      if (cost != null) {
-        var reluctance = cost.getGraphQLReluctance();
-        if (reluctance != null) {
-          preferences.withReluctance(reluctance);
-        }
-        var mountCost = cost.getGraphQLMountDismountCost();
-        if (mountCost != null) {
-          preferences.withMountDismountCost(mountCost.toSeconds());
-        }
-      }
-    }
-  }
-
-  private static void setBicycleParkingPreferences(
-    VehicleParkingPreferences.Builder preferences,
-    GraphQLTypes.GraphQLBicycleParkingPreferencesInput args,
-    DataFetchingEnvironment environment
-  ) {
-    if (args != null) {
-      var unpreferredCost = args.getGraphQLUnpreferredCost();
-      if (unpreferredCost != null) {
-        preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds());
-      }
-      var filters = getParkingFilters(environment, "bicycle");
-      preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters));
-      preferences.withBannedVehicleParkingTags(parseNotFilters(filters));
-      var preferred = getParkingPreferred(environment, "bicycle");
-      preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred));
-      preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred));
-    }
-  }
-
-  /**
-   * This methods returns required/banned parking tags of the given type from argument structure:
-   * preferences.street.type.parking.filters. This methods circumvents a bug in graphql-codegen as
-   * getting a list of input objects is not possible through using the generated types in
-   * {@link GraphQLTypes}.
-   * 
      
-   * TODO this ugliness can be removed when the bug gets fixed
-   */
-  @Nonnull
-  private static Collection> getParkingFilters(
-    DataFetchingEnvironment environment,
-    String type
-  ) {
-    var parking = getParking(environment, type);
-    var filters = parking != null && parking.containsKey("filters")
-      ? getParking(environment, type).get("filters")
-      : null;
-    return filters != null ? (Collection>) filters : List.of();
-  }
-
-  /**
-   * This methods returns preferred/unpreferred parking tags of the given type from argument
-   * structure: preferences.street.type.parking.preferred. This methods circumvents a bug in
-   * graphql-codegen as getting a list of input objects is not possible through using the generated
-   * types in {@link GraphQLTypes}.
-   * 
      
-   * TODO this ugliness can be removed when the bug gets fixed
-   */
-  @Nonnull
-  private static Collection> getParkingPreferred(
-    DataFetchingEnvironment environment,
-    String type
-  ) {
-    var parking = getParking(environment, type);
-    var preferred = parking != null && parking.containsKey("preferred")
-      ? getParking(environment, type).get("preferred")
-      : null;
-    return preferred != null ? (Collection>) preferred : List.of();
-  }
-
-  /**
-   * This methods returns parking preferences of the given type from argument structure:
-   * preferences.street.type.parking. This methods circumvents a bug in graphql-codegen as getting a
-   * list of input objects is not possible through using the generated types in
-   * {@link GraphQLTypes}.
-   * 
      
-   * TODO this ugliness can be removed when the bug gets fixed
-   */
-  @Nullable
-  private static Map getParking(DataFetchingEnvironment environment, String type) {
-    return (
-      (Map) (
-        (Map) (
-          (Map) ((Map) environment.getArgument("preferences")).get(
-              "street"
-            )
-        ).get(type)
-      ).get("parking")
-    );
-  }
-
-  private static void setBicycleRentalPreferences(
-    VehicleRentalPreferences.Builder preferences,
-    GraphQLTypes.GraphQLBicycleRentalPreferencesInput args
-  ) {
-    if (args != null) {
-      var allowedNetworks = args.getGraphQLAllowedNetworks();
-      if (!CollectionUtils.isEmpty(allowedNetworks)) {
-        preferences.withAllowedNetworks(Set.copyOf(allowedNetworks));
-      }
-      var bannedNetworks = args.getGraphQLBannedNetworks();
-      if (!CollectionUtils.isEmpty(bannedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
-      }
-      var destinationPolicy = args.getGraphQLDestinationBicyclePolicy();
-      if (destinationPolicy != null) {
-        var allowed = destinationPolicy.getGraphQLAllowKeeping();
-        if (allowed != null) {
-          preferences.withAllowArrivingInRentedVehicleAtDestination(allowed);
-        }
-        var cost = destinationPolicy.getGraphQLKeepingCost();
-        if (cost != null) {
-          preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds());
-        }
-      }
-    }
-  }
-
-  private static void setBicycleOptimization(
-    BikePreferences.Builder preferences,
-    GraphQLTypes.GraphQLCyclingOptimizationInput args
-  ) {
-    if (args != null) {
-      var type = args.getGraphQLType();
-      var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null;
-      if (mappedType != null) {
-        preferences.withOptimizeType(mappedType);
-      }
-      var triangleArgs = args.getGraphQLTriangle();
-      if (isBicycleTriangleSet(triangleArgs)) {
-        preferences.withForcedOptimizeTriangle(triangle -> {
-          triangle
-            .withSlope(triangleArgs.getGraphQLFlatness())
-            .withSafety(triangleArgs.getGraphQLSafety())
-            .withTime(triangleArgs.getGraphQLTime());
-        });
-      }
-    }
-  }
-
-  private static boolean isBicycleTriangleSet(
-    GraphQLTypes.GraphQLTriangleCyclingFactorsInput args
-  ) {
-    return (
-      args != null &&
-      args.getGraphQLFlatness() != null &&
-      args.getGraphQLSafety() != null &&
-      args.getGraphQLTime() != null
-    );
-  }
-
-  private static void setCarPreferences(
-    CarPreferences.Builder preferences,
-    GraphQLTypes.GraphQLCarPreferencesInput args,
-    DataFetchingEnvironment environment
-  ) {
-    if (args != null) {
-      var reluctance = args.getGraphQLReluctance();
-      if (reluctance != null) {
-        preferences.withReluctance(reluctance);
-      }
-      preferences.withParking(parking ->
-        setCarParkingPreferences(parking, args.getGraphQLParking(), environment)
-      );
-      preferences.withRental(rental -> setCarRentalPreferences(rental, args.getGraphQLRental()));
-    }
-  }
-
-  private static void setCarParkingPreferences(
-    VehicleParkingPreferences.Builder preferences,
-    GraphQLTypes.GraphQLCarParkingPreferencesInput args,
-    DataFetchingEnvironment environment
-  ) {
-    if (args != null) {
-      var unpreferredCost = args.getGraphQLUnpreferredCost();
-      if (unpreferredCost != null) {
-        preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds());
-      }
-      var filters = getParkingFilters(environment, "car");
-      preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters));
-      preferences.withBannedVehicleParkingTags(parseNotFilters(filters));
-      var preferred = getParkingPreferred(environment, "car");
-      preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred));
-      preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred));
-    }
-  }
-
-  private static void setCarRentalPreferences(
-    VehicleRentalPreferences.Builder preferences,
-    GraphQLTypes.GraphQLCarRentalPreferencesInput args
-  ) {
-    if (args != null) {
-      var allowedNetworks = args.getGraphQLAllowedNetworks();
-      if (!CollectionUtils.isEmpty(allowedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
-      }
-      var bannedNetworks = args.getGraphQLBannedNetworks();
-      if (!CollectionUtils.isEmpty(bannedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
-      }
-    }
-  }
-
-  private static void setScooterPreferences(
-    ScooterPreferences.Builder preferences,
-    GraphQLTypes.GraphQLScooterPreferencesInput args
-  ) {
-    if (args != null) {
-      var speed = args.getGraphQLSpeed();
-      if (speed != null) {
-        preferences.withSpeed(speed);
-      }
-      var reluctance = args.getGraphQLReluctance();
-      if (reluctance != null) {
-        preferences.withReluctance(reluctance);
-      }
-      preferences.withRental(rental -> setScooterRentalPreferences(rental, args.getGraphQLRental())
-      );
-      setScooterOptimization(preferences, args.getGraphQLOptimization());
-    }
-  }
-
-  private static void setScooterRentalPreferences(
-    VehicleRentalPreferences.Builder preferences,
-    GraphQLTypes.GraphQLScooterRentalPreferencesInput args
-  ) {
-    if (args != null) {
-      var allowedNetworks = args.getGraphQLAllowedNetworks();
-      if (!CollectionUtils.isEmpty(allowedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
-      }
-      var bannedNetworks = args.getGraphQLBannedNetworks();
-      if (!CollectionUtils.isEmpty(bannedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
-      }
-      var destinationPolicy = args.getGraphQLDestinationScooterPolicy();
-      if (destinationPolicy != null) {
-        var allowed = destinationPolicy.getGraphQLAllowKeeping();
-        if (allowed != null) {
-          preferences.withAllowArrivingInRentedVehicleAtDestination(allowed);
-        }
-        var cost = destinationPolicy.getGraphQLKeepingCost();
-        if (cost != null) {
-          preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds());
-        }
-      }
-    }
-  }
-
-  private static void setScooterOptimization(
-    ScooterPreferences.Builder preferences,
-    GraphQLTypes.GraphQLScooterOptimizationInput args
-  ) {
-    if (args != null) {
-      var type = args.getGraphQLType();
-      var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null;
-      if (mappedType != null) {
-        preferences.withOptimizeType(mappedType);
-      }
-      var triangleArgs = args.getGraphQLTriangle();
-      if (isScooterTriangleSet(triangleArgs)) {
-        preferences.withForcedOptimizeTriangle(triangle -> {
-          triangle
-            .withSlope(triangleArgs.getGraphQLFlatness())
-            .withSafety(triangleArgs.getGraphQLSafety())
-            .withTime(triangleArgs.getGraphQLTime());
-        });
-      }
-    }
-  }
-
-  private static boolean isScooterTriangleSet(
-    GraphQLTypes.GraphQLTriangleScooterFactorsInput args
-  ) {
-    return (
-      args != null &&
-      args.getGraphQLFlatness() != null &&
-      args.getGraphQLSafety() != null &&
-      args.getGraphQLTime() != null
-    );
-  }
-
-  private static void setWalkPreferences(
-    WalkPreferences.Builder preferences,
-    GraphQLTypes.GraphQLWalkPreferencesInput args
-  ) {
-    if (args != null) {
-      var speed = args.getGraphQLSpeed();
-      if (speed != null) {
-        preferences.withSpeed(speed);
-      }
-      var reluctance = args.getGraphQLReluctance();
-      if (reluctance != null) {
-        preferences.withReluctance(reluctance);
-      }
-      var walkSafetyFactor = args.getGraphQLWalkSafetyFactor();
-      if (walkSafetyFactor != null) {
-        preferences.withSafetyFactor(walkSafetyFactor);
-      }
-      var boardCost = args.getGraphQLBoardCost();
-      if (boardCost != null) {
-        preferences.withBoardCost(boardCost.toSeconds());
-      }
-    }
-  }
-
   private static void setAccessibilityPreferences(
     RouteRequest request,
     GraphQLTypes.GraphQLAccessibilityPreferencesInput preferenceArgs
@@ -613,97 +131,6 @@ private static void setAccessibilityPreferences(
     }
   }
 
-  /**
-   * TODO this doesn't support multiple street modes yet
-   */
-  private static void setModes(
-    JourneyRequest journey,
-    GraphQLTypes.GraphQLPlanModesInput modesInput,
-    DataFetchingEnvironment environment
-  ) {
-    var direct = modesInput.getGraphQLDirect();
-    if (Boolean.TRUE.equals(modesInput.getGraphQLTransitOnly())) {
-      journey.direct().setMode(StreetMode.NOT_SET);
-    } else if (!CollectionUtils.isEmpty(direct)) {
-      journey.direct().setMode(DirectModeMapper.map(direct.getFirst()));
-    }
-
-    var transit = modesInput.getGraphQLTransit();
-    if (Boolean.TRUE.equals(modesInput.getGraphQLDirectOnly())) {
-      journey.transit().disable();
-    } else if (transit != null) {
-      var access = transit.getGraphQLAccess();
-      if (!CollectionUtils.isEmpty(access)) {
-        journey.access().setMode(AccessModeMapper.map(access.getFirst()));
-      }
-
-      var egress = transit.getGraphQLEgress();
-      if (!CollectionUtils.isEmpty(egress)) {
-        journey.egress().setMode(EgressModeMapper.map(egress.getFirst()));
-      }
-
-      var transfer = transit.getGraphQLTransfer();
-      if (!CollectionUtils.isEmpty(transfer)) {
-        journey.transfer().setMode(TransferModeMapper.map(transfer.getFirst()));
-      }
-      validateStreetModes(journey);
-
-      var transitModes = getTransitModes(environment);
-      if (!CollectionUtils.isEmpty(transitModes)) {
-        var filterRequestBuilder = TransitFilterRequest.of();
-        var mainAndSubModes = transitModes
-          .stream()
-          .map(mode ->
-            new MainAndSubMode(
-              TransitModeMapper.map(
-                GraphQLTypes.GraphQLTransitMode.valueOf((String) mode.get("mode"))
-              )
-            )
-          )
-          .toList();
-        filterRequestBuilder.addSelect(
-          SelectRequest.of().withTransportModes(mainAndSubModes).build()
-        );
-        journey.transit().setFilters(List.of(filterRequestBuilder.build()));
-      }
-    }
-  }
-
-  /**
-   * TODO this doesn't support multiple street modes yet
-   */
-  private static void validateStreetModes(JourneyRequest journey) {
-    Set modes = new HashSet();
-    modes.add(journey.access().mode());
-    modes.add(journey.egress().mode());
-    modes.add(journey.transfer().mode());
-    if (modes.contains(StreetMode.BIKE) && modes.size() != 1) {
-      throw new IllegalArgumentException(
-        "If BICYCLE is used for access, egress or transfer, then it should be used for all."
-      );
-    }
-  }
-
-  /**
-   * This methods returns list of modes and their costs from the argument structure:
-   * modes.transit.transit. This methods circumvents a bug in graphql-codegen as getting a list of
-   * input objects is not possible through using the generated types in {@link GraphQLTypes}.
-   * 
      
-   * TODO this ugliness can be removed when the bug gets fixed
-   */
-  private static List> getTransitModes(DataFetchingEnvironment environment) {
-    if (environment.containsArgument("modes")) {
-      Map modesArgs = environment.getArgument("modes");
-      if (modesArgs.containsKey("transit")) {
-        Map transitArgs = (Map) modesArgs.get("transit");
-        if (transitArgs.containsKey("transit")) {
-          return (List>) transitArgs.get("transit");
-        }
-      }
-    }
-    return List.of();
-  }
-
   private static GenericLocation parseGenericLocation(
     GraphQLTypes.GraphQLPlanLabeledLocationInput locationInput
   ) {
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
new file mode 100644
index 00000000000..c6e83d9af0a
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
@@ -0,0 +1,89 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import java.util.Set;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.framework.collection.CollectionUtils;
+import org.opentripplanner.routing.api.request.preference.ScooterPreferences;
+import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences;
+
+public class ScooterPreferencesMapper {
+
+  static void setScooterPreferences(
+    ScooterPreferences.Builder preferences,
+    GraphQLTypes.GraphQLScooterPreferencesInput args
+  ) {
+    if (args != null) {
+      var speed = args.getGraphQLSpeed();
+      if (speed != null) {
+        preferences.withSpeed(speed);
+      }
+      var reluctance = args.getGraphQLReluctance();
+      if (reluctance != null) {
+        preferences.withReluctance(reluctance);
+      }
+      preferences.withRental(rental -> setScooterRentalPreferences(rental, args.getGraphQLRental())
+      );
+      setScooterOptimization(preferences, args.getGraphQLOptimization());
+    }
+  }
+
+  private static void setScooterRentalPreferences(
+    VehicleRentalPreferences.Builder preferences,
+    GraphQLTypes.GraphQLScooterRentalPreferencesInput args
+  ) {
+    if (args != null) {
+      var allowedNetworks = args.getGraphQLAllowedNetworks();
+      if (!CollectionUtils.isEmpty(allowedNetworks)) {
+        preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
+      }
+      var bannedNetworks = args.getGraphQLBannedNetworks();
+      if (!CollectionUtils.isEmpty(bannedNetworks)) {
+        preferences.withBannedNetworks(Set.copyOf(bannedNetworks));
+      }
+      var destinationPolicy = args.getGraphQLDestinationScooterPolicy();
+      if (destinationPolicy != null) {
+        var allowed = destinationPolicy.getGraphQLAllowKeeping();
+        if (allowed != null) {
+          preferences.withAllowArrivingInRentedVehicleAtDestination(allowed);
+        }
+        var cost = destinationPolicy.getGraphQLKeepingCost();
+        if (cost != null) {
+          preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds());
+        }
+      }
+    }
+  }
+
+  private static void setScooterOptimization(
+    ScooterPreferences.Builder preferences,
+    GraphQLTypes.GraphQLScooterOptimizationInput args
+  ) {
+    if (args != null) {
+      var type = args.getGraphQLType();
+      var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null;
+      if (mappedType != null) {
+        preferences.withOptimizeType(mappedType);
+      }
+      var triangleArgs = args.getGraphQLTriangle();
+      if (isScooterTriangleSet(triangleArgs)) {
+        preferences.withForcedOptimizeTriangle(triangle -> {
+          triangle
+            .withSlope(triangleArgs.getGraphQLFlatness())
+            .withSafety(triangleArgs.getGraphQLSafety())
+            .withTime(triangleArgs.getGraphQLTime());
+        });
+      }
+    }
+  }
+
+  private static boolean isScooterTriangleSet(
+    GraphQLTypes.GraphQLTriangleScooterFactorsInput args
+  ) {
+    return (
+      args != null &&
+      args.getGraphQLFlatness() != null &&
+      args.getGraphQLSafety() != null &&
+      args.getGraphQLTime() != null
+    );
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java
new file mode 100644
index 00000000000..792a23bb2a1
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java
@@ -0,0 +1,102 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.ArgumentUtils.getTransitModes;
+
+import graphql.schema.DataFetchingEnvironment;
+import java.util.Map;
+import java.util.stream.Collectors;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper;
+import org.opentripplanner.framework.collection.CollectionUtils;
+import org.opentripplanner.framework.time.DurationUtils;
+import org.opentripplanner.routing.api.request.preference.TransferPreferences;
+import org.opentripplanner.routing.api.request.preference.TransitPreferences;
+
+public class TransitPreferencesMapper {
+
+  static void setTransitPreferences(
+    TransitPreferences.Builder transitPreferences,
+    TransferPreferences.Builder transferPreferences,
+    GraphQLTypes.GraphQLQueryTypePlanConnectionArgs args,
+    DataFetchingEnvironment environment
+  ) {
+    var modes = args.getGraphQLModes();
+    var transit = getTransitModes(environment);
+    if (!Boolean.TRUE.equals(modes.getGraphQLDirectOnly()) && !CollectionUtils.isEmpty(transit)) {
+      var reluctanceForMode = transit
+        .stream()
+        .filter(mode -> mode.containsKey("cost"))
+        .collect(
+          Collectors.toMap(
+            mode ->
+              TransitModeMapper.map(
+                GraphQLTypes.GraphQLTransitMode.valueOf((String) mode.get("mode"))
+              ),
+            mode -> (Double) ((Map) mode.get("cost")).get("reluctance")
+          )
+        );
+      transitPreferences.setReluctanceForMode(reluctanceForMode);
+    }
+    var transitArgs = args.getGraphQLPreferences().getGraphQLTransit();
+    if (transitArgs != null) {
+      var board = transitArgs.getGraphQLBoard();
+      if (board != null) {
+        var slack = board.getGraphQLSlack();
+        if (slack != null) {
+          transitPreferences.withDefaultBoardSlackSec(
+            (int) DurationUtils.requireNonNegativeMedium(slack, "board slack").toSeconds()
+          );
+        }
+        var waitReluctance = board.getGraphQLWaitReluctance();
+        if (waitReluctance != null) {
+          transferPreferences.withWaitReluctance(waitReluctance);
+        }
+      }
+      var alight = transitArgs.getGraphQLAlight();
+      if (alight != null) {
+        var slack = alight.getGraphQLSlack();
+        if (slack != null) {
+          transitPreferences.withDefaultAlightSlackSec(
+            (int) DurationUtils.requireNonNegativeMedium(slack, "alight slack").toSeconds()
+          );
+        }
+      }
+      var transfer = transitArgs.getGraphQLTransfer();
+      if (transfer != null) {
+        var cost = transfer.getGraphQLCost();
+        if (cost != null) {
+          transferPreferences.withCost(cost.toSeconds());
+        }
+        var slack = transfer.getGraphQLSlack();
+        if (slack != null) {
+          transferPreferences.withSlack(
+            (int) DurationUtils.requireNonNegativeMedium(slack, "transfer slack").toSeconds()
+          );
+        }
+        var maxTransfers = transfer.getGraphQLMaximumTransfers();
+        if (maxTransfers != null) {
+          transferPreferences.withMaxTransfers(maxTransfers);
+        }
+        var additionalTransfers = transfer.getGraphQLMaximumAdditionalTransfers();
+        if (additionalTransfers != null) {
+          transferPreferences.withMaxAdditionalTransfers(additionalTransfers);
+        }
+      }
+      var timetable = transitArgs.getGraphQLTimetable();
+      if (timetable != null) {
+        var excludeUpdates = timetable.getGraphQLExcludeRealTimeUpdates();
+        if (excludeUpdates != null) {
+          transitPreferences.setIgnoreRealtimeUpdates(excludeUpdates);
+        }
+        var includePlannedCancellations = timetable.getGraphQLIncludePlannedCancellations();
+        if (includePlannedCancellations != null) {
+          transitPreferences.setIncludePlannedCancellations(includePlannedCancellations);
+        }
+        var includeRealtimeCancellations = timetable.getGraphQLIncludeRealTimeCancellations();
+        if (includeRealtimeCancellations != null) {
+          transitPreferences.setIncludeRealtimeCancellations(includeRealtimeCancellations);
+        }
+      }
+    }
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
new file mode 100644
index 00000000000..be2d520ec04
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
@@ -0,0 +1,31 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.routing.api.request.preference.WalkPreferences;
+
+public class WalkPreferencesMapper {
+
+  static void setWalkPreferences(
+    WalkPreferences.Builder preferences,
+    GraphQLTypes.GraphQLWalkPreferencesInput args
+  ) {
+    if (args != null) {
+      var speed = args.getGraphQLSpeed();
+      if (speed != null) {
+        preferences.withSpeed(speed);
+      }
+      var reluctance = args.getGraphQLReluctance();
+      if (reluctance != null) {
+        preferences.withReluctance(reluctance);
+      }
+      var walkSafetyFactor = args.getGraphQLWalkSafetyFactor();
+      if (walkSafetyFactor != null) {
+        preferences.withSafetyFactor(walkSafetyFactor);
+      }
+      var boardCost = args.getGraphQLBoardCost();
+      if (boardCost != null) {
+        preferences.withBoardCost(boardCost.toSeconds());
+      }
+    }
+  }
+}

From 171a09060c1912fb285ea6a9a7b2dcde60b036f9 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 22 Mar 2024 16:48:51 +0200
Subject: [PATCH 0855/1688] Split bicycle tests into own class

---
 .../RouteRequestMapperBicycleTest.java        | 314 +++++++++++++++++
 .../routerequest/RouteRequestMapperTest.java  | 323 ++----------------
 2 files changed, 351 insertions(+), 286 deletions(-)
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
new file mode 100644
index 00000000000..50f04f4d2a2
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
@@ -0,0 +1,314 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext;
+
+import java.time.Duration;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner._support.time.ZoneIds;
+import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
+import org.opentripplanner.apis.gtfs.TestRoutingService;
+import org.opentripplanner.ext.fares.impl.DefaultFareService;
+import org.opentripplanner.framework.model.Cost;
+import org.opentripplanner.routing.api.request.RouteRequest;
+import org.opentripplanner.routing.core.VehicleRoutingOptimizeType;
+import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.graphfinder.GraphFinder;
+import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
+import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService;
+import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TransitModel;
+
+class RouteRequestMapperBicycleTest {
+
+  private static final GraphQLRequestContext context;
+  private static final Map args = new HashMap<>();
+
+  static {
+    args.put(
+      "origin",
+      Map.ofEntries(
+        entry("location", Map.of("coordinate", Map.of("latitude", 1.0, "longitude", 2.0)))
+      )
+    );
+    args.put(
+      "destination",
+      Map.ofEntries(
+        entry("location", Map.of("coordinate", Map.of("latitude", 2.0, "longitude", 1.0)))
+      )
+    );
+
+    Graph graph = new Graph();
+    var transitModel = new TransitModel();
+    transitModel.initTimeZone(ZoneIds.BERLIN);
+    final DefaultTransitService transitService = new DefaultTransitService(transitModel);
+    context =
+      new GraphQLRequestContext(
+        new TestRoutingService(List.of()),
+        transitService,
+        new DefaultFareService(),
+        graph.getVehicleParkingService(),
+        new DefaultVehicleRentalService(),
+        new DefaultRealtimeVehicleService(transitService),
+        GraphFinder.getInstance(graph, transitService::findRegularStops),
+        new RouteRequest()
+      );
+  }
+
+  @Test
+  void testBasicBikePreferences() {
+    var bicycleArgs = createArgsCopy(args);
+    var reluctance = 7.5;
+    var speed = 15d;
+    var boardCost = Cost.costOfSeconds(50);
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry("reluctance", reluctance),
+                entry("speed", speed),
+                entry("boardCost", boardCost)
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikePreferences = routeRequest.preferences().bike();
+    assertEquals(reluctance, bikePreferences.reluctance());
+    assertEquals(speed, bikePreferences.speed());
+    assertEquals(boardCost.toSeconds(), bikePreferences.boardCost());
+  }
+
+  @Test
+  void testBikeWalkPreferences() {
+    var bicycleArgs = createArgsCopy(args);
+    var walkSpeed = 7d;
+    var mountDismountTime = Duration.ofSeconds(23);
+    var mountDismountCost = Cost.costOfSeconds(35);
+    var walkReluctance = 6.3;
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "walk",
+                  Map.ofEntries(
+                    entry("speed", walkSpeed),
+                    entry("mountDismountTime", mountDismountTime),
+                    entry(
+                      "cost",
+                      Map.ofEntries(
+                        entry("mountDismountCost", mountDismountCost),
+                        entry("reluctance", walkReluctance)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikeWalkingPreferences = routeRequest.preferences().bike().walking();
+    assertEquals(walkSpeed, bikeWalkingPreferences.speed());
+    assertEquals(mountDismountTime, bikeWalkingPreferences.mountDismountTime());
+    assertEquals(mountDismountCost, bikeWalkingPreferences.mountDismountCost());
+    assertEquals(walkReluctance, bikeWalkingPreferences.reluctance());
+  }
+
+  @Test
+  void testBikeTrianglePreferences() {
+    var bicycleArgs = createArgsCopy(args);
+    var bikeSafety = 0.3;
+    var bikeFlatness = 0.5;
+    var bikeTime = 0.2;
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "optimization",
+                  Map.ofEntries(
+                    entry(
+                      "triangle",
+                      Map.ofEntries(
+                        entry("safety", bikeSafety),
+                        entry("flatness", bikeFlatness),
+                        entry("time", bikeTime)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikePreferences = routeRequest.preferences().bike();
+    assertEquals(VehicleRoutingOptimizeType.TRIANGLE, bikePreferences.optimizeType());
+    var bikeTrianglePreferences = bikePreferences.optimizeTriangle();
+    assertEquals(bikeSafety, bikeTrianglePreferences.safety());
+    assertEquals(bikeFlatness, bikeTrianglePreferences.slope());
+    assertEquals(bikeTime, bikeTrianglePreferences.time());
+  }
+
+  @Test
+  void testBikeOptimizationPreferences() {
+    var bicycleArgs = createArgsCopy(args);
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(entry("optimization", Map.ofEntries(entry("type", "SAFEST_STREETS"))))
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikePreferences = routeRequest.preferences().bike();
+    assertEquals(VehicleRoutingOptimizeType.SAFEST_STREETS, bikePreferences.optimizeType());
+  }
+
+  @Test
+  void testBikeRentalPreferences() {
+    var bicycleArgs = createArgsCopy(args);
+    var allowed = Set.of("foo", "bar");
+    var banned = Set.of("not");
+    var allowKeeping = true;
+    var keepingCost = Cost.costOfSeconds(150);
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "rental",
+                  Map.ofEntries(
+                    entry("allowedNetworks", allowed.stream().toList()),
+                    entry("bannedNetworks", banned.stream().toList()),
+                    entry(
+                      "destinationBicyclePolicy",
+                      Map.ofEntries(
+                        entry("allowKeeping", allowKeeping),
+                        entry("keepingCost", keepingCost)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikeRentalPreferences = routeRequest.preferences().bike().rental();
+    assertEquals(allowed, bikeRentalPreferences.allowedNetworks());
+    assertEquals(banned, bikeRentalPreferences.bannedNetworks());
+    assertEquals(allowKeeping, bikeRentalPreferences.allowArrivingInRentedVehicleAtDestination());
+    assertEquals(keepingCost, bikeRentalPreferences.arrivingInRentalVehicleAtDestinationCost());
+  }
+
+  @Test
+  void testBikeParkingPreferences() {
+    var bicycleArgs = createArgsCopy(args);
+    var unpreferredCost = Cost.costOfSeconds(150);
+    var notFilter = List.of("wheelbender");
+    var selectFilter = List.of("locker", "roof");
+    var unpreferred = List.of("bad");
+    var preferred = List.of("a", "b");
+    bicycleArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "bicycle",
+              Map.ofEntries(
+                entry(
+                  "parking",
+                  Map.ofEntries(
+                    entry("unpreferredCost", unpreferredCost),
+                    entry(
+                      "filters",
+                      List.of(
+                        Map.ofEntries(
+                          entry("not", List.of(Map.of("tags", notFilter))),
+                          entry("select", List.of(Map.of("tags", selectFilter)))
+                        )
+                      )
+                    ),
+                    entry(
+                      "preferred",
+                      List.of(
+                        Map.ofEntries(
+                          entry("not", List.of(Map.of("tags", unpreferred))),
+                          entry("select", List.of(Map.of("tags", preferred)))
+                        )
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var bikeParkingPreferences = routeRequest.preferences().bike().parking();
+    assertEquals(unpreferredCost, bikeParkingPreferences.unpreferredVehicleParkingTagCost());
+    assertEquals(
+      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(notFilter, selectFilter),
+      bikeParkingPreferences.filter().toString()
+    );
+    assertEquals(
+      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(unpreferred, preferred),
+      bikeParkingPreferences.preferred().toString()
+    );
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
index 740ec2bc373..e8b38eb217b 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
@@ -20,19 +20,16 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.opentripplanner._support.time.ZoneIds;
 import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
 import org.opentripplanner.apis.gtfs.TestRoutingService;
 import org.opentripplanner.ext.fares.impl.DefaultFareService;
-import org.opentripplanner.framework.model.Cost;
 import org.opentripplanner.model.plan.paging.cursor.PageCursor;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile;
-import org.opentripplanner.routing.core.VehicleRoutingOptimizeType;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.graphfinder.GraphFinder;
 import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
@@ -86,7 +83,7 @@ class RouteRequestMapperTest {
 
   @Test
   void testMinimalArgs() {
-    var env = executionContext(args);
+    var env = executionContext(args, LOCALE, context);
     var defaultRequest = new RouteRequest();
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(ORIGIN.x, routeRequest.from().lat);
@@ -118,10 +115,10 @@ void testMinimalArgs() {
 
   @Test
   void testEarliestDeparture() {
-    var dateTimeArgs = createArgsCopy();
+    var dateTimeArgs = createArgsCopy(args);
     var dateTime = OffsetDateTime.of(LocalDate.of(2020, 3, 15), LocalTime.MIDNIGHT, ZoneOffset.UTC);
     dateTimeArgs.put("dateTime", Map.ofEntries(entry("earliestDeparture", dateTime)));
-    var env = executionContext(dateTimeArgs);
+    var env = executionContext(dateTimeArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(dateTime.toInstant(), routeRequest.dateTime());
     assertFalse(routeRequest.arriveBy());
@@ -130,10 +127,10 @@ void testEarliestDeparture() {
 
   @Test
   void testLatestArrival() {
-    var dateTimeArgs = createArgsCopy();
+    var dateTimeArgs = createArgsCopy(args);
     var dateTime = OffsetDateTime.of(LocalDate.of(2020, 3, 15), LocalTime.MIDNIGHT, ZoneOffset.UTC);
     dateTimeArgs.put("dateTime", Map.ofEntries(entry("latestArrival", dateTime)));
-    var env = executionContext(dateTimeArgs);
+    var env = executionContext(dateTimeArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(dateTime.toInstant(), routeRequest.dateTime());
     assertTrue(routeRequest.arriveBy());
@@ -161,7 +158,7 @@ void testStopLocationAndLabel() {
         entry("label", destinationLabel)
       )
     );
-    var env = executionContext(stopLocationArgs);
+    var env = executionContext(stopLocationArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(FeedScopedId.parse(stopA), routeRequest.from().stopId);
     assertEquals(originLabel, routeRequest.from().label);
@@ -172,9 +169,9 @@ void testStopLocationAndLabel() {
   @Test
   void testLocale() {
     var englishLocale = Locale.ENGLISH;
-    var localeArgs = createArgsCopy();
+    var localeArgs = createArgsCopy(args);
     localeArgs.put("locale", englishLocale);
-    var env = executionContext(localeArgs);
+    var env = executionContext(localeArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(englishLocale, routeRequest.locale());
   }
@@ -182,9 +179,9 @@ void testLocale() {
   @Test
   void testSearchWindow() {
     var searchWindow = Duration.ofHours(5);
-    var searchWindowArgs = createArgsCopy();
+    var searchWindowArgs = createArgsCopy(args);
     searchWindowArgs.put("searchWindow", searchWindow);
-    var env = executionContext(searchWindowArgs);
+    var env = executionContext(searchWindowArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(searchWindow, routeRequest.searchWindow());
   }
@@ -195,12 +192,12 @@ void testBefore() {
       "MXxQUkVWSU9VU19QQUdFfDIwMjQtMDMtMTVUMTM6MzU6MzlafHw0MG18U1RSRUVUX0FORF9BUlJJVkFMX1RJTUV8ZmFsc2V8MjAyNC0wMy0xNVQxNDoyODoxNFp8MjAyNC0wMy0xNVQxNToxNDoyMlp8MXw0MjUzfA=="
     );
     var last = 8;
-    var beforeArgs = createArgsCopy();
+    var beforeArgs = createArgsCopy(args);
     beforeArgs.put("before", before.encode());
     beforeArgs.put("first", 3);
     beforeArgs.put("last", last);
     beforeArgs.put("numberOfItineraries", 3);
-    var env = executionContext(beforeArgs);
+    var env = executionContext(beforeArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(before, routeRequest.pageCursor());
     assertEquals(last, routeRequest.numItineraries());
@@ -212,12 +209,12 @@ void testAfter() {
       "MXxORVhUX1BBR0V8MjAyNC0wMy0xNVQxNDo0MzoxNFp8fDQwbXxTVFJFRVRfQU5EX0FSUklWQUxfVElNRXxmYWxzZXwyMDI0LTAzLTE1VDE0OjI4OjE0WnwyMDI0LTAzLTE1VDE1OjE0OjIyWnwxfDQyNTN8"
     );
     var first = 8;
-    var afterArgs = createArgsCopy();
+    var afterArgs = createArgsCopy(args);
     afterArgs.put("after", after.encode());
     afterArgs.put("first", first);
     afterArgs.put("last", 3);
     afterArgs.put("numberOfItineraries", 3);
-    var env = executionContext(afterArgs);
+    var env = executionContext(afterArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(after, routeRequest.pageCursor());
     assertEquals(first, routeRequest.numItineraries());
@@ -226,34 +223,34 @@ void testAfter() {
   @Test
   void testNumberOfItineraries() {
     var itineraries = 8;
-    var itinArgs = createArgsCopy();
+    var itinArgs = createArgsCopy(args);
     itinArgs.put("numberOfItineraries", itineraries);
-    var env = executionContext(itinArgs);
+    var env = executionContext(itinArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(itineraries, routeRequest.numItineraries());
   }
 
   @Test
   void testDirectOnly() {
-    var modesArgs = createArgsCopy();
+    var modesArgs = createArgsCopy(args);
     modesArgs.put("modes", Map.ofEntries(entry("directOnly", true)));
-    var env = executionContext(modesArgs);
+    var env = executionContext(modesArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertFalse(routeRequest.journey().transit().enabled());
   }
 
   @Test
   void testTransitOnly() {
-    var modesArgs = createArgsCopy();
+    var modesArgs = createArgsCopy(args);
     modesArgs.put("modes", Map.ofEntries(entry("transitOnly", true)));
-    var env = executionContext(modesArgs);
+    var env = executionContext(modesArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(StreetMode.NOT_SET, routeRequest.journey().direct().mode());
   }
 
   @Test
   void testStreetModes() {
-    var modesArgs = createArgsCopy();
+    var modesArgs = createArgsCopy(args);
     var bicycle = List.of("BICYCLE");
     modesArgs.put(
       "modes",
@@ -269,7 +266,7 @@ void testStreetModes() {
         )
       )
     );
-    var env = executionContext(modesArgs);
+    var env = executionContext(modesArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     assertEquals(StreetMode.CAR, routeRequest.journey().direct().mode());
     assertEquals(StreetMode.BIKE, routeRequest.journey().access().mode());
@@ -279,7 +276,7 @@ void testStreetModes() {
 
   @Test
   void testTransitModes() {
-    var modesArgs = createArgsCopy();
+    var modesArgs = createArgsCopy(args);
     var tramCost = 1.5;
     modesArgs.put(
       "modes",
@@ -301,7 +298,7 @@ void testTransitModes() {
         )
       )
     );
-    var env = executionContext(modesArgs);
+    var env = executionContext(modesArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     var reluctanceForMode = routeRequest.preferences().transit().reluctanceForMode();
     assertEquals(tramCost, reluctanceForMode.get(TransitMode.TRAM));
@@ -314,7 +311,7 @@ void testTransitModes() {
 
   @Test
   void testItineraryFilters() {
-    var filterArgs = createArgsCopy();
+    var filterArgs = createArgsCopy(args);
     var profile = ItineraryFilterDebugProfile.LIMIT_TO_NUM_OF_ITINERARIES;
     var keepOne = 0.4;
     var keepThree = 0.6;
@@ -328,7 +325,7 @@ void testItineraryFilters() {
         entry("groupedOtherThanSameLegsMaxCostMultiplier", multiplier)
       )
     );
-    var env = executionContext(filterArgs);
+    var env = executionContext(filterArgs, LOCALE, context);
     var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
     var itinFilter = routeRequest.preferences().itineraryFilter();
     assertEquals(profile, itinFilter.debug());
@@ -337,279 +334,33 @@ void testItineraryFilters() {
     assertEquals(multiplier, itinFilter.groupedOtherThanSameLegsMaxCostMultiplier());
   }
 
-  @Test
-  void testBasicBikePreferences() {
-    var bicycleArgs = createArgsCopy();
-    var reluctance = 7.5;
-    var speed = 15d;
-    var boardCost = Cost.costOfSeconds(50);
-    bicycleArgs.put(
-      "preferences",
-      Map.ofEntries(
-        entry(
-          "street",
-          Map.ofEntries(
-            entry(
-              "bicycle",
-              Map.ofEntries(
-                entry("reluctance", reluctance),
-                entry("speed", speed),
-                entry("boardCost", boardCost)
-              )
-            )
-          )
-        )
-      )
-    );
-    var env = executionContext(bicycleArgs);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
-    var bikePreferences = routeRequest.preferences().bike();
-    assertEquals(reluctance, bikePreferences.reluctance());
-    assertEquals(speed, bikePreferences.speed());
-    assertEquals(boardCost.toSeconds(), bikePreferences.boardCost());
-  }
-
-  @Test
-  void testBikeWalkPreferences() {
-    var bicycleArgs = createArgsCopy();
-    var walkSpeed = 7d;
-    var mountDismountTime = Duration.ofSeconds(23);
-    var mountDismountCost = Cost.costOfSeconds(35);
-    var walkReluctance = 6.3;
-    bicycleArgs.put(
-      "preferences",
-      Map.ofEntries(
-        entry(
-          "street",
-          Map.ofEntries(
-            entry(
-              "bicycle",
-              Map.ofEntries(
-                entry(
-                  "walk",
-                  Map.ofEntries(
-                    entry("speed", walkSpeed),
-                    entry("mountDismountTime", mountDismountTime),
-                    entry(
-                      "cost",
-                      Map.ofEntries(
-                        entry("mountDismountCost", mountDismountCost),
-                        entry("reluctance", walkReluctance)
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    );
-    var env = executionContext(bicycleArgs);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
-    var bikeWalkingPreferences = routeRequest.preferences().bike().walking();
-    assertEquals(walkSpeed, bikeWalkingPreferences.speed());
-    assertEquals(mountDismountTime, bikeWalkingPreferences.mountDismountTime());
-    assertEquals(mountDismountCost, bikeWalkingPreferences.mountDismountCost());
-    assertEquals(walkReluctance, bikeWalkingPreferences.reluctance());
-  }
-
-  @Test
-  void testBikeTrianglePreferences() {
-    var bicycleArgs = createArgsCopy();
-    var bikeSafety = 0.3;
-    var bikeFlatness = 0.5;
-    var bikeTime = 0.2;
-    bicycleArgs.put(
-      "preferences",
-      Map.ofEntries(
-        entry(
-          "street",
-          Map.ofEntries(
-            entry(
-              "bicycle",
-              Map.ofEntries(
-                entry(
-                  "optimization",
-                  Map.ofEntries(
-                    entry(
-                      "triangle",
-                      Map.ofEntries(
-                        entry("safety", bikeSafety),
-                        entry("flatness", bikeFlatness),
-                        entry("time", bikeTime)
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    );
-    var env = executionContext(bicycleArgs);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
-    var bikePreferences = routeRequest.preferences().bike();
-    assertEquals(VehicleRoutingOptimizeType.TRIANGLE, bikePreferences.optimizeType());
-    var bikeTrianglePreferences = bikePreferences.optimizeTriangle();
-    assertEquals(bikeSafety, bikeTrianglePreferences.safety());
-    assertEquals(bikeFlatness, bikeTrianglePreferences.slope());
-    assertEquals(bikeTime, bikeTrianglePreferences.time());
-  }
-
-  @Test
-  void testBikeOptimizationPreferences() {
-    var bicycleArgs = createArgsCopy();
-    bicycleArgs.put(
-      "preferences",
-      Map.ofEntries(
-        entry(
-          "street",
-          Map.ofEntries(
-            entry(
-              "bicycle",
-              Map.ofEntries(entry("optimization", Map.ofEntries(entry("type", "SAFEST_STREETS"))))
-            )
-          )
-        )
-      )
-    );
-    var env = executionContext(bicycleArgs);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
-    var bikePreferences = routeRequest.preferences().bike();
-    assertEquals(VehicleRoutingOptimizeType.SAFEST_STREETS, bikePreferences.optimizeType());
-  }
-
-  @Test
-  void testBikeRentalPreferences() {
-    var bicycleArgs = createArgsCopy();
-    var allowed = Set.of("foo", "bar");
-    var banned = Set.of("not");
-    var allowKeeping = true;
-    var keepingCost = Cost.costOfSeconds(150);
-    bicycleArgs.put(
-      "preferences",
-      Map.ofEntries(
-        entry(
-          "street",
-          Map.ofEntries(
-            entry(
-              "bicycle",
-              Map.ofEntries(
-                entry(
-                  "rental",
-                  Map.ofEntries(
-                    entry("allowedNetworks", allowed.stream().toList()),
-                    entry("bannedNetworks", banned.stream().toList()),
-                    entry(
-                      "destinationBicyclePolicy",
-                      Map.ofEntries(
-                        entry("allowKeeping", allowKeeping),
-                        entry("keepingCost", keepingCost)
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    );
-    var env = executionContext(bicycleArgs);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
-    var bikeRentalPreferences = routeRequest.preferences().bike().rental();
-    assertEquals(allowed, bikeRentalPreferences.allowedNetworks());
-    assertEquals(banned, bikeRentalPreferences.bannedNetworks());
-    assertEquals(allowKeeping, bikeRentalPreferences.allowArrivingInRentedVehicleAtDestination());
-    assertEquals(keepingCost, bikeRentalPreferences.arrivingInRentalVehicleAtDestinationCost());
-  }
-
-  @Test
-  void testBikeParkingPreferences() {
-    var bicycleArgs = createArgsCopy();
-    var unpreferredCost = Cost.costOfSeconds(150);
-    var notFilter = List.of("wheelbender");
-    var selectFilter = List.of("locker", "roof");
-    var unpreferred = List.of("bad");
-    var preferred = List.of("a", "b");
-    bicycleArgs.put(
-      "preferences",
-      Map.ofEntries(
-        entry(
-          "street",
-          Map.ofEntries(
-            entry(
-              "bicycle",
-              Map.ofEntries(
-                entry(
-                  "parking",
-                  Map.ofEntries(
-                    entry("unpreferredCost", unpreferredCost),
-                    entry(
-                      "filters",
-                      List.of(
-                        Map.ofEntries(
-                          entry("not", List.of(Map.of("tags", notFilter))),
-                          entry("select", List.of(Map.of("tags", selectFilter)))
-                        )
-                      )
-                    ),
-                    entry(
-                      "preferred",
-                      List.of(
-                        Map.ofEntries(
-                          entry("not", List.of(Map.of("tags", unpreferred))),
-                          entry("select", List.of(Map.of("tags", preferred)))
-                        )
-                      )
-                    )
-                  )
-                )
-              )
-            )
-          )
-        )
-      )
-    );
-    var env = executionContext(bicycleArgs);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
-    var bikeParkingPreferences = routeRequest.preferences().bike().parking();
-    assertEquals(unpreferredCost, bikeParkingPreferences.unpreferredVehicleParkingTagCost());
-    assertEquals(
-      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(notFilter, selectFilter),
-      bikeParkingPreferences.filter().toString()
-    );
-    assertEquals(
-      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(unpreferred, preferred),
-      bikeParkingPreferences.preferred().toString()
-    );
-  }
-
-  private Map createArgsCopy() {
+  static Map createArgsCopy(Map arguments) {
     Map newArgs = new HashMap<>();
-    newArgs.putAll(args);
+    newArgs.putAll(arguments);
     return newArgs;
   }
 
-  private DataFetchingEnvironment executionContext(Map arguments) {
+  static DataFetchingEnvironment executionContext(
+    Map arguments,
+    Locale locale,
+    GraphQLRequestContext requestContext
+  ) {
     ExecutionInput executionInput = ExecutionInput
       .newExecutionInput()
       .query("")
       .operationName("planConnection")
-      .context(context)
-      .locale(LOCALE)
+      .context(requestContext)
+      .locale(locale)
       .build();
 
     var executionContext = newExecutionContextBuilder()
       .executionInput(executionInput)
-      .executionId(ExecutionId.from(this.getClass().getName()))
+      .executionId(ExecutionId.from("planConnectionTest"))
       .build();
     return DataFetchingEnvironmentImpl
       .newDataFetchingEnvironment(executionContext)
       .arguments(arguments)
-      .localContext(Map.of("locale", LOCALE))
+      .localContext(Map.of("locale", locale))
       .build();
   }
 }

From e88ca44b76e5d3b22ad61e0eab411bbeee75926a Mon Sep 17 00:00:00 2001
From: Henrik Abrahamsson 
Date: Fri, 22 Mar 2024 18:01:41 +0100
Subject: [PATCH 0856/1688] Minor cleanup

---
 .../ext/siri/updater/azure/AbstractAzureSiriUpdater.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
index bf5f8a6113a..ba1ae880d34 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java
@@ -218,12 +218,10 @@ protected Optional fetchInitialSiriData(URI uri) {
       LOG.info("Fetched initial data in {} ms", (t2 - t1));
 
       if (siriOptional.isEmpty()) {
-        LOG.info("Got status 204 'No Content', handling gracefully.");
-        return Optional.empty();
+        LOG.info("Got status 204 'No Content'.");
       }
 
-      var serviceDelivery = siriOptional.get().getServiceDelivery();
-      return Optional.ofNullable(serviceDelivery);
+      return siriOptional.flatMap(siri -> Optional.ofNullable(siri.getServiceDelivery()));
     }
   }
 

From 38a2ffffe307955b4708ccd0693222832c11a708 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Sat, 23 Mar 2024 22:07:16 +0200
Subject: [PATCH 0857/1688] Remove duplication

---
 .../RouteRequestMapperBicycleTest.java        | 82 ++++------------
 .../routerequest/RouteRequestMapperTest.java  | 98 +++++++++----------
 2 files changed, 67 insertions(+), 113 deletions(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
index 50f04f4d2a2..75c68c2a91a 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java
@@ -6,65 +6,19 @@
 import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext;
 
 import java.time.Duration;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import java.util.Set;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner._support.time.ZoneIds;
-import org.opentripplanner.apis.gtfs.GraphQLRequestContext;
-import org.opentripplanner.apis.gtfs.TestRoutingService;
-import org.opentripplanner.ext.fares.impl.DefaultFareService;
 import org.opentripplanner.framework.model.Cost;
-import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.core.VehicleRoutingOptimizeType;
-import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.graphfinder.GraphFinder;
-import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
-import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService;
-import org.opentripplanner.transit.service.DefaultTransitService;
-import org.opentripplanner.transit.service.TransitModel;
 
 class RouteRequestMapperBicycleTest {
 
-  private static final GraphQLRequestContext context;
-  private static final Map args = new HashMap<>();
-
-  static {
-    args.put(
-      "origin",
-      Map.ofEntries(
-        entry("location", Map.of("coordinate", Map.of("latitude", 1.0, "longitude", 2.0)))
-      )
-    );
-    args.put(
-      "destination",
-      Map.ofEntries(
-        entry("location", Map.of("coordinate", Map.of("latitude", 2.0, "longitude", 1.0)))
-      )
-    );
-
-    Graph graph = new Graph();
-    var transitModel = new TransitModel();
-    transitModel.initTimeZone(ZoneIds.BERLIN);
-    final DefaultTransitService transitService = new DefaultTransitService(transitModel);
-    context =
-      new GraphQLRequestContext(
-        new TestRoutingService(List.of()),
-        transitService,
-        new DefaultFareService(),
-        graph.getVehicleParkingService(),
-        new DefaultVehicleRentalService(),
-        new DefaultRealtimeVehicleService(transitService),
-        GraphFinder.getInstance(graph, transitService::findRegularStops),
-        new RouteRequest()
-      );
-  }
-
   @Test
   void testBasicBikePreferences() {
-    var bicycleArgs = createArgsCopy(args);
+    var bicycleArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
     var reluctance = 7.5;
     var speed = 15d;
     var boardCost = Cost.costOfSeconds(50);
@@ -86,8 +40,8 @@ void testBasicBikePreferences() {
         )
       )
     );
-    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
     var bikePreferences = routeRequest.preferences().bike();
     assertEquals(reluctance, bikePreferences.reluctance());
     assertEquals(speed, bikePreferences.speed());
@@ -96,7 +50,7 @@ void testBasicBikePreferences() {
 
   @Test
   void testBikeWalkPreferences() {
-    var bicycleArgs = createArgsCopy(args);
+    var bicycleArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
     var walkSpeed = 7d;
     var mountDismountTime = Duration.ofSeconds(23);
     var mountDismountCost = Cost.costOfSeconds(35);
@@ -130,8 +84,8 @@ void testBikeWalkPreferences() {
         )
       )
     );
-    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
     var bikeWalkingPreferences = routeRequest.preferences().bike().walking();
     assertEquals(walkSpeed, bikeWalkingPreferences.speed());
     assertEquals(mountDismountTime, bikeWalkingPreferences.mountDismountTime());
@@ -141,7 +95,7 @@ void testBikeWalkPreferences() {
 
   @Test
   void testBikeTrianglePreferences() {
-    var bicycleArgs = createArgsCopy(args);
+    var bicycleArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
     var bikeSafety = 0.3;
     var bikeFlatness = 0.5;
     var bikeTime = 0.2;
@@ -173,8 +127,8 @@ void testBikeTrianglePreferences() {
         )
       )
     );
-    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
     var bikePreferences = routeRequest.preferences().bike();
     assertEquals(VehicleRoutingOptimizeType.TRIANGLE, bikePreferences.optimizeType());
     var bikeTrianglePreferences = bikePreferences.optimizeTriangle();
@@ -185,7 +139,7 @@ void testBikeTrianglePreferences() {
 
   @Test
   void testBikeOptimizationPreferences() {
-    var bicycleArgs = createArgsCopy(args);
+    var bicycleArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
     bicycleArgs.put(
       "preferences",
       Map.ofEntries(
@@ -200,15 +154,15 @@ void testBikeOptimizationPreferences() {
         )
       )
     );
-    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
     var bikePreferences = routeRequest.preferences().bike();
     assertEquals(VehicleRoutingOptimizeType.SAFEST_STREETS, bikePreferences.optimizeType());
   }
 
   @Test
   void testBikeRentalPreferences() {
-    var bicycleArgs = createArgsCopy(args);
+    var bicycleArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
     var allowed = Set.of("foo", "bar");
     var banned = Set.of("not");
     var allowKeeping = true;
@@ -242,8 +196,8 @@ void testBikeRentalPreferences() {
         )
       )
     );
-    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
     var bikeRentalPreferences = routeRequest.preferences().bike().rental();
     assertEquals(allowed, bikeRentalPreferences.allowedNetworks());
     assertEquals(banned, bikeRentalPreferences.bannedNetworks());
@@ -253,7 +207,7 @@ void testBikeRentalPreferences() {
 
   @Test
   void testBikeParkingPreferences() {
-    var bicycleArgs = createArgsCopy(args);
+    var bicycleArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
     var unpreferredCost = Cost.costOfSeconds(150);
     var notFilter = List.of("wheelbender");
     var selectFilter = List.of("locker", "roof");
@@ -298,8 +252,8 @@ void testBikeParkingPreferences() {
         )
       )
     );
-    var env = executionContext(bicycleArgs, Locale.ENGLISH, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(bicycleArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
     var bikeParkingPreferences = routeRequest.preferences().bike().parking();
     assertEquals(unpreferredCost, bikeParkingPreferences.unpreferredVehicleParkingTagCost());
     assertEquals(
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
index e8b38eb217b..d1cc96fdea0 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java
@@ -44,17 +44,15 @@ class RouteRequestMapperTest {
   private static final Coordinate ORIGIN = new Coordinate(1.0, 2.0);
   private static final Coordinate DESTINATION = new Coordinate(2.0, 1.0);
   private static final Locale LOCALE = Locale.GERMAN;
-  private static final GraphQLRequestContext context;
-  private static final Map args = new HashMap<>();
-
-  static {
-    args.put(
+  static final GraphQLRequestContext CONTEXT;
+  static final Map ARGS = Map.ofEntries(
+    entry(
       "origin",
       Map.ofEntries(
         entry("location", Map.of("coordinate", Map.of("latitude", ORIGIN.x, "longitude", ORIGIN.y)))
       )
-    );
-    args.put(
+    ),
+    entry(
       "destination",
       Map.ofEntries(
         entry(
@@ -62,13 +60,15 @@ class RouteRequestMapperTest {
           Map.of("coordinate", Map.of("latitude", DESTINATION.x, "longitude", DESTINATION.y))
         )
       )
-    );
+    )
+  );
 
+  static {
     Graph graph = new Graph();
     var transitModel = new TransitModel();
     transitModel.initTimeZone(ZoneIds.BERLIN);
     final DefaultTransitService transitService = new DefaultTransitService(transitModel);
-    context =
+    CONTEXT =
       new GraphQLRequestContext(
         new TestRoutingService(List.of()),
         transitService,
@@ -83,9 +83,9 @@ class RouteRequestMapperTest {
 
   @Test
   void testMinimalArgs() {
-    var env = executionContext(args, LOCALE, context);
+    var env = executionContext(ARGS, LOCALE, CONTEXT);
     var defaultRequest = new RouteRequest();
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(ORIGIN.x, routeRequest.from().lat);
     assertEquals(ORIGIN.y, routeRequest.from().lng);
     assertEquals(DESTINATION.x, routeRequest.to().lat);
@@ -115,11 +115,11 @@ void testMinimalArgs() {
 
   @Test
   void testEarliestDeparture() {
-    var dateTimeArgs = createArgsCopy(args);
+    var dateTimeArgs = createArgsCopy(ARGS);
     var dateTime = OffsetDateTime.of(LocalDate.of(2020, 3, 15), LocalTime.MIDNIGHT, ZoneOffset.UTC);
     dateTimeArgs.put("dateTime", Map.ofEntries(entry("earliestDeparture", dateTime)));
-    var env = executionContext(dateTimeArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(dateTimeArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(dateTime.toInstant(), routeRequest.dateTime());
     assertFalse(routeRequest.arriveBy());
     assertFalse(routeRequest.isTripPlannedForNow());
@@ -127,11 +127,11 @@ void testEarliestDeparture() {
 
   @Test
   void testLatestArrival() {
-    var dateTimeArgs = createArgsCopy(args);
+    var dateTimeArgs = createArgsCopy(ARGS);
     var dateTime = OffsetDateTime.of(LocalDate.of(2020, 3, 15), LocalTime.MIDNIGHT, ZoneOffset.UTC);
     dateTimeArgs.put("dateTime", Map.ofEntries(entry("latestArrival", dateTime)));
-    var env = executionContext(dateTimeArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(dateTimeArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(dateTime.toInstant(), routeRequest.dateTime());
     assertTrue(routeRequest.arriveBy());
     assertFalse(routeRequest.isTripPlannedForNow());
@@ -158,8 +158,8 @@ void testStopLocationAndLabel() {
         entry("label", destinationLabel)
       )
     );
-    var env = executionContext(stopLocationArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(stopLocationArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(FeedScopedId.parse(stopA), routeRequest.from().stopId);
     assertEquals(originLabel, routeRequest.from().label);
     assertEquals(FeedScopedId.parse(stopB), routeRequest.to().stopId);
@@ -169,20 +169,20 @@ void testStopLocationAndLabel() {
   @Test
   void testLocale() {
     var englishLocale = Locale.ENGLISH;
-    var localeArgs = createArgsCopy(args);
+    var localeArgs = createArgsCopy(ARGS);
     localeArgs.put("locale", englishLocale);
-    var env = executionContext(localeArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(localeArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(englishLocale, routeRequest.locale());
   }
 
   @Test
   void testSearchWindow() {
     var searchWindow = Duration.ofHours(5);
-    var searchWindowArgs = createArgsCopy(args);
+    var searchWindowArgs = createArgsCopy(ARGS);
     searchWindowArgs.put("searchWindow", searchWindow);
-    var env = executionContext(searchWindowArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(searchWindowArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(searchWindow, routeRequest.searchWindow());
   }
 
@@ -192,13 +192,13 @@ void testBefore() {
       "MXxQUkVWSU9VU19QQUdFfDIwMjQtMDMtMTVUMTM6MzU6MzlafHw0MG18U1RSRUVUX0FORF9BUlJJVkFMX1RJTUV8ZmFsc2V8MjAyNC0wMy0xNVQxNDoyODoxNFp8MjAyNC0wMy0xNVQxNToxNDoyMlp8MXw0MjUzfA=="
     );
     var last = 8;
-    var beforeArgs = createArgsCopy(args);
+    var beforeArgs = createArgsCopy(ARGS);
     beforeArgs.put("before", before.encode());
     beforeArgs.put("first", 3);
     beforeArgs.put("last", last);
     beforeArgs.put("numberOfItineraries", 3);
-    var env = executionContext(beforeArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(beforeArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(before, routeRequest.pageCursor());
     assertEquals(last, routeRequest.numItineraries());
   }
@@ -209,13 +209,13 @@ void testAfter() {
       "MXxORVhUX1BBR0V8MjAyNC0wMy0xNVQxNDo0MzoxNFp8fDQwbXxTVFJFRVRfQU5EX0FSUklWQUxfVElNRXxmYWxzZXwyMDI0LTAzLTE1VDE0OjI4OjE0WnwyMDI0LTAzLTE1VDE1OjE0OjIyWnwxfDQyNTN8"
     );
     var first = 8;
-    var afterArgs = createArgsCopy(args);
+    var afterArgs = createArgsCopy(ARGS);
     afterArgs.put("after", after.encode());
     afterArgs.put("first", first);
     afterArgs.put("last", 3);
     afterArgs.put("numberOfItineraries", 3);
-    var env = executionContext(afterArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(afterArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(after, routeRequest.pageCursor());
     assertEquals(first, routeRequest.numItineraries());
   }
@@ -223,34 +223,34 @@ void testAfter() {
   @Test
   void testNumberOfItineraries() {
     var itineraries = 8;
-    var itinArgs = createArgsCopy(args);
+    var itinArgs = createArgsCopy(ARGS);
     itinArgs.put("numberOfItineraries", itineraries);
-    var env = executionContext(itinArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(itinArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(itineraries, routeRequest.numItineraries());
   }
 
   @Test
   void testDirectOnly() {
-    var modesArgs = createArgsCopy(args);
+    var modesArgs = createArgsCopy(ARGS);
     modesArgs.put("modes", Map.ofEntries(entry("directOnly", true)));
-    var env = executionContext(modesArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(modesArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertFalse(routeRequest.journey().transit().enabled());
   }
 
   @Test
   void testTransitOnly() {
-    var modesArgs = createArgsCopy(args);
+    var modesArgs = createArgsCopy(ARGS);
     modesArgs.put("modes", Map.ofEntries(entry("transitOnly", true)));
-    var env = executionContext(modesArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(modesArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(StreetMode.NOT_SET, routeRequest.journey().direct().mode());
   }
 
   @Test
   void testStreetModes() {
-    var modesArgs = createArgsCopy(args);
+    var modesArgs = createArgsCopy(ARGS);
     var bicycle = List.of("BICYCLE");
     modesArgs.put(
       "modes",
@@ -266,8 +266,8 @@ void testStreetModes() {
         )
       )
     );
-    var env = executionContext(modesArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(modesArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     assertEquals(StreetMode.CAR, routeRequest.journey().direct().mode());
     assertEquals(StreetMode.BIKE, routeRequest.journey().access().mode());
     assertEquals(StreetMode.BIKE, routeRequest.journey().egress().mode());
@@ -276,7 +276,7 @@ void testStreetModes() {
 
   @Test
   void testTransitModes() {
-    var modesArgs = createArgsCopy(args);
+    var modesArgs = createArgsCopy(ARGS);
     var tramCost = 1.5;
     modesArgs.put(
       "modes",
@@ -298,8 +298,8 @@ void testTransitModes() {
         )
       )
     );
-    var env = executionContext(modesArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(modesArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     var reluctanceForMode = routeRequest.preferences().transit().reluctanceForMode();
     assertEquals(tramCost, reluctanceForMode.get(TransitMode.TRAM));
     assertNull(reluctanceForMode.get(TransitMode.FERRY));
@@ -311,7 +311,7 @@ void testTransitModes() {
 
   @Test
   void testItineraryFilters() {
-    var filterArgs = createArgsCopy(args);
+    var filterArgs = createArgsCopy(ARGS);
     var profile = ItineraryFilterDebugProfile.LIMIT_TO_NUM_OF_ITINERARIES;
     var keepOne = 0.4;
     var keepThree = 0.6;
@@ -325,8 +325,8 @@ void testItineraryFilters() {
         entry("groupedOtherThanSameLegsMaxCostMultiplier", multiplier)
       )
     );
-    var env = executionContext(filterArgs, LOCALE, context);
-    var routeRequest = RouteRequestMapper.toRouteRequest(env, context);
+    var env = executionContext(filterArgs, LOCALE, CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT);
     var itinFilter = routeRequest.preferences().itineraryFilter();
     assertEquals(profile, itinFilter.debug());
     assertEquals(keepOne, itinFilter.groupSimilarityKeepOne());

From 7b4fcf202fd26c0dbd48d4cc99ed09105dc1da44 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Sat, 23 Mar 2024 22:19:58 +0200
Subject: [PATCH 0858/1688] Fix allowedNetworks for scooter and car as well

---
 .../apis/gtfs/mapping/routerequest/CarPreferencesMapper.java    | 2 +-
 .../gtfs/mapping/routerequest/ScooterPreferencesMapper.java     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
index b815144c1d0..b0ba8e9776c 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java
@@ -58,7 +58,7 @@ private static void setCarRentalPreferences(
     if (args != null) {
       var allowedNetworks = args.getGraphQLAllowedNetworks();
       if (!CollectionUtils.isEmpty(allowedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
+        preferences.withAllowedNetworks(Set.copyOf(allowedNetworks));
       }
       var bannedNetworks = args.getGraphQLBannedNetworks();
       if (!CollectionUtils.isEmpty(bannedNetworks)) {
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
index c6e83d9af0a..f3da4c22463 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java
@@ -34,7 +34,7 @@ private static void setScooterRentalPreferences(
     if (args != null) {
       var allowedNetworks = args.getGraphQLAllowedNetworks();
       if (!CollectionUtils.isEmpty(allowedNetworks)) {
-        preferences.withBannedNetworks(Set.copyOf(allowedNetworks));
+        preferences.withAllowedNetworks(Set.copyOf(allowedNetworks));
       }
       var bannedNetworks = args.getGraphQLBannedNetworks();
       if (!CollectionUtils.isEmpty(bannedNetworks)) {

From c358ba46d302e3032a83b8148c47a7b779e4afcd Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Sat, 23 Mar 2024 22:41:13 +0200
Subject: [PATCH 0859/1688] Rename walkSafetyFactor -> safetyFactor

---
 .../apis/gtfs/generated/GraphQLTypes.java     | 20 +++++++++----------
 .../routerequest/WalkPreferencesMapper.java   |  2 +-
 .../opentripplanner/apis/gtfs/schema.graphqls |  2 +-
 .../apis/gtfs/queries/planConnection.graphql  |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
index 3cb0eb1e5a2..0a65edef4a8 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
@@ -4985,15 +4985,15 @@ public static class GraphQLWalkPreferencesInput {
 
     private org.opentripplanner.framework.model.Cost boardCost;
     private Double reluctance;
+    private Double safetyFactor;
     private Double speed;
-    private Double walkSafetyFactor;
 
     public GraphQLWalkPreferencesInput(Map args) {
       if (args != null) {
         this.boardCost = (org.opentripplanner.framework.model.Cost) args.get("boardCost");
         this.reluctance = (Double) args.get("reluctance");
+        this.safetyFactor = (Double) args.get("safetyFactor");
         this.speed = (Double) args.get("speed");
-        this.walkSafetyFactor = (Double) args.get("walkSafetyFactor");
       }
     }
 
@@ -5005,12 +5005,12 @@ public Double getGraphQLReluctance() {
       return this.reluctance;
     }
 
-    public Double getGraphQLSpeed() {
-      return this.speed;
+    public Double getGraphQLSafetyFactor() {
+      return this.safetyFactor;
     }
 
-    public Double getGraphQLWalkSafetyFactor() {
-      return this.walkSafetyFactor;
+    public Double getGraphQLSpeed() {
+      return this.speed;
     }
 
     public void setGraphQLBoardCost(org.opentripplanner.framework.model.Cost boardCost) {
@@ -5021,12 +5021,12 @@ public void setGraphQLReluctance(Double reluctance) {
       this.reluctance = reluctance;
     }
 
-    public void setGraphQLSpeed(Double speed) {
-      this.speed = speed;
+    public void setGraphQLSafetyFactor(Double safetyFactor) {
+      this.safetyFactor = safetyFactor;
     }
 
-    public void setGraphQLWalkSafetyFactor(Double walkSafetyFactor) {
-      this.walkSafetyFactor = walkSafetyFactor;
+    public void setGraphQLSpeed(Double speed) {
+      this.speed = speed;
     }
   }
 
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
index be2d520ec04..b202d9e7300 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java
@@ -18,7 +18,7 @@ static void setWalkPreferences(
       if (reluctance != null) {
         preferences.withReluctance(reluctance);
       }
-      var walkSafetyFactor = args.getGraphQLWalkSafetyFactor();
+      var walkSafetyFactor = args.getGraphQLSafetyFactor();
       if (walkSafetyFactor != null) {
         preferences.withSafetyFactor(walkSafetyFactor);
       }
diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 1011c98c91b..4d7fdbb78bb 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -5536,7 +5536,7 @@ input WalkPreferencesInput {
     Factor for how much the walk safety is considered in routing. Value should be between 0 and 1.
     If the value is set to be 0, safety is ignored.
     """
-    walkSafetyFactor: Ratio
+    safetyFactor: Ratio
 
     """
     The cost of boarding a vehicle while walking.
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql
index 39691b349f8..aec99442d3b 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql
@@ -111,7 +111,7 @@
         walk: {
           speed: 2.4
           reluctance: 1.5
-          walkSafetyFactor: 0.5
+          safetyFactor: 0.5
           boardCost: 200
         }
       }

From 427a7b2a436a38825cc42c91ff9a713aad220bf7 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Sat, 23 Mar 2024 22:43:36 +0200
Subject: [PATCH 0860/1688] Add tests for other street preferences

---
 .../RouteRequestMapperCarTest.java            | 125 ++++++++++++++
 .../RouteRequestMapperScooterTest.java        | 154 ++++++++++++++++++
 .../RouteRequestMapperWalkTest.java           |  49 ++++++
 3 files changed, 328 insertions(+)
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java
new file mode 100644
index 00000000000..0fe8f76c26d
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java
@@ -0,0 +1,125 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.framework.model.Cost;
+
+class RouteRequestMapperCarTest {
+
+  @Test
+  void testBasicCarPreferences() {
+    var carArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var reluctance = 7.5;
+    carArgs.put(
+      "preferences",
+      Map.ofEntries(entry("street", Map.ofEntries(entry("car", Map.of("reluctance", reluctance)))))
+    );
+    var env = executionContext(carArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var carPreferences = routeRequest.preferences().car();
+    assertEquals(reluctance, carPreferences.reluctance());
+  }
+
+  @Test
+  void testCarRentalPreferences() {
+    var carArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var allowed = Set.of("foo", "bar");
+    var banned = Set.of("not");
+    carArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "car",
+              Map.ofEntries(
+                entry(
+                  "rental",
+                  Map.ofEntries(
+                    entry("allowedNetworks", allowed.stream().toList()),
+                    entry("bannedNetworks", banned.stream().toList())
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(carArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var carRentalPreferences = routeRequest.preferences().car().rental();
+    assertEquals(allowed, carRentalPreferences.allowedNetworks());
+    assertEquals(banned, carRentalPreferences.bannedNetworks());
+  }
+
+  @Test
+  void testCarParkingPreferences() {
+    var carArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var unpreferredCost = Cost.costOfSeconds(150);
+    var notFilter = List.of("wheelbender");
+    var selectFilter = List.of("locker", "roof");
+    var unpreferred = List.of("bad");
+    var preferred = List.of("a", "b");
+    carArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "car",
+              Map.ofEntries(
+                entry(
+                  "parking",
+                  Map.ofEntries(
+                    entry("unpreferredCost", unpreferredCost),
+                    entry(
+                      "filters",
+                      List.of(
+                        Map.ofEntries(
+                          entry("not", List.of(Map.of("tags", notFilter))),
+                          entry("select", List.of(Map.of("tags", selectFilter)))
+                        )
+                      )
+                    ),
+                    entry(
+                      "preferred",
+                      List.of(
+                        Map.ofEntries(
+                          entry("not", List.of(Map.of("tags", unpreferred))),
+                          entry("select", List.of(Map.of("tags", preferred)))
+                        )
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(carArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var carParkingPreferences = routeRequest.preferences().car().parking();
+    assertEquals(unpreferredCost, carParkingPreferences.unpreferredVehicleParkingTagCost());
+    assertEquals(
+      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(notFilter, selectFilter),
+      carParkingPreferences.filter().toString()
+    );
+    assertEquals(
+      "VehicleParkingFilter{not: [tags=%s], select: [tags=%s]}".formatted(unpreferred, preferred),
+      carParkingPreferences.preferred().toString()
+    );
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java
new file mode 100644
index 00000000000..507f7276df8
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java
@@ -0,0 +1,154 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext;
+
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.framework.model.Cost;
+import org.opentripplanner.routing.core.VehicleRoutingOptimizeType;
+
+class RouteRequestMapperScooterTest {
+
+  @Test
+  void testBasicScooterPreferences() {
+    var scooterArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var reluctance = 7.5;
+    var speed = 15d;
+    scooterArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry("scooter", Map.ofEntries(entry("reluctance", reluctance), entry("speed", speed)))
+          )
+        )
+      )
+    );
+    var env = executionContext(scooterArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var scooterPreferences = routeRequest.preferences().scooter();
+    assertEquals(reluctance, scooterPreferences.reluctance());
+    assertEquals(speed, scooterPreferences.speed());
+  }
+
+  @Test
+  void testScooterTrianglePreferences() {
+    var scooterArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var scooterSafety = 0.3;
+    var scooterFlatness = 0.5;
+    var scooterTime = 0.2;
+    scooterArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "scooter",
+              Map.ofEntries(
+                entry(
+                  "optimization",
+                  Map.ofEntries(
+                    entry(
+                      "triangle",
+                      Map.ofEntries(
+                        entry("safety", scooterSafety),
+                        entry("flatness", scooterFlatness),
+                        entry("time", scooterTime)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(scooterArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var scooterPreferences = routeRequest.preferences().scooter();
+    assertEquals(VehicleRoutingOptimizeType.TRIANGLE, scooterPreferences.optimizeType());
+    var scooterTrianglePreferences = scooterPreferences.optimizeTriangle();
+    assertEquals(scooterSafety, scooterTrianglePreferences.safety());
+    assertEquals(scooterFlatness, scooterTrianglePreferences.slope());
+    assertEquals(scooterTime, scooterTrianglePreferences.time());
+  }
+
+  @Test
+  void testScooterOptimizationPreferences() {
+    var scooterArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    scooterArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "scooter",
+              Map.ofEntries(entry("optimization", Map.ofEntries(entry("type", "SAFEST_STREETS"))))
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(scooterArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var scooterPreferences = routeRequest.preferences().scooter();
+    assertEquals(VehicleRoutingOptimizeType.SAFEST_STREETS, scooterPreferences.optimizeType());
+  }
+
+  @Test
+  void testScooterRentalPreferences() {
+    var scooterArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var allowed = Set.of("foo", "bar");
+    var banned = Set.of("not");
+    var allowKeeping = true;
+    var keepingCost = Cost.costOfSeconds(150);
+    scooterArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "scooter",
+              Map.ofEntries(
+                entry(
+                  "rental",
+                  Map.ofEntries(
+                    entry("allowedNetworks", allowed.stream().toList()),
+                    entry("bannedNetworks", banned.stream().toList()),
+                    entry(
+                      "destinationScooterPolicy",
+                      Map.ofEntries(
+                        entry("allowKeeping", allowKeeping),
+                        entry("keepingCost", keepingCost)
+                      )
+                    )
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(scooterArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var scooterRentalPreferences = routeRequest.preferences().scooter().rental();
+    assertEquals(allowed, scooterRentalPreferences.allowedNetworks());
+    assertEquals(banned, scooterRentalPreferences.bannedNetworks());
+    assertEquals(
+      allowKeeping,
+      scooterRentalPreferences.allowArrivingInRentedVehicleAtDestination()
+    );
+    assertEquals(keepingCost, scooterRentalPreferences.arrivingInRentalVehicleAtDestinationCost());
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java
new file mode 100644
index 00000000000..86d249419e1
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperWalkTest.java
@@ -0,0 +1,49 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext;
+
+import java.util.Locale;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.framework.model.Cost;
+
+class RouteRequestMapperWalkTest {
+
+  @Test
+  void testWalkPreferences() {
+    var walkArgs = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var reluctance = 7.5;
+    var speed = 15d;
+    var boardCost = Cost.costOfSeconds(50);
+    var safetyFactor = 0.4;
+    walkArgs.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "street",
+          Map.ofEntries(
+            entry(
+              "walk",
+              Map.ofEntries(
+                entry("reluctance", reluctance),
+                entry("speed", speed),
+                entry("boardCost", boardCost),
+                entry("safetyFactor", safetyFactor)
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(walkArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var walkPreferences = routeRequest.preferences().walk();
+    assertEquals(reluctance, walkPreferences.reluctance());
+    assertEquals(speed, walkPreferences.speed());
+    assertEquals(boardCost.toSeconds(), walkPreferences.boardCost());
+    assertEquals(safetyFactor, walkPreferences.safetyFactor());
+  }
+}

From dd68ea1b29627099559bf851fab304733edf75d0 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Sun, 24 Mar 2024 00:03:43 +0200
Subject: [PATCH 0861/1688] Add transit and accesibility tests

---
 .../RouteRequestMapperAccessibilityTest.java  |  31 +++++
 .../RouteRequestMapperTransitTest.java        | 126 ++++++++++++++++++
 2 files changed, 157 insertions(+)
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java
new file mode 100644
index 00000000000..99377aa7e46
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperAccessibilityTest.java
@@ -0,0 +1,31 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext;
+
+import java.util.Locale;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+
+class RouteRequestMapperAccessibilityTest {
+
+  @Test
+  void testWheelchairPreferences() {
+    var args = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var wheelchairEnabled = true;
+    args.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "accessibility",
+          Map.ofEntries(entry("wheelchair", Map.ofEntries(entry("enabled", wheelchairEnabled))))
+        )
+      )
+    );
+    var env = executionContext(args, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    assertEquals(wheelchairEnabled, routeRequest.wheelchair());
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java
new file mode 100644
index 00000000000..a8b5c10b381
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java
@@ -0,0 +1,126 @@
+package org.opentripplanner.apis.gtfs.mapping.routerequest;
+
+import static java.util.Map.entry;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy;
+import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext;
+
+import java.time.Duration;
+import java.util.Locale;
+import java.util.Map;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.framework.model.Cost;
+import org.opentripplanner.transit.model.basic.TransitMode;
+
+class RouteRequestMapperTransitTest {
+
+  @Test
+  void testBoardPreferences() {
+    var args = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var reluctance = 7.5;
+    var slack = Duration.ofSeconds(125);
+    args.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "transit",
+          Map.ofEntries(
+            entry(
+              "board",
+              Map.ofEntries(entry("waitReluctance", reluctance), entry("slack", slack))
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(args, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var transferPreferences = routeRequest.preferences().transfer();
+    assertEquals(reluctance, transferPreferences.waitReluctance());
+    var transitPreferences = routeRequest.preferences().transit();
+    assertEquals(slack, transitPreferences.boardSlack().valueOf(TransitMode.BUS));
+  }
+
+  @Test
+  void testAlightPreferences() {
+    var args = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var slack = Duration.ofSeconds(125);
+    args.put(
+      "preferences",
+      Map.ofEntries(
+        entry("transit", Map.ofEntries(entry("alight", Map.ofEntries(entry("slack", slack)))))
+      )
+    );
+    var env = executionContext(args, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var transitPreferences = routeRequest.preferences().transit();
+    assertEquals(slack, transitPreferences.alightSlack().valueOf(TransitMode.BUS));
+  }
+
+  @Test
+  void testTransferPreferences() {
+    var args = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var cost = Cost.costOfSeconds(75);
+    var slack = Duration.ofSeconds(125);
+    var maximumAdditionalTransfers = 1;
+    var maximumTransfers = 3;
+    args.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "transit",
+          Map.ofEntries(
+            entry(
+              "transfer",
+              Map.ofEntries(
+                entry("cost", cost),
+                entry("slack", slack),
+                entry("maximumAdditionalTransfers", maximumAdditionalTransfers),
+                entry("maximumTransfers", maximumTransfers)
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(args, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var transferPreferences = routeRequest.preferences().transfer();
+    assertEquals(cost.toSeconds(), transferPreferences.cost());
+    assertEquals(slack.toSeconds(), transferPreferences.slack());
+    assertEquals(maximumAdditionalTransfers, transferPreferences.maxAdditionalTransfers());
+    assertEquals(maximumTransfers, transferPreferences.maxTransfers());
+  }
+
+  @Test
+  void testTimetablePreferences() {
+    var args = createArgsCopy(RouteRequestMapperTest.ARGS);
+    var excludeRealTimeUpdates = true;
+    var includePlannedCancellations = true;
+    var includeRealTimeCancellations = true;
+    args.put(
+      "preferences",
+      Map.ofEntries(
+        entry(
+          "transit",
+          Map.ofEntries(
+            entry(
+              "timetable",
+              Map.ofEntries(
+                entry("excludeRealTimeUpdates", excludeRealTimeUpdates),
+                entry("includePlannedCancellations", includePlannedCancellations),
+                entry("includeRealTimeCancellations", includeRealTimeCancellations)
+              )
+            )
+          )
+        )
+      )
+    );
+    var env = executionContext(args, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT);
+    var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT);
+    var transitPreferences = routeRequest.preferences().transit();
+    assertEquals(excludeRealTimeUpdates, transitPreferences.ignoreRealtimeUpdates());
+    assertEquals(includePlannedCancellations, transitPreferences.includePlannedCancellations());
+    assertEquals(includeRealTimeCancellations, transitPreferences.includeRealtimeCancellations());
+  }
+}

From b4a0f8ec4d0b9421d8bbcaabe3d89f6c37ca7b66 Mon Sep 17 00:00:00 2001
From: sharhio 
Date: Mon, 25 Mar 2024 10:01:53 +0200
Subject: [PATCH 0862/1688] changelog entry

---
 doc-templates/sandbox/MapboxVectorTilesApi.md | 1 +
 docs/sandbox/MapboxVectorTilesApi.md          | 1 +
 2 files changed, 2 insertions(+)

diff --git a/doc-templates/sandbox/MapboxVectorTilesApi.md b/doc-templates/sandbox/MapboxVectorTilesApi.md
index d64d9700da4..6468f56db32 100644
--- a/doc-templates/sandbox/MapboxVectorTilesApi.md
+++ b/doc-templates/sandbox/MapboxVectorTilesApi.md
@@ -212,3 +212,4 @@ key, and a function to create the mapper, with a `Graph` object as a parameter,
   * Added a new Digitransit vehicle parking mapper with no real-time information and less fields
 - 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627)
 - 2024-02-27: Add layer for flex zones [#5704](https://github.com/opentripplanner/OpenTripPlanner/pull/5704)
+- 2024-03-25: Add layer for realtime stops [#5743](https://github.com/opentripplanner/OpenTripPlanner/pull/5743)
diff --git a/docs/sandbox/MapboxVectorTilesApi.md b/docs/sandbox/MapboxVectorTilesApi.md
index a78b47e92ae..62f3bd36c38 100644
--- a/docs/sandbox/MapboxVectorTilesApi.md
+++ b/docs/sandbox/MapboxVectorTilesApi.md
@@ -307,3 +307,4 @@ key, and a function to create the mapper, with a `Graph` object as a parameter,
   * Added a new Digitransit vehicle parking mapper with no real-time information and less fields
 - 2024-01-22: Make `basePath` configurable [#5627](https://github.com/opentripplanner/OpenTripPlanner/pull/5627)
 - 2024-02-27: Add layer for flex zones [#5704](https://github.com/opentripplanner/OpenTripPlanner/pull/5704)
+- 2024-03-25: Add layer for realtime stops [#5743](https://github.com/opentripplanner/OpenTripPlanner/pull/5743)

From e53e8783a4ed8c4753f01e4220abd53677a8d8f2 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 25 Mar 2024 10:21:36 +0100
Subject: [PATCH 0863/1688] Add link to osm.org from new debug client

---
 .../src/components/MapView/GeometryPropertyPopup.tsx     | 9 +++++++++
 client-next/src/style.css                                | 7 +++++++
 2 files changed, 16 insertions(+)

diff --git a/client-next/src/components/MapView/GeometryPropertyPopup.tsx b/client-next/src/components/MapView/GeometryPropertyPopup.tsx
index 3ecedb2c67d..968dfdcde76 100644
--- a/client-next/src/components/MapView/GeometryPropertyPopup.tsx
+++ b/client-next/src/components/MapView/GeometryPropertyPopup.tsx
@@ -28,6 +28,15 @@ export function GeometryPropertyPopup({
           ))}

      5. +       ); } diff --git a/client-next/src/style.css b/client-next/src/style.css index 9a538686043..79c85d38628 100644 --- a/client-next/src/style.css +++ b/client-next/src/style.css @@ -120,6 +120,13 @@ padding-left: 2px; } +/* geometry popup */ + +.geometry-popup-osm-link { + text-align: right; + padding: 0 5px; +} + /* debug layer selector */ .maplibregl-ctrl-group.layer-select { From 32eefbcfbeb4c2dda4fb6c5acf340c8ed8bd9cf0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 10:46:11 +0100 Subject: [PATCH 0864/1688] Apply suggestions from code review Co-authored-by: Thomas Gran --- docs/Migrating-Configuration.md | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/Migrating-Configuration.md b/docs/Migrating-Configuration.md index ab36ebf4fa0..e78dfa55357 100644 --- a/docs/Migrating-Configuration.md +++ b/docs/Migrating-Configuration.md @@ -16,22 +16,19 @@ to be a configuration error, perhaps because the schema was changed. In such a c consult the [feature](Configuration.md#otp-features), [router](RouterConfiguration.md) or [build configuration documentation](BuildConfiguration.md) to find out what the new schema looks like. -By default, OTP starts up even when unknown configuration parameters have been found. This is there -to support the style deployment where old config parameters remain in the file for a certain migration -period. - -This allows you to roll back the OTP version without the need to roll back the OTP configuration. +By default, OTP starts up even if unknown configuration parameters exists. This supports forward and backwards +migration of config parameters independent if the OTP version. This allow the configuration to follow the lifecycle of the environment and still be able to roll back OTP. Combined with the config parameter substitution it also allows using the same configuration in different environments. Tip! Rolling out the configuration before rolling out a new +version of OTP, ensure you that you are safe and can roll back later. An example: you change the location of the graphs, a critical error occurs afterwards and you need to roll back. Any member of the dev-ops team should then be confident that they can roll back without -risk - even if the environment changed. +risk - even if the environment changed since the last OTP version was rolled out. ### Aborting on invalid configuration If you want OTP to abort the startup when encountering unknown configuration parameters, you can add the flag `--abortOnUnknownConfig` to your regular OTP CLI commands. -This should of course be used wisely as it can also accidentally make your production instances refuse -to start up. -Therefore, we recommend that you use it only in a separate pre-production step, perhaps during graph -build. \ No newline at end of file +This should of course be used wisely as it can also accidentally make your production instances refuse to start up. +For some deployments this is a good solution - especially if the config substitution feature is used to inject +environment specific information. Using this feature in the graph-build phase is less risky, than in the OTP serve phase. \ No newline at end of file From cc4b0d9939a373b1275ca016298c5c752ad8a727 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 10:54:19 +0100 Subject: [PATCH 0865/1688] Rename tests --- .../framework/json/NodeAdapterTest.java | 37 ++++++++----------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index 5a1aa2f0063..29969851c29 100644 --- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -23,7 +23,6 @@ import java.util.Locale; import java.util.Map; import java.util.Set; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.framework.application.OtpAppException; @@ -558,31 +557,27 @@ void unusedParams() { assertEquals("Unexpected config parameter: 'foo.b:false' in 'Test'", buf.toString()); } - @Nested - class Validation { - - @Test - void invalidProperties() { - // Given: two parameters a and b - NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); + @Test + void unknownProperties() { + // Given: two parameters a and b + NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); - // When: Access ONLY parameter 'a', but not 'b' - subject.of("foo").asObject().of("a").asBoolean(); + // When: Access ONLY parameter 'a', but not 'b' + subject.of("foo").asObject().of("a").asBoolean(); - assertTrue(subject.hasUnknownParameters()); - } + assertTrue(subject.hasUnknownParameters()); + } - @Test - void valid() { - // Given: two parameters a and b - NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); + @Test + void allPropertiesAreKnown() { + // Given: two parameters a and b + NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); - var object = subject.of("foo").asObject(); - object.of("a").asBoolean(); - object.of("b").asBoolean(); + var object = subject.of("foo").asObject(); + object.of("a").asBoolean(); + object.of("b").asBoolean(); - assertFalse(subject.hasUnknownParameters()); - } + assertFalse(subject.hasUnknownParameters()); } private static String unusedParams(NodeAdapter subject) { From 86f1a8321a2163e6687363b1423f9a61d107b45a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 10:55:38 +0100 Subject: [PATCH 0866/1688] Don't check warnings Co-authored-by: Thomas Gran --- .../standalone/config/framework/json/NodeAdapter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java index 9523e330eca..51303ea4fc5 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/NodeAdapter.java @@ -176,7 +176,7 @@ public void logAllWarnings(Consumer logger) { * Checks if any unknown or invalid properties were encountered while loading the configuration. */ public boolean hasUnknownParameters() { - return !unusedParams().isEmpty() || !allWarnings().toList().isEmpty(); + return !unusedParams().isEmpty(); } /** From 7cf928e96811a24e825e39331ad3e2beffc71cc3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 10:57:00 +0100 Subject: [PATCH 0867/1688] Rename from properties to parameters --- .../standalone/config/framework/json/NodeAdapterTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index 29969851c29..8128a48a678 100644 --- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -558,7 +558,7 @@ void unusedParams() { } @Test - void unknownProperties() { + void unknownParameters() { // Given: two parameters a and b NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); @@ -569,7 +569,7 @@ void unknownProperties() { } @Test - void allPropertiesAreKnown() { + void allParametersAreKnown() { // Given: two parameters a and b NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); From fae03b1b0648657c90fa40fec96457ac9e45d192 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 11:02:39 +0100 Subject: [PATCH 0868/1688] Move exception throwing code into ConfigModel.java --- .../opentripplanner/standalone/OTPMain.java | 7 ++---- .../standalone/config/ConfigModel.java | 22 ++++++++++++++----- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/OTPMain.java b/src/main/java/org/opentripplanner/standalone/OTPMain.java index de5ccd7057c..d865f8fa28c 100644 --- a/src/main/java/org/opentripplanner/standalone/OTPMain.java +++ b/src/main/java/org/opentripplanner/standalone/OTPMain.java @@ -180,11 +180,8 @@ private static void startOTPServer(CommandLineParameters cli) { * Optionally, check if the config is valid and if not abort the startup process. */ private static void detectUnusedConfigParams(CommandLineParameters cli, ConfigModel config) { - if (cli.abortOnUnknownConfig && config.hasUnknownParameters()) { - throw new OtpAppException( - "Configuration contains unknown parameters (see above for details). " + - "Please fix your configuration or remove --abortOnUnknownConfig from your OTP CLI parameters." - ); + if (cli.abortOnUnknownConfig) { + config.abortOnUnknownParameters(); } } diff --git a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java index 8cffa5002e4..c82dd33ddbf 100644 --- a/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java +++ b/src/main/java/org/opentripplanner/standalone/config/ConfigModel.java @@ -2,6 +2,7 @@ import com.fasterxml.jackson.databind.node.MissingNode; import org.opentripplanner.framework.application.OTPFeature; +import org.opentripplanner.framework.application.OtpAppException; import org.opentripplanner.framework.application.OtpFileNames; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -108,12 +109,21 @@ public static void initializeOtpFeatures(OtpConfig otpConfig) { /** * Checks if any unknown or invalid parameters were encountered while loading the configuration. + *

      + * If so it throws an exception. */ - public boolean hasUnknownParameters() { - return ( - otpConfig.hasUnknownParameters() || - buildConfig.hasUnknownParameters() || - routerConfig.hasUnknownParameters() - ); + public void abortOnUnknownParameters() { + if ( + ( + otpConfig.hasUnknownParameters() || + buildConfig.hasUnknownParameters() || + routerConfig.hasUnknownParameters() + ) + ) { + throw new OtpAppException( + "Configuration contains unknown parameters (see above for details). " + + "Please fix your configuration or remove --abortOnUnknownConfig from your OTP CLI parameters." + ); + } } } From 70026b92c4a00a98a45cfea6f8ac4ae2dce78b59 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 11:05:34 +0100 Subject: [PATCH 0869/1688] Improve documentation --- docs/Migrating-Configuration.md | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/Migrating-Configuration.md b/docs/Migrating-Configuration.md index e78dfa55357..c6f1ee946f6 100644 --- a/docs/Migrating-Configuration.md +++ b/docs/Migrating-Configuration.md @@ -16,8 +16,11 @@ to be a configuration error, perhaps because the schema was changed. In such a c consult the [feature](Configuration.md#otp-features), [router](RouterConfiguration.md) or [build configuration documentation](BuildConfiguration.md) to find out what the new schema looks like. -By default, OTP starts up even if unknown configuration parameters exists. This supports forward and backwards -migration of config parameters independent if the OTP version. This allow the configuration to follow the lifecycle of the environment and still be able to roll back OTP. Combined with the config parameter substitution it also allows using the same configuration in different environments. Tip! Rolling out the configuration before rolling out a new +By default, OTP starts up even if unknown configuration parameters exist. This supports forward and backwards +migration of config parameters independent if the OTP version. This allows the configuration to follow +the lifecycle of the environment and still be able to roll back OTP. +Combined with the config parameter substitution it also allows using the same configuration in +different environments. Tip! Rolling out the configuration before rolling out a new version of OTP, ensure you that you are safe and can roll back later. An example: you change the location of the graphs, a critical error occurs afterwards and you need to From ee00762b9c16ec7bcd4465be7828d4a8ee9e2472 Mon Sep 17 00:00:00 2001 From: Johan Torin Date: Mon, 25 Mar 2024 11:11:47 +0100 Subject: [PATCH 0870/1688] Update src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java Co-authored-by: Leonard Ehrenfried --- .../ext/siri/updater/azure/AbstractAzureSiriUpdater.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java index ba1ae880d34..1915105960e 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java @@ -221,7 +221,7 @@ protected Optional fetchInitialSiriData(URI uri) { LOG.info("Got status 204 'No Content'."); } - return siriOptional.flatMap(siri -> Optional.ofNullable(siri.getServiceDelivery())); + return siriOptional.map(siri -> siri.getServiceDelivery()); } } From c78619b4185fc0c9ddded0e451bf2b2ebfb59be5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 25 Mar 2024 13:09:12 +0200 Subject: [PATCH 0871/1688] Add tests for utils and rename duration util method --- .../routerequest/RouteRequestMapper.java | 2 +- .../framework/time/DurationUtils.java | 2 +- .../framework/graphql/GraphQLUtilsTest.java | 6 ++- .../framework/time/DurationUtilsTest.java | 42 +++++++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java index 3044577258f..cc45e87c35e 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java @@ -43,7 +43,7 @@ public static RouteRequest toRouteRequest( request.setLocale(GraphQLUtils.getLocale(environment, args.getGraphQLLocale())); if (args.getGraphQLSearchWindow() != null) { request.setSearchWindow( - DurationUtils.requireNonNegativeLarge(args.getGraphQLSearchWindow(), "searchWindow") + DurationUtils.requireNonNegativeLong(args.getGraphQLSearchWindow(), "searchWindow") ); } diff --git a/src/main/java/org/opentripplanner/framework/time/DurationUtils.java b/src/main/java/org/opentripplanner/framework/time/DurationUtils.java index 8f50240d693..9d16ed7d269 100644 --- a/src/main/java/org/opentripplanner/framework/time/DurationUtils.java +++ b/src/main/java/org/opentripplanner/framework/time/DurationUtils.java @@ -191,7 +191,7 @@ public static Duration requireNonNegative(Duration value) { * * @param subject used to identify name of the problematic value when throwing an exception. */ - public static Duration requireNonNegativeLarge(Duration value, String subject) { + public static Duration requireNonNegativeLong(Duration value, String subject) { Objects.requireNonNull(value); if (value.isNegative()) { throw new IllegalArgumentException( diff --git a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java index 9a1e2a2ba90..b72cb6e5a0d 100644 --- a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java @@ -73,9 +73,11 @@ void testGetLocaleWithDefinedLocaleArg() { var frenchLocale = Locale.FRENCH; - var locale = GraphQLUtils.getLocale(env, frenchLocale.toString()); + var localeWithString = GraphQLUtils.getLocale(env, frenchLocale.toString()); + assertEquals(frenchLocale, localeWithString); - assertEquals(frenchLocale, locale); + var localeWithLocale = GraphQLUtils.getLocale(env, frenchLocale); + assertEquals(frenchLocale, localeWithLocale); } @Test diff --git a/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java b/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java index 2457aa14b60..97b8afc52c0 100644 --- a/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/time/DurationUtilsTest.java @@ -4,6 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.params.provider.Arguments.of; import static org.opentripplanner.framework.time.DurationUtils.requireNonNegative; +import static org.opentripplanner.framework.time.DurationUtils.requireNonNegativeLong; +import static org.opentripplanner.framework.time.DurationUtils.requireNonNegativeMedium; +import static org.opentripplanner.framework.time.DurationUtils.requireNonNegativeShort; import static org.opentripplanner.framework.time.DurationUtils.toIntMilliseconds; import java.time.Duration; @@ -124,6 +127,45 @@ public void testRequireNonNegative() { assertThrows(IllegalArgumentException.class, () -> requireNonNegative(Duration.ofSeconds(-1))); } + @Test + public void testRequireNonNegativeLong() { + assertThrows(NullPointerException.class, () -> requireNonNegativeLong(null, "test")); + assertThrows( + IllegalArgumentException.class, + () -> requireNonNegativeLong(Duration.ofSeconds(-1), "test") + ); + assertThrows( + IllegalArgumentException.class, + () -> requireNonNegativeLong(Duration.ofDays(3), "test") + ); + } + + @Test + public void testRequireNonNegativeMedium() { + assertThrows(NullPointerException.class, () -> requireNonNegativeMedium(null, "test")); + assertThrows( + IllegalArgumentException.class, + () -> requireNonNegativeMedium(Duration.ofSeconds(-1), "test") + ); + assertThrows( + IllegalArgumentException.class, + () -> requireNonNegativeMedium(Duration.ofHours(3), "test") + ); + } + + @Test + public void testRequireNonNegativeShort() { + assertThrows(NullPointerException.class, () -> requireNonNegativeShort(null, "test")); + assertThrows( + IllegalArgumentException.class, + () -> requireNonNegativeShort(Duration.ofSeconds(-1), "test") + ); + assertThrows( + IllegalArgumentException.class, + () -> requireNonNegativeShort(Duration.ofMinutes(31), "test") + ); + } + @Test public void testToIntMilliseconds() { assertEquals(20, toIntMilliseconds(null, 20)); From e6c31e63e8ce73eb1dc628e62cc46bd00aec9bfe Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 25 Mar 2024 13:25:58 +0200 Subject: [PATCH 0872/1688] removed old string return value --- .../DigitransitRealtimeStopPropertyMapper.java | 8 +------- .../stops/DigitransitStopPropertyMapper.java | 17 ++++++----------- 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java index 47cf7210274..55d67d28d71 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java @@ -35,13 +35,7 @@ protected Collection map(RegularStop stop) { Collection sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService); return ListUtils.combine( sharedKeyValues, - List.of( - new KeyValue("closedByServiceAlert", noServiceAlert), - new KeyValue( - "parentStation", - stop.getParentStation() != null ? stop.getParentStation().getId() : null - ) - ) + List.of(new KeyValue("closedByServiceAlert", noServiceAlert)) ); } } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java index e9c40e43ba8..643ed63b7f8 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java @@ -35,16 +35,7 @@ protected static DigitransitStopPropertyMapper create( @Override protected Collection map(RegularStop stop) { - Collection sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService); - return ListUtils.combine( - sharedKeyValues, - List.of( - new KeyValue( - "parentStation", - stop.getParentStation() != null ? stop.getParentStation().getId() : "null" - ) - ) - ); + return getBaseKeyValues(stop, i18NStringMapper, transitService); } protected static Collection getBaseKeyValues( @@ -59,7 +50,11 @@ protected static Collection getBaseKeyValues( new KeyValue("platform", stop.getPlatformCode()), new KeyValue("desc", i18NStringMapper.mapToApi(stop.getDescription())), new KeyValue("type", getType(transitService, stop)), - new KeyValue("routes", getRoutes(transitService, stop)) + new KeyValue("routes", getRoutes(transitService, stop)), + new KeyValue( + "parentStation", + stop.getParentStation() != null ? stop.getParentStation().getId() : null + ) ); } From a88bef7e2c6fdf1eabc83063eb0be2f2de475726 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 12:43:05 +0100 Subject: [PATCH 0873/1688] Fix typo in schema file [ci skip] --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index c1189f21ba1..efd2cca1db3 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1673,7 +1673,7 @@ available. type LegTime { "The scheduled time of the event." scheduledTime: OffsetDateTime! - "The estimated time of the event. If no real-time information is available, this is null," + "The estimated time of the event. If no real-time information is available, this is null." estimated: RealTimeEstimate } From fb53e8c9d956e65e94e36949a8042da31acfba41 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 12:24:37 +0000 Subject: [PATCH 0874/1688] Update dependency vite to v5 --- client-next/package-lock.json | 1506 +++++---------------------------- client-next/package.json | 2 +- 2 files changed, 201 insertions(+), 1307 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 0f9f836e54e..c174a26ed2e 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -40,7 +40,7 @@ "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.2", - "vite": "4.5.2", + "vite": "5.2.6", "vitest": "1.4.0" } }, @@ -1214,9 +1214,9 @@ "dev": true }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.19.12.tgz", - "integrity": "sha512-bmoCYyWdEL3wDQIVbcyzRyeKLgk2WtWLTWz1ZIAZF/EGbNOwSA6ew3PftJ1PqMiOOGu0OyFMzG53L0zqIpPeNA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", "cpu": [ "ppc64" ], @@ -1230,9 +1230,9 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz", - "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ "arm" ], @@ -1246,9 +1246,9 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz", - "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", "cpu": [ "arm64" ], @@ -1262,9 +1262,9 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz", - "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", "cpu": [ "x64" ], @@ -1278,9 +1278,9 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz", - "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", "cpu": [ "arm64" ], @@ -1294,9 +1294,9 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz", - "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", "cpu": [ "x64" ], @@ -1310,9 +1310,9 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz", - "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", "cpu": [ "arm64" ], @@ -1326,9 +1326,9 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz", - "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", "cpu": [ "x64" ], @@ -1342,9 +1342,9 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz", - "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", "cpu": [ "arm" ], @@ -1358,9 +1358,9 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz", - "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", "cpu": [ "arm64" ], @@ -1374,9 +1374,9 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz", - "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", "cpu": [ "ia32" ], @@ -1390,9 +1390,9 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz", - "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", "cpu": [ "loong64" ], @@ -1406,9 +1406,9 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz", - "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", "cpu": [ "mips64el" ], @@ -1422,9 +1422,9 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz", - "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", "cpu": [ "ppc64" ], @@ -1438,9 +1438,9 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz", - "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", "cpu": [ "riscv64" ], @@ -1454,9 +1454,9 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz", - "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", "cpu": [ "s390x" ], @@ -1470,9 +1470,9 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.18.20.tgz", - "integrity": "sha512-UYqiqemphJcNsFEskc73jQ7B9jgwjWrSayxawS6UVFZGWrAAtkzjxSqnoclCXxWtfwLdzU+vTpcNYhpn43uP1w==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", "cpu": [ "x64" ], @@ -1486,9 +1486,9 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz", - "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", "cpu": [ "x64" ], @@ -1502,9 +1502,9 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz", - "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", "cpu": [ "x64" ], @@ -1518,9 +1518,9 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz", - "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", "cpu": [ "x64" ], @@ -1534,9 +1534,9 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz", - "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", "cpu": [ "arm64" ], @@ -1550,9 +1550,9 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz", - "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", "cpu": [ "ia32" ], @@ -1566,9 +1566,9 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz", - "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", "cpu": [ "x64" ], @@ -3196,9 +3196,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.10.0.tgz", - "integrity": "sha512-/MeDQmcD96nVoRumKUljsYOLqfv1YFJps+0pTrb2Z9Nl/w5qNUysMaWQsrd1mvAlNT4yza1iVyIu4Q4AgF6V3A==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", + "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", "cpu": [ "arm" ], @@ -3209,9 +3209,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.10.0.tgz", - "integrity": "sha512-lvu0jK97mZDJdpZKDnZI93I0Om8lSDaiPx3OiCk0RXn3E8CMPJNS/wxjAvSJJzhhZpfjXsjLWL8LnS6qET4VNQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", + "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", "cpu": [ "arm64" ], @@ -3222,9 +3222,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.10.0.tgz", - "integrity": "sha512-uFpayx8I8tyOvDkD7X6n0PriDRWxcqEjqgtlxnUA/G9oS93ur9aZ8c8BEpzFmsed1TH5WZNG5IONB8IiW90TQg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", + "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", "cpu": [ "arm64" ], @@ -3235,9 +3235,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.10.0.tgz", - "integrity": "sha512-nIdCX03qFKoR/MwQegQBK+qZoSpO3LESurVAC6s6jazLA1Mpmgzo3Nj3H1vydXp/JM29bkCiuF7tDuToj4+U9Q==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", + "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", "cpu": [ "x64" ], @@ -3248,9 +3248,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.10.0.tgz", - "integrity": "sha512-Fz7a+y5sYhYZMQFRkOyCs4PLhICAnxRX/GnWYReaAoruUzuRtcf+Qnw+T0CoAWbHCuz2gBUwmWnUgQ67fb3FYw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", + "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", "cpu": [ "arm" ], @@ -3261,9 +3261,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.10.0.tgz", - "integrity": "sha512-yPtF9jIix88orwfTi0lJiqINnlWo6p93MtZEoaehZnmCzEmLL0eqjA3eGVeyQhMtxdV+Mlsgfwhh0+M/k1/V7Q==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", + "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", "cpu": [ "arm64" ], @@ -3274,9 +3274,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.10.0.tgz", - "integrity": "sha512-9GW9yA30ib+vfFiwjX+N7PnjTnCMiUffhWj4vkG4ukYv1kJ4T9gHNg8zw+ChsOccM27G9yXrEtMScf1LaCuoWQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", + "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", "cpu": [ "arm64" ], @@ -3287,9 +3287,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.10.0.tgz", - "integrity": "sha512-X1ES+V4bMq2ws5fF4zHornxebNxMXye0ZZjUrzOrf7UMx1d6wMQtfcchZ8SqUnQPPHdOyOLW6fTcUiFgHFadRA==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", + "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", "cpu": [ "riscv64" ], @@ -3300,9 +3300,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.10.0.tgz", - "integrity": "sha512-w/5OpT2EnI/Xvypw4FIhV34jmNqU5PZjZue2l2Y3ty1Ootm3SqhI+AmfhlUYGBTd9JnpneZCDnt3uNOiOBkMyw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", + "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", "cpu": [ "x64" ], @@ -3313,9 +3313,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.10.0.tgz", - "integrity": "sha512-q/meftEe3QlwQiGYxD9rWwB21DoKQ9Q8wA40of/of6yGHhZuGfZO0c3WYkN9dNlopHlNT3mf5BPsUSxoPuVQaw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", + "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", "cpu": [ "x64" ], @@ -3326,9 +3326,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.10.0.tgz", - "integrity": "sha512-NrR6667wlUfP0BHaEIKgYM/2va+Oj+RjZSASbBMnszM9k+1AmliRjHc3lJIiOehtSSjqYiO7R6KLNrWOX+YNSQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", + "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", "cpu": [ "arm64" ], @@ -3339,9 +3339,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.10.0.tgz", - "integrity": "sha512-FV0Tpt84LPYDduIDcXvEC7HKtyXxdvhdAOvOeWMWbQNulxViH2O07QXkT/FffX4FqEI02jEbCJbr+YcuKdyyMg==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", + "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", "cpu": [ "ia32" ], @@ -3352,9 +3352,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.10.0.tgz", - "integrity": "sha512-OZoJd+o5TaTSQeFFQ6WjFCiltiYVjIdsXxwu/XZ8qRpsvMQr4UsVrE5UyT9RIvsnuF47DqkJKhhVZ2Q9YW9IpQ==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", + "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", "cpu": [ "x64" ], @@ -5720,9 +5720,9 @@ } }, "node_modules/esbuild": { - "version": "0.18.20", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.18.20.tgz", - "integrity": "sha512-ceqxoedUrcayh7Y7ZX6NdbbDzGROiyVBgC4PriJThBKSVPWnnFHZAkfI1lJT8QFkOwH4qOS2SJkS4wvpGl8BpA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, "bin": { @@ -5732,28 +5732,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/android-arm": "0.18.20", - "@esbuild/android-arm64": "0.18.20", - "@esbuild/android-x64": "0.18.20", - "@esbuild/darwin-arm64": "0.18.20", - "@esbuild/darwin-x64": "0.18.20", - "@esbuild/freebsd-arm64": "0.18.20", - "@esbuild/freebsd-x64": "0.18.20", - "@esbuild/linux-arm": "0.18.20", - "@esbuild/linux-arm64": "0.18.20", - "@esbuild/linux-ia32": "0.18.20", - "@esbuild/linux-loong64": "0.18.20", - "@esbuild/linux-mips64el": "0.18.20", - "@esbuild/linux-ppc64": "0.18.20", - "@esbuild/linux-riscv64": "0.18.20", - "@esbuild/linux-s390x": "0.18.20", - "@esbuild/linux-x64": "0.18.20", - "@esbuild/netbsd-x64": "0.18.20", - "@esbuild/openbsd-x64": "0.18.20", - "@esbuild/sunos-x64": "0.18.20", - "@esbuild/win32-arm64": "0.18.20", - "@esbuild/win32-ia32": "0.18.20", - "@esbuild/win32-x64": "0.18.20" + "@esbuild/aix-ppc64": "0.20.2", + "@esbuild/android-arm": "0.20.2", + "@esbuild/android-arm64": "0.20.2", + "@esbuild/android-x64": "0.20.2", + "@esbuild/darwin-arm64": "0.20.2", + "@esbuild/darwin-x64": "0.20.2", + "@esbuild/freebsd-arm64": "0.20.2", + "@esbuild/freebsd-x64": "0.20.2", + "@esbuild/linux-arm": "0.20.2", + "@esbuild/linux-arm64": "0.20.2", + "@esbuild/linux-ia32": "0.20.2", + "@esbuild/linux-loong64": "0.20.2", + "@esbuild/linux-mips64el": "0.20.2", + "@esbuild/linux-ppc64": "0.20.2", + "@esbuild/linux-riscv64": "0.20.2", + "@esbuild/linux-s390x": "0.20.2", + "@esbuild/linux-x64": "0.20.2", + "@esbuild/netbsd-x64": "0.20.2", + "@esbuild/openbsd-x64": "0.20.2", + "@esbuild/sunos-x64": "0.20.2", + "@esbuild/win32-arm64": "0.20.2", + "@esbuild/win32-ia32": "0.20.2", + "@esbuild/win32-x64": "0.20.2" } }, "node_modules/escalade": { @@ -9081,9 +9082,9 @@ } }, "node_modules/postcss": { - "version": "8.4.35", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.35.tgz", - "integrity": "sha512-u5U8qYpBCpN13BsiEB0CbR1Hhh4Gc0zLFuedrHJKMctHCHAGrMdG0PRM/KErzAL3CU6/eckEtmHNB3x6e3c0vA==", + "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "funding": [ { @@ -9102,7 +9103,7 @@ "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "source-map-js": "^1.2.0" }, "engines": { "node": "^10 || ^12 || >=14" @@ -9570,18 +9571,34 @@ } }, "node_modules/rollup": { - "version": "3.29.4", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-3.29.4.tgz", - "integrity": "sha512-oWzmBZwvYrU0iJHtDmhsm662rC15FRXmcjCk1xD771dFDx5jJ02ufAQQTn0etB2emNk4J9EZg/yWKpsn9BWGRw==", + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", + "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", "dev": true, + "dependencies": { + "@types/estree": "1.0.5" + }, "bin": { "rollup": "dist/bin/rollup" }, "engines": { - "node": ">=14.18.0", + "node": ">=18.0.0", "npm": ">=8.0.0" }, "optionalDependencies": { + "@rollup/rollup-android-arm-eabi": "4.13.0", + "@rollup/rollup-android-arm64": "4.13.0", + "@rollup/rollup-darwin-arm64": "4.13.0", + "@rollup/rollup-darwin-x64": "4.13.0", + "@rollup/rollup-linux-arm-gnueabihf": "4.13.0", + "@rollup/rollup-linux-arm64-gnu": "4.13.0", + "@rollup/rollup-linux-arm64-musl": "4.13.0", + "@rollup/rollup-linux-riscv64-gnu": "4.13.0", + "@rollup/rollup-linux-x64-gnu": "4.13.0", + "@rollup/rollup-linux-x64-musl": "4.13.0", + "@rollup/rollup-win32-arm64-msvc": "4.13.0", + "@rollup/rollup-win32-ia32-msvc": "4.13.0", + "@rollup/rollup-win32-x64-msvc": "4.13.0", "fsevents": "~2.3.2" } }, @@ -9933,9 +9950,9 @@ } }, "node_modules/source-map-js": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.0.2.tgz", - "integrity": "sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, "engines": { "node": ">=0.10.0" @@ -10760,29 +10777,29 @@ } }, "node_modules/vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "5.2.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.6.tgz", + "integrity": "sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==", "dev": true, "dependencies": { - "esbuild": "^0.18.10", - "postcss": "^8.4.27", - "rollup": "^3.27.1" + "esbuild": "^0.20.1", + "postcss": "^8.4.36", + "rollup": "^4.13.0" }, "bin": { "vite": "bin/vite.js" }, "engines": { - "node": "^14.18.0 || >=16.0.0" + "node": "^18.0.0 || >=20.0.0" }, "funding": { "url": "https://github.com/vitejs/vite?sponsor=1" }, "optionalDependencies": { - "fsevents": "~2.3.2" + "fsevents": "~2.3.3" }, "peerDependencies": { - "@types/node": ">= 14", + "@types/node": "^18.0.0 || >=20.0.0", "less": "*", "lightningcss": "^1.21.0", "sass": "*", @@ -10836,513 +10853,36 @@ "url": "https://opencollective.com/vitest" } }, - "node_modules/vite-node/node_modules/@esbuild/android-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", - "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/android-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", - "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/android-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", - "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/darwin-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", - "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/darwin-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", - "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", - "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/freebsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", - "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", - "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", - "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", - "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", - "cpu": [ - "ia32" - ], + "node_modules/vitest": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.4.0.tgz", + "integrity": "sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==", "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-loong64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", - "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-mips64el": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", - "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", - "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-riscv64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", - "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-s390x": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", - "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/linux-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", - "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/netbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", - "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/openbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", - "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/sunos-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", - "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/win32-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", - "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/win32-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", - "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/@esbuild/win32-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", - "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vite-node/node_modules/esbuild": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", - "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.12", - "@esbuild/android-arm": "0.19.12", - "@esbuild/android-arm64": "0.19.12", - "@esbuild/android-x64": "0.19.12", - "@esbuild/darwin-arm64": "0.19.12", - "@esbuild/darwin-x64": "0.19.12", - "@esbuild/freebsd-arm64": "0.19.12", - "@esbuild/freebsd-x64": "0.19.12", - "@esbuild/linux-arm": "0.19.12", - "@esbuild/linux-arm64": "0.19.12", - "@esbuild/linux-ia32": "0.19.12", - "@esbuild/linux-loong64": "0.19.12", - "@esbuild/linux-mips64el": "0.19.12", - "@esbuild/linux-ppc64": "0.19.12", - "@esbuild/linux-riscv64": "0.19.12", - "@esbuild/linux-s390x": "0.19.12", - "@esbuild/linux-x64": "0.19.12", - "@esbuild/netbsd-x64": "0.19.12", - "@esbuild/openbsd-x64": "0.19.12", - "@esbuild/sunos-x64": "0.19.12", - "@esbuild/win32-arm64": "0.19.12", - "@esbuild/win32-ia32": "0.19.12", - "@esbuild/win32-x64": "0.19.12" - } - }, - "node_modules/vite-node/node_modules/rollup": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.10.0.tgz", - "integrity": "sha512-t2v9G2AKxcQ8yrG+WGxctBes1AomT0M4ND7jTFBCVPXQ/WFTvNSefIrNSmLKhIKBrvN8SG+CZslimJcT3W2u2g==", - "dev": true, - "dependencies": { - "@types/estree": "1.0.5" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.10.0", - "@rollup/rollup-android-arm64": "4.10.0", - "@rollup/rollup-darwin-arm64": "4.10.0", - "@rollup/rollup-darwin-x64": "4.10.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.10.0", - "@rollup/rollup-linux-arm64-gnu": "4.10.0", - "@rollup/rollup-linux-arm64-musl": "4.10.0", - "@rollup/rollup-linux-riscv64-gnu": "4.10.0", - "@rollup/rollup-linux-x64-gnu": "4.10.0", - "@rollup/rollup-linux-x64-musl": "4.10.0", - "@rollup/rollup-win32-arm64-msvc": "4.10.0", - "@rollup/rollup-win32-ia32-msvc": "4.10.0", - "@rollup/rollup-win32-x64-msvc": "4.10.0", - "fsevents": "~2.3.2" - } - }, - "node_modules/vite-node/node_modules/vite": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.1.tgz", - "integrity": "sha512-wclpAgY3F1tR7t9LL5CcHC41YPkQIpKUGeIuT8MdNwNZr6OqOTLs7JX5vIHAtzqLWXts0T+GDrh9pN2arneKqg==", - "dev": true, - "dependencies": { - "esbuild": "^0.19.3", - "postcss": "^8.4.35", - "rollup": "^4.2.0" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - }, - "peerDependencies": { - "@types/node": "^18.0.0 || >=20.0.0", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.4.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - } - } - }, - "node_modules/vitest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.4.0.tgz", - "integrity": "sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==", - "dev": true, - "dependencies": { - "@vitest/expect": "1.4.0", - "@vitest/runner": "1.4.0", - "@vitest/snapshot": "1.4.0", - "@vitest/spy": "1.4.0", - "@vitest/utils": "1.4.0", - "acorn-walk": "^8.3.2", - "chai": "^4.3.10", - "debug": "^4.3.4", - "execa": "^8.0.1", - "local-pkg": "^0.5.0", - "magic-string": "^0.30.5", - "pathe": "^1.1.1", - "picocolors": "^1.0.0", - "std-env": "^3.5.0", - "strip-literal": "^2.0.0", - "tinybench": "^2.5.1", - "tinypool": "^0.8.2", - "vite": "^5.0.0", - "vite-node": "1.4.0", - "why-is-node-running": "^2.2.2" - }, - "bin": { - "vitest": "vitest.mjs" - }, + "dependencies": { + "@vitest/expect": "1.4.0", + "@vitest/runner": "1.4.0", + "@vitest/snapshot": "1.4.0", + "@vitest/spy": "1.4.0", + "@vitest/utils": "1.4.0", + "acorn-walk": "^8.3.2", + "chai": "^4.3.10", + "debug": "^4.3.4", + "execa": "^8.0.1", + "local-pkg": "^0.5.0", + "magic-string": "^0.30.5", + "pathe": "^1.1.1", + "picocolors": "^1.0.0", + "std-env": "^3.5.0", + "strip-literal": "^2.0.0", + "tinybench": "^2.5.1", + "tinypool": "^0.8.2", + "vite": "^5.0.0", + "vite-node": "1.4.0", + "why-is-node-running": "^2.2.2" + }, + "bin": { + "vitest": "vitest.mjs" + }, "engines": { "node": "^18.0.0 || >=20.0.0" }, @@ -11378,652 +10918,6 @@ } } }, - "node_modules/vitest/node_modules/@esbuild/android-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.19.12.tgz", - "integrity": "sha512-qg/Lj1mu3CdQlDEEiWrlC4eaPZ1KztwGJ9B6J+/6G+/4ewxJg7gqj8eVYWvao1bXrqGiW2rsBZFSX3q2lcW05w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/android-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.19.12.tgz", - "integrity": "sha512-P0UVNGIienjZv3f5zq0DP3Nt2IE/3plFzuaS96vihvD0Hd6H/q4WXUGpCxD/E8YrSXfNyRPbpTq+T8ZQioSuPA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/android-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.19.12.tgz", - "integrity": "sha512-3k7ZoUW6Q6YqhdhIaq/WZ7HwBpnFBlW905Fa4s4qWJyiNOgT1dOqDiVAQFwBH7gBRZr17gLrlFCRzF6jFh7Kew==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/darwin-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.19.12.tgz", - "integrity": "sha512-B6IeSgZgtEzGC42jsI+YYu9Z3HKRxp8ZT3cqhvliEHovq8HSX2YX8lNocDn79gCKJXOSaEot9MVYky7AKjCs8g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/darwin-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz", - "integrity": "sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/freebsd-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.19.12.tgz", - "integrity": "sha512-4aRvFIXmwAcDBw9AueDQ2YnGmz5L6obe5kmPT8Vd+/+x/JMVKCgdcRwH6APrbpNXsPz+K653Qg8HB/oXvXVukA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/freebsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.19.12.tgz", - "integrity": "sha512-EYoXZ4d8xtBoVN7CEwWY2IN4ho76xjYXqSXMNccFSx2lgqOG/1TBPW0yPx1bJZk94qu3tX0fycJeeQsKovA8gg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-arm": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.19.12.tgz", - "integrity": "sha512-J5jPms//KhSNv+LO1S1TX1UWp1ucM6N6XuL6ITdKWElCu8wXP72l9MM0zDTzzeikVyqFE6U8YAV9/tFyj0ti+w==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.19.12.tgz", - "integrity": "sha512-EoTjyYyLuVPfdPLsGVVVC8a0p1BFFvtpQDB/YLEhaXyf/5bczaGeN15QkR+O4S5LeJ92Tqotve7i1jn35qwvdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.19.12.tgz", - "integrity": "sha512-Thsa42rrP1+UIGaWz47uydHSBOgTUnwBwNq59khgIwktK6x60Hivfbux9iNR0eHCHzOLjLMLfUMLCypBkZXMHA==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-loong64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.19.12.tgz", - "integrity": "sha512-LiXdXA0s3IqRRjm6rV6XaWATScKAXjI4R4LoDlvO7+yQqFdlr1Bax62sRwkVvRIrwXxvtYEHHI4dm50jAXkuAA==", - "cpu": [ - "loong64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-mips64el": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.19.12.tgz", - "integrity": "sha512-fEnAuj5VGTanfJ07ff0gOA6IPsvrVHLVb6Lyd1g2/ed67oU1eFzL0r9WL7ZzscD+/N6i3dWumGE1Un4f7Amf+w==", - "cpu": [ - "mips64el" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-ppc64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.19.12.tgz", - "integrity": "sha512-nYJA2/QPimDQOh1rKWedNOe3Gfc8PabU7HT3iXWtNUbRzXS9+vgB0Fjaqr//XNbd82mCxHzik2qotuI89cfixg==", - "cpu": [ - "ppc64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-riscv64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.19.12.tgz", - "integrity": "sha512-2MueBrlPQCw5dVJJpQdUYgeqIzDQgw3QtiAHUC4RBz9FXPrskyyU3VI1hw7C0BSKB9OduwSJ79FTCqtGMWqJHg==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-s390x": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.19.12.tgz", - "integrity": "sha512-+Pil1Nv3Umes4m3AZKqA2anfhJiVmNCYkPchwFJNEJN5QxmTs1uzyy4TvmDrCRNT2ApwSari7ZIgrPeUx4UZDg==", - "cpu": [ - "s390x" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/linux-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.19.12.tgz", - "integrity": "sha512-B71g1QpxfwBvNrfyJdVDexenDIt1CiDN1TIXLbhOw0KhJzE78KIFGX6OJ9MrtC0oOqMWf+0xop4qEU8JrJTwCg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/netbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.19.12.tgz", - "integrity": "sha512-3ltjQ7n1owJgFbuC61Oj++XhtzmymoCihNFgT84UAmJnxJfm4sYCiSLTXZtE00VWYpPMYc+ZQmB6xbSdVh0JWA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/openbsd-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.19.12.tgz", - "integrity": "sha512-RbrfTB9SWsr0kWmb9srfF+L933uMDdu9BIzdA7os2t0TXhCRjrQyCeOt6wVxr79CKD4c+p+YhCj31HBkYcXebw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/sunos-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.19.12.tgz", - "integrity": "sha512-HKjJwRrW8uWtCQnQOz9qcU3mUZhTUQvi56Q8DPTLLB+DawoiQdjsYq+j+D3s9I8VFtDr+F9CjgXKKC4ss89IeA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/win32-arm64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.19.12.tgz", - "integrity": "sha512-URgtR1dJnmGvX864pn1B2YUYNzjmXkuJOIqG2HdU62MVS4EHpU2946OZoTMnRUHklGtJdJZ33QfzdjGACXhn1A==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/win32-ia32": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.19.12.tgz", - "integrity": "sha512-+ZOE6pUkMOJfmxmBZElNOx72NKpIa/HFOMGzu8fqzQJ5kgf6aTGrcJaFsNiVMH4JKpMipyK+7k0n2UXN7a8YKQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@esbuild/win32-x64": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz", - "integrity": "sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/vitest/node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", - "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-android-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", - "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", - "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-darwin-x64": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", - "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", - "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", - "cpu": [ - "arm" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", - "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", - "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", - "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", - "cpu": [ - "riscv64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", - "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", - "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", - "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", - "cpu": [ - "arm64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", - "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", - "cpu": [ - "ia32" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/vitest/node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", - "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", - "cpu": [ - "x64" - ], - "dev": true, - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/vitest/node_modules/esbuild": { - "version": "0.19.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.12.tgz", - "integrity": "sha512-aARqgq8roFBj054KvQr5f1sFu0D65G+miZRCuJyJ0G13Zwx7vRar5Zhn2tkQNzIXcBrNVsv/8stehpj+GAjgbg==", - "dev": true, - "hasInstallScript": true, - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=12" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.19.12", - "@esbuild/android-arm": "0.19.12", - "@esbuild/android-arm64": "0.19.12", - "@esbuild/android-x64": "0.19.12", - "@esbuild/darwin-arm64": "0.19.12", - "@esbuild/darwin-x64": "0.19.12", - "@esbuild/freebsd-arm64": "0.19.12", - "@esbuild/freebsd-x64": "0.19.12", - "@esbuild/linux-arm": "0.19.12", - "@esbuild/linux-arm64": "0.19.12", - "@esbuild/linux-ia32": "0.19.12", - "@esbuild/linux-loong64": "0.19.12", - "@esbuild/linux-mips64el": "0.19.12", - "@esbuild/linux-ppc64": "0.19.12", - "@esbuild/linux-riscv64": "0.19.12", - "@esbuild/linux-s390x": "0.19.12", - "@esbuild/linux-x64": "0.19.12", - "@esbuild/netbsd-x64": "0.19.12", - "@esbuild/openbsd-x64": "0.19.12", - "@esbuild/sunos-x64": "0.19.12", - "@esbuild/win32-arm64": "0.19.12", - "@esbuild/win32-ia32": "0.19.12", - "@esbuild/win32-x64": "0.19.12" - } - }, - "node_modules/vitest/node_modules/rollup": { - "version": "4.13.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", - "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", - "dev": true, - "dependencies": { - "@types/estree": "1.0.5" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.13.0", - "@rollup/rollup-android-arm64": "4.13.0", - "@rollup/rollup-darwin-arm64": "4.13.0", - "@rollup/rollup-darwin-x64": "4.13.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.13.0", - "@rollup/rollup-linux-arm64-gnu": "4.13.0", - "@rollup/rollup-linux-arm64-musl": "4.13.0", - "@rollup/rollup-linux-riscv64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-gnu": "4.13.0", - "@rollup/rollup-linux-x64-musl": "4.13.0", - "@rollup/rollup-win32-arm64-msvc": "4.13.0", - "@rollup/rollup-win32-ia32-msvc": "4.13.0", - "@rollup/rollup-win32-x64-msvc": "4.13.0", - "fsevents": "~2.3.2" - } - }, - "node_modules/vitest/node_modules/vite": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.1.6.tgz", - "integrity": "sha512-yYIAZs9nVfRJ/AiOLCA91zzhjsHUgMjB+EigzFb6W2XTLO8JixBCKCjvhKZaye+NKYHCrkv3Oh50dH9EdLU2RA==", - "dev": true, - "dependencies": { - "esbuild": "^0.19.3", - "postcss": "^8.4.35", - "rollup": "^4.2.0" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^18.0.0 || >=20.0.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - }, - "peerDependencies": { - "@types/node": "^18.0.0 || >=20.0.0", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.4.0" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - } - } - }, "node_modules/vt-pbf": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", diff --git a/client-next/package.json b/client-next/package.json index 2638a71a2c4..35d0908dbf0 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -49,7 +49,7 @@ "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.2", - "vite": "4.5.2", + "vite": "5.2.6", "vitest": "1.4.0" } } From be91f29acc886b6796365893a63f162ae47737d6 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 25 Mar 2024 17:04:07 +0200 Subject: [PATCH 0875/1688] Implement access/egress/transfer/direct mode validation --- .../routerequest/ModePreferencesMapper.java | 76 ++++++++++++++++++- .../apis/gtfs/queries/planConnection.graphql | 4 +- 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java index 28e884acbde..0bd4e53eb35 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java @@ -29,7 +29,8 @@ static void setModes( if (Boolean.TRUE.equals(modesInput.getGraphQLTransitOnly())) { journey.direct().setMode(StreetMode.NOT_SET); } else if (!CollectionUtils.isEmpty(direct)) { - journey.direct().setMode(DirectModeMapper.map(direct.getFirst())); + var streetModes = direct.stream().map(DirectModeMapper::map).toList(); + journey.direct().setMode(getStreetMode(streetModes)); } var transit = modesInput.getGraphQLTransit(); @@ -38,17 +39,20 @@ static void setModes( } else if (transit != null) { var access = transit.getGraphQLAccess(); if (!CollectionUtils.isEmpty(access)) { - journey.access().setMode(AccessModeMapper.map(access.getFirst())); + var streetModes = access.stream().map(AccessModeMapper::map).toList(); + journey.access().setMode(getStreetMode(streetModes)); } var egress = transit.getGraphQLEgress(); if (!CollectionUtils.isEmpty(egress)) { - journey.egress().setMode(EgressModeMapper.map(egress.getFirst())); + var streetModes = egress.stream().map(EgressModeMapper::map).toList(); + journey.egress().setMode(getStreetMode(streetModes)); } var transfer = transit.getGraphQLTransfer(); if (!CollectionUtils.isEmpty(transfer)) { - journey.transfer().setMode(TransferModeMapper.map(transfer.getFirst())); + var streetModes = transfer.stream().map(TransferModeMapper::map).toList(); + journey.transfer().setMode(getStreetMode(streetModes)); } validateStreetModes(journey); @@ -73,6 +77,70 @@ static void setModes( } } + /** + * Current support: + * 1. If only one mode is defined, it needs to be WALK, BICYCLE, CAR or some parking mode. + * 2. If two modes are defined, they can't be BICYCLE or CAR, and WALK needs to be one of them. + * 3. More than two modes can't be defined for the same leg. + *

      + * TODO future support: + * 1. Any mode can be defined alone. If it's not used in a leg, the leg gets filtered away. + * 2. If two modes are defined, they can't be BICYCLE or CAR. Usually WALK is required as the second + * mode but in some cases it's possible to define other modes as well such as BICYCLE_RENTAL together + * with SCOOTER_RENTAL. In that case, legs which don't use BICYCLE_RENTAL or SCOOTER_RENTAL would be filtered + * out. + * 3. When more than two modes are used, some combinations are supported such as WALK, BICYCLE_RENTAL and SCOOTER_RENTAL. + */ + private static StreetMode getStreetMode(List modes) { + if (modes.size() > 2) { + throw new IllegalArgumentException( + "Only one or two modes can be specified for a leg, got: %.".formatted(modes) + ); + } + if (modes.size() == 1) { + var mode = modes.getFirst(); + // TODO in the future, we will support defining other modes alone as well and filter out legs + // which don't contain the only specified mode as opposed to also returning legs which contain + // only walking. + if (!isAlwaysPresentInLeg(mode)) { + throw new IllegalArgumentException( + "For the time being, %s needs to be combined with WALK mode for the same leg.".formatted( + mode + ) + ); + } + return mode; + } + if (modes.contains(StreetMode.BIKE)) { + throw new IllegalArgumentException( + "Bicycle can't be combined with other modes for the same leg: %s.".formatted(modes) + ); + } + if (modes.contains(StreetMode.CAR)) { + throw new IllegalArgumentException( + "Car can't be combined with other modes for the same leg: %s.".formatted(modes) + ); + } + if (!modes.contains(StreetMode.WALK)) { + throw new IllegalArgumentException( + "For the time being, WALK needs to be added as a mode for a leg when using %s and these two can't be used in the same leg.".formatted( + modes + ) + ); + } + // Walk is currently always used as an implied mode when mode is not car. + return modes.stream().filter(mode -> mode != StreetMode.WALK).findFirst().get(); + } + + private static boolean isAlwaysPresentInLeg(StreetMode mode) { + return ( + mode == StreetMode.BIKE || + mode == StreetMode.CAR || + mode == StreetMode.WALK || + mode.includesParking() + ); + } + /** * TODO this doesn't support multiple street modes yet */ diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql index aec99442d3b..2e87c4dec01 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql @@ -28,9 +28,9 @@ transitOnly: false direct: [WALK] transit: { - access: [BICYCLE_RENTAL] + access: [BICYCLE_RENTAL, WALK] transfer: [WALK] - egress: [BICYCLE_RENTAL] + egress: [BICYCLE_RENTAL, WALK] transit: [ { mode: TRAM From 451ea2ee0baf3077b4b4c5dcef7d29719f66c420 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 25 Mar 2024 17:24:22 +0200 Subject: [PATCH 0876/1688] Add more tests for street modes --- .../RouteRequestMapperModesTest.java | 186 ++++++++++++++++++ .../routerequest/RouteRequestMapperTest.java | 82 -------- 2 files changed, 186 insertions(+), 82 deletions(-) create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java new file mode 100644 index 00000000000..0d9285f93b9 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java @@ -0,0 +1,186 @@ +package org.opentripplanner.apis.gtfs.mapping.routerequest; + +import static java.util.Map.entry; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy; +import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext; + +import java.util.List; +import java.util.Locale; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.opentripplanner.routing.api.request.StreetMode; +import org.opentripplanner.transit.model.basic.TransitMode; + +class RouteRequestMapperModesTest { + + @Test + void testDirectOnly() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + modesArgs.put("modes", Map.ofEntries(entry("directOnly", true))); + var env = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT); + assertFalse(routeRequest.journey().transit().enabled()); + } + + @Test + void testTransitOnly() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + modesArgs.put("modes", Map.ofEntries(entry("transitOnly", true))); + var env = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT); + assertEquals(StreetMode.NOT_SET, routeRequest.journey().direct().mode()); + } + + @Test + void testStreetModesWithOneValidMode() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var bicycle = List.of("BICYCLE"); + modesArgs.put( + "modes", + Map.ofEntries( + entry("direct", List.of("CAR")), + entry( + "transit", + Map.ofEntries( + entry("access", bicycle), + entry("egress", bicycle), + entry("transfer", bicycle) + ) + ) + ) + ); + var env = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT); + assertEquals(StreetMode.CAR, routeRequest.journey().direct().mode()); + assertEquals(StreetMode.BIKE, routeRequest.journey().access().mode()); + assertEquals(StreetMode.BIKE, routeRequest.journey().egress().mode()); + assertEquals(StreetMode.BIKE, routeRequest.journey().transfer().mode()); + } + + @Test + void testStreetModesWithOneInvalidMode() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var bicycleRental = List.of("BICYCLE_RENTAL"); + modesArgs.put("modes", Map.ofEntries(entry("direct", bicycleRental))); + var env = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT) + ); + } + + @Test + void testStreetModesWithTwoValidModes() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var bicycleRental = List.of("BICYCLE_RENTAL", "WALK"); + modesArgs.put( + "modes", + Map.ofEntries( + entry("direct", bicycleRental), + entry( + "transit", + Map.ofEntries(entry("access", bicycleRental), entry("egress", bicycleRental)) + ) + ) + ); + var env = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT); + assertEquals(StreetMode.BIKE_RENTAL, routeRequest.journey().direct().mode()); + assertEquals(StreetMode.BIKE_RENTAL, routeRequest.journey().access().mode()); + assertEquals(StreetMode.BIKE_RENTAL, routeRequest.journey().egress().mode()); + assertEquals(StreetMode.WALK, routeRequest.journey().transfer().mode()); + } + + @Test + void testStreetModesWithTwoInvalidModes() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var rentals = List.of("BICYCLE_RENTAL", "CAR_RENTAL"); + modesArgs.put( + "modes", + Map.ofEntries( + entry("direct", rentals), + entry("transit", Map.ofEntries(entry("access", rentals), entry("egress", rentals))) + ) + ); + var rentalEnv = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(rentalEnv, RouteRequestMapperTest.CONTEXT) + ); + + modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var bicycleWalk = List.of("BICYCLE", "WALK"); + modesArgs.put( + "modes", + Map.ofEntries( + entry("transit", Map.ofEntries(entry("access", bicycleWalk), entry("egress", bicycleWalk))) + ) + ); + var bicycleWalkEnv = executionContext( + modesArgs, + Locale.ENGLISH, + RouteRequestMapperTest.CONTEXT + ); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(bicycleWalkEnv, RouteRequestMapperTest.CONTEXT) + ); + } + + @Test + void testStreetModesWithThreeModes() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var rentals = List.of("WALK", "BICYCLE_RENTAL", "CAR_RENTAL"); + modesArgs.put( + "modes", + Map.ofEntries( + entry("direct", rentals), + entry("transit", Map.ofEntries(entry("access", rentals), entry("egress", rentals))) + ) + ); + var env = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT) + ); + } + + @Test + void testTransitModes() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var tramCost = 1.5; + modesArgs.put( + "modes", + Map.ofEntries( + entry( + "transit", + Map.ofEntries( + entry( + "transit", + List.of( + Map.ofEntries( + entry("mode", "TRAM"), + entry("cost", Map.ofEntries(entry("reluctance", tramCost))) + ), + Map.ofEntries(entry("mode", "FERRY")) + ) + ) + ) + ) + ) + ); + var env = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT); + var reluctanceForMode = routeRequest.preferences().transit().reluctanceForMode(); + assertEquals(tramCost, reluctanceForMode.get(TransitMode.TRAM)); + assertNull(reluctanceForMode.get(TransitMode.FERRY)); + assertEquals( + "[TransitFilterRequest{select: [SelectRequest{transportModes: [FERRY, TRAM]}]}]", + routeRequest.journey().transit().filters().toString() + ); + } +} diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java index d1cc96fdea0..731941ad48c 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java @@ -5,7 +5,6 @@ import static java.util.Map.entry; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNull; import graphql.ExecutionInput; import graphql.execution.ExecutionId; @@ -28,13 +27,11 @@ import org.opentripplanner.ext.fares.impl.DefaultFareService; import org.opentripplanner.model.plan.paging.cursor.PageCursor; import org.opentripplanner.routing.api.request.RouteRequest; -import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.preference.ItineraryFilterDebugProfile; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.GraphFinder; import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService; import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService; -import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; @@ -230,85 +227,6 @@ void testNumberOfItineraries() { assertEquals(itineraries, routeRequest.numItineraries()); } - @Test - void testDirectOnly() { - var modesArgs = createArgsCopy(ARGS); - modesArgs.put("modes", Map.ofEntries(entry("directOnly", true))); - var env = executionContext(modesArgs, LOCALE, CONTEXT); - var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT); - assertFalse(routeRequest.journey().transit().enabled()); - } - - @Test - void testTransitOnly() { - var modesArgs = createArgsCopy(ARGS); - modesArgs.put("modes", Map.ofEntries(entry("transitOnly", true))); - var env = executionContext(modesArgs, LOCALE, CONTEXT); - var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT); - assertEquals(StreetMode.NOT_SET, routeRequest.journey().direct().mode()); - } - - @Test - void testStreetModes() { - var modesArgs = createArgsCopy(ARGS); - var bicycle = List.of("BICYCLE"); - modesArgs.put( - "modes", - Map.ofEntries( - entry("direct", List.of("CAR")), - entry( - "transit", - Map.ofEntries( - entry("access", bicycle), - entry("egress", bicycle), - entry("transfer", bicycle) - ) - ) - ) - ); - var env = executionContext(modesArgs, LOCALE, CONTEXT); - var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT); - assertEquals(StreetMode.CAR, routeRequest.journey().direct().mode()); - assertEquals(StreetMode.BIKE, routeRequest.journey().access().mode()); - assertEquals(StreetMode.BIKE, routeRequest.journey().egress().mode()); - assertEquals(StreetMode.BIKE, routeRequest.journey().transfer().mode()); - } - - @Test - void testTransitModes() { - var modesArgs = createArgsCopy(ARGS); - var tramCost = 1.5; - modesArgs.put( - "modes", - Map.ofEntries( - entry( - "transit", - Map.ofEntries( - entry( - "transit", - List.of( - Map.ofEntries( - entry("mode", "TRAM"), - entry("cost", Map.ofEntries(entry("reluctance", tramCost))) - ), - Map.ofEntries(entry("mode", "FERRY")) - ) - ) - ) - ) - ) - ); - var env = executionContext(modesArgs, LOCALE, CONTEXT); - var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT); - var reluctanceForMode = routeRequest.preferences().transit().reluctanceForMode(); - assertEquals(tramCost, reluctanceForMode.get(TransitMode.TRAM)); - assertNull(reluctanceForMode.get(TransitMode.FERRY)); - assertEquals( - "[TransitFilterRequest{select: [SelectRequest{transportModes: [FERRY, TRAM]}]}]", - routeRequest.journey().transit().filters().toString() - ); - } - @Test void testItineraryFilters() { var filterArgs = createArgsCopy(ARGS); From 64d268cc5c2aaeadb6fea55df842e4d520310f9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 19:07:33 +0000 Subject: [PATCH 0877/1688] Update Debug UI dependencies (non-major) --- client-next/package-lock.json | 136 +++++++++++++++++----------------- client-next/package.json | 12 +-- 2 files changed, 74 insertions(+), 74 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 0f9f836e54e..b1212db1fba 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -23,11 +23,11 @@ "@graphql-codegen/client-preset": "4.2.4", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "14.2.1", - "@types/react": "18.2.66", + "@testing-library/react": "14.2.2", + "@types/react": "18.2.70", "@types/react-dom": "18.2.22", - "@typescript-eslint/eslint-plugin": "7.2.0", - "@typescript-eslint/parser": "7.2.0", + "@typescript-eslint/eslint-plugin": "7.4.0", + "@typescript-eslint/parser": "7.4.0", "@vitejs/plugin-react": "4.2.1", "@vitest/coverage-v8": "1.4.0", "eslint": "8.57.0", @@ -39,8 +39,8 @@ "eslint-plugin-react-refresh": "0.4.6", "jsdom": "24.0.0", "prettier": "3.2.5", - "typescript": "5.4.2", - "vite": "4.5.2", + "typescript": "5.4.3", + "vite": "4.5.3", "vitest": "1.4.0" } }, @@ -3398,9 +3398,9 @@ } }, "node_modules/@testing-library/react": { - "version": "14.2.1", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.1.tgz", - "integrity": "sha512-sGdjws32ai5TLerhvzThYFbpnF9XtL65Cjf+gB0Dhr29BGqK+mAeN7SURSdu+eqgET4ANcWoC7FQpkaiGvBr+A==", + "version": "14.2.2", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.2.tgz", + "integrity": "sha512-SOUuM2ysCvjUWBXTNfQ/ztmnKDmqaiPV3SvoIuyxMUca45rbSWWAT/qB8CUs/JQ/ux/8JFs9DNdFQ3f6jH3crA==", "dev": true, "dependencies": { "@babel/runtime": "^7.12.5", @@ -3554,9 +3554,9 @@ "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng==" }, "node_modules/@types/react": { - "version": "18.2.66", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.66.tgz", - "integrity": "sha512-OYTmMI4UigXeFMF/j4uv0lBBEbongSgptPrHBxqME44h9+yNov+oL6Z3ocJKo0WyXR84sQUNeyIp9MRfckvZpg==", + "version": "18.2.70", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.70.tgz", + "integrity": "sha512-hjlM2hho2vqklPhopNkXkdkeq6Lv8WSZTpr7956zY+3WS5cfYUewtCzsJLsbW5dEv3lfSeQ4W14ZFeKC437JRQ==", "dependencies": { "@types/prop-types": "*", "@types/scheduler": "*", @@ -3614,16 +3614,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz", - "integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.4.0.tgz", + "integrity": "sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "7.2.0", - "@typescript-eslint/type-utils": "7.2.0", - "@typescript-eslint/utils": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0", + "@typescript-eslint/scope-manager": "7.4.0", + "@typescript-eslint/type-utils": "7.4.0", + "@typescript-eslint/utils": "7.4.0", + "@typescript-eslint/visitor-keys": "7.4.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -3632,7 +3632,7 @@ "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -3682,19 +3682,19 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz", - "integrity": "sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.4.0.tgz", + "integrity": "sha512-ZvKHxHLusweEUVwrGRXXUVzFgnWhigo4JurEj0dGF1tbcGh6buL+ejDdjxOQxv6ytcY1uhun1p2sm8iWStlgLQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.2.0", - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/typescript-estree": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0", + "@typescript-eslint/scope-manager": "7.4.0", + "@typescript-eslint/types": "7.4.0", + "@typescript-eslint/typescript-estree": "7.4.0", + "@typescript-eslint/visitor-keys": "7.4.0", "debug": "^4.3.4" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -3710,16 +3710,16 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz", - "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.4.0.tgz", + "integrity": "sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0" + "@typescript-eslint/types": "7.4.0", + "@typescript-eslint/visitor-keys": "7.4.0" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -3727,18 +3727,18 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz", - "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.4.0.tgz", + "integrity": "sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.2.0", - "@typescript-eslint/utils": "7.2.0", + "@typescript-eslint/typescript-estree": "7.4.0", + "@typescript-eslint/utils": "7.4.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -3754,12 +3754,12 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz", - "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.4.0.tgz", + "integrity": "sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==", "dev": true, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -3767,13 +3767,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz", - "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.4.0.tgz", + "integrity": "sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/visitor-keys": "7.2.0", + "@typescript-eslint/types": "7.4.0", + "@typescript-eslint/visitor-keys": "7.4.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3782,7 +3782,7 @@ "ts-api-utils": "^1.0.1" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -3852,21 +3852,21 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz", - "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.4.0.tgz", + "integrity": "sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.2.0", - "@typescript-eslint/types": "7.2.0", - "@typescript-eslint/typescript-estree": "7.2.0", + "@typescript-eslint/scope-manager": "7.4.0", + "@typescript-eslint/types": "7.4.0", + "@typescript-eslint/typescript-estree": "7.4.0", "semver": "^7.5.4" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -3910,16 +3910,16 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz", - "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==", + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.4.0.tgz", + "integrity": "sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.2.0", + "@typescript-eslint/types": "7.4.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { - "node": "^16.0.0 || >=18.0.0" + "node": "^18.18.0 || >=20.0.0" }, "funding": { "type": "opencollective", @@ -10515,9 +10515,9 @@ } }, "node_modules/typescript": { - "version": "5.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz", - "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==", + "version": "5.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz", + "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -10760,9 +10760,9 @@ } }, "node_modules/vite": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.2.tgz", - "integrity": "sha512-tBCZBNSBbHQkaGyhGCDUGqeo2ph8Fstyp6FMSvTtsXeZSPpSMGlviAOav2hxVTqFcx8Hj/twtWKsMJXNY0xI8w==", + "version": "4.5.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-4.5.3.tgz", + "integrity": "sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==", "dev": true, "dependencies": { "esbuild": "^0.18.10", diff --git a/client-next/package.json b/client-next/package.json index 2638a71a2c4..5f41498d590 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -32,11 +32,11 @@ "@graphql-codegen/client-preset": "4.2.4", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "14.2.1", - "@types/react": "18.2.66", + "@testing-library/react": "14.2.2", + "@types/react": "18.2.70", "@types/react-dom": "18.2.22", - "@typescript-eslint/eslint-plugin": "7.2.0", - "@typescript-eslint/parser": "7.2.0", + "@typescript-eslint/eslint-plugin": "7.4.0", + "@typescript-eslint/parser": "7.4.0", "@vitejs/plugin-react": "4.2.1", "@vitest/coverage-v8": "1.4.0", "eslint": "8.57.0", @@ -48,8 +48,8 @@ "eslint-plugin-react-refresh": "0.4.6", "jsdom": "24.0.0", "prettier": "3.2.5", - "typescript": "5.4.2", - "vite": "4.5.2", + "typescript": "5.4.3", + "vite": "4.5.3", "vitest": "1.4.0" } } From fc9986a85490650b74007f9fc875345beb3ae96f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 26 Mar 2024 08:28:47 +0100 Subject: [PATCH 0878/1688] Fix deprecated api usage --- .../src/components/ItineraryList/ItineraryHeaderLegContent.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx b/client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx index d1b21d46543..f51eea65945 100644 --- a/client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx +++ b/client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx @@ -1,6 +1,6 @@ import { Leg } from '../../gql/graphql.ts'; import { useHeaderLegContentStyleCalculations } from './useHeaderLegContentStyleCalculations.ts'; -const modeIcons = import.meta.glob('../../static/img/mode/*.png', { as: 'url', eager: true }); +const modeIcons = import.meta.glob('../../static/img/mode/*.png', { query: '?url', import: 'default', eager: true }); function getModeIconUrl(leg: Leg) { return modeIcons[`../../static/img/mode/${leg.mode.toLowerCase()}.png`]; From 09d5061588f0b7f83de9fa9f0d793509799f1d8b Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Tue, 26 Mar 2024 07:48:45 +0000 Subject: [PATCH 0879/1688] Upgrade debug client to version 2024/03/2024-03-26T07:48 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index add4c49aadc..8d94c2f8219 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From 50faeed65970719b2b56774a713af155d20fc2aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 26 Mar 2024 08:59:51 +0100 Subject: [PATCH 0880/1688] Revert changes to index.html --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index add4c49aadc..8d94c2f8219 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From 657de8c646a986aea49e9b56831a962cfb063990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 26 Mar 2024 09:02:58 +0100 Subject: [PATCH 0881/1688] Fix package-lock --- client-next/package-lock.json | 4929 ++++++++++++++++++++++----------- 1 file changed, 3346 insertions(+), 1583 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 195e4cad0df..03aa0171357 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -46,19 +46,21 @@ }, "node_modules/@aashutoshrathi/word-wrap": { "version": "1.2.6", + "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", + "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/@ampproject/remapping": { - "version": "2.2.1", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", "dev": true, - "license": "Apache-2.0", "dependencies": { - "@jridgewell/gen-mapping": "^0.3.0", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" @@ -66,8 +68,9 @@ }, "node_modules/@ardatan/relay-compiler": { "version": "12.0.0", + "resolved": "https://registry.npmjs.org/@ardatan/relay-compiler/-/relay-compiler-12.0.0.tgz", + "integrity": "sha512-9anThAaj1dQr6IGmzBMcfzOQKTa5artjuPmw8NYK/fiGEMjADbSguBY2FMDykt+QhilR3wc9VA/3yVju7JHg7Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.14.0", "@babel/generator": "^7.14.0", @@ -96,8 +99,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/cliui": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", @@ -106,8 +110,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/find-up": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^5.0.0", "path-exists": "^4.0.0" @@ -118,8 +123,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/locate-path": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^4.1.0" }, @@ -129,8 +135,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/p-limit": { "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, - "license": "MIT", "dependencies": { "p-try": "^2.0.0" }, @@ -143,8 +150,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/p-locate": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^2.2.0" }, @@ -154,13 +162,15 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/y18n": { "version": "4.0.3", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", + "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", + "dev": true }, "node_modules/@ardatan/relay-compiler/node_modules/yargs": { "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, - "license": "MIT", "dependencies": { "cliui": "^6.0.0", "decamelize": "^1.2.0", @@ -180,8 +190,9 @@ }, "node_modules/@ardatan/relay-compiler/node_modules/yargs-parser": { "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, - "license": "ISC", "dependencies": { "camelcase": "^5.0.0", "decamelize": "^1.2.0" @@ -192,8 +203,9 @@ }, "node_modules/@ardatan/sync-fetch": { "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@ardatan/sync-fetch/-/sync-fetch-0.0.1.tgz", + "integrity": "sha512-xhlTqH0m31mnsG0tIP4ETgfSB6gXDaYYsUWTrlUV93fFQPI9dd8hE0Ot6MHLCtqgB32hwJAC3YZMWlXZw7AleA==", "dev": true, - "license": "MIT", "dependencies": { "node-fetch": "^2.6.1" }, @@ -202,104 +214,43 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.23.5", + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", + "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/highlight": "^7.23.4", - "chalk": "^2.4.2" + "@babel/highlight": "^7.24.2", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" } }, - "node_modules/@babel/code-frame/node_modules/ansi-styles": { - "version": "3.2.1", - "dev": true, - "license": "MIT", - "dependencies": { - "color-convert": "^1.9.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/chalk": { - "version": "2.4.2", - "dev": true, - "license": "MIT", - "dependencies": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - }, - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/color-convert": { - "version": "1.9.3", - "dev": true, - "license": "MIT", - "dependencies": { - "color-name": "1.1.3" - } - }, - "node_modules/@babel/code-frame/node_modules/color-name": { - "version": "1.1.3", - "dev": true, - "license": "MIT" - }, - "node_modules/@babel/code-frame/node_modules/escape-string-regexp": { - "version": "1.0.5", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.8.0" - } - }, - "node_modules/@babel/code-frame/node_modules/has-flag": { - "version": "3.0.0", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=4" - } - }, - "node_modules/@babel/code-frame/node_modules/supports-color": { - "version": "5.5.0", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^3.0.0" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/@babel/compat-data": { - "version": "7.23.5", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz", + "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.23.9", + "version": "7.24.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz", + "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==", "dev": true, - "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.23.5", - "@babel/generator": "^7.23.6", + "@babel/code-frame": "^7.24.2", + "@babel/generator": "^7.24.1", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.23.9", - "@babel/parser": "^7.23.9", - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/helpers": "^7.24.1", + "@babel/parser": "^7.24.1", + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -315,13 +266,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.23.6", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz", + "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/types": "^7.23.6", - "@jridgewell/gen-mapping": "^0.3.2", - "@jridgewell/trace-mapping": "^0.3.17", + "@babel/types": "^7.24.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" }, "engines": { @@ -330,8 +282,9 @@ }, "node_modules/@babel/helper-annotate-as-pure": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.22.5.tgz", + "integrity": "sha512-LvBTxu8bQSQkcyKOU+a1btnNFQ1dMAd0R6PyW3arXes06F6QLWLIrd681bxRPIXlrMGR3XYnW9JyML7dP3qgxg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -341,8 +294,9 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.23.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", + "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/compat-data": "^7.23.5", "@babel/helper-validator-option": "^7.23.5", @@ -355,16 +309,17 @@ } }, "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.24.0", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.1.tgz", + "integrity": "sha512-1yJa9dX9g//V6fDebXoEfEsxkZHk3Hcbm+zLhyu6qVgYFLvmTALTeV+jNU9e5RnYtioBrGEOdoI2joMSNQ/+aA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-replace-supers": "^7.24.1", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", "semver": "^6.3.1" @@ -378,16 +333,18 @@ }, "node_modules/@babel/helper-environment-visitor": { "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", + "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", + "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/template": "^7.22.15", "@babel/types": "^7.23.0" @@ -398,8 +355,9 @@ }, "node_modules/@babel/helper-hoist-variables": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", + "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -409,8 +367,9 @@ }, "node_modules/@babel/helper-member-expression-to-functions": { "version": "7.23.0", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.23.0.tgz", + "integrity": "sha512-6gfrPwh7OuT6gZyJZvd6WbTfrqAo7vm4xCzAXOusKqq/vWdKXphTpj5klHKNmRUU6/QRGlBsyU9mAIPaWHlqJA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.23.0" }, @@ -419,11 +378,12 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.22.15", + "version": "7.24.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", + "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/types": "^7.22.15" + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -431,8 +391,9 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.23.3", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", + "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-module-imports": "^7.22.15", @@ -449,8 +410,9 @@ }, "node_modules/@babel/helper-optimise-call-expression": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.22.5.tgz", + "integrity": "sha512-HBwaojN0xFRx4yIvpwGqxiV2tUfl7401jlok564NgB9EHS1y6QT17FmKWm4ztqjeVdXLuC4fSvHc5ePpQjoTbw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -459,20 +421,22 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.22.5", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", + "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-replace-supers": { - "version": "7.22.20", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.24.1.tgz", + "integrity": "sha512-QCR1UqC9BzG5vZl8BMicmZ28RuUBnHhAMddD8yHFHDRH9lLTZ9uUPehX8ctVPT8l0TKblJidqcgUUKGVrePleQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-member-expression-to-functions": "^7.22.15", + "@babel/helper-member-expression-to-functions": "^7.23.0", "@babel/helper-optimise-call-expression": "^7.22.5" }, "engines": { @@ -484,8 +448,9 @@ }, "node_modules/@babel/helper-simple-access": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", + "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -495,8 +460,9 @@ }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { "version": "7.22.5", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.22.5.tgz", + "integrity": "sha512-tK14r66JZKiC43p8Ki33yLBVJKlQDFoA8GYN67lWCDCqoL6EMMSuM9b+Iff2jHaM/RRFYl7K+iiru7hbRqNx8Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -506,8 +472,9 @@ }, "node_modules/@babel/helper-split-export-declaration": { "version": "7.22.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", + "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.22.5" }, @@ -516,50 +483,56 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.23.4", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", + "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { "version": "7.22.20", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", + "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { "version": "7.23.5", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", + "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.23.9", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz", + "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/template": "^7.23.9", - "@babel/traverse": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/template": "^7.24.0", + "@babel/traverse": "^7.24.1", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.23.4", + "version": "7.24.2", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", + "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.22.20", "chalk": "^2.4.2", - "js-tokens": "^4.0.0" + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" }, "engines": { "node": ">=6.9.0" @@ -567,8 +540,9 @@ }, "node_modules/@babel/highlight/node_modules/ansi-styles": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -578,8 +552,9 @@ }, "node_modules/@babel/highlight/node_modules/chalk": { "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -591,37 +566,42 @@ }, "node_modules/@babel/highlight/node_modules/color-convert": { "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "1.1.3" } }, "node_modules/@babel/highlight/node_modules/color-name": { "version": "1.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true }, "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/@babel/highlight/node_modules/has-flag": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/@babel/highlight/node_modules/supports-color": { "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -630,9 +610,10 @@ } }, "node_modules/@babel/parser": { - "version": "7.23.9", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz", + "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==", "dev": true, - "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -642,8 +623,10 @@ }, "node_modules/@babel/plugin-proposal-class-properties": { "version": "7.18.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz", + "integrity": "sha512-cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-create-class-features-plugin": "^7.18.6", "@babel/helper-plugin-utils": "^7.18.6" @@ -657,8 +640,10 @@ }, "node_modules/@babel/plugin-proposal-object-rest-spread": { "version": "7.20.7", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz", + "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==", + "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.", "dev": true, - "license": "MIT", "dependencies": { "@babel/compat-data": "^7.20.5", "@babel/helper-compilation-targets": "^7.20.7", @@ -675,8 +660,9 @@ }, "node_modules/@babel/plugin-syntax-class-properties": { "version": "7.12.13", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", + "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.12.13" }, @@ -685,11 +671,12 @@ } }, "node_modules/@babel/plugin-syntax-flow": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.24.1.tgz", + "integrity": "sha512-sxi2kLTI5DeW5vDtMUsk4mTPwvlUDbjOnoWayhynCwrw4QXRld4QEYwqzY8JmQXaJUtgUuCIurtSRH5sn4c7mA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -699,11 +686,12 @@ } }, "node_modules/@babel/plugin-syntax-import-assertions": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.24.1.tgz", + "integrity": "sha512-IuwnI5XnuF189t91XbxmXeCDz3qs6iDRO7GJ++wcfgeXNs/8FmIlKcpDSXNVyuLQxlwvskmI3Ct73wUODkJBlQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -713,11 +701,12 @@ } }, "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.24.1.tgz", + "integrity": "sha512-2eCtxZXf+kbkMIsXS4poTvT4Yu5rXiRa+9xGVT56raghjmBTKMpFNc9R4IDiB4emao9eO22Ox7CxuJG7BgExqA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -728,8 +717,9 @@ }, "node_modules/@babel/plugin-syntax-object-rest-spread": { "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.8.0" }, @@ -738,11 +728,12 @@ } }, "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.24.1.tgz", + "integrity": "sha512-ngT/3NkRhsaep9ck9uj2Xhv9+xB1zShY3tM3g6om4xxCELwCDN4g4Aq5dRn48+0hasAql7s2hdBOysCfNpr4fw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -752,11 +743,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoped-functions": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.24.1.tgz", + "integrity": "sha512-TWWC18OShZutrv9C6mye1xwtam+uNi2bnTOCBUd5sZxyHOiWbU6ztSROofIMrK84uweEZC219POICK/sTYwfgg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -766,11 +758,12 @@ } }, "node_modules/@babel/plugin-transform-block-scoping": { - "version": "7.23.4", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.24.1.tgz", + "integrity": "sha512-h71T2QQvDgM2SmT29UYU6ozjMlAt7s7CSs5Hvy8f8cf/GM/Z4a2zMfN+fjVGaieeCrXR3EdQl6C4gQG+OgmbKw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -780,16 +773,17 @@ } }, "node_modules/@babel/plugin-transform-classes": { - "version": "7.23.8", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.1.tgz", + "integrity": "sha512-ZTIe3W7UejJd3/3R4p7ScyyOoafetUShSf4kCqV0O7F/RiHxVj/wRaRnQlrGwflvcehNA8M42HkAiEDYZu2F1Q==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20", + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-replace-supers": "^7.24.1", "@babel/helper-split-export-declaration": "^7.22.6", "globals": "^11.1.0" }, @@ -801,12 +795,13 @@ } }, "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.24.1.tgz", + "integrity": "sha512-5pJGVIUfJpOS+pAqBQd+QMaTD2vCL/HcePooON6pDpHgRp4gNRmzyHTPIkXntwKsq3ayUFVfJaIKPw2pOkOcTw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/template": "^7.22.15" + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/template": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -816,11 +811,12 @@ } }, "node_modules/@babel/plugin-transform-destructuring": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.1.tgz", + "integrity": "sha512-ow8jciWqNxR3RYbSNVuF4U2Jx130nwnBnhRw6N6h1bOejNkABmcI5X5oz29K4alWX7vf1C+o6gtKXikzRKkVdw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -830,12 +826,13 @@ } }, "node_modules/@babel/plugin-transform-flow-strip-types": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-flow-strip-types/-/plugin-transform-flow-strip-types-7.24.1.tgz", + "integrity": "sha512-iIYPIWt3dUmUKKE10s3W+jsQ3icFkw0JyRVyY1B7G4yK/nngAOHLVx8xlhA6b/Jzl/Y0nis8gjqhqKtRDQqHWQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/plugin-syntax-flow": "^7.23.3" + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/plugin-syntax-flow": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -845,11 +842,12 @@ } }, "node_modules/@babel/plugin-transform-for-of": { - "version": "7.23.6", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.24.1.tgz", + "integrity": "sha512-OxBdcnF04bpdQdR3i4giHZNZQn7cm8RQKcSwA17wAAqEELo1ZOwp5FFgeptWUQXFyT9kwHo10aqqauYkRZPCAg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { @@ -860,13 +858,14 @@ } }, "node_modules/@babel/plugin-transform-function-name": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.24.1.tgz", + "integrity": "sha512-BXmDZpPlh7jwicKArQASrj8n22/w6iymRnvHYYd2zO30DbE277JO20/7yXJT3QxDPtiQiOxQBbZH4TpivNXIxA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-compilation-targets": "^7.22.15", + "@babel/helper-compilation-targets": "^7.23.6", "@babel/helper-function-name": "^7.23.0", - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -876,11 +875,12 @@ } }, "node_modules/@babel/plugin-transform-literals": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.24.1.tgz", + "integrity": "sha512-zn9pwz8U7nCqOYIiBaOxoQOtYmMODXTJnkxG4AtX8fPmnCRYWBOHD0qcpwS9e2VDSp1zNJYpdnFMIKb8jmwu6g==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -890,11 +890,12 @@ } }, "node_modules/@babel/plugin-transform-member-expression-literals": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.24.1.tgz", + "integrity": "sha512-4ojai0KysTWXzHseJKa1XPNXKRbuUrhkOPY4rEGeR+7ChlJVKxFa3H3Bz+7tWaGKgJAXUWKOGmltN+u9B3+CVg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -904,12 +905,13 @@ } }, "node_modules/@babel/plugin-transform-modules-commonjs": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.1.tgz", + "integrity": "sha512-szog8fFTUxBfw0b98gEWPaEqF42ZUD/T3bkynW/wtgx2p/XCP55WEsb+VosKceRSd6njipdZvNogqdtI4Q0chw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-module-transforms": "^7.23.3", - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-simple-access": "^7.22.5" }, "engines": { @@ -920,12 +922,13 @@ } }, "node_modules/@babel/plugin-transform-object-super": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.24.1.tgz", + "integrity": "sha512-oKJqR3TeI5hSLRxudMjFQ9re9fBVUU0GICqM3J1mi8MqlhVr6hC/ZN4ttAyMuQR6EZZIY6h/exe5swqGNNIkWQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", - "@babel/helper-replace-supers": "^7.22.20" + "@babel/helper-plugin-utils": "^7.24.0", + "@babel/helper-replace-supers": "^7.24.1" }, "engines": { "node": ">=6.9.0" @@ -935,11 +938,12 @@ } }, "node_modules/@babel/plugin-transform-parameters": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.24.1.tgz", + "integrity": "sha512-8Jl6V24g+Uw5OGPeWNKrKqXPDw2YDjLc53ojwfMcKwlEoETKU9rU0mHUtcg9JntWI/QYzGAXNWEcVHZ+fR+XXg==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -949,11 +953,12 @@ } }, "node_modules/@babel/plugin-transform-property-literals": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.24.1.tgz", + "integrity": "sha512-LetvD7CrHmEx0G442gOomRr66d7q8HzzGGr4PMHGr+5YIm6++Yke+jxj246rpvsbyhJwCLxcTn6zW1P1BSenqA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -963,11 +968,12 @@ } }, "node_modules/@babel/plugin-transform-react-display-name": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.24.1.tgz", + "integrity": "sha512-mvoQg2f9p2qlpDQRBC7M3c3XTr0k7cp/0+kFKKO/7Gtu0LSw16eKB+Fabe2bDT/UpsyasTBBkAnbdsLrkD5XMw==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -978,8 +984,9 @@ }, "node_modules/@babel/plugin-transform-react-jsx": { "version": "7.23.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.23.4.tgz", + "integrity": "sha512-5xOpoPguCZCRbo/JeHlloSkTA8Bld1J/E1/kLfD1nsuiW1m8tduTA1ERCgIZokDflX/IBzKcqR3l7VlRgiIfHA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-annotate-as-pure": "^7.22.5", "@babel/helper-module-imports": "^7.22.15", @@ -995,11 +1002,12 @@ } }, "node_modules/@babel/plugin-transform-react-jsx-self": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.1.tgz", + "integrity": "sha512-kDJgnPujTmAZ/9q2CN4m2/lRsUUPDvsG3+tSHWUJIzMGTt5U/b/fwWd3RO3n+5mjLrsBrVa5eKFRVSQbi3dF1w==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1009,11 +1017,12 @@ } }, "node_modules/@babel/plugin-transform-react-jsx-source": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.24.1.tgz", + "integrity": "sha512-1v202n7aUq4uXAieRTKcwPzNyphlCuqHHDcdSNc+vdhoTEZcFMh+L5yZuCmGaIO7bs1nJUNfHB89TZyoL48xNA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1023,11 +1032,12 @@ } }, "node_modules/@babel/plugin-transform-shorthand-properties": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.24.1.tgz", + "integrity": "sha512-LyjVB1nsJ6gTTUKRjRWx9C1s9hE7dLfP/knKdrfeH9UPtAGjYGgxIbFfx7xyLIEWs7Xe1Gnf8EWiUqfjLhInZA==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1037,11 +1047,12 @@ } }, "node_modules/@babel/plugin-transform-spread": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.24.1.tgz", + "integrity": "sha512-KjmcIM+fxgY+KxPVbjelJC6hrH1CgtPmTvdXAfn3/a9CnWGSTY7nH4zm5+cjmWJybdcPSsD0++QssDsjcpe47g==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5", + "@babel/helper-plugin-utils": "^7.24.0", "@babel/helper-skip-transparent-expression-wrappers": "^7.22.5" }, "engines": { @@ -1052,11 +1063,12 @@ } }, "node_modules/@babel/plugin-transform-template-literals": { - "version": "7.23.3", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.24.1.tgz", + "integrity": "sha512-WRkhROsNzriarqECASCNu/nojeXCDTE/F2HmRgOzi7NGvyfYGq1NEjKBK3ckLfRgGc6/lPAqP0vDOSw3YtG34g==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.22.5" + "@babel/helper-plugin-utils": "^7.24.0" }, "engines": { "node": ">=6.9.0" @@ -1066,8 +1078,9 @@ } }, "node_modules/@babel/runtime": { - "version": "7.23.9", - "license": "MIT", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz", + "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==", "dependencies": { "regenerator-runtime": "^0.14.0" }, @@ -1076,31 +1089,33 @@ } }, "node_modules/@babel/template": { - "version": "7.23.9", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", + "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9" + "@babel/parser": "^7.24.0", + "@babel/types": "^7.24.0" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.23.9", + "version": "7.24.1", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", + "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", "dev": true, - "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/generator": "^7.23.6", + "@babel/code-frame": "^7.24.1", + "@babel/generator": "^7.24.1", "@babel/helper-environment-visitor": "^7.22.20", "@babel/helper-function-name": "^7.23.0", "@babel/helper-hoist-variables": "^7.22.5", "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.23.9", - "@babel/types": "^7.23.9", + "@babel/parser": "^7.24.1", + "@babel/types": "^7.24.0", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1109,9 +1124,10 @@ } }, "node_modules/@babel/types": { - "version": "7.23.9", + "version": "7.24.0", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", + "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.23.4", "@babel/helper-validator-identifier": "^7.22.20", @@ -1123,133 +1139,518 @@ }, "node_modules/@bcoe/v8-coverage": { "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", + "dev": true + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", + "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "cpu": [ + "ppc64" + ], "dev": true, - "license": "MIT" + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=12" + } }, - "node_modules/@esbuild/darwin-x64": { + "node_modules/@esbuild/android-arm": { "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", + "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", "cpu": [ - "x64" + "arm" ], "dev": true, - "license": "MIT", "optional": true, "os": [ - "darwin" + "android" ], "engines": { "node": ">=12" } }, - "node_modules/@eslint-community/eslint-utils": { - "version": "4.4.0", + "node_modules/@esbuild/android-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", + "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "eslint-visitor-keys": "^3.3.0" - }, + "optional": true, + "os": [ + "android" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "peerDependencies": { - "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + "node": ">=12" } }, - "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", + "node_modules/@esbuild/android-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", + "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "android" + ], "engines": { - "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + "node": ">=12" } }, - "node_modules/@eslint/eslintrc": { - "version": "2.1.4", + "node_modules/@esbuild/darwin-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", + "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^9.6.0", - "globals": "^13.19.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.0", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "node": ">=12" } }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "13.24.0", + "node_modules/@esbuild/darwin-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", + "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "type-fest": "^0.20.2" - }, + "optional": true, + "os": [ + "darwin" + ], "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "node_modules/@esbuild/freebsd-arm64": { "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", + "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "(MIT OR CC0-1.0)", + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=12" } }, - "node_modules/@eslint/js": { - "version": "8.57.0", + "node_modules/@esbuild/freebsd-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", + "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=12" } }, - "node_modules/@googlemaps/polyline-codec": { - "version": "1.0.28", - "license": "Apache-2.0" + "node_modules/@esbuild/linux-arm": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", + "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } }, - "node_modules/@graphql-codegen/add": { - "version": "5.0.2", + "node_modules/@esbuild/linux-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", + "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.3", - "tslib": "~2.6.0" - }, - "peerDependencies": { - "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" } }, - "node_modules/@graphql-codegen/cli": { - "version": "5.0.2", + "node_modules/@esbuild/linux-ia32": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", + "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@babel/generator": "^7.18.13", - "@babel/template": "^7.18.10", - "@babel/types": "^7.18.13", - "@graphql-codegen/client-preset": "^4.2.2", - "@graphql-codegen/core": "^4.0.2", - "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-tools/apollo-engine-loader": "^8.0.0", - "@graphql-tools/code-file-loader": "^8.0.0", - "@graphql-tools/git-loader": "^8.0.0", - "@graphql-tools/github-loader": "^8.0.0", - "@graphql-tools/graphql-file-loader": "^8.0.0", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", + "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", + "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", + "cpu": [ + "mips64el" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", + "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", + "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", + "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", + "cpu": [ + "s390x" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", + "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", + "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", + "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", + "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", + "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", + "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", + "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=12" + } + }, + "node_modules/@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "dependencies": { + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0" + } + }, + "node_modules/@eslint-community/regexpp": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", + "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "dev": true, + "engines": { + "node": "^12.0.0 || ^14.0.0 || >=16.0.0" + } + }, + "node_modules/@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "dependencies": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "url": "https://opencollective.com/eslint" + } + }, + "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@eslint/eslintrc/node_modules/globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "dependencies": { + "type-fest": "^0.20.2" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/eslintrc/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/@eslint/eslintrc/node_modules/type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + } + }, + "node_modules/@googlemaps/polyline-codec": { + "version": "1.0.28", + "resolved": "https://registry.npmjs.org/@googlemaps/polyline-codec/-/polyline-codec-1.0.28.tgz", + "integrity": "sha512-m7rh8sbxlrHvebXEweBHX8r1uPtToPRYxWDD6p6k2YG8hyhBe0Wi6xRUVFpxpEseMNgF+OBotFQC5senj8K7TQ==" + }, + "node_modules/@graphql-codegen/add": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/add/-/add-5.0.2.tgz", + "integrity": "sha512-ouBkSvMFUhda5VoKumo/ZvsZM9P5ZTyDsI8LW18VxSNWOjrTeLXBWHG8Gfaai0HwhflPtCYVABbriEcOmrRShQ==", + "dev": true, + "dependencies": { + "@graphql-codegen/plugin-helpers": "^5.0.3", + "tslib": "~2.6.0" + }, + "peerDependencies": { + "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0" + } + }, + "node_modules/@graphql-codegen/cli": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/cli/-/cli-5.0.2.tgz", + "integrity": "sha512-MBIaFqDiLKuO4ojN6xxG9/xL9wmfD3ZjZ7RsPjwQnSHBCUXnEkdKvX+JVpx87Pq29Ycn8wTJUguXnTZ7Di0Mlw==", + "dev": true, + "dependencies": { + "@babel/generator": "^7.18.13", + "@babel/template": "^7.18.10", + "@babel/types": "^7.18.13", + "@graphql-codegen/client-preset": "^4.2.2", + "@graphql-codegen/core": "^4.0.2", + "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-tools/apollo-engine-loader": "^8.0.0", + "@graphql-tools/code-file-loader": "^8.0.0", + "@graphql-tools/git-loader": "^8.0.0", + "@graphql-tools/github-loader": "^8.0.0", + "@graphql-tools/graphql-file-loader": "^8.0.0", "@graphql-tools/json-file-loader": "^8.0.0", "@graphql-tools/load": "^8.0.0", "@graphql-tools/prisma-loader": "^8.0.0", @@ -1293,8 +1694,9 @@ }, "node_modules/@graphql-codegen/client-preset": { "version": "4.2.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.4.tgz", + "integrity": "sha512-k1c8v2YxJhhITGQGxViG9asLAoop9m7X9duU7Zztqjc98ooxsUzXICfvAWsH3mLAUibXAx4Ax6BPzKsTtQmBPg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", @@ -1316,8 +1718,9 @@ }, "node_modules/@graphql-codegen/core": { "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/core/-/core-4.0.2.tgz", + "integrity": "sha512-IZbpkhwVqgizcjNiaVzNAzm/xbWT6YnGgeOLwVjm4KbJn3V2jchVtuzHH09G5/WkkLSk2wgbXNdwjM41JxO6Eg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/schema": "^10.0.0", @@ -1330,8 +1733,9 @@ }, "node_modules/@graphql-codegen/gql-tag-operations": { "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.6.tgz", + "integrity": "sha512-y6iXEDpDNjwNxJw3WZqX1/Znj0QHW7+y8O+t2V8qvbTT+3kb2lr9ntc8By7vCr6ctw9tXI4XKaJgpTstJDOwFA==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-codegen/visitor-plugin-common": "5.1.0", @@ -1345,8 +1749,9 @@ }, "node_modules/@graphql-codegen/introspection": { "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@graphql-codegen/introspection/-/introspection-4.0.3.tgz", + "integrity": "sha512-4cHRG15Zu4MXMF4wTQmywNf4+fkDYv5lTbzraVfliDnB8rJKcaurQpRBi11KVuQUe24YTq/Cfk4uwewfNikWoA==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-codegen/visitor-plugin-common": "^5.0.0", @@ -1358,8 +1763,9 @@ }, "node_modules/@graphql-codegen/plugin-helpers": { "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.3.tgz", + "integrity": "sha512-yZ1rpULIWKBZqCDlvGIJRSyj1B2utkEdGmXZTBT/GVayP4hyRYlkd36AJV/LfEsVD8dnsKL5rLz2VTYmRNlJ5Q==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "change-case-all": "1.0.15", @@ -1374,8 +1780,9 @@ }, "node_modules/@graphql-codegen/schema-ast": { "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@graphql-codegen/schema-ast/-/schema-ast-4.0.2.tgz", + "integrity": "sha512-5mVAOQQK3Oz7EtMl/l3vOQdc2aYClUzVDHHkMvZlunc+KlGgl81j8TLa+X7ANIllqU4fUEsQU3lJmk4hXP6K7Q==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/utils": "^10.0.0", @@ -1387,8 +1794,9 @@ }, "node_modules/@graphql-codegen/typed-document-node": { "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.6.tgz", + "integrity": "sha512-US0J95hOE2/W/h42w4oiY+DFKG7IetEN1mQMgXXeat1w6FAR5PlIz4JrRrEkiVfVetZ1g7K78SOwBD8/IJnDiA==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-codegen/visitor-plugin-common": "5.1.0", @@ -1402,8 +1810,9 @@ }, "node_modules/@graphql-codegen/typescript": { "version": "4.0.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.6.tgz", + "integrity": "sha512-IBG4N+Blv7KAL27bseruIoLTjORFCT3r+QYyMC3g11uY3/9TPpaUyjSdF70yBe5GIQ6dAgDU+ENUC1v7EPi0rw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-codegen/schema-ast": "^4.0.2", @@ -1417,8 +1826,9 @@ }, "node_modules/@graphql-codegen/typescript-operations": { "version": "4.2.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.0.tgz", + "integrity": "sha512-lmuwYb03XC7LNRS8oo9M4/vlOrq/wOKmTLBHlltK2YJ1BO/4K/Q9Jdv/jDmJpNydHVR1fmeF4wAfsIp1f9JibA==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-codegen/typescript": "^4.0.6", @@ -1432,8 +1842,9 @@ }, "node_modules/@graphql-codegen/visitor-plugin-common": { "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.1.0.tgz", + "integrity": "sha512-eamQxtA9bjJqI2lU5eYoA1GbdMIRT2X8m8vhWYsVQVWD3qM7sx/IqJU0kx0J3Vd4/CSd36BzL6RKwksibytDIg==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "@graphql-tools/optimize": "^2.0.0", @@ -1451,12 +1862,13 @@ } }, "node_modules/@graphql-tools/apollo-engine-loader": { - "version": "8.0.0", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/apollo-engine-loader/-/apollo-engine-loader-8.0.1.tgz", + "integrity": "sha512-NaPeVjtrfbPXcl+MLQCJLWtqe2/E4bbAqcauEOQ+3sizw1Fc2CNmhHRF8a6W4D0ekvTRRXAMptXYgA2uConbrA==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "@whatwg-node/fetch": "^0.9.0", "tslib": "^2.4.0" }, @@ -1469,18 +1881,20 @@ }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.16", + "version": "0.9.17", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.17.tgz", + "integrity": "sha512-TDYP3CpCrxwxpiNY0UMNf096H5Ihf67BK1iKGegQl5u9SlpEDYrvnV71gWBGJm+Xm31qOy8ATgma9rm8Pe7/5Q==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.5", + "@whatwg-node/node-fetch": "^0.5.7", "urlpattern-polyfill": "^10.0.0" }, "engines": { @@ -1488,9 +1902,10 @@ } }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.6", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.10.tgz", + "integrity": "sha512-KIAHepie/T1PRkUfze4t+bPlyvpxlWiXTPtcGlbIZ0vWkBJMdRmCg4ZrJ2y4XaO1eTPo1HlWYUuj1WvoIpumqg==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -1504,15 +1919,17 @@ }, "node_modules/@graphql-tools/apollo-engine-loader/node_modules/urlpattern-polyfill": { "version": "10.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/batch-execute": { - "version": "9.0.2", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-9.0.4.tgz", + "integrity": "sha512-kkebDLXgDrep5Y0gK1RN3DMUlLqNhg60OAz0lTCqrYeja6DshxLtLkj+zV4mVbBA4mQOEoBmw6g1LZs3dA84/w==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.5", + "@graphql-tools/utils": "^10.0.13", "dataloader": "^2.2.2", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" @@ -1525,11 +1942,12 @@ } }, "node_modules/@graphql-tools/code-file-loader": { - "version": "8.1.0", + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/code-file-loader/-/code-file-loader-8.1.1.tgz", + "integrity": "sha512-q4KN25EPSUztc8rA8YUU3ufh721Yk12xXDbtUA+YstczWS7a1RJlghYMFEfR1HsHSYbF7cUqkbnTKSGM3o52bQ==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/graphql-tag-pluck": "8.2.0", + "@graphql-tools/graphql-tag-pluck": "8.3.0", "@graphql-tools/utils": "^10.0.13", "globby": "^11.0.3", "tslib": "^2.4.0", @@ -1543,14 +1961,15 @@ } }, "node_modules/@graphql-tools/delegate": { - "version": "10.0.3", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.4.tgz", + "integrity": "sha512-WswZRbQZMh/ebhc8zSomK9DIh6Pd5KbuiMsyiKkKz37TWTrlCOe+4C/fyrBFez30ksq6oFyCeSKMwfrCbeGo0Q==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/batch-execute": "^9.0.1", - "@graphql-tools/executor": "^1.0.0", - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.5", + "@graphql-tools/batch-execute": "^9.0.4", + "@graphql-tools/executor": "^1.2.1", + "@graphql-tools/schema": "^10.0.3", + "@graphql-tools/utils": "^10.0.13", "dataloader": "^2.2.2", "tslib": "^2.5.0" }, @@ -1563,8 +1982,9 @@ }, "node_modules/@graphql-tools/documents": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/documents/-/documents-1.0.0.tgz", + "integrity": "sha512-rHGjX1vg/nZ2DKqRGfDPNC55CWZBMldEVcH+91BThRa6JeT80NqXknffLLEZLRUxyikCfkwMsk6xR3UNMqG0Rg==", "dev": true, - "license": "MIT", "dependencies": { "lodash.sortby": "^4.7.0", "tslib": "^2.4.0" @@ -1577,11 +1997,12 @@ } }, "node_modules/@graphql-tools/executor": { - "version": "1.2.0", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.2.4.tgz", + "integrity": "sha512-aCO/5LEAwyTWObAAfpLlwAjaOjTxRX6YNXcGW62mglQhPBy+j0fTc4desci/4nJ49l8FWETaTG0MZ1G/PqQslg==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.1.1", "@graphql-typed-document-node/core": "3.2.0", "@repeaterjs/repeater": "^3.0.4", "tslib": "^2.4.0", @@ -1595,11 +2016,12 @@ } }, "node_modules/@graphql-tools/executor-graphql-ws": { - "version": "1.1.0", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.2.tgz", + "integrity": "sha512-+9ZK0rychTH1LUv4iZqJ4ESbmULJMTsv3XlFooPUngpxZkk00q6LqHKJRrsLErmQrVaC7cwQCaRBJa0teK17Lg==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", "@types/ws": "^8.0.0", "graphql-ws": "^5.14.0", "isomorphic-ws": "^5.0.0", @@ -1614,11 +2036,12 @@ } }, "node_modules/@graphql-tools/executor-http": { - "version": "1.0.7", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.9.tgz", + "integrity": "sha512-+NXaZd2MWbbrWHqU4EhXcrDbogeiCDmEbrAN+rMn4Nu2okDjn2MTFDbTIab87oEubQCH4Te1wDkWPKrzXup7+Q==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.2", + "@graphql-tools/utils": "^10.0.13", "@repeaterjs/repeater": "^3.0.4", "@whatwg-node/fetch": "^0.9.0", "extract-files": "^11.0.0", @@ -1635,18 +2058,20 @@ }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/fetch": { - "version": "0.9.16", + "version": "0.9.17", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.17.tgz", + "integrity": "sha512-TDYP3CpCrxwxpiNY0UMNf096H5Ihf67BK1iKGegQl5u9SlpEDYrvnV71gWBGJm+Xm31qOy8ATgma9rm8Pe7/5Q==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.5", + "@whatwg-node/node-fetch": "^0.5.7", "urlpattern-polyfill": "^10.0.0" }, "engines": { @@ -1654,9 +2079,10 @@ } }, "node_modules/@graphql-tools/executor-http/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.6", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.10.tgz", + "integrity": "sha512-KIAHepie/T1PRkUfze4t+bPlyvpxlWiXTPtcGlbIZ0vWkBJMdRmCg4ZrJ2y4XaO1eTPo1HlWYUuj1WvoIpumqg==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -1670,15 +2096,17 @@ }, "node_modules/@graphql-tools/executor-http/node_modules/urlpattern-polyfill": { "version": "10.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/executor-legacy-ws": { - "version": "1.0.5", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.6.tgz", + "integrity": "sha512-lDSxz9VyyquOrvSuCCnld3256Hmd+QI2lkmkEv7d4mdzkxkK4ddAWW1geQiWrQvWmdsmcnGGlZ7gDGbhEExwqg==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "@types/ws": "^8.0.0", "isomorphic-ws": "^5.0.0", "tslib": "^2.4.0", @@ -1692,11 +2120,12 @@ } }, "node_modules/@graphql-tools/git-loader": { - "version": "8.0.4", + "version": "8.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/git-loader/-/git-loader-8.0.5.tgz", + "integrity": "sha512-P97/1mhruDiA6D5WUmx3n/aeGPLWj2+4dpzDOxFGGU+z9NcI/JdygMkeFpGZNHeJfw+kHfxgPcMPnxHcyhAoVA==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/graphql-tag-pluck": "8.2.0", + "@graphql-tools/graphql-tag-pluck": "8.3.0", "@graphql-tools/utils": "^10.0.13", "is-glob": "4.0.3", "micromatch": "^4.0.4", @@ -1711,14 +2140,15 @@ } }, "node_modules/@graphql-tools/github-loader": { - "version": "8.0.0", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/github-loader/-/github-loader-8.0.1.tgz", + "integrity": "sha512-W4dFLQJ5GtKGltvh/u1apWRFKBQOsDzFxO9cJkOYZj1VzHCpRF43uLST4VbCfWve+AwBqOuKr7YgkHoxpRMkcg==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", - "@graphql-tools/executor-http": "^1.0.0", + "@graphql-tools/executor-http": "^1.0.9", "@graphql-tools/graphql-tag-pluck": "^8.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "@whatwg-node/fetch": "^0.9.0", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" @@ -1732,18 +2162,20 @@ }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.16", + "version": "0.9.17", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.17.tgz", + "integrity": "sha512-TDYP3CpCrxwxpiNY0UMNf096H5Ihf67BK1iKGegQl5u9SlpEDYrvnV71gWBGJm+Xm31qOy8ATgma9rm8Pe7/5Q==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.5", + "@whatwg-node/node-fetch": "^0.5.7", "urlpattern-polyfill": "^10.0.0" }, "engines": { @@ -1751,9 +2183,10 @@ } }, "node_modules/@graphql-tools/github-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.6", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.10.tgz", + "integrity": "sha512-KIAHepie/T1PRkUfze4t+bPlyvpxlWiXTPtcGlbIZ0vWkBJMdRmCg4ZrJ2y4XaO1eTPo1HlWYUuj1WvoIpumqg==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -1767,16 +2200,18 @@ }, "node_modules/@graphql-tools/github-loader/node_modules/urlpattern-polyfill": { "version": "10.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/graphql-file-loader": { - "version": "8.0.0", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-8.0.1.tgz", + "integrity": "sha512-7gswMqWBabTSmqbaNyWSmRRpStWlcCkBc73E6NZNlh4YNuiyKOwbvSkOUYFOqFMfEL+cFsXgAvr87Vz4XrYSbA==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/import": "7.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/import": "7.0.1", + "@graphql-tools/utils": "^10.0.13", "globby": "^11.0.3", "tslib": "^2.4.0", "unixify": "^1.0.0" @@ -1789,9 +2224,10 @@ } }, "node_modules/@graphql-tools/graphql-tag-pluck": { - "version": "8.2.0", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/graphql-tag-pluck/-/graphql-tag-pluck-8.3.0.tgz", + "integrity": "sha512-gNqukC+s7iHC7vQZmx1SEJQmLnOguBq+aqE2zV2+o1hxkExvKqyFli1SY/9gmukFIKpKutCIj+8yLOM+jARutw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.22.9", "@babel/parser": "^7.16.8", @@ -1809,11 +2245,12 @@ } }, "node_modules/@graphql-tools/import": { - "version": "7.0.0", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/import/-/import-7.0.1.tgz", + "integrity": "sha512-935uAjAS8UAeXThqHfYVr4HEAp6nHJ2sximZKO1RzUTq5WoALMAhhGARl0+ecm6X+cqNUwIChJbjtaa6P/ML0w==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "resolve-from": "5.0.0", "tslib": "^2.4.0" }, @@ -1825,11 +2262,12 @@ } }, "node_modules/@graphql-tools/json-file-loader": { - "version": "8.0.0", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-8.0.1.tgz", + "integrity": "sha512-lAy2VqxDAHjVyqeJonCP6TUemrpYdDuKt25a10X6zY2Yn3iFYGnuIDQ64cv3ytyGY6KPyPB+Kp+ZfOkNDG3FQA==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/utils": "^10.0.13", "globby": "^11.0.3", "tslib": "^2.4.0", "unixify": "^1.0.0" @@ -1842,12 +2280,13 @@ } }, "node_modules/@graphql-tools/load": { - "version": "8.0.1", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/load/-/load-8.0.2.tgz", + "integrity": "sha512-S+E/cmyVmJ3CuCNfDuNF2EyovTwdWfQScXv/2gmvJOti2rGD8jTt9GYVzXaxhblLivQR9sBUCNZu/w7j7aXUCA==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.11", + "@graphql-tools/schema": "^10.0.3", + "@graphql-tools/utils": "^10.0.13", "p-limit": "3.1.0", "tslib": "^2.4.0" }, @@ -1859,11 +2298,12 @@ } }, "node_modules/@graphql-tools/merge": { - "version": "9.0.1", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/merge/-/merge-9.0.3.tgz", + "integrity": "sha512-FeKv9lKLMwqDu0pQjPpF59GY3HReUkWXKsMIuMuJQOKh9BETu7zPEFUELvcw8w+lwZkl4ileJsHXC9+AnsT2Lw==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/utils": "^10.0.10", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0" }, "engines": { @@ -1875,8 +2315,9 @@ }, "node_modules/@graphql-tools/optimize": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@graphql-tools/optimize/-/optimize-2.0.0.tgz", + "integrity": "sha512-nhdT+CRGDZ+bk68ic+Jw1OZ99YCDIKYA5AlVAnBHJvMawSx9YQqQAIj4refNc1/LRieGiuWvhbG3jvPVYho0Dg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.4.0" }, @@ -1888,12 +2329,13 @@ } }, "node_modules/@graphql-tools/prisma-loader": { - "version": "8.0.2", + "version": "8.0.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/prisma-loader/-/prisma-loader-8.0.3.tgz", + "integrity": "sha512-oZhxnMr3Jw2WAW1h9FIhF27xWzIB7bXWM8olz4W12oII4NiZl7VRkFw9IT50zME2Bqi9LGh9pkmMWkjvbOpl+Q==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/url-loader": "^8.0.0", - "@graphql-tools/utils": "^10.0.8", + "@graphql-tools/url-loader": "^8.0.2", + "@graphql-tools/utils": "^10.0.13", "@types/js-yaml": "^4.0.0", "@types/json-stable-stringify": "^1.0.32", "@whatwg-node/fetch": "^0.9.0", @@ -1920,18 +2362,20 @@ }, "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.16", + "version": "0.9.17", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.17.tgz", + "integrity": "sha512-TDYP3CpCrxwxpiNY0UMNf096H5Ihf67BK1iKGegQl5u9SlpEDYrvnV71gWBGJm+Xm31qOy8ATgma9rm8Pe7/5Q==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.5", + "@whatwg-node/node-fetch": "^0.5.7", "urlpattern-polyfill": "^10.0.0" }, "engines": { @@ -1939,9 +2383,10 @@ } }, "node_modules/@graphql-tools/prisma-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.6", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.10.tgz", + "integrity": "sha512-KIAHepie/T1PRkUfze4t+bPlyvpxlWiXTPtcGlbIZ0vWkBJMdRmCg4ZrJ2y4XaO1eTPo1HlWYUuj1WvoIpumqg==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -1955,13 +2400,15 @@ }, "node_modules/@graphql-tools/prisma-loader/node_modules/urlpattern-polyfill": { "version": "10.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/relay-operation-optimizer": { "version": "7.0.1", + "resolved": "https://registry.npmjs.org/@graphql-tools/relay-operation-optimizer/-/relay-operation-optimizer-7.0.1.tgz", + "integrity": "sha512-y0ZrQ/iyqWZlsS/xrJfSir3TbVYJTYmMOu4TaSz6F4FRDTQ3ie43BlKkhf04rC28pnUOS4BO9pDcAo1D30l5+A==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/relay-compiler": "12.0.0", "@graphql-tools/utils": "^10.0.13", @@ -1975,12 +2422,13 @@ } }, "node_modules/@graphql-tools/schema": { - "version": "10.0.2", + "version": "10.0.3", + "resolved": "https://registry.npmjs.org/@graphql-tools/schema/-/schema-10.0.3.tgz", + "integrity": "sha512-p28Oh9EcOna6i0yLaCFOnkcBDQECVf3SCexT6ktb86QNj9idnkhI+tCxnwZDh58Qvjd2nURdkbevvoZkvxzCog==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/merge": "^9.0.1", - "@graphql-tools/utils": "^10.0.10", + "@graphql-tools/merge": "^9.0.3", + "@graphql-tools/utils": "^10.0.13", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, @@ -1992,17 +2440,18 @@ } }, "node_modules/@graphql-tools/url-loader": { - "version": "8.0.1", + "version": "8.0.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-8.0.2.tgz", + "integrity": "sha512-1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ==", "dev": true, - "license": "MIT", "dependencies": { "@ardatan/sync-fetch": "^0.0.1", - "@graphql-tools/delegate": "^10.0.0", - "@graphql-tools/executor-graphql-ws": "^1.0.0", - "@graphql-tools/executor-http": "^1.0.5", - "@graphql-tools/executor-legacy-ws": "^1.0.0", - "@graphql-tools/utils": "^10.0.0", - "@graphql-tools/wrap": "^10.0.0", + "@graphql-tools/delegate": "^10.0.4", + "@graphql-tools/executor-graphql-ws": "^1.1.2", + "@graphql-tools/executor-http": "^1.0.9", + "@graphql-tools/executor-legacy-ws": "^1.0.6", + "@graphql-tools/utils": "^10.0.13", + "@graphql-tools/wrap": "^10.0.2", "@types/ws": "^8.0.0", "@whatwg-node/fetch": "^0.9.0", "isomorphic-ws": "^5.0.0", @@ -2019,18 +2468,20 @@ }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/events": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.1.1.tgz", + "integrity": "sha512-AyQEn5hIPV7Ze+xFoXVU3QTHXVbWPrzaOkxtENMPMuNL6VVHrp4hHfDt9nrQpjO7BgvuM95dMtkycX5M/DZR3w==", "dev": true, - "license": "MIT", "engines": { "node": ">=16.0.0" } }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/fetch": { - "version": "0.9.16", + "version": "0.9.17", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.9.17.tgz", + "integrity": "sha512-TDYP3CpCrxwxpiNY0UMNf096H5Ihf67BK1iKGegQl5u9SlpEDYrvnV71gWBGJm+Xm31qOy8ATgma9rm8Pe7/5Q==", "dev": true, - "license": "MIT", "dependencies": { - "@whatwg-node/node-fetch": "^0.5.5", + "@whatwg-node/node-fetch": "^0.5.7", "urlpattern-polyfill": "^10.0.0" }, "engines": { @@ -2038,9 +2489,10 @@ } }, "node_modules/@graphql-tools/url-loader/node_modules/@whatwg-node/node-fetch": { - "version": "0.5.6", + "version": "0.5.10", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.10.tgz", + "integrity": "sha512-KIAHepie/T1PRkUfze4t+bPlyvpxlWiXTPtcGlbIZ0vWkBJMdRmCg4ZrJ2y4XaO1eTPo1HlWYUuj1WvoIpumqg==", "dev": true, - "license": "MIT", "dependencies": { "@kamilkisiela/fast-url-parser": "^1.1.4", "@whatwg-node/events": "^0.1.0", @@ -2054,13 +2506,15 @@ }, "node_modules/@graphql-tools/url-loader/node_modules/urlpattern-polyfill": { "version": "10.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", + "integrity": "sha512-H/A06tKD7sS1O1X2SshBVeA5FLycRpjqiBeqGKmBwBDBy28EnRjORxTNe269KSSr5un5qyWi1iL61wLxpd+ZOg==", + "dev": true }, "node_modules/@graphql-tools/utils": { - "version": "10.0.13", + "version": "10.1.2", + "resolved": "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.1.2.tgz", + "integrity": "sha512-fX13CYsDnX4yifIyNdiN0cVygz/muvkreWWem6BBw130+ODbRRgfiVveL0NizCEnKXkpvdeTy9Bxvo9LIKlhrw==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "cross-inspect": "1.0.0", @@ -2075,13 +2529,14 @@ } }, "node_modules/@graphql-tools/wrap": { - "version": "10.0.1", + "version": "10.0.5", + "resolved": "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-10.0.5.tgz", + "integrity": "sha512-Cbr5aYjr3HkwdPvetZp1cpDWTGdD1Owgsb3z/ClzhmrboiK86EnQDxDvOJiQkDCPWE9lNBwj8Y4HfxroY0D9DQ==", "dev": true, - "license": "MIT", "dependencies": { - "@graphql-tools/delegate": "^10.0.3", - "@graphql-tools/schema": "^10.0.0", - "@graphql-tools/utils": "^10.0.0", + "@graphql-tools/delegate": "^10.0.4", + "@graphql-tools/schema": "^10.0.3", + "@graphql-tools/utils": "^10.1.1", "tslib": "^2.4.0", "value-or-promise": "^1.0.12" }, @@ -2094,15 +2549,17 @@ }, "node_modules/@graphql-typed-document-node/core": { "version": "3.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz", + "integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==", "peerDependencies": { "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "node_modules/@humanwhocodes/config-array": { "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "@humanwhocodes/object-schema": "^2.0.2", "debug": "^4.3.1", @@ -2112,10 +2569,33 @@ "node": ">=10.10.0" } }, + "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/@humanwhocodes/config-array/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=12.22" }, @@ -2126,21 +2606,24 @@ }, "node_modules/@humanwhocodes/object-schema": { "version": "2.0.2", - "dev": true, - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.2.tgz", + "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==", + "dev": true }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", + "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/@jest/schemas": { "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", "dev": true, - "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -2149,43 +2632,48 @@ } }, "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.3", + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", "dev": true, - "license": "MIT", "dependencies": { - "@jridgewell/set-array": "^1.0.1", + "@jridgewell/set-array": "^1.2.1", "@jridgewell/sourcemap-codec": "^1.4.10", - "@jridgewell/trace-mapping": "^0.3.9" + "@jridgewell/trace-mapping": "^0.3.24" }, "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.1", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/set-array": { - "version": "1.1.2", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.4.15", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz", + "integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==", + "dev": true }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", "@jridgewell/sourcemap-codec": "^1.4.14" @@ -2193,12 +2681,14 @@ }, "node_modules/@kamilkisiela/fast-url-parser": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@kamilkisiela/fast-url-parser/-/fast-url-parser-1.1.4.tgz", + "integrity": "sha512-gbkePEBupNydxCelHCESvFSFM8XPh1Zs/OAVRW/rKpEqPAl5PbOM90Si8mv9bvnR53uPD2s/FiRxdvSejpRJew==", + "dev": true }, "node_modules/@mapbox/geojson-rewind": { "version": "0.5.2", - "license": "ISC", + "resolved": "https://registry.npmjs.org/@mapbox/geojson-rewind/-/geojson-rewind-0.5.2.tgz", + "integrity": "sha512-tJaT+RbYGJYStt7wI3cq4Nl4SXxG8W7JDG5DMJu97V25RnbNg3QtQtf+KD+VLjNpWKYsRvXDNmNrBgEETr1ifA==", "dependencies": { "get-stream": "^6.0.1", "minimist": "^1.2.6" @@ -2209,127 +2699,360 @@ }, "node_modules/@mapbox/jsonlint-lines-primitives": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz", + "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/@mapbox/point-geometry": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/@mapbox/point-geometry/-/point-geometry-0.1.0.tgz", + "integrity": "sha512-6j56HdLTwWGO0fJPlrZtdU/B13q8Uwmo18Ck2GnGgN9PCFyKTZ3UbXeEdRFh18i9XQ92eH2VdtpJHpBD3aripQ==" + }, + "node_modules/@mapbox/tiny-sdf": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/@mapbox/tiny-sdf/-/tiny-sdf-2.0.6.tgz", + "integrity": "sha512-qMqa27TLw+ZQz5Jk+RcwZGH7BQf5G/TrutJhspsca/3SHwmgKQ1iq+d3Jxz5oysPVYTGP6aXxCo5Lk9Er6YBAA==" + }, + "node_modules/@mapbox/unitbezier": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/@mapbox/unitbezier/-/unitbezier-0.0.1.tgz", + "integrity": "sha512-nMkuDXFv60aBr9soUG5q+GvZYL+2KZHVvsqFCzqnkGEf46U2fvmytHaEVc1/YZbiLn8X+eR3QzX1+dwDO1lxlw==" + }, + "node_modules/@mapbox/vector-tile": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@mapbox/vector-tile/-/vector-tile-1.3.1.tgz", + "integrity": "sha512-MCEddb8u44/xfQ3oD+Srl/tNcQoqTw3goGk2oLsrFxOTc3dUp+kAnby3PvAeeBYSMSjSPD1nd1AJA6W49WnoUw==", + "dependencies": { + "@mapbox/point-geometry": "~0.1.0" + } + }, + "node_modules/@mapbox/whoots-js": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@mapbox/whoots-js/-/whoots-js-3.1.0.tgz", + "integrity": "sha512-Es6WcD0nO5l+2BOQS4uLfNPYQaNDfbot3X1XUoloz+x0mPDS3eeORZJl06HXjwBG1fOGwCRnzK88LMdxKRrd6Q==", + "engines": { + "node": ">=6.0.0" + } + }, + "node_modules/@maplibre/maplibre-gl-style-spec": { + "version": "20.1.1", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.1.1.tgz", + "integrity": "sha512-z85ARNPCBI2Cs5cPOS3DSbraTN+ue8zrcYVoSWBuNrD/mA+2SKAJ+hIzI22uN7gac6jBMnCdpPKRxS/V0KSZVQ==", + "dependencies": { + "@mapbox/jsonlint-lines-primitives": "~2.0.2", + "@mapbox/unitbezier": "^0.0.1", + "json-stringify-pretty-compact": "^4.0.0", + "minimist": "^1.2.8", + "rw": "^1.3.3", + "sort-object": "^3.0.3" + }, + "bin": { + "gl-style-format": "dist/gl-style-format.mjs", + "gl-style-migrate": "dist/gl-style-migrate.mjs", + "gl-style-validate": "dist/gl-style-validate.mjs" + } + }, + "node_modules/@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "dependencies": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.4.1.tgz", + "integrity": "sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==", + "dev": true, + "dependencies": { + "detect-libc": "^1.0.3", + "is-glob": "^4.0.3", + "micromatch": "^4.0.5", + "node-addon-api": "^7.0.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + }, + "optionalDependencies": { + "@parcel/watcher-android-arm64": "2.4.1", + "@parcel/watcher-darwin-arm64": "2.4.1", + "@parcel/watcher-darwin-x64": "2.4.1", + "@parcel/watcher-freebsd-x64": "2.4.1", + "@parcel/watcher-linux-arm-glibc": "2.4.1", + "@parcel/watcher-linux-arm64-glibc": "2.4.1", + "@parcel/watcher-linux-arm64-musl": "2.4.1", + "@parcel/watcher-linux-x64-glibc": "2.4.1", + "@parcel/watcher-linux-x64-musl": "2.4.1", + "@parcel/watcher-win32-arm64": "2.4.1", + "@parcel/watcher-win32-ia32": "2.4.1", + "@parcel/watcher-win32-x64": "2.4.1" + } + }, + "node_modules/@parcel/watcher-android-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-android-arm64/-/watcher-android-arm64-2.4.1.tgz", + "integrity": "sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-arm64/-/watcher-darwin-arm64-2.4.1.tgz", + "integrity": "sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-darwin-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-darwin-x64/-/watcher-darwin-x64-2.4.1.tgz", + "integrity": "sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, + "node_modules/@parcel/watcher-freebsd-x64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-freebsd-x64/-/watcher-freebsd-x64-2.4.1.tgz", + "integrity": "sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], "engines": { - "node": ">= 0.6" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@mapbox/point-geometry": { - "version": "0.1.0", - "license": "ISC" - }, - "node_modules/@mapbox/tiny-sdf": { - "version": "2.0.6", - "license": "BSD-2-Clause" - }, - "node_modules/@mapbox/unitbezier": { - "version": "0.0.1", - "license": "BSD-2-Clause" - }, - "node_modules/@mapbox/vector-tile": { - "version": "1.3.1", - "license": "BSD-3-Clause", - "dependencies": { - "@mapbox/point-geometry": "~0.1.0" + "node_modules/@parcel/watcher-linux-arm-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm-glibc/-/watcher-linux-arm-glibc-2.4.1.tgz", + "integrity": "sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@mapbox/whoots-js": { - "version": "3.1.0", - "license": "ISC", + "node_modules/@parcel/watcher-linux-arm64-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-glibc/-/watcher-linux-arm64-glibc-2.4.1.tgz", + "integrity": "sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">=6.0.0" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "19.3.3", - "license": "ISC", - "dependencies": { - "@mapbox/jsonlint-lines-primitives": "~2.0.2", - "@mapbox/unitbezier": "^0.0.1", - "json-stringify-pretty-compact": "^3.0.0", - "minimist": "^1.2.8", - "rw": "^1.3.3", - "sort-object": "^3.0.3" + "node_modules/@parcel/watcher-linux-arm64-musl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-arm64-musl/-/watcher-linux-arm64-musl-2.4.1.tgz", + "integrity": "sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10.0.0" }, - "bin": { - "gl-style-format": "dist/gl-style-format.mjs", - "gl-style-migrate": "dist/gl-style-migrate.mjs", - "gl-style-validate": "dist/gl-style-validate.mjs" + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", + "node_modules/@parcel/watcher-linux-x64-glibc": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-glibc/-/watcher-linux-x64-glibc-2.4.1.tgz", + "integrity": "sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" - }, + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 8" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", + "node_modules/@parcel/watcher-linux-x64-musl": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-linux-x64-musl/-/watcher-linux-x64-musl-2.4.1.tgz", + "integrity": "sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT", + "optional": true, + "os": [ + "linux" + ], "engines": { - "node": ">= 8" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", + "node_modules/@parcel/watcher-win32-arm64": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-arm64/-/watcher-win32-arm64-2.4.1.tgz", + "integrity": "sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==", + "cpu": [ + "arm64" + ], "dev": true, - "license": "MIT", - "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" - }, + "optional": true, + "os": [ + "win32" + ], "engines": { - "node": ">= 8" + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" } }, - "node_modules/@parcel/watcher": { + "node_modules/@parcel/watcher-win32-ia32": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-ia32/-/watcher-win32-ia32-2.4.1.tgz", + "integrity": "sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==", + "cpu": [ + "ia32" + ], "dev": true, - "license": "MIT", - "dependencies": { - "detect-libc": "^1.0.3", - "is-glob": "^4.0.3", - "micromatch": "^4.0.5", - "node-addon-api": "^7.0.0" - }, + "optional": true, + "os": [ + "win32" + ], "engines": { "node": ">= 10.0.0" }, "funding": { "type": "opencollective", "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "@parcel/watcher-android-arm64": "2.4.1", - "@parcel/watcher-darwin-arm64": "2.4.1", - "@parcel/watcher-darwin-x64": "2.4.1", - "@parcel/watcher-freebsd-x64": "2.4.1", - "@parcel/watcher-linux-arm-glibc": "2.4.1", - "@parcel/watcher-linux-arm64-glibc": "2.4.1", - "@parcel/watcher-linux-arm64-musl": "2.4.1", - "@parcel/watcher-linux-x64-glibc": "2.4.1", - "@parcel/watcher-linux-x64-musl": "2.4.1", - "@parcel/watcher-win32-arm64": "2.4.1", - "@parcel/watcher-win32-ia32": "2.4.1", - "@parcel/watcher-win32-x64": "2.4.1" } }, - "node_modules/@parcel/watcher-darwin-x64": { + "node_modules/@parcel/watcher-win32-x64": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/@parcel/watcher-win32-x64/-/watcher-win32-x64-2.4.1.tgz", + "integrity": "sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==", "cpu": [ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ], "engines": { "node": ">= 10.0.0" @@ -2341,8 +3064,9 @@ }, "node_modules/@peculiar/asn1-schema": { "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.8.tgz", + "integrity": "sha512-ULB1XqHKx1WBU/tTFIA+uARuRoBVZ4pNdOA878RDrRbBfBGcSzi5HBkdScC6ZbHn8z7L8gmKCgPC1LHRrP46tA==", "dev": true, - "license": "MIT", "dependencies": { "asn1js": "^3.0.5", "pvtsutils": "^1.3.5", @@ -2351,8 +3075,9 @@ }, "node_modules/@peculiar/json-schema": { "version": "1.1.12", + "resolved": "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz", + "integrity": "sha512-coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.0" }, @@ -2362,8 +3087,9 @@ }, "node_modules/@peculiar/webcrypto": { "version": "1.4.5", + "resolved": "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.4.5.tgz", + "integrity": "sha512-oDk93QCDGdxFRM8382Zdminzs44dg3M2+E5Np+JWkpqLDyJC9DviMh8F8mEJkYuUcUOGA5jHO5AJJ10MFWdbZw==", "dev": true, - "license": "MIT", "dependencies": { "@peculiar/asn1-schema": "^2.3.8", "@peculiar/json-schema": "^1.1.12", @@ -2377,15 +3103,17 @@ }, "node_modules/@popperjs/core": { "version": "2.11.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" } }, "node_modules/@react-aria/ssr": { - "version": "3.9.1", - "license": "Apache-2.0", + "version": "3.9.2", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.2.tgz", + "integrity": "sha512-0gKkgDYdnq1w+ey8KzG9l+H5Z821qh9vVjztk55rUg71vTk/Eaebeir+WtzcLLwTjw3m/asIjx8Y59y1lJZhBw==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -2398,73 +3126,237 @@ }, "node_modules/@repeaterjs/repeater": { "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@repeaterjs/repeater/-/repeater-3.0.5.tgz", + "integrity": "sha512-l3YHBLAol6d/IKnB9LhpD0cEZWAoe3eFKUyTYWmFmCO2Q/WOckxLQAUyMZWwZV2M/m3+4vgRoaolFqaII82/TA==", + "dev": true + }, + "node_modules/@restart/hooks": { + "version": "0.4.16", + "resolved": "https://registry.npmjs.org/@restart/hooks/-/hooks-0.4.16.tgz", + "integrity": "sha512-f7aCv7c+nU/3mF7NWLtVVr0Ra80RqsO89hO72r+Y/nvQr5+q0UFGkocElTH6MJApvReVh6JHUFYn2cw1WdHF3w==", + "dependencies": { + "dequal": "^2.0.3" + }, + "peerDependencies": { + "react": ">=16.8.0" + } + }, + "node_modules/@restart/ui": { + "version": "1.6.8", + "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.8.tgz", + "integrity": "sha512-6ndCv3oZ7r9vuP1Ok9KH55TM1/UkdBnP/fSraW0DFDMbPMzWKhVKeFAIEUCRCSdzayjZDcFYK6xbMlipN9dmMA==", + "dependencies": { + "@babel/runtime": "^7.21.0", + "@popperjs/core": "^2.11.6", + "@react-aria/ssr": "^3.5.0", + "@restart/hooks": "^0.4.9", + "@types/warning": "^3.0.0", + "dequal": "^2.0.3", + "dom-helpers": "^5.2.0", + "uncontrollable": "^8.0.1", + "warning": "^4.0.3" + }, + "peerDependencies": { + "react": ">=16.14.0", + "react-dom": ">=16.14.0" + } + }, + "node_modules/@restart/ui/node_modules/uncontrollable": { + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-8.0.4.tgz", + "integrity": "sha512-ulRWYWHvscPFc0QQXvyJjY6LIXU56f0h8pQFvhxiKk5V1fcI8gp9Ht9leVAhrVjzqMw0BgjspBINx9r6oyJUvQ==", + "peerDependencies": { + "react": ">=16.14.0" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.13.0.tgz", + "integrity": "sha512-5ZYPOuaAqEH/W3gYsRkxQATBW3Ii1MfaT4EQstTnLKViLi2gLSQmlmtTpGucNP3sXEpOiI5tdGhjdE111ekyEg==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.13.0.tgz", + "integrity": "sha512-BSbaCmn8ZadK3UAQdlauSvtaJjhlDEjS5hEVVIN3A4bbl3X+otyf/kOJV08bYiRxfejP3DXFzO2jz3G20107+Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.13.0.tgz", + "integrity": "sha512-Ovf2evVaP6sW5Ut0GHyUSOqA6tVKfrTHddtmxGQc1CTQa1Cw3/KMCDEEICZBbyppcwnhMwcDce9ZRxdWRpVd6g==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.13.0.tgz", + "integrity": "sha512-U+Jcxm89UTK592vZ2J9st9ajRv/hrwHdnvyuJpa5A2ngGSVHypigidkQJP+YiGL6JODiUeMzkqQzbCG3At81Gg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.13.0.tgz", + "integrity": "sha512-8wZidaUJUTIR5T4vRS22VkSMOVooG0F4N+JSwQXWSRiC6yfEsFMLTYRFHvby5mFFuExHa/yAp9juSphQQJAijQ==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.13.0.tgz", + "integrity": "sha512-Iu0Kno1vrD7zHQDxOmvweqLkAzjxEVqNhUIXBsZ8hu8Oak7/5VTPrxOEZXYC1nmrBVJp0ZcL2E7lSuuOVaE3+w==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.13.0.tgz", + "integrity": "sha512-C31QrW47llgVyrRjIwiOwsHFcaIwmkKi3PCroQY5aVq4H0A5v/vVVAtFsI1nfBngtoRpeREvZOkIhmRwUKkAdw==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.13.0.tgz", + "integrity": "sha512-Oq90dtMHvthFOPMl7pt7KmxzX7E71AfyIhh+cPhLY9oko97Zf2C9tt/XJD4RgxhaGeAraAXDtqxvKE1y/j35lA==", + "cpu": [ + "riscv64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.13.0.tgz", + "integrity": "sha512-yUD/8wMffnTKuiIsl6xU+4IA8UNhQ/f1sAnQebmE/lyQ8abjsVyDkyRkWop0kdMhKMprpNIhPmYlCxgHrPoXoA==", + "cpu": [ + "x64" + ], "dev": true, - "license": "MIT" + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@restart/hooks": { - "version": "0.4.16", - "license": "MIT", - "dependencies": { - "dequal": "^2.0.3" - }, - "peerDependencies": { - "react": ">=16.8.0" - } + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.13.0.tgz", + "integrity": "sha512-9RyNqoFNdF0vu/qqX63fKotBh43fJQeYC98hCaf89DYQpv+xu0D8QFSOS0biA7cGuqJFOc1bJ+m2rhhsKcw1hw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ] }, - "node_modules/@restart/ui": { - "version": "1.6.8", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.21.0", - "@popperjs/core": "^2.11.6", - "@react-aria/ssr": "^3.5.0", - "@restart/hooks": "^0.4.9", - "@types/warning": "^3.0.0", - "dequal": "^2.0.3", - "dom-helpers": "^5.2.0", - "uncontrollable": "^8.0.1", - "warning": "^4.0.3" - }, - "peerDependencies": { - "react": ">=16.14.0", - "react-dom": ">=16.14.0" - } + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.13.0.tgz", + "integrity": "sha512-46ue8ymtm/5PUU6pCvjlic0z82qWkxv54GTJZgHrQUuZnVH+tvvSP0LsozIDsCBFO4VjJ13N68wqrKSeScUKdA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] }, - "node_modules/@restart/ui/node_modules/uncontrollable": { - "version": "8.0.4", - "license": "MIT", - "peerDependencies": { - "react": ">=16.14.0" - } + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.13.0.tgz", + "integrity": "sha512-P5/MqLdLSlqxbeuJ3YDeX37srC8mCflSyTrUsgbU1c/U9j6l2g2GiIdYaGD9QjdMQPMSgYm7hgg0551wHyIluw==", + "cpu": [ + "ia32" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ] }, - "node_modules/@rollup/rollup-darwin-x64": { + "node_modules/@rollup/rollup-win32-x64-msvc": { "version": "4.13.0", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.13.0.tgz", + "integrity": "sha512-UKXUQNbO3DOhzLRwHSpa0HnhhCgNODvfoPWv2FCXme8N/ANFfhIPMGuOT+QuKd16+B5yxZ0HdpNlqPvTMS1qfw==", "cpu": [ "x64" ], "dev": true, - "license": "MIT", "optional": true, "os": [ - "darwin" + "win32" ] }, "node_modules/@sinclair/typebox": { "version": "0.27.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "dev": true }, "node_modules/@swc/helpers": { - "version": "0.5.6", - "license": "Apache-2.0", + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.7.tgz", + "integrity": "sha512-BVvNZhx362+l2tSwSuyEUV4h7+jk9raNdoTSdLfwTshXJSaGmYKluGRJznziCI3KX02Z19DdsQrdfrpXAU3Hfg==", "dependencies": { "tslib": "^2.4.0" } }, "node_modules/@testing-library/dom": { "version": "9.3.4", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", + "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -2499,13 +3391,15 @@ }, "node_modules/@types/aria-query": { "version": "5.0.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true }, "node_modules/@types/babel__core": { "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", + "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/parser": "^7.20.7", "@babel/types": "^7.20.7", @@ -2516,16 +3410,18 @@ }, "node_modules/@types/babel__generator": { "version": "7.6.8", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.8.tgz", + "integrity": "sha512-ASsj+tpEDsEiFr1arWrlN6V3mdfjRMZt6LtK/Vp/kreFLnr5QH5+DhvD5nINYZXzwJvXeGq+05iUXcAzVrqWtw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.0.0" } }, "node_modules/@types/babel__template": { "version": "7.4.4", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", + "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", "dev": true, - "license": "MIT", "dependencies": { "@babel/parser": "^7.1.0", "@babel/types": "^7.0.0" @@ -2533,37 +3429,43 @@ }, "node_modules/@types/babel__traverse": { "version": "7.20.5", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.20.5.tgz", + "integrity": "sha512-WXCyOcRtH37HAUkpXhUduaxdm82b4GSlyTqajXviN4EfiuPgNYR109xMCKvpl6zPIpua0DGlMEDCq+g8EdoheQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/types": "^7.20.7" } }, "node_modules/@types/estree": { "version": "1.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true }, "node_modules/@types/geojson": { "version": "7946.0.14", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz", + "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==" }, "node_modules/@types/geojson-vt": { "version": "3.2.5", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/geojson-vt/-/geojson-vt-3.2.5.tgz", + "integrity": "sha512-qDO7wqtprzlpe8FfQ//ClPV9xiuoh2nkIgiouIptON9w5jvD/fA4szvP9GBlDVdJ5dldAl0kX/sy3URbWwLx0g==", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/istanbul-lib-coverage": { "version": "2.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", + "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", + "dev": true }, "node_modules/@types/js-yaml": { "version": "4.0.9", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz", + "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==", + "dev": true }, "node_modules/@types/json-schema": { "version": "7.0.15", @@ -2573,21 +3475,25 @@ }, "node_modules/@types/json-stable-stringify": { "version": "1.0.36", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.36.tgz", + "integrity": "sha512-b7bq23s4fgBB76n34m2b3RBf6M369B0Z9uRR8aHTMd8kZISRkmDEpPD8hhpYvDFzr3bJCPES96cm3Q6qRNDbQw==", + "dev": true }, "node_modules/@types/json5": { "version": "0.0.29", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", + "dev": true }, "node_modules/@types/mapbox__point-geometry": { "version": "0.1.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", + "integrity": "sha512-mUWlSxAmYLfwnRBmgYV86tgYmMIICX4kza8YnE/eIlywGe2XoOxlpVnXWwir92xRLjwyarqwpu2EJKD2pk0IUA==" }, "node_modules/@types/mapbox__vector-tile": { "version": "1.3.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/mapbox__vector-tile/-/mapbox__vector-tile-1.3.4.tgz", + "integrity": "sha512-bpd8dRn9pr6xKvuEBQup8pwQfD4VUyqO/2deGjfpe6AwC8YRlyEipvefyRJUSiCJTZuCb8Pl1ciVV5ekqJ96Bg==", "dependencies": { "@types/geojson": "*", "@types/mapbox__point-geometry": "*", @@ -2595,27 +3501,31 @@ } }, "node_modules/@types/mapbox-gl": { - "version": "2.7.21", - "license": "MIT", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/@types/mapbox-gl/-/mapbox-gl-3.1.0.tgz", + "integrity": "sha512-hI6cQDjw1bkJw7MC/eHMqq5TWUamLwsujnUUeiIX2KDRjxRNSYMjnHz07+LATz9I9XIsKumOtUz4gRYnZOJ/FA==", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/node": { - "version": "20.11.17", + "version": "20.11.30", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.11.30.tgz", + "integrity": "sha512-dHM6ZxwlmuZaRmUPfv1p+KrdD1Dci04FbdEm/9wEMouFqxYoFl5aMkt0VMAUtYRQDyYvD41WJLukhq/ha3YuTw==", "dev": true, - "license": "MIT", "dependencies": { "undici-types": "~5.26.4" } }, "node_modules/@types/pbf": { "version": "3.0.5", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/pbf/-/pbf-3.0.5.tgz", + "integrity": "sha512-j3pOPiEcWZ34R6a6mN07mUkM4o4Lwf6hPNt8eilOeZhTFbxFXmKhvXl9Y28jotFPaI1bpPDJsbCprUoNke6OrA==" }, "node_modules/@types/prop-types": { - "version": "15.7.11", - "license": "MIT" + "version": "15.7.12", + "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.12.tgz", + "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/react": { "version": "18.2.70", @@ -2629,22 +3539,25 @@ }, "node_modules/@types/react-dom": { "version": "18.2.22", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.22.tgz", + "integrity": "sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/react": "*" } }, "node_modules/@types/react-transition-group": { "version": "4.4.10", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", + "integrity": "sha512-hT/+s0VQs2ojCX823m60m5f0sL5idt9SO6Tj6Dg+rdphGPIeJbJ6CxvBYkgkGKrYeDjvIpKTR38UzmtHJOGW3Q==", "dependencies": { "@types/react": "*" } }, "node_modules/@types/scheduler": { "version": "0.16.8", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", + "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" }, "node_modules/@types/semver": { "version": "7.5.8", @@ -2654,19 +3567,22 @@ }, "node_modules/@types/supercluster": { "version": "7.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz", + "integrity": "sha512-Z0pOY34GDFl3Q6hUFYf3HkTwKEE02e7QgtJppBt+beEAxnyOpJua+voGFvxINBHa06GwLFFym7gRPY2SiKIfIA==", "dependencies": { "@types/geojson": "*" } }, "node_modules/@types/warning": { "version": "3.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/@types/warning/-/warning-3.0.3.tgz", + "integrity": "sha512-D1XC7WK8K+zZEveUPY+cf4+kgauk8N4eHr/XIHXGlGYkHLud6hK9lYfZk1ry1TNh798cZUCgb6MqGEG8DkJt6Q==" }, "node_modules/@types/ws": { "version": "8.5.10", + "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz", + "integrity": "sha512-vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==", "dev": true, - "license": "MIT", "dependencies": { "@types/node": "*" } @@ -2708,8 +3624,9 @@ }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -2719,8 +3636,9 @@ }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -2733,8 +3651,9 @@ }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/@typescript-eslint/parser": { "version": "7.4.0", @@ -2849,15 +3768,6 @@ } } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", - "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "dev": true, - "dependencies": { - "balanced-match": "^1.0.0" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", @@ -2870,21 +3780,6 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "dev": true, - "dependencies": { - "brace-expansion": "^2.0.1" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { "version": "7.6.0", "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", @@ -2983,13 +3878,15 @@ }, "node_modules/@ungap/structured-clone": { "version": "1.2.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true }, "node_modules/@vitejs/plugin-react": { "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz", + "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==", "dev": true, - "license": "MIT", "dependencies": { "@babel/core": "^7.23.5", "@babel/plugin-transform-react-jsx-self": "^7.23.3", @@ -3006,8 +3903,9 @@ }, "node_modules/@vitest/coverage-v8": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.4.0.tgz", + "integrity": "sha512-4hDGyH1SvKpgZnIByr9LhGgCEuF9DKM34IBLCC/fVfy24Z3+PZ+Ii9hsVBsHvY1umM1aGPEjceRkzxCfcQ10wg==", "dev": true, - "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.1", "@bcoe/v8-coverage": "^0.2.3", @@ -3033,8 +3931,9 @@ }, "node_modules/@vitest/expect": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.4.0.tgz", + "integrity": "sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==", "dev": true, - "license": "MIT", "dependencies": { "@vitest/spy": "1.4.0", "@vitest/utils": "1.4.0", @@ -3046,8 +3945,9 @@ }, "node_modules/@vitest/runner": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.4.0.tgz", + "integrity": "sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==", "dev": true, - "license": "MIT", "dependencies": { "@vitest/utils": "1.4.0", "p-limit": "^5.0.0", @@ -3059,8 +3959,9 @@ }, "node_modules/@vitest/runner/node_modules/p-limit": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz", + "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^1.0.0" }, @@ -3073,8 +3974,9 @@ }, "node_modules/@vitest/runner/node_modules/yocto-queue": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz", + "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==", "dev": true, - "license": "MIT", "engines": { "node": ">=12.20" }, @@ -3084,8 +3986,9 @@ }, "node_modules/@vitest/snapshot": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.4.0.tgz", + "integrity": "sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==", "dev": true, - "license": "MIT", "dependencies": { "magic-string": "^0.30.5", "pathe": "^1.1.1", @@ -3097,8 +4000,9 @@ }, "node_modules/@vitest/snapshot/node_modules/ansi-styles": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -3108,8 +4012,9 @@ }, "node_modules/@vitest/snapshot/node_modules/pretty-format": { "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -3121,13 +4026,15 @@ }, "node_modules/@vitest/snapshot/node_modules/react-is": { "version": "18.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true }, "node_modules/@vitest/spy": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.4.0.tgz", + "integrity": "sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==", "dev": true, - "license": "MIT", "dependencies": { "tinyspy": "^2.2.0" }, @@ -3137,8 +4044,9 @@ }, "node_modules/@vitest/utils": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.4.0.tgz", + "integrity": "sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==", "dev": true, - "license": "MIT", "dependencies": { "diff-sequences": "^29.6.3", "estree-walker": "^3.0.3", @@ -3151,8 +4059,9 @@ }, "node_modules/@vitest/utils/node_modules/ansi-styles": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -3162,8 +4071,9 @@ }, "node_modules/@vitest/utils/node_modules/pretty-format": { "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", "dev": true, - "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -3175,18 +4085,21 @@ }, "node_modules/@vitest/utils/node_modules/react-is": { "version": "18.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "dev": true }, "node_modules/@whatwg-node/events": { "version": "0.0.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.0.3.tgz", + "integrity": "sha512-IqnKIDWfXBJkvy/k6tzskWTc2NK3LcqHlb+KHGCrjOCH4jfQckRX0NAiIcC/vIqQkzLYw2r2CTSwAxcrtcD6lA==", + "dev": true }, "node_modules/@whatwg-node/fetch": { "version": "0.8.8", + "resolved": "https://registry.npmjs.org/@whatwg-node/fetch/-/fetch-0.8.8.tgz", + "integrity": "sha512-CdcjGC2vdKhc13KKxgsc6/616BQ7ooDIgPeTuAiE8qfCnS0mGzcfCOoZXypQSz73nxI+GWc7ZReIAVhxoE1KCg==", "dev": true, - "license": "MIT", "dependencies": { "@peculiar/webcrypto": "^1.4.0", "@whatwg-node/node-fetch": "^0.3.6", @@ -3197,8 +4110,9 @@ }, "node_modules/@whatwg-node/node-fetch": { "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.3.6.tgz", + "integrity": "sha512-w9wKgDO4C95qnXZRwZTfCmLWqyRnooGjcIwG0wADWjw9/HN0p7dtvtgSvItZtUyNteEvgTrd8QojNEqV6DAGTA==", "dev": true, - "license": "MIT", "dependencies": { "@whatwg-node/events": "^0.0.3", "busboy": "^1.6.0", @@ -3209,8 +4123,9 @@ }, "node_modules/acorn": { "version": "8.11.3", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz", + "integrity": "sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==", "dev": true, - "license": "MIT", "bin": { "acorn": "bin/acorn" }, @@ -3220,24 +4135,27 @@ }, "node_modules/acorn-jsx": { "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, "node_modules/acorn-walk": { "version": "8.3.2", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz", + "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.4.0" } }, "node_modules/agent-base": { "version": "7.1.0", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", + "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^4.3.4" }, @@ -3247,8 +4165,9 @@ }, "node_modules/aggregate-error": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", + "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, - "license": "MIT", "dependencies": { "clean-stack": "^2.0.0", "indent-string": "^4.0.0" @@ -3259,8 +4178,9 @@ }, "node_modules/ajv": { "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -3274,8 +4194,9 @@ }, "node_modules/ansi-escapes": { "version": "4.3.2", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", + "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==", "dev": true, - "license": "MIT", "dependencies": { "type-fest": "^0.21.3" }, @@ -3288,16 +4209,18 @@ }, "node_modules/ansi-regex": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/ansi-styles": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -3310,28 +4233,32 @@ }, "node_modules/argparse": { "version": "2.0.1", - "dev": true, - "license": "Python-2.0" + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true }, "node_modules/aria-query": { "version": "5.1.3", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", + "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "deep-equal": "^2.0.5" } }, "node_modules/arr-union": { "version": "3.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==", "engines": { "node": ">=0.10.0" } }, "node_modules/array-buffer-byte-length": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", + "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "is-array-buffer": "^3.0.4" @@ -3344,14 +4271,16 @@ } }, "node_modules/array-includes": { - "version": "3.1.7", + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz", + "integrity": "sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", "is-string": "^1.0.7" }, "engines": { @@ -3363,39 +4292,24 @@ }, "node_modules/array-union": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/array.prototype.filter": { - "version": "1.0.3", - "dev": true, - "license": "MIT", - "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-array-method-boxes-properly": "^1.0.0", - "is-string": "^1.0.7" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/array.prototype.findlast": { - "version": "1.2.4", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz", + "integrity": "sha512-CVvd6FHg1Z3POpBLxO6E6zr+rSKEQ9L6rZHAaY7lLfhKsWYUBBOuMs0e9o24oopj6H+geRCX0YJ+TJLBK2eHyQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", + "es-abstract": "^1.23.2", "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", "es-shim-unscopables": "^1.0.2" }, "engines": { @@ -3406,14 +4320,16 @@ } }, "node_modules/array.prototype.findlastindex": { - "version": "1.2.4", + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/array.prototype.findlastindex/-/array.prototype.findlastindex-1.2.5.tgz", + "integrity": "sha512-zfETvRFA8o7EiNn++N5f/kaCw221hrpGsDmcpndVupkPzEc1Wuf3VgC0qby1BbHs7f5DVYjgtEU2LLh5bqeGfQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", + "es-abstract": "^1.23.2", "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", "es-shim-unscopables": "^1.0.2" }, "engines": { @@ -3425,8 +4341,9 @@ }, "node_modules/array.prototype.flat": { "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.3.2.tgz", + "integrity": "sha512-djYB+Zx2vLewY8RWlNCUdHjDXs2XOgm602S9E7P/UpHgfeHL00cRiIF+IN/G/aUJ7kGPb6yO/ErDI5V2s8iycA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3442,8 +4359,9 @@ }, "node_modules/array.prototype.flatmap": { "version": "1.3.2", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", + "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3459,8 +4377,9 @@ }, "node_modules/array.prototype.toreversed": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz", + "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -3470,8 +4389,9 @@ }, "node_modules/array.prototype.tosorted": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", + "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -3482,8 +4402,9 @@ }, "node_modules/arraybuffer.prototype.slice": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", + "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", "dev": true, - "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", "call-bind": "^1.0.5", @@ -3503,13 +4424,15 @@ }, "node_modules/asap": { "version": "2.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", + "dev": true }, "node_modules/asn1js": { "version": "3.0.5", + "resolved": "https://registry.npmjs.org/asn1js/-/asn1js-3.0.5.tgz", + "integrity": "sha512-FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "pvtsutils": "^1.3.2", "pvutils": "^1.1.3", @@ -3521,49 +4444,47 @@ }, "node_modules/assertion-error": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz", + "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==", "dev": true, - "license": "MIT", "engines": { "node": "*" } }, "node_modules/assign-symbols": { "version": "1.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==", "engines": { "node": ">=0.10.0" } }, "node_modules/ast-types-flow": { "version": "0.0.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.8.tgz", + "integrity": "sha512-OH/2E5Fg20h2aPrbe+QL8JZQFko0YZaF+j4mnQ7BGhfavO7OpSLa8a0y9sBwomHdSbkhTS8TQNayBfnW5DwbvQ==", + "dev": true }, "node_modules/astral-regex": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, - "node_modules/asynciterator.prototype": { - "version": "1.0.0", - "dev": true, - "license": "MIT", - "dependencies": { - "has-symbols": "^1.0.3" - } - }, "node_modules/asynckit": { "version": "0.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "dev": true }, "node_modules/auto-bind": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/auto-bind/-/auto-bind-4.0.0.tgz", + "integrity": "sha512-Hdw8qdNiqdJ8LqT0iK0sVzkFbzg6fhnQqqfWhBDxcHZvU75+B+ayzTy8x+k5Ix0Y92XOhOUlx74ps+bA6BeYMQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -3572,9 +4493,13 @@ } }, "node_modules/available-typed-arrays": { - "version": "1.0.6", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", + "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, - "license": "MIT", + "dependencies": { + "possible-typed-array-names": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -3582,23 +4507,35 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/axe-core": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz", + "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/axobject-query": { "version": "3.2.1", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz", + "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "dequal": "^2.0.3" } }, "node_modules/babel-plugin-syntax-trailing-function-commas": { "version": "7.0.0-beta.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz", + "integrity": "sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==", + "dev": true }, "node_modules/babel-preset-fbjs": { "version": "3.4.0", + "resolved": "https://registry.npmjs.org/babel-preset-fbjs/-/babel-preset-fbjs-3.4.0.tgz", + "integrity": "sha512-9ywCsCvo1ojrw0b+XYk7aFvTH6D9064t0RIL1rtMf3nsa02Xw41MS7sZw216Im35xj/UY0PDBQsa1brUDDF1Ow==", "dev": true, - "license": "MIT", "dependencies": { "@babel/plugin-proposal-class-properties": "^7.0.0", "@babel/plugin-proposal-object-rest-spread": "^7.0.0", @@ -3634,11 +4571,14 @@ }, "node_modules/balanced-match": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true }, "node_modules/base64-js": { "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "funding": [ { @@ -3653,13 +4593,13 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/bl": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", "dev": true, - "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -3668,6 +4608,8 @@ }, "node_modules/bootstrap": { "version": "5.3.3", + "resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-5.3.3.tgz", + "integrity": "sha512-8HLCdWgyoMguSO9o+aH+iuZ+aht+mzW0u3HIMzVu7Srrpv7EBBxTnrFlSCskwdY1+EOFQSm7uMJhNQHkdPcmjg==", "funding": [ { "type": "github", @@ -3678,24 +4620,24 @@ "url": "https://opencollective.com/bootstrap" } ], - "license": "MIT", "peerDependencies": { "@popperjs/core": "^2.11.8" } }, "node_modules/brace-expansion": { - "version": "1.1.11", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "balanced-match": "^1.0.0" } }, "node_modules/braces": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", "dev": true, - "license": "MIT", "dependencies": { "fill-range": "^7.0.1" }, @@ -3704,7 +4646,9 @@ } }, "node_modules/browserslist": { - "version": "4.22.3", + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.0.tgz", + "integrity": "sha512-QW8HiM1shhT2GuzkvklfjcKDiWFXHOeFCIA/huJPwHsslwcydgk7X+z2zXpEijP98UCY7HbubZt5J2Zgvf0CaQ==", "dev": true, "funding": [ { @@ -3720,10 +4664,9 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { - "caniuse-lite": "^1.0.30001580", - "electron-to-chromium": "^1.4.648", + "caniuse-lite": "^1.0.30001587", + "electron-to-chromium": "^1.4.668", "node-releases": "^2.0.14", "update-browserslist-db": "^1.0.13" }, @@ -3736,14 +4679,17 @@ }, "node_modules/bser": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", "dev": true, - "license": "Apache-2.0", "dependencies": { "node-int64": "^0.4.0" } }, "node_modules/buffer": { "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", "dev": true, "funding": [ { @@ -3759,7 +4705,6 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -3767,6 +4712,8 @@ }, "node_modules/busboy": { "version": "1.6.0", + "resolved": "https://registry.npmjs.org/busboy/-/busboy-1.6.0.tgz", + "integrity": "sha512-8SFQbg/0hQ9xy3UNTB0YEnsNBbWfhf7RtnzpL7TkBiTBRfrQ9Fxcnz7VJsleJpyp6rVLvXiuORqjlHi5q+PYuA==", "dev": true, "dependencies": { "streamsearch": "^1.1.0" @@ -3777,7 +4724,8 @@ }, "node_modules/bytewise": { "version": "1.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz", + "integrity": "sha512-rHuuseJ9iQ0na6UDhnrRVDh8YnWVlU6xM3VH6q/+yHDeUH2zIhUzP+2/h3LIrhLDBtTqzWpE3p3tP/boefskKQ==", "dependencies": { "bytewise-core": "^1.2.2", "typewise": "^1.0.3" @@ -3785,23 +4733,26 @@ }, "node_modules/bytewise-core": { "version": "1.2.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz", + "integrity": "sha512-nZD//kc78OOxeYtRlVk8/zXqTB4gf/nlguL1ggWA8FuchMyOxcyHR4QPQZMUmA7czC+YnaBrPUCubqAWe50DaA==", "dependencies": { "typewise-core": "^1.2" } }, "node_modules/cac": { "version": "6.7.14", + "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz", + "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/call-bind": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", + "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", "dev": true, - "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -3818,16 +4769,18 @@ }, "node_modules/callsites": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/camel-case": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", "dev": true, - "license": "MIT", "dependencies": { "pascal-case": "^3.1.2", "tslib": "^2.0.3" @@ -3835,14 +4788,17 @@ }, "node_modules/camelcase": { "version": "5.3.1", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/caniuse-lite": { - "version": "1.0.30001587", + "version": "1.0.30001600", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001600.tgz", + "integrity": "sha512-+2S9/2JFhYmYaDpZvo0lKkfvuKIglrx68MwOBqMGHhQsNkLjB5xtc/TGoEPs+MxjSyN/72qer2g97nzR641mOQ==", "dev": true, "funding": [ { @@ -3857,13 +4813,13 @@ "type": "github", "url": "https://github.com/sponsors/ai" } - ], - "license": "CC-BY-4.0" + ] }, "node_modules/capital-case": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", + "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -3872,8 +4828,9 @@ }, "node_modules/chai": { "version": "4.4.1", + "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz", + "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==", "dev": true, - "license": "MIT", "dependencies": { "assertion-error": "^1.1.0", "check-error": "^1.0.3", @@ -3889,8 +4846,9 @@ }, "node_modules/chalk": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -3904,8 +4862,9 @@ }, "node_modules/change-case": { "version": "4.1.2", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", + "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", "dev": true, - "license": "MIT", "dependencies": { "camel-case": "^4.1.2", "capital-case": "^1.0.4", @@ -3923,8 +4882,9 @@ }, "node_modules/change-case-all": { "version": "1.0.15", + "resolved": "https://registry.npmjs.org/change-case-all/-/change-case-all-1.0.15.tgz", + "integrity": "sha512-3+GIFhk3sNuvFAJKU46o26OdzudQlPNBCu1ZQi3cMeMHhty1bhDxu2WrEilVNYaGvqUtR1VSigFcJOiS13dRhQ==", "dev": true, - "license": "MIT", "dependencies": { "change-case": "^4.1.2", "is-lower-case": "^2.0.2", @@ -3940,13 +4900,15 @@ }, "node_modules/chardet": { "version": "0.7.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", + "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "dev": true }, "node_modules/check-error": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz", + "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==", "dev": true, - "license": "MIT", "dependencies": { "get-func-name": "^2.0.2" }, @@ -3956,20 +4918,23 @@ }, "node_modules/classnames": { "version": "2.5.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz", + "integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==" }, "node_modules/clean-stack": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", + "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/cli-cursor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", "dev": true, - "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" }, @@ -3979,8 +4944,9 @@ }, "node_modules/cli-spinners": { "version": "2.9.2", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.9.2.tgz", + "integrity": "sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" }, @@ -3990,8 +4956,9 @@ }, "node_modules/cli-truncate": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz", + "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==", "dev": true, - "license": "MIT", "dependencies": { "slice-ansi": "^3.0.0", "string-width": "^4.2.0" @@ -4005,16 +4972,18 @@ }, "node_modules/cli-width": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", + "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", "dev": true, - "license": "ISC", "engines": { "node": ">= 10" } }, "node_modules/cliui": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "dev": true, - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -4026,8 +4995,9 @@ }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -4042,16 +5012,18 @@ }, "node_modules/clone": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8" } }, "node_modules/color-convert": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -4061,18 +5033,21 @@ }, "node_modules/color-name": { "version": "1.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true }, "node_modules/colorette": { "version": "2.0.20", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "dev": true }, "node_modules/combined-stream": { "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, - "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -4082,21 +5057,24 @@ }, "node_modules/common-tags": { "version": "1.8.2", + "resolved": "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz", + "integrity": "sha512-gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4.0.0" } }, "node_modules/concat-map": { "version": "0.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true }, "node_modules/constant-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", + "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -4105,13 +5083,15 @@ }, "node_modules/convert-source-map": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true }, "node_modules/cosmiconfig": { "version": "8.3.6", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.3.6.tgz", + "integrity": "sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==", "dev": true, - "license": "MIT", "dependencies": { "import-fresh": "^3.3.0", "js-yaml": "^4.1.0", @@ -4135,15 +5115,17 @@ }, "node_modules/cross-fetch": { "version": "3.1.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", + "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", "dependencies": { "node-fetch": "^2.6.12" } }, "node_modules/cross-inspect": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cross-inspect/-/cross-inspect-1.0.0.tgz", + "integrity": "sha512-4PFfn4b5ZN6FMNGSZlyb7wUhuN8wvj8t/VQHZdM4JsDcruGJ8L2kf9zao98QIrBPFCpdk27qst/AGTl7pL3ypQ==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.4.0" }, @@ -4153,8 +5135,9 @@ }, "node_modules/cross-spawn": { "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^3.1.0", "shebang-command": "^2.0.0", @@ -4166,8 +5149,9 @@ }, "node_modules/cssstyle": { "version": "4.0.1", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-4.0.1.tgz", + "integrity": "sha512-8ZYiJ3A/3OkDd093CBT/0UKDWry7ak4BdPTFP2+QEP7cmhouyq/Up709ASSj2cK02BbZiMgk7kYjZNS4QP5qrQ==", "dev": true, - "license": "MIT", "dependencies": { "rrweb-cssom": "^0.6.0" }, @@ -4177,17 +5161,20 @@ }, "node_modules/csstype": { "version": "3.1.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==" }, "node_modules/damerau-levenshtein": { "version": "1.0.8", - "dev": true, - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz", + "integrity": "sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA==", + "dev": true }, "node_modules/data-urls": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz", + "integrity": "sha512-ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==", "dev": true, - "license": "MIT", "dependencies": { "whatwg-mimetype": "^4.0.0", "whatwg-url": "^14.0.0" @@ -4196,20 +5183,74 @@ "node": ">=18" } }, + "node_modules/data-view-buffer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", + "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", + "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.7", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/data-view-byte-offset": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", + "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "dev": true, + "dependencies": { + "call-bind": "^1.0.6", + "es-errors": "^1.3.0", + "is-data-view": "^1.0.1" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/dataloader": { "version": "2.2.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/dataloader/-/dataloader-2.2.2.tgz", + "integrity": "sha512-8YnDaaf7N3k/q5HnTJVuzSyLETjoZjVmHc4AeKAzOvKHEFQKcn64OKBfzHYtE9zGjctNM7V9I0MfnUVLpi7M5g==", + "dev": true }, "node_modules/debounce": { "version": "1.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz", + "integrity": "sha512-XRRe6Glud4rd/ZGQfiV1ruXSfbvfJedlV9Y6zOlP+2K04vBYiJEte6stfFkCP03aMnY5tsipamumUjL14fofug==", + "dev": true }, "node_modules/debug": { "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "2.1.2" }, @@ -4224,21 +5265,24 @@ }, "node_modules/decamelize": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/decimal.js": { "version": "10.4.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.4.3.tgz", + "integrity": "sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==", + "dev": true }, "node_modules/deep-eql": { "version": "4.1.3", + "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz", + "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==", "dev": true, - "license": "MIT", "dependencies": { "type-detect": "^4.0.0" }, @@ -4248,8 +5292,9 @@ }, "node_modules/deep-equal": { "version": "2.2.3", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", + "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", "dev": true, - "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.0", "call-bind": "^1.0.5", @@ -4279,13 +5324,15 @@ }, "node_modules/deep-is": { "version": "0.1.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true }, "node_modules/defaults": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", "dev": true, - "license": "MIT", "dependencies": { "clone": "^1.0.2" }, @@ -4295,8 +5342,9 @@ }, "node_modules/define-data-property": { "version": "1.1.4", + "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", + "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, - "license": "MIT", "dependencies": { "es-define-property": "^1.0.0", "es-errors": "^1.3.0", @@ -4311,8 +5359,9 @@ }, "node_modules/define-properties": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", + "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, - "license": "MIT", "dependencies": { "define-data-property": "^1.0.1", "has-property-descriptors": "^1.0.0", @@ -4327,39 +5376,44 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.4.0" } }, "node_modules/dependency-graph": { "version": "0.11.0", + "resolved": "https://registry.npmjs.org/dependency-graph/-/dependency-graph-0.11.0.tgz", + "integrity": "sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6.0" } }, "node_modules/dequal": { "version": "2.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "engines": { "node": ">=6" } }, "node_modules/detect-indent": { "version": "6.1.0", + "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-6.1.0.tgz", + "integrity": "sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/detect-libc": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==", "dev": true, - "license": "Apache-2.0", "bin": { "detect-libc": "bin/detect-libc.js" }, @@ -4369,16 +5423,18 @@ }, "node_modules/diff-sequences": { "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", "dev": true, - "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } }, "node_modules/dir-glob": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", "dev": true, - "license": "MIT", "dependencies": { "path-type": "^4.0.0" }, @@ -4388,8 +5444,9 @@ }, "node_modules/doctrine": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, - "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -4399,12 +5456,14 @@ }, "node_modules/dom-accessibility-api": { "version": "0.5.16", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true }, "node_modules/dom-helpers": { "version": "5.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", "dependencies": { "@babel/runtime": "^7.8.7", "csstype": "^3.0.2" @@ -4412,17 +5471,19 @@ }, "node_modules/dot-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" } }, "node_modules/dotenv": { - "version": "16.4.4", + "version": "16.4.5", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.5.tgz", + "integrity": "sha512-ZmdL2rui+eB2YwhsWzjInR8LldtZHGDoQ1ugH85ppHKwpUHL7j7rN0Ti9NCnGiQbhaZ11FpR+7ao1dNsmduNUg==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -4432,30 +5493,35 @@ }, "node_modules/dset": { "version": "3.1.3", + "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.3.tgz", + "integrity": "sha512-20TuZZHCEZ2O71q9/+8BwKwZ0QtD9D8ObhrihJPr+vLLYlSuAU3/zL4cSlgbfeoGHTjCSJBa7NGcrF9/Bx/WJQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/earcut": { "version": "2.2.4", - "license": "ISC" + "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", + "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ==" }, "node_modules/electron-to-chromium": { - "version": "1.4.668", - "dev": true, - "license": "ISC" + "version": "1.4.717", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz", + "integrity": "sha512-6Fmg8QkkumNOwuZ/5mIbMU9WI3H2fmn5ajcVya64I5Yr5CcNmO7vcLt0Y7c96DCiMO5/9G+4sI2r6eEvdg1F7A==", + "dev": true }, "node_modules/emoji-regex": { "version": "9.2.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", + "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", + "dev": true }, "node_modules/entities": { "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=0.12" }, @@ -4465,24 +5531,30 @@ }, "node_modules/error-ex": { "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", "dev": true, - "license": "MIT", "dependencies": { "is-arrayish": "^0.2.1" } }, "node_modules/es-abstract": { - "version": "1.22.4", + "version": "1.23.2", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.2.tgz", + "integrity": "sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==", "dev": true, - "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", "arraybuffer.prototype.slice": "^1.0.3", - "available-typed-arrays": "^1.0.6", + "available-typed-arrays": "^1.0.7", "call-bind": "^1.0.7", + "data-view-buffer": "^1.0.1", + "data-view-byte-length": "^1.0.1", + "data-view-byte-offset": "^1.0.0", "es-define-property": "^1.0.0", "es-errors": "^1.3.0", - "es-set-tostringtag": "^2.0.2", + "es-object-atoms": "^1.0.0", + "es-set-tostringtag": "^2.0.3", "es-to-primitive": "^1.2.1", "function.prototype.name": "^1.1.6", "get-intrinsic": "^1.2.4", @@ -4490,15 +5562,16 @@ "globalthis": "^1.0.3", "gopd": "^1.0.1", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.1", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", - "hasown": "^2.0.1", + "hasown": "^2.0.2", "internal-slot": "^1.0.7", "is-array-buffer": "^3.0.4", "is-callable": "^1.2.7", - "is-negative-zero": "^2.0.2", + "is-data-view": "^1.0.1", + "is-negative-zero": "^2.0.3", "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", + "is-shared-array-buffer": "^1.0.3", "is-string": "^1.0.7", "is-typed-array": "^1.1.13", "is-weakref": "^1.0.2", @@ -4506,34 +5579,30 @@ "object-keys": "^1.1.1", "object.assign": "^4.1.5", "regexp.prototype.flags": "^1.5.2", - "safe-array-concat": "^1.1.0", + "safe-array-concat": "^1.1.2", "safe-regex-test": "^1.0.3", - "string.prototype.trim": "^1.2.8", - "string.prototype.trimend": "^1.0.7", + "string.prototype.trim": "^1.2.9", + "string.prototype.trimend": "^1.0.8", "string.prototype.trimstart": "^1.0.7", - "typed-array-buffer": "^1.0.1", - "typed-array-byte-length": "^1.0.0", - "typed-array-byte-offset": "^1.0.0", - "typed-array-length": "^1.0.4", + "typed-array-buffer": "^1.0.2", + "typed-array-byte-length": "^1.0.1", + "typed-array-byte-offset": "^1.0.2", + "typed-array-length": "^1.0.5", "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.14" + "which-typed-array": "^1.1.15" }, "engines": { "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/es-array-method-boxes-properly": { - "version": "1.0.0", - "dev": true, - "license": "MIT" + } }, "node_modules/es-define-property": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", + "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", "dev": true, - "license": "MIT", "dependencies": { "get-intrinsic": "^1.2.4" }, @@ -4543,16 +5612,18 @@ }, "node_modules/es-errors": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/es-get-iterator": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", + "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.1.3", @@ -4569,38 +5640,51 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.0.17", + "version": "1.0.18", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz", + "integrity": "sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==", "dev": true, - "license": "MIT", "dependencies": { - "asynciterator.prototype": "^1.0.0", "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.4", + "es-abstract": "^1.23.0", "es-errors": "^1.3.0", - "es-set-tostringtag": "^2.0.2", + "es-set-tostringtag": "^2.0.3", "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", "globalthis": "^1.0.3", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.1", + "has-proto": "^1.0.3", "has-symbols": "^1.0.3", "internal-slot": "^1.0.7", "iterator.prototype": "^1.1.2", - "safe-array-concat": "^1.1.0" + "safe-array-concat": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", + "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/es-set-tostringtag": { - "version": "2.0.2", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", + "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", "dev": true, - "license": "MIT", "dependencies": { - "get-intrinsic": "^1.2.2", - "has-tostringtag": "^1.0.0", - "hasown": "^2.0.0" + "get-intrinsic": "^1.2.4", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.1" }, "engines": { "node": ">= 0.4" @@ -4608,16 +5692,18 @@ }, "node_modules/es-shim-unscopables": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.0.2.tgz", + "integrity": "sha512-J3yBRXCzDu4ULnQwxyToo/OjdMx6akgVC7K6few0a7F/0wLtmKKN7I73AH5T2836UuXRqN7Qg+IIUw/+YJksRw==", "dev": true, - "license": "MIT", "dependencies": { "hasown": "^2.0.0" } }, "node_modules/es-to-primitive": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", "dev": true, - "license": "MIT", "dependencies": { "is-callable": "^1.1.4", "is-date-object": "^1.0.1", @@ -4632,9 +5718,10 @@ }, "node_modules/esbuild": { "version": "0.20.2", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", + "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", "dev": true, "hasInstallScript": true, - "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -4669,16 +5756,18 @@ }, "node_modules/escalade": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/escape-string-regexp": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -4688,8 +5777,9 @@ }, "node_modules/eslint": { "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", "dev": true, - "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -4742,8 +5832,9 @@ }, "node_modules/eslint-config-prettier": { "version": "9.1.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz", + "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==", "dev": true, - "license": "MIT", "bin": { "eslint-config-prettier": "bin/cli.js" }, @@ -4753,8 +5844,9 @@ }, "node_modules/eslint-import-resolver-node": { "version": "0.3.9", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.9.tgz", + "integrity": "sha512-WFj2isz22JahUv+B788TlO3N6zL3nNJGU8CcZbPZvVEkBPaJdCV4vy5wyghty5ROFbCRnm132v8BScu5/1BQ8g==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^3.2.7", "is-core-module": "^2.13.0", @@ -4763,16 +5855,18 @@ }, "node_modules/eslint-import-resolver-node/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-module-utils": { - "version": "2.8.0", + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.8.1.tgz", + "integrity": "sha512-rXDXR3h7cs7dy9RNpUlQf80nX31XWJEyGq1tRMo+6GsO5VmTe4UTwtmonAD4ZkAsrfMVDA2wlGJ3790Ys+D49Q==", "dev": true, - "license": "MIT", "dependencies": { "debug": "^3.2.7" }, @@ -4787,16 +5881,18 @@ }, "node_modules/eslint-module-utils/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import": { "version": "2.29.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.29.1.tgz", + "integrity": "sha512-BbPC0cuExzhiMo4Ff1BTVwHpjjv28C5R+btTOGaCRC7UEz801up0JadwkeSk5Ued6TG34uaczuVuH6qyy5YUxw==", "dev": true, - "license": "MIT", "dependencies": { "array-includes": "^3.1.7", "array.prototype.findlastindex": "^1.2.3", @@ -4823,18 +5919,30 @@ "eslint": "^2 || ^3 || ^4 || ^5 || ^6 || ^7.2.0 || ^8" } }, + "node_modules/eslint-plugin-import/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint-plugin-import/node_modules/debug": { "version": "3.2.7", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", + "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, - "license": "MIT", "dependencies": { "ms": "^2.1.1" } }, "node_modules/eslint-plugin-import/node_modules/doctrine": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -4842,10 +5950,23 @@ "node": ">=0.10.0" } }, + "node_modules/eslint-plugin-import/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/eslint-plugin-jsx-a11y": { "version": "6.8.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz", + "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==", "dev": true, - "license": "MIT", "dependencies": { "@babel/runtime": "^7.23.2", "aria-query": "^5.3.0", @@ -4873,24 +5994,40 @@ }, "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, - "license": "Apache-2.0", "dependencies": { "dequal": "^2.0.3" } }, - "node_modules/eslint-plugin-jsx-a11y/node_modules/axe-core": { - "version": "4.7.0", + "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/eslint-plugin-jsx-a11y/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, - "license": "MPL-2.0", + "dependencies": { + "brace-expansion": "^1.1.7" + }, "engines": { - "node": ">=4" + "node": "*" } }, "node_modules/eslint-plugin-react": { "version": "7.34.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz", + "integrity": "sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw==", "dev": true, - "license": "MIT", "dependencies": { "array-includes": "^3.1.7", "array.prototype.findlast": "^1.2.4", @@ -4920,8 +6057,9 @@ }, "node_modules/eslint-plugin-react-hooks": { "version": "4.6.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", + "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -4931,16 +6069,28 @@ }, "node_modules/eslint-plugin-react-refresh": { "version": "0.4.6", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.6.tgz", + "integrity": "sha512-NjGXdm7zgcKRkKMua34qVO9doI7VOxZ6ancSvBELJSSoX97jyndXcSoa8XBh69JoB31dNz3EEzlMcizZl7LaMA==", "dev": true, - "license": "MIT", "peerDependencies": { "eslint": ">=7" } }, + "node_modules/eslint-plugin-react/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint-plugin-react/node_modules/doctrine": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", + "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, - "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -4948,10 +6098,23 @@ "node": ">=0.10.0" } }, + "node_modules/eslint-plugin-react/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/eslint-plugin-react/node_modules/resolve": { "version": "2.0.0-next.5", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", + "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, - "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -4966,8 +6129,9 @@ }, "node_modules/eslint-scope": { "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -4981,8 +6145,9 @@ }, "node_modules/eslint-visitor-keys": { "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "license": "Apache-2.0", "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -4990,10 +6155,21 @@ "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/eslint/node_modules/globals": { "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", "dev": true, - "license": "MIT", "dependencies": { "type-fest": "^0.20.2" }, @@ -5004,10 +6180,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/eslint/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/eslint/node_modules/type-fest": { "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -5017,8 +6206,9 @@ }, "node_modules/espree": { "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -5033,8 +6223,9 @@ }, "node_modules/esquery": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", + "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "estraverse": "^5.1.0" }, @@ -5044,8 +6235,9 @@ }, "node_modules/esrecurse": { "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" }, @@ -5055,32 +6247,36 @@ }, "node_modules/estraverse": { "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=4.0" } }, "node_modules/estree-walker": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", "dev": true, - "license": "MIT", "dependencies": { "@types/estree": "^1.0.0" } }, "node_modules/esutils": { "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/execa": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-8.0.1.tgz", + "integrity": "sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==", "dev": true, - "license": "MIT", "dependencies": { "cross-spawn": "^7.0.3", "get-stream": "^8.0.1", @@ -5101,8 +6297,9 @@ }, "node_modules/execa/node_modules/get-stream": { "version": "8.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-8.0.1.tgz", + "integrity": "sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==", "dev": true, - "license": "MIT", "engines": { "node": ">=16" }, @@ -5112,8 +6309,9 @@ }, "node_modules/execa/node_modules/mimic-fn": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-4.0.0.tgz", + "integrity": "sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -5123,8 +6321,9 @@ }, "node_modules/execa/node_modules/onetime": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-6.0.0.tgz", + "integrity": "sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==", "dev": true, - "license": "MIT", "dependencies": { "mimic-fn": "^4.0.0" }, @@ -5137,8 +6336,9 @@ }, "node_modules/execa/node_modules/signal-exit": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", + "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "dev": true, - "license": "ISC", "engines": { "node": ">=14" }, @@ -5148,7 +6348,8 @@ }, "node_modules/extend-shallow": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==", "dependencies": { "is-extendable": "^0.1.0" }, @@ -5158,8 +6359,9 @@ }, "node_modules/external-editor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", + "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", "dev": true, - "license": "MIT", "dependencies": { "chardet": "^0.7.0", "iconv-lite": "^0.4.24", @@ -5171,8 +6373,9 @@ }, "node_modules/extract-files": { "version": "11.0.0", + "resolved": "https://registry.npmjs.org/extract-files/-/extract-files-11.0.0.tgz", + "integrity": "sha512-FuoE1qtbJ4bBVvv94CC7s0oTnKUGvQs+Rjf1L2SJFfS+HTVVjhPFtehPdQ0JiGPqVNfSSZvL5yzHHQq2Z4WNhQ==", "dev": true, - "license": "MIT", "engines": { "node": "^12.20 || >= 14.13" }, @@ -5182,18 +6385,21 @@ }, "node_modules/fast-decode-uri-component": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-decode-uri-component/-/fast-decode-uri-component-1.0.1.tgz", + "integrity": "sha512-WKgKWg5eUxvRZGwW8FvfbaH7AXSh2cL+3j5fMGzUMCxWBJ3dV3a7Wz8y2f/uQ0e3B6WmodD3oS54jTQ9HVTIIg==", + "dev": true }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true }, "node_modules/fast-glob": { "version": "3.3.2", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz", + "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==", "dev": true, - "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", "@nodelib/fs.walk": "^1.2.3", @@ -5207,8 +6413,9 @@ }, "node_modules/fast-glob/node_modules/glob-parent": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.1" }, @@ -5218,50 +6425,57 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true }, "node_modules/fast-levenshtein": { "version": "2.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true }, "node_modules/fast-querystring": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/fast-querystring/-/fast-querystring-1.1.2.tgz", + "integrity": "sha512-g6KuKWmFXc0fID8WWH0jit4g0AGBoJhCkJMb1RmbsSEUNvQ+ZC8D6CUZ+GtF8nMzSPXnhiePyyqqipzNNEnHjg==", "dev": true, - "license": "MIT", "dependencies": { "fast-decode-uri-component": "^1.0.1" } }, "node_modules/fast-url-parser": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/fast-url-parser/-/fast-url-parser-1.1.3.tgz", + "integrity": "sha512-5jOCVXADYNuRkKFzNJ0dCCewsZiYo0dz8QNYljkOpFC6r2U4OBmKtvm/Tsuh4w1YYdDqDb31a8TVhBJ2OJKdqQ==", "dev": true, - "license": "MIT", "dependencies": { "punycode": "^1.3.2" } }, "node_modules/fastq": { "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", "dev": true, - "license": "ISC", "dependencies": { "reusify": "^1.0.4" } }, "node_modules/fb-watchman": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz", + "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "bser": "2.1.1" } }, "node_modules/fbjs": { "version": "3.0.5", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz", + "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==", "dev": true, - "license": "MIT", "dependencies": { "cross-fetch": "^3.1.5", "fbjs-css-vars": "^1.0.0", @@ -5274,13 +6488,15 @@ }, "node_modules/fbjs-css-vars": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", + "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==", + "dev": true }, "node_modules/figures": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", "dev": true, - "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -5293,16 +6509,18 @@ }, "node_modules/figures/node_modules/escape-string-regexp": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.0" } }, "node_modules/file-entry-cache": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, - "license": "MIT", "dependencies": { "flat-cache": "^3.0.4" }, @@ -5312,8 +6530,9 @@ }, "node_modules/fill-range": { "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", "dev": true, - "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" }, @@ -5323,8 +6542,9 @@ }, "node_modules/find-up": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, - "license": "MIT", "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -5338,8 +6558,9 @@ }, "node_modules/flat-cache": { "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, - "license": "MIT", "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -5350,22 +6571,25 @@ } }, "node_modules/flatted": { - "version": "3.2.9", - "dev": true, - "license": "ISC" + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true }, "node_modules/for-each": { "version": "0.3.3", + "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz", + "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==", "dev": true, - "license": "MIT", "dependencies": { "is-callable": "^1.1.3" } }, "node_modules/form-data": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", "dev": true, - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -5377,13 +6601,16 @@ }, "node_modules/fs.realpath": { "version": "1.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true }, "node_modules/fsevents": { "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, - "license": "MIT", + "hasInstallScript": true, "optional": true, "os": [ "darwin" @@ -5394,16 +6621,18 @@ }, "node_modules/function-bind": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/function.prototype.name": { "version": "1.1.6", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", + "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -5419,44 +6648,50 @@ }, "node_modules/functions-have-names": { "version": "1.2.3", + "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/gensync": { "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/geojson-vt": { "version": "3.2.1", - "license": "ISC" + "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz", + "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg==" }, "node_modules/get-caller-file": { "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "dev": true, - "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } }, "node_modules/get-func-name": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz", + "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==", "dev": true, - "license": "MIT", "engines": { "node": "*" } }, "node_modules/get-intrinsic": { "version": "1.2.4", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", + "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", "dev": true, - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2", @@ -5473,7 +6708,8 @@ }, "node_modules/get-stream": { "version": "6.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "engines": { "node": ">=10" }, @@ -5483,8 +6719,9 @@ }, "node_modules/get-symbol-description": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", + "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "es-errors": "^1.3.0", @@ -5499,19 +6736,22 @@ }, "node_modules/get-value": { "version": "2.0.6", - "license": "MIT", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==", "engines": { "node": ">=0.10.0" } }, "node_modules/gl-matrix": { "version": "3.4.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/gl-matrix/-/gl-matrix-3.4.3.tgz", + "integrity": "sha512-wcCp8vu8FT22BnvKVPjXa/ICBWRq/zjFfdofZy1WSpQZpphblv12/bOQLBC1rMM7SGOFS9ltVmKOHil5+Ml7gA==" }, "node_modules/glob": { "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", "dev": true, - "license": "ISC", "dependencies": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", @@ -5529,8 +6769,9 @@ }, "node_modules/glob-parent": { "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, - "license": "ISC", "dependencies": { "is-glob": "^4.0.3" }, @@ -5538,9 +6779,32 @@ "node": ">=10.13.0" } }, + "node_modules/glob/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/glob/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/global-prefix": { "version": "3.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz", + "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==", "dependencies": { "ini": "^1.3.5", "kind-of": "^6.0.2", @@ -5552,7 +6816,8 @@ }, "node_modules/global-prefix/node_modules/which": { "version": "1.3.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", + "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dependencies": { "isexe": "^2.0.0" }, @@ -5562,16 +6827,18 @@ }, "node_modules/globals": { "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/globalthis": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz", + "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==", "dev": true, - "license": "MIT", "dependencies": { "define-properties": "^1.1.3" }, @@ -5584,8 +6851,9 @@ }, "node_modules/globby": { "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", "dev": true, - "license": "MIT", "dependencies": { "array-union": "^2.1.0", "dir-glob": "^3.0.1", @@ -5603,8 +6871,9 @@ }, "node_modules/gopd": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", + "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", "dev": true, - "license": "MIT", "dependencies": { "get-intrinsic": "^1.1.3" }, @@ -5614,20 +6883,23 @@ }, "node_modules/graphemer": { "version": "1.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true }, "node_modules/graphql": { "version": "16.8.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz", + "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } }, "node_modules/graphql-config": { "version": "5.0.3", + "resolved": "https://registry.npmjs.org/graphql-config/-/graphql-config-5.0.3.tgz", + "integrity": "sha512-BNGZaoxIBkv9yy6Y7omvsaBUHOzfFcII3UN++tpH8MGOKFPFkCPZuwx09ggANMt8FgyWP1Od8SWPmrUEZca4NQ==", "dev": true, - "license": "MIT", "dependencies": { "@graphql-tools/graphql-file-loader": "^8.0.0", "@graphql-tools/json-file-loader": "^8.0.0", @@ -5654,10 +6926,21 @@ } } }, + "node_modules/graphql-config/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, "node_modules/graphql-config/node_modules/minimatch": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.3.tgz", + "integrity": "sha512-lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -5667,7 +6950,8 @@ }, "node_modules/graphql-request": { "version": "6.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-6.1.0.tgz", + "integrity": "sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==", "dependencies": { "@graphql-typed-document-node/core": "^3.2.0", "cross-fetch": "^3.1.5" @@ -5678,8 +6962,9 @@ }, "node_modules/graphql-tag": { "version": "2.12.6", + "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz", + "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.1.0" }, @@ -5692,8 +6977,9 @@ }, "node_modules/graphql-ws": { "version": "5.15.0", + "resolved": "https://registry.npmjs.org/graphql-ws/-/graphql-ws-5.15.0.tgz", + "integrity": "sha512-xWGAtm3fig9TIhSaNsg0FaDZ8Pyn/3re3RFlP4rhQcmjRDIPpk1EhRuNB+YSJtLzttyuToaDiNhwT1OMoGnJnw==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -5703,24 +6989,27 @@ }, "node_modules/has-bigints": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", + "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/has-flag": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/has-property-descriptors": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", + "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, - "license": "MIT", "dependencies": { "es-define-property": "^1.0.0" }, @@ -5729,9 +7018,10 @@ } }, "node_modules/has-proto": { - "version": "1.0.1", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", + "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5741,8 +7031,9 @@ }, "node_modules/has-symbols": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -5752,8 +7043,9 @@ }, "node_modules/has-tostringtag": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, - "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -5765,9 +7057,10 @@ } }, "node_modules/hasown": { - "version": "2.0.1", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "dev": true, - "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -5777,8 +7070,9 @@ }, "node_modules/header-case": { "version": "2.0.4", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", + "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", "dev": true, - "license": "MIT", "dependencies": { "capital-case": "^1.0.4", "tslib": "^2.0.3" @@ -5786,8 +7080,9 @@ }, "node_modules/html-encoding-sniffer": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz", + "integrity": "sha512-Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==", "dev": true, - "license": "MIT", "dependencies": { "whatwg-encoding": "^3.1.1" }, @@ -5797,13 +7092,15 @@ }, "node_modules/html-escaper": { "version": "2.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", + "dev": true }, "node_modules/http-proxy-agent": { - "version": "7.0.1", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", + "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "dev": true, - "license": "MIT", "dependencies": { "agent-base": "^7.1.0", "debug": "^4.3.4" @@ -5813,9 +7110,10 @@ } }, "node_modules/https-proxy-agent": { - "version": "7.0.3", + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz", + "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==", "dev": true, - "license": "MIT", "dependencies": { "agent-base": "^7.0.2", "debug": "4" @@ -5826,16 +7124,18 @@ }, "node_modules/human-signals": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-5.0.0.tgz", + "integrity": "sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=16.17.0" } }, "node_modules/iconv-lite": { "version": "0.4.24", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", + "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "dev": true, - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" }, @@ -5845,6 +7145,8 @@ }, "node_modules/ieee754": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "funding": [ { "type": "github", @@ -5858,29 +7160,31 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "BSD-3-Clause" + ] }, "node_modules/ignore": { "version": "5.3.1", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.1.tgz", + "integrity": "sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4" } }, "node_modules/immutable": { "version": "3.7.6", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", + "integrity": "sha512-AizQPcaofEtO11RZhPPHBOJRdo/20MKQF9mBLnVkBoyHi1/zXK8fzVdnEpSV9gxqtnh6Qomfp3F0xT5qP/vThw==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.8.0" } }, "node_modules/import-fresh": { "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", "dev": true, - "license": "MIT", "dependencies": { "parent-module": "^1.0.0", "resolve-from": "^4.0.0" @@ -5894,16 +7198,18 @@ }, "node_modules/import-fresh/node_modules/resolve-from": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/import-from": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz", + "integrity": "sha512-P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=12.2" }, @@ -5913,24 +7219,27 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.8.19" } }, "node_modules/indent-string": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", + "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/inflight": { "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", "dev": true, - "license": "ISC", "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -5938,17 +7247,20 @@ }, "node_modules/inherits": { "version": "2.0.4", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true }, "node_modules/ini": { "version": "1.3.8", - "license": "ISC" + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", + "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==" }, "node_modules/inquirer": { "version": "8.2.6", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.6.tgz", + "integrity": "sha512-M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==", "dev": true, - "license": "MIT", "dependencies": { "ansi-escapes": "^4.2.1", "chalk": "^4.1.1", @@ -5972,8 +7284,9 @@ }, "node_modules/internal-slot": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", + "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", "dev": true, - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "hasown": "^2.0.0", @@ -5985,15 +7298,17 @@ }, "node_modules/invariant": { "version": "2.2.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", "dependencies": { "loose-envify": "^1.0.0" } }, "node_modules/is-absolute": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-absolute/-/is-absolute-1.0.0.tgz", + "integrity": "sha512-dOWoqflvcydARa360Gvv18DZ/gRuHKi2NU/wU5X1ZFzdYfH29nkiNZsF3mp4OJ3H4yo9Mx8A/uAGNzpzPN3yBA==", "dev": true, - "license": "MIT", "dependencies": { "is-relative": "^1.0.0", "is-windows": "^1.0.1" @@ -6004,8 +7319,9 @@ }, "node_modules/is-arguments": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", + "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -6019,8 +7335,9 @@ }, "node_modules/is-array-buffer": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", + "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "get-intrinsic": "^1.2.1" @@ -6034,13 +7351,15 @@ }, "node_modules/is-arrayish": { "version": "0.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", + "dev": true }, "node_modules/is-async-function": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", + "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6053,8 +7372,9 @@ }, "node_modules/is-bigint": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", + "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", "dev": true, - "license": "MIT", "dependencies": { "has-bigints": "^1.0.1" }, @@ -6064,8 +7384,9 @@ }, "node_modules/is-boolean-object": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", + "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -6079,8 +7400,9 @@ }, "node_modules/is-callable": { "version": "1.2.7", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", + "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6090,8 +7412,9 @@ }, "node_modules/is-core-module": { "version": "2.13.1", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz", + "integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==", "dev": true, - "license": "MIT", "dependencies": { "hasown": "^2.0.0" }, @@ -6099,10 +7422,26 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-data-view": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", + "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "dev": true, + "dependencies": { + "is-typed-array": "^1.1.13" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-date-object": { "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", + "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6115,23 +7454,26 @@ }, "node_modules/is-extendable": { "version": "0.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==", "engines": { "node": ">=0.10.0" } }, "node_modules/is-extglob": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/is-finalizationregistry": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", + "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6141,16 +7483,18 @@ }, "node_modules/is-fullwidth-code-point": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-generator-function": { "version": "1.0.10", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", + "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6163,8 +7507,9 @@ }, "node_modules/is-glob": { "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "dev": true, - "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" }, @@ -6174,32 +7519,39 @@ }, "node_modules/is-interactive": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-lower-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-lower-case/-/is-lower-case-2.0.2.tgz", + "integrity": "sha512-bVcMJy4X5Og6VZfdOZstSexlEy20Sr0k/p/b2IlQJlfdKAQuMpiv5w2Ccxb8sKdRUNAG1PnHVHjFSdRDVS6NlQ==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/is-map": { - "version": "2.0.2", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", + "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", "dev": true, - "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-negative-zero": { - "version": "2.0.2", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", + "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -6209,16 +7561,18 @@ }, "node_modules/is-number": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/is-number-object": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", + "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6231,15 +7585,17 @@ }, "node_modules/is-path-inside": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/is-plain-object": { "version": "2.0.4", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", "dependencies": { "isobject": "^3.0.1" }, @@ -6249,13 +7605,15 @@ }, "node_modules/is-potential-custom-element-name": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true }, "node_modules/is-regex": { "version": "1.1.4", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", + "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -6269,8 +7627,9 @@ }, "node_modules/is-relative": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz", + "integrity": "sha512-Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==", "dev": true, - "license": "MIT", "dependencies": { "is-unc-path": "^1.0.0" }, @@ -6279,19 +7638,27 @@ } }, "node_modules/is-set": { - "version": "2.0.2", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", + "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", "dev": true, - "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-shared-array-buffer": { - "version": "1.0.2", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", + "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2" + "call-bind": "^1.0.7" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6299,8 +7666,9 @@ }, "node_modules/is-stream": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", + "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, - "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" }, @@ -6310,8 +7678,9 @@ }, "node_modules/is-string": { "version": "1.0.7", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", + "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", "dev": true, - "license": "MIT", "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -6324,8 +7693,9 @@ }, "node_modules/is-symbol": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", + "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", "dev": true, - "license": "MIT", "dependencies": { "has-symbols": "^1.0.2" }, @@ -6338,8 +7708,9 @@ }, "node_modules/is-typed-array": { "version": "1.1.13", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", + "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", "dev": true, - "license": "MIT", "dependencies": { "which-typed-array": "^1.1.14" }, @@ -6352,8 +7723,9 @@ }, "node_modules/is-unc-path": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-unc-path/-/is-unc-path-1.0.0.tgz", + "integrity": "sha512-mrGpVd0fs7WWLfVsStvgF6iEJnbjDFZh9/emhRDcGWTduTfNHd9CHeUwH3gYIjdbwo4On6hunkztwOaAw0yllQ==", "dev": true, - "license": "MIT", "dependencies": { "unc-path-regex": "^0.1.2" }, @@ -6363,8 +7735,9 @@ }, "node_modules/is-unicode-supported": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -6374,24 +7747,30 @@ }, "node_modules/is-upper-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-upper-case/-/is-upper-case-2.0.2.tgz", + "integrity": "sha512-44pxmxAvnnAOwBg4tHPnkfvgjPwbc5QIsSstNU+YcJ1ovxVzCWpSGosPJOZh/a1tdl81fbgnLc9LLv+x2ywbPQ==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/is-weakmap": { - "version": "2.0.1", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", + "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", "dev": true, - "license": "MIT", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-weakref": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", + "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2" }, @@ -6400,12 +7779,16 @@ } }, "node_modules/is-weakset": { - "version": "2.0.2", + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", + "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.1" + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -6413,48 +7796,55 @@ }, "node_modules/is-windows": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/isarray": { "version": "2.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", + "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", + "dev": true }, "node_modules/isexe": { "version": "2.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" }, "node_modules/isobject": { "version": "3.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", "engines": { "node": ">=0.10.0" } }, "node_modules/isomorphic-ws": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/isomorphic-ws/-/isomorphic-ws-5.0.0.tgz", + "integrity": "sha512-muId7Zzn9ywDsyXgTIafTry2sV3nySZeUDe6YedVd1Hvuuep5AsIlqK+XefWpYTyJG5e503F2xIuT2lcU6rCSw==", "dev": true, - "license": "MIT", "peerDependencies": { "ws": "*" } }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", + "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=8" } }, "node_modules/istanbul-lib-report": { "version": "3.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", + "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "istanbul-lib-coverage": "^3.0.0", "make-dir": "^4.0.0", @@ -6466,8 +7856,9 @@ }, "node_modules/istanbul-lib-source-maps": { "version": "5.0.4", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.4.tgz", + "integrity": "sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "@jridgewell/trace-mapping": "^0.3.23", "debug": "^4.1.1", @@ -6478,9 +7869,10 @@ } }, "node_modules/istanbul-reports": { - "version": "3.1.6", + "version": "3.1.7", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz", + "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "html-escaper": "^2.0.0", "istanbul-lib-report": "^3.0.0" @@ -6491,8 +7883,9 @@ }, "node_modules/iterator.prototype": { "version": "1.1.2", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.2.tgz", + "integrity": "sha512-DR33HMMr8EzwuRL8Y9D3u2BMj8+RqSE850jfGu59kS7tbmPLzGkZmVSfyCFSDxuZiEY6Rzt3T2NA/qU+NwVj1w==", "dev": true, - "license": "MIT", "dependencies": { "define-properties": "^1.2.1", "get-intrinsic": "^1.2.1", @@ -6503,28 +7896,32 @@ }, "node_modules/jiti": { "version": "1.21.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz", + "integrity": "sha512-gFqAIbuKyyso/3G2qhiO2OM6shY6EPP/R0+mkDbyspxKazh8BXDC5FiFsUjlczgdNz/vfra0da2y+aHrusLG/Q==", "dev": true, - "license": "MIT", "bin": { "jiti": "bin/jiti.js" } }, "node_modules/jose": { - "version": "5.2.2", + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/jose/-/jose-5.2.3.tgz", + "integrity": "sha512-KUXdbctm1uHVL8BYhnyHkgp3zDX5KW8ZhAKVFEfUbU2P8Alpzjb+48hHvjOdQIyPshoblhzsuqOwEEAbtHVirA==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/panva" } }, "node_modules/js-tokens": { "version": "4.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" }, "node_modules/js-yaml": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -6534,8 +7931,9 @@ }, "node_modules/jsdom": { "version": "24.0.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz", + "integrity": "sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==", "dev": true, - "license": "MIT", "dependencies": { "cssstyle": "^4.0.1", "data-urls": "^5.0.0", @@ -6573,8 +7971,9 @@ }, "node_modules/jsesc": { "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", "dev": true, - "license": "MIT", "bin": { "jsesc": "bin/jsesc" }, @@ -6584,23 +7983,27 @@ }, "node_modules/json-buffer": { "version": "3.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true }, "node_modules/json-stable-stringify": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.1.tgz", + "integrity": "sha512-SU/971Kt5qVQfJpyDveVhQ/vya+5hvrjClFOcr8c0Fq5aODJjMwutrOfCU+eCnVD5gpx1Q3fEqkyom77zH1iIg==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "isarray": "^2.0.5", @@ -6616,17 +8019,20 @@ }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true }, "node_modules/json-stringify-pretty-compact": { - "version": "3.0.0", - "license": "MIT" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz", + "integrity": "sha512-3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==" }, "node_modules/json-to-pretty-yaml": { "version": "1.2.2", + "resolved": "https://registry.npmjs.org/json-to-pretty-yaml/-/json-to-pretty-yaml-1.2.2.tgz", + "integrity": "sha512-rvm6hunfCcqegwYaG5T4yKJWxc9FXFgBVrcTZ4XfSVRwa5HA/Xs+vB/Eo9treYYHCeNM0nrSUr82V/M31Urc7A==", "dev": true, - "license": "Apache-2.0", "dependencies": { "remedial": "^1.0.7", "remove-trailing-spaces": "^1.0.6" @@ -6637,8 +8043,9 @@ }, "node_modules/json5": { "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, - "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -6648,21 +8055,24 @@ }, "node_modules/jsonc-parser": { "version": "3.2.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz", + "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==", + "dev": true }, "node_modules/jsonify": { "version": "0.0.1", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz", + "integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==", "dev": true, - "license": "Public Domain", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/jsx-ast-utils": { "version": "3.3.5", + "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz", + "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==", "dev": true, - "license": "MIT", "dependencies": { "array-includes": "^3.1.6", "array.prototype.flat": "^1.3.1", @@ -6675,32 +8085,37 @@ }, "node_modules/kdbush": { "version": "4.0.2", - "license": "ISC" + "resolved": "https://registry.npmjs.org/kdbush/-/kdbush-4.0.2.tgz", + "integrity": "sha512-WbCVYJ27Sz8zi9Q7Q0xHC+05iwkm3Znipc2XTlrnJbsHMYktW4hPhXUE8Ys1engBrvffoSCqbil1JQAa7clRpA==" }, "node_modules/keyv": { "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, - "license": "MIT", "dependencies": { "json-buffer": "3.0.1" } }, "node_modules/kind-of": { "version": "6.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", "engines": { "node": ">=0.10.0" } }, "node_modules/language-subtag-registry": { "version": "0.3.22", - "dev": true, - "license": "CC0-1.0" + "resolved": "https://registry.npmjs.org/language-subtag-registry/-/language-subtag-registry-0.3.22.tgz", + "integrity": "sha512-tN0MCzyWnoz/4nHS6uxdlFWoUZT7ABptwKPQ52Ea7URk6vll88bWBVhodtnlfEuCcKWNGoc+uGbw1cwa9IKh/w==", + "dev": true }, "node_modules/language-tags": { "version": "1.0.9", + "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.9.tgz", + "integrity": "sha512-MbjN408fEndfiQXbFQ1vnd+1NoLDsnQW41410oQBXiyXDMYH5z505juWa4KUE1LqxRC7DgOgZDbKLxHIwm27hA==", "dev": true, - "license": "MIT", "dependencies": { "language-subtag-registry": "^0.3.20" }, @@ -6710,8 +8125,9 @@ }, "node_modules/levn": { "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -6722,13 +8138,15 @@ }, "node_modules/lines-and-columns": { "version": "1.2.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", + "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", + "dev": true }, "node_modules/listr2": { "version": "4.0.5", + "resolved": "https://registry.npmjs.org/listr2/-/listr2-4.0.5.tgz", + "integrity": "sha512-juGHV1doQdpNT3GSTs9IUN43QJb7KHdF9uqg7Vufs/tG9VTzpFphqF4pm/ICdAABGQxsyNn9CiYA3StkI6jpwA==", "dev": true, - "license": "MIT", "dependencies": { "cli-truncate": "^2.1.0", "colorette": "^2.0.16", @@ -6753,8 +8171,9 @@ }, "node_modules/listr2/node_modules/wrap-ansi": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -6769,8 +8188,9 @@ }, "node_modules/local-pkg": { "version": "0.5.0", + "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz", + "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==", "dev": true, - "license": "MIT", "dependencies": { "mlly": "^1.4.2", "pkg-types": "^1.0.3" @@ -6784,8 +8204,9 @@ }, "node_modules/locate-path": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, - "license": "MIT", "dependencies": { "p-locate": "^5.0.0" }, @@ -6798,23 +8219,27 @@ }, "node_modules/lodash": { "version": "4.17.21", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true }, "node_modules/lodash.merge": { "version": "4.6.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true }, "node_modules/lodash.sortby": { "version": "4.7.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==", + "dev": true }, "node_modules/log-symbols": { "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, - "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -6828,8 +8253,9 @@ }, "node_modules/log-update": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz", + "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==", "dev": true, - "license": "MIT", "dependencies": { "ansi-escapes": "^4.3.0", "cli-cursor": "^3.1.0", @@ -6845,8 +8271,9 @@ }, "node_modules/log-update/node_modules/slice-ansi": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -6861,7 +8288,8 @@ }, "node_modules/loose-envify": { "version": "1.4.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", "dependencies": { "js-tokens": "^3.0.0 || ^4.0.0" }, @@ -6871,48 +8299,54 @@ }, "node_modules/loupe": { "version": "2.3.7", + "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz", + "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==", "dev": true, - "license": "MIT", "dependencies": { "get-func-name": "^2.0.1" } }, "node_modules/lower-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/lower-case-first": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case-first/-/lower-case-first-2.0.2.tgz", + "integrity": "sha512-EVm/rR94FJTZi3zefZ82fLWab+GX14LJN4HrWBcuo6Evmsl9hEfnqxgcHCKb9q+mNf6EVdsjx/qucYFIIB84pg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/lru-cache": { "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^3.0.2" } }, "node_modules/lz-string": { "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "dev": true, - "license": "MIT", "bin": { "lz-string": "bin/bin.js" } }, "node_modules/magic-string": { - "version": "0.30.7", + "version": "0.30.8", + "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz", + "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==", "dev": true, - "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15" }, @@ -6922,8 +8356,9 @@ }, "node_modules/magicast": { "version": "0.3.3", + "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.3.tgz", + "integrity": "sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==", "dev": true, - "license": "MIT", "dependencies": { "@babel/parser": "^7.23.6", "@babel/types": "^7.23.6", @@ -6932,8 +8367,9 @@ }, "node_modules/make-dir": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", + "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, - "license": "MIT", "dependencies": { "semver": "^7.5.3" }, @@ -6946,8 +8382,9 @@ }, "node_modules/make-dir/node_modules/lru-cache": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", "dev": true, - "license": "ISC", "dependencies": { "yallist": "^4.0.0" }, @@ -6957,8 +8394,9 @@ }, "node_modules/make-dir/node_modules/semver": { "version": "7.6.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", + "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", "dev": true, - "license": "ISC", "dependencies": { "lru-cache": "^6.0.0" }, @@ -6971,20 +8409,23 @@ }, "node_modules/make-dir/node_modules/yallist": { "version": "4.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true }, "node_modules/map-cache": { "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/maplibre-gl": { "version": "4.1.1", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.1.tgz", + "integrity": "sha512-DmHru9FTHCOngNHzIx9W2+MlUziYPfPxd2qjyeWwczBYNx2SDpmH394MkuCvSgnfUm5Zvs4NaYCqMu44jUga1Q==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -7021,44 +8462,26 @@ "url": "https://github.com/maplibre/maplibre-gl-js?sponsor=1" } }, - "node_modules/maplibre-gl/node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "20.1.1", - "license": "ISC", - "dependencies": { - "@mapbox/jsonlint-lines-primitives": "~2.0.2", - "@mapbox/unitbezier": "^0.0.1", - "json-stringify-pretty-compact": "^4.0.0", - "minimist": "^1.2.8", - "rw": "^1.3.3", - "sort-object": "^3.0.3" - }, - "bin": { - "gl-style-format": "dist/gl-style-format.mjs", - "gl-style-migrate": "dist/gl-style-migrate.mjs", - "gl-style-validate": "dist/gl-style-validate.mjs" - } - }, - "node_modules/maplibre-gl/node_modules/json-stringify-pretty-compact": { - "version": "4.0.0", - "license": "MIT" - }, "node_modules/merge-stream": { "version": "2.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true }, "node_modules/merge2": { "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/meros": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/meros/-/meros-1.3.0.tgz", + "integrity": "sha512-2BNGOimxEz5hmjUG2FwoxCt5HN7BXdaWyFqEwxPTrJzVdABtrL4TiHTcsWSFAxPQ/tOnEaQEJh3qWq71QRMY+w==", "dev": true, - "license": "MIT", "engines": { "node": ">=13" }, @@ -7073,8 +8496,9 @@ }, "node_modules/micromatch": { "version": "4.0.5", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz", + "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==", "dev": true, - "license": "MIT", "dependencies": { "braces": "^3.0.2", "picomatch": "^2.3.1" @@ -7085,16 +8509,18 @@ }, "node_modules/mime-db": { "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/mime-types": { "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "dev": true, - "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -7104,34 +8530,41 @@ }, "node_modules/mimic-fn": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/minimatch": { - "version": "3.1.2", + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", "dev": true, - "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.1" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/minimist": { "version": "1.2.8", - "license": "MIT", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/mlly": { - "version": "1.5.0", + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz", + "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==", "dev": true, - "license": "MIT", "dependencies": { "acorn": "^8.11.3", "pathe": "^1.1.2", @@ -7141,20 +8574,25 @@ }, "node_modules/ms": { "version": "2.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true }, "node_modules/murmurhash-js": { "version": "1.0.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/murmurhash-js/-/murmurhash-js-1.0.0.tgz", + "integrity": "sha512-TvmkNhkv8yct0SVBSy+o8wYzXjE4Zz3PCesbfs8HiCXXdcTuocApFv11UWlNFWKYsP2okqrhb7JNlSm9InBhIw==" }, "node_modules/mute-stream": { "version": "0.0.8", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", + "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", + "dev": true }, "node_modules/nanoid": { "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", "dev": true, "funding": [ { @@ -7162,7 +8600,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -7172,13 +8609,15 @@ }, "node_modules/natural-compare": { "version": "1.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true }, "node_modules/no-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", "dev": true, - "license": "MIT", "dependencies": { "lower-case": "^2.0.2", "tslib": "^2.0.3" @@ -7186,15 +8625,17 @@ }, "node_modules/node-addon-api": { "version": "7.1.0", + "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz", + "integrity": "sha512-mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==", "dev": true, - "license": "MIT", "engines": { "node": "^16 || ^18 || >= 20" } }, "node_modules/node-fetch": { "version": "2.7.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dependencies": { "whatwg-url": "^5.0.0" }, @@ -7212,15 +8653,18 @@ }, "node_modules/node-fetch/node_modules/tr46": { "version": "0.0.3", - "license": "MIT" + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" }, "node_modules/node-fetch/node_modules/webidl-conversions": { "version": "3.0.1", - "license": "BSD-2-Clause" + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" }, "node_modules/node-fetch/node_modules/whatwg-url": { "version": "5.0.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -7228,18 +8672,21 @@ }, "node_modules/node-int64": { "version": "0.4.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==", + "dev": true }, "node_modules/node-releases": { "version": "2.0.14", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz", + "integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==", + "dev": true }, "node_modules/normalize-path": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==", "dev": true, - "license": "MIT", "dependencies": { "remove-trailing-separator": "^1.0.1" }, @@ -7248,9 +8695,10 @@ } }, "node_modules/npm-run-path": { - "version": "5.2.0", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-5.3.0.tgz", + "integrity": "sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==", "dev": true, - "license": "MIT", "dependencies": { "path-key": "^4.0.0" }, @@ -7263,8 +8711,9 @@ }, "node_modules/npm-run-path/node_modules/path-key": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", + "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -7274,36 +8723,41 @@ }, "node_modules/nullthrows": { "version": "1.1.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz", + "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw==", + "dev": true }, "node_modules/nwsapi": { "version": "2.2.7", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", + "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", + "dev": true }, "node_modules/object-assign": { "version": "4.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "engines": { "node": ">=0.10.0" } }, "node_modules/object-inspect": { "version": "1.13.1", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", + "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object-is": { - "version": "1.1.5", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", + "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.1.3" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -7314,16 +8768,18 @@ }, "node_modules/object-keys": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" } }, "node_modules/object.assign": { "version": "4.1.5", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", + "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.5", "define-properties": "^1.2.1", @@ -7338,26 +8794,29 @@ } }, "node_modules/object.entries": { - "version": "1.1.7", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz", + "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" } }, "node_modules/object.fromentries": { - "version": "2.0.7", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz", + "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -7367,37 +8826,45 @@ } }, "node_modules/object.groupby": { - "version": "1.0.2", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/object.groupby/-/object.groupby-1.0.3.tgz", + "integrity": "sha512-+Lhy3TQTuzXI5hevh8sBGqbmurHbbIjAi0Z4S63nthVLmLxfbj4T54a4CfZrXIrt9iP4mVAPYMo/v99taj3wjQ==", "dev": true, - "license": "MIT", "dependencies": { - "array.prototype.filter": "^1.0.3", - "call-bind": "^1.0.5", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.0.0" + "es-abstract": "^1.23.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/object.hasown": { - "version": "1.1.3", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz", + "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==", "dev": true, - "license": "MIT", "dependencies": { - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/object.values": { - "version": "1.1.7", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", + "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -7408,16 +8875,18 @@ }, "node_modules/once": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, - "license": "ISC", "dependencies": { "wrappy": "1" } }, "node_modules/onetime": { "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", "dev": true, - "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -7430,8 +8899,9 @@ }, "node_modules/optionator": { "version": "0.9.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", + "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, - "license": "MIT", "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -7446,8 +8916,9 @@ }, "node_modules/ora": { "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", "dev": true, - "license": "MIT", "dependencies": { "bl": "^4.1.0", "chalk": "^4.1.0", @@ -7468,16 +8939,18 @@ }, "node_modules/os-tmpdir": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/p-limit": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, - "license": "MIT", "dependencies": { "yocto-queue": "^0.1.0" }, @@ -7490,8 +8963,9 @@ }, "node_modules/p-locate": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, - "license": "MIT", "dependencies": { "p-limit": "^3.0.2" }, @@ -7504,8 +8978,9 @@ }, "node_modules/p-map": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, - "license": "MIT", "dependencies": { "aggregate-error": "^3.0.0" }, @@ -7518,16 +8993,18 @@ }, "node_modules/p-try": { "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/param-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", "dev": true, - "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -7535,8 +9012,9 @@ }, "node_modules/parent-module": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, - "license": "MIT", "dependencies": { "callsites": "^3.0.0" }, @@ -7546,8 +9024,9 @@ }, "node_modules/parse-filepath": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/parse-filepath/-/parse-filepath-1.0.2.tgz", + "integrity": "sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==", "dev": true, - "license": "MIT", "dependencies": { "is-absolute": "^1.0.0", "map-cache": "^0.2.0", @@ -7559,8 +9038,9 @@ }, "node_modules/parse-json": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", + "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, - "license": "MIT", "dependencies": { "@babel/code-frame": "^7.0.0", "error-ex": "^1.3.1", @@ -7576,8 +9056,9 @@ }, "node_modules/parse5": { "version": "7.1.2", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz", + "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==", "dev": true, - "license": "MIT", "dependencies": { "entities": "^4.4.0" }, @@ -7587,8 +9068,9 @@ }, "node_modules/pascal-case": { "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3" @@ -7596,8 +9078,9 @@ }, "node_modules/path-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", + "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", "dev": true, - "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -7605,37 +9088,42 @@ }, "node_modules/path-exists": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-is-absolute": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-key": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/path-parse": { "version": "1.0.7", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true }, "node_modules/path-root": { "version": "0.1.1", + "resolved": "https://registry.npmjs.org/path-root/-/path-root-0.1.1.tgz", + "integrity": "sha512-QLcPegTHF11axjfojBIoDygmS2E3Lf+8+jI6wOVmNVenrKSo3mFdSGiIgdSHenczw3wPtlVMQaFVwGmM7BJdtg==", "dev": true, - "license": "MIT", "dependencies": { "path-root-regex": "^0.1.0" }, @@ -7645,36 +9133,41 @@ }, "node_modules/path-root-regex": { "version": "0.1.2", + "resolved": "https://registry.npmjs.org/path-root-regex/-/path-root-regex-0.1.2.tgz", + "integrity": "sha512-4GlJ6rZDhQZFE0DPVKh0e9jmZ5egZfxTkp7bcRDuPlJXbAwhxcl2dINPUAsjLdejqaLsCeg8axcLjIbvBjN4pQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/path-type": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/pathe": { "version": "1.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz", + "integrity": "sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==", + "dev": true }, "node_modules/pathval": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz", + "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==", "dev": true, - "license": "MIT", "engines": { "node": "*" } }, "node_modules/pbf": { "version": "3.2.1", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/pbf/-/pbf-3.2.1.tgz", + "integrity": "sha512-ClrV7pNOn7rtmoQVF4TS1vyU0WhYRnP92fzbfF75jAIwpnzdJXf8iTd4CMEqO4yUenH6NDqLiwjqlh6QgZzgLQ==", "dependencies": { "ieee754": "^1.1.12", "resolve-protobuf-schema": "^2.1.0" @@ -7685,13 +9178,15 @@ }, "node_modules/picocolors": { "version": "1.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz", + "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==", + "dev": true }, "node_modules/picomatch": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, @@ -7701,16 +9196,28 @@ }, "node_modules/pkg-types": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz", + "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==", "dev": true, - "license": "MIT", "dependencies": { "jsonc-parser": "^3.2.0", "mlly": "^1.2.0", "pathe": "^1.1.0" } }, + "node_modules/possible-typed-array-names": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz", + "integrity": "sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==", + "dev": true, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/postcss": { "version": "8.4.38", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz", + "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==", "dev": true, "funding": [ { @@ -7726,7 +9233,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "nanoid": "^3.3.7", "picocolors": "^1.0.0", @@ -7738,20 +9244,23 @@ }, "node_modules/potpack": { "version": "2.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/potpack/-/potpack-2.0.0.tgz", + "integrity": "sha512-Q+/tYsFU9r7xoOJ+y/ZTtdVQwTWfzjbiXBDMM/JKUux3+QPP02iUuIoeBQ+Ot6oEDlC+/PGjB/5A3K7KKb7hcw==" }, "node_modules/prelude-ls": { "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.8.0" } }, "node_modules/prettier": { "version": "3.2.5", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", + "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", "dev": true, - "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -7764,8 +9273,9 @@ }, "node_modules/pretty-format": { "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -7777,8 +9287,9 @@ }, "node_modules/pretty-format/node_modules/ansi-styles": { "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, @@ -7788,15 +9299,17 @@ }, "node_modules/promise": { "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", "dev": true, - "license": "MIT", "dependencies": { "asap": "~2.0.3" } }, "node_modules/prop-types": { "version": "15.8.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", + "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", "dependencies": { "loose-envify": "^1.4.0", "object-assign": "^4.1.1", @@ -7805,7 +9318,8 @@ }, "node_modules/prop-types-extra": { "version": "1.1.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/prop-types-extra/-/prop-types-extra-1.1.1.tgz", + "integrity": "sha512-59+AHNnHYCdiC+vMwY52WmvP5dM3QLeoumYuEyceQDi9aEhtwN9zIQ2ZNo25sMyXnbh32h+P1ezDsUpUH3JAew==", "dependencies": { "react-is": "^16.3.2", "warning": "^4.0.0" @@ -7816,49 +9330,59 @@ }, "node_modules/prop-types-extra/node_modules/react-is": { "version": "16.13.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/prop-types/node_modules/react-is": { "version": "16.13.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" }, "node_modules/protocol-buffers-schema": { "version": "3.6.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/protocol-buffers-schema/-/protocol-buffers-schema-3.6.0.tgz", + "integrity": "sha512-TdDRD+/QNdrCGCE7v8340QyuXd4kIWIgapsE2+n/SaGiSSbomYl4TjHlvIoCWRpE7wFt02EpB35VVA2ImcBVqw==" }, "node_modules/psl": { "version": "1.9.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz", + "integrity": "sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==", + "dev": true }, "node_modules/punycode": { "version": "1.4.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==", + "dev": true }, "node_modules/pvtsutils": { "version": "1.3.5", + "resolved": "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.5.tgz", + "integrity": "sha512-ARvb14YB9Nm2Xi6nBq1ZX6dAM0FsJnuk+31aUp4TrcZEdKUlSqOqsxJHUPJDNE3qiIp+iUPEIeR6Je/tgV7zsA==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.6.1" } }, "node_modules/pvutils": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz", + "integrity": "sha512-pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=6.0.0" } }, "node_modules/querystringify": { "version": "2.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz", + "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==", + "dev": true }, "node_modules/queue-microtask": { "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "dev": true, "funding": [ { @@ -7873,16 +9397,17 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/quickselect": { "version": "2.0.0", - "license": "ISC" + "resolved": "https://registry.npmjs.org/quickselect/-/quickselect-2.0.0.tgz", + "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==" }, "node_modules/react": { "version": "18.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", + "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", "dependencies": { "loose-envify": "^1.1.0" }, @@ -7892,7 +9417,8 @@ }, "node_modules/react-bootstrap": { "version": "2.10.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.2.tgz", + "integrity": "sha512-UvB7mRqQjivdZNxJNEA2yOQRB7L9N43nBnKc33K47+cH90/ujmnMwatTCwQLu83gLhrzAl8fsa6Lqig/KLghaA==", "dependencies": { "@babel/runtime": "^7.22.5", "@restart/hooks": "^0.4.9", @@ -7920,7 +9446,8 @@ }, "node_modules/react-dom": { "version": "18.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", + "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", "dependencies": { "loose-envify": "^1.1.0", "scheduler": "^0.23.0" @@ -7931,16 +9458,19 @@ }, "node_modules/react-is": { "version": "17.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", + "dev": true }, "node_modules/react-lifecycles-compat": { "version": "3.0.4", - "license": "MIT" + "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", + "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" }, "node_modules/react-map-gl": { "version": "7.1.7", - "license": "MIT", + "resolved": "https://registry.npmjs.org/react-map-gl/-/react-map-gl-7.1.7.tgz", + "integrity": "sha512-mwjc0obkBJOXCcoXQr3VoLqmqwo9vS4bXfbGsdxXzEgVCv/PM0v+1QggL7W0d/ccIy+VCjbXNlGij+PENz6VNg==", "dependencies": { "@maplibre/maplibre-gl-style-spec": "^19.2.1", "@types/mapbox-gl": ">=1.0.0" @@ -7960,17 +9490,42 @@ } } }, + "node_modules/react-map-gl/node_modules/@maplibre/maplibre-gl-style-spec": { + "version": "19.3.3", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-19.3.3.tgz", + "integrity": "sha512-cOZZOVhDSulgK0meTsTkmNXb1ahVvmTmWmfx9gRBwc6hq98wS9JP35ESIoNq3xqEan+UN+gn8187Z6E4NKhLsw==", + "dependencies": { + "@mapbox/jsonlint-lines-primitives": "~2.0.2", + "@mapbox/unitbezier": "^0.0.1", + "json-stringify-pretty-compact": "^3.0.0", + "minimist": "^1.2.8", + "rw": "^1.3.3", + "sort-object": "^3.0.3" + }, + "bin": { + "gl-style-format": "dist/gl-style-format.mjs", + "gl-style-migrate": "dist/gl-style-migrate.mjs", + "gl-style-validate": "dist/gl-style-validate.mjs" + } + }, + "node_modules/react-map-gl/node_modules/json-stringify-pretty-compact": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-3.0.0.tgz", + "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==" + }, "node_modules/react-refresh": { "version": "0.14.0", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", + "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/react-transition-group": { "version": "4.4.5", - "license": "BSD-3-Clause", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", + "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", "dependencies": { "@babel/runtime": "^7.5.5", "dom-helpers": "^5.0.1", @@ -7984,8 +9539,9 @@ }, "node_modules/readable-stream": { "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "dev": true, - "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -7996,15 +9552,16 @@ } }, "node_modules/reflect.getprototypeof": { - "version": "1.0.5", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", + "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.0.0", - "get-intrinsic": "^1.2.3", + "es-abstract": "^1.23.1", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.4", "globalthis": "^1.0.3", "which-builtin-type": "^1.1.3" }, @@ -8017,12 +9574,14 @@ }, "node_modules/regenerator-runtime": { "version": "0.14.1", - "license": "MIT" + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz", + "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==" }, "node_modules/regexp.prototype.flags": { "version": "1.5.2", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", + "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.6", "define-properties": "^1.2.1", @@ -8038,8 +9597,9 @@ }, "node_modules/relay-runtime": { "version": "12.0.0", + "resolved": "https://registry.npmjs.org/relay-runtime/-/relay-runtime-12.0.0.tgz", + "integrity": "sha512-QU6JKr1tMsry22DXNy9Whsq5rmvwr3LSZiiWV/9+DFpuTWvp+WFhobWMc8TC4OjKFfNhEZy7mOiqUAn5atQtug==", "dev": true, - "license": "MIT", "dependencies": { "@babel/runtime": "^7.0.0", "fbjs": "^3.0.0", @@ -8048,44 +9608,51 @@ }, "node_modules/remedial": { "version": "1.0.8", + "resolved": "https://registry.npmjs.org/remedial/-/remedial-1.0.8.tgz", + "integrity": "sha512-/62tYiOe6DzS5BqVsNpH/nkGlX45C/Sp6V+NtiN6JQNS1Viay7cWkazmRkrQrdFj2eshDe96SIQNIoMxqhzBOg==", "dev": true, - "license": "(MIT OR Apache-2.0)", "engines": { "node": "*" } }, "node_modules/remove-trailing-separator": { "version": "1.1.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==", + "dev": true }, "node_modules/remove-trailing-spaces": { "version": "1.0.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/remove-trailing-spaces/-/remove-trailing-spaces-1.0.8.tgz", + "integrity": "sha512-O3vsMYfWighyFbTd8hk8VaSj9UAGENxAtX+//ugIst2RMk5e03h6RoIS+0ylsFxY1gvmPuAY/PO4It+gPEeySA==", + "dev": true }, "node_modules/require-directory": { "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/require-main-filename": { "version": "2.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", + "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "dev": true }, "node_modules/requires-port": { "version": "1.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==", + "dev": true }, "node_modules/resolve": { "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", "dev": true, - "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -8100,23 +9667,26 @@ }, "node_modules/resolve-from": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/resolve-protobuf-schema": { "version": "2.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/resolve-protobuf-schema/-/resolve-protobuf-schema-2.1.0.tgz", + "integrity": "sha512-kI5ffTiZWmJaS/huM8wZfEMer1eRd7oJQhDuxeCLe3t7N7mX3z94CN0xPxBQxFYQTSNz9T0i+v6inKqSdK8xrQ==", "dependencies": { "protocol-buffers-schema": "^3.3.1" } }, "node_modules/restore-cursor": { "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", "dev": true, - "license": "MIT", "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -8127,8 +9697,9 @@ }, "node_modules/reusify": { "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", "dev": true, - "license": "MIT", "engines": { "iojs": ">=1.0.0", "node": ">=0.10.0" @@ -8136,13 +9707,15 @@ }, "node_modules/rfdc": { "version": "1.3.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz", + "integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==", + "dev": true }, "node_modules/rimraf": { "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, - "license": "ISC", "dependencies": { "glob": "^7.1.3" }, @@ -8155,8 +9728,9 @@ }, "node_modules/rollup": { "version": "4.13.0", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.13.0.tgz", + "integrity": "sha512-3YegKemjoQnYKmsBlOHfMLVPPA5xLkQ8MHLLSw/fBrFaVkEayL51DilPpNNLq1exr98F2B1TzrV0FUlN3gWRPg==", "dev": true, - "license": "MIT", "dependencies": { "@types/estree": "1.0.5" }, @@ -8186,19 +9760,23 @@ }, "node_modules/rrweb-cssom": { "version": "0.6.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.6.0.tgz", + "integrity": "sha512-APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==", + "dev": true }, "node_modules/run-async": { "version": "2.4.1", + "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", + "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.12.0" } }, "node_modules/run-parallel": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "dev": true, "funding": [ { @@ -8214,30 +9792,32 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "queue-microtask": "^1.2.2" } }, "node_modules/rw": { "version": "1.3.3", - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz", + "integrity": "sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ==" }, "node_modules/rxjs": { "version": "7.8.1", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.1.tgz", + "integrity": "sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==", "dev": true, - "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" } }, "node_modules/safe-array-concat": { - "version": "1.1.0", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", + "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", - "get-intrinsic": "^1.2.2", + "call-bind": "^1.0.7", + "get-intrinsic": "^1.2.4", "has-symbols": "^1.0.3", "isarray": "^2.0.5" }, @@ -8250,6 +9830,8 @@ }, "node_modules/safe-buffer": { "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "dev": true, "funding": [ { @@ -8264,13 +9846,13 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/safe-regex-test": { "version": "1.0.3", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", + "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.6", "es-errors": "^1.3.0", @@ -8285,13 +9867,15 @@ }, "node_modules/safer-buffer": { "version": "2.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", + "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", + "dev": true }, "node_modules/saxes": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", "dev": true, - "license": "ISC", "dependencies": { "xmlchars": "^2.2.0" }, @@ -8301,28 +9885,32 @@ }, "node_modules/scheduler": { "version": "0.23.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", + "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", "dependencies": { "loose-envify": "^1.1.0" } }, "node_modules/scuid": { "version": "1.1.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/scuid/-/scuid-1.1.0.tgz", + "integrity": "sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==", + "dev": true }, "node_modules/semver": { "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, - "license": "ISC", "bin": { "semver": "bin/semver.js" } }, "node_modules/sentence-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", + "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", "dev": true, - "license": "MIT", "dependencies": { "no-case": "^3.0.4", "tslib": "^2.0.3", @@ -8331,33 +9919,37 @@ }, "node_modules/set-blocking": { "version": "2.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", + "dev": true }, "node_modules/set-function-length": { - "version": "1.2.1", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, - "license": "MIT", "dependencies": { - "define-data-property": "^1.1.2", + "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.3", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.1" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" } }, "node_modules/set-function-name": { - "version": "2.0.1", + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", + "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, - "license": "MIT", "dependencies": { - "define-data-property": "^1.0.1", + "define-data-property": "^1.1.4", + "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", - "has-property-descriptors": "^1.0.0" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -8365,7 +9957,8 @@ }, "node_modules/set-value": { "version": "2.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", "dependencies": { "extend-shallow": "^2.0.1", "is-extendable": "^0.1.1", @@ -8378,13 +9971,15 @@ }, "node_modules/setimmediate": { "version": "1.0.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "dev": true }, "node_modules/shebang-command": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, - "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" }, @@ -8394,26 +9989,29 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/shell-quote": { "version": "1.8.1", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.8.1.tgz", + "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==", "dev": true, - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/side-channel": { - "version": "1.0.5", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", + "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "es-errors": "^1.3.0", "get-intrinsic": "^1.2.4", "object-inspect": "^1.13.1" @@ -8427,31 +10025,36 @@ }, "node_modules/siginfo": { "version": "2.0.0", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true }, "node_modules/signal-exit": { "version": "3.0.7", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "dev": true }, "node_modules/signedsource": { "version": "1.0.0", - "dev": true, - "license": "BSD-3-Clause" + "resolved": "https://registry.npmjs.org/signedsource/-/signedsource-1.0.0.tgz", + "integrity": "sha512-6+eerH9fEnNmi/hyM1DXcRK3pWdoMQtlkQ+ns0ntzunjKqp5i3sKCc80ym8Fib3iaYhdJUOPdhlJWj1tvge2Ww==", + "dev": true }, "node_modules/slash": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" } }, "node_modules/slice-ansi": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz", + "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "astral-regex": "^2.0.0", @@ -8463,8 +10066,9 @@ }, "node_modules/snake-case": { "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", "dev": true, - "license": "MIT", "dependencies": { "dot-case": "^3.0.4", "tslib": "^2.0.3" @@ -8472,21 +10076,24 @@ }, "node_modules/sort-asc": { "version": "0.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sort-asc/-/sort-asc-0.2.0.tgz", + "integrity": "sha512-umMGhjPeHAI6YjABoSTrFp2zaBtXBej1a0yKkuMUyjjqu6FJsTF+JYwCswWDg+zJfk/5npWUUbd33HH/WLzpaA==", "engines": { "node": ">=0.10.0" } }, "node_modules/sort-desc": { "version": "0.2.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sort-desc/-/sort-desc-0.2.0.tgz", + "integrity": "sha512-NqZqyvL4VPW+RAxxXnB8gvE1kyikh8+pR+T+CXLksVRN9eiQqkQlPwqWYU0mF9Jm7UnctShlxLyAt1CaBOTL1w==", "engines": { "node": ">=0.10.0" } }, "node_modules/sort-object": { "version": "3.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/sort-object/-/sort-object-3.0.3.tgz", + "integrity": "sha512-nK7WOY8jik6zaG9CRwZTaD5O7ETWDLZYMM12pqY8htll+7dYeqGfEUPcUBHOpSJg2vJOrvFIY2Dl5cX2ih1hAQ==", "dependencies": { "bytewise": "^1.1.0", "get-value": "^2.0.2", @@ -8501,15 +10108,17 @@ }, "node_modules/source-map-js": { "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", "dev": true, - "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" } }, "node_modules/split-string": { "version": "3.1.0", - "license": "MIT", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", "dependencies": { "extend-shallow": "^3.0.0" }, @@ -8519,7 +10128,8 @@ }, "node_modules/split-string/node_modules/extend-shallow": { "version": "3.0.2", - "license": "MIT", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==", "dependencies": { "assign-symbols": "^1.0.0", "is-extendable": "^1.0.1" @@ -8530,7 +10140,8 @@ }, "node_modules/split-string/node_modules/is-extendable": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", "dependencies": { "is-plain-object": "^2.0.4" }, @@ -8540,26 +10151,30 @@ }, "node_modules/sponge-case": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/sponge-case/-/sponge-case-1.0.1.tgz", + "integrity": "sha512-dblb9Et4DAtiZ5YSUZHLl4XhH4uK80GhAZrVXdN4O2P4gQ40Wa5UIOPUHlA/nFd2PLblBZWUioLMMAVrgpoYcA==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/stackback": { "version": "0.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true }, "node_modules/std-env": { "version": "3.7.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.7.0.tgz", + "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==", + "dev": true }, "node_modules/stop-iteration-iterator": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", + "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", "dev": true, - "license": "MIT", "dependencies": { "internal-slot": "^1.0.4" }, @@ -8569,6 +10184,8 @@ }, "node_modules/streamsearch": { "version": "1.1.0", + "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", + "integrity": "sha512-Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==", "dev": true, "engines": { "node": ">=10.0.0" @@ -8576,21 +10193,24 @@ }, "node_modules/string_decoder": { "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "dev": true, - "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } }, "node_modules/string-env-interpolation": { "version": "1.0.1", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/string-env-interpolation/-/string-env-interpolation-1.0.1.tgz", + "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==", + "dev": true }, "node_modules/string-width": { "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "dev": true, - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -8602,36 +10222,46 @@ }, "node_modules/string-width/node_modules/emoji-regex": { "version": "8.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true }, "node_modules/string.prototype.matchall": { - "version": "4.0.10", + "version": "4.0.11", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", + "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "get-intrinsic": "^1.2.1", + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.2", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.4", + "gopd": "^1.0.1", "has-symbols": "^1.0.3", - "internal-slot": "^1.0.5", - "regexp.prototype.flags": "^1.5.0", - "set-function-name": "^2.0.0", - "side-channel": "^1.0.4" + "internal-slot": "^1.0.7", + "regexp.prototype.flags": "^1.5.2", + "set-function-name": "^2.0.2", + "side-channel": "^1.0.6" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trim": { - "version": "1.2.8", + "version": "1.2.9", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", + "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.0", + "es-object-atoms": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -8641,26 +10271,31 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.7", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", + "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/string.prototype.trimstart": { - "version": "1.0.7", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1" + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -8668,8 +10303,9 @@ }, "node_modules/strip-ansi": { "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -8679,16 +10315,18 @@ }, "node_modules/strip-bom": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/strip-final-newline": { "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-3.0.0.tgz", + "integrity": "sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" }, @@ -8698,8 +10336,9 @@ }, "node_modules/strip-json-comments": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "license": "MIT", "engines": { "node": ">=8" }, @@ -8709,8 +10348,9 @@ }, "node_modules/strip-literal": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.0.0.tgz", + "integrity": "sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==", "dev": true, - "license": "MIT", "dependencies": { "js-tokens": "^8.0.2" }, @@ -8720,20 +10360,23 @@ }, "node_modules/strip-literal/node_modules/js-tokens": { "version": "8.0.3", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.3.tgz", + "integrity": "sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==", + "dev": true }, "node_modules/supercluster": { "version": "8.0.1", - "license": "ISC", + "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz", + "integrity": "sha512-IiOea5kJ9iqzD2t7QJq/cREyLHTtSmUT6gQsweojg9WH2sYJqZK9SswTu6jrscO6D1G5v5vYZ9ru/eq85lXeZQ==", "dependencies": { "kdbush": "^4.0.2" } }, "node_modules/supports-color": { "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -8743,8 +10386,9 @@ }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "dev": true, - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -8754,21 +10398,24 @@ }, "node_modules/swap-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/swap-case/-/swap-case-2.0.2.tgz", + "integrity": "sha512-kc6S2YS/2yXbtkSMunBtKdah4VFETZ8Oh6ONSmSd9bRxhqTrtARUCBUiWXH3xVPpvR7tz2CSnkuXVE42EcGnMw==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/symbol-tree": { "version": "3.2.4", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true }, "node_modules/test-exclude": { "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, - "license": "ISC", "dependencies": { "@istanbuljs/schema": "^0.1.2", "glob": "^7.1.4", @@ -8778,53 +10425,83 @@ "node": ">=8" } }, + "node_modules/test-exclude/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/test-exclude/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, "node_modules/text-table": { "version": "0.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "node_modules/through": { "version": "2.3.8", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", + "dev": true }, "node_modules/tinybench": { "version": "2.6.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.6.0.tgz", + "integrity": "sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==", + "dev": true }, "node_modules/tinypool": { - "version": "0.8.2", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.3.tgz", + "integrity": "sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==", "dev": true, - "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/tinyqueue": { "version": "2.0.3", - "license": "ISC" + "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz", + "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA==" }, "node_modules/tinyspy": { "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz", + "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==", "dev": true, - "license": "MIT", "engines": { "node": ">=14.0.0" } }, "node_modules/title-case": { "version": "3.0.3", + "resolved": "https://registry.npmjs.org/title-case/-/title-case-3.0.3.tgz", + "integrity": "sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/tmp": { "version": "0.0.33", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", + "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", "dev": true, - "license": "MIT", "dependencies": { "os-tmpdir": "~1.0.2" }, @@ -8834,16 +10511,18 @@ }, "node_modules/to-fast-properties": { "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/to-regex-range": { "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, - "license": "MIT", "dependencies": { "is-number": "^7.0.0" }, @@ -8853,8 +10532,9 @@ }, "node_modules/tough-cookie": { "version": "4.1.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", + "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", "dev": true, - "license": "BSD-3-Clause", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", @@ -8867,16 +10547,18 @@ }, "node_modules/tough-cookie/node_modules/punycode": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/tr46": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz", + "integrity": "sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==", "dev": true, - "license": "MIT", "dependencies": { "punycode": "^2.3.1" }, @@ -8886,16 +10568,18 @@ }, "node_modules/tr46/node_modules/punycode": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/ts-api-utils": { - "version": "1.2.1", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-1.3.0.tgz", + "integrity": "sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=16" }, @@ -8905,13 +10589,15 @@ }, "node_modules/ts-log": { "version": "2.2.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/ts-log/-/ts-log-2.2.5.tgz", + "integrity": "sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==", + "dev": true }, "node_modules/tsconfig-paths": { "version": "3.15.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", + "integrity": "sha512-2Ac2RgzDe/cn48GvOe3M+o82pEFewD3UPbyoUHHdKasHwJKjds4fLXWf/Ux5kATBKN20oaFGu+jbElp1pos0mg==", "dev": true, - "license": "MIT", "dependencies": { "@types/json5": "^0.0.29", "json5": "^1.0.2", @@ -8921,8 +10607,9 @@ }, "node_modules/tsconfig-paths/node_modules/json5": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", "dev": true, - "license": "MIT", "dependencies": { "minimist": "^1.2.0" }, @@ -8932,12 +10619,14 @@ }, "node_modules/tslib": { "version": "2.6.2", - "license": "0BSD" + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", + "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, "node_modules/type-check": { "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, - "license": "MIT", "dependencies": { "prelude-ls": "^1.2.1" }, @@ -8947,16 +10636,18 @@ }, "node_modules/type-detect": { "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, - "license": "MIT", "engines": { "node": ">=4" } }, "node_modules/type-fest": { "version": "0.21.3", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", + "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==", "dev": true, - "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=10" }, @@ -8965,11 +10656,12 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", + "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.7", "es-errors": "^1.3.0", "is-typed-array": "^1.1.13" }, @@ -8978,14 +10670,16 @@ } }, "node_modules/typed-array-byte-length": { - "version": "1.0.0", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", + "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -8995,15 +10689,17 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.0", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", + "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", "dev": true, - "license": "MIT", "dependencies": { - "available-typed-arrays": "^1.0.5", - "call-bind": "^1.0.2", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "has-proto": "^1.0.1", - "is-typed-array": "^1.1.10" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13" }, "engines": { "node": ">= 0.4" @@ -9013,13 +10709,20 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.4", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", + "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", "dev": true, - "license": "MIT", "dependencies": { - "call-bind": "^1.0.2", + "call-bind": "^1.0.7", "for-each": "^0.3.3", - "is-typed-array": "^1.1.9" + "gopd": "^1.0.1", + "has-proto": "^1.0.3", + "is-typed-array": "^1.1.13", + "possible-typed-array-names": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9040,17 +10743,21 @@ }, "node_modules/typewise": { "version": "1.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz", + "integrity": "sha512-aXofE06xGhaQSPzt8hlTY+/YWQhm9P0jYUp1f2XtmW/3Bk0qzXcyFWAtPoo2uTGQj1ZwbDuSyuxicq+aDo8lCQ==", "dependencies": { "typewise-core": "^1.2.0" } }, "node_modules/typewise-core": { "version": "1.2.0", - "license": "MIT" + "resolved": "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz", + "integrity": "sha512-2SCC/WLzj2SbUwzFOzqMCkz5amXLlxtJqDKTICqg30x+2DZxcfZN2MvQZmGfXWKNWaKK9pBPsvkcwv8bF/gxKg==" }, "node_modules/ua-parser-js": { "version": "1.0.37", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz", + "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==", "dev": true, "funding": [ { @@ -9066,20 +10773,21 @@ "url": "https://github.com/sponsors/faisalman" } ], - "license": "MIT", "engines": { "node": "*" } }, "node_modules/ufo": { - "version": "1.4.0", - "dev": true, - "license": "MIT" + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz", + "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==", + "dev": true }, "node_modules/unbox-primitive": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", + "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", "dev": true, - "license": "MIT", "dependencies": { "call-bind": "^1.0.2", "has-bigints": "^1.0.2", @@ -9092,15 +10800,17 @@ }, "node_modules/unc-path-regex": { "version": "0.1.2", + "resolved": "https://registry.npmjs.org/unc-path-regex/-/unc-path-regex-0.1.2.tgz", + "integrity": "sha512-eXL4nmJT7oCpkZsHZUOJo8hcX3GbsiDOa0Qu9F646fi8dT3XuSVopVqAcEiVzSKKH7UoDti23wNX3qGFxcW5Qg==", "dev": true, - "license": "MIT", "engines": { "node": ">=0.10.0" } }, "node_modules/uncontrollable": { "version": "7.2.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/uncontrollable/-/uncontrollable-7.2.1.tgz", + "integrity": "sha512-svtcfoTADIB0nT9nltgjujTi7BzVmwjZClOmskKu/E8FW9BXzg9os8OLr4f8Dlnk0rYWJIWr4wv9eKUXiQvQwQ==", "dependencies": { "@babel/runtime": "^7.6.3", "@types/react": ">=16.9.11", @@ -9113,12 +10823,14 @@ }, "node_modules/undici-types": { "version": "5.26.5", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz", + "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==", + "dev": true }, "node_modules/union-value": { "version": "1.0.1", - "license": "MIT", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", "dependencies": { "arr-union": "^3.1.0", "get-value": "^2.0.6", @@ -9131,16 +10843,18 @@ }, "node_modules/universalify": { "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", "dev": true, - "license": "MIT", "engines": { "node": ">= 4.0.0" } }, "node_modules/unixify": { "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz", + "integrity": "sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==", "dev": true, - "license": "MIT", "dependencies": { "normalize-path": "^2.1.1" }, @@ -9150,6 +10864,8 @@ }, "node_modules/update-browserslist-db": { "version": "1.0.13", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz", + "integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==", "dev": true, "funding": [ { @@ -9165,7 +10881,6 @@ "url": "https://github.com/sponsors/ai" } ], - "license": "MIT", "dependencies": { "escalade": "^3.1.1", "picocolors": "^1.0.0" @@ -9179,40 +10894,45 @@ }, "node_modules/upper-case": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", + "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/upper-case-first": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", + "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", "dev": true, - "license": "MIT", "dependencies": { "tslib": "^2.0.3" } }, "node_modules/uri-js": { "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "dev": true, - "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" } }, "node_modules/uri-js/node_modules/punycode": { "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "dev": true, - "license": "MIT", "engines": { "node": ">=6" } }, "node_modules/url-parse": { "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", + "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==", "dev": true, - "license": "MIT", "dependencies": { "querystringify": "^2.1.1", "requires-port": "^1.0.0" @@ -9220,18 +10940,21 @@ }, "node_modules/urlpattern-polyfill": { "version": "8.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-8.0.2.tgz", + "integrity": "sha512-Qp95D4TPJl1kC9SKigDcqgyM2VDVO4RiJc2d4qe5GrYm+zbIQCWWKAFaJNQ4BhdFeDGwBmAxqJBwWSJDb9T3BQ==", + "dev": true }, "node_modules/util-deprecate": { "version": "1.0.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true }, "node_modules/v8-to-istanbul": { "version": "9.2.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", + "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==", "dev": true, - "license": "ISC", "dependencies": { "@jridgewell/trace-mapping": "^0.3.12", "@types/istanbul-lib-coverage": "^2.0.1", @@ -9243,16 +10966,18 @@ }, "node_modules/value-or-promise": { "version": "1.0.12", + "resolved": "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.12.tgz", + "integrity": "sha512-Z6Uz+TYwEqE7ZN50gwn+1LCVo9ZVrpxRPOhOLnncYkY1ZzOYtrX8Fwf/rFktZ8R5mJms6EZf5TqNOMeZmnPq9Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=12" } }, "node_modules/vite": { "version": "5.2.6", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.6.tgz", + "integrity": "sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==", "dev": true, - "license": "MIT", "dependencies": { "esbuild": "^0.20.1", "postcss": "^8.4.36", @@ -9305,8 +11030,9 @@ }, "node_modules/vite-node": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.4.0.tgz", + "integrity": "sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==", "dev": true, - "license": "MIT", "dependencies": { "cac": "^6.7.14", "debug": "^4.3.4", @@ -9326,8 +11052,9 @@ }, "node_modules/vitest": { "version": "1.4.0", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.4.0.tgz", + "integrity": "sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==", "dev": true, - "license": "MIT", "dependencies": { "@vitest/expect": "1.4.0", "@vitest/runner": "1.4.0", @@ -9390,7 +11117,8 @@ }, "node_modules/vt-pbf": { "version": "3.1.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/vt-pbf/-/vt-pbf-3.1.3.tgz", + "integrity": "sha512-2LzDFzt0mZKZ9IpVF2r69G9bXaP2Q2sArJCmcCgvfTdCCZzSyz4aCLoQyUilu37Ll56tCblIZrXFIjNUpGIlmA==", "dependencies": { "@mapbox/point-geometry": "0.1.0", "@mapbox/vector-tile": "^1.3.1", @@ -9399,8 +11127,9 @@ }, "node_modules/w3c-xmlserializer": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", "dev": true, - "license": "MIT", "dependencies": { "xml-name-validator": "^5.0.0" }, @@ -9410,31 +11139,35 @@ }, "node_modules/warning": { "version": "4.0.3", - "license": "MIT", + "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz", + "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==", "dependencies": { "loose-envify": "^1.0.0" } }, "node_modules/wcwidth": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", "dev": true, - "license": "MIT", "dependencies": { "defaults": "^1.0.3" } }, "node_modules/web-streams-polyfill": { - "version": "3.3.2", + "version": "3.3.3", + "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", + "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", "dev": true, - "license": "MIT", "engines": { "node": ">= 8" } }, "node_modules/webcrypto-core": { "version": "1.7.8", + "resolved": "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.7.8.tgz", + "integrity": "sha512-eBR98r9nQXTqXt/yDRtInszPMjTaSAMJAFDg2AHsgrnczawT1asx9YNBX6k5p+MekbPF4+s/UJJrr88zsTqkSg==", "dev": true, - "license": "MIT", "dependencies": { "@peculiar/asn1-schema": "^2.3.8", "@peculiar/json-schema": "^1.1.12", @@ -9445,16 +11178,18 @@ }, "node_modules/webidl-conversions": { "version": "7.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", + "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", "dev": true, - "license": "BSD-2-Clause", "engines": { "node": ">=12" } }, "node_modules/whatwg-encoding": { "version": "3.1.1", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", + "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", "dev": true, - "license": "MIT", "dependencies": { "iconv-lite": "0.6.3" }, @@ -9464,8 +11199,9 @@ }, "node_modules/whatwg-encoding/node_modules/iconv-lite": { "version": "0.6.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", + "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "dev": true, - "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" }, @@ -9475,16 +11211,18 @@ }, "node_modules/whatwg-mimetype": { "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", "dev": true, - "license": "MIT", "engines": { "node": ">=18" } }, "node_modules/whatwg-url": { "version": "14.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz", + "integrity": "sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==", "dev": true, - "license": "MIT", "dependencies": { "tr46": "^5.0.0", "webidl-conversions": "^7.0.0" @@ -9495,8 +11233,9 @@ }, "node_modules/which": { "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, - "license": "ISC", "dependencies": { "isexe": "^2.0.0" }, @@ -9509,8 +11248,9 @@ }, "node_modules/which-boxed-primitive": { "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", + "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", "dev": true, - "license": "MIT", "dependencies": { "is-bigint": "^1.0.1", "is-boolean-object": "^1.1.0", @@ -9524,8 +11264,9 @@ }, "node_modules/which-builtin-type": { "version": "1.1.3", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.3.tgz", + "integrity": "sha512-YmjsSMDBYsM1CaFiayOVT06+KJeXf0o5M/CAd4o1lTadFAtacTUM49zoYxr/oroopFDfhvN6iEcBxUyc3gvKmw==", "dev": true, - "license": "MIT", "dependencies": { "function.prototype.name": "^1.1.5", "has-tostringtag": "^1.0.0", @@ -9548,14 +11289,18 @@ } }, "node_modules/which-collection": { - "version": "1.0.1", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", + "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", "dev": true, - "license": "MIT", "dependencies": { - "is-map": "^2.0.1", - "is-set": "^2.0.1", - "is-weakmap": "^2.0.1", - "is-weakset": "^2.0.1" + "is-map": "^2.0.3", + "is-set": "^2.0.3", + "is-weakmap": "^2.0.2", + "is-weakset": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -9563,19 +11308,21 @@ }, "node_modules/which-module": { "version": "2.0.1", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", + "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", + "dev": true }, "node_modules/which-typed-array": { - "version": "1.1.14", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", + "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", "dev": true, - "license": "MIT", "dependencies": { - "available-typed-arrays": "^1.0.6", - "call-bind": "^1.0.5", + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-tostringtag": "^1.0.1" + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -9586,8 +11333,9 @@ }, "node_modules/why-is-node-running": { "version": "2.2.2", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz", + "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==", "dev": true, - "license": "MIT", "dependencies": { "siginfo": "^2.0.0", "stackback": "0.0.2" @@ -9601,8 +11349,9 @@ }, "node_modules/wrap-ansi": { "version": "6.2.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", + "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -9614,13 +11363,15 @@ }, "node_modules/wrappy": { "version": "1.0.2", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true }, "node_modules/ws": { "version": "8.16.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", + "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", "dev": true, - "license": "MIT", "engines": { "node": ">=10.0.0" }, @@ -9639,47 +11390,57 @@ }, "node_modules/xml-name-validator": { "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", "dev": true, - "license": "Apache-2.0", "engines": { "node": ">=18" } }, "node_modules/xmlchars": { "version": "2.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true }, "node_modules/y18n": { "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true, - "license": "ISC", "engines": { "node": ">=10" } }, "node_modules/yallist": { "version": "3.1.1", - "dev": true, - "license": "ISC" + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true }, "node_modules/yaml": { - "version": "2.3.4", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.4.1.tgz", + "integrity": "sha512-pIXzoImaqmfOrL7teGUBt/T7ZDnyeGBWyXQBvOVhLkWLN37GXv8NMLK406UY6dS51JfcQHsmcW5cJ441bHg6Lg==", "dev": true, - "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, "engines": { "node": ">= 14" } }, "node_modules/yaml-ast-parser": { "version": "0.0.43", - "dev": true, - "license": "Apache-2.0" + "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz", + "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==", + "dev": true }, "node_modules/yargs": { "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "dev": true, - "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -9695,16 +11456,18 @@ }, "node_modules/yargs-parser": { "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "dev": true, - "license": "ISC", "engines": { "node": ">=12" } }, "node_modules/yocto-queue": { "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, - "license": "MIT", "engines": { "node": ">=10" }, From f4438a8dc142150d1b7e70b36dfa60e9fb2857b7 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Tue, 26 Mar 2024 08:39:19 +0000 Subject: [PATCH 0882/1688] Upgrade debug client to version 2024/03/2024-03-26T08:38 --- src/client/debug-client-preview/index.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 8d94c2f8219..7b902b7e92f 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,11 +5,10 @@ OTP Debug Client - - + +
      - From 1023451ccd88c3db2b7a6663ef4c69fa07559984 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 17:03:49 +0100 Subject: [PATCH 0883/1688] Add NOI OpenDataHub parking updater --- docs/sandbox/VehicleParking.md | 10 +- .../vehicleparking/noi/NoiUpdaterTest.java | 51 ++++++ .../ext/vehicleparking/noi/stations.json | 159 ++++++++++++++++++ .../ext/vehicleparking/noi/NoiUpdater.java | 69 ++++++++ .../noi/NoiUpdaterParameters.java | 25 +++ .../vehicle_parking/VehicleParking.java | 5 +- .../config/framework/json/OtpVersion.java | 3 +- .../updaters/VehicleParkingUpdaterConfig.java | 17 +- .../VehicleParkingDataSourceFactory.java | 3 + .../VehicleParkingSourceType.java | 1 + .../apis/gtfs/GraphQLIntegrationTest.java | 1 + .../module/VehicleParkingLinkingTest.java | 23 ++- .../VehicleParkingHelperTest.java | 9 +- .../VehicleParkingTestUtil.java | 5 +- .../model/_data/StreetModelForTest.java | 5 + .../model/edge/VehicleParkingEdgeTest.java | 5 +- .../edge/VehicleParkingPreferredTagsTest.java | 7 +- .../VehicleParkingUpdaterTest.java | 19 ++- 18 files changed, 376 insertions(+), 41 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterTest.java create mode 100644 src/ext-test/resources/org/opentripplanner/ext/vehicleparking/noi/stations.json create mode 100644 src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java create mode 100644 src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterParameters.java diff --git a/docs/sandbox/VehicleParking.md b/docs/sandbox/VehicleParking.md index 4bfc2f6bd36..8a659446516 100644 --- a/docs/sandbox/VehicleParking.md +++ b/docs/sandbox/VehicleParking.md @@ -60,7 +60,7 @@ This will end up in the API responses as the feed id of of the parking lot. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` **Path:** /updaters/[2] -**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` The source of the vehicle updates. @@ -110,7 +110,7 @@ Used for converting abstract opening hours into concrete points in time. | frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.2 | | [sourceType](#u__3__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | | [timeZone](#u__3__timeZone) | `time-zone` | The time zone of the feed. | *Optional* | | 2.2 | -| url | `string` | URL of the resource. | *Optional* | | 2.2 | +| url | `string` | URL of the resource. | *Required* | | 2.2 | | [headers](#u__3__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.2 | | [tags](#u__3__tags) | `string[]` | Tags to add to the parking lots. | *Optional* | | 2.2 | @@ -130,7 +130,7 @@ This will end up in the API responses as the feed id of of the parking lot. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` **Path:** /updaters/[3] -**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` The source of the vehicle updates. @@ -196,7 +196,7 @@ Tags to add to the parking lots. | [feedId](#u__4__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | | frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.3 | | [sourceType](#u__4__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | -| url | `uri` | URL of the locations endpoint. | *Optional* | | 2.3 | +| url | `uri` | URL of the locations endpoint. | *Required* | | 2.3 | | [headers](#u__4__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | @@ -215,7 +215,7 @@ This will end up in the API responses as the feed id of of the parking lot. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` **Path:** /updaters/[4] -**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` The source of the vehicle updates. diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterTest.java b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterTest.java new file mode 100644 index 00000000000..f931e3d964e --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterTest.java @@ -0,0 +1,51 @@ +package org.opentripplanner.ext.vehicleparking.noi; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.time.Duration; +import org.junit.jupiter.api.Test; +import org.opentripplanner.test.support.ResourceLoader; +import org.opentripplanner.updater.spi.HttpHeaders; + +class NoiUpdaterTest { + + @Test + void parse() { + var uri = ResourceLoader.of(this).uri("stations.json"); + var parameters = new NoiUpdaterParameters( + "noi", + uri, + "noi", + Duration.ofSeconds(30), + HttpHeaders.empty() + ); + var updater = new NoiUpdater(parameters); + updater.update(); + var lots = updater.getUpdates(); + + assertEquals(14, lots.size()); + + lots.forEach(l -> assertNotNull(l.getName())); + + var first = lots.getFirst(); + assertEquals("noi:105", first.getId().toString()); + assertEquals("(46.49817, 11.35726)", first.getCoordinate().toString()); + assertEquals("P05 - Laurin", first.getName().toString()); + assertEquals(57, first.getAvailability().getCarSpaces()); + assertEquals(90, first.getCapacity().getCarSpaces()); + + var last = lots.getLast(); + assertEquals( + "noi:935af00d-aa5f-eb11-9889-501ac5928d31-0.8458736393052522", + last.getId().toString() + ); + assertEquals("(46.5057, 11.3395)", last.getCoordinate().toString()); + assertEquals( + "Parksensoren Bozen - PNI Parksensor Nr.10 Commissariato - Viale Eugenio di savoia", + last.getName().toString() + ); + assertEquals(0, last.getAvailability().getCarSpaces()); + assertEquals(1, last.getCapacity().getCarSpaces()); + } +} diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/noi/stations.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/noi/stations.json new file mode 100644 index 00000000000..2bbb07ac98b --- /dev/null +++ b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/noi/stations.json @@ -0,0 +1,159 @@ +{ + "last_updated": 1711368767, + "ttl": 0, + "version": "3.0.0", + "data": { + "stations": [ + { + "type": "station", + "station_id": "105", + "name": "P05 - Laurin", + "lat": 46.498174, + "lon": 11.357255, + "city": "Bolzano - Bozen", + "capacity": 90, + "free": 57 + }, + { + "type": "station", + "station_id": "TRENTO:areaexsitviacanestrinip1", + "name": "Area ex SIT via Canestrini - P1", + "lat": 46.0691, + "lon": 11.1162, + "address": "Lung'Adige Monte Grappa", + "city": "Trento", + "capacity": 300, + "free": 0 + }, + { + "type": "station", + "station_id": "ROVERETO:asm", + "name": "A.S.M.", + "lat": 45.893593, + "lon": 11.036507, + "address": "Piazzale ex-A.S.M - Via Manzoni - Rovereto", + "city": "Rovereto", + "capacity": 145, + "free": 42 + }, + { + "type": "station", + "station_id": "ROVERETO:centrostorico", + "name": "Centro Storico", + "lat": 45.890306, + "lon": 11.045004, + "address": "Viale dei Colli - Rovereto", + "city": "Rovereto", + "capacity": 143, + "free": 20 + }, + { + "type": "station", + "station_id": "ROVERETO:mart", + "name": "Mart", + "lat": 45.894705, + "lon": 11.044661, + "address": "Mart - Via Sticcotta - Rovereto", + "city": "Rovereto", + "capacity": 224, + "free": 224 + }, + { + "type": "sensor", + "station_id": "001bc50670100557-0.30188412882192206", + "group_name": "area viale Druso", + "group_id": "area_viale_druso", + "name": "piazzetta Mazzoni 3", + "lat": 46.495025, + "lon": 11.347069, + "address": "area viale Druso", + "city": "Bolzano - Bozen", + "free": false + }, + { + "type": "sensor", + "station_id": "001bc50670100541-0.9632040952321754", + "group_name": "Via A. Rosmini 22-26", + "group_id": "via_a_rosmini_22_26", + "name": "Via A. Rosmini 22-26", + "lat": 46.498292, + "lon": 11.348031, + "address": "Via A. Rosmini 22-26", + "city": "Bolzano - Bozen", + "free": false + }, + { + "type": "sensor", + "station_id": "001bc50670112a6b-0.6239539554369709", + "group_name": "Via Amalfi", + "group_id": "via_amalfi", + "name": "Via Amalfi angolo Via Druso", + "lat": 46.495283, + "lon": 11.332472, + "address": "Via Amalfi", + "city": "Bolzano - Bozen", + "free": false + }, + { + "type": "sensor", + "station_id": "001bc5067010064d-0.18879954213280836", + "group_name": "area viale Druso", + "group_id": "area_viale_druso", + "name": "piazzetta Mazzoni 4", + "lat": 46.495056, + "lon": 11.347056, + "address": "area viale Druso", + "city": "Bolzano - Bozen", + "free": false + }, + { + "type": "sensor", + "station_id": "001bc50670112976-0.4989211141789258", + "group_name": "Viale Druso 237", + "group_id": "viale_druso_237", + "name": "Viale Druso 237", + "lat": 46.495, + "lon": 11.328703, + "address": "Viale Druso 237", + "city": "Bolzano - Bozen", + "free": true + }, + { + "type": "sensor", + "station_id": "9398a35b-ef3d-eb11-b9ed-0050f244b601-0.12775006754129703", + "group_id": "", + "name": "Parksensoren Bozen - PNI Parksensor Nr.3 Siegesplatz Parkplatz", + "lat": 46.501, + "lon": 11.3431, + "free": true + }, + { + "type": "sensor", + "station_id": "7776d25f-f03d-eb11-b9ed-0050f244b601-0.4355636862513992", + "group_id": "", + "name": "Parksensoren Bozen - PNI Parksensor Nr.5 DucaDaostastrasse", + "lat": 46.4953, + "lon": 11.3396, + "free": false + }, + { + "type": "sensor", + "station_id": "e3e26add-ee3d-eb11-b9ed-0050f244b601-0.8423578257530036", + "group_id": "", + "name": "Parksensoren Bozen - PNI Parksensor Nr.4 Bahnhof BZ Richtung Rittnerseilbahn", + "lat": 46.497, + "lon": 11.3583, + "free": false + }, + { + "type": "sensor", + "station_id": "935af00d-aa5f-eb11-9889-501ac5928d31-0.8458736393052522", + "group_id": "", + "name": "Parksensoren Bozen - PNI Parksensor Nr.10 Commissariato - Viale Eugenio di savoia", + "lat": 46.5057, + "lon": 11.3395, + "free": false + } + ] + } +} \ No newline at end of file diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java new file mode 100644 index 00000000000..9bd64d9612f --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java @@ -0,0 +1,69 @@ +package org.opentripplanner.ext.vehicleparking.noi; + +import com.fasterxml.jackson.databind.JsonNode; +import org.opentripplanner.framework.geometry.WgsCoordinate; +import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.routing.vehicle_parking.VehicleParking; +import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; +import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.updater.spi.GenericJsonDataSource; + +/** + * Vehicle parking updater class for NOI's open data hub format APIs. + */ +public class NoiUpdater extends GenericJsonDataSource { + + private static final String JSON_PARSE_PATH = "data/stations"; + + private final String feedId; + + public NoiUpdater(NoiUpdaterParameters parameters) { + super(parameters.url().toString(), JSON_PARSE_PATH, parameters.httpHeaders()); + this.feedId = parameters.feedId(); + } + + @Override + protected VehicleParking parseElement(JsonNode jsonNode) { + var type = jsonNode.path("type").textValue(); + VehicleParkingSpaces capacity, availability; + if (type.equals("station")) { + capacity = extractSpaces(jsonNode, "capacity"); + availability = extractSpaces(jsonNode, "free"); + } else if (type.equals("sensor")) { + capacity = VehicleParkingSpaces.builder().carSpaces(1).build(); + var isFree = jsonNode.path("free").asBoolean(); + availability = VehicleParkingSpaces.builder().carSpaces(isFree ? 1 : 0).build(); + } else { + throw new IllegalArgumentException("Unknown type '%s'".formatted(type)); + } + + var vehicleParkId = new FeedScopedId(feedId, jsonNode.path("station_id").asText()); + var name = new NonLocalizedString(jsonNode.path("name").asText()); + double lat = jsonNode.path("lat").asDouble(); + double lon = jsonNode.path("lon").asDouble(); + var coordinate = new WgsCoordinate(lat, lon); + VehicleParking.VehicleParkingEntranceCreator entrance = builder -> + builder + .entranceId(new FeedScopedId(feedId, vehicleParkId.getId() + "/entrance")) + .coordinate(coordinate) + .walkAccessible(true) + .carAccessible(true); + + return VehicleParking + .builder() + .id(vehicleParkId) + .name(name) + .state(VehicleParkingState.OPERATIONAL) + .coordinate(coordinate) + .capacity(capacity) + .availability(availability) + .carPlaces(true) + .entrance(entrance) + .build(); + } + + private static VehicleParkingSpaces extractSpaces(JsonNode jsonNode, String free) { + return VehicleParkingSpaces.builder().carSpaces(jsonNode.get(free).asInt()).build(); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterParameters.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterParameters.java new file mode 100644 index 00000000000..371ffdc9f33 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdaterParameters.java @@ -0,0 +1,25 @@ +package org.opentripplanner.ext.vehicleparking.noi; + +import java.net.URI; +import java.time.Duration; +import org.opentripplanner.updater.spi.HttpHeaders; +import org.opentripplanner.updater.vehicle_parking.VehicleParkingSourceType; +import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters; + +/** + * Class that extends {@link VehicleParkingUpdaterParameters} with parameters required by {@link + * NoiUpdater}. + */ +public record NoiUpdaterParameters( + String configRef, + URI url, + String feedId, + Duration frequency, + HttpHeaders httpHeaders +) + implements VehicleParkingUpdaterParameters { + @Override + public VehicleParkingSourceType sourceType() { + return VehicleParkingSourceType.NOI_OPEN_DATA_HUB; + } +} diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java index e5b0fd083dc..6ebd34e1287 100644 --- a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java +++ b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java @@ -120,9 +120,10 @@ public class VehicleParking implements Serializable { VehicleParkingSpaces availability, VehicleParkingGroup vehicleParkingGroup ) { - this.id = id; + this.id = + Objects.requireNonNull(id, "%s must have an ID".formatted(this.getClass().getSimpleName())); this.name = name; - this.coordinate = coordinate; + this.coordinate = Objects.requireNonNull(coordinate); this.detailsUrl = detailsUrl; this.imageUrl = imageUrl; this.tags = tags; diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java index 6caf9082cff..70b8e261ee4 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/OtpVersion.java @@ -10,7 +10,8 @@ public enum OtpVersion { V2_2("2.2"), V2_3("2.3"), V2_4("2.4"), - V2_5("2.5"); + V2_5("2.5"), + V2_6("2.6"); private final String text; diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java index e808ad6905c..f0306941547 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java @@ -2,6 +2,7 @@ import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_6; import java.time.Duration; import java.time.ZoneId; @@ -9,6 +10,7 @@ import java.util.Set; import org.opentripplanner.ext.vehicleparking.bikely.BikelyUpdaterParameters; import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdaterParameters; +import org.opentripplanner.ext.vehicleparking.noi.NoiUpdaterParameters; import org.opentripplanner.ext.vehicleparking.parkapi.ParkAPIUpdaterParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.updater.vehicle_parking.VehicleParkingSourceType; @@ -50,7 +52,7 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap ); case PARK_API, BICYCLE_PARK_API -> new ParkAPIUpdaterParameters( updaterRef, - c.of("url").since(V2_2).summary("URL of the resource.").asString(null), + c.of("url").since(V2_2).summary("URL of the resource.").asString(), feedId, c .of("frequency") @@ -66,7 +68,7 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap ); case BIKELY -> new BikelyUpdaterParameters( updaterRef, - c.of("url").since(V2_3).summary("URL of the locations endpoint.").asUri(null), + c.of("url").since(V2_3).summary("URL of the locations endpoint.").asUri(), feedId, c .of("frequency") @@ -75,6 +77,17 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap .asDuration(Duration.ofMinutes(1)), HttpHeadersConfig.headers(c, V2_3) ); + case NOI_OPEN_DATA_HUB -> new NoiUpdaterParameters( + updaterRef, + c.of("url").since(V2_6).summary("URL of the locations endpoint.").asUri(), + feedId, + c + .of("frequency") + .since(V2_6) + .summary("How often to update the source.") + .asDuration(Duration.ofMinutes(1)), + HttpHeadersConfig.headers(c, V2_6) + ); }; } diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java index e0214fd9d57..3fe465a8cd5 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java @@ -4,6 +4,8 @@ import org.opentripplanner.ext.vehicleparking.bikely.BikelyUpdaterParameters; import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdater; import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdaterParameters; +import org.opentripplanner.ext.vehicleparking.noi.NoiUpdater; +import org.opentripplanner.ext.vehicleparking.noi.NoiUpdaterParameters; import org.opentripplanner.ext.vehicleparking.parkapi.BicycleParkAPIUpdater; import org.opentripplanner.ext.vehicleparking.parkapi.CarParkAPIUpdater; import org.opentripplanner.ext.vehicleparking.parkapi.ParkAPIUpdaterParameters; @@ -36,6 +38,7 @@ public static DataSource create( openingHoursCalendarService ); case BIKELY -> new BikelyUpdater((BikelyUpdaterParameters) parameters); + case NOI_OPEN_DATA_HUB -> new NoiUpdater((NoiUpdaterParameters) parameters); }; } } diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java index 583bc9afc99..3a0cb7d31b3 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java @@ -5,4 +5,5 @@ public enum VehicleParkingSourceType { BICYCLE_PARK_API, HSL_PARK, BIKELY, + NOI_OPEN_DATA_HUB, } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index f630e0cee3c..e9121a3248d 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -130,6 +130,7 @@ static void setup() { VehicleParking .builder() .id(id("parking-1")) + .coordinate(WgsCoordinate.GREENWICH) .name(NonLocalizedString.ofNullable("parking")) .build() ), diff --git a/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java b/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java index 95f4df79b7b..23f4ffc72ca 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/VehicleParkingLinkingTest.java @@ -9,7 +9,6 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.routing.graph.Graph; -import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingHelper; import org.opentripplanner.routing.vehicle_parking.VehicleParkingTestGraphData; import org.opentripplanner.street.model.StreetTraversalPermission; @@ -46,8 +45,8 @@ public void setup() { @Test public void entranceWithVertexLinkingTest() { - var parking = VehicleParking - .builder() + var parking = StreetModelForTest + .vehicleParking() .entrance(builder -> builder.entranceId(id("1")).coordinate(new WgsCoordinate(A.getCoordinate())).vertex(A) ) @@ -65,8 +64,8 @@ public void entranceWithVertexLinkingTest() { @Test public void entranceWithoutVertexLinkingTest() { - var parking = VehicleParking - .builder() + var parking = StreetModelForTest + .vehicleParking() .entrance(builder -> builder .entranceId(id("1")) @@ -99,8 +98,8 @@ public void carParkingEntranceToAllTraversableStreetLinkingTest() { StreetModelForTest.streetEdge(A, C, StreetTraversalPermission.NONE); - var parking = VehicleParking - .builder() + var parking = StreetModelForTest + .vehicleParking() .entrance(builder -> builder .entranceId(id("1")) @@ -123,9 +122,8 @@ public void carParkingEntranceToAllTraversableStreetLinkingTest() { @Test public void removeEntranceWithNonExistingVertexTest() { - var vehicleParking = VehicleParking - .builder() - .id(id("VP")) + var vehicleParking = StreetModelForTest + .vehicleParking() .bicyclePlaces(true) .entrance(builder -> builder @@ -159,9 +157,8 @@ public void removeEntranceWithNonExistingVertexTest() { @Test public void removeVehicleParkingWithOneEntranceAndNonExistingVertexTest() { - var vehicleParking = VehicleParking - .builder() - .id(id("VP")) + var vehicleParking = StreetModelForTest + .vehicleParking() .bicyclePlaces(true) .entrance(builder -> builder diff --git a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java index 9c80cb9cda9..90bdeb015a4 100644 --- a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java +++ b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelperTest.java @@ -10,6 +10,7 @@ import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.vehicle_parking.VehicleParking.VehicleParkingEntranceCreator; +import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.model.edge.VehicleParkingEdge; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -41,8 +42,8 @@ void linkThreeVerticesTest() { @Test void linkSkippingEdgesTest() { Graph graph = new Graph(); - var vehicleParking = VehicleParking - .builder() + var vehicleParking = StreetModelForTest + .vehicleParking() .entrances( IntStream .rangeClosed(1, 3) @@ -67,8 +68,8 @@ void linkSkippingEdgesTest() { } private VehicleParking createParingWithEntrances(int entranceNumber) { - return VehicleParking - .builder() + return StreetModelForTest + .vehicleParking() .bicyclePlaces(true) .entrances( IntStream diff --git a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java index 078d7350dcc..fca20322ebe 100644 --- a/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java +++ b/src/test/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingTestUtil.java @@ -2,6 +2,7 @@ import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.transit.model.framework.FeedScopedId; public class VehicleParkingTestUtil { @@ -25,8 +26,8 @@ public static VehicleParking createParkingWithEntrances( .coordinate(new WgsCoordinate(y, x)) .walkAccessible(true); - return VehicleParking - .builder() + return StreetModelForTest + .vehicleParking() .id(new FeedScopedId(TEST_FEED_ID, id)) .bicyclePlaces(true) .capacity(vehiclePlaces) diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java index d50c8a74dfc..141331e80cd 100644 --- a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java +++ b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java @@ -9,6 +9,7 @@ import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder; import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex; import org.opentripplanner.street.model.RentalFormFactor; @@ -111,4 +112,8 @@ public static VehicleRentalPlaceVertex rentalVertex(RentalFormFactor formFactor) } return new VehicleRentalPlaceVertex(rentalVehicleBuilder.build()); } + + public static VehicleParking.VehicleParkingBuilder vehicleParking() { + return VehicleParking.builder().id(id("vehicle-parking-1")).coordinate(WgsCoordinate.GREENWICH); + } } diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java index 7dad61fbd6b..81bee23ad54 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingEdgeTest.java @@ -10,6 +10,7 @@ import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; +import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; @@ -130,8 +131,8 @@ private VehicleParking createVehicleParking( boolean carPlaces, VehicleParkingSpaces availability ) { - return VehicleParking - .builder() + return StreetModelForTest + .vehicleParking() .id(TransitModelForTest.id("VehicleParking")) .bicyclePlaces(bicyclePlaces) .carPlaces(carPlaces) diff --git a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java index 5969121b6d6..579ae4e964d 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/VehicleParkingPreferredTagsTest.java @@ -11,9 +11,9 @@ import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingEntrance; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; +import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.request.StreetSearchRequest; @@ -62,9 +62,8 @@ private void runTest( double expectedCost, boolean arriveBy ) { - var parking = VehicleParking - .builder() - .coordinate(COORDINATE) + var parking = StreetModelForTest + .vehicleParking() .tags(parkingTags) .availability(VehicleParkingSpaces.builder().bicycleSpaces(100).build()) .bicyclePlaces(true) diff --git a/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java b/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java index 2bcb49defae..a31b5cfb387 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdaterTest.java @@ -16,6 +16,7 @@ import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; import org.opentripplanner.routing.vehicle_parking.VehicleParkingTestGraphData; import org.opentripplanner.routing.vehicle_parking.VehicleParkingTestUtil; +import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.model.edge.StreetVehicleParkingLink; import org.opentripplanner.street.model.edge.VehicleParkingEdge; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; @@ -142,7 +143,10 @@ void deleteVehicleParkingTest() { @Test void addNotOperatingVehicleParkingTest() { - var vehicleParking = VehicleParking.builder().state(VehicleParkingState.CLOSED).build(); + var vehicleParking = StreetModelForTest + .vehicleParking() + .state(VehicleParkingState.CLOSED) + .build(); when(dataSource.getUpdates()).thenReturn(List.of(vehicleParking)); runUpdaterOnce(); @@ -155,8 +159,8 @@ void addNotOperatingVehicleParkingTest() { void updateNotOperatingVehicleParkingTest() { var vehiclePlaces = VehicleParkingSpaces.builder().bicycleSpaces(1).build(); - var vehicleParking = VehicleParking - .builder() + var vehicleParking = StreetModelForTest + .vehicleParking() .availability(vehiclePlaces) .state(VehicleParkingState.CLOSED) .build(); @@ -175,8 +179,8 @@ void updateNotOperatingVehicleParkingTest() { vehiclePlaces = VehicleParkingSpaces.builder().bicycleSpaces(2).build(); vehicleParking = - VehicleParking - .builder() + StreetModelForTest + .vehicleParking() .availability(vehiclePlaces) .state(VehicleParkingState.CLOSED) .build(); @@ -194,7 +198,10 @@ void updateNotOperatingVehicleParkingTest() { @Test void deleteNotOperatingVehicleParkingTest() { - var vehicleParking = VehicleParking.builder().state(VehicleParkingState.CLOSED).build(); + var vehicleParking = StreetModelForTest + .vehicleParking() + .state(VehicleParkingState.CLOSED) + .build(); when(dataSource.getUpdates()).thenReturn(List.of(vehicleParking)); runUpdaterOnce(); From 999f28b5224d2ad352497fba6acd8983eb38d457 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 17:20:52 +0100 Subject: [PATCH 0884/1688] Update docs --- doc-templates/VehicleParking.md | 7 +- docs/sandbox/VehicleParking.md | 64 ++++++++++++++++++- .../standalone/config/router-config.json | 6 ++ 3 files changed, 75 insertions(+), 2 deletions(-) diff --git a/doc-templates/VehicleParking.md b/doc-templates/VehicleParking.md index 37988ef7902..50bd8806267 100644 --- a/doc-templates/VehicleParking.md +++ b/doc-templates/VehicleParking.md @@ -3,7 +3,7 @@ ## Contact Info - For HSL Park and Ride updater: Digitransit team, HSL, Helsinki, Finland -- For Bikely updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) +- For Bikely and NOI updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) ## Documentation @@ -16,6 +16,7 @@ Currently contains the following updaters: - [HSL Park and Ride](https://p.hsl.fi/docs/index.html) - [ParkAPI](https://github.com/offenesdresden/ParkAPI) - [Bikely](https://www.safebikely.com/) +- [NOI Open Data Hub](https://opendatahub.com/) ### Configuration @@ -39,6 +40,10 @@ All updaters have the following parameters in common: +## NOI Open Data Hub + + + ## Changelog diff --git a/docs/sandbox/VehicleParking.md b/docs/sandbox/VehicleParking.md index 8a659446516..2721fff9b0c 100644 --- a/docs/sandbox/VehicleParking.md +++ b/docs/sandbox/VehicleParking.md @@ -3,7 +3,7 @@ ## Contact Info - For HSL Park and Ride updater: Digitransit team, HSL, Helsinki, Finland -- For Bikely updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) +- For Bikely and NOI updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) ## Documentation @@ -16,6 +16,7 @@ Currently contains the following updaters: - [HSL Park and Ride](https://p.hsl.fi/docs/index.html) - [ParkAPI](https://github.com/offenesdresden/ParkAPI) - [Bikely](https://www.safebikely.com/) +- [NOI Open Data Hub](https://opendatahub.com/) ### Configuration @@ -250,6 +251,67 @@ HTTP headers to add to the request. Any header key, value can be inserted. +## NOI Open Data Hub + + + + +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|---------------------------------|:---------------:|----------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [feedId](#u__5__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | +| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.6 | +| [sourceType](#u__5__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | +| url | `uri` | URL of the locations endpoint. | *Required* | | 2.6 | +| [headers](#u__5__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.6 | + + +#### Details + +

      feedId

      + +**Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /updaters/[5] + +The name of the data source. + +This will end up in the API responses as the feed id of of the parking lot. + +

      sourceType

      + +**Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` +**Path:** /updaters/[5] +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` + +The source of the vehicle updates. + +

      headers

      + +**Since version:** `2.6` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` +**Path:** /updaters/[5] + +HTTP headers to add to the request. Any header key, value can be inserted. + + + +##### Example configuration + +```JSON +// router-config.json +{ + "updaters" : [ + { + "type" : "vehicle-parking", + "feedId" : "noi", + "sourceType" : "noi-open-data-hub", + "url" : "https://parking.otp.opendatahub.com/parking/all.json" + } + ] +} +``` + + + ## Changelog diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index 3a07cddfeb8..f5eaa1f942b 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -334,6 +334,12 @@ "Authorization": "${BIKELY_AUTHORIZATION}" } }, + { + "type": "vehicle-parking", + "feedId": "noi", + "sourceType": "noi-open-data-hub", + "url": "https://parking.otp.opendatahub.com/parking/all.json" + }, { "type": "stop-time-updater", "frequency": "1m", From 95c4f6c27f26d0e11b925f35d2ec587544168fee Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 26 Mar 2024 09:57:07 +0100 Subject: [PATCH 0885/1688] Add nicer toString --- docs/RouterConfiguration.md | 6 +++ docs/UpdaterConfig.md | 36 +++++++------- docs/sandbox/siri/SiriAzureUpdater.md | 48 +++++++++---------- docs/sandbox/siri/SiriUpdater.md | 46 +++++++++--------- .../ext/vehicleparking/noi/NoiUpdater.java | 18 +++++-- .../VehicleParkingUpdater.java | 8 +++- 6 files changed, 91 insertions(+), 71 deletions(-) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 503b8c7370f..e0f1d81b590 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -764,6 +764,12 @@ Used to group requests when monitoring OTP. "Authorization" : "${BIKELY_AUTHORIZATION}" } }, + { + "type" : "vehicle-parking", + "feedId" : "noi", + "sourceType" : "noi-open-data-hub", + "url" : "https://parking.otp.opendatahub.com/parking/all.json" + }, { "type" : "stop-time-updater", "frequency" : "1m", diff --git a/docs/UpdaterConfig.md b/docs/UpdaterConfig.md index 973874be66a..3e0907f60ad 100644 --- a/docs/UpdaterConfig.md +++ b/docs/UpdaterConfig.md @@ -92,20 +92,20 @@ The information is downloaded in a single HTTP request and polled regularly. | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |-----------------------------------------------------------------------|:---------------:|----------------------------------------------------------------------------|:----------:|----------------------|:-----:| | type = "stop-time-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [backwardsDelayPropagationType](#u__5__backwardsDelayPropagationType) | `enum` | How backwards propagation should be handled. | *Optional* | `"required-no-data"` | 2.2 | +| [backwardsDelayPropagationType](#u__6__backwardsDelayPropagationType) | `enum` | How backwards propagation should be handled. | *Optional* | `"required-no-data"` | 2.2 | | feedId | `string` | Which feed the updates apply to. | *Required* | | 1.5 | | frequency | `duration` | How often the data should be downloaded. | *Optional* | `"PT1M"` | 1.5 | | fuzzyTripMatching | `boolean` | If the trips should be matched fuzzily. | *Optional* | `false` | 1.5 | -| [url](#u__5__url) | `string` | The URL of the GTFS-RT resource. | *Required* | | 1.5 | -| [headers](#u__5__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [url](#u__6__url) | `string` | The URL of the GTFS-RT resource. | *Required* | | 1.5 | +| [headers](#u__6__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

      backwardsDelayPropagationType

      +

      backwardsDelayPropagationType

      **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"required-no-data"` -**Path:** /updaters/[5] +**Path:** /updaters/[6] **Enum values:** `required-no-data` | `required` | `always` How backwards propagation should be handled. @@ -124,19 +124,19 @@ How backwards propagation should be handled. The updated times are exposed through APIs. -

      url

      +

      url

      **Since version:** `1.5` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /updaters/[5] +**Path:** /updaters/[6] The URL of the GTFS-RT resource. `file:` URLs are also supported if you want to read a file from the local disk. -

      headers

      +

      headers

      **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[5] +**Path:** /updaters/[6] HTTP headers to add to the request. Any header key, value can be inserted. @@ -178,7 +178,7 @@ This system powers the realtime updates in Helsinki and more information can be | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |-----------------------------------------------------------------------|:---------:|----------------------------------------------|:----------:|----------------------|:-----:| | type = "mqtt-gtfs-rt-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [backwardsDelayPropagationType](#u__6__backwardsDelayPropagationType) | `enum` | How backwards propagation should be handled. | *Optional* | `"required-no-data"` | 2.2 | +| [backwardsDelayPropagationType](#u__7__backwardsDelayPropagationType) | `enum` | How backwards propagation should be handled. | *Optional* | `"required-no-data"` | 2.2 | | feedId | `string` | The feed id to apply the updates to. | *Required* | | 2.0 | | fuzzyTripMatching | `boolean` | Whether to match trips fuzzily. | *Optional* | `false` | 2.0 | | qos | `integer` | QOS level. | *Optional* | `0` | 2.0 | @@ -188,10 +188,10 @@ This system powers the realtime updates in Helsinki and more information can be ##### Parameter details -

      backwardsDelayPropagationType

      +

      backwardsDelayPropagationType

      **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"required-no-data"` -**Path:** /updaters/[6] +**Path:** /updaters/[7] **Enum values:** `required-no-data` | `required` | `always` How backwards propagation should be handled. @@ -247,24 +247,24 @@ The information is downloaded in a single HTTP request and polled regularly. | frequency | `duration` | How often the positions should be updated. | *Optional* | `"PT1M"` | 2.2 | | fuzzyTripMatching | `boolean` | Whether to match trips fuzzily. | *Optional* | `false` | 2.5 | | url | `uri` | The URL of GTFS-RT protobuf HTTP resource to download the positions from. | *Required* | | 2.2 | -| [features](#u__7__features) | `enum set` | Which features of GTFS RT vehicle positions should be loaded into OTP. | *Optional* | | 2.5 | -| [headers](#u__7__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [features](#u__8__features) | `enum set` | Which features of GTFS RT vehicle positions should be loaded into OTP. | *Optional* | | 2.5 | +| [headers](#u__8__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

      features

      +

      features

      **Since version:** `2.5` ∙ **Type:** `enum set` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[7] +**Path:** /updaters/[8] **Enum values:** `position` | `stop-position` | `occupancy` Which features of GTFS RT vehicle positions should be loaded into OTP. -

      headers

      +

      headers

      **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[7] +**Path:** /updaters/[8] HTTP headers to add to the request. Any header key, value can be inserted. diff --git a/docs/sandbox/siri/SiriAzureUpdater.md b/docs/sandbox/siri/SiriAzureUpdater.md index 3b5c536946d..c6ddf9f3ebe 100644 --- a/docs/sandbox/siri/SiriAzureUpdater.md +++ b/docs/sandbox/siri/SiriAzureUpdater.md @@ -24,14 +24,14 @@ To enable the SIRI updater you need to add it to the updaters section of the `ro | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |------------------------------------------------------------|:----------:|------------------------------------------------------------------|:----------:|---------------------|:-----:| | type = "siri-azure-et-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [authenticationType](#u__11__authenticationType) | `enum` | Which authentication type to use | *Optional* | `"sharedaccesskey"` | 2.5 | +| [authenticationType](#u__12__authenticationType) | `enum` | Which authentication type to use | *Optional* | `"sharedaccesskey"` | 2.5 | | autoDeleteOnIdle | `duration` | The time after which an inactive subscription is removed. | *Optional* | `"PT1H"` | 2.5 | -| [customMidnight](#u__11__customMidnight) | `integer` | Time on which time breaks into new day. | *Optional* | `0` | 2.2 | +| [customMidnight](#u__12__customMidnight) | `integer` | Time on which time breaks into new day. | *Optional* | `0` | 2.2 | | feedId | `string` | The ID of the feed to apply the updates to. | *Optional* | | 2.2 | -| [fullyQualifiedNamespace](#u__11__fullyQualifiedNamespace) | `string` | Service Bus fully qualified namespace used for authentication. | *Optional* | | 2.5 | +| [fullyQualifiedNamespace](#u__12__fullyQualifiedNamespace) | `string` | Service Bus fully qualified namespace used for authentication. | *Optional* | | 2.5 | | fuzzyTripMatching | `boolean` | Whether to apply fuzzyTripMatching on the updates | *Optional* | `false` | 2.2 | | prefetchCount | `integer` | The number of messages to fetch from the subscription at a time. | *Optional* | `10` | 2.5 | -| [servicebus-url](#u__11__servicebus_url) | `string` | Service Bus connection used for authentication. | *Optional* | | 2.2 | +| [servicebus-url](#u__12__servicebus_url) | `string` | Service Bus connection used for authentication. | *Optional* | | 2.2 | | topic | `string` | Service Bus topic to connect to. | *Optional* | | 2.2 | | history | `object` | Configuration for fetching historical data on startup | *Optional* | | 2.2 | |    fromDateTime | `string` | Datetime boundary for historical data | *Optional* | `"-P1D"` | 2.2 | @@ -41,36 +41,36 @@ To enable the SIRI updater you need to add it to the updaters section of the `ro ##### Parameter details -

      authenticationType

      +

      authenticationType

      **Since version:** `2.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"sharedaccesskey"` -**Path:** /updaters/[11] +**Path:** /updaters/[12] **Enum values:** `sharedaccesskey` | `federatedidentity` Which authentication type to use -

      customMidnight

      +

      customMidnight

      **Since version:** `2.2` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` -**Path:** /updaters/[11] +**Path:** /updaters/[12] Time on which time breaks into new day. It is common that operating day date breaks a little bit later than midnight so that the switch happens when traffic is at the lowest point. Parameter uses 24-hour format. If the switch happens on 4 am then set this field to 4. -

      fullyQualifiedNamespace

      +

      fullyQualifiedNamespace

      **Since version:** `2.5` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[11] +**Path:** /updaters/[12] Service Bus fully qualified namespace used for authentication. Has to be present for authenticationMethod FederatedIdentity. -

      servicebus-url

      +

      servicebus-url

      **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[11] +**Path:** /updaters/[12] Service Bus connection used for authentication. @@ -112,14 +112,14 @@ Has to be present for authenticationMethod SharedAccessKey. This should be Prima | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |------------------------------------------------------------|:----------:|------------------------------------------------------------------|:----------:|---------------------|:-----:| | type = "siri-azure-sx-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [authenticationType](#u__10__authenticationType) | `enum` | Which authentication type to use | *Optional* | `"sharedaccesskey"` | 2.5 | +| [authenticationType](#u__11__authenticationType) | `enum` | Which authentication type to use | *Optional* | `"sharedaccesskey"` | 2.5 | | autoDeleteOnIdle | `duration` | The time after which an inactive subscription is removed. | *Optional* | `"PT1H"` | 2.5 | -| [customMidnight](#u__10__customMidnight) | `integer` | Time on which time breaks into new day. | *Optional* | `0` | 2.2 | +| [customMidnight](#u__11__customMidnight) | `integer` | Time on which time breaks into new day. | *Optional* | `0` | 2.2 | | feedId | `string` | The ID of the feed to apply the updates to. | *Optional* | | 2.2 | -| [fullyQualifiedNamespace](#u__10__fullyQualifiedNamespace) | `string` | Service Bus fully qualified namespace used for authentication. | *Optional* | | 2.5 | +| [fullyQualifiedNamespace](#u__11__fullyQualifiedNamespace) | `string` | Service Bus fully qualified namespace used for authentication. | *Optional* | | 2.5 | | fuzzyTripMatching | `boolean` | Whether to apply fuzzyTripMatching on the updates | *Optional* | `false` | 2.2 | | prefetchCount | `integer` | The number of messages to fetch from the subscription at a time. | *Optional* | `10` | 2.5 | -| [servicebus-url](#u__10__servicebus_url) | `string` | Service Bus connection used for authentication. | *Optional* | | 2.2 | +| [servicebus-url](#u__11__servicebus_url) | `string` | Service Bus connection used for authentication. | *Optional* | | 2.2 | | topic | `string` | Service Bus topic to connect to. | *Optional* | | 2.2 | | history | `object` | Configuration for fetching historical data on startup | *Optional* | | 2.2 | |    fromDateTime | `string` | Datetime boundary for historical data. | *Optional* | `"-P1D"` | 2.2 | @@ -130,36 +130,36 @@ Has to be present for authenticationMethod SharedAccessKey. This should be Prima ##### Parameter details -

      authenticationType

      +

      authenticationType

      **Since version:** `2.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"sharedaccesskey"` -**Path:** /updaters/[10] +**Path:** /updaters/[11] **Enum values:** `sharedaccesskey` | `federatedidentity` Which authentication type to use -

      customMidnight

      +

      customMidnight

      **Since version:** `2.2` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `0` -**Path:** /updaters/[10] +**Path:** /updaters/[11] Time on which time breaks into new day. It is common that operating day date breaks a little bit later than midnight so that the switch happens when traffic is at the lowest point. Parameter uses 24-hour format. If the switch happens on 4 am then set this field to 4. -

      fullyQualifiedNamespace

      +

      fullyQualifiedNamespace

      **Since version:** `2.5` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[10] +**Path:** /updaters/[11] Service Bus fully qualified namespace used for authentication. Has to be present for authenticationMethod FederatedIdentity. -

      servicebus-url

      +

      servicebus-url

      **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[10] +**Path:** /updaters/[11] Service Bus connection used for authentication. diff --git a/docs/sandbox/siri/SiriUpdater.md b/docs/sandbox/siri/SiriUpdater.md index f6c4c3f999f..72ab45d0f39 100644 --- a/docs/sandbox/siri/SiriUpdater.md +++ b/docs/sandbox/siri/SiriUpdater.md @@ -37,16 +37,16 @@ To enable the SIRI updater you need to add it to the updaters section of the `ro | previewInterval | `duration` | TODO | *Optional* | | 2.0 | | requestorRef | `string` | The requester reference. | *Optional* | | 2.0 | | timeout | `duration` | The HTTP timeout to download the updates. | *Optional* | `"PT15S"` | 2.0 | -| [url](#u__8__url) | `string` | The URL to send the HTTP requests to. | *Required* | | 2.0 | -| [headers](#u__8__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| [url](#u__9__url) | `string` | The URL to send the HTTP requests to. | *Required* | | 2.0 | +| [headers](#u__9__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

      url

      +

      url

      **Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /updaters/[8] +**Path:** /updaters/[9] The URL to send the HTTP requests to. @@ -58,10 +58,10 @@ renamed by the loader when processed: -

      headers

      +

      headers

      **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[8] +**Path:** /updaters/[9] HTTP headers to add to the request. Any header key, value can be inserted. @@ -93,25 +93,25 @@ HTTP headers to add to the request. Any header key, value can be inserted. -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|---------------------------------|:---------------:|--------------------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| -| type = "siri-sx-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | -| blockReadinessUntilInitialized | `boolean` | Whether catching up with the updates should block the readiness check from returning a 'ready' result. | *Optional* | `false` | 2.0 | -| [earlyStart](#u__9__earlyStart) | `duration` | This value is subtracted from the actual validity defined in the message. | *Optional* | `"PT0S"` | 2.0 | -| feedId | `string` | The ID of the feed to apply the updates to. | *Required* | | 2.0 | -| frequency | `duration` | How often the updates should be retrieved. | *Optional* | `"PT1M"` | 2.0 | -| requestorRef | `string` | The requester reference. | *Optional* | | 2.0 | -| timeout | `duration` | The HTTP timeout to download the updates. | *Optional* | `"PT15S"` | 2.0 | -| [url](#u__9__url) | `string` | The URL to send the HTTP requests to. Supports http/https and file protocol. | *Required* | | 2.0 | -| [headers](#u__9__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|----------------------------------|:---------------:|--------------------------------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "siri-sx-updater" | `enum` | The type of the updater. | *Required* | | 1.5 | +| blockReadinessUntilInitialized | `boolean` | Whether catching up with the updates should block the readiness check from returning a 'ready' result. | *Optional* | `false` | 2.0 | +| [earlyStart](#u__10__earlyStart) | `duration` | This value is subtracted from the actual validity defined in the message. | *Optional* | `"PT0S"` | 2.0 | +| feedId | `string` | The ID of the feed to apply the updates to. | *Required* | | 2.0 | +| frequency | `duration` | How often the updates should be retrieved. | *Optional* | `"PT1M"` | 2.0 | +| requestorRef | `string` | The requester reference. | *Optional* | | 2.0 | +| timeout | `duration` | The HTTP timeout to download the updates. | *Optional* | `"PT15S"` | 2.0 | +| [url](#u__10__url) | `string` | The URL to send the HTTP requests to. Supports http/https and file protocol. | *Required* | | 2.0 | +| [headers](#u__10__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | ##### Parameter details -

      earlyStart

      +

      earlyStart

      **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` -**Path:** /updaters/[9] +**Path:** /updaters/[10] This value is subtracted from the actual validity defined in the message. @@ -119,10 +119,10 @@ Normally the planned departure time is used, so setting this to 10s will cause t SX-message to be included in trip-results 10 seconds before the the planned departure time. -

      url

      +

      url

      **Since version:** `2.0` ∙ **Type:** `string` ∙ **Cardinality:** `Required` -**Path:** /updaters/[9] +**Path:** /updaters/[10] The URL to send the HTTP requests to. Supports http/https and file protocol. @@ -135,10 +135,10 @@ renamed by the loader when processed: -

      headers

      +

      headers

      **Since version:** `2.3` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` -**Path:** /updaters/[9] +**Path:** /updaters/[10] HTTP headers to add to the request. Any header key, value can be inserted. diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java index 9bd64d9612f..d5ef7e63d13 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/noi/NoiUpdater.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.databind.JsonNode; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; @@ -15,12 +16,11 @@ public class NoiUpdater extends GenericJsonDataSource { private static final String JSON_PARSE_PATH = "data/stations"; - - private final String feedId; + private final NoiUpdaterParameters params; public NoiUpdater(NoiUpdaterParameters parameters) { super(parameters.url().toString(), JSON_PARSE_PATH, parameters.httpHeaders()); - this.feedId = parameters.feedId(); + this.params = parameters; } @Override @@ -38,14 +38,14 @@ protected VehicleParking parseElement(JsonNode jsonNode) { throw new IllegalArgumentException("Unknown type '%s'".formatted(type)); } - var vehicleParkId = new FeedScopedId(feedId, jsonNode.path("station_id").asText()); + var vehicleParkId = new FeedScopedId(params.feedId(), jsonNode.path("station_id").asText()); var name = new NonLocalizedString(jsonNode.path("name").asText()); double lat = jsonNode.path("lat").asDouble(); double lon = jsonNode.path("lon").asDouble(); var coordinate = new WgsCoordinate(lat, lon); VehicleParking.VehicleParkingEntranceCreator entrance = builder -> builder - .entranceId(new FeedScopedId(feedId, vehicleParkId.getId() + "/entrance")) + .entranceId(new FeedScopedId(params.feedId(), vehicleParkId.getId() + "/entrance")) .coordinate(coordinate) .walkAccessible(true) .carAccessible(true); @@ -66,4 +66,12 @@ protected VehicleParking parseElement(JsonNode jsonNode) { private static VehicleParkingSpaces extractSpaces(JsonNode jsonNode, String free) { return VehicleParkingSpaces.builder().carSpaces(jsonNode.get(free).asInt()).build(); } + + @Override + public String toString() { + return ToStringBuilder + .of(this.getClass()) + .addStr("url", this.params.url().toString()) + .toString(); + } } diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java index 3d2e9b21e29..185de6bddb7 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingUpdater.java @@ -8,6 +8,7 @@ import java.util.Set; import java.util.function.Function; import java.util.stream.Collectors; +import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.linking.DisposableEdgeCollection; import org.opentripplanner.routing.linking.LinkingDirection; @@ -68,7 +69,7 @@ public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) { } @Override - protected void runPolling() throws Exception { + protected void runPolling() { LOG.debug("Updating vehicle parkings from {}", source); if (!source.update()) { LOG.debug("No updates"); @@ -239,4 +240,9 @@ private void removeVehicleParkingEdgesFromGraph( graph.remove(entranceVertex); } } + + @Override + public String toString() { + return ToStringBuilder.of(this.getClass()).addObj("source", source).toString(); + } } From 8ffb073aa190d0a81172fed3d6fe5d4199cc670b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 14:27:19 +0000 Subject: [PATCH 0886/1688] Update dependency com.graphql-java:graphql-java to v21.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f3e2a02692..f661ad80fee 100644 --- a/pom.xml +++ b/pom.xml @@ -866,7 +866,7 @@ com.graphql-java graphql-java - 21.4 + 21.5 com.graphql-java From 1893244957ba67acc4616136ca9bcff9ca51e359 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 00:15:10 +0000 Subject: [PATCH 0887/1688] Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7f3e2a02692..0138a4950fa 100644 --- a/pom.xml +++ b/pom.xml @@ -1007,7 +1007,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.1 + 3.2.2 sign-artifacts From aebead92b2e822a6fafd4ae797aaba7c8752de43 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 27 Mar 2024 22:41:04 +0100 Subject: [PATCH 0888/1688] Correct x/y lat/lon confusion --- .../flex/AreaStopsToVerticesMapperTest.java | 62 ++++++++----------- .../_support/geometry/Coordinates.java | 19 ++++-- .../_support/geometry/Polygons.java | 12 ++-- .../framework/geometry/WgsCoordinateTest.java | 8 +-- .../framework/lang/StringUtilsTest.java | 2 + .../module/StreetLinkerModuleTest.java | 8 +-- .../core/TemporaryVerticesContainerTest.java | 4 +- .../model/_data/StreetModelForTest.java | 6 +- .../street/model/edge/StreetEdgeTest.java | 4 +- .../GeofencingVertexUpdaterTest.java | 21 ++++--- 10 files changed, 75 insertions(+), 71 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java index 9e95350020f..3b41cf9632d 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.jupiter.api.DynamicTest.dynamicTest; import static org.opentripplanner._support.geometry.Coordinates.BERLIN; import static org.opentripplanner._support.geometry.Coordinates.HAMBURG; import static org.opentripplanner.street.model.StreetTraversalPermission.ALL; @@ -13,9 +12,8 @@ import java.util.List; import java.util.Set; -import java.util.stream.Stream; -import org.junit.jupiter.api.DynamicTest; -import org.junit.jupiter.api.TestFactory; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.locationtech.jts.geom.Coordinate; import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.routing.graph.Graph; @@ -42,44 +40,38 @@ class AreaStopsToVerticesMapperTest { public static final TransitModel TRANSIT_MODEL = new TransitModel(STOP_MODEL, new Deduplicator()); - private final List testCases = List.of( - new TestCase(BERLIN, ALL, Set.of(BERLIN_AREA_STOP)), - new TestCase(BERLIN, PEDESTRIAN_AND_CAR, Set.of(BERLIN_AREA_STOP)), - new TestCase(BERLIN, BICYCLE_AND_CAR, Set.of()), - new TestCase(HAMBURG, ALL, Set.of()), - new TestCase(BERLIN, PEDESTRIAN, Set.of()), - new TestCase(HAMBURG, PEDESTRIAN, Set.of()), - new TestCase(BERLIN, CAR, Set.of()) - ); + static List testCases() { + return List.of( + new TestCase(BERLIN, ALL, Set.of(BERLIN_AREA_STOP)), + new TestCase(BERLIN, PEDESTRIAN_AND_CAR, Set.of(BERLIN_AREA_STOP)), + new TestCase(BERLIN, BICYCLE_AND_CAR, Set.of()), + new TestCase(HAMBURG, ALL, Set.of()), + new TestCase(BERLIN, PEDESTRIAN, Set.of()), + new TestCase(HAMBURG, PEDESTRIAN, Set.of()), + new TestCase(BERLIN, CAR, Set.of()) + ); + } - @TestFactory - Stream mapAreaStopsInVertex() { - return testCases - .stream() - .map(tc -> - dynamicTest( - tc.toString(), - () -> { - var graph = new Graph(); + @ParameterizedTest + @MethodSource("testCases") + void mapAreaStopsInVertex(TestCase tc) { + var graph = new Graph(); - var fromVertex = StreetModelForTest.intersectionVertex(tc.coordinate); - var toVertex = StreetModelForTest.intersectionVertex(tc.coordinate); + var fromVertex = StreetModelForTest.intersectionVertex(tc.coordinate); + var toVertex = StreetModelForTest.intersectionVertex(tc.coordinate); - var edge = StreetModelForTest.streetEdge(fromVertex, toVertex); - edge.setPermission(tc.permission); - fromVertex.addOutgoing(edge); + var edge = StreetModelForTest.streetEdge(fromVertex, toVertex); + edge.setPermission(tc.permission); + fromVertex.addOutgoing(edge); - graph.addVertex(fromVertex); - assertTrue(fromVertex.areaStops().isEmpty()); + graph.addVertex(fromVertex); + assertTrue(fromVertex.areaStops().isEmpty()); - var mapper = new AreaStopsToVerticesMapper(graph, TRANSIT_MODEL); + var mapper = new AreaStopsToVerticesMapper(graph, TRANSIT_MODEL); - mapper.buildGraph(); + mapper.buildGraph(); - assertEquals(tc.expectedAreaStops, fromVertex.areaStops()); - } - ) - ); + assertEquals(tc.expectedAreaStops, fromVertex.areaStops()); } private record TestCase( diff --git a/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java b/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java index 3e5bddd9f94..88fcdcf1160 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java @@ -4,9 +4,18 @@ public class Coordinates { - public static final Coordinate BERLIN = new Coordinate(52.5212, 13.4105); - public static final Coordinate BERLIN_BRANDENBURG_GATE = new Coordinate(52.51627, 13.37770); - public static final Coordinate HAMBURG = new Coordinate(53.5566, 10.0003); - public static final Coordinate KONGSBERG_PLATFORM_1 = new Coordinate(59.67216, 9.65107); - public static final Coordinate BOSTON = new Coordinate(42.36541, -71.06129); + public static final Coordinate BERLIN = of(52.5212, 13.4105); + public static final Coordinate BERLIN_BRANDENBURG_GATE = of(52.51627, 13.37770); + public static final Coordinate HAMBURG = of(53.5566, 10.0003); + public static final Coordinate KONGSBERG_PLATFORM_1 = of(59.67216, 9.65107); + public static final Coordinate BOSTON = of(42.36541, -71.06129); + + /** + * Because it is a frequent mistake to mistake x/y and longitude/latitude when + * constructing JTS Coordinates, this static factory method makes is clear + * which is which. + */ + public static Coordinate of(double latitude, double longitude) { + return new Coordinate(longitude, latitude); + } } diff --git a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java index efedd74499c..e3d153ea041 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java @@ -12,11 +12,11 @@ public class Polygons { .getGeometryFactory() .createPolygon( new Coordinate[] { - new Coordinate(52.616841, 13.224692810), - new Coordinate(52.6168419, 13.224692810), - new Coordinate(52.3915238, 13.646107734), - new Coordinate(52.616841, 13.646107734), - new Coordinate(52.616841, 13.224692810), + Coordinates.of(52.616841, 13.224692810), + Coordinates.of(52.616841, 13.646107734), + Coordinates.of(52.3915238, 13.646107734), + Coordinates.of(52.396421, 13.2268067), + Coordinates.of(52.616841, 13.224692810), } ); @@ -25,7 +25,7 @@ public static org.geojson.Polygon toGeoJson(Polygon polygon) { var coordinates = Arrays .stream(polygon.getCoordinates()) - .map(c -> new LngLatAlt(c.y, c.x)) + .map(c -> new LngLatAlt(c.x, c.y)) .toList(); ret.add(coordinates); diff --git a/src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java b/src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java index 05051ab7dff..5cd7ac66123 100644 --- a/src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java +++ b/src/test/java/org/opentripplanner/framework/geometry/WgsCoordinateTest.java @@ -109,15 +109,15 @@ void testGreenwich() { void roundingTo10m() { var hamburg = new WgsCoordinate(Coordinates.HAMBURG); var rounded = hamburg.roundToApproximate10m(); - assertEquals(10.0003, rounded.latitude()); - assertEquals(53.5566, rounded.longitude()); + assertEquals(10.0003, rounded.longitude()); + assertEquals(53.5566, rounded.latitude()); } @Test void roundingTo100m() { var hamburg = new WgsCoordinate(Coordinates.HAMBURG); var rounded = hamburg.roundToApproximate100m(); - assertEquals(10, rounded.latitude()); - assertEquals(53.557, rounded.longitude()); + assertEquals(10, rounded.longitude()); + assertEquals(53.557, rounded.latitude()); } } diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java index 0e67344b2bb..17ee3cbca6a 100644 --- a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java @@ -13,6 +13,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; +import org.opentripplanner._support.geometry.Polygons; class StringUtilsTest { @@ -77,6 +78,7 @@ void padCenter() { @Test void padRight() { + System.out.println(Polygons.BERLIN); assertEquals("ABC???", StringUtils.padRight("ABC", '?', 6)); assertEquals("??????", StringUtils.padRight(null, '?', 6)); assertEquals("ABC", StringUtils.padRight("ABC", '?', 3)); diff --git a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java index 96e71b9d3ec..4d2141eb38e 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java @@ -102,12 +102,12 @@ private static class TestModel { public TestModel() { var from = StreetModelForTest.intersectionVertex( - KONGSBERG_PLATFORM_1.x - DELTA, - KONGSBERG_PLATFORM_1.y - DELTA + KONGSBERG_PLATFORM_1.y - DELTA, + KONGSBERG_PLATFORM_1.x - DELTA ); var to = StreetModelForTest.intersectionVertex( - KONGSBERG_PLATFORM_1.x + DELTA, - KONGSBERG_PLATFORM_1.y + DELTA + KONGSBERG_PLATFORM_1.y + DELTA, + KONGSBERG_PLATFORM_1.x + DELTA ); Graph graph = new Graph(); diff --git a/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java b/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java index 49dc42e6f4c..c01558338a4 100644 --- a/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java +++ b/src/test/java/org/opentripplanner/routing/core/TemporaryVerticesContainerTest.java @@ -39,8 +39,8 @@ public class TemporaryVerticesContainerTest { private final Graph g = new Graph(new Deduplicator()); private final StreetVertex a = StreetModelForTest.intersectionVertex("A", 1.0, 1.0); - private final StreetVertex b = StreetModelForTest.intersectionVertex("B", 0.0, 1.0); - private final StreetVertex c = StreetModelForTest.intersectionVertex("C", 1.0, 0.0); + private final StreetVertex b = StreetModelForTest.intersectionVertex("B", 1.0, 0.0); + private final StreetVertex c = StreetModelForTest.intersectionVertex("C", 0.0, 1.0); private final List permanentVertexes = Arrays.asList(a, b, c); // - And travel *origin* is 0,4 degrees on the road from B to A private final GenericLocation from = new GenericLocation(1.0, 0.4); diff --git a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java index d50c8a74dfc..94ebaec73c4 100644 --- a/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java +++ b/src/test/java/org/opentripplanner/street/model/_data/StreetModelForTest.java @@ -29,16 +29,16 @@ public class StreetModelForTest { public static StreetVertex V4 = intersectionVertex("V4", 3, 3); public static IntersectionVertex intersectionVertex(Coordinate c) { - return intersectionVertex(c.x, c.y); + return intersectionVertex(c.y, c.x); } public static IntersectionVertex intersectionVertex(double lat, double lon) { var label = "%s_%s".formatted(lat, lon); - return new LabelledIntersectionVertex(label, lat, lon, false, false); + return new LabelledIntersectionVertex(label, lon, lat, false, false); } public static IntersectionVertex intersectionVertex(String label, double lat, double lon) { - return new LabelledIntersectionVertex(label, lat, lon, false, false); + return new LabelledIntersectionVertex(label, lon, lat, false, false); } @Nonnull diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java index 318f133f15e..7de7b0c7ce6 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetEdgeTest.java @@ -46,7 +46,7 @@ public class StreetEdgeTest { public void before() { v0 = intersectionVertex("maple_0th", 0.0, 0.0); // label, X, Y v1 = intersectionVertex("maple_1st", 2.0, 2.0); - v2 = intersectionVertex("maple_2nd", 1.0, 2.0); + v2 = intersectionVertex("maple_2nd", 2.0, 1.0); this.proto = StreetSearchRequest @@ -73,7 +73,7 @@ public void testInAndOutAngles() { assertEquals(90, e1.getOutAngle()); // 2 new ones - StreetVertex u = intersectionVertex("test1", 2.0, 1.0); + StreetVertex u = intersectionVertex("test1", 1.0, 2.0); StreetVertex v = intersectionVertex("test2", 2.0, 2.0); // Second edge, heading straight North diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java index 09dd1cf1cb9..bab86f8cd6f 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java @@ -12,6 +12,7 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.MultiPolygon; import org.locationtech.jts.geom.Polygon; +import org.opentripplanner._support.geometry.Coordinates; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.street.BusinessAreaBorder; @@ -40,21 +41,21 @@ class GeofencingVertexUpdaterTest { GeometryFactory fac = GeometryUtils.getGeometryFactory(); Polygon frognerPark = fac.createPolygon( new Coordinate[] { - new Coordinate(59.93112978539807, 10.691099320272173), - new Coordinate(59.92231848097069, 10.691099320272173), - new Coordinate(59.92231848097069, 10.711758464910503), - new Coordinate(59.92231848097069, 10.691099320272173), - new Coordinate(59.93112978539807, 10.691099320272173), + Coordinates.of(59.93112978539807, 10.691099320272173), + Coordinates.of(59.92231848097069, 10.691099320272173), + Coordinates.of(59.92231848097069, 10.711758464910503), + Coordinates.of(59.92231848097069, 10.691099320272173), + Coordinates.of(59.93112978539807, 10.691099320272173), } ); final GeofencingZone zone = new GeofencingZone(id("frogner-park"), frognerPark, true, false); Polygon osloPolygon = fac.createPolygon( new Coordinate[] { - new Coordinate(59.961055202323195, 10.62535658370308), - new Coordinate(59.889009435700416, 10.62535658370308), - new Coordinate(59.889009435700416, 10.849791142928694), - new Coordinate(59.961055202323195, 10.849791142928694), - new Coordinate(59.961055202323195, 10.62535658370308), + Coordinates.of(59.961055202323195, 10.62535658370308), + Coordinates.of(59.889009435700416, 10.62535658370308), + Coordinates.of(59.889009435700416, 10.849791142928694), + Coordinates.of(59.961055202323195, 10.849791142928694), + Coordinates.of(59.961055202323195, 10.62535658370308), } ); From e58a5a4f05ac1b828c9c06e3174bbd926616996d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 27 Mar 2024 22:46:48 +0100 Subject: [PATCH 0889/1688] Move polygons into separate class --- .../_support/geometry/Coordinates.java | 2 +- .../_support/geometry/Polygons.java | 41 ++++++++++++++----- .../framework/lang/StringUtilsTest.java | 1 - .../GeofencingVertexUpdaterTest.java | 33 ++++----------- 4 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java b/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java index 88fcdcf1160..5a4526012c9 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Coordinates.java @@ -11,7 +11,7 @@ public class Coordinates { public static final Coordinate BOSTON = of(42.36541, -71.06129); /** - * Because it is a frequent mistake to mistake x/y and longitude/latitude when + * Because it is a frequent mistake to swap x/y and longitude/latitude when * constructing JTS Coordinates, this static factory method makes is clear * which is which. */ diff --git a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java index e3d153ea041..c01921b12b6 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java @@ -3,22 +3,41 @@ import java.util.Arrays; import org.geojson.LngLatAlt; import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.Polygon; import org.opentripplanner.framework.geometry.GeometryUtils; public class Polygons { - public static final Polygon BERLIN = GeometryUtils - .getGeometryFactory() - .createPolygon( - new Coordinate[] { - Coordinates.of(52.616841, 13.224692810), - Coordinates.of(52.616841, 13.646107734), - Coordinates.of(52.3915238, 13.646107734), - Coordinates.of(52.396421, 13.2268067), - Coordinates.of(52.616841, 13.224692810), - } - ); + private static final GeometryFactory FAC = GeometryUtils.getGeometryFactory(); + public static final Polygon BERLIN = FAC.createPolygon( + new Coordinate[] { + Coordinates.of(52.616841, 13.224692810), + Coordinates.of(52.616841, 13.646107734), + Coordinates.of(52.3915238, 13.646107734), + Coordinates.of(52.396421, 13.2268067), + Coordinates.of(52.616841, 13.224692810), + } + ); + + public static Polygon OSLO = FAC.createPolygon( + new Coordinate[] { + Coordinates.of(59.961055202323195, 10.62535658370308), + Coordinates.of(59.889009435700416, 10.62535658370308), + Coordinates.of(59.889009435700416, 10.849791142928694), + Coordinates.of(59.961055202323195, 10.849791142928694), + Coordinates.of(59.961055202323195, 10.62535658370308), + } + ); + public static Polygon OSLO_FROGNER_PARK = FAC.createPolygon( + new Coordinate[] { + Coordinates.of(59.93112978539807, 10.691099320272173), + Coordinates.of(59.92231848097069, 10.691099320272173), + Coordinates.of(59.92231848097069, 10.711758464910503), + Coordinates.of(59.92231848097069, 10.691099320272173), + Coordinates.of(59.93112978539807, 10.691099320272173), + } + ); public static org.geojson.Polygon toGeoJson(Polygon polygon) { var ret = new org.geojson.Polygon(); diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java index 17ee3cbca6a..52cce79ebd5 100644 --- a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java @@ -78,7 +78,6 @@ void padCenter() { @Test void padRight() { - System.out.println(Polygons.BERLIN); assertEquals("ABC???", StringUtils.padRight("ABC", '?', 6)); assertEquals("??????", StringUtils.padRight(null, '?', 6)); assertEquals("ABC", StringUtils.padRight("ABC", '?', 3)); diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java index bab86f8cd6f..99910e04f7c 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/GeofencingVertexUpdaterTest.java @@ -8,11 +8,10 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.MultiPolygon; import org.locationtech.jts.geom.Polygon; -import org.opentripplanner._support.geometry.Coordinates; +import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.street.BusinessAreaBorder; @@ -36,30 +35,16 @@ class GeofencingVertexUpdaterTest { final GeofencingVertexUpdater updater = new GeofencingVertexUpdater(ignored -> List.of(insideFrognerPark, halfInHalfOutFrognerPark, businessBorder) ); - StreetEdge outsideFrognerPark = streetEdge(outsideFrognerPark1, outsideFrognerPark2); - - GeometryFactory fac = GeometryUtils.getGeometryFactory(); - Polygon frognerPark = fac.createPolygon( - new Coordinate[] { - Coordinates.of(59.93112978539807, 10.691099320272173), - Coordinates.of(59.92231848097069, 10.691099320272173), - Coordinates.of(59.92231848097069, 10.711758464910503), - Coordinates.of(59.92231848097069, 10.691099320272173), - Coordinates.of(59.93112978539807, 10.691099320272173), - } - ); - final GeofencingZone zone = new GeofencingZone(id("frogner-park"), frognerPark, true, false); - Polygon osloPolygon = fac.createPolygon( - new Coordinate[] { - Coordinates.of(59.961055202323195, 10.62535658370308), - Coordinates.of(59.889009435700416, 10.62535658370308), - Coordinates.of(59.889009435700416, 10.849791142928694), - Coordinates.of(59.961055202323195, 10.849791142928694), - Coordinates.of(59.961055202323195, 10.62535658370308), - } + + static GeometryFactory fac = GeometryUtils.getGeometryFactory(); + final GeofencingZone zone = new GeofencingZone( + id("frogner-park"), + Polygons.OSLO_FROGNER_PARK, + true, + false ); - MultiPolygon osloMultiPolygon = fac.createMultiPolygon(new Polygon[] { osloPolygon }); + MultiPolygon osloMultiPolygon = fac.createMultiPolygon(new Polygon[] { Polygons.OSLO }); final GeofencingZone businessArea = new GeofencingZone( id("oslo"), osloMultiPolygon, From 4c9d5fcef520600cb7d6a20a4d84601c3e669fa6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 28 Mar 2024 10:55:45 +0100 Subject: [PATCH 0890/1688] Correct polygon for Frogner Park --- .../_support/geometry/Polygons.java | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java index c01921b12b6..a386d8a27e1 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java @@ -31,11 +31,28 @@ public class Polygons { ); public static Polygon OSLO_FROGNER_PARK = FAC.createPolygon( new Coordinate[] { - Coordinates.of(59.93112978539807, 10.691099320272173), - Coordinates.of(59.92231848097069, 10.691099320272173), - Coordinates.of(59.92231848097069, 10.711758464910503), - Coordinates.of(59.92231848097069, 10.691099320272173), - Coordinates.of(59.93112978539807, 10.691099320272173), + Coordinates.of(59.92939032560119, 10.69770054003061), + Coordinates.of(59.929138466684975, 10.695210909925208), + Coordinates.of(59.92745319808358, 10.692696865071184), + Coordinates.of(59.92709930323093, 10.693774304996225), + Coordinates.of(59.92745914988427, 10.69495957972947), + Coordinates.of(59.92736919590291, 10.697664535925895), + Coordinates.of(59.924837887427856, 10.697927604125255), + Coordinates.of(59.924447953413335, 10.697448767354985), + Coordinates.of(59.92378800804022, 10.697819761729818), + Coordinates.of(59.92329018587293, 10.699196446969069), + Coordinates.of(59.92347619027632, 10.700285749621997), + Coordinates.of(59.92272030268688, 10.704714696822037), + Coordinates.of(59.92597766029715, 10.71001707489603), + Coordinates.of(59.92676341291536, 10.707838597058043), + Coordinates.of(59.92790300889098, 10.708389137506913), + Coordinates.of(59.928376832499424, 10.707060536853078), + Coordinates.of(59.92831087551576, 10.705803789539402), + Coordinates.of(59.92953431964068, 10.706641515204467), + Coordinates.of(59.93046383654274, 10.70484606360543), + Coordinates.of(59.93008590667682, 10.701817874860211), + Coordinates.of(59.93028982601595, 10.700525251174469), + Coordinates.of(59.92939032560119, 10.69770054003061), } ); From 1d330b0e5a2938ee51cf4fc1721c49a8c0907d86 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 28 Mar 2024 14:00:42 +0100 Subject: [PATCH 0891/1688] Apply review feedback --- .../org/opentripplanner/apis/gtfs/schema.graphqls | 9 +++++++++ .../apis/gtfs/GraphQLIntegrationTest.java | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index cfa764b615e..01c69fd469a 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3430,6 +3430,15 @@ type Route implements Node { """ Orders the routes in a way which is useful for presentation to passengers. Routes with smaller values should be displayed first. + + The value can be any non-negative integer. A null value means that no information was supplied. + + This value is passed through from the source data without modification. If multiple feeds + define sort orders for their routes, they may not be comparable to each other as no agreed scale + exists. + + Two routes may also have the same sort order and clients must decide based on other criteria + what the actual order is. """ sortOrder: Int } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index 2f26dc34dc8..2f1e57ef4dc 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -295,7 +295,7 @@ private static BikeAccess bikesAllowed(TransitMode m) { } /** - * We want to provide a variety of numbers and null. + * We want to provide a variety of numbers and null, so we cover all cases in the test output. */ private static Integer sortOrder(TransitMode m) { if (m.ordinal() == 0) { From 48f43c768ca933fba7217df821aa27da695b68ff Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 28 Mar 2024 14:28:58 +0000 Subject: [PATCH 0892/1688] Upgrade debug client to version 2024/03/2024-03-28T14:28 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 7b902b7e92f..b719c57b507 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From a372695b9433bb6d7e5c78b5b5a7710df0a7955a Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 28 Mar 2024 15:10:07 +0000 Subject: [PATCH 0893/1688] Add changelog entry for #5764 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index da24aae7a35..e1773cb0a5e 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -7,6 +7,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - ISO-8601 date time for GTFS API itinerary responses [#5660](https://github.com/opentripplanner/OpenTripPlanner/pull/5660) - Fix street routing on roundabout [#5732](https://github.com/opentripplanner/OpenTripPlanner/pull/5732) +- Expose route sort order in GTFS API [#5764](https://github.com/opentripplanner/OpenTripPlanner/pull/5764) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 50ff507fb433dfb79566f58d3effdb7831ade39c Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 28 Mar 2024 18:10:31 +0200 Subject: [PATCH 0894/1688] Better empty array arg handling --- .../mapping/routerequest/ArgumentUtils.java | 3 ++- .../BicyclePreferencesMapper.java | 8 +++--- .../routerequest/CarPreferencesMapper.java | 8 +++--- .../routerequest/ModePreferencesMapper.java | 26 ++++++++++++++----- .../ScooterPreferencesMapper.java | 8 +++--- 5 files changed, 37 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java index c9235afe185..b04affeaaf2 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ArgumentUtils.java @@ -20,6 +20,7 @@ public class ArgumentUtils { *

      * TODO this ugliness can be removed when the bug gets fixed */ + @Nullable static List> getTransitModes(DataFetchingEnvironment environment) { if (environment.containsArgument("modes")) { Map modesArgs = environment.getArgument("modes"); @@ -30,7 +31,7 @@ static List> getTransitModes(DataFetchingEnvironment environ } } } - return List.of(); + return null; } /** diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java index cd0f1ef16da..8bafc24b2c4 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java @@ -8,7 +8,6 @@ import graphql.schema.DataFetchingEnvironment; import java.util.Set; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.framework.collection.CollectionUtils; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.api.request.preference.BikePreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; @@ -99,11 +98,14 @@ private static void setBicycleRentalPreferences( ) { if (args != null) { var allowedNetworks = args.getGraphQLAllowedNetworks(); - if (!CollectionUtils.isEmpty(allowedNetworks)) { + if (allowedNetworks != null) { + if (allowedNetworks.isEmpty()) { + throw new IllegalArgumentException("Allowed bicycle rental networks must not be empty."); + } preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); } var bannedNetworks = args.getGraphQLBannedNetworks(); - if (!CollectionUtils.isEmpty(bannedNetworks)) { + if (bannedNetworks != null) { preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); } var destinationPolicy = args.getGraphQLDestinationBicyclePolicy(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java index b0ba8e9776c..ddf086bdac5 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java @@ -8,7 +8,6 @@ import graphql.schema.DataFetchingEnvironment; import java.util.Set; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.framework.collection.CollectionUtils; import org.opentripplanner.routing.api.request.preference.CarPreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; @@ -57,11 +56,14 @@ private static void setCarRentalPreferences( ) { if (args != null) { var allowedNetworks = args.getGraphQLAllowedNetworks(); - if (!CollectionUtils.isEmpty(allowedNetworks)) { + if (allowedNetworks != null) { + if (allowedNetworks.isEmpty()) { + throw new IllegalArgumentException("Allowed car rental networks must not be empty."); + } preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); } var bannedNetworks = args.getGraphQLBannedNetworks(); - if (!CollectionUtils.isEmpty(bannedNetworks)) { + if (bannedNetworks != null) { preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java index 0bd4e53eb35..32d3456df57 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ModePreferencesMapper.java @@ -8,7 +8,6 @@ import java.util.Set; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.mapping.TransitModeMapper; -import org.opentripplanner.framework.collection.CollectionUtils; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.request.JourneyRequest; import org.opentripplanner.routing.api.request.request.filter.SelectRequest; @@ -28,7 +27,10 @@ static void setModes( var direct = modesInput.getGraphQLDirect(); if (Boolean.TRUE.equals(modesInput.getGraphQLTransitOnly())) { journey.direct().setMode(StreetMode.NOT_SET); - } else if (!CollectionUtils.isEmpty(direct)) { + } else if (direct != null) { + if (direct.isEmpty()) { + throw new IllegalArgumentException("Direct modes must not be empty."); + } var streetModes = direct.stream().map(DirectModeMapper::map).toList(); journey.direct().setMode(getStreetMode(streetModes)); } @@ -38,26 +40,38 @@ static void setModes( journey.transit().disable(); } else if (transit != null) { var access = transit.getGraphQLAccess(); - if (!CollectionUtils.isEmpty(access)) { + if (access != null) { + if (access.isEmpty()) { + throw new IllegalArgumentException("Access modes must not be empty."); + } var streetModes = access.stream().map(AccessModeMapper::map).toList(); journey.access().setMode(getStreetMode(streetModes)); } var egress = transit.getGraphQLEgress(); - if (!CollectionUtils.isEmpty(egress)) { + if (egress != null) { + if (egress.isEmpty()) { + throw new IllegalArgumentException("Egress modes must not be empty."); + } var streetModes = egress.stream().map(EgressModeMapper::map).toList(); journey.egress().setMode(getStreetMode(streetModes)); } var transfer = transit.getGraphQLTransfer(); - if (!CollectionUtils.isEmpty(transfer)) { + if (transfer != null) { + if (transfer.isEmpty()) { + throw new IllegalArgumentException("Transfer modes must not be empty."); + } var streetModes = transfer.stream().map(TransferModeMapper::map).toList(); journey.transfer().setMode(getStreetMode(streetModes)); } validateStreetModes(journey); var transitModes = getTransitModes(environment); - if (!CollectionUtils.isEmpty(transitModes)) { + if (transitModes != null) { + if (transitModes.isEmpty()) { + throw new IllegalArgumentException("Transit modes must not be empty."); + } var filterRequestBuilder = TransitFilterRequest.of(); var mainAndSubModes = transitModes .stream() diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java index f3da4c22463..81e481f2571 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java @@ -2,7 +2,6 @@ import java.util.Set; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; -import org.opentripplanner.framework.collection.CollectionUtils; import org.opentripplanner.routing.api.request.preference.ScooterPreferences; import org.opentripplanner.routing.api.request.preference.VehicleRentalPreferences; @@ -33,11 +32,14 @@ private static void setScooterRentalPreferences( ) { if (args != null) { var allowedNetworks = args.getGraphQLAllowedNetworks(); - if (!CollectionUtils.isEmpty(allowedNetworks)) { + if (allowedNetworks != null) { + if (allowedNetworks.isEmpty()) { + throw new IllegalArgumentException("Allowed scooter rental networks must not be empty."); + } preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); } var bannedNetworks = args.getGraphQLBannedNetworks(); - if (!CollectionUtils.isEmpty(bannedNetworks)) { + if (bannedNetworks != null) { preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); } var destinationPolicy = args.getGraphQLDestinationScooterPolicy(); From d5dbf7949e8c0e73021faae9d16d2d36770bfacb Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sun, 31 Mar 2024 14:39:39 +0900 Subject: [PATCH 0895/1688] Update src/main/java/org/opentripplanner/routing/graph/Graph.java Co-authored-by: Leonard Ehrenfried --- src/main/java/org/opentripplanner/routing/graph/Graph.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java index 3e47046aab9..ba83ed6886d 100644 --- a/src/main/java/org/opentripplanner/routing/graph/Graph.java +++ b/src/main/java/org/opentripplanner/routing/graph/Graph.java @@ -54,7 +54,7 @@ * Other data structures related to street routing, such as elevation data and vehicle parking * information, are also collected here as fields of the Graph. For historical reasons the Graph * sometimes serves as a catch-all, as it used to be the root of the object tree representing the - * whole transportation network. + * whole transportation network. This use of the Graph object is being phased out and discouraged. *

      * In some sense the Graph is just some indexes into a set of vertices. The Graph used to hold lists * of edges for each vertex, but those lists are now attached to the vertices themselves. From 50bd2520292a396d1165ee9aec4726b6d74b80d0 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sun, 31 Mar 2024 15:05:13 +0900 Subject: [PATCH 0896/1688] update docs in response to PR comments --- .../opentripplanner/ext/siri/SiriTripPatternCache.java | 9 ++++++--- .../opentripplanner/routing/alertpatch/TransitAlert.java | 7 ++++--- .../transit/model/network/StopPattern.java | 3 ++- .../opentripplanner/transit/service/TransitModel.java | 4 +++- src/main/java/org/opentripplanner/updater/package.md | 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index a803764c2c4..146fc2ade1e 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -52,13 +52,16 @@ public class SiriTripPatternCache { // TODO RT_AB: generalize this so we can generate IDs for SIRI or GTFS-RT sources. private final SiriTripPatternIdGenerator tripPatternIdGenerator; - // TODO RT_AB: clarify name and add documentation to this field, and why it's constructor injected + /** + * SiriTripPatternCache needs only this one feature of TransitService, so we retain only this + * function reference to effectively narrow the interface. This should also facilitate testing. + */ private final Function getPatternForTrip; /** * Constructor. - * TODO RT_AB: clarify why the ID generator and pattern fetching function are injected here. - * Potentially make the class usable for GTFS-RT cases by injecting different ID generator etc. + * TODO RT_AB: This class could potentially be reused for both SIRI and GTFS-RT, which may + * involve injecting a different ID generator and pattern fetching method. */ public SiriTripPatternCache( SiriTripPatternIdGenerator tripPatternIdGenerator, diff --git a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java index 4a7ef91a8ea..59ad16cda6a 100644 --- a/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java +++ b/src/main/java/org/opentripplanner/routing/alertpatch/TransitAlert.java @@ -19,9 +19,10 @@ * Internal representation of a GTFS-RT Service Alert or SIRI Situation Exchange (SX) message. * These are text descriptions of problems affecting specific stops, routes, or other components * of the transit system which will be displayed to users as text. - * Although they have flags describing the effect of the problem described in the text, convention - * is that these messages do not modify routing behavior on their own. They must be accompanied by - * messages of other types to actually impact routing. + * Although they have flags describing the effect of the problem described in the text, these + * messages do not currently modify routing behavior on their own. They must be accompanied by + * messages of other types to actually impact routing. However, there is ongoing discussion about + * allowing Alerts to affect routing, especially for cases such as stop closure messages. */ public class TransitAlert extends AbstractTransitEntity { diff --git a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java index 6aad00b659b..21b911f500a 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java @@ -94,7 +94,8 @@ StopPatternBuilder mutate() { return new StopPatternBuilder(this, null); } - // TODO RT_AB: documentation or naming - this does not mutate the object in place, it makes a copy + // TODO RT_AB: Rename and add documentation. This method does not mutate the object in place, it + // makes a copy. Confirmed in discussion that this should have a different name like "copy". StopPatternBuilder mutate(StopPattern realTime) { return new StopPatternBuilder(this, realTime); } diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java index 3d2f2d5424e..da257821174 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitModel.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitModel.java @@ -58,7 +58,9 @@ * The TransitModel groups together all instances making up OTP's primary internal representation * of the public transportation network. Although the names of many entities are derived from * GTFS concepts, these are actually independent of the data source from which they are loaded. - * Both GTFS and NeTEx entities are mapped to these same internal OTP entities. + * Both GTFS and NeTEx entities are mapped to these same internal OTP entities. If a concept exists + * in both GTFS and NeTEx, the GTFS name is used in the internal model. For concepts that exist + * only in NeTEx, the NeTEx name is used in the internal model. * * A TransitModel instance also includes references to some transient indexes of its contents, to * the TransitLayer derived from it, and to some other services and utilities that operate upon diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md index 0a1b6974a1e..1a7c79f52b6 100644 --- a/src/main/java/org/opentripplanner/updater/package.md +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -28,7 +28,7 @@ The following is a sequence diagram showing how threads are intended to communic ![Realtime sequence diagram](images/updater-threads-queues.svg) -At the top of the diagram are the GraphUpdater implementations. These fall broadly into two categories: polling updaters and streaming updaters. Polling updaters periodically send a request to server (often just a simple HTTP server) which returns a file containing the latest version of the updates. Streaming updaters are generally built around libraries implementing message-oriented protocols such as AMQP or WebSockets, which fire a callback each time a new message is received. Polling updaters tend to return a full dataset describing the entire system state on each polling operation, while streaming updaters tend to receive incremental messages targeting individual transit trips. As such, polling updaters execute relatively infrequently (perhaps every minute or two) and process large responses, while streaming updaters execute very frequently (often many times per second) and operate on small messages in short bursts. Polling updaters are simpler in many ways and make use of common HTTP server components, but they introduce significant latency and redundant communication. Streaming updaters require more purpose-built or custom-configured components including message brokers, but bandwidth consumption and latency are lower, allowing routing results to reflect vehicle delays and positions immediately after they're reported. +At the top of the diagram are the GraphUpdater implementations. These fall broadly into two categories: polling updaters and streaming updaters. Polling updaters periodically send a request to server (often just a simple HTTP server) which returns a file containing the latest version of the updates. Streaming updaters are generally built around libraries implementing message-oriented protocols such as MQTT or AMQP, which fire a callback each time a new message is received. Polling updaters tend to return a full dataset describing the entire system state on each polling operation, while streaming updaters tend to receive incremental messages targeting individual transit trips. As such, polling updaters execute relatively infrequently (perhaps every minute or two) and process large responses, while streaming updaters execute very frequently (often many times per second) and operate on small messages in short bursts. Polling updaters are simpler in many ways and make use of common HTTP server components, but they introduce significant latency and redundant communication. Streaming updaters require more purpose-built or custom-configured components including message brokers, but bandwidth consumption and latency are lower, allowing routing results to reflect vehicle delays and positions immediately after they're reported. The GraphUpdaterManager coordinates all these updaters, and each runs freely in its own thread, receiving, deserializing, and validating data on its own schedule. Importantly, the GraphUpdaters are _not allowed to directly modify the transit data (Graph)_. Instead, they submit instances of GraphWriterRunnable which are queued up using the WriteToGraphCallback interface. These instances are essentially deferred code snippets that _are allowed_ to write to the Graph, but in a very controlled way. In short, there is exactly one thread that is allowed to make changes to the transit data, and those changes are queued up and executed in sequence, one at a time. From 256226dcae0268a59e49adb34d459a84aa104c63 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 31 Mar 2024 22:39:41 +0000 Subject: [PATCH 0897/1688] Update lucene.version to v9.10.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0de0e7ef711..ad3c0d135f6 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 1.12.3 5.5.3 1.5.3 - 9.9.1 + 9.10.0 2.0.12 2.0.15 1.26 From c54650db2bfbacca96de746df0ca972f973be8bd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 31 Mar 2024 22:39:33 +0000 Subject: [PATCH 0898/1688] Update dependency mkdocs-material to v9.5.16 --- docs/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/requirements.txt b/docs/requirements.txt index 8c87ef1c626..93a8c6c673e 100644 --- a/docs/requirements.txt +++ b/docs/requirements.txt @@ -1,4 +1,4 @@ mkdocs==1.5.3 -mkdocs-material==9.5.3 +mkdocs-material==9.5.16 mike@git+https://github.com/jimporter/mike.git@f0522f245e64687dd18384fbd86b721175711474 mkdocs-no-sitemap-plugin==0.0.1 From ae3562ae27820c26c2ccd1026ac74bcd95741f43 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 01:14:08 +0000 Subject: [PATCH 0899/1688] Update Debug UI dependencies (non-major) --- client-next/package-lock.json | 136 ++++++++++++++++------------------ client-next/package.json | 14 ++-- 2 files changed, 72 insertions(+), 78 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 03aa0171357..d3b8c10754b 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -12,7 +12,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.1.1", + "maplibre-gl": "4.1.2", "react": "18.2.0", "react-bootstrap": "2.10.2", "react-dom": "18.2.0", @@ -20,14 +20,14 @@ }, "devDependencies": { "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/client-preset": "4.2.4", + "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "14.2.2", - "@types/react": "18.2.70", - "@types/react-dom": "18.2.22", - "@typescript-eslint/eslint-plugin": "7.4.0", - "@typescript-eslint/parser": "7.4.0", + "@types/react": "18.2.73", + "@types/react-dom": "18.2.23", + "@typescript-eslint/eslint-plugin": "7.5.0", + "@typescript-eslint/parser": "7.5.0", "@vitejs/plugin-react": "4.2.1", "@vitest/coverage-v8": "1.4.0", "eslint": "8.57.0", @@ -40,7 +40,7 @@ "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.3", - "vite": "5.2.6", + "vite": "5.2.7", "vitest": "1.4.0" } }, @@ -1693,9 +1693,9 @@ } }, "node_modules/@graphql-codegen/client-preset": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.4.tgz", - "integrity": "sha512-k1c8v2YxJhhITGQGxViG9asLAoop9m7X9duU7Zztqjc98ooxsUzXICfvAWsH3mLAUibXAx4Ax6BPzKsTtQmBPg==", + "version": "4.2.5", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.5.tgz", + "integrity": "sha512-hAdB6HN8EDmkoBtr0bPUN/7NH6svzqbcTDMWBCRXPESXkl7y80po+IXrXUjsSrvhKG8xkNXgJNz/2mjwHzywcA==", "dev": true, "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", @@ -3528,19 +3528,18 @@ "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/react": { - "version": "18.2.70", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.70.tgz", - "integrity": "sha512-hjlM2hho2vqklPhopNkXkdkeq6Lv8WSZTpr7956zY+3WS5cfYUewtCzsJLsbW5dEv3lfSeQ4W14ZFeKC437JRQ==", + "version": "18.2.73", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.73.tgz", + "integrity": "sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==", "dependencies": { "@types/prop-types": "*", - "@types/scheduler": "*", "csstype": "^3.0.2" } }, "node_modules/@types/react-dom": { - "version": "18.2.22", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.22.tgz", - "integrity": "sha512-fHkBXPeNtfvri6gdsMYyW+dW7RXFo6Ad09nLFK0VQWR7yGLai/Cyvyj696gbwYvBnhGtevUG9cET0pmUbMtoPQ==", + "version": "18.2.23", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.23.tgz", + "integrity": "sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==", "dev": true, "dependencies": { "@types/react": "*" @@ -3554,11 +3553,6 @@ "@types/react": "*" } }, - "node_modules/@types/scheduler": { - "version": "0.16.8", - "resolved": "https://registry.npmjs.org/@types/scheduler/-/scheduler-0.16.8.tgz", - "integrity": "sha512-WZLiwShhwLRmeV6zH+GkbOFT6Z6VklCItrDioxUnv+u4Ll+8vKeFySoFyK/0ctcRpOmwAicELfmys1sDc/Rw+A==" - }, "node_modules/@types/semver": { "version": "7.5.8", "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", @@ -3588,16 +3582,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.4.0.tgz", - "integrity": "sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.5.0.tgz", + "integrity": "sha512-HpqNTH8Du34nLxbKgVMGljZMG0rJd2O9ecvr2QLYp+7512ty1j42KnsFwspPXg1Vh8an9YImf6CokUBltisZFQ==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "7.4.0", - "@typescript-eslint/type-utils": "7.4.0", - "@typescript-eslint/utils": "7.4.0", - "@typescript-eslint/visitor-keys": "7.4.0", + "@typescript-eslint/scope-manager": "7.5.0", + "@typescript-eslint/type-utils": "7.5.0", + "@typescript-eslint/utils": "7.5.0", + "@typescript-eslint/visitor-keys": "7.5.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.2.4", @@ -3656,15 +3650,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.4.0.tgz", - "integrity": "sha512-ZvKHxHLusweEUVwrGRXXUVzFgnWhigo4JurEj0dGF1tbcGh6buL+ejDdjxOQxv6ytcY1uhun1p2sm8iWStlgLQ==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.5.0.tgz", + "integrity": "sha512-cj+XGhNujfD2/wzR1tabNsidnYRaFfEkcULdcIyVBYcXjBvBKOes+mpMBP7hMpOyk+gBcfXsrg4NBGAStQyxjQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.4.0", - "@typescript-eslint/types": "7.4.0", - "@typescript-eslint/typescript-estree": "7.4.0", - "@typescript-eslint/visitor-keys": "7.4.0", + "@typescript-eslint/scope-manager": "7.5.0", + "@typescript-eslint/types": "7.5.0", + "@typescript-eslint/typescript-estree": "7.5.0", + "@typescript-eslint/visitor-keys": "7.5.0", "debug": "^4.3.4" }, "engines": { @@ -3684,13 +3678,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.4.0.tgz", - "integrity": "sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.5.0.tgz", + "integrity": "sha512-Z1r7uJY0MDeUlql9XJ6kRVgk/sP11sr3HKXn268HZyqL7i4cEfrdFuSSY/0tUqT37l5zT0tJOsuDP16kio85iA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.4.0", - "@typescript-eslint/visitor-keys": "7.4.0" + "@typescript-eslint/types": "7.5.0", + "@typescript-eslint/visitor-keys": "7.5.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3701,13 +3695,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.4.0.tgz", - "integrity": "sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.5.0.tgz", + "integrity": "sha512-A021Rj33+G8mx2Dqh0nMO9GyjjIBK3MqgVgZ2qlKf6CJy51wY/lkkFqq3TqqnH34XyAHUkq27IjlUkWlQRpLHw==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.4.0", - "@typescript-eslint/utils": "7.4.0", + "@typescript-eslint/typescript-estree": "7.5.0", + "@typescript-eslint/utils": "7.5.0", "debug": "^4.3.4", "ts-api-utils": "^1.0.1" }, @@ -3728,9 +3722,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.4.0.tgz", - "integrity": "sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.5.0.tgz", + "integrity": "sha512-tv5B4IHeAdhR7uS4+bf8Ov3k793VEVHd45viRRkehIUZxm0WF82VPiLgHzA/Xl4TGPg1ZD49vfxBKFPecD5/mg==", "dev": true, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3741,13 +3735,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.4.0.tgz", - "integrity": "sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.5.0.tgz", + "integrity": "sha512-YklQQfe0Rv2PZEueLTUffiQGKQneiIEKKnfIqPIOxgM9lKSZFCjT5Ad4VqRKj/U4+kQE3fa8YQpskViL7WjdPQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.4.0", - "@typescript-eslint/visitor-keys": "7.4.0", + "@typescript-eslint/types": "7.5.0", + "@typescript-eslint/visitor-keys": "7.5.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3802,17 +3796,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.4.0.tgz", - "integrity": "sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.5.0.tgz", + "integrity": "sha512-3vZl9u0R+/FLQcpy2EHyRGNqAS/ofJ3Ji8aebilfJe+fobK8+LbIFmrHciLVDxjDoONmufDcnVSF38KwMEOjzw==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.12", "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.4.0", - "@typescript-eslint/types": "7.4.0", - "@typescript-eslint/typescript-estree": "7.4.0", + "@typescript-eslint/scope-manager": "7.5.0", + "@typescript-eslint/types": "7.5.0", + "@typescript-eslint/typescript-estree": "7.5.0", "semver": "^7.5.4" }, "engines": { @@ -3860,12 +3854,12 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.4.0.tgz", - "integrity": "sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==", + "version": "7.5.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.5.0.tgz", + "integrity": "sha512-mcuHM/QircmA6O7fy6nn2w/3ditQkj+SgtOc8DW3uQ10Yfj42amm2i+6F2K4YAOPNNTmE6iM1ynM6lrSwdendA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.4.0", + "@typescript-eslint/types": "7.5.0", "eslint-visitor-keys": "^3.4.1" }, "engines": { @@ -8423,9 +8417,9 @@ } }, "node_modules/maplibre-gl": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.1.tgz", - "integrity": "sha512-DmHru9FTHCOngNHzIx9W2+MlUziYPfPxd2qjyeWwczBYNx2SDpmH394MkuCvSgnfUm5Zvs4NaYCqMu44jUga1Q==", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.2.tgz", + "integrity": "sha512-98T+3BesL4w/N39q/rgs9q6HzHLG6pgbS9UaTqg6fMISfzy2WGKokjK205ENFDDmEljj54/LTfdXgqg2XfYU4A==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -10974,13 +10968,13 @@ } }, "node_modules/vite": { - "version": "5.2.6", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.6.tgz", - "integrity": "sha512-FPtnxFlSIKYjZ2eosBQamz4CbyrTizbZ3hnGJlh/wMtCrlp1Hah6AzBLjGI5I2urTfNnpovpHdrL6YRuBOPnCA==", + "version": "5.2.7", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.7.tgz", + "integrity": "sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==", "dev": true, "dependencies": { "esbuild": "^0.20.1", - "postcss": "^8.4.36", + "postcss": "^8.4.38", "rollup": "^4.13.0" }, "bin": { diff --git a/client-next/package.json b/client-next/package.json index 36569ee11f8..d3f583057d8 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -21,7 +21,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.1.1", + "maplibre-gl": "4.1.2", "react": "18.2.0", "react-bootstrap": "2.10.2", "react-dom": "18.2.0", @@ -29,14 +29,14 @@ }, "devDependencies": { "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/client-preset": "4.2.4", + "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "14.2.2", - "@types/react": "18.2.70", - "@types/react-dom": "18.2.22", - "@typescript-eslint/eslint-plugin": "7.4.0", - "@typescript-eslint/parser": "7.4.0", + "@types/react": "18.2.73", + "@types/react-dom": "18.2.23", + "@typescript-eslint/eslint-plugin": "7.5.0", + "@typescript-eslint/parser": "7.5.0", "@vitejs/plugin-react": "4.2.1", "@vitest/coverage-v8": "1.4.0", "eslint": "8.57.0", @@ -49,7 +49,7 @@ "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.3", - "vite": "5.2.6", + "vite": "5.2.7", "vitest": "1.4.0" } } From 8d15a0d9616bedd15f67b294c91d721131feccd8 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Tue, 2 Apr 2024 07:26:15 +0000 Subject: [PATCH 0900/1688] Upgrade debug client to version 2024/04/2024-04-02T07:25 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index b719c57b507..3973571de30 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From 27e533b631a5a5eadfdbac2145bffea38ead1902 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 2 Apr 2024 10:49:04 +0300 Subject: [PATCH 0901/1688] Add tests --- .../RouteRequestMapperBicycleTest.java | 50 +++++++++++++++++++ .../RouteRequestMapperCarTest.java | 50 +++++++++++++++++++ .../RouteRequestMapperModesTest.java | 47 +++++++++++++++++ .../RouteRequestMapperScooterTest.java | 50 +++++++++++++++++++ 4 files changed, 197 insertions(+) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java index 75c68c2a91a..698390557e1 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperBicycleTest.java @@ -2,6 +2,7 @@ import static java.util.Map.entry; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy; import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext; @@ -205,6 +206,55 @@ void testBikeRentalPreferences() { assertEquals(keepingCost, bikeRentalPreferences.arrivingInRentalVehicleAtDestinationCost()); } + @Test + void testEmptyBikeRentalPreferences() { + var bikeArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var empty = Set.of(); + bikeArgs.put( + "preferences", + Map.ofEntries( + entry( + "street", + Map.ofEntries( + entry( + "bicycle", + Map.ofEntries( + entry("rental", Map.ofEntries(entry("allowedNetworks", empty.stream().toList()))) + ) + ) + ) + ) + ) + ); + var allowedEnv = executionContext(bikeArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(allowedEnv, RouteRequestMapperTest.CONTEXT) + ); + + bikeArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + bikeArgs.put( + "preferences", + Map.ofEntries( + entry( + "street", + Map.ofEntries( + entry( + "bicycle", + Map.ofEntries( + entry("rental", Map.ofEntries(entry("bannedNetworks", empty.stream().toList()))) + ) + ) + ) + ) + ) + ); + var bannedEnv = executionContext(bikeArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(bannedEnv, RouteRequestMapperTest.CONTEXT); + var bikeRentalPreferences = routeRequest.preferences().bike().rental(); + assertEquals(empty, bikeRentalPreferences.bannedNetworks()); + } + @Test void testBikeParkingPreferences() { var bicycleArgs = createArgsCopy(RouteRequestMapperTest.ARGS); diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java index 0fe8f76c26d..6c8109676f0 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperCarTest.java @@ -2,6 +2,7 @@ import static java.util.Map.entry; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy; import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext; @@ -62,6 +63,55 @@ void testCarRentalPreferences() { assertEquals(banned, carRentalPreferences.bannedNetworks()); } + @Test + void testEmptyCarRentalPreferences() { + var carArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var empty = Set.of(); + carArgs.put( + "preferences", + Map.ofEntries( + entry( + "street", + Map.ofEntries( + entry( + "car", + Map.ofEntries( + entry("rental", Map.ofEntries(entry("allowedNetworks", empty.stream().toList()))) + ) + ) + ) + ) + ) + ); + var allowedEnv = executionContext(carArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(allowedEnv, RouteRequestMapperTest.CONTEXT) + ); + + carArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + carArgs.put( + "preferences", + Map.ofEntries( + entry( + "street", + Map.ofEntries( + entry( + "car", + Map.ofEntries( + entry("rental", Map.ofEntries(entry("bannedNetworks", empty.stream().toList()))) + ) + ) + ) + ) + ) + ); + var bannedEnv = executionContext(carArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(bannedEnv, RouteRequestMapperTest.CONTEXT); + var carRentalPreferences = routeRequest.preferences().car().rental(); + assertEquals(empty, carRentalPreferences.bannedNetworks()); + } + @Test void testCarParkingPreferences() { var carArgs = createArgsCopy(RouteRequestMapperTest.ARGS); diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java index 0d9285f93b9..910bb916a7b 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperModesTest.java @@ -183,4 +183,51 @@ void testTransitModes() { routeRequest.journey().transit().filters().toString() ); } + + @Test + void testStreetModesWithEmptyModes() { + var modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var empty = List.of(); + modesArgs.put("modes", Map.ofEntries(entry("direct", empty))); + var directEnv = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(directEnv, RouteRequestMapperTest.CONTEXT) + ); + + modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + modesArgs.put("modes", Map.ofEntries(entry("transit", Map.ofEntries(entry("access", empty))))); + var accessEnv = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(accessEnv, RouteRequestMapperTest.CONTEXT) + ); + + modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + modesArgs.put("modes", Map.ofEntries(entry("transit", Map.ofEntries(entry("egress", empty))))); + var egressEnv = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(egressEnv, RouteRequestMapperTest.CONTEXT) + ); + + modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + modesArgs.put( + "modes", + Map.ofEntries(entry("transit", Map.ofEntries(entry("transfer", empty)))) + ); + var transferEnv = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(transferEnv, RouteRequestMapperTest.CONTEXT) + ); + + modesArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + modesArgs.put("modes", Map.ofEntries(entry("transit", Map.ofEntries(entry("transit", empty))))); + var transitEnv = executionContext(modesArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(transitEnv, RouteRequestMapperTest.CONTEXT) + ); + } } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java index 507f7276df8..de15a45d0c9 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperScooterTest.java @@ -2,6 +2,7 @@ import static java.util.Map.entry; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.createArgsCopy; import static org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapperTest.executionContext; @@ -151,4 +152,53 @@ void testScooterRentalPreferences() { ); assertEquals(keepingCost, scooterRentalPreferences.arrivingInRentalVehicleAtDestinationCost()); } + + @Test + void testEmptyScooterRentalPreferences() { + var scooterArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + var empty = Set.of(); + scooterArgs.put( + "preferences", + Map.ofEntries( + entry( + "street", + Map.ofEntries( + entry( + "scooter", + Map.ofEntries( + entry("rental", Map.ofEntries(entry("allowedNetworks", empty.stream().toList()))) + ) + ) + ) + ) + ) + ); + var allowedEnv = executionContext(scooterArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + assertThrows( + IllegalArgumentException.class, + () -> RouteRequestMapper.toRouteRequest(allowedEnv, RouteRequestMapperTest.CONTEXT) + ); + + scooterArgs = createArgsCopy(RouteRequestMapperTest.ARGS); + scooterArgs.put( + "preferences", + Map.ofEntries( + entry( + "street", + Map.ofEntries( + entry( + "scooter", + Map.ofEntries( + entry("rental", Map.ofEntries(entry("bannedNetworks", empty.stream().toList()))) + ) + ) + ) + ) + ) + ); + var bannedEnv = executionContext(scooterArgs, Locale.ENGLISH, RouteRequestMapperTest.CONTEXT); + var routeRequest = RouteRequestMapper.toRouteRequest(bannedEnv, RouteRequestMapperTest.CONTEXT); + var scooterRentalPreferences = routeRequest.preferences().scooter().rental(); + assertEquals(empty, scooterRentalPreferences.bannedNetworks()); + } } From 258398db202f97434662e5bf37fe82b18ac490b2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 2 Apr 2024 10:57:07 +0200 Subject: [PATCH 0902/1688] Remove import --- .../java/org/opentripplanner/framework/lang/StringUtilsTest.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java index 52cce79ebd5..0e67344b2bb 100644 --- a/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/lang/StringUtilsTest.java @@ -13,7 +13,6 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.junit.jupiter.params.provider.ValueSource; -import org.opentripplanner._support.geometry.Polygons; class StringUtilsTest { From 7fe1f3ee7486b1bcdcecc8cfa777d80e6a585f66 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 19 Mar 2024 23:07:42 +0100 Subject: [PATCH 0903/1688] Make more classes package private --- .../opentripplanner/graph_builder/module/osm/DisjointSet.java | 2 +- .../java/org/opentripplanner/graph_builder/module/osm/Ring.java | 2 +- .../graph_builder/module/osm/WalkableAreaBuilder.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java index a5b9179f696..15bfc3605b5 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/DisjointSet.java @@ -12,7 +12,7 @@ import org.opentripplanner.framework.collection.MapUtils; /** Basic union-find data structure with path compression */ -public class DisjointSet { +class DisjointSet { TIntList sets = new TIntArrayList(); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java index 9804c2d646f..754bdbc36b2 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/Ring.java @@ -19,7 +19,7 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.openstreetmap.model.OSMNode; -public class Ring { +class Ring { private final LinearRing shell; private final List holes = new ArrayList<>(); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java index 5562f1df1a3..b83673c239b 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java @@ -68,7 +68,7 @@ * number of edges for an area wouldn't be determined by the nodes. The current approach can lead * to an excessive number of edges, or to no edges at all if maxAreaNodes is surpassed. */ -public class WalkableAreaBuilder { +class WalkableAreaBuilder { private final DataImportIssueStore issueStore; From debb6eb2a9370064b037d19146ee87f0bc07aa2e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Mar 2024 14:53:23 +0100 Subject: [PATCH 0904/1688] Use instance method for figuring out bogus name --- .../graph_builder/module/osm/OsmModule.java | 7 ++----- .../module/osm/WalkableAreaBuilder.java | 18 ++++++------------ .../openstreetmap/model/OSMWithTags.java | 7 +++++++ .../openstreetmap/model/OSMWithTagsTest.java | 9 +++++++++ 4 files changed, 24 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index e831d2ada47..0cd53b70fc6 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -541,11 +541,8 @@ private StreetEdge getEdgeForStreet( .withRoundabout(way.isRoundabout()) .withSlopeOverride(way.getOsmProvider().getWayPropertySet().getSlopeOverride(way)) .withStairs(way.isSteps()) - .withWheelchairAccessible(way.isWheelchairAccessible()); - - if (!way.hasTag("name") && !way.hasTag("ref")) { - seb.withBogusName(true); - } + .withWheelchairAccessible(way.isWheelchairAccessible()) + .withBogusName(way.needsFallbackName()); StreetEdge street = seb.buildAndConnect(); params.edgeNamer().recordEdge(way, street); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java index b83673c239b..5a828f2b689 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java @@ -400,7 +400,7 @@ private void pruneAreaEdges( Set edges, Set edgesToKeep ) { - if (edges.size() == 0) return; + if (edges.isEmpty()) return; StreetMode mode; StreetEdge firstEdge = (StreetEdge) edges.iterator().next(); @@ -496,7 +496,7 @@ private Set createSegments( } // do we need to recurse? if (intersects.size() == 1) { - Area area = intersects.get(0); + Area area = intersects.getFirst(); OSMWithTags areaEntity = area.parent; StreetTraversalPermission areaPermissions = areaEntity.overridePermissions( @@ -531,11 +531,8 @@ private Set createSegments( .withPermission(areaPermissions) .withBack(false) .withArea(edgeList) - .withCarSpeed(carSpeed); - - if (!areaEntity.hasTag("name") && !areaEntity.hasTag("ref")) { - streetEdgeBuilder.withBogusName(true); - } + .withCarSpeed(carSpeed) + .withBogusName(areaEntity.needsFallbackName()); streetEdgeBuilder.withWheelchairAccessible(areaEntity.isWheelchairAccessible()); @@ -559,11 +556,8 @@ private Set createSegments( .withPermission(areaPermissions) .withBack(true) .withArea(edgeList) - .withCarSpeed(carSpeed); - - if (!areaEntity.hasTag("name") && !areaEntity.hasTag("ref")) { - backStreetEdgeBuilder.withBogusName(true); - } + .withCarSpeed(carSpeed) + .withBogusName(areaEntity.needsFallbackName()); backStreetEdgeBuilder.withWheelchairAccessible(areaEntity.isWheelchairAccessible()); diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index 37757823362..5128fb49d3f 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -576,6 +576,13 @@ public boolean isWheelchairAccessible() { return !isTagFalse("wheelchair"); } + /** + * Does this entity has a name of its own or if it needs to have a fallback one assigned? + */ + public boolean needsFallbackName() { + return !hasTag("name") && !hasTag("ref"); + } + /** * Returns true if this tag is explicitly access to this entity. */ diff --git a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java index ca5db77df12..18d92a5eec8 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java @@ -262,4 +262,13 @@ void testGenerateI18NForPattern() { osmTags.generateI18NForPattern("Note: {note}, {wheelchair:description}, {foobar:description}") ); } + + @Test + void fallbackName() { + var nameless = WayTestData.cycleway(); + assertTrue(nameless.needsFallbackName()); + + var namedTunnel = WayTestData.carTunnel(); + assertFalse(namedTunnel.needsFallbackName()); + } } From f2d5e4a5bd7aebdf0a520d5b5fd98228571ff8fc Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Mar 2024 15:37:35 +0100 Subject: [PATCH 0905/1688] Improve debugging of edge names --- .../vector/edge/EdgePropertyMapper.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java index fb65d0b5d3b..704bf961dfa 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java @@ -3,6 +3,7 @@ import static org.opentripplanner.framework.lang.DoubleUtils.roundTo2Decimals; import static org.opentripplanner.inspector.vector.KeyValue.kv; +import com.google.common.collect.Lists; import java.util.Collection; import java.util.List; import org.opentripplanner.apis.support.mapping.PropertyMapper; @@ -16,16 +17,26 @@ public class EdgePropertyMapper extends PropertyMapper { @Override protected Collection map(Edge input) { - List baseProps = List.of(kv("class", input.getClass().getSimpleName())); + var baseProps = List.of(kv("class", input.getClass().getSimpleName())); List properties = switch (input) { - case StreetEdge e -> List.of( - kv("permission", e.getPermission().toString()), - kv("bicycleSafetyFactor", roundTo2Decimals(e.getBicycleSafetyFactor())) - ); + case StreetEdge e -> mapStreetEdge(e); case EscalatorEdge e -> List.of(kv("distance", e.getDistanceMeters())); default -> List.of(); }; return ListUtils.combine(baseProps, properties); } + + private static List mapStreetEdge(StreetEdge se) { + var props = Lists.newArrayList( + kv("permission", se.getPermission().toString()), + kv("bicycleSafetyFactor", roundTo2Decimals(se.getBicycleSafetyFactor())) + ); + if (se.hasBogusName()) { + props.addFirst(kv("generated name", "%s".formatted(se.getName().toString()))); + } else { + props.addFirst(kv("name", se.getName().toString())); + } + return props; + } } From ea94f83770cf7c6970a0157aec13b0504db2c936 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 20 Mar 2024 15:43:44 +0100 Subject: [PATCH 0906/1688] Simplify builder chains --- .../module/osm/WalkableAreaBuilder.java | 16 ++++++---------- .../openstreetmap/model/OSMWay.java | 4 ++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java index 5a828f2b689..6244a50321f 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java @@ -532,11 +532,9 @@ private Set createSegments( .withBack(false) .withArea(edgeList) .withCarSpeed(carSpeed) - .withBogusName(areaEntity.needsFallbackName()); - - streetEdgeBuilder.withWheelchairAccessible(areaEntity.isWheelchairAccessible()); - - streetEdgeBuilder.withLink(areaEntity.isLink()); + .withBogusName(areaEntity.needsFallbackName()) + .withWheelchairAccessible(areaEntity.isWheelchairAccessible()) + .withLink(areaEntity.isLink()); label = "way (area) " + @@ -557,11 +555,9 @@ private Set createSegments( .withBack(true) .withArea(edgeList) .withCarSpeed(carSpeed) - .withBogusName(areaEntity.needsFallbackName()); - - backStreetEdgeBuilder.withWheelchairAccessible(areaEntity.isWheelchairAccessible()); - - backStreetEdgeBuilder.withLink(areaEntity.isLink()); + .withBogusName(areaEntity.needsFallbackName()) + .withWheelchairAccessible(areaEntity.isWheelchairAccessible()) + .withLink(areaEntity.isLink()); if (!wayPropertiesCache.containsKey(areaEntity)) { WayProperties wayData = areaEntity diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java index 1ce6c698f22..c0cd049bd83 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java @@ -60,6 +60,10 @@ public boolean isSteps() { return isTag("highway", "steps"); } + /** + * Checks the wheelchair-accessibility of this way. Stairs are by default inaccessible but + * can be made accessible if they explicitly set wheelchair=true. + */ public boolean isWheelchairAccessible() { if (isSteps()) { return isTagTrue("wheelchair"); From c25c12ab69da21a7ca45255530e6c412210caf0e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 21 Mar 2024 17:19:33 +0100 Subject: [PATCH 0907/1688] Add first draft of edge naming --- .../apis/vectortiles/DebugStyleSpec.java | 27 +++++-- .../apis/vectortiles/model/StyleBuilder.java | 20 +++++ .../apis/vectortiles/model/StyleSpec.java | 5 ++ .../module/osm/naming/SidewalkNamer.java | 77 +++++++++++++++++++ .../graph_builder/services/osm/EdgeNamer.java | 4 +- .../vector/edge/EdgePropertyMapper.java | 2 +- .../openstreetmap/model/OSMWithTags.java | 20 ++++- 7 files changed, 142 insertions(+), 13 deletions(-) create mode 100644 src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 8350a10d670..1558346493a 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -13,6 +13,7 @@ import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink; import org.opentripplanner.street.model.edge.AreaEdge; import org.opentripplanner.street.model.edge.BoardingLocationToStopLink; +import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.ElevatorHopEdge; import org.opentripplanner.street.model.edge.EscalatorEdge; import org.opentripplanner.street.model.edge.PathwayEdge; @@ -49,6 +50,13 @@ public class DebugStyleSpec { 1, List.of(new ZoomStop(15, 0.2f), new ZoomStop(MAX_ZOOM, 3)) ); + private static final Class[] ALL_EDGES = new Class[]{StreetEdge.class, + AreaEdge.class, + EscalatorEdge.class, + PathwayEdge.class, + ElevatorHopEdge.class, + TemporaryPartialStreetEdge.class, + TemporaryFreeEdge.class}; static StyleSpec build( VectorSourceLayer regularStops, @@ -74,18 +82,23 @@ static StyleSpec build( .vectorSourceLayer(edges) .lineColor(MAGENTA) .edgeFilter( - StreetEdge.class, - AreaEdge.class, - EscalatorEdge.class, - PathwayEdge.class, - ElevatorHopEdge.class, - TemporaryPartialStreetEdge.class, - TemporaryFreeEdge.class + ALL_EDGES ) .lineWidth(LINE_WIDTH) .minZoom(13) .maxZoom(MAX_ZOOM) .intiallyHidden(), + StyleBuilder + .ofId("edge-name") + .typeSymbol() + .lineText("name") + .vectorSourceLayer(edges) + .edgeFilter( + ALL_EDGES + ) + .minZoom(15) + .maxZoom(MAX_ZOOM) + .intiallyHidden(), StyleBuilder .ofId("link") .typeLine() diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java index 07efe376968..c7f259b0c9b 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java @@ -8,6 +8,7 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Stream; +import org.opentripplanner.apis.vectortiles.model.ZoomDependentNumber.ZoomStop; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.street.model.edge.Edge; @@ -41,6 +42,7 @@ public enum LayerType { Line, Raster, Fill, + Symbol } private StyleBuilder(String id) { @@ -94,11 +96,29 @@ public StyleBuilder typeFill() { return this; } + public StyleBuilder typeSymbol() { + type(LayerType.Symbol); + return this; + } + private StyleBuilder type(LayerType type) { props.put(TYPE, type.name().toLowerCase()); return this; } + public StyleBuilder lineText(String name){ + layout.put("symbol-placement", "line"); + layout.put("text-field", "{%s}".formatted(name)); + layout.put("text-font", List.of("KlokanTech Noto Sans Regular")); + layout.put("text-size", new ZoomDependentNumber(14, List.of(new ZoomStop(14, 12), new ZoomStop(20, 14))).toJson()); + layout.put("text-offset", List.of(0, 0.9)); + paint.put("text-color", "#000"); + paint.put("text-halo-color", "#fff"); + paint.put("text-halo-blur", 4); + paint.put("text-halo-width", 3); + return this; + } + public StyleBuilder circleColor(String color) { paint.put("circle-color", validateColor(color)); return this; diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java index 64f680ed202..71e5df9d335 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleSpec.java @@ -46,4 +46,9 @@ public Map sources() { public List layers() { return layers; } + + @JsonSerialize + public String glyphs() { + return "https://cdn.jsdelivr.net/gh/klokantech/klokantech-gl-fonts@master/{fontstack}/{range}.pbf"; + } } diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java new file mode 100644 index 00000000000..e32df244530 --- /dev/null +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -0,0 +1,77 @@ +package org.opentripplanner.graph_builder.module.osm.naming; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.Comparator; +import java.util.List; +import org.locationtech.jts.algorithm.distance.DiscreteHausdorffDistance; +import org.locationtech.jts.index.SpatialIndex; +import org.locationtech.jts.index.quadtree.Quadtree; +import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.framework.logging.ProgressTracker; +import org.opentripplanner.graph_builder.services.osm.EdgeNamer; +import org.opentripplanner.openstreetmap.model.OSMWithTags; +import org.opentripplanner.street.model.edge.StreetEdge; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SidewalkNamer implements EdgeNamer { + + private static final Logger LOG = LoggerFactory.getLogger(SidewalkNamer.class); + + private SpatialIndex streetEdges = new Quadtree(); + private Collection unnamedSidewalks = new ArrayList<>(); + + @Override + public I18NString name(OSMWithTags way) { + return way.getAssumedName(); + } + + @Override + public void recordEdge(OSMWithTags way, StreetEdge edge) { + if (way.isSidewalk() && way.needsFallbackName()) { + unnamedSidewalks.add(edge); + } + if (way.isNamed()) { + streetEdges.insert(edge.getGeometry().getEnvelopeInternal(), edge); + } + } + + @Override + public void postprocess() { + ProgressTracker progress = ProgressTracker.track( + "Assigning names to sidewalks", + 500, + unnamedSidewalks.size() + ); + unnamedSidewalks + .parallelStream() + .forEach(sidewalk -> { + var envelope = sidewalk.getGeometry().getEnvelopeInternal(); + envelope.expandBy(0.0002); + var candidates = (List) streetEdges.query(envelope); + + candidates + .stream() + .min(lowestHausdorffDistance(sidewalk)) + .ifPresent(named -> { + sidewalk.setName(named.getName()); + }); + + //Keep lambda! A method-ref would cause incorrect class and line number to be logged + //noinspection Convert2MethodRef + progress.step(m -> LOG.info(m)); + }); + LOG.info(progress.completeMessage()); + + // set the indices to null so they can be garbage-collected + streetEdges = null; + unnamedSidewalks = null; + } + + private static Comparator lowestHausdorffDistance(StreetEdge sidewalk) { + return Comparator.comparingDouble(candidate -> + DiscreteHausdorffDistance.distance(sidewalk.getGeometry(), candidate.getGeometry()) + ); + } +} diff --git a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java index d9e52a18465..2733e705c70 100644 --- a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java @@ -5,6 +5,7 @@ import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.module.osm.naming.DefaultNamer; import org.opentripplanner.graph_builder.module.osm.naming.PortlandCustomNamer; +import org.opentripplanner.graph_builder.module.osm.naming.SidewalkNamer; import org.opentripplanner.openstreetmap.model.OSMWithTags; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.framework.json.OtpVersion; @@ -50,7 +51,7 @@ public static EdgeNamer fromConfig(NodeAdapter root, String parameterName) { var osmNaming = root .of(parameterName) .summary("A custom OSM namer to use.") - .since(OtpVersion.V2_0) + .since(OtpVersion.V1_5) .asString(null); return fromConfig(osmNaming); } @@ -65,6 +66,7 @@ public static EdgeNamer fromConfig(String type) { return switch (type) { case "portland" -> new PortlandCustomNamer(); + case "sidewalks" -> new SidewalkNamer(); default -> throw new IllegalArgumentException( String.format("Unknown osmNaming type: '%s'", type) ); diff --git a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java index 704bf961dfa..d43a91d384d 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java +++ b/src/main/java/org/opentripplanner/inspector/vector/edge/EdgePropertyMapper.java @@ -33,7 +33,7 @@ private static List mapStreetEdge(StreetEdge se) { kv("bicycleSafetyFactor", roundTo2Decimals(se.getBicycleSafetyFactor())) ); if (se.hasBogusName()) { - props.addFirst(kv("generated name", "%s".formatted(se.getName().toString()))); + props.addFirst(kv("name", "%s (generated)".formatted(se.getName().toString()))); } else { props.addFirst(kv("name", se.getName().toString())); } diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index 5128fb49d3f..a4922400b04 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -30,7 +30,7 @@ public class OSMWithTags { /** * highway=* values that we don't want to even consider when building the graph. */ - public static final Set NON_ROUTABLE_HIGHWAYS = Set.of( + private static final Set NON_ROUTABLE_HIGHWAYS = Set.of( "proposed", "planned", "construction", @@ -46,7 +46,8 @@ public class OSMWithTags { "escape" ); - static final Set LEVEL_TAGS = Set.of("level", "layer"); + private static final Set LEVEL_TAGS = Set.of("level", "layer"); + private static final Set DEFAULT_LEVEL = Set.of("0"); /* To save memory this is only created when an entity actually has tags. */ private Map tags; @@ -163,6 +164,10 @@ public boolean isBicycleDismountForced() { return isTag("bicycle", "dismount"); } + public boolean isSidewalk() { + return isTag("footway", "sidewalk") && isTag("highway", "footway"); + } + protected boolean doesTagAllowAccess(String tag) { if (tags == null) { return false; @@ -580,7 +585,14 @@ public boolean isWheelchairAccessible() { * Does this entity has a name of its own or if it needs to have a fallback one assigned? */ public boolean needsFallbackName() { - return !hasTag("name") && !hasTag("ref"); + return !isNamed(); + } + + /** + * Does this entity have tags that allow extracting a name? + */ + public boolean isNamed() { + return hasTag("name") || hasTag("ref"); } /** @@ -600,7 +612,7 @@ public Set getLevels() { var levels = getMultiTagValues(LEVEL_TAGS); if (levels.isEmpty()) { // default - return Set.of("0"); + return DEFAULT_LEVEL; } return levels; } From bac74c97ccfba54360636d49d0ce6175b043e0e4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 09:58:25 +0100 Subject: [PATCH 0908/1688] Finetune sidewalk naming --- .../apis/vectortiles/DebugStyleSpec.java | 16 ++-- .../apis/vectortiles/model/StyleBuilder.java | 14 +++- .../module/osm/naming/SidewalkNamer.java | 73 +++++++++++++++++-- .../openstreetmap/model/OSMWithTags.java | 7 ++ 4 files changed, 91 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 1558346493a..16e3b247bc7 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -50,13 +50,15 @@ public class DebugStyleSpec { 1, List.of(new ZoomStop(15, 0.2f), new ZoomStop(MAX_ZOOM, 3)) ); - private static final Class[] ALL_EDGES = new Class[]{StreetEdge.class, + private static final Class[] ALL_EDGES = new Class[] { + StreetEdge.class, AreaEdge.class, EscalatorEdge.class, PathwayEdge.class, ElevatorHopEdge.class, TemporaryPartialStreetEdge.class, - TemporaryFreeEdge.class}; + TemporaryFreeEdge.class, + }; static StyleSpec build( VectorSourceLayer regularStops, @@ -81,9 +83,7 @@ static StyleSpec build( .typeLine() .vectorSourceLayer(edges) .lineColor(MAGENTA) - .edgeFilter( - ALL_EDGES - ) + .edgeFilter(ALL_EDGES) .lineWidth(LINE_WIDTH) .minZoom(13) .maxZoom(MAX_ZOOM) @@ -93,10 +93,8 @@ static StyleSpec build( .typeSymbol() .lineText("name") .vectorSourceLayer(edges) - .edgeFilter( - ALL_EDGES - ) - .minZoom(15) + .edgeFilter(ALL_EDGES) + .minZoom(17) .maxZoom(MAX_ZOOM) .intiallyHidden(), StyleBuilder diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java index c7f259b0c9b..28c1e792fd1 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java @@ -42,7 +42,7 @@ public enum LayerType { Line, Raster, Fill, - Symbol + Symbol, } private StyleBuilder(String id) { @@ -106,12 +106,18 @@ private StyleBuilder type(LayerType type) { return this; } - public StyleBuilder lineText(String name){ + public StyleBuilder lineText(String name) { layout.put("symbol-placement", "line"); + layout.put("symbol-spacing", 500); layout.put("text-field", "{%s}".formatted(name)); layout.put("text-font", List.of("KlokanTech Noto Sans Regular")); - layout.put("text-size", new ZoomDependentNumber(14, List.of(new ZoomStop(14, 12), new ZoomStop(20, 14))).toJson()); - layout.put("text-offset", List.of(0, 0.9)); + layout.put( + "text-size", + new ZoomDependentNumber(14, List.of(new ZoomStop(14, 12), new ZoomStop(20, 14))).toJson() + ); + layout.put("text-max-width", 5); + layout.put("text-keep-upright", true); + layout.put("text-rotation-alignment", "map"); paint.put("text-color", "#000"); paint.put("text-halo-color", "#fff"); paint.put("text-halo-blur", 4); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index e32df244530..fa988df6032 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -4,9 +4,13 @@ import java.util.Collection; import java.util.Comparator; import java.util.List; +import java.util.Objects; import org.locationtech.jts.algorithm.distance.DiscreteHausdorffDistance; import org.locationtech.jts.index.SpatialIndex; -import org.locationtech.jts.index.quadtree.Quadtree; +import org.locationtech.jts.operation.distance.DistanceOp; +import org.opentripplanner.framework.geometry.HashGridSpatialIndex; +import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; +import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; @@ -18,8 +22,9 @@ public class SidewalkNamer implements EdgeNamer { private static final Logger LOG = LoggerFactory.getLogger(SidewalkNamer.class); + private static final int MAX_DISTANCE_TO_SIDEWALK = 50; - private SpatialIndex streetEdges = new Quadtree(); + private SpatialIndex streetEdges = new HashGridSpatialIndex(); private Collection unnamedSidewalks = new ArrayList<>(); @Override @@ -29,7 +34,7 @@ public I18NString name(OSMWithTags way) { @Override public void recordEdge(OSMWithTags way, StreetEdge edge) { - if (way.isSidewalk() && way.needsFallbackName()) { + if (way.isSidewalk() && way.needsFallbackName() && !way.isExplicitlyUnnamed()) { unnamedSidewalks.add(edge); } if (way.isNamed()) { @@ -44,24 +49,45 @@ public void postprocess() { 500, unnamedSidewalks.size() ); + + List edges = new ArrayList<>(); unnamedSidewalks .parallelStream() .forEach(sidewalk -> { var envelope = sidewalk.getGeometry().getEnvelopeInternal(); - envelope.expandBy(0.0002); + envelope.expandBy(0.000002); var candidates = (List) streetEdges.query(envelope); candidates .stream() - .min(lowestHausdorffDistance(sidewalk)) + .map(c -> { + var hausdorff = DiscreteHausdorffDistance.distance( + sidewalk.getGeometry(), + c.getGeometry(),0.5 + ); + + var points = DistanceOp.nearestPoints( c.getGeometry(),sidewalk.getGeometry()); + double fastDistance = SphericalDistanceLibrary.fastDistance(points[0], points[1]); + + return new EdgeWithDistance(hausdorff, fastDistance, candidates.size(), c, sidewalk); + }) + .filter(e -> e.distance < MAX_DISTANCE_TO_SIDEWALK) + .min(Comparator.comparingDouble(EdgeWithDistance::hausdorff)) .ifPresent(named -> { - sidewalk.setName(named.getName()); + edges.add(named); + sidewalk.setName(Objects.requireNonNull(named.namedEdge.getName())); }); //Keep lambda! A method-ref would cause incorrect class and line number to be logged //noinspection Convert2MethodRef progress.step(m -> LOG.info(m)); }); + + edges + .stream() + .sorted(Comparator.comparingDouble(EdgeWithDistance::hausdorff).reversed()) + .limit(100) + .forEach(EdgeWithDistance::logDebugString); LOG.info(progress.completeMessage()); // set the indices to null so they can be garbage-collected @@ -74,4 +100,39 @@ private static Comparator lowestHausdorffDistance(StreetEdge sidewal DiscreteHausdorffDistance.distance(sidewalk.getGeometry(), candidate.getGeometry()) ); } + + record EdgeWithDistance( + double hausdorff, + double distance, + int numberOfCandidates, + StreetEdge namedEdge, + StreetEdge sidewalk + ) { + void logDebugString() { + LOG.info("Name '{}' applied with low Hausdorff distance ", namedEdge.getName()); + LOG.info("Hausdorff: {}", hausdorff); + LOG.info("Distance: {}m", distance); + LOG.info("OSM: {}", osmUrl()); + LOG.info("Debug client: {}", debugClientUrl()); + LOG.info("<-------------------------------------------------------------------------------->"); + } + + String debugClientUrl() { + var c = new WgsCoordinate(sidewalk.getFromVertex().getCoordinate()); + return "http://localhost:8080/debug-client-preview/#19/%s/%s".formatted( + c.latitude(), + c.longitude() + ); + } + + String osmUrl() { + var c = new WgsCoordinate(sidewalk.getFromVertex().getCoordinate()); + return "https://www.openstreetmap.org/?mlat=%s&mlon=%s#map=17/%s/%s".formatted( + c.latitude(), + c.longitude(), + c.latitude(), + c.longitude() + ); + } + } } diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index a4922400b04..056acafb5d6 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -168,6 +168,13 @@ public boolean isSidewalk() { return isTag("footway", "sidewalk") && isTag("highway", "footway"); } + /** + * Whether this entity explicity doesn't have a name. + */ + public boolean isExplicitlyUnnamed() { + return isTagTrue("noname"); + } + protected boolean doesTagAllowAccess(String tag) { if (tags == null) { return false; From 22e102a77928283d994c2d0e3d3616e4bf77eb4a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 25 Mar 2024 10:04:32 +0100 Subject: [PATCH 0909/1688] Finetune sidewalk naming --- .../graph_builder/module/osm/naming/SidewalkNamer.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index fa988df6032..30696a548f7 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -63,10 +63,11 @@ public void postprocess() { .map(c -> { var hausdorff = DiscreteHausdorffDistance.distance( sidewalk.getGeometry(), - c.getGeometry(),0.5 + c.getGeometry(), + 0.5 ); - var points = DistanceOp.nearestPoints( c.getGeometry(),sidewalk.getGeometry()); + var points = DistanceOp.nearestPoints(c.getGeometry(), sidewalk.getGeometry()); double fastDistance = SphericalDistanceLibrary.fastDistance(points[0], points[1]); return new EdgeWithDistance(hausdorff, fastDistance, candidates.size(), c, sidewalk); @@ -114,7 +115,9 @@ void logDebugString() { LOG.info("Distance: {}m", distance); LOG.info("OSM: {}", osmUrl()); LOG.info("Debug client: {}", debugClientUrl()); - LOG.info("<-------------------------------------------------------------------------------->"); + LOG.info( + "<-------------------------------------------------------------------------------->" + ); } String debugClientUrl() { From 1f106b14e5e4e7d7dc318b89a9ba1b9b2e13ad89 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 26 Mar 2024 17:20:50 +0100 Subject: [PATCH 0910/1688] Add documentation --- .../geometry/SphericalDistanceLibrary.java | 14 ++++++++++---- .../module/osm/naming/SidewalkNamer.java | 13 +++++++++---- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java b/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java index 479163aefd1..38c80e86d79 100644 --- a/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java +++ b/src/main/java/org/opentripplanner/framework/geometry/SphericalDistanceLibrary.java @@ -30,10 +30,16 @@ public static double distance(Coordinate from, Coordinate to) { return distance(from.y, from.x, to.y, to.x); } + /** + * @see SphericalDistanceLibrary#fastDistance(double, double, double, double) + */ public static double fastDistance(Coordinate from, Coordinate to) { return fastDistance(from.y, from.x, to.y, to.x); } + /** + * @see SphericalDistanceLibrary#fastDistance(double, double, double, double) + */ public static double fastDistance(Coordinate from, Coordinate to, double cosLat) { double dLat = toRadians(from.y - to.y); double dLon = toRadians(from.x - to.x) * cosLat; @@ -105,8 +111,8 @@ public static double distance(double lat1, double lon1, double lat2, double lon2 } /** - * Compute an (approximated) distance between two points, with a known cos(lat). Be careful, this - * is approximated and never check for the validity of input cos(lat). + * Compute an (approximated) distance in meters between two points, with a known cos(lat). + * Be careful, this is approximated and never checks for the validity of input cos(lat). */ public static double fastDistance(double lat1, double lon1, double lat2, double lon2) { return fastDistance(lat1, lon1, lat2, lon2, RADIUS_OF_EARTH_IN_M); @@ -131,8 +137,8 @@ public static double distance(double lat1, double lon1, double lat2, double lon2 } /** - * Approximated, fast and under-estimated equirectangular distance between two points. Works only - * for small delta lat/lon, fall-back on exact distance if not the case. See: + * Approximated, fast and under-estimated equirectangular distance in meters between two points. + * Works only for small delta lat/lon, fall-back on exact distance if not the case. See: * http://www.movable-type.co.uk/scripts/latlong.html */ public static double fastDistance( diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 30696a548f7..495409a62a3 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -68,9 +68,9 @@ public void postprocess() { ); var points = DistanceOp.nearestPoints(c.getGeometry(), sidewalk.getGeometry()); - double fastDistance = SphericalDistanceLibrary.fastDistance(points[0], points[1]); + double distance = SphericalDistanceLibrary.fastDistance(points[0], points[1]); - return new EdgeWithDistance(hausdorff, fastDistance, candidates.size(), c, sidewalk); + return new EdgeWithDistance(hausdorff, distance, candidates.size(), c, sidewalk); }) .filter(e -> e.distance < MAX_DISTANCE_TO_SIDEWALK) .min(Comparator.comparingDouble(EdgeWithDistance::hausdorff)) @@ -84,11 +84,12 @@ public void postprocess() { progress.step(m -> LOG.info(m)); }); - edges + var worst = edges .stream() .sorted(Comparator.comparingDouble(EdgeWithDistance::hausdorff).reversed()) .limit(100) - .forEach(EdgeWithDistance::logDebugString); + .toList(); + worst.forEach(EdgeWithDistance::logDebugString); LOG.info(progress.completeMessage()); // set the indices to null so they can be garbage-collected @@ -109,6 +110,10 @@ record EdgeWithDistance( StreetEdge namedEdge, StreetEdge sidewalk ) { + EdgeWithDistance { + Objects.requireNonNull(namedEdge); + Objects.requireNonNull(sidewalk); + } void logDebugString() { LOG.info("Name '{}' applied with low Hausdorff distance ", namedEdge.getName()); LOG.info("Hausdorff: {}", hausdorff); From 1d83a07ccc6439d4cf4230c11bfe228cade66aa0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 27 Mar 2024 15:37:03 +0100 Subject: [PATCH 0911/1688] Fine-tune sidewalk naming algorithm --- .../framework/geometry/GeometryUtils.java | 2 +- .../module/osm/naming/SidewalkNamer.java | 202 ++++++++++++------ .../openstreetmap/model/OSMWithTags.java | 5 +- 3 files changed, 144 insertions(+), 65 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java b/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java index cf634ad0e23..87a225fc0b3 100644 --- a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java +++ b/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java @@ -264,7 +264,7 @@ public static Geometry convertGeoJsonToJtsGeometry(GeoJsonObject geoJsonGeom) } /** - * Extract individual line string from a mult-line string. + * Extract individual line strings from a multi-line string. */ public static List getLineStrings(MultiLineString mls) { var ret = new ArrayList(); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 495409a62a3..8c03eacbd67 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -5,13 +5,27 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; -import org.locationtech.jts.algorithm.distance.DiscreteHausdorffDistance; -import org.locationtech.jts.index.SpatialIndex; +import java.util.Set; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; +import org.geotools.api.referencing.FactoryException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; +import org.geotools.api.referencing.operation.MathTransform; +import org.geotools.api.referencing.operation.TransformException; +import org.geotools.geometry.jts.JTS; +import org.geotools.referencing.CRS; +import org.geotools.referencing.crs.DefaultGeographicCRS; +import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.MultiLineString; +import org.locationtech.jts.geom.Point; +import org.locationtech.jts.operation.buffer.BufferParameters; import org.locationtech.jts.operation.distance.DistanceOp; +import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.HashGridSpatialIndex; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; -import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.logging.ProgressTracker; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.openstreetmap.model.OSMWithTags; @@ -23,9 +37,10 @@ public class SidewalkNamer implements EdgeNamer { private static final Logger LOG = LoggerFactory.getLogger(SidewalkNamer.class); private static final int MAX_DISTANCE_TO_SIDEWALK = 50; + private static final double MIN_PERCENT_IN_BUFFER = .85; - private SpatialIndex streetEdges = new HashGridSpatialIndex(); - private Collection unnamedSidewalks = new ArrayList<>(); + private HashGridSpatialIndex streetEdges = new HashGridSpatialIndex<>(); + private Collection unnamedSidewalks = new ArrayList<>(); @Override public I18NString name(OSMWithTags way) { @@ -35,10 +50,19 @@ public I18NString name(OSMWithTags way) { @Override public void recordEdge(OSMWithTags way, StreetEdge edge) { if (way.isSidewalk() && way.needsFallbackName() && !way.isExplicitlyUnnamed()) { - unnamedSidewalks.add(edge); + unnamedSidewalks.add(new EdgeOnLevel(edge, way.getLevels())); } - if (way.isNamed()) { - streetEdges.insert(edge.getGeometry().getEnvelopeInternal(), edge); + if (way.isNamed() && !way.isLink()) { + var containsReverse = streetEdges + .query(edge.getGeometry().getEnvelopeInternal()) + .stream() + .anyMatch(candidate -> candidate.edge.isReverseOf(edge)); + if (!containsReverse) { + streetEdges.insert( + edge.getGeometry().getEnvelopeInternal(), + new EdgeOnLevel(edge, way.getLevels()) + ); + } } } @@ -50,33 +74,58 @@ public void postprocess() { unnamedSidewalks.size() ); - List edges = new ArrayList<>(); + final AtomicInteger namesApplied = new AtomicInteger(0); unnamedSidewalks .parallelStream() - .forEach(sidewalk -> { + .forEach(sidewalkOnLevel -> { + var sidewalk = sidewalkOnLevel.edge; var envelope = sidewalk.getGeometry().getEnvelopeInternal(); envelope.expandBy(0.000002); - var candidates = (List) streetEdges.query(envelope); + var candidates = streetEdges.query(envelope); - candidates + var groups = candidates + .stream() + .collect(Collectors.groupingBy(e -> e.edge.getName())) + .entrySet() .stream() - .map(c -> { - var hausdorff = DiscreteHausdorffDistance.distance( - sidewalk.getGeometry(), - c.getGeometry(), - 0.5 + .map(entry -> { + var levels = entry + .getValue() + .stream() + .flatMap(e -> e.levels.stream()) + .collect(Collectors.toSet()); + return new CandidateGroup( + entry.getKey(), + entry.getValue().stream().map(e -> e.edge).toList(), + levels ); + }); - var points = DistanceOp.nearestPoints(c.getGeometry(), sidewalk.getGeometry()); - double distance = SphericalDistanceLibrary.fastDistance(points[0], points[1]); + var buffer = preciseBuffer(sidewalk.getGeometry(), 25); + var sidewalkLength = SphericalDistanceLibrary.length(sidewalk.getGeometry()); - return new EdgeWithDistance(hausdorff, distance, candidates.size(), c, sidewalk); + groups + .filter(g -> g.nearestDistanceTo(sidewalk.getGeometry()) < MAX_DISTANCE_TO_SIDEWALK) + .filter(g -> g.levels.equals(sidewalkOnLevel.levels)) + .map(g -> { + var lengthInsideBuffer = g.intersectionLength(buffer); + double percentInBuffer = lengthInsideBuffer / sidewalkLength; + return new NamedEdgeGroup(percentInBuffer, candidates.size(), g.name, sidewalk); }) - .filter(e -> e.distance < MAX_DISTANCE_TO_SIDEWALK) - .min(Comparator.comparingDouble(EdgeWithDistance::hausdorff)) - .ifPresent(named -> { - edges.add(named); - sidewalk.setName(Objects.requireNonNull(named.namedEdge.getName())); + // remove those groups where less than a certain percentage is inside the buffer around + // the sidewalk. this safety mechanism for sidewalks that snake around the + // like https://www.openstreetmap.org/way/1059101564 + .filter(group -> group.percentInBuffer > MIN_PERCENT_IN_BUFFER) + .max(Comparator.comparingDouble(NamedEdgeGroup::percentInBuffer)) + .ifPresent(group -> { + namesApplied.incrementAndGet(); + var name = group.name.toString(); + + sidewalk.setName( + Objects.requireNonNull( + I18NString.of("%s, Percent in buffer: %s".formatted(name, group.percentInBuffer)) + ) + ); }); //Keep lambda! A method-ref would cause incorrect class and line number to be logged @@ -84,12 +133,13 @@ public void postprocess() { progress.step(m -> LOG.info(m)); }); - var worst = edges - .stream() - .sorted(Comparator.comparingDouble(EdgeWithDistance::hausdorff).reversed()) - .limit(100) - .toList(); - worst.forEach(EdgeWithDistance::logDebugString); + LOG.info( + "Assigned names to {} of {} of sidewalks ({})", + namesApplied.get(), + unnamedSidewalks.size(), + DoubleUtils.roundTo2Decimals((double) namesApplied.get() / unnamedSidewalks.size() * 100) + ); + LOG.info(progress.completeMessage()); // set the indices to null so they can be garbage-collected @@ -97,50 +147,76 @@ public void postprocess() { unnamedSidewalks = null; } - private static Comparator lowestHausdorffDistance(StreetEdge sidewalk) { - return Comparator.comparingDouble(candidate -> - DiscreteHausdorffDistance.distance(sidewalk.getGeometry(), candidate.getGeometry()) - ); + /** + * Taken from https://stackoverflow.com/questions/36455020 + */ + private Geometry preciseBuffer(Geometry geometry, double distanceInMeters) { + try { + var coordinate = geometry.getCentroid().getCoordinate(); + String code = "AUTO:42001,%s,%s".formatted(coordinate.x, coordinate.y); + CoordinateReferenceSystem auto = CRS.decode(code); + + MathTransform toTransform = CRS.findMathTransform(DefaultGeographicCRS.WGS84, auto); + MathTransform fromTransform = CRS.findMathTransform(auto, DefaultGeographicCRS.WGS84); + + Geometry pGeom = JTS.transform(geometry, toTransform); + + Geometry pBufferedGeom = pGeom.buffer(distanceInMeters, 4, BufferParameters.CAP_FLAT); + return JTS.transform(pBufferedGeom, fromTransform); + } catch (TransformException | FactoryException e) { + throw new RuntimeException(e); + } } - record EdgeWithDistance( - double hausdorff, - double distance, + record NamedEdgeGroup( + double percentInBuffer, int numberOfCandidates, - StreetEdge namedEdge, + I18NString name, StreetEdge sidewalk ) { - EdgeWithDistance { - Objects.requireNonNull(namedEdge); + NamedEdgeGroup { + Objects.requireNonNull(name); Objects.requireNonNull(sidewalk); } - void logDebugString() { - LOG.info("Name '{}' applied with low Hausdorff distance ", namedEdge.getName()); - LOG.info("Hausdorff: {}", hausdorff); - LOG.info("Distance: {}m", distance); - LOG.info("OSM: {}", osmUrl()); - LOG.info("Debug client: {}", debugClientUrl()); - LOG.info( - "<-------------------------------------------------------------------------------->" - ); + } + + record CandidateGroup(I18NString name, List edges, Set levels) { + double intersectionLength(Geometry polygon) { + return edges + .stream() + .mapToDouble(edge -> { + var intersection = polygon.intersection(edge.getGeometry()); + return length(intersection); + }) + .sum(); } - String debugClientUrl() { - var c = new WgsCoordinate(sidewalk.getFromVertex().getCoordinate()); - return "http://localhost:8080/debug-client-preview/#19/%s/%s".formatted( - c.latitude(), - c.longitude() + private double length(Geometry intersection) { + return switch (intersection) { + case LineString ls -> SphericalDistanceLibrary.length(ls); + case MultiLineString mls -> GeometryUtils + .getLineStrings(mls) + .stream() + .mapToDouble(this::intersectionLength) + .sum(); + case Point ignored -> 0; + case Geometry g -> throw new IllegalStateException( + "Didn't expect geometry %s".formatted(g.getClass()) ); + }; } - String osmUrl() { - var c = new WgsCoordinate(sidewalk.getFromVertex().getCoordinate()); - return "https://www.openstreetmap.org/?mlat=%s&mlon=%s#map=17/%s/%s".formatted( - c.latitude(), - c.longitude(), - c.latitude(), - c.longitude() - ); + double nearestDistanceTo(Geometry g) { + return edges + .stream() + .mapToDouble(e -> { + var points = DistanceOp.nearestPoints(e.getGeometry(), g); + return SphericalDistanceLibrary.fastDistance(points[0], points[1]); + }) + .min() + .orElse(Double.MAX_VALUE); } } + + record EdgeOnLevel(StreetEdge edge, Set levels) {} } diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index 056acafb5d6..5cf5ce52a2f 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -533,7 +533,7 @@ public Set getMultiTagValues(Set refTags) { .flatMap(v -> Arrays.stream(v.split(";"))) .map(String::strip) .filter(v -> !v.isBlank()) - .collect(Collectors.toUnmodifiableSet()); + .collect(Collectors.toSet()); } public OsmProvider getOsmProvider() { @@ -570,6 +570,9 @@ public boolean isRoutable() { return false; } + /** + * Is this a link to another road, like a highway ramp. + */ public boolean isLink() { String highway = getTag("highway"); return highway != null && highway.endsWith(("_link")); From ea1c1697f8467da822940e138604c712b4502f8f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 27 Mar 2024 15:47:07 +0100 Subject: [PATCH 0912/1688] Update tests and docs --- docs/BuildConfiguration.md | 2 +- .../apis/vectortiles/style.json | 55 ++++++++++++++++++- 2 files changed, 54 insertions(+), 3 deletions(-) diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index 3a3a6ff7ee4..c993016160f 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -35,7 +35,7 @@ Sections follow that describe particular settings in more depth. | maxTransferDuration | `duration` | Transfers up to this duration with the default walk speed value will be pre-calculated and included in the Graph. | *Optional* | `"PT30M"` | 2.1 | | [multiThreadElevationCalculations](#multiThreadElevationCalculations) | `boolean` | Configuring multi-threading during elevation calculations. | *Optional* | `false` | 2.0 | | [osmCacheDataInMem](#osmCacheDataInMem) | `boolean` | If OSM data should be cached in memory during processing. | *Optional* | `false` | 2.0 | -| osmNaming | `string` | A custom OSM namer to use. | *Optional* | | 2.0 | +| osmNaming | `string` | A custom OSM namer to use. | *Optional* | | 1.5 | | platformEntriesLinking | `boolean` | Link unconnected entries to public transport platforms. | *Optional* | `false` | 2.0 | | [readCachedElevations](#readCachedElevations) | `boolean` | Whether to read cached elevation data. | *Optional* | `true` | 2.0 | | staticBikeParkAndRide | `boolean` | Whether we should create bike P+R stations from OSM data. | *Optional* | `false` | 1.5 | diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index 7e611171409..f8a6a80e44c 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -63,6 +63,56 @@ "visibility" : "none" } }, + { + "id" : "edge-name", + "type" : "symbol", + "source" : "vectorSource", + "source-layer" : "edges", + "minzoom" : 17, + "maxzoom" : 23, + "paint" : { + "text-color" : "#000", + "text-halo-color" : "#fff", + "text-halo-blur" : 4, + "text-halo-width" : 3 + }, + "filter" : [ + "in", + "class", + "StreetEdge", + "AreaEdge", + "EscalatorEdge", + "PathwayEdge", + "ElevatorHopEdge", + "TemporaryPartialStreetEdge", + "TemporaryFreeEdge" + ], + "layout" : { + "symbol-placement" : "line", + "symbol-spacing" : 500, + "text-field" : "{name}", + "text-font" : [ + "KlokanTech Noto Sans Regular" + ], + "text-size" : { + "base" : 14.0, + "stops" : [ + [ + 14, + 12.0 + ], + [ + 20, + 14.0 + ] + ] + }, + "text-max-width" : 5, + "text-keep-upright" : true, + "text-rotation-alignment" : "map", + "visibility" : "none" + } + }, { "id" : "link", "type" : "line", @@ -194,5 +244,6 @@ } } ], - "version" : 8 -} + "version" : 8, + "glyphs" : "https://cdn.jsdelivr.net/gh/klokantech/klokantech-gl-fonts@master/{fontstack}/{range}.pbf" +} \ No newline at end of file From daac6006f9e0cae79fb9b7a7bf5a0b75673aa727 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 27 Mar 2024 16:48:14 +0100 Subject: [PATCH 0913/1688] Improve documentation --- docs/BuildConfiguration.md | 10 ++++++++- .../module/osm/naming/SidewalkNamer.java | 8 +------ .../graph_builder/services/osm/EdgeNamer.java | 21 +++++++++++-------- .../services/osm/EdgeNamerTest.java | 12 +++++++++++ 4 files changed, 34 insertions(+), 17 deletions(-) create mode 100644 src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index c993016160f..a95421e47f7 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -35,7 +35,7 @@ Sections follow that describe particular settings in more depth. | maxTransferDuration | `duration` | Transfers up to this duration with the default walk speed value will be pre-calculated and included in the Graph. | *Optional* | `"PT30M"` | 2.1 | | [multiThreadElevationCalculations](#multiThreadElevationCalculations) | `boolean` | Configuring multi-threading during elevation calculations. | *Optional* | `false` | 2.0 | | [osmCacheDataInMem](#osmCacheDataInMem) | `boolean` | If OSM data should be cached in memory during processing. | *Optional* | `false` | 2.0 | -| osmNaming | `string` | A custom OSM namer to use. | *Optional* | | 1.5 | +| [osmNaming](#osmNaming) | `enum` | A custom OSM namer to use. | *Optional* | `"none"` | 1.5 | | platformEntriesLinking | `boolean` | Link unconnected entries to public transport platforms. | *Optional* | `false` | 2.0 | | [readCachedElevations](#readCachedElevations) | `boolean` | Whether to read cached elevation data. | *Optional* | `true` | 2.0 | | staticBikeParkAndRide | `boolean` | Whether we should create bike P+R stations from OSM data. | *Optional* | `false` | 1.5 | @@ -536,6 +536,14 @@ deployment depending on your infrastructure. Set the parameter to `true` to cach data, and to `false` to read the stream from the source each time. +

      osmNaming

      + +**Since version:** `1.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"none"` +**Path:** / +**Enum values:** `none` | `portland` | `sidewalks` + +A custom OSM namer to use. +

      readCachedElevations

      **Since version:** `2.0` ∙ **Type:** `boolean` ∙ **Cardinality:** `Optional` ∙ **Default value:** `true` diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 8c03eacbd67..41e4fa09482 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -119,13 +119,7 @@ public void postprocess() { .max(Comparator.comparingDouble(NamedEdgeGroup::percentInBuffer)) .ifPresent(group -> { namesApplied.incrementAndGet(); - var name = group.name.toString(); - - sidewalk.setName( - Objects.requireNonNull( - I18NString.of("%s, Percent in buffer: %s".formatted(name, group.percentInBuffer)) - ) - ); + sidewalk.setName(Objects.requireNonNull(group.name)); }); //Keep lambda! A method-ref would cause incorrect class and line number to be logged diff --git a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java index 2733e705c70..249557ba1fe 100644 --- a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java @@ -52,25 +52,28 @@ public static EdgeNamer fromConfig(NodeAdapter root, String parameterName) { .of(parameterName) .summary("A custom OSM namer to use.") .since(OtpVersion.V1_5) - .asString(null); + .asEnum(EdgeNamerType.NONE); return fromConfig(osmNaming); } /** * Create a custom namer if needed, return null if not found / by default. */ - public static EdgeNamer fromConfig(String type) { - if (type == null) { + public static EdgeNamer fromConfig(EdgeNamerType type) { + if(type == null{ return new DefaultNamer(); } - return switch (type) { - case "portland" -> new PortlandCustomNamer(); - case "sidewalks" -> new SidewalkNamer(); - default -> throw new IllegalArgumentException( - String.format("Unknown osmNaming type: '%s'", type) - ); + case PORTLAND -> new PortlandCustomNamer(); + case SIDEWALKS -> new SidewalkNamer(); + case NONE -> new DefaultNamer(); }; } } + + enum EdgeNamerType { + NONE, + PORTLAND, + SIDEWALKS, + } } diff --git a/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java b/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java new file mode 100644 index 00000000000..70e9dbbc198 --- /dev/null +++ b/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java @@ -0,0 +1,12 @@ +package org.opentripplanner.graph_builder.services.osm; + +import org.junit.jupiter.api.Test; + +class EdgeNamerTest { + + @Test + void nullType(){ + var namer = EdgeNamer.EdgeNamerFactory.fromConfig(null); + } + +} \ No newline at end of file From 4d67575df277e8781af10c780d79b252b752e2ac Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 27 Mar 2024 21:40:05 +0100 Subject: [PATCH 0914/1688] Split up methods, add documentation --- .../module/osm/naming/SidewalkNamer.java | 122 ++++++++++-------- .../graph_builder/services/osm/EdgeNamer.java | 8 +- .../services/osm/EdgeNamerTest.java | 15 ++- 3 files changed, 84 insertions(+), 61 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 41e4fa09482..a44b4551919 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -8,6 +8,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; +import java.util.stream.Stream; import org.geotools.api.referencing.FactoryException; import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.api.referencing.operation.MathTransform; @@ -53,6 +54,8 @@ public void recordEdge(OSMWithTags way, StreetEdge edge) { unnamedSidewalks.add(new EdgeOnLevel(edge, way.getLevels())); } if (way.isNamed() && !way.isLink()) { + // we generate two edges for each osm way: one there and one back. since we don't do any routing + // in this class we don't need the two directions and keep only one of them. var containsReverse = streetEdges .query(edge.getGeometry().getEnvelopeInternal()) .stream() @@ -78,49 +81,7 @@ public void postprocess() { unnamedSidewalks .parallelStream() .forEach(sidewalkOnLevel -> { - var sidewalk = sidewalkOnLevel.edge; - var envelope = sidewalk.getGeometry().getEnvelopeInternal(); - envelope.expandBy(0.000002); - var candidates = streetEdges.query(envelope); - - var groups = candidates - .stream() - .collect(Collectors.groupingBy(e -> e.edge.getName())) - .entrySet() - .stream() - .map(entry -> { - var levels = entry - .getValue() - .stream() - .flatMap(e -> e.levels.stream()) - .collect(Collectors.toSet()); - return new CandidateGroup( - entry.getKey(), - entry.getValue().stream().map(e -> e.edge).toList(), - levels - ); - }); - - var buffer = preciseBuffer(sidewalk.getGeometry(), 25); - var sidewalkLength = SphericalDistanceLibrary.length(sidewalk.getGeometry()); - - groups - .filter(g -> g.nearestDistanceTo(sidewalk.getGeometry()) < MAX_DISTANCE_TO_SIDEWALK) - .filter(g -> g.levels.equals(sidewalkOnLevel.levels)) - .map(g -> { - var lengthInsideBuffer = g.intersectionLength(buffer); - double percentInBuffer = lengthInsideBuffer / sidewalkLength; - return new NamedEdgeGroup(percentInBuffer, candidates.size(), g.name, sidewalk); - }) - // remove those groups where less than a certain percentage is inside the buffer around - // the sidewalk. this safety mechanism for sidewalks that snake around the - // like https://www.openstreetmap.org/way/1059101564 - .filter(group -> group.percentInBuffer > MIN_PERCENT_IN_BUFFER) - .max(Comparator.comparingDouble(NamedEdgeGroup::percentInBuffer)) - .ifPresent(group -> { - namesApplied.incrementAndGet(); - sidewalk.setName(Objects.requireNonNull(group.name)); - }); + assignNameToSidewalk(sidewalkOnLevel, namesApplied); //Keep lambda! A method-ref would cause incorrect class and line number to be logged //noinspection Convert2MethodRef @@ -128,7 +89,7 @@ public void postprocess() { }); LOG.info( - "Assigned names to {} of {} of sidewalks ({})", + "Assigned names to {} of {} of sidewalks ({}%)", namesApplied.get(), unnamedSidewalks.size(), DoubleUtils.roundTo2Decimals((double) namesApplied.get() / unnamedSidewalks.size() * 100) @@ -141,6 +102,60 @@ public void postprocess() { unnamedSidewalks = null; } + private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger namesApplied) { + var sidewalk = sidewalkOnLevel.edge; + var buffer = preciseBuffer(sidewalk.getGeometry(), 25); + var sidewalkLength = SphericalDistanceLibrary.length(sidewalk.getGeometry()); + + var envelope = sidewalk.getGeometry().getEnvelopeInternal(); + envelope.expandBy(0.000002); + var candidates = streetEdges.query(envelope); + + groupEdgesByName(candidates) + .filter(g -> g.nearestDistanceTo(sidewalk.getGeometry()) < MAX_DISTANCE_TO_SIDEWALK) + .filter(g -> g.levels.equals(sidewalkOnLevel.levels)) + .map(g -> computePercentInsideBuffer(g, buffer, sidewalkLength)) + // remove those groups where less than a certain percentage is inside the buffer around + // the sidewalk. this safety mechanism for sidewalks that snake around the corner + // like https://www.openstreetmap.org/way/1059101564 + .filter(group -> group.percentInBuffer > MIN_PERCENT_IN_BUFFER) + .max(Comparator.comparingDouble(NamedEdgeGroup::percentInBuffer)) + .ifPresent(group -> { + namesApplied.incrementAndGet(); + sidewalk.setName(Objects.requireNonNull(group.name)); + }); + } + + private static NamedEdgeGroup computePercentInsideBuffer( + CandidateGroup g, + Geometry buffer, + double sidewalkLength + ) { + var lengthInsideBuffer = g.intersectionLength(buffer); + double percentInBuffer = lengthInsideBuffer / sidewalkLength; + return new NamedEdgeGroup(percentInBuffer, g.name); + } + + private static Stream groupEdgesByName(List candidates) { + return candidates + .stream() + .collect(Collectors.groupingBy(e -> e.edge.getName())) + .entrySet() + .stream() + .map(entry -> { + var levels = entry + .getValue() + .stream() + .flatMap(e -> e.levels.stream()) + .collect(Collectors.toSet()); + return new CandidateGroup( + entry.getKey(), + entry.getValue().stream().map(e -> e.edge).toList(), + levels + ); + }); + } + /** * Taken from https://stackoverflow.com/questions/36455020 */ @@ -162,19 +177,17 @@ private Geometry preciseBuffer(Geometry geometry, double distanceInMeters) { } } - record NamedEdgeGroup( - double percentInBuffer, - int numberOfCandidates, - I18NString name, - StreetEdge sidewalk - ) { + private record NamedEdgeGroup(double percentInBuffer, I18NString name) { NamedEdgeGroup { Objects.requireNonNull(name); - Objects.requireNonNull(sidewalk); } } - record CandidateGroup(I18NString name, List edges, Set levels) { + /** + * A group of edges that are near a sidewalk that have the same name. These groups are used + * to figure out if the name of the group can be applied to a nearby sidewalk. + */ + private record CandidateGroup(I18NString name, List edges, Set levels) { double intersectionLength(Geometry polygon) { return edges .stream() @@ -200,6 +213,9 @@ private double length(Geometry intersection) { }; } + /** + * Get the closest distance in meters between any of the edges in the group and the given geometry. + */ double nearestDistanceTo(Geometry g) { return edges .stream() @@ -212,5 +228,5 @@ private double length(Geometry intersection) { } } - record EdgeOnLevel(StreetEdge edge, Set levels) {} + private record EdgeOnLevel(StreetEdge edge, Set levels) {} } diff --git a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java index 249557ba1fe..010b21ec2d1 100644 --- a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java @@ -52,7 +52,7 @@ public static EdgeNamer fromConfig(NodeAdapter root, String parameterName) { .of(parameterName) .summary("A custom OSM namer to use.") .since(OtpVersion.V1_5) - .asEnum(EdgeNamerType.NONE); + .asEnum(EdgeNamerType.DEFAULT); return fromConfig(osmNaming); } @@ -60,19 +60,19 @@ public static EdgeNamer fromConfig(NodeAdapter root, String parameterName) { * Create a custom namer if needed, return null if not found / by default. */ public static EdgeNamer fromConfig(EdgeNamerType type) { - if(type == null{ + if (type == null) { return new DefaultNamer(); } return switch (type) { case PORTLAND -> new PortlandCustomNamer(); case SIDEWALKS -> new SidewalkNamer(); - case NONE -> new DefaultNamer(); + case DEFAULT -> new DefaultNamer(); }; } } enum EdgeNamerType { - NONE, + DEFAULT, PORTLAND, SIDEWALKS, } diff --git a/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java b/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java index 70e9dbbc198..ff471fbfbf6 100644 --- a/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/services/osm/EdgeNamerTest.java @@ -1,12 +1,19 @@ package org.opentripplanner.graph_builder.services.osm; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + import org.junit.jupiter.api.Test; +import org.opentripplanner.graph_builder.module.osm.naming.DefaultNamer; +import org.opentripplanner.graph_builder.services.osm.EdgeNamer.EdgeNamerType; class EdgeNamerTest { @Test - void nullType(){ - var namer = EdgeNamer.EdgeNamerFactory.fromConfig(null); + void nullType() { + assertInstanceOf(DefaultNamer.class, EdgeNamer.EdgeNamerFactory.fromConfig(null)); + assertInstanceOf( + DefaultNamer.class, + EdgeNamer.EdgeNamerFactory.fromConfig(EdgeNamerType.DEFAULT) + ); } - -} \ No newline at end of file +} From 86707901c27ba775a72f948d2c24954324c56148 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 28 Mar 2024 12:27:22 +0100 Subject: [PATCH 0915/1688] Add test, docs --- docs/BuildConfiguration.md | 6 +- .../apis/gtfs/GraphQLScalars.java | 7 +- .../framework/json/ObjectMappers.java | 9 ++ .../module/osm/naming/SidewalkNamer.java | 45 ++++++- .../module/osm/naming/SidewalkNamerTest.java | 114 ++++++++++++++++++ .../wayproperty/specifier/WayTestData.java | 9 +- .../test/support/GeoJsonIo.java | 26 ++++ 7 files changed, 204 insertions(+), 12 deletions(-) create mode 100644 src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java create mode 100644 src/test/java/org/opentripplanner/test/support/GeoJsonIo.java diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index a95421e47f7..fe3a2109ba4 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -35,7 +35,7 @@ Sections follow that describe particular settings in more depth. | maxTransferDuration | `duration` | Transfers up to this duration with the default walk speed value will be pre-calculated and included in the Graph. | *Optional* | `"PT30M"` | 2.1 | | [multiThreadElevationCalculations](#multiThreadElevationCalculations) | `boolean` | Configuring multi-threading during elevation calculations. | *Optional* | `false` | 2.0 | | [osmCacheDataInMem](#osmCacheDataInMem) | `boolean` | If OSM data should be cached in memory during processing. | *Optional* | `false` | 2.0 | -| [osmNaming](#osmNaming) | `enum` | A custom OSM namer to use. | *Optional* | `"none"` | 1.5 | +| [osmNaming](#osmNaming) | `enum` | A custom OSM namer to use. | *Optional* | `"default"` | 1.5 | | platformEntriesLinking | `boolean` | Link unconnected entries to public transport platforms. | *Optional* | `false` | 2.0 | | [readCachedElevations](#readCachedElevations) | `boolean` | Whether to read cached elevation data. | *Optional* | `true` | 2.0 | | staticBikeParkAndRide | `boolean` | Whether we should create bike P+R stations from OSM data. | *Optional* | `false` | 1.5 | @@ -538,9 +538,9 @@ data, and to `false` to read the stream from the source each time.

      osmNaming

      -**Since version:** `1.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"none"` +**Since version:** `1.5` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"default"` **Path:** / -**Enum values:** `none` | `portland` | `sidewalks` +**Enum values:** `default` | `portland` | `sidewalks` A custom OSM namer to use. diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 42ffe992539..5ab24c89543 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -1,6 +1,5 @@ package org.opentripplanner.apis.gtfs; -import com.bedatadriven.jackson.datatype.jts.JtsModule; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import graphql.language.StringValue; @@ -16,15 +15,15 @@ import java.time.format.DateTimeFormatter; import javax.annotation.Nonnull; import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; +import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.framework.model.Grams; import org.opentripplanner.framework.time.OffsetDateTimeParser; public class GraphQLScalars { - private static final ObjectMapper geoJsonMapper = new ObjectMapper() - .registerModule(new JtsModule(GeometryUtils.getGeometryFactory())); + private static final ObjectMapper geoJsonMapper = ObjectMappers.geoJson(); + public static GraphQLScalarType DURATION_SCALAR = DurationScalarFactory.createDurationScalar(); public static final GraphQLScalarType POLYLINE_SCALAR = GraphQLScalarType diff --git a/src/main/java/org/opentripplanner/framework/json/ObjectMappers.java b/src/main/java/org/opentripplanner/framework/json/ObjectMappers.java index 8802db0fc41..1670ae94fb3 100644 --- a/src/main/java/org/opentripplanner/framework/json/ObjectMappers.java +++ b/src/main/java/org/opentripplanner/framework/json/ObjectMappers.java @@ -1,7 +1,9 @@ package org.opentripplanner.framework.json; +import com.bedatadriven.jackson.datatype.jts.JtsModule; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; +import org.opentripplanner.framework.geometry.GeometryUtils; public class ObjectMappers { @@ -13,4 +15,11 @@ public static ObjectMapper ignoringExtraFields() { mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); return mapper; } + + /** + * Returns a mapper that can serialize JTS geometries into GeoJSON. + */ + public static ObjectMapper geoJson() { + return new ObjectMapper().registerModule(new JtsModule(GeometryUtils.getGeometryFactory())); + } } diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index a44b4551919..60d0f267337 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -34,11 +34,30 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * A namer that assigns names of nearby streets to sidewalks if they meet certain + * geometric similarity criteria. + *

      + * The algorithm works as follows: + * - for each sidewalk we look up (named) street edges nearby + * - group those edges into groups where each edge has the same name + * - draw a flat-capped buffer around the sidewalk, like this: https://tinyurl.com/4fpe882h + * - check how much of a named edge group is inside the buffer + * - remove those groups which are below MIN_PERCENT_IN_BUFFER + * - take the group that has the highest percentage (as a proportion of the sidewalk length) inside + * the buffer and apply its name to the sidewalk. + *

      + * This works very well for OSM data where the sidewalk runs a parallel to the street and at each + * intersection the sidewalk is also split. It doesn't work well for sidewalks that go around + * the corner, like https://www.openstreetmap.org/way/1059101564. These cases are, however, detected + * by the above algorithm and the sidewalk name remains the same. + */ public class SidewalkNamer implements EdgeNamer { private static final Logger LOG = LoggerFactory.getLogger(SidewalkNamer.class); private static final int MAX_DISTANCE_TO_SIDEWALK = 50; private static final double MIN_PERCENT_IN_BUFFER = .85; + private static final int BUFFER_METERS = 25; private HashGridSpatialIndex streetEdges = new HashGridSpatialIndex<>(); private Collection unnamedSidewalks = new ArrayList<>(); @@ -102,9 +121,12 @@ public void postprocess() { unnamedSidewalks = null; } + /** + * The actual worker method that runs the business logic on an individual sidewalk edge. + */ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger namesApplied) { var sidewalk = sidewalkOnLevel.edge; - var buffer = preciseBuffer(sidewalk.getGeometry(), 25); + var buffer = preciseBuffer(sidewalk.getGeometry(), BUFFER_METERS); var sidewalkLength = SphericalDistanceLibrary.length(sidewalk.getGeometry()); var envelope = sidewalk.getGeometry().getEnvelopeInternal(); @@ -112,7 +134,9 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam var candidates = streetEdges.query(envelope); groupEdgesByName(candidates) + // remove edges that are far away .filter(g -> g.nearestDistanceTo(sidewalk.getGeometry()) < MAX_DISTANCE_TO_SIDEWALK) + // make sure we only compare sidewalks and streets that are on the same level .filter(g -> g.levels.equals(sidewalkOnLevel.levels)) .map(g -> computePercentInsideBuffer(g, buffer, sidewalkLength)) // remove those groups where less than a certain percentage is inside the buffer around @@ -126,6 +150,10 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam }); } + /** + * Compute the length of the group that is inside the buffer and return it as a percentage + * of the lenght of the sidewalk. + */ private static NamedEdgeGroup computePercentInsideBuffer( CandidateGroup g, Geometry buffer, @@ -136,6 +164,11 @@ private static NamedEdgeGroup computePercentInsideBuffer( return new NamedEdgeGroup(percentInBuffer, g.name); } + /** + * If a single street is split into several eges each individual part of the street would potentially + * have a low similarity with the (longer) sidewalk. For that reason we combined them into a group + * and have a better basis for comparison. + */ private static Stream groupEdgesByName(List candidates) { return candidates .stream() @@ -157,6 +190,13 @@ private static Stream groupEdgesByName(List candida } /** + * Add a buffer around a geometry that uses both meters as the input and makes sure + * that the buffer is the same distance (in meters) anywhere on earth. + *

      + * Background: If you call the regular buffer() method on a JTS geometry that uses WGS84 as the + * coordinate reference system, the buffer will be accurate at the equator but will become more + * and more elongated the furter north/south you go. + *

      * Taken from https://stackoverflow.com/questions/36455020 */ private Geometry preciseBuffer(Geometry geometry, double distanceInMeters) { @@ -188,6 +228,9 @@ private record NamedEdgeGroup(double percentInBuffer, I18NString name) { * to figure out if the name of the group can be applied to a nearby sidewalk. */ private record CandidateGroup(I18NString name, List edges, Set levels) { + /** + * How much of this group intersects with the give geometry, in meters. + */ double intersectionLength(Geometry polygon) { return edges .stream() diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java b/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java new file mode 100644 index 00000000000..3faa77ee531 --- /dev/null +++ b/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java @@ -0,0 +1,114 @@ +package org.opentripplanner.graph_builder.module.osm.naming; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.geometry.GeometryUtils; +import org.opentripplanner.framework.geometry.WgsCoordinate; +import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.graph_builder.services.osm.EdgeNamer; +import org.opentripplanner.openstreetmap.model.OSMWay; +import org.opentripplanner.openstreetmap.wayproperty.specifier.WayTestData; +import org.opentripplanner.street.model.StreetTraversalPermission; +import org.opentripplanner.street.model._data.StreetModelForTest; +import org.opentripplanner.street.model.edge.StreetEdge; +import org.opentripplanner.street.model.edge.StreetEdgeBuilder; +import org.opentripplanner.test.support.GeoJsonIo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +class SidewalkNamerTest { + + private static final I18NString SIDEWALK = I18NString.of("sidewalk"); + private static final Logger LOG = LoggerFactory.getLogger(SidewalkNamerTest.class); + + @Test + void postprocess() { + var builder = new ModelBuilder(); + var sidewalk = builder.addUnamedSidewalk( + new WgsCoordinate(33.75029, -84.39198), + new WgsCoordinate(33.74932, -84.39275) + ); + + LOG.info( + "Geometry of {}: {}", + sidewalk.edge.getName(), + GeoJsonIo.toUrl(sidewalk.edge.getGeometry()) + ); + + var pryorStreet = builder.addStreetEdge( + "Pryor Street", + new WgsCoordinate(33.75032, -84.39190), + new WgsCoordinate(33.74924, -84.39275) + ); + + LOG.info( + "Geometry of {}: {}", + pryorStreet.edge.getName(), + GeoJsonIo.toUrl(pryorStreet.edge.getGeometry()) + ); + + assertNotEquals(sidewalk.edge.getName(), pryorStreet.edge.getName()); + builder.postProcess(new SidewalkNamer()); + assertEquals(sidewalk.edge.getName(), pryorStreet.edge.getName()); + } + + private static class ModelBuilder { + + private final List pairs = new ArrayList<>(); + + EdgePair addUnamedSidewalk(WgsCoordinate... coordinates) { + var edge = edgeBuilder(coordinates) + .withName(SIDEWALK) + .withPermission(StreetTraversalPermission.PEDESTRIAN) + .withBogusName(true) + .buildAndConnect(); + + var way = WayTestData.footwaySidewalk(); + assertTrue(way.isSidewalk()); + var p = new EdgePair(way, edge); + pairs.add(p); + return p; + } + + EdgePair addStreetEdge(String name, WgsCoordinate... coordinates) { + var edge = edgeBuilder(coordinates) + .withName(I18NString.of(name)) + .withPermission(StreetTraversalPermission.ALL) + .buildAndConnect(); + var way = WayTestData.highwayTertiary(); + way.addTag("name", name); + assertFalse(way.isSidewalk()); + assertTrue(way.isNamed()); + var p = new EdgePair(way, edge); + pairs.add(p); + return p; + } + + void postProcess(EdgeNamer namer) { + pairs.forEach(p -> namer.recordEdge(p.way, p.edge)); + namer.postprocess(); + } + + private static StreetEdgeBuilder edgeBuilder(WgsCoordinate... c) { + var coordinates = Arrays.stream(c).toList(); + var ls = GeometryUtils.makeLineString(c); + return new StreetEdgeBuilder<>() + .withFromVertex( + StreetModelForTest.intersectionVertex(coordinates.getFirst().asJtsCoordinate()) + ) + .withToVertex( + StreetModelForTest.intersectionVertex(coordinates.getLast().asJtsCoordinate()) + ) + .withGeometry(ls); + } + } + + private record EdgePair(OSMWay way, StreetEdge edge) {} +} diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/WayTestData.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/WayTestData.java index 20dbcbb5a78..b09f690f794 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/WayTestData.java +++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/WayTestData.java @@ -121,9 +121,10 @@ public static OSMWithTags cyclewayBoth() { return way; } - public static OSMWithTags footwaySidewalk() { - var way = new OSMWithTags(); + public static OSMWay footwaySidewalk() { + var way = new OSMWay(); way.addTag("footway", "sidewalk"); + way.addTag("highway", "footway"); return way; } @@ -155,8 +156,8 @@ public static OSMWithTags highwayTrunk() { return way; } - public static OSMWithTags highwayTertiary() { - var way = new OSMWithTags(); + public static OSMWay highwayTertiary() { + var way = new OSMWay(); way.addTag("highway", "tertiary"); return way; } diff --git a/src/test/java/org/opentripplanner/test/support/GeoJsonIo.java b/src/test/java/org/opentripplanner/test/support/GeoJsonIo.java new file mode 100644 index 00000000000..8e25407fca5 --- /dev/null +++ b/src/test/java/org/opentripplanner/test/support/GeoJsonIo.java @@ -0,0 +1,26 @@ +package org.opentripplanner.test.support; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.framework.json.ObjectMappers; + +/** + * Helper class for generating URLs to geojson.io. + */ +public class GeoJsonIo { + + private static final ObjectMapper MAPPER = ObjectMappers.geoJson(); + + public static String toUrl(Geometry geometry) { + try { + var geoJson = MAPPER.writeValueAsString(geometry); + var encoded = URLEncoder.encode(geoJson, StandardCharsets.UTF_8); + return "http://geojson.io/#data=data:application/json,%s".formatted(encoded); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } + } +} From 4b6a27ea9f89ecefb5b6049de05688b40c81f961 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 28 Mar 2024 13:48:20 +0100 Subject: [PATCH 0916/1688] Sort by keys before comparing --- .../org/opentripplanner/test/support/JsonAssertions.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java index 2dab1e96190..f57e5a6741d 100644 --- a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java +++ b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java @@ -5,12 +5,17 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import org.opentripplanner.standalone.config.framework.json.JsonSupport; public class JsonAssertions { private static final ObjectMapper MAPPER = new ObjectMapper(); + static { + MAPPER.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true); + } + /** * Take two JSON documents and reformat them before comparing {@code actual} with {@code expected}. */ From f596432db06b97c672a0906756c4c6c08151b850 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 28 Mar 2024 14:19:51 +0100 Subject: [PATCH 0917/1688] Sort order for JSON files --- .../test/support/JsonAssertions.java | 16 ++++++++++------ .../opentripplanner/apis/vectortiles/style.json | 4 ++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java index f57e5a6741d..1fe87268eee 100644 --- a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java +++ b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java @@ -5,17 +5,12 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.SerializationFeature; import org.opentripplanner.standalone.config.framework.json.JsonSupport; public class JsonAssertions { private static final ObjectMapper MAPPER = new ObjectMapper(); - static { - MAPPER.configure(SerializationFeature.ORDER_MAP_ENTRIES_BY_KEYS, true); - } - /** * Take two JSON documents and reformat them before comparing {@code actual} with {@code expected}. */ @@ -32,8 +27,17 @@ public static void assertEqualJson(String expected, String actual) { */ public static void assertEqualJson(String expected, JsonNode actual) { try { + var actualNode = MAPPER.readTree(actual.toString()); var exp = MAPPER.readTree(expected); - assertEquals(JsonSupport.prettyPrint(exp), JsonSupport.prettyPrint(actual)); + assertEquals( + exp, + actualNode, + () -> + "Expected '%s' but actual was '%s'".formatted( + JsonSupport.prettyPrint(exp), + JsonSupport.prettyPrint(actualNode) + ) + ); } catch (JsonProcessingException e) { throw new RuntimeException(e); } diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json index f8a6a80e44c..c0e31a26f5d 100644 --- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json +++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json @@ -244,6 +244,6 @@ } } ], - "version" : 8, - "glyphs" : "https://cdn.jsdelivr.net/gh/klokantech/klokantech-gl-fonts@master/{fontstack}/{range}.pbf" + "glyphs" : "https://cdn.jsdelivr.net/gh/klokantech/klokantech-gl-fonts@master/{fontstack}/{range}.pbf", + "version" : 8 } \ No newline at end of file From a312d2a1e4a1cadf4354b991366bf936827d155e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 28 Mar 2024 14:42:20 +0100 Subject: [PATCH 0918/1688] Revert set conversion --- .../org/opentripplanner/openstreetmap/model/OSMWithTags.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index 5cf5ce52a2f..51bc9da1dd8 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -533,7 +533,7 @@ public Set getMultiTagValues(Set refTags) { .flatMap(v -> Arrays.stream(v.split(";"))) .map(String::strip) .filter(v -> !v.isBlank()) - .collect(Collectors.toSet()); + .collect(Collectors.toUnmodifiableSet()); } public OsmProvider getOsmProvider() { From 8a45b2ec53d081a96e78b1bbbb709f0e9420a9c1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 01:49:55 +0000 Subject: [PATCH 0919/1688] Update dependency com.google.cloud.tools:jib-maven-plugin to v3.4.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0de0e7ef711..53cc2f59184 100644 --- a/pom.xml +++ b/pom.xml @@ -444,7 +444,7 @@ com.google.cloud.tools jib-maven-plugin - 3.4.1 + 3.4.2 org.opentripplanner.standalone.OTPMain From c1a91969c5007e539d580926d9e52c15b3f9e7b0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 3 Apr 2024 01:50:02 +0000 Subject: [PATCH 0920/1688] Update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 53cc2f59184..b1dec9cb960 100644 --- a/pom.xml +++ b/pom.xml @@ -312,7 +312,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - junit - junit - - - - diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java new file mode 100644 index 00000000000..d187b611ef3 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/TestTransitService.java @@ -0,0 +1,23 @@ +package org.opentripplanner.ext.vectortiles.layers; + +import java.util.Set; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.TransitModel; + +public class TestTransitService extends DefaultTransitService { + + public TestTransitService(TransitModel transitModel) { + super(transitModel); + } + + @Override + public Set getRoutesForStop(StopLocation stop) { + return Set.of( + TransitModelForTest.route("1").withMode(TransitMode.RAIL).withGtfsType(100).build() + ); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java new file mode 100644 index 00000000000..da85285954d --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapperTest.java @@ -0,0 +1,46 @@ +package org.opentripplanner.ext.vectortiles.layers.stations; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.transit.model._data.TransitModelForTest.id; + +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import org.junit.jupiter.api.Test; +import org.opentripplanner.ext.vectortiles.layers.TestTransitService; +import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.site.Station; +import org.opentripplanner.transit.service.StopModel; +import org.opentripplanner.transit.service.TransitModel; + +public class DigitransitStationPropertyMapperTest { + + @Test + void map() { + var deduplicator = new Deduplicator(); + var transitModel = new TransitModel(new StopModel(), deduplicator); + transitModel.index(); + var transitService = new TestTransitService(transitModel); + + var mapper = DigitransitStationPropertyMapper.create(transitService, Locale.US); + + var station = Station + .of(id("a-station")) + .withCoordinate(1, 1) + .withName(I18NString.of("A station")) + .build(); + + TransitModelForTest.of().stop("stop-1").withParentStation(station).build(); + + Map map = new HashMap<>(); + mapper.map(station).forEach(o -> map.put(o.key(), o.value())); + + assertEquals("F:a-station", map.get("gtfsId")); + assertEquals("A station", map.get("name")); + assertEquals("", map.get("type")); + assertEquals("[{\"mode\":\"RAIL\",\"shortName\":\"R1\"}]", map.get("routes")); + assertEquals("[\"F:stop-1\"]", map.get("stops")); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java new file mode 100644 index 00000000000..8f2e1f94fa6 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java @@ -0,0 +1,104 @@ +package org.opentripplanner.ext.vectortiles.layers.stops; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.framework.time.TimeUtils.time; +import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; + +import java.time.ZonedDateTime; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.opentripplanner._support.time.ZoneIds; +import org.opentripplanner.ext.realtimeresolver.RealtimeResolver; +import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.model.plan.Place; +import org.opentripplanner.routing.alertpatch.AlertEffect; +import org.opentripplanner.routing.alertpatch.EntitySelector; +import org.opentripplanner.routing.alertpatch.TimePeriod; +import org.opentripplanner.routing.alertpatch.TransitAlert; +import org.opentripplanner.routing.impl.TransitAlertServiceImpl; +import org.opentripplanner.routing.services.TransitAlertService; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.StopModel; +import org.opentripplanner.transit.service.TransitModel; + +public class RealtimeStopsLayerTest { + + private RegularStop stop; + private RegularStop stop2; + + @BeforeEach + public void setUp() { + var name = I18NString.of("name"); + var desc = I18NString.of("desc"); + stop = + StopModel + .of() + .regularStop(new FeedScopedId("F", "name")) + .withName(name) + .withDescription(desc) + .withCoordinate(50, 10) + .build(); + stop2 = + StopModel + .of() + .regularStop(new FeedScopedId("F", "name")) + .withName(name) + .withDescription(desc) + .withCoordinate(51, 10) + .build(); + } + + @Test + void realtimeStopLayer() { + var deduplicator = new Deduplicator(); + var transitModel = new TransitModel(new StopModel(), deduplicator); + transitModel.initTimeZone(ZoneIds.HELSINKI); + transitModel.index(); + var alertService = new TransitAlertServiceImpl(transitModel); + var transitService = new DefaultTransitService(transitModel) { + @Override + public TransitAlertService getTransitAlertService() { + return alertService; + } + }; + + Route route = TransitModelForTest.route("route").build(); + var itinerary = newItinerary(Place.forStop(stop), time("11:00")) + .bus(route, 1, time("11:05"), time("11:20"), Place.forStop(stop2)) + .build(); + var startDate = ZonedDateTime.now(ZoneIds.HELSINKI).minusDays(1).toEpochSecond(); + var endDate = ZonedDateTime.now(ZoneIds.HELSINKI).plusDays(1).toEpochSecond(); + var alert = TransitAlert + .of(stop.getId()) + .addEntity(new EntitySelector.Stop(stop.getId())) + .addTimePeriod(new TimePeriod(startDate, endDate)) + .withEffect(AlertEffect.NO_SERVICE) + .build(); + transitService.getTransitAlertService().setAlerts(List.of(alert)); + + var itineraries = List.of(itinerary); + RealtimeResolver.populateLegsWithRealtime(itineraries, transitService); + + DigitransitRealtimeStopPropertyMapper mapper = new DigitransitRealtimeStopPropertyMapper( + transitService, + new Locale("en-US") + ); + + Map map = new HashMap<>(); + mapper.map(stop).forEach(o -> map.put(o.key(), o.value())); + + assertEquals("F:name", map.get("gtfsId")); + assertEquals("name", map.get("name")); + assertEquals("desc", map.get("desc")); + assertEquals(true, map.get("closedByServiceAlert")); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java index a914cf9db6c..4c3e60701bd 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/StopsLayerTest.java @@ -1,32 +1,16 @@ package org.opentripplanner.ext.vectortiles.layers.stops; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.framework.time.TimeUtils.time; -import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import java.time.Instant; -import java.time.LocalDate; -import java.time.ZonedDateTime; import java.util.HashMap; -import java.util.List; import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.ext.realtimeresolver.RealtimeResolver; +import org.opentripplanner.ext.vectortiles.layers.TestTransitService; import org.opentripplanner.framework.i18n.TranslatedString; -import org.opentripplanner.model.plan.Place; -import org.opentripplanner.routing.alertpatch.AlertEffect; -import org.opentripplanner.routing.alertpatch.EntitySelector; -import org.opentripplanner.routing.alertpatch.TimePeriod; -import org.opentripplanner.routing.alertpatch.TransitAlert; -import org.opentripplanner.routing.impl.TransitAlertServiceImpl; -import org.opentripplanner.routing.services.TransitAlertService; -import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.StopModel; @@ -35,7 +19,6 @@ public class StopsLayerTest { private RegularStop stop; - private RegularStop stop2; @BeforeEach public void setUp() { @@ -67,14 +50,6 @@ public void setUp() { .withDescription(descTranslations) .withCoordinate(50, 10) .build(); - stop2 = - StopModel - .of() - .regularStop(new FeedScopedId("F", "name")) - .withName(nameTranslations) - .withDescription(descTranslations) - .withCoordinate(51, 10) - .build(); } @Test @@ -82,7 +57,7 @@ public void digitransitStopPropertyMapperTest() { var deduplicator = new Deduplicator(); var transitModel = new TransitModel(new StopModel(), deduplicator); transitModel.index(); - var transitService = new DefaultTransitService(transitModel); + var transitService = new TestTransitService(transitModel); DigitransitStopPropertyMapper mapper = DigitransitStopPropertyMapper.create( transitService, @@ -95,6 +70,7 @@ public void digitransitStopPropertyMapperTest() { assertEquals("F:name", map.get("gtfsId")); assertEquals("name", map.get("name")); assertEquals("desc", map.get("desc")); + assertEquals("[{\"gtfsType\":100}]", map.get("routes")); } @Test @@ -115,49 +91,4 @@ public void digitransitStopPropertyMapperTranslationTest() { assertEquals("nameDE", map.get("name")); assertEquals("descDE", map.get("desc")); } - - @Test - public void digitransitRealtimeStopPropertyMapperTest() { - var deduplicator = new Deduplicator(); - var transitModel = new TransitModel(new StopModel(), deduplicator); - transitModel.initTimeZone(ZoneIds.HELSINKI); - transitModel.index(); - var alertService = new TransitAlertServiceImpl(transitModel); - var transitService = new DefaultTransitService(transitModel) { - @Override - public TransitAlertService getTransitAlertService() { - return alertService; - } - }; - - Route route = TransitModelForTest.route("route").build(); - var itinerary = newItinerary(Place.forStop(stop), time("11:00")) - .bus(route, 1, time("11:05"), time("11:20"), Place.forStop(stop2)) - .build(); - var startDate = ZonedDateTime.now(ZoneIds.HELSINKI).minusDays(1).toEpochSecond(); - var endDate = ZonedDateTime.now(ZoneIds.HELSINKI).plusDays(1).toEpochSecond(); - var alert = TransitAlert - .of(stop.getId()) - .addEntity(new EntitySelector.Stop(stop.getId())) - .addTimePeriod(new TimePeriod(startDate, endDate)) - .withEffect(AlertEffect.NO_SERVICE) - .build(); - transitService.getTransitAlertService().setAlerts(List.of(alert)); - - var itineraries = List.of(itinerary); - RealtimeResolver.populateLegsWithRealtime(itineraries, transitService); - - DigitransitRealtimeStopPropertyMapper mapper = new DigitransitRealtimeStopPropertyMapper( - transitService, - new Locale("en-US") - ); - - Map map = new HashMap<>(); - mapper.map(stop).forEach(o -> map.put(o.key(), o.value())); - - assertEquals("F:name", map.get("gtfsId")); - assertEquals("name", map.get("name")); - assertEquals("desc", map.get("desc")); - assertEquals(true, map.get("closedByServiceAlert")); - } } diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java index 1ec7d042894..60ba9100f43 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java @@ -144,7 +144,7 @@ public void digitransitVehicleParkingGroupPropertyMapperTest() { assertEquals("groupName", map.get("name").toString()); assertEquals( - "[{\"bicyclePlaces\":false,\"carPlaces\":true,\"name\":\"name\",\"id\":\"F:id\"}]", + "[{\"carPlaces\":true,\"bicyclePlaces\":false,\"id\":\"F:id\",\"name\":\"name\"}]", map.get("vehicleParking") ); } @@ -162,7 +162,7 @@ public void digitransitVehicleParkingGroupPropertyMapperTranslationTest() { assertEquals("groupDE", map.get("name").toString()); assertEquals( - "[{\"bicyclePlaces\":false,\"carPlaces\":true,\"name\":\"DE\",\"id\":\"F:id\"}]", + "[{\"carPlaces\":true,\"bicyclePlaces\":false,\"id\":\"F:id\",\"name\":\"DE\"}]", map.get("vehicleParking") ); } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java index a828cd37a7c..18b4a5f388d 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stations/DigitransitStationPropertyMapper.java @@ -1,13 +1,14 @@ package org.opentripplanner.ext.vectortiles.layers.stations; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Collection; import java.util.List; import java.util.Locale; -import java.util.Map; import java.util.stream.Collectors; -import org.json.simple.JSONArray; import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; +import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.Station; @@ -16,6 +17,7 @@ public class DigitransitStationPropertyMapper extends PropertyMapper { + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); private final TransitService transitService; private final I18NStringMapper i18NStringMapper; @@ -33,41 +35,47 @@ public static DigitransitStationPropertyMapper create( @Override public Collection map(Station station) { - var childStops = station.getChildStops(); - - return List.of( - new KeyValue("gtfsId", station.getId().toString()), - new KeyValue("name", i18NStringMapper.mapNonnullToApi(station.getName())), - new KeyValue( - "type", - childStops - .stream() - .flatMap(stop -> transitService.getPatternsForStop(stop).stream()) - .map(tripPattern -> tripPattern.getMode().name()) - .distinct() - .collect(Collectors.joining(",")) - ), - new KeyValue( - "stops", - JSONArray.toJSONString( - childStops.stream().map(StopLocation::getId).map(FeedScopedId::toString).toList() - ) - ), - new KeyValue( - "routes", - JSONArray.toJSONString( + try { + var childStops = station.getChildStops(); + return List.of( + new KeyValue("gtfsId", station.getId().toString()), + new KeyValue("name", i18NStringMapper.mapNonnullToApi(station.getName())), + new KeyValue( + "type", childStops .stream() - .flatMap(stop -> transitService.getRoutesForStop(stop).stream()) + .flatMap(stop -> transitService.getPatternsForStop(stop).stream()) + .map(tripPattern -> tripPattern.getMode().name()) .distinct() - .map(route -> - route.getShortName() == null - ? Map.of("mode", route.getMode().name()) - : Map.of("mode", route.getMode().name(), "shortName", route.getShortName()) - ) - .collect(Collectors.toList()) + .collect(Collectors.joining(",")) + ), + new KeyValue( + "stops", + OBJECT_MAPPER.writeValueAsString( + childStops.stream().map(StopLocation::getId).map(FeedScopedId::toString).toList() + ) + ), + new KeyValue( + "routes", + OBJECT_MAPPER.writeValueAsString( + childStops + .stream() + .flatMap(stop -> transitService.getRoutesForStop(stop).stream()) + .distinct() + .map(route -> { + var obj = OBJECT_MAPPER.createObjectNode(); + obj.put("mode", route.getMode().name()); + if (route.getShortName() != null) { + obj.put("shortName", route.getShortName()); + } + return obj; + }) + .toList() + ) ) - ) - ); + ); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } } } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java index 643ed63b7f8..d10e221b1d5 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitStopPropertyMapper.java @@ -1,16 +1,16 @@ package org.opentripplanner.ext.vectortiles.layers.stops; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Collection; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.function.Function; import java.util.stream.Collectors; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; import org.opentripplanner.apis.support.mapping.PropertyMapper; -import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NStringMapper; +import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.RegularStop; @@ -18,6 +18,7 @@ public class DigitransitStopPropertyMapper extends PropertyMapper { + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); private final TransitService transitService; private final I18NStringMapper i18NStringMapper; @@ -59,17 +60,20 @@ protected static Collection getBaseKeyValues( } protected static String getRoutes(TransitService transitService, RegularStop stop) { - return JSONArray.toJSONString( - transitService + try { + var objects = transitService .getRoutesForStop(stop) .stream() .map(route -> { - JSONObject routeObject = new JSONObject(); + var routeObject = OBJECT_MAPPER.createObjectNode(); routeObject.put("gtfsType", route.getGtfsType()); return routeObject; }) - .toList() - ); + .toList(); + return OBJECT_MAPPER.writeValueAsString(objects); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } } protected static String getType(TransitService transitService, RegularStop stop) { diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java index 33f415c157a..efafc969619 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/DigitransitVehicleParkingGroupPropertyMapper.java @@ -1,17 +1,19 @@ package org.opentripplanner.ext.vectortiles.layers.vehicleparkings; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Collection; import java.util.List; import java.util.Locale; -import org.json.simple.JSONArray; -import org.json.simple.JSONObject; import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; +import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; public class DigitransitVehicleParkingGroupPropertyMapper extends PropertyMapper { + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); private final I18NStringMapper i18NStringMapper; public DigitransitVehicleParkingGroupPropertyMapper(Locale locale) { @@ -24,25 +26,28 @@ public static DigitransitVehicleParkingGroupPropertyMapper create(Locale locale) @Override protected Collection map(VehicleParkingAndGroup parkingAndGroup) { - var group = parkingAndGroup.vehicleParkingGroup(); - String parking = JSONArray.toJSONString( - parkingAndGroup + try { + var group = parkingAndGroup.vehicleParkingGroup(); + var lots = parkingAndGroup .vehicleParking() .stream() .map(vehicleParkingPlace -> { - JSONObject parkingObject = new JSONObject(); + var parkingObject = OBJECT_MAPPER.createObjectNode(); parkingObject.put("carPlaces", vehicleParkingPlace.hasCarPlaces()); parkingObject.put("bicyclePlaces", vehicleParkingPlace.hasBicyclePlaces()); parkingObject.put("id", vehicleParkingPlace.getId().toString()); parkingObject.put("name", i18NStringMapper.mapToApi(vehicleParkingPlace.getName())); return parkingObject; }) - .toList() - ); - return List.of( - new KeyValue("id", group.id().toString()), - new KeyValue("name", i18NStringMapper.mapToApi(group.name())), - new KeyValue("vehicleParking", parking) - ); + .toList(); + var string = OBJECT_MAPPER.writeValueAsString(lots); + return List.of( + new KeyValue("id", group.id().toString()), + new KeyValue("name", i18NStringMapper.mapToApi(group.name())), + new KeyValue("vehicleParking", string) + ); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } } } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java index c938f9736fd..bccc2b4de4d 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/StadtnaviVehicleParkingPropertyMapper.java @@ -1,11 +1,12 @@ package org.opentripplanner.ext.vectortiles.layers.vehicleparkings; +import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Collection; import java.util.List; import java.util.Locale; -import org.json.simple.JSONObject; import org.opentripplanner.apis.support.mapping.PropertyMapper; import org.opentripplanner.framework.i18n.I18NStringMapper; +import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.inspector.vector.KeyValue; import org.opentripplanner.model.calendar.openinghours.OsmOpeningHoursSupport; import org.opentripplanner.routing.vehicle_parking.VehicleParking; @@ -13,6 +14,7 @@ public class StadtnaviVehicleParkingPropertyMapper extends PropertyMapper { + private static final ObjectMapper OBJECT_MAPPER = ObjectMappers.ignoringExtraFields(); private final DigitransitVehicleParkingPropertyMapper digitransitMapper; private final I18NStringMapper i18NStringMapper; @@ -57,13 +59,13 @@ private static List mapPlaces(String key, VehicleParkingSpaces places) return List.of(); } - var json = new JSONObject(); + var json = OBJECT_MAPPER.createObjectNode(); json.put("bicyclePlaces", places.getBicycleSpaces()); json.put("carPlaces", places.getCarSpaces()); json.put("wheelchairAccessibleCarPlaces", places.getWheelchairAccessibleCarSpaces()); return List.of( - new KeyValue(key, JSONObject.toJSONString(json)), + new KeyValue(key, json.toString()), new KeyValue(subKey(key, "bicyclePlaces"), places.getBicycleSpaces()), new KeyValue(subKey(key, "carPlaces"), places.getCarSpaces()), new KeyValue( From 3c1bb2dd77079faead57f4c9d9997977e3338638 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 4 Apr 2024 16:56:10 +0200 Subject: [PATCH 0927/1688] Move expensive WGS84_XY constant setup into ElevationModule --- .../framework/geometry/GeometryUtils.java | 20 ------------------- .../module/ned/ElevationModule.java | 18 +++++++++++++++-- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java b/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java index cf634ad0e23..c02ff6151e2 100644 --- a/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java +++ b/src/main/java/org/opentripplanner/framework/geometry/GeometryUtils.java @@ -10,8 +10,6 @@ import java.util.stream.Stream; import org.geojson.GeoJsonObject; import org.geojson.LngLatAlt; -import org.geotools.api.referencing.crs.CoordinateReferenceSystem; -import org.geotools.referencing.CRS; import org.locationtech.jts.algorithm.ConvexHull; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.CoordinateSequence; @@ -28,30 +26,12 @@ import org.locationtech.jts.linearref.LengthLocationMap; import org.locationtech.jts.linearref.LinearLocation; import org.locationtech.jts.linearref.LocationIndexedLine; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class GeometryUtils { - private static final Logger LOG = LoggerFactory.getLogger(GeometryUtils.class); - private static final CoordinateSequenceFactory csf = new PackedCoordinateSequenceFactory(); private static final GeometryFactory gf = new GeometryFactory(csf); - /** A shared copy of the WGS84 CRS with longitude-first axis order. */ - public static final CoordinateReferenceSystem WGS84_XY; - - static { - try { - WGS84_XY = CRS.getAuthorityFactory(true).createCoordinateReferenceSystem("EPSG:4326"); - } catch (Exception ex) { - LOG.error("Unable to create longitude-first WGS84 CRS", ex); - throw new RuntimeException( - "Could not create longitude-first WGS84 coordinate reference system." - ); - } - } - public static Geometry makeConvexHull( Collection collection, Function mapToCoordinate diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java index 592d34fb543..6cf48d121d6 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java @@ -20,13 +20,14 @@ import java.util.concurrent.atomic.AtomicInteger; import org.geotools.api.coverage.Coverage; import org.geotools.api.coverage.PointOutsideCoverageException; +import org.geotools.api.referencing.crs.CoordinateReferenceSystem; import org.geotools.api.referencing.operation.TransformException; import org.geotools.geometry.Position2D; +import org.geotools.referencing.CRS; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.opentripplanner.framework.geometry.EncodedPolyline; -import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.logging.ProgressTracker; @@ -61,6 +62,19 @@ public class ElevationModule implements GraphBuilderModule { private static final Logger LOG = LoggerFactory.getLogger(ElevationModule.class); + /** A shared copy of the WGS84 CRS with longitude-first axis order. */ + public static final CoordinateReferenceSystem WGS84_XY; + + static { + try { + WGS84_XY = CRS.getAuthorityFactory(true).createCoordinateReferenceSystem("EPSG:4326"); + } catch (Exception ex) { + LOG.error("Unable to create longitude-first WGS84 CRS", ex); + throw new RuntimeException( + "Could not create longitude-first WGS84 coordinate reference system." + ); + } + } /** The elevation data to be used in calculating elevations. */ private final ElevationGridCoverageFactory gridCoverageFactory; @@ -564,7 +578,7 @@ private double getElevation(Coverage coverage, double x, double y) // GeoTIFFs in various projections. Note that GeoTools defaults to strict EPSG axis ordering of (lat, long) // for DefaultGeographicCRS.WGS84, but OTP is using (long, lat) throughout and assumes unprojected DEM // rasters to also use (long, lat). - coverage.evaluate(new Position2D(GeometryUtils.WGS84_XY, x, y), values); + coverage.evaluate(new Position2D(WGS84_XY, x, y), values); } catch (PointOutsideCoverageException e) { nPointsOutsideDEM.incrementAndGet(); throw e; From 64ded27009af07e8be6d44ad57ca06b3767ac211 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 4 Apr 2024 20:42:28 +0200 Subject: [PATCH 0928/1688] Make field private --- .../graph_builder/module/ned/ElevationModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java index 6cf48d121d6..e224d1d6d0b 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java @@ -63,7 +63,7 @@ public class ElevationModule implements GraphBuilderModule { private static final Logger LOG = LoggerFactory.getLogger(ElevationModule.class); /** A shared copy of the WGS84 CRS with longitude-first axis order. */ - public static final CoordinateReferenceSystem WGS84_XY; + private static final CoordinateReferenceSystem WGS84_XY; static { try { From 0d046467064928f19d36da4d464542b753950a3d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 22:29:44 +0000 Subject: [PATCH 0929/1688] Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b1dec9cb960..46e04cc24d5 100644 --- a/pom.xml +++ b/pom.xml @@ -185,7 +185,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources From 300a52ee3f217c141b27bb88906f365d2ceedb3c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 03:26:52 +0000 Subject: [PATCH 0930/1688] Update google.dagger.version to v2.51.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 46e04cc24d5..b56c3b4c4fc 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 149 31.0 - 2.51 + 2.51.1 2.17.0 3.1.5 5.10.2 From db554c24e63ec23b70dedf5497772cae14956948 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 5 Apr 2024 10:50:01 +0200 Subject: [PATCH 0931/1688] Fix handling of null transport mode filter --- .../opentripplanner/apis/transmodel/mapping/FilterMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java index 9141ce4c104..71d2691e47a 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/FilterMapper.java @@ -83,7 +83,7 @@ static void mapFilterOldWay( List tModes = new ArrayList<>(); if (GqlUtil.hasArgument(environment, "modes")) { Map modesInput = environment.getArgument("modes"); - if (modesInput.containsKey("transportModes")) { + if (modesInput.get("transportModes") != null) { List> transportModes = (List>) modesInput.get( "transportModes" ); From 24076e9090d2de75dfe8830233eedba91115642e Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 5 Apr 2024 19:24:23 +0300 Subject: [PATCH 0932/1688] Discourage walking when sidepaths are available --- .../openstreetmap/tagmapping/FinlandMapper.java | 7 +++++++ .../openstreetmap/tagmapping/FinlandMapperTest.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java index 9bafe133f2a..c42b8016d45 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java @@ -1,5 +1,6 @@ package org.opentripplanner.openstreetmap.tagmapping; +import static org.opentripplanner.openstreetmap.wayproperty.MixinPropertiesBuilder.ofWalkSafety; import static org.opentripplanner.openstreetmap.wayproperty.WayPropertiesBuilder.withModes; import static org.opentripplanner.street.model.StreetTraversalPermission.ALL; import static org.opentripplanner.street.model.StreetTraversalPermission.CAR; @@ -163,6 +164,12 @@ else if (speedLimit <= 16.65f) { props.setProperties("highway=service;tunnel=yes;access=destination", withModes(NONE)); props.setProperties("highway=service;access=destination", withModes(ALL).bicycleSafety(1.1)); + // Typically if this tag is used on a way, there is also a better option for walking. + // We don't need to set bicycle safety as cycling is not currently allowed on these ways. + props.setMixinProperties("bicycle=use_sidepath", ofWalkSafety(5)); + + props.setMixinProperties("foot=use_sidepath", ofWalkSafety(8)); + // Automobile speeds in Finland. // General speed limit is 80kph unless signs says otherwise. props.defaultCarSpeed = 22.22f; diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java index a2f84873f20..ca3c059db51 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java @@ -162,6 +162,13 @@ public void testSafetyWithMixins() { wps.getDataForWay(wayWithMixinsAndCustomSafety).walkSafety().forward(), epsilon ); + + OSMWithTags wayWithBicycleSidePath = new OSMWithTags(); + wayWithBicycleSidePath.addTag("bicycle", "use_sidepath"); + assertEquals(8, wps.getDataForWay(wayWithBicycleSidePath).walkSafety().forward(), epsilon); + OSMWithTags wayWithFootSidePath = new OSMWithTags(); + wayWithFootSidePath.addTag("foot", "use_sidepath"); + assertEquals(12.8, wps.getDataForWay(wayWithFootSidePath).walkSafety().forward(), epsilon); } @Test From 1a05817acce744d027acacbf523db931f956c355 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 18:17:45 +0000 Subject: [PATCH 0933/1688] Update jersey monorepo to v3.1.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ea68258aeed..6777893e2be 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 31.0 2.51 2.17.0 - 3.1.5 + 3.1.6 5.10.2 1.12.3 5.5.3 From 5871882a3b15a0d54bf7d4c5416fc13c6468e981 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 8 Apr 2024 11:37:22 +0200 Subject: [PATCH 0934/1688] Fix trip duplication in DSJ mapping --- .../opentripplanner/netex/mapping/TripPatternMapper.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java index 765a9b5c47f..d16cd71f103 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java @@ -392,9 +392,12 @@ private Trip mapTrip( JourneyPattern_VersionStructure journeyPattern, ServiceJourney serviceJourney ) { - return tripMapper.mapServiceJourney( - serviceJourney, - () -> findTripHeadsign(journeyPattern, serviceJourney) + return deduplicator.deduplicateObject( + Trip.class, + tripMapper.mapServiceJourney( + serviceJourney, + () -> findTripHeadsign(journeyPattern, serviceJourney) + ) ); } From eecca1dfee8cd684455a6ace23dc37e14307a697 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 5 Apr 2024 20:56:40 +0300 Subject: [PATCH 0935/1688] Pass in logger when creating OtpHttpClient --- .../ridehailing/service/uber/UberService.java | 2 +- .../updater/SiriETGooglePubsubUpdater.java | 2 +- .../ext/siri/updater/SiriHttpLoader.java | 2 +- .../azure/AbstractAzureSiriUpdater.java | 2 +- .../SmooveBikeRentalDataSource.java | 6 ++--- .../vehicleparking/bikely/BikelyUpdater.java | 2 +- .../hslpark/HslFacilitiesDownloader.java | 14 +++++----- .../hslpark/HslHubsDownloader.java | 14 +++++----- .../VehicleRentalServiceDirectoryFetcher.java | 4 +-- .../https/HttpsDataSourceRepository.java | 6 ++++- .../datastore/https/HttpsFileDataSource.java | 6 ++++- .../framework/io/JsonDataListDownloader.java | 16 ++++++------ .../framework/io/OtpHttpClient.java | 26 ++++++++++++------- .../alert/GtfsRealtimeAlertsUpdater.java | 2 +- .../configure/UpdaterConfigurator.java | 6 ++++- .../updater/spi/GenericJsonDataSource.java | 2 +- .../trip/GtfsRealtimeTripUpdateSource.java | 2 +- ...GtfsRealtimeHttpVehiclePositionSource.java | 2 +- .../datasources/GbfsFeedLoader.java | 2 +- .../datasources/GbfsFeedLoaderTest.java | 8 +++++- .../GbfsVehicleRentalDataSourceTest.java | 10 ++++--- 21 files changed, 82 insertions(+), 54 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java b/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java index bfc65566e6e..42ec65716de 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java @@ -79,7 +79,7 @@ public UberService(RideHailingServiceParameters config) { this.timeEstimateUri = timeEstimateUri; this.bannedTypes = bannedTypes; this.wheelchairAccessibleProductId = wheelchairAccessibleProductId; - this.otpHttpClient = new OtpHttpClient(); + this.otpHttpClient = new OtpHttpClient(LOG); } @Override diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index 4b5797f03de..84c6c9abab1 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -312,7 +312,7 @@ private void initializeData() { } private ByteString fetchInitialData() { - try (OtpHttpClient otpHttpClient = new OtpHttpClient()) { + try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { return otpHttpClient.getAndMap( dataInitializationUrl, initialGetDataTimeout, diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java index 7a094dc0863..a94580a4ce5 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java @@ -35,7 +35,7 @@ public SiriHttpLoader( this.timeout = timeout; this.requestHeaders = requestHeaders; this.previewInterval = previewInterval; - this.otpHttpClient = new OtpHttpClient(timeout, timeout); + this.otpHttpClient = new OtpHttpClient(timeout, timeout, LOG); } /** diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java index 1915105960e..9aa2e1d9a66 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java @@ -206,7 +206,7 @@ public String getConfigRef() { protected Optional fetchInitialSiriData(URI uri) { var headers = HttpHeaders.of().acceptApplicationXML().build().asMap(); - try (OtpHttpClient otpHttpClient = new OtpHttpClient()) { + try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { var t1 = System.currentTimeMillis(); var siriOptional = otpHttpClient.executeAndMapOptional( new HttpGet(uri), diff --git a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java index abeaab42137..73f46ecd501 100644 --- a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java +++ b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java @@ -23,7 +23,7 @@ public class SmooveBikeRentalDataSource extends GenericJsonDataSource implements VehicleRentalDatasource { - private static final Logger log = LoggerFactory.getLogger(SmooveBikeRentalDataSource.class); + private static final Logger LOG = LoggerFactory.getLogger(SmooveBikeRentalDataSource.class); public static final String DEFAULT_NETWORK_NAME = "smoove"; @@ -33,7 +33,7 @@ public class SmooveBikeRentalDataSource private final RentalVehicleType vehicleType; public SmooveBikeRentalDataSource(SmooveBikeRentalDataSourceParameters config) { - this(config, new OtpHttpClient()); + this(config, new OtpHttpClient(LOG)); } public SmooveBikeRentalDataSource( @@ -76,7 +76,7 @@ protected VehicleRentalStation parseElement(JsonNode node) { station.longitude = Double.parseDouble(coordinates[1].trim()); } catch (NumberFormatException e) { // E.g. coordinates is empty - log.warn("Error parsing bike rental station {}", station.id, e); + LOG.warn("Error parsing bike rental station {}", station.id, e); return null; } if (!node.path("style").asText().equals("Station on")) { diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java index 5758d5d99e1..1c711d6d347 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java @@ -44,7 +44,7 @@ public class BikelyUpdater implements DataSource { .put("lonMax", 0) .put("latMin", 0) .put("latMax", 0); - private final OtpHttpClient httpClient = new OtpHttpClient(); + private final OtpHttpClient httpClient = new OtpHttpClient(LOG); private final BikelyUpdaterParameters parameters; private List lots; diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java index 31664170a04..4b89eabe19a 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java @@ -20,7 +20,7 @@ public class HslFacilitiesDownloader { - private static final Logger log = LoggerFactory.getLogger(HslFacilitiesDownloader.class); + private static final Logger LOG = LoggerFactory.getLogger(HslFacilitiesDownloader.class); private static final ObjectMapper mapper = new ObjectMapper(); private final String jsonParsePath; @@ -36,14 +36,14 @@ public HslFacilitiesDownloader( this.url = url; this.jsonParsePath = jsonParsePath; this.facilitiesParser = facilitiesParser; - this.otpHttpClient = new OtpHttpClient(); + this.otpHttpClient = new OtpHttpClient(LOG); } public List downloadFacilities( Map hubForPark ) { if (url == null) { - log.warn("Cannot download updates, because url is null!"); + LOG.warn("Cannot download updates, because url is null!"); return null; } @@ -55,17 +55,17 @@ public List downloadFacilities( try { return parseJSON(is, hubForPark); } catch (IllegalArgumentException e) { - log.warn("Error parsing facilities from {}", url, e); + LOG.warn("Error parsing facilities from {}", url, e); } catch (JsonProcessingException e) { - log.warn("Error parsing facilities from {} (bad JSON of some sort)", url, e); + LOG.warn("Error parsing facilities from {} (bad JSON of some sort)", url, e); } catch (IOException e) { - log.warn("Error reading facilities from {}", url, e); + LOG.warn("Error reading facilities from {}", url, e); } return null; } ); } catch (OtpHttpClientException e) { - log.warn("Failed to get data from url {}", url); + LOG.warn("Failed to get data from url {}", url); return null; } } diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java index c5712e2067e..102551705df 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java @@ -18,7 +18,7 @@ public class HslHubsDownloader { - private static final Logger log = LoggerFactory.getLogger(HslHubsDownloader.class); + private static final Logger LOG = LoggerFactory.getLogger(HslHubsDownloader.class); private static final ObjectMapper mapper = new ObjectMapper(); private final String jsonParsePath; @@ -34,12 +34,12 @@ public HslHubsDownloader( this.url = url; this.jsonParsePath = jsonParsePath; this.hubsParser = hubsParser; - otpHttpClient = new OtpHttpClient(); + otpHttpClient = new OtpHttpClient(LOG); } public Map downloadHubs() { if (url == null) { - log.warn("Cannot download updates, because url is null!"); + LOG.warn("Cannot download updates, because url is null!"); return null; } try { @@ -50,17 +50,17 @@ public Map downloadHubs() { try { return parseJSON(is); } catch (IllegalArgumentException e) { - log.warn("Error parsing hubs from {}", url, e); + LOG.warn("Error parsing hubs from {}", url, e); } catch (JsonProcessingException e) { - log.warn("Error parsing hubs from {} (bad JSON of some sort)", url, e); + LOG.warn("Error parsing hubs from {} (bad JSON of some sort)", url, e); } catch (IOException e) { - log.warn("Error reading hubs from {}", url, e); + LOG.warn("Error reading hubs from {}", url, e); } return null; } ); } catch (OtpHttpClientException e) { - log.warn("Failed to get data from url {}", url); + LOG.warn("Failed to get data from url {}", url); return null; } } diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java index d51d0d70b6c..05c54178c7b 100644 --- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java +++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java @@ -61,7 +61,7 @@ public static List createUpdatersFromEndpoint( } int maxHttpConnections = sources.size(); - var otpHttpClient = new OtpHttpClient(maxHttpConnections); + var otpHttpClient = new OtpHttpClient(maxHttpConnections, LOG); var serviceDirectory = new VehicleRentalServiceDirectoryFetcher( vertexLinker, @@ -154,7 +154,7 @@ private VehicleRentalUpdater fetchAndCreateUpdater( private static JsonNode listSources(VehicleRentalServiceDirectoryFetcherParameters parameters) { JsonNode node; URI url = parameters.getUrl(); - try (OtpHttpClient otpHttpClient = new OtpHttpClient()) { + try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { node = otpHttpClient.getAndMapAsJsonNode(url, Map.of(), new ObjectMapper()); } catch (OtpHttpClientException e) { LOG.warn("Error fetching list of vehicle rental endpoints from {}", url, e); diff --git a/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java b/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java index bf087d0c0ad..402007ea394 100644 --- a/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java +++ b/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java @@ -12,12 +12,16 @@ import org.opentripplanner.datastore.base.DataSourceRepository; import org.opentripplanner.datastore.file.ZipStreamDataSourceDecorator; import org.opentripplanner.framework.io.OtpHttpClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This data store accesses files in read-only mode over HTTPS. */ public class HttpsDataSourceRepository implements DataSourceRepository { + private static final Logger LOG = LoggerFactory.getLogger(HttpsFileDataSource.class); + private static final Duration HTTP_HEAD_REQUEST_TIMEOUT = Duration.ofSeconds(20); @Override @@ -75,7 +79,7 @@ private CompositeDataSource createCompositeSource(URI uri, FileType type) { } protected List

      getHttpHeaders(URI uri) { - try (OtpHttpClient otpHttpClient = new OtpHttpClient()) { + try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { return otpHttpClient.getHeaders(uri, HTTP_HEAD_REQUEST_TIMEOUT, Map.of()); } } diff --git a/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java b/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java index 14b770036b8..9b55019332f 100644 --- a/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java +++ b/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java @@ -13,6 +13,8 @@ import org.opentripplanner.datastore.file.DirectoryDataSource; import org.opentripplanner.datastore.file.ZipFileDataSource; import org.opentripplanner.framework.io.OtpHttpClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This class is a wrapper around an HTTPS resource. @@ -22,6 +24,8 @@ */ final class HttpsFileDataSource implements DataSource { + private static final Logger LOG = LoggerFactory.getLogger(HttpsFileDataSource.class); + private static final Duration HTTP_GET_REQUEST_TIMEOUT = Duration.ofSeconds(20); private final URI uri; private final FileType type; @@ -35,7 +39,7 @@ final class HttpsFileDataSource implements DataSource { this.uri = uri; this.type = type; this.httpsDataSourceMetadata = httpsDataSourceMetadata; - otpHttpClient = new OtpHttpClient(); + otpHttpClient = new OtpHttpClient(LOG); } /** diff --git a/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java b/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java index bb602adb472..b45604b26aa 100644 --- a/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java +++ b/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java @@ -17,7 +17,7 @@ public class JsonDataListDownloader { - private static final Logger log = LoggerFactory.getLogger(JsonDataListDownloader.class); + private static final Logger LOG = LoggerFactory.getLogger(JsonDataListDownloader.class); private final String jsonParsePath; private final Map headers; private final Function elementParser; @@ -30,7 +30,7 @@ public JsonDataListDownloader( @Nonnull Function elementParser, @Nonnull Map headers ) { - this(url, jsonParsePath, elementParser, headers, new OtpHttpClient()); + this(url, jsonParsePath, elementParser, headers, new OtpHttpClient(LOG)); } public JsonDataListDownloader( @@ -49,7 +49,7 @@ public JsonDataListDownloader( public List download() { if (url == null) { - log.warn("Cannot download updates, because url is null!"); + LOG.warn("Cannot download updates, because url is null!"); return null; } try { @@ -60,17 +60,17 @@ public List download() { try { return parseJSON(is); } catch (IllegalArgumentException e) { - log.warn("Error parsing bike rental feed from {}", url, e); + LOG.warn("Error parsing bike rental feed from {}", url, e); } catch (JsonProcessingException e) { - log.warn("Error parsing bike rental feed from {} (bad JSON of some sort)", url, e); + LOG.warn("Error parsing bike rental feed from {} (bad JSON of some sort)", url, e); } catch (IOException e) { - log.warn("Error reading bike rental feed from {}", url, e); + LOG.warn("Error reading bike rental feed from {}", url, e); } return null; } ); } catch (OtpHttpClientException e) { - log.warn("Failed to get data from url {}", url); + LOG.warn("Failed to get data from url {}", url); return null; } } @@ -111,7 +111,7 @@ private List parseJSON(InputStream dataStream) throws IllegalArgumentExceptio out.add(parsedElement); } } catch (Exception e) { - log.error("Could not process element in JSON list downloaded from {}", url, e); + LOG.error("Could not process element in JSON list downloaded from {}", url, e); } } return out; diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java index 1ac8891553c..774dad34a24 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java @@ -39,7 +39,6 @@ import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * HTTP client providing convenience methods to send HTTP requests and map HTTP responses to Java @@ -79,7 +78,6 @@ */ public class OtpHttpClient implements AutoCloseable { - private static final Logger LOG = LoggerFactory.getLogger(OtpHttpClient.class); private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(5); private static final Duration DEFAULT_TTL = Duration.ofMinutes(1); @@ -91,34 +89,41 @@ public class OtpHttpClient implements AutoCloseable { private final CloseableHttpClient httpClient; + private final Logger log; + /** * Creates an HTTP client with default timeout, default connection time-to-live and default max * number of connections. */ - public OtpHttpClient() { - this(DEFAULT_TIMEOUT, DEFAULT_TTL); + public OtpHttpClient(Logger logger) { + this(DEFAULT_TIMEOUT, DEFAULT_TTL, logger); } /** * Creates an HTTP client with default timeout, default connection time-to-live and the given max * number of connections. */ - public OtpHttpClient(int maxConnections) { - this(DEFAULT_TIMEOUT, DEFAULT_TTL, maxConnections); + public OtpHttpClient(int maxConnections, Logger logger) { + this(DEFAULT_TIMEOUT, DEFAULT_TTL, maxConnections, logger); } /** * Creates an HTTP client the given timeout and connection time-to-live and the default max * number of connections. */ - public OtpHttpClient(Duration timeout, Duration connectionTtl) { - this(timeout, connectionTtl, DEFAULT_MAX_TOTAL_CONNECTIONS); + public OtpHttpClient(Duration timeout, Duration connectionTtl, Logger logger) { + this(timeout, connectionTtl, DEFAULT_MAX_TOTAL_CONNECTIONS, logger); } /** * Creates an HTTP client with custom configuration. */ - private OtpHttpClient(Duration timeout, Duration connectionTtl, int maxConnections) { + private OtpHttpClient( + Duration timeout, + Duration connectionTtl, + int maxConnections, + Logger logger + ) { Objects.requireNonNull(timeout); Objects.requireNonNull(connectionTtl); @@ -145,6 +150,7 @@ private OtpHttpClient(Duration timeout, Duration connectionTtl, int maxConnectio .setDefaultRequestConfig(requestConfig(timeout)); httpClient = httpClientBuilder.build(); + log = logger; } /** @@ -162,7 +168,7 @@ public List
      getHeaders( requestHeaderValues, response -> { if (isFailedRequest(response)) { - LOG.warn( + log.warn( "Headers of resource {} unavailable. HTTP error code {}", sanitizeUri(uri), response.getCode() diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java index 21f6c81bc67..ca5434d2e7b 100644 --- a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java +++ b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java @@ -50,7 +50,7 @@ public GtfsRealtimeAlertsUpdater( this.updateHandler.setFeedId(config.feedId()); this.updateHandler.setTransitAlertService(transitAlertService); this.updateHandler.setFuzzyTripMatcher(fuzzyTripMatcher); - this.otpHttpClient = new OtpHttpClient(); + this.otpHttpClient = new OtpHttpClient(LOG); LOG.info("Creating real-time alert updater running every {}: {}", pollingPeriod(), url); } diff --git a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java index c755578da41..5286173041c 100644 --- a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java +++ b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java @@ -28,6 +28,8 @@ import org.opentripplanner.updater.vehicle_position.PollingVehiclePositionUpdater; import org.opentripplanner.updater.vehicle_rental.VehicleRentalUpdater; import org.opentripplanner.updater.vehicle_rental.datasources.VehicleRentalDataSourceFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Sets up and starts all the graph updaters. @@ -38,6 +40,8 @@ */ public class UpdaterConfigurator { + private static final Logger LOG = LoggerFactory.getLogger(UpdaterConfigurator.class); + private final Graph graph; private final TransitModel transitModel; private final UpdatersParameters updatersParameters; @@ -137,7 +141,7 @@ private List createUpdatersFromConfig() { if (!updatersParameters.getVehicleRentalParameters().isEmpty()) { int maxHttpConnections = updatersParameters.getVehicleRentalParameters().size(); - OtpHttpClient otpHttpClient = new OtpHttpClient(maxHttpConnections); + OtpHttpClient otpHttpClient = new OtpHttpClient(maxHttpConnections, LOG); for (var configItem : updatersParameters.getVehicleRentalParameters()) { var source = VehicleRentalDataSourceFactory.create( configItem.sourceParameters(), diff --git a/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java b/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java index df275073f72..11e4717df26 100644 --- a/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java +++ b/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java @@ -15,7 +15,7 @@ public abstract class GenericJsonDataSource implements DataSource { protected List updates = List.of(); protected GenericJsonDataSource(String url, String jsonParsePath, HttpHeaders headers) { - this(url, jsonParsePath, headers, new OtpHttpClient()); + this(url, jsonParsePath, headers, new OtpHttpClient(LOG)); } protected GenericJsonDataSource( diff --git a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java index 765f6d11845..3fa9fc6e779 100644 --- a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java @@ -33,7 +33,7 @@ public GtfsRealtimeTripUpdateSource(PollingTripUpdaterParameters config) { this.url = config.url(); this.headers = HttpHeaders.of().acceptProtobuf().add(config.headers()).build(); MfdzRealtimeExtensions.registerAllExtensions(registry); - otpHttpClient = new OtpHttpClient(); + otpHttpClient = new OtpHttpClient(LOG); } public List getUpdates() { diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java b/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java index 5983eef7c40..d68a67eaa9a 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java @@ -33,7 +33,7 @@ public class GtfsRealtimeHttpVehiclePositionSource { public GtfsRealtimeHttpVehiclePositionSource(URI url, HttpHeaders headers) { this.url = url; this.headers = HttpHeaders.of().acceptProtobuf().add(headers).build(); - this.otpHttpClient = new OtpHttpClient(); + this.otpHttpClient = new OtpHttpClient(LOG); } /** diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java index 58a625192f9..87f58f24f85 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java @@ -98,7 +98,7 @@ public GbfsFeedLoader( } GbfsFeedLoader(String url, HttpHeaders httpHeaders, String languageCode) { - this(url, httpHeaders, languageCode, new OtpHttpClient()); + this(url, httpHeaders, languageCode, new OtpHttpClient(LOG)); } /** diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java index 5bb9a3a750c..2c5c36b29e7 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java @@ -30,6 +30,8 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.updater.spi.HttpHeaders; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This tests that {@link GbfsFeedLoader} handles loading of different versions of GBFS correctly, @@ -90,7 +92,11 @@ void getV10FeedWithExplicitLanguage() { @Test @Disabled void fetchAllPublicFeeds() { - try (OtpHttpClient otpHttpClient = new OtpHttpClient()) { + try ( + OtpHttpClient otpHttpClient = new OtpHttpClient( + LoggerFactory.getLogger(GbfsFeedLoaderTest.class) + ) + ) { List exceptions = otpHttpClient.getAndMap( URI.create("https://raw.githubusercontent.com/NABSA/gbfs/master/systems.csv"), Map.of(), diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java index dba2e10510b..9ac5f2d44d2 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java @@ -16,12 +16,16 @@ import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.updater.spi.HttpHeaders; import org.opentripplanner.updater.vehicle_rental.datasources.params.GbfsVehicleRentalDataSourceParameters; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * This tests the mapping between data coming from a {@link GbfsFeedLoader} to OTP station models. */ class GbfsVehicleRentalDataSourceTest { + private static final Logger LOG = LoggerFactory.getLogger(GbfsVehicleRentalDataSourceTest.class); + @Test void makeStationFromV22() { var dataSource = new GbfsVehicleRentalDataSource( @@ -34,7 +38,7 @@ void makeStationFromV22() { false, false ), - new OtpHttpClient() + new OtpHttpClient(LOG) ); dataSource.setup(); @@ -125,7 +129,7 @@ void geofencing() { true, false ), - new OtpHttpClient() + new OtpHttpClient(LOG) ); dataSource.setup(); @@ -167,7 +171,7 @@ void makeStationFromV10() { false, true ), - new OtpHttpClient() + new OtpHttpClient(LOG) ); dataSource.setup(); From 78aaa64004607af2f4b52afe596b2307b939eb0c Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 8 Apr 2024 15:19:41 +0300 Subject: [PATCH 0936/1688] Trace log error response --- .../framework/io/OtpHttpClient.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java index 774dad34a24..959f2cbb496 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java @@ -2,8 +2,10 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; +import java.io.InputStreamReader; import java.net.MalformedURLException; import java.net.URI; import java.net.URL; @@ -14,6 +16,7 @@ import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; @@ -168,6 +171,7 @@ public List
      getHeaders( requestHeaderValues, response -> { if (isFailedRequest(response)) { + logResponse(response); log.warn( "Headers of resource {} unavailable. HTTP error code {}", sanitizeUri(uri), @@ -422,6 +426,7 @@ protected T executeAndMapWithResponseHandler( private T mapResponse(ClassicHttpResponse response, ResponseMapper contentMapper) { if (isFailedRequest(response)) { + logResponse(response); throw new OtpHttpClientException( "HTTP request failed with status code " + response.getCode() ); @@ -491,6 +496,24 @@ private static String sanitizeUri(URI uri) { return uri.toString().replace('?' + uri.getQuery(), ""); } + private void logResponse(ClassicHttpResponse response) { + try { + if ( + log.isTraceEnabled() && + response.getEntity() != null && + response.getEntity().getContent() != null + ) { + var entity = response.getEntity(); + String content = new BufferedReader(new InputStreamReader(entity.getContent())) + .lines() + .collect(Collectors.joining("\n")); + log.trace("HTTP request failed with status code {}: \n{}", response.getCode(), content); + } + } catch (Exception e) { + log.debug(e.getMessage()); + } + } + @FunctionalInterface public interface ResponseMapper { /** From da3271691eef87c49b60e8ee7aa29e30d1a14b71 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 9 Apr 2024 09:00:22 +0000 Subject: [PATCH 0937/1688] Add changelog entry for #5789 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index e68122c6f07..021fe4b76de 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -9,6 +9,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix street routing on roundabout [#5732](https://github.com/opentripplanner/OpenTripPlanner/pull/5732) - Expose route sort order in GTFS API [#5764](https://github.com/opentripplanner/OpenTripPlanner/pull/5764) - Fix issue with cancellations on trip patterns that run after midnight [#5719](https://github.com/opentripplanner/OpenTripPlanner/pull/5719) +- Fix handling of null transport mode filter [#5789](https://github.com/opentripplanner/OpenTripPlanner/pull/5789) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From f5c51bcd2c1c104d4acea620ab60c91a65d23053 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Apr 2024 11:41:45 +0200 Subject: [PATCH 0938/1688] Add comment about moving constant --- .../graph_builder/module/ned/ElevationModule.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java index e224d1d6d0b..d0fc6da5adf 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java @@ -62,10 +62,17 @@ public class ElevationModule implements GraphBuilderModule { private static final Logger LOG = LoggerFactory.getLogger(ElevationModule.class); - /** A shared copy of the WGS84 CRS with longitude-first axis order. */ + /** + * A shared copy of the WGS84 CRS with longitude-first axis order. This constant used + * to be defined in a shared utility class but since it's slow to initialize, it was move here. + * See https://github.com/opentripplanner/OpenTripPlanner/pull/5786 + * */ private static final CoordinateReferenceSystem WGS84_XY; static { + // looking up the CRS is surprisingly expensive (~500ms) and should therefore not done + // in shared utility class + // https://github.com/opentripplanner/OpenTripPlanner/pull/5786 try { WGS84_XY = CRS.getAuthorityFactory(true).createCoordinateReferenceSystem("EPSG:4326"); } catch (Exception ex) { From 9e1bd4d5f851065f45fdf856f0c02433312464b5 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 9 Apr 2024 13:08:10 +0200 Subject: [PATCH 0939/1688] Fix typo --- .../opentripplanner/netex/mapping/TripPatternMapper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java b/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java index d16cd71f103..740224b4489 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/TripPatternMapper.java @@ -67,7 +67,7 @@ class TripPatternMapper { private final ReadOnlyHierarchicalMap routeById; - private final Multimap serviceJourniesByPatternId = ArrayListMultimap.create(); + private final Multimap serviceJourneysByPatternId = ArrayListMultimap.create(); private final ReadOnlyHierarchicalMapById operatingDayById; @@ -152,12 +152,12 @@ class TripPatternMapper { this.serviceJourneyById = serviceJourneyById; // Index service journey by pattern id for (ServiceJourney sj : serviceJourneyById.localValues()) { - this.serviceJourniesByPatternId.put(sj.getJourneyPatternRef().getValue().getRef(), sj); + this.serviceJourneysByPatternId.put(sj.getJourneyPatternRef().getValue().getRef(), sj); } } Optional mapTripPattern(JourneyPattern_VersionStructure journeyPattern) { - Collection serviceJourneys = serviceJourniesByPatternId.get( + Collection serviceJourneys = serviceJourneysByPatternId.get( journeyPattern.getId() ); From 3a7a418c2b73b9df556a097a5adce6fb28ba36a5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Apr 2024 14:14:44 +0200 Subject: [PATCH 0940/1688] Update src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java Co-authored-by: Andrew Byrd --- .../graph_builder/module/ned/ElevationModule.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java index d0fc6da5adf..288d41db73b 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java @@ -63,16 +63,15 @@ public class ElevationModule implements GraphBuilderModule { private static final Logger LOG = LoggerFactory.getLogger(ElevationModule.class); /** - * A shared copy of the WGS84 CRS with longitude-first axis order. This constant used - * to be defined in a shared utility class but since it's slow to initialize, it was move here. - * See https://github.com/opentripplanner/OpenTripPlanner/pull/5786 - * */ + * The WGS84 CRS with longitude-first axis order. The first time a CRS lookup is + * performed is surprisingly expensive (around 500ms), apparently due to initializing + * an HSQLDB JDBC connection. For this reason, the constant is defined in this + * narrower scope rather than a shared utility class, where it was seen to incur the + * initialization cost in a broader range of tests than is necessary. + */ private static final CoordinateReferenceSystem WGS84_XY; static { - // looking up the CRS is surprisingly expensive (~500ms) and should therefore not done - // in shared utility class - // https://github.com/opentripplanner/OpenTripPlanner/pull/5786 try { WGS84_XY = CRS.getAuthorityFactory(true).createCoordinateReferenceSystem("EPSG:4326"); } catch (Exception ex) { From 70bb4ee955197f8063aee6b943bdd666eb616d36 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Apr 2024 14:46:30 +0200 Subject: [PATCH 0941/1688] Fix formatting --- .../graph_builder/module/ned/ElevationModule.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java index 288d41db73b..6bcab049bd4 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/ned/ElevationModule.java @@ -63,9 +63,9 @@ public class ElevationModule implements GraphBuilderModule { private static final Logger LOG = LoggerFactory.getLogger(ElevationModule.class); /** - * The WGS84 CRS with longitude-first axis order. The first time a CRS lookup is + * The WGS84 CRS with longitude-first axis order. The first time a CRS lookup is * performed is surprisingly expensive (around 500ms), apparently due to initializing - * an HSQLDB JDBC connection. For this reason, the constant is defined in this + * an HSQLDB JDBC connection. For this reason, the constant is defined in this * narrower scope rather than a shared utility class, where it was seen to incur the * initialization cost in a broader range of tests than is necessary. */ From 9d764b1d807e80e0c013b8bd8196d9c732624bc2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Apr 2024 15:32:17 +0200 Subject: [PATCH 0942/1688] Upgrade Codecov action and use token --- .github/workflows/cibuild.yml | 4 +++- .github/workflows/performance-test.yml | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml index 5a48da6bc44..2853c7ee00b 100644 --- a/.github/workflows/cibuild.yml +++ b/.github/workflows/cibuild.yml @@ -51,9 +51,11 @@ jobs: - name: Send coverage data to codecov.io if: github.repository_owner == 'opentripplanner' - uses: codecov/codecov-action@v3.1.1 + uses: codecov/codecov-action@v4 with: files: target/site/jacoco/jacoco.xml + token: ${{ secrets.CODECOV_TOKEN }} + verbose: true - name: Deploy to Github Package Registry if: github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev-1.x' || github.ref == 'refs/heads/dev-2.x') diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml index 1b8201a01ae..60b3e69610d 100644 --- a/.github/workflows/performance-test.yml +++ b/.github/workflows/performance-test.yml @@ -75,7 +75,7 @@ jobs: - name: Set up Maven if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x' - uses: stCarolas/setup-maven@v.4.5 + uses: stCarolas/setup-maven@v5 with: maven-version: 3.8.2 @@ -102,7 +102,7 @@ jobs: - name: Archive travel results file if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: ${{ matrix.location }}-travelSearch-results.csv path: test/performance/${{ matrix.location }}/travelSearch-results.csv From bf11e9f916be86d5e903d10129a1874bac57c612 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 9 Apr 2024 17:06:24 +0300 Subject: [PATCH 0943/1688] Don't back cycling on use_sidepath and apply safety values in default mapper --- .../openstreetmap/model/OSMWay.java | 26 -------- .../openstreetmap/model/OSMWithTags.java | 8 +-- .../tagmapping/DefaultMapper.java | 3 + .../tagmapping/FinlandMapper.java | 2 - .../openstreetmap/model/OSMWayTest.java | 15 ----- .../openstreetmap/model/OSMWithTagsTest.java | 2 +- .../tagmapping/DefaultMapperTest.java | 42 +++++++++++++ .../tagmapping/FinlandMapperTest.java | 2 +- .../wayproperty/WayPropertySetTest.java | 59 ------------------- 9 files changed, 49 insertions(+), 110 deletions(-) diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java index 1ce6c698f22..6e610f99fa3 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWay.java @@ -105,20 +105,6 @@ public boolean isOneWayReverseBicycle() { return "-1".equals(oneWayBicycle) || isTagFalse("bicycle:forward"); } - /** - * Returns true if bikes must use sidepath in forward direction - */ - public boolean isForwardDirectionSidepath() { - return "use_sidepath".equals(getTag("bicycle:forward")); - } - - /** - * Returns true if bikes must use sidepath in reverse direction - */ - public boolean isReverseDirectionSidepath() { - return "use_sidepath".equals(getTag("bicycle:backward")); - } - /** * Some cycleways allow contraflow biking. */ @@ -184,18 +170,6 @@ public StreetTraversalPermissionPair splitPermissions(StreetTraversalPermission } } - //This needs to be after adding permissions for oneway:bicycle=no - //removes bicycle permission when bicycles need to use sidepath - //TAG: bicycle:forward=use_sidepath - if (isForwardDirectionSidepath()) { - permissionsFront = permissionsFront.remove(StreetTraversalPermission.BICYCLE); - } - - //TAG bicycle:backward=use_sidepath - if (isReverseDirectionSidepath()) { - permissionsBack = permissionsBack.remove(StreetTraversalPermission.BICYCLE); - } - if (isOpposableCycleway()) { permissionsBack = permissionsBack.add(StreetTraversalPermission.BICYCLE); } diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index 37757823362..e5feda76bc5 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -391,14 +391,10 @@ public boolean isVehicleExplicitlyAllowed() { /** * Returns true if bikes are explicitly denied access. *

      - * bicycle is denied if bicycle:no, bicycle:dismount, bicycle:license or bicycle:use_sidepath + * bicycle is denied if bicycle:no, bicycle:dismount or bicycle:license. */ public boolean isBicycleExplicitlyDenied() { - return ( - isTagDeniedAccess("bicycle") || - "dismount".equals(getTag("bicycle")) || - "use_sidepath".equals(getTag("bicycle")) - ); + return (isTagDeniedAccess("bicycle") || "dismount".equals(getTag("bicycle"))); } /** diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java index 1463313203d..9989c102030 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java @@ -624,6 +624,9 @@ public void populateProperties(WayPropertySet props) { props.setMixinProperties("foot=discouraged", ofWalkSafety(3)); props.setMixinProperties("bicycle=discouraged", ofBicycleSafety(3)); + props.setMixinProperties("foot=use_sidepath", ofWalkSafety(5)); + props.setMixinProperties("bicycle=use_sidepath", ofBicycleSafety(5)); + populateNotesAndNames(props); // slope overrides diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java index c42b8016d45..5ea949e8d5c 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java +++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapper.java @@ -168,8 +168,6 @@ else if (speedLimit <= 16.65f) { // We don't need to set bicycle safety as cycling is not currently allowed on these ways. props.setMixinProperties("bicycle=use_sidepath", ofWalkSafety(5)); - props.setMixinProperties("foot=use_sidepath", ofWalkSafety(8)); - // Automobile speeds in Finland. // General speed limit is 80kph unless signs says otherwise. props.defaultCarSpeed = 22.22f; diff --git a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java index c316793ad8c..c0af4cf2701 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWayTest.java @@ -92,21 +92,6 @@ void testIsOneWayBicycle() { assertTrue(way.isOneWayReverseBicycle()); } - @Test - void testIsOneDirectionSidepath() { - OSMWay way = new OSMWay(); - assertFalse(way.isForwardDirectionSidepath()); - assertFalse(way.isReverseDirectionSidepath()); - - way.addTag("bicycle:forward", "use_sidepath"); - assertTrue(way.isForwardDirectionSidepath()); - assertFalse(way.isReverseDirectionSidepath()); - - way.addTag("bicycle:backward", "use_sidepath"); - assertTrue(way.isForwardDirectionSidepath()); - assertTrue(way.isReverseDirectionSidepath()); - } - @Test void testIsOpposableCycleway() { OSMWay way = new OSMWay(); diff --git a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java index ca5db77df12..aefd287cac8 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java @@ -136,7 +136,7 @@ void testBicycleDenied() { assertFalse(tags.isBicycleExplicitlyDenied(), "bicycle=" + allowedValue); } - for (var deniedValue : List.of("no", "dismount", "license", "use_sidepath")) { + for (var deniedValue : List.of("no", "dismount", "license")) { tags.addTag("bicycle", deniedValue); assertTrue(tags.isBicycleExplicitlyDenied(), "bicycle=" + deniedValue); } diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java index 9a16f6a8e2e..2a8988dda61 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapperTest.java @@ -147,6 +147,48 @@ void bicycleDiscouraged() { assertEquals(2.94, discouragedProps.bicycleSafety().forward(), epsilon); } + @Test + void footUseSidepath() { + var regular = WayTestData.pedestrianTunnel(); + var props = wps.getDataForWay(regular); + assertEquals(PEDESTRIAN_AND_BICYCLE, props.getPermission()); + assertEquals(1, props.walkSafety().forward()); + + var useSidepath = WayTestData.pedestrianTunnel().addTag("foot", "use_sidepath"); + var useSidepathProps = wps.getDataForWay(useSidepath); + assertEquals(PEDESTRIAN_AND_BICYCLE, useSidepathProps.getPermission()); + assertEquals(5, useSidepathProps.walkSafety().forward()); + } + + @Test + void bicycleUseSidepath() { + var regular = WayTestData.southeastLaBonitaWay(); + var props = wps.getDataForWay(regular); + assertEquals(ALL, props.getPermission()); + assertEquals(.98, props.bicycleSafety().forward()); + + var useSidepath = WayTestData.southeastLaBonitaWay().addTag("bicycle", "use_sidepath"); + var useSidepathProps = wps.getDataForWay(useSidepath); + assertEquals(ALL, useSidepathProps.getPermission()); + assertEquals(4.9, useSidepathProps.bicycleSafety().forward(), epsilon); + + var useSidepathForward = WayTestData + .southeastLaBonitaWay() + .addTag("bicycle:forward", "use_sidepath"); + var useSidepathForwardProps = wps.getDataForWay(useSidepathForward); + assertEquals(ALL, useSidepathForwardProps.getPermission()); + assertEquals(4.9, useSidepathForwardProps.bicycleSafety().forward(), epsilon); + assertEquals(0.98, useSidepathForwardProps.bicycleSafety().back(), epsilon); + + var useSidepathBackward = WayTestData + .southeastLaBonitaWay() + .addTag("bicycle:backward", "use_sidepath"); + var useSidepathBackwardProps = wps.getDataForWay(useSidepathBackward); + assertEquals(ALL, useSidepathBackwardProps.getPermission()); + assertEquals(0.98, useSidepathBackwardProps.bicycleSafety().forward(), epsilon); + assertEquals(4.9, useSidepathBackwardProps.bicycleSafety().back(), epsilon); + } + /** * Test that two values are within epsilon of each other. */ diff --git a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java index ca3c059db51..4dd52195acb 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/tagmapping/FinlandMapperTest.java @@ -168,7 +168,7 @@ public void testSafetyWithMixins() { assertEquals(8, wps.getDataForWay(wayWithBicycleSidePath).walkSafety().forward(), epsilon); OSMWithTags wayWithFootSidePath = new OSMWithTags(); wayWithFootSidePath.addTag("foot", "use_sidepath"); - assertEquals(12.8, wps.getDataForWay(wayWithFootSidePath).walkSafety().forward(), epsilon); + assertEquals(8, wps.getDataForWay(wayWithFootSidePath).walkSafety().forward(), epsilon); } @Test diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java index e8f5b6e51d3..24360539b6f 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/WayPropertySetTest.java @@ -256,65 +256,6 @@ void testMotorVehicleTagDeniedPermissions() { assertTrue(permissionPair.main().allowsNothing());*/ } - @Test - void testSidepathPermissions() { - OSMWay way = new OSMWay(); - way.addTag("bicycle", "use_sidepath"); - way.addTag("highway", "primary"); - way.addTag("lanes", "2"); - way.addTag("maxspeed", "70"); - way.addTag("oneway", "yes"); - var permissionPair = getWayProperties(way); - - assertFalse(permissionPair.main().allows(StreetTraversalPermission.BICYCLE)); - assertFalse(permissionPair.back().allows(StreetTraversalPermission.BICYCLE)); - - assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR)); - assertFalse(permissionPair.back().allows(StreetTraversalPermission.CAR)); - - way = new OSMWay(); - way.addTag("bicycle:forward", "use_sidepath"); - way.addTag("highway", "tertiary"); - permissionPair = getWayProperties(way); - - assertFalse(permissionPair.main().allows(StreetTraversalPermission.BICYCLE)); - assertTrue(permissionPair.back().allows(StreetTraversalPermission.BICYCLE)); - - assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR)); - assertTrue(permissionPair.back().allows(StreetTraversalPermission.CAR)); - - way = new OSMWay(); - way.addTag("bicycle:backward", "use_sidepath"); - way.addTag("highway", "tertiary"); - permissionPair = getWayProperties(way); - - assertTrue(permissionPair.main().allows(StreetTraversalPermission.BICYCLE)); - assertFalse(permissionPair.back().allows(StreetTraversalPermission.BICYCLE)); - - assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR)); - assertTrue(permissionPair.back().allows(StreetTraversalPermission.CAR)); - - way = new OSMWay(); - way.addTag("highway", "tertiary"); - way.addTag("oneway", "yes"); - way.addTag("oneway:bicycle", "no"); - permissionPair = getWayProperties(way); - - assertTrue(permissionPair.main().allows(StreetTraversalPermission.BICYCLE)); - assertTrue(permissionPair.back().allows(StreetTraversalPermission.BICYCLE)); - - assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR)); - assertFalse(permissionPair.back().allows(StreetTraversalPermission.CAR)); - - way.addTag("bicycle:forward", "use_sidepath"); - permissionPair = getWayProperties(way); - assertFalse(permissionPair.main().allows(StreetTraversalPermission.BICYCLE)); - assertTrue(permissionPair.back().allows(StreetTraversalPermission.BICYCLE)); - - assertTrue(permissionPair.main().allows(StreetTraversalPermission.CAR)); - assertFalse(permissionPair.back().allows(StreetTraversalPermission.CAR)); - } - private StreetTraversalPermissionPair getWayProperties(OSMWay way) { WayPropertySet wayPropertySet = new WayPropertySet(); WayProperties wayData = wayPropertySet.getDataForWay(way); From 1896c9991955cabe5332bc3e4cde736042f463a0 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 9 Apr 2024 16:12:31 +0200 Subject: [PATCH 0944/1688] Added unit test --- .../netex/mapping/NetexTestDataSample.java | 21 +++- .../netex/mapping/TripPatternMapperTest.java | 111 ++++++++++++++---- 2 files changed, 104 insertions(+), 28 deletions(-) diff --git a/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java b/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java index b8723fdbcf3..b72c9b05277 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java +++ b/src/test/java/org/opentripplanner/netex/mapping/NetexTestDataSample.java @@ -40,6 +40,7 @@ import org.rutebanken.netex.model.ScheduledStopPointRefStructure; import org.rutebanken.netex.model.ServiceAlterationEnumeration; import org.rutebanken.netex.model.ServiceJourney; +import org.rutebanken.netex.model.ServiceJourneyRefStructure; import org.rutebanken.netex.model.StopPointInJourneyPattern; import org.rutebanken.netex.model.StopPointInJourneyPatternRefStructure; import org.rutebanken.netex.model.TimetabledPassingTime; @@ -50,9 +51,11 @@ public class NetexTestDataSample { public static final String SERVICE_JOURNEY_ID = "RUT:ServiceJourney:1"; + public static final String DATED_SERVICE_JOURNEY_ID_1 = "RUT:DatedServiceJourney:1"; + public static final String DATED_SERVICE_JOURNEY_ID_2 = "RUT:DatedServiceJourney:2"; public static final List DATED_SERVICE_JOURNEY_ID = List.of( - "RUT:DatedServiceJourney:1", - "RUT:DatedServiceJourney:2" + DATED_SERVICE_JOURNEY_ID_1, + DATED_SERVICE_JOURNEY_ID_2 ); public static final List OPERATING_DAYS = List.of("2022-02-28", "2022-02-29"); private static final DayType EVERYDAY = new DayType() @@ -174,6 +177,11 @@ public NetexTestDataSample() { DatedServiceJourney datedServiceJourney = new DatedServiceJourney() .withId(DATED_SERVICE_JOURNEY_ID.get(i)) + .withJourneyRef( + List.of( + MappingSupport.createWrappedRef(SERVICE_JOURNEY_ID, ServiceJourneyRefStructure.class) + ) + ) .withServiceAlteration(ServiceAlterationEnumeration.PLANNED) .withOperatingDayRef(new OperatingDayRefStructure().withRef(operatingDay.getId())); @@ -218,6 +226,15 @@ public HierarchicalMapById getServiceJourneyById() { return serviceJourneyById; } + public DatedServiceJourney getDatedServiceJourneyById(String id) { + return datedServiceJourneyBySjId + .values() + .stream() + .filter(datedServiceJourney -> datedServiceJourney.getId().equals(id)) + .findFirst() + .orElse(null); + } + public ServiceJourney getServiceJourney() { return serviceJourneyById.lookup(SERVICE_JOURNEY_ID); } diff --git a/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java index 74448fb3638..95af8f623e5 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/TripPatternMapperTest.java @@ -1,9 +1,12 @@ package org.opentripplanner.netex.mapping; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.common.collect.ArrayListMultimap; +import java.util.List; import java.util.Map; import java.util.Optional; import org.junit.jupiter.api.Test; @@ -19,17 +22,19 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.rutebanken.netex.model.DatedServiceJourney; +import org.rutebanken.netex.model.DatedServiceJourneyRefStructure; import org.rutebanken.netex.model.OperatingDay; +import org.rutebanken.netex.model.ServiceAlterationEnumeration; /** * @author Thomas Gran (Capra) - tgr@capraconsulting.no (29.11.2017) */ -public class TripPatternMapperTest { +class TripPatternMapperTest { private static final FeedScopedId SERVICE_ID = TransitModelForTest.id("S01"); @Test - public void testMapTripPattern() { + void testMapTripPattern() { NetexTestDataSample sample = new NetexTestDataSample(); TripPatternMapper tripPatternMapper = new TripPatternMapper( @@ -88,9 +93,85 @@ public void testMapTripPattern() { } @Test - public void testMapTripPattern_datedServiceJourney() { + void testMapTripPattern_datedServiceJourney() { NetexTestDataSample sample = new NetexTestDataSample(); + Optional res = mapTripPattern(sample); + assertTrue(res.isPresent()); + + var r = res.get(); + + assertEquals(2, r.tripOnServiceDates().size()); + + Trip trip = r.tripPattern().scheduledTripsAsStream().findFirst().get(); + + for (TripOnServiceDate tripOnServiceDate : r.tripOnServiceDates()) { + assertEquals(trip, tripOnServiceDate.getTrip()); + assertEquals(TripAlteration.PLANNED, tripOnServiceDate.getTripAlteration()); + assertEquals( + 1, + sample + .getOperatingDaysById() + .localValues() + .stream() + .map(OperatingDay::getId) + .filter(id -> id.equals(tripOnServiceDate.getServiceDate().toString())) + .count() + ); + } + } + + @Test + void testDatedServiceJourneyReplacement() { + NetexTestDataSample sample = new NetexTestDataSample(); + DatedServiceJourney dsjReplaced = sample.getDatedServiceJourneyById( + NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_1 + ); + dsjReplaced.setServiceAlteration(ServiceAlterationEnumeration.REPLACED); + DatedServiceJourney dsjReplacing = sample.getDatedServiceJourneyById( + NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_2 + ); + dsjReplacing.withJourneyRef( + List.of( + MappingSupport.createWrappedRef(dsjReplaced.getId(), DatedServiceJourneyRefStructure.class) + ) + ); + Optional res = mapTripPattern(sample); + + assertTrue(res.isPresent()); + var r = res.get(); + Optional replacedTripOnServiceDate = r + .tripOnServiceDates() + .stream() + .filter(tripOnServiceDate -> + NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_1.equals(tripOnServiceDate.getId().getId()) + ) + .findFirst(); + + assertTrue(replacedTripOnServiceDate.isPresent()); + assertEquals(TripAlteration.REPLACED, replacedTripOnServiceDate.get().getTripAlteration()); + + Optional replacingTripOnServiceDate = r + .tripOnServiceDates() + .stream() + .filter(tripOnServiceDate -> + NetexTestDataSample.DATED_SERVICE_JOURNEY_ID_2.equals(tripOnServiceDate.getId().getId()) + ) + .findFirst(); + + assertTrue(replacingTripOnServiceDate.isPresent()); + assertEquals(TripAlteration.PLANNED, replacingTripOnServiceDate.get().getTripAlteration()); + assertFalse(replacingTripOnServiceDate.get().getReplacementFor().isEmpty()); + + // the replaced trip should refer to the same object (object identity) whether it is accessed + // directly from the replaced DSJ or indirectly through the replacing DSJ. + assertSame( + replacingTripOnServiceDate.get().getReplacementFor().getFirst().getTrip(), + replacedTripOnServiceDate.get().getTrip() + ); + } + + private static Optional mapTripPattern(NetexTestDataSample sample) { HierarchicalMapById datedServiceJourneys = new HierarchicalMapById<>(); datedServiceJourneys.addAll(sample.getDatedServiceJourneyBySjId().values()); @@ -121,28 +202,6 @@ public void testMapTripPattern_datedServiceJourney() { Optional res = tripPatternMapper.mapTripPattern( sample.getJourneyPattern() ); - - assertTrue(res.isPresent()); - - var r = res.get(); - - assertEquals(2, r.tripOnServiceDates().size()); - - Trip trip = r.tripPattern().scheduledTripsAsStream().findFirst().get(); - - for (TripOnServiceDate tripOnServiceDate : r.tripOnServiceDates()) { - assertEquals(trip, tripOnServiceDate.getTrip()); - assertEquals(TripAlteration.PLANNED, tripOnServiceDate.getTripAlteration()); - assertEquals( - 1, - sample - .getOperatingDaysById() - .localValues() - .stream() - .map(OperatingDay::getId) - .filter(id -> id.equals(tripOnServiceDate.getServiceDate().toString())) - .count() - ); - } + return res; } } From 05640381726c9ec7a7d122c2960a8e6752d91949 Mon Sep 17 00:00:00 2001 From: Bastian Silies Date: Tue, 9 Apr 2024 17:26:00 +0200 Subject: [PATCH 0945/1688] extract ferry-check --- .../module/islandpruning/PruneIslands.java | 17 +-- .../module/islandpruning/Subgraph.java | 27 +++- .../islandpruning/SubgraphOnlyFerryTest.java | 125 ++++++++++++++++++ 3 files changed, 151 insertions(+), 18 deletions(-) create mode 100644 src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java index ff88bebaa45..26349c0d803 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/PruneIslands.java @@ -10,7 +10,6 @@ import java.util.List; import java.util.Map; import java.util.Queue; -import java.util.Set; import java.util.stream.Collectors; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.GraphConnectivity; @@ -33,7 +32,6 @@ import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.service.TransitModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -252,16 +250,7 @@ private int processIslands( if (island.stopSize() > 0) { //for islands with stops islandsWithStops++; - boolean onlyFerry = true; - for (Iterator vIter = island.stopIterator(); vIter.hasNext();) { - TransitStopVertex v = (TransitStopVertex) vIter.next(); - Set modes = v.getModes(); - // test if stop has other transit modes than FERRY - if (modes.isEmpty() || !modes.contains(TransitMode.FERRY)) { - onlyFerry = false; - break; - } - } + boolean onlyFerry = island.hasOnlyFerryStops(); // do not remove real islands which have only ferry stops if (!onlyFerry && island.streetSize() < pruningThresholdWithStops * adaptivePruningFactor) { double sizeCoeff = (adaptivePruningFactor > 1.0) @@ -487,8 +476,8 @@ private boolean restrictOrRemove( // note: do not unlink stop if only CAR mode is pruned // maybe this needs more logic for flex routing cases List stopLabels = new ArrayList<>(); - for (Iterator vIter = island.stopIterator(); vIter.hasNext();) { - Vertex v = vIter.next(); + for (Iterator vIter = island.stopIterator(); vIter.hasNext();) { + TransitStopVertex v = vIter.next(); stopLabels.add(v.getLabel()); Collection edges = new ArrayList<>(v.getOutgoing()); edges.addAll(v.getIncoming()); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java index 019c1c12a19..8678f1700e2 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java @@ -17,11 +17,12 @@ import org.opentripplanner.street.model.vertex.OsmVertex; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.transit.model.basic.TransitMode; class Subgraph { private final Set streetVertexSet; - private final Set stopsVertexSet; + private final Set stopsVertexSet; Subgraph() { streetVertexSet = new HashSet<>(); @@ -30,7 +31,7 @@ class Subgraph { void addVertex(Vertex vertex) { if (vertex instanceof TransitStopVertex) { - stopsVertexSet.add(vertex); + stopsVertexSet.add((TransitStopVertex) vertex); } else { streetVertexSet.add(vertex); } @@ -64,7 +65,7 @@ Iterator streetIterator() { return streetVertexSet.iterator(); } - Iterator stopIterator() { + Iterator stopIterator() { return stopsVertexSet.iterator(); } @@ -98,7 +99,7 @@ Iterator stopIterator() { Vertex vx = vIter.next(); envelope.expandToInclude(vx.getCoordinate()); } - for (Iterator vIter = stopIterator(); vIter.hasNext();) { + for (Iterator vIter = stopIterator(); vIter.hasNext();) { Vertex vx = vIter.next(); envelope.expandToInclude(vx.getCoordinate()); } @@ -127,4 +128,22 @@ Geometry getGeometry() { return new MultiPoint(points.toArray(new Point[0]), geometryFactory); } + + /** + * Checks whether the subgraph has only transit-stops for ferries + * + * @return true if only ferries stop at the subgraph and false if other or no other modes are + * stopping at the subgraph + */ + boolean hasOnlyFerryStops() { + for (Iterator vIter = this.stopIterator(); vIter.hasNext();) { + TransitStopVertex v = vIter.next(); + Set modes = v.getModes(); + // test if stop has other transit modes than FERRY + if (!modes.contains(TransitMode.FERRY)) { + return false; + } + } + return true; + } } diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java new file mode 100644 index 00000000000..e93cfa61815 --- /dev/null +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java @@ -0,0 +1,125 @@ +package org.opentripplanner.graph_builder.module.islandpruning; + +import static org.junit.jupiter.api.Assertions.*; + +import java.util.Set; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.opentripplanner.street.model.vertex.TransitStopVertex; +import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; +import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.site.RegularStop; + +class SubgraphOnlyFerryTest { + + private static RegularStop regularStop1; + private static RegularStop regularStop2; + + @BeforeAll + static void setUp() { + regularStop1 = + RegularStop + .of(new FeedScopedId("HH-GTFS", "TEST1"), () -> 0) + .withCoordinate(53.54948, 9.98455) + .build(); + regularStop2 = + RegularStop + .of(new FeedScopedId("HH-GTFS", "TEST2"), () -> 0) + .withCoordinate(53.55272, 9.99480) + .build(); + } + + @Test + void subgraphHasOnlyFerry() { + TransitStopVertex transitStopVertex = new TransitStopVertexBuilder() + .withStop(regularStop1) + .withModes(Set.of(TransitMode.FERRY)) + .build(); + + Subgraph subgraph = new Subgraph(); + subgraph.addVertex(transitStopVertex); + + assertTrue(subgraph.hasOnlyFerryStops()); + } + + @Test + void subgraphHasOnlyNoFerry() { + TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + .withStop(regularStop1) + .withModes(Set.of(TransitMode.BUS)) + .build(); + + Subgraph subgraph = new Subgraph(); + subgraph.addVertex(transitStopVertex1); + + assertFalse(subgraph.hasOnlyFerryStops()); + } + + @Test + void subgraphHasOnlyNoMode() { + TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + .withStop(regularStop1) + .withModes(Set.of()) + .build(); + + Subgraph subgraph = new Subgraph(); + subgraph.addVertex(transitStopVertex1); + + assertFalse(subgraph.hasOnlyFerryStops()); + } + + @Test + void subgraphHasOnlyFerryMoreStops() { + TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + .withStop(regularStop1) + .withModes(Set.of(TransitMode.FERRY)) + .build(); + TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder() + .withStop(regularStop2) + .withModes(Set.of(TransitMode.FERRY)) + .build(); + + Subgraph subgraph = new Subgraph(); + subgraph.addVertex(transitStopVertex1); + subgraph.addVertex(transitStopVertex2); + + assertTrue(subgraph.hasOnlyFerryStops()); + } + + @Test + void subgraphHasNotOnlyFerryMoreStops() { + TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + .withStop(regularStop1) + .withModes(Set.of(TransitMode.FERRY)) + .build(); + TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder() + .withStop(regularStop2) + .withModes(Set.of(TransitMode.BUS)) + .build(); + + Subgraph subgraph = new Subgraph(); + subgraph.addVertex(transitStopVertex1); + subgraph.addVertex(transitStopVertex2); + + assertFalse(subgraph.hasOnlyFerryStops()); + } + + @Test + void subgraphHasNoModeMoreStops() { + TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + .withStop(regularStop1) + .withModes(Set.of(TransitMode.FERRY)) + .build(); + TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder() + .withStop(regularStop2) + .withModes(Set.of()) + .build(); + + Subgraph subgraph = new Subgraph(); + subgraph.addVertex(transitStopVertex1); + subgraph.addVertex(transitStopVertex2); + + assertFalse(subgraph.hasOnlyFerryStops()); + } +} From ffbacb98306340f88d5caf8361ecbbac1db709ce Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Apr 2024 07:16:38 +0200 Subject: [PATCH 0946/1688] Finetune renovate automerge config [ci skip] --- renovate.json5 | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 8a7f57e6764..89ff44c60e4 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -46,14 +46,20 @@ // noise, so we slow it down a bit { "matchPackageNames": [ - "org.entur.gbfs:gbfs-java-model", - "ch.qos.logback:logback-classic", - "io.github.git-commit-id:git-commit-id-maven-plugin" + "org.entur.gbfs:gbfs-java-model" ], "matchUpdateTypes": ["patch"], "schedule": "on the 18th day of the month", "automerge": true }, + { + "matchPackageNames": [ + "ch.qos.logback:logback-classic", + "io.github.git-commit-id:git-commit-id-maven-plugin" + ], + "schedule": "on the 19th day of the month", + "automerge": true + }, { // https://github.com/graphql-java-kickstart/renovate-config/blob/main/default.json "description": "GraphQL Java (ignoring snapshot builds)", From 8754908682182c2e33f64a231f965a1526ed1277 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Wed, 10 Apr 2024 08:37:29 +0200 Subject: [PATCH 0947/1688] Increase log severity for incompatible serialized leg reference --- .../model/plan/legreference/LegReferenceSerializer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java b/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java index c5c38fd2506..0ceae6cb456 100644 --- a/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java +++ b/src/main/java/org/opentripplanner/model/plan/legreference/LegReferenceSerializer.java @@ -66,7 +66,7 @@ public static LegReference decode(String legReference) { var type = readEnum(in, LegReferenceType.class); return type.getDeserializer().read(in); } catch (IOException e) { - LOG.info( + LOG.warn( "Unable to decode leg reference (incompatible serialization format): '{}'", legReference, e From 1c66f062eac75e8da0db9f3e1b03e91a709f5b39 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Apr 2024 11:37:32 +0200 Subject: [PATCH 0948/1688] Apply review feedback about documentation --- .../module/osm/naming/SidewalkNamer.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 60d0f267337..049c3cfee24 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -102,8 +102,8 @@ public void postprocess() { .forEach(sidewalkOnLevel -> { assignNameToSidewalk(sidewalkOnLevel, namesApplied); - //Keep lambda! A method-ref would cause incorrect class and line number to be logged - //noinspection Convert2MethodRef + // Keep lambda! A method-ref would cause incorrect class and line number to be logged + // noinspection Convert2MethodRef progress.step(m -> LOG.info(m)); }); @@ -139,9 +139,9 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam // make sure we only compare sidewalks and streets that are on the same level .filter(g -> g.levels.equals(sidewalkOnLevel.levels)) .map(g -> computePercentInsideBuffer(g, buffer, sidewalkLength)) - // remove those groups where less than a certain percentage is inside the buffer around - // the sidewalk. this safety mechanism for sidewalks that snake around the corner - // like https://www.openstreetmap.org/way/1059101564 + // Remove those groups where less than a certain percentage is inside the buffer around + // the sidewalk. This is a safety mechanism for sidewalks that snake around the corner, + // like https://www.openstreetmap.org/way/1059101564 . .filter(group -> group.percentInBuffer > MIN_PERCENT_IN_BUFFER) .max(Comparator.comparingDouble(NamedEdgeGroup::percentInBuffer)) .ifPresent(group -> { @@ -152,7 +152,7 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam /** * Compute the length of the group that is inside the buffer and return it as a percentage - * of the lenght of the sidewalk. + * of the length of the sidewalk. */ private static NamedEdgeGroup computePercentInsideBuffer( CandidateGroup g, @@ -165,8 +165,8 @@ private static NamedEdgeGroup computePercentInsideBuffer( } /** - * If a single street is split into several eges each individual part of the street would potentially - * have a low similarity with the (longer) sidewalk. For that reason we combined them into a group + * If a single street is split into several edges, each individual part of the street would potentially + * have a low similarity with the (longer) sidewalk. For that reason we combine them into a group * and have a better basis for comparison. */ private static Stream groupEdgesByName(List candidates) { @@ -190,12 +190,12 @@ private static Stream groupEdgesByName(List candida } /** - * Add a buffer around a geometry that uses both meters as the input and makes sure - * that the buffer is the same distance (in meters) anywhere on earth. + * Add a buffer around a geometry that makes sure that the buffer is the same distance (in meters) + * anywhere on earth. *

      * Background: If you call the regular buffer() method on a JTS geometry that uses WGS84 as the * coordinate reference system, the buffer will be accurate at the equator but will become more - * and more elongated the furter north/south you go. + * and more elongated the further north/south you go. *

      * Taken from https://stackoverflow.com/questions/36455020 */ @@ -229,7 +229,7 @@ private record NamedEdgeGroup(double percentInBuffer, I18NString name) { */ private record CandidateGroup(I18NString name, List edges, Set levels) { /** - * How much of this group intersects with the give geometry, in meters. + * How much of this group intersects with the given geometry, in meters. */ double intersectionLength(Geometry polygon) { return edges From 146db257da81fa756b3fa2da1e48d9f4b485f6c7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Apr 2024 12:12:54 +0200 Subject: [PATCH 0949/1688] Add matrix badge [ci skip] --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 318ed43be31..5e016c22bb2 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ ## Overview [![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner) +[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im) [![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner) [![Commit activity](https://img.shields.io/github/commit-activity/y/opentripplanner/OpenTripPlanner)](https://github.com/opentripplanner/OpenTripPlanner/graphs/contributors) [![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner) From 9309737d1a18934eb8e47ab8c90c3a8e719cacd0 Mon Sep 17 00:00:00 2001 From: Bastian Silies Date: Thu, 11 Apr 2024 14:09:39 +0200 Subject: [PATCH 0950/1688] refactoring --- .../module/islandpruning/Subgraph.java | 8 +++--- .../islandpruning/SubgraphOnlyFerryTest.java | 25 +++++-------------- 2 files changed, 9 insertions(+), 24 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java index 8678f1700e2..55efe6cb3d8 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java @@ -99,8 +99,7 @@ Iterator stopIterator() { Vertex vx = vIter.next(); envelope.expandToInclude(vx.getCoordinate()); } - for (Iterator vIter = stopIterator(); vIter.hasNext();) { - Vertex vx = vIter.next(); + for (TransitStopVertex vx : stopsVertexSet) { envelope.expandToInclude(vx.getCoordinate()); } envelope.expandBy(searchRadiusDegrees / xscale, searchRadiusDegrees); @@ -132,12 +131,11 @@ Geometry getGeometry() { /** * Checks whether the subgraph has only transit-stops for ferries * - * @return true if only ferries stop at the subgraph and false if other or no other modes are + * @return true if only ferries stop at the subgraph and false if other or no modes are * stopping at the subgraph */ boolean hasOnlyFerryStops() { - for (Iterator vIter = this.stopIterator(); vIter.hasNext();) { - TransitStopVertex v = vIter.next(); + for (TransitStopVertex v : stopsVertexSet) { Set modes = v.getModes(); // test if stop has other transit modes than FERRY if (!modes.contains(TransitMode.FERRY)) { diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java index e93cfa61815..26aaf12896b 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java @@ -1,34 +1,21 @@ package org.opentripplanner.graph_builder.module.islandpruning; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; -import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; +import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.TransitMode; -import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.RegularStop; class SubgraphOnlyFerryTest { - private static RegularStop regularStop1; - private static RegularStop regularStop2; - - @BeforeAll - static void setUp() { - regularStop1 = - RegularStop - .of(new FeedScopedId("HH-GTFS", "TEST1"), () -> 0) - .withCoordinate(53.54948, 9.98455) - .build(); - regularStop2 = - RegularStop - .of(new FeedScopedId("HH-GTFS", "TEST2"), () -> 0) - .withCoordinate(53.55272, 9.99480) - .build(); - } + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final RegularStop regularStop1 = TEST_MODEL.stop("TEST-1").build(); + private static final RegularStop regularStop2 = TEST_MODEL.stop("TEST-2").build(); @Test void subgraphHasOnlyFerry() { From 69dca4ee82fc7b8fd96c610b176e40d750007841 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 11 Apr 2024 12:43:48 +0000 Subject: [PATCH 0951/1688] Add changelog entry for #5790 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 021fe4b76de..0252f984fb7 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -10,6 +10,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Expose route sort order in GTFS API [#5764](https://github.com/opentripplanner/OpenTripPlanner/pull/5764) - Fix issue with cancellations on trip patterns that run after midnight [#5719](https://github.com/opentripplanner/OpenTripPlanner/pull/5719) - Fix handling of null transport mode filter [#5789](https://github.com/opentripplanner/OpenTripPlanner/pull/5789) +- Discourage instead of ban cycling on use_sidepath ways and do the same for walking on foot=use_sidepath [#5790](https://github.com/opentripplanner/OpenTripPlanner/pull/5790) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From ffeadea772a236400e9912c2f3f141e4621eb07b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 11 Apr 2024 16:11:06 +0300 Subject: [PATCH 0952/1688] Fix rental availability use --- .../routerequest/RouteRequestMapper.java | 22 ++++++++++- .../routerequest/RouteRequestMapperTest.java | 37 ++++++++++++++++++- 2 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java index cc45e87c35e..fb7785e0fda 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java @@ -81,7 +81,7 @@ private static void setPreferences( prefs.withTransit(transit -> { prefs.withTransfer(transfer -> setTransitPreferences(transit, transfer, args, environment)); }); - setStreetPreferences(prefs, preferenceArgs.getGraphQLStreet(), environment); + setStreetPreferences(prefs, request, preferenceArgs.getGraphQLStreet(), environment); setAccessibilityPreferences(request, preferenceArgs.getGraphQLAccessibility()); } @@ -109,9 +109,11 @@ private static void setItineraryFilters( private static void setStreetPreferences( RoutingPreferences.Builder preferences, + RouteRequest request, GraphQLTypes.GraphQLPlanStreetPreferencesInput args, DataFetchingEnvironment environment ) { + setRentalAvailabilityPreferences(preferences, request); if (args != null) { preferences.withBike(bicycle -> setBicyclePreferences(bicycle, args.getGraphQLBicycle(), environment) @@ -122,6 +124,24 @@ private static void setStreetPreferences( } } + private static void setRentalAvailabilityPreferences( + RoutingPreferences.Builder preferences, + RouteRequest request + ) { + preferences.withBike(bike -> + bike.withRental(rental -> rental.withUseAvailabilityInformation(request.isTripPlannedForNow()) + ) + ); + preferences.withCar(car -> + car.withRental(rental -> rental.withUseAvailabilityInformation(request.isTripPlannedForNow())) + ); + preferences.withScooter(scooter -> + scooter.withRental(rental -> + rental.withUseAvailabilityInformation(request.isTripPlannedForNow()) + ) + ); + } + private static void setAccessibilityPreferences( RouteRequest request, GraphQLTypes.GraphQLAccessibilityPreferencesInput preferenceArgs diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java index 731941ad48c..1ed4a99edb7 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java @@ -88,7 +88,6 @@ void testMinimalArgs() { assertEquals(DESTINATION.x, routeRequest.to().lat); assertEquals(DESTINATION.y, routeRequest.to().lng); assertEquals(LOCALE, routeRequest.locale()); - assertEquals(defaultRequest.preferences(), routeRequest.preferences()); assertEquals(defaultRequest.wheelchair(), routeRequest.wheelchair()); assertEquals(defaultRequest.arriveBy(), routeRequest.arriveBy()); assertEquals(defaultRequest.isTripPlannedForNow(), routeRequest.isTripPlannedForNow()); @@ -108,6 +107,19 @@ void testMinimalArgs() { .compareTo(Duration.ofSeconds(10)) < 0 ); + + // Using current time as datetime changes rental availability use preferences, therefore to + // check that the preferences are equal, we need to use a future time. + var futureArgs = createArgsCopy(ARGS); + var futureTime = OffsetDateTime.of( + LocalDate.of(3000, 3, 15), + LocalTime.MIDNIGHT, + ZoneOffset.UTC + ); + futureArgs.put("dateTime", Map.ofEntries(entry("earliestDeparture", futureTime))); + var futureEnv = executionContext(futureArgs, LOCALE, CONTEXT); + var futureRequest = RouteRequestMapper.toRouteRequest(futureEnv, CONTEXT); + assertEquals(defaultRequest.preferences(), futureRequest.preferences()); } @Test @@ -134,6 +146,29 @@ void testLatestArrival() { assertFalse(routeRequest.isTripPlannedForNow()); } + @Test + void testRentalAvailability() { + var nowArgs = createArgsCopy(ARGS); + var nowEnv = executionContext(nowArgs, LOCALE, CONTEXT); + var nowRequest = RouteRequestMapper.toRouteRequest(nowEnv, CONTEXT); + assertTrue(nowRequest.preferences().bike().rental().useAvailabilityInformation()); + assertTrue(nowRequest.preferences().car().rental().useAvailabilityInformation()); + assertTrue(nowRequest.preferences().scooter().rental().useAvailabilityInformation()); + + var futureArgs = createArgsCopy(ARGS); + var futureTime = OffsetDateTime.of( + LocalDate.of(3000, 3, 15), + LocalTime.MIDNIGHT, + ZoneOffset.UTC + ); + futureArgs.put("dateTime", Map.ofEntries(entry("earliestDeparture", futureTime))); + var futureEnv = executionContext(futureArgs, LOCALE, CONTEXT); + var futureRequest = RouteRequestMapper.toRouteRequest(futureEnv, CONTEXT); + assertFalse(futureRequest.preferences().bike().rental().useAvailabilityInformation()); + assertFalse(futureRequest.preferences().car().rental().useAvailabilityInformation()); + assertFalse(futureRequest.preferences().scooter().rental().useAvailabilityInformation()); + } + @Test void testStopLocationAndLabel() { Map stopLocationArgs = new HashMap<>(); From 8230308f02c8f99e3df7b7419ec4126f312d41ca Mon Sep 17 00:00:00 2001 From: Bastian Silies Date: Thu, 11 Apr 2024 15:26:13 +0200 Subject: [PATCH 0953/1688] use pattern variable --- .../graph_builder/module/islandpruning/Subgraph.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java index 55efe6cb3d8..94dcfaaf131 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/islandpruning/Subgraph.java @@ -30,8 +30,8 @@ class Subgraph { } void addVertex(Vertex vertex) { - if (vertex instanceof TransitStopVertex) { - stopsVertexSet.add((TransitStopVertex) vertex); + if (vertex instanceof TransitStopVertex transitStopVertex) { + stopsVertexSet.add(transitStopVertex); } else { streetVertexSet.add(vertex); } From c5f4f5bb3faabd2891d3eeba5df992cd1dcb6a10 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 11 Apr 2024 17:41:52 +0300 Subject: [PATCH 0954/1688] Fix handling of Integer values in scalars --- .../apis/gtfs/GraphQLScalars.java | 36 ++++++++++++++----- ...st.java => CoordinateValueScalarTest.java} | 4 +++ .../apis/gtfs/RatioScalarTest.java | 4 +-- .../apis/gtfs/ReluctanceScalarTest.java | 8 +++-- 4 files changed, 39 insertions(+), 13 deletions(-) rename src/test/java/org/opentripplanner/apis/gtfs/{CoordinateValueTest.java => CoordinateValueScalarTest.java} (94%) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 29d3e2c5575..e0f6ea8d130 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -145,6 +145,10 @@ public Double parseValue(Object input) throws CoercingParseValueException { return validateCoordinate(doubleValue) .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE)); } + if (input instanceof Integer intValue) { + return validateCoordinate(intValue) + .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE)); + } throw new CoercingParseValueException( "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) ); @@ -317,20 +321,28 @@ public Double serialize(Object dataFetcherResult) throws CoercingSerializeExcept @Override public Grams parseValue(Object input) throws CoercingParseValueException { - if (input instanceof Double) { - var grams = (Double) input; - return new Grams(grams); + if (input instanceof Double doubleValue) { + return new Grams(doubleValue); } - return null; + if (input instanceof Integer intValue) { + return new Grams(intValue); + } + throw new CoercingParseValueException( + "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) + ); } @Override public Grams parseLiteral(Object input) throws CoercingParseLiteralException { - if (input instanceof Double) { - var grams = (Double) input; - return new Grams(grams); + if (input instanceof FloatValue coordinate) { + return new Grams(coordinate.getValue().doubleValue()); } - return null; + if (input instanceof IntValue coordinate) { + return new Grams(coordinate.getValue().doubleValue()); + } + throw new CoercingParseLiteralException( + "Expected a number, got: " + input.getClass().getSimpleName() + ); } } ) @@ -367,6 +379,10 @@ public Double parseValue(Object input) throws CoercingParseValueException { return validateRatio(doubleValue) .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE)); } + if (input instanceof Integer intValue) { + return validateRatio(intValue) + .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE)); + } throw new CoercingParseValueException( "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) ); @@ -429,6 +445,10 @@ public Double parseValue(Object input) throws CoercingParseValueException { return validateReluctance(doubleValue) .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE)); } + if (input instanceof Integer intValue) { + return validateReluctance(intValue) + .orElseThrow(() -> new CoercingParseValueException(VALIDATION_ERROR_MESSAGE)); + } throw new CoercingParseValueException( "Expected a number, got %s %s".formatted(input.getClass().getSimpleName(), input) ); diff --git a/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueTest.java b/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueScalarTest.java similarity index 94% rename from src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueTest.java rename to src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueScalarTest.java index 60028174b5c..99042498342 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/CoordinateValueScalarTest.java @@ -16,6 +16,7 @@ class CoordinateValueScalarTest { private static final Double COORDINATE = 10.0; + private static final Integer COORDINATE_INT = 10; private static final double COORDINATE_MAX = 180.0; private static final double COORDINATE_MIN = 180.0; private static final double TOO_HIGH = 190; @@ -52,6 +53,9 @@ void testParseValue() { coordinate = (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(COORDINATE_MAX); assertEquals(COORDINATE_MAX, coordinate, DELTA); + coordinate = + (Double) GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(COORDINATE_INT); + assertEquals(COORDINATE_INT, coordinate, DELTA); assertThrows( CoercingParseValueException.class, () -> GraphQLScalars.COORDINATE_VALUE_SCALAR.getCoercing().parseValue(TEXT) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java index 5af93dcef1d..b628ef3f5d1 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/RatioScalarTest.java @@ -16,8 +16,8 @@ class RatioScalarTest { private static final Double HALF = 0.5; - private static final double ZERO = 0; - private static final double ONE = 1; + private static final Integer ZERO = 0; + private static final Integer ONE = 1; private static final double TOO_HIGH = 1.1; private static final double TOO_LOW = -1.1; private static final String TEXT = "foo"; diff --git a/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java b/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java index 6a1bb7124a9..40684e85885 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/ReluctanceScalarTest.java @@ -16,7 +16,7 @@ class ReluctanceScalarTest { private static final Double HALF = 0.5; - private static final int ONE = 1; + private static final Integer ONE = 1; private static final double TOO_HIGH = 100001; private static final double TOO_LOW = 0; private static final String TEXT = "foo"; @@ -37,8 +37,10 @@ void testSerialize() { @Test void testParseValue() { - var reluctance = (Double) GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(HALF); - assertEquals(HALF, reluctance, DELTA); + var reluctanceDouble = (Double) GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(HALF); + assertEquals(HALF, reluctanceDouble, DELTA); + var reluctanceInt = (Double) GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(ONE); + assertEquals(ONE, reluctanceInt, DELTA); assertThrows( CoercingParseValueException.class, () -> GraphQLScalars.RELUCTANCE_SCALAR.getCoercing().parseValue(TEXT) From bbbe74c9b89bdf75ffc3fd8aa2749b3ace934316 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Apr 2024 18:14:51 +0200 Subject: [PATCH 0955/1688] Implement hashCode for Money --- .../java/org/opentripplanner/transit/model/basic/Money.java | 5 +++++ .../java/org/opentripplanner/routing/core/MoneyTest.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/main/java/org/opentripplanner/transit/model/basic/Money.java b/src/main/java/org/opentripplanner/transit/model/basic/Money.java index e44994d1105..35278d8fbd8 100644 --- a/src/main/java/org/opentripplanner/transit/model/basic/Money.java +++ b/src/main/java/org/opentripplanner/transit/model/basic/Money.java @@ -206,4 +206,9 @@ public boolean equals(Object obj) { return false; } } + + @Override + public int hashCode() { + return Objects.hash(currency, amount); + } } diff --git a/src/test/java/org/opentripplanner/routing/core/MoneyTest.java b/src/test/java/org/opentripplanner/routing/core/MoneyTest.java index 5f197708f1d..01392e64493 100644 --- a/src/test/java/org/opentripplanner/routing/core/MoneyTest.java +++ b/src/test/java/org/opentripplanner/routing/core/MoneyTest.java @@ -102,4 +102,9 @@ void greaterThan() { void serializable() { assertInstanceOf(Serializable.class, oneDollar); } + + @Test + void equalHashCode() { + assertEquals(Money.usDollars(5).hashCode(), Money.usDollars(5).hashCode()); + } } From 2bd35ccc869fc1869d968f40cdca71438435f1b1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 11 Apr 2024 23:43:26 +0200 Subject: [PATCH 0956/1688] Update GPG plugin less often [ci skip] --- renovate.json5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json5 b/renovate.json5 index 89ff44c60e4..d24a1e5cf3f 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -55,7 +55,8 @@ { "matchPackageNames": [ "ch.qos.logback:logback-classic", - "io.github.git-commit-id:git-commit-id-maven-plugin" + "io.github.git-commit-id:git-commit-id-maven-plugin", + "org.apache.maven.plugins:maven-gpg-plugin" ], "schedule": "on the 19th day of the month", "automerge": true @@ -116,7 +117,6 @@ "org.apache.commons:commons-compress", // only used by tests // maven plugins "org.codehaus.mojo:build-helper-maven-plugin", - "org.apache.maven.plugins:maven-gpg-plugin", "org.apache.maven.plugins:maven-source-plugin", "com.hubspot.maven.plugins:prettier-maven-plugin", "com.google.cloud.tools:jib-maven-plugin", From 150170f88e39829e98087a41c9f06a47e15e9dc2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:44:29 +0000 Subject: [PATCH 0957/1688] Update dependency com.tngtech.archunit:archunit to v1.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 31f7f72f184..ce9e914e687 100644 --- a/pom.xml +++ b/pom.xml @@ -693,7 +693,7 @@ com.tngtech.archunit archunit - 1.2.1 + 1.3.0 test From c53e83801fb45ed030af0c920cac4df16e3a2577 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 12 Apr 2024 08:25:30 +0200 Subject: [PATCH 0958/1688] Fix more typos --- .../graph_builder/module/osm/naming/SidewalkNamer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 049c3cfee24..e6eab4d3d0e 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -141,7 +141,7 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam .map(g -> computePercentInsideBuffer(g, buffer, sidewalkLength)) // Remove those groups where less than a certain percentage is inside the buffer around // the sidewalk. This is a safety mechanism for sidewalks that snake around the corner, - // like https://www.openstreetmap.org/way/1059101564 . + // like https://www.openstreetmap.org/way/1059101564. .filter(group -> group.percentInBuffer > MIN_PERCENT_IN_BUFFER) .max(Comparator.comparingDouble(NamedEdgeGroup::percentInBuffer)) .ifPresent(group -> { @@ -195,7 +195,7 @@ private static Stream groupEdgesByName(List candida *

      * Background: If you call the regular buffer() method on a JTS geometry that uses WGS84 as the * coordinate reference system, the buffer will be accurate at the equator but will become more - * and more elongated the further north/south you go. + * and more elongated the farther north/south you go. *

      * Taken from https://stackoverflow.com/questions/36455020 */ From b1e26a8c14a190a9f12a8649f7479b160a3c5370 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 12 Apr 2024 08:14:42 +0000 Subject: [PATCH 0959/1688] Add changelog entry for #5782 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 0252f984fb7..206d1b64e7f 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -11,6 +11,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix issue with cancellations on trip patterns that run after midnight [#5719](https://github.com/opentripplanner/OpenTripPlanner/pull/5719) - Fix handling of null transport mode filter [#5789](https://github.com/opentripplanner/OpenTripPlanner/pull/5789) - Discourage instead of ban cycling on use_sidepath ways and do the same for walking on foot=use_sidepath [#5790](https://github.com/opentripplanner/OpenTripPlanner/pull/5790) +- Prune islands with mode-less stop vertices [#5782](https://github.com/opentripplanner/OpenTripPlanner/pull/5782) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 75e515b464c0bc01f4d0eccb484eac43f0bf785d Mon Sep 17 00:00:00 2001 From: Eivind Morris Bakke Date: Fri, 12 Apr 2024 14:48:35 +0200 Subject: [PATCH 0960/1688] Overwrites directMode when it is not set in the request. (#5779) Defaulting it to walk when it was not set caused issues when the user expected no results because transportModes are defined. --- .../apis/transmodel/mapping/RequestModesMapper.java | 7 +++---- .../transmodel/mapping/RequestModesMapperTest.java | 11 +++++++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java index 59259905944..e7a13dcacc9 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java @@ -15,7 +15,7 @@ class RequestModesMapper { * Maps GraphQL Modes input type to RequestModes. *

      * This only maps access, egress, direct & transfer modes. Transport modes are set using filters. - * Default modes are WALK for access, egress, direct & transfer. + * Default modes are WALK for access, egress & transfer. */ static RequestModes mapRequestModes(Map modesInput) { RequestModesBuilder mBuilder = RequestModes.of(); @@ -28,9 +28,8 @@ static RequestModes mapRequestModes(Map modesInput) { if (modesInput.containsKey(egressModeKey)) { mBuilder.withEgressMode((StreetMode) modesInput.get(egressModeKey)); } - if (modesInput.containsKey(directModeKey)) { - mBuilder.withDirectMode((StreetMode) modesInput.get(directModeKey)); - } + // An unset directMode should overwrite the walk default, so we don't check for existence first. + mBuilder.withDirectMode((StreetMode) modesInput.get(directModeKey)); return mBuilder.build(); } diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java index 160014213d3..b8d08c7d7f5 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java @@ -13,9 +13,11 @@ class RequestModesMapperTest { void testMapRequestModesEmptyMapReturnsDefaults() { Map inputModes = Map.of(); + RequestModes wantModes = RequestModes.of().withDirectMode(null).build(); + RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); - assertEquals(RequestModes.of().build(), mappedModes); + assertEquals(wantModes, mappedModes); } @Test @@ -26,6 +28,7 @@ void testMapRequestModesAccessSetReturnsDefaultsForOthers() { .of() .withAccessMode(StreetMode.BIKE) .withTransferMode(StreetMode.BIKE) + .withDirectMode(null) .build(); RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); @@ -37,7 +40,11 @@ void testMapRequestModesAccessSetReturnsDefaultsForOthers() { void testMapRequestModesEgressSetReturnsDefaultsForOthers() { Map inputModes = Map.of("egressMode", StreetMode.CAR); - RequestModes wantModes = RequestModes.of().withEgressMode(StreetMode.CAR).build(); + RequestModes wantModes = RequestModes + .of() + .withEgressMode(StreetMode.CAR) + .withDirectMode(null) + .build(); RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); From f3b8c93f9a40cd42a4c02bf94377fa9e5cbb8cbc Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 12 Apr 2024 12:48:53 +0000 Subject: [PATCH 0961/1688] Add changelog entry for #5779 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 206d1b64e7f..704ce4787c0 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -12,6 +12,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix handling of null transport mode filter [#5789](https://github.com/opentripplanner/OpenTripPlanner/pull/5789) - Discourage instead of ban cycling on use_sidepath ways and do the same for walking on foot=use_sidepath [#5790](https://github.com/opentripplanner/OpenTripPlanner/pull/5790) - Prune islands with mode-less stop vertices [#5782](https://github.com/opentripplanner/OpenTripPlanner/pull/5782) +- Overwrite default WALK directMode when it is not set in the request, but modes is set [#5779](https://github.com/opentripplanner/OpenTripPlanner/pull/5779) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 1e1659a5dc5480acbd1d70e60027b0f4d9cb4e00 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 11:36:06 +0000 Subject: [PATCH 0962/1688] Update dependency @testing-library/react to v15 --- client-next/package-lock.json | 135 ++++------------------------------ client-next/package.json | 2 +- 2 files changed, 16 insertions(+), 121 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index d3b8c10754b..6ac0e07e20f 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -23,7 +23,7 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "14.2.2", + "@testing-library/react": "15.0.2", "@types/react": "18.2.73", "@types/react-dom": "18.2.23", "@typescript-eslint/eslint-plugin": "7.5.0", @@ -3353,36 +3353,36 @@ } }, "node_modules/@testing-library/dom": { - "version": "9.3.4", - "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz", - "integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.0.0.tgz", + "integrity": "sha512-PmJPnogldqoVFf+EwbHvbBJ98MmqASV8kLrBYgsDNxQcFMeIS7JFL48sfyXvuMtgmWO/wMhh25odr+8VhDmn4g==", "dev": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", "@types/aria-query": "^5.0.1", - "aria-query": "5.1.3", + "aria-query": "5.3.0", "chalk": "^4.1.0", "dom-accessibility-api": "^0.5.9", "lz-string": "^1.5.0", "pretty-format": "^27.0.2" }, "engines": { - "node": ">=14" + "node": ">=18" } }, "node_modules/@testing-library/react": { - "version": "14.2.2", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.2.tgz", - "integrity": "sha512-SOUuM2ysCvjUWBXTNfQ/ztmnKDmqaiPV3SvoIuyxMUca45rbSWWAT/qB8CUs/JQ/ux/8JFs9DNdFQ3f6jH3crA==", + "version": "15.0.2", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.2.tgz", + "integrity": "sha512-5mzIpuytB1ctpyywvyaY2TAAUQVCZIGqwiqFQf6u9lvj/SJQepGUzNV18Xpk+NLCaCE2j7CWrZE0tEf9xLZYiQ==", "dev": true, "dependencies": { "@babel/runtime": "^7.12.5", - "@testing-library/dom": "^9.0.0", + "@testing-library/dom": "^10.0.0", "@types/react-dom": "^18.0.0" }, "engines": { - "node": ">=14" + "node": ">=18" }, "peerDependencies": { "react": "^18.0.0", @@ -4232,12 +4232,12 @@ "dev": true }, "node_modules/aria-query": { - "version": "5.1.3", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz", - "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", "dev": true, "dependencies": { - "deep-equal": "^2.0.5" + "dequal": "^2.0.3" } }, "node_modules/arr-union": { @@ -5284,38 +5284,6 @@ "node": ">=6" } }, - "node_modules/deep-equal": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz", - "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==", - "dev": true, - "dependencies": { - "array-buffer-byte-length": "^1.0.0", - "call-bind": "^1.0.5", - "es-get-iterator": "^1.1.3", - "get-intrinsic": "^1.2.2", - "is-arguments": "^1.1.1", - "is-array-buffer": "^3.0.2", - "is-date-object": "^1.0.5", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.2", - "isarray": "^2.0.5", - "object-is": "^1.1.5", - "object-keys": "^1.1.1", - "object.assign": "^4.1.4", - "regexp.prototype.flags": "^1.5.1", - "side-channel": "^1.0.4", - "which-boxed-primitive": "^1.0.2", - "which-collection": "^1.0.1", - "which-typed-array": "^1.1.13" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -5613,26 +5581,6 @@ "node": ">= 0.4" } }, - "node_modules/es-get-iterator": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz", - "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.1.3", - "has-symbols": "^1.0.3", - "is-arguments": "^1.1.1", - "is-map": "^2.0.2", - "is-set": "^2.0.2", - "is-string": "^1.0.7", - "isarray": "^2.0.5", - "stop-iteration-iterator": "^1.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/es-iterator-helpers": { "version": "1.0.18", "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz", @@ -5986,15 +5934,6 @@ "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8" } }, - "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", - "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", - "dev": true, - "dependencies": { - "dequal": "^2.0.3" - } - }, "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -7311,22 +7250,6 @@ "node": ">=0.10.0" } }, - "node_modules/is-arguments": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", - "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-array-buffer": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", @@ -8744,22 +8667,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/object-is": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz", - "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==", - "dev": true, - "dependencies": { - "call-bind": "^1.0.7", - "define-properties": "^1.2.1" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", @@ -10164,18 +10071,6 @@ "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==", "dev": true }, - "node_modules/stop-iteration-iterator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz", - "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==", - "dev": true, - "dependencies": { - "internal-slot": "^1.0.4" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/streamsearch": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz", diff --git a/client-next/package.json b/client-next/package.json index d3f583057d8..e5019ecb088 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -32,7 +32,7 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "14.2.2", + "@testing-library/react": "15.0.2", "@types/react": "18.2.73", "@types/react-dom": "18.2.23", "@typescript-eslint/eslint-plugin": "7.5.0", From 86af4f85a5e86e5fd8de638c9cd413e1367f559c Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Mon, 15 Apr 2024 05:43:52 +0000 Subject: [PATCH 0963/1688] Upgrade debug client to version 2024/04/2024-04-15T05:43 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 3973571de30..317fbed5a11 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From dc95c7bc37ee30da551ab5e0e1b1fd33a0972647 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 05:44:44 +0000 Subject: [PATCH 0964/1688] Update dependency org.entur.gbfs:gbfs-java-model to v3.1.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce9e914e687..be2f70a0edd 100644 --- a/pom.xml +++ b/pom.xml @@ -674,7 +674,7 @@ org.entur.gbfs gbfs-java-model - 3.0.26 + 3.1.1 From 31341fa7f30fb78d97d397f6350d05b054fba901 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 15 Apr 2024 07:52:39 +0200 Subject: [PATCH 0965/1688] Automerge maven-jar-plugin [ci skip] --- renovate.json5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index d24a1e5cf3f..b3472c1a0d1 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -121,7 +121,8 @@ "com.hubspot.maven.plugins:prettier-maven-plugin", "com.google.cloud.tools:jib-maven-plugin", "org.apache.maven.plugins:maven-shade-plugin", - "org.apache.maven.plugins:maven-compiler-plugin" + "org.apache.maven.plugins:maven-compiler-plugin", + "org.apache.maven.plugins:maven-jar-plugin" ], "matchPackagePrefixes": [ "org.junit.jupiter:", From af101e0558401555d199a82114fe82403aac8c33 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 11:35:35 +0000 Subject: [PATCH 0966/1688] Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce9e914e687..0dbec37943a 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 From b1ed4fffe80281836c9c4362c851e24edd56700f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 12 Feb 2024 17:59:06 +0100 Subject: [PATCH 0967/1688] Add flex duration factors and offsets --- .../gtfs/mapping/StopTimeMapper.java | 16 +++++++ .../org/opentripplanner/model/StopTime.java | 47 ++++++++++--------- 2 files changed, 41 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index fc75236f4e4..2c01dda3e1b 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -1,5 +1,8 @@ package org.opentripplanner.gtfs.mapping; +import static org.onebusaway.gtfs.model.StopTime.MISSING_VALUE; + +import java.time.Duration; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -102,6 +105,19 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) { lhs.setFarePeriodId(rhs.getFarePeriodId()); lhs.setFlexWindowStart(rhs.getStartPickupDropOffWindow()); lhs.setFlexWindowEnd(rhs.getEndPickupDropOffWindow()); + if(rhs.getMeanDurationOffset() != MISSING_VALUE) { + lhs.setMeanDurationFactor(rhs.getMeanDurationFactor()); + } + if(rhs.getMeanDurationOffset() != MISSING_VALUE) { + lhs.setMeanDurationOffset(Duration.ofSeconds((long) rhs.getMeanDurationOffset())); + } + if(rhs.getSafeDurationFactor() != MISSING_VALUE){ + lhs.setSafeDurationFactor(rhs.getSafeDurationFactor()); + } + if(rhs.getSafeDurationOffset()!= MISSING_VALUE){ + lhs.setSafeDurationOffset(Duration.ofSeconds((long) rhs.getSafeDurationOffset())); + } + lhs.setFlexContinuousPickup( PickDropMapper.mapFlexContinuousPickDrop(rhs.getContinuousPickup()) ); diff --git a/src/main/java/org/opentripplanner/model/StopTime.java b/src/main/java/org/opentripplanner/model/StopTime.java index 2ae04484426..8320e532c2c 100644 --- a/src/main/java/org/opentripplanner/model/StopTime.java +++ b/src/main/java/org/opentripplanner/model/StopTime.java @@ -1,6 +1,7 @@ /* This file is based on code copied from project OneBusAway, see the LICENSE file for further information. */ package org.opentripplanner.model; +import java.time.Duration; import java.util.List; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; @@ -50,6 +51,14 @@ public final class StopTime implements Comparable { private int flexWindowEnd = MISSING_VALUE; + private double meanDurationFactor = MISSING_VALUE; + + private Duration meanDurationOffset = Duration.ZERO; + + private double safeDurationFactor = MISSING_VALUE; + + private Duration safeDurationOffset = Duration.ZERO; + // Disabled by default private PickDrop flexContinuousPickup = PickDrop.NONE; @@ -62,28 +71,6 @@ public final class StopTime implements Comparable { public StopTime() {} - public StopTime(StopTime st) { - this.trip = st.trip; - this.stop = st.stop; - this.arrivalTime = st.arrivalTime; - this.departureTime = st.departureTime; - this.timepoint = st.timepoint; - this.stopSequence = st.stopSequence; - this.stopHeadsign = st.stopHeadsign; - this.routeShortName = st.routeShortName; - this.pickupType = st.pickupType; - this.dropOffType = st.dropOffType; - this.shapeDistTraveled = st.shapeDistTraveled; - this.farePeriodId = st.farePeriodId; - this.flexWindowStart = st.flexWindowStart; - this.flexWindowEnd = st.flexWindowEnd; - this.flexContinuousPickup = st.flexContinuousPickup; - this.flexContinuousDropOff = st.flexContinuousDropOff; - this.dropOffBookingInfo = st.dropOffBookingInfo; - this.pickupBookingInfo = st.pickupBookingInfo; - this.headsignVias = st.headsignVias; - } - /** * The id is used to navigate/link StopTime to other entities (Map from StopTime.id -> Entity.id). * There is no need to navigate in the opposite direction. The StopTime id is NOT stored in a @@ -310,6 +297,22 @@ public String toString() { ); } + public void setMeanDurationFactor(double meanDurationFactor) { + this.meanDurationFactor = meanDurationFactor; + } + + public void setMeanDurationOffset(Duration meanDurationOffset) { + this.meanDurationOffset = meanDurationOffset; + } + + public void setSafeDurationOffset(Duration safeDurationOffset) { + this.safeDurationOffset = safeDurationOffset; + } + + public void setSafeDurationFactor(double safeDurationFactor) { + this.safeDurationFactor = safeDurationFactor; + } + private static int getAvailableTime(int... times) { for (var time : times) { if (time != MISSING_VALUE) { From 95527bbac94835a4032e43a34eb5872bed8bbb25 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 14 Feb 2024 17:23:12 +0100 Subject: [PATCH 0968/1688] Add initial implementation of flex duration factors --- .../DurationFactorCalculator.java | 26 +++++++++++++++++++ .../ext/flex/flexpathcalculator/FlexPath.java | 6 +++++ .../ext/flex/trip/StopTimeWindow.java | 13 ++++++++++ .../ext/flex/trip/UnscheduledTrip.java | 12 +++++---- .../gtfs/mapping/StopTimeMapper.java | 8 +++--- .../org/opentripplanner/model/StopTime.java | 15 +++++++++++ 6 files changed, 71 insertions(+), 9 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java new file mode 100644 index 00000000000..c4bc23848d7 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java @@ -0,0 +1,26 @@ +package org.opentripplanner.ext.flex.flexpathcalculator; + +import java.time.Duration; +import javax.annotation.Nullable; +import org.opentripplanner.street.model.vertex.Vertex; + +public class DurationFactorCalculator implements FlexPathCalculator { + + private final FlexPathCalculator underlying; + + public DurationFactorCalculator(FlexPathCalculator underlying) { + this.underlying = underlying; + } + + @Nullable + @Override + public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex) { + var path = underlying.calculateFlexPath(fromv, tov, fromStopIndex, toStopIndex); + + if (path == null) { + return null; + } else { + return path.withDurationFactors(1.5f, Duration.ofMinutes(10)); + } + } +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index 5c5557890d6..c36a59524d1 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.flex.flexpathcalculator; +import java.time.Duration; import java.util.function.Supplier; import org.locationtech.jts.geom.LineString; @@ -32,4 +33,9 @@ public LineString getGeometry() { } return geometry; } + + public FlexPath withDurationFactors(float factor, Duration offset) { + int updatedDuration = (int) ((durationSeconds * factor) + offset.toSeconds()); + return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); + } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java b/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java index 5b7ebbbc575..821fe290cbb 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java @@ -3,6 +3,7 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; import java.io.Serializable; +import java.util.OptionalDouble; import org.opentripplanner.framework.lang.IntRange; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; @@ -18,6 +19,8 @@ class StopTimeWindow implements Serializable { private final PickDrop pickupType; private final PickDrop dropOffType; + private final double meanDurationFactor; + StopTimeWindow(StopTime st) { stop = st.getStop(); @@ -32,6 +35,12 @@ class StopTimeWindow implements Serializable { // Do not allow for pickup/dropoff if times are not available pickupType = start == MISSING_VALUE ? PickDrop.NONE : st.getPickupType(); dropOffType = end == MISSING_VALUE ? PickDrop.NONE : st.getDropOffType(); + + if (st.meanDurationFactor().isPresent()) { + meanDurationFactor = st.meanDurationFactor().getAsDouble(); + } else { + meanDurationFactor = 1; + } } public StopLocation stop() { @@ -58,6 +67,10 @@ public IntRange timeWindow() { return IntRange.ofInclusive(start, end); } + public double meanDurationFactor() { + return meanDurationFactor; + } + private static int getAvailableTime(int... times) { for (var time : times) { if (time != MISSING_VALUE) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index c5968507676..10b00b6ab98 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -14,6 +14,7 @@ import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.ext.flex.FlexServiceDate; +import org.opentripplanner.ext.flex.flexpathcalculator.DurationFactorCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; @@ -81,8 +82,6 @@ public static UnscheduledTripBuilder of(FeedScopedId id) { * - One or more stop times with a flexible time window but no fixed stop in between them */ public static boolean isUnscheduledTrip(List stopTimes) { - Predicate hasFlexWindow = st -> - st.getFlexWindowStart() != MISSING_VALUE || st.getFlexWindowEnd() != MISSING_VALUE; Predicate hasContinuousStops = stopTime -> stopTime.getFlexContinuousDropOff() != NONE || stopTime.getFlexContinuousPickup() != NONE; if (stopTimes.isEmpty()) { @@ -90,9 +89,9 @@ public static boolean isUnscheduledTrip(List stopTimes) { } else if (stopTimes.stream().anyMatch(hasContinuousStops)) { return false; } else if (N_STOPS.contains(stopTimes.size())) { - return stopTimes.stream().anyMatch(hasFlexWindow); + return stopTimes.stream().anyMatch(StopTime::hasFlexWindow); } else { - return stopTimes.stream().allMatch(hasFlexWindow); + return stopTimes.stream().allMatch(StopTime::hasFlexWindow); } } @@ -120,6 +119,9 @@ public Stream getFlexAccessTemplates( } else { indices = IntStream.range(fromIndex + 1, lastIndexInTrip + 1); } + + var updatedCalculator = new DurationFactorCalculator(calculator); + // check for every stop after fromIndex if you can alight, if so return a template return indices // if you cannot alight at an index, the trip is not possible @@ -137,7 +139,7 @@ public Stream getFlexAccessTemplates( alightStop.index, alightStop.stop, date, - calculator, + updatedCalculator, config ) ); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index 2c01dda3e1b..0a1f6269e4f 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -105,16 +105,16 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) { lhs.setFarePeriodId(rhs.getFarePeriodId()); lhs.setFlexWindowStart(rhs.getStartPickupDropOffWindow()); lhs.setFlexWindowEnd(rhs.getEndPickupDropOffWindow()); - if(rhs.getMeanDurationOffset() != MISSING_VALUE) { + if (rhs.getMeanDurationOffset() != MISSING_VALUE) { lhs.setMeanDurationFactor(rhs.getMeanDurationFactor()); } - if(rhs.getMeanDurationOffset() != MISSING_VALUE) { + if (rhs.getMeanDurationOffset() != MISSING_VALUE) { lhs.setMeanDurationOffset(Duration.ofSeconds((long) rhs.getMeanDurationOffset())); } - if(rhs.getSafeDurationFactor() != MISSING_VALUE){ + if (rhs.getSafeDurationFactor() != MISSING_VALUE) { lhs.setSafeDurationFactor(rhs.getSafeDurationFactor()); } - if(rhs.getSafeDurationOffset()!= MISSING_VALUE){ + if (rhs.getSafeDurationOffset() != MISSING_VALUE) { lhs.setSafeDurationOffset(Duration.ofSeconds((long) rhs.getSafeDurationOffset())); } diff --git a/src/main/java/org/opentripplanner/model/StopTime.java b/src/main/java/org/opentripplanner/model/StopTime.java index 8320e532c2c..64045bbbbfe 100644 --- a/src/main/java/org/opentripplanner/model/StopTime.java +++ b/src/main/java/org/opentripplanner/model/StopTime.java @@ -3,6 +3,7 @@ import java.time.Duration; import java.util.List; +import java.util.OptionalDouble; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.model.site.StopLocation; @@ -313,6 +314,13 @@ public void setSafeDurationFactor(double safeDurationFactor) { this.safeDurationFactor = safeDurationFactor; } + public OptionalDouble meanDurationFactor() { + if (meanDurationFactor == MISSING_VALUE) { + return OptionalDouble.empty(); + } + return OptionalDouble.of(meanDurationFactor); + } + private static int getAvailableTime(int... times) { for (var time : times) { if (time != MISSING_VALUE) { @@ -322,4 +330,11 @@ private static int getAvailableTime(int... times) { return MISSING_VALUE; } + + /** + * Does this stop time define a flex window? + */ + public boolean hasFlexWindow() { + return flexWindowStart != MISSING_VALUE || flexWindowEnd != MISSING_VALUE; + } } From ea0960aa70e7cceff521777fd9ebb9f69ea50e75 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 15 Mar 2024 09:27:24 +0100 Subject: [PATCH 0969/1688] Remove stop-time-based factors --- .../ext/flex/trip/StopTimeWindow.java | 13 -------- .../gtfs/mapping/StopTimeMapper.java | 15 --------- .../org/opentripplanner/model/StopTime.java | 33 ------------------- 3 files changed, 61 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java b/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java index 821fe290cbb..5b7ebbbc575 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/StopTimeWindow.java @@ -3,7 +3,6 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; import java.io.Serializable; -import java.util.OptionalDouble; import org.opentripplanner.framework.lang.IntRange; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; @@ -19,8 +18,6 @@ class StopTimeWindow implements Serializable { private final PickDrop pickupType; private final PickDrop dropOffType; - private final double meanDurationFactor; - StopTimeWindow(StopTime st) { stop = st.getStop(); @@ -35,12 +32,6 @@ class StopTimeWindow implements Serializable { // Do not allow for pickup/dropoff if times are not available pickupType = start == MISSING_VALUE ? PickDrop.NONE : st.getPickupType(); dropOffType = end == MISSING_VALUE ? PickDrop.NONE : st.getDropOffType(); - - if (st.meanDurationFactor().isPresent()) { - meanDurationFactor = st.meanDurationFactor().getAsDouble(); - } else { - meanDurationFactor = 1; - } } public StopLocation stop() { @@ -67,10 +58,6 @@ public IntRange timeWindow() { return IntRange.ofInclusive(start, end); } - public double meanDurationFactor() { - return meanDurationFactor; - } - private static int getAvailableTime(int... times) { for (var time : times) { if (time != MISSING_VALUE) { diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index 0a1f6269e4f..67b250c5061 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -1,8 +1,5 @@ package org.opentripplanner.gtfs.mapping; -import static org.onebusaway.gtfs.model.StopTime.MISSING_VALUE; - -import java.time.Duration; import java.util.Collection; import java.util.HashMap; import java.util.Map; @@ -105,18 +102,6 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) { lhs.setFarePeriodId(rhs.getFarePeriodId()); lhs.setFlexWindowStart(rhs.getStartPickupDropOffWindow()); lhs.setFlexWindowEnd(rhs.getEndPickupDropOffWindow()); - if (rhs.getMeanDurationOffset() != MISSING_VALUE) { - lhs.setMeanDurationFactor(rhs.getMeanDurationFactor()); - } - if (rhs.getMeanDurationOffset() != MISSING_VALUE) { - lhs.setMeanDurationOffset(Duration.ofSeconds((long) rhs.getMeanDurationOffset())); - } - if (rhs.getSafeDurationFactor() != MISSING_VALUE) { - lhs.setSafeDurationFactor(rhs.getSafeDurationFactor()); - } - if (rhs.getSafeDurationOffset() != MISSING_VALUE) { - lhs.setSafeDurationOffset(Duration.ofSeconds((long) rhs.getSafeDurationOffset())); - } lhs.setFlexContinuousPickup( PickDropMapper.mapFlexContinuousPickDrop(rhs.getContinuousPickup()) diff --git a/src/main/java/org/opentripplanner/model/StopTime.java b/src/main/java/org/opentripplanner/model/StopTime.java index 64045bbbbfe..e753b8d2885 100644 --- a/src/main/java/org/opentripplanner/model/StopTime.java +++ b/src/main/java/org/opentripplanner/model/StopTime.java @@ -1,9 +1,7 @@ /* This file is based on code copied from project OneBusAway, see the LICENSE file for further information. */ package org.opentripplanner.model; -import java.time.Duration; import java.util.List; -import java.util.OptionalDouble; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.transit.model.site.StopLocation; @@ -52,14 +50,6 @@ public final class StopTime implements Comparable { private int flexWindowEnd = MISSING_VALUE; - private double meanDurationFactor = MISSING_VALUE; - - private Duration meanDurationOffset = Duration.ZERO; - - private double safeDurationFactor = MISSING_VALUE; - - private Duration safeDurationOffset = Duration.ZERO; - // Disabled by default private PickDrop flexContinuousPickup = PickDrop.NONE; @@ -298,29 +288,6 @@ public String toString() { ); } - public void setMeanDurationFactor(double meanDurationFactor) { - this.meanDurationFactor = meanDurationFactor; - } - - public void setMeanDurationOffset(Duration meanDurationOffset) { - this.meanDurationOffset = meanDurationOffset; - } - - public void setSafeDurationOffset(Duration safeDurationOffset) { - this.safeDurationOffset = safeDurationOffset; - } - - public void setSafeDurationFactor(double safeDurationFactor) { - this.safeDurationFactor = safeDurationFactor; - } - - public OptionalDouble meanDurationFactor() { - if (meanDurationFactor == MISSING_VALUE) { - return OptionalDouble.empty(); - } - return OptionalDouble.of(meanDurationFactor); - } - private static int getAvailableTime(int... times) { for (var time : times) { if (time != MISSING_VALUE) { From a0eb06655a65deb18005d9ba5f2441c072d3fa59 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 15 Mar 2024 10:29:47 +0100 Subject: [PATCH 0970/1688] Move factors into calcultor --- .../DurationFactorCalculator.java | 14 +++++++++----- .../ext/flex/trip/UnscheduledTrip.java | 3 ++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java index c4bc23848d7..24a4d665fe6 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java @@ -6,21 +6,25 @@ public class DurationFactorCalculator implements FlexPathCalculator { - private final FlexPathCalculator underlying; + private final FlexPathCalculator delegate; + private final float factor; + private final Duration offset; - public DurationFactorCalculator(FlexPathCalculator underlying) { - this.underlying = underlying; + public DurationFactorCalculator(FlexPathCalculator delegate, float factor, Duration offset) { + this.delegate = delegate; + this.factor = factor; + this.offset = offset; } @Nullable @Override public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex) { - var path = underlying.calculateFlexPath(fromv, tov, fromStopIndex, toStopIndex); + var path = delegate.calculateFlexPath(fromv, tov, fromStopIndex, toStopIndex); if (path == null) { return null; } else { - return path.withDurationFactors(1.5f, Duration.ofMinutes(10)); + return path.withDurationFactors(factor, offset); } } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 10b00b6ab98..e2ab49045d6 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -3,6 +3,7 @@ import static org.opentripplanner.model.PickDrop.NONE; import static org.opentripplanner.model.StopTime.MISSING_VALUE; +import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.Optional; @@ -120,7 +121,7 @@ public Stream getFlexAccessTemplates( indices = IntStream.range(fromIndex + 1, lastIndexInTrip + 1); } - var updatedCalculator = new DurationFactorCalculator(calculator); + var updatedCalculator = new DurationFactorCalculator(calculator, 1.5f, Duration.ofMinutes(20)); // check for every stop after fromIndex if you can alight, if so return a template return indices From cc7601275a2ba2551028b40d229da7afd799188c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 15 Mar 2024 14:24:04 +0100 Subject: [PATCH 0971/1688] Encapsulate factors, add parsing --- .../ext/flex/FlexTripsMapper.java | 9 ++++++- .../DurationFactorCalculator.java | 12 ++++----- .../ext/flex/flexpathcalculator/FlexPath.java | 6 ++--- .../ext/flex/trip/FlexDurationFactors.java | 27 +++++++++++++++++++ .../ext/flex/trip/UnscheduledTrip.java | 15 +++++++++-- .../ext/flex/trip/UnscheduledTripBuilder.java | 10 +++++++ .../GTFSToOtpTransitServiceMapper.java | 1 + .../gtfs/mapping/TripMapper.java | 26 ++++++++++++++++-- .../model/impl/OtpTransitServiceBuilder.java | 9 +++++++ 9 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index f5ab34cce49..d4918e8ed33 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -4,6 +4,7 @@ import java.util.ArrayList; import java.util.List; +import org.opentripplanner.ext.flex.trip.FlexDurationFactors; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; @@ -34,10 +35,16 @@ public class FlexTripsMapper { for (Trip trip : stopTimesByTrip.keys()) { /* Fetch the stop times for this trip. Copy the list since it's immutable. */ List stopTimes = new ArrayList<>(stopTimesByTrip.get(trip)); + var factors = builder.getFlexDurationFactors().getOrDefault(trip, FlexDurationFactors.ZERO); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { result.add( - UnscheduledTrip.of(trip.getId()).withTrip(trip).withStopTimes(stopTimes).build() + UnscheduledTrip + .of(trip.getId()) + .withTrip(trip) + .withStopTimes(stopTimes) + .withDurationFactors(factors) + .build() ); } else if (ScheduledDeviatedTrip.isScheduledFlexTrip(stopTimes)) { result.add( diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java index 24a4d665fe6..3e5a6b1db79 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java @@ -1,19 +1,17 @@ package org.opentripplanner.ext.flex.flexpathcalculator; -import java.time.Duration; import javax.annotation.Nullable; +import org.opentripplanner.ext.flex.trip.FlexDurationFactors; import org.opentripplanner.street.model.vertex.Vertex; public class DurationFactorCalculator implements FlexPathCalculator { private final FlexPathCalculator delegate; - private final float factor; - private final Duration offset; + private final FlexDurationFactors factors; - public DurationFactorCalculator(FlexPathCalculator delegate, float factor, Duration offset) { + public DurationFactorCalculator(FlexPathCalculator delegate, FlexDurationFactors factors) { this.delegate = delegate; - this.factor = factor; - this.offset = offset; + this.factors = factors; } @Nullable @@ -24,7 +22,7 @@ public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, i if (path == null) { return null; } else { - return path.withDurationFactors(factor, offset); + return path.withDurationFactors(factors); } } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index c36a59524d1..7ba3aad43d4 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java @@ -1,8 +1,8 @@ package org.opentripplanner.ext.flex.flexpathcalculator; -import java.time.Duration; import java.util.function.Supplier; import org.locationtech.jts.geom.LineString; +import org.opentripplanner.ext.flex.trip.FlexDurationFactors; /** * This class contains the results from a FlexPathCalculator. @@ -34,8 +34,8 @@ public LineString getGeometry() { return geometry; } - public FlexPath withDurationFactors(float factor, Duration offset) { - int updatedDuration = (int) ((durationSeconds * factor) + offset.toSeconds()); + public FlexPath withDurationFactors(FlexDurationFactors factors) { + int updatedDuration = (int) ((durationSeconds * factors.factor()) + factors.offsetInSeconds()); return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java new file mode 100644 index 00000000000..41b610730d4 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java @@ -0,0 +1,27 @@ +package org.opentripplanner.ext.flex.trip; + +import java.time.Duration; + +public class FlexDurationFactors { + + public static FlexDurationFactors ZERO = new FlexDurationFactors(Duration.ZERO, 1); + private final int offset; + private final float factor; + + public FlexDurationFactors(Duration offset, float factor) { + this.offset = (int) offset.toSeconds(); + this.factor = factor; + } + + public float factor() { + return factor; + } + + public int offsetInSeconds() { + return offset; + } + + boolean nonZero() { + return offset != 0 && factor != 1.0; + } +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index e2ab49045d6..9c71696c02b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -3,9 +3,9 @@ import static org.opentripplanner.model.PickDrop.NONE; import static org.opentripplanner.model.StopTime.MISSING_VALUE; -import java.time.Duration; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.Set; import java.util.function.Function; @@ -52,6 +52,8 @@ public class UnscheduledTrip extends FlexTrip stopTimes = builder.stopTimes(); @@ -69,6 +71,7 @@ public UnscheduledTrip(UnscheduledTripBuilder builder) { this.dropOffBookingInfos[i] = stopTimes.get(0).getDropOffBookingInfo(); this.pickupBookingInfos[i] = stopTimes.get(0).getPickupBookingInfo(); } + this.duractionFactors = Objects.requireNonNull(builder.durationFactors()); } public static UnscheduledTripBuilder of(FeedScopedId id) { @@ -121,7 +124,7 @@ public Stream getFlexAccessTemplates( indices = IntStream.range(fromIndex + 1, lastIndexInTrip + 1); } - var updatedCalculator = new DurationFactorCalculator(calculator, 1.5f, Duration.ofMinutes(20)); + final var updatedCalculator = flexPathCalculator(calculator); // check for every stop after fromIndex if you can alight, if so return a template return indices @@ -146,6 +149,14 @@ public Stream getFlexAccessTemplates( ); } + private FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { + if (duractionFactors.nonZero()) { + return new DurationFactorCalculator(calculator, duractionFactors); + } else { + return calculator; + } + } + @Override public Stream getFlexEgressTemplates( NearbyStop egress, diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java index 678b7fcce5e..e2d296d8154 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java @@ -8,6 +8,7 @@ public class UnscheduledTripBuilder extends FlexTripBuilder { private List stopTimes; + private FlexDurationFactors durationFactors = FlexDurationFactors.ZERO; UnscheduledTripBuilder(FeedScopedId id) { super(id); @@ -29,6 +30,15 @@ public List stopTimes() { return stopTimes; } + public UnscheduledTripBuilder withDurationFactors(FlexDurationFactors factors) { + this.durationFactors = factors; + return this; + } + + public FlexDurationFactors durationFactors() { + return durationFactors; + } + @Override UnscheduledTripBuilder instance() { return this; diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index 4d5fe6bd051..15a4c2e28b7 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -171,6 +171,7 @@ public void mapStopTripAndRouteDataIntoBuilder() { builder.getPathways().addAll(pathwayMapper.map(data.getAllPathways())); builder.getStopTimesSortedByTrip().addAll(stopTimeMapper.map(data.getAllStopTimes())); + builder.getFlexDurationFactors().putAll(tripMapper.flexDurationFactors()); builder.getTripsById().addAll(tripMapper.map(data.getAllTrips())); fareRulesBuilder.fareAttributes().addAll(fareAttributeMapper.map(data.getAllFareAttributes())); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index a80ae035ed1..77d6eb879b0 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -1,8 +1,11 @@ package org.opentripplanner.gtfs.mapping; +import java.time.Duration; import java.util.Collection; import java.util.HashMap; import java.util.Map; +import java.util.Optional; +import org.opentripplanner.ext.flex.trip.FlexDurationFactors; import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.timetable.Trip; @@ -12,9 +15,10 @@ class TripMapper { private final RouteMapper routeMapper; private final DirectionMapper directionMapper; - private TranslationHelper translationHelper; + private final TranslationHelper translationHelper; private final Map mappedTrips = new HashMap<>(); + private final Map flexDurationFactors = new HashMap<>(); TripMapper( RouteMapper routeMapper, @@ -38,6 +42,13 @@ Collection getMappedTrips() { return mappedTrips.values(); } + /** + * The map of flex duration factors per flex trip. + */ + Map flexDurationFactors() { + return flexDurationFactors; + } + private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { var lhs = Trip.of(AgencyAndIdMapper.mapAgencyAndId(rhs.getId())); @@ -62,6 +73,17 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { lhs.withBikesAllowed(BikeAccessMapper.mapForTrip(rhs)); lhs.withGtfsFareId(rhs.getFareId()); - return lhs.build(); + var trip = lhs.build(); + mapFlexDurationFactots(rhs).ifPresent(f -> flexDurationFactors.put(trip, f)); + return trip; + } + + private Optional mapFlexDurationFactots(org.onebusaway.gtfs.model.Trip rhs) { + if (rhs.getMeanDurationFactor() == null && rhs.getMeanDurationOffset() == null) { + return Optional.empty(); + } else { + var offset = Duration.ofSeconds(rhs.getMeanDurationOffset().longValue()); + return Optional.of(new FlexDurationFactors(offset, rhs.getMeanDurationFactor().floatValue())); + } } } diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java index 382d6042a05..e4d0d76cbe3 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java @@ -3,10 +3,13 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; import java.util.ArrayList; +import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; +import org.opentripplanner.ext.flex.trip.FlexDurationFactors; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; @@ -92,6 +95,8 @@ public class OtpTransitServiceBuilder { private final TripStopTimes stopTimesByTrip = new TripStopTimes(); + private final Map flexDurationFactors = new HashMap<>(); + private final EntityById fareZonesById = new DefaultEntityById<>(); private final List transfers = new ArrayList<>(); @@ -209,6 +214,10 @@ public TripStopTimes getStopTimesSortedByTrip() { return stopTimesByTrip; } + public Map getFlexDurationFactors() { + return flexDurationFactors; + } + public EntityById getFareZonesById() { return fareZonesById; } From dca331bff6144a4d51902bcfe78115bac00c40ee Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 15 Mar 2024 15:07:31 +0100 Subject: [PATCH 0972/1688] Make factors serializable --- .../ext/flex/FlexTripsMapper.java | 2 +- .../ext/flex/trip/FlexDurationFactors.java | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index d4918e8ed33..819b51f9df2 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -35,9 +35,9 @@ public class FlexTripsMapper { for (Trip trip : stopTimesByTrip.keys()) { /* Fetch the stop times for this trip. Copy the list since it's immutable. */ List stopTimes = new ArrayList<>(stopTimesByTrip.get(trip)); - var factors = builder.getFlexDurationFactors().getOrDefault(trip, FlexDurationFactors.ZERO); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { + var factors = builder.getFlexDurationFactors().getOrDefault(trip, FlexDurationFactors.ZERO); result.add( UnscheduledTrip .of(trip.getId()) diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java index 41b610730d4..adcb25dc1e4 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java @@ -1,15 +1,21 @@ package org.opentripplanner.ext.flex.trip; +import java.io.Serializable; import java.time.Duration; +import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.framework.tostring.ToStringBuilder; -public class FlexDurationFactors { +public class FlexDurationFactors implements Serializable { public static FlexDurationFactors ZERO = new FlexDurationFactors(Duration.ZERO, 1); private final int offset; private final float factor; public FlexDurationFactors(Duration offset, float factor) { - this.offset = (int) offset.toSeconds(); + if (factor < 0.1) { + throw new IllegalArgumentException("Flex duration factor must not be less than 0.1"); + } + this.offset = (int) DurationUtils.requireNonNegative(offset).toSeconds(); this.factor = factor; } @@ -24,4 +30,13 @@ public int offsetInSeconds() { boolean nonZero() { return offset != 0 && factor != 1.0; } + + @Override + public String toString() { + return ToStringBuilder + .of(FlexDurationFactors.class) + .addNum("factor", factor) + .addDurationSec("offset", offset) + .toString(); + } } From 721845e1b7287a8186b4abdf517501b51474ded7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Apr 2024 12:28:37 +0200 Subject: [PATCH 0973/1688] Use safe instead of mean values --- .../mapping/GTFSToOtpTransitServiceMapper.java | 2 +- .../opentripplanner/gtfs/mapping/TripMapper.java | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index 15a4c2e28b7..4ee1cdcf1d7 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -171,7 +171,7 @@ public void mapStopTripAndRouteDataIntoBuilder() { builder.getPathways().addAll(pathwayMapper.map(data.getAllPathways())); builder.getStopTimesSortedByTrip().addAll(stopTimeMapper.map(data.getAllStopTimes())); - builder.getFlexDurationFactors().putAll(tripMapper.flexDurationFactors()); + builder.getFlexDurationFactors().putAll(tripMapper.flexSafeDurationFactors()); builder.getTripsById().addAll(tripMapper.map(data.getAllTrips())); fareRulesBuilder.fareAttributes().addAll(fareAttributeMapper.map(data.getAllFareAttributes())); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index 77d6eb879b0..0164e7d77f9 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -18,7 +18,7 @@ class TripMapper { private final TranslationHelper translationHelper; private final Map mappedTrips = new HashMap<>(); - private final Map flexDurationFactors = new HashMap<>(); + private final Map flexSafeDurationFactors = new HashMap<>(); TripMapper( RouteMapper routeMapper, @@ -45,8 +45,8 @@ Collection getMappedTrips() { /** * The map of flex duration factors per flex trip. */ - Map flexDurationFactors() { - return flexDurationFactors; + Map flexSafeDurationFactors() { + return flexSafeDurationFactors; } private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { @@ -74,16 +74,16 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { lhs.withGtfsFareId(rhs.getFareId()); var trip = lhs.build(); - mapFlexDurationFactots(rhs).ifPresent(f -> flexDurationFactors.put(trip, f)); + mapSafeDurationFactors(rhs).ifPresent(f -> flexSafeDurationFactors.put(trip, f)); return trip; } - private Optional mapFlexDurationFactots(org.onebusaway.gtfs.model.Trip rhs) { - if (rhs.getMeanDurationFactor() == null && rhs.getMeanDurationOffset() == null) { + private Optional mapSafeDurationFactors(org.onebusaway.gtfs.model.Trip rhs) { + if (rhs.getSafeDurationFactor() == null && rhs.getSafeDurationOffset() == null) { return Optional.empty(); } else { - var offset = Duration.ofSeconds(rhs.getMeanDurationOffset().longValue()); - return Optional.of(new FlexDurationFactors(offset, rhs.getMeanDurationFactor().floatValue())); + var offset = Duration.ofSeconds(rhs.getSafeDurationOffset().longValue()); + return Optional.of(new FlexDurationFactors(offset, rhs.getSafeDurationFactor().floatValue())); } } } From abcfa935489f7dfdc735ec92e7dead8cd7ca4f1c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Apr 2024 12:32:15 +0200 Subject: [PATCH 0974/1688] Use correct booking info instances --- .../org/opentripplanner/ext/flex/trip/UnscheduledTrip.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 9c71696c02b..712a446c7ed 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -68,8 +68,8 @@ public UnscheduledTrip(UnscheduledTripBuilder builder) { for (int i = 0; i < size; i++) { this.stopTimes[i] = new StopTimeWindow(stopTimes.get(i)); - this.dropOffBookingInfos[i] = stopTimes.get(0).getDropOffBookingInfo(); - this.pickupBookingInfos[i] = stopTimes.get(0).getPickupBookingInfo(); + this.dropOffBookingInfos[i] = stopTimes.get(i).getDropOffBookingInfo(); + this.pickupBookingInfos[i] = stopTimes.get(i).getPickupBookingInfo(); } this.duractionFactors = Objects.requireNonNull(builder.durationFactors()); } From 5066052c4452afdc15f10896f4c01ee510415dab Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 5 Apr 2024 16:05:31 +0200 Subject: [PATCH 0975/1688] Implement duration modifier for ScheduledDeviated trip --- .../ext/flex/FlexTripsMapper.java | 14 ++++--- .../DurationFactorCalculator.java | 6 +-- .../ext/flex/flexpathcalculator/FlexPath.java | 4 +- .../ScheduledFlexPathCalculator.java | 9 +++-- ...Factors.java => FlexDurationModifier.java} | 14 ++++--- .../ext/flex/trip/ScheduledDeviatedTrip.java | 39 +++++++++++++++++-- .../trip/ScheduledDeviatedTripBuilder.java | 10 +++++ .../ext/flex/trip/UnscheduledTrip.java | 8 ++-- .../ext/flex/trip/UnscheduledTripBuilder.java | 10 ++--- .../gtfs/mapping/TripMapper.java | 14 ++++--- .../model/impl/OtpTransitServiceBuilder.java | 7 ++-- 11 files changed, 96 insertions(+), 39 deletions(-) rename src/ext/java/org/opentripplanner/ext/flex/trip/{FlexDurationFactors.java => FlexDurationModifier.java} (68%) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index 819b51f9df2..5881bc798a8 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.ext.flex.trip.FlexDurationFactors; +import org.opentripplanner.ext.flex.trip.FlexDurationModifier; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; @@ -35,20 +35,24 @@ public class FlexTripsMapper { for (Trip trip : stopTimesByTrip.keys()) { /* Fetch the stop times for this trip. Copy the list since it's immutable. */ List stopTimes = new ArrayList<>(stopTimesByTrip.get(trip)); - + var modifier = builder.getFlexDurationFactors().getOrDefault(trip, FlexDurationModifier.NONE); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { - var factors = builder.getFlexDurationFactors().getOrDefault(trip, FlexDurationFactors.ZERO); result.add( UnscheduledTrip .of(trip.getId()) .withTrip(trip) .withStopTimes(stopTimes) - .withDurationFactors(factors) + .withDurationModifier(modifier) .build() ); } else if (ScheduledDeviatedTrip.isScheduledFlexTrip(stopTimes)) { result.add( - ScheduledDeviatedTrip.of(trip.getId()).withTrip(trip).withStopTimes(stopTimes).build() + ScheduledDeviatedTrip + .of(trip.getId()) + .withTrip(trip) + .withStopTimes(stopTimes) + .withDurationModifier(modifier) + .build() ); } else if (hasContinuousStops(stopTimes) && FlexTrip.containsFlexStops(stopTimes)) { store.add( diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java index 3e5a6b1db79..e0873fab187 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java @@ -1,15 +1,15 @@ package org.opentripplanner.ext.flex.flexpathcalculator; import javax.annotation.Nullable; -import org.opentripplanner.ext.flex.trip.FlexDurationFactors; +import org.opentripplanner.ext.flex.trip.FlexDurationModifier; import org.opentripplanner.street.model.vertex.Vertex; public class DurationFactorCalculator implements FlexPathCalculator { private final FlexPathCalculator delegate; - private final FlexDurationFactors factors; + private final FlexDurationModifier factors; - public DurationFactorCalculator(FlexPathCalculator delegate, FlexDurationFactors factors) { + public DurationFactorCalculator(FlexPathCalculator delegate, FlexDurationModifier factors) { this.delegate = delegate; this.factors = factors; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index 7ba3aad43d4..22752726ae7 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java @@ -2,7 +2,7 @@ import java.util.function.Supplier; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.ext.flex.trip.FlexDurationFactors; +import org.opentripplanner.ext.flex.trip.FlexDurationModifier; /** * This class contains the results from a FlexPathCalculator. @@ -34,7 +34,7 @@ public LineString getGeometry() { return geometry; } - public FlexPath withDurationFactors(FlexDurationFactors factors) { + public FlexPath withDurationFactors(FlexDurationModifier factors) { int updatedDuration = (int) ((durationSeconds * factors.factor()) + factors.offsetInSeconds()); return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java index 7d953abc4fd..cd5228dada5 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java @@ -20,7 +20,7 @@ public ScheduledFlexPathCalculator(FlexPathCalculator flexPathCalculator, FlexTr @Override public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex) { - FlexPath flexPath = flexPathCalculator.calculateFlexPath( + final var flexPath = flexPathCalculator.calculateFlexPath( fromv, tov, fromStopIndex, @@ -29,7 +29,6 @@ public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, i if (flexPath == null) { return null; } - int distance = flexPath.distanceMeters; int departureTime = trip.earliestDepartureTime( Integer.MIN_VALUE, fromStopIndex, @@ -50,6 +49,10 @@ public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, i if (departureTime >= arrivalTime) { return null; } - return new FlexPath(distance, arrivalTime - departureTime, flexPath::getGeometry); + return new FlexPath( + flexPath.distanceMeters, + arrivalTime - departureTime, + flexPath::getGeometry + ); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationModifier.java similarity index 68% rename from src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java rename to src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationModifier.java index adcb25dc1e4..60f795d7280 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationFactors.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationModifier.java @@ -5,13 +5,13 @@ import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; -public class FlexDurationFactors implements Serializable { +public class FlexDurationModifier implements Serializable { - public static FlexDurationFactors ZERO = new FlexDurationFactors(Duration.ZERO, 1); + public static FlexDurationModifier NONE = new FlexDurationModifier(Duration.ZERO, 1); private final int offset; private final float factor; - public FlexDurationFactors(Duration offset, float factor) { + public FlexDurationModifier(Duration offset, float factor) { if (factor < 0.1) { throw new IllegalArgumentException("Flex duration factor must not be less than 0.1"); } @@ -27,14 +27,18 @@ public int offsetInSeconds() { return offset; } - boolean nonZero() { + /** + * Check if this instance actually modifies the duration or simply passes it back without + * change. + */ + boolean modifies() { return offset != 0 && factor != 1.0; } @Override public String toString() { return ToStringBuilder - .of(FlexDurationFactors.class) + .of(FlexDurationModifier.class) .addNum("factor", factor) .addDurationSec("offset", offset) .toString(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index e16e1e5e1f7..33a064e610c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -1,5 +1,7 @@ package org.opentripplanner.ext.flex.trip; +import static org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip.TimeType.FIXED_TIME; +import static org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip.TimeType.FLEXIBLE_TIME; import static org.opentripplanner.model.PickDrop.NONE; import static org.opentripplanner.model.StopTime.MISSING_VALUE; @@ -15,6 +17,7 @@ import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.ext.flex.FlexServiceDate; +import org.opentripplanner.ext.flex.flexpathcalculator.DurationFactorCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; @@ -42,6 +45,8 @@ public class ScheduledDeviatedTrip private final BookingInfo[] dropOffBookingInfos; private final BookingInfo[] pickupBookingInfos; + private final FlexDurationModifier durationModifier; + ScheduledDeviatedTrip(ScheduledDeviatedTripBuilder builder) { super(builder); List stopTimes = builder.stopTimes(); @@ -59,6 +64,7 @@ public class ScheduledDeviatedTrip this.dropOffBookingInfos[i] = stopTimes.get(i).getDropOffBookingInfo(); this.pickupBookingInfos[i] = stopTimes.get(i).getPickupBookingInfo(); } + this.durationModifier = builder.durationModifier(); } public static ScheduledDeviatedTripBuilder of(FeedScopedId id) { @@ -104,7 +110,7 @@ public Stream getFlexAccessTemplates( toIndex, stop, date, - scheduledCalculator, + getCalculator(fromIndex, toIndex, scheduledCalculator), config ) ); @@ -114,6 +120,25 @@ public Stream getFlexAccessTemplates( return res.stream(); } + /** + * If any of the stops involved in the path computation, then apply the duration factors. + * If both from and to have a fixed time, then don't apply the factors. + */ + private FlexPathCalculator getCalculator( + int fromIndex, + int toIndex, + FlexPathCalculator scheduledCalculator + ) { + final boolean usesFlexWindow = + stopTimes[fromIndex].timeType == FLEXIBLE_TIME || + stopTimes[toIndex].timeType == FLEXIBLE_TIME; + if (usesFlexWindow && durationModifier.modifies()) { + return new DurationFactorCalculator(scheduledCalculator, FlexDurationModifier.NONE); + } else { + return scheduledCalculator; + } + } + @Override public Stream getFlexEgressTemplates( NearbyStop egress, @@ -144,7 +169,7 @@ public Stream getFlexEgressTemplates( toIndex, stop, date, - scheduledCalculator, + getCalculator(fromIndex, toIndex, scheduledCalculator), config ) ); @@ -176,7 +201,7 @@ public int earliestDepartureTime(int stopIndex) { @Override public int latestArrivalTime( int arrivalTime, - int fromStopIndex, + int ignored, int toStopIndex, int flexTripDurationSeconds ) { @@ -297,10 +322,13 @@ private static class ScheduledDeviatedStopTime implements Serializable { private final int arrivalTime; private final PickDrop pickupType; private final PickDrop dropOffType; + private final TimeType timeType; private ScheduledDeviatedStopTime(StopTime st) { this.stop = st.getStop(); + this.timeType = st.hasFlexWindow() ? FLEXIBLE_TIME : FIXED_TIME; + // Store the time the user is guaranteed to arrive at latest this.arrivalTime = st.getLatestPossibleArrivalTime(); // Store the time the user needs to be ready for pickup @@ -315,4 +343,9 @@ private ScheduledDeviatedStopTime(StopTime st) { this.dropOffType = arrivalTime == MISSING_VALUE ? PickDrop.NONE : st.getDropOffType(); } } + + enum TimeType { + FIXED_TIME, + FLEXIBLE_TIME, + } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java index 4033bbe7c59..3a33ebd50ec 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java @@ -8,6 +8,7 @@ public class ScheduledDeviatedTripBuilder extends FlexTripBuilder { private List stopTimes; + private FlexDurationModifier durationModifier = FlexDurationModifier.NONE; ScheduledDeviatedTripBuilder(FeedScopedId id) { super(id); @@ -29,6 +30,15 @@ public List stopTimes() { return stopTimes; } + public FlexDurationModifier durationModifier() { + return durationModifier; + } + + public ScheduledDeviatedTripBuilder withDurationModifier(FlexDurationModifier modifier) { + this.durationModifier = modifier; + return this; + } + @Override ScheduledDeviatedTripBuilder instance() { return this; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 712a446c7ed..d85c6b72c27 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -52,7 +52,7 @@ public class UnscheduledTrip extends FlexTrip getFlexAccessTemplates( } private FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { - if (duractionFactors.nonZero()) { - return new DurationFactorCalculator(calculator, duractionFactors); + if (durationModifier.modifies()) { + return new DurationFactorCalculator(calculator, durationModifier); } else { return calculator; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java index e2d296d8154..7e2132ed036 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java @@ -8,7 +8,7 @@ public class UnscheduledTripBuilder extends FlexTripBuilder { private List stopTimes; - private FlexDurationFactors durationFactors = FlexDurationFactors.ZERO; + private FlexDurationModifier durationModifier = FlexDurationModifier.NONE; UnscheduledTripBuilder(FeedScopedId id) { super(id); @@ -30,13 +30,13 @@ public List stopTimes() { return stopTimes; } - public UnscheduledTripBuilder withDurationFactors(FlexDurationFactors factors) { - this.durationFactors = factors; + public UnscheduledTripBuilder withDurationModifier(FlexDurationModifier factors) { + this.durationModifier = factors; return this; } - public FlexDurationFactors durationFactors() { - return durationFactors; + public FlexDurationModifier durationModifier() { + return durationModifier; } @Override diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index 0164e7d77f9..03ef077d319 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.ext.flex.trip.FlexDurationFactors; +import org.opentripplanner.ext.flex.trip.FlexDurationModifier; import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.timetable.Trip; @@ -18,7 +18,7 @@ class TripMapper { private final TranslationHelper translationHelper; private final Map mappedTrips = new HashMap<>(); - private final Map flexSafeDurationFactors = new HashMap<>(); + private final Map flexSafeDurationFactors = new HashMap<>(); TripMapper( RouteMapper routeMapper, @@ -45,7 +45,7 @@ Collection getMappedTrips() { /** * The map of flex duration factors per flex trip. */ - Map flexSafeDurationFactors() { + Map flexSafeDurationFactors() { return flexSafeDurationFactors; } @@ -78,12 +78,16 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { return trip; } - private Optional mapSafeDurationFactors(org.onebusaway.gtfs.model.Trip rhs) { + private Optional mapSafeDurationFactors( + org.onebusaway.gtfs.model.Trip rhs + ) { if (rhs.getSafeDurationFactor() == null && rhs.getSafeDurationOffset() == null) { return Optional.empty(); } else { var offset = Duration.ofSeconds(rhs.getSafeDurationOffset().longValue()); - return Optional.of(new FlexDurationFactors(offset, rhs.getSafeDurationFactor().floatValue())); + return Optional.of( + new FlexDurationModifier(offset, rhs.getSafeDurationFactor().floatValue()) + ); } } } diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java index e4d0d76cbe3..5811fe042c3 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java @@ -7,9 +7,8 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Optional; import java.util.Set; -import org.opentripplanner.ext.flex.trip.FlexDurationFactors; +import org.opentripplanner.ext.flex.trip.FlexDurationModifier; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; @@ -95,7 +94,7 @@ public class OtpTransitServiceBuilder { private final TripStopTimes stopTimesByTrip = new TripStopTimes(); - private final Map flexDurationFactors = new HashMap<>(); + private final Map flexDurationFactors = new HashMap<>(); private final EntityById fareZonesById = new DefaultEntityById<>(); @@ -214,7 +213,7 @@ public TripStopTimes getStopTimesSortedByTrip() { return stopTimesByTrip; } - public Map getFlexDurationFactors() { + public Map getFlexDurationFactors() { return flexDurationFactors; } From 90b15cd8684da65bb5bf2e1d984d00bc53129cdc Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 6 Apr 2024 22:13:08 +0200 Subject: [PATCH 0976/1688] Rename and test --- .../DurationModifierCalculatorTest.java | 35 +++++++++++++++++ .../flex/flexpathcalculator/FlexPathTest.java | 39 +++++++++++++++++++ .../ext/flex/FlexTripsMapper.java | 4 +- ...r.java => DurationModifierCalculator.java} | 10 ++--- .../ext/flex/flexpathcalculator/FlexPath.java | 11 ++++-- ...ionModifier.java => DurationModifier.java} | 8 ++-- .../ext/flex/trip/ScheduledDeviatedTrip.java | 6 +-- .../trip/ScheduledDeviatedTripBuilder.java | 6 +-- .../ext/flex/trip/UnscheduledTrip.java | 6 +-- .../ext/flex/trip/UnscheduledTripBuilder.java | 6 +-- .../gtfs/mapping/TripMapper.java | 14 +++---- .../model/impl/OtpTransitServiceBuilder.java | 6 +-- .../_support/geometry/Polygons.java | 4 +- 13 files changed, 115 insertions(+), 40 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java rename src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/{DurationFactorCalculator.java => DurationModifierCalculator.java} (62%) rename src/ext/java/org/opentripplanner/ext/flex/trip/{FlexDurationModifier.java => DurationModifier.java} (79%) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java new file mode 100644 index 00000000000..fd81344893b --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java @@ -0,0 +1,35 @@ +package org.opentripplanner.ext.flex.flexpathcalculator; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.time.Duration; +import org.junit.jupiter.api.Test; +import org.opentripplanner.ext.flex.trip.DurationModifier; +import org.opentripplanner.framework.geometry.GeometryUtils; +import org.opentripplanner.street.model._data.StreetModelForTest; + +class DurationModifierCalculatorTest { + + private static final int THIRTY_MINS_IN_SECONDS = (int) Duration.ofMinutes(30).toSeconds(); + + @Test + void calculate() { + FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> + new FlexPath(10_000, THIRTY_MINS_IN_SECONDS, () -> GeometryUtils.makeLineString(1, 1, 2, 2)); + + var mod = new DurationModifier(Duration.ofMinutes(10), 1.5f); + var calc = new DurationModifierCalculator(delegate, mod); + var path = calc.calculateFlexPath(StreetModelForTest.V1, StreetModelForTest.V2, 0, 5); + assertEquals(3300, path.durationSeconds); + } + + @Test + void nullValue() { + FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> null; + var mod = new DurationModifier(Duration.ofMinutes(10), 1.5f); + var calc = new DurationModifierCalculator(delegate, mod); + var path = calc.calculateFlexPath(StreetModelForTest.V1, StreetModelForTest.V2, 0, 5); + assertNull(path); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java new file mode 100644 index 00000000000..9bee310573b --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java @@ -0,0 +1,39 @@ +package org.opentripplanner.ext.flex.flexpathcalculator; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.time.Duration; +import java.util.List; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.locationtech.jts.geom.LineString; +import org.opentripplanner.ext.flex.trip.DurationModifier; +import org.opentripplanner.framework.geometry.GeometryUtils; + +class FlexPathTest { + + private static final int THIRTY_MINS_IN_SECONDS = (int) Duration.ofMinutes(30).toSeconds(); + private static final LineString LINE_STRING = GeometryUtils.makeLineString(1, 1, 2, 2); + private static final FlexPath PATH = new FlexPath( + 10_000, + THIRTY_MINS_IN_SECONDS, + () -> LINE_STRING + ); + + static List cases() { + return List.of( + Arguments.of(DurationModifier.NONE, THIRTY_MINS_IN_SECONDS), + Arguments.of(new DurationModifier(Duration.ofMinutes(10), 1), 2400), + Arguments.of(new DurationModifier(Duration.ofMinutes(10), 1.5f), 3300), + Arguments.of(new DurationModifier(Duration.ZERO, 3), 5400) + ); + } + + @ParameterizedTest + @MethodSource("cases") + void calculate(DurationModifier mod, int expectedSeconds) { + var modified = PATH.withDurationModifier(mod); + assertEquals(expectedSeconds, modified.durationSeconds); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index 5881bc798a8..e6cad4d3e40 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.ext.flex.trip.FlexDurationModifier; +import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; @@ -35,7 +35,7 @@ public class FlexTripsMapper { for (Trip trip : stopTimesByTrip.keys()) { /* Fetch the stop times for this trip. Copy the list since it's immutable. */ List stopTimes = new ArrayList<>(stopTimesByTrip.get(trip)); - var modifier = builder.getFlexDurationFactors().getOrDefault(trip, FlexDurationModifier.NONE); + var modifier = builder.getFlexDurationFactors().getOrDefault(trip, DurationModifier.NONE); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { result.add( UnscheduledTrip diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java similarity index 62% rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java rename to src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java index e0873fab187..643c2bb7b6f 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationFactorCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java @@ -1,15 +1,15 @@ package org.opentripplanner.ext.flex.flexpathcalculator; import javax.annotation.Nullable; -import org.opentripplanner.ext.flex.trip.FlexDurationModifier; +import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.street.model.vertex.Vertex; -public class DurationFactorCalculator implements FlexPathCalculator { +public class DurationModifierCalculator implements FlexPathCalculator { private final FlexPathCalculator delegate; - private final FlexDurationModifier factors; + private final DurationModifier factors; - public DurationFactorCalculator(FlexPathCalculator delegate, FlexDurationModifier factors) { + public DurationModifierCalculator(FlexPathCalculator delegate, DurationModifier factors) { this.delegate = delegate; this.factors = factors; } @@ -22,7 +22,7 @@ public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, i if (path == null) { return null; } else { - return path.withDurationFactors(factors); + return path.withDurationModifier(factors); } } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index 22752726ae7..54c11198b19 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java @@ -1,12 +1,14 @@ package org.opentripplanner.ext.flex.flexpathcalculator; import java.util.function.Supplier; +import javax.annotation.concurrent.Immutable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.ext.flex.trip.FlexDurationModifier; +import org.opentripplanner.ext.flex.trip.DurationModifier; /** * This class contains the results from a FlexPathCalculator. */ +@Immutable public class FlexPath { private final Supplier geometrySupplier; @@ -34,8 +36,11 @@ public LineString getGeometry() { return geometry; } - public FlexPath withDurationFactors(FlexDurationModifier factors) { - int updatedDuration = (int) ((durationSeconds * factors.factor()) + factors.offsetInSeconds()); + /** + * Returns an (immutable) copy of this path with the duration modified. + */ + public FlexPath withDurationModifier(DurationModifier mod) { + int updatedDuration = (int) ((durationSeconds * mod.factor()) + mod.offsetInSeconds()); return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationModifier.java b/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java similarity index 79% rename from src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationModifier.java rename to src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java index 60f795d7280..b9abdd843ff 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexDurationModifier.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java @@ -5,13 +5,13 @@ import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; -public class FlexDurationModifier implements Serializable { +public class DurationModifier implements Serializable { - public static FlexDurationModifier NONE = new FlexDurationModifier(Duration.ZERO, 1); + public static DurationModifier NONE = new DurationModifier(Duration.ZERO, 1); private final int offset; private final float factor; - public FlexDurationModifier(Duration offset, float factor) { + public DurationModifier(Duration offset, float factor) { if (factor < 0.1) { throw new IllegalArgumentException("Flex duration factor must not be less than 0.1"); } @@ -38,7 +38,7 @@ boolean modifies() { @Override public String toString() { return ToStringBuilder - .of(FlexDurationModifier.class) + .of(DurationModifier.class) .addNum("factor", factor) .addDurationSec("offset", offset) .toString(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 33a064e610c..553fd2959a5 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.DurationFactorCalculator; +import org.opentripplanner.ext.flex.flexpathcalculator.DurationModifierCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; @@ -45,7 +45,7 @@ public class ScheduledDeviatedTrip private final BookingInfo[] dropOffBookingInfos; private final BookingInfo[] pickupBookingInfos; - private final FlexDurationModifier durationModifier; + private final DurationModifier durationModifier; ScheduledDeviatedTrip(ScheduledDeviatedTripBuilder builder) { super(builder); @@ -133,7 +133,7 @@ private FlexPathCalculator getCalculator( stopTimes[fromIndex].timeType == FLEXIBLE_TIME || stopTimes[toIndex].timeType == FLEXIBLE_TIME; if (usesFlexWindow && durationModifier.modifies()) { - return new DurationFactorCalculator(scheduledCalculator, FlexDurationModifier.NONE); + return new DurationModifierCalculator(scheduledCalculator, durationModifier); } else { return scheduledCalculator; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java index 3a33ebd50ec..3bd89ef2e02 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java @@ -8,7 +8,7 @@ public class ScheduledDeviatedTripBuilder extends FlexTripBuilder { private List stopTimes; - private FlexDurationModifier durationModifier = FlexDurationModifier.NONE; + private DurationModifier durationModifier = DurationModifier.NONE; ScheduledDeviatedTripBuilder(FeedScopedId id) { super(id); @@ -30,11 +30,11 @@ public List stopTimes() { return stopTimes; } - public FlexDurationModifier durationModifier() { + public DurationModifier durationModifier() { return durationModifier; } - public ScheduledDeviatedTripBuilder withDurationModifier(FlexDurationModifier modifier) { + public ScheduledDeviatedTripBuilder withDurationModifier(DurationModifier modifier) { this.durationModifier = modifier; return this; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index d85c6b72c27..d8e942d0c98 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -15,7 +15,7 @@ import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.DurationFactorCalculator; +import org.opentripplanner.ext.flex.flexpathcalculator.DurationModifierCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; @@ -52,7 +52,7 @@ public class UnscheduledTrip extends FlexTrip getFlexAccessTemplates( private FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { if (durationModifier.modifies()) { - return new DurationFactorCalculator(calculator, durationModifier); + return new DurationModifierCalculator(calculator, durationModifier); } else { return calculator; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java index 7e2132ed036..7b4617048a6 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java @@ -8,7 +8,7 @@ public class UnscheduledTripBuilder extends FlexTripBuilder { private List stopTimes; - private FlexDurationModifier durationModifier = FlexDurationModifier.NONE; + private DurationModifier durationModifier = DurationModifier.NONE; UnscheduledTripBuilder(FeedScopedId id) { super(id); @@ -30,12 +30,12 @@ public List stopTimes() { return stopTimes; } - public UnscheduledTripBuilder withDurationModifier(FlexDurationModifier factors) { + public UnscheduledTripBuilder withDurationModifier(DurationModifier factors) { this.durationModifier = factors; return this; } - public FlexDurationModifier durationModifier() { + public DurationModifier durationModifier() { return durationModifier; } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index 03ef077d319..cc6e44343e6 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -5,7 +5,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.ext.flex.trip.FlexDurationModifier; +import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.timetable.Trip; @@ -18,7 +18,7 @@ class TripMapper { private final TranslationHelper translationHelper; private final Map mappedTrips = new HashMap<>(); - private final Map flexSafeDurationFactors = new HashMap<>(); + private final Map flexSafeDurationFactors = new HashMap<>(); TripMapper( RouteMapper routeMapper, @@ -45,7 +45,7 @@ Collection getMappedTrips() { /** * The map of flex duration factors per flex trip. */ - Map flexSafeDurationFactors() { + Map flexSafeDurationFactors() { return flexSafeDurationFactors; } @@ -78,16 +78,12 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { return trip; } - private Optional mapSafeDurationFactors( - org.onebusaway.gtfs.model.Trip rhs - ) { + private Optional mapSafeDurationFactors(org.onebusaway.gtfs.model.Trip rhs) { if (rhs.getSafeDurationFactor() == null && rhs.getSafeDurationOffset() == null) { return Optional.empty(); } else { var offset = Duration.ofSeconds(rhs.getSafeDurationOffset().longValue()); - return Optional.of( - new FlexDurationModifier(offset, rhs.getSafeDurationFactor().floatValue()) - ); + return Optional.of(new DurationModifier(offset, rhs.getSafeDurationFactor().floatValue())); } } } diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java index 5811fe042c3..16b7bf22388 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java @@ -8,7 +8,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.ext.flex.trip.FlexDurationModifier; +import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; @@ -94,7 +94,7 @@ public class OtpTransitServiceBuilder { private final TripStopTimes stopTimesByTrip = new TripStopTimes(); - private final Map flexDurationFactors = new HashMap<>(); + private final Map flexDurationFactors = new HashMap<>(); private final EntityById fareZonesById = new DefaultEntityById<>(); @@ -213,7 +213,7 @@ public TripStopTimes getStopTimesSortedByTrip() { return stopTimesByTrip; } - public Map getFlexDurationFactors() { + public Map getFlexDurationFactors() { return flexDurationFactors; } diff --git a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java index a386d8a27e1..ee110ab4f4f 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java @@ -20,7 +20,7 @@ public class Polygons { } ); - public static Polygon OSLO = FAC.createPolygon( + public static final Polygon OSLO = FAC.createPolygon( new Coordinate[] { Coordinates.of(59.961055202323195, 10.62535658370308), Coordinates.of(59.889009435700416, 10.62535658370308), @@ -29,7 +29,7 @@ public class Polygons { Coordinates.of(59.961055202323195, 10.62535658370308), } ); - public static Polygon OSLO_FROGNER_PARK = FAC.createPolygon( + public static final Polygon OSLO_FROGNER_PARK = FAC.createPolygon( new Coordinate[] { Coordinates.of(59.92939032560119, 10.69770054003061), Coordinates.of(59.929138466684975, 10.695210909925208), From 41b2e505dc14d981fa1c15f4ae203494a7c0a301 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 8 Apr 2024 00:03:09 +0200 Subject: [PATCH 0977/1688] Extract class for building flex stop times --- .../ext/flex/FlexStopTimesForTest.java | 49 +++++++++++++++++++ .../DurationModifierCalculatorTest.java | 4 +- .../flex/flexpathcalculator/FlexPathTest.java | 6 +-- .../ScheduledFlexPathCalculatorTest.java | 38 ++++++++++++++ .../ext/flex/trip/UnscheduledTripTest.java | 42 +++------------- .../ext/flex/FlexibleTransitLeg.java | 1 + .../_support/geometry/LineStrings.java | 9 ++++ 7 files changed, 108 insertions(+), 41 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java create mode 100644 src/test/java/org/opentripplanner/_support/geometry/LineStrings.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java new file mode 100644 index 00000000000..d76382999a2 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexStopTimesForTest.java @@ -0,0 +1,49 @@ +package org.opentripplanner.ext.flex; + +import static org.opentripplanner.model.StopTime.MISSING_VALUE; + +import org.opentripplanner._support.geometry.Polygons; +import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.model.StopTime; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.StopLocation; + +public class FlexStopTimesForTest { + + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final StopLocation AREA_STOP = TEST_MODEL.areaStopForTest("area", Polygons.BERLIN); + private static final RegularStop REGULAR_STOP = TEST_MODEL.stop("stop").build(); + + public static StopTime area(String startTime, String endTime) { + return area(AREA_STOP, endTime, startTime); + } + + public static StopTime area(StopLocation areaStop, String endTime, String startTime) { + var stopTime = new StopTime(); + stopTime.setStop(areaStop); + stopTime.setFlexWindowStart(TimeUtils.time(startTime)); + stopTime.setFlexWindowEnd(TimeUtils.time(endTime)); + return stopTime; + } + + public static StopTime regularArrival(String arrivalTime) { + return regularStopTime(TimeUtils.time(arrivalTime), MISSING_VALUE); + } + + public static StopTime regularStopTime(String arrivalTime, String departureTime) { + return regularStopTime(TimeUtils.time(arrivalTime), TimeUtils.time(departureTime)); + } + + public static StopTime regularStopTime(int arrivalTime, int departureTime) { + var stopTime = new StopTime(); + stopTime.setStop(REGULAR_STOP); + stopTime.setArrivalTime(arrivalTime); + stopTime.setDepartureTime(departureTime); + return stopTime; + } + + public static StopTime regularDeparture(String departureTime) { + return regularStopTime(MISSING_VALUE, TimeUtils.time(departureTime)); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java index fd81344893b..f610cbe09c4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java @@ -5,8 +5,8 @@ import java.time.Duration; import org.junit.jupiter.api.Test; +import org.opentripplanner._support.geometry.LineStrings; import org.opentripplanner.ext.flex.trip.DurationModifier; -import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.street.model._data.StreetModelForTest; class DurationModifierCalculatorTest { @@ -16,7 +16,7 @@ class DurationModifierCalculatorTest { @Test void calculate() { FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> - new FlexPath(10_000, THIRTY_MINS_IN_SECONDS, () -> GeometryUtils.makeLineString(1, 1, 2, 2)); + new FlexPath(10_000, THIRTY_MINS_IN_SECONDS, () -> LineStrings.SIMPLE); var mod = new DurationModifier(Duration.ofMinutes(10), 1.5f); var calc = new DurationModifierCalculator(delegate, mod); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java index 9bee310573b..6a4c79ca2cc 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java @@ -7,18 +7,16 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.locationtech.jts.geom.LineString; +import org.opentripplanner._support.geometry.LineStrings; import org.opentripplanner.ext.flex.trip.DurationModifier; -import org.opentripplanner.framework.geometry.GeometryUtils; class FlexPathTest { private static final int THIRTY_MINS_IN_SECONDS = (int) Duration.ofMinutes(30).toSeconds(); - private static final LineString LINE_STRING = GeometryUtils.makeLineString(1, 1, 2, 2); private static final FlexPath PATH = new FlexPath( 10_000, THIRTY_MINS_IN_SECONDS, - () -> LINE_STRING + () -> LineStrings.SIMPLE ); static List cases() { diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java new file mode 100644 index 00000000000..70f39af2420 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java @@ -0,0 +1,38 @@ +package org.opentripplanner.ext.flex.flexpathcalculator; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.ext.flex.FlexStopTimesForTest.area; +import static org.opentripplanner.ext.flex.FlexStopTimesForTest.regularStopTime; +import static org.opentripplanner.street.model._data.StreetModelForTest.V1; +import static org.opentripplanner.street.model._data.StreetModelForTest.V2; +import static org.opentripplanner.transit.model._data.TransitModelForTest.id; + +import java.time.Duration; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner._support.geometry.LineStrings; +import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; + +class ScheduledFlexPathCalculatorTest { + + private static final ScheduledDeviatedTrip TRIP = ScheduledDeviatedTrip + .of(id("123")) + .withStopTimes( + List.of( + regularStopTime("10:00", "10:01"), + area("10:10", "10:20"), + regularStopTime("10:25", "10:26"), + area("10:40", "10:50") + ) + ) + .build(); + + @Test + void calculateTime() { + var c = (FlexPathCalculator) (fromv, tov, fromStopIndex, toStopIndex) -> + new FlexPath(10_000, (int) Duration.ofMinutes(10).toSeconds(), () -> LineStrings.SIMPLE); + var calc = new ScheduledFlexPathCalculator(c, TRIP); + var path = calc.calculateFlexPath(V1, V2, 0, 1); + assertEquals(Duration.ofMinutes(19), Duration.ofSeconds(path.durationSeconds)); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index fabe534ff23..bfcd9bad565 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.ext.flex.FlexStopTimesForTest.area; import static org.opentripplanner.ext.flex.trip.UnscheduledTrip.isUnscheduledTrip; import static org.opentripplanner.ext.flex.trip.UnscheduledTripTest.TestCase.tc; import static org.opentripplanner.model.PickDrop.NONE; @@ -22,6 +23,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.ext.flex.FlexServiceDate; +import org.opentripplanner.ext.flex.FlexStopTimesForTest; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; @@ -48,11 +50,10 @@ class UnscheduledTripTest { private static final int T15_00 = TimeUtils.hm2time(15, 0); private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final StopLocation AREA_STOP = TEST_MODEL.areaStopForTest("area", Polygons.BERLIN); private static final RegularStop REGULAR_STOP = TEST_MODEL.stop("stop").build(); - private static final StopLocation AREA_STOP = TEST_MODEL.areaStopForTest("area", Polygons.BERLIN); - @Nested class IsUnscheduledTrip { @@ -196,7 +197,7 @@ void testUnscheduledFeederTripToScheduledStop() { static Stream testRegularStopToAreaEarliestDepartureTimeTestCases() { // REGULAR-STOP to AREA - (10:00-14:00) => (14:00) - var tc = tc(regularDeparture("10:00"), area("10:00", "14:00")); + var tc = tc(FlexStopTimesForTest.regularDeparture("10:00"), area("10:00", "14:00")); return Stream.of( tc .expected("Requested departure time is before flex service departure time", "10:00") @@ -245,7 +246,7 @@ void testRegularStopToAreaEarliestDepartureTime(TestCase tc) { static Stream testAreaToRegularStopEarliestDepartureTestCases() { // AREA TO REGULAR-STOP - (10:00-14:00) => (14:00) - var tc = tc(area("10:00", "14:00"), regularArrival("14:00")); + var tc = tc(area("10:00", "14:00"), FlexStopTimesForTest.regularArrival("14:00")); return Stream.of( tc .expected( @@ -366,7 +367,7 @@ void testAreaToAreaEarliestDepartureTime(TestCase tc) { static Stream testRegularStopToAreaLatestArrivalTimeTestCases() { // REGULAR-STOP to AREA - (10:00-14:00) => (14:00) - var tc = tc(regularDeparture("10:00"), area("10:00", "14:00")); + var tc = tc(FlexStopTimesForTest.regularDeparture("10:00"), area("10:00", "14:00")); return Stream.of( tc .expectedNotFound("Requested arrival time is before flex service arrival window start") @@ -421,7 +422,7 @@ void testRegularStopToAreaLatestArrivalTime(TestCase tc) { static Stream testAreaToRegularStopLatestArrivalTimeTestCases() { // AREA TO REGULAR-STOP - (10:00-14:00) => (14:00) - var tc = tc(area("10:00", "14:00"), regularArrival("14:00")); + var tc = tc(area("10:00", "14:00"), FlexStopTimesForTest.regularArrival("14:00")); return Stream.of( tc .expectedNotFound("Requested arrival time is before flex service arrival window start") @@ -661,35 +662,6 @@ private static String timeToString(int time) { return TimeUtils.timeToStrCompact(time, MISSING_VALUE, "MISSING_VALUE"); } - private static StopTime area(String startTime, String endTime) { - return area(AREA_STOP, endTime, startTime); - } - - @Nonnull - private static StopTime area(StopLocation areaStop, String endTime, String startTime) { - var stopTime = new StopTime(); - stopTime.setStop(areaStop); - stopTime.setFlexWindowStart(TimeUtils.time(startTime)); - stopTime.setFlexWindowEnd(TimeUtils.time(endTime)); - return stopTime; - } - - private static StopTime regularDeparture(String departureTime) { - return regularStopTime(MISSING_VALUE, TimeUtils.time(departureTime)); - } - - private static StopTime regularArrival(String arrivalTime) { - return regularStopTime(TimeUtils.time(arrivalTime), MISSING_VALUE); - } - - private static StopTime regularStopTime(int arrivalTime, int departureTime) { - var stopTime = new StopTime(); - stopTime.setStop(REGULAR_STOP); - stopTime.setArrivalTime(arrivalTime); - stopTime.setDepartureTime(departureTime); - return stopTime; - } - @Nonnull private static NearbyStop nearbyStop(AreaStop stop) { return new NearbyStop(stop, 1000, List.of(), null); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index fac1118556f..b9e10e29214 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -196,6 +196,7 @@ public int getGeneralizedCost() { return generalizedCost; } + @Override public void addAlert(TransitAlert alert) { transitAlerts.add(alert); } diff --git a/src/test/java/org/opentripplanner/_support/geometry/LineStrings.java b/src/test/java/org/opentripplanner/_support/geometry/LineStrings.java new file mode 100644 index 00000000000..515f161be92 --- /dev/null +++ b/src/test/java/org/opentripplanner/_support/geometry/LineStrings.java @@ -0,0 +1,9 @@ +package org.opentripplanner._support.geometry; + +import org.locationtech.jts.geom.LineString; +import org.opentripplanner.framework.geometry.GeometryUtils; + +public class LineStrings { + + public static final LineString SIMPLE = GeometryUtils.makeLineString(0, 0, 1, 1); +} From dec30cd3c95d788e2bb7691ec2ae73c611adcc00 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Apr 2024 09:57:06 +0200 Subject: [PATCH 0978/1688] Remove durationModifier to ScheduledDeviatedTrip --- .../ext/flex/FlexTripsMapper.java | 3 +-- .../ext/flex/trip/ScheduledDeviatedTrip.java | 27 ++----------------- .../trip/ScheduledDeviatedTripBuilder.java | 10 ------- 3 files changed, 3 insertions(+), 37 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index e6cad4d3e40..b4123a3b556 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -35,8 +35,8 @@ public class FlexTripsMapper { for (Trip trip : stopTimesByTrip.keys()) { /* Fetch the stop times for this trip. Copy the list since it's immutable. */ List stopTimes = new ArrayList<>(stopTimesByTrip.get(trip)); - var modifier = builder.getFlexDurationFactors().getOrDefault(trip, DurationModifier.NONE); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { + var modifier = builder.getFlexDurationFactors().getOrDefault(trip, DurationModifier.NONE); result.add( UnscheduledTrip .of(trip.getId()) @@ -51,7 +51,6 @@ public class FlexTripsMapper { .of(trip.getId()) .withTrip(trip) .withStopTimes(stopTimes) - .withDurationModifier(modifier) .build() ); } else if (hasContinuousStops(stopTimes) && FlexTrip.containsFlexStops(stopTimes)) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 553fd2959a5..84982c837dc 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -17,7 +17,6 @@ import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.DurationModifierCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; @@ -45,8 +44,6 @@ public class ScheduledDeviatedTrip private final BookingInfo[] dropOffBookingInfos; private final BookingInfo[] pickupBookingInfos; - private final DurationModifier durationModifier; - ScheduledDeviatedTrip(ScheduledDeviatedTripBuilder builder) { super(builder); List stopTimes = builder.stopTimes(); @@ -64,7 +61,6 @@ public class ScheduledDeviatedTrip this.dropOffBookingInfos[i] = stopTimes.get(i).getDropOffBookingInfo(); this.pickupBookingInfos[i] = stopTimes.get(i).getPickupBookingInfo(); } - this.durationModifier = builder.durationModifier(); } public static ScheduledDeviatedTripBuilder of(FeedScopedId id) { @@ -110,7 +106,7 @@ public Stream getFlexAccessTemplates( toIndex, stop, date, - getCalculator(fromIndex, toIndex, scheduledCalculator), + scheduledCalculator, config ) ); @@ -120,25 +116,6 @@ public Stream getFlexAccessTemplates( return res.stream(); } - /** - * If any of the stops involved in the path computation, then apply the duration factors. - * If both from and to have a fixed time, then don't apply the factors. - */ - private FlexPathCalculator getCalculator( - int fromIndex, - int toIndex, - FlexPathCalculator scheduledCalculator - ) { - final boolean usesFlexWindow = - stopTimes[fromIndex].timeType == FLEXIBLE_TIME || - stopTimes[toIndex].timeType == FLEXIBLE_TIME; - if (usesFlexWindow && durationModifier.modifies()) { - return new DurationModifierCalculator(scheduledCalculator, durationModifier); - } else { - return scheduledCalculator; - } - } - @Override public Stream getFlexEgressTemplates( NearbyStop egress, @@ -169,7 +146,7 @@ public Stream getFlexEgressTemplates( toIndex, stop, date, - getCalculator(fromIndex, toIndex, scheduledCalculator), + scheduledCalculator, config ) ); diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java index 3bd89ef2e02..4033bbe7c59 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripBuilder.java @@ -8,7 +8,6 @@ public class ScheduledDeviatedTripBuilder extends FlexTripBuilder { private List stopTimes; - private DurationModifier durationModifier = DurationModifier.NONE; ScheduledDeviatedTripBuilder(FeedScopedId id) { super(id); @@ -30,15 +29,6 @@ public List stopTimes() { return stopTimes; } - public DurationModifier durationModifier() { - return durationModifier; - } - - public ScheduledDeviatedTripBuilder withDurationModifier(DurationModifier modifier) { - this.durationModifier = modifier; - return this; - } - @Override ScheduledDeviatedTripBuilder instance() { return this; From 354c96839897497b91615971e40775b5d3e3fafa Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Apr 2024 12:37:01 +0200 Subject: [PATCH 0979/1688] Add test and docs for DurationModifier --- .../ext/flex/trip/DurationModifierTest.java | 20 +++++++++++++++++++ .../ext/flex/trip/DurationModifier.java | 7 +++++++ 2 files changed, 27 insertions(+) create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java new file mode 100644 index 00000000000..c6f4e75f7c5 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java @@ -0,0 +1,20 @@ +package org.opentripplanner.ext.flex.trip; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.time.Duration; +import org.junit.jupiter.api.Test; + +class DurationModifierTest { + + @Test + void doesNotModify() { + assertFalse(DurationModifier.NONE.modifies()); + } + + @Test + void modifies() { + assertTrue(new DurationModifier(Duration.ofMinutes(1), 1.5f).modifies()); + } +} \ No newline at end of file diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java b/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java index b9abdd843ff..4832a7cc9bc 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java @@ -5,12 +5,19 @@ import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; +/** + * A modifier to influence the A*-calculated driving time of flex trips. + */ public class DurationModifier implements Serializable { public static DurationModifier NONE = new DurationModifier(Duration.ZERO, 1); private final int offset; private final float factor; + /** + * @param offset A fixed offset to add to the driving time. + * @param factor A factor to multiply the driving time with. + */ public DurationModifier(Duration offset, float factor) { if (factor < 0.1) { throw new IllegalArgumentException("Flex duration factor must not be less than 0.1"); From 991406ed25845660bd0a25e972e86c66227b7409 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 9 Apr 2024 13:42:44 +0200 Subject: [PATCH 0980/1688] Cleanup, tests and documentation --- doc-templates/Flex.md | 4 +- docs/sandbox/Flex.md | 4 +- .../flex/flexpathcalculator/FlexPathTest.java | 1 + .../ext/flex/trip/DurationModifierTest.java | 2 +- .../trip/UnscheduledDrivingDurationTest.java | 44 ++++++++++++++++++ .../ext/flex/trip/UnscheduledTripTest.java | 11 ++--- .../ext/flex/FlexTripsMapper.java | 6 +-- .../DurationModifierCalculator.java | 4 ++ .../ext/flex/trip/ScheduledDeviatedTrip.java | 10 ----- .../ext/flex/trip/UnscheduledTrip.java | 6 ++- .../GTFSToOtpTransitServiceMapper.java | 2 +- .../gtfs/mapping/TripMapper.java | 10 ++--- .../gtfs/mapping/TripMapperTest.java | 45 ++++++++++++++----- 13 files changed, 107 insertions(+), 42 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java diff --git a/doc-templates/Flex.md b/doc-templates/Flex.md index 2015e898cae..50512f66133 100644 --- a/doc-templates/Flex.md +++ b/doc-templates/Flex.md @@ -10,8 +10,8 @@ To enable this turn on `FlexRouting` as a feature in `otp-config.json`. -The GTFS feeds should conform to the -[GTFS-Flex v2 draft PR](https://github.com/google/transit/pull/388) +The GTFS feeds must conform to the final, approved version of the draft which has been +merged into the [mainline specification](https://gtfs.org/schedule/reference/) in March 2024. ## Configuration diff --git a/docs/sandbox/Flex.md b/docs/sandbox/Flex.md index 61d15851a56..277e4e617f2 100644 --- a/docs/sandbox/Flex.md +++ b/docs/sandbox/Flex.md @@ -10,8 +10,8 @@ To enable this turn on `FlexRouting` as a feature in `otp-config.json`. -The GTFS feeds should conform to the -[GTFS-Flex v2 draft PR](https://github.com/google/transit/pull/388) +The GTFS feeds must conform to the final, approved version of the draft which has been +merged into the [mainline specification](https://gtfs.org/schedule/reference/) in March 2024. ## Configuration diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java index 6a4c79ca2cc..b79093e26c5 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java @@ -33,5 +33,6 @@ static List cases() { void calculate(DurationModifier mod, int expectedSeconds) { var modified = PATH.withDurationModifier(mod); assertEquals(expectedSeconds, modified.durationSeconds); + assertEquals(LineStrings.SIMPLE, modified.getGeometry()); } } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java index c6f4e75f7c5..05fb9965935 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java @@ -17,4 +17,4 @@ void doesNotModify() { void modifies() { assertTrue(new DurationModifier(Duration.ofMinutes(1), 1.5f).modifies()); } -} \ No newline at end of file +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java new file mode 100644 index 00000000000..45d8c5be624 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java @@ -0,0 +1,44 @@ +package org.opentripplanner.ext.flex.trip; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.street.model._data.StreetModelForTest.V1; +import static org.opentripplanner.street.model._data.StreetModelForTest.V2; +import static org.opentripplanner.transit.model._data.TransitModelForTest.id; + +import java.time.Duration; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner._support.geometry.LineStrings; +import org.opentripplanner.ext.flex.FlexStopTimesForTest; +import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; +import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; +import org.opentripplanner.model.StopTime; + +class UnscheduledDrivingDurationTest { + + static final FlexPathCalculator STATIC_CALCULATOR = (fromv, tov, fromStopIndex, toStopIndex) -> + new FlexPath(10_000, (int) Duration.ofMinutes(10).toSeconds(), () -> LineStrings.SIMPLE); + private static final StopTime STOP_TIME = FlexStopTimesForTest.area("10:00", "18:00"); + + @Test + void noModifier() { + var trip = UnscheduledTrip.of(id("1")).withStopTimes(List.of(STOP_TIME)).build(); + + var calculator = trip.flexPathCalculator(STATIC_CALCULATOR); + var path = calculator.calculateFlexPath(V1, V2, 0, 0); + assertEquals(600, path.durationSeconds); + } + + @Test + void withModifier() { + var trip = UnscheduledTrip + .of(id("1")) + .withStopTimes(List.of(STOP_TIME)) + .withDurationModifier(new DurationModifier(Duration.ofMinutes(2), 1.5f)) + .build(); + + var calculator = trip.flexPathCalculator(STATIC_CALCULATOR); + var path = calculator.calculateFlexPath(V1, V2, 0, 0); + assertEquals(1020, path.durationSeconds); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index bfcd9bad565..80bda31fabf 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.ext.flex.FlexStopTimesForTest.area; +import static org.opentripplanner.ext.flex.FlexStopTimesForTest.regularArrival; +import static org.opentripplanner.ext.flex.FlexStopTimesForTest.regularDeparture; import static org.opentripplanner.ext.flex.trip.UnscheduledTrip.isUnscheduledTrip; import static org.opentripplanner.ext.flex.trip.UnscheduledTripTest.TestCase.tc; import static org.opentripplanner.model.PickDrop.NONE; @@ -23,7 +25,6 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.FlexStopTimesForTest; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; @@ -197,7 +198,7 @@ void testUnscheduledFeederTripToScheduledStop() { static Stream testRegularStopToAreaEarliestDepartureTimeTestCases() { // REGULAR-STOP to AREA - (10:00-14:00) => (14:00) - var tc = tc(FlexStopTimesForTest.regularDeparture("10:00"), area("10:00", "14:00")); + var tc = tc(regularDeparture("10:00"), area("10:00", "14:00")); return Stream.of( tc .expected("Requested departure time is before flex service departure time", "10:00") @@ -246,7 +247,7 @@ void testRegularStopToAreaEarliestDepartureTime(TestCase tc) { static Stream testAreaToRegularStopEarliestDepartureTestCases() { // AREA TO REGULAR-STOP - (10:00-14:00) => (14:00) - var tc = tc(area("10:00", "14:00"), FlexStopTimesForTest.regularArrival("14:00")); + var tc = tc(area("10:00", "14:00"), regularArrival("14:00")); return Stream.of( tc .expected( @@ -367,7 +368,7 @@ void testAreaToAreaEarliestDepartureTime(TestCase tc) { static Stream testRegularStopToAreaLatestArrivalTimeTestCases() { // REGULAR-STOP to AREA - (10:00-14:00) => (14:00) - var tc = tc(FlexStopTimesForTest.regularDeparture("10:00"), area("10:00", "14:00")); + var tc = tc(regularDeparture("10:00"), area("10:00", "14:00")); return Stream.of( tc .expectedNotFound("Requested arrival time is before flex service arrival window start") @@ -422,7 +423,7 @@ void testRegularStopToAreaLatestArrivalTime(TestCase tc) { static Stream testAreaToRegularStopLatestArrivalTimeTestCases() { // AREA TO REGULAR-STOP - (10:00-14:00) => (14:00) - var tc = tc(area("10:00", "14:00"), FlexStopTimesForTest.regularArrival("14:00")); + var tc = tc(area("10:00", "14:00"), regularArrival("14:00")); return Stream.of( tc .expectedNotFound("Requested arrival time is before flex service arrival window start") diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index b4123a3b556..bb2ed2764f6 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -47,11 +47,7 @@ public class FlexTripsMapper { ); } else if (ScheduledDeviatedTrip.isScheduledFlexTrip(stopTimes)) { result.add( - ScheduledDeviatedTrip - .of(trip.getId()) - .withTrip(trip) - .withStopTimes(stopTimes) - .build() + ScheduledDeviatedTrip.of(trip.getId()).withTrip(trip).withStopTimes(stopTimes).build() ); } else if (hasContinuousStops(stopTimes) && FlexTrip.containsFlexStops(stopTimes)) { store.add( diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java index 643c2bb7b6f..158e6a933c7 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java @@ -4,6 +4,10 @@ import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.street.model.vertex.Vertex; +/** + * A calculator to delegates the main computation to another instance and applies a duration + * modifier afterward. + */ public class DurationModifierCalculator implements FlexPathCalculator { private final FlexPathCalculator delegate; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 84982c837dc..0026d98c964 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -1,7 +1,5 @@ package org.opentripplanner.ext.flex.trip; -import static org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip.TimeType.FIXED_TIME; -import static org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip.TimeType.FLEXIBLE_TIME; import static org.opentripplanner.model.PickDrop.NONE; import static org.opentripplanner.model.StopTime.MISSING_VALUE; @@ -299,13 +297,10 @@ private static class ScheduledDeviatedStopTime implements Serializable { private final int arrivalTime; private final PickDrop pickupType; private final PickDrop dropOffType; - private final TimeType timeType; private ScheduledDeviatedStopTime(StopTime st) { this.stop = st.getStop(); - this.timeType = st.hasFlexWindow() ? FLEXIBLE_TIME : FIXED_TIME; - // Store the time the user is guaranteed to arrive at latest this.arrivalTime = st.getLatestPossibleArrivalTime(); // Store the time the user needs to be ready for pickup @@ -320,9 +315,4 @@ private ScheduledDeviatedStopTime(StopTime st) { this.dropOffType = arrivalTime == MISSING_VALUE ? PickDrop.NONE : st.getDropOffType(); } } - - enum TimeType { - FIXED_TIME, - FLEXIBLE_TIME, - } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index d8e942d0c98..bc3bd52cc4c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -149,7 +149,11 @@ public Stream getFlexAccessTemplates( ); } - private FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { + /** + * Get the correct {@link FlexPathCalculator} depending on the {@code durationModified}. + * If the modifier doesn't actually modify, we don't + */ + protected FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { if (durationModifier.modifies()) { return new DurationModifierCalculator(calculator, durationModifier); } else { diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index 4ee1cdcf1d7..24db367f829 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -171,7 +171,7 @@ public void mapStopTripAndRouteDataIntoBuilder() { builder.getPathways().addAll(pathwayMapper.map(data.getAllPathways())); builder.getStopTimesSortedByTrip().addAll(stopTimeMapper.map(data.getAllStopTimes())); - builder.getFlexDurationFactors().putAll(tripMapper.flexSafeDurationFactors()); + builder.getFlexDurationFactors().putAll(tripMapper.flexSafeDurationModifiers()); builder.getTripsById().addAll(tripMapper.map(data.getAllTrips())); fareRulesBuilder.fareAttributes().addAll(fareAttributeMapper.map(data.getAllFareAttributes())); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index cc6e44343e6..ec7d1379ca0 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -18,7 +18,7 @@ class TripMapper { private final TranslationHelper translationHelper; private final Map mappedTrips = new HashMap<>(); - private final Map flexSafeDurationFactors = new HashMap<>(); + private final Map flexSafeDurationModifiers = new HashMap<>(); TripMapper( RouteMapper routeMapper, @@ -45,8 +45,8 @@ Collection getMappedTrips() { /** * The map of flex duration factors per flex trip. */ - Map flexSafeDurationFactors() { - return flexSafeDurationFactors; + Map flexSafeDurationModifiers() { + return flexSafeDurationModifiers; } private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { @@ -74,11 +74,11 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { lhs.withGtfsFareId(rhs.getFareId()); var trip = lhs.build(); - mapSafeDurationFactors(rhs).ifPresent(f -> flexSafeDurationFactors.put(trip, f)); + mapSafeDurationModifier(rhs).ifPresent(f -> flexSafeDurationModifiers.put(trip, f)); return trip; } - private Optional mapSafeDurationFactors(org.onebusaway.gtfs.model.Trip rhs) { + private Optional mapSafeDurationModifier(org.onebusaway.gtfs.model.Trip rhs) { if (rhs.getSafeDurationFactor() == null && rhs.getSafeDurationOffset() == null) { return Optional.empty(); } else { diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java index 4f0c70f22d2..141c1d5bf6b 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java @@ -33,11 +33,15 @@ public class TripMapperTest { public static final DataImportIssueStore ISSUE_STORE = DataImportIssueStore.NOOP; - private final TripMapper subject = new TripMapper( - new RouteMapper(new AgencyMapper(FEED_ID), ISSUE_STORE, new TranslationHelper()), - new DirectionMapper(ISSUE_STORE), - new TranslationHelper() - ); + private final TripMapper subject = defaultTripMapper(); + + private static TripMapper defaultTripMapper() { + return new TripMapper( + new RouteMapper(new AgencyMapper(FEED_ID), ISSUE_STORE, new TranslationHelper()), + new DirectionMapper(ISSUE_STORE), + new TranslationHelper() + ); + } static { GtfsTestData data = new GtfsTestData(); @@ -56,14 +60,14 @@ public class TripMapperTest { } @Test - public void testMapCollection() throws Exception { + void testMapCollection() throws Exception { assertNull(subject.map((Collection) null)); assertTrue(subject.map(Collections.emptyList()).isEmpty()); assertEquals(1, subject.map(Collections.singleton(TRIP)).size()); } @Test - public void testMap() throws Exception { + void testMap() throws Exception { org.opentripplanner.transit.model.timetable.Trip result = subject.map(TRIP); assertEquals("A:1", result.getId().toString()); @@ -80,7 +84,7 @@ public void testMap() throws Exception { } @Test - public void testMapWithNulls() throws Exception { + void testMapWithNulls() throws Exception { Trip input = new Trip(); input.setId(AGENCY_AND_ID); input.setRoute(new GtfsTestData().route); @@ -101,12 +105,33 @@ public void testMapWithNulls() throws Exception { assertEquals(BikeAccess.UNKNOWN, result.getBikesAllowed()); } - /** Mapping the same object twice, should return the the same instance. */ + /** Mapping the same object twice, should return the same instance. */ @Test - public void testMapCache() throws Exception { + void testMapCache() throws Exception { org.opentripplanner.transit.model.timetable.Trip result1 = subject.map(TRIP); org.opentripplanner.transit.model.timetable.Trip result2 = subject.map(TRIP); assertSame(result1, result2); } + + @Test + void noFlexDurationModifier() { + var mapper = defaultTripMapper(); + mapper.map(TRIP); + assertTrue(mapper.flexSafeDurationModifiers().isEmpty()); + } + + @Test + void flexDurationModifier() { + var flexTrip = new Trip(); + flexTrip.setId(new AgencyAndId("1", "1")); + flexTrip.setSafeDurationFactor(1.5); + flexTrip.setSafeDurationOffset(600d); + flexTrip.setRoute(new GtfsTestData().route); + var mapper = defaultTripMapper(); + var mapped = mapper.map(flexTrip); + var mod = mapper.flexSafeDurationModifiers().get(mapped); + assertEquals(1.5f, mod.factor()); + assertEquals(600, mod.offsetInSeconds()); + } } From 591296b9d7d9b900e016e7dccc67cb9ee5119a66 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 01:20:50 +0000 Subject: [PATCH 0981/1688] Update Debug UI dependencies (non-major) --- client-next/package-lock.json | 251 ++++++++++++++++------------------ client-next/package.json | 16 +-- 2 files changed, 123 insertions(+), 144 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 6ac0e07e20f..08a9146ceb1 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -24,12 +24,12 @@ "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "15.0.2", - "@types/react": "18.2.73", - "@types/react-dom": "18.2.23", - "@typescript-eslint/eslint-plugin": "7.5.0", - "@typescript-eslint/parser": "7.5.0", + "@types/react": "18.2.79", + "@types/react-dom": "18.2.25", + "@typescript-eslint/eslint-plugin": "7.7.0", + "@typescript-eslint/parser": "7.7.0", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.4.0", + "@vitest/coverage-v8": "1.5.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", @@ -39,9 +39,9 @@ "eslint-plugin-react-refresh": "0.4.6", "jsdom": "24.0.0", "prettier": "3.2.5", - "typescript": "5.4.3", - "vite": "5.2.7", - "vitest": "1.4.0" + "typescript": "5.4.5", + "vite": "5.2.8", + "vitest": "1.5.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -3455,12 +3455,6 @@ "@types/geojson": "*" } }, - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz", - "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==", - "dev": true - }, "node_modules/@types/js-yaml": { "version": "4.0.9", "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz", @@ -3528,18 +3522,18 @@ "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/react": { - "version": "18.2.73", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.73.tgz", - "integrity": "sha512-XcGdod0Jjv84HOC7N5ziY3x+qL0AfmubvKOZ9hJjJ2yd5EE+KYjWhdOjt387e9HPheHkdggF9atTifMRtyAaRA==", + "version": "18.2.79", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz", + "integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==", "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" } }, "node_modules/@types/react-dom": { - "version": "18.2.23", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.23.tgz", - "integrity": "sha512-ZQ71wgGOTmDYpnav2knkjr3qXdAFu0vsk8Ci5w3pGAIdj7/kKAyn+VsQDhXsmzzzepAiI9leWMmubXz690AI/A==", + "version": "18.2.25", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz", + "integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==", "dev": true, "dependencies": { "@types/react": "*" @@ -3582,22 +3576,22 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.5.0.tgz", - "integrity": "sha512-HpqNTH8Du34nLxbKgVMGljZMG0rJd2O9ecvr2QLYp+7512ty1j42KnsFwspPXg1Vh8an9YImf6CokUBltisZFQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz", + "integrity": "sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==", "dev": true, "dependencies": { - "@eslint-community/regexpp": "^4.5.1", - "@typescript-eslint/scope-manager": "7.5.0", - "@typescript-eslint/type-utils": "7.5.0", - "@typescript-eslint/utils": "7.5.0", - "@typescript-eslint/visitor-keys": "7.5.0", + "@eslint-community/regexpp": "^4.10.0", + "@typescript-eslint/scope-manager": "7.7.0", + "@typescript-eslint/type-utils": "7.7.0", + "@typescript-eslint/utils": "7.7.0", + "@typescript-eslint/visitor-keys": "7.7.0", "debug": "^4.3.4", "graphemer": "^1.4.0", - "ignore": "^5.2.4", + "ignore": "^5.3.1", "natural-compare": "^1.4.0", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3650,15 +3644,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.5.0.tgz", - "integrity": "sha512-cj+XGhNujfD2/wzR1tabNsidnYRaFfEkcULdcIyVBYcXjBvBKOes+mpMBP7hMpOyk+gBcfXsrg4NBGAStQyxjQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.0.tgz", + "integrity": "sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.5.0", - "@typescript-eslint/types": "7.5.0", - "@typescript-eslint/typescript-estree": "7.5.0", - "@typescript-eslint/visitor-keys": "7.5.0", + "@typescript-eslint/scope-manager": "7.7.0", + "@typescript-eslint/types": "7.7.0", + "@typescript-eslint/typescript-estree": "7.7.0", + "@typescript-eslint/visitor-keys": "7.7.0", "debug": "^4.3.4" }, "engines": { @@ -3678,13 +3672,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.5.0.tgz", - "integrity": "sha512-Z1r7uJY0MDeUlql9XJ6kRVgk/sP11sr3HKXn268HZyqL7i4cEfrdFuSSY/0tUqT37l5zT0tJOsuDP16kio85iA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz", + "integrity": "sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.5.0", - "@typescript-eslint/visitor-keys": "7.5.0" + "@typescript-eslint/types": "7.7.0", + "@typescript-eslint/visitor-keys": "7.7.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3695,15 +3689,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.5.0.tgz", - "integrity": "sha512-A021Rj33+G8mx2Dqh0nMO9GyjjIBK3MqgVgZ2qlKf6CJy51wY/lkkFqq3TqqnH34XyAHUkq27IjlUkWlQRpLHw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz", + "integrity": "sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.5.0", - "@typescript-eslint/utils": "7.5.0", + "@typescript-eslint/typescript-estree": "7.7.0", + "@typescript-eslint/utils": "7.7.0", "debug": "^4.3.4", - "ts-api-utils": "^1.0.1" + "ts-api-utils": "^1.3.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3722,9 +3716,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.5.0.tgz", - "integrity": "sha512-tv5B4IHeAdhR7uS4+bf8Ov3k793VEVHd45viRRkehIUZxm0WF82VPiLgHzA/Xl4TGPg1ZD49vfxBKFPecD5/mg==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.0.tgz", + "integrity": "sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==", "dev": true, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3735,19 +3729,19 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.5.0.tgz", - "integrity": "sha512-YklQQfe0Rv2PZEueLTUffiQGKQneiIEKKnfIqPIOxgM9lKSZFCjT5Ad4VqRKj/U4+kQE3fa8YQpskViL7WjdPQ==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz", + "integrity": "sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.5.0", - "@typescript-eslint/visitor-keys": "7.5.0", + "@typescript-eslint/types": "7.7.0", + "@typescript-eslint/visitor-keys": "7.7.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", - "minimatch": "9.0.3", - "semver": "^7.5.4", - "ts-api-utils": "^1.0.1" + "minimatch": "^9.0.4", + "semver": "^7.6.0", + "ts-api-utils": "^1.3.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3796,18 +3790,18 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.5.0.tgz", - "integrity": "sha512-3vZl9u0R+/FLQcpy2EHyRGNqAS/ofJ3Ji8aebilfJe+fobK8+LbIFmrHciLVDxjDoONmufDcnVSF38KwMEOjzw==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.0.tgz", + "integrity": "sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.12", - "@types/semver": "^7.5.0", - "@typescript-eslint/scope-manager": "7.5.0", - "@typescript-eslint/types": "7.5.0", - "@typescript-eslint/typescript-estree": "7.5.0", - "semver": "^7.5.4" + "@types/json-schema": "^7.0.15", + "@types/semver": "^7.5.8", + "@typescript-eslint/scope-manager": "7.7.0", + "@typescript-eslint/types": "7.7.0", + "@typescript-eslint/typescript-estree": "7.7.0", + "semver": "^7.6.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3854,13 +3848,13 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.5.0.tgz", - "integrity": "sha512-mcuHM/QircmA6O7fy6nn2w/3ditQkj+SgtOc8DW3uQ10Yfj42amm2i+6F2K4YAOPNNTmE6iM1ynM6lrSwdendA==", + "version": "7.7.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz", + "integrity": "sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.5.0", - "eslint-visitor-keys": "^3.4.1" + "@typescript-eslint/types": "7.7.0", + "eslint-visitor-keys": "^3.4.3" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3896,9 +3890,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.4.0.tgz", - "integrity": "sha512-4hDGyH1SvKpgZnIByr9LhGgCEuF9DKM34IBLCC/fVfy24Z3+PZ+Ii9hsVBsHvY1umM1aGPEjceRkzxCfcQ10wg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.5.0.tgz", + "integrity": "sha512-1igVwlcqw1QUMdfcMlzzY4coikSIBN944pkueGi0pawrX5I5Z+9hxdTR+w3Sg6Q3eZhvdMAs8ZaF9JuTG1uYOQ==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.1", @@ -3913,24 +3907,23 @@ "picocolors": "^1.0.0", "std-env": "^3.5.0", "strip-literal": "^2.0.0", - "test-exclude": "^6.0.0", - "v8-to-istanbul": "^9.2.0" + "test-exclude": "^6.0.0" }, "funding": { "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "1.4.0" + "vitest": "1.5.0" } }, "node_modules/@vitest/expect": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.4.0.tgz", - "integrity": "sha512-Jths0sWCJZ8BxjKe+p+eKsoqev1/T8lYcrjavEaz8auEJ4jAVY0GwW3JKmdVU4mmNPLPHixh4GNXP7GFtAiDHA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.0.tgz", + "integrity": "sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==", "dev": true, "dependencies": { - "@vitest/spy": "1.4.0", - "@vitest/utils": "1.4.0", + "@vitest/spy": "1.5.0", + "@vitest/utils": "1.5.0", "chai": "^4.3.10" }, "funding": { @@ -3938,12 +3931,12 @@ } }, "node_modules/@vitest/runner": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.4.0.tgz", - "integrity": "sha512-EDYVSmesqlQ4RD2VvWo3hQgTJ7ZrFQ2VSJdfiJiArkCerDAGeyF1i6dHkmySqk573jLp6d/cfqCN+7wUB5tLgg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.0.tgz", + "integrity": "sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==", "dev": true, "dependencies": { - "@vitest/utils": "1.4.0", + "@vitest/utils": "1.5.0", "p-limit": "^5.0.0", "pathe": "^1.1.1" }, @@ -3979,9 +3972,9 @@ } }, "node_modules/@vitest/snapshot": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.4.0.tgz", - "integrity": "sha512-saAFnt5pPIA5qDGxOHxJ/XxhMFKkUSBJmVt5VgDsAqPTX6JP326r5C/c9UuCMPoXNzuudTPsYDZCoJ5ilpqG2A==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.0.tgz", + "integrity": "sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==", "dev": true, "dependencies": { "magic-string": "^0.30.5", @@ -4025,9 +4018,9 @@ "dev": true }, "node_modules/@vitest/spy": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.4.0.tgz", - "integrity": "sha512-Ywau/Qs1DzM/8Uc+yA77CwSegizMlcgTJuYGAi0jujOteJOUf1ujunHThYo243KG9nAyWT3L9ifPYZ5+As/+6Q==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.0.tgz", + "integrity": "sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==", "dev": true, "dependencies": { "tinyspy": "^2.2.0" @@ -4037,9 +4030,9 @@ } }, "node_modules/@vitest/utils": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.4.0.tgz", - "integrity": "sha512-mx3Yd1/6e2Vt/PUC98DcqTirtfxUyAZ32uK82r8rZzbtBeBo+nqgnjx/LvqQdWsrvNtm14VmurNgcf4nqY5gJg==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.0.tgz", + "integrity": "sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==", "dev": true, "dependencies": { "diff-sequences": "^29.6.3", @@ -8455,9 +8448,9 @@ } }, "node_modules/minimatch": { - "version": "9.0.3", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", - "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "version": "9.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", + "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dev": true, "dependencies": { "brace-expansion": "^2.0.1" @@ -10618,9 +10611,9 @@ } }, "node_modules/typescript": { - "version": "5.4.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz", - "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==", + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", "dev": true, "bin": { "tsc": "bin/tsc", @@ -10839,20 +10832,6 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "dev": true }, - "node_modules/v8-to-istanbul": { - "version": "9.2.0", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-9.2.0.tgz", - "integrity": "sha512-/EH/sDgxU2eGxajKdwLCDmQ4FWq+kpi3uCmBGpw1xJtnAxEjlD8j8PEiGWpCIMIs3ciNAgH0d3TTJiUkYzyZjA==", - "dev": true, - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.12", - "@types/istanbul-lib-coverage": "^2.0.1", - "convert-source-map": "^2.0.0" - }, - "engines": { - "node": ">=10.12.0" - } - }, "node_modules/value-or-promise": { "version": "1.0.12", "resolved": "https://registry.npmjs.org/value-or-promise/-/value-or-promise-1.0.12.tgz", @@ -10863,9 +10842,9 @@ } }, "node_modules/vite": { - "version": "5.2.7", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.7.tgz", - "integrity": "sha512-k14PWOKLI6pMaSzAuGtT+Cf0YmIx12z9YGon39onaJNy8DLBfBJrzg9FQEmkAM5lpHBZs9wksWAsyF/HkpEwJA==", + "version": "5.2.8", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", + "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", "dev": true, "dependencies": { "esbuild": "^0.20.1", @@ -10918,9 +10897,9 @@ } }, "node_modules/vite-node": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.4.0.tgz", - "integrity": "sha512-VZDAseqjrHgNd4Kh8icYHWzTKSCZMhia7GyHfhtzLW33fZlG9SwsB6CEhgyVOWkJfJ2pFLrp/Gj1FSfAiqH9Lw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.0.tgz", + "integrity": "sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -10940,16 +10919,16 @@ } }, "node_modules/vitest": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.4.0.tgz", - "integrity": "sha512-gujzn0g7fmwf83/WzrDTnncZt2UiXP41mHuFYFrdwaLRVQ6JYQEiME2IfEjU3vcFL3VKa75XhI3lFgn+hfVsQw==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.0.tgz", + "integrity": "sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==", "dev": true, "dependencies": { - "@vitest/expect": "1.4.0", - "@vitest/runner": "1.4.0", - "@vitest/snapshot": "1.4.0", - "@vitest/spy": "1.4.0", - "@vitest/utils": "1.4.0", + "@vitest/expect": "1.5.0", + "@vitest/runner": "1.5.0", + "@vitest/snapshot": "1.5.0", + "@vitest/spy": "1.5.0", + "@vitest/utils": "1.5.0", "acorn-walk": "^8.3.2", "chai": "^4.3.10", "debug": "^4.3.4", @@ -10961,9 +10940,9 @@ "std-env": "^3.5.0", "strip-literal": "^2.0.0", "tinybench": "^2.5.1", - "tinypool": "^0.8.2", + "tinypool": "^0.8.3", "vite": "^5.0.0", - "vite-node": "1.4.0", + "vite-node": "1.5.0", "why-is-node-running": "^2.2.2" }, "bin": { @@ -10978,8 +10957,8 @@ "peerDependencies": { "@edge-runtime/vm": "*", "@types/node": "^18.0.0 || >=20.0.0", - "@vitest/browser": "1.4.0", - "@vitest/ui": "1.4.0", + "@vitest/browser": "1.5.0", + "@vitest/ui": "1.5.0", "happy-dom": "*", "jsdom": "*" }, diff --git a/client-next/package.json b/client-next/package.json index e5019ecb088..643acd1c082 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -33,12 +33,12 @@ "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "15.0.2", - "@types/react": "18.2.73", - "@types/react-dom": "18.2.23", - "@typescript-eslint/eslint-plugin": "7.5.0", - "@typescript-eslint/parser": "7.5.0", + "@types/react": "18.2.79", + "@types/react-dom": "18.2.25", + "@typescript-eslint/eslint-plugin": "7.7.0", + "@typescript-eslint/parser": "7.7.0", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.4.0", + "@vitest/coverage-v8": "1.5.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", @@ -48,8 +48,8 @@ "eslint-plugin-react-refresh": "0.4.6", "jsdom": "24.0.0", "prettier": "3.2.5", - "typescript": "5.4.3", - "vite": "5.2.7", - "vitest": "1.4.0" + "typescript": "5.4.5", + "vite": "5.2.8", + "vitest": "1.5.0" } } From f77cedee401e27d6d770acd7984a39bf9ffc0b8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 21:19:06 +0000 Subject: [PATCH 0982/1688] Update slf4j monorepo to v2.0.13 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0dbec37943a..06d33adeecb 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ 5.5.3 1.5.3 9.10.0 - 2.0.12 + 2.0.13 2.0.15 1.26 4.0.5 From 89c20277965c20221c90ba661eff9e2c037433a1 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Tue, 16 Apr 2024 05:11:56 +0000 Subject: [PATCH 0983/1688] Upgrade debug client to version 2024/04/2024-04-16T05:11 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 317fbed5a11..1b561ffc656 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
      From 70585decabdfe488947bb1ddf4aa7ef207b155ef Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Apr 2024 09:40:41 +0200 Subject: [PATCH 0984/1688] Remove extra expandBy --- .../graph_builder/module/osm/naming/SidewalkNamer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index e6eab4d3d0e..763a531250f 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -129,9 +129,7 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam var buffer = preciseBuffer(sidewalk.getGeometry(), BUFFER_METERS); var sidewalkLength = SphericalDistanceLibrary.length(sidewalk.getGeometry()); - var envelope = sidewalk.getGeometry().getEnvelopeInternal(); - envelope.expandBy(0.000002); - var candidates = streetEdges.query(envelope); + var candidates = streetEdges.query(buffer.getEnvelopeInternal()); groupEdgesByName(candidates) // remove edges that are far away From 3056805c63b67a93e16e4b206a0aef785cb275d8 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Apr 2024 09:43:54 +0200 Subject: [PATCH 0985/1688] Use better name for variable --- .../opentripplanner/apis/vectortiles/DebugStyleSpec.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java index 16e3b247bc7..92d577480e2 100644 --- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java +++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java @@ -50,7 +50,7 @@ public class DebugStyleSpec { 1, List.of(new ZoomStop(15, 0.2f), new ZoomStop(MAX_ZOOM, 3)) ); - private static final Class[] ALL_EDGES = new Class[] { + private static final Class[] EDGES_TO_DISPLAY = new Class[] { StreetEdge.class, AreaEdge.class, EscalatorEdge.class, @@ -83,7 +83,7 @@ static StyleSpec build( .typeLine() .vectorSourceLayer(edges) .lineColor(MAGENTA) - .edgeFilter(ALL_EDGES) + .edgeFilter(EDGES_TO_DISPLAY) .lineWidth(LINE_WIDTH) .minZoom(13) .maxZoom(MAX_ZOOM) @@ -93,7 +93,7 @@ static StyleSpec build( .typeSymbol() .lineText("name") .vectorSourceLayer(edges) - .edgeFilter(ALL_EDGES) + .edgeFilter(EDGES_TO_DISPLAY) .minZoom(17) .maxZoom(MAX_ZOOM) .intiallyHidden(), From ed40a51ebebe447c1b9f82dc58acad457b0a5754 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 16 Apr 2024 09:09:34 +0000 Subject: [PATCH 0986/1688] Add changelog entry for #5794 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 704ce4787c0..25c8cb80594 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -13,6 +13,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Discourage instead of ban cycling on use_sidepath ways and do the same for walking on foot=use_sidepath [#5790](https://github.com/opentripplanner/OpenTripPlanner/pull/5790) - Prune islands with mode-less stop vertices [#5782](https://github.com/opentripplanner/OpenTripPlanner/pull/5782) - Overwrite default WALK directMode when it is not set in the request, but modes is set [#5779](https://github.com/opentripplanner/OpenTripPlanner/pull/5779) +- Fix trip duplication in Graph Builder DSJ mapping [#5794](https://github.com/opentripplanner/OpenTripPlanner/pull/5794) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 087c436091c002afda636de5860cd72f6fa3c4fc Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 16 Apr 2024 14:31:09 +0300 Subject: [PATCH 0987/1688] Update graphql-java-extended-scalars --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1d53526ed8f..bf474226bdc 100644 --- a/pom.xml +++ b/pom.xml @@ -857,7 +857,7 @@ com.graphql-java graphql-java-extended-scalars - 21.0 + 22.0 org.apache.httpcomponents.client5 From 18bbe02120594d62fd206b0f163cc713ea2e5636 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 16 Apr 2024 14:36:02 +0300 Subject: [PATCH 0988/1688] Fix maxTransfers --- .../mapping/routerequest/TransitPreferencesMapper.java | 10 +++++++++- .../routerequest/RouteRequestMapperTransitTest.java | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java index 792a23bb2a1..3c6a53eac2a 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java @@ -75,10 +75,18 @@ static void setTransitPreferences( } var maxTransfers = transfer.getGraphQLMaximumTransfers(); if (maxTransfers != null) { - transferPreferences.withMaxTransfers(maxTransfers); + if (maxTransfers < 0) { + throw new IllegalArgumentException("Maximum transfers must be non-negative."); + } + transferPreferences.withMaxTransfers(maxTransfers + 1); } var additionalTransfers = transfer.getGraphQLMaximumAdditionalTransfers(); if (additionalTransfers != null) { + if (additionalTransfers < 0) { + throw new IllegalArgumentException( + "Maximum additional transfers must be non-negative." + ); + } transferPreferences.withMaxAdditionalTransfers(additionalTransfers); } } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java index a8b5c10b381..5b2149afe32 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java @@ -89,7 +89,7 @@ void testTransferPreferences() { assertEquals(cost.toSeconds(), transferPreferences.cost()); assertEquals(slack.toSeconds(), transferPreferences.slack()); assertEquals(maximumAdditionalTransfers, transferPreferences.maxAdditionalTransfers()); - assertEquals(maximumTransfers, transferPreferences.maxTransfers()); + assertEquals(maximumTransfers + 1, transferPreferences.maxTransfers()); } @Test From de0e38292a806fd0534009965abcf91ed5366d5b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 16 Apr 2024 17:24:15 +0200 Subject: [PATCH 0989/1688] Compute UTM CRS only once --- .../module/osm/naming/SidewalkNamer.java | 91 +++++++++++++------ 1 file changed, 62 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 763a531250f..d17de3f96c1 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -16,6 +16,8 @@ import org.geotools.geometry.jts.JTS; import org.geotools.referencing.CRS; import org.geotools.referencing.crs.DefaultGeographicCRS; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Envelope; import org.locationtech.jts.geom.Geometry; import org.locationtech.jts.geom.LineString; import org.locationtech.jts.geom.MultiLineString; @@ -61,6 +63,7 @@ public class SidewalkNamer implements EdgeNamer { private HashGridSpatialIndex streetEdges = new HashGridSpatialIndex<>(); private Collection unnamedSidewalks = new ArrayList<>(); + private PreciseBuffer preciseBuffer; @Override public I18NString name(OSMWithTags way) { @@ -96,6 +99,8 @@ public void postprocess() { unnamedSidewalks.size() ); + this.preciseBuffer = new PreciseBuffer(computeCentroid(), BUFFER_METERS); + final AtomicInteger namesApplied = new AtomicInteger(0); unnamedSidewalks .parallelStream() @@ -121,12 +126,23 @@ public void postprocess() { unnamedSidewalks = null; } + /** + * Compute the centroid of all sidewalk edges. + */ + private Coordinate computeCentroid() { + var envelope = new Envelope(); + unnamedSidewalks.forEach(e -> + envelope.expandToInclude(e.edge.getGeometry().getEnvelopeInternal()) + ); + return envelope.centre(); + } + /** * The actual worker method that runs the business logic on an individual sidewalk edge. */ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger namesApplied) { var sidewalk = sidewalkOnLevel.edge; - var buffer = preciseBuffer(sidewalk.getGeometry(), BUFFER_METERS); + var buffer = preciseBuffer.preciseBuffer(sidewalk.getGeometry()); var sidewalkLength = SphericalDistanceLibrary.length(sidewalk.getGeometry()); var candidates = streetEdges.query(buffer.getEnvelopeInternal()); @@ -187,34 +203,6 @@ private static Stream groupEdgesByName(List candida }); } - /** - * Add a buffer around a geometry that makes sure that the buffer is the same distance (in meters) - * anywhere on earth. - *

      - * Background: If you call the regular buffer() method on a JTS geometry that uses WGS84 as the - * coordinate reference system, the buffer will be accurate at the equator but will become more - * and more elongated the farther north/south you go. - *

      - * Taken from https://stackoverflow.com/questions/36455020 - */ - private Geometry preciseBuffer(Geometry geometry, double distanceInMeters) { - try { - var coordinate = geometry.getCentroid().getCoordinate(); - String code = "AUTO:42001,%s,%s".formatted(coordinate.x, coordinate.y); - CoordinateReferenceSystem auto = CRS.decode(code); - - MathTransform toTransform = CRS.findMathTransform(DefaultGeographicCRS.WGS84, auto); - MathTransform fromTransform = CRS.findMathTransform(auto, DefaultGeographicCRS.WGS84); - - Geometry pGeom = JTS.transform(geometry, toTransform); - - Geometry pBufferedGeom = pGeom.buffer(distanceInMeters, 4, BufferParameters.CAP_FLAT); - return JTS.transform(pBufferedGeom, fromTransform); - } catch (TransformException | FactoryException e) { - throw new RuntimeException(e); - } - } - private record NamedEdgeGroup(double percentInBuffer, I18NString name) { NamedEdgeGroup { Objects.requireNonNull(name); @@ -270,4 +258,49 @@ private double length(Geometry intersection) { } private record EdgeOnLevel(StreetEdge edge, Set levels) {} + + /** + * A class to cache the expensive construction of a Universal Traverse Mercator coordinate + * reference system. + * Re-using the same CRS for all edges might introduce tiny imprecisions for OTPs use cases + * but speeds up the processing enormously and is a price well worth paying. + */ + private static final class PreciseBuffer { + + private final double distanceInMeters; + private final MathTransform toTransform; + private final MathTransform fromTransform; + + private PreciseBuffer(Coordinate coordinate, double distanceInMeters) { + this.distanceInMeters = distanceInMeters; + String code = "AUTO:42001,%s,%s".formatted(coordinate.x, coordinate.y); + try { + CoordinateReferenceSystem auto = CRS.decode(code); + this.toTransform = CRS.findMathTransform(DefaultGeographicCRS.WGS84, auto); + this.fromTransform = CRS.findMathTransform(auto, DefaultGeographicCRS.WGS84); + } catch (FactoryException e) { + throw new RuntimeException(e); + } + } + + /** + * Add a buffer around a geometry that makes sure that the buffer is the same distance (in + * meters) anywhere on earth. + *

      + * Background: If you call the regular buffer() method on a JTS geometry that uses WGS84 as the + * coordinate reference system, the buffer will be accurate at the equator but will become more + * and more elongated the farther north/south you go. + *

      + * Taken from https://stackoverflow.com/questions/36455020 + */ + private Geometry preciseBuffer(Geometry geometry) { + try { + Geometry pGeom = JTS.transform(geometry, toTransform); + Geometry pBufferedGeom = pGeom.buffer(distanceInMeters, 4, BufferParameters.CAP_FLAT); + return JTS.transform(pBufferedGeom, fromTransform); + } catch (TransformException e) { + throw new RuntimeException(e); + } + } + } } From bad0b729bb6e58b6e2ddb0c1f30715ee3d49f044 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Wed, 17 Apr 2024 11:14:10 +0200 Subject: [PATCH 0990/1688] Fix DebugUi doc --- docs/Frontends.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Frontends.md b/docs/Frontends.md index e8b299a52ac..e7946102ea1 100644 --- a/docs/Frontends.md +++ b/docs/Frontends.md @@ -32,7 +32,7 @@ While the "classic" (i.e. old) debug frontend is enabled by default as of this w // otp-config.json { "otpFeatures": { - "DebugClient": true, + "DebugUi": true, "SandboxAPIGeocoder": true } } From a1f51daadcbdfca0a5fd654e3888ccc8eb47aa19 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Apr 2024 14:29:38 +0200 Subject: [PATCH 0991/1688] Add Bikeep parking updater --- docs/sandbox/VehicleParking.md | 8 +- .../bikeep/BikeepUpdaterTest.java | 45 +++ .../ext/vehicleparking/bikeep/bikeep.json | 303 ++++++++++++++++++ .../vehicleparking/bikeep/BikeepUpdater.java | 73 +++++ .../bikeep/BikeepUpdaterParameters.java | 25 ++ .../parkapi/ParkAPIUpdater.java | 8 + .../updaters/VehicleParkingUpdaterConfig.java | 12 + .../VehicleParkingDataSourceFactory.java | 3 + .../VehicleParkingSourceType.java | 1 + 9 files changed, 474 insertions(+), 4 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java create mode 100644 src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json create mode 100644 src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java create mode 100644 src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java diff --git a/docs/sandbox/VehicleParking.md b/docs/sandbox/VehicleParking.md index 2721fff9b0c..d8e05af8d25 100644 --- a/docs/sandbox/VehicleParking.md +++ b/docs/sandbox/VehicleParking.md @@ -61,7 +61,7 @@ This will end up in the API responses as the feed id of of the parking lot. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` **Path:** /updaters/[2] -**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` | `bikeep` The source of the vehicle updates. @@ -131,7 +131,7 @@ This will end up in the API responses as the feed id of of the parking lot. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` **Path:** /updaters/[3] -**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` | `bikeep` The source of the vehicle updates. @@ -216,7 +216,7 @@ This will end up in the API responses as the feed id of of the parking lot. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` **Path:** /updaters/[4] -**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` | `bikeep` The source of the vehicle updates. @@ -281,7 +281,7 @@ This will end up in the API responses as the feed id of of the parking lot. **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` **Path:** /updaters/[5] -**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` | `bikeep` The source of the vehicle updates. diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java new file mode 100644 index 00000000000..82099dfbd51 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java @@ -0,0 +1,45 @@ +package org.opentripplanner.ext.vehicleparking.bikeep; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import java.time.Duration; +import org.junit.jupiter.api.Test; +import org.opentripplanner.test.support.ResourceLoader; +import org.opentripplanner.updater.spi.HttpHeaders; + +class BikeepUpdaterTest { + + @Test + void parse() { + var uri = ResourceLoader.of(this).uri("bikeep.json"); + var parameters = new BikeepUpdaterParameters( + "bikeep", + uri, + "bikeep", + Duration.ofSeconds(30), + HttpHeaders.empty() + ); + var updater = new BikeepUpdater(parameters); + updater.update(); + var lots = updater.getUpdates(); + + assertEquals(9, lots.size()); + + lots.forEach(l -> assertNotNull(l.getName())); + + var first = lots.getFirst(); + assertEquals("bikeep:224121", first.getId().toString()); + assertEquals("(60.40593, 4.99634)", first.getCoordinate().toString()); + assertEquals("Ågotnes Terminal", first.getName().toString()); + assertEquals(10, first.getAvailability().getBicycleSpaces()); + assertEquals(10, first.getCapacity().getBicycleSpaces()); + + var last = lots.getLast(); + assertEquals("bikeep:224111", last.getId().toString()); + assertEquals("(59.88741, 10.5205)", last.getCoordinate().toString()); + assertEquals("Sandvika Storsenter Nytorget", last.getName().toString()); + assertEquals(13, last.getAvailability().getBicycleSpaces()); + assertEquals(15, last.getCapacity().getBicycleSpaces()); + } +} diff --git a/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json new file mode 100644 index 00000000000..6f164077ee1 --- /dev/null +++ b/src/ext-test/resources/org/opentripplanner/ext/vehicleparking/bikeep/bikeep.json @@ -0,0 +1,303 @@ +{ + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 4.996344, + 60.405932 + ] + }, + "properties": { + "code": "224121", + "label": "Ågotnes Terminal", + "name": "#224121 Ågotnes Terminal", + "address": "Ågotnes", + "tags": [ + "FREE", + "BIKE", + "PRIVATE", + "BOOKABLE" + ], + "icon": { + "png": "", + "png2x": "", + "svg": "" + }, + "parking": { + "available": 10, + "online": 10, + "total": 10 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 10.666802, + 59.436443 + ] + }, + "properties": { + "code": "226261", + "label": "Gågata Østre", + "name": "#226261 Gågata Østre", + "address": "Dronningens gate, Moss", + "tags": [ + "FREE", + "PRIVATE", + "BOOKABLE", + "BIKE" + ], + "icon": { + "png": "", + "png2x": "", + "svg": "" + }, + "parking": { + "available": 7, + "online": 10, + "total": 10 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 10.661444, + 59.435401 + ] + }, + "properties": { + "code": "226259", + "label": "Gågata Vestre", + "name": "#226259 Gågata Vestre", + "address": "Dronningens gate, Moss", + "tags": [ + "BIKE", + "FREE", + "PRIVATE", + "BOOKABLE" + ], + "icon": { + "png": "", + "png2x": "", + "svg": "" + }, + "parking": { + "available": 5, + "online": 5, + "total": 5 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 10.774958, + 59.946535 + ] + }, + "properties": { + "code": "223443", + "label": "Storo Storsenter", + "name": "#223443 Storo Storsenter", + "address": "Norway", + "tags": [ + "BIKE", + "PRIVATE", + "BOOKABLE", + "FREE" + ], + "icon": { + "png": "https://assets.bikeep.com/locations/icons/bikeep.png", + "png2x": "https://assets.bikeep.com/locations/icons/bikeep@2x.png", + "svg": "" + }, + "parking": { + "available": 17, + "online": 20, + "total": 20 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 10.501222, + 59.914578 + ] + }, + "properties": { + "code": "224519", + "label": "Kolsås Sykkelhotell", + "name": "#224519 Kolsås Sykkelhotell", + "address": "Norway", + "tags": [ + "PRIVATE", + "FREE", + "BOOKABLE", + "BIKE_HOUSE", + "BIKE" + ], + "icon": { + "png": "https://assets.bikeep.com/locations/icons/bikeep.png", + "png2x": "https://assets.bikeep.com/locations/icons/bikeep@2x.png", + "svg": "" + }, + "parking": { + "available": 13, + "online": 22, + "total": 22 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 10.663716, + 59.435539 + ] + }, + "properties": { + "code": "226260", + "label": "Gågata Midtre", + "name": "#226260 Gågata Midtre", + "address": "Dronningens gate, Moss", + "tags": [ + "FREE", + "BOOKABLE", + "PRIVATE", + "BIKE" + ], + "icon": { + "png": "", + "png2x": "", + "svg": "" + }, + "parking": { + "available": 5, + "online": 5, + "total": 5 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 5.320344, + 60.463246 + ] + }, + "properties": { + "code": "226266", + "label": "Åsane Sykkelhus", + "name": "#226266 Åsane Sykkelhus", + "address": "Åsane terminal", + "tags": [ + "BOOKABLE", + "BIKE", + "FREE", + "PRIVATE" + ], + "icon": { + "png": "", + "png2x": "", + "svg": "" + }, + "parking": { + "available": 11, + "online": 12, + "total": 12 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 10.521137, + 59.889181 + ] + }, + "properties": { + "code": "224112", + "label": "Sandvika Storsenter Kjørbokollen", + "name": "#224112 Sandvika Storsenter Kjørbokollen", + "address": "Brodtkorbsgate 7, Sandvika", + "tags": [ + "PRIVATE", + "FREE", + "BIKE", + "BOOKABLE" + ], + "icon": { + "png": "", + "png2x": "", + "svg": "" + }, + "parking": { + "available": 5, + "online": 5, + "total": 5 + }, + "renting": null + } + }, + { + "type": "Feature", + "geometry": { + "type": "Point", + "coordinates": [ + 10.520496, + 59.887412 + ] + }, + "properties": { + "code": "224111", + "label": "Sandvika Storsenter Nytorget", + "name": "#224111 Sandvika Storsenter Nytorget", + "address": "Sandviksveien 176, Sandvika", + "tags": [ + "BIKE", + "BOOKABLE", + "PRIVATE", + "FREE" + ], + "icon": { + "png": "", + "png2x": "", + "svg": "" + }, + "parking": { + "available": 13, + "online": 15, + "total": 15 + }, + "renting": null + } + } + ] +} \ No newline at end of file diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java new file mode 100644 index 00000000000..43ed99453b2 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java @@ -0,0 +1,73 @@ +package org.opentripplanner.ext.vehicleparking.bikeep; + +import com.fasterxml.jackson.databind.JsonNode; +import org.opentripplanner.framework.geometry.WgsCoordinate; +import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.routing.vehicle_parking.VehicleParking; +import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; +import org.opentripplanner.routing.vehicle_parking.VehicleParkingState; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.updater.spi.GenericJsonDataSource; + +/** + * Vehicle parking updater for Bikeep's API. + */ +public class BikeepUpdater extends GenericJsonDataSource { + + private static final String JSON_PARSE_PATH = "features"; + private final BikeepUpdaterParameters params; + + public BikeepUpdater(BikeepUpdaterParameters parameters) { + super(parameters.url().toString(), JSON_PARSE_PATH, parameters.httpHeaders()); + this.params = parameters; + } + + @Override + protected VehicleParking parseElement(JsonNode jsonNode) { + var coords = jsonNode.path("geometry").path("coordinates"); + var coordinate = new WgsCoordinate(coords.get(1).asDouble(), coords.get(0).asDouble()); + + var props = jsonNode.path("properties"); + var vehicleParkId = new FeedScopedId(params.feedId(), props.path("code").asText()); + var name = new NonLocalizedString(props.path("label").asText()); + var parking = props.path("parking"); + + var availability = VehicleParkingSpaces + .builder() + .bicycleSpaces(parking.get("available").asInt()) + .build(); + var capacity = VehicleParkingSpaces + .builder() + .bicycleSpaces(parking.get("total").asInt()) + .build(); + + VehicleParking.VehicleParkingEntranceCreator entrance = builder -> + builder + .entranceId(new FeedScopedId(params.feedId(), vehicleParkId.getId() + "/entrance")) + .coordinate(coordinate) + .walkAccessible(true) + .carAccessible(true); + + return VehicleParking + .builder() + .id(vehicleParkId) + .name(name) + .state(VehicleParkingState.OPERATIONAL) + .coordinate(coordinate) + .bicyclePlaces(true) + .availability(availability) + .capacity(capacity) + .entrance(entrance) + .build(); + } + + @Override + public String toString() { + return ToStringBuilder + .of(this.getClass()) + .addStr("feedId", this.params.feedId()) + .addStr("url", this.params.url().toString()) + .toString(); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java new file mode 100644 index 00000000000..be937ecdd5e --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterParameters.java @@ -0,0 +1,25 @@ +package org.opentripplanner.ext.vehicleparking.bikeep; + +import java.net.URI; +import java.time.Duration; +import org.opentripplanner.updater.spi.HttpHeaders; +import org.opentripplanner.updater.vehicle_parking.VehicleParkingSourceType; +import org.opentripplanner.updater.vehicle_parking.VehicleParkingUpdaterParameters; + +/** + * Class that extends {@link VehicleParkingUpdaterParameters} with parameters required by {@link + * BikeepUpdater}. + */ +public record BikeepUpdaterParameters( + String configRef, + URI url, + String feedId, + Duration frequency, + HttpHeaders httpHeaders +) + implements VehicleParkingUpdaterParameters { + @Override + public VehicleParkingSourceType sourceType() { + return VehicleParkingSourceType.BIKEEP; + } +} diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java index fd9389f8ee3..c6f775e588f 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/parkapi/ParkAPIUpdater.java @@ -12,6 +12,7 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.i18n.TranslatedString; +import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.calendar.openinghours.OHCalendar; import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; import org.opentripplanner.openstreetmap.OSMOpeningHoursParser; @@ -36,6 +37,7 @@ abstract class ParkAPIUpdater extends GenericJsonDataSource { private final Collection staticTags; private final OSMOpeningHoursParser osmOpeningHoursParser; + private final String url; public ParkAPIUpdater( ParkAPIUpdaterParameters parameters, @@ -46,6 +48,7 @@ public ParkAPIUpdater( this.staticTags = parameters.tags(); this.osmOpeningHoursParser = new OSMOpeningHoursParser(openingHoursCalendarService, parameters.timeZone()); + this.url = parameters.url(); } @Override @@ -196,4 +199,9 @@ private List parseTags(JsonNode node, String... tagNames) { } return tagList; } + + @Override + public String toString() { + return ToStringBuilder.of(getClass()).addStr("feedId", feedId).addObj("url", url).toString(); + } } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java index f0306941547..d04e1900795 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java @@ -8,6 +8,7 @@ import java.time.ZoneId; import java.util.ArrayList; import java.util.Set; +import org.opentripplanner.ext.vehicleparking.bikeep.BikeepUpdaterParameters; import org.opentripplanner.ext.vehicleparking.bikely.BikelyUpdaterParameters; import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdaterParameters; import org.opentripplanner.ext.vehicleparking.noi.NoiUpdaterParameters; @@ -88,6 +89,17 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap .asDuration(Duration.ofMinutes(1)), HttpHeadersConfig.headers(c, V2_6) ); + case BIKEEP -> new BikeepUpdaterParameters( + updaterRef, + c.of("url").since(V2_6).summary("URL of the locations endpoint.").asUri(), + feedId, + c + .of("frequency") + .since(V2_6) + .summary("How often to update the source.") + .asDuration(Duration.ofMinutes(1)), + HttpHeadersConfig.headers(c, V2_6) + ); }; } diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java index 3fe465a8cd5..a956fda0d87 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingDataSourceFactory.java @@ -1,5 +1,7 @@ package org.opentripplanner.updater.vehicle_parking; +import org.opentripplanner.ext.vehicleparking.bikeep.BikeepUpdater; +import org.opentripplanner.ext.vehicleparking.bikeep.BikeepUpdaterParameters; import org.opentripplanner.ext.vehicleparking.bikely.BikelyUpdater; import org.opentripplanner.ext.vehicleparking.bikely.BikelyUpdaterParameters; import org.opentripplanner.ext.vehicleparking.hslpark.HslParkUpdater; @@ -39,6 +41,7 @@ public static DataSource create( ); case BIKELY -> new BikelyUpdater((BikelyUpdaterParameters) parameters); case NOI_OPEN_DATA_HUB -> new NoiUpdater((NoiUpdaterParameters) parameters); + case BIKEEP -> new BikeepUpdater((BikeepUpdaterParameters) parameters); }; } } diff --git a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java index 3a0cb7d31b3..f6a28177d8e 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_parking/VehicleParkingSourceType.java @@ -6,4 +6,5 @@ public enum VehicleParkingSourceType { HSL_PARK, BIKELY, NOI_OPEN_DATA_HUB, + BIKEEP, } From f2a76c27a070ddf3adb2e1c110ea7e095b922b09 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 10 Apr 2024 14:43:34 +0200 Subject: [PATCH 0992/1688] Add tag handling --- doc-templates/VehicleParking.md | 5 +- docs/RouterConfiguration.md | 6 ++ docs/sandbox/VehicleParking.md | 62 ++++++++++++++- .../bikeep/BikeepUpdaterTest.java | 2 + .../vehicleparking/bikeep/BikeepUpdater.java | 76 +++++++++++-------- .../standalone/config/router-config.json | 6 ++ 6 files changed, 124 insertions(+), 33 deletions(-) diff --git a/doc-templates/VehicleParking.md b/doc-templates/VehicleParking.md index 50bd8806267..5d149e40f9a 100644 --- a/doc-templates/VehicleParking.md +++ b/doc-templates/VehicleParking.md @@ -3,7 +3,7 @@ ## Contact Info - For HSL Park and Ride updater: Digitransit team, HSL, Helsinki, Finland -- For Bikely and NOI updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) +- For Bikely, NOI and Bikeep updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) ## Documentation @@ -44,6 +44,9 @@ All updaters have the following parameters in common: +## Bikeep + + ## Changelog diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index e0f1d81b590..918717d439f 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -844,6 +844,12 @@ Used to group requests when monitoring OTP. "fromDateTime" : "-P1D", "timeout" : 300000 } + }, + { + "type" : "vehicle-parking", + "feedId" : "bikeep", + "sourceType" : "bikeep", + "url" : "https://services.bikeep.com/location/v1/public-areas/no-baia-mobility/locations" } ], "rideHailingServices" : [ diff --git a/docs/sandbox/VehicleParking.md b/docs/sandbox/VehicleParking.md index d8e05af8d25..7599a762602 100644 --- a/docs/sandbox/VehicleParking.md +++ b/docs/sandbox/VehicleParking.md @@ -3,7 +3,7 @@ ## Contact Info - For HSL Park and Ride updater: Digitransit team, HSL, Helsinki, Finland -- For Bikely and NOI updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) +- For Bikely, NOI and Bikeep updater: Leonard Ehrenfried, [mail@leonard.io](mailto:mail@leonard.io) ## Documentation @@ -312,6 +312,66 @@ HTTP headers to add to the request. Any header key, value can be inserted. +## Bikeep + + + + +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|----------------------------------|:---------------:|----------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [feedId](#u__13__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | +| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.6 | +| [sourceType](#u__13__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | +| url | `uri` | URL of the locations endpoint. | *Required* | | 2.6 | +| [headers](#u__13__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.6 | + + +#### Details + +

      feedId

      + +**Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required` +**Path:** /updaters/[13] + +The name of the data source. + +This will end up in the API responses as the feed id of of the parking lot. + +

      sourceType

      + +**Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required` +**Path:** /updaters/[13] +**Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` | `bikeep` + +The source of the vehicle updates. + +

      headers

      + +**Since version:** `2.6` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional` +**Path:** /updaters/[13] + +HTTP headers to add to the request. Any header key, value can be inserted. + + + +##### Example configuration + +```JSON +// router-config.json +{ + "updaters" : [ + { + "type" : "vehicle-parking", + "feedId" : "bikeep", + "sourceType" : "bikeep", + "url" : "https://services.bikeep.com/location/v1/public-areas/no-baia-mobility/locations" + } + ] +} +``` + + ## Changelog diff --git a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java index 82099dfbd51..679339f359b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdaterTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import java.time.Duration; +import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.updater.spi.HttpHeaders; @@ -34,6 +35,7 @@ void parse() { assertEquals("Ågotnes Terminal", first.getName().toString()); assertEquals(10, first.getAvailability().getBicycleSpaces()); assertEquals(10, first.getCapacity().getBicycleSpaces()); + assertEquals(Set.of("FREE", "PRIVATE", "BIKE", "BOOKABLE"), first.getTags()); var last = lots.getLast(); assertEquals("bikeep:224111", last.getId().toString()); diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java index 43ed99453b2..9216eb79995 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikeep/BikeepUpdater.java @@ -1,8 +1,12 @@ package org.opentripplanner.ext.vehicleparking.bikeep; import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectReader; +import java.io.IOException; +import java.util.List; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; @@ -16,6 +20,9 @@ public class BikeepUpdater extends GenericJsonDataSource { private static final String JSON_PARSE_PATH = "features"; + private static final ObjectReader STRING_LIST_READER = ObjectMappers + .ignoringExtraFields() + .readerForListOf(String.class); private final BikeepUpdaterParameters params; public BikeepUpdater(BikeepUpdaterParameters parameters) { @@ -25,41 +32,48 @@ public BikeepUpdater(BikeepUpdaterParameters parameters) { @Override protected VehicleParking parseElement(JsonNode jsonNode) { - var coords = jsonNode.path("geometry").path("coordinates"); - var coordinate = new WgsCoordinate(coords.get(1).asDouble(), coords.get(0).asDouble()); + try { + var coords = jsonNode.path("geometry").path("coordinates"); + var coordinate = new WgsCoordinate(coords.get(1).asDouble(), coords.get(0).asDouble()); - var props = jsonNode.path("properties"); - var vehicleParkId = new FeedScopedId(params.feedId(), props.path("code").asText()); - var name = new NonLocalizedString(props.path("label").asText()); - var parking = props.path("parking"); + var props = jsonNode.path("properties"); + var vehicleParkId = new FeedScopedId(params.feedId(), props.path("code").asText()); + var name = new NonLocalizedString(props.path("label").asText()); + var parking = props.path("parking"); - var availability = VehicleParkingSpaces - .builder() - .bicycleSpaces(parking.get("available").asInt()) - .build(); - var capacity = VehicleParkingSpaces - .builder() - .bicycleSpaces(parking.get("total").asInt()) - .build(); + List tags = STRING_LIST_READER.readValue(props.path("tags")); - VehicleParking.VehicleParkingEntranceCreator entrance = builder -> - builder - .entranceId(new FeedScopedId(params.feedId(), vehicleParkId.getId() + "/entrance")) - .coordinate(coordinate) - .walkAccessible(true) - .carAccessible(true); + var availability = VehicleParkingSpaces + .builder() + .bicycleSpaces(parking.get("available").asInt()) + .build(); + var capacity = VehicleParkingSpaces + .builder() + .bicycleSpaces(parking.get("total").asInt()) + .build(); + + VehicleParking.VehicleParkingEntranceCreator entrance = builder -> + builder + .entranceId(new FeedScopedId(params.feedId(), vehicleParkId.getId() + "/entrance")) + .coordinate(coordinate) + .walkAccessible(true) + .carAccessible(true); - return VehicleParking - .builder() - .id(vehicleParkId) - .name(name) - .state(VehicleParkingState.OPERATIONAL) - .coordinate(coordinate) - .bicyclePlaces(true) - .availability(availability) - .capacity(capacity) - .entrance(entrance) - .build(); + return VehicleParking + .builder() + .id(vehicleParkId) + .name(name) + .state(VehicleParkingState.OPERATIONAL) + .coordinate(coordinate) + .bicyclePlaces(true) + .availability(availability) + .tags(tags) + .capacity(capacity) + .entrance(entrance) + .build(); + } catch (IOException e) { + throw new RuntimeException(e); + } } @Override diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index f5eaa1f942b..3b43ef1c5d2 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -420,6 +420,12 @@ "fromDateTime": "-P1D", "timeout": 300000 } + }, + { + "type": "vehicle-parking", + "feedId": "bikeep", + "sourceType": "bikeep", + "url": "https://services.bikeep.com/location/v1/public-areas/no-baia-mobility/locations" } ], "rideHailingServices": [ From 1d749c3d3642f4e7e4223db8af136a13bd0fbc54 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 17 Apr 2024 14:25:14 +0200 Subject: [PATCH 0993/1688] Always record edges in pairs in the custom namer --- .../graph_builder/module/osm/OsmModule.java | 9 ++-- .../module/osm/StreetEdgePair.java | 35 +++++++++++++ .../module/osm/naming/DefaultNamer.java | 4 +- .../osm/naming/PortlandCustomNamer.java | 49 ++++++++++--------- .../module/osm/naming/SidewalkNamer.java | 22 ++++----- .../graph_builder/services/osm/EdgeNamer.java | 6 +-- .../module/islandpruning/TestNamer.java | 4 +- .../module/osm/naming/SidewalkNamerTest.java | 3 +- 8 files changed, 85 insertions(+), 47 deletions(-) create mode 100644 src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index 0cd53b70fc6..79bcacda660 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -113,8 +113,6 @@ public Map elevationDataOutput() { return elevationData; } - private record StreetEdgePair(StreetEdge main, StreetEdge back) {} - private void build() { var parkingProcessor = new ParkingProcessor( graph, @@ -390,8 +388,10 @@ private void buildBasicGraph() { geometry ); - StreetEdge street = streets.main; - StreetEdge backStreet = streets.back; + params.edgeNamer().recordEdges(way, streets); + + StreetEdge street = streets.main(); + StreetEdge backStreet = streets.back(); normalizer.applyWayProperties(street, backStreet, wayData, way); applyEdgesToTurnRestrictions(way, startNode, endNode, street, backStreet); @@ -545,7 +545,6 @@ private StreetEdge getEdgeForStreet( .withBogusName(way.needsFallbackName()); StreetEdge street = seb.buildAndConnect(); - params.edgeNamer().recordEdge(way, street); return street; } diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java new file mode 100644 index 00000000000..7e87838c4d5 --- /dev/null +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/StreetEdgePair.java @@ -0,0 +1,35 @@ +package org.opentripplanner.graph_builder.module.osm; + +import java.util.ArrayList; +import org.opentripplanner.street.model.edge.StreetEdge; + +public record StreetEdgePair(StreetEdge main, StreetEdge back) { + /** + * Return the non-null elements of this pair as an Iterable. + */ + public Iterable asIterable() { + var ret = new ArrayList(2); + if (main != null) { + ret.add(main); + } + if (back != null) { + ret.add(back); + } + return ret; + } + + /** + * Select one of the edges contained in this pair that is not null. No particular algorithm is + * guaranteed, and it may change in the future. + */ + public StreetEdge pickAny() { + if (main != null) { + return main; + } else if (back != null) { + return back; + } + throw new IllegalStateException( + "%s must not contain two null elements".formatted(getClass().getSimpleName()) + ); + } +} diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java index b1639608d4c..ff7b7d17666 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/DefaultNamer.java @@ -1,9 +1,9 @@ package org.opentripplanner.graph_builder.module.osm.naming; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.graph_builder.module.osm.StreetEdgePair; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.openstreetmap.model.OSMWithTags; -import org.opentripplanner.street.model.edge.StreetEdge; public class DefaultNamer implements EdgeNamer { @@ -13,7 +13,7 @@ public I18NString name(OSMWithTags way) { } @Override - public void recordEdge(OSMWithTags way, StreetEdge edge) {} + public void recordEdges(OSMWithTags way, StreetEdgePair edge) {} @Override public void postprocess() {} diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java index 9d550d51ae6..fb0d3f583e0 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java @@ -3,6 +3,7 @@ import java.util.HashSet; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.graph_builder.module.osm.StreetEdgePair; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.openstreetmap.model.OSMWithTags; import org.opentripplanner.street.model.edge.StreetEdge; @@ -69,28 +70,32 @@ public I18NString name(OSMWithTags way) { } @Override - public void recordEdge(OSMWithTags way, StreetEdge edge) { - if (!edge.hasBogusName()) { - return; // this edge already has a real name so there is nothing to do - } - String highway = way.getTag("highway"); - if ("motorway_link".equals(highway) || "trunk_link".equals(highway)) { - if (edge.isBack()) { - nameByDestination.add(edge); - } else { - nameByOrigin.add(edge); - } - } else if ( - "secondary_link".equals(highway) || - "primary_link".equals(highway) || - "tertiary_link".equals(highway) - ) { - if (edge.isBack()) { - nameByOrigin.add(edge); - } else { - nameByDestination.add(edge); - } - } + public void recordEdges(OSMWithTags way, StreetEdgePair edgePair) { + edgePair + .asIterable() + .forEach(edge -> { + if (!edge.hasBogusName()) { + return; // this edge already has a real name so there is nothing to do + } + String highway = way.getTag("highway"); + if ("motorway_link".equals(highway) || "trunk_link".equals(highway)) { + if (edge.isBack()) { + nameByDestination.add(edge); + } else { + nameByOrigin.add(edge); + } + } else if ( + "secondary_link".equals(highway) || + "primary_link".equals(highway) || + "tertiary_link".equals(highway) + ) { + if (edge.isBack()) { + nameByOrigin.add(edge); + } else { + nameByDestination.add(edge); + } + } + }); } @Override diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index d17de3f96c1..990d1d73442 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -30,6 +30,7 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.logging.ProgressTracker; +import org.opentripplanner.graph_builder.module.osm.StreetEdgePair; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.openstreetmap.model.OSMWithTags; import org.opentripplanner.street.model.edge.StreetEdge; @@ -71,23 +72,20 @@ public I18NString name(OSMWithTags way) { } @Override - public void recordEdge(OSMWithTags way, StreetEdge edge) { + public void recordEdges(OSMWithTags way, StreetEdgePair pair) { if (way.isSidewalk() && way.needsFallbackName() && !way.isExplicitlyUnnamed()) { - unnamedSidewalks.add(new EdgeOnLevel(edge, way.getLevels())); + pair + .asIterable() + .forEach(edge -> unnamedSidewalks.add(new EdgeOnLevel(edge, way.getLevels()))); } if (way.isNamed() && !way.isLink()) { // we generate two edges for each osm way: one there and one back. since we don't do any routing // in this class we don't need the two directions and keep only one of them. - var containsReverse = streetEdges - .query(edge.getGeometry().getEnvelopeInternal()) - .stream() - .anyMatch(candidate -> candidate.edge.isReverseOf(edge)); - if (!containsReverse) { - streetEdges.insert( - edge.getGeometry().getEnvelopeInternal(), - new EdgeOnLevel(edge, way.getLevels()) - ); - } + var edge = pair.pickAny(); + streetEdges.insert( + edge.getGeometry().getEnvelopeInternal(), + new EdgeOnLevel(edge, way.getLevels()) + ); } } diff --git a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java index 010b21ec2d1..60cf780f714 100644 --- a/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/services/osm/EdgeNamer.java @@ -3,13 +3,13 @@ import javax.annotation.Nonnull; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.graph_builder.module.osm.StreetEdgePair; import org.opentripplanner.graph_builder.module.osm.naming.DefaultNamer; import org.opentripplanner.graph_builder.module.osm.naming.PortlandCustomNamer; import org.opentripplanner.graph_builder.module.osm.naming.SidewalkNamer; import org.opentripplanner.openstreetmap.model.OSMWithTags; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; import org.opentripplanner.standalone.config.framework.json.OtpVersion; -import org.opentripplanner.street.model.edge.StreetEdge; /** * Interface responsible for naming edges of the street graph. It allows you to write your own @@ -25,11 +25,11 @@ public interface EdgeNamer { * Callback function for each way/edge combination so that more complicated names can be built * in the post-processing step. */ - void recordEdge(OSMWithTags way, StreetEdge edge); + void recordEdges(OSMWithTags way, StreetEdgePair edge); /** * Called after each edge has been named to build a more complex name out of the relationships - * tracked in {@link EdgeNamer#recordEdge(OSMWithTags, StreetEdge)}. + * tracked in {@link EdgeNamer#recordEdges(OSMWithTags, StreetEdgePair)}. */ void postprocess(); diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java index 0d2ad370541..4002da919d8 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/TestNamer.java @@ -2,9 +2,9 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.graph_builder.module.osm.StreetEdgePair; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.openstreetmap.model.OSMWithTags; -import org.opentripplanner.street.model.edge.StreetEdge; class TestNamer implements EdgeNamer { @@ -14,7 +14,7 @@ public I18NString name(OSMWithTags way) { } @Override - public void recordEdge(OSMWithTags way, StreetEdge edge) {} + public void recordEdges(OSMWithTags way, StreetEdgePair edge) {} @Override public void postprocess() {} diff --git a/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java b/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java index 3faa77ee531..c1c3d7e5e73 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamerTest.java @@ -12,6 +12,7 @@ import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.graph_builder.module.osm.StreetEdgePair; import org.opentripplanner.graph_builder.services.osm.EdgeNamer; import org.opentripplanner.openstreetmap.model.OSMWay; import org.opentripplanner.openstreetmap.wayproperty.specifier.WayTestData; @@ -92,7 +93,7 @@ EdgePair addStreetEdge(String name, WgsCoordinate... coordinates) { } void postProcess(EdgeNamer namer) { - pairs.forEach(p -> namer.recordEdge(p.way, p.edge)); + pairs.forEach(p -> namer.recordEdges(p.way, new StreetEdgePair(p.edge, null))); namer.postprocess(); } From 68f667e0403a85e940d0de8eb99cf3f6eddb097a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 18 Apr 2024 14:58:54 +0200 Subject: [PATCH 0994/1688] Apply suggestions from code review Co-authored-by: Thomas Gran --- .../standalone/config/framework/json/NodeAdapterTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java index 8128a48a678..9d3719c2285 100644 --- a/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/framework/json/NodeAdapterTest.java @@ -560,7 +560,7 @@ void unusedParams() { @Test void unknownParameters() { // Given: two parameters a and b - NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); + var subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); // When: Access ONLY parameter 'a', but not 'b' subject.of("foo").asObject().of("a").asBoolean(); @@ -571,7 +571,7 @@ void unknownParameters() { @Test void allParametersAreKnown() { // Given: two parameters a and b - NodeAdapter subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); + var subject = newNodeAdapterForTest("{ foo : { a: true, b: false } }"); var object = subject.of("foo").asObject(); object.of("a").asBoolean(); From 4b5b7d6bf59e51aed4f8fd7294486e9dbfb5e273 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 18 Apr 2024 13:24:13 +0000 Subject: [PATCH 0995/1688] Add changelog entry for #5676 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 25c8cb80594..d12e9a100f0 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -14,6 +14,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Prune islands with mode-less stop vertices [#5782](https://github.com/opentripplanner/OpenTripPlanner/pull/5782) - Overwrite default WALK directMode when it is not set in the request, but modes is set [#5779](https://github.com/opentripplanner/OpenTripPlanner/pull/5779) - Fix trip duplication in Graph Builder DSJ mapping [#5794](https://github.com/opentripplanner/OpenTripPlanner/pull/5794) +- Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 6c7d95383a2fe297c4a2ca690dcc65b971b68a37 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 18 Apr 2024 16:32:04 +0200 Subject: [PATCH 0996/1688] Replace DurationModifier with TimePenalty --- .../DurationModifierCalculatorTest.java | 6 +-- .../flex/flexpathcalculator/FlexPathTest.java | 12 ++--- .../ext/flex/trip/DurationModifierTest.java | 20 ------- .../trip/UnscheduledDrivingDurationTest.java | 3 +- .../ext/flex/FlexTripsMapper.java | 4 +- .../DurationModifierCalculator.java | 8 +-- .../ext/flex/flexpathcalculator/FlexPath.java | 16 ++++-- .../ext/flex/trip/DurationModifier.java | 53 ------------------- .../ext/flex/trip/UnscheduledTrip.java | 5 +- .../ext/flex/trip/UnscheduledTripBuilder.java | 7 +-- .../gtfs/mapping/TripMapper.java | 10 ++-- .../model/impl/OtpTransitServiceBuilder.java | 6 +-- .../gtfs/mapping/TripMapperTest.java | 4 +- 13 files changed, 45 insertions(+), 109 deletions(-) delete mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java delete mode 100644 src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java index f610cbe09c4..a97460dda75 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java @@ -6,7 +6,7 @@ import java.time.Duration; import org.junit.jupiter.api.Test; import org.opentripplanner._support.geometry.LineStrings; -import org.opentripplanner.ext.flex.trip.DurationModifier; +import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.street.model._data.StreetModelForTest; class DurationModifierCalculatorTest { @@ -18,7 +18,7 @@ void calculate() { FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> new FlexPath(10_000, THIRTY_MINS_IN_SECONDS, () -> LineStrings.SIMPLE); - var mod = new DurationModifier(Duration.ofMinutes(10), 1.5f); + var mod = TimePenalty.of(Duration.ofMinutes(10), 1.5f); var calc = new DurationModifierCalculator(delegate, mod); var path = calc.calculateFlexPath(StreetModelForTest.V1, StreetModelForTest.V2, 0, 5); assertEquals(3300, path.durationSeconds); @@ -27,7 +27,7 @@ void calculate() { @Test void nullValue() { FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> null; - var mod = new DurationModifier(Duration.ofMinutes(10), 1.5f); + var mod = TimePenalty.of(Duration.ofMinutes(10), 1.5f); var calc = new DurationModifierCalculator(delegate, mod); var path = calc.calculateFlexPath(StreetModelForTest.V1, StreetModelForTest.V2, 0, 5); assertNull(path); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java index b79093e26c5..8bd3abee785 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.geometry.LineStrings; -import org.opentripplanner.ext.flex.trip.DurationModifier; +import org.opentripplanner.routing.api.request.framework.TimePenalty; class FlexPathTest { @@ -21,16 +21,16 @@ class FlexPathTest { static List cases() { return List.of( - Arguments.of(DurationModifier.NONE, THIRTY_MINS_IN_SECONDS), - Arguments.of(new DurationModifier(Duration.ofMinutes(10), 1), 2400), - Arguments.of(new DurationModifier(Duration.ofMinutes(10), 1.5f), 3300), - Arguments.of(new DurationModifier(Duration.ZERO, 3), 5400) + Arguments.of(TimePenalty.ZERO, THIRTY_MINS_IN_SECONDS), + Arguments.of(TimePenalty.of(Duration.ofMinutes(10), 1), 2400), + Arguments.of(TimePenalty.of(Duration.ofMinutes(10), 1.5f), 3300), + Arguments.of(TimePenalty.of(Duration.ZERO, 3), 5400) ); } @ParameterizedTest @MethodSource("cases") - void calculate(DurationModifier mod, int expectedSeconds) { + void calculate(TimePenalty mod, int expectedSeconds) { var modified = PATH.withDurationModifier(mod); assertEquals(expectedSeconds, modified.durationSeconds); assertEquals(LineStrings.SIMPLE, modified.getGeometry()); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java deleted file mode 100644 index 05fb9965935..00000000000 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/DurationModifierTest.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.opentripplanner.ext.flex.trip; - -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertTrue; - -import java.time.Duration; -import org.junit.jupiter.api.Test; - -class DurationModifierTest { - - @Test - void doesNotModify() { - assertFalse(DurationModifier.NONE.modifies()); - } - - @Test - void modifies() { - assertTrue(new DurationModifier(Duration.ofMinutes(1), 1.5f).modifies()); - } -} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java index 45d8c5be624..bd06a51960b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java @@ -13,6 +13,7 @@ import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.model.StopTime; +import org.opentripplanner.routing.api.request.framework.TimePenalty; class UnscheduledDrivingDurationTest { @@ -34,7 +35,7 @@ void withModifier() { var trip = UnscheduledTrip .of(id("1")) .withStopTimes(List.of(STOP_TIME)) - .withDurationModifier(new DurationModifier(Duration.ofMinutes(2), 1.5f)) + .withDurationModifier(TimePenalty.of(Duration.ofMinutes(2), 1.5f)) .build(); var calculator = trip.flexPathCalculator(STATIC_CALCULATOR); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index bb2ed2764f6..76a13255b67 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; -import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; @@ -13,6 +12,7 @@ import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TripStopTimes; import org.opentripplanner.model.impl.OtpTransitServiceBuilder; +import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.timetable.Trip; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,7 +36,7 @@ public class FlexTripsMapper { /* Fetch the stop times for this trip. Copy the list since it's immutable. */ List stopTimes = new ArrayList<>(stopTimesByTrip.get(trip)); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { - var modifier = builder.getFlexDurationFactors().getOrDefault(trip, DurationModifier.NONE); + var modifier = builder.getFlexDurationFactors().getOrDefault(trip, TimePenalty.ZERO); result.add( UnscheduledTrip .of(trip.getId()) diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java index 158e6a933c7..0f521b55b1f 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.flex.flexpathcalculator; import javax.annotation.Nullable; -import org.opentripplanner.ext.flex.trip.DurationModifier; +import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.street.model.vertex.Vertex; /** @@ -11,11 +11,11 @@ public class DurationModifierCalculator implements FlexPathCalculator { private final FlexPathCalculator delegate; - private final DurationModifier factors; + private final TimePenalty factors; - public DurationModifierCalculator(FlexPathCalculator delegate, DurationModifier factors) { + public DurationModifierCalculator(FlexPathCalculator delegate, TimePenalty penalty) { this.delegate = delegate; - this.factors = factors; + this.factors = penalty; } @Nullable diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index 54c11198b19..3a692dff40b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java @@ -1,9 +1,11 @@ package org.opentripplanner.ext.flex.flexpathcalculator; +import java.time.Duration; import java.util.function.Supplier; import javax.annotation.concurrent.Immutable; import org.locationtech.jts.geom.LineString; -import org.opentripplanner.ext.flex.trip.DurationModifier; +import org.opentripplanner.framework.lang.IntUtils; +import org.opentripplanner.routing.api.request.framework.TimePenalty; /** * This class contains the results from a FlexPathCalculator. @@ -25,7 +27,7 @@ public class FlexPath { */ public FlexPath(int distanceMeters, int durationSeconds, Supplier geometrySupplier) { this.distanceMeters = distanceMeters; - this.durationSeconds = durationSeconds; + this.durationSeconds = IntUtils.requireNotNegative(durationSeconds); this.geometrySupplier = geometrySupplier; } @@ -39,8 +41,12 @@ public LineString getGeometry() { /** * Returns an (immutable) copy of this path with the duration modified. */ - public FlexPath withDurationModifier(DurationModifier mod) { - int updatedDuration = (int) ((durationSeconds * mod.factor()) + mod.offsetInSeconds()); - return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); + public FlexPath withDurationModifier(TimePenalty mod) { + if (mod.isZero()) { + return this; + } else { + int updatedDuration = (int) mod.calculate(Duration.ofSeconds(durationSeconds)).toSeconds(); + return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); + } } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java b/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java deleted file mode 100644 index 4832a7cc9bc..00000000000 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/DurationModifier.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.opentripplanner.ext.flex.trip; - -import java.io.Serializable; -import java.time.Duration; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; - -/** - * A modifier to influence the A*-calculated driving time of flex trips. - */ -public class DurationModifier implements Serializable { - - public static DurationModifier NONE = new DurationModifier(Duration.ZERO, 1); - private final int offset; - private final float factor; - - /** - * @param offset A fixed offset to add to the driving time. - * @param factor A factor to multiply the driving time with. - */ - public DurationModifier(Duration offset, float factor) { - if (factor < 0.1) { - throw new IllegalArgumentException("Flex duration factor must not be less than 0.1"); - } - this.offset = (int) DurationUtils.requireNonNegative(offset).toSeconds(); - this.factor = factor; - } - - public float factor() { - return factor; - } - - public int offsetInSeconds() { - return offset; - } - - /** - * Check if this instance actually modifies the duration or simply passes it back without - * change. - */ - boolean modifies() { - return offset != 0 && factor != 1.0; - } - - @Override - public String toString() { - return ToStringBuilder - .of(DurationModifier.class) - .addNum("factor", factor) - .addDurationSec("offset", offset) - .toString(); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index bc3bd52cc4c..db662a5fd45 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -23,6 +23,7 @@ import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; +import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -52,7 +53,7 @@ public class UnscheduledTrip extends FlexTrip getFlexAccessTemplates( * If the modifier doesn't actually modify, we don't */ protected FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { - if (durationModifier.modifies()) { + if (!durationModifier.isZero()) { return new DurationModifierCalculator(calculator, durationModifier); } else { return calculator; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java index 7b4617048a6..cfffebe4fa7 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java @@ -2,13 +2,14 @@ import java.util.List; import org.opentripplanner.model.StopTime; +import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.framework.FeedScopedId; public class UnscheduledTripBuilder extends FlexTripBuilder { private List stopTimes; - private DurationModifier durationModifier = DurationModifier.NONE; + private TimePenalty durationModifier = TimePenalty.ZERO; UnscheduledTripBuilder(FeedScopedId id) { super(id); @@ -30,12 +31,12 @@ public List stopTimes() { return stopTimes; } - public UnscheduledTripBuilder withDurationModifier(DurationModifier factors) { + public UnscheduledTripBuilder withDurationModifier(TimePenalty factors) { this.durationModifier = factors; return this; } - public DurationModifier durationModifier() { + public TimePenalty durationModifier() { return durationModifier; } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index ec7d1379ca0..46160fa5daa 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -5,9 +5,9 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; -import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.timetable.Trip; /** Responsible for mapping GTFS TripMapper into the OTP model. */ @@ -18,7 +18,7 @@ class TripMapper { private final TranslationHelper translationHelper; private final Map mappedTrips = new HashMap<>(); - private final Map flexSafeDurationModifiers = new HashMap<>(); + private final Map flexSafeDurationModifiers = new HashMap<>(); TripMapper( RouteMapper routeMapper, @@ -45,7 +45,7 @@ Collection getMappedTrips() { /** * The map of flex duration factors per flex trip. */ - Map flexSafeDurationModifiers() { + Map flexSafeDurationModifiers() { return flexSafeDurationModifiers; } @@ -78,12 +78,12 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { return trip; } - private Optional mapSafeDurationModifier(org.onebusaway.gtfs.model.Trip rhs) { + private Optional mapSafeDurationModifier(org.onebusaway.gtfs.model.Trip rhs) { if (rhs.getSafeDurationFactor() == null && rhs.getSafeDurationOffset() == null) { return Optional.empty(); } else { var offset = Duration.ofSeconds(rhs.getSafeDurationOffset().longValue()); - return Optional.of(new DurationModifier(offset, rhs.getSafeDurationFactor().floatValue())); + return Optional.of(TimePenalty.of(offset, rhs.getSafeDurationFactor().doubleValue())); } } } diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java index 16b7bf22388..756a1ccf2a8 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.opentripplanner.ext.flex.trip.DurationModifier; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.gtfs.mapping.StaySeatedNotAllowed; @@ -24,6 +23,7 @@ import org.opentripplanner.model.calendar.impl.CalendarServiceDataFactoryImpl; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.model.transfer.TransferPoint; +import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.transit.model.basic.Notice; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.framework.DefaultEntityById; @@ -94,7 +94,7 @@ public class OtpTransitServiceBuilder { private final TripStopTimes stopTimesByTrip = new TripStopTimes(); - private final Map flexDurationFactors = new HashMap<>(); + private final Map flexDurationFactors = new HashMap<>(); private final EntityById fareZonesById = new DefaultEntityById<>(); @@ -213,7 +213,7 @@ public TripStopTimes getStopTimesSortedByTrip() { return stopTimesByTrip; } - public Map getFlexDurationFactors() { + public Map getFlexDurationFactors() { return flexDurationFactors; } diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java index 141c1d5bf6b..9424e44364b 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java @@ -131,7 +131,7 @@ void flexDurationModifier() { var mapper = defaultTripMapper(); var mapped = mapper.map(flexTrip); var mod = mapper.flexSafeDurationModifiers().get(mapped); - assertEquals(1.5f, mod.factor()); - assertEquals(600, mod.offsetInSeconds()); + assertEquals(1.5f, mod.coefficient()); + assertEquals(600, mod.constant().toSeconds()); } } From 091e4ed5620630e3f70e4eb585a733a2e28d4d2d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 18 Apr 2024 16:42:53 +0200 Subject: [PATCH 0997/1688] Update documentation --- docs/sandbox/VehicleParking.md | 100 +++++++++--------- .../updaters/VehicleParkingUpdaterConfig.java | 2 +- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/docs/sandbox/VehicleParking.md b/docs/sandbox/VehicleParking.md index 7599a762602..8d9e4942440 100644 --- a/docs/sandbox/VehicleParking.md +++ b/docs/sandbox/VehicleParking.md @@ -33,17 +33,17 @@ All updaters have the following parameters in common: -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|---------------------------------|:-----------:|----------------------------------------------|:----------:|---------------|:-----:| -| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | -| facilitiesFrequencySec | `integer` | How often the facilities should be updated. | *Optional* | `3600` | 2.2 | -| facilitiesUrl | `string` | URL of the facilities. | *Optional* | | 2.2 | -| [feedId](#u__2__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | -| hubsUrl | `string` | Hubs URL | *Optional* | | 2.2 | -| [sourceType](#u__2__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | -| [timeZone](#u__2__timeZone) | `time-zone` | The time zone of the feed. | *Optional* | | 2.2 | -| utilizationsFrequencySec | `integer` | How often the utilization should be updated. | *Optional* | `600` | 2.2 | -| utilizationsUrl | `string` | URL of the utilization data. | *Optional* | | 2.2 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|---------------------------------|:-----------:|------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | +| facilitiesFrequencySec | `integer` | How often the facilities should be updated. | *Optional* | `3600` | 2.2 | +| facilitiesUrl | `string` | URL of the facilities. | *Optional* | | 2.2 | +| [feedId](#u__2__feedId) | `string` | The id of the data source, which will be the prefix of the parking lot's id. | *Required* | | 2.2 | +| hubsUrl | `string` | Hubs URL | *Optional* | | 2.2 | +| [sourceType](#u__2__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | +| [timeZone](#u__2__timeZone) | `time-zone` | The time zone of the feed. | *Optional* | | 2.2 | +| utilizationsFrequencySec | `integer` | How often the utilization should be updated. | *Optional* | `600` | 2.2 | +| utilizationsUrl | `string` | URL of the utilization data. | *Optional* | | 2.2 | #### Details @@ -53,7 +53,7 @@ All updaters have the following parameters in common: **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required` **Path:** /updaters/[2] -The name of the data source. +The id of the data source, which will be the prefix of the parking lot's id. This will end up in the API responses as the feed id of of the parking lot. @@ -104,16 +104,16 @@ Used for converting abstract opening hours into concrete points in time. -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|---------------------------------|:---------------:|----------------------------------------------------------------------------|:----------:|---------------|:-----:| -| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [feedId](#u__3__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | -| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.2 | -| [sourceType](#u__3__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | -| [timeZone](#u__3__timeZone) | `time-zone` | The time zone of the feed. | *Optional* | | 2.2 | -| url | `string` | URL of the resource. | *Required* | | 2.2 | -| [headers](#u__3__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.2 | -| [tags](#u__3__tags) | `string[]` | Tags to add to the parking lots. | *Optional* | | 2.2 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|---------------------------------|:---------------:|------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [feedId](#u__3__feedId) | `string` | The id of the data source, which will be the prefix of the parking lot's id. | *Required* | | 2.2 | +| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.2 | +| [sourceType](#u__3__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | +| [timeZone](#u__3__timeZone) | `time-zone` | The time zone of the feed. | *Optional* | | 2.2 | +| url | `string` | URL of the resource. | *Required* | | 2.2 | +| [headers](#u__3__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.2 | +| [tags](#u__3__tags) | `string[]` | Tags to add to the parking lots. | *Optional* | | 2.2 | #### Details @@ -123,7 +123,7 @@ Used for converting abstract opening hours into concrete points in time. **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required` **Path:** /updaters/[3] -The name of the data source. +The id of the data source, which will be the prefix of the parking lot's id. This will end up in the API responses as the feed id of of the parking lot. @@ -191,14 +191,14 @@ Tags to add to the parking lots. -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|---------------------------------|:---------------:|----------------------------------------------------------------------------|:----------:|---------------|:-----:| -| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [feedId](#u__4__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | -| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.3 | -| [sourceType](#u__4__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | -| url | `uri` | URL of the locations endpoint. | *Required* | | 2.3 | -| [headers](#u__4__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|---------------------------------|:---------------:|------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [feedId](#u__4__feedId) | `string` | The id of the data source, which will be the prefix of the parking lot's id. | *Required* | | 2.2 | +| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.3 | +| [sourceType](#u__4__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | +| url | `uri` | URL of the locations endpoint. | *Required* | | 2.3 | +| [headers](#u__4__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.3 | #### Details @@ -208,7 +208,7 @@ Tags to add to the parking lots. **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required` **Path:** /updaters/[4] -The name of the data source. +The id of the data source, which will be the prefix of the parking lot's id. This will end up in the API responses as the feed id of of the parking lot. @@ -256,14 +256,14 @@ HTTP headers to add to the request. Any header key, value can be inserted. -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|---------------------------------|:---------------:|----------------------------------------------------------------------------|:----------:|---------------|:-----:| -| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [feedId](#u__5__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | -| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.6 | -| [sourceType](#u__5__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | -| url | `uri` | URL of the locations endpoint. | *Required* | | 2.6 | -| [headers](#u__5__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.6 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|---------------------------------|:---------------:|------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [feedId](#u__5__feedId) | `string` | The id of the data source, which will be the prefix of the parking lot's id. | *Required* | | 2.2 | +| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.6 | +| [sourceType](#u__5__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | +| url | `uri` | URL of the locations endpoint. | *Required* | | 2.6 | +| [headers](#u__5__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.6 | #### Details @@ -273,7 +273,7 @@ HTTP headers to add to the request. Any header key, value can be inserted. **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required` **Path:** /updaters/[5] -The name of the data source. +The id of the data source, which will be the prefix of the parking lot's id. This will end up in the API responses as the feed id of of the parking lot. @@ -317,14 +317,14 @@ HTTP headers to add to the request. Any header key, value can be inserted. -| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | -|----------------------------------|:---------------:|----------------------------------------------------------------------------|:----------:|---------------|:-----:| -| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | -| [feedId](#u__13__feedId) | `string` | The name of the data source. | *Required* | | 2.2 | -| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.6 | -| [sourceType](#u__13__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | -| url | `uri` | URL of the locations endpoint. | *Required* | | 2.6 | -| [headers](#u__13__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.6 | +| Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | +|----------------------------------|:---------------:|------------------------------------------------------------------------------|:----------:|---------------|:-----:| +| type = "vehicle-parking" | `enum` | The type of the updater. | *Required* | | 1.5 | +| [feedId](#u__13__feedId) | `string` | The id of the data source, which will be the prefix of the parking lot's id. | *Required* | | 2.2 | +| frequency | `duration` | How often to update the source. | *Optional* | `"PT1M"` | 2.6 | +| [sourceType](#u__13__sourceType) | `enum` | The source of the vehicle updates. | *Required* | | 2.2 | +| url | `uri` | URL of the locations endpoint. | *Required* | | 2.6 | +| [headers](#u__13__headers) | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted. | *Optional* | | 2.6 | #### Details @@ -334,7 +334,7 @@ HTTP headers to add to the request. Any header key, value can be inserted. **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required` **Path:** /updaters/[13] -The name of the data source. +The id of the data source, which will be the prefix of the parking lot's id. This will end up in the API responses as the feed id of of the parking lot. diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java index d04e1900795..c687899009f 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/VehicleParkingUpdaterConfig.java @@ -28,7 +28,7 @@ public static VehicleParkingUpdaterParameters create(String updaterRef, NodeAdap var feedId = c .of("feedId") .since(V2_2) - .summary("The name of the data source.") + .summary("The id of the data source, which will be the prefix of the parking lot's id.") .description("This will end up in the API responses as the feed id of of the parking lot.") .asString(); return switch (sourceType) { From 355b287cb844464379c592ba94f8b6ecc850282e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 18 Apr 2024 16:56:31 +0200 Subject: [PATCH 0998/1688] Update documentation --- .../org/opentripplanner/ext/flex/trip/UnscheduledTrip.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index db662a5fd45..7fa31c78114 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -151,8 +151,8 @@ public Stream getFlexAccessTemplates( } /** - * Get the correct {@link FlexPathCalculator} depending on the {@code durationModified}. - * If the modifier doesn't actually modify, we don't + * Get the correct {@link FlexPathCalculator} depending on the {@code durationModifier}. + * If the modifier doesn't actually modify, we return the regular calculator. */ protected FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { if (!durationModifier.isZero()) { From cd166d80abb4714227db585eb04fd0479bfb25ae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 00:05:45 +0000 Subject: [PATCH 0999/1688] Update dependency ch.qos.logback:logback-classic to v1.5.6 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 66d2919b3c4..7aa9edec631 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ 5.10.2 1.12.3 5.5.3 - 1.5.3 + 1.5.6 9.10.0 2.0.13 2.0.15 From 7440b8aca2e613df9780e75e255c500d9d3266b4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 00:05:51 +0000 Subject: [PATCH 1000/1688] Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7aa9edec631..01971b3804e 100644 --- a/pom.xml +++ b/pom.xml @@ -993,7 +993,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.2 + 3.2.3 sign-artifacts From c5d87a14f0c9e6aa9d692e7e795a32619d96072f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 10:36:07 +0000 Subject: [PATCH 1001/1688] Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.4 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 01971b3804e..1dffab1348e 100644 --- a/pom.xml +++ b/pom.xml @@ -993,7 +993,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sign-artifacts From aa92132cea37082140cf9aba55d6dcb46da7dab6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 22:22:29 +0000 Subject: [PATCH 1002/1688] Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1dffab1348e..adb529027d1 100644 --- a/pom.xml +++ b/pom.xml @@ -158,7 +158,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.0 + 3.4.1 From 6588a9f1887ef82c3d00f2e6f057e4f8287c2c64 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Tue, 23 Apr 2024 18:25:52 +0800 Subject: [PATCH 1003/1688] add separate Travel Time Analysis docs page moved info out of v1-v2 comparison and accessibility pages --- docs/Accessibility.md | 17 +++++------------ docs/Analysis.md | 21 +++++++++++++++++++++ docs/Version-Comparison.md | 33 ++++++++------------------------- docs/sandbox/TravelTime.md | 6 +++++- mkdocs.yml | 1 + 5 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 docs/Analysis.md diff --git a/docs/Accessibility.md b/docs/Accessibility.md index c5820facc40..49373c522c2 100644 --- a/docs/Accessibility.md +++ b/docs/Accessibility.md @@ -2,24 +2,17 @@ ## Preamble -In this document and in OTP, the term "accessibility" is used with what has become its most common +In this document and in OTP, the term "accessibility" is used with its most common meaning: design of products, devices, services, vehicles, or environments to ensure they are usable by -people with disabilities. It has other meanings in other contexts (see below). +people with disabilities. If you have reached this page looking for cumulative opportunities +accessibility indicators (access to opportunities metrics) please see the [Analysis](Analysis.md) page. + While accessibility is a complex subject, at this point GTFS and Netex mostly represent it very simply as a yes/no possibility of wheelchair use. While OTP developers hope to broaden the scope and nuance of accessibility support in OTP, the lack of detailed data from data producers -currently limits implementation and discussion in this document to this binary +currently limits implementation and discussion in this document to this binary "wheelchair accessible" definition. -The term "accessibility" has a completely separate, unrelated definition in the fields of -spatial analysis, urban transportation planning, and associated social sciences, where it refers to -quantitative indicators of how well-connected a particular location is to people or opportunities. -OpenTripPlanner has been widely used in research settings for the calculation of such accessibility -indicators. If this is what you're looking for, see the documentation sections [on isochrones](sandbox/TravelTime.md) and [analysis](Version-Comparison.md/#analysis). -Although this meaning of the term dates back many decades, it is less well known and has become a -source of confusion, so the academic and planning communities are gradually shifting to the -expression "access to opportunities", often shortened to "access". - ## Unknown data Many agencies have the same problem: data on wheelchair-accessibility is, if it exists at all, diff --git a/docs/Analysis.md b/docs/Analysis.md new file mode 100644 index 00000000000..867e90869c4 --- /dev/null +++ b/docs/Analysis.md @@ -0,0 +1,21 @@ +# Travel Time Analysis + +## Background + +Since the beginning of the project, many OTP contributors and users have been primarily interested in research, spatial analysis, and urban planning use cases. They have prototyped many ideas within or on top of the OTP codebase, including one-to-many searches producing travel time grids, isochrones, and access-to-opportunities indicators (see Terminology Note below). This has historically been a major area of application for OpenTripPlanner and has helped popularize cumulative opportunities metrics in urban planning. For example, the University of Minnesota Accessibility Observatory used OpenTripPlanner for [Access Across America](https://www.cts.umn.edu/programs/ao/aaa). + +Although we consider these use cases quite important, most work of this kind has long since shifted to separate projects focused on urban planning and analytics. As of version 2, OTP has chosen to focus entirely on passenger information rather than analytics. + +## Travel Time Analysis in OTP1 + +Much of the analysis code present in the v1.x legacy branch of OTP is essentially an unmaintained and unsupported early prototype for later projects, specifically [R5](https://github.com/conveyal/r5/) and the [Conveyal Analysis](https://conveyal.com/learn) system built upon it. OTP1 seems to have gained popularity for analysis uses due to the existence of documentation and an active user community, but has significant technical shortcomings. One of these is simply speed: OTP1 can be orders of magnitude slower (and more memory-intensive) than the approaches used in R5. The other is the requirement to search at a single specific time. Travel times and especially wait times on scheduled transit vary greatly depending on when you depart. Accounting for variation over a time window requires repeated independent searches at each possible departure time, which is very inefficient. R5 is highly optimized to capture variations in travel time across time windows and account for uncertainty in waiting times on frequency-based routes. + +## Travel Time Analysis in OTP2 + +OTP2's new transit router is quite similar to R5 (indeed it was directly influenced by R5) and would not face the same technical problems. Nonetheless, we have decided not to port the OTP1 analysis features over to OTP2 since it would broaden the scope of OTP2 away from passenger information and draw the finite amount of available attention and resources away from existing open source analytics tools. If you would like to apply the routing innovations present in OTP2 in analytics situations, we recommend taking a look at projects like R5 or the R and Python language wrappers for it created by the community. + +Some analytics features may still be available as optional "sandbox" features in OTP2 (such as [Travel Time](sandbox/TravelTime.md)), but these do not work in the same way as the features you may have used or read about in OTP1. They are unmaintained and unsupported, and may be removed in the near future. + +## Terminology Note + +In OpenTripPlanner, we usually use the term "accessibility" with its most common meaning: design of products, devices, services, vehicles, or environments to ensure they are usable by people with disabilities. The term "accessibility" has a completely separate, unrelated definition in the fields of spatial analysis, urban transportation planning, and associated social sciences, where it refers to quantitative indicators of how well-connected a particular location is to people or opportunities. OTP has been widely used in research and planning settings for the calculation of such indicators. Although this meaning of the term dates back many decades, it is less well known and has become a source of confusion, so the academic and planning communities are gradually shifting to the expression "access to opportunities", often shortened to "access". diff --git a/docs/Version-Comparison.md b/docs/Version-Comparison.md index 454188d022e..48257bdbd54 100644 --- a/docs/Version-Comparison.md +++ b/docs/Version-Comparison.md @@ -81,31 +81,14 @@ other projects where they are more actively developed. ### Analysis -Many OpenTripPlanner contributors have been primarily interested in transportation and urban -planning use cases. We consider these use cases quite important. This has been a major area of -application for OpenTripPlanner and has helped popularize cumulative opportunities accessibility -metrics. For example, the University of Minnesota Accessibility Observatory used OpenTripPlanner -for [Access Across America](http://access.umn.edu/research/america/). Nonetheless, the analysis code -in OTP1 is essentially an unmaintained and unsupported early prototype for later projects, -specifically Conveyal's R5 (and the Conveyal Analysis system built upon it). OTP1 seems to have -gained popularity for analysis uses due to the existence of documentation and an active user -community, but has significant technical shortcomings. One of these is simply speed: OTP1 can be -orders of magnitude slower (and more memory-intensive) than the approaches exemplified in R5. The -other is the requirement to search at a single specific time. Travel times and especially wait times -on scheduled transit vary greatly depending on when you depart. Accounting for variation over a time -window requires repeated independent searches at each possible departure time, which is very -inefficient. R5 is highly optimized to capture variations in travel time across time windows and -account for uncertainty in waiting times on frequency-based routes. - -Due to its similarity to the R5 approach, OTP2's transit router would not have these same problems. -Nonetheless, we have decided not to port the OTP1 analysis features over to OTP2 since it would -broaden the focus away from passenger information and draw finite attention away from existing -projects like R5 and Conveyal Analysis. - -Accordingly, we have made an effort to clean up and augment OTP1 analysis documentation for -researchers who will continue to need it. It should remain possible for people to continue using -OTP1 if they prefer. If you would instead like to apply the innovations present in OTP2, we -recommend looking into R5 or Conveyal Analysis. +From the beginning of the project, many OTP contributors and users have used OTP in research, +analysis, and planning applications. They have prototyped many ideas within the OTP codebase, +including one-to-many searches producing travel time grids, isochrones, and access-to-opportunities +metrics. While some of these features may still be available as optional "sandbox" features in OTP2, they are unsupported and may be removed in the near future. + +Most work of this kind moved over separate projects focused on urban planning and analytics. As of +version 2, OTP has chosen to focus entirely on passenger information rather than analytics +applications. See the [Analysis](Analysis.md) page for more details. ### Routers API and Hot Reloading diff --git a/docs/sandbox/TravelTime.md b/docs/sandbox/TravelTime.md index 335d454c529..817f71506f3 100644 --- a/docs/sandbox/TravelTime.md +++ b/docs/sandbox/TravelTime.md @@ -11,7 +11,11 @@ ## Documentation The API produces a snapshot of travel time form a single place to places around it. The results can -be fetched either as a set of isochrones or a raster map. +be fetched either as a set of isochrones or a raster map. Please note that as a sandbox feature this +functionality is UNSUPPORTED and neither maintained nor well-understood by most current OTP +developers, and may not be accurate or reliable. Travel time analytics work that began within OTP +has moved years ago to other projects, where it actively continues. See the +[Analysis](../Analysis.md) page for further details. ### Configuration diff --git a/mkdocs.yml b/mkdocs.yml index c14e451a906..da976615d1b 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -84,6 +84,7 @@ nav: - "Stop Area Relations": 'StopAreas.md' - "Street Graph Pruning": 'IslandPruning.md' - Accessibility: 'Accessibility.md' + - "Travel Time Analysis": 'Analysis.md' - "Logging": "Logging.md" - Development: - "Developers' Guide": 'Developers-Guide.md' From e2cc0e57a50eb68d563ef38e45c66b2ecb0a97de Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 24 Apr 2024 01:04:50 +0000 Subject: [PATCH 1004/1688] Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index adb529027d1..ce89fc467e6 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ properly if some input files are missing a terminating newline) --> org.apache.maven.plugins maven-shade-plugin - 3.5.2 + 3.5.3 package From 2edd276ae23d3ac5f3e199f46095b74839776105 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Wed, 24 Apr 2024 23:15:43 +0300 Subject: [PATCH 1005/1688] Create factory for OtpHttpClient and some refactoring --- .../ridehailing/service/uber/UberService.java | 3 +- .../updater/SiriETGooglePubsubUpdater.java | 5 +- .../ext/siri/updater/SiriHttpLoader.java | 3 +- .../azure/AbstractAzureSiriUpdater.java | 5 +- .../SmooveBikeRentalDataSource.java | 7 +- .../vehicleparking/bikely/BikelyUpdater.java | 3 +- .../hslpark/HslFacilitiesDownloader.java | 6 +- .../hslpark/HslHubsDownloader.java | 6 +- .../hslpark/HslParkUpdater.java | 15 +- .../VehicleRentalServiceDirectoryFetcher.java | 17 ++- .../https/HttpsDataSourceRepository.java | 5 +- .../datastore/https/HttpsFileDataSource.java | 3 +- .../framework/io/JsonDataListDownloader.java | 2 +- .../framework/io/OtpHttpClient.java | 113 +-------------- .../framework/io/OtpHttpClientFactory.java | 137 ++++++++++++++++++ .../alert/GtfsRealtimeAlertsUpdater.java | 3 +- .../configure/UpdaterConfigurator.java | 6 +- .../updater/spi/GenericJsonDataSource.java | 3 +- .../trip/GtfsRealtimeTripUpdateSource.java | 3 +- ...GtfsRealtimeHttpVehiclePositionSource.java | 3 +- .../datasources/GbfsFeedLoader.java | 3 +- .../GbfsVehicleRentalDataSource.java | 5 +- .../VehicleRentalDataSourceFactory.java | 8 +- .../datasources/GbfsFeedLoaderTest.java | 10 +- .../GbfsVehicleRentalDataSourceTest.java | 12 +- 25 files changed, 223 insertions(+), 163 deletions(-) create mode 100644 src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java b/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java index 42ec65716de..9b276fc053e 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/service/uber/UberService.java @@ -25,6 +25,7 @@ import org.opentripplanner.ext.ridehailing.service.oauth.UrlEncodedOAuthService; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.transit.model.basic.Money; import org.slf4j.Logger; @@ -79,7 +80,7 @@ public UberService(RideHailingServiceParameters config) { this.timeEstimateUri = timeEstimateUri; this.bannedTypes = bannedTypes; this.wheelchairAccessibleProductId = wheelchairAccessibleProductId; - this.otpHttpClient = new OtpHttpClient(LOG); + this.otpHttpClient = new OtpHttpClientFactory().create(LOG); } @Override diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index 84c6c9abab1..9a1c5690c58 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -28,7 +28,7 @@ import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; import org.opentripplanner.framework.application.ApplicationShutdownSupport; -import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.retry.OtpRetry; import org.opentripplanner.framework.retry.OtpRetryBuilder; import org.opentripplanner.framework.text.FileSizeToTextConverter; @@ -312,7 +312,8 @@ private void initializeData() { } private ByteString fetchInitialData() { - try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { + try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { + var otpHttpClient = otpHttpClientFactory.create(LOG); return otpHttpClient.getAndMap( dataInitializationUrl, initialGetDataTimeout, diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java index a94580a4ce5..daf3d0397cc 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHttpLoader.java @@ -4,6 +4,7 @@ import java.time.Duration; import java.util.Optional; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.updater.spi.HttpHeaders; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +36,7 @@ public SiriHttpLoader( this.timeout = timeout; this.requestHeaders = requestHeaders; this.previewInterval = previewInterval; - this.otpHttpClient = new OtpHttpClient(timeout, timeout, LOG); + this.otpHttpClient = new OtpHttpClientFactory(timeout, timeout).create(LOG); } /** diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java index 9aa2e1d9a66..f211468cc66 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java @@ -25,7 +25,7 @@ import org.opentripplanner.ext.siri.EntityResolver; import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; import org.opentripplanner.framework.application.ApplicationShutdownSupport; -import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; @@ -206,7 +206,8 @@ public String getConfigRef() { protected Optional fetchInitialSiriData(URI uri) { var headers = HttpHeaders.of().acceptApplicationXML().build().asMap(); - try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { + try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { + var otpHttpClient = otpHttpClientFactory.create(LOG); var t1 = System.currentTimeMillis(); var siriOptional = otpHttpClient.executeAndMapOptional( new HttpGet(uri), diff --git a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java index 73f46ecd501..3876ff44651 100644 --- a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java +++ b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java @@ -4,6 +4,7 @@ import java.util.Map; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; @@ -33,14 +34,14 @@ public class SmooveBikeRentalDataSource private final RentalVehicleType vehicleType; public SmooveBikeRentalDataSource(SmooveBikeRentalDataSourceParameters config) { - this(config, new OtpHttpClient(LOG)); + this(config, new OtpHttpClientFactory()); } public SmooveBikeRentalDataSource( SmooveBikeRentalDataSourceParameters config, - OtpHttpClient otpHttpClient + OtpHttpClientFactory otpHttpClientFactory ) { - super(config.url(), "result", config.httpHeaders(), otpHttpClient); + super(config.url(), "result", config.httpHeaders(), otpHttpClientFactory.create(LOG)); networkName = config.getNetwork(DEFAULT_NETWORK_NAME); vehicleType = RentalVehicleType.getDefaultType(networkName); overloadingAllowed = config.overloadingAllowed(); diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java index 1c711d6d347..2bed1121913 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/bikely/BikelyUpdater.java @@ -15,6 +15,7 @@ import org.opentripplanner.framework.i18n.LocalizedString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces; @@ -44,7 +45,7 @@ public class BikelyUpdater implements DataSource { .put("lonMax", 0) .put("latMin", 0) .put("latMax", 0); - private final OtpHttpClient httpClient = new OtpHttpClient(LOG); + private final OtpHttpClient httpClient = new OtpHttpClientFactory().create(LOG); private final BikelyUpdaterParameters parameters; private List lots; diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java index 4b89eabe19a..dcf4ffe29d9 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslFacilitiesDownloader.java @@ -12,6 +12,7 @@ import java.util.function.BiFunction; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingGroup; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -31,12 +32,13 @@ public class HslFacilitiesDownloader { public HslFacilitiesDownloader( String url, String jsonParsePath, - BiFunction, VehicleParking> facilitiesParser + BiFunction, VehicleParking> facilitiesParser, + OtpHttpClientFactory otpHttpClientFactory ) { this.url = url; this.jsonParsePath = jsonParsePath; this.facilitiesParser = facilitiesParser; - this.otpHttpClient = new OtpHttpClient(LOG); + this.otpHttpClient = otpHttpClientFactory.create(LOG); } public List downloadFacilities( diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java index 102551705df..f1f98b6139c 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslHubsDownloader.java @@ -11,6 +11,7 @@ import java.util.function.Function; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.routing.vehicle_parking.VehicleParkingGroup; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.slf4j.Logger; @@ -29,12 +30,13 @@ public class HslHubsDownloader { public HslHubsDownloader( String url, String jsonParsePath, - Function> hubsParser + Function> hubsParser, + OtpHttpClientFactory otpHttpClientFactory ) { this.url = url; this.jsonParsePath = jsonParsePath; this.hubsParser = hubsParser; - otpHttpClient = new OtpHttpClient(LOG); + otpHttpClient = otpHttpClientFactory.create(LOG); } public Map downloadHubs() { diff --git a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java index e5086630941..f5c5b33ef29 100644 --- a/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/vehicleparking/hslpark/HslParkUpdater.java @@ -4,6 +4,7 @@ import java.util.Map; import java.util.stream.Collectors; import org.opentripplanner.framework.io.JsonDataListDownloader; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingGroup; @@ -11,6 +12,8 @@ import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces.VehicleParkingSpacesBuilder; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.updater.spi.DataSource; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Vehicle parking updater class for https://github.com/HSLdevcom/parkandrideAPI format APIs. There @@ -19,6 +22,8 @@ */ public class HslParkUpdater implements DataSource { + private static final Logger LOG = LoggerFactory.getLogger(HslParkUpdater.class); + private static final String JSON_PARSE_PATH = "results"; private final HslFacilitiesDownloader facilitiesDownloader; @@ -43,24 +48,28 @@ public HslParkUpdater( new HslParkToVehicleParkingMapper(feedId, openingHoursCalendarService, parameters.timeZone()); vehicleParkingGroupMapper = new HslHubToVehicleParkingGroupMapper(feedId); parkPatchMapper = new HslParkUtilizationToPatchMapper(feedId); + var otpHttpClientFactory = new OtpHttpClientFactory(); facilitiesDownloader = new HslFacilitiesDownloader( parameters.facilitiesUrl(), JSON_PARSE_PATH, - vehicleParkingMapper::parsePark + vehicleParkingMapper::parsePark, + otpHttpClientFactory ); hubsDownloader = new HslHubsDownloader( parameters.hubsUrl(), JSON_PARSE_PATH, - vehicleParkingGroupMapper::parseHub + vehicleParkingGroupMapper::parseHub, + otpHttpClientFactory ); utilizationsDownloader = new JsonDataListDownloader<>( parameters.utilizationsUrl(), "", parkPatchMapper::parseUtilization, - Map.of() + Map.of(), + otpHttpClientFactory.create(LOG) ); this.facilitiesFrequencySec = parameters.facilitiesFrequencySec(); } diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java index 05c54178c7b..9b350dec345 100644 --- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java +++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java @@ -10,8 +10,8 @@ import java.util.Map; import java.util.Optional; import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters; -import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.json.JsonUtils; import org.opentripplanner.routing.linking.VertexLinker; import org.opentripplanner.service.vehiclerental.VehicleRentalRepository; @@ -35,16 +35,16 @@ public class VehicleRentalServiceDirectoryFetcher { private final VertexLinker vertexLinker; private final VehicleRentalRepository repository; - private final OtpHttpClient otpHttpClient; + private final OtpHttpClientFactory otpHttpClientFactory; public VehicleRentalServiceDirectoryFetcher( VertexLinker vertexLinker, VehicleRentalRepository repository, - OtpHttpClient otpHttpClient + OtpHttpClientFactory otpHttpClientFactory ) { this.vertexLinker = vertexLinker; this.repository = repository; - this.otpHttpClient = otpHttpClient; + this.otpHttpClientFactory = otpHttpClientFactory; } public static List createUpdatersFromEndpoint( @@ -61,12 +61,12 @@ public static List createUpdatersFromEndpoint( } int maxHttpConnections = sources.size(); - var otpHttpClient = new OtpHttpClient(maxHttpConnections, LOG); + var otpHttpClientFactory = new OtpHttpClientFactory(maxHttpConnections); var serviceDirectory = new VehicleRentalServiceDirectoryFetcher( vertexLinker, repository, - otpHttpClient + otpHttpClientFactory ); return serviceDirectory.createUpdatersFromEndpoint(parameters, sources); } @@ -146,7 +146,7 @@ private VehicleRentalUpdater fetchAndCreateUpdater( var dataSource = VehicleRentalDataSourceFactory.create( vehicleRentalParameters.sourceParameters(), - otpHttpClient + otpHttpClientFactory ); return new VehicleRentalUpdater(vehicleRentalParameters, dataSource, vertexLinker, repository); } @@ -154,7 +154,8 @@ private VehicleRentalUpdater fetchAndCreateUpdater( private static JsonNode listSources(VehicleRentalServiceDirectoryFetcherParameters parameters) { JsonNode node; URI url = parameters.getUrl(); - try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { + try { + var otpHttpClient = new OtpHttpClientFactory().create(LOG); node = otpHttpClient.getAndMapAsJsonNode(url, Map.of(), new ObjectMapper()); } catch (OtpHttpClientException e) { LOG.warn("Error fetching list of vehicle rental endpoints from {}", url, e); diff --git a/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java b/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java index 402007ea394..56afc888c73 100644 --- a/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java +++ b/src/main/java/org/opentripplanner/datastore/https/HttpsDataSourceRepository.java @@ -11,7 +11,7 @@ import org.opentripplanner.datastore.api.FileType; import org.opentripplanner.datastore.base.DataSourceRepository; import org.opentripplanner.datastore.file.ZipStreamDataSourceDecorator; -import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -79,7 +79,8 @@ private CompositeDataSource createCompositeSource(URI uri, FileType type) { } protected List
      getHttpHeaders(URI uri) { - try (OtpHttpClient otpHttpClient = new OtpHttpClient(LOG)) { + try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { + var otpHttpClient = otpHttpClientFactory.create(LOG); return otpHttpClient.getHeaders(uri, HTTP_HEAD_REQUEST_TIMEOUT, Map.of()); } } diff --git a/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java b/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java index 9b55019332f..f81f42f9c77 100644 --- a/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java +++ b/src/main/java/org/opentripplanner/datastore/https/HttpsFileDataSource.java @@ -13,6 +13,7 @@ import org.opentripplanner.datastore.file.DirectoryDataSource; import org.opentripplanner.datastore.file.ZipFileDataSource; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +40,7 @@ final class HttpsFileDataSource implements DataSource { this.uri = uri; this.type = type; this.httpsDataSourceMetadata = httpsDataSourceMetadata; - otpHttpClient = new OtpHttpClient(LOG); + otpHttpClient = new OtpHttpClientFactory().create(LOG); } /** diff --git a/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java b/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java index b45604b26aa..3577a7c3646 100644 --- a/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java +++ b/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java @@ -30,7 +30,7 @@ public JsonDataListDownloader( @Nonnull Function elementParser, @Nonnull Map headers ) { - this(url, jsonParsePath, elementParser, headers, new OtpHttpClient(LOG)); + this(url, jsonParsePath, elementParser, headers, new OtpHttpClientFactory().create(LOG)); } public JsonDataListDownloader( diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java index 959f2cbb496..678eb4754bd 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClient.java @@ -20,14 +20,9 @@ import org.apache.hc.client5.http.classic.methods.HttpGet; import org.apache.hc.client5.http.classic.methods.HttpPost; import org.apache.hc.client5.http.classic.methods.HttpUriRequestBase; -import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.RequestConfig; import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse; -import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; -import org.apache.hc.client5.http.impl.classic.HttpClients; -import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; -import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; import org.apache.hc.core5.http.ClassicHttpResponse; import org.apache.hc.core5.http.ContentType; import org.apache.hc.core5.http.Header; @@ -35,11 +30,7 @@ import org.apache.hc.core5.http.HttpHeaders; import org.apache.hc.core5.http.HttpResponse; import org.apache.hc.core5.http.io.HttpClientResponseHandler; -import org.apache.hc.core5.http.io.SocketConfig; import org.apache.hc.core5.http.io.entity.StringEntity; -import org.apache.hc.core5.pool.PoolConcurrencyPolicy; -import org.apache.hc.core5.pool.PoolReusePolicy; -import org.apache.hc.core5.util.TimeValue; import org.apache.hc.core5.util.Timeout; import org.slf4j.Logger; @@ -52,107 +43,26 @@ *

      Exception management

      * Exceptions thrown during network operations or response mapping are wrapped in * {@link OtpHttpClientException} - *

      Timeout configuration

      - * The same timeout value is applied to the following parameters: - *
        - *
      • Connection request timeout: the maximum waiting time for leasing a connection in the - * connection pool. - *
      • Connect timeout: the maximum waiting time for the first packet received from the server. - *
      • Socket timeout: the maximum waiting time between two packets received from the server. - *
      - * The default timeout is set to 5 seconds. - *

      Connection time-to-live

      - * Maximum time an HTTP connection can stay in the connection pool before being closed. - * Note that HTTP 1.1 and HTTP/2 rely on persistent connections and the HTTP server is allowed to - * close idle connections at any time. - * The default connection time-to-live is set to 1 minute. *

      Resource management

      - * It is recommended to use the getAndMapXXX and postAndMapXXX methods - * in this class since they - * ensure that the underlying network resources are properly released. - * The method {@link #getAsInputStream} gives access to an input stream on the body response but - * requires the caller to close this stream. For most use cases, this method is not recommended . - *

      Connection Pooling

      - * The connection pool holds by default a maximum of 25 connections, with maximum 5 connections - * per host. + * It is recommended to use the getAndMapXXX and postAndMapXXX methods in + * this class since they ensure that the underlying network resources are properly released. The + * method {@link #getAsInputStream} gives access to an input stream on the body response but + * requires the caller to close this stream. For most use cases, this method is not recommended. * *

      Thread-safety

      * Instances of this class are thread-safe. */ -public class OtpHttpClient implements AutoCloseable { - - private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(5); - - private static final Duration DEFAULT_TTL = Duration.ofMinutes(1); - - /** - * see {@link PoolingHttpClientConnectionManager#DEFAULT_MAX_TOTAL_CONNECTIONS} - */ - public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 25; +public class OtpHttpClient { private final CloseableHttpClient httpClient; private final Logger log; - /** - * Creates an HTTP client with default timeout, default connection time-to-live and default max - * number of connections. - */ - public OtpHttpClient(Logger logger) { - this(DEFAULT_TIMEOUT, DEFAULT_TTL, logger); - } - - /** - * Creates an HTTP client with default timeout, default connection time-to-live and the given max - * number of connections. - */ - public OtpHttpClient(int maxConnections, Logger logger) { - this(DEFAULT_TIMEOUT, DEFAULT_TTL, maxConnections, logger); - } - - /** - * Creates an HTTP client the given timeout and connection time-to-live and the default max - * number of connections. - */ - public OtpHttpClient(Duration timeout, Duration connectionTtl, Logger logger) { - this(timeout, connectionTtl, DEFAULT_MAX_TOTAL_CONNECTIONS, logger); - } - /** * Creates an HTTP client with custom configuration. */ - private OtpHttpClient( - Duration timeout, - Duration connectionTtl, - int maxConnections, - Logger logger - ) { - Objects.requireNonNull(timeout); - Objects.requireNonNull(connectionTtl); - - PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder - .create() - .setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(Timeout.of(timeout)).build()) - .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT) - .setConnPoolPolicy(PoolReusePolicy.LIFO) - .setMaxConnTotal(maxConnections) - .setDefaultConnectionConfig( - ConnectionConfig - .custom() - .setSocketTimeout(Timeout.of(timeout)) - .setConnectTimeout(Timeout.of(timeout)) - .setTimeToLive(TimeValue.of(connectionTtl)) - .build() - ) - .build(); - - HttpClientBuilder httpClientBuilder = HttpClients - .custom() - .setUserAgent("OpenTripPlanner") - .setConnectionManager(connectionManager) - .setDefaultRequestConfig(requestConfig(timeout)); - - httpClient = httpClientBuilder.build(); + OtpHttpClient(CloseableHttpClient httpClient, Logger logger) { + this.httpClient = httpClient; log = logger; } @@ -357,15 +267,6 @@ public Optional executeAndMapOptional( ); } - @Override - public void close() { - try { - httpClient.close(); - } catch (IOException e) { - throw new OtpHttpClientException(e); - } - } - /** * Executes an HTTP GET request and returns an input stream on the response body. The caller must * close the stream in order to release resources. Use preferably the provided getAndMapXXX diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java new file mode 100644 index 00000000000..a6436168541 --- /dev/null +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClientFactory.java @@ -0,0 +1,137 @@ +package org.opentripplanner.framework.io; + +import java.io.IOException; +import java.time.Duration; +import java.util.Objects; +import org.apache.hc.client5.http.config.ConnectionConfig; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.classic.HttpClients; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager; +import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder; +import org.apache.hc.core5.http.io.SocketConfig; +import org.apache.hc.core5.pool.PoolConcurrencyPolicy; +import org.apache.hc.core5.pool.PoolReusePolicy; +import org.apache.hc.core5.util.TimeValue; +import org.apache.hc.core5.util.Timeout; +import org.slf4j.Logger; + +/** + * Factory for creating {@link OtpHttpClient} instances. These instances will share the same + * {@link CloseableHttpClient} instance. + * + *

      Timeout configuration

      + * The same timeout value is applied to the following parameters: + *
        + *
      • Connection request timeout: the maximum waiting time for leasing a connection in the + * connection pool. + *
      • Connect timeout: the maximum waiting time for the first packet received from the server. + *
      • Socket timeout: the maximum waiting time between two packets received from the server. + *
      + * The default timeout is set to 5 seconds. + *

      Connection time-to-live

      + * Maximum time an HTTP connection can stay in the connection pool before being closed. + * Note that HTTP 1.1 and HTTP/2 rely on persistent connections and the HTTP server is allowed to + * close idle connections at any time. + * The default connection time-to-live is set to 1 minute. + *

      Connection Pooling

      + * The connection pool holds by default a maximum of 25 connections, with maximum 5 connections + * per host. + * + *

      Thread-safety

      + * Instances of this class are thread-safe. + */ +public class OtpHttpClientFactory implements AutoCloseable { + + private static final Duration DEFAULT_TIMEOUT = Duration.ofSeconds(5); + + private static final Duration DEFAULT_TTL = Duration.ofMinutes(1); + + /** + * see {@link PoolingHttpClientConnectionManager#DEFAULT_MAX_TOTAL_CONNECTIONS} + */ + public static final int DEFAULT_MAX_TOTAL_CONNECTIONS = 25; + + private final CloseableHttpClient httpClient; + + /** + * Creates an HTTP client with default timeout, default connection time-to-live and default max + * number of connections. + */ + public OtpHttpClientFactory() { + this(DEFAULT_TIMEOUT, DEFAULT_TTL); + } + + /** + * Creates an HTTP client with default timeout, default connection time-to-live and the given max + * number of connections. + */ + public OtpHttpClientFactory(int maxConnections) { + this(DEFAULT_TIMEOUT, DEFAULT_TTL, maxConnections); + } + + /** + * Creates an HTTP client the given timeout and connection time-to-live and the default max + * number of connections. + */ + public OtpHttpClientFactory(Duration timeout, Duration connectionTtl) { + this(timeout, connectionTtl, DEFAULT_MAX_TOTAL_CONNECTIONS); + } + + /** + * Creates an HTTP client with custom configuration. + */ + private OtpHttpClientFactory(Duration timeout, Duration connectionTtl, int maxConnections) { + Objects.requireNonNull(timeout); + Objects.requireNonNull(connectionTtl); + + PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder + .create() + .setDefaultSocketConfig(SocketConfig.custom().setSoTimeout(Timeout.of(timeout)).build()) + .setPoolConcurrencyPolicy(PoolConcurrencyPolicy.STRICT) + .setConnPoolPolicy(PoolReusePolicy.LIFO) + .setMaxConnTotal(maxConnections) + .setDefaultConnectionConfig( + ConnectionConfig + .custom() + .setSocketTimeout(Timeout.of(timeout)) + .setConnectTimeout(Timeout.of(timeout)) + .setTimeToLive(TimeValue.of(connectionTtl)) + .build() + ) + .build(); + + HttpClientBuilder httpClientBuilder = HttpClients + .custom() + .setUserAgent("OpenTripPlanner") + .setConnectionManager(connectionManager) + .setDefaultRequestConfig(requestConfig(timeout)); + + httpClient = httpClientBuilder.build(); + } + + public OtpHttpClient create(Logger logger) { + return new OtpHttpClient(httpClient, logger); + } + + @Override + public void close() { + try { + httpClient.close(); + } catch (IOException e) { + throw new OtpHttpClientException(e); + } + } + + /** + * Configures the request with a custom timeout. + */ + private static RequestConfig requestConfig(Duration timeout) { + return RequestConfig + .custom() + .setResponseTimeout(Timeout.of(timeout)) + .setConnectionRequestTimeout(Timeout.of(timeout)) + .build(); + } +} diff --git a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java index ca5434d2e7b..364972531c2 100644 --- a/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java +++ b/src/main/java/org/opentripplanner/updater/alert/GtfsRealtimeAlertsUpdater.java @@ -3,6 +3,7 @@ import com.google.transit.realtime.GtfsRealtime.FeedMessage; import java.net.URI; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.impl.TransitAlertServiceImpl; import org.opentripplanner.routing.services.TransitAlertService; @@ -50,7 +51,7 @@ public GtfsRealtimeAlertsUpdater( this.updateHandler.setFeedId(config.feedId()); this.updateHandler.setTransitAlertService(transitAlertService); this.updateHandler.setFuzzyTripMatcher(fuzzyTripMatcher); - this.otpHttpClient = new OtpHttpClient(LOG); + this.otpHttpClient = new OtpHttpClientFactory().create(LOG); LOG.info("Creating real-time alert updater running every {}: {}", pollingPeriod(), url); } diff --git a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java index 5286173041c..3b6f7f52279 100644 --- a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java +++ b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java @@ -10,7 +10,7 @@ import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdater; import org.opentripplanner.ext.vehiclerentalservicedirectory.VehicleRentalServiceDirectoryFetcher; import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters; -import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository; @@ -141,11 +141,11 @@ private List createUpdatersFromConfig() { if (!updatersParameters.getVehicleRentalParameters().isEmpty()) { int maxHttpConnections = updatersParameters.getVehicleRentalParameters().size(); - OtpHttpClient otpHttpClient = new OtpHttpClient(maxHttpConnections, LOG); + var otpHttpClientFactory = new OtpHttpClientFactory(maxHttpConnections); for (var configItem : updatersParameters.getVehicleRentalParameters()) { var source = VehicleRentalDataSourceFactory.create( configItem.sourceParameters(), - otpHttpClient + otpHttpClientFactory ); updaters.add( new VehicleRentalUpdater(configItem, source, graph.getLinker(), vehicleRentalRepository) diff --git a/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java b/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java index 11e4717df26..894c0a0466f 100644 --- a/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java +++ b/src/main/java/org/opentripplanner/updater/spi/GenericJsonDataSource.java @@ -4,6 +4,7 @@ import java.util.List; import org.opentripplanner.framework.io.JsonDataListDownloader; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -15,7 +16,7 @@ public abstract class GenericJsonDataSource implements DataSource { protected List updates = List.of(); protected GenericJsonDataSource(String url, String jsonParsePath, HttpHeaders headers) { - this(url, jsonParsePath, headers, new OtpHttpClient(LOG)); + this(url, jsonParsePath, headers, new OtpHttpClientFactory().create(LOG)); } protected GenericJsonDataSource( diff --git a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java index 3fa9fc6e779..12a044424ca 100644 --- a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java @@ -10,6 +10,7 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.updater.spi.HttpHeaders; import org.slf4j.Logger; @@ -33,7 +34,7 @@ public GtfsRealtimeTripUpdateSource(PollingTripUpdaterParameters config) { this.url = config.url(); this.headers = HttpHeaders.of().acceptProtobuf().add(config.headers()).build(); MfdzRealtimeExtensions.registerAllExtensions(registry); - otpHttpClient = new OtpHttpClient(LOG); + otpHttpClient = new OtpHttpClientFactory().create(LOG); } public List getUpdates() { diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java b/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java index d68a67eaa9a..ec0be6822e7 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_position/GtfsRealtimeHttpVehiclePositionSource.java @@ -9,6 +9,7 @@ import java.util.List; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.updater.spi.HttpHeaders; import org.slf4j.Logger; @@ -33,7 +34,7 @@ public class GtfsRealtimeHttpVehiclePositionSource { public GtfsRealtimeHttpVehiclePositionSource(URI url, HttpHeaders headers) { this.url = url; this.headers = HttpHeaders.of().acceptProtobuf().add(headers).build(); - this.otpHttpClient = new OtpHttpClient(LOG); + this.otpHttpClient = new OtpHttpClientFactory().create(LOG); } /** diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java index 87f58f24f85..d4e5cbd4952 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java @@ -13,6 +13,7 @@ import org.entur.gbfs.v2_3.gbfs.GBFSFeeds; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.updater.spi.HttpHeaders; import org.opentripplanner.updater.spi.UpdaterConstructionException; import org.slf4j.Logger; @@ -98,7 +99,7 @@ public GbfsFeedLoader( } GbfsFeedLoader(String url, HttpHeaders httpHeaders, String languageCode) { - this(url, httpHeaders, languageCode, new OtpHttpClient(LOG)); + this(url, httpHeaders, languageCode, new OtpHttpClientFactory().create(LOG)); } /** diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java index 8cc8897f0de..aed214102ff 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java @@ -16,6 +16,7 @@ import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleTypes; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; @@ -46,10 +47,10 @@ class GbfsVehicleRentalDataSource implements VehicleRentalDatasource { public GbfsVehicleRentalDataSource( GbfsVehicleRentalDataSourceParameters parameters, - OtpHttpClient otpHttpClient + OtpHttpClientFactory otpHttpClientFactory ) { this.params = parameters; - this.otpHttpClient = otpHttpClient; + this.otpHttpClient = otpHttpClientFactory.create(LOG); } @Override diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java index 50e26d82459..bd921a70edb 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/VehicleRentalDataSourceFactory.java @@ -2,7 +2,7 @@ import org.opentripplanner.ext.smoovebikerental.SmooveBikeRentalDataSource; import org.opentripplanner.ext.smoovebikerental.SmooveBikeRentalDataSourceParameters; -import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.updater.vehicle_rental.datasources.params.GbfsVehicleRentalDataSourceParameters; import org.opentripplanner.updater.vehicle_rental.datasources.params.VehicleRentalDataSourceParameters; @@ -10,7 +10,7 @@ public class VehicleRentalDataSourceFactory { public static VehicleRentalDatasource create( VehicleRentalDataSourceParameters source, - OtpHttpClient otpHttpClient + OtpHttpClientFactory otpHttpClientFactory ) { return switch (source.sourceType()) { // There used to be a lot more updaters and corresponding config variables here, but since @@ -20,11 +20,11 @@ public static VehicleRentalDatasource create( // and become the point of contact for the community. case GBFS -> new GbfsVehicleRentalDataSource( (GbfsVehicleRentalDataSourceParameters) source, - otpHttpClient + otpHttpClientFactory ); case SMOOVE -> new SmooveBikeRentalDataSource( (SmooveBikeRentalDataSourceParameters) source, - otpHttpClient + otpHttpClientFactory ); }; } diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java index 2c5c36b29e7..9a0dbcdfe87 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java @@ -28,9 +28,8 @@ import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleTypes; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.updater.spi.HttpHeaders; -import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** @@ -92,11 +91,10 @@ void getV10FeedWithExplicitLanguage() { @Test @Disabled void fetchAllPublicFeeds() { - try ( - OtpHttpClient otpHttpClient = new OtpHttpClient( + try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { + var otpHttpClient = otpHttpClientFactory.create( LoggerFactory.getLogger(GbfsFeedLoaderTest.class) - ) - ) { + ); List exceptions = otpHttpClient.getAndMap( URI.create("https://raw.githubusercontent.com/NABSA/gbfs/master/systems.csv"), Map.of(), diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java index 9ac5f2d44d2..018a3d06e5b 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java @@ -10,22 +10,18 @@ import java.util.Map; import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleType; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.io.OtpHttpClient; +import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.updater.spi.HttpHeaders; import org.opentripplanner.updater.vehicle_rental.datasources.params.GbfsVehicleRentalDataSourceParameters; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * This tests the mapping between data coming from a {@link GbfsFeedLoader} to OTP station models. */ class GbfsVehicleRentalDataSourceTest { - private static final Logger LOG = LoggerFactory.getLogger(GbfsVehicleRentalDataSourceTest.class); - @Test void makeStationFromV22() { var dataSource = new GbfsVehicleRentalDataSource( @@ -38,7 +34,7 @@ void makeStationFromV22() { false, false ), - new OtpHttpClient(LOG) + new OtpHttpClientFactory() ); dataSource.setup(); @@ -129,7 +125,7 @@ void geofencing() { true, false ), - new OtpHttpClient(LOG) + new OtpHttpClientFactory() ); dataSource.setup(); @@ -171,7 +167,7 @@ void makeStationFromV10() { false, true ), - new OtpHttpClient(LOG) + new OtpHttpClientFactory() ); dataSource.setup(); From 576326b53e7597f7c709a06abcf751888103e116 Mon Sep 17 00:00:00 2001 From: Johan Torin Date: Wed, 24 Apr 2024 19:10:33 +0200 Subject: [PATCH 1006/1688] Fix handling of implicit access and egress mode parameters. If the 'modes' section is present but the nested 'access' or 'egress' parameters are not, then only transit that originates from/arrives directly at the stop should be used for the trip, just as if the parameter was present and set to null. Fix this by setting the corresponding mode to NOT_SET in the cases where 'modes' is specified but the parameter is not. Adapt and add tests to cover these cases better. --- .../mapping/RequestModesMapper.java | 9 ++- .../mapping/RequestModesMapperTest.java | 37 +++++++--- .../mapping/TripRequestMapperTest.java | 70 +++++++++++++++++-- 3 files changed, 99 insertions(+), 17 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java index e7a13dcacc9..469d6868658 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java @@ -15,7 +15,6 @@ class RequestModesMapper { * Maps GraphQL Modes input type to RequestModes. *

      * This only maps access, egress, direct & transfer modes. Transport modes are set using filters. - * Default modes are WALK for access, egress & transfer. */ static RequestModes mapRequestModes(Map modesInput) { RequestModesBuilder mBuilder = RequestModes.of(); @@ -24,11 +23,11 @@ static RequestModes mapRequestModes(Map modesInput) { StreetMode accessMode = (StreetMode) modesInput.get(accessModeKey); mBuilder.withAccessMode(accessMode); mBuilder.withTransferMode(accessMode == StreetMode.BIKE ? StreetMode.BIKE : StreetMode.WALK); + } else { + mBuilder.withAccessMode(StreetMode.NOT_SET); } - if (modesInput.containsKey(egressModeKey)) { - mBuilder.withEgressMode((StreetMode) modesInput.get(egressModeKey)); - } - // An unset directMode should overwrite the walk default, so we don't check for existence first. + // Non-existing values and null are later translated into NOT_SET. + mBuilder.withEgressMode((StreetMode) modesInput.get(egressModeKey)); mBuilder.withDirectMode((StreetMode) modesInput.get(directModeKey)); return mBuilder.build(); diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java index b8d08c7d7f5..d897fc808c2 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapperTest.java @@ -1,6 +1,6 @@ package org.opentripplanner.apis.transmodel.mapping; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Map; import org.junit.jupiter.api.Test; @@ -9,11 +9,32 @@ class RequestModesMapperTest { + private static final RequestModes MODES_NOT_SET = RequestModes + .of() + .withAccessMode(StreetMode.NOT_SET) + .withEgressMode(StreetMode.NOT_SET) + .withDirectMode(StreetMode.NOT_SET) + .build(); + @Test void testMapRequestModesEmptyMapReturnsDefaults() { Map inputModes = Map.of(); - RequestModes wantModes = RequestModes.of().withDirectMode(null).build(); + RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); + + assertEquals(MODES_NOT_SET, mappedModes); + } + + @Test + void testMapRequestModesScooterRentalAccessSetReturnsDefaultsForOthers() { + Map inputModes = Map.of("accessMode", StreetMode.SCOOTER_RENTAL); + + RequestModes wantModes = MODES_NOT_SET + .copyOf() + .withAccessMode(StreetMode.SCOOTER_RENTAL) + .withTransferMode(StreetMode.WALK) + .withDirectMode(null) + .build(); RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); @@ -21,11 +42,11 @@ void testMapRequestModesEmptyMapReturnsDefaults() { } @Test - void testMapRequestModesAccessSetReturnsDefaultsForOthers() { + void testMapRequestModesBikeAccessSetReturnsDefaultsForOthers() { Map inputModes = Map.of("accessMode", StreetMode.BIKE); - RequestModes wantModes = RequestModes - .of() + RequestModes wantModes = MODES_NOT_SET + .copyOf() .withAccessMode(StreetMode.BIKE) .withTransferMode(StreetMode.BIKE) .withDirectMode(null) @@ -40,8 +61,8 @@ void testMapRequestModesAccessSetReturnsDefaultsForOthers() { void testMapRequestModesEgressSetReturnsDefaultsForOthers() { Map inputModes = Map.of("egressMode", StreetMode.CAR); - RequestModes wantModes = RequestModes - .of() + RequestModes wantModes = MODES_NOT_SET + .copyOf() .withEgressMode(StreetMode.CAR) .withDirectMode(null) .build(); @@ -55,7 +76,7 @@ void testMapRequestModesEgressSetReturnsDefaultsForOthers() { void testMapRequestModesDirectSetReturnsDefaultsForOthers() { Map inputModes = Map.of("directMode", StreetMode.CAR); - RequestModes wantModes = RequestModes.of().withDirectMode(StreetMode.CAR).build(); + RequestModes wantModes = MODES_NOT_SET.copyOf().withDirectMode(StreetMode.CAR).build(); RequestModes mappedModes = RequestModesMapper.mapRequestModes(inputModes); diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index e35f198d16e..22524a0297b 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -15,11 +15,13 @@ import io.micrometer.core.instrument.Metrics; import java.time.Duration; import java.time.LocalDate; +import java.util.Collections; import java.util.List; import java.util.Locale; import java.util.Map; import java.util.function.Function; import java.util.stream.Stream; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -64,7 +66,6 @@ public class TripRequestMapperTest implements PlanTestConstants { private static TransitModelForTest TEST_MODEL = TransitModelForTest.of(); - static final TransmodelRequestContext context; private static final Duration MAX_FLEXIBLE = Duration.ofMinutes(20); private static final Function STOP_TO_ID = s -> s.getId().toString(); @@ -76,8 +77,12 @@ public class TripRequestMapperTest implements PlanTestConstants { private static final RegularStop stop2 = TEST_MODEL.stop("ST:stop2", 2, 1).build(); private static final RegularStop stop3 = TEST_MODEL.stop("ST:stop3", 3, 1).build(); + private static final Graph graph = new Graph(); + private static final DefaultTransitService transitService; + + private TransmodelRequestContext context; + static { - var graph = new Graph(); var itinerary = newItinerary(Place.forStop(stop1), time("11:00")) .bus(route1, 1, time("11:05"), time("11:20"), Place.forStop(stop2)) .bus(route2, 2, time("11:20"), time("11:40"), Place.forStop(stop3)) @@ -103,8 +108,12 @@ public class TripRequestMapperTest implements PlanTestConstants { transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); transitModel.index(); - final var transitService = new DefaultTransitService(transitModel); - var defaultRequest = new RouteRequest(); + transitService = new DefaultTransitService(transitModel); + } + + @BeforeEach + void setup() { + final RouteRequest defaultRequest = new RouteRequest(); // Change defaults for FLEXIBLE to a lower value than the default 45m. This should restrict the // input to be less than 20m, not 45m. @@ -335,6 +344,59 @@ void testPassThroughPointsNoMatch() { assertEquals("No match for F:XX:NonExisting.", ex.getMessage()); } + @Test + public void testNoModes() { + var req = TripRequestMapper.createRequest(executionContext(Map.of())); + + assertEquals(StreetMode.WALK, req.journey().access().mode()); + assertEquals(StreetMode.WALK, req.journey().egress().mode()); + assertEquals(StreetMode.WALK, req.journey().direct().mode()); + assertEquals(StreetMode.WALK, req.journey().transfer().mode()); + } + + @Test + public void testEmptyModes() { + Map arguments = Map.of("modes", Map.of()); + var req = TripRequestMapper.createRequest(executionContext(arguments)); + + assertEquals(StreetMode.NOT_SET, req.journey().access().mode()); + assertEquals(StreetMode.NOT_SET, req.journey().egress().mode()); + assertEquals(StreetMode.NOT_SET, req.journey().direct().mode()); + assertEquals(StreetMode.WALK, req.journey().transfer().mode()); + } + + @Test + public void testExplicitModes() { + Map arguments = Map.of( + "modes", + Map.of( + "accessMode", + StreetMode.SCOOTER_RENTAL, + "egressMode", + StreetMode.BIKE_RENTAL, + "directMode", + StreetMode.BIKE_TO_PARK + ) + ); + var req = TripRequestMapper.createRequest(executionContext(arguments)); + + assertEquals(StreetMode.SCOOTER_RENTAL, req.journey().access().mode()); + assertEquals(StreetMode.BIKE_RENTAL, req.journey().egress().mode()); + assertEquals(StreetMode.BIKE_TO_PARK, req.journey().direct().mode()); + assertEquals(StreetMode.WALK, req.journey().transfer().mode()); + } + + @Test + public void testExplicitModesBikeAccess() { + Map arguments = Map.of("modes", Map.of("accessMode", StreetMode.BIKE)); + var req = TripRequestMapper.createRequest(executionContext(arguments)); + + assertEquals(StreetMode.BIKE, req.journey().access().mode()); + assertEquals(StreetMode.NOT_SET, req.journey().egress().mode()); + assertEquals(StreetMode.NOT_SET, req.journey().direct().mode()); + assertEquals(StreetMode.BIKE, req.journey().transfer().mode()); + } + private DataFetchingEnvironment executionContext(Map arguments) { ExecutionInput executionInput = ExecutionInput .newExecutionInput() From 3572d3b7178d271a18077c29461172e053db67b3 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Thu, 25 Apr 2024 15:48:04 +0800 Subject: [PATCH 1007/1688] de-emphasize mailing list in landing page --- docs/index.md | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/docs/index.md b/docs/index.md index f1ddc791212..b10013af235 100644 --- a/docs/index.md +++ b/docs/index.md @@ -60,12 +60,7 @@ your own OTP instance, the best place to start is the [Basic Tutorial](Basic-Tut # Getting help -The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) -where most of the core developers are. -You can also send questions and comments to the [mailing list](http://groups.google.com/group/opentripplanner-users) -or file bug reports via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). -Note that the issue tracker is not intended for support questions or discussions. Please use the -chat or the mailing list instead. +The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) where most of the core developers are. Bug reports may be filed via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). The issue tracker is not intended for support questions or discussions. Please use the chat for this purpose. The OpenTripPlanner [mailing list](http://groups.google.com/group/opentripplanner-users) is treated as a legacy communications channel and used almost exclusively for project announcements. Again, please direct development and support discussions to the Gitter chat. # Financial and In-Kind Support From 965fe275a47d4e81244e86fb4dc5672caa3adbd9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Apr 2024 12:26:55 +0000 Subject: [PATCH 1008/1688] Update Debug UI dependencies (non-major) --- client-next/package-lock.json | 188 +++++++++++++++++----------------- client-next/package.json | 14 +-- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 08a9146ceb1..0eb34f02228 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -12,7 +12,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.1.2", + "maplibre-gl": "4.1.3", "react": "18.2.0", "react-bootstrap": "2.10.2", "react-dom": "18.2.0", @@ -23,13 +23,13 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.2", + "@testing-library/react": "15.0.4", "@types/react": "18.2.79", "@types/react-dom": "18.2.25", - "@typescript-eslint/eslint-plugin": "7.7.0", - "@typescript-eslint/parser": "7.7.0", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.5.0", + "@vitest/coverage-v8": "1.5.2", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", @@ -40,8 +40,8 @@ "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.5", - "vite": "5.2.8", - "vitest": "1.5.0" + "vite": "5.2.10", + "vitest": "1.5.2" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -3372,9 +3372,9 @@ } }, "node_modules/@testing-library/react": { - "version": "15.0.2", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.2.tgz", - "integrity": "sha512-5mzIpuytB1ctpyywvyaY2TAAUQVCZIGqwiqFQf6u9lvj/SJQepGUzNV18Xpk+NLCaCE2j7CWrZE0tEf9xLZYiQ==", + "version": "15.0.4", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.4.tgz", + "integrity": "sha512-Fw/LM1emOHKfCxv5R0tz+25TOtiMt0o5Np1zJmb4LbSacOagXQX4ooAaHiJfGUMe+OjUk504BX11W+9Z8CvyZA==", "dev": true, "dependencies": { "@babel/runtime": "^7.12.5", @@ -3576,16 +3576,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.0.tgz", - "integrity": "sha512-GJWR0YnfrKnsRoluVO3PRb9r5aMZriiMMM/RHj5nnTrBy1/wIgk76XCtCKcnXGjpZQJQRFtGV9/0JJ6n30uwpQ==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz", + "integrity": "sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.7.0", - "@typescript-eslint/type-utils": "7.7.0", - "@typescript-eslint/utils": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0", + "@typescript-eslint/scope-manager": "7.7.1", + "@typescript-eslint/type-utils": "7.7.1", + "@typescript-eslint/utils": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.3.1", @@ -3644,15 +3644,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.0.tgz", - "integrity": "sha512-fNcDm3wSwVM8QYL4HKVBggdIPAy9Q41vcvC/GtDobw3c4ndVT3K6cqudUmjHPw8EAp4ufax0o58/xvWaP2FmTg==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.1.tgz", + "integrity": "sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.7.0", - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/typescript-estree": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0", + "@typescript-eslint/scope-manager": "7.7.1", + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/typescript-estree": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1", "debug": "^4.3.4" }, "engines": { @@ -3672,13 +3672,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.0.tgz", - "integrity": "sha512-/8INDn0YLInbe9Wt7dK4cXLDYp0fNHP5xKLHvZl3mOT5X17rK/YShXaiNmorl+/U4VKCVIjJnx4Ri5b0y+HClw==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz", + "integrity": "sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0" + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3689,13 +3689,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.0.tgz", - "integrity": "sha512-bOp3ejoRYrhAlnT/bozNQi3nio9tIgv3U5C0mVDdZC7cpcQEDZXvq8inrHYghLVwuNABRqrMW5tzAv88Vy77Sg==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz", + "integrity": "sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.7.0", - "@typescript-eslint/utils": "7.7.0", + "@typescript-eslint/typescript-estree": "7.7.1", + "@typescript-eslint/utils": "7.7.1", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3716,9 +3716,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.0.tgz", - "integrity": "sha512-G01YPZ1Bd2hn+KPpIbrAhEWOn5lQBrjxkzHkWvP6NucMXFtfXoevK82hzQdpfuQYuhkvFDeQYbzXCjR1z9Z03w==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.1.tgz", + "integrity": "sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==", "dev": true, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3729,13 +3729,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.0.tgz", - "integrity": "sha512-8p71HQPE6CbxIBy2kWHqM1KGrC07pk6RJn40n0DSc6bMOBBREZxSDJ+BmRzc8B5OdaMh1ty3mkuWRg4sCFiDQQ==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz", + "integrity": "sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/visitor-keys": "7.7.0", + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/visitor-keys": "7.7.1", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3790,17 +3790,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.0.tgz", - "integrity": "sha512-LKGAXMPQs8U/zMRFXDZOzmMKgFv3COlxUQ+2NMPhbqgVm6R1w+nU1i4836Pmxu9jZAuIeyySNrN/6Rc657ggig==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.1.tgz", + "integrity": "sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.15", "@types/semver": "^7.5.8", - "@typescript-eslint/scope-manager": "7.7.0", - "@typescript-eslint/types": "7.7.0", - "@typescript-eslint/typescript-estree": "7.7.0", + "@typescript-eslint/scope-manager": "7.7.1", + "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/typescript-estree": "7.7.1", "semver": "^7.6.0" }, "engines": { @@ -3848,12 +3848,12 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.7.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.0.tgz", - "integrity": "sha512-h0WHOj8MhdhY8YWkzIF30R379y0NqyOHExI9N9KCzvmu05EgG4FumeYa3ccfKUSphyWkWQE1ybVrgz/Pbam6YA==", + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz", + "integrity": "sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.7.0", + "@typescript-eslint/types": "7.7.1", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -3890,9 +3890,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.5.0.tgz", - "integrity": "sha512-1igVwlcqw1QUMdfcMlzzY4coikSIBN944pkueGi0pawrX5I5Z+9hxdTR+w3Sg6Q3eZhvdMAs8ZaF9JuTG1uYOQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.5.2.tgz", + "integrity": "sha512-QJqxRnbCwNtbbegK9E93rBmhN3dbfG1bC/o52Bqr0zGCYhQzwgwvrJBG7Q8vw3zilX6Ryy6oa/mkZku2lLJx1Q==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.1", @@ -3913,17 +3913,17 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "1.5.0" + "vitest": "1.5.2" } }, "node_modules/@vitest/expect": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.0.tgz", - "integrity": "sha512-0pzuCI6KYi2SIC3LQezmxujU9RK/vwC1U9R0rLuGlNGcOuDWxqWKu6nUdFsX9tH1WU0SXtAxToOsEjeUn1s3hA==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.2.tgz", + "integrity": "sha512-rf7MTD1WCoDlN3FfYJ9Llfp0PbdtOMZ3FIF0AVkDnKbp3oiMW1c8AmvRZBcqbAhDUAvF52e9zx4WQM1r3oraVA==", "dev": true, "dependencies": { - "@vitest/spy": "1.5.0", - "@vitest/utils": "1.5.0", + "@vitest/spy": "1.5.2", + "@vitest/utils": "1.5.2", "chai": "^4.3.10" }, "funding": { @@ -3931,12 +3931,12 @@ } }, "node_modules/@vitest/runner": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.0.tgz", - "integrity": "sha512-7HWwdxXP5yDoe7DTpbif9l6ZmDwCzcSIK38kTSIt6CFEpMjX4EpCgT6wUmS0xTXqMI6E/ONmfgRKmaujpabjZQ==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.2.tgz", + "integrity": "sha512-7IJ7sJhMZrqx7HIEpv3WrMYcq8ZNz9L6alo81Y6f8hV5mIE6yVZsFoivLZmr0D777klm1ReqonE9LyChdcmw6g==", "dev": true, "dependencies": { - "@vitest/utils": "1.5.0", + "@vitest/utils": "1.5.2", "p-limit": "^5.0.0", "pathe": "^1.1.1" }, @@ -3972,9 +3972,9 @@ } }, "node_modules/@vitest/snapshot": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.0.tgz", - "integrity": "sha512-qpv3fSEuNrhAO3FpH6YYRdaECnnRjg9VxbhdtPwPRnzSfHVXnNzzrpX4cJxqiwgRMo7uRMWDFBlsBq4Cr+rO3A==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.2.tgz", + "integrity": "sha512-CTEp/lTYos8fuCc9+Z55Ga5NVPKUgExritjF5VY7heRFUfheoAqBneUlvXSUJHUZPjnPmyZA96yLRJDP1QATFQ==", "dev": true, "dependencies": { "magic-string": "^0.30.5", @@ -4018,9 +4018,9 @@ "dev": true }, "node_modules/@vitest/spy": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.0.tgz", - "integrity": "sha512-vu6vi6ew5N5MMHJjD5PoakMRKYdmIrNJmyfkhRpQt5d9Ewhw9nZ5Aqynbi3N61bvk9UvZ5UysMT6ayIrZ8GA9w==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.2.tgz", + "integrity": "sha512-xCcPvI8JpCtgikT9nLpHPL1/81AYqZy1GCy4+MCHBE7xi8jgsYkULpW5hrx5PGLgOQjUpb6fd15lqcriJ40tfQ==", "dev": true, "dependencies": { "tinyspy": "^2.2.0" @@ -4030,9 +4030,9 @@ } }, "node_modules/@vitest/utils": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.0.tgz", - "integrity": "sha512-BDU0GNL8MWkRkSRdNFvCUCAVOeHaUlVJ9Tx0TYBZyXaaOTmGtUFObzchCivIBrIwKzvZA7A9sCejVhXM2aY98A==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.2.tgz", + "integrity": "sha512-sWOmyofuXLJ85VvXNsroZur7mOJGiQeM0JN3/0D1uU8U9bGFM69X1iqHaRXl6R8BwaLY6yPCogP257zxTzkUdA==", "dev": true, "dependencies": { "diff-sequences": "^29.6.3", @@ -8333,9 +8333,9 @@ } }, "node_modules/maplibre-gl": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.2.tgz", - "integrity": "sha512-98T+3BesL4w/N39q/rgs9q6HzHLG6pgbS9UaTqg6fMISfzy2WGKokjK205ENFDDmEljj54/LTfdXgqg2XfYU4A==", + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.3.tgz", + "integrity": "sha512-nMy5h0kzq9Z66C6AIb3p2BvLIVHz75dGGQow22x+h9/VOihr0IPQI26ylAi6lHqvEy2VqjiRmKAMlFwt0xFKfQ==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -10842,9 +10842,9 @@ } }, "node_modules/vite": { - "version": "5.2.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.8.tgz", - "integrity": "sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA==", + "version": "5.2.10", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.10.tgz", + "integrity": "sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==", "dev": true, "dependencies": { "esbuild": "^0.20.1", @@ -10897,9 +10897,9 @@ } }, "node_modules/vite-node": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.0.tgz", - "integrity": "sha512-tV8h6gMj6vPzVCa7l+VGq9lwoJjW8Y79vst8QZZGiuRAfijU+EEWuc0kFpmndQrWhMMhet1jdSF+40KSZUqIIw==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.2.tgz", + "integrity": "sha512-Y8p91kz9zU+bWtF7HGt6DVw2JbhyuB2RlZix3FPYAYmUyZ3n7iTp8eSyLyY6sxtPegvxQtmlTMhfPhUfCUF93A==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -10919,16 +10919,16 @@ } }, "node_modules/vitest": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.0.tgz", - "integrity": "sha512-d8UKgR0m2kjdxDWX6911uwxout6GHS0XaGH1cksSIVVG8kRlE7G7aBw7myKQCvDI5dT4j7ZMa+l706BIORMDLw==", + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.2.tgz", + "integrity": "sha512-l9gwIkq16ug3xY7BxHwcBQovLZG75zZL0PlsiYQbf76Rz6QGs54416UWMtC0jXeihvHvcHrf2ROEjkQRVpoZYw==", "dev": true, "dependencies": { - "@vitest/expect": "1.5.0", - "@vitest/runner": "1.5.0", - "@vitest/snapshot": "1.5.0", - "@vitest/spy": "1.5.0", - "@vitest/utils": "1.5.0", + "@vitest/expect": "1.5.2", + "@vitest/runner": "1.5.2", + "@vitest/snapshot": "1.5.2", + "@vitest/spy": "1.5.2", + "@vitest/utils": "1.5.2", "acorn-walk": "^8.3.2", "chai": "^4.3.10", "debug": "^4.3.4", @@ -10942,7 +10942,7 @@ "tinybench": "^2.5.1", "tinypool": "^0.8.3", "vite": "^5.0.0", - "vite-node": "1.5.0", + "vite-node": "1.5.2", "why-is-node-running": "^2.2.2" }, "bin": { @@ -10957,8 +10957,8 @@ "peerDependencies": { "@edge-runtime/vm": "*", "@types/node": "^18.0.0 || >=20.0.0", - "@vitest/browser": "1.5.0", - "@vitest/ui": "1.5.0", + "@vitest/browser": "1.5.2", + "@vitest/ui": "1.5.2", "happy-dom": "*", "jsdom": "*" }, diff --git a/client-next/package.json b/client-next/package.json index 643acd1c082..0fe51abdad8 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -21,7 +21,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.1.2", + "maplibre-gl": "4.1.3", "react": "18.2.0", "react-bootstrap": "2.10.2", "react-dom": "18.2.0", @@ -32,13 +32,13 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.2", + "@testing-library/react": "15.0.4", "@types/react": "18.2.79", "@types/react-dom": "18.2.25", - "@typescript-eslint/eslint-plugin": "7.7.0", - "@typescript-eslint/parser": "7.7.0", + "@typescript-eslint/eslint-plugin": "7.7.1", + "@typescript-eslint/parser": "7.7.1", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.5.0", + "@vitest/coverage-v8": "1.5.2", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", @@ -49,7 +49,7 @@ "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.5", - "vite": "5.2.8", - "vitest": "1.5.0" + "vite": "5.2.10", + "vitest": "1.5.2" } } From a5d91fb0e8cf12a8ba38dd76ed257e2b4ab732d1 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Thu, 25 Apr 2024 14:59:04 +0200 Subject: [PATCH 1009/1688] Resolve review comments --- .../opentripplanner/raptor/spi/RaptorCostCalculator.java | 2 +- .../raptoradapter/transit/cost/CostCalculatorFactory.java | 4 ++-- .../raptoradapter/transit/cost/DefaultCostCalculator.java | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java b/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java index f69d5410fc4..7a9928e51aa 100644 --- a/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java +++ b/src/main/java/org/opentripplanner/raptor/spi/RaptorCostCalculator.java @@ -53,7 +53,7 @@ int boardingCost( /** * Used for estimating the remaining value for a criteria at a given stop arrival. The calculated * value should be an optimistic estimate for the heuristics to work properly. So, to calculate - * the generalized cost for given the {@code minTravelTime} and {@code minNumTransfers} retuning + * the generalized cost for given the {@code minTravelTime} and {@code minNumTransfers} returning * the greatest value, which is guaranteed to be less than the * real value would be correct and a good choice. */ diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java index 3a79b25e678..fef7b3509e3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java @@ -6,11 +6,11 @@ public class CostCalculatorFactory { public static RaptorCostCalculator createCostCalculator( GeneralizedCostParameters generalizedCostParameters, - int[] stopTransferCosts + int[] stopBoardAlightCosts ) { RaptorCostCalculator calculator = new DefaultCostCalculator<>( generalizedCostParameters, - stopTransferCosts + stopBoardAlightCosts ); if (generalizedCostParameters.wheelchairEnabled()) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java index d5951812612..ee2f1282625 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java @@ -130,11 +130,11 @@ public int calculateRemainingMinCost(int minTravelTime, int minNumTransfers, int transitFactors.minFactor() * minTravelTime ); - } else if (stopTransferCost != null) { - // Remove cost that was added during alighting similar as we do in the costEgress() method - return (transitFactors.minFactor() * minTravelTime - stopTransferCost[fromStop]); } else { - return transitFactors.minFactor() * minTravelTime; + // Remove cost that was added during alighting similar as we do in the costEgress() method + int fixedCost = transitFactors.minFactor() * minTravelTime; + + return stopTransferCost == null ? fixedCost : fixedCost - stopTransferCost[fromStop]; } } From 329266c47897e2e883fb124fbd4f13b1fc3037f7 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 25 Apr 2024 13:08:12 +0000 Subject: [PATCH 1010/1688] Upgrade debug client to version 2024/04/2024-04-25T13:07 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 1b561ffc656..853fee5b440 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From 23cd12ef4fdc2f2d8311f1f0017a0c3624a15015 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 25 Apr 2024 13:29:26 +0000 Subject: [PATCH 1011/1688] Add changelog entry for #5783 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index d12e9a100f0..cafc677ccc6 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -15,6 +15,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Overwrite default WALK directMode when it is not set in the request, but modes is set [#5779](https://github.com/opentripplanner/OpenTripPlanner/pull/5779) - Fix trip duplication in Graph Builder DSJ mapping [#5794](https://github.com/opentripplanner/OpenTripPlanner/pull/5794) - Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) +- Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From fd8b26c75945284cf0b8c760965af21977ada59f Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 25 Apr 2024 16:47:18 +0300 Subject: [PATCH 1012/1688] Remove references to bike rental from generic downloader --- .../framework/io/JsonDataListDownloader.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java b/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java index 3577a7c3646..3affa734605 100644 --- a/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java +++ b/src/main/java/org/opentripplanner/framework/io/JsonDataListDownloader.java @@ -60,11 +60,11 @@ public List download() { try { return parseJSON(is); } catch (IllegalArgumentException e) { - LOG.warn("Error parsing bike rental feed from {}", url, e); + LOG.warn("Error parsing feed from {}", url, e); } catch (JsonProcessingException e) { - LOG.warn("Error parsing bike rental feed from {} (bad JSON of some sort)", url, e); + LOG.warn("Error parsing feed from {} (bad JSON of some sort)", url, e); } catch (IOException e) { - LOG.warn("Error reading bike rental feed from {}", url, e); + LOG.warn("Error reading feed from {}", url, e); } return null; } From cad90d3ee6074dc804caf6727468735d1edbfff3 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 25 Apr 2024 17:04:57 +0300 Subject: [PATCH 1013/1688] Get rid of numberOfItineraries, use first instead --- .../apis/gtfs/generated/GraphQLTypes.java | 10 --------- .../routerequest/RouteRequestMapper.java | 4 ++-- .../opentripplanner/apis/gtfs/schema.graphqls | 22 +++++-------------- .../routerequest/RouteRequestMapperTest.java | 5 +++-- .../apis/gtfs/queries/planConnection.graphql | 2 +- 5 files changed, 11 insertions(+), 32 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index 0a65edef4a8..3c187ca3bbe 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -3248,7 +3248,6 @@ public static class GraphQLQueryTypePlanConnectionArgs { private Integer last; private java.util.Locale locale; private GraphQLPlanModesInput modes; - private Integer numberOfItineraries; private GraphQLPlanLabeledLocationInput origin; private GraphQLPlanPreferencesInput preferences; private java.time.Duration searchWindow; @@ -3266,7 +3265,6 @@ public GraphQLQueryTypePlanConnectionArgs(Map args) { this.last = (Integer) args.get("last"); this.locale = (java.util.Locale) args.get("locale"); this.modes = new GraphQLPlanModesInput((Map) args.get("modes")); - this.numberOfItineraries = (Integer) args.get("numberOfItineraries"); this.origin = new GraphQLPlanLabeledLocationInput((Map) args.get("origin")); this.preferences = new GraphQLPlanPreferencesInput((Map) args.get("preferences")); @@ -3310,10 +3308,6 @@ public GraphQLPlanModesInput getGraphQLModes() { return this.modes; } - public Integer getGraphQLNumberOfItineraries() { - return this.numberOfItineraries; - } - public GraphQLPlanLabeledLocationInput getGraphQLOrigin() { return this.origin; } @@ -3362,10 +3356,6 @@ public void setGraphQLModes(GraphQLPlanModesInput modes) { this.modes = modes; } - public void setGraphQLNumberOfItineraries(Integer numberOfItineraries) { - this.numberOfItineraries = numberOfItineraries; - } - public void setGraphQLOrigin(GraphQLPlanLabeledLocationInput origin) { this.origin = origin; } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java index fb7785e0fda..feef589232c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java @@ -57,8 +57,8 @@ public static RouteRequest toRouteRequest( if (args.getGraphQLFirst() != null) { request.setNumItineraries(args.getGraphQLFirst()); } - } else if (args.getGraphQLNumberOfItineraries() != null) { - request.setNumItineraries(args.getGraphQLNumberOfItineraries()); + } else if (args.getGraphQLFirst() != null) { + request.setNumItineraries(args.getGraphQLFirst()); } request.withPreferences(preferences -> setPreferences(preferences, request, args, environment)); diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index ee841a170aa..aada7e9ff68 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -4237,18 +4237,6 @@ type QueryType { """ searchWindow: Duration - """ - Maximum number of itineraries that will be returned. It's possible that no itineraries are - found, paging for earlier or later itineraries can yield to results in that case. The returned - itineraries are either closest to the defined earliest departure time or to the latest arrival - time. It can make sense to search for more itineraries that what is immediately needed if there - is a possibility that more itineraries are used later on (limiting the number of returned itineraries - does not affect the performance by a lot but can affect the network bandwidth usage). During the - search for next or previous pages with `after` or `before` cursors, this field is ignored and - `first` or `last` should be used instead. - """ - numberOfItineraries: Int - """ The origin where the search starts. Usually coordinates but can also be a stop location. """ @@ -4298,11 +4286,11 @@ type QueryType { after: String """ - How many new itineraries should at maximum be returned in forward pagination. It's recommended to - use the same value as was used for the `numberOfItineraries` in the original search for optimal - performance. This parameter is part of the + How many new itineraries should at maximum be returned in either the first search or with + forward pagination. This parameter is part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) - and should be used together with the `after` parameter. + and should be used together with the `after` parameter (although `after` shouldn't be defined + in the first search). """ first: Int @@ -4317,7 +4305,7 @@ type QueryType { """ How many new itineraries should at maximum be returned in backwards pagination. It's recommended to - use the same value as was used for the `numberOfItineraries` in the original search for optimal + use the same value as was used for the `first` parameter in the original search for optimal performance. This parameter is part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) and should be used together with the `before` parameter. diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java index 1ed4a99edb7..19ac4326f9a 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java @@ -253,10 +253,11 @@ void testAfter() { } @Test - void testNumberOfItineraries() { + void testNumberOfItinerariesForSearchWithoutPaging() { var itineraries = 8; var itinArgs = createArgsCopy(ARGS); - itinArgs.put("numberOfItineraries", itineraries); + itinArgs.put("first", itineraries); + itinArgs.put("last", 3); var env = executionContext(itinArgs, LOCALE, CONTEXT); var routeRequest = RouteRequestMapper.toRouteRequest(env, CONTEXT); assertEquals(itineraries, routeRequest.numItineraries()); diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql index 2e87c4dec01..4013479ded0 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql @@ -4,7 +4,7 @@ earliestDeparture: "2023-06-13T14:30+03:00" } searchWindow: "PT2H30M" - numberOfItineraries: 5 + first: 5 origin: { location: { coordinate: { From f8dc495a83a89ba628e2a899330615dc589405e2 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 25 Apr 2024 17:17:18 +0300 Subject: [PATCH 1014/1688] Minor code style change --- .../BicyclePreferencesMapper.java | 181 +++++++++--------- .../routerequest/CarPreferencesMapper.java | 68 ++++--- .../routerequest/RouteRequestMapper.java | 17 +- .../ScooterPreferencesMapper.java | 99 +++++----- .../TransitPreferencesMapper.java | 122 ++++++------ .../routerequest/WalkPreferencesMapper.java | 36 ++-- 6 files changed, 274 insertions(+), 249 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java index 8bafc24b2c4..7205757a569 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/BicyclePreferencesMapper.java @@ -21,54 +21,57 @@ static void setBicyclePreferences( GraphQLTypes.GraphQLBicyclePreferencesInput args, DataFetchingEnvironment environment ) { - if (args != null) { - var speed = args.getGraphQLSpeed(); - if (speed != null) { - preferences.withSpeed(speed); - } - var reluctance = args.getGraphQLReluctance(); - if (reluctance != null) { - preferences.withReluctance(reluctance); - } - var boardCost = args.getGraphQLBoardCost(); - if (boardCost != null) { - preferences.withBoardCost(boardCost.toSeconds()); - } - preferences.withWalking(walk -> setBicycleWalkPreferences(walk, args.getGraphQLWalk())); - preferences.withParking(parking -> - setBicycleParkingPreferences(parking, args.getGraphQLParking(), environment) - ); - preferences.withRental(rental -> setBicycleRentalPreferences(rental, args.getGraphQLRental()) - ); - setBicycleOptimization(preferences, args.getGraphQLOptimization()); + if (args == null) { + return; + } + + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); } + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + var boardCost = args.getGraphQLBoardCost(); + if (boardCost != null) { + preferences.withBoardCost(boardCost.toSeconds()); + } + preferences.withWalking(walk -> setBicycleWalkPreferences(walk, args.getGraphQLWalk())); + preferences.withParking(parking -> + setBicycleParkingPreferences(parking, args.getGraphQLParking(), environment) + ); + preferences.withRental(rental -> setBicycleRentalPreferences(rental, args.getGraphQLRental())); + setBicycleOptimization(preferences, args.getGraphQLOptimization()); } private static void setBicycleWalkPreferences( VehicleWalkingPreferences.Builder preferences, GraphQLTypes.GraphQLBicycleWalkPreferencesInput args ) { - if (args != null) { - var speed = args.getGraphQLSpeed(); - if (speed != null) { - preferences.withSpeed(speed); - } - var mountTime = args.getGraphQLMountDismountTime(); - if (mountTime != null) { - preferences.withMountDismountTime( - DurationUtils.requireNonNegativeShort(mountTime, "bicycle mount dismount time") - ); + if (args == null) { + return; + } + + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); + } + var mountTime = args.getGraphQLMountDismountTime(); + if (mountTime != null) { + preferences.withMountDismountTime( + DurationUtils.requireNonNegativeShort(mountTime, "bicycle mount dismount time") + ); + } + var cost = args.getGraphQLCost(); + if (cost != null) { + var reluctance = cost.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); } - var cost = args.getGraphQLCost(); - if (cost != null) { - var reluctance = cost.getGraphQLReluctance(); - if (reluctance != null) { - preferences.withReluctance(reluctance); - } - var mountCost = cost.getGraphQLMountDismountCost(); - if (mountCost != null) { - preferences.withMountDismountCost(mountCost.toSeconds()); - } + var mountCost = cost.getGraphQLMountDismountCost(); + if (mountCost != null) { + preferences.withMountDismountCost(mountCost.toSeconds()); } } } @@ -78,46 +81,50 @@ private static void setBicycleParkingPreferences( GraphQLTypes.GraphQLBicycleParkingPreferencesInput args, DataFetchingEnvironment environment ) { - if (args != null) { - var unpreferredCost = args.getGraphQLUnpreferredCost(); - if (unpreferredCost != null) { - preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds()); - } - var filters = getParkingFilters(environment, "bicycle"); - preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters)); - preferences.withBannedVehicleParkingTags(parseNotFilters(filters)); - var preferred = getParkingPreferred(environment, "bicycle"); - preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred)); - preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred)); + if (args == null) { + return; } + + var unpreferredCost = args.getGraphQLUnpreferredCost(); + if (unpreferredCost != null) { + preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds()); + } + var filters = getParkingFilters(environment, "bicycle"); + preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters)); + preferences.withBannedVehicleParkingTags(parseNotFilters(filters)); + var preferred = getParkingPreferred(environment, "bicycle"); + preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred)); + preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred)); } private static void setBicycleRentalPreferences( VehicleRentalPreferences.Builder preferences, GraphQLTypes.GraphQLBicycleRentalPreferencesInput args ) { - if (args != null) { - var allowedNetworks = args.getGraphQLAllowedNetworks(); - if (allowedNetworks != null) { - if (allowedNetworks.isEmpty()) { - throw new IllegalArgumentException("Allowed bicycle rental networks must not be empty."); - } - preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); + if (args == null) { + return; + } + + var allowedNetworks = args.getGraphQLAllowedNetworks(); + if (allowedNetworks != null) { + if (allowedNetworks.isEmpty()) { + throw new IllegalArgumentException("Allowed bicycle rental networks must not be empty."); } - var bannedNetworks = args.getGraphQLBannedNetworks(); - if (bannedNetworks != null) { - preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); + } + var bannedNetworks = args.getGraphQLBannedNetworks(); + if (bannedNetworks != null) { + preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + } + var destinationPolicy = args.getGraphQLDestinationBicyclePolicy(); + if (destinationPolicy != null) { + var allowed = destinationPolicy.getGraphQLAllowKeeping(); + if (allowed != null) { + preferences.withAllowArrivingInRentedVehicleAtDestination(allowed); } - var destinationPolicy = args.getGraphQLDestinationBicyclePolicy(); - if (destinationPolicy != null) { - var allowed = destinationPolicy.getGraphQLAllowKeeping(); - if (allowed != null) { - preferences.withAllowArrivingInRentedVehicleAtDestination(allowed); - } - var cost = destinationPolicy.getGraphQLKeepingCost(); - if (cost != null) { - preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds()); - } + var cost = destinationPolicy.getGraphQLKeepingCost(); + if (cost != null) { + preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds()); } } } @@ -126,21 +133,23 @@ private static void setBicycleOptimization( BikePreferences.Builder preferences, GraphQLTypes.GraphQLCyclingOptimizationInput args ) { - if (args != null) { - var type = args.getGraphQLType(); - var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null; - if (mappedType != null) { - preferences.withOptimizeType(mappedType); - } - var triangleArgs = args.getGraphQLTriangle(); - if (isBicycleTriangleSet(triangleArgs)) { - preferences.withForcedOptimizeTriangle(triangle -> { - triangle - .withSlope(triangleArgs.getGraphQLFlatness()) - .withSafety(triangleArgs.getGraphQLSafety()) - .withTime(triangleArgs.getGraphQLTime()); - }); - } + if (args == null) { + return; + } + + var type = args.getGraphQLType(); + var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null; + if (mappedType != null) { + preferences.withOptimizeType(mappedType); + } + var triangleArgs = args.getGraphQLTriangle(); + if (isBicycleTriangleSet(triangleArgs)) { + preferences.withForcedOptimizeTriangle(triangle -> { + triangle + .withSlope(triangleArgs.getGraphQLFlatness()) + .withSafety(triangleArgs.getGraphQLSafety()) + .withTime(triangleArgs.getGraphQLTime()); + }); } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java index ddf086bdac5..01a78153c9b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/CarPreferencesMapper.java @@ -19,16 +19,18 @@ static void setCarPreferences( GraphQLTypes.GraphQLCarPreferencesInput args, DataFetchingEnvironment environment ) { - if (args != null) { - var reluctance = args.getGraphQLReluctance(); - if (reluctance != null) { - preferences.withReluctance(reluctance); - } - preferences.withParking(parking -> - setCarParkingPreferences(parking, args.getGraphQLParking(), environment) - ); - preferences.withRental(rental -> setCarRentalPreferences(rental, args.getGraphQLRental())); + if (args == null) { + return; + } + + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); } + preferences.withParking(parking -> + setCarParkingPreferences(parking, args.getGraphQLParking(), environment) + ); + preferences.withRental(rental -> setCarRentalPreferences(rental, args.getGraphQLRental())); } private static void setCarParkingPreferences( @@ -36,36 +38,40 @@ private static void setCarParkingPreferences( GraphQLTypes.GraphQLCarParkingPreferencesInput args, DataFetchingEnvironment environment ) { - if (args != null) { - var unpreferredCost = args.getGraphQLUnpreferredCost(); - if (unpreferredCost != null) { - preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds()); - } - var filters = getParkingFilters(environment, "car"); - preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters)); - preferences.withBannedVehicleParkingTags(parseNotFilters(filters)); - var preferred = getParkingPreferred(environment, "car"); - preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred)); - preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred)); + if (args == null) { + return; + } + + var unpreferredCost = args.getGraphQLUnpreferredCost(); + if (unpreferredCost != null) { + preferences.withUnpreferredVehicleParkingTagCost(unpreferredCost.toSeconds()); } + var filters = getParkingFilters(environment, "car"); + preferences.withRequiredVehicleParkingTags(parseSelectFilters(filters)); + preferences.withBannedVehicleParkingTags(parseNotFilters(filters)); + var preferred = getParkingPreferred(environment, "car"); + preferences.withPreferredVehicleParkingTags(parseSelectFilters(preferred)); + preferences.withNotPreferredVehicleParkingTags(parseNotFilters(preferred)); } private static void setCarRentalPreferences( VehicleRentalPreferences.Builder preferences, GraphQLTypes.GraphQLCarRentalPreferencesInput args ) { - if (args != null) { - var allowedNetworks = args.getGraphQLAllowedNetworks(); - if (allowedNetworks != null) { - if (allowedNetworks.isEmpty()) { - throw new IllegalArgumentException("Allowed car rental networks must not be empty."); - } - preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); - } - var bannedNetworks = args.getGraphQLBannedNetworks(); - if (bannedNetworks != null) { - preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + if (args == null) { + return; + } + + var allowedNetworks = args.getGraphQLAllowedNetworks(); + if (allowedNetworks != null) { + if (allowedNetworks.isEmpty()) { + throw new IllegalArgumentException("Allowed car rental networks must not be empty."); } + preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); + } + var bannedNetworks = args.getGraphQLBannedNetworks(); + if (bannedNetworks != null) { + preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); } } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java index feef589232c..ada358d98b3 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapper.java @@ -114,14 +114,17 @@ private static void setStreetPreferences( DataFetchingEnvironment environment ) { setRentalAvailabilityPreferences(preferences, request); - if (args != null) { - preferences.withBike(bicycle -> - setBicyclePreferences(bicycle, args.getGraphQLBicycle(), environment) - ); - preferences.withCar(car -> setCarPreferences(car, args.getGraphQLCar(), environment)); - preferences.withScooter(scooter -> setScooterPreferences(scooter, args.getGraphQLScooter())); - preferences.withWalk(walk -> setWalkPreferences(walk, args.getGraphQLWalk())); + + if (args == null) { + return; } + + preferences.withBike(bicycle -> + setBicyclePreferences(bicycle, args.getGraphQLBicycle(), environment) + ); + preferences.withCar(car -> setCarPreferences(car, args.getGraphQLCar(), environment)); + preferences.withScooter(scooter -> setScooterPreferences(scooter, args.getGraphQLScooter())); + preferences.withWalk(walk -> setWalkPreferences(walk, args.getGraphQLWalk())); } private static void setRentalAvailabilityPreferences( diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java index 81e481f2571..f29ebd0de63 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/ScooterPreferencesMapper.java @@ -11,47 +11,50 @@ static void setScooterPreferences( ScooterPreferences.Builder preferences, GraphQLTypes.GraphQLScooterPreferencesInput args ) { - if (args != null) { - var speed = args.getGraphQLSpeed(); - if (speed != null) { - preferences.withSpeed(speed); - } - var reluctance = args.getGraphQLReluctance(); - if (reluctance != null) { - preferences.withReluctance(reluctance); - } - preferences.withRental(rental -> setScooterRentalPreferences(rental, args.getGraphQLRental()) - ); - setScooterOptimization(preferences, args.getGraphQLOptimization()); + if (args == null) { + return; + } + + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); } + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + preferences.withRental(rental -> setScooterRentalPreferences(rental, args.getGraphQLRental())); + setScooterOptimization(preferences, args.getGraphQLOptimization()); } private static void setScooterRentalPreferences( VehicleRentalPreferences.Builder preferences, GraphQLTypes.GraphQLScooterRentalPreferencesInput args ) { - if (args != null) { - var allowedNetworks = args.getGraphQLAllowedNetworks(); - if (allowedNetworks != null) { - if (allowedNetworks.isEmpty()) { - throw new IllegalArgumentException("Allowed scooter rental networks must not be empty."); - } - preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); + if (args == null) { + return; + } + + var allowedNetworks = args.getGraphQLAllowedNetworks(); + if (allowedNetworks != null) { + if (allowedNetworks.isEmpty()) { + throw new IllegalArgumentException("Allowed scooter rental networks must not be empty."); } - var bannedNetworks = args.getGraphQLBannedNetworks(); - if (bannedNetworks != null) { - preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + preferences.withAllowedNetworks(Set.copyOf(allowedNetworks)); + } + var bannedNetworks = args.getGraphQLBannedNetworks(); + if (bannedNetworks != null) { + preferences.withBannedNetworks(Set.copyOf(bannedNetworks)); + } + var destinationPolicy = args.getGraphQLDestinationScooterPolicy(); + if (destinationPolicy != null) { + var allowed = destinationPolicy.getGraphQLAllowKeeping(); + if (allowed != null) { + preferences.withAllowArrivingInRentedVehicleAtDestination(allowed); } - var destinationPolicy = args.getGraphQLDestinationScooterPolicy(); - if (destinationPolicy != null) { - var allowed = destinationPolicy.getGraphQLAllowKeeping(); - if (allowed != null) { - preferences.withAllowArrivingInRentedVehicleAtDestination(allowed); - } - var cost = destinationPolicy.getGraphQLKeepingCost(); - if (cost != null) { - preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds()); - } + var cost = destinationPolicy.getGraphQLKeepingCost(); + if (cost != null) { + preferences.withArrivingInRentalVehicleAtDestinationCost(cost.toSeconds()); } } } @@ -60,21 +63,23 @@ private static void setScooterOptimization( ScooterPreferences.Builder preferences, GraphQLTypes.GraphQLScooterOptimizationInput args ) { - if (args != null) { - var type = args.getGraphQLType(); - var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null; - if (mappedType != null) { - preferences.withOptimizeType(mappedType); - } - var triangleArgs = args.getGraphQLTriangle(); - if (isScooterTriangleSet(triangleArgs)) { - preferences.withForcedOptimizeTriangle(triangle -> { - triangle - .withSlope(triangleArgs.getGraphQLFlatness()) - .withSafety(triangleArgs.getGraphQLSafety()) - .withTime(triangleArgs.getGraphQLTime()); - }); - } + if (args == null) { + return; + } + + var type = args.getGraphQLType(); + var mappedType = type != null ? VehicleOptimizationTypeMapper.map(type) : null; + if (mappedType != null) { + preferences.withOptimizeType(mappedType); + } + var triangleArgs = args.getGraphQLTriangle(); + if (isScooterTriangleSet(triangleArgs)) { + preferences.withForcedOptimizeTriangle(triangle -> { + triangle + .withSlope(triangleArgs.getGraphQLFlatness()) + .withSafety(triangleArgs.getGraphQLSafety()) + .withTime(triangleArgs.getGraphQLTime()); + }); } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java index 3c6a53eac2a..f542639ae36 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java @@ -38,72 +38,72 @@ static void setTransitPreferences( transitPreferences.setReluctanceForMode(reluctanceForMode); } var transitArgs = args.getGraphQLPreferences().getGraphQLTransit(); - if (transitArgs != null) { - var board = transitArgs.getGraphQLBoard(); - if (board != null) { - var slack = board.getGraphQLSlack(); - if (slack != null) { - transitPreferences.withDefaultBoardSlackSec( - (int) DurationUtils.requireNonNegativeMedium(slack, "board slack").toSeconds() - ); - } - var waitReluctance = board.getGraphQLWaitReluctance(); - if (waitReluctance != null) { - transferPreferences.withWaitReluctance(waitReluctance); - } + if (transitArgs == null) { + return; + } + + var board = transitArgs.getGraphQLBoard(); + if (board != null) { + var slack = board.getGraphQLSlack(); + if (slack != null) { + transitPreferences.withDefaultBoardSlackSec( + (int) DurationUtils.requireNonNegativeMedium(slack, "board slack").toSeconds() + ); } - var alight = transitArgs.getGraphQLAlight(); - if (alight != null) { - var slack = alight.getGraphQLSlack(); - if (slack != null) { - transitPreferences.withDefaultAlightSlackSec( - (int) DurationUtils.requireNonNegativeMedium(slack, "alight slack").toSeconds() - ); - } + var waitReluctance = board.getGraphQLWaitReluctance(); + if (waitReluctance != null) { + transferPreferences.withWaitReluctance(waitReluctance); } - var transfer = transitArgs.getGraphQLTransfer(); - if (transfer != null) { - var cost = transfer.getGraphQLCost(); - if (cost != null) { - transferPreferences.withCost(cost.toSeconds()); - } - var slack = transfer.getGraphQLSlack(); - if (slack != null) { - transferPreferences.withSlack( - (int) DurationUtils.requireNonNegativeMedium(slack, "transfer slack").toSeconds() - ); - } - var maxTransfers = transfer.getGraphQLMaximumTransfers(); - if (maxTransfers != null) { - if (maxTransfers < 0) { - throw new IllegalArgumentException("Maximum transfers must be non-negative."); - } - transferPreferences.withMaxTransfers(maxTransfers + 1); - } - var additionalTransfers = transfer.getGraphQLMaximumAdditionalTransfers(); - if (additionalTransfers != null) { - if (additionalTransfers < 0) { - throw new IllegalArgumentException( - "Maximum additional transfers must be non-negative." - ); - } - transferPreferences.withMaxAdditionalTransfers(additionalTransfers); - } + } + var alight = transitArgs.getGraphQLAlight(); + if (alight != null) { + var slack = alight.getGraphQLSlack(); + if (slack != null) { + transitPreferences.withDefaultAlightSlackSec( + (int) DurationUtils.requireNonNegativeMedium(slack, "alight slack").toSeconds() + ); } - var timetable = transitArgs.getGraphQLTimetable(); - if (timetable != null) { - var excludeUpdates = timetable.getGraphQLExcludeRealTimeUpdates(); - if (excludeUpdates != null) { - transitPreferences.setIgnoreRealtimeUpdates(excludeUpdates); - } - var includePlannedCancellations = timetable.getGraphQLIncludePlannedCancellations(); - if (includePlannedCancellations != null) { - transitPreferences.setIncludePlannedCancellations(includePlannedCancellations); + } + var transfer = transitArgs.getGraphQLTransfer(); + if (transfer != null) { + var cost = transfer.getGraphQLCost(); + if (cost != null) { + transferPreferences.withCost(cost.toSeconds()); + } + var slack = transfer.getGraphQLSlack(); + if (slack != null) { + transferPreferences.withSlack( + (int) DurationUtils.requireNonNegativeMedium(slack, "transfer slack").toSeconds() + ); + } + var maxTransfers = transfer.getGraphQLMaximumTransfers(); + if (maxTransfers != null) { + if (maxTransfers < 0) { + throw new IllegalArgumentException("Maximum transfers must be non-negative."); } - var includeRealtimeCancellations = timetable.getGraphQLIncludeRealTimeCancellations(); - if (includeRealtimeCancellations != null) { - transitPreferences.setIncludeRealtimeCancellations(includeRealtimeCancellations); + transferPreferences.withMaxTransfers(maxTransfers + 1); + } + var additionalTransfers = transfer.getGraphQLMaximumAdditionalTransfers(); + if (additionalTransfers != null) { + if (additionalTransfers < 0) { + throw new IllegalArgumentException("Maximum additional transfers must be non-negative."); } + transferPreferences.withMaxAdditionalTransfers(additionalTransfers); + } + } + var timetable = transitArgs.getGraphQLTimetable(); + if (timetable != null) { + var excludeUpdates = timetable.getGraphQLExcludeRealTimeUpdates(); + if (excludeUpdates != null) { + transitPreferences.setIgnoreRealtimeUpdates(excludeUpdates); + } + var includePlannedCancellations = timetable.getGraphQLIncludePlannedCancellations(); + if (includePlannedCancellations != null) { + transitPreferences.setIncludePlannedCancellations(includePlannedCancellations); + } + var includeRealtimeCancellations = timetable.getGraphQLIncludeRealTimeCancellations(); + if (includeRealtimeCancellations != null) { + transitPreferences.setIncludeRealtimeCancellations(includeRealtimeCancellations); } } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java index b202d9e7300..1795e999ac6 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/WalkPreferencesMapper.java @@ -9,23 +9,25 @@ static void setWalkPreferences( WalkPreferences.Builder preferences, GraphQLTypes.GraphQLWalkPreferencesInput args ) { - if (args != null) { - var speed = args.getGraphQLSpeed(); - if (speed != null) { - preferences.withSpeed(speed); - } - var reluctance = args.getGraphQLReluctance(); - if (reluctance != null) { - preferences.withReluctance(reluctance); - } - var walkSafetyFactor = args.getGraphQLSafetyFactor(); - if (walkSafetyFactor != null) { - preferences.withSafetyFactor(walkSafetyFactor); - } - var boardCost = args.getGraphQLBoardCost(); - if (boardCost != null) { - preferences.withBoardCost(boardCost.toSeconds()); - } + if (args == null) { + return; + } + + var speed = args.getGraphQLSpeed(); + if (speed != null) { + preferences.withSpeed(speed); + } + var reluctance = args.getGraphQLReluctance(); + if (reluctance != null) { + preferences.withReluctance(reluctance); + } + var walkSafetyFactor = args.getGraphQLSafetyFactor(); + if (walkSafetyFactor != null) { + preferences.withSafetyFactor(walkSafetyFactor); + } + var boardCost = args.getGraphQLBoardCost(); + if (boardCost != null) { + preferences.withBoardCost(boardCost.toSeconds()); } } } From ec8a81e3622bd55add5f335b077bdd7df5752545 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 25 Apr 2024 17:25:54 +0300 Subject: [PATCH 1015/1688] Use more sensible test method for testing size --- .../gtfs/mapping/routerequest/RouteRequestMapperTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java index 19ac4326f9a..f47f7a7004a 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTest.java @@ -94,8 +94,8 @@ void testMinimalArgs() { assertEquals(defaultRequest.numItineraries(), routeRequest.numItineraries()); assertEquals(defaultRequest.searchWindow(), routeRequest.searchWindow()); assertEquals(defaultRequest.journey().modes(), routeRequest.journey().modes()); - assertTrue(defaultRequest.journey().transit().filters().size() == 1); - assertTrue(routeRequest.journey().transit().filters().size() == 1); + assertEquals(1, defaultRequest.journey().transit().filters().size()); + assertEquals(1, routeRequest.journey().transit().filters().size()); assertTrue(routeRequest.journey().transit().enabled()); assertEquals( defaultRequest.journey().transit().filters().toString(), From a6d8e41122ab4def799c4618995c267f02442c8d Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 25 Apr 2024 16:24:12 +0000 Subject: [PATCH 1016/1688] Add changelog entry for #5820 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index cafc677ccc6..2ba638c9ab1 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -16,6 +16,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix trip duplication in Graph Builder DSJ mapping [#5794](https://github.com/opentripplanner/OpenTripPlanner/pull/5794) - Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) - Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) +- De-emphasize mailing list in landing page [#5820](https://github.com/opentripplanner/OpenTripPlanner/pull/5820) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 7a088e0a5580990e6e28d42bac034a1c095b8a71 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Fri, 26 Apr 2024 11:55:40 +0200 Subject: [PATCH 1017/1688] Make naming of stopTransferCost/stopBoardAlightCost consistent --- docs/BuildConfiguration.md | 4 +- docs/RouteRequest.md | 2 +- docs/RouterConfiguration.md | 18 ++++---- docs/examples/entur/router-config.json | 2 +- .../examples/skanetrafiken/router-config.json | 2 +- .../org/opentripplanner/model/Timetable.java | 1 + .../raptoradapter/router/TransitRouter.java | 2 +- .../raptoradapter/transit/TransitLayer.java | 21 ++++++--- .../transit/TransitTuningParameters.java | 11 +++-- .../transit/cost/CostCalculatorFactory.java | 5 +- .../transit/cost/DefaultCostCalculator.java | 46 ++++++++++++------- .../transit/mappers/TransitLayerMapper.java | 19 +++++--- .../RaptorRoutingRequestTransitData.java | 2 +- .../api/TransferOptimizationParameters.java | 7 +-- ...ansferOptimizationServiceConfigurator.java | 16 ++++--- .../model/OptimizedPathTail.java | 10 ++-- .../model/StopPriorityCostCalculator.java | 23 ++++++---- .../services/OptimizePathDomainService.java | 13 ++++-- .../config/buildconfig/GtfsConfig.java | 2 +- .../routerconfig/TransitRoutingConfig.java | 30 +++++++----- .../config/routerequest/TransferConfig.java | 2 +- .../raptor/_data/transit/TestTransitData.java | 12 ++--- ...gressStopBoardAlightTransferCostTest.java} | 10 ++-- .../mappers/TransitLayerMapperTest.java | 4 +- .../model/OptimizedPathTailTest.java | 4 +- .../standalone/config/router-config.json | 2 +- .../performance/norway/speed-test-config.json | 2 +- .../skanetrafiken/speed-test-config.json | 2 +- .../switzerland/speed-test-config.json | 2 +- 29 files changed, 166 insertions(+), 110 deletions(-) rename src/test/java/org/opentripplanner/raptor/moduletests/{B05_EgressStopTransferCostTest.java => B05_EgressStopBoardAlightTransferCostTest.java} (86%) diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index 3a3a6ff7ee4..dd60059a209 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -744,7 +744,7 @@ but we want to calculate the transfers always from OSM data. Should there be some preference or aversion for transfers at stops that are part of a station. This parameter sets the generic level of preference. What is the actual cost can be changed -with the `stopTransferCost` parameter in the router configuration. +with the `stopBoardAlightDuringTransferCost` parameter in the router configuration.

      adaptivePruningDistance

      @@ -993,7 +993,7 @@ but we want to calculate the transfers always from OSM data. Should there be some preference or aversion for transfers at stops that are part of a station. Overrides the value specified in `gtfsDefaults`. This parameter sets the generic level of preference. What is the actual cost can be changed -with the `stopTransferCost` parameter in the router configuration. +with the `stopBoardAlightDuringTransferCost` parameter in the router configuration.

      groupFilePattern

      diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index ad7dc366bcf..52fd177fbf6 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -947,7 +947,7 @@ The wait time is used to prevent *back-travel*, the `backTravelWaitTimeFactor` i Add an extra board- and alight-cost for prioritized stops. -A stopBoardAlightCosts is added to the generalized-cost during routing. But this cost +A stopBoardAlightTransferCosts is added to the generalized-cost during routing. But this cost cannot be too high, because that would add extra cost to the transfer, and favor other alternative paths. But, when optimizing transfers, we do not have to take other paths into consideration and can *boost* the stop-priority-cost to allow transfers to diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index e0f1d81b590..e948a23dd54 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -61,7 +61,7 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md). |       [minWindow](#transit_dynamicSearchWindow_minWindow) | `duration` | The constant minimum duration for a raptor-search-window. | *Optional* | `"PT40M"` | 2.2 | |       [stepMinutes](#transit_dynamicSearchWindow_stepMinutes) | `integer` | Used to set the steps the search-window is rounded to. | *Optional* | `10` | 2.1 | |    [pagingSearchWindowAdjustments](#transit_pagingSearchWindowAdjustments) | `duration[]` | The provided array of durations is used to increase the search-window for the next/previous page. | *Optional* | | na | -|    [stopTransferCost](#transit_stopTransferCost) | `enum map of integer` | Use this to set a stop transfer cost for the given transfer priority | *Optional* | | 2.0 | +|    [stopBoardAlightDuringTransferCost](#transit_stopBoardAlightDuringTransferCost) | `enum map of integer` | Costs for boarding and alighting during transfers at stops with a given transfer priority. | *Optional* | | 2.0 | |    [transferCacheRequests](#transit_transferCacheRequests) | `object[]` | Routing requests to use for pre-filling the stop-to-stop transfer cache. | *Optional* | | 2.3 | | transmodelApi | `object` | Configuration for the Transmodel GraphQL API. | *Optional* | | 2.1 | |    [hideFeedId](#transmodelApi_hideFeedId) | `boolean` | Hide the FeedId in all API output, and add it to input. | *Optional* | `false` | na | @@ -358,19 +358,21 @@ previous page cursor. See JavaDoc for [TransitTuningParameters#pagingSearchWindo for more info." -

      stopTransferCost

      +

      stopBoardAlightDuringTransferCost

      **Since version:** `2.0` ∙ **Type:** `enum map of integer` ∙ **Cardinality:** `Optional` **Path:** /transit **Enum keys:** `discouraged` | `allowed` | `recommended` | `preferred` -Use this to set a stop transfer cost for the given transfer priority +Costs for boarding and alighting during transfers at stops with a given transfer priority. -The cost is applied to boarding and alighting at all stops. All stops have a transfer cost priority -set, the default is `allowed`. The `stopTransferCost` parameter is optional, but if listed all +This cost is applied **both to boarding and alighting** at stops during transfers. All stops have a transfer cost priority +set, the default is `allowed`. The `stopBoardAlightDuringTransferCost` parameter is optional, but if listed all values must be set. -If not set the `stopTransferCost` is ignored. This is only available for NeTEx imported Stops. +When a transfer occurs at the same stop, the cost will be applied twice since the cost is both for boarding and alighting, + +If not set the `stopBoardAlightDuringTransferCost` is ignored. This is only available for NeTEx imported Stops. The cost is a scalar, but is equivalent to the felt cost of riding a transit trip for 1 second. @@ -382,7 +384,7 @@ The cost is a scalar, but is equivalent to the felt cost of riding a transit tri | `preferred` | The best place to do transfers. Should be set to `0`(zero). | int | Use values in a range from `0` to `100 000`. **All key/value pairs are required if the -`stopTransferCost` is listed.** +`stopBoardAlightDuringTransferCost` is listed.**

      transferCacheRequests

      @@ -608,7 +610,7 @@ Used to group requests when monitoring OTP. "minWindow" : "1h", "maxWindow" : "5h" }, - "stopTransferCost" : { + "stopBoardAlightDuringTransferCost" : { "DISCOURAGED" : 1500, "ALLOWED" : 75, "RECOMMENDED" : 30, diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index 652f43f74bc..0cbded8bc85 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -91,7 +91,7 @@ "minWindow" : "1h", "maxWindow" : "5h" }, - "stopTransferCost" : { + "stopBoardAlightDuringTransferCost" : { "DISCOURAGED" : 1500, "ALLOWED" : 75, "RECOMMENDED" : 30, diff --git a/docs/examples/skanetrafiken/router-config.json b/docs/examples/skanetrafiken/router-config.json index 74042d68e31..6d782879a52 100644 --- a/docs/examples/skanetrafiken/router-config.json +++ b/docs/examples/skanetrafiken/router-config.json @@ -15,7 +15,7 @@ "24h", "0h" ], - "stopTransferCost": { + "stopBoardAlightDuringTransferCost": { "DISCOURAGED": 3000, "ALLOWED": 150, "RECOMMENDED": 60, diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/src/main/java/org/opentripplanner/model/Timetable.java index a8f0f1bbf44..031e95e8870 100644 --- a/src/main/java/org/opentripplanner/model/Timetable.java +++ b/src/main/java/org/opentripplanner/model/Timetable.java @@ -61,6 +61,7 @@ public class Timetable implements Serializable { private final List frequencyEntries = new ArrayList<>(); + @Nullable private final LocalDate serviceDate; /** Construct an empty Timetable. */ diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index b58af3c8b23..0a9e46d2fe3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -146,7 +146,7 @@ private TransitRouterResult route() { requestTransitDataProvider.stopNameResolver(), serverContext.transitService().getTransferService(), requestTransitDataProvider, - transitLayer.getStopBoardAlightCosts(), + transitLayer.getStopBoardAlightTransferCosts(), request.preferences().transfer().optimization(), raptorRequest.multiCriteria() ); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java index 288f429a861..0afcd97450a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java @@ -48,7 +48,11 @@ public class TransitLayer { private final TransferIndexGenerator transferIndexGenerator; - private final int[] stopBoardAlightCosts; + /** + * @see #getStopBoardAlightTransferCosts() + */ + @Nullable + private final int[] stopBoardAlightTransferCosts; /** * Makes a shallow copy of the TransitLayer, except for the tripPatternsForDate, where a shallow @@ -65,7 +69,7 @@ public TransitLayer(TransitLayer transitLayer) { transitLayer.transferCache, transitLayer.constrainedTransfers, transitLayer.transferIndexGenerator, - transitLayer.stopBoardAlightCosts + transitLayer.stopBoardAlightTransferCosts ); } @@ -78,7 +82,7 @@ public TransitLayer( RaptorRequestTransferCache transferCache, ConstrainedTransfersForPatterns constrainedTransfers, TransferIndexGenerator transferIndexGenerator, - int[] stopBoardAlightCosts + @Nullable int[] stopBoardAlightTransferCosts ) { this.tripPatternsRunningOnDate = new HashMap<>(tripPatternsRunningOnDate); this.transfersByStopIndex = transfersByStopIndex; @@ -88,7 +92,7 @@ public TransitLayer( this.transferCache = transferCache; this.constrainedTransfers = constrainedTransfers; this.transferIndexGenerator = transferIndexGenerator; - this.stopBoardAlightCosts = stopBoardAlightCosts; + this.stopBoardAlightTransferCosts = stopBoardAlightTransferCosts; } @Nullable @@ -166,8 +170,13 @@ public TransferIndexGenerator getTransferIndexGenerator() { return transferIndexGenerator; } - public int[] getStopBoardAlightCosts() { - return stopBoardAlightCosts; + /** + * Costs for both boarding and alighting at a given stop during transfer. Note that this is in + * raptor centi-second units. + */ + @Nullable + public int[] getStopBoardAlightTransferCosts() { + return stopBoardAlightTransferCosts; } /** diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java index 31c602b6133..b62459db679 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitTuningParameters.java @@ -13,7 +13,7 @@ public interface TransitTuningParameters { * These tuning parameters are typically used in unit tests. The values are: * 
          * enableStopTransferPriority : true
-   * stopTransferCost : {
+   * stopBoardAlightDuringTransferCost : {
    *   DISCOURAGED:  3600  (equivalent of 1 hour penalty)
    *   ALLOWED:        60  (60 seconds penalty)
    *   RECOMMENDED:    20  (20 seconds penalty)
@@ -28,7 +28,7 @@ public boolean enableStopTransferPriority() {
     }
 
     @Override
-    public Integer stopTransferCost(StopTransferPriority key) {
+    public Integer stopBoardAlightDuringTransferCost(StopTransferPriority key) {
       switch (key) {
         case DISCOURAGED:
           return 3600;
@@ -70,10 +70,11 @@ public List transferCacheRequests() {
   boolean enableStopTransferPriority();
 
   /**
-   * The stop transfer cost for the given {@link StopTransferPriority}. The cost applied to boarding
-   * and alighting all stops with the given priority.
+   * The stop board alight transfer cost for the given {@link StopTransferPriority}. The cost
+   * applied during transfers to both boarding and alighting of stops with the given
+   * priority.
    */
-  Integer stopTransferCost(StopTransferPriority key);
+  Integer stopBoardAlightDuringTransferCost(StopTransferPriority key);
 
   /**
    * The maximum number of transfer RouteRequests for which the pre-calculated transfers should be
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java
index fef7b3509e3..a10cf828b45 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/CostCalculatorFactory.java
@@ -1,16 +1,17 @@
 package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost;
 
+import javax.annotation.Nullable;
 import org.opentripplanner.raptor.spi.RaptorCostCalculator;
 
 public class CostCalculatorFactory {
 
   public static  RaptorCostCalculator createCostCalculator(
     GeneralizedCostParameters generalizedCostParameters,
-    int[] stopBoardAlightCosts
+    @Nullable int[] stopBoardAlightTransferCosts
   ) {
     RaptorCostCalculator calculator = new DefaultCostCalculator<>(
       generalizedCostParameters,
-      stopBoardAlightCosts
+      stopBoardAlightTransferCosts
     );
 
     if (generalizedCostParameters.wheelchairEnabled()) {
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java
index ee2f1282625..43faa3f0c40 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultCostCalculator.java
@@ -19,22 +19,28 @@ public final class DefaultCostCalculator
   private final int boardAndTransferCost;
   private final int waitFactor;
   private final FactorStrategy transitFactors;
-  private final int[] stopTransferCost;
+
+  /**
+   * Costs for boarding and alighting at a given stop during transfer.
+   * See TransitLayer.getStopBoardAlightTransferCosts()
+   */
+  @Nullable
+  private final int[] stopBoardAlightTransferCosts;
 
   /**
    * Cost unit: SECONDS - The unit for all input parameters are in the OTP TRANSIT model cost unit
    * (in Raptor the unit for cost is centi-seconds).
    *
-   * @param stopTransferCost Unit centi-seconds. This parameter is used "as-is" and not transformed
-   *                      into the Raptor cast unit to avoid the transformation for each request.
-   *                      Use {@code null} to ignore stop cost.
+   * @param stopBoardAlightTransferCosts Unit centi-seconds. This parameter is used "as-is" and not
+   *                      transformed into the Raptor cast unit to avoid the transformation for each
+   *                      request. Use {@code null} to ignore stop cost.
    */
   public DefaultCostCalculator(
     int boardCost,
     int transferCost,
     double waitReluctanceFactor,
     @Nullable double[] transitReluctanceFactors,
-    @Nullable int[] stopTransferCost
+    @Nullable int[] stopBoardAlightTransferCosts
   ) {
     this.boardCostOnly = RaptorCostConverter.toRaptorCost(boardCost);
     this.transferCostOnly = RaptorCostConverter.toRaptorCost(transferCost);
@@ -46,16 +52,19 @@ public DefaultCostCalculator(
         ? new SingleValueFactorStrategy(GeneralizedCostParameters.DEFAULT_TRANSIT_RELUCTANCE)
         : new IndexBasedFactorStrategy(transitReluctanceFactors);
 
-    this.stopTransferCost = stopTransferCost;
+    this.stopBoardAlightTransferCosts = stopBoardAlightTransferCosts;
   }
 
-  public DefaultCostCalculator(GeneralizedCostParameters params, int[] stopTransferCost) {
+  public DefaultCostCalculator(
+    GeneralizedCostParameters params,
+    @Nullable int[] stopBoardAlightTransferCosts
+  ) {
     this(
       params.boardCost(),
       params.transferCost(),
       params.waitReluctanceFactor(),
       params.transitReluctanceFactors(),
-      stopTransferCost
+      stopBoardAlightTransferCosts
     );
   }
 
@@ -108,8 +117,8 @@ public int transitArrivalCost(
 
     // Add transfer cost on all alighting events.
     // If it turns out to be the last one this cost will be removed during costEgress phase.
-    if (stopTransferCost != null) {
-      cost += stopTransferCost[toStop];
+    if (stopBoardAlightTransferCosts != null) {
+      cost += stopBoardAlightTransferCosts[toStop];
     }
 
     return cost;
@@ -134,7 +143,9 @@ public int calculateRemainingMinCost(int minTravelTime, int minNumTransfers, int
       // Remove cost that was added during alighting similar as we do in the costEgress() method
       int fixedCost = transitFactors.minFactor() * minTravelTime;
 
-      return stopTransferCost == null ? fixedCost : fixedCost - stopTransferCost[fromStop];
+      return stopBoardAlightTransferCosts == null
+        ? fixedCost
+        : fixedCost - stopBoardAlightTransferCosts[fromStop];
     }
   }
 
@@ -142,12 +153,12 @@ public int calculateRemainingMinCost(int minTravelTime, int minNumTransfers, int
   public int costEgress(RaptorAccessEgress egress) {
     if (egress.hasRides()) {
       return egress.c1() + transferCostOnly;
-    } else if (stopTransferCost != null) {
+    } else if (stopBoardAlightTransferCosts != null) {
       // Remove cost that was added during alighting.
       // We do not want to add this cost on last alighting since it should only be applied on transfers
       // It has to be done here because during alighting we do not know yet if it will be
       // a transfer or not.
-      return egress.c1() - stopTransferCost[egress.stop()];
+      return egress.c1() - stopBoardAlightTransferCosts[egress.stop()];
     } else {
       return egress.c1();
     }
@@ -171,8 +182,8 @@ public int boardingCostRegularTransfer(
     cost += firstBoarding ? boardCostOnly : boardAndTransferCost;
 
     // If it's first boarding event then it is not a transfer
-    if (stopTransferCost != null && !firstBoarding) {
-      cost += stopTransferCost[boardStop];
+    if (stopBoardAlightTransferCosts != null && !firstBoarding) {
+      cost += stopBoardAlightTransferCosts[boardStop];
     }
     return cost;
   }
@@ -210,8 +221,9 @@ private int boardingCostConstrainedTransfer(
       // For a guaranteed transfer we skip board- and transfer-cost
       final int boardWaitTime = boardTime - prevArrivalTime;
 
-      // StopTransferCost is NOT added to the cost here. This is because a trip-to-trip constrained transfer take
-      // precedence over stop-to-stop transfer priority (NeTEx station transfer priority).
+      // StopBoardAlightTransferCost is NOT added to the cost here. This is because a trip-to-trip
+      // constrained transfer take precedence over stop-to-stop transfer priority (NeTEx station
+      // transfer priority).
       return waitFactor * boardWaitTime;
     }
 
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
index d74e2fbcbdb..fe81d28c098 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
@@ -13,6 +13,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.model.Timetable;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.Transfer;
@@ -103,7 +104,7 @@ private TransitLayer map(TransitTuningParameters tuningParameters) {
       transferCache,
       constrainedTransfers,
       transferIndexGenerator,
-      createStopTransferCosts(stopModel, tuningParameters)
+      createStopBoardAlightTransferCosts(stopModel, tuningParameters)
     );
   }
 
@@ -179,19 +180,23 @@ private HashMap> keyByRunningPeriodDates(
   }
 
   /**
-   * Create static board/alight cost for Raptor to include for each stop.
+   * Create static board/alight cost for Raptor to apply during transfer
    */
-  static int[] createStopTransferCosts(StopModel stops, TransitTuningParameters tuningParams) {
+  @Nullable
+  static int[] createStopBoardAlightTransferCosts(
+    StopModel stops,
+    TransitTuningParameters tuningParams
+  ) {
     if (!tuningParams.enableStopTransferPriority()) {
       return null;
     }
-    int[] stopTransferCosts = new int[stops.stopIndexSize()];
+    int[] stopBoardAlightTransferCosts = new int[stops.stopIndexSize()];
 
     for (int i = 0; i < stops.stopIndexSize(); ++i) {
       StopTransferPriority priority = stops.stopByIndex(i).getPriority();
-      int domainCost = tuningParams.stopTransferCost(priority);
-      stopTransferCosts[i] = RaptorCostConverter.toRaptorCost(domainCost);
+      int domainCost = tuningParams.stopBoardAlightDuringTransferCost(priority);
+      stopBoardAlightTransferCosts[i] = RaptorCostConverter.toRaptorCost(domainCost);
     }
-    return stopTransferCosts;
+    return stopBoardAlightTransferCosts;
   }
 }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
index 4338593d59d..8c310206a01 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
@@ -104,7 +104,7 @@ public RaptorRoutingRequestTransitData(
     this.generalizedCostCalculator =
       CostCalculatorFactory.createCostCalculator(
         mcCostParams,
-        transitLayer.getStopBoardAlightCosts()
+        transitLayer.getStopBoardAlightTransferCosts()
       );
 
     this.slackProvider =
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java
index 554de3ddc6d..0f51dd83165 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/api/TransferOptimizationParameters.java
@@ -35,9 +35,10 @@ public interface TransferOptimizationParameters {
   double minSafeWaitTimeFactor();
 
   /**
-   * Use this to add an extra board- and alight-cost for (none) prioritized stops. A {@code
-   * stopBoardAlightCosts} is added to the generalized-cost during routing. But, this cost cannot be
-   * too high, because that would add extra cost to the transfer, and favor other alternative paths.
+   * Use this to add an extra board- and alight-cost for (non) prioritized stops. A {@code
+   * stopBoardAlightTransferCosts} is added to the generalized-cost during routing. But, this cost
+   * cannot be too high, because that would add extra cost to the transfer, and favor other
+   * alternative paths.
    * But, when optimizing transfers, we do not have to take other paths into consideration and can
    * "boost" the stop-priority-cost to allow transfers to take place at a preferred stop.
    * 
      
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java
index a733927f068..cb5f3d7fdab 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/configure/TransferOptimizationServiceConfigurator.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.routing.algorithm.transferoptimization.configure;
 
 import java.util.function.IntFunction;
+import javax.annotation.Nullable;
 import org.opentripplanner.model.transfer.TransferService;
 import org.opentripplanner.raptor.api.model.RaptorTripSchedule;
 import org.opentripplanner.raptor.api.path.RaptorStopNameResolver;
@@ -28,7 +29,10 @@ public class TransferOptimizationServiceConfigurator transitDataProvider;
-  private final int[] stopBoardAlightCosts;
+
+  @Nullable
+  private final int[] stopBoardAlightTransferCosts;
+
   private final TransferOptimizationParameters config;
   private final MultiCriteriaRequest multiCriteriaRequest;
 
@@ -37,7 +41,7 @@ private TransferOptimizationServiceConfigurator(
     RaptorStopNameResolver stopNameResolver,
     TransferService transferService,
     RaptorTransitDataProvider transitDataProvider,
-    int[] stopBoardAlightCosts,
+    int[] stopBoardAlightTransferCosts,
     TransferOptimizationParameters config,
     MultiCriteriaRequest multiCriteriaRequest
   ) {
@@ -45,7 +49,7 @@ private TransferOptimizationServiceConfigurator(
     this.stopNameResolver = stopNameResolver;
     this.transferService = transferService;
     this.transitDataProvider = transitDataProvider;
-    this.stopBoardAlightCosts = stopBoardAlightCosts;
+    this.stopBoardAlightTransferCosts = stopBoardAlightTransferCosts;
     this.config = config;
     this.multiCriteriaRequest = multiCriteriaRequest;
   }
@@ -60,7 +64,7 @@ > OptimizeTransferService createOptimizeTransferService(
     RaptorStopNameResolver stopNameResolver,
     TransferService transferService,
     RaptorTransitDataProvider transitDataProvider,
-    int[] stopBoardAlightCosts,
+    @Nullable int[] stopBoardAlightTransferCosts,
     TransferOptimizationParameters config,
     MultiCriteriaRequest multiCriteriaRequest
   ) {
@@ -69,7 +73,7 @@ > OptimizeTransferService createOptimizeTransferService(
       stopNameResolver,
       transferService,
       transitDataProvider,
-      stopBoardAlightCosts,
+      stopBoardAlightTransferCosts,
       config,
       multiCriteriaRequest
     )
@@ -113,7 +117,7 @@ private OptimizePathDomainService createOptimizePathService(
       costCalculator,
       transitDataProvider.slackProvider(),
       transferWaitTimeCostCalculator,
-      stopBoardAlightCosts,
+      stopBoardAlightTransferCosts,
       config.extraStopBoardAlightCostsFactor(),
       createFilter(),
       stopNameResolver
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java
index fa74648e8eb..8d18c461101 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTail.java
@@ -33,6 +33,7 @@ public class OptimizedPathTail
   @Nullable
   private final TransferWaitTimeCostCalculator waitTimeCostCalculator;
 
+  @Nullable
   private final StopPriorityCostCalculator stopPriorityCostCalculator;
 
   private int transferPriorityCost = TransferConstraint.ZERO_COST;
@@ -44,15 +45,18 @@ public OptimizedPathTail(
     RaptorCostCalculator costCalculator,
     int iterationDepartureTime,
     TransferWaitTimeCostCalculator waitTimeCostCalculator,
-    int[] stopBoardAlightCosts,
+    @Nullable int[] stopBoardAlightTransferCosts,
     double extraStopBoardAlightCostsFactor,
     RaptorStopNameResolver stopNameResolver
   ) {
     super(slackProvider, iterationDepartureTime, costCalculator, stopNameResolver, null);
     this.waitTimeCostCalculator = waitTimeCostCalculator;
     this.stopPriorityCostCalculator =
-      (stopBoardAlightCosts != null && extraStopBoardAlightCostsFactor > 0.01)
-        ? new StopPriorityCostCalculator(extraStopBoardAlightCostsFactor, stopBoardAlightCosts)
+      (stopBoardAlightTransferCosts != null && extraStopBoardAlightCostsFactor > 0.01)
+        ? new StopPriorityCostCalculator(
+          extraStopBoardAlightCostsFactor,
+          stopBoardAlightTransferCosts
+        )
         : null;
   }
 
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java
index 090dd1ebd5a..48a4b733b58 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/model/StopPriorityCostCalculator.java
@@ -1,22 +1,29 @@
 package org.opentripplanner.routing.algorithm.transferoptimization.model;
 
 import org.opentripplanner.framework.lang.IntUtils;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer;
 
 /**
- * This calculator is used to give the stop-priority-cost a boost, by multiplying it with a {@code
- * factor}.
+ * This class calculates an extra stop priority cost by using the stop-board-alight-transfer-cost
+ * and boosting it by multiplying it with a {@code factor}.
  */
 public class StopPriorityCostCalculator {
 
-  private final int[] stopTransferCost;
-  private final double extraStopTransferCostFactor;
+  /**
+   * @see TransitLayer#getStopBoardAlightTransferCosts()
+   */
+  private final int[] stopBoardAlightTransferCosts;
+  private final double extraStopBoardAlightCostFactor;
 
-  StopPriorityCostCalculator(double extraStopTransferCostFactor, int[] stopTransferCost) {
-    this.stopTransferCost = stopTransferCost;
-    this.extraStopTransferCostFactor = extraStopTransferCostFactor;
+  StopPriorityCostCalculator(
+    double extraStopBoardAlightCostFactor,
+    int[] stopBoardAlightTransferCosts
+  ) {
+    this.stopBoardAlightTransferCosts = stopBoardAlightTransferCosts;
+    this.extraStopBoardAlightCostFactor = extraStopBoardAlightCostFactor;
   }
 
   int extraStopPriorityCost(int stop) {
-    return IntUtils.round(stopTransferCost[stop] * extraStopTransferCostFactor);
+    return IntUtils.round(stopBoardAlightTransferCosts[stop] * extraStopBoardAlightCostFactor);
   }
 }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java
index bfe5c3de841..ca8f953ced5 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/transferoptimization/services/OptimizePathDomainService.java
@@ -8,7 +8,6 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 import javax.annotation.Nullable;
-import org.opentripplanner.raptor.api.model.RaptorConstants;
 import org.opentripplanner.raptor.api.model.RaptorTripSchedule;
 import org.opentripplanner.raptor.api.path.RaptorPath;
 import org.opentripplanner.raptor.api.path.RaptorStopNameResolver;
@@ -16,6 +15,7 @@
 import org.opentripplanner.raptor.api.path.TransitPathLeg;
 import org.opentripplanner.raptor.spi.RaptorCostCalculator;
 import org.opentripplanner.raptor.spi.RaptorSlackProvider;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer;
 import org.opentripplanner.routing.algorithm.transferoptimization.api.OptimizedPath;
 import org.opentripplanner.routing.algorithm.transferoptimization.model.OptimizedPathTail;
 import org.opentripplanner.routing.algorithm.transferoptimization.model.PathTailFilter;
@@ -78,8 +78,11 @@ public class OptimizePathDomainService {
   @Nullable
   private final TransferWaitTimeCostCalculator waitTimeCostCalculator;
 
+  /**
+   * @see TransitLayer#getStopBoardAlightTransferCosts()
+   */
   @Nullable
-  private final int[] stopBoardAlightCosts;
+  private final int[] stopBoardAlightTransferCosts;
 
   private final double extraStopBoardAlightCostsFactor;
 
@@ -88,7 +91,7 @@ public OptimizePathDomainService(
     RaptorCostCalculator costCalculator,
     RaptorSlackProvider slackProvider,
     @Nullable TransferWaitTimeCostCalculator waitTimeCostCalculator,
-    int[] stopBoardAlightCosts,
+    @Nullable int[] stopBoardAlightTransferCosts,
     double extraStopBoardAlightCostsFactor,
     PathTailFilter filter,
     RaptorStopNameResolver stopNameTranslator
@@ -97,7 +100,7 @@ public OptimizePathDomainService(
     this.costCalculator = costCalculator;
     this.slackProvider = slackProvider;
     this.waitTimeCostCalculator = waitTimeCostCalculator;
-    this.stopBoardAlightCosts = stopBoardAlightCosts;
+    this.stopBoardAlightTransferCosts = stopBoardAlightTransferCosts;
     this.extraStopBoardAlightCostsFactor = extraStopBoardAlightCostsFactor;
     this.filter = filter;
     this.stopNameTranslator = stopNameTranslator;
@@ -139,7 +142,7 @@ private Set> findBestTransferOption(
         costCalculator,
         iterationDepartureTime,
         waitTimeCostCalculator,
-        stopBoardAlightCosts,
+        stopBoardAlightTransferCosts,
         extraStopBoardAlightCostsFactor,
         stopNameTranslator
       )
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java b/src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java
index a0a947e429a..e4a400dffe3 100644
--- a/src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/buildconfig/GtfsConfig.java
@@ -74,7 +74,7 @@ private static GtfsFeedParametersBuilder mapGenericParameters(
           .description(
             """
             This parameter sets the generic level of preference. What is the actual cost can be changed
-            with the `stopTransferCost` parameter in the router configuration.
+            with the `stopBoardAlightDuringTransferCost` parameter in the router configuration.
             """
           )
           .docDefaultValue(docDefaults.stationTransferPreference())
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java
index d4c99004a59..34465cff27a 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/TransitRoutingConfig.java
@@ -31,7 +31,7 @@ public final class TransitRoutingConfig implements RaptorTuningParameters, Trans
   private final List transferCacheRequests;
   private final List pagingSearchWindowAdjustments;
 
-  private final Map stopTransferCost;
+  private final Map stopBoardAlightDuringTransferCost;
   private final Duration maxSearchWindow;
   private final DynamicSearchWindowCoefficients dynamicSearchWindowCoefficients;
 
@@ -114,18 +114,24 @@ public TransitRoutingConfig(
         )
         .asInt(dft.searchThreadPoolSize());
     // Dynamic Search Window
-    this.stopTransferCost =
+    this.stopBoardAlightDuringTransferCost =
       c
-        .of("stopTransferCost")
+        .of("stopBoardAlightDuringTransferCost")
         .since(V2_0)
-        .summary("Use this to set a stop transfer cost for the given transfer priority")
+        .summary(
+          "Costs for boarding and alighting during transfers at stops with a given transfer priority."
+        )
         .description(
           """
-The cost is applied to boarding and alighting at all stops. All stops have a transfer cost priority
-set, the default is `allowed`. The `stopTransferCost` parameter is optional, but if listed all 
-values must be set.
+This cost is applied **both to boarding and alighting** at stops during transfers. All stops have a
+transfer cost priority set, the default is `allowed`. The `stopBoardAlightDuringTransferCost`
+parameter is optional, but if listed all values must be set.
+
+When a transfer occurs at the same stop, the cost will be applied twice since the cost is both for
+boarding and alighting,
           
-If not set the `stopTransferCost` is ignored. This is only available for NeTEx imported Stops.
+If not set the `stopBoardAlightDuringTransferCost` is ignored. This is only available for NeTEx
+imported Stops.
           
 The cost is a scalar, but is equivalent to the felt cost of riding a transit trip for 1 second.
           
@@ -137,7 +143,7 @@ public TransitRoutingConfig(
 | `preferred`   | The best place to do transfers. Should be set to `0`(zero).                                   | int  |
           
 Use values in a range from `0` to `100 000`. **All key/value pairs are required if the 
-`stopTransferCost` is listed.**
+`stopBoardAlightDuringTransferCost` is listed.**
 """
         )
         .asEnumMapAllKeysRequired(StopTransferPriority.class, Integer.class);
@@ -250,12 +256,12 @@ public DynamicSearchWindowCoefficients dynamicSearchWindowCoefficients() {
 
   @Override
   public boolean enableStopTransferPriority() {
-    return stopTransferCost != null;
+    return stopBoardAlightDuringTransferCost != null;
   }
 
   @Override
-  public Integer stopTransferCost(StopTransferPriority key) {
-    return stopTransferCost.get(key);
+  public Integer stopBoardAlightDuringTransferCost(StopTransferPriority key) {
+    return stopBoardAlightDuringTransferCost.get(key);
   }
 
   @Override
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
index 91665d56d38..365c4e89145 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
@@ -144,7 +144,7 @@ private static TransferOptimizationPreferences mapTransferOptimization(NodeAdapt
           .summary("Add an extra board- and alight-cost for prioritized stops.")
           .description(
             """
-            A stopBoardAlightCosts is added to the generalized-cost during routing. But this cost
+            A stopBoardAlightTransferCosts is added to the generalized-cost during routing. But this cost
             cannot be too high, because that would add extra cost to the transfer, and favor other
             alternative paths. But, when optimizing transfers, we do not have to take other paths
             into consideration and can *boost* the stop-priority-cost to allow transfers to
diff --git a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java b/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java
index 037c345bc23..97ad09e3bfd 100644
--- a/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java
+++ b/src/test/java/org/opentripplanner/raptor/_data/transit/TestTransitData.java
@@ -66,7 +66,7 @@ public class TestTransitData
   private final List constrainedTransfers = new ArrayList<>();
   private final GeneralizedCostParametersBuilder costParamsBuilder = GeneralizedCostParameters.of();
 
-  private final int[] stopBoardAlightCosts = new int[NUM_STOPS];
+  private final int[] stopBoardAlightTransferCosts = new int[NUM_STOPS];
 
   private RaptorSlackProvider slackProvider = SLACK_PROVIDER;
 
@@ -106,7 +106,7 @@ public int numberOfStops() {
   public RaptorCostCalculator multiCriteriaCostCalculator() {
     return CostCalculatorFactory.createCostCalculator(
       costParamsBuilder.build(),
-      stopBoardAlightCost()
+      stopBoardAlightTransferCosts()
     );
   }
 
@@ -302,8 +302,8 @@ public TestTransitData withConstrainedTransfer(
     return this;
   }
 
-  public TestTransitData withStopBoardAlightCost(int stop, int boardAlightCost) {
-    stopBoardAlightCosts[stop] = boardAlightCost;
+  public TestTransitData withStopBoardAlightTransferCost(int stop, int boardAlightTransferCost) {
+    stopBoardAlightTransferCosts[stop] = boardAlightTransferCost;
     return this;
   }
 
@@ -357,9 +357,9 @@ public List getPatterns() {
 
   /* private methods */
 
-  private int[] stopBoardAlightCost() {
+  private int[] stopBoardAlightTransferCosts() {
     // Not implemented, no test for this yet.
-    return stopBoardAlightCosts;
+    return stopBoardAlightTransferCosts;
   }
 
   private void expandNumOfStops(int stopIndex) {
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopTransferCostTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java
similarity index 86%
rename from src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopTransferCostTest.java
rename to src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java
index 21c1dd2a755..df38aabc483 100644
--- a/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopTransferCostTest.java
+++ b/src/test/java/org/opentripplanner/raptor/moduletests/B05_EgressStopBoardAlightTransferCostTest.java
@@ -22,10 +22,10 @@
 /**
  * FEATURE UNDER TEST
  * 
      
- * This verifies that the stopTransferCost is not applied for egress legs. If this is not correctly
- * handled by the heuristics optimization, the cheapest journey could be discarded.
+ * This verifies that the stopBoardAlightTransferCost is not applied for egress legs. If this is not
+ * correctly handled by the heuristics optimization, the cheapest journey could be discarded.
  */
-public class B05_EgressStopTransferCostTest implements RaptorTestConstants {
+public class B05_EgressStopBoardAlightTransferCostTest implements RaptorTestConstants {
 
   private final TestTransitData data = new TestTransitData();
   private final RaptorRequestBuilder requestBuilder = new RaptorRequestBuilder<>();
@@ -40,7 +40,7 @@ void setup() {
       .withRoute(route("R2", STOP_C, STOP_D).withTimetable(schedule("0:18, 0:20")));
 
     data.mcCostParamsBuilder().transferCost(0).boardCost(0);
-    data.withStopBoardAlightCost(STOP_D, 60000);
+    data.withStopBoardAlightTransferCost(STOP_D, 60000);
 
     requestBuilder
       .searchParams()
@@ -61,7 +61,7 @@ static List testCases() {
       .add(
         multiCriteria(),
         // We should get both the fastest and the c1-cheapest results
-        // The stopTransferCost should not be applied to the egress leg from STOP_D
+        // The stopBoardAlightTransferCost should not be applied to the egress leg from STOP_D
         "B ~ BUS R1 0:10 0:14 ~ C ~ Walk 5m [0:10 0:19 9m Tₓ0 C₁840]",
         "B ~ BUS R1 0:10 0:14 ~ C ~ BUS R2 0:18 0:20 ~ D ~ Walk 20s [0:10 0:20:20 10m20s Tₓ1 C₁640]"
       )
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java
index bebc11fd2c2..9296ee2730c 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapperTest.java
@@ -42,8 +42,8 @@ class TransitLayerMapperTest {
   private final List STOPS = Arrays.asList(STOP_0, STOP_1, STOP_2, STOP_3, STOP_4);
 
   @Test
-  public void createStopTransferCosts() {
-    int[] result = TransitLayerMapper.createStopTransferCosts(
+  public void createStopBoardAlightTransferCosts() {
+    int[] result = TransitLayerMapper.createStopBoardAlightTransferCosts(
       new StopModelMock(STOPS),
       TransitTuningParameters.FOR_TEST
     );
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java b/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java
index f9bdf0df273..8c82f68a8bc 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/transferoptimization/model/OptimizedPathTailTest.java
@@ -53,14 +53,14 @@ class OptimizedPathTailTest implements RaptorTestConstants {
    *  Extra cost = (30.0 + 2 * 10.0) * 2.0 = $100.00
    *
      */ - private final int[] stopBoardAlightCost = new int[] { 0, 0, 3000, 0, 1000, 0 }; + private final int[] stopBoardAlightTransferCosts = new int[] { 0, 0, 3000, 0, 1000, 0 }; private final OptimizedPathTail subject = new OptimizedPathTail<>( SLACK_PROVIDER, BasicPathTestCase.C1_CALCULATOR, 0, waitTimeCalc, - stopBoardAlightCost, + stopBoardAlightTransferCosts, 2.0, this::stopIndexToName ); diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index f5eaa1f942b..1fb20306049 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -171,7 +171,7 @@ "minWindow": "1h", "maxWindow": "5h" }, - "stopTransferCost": { + "stopBoardAlightDuringTransferCost": { "DISCOURAGED": 1500, "ALLOWED": 75, "RECOMMENDED": 30, diff --git a/test/performance/norway/speed-test-config.json b/test/performance/norway/speed-test-config.json index e4ca99d7fe5..e8e33576769 100644 --- a/test/performance/norway/speed-test-config.json +++ b/test/performance/norway/speed-test-config.json @@ -31,7 +31,7 @@ // stepMinutes: 10 // stepMinutes: 10 }, - "stopTransferCost": { + "stopBoardAlightDuringTransferCost": { "DISCOURAGED": 86400, "ALLOWED": 3000, "RECOMMENDED": 300, diff --git a/test/performance/skanetrafiken/speed-test-config.json b/test/performance/skanetrafiken/speed-test-config.json index 66184ab124f..69a12755336 100644 --- a/test/performance/skanetrafiken/speed-test-config.json +++ b/test/performance/skanetrafiken/speed-test-config.json @@ -7,7 +7,7 @@ "dynamicSearchWindow": { "maxWindow": "24h" }, - "stopTransferCost": { + "stopBoardAlightDuringTransferCost": { "DISCOURAGED": 3000, "ALLOWED": 150, "RECOMMENDED": 60, diff --git a/test/performance/switzerland/speed-test-config.json b/test/performance/switzerland/speed-test-config.json index 19ac7a1358a..7c2e692d2cb 100644 --- a/test/performance/switzerland/speed-test-config.json +++ b/test/performance/switzerland/speed-test-config.json @@ -31,7 +31,7 @@ // stepMinutes: 10 // stepMinutes: 10 }, - "stopTransferCost": { + "stopBoardAlightDuringTransferCost": { "DISCOURAGED": 86400, "ALLOWED": 3000, "RECOMMENDED": 300, From 22a976301224299c0e1061775b6ec12ff78d192b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 26 Apr 2024 20:14:57 +0300 Subject: [PATCH 1018/1688] Refactor PlanPageInfo to be a class --- .../apis/gtfs/model/PlanPageInfo.java | 79 +++++++++++++++++-- 1 file changed, 72 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java index e4953227a6c..1575933b924 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java @@ -2,11 +2,76 @@ import graphql.relay.ConnectionCursor; import java.time.Duration; +import java.util.Objects; -public record PlanPageInfo( - ConnectionCursor startCursor, - ConnectionCursor endCursor, - boolean hasPreviousPage, - boolean hasNextPage, - Duration searchWindowUsed -) {} +public class PlanPageInfo { + + private final ConnectionCursor startCursor; + private final ConnectionCursor endCursor; + private final boolean hasPreviousPage; + private final boolean hasNextPage; + private final Duration searchWindowUsed; + + public PlanPageInfo( + ConnectionCursor startCursor, + ConnectionCursor endCursor, + boolean hasPreviousPage, + boolean hasNextPage, + Duration searchWindowUsed + ) { + this.startCursor = startCursor; + this.endCursor = endCursor; + this.hasPreviousPage = hasPreviousPage; + this.hasNextPage = hasNextPage; + this.searchWindowUsed = searchWindowUsed; + } + + public ConnectionCursor startCursor() { + return startCursor; + } + + public ConnectionCursor endCursor() { + return endCursor; + } + + public boolean hasPreviousPage() { + return hasPreviousPage; + } + + public boolean hasNextPage() { + return hasNextPage; + } + + public Duration searchWindowUsed() { + return searchWindowUsed; + } + + @Override + public int hashCode() { + return Objects.hash( + startCursor.getValue(), + endCursor.getValue(), + hasPreviousPage, + hasNextPage, + searchWindowUsed + ); + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + PlanPageInfo that = (PlanPageInfo) o; + return ( + Objects.equals(startCursor.getValue(), that.startCursor.getValue()) && + Objects.equals(endCursor.getValue(), that.endCursor.getValue()) && + Objects.equals(searchWindowUsed, that.searchWindowUsed) && + hasPreviousPage == that.hasPreviousPage && + hasNextPage == that.hasNextPage + ); + } +} From 459348d056f806d08239c84cfcbc7dcf130907fb Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 29 Apr 2024 15:50:11 +0300 Subject: [PATCH 1019/1688] Combine multiple methods into one and clarify method naming/javadoc --- .../ext/siri/SiriTimetableSnapshotSource.java | 2 +- .../model/TimetableSnapshot.java | 84 +++++++++---------- .../updater/trip/TimetableSnapshotSource.java | 2 +- 3 files changed, 40 insertions(+), 48 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 87f100464a5..e188f16b75c 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -354,7 +354,7 @@ private Result handleModifiedTrip( // Also check whether trip id has been used for previously ADDED/MODIFIED trip message and // remove the previously created trip - this.buffer.removePreviousRealtimeUpdate(trip.getId(), serviceDate); + this.buffer.removeRealtimeAddedTripPatternAndTimetablesForTrip(trip.getId(), serviceDate); return updateResult; } diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index 937c3e13ffd..3c0078da62a 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -262,20 +262,52 @@ public void clear(String feedId) { } /** - * Removes previous trip-update from buffer if there is an update with given trip on service date + * If a previous realtime update has changed which trip pattern is used for this trip on the given + * service date, this removes the timetables for this trip on the service date for the trip + * pattern and also the connection of that trip pattern for this trip on the given service date. + * The original trip pattern from the scheduled data will be used for the trip again on this + * service date until a new trip pattern is used for the trip. * - * @param serviceDate service date - * @return true if a previously added trip was removed + * @return true if a new trip pattern was used for the trip previously and its connection to the + * trip one the given service date was attempted to removed together with its timetables for the + * trip. */ - public boolean removePreviousRealtimeUpdate(FeedScopedId tripId, LocalDate serviceDate) { + public boolean removeRealtimeAddedTripPatternAndTimetablesForTrip( + FeedScopedId tripId, + LocalDate serviceDate + ) { boolean success = false; final TripPattern pattern = getRealtimeAddedTripPattern(tripId, serviceDate); if (pattern != null) { // Remove the previous real-time-added TripPattern from buffer. // Only one version of the real-time-update should exist - removeLastAddedTripPattern(tripId, serviceDate); - removeRealtimeUpdatedTripTimes(pattern, tripId, serviceDate); + realtimeAddedTripPattern.remove(new TripIdAndServiceDate(tripId, serviceDate)); + SortedSet sortedTimetables = this.timetables.get(pattern); + if (sortedTimetables != null) { + TripTimes tripTimesToRemove = null; + for (Timetable timetable : sortedTimetables) { + if (timetable.isValidFor(serviceDate)) { + final TripTimes tripTimes = timetable.getTripTimes(tripId); + if (tripTimes == null) { + LOG.debug("No triptimes to remove for trip {}", tripId); + } else if (tripTimesToRemove != null) { + LOG.debug("Found two triptimes to remove for trip {}", tripId); + } else { + tripTimesToRemove = tripTimes; + } + } + } + + if (tripTimesToRemove != null) { + for (Timetable sortedTimetable : sortedTimetables) { + boolean isDirty = sortedTimetable.getTripTimes().remove(tripTimesToRemove); + if (isDirty) { + dirtyTimetables.add(sortedTimetable); + } + } + } + } success = true; } @@ -371,46 +403,6 @@ protected boolean clearRealtimeAddedTripPattern(String feedId) { ); } - private void removeRealtimeUpdatedTripTimes( - TripPattern tripPattern, - FeedScopedId tripId, - LocalDate serviceDate - ) { - SortedSet sortedTimetables = this.timetables.get(tripPattern); - if (sortedTimetables != null) { - TripTimes tripTimesToRemove = null; - for (Timetable timetable : sortedTimetables) { - if (timetable.isValidFor(serviceDate)) { - final TripTimes tripTimes = timetable.getTripTimes(tripId); - if (tripTimes == null) { - LOG.debug("No triptimes to remove for trip {}", tripId); - } else if (tripTimesToRemove != null) { - LOG.debug("Found two triptimes to remove for trip {}", tripId); - } else { - tripTimesToRemove = tripTimes; - } - } - } - - if (tripTimesToRemove != null) { - for (Timetable sortedTimetable : sortedTimetables) { - boolean isDirty = sortedTimetable.getTripTimes().remove(tripTimesToRemove); - if (isDirty) { - dirtyTimetables.add(sortedTimetable); - } - } - } - } - } - - /** - * Removes the latest added trip pattern from the cache. This should be done when removing the - * trip times from the timetable the trip has been added to. - */ - private void removeLastAddedTripPattern(FeedScopedId feedScopedTripId, LocalDate serviceDate) { - realtimeAddedTripPattern.remove(new TripIdAndServiceDate(feedScopedTripId, serviceDate)); - } - /** * Add the patterns to the stop index, only if they come from a modified pattern */ diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 21fcbfd2d6e..6b00dcb8b1a 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -287,7 +287,7 @@ public UpdateResult applyTripUpdates( cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType); // Remove previous realtime updates for this trip. This is necessary to avoid previous // stop pattern modifications from persisting - this.buffer.removePreviousRealtimeUpdate(tripId, serviceDate); + this.buffer.removeRealtimeAddedTripPatternAndTimetablesForTrip(tripId, serviceDate); } uIndex += 1; From b98c3c808ca37c33c258b4efbd2a83d1f9f347f4 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 29 Apr 2024 15:54:40 +0300 Subject: [PATCH 1020/1688] Rename parameter to better match its type --- .../updater/trip/TimetableSnapshotSource.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 6b00dcb8b1a..e66174b0126 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -1137,7 +1137,7 @@ private Result handleModifiedTrip( private Result handleCanceledTrip( FeedScopedId tripId, final LocalDate serviceDate, - CancelationType markAsDeleted, + CancelationType cancelationType, boolean canceledPreviouslyAddedTrip ) { // if previously a added trip was removed, there can't be a scheduled trip to remove @@ -1145,7 +1145,11 @@ private Result handleCanceledTrip( return Result.success(UpdateSuccess.noWarnings()); } // Try to cancel scheduled trip - final boolean cancelScheduledSuccess = cancelScheduledTrip(tripId, serviceDate, markAsDeleted); + final boolean cancelScheduledSuccess = cancelScheduledTrip( + tripId, + serviceDate, + cancelationType + ); if (!cancelScheduledSuccess) { debug(tripId, "No pattern found for tripId. Skipping cancellation."); From 2d53250124f5663c5428ebb5b285dd50be3aebe1 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Wed, 20 Dec 2023 12:15:45 +0100 Subject: [PATCH 1021/1688] Add RoutingAccessEgress --- .../ridehailing/RideHailingAccessAdapter.java | 3 +- .../ridehailing/RideHailingAccessShifter.java | 5 +-- .../ext/traveltime/TravelTimeResource.java | 4 +-- .../mapping/RaptorPathToItineraryMapper.java | 10 +++--- .../raptoradapter/router/TransitRouter.java | 18 +++++----- .../street/AccessEgressPenaltyDecorator.java | 14 +++++--- .../router/street/AccessEgresses.java | 14 ++++---- .../transit/DefaultAccessEgress.java | 12 ++++--- .../transit/RoutingAccessEgress.java | 33 +++++++++++++++++++ .../transit/mappers/AccessEgressMapper.java | 7 ++-- .../AccessEgressPenaltyDecoratorTest.java | 19 ++++++----- .../router/street/AccessEgressesTest.java | 15 +++++---- 12 files changed, 100 insertions(+), 54 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java index beba8570b8b..3c4d2a1b7ff 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java @@ -3,6 +3,7 @@ import java.time.Duration; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; /** * This class is used to adapt the ride hailing accesses (not egresses) into a time-dependent @@ -12,7 +13,7 @@ public final class RideHailingAccessAdapter extends DefaultAccessEgress { private final Duration arrival; - public RideHailingAccessAdapter(DefaultAccessEgress access, Duration arrival) { + public RideHailingAccessAdapter(RoutingAccessEgress access, Duration arrival) { super(access.stop(), access.getLastState()); this.arrival = arrival; } diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java index b4a75c26aad..32f79dcc8a0 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java @@ -10,6 +10,7 @@ import org.opentripplanner.ext.ridehailing.model.ArrivalTime; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.transit.model.framework.Result; @@ -33,9 +34,9 @@ public class RideHailingAccessShifter { * so that they only start at the time when the ride hailing vehicle can actually be there * to pick up passengers. */ - public static List shiftAccesses( + public static List shiftAccesses( boolean isAccess, - List results, + List results, List services, RouteRequest request, Instant now diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java index 67d8bb0d6cb..88742aebeb1 100644 --- a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java +++ b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java @@ -34,7 +34,7 @@ import org.opentripplanner.raptor.api.response.RaptorResponse; import org.opentripplanner.raptor.api.response.StopArrivals; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressRouter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.AccessEgressMapper; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.RaptorRoutingRequestTransitData; @@ -178,7 +178,7 @@ private ZSampleGrid getSampleGrid() { } } - private Collection getAccess(TemporaryVerticesContainer temporaryVertices) { + private Collection getAccess(TemporaryVerticesContainer temporaryVertices) { final Collection accessStops = AccessEgressRouter.streetSearch( routingRequest, temporaryVertices, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java index 2780cc8ba14..d7098c20661 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapper.java @@ -24,8 +24,8 @@ import org.opentripplanner.raptor.api.path.RaptorPath; import org.opentripplanner.raptor.api.path.TransferPathLeg; import org.opentripplanner.raptor.api.path.TransitPathLeg; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultRaptorTransfer; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.Transfer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; @@ -146,12 +146,12 @@ else if (pathLeg.isTransferLeg()) { } var penaltyCost = 0; - if (accessPathLeg.access() instanceof DefaultAccessEgress ae) { + if (accessPathLeg.access() instanceof RoutingAccessEgress ae) { itinerary.setAccessPenalty(ae.penalty()); penaltyCost += ae.penalty().cost().toSeconds(); } - if (egressPathLeg.egress() instanceof DefaultAccessEgress ae) { + if (egressPathLeg.egress() instanceof RoutingAccessEgress ae) { itinerary.setEgressPenalty(ae.penalty()); penaltyCost += ae.penalty().cost().toSeconds(); } @@ -169,7 +169,7 @@ private List mapAccessLeg(AccessPathLeg accessPathLeg) { return List.of(); } - DefaultAccessEgress accessPath = (DefaultAccessEgress) accessPathLeg.access(); + RoutingAccessEgress accessPath = (RoutingAccessEgress) accessPathLeg.access(); var graphPath = new GraphPath<>(accessPath.getLastState()); @@ -279,7 +279,7 @@ private Itinerary mapEgressLeg(EgressPathLeg egressPathLeg) { return null; } - DefaultAccessEgress egressPath = (DefaultAccessEgress) egressPathLeg.egress(); + RoutingAccessEgress egressPath = (RoutingAccessEgress) egressPathLeg.egress(); var graphPath = new GraphPath<>(egressPath.getLastState()); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index b58af3c8b23..a4d9b212230 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -23,7 +23,7 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.AccessEgressMapper; @@ -171,8 +171,8 @@ private TransitRouterResult route() { } private AccessEgresses fetchAccessEgresses() { - final var asyncAccessList = new ArrayList(); - final var asyncEgressList = new ArrayList(); + final var asyncAccessList = new ArrayList(); + final var asyncEgressList = new ArrayList(); if (OTPFeature.ParallelRouting.isOn()) { try { @@ -207,21 +207,21 @@ private AccessEgresses fetchAccessEgresses() { return new AccessEgresses(accessList, egressList); } - private Collection fetchAccess() { + private Collection fetchAccess() { debugTimingAggregator.startedAccessCalculating(); var list = fetchAccessEgresses(ACCESS); debugTimingAggregator.finishedAccessCalculating(); return list; } - private Collection fetchEgress() { + private Collection fetchEgress() { debugTimingAggregator.startedEgressCalculating(); var list = fetchAccessEgresses(EGRESS); debugTimingAggregator.finishedEgressCalculating(); return list; } - private Collection fetchAccessEgresses(AccessEgressType type) { + private Collection fetchAccessEgresses(AccessEgressType type) { var streetRequest = type.isAccess() ? request.journey().access() : request.journey().egress(); // Prepare access/egress lists @@ -255,7 +255,7 @@ private Collection fetchAccessEgresses(AccessEgressType typ stopCountLimit ); - List results = new ArrayList<>( + List results = new ArrayList<>( AccessEgressMapper.mapNearbyStops(nearbyStops, type.isEgress()) ); results = timeshiftRideHailing(streetRequest, type, results); @@ -288,10 +288,10 @@ private Collection fetchAccessEgresses(AccessEgressType typ * This method is a good candidate to be moved to the access/egress filter chain when that has * been added. */ - private List timeshiftRideHailing( + private List timeshiftRideHailing( StreetRequest streetRequest, AccessEgressType type, - List accessEgressList + List accessEgressList ) { if (streetRequest.mode() != StreetMode.CAR_HAILING) { return accessEgressList; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java index 8f8d73c1acd..5adb1fdc001 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecorator.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.router.street; import java.util.Collection; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenaltyForEnum; @@ -25,19 +25,23 @@ public AccessEgressPenaltyDecorator( this.penalty = penalty; } - public Collection decorateAccess(Collection list) { + public Collection decorateAccess( + Collection list + ) { return decorate(list, accessMode); } - public Collection decorateEgress(Collection list) { + public Collection decorateEgress( + Collection list + ) { return decorate(list, egressMode); } /** * Decorate each access-egress with a penalty according to the specified street-mode. */ - private Collection decorate( - Collection input, + private Collection decorate( + Collection input, StreetMode requestedMode ) { if (input.isEmpty()) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java index f2e8fe6c9f1..50b4f528c5b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgresses.java @@ -1,26 +1,26 @@ package org.opentripplanner.routing.algorithm.raptoradapter.router.street; import java.util.Collection; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; public class AccessEgresses { - private final Collection accesses; - private final Collection egresses; + private final Collection accesses; + private final Collection egresses; public AccessEgresses( - Collection accesses, - Collection egresses + Collection accesses, + Collection egresses ) { this.accesses = accesses; this.egresses = egresses; } - public Collection getAccesses() { + public Collection getAccesses() { return accesses; } - public Collection getEgresses() { + public Collection getEgresses() { return egresses; } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java index 35987c0af7d..e71e18fa985 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java @@ -2,7 +2,6 @@ import java.util.Objects; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter; import org.opentripplanner.street.search.state.State; @@ -10,7 +9,7 @@ /** * Default implementation of the RaptorAccessEgress interface. */ -public class DefaultAccessEgress implements RaptorAccessEgress { +public class DefaultAccessEgress implements RoutingAccessEgress { private final int stop; private final int durationInSeconds; @@ -34,7 +33,7 @@ public DefaultAccessEgress(int stop, State lastState) { this.penalty = TimeAndCost.ZERO; } - protected DefaultAccessEgress(DefaultAccessEgress other, TimeAndCost penalty) { + protected DefaultAccessEgress(RoutingAccessEgress other, TimeAndCost penalty) { if (other.hasPenalty()) { throw new IllegalStateException("Can not add penalty twice..."); } @@ -54,6 +53,7 @@ protected DefaultAccessEgress(DefaultAccessEgress other, TimeAndCost penalty) { *

      * OVERRIDE THIS IF KEEPING THE TYPE IS IMPORTANT! */ + @Override public DefaultAccessEgress withPenalty(TimeAndCost penalty) { return new DefaultAccessEgress(this, penalty); } @@ -83,18 +83,22 @@ public boolean hasOpeningHours() { return false; } + @Override public State getLastState() { return lastState; } + @Override public boolean isWalkOnly() { return lastState.containsOnlyWalkMode(); } + @Override public boolean hasPenalty() { return !penalty.isZero(); } + @Override public TimeAndCost penalty() { return penalty; } @@ -121,7 +125,7 @@ public final boolean equals(Object o) { } // We check the contract of DefaultAccessEgress used for routing for equality, we do not care // if the entries are different implementation or have different AStar paths(lastState). - if (!(o instanceof DefaultAccessEgress that)) { + if (!(o instanceof RoutingAccessEgress that)) { return false; } return ( diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java new file mode 100644 index 00000000000..d22ec0f71f9 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java @@ -0,0 +1,33 @@ +package org.opentripplanner.routing.algorithm.raptoradapter.transit; + +import org.opentripplanner.framework.model.TimeAndCost; +import org.opentripplanner.raptor.api.model.RaptorAccessEgress; +import org.opentripplanner.street.search.state.State; + +/** + * Encapsulate information about an access or egress path. This interface extends + * {@link RaptorAccessEgress} with methods relevant only to street routing and + * access/egress filtering. + */ +public interface RoutingAccessEgress extends RaptorAccessEgress { + /** + * Return a new copy of this with the requested penalty. + *

      + * OVERRIDE THIS IF KEEPING THE TYPE IS IMPORTANT! + */ + RoutingAccessEgress withPenalty(TimeAndCost penalty); + + /** + * Return the last state both in the case of access and egress. + */ + State getLastState(); + + /** + * Return true if all edges are traversed on foot. + */ + boolean isWalkOnly(); + + boolean hasPenalty(); + + TimeAndCost penalty(); +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java index 6cef677f5a9..fd7619ac297 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java @@ -7,12 +7,13 @@ import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.FlexAccessEgressAdapter; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.transit.model.site.RegularStop; public class AccessEgressMapper { - public static List mapNearbyStops( + public static List mapNearbyStops( Collection accessStops, boolean isEgress ) { @@ -23,7 +24,7 @@ public static List mapNearbyStops( .collect(Collectors.toList()); } - public static Collection mapFlexAccessEgresses( + public static Collection mapFlexAccessEgresses( Collection flexAccessEgresses, boolean isEgress ) { @@ -33,7 +34,7 @@ public static Collection mapFlexAccessEgresses( .collect(Collectors.toList()); } - private static DefaultAccessEgress mapNearbyStop(NearbyStop nearbyStop, boolean isEgress) { + private static RoutingAccessEgress mapNearbyStop(NearbyStop nearbyStop, boolean isEgress) { if (!(nearbyStop.stop instanceof RegularStop)) { return null; } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java index 7d68c5bfeeb..78b12a97b82 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressPenaltyDecoratorTest.java @@ -12,6 +12,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenalty; import org.opentripplanner.routing.api.request.framework.TimeAndCostPenaltyForEnum; @@ -24,8 +25,8 @@ class AccessEgressPenaltyDecoratorTest { private static final int DURATION_CAR_RENTAL = 45; private static final int DURATION_WALKING = 135; private static final Duration D10m = DurationUtils.duration("10m"); - private static final DefaultAccessEgress WALK = ofWalking(DURATION_WALKING); - private static final DefaultAccessEgress CAR_RENTAL = ofCarRental(DURATION_CAR_RENTAL); + private static final RoutingAccessEgress WALK = ofWalking(DURATION_WALKING); + private static final RoutingAccessEgress CAR_RENTAL = ofCarRental(DURATION_CAR_RENTAL); private static final TimeAndCostPenalty PENALTY = new TimeAndCostPenalty( TimePenalty.of(D10m, 1.5), 2.0 @@ -33,10 +34,10 @@ class AccessEgressPenaltyDecoratorTest { // We use the penalty to calculate the expected value, this is not pure, but the // TimeAndCostPenalty is unit-tested elsewhere. - private static final DefaultAccessEgress EXP_WALK_W_PENALTY = WALK.withPenalty( + private static final RoutingAccessEgress EXP_WALK_W_PENALTY = WALK.withPenalty( PENALTY.calculate(DURATION_WALKING) ); - private static final DefaultAccessEgress EXP_CAR_RENTAL_W_PENALTY = CAR_RENTAL.withPenalty( + private static final RoutingAccessEgress EXP_CAR_RENTAL_W_PENALTY = CAR_RENTAL.withPenalty( PENALTY.calculate(DURATION_CAR_RENTAL) ); @@ -60,7 +61,7 @@ private static List decorateCarRentalTestCase() { @ParameterizedTest @MethodSource("decorateCarRentalTestCase") - void decorateCarRentalTest(List expected, List input) { + void decorateCarRentalTest(List expected, List input) { var subject = new AccessEgressPenaltyDecorator( StreetMode.CAR_RENTAL, StreetMode.WALK, @@ -81,7 +82,7 @@ private static List decorateWalkTestCase() { @ParameterizedTest @MethodSource("decorateWalkTestCase") - void decorateWalkTest(List expected, List input) { + void decorateWalkTest(List expected, List input) { var subject = new AccessEgressPenaltyDecorator( StreetMode.CAR_RENTAL, StreetMode.WALK, @@ -111,18 +112,18 @@ void doNotDecorateAnyIfNoPenaltyIsSet() { @Test void filterEgress() {} - private static DefaultAccessEgress ofCarRental(int duration) { + private static RoutingAccessEgress ofCarRental(int duration) { return ofAccessEgress( duration, TestStateBuilder.ofCarRental().streetEdge().pickUpCarFromStation().build() ); } - private static DefaultAccessEgress ofWalking(int durationInSeconds) { + private static RoutingAccessEgress ofWalking(int durationInSeconds) { return ofAccessEgress(durationInSeconds, TestStateBuilder.ofWalking().streetEdge().build()); } - private static DefaultAccessEgress ofAccessEgress(int duration, State state) { + private static RoutingAccessEgress ofAccessEgress(int duration, State state) { // We do NOT need to override #withPenalty(...), because all fields including // 'durationInSeconds' is copied over using the getters. diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java index 1779155a69b..bd498e82f65 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressesTest.java @@ -8,36 +8,37 @@ import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.street.search.state.TestStateBuilder; class AccessEgressesTest { public static final Duration D3m = Duration.ofMinutes(3); public static final Duration D7m = Duration.ofMinutes(7); - private static final DefaultAccessEgress ACCESS_A = new DefaultAccessEgress( + private static final RoutingAccessEgress ACCESS_A = new DefaultAccessEgress( 1, TestStateBuilder.ofWalking().build() ) .withPenalty(new TimeAndCost(D3m, Cost.ZERO)); - private static final DefaultAccessEgress ACCESS_B = new DefaultAccessEgress( + private static final RoutingAccessEgress ACCESS_B = new DefaultAccessEgress( 1, TestStateBuilder.ofWalking().build() ) .withPenalty(new TimeAndCost(D7m, Cost.ZERO)); - private static final DefaultAccessEgress ACCESS_C = new DefaultAccessEgress( + private static final RoutingAccessEgress ACCESS_C = new DefaultAccessEgress( 1, TestStateBuilder.ofWalking().build() ); - private static final List ACCESSES = List.of(ACCESS_A, ACCESS_B, ACCESS_C); - private static final DefaultAccessEgress EGRESS_A = new DefaultAccessEgress( + private static final List ACCESSES = List.of(ACCESS_A, ACCESS_B, ACCESS_C); + private static final RoutingAccessEgress EGRESS_A = new DefaultAccessEgress( 1, TestStateBuilder.ofWalking().build() ); - private static final DefaultAccessEgress EGRESS_B = new DefaultAccessEgress( + private static final RoutingAccessEgress EGRESS_B = new DefaultAccessEgress( 1, TestStateBuilder.ofWalking().build() ); - private static final List EGRESSES = List.of(EGRESS_A, EGRESS_B); + private static final List EGRESSES = List.of(EGRESS_A, EGRESS_B); private final AccessEgresses subject = new AccessEgresses(ACCESSES, EGRESSES); From e2483f40c939369bd740ed55c7f82e3e43ae267a Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Wed, 20 Dec 2023 16:59:22 +0100 Subject: [PATCH 1022/1688] Add request parameter earliestBookingTime --- .../apis/transmodel/mapping/TripRequestMapper.java | 7 +++++++ .../apis/transmodel/model/plan/TripQuery.java | 8 ++++++++ .../routing/api/request/RouteRequest.java | 11 +++++++++++ .../opentripplanner/apis/transmodel/schema.graphql | 2 ++ 4 files changed, 28 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java index 5c579501254..72abfc8afe3 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java @@ -52,6 +52,13 @@ public static RouteRequest createRequest(DataFetchingEnvironment environment) { "dateTime", millisSinceEpoch -> request.setDateTime(Instant.ofEpochMilli((long) millisSinceEpoch)) ); + + callWith.argument( + "earliestBookingTime", + millisSinceEpoch -> + request.setEarliestBookingTime(Instant.ofEpochMilli((long) millisSinceEpoch)) + ); + callWith.argument( "searchWindow", (Integer m) -> request.setSearchWindow(Duration.ofMinutes(m)) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index bf34d9928e4..73d8173e3b3 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -58,6 +58,14 @@ public static GraphQLFieldDefinition create( .type(gqlUtil.dateTimeScalar) .build() ) + .argument( + GraphQLArgument + .newArgument() + .name("earliestBookingTime") + .description("Date and time for the earliest time the user can book the journey") + .type(gqlUtil.dateTimeScalar) + .build() + ) .argument( GraphQLArgument .newArgument() diff --git a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java index ce2fdb31c44..f570c3bfcc5 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java +++ b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java @@ -81,6 +81,8 @@ public class RouteRequest implements Cloneable, Serializable { private boolean wheelchair = false; + private Instant earliestBookingTime; + /* CONSTRUCTORS */ /** Constructor for options; modes defaults to walk and transit */ @@ -112,6 +114,15 @@ public void withPreferences(Consumer body) { this.preferences = preferences.copyOf().apply(body).build(); } + public Instant earliestBookingTime() { + return earliestBookingTime; + } + + public RouteRequest setEarliestBookingTime(Instant earliestBookingTime) { + this.earliestBookingTime = earliestBookingTime; + return this; + } + void setPreferences(RoutingPreferences preferences) { this.preferences = preferences; } diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index d263667d672..5c7fd89294f 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -795,6 +795,8 @@ type QueryType { dateTime: DateTime, "Debug the itinerary-filter-chain. OTP will attach a system notice to itineraries instead of removing them. This is very convenient when tuning the filters." debugItineraryFilter: Boolean = false @deprecated(reason : "Use `itineraryFilter.debug` instead."), + "Date and time for the earliest time the user can book the journey" + earliestBookingTime: DateTime, "A list of filters for which trips should be included. A trip will be included if it matches with at least one filter. An empty list of filters means that all trips should be included. If a search include this parameter, \"whiteListed\", \"banned\" & \"modes.transportModes\" filters will be ignored." filters: [TripFilterInput!], "The start location" From f9073e18bbfb4ff550f1c13287d06af429aa1985 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Wed, 20 Dec 2023 17:03:16 +0100 Subject: [PATCH 1023/1688] Adjust earliest departure time with booking time --- .../opentripplanner/model/BookingInfo.java | 31 ++++ .../raptoradapter/router/TransitRouter.java | 17 +- .../transit/BookingTimeAccessEgress.java | 151 ++++++++++++++++++ .../transit/FlexAccessEgressAdapter.java | 5 + 4 files changed, 201 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index 4dc0c17c784..b1c568cfa87 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -2,7 +2,9 @@ import java.io.Serializable; import java.time.Duration; +import java.time.LocalTime; import java.util.EnumSet; +import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.transit.model.organization.ContactInfo; /** @@ -13,6 +15,8 @@ */ public class BookingInfo implements Serializable { + private static final int DAY_IN_SECONDS = 3600 * 24; + private final ContactInfo contactInfo; private final EnumSet bookingMethods; @@ -80,6 +84,33 @@ public BookingInfo( } } + public int earliestDepartureTime(int requestedDepartureTime, int earliestBookingTime) { + if (latestBookingTime != null) { + int otpLatestBookingTime = calculateOtpTime( + latestBookingTime.getTime(), + -latestBookingTime.getDaysPrior() + ); + if (earliestBookingTime <= otpLatestBookingTime) { + return requestedDepartureTime; + } else { + return RaptorConstants.TIME_NOT_SET; + } + } + if (minimumBookingNotice != null) { + if (requestedDepartureTime >= earliestBookingTime + minimumBookingNotice.toSeconds()) { + return requestedDepartureTime; + } else { + return earliestBookingTime + (int) minimumBookingNotice.toSeconds(); + } + } + // missing booking info + return requestedDepartureTime; + } + + static int calculateOtpTime(LocalTime time, int dayOffset) { + return time.toSecondOfDay() + DAY_IN_SECONDS * dayOffset; + } + public ContactInfo getContactInfo() { return contactInfo; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index a4d9b212230..2c6df8492af 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -23,6 +23,7 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingTimeAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; @@ -207,21 +208,21 @@ private AccessEgresses fetchAccessEgresses() { return new AccessEgresses(accessList, egressList); } - private Collection fetchAccess() { + private Collection fetchAccess() { debugTimingAggregator.startedAccessCalculating(); var list = fetchAccessEgresses(ACCESS); debugTimingAggregator.finishedAccessCalculating(); return list; } - private Collection fetchEgress() { + private Collection fetchEgress() { debugTimingAggregator.startedEgressCalculating(); var list = fetchAccessEgresses(EGRESS); debugTimingAggregator.finishedEgressCalculating(); return list; } - private Collection fetchAccessEgresses(AccessEgressType type) { + private Collection fetchAccessEgresses(AccessEgressType type) { var streetRequest = type.isAccess() ? request.journey().access() : request.journey().egress(); // Prepare access/egress lists @@ -275,6 +276,16 @@ private Collection fetchAccessEgresses(AccessEgressType typ results.addAll(AccessEgressMapper.mapFlexAccessEgresses(flexAccessList, type.isEgress())); } + if (request.earliestBookingTime() != null) { + + return results + .stream() + .map(routingAccessEgress -> + new BookingTimeAccessEgress(routingAccessEgress, request.dateTime(), request.earliestBookingTime(), serverContext.transitService().getTimeZone()) + ) + .toList(); + } + return results; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java new file mode 100644 index 00000000000..b7a16c64ac3 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -0,0 +1,151 @@ +package org.opentripplanner.routing.algorithm.raptoradapter.transit; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import javax.annotation.Nullable; +import org.opentripplanner.ext.flex.trip.FlexTrip; +import org.opentripplanner.framework.model.TimeAndCost; +import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.street.search.state.State; + +public class BookingTimeAccessEgress implements RoutingAccessEgress { + + private static final int DAY_IN_SECONDS = 3600 * 24; + + private final RoutingAccessEgress delegate; + + private final BookingInfo pickupBookingInfo; + private final int earliestBookingTime; + + public BookingTimeAccessEgress( + RoutingAccessEgress delegate, + Instant dateTime, + Instant earliestBookingTime, + ZoneId timeZone + ) { + this.delegate = delegate; + this.earliestBookingTime = calculateOtpTime(dateTime, earliestBookingTime, timeZone); + if (delegate instanceof FlexAccessEgressAdapter flexAccessEgressAdapter) { + pickupBookingInfo = flexAccessEgressAdapter.getFlexTrip().getPickupBookingInfo(0); + } else { + pickupBookingInfo = null; + } + } + + @Override + public int stop() { + return delegate.stop(); + } + + @Override + public int c1() { + return delegate.c1(); + } + + @Override + public int durationInSeconds() { + return delegate.durationInSeconds(); + } + + @Override + public int earliestDepartureTime(int requestedDepartureTime) { + int edt = delegate.earliestDepartureTime(requestedDepartureTime); + if (edt == RaptorConstants.TIME_NOT_SET) { + return edt; + } + if (pickupBookingInfo != null) { + return pickupBookingInfo.earliestDepartureTime(edt, earliestBookingTime); + } + return edt; + } + + private int calculateOtpTime(Instant dateTime, Instant earliestBookingTime, ZoneId timeZone) { + ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(dateTime, timeZone); + ZonedDateTime zonedEarliestBookingTime = ZonedDateTime.ofInstant(earliestBookingTime, timeZone); + int days = zonedDateTime.toLocalDate().until(zonedEarliestBookingTime.toLocalDate()).getDays(); + return zonedEarliestBookingTime.toLocalTime().toSecondOfDay() + days * DAY_IN_SECONDS; + } + + @Override + public int latestArrivalTime(int requestedArrivalTime) { + return delegate.latestArrivalTime(requestedArrivalTime); + } + + @Override + public boolean hasOpeningHours() { + return delegate.hasOpeningHours(); + } + + @Override + @Nullable + public String openingHoursToString() { + return delegate.openingHoursToString(); + } + + @Override + public int numberOfRides() { + return delegate.numberOfRides(); + } + + @Override + public boolean hasRides() { + return delegate.hasRides(); + } + + @Override + public boolean stopReachedOnBoard() { + return delegate.stopReachedOnBoard(); + } + + @Override + public boolean stopReachedByWalking() { + return delegate.stopReachedByWalking(); + } + + @Override + public boolean isFree() { + return delegate.isFree(); + } + + @Override + public String defaultToString() { + return delegate.defaultToString(); + } + + @Override + public String asString(boolean includeStop, boolean includeCost, @Nullable String summary) { + return delegate.asString(includeStop, includeCost, summary); + } + + @Override + public RoutingAccessEgress withPenalty(TimeAndCost penalty) { + return delegate.withPenalty(penalty); + } + + @Override + public State getLastState() { + return delegate.getLastState(); + } + + @Override + public boolean isWalkOnly() { + return delegate.isWalkOnly(); + } + + @Override + public boolean hasPenalty() { + return delegate.hasPenalty(); + } + + @Override + public TimeAndCost penalty() { + return delegate.penalty(); + } + + @Override + public int timeShiftDepartureTimeToActualTime(int computedDepartureTimeIncludingPenalty) { + return delegate.timeShiftDepartureTimeToActualTime(computedDepartureTimeIncludingPenalty); + } +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index 0cf95b544f4..23cba8a7545 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -1,6 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit; import org.opentripplanner.ext.flex.FlexAccessEgress; +import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.StopTime; import org.opentripplanner.raptor.api.model.RaptorConstants; @@ -63,6 +64,10 @@ public DefaultAccessEgress withPenalty(TimeAndCost penalty) { return new FlexAccessEgressAdapter(this, penalty); } + public FlexTrip getFlexTrip() { + return flexAccessEgress.trip(); + } + private static int mapToRaptorTime(int flexTime) { return flexTime == StopTime.MISSING_VALUE ? RaptorConstants.TIME_NOT_SET : flexTime; } From 7a95f281c5b7b6490d7b117130951363caadd14b Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 5 Jan 2024 17:04:25 +0100 Subject: [PATCH 1024/1688] Adjust minimum booking period time with booking time --- .../org/opentripplanner/model/BookingInfo.java | 17 +++++++++++------ .../transit/BookingTimeAccessEgress.java | 10 ++-------- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index b1c568cfa87..6a1c465b149 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -4,6 +4,7 @@ import java.time.Duration; import java.time.LocalTime; import java.util.EnumSet; +import java.util.function.IntUnaryOperator; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.transit.model.organization.ContactInfo; @@ -84,27 +85,31 @@ public BookingInfo( } } - public int earliestDepartureTime(int requestedDepartureTime, int earliestBookingTime) { + public int earliestDepartureTime(int requestedDepartureTime, int earliestBookingTime, IntUnaryOperator getEarliestDepartureTime) { + int edt = getEarliestDepartureTime.applyAsInt(requestedDepartureTime); + if(edt == RaptorConstants.TIME_NOT_SET) { + return RaptorConstants.TIME_NOT_SET; + } if (latestBookingTime != null) { int otpLatestBookingTime = calculateOtpTime( latestBookingTime.getTime(), -latestBookingTime.getDaysPrior() ); if (earliestBookingTime <= otpLatestBookingTime) { - return requestedDepartureTime; + return edt; } else { return RaptorConstants.TIME_NOT_SET; } } if (minimumBookingNotice != null) { - if (requestedDepartureTime >= earliestBookingTime + minimumBookingNotice.toSeconds()) { - return requestedDepartureTime; + if (edt >= earliestBookingTime + minimumBookingNotice.toSeconds()) { + return edt; } else { - return earliestBookingTime + (int) minimumBookingNotice.toSeconds(); + return getEarliestDepartureTime.applyAsInt(earliestBookingTime + (int) minimumBookingNotice.toSeconds()); } } // missing booking info - return requestedDepartureTime; + return edt; } static int calculateOtpTime(LocalTime time, int dayOffset) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index b7a16c64ac3..c82a13fb915 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -4,10 +4,8 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import javax.annotation.Nullable; -import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.BookingInfo; -import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.street.search.state.State; public class BookingTimeAccessEgress implements RoutingAccessEgress { @@ -51,14 +49,10 @@ public int durationInSeconds() { @Override public int earliestDepartureTime(int requestedDepartureTime) { - int edt = delegate.earliestDepartureTime(requestedDepartureTime); - if (edt == RaptorConstants.TIME_NOT_SET) { - return edt; - } if (pickupBookingInfo != null) { - return pickupBookingInfo.earliestDepartureTime(edt, earliestBookingTime); + return pickupBookingInfo.earliestDepartureTime(requestedDepartureTime, earliestBookingTime, delegate::earliestDepartureTime); } - return edt; + return delegate.earliestDepartureTime(requestedDepartureTime); } private int calculateOtpTime(Instant dateTime, Instant earliestBookingTime, ZoneId timeZone) { From f6e05bb85d47b99ad324df25b3a1d75f4680062d Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 8 Jan 2024 11:59:26 +0100 Subject: [PATCH 1025/1688] Move time adjustement logic to a dedicated class --- .../opentripplanner/model/BookingInfo.java | 36 ------ .../raptoradapter/router/TransitRouter.java | 8 +- .../transit/BookingTimeAccessEgress.java | 30 ++--- .../transit/OpeningHoursAdjuster.java | 113 ++++++++++++++++++ 4 files changed, 131 insertions(+), 56 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index 6a1c465b149..4dc0c17c784 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -2,10 +2,7 @@ import java.io.Serializable; import java.time.Duration; -import java.time.LocalTime; import java.util.EnumSet; -import java.util.function.IntUnaryOperator; -import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.transit.model.organization.ContactInfo; /** @@ -16,8 +13,6 @@ */ public class BookingInfo implements Serializable { - private static final int DAY_IN_SECONDS = 3600 * 24; - private final ContactInfo contactInfo; private final EnumSet bookingMethods; @@ -85,37 +80,6 @@ public BookingInfo( } } - public int earliestDepartureTime(int requestedDepartureTime, int earliestBookingTime, IntUnaryOperator getEarliestDepartureTime) { - int edt = getEarliestDepartureTime.applyAsInt(requestedDepartureTime); - if(edt == RaptorConstants.TIME_NOT_SET) { - return RaptorConstants.TIME_NOT_SET; - } - if (latestBookingTime != null) { - int otpLatestBookingTime = calculateOtpTime( - latestBookingTime.getTime(), - -latestBookingTime.getDaysPrior() - ); - if (earliestBookingTime <= otpLatestBookingTime) { - return edt; - } else { - return RaptorConstants.TIME_NOT_SET; - } - } - if (minimumBookingNotice != null) { - if (edt >= earliestBookingTime + minimumBookingNotice.toSeconds()) { - return edt; - } else { - return getEarliestDepartureTime.applyAsInt(earliestBookingTime + (int) minimumBookingNotice.toSeconds()); - } - } - // missing booking info - return edt; - } - - static int calculateOtpTime(LocalTime time, int dayOffset) { - return time.toSecondOfDay() + DAY_IN_SECONDS * dayOffset; - } - public ContactInfo getContactInfo() { return contactInfo; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 2c6df8492af..ae91b4c2187 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -277,11 +277,15 @@ private Collection fetchAccessEgresses(AccessEgre } if (request.earliestBookingTime() != null) { - return results .stream() .map(routingAccessEgress -> - new BookingTimeAccessEgress(routingAccessEgress, request.dateTime(), request.earliestBookingTime(), serverContext.transitService().getTimeZone()) + new BookingTimeAccessEgress( + routingAccessEgress, + request.dateTime(), + request.earliestBookingTime(), + serverContext.transitService().getTimeZone() + ) ) .toList(); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index c82a13fb915..b4ca845c331 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -2,20 +2,15 @@ import java.time.Instant; import java.time.ZoneId; -import java.time.ZonedDateTime; import javax.annotation.Nullable; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.street.search.state.State; public class BookingTimeAccessEgress implements RoutingAccessEgress { - private static final int DAY_IN_SECONDS = 3600 * 24; - private final RoutingAccessEgress delegate; - private final BookingInfo pickupBookingInfo; - private final int earliestBookingTime; + private final OpeningHoursAdjuster openingHoursAdjuster; public BookingTimeAccessEgress( RoutingAccessEgress delegate, @@ -24,11 +19,17 @@ public BookingTimeAccessEgress( ZoneId timeZone ) { this.delegate = delegate; - this.earliestBookingTime = calculateOtpTime(dateTime, earliestBookingTime, timeZone); if (delegate instanceof FlexAccessEgressAdapter flexAccessEgressAdapter) { - pickupBookingInfo = flexAccessEgressAdapter.getFlexTrip().getPickupBookingInfo(0); + openingHoursAdjuster = + new OpeningHoursAdjuster( + flexAccessEgressAdapter.getFlexTrip().getPickupBookingInfo(0), + delegate, + earliestBookingTime, + dateTime, + timeZone + ); } else { - pickupBookingInfo = null; + openingHoursAdjuster = null; } } @@ -49,19 +50,12 @@ public int durationInSeconds() { @Override public int earliestDepartureTime(int requestedDepartureTime) { - if (pickupBookingInfo != null) { - return pickupBookingInfo.earliestDepartureTime(requestedDepartureTime, earliestBookingTime, delegate::earliestDepartureTime); + if (openingHoursAdjuster != null) { + return openingHoursAdjuster.earliestDepartureTime(requestedDepartureTime); } return delegate.earliestDepartureTime(requestedDepartureTime); } - private int calculateOtpTime(Instant dateTime, Instant earliestBookingTime, ZoneId timeZone) { - ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(dateTime, timeZone); - ZonedDateTime zonedEarliestBookingTime = ZonedDateTime.ofInstant(earliestBookingTime, timeZone); - int days = zonedDateTime.toLocalDate().until(zonedEarliestBookingTime.toLocalDate()).getDays(); - return zonedEarliestBookingTime.toLocalTime().toSecondOfDay() + days * DAY_IN_SECONDS; - } - @Override public int latestArrivalTime(int requestedArrivalTime) { return delegate.latestArrivalTime(requestedArrivalTime); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java new file mode 100644 index 00000000000..5f448db23e8 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java @@ -0,0 +1,113 @@ +package org.opentripplanner.routing.algorithm.raptoradapter.transit; + +import java.time.Duration; +import java.time.Instant; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.BookingTime; +import org.opentripplanner.raptor.api.model.RaptorConstants; + +/** + * Adjust the opening hours for a given flex access/egress by taking into account the latest booking + * time or minimum booking period for the corresponding flex trip. + */ +public class OpeningHoursAdjuster { + + private static final int DAY_IN_SECONDS = 3600 * 24; + + /** + * Booking info for the boarding stop. + */ + private final BookingInfo boardingBookingInfo; + + /** + * The original access/egress. + */ + private final RoutingAccessEgress delegate; + + /** + * The earliest time the passenger can book the trip. + */ + private final int earliestBookingTime; + + public OpeningHoursAdjuster( + BookingInfo boardingBookingInfo, + RoutingAccessEgress delegate, + Instant earliestBookingTime, + Instant dateTime, + ZoneId timeZone + ) { + this.boardingBookingInfo = boardingBookingInfo; + this.delegate = delegate; + this.earliestBookingTime = + convertEarliestBookingTimeToOtpTime(earliestBookingTime, dateTime, timeZone); + } + + /** + * If the earliest booking time is past the latest booking time, the flex trip cannot + * be boarded and the method returns RaptorConstants.TIME_NOT_SET. + * If the earliest booking time is past the minimum booking period, the requested departure + * time is shifted to ensure a minimum booking period. + * If this results in a departure time outside the opening hours (i.e. after LatestArrivalTime), + * then the method returns RaptorConstants.TIME_NOT_SET. + * Otherwise the requested departure time is returned unchanged. + */ + public int earliestDepartureTime(int requestedDepartureTime) { + int edt = delegate.earliestDepartureTime(requestedDepartureTime); + if (edt == RaptorConstants.TIME_NOT_SET) { + return RaptorConstants.TIME_NOT_SET; + } + BookingTime latestBookingTime = boardingBookingInfo.getLatestBookingTime(); + if (latestBookingTime != null) { + int otpLatestBookingTime = convertBookingTimeToOtpTime( + latestBookingTime.getTime(), + -latestBookingTime.getDaysPrior() + ); + if (earliestBookingTime <= otpLatestBookingTime) { + return edt; + } else { + return RaptorConstants.TIME_NOT_SET; + } + } + Duration minimumBookingNotice = boardingBookingInfo.getMinimumBookingNotice(); + if (minimumBookingNotice != null) { + if (edt >= earliestBookingTime + minimumBookingNotice.toSeconds()) { + return edt; + } else { + // Calculate again the earliest departure time shifted by the minimum booking period. + // This may result in a requested departure time outside the opening hours + // in which case RaptorConstants.TIME_NOT_SET is returned. + return delegate.earliestDepartureTime( + earliestBookingTime + (int) minimumBookingNotice.toSeconds() + ); + } + } + // if both latest booking time and minimum booking notice are missing (invalid data) + // fall back to the default earliest departure time + return edt; + } + + /** + * Convert a booking time with day offset to OTP time. + */ + private static int convertBookingTimeToOtpTime(LocalTime time, int dayOffset) { + return time.toSecondOfDay() + DAY_IN_SECONDS * dayOffset; + } + + /** + * Convert the earliest booking time to OTP time. + * The OTP time starts at midnight the day of the requested dateTime for the requested time zone. + */ + private static int convertEarliestBookingTimeToOtpTime( + Instant earliestBookingTime, + Instant dateTime, + ZoneId timeZone + ) { + ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(dateTime, timeZone); + ZonedDateTime zonedEarliestBookingTime = ZonedDateTime.ofInstant(earliestBookingTime, timeZone); + int days = zonedDateTime.toLocalDate().until(zonedEarliestBookingTime.toLocalDate()).getDays(); + return zonedEarliestBookingTime.toLocalTime().toSecondOfDay() + days * DAY_IN_SECONDS; + } +} From c3f3f7bcdc2d55a0dfb09da9f86c7eee753693d9 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Wed, 10 Jan 2024 17:03:32 +0100 Subject: [PATCH 1026/1688] Code cleanup --- .../raptoradapter/router/TransitRouter.java | 21 ++++--- .../transit/BookingTimeAccessEgress.java | 27 ++++----- .../transit/OpeningHoursAdjuster.java | 60 ++++++++++++------- 3 files changed, 60 insertions(+), 48 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index ae91b4c2187..0c440915835 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -24,6 +24,7 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter; import org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingTimeAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.FlexAccessEgressAdapter; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; @@ -279,14 +280,18 @@ private Collection fetchAccessEgresses(AccessEgre if (request.earliestBookingTime() != null) { return results .stream() - .map(routingAccessEgress -> - new BookingTimeAccessEgress( - routingAccessEgress, - request.dateTime(), - request.earliestBookingTime(), - serverContext.transitService().getTimeZone() - ) - ) + .map(routingAccessEgress -> { + if (routingAccessEgress instanceof FlexAccessEgressAdapter flexAccessEgressAdapter) { + return new BookingTimeAccessEgress( + flexAccessEgressAdapter, + request.dateTime(), + request.earliestBookingTime(), + serverContext.transitService().getTimeZone() + ); + } else { + return routingAccessEgress; + } + }) .toList(); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index b4ca845c331..9a4730834b0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -13,24 +13,20 @@ public class BookingTimeAccessEgress implements RoutingAccessEgress { private final OpeningHoursAdjuster openingHoursAdjuster; public BookingTimeAccessEgress( - RoutingAccessEgress delegate, + FlexAccessEgressAdapter delegate, Instant dateTime, Instant earliestBookingTime, ZoneId timeZone ) { this.delegate = delegate; - if (delegate instanceof FlexAccessEgressAdapter flexAccessEgressAdapter) { - openingHoursAdjuster = - new OpeningHoursAdjuster( - flexAccessEgressAdapter.getFlexTrip().getPickupBookingInfo(0), - delegate, - earliestBookingTime, - dateTime, - timeZone - ); - } else { - openingHoursAdjuster = null; - } + openingHoursAdjuster = + new OpeningHoursAdjuster( + delegate.getFlexTrip().getPickupBookingInfo(0), + delegate, + earliestBookingTime, + dateTime, + timeZone + ); } @Override @@ -50,10 +46,7 @@ public int durationInSeconds() { @Override public int earliestDepartureTime(int requestedDepartureTime) { - if (openingHoursAdjuster != null) { - return openingHoursAdjuster.earliestDepartureTime(requestedDepartureTime); - } - return delegate.earliestDepartureTime(requestedDepartureTime); + return openingHoursAdjuster.earliestDepartureTime(requestedDepartureTime); } @Override diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java index 5f448db23e8..c0839cc59f8 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java @@ -8,6 +8,8 @@ import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.BookingTime; import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Adjust the opening hours for a given flex access/egress by taking into account the latest booking @@ -15,6 +17,8 @@ */ public class OpeningHoursAdjuster { + private static final Logger LOG = LoggerFactory.getLogger(OpeningHoursAdjuster.class); + private static final int DAY_IN_SECONDS = 3600 * 24; /** @@ -25,7 +29,7 @@ public class OpeningHoursAdjuster { /** * The original access/egress. */ - private final RoutingAccessEgress delegate; + private final FlexAccessEgressAdapter delegate; /** * The earliest time the passenger can book the trip. @@ -34,7 +38,7 @@ public class OpeningHoursAdjuster { public OpeningHoursAdjuster( BookingInfo boardingBookingInfo, - RoutingAccessEgress delegate, + FlexAccessEgressAdapter delegate, Instant earliestBookingTime, Instant dateTime, ZoneId timeZone @@ -61,34 +65,44 @@ public int earliestDepartureTime(int requestedDepartureTime) { } BookingTime latestBookingTime = boardingBookingInfo.getLatestBookingTime(); if (latestBookingTime != null) { - int otpLatestBookingTime = convertBookingTimeToOtpTime( - latestBookingTime.getTime(), - -latestBookingTime.getDaysPrior() - ); - if (earliestBookingTime <= otpLatestBookingTime) { - return edt; - } else { - return RaptorConstants.TIME_NOT_SET; - } + return adjustDepartureTimeWithLatestBookingTime(edt, latestBookingTime); } Duration minimumBookingNotice = boardingBookingInfo.getMinimumBookingNotice(); if (minimumBookingNotice != null) { - if (edt >= earliestBookingTime + minimumBookingNotice.toSeconds()) { - return edt; - } else { - // Calculate again the earliest departure time shifted by the minimum booking period. - // This may result in a requested departure time outside the opening hours - // in which case RaptorConstants.TIME_NOT_SET is returned. - return delegate.earliestDepartureTime( - earliestBookingTime + (int) minimumBookingNotice.toSeconds() - ); - } + return adjustDepartureTimeWithMinimumBookingNotice(edt, minimumBookingNotice); } - // if both latest booking time and minimum booking notice are missing (invalid data) - // fall back to the default earliest departure time + LOG.warn( + "Missing both latest booking time and minimum booking notice on trip {}. Falling back to default earliest booking time", + delegate.getFlexTrip().getTrip().getId() + ); return edt; } + private int adjustDepartureTimeWithLatestBookingTime(int edt, BookingTime latestBookingTime) { + int otpLatestBookingTime = convertBookingTimeToOtpTime( + latestBookingTime.getTime(), + -latestBookingTime.getDaysPrior() + ); + if (earliestBookingTime <= otpLatestBookingTime) { + return edt; + } else { + return RaptorConstants.TIME_NOT_SET; + } + } + + private int adjustDepartureTimeWithMinimumBookingNotice(int edt, Duration minimumBookingNotice) { + if (edt >= earliestBookingTime + minimumBookingNotice.toSeconds()) { + return edt; + } else { + // Calculate again the earliest departure time shifted by the minimum booking period. + // This may result in a requested departure time outside the opening hours + // in which case RaptorConstants.TIME_NOT_SET is returned. + return delegate.earliestDepartureTime( + earliestBookingTime + (int) minimumBookingNotice.toSeconds() + ); + } + } + /** * Convert a booking time with day offset to OTP time. */ From dfe4fa84a611686480c33ec552a6dd5d5a9adacc Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Thu, 11 Jan 2024 07:22:05 +0100 Subject: [PATCH 1027/1688] Add unit tests --- .../gtfs/mapping/BookingRuleMapper.java | 23 +-- .../opentripplanner/model/BookingInfo.java | 2 +- .../model/BookingInfoBuilder.java | 77 +++++++++ .../netex/mapping/BookingInfoMapper.java | 31 ++-- .../transit/FlexAccessEgressAdapter.java | 2 +- .../transit/OpeningHoursAdjusterTest.java | 163 ++++++++++++++++++ .../model/_data/TransitModelForTest.java | 4 + 7 files changed, 273 insertions(+), 29 deletions(-) create mode 100644 src/main/java/org/opentripplanner/model/BookingInfoBuilder.java create mode 100644 src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java index 54203bb91c1..fee935fb15e 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java @@ -8,6 +8,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.BookingRule; import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.BookingInfoBuilder; import org.opentripplanner.model.BookingMethod; import org.opentripplanner.model.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; @@ -26,17 +27,17 @@ BookingInfo map(BookingRule rule) { return cachedBookingInfos.computeIfAbsent( rule.getId(), k -> - new BookingInfo( - contactInfo(rule), - bookingMethods(), - earliestBookingTime(rule), - latestBookingTime(rule), - minimumBookingNotice(rule), - maximumBookingNotice(rule), - message(rule), - pickupMessage(rule), - dropOffMessage(rule) - ) + new BookingInfoBuilder() + .withContactInfo(contactInfo(rule)) + .withBookingMethods(bookingMethods()) + .withEarliestBookingTime(earliestBookingTime(rule)) + .withLatestBookingTime(latestBookingTime(rule)) + .withMinimumBookingNotice(minimumBookingNotice(rule)) + .withMaximumBookingNotice(maximumBookingNotice(rule)) + .withMessage(message(rule)) + .withPickupMessage(pickupMessage(rule)) + .withDropOffMessage(dropOffMessage(rule)) + .build() ); } diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index 4dc0c17c784..466cd4b3e3b 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -43,7 +43,7 @@ public class BookingInfo implements Serializable { private final String dropOffMessage; - public BookingInfo( + BookingInfo( ContactInfo contactInfo, EnumSet bookingMethods, BookingTime earliestBookingTime, diff --git a/src/main/java/org/opentripplanner/model/BookingInfoBuilder.java b/src/main/java/org/opentripplanner/model/BookingInfoBuilder.java new file mode 100644 index 00000000000..0205063ae0d --- /dev/null +++ b/src/main/java/org/opentripplanner/model/BookingInfoBuilder.java @@ -0,0 +1,77 @@ +package org.opentripplanner.model; + +import java.time.Duration; +import java.util.EnumSet; +import org.opentripplanner.transit.model.organization.ContactInfo; + +public class BookingInfoBuilder { + + private ContactInfo contactInfo; + private EnumSet bookingMethods; + private BookingTime earliestBookingTime; + private BookingTime latestBookingTime; + private Duration minimumBookingNotice; + private Duration maximumBookingNotice; + private String message; + private String pickupMessage; + private String dropOffMessage; + + public BookingInfoBuilder withContactInfo(ContactInfo contactInfo) { + this.contactInfo = contactInfo; + return this; + } + + public BookingInfoBuilder withBookingMethods(EnumSet bookingMethods) { + this.bookingMethods = bookingMethods; + return this; + } + + public BookingInfoBuilder withEarliestBookingTime(BookingTime earliestBookingTime) { + this.earliestBookingTime = earliestBookingTime; + return this; + } + + public BookingInfoBuilder withLatestBookingTime(BookingTime latestBookingTime) { + this.latestBookingTime = latestBookingTime; + return this; + } + + public BookingInfoBuilder withMinimumBookingNotice(Duration minimumBookingNotice) { + this.minimumBookingNotice = minimumBookingNotice; + return this; + } + + public BookingInfoBuilder withMaximumBookingNotice(Duration maximumBookingNotice) { + this.maximumBookingNotice = maximumBookingNotice; + return this; + } + + public BookingInfoBuilder withMessage(String message) { + this.message = message; + return this; + } + + public BookingInfoBuilder withPickupMessage(String pickupMessage) { + this.pickupMessage = pickupMessage; + return this; + } + + public BookingInfoBuilder withDropOffMessage(String dropOffMessage) { + this.dropOffMessage = dropOffMessage; + return this; + } + + public BookingInfo build() { + return new BookingInfo( + contactInfo, + bookingMethods, + earliestBookingTime, + latestBookingTime, + minimumBookingNotice, + maximumBookingNotice, + message, + pickupMessage, + dropOffMessage + ); + } +} diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java index afb9742fd85..b625a88a50a 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java @@ -10,6 +10,7 @@ import javax.annotation.Nullable; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.BookingInfoBuilder; import org.opentripplanner.model.BookingMethod; import org.opentripplanner.model.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; @@ -45,14 +46,14 @@ BookingInfo map( ServiceJourney serviceJourney, FlexibleLine flexibleLine ) { - return new BookingInfoBuilder() + return new NetexBookingInfoBuilder() .withFlexibleLine(flexibleLine) .withServiceJourney(serviceJourney) .withStopPoint(stopPoint) .build(); } - private class BookingInfoBuilder { + private class NetexBookingInfoBuilder { private ContactStructure bookingContact; private List bookingMethods = new ArrayList<>(); @@ -65,7 +66,7 @@ private class BookingInfoBuilder { private String serviceJourneyRef; private String stopPointRef; - private BookingInfoBuilder withFlexibleLine(FlexibleLine flexibleLine) { + private NetexBookingInfoBuilder withFlexibleLine(FlexibleLine flexibleLine) { if (flexibleLine != null) { this.hasBookingInfo = true; this.flexibleLineRef = ref("FlexibleLine", flexibleLine); @@ -81,7 +82,7 @@ private BookingInfoBuilder withFlexibleLine(FlexibleLine flexibleLine) { return this; } - private BookingInfoBuilder withServiceJourney(ServiceJourney serviceJourney) { + private NetexBookingInfoBuilder withServiceJourney(ServiceJourney serviceJourney) { if (serviceJourney != null && serviceJourney.getFlexibleServiceProperties() != null) { this.hasBookingInfo = true; this.serviceJourneyRef = ref("ServiceJourney", serviceJourney); @@ -98,7 +99,7 @@ private BookingInfoBuilder withServiceJourney(ServiceJourney serviceJourney) { return this; } - private BookingInfoBuilder withStopPoint(StopPointInJourneyPattern stopPoint) { + private NetexBookingInfoBuilder withStopPoint(StopPointInJourneyPattern stopPoint) { BookingArrangementsStructure bookingArrangements = stopPoint.getBookingArrangements(); if (bookingArrangements != null) { this.hasBookingInfo = true; @@ -220,17 +221,15 @@ private BookingInfo build( } String bookingInfoMessage = bookingNote != null ? bookingNote.getValue() : null; - return new BookingInfo( - contactInfo, - filteredBookingMethods, - otpEarliestBookingTime, - otpLatestBookingTime, - minimumBookingNotice, - Duration.ZERO, - bookingInfoMessage, - null, - null - ); + return new BookingInfoBuilder() + .withContactInfo(contactInfo) + .withBookingMethods(filteredBookingMethods) + .withEarliestBookingTime(otpEarliestBookingTime) + .withLatestBookingTime(otpLatestBookingTime) + .withMinimumBookingNotice(minimumBookingNotice) + .withMaximumBookingNotice(Duration.ZERO) + .withMessage(bookingInfoMessage) + .build(); } private void setIfNotEmpty( diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index 23cba8a7545..662d380e6ad 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -64,7 +64,7 @@ public DefaultAccessEgress withPenalty(TimeAndCost penalty) { return new FlexAccessEgressAdapter(this, penalty); } - public FlexTrip getFlexTrip() { + FlexTrip getFlexTrip() { return flexAccessEgress.trip(); } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java new file mode 100644 index 00000000000..58964ca99b2 --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java @@ -0,0 +1,163 @@ +package org.opentripplanner.routing.algorithm.raptoradapter.transit; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.time.ZoneId; +import java.time.ZoneOffset; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.opentripplanner._support.time.ZoneIds; +import org.opentripplanner.ext.flex.FlexAccessEgress; +import org.opentripplanner.ext.flex.FlexPathDurations; +import org.opentripplanner.ext.flex.trip.FlexTrip; +import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.BookingInfoBuilder; +import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.StopTime; +import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.street.search.state.State; +import org.opentripplanner.street.search.state.TestStateBuilder; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.site.RegularStop; + +class OpeningHoursAdjusterTest { + + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final RegularStop S1 = TEST_MODEL.stop("STOP1", 0.0, 0.0).build(); + private static final RegularStop S2 = TEST_MODEL.stop("STOP2", 1.0, 1.0).build(); + private static final ZoneId TIME_ZONE_UTC = ZoneIds.UTC; + private static final FeedScopedId TRIP_ID = new FeedScopedId("FEED", "ID"); + private static final LocalDate REQUEST_DATE = LocalDate.of(2024, 1, 1); + private static final LocalDateTime REQUEST_DATE_TIME = REQUEST_DATE.atTime(8, 0, 0); + public static final ZoneOffset ZONE_OFFSET_UTC = ZoneOffset.UTC; + private static final Instant REQUEST_INSTANT = REQUEST_DATE_TIME.toInstant(ZONE_OFFSET_UTC); + private static final BookingInfo BOOK_BEFORE_11_H_45 = new BookingInfoBuilder() + .withLatestBookingTime(new BookingTime(LocalTime.of(11, 45, 0), 0)) + .build(); + private static final BookingInfo BOOK_ONE_HOUR_BEFORE = new BookingInfoBuilder() + .withMinimumBookingNotice(Duration.ofHours(1)) + .build(); + + private FlexAccessEgressAdapter accessEgress; + private int defaultPickupTime; + + @BeforeEach + void setup() { + State state = TestStateBuilder.ofWalking().streetEdge().streetEdge().build(); + + StopTime stopTime1 = new StopTime(); + stopTime1.setStop(S1); + stopTime1.setFlexWindowStart(LocalTime.of(12, 12).toSecondOfDay()); + stopTime1.setFlexWindowEnd(LocalTime.of(14, 12).toSecondOfDay()); + StopTime stopTime2 = new StopTime(); + stopTime2.setStop(S2); + stopTime2.setFlexWindowStart(LocalTime.of(14, 11).toSecondOfDay()); + stopTime2.setFlexWindowEnd(LocalTime.of(14, 12).toSecondOfDay()); + + FlexTrip trip = TEST_MODEL.unscheduledTrip(TRIP_ID, List.of(stopTime1, stopTime2)); + FlexAccessEgress flexAccessEgress = new FlexAccessEgress( + S1, + new FlexPathDurations(0, 1165, 156, 0), + 0, + 1, + trip, + state, + true + ); + accessEgress = new FlexAccessEgressAdapter(flexAccessEgress, false); + defaultPickupTime = accessEgress.earliestDepartureTime(0); + } + + @Test + void testEarliestBookingTimeBeforeLatestBookingTime() { + Instant beforeLatestBookingTime = REQUEST_DATE + .atTime(BOOK_BEFORE_11_H_45.getLatestBookingTime().getTime().minusMinutes(1)) + .toInstant(ZONE_OFFSET_UTC); + OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( + BOOK_BEFORE_11_H_45, + accessEgress, + beforeLatestBookingTime, + REQUEST_INSTANT, + TIME_ZONE_UTC + ); + assertEquals( + defaultPickupTime, + openingHoursAdjuster.earliestDepartureTime(0), + "When booking before the latest booking time, the default pick-up time is used" + ); + } + + @Test + void testEarliestBookingTimeAfterLatestBookingTime() { + Instant afterLatestBookingTime = REQUEST_DATE + .atTime(BOOK_BEFORE_11_H_45.getLatestBookingTime().getTime().plusMinutes(1)) + .toInstant(ZONE_OFFSET_UTC); + OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( + BOOK_BEFORE_11_H_45, + accessEgress, + afterLatestBookingTime, + REQUEST_INSTANT, + TIME_ZONE_UTC + ); + assertEquals( + RaptorConstants.TIME_NOT_SET, + openingHoursAdjuster.earliestDepartureTime(0), + "When booking after the latest booking time, the trip cannot be boarded" + ); + } + + @Test + void testEarliestBookingTimeBeforeMinimumBookingNotice() { + Instant beforeMinimumBookingNotice = REQUEST_DATE + .atTime( + LocalTime + .ofSecondOfDay(defaultPickupTime) + .minus(BOOK_ONE_HOUR_BEFORE.getMinimumBookingNotice()) + .minusMinutes(1) + ) + .toInstant(ZONE_OFFSET_UTC); + OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( + BOOK_ONE_HOUR_BEFORE, + accessEgress, + beforeMinimumBookingNotice, + REQUEST_INSTANT, + TIME_ZONE_UTC + ); + assertEquals( + defaultPickupTime, + openingHoursAdjuster.earliestDepartureTime(0), + "When booking before the minimum booking notice, the default pick-up time is used" + ); + } + + @Test + void testEarliestBookingTimeAfterMinimumBookingNotice() { + Instant afterMinimumBookingNotice = REQUEST_DATE + .atTime( + LocalTime + .ofSecondOfDay(defaultPickupTime) + .minus(BOOK_ONE_HOUR_BEFORE.getMinimumBookingNotice()) + .plusMinutes(2) + ) + .toInstant(ZONE_OFFSET_UTC); + OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( + BOOK_ONE_HOUR_BEFORE, + accessEgress, + afterMinimumBookingNotice, + REQUEST_INSTANT, + TIME_ZONE_UTC + ); + assertEquals( + RaptorConstants.TIME_NOT_SET, + openingHoursAdjuster.earliestDepartureTime(0), + "When booking after the minimum booking notice, the trip cannot be boarded" + ); + } +} diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java index e01809d2b9f..9d52d38883e 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java @@ -258,6 +258,10 @@ public UnscheduledTrip unscheduledTrip(FeedScopedId id, StopLocation... stops) { return st; }) .toList(); + return unscheduledTrip(id, stopTimes); + } + + public UnscheduledTrip unscheduledTrip(FeedScopedId id, List stopTimes) { return UnscheduledTrip .of(id) .withTrip(trip("flex-trip").build()) From 5c78c9b778dc239f4424c68da15e89984a95c383 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 16 Jan 2024 09:19:19 +0100 Subject: [PATCH 1028/1688] Fix earliest booking time converstion to OTP time --- .../transit/OpeningHoursAdjuster.java | 14 +- .../transit/OpeningHoursAdjusterTest.java | 144 ++++++++++++++++-- 2 files changed, 139 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java index c0839cc59f8..b7c074de9f5 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java @@ -2,9 +2,12 @@ import java.time.Duration; import java.time.Instant; +import java.time.LocalDate; import java.time.LocalTime; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; +import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.BookingTime; import org.opentripplanner.raptor.api.model.RaptorConstants; @@ -112,16 +115,15 @@ private static int convertBookingTimeToOtpTime(LocalTime time, int dayOffset) { /** * Convert the earliest booking time to OTP time. - * The OTP time starts at midnight the day of the requested dateTime for the requested time zone. + * The OTP time starts 12 hours before noon the day of the requested dateTime for the requested time zone. */ - private static int convertEarliestBookingTimeToOtpTime( + static int convertEarliestBookingTimeToOtpTime( Instant earliestBookingTime, Instant dateTime, ZoneId timeZone ) { - ZonedDateTime zonedDateTime = ZonedDateTime.ofInstant(dateTime, timeZone); - ZonedDateTime zonedEarliestBookingTime = ZonedDateTime.ofInstant(earliestBookingTime, timeZone); - int days = zonedDateTime.toLocalDate().until(zonedEarliestBookingTime.toLocalDate()).getDays(); - return zonedEarliestBookingTime.toLocalTime().toSecondOfDay() + days * DAY_IN_SECONDS; + LocalDate serviceDate = LocalDate.ofInstant(dateTime, timeZone); + ZonedDateTime startOfService = ServiceDateUtils.asStartOfService(serviceDate, timeZone); + return ServiceDateUtils.secondsSinceStartOfTime(startOfService, earliestBookingTime); } } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java index 58964ca99b2..2ab7e4742ba 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java @@ -7,8 +7,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZoneOffset; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -32,18 +30,42 @@ class OpeningHoursAdjusterTest { private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); private static final RegularStop S1 = TEST_MODEL.stop("STOP1", 0.0, 0.0).build(); private static final RegularStop S2 = TEST_MODEL.stop("STOP2", 1.0, 1.0).build(); - private static final ZoneId TIME_ZONE_UTC = ZoneIds.UTC; private static final FeedScopedId TRIP_ID = new FeedScopedId("FEED", "ID"); private static final LocalDate REQUEST_DATE = LocalDate.of(2024, 1, 1); private static final LocalDateTime REQUEST_DATE_TIME = REQUEST_DATE.atTime(8, 0, 0); - public static final ZoneOffset ZONE_OFFSET_UTC = ZoneOffset.UTC; - private static final Instant REQUEST_INSTANT = REQUEST_DATE_TIME.toInstant(ZONE_OFFSET_UTC); + private static final Instant REQUEST_INSTANT = REQUEST_DATE_TIME.atZone(ZoneIds.UTC).toInstant(); + + private static final LocalDate REQUEST_DATE_DST_FORWARD = LocalDate.of(2024, 3, 31); + private static final LocalDateTime REQUEST_DATE_TIME_DST_FORWARD = REQUEST_DATE_DST_FORWARD.atTime( + 8, + 0, + 0 + ); + private static final Instant REQUEST_INSTANT_DST_FORWARD = REQUEST_DATE_TIME_DST_FORWARD + .atZone(ZoneIds.OSLO) + .toInstant(); + + private static final LocalDate REQUEST_DATE_DST_BACKWARD = LocalDate.of(2024, 10, 27); + private static final LocalDateTime REQUEST_DATE_TIME_DST_BACKWARD = REQUEST_DATE_DST_BACKWARD.atTime( + 8, + 0, + 0 + ); + private static final Instant REQUEST_INSTANT_DST_BACKWARD = REQUEST_DATE_TIME_DST_BACKWARD + .atZone(ZoneIds.OSLO) + .toInstant(); + private static final BookingInfo BOOK_BEFORE_11_H_45 = new BookingInfoBuilder() .withLatestBookingTime(new BookingTime(LocalTime.of(11, 45, 0), 0)) .build(); + + private static final BookingInfo BOOK_BEFORE_21_H_00_PREVIOUS_DAY = new BookingInfoBuilder() + .withLatestBookingTime(new BookingTime(LocalTime.of(21, 0, 0), 1)) + .build(); private static final BookingInfo BOOK_ONE_HOUR_BEFORE = new BookingInfoBuilder() .withMinimumBookingNotice(Duration.ofHours(1)) .build(); + public static final int SECONDS_IN_TWELVE_HOURS = 12 * 60 * 60; private FlexAccessEgressAdapter accessEgress; private int defaultPickupTime; @@ -79,13 +101,35 @@ void setup() { void testEarliestBookingTimeBeforeLatestBookingTime() { Instant beforeLatestBookingTime = REQUEST_DATE .atTime(BOOK_BEFORE_11_H_45.getLatestBookingTime().getTime().minusMinutes(1)) - .toInstant(ZONE_OFFSET_UTC); + .atZone(ZoneIds.UTC) + .toInstant(); OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( BOOK_BEFORE_11_H_45, accessEgress, beforeLatestBookingTime, REQUEST_INSTANT, - TIME_ZONE_UTC + ZoneIds.UTC + ); + assertEquals( + defaultPickupTime, + openingHoursAdjuster.earliestDepartureTime(0), + "When booking before the latest booking time, the default pick-up time is used" + ); + } + + @Test + void testEarliestBookingTimeBeforeLatestBookingTimeOnPreviousDay() { + Instant beforeLatestBookingTime = REQUEST_DATE + .minusDays(1) + .atTime(BOOK_BEFORE_21_H_00_PREVIOUS_DAY.getLatestBookingTime().getTime().minusMinutes(1)) + .atZone(ZoneIds.UTC) + .toInstant(); + OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( + BOOK_BEFORE_21_H_00_PREVIOUS_DAY, + accessEgress, + beforeLatestBookingTime, + REQUEST_INSTANT, + ZoneIds.UTC ); assertEquals( defaultPickupTime, @@ -98,13 +142,35 @@ void testEarliestBookingTimeBeforeLatestBookingTime() { void testEarliestBookingTimeAfterLatestBookingTime() { Instant afterLatestBookingTime = REQUEST_DATE .atTime(BOOK_BEFORE_11_H_45.getLatestBookingTime().getTime().plusMinutes(1)) - .toInstant(ZONE_OFFSET_UTC); + .atZone(ZoneIds.UTC) + .toInstant(); OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( BOOK_BEFORE_11_H_45, accessEgress, afterLatestBookingTime, REQUEST_INSTANT, - TIME_ZONE_UTC + ZoneIds.UTC + ); + assertEquals( + RaptorConstants.TIME_NOT_SET, + openingHoursAdjuster.earliestDepartureTime(0), + "When booking after the latest booking time, the trip cannot be boarded" + ); + } + + @Test + void testEarliestBookingTimeAfterLatestBookingTimeOnPreviousDay() { + Instant afterLatestBookingTime = REQUEST_DATE + .minusDays(1) + .atTime(BOOK_BEFORE_21_H_00_PREVIOUS_DAY.getLatestBookingTime().getTime().plusMinutes(1)) + .atZone(ZoneIds.UTC) + .toInstant(); + OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( + BOOK_BEFORE_21_H_00_PREVIOUS_DAY, + accessEgress, + afterLatestBookingTime, + REQUEST_INSTANT, + ZoneIds.UTC ); assertEquals( RaptorConstants.TIME_NOT_SET, @@ -122,13 +188,14 @@ void testEarliestBookingTimeBeforeMinimumBookingNotice() { .minus(BOOK_ONE_HOUR_BEFORE.getMinimumBookingNotice()) .minusMinutes(1) ) - .toInstant(ZONE_OFFSET_UTC); + .atZone(ZoneIds.UTC) + .toInstant(); OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( BOOK_ONE_HOUR_BEFORE, accessEgress, beforeMinimumBookingNotice, REQUEST_INSTANT, - TIME_ZONE_UTC + ZoneIds.UTC ); assertEquals( defaultPickupTime, @@ -146,13 +213,14 @@ void testEarliestBookingTimeAfterMinimumBookingNotice() { .minus(BOOK_ONE_HOUR_BEFORE.getMinimumBookingNotice()) .plusMinutes(2) ) - .toInstant(ZONE_OFFSET_UTC); + .atZone(ZoneIds.UTC) + .toInstant(); OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( BOOK_ONE_HOUR_BEFORE, accessEgress, afterMinimumBookingNotice, REQUEST_INSTANT, - TIME_ZONE_UTC + ZoneIds.UTC ); assertEquals( RaptorConstants.TIME_NOT_SET, @@ -160,4 +228,54 @@ void testEarliestBookingTimeAfterMinimumBookingNotice() { "When booking after the minimum booking notice, the trip cannot be boarded" ); } + + @Test + void testConvertEarliestBookingTimeToOtpTimeOnNormalDate() { + // 12:00:00 on 2024-01-01 in Oslo occurs 12 hours after 00:00:00 + Instant earliestBookingTime = REQUEST_DATE.atTime(12, 0, 0).atZone(ZoneIds.OSLO).toInstant(); + assertEquals( + SECONDS_IN_TWELVE_HOURS, + OpeningHoursAdjuster.convertEarliestBookingTimeToOtpTime( + earliestBookingTime, + REQUEST_INSTANT, + ZoneIds.OSLO + ) + ); + } + + @Test + void testConvertEarliestBookingTimeToOtpTimeOnDSTForward() { + // 12:00:00 on 2024-03-31 in Oslo occurs 11 hours after 00:00:00 + // OTP time starts at 23:00:00 on 2024-03-30 + Instant earliestBookingTime = REQUEST_DATE_DST_FORWARD + .atTime(12, 0, 0) + .atZone(ZoneIds.OSLO) + .toInstant(); + assertEquals( + SECONDS_IN_TWELVE_HOURS, + OpeningHoursAdjuster.convertEarliestBookingTimeToOtpTime( + earliestBookingTime, + REQUEST_INSTANT_DST_FORWARD, + ZoneIds.OSLO + ) + ); + } + + @Test + void testConvertEarliestBookingTimeToOtpTimeOnDSTBackward() { + // 12:00:00 on 2024-10-27 in Oslo occurs 13 hours after 00:00:00 + // OTP time starts at 01:00:00 on 2024-10-27 + Instant earliestBookingTime = REQUEST_DATE_DST_FORWARD + .atTime(12, 0, 0) + .atZone(ZoneIds.OSLO) + .toInstant(); + assertEquals( + SECONDS_IN_TWELVE_HOURS, + OpeningHoursAdjuster.convertEarliestBookingTimeToOtpTime( + earliestBookingTime, + REQUEST_INSTANT_DST_FORWARD, + ZoneIds.OSLO + ) + ); + } } From 61ad5b53a52ea91fe5bea2dffce1264f779183af Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 18 Jan 2024 19:18:39 +0100 Subject: [PATCH 1029/1688] doc: Remove old todo - this PR fixes the issue --- src/main/java/org/opentripplanner/model/BookingInfo.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index 466cd4b3e3b..b15cfca722f 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -8,8 +8,6 @@ /** * Info about how a trip might be booked at a particular stop. All of this is pass-through * information, except information about booking time and booking notice. - *

      - * // TODO Make the routing take into account booking time and booking notice. */ public class BookingInfo implements Serializable { From a02eebcfe5778326d665e636beae035d7c086a6d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 19 Jan 2024 11:17:46 +0100 Subject: [PATCH 1030/1688] refactor: Move method withPenalty down together with accessor --- .../transit/DefaultAccessEgress.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java index e71e18fa985..7d0eed74131 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java @@ -48,16 +48,6 @@ protected DefaultAccessEgress(RoutingAccessEgress other, TimeAndCost penalty) { this.lastState = other.getLastState(); } - /** - * Return a new copy of this with the requested penalty. - *

      - * OVERRIDE THIS IF KEEPING THE TYPE IS IMPORTANT! - */ - @Override - public DefaultAccessEgress withPenalty(TimeAndCost penalty) { - return new DefaultAccessEgress(this, penalty); - } - @Override public int durationInSeconds() { return durationInSeconds; @@ -103,6 +93,16 @@ public TimeAndCost penalty() { return penalty; } + /** + * Return a new copy of this with the requested penalty. + *

      + * OVERRIDE THIS IF KEEPING THE TYPE IS IMPORTANT! + */ + @Override + public DefaultAccessEgress withPenalty(TimeAndCost penalty) { + return new DefaultAccessEgress(this, penalty); + } + @Override public int earliestDepartureTime(int requestedDepartureTime) { return requestedDepartureTime; From fae899865f6b5bf5436bc7a2cb2516e716fdae1e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 19 Jan 2024 16:24:58 +0100 Subject: [PATCH 1031/1688] refactor: Get rid of instanceOf and add a contract for booking info in routing --- .../ext/flex/FlexAccessEgress.java | 8 +++++++ .../opentripplanner/model/BookingInfo.java | 3 ++- .../model/booking/RoutingBookingInfo.java | 23 +++++++++++++++++++ .../raptoradapter/router/TransitRouter.java | 8 +++---- .../transit/BookingTimeAccessEgress.java | 17 ++++++-------- .../transit/FlexAccessEgressAdapter.java | 7 ++++++ .../transit/OpeningHoursAdjuster.java | 21 +++++++++-------- .../transit/RoutingAccessEgress.java | 9 ++++++++ .../transit/OpeningHoursAdjusterTest.java | 8 +++---- 9 files changed, 76 insertions(+), 28 deletions(-) create mode 100644 src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index 26833f67a6a..a9045408101 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -4,6 +4,7 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.tostring.ToStringBuilder; +import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; @@ -79,6 +80,13 @@ public int latestArrivalTime(int arrivalTime) { return pathDurations.mapToRouterArrivalTime(latestArrivalTime); } + /** + * Return routing booking info for the boarding stop. + */ + public RoutingBookingInfo routingBookingInfo() { + return trip.getPickupBookingInfo(fromStopIndex); + } + @Override public String toString() { return ToStringBuilder diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index b15cfca722f..f784d024216 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -3,13 +3,14 @@ import java.io.Serializable; import java.time.Duration; import java.util.EnumSet; +import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.transit.model.organization.ContactInfo; /** * Info about how a trip might be booked at a particular stop. All of this is pass-through * information, except information about booking time and booking notice. */ -public class BookingInfo implements Serializable { +public class BookingInfo implements Serializable, RoutingBookingInfo { private final ContactInfo contactInfo; diff --git a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java new file mode 100644 index 00000000000..4891d96f0f0 --- /dev/null +++ b/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java @@ -0,0 +1,23 @@ +package org.opentripplanner.model.booking; + +import java.time.Duration; +import org.opentripplanner.model.BookingTime; + +/** + * This is the contract between booking info and the router. The router will enforce + * this information if the request sets the earliest-booking-time request parameter. + */ +public interface RoutingBookingInfo { + /** + * The router should enforce that the request earliest-booking-time is before + * this time. This time is relative to the service/operating date of the actual trip. + */ + BookingTime getLatestBookingTime(); + + /** + * The router is responsible for enforcing that it is enough time between the + * request earliest-booking-time plus this {@code minimumBookingNotice} and the + * passenger trip boarding time calculated by OTP. + */ + Duration getMinimumBookingNotice(); +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 0c440915835..a2595c19656 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -24,7 +24,6 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter; import org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingTimeAccessEgress; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.FlexAccessEgressAdapter; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; @@ -281,12 +280,13 @@ private Collection fetchAccessEgresses(AccessEgre return results .stream() .map(routingAccessEgress -> { - if (routingAccessEgress instanceof FlexAccessEgressAdapter flexAccessEgressAdapter) { + if (routingAccessEgress.routingBookingInfo().isPresent()) { return new BookingTimeAccessEgress( - flexAccessEgressAdapter, + routingAccessEgress.routingBookingInfo().get(), request.dateTime(), request.earliestBookingTime(), - serverContext.transitService().getTimeZone() + serverContext.transitService().getTimeZone(), + routingAccessEgress ); } else { return routingAccessEgress; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index 9a4730834b0..5e2ab4d79ce 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -4,6 +4,7 @@ import java.time.ZoneId; import javax.annotation.Nullable; import org.opentripplanner.framework.model.TimeAndCost; +import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.street.search.state.State; public class BookingTimeAccessEgress implements RoutingAccessEgress { @@ -13,18 +14,19 @@ public class BookingTimeAccessEgress implements RoutingAccessEgress { private final OpeningHoursAdjuster openingHoursAdjuster; public BookingTimeAccessEgress( - FlexAccessEgressAdapter delegate, - Instant dateTime, + RoutingBookingInfo bookingInfo, + Instant requestDateTime, Instant earliestBookingTime, - ZoneId timeZone + ZoneId timeZone, + RoutingAccessEgress delegate ) { this.delegate = delegate; openingHoursAdjuster = new OpeningHoursAdjuster( - delegate.getFlexTrip().getPickupBookingInfo(0), + bookingInfo, delegate, earliestBookingTime, - dateTime, + requestDateTime, timeZone ); } @@ -124,9 +126,4 @@ public boolean hasPenalty() { public TimeAndCost penalty() { return delegate.penalty(); } - - @Override - public int timeShiftDepartureTimeToActualTime(int computedDepartureTimeIncludingPenalty) { - return delegate.timeShiftDepartureTimeToActualTime(computedDepartureTimeIncludingPenalty); - } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index 662d380e6ad..645780df59f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -1,9 +1,11 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit; +import java.util.Optional; import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorConstants; /** @@ -64,6 +66,11 @@ public DefaultAccessEgress withPenalty(TimeAndCost penalty) { return new FlexAccessEgressAdapter(this, penalty); } + @Override + public Optional routingBookingInfo() { + return Optional.ofNullable(flexAccessEgress.routingBookingInfo()); + } + FlexTrip getFlexTrip() { return flexAccessEgress.trip(); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java index b7c074de9f5..07f09eedc58 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java @@ -6,10 +6,9 @@ import java.time.LocalTime; import java.time.ZoneId; import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; import org.opentripplanner.framework.time.ServiceDateUtils; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,12 +26,12 @@ public class OpeningHoursAdjuster { /** * Booking info for the boarding stop. */ - private final BookingInfo boardingBookingInfo; + private final RoutingBookingInfo boardingBookingInfo; /** * The original access/egress. */ - private final FlexAccessEgressAdapter delegate; + private final RoutingAccessEgress delegate; /** * The earliest time the passenger can book the trip. @@ -40,8 +39,8 @@ public class OpeningHoursAdjuster { private final int earliestBookingTime; public OpeningHoursAdjuster( - BookingInfo boardingBookingInfo, - FlexAccessEgressAdapter delegate, + RoutingBookingInfo boardingBookingInfo, + RoutingAccessEgress delegate, Instant earliestBookingTime, Instant dateTime, ZoneId timeZone @@ -66,7 +65,7 @@ public int earliestDepartureTime(int requestedDepartureTime) { if (edt == RaptorConstants.TIME_NOT_SET) { return RaptorConstants.TIME_NOT_SET; } - BookingTime latestBookingTime = boardingBookingInfo.getLatestBookingTime(); + var latestBookingTime = boardingBookingInfo.getLatestBookingTime(); if (latestBookingTime != null) { return adjustDepartureTimeWithLatestBookingTime(edt, latestBookingTime); } @@ -74,9 +73,13 @@ public int earliestDepartureTime(int requestedDepartureTime) { if (minimumBookingNotice != null) { return adjustDepartureTimeWithMinimumBookingNotice(edt, minimumBookingNotice); } + + // TODO: Add build time report issue for this - this is not a business rule which should + // be implemented here. Here we should just ignore the error. LOG.warn( - "Missing both latest booking time and minimum booking notice on trip {}. Falling back to default earliest booking time", - delegate.getFlexTrip().getTrip().getId() + "Missing both latest booking time and minimum booking notice on trip {}. " + + "Falling back to default earliest booking time", + ((FlexAccessEgressAdapter) delegate).getFlexTrip().getId() ); return edt; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java index d22ec0f71f9..3f76af6f821 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java @@ -1,6 +1,8 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit; +import java.util.Optional; import org.opentripplanner.framework.model.TimeAndCost; +import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.street.search.state.State; @@ -30,4 +32,11 @@ public interface RoutingAccessEgress extends RaptorAccessEgress { boolean hasPenalty(); TimeAndCost penalty(); + + /** + * Booking info enforced by the router. By default nothing is returned. + */ + default Optional routingBookingInfo() { + return Optional.empty(); + } } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java index 2ab7e4742ba..a8bd64c552e 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java @@ -14,10 +14,10 @@ import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.ext.flex.trip.FlexTrip; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.BookingInfoBuilder; import org.opentripplanner.model.BookingTime; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorConstants; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.TestStateBuilder; @@ -55,14 +55,14 @@ class OpeningHoursAdjusterTest { .atZone(ZoneIds.OSLO) .toInstant(); - private static final BookingInfo BOOK_BEFORE_11_H_45 = new BookingInfoBuilder() + private static final RoutingBookingInfo BOOK_BEFORE_11_H_45 = new BookingInfoBuilder() .withLatestBookingTime(new BookingTime(LocalTime.of(11, 45, 0), 0)) .build(); - private static final BookingInfo BOOK_BEFORE_21_H_00_PREVIOUS_DAY = new BookingInfoBuilder() + private static final RoutingBookingInfo BOOK_BEFORE_21_H_00_PREVIOUS_DAY = new BookingInfoBuilder() .withLatestBookingTime(new BookingTime(LocalTime.of(21, 0, 0), 1)) .build(); - private static final BookingInfo BOOK_ONE_HOUR_BEFORE = new BookingInfoBuilder() + private static final RoutingBookingInfo BOOK_ONE_HOUR_BEFORE = new BookingInfoBuilder() .withMinimumBookingNotice(Duration.ofHours(1)) .build(); public static final int SECONDS_IN_TWELVE_HOURS = 12 * 60 * 60; From c140fabbe7d0f7d40eea74c9aa5b288ea7076e53 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 25 Apr 2024 16:59:28 +0200 Subject: [PATCH 1032/1688] feature: Add method in TimeUtils for converting a java.time.Instant to OTP transit request time Otp transit request time is the number of seconds since/before the `transitSearchTimeZero` --- .../framework/time/TimeUtils.java | 6 +++++ .../framework/time/TimeUtilsTest.java | 25 +++++++++++++++++++ 2 files changed, 31 insertions(+) diff --git a/src/main/java/org/opentripplanner/framework/time/TimeUtils.java b/src/main/java/org/opentripplanner/framework/time/TimeUtils.java index 61549eeced3..1f64bbe84a4 100644 --- a/src/main/java/org/opentripplanner/framework/time/TimeUtils.java +++ b/src/main/java/org/opentripplanner/framework/time/TimeUtils.java @@ -2,10 +2,12 @@ import java.security.SecureRandom; import java.time.Duration; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalTime; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.time.temporal.ChronoUnit; import java.util.Arrays; import java.util.Locale; import java.util.Random; @@ -246,4 +248,8 @@ public static long busyWait(int waitMs) { } return value; } + + public static int toTransitTimeSeconds(ZonedDateTime transitSearchTimeZero, Instant time) { + return (int) ChronoUnit.SECONDS.between(transitSearchTimeZero.toInstant(), time); + } } diff --git a/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java b/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java index 53a6e5d4be4..63224c499a9 100644 --- a/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java @@ -3,6 +3,7 @@ import static java.time.ZoneOffset.UTC; import static org.junit.jupiter.api.Assertions.assertEquals; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalTime; import java.time.Month; @@ -182,6 +183,30 @@ void testMsToString() { assertEquals("-1.234s", TimeUtils.msToString(-1234)); } + @Test + void testOtpTime() { + var timeZero = ZonedDateTime.of( + LocalDate.of(2024, Month.JANUARY, 15), + LocalTime.of(0, 0, 0), + ZoneIds.UTC + ); + // otp zero is identical to time + assertEquals( + 0, + TimeUtils.toTransitTimeSeconds(timeZero, Instant.parse("2024-01-15T00:00:00Z")) + ); + // Test positive offset - otp zero is 1h2m3s before time + assertEquals( + 3723, + TimeUtils.toTransitTimeSeconds(timeZero, Instant.parse("2024-01-15T01:02:03Z")) + ); + // Test negative offset - otp zero is 30m after time + assertEquals( + -1800, + TimeUtils.toTransitTimeSeconds(timeZero, Instant.parse("2024-01-14T23:30:00Z")) + ); + } + private static int time(int hour, int min, int sec) { return 60 * (60 * hour + min) + sec; } From 06bc5c406a1d5fc34bc1fb7367c9f12c933df927 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 28 Apr 2024 20:14:21 +0200 Subject: [PATCH 1033/1688] refactor: Add message to OtpHttpClientException --- .../opentripplanner/framework/io/OtpHttpClientException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java b/src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java index a56fdcaa7f0..ff300cc7e3c 100644 --- a/src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java +++ b/src/main/java/org/opentripplanner/framework/io/OtpHttpClientException.java @@ -3,7 +3,7 @@ public class OtpHttpClientException extends RuntimeException { public OtpHttpClientException(Throwable cause) { - super(cause); + super(cause.getMessage(), cause); } public OtpHttpClientException(String message) { From 2923646efc0db30610cd4d24bba0dd40880d003b Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 16:37:36 +0200 Subject: [PATCH 1034/1688] refactor: Rename to `bookingTime` from `earliestBookingTime` --- .../transmodel/mapping/TripRequestMapper.java | 5 ++--- .../apis/transmodel/model/plan/TripQuery.java | 9 +++++++-- .../raptoradapter/router/TransitRouter.java | 4 ++-- .../routing/api/request/RouteRequest.java | 15 ++++++++++----- .../apis/transmodel/schema.graphql | 4 ++-- 5 files changed, 23 insertions(+), 14 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java index 72abfc8afe3..72cd5fc6260 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapper.java @@ -54,9 +54,8 @@ public static RouteRequest createRequest(DataFetchingEnvironment environment) { ); callWith.argument( - "earliestBookingTime", - millisSinceEpoch -> - request.setEarliestBookingTime(Instant.ofEpochMilli((long) millisSinceEpoch)) + "bookingTime", + millisSinceEpoch -> request.setBookingTime(Instant.ofEpochMilli((long) millisSinceEpoch)) ); callWith.argument( diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index 73d8173e3b3..9ef69a96b97 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -61,8 +61,13 @@ public static GraphQLFieldDefinition create( .argument( GraphQLArgument .newArgument() - .name("earliestBookingTime") - .description("Date and time for the earliest time the user can book the journey") + .name("bookingTime") + .description( + "Date and time for the time the user can book the journey. Normally this is when the " + + "search is performed, plus a small grace period to complete the booking. Services witch " + + "must be booked before this time is excluded. Currently only flex services used as " + + "access and egress is supported, not direct flex or other services." + ) .type(gqlUtil.dateTimeScalar) .build() ) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index a2595c19656..c1c8ce9aa3b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -276,7 +276,7 @@ private Collection fetchAccessEgresses(AccessEgre results.addAll(AccessEgressMapper.mapFlexAccessEgresses(flexAccessList, type.isEgress())); } - if (request.earliestBookingTime() != null) { + if (request.bookingTime() != null) { return results .stream() .map(routingAccessEgress -> { @@ -284,7 +284,7 @@ private Collection fetchAccessEgresses(AccessEgre return new BookingTimeAccessEgress( routingAccessEgress.routingBookingInfo().get(), request.dateTime(), - request.earliestBookingTime(), + request.bookingTime(), serverContext.transitService().getTimeZone(), routingAccessEgress ); diff --git a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java index f570c3bfcc5..be208653cd1 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java +++ b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java @@ -81,7 +81,7 @@ public class RouteRequest implements Cloneable, Serializable { private boolean wheelchair = false; - private Instant earliestBookingTime; + private Instant bookingTime; /* CONSTRUCTORS */ @@ -114,12 +114,17 @@ public void withPreferences(Consumer body) { this.preferences = preferences.copyOf().apply(body).build(); } - public Instant earliestBookingTime() { - return earliestBookingTime; + /** + * The booking time is used exclude services witch is not bookable at the + * requested booking time. If a service is bookable at this time or later, the service + * is included. Currently, OTP only supports this for FLEX access and egress. + */ + public Instant bookingTime() { + return bookingTime; } - public RouteRequest setEarliestBookingTime(Instant earliestBookingTime) { - this.earliestBookingTime = earliestBookingTime; + public RouteRequest setBookingTime(Instant bookingTime) { + this.bookingTime = bookingTime; return this; } diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 5c7fd89294f..c9bc2848c62 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -791,12 +791,12 @@ type QueryType { boardSlackDefault: Int = 0, "List of boardSlack for a given set of modes. Defaults: []" boardSlackList: [TransportModeSlack], + "Date and time for the time the user can book the journey. Normally this is when the search is performed, plus a small grace period to complete the booking. Services witch must be booked before this time is excluded. Currently only flex services used as access and egress is supported, not direct flex or other services." + bookingTime: DateTime, "Date and time for the earliest time the user is willing to start the journey (if arriveBy=false/not set) or the latest acceptable time of arriving (arriveBy=true). Defaults to now" dateTime: DateTime, "Debug the itinerary-filter-chain. OTP will attach a system notice to itineraries instead of removing them. This is very convenient when tuning the filters." debugItineraryFilter: Boolean = false @deprecated(reason : "Use `itineraryFilter.debug` instead."), - "Date and time for the earliest time the user can book the journey" - earliestBookingTime: DateTime, "A list of filters for which trips should be included. A trip will be included if it matches with at least one filter. An empty list of filters means that all trips should be included. If a search include this parameter, \"whiteListed\", \"banned\" & \"modes.transportModes\" filters will be ignored." filters: [TripFilterInput!], "The start location" From 6253cf5bb7e19db40903361982d442abade7f31e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 16:42:05 +0200 Subject: [PATCH 1035/1688] fature: Add bookingTime parameter to REST API --- .../ext/restapi/resources/RoutingResource.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java index 1d985f0e555..3ae029fdb2d 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RoutingResource.java @@ -8,6 +8,7 @@ import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MultivaluedMap; import java.time.Duration; +import java.time.LocalDateTime; import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.ArrayList; @@ -171,6 +172,9 @@ public abstract class RoutingResource { @QueryParam("wheelchair") protected Boolean wheelchair; + @QueryParam("bookingTime") + protected String bookingTime; + /** * The maximum time (in seconds) of pre-transit travel when using drive-to-transit (park and ride * or kiss and ride). Defaults to unlimited. @@ -728,6 +732,10 @@ protected RouteRequest buildRequest(MultivaluedMap queryParamete } else { request.setDateTime(date, time, tz); } + + if (bookingTime != null) { + request.setBookingTime(LocalDateTime.parse(bookingTime).atZone(tz).toInstant()); + } } final Duration swDuration = DurationUtils.parseSecondsOrDuration(searchWindow).orElse(null); From eac9b9f3a83cafbe0c6493a02d9fdddff939d1da Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 16:47:53 +0200 Subject: [PATCH 1036/1688] refactor: cleanup code --- .../opentripplanner/model/BookingInfo.java | 19 +++++++++++++-- .../netex/mapping/BookingInfoMapper.java | 24 +++++++------------ .../raptoradapter/router/TransitRouter.java | 20 ++++++++-------- 3 files changed, 36 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index f784d024216..74361d42ad4 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.time.Duration; import java.util.EnumSet; +import javax.annotation.Nullable; import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.transit.model.organization.ContactInfo; @@ -19,35 +20,42 @@ public class BookingInfo implements Serializable, RoutingBookingInfo { /** * Cannot be set at the same time as minimumBookingNotice or maximumBookingNotice */ + @Nullable private final BookingTime earliestBookingTime; /** * Cannot be set at the same time as minimumBookingNotice or maximumBookingNotice */ + @Nullable private final BookingTime latestBookingTime; /** * Cannot be set at the same time as earliestBookingTime or latestBookingTime */ + @Nullable private final Duration minimumBookingNotice; /** * Cannot be set at the same time as earliestBookingTime or latestBookingTime */ + @Nullable private final Duration maximumBookingNotice; + @Nullable private final String message; + @Nullable private final String pickupMessage; + @Nullable private final String dropOffMessage; BookingInfo( ContactInfo contactInfo, EnumSet bookingMethods, BookingTime earliestBookingTime, - BookingTime latestBookingTime, - Duration minimumBookingNotice, + @Nullable BookingTime latestBookingTime, + @Nullable Duration minimumBookingNotice, Duration maximumBookingNotice, String message, String pickupMessage, @@ -87,30 +95,37 @@ public EnumSet bookingMethods() { return bookingMethods; } + @Nullable public BookingTime getEarliestBookingTime() { return earliestBookingTime; } + @Nullable public BookingTime getLatestBookingTime() { return latestBookingTime; } + @Nullable public Duration getMinimumBookingNotice() { return minimumBookingNotice; } + @Nullable public Duration getMaximumBookingNotice() { return maximumBookingNotice; } + @Nullable public String getMessage() { return message; } + @Nullable public String getPickupMessage() { return pickupMessage; } + @Nullable public String getDropOffMessage() { return dropOffMessage; } diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java index b625a88a50a..b02ea7650c5 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java @@ -240,24 +240,18 @@ private void setIfNotEmpty( Duration minimumBookingPeriod, MultilingualString bookingNote ) { - if (bookingContact != null) { - this.bookingContact = bookingContact; - } if (bookingMethods != null && !bookingMethods.isEmpty()) { this.bookingMethods = bookingMethods; } - if (latestBookingTime != null) { - this.latestBookingTime = latestBookingTime; - } - if (bookWhen != null) { - this.bookWhen = bookWhen; - } - if (minimumBookingPeriod != null) { - this.minimumBookingPeriod = minimumBookingPeriod; - } - if (bookingNote != null) { - this.bookingNote = bookingNote; - } + this.bookingContact = getOrDefault(bookingContact, this.bookingContact); + this.minimumBookingPeriod = getOrDefault(minimumBookingPeriod, this.minimumBookingPeriod); + this.latestBookingTime = getOrDefault(latestBookingTime, this.latestBookingTime); + this.bookWhen = getOrDefault(bookWhen, this.bookWhen); + this.bookingNote = getOrDefault(bookingNote, this.bookingNote); } } + + private static T getOrDefault(T value, T defaultValue) { + return value == null ? defaultValue : value; + } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index c1c8ce9aa3b..2e26781cde0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -172,8 +172,8 @@ private TransitRouterResult route() { } private AccessEgresses fetchAccessEgresses() { - final var asyncAccessList = new ArrayList(); - final var asyncEgressList = new ArrayList(); + final var accessList = new ArrayList(); + final var egressList = new ArrayList(); if (OTPFeature.ParallelRouting.isOn()) { try { @@ -181,19 +181,19 @@ private AccessEgresses fetchAccessEgresses() { // log-trace-parameters-propagation and graceful timeout handling here. CompletableFuture .allOf( - CompletableFuture.runAsync(() -> asyncAccessList.addAll(fetchAccess())), - CompletableFuture.runAsync(() -> asyncEgressList.addAll(fetchEgress())) + CompletableFuture.runAsync(() -> accessList.addAll(fetchAccess())), + CompletableFuture.runAsync(() -> egressList.addAll(fetchEgress())) ) .join(); } catch (CompletionException e) { RoutingValidationException.unwrapAndRethrowCompletionException(e); } } else { - asyncAccessList.addAll(fetchAccess()); - asyncEgressList.addAll(fetchEgress()); + accessList.addAll(fetchAccess()); + egressList.addAll(fetchEgress()); } - verifyAccessEgress(asyncAccessList, asyncEgressList); + verifyAccessEgress(accessList, egressList); // Decorate access/egress with a penalty to make it less favourable than transit var penaltyDecorator = new AccessEgressPenaltyDecorator( @@ -202,10 +202,10 @@ private AccessEgresses fetchAccessEgresses() { request.preferences().street().accessEgress().penalty() ); - var accessList = penaltyDecorator.decorateAccess(asyncAccessList); - var egressList = penaltyDecorator.decorateEgress(asyncEgressList); + var accessListWithPenalty = penaltyDecorator.decorateAccess(accessList); + var egressListWithPenalty = penaltyDecorator.decorateEgress(egressList); - return new AccessEgresses(accessList, egressList); + return new AccessEgresses(accessListWithPenalty, egressListWithPenalty); } private Collection fetchAccess() { From 93782abfdd90cfed4addc63735b4c3fbc71a0b57 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 19:52:55 +0200 Subject: [PATCH 1037/1688] Use the DefaultAccessEgress base class in the main internal model, not the raptor interface. This allow us to extend the interface inside the otp internal model. --- .../ext/ridehailing/RideHailingAccessShifter.java | 5 ++--- .../opentripplanner/ext/traveltime/TravelTimeResource.java | 4 ++-- .../algorithm/raptoradapter/router/TransitRouter.java | 7 ++++--- .../raptoradapter/transit/BookingTimeAccessEgress.java | 4 ++-- .../raptoradapter/transit/mappers/AccessEgressMapper.java | 7 +++---- 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java index 32f79dcc8a0..b4a75c26aad 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java @@ -10,7 +10,6 @@ import org.opentripplanner.ext.ridehailing.model.ArrivalTime; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.transit.model.framework.Result; @@ -34,9 +33,9 @@ public class RideHailingAccessShifter { * so that they only start at the time when the ride hailing vehicle can actually be there * to pick up passengers. */ - public static List shiftAccesses( + public static List shiftAccesses( boolean isAccess, - List results, + List results, List services, RouteRequest request, Instant now diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java index 88742aebeb1..67d8bb0d6cb 100644 --- a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java +++ b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java @@ -34,7 +34,7 @@ import org.opentripplanner.raptor.api.response.RaptorResponse; import org.opentripplanner.raptor.api.response.StopArrivals; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressRouter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.AccessEgressMapper; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.RaptorRoutingRequestTransitData; @@ -178,7 +178,7 @@ private ZSampleGrid getSampleGrid() { } } - private Collection getAccess(TemporaryVerticesContainer temporaryVertices) { + private Collection getAccess(TemporaryVerticesContainer temporaryVertices) { final Collection accessStops = AccessEgressRouter.streetSearch( routingRequest, temporaryVertices, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 2e26781cde0..d4e9e50f19b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -24,6 +24,7 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter; import org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingTimeAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; @@ -256,7 +257,7 @@ private Collection fetchAccessEgresses(AccessEgre stopCountLimit ); - List results = new ArrayList<>( + List results = new ArrayList<>( AccessEgressMapper.mapNearbyStops(nearbyStops, type.isEgress()) ); results = timeshiftRideHailing(streetRequest, type, results); @@ -308,10 +309,10 @@ private Collection fetchAccessEgresses(AccessEgre * This method is a good candidate to be moved to the access/egress filter chain when that has * been added. */ - private List timeshiftRideHailing( + private List timeshiftRideHailing( StreetRequest streetRequest, AccessEgressType type, - List accessEgressList + List accessEgressList ) { if (streetRequest.mode() != StreetMode.CAR_HAILING) { return accessEgressList; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index 5e2ab4d79ce..8b6bd1ce36b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -9,7 +9,7 @@ public class BookingTimeAccessEgress implements RoutingAccessEgress { - private final RoutingAccessEgress delegate; + private final DefaultAccessEgress delegate; private final OpeningHoursAdjuster openingHoursAdjuster; @@ -18,7 +18,7 @@ public BookingTimeAccessEgress( Instant requestDateTime, Instant earliestBookingTime, ZoneId timeZone, - RoutingAccessEgress delegate + DefaultAccessEgress delegate ) { this.delegate = delegate; openingHoursAdjuster = diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java index fd7619ac297..6cef677f5a9 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java @@ -7,13 +7,12 @@ import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.FlexAccessEgressAdapter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.transit.model.site.RegularStop; public class AccessEgressMapper { - public static List mapNearbyStops( + public static List mapNearbyStops( Collection accessStops, boolean isEgress ) { @@ -24,7 +23,7 @@ public static List mapNearbyStops( .collect(Collectors.toList()); } - public static Collection mapFlexAccessEgresses( + public static Collection mapFlexAccessEgresses( Collection flexAccessEgresses, boolean isEgress ) { @@ -34,7 +33,7 @@ public static Collection mapFlexAccessEgresses( .collect(Collectors.toList()); } - private static RoutingAccessEgress mapNearbyStop(NearbyStop nearbyStop, boolean isEgress) { + private static DefaultAccessEgress mapNearbyStop(NearbyStop nearbyStop, boolean isEgress) { if (!(nearbyStop.stop instanceof RegularStop)) { return null; } From 760cfb29f8bebf25ac3d1998e425540dbf43b821 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 20:13:08 +0200 Subject: [PATCH 1038/1688] refactor and fix latestArrivalTime, tmePenalty and cleanup - Implement latestArrivalTime in BookingTimeAccessEgress - Make Booking time work with time-penaly - Move bussiness logic into business classes from services and OpeningHoursAdjuster --- .../ext/flex/FlexAccessEgress.java | 34 ++- .../opentripplanner/model/BookingInfo.java | 36 ++- .../opentripplanner/model/BookingTime.java | 37 +++ .../model/booking/RoutingBookingInfo.java | 118 +++++++- .../raptoradapter/router/TransitRouter.java | 18 +- .../transit/BookingTimeAccessEgress.java | 56 ++-- .../transit/FlexAccessEgressAdapter.java | 7 +- .../transit/OpeningHoursAdjuster.java | 132 -------- .../RaptorPathToItineraryMapperTest.java | 9 +- .../transit/OpeningHoursAdjusterTest.java | 281 ------------------ 10 files changed, 254 insertions(+), 474 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java delete mode 100644 src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index a9045408101..2a537e48340 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -2,6 +2,9 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; +import java.util.Objects; +import java.util.Optional; +import javax.annotation.Nullable; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.booking.RoutingBookingInfo; @@ -14,16 +17,19 @@ public final class FlexAccessEgress { private final FlexPathDurations pathDurations; private final int fromStopIndex; private final int toStopIndex; - private final FlexTrip trip; + private final FlexTrip trip; private final State lastState; private final boolean stopReachedOnBoard; + @Nullable + private final RoutingBookingInfo routingBookingInfo; + public FlexAccessEgress( RegularStop stop, FlexPathDurations pathDurations, int fromStopIndex, int toStopIndex, - FlexTrip trip, + FlexTrip trip, State lastState, boolean stopReachedOnBoard ) { @@ -31,19 +37,16 @@ public FlexAccessEgress( this.pathDurations = pathDurations; this.fromStopIndex = fromStopIndex; this.toStopIndex = toStopIndex; - this.trip = trip; + this.trip = Objects.requireNonNull(trip); this.lastState = lastState; this.stopReachedOnBoard = stopReachedOnBoard; + this.routingBookingInfo = createRoutingBookingInfo().orElse(null); } public RegularStop stop() { return stop; } - public FlexTrip trip() { - return trip; - } - public State lastState() { return lastState; } @@ -81,10 +84,11 @@ public int latestArrivalTime(int arrivalTime) { } /** - * Return routing booking info for the boarding stop. + * Return routing booking info for the boarding stop. Empty, if there are not any + * booking restrictions, witch applies to routing. */ - public RoutingBookingInfo routingBookingInfo() { - return trip.getPickupBookingInfo(fromStopIndex); + public Optional routingBookingInfo() { + return Optional.ofNullable(routingBookingInfo); } @Override @@ -95,9 +99,17 @@ public String toString() { .addNum("toStopIndex", toStopIndex) .addObj("durations", pathDurations) .addObj("stop", stop) - .addObj("trip", trip) + .addObj("trip", trip.getId()) .addObj("lastState", lastState) .addBoolIfTrue("stopReachedOnBoard", stopReachedOnBoard) .toString(); } + + private Optional createRoutingBookingInfo() { + var bookingInfo = trip.getPickupBookingInfo(fromStopIndex); + if (bookingInfo == null) { + return Optional.empty(); + } + return bookingInfo.createRoutingBookingInfo(pathDurations.access()); + } } diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/BookingInfo.java index 74361d42ad4..a9e84f40008 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/BookingInfo.java @@ -3,6 +3,7 @@ import java.io.Serializable; import java.time.Duration; import java.util.EnumSet; +import java.util.Optional; import javax.annotation.Nullable; import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.transit.model.organization.ContactInfo; @@ -11,7 +12,7 @@ * Info about how a trip might be booked at a particular stop. All of this is pass-through * information, except information about booking time and booking notice. */ -public class BookingInfo implements Serializable, RoutingBookingInfo { +public class BookingInfo implements Serializable { private final ContactInfo contactInfo; @@ -129,4 +130,37 @@ public String getPickupMessage() { public String getDropOffMessage() { return dropOffMessage; } + + /** + * Create new booking-info for routing based on the parameters used by the trip planner + * routing. The {@code latestBookingTime} and {@code minimumBookingNotice} is checked + * to make sure the service is bookable using the request parameter {@code bookingTime}. + *

      + * This method returns empty if this object does not contain parameters used by the + * routing algorithm. + *

      + * @param flexTripAccessTime The time used for access before boarding the Flex trip - it could + * include slack or walk time. + */ + @Nullable + public Optional createRoutingBookingInfo(int flexTripAccessTime) { + if (minimumBookingNotice == null && latestBookingTime == null) { + return Optional.empty(); + } + var builder = RoutingBookingInfo.of(); + + if (latestBookingTime != null) { + // TODO TGR BOOKING_TIME - This do not look right. Why would we remove the time it takes to + // walk to a flex area here. This is about the time we want to book. I could see how this + // should apply to the `minimumBookingNotice` because it is relative to the board-time + // but not the `latestBookingTime`. + // builder.withLatestBookingTime(latestBookingTime.relativeTime() - flexTripAccessTime); + builder.withLatestBookingTime(latestBookingTime.relativeTimeSeconds()); + } + if (minimumBookingNotice != null) { + // builder.withMinimumBookingNotice((int) minimumBookingNotice.toSeconds()); + builder.withMinimumBookingNotice((int) minimumBookingNotice.toSeconds() - flexTripAccessTime); + } + return Optional.of(builder.build()); + } } diff --git a/src/main/java/org/opentripplanner/model/BookingTime.java b/src/main/java/org/opentripplanner/model/BookingTime.java index 2582752f3c1..be6ed4105f8 100644 --- a/src/main/java/org/opentripplanner/model/BookingTime.java +++ b/src/main/java/org/opentripplanner/model/BookingTime.java @@ -2,6 +2,9 @@ import java.io.Serializable; import java.time.LocalTime; +import java.util.Objects; +import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.framework.tostring.ToStringBuilder; /** * Represents either an earliest or latest time a trip can be booked relative to the departure day @@ -25,4 +28,38 @@ public LocalTime getTime() { public int getDaysPrior() { return daysPrior; } + + /** + * Get the relative time of day, can be negative if the {@code daysPrior} is set. This method + * does account for DST changes within the relative time. + */ + public int relativeTimeSeconds() { + return time.toSecondOfDay() - daysPrior * TimeUtils.ONE_DAY_SECONDS; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + BookingTime that = (BookingTime) o; + return daysPrior == that.daysPrior && Objects.equals(time, that.time); + } + + @Override + public int hashCode() { + return Objects.hash(time, daysPrior); + } + + @Override + public String toString() { + return ToStringBuilder + .of(BookingTime.class) + .addObj("time", time) + .addNum("daysPrior", daysPrior, 0) + .toString(); + } } diff --git a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java index 4891d96f0f0..67076242369 100644 --- a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java +++ b/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java @@ -1,23 +1,121 @@ package org.opentripplanner.model.booking; -import java.time.Duration; -import org.opentripplanner.model.BookingTime; +import java.util.Objects; +import org.opentripplanner.framework.tostring.ToStringBuilder; /** * This is the contract between booking info and the router. The router will enforce * this information if the request sets the earliest-booking-time request parameter. + *

      + * Both {@code latestBookingTime} and {@code minimumBookingNotice} can be {@code null}, + * but at least one ot them must be none {@code null}. + *

      + * This class is not used by Raptor directly, but used by the BookingTimeAccessEgress with + * implement the RaptorAccessEgress interface. */ -public interface RoutingBookingInfo { +public final class RoutingBookingInfo { + + private static final int NOT_SET = -1_999_999; + + private final int latestBookingTime; + private final int minimumBookingNotice; + + private RoutingBookingInfo(int latestBookingTime, int minimumBookingNotice) { + if (latestBookingTime == NOT_SET && minimumBookingNotice == NOT_SET) { + throw new IllegalArgumentException( + "Either latestBookingTime or minimumBookingNotice must be set." + ); + } + this.latestBookingTime = latestBookingTime; + this.minimumBookingNotice = minimumBookingNotice; + } + + public static RoutingBookingInfo.Builder of() { + return new Builder(); + } + /** - * The router should enforce that the request earliest-booking-time is before - * this time. This time is relative to the service/operating date of the actual trip. + * Check if requested board-time can be booked according to the booking info rules. See + * {@link org.opentripplanner.model.BookingInfo}. + *

      + * If not the case, the RaptorConstants.TIME_NOT_SET is returned. */ - BookingTime getLatestBookingTime(); + public boolean isThereEnoughTimeToBook(int time, int requestedBookingTime) { + // This can be optimized/simplified; it can be done before the search start since it + // only depends on the latestBookingTime and requestedBookingTime, not the departure time. + if (exceedsLatestBookingTime(requestedBookingTime)) { + return false; + } + if (exceedsMinimumBookingNotice(time, requestedBookingTime)) { + return false; + } + return true; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + var other = (RoutingBookingInfo) o; + return ( + Objects.equals(latestBookingTime, other.latestBookingTime) && + Objects.equals(minimumBookingNotice, other.minimumBookingNotice) + ); + } + + @Override + public int hashCode() { + return Objects.hash(latestBookingTime, minimumBookingNotice); + } + + @Override + public String toString() { + return ToStringBuilder + .of(RoutingBookingInfo.class) + .addServiceTime("latestBookingTime", latestBookingTime, NOT_SET) + .addDurationSec("minimumBookingNotice", minimumBookingNotice, NOT_SET) + .toString(); + } + + private boolean exceedsLatestBookingTime(int requestedEarliestBookingTime) { + return exist(latestBookingTime) && requestedEarliestBookingTime > latestBookingTime; + } /** - * The router is responsible for enforcing that it is enough time between the - * request earliest-booking-time plus this {@code minimumBookingNotice} and the - * passenger trip boarding time calculated by OTP. + * Check if the given time is after (or eq to) the earliest time allowed according to the minimum + * booking notice. */ - Duration getMinimumBookingNotice(); + private boolean exceedsMinimumBookingNotice(int departureTime, int requestedBookingTime) { + return ( + exist(minimumBookingNotice) && (departureTime - minimumBookingNotice < requestedBookingTime) + ); + } + + private static boolean exist(int value) { + return value != NOT_SET; + } + + public static class Builder { + + private int latestBookingTime = NOT_SET; + private int minimumBookingNotice = NOT_SET; + + public Builder withLatestBookingTime(int latestBookingTime) { + this.latestBookingTime = latestBookingTime; + return this; + } + + public Builder withMinimumBookingNotice(int minimumBookingNotice) { + this.minimumBookingNotice = minimumBookingNotice; + return this; + } + + public RoutingBookingInfo build() { + return new RoutingBookingInfo(latestBookingTime, minimumBookingNotice); + } + } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index d4e9e50f19b..085189b3d6f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -1,7 +1,9 @@ package org.opentripplanner.routing.algorithm.raptoradapter.router; +import static org.opentripplanner.framework.time.TimeUtils.toTransitTimeSeconds; import static org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType.ACCESS; import static org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType.EGRESS; +import static org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingTimeAccessEgress.decorateBookingAccessEgress; import java.time.Duration; import java.time.Instant; @@ -23,7 +25,6 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingTimeAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; @@ -278,21 +279,10 @@ private Collection fetchAccessEgresses(AccessEgre } if (request.bookingTime() != null) { + int requestedBookingTime = toTransitTimeSeconds(transitSearchTimeZero, request.bookingTime()); return results .stream() - .map(routingAccessEgress -> { - if (routingAccessEgress.routingBookingInfo().isPresent()) { - return new BookingTimeAccessEgress( - routingAccessEgress.routingBookingInfo().get(), - request.dateTime(), - request.bookingTime(), - serverContext.transitService().getTimeZone(), - routingAccessEgress - ); - } else { - return routingAccessEgress; - } - }) + .map(accessEgress -> decorateBookingAccessEgress(accessEgress, requestedBookingTime)) .toList(); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index 8b6bd1ce36b..33d12f5b943 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -1,7 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit; -import java.time.Instant; -import java.time.ZoneId; +import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; + import javax.annotation.Nullable; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.booking.RoutingBookingInfo; @@ -11,24 +11,32 @@ public class BookingTimeAccessEgress implements RoutingAccessEgress { private final DefaultAccessEgress delegate; - private final OpeningHoursAdjuster openingHoursAdjuster; + /** + * The requested time the passenger will book the trip. Normally, this is when the search is + * performed plus a small grace period to allow the user to complete the booking. + */ + private final int requestedBookingTime; + + private final RoutingBookingInfo bookingInfo; public BookingTimeAccessEgress( + DefaultAccessEgress delegate, RoutingBookingInfo bookingInfo, - Instant requestDateTime, - Instant earliestBookingTime, - ZoneId timeZone, - DefaultAccessEgress delegate + int requestedBookingTime ) { this.delegate = delegate; - openingHoursAdjuster = - new OpeningHoursAdjuster( - bookingInfo, - delegate, - earliestBookingTime, - requestDateTime, - timeZone - ); + this.requestedBookingTime = requestedBookingTime; + this.bookingInfo = bookingInfo; + } + + public static RoutingAccessEgress decorateBookingAccessEgress( + DefaultAccessEgress accessEgress, + int requestedBookingTime + ) { + var bookingInfo = accessEgress.routingBookingInfo(); + return bookingInfo.isPresent() + ? new BookingTimeAccessEgress(accessEgress, bookingInfo.get(), requestedBookingTime) + : accessEgress; } @Override @@ -48,12 +56,20 @@ public int durationInSeconds() { @Override public int earliestDepartureTime(int requestedDepartureTime) { - return openingHoursAdjuster.earliestDepartureTime(requestedDepartureTime); + int edt = delegate.earliestDepartureTime(requestedDepartureTime); + if (edt == TIME_NOT_SET) { + return TIME_NOT_SET; + } + return bookingInfo.isThereEnoughTimeToBook(edt, requestedBookingTime) ? edt : TIME_NOT_SET; } @Override public int latestArrivalTime(int requestedArrivalTime) { - return delegate.latestArrivalTime(requestedArrivalTime); + int lat = delegate.latestArrivalTime(requestedArrivalTime); + int departureTime = lat - delegate.durationInSeconds(); + return bookingInfo.isThereEnoughTimeToBook(departureTime, requestedBookingTime) + ? lat + : TIME_NOT_SET; } @Override @@ -104,7 +120,11 @@ public String asString(boolean includeStop, boolean includeCost, @Nullable Strin @Override public RoutingAccessEgress withPenalty(TimeAndCost penalty) { - return delegate.withPenalty(penalty); + return new BookingTimeAccessEgress( + delegate.withPenalty(penalty), + bookingInfo, + requestedBookingTime + ); } @Override diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index 645780df59f..09c983e7c1a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -2,7 +2,6 @@ import java.util.Optional; import org.opentripplanner.ext.flex.FlexAccessEgress; -import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.booking.RoutingBookingInfo; @@ -68,11 +67,7 @@ public DefaultAccessEgress withPenalty(TimeAndCost penalty) { @Override public Optional routingBookingInfo() { - return Optional.ofNullable(flexAccessEgress.routingBookingInfo()); - } - - FlexTrip getFlexTrip() { - return flexAccessEgress.trip(); + return flexAccessEgress.routingBookingInfo(); } private static int mapToRaptorTime(int flexTime) { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java deleted file mode 100644 index 07f09eedc58..00000000000 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjuster.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.opentripplanner.routing.algorithm.raptoradapter.transit; - -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import org.opentripplanner.framework.time.ServiceDateUtils; -import org.opentripplanner.model.BookingTime; -import org.opentripplanner.model.booking.RoutingBookingInfo; -import org.opentripplanner.raptor.api.model.RaptorConstants; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Adjust the opening hours for a given flex access/egress by taking into account the latest booking - * time or minimum booking period for the corresponding flex trip. - */ -public class OpeningHoursAdjuster { - - private static final Logger LOG = LoggerFactory.getLogger(OpeningHoursAdjuster.class); - - private static final int DAY_IN_SECONDS = 3600 * 24; - - /** - * Booking info for the boarding stop. - */ - private final RoutingBookingInfo boardingBookingInfo; - - /** - * The original access/egress. - */ - private final RoutingAccessEgress delegate; - - /** - * The earliest time the passenger can book the trip. - */ - private final int earliestBookingTime; - - public OpeningHoursAdjuster( - RoutingBookingInfo boardingBookingInfo, - RoutingAccessEgress delegate, - Instant earliestBookingTime, - Instant dateTime, - ZoneId timeZone - ) { - this.boardingBookingInfo = boardingBookingInfo; - this.delegate = delegate; - this.earliestBookingTime = - convertEarliestBookingTimeToOtpTime(earliestBookingTime, dateTime, timeZone); - } - - /** - * If the earliest booking time is past the latest booking time, the flex trip cannot - * be boarded and the method returns RaptorConstants.TIME_NOT_SET. - * If the earliest booking time is past the minimum booking period, the requested departure - * time is shifted to ensure a minimum booking period. - * If this results in a departure time outside the opening hours (i.e. after LatestArrivalTime), - * then the method returns RaptorConstants.TIME_NOT_SET. - * Otherwise the requested departure time is returned unchanged. - */ - public int earliestDepartureTime(int requestedDepartureTime) { - int edt = delegate.earliestDepartureTime(requestedDepartureTime); - if (edt == RaptorConstants.TIME_NOT_SET) { - return RaptorConstants.TIME_NOT_SET; - } - var latestBookingTime = boardingBookingInfo.getLatestBookingTime(); - if (latestBookingTime != null) { - return adjustDepartureTimeWithLatestBookingTime(edt, latestBookingTime); - } - Duration minimumBookingNotice = boardingBookingInfo.getMinimumBookingNotice(); - if (minimumBookingNotice != null) { - return adjustDepartureTimeWithMinimumBookingNotice(edt, minimumBookingNotice); - } - - // TODO: Add build time report issue for this - this is not a business rule which should - // be implemented here. Here we should just ignore the error. - LOG.warn( - "Missing both latest booking time and minimum booking notice on trip {}. " + - "Falling back to default earliest booking time", - ((FlexAccessEgressAdapter) delegate).getFlexTrip().getId() - ); - return edt; - } - - private int adjustDepartureTimeWithLatestBookingTime(int edt, BookingTime latestBookingTime) { - int otpLatestBookingTime = convertBookingTimeToOtpTime( - latestBookingTime.getTime(), - -latestBookingTime.getDaysPrior() - ); - if (earliestBookingTime <= otpLatestBookingTime) { - return edt; - } else { - return RaptorConstants.TIME_NOT_SET; - } - } - - private int adjustDepartureTimeWithMinimumBookingNotice(int edt, Duration minimumBookingNotice) { - if (edt >= earliestBookingTime + minimumBookingNotice.toSeconds()) { - return edt; - } else { - // Calculate again the earliest departure time shifted by the minimum booking period. - // This may result in a requested departure time outside the opening hours - // in which case RaptorConstants.TIME_NOT_SET is returned. - return delegate.earliestDepartureTime( - earliestBookingTime + (int) minimumBookingNotice.toSeconds() - ); - } - } - - /** - * Convert a booking time with day offset to OTP time. - */ - private static int convertBookingTimeToOtpTime(LocalTime time, int dayOffset) { - return time.toSecondOfDay() + DAY_IN_SECONDS * dayOffset; - } - - /** - * Convert the earliest booking time to OTP time. - * The OTP time starts 12 hours before noon the day of the requested dateTime for the requested time zone. - */ - static int convertEarliestBookingTimeToOtpTime( - Instant earliestBookingTime, - Instant dateTime, - ZoneId timeZone - ) { - LocalDate serviceDate = LocalDate.ofInstant(dateTime, timeZone); - ZonedDateTime startOfService = ServiceDateUtils.asStartOfService(serviceDate, timeZone); - return ServiceDateUtils.secondsSinceStartOfTime(startOfService, earliestBookingTime); - } -} diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index 8c0710d7db6..5b846fbc724 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.opentripplanner.raptor._data.RaptorTestConstants.BOARD_SLACK; +import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.time.Duration; import java.time.Instant; @@ -142,8 +143,14 @@ void penalty() { void createItineraryWithOnBoardFlexAccess() { RaptorPathToItineraryMapper mapper = getRaptorPathToItineraryMapper(); + var flexTrip = TEST_MODEL.unscheduledTrip( + id("flex"), + TEST_MODEL.stop("A:Stop:1").build(), + TEST_MODEL.stop("A:Stop:2").build() + ); + State state = TestStateBuilder.ofWalking().streetEdge().streetEdge().build(); - FlexAccessEgress flexAccessEgress = new FlexAccessEgress(S1, null, 0, 1, null, state, true); + FlexAccessEgress flexAccessEgress = new FlexAccessEgress(S1, null, 0, 1, flexTrip, state, true); RaptorAccessEgress access = new FlexAccessEgressAdapter(flexAccessEgress, false); Transfer transfer = new Transfer(S2.getIndex(), 0); RaptorTransfer raptorTransfer = new DefaultRaptorTransfer(S1.getIndex(), 0, 0, transfer); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java deleted file mode 100644 index a8bd64c552e..00000000000 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/OpeningHoursAdjusterTest.java +++ /dev/null @@ -1,281 +0,0 @@ -package org.opentripplanner.routing.algorithm.raptoradapter.transit; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.time.Duration; -import java.time.Instant; -import java.time.LocalDate; -import java.time.LocalDateTime; -import java.time.LocalTime; -import java.util.List; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.ext.flex.FlexAccessEgress; -import org.opentripplanner.ext.flex.FlexPathDurations; -import org.opentripplanner.ext.flex.trip.FlexTrip; -import org.opentripplanner.model.BookingInfoBuilder; -import org.opentripplanner.model.BookingTime; -import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.RoutingBookingInfo; -import org.opentripplanner.raptor.api.model.RaptorConstants; -import org.opentripplanner.street.search.state.State; -import org.opentripplanner.street.search.state.TestStateBuilder; -import org.opentripplanner.transit.model._data.TransitModelForTest; -import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.site.RegularStop; - -class OpeningHoursAdjusterTest { - - private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); - private static final RegularStop S1 = TEST_MODEL.stop("STOP1", 0.0, 0.0).build(); - private static final RegularStop S2 = TEST_MODEL.stop("STOP2", 1.0, 1.0).build(); - private static final FeedScopedId TRIP_ID = new FeedScopedId("FEED", "ID"); - private static final LocalDate REQUEST_DATE = LocalDate.of(2024, 1, 1); - private static final LocalDateTime REQUEST_DATE_TIME = REQUEST_DATE.atTime(8, 0, 0); - private static final Instant REQUEST_INSTANT = REQUEST_DATE_TIME.atZone(ZoneIds.UTC).toInstant(); - - private static final LocalDate REQUEST_DATE_DST_FORWARD = LocalDate.of(2024, 3, 31); - private static final LocalDateTime REQUEST_DATE_TIME_DST_FORWARD = REQUEST_DATE_DST_FORWARD.atTime( - 8, - 0, - 0 - ); - private static final Instant REQUEST_INSTANT_DST_FORWARD = REQUEST_DATE_TIME_DST_FORWARD - .atZone(ZoneIds.OSLO) - .toInstant(); - - private static final LocalDate REQUEST_DATE_DST_BACKWARD = LocalDate.of(2024, 10, 27); - private static final LocalDateTime REQUEST_DATE_TIME_DST_BACKWARD = REQUEST_DATE_DST_BACKWARD.atTime( - 8, - 0, - 0 - ); - private static final Instant REQUEST_INSTANT_DST_BACKWARD = REQUEST_DATE_TIME_DST_BACKWARD - .atZone(ZoneIds.OSLO) - .toInstant(); - - private static final RoutingBookingInfo BOOK_BEFORE_11_H_45 = new BookingInfoBuilder() - .withLatestBookingTime(new BookingTime(LocalTime.of(11, 45, 0), 0)) - .build(); - - private static final RoutingBookingInfo BOOK_BEFORE_21_H_00_PREVIOUS_DAY = new BookingInfoBuilder() - .withLatestBookingTime(new BookingTime(LocalTime.of(21, 0, 0), 1)) - .build(); - private static final RoutingBookingInfo BOOK_ONE_HOUR_BEFORE = new BookingInfoBuilder() - .withMinimumBookingNotice(Duration.ofHours(1)) - .build(); - public static final int SECONDS_IN_TWELVE_HOURS = 12 * 60 * 60; - - private FlexAccessEgressAdapter accessEgress; - private int defaultPickupTime; - - @BeforeEach - void setup() { - State state = TestStateBuilder.ofWalking().streetEdge().streetEdge().build(); - - StopTime stopTime1 = new StopTime(); - stopTime1.setStop(S1); - stopTime1.setFlexWindowStart(LocalTime.of(12, 12).toSecondOfDay()); - stopTime1.setFlexWindowEnd(LocalTime.of(14, 12).toSecondOfDay()); - StopTime stopTime2 = new StopTime(); - stopTime2.setStop(S2); - stopTime2.setFlexWindowStart(LocalTime.of(14, 11).toSecondOfDay()); - stopTime2.setFlexWindowEnd(LocalTime.of(14, 12).toSecondOfDay()); - - FlexTrip trip = TEST_MODEL.unscheduledTrip(TRIP_ID, List.of(stopTime1, stopTime2)); - FlexAccessEgress flexAccessEgress = new FlexAccessEgress( - S1, - new FlexPathDurations(0, 1165, 156, 0), - 0, - 1, - trip, - state, - true - ); - accessEgress = new FlexAccessEgressAdapter(flexAccessEgress, false); - defaultPickupTime = accessEgress.earliestDepartureTime(0); - } - - @Test - void testEarliestBookingTimeBeforeLatestBookingTime() { - Instant beforeLatestBookingTime = REQUEST_DATE - .atTime(BOOK_BEFORE_11_H_45.getLatestBookingTime().getTime().minusMinutes(1)) - .atZone(ZoneIds.UTC) - .toInstant(); - OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( - BOOK_BEFORE_11_H_45, - accessEgress, - beforeLatestBookingTime, - REQUEST_INSTANT, - ZoneIds.UTC - ); - assertEquals( - defaultPickupTime, - openingHoursAdjuster.earliestDepartureTime(0), - "When booking before the latest booking time, the default pick-up time is used" - ); - } - - @Test - void testEarliestBookingTimeBeforeLatestBookingTimeOnPreviousDay() { - Instant beforeLatestBookingTime = REQUEST_DATE - .minusDays(1) - .atTime(BOOK_BEFORE_21_H_00_PREVIOUS_DAY.getLatestBookingTime().getTime().minusMinutes(1)) - .atZone(ZoneIds.UTC) - .toInstant(); - OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( - BOOK_BEFORE_21_H_00_PREVIOUS_DAY, - accessEgress, - beforeLatestBookingTime, - REQUEST_INSTANT, - ZoneIds.UTC - ); - assertEquals( - defaultPickupTime, - openingHoursAdjuster.earliestDepartureTime(0), - "When booking before the latest booking time, the default pick-up time is used" - ); - } - - @Test - void testEarliestBookingTimeAfterLatestBookingTime() { - Instant afterLatestBookingTime = REQUEST_DATE - .atTime(BOOK_BEFORE_11_H_45.getLatestBookingTime().getTime().plusMinutes(1)) - .atZone(ZoneIds.UTC) - .toInstant(); - OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( - BOOK_BEFORE_11_H_45, - accessEgress, - afterLatestBookingTime, - REQUEST_INSTANT, - ZoneIds.UTC - ); - assertEquals( - RaptorConstants.TIME_NOT_SET, - openingHoursAdjuster.earliestDepartureTime(0), - "When booking after the latest booking time, the trip cannot be boarded" - ); - } - - @Test - void testEarliestBookingTimeAfterLatestBookingTimeOnPreviousDay() { - Instant afterLatestBookingTime = REQUEST_DATE - .minusDays(1) - .atTime(BOOK_BEFORE_21_H_00_PREVIOUS_DAY.getLatestBookingTime().getTime().plusMinutes(1)) - .atZone(ZoneIds.UTC) - .toInstant(); - OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( - BOOK_BEFORE_21_H_00_PREVIOUS_DAY, - accessEgress, - afterLatestBookingTime, - REQUEST_INSTANT, - ZoneIds.UTC - ); - assertEquals( - RaptorConstants.TIME_NOT_SET, - openingHoursAdjuster.earliestDepartureTime(0), - "When booking after the latest booking time, the trip cannot be boarded" - ); - } - - @Test - void testEarliestBookingTimeBeforeMinimumBookingNotice() { - Instant beforeMinimumBookingNotice = REQUEST_DATE - .atTime( - LocalTime - .ofSecondOfDay(defaultPickupTime) - .minus(BOOK_ONE_HOUR_BEFORE.getMinimumBookingNotice()) - .minusMinutes(1) - ) - .atZone(ZoneIds.UTC) - .toInstant(); - OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( - BOOK_ONE_HOUR_BEFORE, - accessEgress, - beforeMinimumBookingNotice, - REQUEST_INSTANT, - ZoneIds.UTC - ); - assertEquals( - defaultPickupTime, - openingHoursAdjuster.earliestDepartureTime(0), - "When booking before the minimum booking notice, the default pick-up time is used" - ); - } - - @Test - void testEarliestBookingTimeAfterMinimumBookingNotice() { - Instant afterMinimumBookingNotice = REQUEST_DATE - .atTime( - LocalTime - .ofSecondOfDay(defaultPickupTime) - .minus(BOOK_ONE_HOUR_BEFORE.getMinimumBookingNotice()) - .plusMinutes(2) - ) - .atZone(ZoneIds.UTC) - .toInstant(); - OpeningHoursAdjuster openingHoursAdjuster = new OpeningHoursAdjuster( - BOOK_ONE_HOUR_BEFORE, - accessEgress, - afterMinimumBookingNotice, - REQUEST_INSTANT, - ZoneIds.UTC - ); - assertEquals( - RaptorConstants.TIME_NOT_SET, - openingHoursAdjuster.earliestDepartureTime(0), - "When booking after the minimum booking notice, the trip cannot be boarded" - ); - } - - @Test - void testConvertEarliestBookingTimeToOtpTimeOnNormalDate() { - // 12:00:00 on 2024-01-01 in Oslo occurs 12 hours after 00:00:00 - Instant earliestBookingTime = REQUEST_DATE.atTime(12, 0, 0).atZone(ZoneIds.OSLO).toInstant(); - assertEquals( - SECONDS_IN_TWELVE_HOURS, - OpeningHoursAdjuster.convertEarliestBookingTimeToOtpTime( - earliestBookingTime, - REQUEST_INSTANT, - ZoneIds.OSLO - ) - ); - } - - @Test - void testConvertEarliestBookingTimeToOtpTimeOnDSTForward() { - // 12:00:00 on 2024-03-31 in Oslo occurs 11 hours after 00:00:00 - // OTP time starts at 23:00:00 on 2024-03-30 - Instant earliestBookingTime = REQUEST_DATE_DST_FORWARD - .atTime(12, 0, 0) - .atZone(ZoneIds.OSLO) - .toInstant(); - assertEquals( - SECONDS_IN_TWELVE_HOURS, - OpeningHoursAdjuster.convertEarliestBookingTimeToOtpTime( - earliestBookingTime, - REQUEST_INSTANT_DST_FORWARD, - ZoneIds.OSLO - ) - ); - } - - @Test - void testConvertEarliestBookingTimeToOtpTimeOnDSTBackward() { - // 12:00:00 on 2024-10-27 in Oslo occurs 13 hours after 00:00:00 - // OTP time starts at 01:00:00 on 2024-10-27 - Instant earliestBookingTime = REQUEST_DATE_DST_FORWARD - .atTime(12, 0, 0) - .atZone(ZoneIds.OSLO) - .toInstant(); - assertEquals( - SECONDS_IN_TWELVE_HOURS, - OpeningHoursAdjuster.convertEarliestBookingTimeToOtpTime( - earliestBookingTime, - REQUEST_INSTANT_DST_FORWARD, - ZoneIds.OSLO - ) - ); - } -} From d49f8210ad6a3c1fc8f5a12c575d102622765917 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 22:46:06 +0200 Subject: [PATCH 1039/1688] refactor: move booking classes to booking package --- .../ext/flex/FlexibleTransitLeg.java | 2 +- .../ext/flex/trip/FlexTrip.java | 2 +- .../ext/flex/trip/ScheduledDeviatedTrip.java | 2 +- .../ext/flex/trip/UnscheduledTrip.java | 2 +- .../restapi/mapping/BookingInfoMapper.java | 2 +- .../restapi/mapping/BookingMethodMapper.java | 2 +- .../restapi/mapping/BookingTimeMapper.java | 2 +- .../gtfs/datafetchers/BookingInfoImpl.java | 4 +- .../gtfs/datafetchers/BookingTimeImpl.java | 2 +- .../apis/gtfs/datafetchers/LegImpl.java | 2 +- .../gtfs/generated/GraphQLDataFetchers.java | 10 ++-- .../apis/gtfs/generated/graphql-codegen.yml | 4 +- .../apis/transmodel/model/EnumTypes.java | 2 +- .../timetable/BookingArrangementType.java | 4 +- .../gtfs/mapping/BookingRuleMapper.java | 10 ++-- .../org/opentripplanner/model/StopTime.java | 1 + .../opentripplanner/model/TripTimeOnDate.java | 1 + .../model/{ => booking}/BookingInfo.java | 58 +++++++++++-------- .../{ => booking}/BookingInfoBuilder.java | 34 +++++------ .../model/{ => booking}/BookingMethod.java | 2 +- .../model/{ => booking}/BookingTime.java | 9 +-- .../model/booking/RoutingBookingInfo.java | 2 +- .../org/opentripplanner/model/plan/Leg.java | 2 +- .../model/plan/ScheduledTransitLeg.java | 2 +- .../netex/mapping/BookingInfoMapper.java | 10 ++-- .../netex/mapping/BookingMethodMapper.java | 2 +- .../netex/mapping/StopTimesMapper.java | 2 +- .../model/timetable/RealTimeTripTimes.java | 2 +- .../model/timetable/ScheduledTripTimes.java | 2 +- .../timetable/ScheduledTripTimesBuilder.java | 2 +- .../StopTimeToScheduledTripTimesMapper.java | 2 +- .../transit/model/timetable/TripTimes.java | 2 +- .../netex/mapping/BookingInfoMapperTest.java | 2 +- 33 files changed, 95 insertions(+), 94 deletions(-) rename src/main/java/org/opentripplanner/model/{ => booking}/BookingInfo.java (74%) rename src/main/java/org/opentripplanner/model/{ => booking}/BookingInfoBuilder.java (70%) rename src/main/java/org/opentripplanner/model/{ => booking}/BookingMethod.java (70%) rename src/main/java/org/opentripplanner/model/{ => booking}/BookingTime.java (84%) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index fac1118556f..f6a32e696a1 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -12,8 +12,8 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.LegTime; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index f12ce78d06d..5a3fda26ee8 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -9,9 +9,9 @@ import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index e16e1e5e1f7..f49df35791c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -19,9 +19,9 @@ import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index c5968507676..c168510bb30 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -18,9 +18,9 @@ import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.framework.lang.IntRange; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java index 4aa8b4a46b1..168207b5c3a 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.ext.restapi.model.ApiBookingInfo; -import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.booking.BookingInfo; public class BookingInfoMapper { diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java index 9b61ff39543..6656053908e 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java @@ -3,7 +3,7 @@ import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.model.BookingMethod; +import org.opentripplanner.model.booking.BookingMethod; public class BookingMethodMapper { diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java index e40309e9137..978816be8c2 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.ext.restapi.model.ApiBookingTime; -import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.booking.BookingTime; public class BookingTimeMapper { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java index 9ba2c21f62d..ab416110ee0 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java @@ -3,8 +3,8 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.model.BookingInfo; -import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; public class BookingInfoImpl implements GraphQLDataFetchers.GraphQLBookingInfo { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java index 8c6e581eba4..937c2c9b9ee 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java @@ -4,7 +4,7 @@ import graphql.schema.DataFetchingEnvironment; import java.time.format.DateTimeFormatter; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.booking.BookingTime; public class BookingTimeImpl implements GraphQLDataFetchers.GraphQLBookingTime { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index 975d8d56831..ba71a603a4f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -14,8 +14,8 @@ import org.opentripplanner.ext.ridehailing.model.RideEstimate; import org.opentripplanner.ext.ridehailing.model.RideHailingLeg; import org.opentripplanner.framework.graphql.GraphQLUtils; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.LegTime; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 559acac920d..195706de84c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -28,6 +28,8 @@ import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.TripTimeOnDate; +import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.model.calendar.openinghours.OHCalendar; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; @@ -210,9 +212,9 @@ public interface GraphQLBookingInfo { public DataFetcher dropOffMessage(); - public DataFetcher earliestBookingTime(); + public DataFetcher earliestBookingTime(); - public DataFetcher latestBookingTime(); + public DataFetcher latestBookingTime(); public DataFetcher maximumBookingNoticeSeconds(); @@ -439,7 +441,7 @@ public interface GraphQLLeg { public DataFetcher distance(); - public DataFetcher dropOffBookingInfo(); + public DataFetcher dropOffBookingInfo(); public DataFetcher dropoffType(); @@ -471,7 +473,7 @@ public interface GraphQLLeg { public DataFetcher> nextLegs(); - public DataFetcher pickupBookingInfo(); + public DataFetcher pickupBookingInfo(); public DataFetcher pickupType(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 55f76863cc6..6578657feb2 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -45,8 +45,8 @@ config: RentalVehicle: org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle#VehicleRentalVehicle VehicleRentalUris: org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris#VehicleRentalStationUris BikesAllowed: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed#GraphQLBikesAllowed - BookingInfo: org.opentripplanner.model.BookingInfo - BookingTime: org.opentripplanner.model.BookingTime + BookingInfo: org.opentripplanner.model.booking.BookingInfo + BookingTime: org.opentripplanner.model.booking.BookingTime CarPark: org.opentripplanner.routing.vehicle_parking.VehicleParking#VehicleParking ContactInfo: org.opentripplanner.transit.model.organization.ContactInfo Cluster: Object diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java index b85d4ce19b9..28312e85a34 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.function.Function; import org.opentripplanner.framework.doc.DocumentedEnum; -import org.opentripplanner.model.BookingMethod; +import org.opentripplanner.model.booking.BookingMethod; import org.opentripplanner.model.plan.AbsoluteDirection; import org.opentripplanner.model.plan.RelativeDirection; import org.opentripplanner.model.plan.VertexType; diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java index c2a11441695..75098696143 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java @@ -8,8 +8,8 @@ import graphql.schema.GraphQLOutputType; import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.model.BookingInfo; -import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; public class BookingArrangementType { diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java index fee935fb15e..84d3c417722 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java @@ -7,10 +7,9 @@ import java.util.Map; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.BookingRule; -import org.opentripplanner.model.BookingInfo; -import org.opentripplanner.model.BookingInfoBuilder; -import org.opentripplanner.model.BookingMethod; -import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.model.booking.BookingMethod; +import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; /** Responsible for mapping GTFS BookingRule into the OTP model. */ @@ -27,7 +26,8 @@ BookingInfo map(BookingRule rule) { return cachedBookingInfos.computeIfAbsent( rule.getId(), k -> - new BookingInfoBuilder() + BookingInfo + .of() .withContactInfo(contactInfo(rule)) .withBookingMethods(bookingMethods()) .withEarliestBookingTime(earliestBookingTime(rule)) diff --git a/src/main/java/org/opentripplanner/model/StopTime.java b/src/main/java/org/opentripplanner/model/StopTime.java index 2ae04484426..a4576461399 100644 --- a/src/main/java/org/opentripplanner/model/StopTime.java +++ b/src/main/java/org/opentripplanner/model/StopTime.java @@ -4,6 +4,7 @@ import java.util.List; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.StopTimeKey; import org.opentripplanner.transit.model.timetable.Trip; diff --git a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 9ba85d6b532..97f216becd5 100644 --- a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -6,6 +6,7 @@ import java.util.Comparator; import java.util.List; import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; diff --git a/src/main/java/org/opentripplanner/model/BookingInfo.java b/src/main/java/org/opentripplanner/model/booking/BookingInfo.java similarity index 74% rename from src/main/java/org/opentripplanner/model/BookingInfo.java rename to src/main/java/org/opentripplanner/model/booking/BookingInfo.java index a9e84f40008..cbf43fd04ee 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfo.java +++ b/src/main/java/org/opentripplanner/model/booking/BookingInfo.java @@ -1,11 +1,11 @@ -package org.opentripplanner.model; +package org.opentripplanner.model.booking; import java.io.Serializable; import java.time.Duration; import java.util.EnumSet; import java.util.Optional; import javax.annotation.Nullable; -import org.opentripplanner.model.booking.RoutingBookingInfo; +import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.organization.ContactInfo; /** @@ -51,35 +51,25 @@ public class BookingInfo implements Serializable { @Nullable private final String dropOffMessage; - BookingInfo( - ContactInfo contactInfo, - EnumSet bookingMethods, - BookingTime earliestBookingTime, - @Nullable BookingTime latestBookingTime, - @Nullable Duration minimumBookingNotice, - Duration maximumBookingNotice, - String message, - String pickupMessage, - String dropOffMessage - ) { - this.contactInfo = contactInfo; - this.bookingMethods = bookingMethods; - this.message = message; - this.pickupMessage = pickupMessage; - this.dropOffMessage = dropOffMessage; + BookingInfo(BookingInfoBuilder builder) { + this.contactInfo = builder.contactInfo; + this.bookingMethods = builder.bookingMethods; + this.message = builder.message; + this.pickupMessage = builder.pickupMessage; + this.dropOffMessage = builder.dropOffMessage; // Ensure that earliestBookingTime/latestBookingTime is not set at the same time as // minimumBookingNotice/maximumBookingNotice - if (earliestBookingTime != null || latestBookingTime != null) { - this.earliestBookingTime = earliestBookingTime; - this.latestBookingTime = latestBookingTime; + if (builder.earliestBookingTime != null || builder.latestBookingTime != null) { + this.earliestBookingTime = builder.earliestBookingTime; + this.latestBookingTime = builder.latestBookingTime; this.minimumBookingNotice = null; this.maximumBookingNotice = null; - } else if (minimumBookingNotice != null || maximumBookingNotice != null) { + } else if (builder.minimumBookingNotice != null || builder.maximumBookingNotice != null) { this.earliestBookingTime = null; this.latestBookingTime = null; - this.minimumBookingNotice = minimumBookingNotice; - this.maximumBookingNotice = maximumBookingNotice; + this.minimumBookingNotice = builder.minimumBookingNotice; + this.maximumBookingNotice = builder.maximumBookingNotice; } else { this.earliestBookingTime = null; this.latestBookingTime = null; @@ -88,6 +78,10 @@ public class BookingInfo implements Serializable { } } + public static BookingInfoBuilder of() { + return new BookingInfoBuilder(); + } + public ContactInfo getContactInfo() { return contactInfo; } @@ -163,4 +157,20 @@ public Optional createRoutingBookingInfo(int flexTripAccessT } return Optional.of(builder.build()); } + + @Override + public String toString() { + return ToStringBuilder + .of(BookingInfo.class) + .addObj("cntactInfo", contactInfo) + .addObj("bookingMethods", bookingMethods) + .addObj("earliestBookingTime", earliestBookingTime) + .addObj("latestBookingTime", latestBookingTime) + .addDuration("minimumBookingNotice", minimumBookingNotice) + .addDuration("maximumBookingNotice", maximumBookingNotice) + .addStr("message", message) + .addStr("pickupMessage", pickupMessage) + .addStr("dropOffMessage", dropOffMessage) + .toString(); + } } diff --git a/src/main/java/org/opentripplanner/model/BookingInfoBuilder.java b/src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java similarity index 70% rename from src/main/java/org/opentripplanner/model/BookingInfoBuilder.java rename to src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java index 0205063ae0d..49cdc82b77f 100644 --- a/src/main/java/org/opentripplanner/model/BookingInfoBuilder.java +++ b/src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model; +package org.opentripplanner.model.booking; import java.time.Duration; import java.util.EnumSet; @@ -6,15 +6,17 @@ public class BookingInfoBuilder { - private ContactInfo contactInfo; - private EnumSet bookingMethods; - private BookingTime earliestBookingTime; - private BookingTime latestBookingTime; - private Duration minimumBookingNotice; - private Duration maximumBookingNotice; - private String message; - private String pickupMessage; - private String dropOffMessage; + ContactInfo contactInfo; + EnumSet bookingMethods; + BookingTime earliestBookingTime; + BookingTime latestBookingTime; + Duration minimumBookingNotice; + Duration maximumBookingNotice; + String message; + String pickupMessage; + String dropOffMessage; + + BookingInfoBuilder() {} public BookingInfoBuilder withContactInfo(ContactInfo contactInfo) { this.contactInfo = contactInfo; @@ -62,16 +64,6 @@ public BookingInfoBuilder withDropOffMessage(String dropOffMessage) { } public BookingInfo build() { - return new BookingInfo( - contactInfo, - bookingMethods, - earliestBookingTime, - latestBookingTime, - minimumBookingNotice, - maximumBookingNotice, - message, - pickupMessage, - dropOffMessage - ); + return new BookingInfo(this); } } diff --git a/src/main/java/org/opentripplanner/model/BookingMethod.java b/src/main/java/org/opentripplanner/model/booking/BookingMethod.java similarity index 70% rename from src/main/java/org/opentripplanner/model/BookingMethod.java rename to src/main/java/org/opentripplanner/model/booking/BookingMethod.java index ac788ec8741..67e0a507915 100644 --- a/src/main/java/org/opentripplanner/model/BookingMethod.java +++ b/src/main/java/org/opentripplanner/model/booking/BookingMethod.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model; +package org.opentripplanner.model.booking; public enum BookingMethod { CALL_DRIVER, diff --git a/src/main/java/org/opentripplanner/model/BookingTime.java b/src/main/java/org/opentripplanner/model/booking/BookingTime.java similarity index 84% rename from src/main/java/org/opentripplanner/model/BookingTime.java rename to src/main/java/org/opentripplanner/model/booking/BookingTime.java index be6ed4105f8..bed51fd22ed 100644 --- a/src/main/java/org/opentripplanner/model/BookingTime.java +++ b/src/main/java/org/opentripplanner/model/booking/BookingTime.java @@ -1,10 +1,9 @@ -package org.opentripplanner.model; +package org.opentripplanner.model.booking; import java.io.Serializable; import java.time.LocalTime; import java.util.Objects; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; /** * Represents either an earliest or latest time a trip can be booked relative to the departure day @@ -56,10 +55,6 @@ public int hashCode() { @Override public String toString() { - return ToStringBuilder - .of(BookingTime.class) - .addObj("time", time) - .addNum("daysPrior", daysPrior, 0) - .toString(); + return daysPrior == 0 ? time.toString() : time.toString() + "-" + daysPrior + "d"; } } diff --git a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java index 67076242369..a72e6c72748 100644 --- a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java +++ b/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java @@ -36,7 +36,7 @@ public static RoutingBookingInfo.Builder of() { /** * Check if requested board-time can be booked according to the booking info rules. See - * {@link org.opentripplanner.model.BookingInfo}. + * {@link BookingInfo}. *

      * If not the case, the RaptorConstants.TIME_NOT_SET is returned. */ diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 5a032def979..4340b8b6f25 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -11,8 +11,8 @@ import org.locationtech.jts.geom.LineString; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.lang.Sandbox; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.transfer.ConstrainedTransfer; diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 6bf39d5aa4c..8325083dfc8 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -20,8 +20,8 @@ import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.plan.legreference.ScheduledTransitLegReference; diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java index b02ea7650c5..3a0e10f57ca 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java @@ -9,10 +9,9 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.BookingInfo; -import org.opentripplanner.model.BookingInfoBuilder; -import org.opentripplanner.model.BookingMethod; -import org.opentripplanner.model.BookingTime; +import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.model.booking.BookingMethod; +import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; import org.rutebanken.netex.model.BookingArrangementsStructure; import org.rutebanken.netex.model.BookingMethodEnumeration; @@ -221,7 +220,8 @@ private BookingInfo build( } String bookingInfoMessage = bookingNote != null ? bookingNote.getValue() : null; - return new BookingInfoBuilder() + return BookingInfo + .of() .withContactInfo(contactInfo) .withBookingMethods(filteredBookingMethods) .withEarliestBookingTime(otpEarliestBookingTime) diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java index 6514667598b..f48d618d38a 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.netex.mapping; -import org.opentripplanner.model.BookingMethod; +import org.opentripplanner.model.booking.BookingMethod; import org.rutebanken.netex.model.BookingMethodEnumeration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java b/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java index 06de1623337..b2350690cbf 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java @@ -15,8 +15,8 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMapById; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java index a62da95e79a..e1a9c360f5d 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java @@ -10,7 +10,7 @@ import java.util.function.IntUnaryOperator; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.framework.DataValidationException; diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java index ff3f61394ae..263c63621fb 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java @@ -16,7 +16,7 @@ import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java index 0eee5d3e183..304e32d2045 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.framework.DeduplicatorService; public class ScheduledTripTimesBuilder { diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java b/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java index bd21905f7d1..c064b9bc2ff 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java @@ -5,8 +5,8 @@ import java.util.Collection; import java.util.List; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.framework.DeduplicatorService; class StopTimeToScheduledTripTimesMapper { diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java index 7bf1a826c1c..be726c53fd2 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java @@ -7,7 +7,7 @@ import java.util.OptionalInt; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; /** diff --git a/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java index b69cb2e9bad..646d169f611 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java @@ -7,7 +7,7 @@ import java.time.LocalTime; import org.junit.jupiter.api.Test; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.BookingInfo; +import org.opentripplanner.model.booking.BookingInfo; import org.rutebanken.netex.model.BookingArrangementsStructure; import org.rutebanken.netex.model.ContactStructure; import org.rutebanken.netex.model.FlexibleLine; From c69494affb477c3679b97aa5f18808cca033ee40 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 22:46:27 +0200 Subject: [PATCH 1040/1688] test: Add unit test to booking package --- .../model/booking/BookingInfoTest.java | 78 ++++++++++ .../model/booking/BookingTimeTest.java | 53 +++++++ .../model/booking/RoutingBookingInfoTest.java | 136 ++++++++++++++++++ 3 files changed, 267 insertions(+) create mode 100644 src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java create mode 100644 src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java create mode 100644 src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java diff --git a/src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java b/src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java new file mode 100644 index 00000000000..a5b45e7a84c --- /dev/null +++ b/src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java @@ -0,0 +1,78 @@ +package org.opentripplanner.model.booking; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.time.Duration; +import java.time.LocalTime; +import java.util.EnumSet; +import org.junit.jupiter.api.Test; +import org.opentripplanner.transit.model.organization.ContactInfo; + +class BookingInfoTest { + + public static final String URL = "http://booking.otp.org"; + public static final ContactInfo CONTACT = ContactInfo + .of() + .withBookingUrl(URL) + .withContactPerson("Jo Contact") + .build(); + public static final EnumSet BOOKING_METHODS = EnumSet.of( + BookingMethod.CALL_DRIVER + ); + public static final BookingTime BOOKING_TIME_NOON = new BookingTime(LocalTime.NOON, 0); + + @Test + void testBookingInfoWithLatestBookingTime() { + var subject = BookingInfo + .of() + .withContactInfo(CONTACT) + .withBookingMethods(BOOKING_METHODS) + .withLatestBookingTime(BOOKING_TIME_NOON) + .withMessage("message") + .withPickupMessage("pickup") + .withDropOffMessage("dropoff") + .build(); + + assertEquals(CONTACT, subject.getContactInfo()); + assertEquals(BOOKING_METHODS, subject.bookingMethods()); + assertNull(subject.getEarliestBookingTime()); + assertEquals(BOOKING_TIME_NOON, subject.getLatestBookingTime()); + assertEquals("message", subject.getMessage()); + assertEquals("pickup", subject.getPickupMessage()); + assertEquals("dropoff", subject.getDropOffMessage()); + + assertEquals( + "BookingInfo{cntactInfo: ContactInfo{contactPerson: 'Jo Contact', bookingUrl: 'http://booking.otp.org'}, bookingMethods: [CALL_DRIVER], latestBookingTime: 12:00, message: 'message', pickupMessage: 'pickup', dropOffMessage: 'dropoff'}", + subject.toString() + ); + + assertEquals( + "Optional[RoutingBookingInfo{latestBookingTime: 12:00}]", + subject.createRoutingBookingInfo(45).toString() + ); + } + + @Test + void testBookingInfoWithMinBookingNotice() { + Duration minimumBookingNotice = Duration.ofMinutes(45); + var subject = BookingInfo + .of() + .withBookingMethods(BOOKING_METHODS) + .withMinimumBookingNotice(minimumBookingNotice) + .build(); + + assertNull(subject.getLatestBookingTime()); + assertEquals(minimumBookingNotice, subject.getMinimumBookingNotice()); + + assertEquals( + "BookingInfo{bookingMethods: [CALL_DRIVER], minimumBookingNotice: 45m}", + subject.toString() + ); + + assertEquals( + "Optional[RoutingBookingInfo{minimumBookingNotice: 44m15s}]", + subject.createRoutingBookingInfo(45).toString() + ); + } +} diff --git a/src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java b/src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java new file mode 100644 index 00000000000..bde2eb34a99 --- /dev/null +++ b/src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java @@ -0,0 +1,53 @@ +package org.opentripplanner.model.booking; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotEquals; + +import java.time.LocalTime; +import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.time.TimeUtils; + +class BookingTimeTest { + + BookingTime noon = new BookingTime(LocalTime.NOON, 0); + BookingTime noonYesterday = new BookingTime(LocalTime.NOON, 1); + BookingTime midnight = new BookingTime(LocalTime.MIDNIGHT, 0); + BookingTime noon2 = new BookingTime(LocalTime.NOON, 0); + + @Test + void equalsAndHashCode() { + assertEquals(noon, noon); + assertEquals(noon, noon2); + assertNotEquals(noon, noonYesterday); + assertNotEquals(noon, midnight); + + assertEquals(noon.hashCode(), noon.hashCode()); + assertEquals(noon.hashCode(), noon2.hashCode()); + assertNotEquals(noon.hashCode(), noonYesterday.hashCode()); + assertNotEquals(noon.hashCode(), midnight.hashCode()); + } + + @Test + void getTime() { + assertEquals(noon.getTime(), LocalTime.NOON); + } + + @Test + void testToString() { + assertEquals("12:00", noon.toString()); + assertEquals("12:00-1d", noonYesterday.toString()); + } + + @Test + void getDaysPrior() { + assertEquals(noon.getDaysPrior(), 0); + assertEquals(noonYesterday.getDaysPrior(), 1); + } + + @Test + void relativeTimeSeconds() { + assertEquals(midnight.relativeTimeSeconds(), 0); + assertEquals(noon.relativeTimeSeconds(), TimeUtils.ONE_DAY_SECONDS / 2); + assertEquals(noonYesterday.relativeTimeSeconds(), -TimeUtils.ONE_DAY_SECONDS / 2); + } +} diff --git a/src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java b/src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java new file mode 100644 index 00000000000..2bdcd53f757 --- /dev/null +++ b/src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java @@ -0,0 +1,136 @@ +package org.opentripplanner.model.booking; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.model.booking.RoutingBookingInfoTest.Expected.LATEST_BOOKING_TIME; +import static org.opentripplanner.model.booking.RoutingBookingInfoTest.Expected.MIN_BOOKING_NOTICE; + +import java.time.LocalTime; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.framework.time.DurationUtils; + +class RoutingBookingInfoTest { + + private static final int MINIMUM_BOOKING_NOTICE_20m = DurationUtils.durationInSeconds("20m"); + private static final LocalTime T13_20 = LocalTime.of(13, 20); + private static final LocalTime T13_00 = LocalTime.of(13, 0); + private static final LocalTime T14_00 = LocalTime.of(14, 0); + private static final LocalTime LATEST_BOOKING_TIME_13_00 = T13_00; + + // NeTEx does not support booking notice and latest booking time, but there is no conflict + // between these parameters. To make sure we support all combinations, we create all 3: + private final RoutingBookingInfo subjectBoth = RoutingBookingInfo + .of() + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) + .build(); + + private final RoutingBookingInfo subjectMinBookingNotice = RoutingBookingInfo + .of() + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .build(); + + private final RoutingBookingInfo subjectLatestBookingTime = RoutingBookingInfo + .of() + .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) + .build(); + + static List testCase() { + // BOARD-TIME | REQUESTED-BOOKING-TIME | EXPECTED + List arguments = List.of( + // Test min-booking-notice <= 13:40 (14:00-20m) + Arguments.of(T14_00, LocalTime.of(13, 39, 59), MIN_BOOKING_NOTICE), + Arguments.of(T14_00, LocalTime.of(13, 40, 0), MIN_BOOKING_NOTICE), + Arguments.of(T14_00, LocalTime.of(13, 40, 1), Expected.NONE), + // Test latest-booking-time <= 13_00 + Arguments.of(T13_00, LocalTime.of(12, 59, 59), LATEST_BOOKING_TIME), + Arguments.of(T13_00, LocalTime.of(13, 0, 0), LATEST_BOOKING_TIME), + Arguments.of(T13_00, LocalTime.of(13, 0, 1), Expected.NONE), + // Combination of both + Arguments.of(T13_20, LocalTime.of(13, 0, 0), Expected.BOTH) + ); + return arguments; + } + + @ParameterizedTest + @MethodSource("testCase") + void isThereEnoughTimeToBookWithMinBookingTime( + LocalTime searchTime, + LocalTime requestedBookingTime, + Expected expected + ) { + int searchTimeSec = searchTime.toSecondOfDay(); + int reqBookingTime = requestedBookingTime.toSecondOfDay(); + + assertEquals( + expected.minBookingNotice, + subjectMinBookingNotice.isThereEnoughTimeToBook(searchTimeSec, reqBookingTime) + ); + } + + @ParameterizedTest + @MethodSource("testCase") + void isThereEnoughTimeToBookWithLatestBookingTime( + LocalTime searchTime, + LocalTime requestedBookingTime, + Expected expected + ) { + int searchTimeSec = searchTime.toSecondOfDay(); + int reqBookingTime = requestedBookingTime.toSecondOfDay(); + + assertEquals( + expected.latestBookingTime, + subjectLatestBookingTime.isThereEnoughTimeToBook(searchTimeSec, reqBookingTime) + ); + } + + @ParameterizedTest + @MethodSource("testCase") + void isThereEnoughTimeToBookUsingBoth( + LocalTime searchTime, + LocalTime requestedBookingTime, + Expected expected + ) { + int searchTimeSec = searchTime.toSecondOfDay(); + int reqBookingTime = requestedBookingTime.toSecondOfDay(); + + assertEquals( + expected == Expected.BOTH, + subjectBoth.isThereEnoughTimeToBook(searchTimeSec, reqBookingTime) + ); + } + + @Test + void testToString() { + assertEquals( + "RoutingBookingInfo{minimumBookingNotice: 20m}", + subjectMinBookingNotice.toString() + ); + assertEquals( + "RoutingBookingInfo{latestBookingTime: 13:00}", + subjectLatestBookingTime.toString() + ); + assertEquals( + "RoutingBookingInfo{latestBookingTime: 13:00, minimumBookingNotice: 20m}", + subjectBoth.toString() + ); + } + + enum Expected { + NONE(false, false), + MIN_BOOKING_NOTICE(true, false), + LATEST_BOOKING_TIME(false, true), + BOTH(true, true); + + boolean minBookingNotice; + boolean latestBookingTime; + + Expected(boolean minBookingNotice, boolean latestBookingTime) { + this.minBookingNotice = minBookingNotice; + this.latestBookingTime = latestBookingTime; + } + } +} From 5c94c242290e344c8677ff14f03552443f70f6e3 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 29 Apr 2024 23:04:18 +0200 Subject: [PATCH 1041/1688] refactor: move booking classes into transit.model.timetable.booking --- .../java/org/opentripplanner/ext/flex/FlexAccessEgress.java | 2 +- .../org/opentripplanner/ext/flex/FlexibleTransitLeg.java | 2 +- .../java/org/opentripplanner/ext/flex/trip/FlexTrip.java | 2 +- .../ext/flex/trip/ScheduledDeviatedTrip.java | 2 +- .../org/opentripplanner/ext/flex/trip/UnscheduledTrip.java | 2 +- .../ext/restapi/mapping/BookingInfoMapper.java | 2 +- .../ext/restapi/mapping/BookingMethodMapper.java | 2 +- .../ext/restapi/mapping/BookingTimeMapper.java | 2 +- .../apis/gtfs/datafetchers/BookingInfoImpl.java | 4 ++-- .../apis/gtfs/datafetchers/BookingTimeImpl.java | 2 +- .../org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java | 2 +- .../apis/gtfs/generated/GraphQLDataFetchers.java | 4 ++-- .../opentripplanner/apis/gtfs/generated/graphql-codegen.yml | 4 ++-- .../opentripplanner/apis/transmodel/model/EnumTypes.java | 2 +- .../transmodel/model/timetable/BookingArrangementType.java | 4 ++-- .../org/opentripplanner/gtfs/mapping/BookingRuleMapper.java | 6 +++--- src/main/java/org/opentripplanner/model/StopTime.java | 2 +- src/main/java/org/opentripplanner/model/TripTimeOnDate.java | 2 +- src/main/java/org/opentripplanner/model/plan/Leg.java | 2 +- .../org/opentripplanner/model/plan/ScheduledTransitLeg.java | 2 +- .../opentripplanner/netex/mapping/BookingInfoMapper.java | 6 +++--- .../opentripplanner/netex/mapping/BookingMethodMapper.java | 2 +- .../org/opentripplanner/netex/mapping/StopTimesMapper.java | 2 +- .../raptoradapter/transit/BookingTimeAccessEgress.java | 2 +- .../raptoradapter/transit/FlexAccessEgressAdapter.java | 2 +- .../raptoradapter/transit/RoutingAccessEgress.java | 2 +- .../transit/model/timetable/RealTimeTripTimes.java | 2 +- .../transit/model/timetable/ScheduledTripTimes.java | 2 +- .../transit/model/timetable/ScheduledTripTimesBuilder.java | 2 +- .../model/timetable/StopTimeToScheduledTripTimesMapper.java | 2 +- .../opentripplanner/transit/model/timetable/TripTimes.java | 2 +- .../model/timetable}/booking/BookingInfo.java | 2 +- .../model/timetable}/booking/BookingInfoBuilder.java | 2 +- .../model/timetable}/booking/BookingMethod.java | 2 +- .../model/timetable}/booking/BookingTime.java | 2 +- .../model/timetable}/booking/RoutingBookingInfo.java | 2 +- .../netex/mapping/BookingInfoMapperTest.java | 2 +- .../transit/model/TransitModelArchitectureTest.java | 2 ++ .../model/timetable}/booking/BookingInfoTest.java | 2 +- .../model/timetable}/booking/BookingTimeTest.java | 2 +- .../model/timetable}/booking/RoutingBookingInfoTest.java | 6 +++--- 41 files changed, 52 insertions(+), 50 deletions(-) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingInfo.java (98%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingInfoBuilder.java (96%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingMethod.java (63%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingTime.java (95%) rename src/main/java/org/opentripplanner/{model => transit/model/timetable}/booking/RoutingBookingInfo.java (98%) rename src/test/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingInfoTest.java (97%) rename src/test/java/org/opentripplanner/{model => transit/model/timetable}/booking/BookingTimeTest.java (96%) rename src/test/java/org/opentripplanner/{model => transit/model/timetable}/booking/RoutingBookingInfoTest.java (93%) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index 2a537e48340..7190749d38e 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -7,9 +7,9 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.tostring.ToStringBuilder; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; public final class FlexAccessEgress { diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index f6a32e696a1..95c9e8fecd4 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -13,7 +13,6 @@ import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.LegTime; @@ -28,6 +27,7 @@ import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.organization.Operator; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index 5a3fda26ee8..ace9de22655 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -11,7 +11,6 @@ import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; @@ -19,6 +18,7 @@ import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * This class represents the different variations of what is considered flexible transit, and its diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index f49df35791c..0f4c513a59a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -21,7 +21,6 @@ import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -29,6 +28,7 @@ import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * A scheduled deviated trip is similar to a regular scheduled trip, except that it contains stop diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index c168510bb30..26006c91e3a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -20,13 +20,13 @@ import org.opentripplanner.framework.lang.IntRange; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.TransitBuilder; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * This type of FlexTrip is used when a taxi-type service is modeled, which operates in any number diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java index 168207b5c3a..008ae2ec202 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.ext.restapi.model.ApiBookingInfo; -import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; public class BookingInfoMapper { diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java index 6656053908e..0ab743e1cb2 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingMethodMapper.java @@ -3,7 +3,7 @@ import java.util.EnumSet; import java.util.Set; import java.util.stream.Collectors; -import org.opentripplanner.model.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; public class BookingMethodMapper { diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java index 978816be8c2..8b3034532fc 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingTimeMapper.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.restapi.mapping; import org.opentripplanner.ext.restapi.model.ApiBookingTime; -import org.opentripplanner.model.booking.BookingTime; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingTimeMapper { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java index ab416110ee0..44ee0985542 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingInfoImpl.java @@ -3,9 +3,9 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingInfoImpl implements GraphQLDataFetchers.GraphQLBookingInfo { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java index 937c2c9b9ee..9d6cd00642d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/BookingTimeImpl.java @@ -4,7 +4,7 @@ import graphql.schema.DataFetchingEnvironment; import java.time.format.DateTimeFormatter; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; -import org.opentripplanner.model.booking.BookingTime; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingTimeImpl implements GraphQLDataFetchers.GraphQLBookingTime { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java index ba71a603a4f..9ec83a4bf67 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/LegImpl.java @@ -15,7 +15,6 @@ import org.opentripplanner.ext.ridehailing.model.RideHailingLeg; import org.opentripplanner.framework.graphql.GraphQLUtils; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Leg; import org.opentripplanner.model.plan.LegTime; @@ -30,6 +29,7 @@ import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; public class LegImpl implements GraphQLDataFetchers.GraphQLLeg { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 195706de84c..33f304c5c25 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -28,8 +28,6 @@ import org.opentripplanner.model.StopTimesInPattern; import org.opentripplanner.model.SystemNotice; import org.opentripplanner.model.TripTimeOnDate; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.model.calendar.openinghours.OHCalendar; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; @@ -63,6 +61,8 @@ import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class GraphQLDataFetchers { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 6578657feb2..bed80cd2229 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -45,8 +45,8 @@ config: RentalVehicle: org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle#VehicleRentalVehicle VehicleRentalUris: org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris#VehicleRentalStationUris BikesAllowed: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed#GraphQLBikesAllowed - BookingInfo: org.opentripplanner.model.booking.BookingInfo - BookingTime: org.opentripplanner.model.booking.BookingTime + BookingInfo: org.opentripplanner.transit.model.timetable.booking.BookingInfo + BookingTime: org.opentripplanner.transit.model.timetable.booking.BookingTime CarPark: org.opentripplanner.routing.vehicle_parking.VehicleParking#VehicleParking ContactInfo: org.opentripplanner.transit.model.organization.ContactInfo Cluster: Object diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java index 28312e85a34..6c173ba815f 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.function.Function; import org.opentripplanner.framework.doc.DocumentedEnum; -import org.opentripplanner.model.booking.BookingMethod; import org.opentripplanner.model.plan.AbsoluteDirection; import org.opentripplanner.model.plan.RelativeDirection; import org.opentripplanner.model.plan.VertexType; @@ -27,6 +26,7 @@ import org.opentripplanner.transit.model.timetable.OccupancyStatus; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.TripAlteration; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; public class EnumTypes { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java index 75098696143..2f2c603a731 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java @@ -8,9 +8,9 @@ import graphql.schema.GraphQLOutputType; import org.opentripplanner.apis.transmodel.model.EnumTypes; import org.opentripplanner.apis.transmodel.support.GqlUtil; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; public class BookingArrangementType { diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java index 84d3c417722..74efdd52202 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/BookingRuleMapper.java @@ -7,10 +7,10 @@ import java.util.Map; import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.BookingRule; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingMethod; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; /** Responsible for mapping GTFS BookingRule into the OTP model. */ class BookingRuleMapper { diff --git a/src/main/java/org/opentripplanner/model/StopTime.java b/src/main/java/org/opentripplanner/model/StopTime.java index a4576461399..a1f524743ad 100644 --- a/src/main/java/org/opentripplanner/model/StopTime.java +++ b/src/main/java/org/opentripplanner/model/StopTime.java @@ -4,10 +4,10 @@ import java.util.List; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.StopTimeKey; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * This class is TEMPORALLY used during mapping of GTFS and Netex into the internal Model, it is not diff --git a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java index 97f216becd5..1bfb0184138 100644 --- a/src/main/java/org/opentripplanner/model/TripTimeOnDate.java +++ b/src/main/java/org/opentripplanner/model/TripTimeOnDate.java @@ -6,7 +6,6 @@ import java.util.Comparator; import java.util.List; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.OccupancyStatus; @@ -14,6 +13,7 @@ import org.opentripplanner.transit.model.timetable.StopTimeKey; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java index 4340b8b6f25..1ee72761d66 100644 --- a/src/main/java/org/opentripplanner/model/plan/Leg.java +++ b/src/main/java/org/opentripplanner/model/plan/Leg.java @@ -12,7 +12,6 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.lang.Sandbox; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.transfer.ConstrainedTransfer; @@ -25,6 +24,7 @@ import org.opentripplanner.transit.model.site.FareZone; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 8325083dfc8..d94ec1895c2 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -21,7 +21,6 @@ import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.legreference.LegReference; import org.opentripplanner.model.plan.legreference.ScheduledTransitLegReference; @@ -38,6 +37,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * One leg of a trip -- that is, a temporally continuous piece of the journey that takes place on a diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java index 3a0e10f57ca..d6c81c76e3d 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingInfoMapper.java @@ -9,10 +9,10 @@ import java.util.stream.Collectors; import javax.annotation.Nullable; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.booking.BookingInfo; -import org.opentripplanner.model.booking.BookingMethod; -import org.opentripplanner.model.booking.BookingTime; import org.opentripplanner.transit.model.organization.ContactInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingTime; import org.rutebanken.netex.model.BookingArrangementsStructure; import org.rutebanken.netex.model.BookingMethodEnumeration; import org.rutebanken.netex.model.ContactStructure; diff --git a/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java b/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java index f48d618d38a..4449913605b 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/BookingMethodMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.netex.mapping; -import org.opentripplanner.model.booking.BookingMethod; +import org.opentripplanner.transit.model.timetable.booking.BookingMethod; import org.rutebanken.netex.model.BookingMethodEnumeration; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java b/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java index b2350690cbf..676ab053da4 100644 --- a/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java +++ b/src/main/java/org/opentripplanner/netex/mapping/StopTimesMapper.java @@ -16,7 +16,6 @@ import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap; import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMapById; import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory; @@ -27,6 +26,7 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.rutebanken.netex.model.DestinationDisplay; import org.rutebanken.netex.model.DestinationDisplay_VersionStructure; import org.rutebanken.netex.model.FlexibleLine; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java index 33d12f5b943..0739a5c4eca 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java @@ -4,8 +4,8 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.street.search.state.State; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; public class BookingTimeAccessEgress implements RoutingAccessEgress { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index 09c983e7c1a..7ecea6ae997 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -4,8 +4,8 @@ import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorConstants; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * This class is used to adapt the FlexAccessEgress into a time-dependent multi-leg DefaultAccessEgress. diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java index 3f76af6f821..debf5ac17ed 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java @@ -2,9 +2,9 @@ import java.util.Optional; import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.model.booking.RoutingBookingInfo; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.street.search.state.State; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * Encapsulate information about an access or egress path. This interface extends diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java index e1a9c360f5d..8eea45c092a 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java @@ -10,9 +10,9 @@ import java.util.function.IntUnaryOperator; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.framework.DataValidationException; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * A TripTimes represents the arrival and departure times for a single trip in an Timetable. It is diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java index 263c63621fb..d367932d24d 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimes.java @@ -16,11 +16,11 @@ import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.framework.DeduplicatorService; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * Regular/planed/scheduled read-only version of {@link TripTimes}. The set of static diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java index 304e32d2045..ce142fd7628 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/ScheduledTripTimesBuilder.java @@ -5,8 +5,8 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.time.TimeUtils; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.framework.DeduplicatorService; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; public class ScheduledTripTimesBuilder { diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java b/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java index c064b9bc2ff..0779575aee5 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/StopTimeToScheduledTripTimesMapper.java @@ -6,8 +6,8 @@ import java.util.List; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.framework.DeduplicatorService; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; class StopTimeToScheduledTripTimesMapper { diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java index be726c53fd2..ff6b022fb59 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java @@ -7,8 +7,8 @@ import java.util.OptionalInt; import javax.annotation.Nullable; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.model.booking.BookingInfo; import org.opentripplanner.transit.model.basic.Accessibility; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; /** * A TripTimes represents the arrival and departure times for a single trip in a timetable. It is diff --git a/src/main/java/org/opentripplanner/model/booking/BookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java similarity index 98% rename from src/main/java/org/opentripplanner/model/booking/BookingInfo.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java index cbf43fd04ee..630acd6805a 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.io.Serializable; import java.time.Duration; diff --git a/src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java similarity index 96% rename from src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java index 49cdc82b77f..fd91f9e781a 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingInfoBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoBuilder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.time.Duration; import java.util.EnumSet; diff --git a/src/main/java/org/opentripplanner/model/booking/BookingMethod.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java similarity index 63% rename from src/main/java/org/opentripplanner/model/booking/BookingMethod.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java index 67e0a507915..78cd2372698 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingMethod.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingMethod.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; public enum BookingMethod { CALL_DRIVER, diff --git a/src/main/java/org/opentripplanner/model/booking/BookingTime.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java similarity index 95% rename from src/main/java/org/opentripplanner/model/booking/BookingTime.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java index bed51fd22ed..90ffcd32305 100644 --- a/src/main/java/org/opentripplanner/model/booking/BookingTime.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.io.Serializable; import java.time.LocalTime; diff --git a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java similarity index 98% rename from src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java rename to src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java index a72e6c72748..f20df16d1ef 100644 --- a/src/main/java/org/opentripplanner/model/booking/RoutingBookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import java.util.Objects; import org.opentripplanner.framework.tostring.ToStringBuilder; diff --git a/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java index 646d169f611..e561a6155d3 100644 --- a/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java +++ b/src/test/java/org/opentripplanner/netex/mapping/BookingInfoMapperTest.java @@ -7,7 +7,7 @@ import java.time.LocalTime; import org.junit.jupiter.api.Test; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.booking.BookingInfo; +import org.opentripplanner.transit.model.timetable.booking.BookingInfo; import org.rutebanken.netex.model.BookingArrangementsStructure; import org.rutebanken.netex.model.ContactStructure; import org.rutebanken.netex.model.FlexibleLine; diff --git a/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java b/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java index 8976e29e293..11db763d97f 100644 --- a/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java +++ b/src/test/java/org/opentripplanner/transit/model/TransitModelArchitectureTest.java @@ -23,6 +23,7 @@ public class TransitModelArchitectureTest { private static final Package NETWORK = TRANSIT_MODEL.subPackage("network"); private static final Package SITE = TRANSIT_MODEL.subPackage("site"); private static final Package TIMETABLE = TRANSIT_MODEL.subPackage("timetable"); + private static final Package TIMETABLE_BOOKING = TIMETABLE.subPackage("booking"); private static final Package LEGACY_MODEL = OTP_ROOT.subPackage("model"); @Test @@ -84,6 +85,7 @@ void enforceTimetablePackageDependencies() { ORGANIZATION, NETWORK, SITE, + TIMETABLE_BOOKING, LEGACY_MODEL ) .verify(); diff --git a/src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java similarity index 97% rename from src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java rename to src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java index a5b45e7a84c..eac6c7eb41c 100644 --- a/src/test/java/org/opentripplanner/model/booking/BookingInfoTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; diff --git a/src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java similarity index 96% rename from src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java rename to src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java index bde2eb34a99..5036defdb88 100644 --- a/src/test/java/org/opentripplanner/model/booking/BookingTimeTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingTimeTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotEquals; diff --git a/src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java similarity index 93% rename from src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java rename to src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java index 2bdcd53f757..1a69f2f0a0f 100644 --- a/src/test/java/org/opentripplanner/model/booking/RoutingBookingInfoTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java @@ -1,8 +1,8 @@ -package org.opentripplanner.model.booking; +package org.opentripplanner.transit.model.timetable.booking; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.model.booking.RoutingBookingInfoTest.Expected.LATEST_BOOKING_TIME; -import static org.opentripplanner.model.booking.RoutingBookingInfoTest.Expected.MIN_BOOKING_NOTICE; +import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.LATEST_BOOKING_TIME; +import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.MIN_BOOKING_NOTICE; import java.time.LocalTime; import java.util.List; From 74b0be72ee1d04ca6fa72341a866a1f90a0bc91a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 30 Apr 2024 17:38:46 +0200 Subject: [PATCH 1042/1688] fix: potential NPE --- .../apis/transmodel/model/timetable/BookingArrangementType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java index 2f2c603a731..d1ff4695b74 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java @@ -127,7 +127,7 @@ public static GraphQLObjectType create(GqlUtil gqlUtil) { return "other"; } } else if ( - earliestBookingTime.getDaysPrior() == 0 && latestBookingTime.getDaysPrior() == 0 + earliestBookingTime.getDaysPrior() == 0 && (latestBookingTime == null || latestBookingTime.getDaysPrior() == 0) ) { return "dayOfTravelOnly"; } else { From 3e1594ca1d360bc30501ceb394ae9c3a9f614929 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 30 Apr 2024 22:52:53 +0200 Subject: [PATCH 1043/1688] refactor: Integrate duration and offset into RoutingBookingInfo - keep business logic together - cleanup naming --- .../ext/flex/FlexAccessEgress.java | 7 +- .../timetable/BookingArrangementType.java | 3 +- .../raptoradapter/router/TransitRouter.java | 6 +- ...va => BookingRestrictionAccessEgress.java} | 28 ++-- .../model/timetable/booking/BookingInfo.java | 34 ---- .../model/timetable/booking/BookingTime.java | 2 +- .../timetable/booking/RoutingBookingInfo.java | 92 ++++++++++- .../timetable/booking/BookingInfoTest.java | 10 -- .../booking/RoutingBookingInfoTest.java | 145 +++++++++++++----- 9 files changed, 227 insertions(+), 100 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/{BookingTimeAccessEgress.java => BookingRestrictionAccessEgress.java} (80%) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index 7190749d38e..f7ccd441185 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -110,6 +110,11 @@ private Optional createRoutingBookingInfo() { if (bookingInfo == null) { return Optional.empty(); } - return bookingInfo.createRoutingBookingInfo(pathDurations.access()); + return RoutingBookingInfo + .of() + .withBookingInfo(bookingInfo) + .withLegDurationInSeconds(pathDurations.total()) + .withTimeOffsetInSeconds(pathDurations.access()) + .build(); } } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java index d1ff4695b74..de0f86b1166 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/timetable/BookingArrangementType.java @@ -127,7 +127,8 @@ public static GraphQLObjectType create(GqlUtil gqlUtil) { return "other"; } } else if ( - earliestBookingTime.getDaysPrior() == 0 && (latestBookingTime == null || latestBookingTime.getDaysPrior() == 0) + earliestBookingTime.getDaysPrior() == 0 && + (latestBookingTime == null || latestBookingTime.getDaysPrior() == 0) ) { return "dayOfTravelOnly"; } else { diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 085189b3d6f..08795c2cf92 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -3,7 +3,7 @@ import static org.opentripplanner.framework.time.TimeUtils.toTransitTimeSeconds; import static org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType.ACCESS; import static org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType.EGRESS; -import static org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingTimeAccessEgress.decorateBookingAccessEgress; +import static org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingRestrictionAccessEgress.decorateAccessEgressBookingRestriction; import java.time.Duration; import java.time.Instant; @@ -282,7 +282,9 @@ private Collection fetchAccessEgresses(AccessEgre int requestedBookingTime = toTransitTimeSeconds(transitSearchTimeZero, request.bookingTime()); return results .stream() - .map(accessEgress -> decorateBookingAccessEgress(accessEgress, requestedBookingTime)) + .map(accessEgress -> + decorateAccessEgressBookingRestriction(accessEgress, requestedBookingTime) + ) .toList(); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java similarity index 80% rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java rename to src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java index 0739a5c4eca..ff3c305167b 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingTimeAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java @@ -7,7 +7,7 @@ import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; -public class BookingTimeAccessEgress implements RoutingAccessEgress { +public class BookingRestrictionAccessEgress implements RoutingAccessEgress { private final DefaultAccessEgress delegate; @@ -19,7 +19,7 @@ public class BookingTimeAccessEgress implements RoutingAccessEgress { private final RoutingBookingInfo bookingInfo; - public BookingTimeAccessEgress( + public BookingRestrictionAccessEgress( DefaultAccessEgress delegate, RoutingBookingInfo bookingInfo, int requestedBookingTime @@ -29,13 +29,13 @@ public BookingTimeAccessEgress( this.bookingInfo = bookingInfo; } - public static RoutingAccessEgress decorateBookingAccessEgress( + public static RoutingAccessEgress decorateAccessEgressBookingRestriction( DefaultAccessEgress accessEgress, int requestedBookingTime ) { var bookingInfo = accessEgress.routingBookingInfo(); return bookingInfo.isPresent() - ? new BookingTimeAccessEgress(accessEgress, bookingInfo.get(), requestedBookingTime) + ? new BookingRestrictionAccessEgress(accessEgress, bookingInfo.get(), requestedBookingTime) : accessEgress; } @@ -60,16 +60,22 @@ public int earliestDepartureTime(int requestedDepartureTime) { if (edt == TIME_NOT_SET) { return TIME_NOT_SET; } - return bookingInfo.isThereEnoughTimeToBook(edt, requestedBookingTime) ? edt : TIME_NOT_SET; + if (bookingInfo.isThereEnoughTimeToBookForDeparture(edt, requestedBookingTime)) { + return edt; + } + return TIME_NOT_SET; } @Override public int latestArrivalTime(int requestedArrivalTime) { - int lat = delegate.latestArrivalTime(requestedArrivalTime); - int departureTime = lat - delegate.durationInSeconds(); - return bookingInfo.isThereEnoughTimeToBook(departureTime, requestedBookingTime) - ? lat - : TIME_NOT_SET; + var lat = delegate.latestArrivalTime(requestedArrivalTime); + if (lat == TIME_NOT_SET) { + return TIME_NOT_SET; + } + if (bookingInfo.isThereEnoughTimeToBookForArrival(lat, requestedBookingTime)) { + return lat; + } + return TIME_NOT_SET; } @Override @@ -120,7 +126,7 @@ public String asString(boolean includeStop, boolean includeCost, @Nullable Strin @Override public RoutingAccessEgress withPenalty(TimeAndCost penalty) { - return new BookingTimeAccessEgress( + return new BookingRestrictionAccessEgress( delegate.withPenalty(penalty), bookingInfo, requestedBookingTime diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java index 630acd6805a..628dc29c1aa 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java @@ -3,7 +3,6 @@ import java.io.Serializable; import java.time.Duration; import java.util.EnumSet; -import java.util.Optional; import javax.annotation.Nullable; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.transit.model.organization.ContactInfo; @@ -125,39 +124,6 @@ public String getDropOffMessage() { return dropOffMessage; } - /** - * Create new booking-info for routing based on the parameters used by the trip planner - * routing. The {@code latestBookingTime} and {@code minimumBookingNotice} is checked - * to make sure the service is bookable using the request parameter {@code bookingTime}. - *

      - * This method returns empty if this object does not contain parameters used by the - * routing algorithm. - *

      - * @param flexTripAccessTime The time used for access before boarding the Flex trip - it could - * include slack or walk time. - */ - @Nullable - public Optional createRoutingBookingInfo(int flexTripAccessTime) { - if (minimumBookingNotice == null && latestBookingTime == null) { - return Optional.empty(); - } - var builder = RoutingBookingInfo.of(); - - if (latestBookingTime != null) { - // TODO TGR BOOKING_TIME - This do not look right. Why would we remove the time it takes to - // walk to a flex area here. This is about the time we want to book. I could see how this - // should apply to the `minimumBookingNotice` because it is relative to the board-time - // but not the `latestBookingTime`. - // builder.withLatestBookingTime(latestBookingTime.relativeTime() - flexTripAccessTime); - builder.withLatestBookingTime(latestBookingTime.relativeTimeSeconds()); - } - if (minimumBookingNotice != null) { - // builder.withMinimumBookingNotice((int) minimumBookingNotice.toSeconds()); - builder.withMinimumBookingNotice((int) minimumBookingNotice.toSeconds() - flexTripAccessTime); - } - return Optional.of(builder.build()); - } - @Override public String toString() { return ToStringBuilder diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java index 90ffcd32305..8034fe07388 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingTime.java @@ -6,7 +6,7 @@ import org.opentripplanner.framework.time.TimeUtils; /** - * Represents either an earliest or latest time a trip can be booked relative to the departure day + * Represents either the earliest or latest time a trip can be booked relative to the departure day * of the trip. */ public class BookingTime implements Serializable { diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java index f20df16d1ef..e3e0c8feb93 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java @@ -1,6 +1,8 @@ package org.opentripplanner.transit.model.timetable.booking; import java.util.Objects; +import java.util.Optional; +import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; /** @@ -19,8 +21,15 @@ public final class RoutingBookingInfo { private final int latestBookingTime; private final int minimumBookingNotice; - - private RoutingBookingInfo(int latestBookingTime, int minimumBookingNotice) { + private final int legDurationInSeconds; + private final int timeOffsetInSeconds; + + private RoutingBookingInfo( + int latestBookingTime, + int minimumBookingNotice, + int legDurationInSeconds, + int timeOffsetInSeconds + ) { if (latestBookingTime == NOT_SET && minimumBookingNotice == NOT_SET) { throw new IllegalArgumentException( "Either latestBookingTime or minimumBookingNotice must be set." @@ -28,6 +37,10 @@ private RoutingBookingInfo(int latestBookingTime, int minimumBookingNotice) { } this.latestBookingTime = latestBookingTime; this.minimumBookingNotice = minimumBookingNotice; + this.legDurationInSeconds = + IntUtils.requireNotNegative(legDurationInSeconds, "legDurationInSeconds"); + this.timeOffsetInSeconds = + IntUtils.requireNotNegative(timeOffsetInSeconds, "timeOffsetInSeconds"); } public static RoutingBookingInfo.Builder of() { @@ -40,7 +53,30 @@ public static RoutingBookingInfo.Builder of() { *

      * If not the case, the RaptorConstants.TIME_NOT_SET is returned. */ - public boolean isThereEnoughTimeToBook(int time, int requestedBookingTime) { + public boolean isThereEnoughTimeToBookForDeparture(int departureTime, int requestedBookingTime) { + return isThereEnoughTimeToBook(departureTime + timeOffsetInSeconds, requestedBookingTime); + } + + /** + * Check if requested board-time can be booked according to the booking info rules. See + * {@link BookingInfo}. + *

      + * If not the case, the RaptorConstants.TIME_NOT_SET is returned. + */ + public boolean isThereEnoughTimeToBookForArrival(int arrivalTime, int requestedBookingTime) { + return isThereEnoughTimeToBook( + arrivalTime - legDurationInSeconds + timeOffsetInSeconds, + requestedBookingTime + ); + } + + /** + * Check if requested board-time can be booked according to the booking info rules. See + * {@link BookingInfo}. + *

      + * If not the case, the RaptorConstants.TIME_NOT_SET is returned. + */ + private boolean isThereEnoughTimeToBook(int time, int requestedBookingTime) { // This can be optimized/simplified; it can be done before the search start since it // only depends on the latestBookingTime and requestedBookingTime, not the departure time. if (exceedsLatestBookingTime(requestedBookingTime)) { @@ -103,6 +139,21 @@ public static class Builder { private int latestBookingTime = NOT_SET; private int minimumBookingNotice = NOT_SET; + private int legDurationInSeconds = 0; + private int timeOffsetInSeconds = 0; + + /** + * Convenience method to add booking info to builder. + */ + public Builder withBookingInfo(BookingInfo bookingInfo) { + if (bookingInfo.getLatestBookingTime() != null) { + withLatestBookingTime(bookingInfo.getLatestBookingTime().relativeTimeSeconds()); + } + if (bookingInfo.getMinimumBookingNotice() != null) { + withMinimumBookingNotice((int) bookingInfo.getMinimumBookingNotice().toSeconds()); + } + return this; + } public Builder withLatestBookingTime(int latestBookingTime) { this.latestBookingTime = latestBookingTime; @@ -114,8 +165,39 @@ public Builder withMinimumBookingNotice(int minimumBookingNotice) { return this; } - public RoutingBookingInfo build() { - return new RoutingBookingInfo(latestBookingTime, minimumBookingNotice); + /** + * The total time of the leg including any access and egress. + * See {@link #withTimeOffsetInSeconds(int)} + */ + public Builder withLegDurationInSeconds(int legDurationInSeconds) { + this.legDurationInSeconds = legDurationInSeconds; + return this; + } + + /** + * The offset is used to calculate when the "real" boardingTime is for the bookable service. + * For example, when a Flex Service is part of access, there might be a walking section before + * the flex service is boarded. In such a case the {@code timeOffsetInSeconds} should be set + * to the time it takes to walk, before boarding the flex. + */ + public Builder withTimeOffsetInSeconds(int timeOffsetInSeconds) { + this.timeOffsetInSeconds = timeOffsetInSeconds; + return this; + } + + public Optional build() { + if (latestBookingTime == NOT_SET && minimumBookingNotice == NOT_SET) { + return Optional.empty(); + } + + return Optional.of( + new RoutingBookingInfo( + latestBookingTime, + minimumBookingNotice, + legDurationInSeconds, + timeOffsetInSeconds + ) + ); } } } diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java index eac6c7eb41c..369764fd8e1 100644 --- a/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java @@ -46,11 +46,6 @@ void testBookingInfoWithLatestBookingTime() { "BookingInfo{cntactInfo: ContactInfo{contactPerson: 'Jo Contact', bookingUrl: 'http://booking.otp.org'}, bookingMethods: [CALL_DRIVER], latestBookingTime: 12:00, message: 'message', pickupMessage: 'pickup', dropOffMessage: 'dropoff'}", subject.toString() ); - - assertEquals( - "Optional[RoutingBookingInfo{latestBookingTime: 12:00}]", - subject.createRoutingBookingInfo(45).toString() - ); } @Test @@ -69,10 +64,5 @@ void testBookingInfoWithMinBookingNotice() { "BookingInfo{bookingMethods: [CALL_DRIVER], minimumBookingNotice: 45m}", subject.toString() ); - - assertEquals( - "Optional[RoutingBookingInfo{minimumBookingNotice: 44m15s}]", - subject.createRoutingBookingInfo(45).toString() - ); } } diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java index 1a69f2f0a0f..8b575d76517 100644 --- a/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java @@ -4,6 +4,7 @@ import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.LATEST_BOOKING_TIME; import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.MIN_BOOKING_NOTICE; +import java.time.Duration; import java.time.LocalTime; import java.util.List; import org.junit.jupiter.api.Test; @@ -11,6 +12,7 @@ import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.framework.time.TimeUtils; class RoutingBookingInfoTest { @@ -20,24 +22,6 @@ class RoutingBookingInfoTest { private static final LocalTime T14_00 = LocalTime.of(14, 0); private static final LocalTime LATEST_BOOKING_TIME_13_00 = T13_00; - // NeTEx does not support booking notice and latest booking time, but there is no conflict - // between these parameters. To make sure we support all combinations, we create all 3: - private final RoutingBookingInfo subjectBoth = RoutingBookingInfo - .of() - .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) - .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) - .build(); - - private final RoutingBookingInfo subjectMinBookingNotice = RoutingBookingInfo - .of() - .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) - .build(); - - private final RoutingBookingInfo subjectLatestBookingTime = RoutingBookingInfo - .of() - .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) - .build(); - static List testCase() { // BOARD-TIME | REQUESTED-BOOKING-TIME | EXPECTED List arguments = List.of( @@ -57,7 +41,7 @@ static List testCase() { @ParameterizedTest @MethodSource("testCase") - void isThereEnoughTimeToBookWithMinBookingTime( + void isThereEnoughTimeToBookWithMinBookingTimeBeforeDeparture( LocalTime searchTime, LocalTime requestedBookingTime, Expected expected @@ -65,9 +49,56 @@ void isThereEnoughTimeToBookWithMinBookingTime( int searchTimeSec = searchTime.toSecondOfDay(); int reqBookingTime = requestedBookingTime.toSecondOfDay(); + var subject = RoutingBookingInfo + .of() + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .build() + .orElseThrow(); + + // Since we have not set a duration or offset, departure and arrival is the same + assertEquals( + expected.minBookingNotice, + subject.isThereEnoughTimeToBookForDeparture(searchTimeSec, reqBookingTime) + ); assertEquals( expected.minBookingNotice, - subjectMinBookingNotice.isThereEnoughTimeToBook(searchTimeSec, reqBookingTime) + subject.isThereEnoughTimeToBookForArrival(searchTimeSec, reqBookingTime) + ); + } + + @ParameterizedTest + @MethodSource("testCase") + void isThereEnoughTimeToBookWithMinBookingTimeBeforeArrival( + LocalTime searchTime, + LocalTime requestedBookingTime, + Expected expected + ) { + int duration = 110; + int offset = 10; + int departureTimeSec = searchTime.toSecondOfDay() - offset; + int arrivalTimeSec = departureTimeSec + duration; + int reqBookingTime = requestedBookingTime.toSecondOfDay(); + + var subject = RoutingBookingInfo + .of() + .withBookingInfo( + BookingInfo + .of() + .withMinimumBookingNotice(Duration.ofSeconds(MINIMUM_BOOKING_NOTICE_20m)) + .build() + ) + .withLegDurationInSeconds(duration) + .withTimeOffsetInSeconds(offset) + .build() + .orElseThrow(); + + assertEquals( + expected.minBookingNotice, + subject.isThereEnoughTimeToBookForDeparture(departureTimeSec, reqBookingTime) + ); + assertEquals( + expected.minBookingNotice, + subject.isThereEnoughTimeToBookForArrival(arrivalTimeSec, reqBookingTime) ); } @@ -78,12 +109,32 @@ void isThereEnoughTimeToBookWithLatestBookingTime( LocalTime requestedBookingTime, Expected expected ) { - int searchTimeSec = searchTime.toSecondOfDay(); + int duration = 300; + int offset = 50; + int departureTimeSec = searchTime.toSecondOfDay() - offset; + int arrivalTimeSec = departureTimeSec + duration; int reqBookingTime = requestedBookingTime.toSecondOfDay(); + var subject = RoutingBookingInfo + .of() + .withBookingInfo( + BookingInfo + .of() + .withLatestBookingTime(new BookingTime(LATEST_BOOKING_TIME_13_00, 0)) + .build() + ) + .withLegDurationInSeconds(duration) + .withTimeOffsetInSeconds(offset) + .build() + .orElseThrow(); + assertEquals( expected.latestBookingTime, - subjectLatestBookingTime.isThereEnoughTimeToBook(searchTimeSec, reqBookingTime) + subject.isThereEnoughTimeToBookForDeparture(departureTimeSec, reqBookingTime) + ); + assertEquals( + expected.latestBookingTime, + subject.isThereEnoughTimeToBookForArrival(arrivalTimeSec, reqBookingTime) ); } @@ -94,28 +145,52 @@ void isThereEnoughTimeToBookUsingBoth( LocalTime requestedBookingTime, Expected expected ) { - int searchTimeSec = searchTime.toSecondOfDay(); + int duration = 0; + int offset = 0; + int departureTimeSec = searchTime.toSecondOfDay() - offset; + int arrivalTimeSec = departureTimeSec + duration; int reqBookingTime = requestedBookingTime.toSecondOfDay(); + // NeTEx does not support booking notice and latest booking time, but there is no conflict + // between these parameters. To make sure we support all combinations, we create all 3: + var subject = RoutingBookingInfo + .of() + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) + .withLegDurationInSeconds(duration) + .withTimeOffsetInSeconds(offset) + .build() + .orElseThrow(); + assertEquals( expected == Expected.BOTH, - subjectBoth.isThereEnoughTimeToBook(searchTimeSec, reqBookingTime) + subject.isThereEnoughTimeToBookForDeparture(departureTimeSec, reqBookingTime), + expected + + " " + + subject + + " " + + TimeUtils.timeToStrLong(departureTimeSec) + + " " + + TimeUtils.timeToStrLong(reqBookingTime) + ); + assertEquals( + expected == Expected.BOTH, + subject.isThereEnoughTimeToBookForArrival(arrivalTimeSec, reqBookingTime) ); } @Test void testToString() { - assertEquals( - "RoutingBookingInfo{minimumBookingNotice: 20m}", - subjectMinBookingNotice.toString() - ); - assertEquals( - "RoutingBookingInfo{latestBookingTime: 13:00}", - subjectLatestBookingTime.toString() - ); + var subject = RoutingBookingInfo + .of() + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) + .build() + .orElseThrow(); + assertEquals( "RoutingBookingInfo{latestBookingTime: 13:00, minimumBookingNotice: 20m}", - subjectBoth.toString() + subject.toString() ); } @@ -125,8 +200,8 @@ enum Expected { LATEST_BOOKING_TIME(false, true), BOTH(true, true); - boolean minBookingNotice; - boolean latestBookingTime; + final boolean minBookingNotice; + final boolean latestBookingTime; Expected(boolean minBookingNotice, boolean latestBookingTime) { this.minBookingNotice = minBookingNotice; From 77265d26d4476932547a48b4b3649ec0cd1fd2dc Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 30 Apr 2024 23:49:52 +0200 Subject: [PATCH 1044/1688] refactor: Interface RoutingAccessEgress is preferred in declarations ... not the implementation DefaultAccessEgress class --- .../ext/ridehailing/RideHailingAccessAdapter.java | 2 +- .../ext/ridehailing/RideHailingAccessShifter.java | 8 ++++---- .../ext/traveltime/TravelTimeResource.java | 4 ++-- .../algorithm/raptoradapter/router/TransitRouter.java | 7 +++---- .../transit/BookingRestrictionAccessEgress.java | 6 +++--- .../raptoradapter/transit/DefaultAccessEgress.java | 2 +- .../raptoradapter/transit/FlexAccessEgressAdapter.java | 2 +- .../raptoradapter/transit/mappers/AccessEgressMapper.java | 7 ++++--- .../raptoradapter/transit/DefaultAccessEgressTest.java | 2 +- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java index 3c4d2a1b7ff..257cf0a7ca5 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessAdapter.java @@ -50,7 +50,7 @@ public String openingHoursToString() { } @Override - public DefaultAccessEgress withPenalty(TimeAndCost penalty) { + public RoutingAccessEgress withPenalty(TimeAndCost penalty) { return new RideHailingAccessAdapter(this, penalty); } diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java index b4a75c26aad..d406842a030 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import org.opentripplanner.ext.ridehailing.model.ArrivalTime; import org.opentripplanner.framework.geometry.WgsCoordinate; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.transit.model.framework.Result; @@ -29,13 +29,13 @@ public class RideHailingAccessShifter { private static final Duration MAX_DURATION_FROM_NOW = Duration.ofMinutes(30); /** - * Given a list of {@link DefaultAccessEgress} shift the access ones which contain driving + * Given a list of {@link RoutingAccessEgress} shift the access ones that contain driving * so that they only start at the time when the ride hailing vehicle can actually be there * to pick up passengers. */ - public static List shiftAccesses( + public static List shiftAccesses( boolean isAccess, - List results, + List results, List services, RouteRequest request, Instant now diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java index 67d8bb0d6cb..88742aebeb1 100644 --- a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java +++ b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java @@ -34,7 +34,7 @@ import org.opentripplanner.raptor.api.response.RaptorResponse; import org.opentripplanner.raptor.api.response.StopArrivals; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressRouter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.AccessEgressMapper; import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.RaptorRoutingRequestTransitData; @@ -178,7 +178,7 @@ private ZSampleGrid getSampleGrid() { } } - private Collection getAccess(TemporaryVerticesContainer temporaryVertices) { + private Collection getAccess(TemporaryVerticesContainer temporaryVertices) { final Collection accessStops = AccessEgressRouter.streetSearch( routingRequest, temporaryVertices, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 08795c2cf92..732084137c4 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -25,7 +25,6 @@ import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgresses; import org.opentripplanner.routing.algorithm.raptoradapter.router.street.FlexAccessEgressRouter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer; import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; @@ -258,7 +257,7 @@ private Collection fetchAccessEgresses(AccessEgre stopCountLimit ); - List results = new ArrayList<>( + List results = new ArrayList<>( AccessEgressMapper.mapNearbyStops(nearbyStops, type.isEgress()) ); results = timeshiftRideHailing(streetRequest, type, results); @@ -301,10 +300,10 @@ private Collection fetchAccessEgresses(AccessEgre * This method is a good candidate to be moved to the access/egress filter chain when that has * been added. */ - private List timeshiftRideHailing( + private List timeshiftRideHailing( StreetRequest streetRequest, AccessEgressType type, - List accessEgressList + List accessEgressList ) { if (streetRequest.mode() != StreetMode.CAR_HAILING) { return accessEgressList; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java index ff3c305167b..71c864b4ecb 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java @@ -9,7 +9,7 @@ public class BookingRestrictionAccessEgress implements RoutingAccessEgress { - private final DefaultAccessEgress delegate; + private final RoutingAccessEgress delegate; /** * The requested time the passenger will book the trip. Normally, this is when the search is @@ -20,7 +20,7 @@ public class BookingRestrictionAccessEgress implements RoutingAccessEgress { private final RoutingBookingInfo bookingInfo; public BookingRestrictionAccessEgress( - DefaultAccessEgress delegate, + RoutingAccessEgress delegate, RoutingBookingInfo bookingInfo, int requestedBookingTime ) { @@ -30,7 +30,7 @@ public BookingRestrictionAccessEgress( } public static RoutingAccessEgress decorateAccessEgressBookingRestriction( - DefaultAccessEgress accessEgress, + RoutingAccessEgress accessEgress, int requestedBookingTime ) { var bookingInfo = accessEgress.routingBookingInfo(); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java index 7d0eed74131..3f68d91321e 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgress.java @@ -99,7 +99,7 @@ public TimeAndCost penalty() { * OVERRIDE THIS IF KEEPING THE TYPE IS IMPORTANT! */ @Override - public DefaultAccessEgress withPenalty(TimeAndCost penalty) { + public RoutingAccessEgress withPenalty(TimeAndCost penalty) { return new DefaultAccessEgress(this, penalty); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index 7ecea6ae997..fae11497c84 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -61,7 +61,7 @@ public boolean isWalkOnly() { } @Override - public DefaultAccessEgress withPenalty(TimeAndCost penalty) { + public RoutingAccessEgress withPenalty(TimeAndCost penalty) { return new FlexAccessEgressAdapter(this, penalty); } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java index 6cef677f5a9..fd7619ac297 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/AccessEgressMapper.java @@ -7,12 +7,13 @@ import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; import org.opentripplanner.routing.algorithm.raptoradapter.transit.FlexAccessEgressAdapter; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.RoutingAccessEgress; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.transit.model.site.RegularStop; public class AccessEgressMapper { - public static List mapNearbyStops( + public static List mapNearbyStops( Collection accessStops, boolean isEgress ) { @@ -23,7 +24,7 @@ public static List mapNearbyStops( .collect(Collectors.toList()); } - public static Collection mapFlexAccessEgresses( + public static Collection mapFlexAccessEgresses( Collection flexAccessEgresses, boolean isEgress ) { @@ -33,7 +34,7 @@ public static Collection mapFlexAccessEgresses( .collect(Collectors.toList()); } - private static DefaultAccessEgress mapNearbyStop(NearbyStop nearbyStop, boolean isEgress) { + private static RoutingAccessEgress mapNearbyStop(NearbyStop nearbyStop, boolean isEgress) { if (!(nearbyStop.stop instanceof RegularStop)) { return null; } diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java index 92ed7aa4825..0fcb7c8cea3 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/DefaultAccessEgressTest.java @@ -22,7 +22,7 @@ class DefaultAccessEgressTest { public static final TimeAndCost PENALTY = new TimeAndCost(TIME_PENALTY, COST_PENALTY); private final DefaultAccessEgress subject = new DefaultAccessEgress(STOP, LAST_STATE); - private final DefaultAccessEgress subjectWithPenalty = subject.withPenalty(PENALTY); + private final RoutingAccessEgress subjectWithPenalty = subject.withPenalty(PENALTY); @Test void canNotAddPenaltyTwice() { From 0a1abb2c502f5a1d87e4b482d9a8681138db7058 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 2 May 2024 09:23:32 +0000 Subject: [PATCH 1045/1688] Update Debug UI dependencies (non-major) --- client-next/package-lock.json | 242 +++++++++++++++++----------------- client-next/package.json | 22 ++-- 2 files changed, 135 insertions(+), 129 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 0eb34f02228..abe2c5d3ed6 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -13,9 +13,9 @@ "graphql": "16.8.1", "graphql-request": "6.1.0", "maplibre-gl": "4.1.3", - "react": "18.2.0", + "react": "18.3.1", "react-bootstrap": "2.10.2", - "react-dom": "18.2.0", + "react-dom": "18.3.1", "react-map-gl": "7.1.7" }, "devDependencies": { @@ -23,25 +23,25 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.4", - "@types/react": "18.2.79", - "@types/react-dom": "18.2.25", - "@typescript-eslint/eslint-plugin": "7.7.1", - "@typescript-eslint/parser": "7.7.1", + "@testing-library/react": "15.0.6", + "@types/react": "18.3.1", + "@types/react-dom": "18.3.0", + "@typescript-eslint/eslint-plugin": "7.8.0", + "@typescript-eslint/parser": "7.8.0", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.5.2", + "@vitest/coverage-v8": "1.5.3", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", "eslint-plugin-jsx-a11y": "6.8.0", "eslint-plugin-react": "7.34.1", - "eslint-plugin-react-hooks": "4.6.0", + "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.6", "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.5", - "vite": "5.2.10", - "vitest": "1.5.2" + "vite": "5.2.11", + "vitest": "1.5.3" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -3372,9 +3372,9 @@ } }, "node_modules/@testing-library/react": { - "version": "15.0.4", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.4.tgz", - "integrity": "sha512-Fw/LM1emOHKfCxv5R0tz+25TOtiMt0o5Np1zJmb4LbSacOagXQX4ooAaHiJfGUMe+OjUk504BX11W+9Z8CvyZA==", + "version": "15.0.6", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.6.tgz", + "integrity": "sha512-UlbazRtEpQClFOiYp+1BapMT+xyqWMnE+hh9tn5DQ6gmlE7AIZWcGpzZukmDZuFk3By01oiqOf8lRedLS4k6xQ==", "dev": true, "dependencies": { "@babel/runtime": "^7.12.5", @@ -3385,8 +3385,14 @@ "node": ">=18" }, "peerDependencies": { + "@types/react": "^18.0.0", "react": "^18.0.0", "react-dom": "^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/@types/aria-query": { @@ -3522,18 +3528,18 @@ "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/react": { - "version": "18.2.79", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.79.tgz", - "integrity": "sha512-RwGAGXPl9kSXwdNTafkOEuFrTBD5SA2B3iEB96xi8+xu5ddUa/cpvyVCSNn+asgLCTHkb5ZxN8gbuibYJi4s1w==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz", + "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==", "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" } }, "node_modules/@types/react-dom": { - "version": "18.2.25", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.2.25.tgz", - "integrity": "sha512-o/V48vf4MQh7juIKZU2QGDfli6p1+OOi5oXx36Hffpc9adsHeXjVp8rHuPkjd8VT8sOJ2Zp05HR7CdpGTIUFUA==", + "version": "18.3.0", + "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.0.tgz", + "integrity": "sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==", "dev": true, "dependencies": { "@types/react": "*" @@ -3576,16 +3582,16 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.7.1.tgz", - "integrity": "sha512-KwfdWXJBOviaBVhxO3p5TJiLpNuh2iyXyjmWN0f1nU87pwyvfS0EmjC6ukQVYVFJd/K1+0NWGPDXiyEyQorn0Q==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz", + "integrity": "sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==", "dev": true, "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.7.1", - "@typescript-eslint/type-utils": "7.7.1", - "@typescript-eslint/utils": "7.7.1", - "@typescript-eslint/visitor-keys": "7.7.1", + "@typescript-eslint/scope-manager": "7.8.0", + "@typescript-eslint/type-utils": "7.8.0", + "@typescript-eslint/utils": "7.8.0", + "@typescript-eslint/visitor-keys": "7.8.0", "debug": "^4.3.4", "graphemer": "^1.4.0", "ignore": "^5.3.1", @@ -3644,15 +3650,15 @@ "dev": true }, "node_modules/@typescript-eslint/parser": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.7.1.tgz", - "integrity": "sha512-vmPzBOOtz48F6JAGVS/kZYk4EkXao6iGrD838sp1w3NQQC0W8ry/q641KU4PrG7AKNAf56NOcR8GOpH8l9FPCw==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.8.0.tgz", + "integrity": "sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==", "dev": true, "dependencies": { - "@typescript-eslint/scope-manager": "7.7.1", - "@typescript-eslint/types": "7.7.1", - "@typescript-eslint/typescript-estree": "7.7.1", - "@typescript-eslint/visitor-keys": "7.7.1", + "@typescript-eslint/scope-manager": "7.8.0", + "@typescript-eslint/types": "7.8.0", + "@typescript-eslint/typescript-estree": "7.8.0", + "@typescript-eslint/visitor-keys": "7.8.0", "debug": "^4.3.4" }, "engines": { @@ -3672,13 +3678,13 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.7.1.tgz", - "integrity": "sha512-PytBif2SF+9SpEUKynYn5g1RHFddJUcyynGpztX3l/ik7KmZEv19WCMhUBkHXPU9es/VWGD3/zg3wg90+Dh2rA==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz", + "integrity": "sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.7.1", - "@typescript-eslint/visitor-keys": "7.7.1" + "@typescript-eslint/types": "7.8.0", + "@typescript-eslint/visitor-keys": "7.8.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3689,13 +3695,13 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.7.1.tgz", - "integrity": "sha512-ZksJLW3WF7o75zaBPScdW1Gbkwhd/lyeXGf1kQCxJaOeITscoSl0MjynVvCzuV5boUz/3fOI06Lz8La55mu29Q==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz", + "integrity": "sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==", "dev": true, "dependencies": { - "@typescript-eslint/typescript-estree": "7.7.1", - "@typescript-eslint/utils": "7.7.1", + "@typescript-eslint/typescript-estree": "7.8.0", + "@typescript-eslint/utils": "7.8.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3716,9 +3722,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.7.1.tgz", - "integrity": "sha512-AmPmnGW1ZLTpWa+/2omPrPfR7BcbUU4oha5VIbSbS1a1Tv966bklvLNXxp3mrbc+P2j4MNOTfDffNsk4o0c6/w==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.8.0.tgz", + "integrity": "sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==", "dev": true, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3729,13 +3735,13 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.7.1.tgz", - "integrity": "sha512-CXe0JHCXru8Fa36dteXqmH2YxngKJjkQLjxzoj6LYwzZ7qZvgsLSc+eqItCrqIop8Vl2UKoAi0StVWu97FQZIQ==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz", + "integrity": "sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.7.1", - "@typescript-eslint/visitor-keys": "7.7.1", + "@typescript-eslint/types": "7.8.0", + "@typescript-eslint/visitor-keys": "7.8.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3790,17 +3796,17 @@ "dev": true }, "node_modules/@typescript-eslint/utils": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.7.1.tgz", - "integrity": "sha512-QUvBxPEaBXf41ZBbaidKICgVL8Hin0p6prQDu6bbetWo39BKbWJxRsErOzMNT1rXvTll+J7ChrbmMCXM9rsvOQ==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.8.0.tgz", + "integrity": "sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==", "dev": true, "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", "@types/json-schema": "^7.0.15", "@types/semver": "^7.5.8", - "@typescript-eslint/scope-manager": "7.7.1", - "@typescript-eslint/types": "7.7.1", - "@typescript-eslint/typescript-estree": "7.7.1", + "@typescript-eslint/scope-manager": "7.8.0", + "@typescript-eslint/types": "7.8.0", + "@typescript-eslint/typescript-estree": "7.8.0", "semver": "^7.6.0" }, "engines": { @@ -3848,12 +3854,12 @@ "dev": true }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.7.1.tgz", - "integrity": "sha512-gBL3Eq25uADw1LQ9kVpf3hRM+DWzs0uZknHYK3hq4jcTPqVCClHGDnB6UUUV2SFeBeA4KWHWbbLqmbGcZ4FYbw==", + "version": "7.8.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz", + "integrity": "sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==", "dev": true, "dependencies": { - "@typescript-eslint/types": "7.7.1", + "@typescript-eslint/types": "7.8.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -3890,9 +3896,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.5.2.tgz", - "integrity": "sha512-QJqxRnbCwNtbbegK9E93rBmhN3dbfG1bC/o52Bqr0zGCYhQzwgwvrJBG7Q8vw3zilX6Ryy6oa/mkZku2lLJx1Q==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.5.3.tgz", + "integrity": "sha512-DPyGSu/fPHOJuPxzFSQoT4N/Fu/2aJfZRtEpEp8GI7NHsXBGE94CQ+pbEGBUMFjatsHPDJw/+TAF9r4ens2CNw==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.1", @@ -3913,17 +3919,17 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "1.5.2" + "vitest": "1.5.3" } }, "node_modules/@vitest/expect": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.2.tgz", - "integrity": "sha512-rf7MTD1WCoDlN3FfYJ9Llfp0PbdtOMZ3FIF0AVkDnKbp3oiMW1c8AmvRZBcqbAhDUAvF52e9zx4WQM1r3oraVA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.3.tgz", + "integrity": "sha512-y+waPz31pOFr3rD7vWTbwiLe5+MgsMm40jTZbQE8p8/qXyBX3CQsIXRx9XK12IbY7q/t5a5aM/ckt33b4PxK2g==", "dev": true, "dependencies": { - "@vitest/spy": "1.5.2", - "@vitest/utils": "1.5.2", + "@vitest/spy": "1.5.3", + "@vitest/utils": "1.5.3", "chai": "^4.3.10" }, "funding": { @@ -3931,12 +3937,12 @@ } }, "node_modules/@vitest/runner": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.2.tgz", - "integrity": "sha512-7IJ7sJhMZrqx7HIEpv3WrMYcq8ZNz9L6alo81Y6f8hV5mIE6yVZsFoivLZmr0D777klm1ReqonE9LyChdcmw6g==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.3.tgz", + "integrity": "sha512-7PlfuReN8692IKQIdCxwir1AOaP5THfNkp0Uc4BKr2na+9lALNit7ub9l3/R7MP8aV61+mHKRGiqEKRIwu6iiQ==", "dev": true, "dependencies": { - "@vitest/utils": "1.5.2", + "@vitest/utils": "1.5.3", "p-limit": "^5.0.0", "pathe": "^1.1.1" }, @@ -3972,9 +3978,9 @@ } }, "node_modules/@vitest/snapshot": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.2.tgz", - "integrity": "sha512-CTEp/lTYos8fuCc9+Z55Ga5NVPKUgExritjF5VY7heRFUfheoAqBneUlvXSUJHUZPjnPmyZA96yLRJDP1QATFQ==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.3.tgz", + "integrity": "sha512-K3mvIsjyKYBhNIDujMD2gfQEzddLe51nNOAf45yKRt/QFJcUIeTQd2trRvv6M6oCBHNVnZwFWbQ4yj96ibiDsA==", "dev": true, "dependencies": { "magic-string": "^0.30.5", @@ -4018,9 +4024,9 @@ "dev": true }, "node_modules/@vitest/spy": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.2.tgz", - "integrity": "sha512-xCcPvI8JpCtgikT9nLpHPL1/81AYqZy1GCy4+MCHBE7xi8jgsYkULpW5hrx5PGLgOQjUpb6fd15lqcriJ40tfQ==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.3.tgz", + "integrity": "sha512-Llj7Jgs6lbnL55WoshJUUacdJfjU2honvGcAJBxhra5TPEzTJH8ZuhI3p/JwqqfnTr4PmP7nDmOXP53MS7GJlg==", "dev": true, "dependencies": { "tinyspy": "^2.2.0" @@ -4030,9 +4036,9 @@ } }, "node_modules/@vitest/utils": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.2.tgz", - "integrity": "sha512-sWOmyofuXLJ85VvXNsroZur7mOJGiQeM0JN3/0D1uU8U9bGFM69X1iqHaRXl6R8BwaLY6yPCogP257zxTzkUdA==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.3.tgz", + "integrity": "sha512-rE9DTN1BRhzkzqNQO+kw8ZgfeEBCLXiHJwetk668shmNBpSagQxneT5eSqEBLP+cqSiAeecvQmbpFfdMyLcIQA==", "dev": true, "dependencies": { "diff-sequences": "^29.6.3", @@ -4071,9 +4077,9 @@ } }, "node_modules/@vitest/utils/node_modules/react-is": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", - "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", "dev": true }, "node_modules/@whatwg-node/events": { @@ -5982,9 +5988,9 @@ } }, "node_modules/eslint-plugin-react-hooks": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.0.tgz", - "integrity": "sha512-oFc7Itz9Qxh2x4gNHStv3BqJq54ExXmfC+a1NjAta66IAN87Wu0R/QArgIS9qKzX3dXKPI9H5crl9QchNMY9+g==", + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz", + "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==", "dev": true, "engines": { "node": ">=10" @@ -9299,9 +9305,9 @@ "integrity": "sha512-RKJ22hX8mHe3Y6wH/N3wCM6BWtjaxIyyUIkpHOvfFnxdI4yD4tBXEBKSbriGujF6jnSVkJrffuo6vxACiSSxIw==" }, "node_modules/react": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react/-/react-18.2.0.tgz", - "integrity": "sha512-/3IjMdb2L9QbBdWiW5e3P2/npwMBaU9mHCSCUzNln0ZCYbcfTsGbTJrU/kGemdH2IWmB2ioZ+zkxtmq6g09fGQ==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz", + "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==", "dependencies": { "loose-envify": "^1.1.0" }, @@ -9339,15 +9345,15 @@ } }, "node_modules/react-dom": { - "version": "18.2.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.2.0.tgz", - "integrity": "sha512-6IMTriUmvsjHUjNtEDudZfuDQUoWXVxKHhlEGSk81n4YFS+r/Kl99wXiwlVXtPBtJenozv2P+hxDsw9eA7Xo6g==", + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz", + "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==", "dependencies": { "loose-envify": "^1.1.0", - "scheduler": "^0.23.0" + "scheduler": "^0.23.2" }, "peerDependencies": { - "react": "^18.2.0" + "react": "^18.3.1" } }, "node_modules/react-is": { @@ -9778,9 +9784,9 @@ } }, "node_modules/scheduler": { - "version": "0.23.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.0.tgz", - "integrity": "sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==", + "version": "0.23.2", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz", + "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==", "dependencies": { "loose-envify": "^1.1.0" } @@ -10842,9 +10848,9 @@ } }, "node_modules/vite": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.10.tgz", - "integrity": "sha512-PAzgUZbP7msvQvqdSD+ErD5qGnSFiGOoWmV5yAKUEI0kdhjbH6nMWVyZQC/hSc4aXwc0oJ9aEdIiF9Oje0JFCw==", + "version": "5.2.11", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz", + "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==", "dev": true, "dependencies": { "esbuild": "^0.20.1", @@ -10897,9 +10903,9 @@ } }, "node_modules/vite-node": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.2.tgz", - "integrity": "sha512-Y8p91kz9zU+bWtF7HGt6DVw2JbhyuB2RlZix3FPYAYmUyZ3n7iTp8eSyLyY6sxtPegvxQtmlTMhfPhUfCUF93A==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.3.tgz", + "integrity": "sha512-axFo00qiCpU/JLd8N1gu9iEYL3xTbMbMrbe5nDp9GL0nb6gurIdZLkkFogZXWnE8Oyy5kfSLwNVIcVsnhE7lgQ==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -10919,16 +10925,16 @@ } }, "node_modules/vitest": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.2.tgz", - "integrity": "sha512-l9gwIkq16ug3xY7BxHwcBQovLZG75zZL0PlsiYQbf76Rz6QGs54416UWMtC0jXeihvHvcHrf2ROEjkQRVpoZYw==", + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.3.tgz", + "integrity": "sha512-2oM7nLXylw3mQlW6GXnRriw+7YvZFk/YNV8AxIC3Z3MfFbuziLGWP9GPxxu/7nRlXhqyxBikpamr+lEEj1sUEw==", "dev": true, "dependencies": { - "@vitest/expect": "1.5.2", - "@vitest/runner": "1.5.2", - "@vitest/snapshot": "1.5.2", - "@vitest/spy": "1.5.2", - "@vitest/utils": "1.5.2", + "@vitest/expect": "1.5.3", + "@vitest/runner": "1.5.3", + "@vitest/snapshot": "1.5.3", + "@vitest/spy": "1.5.3", + "@vitest/utils": "1.5.3", "acorn-walk": "^8.3.2", "chai": "^4.3.10", "debug": "^4.3.4", @@ -10942,7 +10948,7 @@ "tinybench": "^2.5.1", "tinypool": "^0.8.3", "vite": "^5.0.0", - "vite-node": "1.5.2", + "vite-node": "1.5.3", "why-is-node-running": "^2.2.2" }, "bin": { @@ -10957,8 +10963,8 @@ "peerDependencies": { "@edge-runtime/vm": "*", "@types/node": "^18.0.0 || >=20.0.0", - "@vitest/browser": "1.5.2", - "@vitest/ui": "1.5.2", + "@vitest/browser": "1.5.3", + "@vitest/ui": "1.5.3", "happy-dom": "*", "jsdom": "*" }, diff --git a/client-next/package.json b/client-next/package.json index 0fe51abdad8..1677c6a3b1f 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -22,9 +22,9 @@ "graphql": "16.8.1", "graphql-request": "6.1.0", "maplibre-gl": "4.1.3", - "react": "18.2.0", + "react": "18.3.1", "react-bootstrap": "2.10.2", - "react-dom": "18.2.0", + "react-dom": "18.3.1", "react-map-gl": "7.1.7" }, "devDependencies": { @@ -32,24 +32,24 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.4", - "@types/react": "18.2.79", - "@types/react-dom": "18.2.25", - "@typescript-eslint/eslint-plugin": "7.7.1", - "@typescript-eslint/parser": "7.7.1", + "@testing-library/react": "15.0.6", + "@types/react": "18.3.1", + "@types/react-dom": "18.3.0", + "@typescript-eslint/eslint-plugin": "7.8.0", + "@typescript-eslint/parser": "7.8.0", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.5.2", + "@vitest/coverage-v8": "1.5.3", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", "eslint-plugin-jsx-a11y": "6.8.0", "eslint-plugin-react": "7.34.1", - "eslint-plugin-react-hooks": "4.6.0", + "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.6", "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.5", - "vite": "5.2.10", - "vitest": "1.5.2" + "vite": "5.2.11", + "vitest": "1.5.3" } } From 0fd7eca0e2943d6285e095fe2c2b3e93cc985237 Mon Sep 17 00:00:00 2001 From: Yannik Tausch Date: Thu, 2 May 2024 14:59:49 +0200 Subject: [PATCH 1046/1688] point to additional i in GraphiQL URL --- docs/apis/GTFS-GraphQL-API.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/apis/GTFS-GraphQL-API.md b/docs/apis/GTFS-GraphQL-API.md index f2cc32e2888..cda512bc689 100644 --- a/docs/apis/GTFS-GraphQL-API.md +++ b/docs/apis/GTFS-GraphQL-API.md @@ -11,7 +11,7 @@ makes it easy to use this API in a Java application. ## URLs - GraphQL endpoint: [`http://localhost:8080/otp/gtfs/v1`](http://localhost:8080/otp/gtfs/v1) - HTML schema documentation: [https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/](https://docs.opentripplanner.org/api/dev-2.x/graphql-gtfs/) - - Built-in visual GraphQL client: [http://localhost:8080/graphiql](http://localhost:8080/graphiql) + - Built-in visual GraphQL client: [http://localhost:8080/graphiql](http://localhost:8080/graphiql) (note the additional `i`!) ## Built-in API client @@ -43,4 +43,4 @@ If you want to disable it, do it in `otp-config.json`: "GtfsGraphQlApi": false } } -``` \ No newline at end of file +``` From 5b3be61ac76eebbb04282643aa3d2d390730f20e Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Thu, 2 May 2024 14:37:56 +0000 Subject: [PATCH 1047/1688] Upgrade debug client to version 2024/05/2024-05-02T14:37 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 853fee5b440..8968324b94d 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

      From ac85a45296ce257ba5247e71226da69b88f66cf5 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 2 May 2024 15:08:34 -0700 Subject: [PATCH 1048/1688] test: modify tests for Kitsap transit cash trasnfers --- .../ext/fares/impl/OrcaFareServiceTest.java | 33 +++++++++---------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java index 4d04281ebb6..7493c33bbb2 100644 --- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java @@ -199,16 +199,11 @@ void calculateFareThatExceedsTwoHourFreeTransferWindow() { getLeg(KITSAP_TRANSIT_AGENCY_ID, 150) ); - var SIX_TIMES_DEFAULT = DEFAULT_TEST_RIDE_PRICE.times(6); - calculateFare(rides, regular, SIX_TIMES_DEFAULT); - calculateFare(rides, FareType.senior, SIX_TIMES_DEFAULT); + calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(2)); + calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(2)); calculateFare(rides, FareType.youth, ZERO_USD); calculateFare(rides, FareType.electronicSpecial, TWO_DOLLARS); - calculateFare( - rides, - FareType.electronicRegular, - DEFAULT_TEST_RIDE_PRICE.plus(DEFAULT_TEST_RIDE_PRICE) - ); + calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE.times(2)); calculateFare(rides, FareType.electronicSenior, TWO_DOLLARS); calculateFare(rides, FareType.electronicYouth, ZERO_USD); } @@ -228,11 +223,11 @@ void calculateFareThatIncludesNoFreeTransfers() { getLeg(KITSAP_TRANSIT_AGENCY_ID, 121), getLeg(WASHINGTON_STATE_FERRIES_AGENCY_ID, 150, "Fauntleroy-VashonIsland") ); - calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(4).plus(FERRY_FARE)); + calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(3).plus(FERRY_FARE)); calculateFare( rides, FareType.senior, - DEFAULT_TEST_RIDE_PRICE.times(3).plus(usDollars(.50f)).plus(HALF_FERRY_FARE) + DEFAULT_TEST_RIDE_PRICE.times(2).plus(usDollars(.50f)).plus(HALF_FERRY_FARE) ); calculateFare(rides, FareType.youth, Money.ZERO_USD); // We don't get any fares for the skagit transit leg below here because they don't accept ORCA (electronic) @@ -267,8 +262,8 @@ void calculateFareThatExceedsTwoHourFreeTransferWindowTwice() { getLeg(KITSAP_TRANSIT_AGENCY_ID, 240), getLeg(KITSAP_TRANSIT_AGENCY_ID, 270) ); - calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(10)); - calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(10)); + calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(3)); + calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(3)); calculateFare(rides, FareType.youth, Money.ZERO_USD); calculateFare(rides, FareType.electronicSpecial, usDollars(3)); calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE.times(3)); @@ -290,8 +285,8 @@ void calculateFareThatStartsWithACashFare() { getLeg(KITSAP_TRANSIT_AGENCY_ID, 120), getLeg(KITSAP_TRANSIT_AGENCY_ID, 149) ); - calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(6)); - calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(6)); + calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(2)); + calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(2)); calculateFare(rides, FareType.youth, Money.ZERO_USD); calculateFare(rides, FareType.electronicSpecial, DEFAULT_TEST_RIDE_PRICE.plus(ONE_DOLLAR)); calculateFare( @@ -424,16 +419,18 @@ void calculateSoundTransitBusFares() { } @Test - void calculateCashFreeTransferKCMetro() { + void calculateCashFreeTransferKCMetroAndKitsap() { List rides = List.of( getLeg(KC_METRO_AGENCY_ID, 0), getLeg(KC_METRO_AGENCY_ID, 20), getLeg(COMM_TRANS_AGENCY_ID, 45), getLeg(KC_METRO_AGENCY_ID, 60), - getLeg(KC_METRO_AGENCY_ID, 130) + getLeg(KC_METRO_AGENCY_ID, 130), + getLeg(KITSAP_TRANSIT_AGENCY_ID, 131), + getLeg(KITSAP_TRANSIT_AGENCY_ID, 132) ); - calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(3)); - calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(3)); + calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(4)); + calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(4)); calculateFare(rides, FareType.youth, Money.ZERO_USD); calculateFare(rides, FareType.electronicSpecial, usDollars(1.25f)); calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE.times(2)); From b6a298207bfb004b98b7ba006dbe7ee86ec6c2ed Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 2 May 2024 15:09:58 -0700 Subject: [PATCH 1049/1688] implement new transfer logic for Kitsap transit --- .../ext/fares/impl/OrcaFareService.java | 148 ++++++++++-------- 1 file changed, 82 insertions(+), 66 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index a02f37417ec..16e8791cd5f 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -7,6 +7,7 @@ import java.time.ZonedDateTime; import java.util.Collection; import java.util.Currency; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Optional; @@ -23,6 +24,7 @@ import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.organization.Agency; public class OrcaFareService extends DefaultFareService { @@ -50,6 +52,12 @@ public class OrcaFareService extends DefaultFareService { "cash" ); + protected enum TransferType { + ORCA_INTERAGENCY_TRANSFER, + SAME_AGENCY_TRANSFER, + NO_TRANSFER, + } + protected enum RideType { COMM_TRANS_LOCAL_SWIFT, COMM_TRANS_COMMUTER_EXPRESS, @@ -75,12 +83,25 @@ protected enum RideType { SKAGIT_CROSS_COUNTY, UNKNOWN; + public TransferType getTransferType(FareType fareType) { + if (usesOrca(fareType) && this.permitsFreeTransfers()) { + return TransferType.ORCA_INTERAGENCY_TRANSFER; + } else if (this == KC_METRO || this == KITSAP_TRANSIT) { + return TransferType.SAME_AGENCY_TRANSFER; + } + return TransferType.NO_TRANSFER; + } + /** * All transit agencies permit free transfers, apart from these. */ public boolean permitsFreeTransfers() { return switch (this) { - case WASHINGTON_STATE_FERRIES, SKAGIT_TRANSIT -> false; + case WASHINGTON_STATE_FERRIES, + SKAGIT_TRANSIT, + WHATCOM_LOCAL, + WHATCOM_CROSS_COUNTY, + SKAGIT_CROSS_COUNTY -> false; default -> true; }; } @@ -93,6 +114,46 @@ public boolean agencyAcceptsOrca() { } } + static class TransferData { + + Money transferDiscount; + ZonedDateTime transferStartTime; + + FareType fareType; + + public TransferData(FareType fareType) { + this.fareType = fareType; + } + + public Money getDiscountedLegPrice(Leg leg, Money legPrice) { + if (transferStartTime != null) { + var inFreeTransferWindow = inFreeTransferWindow(transferStartTime, leg.getStartTime()); + if (inFreeTransferWindow) { + if (legPrice.greaterThan(transferDiscount)) { + this.transferStartTime = leg.getStartTime(); + var discountedLegFare = legPrice.minus(this.transferDiscount); + this.transferDiscount = legPrice; + return discountedLegFare; + } + return Money.ZERO_USD; + } + } + // Start a new transfer + this.transferDiscount = legPrice; + this.transferStartTime = leg.getStartTime(); + return legPrice; + } + + public void update(Money transferDiscount, ZonedDateTime transferStartTime) { + this.transferDiscount = transferDiscount; + this.transferStartTime = transferStartTime; + } + + public void update(Money transferDiscount) { + this.transferDiscount = transferDiscount; + } + } + /** * Categorizes a leg based on various parameters. * The classifications determine the various rules and fares applied to the leg. @@ -403,17 +464,14 @@ public ItineraryFares calculateFaresForType( Collection fareRules ) { var fare = ItineraryFares.empty(); - ZonedDateTime freeTransferStartTime = null; Money cost = Money.ZERO_USD; - Money orcaFareDiscount = Money.ZERO_USD; + var orcaFareDiscount = new TransferData(fareType); + HashMap perAgencyTransferDiscount = new HashMap<>(); + for (Leg leg : legs) { RideType rideType = getRideType(leg); assert rideType != null; boolean ridePermitsFreeTransfers = rideType.permitsFreeTransfers(); - if (freeTransferStartTime == null && ridePermitsFreeTransfers) { - // The start of a free transfer must be with a transit agency that permits it! - freeTransferStartTime = leg.getStartTime(); - } Optional singleLegPrice = getRidePrice(leg, FareType.regular, fareRules); Optional optionalLegFare = singleLegPrice.flatMap(slp -> getLegFare(fareType, rideType, slp, leg) @@ -424,61 +482,30 @@ public ItineraryFares calculateFaresForType( } Money legFare = optionalLegFare.get(); - boolean inFreeTransferWindow = inFreeTransferWindow( - freeTransferStartTime, - leg.getStartTime() - ); - if (hasFreeTransfers(fareType, rideType) && inFreeTransferWindow) { - // If using Orca (free transfers), the total fare should be equivalent to the - // most expensive leg of the journey. - // If the new fare is more than the current ORCA amount, the transfer is extended. - if (legFare.greaterThan(orcaFareDiscount)) { - freeTransferStartTime = leg.getStartTime(); - // Note: on first leg, discount will be 0 meaning no transfer was applied. - addLegFareProduct(leg, fare, fareType, legFare.minus(orcaFareDiscount), orcaFareDiscount); - orcaFareDiscount = legFare; - } else { - // Ride is free, counts as a transfer if legFare is NOT free - addLegFareProduct( - leg, - fare, - fareType, - Money.ZERO_USD, - legFare.isPositive() ? orcaFareDiscount : Money.ZERO_USD - ); - } - } else if (usesOrca(fareType) && !inFreeTransferWindow) { - // If using Orca and outside of the free transfer window, add the cumulative Orca fare (the maximum leg - // fare encountered within the free transfer window). - cost = cost.plus(orcaFareDiscount); - - // Reset the free transfer start time and next Orca fare as needed. - if (ridePermitsFreeTransfers) { - // The leg is using a ride type that permits free transfers. - // The next free transfer window begins at the start time of this leg. - freeTransferStartTime = leg.getStartTime(); - // Reset the Orca fare to be the fare of this leg. - orcaFareDiscount = legFare; + var transferType = rideType.getTransferType(fareType); + if (transferType == TransferType.ORCA_INTERAGENCY_TRANSFER) { + var discountedFare = orcaFareDiscount.getDiscountedLegPrice(leg, legFare); + var transferDiscount = legFare.minus(discountedFare); + addLegFareProduct(leg, fare, fareType, discountedFare, transferDiscount); + cost = cost.plus(discountedFare); + } else if (transferType == TransferType.SAME_AGENCY_TRANSFER) { + TransferData transferData; + if (perAgencyTransferDiscount.containsKey(leg.getAgency().getName())) { + transferData = perAgencyTransferDiscount.get(leg.getAgency().getName()); } else { - // The leg is not using a ride type that permits free transfers. - // Since there are no free transfers for this leg, increase the total cost by the fare for this leg. - cost = cost.plus(legFare); - // The current free transfer window has expired and won't start again until another leg is - // encountered that does have free transfers. - freeTransferStartTime = null; - // The previous Orca fare has been applied to the total cost. Also, the non-free transfer cost has - // also been applied to the total cost. Therefore, the next Orca cost for the next free-transfer - // window needs to be reset to 0 so that it is not applied after looping through all rides. - orcaFareDiscount = Money.ZERO_USD; + transferData = new TransferData(fareType); + perAgencyTransferDiscount.put(leg.getAgency().getName(), transferData); } - addLegFareProduct(leg, fare, fareType, legFare, Money.ZERO_USD); + var discountedFare = transferData.getDiscountedLegPrice(leg, legFare); + var transferDiscount = legFare.minus(discountedFare); + addLegFareProduct(leg, fare, fareType, discountedFare, transferDiscount); + cost = cost.plus(discountedFare); } else { // If not using Orca, add the agency's default price for this leg. addLegFareProduct(leg, fare, fareType, legFare, Money.ZERO_USD); cost = cost.plus(legFare); } } - cost = cost.plus(orcaFareDiscount); if (cost.fractionalAmount().floatValue() < Float.MAX_VALUE) { var fp = FareProduct .of(new FeedScopedId(FEED_ID, fareType.name()), fareType.name(), cost) @@ -552,7 +579,7 @@ protected Map> fareLegsByFeed(List fareLegs) { /** * Check if trip falls within the transfer time window. */ - private boolean inFreeTransferWindow( + private static boolean inFreeTransferWindow( ZonedDateTime freeTransferStartTime, ZonedDateTime currentLegStartTime ) { @@ -562,17 +589,6 @@ private boolean inFreeTransferWindow( return duration.compareTo(MAX_TRANSFER_DISCOUNT_DURATION) < 0; } - /** - * A free transfer can be applied if using Orca and the transit agency permits free transfers. - */ - private boolean hasFreeTransfers(FareType fareType, RideType rideType) { - // King County Metro allows transfers on cash fare - return ( - (rideType.permitsFreeTransfers() && usesOrca(fareType)) || - (rideType == RideType.KC_METRO && !usesOrca(fareType)) - ); - } - /** * Define Orca fare types. */ From 74430b0ef4c7e593bc32f62838478561b2640f1d Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Fri, 3 May 2024 18:35:16 +0800 Subject: [PATCH 1050/1688] Apply suggestions from code review Co-authored-by: Thomas Gran --- .../opentripplanner/ext/siri/SiriTripPatternCache.java | 8 ++++++-- .../ext/siri/SiriTripPatternIdGenerator.java | 2 ++ .../transit/model/network/TripPattern.java | 8 ++++++-- .../org/opentripplanner/updater/spi/GraphUpdater.java | 9 ++++++--- 4 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index 146fc2ade1e..695db21f467 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -30,6 +30,12 @@ * simply TripPatternCache. * TODO RT_AB: To the extent that double SIRI/GTFS implementations are kept, prefix all names * with GTFS or SIRI or NETEX rather than having no prefix on the GTFS versions. + * TODO RT_TG: There is no clear strategy for what should be in the cache and the transit model and the flow + * between them. The NeTEx and a GTFS version of this should be merged. Having NeTex and GTFS + * specific indexes inside is ok. With the increased usage of DatedServiceJourneys, this should probably + * be part of the main model - not a separate cashe. It is possible that this class works when it comes to + * the thread-safety, but just by looking at a few lines of code I see problems - a strategy needs to be + * analysed, designed and documented. */ public class SiriTripPatternCache { @@ -71,8 +77,6 @@ public SiriTripPatternCache( this.getPatternForTrip = getPatternForTrip; } - // - /** * Get cached trip pattern or create one if it doesn't exist yet. * diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java index e0882bd6215..d5a98088746 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java @@ -12,6 +12,8 @@ * from the SIRI updaters. It is important to create only one instance of this class, and inject * that single instance wherever it is needed. The ID generation is threadsafe, even if that is * probably not needed. + * TODO RT: To make this simpler to use we could make it a "Singelton" (static getInstance() method) - that would + * enforce one instance only, and simplify injection (use getInstance() where needed). */ class SiriTripPatternIdGenerator { diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index 2d64160de2d..a4a6330e895 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -58,7 +58,7 @@ public final class TripPattern private final Route route; /** - * The Route and StopPattern together form the primary key of the TripPattern. They are the shared + * The Route and StopPattern together form the natural key of the TripPattern. They are the shared * set of characteristics that group many trips together into one TripPattern. This grouping saves * memory by not replicating any details shared across all trips in the TripPattern, but it is * also essential to some optimizations in routing algorithms like Raptor. @@ -88,7 +88,11 @@ public final class TripPattern private final boolean containsMultipleModes; private String name; - /** Geometries of each inter-stop segment of the tripPattern. */ + /** + * Geometries of each inter-stop segment of the tripPattern. + * Not used in routing, only for API listing. + * TODO: Encapsulate the byte arrays in a class. + */ private final byte[][] hopGeometries; /** diff --git a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java index e0eed54a6de..9682d560334 100644 --- a/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java +++ b/src/main/java/org/opentripplanner/updater/spi/GraphUpdater.java @@ -3,13 +3,16 @@ /** * Interface for classes that fetch or receive information while the OTP instance is running and * make changes to the Graph and associated transit data to reflect the current situation. This is - * typically information about disruptions to service, bicycle or parking availability, etc.

      + * typically information about disruptions to service, bicycle or parking availability, etc. + *

      * Each GraphUpdater implementation will be run in a separate thread, allowing it to make blocking * calls to fetch data or even sleep between periodic polling operations without affecting the rest - * of the OTP instance.

      + * of the OTP instance. + *

      * GraphUpdater implementations are instantiated by UpdaterConfigurator. Each updater configuration * item in the router-config for a ThingUpdater is mapped to a corresponding configuration class - * ThingUpdaterParameters, which is passed to the ThingUpdater constructor.

      + * ThingUpdaterParameters, which is passed to the ThingUpdater constructor. + *

      * GraphUpdater implementations are only allowed to make changes to the Graph and related structures * by submitting instances implementing GraphWriterRunnable (often anonymous functions) to the * Graph writing callback function supplied to them by the GraphUpdaterManager after they're From 31dc11041b941ca9f8feb94cf4cce2cad55daae3 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 4 May 2024 01:08:05 +0800 Subject: [PATCH 1051/1688] updates in response to PR review --- .../ext/siri/SiriAlertsUpdateHandler.java | 34 ++++++++++++------- .../ext/siri/SiriTimetableSnapshotSource.java | 7 ++-- .../ext/siri/SiriTripPatternCache.java | 5 +-- .../updater/SiriETGooglePubsubUpdater.java | 4 +-- .../ext/siri/updater/SiriETUpdater.java | 4 +-- .../ext/siri/updater/SiriSXUpdater.java | 9 +++-- .../azure/AbstractAzureSiriUpdater.java | 4 +-- .../model/TimetableSnapshot.java | 7 ++-- .../raptoradapter/transit/TransitLayer.java | 9 ++--- .../opentripplanner/routing/graph/Graph.java | 2 +- .../api/OtpServerRequestContext.java | 16 ++++----- .../transit/model/network/StopPattern.java | 6 ++-- .../transit/model/network/TripPattern.java | 4 +-- .../updater/GraphUpdaterManager.java | 2 +- .../alert/GtfsRealtimeAlertsUpdater.java | 4 +-- .../updater/alert/TransitAlertProvider.java | 3 ++ .../updater/spi/GraphUpdater.java | 2 +- .../updater/trip/MqttGtfsRealtimeUpdater.java | 4 +-- .../updater/trip/PollingTripUpdater.java | 4 +-- .../VehicleParkingUpdater.java | 4 +-- .../PollingVehiclePositionUpdater.java | 4 +-- .../vehicle_rental/VehicleRentalUpdater.java | 4 +-- .../model/network/StopPatternTest.java | 2 +- 23 files changed, 74 insertions(+), 70 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java b/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java index d4df702bc19..8a747e765da 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriAlertsUpdateHandler.java @@ -35,11 +35,18 @@ import uk.org.siri.siri20.WorkflowStatusEnumeration; /** - * This updater applies the equivalent of GTFS Alerts, but from SIRI Situation Exchange feeds. + * This updater applies the equivalent of GTFS Alerts, but from SIRI Situation Exchange (SX) feeds. + * As the incoming SIRI SX messages are mapped to internal TransitAlerts, their FeedScopedIds will + * be the single feed ID associated with this update handler, plus the situation number provided in + * the SIRI SX message. + * This class cannot handle situations where incoming messages are being applied to multiple static + * feeds with different IDs. For now it may only work in single-feed regions. A possible workaround + * is to assign the same feed ID to multiple static feeds where it is known that their entity IDs + * are all drawn from the same namespace (i.e. they are functionally fragments of the same feed). + * TODO RT_AB: Internal FeedScopedId creation strategy should probably be pluggable or configurable. + * TG has indicated this is a necessary condition for moving this updater out of sandbox. * TODO RT_AB: The name should be clarified, as there is no such thing as "SIRI Alerts", and it * is referencing the internal model concept of "Alerts" which are derived from GTFS terminology. - * NOTE this cannot handle situations where incoming messages are being applied to multiple static - * feeds with different IDs (for now it may only work in single-feed regions). */ public class SiriAlertsUpdateHandler { @@ -47,8 +54,6 @@ public class SiriAlertsUpdateHandler { private final String feedId; private final Set alerts = new HashSet<>(); private final TransitAlertService transitAlertService; - - /** The alert should be displayed to users this long before the activePeriod begins. */ private final Duration earlyStart; /** @@ -57,6 +62,9 @@ public class SiriAlertsUpdateHandler { */ private final AffectsMapper affectsMapper; + /** + * @param earlyStart display the alerts to users this long before their activePeriod begins + */ public SiriAlertsUpdateHandler( String feedId, TransitModel transitModel, @@ -98,7 +106,7 @@ public void update(ServiceDelivery delivery) { } else { TransitAlert alert = null; try { - alert = handleAlert(sxElement); + alert = mapSituationToAlert(sxElement); addedCounter++; } catch (Exception e) { LOG.info( @@ -129,12 +137,11 @@ public void update(ServiceDelivery delivery) { } /** - * FIXME RT_AB: This does not just "handle" an alert, it builds an internal model Alert from - * an incoming SIRI situation exchange element. It is a mapper or factory. - * It may return null if the header, description, and detail text are all empty or missing in the + * Build an internal model Alert from an incoming SIRI situation exchange element. + * May return null if the header, description, and detail text are all empty or missing in the * SIRI message. In all other cases it will return a valid TransitAlert instance. */ - private TransitAlert handleAlert(PtSituationElement situation) { + private TransitAlert mapSituationToAlert(PtSituationElement situation) { TransitAlertBuilder alert = createAlertWithTexts(situation); if ( @@ -213,9 +220,10 @@ private long getEpochSecond(ZonedDateTime startTime) { } /* - * Creates a builder for an internal model TransitAlert, including all textual content from the - * supplied SIRI PtSituation. The feed scoped ID of this TransitAlert will be the single feed ID - * associated with this update handler, plus the situation number provided in the SIRI feed. + * Creates a builder for an internal model TransitAlert. The builder is pre-filled with all + * textual content from the supplied SIRI PtSituation. The builder also has the feed scoped ID + * pre-set to the single feed ID associated with this update handler, plus the situation number + * provided in the SIRI PtSituation. */ private TransitAlertBuilder createAlertWithTexts(PtSituationElement situation) { return TransitAlert diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index d7b096adabe..080a1535284 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -138,8 +138,7 @@ public TimetableSnapshot getTimetableSnapshot() { * * @param fullDataset true iff the list with updates represent all updates that are active right * now, i.e. all previous updates should be disregarded - * @param updates SIRI VehicleMonitoringDeliveries that should be applied atomically - * FIXME RT_AB: aren't these ET deliveries, not VM? + * @param updates SIRI EstimatedTimetable deliveries that should be applied atomically. */ public UpdateResult applyEstimatedTimetable( @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher, @@ -375,9 +374,7 @@ private Result addTripToGraphAndBuffer(TripUpdate tr trip, serviceDate ); - - // Add new trip times to the buffer and return result with success or error. The update method - // will perform protective copies as needed, whether pattern is created by realtime data or not. + // Add new trip times to buffer, making protective copies as needed. Bubble success/error up. var result = buffer.update(pattern, tripUpdate.tripTimes(), serviceDate); LOG.debug("Applied real-time data for trip {} on {}", trip, serviceDate); return result; diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index 695db21f467..5cce9031e1b 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -46,8 +46,9 @@ public class SiriTripPatternCache { // in the GTFS version of this class, but with service date as part of the key. private final Map cache = new HashMap<>(); - // This appears to be a SIRI-specific index for use in GraphQL APIs. - // It is not present on the GTFS-RT version of this class. + // TODO RT_AB: Improve documentation. This field appears to be an index that exists only in the + // SIRI version of this class (i.e. this version and not the older TripPatternCache that + // handles GTFS-RT). This index appears to be tailored for use by the Transmodel GraphQL APIs. private final ListMultimap patternsForStop = Multimaps.synchronizedListMultimap( ArrayListMultimap.create() ); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index 4b5797f03de..1e06d334e74 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -166,8 +166,8 @@ public SiriETGooglePubsubUpdater( } @Override - public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) { - this.saveResultOnGraph = saveResultOnGraph; + public void setup(WriteToGraphCallback writeToGraphCallback) { + this.saveResultOnGraph = writeToGraphCallback; } @Override diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java index c8ccd2c533b..66007f4aed8 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java @@ -77,8 +77,8 @@ public SiriETUpdater( } @Override - public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) { - this.saveResultOnGraph = saveResultOnGraph; + public void setup(WriteToGraphCallback writeToGraphCallback) { + this.saveResultOnGraph = writeToGraphCallback; } /** diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java index 77ccddfc736..5ededbb3bf0 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriSXUpdater.java @@ -35,7 +35,7 @@ public class SiriSXUpdater extends PollingGraphUpdater implements TransitAlertPr // TODO RT_AB: Document why SiriAlertsUpdateHandler is a separate instance that persists across // many graph update operations. private final SiriAlertsUpdateHandler updateHandler; - private WriteToGraphCallback saveResultOnGraph; + private WriteToGraphCallback writeToGraphCallback; private ZonedDateTime lastTimestamp = ZonedDateTime.now().minusWeeks(1); private String requestorRef; /** @@ -87,9 +87,8 @@ public SiriSXUpdater(SiriSXUpdaterParameters config, TransitModel transitModel) } @Override - public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) { - // TODO RT_AB: Consider renaming this callback. Its name is currently like an imperative verb. - this.saveResultOnGraph = saveResultOnGraph; + public void setup(WriteToGraphCallback writeToGraphCallback) { + this.writeToGraphCallback = writeToGraphCallback; } public TransitAlertService getTransitAlertService() { @@ -150,7 +149,7 @@ private void updateSiri() { // All that said, out of all the update types, Alerts (and SIRI SX) are probably the ones // that would be most tolerant of non-versioned application-wide storage since they don't // participate in routing and are tacked on to already-completed routing responses. - saveResultOnGraph.execute((graph, transitModel) -> { + writeToGraphCallback.execute((graph, transitModel) -> { updateHandler.update(serviceDelivery); if (markPrimed) { primed = true; diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java index f96941c7370..3023ff8359b 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/AbstractAzureSiriUpdater.java @@ -92,8 +92,8 @@ public AbstractAzureSiriUpdater(SiriAzureUpdaterParameters config, TransitModel protected abstract void errorConsumer(ServiceBusErrorContext errorContext); @Override - public void setGraphUpdaterManager(WriteToGraphCallback saveResultOnGraph) { - this.saveResultOnGraph = saveResultOnGraph; + public void setup(WriteToGraphCallback writeToGraphCallback) { + this.saveResultOnGraph = writeToGraphCallback; } @Override diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index cf254472a43..136d70fd7d9 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -196,11 +196,10 @@ public boolean hasRealtimeAddedTripPatterns() { /** * Update the TripTimes of one Trip in a Timetable of a TripPattern. If the Trip of the TripTimes * does not exist yet in the Timetable, add it. This method will make a protective copy - * of the Timetable if such a copy has not already been made while building up this snapshot. + * of the Timetable if such a copy has not already been made while building up this snapshot, + * handling both cases where patterns were pre-existing in static data or created by realtime data. * - * @param pattern trip pattern - * @param updatedTripTimes updated trip times - * @param serviceDate service day for which this update is valid + * @param serviceDate service day for which this update is valid * @return whether the update was actually applied */ public Result update( diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java index 6757dbccae0..e8dacee87a8 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java @@ -22,10 +22,11 @@ * and indexed differently for efficient use by the Raptor router. Patterns and trips are split out * by days, retaining only the services actually running on any particular day. * - * TODO RT_AB: this name is apparently modeled after R5, where the TransportNetwork is split into - * two layers (one for the streets and one for the public transit data). Here the situation is - * different: this seems to be an indexed and rearranged copy of the main transit data (a - * TransitModel instance). + * TODO RT_AB: this name may reflect usage in R5, where the TransportNetwork encompasses two + * sub-aggregates (one for the streets and one for the public transit data). Here, the TransitLayer + * seems to just be an indexed and rearranged copy of the main TransitModel instance. TG has + * indicated that "layer" should be restricted in its standard OO meaning, and this class should + * really be merged into TransitModel. */ public class TransitLayer { diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java index ba83ed6886d..4b6c9938317 100644 --- a/src/main/java/org/opentripplanner/routing/graph/Graph.java +++ b/src/main/java/org/opentripplanner/routing/graph/Graph.java @@ -59,7 +59,7 @@ * In some sense the Graph is just some indexes into a set of vertices. The Graph used to hold lists * of edges for each vertex, but those lists are now attached to the vertices themselves. *

      - * TODO RT_AB: rename to StreetGraph to emphasize what it represents? + * TODO RT_AB: I favor renaming to StreetGraph to emphasize what it represents. TG agreed in review. */ public class Graph implements Serializable { diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index d1d565eeb0d..b632ea6104b 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -30,16 +30,14 @@ import org.opentripplanner.transit.service.TransitService; /** - * The purpose of this class is to allow APIs (HTTP Resources) to access the OTP Server Context. - * FIXME RT_AB: Expand and clarify descriptions, which are circular (OtpServerRequestContext - * provides access to OTP Server Context). What exactly does "Server Context" mean here? - * What does "access" mean? Does this mean it "allows individual requests to call a limited - * number of methods on the components of the server without direct access to their internals?" + * The purpose of this class is to give APIs (HTTP Resources) read-only access to the OTP internal + * transit model. It allows individual API requests to use a limited number of methods and data + * structures without direct access to the internals of the server components. + * * By using an interface, and not injecting each service class we avoid giving the resources access - * to the server implementation. The context is injected by Jersey. An alternative to injecting this - * interface is to inject each individual component in the context - hence reducing the dependencies - * further. - * TODO RT_AB: clarify how injecting more individual components would "reduce dependencies further". + * to the server implementation. The context is injected by Jersey. Instead of injecting this + * context interface, it is conceivable to inject each of the individual items within this context. + * * But there is not a "real" need for this. For example, we do not have unit tests on the * Resources. If we in the future would decide to write unit tests for the APIs, then we could * eliminate this interface and just inject the components. See the bind method in OTPServer. diff --git a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java index 21b911f500a..3fc51cea0c6 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/StopPattern.java @@ -90,13 +90,11 @@ public static StopPatternBuilder create(int length) { * This has package local access since a StopPattern is a part of a TripPattern. To change it * use the {@link TripPattern#copyPlannedStopPattern()} method. */ - StopPatternBuilder mutate() { + StopPatternBuilder copyOf() { return new StopPatternBuilder(this, null); } - // TODO RT_AB: Rename and add documentation. This method does not mutate the object in place, it - // makes a copy. Confirmed in discussion that this should have a different name like "copy". - StopPatternBuilder mutate(StopPattern realTime) { + StopPatternBuilder copyOf(StopPattern realTime) { return new StopPatternBuilder(this, realTime); } diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index a4a6330e895..8e0ec4c6129 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -200,8 +200,8 @@ public StopPattern getStopPattern() { */ public StopPattern.StopPatternBuilder copyPlannedStopPattern() { return isModified() - ? originalTripPattern.stopPattern.mutate(stopPattern) - : stopPattern.mutate(); + ? originalTripPattern.stopPattern.copyOf(stopPattern) + : stopPattern.copyOf(); } public LineString getGeometry() { diff --git a/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java b/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java index 09b7966908e..0dad35bfcd8 100644 --- a/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java +++ b/src/main/java/org/opentripplanner/updater/GraphUpdaterManager.java @@ -90,7 +90,7 @@ public GraphUpdaterManager(Graph graph, TransitModel transitModel, List Date: Sat, 4 May 2024 01:32:22 +0800 Subject: [PATCH 1052/1688] Update javadoc in response to PR review --- .../transit/model/network/TripPattern.java | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index 8e0ec4c6129..ae7a605d5c1 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -42,6 +42,11 @@ * stop). Trips are assumed to be non-overtaking, so that an earlier trip never arrives after a * later trip. *

      + * The Route and StopPattern together form the natural key of the TripPattern. They are the shared + * set of characteristics that group many trips together into one TripPattern. This grouping saves + * memory by not replicating any details shared across all trips in the TripPattern, but it is + * also essential to some optimizations in routing algorithms like Raptor. + *

      * This is called a JOURNEY_PATTERN in the Transmodel vocabulary. However, GTFS calls a Transmodel * JOURNEY a "trip", thus TripPattern. *

      @@ -58,11 +63,6 @@ public final class TripPattern private final Route route; /** - * The Route and StopPattern together form the natural key of the TripPattern. They are the shared - * set of characteristics that group many trips together into one TripPattern. This grouping saves - * memory by not replicating any details shared across all trips in the TripPattern, but it is - * also essential to some optimizations in routing algorithms like Raptor. - *

      * This field should not be accessed outside this class. All access to the StopPattern is * performed through method delegation, like the {@link #numberOfStops()} and * {@link #canBoard(int)} methods. @@ -73,15 +73,18 @@ public final class TripPattern * TripPatterns hold a reference to a Timetable (i.e. TripTimes for all Trips in the pattern) for * only scheduled trips from the GTFS or NeTEx data. If any trips were later updated in real time, * there will be another Timetable holding those updates and reading through to the scheduled one. - * This realtime Timetable is retrieved from a TimetableSnapshot. - * Also see end of Javadoc on TimetableSnapshot for more details. + * That other realtime Timetable is retrieved from a TimetableSnapshot (see end of Javadoc on + * TimetableSnapshot for more details). + * TODO RT_AB: The above system should be changed to integrate realtime and scheduled data more + * closely. The Timetable may become obsolete or change significantly when they are integrated. */ private final Timetable scheduledTimetable; - // This TransitMode is a redundant replication/memoization of information on the Route. + // This TransitMode is arguably a redundant replication/memoization of information on the Route. // It appears that in the TripPatternBuilder it is only ever set from a Trip which is itself set - // from a Route. - // TODO RT_AB: confirm whether there is any reason this doesn't just read through to Route. + // from a Route. This does not just read through to Route because in Netex trips may override + // the mode of their route. But we need to establish with more clarity whether our internal model + // TripPatterns allow trips of mixed modes, or rather if a single mode is part of their unique key. private final TransitMode mode; private final SubMode netexSubMode; From e0f74f197283e15e028f91a126d593144c889387 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 4 May 2024 01:35:21 +0800 Subject: [PATCH 1053/1688] formatting (mvn prettier:write) --- .../opentripplanner/ext/siri/SiriTripPatternCache.java | 6 +++--- .../transit/model/network/TripPattern.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index 5cce9031e1b..4411e096ebc 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -31,11 +31,11 @@ * TODO RT_AB: To the extent that double SIRI/GTFS implementations are kept, prefix all names * with GTFS or SIRI or NETEX rather than having no prefix on the GTFS versions. * TODO RT_TG: There is no clear strategy for what should be in the cache and the transit model and the flow - * between them. The NeTEx and a GTFS version of this should be merged. Having NeTex and GTFS - * specific indexes inside is ok. With the increased usage of DatedServiceJourneys, this should probably + * between them. The NeTEx and a GTFS version of this should be merged. Having NeTex and GTFS + * specific indexes inside is ok. With the increased usage of DatedServiceJourneys, this should probably * be part of the main model - not a separate cashe. It is possible that this class works when it comes to * the thread-safety, but just by looking at a few lines of code I see problems - a strategy needs to be - * analysed, designed and documented. + * analysed, designed and documented. */ public class SiriTripPatternCache { diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index ae7a605d5c1..e59d9f5125c 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -91,11 +91,11 @@ public final class TripPattern private final boolean containsMultipleModes; private String name; - /** - * Geometries of each inter-stop segment of the tripPattern. - * Not used in routing, only for API listing. - * TODO: Encapsulate the byte arrays in a class. - */ + /** + * Geometries of each inter-stop segment of the tripPattern. + * Not used in routing, only for API listing. + * TODO: Encapsulate the byte arrays in a class. + */ private final byte[][] hopGeometries; /** From 07642672c80d1ca46795da81f8077e69cd1132e8 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 4 May 2024 01:40:19 +0800 Subject: [PATCH 1054/1688] Update updater/package.md Co-authored-by: Thomas Gran --- src/main/java/org/opentripplanner/updater/package.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md index 1a7c79f52b6..e6dc485d4df 100644 --- a/src/main/java/org/opentripplanner/updater/package.md +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -2,7 +2,7 @@ ## Realtime Data Sources -Published transit data is broadly divided into two categories, which represent different time scales. On one hand we have scheduled data (also called static or theoretical data), and on the other hand realtime (or dynamic) data. Scheduled data is supplied in GTFS or NeTEx format, with the corresponding realtime data supplied in the [GTFS-RT](https://gtfs.org/realtime/reference/) and [SIRI](https://www.siri-cen.eu/) formats, respectively. This package contains code that retrieves and decodes realtime data, then layers it on top of the static transit data in a live OTP instance while it continues to handle routing requests. +Published transit data is broadly divided into two categories, which represent different time scales. On one hand we have scheduled data (also called planned or static data), and on the other hand realtime data. Scheduled data is supplied in GTFS or NeTEx format, with the corresponding realtime data supplied in the [GTFS-RT](https://gtfs.org/realtime/reference/) and [SIRI](https://www.siri-cen.eu/) formats, respectively. This package contains code that retrieves and decodes realtime data, then layers it on top of the static transit data in a live OTP instance while it continues to handle routing requests. Different data producers might update their scheduled data every month, week, or day. Realtime data then covers any changes to service at a timescale shorter than that of a given producer's scheduled data. Broadly speaking, realtime data represents short-term unexpected or unplanned changes that modify the planned schedules, and could require changes to journeys that the riders would not expect from the schedule. OpenTripPlanner uses three main categories of realtime data which are summarized in the table below. The SIRI specification includes more types, but OTP handles only these three that correspond to the three GTFS-RT types. From b5f6a708e1148ad1fdee0eee575748f5ee99cbd7 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 3 May 2024 13:23:03 -0700 Subject: [PATCH 1055/1688] orca fares: general cleanup and fix for xfer value --- .../ext/fares/impl/OrcaFareService.java | 49 ++++++++++--------- 1 file changed, 27 insertions(+), 22 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index 16e8791cd5f..8e2118c0800 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.fares.impl; +import static org.opentripplanner.transit.model.basic.Money.ZERO_USD; import static org.opentripplanner.transit.model.basic.Money.usDollars; import com.google.common.collect.Lists; @@ -116,13 +117,14 @@ public boolean agencyAcceptsOrca() { static class TransferData { - Money transferDiscount; - ZonedDateTime transferStartTime; + private Money transferDiscount; + private ZonedDateTime transferStartTime; - FareType fareType; - - public TransferData(FareType fareType) { - this.fareType = fareType; + public Money getTransferDiscount() { + if (this.transferDiscount == null) { + return ZERO_USD; + } + return this.transferDiscount; } public Money getDiscountedLegPrice(Leg leg, Money legPrice) { @@ -143,15 +145,6 @@ public Money getDiscountedLegPrice(Leg leg, Money legPrice) { this.transferStartTime = leg.getStartTime(); return legPrice; } - - public void update(Money transferDiscount, ZonedDateTime transferStartTime) { - this.transferDiscount = transferDiscount; - this.transferStartTime = transferStartTime; - } - - public void update(Money transferDiscount) { - this.transferDiscount = transferDiscount; - } } /** @@ -465,13 +458,12 @@ public ItineraryFares calculateFaresForType( ) { var fare = ItineraryFares.empty(); Money cost = Money.ZERO_USD; - var orcaFareDiscount = new TransferData(fareType); + var orcaFareDiscount = new TransferData(); HashMap perAgencyTransferDiscount = new HashMap<>(); for (Leg leg : legs) { RideType rideType = getRideType(leg); assert rideType != null; - boolean ridePermitsFreeTransfers = rideType.permitsFreeTransfers(); Optional singleLegPrice = getRidePrice(leg, FareType.regular, fareRules); Optional optionalLegFare = singleLegPrice.flatMap(slp -> getLegFare(fareType, rideType, slp, leg) @@ -484,21 +476,34 @@ public ItineraryFares calculateFaresForType( var transferType = rideType.getTransferType(fareType); if (transferType == TransferType.ORCA_INTERAGENCY_TRANSFER) { + // Important to get transfer discount before calculating next leg price + var transferDiscount = orcaFareDiscount.getTransferDiscount(); var discountedFare = orcaFareDiscount.getDiscountedLegPrice(leg, legFare); - var transferDiscount = legFare.minus(discountedFare); - addLegFareProduct(leg, fare, fareType, discountedFare, transferDiscount); + addLegFareProduct( + leg, + fare, + fareType, + discountedFare, + legFare.greaterThan(ZERO_USD) ? transferDiscount : ZERO_USD + ); cost = cost.plus(discountedFare); } else if (transferType == TransferType.SAME_AGENCY_TRANSFER) { TransferData transferData; if (perAgencyTransferDiscount.containsKey(leg.getAgency().getName())) { transferData = perAgencyTransferDiscount.get(leg.getAgency().getName()); } else { - transferData = new TransferData(fareType); + transferData = new TransferData(); perAgencyTransferDiscount.put(leg.getAgency().getName(), transferData); } + var transferDiscount = transferData.transferDiscount; var discountedFare = transferData.getDiscountedLegPrice(leg, legFare); - var transferDiscount = legFare.minus(discountedFare); - addLegFareProduct(leg, fare, fareType, discountedFare, transferDiscount); + addLegFareProduct( + leg, + fare, + fareType, + discountedFare, + legFare.greaterThan(ZERO_USD) ? transferDiscount : ZERO_USD + ); cost = cost.plus(discountedFare); } else { // If not using Orca, add the agency's default price for this leg. From e33d710875a908c17d6cc0e06818290d1ba7b109 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Fri, 3 May 2024 13:30:58 -0700 Subject: [PATCH 1056/1688] fix(orca-fares): use getter for transfer discount --- .../org/opentripplanner/ext/fares/impl/OrcaFareService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java index 8e2118c0800..8f961b0b01b 100644 --- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java +++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java @@ -495,7 +495,7 @@ public ItineraryFares calculateFaresForType( transferData = new TransferData(); perAgencyTransferDiscount.put(leg.getAgency().getName(), transferData); } - var transferDiscount = transferData.transferDiscount; + var transferDiscount = transferData.getTransferDiscount(); var discountedFare = transferData.getDiscountedLegPrice(leg, legFare); addLegFareProduct( leg, From 97d99b09a6f3dde455d9a9d5aadbe5395bde4f79 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sat, 4 May 2024 23:44:42 +0800 Subject: [PATCH 1057/1688] Update src/main/java/org/opentripplanner/updater/package.md Co-authored-by: Thomas Gran --- src/main/java/org/opentripplanner/updater/package.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md index e6dc485d4df..4855a6a5e51 100644 --- a/src/main/java/org/opentripplanner/updater/package.md +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -36,7 +36,14 @@ As mentioned above, these GraphWriterRunnable instances must write to the transi This writable buffer of transit data is periodically made immutable and swapped into the role of a live snapshot, which is ready to be handed off to any incoming routing requests. Each time an immutable snapshot is created, a new writable buffer is created by making a shallow copy of the root instance in the transit data aggreagate. This functions like a double-buffering system, except that any number of snapshots can exist at once, and large subsets of the data can be shared across snapshots. As older snapshots (and their component parts) fall out of use, they are dereferenced and become eligible for garbage collection. Although the buffer swap could in principle occur after every write operation, it can incur significant copying and indexing overhead. When incremental message-oriented updaters are present this overhead would be incurred more often than necesary. Snapshots can be throttled to occur at most every few seconds, thereby reducing the total overhead at no perceptible cost to realtime visibility latency. -This is essentially a multi-version snapshot concurrency control system, inspired by widely used database engines (and in fact informed by books on transactional database design). The end result is a system where 1) writing operations are simple to reason about and cannot conflict because only one write happens at a time; 2) multiple read operations (including routing requests) can occur concurrently; 3) read operations do not need to pause while writes are happening; 4) read operations see only fully completed write operations, never partial writes; and 5) each read operation sees a consistent, unchanging view of the transit data. +This is essentially a multi-version snapshot concurrency control system, inspired by widely used database engines (and in fact informed by books on transactional database design). The end result is a system where: +

        +
      1. writing operations are simple to reason about and cannot conflict because only one write happens at a time.
        2. +
      2. multiple read operations (including routing requests) can occur concurrently.
        3. +
      3. read operations do not need to pause while writes are happening.
        4. +
      4. read operations see only fully completed write operations, never partial writes.
        5. +
      5. each read operation sees a consistent, unchanging view of the transit data.
        6. +
          An important characteristic of this approach is that _no locking is necessary_. However, some form of synchronization is used during the buffer swap operation to impose a consistent view of the whole data structure via a happens-before relationship as defined by the Java memory model. While pointers to objects can be handed between threads with no read-tearing of the pointer itself, there is no guarantee that the web of objects pointed to will be consistent without some explicit synchronization at the hand-off. From f4a23d837138d50885b2b30eac0e6dffe702fbbf Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Sun, 5 May 2024 00:26:58 +0800 Subject: [PATCH 1058/1688] update package.md in response to PR review --- .../org/opentripplanner/updater/package.md | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md index 4855a6a5e51..134416ac826 100644 --- a/src/main/java/org/opentripplanner/updater/package.md +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -4,7 +4,7 @@ Published transit data is broadly divided into two categories, which represent different time scales. On one hand we have scheduled data (also called planned or static data), and on the other hand realtime data. Scheduled data is supplied in GTFS or NeTEx format, with the corresponding realtime data supplied in the [GTFS-RT](https://gtfs.org/realtime/reference/) and [SIRI](https://www.siri-cen.eu/) formats, respectively. This package contains code that retrieves and decodes realtime data, then layers it on top of the static transit data in a live OTP instance while it continues to handle routing requests. -Different data producers might update their scheduled data every month, week, or day. Realtime data then covers any changes to service at a timescale shorter than that of a given producer's scheduled data. Broadly speaking, realtime data represents short-term unexpected or unplanned changes that modify the planned schedules, and could require changes to journeys that the riders would not expect from the schedule. OpenTripPlanner uses three main categories of realtime data which are summarized in the table below. The SIRI specification includes more types, but OTP handles only these three that correspond to the three GTFS-RT types. +Different data producers might update their scheduled data every month, week, or day; some even update it multiple times per day. Realtime data then covers any changes to service at a timescale shorter than that of a given producer's scheduled data. Broadly speaking, realtime data represents short-term unexpected or unplanned changes that modify the planned schedules, and could require changes to journeys that the riders would not expect from the schedule. OpenTripPlanner uses three main categories of realtime data which are summarized in the table below. The SIRI specification includes more types, but OTP handles only these three that correspond to the three GTFS-RT types. | GTFS-RT Name | SIRI Name | Description | |----------------------------------------------------------------------------------|--------------------------|-----------------------------------------------------------------------| @@ -12,7 +12,7 @@ Different data producers might update their scheduled data every month, week, or | [Trip Update](https://gtfs.org/realtime/reference/#message-tripupdate) | Estimated Timetable (ET) | Observed or expected arrival and departure times for near-term trips | | [Vehicle Position](https://gtfs.org/realtime/reference/#message-vehicleposition) | Vehicle Monitoring (VM) | Physical location of vehicles currently providing service | -GTFS-RT takes the form of binary protocol buffer messages that are typically fetched over HTTP. On the other hand, the SIRI specification originally described SOAP remote procedure calls retrieving an XML representation of the messages. Various projects instead adopted simple HTTP GET requests passing parameters in the URL and returning a JSON representation. The latter approach was eventually officially recognized as "SIRI Lite". +GTFS-RT takes the form of binary protocol buffer messages that are typically fetched over HTTP. On the other hand, the SIRI specification originally described SOAP remote procedure calls retrieving an XML representation of the messages. Various projects instead adopted simple HTTP GET requests passing parameters in the URL and optionally returning a JSON representation instead of XML. This latter approach was officially recognized as "SIRI Lite", has become quite common, and is the approach supported by OTP. Because OTP handles both GTFS-RT and SIRI data sources, there will often be two equivalent classes for retrieving and interpreting a particular kind of realtime data. For example, there is a SiriAlertsUpdateHandler and an AlertsUpdateHandler. The SIRI variants are typically prefixed with `Siri` while the GTFS-RT ones have no prefix for historical reasons (the GTFS-RT versions were originally the only ones). These should perhaps be renamed with a `GtfsRt` prefix for symmetry. Once the incoming messages have been decoded, they will ideally be mapped into a single internal class that was originally derived from GTFS-RT but has been extended to cover all information afforded by both GTFS and SIRI. For example, both classes mentioned above produce TransitAlert instances. These uniform internal representations can then be applied to the internal transit model using a single mechanism, independent of the message source type. @@ -24,6 +24,8 @@ The following approach to realtime concurrency was devised around 2013 when OTP On 11 January 2024 a team of OTP developers reviewed this realtime concurrency approach together. The conclusion was that this approach remains sound, and that any consistency problems were not due to the approach itself, but rather due to its partial or erroneous implementation in realtime updater classes. Therefore, we decided to continue applying this approach in any new work on the realtime subsystem, at least until we encounter some situation that does not fit within this model. All existing realtime code that is not consistent with this approach should progressively be brought in line with it. +In OTP's internal transit model, realtime data is currently stored separately from the scheduled data. This is only because realtime was originally introduced as an optional extra feature. Now that realtime is very commonly used, we intend to create a single unified transit model that will nonetheless continue to apply the same concurrency approach. + The following is a sequence diagram showing how threads are intended to communicate. Unlike some common forms of sequence diagrams, time is on the horizontal axis here. Each horizontal line represents either a thread of execution (handling incoming realtime messages or routing requests) or a queue or buffer data structure. Dotted lines represent object references being handed off, and solid lines represent data being copied. ![Realtime sequence diagram](images/updater-threads-queues.svg) @@ -37,13 +39,14 @@ As mentioned above, these GraphWriterRunnable instances must write to the transi This writable buffer of transit data is periodically made immutable and swapped into the role of a live snapshot, which is ready to be handed off to any incoming routing requests. Each time an immutable snapshot is created, a new writable buffer is created by making a shallow copy of the root instance in the transit data aggreagate. This functions like a double-buffering system, except that any number of snapshots can exist at once, and large subsets of the data can be shared across snapshots. As older snapshots (and their component parts) fall out of use, they are dereferenced and become eligible for garbage collection. Although the buffer swap could in principle occur after every write operation, it can incur significant copying and indexing overhead. When incremental message-oriented updaters are present this overhead would be incurred more often than necesary. Snapshots can be throttled to occur at most every few seconds, thereby reducing the total overhead at no perceptible cost to realtime visibility latency. This is essentially a multi-version snapshot concurrency control system, inspired by widely used database engines (and in fact informed by books on transactional database design). The end result is a system where: -
            -
          1. writing operations are simple to reason about and cannot conflict because only one write happens at a time.
            2. -
          2. multiple read operations (including routing requests) can occur concurrently.
            3. -
          3. read operations do not need to pause while writes are happening.
            4. -
          4. read operations see only fully completed write operations, never partial writes.
            5. -
          5. each read operation sees a consistent, unchanging view of the transit data.
            6. -
              + +1. Writing operations are simple to reason about and cannot conflict because only one write happens at a time. +1. Multiple read operations (including routing requests) can occur concurrently. +1. Read operations do not need to pause while writes are happening. +1. Read operations see only fully completed write operations, never partial writes. +1. Each read operation sees a consistent, unchanging view of the transit data. +1. Each external API request sees a consistent data set, meaning all services that the + query directly or indirectly uses are operating on the same version of the data. An important characteristic of this approach is that _no locking is necessary_. However, some form of synchronization is used during the buffer swap operation to impose a consistent view of the whole data structure via a happens-before relationship as defined by the Java memory model. While pointers to objects can be handed between threads with no read-tearing of the pointer itself, there is no guarantee that the web of objects pointed to will be consistent without some explicit synchronization at the hand-off. From 8ad34a5c68e99f5dbcc73e9a9100177f49e9ace1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 5 May 2024 04:16:00 +0000 Subject: [PATCH 1059/1688] Update jackson.version to v2.17.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce89fc467e6..fd55f783970 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 31.0 2.51.1 - 2.17.0 + 2.17.1 3.1.6 5.10.2 1.12.3 From b47dfe8e6eb09b71cb9d0b53ab2b8fd50fa7fd9b Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 6 May 2024 11:39:00 +0000 Subject: [PATCH 1060/1688] Add changelog entry for #5826 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 2ba638c9ab1..ff97b7c822b 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -17,6 +17,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) - Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) - De-emphasize mailing list in landing page [#5820](https://github.com/opentripplanner/OpenTripPlanner/pull/5820) +- ORCA Fares: Add free cash transfers for Kitsap transit [#5826](https://github.com/opentripplanner/OpenTripPlanner/pull/5826) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 51f466f88e944faf2eb6a3a84be84936c5d55bf6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 13:41:44 +0200 Subject: [PATCH 1061/1688] Clean up changelog [ci skip] --- README.md | 2 +- docs/Changelog.md | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 5e016c22bb2..4a5fa77c7ee 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ ## Overview [![Join the chat at https://gitter.im/opentripplanner/OpenTripPLanner](https://badges.gitter.im/opentripplanner/OpenTripPlanner.svg)](https://gitter.im/opentripplanner/OpenTripPlanner) -[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im) +[![Matrix](https://img.shields.io/matrix/opentripplanner%3Amatrix.org?label=Matrix%20chat&?cacheSeconds=172800)](https://matrix.to/#/#opentripplanner_OpenTripPlanner:gitter.im) [![codecov](https://codecov.io/gh/opentripplanner/OpenTripPlanner/branch/dev-2.x/graph/badge.svg?token=ak4PbIKgZ1)](https://codecov.io/gh/opentripplanner/OpenTripPlanner) [![Commit activity](https://img.shields.io/github/commit-activity/y/opentripplanner/OpenTripPlanner)](https://github.com/opentripplanner/OpenTripPlanner/graphs/contributors) [![Docker Pulls](https://img.shields.io/docker/pulls/opentripplanner/opentripplanner)](https://hub.docker.com/r/opentripplanner/opentripplanner) diff --git a/docs/Changelog.md b/docs/Changelog.md index ff97b7c822b..cafc677ccc6 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -16,8 +16,6 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix trip duplication in Graph Builder DSJ mapping [#5794](https://github.com/opentripplanner/OpenTripPlanner/pull/5794) - Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) - Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) -- De-emphasize mailing list in landing page [#5820](https://github.com/opentripplanner/OpenTripPlanner/pull/5820) -- ORCA Fares: Add free cash transfers for Kitsap transit [#5826](https://github.com/opentripplanner/OpenTripPlanner/pull/5826) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 2dd2825a421f8ca5bc8f93d36a12f3f46e5c3cfa Mon Sep 17 00:00:00 2001 From: Johan Torin Date: Fri, 3 May 2024 17:20:26 +0200 Subject: [PATCH 1062/1688] Add test-case for explicit null modes parameter. --- .../mapping/TripRequestMapperTest.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 22524a0297b..654c52ce912 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -16,9 +16,11 @@ import java.time.Duration; import java.time.LocalDate; import java.util.Collections; +import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.Optional; import java.util.function.Function; import java.util.stream.Stream; import org.junit.jupiter.api.BeforeEach; @@ -365,6 +367,21 @@ public void testEmptyModes() { assertEquals(StreetMode.WALK, req.journey().transfer().mode()); } + @Test + public void testNullModes() { + HashMap modes = new HashMap<>(); + modes.put("accessMode", null); + modes.put("egressMode", null); + modes.put("directMode", null); + Map arguments = Map.of("modes", modes); + var req = TripRequestMapper.createRequest(executionContext(arguments)); + + assertEquals(StreetMode.NOT_SET, req.journey().access().mode()); + assertEquals(StreetMode.NOT_SET, req.journey().egress().mode()); + assertEquals(StreetMode.NOT_SET, req.journey().direct().mode()); + assertEquals(StreetMode.WALK, req.journey().transfer().mode()); + } + @Test public void testExplicitModes() { Map arguments = Map.of( From 4013d70e0baca11a42e053ffaa76daa5ce188e62 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 14:26:37 +0200 Subject: [PATCH 1063/1688] Remove unneeded operation --- .../module/osm/naming/SidewalkNamer.java | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 990d1d73442..a8dd169dfe5 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -23,7 +23,6 @@ import org.locationtech.jts.geom.MultiLineString; import org.locationtech.jts.geom.Point; import org.locationtech.jts.operation.buffer.BufferParameters; -import org.locationtech.jts.operation.distance.DistanceOp; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.HashGridSpatialIndex; import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; @@ -146,8 +145,6 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam var candidates = streetEdges.query(buffer.getEnvelopeInternal()); groupEdgesByName(candidates) - // remove edges that are far away - .filter(g -> g.nearestDistanceTo(sidewalk.getGeometry()) < MAX_DISTANCE_TO_SIDEWALK) // make sure we only compare sidewalks and streets that are on the same level .filter(g -> g.levels.equals(sidewalkOnLevel.levels)) .map(g -> computePercentInsideBuffer(g, buffer, sidewalkLength)) @@ -240,19 +237,6 @@ private double length(Geometry intersection) { }; } - /** - * Get the closest distance in meters between any of the edges in the group and the given geometry. - */ - double nearestDistanceTo(Geometry g) { - return edges - .stream() - .mapToDouble(e -> { - var points = DistanceOp.nearestPoints(e.getGeometry(), g); - return SphericalDistanceLibrary.fastDistance(points[0], points[1]); - }) - .min() - .orElse(Double.MAX_VALUE); - } } private record EdgeOnLevel(StreetEdge edge, Set levels) {} From e28a69c75fd5d4681f2f8a6213caba640671327c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 14:34:47 +0200 Subject: [PATCH 1064/1688] Improve performance of Portland custom namer --- .../module/osm/naming/PortlandCustomNamer.java | 11 ++++------- .../module/osm/naming/SidewalkNamer.java | 1 - .../openstreetmap/model/OSMWithTags.java | 14 ++++++++++++++ 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java index fb0d3f583e0..b178adaab6b 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java @@ -71,24 +71,21 @@ public I18NString name(OSMWithTags way) { @Override public void recordEdges(OSMWithTags way, StreetEdgePair edgePair) { + final boolean isHighwayLink = way.isHighwayLink(); + final boolean isLowerLink = way.isLowerLink(); edgePair .asIterable() .forEach(edge -> { if (!edge.hasBogusName()) { return; // this edge already has a real name so there is nothing to do } - String highway = way.getTag("highway"); - if ("motorway_link".equals(highway) || "trunk_link".equals(highway)) { + if (isHighwayLink) { if (edge.isBack()) { nameByDestination.add(edge); } else { nameByOrigin.add(edge); } - } else if ( - "secondary_link".equals(highway) || - "primary_link".equals(highway) || - "tertiary_link".equals(highway) - ) { + } else if (isLowerLink) { if (edge.isBack()) { nameByOrigin.add(edge); } else { diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index a8dd169dfe5..19b750106fa 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -236,7 +236,6 @@ private double length(Geometry intersection) { ); }; } - } private record EdgeOnLevel(StreetEdge edge, Set levels) {} diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index 636584eb770..d0f0dea764e 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -574,6 +574,20 @@ public boolean isLink() { return highway != null && highway.endsWith(("_link")); } + public boolean isHighwayLink() { + String highway = getTag("highway"); + return "motorway_link".equals(highway) || "trunk_link".equals(highway); + } + + public boolean isLowerLink() { + String highway = getTag("highway"); + return ( + "secondary_link".equals(highway) || + "primary_link".equals(highway) || + "tertiary_link".equals(highway) + ); + } + public boolean isElevator() { return isTag("highway", "elevator"); } From f995865fbe33c64691c5ea91f3f546057facc60b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 14:40:36 +0200 Subject: [PATCH 1065/1688] Improve computation of center point --- .../module/osm/naming/SidewalkNamer.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 19b750106fa..5245a9e9887 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -96,7 +96,7 @@ public void postprocess() { unnamedSidewalks.size() ); - this.preciseBuffer = new PreciseBuffer(computeCentroid(), BUFFER_METERS); + this.preciseBuffer = new PreciseBuffer(computeEnvelopeCenter(), BUFFER_METERS); final AtomicInteger namesApplied = new AtomicInteger(0); unnamedSidewalks @@ -126,11 +126,12 @@ public void postprocess() { /** * Compute the centroid of all sidewalk edges. */ - private Coordinate computeCentroid() { + private Coordinate computeEnvelopeCenter() { var envelope = new Envelope(); - unnamedSidewalks.forEach(e -> - envelope.expandToInclude(e.edge.getGeometry().getEnvelopeInternal()) - ); + unnamedSidewalks.forEach(e -> { + envelope.expandToInclude(e.edge.getFromVertex().getCoordinate()); + envelope.expandToInclude(e.edge.getToVertex().getCoordinate()); + }); return envelope.centre(); } From e9a0722d9b6c4a6e28a48ca85a799fb4ece45e62 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 14:51:01 +0200 Subject: [PATCH 1066/1688] Improve if/else logic --- .../graph_builder/module/osm/naming/SidewalkNamer.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 5245a9e9887..c1080a66772 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -57,7 +57,6 @@ public class SidewalkNamer implements EdgeNamer { private static final Logger LOG = LoggerFactory.getLogger(SidewalkNamer.class); - private static final int MAX_DISTANCE_TO_SIDEWALK = 50; private static final double MIN_PERCENT_IN_BUFFER = .85; private static final int BUFFER_METERS = 25; @@ -72,14 +71,16 @@ public I18NString name(OSMWithTags way) { @Override public void recordEdges(OSMWithTags way, StreetEdgePair pair) { + // this way is a sidewalk and hasn't been named yet (and is not explicitly unnamed) if (way.isSidewalk() && way.needsFallbackName() && !way.isExplicitlyUnnamed()) { pair .asIterable() .forEach(edge -> unnamedSidewalks.add(new EdgeOnLevel(edge, way.getLevels()))); } - if (way.isNamed() && !way.isLink()) { + // the way is _not_ a sidewalk and does have a name + else if (way.isNamed() && !way.isLink()) { // we generate two edges for each osm way: one there and one back. since we don't do any routing - // in this class we don't need the two directions and keep only one of them. + // in this class we don't need the two directions and index only one of them. var edge = pair.pickAny(); streetEdges.insert( edge.getGeometry().getEnvelopeInternal(), From 8a88c9932f5fdfcd7eb643730e8f18a38dd6f03f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 14:55:40 +0200 Subject: [PATCH 1067/1688] Update comment --- .../graph_builder/module/osm/naming/SidewalkNamer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index c1080a66772..6016e8e1d44 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -79,8 +79,9 @@ public void recordEdges(OSMWithTags way, StreetEdgePair pair) { } // the way is _not_ a sidewalk and does have a name else if (way.isNamed() && !way.isLink()) { - // we generate two edges for each osm way: one there and one back. since we don't do any routing - // in this class we don't need the two directions and index only one of them. + // We generate two edges for each osm way: one there and one back. This spatial index only + // needs to contain one item for each road segment with a unique geometry and name, so we + // add only one of the two edges. var edge = pair.pickAny(); streetEdges.insert( edge.getGeometry().getEnvelopeInternal(), From 8823782eda247a587dd03169e2af18bbd992de00 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Mon, 6 May 2024 21:43:36 +0800 Subject: [PATCH 1068/1688] copy mailing list information from docs to readme --- README.md | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/README.md b/README.md index 5e016c22bb2..5e93f3c98b5 100644 --- a/README.md +++ b/README.md @@ -60,16 +60,7 @@ the world. ## Getting in touch -The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) -where most of the core developers are. You can also send questions and comments to the -[mailing list](http://groups.google.com/group/opentripplanner-users). - -Changes and extensions to OTP are debated in issues on [GitHub](https://github.com/opentripplanner/OpenTripPlanner/issues) -and in the [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner). More general -questions and announcements of interest to non-developer OTP users should be directed to -the [opentripplanner-users](https://groups.google.com/forum/#!forum/opentripplanner-users) list. -Other details of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be -found in the main documentation. +The fastest way to get help is to use our [Gitter chat room](https://gitter.im/opentripplanner/OpenTripPlanner) where most of the core developers are. Bug reports may be filed via the Github [issue tracker](https://github.com/openplans/OpenTripPlanner/issues). The OpenTripPlanner [mailing list](http://groups.google.com/group/opentripplanner-users) is used almost exclusively for project announcements. The mailing list and issue tracker are not intended for support questions or discussions. Please use the chat for this purpose. Other details of [project governance](http://docs.opentripplanner.org/en/dev-2.x/Governance/) can be found in the main documentation. ## OTP Ecosystem From c5ac1698f80acf240682b64b5953e14c7908e81b Mon Sep 17 00:00:00 2001 From: Johan Torin Date: Mon, 6 May 2024 15:46:25 +0200 Subject: [PATCH 1069/1688] Refactor to set values directly in the mapper and not rely on later logic. * Set NOT_SET early where applicable. * Rework how transferMode is applied but take care to not overwrite the defaults even if it's the same value. --- .../mapping/RequestModesMapper.java | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java index 469d6868658..133da8e3b76 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java @@ -1,12 +1,16 @@ package org.opentripplanner.apis.transmodel.mapping; import java.util.Map; +import java.util.Optional; +import java.util.function.Consumer; +import java.util.function.Predicate; import org.opentripplanner.routing.api.request.RequestModes; import org.opentripplanner.routing.api.request.RequestModesBuilder; import org.opentripplanner.routing.api.request.StreetMode; class RequestModesMapper { + private static final Predicate IS_BIKE = m -> m == StreetMode.BIKE; private static final String accessModeKey = "accessMode"; private static final String egressModeKey = "egressMode"; private static final String directModeKey = "directMode"; @@ -19,17 +23,22 @@ class RequestModesMapper { static RequestModes mapRequestModes(Map modesInput) { RequestModesBuilder mBuilder = RequestModes.of(); - if (modesInput.containsKey(accessModeKey)) { - StreetMode accessMode = (StreetMode) modesInput.get(accessModeKey); - mBuilder.withAccessMode(accessMode); - mBuilder.withTransferMode(accessMode == StreetMode.BIKE ? StreetMode.BIKE : StreetMode.WALK); - } else { - mBuilder.withAccessMode(StreetMode.NOT_SET); - } - // Non-existing values and null are later translated into NOT_SET. - mBuilder.withEgressMode((StreetMode) modesInput.get(egressModeKey)); - mBuilder.withDirectMode((StreetMode) modesInput.get(directModeKey)); + final StreetMode accessMode = (StreetMode) modesInput.get(accessModeKey); + ensureValueAndSet(accessMode, mBuilder::withAccessMode); + ensureValueAndSet((StreetMode) modesInput.get(egressModeKey), mBuilder::withEgressMode); + ensureValueAndSet((StreetMode) modesInput.get(directModeKey), mBuilder::withDirectMode); + Optional.ofNullable(accessMode).filter(IS_BIKE).ifPresent(mBuilder::withTransferMode); return mBuilder.build(); } + + /** + * Use the provided consumer to apply the StreetMode if it's non-null, otherwise apply NOT_SET. + * + * @param streetMode + * @param consumer + */ + private static void ensureValueAndSet(StreetMode streetMode, Consumer consumer) { + Optional.ofNullable(streetMode).or(() -> Optional.of(StreetMode.NOT_SET)).ifPresent(consumer); + } } From b1d36f902aaacd1ca4fbe46120155e119ba793e1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 17:22:46 +0200 Subject: [PATCH 1070/1688] Update accessibility score docs [ci skip] --- docs/sandbox/IBIAccessibilityScore.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/docs/sandbox/IBIAccessibilityScore.md b/docs/sandbox/IBIAccessibilityScore.md index e3c6ef16bbd..5b944eaf73b 100644 --- a/docs/sandbox/IBIAccessibilityScore.md +++ b/docs/sandbox/IBIAccessibilityScore.md @@ -1,14 +1,9 @@ -# IBI Group Accessibility Score - OTP Sandbox Extension +# IBI Group Accessibility Score ## Contact Info - IBI Group ([transitrealtime@ibigroup.com](mailto:transitrealtime@ibigroup.com)) -## Changelog - -- Create initial - implementation [#4221](https://github.com/opentripplanner/OpenTripPlanner/pull/4221) - ## Documentation This extension computes a numeric accessibility score between 0 and 1 and adds it to the itinerary @@ -32,4 +27,8 @@ To enable the feature add the following to `router-config.json`: } ``` -The score is only computed when you search for wheelchair-accessible routes. \ No newline at end of file +The score is only computed when you search for wheelchair-accessible routes. + +## Changelog + +- Create initial implementation [#4221](https://github.com/opentripplanner/OpenTripPlanner/pull/4221) From 90148e089134c2289f1d6310bb50cf1645f0d000 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 17:41:19 +0200 Subject: [PATCH 1071/1688] Update docs about experimental fields --- doc-templates/Flex.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/doc-templates/Flex.md b/doc-templates/Flex.md index 50512f66133..0e79ecdbffc 100644 --- a/doc-templates/Flex.md +++ b/doc-templates/Flex.md @@ -13,6 +13,17 @@ To enable this turn on `FlexRouting` as a feature in `otp-config.json`. The GTFS feeds must conform to the final, approved version of the draft which has been merged into the [mainline specification](https://gtfs.org/schedule/reference/) in March 2024. +### Experimental features + +This sandbox feature also has experimental support for the following fields: + +- `safe_duration_factor` +- `safe_duration_offset` + +These features are currently [undergoing specification](https://github.com/MobilityData/gtfs-flex/pull/79) +and their definition might change. OTP's implementation will be also be changed so be careful +when relying on this feature. + ## Configuration This feature allows a limited number of config options. To change the configuration, add the From a4dc25b7d635ec872e4843d23d7ab1533f662249 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 6 May 2024 17:46:16 +0200 Subject: [PATCH 1072/1688] Revert renaming --- docs/sandbox/Flex.md | 11 +++++++++++ .../ext/flex/trip/ScheduledDeviatedTrip.java | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/docs/sandbox/Flex.md b/docs/sandbox/Flex.md index 277e4e617f2..7b08fd7d05f 100644 --- a/docs/sandbox/Flex.md +++ b/docs/sandbox/Flex.md @@ -13,6 +13,17 @@ To enable this turn on `FlexRouting` as a feature in `otp-config.json`. The GTFS feeds must conform to the final, approved version of the draft which has been merged into the [mainline specification](https://gtfs.org/schedule/reference/) in March 2024. +### Experimental features + +This sandbox feature also has experimental support for the following fields: + +- `safe_duration_factor` +- `safe_duration_offset` + +These features are currently [undergoing specification](https://github.com/MobilityData/gtfs-flex/pull/79) +and their definition might change. OTP's implementation will be also be changed so be careful +when relying on this feature. + ## Configuration This feature allows a limited number of config options. To change the configuration, add the diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 0026d98c964..e16e1e5e1f7 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -176,7 +176,7 @@ public int earliestDepartureTime(int stopIndex) { @Override public int latestArrivalTime( int arrivalTime, - int ignored, + int fromStopIndex, int toStopIndex, int flexTripDurationSeconds ) { From 7b07cd56482574a42b504b5693de877505ece940 Mon Sep 17 00:00:00 2001 From: Johan Torin Date: Tue, 7 May 2024 09:04:08 +0200 Subject: [PATCH 1073/1688] Update src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java Replace Optional-chain with a less complicated ternary condition. Co-authored-by: Henrik Abrahamsson <127481124+habrahamsson-skanetrafiken@users.noreply.github.com> --- .../apis/transmodel/mapping/RequestModesMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java index 133da8e3b76..974b8dd10c3 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/RequestModesMapper.java @@ -39,6 +39,6 @@ static RequestModes mapRequestModes(Map modesInput) { * @param consumer */ private static void ensureValueAndSet(StreetMode streetMode, Consumer consumer) { - Optional.ofNullable(streetMode).or(() -> Optional.of(StreetMode.NOT_SET)).ifPresent(consumer); + consumer.accept(streetMode == null ? StreetMode.NOT_SET : streetMode); } } From 1b2c59998228aa458e16b6b000554ee812014313 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Tue, 7 May 2024 10:15:20 +0200 Subject: [PATCH 1074/1688] Regenerate documentation --- docs/RouterConfiguration.md | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index e948a23dd54..59fa53fc7c9 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -366,13 +366,15 @@ for more info." Costs for boarding and alighting during transfers at stops with a given transfer priority. -This cost is applied **both to boarding and alighting** at stops during transfers. All stops have a transfer cost priority -set, the default is `allowed`. The `stopBoardAlightDuringTransferCost` parameter is optional, but if listed all -values must be set. +This cost is applied **both to boarding and alighting** at stops during transfers. All stops have a +transfer cost priority set, the default is `allowed`. The `stopBoardAlightDuringTransferCost` +parameter is optional, but if listed all values must be set. -When a transfer occurs at the same stop, the cost will be applied twice since the cost is both for boarding and alighting, +When a transfer occurs at the same stop, the cost will be applied twice since the cost is both for +boarding and alighting, -If not set the `stopBoardAlightDuringTransferCost` is ignored. This is only available for NeTEx imported Stops. +If not set the `stopBoardAlightDuringTransferCost` is ignored. This is only available for NeTEx +imported Stops. The cost is a scalar, but is equivalent to the felt cost of riding a transit trip for 1 second. From 6100a6db094fa9627107a0a3ebdf0b63127763e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 11:20:00 +0000 Subject: [PATCH 1075/1688] chore(deps): update debug ui dependencies (non-major) --- client-next/package-lock.json | 110 ++++++++++++++++++---------------- client-next/package.json | 8 +-- 2 files changed, 63 insertions(+), 55 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index abe2c5d3ed6..83f19bf3c48 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -12,7 +12,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.1.3", + "maplibre-gl": "4.2.0", "react": "18.3.1", "react-bootstrap": "2.10.2", "react-dom": "18.3.1", @@ -23,13 +23,13 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.6", + "@testing-library/react": "15.0.7", "@types/react": "18.3.1", "@types/react-dom": "18.3.0", "@typescript-eslint/eslint-plugin": "7.8.0", "@typescript-eslint/parser": "7.8.0", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.5.3", + "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", @@ -41,7 +41,7 @@ "prettier": "3.2.5", "typescript": "5.4.5", "vite": "5.2.11", - "vitest": "1.5.3" + "vitest": "1.6.0" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -2737,16 +2737,18 @@ } }, "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "20.1.1", - "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.1.1.tgz", - "integrity": "sha512-z85ARNPCBI2Cs5cPOS3DSbraTN+ue8zrcYVoSWBuNrD/mA+2SKAJ+hIzI22uN7gac6jBMnCdpPKRxS/V0KSZVQ==", + "version": "20.2.0", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.2.0.tgz", + "integrity": "sha512-BTw6/3ysowky22QMtNDjElp+YLwwvBDh3xxnq1izDFjTtUERm5nYSihlNZ6QaxXb+6lX2T2t0hBEjheAI+kBEQ==", "dependencies": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/unitbezier": "^0.0.1", "json-stringify-pretty-compact": "^4.0.0", "minimist": "^1.2.8", + "quickselect": "^2.0.0", "rw": "^1.3.3", - "sort-object": "^3.0.3" + "sort-object": "^3.0.3", + "tinyqueue": "^2.0.3" }, "bin": { "gl-style-format": "dist/gl-style-format.mjs", @@ -3372,9 +3374,9 @@ } }, "node_modules/@testing-library/react": { - "version": "15.0.6", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.6.tgz", - "integrity": "sha512-UlbazRtEpQClFOiYp+1BapMT+xyqWMnE+hh9tn5DQ6gmlE7AIZWcGpzZukmDZuFk3By01oiqOf8lRedLS4k6xQ==", + "version": "15.0.7", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.7.tgz", + "integrity": "sha512-cg0RvEdD1TIhhkm1IeYMQxrzy0MtUNfa3minv4MjbgcYzJAZ7yD0i0lwoPOTPr+INtiXFezt2o8xMSnyHhEn2Q==", "dev": true, "dependencies": { "@babel/runtime": "^7.12.5", @@ -3485,6 +3487,11 @@ "integrity": "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ==", "dev": true }, + "node_modules/@types/junit-report-builder": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@types/junit-report-builder/-/junit-report-builder-3.0.2.tgz", + "integrity": "sha512-R5M+SYhMbwBeQcNXYWNCZkl09vkVfAtcPIaCGdzIkkbeaTrVbGQ7HVgi4s+EmM/M1K4ZuWQH0jGcvMvNePfxYA==" + }, "node_modules/@types/mapbox__point-geometry": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/@types/mapbox__point-geometry/-/mapbox__point-geometry-0.1.4.tgz", @@ -3896,9 +3903,9 @@ } }, "node_modules/@vitest/coverage-v8": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.5.3.tgz", - "integrity": "sha512-DPyGSu/fPHOJuPxzFSQoT4N/Fu/2aJfZRtEpEp8GI7NHsXBGE94CQ+pbEGBUMFjatsHPDJw/+TAF9r4ens2CNw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.6.0.tgz", + "integrity": "sha512-KvapcbMY/8GYIG0rlwwOKCVNRc0OL20rrhFkg/CHNzncV03TE2XWvO5w9uZYoxNiMEBacAJt3unSOiZ7svePew==", "dev": true, "dependencies": { "@ampproject/remapping": "^2.2.1", @@ -3919,17 +3926,17 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "vitest": "1.5.3" + "vitest": "1.6.0" } }, "node_modules/@vitest/expect": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.5.3.tgz", - "integrity": "sha512-y+waPz31pOFr3rD7vWTbwiLe5+MgsMm40jTZbQE8p8/qXyBX3CQsIXRx9XK12IbY7q/t5a5aM/ckt33b4PxK2g==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.0.tgz", + "integrity": "sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==", "dev": true, "dependencies": { - "@vitest/spy": "1.5.3", - "@vitest/utils": "1.5.3", + "@vitest/spy": "1.6.0", + "@vitest/utils": "1.6.0", "chai": "^4.3.10" }, "funding": { @@ -3937,12 +3944,12 @@ } }, "node_modules/@vitest/runner": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.5.3.tgz", - "integrity": "sha512-7PlfuReN8692IKQIdCxwir1AOaP5THfNkp0Uc4BKr2na+9lALNit7ub9l3/R7MP8aV61+mHKRGiqEKRIwu6iiQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.6.0.tgz", + "integrity": "sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==", "dev": true, "dependencies": { - "@vitest/utils": "1.5.3", + "@vitest/utils": "1.6.0", "p-limit": "^5.0.0", "pathe": "^1.1.1" }, @@ -3978,9 +3985,9 @@ } }, "node_modules/@vitest/snapshot": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.5.3.tgz", - "integrity": "sha512-K3mvIsjyKYBhNIDujMD2gfQEzddLe51nNOAf45yKRt/QFJcUIeTQd2trRvv6M6oCBHNVnZwFWbQ4yj96ibiDsA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz", + "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==", "dev": true, "dependencies": { "magic-string": "^0.30.5", @@ -4024,9 +4031,9 @@ "dev": true }, "node_modules/@vitest/spy": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.5.3.tgz", - "integrity": "sha512-Llj7Jgs6lbnL55WoshJUUacdJfjU2honvGcAJBxhra5TPEzTJH8ZuhI3p/JwqqfnTr4PmP7nDmOXP53MS7GJlg==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.6.0.tgz", + "integrity": "sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==", "dev": true, "dependencies": { "tinyspy": "^2.2.0" @@ -4036,9 +4043,9 @@ } }, "node_modules/@vitest/utils": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.5.3.tgz", - "integrity": "sha512-rE9DTN1BRhzkzqNQO+kw8ZgfeEBCLXiHJwetk668shmNBpSagQxneT5eSqEBLP+cqSiAeecvQmbpFfdMyLcIQA==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.6.0.tgz", + "integrity": "sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==", "dev": true, "dependencies": { "diff-sequences": "^29.6.3", @@ -8339,9 +8346,9 @@ } }, "node_modules/maplibre-gl": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.1.3.tgz", - "integrity": "sha512-nMy5h0kzq9Z66C6AIb3p2BvLIVHz75dGGQow22x+h9/VOihr0IPQI26ylAi6lHqvEy2VqjiRmKAMlFwt0xFKfQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.2.0.tgz", + "integrity": "sha512-x5GgYyKKn5UDvbUZFK7ng3Pq829/uYWDSVN/itZoP2slWSzKbjIXKi/Qhz5FnYiMXwpRgM08UIcVjtn1PLK9Tg==", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -8350,9 +8357,10 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", - "@maplibre/maplibre-gl-style-spec": "^20.1.1", + "@maplibre/maplibre-gl-style-spec": "^20.2.0", "@types/geojson": "^7946.0.14", "@types/geojson-vt": "3.2.5", + "@types/junit-report-builder": "^3.0.2", "@types/mapbox__point-geometry": "^0.1.4", "@types/mapbox__vector-tile": "^1.3.4", "@types/pbf": "^3.0.5", @@ -10903,9 +10911,9 @@ } }, "node_modules/vite-node": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.5.3.tgz", - "integrity": "sha512-axFo00qiCpU/JLd8N1gu9iEYL3xTbMbMrbe5nDp9GL0nb6gurIdZLkkFogZXWnE8Oyy5kfSLwNVIcVsnhE7lgQ==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.6.0.tgz", + "integrity": "sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==", "dev": true, "dependencies": { "cac": "^6.7.14", @@ -10925,16 +10933,16 @@ } }, "node_modules/vitest": { - "version": "1.5.3", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.5.3.tgz", - "integrity": "sha512-2oM7nLXylw3mQlW6GXnRriw+7YvZFk/YNV8AxIC3Z3MfFbuziLGWP9GPxxu/7nRlXhqyxBikpamr+lEEj1sUEw==", + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.6.0.tgz", + "integrity": "sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==", "dev": true, "dependencies": { - "@vitest/expect": "1.5.3", - "@vitest/runner": "1.5.3", - "@vitest/snapshot": "1.5.3", - "@vitest/spy": "1.5.3", - "@vitest/utils": "1.5.3", + "@vitest/expect": "1.6.0", + "@vitest/runner": "1.6.0", + "@vitest/snapshot": "1.6.0", + "@vitest/spy": "1.6.0", + "@vitest/utils": "1.6.0", "acorn-walk": "^8.3.2", "chai": "^4.3.10", "debug": "^4.3.4", @@ -10948,7 +10956,7 @@ "tinybench": "^2.5.1", "tinypool": "^0.8.3", "vite": "^5.0.0", - "vite-node": "1.5.3", + "vite-node": "1.6.0", "why-is-node-running": "^2.2.2" }, "bin": { @@ -10963,8 +10971,8 @@ "peerDependencies": { "@edge-runtime/vm": "*", "@types/node": "^18.0.0 || >=20.0.0", - "@vitest/browser": "1.5.3", - "@vitest/ui": "1.5.3", + "@vitest/browser": "1.6.0", + "@vitest/ui": "1.6.0", "happy-dom": "*", "jsdom": "*" }, diff --git a/client-next/package.json b/client-next/package.json index 1677c6a3b1f..5ff988bdc87 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -21,7 +21,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.1.3", + "maplibre-gl": "4.2.0", "react": "18.3.1", "react-bootstrap": "2.10.2", "react-dom": "18.3.1", @@ -32,13 +32,13 @@ "@graphql-codegen/client-preset": "4.2.5", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.6", + "@testing-library/react": "15.0.7", "@types/react": "18.3.1", "@types/react-dom": "18.3.0", "@typescript-eslint/eslint-plugin": "7.8.0", "@typescript-eslint/parser": "7.8.0", "@vitejs/plugin-react": "4.2.1", - "@vitest/coverage-v8": "1.5.3", + "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", @@ -50,6 +50,6 @@ "prettier": "3.2.5", "typescript": "5.4.5", "vite": "5.2.11", - "vitest": "1.5.3" + "vitest": "1.6.0" } } From 82b853a986fe7f321c7ddc52cde000b57cdb8a67 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 7 May 2024 12:44:04 +0200 Subject: [PATCH 1076/1688] Validate value of timerange GraphQL parameter --- .../apis/transmodel/model/stop/QuayType.java | 6 ++++-- .../transmodel/model/stop/StopPlaceType.java | 5 +++-- .../apis/transmodel/support/GqlUtil.java | 19 +++++++++++++++++++ 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index 0b22086dfaf..7e51328e88f 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -1,5 +1,7 @@ package org.opentripplanner.apis.transmodel.model.stop; +import static org.opentripplanner.apis.transmodel.support.GqlUtil.getPositiveNonNullIntegerArgument; + import graphql.Scalars; import graphql.schema.GraphQLArgument; import graphql.schema.GraphQLFieldDefinition; @@ -299,8 +301,8 @@ public static GraphQLObjectType create( Integer departuresPerLineAndDestinationDisplay = environment.getArgument( "numberOfDeparturesPerLineAndDestinationDisplay" ); - Integer timeRangeInput = environment.getArgument("timeRange"); - Duration timeRange = Duration.ofSeconds(timeRangeInput.longValue()); + int timeRangeInput = getPositiveNonNullIntegerArgument(environment, "timeRange"); + Duration timeRange = Duration.ofSeconds(timeRangeInput); StopLocation stop = environment.getSource(); JourneyWhiteListed whiteListed = new JourneyWhiteListed(environment); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java index d178e5125b5..5518db3e7fd 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java @@ -1,6 +1,7 @@ package org.opentripplanner.apis.transmodel.model.stop; import static java.lang.Boolean.TRUE; +import static org.opentripplanner.apis.transmodel.support.GqlUtil.getPositiveNonNullIntegerArgument; import graphql.Scalars; import graphql.schema.DataFetchingEnvironment; @@ -356,8 +357,8 @@ public static GraphQLObjectType create( Integer departuresPerLineAndDestinationDisplay = environment.getArgument( "numberOfDeparturesPerLineAndDestinationDisplay" ); - Integer timeRangeInput = environment.getArgument("timeRange"); - Duration timeRage = Duration.ofSeconds(timeRangeInput.longValue()); + int timeRangeInput = getPositiveNonNullIntegerArgument(environment, "timeRange"); + Duration timeRage = Duration.ofSeconds(timeRangeInput); MonoOrMultiModalStation monoOrMultiModalStation = environment.getSource(); JourneyWhiteListed whiteListed = new JourneyWhiteListed(environment); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java index 3700ea60332..1f0722eb991 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java @@ -103,6 +103,25 @@ public static boolean hasArgument(DataFetchingEnvironment environment, String na return environment.containsArgument(name) && environment.getArgument(name) != null; } + /** + * Return the integer value of the argument or throw an exception if the value is null + * or strictly negative. + * This should generally be handled at the GraphQL schema level, + * but must sometimes be implemented programmatically to preserve backward compatibility. + */ + public static int getPositiveNonNullIntegerArgument( + DataFetchingEnvironment environment, + String argumentName + ) { + Integer argumentValue = environment.getArgument(argumentName); + if (argumentValue == null || argumentValue < 0) { + throw new IllegalArgumentException( + "The argument '" + argumentName + "' should be a non-null positive value: " + argumentValue + ); + } + return argumentValue; + } + public static List listOfNullSafe(T element) { return element == null ? List.of() : List.of(element); } From dfe36ef78bbdf0f06f7aa23ca7143a1a948075f7 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 7 May 2024 12:45:10 +0200 Subject: [PATCH 1077/1688] Fix typo --- .../apis/transmodel/model/stop/StopPlaceType.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java index 5518db3e7fd..3ab444bb52c 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java @@ -358,7 +358,7 @@ public static GraphQLObjectType create( "numberOfDeparturesPerLineAndDestinationDisplay" ); int timeRangeInput = getPositiveNonNullIntegerArgument(environment, "timeRange"); - Duration timeRage = Duration.ofSeconds(timeRangeInput); + Duration timeRange = Duration.ofSeconds(timeRangeInput); MonoOrMultiModalStation monoOrMultiModalStation = environment.getSource(); JourneyWhiteListed whiteListed = new JourneyWhiteListed(environment); @@ -375,7 +375,7 @@ public static GraphQLObjectType create( getTripTimesForStop( singleStop, startTime, - timeRage, + timeRange, arrivalDeparture, includeCancelledTrips, numberOfDepartures, @@ -420,7 +420,7 @@ public static GraphQLObjectType create( public static Stream getTripTimesForStop( StopLocation stop, Instant startTimeSeconds, - Duration timeRage, + Duration timeRange, ArrivalDeparture arrivalDeparture, boolean includeCancelledTrips, int numberOfDepartures, @@ -435,7 +435,7 @@ public static Stream getTripTimesForStop( List stopTimesInPatterns = transitService.stopTimesForStop( stop, startTimeSeconds, - timeRage, + timeRange, numberOfDepartures, arrivalDeparture, includeCancelledTrips From 63bce5ee6142563d644388f1af3b0be1d3812d7b Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 7 May 2024 13:05:24 +0200 Subject: [PATCH 1078/1688] Add documentation --- .../opentripplanner/apis/transmodel/model/stop/QuayType.java | 3 +++ .../apis/transmodel/model/stop/StopPlaceType.java | 3 +++ .../org/opentripplanner/apis/transmodel/schema.graphql | 2 ++ 3 files changed, 8 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java index 7e51328e88f..e146b537c1c 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/QuayType.java @@ -216,6 +216,9 @@ public static GraphQLObjectType create( GraphQLArgument .newArgument() .name("timeRange") + .description( + "Duration in seconds from start time to search forward for estimated calls. Must be a positive value. Default value is 24 hours" + ) .type(Scalars.GraphQLInt) .defaultValue(24 * 60 * 60) .build() diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java index 3ab444bb52c..13a1521bf1a 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java @@ -290,6 +290,9 @@ public static GraphQLObjectType create( GraphQLArgument .newArgument() .name("timeRange") + .description( + "Duration in seconds from start time to search forward for estimated calls. Must be a positive value. Default value is 24 hours" + ) .type(Scalars.GraphQLInt) .defaultValue(24 * 60 * 60) .build() diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index d263667d672..e6f4208c643 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -571,6 +571,7 @@ type Quay implements PlaceInterface { omitNonBoarding: Boolean = false @deprecated(reason : "Non-functional. Use arrivalDeparture instead."), "DateTime for when to fetch estimated calls from. Default value is current time" startTime: DateTime, + "Duration in seconds from start time to search forward for estimated calls. Must be a positive value. Default value is 24 hours" timeRange: Int = 86400, "Parameters for indicating the only authorities and/or lines or quays to list estimatedCalls for" whiteListed: InputWhiteListed, @@ -1132,6 +1133,7 @@ type StopPlace implements PlaceInterface { numberOfDeparturesPerLineAndDestinationDisplay: Int, "DateTime for when to fetch estimated calls from. Default value is current time" startTime: DateTime, + "Duration in seconds from start time to search forward for estimated calls. Must be a positive value. Default value is 24 hours" timeRange: Int = 86400, "Parameters for indicating the only authorities and/or lines or quays to list estimatedCalls for" whiteListed: InputWhiteListed, From 305c6cea0431e00c8ea5c8b350193b62ee0a152e Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 7 May 2024 14:36:28 +0200 Subject: [PATCH 1079/1688] Add unit tests --- .../apis/transmodel/support/GqlUtilTest.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java b/src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java index d2d15168baf..40a95a6661a 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/support/GqlUtilTest.java @@ -2,11 +2,14 @@ import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import graphql.ExecutionInput; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionId; +import graphql.schema.DataFetchingEnvironment; import graphql.schema.DataFetchingEnvironmentImpl; +import java.util.HashMap; import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; @@ -14,6 +17,7 @@ public class GqlUtilTest { static final ExecutionContext executionContext; + private static final String TEST_ARGUMENT = "testArgument"; static { ExecutionInput executionInput = ExecutionInput @@ -29,6 +33,54 @@ public class GqlUtilTest { .build(); } + @Test + void testGetPositiveNonNullIntegerArgumentWithStrictlyPositiveValue() { + var env = buildEnvWithTestValue(1); + assertEquals(1, GqlUtil.getPositiveNonNullIntegerArgument(env, TEST_ARGUMENT)); + } + + @Test + void testGetPositiveNonNullIntegerArgumentWithZeroValue() { + var env = buildEnvWithTestValue(0); + assertEquals(0, GqlUtil.getPositiveNonNullIntegerArgument(env, TEST_ARGUMENT)); + } + + @Test + void testGetPositiveNonNullIntegerArgumentWithNegativeValue() { + var env = buildEnvWithTestValue(-1); + assertThrows( + IllegalArgumentException.class, + () -> GqlUtil.getPositiveNonNullIntegerArgument(env, TEST_ARGUMENT) + ); + } + + @Test + void testGetPositiveNonNullIntegerArgumentWithNullValue() { + var env = buildEnvWithTestValue(null); + assertThrows( + IllegalArgumentException.class, + () -> GqlUtil.getPositiveNonNullIntegerArgument(env, TEST_ARGUMENT) + ); + } + + @Test + void testGetPositiveNonNullIntegerArgumentWithoutValue() { + var env = DataFetchingEnvironmentImpl.newDataFetchingEnvironment(executionContext).build(); + assertThrows( + IllegalArgumentException.class, + () -> GqlUtil.getPositiveNonNullIntegerArgument(env, TEST_ARGUMENT) + ); + } + + private static DataFetchingEnvironment buildEnvWithTestValue(Integer value) { + Map argsMap = new HashMap<>(); + argsMap.put(TEST_ARGUMENT, value); + return DataFetchingEnvironmentImpl + .newDataFetchingEnvironment(executionContext) + .arguments(argsMap) + .build(); + } + @Test void testGetLocaleWithLangArgument() { var env = DataFetchingEnvironmentImpl From 203fcddeb7068e5dd8145c975c03f310ee54fe65 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson <127481124+habrahamsson-skanetrafiken@users.noreply.github.com> Date: Tue, 7 May 2024 15:51:16 +0200 Subject: [PATCH 1080/1688] Apply review suggestion Co-authored-by: Thomas Gran --- .../routing/algorithm/raptoradapter/transit/TransitLayer.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java index 0afcd97450a..2dde108b97e 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java @@ -48,9 +48,6 @@ public class TransitLayer { private final TransferIndexGenerator transferIndexGenerator; - /** - * @see #getStopBoardAlightTransferCosts() - */ @Nullable private final int[] stopBoardAlightTransferCosts; From 9a65a99e81b32d68fc6e59bb74a3f9508271c6bd Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 8 May 2024 07:26:57 +0300 Subject: [PATCH 1081/1688] Remove duplicate of feedImpl typeWiring --- .../java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 1fd78765a07..53d53b9bc4b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -129,7 +129,6 @@ protected static GraphQLSchema buildSchema() { .type(typeWiring.build(DepartureRowImpl.class)) .type(typeWiring.build(elevationProfileComponentImpl.class)) .type(typeWiring.build(FeedImpl.class)) - .type(typeWiring.build(FeedImpl.class)) .type(typeWiring.build(GeometryImpl.class)) .type(typeWiring.build(ItineraryImpl.class)) .type(typeWiring.build(LegImpl.class)) From 0ba5df5269168b86cf5819e94d45fe895135970a Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 8 May 2024 07:28:57 +0300 Subject: [PATCH 1082/1688] Data fetchers for publisherName and publisherUrl of FeedInfo class --- .../apis/gtfs/datafetchers/FeedImpl.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java index 7d7c62136b6..6cf8d27b262 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java @@ -64,6 +64,22 @@ public DataFetcher feedId() { return this::getSource; } + @Override + public DataFetcher publisherName() { + return environment -> { + String id = getSource(environment); + return getTransitService(environment).getFeedInfo(id).getPublisherName(); + }; + } + + @Override + public DataFetcher publisherUrl() { + return environment -> { + String id = getSource(environment); + return getTransitService(environment).getFeedInfo(id).getPublisherUrl(); + }; + } + private List getAgencies(DataFetchingEnvironment environment) { String id = getSource(environment); return getTransitService(environment) From c43b8d56ecaab1a164500f6fd16d4add58a04669 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 8 May 2024 07:30:59 +0300 Subject: [PATCH 1083/1688] Update gtfs graphql schema --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 56f3528d6e3..b81ebdff4c7 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -984,6 +984,12 @@ type Feed { """List of agencies which provide data to this feed""" agencies: [Agency] + """Name of feed publisher""" + publisherName: String! + + """Web address of feed publisher""" + publisherUrl: String! + """ Alerts relevant for the feed. """ From 4b9b06592b2c433357d637683d45e7ae96682a93 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 8 May 2024 07:49:16 +0300 Subject: [PATCH 1084/1688] Update generated GraphQLDataFetchers.java --- .../apis/gtfs/generated/GraphQLDataFetchers.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 559acac920d..6a2e398cd91 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -380,6 +380,10 @@ public interface GraphQLFeed { public DataFetcher> alerts(); public DataFetcher feedId(); + + public DataFetcher publisherName(); + + public DataFetcher publisherUrl(); } public interface GraphQLGeometry { From 49436441cf399d12ce5bd051a874bcdee7ab9e30 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Wed, 8 May 2024 07:11:16 +0000 Subject: [PATCH 1085/1688] Upgrade debug client to version 2024/05/2024-05-08T07:10 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 8968324b94d..974356161cb 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
              From 2b2d36505ab952ffb6bcb2ec7c7ac84c4f609361 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 8 May 2024 11:00:25 +0200 Subject: [PATCH 1086/1688] Clarify hasName/hasNoName/isExplicitlyUnnamed --- .../graph_builder/module/osm/OsmModule.java | 2 +- .../module/osm/WalkableAreaBuilder.java | 4 +-- .../module/osm/naming/SidewalkNamer.java | 2 +- .../openstreetmap/model/OSMWithTags.java | 33 ++++++++++++------- .../openstreetmap/model/OSMWithTagsTest.java | 4 +-- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index 79bcacda660..3a745dddf52 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -542,7 +542,7 @@ private StreetEdge getEdgeForStreet( .withSlopeOverride(way.getOsmProvider().getWayPropertySet().getSlopeOverride(way)) .withStairs(way.isSteps()) .withWheelchairAccessible(way.isWheelchairAccessible()) - .withBogusName(way.needsFallbackName()); + .withBogusName(way.hasNoName()); StreetEdge street = seb.buildAndConnect(); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java index 6244a50321f..89b71403232 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/WalkableAreaBuilder.java @@ -532,7 +532,7 @@ private Set createSegments( .withBack(false) .withArea(edgeList) .withCarSpeed(carSpeed) - .withBogusName(areaEntity.needsFallbackName()) + .withBogusName(areaEntity.hasNoName()) .withWheelchairAccessible(areaEntity.isWheelchairAccessible()) .withLink(areaEntity.isLink()); @@ -555,7 +555,7 @@ private Set createSegments( .withBack(true) .withArea(edgeList) .withCarSpeed(carSpeed) - .withBogusName(areaEntity.needsFallbackName()) + .withBogusName(areaEntity.hasNoName()) .withWheelchairAccessible(areaEntity.isWheelchairAccessible()) .withLink(areaEntity.isLink()); diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 6016e8e1d44..196ebe73946 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -72,7 +72,7 @@ public I18NString name(OSMWithTags way) { @Override public void recordEdges(OSMWithTags way, StreetEdgePair pair) { // this way is a sidewalk and hasn't been named yet (and is not explicitly unnamed) - if (way.isSidewalk() && way.needsFallbackName() && !way.isExplicitlyUnnamed()) { + if (way.isSidewalk() && way.hasNoName() && !way.isExplicitlyUnnamed()) { pair .asIterable() .forEach(edge -> unnamedSidewalks.add(new EdgeOnLevel(edge, way.getLevels()))); diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index d0f0dea764e..b4c9c4b01b5 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -168,13 +168,6 @@ public boolean isSidewalk() { return isTag("footway", "sidewalk") && isTag("highway", "footway"); } - /** - * Whether this entity explicity doesn't have a name. - */ - public boolean isExplicitlyUnnamed() { - return isTagTrue("noname"); - } - protected boolean doesTagAllowAccess(String tag) { if (tags == null) { return false; @@ -602,17 +595,33 @@ public boolean isWheelchairAccessible() { } /** - * Does this entity has a name of its own or if it needs to have a fallback one assigned? + * Does this entity have tags that allow extracting a name? */ - public boolean needsFallbackName() { + public boolean isNamed() { + return hasTag("name") || hasTag("ref"); + } + + /** + * Is this entity unnamed? + *

              + * Perhaps this entity has a name that isn't in the source data, but it's also possible that + * it's explicitly tagged as not having one. + * + * @see OSMWithTags#isExplicitlyUnnamed() + */ + public boolean hasNoName() { return !isNamed(); } /** - * Does this entity have tags that allow extracting a name? + * Whether this entity explicitly doesn't have a name. This is different to no name being + * set on the entity in OSM. + * + * @see OSMWithTags#isNamed() + * @see https://wiki.openstreetmap.org/wiki/Tag:noname%3Dyes */ - public boolean isNamed() { - return hasTag("name") || hasTag("ref"); + public boolean isExplicitlyUnnamed() { + return isTagTrue("noname"); } /** diff --git a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java index 3c060150714..3b50d0bff0d 100644 --- a/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java +++ b/src/test/java/org/opentripplanner/openstreetmap/model/OSMWithTagsTest.java @@ -266,9 +266,9 @@ void testGenerateI18NForPattern() { @Test void fallbackName() { var nameless = WayTestData.cycleway(); - assertTrue(nameless.needsFallbackName()); + assertTrue(nameless.hasNoName()); var namedTunnel = WayTestData.carTunnel(); - assertFalse(namedTunnel.needsFallbackName()); + assertFalse(namedTunnel.hasNoName()); } } From 119927ea79af4a4ee511de71309da9d29a30f140 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 8 May 2024 12:43:55 +0300 Subject: [PATCH 1087/1688] Add test for feedinfo query --- .../apis/gtfs/GraphQLIntegrationTest.java | 14 ++++++++++++++ .../apis/gtfs/expectations/feedinfo.json | 16 ++++++++++++++++ .../apis/gtfs/queries/feedinfo.graphql | 10 ++++++++++ 3 files changed, 40 insertions(+) create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index fcc59af845f..614c8778c6b 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -43,6 +43,7 @@ import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.model.Grams; +import org.opentripplanner.model.FeedInfo; import org.opentripplanner.model.fare.FareMedium; import org.opentripplanner.model.fare.FareProduct; import org.opentripplanner.model.fare.ItineraryFares; @@ -84,6 +85,7 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.BikeAccess; import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.RealTimeTripTimes; @@ -151,6 +153,18 @@ static void setup() { transitModel.addTripPattern(id("pattern-1"), pattern); + var feedId = "testfeed"; + var feedInfo = FeedInfo.dummyForTest(feedId); + transitModel.addFeedInfo(feedInfo); + + var agency = Agency + .of(new FeedScopedId(feedId, "agency-xx")) + .withName("speedtransit") + .withUrl("www.otp-foo.bar") + .withTimezone("Europe/Berlin") + .build(); + transitModel.addAgency(agency); + transitModel.initTimeZone(ZoneIds.BERLIN); transitModel.index(); var routes = Arrays diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json new file mode 100644 index 00000000000..a3dbe43b0f1 --- /dev/null +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json @@ -0,0 +1,16 @@ +{ + "data" : { + "feeds" : [ + { + "agencies" : [ + { + "name" : "speedtransit", + "url" : "www.otp-foo.bar" + } + ], + "publisherUrl" : "www.z.org", + "publisherName" : "publisher" + } + ] + } +} \ No newline at end of file diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql new file mode 100644 index 00000000000..f0737202786 --- /dev/null +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql @@ -0,0 +1,10 @@ +{ + feeds { + agencies { + name + url + } + publisherUrl + publisherName + } +} \ No newline at end of file From ea679755a77beb05536b5c163f174141f62fbd72 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 8 May 2024 13:02:43 +0200 Subject: [PATCH 1088/1688] Remove extra collection conversion --- src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index 76a13255b67..5347e7504c5 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -33,8 +33,7 @@ public class FlexTripsMapper { ProgressTracker progress = ProgressTracker.track("Create flex trips", 500, tripSize); for (Trip trip : stopTimesByTrip.keys()) { - /* Fetch the stop times for this trip. Copy the list since it's immutable. */ - List stopTimes = new ArrayList<>(stopTimesByTrip.get(trip)); + var stopTimes = stopTimesByTrip.get(trip); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { var modifier = builder.getFlexDurationFactors().getOrDefault(trip, TimePenalty.ZERO); result.add( From 9128aa6b873407284c4f844028d60d9631e300da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 May 2024 11:07:17 +0000 Subject: [PATCH 1089/1688] fix(deps): update dependency org.onebusaway:onebusaway-gtfs to v1.4.17 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce89fc467e6..2c537332022 100644 --- a/pom.xml +++ b/pom.xml @@ -817,7 +817,7 @@ org.onebusaway onebusaway-gtfs - 1.4.15 + 1.4.17 org.slf4j From 695161a86c82dbbeed34140417d071df55823191 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 8 May 2024 13:25:53 +0200 Subject: [PATCH 1090/1688] Rename modifiers/factors to time penalty --- ...rTest.java => TimePenaltyCalculatorTest.java} | 6 +++--- .../trip/UnscheduledDrivingDurationTest.java | 6 +++--- .../ext/flex/FlexTripsMapper.java | 4 ++-- ...alculator.java => TimePenaltyCalculator.java} | 4 ++-- .../ext/flex/trip/UnscheduledTrip.java | 16 ++++++++++------ .../ext/flex/trip/UnscheduledTripBuilder.java | 10 +++++----- .../mapping/GTFSToOtpTransitServiceMapper.java | 2 +- .../model/impl/OtpTransitServiceBuilder.java | 2 +- .../api/request/framework/TimePenalty.java | 8 ++++++++ .../api/request/framework/TimePenaltyTest.java | 7 +++++++ 10 files changed, 42 insertions(+), 23 deletions(-) rename src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/{DurationModifierCalculatorTest.java => TimePenaltyCalculatorTest.java} (88%) rename src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/{DurationModifierCalculator.java => TimePenaltyCalculator.java} (83%) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java similarity index 88% rename from src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java rename to src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java index a97460dda75..e504f8ac762 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculatorTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java @@ -9,7 +9,7 @@ import org.opentripplanner.routing.api.request.framework.TimePenalty; import org.opentripplanner.street.model._data.StreetModelForTest; -class DurationModifierCalculatorTest { +class TimePenaltyCalculatorTest { private static final int THIRTY_MINS_IN_SECONDS = (int) Duration.ofMinutes(30).toSeconds(); @@ -19,7 +19,7 @@ void calculate() { new FlexPath(10_000, THIRTY_MINS_IN_SECONDS, () -> LineStrings.SIMPLE); var mod = TimePenalty.of(Duration.ofMinutes(10), 1.5f); - var calc = new DurationModifierCalculator(delegate, mod); + var calc = new TimePenaltyCalculator(delegate, mod); var path = calc.calculateFlexPath(StreetModelForTest.V1, StreetModelForTest.V2, 0, 5); assertEquals(3300, path.durationSeconds); } @@ -28,7 +28,7 @@ void calculate() { void nullValue() { FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> null; var mod = TimePenalty.of(Duration.ofMinutes(10), 1.5f); - var calc = new DurationModifierCalculator(delegate, mod); + var calc = new TimePenaltyCalculator(delegate, mod); var path = calc.calculateFlexPath(StreetModelForTest.V1, StreetModelForTest.V2, 0, 5); assertNull(path); } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java index bd06a51960b..a4b245b7de8 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java @@ -22,7 +22,7 @@ class UnscheduledDrivingDurationTest { private static final StopTime STOP_TIME = FlexStopTimesForTest.area("10:00", "18:00"); @Test - void noModifier() { + void noPenalty() { var trip = UnscheduledTrip.of(id("1")).withStopTimes(List.of(STOP_TIME)).build(); var calculator = trip.flexPathCalculator(STATIC_CALCULATOR); @@ -31,11 +31,11 @@ void noModifier() { } @Test - void withModifier() { + void withPenalty() { var trip = UnscheduledTrip .of(id("1")) .withStopTimes(List.of(STOP_TIME)) - .withDurationModifier(TimePenalty.of(Duration.ofMinutes(2), 1.5f)) + .withTimePenalty(TimePenalty.of(Duration.ofMinutes(2), 1.5f)) .build(); var calculator = trip.flexPathCalculator(STATIC_CALCULATOR); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java index 5347e7504c5..c4167f2f9e1 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexTripsMapper.java @@ -35,13 +35,13 @@ public class FlexTripsMapper { for (Trip trip : stopTimesByTrip.keys()) { var stopTimes = stopTimesByTrip.get(trip); if (UnscheduledTrip.isUnscheduledTrip(stopTimes)) { - var modifier = builder.getFlexDurationFactors().getOrDefault(trip, TimePenalty.ZERO); + var timePenalty = builder.getFlexTimePenalty().getOrDefault(trip, TimePenalty.NONE); result.add( UnscheduledTrip .of(trip.getId()) .withTrip(trip) .withStopTimes(stopTimes) - .withDurationModifier(modifier) + .withTimePenalty(timePenalty) .build() ); } else if (ScheduledDeviatedTrip.isScheduledFlexTrip(stopTimes)) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java similarity index 83% rename from src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java rename to src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java index 0f521b55b1f..63b661f0f9a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DurationModifierCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java @@ -8,12 +8,12 @@ * A calculator to delegates the main computation to another instance and applies a duration * modifier afterward. */ -public class DurationModifierCalculator implements FlexPathCalculator { +public class TimePenaltyCalculator implements FlexPathCalculator { private final FlexPathCalculator delegate; private final TimePenalty factors; - public DurationModifierCalculator(FlexPathCalculator delegate, TimePenalty penalty) { + public TimePenaltyCalculator(FlexPathCalculator delegate, TimePenalty penalty) { this.delegate = delegate; this.factors = penalty; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 7fa31c78114..402d39e2aa7 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -15,11 +15,13 @@ import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.DurationModifierCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; +import org.opentripplanner.ext.flex.flexpathcalculator.TimePenaltyCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; +import org.opentripplanner.framework.lang.DoubleUtils; import org.opentripplanner.framework.lang.IntRange; +import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.model.BookingInfo; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; @@ -53,7 +55,7 @@ public class UnscheduledTrip extends FlexTrip getFlexAccessTemplates( } /** - * Get the correct {@link FlexPathCalculator} depending on the {@code durationModifier}. + * Get the correct {@link FlexPathCalculator} depending on the {@code timePenalty}. * If the modifier doesn't actually modify, we return the regular calculator. */ protected FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { - if (!durationModifier.isZero()) { - return new DurationModifierCalculator(calculator, durationModifier); + if (timePenalty.modifies()) { + return new TimePenaltyCalculator(calculator, timePenalty); } else { return calculator; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java index cfffebe4fa7..1f8585f5ad0 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTripBuilder.java @@ -9,7 +9,7 @@ public class UnscheduledTripBuilder extends FlexTripBuilder { private List stopTimes; - private TimePenalty durationModifier = TimePenalty.ZERO; + private TimePenalty timePenalty = TimePenalty.NONE; UnscheduledTripBuilder(FeedScopedId id) { super(id); @@ -31,13 +31,13 @@ public List stopTimes() { return stopTimes; } - public UnscheduledTripBuilder withDurationModifier(TimePenalty factors) { - this.durationModifier = factors; + public UnscheduledTripBuilder withTimePenalty(TimePenalty factors) { + this.timePenalty = factors; return this; } - public TimePenalty durationModifier() { - return durationModifier; + public TimePenalty timePenalty() { + return timePenalty; } @Override diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index 24db367f829..ce65d6b0820 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -171,7 +171,7 @@ public void mapStopTripAndRouteDataIntoBuilder() { builder.getPathways().addAll(pathwayMapper.map(data.getAllPathways())); builder.getStopTimesSortedByTrip().addAll(stopTimeMapper.map(data.getAllStopTimes())); - builder.getFlexDurationFactors().putAll(tripMapper.flexSafeDurationModifiers()); + builder.getFlexTimePenalty().putAll(tripMapper.flexSafeDurationModifiers()); builder.getTripsById().addAll(tripMapper.map(data.getAllTrips())); fareRulesBuilder.fareAttributes().addAll(fareAttributeMapper.map(data.getAllFareAttributes())); diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java index 756a1ccf2a8..544ca29599d 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java @@ -213,7 +213,7 @@ public TripStopTimes getStopTimesSortedByTrip() { return stopTimesByTrip; } - public Map getFlexDurationFactors() { + public Map getFlexTimePenalty() { return flexDurationFactors; } diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java b/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java index aaa81db5a09..0c6fdd96436 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java +++ b/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java @@ -7,6 +7,7 @@ public final class TimePenalty extends AbstractLinearFunction { public static final TimePenalty ZERO = new TimePenalty(Duration.ZERO, 0.0); + public static final TimePenalty NONE = new TimePenalty(Duration.ZERO, 1.0); private TimePenalty(Duration constant, double coefficient) { super(DurationUtils.requireNonNegative(constant), coefficient); @@ -31,6 +32,13 @@ protected boolean isZero(Duration value) { return value.isZero(); } + /** + * Does this penalty actually modify a duration or would it be returned unchanged? + */ + public boolean modifies() { + return !constant().isZero() && coefficient() != 1.0; + } + @Override protected Duration constantAsDuration() { return constant(); diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java b/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java index f5bffe1f415..087ffa1d637 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/framework/TimePenaltyTest.java @@ -64,4 +64,11 @@ void calculate() { var subject = TimePenalty.of(D2m, 0.5); assertEquals(120 + 150, subject.calculate(Duration.ofMinutes(5)).toSeconds()); } + + @Test + void modifies() { + var subject = TimePenalty.of(D2m, 0.5); + assertTrue(subject.modifies()); + assertFalse(TimePenalty.ZERO.modifies()); + } } From 9000243814286fa558d53b2467d7e9513d346467 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 8 May 2024 14:34:53 +0200 Subject: [PATCH 1091/1688] refactor: Rename to AbstractFlexTemplate from FlexAccessEgressTemplate --- .../opentripplanner/ext/flex/edgetype/FlexTripEdge.java | 8 ++++---- ...ccessEgressTemplate.java => AbstractFlexTemplate.java} | 6 +++--- .../ext/flex/template/FlexAccessTemplate.java | 2 +- .../ext/flex/template/FlexEgressTemplate.java | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename src/ext/java/org/opentripplanner/ext/flex/template/{FlexAccessEgressTemplate.java => AbstractFlexTemplate.java} (98%) diff --git a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index acf2f8f95dc..0db66e04e0d 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -4,7 +4,7 @@ import javax.annotation.Nonnull; import org.locationtech.jts.geom.LineString; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; -import org.opentripplanner.ext.flex.template.FlexAccessEgressTemplate; +import org.opentripplanner.ext.flex.template.AbstractFlexTemplate; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.street.model.edge.Edge; @@ -19,7 +19,7 @@ public class FlexTripEdge extends Edge { private final FlexTrip trip; public final StopLocation s1; public final StopLocation s2; - public final FlexAccessEgressTemplate flexTemplate; + public final AbstractFlexTemplate flexTemplate; public final FlexPath flexPath; private FlexTripEdge( @@ -28,7 +28,7 @@ private FlexTripEdge( StopLocation s1, StopLocation s2, FlexTrip trip, - FlexAccessEgressTemplate flexTemplate, + AbstractFlexTemplate flexTemplate, FlexPath flexPath ) { super(v1, v2); @@ -49,7 +49,7 @@ public static FlexTripEdge createFlexTripEdge( StopLocation s1, StopLocation s2, FlexTrip trip, - FlexAccessEgressTemplate flexTemplate, + AbstractFlexTemplate flexTemplate, FlexPath flexPath ) { return new FlexTripEdge(v1, v2, s1, s2, trip, flexTemplate, flexPath); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java similarity index 98% rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressTemplate.java rename to src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 68f490f775f..2b4d46ad074 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -33,7 +33,7 @@ *

              * Please also see Flex.svg for an illustration of how the flex concepts relate to each other. */ -public abstract class FlexAccessEgressTemplate { +public abstract class AbstractFlexTemplate { /** * We do not want extremely short flex trips, they will normally be dominated in the @@ -59,7 +59,7 @@ public abstract class FlexAccessEgressTemplate { * @param date The service date of this FlexTrip * @param calculator Calculates the path and duration of the FlexTrip */ - FlexAccessEgressTemplate( + AbstractFlexTemplate( NearbyStop accessEgress, FlexTrip trip, int fromStopIndex, @@ -125,7 +125,7 @@ public Stream createFlexAccessEgressStream( @Override public String toString() { return ToStringBuilder - .of(FlexAccessEgressTemplate.class) + .of(AbstractFlexTemplate.class) .addObj("accessEgress", accessEgress) .addObj("trip", trip) .addNum("fromStopIndex", fromStopIndex) diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 39963bcf69e..f9076d45f41 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -24,7 +24,7 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; -public class FlexAccessTemplate extends FlexAccessEgressTemplate { +public class FlexAccessTemplate extends AbstractFlexTemplate { public FlexAccessTemplate( NearbyStop accessEgress, diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index 27e9cd2f009..04340d17ccf 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -18,7 +18,7 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; -public class FlexEgressTemplate extends FlexAccessEgressTemplate { +public class FlexEgressTemplate extends AbstractFlexTemplate { public FlexEgressTemplate( NearbyStop accessEgress, From b5082a0c8fd9e92946dc1307e321682d675c5739 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 8 May 2024 15:11:40 +0200 Subject: [PATCH 1092/1688] refactor: Reduce coupling in FlexTrip --- .../ext/flex/trip/UnscheduledTripTest.java | 14 ++++--------- .../opentripplanner/ext/flex/FlexRouter.java | 4 ++-- .../ext/flex/template/FlexEgressTemplate.java | 14 ------------- .../ext/flex/trip/FlexTrip.java | 4 ++-- .../ext/flex/trip/ScheduledDeviatedTrip.java | 20 +++++++++---------- .../ext/flex/trip/UnscheduledTrip.java | 20 +++++++++---------- .../module/NearbyStopFinder.java | 4 ++-- 7 files changed, 30 insertions(+), 50 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index fabe534ff23..ea72a98a0d7 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -33,7 +33,6 @@ import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model._data.TransitModelForTest; -import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; @@ -562,11 +561,11 @@ void boardingAlighting() { .build() .trip(); - assertTrue(trip.isBoardingPossible(nearbyStop(AREA_STOP1))); - assertFalse(trip.isAlightingPossible(nearbyStop(AREA_STOP1))); + assertTrue(trip.isBoardingPossible(AREA_STOP1)); + assertFalse(trip.isAlightingPossible(AREA_STOP1)); - assertFalse(trip.isBoardingPossible(nearbyStop(AREA_STOP2))); - assertTrue(trip.isAlightingPossible(nearbyStop(AREA_STOP2))); + assertFalse(trip.isBoardingPossible(AREA_STOP2)); + assertTrue(trip.isAlightingPossible(AREA_STOP2)); } @Nested @@ -690,11 +689,6 @@ private static StopTime regularStopTime(int arrivalTime, int departureTime) { return stopTime; } - @Nonnull - private static NearbyStop nearbyStop(AreaStop stop) { - return new NearbyStop(stop, 1000, List.of(), null); - } - record TestCase( StopTime from, StopTime to, diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index c84cb8823a7..3fcf3bae375 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -226,8 +226,8 @@ private Stream getClosestFlexTrips( .stream() .filter(flexTrip -> pickup - ? flexTrip.isBoardingPossible(accessEgress) - : flexTrip.isAlightingPossible(accessEgress) + ? flexTrip.isBoardingPossible(accessEgress.stop) + : flexTrip.isAlightingPossible(accessEgress.stop) ) .map(flexTrip -> new AccessEgressAndNearbyStop(accessEgress, flexTrip)) ); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index 04340d17ccf..4315b2af9a3 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -83,18 +83,4 @@ protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, StopLocation transferS flexPath ); } - - protected boolean isRouteable(Vertex flexVertex) { - if (accessEgress.state.getVertex() == flexVertex) { - return false; - } else return ( - calculator.calculateFlexPath( - flexVertex, - accessEgress.state.getVertex(), - fromStopIndex, - toStopIndex - ) != - null - ); - } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index ace9de22655..d7c697dc7e2 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -119,9 +119,9 @@ public Trip getTrip() { public abstract PickDrop getAlightRule(int i); - public abstract boolean isBoardingPossible(NearbyStop stop); + public abstract boolean isBoardingPossible(StopLocation stop); - public abstract boolean isAlightingPossible(NearbyStop stop); + public abstract boolean isAlightingPossible(StopLocation stop); @Override public boolean sameAs(@Nonnull T other) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 0f4c513a59a..250f17cf357 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -83,7 +83,7 @@ public Stream getFlexAccessTemplates( ) { FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, this); - int fromIndex = getFromIndex(access); + int fromIndex = getFromIndex(access.stop); if (fromIndex == -1) { return Stream.empty(); @@ -123,7 +123,7 @@ public Stream getFlexEgressTemplates( ) { FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, this); - int toIndex = getToIndex(egress); + int toIndex = getToIndex(egress.stop); if (toIndex == -1) { return Stream.empty(); @@ -221,12 +221,12 @@ public PickDrop getAlightRule(int i) { } @Override - public boolean isBoardingPossible(NearbyStop stop) { + public boolean isBoardingPossible(StopLocation stop) { return getFromIndex(stop) != -1; } @Override - public boolean isAlightingPossible(NearbyStop stop) { + public boolean isAlightingPossible(StopLocation stop) { return getToIndex(stop) != -1; } @@ -252,18 +252,18 @@ private Collection expandStops(StopLocation stop) { : Collections.singleton(stop); } - private int getFromIndex(NearbyStop accessEgress) { + private int getFromIndex(StopLocation fromStop) { for (int i = 0; i < stopTimes.length; i++) { if (getBoardRule(i).isNotRoutable()) { continue; } StopLocation stop = stopTimes[i].stop; if (stop instanceof GroupStop groupStop) { - if (groupStop.getChildLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(fromStop)) { return i; } } else { - if (stop.equals(accessEgress.stop)) { + if (stop.equals(fromStop)) { return i; } } @@ -271,18 +271,18 @@ private int getFromIndex(NearbyStop accessEgress) { return -1; } - private int getToIndex(NearbyStop accessEgress) { + private int getToIndex(StopLocation toStop) { for (int i = stopTimes.length - 1; i >= 0; i--) { if (getAlightRule(i).isNotRoutable()) { continue; } StopLocation stop = stopTimes[i].stop; if (stop instanceof GroupStop groupStop) { - if (groupStop.getChildLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(toStop)) { return i; } } else { - if (stop.equals(accessEgress.stop)) { + if (stop.equals(toStop)) { return i; } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 26006c91e3a..282950b3f60 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -104,7 +104,7 @@ public Stream getFlexAccessTemplates( FlexConfig config ) { // Find boarding index, also check if it's boardable - final int fromIndex = getFromIndex(access); + final int fromIndex = getFromIndex(access.stop); // templates will be generated from the boardingIndex to the end of the trip final int lastIndexInTrip = stopTimes.length - 1; @@ -154,7 +154,7 @@ public Stream getFlexEgressTemplates( int firstIndexInTrip = 0; // Find alighting index, also check if alighting is allowed - int toIndex = getToIndex(egress); + int toIndex = getToIndex(egress.stop); // Check if trip is possible if (toIndex == INDEX_NOT_FOUND || firstIndexInTrip > toIndex) { @@ -272,12 +272,12 @@ public PickDrop getAlightRule(int i) { } @Override - public boolean isBoardingPossible(NearbyStop stop) { + public boolean isBoardingPossible(StopLocation stop) { return getFromIndex(stop) != INDEX_NOT_FOUND; } @Override - public boolean isAlightingPossible(NearbyStop stop) { + public boolean isAlightingPossible(StopLocation stop) { return getToIndex(stop) != INDEX_NOT_FOUND; } @@ -304,18 +304,18 @@ private Stream expandStops(int index) { : Stream.of(new IndexedStopLocation(index, stop)); } - private int getFromIndex(NearbyStop accessEgress) { + private int getFromIndex(StopLocation fromStop) { for (int i = 0; i < stopTimes.length; i++) { if (getBoardRule(i).isNotRoutable()) { continue; } StopLocation stop = stopTimes[i].stop(); if (stop instanceof GroupStop groupStop) { - if (groupStop.getChildLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(fromStop)) { return i; } } else { - if (stop.equals(accessEgress.stop)) { + if (stop.equals(fromStop)) { return i; } } @@ -323,18 +323,18 @@ private int getFromIndex(NearbyStop accessEgress) { return INDEX_NOT_FOUND; } - private int getToIndex(NearbyStop accessEgress) { + private int getToIndex(StopLocation toStop) { for (int i = stopTimes.length - 1; i >= 0; i--) { if (getAlightRule(i).isNotRoutable()) { continue; } StopLocation stop = stopTimes[i].stop(); if (stop instanceof GroupStop groupStop) { - if (groupStop.getChildLocations().contains(accessEgress.stop)) { + if (groupStop.getChildLocations().contains(toStop)) { return i; } } else { - if (stop.equals(accessEgress.stop)) { + if (stop.equals(toStop)) { return i; } } diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java index 7386b60b452..aca6e8a94cf 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java @@ -133,8 +133,8 @@ public Set findNearbyStopsConsideringPatterns( for (FlexTrip trip : transitService.getFlexIndex().getFlexTripsByStop(ts1)) { if ( reverseDirection - ? trip.isAlightingPossible(nearbyStop) - : trip.isBoardingPossible(nearbyStop) + ? trip.isAlightingPossible(nearbyStop.stop) + : trip.isBoardingPossible(nearbyStop.stop) ) { closestStopForFlexTrip.putMin(trip, nearbyStop); } From cc4385d7076f675070a2a49d497bc27487cb19d2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 8 May 2024 14:32:32 +0200 Subject: [PATCH 1093/1688] fix: Fix dropOff and pickup booking info Pickup should use the board-stop, not alight stop and opposite for dropOff. --- .../java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index 95c9e8fecd4..c8c049f4e08 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -173,12 +173,12 @@ public PickDrop getAlightRule() { @Override public BookingInfo getDropOffBookingInfo() { - return edge.getFlexTrip().getDropOffBookingInfo(getBoardStopPosInPattern()); + return edge.getFlexTrip().getDropOffBookingInfo(getAlightStopPosInPattern()); } @Override public BookingInfo getPickupBookingInfo() { - return edge.getFlexTrip().getPickupBookingInfo(getAlightStopPosInPattern()); + return edge.getFlexTrip().getPickupBookingInfo(getBoardStopPosInPattern()); } @Override From 19ac4d8df44d9f8ab128f6d231b10259b0aeaf75 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 8 May 2024 15:21:46 +0200 Subject: [PATCH 1094/1688] refactor: Remove input flag to cause method branching --- .../ext/restapi/mapping/BookingInfoMapper.java | 16 +++++++++++++--- .../ext/restapi/mapping/LegMapper.java | 5 +++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java index 008ae2ec202..b4e3292b435 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/BookingInfoMapper.java @@ -5,7 +5,19 @@ public class BookingInfoMapper { - static ApiBookingInfo mapBookingInfo(BookingInfo info, boolean isPickup) { + static ApiBookingInfo mapBookingInfoForPickup(BookingInfo info) { + return mapBookingInfo(info, true); + } + + static ApiBookingInfo mapBookingInfoForDropOff(BookingInfo info) { + return mapBookingInfo(info, false); + } + + /** + * @param isPickup either pickup or dropOff message must be set, not both. We only want to show + * the pick-up message for pickups, and the drop-off message for drop-offs. + */ + private static ApiBookingInfo mapBookingInfo(BookingInfo info, boolean isPickup) { if (info == null) { return null; } @@ -18,9 +30,7 @@ static ApiBookingInfo mapBookingInfo(BookingInfo info, boolean isPickup) { info.getMinimumBookingNotice(), info.getMaximumBookingNotice(), info.getMessage(), - // we only want to show the pick up message for pickups isPickup ? info.getPickupMessage() : null, - // and only the drop off message for drop offs !isPickup ? info.getDropOffMessage() : null ); } diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java index 766262bca89..b642426cd6d 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/LegMapper.java @@ -142,9 +142,10 @@ public ApiLeg mapLeg( api.boardRule = getBoardAlightMessage(domain.getBoardRule()); api.alightRule = getBoardAlightMessage(domain.getAlightRule()); - api.pickupBookingInfo = BookingInfoMapper.mapBookingInfo(domain.getPickupBookingInfo(), true); + api.pickupBookingInfo = + BookingInfoMapper.mapBookingInfoForPickup(domain.getPickupBookingInfo()); api.dropOffBookingInfo = - BookingInfoMapper.mapBookingInfo(domain.getDropOffBookingInfo(), false); + BookingInfoMapper.mapBookingInfoForDropOff(domain.getDropOffBookingInfo()); api.rentedBike = domain.getRentedVehicle(); api.walkingBike = domain.getWalkingBike(); From 750d802d3b75f4ade25f62af34cd23c7638f99df Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 8 May 2024 16:22:32 +0200 Subject: [PATCH 1095/1688] refactor: Rename 'findBoard-/Alight-Index' methods in FlexTrip We need these methods to be public to use them in mapping code later. --- .../ext/flex/trip/FlexTrip.java | 14 +++++++ .../ext/flex/trip/ScheduledDeviatedTrip.java | 24 ++++++------ .../ext/flex/trip/UnscheduledTrip.java | 37 ++++++++++--------- 3 files changed, 46 insertions(+), 29 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index d7c697dc7e2..9342ddc721c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -28,6 +28,8 @@ public abstract class FlexTrip, B extends FlexTripBuilder> extends AbstractTransitEntity { + public static int STOP_INDEX_NOT_FOUND = -1; + private final Trip trip; FlexTrip(FlexTripBuilder builder) { @@ -123,6 +125,18 @@ public Trip getTrip() { public abstract boolean isAlightingPossible(StopLocation stop); + /** + * Find the first board-stop-position matching the given {@code fromStop}. + * Retuns {@link #STOP_INDEX_NOT_FOUND} if not found. + */ + public abstract int findBoardIndex(StopLocation fromStop); + + /** + * Find the first alight-stop-position matching the given {@code toStop}. + * Retuns {@link #STOP_INDEX_NOT_FOUND} if not found. + */ + public abstract int findAlightIndex(StopLocation toStop); + @Override public boolean sameAs(@Nonnull T other) { return getId().equals(other.getId()) && Objects.equals(trip, other.getTrip()); diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 250f17cf357..1ca177777b6 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -83,7 +83,7 @@ public Stream getFlexAccessTemplates( ) { FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, this); - int fromIndex = getFromIndex(access.stop); + int fromIndex = findBoardIndex(access.stop); if (fromIndex == -1) { return Stream.empty(); @@ -123,9 +123,9 @@ public Stream getFlexEgressTemplates( ) { FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, this); - int toIndex = getToIndex(egress.stop); + var toIndex = findAlightIndex(egress.stop); - if (toIndex == -1) { + if (toIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { return Stream.empty(); } @@ -221,13 +221,13 @@ public PickDrop getAlightRule(int i) { } @Override - public boolean isBoardingPossible(StopLocation stop) { - return getFromIndex(stop) != -1; + public boolean isBoardingPossible(StopLocation fromStop) { + return findBoardIndex(fromStop) != STOP_INDEX_NOT_FOUND; } @Override - public boolean isAlightingPossible(StopLocation stop) { - return getToIndex(stop) != -1; + public boolean isAlightingPossible(StopLocation toStop) { + return findAlightIndex(toStop) != STOP_INDEX_NOT_FOUND; } @Override @@ -252,7 +252,8 @@ private Collection expandStops(StopLocation stop) { : Collections.singleton(stop); } - private int getFromIndex(StopLocation fromStop) { + @Override + public int findBoardIndex(StopLocation fromStop) { for (int i = 0; i < stopTimes.length; i++) { if (getBoardRule(i).isNotRoutable()) { continue; @@ -268,10 +269,11 @@ private int getFromIndex(StopLocation fromStop) { } } } - return -1; + return STOP_INDEX_NOT_FOUND; } - private int getToIndex(StopLocation toStop) { + @Override + public int findAlightIndex(StopLocation toStop) { for (int i = stopTimes.length - 1; i >= 0; i--) { if (getAlightRule(i).isNotRoutable()) { continue; @@ -287,7 +289,7 @@ private int getToIndex(StopLocation toStop) { } } } - return -1; + return STOP_INDEX_NOT_FOUND; } private static class ScheduledDeviatedStopTime implements Serializable { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 282950b3f60..2403d0ac47d 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -43,7 +43,6 @@ public class UnscheduledTrip extends FlexTrip { private static final Set N_STOPS = Set.of(1, 2); - private static final int INDEX_NOT_FOUND = -1; private final StopTimeWindow[] stopTimes; @@ -104,13 +103,13 @@ public Stream getFlexAccessTemplates( FlexConfig config ) { // Find boarding index, also check if it's boardable - final int fromIndex = getFromIndex(access.stop); + final int fromIndex = findBoardIndex(access.stop); // templates will be generated from the boardingIndex to the end of the trip final int lastIndexInTrip = stopTimes.length - 1; // Check if trip is possible - if (fromIndex == INDEX_NOT_FOUND || fromIndex > lastIndexInTrip) { + if (fromIndex == STOP_INDEX_NOT_FOUND) { return Stream.empty(); } @@ -154,10 +153,10 @@ public Stream getFlexEgressTemplates( int firstIndexInTrip = 0; // Find alighting index, also check if alighting is allowed - int toIndex = getToIndex(egress.stop); + int toIndex = findAlightIndex(egress.stop); // Check if trip is possible - if (toIndex == INDEX_NOT_FOUND || firstIndexInTrip > toIndex) { + if (toIndex == STOP_INDEX_NOT_FOUND) { return Stream.empty(); } @@ -273,12 +272,12 @@ public PickDrop getAlightRule(int i) { @Override public boolean isBoardingPossible(StopLocation stop) { - return getFromIndex(stop) != INDEX_NOT_FOUND; + return findBoardIndex(stop) != STOP_INDEX_NOT_FOUND; } @Override public boolean isAlightingPossible(StopLocation stop) { - return getToIndex(stop) != INDEX_NOT_FOUND; + return findAlightIndex(stop) != STOP_INDEX_NOT_FOUND; } @Override @@ -297,14 +296,8 @@ public TransitBuilder copy() { return new UnscheduledTripBuilder(this); } - private Stream expandStops(int index) { - var stop = stopTimes[index].stop(); - return stop instanceof GroupStop groupStop - ? groupStop.getChildLocations().stream().map(s -> new IndexedStopLocation(index, s)) - : Stream.of(new IndexedStopLocation(index, stop)); - } - - private int getFromIndex(StopLocation fromStop) { + @Override + public int findBoardIndex(StopLocation fromStop) { for (int i = 0; i < stopTimes.length; i++) { if (getBoardRule(i).isNotRoutable()) { continue; @@ -320,10 +313,11 @@ private int getFromIndex(StopLocation fromStop) { } } } - return INDEX_NOT_FOUND; + return FlexTrip.STOP_INDEX_NOT_FOUND; } - private int getToIndex(StopLocation toStop) { + @Override + public int findAlightIndex(StopLocation toStop) { for (int i = stopTimes.length - 1; i >= 0; i--) { if (getAlightRule(i).isNotRoutable()) { continue; @@ -339,7 +333,14 @@ private int getToIndex(StopLocation toStop) { } } } - return INDEX_NOT_FOUND; + return FlexTrip.STOP_INDEX_NOT_FOUND; + } + + private Stream expandStops(int index) { + var stop = stopTimes[index].stop(); + return stop instanceof GroupStop groupStop + ? groupStop.getChildLocations().stream().map(s -> new IndexedStopLocation(index, s)) + : Stream.of(new IndexedStopLocation(index, stop)); } private Optional departureTimeWindow( From 61d60febfbcf43ae72e2670acc90995fe3b558be Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 8 May 2024 22:26:57 +0200 Subject: [PATCH 1096/1688] refactor: Remove dependency on NearbyStop and the templates in FlexTrip --- .../ext/flex/GtfsFlexTest.java | 11 +- .../flex/trip/ScheduledDeviatedTripTest.java | 11 +- .../ext/flex/trip/UnscheduledTripTest.java | 11 +- .../opentripplanner/ext/flex/FlexRouter.java | 13 +- .../flex/template/FlexTemplateFactory.java | 254 ++++++++++++++++++ .../ext/flex/trip/FlexTrip.java | 32 +-- .../ext/flex/trip/ScheduledDeviatedTrip.java | 99 +------ .../ext/flex/trip/UnscheduledTrip.java | 128 ++------- 8 files changed, 315 insertions(+), 244 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index 78c4a2f3ddc..6951a5efd5c 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -9,6 +9,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.TestOtpModel; +import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.routing.graphfinder.NearbyStop; @@ -54,9 +55,8 @@ void calculateAccessTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var accesses = trip - .getFlexAccessTemplates(nearbyStop, flexDate, calculator, FlexConfig.DEFAULT) - .toList(); + var accesses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) + .createAccessTemplates(trip, nearbyStop, flexDate); assertEquals(1, accesses.size()); @@ -69,9 +69,8 @@ void calculateAccessTemplate() { void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var egresses = trip - .getFlexEgressTemplates(nearbyStop, flexDate, calculator, FlexConfig.DEFAULT) - .toList(); + var egresses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) + .createEgressTemplates(trip, nearbyStop, flexDate); assertEquals(1, egresses.size()); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 143388cac0f..388cbc6d747 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -21,6 +21,7 @@ import org.opentripplanner.ext.fares.DecorateWithFare; import org.opentripplanner.ext.flex.FlexRouter; import org.opentripplanner.ext.flex.FlexTest; +import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.geometry.EncodedPolyline; import org.opentripplanner.framework.i18n.I18NString; @@ -96,9 +97,8 @@ void calculateAccessTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var accesses = trip - .getFlexAccessTemplates(nearbyStop, flexDate, calculator, FlexConfig.DEFAULT) - .toList(); + var accesses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) + .createAccessTemplates(trip, nearbyStop, flexDate); assertEquals(3, accesses.size()); @@ -111,9 +111,8 @@ void calculateAccessTemplate() { void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var egresses = trip - .getFlexEgressTemplates(nearbyStop, flexDate, calculator, FlexConfig.DEFAULT) - .toList(); + var egresses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) + .createEgressTemplates(trip, nearbyStop, flexDate); assertEquals(3, egresses.size()); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index ea72a98a0d7..51186d6a049 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -25,6 +25,7 @@ import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; +import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; @@ -643,16 +644,14 @@ private static UnscheduledTrip trip(List stopTimes) { @Nonnull private static List accessTemplates(UnscheduledTrip trip) { - return trip - .getFlexAccessTemplates(NEARBY_STOP, FLEX_SERVICE_DATE, CALCULATOR, FlexConfig.DEFAULT) - .toList(); + return new FlexTemplateFactory(CALCULATOR, FlexConfig.DEFAULT) + .createAccessTemplates(trip, NEARBY_STOP, FLEX_SERVICE_DATE); } @Nonnull private static List egressTemplates(UnscheduledTrip trip) { - return trip - .getFlexEgressTemplates(NEARBY_STOP, FLEX_SERVICE_DATE, CALCULATOR, FlexConfig.DEFAULT) - .toList(); + return new FlexTemplateFactory(CALCULATOR, FlexConfig.DEFAULT) + .createEgressTemplates(trip, NEARBY_STOP, FLEX_SERVICE_DATE); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 3fcf3bae375..147698b94f2 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -19,6 +19,7 @@ import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; +import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.framework.time.ServiceDateUtils; @@ -170,6 +171,8 @@ private void calculateFlexAccessTemplates() { return; } + var templateFactory = new FlexTemplateFactory(accessFlexPathCalculator, config); + // Fetch the closest flexTrips reachable from the access stops this.flexAccessTemplates = getClosestFlexTrips(streetAccesses, true) @@ -181,9 +184,7 @@ private void calculateFlexAccessTemplates() { .filter(date -> date.isFlexTripRunning(it.flexTrip(), this.transitService)) // Create templates from trip, boarding at the nearbyStop .flatMap(date -> - it - .flexTrip() - .getFlexAccessTemplates(it.accessEgress(), date, accessFlexPathCalculator, config) + templateFactory.createAccessTemplates(it.flexTrip(), it.accessEgress(), date).stream() ) ) .toList(); @@ -194,6 +195,8 @@ private void calculateFlexEgressTemplates() { return; } + var templateFactory = new FlexTemplateFactory(egressFlexPathCalculator, config); + // Fetch the closest flexTrips reachable from the egress stops this.flexEgressTemplates = getClosestFlexTrips(streetEgresses, false) @@ -205,9 +208,7 @@ private void calculateFlexEgressTemplates() { .filter(date -> date.isFlexTripRunning(it.flexTrip(), this.transitService)) // Create templates from trip, alighting at the nearbyStop .flatMap(date -> - it - .flexTrip() - .getFlexEgressTemplates(it.accessEgress(), date, egressFlexPathCalculator, config) + templateFactory.createEgressTemplates(it.flexTrip(), it.accessEgress(), date).stream() ) ) .toList(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java new file mode 100644 index 00000000000..b25a69fd2b6 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -0,0 +1,254 @@ +package org.opentripplanner.ext.flex.template; + +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; +import java.util.stream.IntStream; +import org.opentripplanner.ext.flex.FlexServiceDate; +import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; +import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; +import org.opentripplanner.ext.flex.trip.FlexTrip; +import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; +import org.opentripplanner.ext.flex.trip.UnscheduledTrip; +import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.standalone.config.sandbox.FlexConfig; +import org.opentripplanner.transit.model.site.GroupStop; +import org.opentripplanner.transit.model.site.StopLocation; + +public class FlexTemplateFactory { + + private final FlexPathCalculator calculator; + private final FlexConfig config; + private FlexTrip trip; + private NearbyStop nearbyStop; + private FlexServiceDate date; + + public FlexTemplateFactory(FlexPathCalculator calculator, FlexConfig config) { + this.calculator = calculator; + this.config = config; + } + + private void with(FlexTrip trip, NearbyStop nearbyStop, FlexServiceDate date) { + this.trip = trip; + this.nearbyStop = nearbyStop; + this.date = date; + } + + public List createAccessTemplates( + FlexTrip flexTrip, + NearbyStop access, + FlexServiceDate date + ) { + // TODO: Merge the type specific methods and push differences into the types, + // The diff is likely to be important business rules. + if (flexTrip instanceof ScheduledDeviatedTrip sdt) { + return createAccessTemplatesForScheduledDeviatedTrip(sdt, access, date); + } else if (flexTrip instanceof UnscheduledTrip ust) { + return createAccessTemplatesForUnscheduledTrip(ust, access, date); + } + throw new IllegalArgumentException("Unknown type: " + flexTrip.getClass()); + } + + public List createEgressTemplates( + FlexTrip flexTrip, + NearbyStop egress, + FlexServiceDate date + ) { + // TODO: Merge the type specific methods and push differences into the types, + // The diff is likely to be important business rules. + if (flexTrip instanceof ScheduledDeviatedTrip sdt) { + return createEgressTemplatesForScheduledDeviatedTrip(sdt, egress, date); + } else if (flexTrip instanceof UnscheduledTrip ust) { + return createEgressTemplatesForUnscheduledTrip(ust, egress, date); + } + throw new IllegalArgumentException("Unknown type: " + flexTrip.getClass()); + } + + private List createAccessTemplatesForScheduledDeviatedTrip( + ScheduledDeviatedTrip flexTrip, + NearbyStop access, + FlexServiceDate date + ) { + with(flexTrip, access, date); + var scheduledCalculator = new ScheduledFlexPathCalculator(calculator, flexTrip); + + int fromIndex = flexTrip.findBoardIndex(access.stop); + + if (fromIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + return List.of(); + } + + ArrayList res = new ArrayList<>(); + + for (int toIndex = fromIndex; toIndex < flexTrip.numberOfStops(); toIndex++) { + if (flexTrip.getAlightRule(toIndex).isNotRoutable()) { + continue; + } + for (IndexedStopLocation stop : expandStopsAt(flexTrip, toIndex)) { + res.add( + new FlexAccessTemplate( + access, + trip, + fromIndex, + toIndex, + stop.stop, + date, + scheduledCalculator, + config + ) + ); + } + } + return res; + } + + private List createEgressTemplatesForScheduledDeviatedTrip( + ScheduledDeviatedTrip flexTrip, + NearbyStop egress, + FlexServiceDate date + ) { + with(flexTrip, egress, date); + + FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, flexTrip); + + var toIndex = flexTrip.findAlightIndex(egress.stop); + + if (toIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + return List.of(); + } + + List res = new ArrayList<>(); + + for (int fromIndex = toIndex; fromIndex >= 0; fromIndex--) { + if (flexTrip.getBoardRule(fromIndex).isNotRoutable()) { + continue; + } + for (var stop : expandStopsAt(flexTrip, fromIndex)) { + res.add( + new FlexEgressTemplate( + egress, + flexTrip, + fromIndex, + toIndex, + stop.stop, + date, + scheduledCalculator, + config + ) + ); + } + } + return res; + } + + private List createAccessTemplatesForUnscheduledTrip( + UnscheduledTrip flexTrip, + NearbyStop access, + FlexServiceDate date + ) { + with(flexTrip, access, date); + + // Find boarding index, also check if it's boardable + final int fromIndex = flexTrip.findBoardIndex(access.stop); + + if (fromIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + return List.of(); + } + + // templates will be generated from the boardingIndex to the end of the trip + final int lastIndexInTrip = flexTrip.numberOfStops() - 1; + + // Check if trip is possible + IntStream indices; + if (flexTrip.numberOfStops() == 1) { + indices = IntStream.of(fromIndex); + } else { + indices = IntStream.range(fromIndex + 1, lastIndexInTrip + 1); + } + + for (int toIndex = fromIndex; toIndex < flexTrip.numberOfStops(); toIndex++) { + if (flexTrip.getAlightRule(toIndex).isNotRoutable()) { + continue; + } + for (var stop : expandStopsAt(flexTrip, toIndex)) {} + } + + // check for every stop after fromIndex if you can alight, if so return a template + return indices + // if you cannot alight at an index, the trip is not possible + .filter(alightIndex -> flexTrip.getAlightRule(alightIndex).isRoutable()) + // expand GroupStops and build IndexedStopLocations + .mapToObj(alightIndex -> expandStopsAt(flexTrip, alightIndex).stream()) + // flatten stream of streams + .flatMap(Function.identity()) + // create template + .map(alightStop -> + new FlexAccessTemplate( + access, + flexTrip, + fromIndex, + alightStop.index, + alightStop.stop, + date, + calculator, + config + ) + ) + .toList(); + } + + private List createEgressTemplatesForUnscheduledTrip( + UnscheduledTrip flexTrip, + NearbyStop egress, + FlexServiceDate date + ) { + // templates will be generated from the first index to the toIndex + int firstIndexInTrip = 0; + + // Find alighting index, also check if alighting is allowed + int toIndex = flexTrip.findAlightIndex(egress.stop); + + // Check if trip is possible + if (toIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + return List.of(); + } + + IntStream indices; + if (flexTrip.numberOfStops() == 1) { + indices = IntStream.of(toIndex); + } else { + indices = IntStream.range(firstIndexInTrip, toIndex + 1); + } + // check for every stop after fromIndex if you can alight, if so return a template + return indices + // if you cannot board at this index, the trip is not possible + .filter(boardIndex -> flexTrip.getBoardRule(boardIndex).isRoutable()) + // expand GroupStops and build IndexedStopLocations + .mapToObj(boardIndex -> expandStopsAt(flexTrip, boardIndex).stream()) + // flatten stream of streams + .flatMap(Function.identity()) + // create template + .map(boardStop -> + new FlexEgressTemplate( + egress, + flexTrip, + boardStop.index, + toIndex, + boardStop.stop, + date, + calculator, + config + ) + ) + .toList(); + } + + private static List expandStopsAt(FlexTrip flexTrip, int index) { + var stop = flexTrip.getStop(index); + return stop instanceof GroupStop groupStop + ? groupStop.getChildLocations().stream().map(s -> new IndexedStopLocation(index, s)).toList() + : List.of(new IndexedStopLocation(index, stop)); + } + + private record IndexedStopLocation(int index, StopLocation stop) {} +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index 9342ddc721c..f5070d14fa6 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -3,16 +3,9 @@ import java.util.List; import java.util.Objects; import java.util.Set; -import java.util.stream.Stream; import javax.annotation.Nonnull; -import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; -import org.opentripplanner.ext.flex.template.FlexAccessTemplate; -import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.AbstractTransitEntity; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.model.site.GroupStop; @@ -45,20 +38,6 @@ public static boolean isFlexStop(StopLocation stop) { return stop instanceof GroupStop || stop instanceof AreaStop; } - public abstract Stream getFlexAccessTemplates( - NearbyStop access, - FlexServiceDate date, - FlexPathCalculator calculator, - FlexConfig config - ); - - public abstract Stream getFlexEgressTemplates( - NearbyStop egress, - FlexServiceDate date, - FlexPathCalculator calculator, - FlexConfig config - ); - /** * Earliest departure time from fromStopIndex to toStopIndex, which departs after departureTime, * and for which the flex trip has a duration of flexTime seconds. @@ -99,6 +78,11 @@ public abstract int latestArrivalTime( */ public abstract int latestArrivalTime(int stopIndex); + /** + * Return number-of-stops this trip visit. + */ + public abstract int numberOfStops(); + /** * Returns all the stops that are in this trip. *

              @@ -109,6 +93,12 @@ public abstract int latestArrivalTime( */ public abstract Set getStops(); + /** + * Return a stop at given stop-index. Note! The visited order may not be the same as the + * indexing order. + */ + public abstract StopLocation getStop(int stopIndex); + public Trip getTrip() { return trip; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 1ca177777b6..e850c87c334 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -4,7 +4,6 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; import java.io.Serializable; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -12,17 +11,9 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.Nonnull; -import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; -import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; -import org.opentripplanner.ext.flex.template.FlexAccessTemplate; -import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.TransitBuilder; import org.opentripplanner.transit.model.site.GroupStop; @@ -74,86 +65,6 @@ public static boolean isScheduledFlexTrip(List stopTimes) { ); } - @Override - public Stream getFlexAccessTemplates( - NearbyStop access, - FlexServiceDate date, - FlexPathCalculator calculator, - FlexConfig config - ) { - FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, this); - - int fromIndex = findBoardIndex(access.stop); - - if (fromIndex == -1) { - return Stream.empty(); - } - - ArrayList res = new ArrayList<>(); - - for (int toIndex = fromIndex; toIndex < stopTimes.length; toIndex++) { - if (getAlightRule(toIndex).isNotRoutable()) { - continue; - } - for (StopLocation stop : expandStops(stopTimes[toIndex].stop)) { - res.add( - new FlexAccessTemplate( - access, - this, - fromIndex, - toIndex, - stop, - date, - scheduledCalculator, - config - ) - ); - } - } - - return res.stream(); - } - - @Override - public Stream getFlexEgressTemplates( - NearbyStop egress, - FlexServiceDate date, - FlexPathCalculator calculator, - FlexConfig config - ) { - FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, this); - - var toIndex = findAlightIndex(egress.stop); - - if (toIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { - return Stream.empty(); - } - - ArrayList res = new ArrayList<>(); - - for (int fromIndex = toIndex; fromIndex >= 0; fromIndex--) { - if (getBoardRule(fromIndex).isNotRoutable()) { - continue; - } - for (StopLocation stop : expandStops(stopTimes[fromIndex].stop)) { - res.add( - new FlexEgressTemplate( - egress, - this, - fromIndex, - toIndex, - stop, - date, - scheduledCalculator, - config - ) - ); - } - } - - return res.stream(); - } - @Override public int earliestDepartureTime( int departureTime, @@ -192,6 +103,11 @@ public int latestArrivalTime(int stopIndex) { return stopTimes[stopIndex].arrivalTime; } + @Override + public int numberOfStops() { + return stopTimes.length; + } + @Override public Set getStops() { return Arrays @@ -200,6 +116,11 @@ public Set getStops() { .collect(Collectors.toSet()); } + @Override + public StopLocation getStop(int stopIndex) { + return stopTimes[stopIndex].stop; + } + @Override public BookingInfo getDropOffBookingInfo(int i) { return dropOffBookingInfos[i]; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 2403d0ac47d..03d71af9ad2 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -7,21 +7,13 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import java.util.stream.IntStream; import java.util.stream.Stream; import javax.annotation.Nonnull; -import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; -import org.opentripplanner.ext.flex.template.FlexAccessTemplate; -import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.framework.lang.IntRange; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.TransitBuilder; import org.opentripplanner.transit.model.site.GroupStop; @@ -95,100 +87,6 @@ public static boolean isUnscheduledTrip(List stopTimes) { } } - @Override - public Stream getFlexAccessTemplates( - NearbyStop access, - FlexServiceDate date, - FlexPathCalculator calculator, - FlexConfig config - ) { - // Find boarding index, also check if it's boardable - final int fromIndex = findBoardIndex(access.stop); - - // templates will be generated from the boardingIndex to the end of the trip - final int lastIndexInTrip = stopTimes.length - 1; - - // Check if trip is possible - if (fromIndex == STOP_INDEX_NOT_FOUND) { - return Stream.empty(); - } - - IntStream indices; - if (stopTimes.length == 1) { - indices = IntStream.of(fromIndex); - } else { - indices = IntStream.range(fromIndex + 1, lastIndexInTrip + 1); - } - // check for every stop after fromIndex if you can alight, if so return a template - return indices - // if you cannot alight at an index, the trip is not possible - .filter(alightIndex -> getAlightRule(alightIndex).isRoutable()) - // expand GroupStops and build IndexedStopLocations - .mapToObj(this::expandStops) - // flatten stream of streams - .flatMap(Function.identity()) - // create template - .map(alightStop -> - new FlexAccessTemplate( - access, - this, - fromIndex, - alightStop.index, - alightStop.stop, - date, - calculator, - config - ) - ); - } - - @Override - public Stream getFlexEgressTemplates( - NearbyStop egress, - FlexServiceDate date, - FlexPathCalculator calculator, - FlexConfig config - ) { - // templates will be generated from the first index to the toIndex - int firstIndexInTrip = 0; - - // Find alighting index, also check if alighting is allowed - int toIndex = findAlightIndex(egress.stop); - - // Check if trip is possible - if (toIndex == STOP_INDEX_NOT_FOUND) { - return Stream.empty(); - } - - IntStream indices; - if (stopTimes.length == 1) { - indices = IntStream.of(toIndex); - } else { - indices = IntStream.range(firstIndexInTrip, toIndex + 1); - } - // check for every stop after fromIndex if you can alight, if so return a template - return indices - // if you cannot board at this index, the trip is not possible - .filter(boardIndex -> getBoardRule(boardIndex).isRoutable()) - // expand GroupStops and build IndexedStopLocations - .mapToObj(this::expandStops) - // flatten stream of streams - .flatMap(Function.identity()) - // create template - .map(boardStop -> - new FlexEgressTemplate( - egress, - this, - boardStop.index, - toIndex, - boardStop.stop, - date, - calculator, - config - ) - ); - } - @Override public int earliestDepartureTime( int requestedDepartureTime, @@ -245,29 +143,39 @@ public int latestArrivalTime(int stopIndex) { return stopTimes[stopIndex].end(); } + @Override + public int numberOfStops() { + return stopTimes.length; + } + @Override public Set getStops() { return Arrays.stream(stopTimes).map(StopTimeWindow::stop).collect(Collectors.toSet()); } @Override - public BookingInfo getDropOffBookingInfo(int i) { - return dropOffBookingInfos[i]; + public StopLocation getStop(int stopIndex) { + return stopTimes[stopIndex].stop(); + } + + @Override + public BookingInfo getDropOffBookingInfo(int stopIndex) { + return dropOffBookingInfos[stopIndex]; } @Override - public BookingInfo getPickupBookingInfo(int i) { - return pickupBookingInfos[i]; + public BookingInfo getPickupBookingInfo(int stopIndex) { + return pickupBookingInfos[stopIndex]; } @Override - public PickDrop getBoardRule(int i) { - return stopTimes[i].pickupType(); + public PickDrop getBoardRule(int stopIndex) { + return stopTimes[stopIndex].pickupType(); } @Override - public PickDrop getAlightRule(int i) { - return stopTimes[i].dropOffType(); + public PickDrop getAlightRule(int stopIndex) { + return stopTimes[stopIndex].dropOffType(); } @Override From 13c47176aa97f4e3e184e60c017d7d724509e424 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 9 May 2024 23:05:04 +0200 Subject: [PATCH 1097/1688] Fix spelling [ci skip] --- docs/Version-Comparison.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/Version-Comparison.md b/docs/Version-Comparison.md index 48257bdbd54..bc4a7caf5d8 100644 --- a/docs/Version-Comparison.md +++ b/docs/Version-Comparison.md @@ -92,7 +92,7 @@ applications. See the [Analysis](Analysis.md) page for more details. ### Routers API and Hot Reloading -Via it's Routers API, OTP1 allows loading data and serving APIs for multiple separate geographic +Via its Routers API, OTP1 allows loading data and serving APIs for multiple separate geographic areas. This is functionally equivalent to running more than one OTP server with separate data sets. This system also allows reloading transportation network data when it changes, or even pushing new data over a network connection. From fdf2bf297f85d5f7d804d00f1d372a16e4abced7 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 10 May 2024 10:03:30 +0000 Subject: [PATCH 1098/1688] Add changelog entry for #5821 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index cafc677ccc6..c4b90705ae7 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -16,6 +16,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix trip duplication in Graph Builder DSJ mapping [#5794](https://github.com/opentripplanner/OpenTripPlanner/pull/5794) - Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) - Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) +- Fix handling of implicit access and egress mode parameters. [#5821](https://github.com/opentripplanner/OpenTripPlanner/pull/5821) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 2a273eebc2e9681c32f004bd6d0aca938f6ac64a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 10 May 2024 15:30:48 +0200 Subject: [PATCH 1099/1688] fix: Flex trips are not allowed to board and alight at the same stop. TESTES FAILS! This was earlier allowed in GTFS, but not in NeTEx. The code is refactored to express this decision explicit. THIS IS NOT BACKWARD COMPATIBLE. But if someone requests it, we will allow adding a feature flag for it. --- .../ext/flex/GtfsFlexTest.java | 18 +- .../flex/trip/ScheduledDeviatedTripTest.java | 12 +- .../ext/flex/trip/UnscheduledTripTest.java | 12 +- .../opentripplanner/ext/flex/FlexRouter.java | 16 +- .../flex/template/FlexTemplateFactory.java | 317 +++++++----------- .../ext/flex/trip/FlexTrip.java | 12 +- 6 files changed, 164 insertions(+), 223 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index 6951a5efd5c..35b8352e3fb 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -55,22 +55,22 @@ void calculateAccessTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var accesses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) - .createAccessTemplates(trip, nearbyStop, flexDate); + var accesses = FlexTemplateFactory + .of(calculator, FlexConfig.DEFAULT) + .with(flexDate, trip, nearbyStop) + .createAccessTemplates(); - assertEquals(1, accesses.size()); - - var access = accesses.get(0); - assertEquals(0, access.fromStopIndex); - assertEquals(0, access.toStopIndex); + assertFalse(accesses.isEmpty()); } @Test void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var egresses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) - .createEgressTemplates(trip, nearbyStop, flexDate); + var egresses = FlexTemplateFactory + .of(calculator, FlexConfig.DEFAULT) + .with(flexDate, trip, nearbyStop) + .createEgressTemplates(); assertEquals(1, egresses.size()); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 388cbc6d747..f0a243029be 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -97,8 +97,8 @@ void calculateAccessTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var accesses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) - .createAccessTemplates(trip, nearbyStop, flexDate); + FlexTemplateFactory templateFactory = FlexTemplateFactory.of(calculator, FlexConfig.DEFAULT); + var accesses = templateFactory.with(flexDate, trip, nearbyStop).createAccessTemplates(); assertEquals(3, accesses.size()); @@ -111,12 +111,14 @@ void calculateAccessTemplate() { void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - var egresses = new FlexTemplateFactory(calculator, FlexConfig.DEFAULT) - .createEgressTemplates(trip, nearbyStop, flexDate); + var egresses = FlexTemplateFactory + .of(calculator, FlexConfig.DEFAULT) + .with(flexDate, trip, nearbyStop) + .createEgressTemplates(); assertEquals(3, egresses.size()); - var egress = egresses.get(0); + var egress = egresses.get(2); assertEquals(2, egress.fromStopIndex); assertEquals(2, egress.toStopIndex); } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index 51186d6a049..bd3cc3eadf9 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -644,14 +644,18 @@ private static UnscheduledTrip trip(List stopTimes) { @Nonnull private static List accessTemplates(UnscheduledTrip trip) { - return new FlexTemplateFactory(CALCULATOR, FlexConfig.DEFAULT) - .createAccessTemplates(trip, NEARBY_STOP, FLEX_SERVICE_DATE); + return FlexTemplateFactory + .of(CALCULATOR, FlexConfig.DEFAULT) + .with(FLEX_SERVICE_DATE, trip, NEARBY_STOP) + .createAccessTemplates(); } @Nonnull private static List egressTemplates(UnscheduledTrip trip) { - return new FlexTemplateFactory(CALCULATOR, FlexConfig.DEFAULT) - .createEgressTemplates(trip, NEARBY_STOP, FLEX_SERVICE_DATE); + return FlexTemplateFactory + .of(CALCULATOR, FlexConfig.DEFAULT) + .with(FLEX_SERVICE_DATE, trip, NEARBY_STOP) + .createEgressTemplates(); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 147698b94f2..3bdd750aa7a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -171,7 +171,7 @@ private void calculateFlexAccessTemplates() { return; } - var templateFactory = new FlexTemplateFactory(accessFlexPathCalculator, config); + var templateFactory = FlexTemplateFactory.of(accessFlexPathCalculator, config); // Fetch the closest flexTrips reachable from the access stops this.flexAccessTemplates = @@ -184,7 +184,10 @@ private void calculateFlexAccessTemplates() { .filter(date -> date.isFlexTripRunning(it.flexTrip(), this.transitService)) // Create templates from trip, boarding at the nearbyStop .flatMap(date -> - templateFactory.createAccessTemplates(it.flexTrip(), it.accessEgress(), date).stream() + templateFactory + .with(date, it.flexTrip(), it.accessEgress()) + .createAccessTemplates() + .stream() ) ) .toList(); @@ -195,7 +198,7 @@ private void calculateFlexEgressTemplates() { return; } - var templateFactory = new FlexTemplateFactory(egressFlexPathCalculator, config); + var templateFactory = FlexTemplateFactory.of(egressFlexPathCalculator, config); // Fetch the closest flexTrips reachable from the egress stops this.flexEgressTemplates = @@ -206,9 +209,12 @@ private void calculateFlexEgressTemplates() { .stream(dates) // Discard if service is not running on date .filter(date -> date.isFlexTripRunning(it.flexTrip(), this.transitService)) - // Create templates from trip, alighting at the nearbyStop + // Create templates from trips, alighting at the nearbyStop .flatMap(date -> - templateFactory.createEgressTemplates(it.flexTrip(), it.accessEgress(), date).stream() + templateFactory + .with(date, it.flexTrip(), it.accessEgress()) + .createEgressTemplates() + .stream() ) ) .toList(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index b25a69fd2b6..58ec5e0c422 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -2,253 +2,178 @@ import java.util.ArrayList; import java.util.List; -import java.util.function.Function; -import java.util.stream.IntStream; +import java.util.Objects; import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; -import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; +/** + * The factory is used to create flex trip templates. + */ public class FlexTemplateFactory { private final FlexPathCalculator calculator; private final FlexConfig config; - private FlexTrip trip; - private NearbyStop nearbyStop; private FlexServiceDate date; + private FlexTrip trip; + private NearbyStop nearbyStop; - public FlexTemplateFactory(FlexPathCalculator calculator, FlexConfig config) { - this.calculator = calculator; - this.config = config; + private FlexTemplateFactory(FlexPathCalculator calculator, FlexConfig config) { + this.calculator = Objects.requireNonNull(calculator); + this.config = Objects.requireNonNull(config); } - private void with(FlexTrip trip, NearbyStop nearbyStop, FlexServiceDate date) { - this.trip = trip; - this.nearbyStop = nearbyStop; - this.date = date; + public static FlexTemplateFactory of(FlexPathCalculator calculator, FlexConfig config) { + return new FlexTemplateFactory(calculator, config); } - public List createAccessTemplates( - FlexTrip flexTrip, - NearbyStop access, - FlexServiceDate date + /** + * Add required parameters to the factory before calling the create methods. + */ + public FlexTemplateFactory with( + FlexServiceDate date, + FlexTrip flexTrip, + NearbyStop nearbyStop ) { - // TODO: Merge the type specific methods and push differences into the types, - // The diff is likely to be important business rules. - if (flexTrip instanceof ScheduledDeviatedTrip sdt) { - return createAccessTemplatesForScheduledDeviatedTrip(sdt, access, date); - } else if (flexTrip instanceof UnscheduledTrip ust) { - return createAccessTemplatesForUnscheduledTrip(ust, access, date); - } - throw new IllegalArgumentException("Unknown type: " + flexTrip.getClass()); + this.date = Objects.requireNonNull(date); + this.trip = Objects.requireNonNull(flexTrip); + this.nearbyStop = Objects.requireNonNull(nearbyStop); + return this; } - public List createEgressTemplates( - FlexTrip flexTrip, - NearbyStop egress, - FlexServiceDate date - ) { - // TODO: Merge the type specific methods and push differences into the types, - // The diff is likely to be important business rules. - if (flexTrip instanceof ScheduledDeviatedTrip sdt) { - return createEgressTemplatesForScheduledDeviatedTrip(sdt, egress, date); - } else if (flexTrip instanceof UnscheduledTrip ust) { - return createEgressTemplatesForUnscheduledTrip(ust, egress, date); - } - throw new IllegalArgumentException("Unknown type: " + flexTrip.getClass()); - } - - private List createAccessTemplatesForScheduledDeviatedTrip( - ScheduledDeviatedTrip flexTrip, - NearbyStop access, - FlexServiceDate date - ) { - with(flexTrip, access, date); - var scheduledCalculator = new ScheduledFlexPathCalculator(calculator, flexTrip); + public List createAccessTemplates() { + assertRequiredParametersSet(); - int fromIndex = flexTrip.findBoardIndex(access.stop); + int boardIndex = trip.findBoardIndex(stop()); - if (fromIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + if (boardIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { return List.of(); } - ArrayList res = new ArrayList<>(); - - for (int toIndex = fromIndex; toIndex < flexTrip.numberOfStops(); toIndex++) { - if (flexTrip.getAlightRule(toIndex).isNotRoutable()) { - continue; - } - for (IndexedStopLocation stop : expandStopsAt(flexTrip, toIndex)) { - res.add( - new FlexAccessTemplate( - access, - trip, - fromIndex, - toIndex, - stop.stop, - date, - scheduledCalculator, - config - ) - ); - } - } - return res; - } - - private List createEgressTemplatesForScheduledDeviatedTrip( - ScheduledDeviatedTrip flexTrip, - NearbyStop egress, - FlexServiceDate date - ) { - with(flexTrip, egress, date); - - FlexPathCalculator scheduledCalculator = new ScheduledFlexPathCalculator(calculator, flexTrip); - - var toIndex = flexTrip.findAlightIndex(egress.stop); - - if (toIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { - return List.of(); - } + ArrayList result = new ArrayList<>(); - List res = new ArrayList<>(); + int alightIndex = isBoardingAndAlightingAtSameStopPositionAllowed() + ? boardIndex + : boardIndex + 1; - for (int fromIndex = toIndex; fromIndex >= 0; fromIndex--) { - if (flexTrip.getBoardRule(fromIndex).isNotRoutable()) { - continue; - } - for (var stop : expandStopsAt(flexTrip, fromIndex)) { - res.add( - new FlexEgressTemplate( - egress, - flexTrip, - fromIndex, - toIndex, - stop.stop, - date, - scheduledCalculator, - config - ) - ); + for (; alightIndex < trip.numberOfStops(); alightIndex++) { + if (trip.getAlightRule(alightIndex).isRoutable()) { + for (var stop : expandStopsAt(trip, alightIndex)) { + result.add(createAccessTemplate(trip, boardIndex, stop, alightIndex)); + } } } - return res; + return result; } - private List createAccessTemplatesForUnscheduledTrip( - UnscheduledTrip flexTrip, - NearbyStop access, - FlexServiceDate date - ) { - with(flexTrip, access, date); + public List createEgressTemplates() { + assertRequiredParametersSet(); - // Find boarding index, also check if it's boardable - final int fromIndex = flexTrip.findBoardIndex(access.stop); + var alightIndex = trip.findAlightIndex(stop()); - if (fromIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + if (alightIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { return List.of(); } - // templates will be generated from the boardingIndex to the end of the trip - final int lastIndexInTrip = flexTrip.numberOfStops() - 1; + List result = new ArrayList<>(); - // Check if trip is possible - IntStream indices; - if (flexTrip.numberOfStops() == 1) { - indices = IntStream.of(fromIndex); - } else { - indices = IntStream.range(fromIndex + 1, lastIndexInTrip + 1); - } + int end = isBoardingAndAlightingAtSameStopPositionAllowed() ? alightIndex : alightIndex - 1; - for (int toIndex = fromIndex; toIndex < flexTrip.numberOfStops(); toIndex++) { - if (flexTrip.getAlightRule(toIndex).isNotRoutable()) { - continue; + for (int boardIndex = 0; boardIndex <= end; boardIndex++) { + if (trip.getBoardRule(boardIndex).isRoutable()) { + for (var stop : expandStopsAt(trip, boardIndex)) { + result.add(createEgressTemplate(trip, stop, boardIndex, alightIndex)); + } } - for (var stop : expandStopsAt(flexTrip, toIndex)) {} } + return result; + } - // check for every stop after fromIndex if you can alight, if so return a template - return indices - // if you cannot alight at an index, the trip is not possible - .filter(alightIndex -> flexTrip.getAlightRule(alightIndex).isRoutable()) - // expand GroupStops and build IndexedStopLocations - .mapToObj(alightIndex -> expandStopsAt(flexTrip, alightIndex).stream()) - // flatten stream of streams - .flatMap(Function.identity()) - // create template - .map(alightStop -> - new FlexAccessTemplate( - access, - flexTrip, - fromIndex, - alightStop.index, - alightStop.stop, - date, - calculator, - config - ) - ) - .toList(); + private void assertRequiredParametersSet() { + Objects.requireNonNull(date); + Objects.requireNonNull(trip); + Objects.requireNonNull(nearbyStop); } - private List createEgressTemplatesForUnscheduledTrip( - UnscheduledTrip flexTrip, - NearbyStop egress, - FlexServiceDate date - ) { - // templates will be generated from the first index to the toIndex - int firstIndexInTrip = 0; + /** + * With respect to one journey/itinerary this method retuns {@code true} if a passenger can + * board and alight at the same stop in the journey pattern. This is not allowed for regular + * stops, but it would make sense to allow it for area stops or group stops. + *

              + * In NeTEx this is not allowed. + *

              + * In GTFS this is no longer allowed according to specification. But it was allowed earlier. + *

              + * This method simply returns {@code false}, but we keep it here for documentation. If requested, + * we can add code to be backward compatible with the old GTFS version here. + */ + private boolean isBoardingAndAlightingAtSameStopPositionAllowed() { + // If implemented: + // - RegularStops should always return false, + // - Area stops should return the value of a feature flag like + // 'OTPFeature.BoardingAndAlightingAtSameStopPositionAllowed' + // - GroupStop - to be decided + return false; + } - // Find alighting index, also check if alighting is allowed - int toIndex = flexTrip.findAlightIndex(egress.stop); + /** + * Return the access/egress stop, can be Regular-, Group- and AreaStop. + * Se also {@link #expandStopsAt(FlexTrip, int)}. + */ + private StopLocation stop() { + return nearbyStop.stop; + } - // Check if trip is possible - if (toIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { - return List.of(); - } + private static List expandStopsAt(FlexTrip flexTrip, int index) { + var stop = flexTrip.getStop(index); + return stop instanceof GroupStop groupStop ? groupStop.getChildLocations() : List.of(stop); + } - IntStream indices; - if (flexTrip.numberOfStops() == 1) { - indices = IntStream.of(toIndex); - } else { - indices = IntStream.range(firstIndexInTrip, toIndex + 1); - } - // check for every stop after fromIndex if you can alight, if so return a template - return indices - // if you cannot board at this index, the trip is not possible - .filter(boardIndex -> flexTrip.getBoardRule(boardIndex).isRoutable()) - // expand GroupStops and build IndexedStopLocations - .mapToObj(boardIndex -> expandStopsAt(flexTrip, boardIndex).stream()) - // flatten stream of streams - .flatMap(Function.identity()) - // create template - .map(boardStop -> - new FlexEgressTemplate( - egress, - flexTrip, - boardStop.index, - toIndex, - boardStop.stop, - date, - calculator, - config - ) - ) - .toList(); + FlexPathCalculator createCalculator(FlexTrip flexTrip) { + return flexTrip instanceof ScheduledDeviatedTrip + ? new ScheduledFlexPathCalculator(calculator, flexTrip) + : calculator; } - private static List expandStopsAt(FlexTrip flexTrip, int index) { - var stop = flexTrip.getStop(index); - return stop instanceof GroupStop groupStop - ? groupStop.getChildLocations().stream().map(s -> new IndexedStopLocation(index, s)).toList() - : List.of(new IndexedStopLocation(index, stop)); + private FlexAccessTemplate createAccessTemplate( + FlexTrip flexTrip, + int boardIndex, + StopLocation alightStop, + int alightStopIndex + ) { + return new FlexAccessTemplate( + nearbyStop, + flexTrip, + boardIndex, + alightStopIndex, + alightStop, + date, + createCalculator(flexTrip), + config + ); } - private record IndexedStopLocation(int index, StopLocation stop) {} + private FlexEgressTemplate createEgressTemplate( + FlexTrip flexTrip, + StopLocation boardStop, + int boardStopIndex, + int alightIndex + ) { + return new FlexEgressTemplate( + nearbyStop, + flexTrip, + boardStopIndex, + alightIndex, + boardStop, + date, + createCalculator(flexTrip), + config + ); + } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index f5070d14fa6..c53ff10a657 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -116,14 +116,18 @@ public Trip getTrip() { public abstract boolean isAlightingPossible(StopLocation stop); /** - * Find the first board-stop-position matching the given {@code fromStop}. - * Retuns {@link #STOP_INDEX_NOT_FOUND} if not found. + * Find the first stop-position matching the given {@code fromStop} where + * boarding is allowed. + * + * @return stop position in the pattern or {@link #STOP_INDEX_NOT_FOUND} if not found. */ public abstract int findBoardIndex(StopLocation fromStop); /** - * Find the first alight-stop-position matching the given {@code toStop}. - * Retuns {@link #STOP_INDEX_NOT_FOUND} if not found. + * Find the first stop-position matching the given {@code toStop} where + * alighting is allowed. + * + * @return the stop position in the pattern or {@link #STOP_INDEX_NOT_FOUND} if not found. */ public abstract int findAlightIndex(StopLocation toStop); From b818a82ffcf2bc0235e90fdf81cc1e2acef25f3c Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 10 May 2024 18:07:22 +0200 Subject: [PATCH 1100/1688] refactor: Remove forbidden dependency from flex domain to OTP configuration. --- .../ext/flex/GtfsFlexTest.java | 5 +- .../flex/trip/ScheduledDeviatedTripTest.java | 11 ++-- .../ext/flex/trip/UnscheduledTripTest.java | 6 +- .../ext/flex/FlexParameters.java | 57 +++++++++++++++++++ .../opentripplanner/ext/flex/FlexRouter.java | 21 ++++--- .../flex/template/AbstractFlexTemplate.java | 16 +++--- .../ext/flex/template/FlexAccessTemplate.java | 17 ++++-- .../ext/flex/template/FlexEgressTemplate.java | 15 ++++- .../flex/template/FlexTemplateFactory.java | 24 ++++---- .../raptoradapter/router/TransitRouter.java | 2 +- .../router/street/DirectFlexRouter.java | 8 +-- .../router/street/FlexAccessEgressRouter.java | 8 +-- .../api/OtpServerRequestContext.java | 4 +- .../standalone/config/RouterConfig.java | 3 +- .../standalone/config/sandbox/FlexConfig.java | 13 +++-- .../configure/ConstructApplicationModule.java | 2 +- .../server/DefaultServerRequestContext.java | 16 +++--- .../opentripplanner/TestServerContext.java | 2 +- .../mapping/TripRequestMapperTest.java | 2 +- .../model/plan/TestItineraryBuilder.java | 4 +- .../config/sandbox/FlexConfigTest.java | 14 ----- 21 files changed, 159 insertions(+), 91 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java delete mode 100644 src/test/java/org/opentripplanner/standalone/config/sandbox/FlexConfigTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index 35b8352e3fb..40d80640221 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -13,7 +13,6 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.service.TransitModel; @@ -56,7 +55,7 @@ void calculateAccessTemplate() { var nearbyStop = getNearbyStop(trip); var accesses = FlexTemplateFactory - .of(calculator, FlexConfig.DEFAULT) + .of(calculator, FlexParameters.defaultValues().maxTransferDuration()) .with(flexDate, trip, nearbyStop) .createAccessTemplates(); @@ -68,7 +67,7 @@ void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); var egresses = FlexTemplateFactory - .of(calculator, FlexConfig.DEFAULT) + .of(calculator, FlexParameters.defaultValues().maxTransferDuration()) .with(flexDate, trip, nearbyStop) .createEgressTemplates(); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index f0a243029be..c5dea86b001 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -19,6 +19,7 @@ import org.opentripplanner.TestServerContext; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.ext.fares.DecorateWithFare; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexRouter; import org.opentripplanner.ext.flex.FlexTest; import org.opentripplanner.ext.flex.template.FlexTemplateFactory; @@ -38,7 +39,6 @@ import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.api.OtpServerRequestContext; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.model.vertex.StreetLocation; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; @@ -97,7 +97,10 @@ void calculateAccessTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); - FlexTemplateFactory templateFactory = FlexTemplateFactory.of(calculator, FlexConfig.DEFAULT); + FlexTemplateFactory templateFactory = FlexTemplateFactory.of( + calculator, + FlexParameters.defaultValues().maxTransferDuration() + ); var accesses = templateFactory.with(flexDate, trip, nearbyStop).createAccessTemplates(); assertEquals(3, accesses.size()); @@ -112,7 +115,7 @@ void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); var egresses = FlexTemplateFactory - .of(calculator, FlexConfig.DEFAULT) + .of(calculator, FlexParameters.defaultValues().maxTransferDuration()) .with(flexDate, trip, nearbyStop) .createEgressTemplates(); @@ -134,7 +137,7 @@ void calculateDirectFare() { var router = new FlexRouter( graph, new DefaultTransitService(transitModel), - FlexConfig.DEFAULT, + FlexParameters.defaultValues(), OffsetDateTime.parse("2021-11-12T10:15:24-05:00").toInstant(), false, 1, diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index bd3cc3eadf9..92b7879a96f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -21,6 +21,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner._support.geometry.Polygons; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; @@ -32,7 +33,6 @@ import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; @@ -645,7 +645,7 @@ private static UnscheduledTrip trip(List stopTimes) { @Nonnull private static List accessTemplates(UnscheduledTrip trip) { return FlexTemplateFactory - .of(CALCULATOR, FlexConfig.DEFAULT) + .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) .with(FLEX_SERVICE_DATE, trip, NEARBY_STOP) .createAccessTemplates(); } @@ -653,7 +653,7 @@ private static List accessTemplates(UnscheduledTrip trip) { @Nonnull private static List egressTemplates(UnscheduledTrip trip) { return FlexTemplateFactory - .of(CALCULATOR, FlexConfig.DEFAULT) + .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) .with(FLEX_SERVICE_DATE, trip, NEARBY_STOP) .createEgressTemplates(); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java b/src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java new file mode 100644 index 00000000000..564991a94a0 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexParameters.java @@ -0,0 +1,57 @@ +package org.opentripplanner.ext.flex; + +import java.time.Duration; + +/** + * Define parameters used to configure flex. For further documentation on these parameters, look + * at the {@link org.opentripplanner.standalone.config.sandbox.FlexConfig} class which implements + * this interface. The flex package does not use all parameters defined here. Some parameters are + * passed into the street search(AStar) as part of a flex use-case. We keep them here for + * completeness and simplicity (just one interface). + */ +public interface FlexParameters { + /** + * See {@link org.opentripplanner.standalone.config.sandbox.FlexConfig} + */ + Duration maxTransferDuration(); + /** + * See {@link org.opentripplanner.standalone.config.sandbox.FlexConfig} + */ + Duration maxFlexTripDuration(); + /** + * See {@link org.opentripplanner.standalone.config.sandbox.FlexConfig} + */ + Duration maxAccessWalkDuration(); + /** + * See {@link org.opentripplanner.standalone.config.sandbox.FlexConfig} + */ + Duration maxEgressWalkDuration(); + + /** + * This defines the default values. This will be used by the OTP configuration and by tests, + * avoid using this directly. + */ + static FlexParameters defaultValues() { + return new FlexParameters() { + @Override + public Duration maxTransferDuration() { + return Duration.ofMinutes(5); + } + + @Override + public Duration maxFlexTripDuration() { + return Duration.ofMinutes(45); + } + + @Override + public Duration maxAccessWalkDuration() { + return Duration.ofMinutes(45); + } + + @Override + public Duration maxEgressWalkDuration() { + return Duration.ofMinutes(45); + } + }; + } +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 3bdd750aa7a..c8d6c5cdae1 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -27,7 +27,6 @@ import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; @@ -37,7 +36,7 @@ public class FlexRouter { private final Graph graph; private final TransitService transitService; - private final FlexConfig config; + private final FlexParameters flexParameters; private final Collection streetAccesses; private final Collection streetEgresses; private final FlexIndex flexIndex; @@ -59,7 +58,7 @@ public class FlexRouter { public FlexRouter( Graph graph, TransitService transitService, - FlexConfig config, + FlexParameters flexParameters, Instant searchInstant, boolean arriveBy, int additionalPastSearchDays, @@ -69,7 +68,7 @@ public FlexRouter( ) { this.graph = graph; this.transitService = transitService; - this.config = config; + this.flexParameters = flexParameters; this.streetAccesses = streetAccesses; this.streetEgresses = egressTransfers; this.flexIndex = transitService.getFlexIndex(); @@ -82,9 +81,9 @@ public FlexRouter( if (graph.hasStreets) { this.accessFlexPathCalculator = - new StreetFlexPathCalculator(false, config.maxFlexTripDuration()); + new StreetFlexPathCalculator(false, this.flexParameters.maxFlexTripDuration()); this.egressFlexPathCalculator = - new StreetFlexPathCalculator(true, config.maxFlexTripDuration()); + new StreetFlexPathCalculator(true, this.flexParameters.maxFlexTripDuration()); } else { // this is only really useful in tests. in real world scenarios you're unlikely to get useful // results if you don't have streets @@ -171,7 +170,10 @@ private void calculateFlexAccessTemplates() { return; } - var templateFactory = FlexTemplateFactory.of(accessFlexPathCalculator, config); + var templateFactory = FlexTemplateFactory.of( + accessFlexPathCalculator, + flexParameters.maxTransferDuration() + ); // Fetch the closest flexTrips reachable from the access stops this.flexAccessTemplates = @@ -198,7 +200,10 @@ private void calculateFlexEgressTemplates() { return; } - var templateFactory = FlexTemplateFactory.of(egressFlexPathCalculator, config); + var templateFactory = FlexTemplateFactory.of( + egressFlexPathCalculator, + flexParameters.maxTransferDuration() + ); // Fetch the closest flexTrips reachable from the egress stops this.flexEgressTemplates = diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 2b4d46ad074..b8649422a7d 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.flex.template; +import java.time.Duration; import java.time.LocalDate; import java.util.ArrayList; import java.util.Collection; @@ -17,7 +18,6 @@ import org.opentripplanner.model.PathTransfer; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; @@ -41,14 +41,14 @@ public abstract class AbstractFlexTemplate { */ private static final int MIN_FLEX_TRIP_DURATION_SECONDS = 10; protected final NearbyStop accessEgress; - protected final FlexTrip trip; + protected final FlexTrip trip; public final int fromStopIndex; public final int toStopIndex; protected final StopLocation transferStop; protected final int secondsFromStartOfTime; public final LocalDate serviceDate; protected final FlexPathCalculator calculator; - private final FlexConfig flexConfig; + private final Duration maxTransferDuration; /** * @param accessEgress Path from origin to the point of boarding for this flex trip @@ -61,13 +61,13 @@ public abstract class AbstractFlexTemplate { */ AbstractFlexTemplate( NearbyStop accessEgress, - FlexTrip trip, + FlexTrip trip, int fromStopIndex, int toStopIndex, StopLocation transferStop, FlexServiceDate date, FlexPathCalculator calculator, - FlexConfig config + Duration maxTransferDuration ) { this.accessEgress = accessEgress; this.trip = trip; @@ -77,7 +77,7 @@ public abstract class AbstractFlexTemplate { this.secondsFromStartOfTime = date.secondsFromStartOfTime; this.serviceDate = date.serviceDate; this.calculator = calculator; - this.flexConfig = config; + this.maxTransferDuration = maxTransferDuration; } public StopLocation getTransferStop() { @@ -105,7 +105,7 @@ public Stream createFlexAccessEgressStream( // transferStop is Location Area/Line else { double maxDistanceMeters = - flexConfig.maxTransferDuration().getSeconds() * + maxTransferDuration.getSeconds() * accessEgress.state.getRequest().preferences().walk().speed(); return getTransfersFromTransferStop(transitService) @@ -134,7 +134,7 @@ public String toString() { .addServiceTime("secondsFromStartOfTime", secondsFromStartOfTime) .addDate("serviceDate", serviceDate) .addObj("calculator", calculator) - .addObj("flexConfig", flexConfig) + .addDuration("maxTransferDuration", maxTransferDuration) .toString(); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index f9076d45f41..59fbb094eff 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -2,6 +2,7 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; +import java.time.Duration; import java.time.ZonedDateTime; import java.util.Collection; import java.util.List; @@ -15,7 +16,6 @@ import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper; import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.EdgeTraverser; @@ -28,15 +28,24 @@ public class FlexAccessTemplate extends AbstractFlexTemplate { public FlexAccessTemplate( NearbyStop accessEgress, - FlexTrip trip, + FlexTrip trip, int fromStopTime, int toStopTime, StopLocation transferStop, FlexServiceDate date, FlexPathCalculator calculator, - FlexConfig config + Duration maxTransferDuration ) { - super(accessEgress, trip, fromStopTime, toStopTime, transferStop, date, calculator, config); + super( + accessEgress, + trip, + fromStopTime, + toStopTime, + transferStop, + date, + calculator, + maxTransferDuration + ); } public Itinerary createDirectGraphPath( diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index 4315b2af9a3..1ab7ba89084 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.flex.template; import com.google.common.collect.Lists; +import java.time.Duration; import java.util.Collection; import java.util.List; import org.opentripplanner.ext.flex.FlexPathDurations; @@ -10,7 +11,6 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.model.PathTransfer; import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.State; @@ -28,9 +28,18 @@ public FlexEgressTemplate( StopLocation transferStop, FlexServiceDate date, FlexPathCalculator calculator, - FlexConfig config + Duration maxTransferDuration ) { - super(accessEgress, trip, fromStopIndex, toStopIndex, transferStop, date, calculator, config); + super( + accessEgress, + trip, + fromStopIndex, + toStopIndex, + transferStop, + date, + calculator, + maxTransferDuration + ); } protected List getTransferEdges(PathTransfer transfer) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 58ec5e0c422..8df3e624132 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -1,5 +1,6 @@ package org.opentripplanner.ext.flex.template; +import java.time.Duration; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -9,7 +10,6 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; @@ -19,18 +19,21 @@ public class FlexTemplateFactory { private final FlexPathCalculator calculator; - private final FlexConfig config; + private final Duration maxTransferDuration; private FlexServiceDate date; private FlexTrip trip; private NearbyStop nearbyStop; - private FlexTemplateFactory(FlexPathCalculator calculator, FlexConfig config) { + private FlexTemplateFactory(FlexPathCalculator calculator, Duration maxTransferDuration) { this.calculator = Objects.requireNonNull(calculator); - this.config = Objects.requireNonNull(config); + this.maxTransferDuration = Objects.requireNonNull(maxTransferDuration); } - public static FlexTemplateFactory of(FlexPathCalculator calculator, FlexConfig config) { - return new FlexTemplateFactory(calculator, config); + public static FlexTemplateFactory of( + FlexPathCalculator calculator, + Duration maxTransferDuration + ) { + return new FlexTemplateFactory(calculator, maxTransferDuration); } /** @@ -114,11 +117,6 @@ private void assertRequiredParametersSet() { * we can add code to be backward compatible with the old GTFS version here. */ private boolean isBoardingAndAlightingAtSameStopPositionAllowed() { - // If implemented: - // - RegularStops should always return false, - // - Area stops should return the value of a feature flag like - // 'OTPFeature.BoardingAndAlightingAtSameStopPositionAllowed' - // - GroupStop - to be decided return false; } @@ -155,7 +153,7 @@ private FlexAccessTemplate createAccessTemplate( alightStop, date, createCalculator(flexTrip), - config + maxTransferDuration ); } @@ -173,7 +171,7 @@ private FlexEgressTemplate createEgressTemplate( boardStop, date, createCalculator(flexTrip), - config + maxTransferDuration ); } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 732084137c4..8b89fb42b5d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -269,7 +269,7 @@ private Collection fetchAccessEgresses(AccessEgre temporaryVerticesContainer, serverContext, additionalSearchDays, - serverContext.flexConfig(), + serverContext.flexParameters(), serverContext.dataOverlayContext(accessRequest), type.isEgress() ); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java index 5a4892ee96b..037ecdf7b07 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java @@ -41,7 +41,7 @@ public static List route( request.journey().direct(), serverContext.dataOverlayContext(request), false, - serverContext.flexConfig().maxAccessWalkDuration(), + serverContext.flexParameters().maxAccessWalkDuration(), 0 ); Collection egressStops = AccessEgressRouter.streetSearch( @@ -51,14 +51,14 @@ public static List route( request.journey().direct(), serverContext.dataOverlayContext(request), true, - serverContext.flexConfig().maxEgressWalkDuration(), + serverContext.flexParameters().maxEgressWalkDuration(), 0 ); - FlexRouter flexRouter = new FlexRouter( + var flexRouter = new FlexRouter( serverContext.graph(), serverContext.transitService(), - serverContext.flexConfig(), + serverContext.flexParameters(), request.dateTime(), request.arriveBy(), additionalSearchDays.additionalSearchDaysInPast(), diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java index 639a6dbb997..e05e4753175 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java @@ -4,6 +4,7 @@ import java.util.List; import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; import org.opentripplanner.ext.flex.FlexAccessEgress; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexRouter; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.routing.algorithm.raptoradapter.router.AdditionalSearchDays; @@ -12,7 +13,6 @@ import org.opentripplanner.routing.api.request.request.StreetRequest; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.api.OtpServerRequestContext; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.search.TemporaryVerticesContainer; import org.opentripplanner.transit.service.TransitService; @@ -25,7 +25,7 @@ public static Collection routeAccessEgress( TemporaryVerticesContainer verticesContainer, OtpServerRequestContext serverContext, AdditionalSearchDays searchDays, - FlexConfig config, + FlexParameters config, DataOverlayContext dataOverlayContext, boolean isEgress ) { @@ -41,7 +41,7 @@ public static Collection routeAccessEgress( new StreetRequest(StreetMode.WALK), dataOverlayContext, false, - serverContext.flexConfig().maxAccessWalkDuration(), + serverContext.flexParameters().maxAccessWalkDuration(), 0 ) : List.of(); @@ -54,7 +54,7 @@ public static Collection routeAccessEgress( new StreetRequest(StreetMode.WALK), dataOverlayContext, true, - serverContext.flexConfig().maxEgressWalkDuration(), + serverContext.flexParameters().maxEgressWalkDuration(), 0 ) : List.of(); diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index 1adebc6a90e..55b673c703f 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -7,6 +7,7 @@ import org.opentripplanner.astar.spi.TraverseVisitor; import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; import org.opentripplanner.ext.emissions.EmissionsService; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.framework.application.OTPFeature; @@ -23,7 +24,6 @@ import org.opentripplanner.service.vehiclerental.VehicleRentalService; import org.opentripplanner.service.worldenvelope.WorldEnvelopeService; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.service.StreetLimitationParametersService; @@ -120,7 +120,7 @@ default GraphFinder graphFinder() { return GraphFinder.getInstance(graph(), transitService()::findRegularStops); } - FlexConfig flexConfig(); + FlexParameters flexParameters(); VectorTileConfig vectorTileConfig(); diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java index 4ac0688a759..55128af5659 100644 --- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.node.MissingNode; import java.io.Serializable; import java.util.List; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.ridehailing.RideHailingServiceParameters; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; @@ -127,7 +128,7 @@ public VectorTileConfig vectorTileConfig() { return vectorTileConfig; } - public FlexConfig flexConfig() { + public FlexParameters flexParameters() { return flexConfig; } diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java index cefec90b09e..2521ca5e57b 100644 --- a/src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/FlexConfig.java @@ -4,11 +4,12 @@ import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3; import java.time.Duration; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; -public class FlexConfig { +public class FlexConfig implements FlexParameters { - public static final FlexConfig DEFAULT = new FlexConfig(); + private static final FlexParameters DEFAULT = FlexParameters.defaultValues(); public static final String ACCESS_EGRESS_DESCRIPTION = """ @@ -58,7 +59,7 @@ public FlexConfig(NodeAdapter root, String parameterName) { A lower value means that the routing is faster. """ ) - .asDuration(DEFAULT.maxTransferDuration); + .asDuration(DEFAULT.maxTransferDuration()); maxFlexTripDuration = json @@ -70,7 +71,7 @@ public FlexConfig(NodeAdapter root, String parameterName) { "the access/egress duration to the boarding/alighting of the flex trip, as well as the " + "connection to the transit stop." ) - .asDuration(DEFAULT.maxFlexTripDuration); + .asDuration(DEFAULT.maxFlexTripDuration()); maxAccessWalkDuration = json @@ -80,7 +81,7 @@ public FlexConfig(NodeAdapter root, String parameterName) { "The maximum duration the passenger will be allowed to walk to reach a flex stop or zone." ) .description(ACCESS_EGRESS_DESCRIPTION) - .asDuration(DEFAULT.maxAccessWalkDuration); + .asDuration(DEFAULT.maxAccessWalkDuration()); maxEgressWalkDuration = json @@ -90,7 +91,7 @@ public FlexConfig(NodeAdapter root, String parameterName) { "The maximum duration the passenger will be allowed to walk after leaving the flex vehicle at the final destination." ) .description(ACCESS_EGRESS_DESCRIPTION) - .asDuration(DEFAULT.maxEgressWalkDuration); + .asDuration(DEFAULT.maxEgressWalkDuration()); } public Duration maxFlexTripDuration() { diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java index 93158f87cff..eb244ce726c 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java @@ -56,7 +56,7 @@ OtpServerRequestContext providesServerContext( realtimeVehicleService, vehicleRentalService, emissionsService, - routerConfig.flexConfig(), + routerConfig.flexParameters(), rideHailingServices, stopConsolidationService, streetLimitationParametersService, diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index 019b7267015..7a4ccea9247 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -6,6 +6,7 @@ import javax.annotation.Nullable; import org.opentripplanner.astar.spi.TraverseVisitor; import org.opentripplanner.ext.emissions.EmissionsService; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.inspector.raster.TileRendererManager; @@ -24,7 +25,6 @@ import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.standalone.config.routerconfig.TransitRoutingConfig; import org.opentripplanner.standalone.config.routerconfig.VectorTileConfig; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.service.StreetLimitationParametersService; import org.opentripplanner.transit.service.TransitService; @@ -41,7 +41,7 @@ public class DefaultServerRequestContext implements OtpServerRequestContext { private final RaptorConfig raptorConfig; private final TileRendererManager tileRendererManager; private final VectorTileConfig vectorTileConfig; - private final FlexConfig flexConfig; + private final FlexParameters flexParameters; private final TraverseVisitor traverseVisitor; private final WorldEnvelopeService worldEnvelopeService; private final RealtimeVehicleService realtimeVehicleService; @@ -69,7 +69,7 @@ private DefaultServerRequestContext( List rideHailingServices, StopConsolidationService stopConsolidationService, StreetLimitationParametersService streetLimitationParametersService, - FlexConfig flexConfig, + FlexParameters flexParameters, TraverseVisitor traverseVisitor ) { this.graph = graph; @@ -80,7 +80,7 @@ private DefaultServerRequestContext( this.tileRendererManager = tileRendererManager; this.vectorTileConfig = vectorTileConfig; this.vehicleRentalService = vehicleRentalService; - this.flexConfig = flexConfig; + this.flexParameters = flexParameters; this.traverseVisitor = traverseVisitor; this.routeRequestDefaults = routeRequestDefaults; this.worldEnvelopeService = worldEnvelopeService; @@ -106,7 +106,7 @@ public static DefaultServerRequestContext create( RealtimeVehicleService realtimeVehicleService, VehicleRentalService vehicleRentalService, @Nullable EmissionsService emissionsService, - FlexConfig flexConfig, + FlexParameters flexParameters, List rideHailingServices, @Nullable StopConsolidationService stopConsolidationService, StreetLimitationParametersService streetLimitationParametersService, @@ -128,7 +128,7 @@ public static DefaultServerRequestContext create( rideHailingServices, stopConsolidationService, streetLimitationParametersService, - flexConfig, + flexParameters, traverseVisitor ); } @@ -226,8 +226,8 @@ public TraverseVisitor traverseVisitor() { } @Override - public FlexConfig flexConfig() { - return flexConfig; + public FlexParameters flexParameters() { + return flexParameters; } @Override diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index bf6a8d2bbd3..2f4ded1121d 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -51,7 +51,7 @@ public static OtpServerRequestContext createServerContext( createRealtimeVehicleService(transitService), createVehicleRentalService(), createEmissionsService(), - routerConfig.flexConfig(), + routerConfig.flexParameters(), List.of(), null, createStreetLimitationParametersService(), diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index e35f198d16e..4c7152218b9 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -131,7 +131,7 @@ public class TripRequestMapperTest implements PlanTestConstants { new DefaultRealtimeVehicleService(transitService), new DefaultVehicleRentalService(), new DefaultEmissionsService(new EmissionsDataModel()), - RouterConfig.DEFAULT.flexConfig(), + RouterConfig.DEFAULT.flexParameters(), List.of(), null, new DefaultStreetLimitationParametersService(new StreetLimitationParameters()), diff --git a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java index dafcc639ceb..cfe3d553354 100644 --- a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -15,6 +15,7 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; +import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; @@ -30,7 +31,6 @@ import org.opentripplanner.model.StopTime; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.model.transfer.TransferConstraint; -import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -220,7 +220,7 @@ public TestItineraryBuilder flex(int start, int end, Place to) { null, new FlexServiceDate(LocalDate.now(), 0, new TIntHashSet()), new DirectFlexPathCalculator(), - FlexConfig.DEFAULT + FlexParameters.defaultValues().maxTransferDuration() ); var fromv = StreetModelForTest.intersectionVertex( diff --git a/src/test/java/org/opentripplanner/standalone/config/sandbox/FlexConfigTest.java b/src/test/java/org/opentripplanner/standalone/config/sandbox/FlexConfigTest.java deleted file mode 100644 index 2488fd626bf..00000000000 --- a/src/test/java/org/opentripplanner/standalone/config/sandbox/FlexConfigTest.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.opentripplanner.standalone.config.sandbox; - -import static org.junit.jupiter.api.Assertions.*; - -import org.junit.jupiter.api.Test; - -class FlexConfigTest { - - @Test - void initializationOrder() { - assertNotNull(FlexConfig.DEFAULT.maxTransferDuration()); - assertNotNull(FlexConfig.DEFAULT.maxFlexTripDuration()); - } -} From 0ab020ba8ba7e779c37a2e65f99934065272e136 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 10 May 2024 19:22:37 +0200 Subject: [PATCH 1101/1688] refactor: Cleanup TEST_MODEL.areaStop --- .../flex/AreaStopsToVerticesMapperTest.java | 8 +++---- .../ext/flex/trip/UnscheduledTripTest.java | 9 ++++--- .../areastops/AreaStopPropertyMapperTest.java | 3 +-- .../street/model/vertex/OsmVertexTest.java | 11 ++------- .../model/_data/TransitModelForTest.java | 24 +++++++++++++++---- .../model/network/StopPatternTest.java | 17 +------------ 6 files changed, 31 insertions(+), 41 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java index 3b41cf9632d..67eb7e3ed93 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/AreaStopsToVerticesMapperTest.java @@ -29,10 +29,10 @@ class AreaStopsToVerticesMapperTest { private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); - private static final AreaStop BERLIN_AREA_STOP = TEST_MODEL.areaStopForTest( - "berlin", - Polygons.BERLIN - ); + private static final AreaStop BERLIN_AREA_STOP = TEST_MODEL + .areaStop("berlin") + .withGeometry(Polygons.BERLIN) + .build(); public static final StopModel STOP_MODEL = TEST_MODEL .stopModelBuilder() .withAreaStop(AreaStopsToVerticesMapperTest.BERLIN_AREA_STOP) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index 92b7879a96f..5c9fe8f9c19 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; @@ -51,7 +50,7 @@ class UnscheduledTripTest { private static final RegularStop REGULAR_STOP = TEST_MODEL.stop("stop").build(); - private static final StopLocation AREA_STOP = TEST_MODEL.areaStopForTest("area", Polygons.BERLIN); + private static final StopLocation AREA_STOP = TEST_MODEL.areaStop("area").build(); @Nested class IsUnscheduledTrip { @@ -546,9 +545,9 @@ void testMultipleAreasEarliestDepartureTime(TestCase tc) { @Test void boardingAlighting() { - var AREA_STOP1 = TEST_MODEL.areaStopForTest("area-1", Polygons.BERLIN); - var AREA_STOP2 = TEST_MODEL.areaStopForTest("area-2", Polygons.BERLIN); - var AREA_STOP3 = TEST_MODEL.areaStopForTest("area-3", Polygons.BERLIN); + var AREA_STOP1 = TEST_MODEL.areaStop("area-1").build(); + var AREA_STOP2 = TEST_MODEL.areaStop("area-2").build(); + var AREA_STOP3 = TEST_MODEL.areaStop("area-3").build(); var first = area(AREA_STOP1, "10:00", "10:05"); first.setDropOffType(NONE); diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java index 2cf0804b630..5387df91bca 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/areastops/AreaStopPropertyMapperTest.java @@ -6,7 +6,6 @@ import java.util.List; import java.util.Locale; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.site.AreaStop; @@ -15,7 +14,7 @@ class AreaStopPropertyMapperTest { private static final TransitModelForTest MODEL = new TransitModelForTest(StopModel.of()); - private static final AreaStop STOP = MODEL.areaStopForTest("123", Polygons.BERLIN); + private static final AreaStop STOP = MODEL.areaStop("123").build(); private static final Route ROUTE_WITH_COLOR = TransitModelForTest .route("123") .withColor("ffffff") diff --git a/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java b/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java index 0ec80117426..b3a2b0baebb 100644 --- a/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java +++ b/src/test/java/org/opentripplanner/street/model/vertex/OsmVertexTest.java @@ -7,7 +7,6 @@ import java.util.List; import javax.annotation.Nonnull; import org.junit.jupiter.api.Test; -import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.site.AreaStop; @@ -15,14 +14,8 @@ class OsmVertexTest { private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); - private static final AreaStop AREA_STOP1 = TEST_MODEL.areaStopForTest( - "flex-zone-1", - Polygons.BERLIN - ); - private static final AreaStop AREA_STOP2 = TEST_MODEL.areaStopForTest( - "flex-zone-2", - Polygons.BERLIN - ); + private static final AreaStop AREA_STOP1 = TEST_MODEL.areaStop("flex-zone-1").build(); + private static final AreaStop AREA_STOP2 = TEST_MODEL.areaStop("flex-zone-2").build(); @Test void areaStops() { diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java index 9d52d38883e..fc5c8dbd625 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java @@ -5,8 +5,11 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.IntStream; -import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.geom.Coordinate; +import org.locationtech.jts.geom.Polygon; +import org.opentripplanner._support.geometry.Coordinates; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; +import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; @@ -23,7 +26,7 @@ import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.network.TripPatternBuilder; import org.opentripplanner.transit.model.organization.Agency; -import org.opentripplanner.transit.model.site.AreaStop; +import org.opentripplanner.transit.model.site.AreaStopBuilder; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.RegularStopBuilder; @@ -52,6 +55,18 @@ public class TransitModelForTest { public static final String OTHER_TIME_ZONE_ID = "America/Los_Angeles"; public static final WgsCoordinate ANY_COORDINATE = new WgsCoordinate(60.0, 10.0); + // This is used to create valid objects - do not use it for verification + private static final Polygon ANY_POLYGON = GeometryUtils + .getGeometryFactory() + .createPolygon( + new Coordinate[] { + Coordinates.of(61.0, 10.0), + Coordinates.of(61.0, 12.0), + Coordinates.of(60.0, 11.0), + Coordinates.of(61.0, 10.0), + } + ); + public static final Agency AGENCY = Agency .of(id("A1")) .withName("Agency Test") @@ -159,12 +174,11 @@ public GroupStop groupStopForTest(String idAndName, List stops) { return builder.build(); } - public AreaStop areaStopForTest(String idAndName, Geometry geometry) { + public AreaStopBuilder areaStop(String idAndName) { return stopModelBuilder .areaStop(id(idAndName)) .withName(new NonLocalizedString(idAndName)) - .withGeometry(geometry) - .build(); + .withGeometry(ANY_POLYGON); } public StopTime stopTime(Trip trip, int seq) { diff --git a/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java b/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java index d92aad0e159..d898f69cf54 100644 --- a/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java +++ b/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java @@ -6,8 +6,6 @@ import java.util.List; import org.junit.jupiter.api.Test; -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.timetable.Trip; @@ -25,20 +23,7 @@ void boardingAlightingConditions() { var s34 = testModel.groupStopForTest("3_4", List.of(s3, s4)); - var areaStop = testModel.areaStopForTest( - "area", - GeometryUtils - .getGeometryFactory() - .createPolygon( - new Coordinate[] { - new Coordinate(11.0, 63.0), - new Coordinate(11.5, 63.0), - new Coordinate(11.5, 63.5), - new Coordinate(11.0, 63.5), - new Coordinate(11.0, 63.0), - } - ) - ); + var areaStop = testModel.areaStop("area").build(); Trip t = TransitModelForTest.trip("trip").build(); From 8e3ddcc4df2a4b82176f4108e10647dbe2e51cdb Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 10 May 2024 19:31:30 +0200 Subject: [PATCH 1102/1688] refactor: Rename groupStop from (groupStopForTest) - repeating context --- .../transit/model/_data/TransitModelForTest.java | 5 +++-- .../transit/model/network/StopPatternTest.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java index fc5c8dbd625..c221bd6b95b 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.function.Consumer; import java.util.stream.IntStream; +import java.util.stream.Stream; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; import org.opentripplanner._support.geometry.Coordinates; @@ -164,12 +165,12 @@ public StationBuilder station(String idAndName) { .withPriority(StopTransferPriority.ALLOWED); } - public GroupStop groupStopForTest(String idAndName, List stops) { + public GroupStop groupStop(String idAndName, RegularStop... stops) { var builder = stopModelBuilder .groupStop(id(idAndName)) .withName(new NonLocalizedString(idAndName)); - stops.forEach(builder::addLocation); + Stream.of(stops).forEach(builder::addLocation); return builder.build(); } diff --git a/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java b/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java index d898f69cf54..af9dc89afe1 100644 --- a/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java +++ b/src/test/java/org/opentripplanner/transit/model/network/StopPatternTest.java @@ -21,7 +21,7 @@ void boardingAlightingConditions() { var s3 = testModel.stop("3", 62.0, 11.0).build(); var s4 = testModel.stop("4", 62.1, 11.0).build(); - var s34 = testModel.groupStopForTest("3_4", List.of(s3, s4)); + var s34 = testModel.groupStop("3_4", s3, s4); var areaStop = testModel.areaStop("area").build(); From 5dfcc62cd7d9a9c44b197b20d12e957153eaa77f Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 10 May 2024 20:23:35 +0200 Subject: [PATCH 1103/1688] refactor: Simplify and encapsulate id for TransitModelForTest#unscheduledTrip --- .../graph_builder/module/StreetLinkerModuleTest.java | 2 +- .../algorithm/mapping/RaptorPathToItineraryMapperTest.java | 3 +-- .../transit/model/_data/TransitModelForTest.java | 6 +++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java index 4d2141eb38e..a327cd427ab 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java @@ -68,7 +68,7 @@ void linkRegularStop() { void linkFlexStop() { OTPFeature.FlexRouting.testOn(() -> { var model = new TestModel(); - var flexTrip = TransitModelForTest.of().unscheduledTrip(id("flex"), model.stop()); + var flexTrip = TransitModelForTest.of().unscheduledTrip("flex", model.stop()); model.withFlexTrip(flexTrip); var module = model.streetLinkerModule(); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index 5b846fbc724..6f228bdd420 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -4,7 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.opentripplanner.raptor._data.RaptorTestConstants.BOARD_SLACK; -import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.time.Duration; import java.time.Instant; @@ -144,7 +143,7 @@ void createItineraryWithOnBoardFlexAccess() { RaptorPathToItineraryMapper mapper = getRaptorPathToItineraryMapper(); var flexTrip = TEST_MODEL.unscheduledTrip( - id("flex"), + "flex", TEST_MODEL.stop("A:Stop:1").build(), TEST_MODEL.stop("A:Stop:2").build() ); diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java index c221bd6b95b..31f996c00e9 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java @@ -261,7 +261,7 @@ public TripPatternBuilder pattern(TransitMode mode) { .withStopPattern(stopPattern(3)); } - public UnscheduledTrip unscheduledTrip(FeedScopedId id, StopLocation... stops) { + public UnscheduledTrip unscheduledTrip(String id, StopLocation... stops) { var stopTimes = Arrays .stream(stops) .map(s -> { @@ -276,9 +276,9 @@ public UnscheduledTrip unscheduledTrip(FeedScopedId id, StopLocation... stops) { return unscheduledTrip(id, stopTimes); } - public UnscheduledTrip unscheduledTrip(FeedScopedId id, List stopTimes) { + public UnscheduledTrip unscheduledTrip(String id, List stopTimes) { return UnscheduledTrip - .of(id) + .of(id(id)) .withTrip(trip("flex-trip").build()) .withStopTimes(stopTimes) .build(); From c5865b83c496429ce107b901512fdc650d7b463d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 13 May 2024 10:21:46 +0200 Subject: [PATCH 1104/1688] refactor: Rename FlexTest to FlexIntegrationTestData --- .../org/opentripplanner/ext/flex/FlexIntegrationTest.java | 8 ++++++-- .../flex/{FlexTest.java => FlexIntegrationTestData.java} | 4 ++-- .../java/org/opentripplanner/ext/flex/GtfsFlexTest.java | 4 ++-- .../ext/flex/trip/ScheduledDeviatedTripTest.java | 8 ++++---- 4 files changed, 14 insertions(+), 10 deletions(-) rename src/ext-test/java/org/opentripplanner/ext/flex/{FlexTest.java => FlexIntegrationTestData.java} (97%) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java index f414572ecf2..e0ece82db12 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java @@ -57,14 +57,18 @@ public class FlexIntegrationTest { @BeforeAll static void setup() { OTPFeature.enableFeatures(Map.of(OTPFeature.FlexRouting, true)); - TestOtpModel model = ConstantsForTests.buildOsmGraph(FlexTest.COBB_OSM); + TestOtpModel model = ConstantsForTests.buildOsmGraph(FlexIntegrationTestData.COBB_OSM); graph = model.graph(); transitModel = model.transitModel(); addGtfsToGraph( graph, transitModel, - List.of(FlexTest.COBB_BUS_30_GTFS, FlexTest.MARTA_BUS_856_GTFS, FlexTest.COBB_FLEX_GTFS) + List.of( + FlexIntegrationTestData.COBB_BUS_30_GTFS, + FlexIntegrationTestData.MARTA_BUS_856_GTFS, + FlexIntegrationTestData.COBB_FLEX_GTFS + ) ); service = TestServerContext.createServerContext(graph, transitModel).routingService(); } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java similarity index 97% rename from src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java rename to src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index 26cedae79ee..db8fbd59aea 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -20,9 +20,9 @@ import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; -public abstract class FlexTest { +public abstract class FlexIntegrationTestData { - private static final ResourceLoader RES = ResourceLoader.of(FlexTest.class); + private static final ResourceLoader RES = ResourceLoader.of(FlexIntegrationTestData.class); protected static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs"); protected static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index 40d80640221..90ee14f601c 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -24,13 +24,13 @@ * It only contains a single stop time which in GTFS static would not work but is valid in GTFS * Flex. */ -public class GtfsFlexTest extends FlexTest { +public class GtfsFlexTest extends FlexIntegrationTestData { private static TransitModel transitModel; @BeforeAll static void setup() { - TestOtpModel model = FlexTest.buildFlexGraph(ASPEN_GTFS); + TestOtpModel model = FlexIntegrationTestData.buildFlexGraph(ASPEN_GTFS); transitModel = model.transitModel(); } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index c5dea86b001..0dd900ce4aa 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -19,9 +19,9 @@ import org.opentripplanner.TestServerContext; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.ext.fares.DecorateWithFare; +import org.opentripplanner.ext.flex.FlexIntegrationTestData; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexRouter; -import org.opentripplanner.ext.flex.FlexTest; import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.geometry.EncodedPolyline; @@ -54,7 +54,7 @@ *

              * Read about the details at: https://www.cobbcounty.org/transportation/cobblinc/routes-and-schedules/flex */ -public class ScheduledDeviatedTripTest extends FlexTest { +public class ScheduledDeviatedTripTest extends FlexIntegrationTestData { static Graph graph; static TransitModel transitModel; @@ -224,13 +224,13 @@ void shouldNotInterpolateFlexTimes() { */ @Test void parseContinuousPickup() { - var lincolnGraph = FlexTest.buildFlexGraph(LINCOLN_COUNTY_GTFS); + var lincolnGraph = FlexIntegrationTestData.buildFlexGraph(LINCOLN_COUNTY_GTFS); assertNotNull(lincolnGraph); } @BeforeAll static void setup() { - TestOtpModel model = FlexTest.buildFlexGraph(COBB_FLEX_GTFS); + TestOtpModel model = FlexIntegrationTestData.buildFlexGraph(COBB_FLEX_GTFS); graph = model.graph(); transitModel = model.transitModel(); } From 119fea0944195f01ddd330926cddbde04fff8cb2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 13 May 2024 11:30:39 +0200 Subject: [PATCH 1105/1688] refactor: Fix constant naming in FlexIntegrationTestData --- .../ext/flex/FlexIntegrationTestData.java | 12 ++++++------ .../org/opentripplanner/ext/flex/GtfsFlexTest.java | 8 ++++---- .../ext/flex/trip/ScheduledDeviatedTripTest.java | 8 ++++---- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index db8fbd59aea..0a86ec846ef 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -31,12 +31,12 @@ public abstract class FlexIntegrationTestData { protected static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); protected static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf"); - protected static final DirectFlexPathCalculator calculator = new DirectFlexPathCalculator(); - protected static final LocalDate serviceDate = LocalDate.of(2021, 4, 11); - protected static final int secondsSinceMidnight = LocalTime.of(10, 0).toSecondOfDay(); - protected static final FlexServiceDate flexDate = new FlexServiceDate( - serviceDate, - secondsSinceMidnight, + protected static final DirectFlexPathCalculator CALCULATOR = new DirectFlexPathCalculator(); + protected static final LocalDate SERVICE_DATE = LocalDate.of(2021, 4, 11); + protected static final int SECONDS_SINCE_MIDNIGHT = LocalTime.of(10, 0).toSecondOfDay(); + protected static final FlexServiceDate FLEX_DATE = new FlexServiceDate( + SERVICE_DATE, + SECONDS_SINCE_MIDNIGHT, new TIntHashSet() ); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index 90ee14f601c..0cae35f75f5 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -55,8 +55,8 @@ void calculateAccessTemplate() { var nearbyStop = getNearbyStop(trip); var accesses = FlexTemplateFactory - .of(calculator, FlexParameters.defaultValues().maxTransferDuration()) - .with(flexDate, trip, nearbyStop) + .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) + .with(FLEX_DATE, trip, nearbyStop) .createAccessTemplates(); assertFalse(accesses.isEmpty()); @@ -67,8 +67,8 @@ void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); var egresses = FlexTemplateFactory - .of(calculator, FlexParameters.defaultValues().maxTransferDuration()) - .with(flexDate, trip, nearbyStop) + .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) + .with(FLEX_DATE, trip, nearbyStop) .createEgressTemplates(); assertEquals(1, egresses.size()); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 0dd900ce4aa..c1ed99c7858 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -98,10 +98,10 @@ void calculateAccessTemplate() { var nearbyStop = getNearbyStop(trip); FlexTemplateFactory templateFactory = FlexTemplateFactory.of( - calculator, + CALCULATOR, FlexParameters.defaultValues().maxTransferDuration() ); - var accesses = templateFactory.with(flexDate, trip, nearbyStop).createAccessTemplates(); + var accesses = templateFactory.with(FLEX_DATE, trip, nearbyStop).createAccessTemplates(); assertEquals(3, accesses.size()); @@ -115,8 +115,8 @@ void calculateEgressTemplate() { var trip = getFlexTrip(); var nearbyStop = getNearbyStop(trip); var egresses = FlexTemplateFactory - .of(calculator, FlexParameters.defaultValues().maxTransferDuration()) - .with(flexDate, trip, nearbyStop) + .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) + .with(FLEX_DATE, trip, nearbyStop) .createEgressTemplates(); assertEquals(3, egresses.size()); From 0675eb4a7ca2f9cbe5d8c747ed193c573b7d240a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 13 May 2024 11:39:05 +0200 Subject: [PATCH 1106/1688] refactor: Remove inheritance on FlexIntegrationTestData --- .../ext/flex/FlexIntegrationTestData.java | 18 +++++++++--------- .../opentripplanner/ext/flex/GtfsFlexTest.java | 5 ++++- .../flex/trip/ScheduledDeviatedTripTest.java | 6 +++++- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index 0a86ec846ef..890e99725c4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -20,27 +20,27 @@ import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; -public abstract class FlexIntegrationTestData { +public final class FlexIntegrationTestData { private static final ResourceLoader RES = ResourceLoader.of(FlexIntegrationTestData.class); - protected static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs"); - protected static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); + public static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs"); + public static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); protected static final File COBB_BUS_30_GTFS = RES.file("cobblinc-bus-30-only.gtfs.zip"); protected static final File MARTA_BUS_856_GTFS = RES.file("marta-bus-856-only.gtfs.zip"); - protected static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); + public static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); protected static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf"); - protected static final DirectFlexPathCalculator CALCULATOR = new DirectFlexPathCalculator(); - protected static final LocalDate SERVICE_DATE = LocalDate.of(2021, 4, 11); - protected static final int SECONDS_SINCE_MIDNIGHT = LocalTime.of(10, 0).toSecondOfDay(); - protected static final FlexServiceDate FLEX_DATE = new FlexServiceDate( + public static final DirectFlexPathCalculator CALCULATOR = new DirectFlexPathCalculator(); + private static final LocalDate SERVICE_DATE = LocalDate.of(2021, 4, 11); + private static final int SECONDS_SINCE_MIDNIGHT = LocalTime.of(10, 0).toSecondOfDay(); + public static final FlexServiceDate FLEX_DATE = new FlexServiceDate( SERVICE_DATE, SECONDS_SINCE_MIDNIGHT, new TIntHashSet() ); - protected static TestOtpModel buildFlexGraph(File file) { + public static TestOtpModel buildFlexGraph(File file) { var deduplicator = new Deduplicator(); var graph = new Graph(deduplicator); var transitModel = new TransitModel(new StopModel(), deduplicator); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index 0cae35f75f5..f098c435644 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -2,6 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.opentripplanner.ext.flex.FlexIntegrationTestData.ASPEN_GTFS; +import static org.opentripplanner.ext.flex.FlexIntegrationTestData.CALCULATOR; +import static org.opentripplanner.ext.flex.FlexIntegrationTestData.FLEX_DATE; import java.util.List; import java.util.Set; @@ -24,7 +27,7 @@ * It only contains a single stop time which in GTFS static would not work but is valid in GTFS * Flex. */ -public class GtfsFlexTest extends FlexIntegrationTestData { +public class GtfsFlexTest { private static TransitModel transitModel; diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index c1ed99c7858..49f3ed9eb5e 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -3,6 +3,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.opentripplanner.ext.flex.FlexIntegrationTestData.CALCULATOR; +import static org.opentripplanner.ext.flex.FlexIntegrationTestData.COBB_FLEX_GTFS; +import static org.opentripplanner.ext.flex.FlexIntegrationTestData.FLEX_DATE; +import static org.opentripplanner.ext.flex.FlexIntegrationTestData.LINCOLN_COUNTY_GTFS; import static org.opentripplanner.test.support.PolylineAssert.assertThatPolylinesAreEqual; import java.time.LocalDateTime; @@ -54,7 +58,7 @@ *

              * Read about the details at: https://www.cobbcounty.org/transportation/cobblinc/routes-and-schedules/flex */ -public class ScheduledDeviatedTripTest extends FlexIntegrationTestData { +public class ScheduledDeviatedTripTest { static Graph graph; static TransitModel transitModel; From 103c7d829d3ba14feca32c4cf2f60cbe4bc9a572 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 13 May 2024 11:44:52 +0200 Subject: [PATCH 1107/1688] refactor: Encapsulate fields in FlexIntegrationTestData --- .../ext/flex/FlexIntegrationTestData.java | 39 +++++++++++++++---- .../ext/flex/GtfsFlexTest.java | 3 +- .../flex/trip/ScheduledDeviatedTripTest.java | 8 ++-- .../ext/flex/trip/ScheduledDeviatedTrip.java | 8 ---- 4 files changed, 36 insertions(+), 22 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index 890e99725c4..66a34781d59 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -24,12 +24,13 @@ public final class FlexIntegrationTestData { private static final ResourceLoader RES = ResourceLoader.of(FlexIntegrationTestData.class); - public static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs"); - public static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); - protected static final File COBB_BUS_30_GTFS = RES.file("cobblinc-bus-30-only.gtfs.zip"); - protected static final File MARTA_BUS_856_GTFS = RES.file("marta-bus-856-only.gtfs.zip"); - public static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); - protected static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf"); + private static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs"); + private static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); + + static final File COBB_BUS_30_GTFS = RES.file("cobblinc-bus-30-only.gtfs.zip"); + static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); + static final File MARTA_BUS_856_GTFS = RES.file("marta-bus-856-only.gtfs.zip"); + static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf"); public static final DirectFlexPathCalculator CALCULATOR = new DirectFlexPathCalculator(); private static final LocalDate SERVICE_DATE = LocalDate.of(2021, 4, 11); @@ -40,7 +41,31 @@ public final class FlexIntegrationTestData { new TIntHashSet() ); - public static TestOtpModel buildFlexGraph(File file) { + public static TestOtpModel aspenGtfs() { + return buildFlexGraph(ASPEN_GTFS); + } + + public static TestOtpModel cobbFlexGtfs() { + return buildFlexGraph(COBB_FLEX_GTFS); + } + + public static TestOtpModel cobbBus30Gtfs() { + return buildFlexGraph(COBB_BUS_30_GTFS); + } + + public static TestOtpModel martaBus856Gtfs() { + return buildFlexGraph(MARTA_BUS_856_GTFS); + } + + public static TestOtpModel lincolnCountyGtfs() { + return buildFlexGraph(LINCOLN_COUNTY_GTFS); + } + + public static TestOtpModel cobbOsm() { + return buildFlexGraph(COBB_OSM); + } + + private static TestOtpModel buildFlexGraph(File file) { var deduplicator = new Deduplicator(); var graph = new Graph(deduplicator); var transitModel = new TransitModel(new StopModel(), deduplicator); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index f098c435644..a17a0a4ed4a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.opentripplanner.ext.flex.FlexIntegrationTestData.ASPEN_GTFS; import static org.opentripplanner.ext.flex.FlexIntegrationTestData.CALCULATOR; import static org.opentripplanner.ext.flex.FlexIntegrationTestData.FLEX_DATE; @@ -33,7 +32,7 @@ public class GtfsFlexTest { @BeforeAll static void setup() { - TestOtpModel model = FlexIntegrationTestData.buildFlexGraph(ASPEN_GTFS); + TestOtpModel model = FlexIntegrationTestData.aspenGtfs(); transitModel = model.transitModel(); } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 49f3ed9eb5e..fe77b8d17e0 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -4,9 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.opentripplanner.ext.flex.FlexIntegrationTestData.CALCULATOR; -import static org.opentripplanner.ext.flex.FlexIntegrationTestData.COBB_FLEX_GTFS; import static org.opentripplanner.ext.flex.FlexIntegrationTestData.FLEX_DATE; -import static org.opentripplanner.ext.flex.FlexIntegrationTestData.LINCOLN_COUNTY_GTFS; import static org.opentripplanner.test.support.PolylineAssert.assertThatPolylinesAreEqual; import java.time.LocalDateTime; @@ -58,7 +56,7 @@ *

              * Read about the details at: https://www.cobbcounty.org/transportation/cobblinc/routes-and-schedules/flex */ -public class ScheduledDeviatedTripTest { +class ScheduledDeviatedTripTest { static Graph graph; static TransitModel transitModel; @@ -228,13 +226,13 @@ void shouldNotInterpolateFlexTimes() { */ @Test void parseContinuousPickup() { - var lincolnGraph = FlexIntegrationTestData.buildFlexGraph(LINCOLN_COUNTY_GTFS); + var lincolnGraph = FlexIntegrationTestData.lincolnCountyGtfs(); assertNotNull(lincolnGraph); } @BeforeAll static void setup() { - TestOtpModel model = FlexIntegrationTestData.buildFlexGraph(COBB_FLEX_GTFS); + TestOtpModel model = FlexIntegrationTestData.cobbFlexGtfs(); graph = model.graph(); transitModel = model.transitModel(); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index e850c87c334..b707fe71116 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -5,8 +5,6 @@ import java.io.Serializable; import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; import java.util.List; import java.util.Set; import java.util.function.Predicate; @@ -167,12 +165,6 @@ public TransitBuilder copy( return new ScheduledDeviatedTripBuilder(this); } - private Collection expandStops(StopLocation stop) { - return stop instanceof GroupStop groupStop - ? groupStop.getChildLocations() - : Collections.singleton(stop); - } - @Override public int findBoardIndex(StopLocation fromStop) { for (int i = 0; i < stopTimes.length; i++) { From e69999ea8f1a4a97171165ad3910cb2763cebd13 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 13 May 2024 12:03:08 +0200 Subject: [PATCH 1108/1688] test: Add unit-test on FlexTemplateFactory Remove old tests on template generation --- .../ext/flex/FlexIntegrationTest.java | 3 +- .../ext/flex/FlexIntegrationTestData.java | 8 +- .../ext/flex/GtfsFlexTest.java | 49 +-- .../template/FlexTemplateFactoryTest.java | 373 ++++++++++++++++++ .../flex/trip/ScheduledDeviatedTripTest.java | 37 -- .../ext/flex/trip/UnscheduledTripTest.java | 99 ----- .../model/_data/TransitModelForTest.java | 9 + 7 files changed, 389 insertions(+), 189 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java index e0ece82db12..c88439a9e3f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner.TestServerContext; import org.opentripplanner.framework.application.OTPFeature; @@ -57,7 +56,7 @@ public class FlexIntegrationTest { @BeforeAll static void setup() { OTPFeature.enableFeatures(Map.of(OTPFeature.FlexRouting, true)); - TestOtpModel model = ConstantsForTests.buildOsmGraph(FlexIntegrationTestData.COBB_OSM); + TestOtpModel model = FlexIntegrationTestData.cobbOsm(); graph = model.graph(); transitModel = model.transitModel(); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index 66a34781d59..97deac5b3d9 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -8,6 +8,7 @@ import java.time.LocalTime; import java.util.List; import java.util.Map; +import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.framework.application.OTPFeature; @@ -25,12 +26,11 @@ public final class FlexIntegrationTestData { private static final ResourceLoader RES = ResourceLoader.of(FlexIntegrationTestData.class); private static final File ASPEN_GTFS = RES.file("aspen-flex-on-demand.gtfs"); - private static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); - static final File COBB_BUS_30_GTFS = RES.file("cobblinc-bus-30-only.gtfs.zip"); static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); + private static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf"); + private static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); static final File MARTA_BUS_856_GTFS = RES.file("marta-bus-856-only.gtfs.zip"); - static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf"); public static final DirectFlexPathCalculator CALCULATOR = new DirectFlexPathCalculator(); private static final LocalDate SERVICE_DATE = LocalDate.of(2021, 4, 11); @@ -62,7 +62,7 @@ public static TestOtpModel lincolnCountyGtfs() { } public static TestOtpModel cobbOsm() { - return buildFlexGraph(COBB_OSM); + return ConstantsForTests.buildOsmGraph(COBB_OSM); } private static TestOtpModel buildFlexGraph(File file) { diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java index a17a0a4ed4a..e116831e2d3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/GtfsFlexTest.java @@ -2,31 +2,26 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.opentripplanner.ext.flex.FlexIntegrationTestData.CALCULATOR; -import static org.opentripplanner.ext.flex.FlexIntegrationTestData.FLEX_DATE; -import java.util.List; import java.util.Set; import java.util.stream.Collectors; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; -import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.service.TransitModel; /** * This test makes sure that one of the example feeds in the GTFS-Flex repo works. It's the City of - * Aspen Downtown taxi service which is a completely unscheduled trip that takes you door-to-door in + * Aspen Downtown taxi service, which is a completely unscheduled trip that takes you door-to-door in * the city. *

              * It only contains a single stop time which in GTFS static would not work but is valid in GTFS * Flex. */ -public class GtfsFlexTest { +class GtfsFlexTest { private static TransitModel transitModel; @@ -51,48 +46,8 @@ void parseAspenTaxiAsUnscheduledTrip() { ); } - @Test - void calculateAccessTemplate() { - var trip = getFlexTrip(); - var nearbyStop = getNearbyStop(trip); - - var accesses = FlexTemplateFactory - .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) - .with(FLEX_DATE, trip, nearbyStop) - .createAccessTemplates(); - - assertFalse(accesses.isEmpty()); - } - - @Test - void calculateEgressTemplate() { - var trip = getFlexTrip(); - var nearbyStop = getNearbyStop(trip); - var egresses = FlexTemplateFactory - .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) - .with(FLEX_DATE, trip, nearbyStop) - .createEgressTemplates(); - - assertEquals(1, egresses.size()); - - var egress = egresses.get(0); - assertEquals(0, egress.fromStopIndex); - assertEquals(0, egress.toStopIndex); - } - @Test void shouldGeneratePatternForFlexTripWithSingleStop() { assertFalse(transitModel.getAllTripPatterns().isEmpty()); } - - private static NearbyStop getNearbyStop(FlexTrip trip) { - assertEquals(1, trip.getStops().size()); - var stopLocation = trip.getStops().iterator().next(); - return new NearbyStop(stopLocation, 0, List.of(), null); - } - - private static FlexTrip getFlexTrip() { - var flexTrips = transitModel.getAllFlexTrips(); - return flexTrips.iterator().next(); - } } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java new file mode 100644 index 00000000000..68a657ebee7 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -0,0 +1,373 @@ +package org.opentripplanner.ext.flex.template; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.ext.flex.template.FlexTemplateFactoryTest.BoardAlight.ALIGHT_ONLY; +import static org.opentripplanner.ext.flex.template.FlexTemplateFactoryTest.BoardAlight.BOARD_AND_ALIGHT; +import static org.opentripplanner.ext.flex.template.FlexTemplateFactoryTest.BoardAlight.BOARD_ONLY; +import static org.opentripplanner.framework.time.TimeUtils.time; + +import gnu.trove.set.hash.TIntHashSet; +import java.time.Duration; +import java.time.LocalDate; +import java.time.Month; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import org.junit.jupiter.api.Test; +import org.locationtech.jts.geom.Coordinate; +import org.opentripplanner.ext.flex.FlexServiceDate; +import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; +import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; +import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; +import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; +import org.opentripplanner.ext.flex.trip.UnscheduledTrip; +import org.opentripplanner.framework.i18n.I18NString; +import org.opentripplanner.model.PickDrop; +import org.opentripplanner.model.StopTime; +import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.street.model.vertex.StreetLocation; +import org.opentripplanner.street.search.request.StreetSearchRequest; +import org.opentripplanner.street.search.state.State; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.Trip; + +class FlexTemplateFactoryTest { + + private static final TransitModelForTest MODEL = TransitModelForTest.of(); + + /** + * This is pass-through information + */ + private static final Duration MAX_TRANSFER_DURATION = Duration.ofMinutes(10); + + /** + * Any calculator will do. The only thing we will test here is that a new scheduled calculator + * is created for scheduled-flex-trips. + */ + private static final FlexPathCalculator CALCULATOR = new StreetFlexPathCalculator( + false, + Duration.ofHours(3) + ); + + public static final int SERVICE_TIME_OFFSET = 3600 * 2; + + /** + * The date is pass-through information in this test, so one date is enough. + */ + private static final FlexServiceDate DATE = new FlexServiceDate( + LocalDate.of(2024, Month.MAY, 17), + SERVICE_TIME_OFFSET, + new TIntHashSet() + ); + + // Stop A-D is a mix of regular and area stops - it should not matter for this test + private static final StopLocation STOP_A = MODEL.stop("A").build(); + private static final StopLocation STOP_B = MODEL.areaStop("B").build(); + private static final StopLocation STOP_C = MODEL.areaStop("C").build(); + private static final StopLocation STOP_D = MODEL.stop("D").build(); + private static final RegularStop STOP_G1 = MODEL.stop("G1").build(); + private static final RegularStop STOP_G2 = MODEL.stop("G2").build(); + private static final RegularStop STOP_G3 = MODEL.stop("G3").build(); + private static final RegularStop STOP_G4 = MODEL.stop("G4").build(); + private static final StopLocation GROUP_STOP_12 = MODEL.groupStop("G", STOP_G1, STOP_G2); + private static final StopLocation GROUP_STOP_34 = MODEL.groupStop("G", STOP_G3, STOP_G4); + + private static final Trip TRIP = TransitModelForTest.trip("Trip").build(); + private static final int T_10_00 = time("10:00"); + private static final int T_10_10 = time("10:10"); + private static final int T_10_20 = time("10:20"); + private static final int T_10_30 = time("10:30"); + private static final int T_10_40 = time("10:40"); + + @Test + void testCreateAccessTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestrictions() { + var flexTrip = unscheduledTrip( + "FlexTrip", + stopTime(1, STOP_A, BOARD_AND_ALIGHT, T_10_00), + stopTime(2, STOP_B, BOARD_AND_ALIGHT, T_10_10) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with access boarding at stop A + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createAccessTemplates(); + + var template = subject.get(0); + assertEquals(0, template.fromStopIndex); + assertEquals(1, template.toStopIndex); + assertSame(CALCULATOR, template.calculator); + assertSame(STOP_B, template.transferStop); + assertSame(DATE.serviceDate, template.serviceDate); + assertEquals(SERVICE_TIME_OFFSET, template.secondsFromStartOfTime); + assertEquals(1, subject.size(), subject::toString); + + // We are not allowed to board and alight at the same stop so boarding the last stop + // will result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createAccessTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + + // Search for a stop not part of the pattern should result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createAccessTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + } + + @Test + void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestrictions() { + var flexTrip = unscheduledTrip( + "FlexTrip", + stopTime(1, STOP_A, BOARD_AND_ALIGHT, T_10_00), + stopTime(2, STOP_B, BOARD_AND_ALIGHT, T_10_10) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with egress alighting at stop B + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createEgressTemplates(); + + var template = subject.get(0); + assertEquals(0, template.fromStopIndex); + assertEquals(1, template.toStopIndex); + assertSame(CALCULATOR, template.calculator); + assertSame(STOP_A, template.transferStop); + assertSame(DATE.serviceDate, template.serviceDate); + assertEquals(SERVICE_TIME_OFFSET, template.secondsFromStartOfTime); + assertEquals(1, subject.size(), subject::toString); + + // We are not allowed to board and alight at the same stop so boarding the last stop + // will result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createEgressTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + + // Search for a stop not part of the pattern should result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createEgressTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + } + + @Test + void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() { + var flexTrip = unscheduledTrip( + "FlexTrip", + stopTime(1, STOP_A, BOARD_ONLY, T_10_00), + stopTime(2, STOP_B, ALIGHT_ONLY, T_10_10), + stopTime(3, STOP_C, BOARD_ONLY, T_10_20), + stopTime(4, STOP_D, ALIGHT_ONLY, T_10_30) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with boarding at stop A + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createAccessTemplates(); + + var t1 = subject.get(0); + var t2 = subject.get(1); + + assertEquals(0, t1.fromStopIndex); + assertEquals(0, t2.fromStopIndex); + assertEquals(Set.of(1, 3), Set.of(t1.toStopIndex, t2.toStopIndex)); + assertEquals(2, subject.size()); + + // Board at stop C + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createAccessTemplates(); + + t1 = subject.get(0); + assertEquals(2, t1.fromStopIndex); + assertEquals(3, t1.toStopIndex); + assertEquals(1, subject.size()); + + // We are not allowed to board and alight at the same stop so boarding the last stop + // will result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createAccessTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + + // Search for a stop not part of the pattern should result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_D)).createAccessTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + } + + @Test + void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() { + var flexTrip = unscheduledTrip( + "FlexTrip", + stopTime(1, STOP_A, BOARD_ONLY, T_10_00), + stopTime(2, STOP_B, ALIGHT_ONLY, T_10_10), + stopTime(3, STOP_C, BOARD_ONLY, T_10_20), + stopTime(4, STOP_D, ALIGHT_ONLY, T_10_30) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with boarding at stop A + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_D)).createEgressTemplates(); + + var t1 = subject.get(0); + var t2 = subject.get(1); + + assertEquals(Set.of(0, 2), Set.of(t1.fromStopIndex, t2.fromStopIndex)); + assertEquals(3, t1.toStopIndex); + assertEquals(3, t2.toStopIndex); + assertEquals(2, subject.size()); + + // Board at stop C + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createEgressTemplates(); + + t1 = subject.get(0); + assertEquals(0, t1.fromStopIndex); + assertEquals(1, t1.toStopIndex); + assertEquals(1, subject.size()); + + // We are not allowed to board and alight at the same stop so boarding the last stop + // will result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createEgressTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + + // Search for a stop not part of the pattern should result in an empty result + subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createEgressTemplates(); + assertTrue(subject.isEmpty(), subject::toString); + } + + @Test + void testCreateAccessTemplateForUnscheduledTripWithTwoGroupsStops() { + var flexTrip = unscheduledTrip( + "FlexTrip", + stopTime(1, GROUP_STOP_12, BOARD_ONLY, T_10_00), + stopTime(2, GROUP_STOP_34, ALIGHT_ONLY, T_10_20) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with access boarding at stop A + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_G1)).createAccessTemplates(); + + var t1 = subject.get(0); + var t2 = subject.get(1); + assertEquals(0, t1.fromStopIndex); + assertEquals(0, t2.fromStopIndex); + assertEquals(1, t1.toStopIndex); + assertEquals(1, t2.toStopIndex); + assertEquals(Set.of(STOP_G3, STOP_G4), Set.of(t1.transferStop, t2.transferStop)); + assertEquals(2, subject.size(), subject::toString); + } + + @Test + void testCreateEgressTemplateForUnscheduledTripWithTwoGroupsStops() { + var flexTrip = unscheduledTrip( + "FlexTrip", + stopTime(1, GROUP_STOP_12, BOARD_ONLY, T_10_00), + stopTime(2, GROUP_STOP_34, ALIGHT_ONLY, T_10_20) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with access boarding at stop A + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_G4)).createEgressTemplates(); + + var t1 = subject.get(0); + var t2 = subject.get(1); + assertEquals(0, t1.fromStopIndex); + assertEquals(0, t2.fromStopIndex); + assertEquals(1, t1.toStopIndex); + assertEquals(1, t2.toStopIndex); + assertEquals(Set.of(STOP_G1, STOP_G2), Set.of(t1.transferStop, t2.transferStop)); + assertEquals(2, subject.size(), subject::toString); + } + + @Test + void testCreateAccessTemplateForScheduledDeviatedTrip() { + var flexTrip = scheduledDeviatedFlexTrip( + "FlexTrip", + stopTime(1, STOP_A, BOARD_ONLY, T_10_00), + stopTime(5, STOP_B, BOARD_AND_ALIGHT, T_10_20), + stopTime(10, STOP_C, ALIGHT_ONLY, T_10_30) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with access boarding at stop A + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createAccessTemplates(); + + var template = subject.get(0); + assertEquals(1, template.fromStopIndex); + assertEquals(2, template.toStopIndex); + assertEquals(STOP_C, template.transferStop); + assertTrue(template.calculator instanceof ScheduledFlexPathCalculator); + assertEquals(1, subject.size(), subject::toString); + } + + @Test + void testCreateEgressTemplateForScheduledDeviatedTrip() { + var flexTrip = scheduledDeviatedFlexTrip( + "FlexTrip", + stopTime(1, STOP_A, BOARD_ONLY, T_10_00), + stopTime(5, STOP_B, BOARD_AND_ALIGHT, T_10_20), + stopTime(10, STOP_C, ALIGHT_ONLY, T_10_30) + ); + + var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); + + // Create template with access boarding at stop A + var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createEgressTemplates(); + + var template = subject.get(0); + assertEquals(0, template.fromStopIndex); + assertEquals(1, template.toStopIndex); + assertEquals(STOP_A, template.transferStop); + assertTrue(template.calculator instanceof ScheduledFlexPathCalculator); + assertEquals(1, subject.size(), subject::toString); + } + + /** + * The nearbyStop is pass-through information, except the stop - which defines the "transfer" + * point. + */ + private static NearbyStop nearbyStop(StopLocation transferPoint) { + var id = "NearbyStop:" + transferPoint.getId().getId(); + return new NearbyStop( + transferPoint, + 0, + List.of(), + new State( + new StreetLocation(id, new Coordinate(0, 0), I18NString.of(id)), + StreetSearchRequest.of().build() + ) + ); + } + + private static ScheduledDeviatedTrip scheduledDeviatedFlexTrip(String id, StopTime... stopTimes) { + return MODEL.scheduledDeviatedTrip(id, stopTimes); + } + + private static UnscheduledTrip unscheduledTrip(String id, StopTime... stopTimes) { + return MODEL.unscheduledTrip(id, Arrays.asList(stopTimes)); + } + + private static StopTime stopTime( + int seqNr, + StopLocation stop, + BoardAlight boardAlight, + int startTime + ) { + var st = MODEL.stopTime(TRIP, seqNr, stop); + switch (boardAlight) { + case BOARD_ONLY: + st.setDropOffType(PickDrop.NONE); + break; + case ALIGHT_ONLY: + st.setPickupType(PickDrop.NONE); + break; + } + st.setFlexWindowStart(startTime); + // 5-minute window + st.setFlexWindowEnd(startTime + 300); + return st; + } + + enum BoardAlight { + BOARD_ONLY, + ALIGHT_ONLY, + BOARD_AND_ALIGHT, + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index fe77b8d17e0..591583fb4ad 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -3,8 +3,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -import static org.opentripplanner.ext.flex.FlexIntegrationTestData.CALCULATOR; -import static org.opentripplanner.ext.flex.FlexIntegrationTestData.FLEX_DATE; import static org.opentripplanner.test.support.PolylineAssert.assertThatPolylinesAreEqual; import java.time.LocalDateTime; @@ -24,7 +22,6 @@ import org.opentripplanner.ext.flex.FlexIntegrationTestData; import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexRouter; -import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.geometry.EncodedPolyline; import org.opentripplanner.framework.i18n.I18NString; @@ -94,40 +91,6 @@ void parseCobbCountyAsScheduledDeviatedTrip() { assertEquals(-84.63430143459385, flexZone.getLon(), delta); } - @Test - void calculateAccessTemplate() { - var trip = getFlexTrip(); - var nearbyStop = getNearbyStop(trip); - - FlexTemplateFactory templateFactory = FlexTemplateFactory.of( - CALCULATOR, - FlexParameters.defaultValues().maxTransferDuration() - ); - var accesses = templateFactory.with(FLEX_DATE, trip, nearbyStop).createAccessTemplates(); - - assertEquals(3, accesses.size()); - - var access = accesses.get(0); - assertEquals(1, access.fromStopIndex); - assertEquals(1, access.toStopIndex); - } - - @Test - void calculateEgressTemplate() { - var trip = getFlexTrip(); - var nearbyStop = getNearbyStop(trip); - var egresses = FlexTemplateFactory - .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) - .with(FLEX_DATE, trip, nearbyStop) - .createEgressTemplates(); - - assertEquals(3, egresses.size()); - - var egress = egresses.get(2); - assertEquals(2, egress.fromStopIndex); - assertEquals(2, egress.toStopIndex); - } - @Test void calculateDirectFare() { OTPFeature.enableFeatures(Map.of(OTPFeature.FlexRouting, true)); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java index 5c9fe8f9c19..101d5dcd0d3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledTripTest.java @@ -9,8 +9,6 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; import static org.opentripplanner.transit.model._data.TransitModelForTest.id; -import gnu.trove.set.hash.TIntHashSet; -import java.time.LocalDate; import java.util.Collections; import java.util.List; import java.util.Objects; @@ -20,18 +18,11 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.ext.flex.FlexParameters; -import org.opentripplanner.ext.flex.FlexServiceDate; -import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; -import org.opentripplanner.ext.flex.template.FlexAccessTemplate; -import org.opentripplanner.ext.flex.template.FlexEgressTemplate; -import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; -import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; @@ -568,96 +559,6 @@ void boardingAlighting() { assertTrue(trip.isAlightingPossible(AREA_STOP2)); } - @Nested - class FlexTemplates { - - private static final DirectFlexPathCalculator CALCULATOR = new DirectFlexPathCalculator(); - static final StopTime FIRST = area("10:00", "10:05"); - static final StopTime SECOND = area("10:10", "10:15"); - static final StopTime THIRD = area("10:20", "10:25"); - static final StopTime FOURTH = area("10:30", "10:35"); - private static final FlexServiceDate FLEX_SERVICE_DATE = new FlexServiceDate( - LocalDate.of(2023, 9, 16), - 0, - new TIntHashSet() - ); - private static final NearbyStop NEARBY_STOP = new NearbyStop( - FOURTH.getStop(), - 100, - List.of(), - null - ); - - @Test - void accessTemplates() { - var trip = trip(List.of(FIRST, SECOND, THIRD, FOURTH)); - - var templates = accessTemplates(trip); - - assertEquals(3, templates.size()); - - List - .of(0, 1, 2) - .forEach(index -> { - var template = templates.get(index); - assertEquals(0, template.fromStopIndex); - assertEquals(index + 1, template.toStopIndex); - }); - } - - @Test - void accessTemplatesNoAlighting() { - var second = area("10:10", "10:15"); - second.setDropOffType(NONE); - - var trip = trip(List.of(FIRST, second, THIRD, FOURTH)); - - var templates = accessTemplates(trip); - - assertEquals(2, templates.size()); - List - .of(0, 1) - .forEach(index -> { - var template = templates.get(index); - assertEquals(0, template.fromStopIndex); - assertEquals(index + 2, template.toStopIndex); - }); - } - - @Test - void egressTemplates() { - var trip = trip(List.of(FIRST, SECOND, THIRD, FOURTH)); - - var templates = egressTemplates(trip); - - assertEquals(4, templates.size()); - var template = templates.get(0); - assertEquals(0, template.fromStopIndex); - assertEquals(3, template.toStopIndex); - } - - @Nonnull - private static UnscheduledTrip trip(List stopTimes) { - return new TestCase.Builder(FIRST, THIRD).withStopTimes(stopTimes).build().trip(); - } - - @Nonnull - private static List accessTemplates(UnscheduledTrip trip) { - return FlexTemplateFactory - .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) - .with(FLEX_SERVICE_DATE, trip, NEARBY_STOP) - .createAccessTemplates(); - } - - @Nonnull - private static List egressTemplates(UnscheduledTrip trip) { - return FlexTemplateFactory - .of(CALCULATOR, FlexParameters.defaultValues().maxTransferDuration()) - .with(FLEX_SERVICE_DATE, trip, NEARBY_STOP) - .createEgressTemplates(); - } - } - private static String timeToString(int time) { return TimeUtils.timeToStrCompact(time, MISSING_VALUE, "MISSING_VALUE"); } diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java index 31f996c00e9..9f06e1d6104 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java @@ -9,6 +9,7 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Polygon; import org.opentripplanner._support.geometry.Coordinates; +import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; @@ -283,4 +284,12 @@ public UnscheduledTrip unscheduledTrip(String id, List stopTimes) { .withStopTimes(stopTimes) .build(); } + + public ScheduledDeviatedTrip scheduledDeviatedTrip(String id, StopTime... stopTimes) { + return ScheduledDeviatedTrip + .of(id(id)) + .withTrip(trip("flex-trip").build()) + .withStopTimes(Arrays.asList(stopTimes)) + .build(); + } } From a9b98b9349ddcffb8e53941dc60f9708b5e66866 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 13 May 2024 14:17:24 +0200 Subject: [PATCH 1109/1688] Mark banned stops as deprected --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 56f3528d6e3..0f863393d87 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1082,7 +1082,7 @@ input InputBanned { banned for boarding and disembarking vehicles — it is possible to get an itinerary where a vehicle stops at one of these stops """ - stops: String + stops: String @deprecated(reason: "Not implemented in OTP2.") """ A comma-separated list of banned stop ids. Only itineraries where these stops @@ -1090,7 +1090,7 @@ input InputBanned { these stops, that route will not be used in the itinerary, even if the stop is not used for boarding or disembarking the vehicle. """ - stopsHard: String + stopsHard: String @deprecated(reason: "Not implemented in OTP2.") } input InputCoordinates { From dbd8f2f1053c89ca183b5fa37e12612882394a70 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 13 May 2024 17:45:56 +0200 Subject: [PATCH 1110/1688] Remove separate section about OSM naming --- doc-templates/BuildConfiguration.md | 16 ---------------- docs/BuildConfiguration.md | 16 ---------------- 2 files changed, 32 deletions(-) diff --git a/doc-templates/BuildConfiguration.md b/doc-templates/BuildConfiguration.md index 756593a57a3..43a29e1fb79 100644 --- a/doc-templates/BuildConfiguration.md +++ b/doc-templates/BuildConfiguration.md @@ -140,22 +140,6 @@ The mechanism is that for any two identical tags, OTP will use the first one. } ``` -### Custom naming - -You can define a custom naming scheme for elements drawn from OSM by defining an `osmNaming` field -in `build-config.json`, such as: - -```JSON -// build-config.json -{ - "osmNaming": "portland" -} -``` - -There is currently only one custom naming module called `portland` (which has no parameters). - - - ## Elevation data OpenTripPlanner can "drape" the OSM street network over a digital elevation model (DEM). This allows diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md index fe3a2109ba4..d2e7833c251 100644 --- a/docs/BuildConfiguration.md +++ b/docs/BuildConfiguration.md @@ -238,22 +238,6 @@ The mechanism is that for any two identical tags, OTP will use the first one. } ``` -### Custom naming - -You can define a custom naming scheme for elements drawn from OSM by defining an `osmNaming` field -in `build-config.json`, such as: - -```JSON -// build-config.json -{ - "osmNaming": "portland" -} -``` - -There is currently only one custom naming module called `portland` (which has no parameters). - - - ## Elevation data OpenTripPlanner can "drape" the OSM street network over a digital elevation model (DEM). This allows From 766d274af6c27d1c00427c91864ff85679345c9a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 May 2024 19:28:05 +0000 Subject: [PATCH 1111/1688] chore(deps): update micrometer.version to v1.13.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ce89fc467e6..56b437aa78e 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ 2.17.0 3.1.6 5.10.2 - 1.12.3 + 1.13.0 5.5.3 1.5.6 9.10.0 From 07aab67bb6c45445bb5f71875b0ed55dd7dbd3b9 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Tue, 14 May 2024 10:44:18 +0200 Subject: [PATCH 1112/1688] Don't expose mutable tripOnServiceDates in TransitModel --- .../org/opentripplanner/netex/NetexModule.java | 2 +- .../transit/service/TransitModel.java | 5 +++-- .../ScheduledTransitLegReferenceTest.java | 18 ++++++++---------- 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opentripplanner/netex/NetexModule.java b/src/main/java/org/opentripplanner/netex/NetexModule.java index 08904c947e4..b9a05d25b10 100644 --- a/src/main/java/org/opentripplanner/netex/NetexModule.java +++ b/src/main/java/org/opentripplanner/netex/NetexModule.java @@ -69,7 +69,7 @@ public void buildGraph() { ); transitBuilder.limitServiceDays(transitPeriodLimit); for (var tripOnServiceDate : transitBuilder.getTripOnServiceDates().values()) { - transitModel.getTripOnServiceDates().put(tripOnServiceDate.getId(), tripOnServiceDate); + transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate); } calendarServiceData.add(transitBuilder.buildCalendarServiceData()); diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java index 2f0162aa8b1..46e22a937be 100644 --- a/src/main/java/org/opentripplanner/transit/service/TransitModel.java +++ b/src/main/java/org/opentripplanner/transit/service/TransitModel.java @@ -371,8 +371,9 @@ public TripPattern getTripPatternForId(FeedScopedId id) { return tripPatternForId.get(id); } - public Map getTripOnServiceDates() { - return tripOnServiceDates; + public void addTripOnServiceDate(FeedScopedId id, TripOnServiceDate tripOnServiceDate) { + invalidateIndex(); + tripOnServiceDates.put(id, tripOnServiceDate); } /** diff --git a/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java b/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java index a3fab1838cb..480639e5bda 100644 --- a/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java +++ b/src/test/java/org/opentripplanner/model/plan/legreference/ScheduledTransitLegReferenceTest.java @@ -87,16 +87,14 @@ static void buildTransitService() { calendarServiceData.putServiceDatesForServiceId(tripPattern.getId(), List.of(SERVICE_DATE)); transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); - transitModel - .getTripOnServiceDates() - .put( - TRIP_ON_SERVICE_DATE_ID, - TripOnServiceDate - .of(TRIP_ON_SERVICE_DATE_ID) - .withTrip(trip) - .withServiceDate(SERVICE_DATE) - .build() - ); + transitModel.addTripOnServiceDate( + TRIP_ON_SERVICE_DATE_ID, + TripOnServiceDate + .of(TRIP_ON_SERVICE_DATE_ID) + .withTrip(trip) + .withServiceDate(SERVICE_DATE) + .build() + ); transitModel.index(); From 60c4ee925f51689bacd596f517ea709984b36615 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 14 May 2024 11:52:48 +0200 Subject: [PATCH 1113/1688] Incorporate review feedback --- .../graph_builder/module/osm/OsmModule.java | 4 +--- .../module/osm/naming/PortlandCustomNamer.java | 18 ++++++++++++++++-- .../module/osm/naming/SidewalkNamer.java | 8 ++++---- .../openstreetmap/model/OSMWithTags.java | 14 -------------- 4 files changed, 21 insertions(+), 23 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java index 3a745dddf52..10c215ee448 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/OsmModule.java @@ -544,9 +544,7 @@ private StreetEdge getEdgeForStreet( .withWheelchairAccessible(way.isWheelchairAccessible()) .withBogusName(way.hasNoName()); - StreetEdge street = seb.buildAndConnect(); - - return street; + return seb.buildAndConnect(); } private float getMaxCarSpeed() { diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java index b178adaab6b..c0ca595fbd7 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/PortlandCustomNamer.java @@ -71,8 +71,8 @@ public I18NString name(OSMWithTags way) { @Override public void recordEdges(OSMWithTags way, StreetEdgePair edgePair) { - final boolean isHighwayLink = way.isHighwayLink(); - final boolean isLowerLink = way.isLowerLink(); + final boolean isHighwayLink = isHighwayLink(way); + final boolean isLowerLink = isLowerLink(way); edgePair .asIterable() .forEach(edge -> { @@ -185,4 +185,18 @@ private static String nameAccordingToOrigin(StreetEdge e, int maxDepth) { } return null; } + + private static boolean isHighwayLink(OSMWithTags way) { + String highway = way.getTag("highway"); + return "motorway_link".equals(highway) || "trunk_link".equals(highway); + } + + private static boolean isLowerLink(OSMWithTags way) { + String highway = way.getTag("highway"); + return ( + "secondary_link".equals(highway) || + "primary_link".equals(highway) || + "tertiary_link".equals(highway) + ); + } } diff --git a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java index 196ebe73946..eafccc0da1b 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/osm/naming/SidewalkNamer.java @@ -71,13 +71,13 @@ public I18NString name(OSMWithTags way) { @Override public void recordEdges(OSMWithTags way, StreetEdgePair pair) { - // this way is a sidewalk and hasn't been named yet (and is not explicitly unnamed) + // This way is a sidewalk and hasn't been named yet (and is not explicitly unnamed) if (way.isSidewalk() && way.hasNoName() && !way.isExplicitlyUnnamed()) { pair .asIterable() .forEach(edge -> unnamedSidewalks.add(new EdgeOnLevel(edge, way.getLevels()))); } - // the way is _not_ a sidewalk and does have a name + // The way is _not_ a sidewalk and does have a name else if (way.isNamed() && !way.isLink()) { // We generate two edges for each osm way: one there and one back. This spatial index only // needs to contain one item for each road segment with a unique geometry and name, so we @@ -120,7 +120,7 @@ public void postprocess() { LOG.info(progress.completeMessage()); - // set the indices to null so they can be garbage-collected + // Set the indices to null so they can be garbage-collected streetEdges = null; unnamedSidewalks = null; } @@ -148,7 +148,7 @@ private void assignNameToSidewalk(EdgeOnLevel sidewalkOnLevel, AtomicInteger nam var candidates = streetEdges.query(buffer.getEnvelopeInternal()); groupEdgesByName(candidates) - // make sure we only compare sidewalks and streets that are on the same level + // Make sure we only compare sidewalks and streets that are on the same level .filter(g -> g.levels.equals(sidewalkOnLevel.levels)) .map(g -> computePercentInsideBuffer(g, buffer, sidewalkLength)) // Remove those groups where less than a certain percentage is inside the buffer around diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java index b4c9c4b01b5..b53739bf6a1 100644 --- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java +++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMWithTags.java @@ -567,20 +567,6 @@ public boolean isLink() { return highway != null && highway.endsWith(("_link")); } - public boolean isHighwayLink() { - String highway = getTag("highway"); - return "motorway_link".equals(highway) || "trunk_link".equals(highway); - } - - public boolean isLowerLink() { - String highway = getTag("highway"); - return ( - "secondary_link".equals(highway) || - "primary_link".equals(highway) || - "tertiary_link".equals(highway) - ); - } - public boolean isElevator() { return isTag("highway", "elevator"); } From 0bc5abfe757fd65d10c192d0d13ab6a6c2ca7864 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 14 May 2024 12:19:28 +0200 Subject: [PATCH 1114/1688] Adjust code to newest Micrometer version --- .../opentripplanner/ext/actuator/ActuatorAPI.java | 12 +++++++----- .../standalone/server/OTPWebApplication.java | 4 ++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java b/src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java index 0f6b6bd2601..f8b61a56ecc 100644 --- a/src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java +++ b/src/ext/java/org/opentripplanner/ext/actuator/ActuatorAPI.java @@ -2,8 +2,7 @@ import static org.apache.hc.core5.http.HttpHeaders.ACCEPT; -import io.micrometer.prometheus.PrometheusMeterRegistry; -import io.prometheus.client.exporter.common.TextFormat; +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; import jakarta.ws.rs.HeaderParam; @@ -23,6 +22,9 @@ public class ActuatorAPI { private static final Logger LOG = LoggerFactory.getLogger(ActuatorAPI.class); + public static final String CONTENT_TYPE_004 = "text/plain; version=0.0.4; charset=utf-8"; + public static final String CONTENT_TYPE_OPENMETRICS_100 = + "application/openmetrics-text; version=1.0.0; charset=utf-8"; /** * List the actuator endpoints available @@ -93,14 +95,14 @@ public Response health(@Context OtpServerRequestContext serverContext) { */ @GET @Path("/prometheus") - @Produces({ TextFormat.CONTENT_TYPE_004, TextFormat.CONTENT_TYPE_OPENMETRICS_100 }) + @Produces({ CONTENT_TYPE_004, CONTENT_TYPE_OPENMETRICS_100 }) public Response prometheus( @Context final PrometheusMeterRegistry prometheusRegistry, @HeaderParam(ACCEPT) @DefaultValue("*/*") final String acceptHeader ) { final var contentType = acceptHeader.contains("application/openmetrics-text") - ? TextFormat.CONTENT_TYPE_OPENMETRICS_100 - : TextFormat.CONTENT_TYPE_004; + ? CONTENT_TYPE_OPENMETRICS_100 + : CONTENT_TYPE_004; return Response .status(Response.Status.OK) diff --git a/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java b/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java index b238a74c7d3..079dad36f53 100644 --- a/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java +++ b/src/main/java/org/opentripplanner/standalone/server/OTPWebApplication.java @@ -3,8 +3,8 @@ import io.micrometer.core.instrument.Metrics; import io.micrometer.core.instrument.binder.jersey.server.DefaultJerseyTagsProvider; import io.micrometer.core.instrument.binder.jersey.server.MetricsApplicationEventListener; -import io.micrometer.prometheus.PrometheusConfig; -import io.micrometer.prometheus.PrometheusMeterRegistry; +import io.micrometer.prometheusmetrics.PrometheusConfig; +import io.micrometer.prometheusmetrics.PrometheusMeterRegistry; import jakarta.ws.rs.container.ContainerResponseFilter; import jakarta.ws.rs.core.Application; import java.util.HashSet; From fed0a5fc3534d009834559bef279425643f7f7fc Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Tue, 14 May 2024 19:49:49 +0800 Subject: [PATCH 1115/1688] add prettier:write to docs, rephrase slightly (#5831) [ci skip] --- docs/Codestyle.md | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/docs/Codestyle.md b/docs/Codestyle.md index d127ff21e5c..d468937adfa 100644 --- a/docs/Codestyle.md +++ b/docs/Codestyle.md @@ -14,14 +14,21 @@ it takes a bit of time, but reformat the entire codebase. Only code you have cha formatted, since the existing code is already formatted. The second way is to set up prettier and run it manually or hick it into your IDE, so it runs every time a file is changed. -### How to run Prittier with Maven +### How to run Prettier with Maven -Format all code is done in the validate phase (run before test, package, install) +Prettier will automatically format all code in the Maven "validate" phase, which runs before the test, package, and install phases. So formatting will happen for example when you run: ``` % mvn test ``` +You can manually run _only_ the formatting process with: + +``` +% mvn prettier:write + +``` + To skip the prettier formating use profile `prettierSkip`: ``` @@ -31,7 +38,7 @@ To skip the prettier formating use profile `prettierSkip`: The check for formatting errors use profile `prettierCheck`: ``` -% mvn test -P prettierSkip +% mvn test -P prettierCheck ``` The check is run by the CI server and will fail the build if the code is incorrectly formatted. From a4a5d01ae103cb0d76b70c41cc6b6fe6ec966cee Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 14 May 2024 11:50:03 +0000 Subject: [PATCH 1116/1688] Add changelog entry for #5831 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index c4b90705ae7..6943759a1ae 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -17,6 +17,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) - Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) - Fix handling of implicit access and egress mode parameters. [#5821](https://github.com/opentripplanner/OpenTripPlanner/pull/5821) +- Add prettier:write to docs and rephrase slightly [ci skip] [#5831](https://github.com/opentripplanner/OpenTripPlanner/pull/5831) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 659c9bee44724781fd5b58b673c47ca48fd4845a Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Tue, 14 May 2024 16:02:59 +0300 Subject: [PATCH 1117/1688] Collect feed info publisher data into object --- .../apis/gtfs/datafetchers/FeedImpl.java | 16 ++++++---------- .../gtfs/generated/GraphQLDataFetchers.java | 9 +++++++-- .../model/organization/FeedPublisher.java | 10 ++++++++++ .../opentripplanner/apis/gtfs/schema.graphqls | 19 ++++++++++++++----- .../apis/gtfs/expectations/feedinfo.json | 6 ++++-- .../apis/gtfs/queries/feedinfo.graphql | 6 ++++-- 6 files changed, 45 insertions(+), 21 deletions(-) create mode 100644 src/main/java/org/opentripplanner/transit/model/organization/FeedPublisher.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java index 6cf8d27b262..47b0fc7e106 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java @@ -13,6 +13,7 @@ import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.services.TransitAlertService; import org.opentripplanner.transit.model.organization.Agency; +import org.opentripplanner.transit.model.organization.FeedPublisher; import org.opentripplanner.transit.service.TransitService; public class FeedImpl implements GraphQLDataFetchers.GraphQLFeed { @@ -65,18 +66,13 @@ public DataFetcher feedId() { } @Override - public DataFetcher publisherName() { + public DataFetcher publisher() { return environment -> { String id = getSource(environment); - return getTransitService(environment).getFeedInfo(id).getPublisherName(); - }; - } - - @Override - public DataFetcher publisherUrl() { - return environment -> { - String id = getSource(environment); - return getTransitService(environment).getFeedInfo(id).getPublisherUrl(); + return new FeedPublisher( + getTransitService(environment).getFeedInfo(id).getPublisherName(), + getTransitService(environment).getFeedInfo(id).getPublisherUrl() + ); }; } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 6a2e398cd91..455503ad8ef 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -381,9 +381,14 @@ public interface GraphQLFeed { public DataFetcher feedId(); - public DataFetcher publisherName(); + public DataFetcher publisher(); + } + + /** Feed publisher information */ + public interface GraphQLFeedPublisher { + public DataFetcher name(); - public DataFetcher publisherUrl(); + public DataFetcher url(); } public interface GraphQLGeometry { diff --git a/src/main/java/org/opentripplanner/transit/model/organization/FeedPublisher.java b/src/main/java/org/opentripplanner/transit/model/organization/FeedPublisher.java new file mode 100644 index 00000000000..6c9a120e81b --- /dev/null +++ b/src/main/java/org/opentripplanner/transit/model/organization/FeedPublisher.java @@ -0,0 +1,10 @@ +package org.opentripplanner.transit.model.organization; + +import java.util.Objects; + +public record FeedPublisher(String name, String url) { + public FeedPublisher { + Objects.requireNonNull(name); + Objects.requireNonNull(url); + } +} diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index b81ebdff4c7..15de75f5408 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -974,6 +974,18 @@ type fareComponent { routes: [Route] @deprecated } + +""" +Feed publisher information +""" +type FeedPublisher { + """Name of feed publisher""" + name: String! + + """Web address of feed publisher""" + url: String! +} + """ A feed provides routing data (stops, routes, timetables, etc.) from one or more public transport agencies. """ @@ -984,11 +996,8 @@ type Feed { """List of agencies which provide data to this feed""" agencies: [Agency] - """Name of feed publisher""" - publisherName: String! - - """Web address of feed publisher""" - publisherUrl: String! + """publisher""" + publisher: FeedPublisher! """ Alerts relevant for the feed. diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json index a3dbe43b0f1..3cf3bd06d66 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/feedinfo.json @@ -8,8 +8,10 @@ "url" : "www.otp-foo.bar" } ], - "publisherUrl" : "www.z.org", - "publisherName" : "publisher" + "publisher" : { + "name" : "publisher", + "url" : "www.z.org" + } } ] } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql index f0737202786..68516d26237 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql @@ -4,7 +4,9 @@ name url } - publisherUrl - publisherName + publisher { + name + url + } } } \ No newline at end of file From 6329621caf63afd11b53405ddc303413c6ead5e4 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 14 May 2024 13:57:48 +0000 Subject: [PATCH 1118/1688] Add changelog entry for #5822 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 6943759a1ae..872ee7a96bb 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -18,6 +18,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) - Fix handling of implicit access and egress mode parameters. [#5821](https://github.com/opentripplanner/OpenTripPlanner/pull/5821) - Add prettier:write to docs and rephrase slightly [ci skip] [#5831](https://github.com/opentripplanner/OpenTripPlanner/pull/5831) +- Make naming of stopTransferCosts/stopBoardAlightCosts consistent [#5822](https://github.com/opentripplanner/OpenTripPlanner/pull/5822) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From aff398abbbc126e0c7b96059c3e4fe7fddd690ec Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 14 May 2024 22:29:44 +0200 Subject: [PATCH 1119/1688] Update link in magidoc documentation --- magidoc.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/magidoc.mjs b/magidoc.mjs index a57b17a4308..4fea5e4e127 100644 --- a/magidoc.mjs +++ b/magidoc.mjs @@ -29,7 +29,7 @@ at http://localhost:8080/graphiql This API is activated by default. To learn how to deactivate it, read the -[documentation](https://docs.opentripplanner.org/en/dev-2.x/apis/GTFS-GraphQ-API/). +[documentation](https://docs.opentripplanner.org/en/dev-2.x/apis/GTFS-GraphQL-API/). `, }], appTitle: 'OTP GTFS GraphQL API', From c1d8f5be03a8b802f43ec308a30c32da8aa7cbaf Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 15 May 2024 08:19:34 +0300 Subject: [PATCH 1120/1688] Move FeedPublisher class to more suitable directory path --- .../org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java | 2 +- .../model/organization => apis/gtfs/model}/FeedPublisher.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename src/main/java/org/opentripplanner/{transit/model/organization => apis/gtfs/model}/FeedPublisher.java (76%) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java index 47b0fc7e106..9c5b17a62e2 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java @@ -9,11 +9,11 @@ import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; +import org.opentripplanner.apis.gtfs.model.FeedPublisher; import org.opentripplanner.routing.alertpatch.EntitySelector; import org.opentripplanner.routing.alertpatch.TransitAlert; import org.opentripplanner.routing.services.TransitAlertService; import org.opentripplanner.transit.model.organization.Agency; -import org.opentripplanner.transit.model.organization.FeedPublisher; import org.opentripplanner.transit.service.TransitService; public class FeedImpl implements GraphQLDataFetchers.GraphQLFeed { diff --git a/src/main/java/org/opentripplanner/transit/model/organization/FeedPublisher.java b/src/main/java/org/opentripplanner/apis/gtfs/model/FeedPublisher.java similarity index 76% rename from src/main/java/org/opentripplanner/transit/model/organization/FeedPublisher.java rename to src/main/java/org/opentripplanner/apis/gtfs/model/FeedPublisher.java index 6c9a120e81b..ba524b537f0 100644 --- a/src/main/java/org/opentripplanner/transit/model/organization/FeedPublisher.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/FeedPublisher.java @@ -1,4 +1,4 @@ -package org.opentripplanner.transit.model.organization; +package org.opentripplanner.apis.gtfs.model; import java.util.Objects; From 835b4091af527ee8e0f5d8a718258a2eebe48c50 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 15 May 2024 01:19:19 +0000 Subject: [PATCH 1121/1688] chore(deps): update dependency org.mockito:mockito-core to v5.12.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 79dd2c45d50..60570418622 100644 --- a/pom.xml +++ b/pom.xml @@ -699,7 +699,7 @@ org.mockito mockito-core - 5.11.0 + 5.12.0 test From 62822005e2ed22733dcdcba199a8cb3695fa1fc0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 15 May 2024 11:45:25 +0200 Subject: [PATCH 1122/1688] Remove non-standard trip fare ID --- .../ext/restapi/mapping/TripMapper.java | 1 - .../org/opentripplanner/gtfs/mapping/TripMapper.java | 1 - .../opentripplanner/transit/model/timetable/Trip.java | 11 +---------- .../transit/model/timetable/TripBuilder.java | 11 ----------- .../opentripplanner/gtfs/mapping/TripMapperTest.java | 4 ---- .../transit/model/timetable/TripTest.java | 4 ---- 6 files changed, 1 insertion(+), 31 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java index f4894a4a7a3..1f7abd3897a 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/TripMapper.java @@ -31,7 +31,6 @@ public static ApiTrip mapToApi(Trip obj) { api.shapeId = FeedScopedIdMapper.mapToApi(obj.getShapeId()); api.wheelchairAccessible = WheelchairAccessibilityMapper.mapToApi(obj.getWheelchairBoarding()); api.bikesAllowed = BikeAccessMapper.mapToApi(obj.getBikesAllowed()); - api.fareId = obj.getGtfsFareId(); return api; } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index a80ae035ed1..d7a4dfd403e 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -60,7 +60,6 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { lhs.withShapeId(AgencyAndIdMapper.mapAgencyAndId(rhs.getShapeId())); lhs.withWheelchairBoarding(WheelchairAccessibilityMapper.map(rhs.getWheelchairAccessible())); lhs.withBikesAllowed(BikeAccessMapper.mapForTrip(rhs)); - lhs.withGtfsFareId(rhs.getFareId()); return lhs.build(); } diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java b/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java index 9e6795e5140..5a1e9150e78 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/Trip.java @@ -36,7 +36,6 @@ public final class Trip extends AbstractTransitEntity impleme private final Accessibility wheelchairBoarding; private final String gtfsBlockId; - private final String gtfsFareId; private final String netexInternalPlanningCode; private final TripAlteration netexAlteration; @@ -65,7 +64,6 @@ public final class Trip extends AbstractTransitEntity impleme this.headsign = builder.getHeadsign(); this.shapeId = builder.getShapeId(); this.gtfsBlockId = builder.getGtfsBlockId(); - this.gtfsFareId = builder.getGtfsFareId(); this.netexInternalPlanningCode = builder.getNetexInternalPlanningCode(); } @@ -149,12 +147,6 @@ public String getGtfsBlockId() { return gtfsBlockId; } - /** Custom extension for KCM to specify a fare per-trip */ - @Nullable - public String getGtfsFareId() { - return gtfsFareId; - } - /** * Internal code (non-public identifier) for the journey (e.g. train- or trip number from the * planners' tool). This is kept to ensure compatibility with legacy planning systems. In NeTEx @@ -209,8 +201,7 @@ public boolean sameAs(@Nonnull Trip other) { Objects.equals(this.direction, other.direction) && Objects.equals(this.bikesAllowed, other.bikesAllowed) && Objects.equals(this.wheelchairBoarding, other.wheelchairBoarding) && - Objects.equals(this.netexAlteration, other.netexAlteration) && - Objects.equals(this.gtfsFareId, other.gtfsFareId) + Objects.equals(this.netexAlteration, other.netexAlteration) ); } diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java b/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java index fd51b9035c7..063dfe10da2 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/TripBuilder.java @@ -23,7 +23,6 @@ public class TripBuilder extends AbstractEntityBuilder { private BikeAccess bikesAllowed; private Accessibility wheelchairBoarding; private String gtfsBlockId; - private String gtfsFareId; private String netexInternalPlanningCode; private TripAlteration netexAlteration; @@ -47,7 +46,6 @@ public class TripBuilder extends AbstractEntityBuilder { this.bikesAllowed = original.getBikesAllowed(); this.wheelchairBoarding = original.getWheelchairBoarding(); this.netexInternalPlanningCode = original.getNetexInternalPlanningCode(); - this.gtfsFareId = original.getGtfsFareId(); } public Operator getOperator() { @@ -176,15 +174,6 @@ public TripBuilder withNetexAlteration(TripAlteration netexAlteration) { return this; } - public String getGtfsFareId() { - return gtfsFareId; - } - - public TripBuilder withGtfsFareId(String gtfsFareId) { - this.gtfsFareId = gtfsFareId; - return this; - } - @Override protected Trip buildFromValues() { return new Trip(this); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java index 4f0c70f22d2..12c513b28d9 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java @@ -23,7 +23,6 @@ public class TripMapperTest { private static final int BIKES_ALLOWED = 1; private static final String BLOCK_ID = "Block Id"; private static final int DIRECTION_ID = 1; - private static final String FARE_ID = "Fare Id"; private static final String TRIP_HEADSIGN = "Trip Headsign"; private static final String TRIP_SHORT_NAME = "Trip Short Name"; @@ -46,7 +45,6 @@ public class TripMapperTest { TRIP.setBikesAllowed(BIKES_ALLOWED); TRIP.setBlockId(BLOCK_ID); TRIP.setDirectionId(Integer.toString(DIRECTION_ID)); - TRIP.setFareId(FARE_ID); TRIP.setRoute(data.route); TRIP.setServiceId(AGENCY_AND_ID); TRIP.setShapeId(AGENCY_AND_ID); @@ -69,7 +67,6 @@ public void testMap() throws Exception { assertEquals("A:1", result.getId().toString()); assertEquals(BLOCK_ID, result.getGtfsBlockId()); assertEquals(Direction.INBOUND, result.getDirection()); - assertEquals(FARE_ID, result.getGtfsFareId()); assertNotNull(result.getRoute()); assertEquals("A:1", result.getServiceId().toString()); assertEquals("A:1", result.getShapeId().toString()); @@ -91,7 +88,6 @@ public void testMapWithNulls() throws Exception { assertNotNull(result.getRoute()); assertNull(result.getGtfsBlockId()); - assertNull(result.getGtfsFareId()); assertNull(result.getServiceId()); assertNull(result.getShapeId()); assertNull(result.getHeadsign()); diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java index 098c1d0994a..3a3f35643fa 100644 --- a/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/TripTest.java @@ -26,7 +26,6 @@ class TripTest { private static final BikeAccess BIKE_ACCESS = BikeAccess.ALLOWED; private static final TransitMode TRANSIT_MODE = TransitMode.BUS; private static final String BLOCK_ID = "blockId"; - private static final String FARE_ID = "fareId"; private static final TripAlteration TRIP_ALTERATION = TripAlteration.CANCELLATION; private static final String NETEX_SUBMODE_NAME = "submode"; private static final SubMode NETEX_SUBMODE = SubMode.of(NETEX_SUBMODE_NAME); @@ -46,7 +45,6 @@ class TripTest { .withBikesAllowed(BIKE_ACCESS) .withMode(TRANSIT_MODE) .withGtfsBlockId(BLOCK_ID) - .withGtfsFareId(FARE_ID) .withNetexAlteration(TRIP_ALTERATION) .withNetexSubmode(NETEX_SUBMODE_NAME) .withNetexInternalPlanningCode(NETEX_INTERNAL_PLANNING_CODE) @@ -88,7 +86,6 @@ void copy() { assertEquals(BIKE_ACCESS, copy.getBikesAllowed()); assertEquals(TRANSIT_MODE, copy.getMode()); assertEquals(BLOCK_ID, copy.getGtfsBlockId()); - assertEquals(FARE_ID, copy.getGtfsFareId()); assertEquals(TRIP_ALTERATION, copy.getNetexAlteration()); assertEquals(NETEX_SUBMODE, copy.getNetexSubMode()); assertEquals(NETEX_INTERNAL_PLANNING_CODE, copy.getNetexInternalPlanningCode()); @@ -115,7 +112,6 @@ void sameAs() { assertFalse(subject.sameAs(subject.copy().withBikesAllowed(BikeAccess.NOT_ALLOWED).build())); assertFalse(subject.sameAs(subject.copy().withMode(TransitMode.RAIL).build())); assertFalse(subject.sameAs(subject.copy().withGtfsBlockId("X").build())); - assertFalse(subject.sameAs(subject.copy().withGtfsFareId("X").build())); assertFalse( subject.sameAs(subject.copy().withNetexAlteration(TripAlteration.REPLACED).build()) ); From 6197cada88f6fa3e39780a60e6e558d1dbedd02f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 15 May 2024 15:20:33 +0200 Subject: [PATCH 1123/1688] Fix grammar [ci skip] --- doc-templates/sandbox/siri/SiriAzureUpdater.md | 5 +++-- docs/sandbox/siri/SiriAzureUpdater.md | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/doc-templates/sandbox/siri/SiriAzureUpdater.md b/doc-templates/sandbox/siri/SiriAzureUpdater.md index eb092ddd08d..85e22e30bda 100644 --- a/doc-templates/sandbox/siri/SiriAzureUpdater.md +++ b/doc-templates/sandbox/siri/SiriAzureUpdater.md @@ -1,7 +1,8 @@ # Siri Azure Updater -It is sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages through *Azure Service Bus*. -IT also OTP to download historical data from en HTTP endpoint on startup. +This is a sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages +through *Azure Service Bus*. +It also enables OTP to download historical data from en HTTP endpoint on startup. ## Contact Info diff --git a/docs/sandbox/siri/SiriAzureUpdater.md b/docs/sandbox/siri/SiriAzureUpdater.md index c6ddf9f3ebe..7b29e802f21 100644 --- a/docs/sandbox/siri/SiriAzureUpdater.md +++ b/docs/sandbox/siri/SiriAzureUpdater.md @@ -1,7 +1,8 @@ # Siri Azure Updater -It is sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages through *Azure Service Bus*. -IT also OTP to download historical data from en HTTP endpoint on startup. +This is a sandbox extension developed by Skånetrafiken that allows OTP to fetch Siri ET & SX messages +through *Azure Service Bus*. +It also enables OTP to download historical data from en HTTP endpoint on startup. ## Contact Info From 722d2cc5f0c52e0a8a20eac66b0bc0428f730671 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Tue, 14 May 2024 16:54:10 +0200 Subject: [PATCH 1124/1688] Add some tests for SiriTimetableSnapshotSource --- .../ext/siri/SiriEtBuilder.java | 262 +++++++++ .../siri/SiriTimetableSnapshotSourceTest.java | 523 ++++++++++++++++++ .../ext/siri/EntityResolver.java | 13 +- .../framework/time/DateUtils.java | 15 +- .../org/opentripplanner/model/Timetable.java | 2 +- .../org/opentripplanner/DateTimeHelper.java | 30 + .../model/_data/TransitModelForTest.java | 10 +- 7 files changed, 846 insertions(+), 9 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java create mode 100644 src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java create mode 100644 src/test/java/org/opentripplanner/DateTimeHelper.java diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java new file mode 100644 index 00000000000..11f9d137642 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java @@ -0,0 +1,262 @@ +package org.opentripplanner.ext.siri; + +import java.math.BigInteger; +import java.util.ArrayList; +import java.util.List; +import java.util.function.Function; +import javax.annotation.Nullable; +import org.opentripplanner.DateTimeHelper; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.StopLocation; +import uk.org.siri.siri20.DatedVehicleJourneyRef; +import uk.org.siri.siri20.EstimatedCall; +import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; +import uk.org.siri.siri20.EstimatedVehicleJourney; +import uk.org.siri.siri20.EstimatedVersionFrameStructure; +import uk.org.siri.siri20.LineRef; +import uk.org.siri.siri20.OperatorRefStructure; +import uk.org.siri.siri20.QuayRefStructure; +import uk.org.siri.siri20.RecordedCall; +import uk.org.siri.siri20.StopAssignmentStructure; +import uk.org.siri.siri20.StopPointRef; +import uk.org.siri.siri20.VehicleJourneyRef; + +/** + * This is a helper class for constucting Siri ET messages to use in tests. + */ +public class SiriEtBuilder { + + private final EstimatedVehicleJourney evj; + private final DateTimeHelper dateTimeHelper; + + public SiriEtBuilder(DateTimeHelper dateTimeHelper) { + this.dateTimeHelper = dateTimeHelper; + this.evj = new EstimatedVehicleJourney(); + + // Set default values + evj.setMonitored(true); + } + + public List buildEstimatedTimetableDeliveries() { + var versionFrame = new EstimatedVersionFrameStructure(); + versionFrame.getEstimatedVehicleJourneies().add(evj); + + var etd = new EstimatedTimetableDeliveryStructure(); + etd.getEstimatedJourneyVersionFrames().add(versionFrame); + return List.of(etd); + } + + public SiriEtBuilder withCancellation(boolean canceled) { + evj.setCancellation(canceled); + return this; + } + + public SiriEtBuilder withMonitored(boolean monitored) { + evj.setMonitored(monitored); + return this; + } + + public SiriEtBuilder withIsExtraJourney(boolean isExtraJourney) { + evj.setExtraJourney(isExtraJourney); + return this; + } + + public SiriEtBuilder withDatedVehicleJourneyRef(String datedServiceJourneyId) { + var ref = new DatedVehicleJourneyRef(); + ref.setValue(datedServiceJourneyId); + evj.setDatedVehicleJourneyRef(ref); + return this; + } + + public SiriEtBuilder withEstimatedVehicleJourneyCode(String estimatedVehicleJourneyCode) { + evj.setEstimatedVehicleJourneyCode(estimatedVehicleJourneyCode); + return this; + } + + public SiriEtBuilder withOperatorRef(String operatorRef) { + var ref = new OperatorRefStructure(); + ref.setValue(operatorRef); + evj.setOperatorRef(ref); + return this; + } + + public SiriEtBuilder withLineRef(String lineRef) { + var ref = new LineRef(); + ref.setValue(lineRef); + evj.setLineRef(ref); + return this; + } + + public SiriEtBuilder withRecordedCalls( + Function producer + ) { + if (evj.getEstimatedCalls() != null) { + // If we call this after estimatedCalls, the ordering will be messed up + throw new RuntimeException( + "You need to call withRecordedCalls() before withEstimatedCalls()" + ); + } + var builder = new RecordedCallsBuilder(dateTimeHelper, 0); + + builder = producer.apply(builder); + + var calls = new EstimatedVehicleJourney.RecordedCalls(); + builder.build().forEach(call -> calls.getRecordedCalls().add(call)); + evj.setRecordedCalls(calls); + return this; + } + + public SiriEtBuilder withEstimatedCalls( + Function producer + ) { + int offset = evj.getRecordedCalls() == null + ? 0 + : evj.getRecordedCalls().getRecordedCalls().size(); + var builder = new EstimatedCallsBuilder(dateTimeHelper, offset); + + builder = producer.apply(builder); + + var calls = new EstimatedVehicleJourney.EstimatedCalls(); + builder.build().forEach(call -> calls.getEstimatedCalls().add(call)); + evj.setEstimatedCalls(calls); + return this; + } + + public SiriEtBuilder withVehicleJourneyRef(String id) { + var ref = new VehicleJourneyRef(); + ref.setValue(id); + evj.setVehicleJourneyRef(ref); + return this; + } + + public static class RecordedCallsBuilder { + + private final ArrayList calls; + private final int orderOffset; + private final DateTimeHelper dateTimeHelper; + + public RecordedCallsBuilder(DateTimeHelper dateTimeHelper, int orderOffset) { + this.dateTimeHelper = dateTimeHelper; + this.orderOffset = orderOffset; + this.calls = new ArrayList<>(); + } + + public RecordedCallsBuilder call(StopLocation stop) { + var call = new RecordedCall(); + call.setOrder(BigInteger.valueOf(orderOffset + calls.size())); + + var ref = new StopPointRef(); + ref.setValue(stop.getId().getId()); + call.setStopPointRef(ref); + + calls.add(call); + return this; + } + + public RecordedCallsBuilder arriveAimedActual(String aimedTime, String actualTime) { + var call = calls.getLast(); + call.setAimedArrivalTime(dateTimeHelper.zonedDateTime(aimedTime)); + call.setActualArrivalTime(dateTimeHelper.zonedDateTime(actualTime)); + return this; + } + + public RecordedCallsBuilder departAimedActual(String aimedTime, String actualTime) { + var call = calls.getLast(); + call.setAimedDepartureTime(dateTimeHelper.zonedDateTime(aimedTime)); + call.setActualDepartureTime(dateTimeHelper.zonedDateTime(actualTime)); + return this; + } + + public RecordedCallsBuilder withIsExtraCall(boolean extra) { + var call = calls.getLast(); + call.setExtraCall(extra); + return this; + } + + public RecordedCallsBuilder withIsCancellation(boolean cancel) { + var call = calls.getLast(); + call.setCancellation(cancel); + return this; + } + + public List build() { + return calls; + } + } + + public static class EstimatedCallsBuilder { + + private final ArrayList calls; + private final int orderOffset; + private final DateTimeHelper dateTimeHelper; + + public EstimatedCallsBuilder(DateTimeHelper dateTimeHelper, int orderOffset) { + this.dateTimeHelper = dateTimeHelper; + this.orderOffset = orderOffset; + this.calls = new ArrayList<>(); + } + + public EstimatedCallsBuilder call(StopLocation stop) { + var call = new EstimatedCall(); + call.setOrder(BigInteger.valueOf(orderOffset + calls.size())); + + var ref = new StopPointRef(); + ref.setValue(stop.getId().getId()); + call.setStopPointRef(ref); + + calls.add(call); + return this; + } + + public EstimatedCallsBuilder arriveAimedExpected(String aimedTime, String expectedTime) { + var call = calls.getLast(); + call.setAimedArrivalTime(dateTimeHelper.zonedDateTime(aimedTime)); + call.setExpectedArrivalTime(dateTimeHelper.zonedDateTime(expectedTime)); + return this; + } + + public EstimatedCallsBuilder departAimedExpected(String aimedTime, String expectedTime) { + var call = calls.getLast(); + call.setAimedDepartureTime(dateTimeHelper.zonedDateTime(aimedTime)); + call.setExpectedDepartureTime(dateTimeHelper.zonedDateTime(expectedTime)); + return this; + } + + public EstimatedCallsBuilder withIsExtraCall(boolean extra) { + var call = calls.getLast(); + call.setExtraCall(extra); + return this; + } + + public EstimatedCallsBuilder withIsCancellation(boolean cancel) { + var call = calls.getLast(); + call.setCancellation(cancel); + return this; + } + + public EstimatedCallsBuilder withArrivalStopAssignment( + RegularStop aimedQuay, + @Nullable RegularStop expectedQuay + ) { + var stopAssignmentStructure = new StopAssignmentStructure(); + + var aimed = new QuayRefStructure(); + aimed.setValue(aimedQuay.getId().getId()); + stopAssignmentStructure.setAimedQuayRef(aimed); + + if (expectedQuay != null) { + var expected = new QuayRefStructure(); + expected.setValue(expectedQuay.getId().getId()); + stopAssignmentStructure.setExpectedQuayRef(expected); + } + + var call = calls.getLast(); + call.setArrivalStopAssignment(stopAssignmentStructure); + return this; + } + + public List build() { + return calls; + } + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java new file mode 100644 index 00000000000..0d98cd62e70 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -0,0 +1,523 @@ +package org.opentripplanner.ext.siri; + +import static org.junit.jupiter.api.Assertions.*; + +import java.time.Duration; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import org.junit.jupiter.api.Test; +import org.opentripplanner.DateTimeHelper; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; +import org.opentripplanner.model.PickDrop; +import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.calendar.CalendarServiceData; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.Station; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.TripOnServiceDate; +import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.transit.model.timetable.TripTimesFactory; +import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.StopModel; +import org.opentripplanner.transit.service.TransitModel; +import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.updater.TimetableSnapshotSourceParameters; +import org.opentripplanner.updater.spi.UpdateError; +import org.opentripplanner.updater.spi.UpdateResult; +import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; + +class SiriTimetableSnapshotSourceTest { + + // TODO testcases: + // Error case: Et message contains a call for stop that is not expected and is not marked as + // extra call. This silently works currently by ignoring the extra call, but should probably fail. + + @Test + void testCancelTrip() { + var env = new RealtimeTestEnvironment(); + + assertEquals(RealTimeState.SCHEDULED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withCancellation(true) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertEquals(1, result.successful()); + assertEquals(RealTimeState.CANCELED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); + } + + @Test + void testAddJourney() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withEstimatedVehicleJourneyCode("newJourney") + .withIsExtraJourney(true) + .withOperatorRef(env.operator1Id.getId()) + .withLineRef(env.route1Id.getId()) + .withRecordedCalls(builder -> builder.call(env.stopC1).departAimedActual("00:01", "00:02")) + .withEstimatedCalls(builder -> builder.call(env.stopD1).arriveAimedExpected("00:03", "00:04")) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertEquals(1, result.successful()); + var tripTimes = env.getTripTimesForTrip("newJourney"); + assertEquals(RealTimeState.ADDED, tripTimes.getRealTimeState()); + assertEquals(2 * 60, tripTimes.getDepartureTime(0)); + assertEquals(4 * 60, tripTimes.getDepartureTime(1)); + } + + @Test + void testReplaceJourney() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withEstimatedVehicleJourneyCode("newJourney") + .withIsExtraJourney(true) + // replace trip1 + .withVehicleJourneyRef(env.trip1.getId().getId()) + .withOperatorRef(env.operator1Id.getId()) + .withLineRef(env.route1Id.getId()) + .withRecordedCalls(builder -> builder.call(env.stopA1).departAimedActual("00:01", "00:02")) + .withEstimatedCalls(builder -> builder.call(env.stopC1).arriveAimedExpected("00:03", "00:04")) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertEquals(1, result.successful()); + + var tripTimes = env.getTripTimesForTrip("newJourney"); + var pattern = env.getPatternForTrip(env.id("newJourney")); + assertEquals(RealTimeState.ADDED, tripTimes.getRealTimeState()); + assertEquals(2 * 60, tripTimes.getDepartureTime(0)); + assertEquals(4 * 60, tripTimes.getDepartureTime(1)); + assertEquals(env.stopA1.getId(), pattern.getStop(0).getId()); + assertEquals(env.stopC1.getId(), pattern.getStop(1).getId()); + + var originalTripTimes = env.getTripTimesForTrip(env.trip1); + assertEquals(RealTimeState.SCHEDULED, originalTripTimes.getRealTimeState()); + } + + /** + * Update calls without changing the pattern + */ + @Test + void testUpdateJourney() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withRecordedCalls(builder -> + builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") + ) + .withEstimatedCalls(builder -> + builder.call(env.stopB1).arriveAimedExpected("00:00:20", "00:00:25") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertEquals(1, result.successful()); + + var tripTimes = env.getTripTimesForTrip(env.trip1); + assertEquals(RealTimeState.UPDATED, tripTimes.getRealTimeState()); + assertEquals(11, tripTimes.getScheduledDepartureTime(0)); + assertEquals(15, tripTimes.getDepartureTime(0)); + assertEquals(20, tripTimes.getScheduledArrivalTime(1)); + assertEquals(25, tripTimes.getArrivalTime(1)); + } + + /** + * Change quay on a trip + */ + @Test + void testChangeQuay() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withRecordedCalls(builder -> + builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") + ) + .withEstimatedCalls(builder -> + builder.call(env.stopB2).arriveAimedExpected("00:00:20", "00:00:33") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertEquals(1, result.successful()); + + var pattern = env.getPatternForTrip(env.trip1.getId()); + var tripTimes = env.getTripTimesForTrip(env.trip1); + assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); + assertEquals(11, tripTimes.getScheduledDepartureTime(0)); + assertEquals(15, tripTimes.getDepartureTime(0)); + assertEquals(20, tripTimes.getScheduledArrivalTime(1)); + assertEquals(33, tripTimes.getArrivalTime(1)); + assertEquals(env.stopB2, pattern.getStop(1)); + } + + @Test + void testCancelStop() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip2.getId().getId()) + .withEstimatedCalls(builder -> + builder + .call(env.stopA1) + .departAimedExpected("00:01:01", "00:01:01") + .call(env.stopB1) + .withIsCancellation(true) + .call(env.stopC1) + .arriveAimedExpected("00:01:30", "00:01:30") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertEquals(1, result.successful()); + + var pattern = env.getPatternForTrip(env.trip2.getId()); + + assertEquals(PickDrop.SCHEDULED, pattern.getAlightType(0)); + assertEquals(PickDrop.CANCELLED, pattern.getAlightType(1)); + assertEquals(PickDrop.SCHEDULED, pattern.getAlightType(2)); + } + + // Ignore this for now since it isn't supported + // TODO: support this + // @Test + void testAddStop() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withRecordedCalls(builder -> + builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") + ) + .withEstimatedCalls(builder -> + builder + .call(env.stopD1) + .withIsExtraCall(true) + .arriveAimedExpected("00:00:19", "00:00:20") + .departAimedExpected("00:00:24", "00:00:25") + .call(env.stopB1) + .arriveAimedExpected("00:00:20", "00:00:33") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertEquals(1, result.successful()); + + var pattern = env.getPatternForTrip(env.trip1.getId()); + var tripTimes = env.getTripTimesForTrip(env.trip1); + assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); + assertEquals(11, tripTimes.getScheduledDepartureTime(0)); + assertEquals(15, tripTimes.getDepartureTime(0)); + + // Should it work to get the scheduled times from an extra call? + assertEquals(19, tripTimes.getScheduledArrivalTime(1)); + assertEquals(24, tripTimes.getScheduledDepartureTime(1)); + + assertEquals(20, tripTimes.getDepartureTime(1)); + assertEquals(25, tripTimes.getDepartureTime(1)); + + assertEquals(20, tripTimes.getScheduledArrivalTime(2)); + assertEquals(33, tripTimes.getArrivalTime(2)); + assertEquals(List.of(env.stopA1, env.stopD1, env.stopB1), pattern.getStops()); + } + + ///////////////// + // Error cases // + ///////////////// + + @Test + void testNotMonitored() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withMonitored(false) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertFailure(result, UpdateError.UpdateErrorType.NOT_MONITORED); + } + + @Test + void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef("newJourney") + .withIsExtraJourney(true) + .withVehicleJourneyRef(env.trip1.getId().getId()) + .withOperatorRef(env.operator1Id.getId()) + .withLineRef(env.route1Id.getId()) + .withEstimatedCalls(builder -> + builder + .call(env.stopA1) + .departAimedExpected("00:01", "00:02") + .call(env.stopC1) + .arriveAimedExpected("00:03", "00:04") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + // TODO: this should have a more specific error type + assertFailure(result, UpdateError.UpdateErrorType.UNKNOWN); + } + + @Test + void testNegativeHopTime() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withRecordedCalls(builder -> + builder + .call(env.stopA1) + .departAimedActual("00:00:11", "00:00:15") + .call(env.stopB1) + .arriveAimedActual("00:00:20", "00:00:14") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertFailure(result, UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME); + } + + @Test + void testNegativeDwellTime() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip2.getId().getId()) + .withRecordedCalls(builder -> + builder + .call(env.stopA1) + .departAimedActual("00:01:01", "00:01:01") + .call(env.stopB1) + .arriveAimedActual("00:01:10", "00:01:13") + .departAimedActual("00:01:11", "00:01:12") + .call(env.stopB1) + .arriveAimedActual("00:01:20", "00:01:20") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertFailure(result, UpdateError.UpdateErrorType.NEGATIVE_DWELL_TIME); + } + + private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType errorType) { + assertEquals(result.failures().keySet(), Set.of(errorType)); + } + + private static class RealtimeTestEnvironment { + + private final TransitModelForTest testModel = TransitModelForTest.of(); + public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); + public final Station stationA = testModel.station("A").build(); + public final Station stationB = testModel.station("B").build(); + public final Station stationC = testModel.station("C").build(); + public final Station stationD = testModel.station("D").build(); + public final RegularStop stopA1 = testModel.stop("A1").withParentStation(stationA).build(); + public final RegularStop stopB1 = testModel.stop("B1").withParentStation(stationB).build(); + public final RegularStop stopB2 = testModel.stop("B2").withParentStation(stationB).build(); + public final RegularStop stopC1 = testModel.stop("C1").withParentStation(stationC).build(); + public final RegularStop stopD1 = testModel.stop("D1").withParentStation(stationD).build(); + public final StopModel stopModel = testModel + .stopModelBuilder() + .withRegularStop(stopA1) + .withRegularStop(stopB1) + .withRegularStop(stopB2) + .withRegularStop(stopC1) + .withRegularStop(stopD1) + .build(); + + public final LocalDate serviceDate = LocalDate.of(2024, 5, 8); + public TransitModel transitModel; + public SiriTimetableSnapshotSource snapshotSource; + + public final FeedScopedId operator1Id = TransitModelForTest.id("TestOperator1"); + public final FeedScopedId route1Id = TransitModelForTest.id("TestRoute1"); + public Trip trip1; + public Trip trip2; + + public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, serviceDate); + + public RealtimeTestEnvironment() { + transitModel = new TransitModel(stopModel, new Deduplicator()); + transitModel.initTimeZone(timeZone); + transitModel.addAgency(TransitModelForTest.AGENCY); + + Route route1 = TransitModelForTest.route(route1Id).build(); + + trip1 = + createTrip( + "TestTrip1", + route1, + List.of(new Stop(stopA1, 10, 11), new Stop(stopB1, 20, 21)) + ); + trip2 = + createTrip( + "TestTrip2", + route1, + List.of(new Stop(stopA1, 60, 61), new Stop(stopB1, 70, 71), new Stop(stopC1, 80, 81)) + ); + + CalendarServiceData calendarServiceData = new CalendarServiceData(); + var cal_id = TransitModelForTest.id("CAL_1"); + calendarServiceData.putServiceDatesForServiceId( + cal_id, + List.of(serviceDate.minusDays(1), serviceDate, serviceDate.plusDays(1)) + ); + transitModel.getServiceCodes().put(cal_id, 0); + transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); + + transitModel.index(); + + var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); + snapshotSource = new SiriTimetableSnapshotSource(parameters, transitModel); + } + + private record Stop(RegularStop stop, int arrivalTime, int departureTime) {} + + private Trip createTrip(String id, Route route, List stops) { + var trip = Trip.of(id(id)).withRoute(route).build(); + + var tripOnServiceDate = TripOnServiceDate + .of(trip.getId()) + .withTrip(trip) + .withServiceDate(serviceDate) + .build(); + + transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate); + + var stopTimes = IntStream + .range(0, stops.size()) + .mapToObj(i -> { + var stop = stops.get(i); + return createStopTime(trip, i, stop.stop(), stop.arrivalTime(), stop.departureTime()); + }) + .collect(Collectors.toList()); + + TripTimes tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, null); + + final TripPattern pattern = TransitModelForTest + .tripPattern(id + "Pattern", route) + .withStopPattern(TransitModelForTest.stopPattern(stops.stream().map(Stop::stop).toList())) + .build(); + pattern.add(tripTimes); + + transitModel.addTripPattern(pattern.getId(), pattern); + + return trip; + } + + public FeedScopedId id(String id) { + return TransitModelForTest.id(id); + } + + /** + * Returns a new fresh TransitService + */ + public TransitService getTransitService() { + return new DefaultTransitService(transitModel); + } + + public EntityResolver getEntityResolver() { + return new EntityResolver(getTransitService(), getFeedId()); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId) { + return getPatternForTrip(tripId, serviceDate); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { + var transitService = getTransitService(); + var trip = transitService.getTripOnServiceDateById(tripId); + return transitService.getPatternForTrip(trip.getTrip(), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(Trip trip) { + return getTripTimesForTrip(trip.getId(), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(String id) { + return getTripTimesForTrip(id(id), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on a serviceDate + */ + public TripTimes getTripTimesForTrip(FeedScopedId tripId, LocalDate serviceDate) { + var transitService = getTransitService(); + var trip = transitService.getTripOnServiceDateById(tripId); + var pattern = transitService.getPatternForTrip(trip.getTrip(), serviceDate); + var timetable = transitService.getTimetableForTripPattern(pattern, serviceDate); + return timetable.getTripTimes(tripId); + } + + public DateTimeHelper getDateTimeHelper() { + return dateTimeHelper; + } + + private StopTime createStopTime( + Trip trip, + int stopSequence, + StopLocation stop, + int arrivalTime, + int departureTime + ) { + var st = new StopTime(); + st.setTrip(trip); + st.setStopSequence(stopSequence); + st.setStop(stop); + st.setArrivalTime(arrivalTime); + st.setDepartureTime(departureTime); + return st; + } + + public String getFeedId() { + return TransitModelForTest.FEED_ID; + } + + public UpdateResult applyEstimatedTimetable(List updates) { + return this.snapshotSource.applyEstimatedTimetable( + null, + getEntityResolver(), + getFeedId(), + false, + updates + ); + } + } +} diff --git a/src/ext/java/org/opentripplanner/ext/siri/EntityResolver.java b/src/ext/java/org/opentripplanner/ext/siri/EntityResolver.java index 5ca467ad1d5..3c142ac693d 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/EntityResolver.java +++ b/src/ext/java/org/opentripplanner/ext/siri/EntityResolver.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import javax.annotation.Nullable; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Operator; @@ -207,6 +208,7 @@ public Operator resolveOperator(String operatorRef) { return transitService.getOperatorForId(resolveId(operatorRef)); } + @Nullable public LocalDate resolveServiceDate(EstimatedVehicleJourney vehicleJourney) { if (vehicleJourney.getFramedVehicleJourneyRef() != null) { var dataFrame = vehicleJourney.getFramedVehicleJourneyRef().getDataFrameRef(); @@ -227,15 +229,18 @@ public LocalDate resolveServiceDate(EstimatedVehicleJourney vehicleJourney) { } } - ZonedDateTime date = CallWrapper.of(vehicleJourney).get(0).getAimedDepartureTime(); - - if (date == null) { + var datetime = CallWrapper + .of(vehicleJourney) + .stream() + .findFirst() + .map(CallWrapper::getAimedDepartureTime); + if (datetime.isEmpty()) { return null; } var daysOffset = calculateDayOffset(vehicleJourney); - return date.toLocalDate().minusDays(daysOffset); + return datetime.get().toLocalDate().minusDays(daysOffset); } /** diff --git a/src/main/java/org/opentripplanner/framework/time/DateUtils.java b/src/main/java/org/opentripplanner/framework/time/DateUtils.java index f2a0bc57f54..d212af56b79 100644 --- a/src/main/java/org/opentripplanner/framework/time/DateUtils.java +++ b/src/main/java/org/opentripplanner/framework/time/DateUtils.java @@ -11,6 +11,7 @@ import java.time.format.DateTimeParseException; import java.util.List; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,6 +52,7 @@ public class DateUtils { * Returns a Date object based on input date and time parameters Defaults to today / now (when * date / time are null) */ + @Nullable public static ZonedDateTime toZonedDateTime(String date, String time, ZoneId tz) { //LOG.debug("JVM default timezone is {}", TimeZone.getDefault()); LOG.debug("Parsing date {} and time {}", date, time); @@ -179,7 +181,18 @@ public static long absoluteTimeout(Duration timeout) { } } - private static LocalTime parseTime(String time) { + /** + * Parse a time string on different formats: + * + * 
              +   * Hour Minute Second      "10:02:03"
+   * Hour Minute             "10:02"
+   * Seconds past midningt   "3600"
+   * AM / PM                 "11:30 PM"
+   *
              + */ + @Nullable + public static LocalTime parseTime(String time) { boolean amPm = false; int addHours = 0; int hour = 0, min = 0, sec = 0; diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/src/main/java/org/opentripplanner/model/Timetable.java index 031e95e8870..269667ba98e 100644 --- a/src/main/java/org/opentripplanner/model/Timetable.java +++ b/src/main/java/org/opentripplanner/model/Timetable.java @@ -126,7 +126,7 @@ public TripTimes getTripTimes(Trip trip) { public TripTimes getTripTimes(FeedScopedId tripId) { for (TripTimes tt : tripTimes) { - if (tt.getTrip().getId() == tripId) { + if (tt.getTrip().getId().equals(tripId)) { return tt; } } diff --git a/src/test/java/org/opentripplanner/DateTimeHelper.java b/src/test/java/org/opentripplanner/DateTimeHelper.java new file mode 100644 index 00000000000..6a058118d1b --- /dev/null +++ b/src/test/java/org/opentripplanner/DateTimeHelper.java @@ -0,0 +1,30 @@ +package org.opentripplanner; + +import java.time.LocalDate; +import java.time.ZoneId; +import java.time.ZonedDateTime; +import org.opentripplanner.framework.time.DateUtils; + +public class DateTimeHelper { + + private final ZoneId zone; + private final LocalDate defaultDate; + + public DateTimeHelper(ZoneId zone, LocalDate defaultDate) { + this.zone = zone; + this.defaultDate = defaultDate; + } + + /** + * Create a zoned datetime from a time string using the default date and timezone + * + * @throws IllegalArgumentException if we can't parse the string as a time. + */ + public ZonedDateTime zonedDateTime(String timeString) { + var time = DateUtils.parseTime(timeString); + if (time == null) { + throw new IllegalArgumentException("Invalid time format"); + } + return defaultDate.atTime(time).atZone(zone); + } +} diff --git a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java index e01809d2b9f..2a4f2dfb701 100644 --- a/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java +++ b/src/test/java/org/opentripplanner/transit/model/_data/TransitModelForTest.java @@ -229,9 +229,13 @@ public StopPattern stopPattern(int numberOfStops) { } public static StopPattern stopPattern(RegularStop... stops) { - var builder = StopPattern.create(stops.length); - for (int i = 0; i < stops.length; i++) { - builder.stops.with(i, stops[i]); + return stopPattern(Arrays.asList(stops)); + } + + public static StopPattern stopPattern(List stops) { + var builder = StopPattern.create(stops.size()); + for (int i = 0; i < stops.size(); i++) { + builder.stops.with(i, stops.get(i)); builder.pickups.with(i, PickDrop.SCHEDULED); builder.dropoffs.with(i, PickDrop.SCHEDULED); } From e0c163c1c937b08e163daeb324ce8bda010b6328 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 17 May 2024 07:50:04 +0000 Subject: [PATCH 1125/1688] Add changelog entry for #5774 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 872ee7a96bb..0b7c70dac2b 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -19,6 +19,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix handling of implicit access and egress mode parameters. [#5821](https://github.com/opentripplanner/OpenTripPlanner/pull/5821) - Add prettier:write to docs and rephrase slightly [ci skip] [#5831](https://github.com/opentripplanner/OpenTripPlanner/pull/5831) - Make naming of stopTransferCosts/stopBoardAlightCosts consistent [#5822](https://github.com/opentripplanner/OpenTripPlanner/pull/5822) +- Namer for applying street names to nearby sidewalks [#5774](https://github.com/opentripplanner/OpenTripPlanner/pull/5774) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From ce31c8e5b0bcf52bf76c113e89247a356f891449 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Fri, 17 May 2024 17:05:52 +0800 Subject: [PATCH 1126/1688] Apply suggestions from code review Co-authored-by: Thomas Gran --- .../opentripplanner/ext/siri/SiriTripPatternCache.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index 4411e096ebc..8b5896a1bf6 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -59,16 +59,15 @@ public class SiriTripPatternCache { // TODO RT_AB: generalize this so we can generate IDs for SIRI or GTFS-RT sources. private final SiriTripPatternIdGenerator tripPatternIdGenerator; - /** - * SiriTripPatternCache needs only this one feature of TransitService, so we retain only this - * function reference to effectively narrow the interface. This should also facilitate testing. - */ private final Function getPatternForTrip; /** - * Constructor. * TODO RT_AB: This class could potentially be reused for both SIRI and GTFS-RT, which may * involve injecting a different ID generator and pattern fetching method. + * + * @param getPatternForTrip SiriTripPatternCache needs only this one feature of TransitService, so we retain + * only this function reference to effectively narrow the interface. This should also facilitate + * testing. */ public SiriTripPatternCache( SiriTripPatternIdGenerator tripPatternIdGenerator, From c66d3011f02e225b9b780b56646a1d3e3f74fa27 Mon Sep 17 00:00:00 2001 From: Andrew Byrd Date: Fri, 17 May 2024 18:16:06 +0800 Subject: [PATCH 1127/1688] update comments in response to review --- .../ext/siri/SiriTripPatternIdGenerator.java | 9 ++++----- .../transit/model/network/TripPattern.java | 12 ++++++++---- src/main/java/org/opentripplanner/updater/package.md | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java index d5a98088746..1b56938d712 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternIdGenerator.java @@ -9,11 +9,10 @@ /** * This class generates new unique IDs for TripPatterns created in response to real-time updates - * from the SIRI updaters. It is important to create only one instance of this class, and inject - * that single instance wherever it is needed. The ID generation is threadsafe, even if that is - * probably not needed. - * TODO RT: To make this simpler to use we could make it a "Singelton" (static getInstance() method) - that would - * enforce one instance only, and simplify injection (use getInstance() where needed). + * from the SIRI updaters. In non-test usage it is important to create only one instance of this + * class, and inject that single instance wherever it is needed. However, this single-instance + * usage pattern is not enforced due to differing needs in tests. + * The ID generation is threadsafe, even if that is probably not needed. */ class SiriTripPatternIdGenerator { diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index e59d9f5125c..f9734c1cb1a 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -42,10 +42,14 @@ * stop). Trips are assumed to be non-overtaking, so that an earlier trip never arrives after a * later trip. *

              - * The Route and StopPattern together form the natural key of the TripPattern. They are the shared - * set of characteristics that group many trips together into one TripPattern. This grouping saves - * memory by not replicating any details shared across all trips in the TripPattern, but it is - * also essential to some optimizations in routing algorithms like Raptor. + * The key of the TripPattern includes the Route, StopPattern, TransitMode, and SubMode. All trips + * grouped under a TripPattern should have the same values for these characteristics (with possible + * exceptions for TransitMode and SubMode). + * TODO RT_AB: We need to clarify exactly which characteristics are identical across the trips. + * Grouping into patterns serves more than one purpose: it conserves memory by not replicating + * details shared across all trips in the TripPattern; it reflects business practices outside + * routing; it is essential to optimizations in routing algorithms like Raptor. We may be + * conflating a domain model grouping with an internal routing grouping. *

              * This is called a JOURNEY_PATTERN in the Transmodel vocabulary. However, GTFS calls a Transmodel * JOURNEY a "trip", thus TripPattern. diff --git a/src/main/java/org/opentripplanner/updater/package.md b/src/main/java/org/opentripplanner/updater/package.md index 134416ac826..50c425bb6eb 100644 --- a/src/main/java/org/opentripplanner/updater/package.md +++ b/src/main/java/org/opentripplanner/updater/package.md @@ -60,7 +60,7 @@ This section summarizes the rationale behind some of the design decisions. An OTP instance can have multiple sources of realtime data at once. In some cases the transit data includes several feeds of scheduled data from different providers, with one or more types of realtime updates for those different feeds. -In a large production system, ideally all the scheduled data would be integrated into a single data source with a unified ID namespace, and all the realtime data would also be integrated into a single data source with an exactly matching namespace. This would be the responsibility of a separate piece of software outside (upstream of) OTP. In practice, such an upstream data integration system does not exist in many deployments and OTP must manage several static and realtime data sources at once. Even when data feeds are well-integrated, the different kinds of realtime (arrival time updates, vehicle positions, or text alerts) may be split across multiple feeds as described in the GTFS-RT spec, which implies polling three different files. +In a large production OTP deployment, input data may be integrated into a single data source by an upstream system, or left as multiple data sources with guarantees about the uniqueness of identifiers. In either case, the single unified ID namespace allows realtime data to be easily associated with transit model entities. In practice, many OTP deployments do not have upstream data integration pipelines. In these cases OTP must manage several independent static and realtime data sources at once; feed IDs are used to keep namespaces separate, and to associate realtime data with the right subset of entities. Even when data feeds are well-integrated, the different kinds of realtime (arrival time updates, vehicle positions, or text alerts) may be split across multiple feeds as described in the GTFS-RT spec, which implies polling three different files. To handle these cases, it must be possible for more than one data source to specify the same feed ID. Eventually we want to make these feed IDs optional to simplify single-namespace OTP deployments. Each OTP instance in such a large configuration is also typically intended to handle several requests concurrently. Each incoming request needs to perform essentially random reads from the same large data structure representing the transit network, so there are efficiency benefits to many concurrent searches happening on the same instance, sharing this one large data structure. In a load-balanced cluster of OTP instances, realtime updates must be received and applied to each copy of the transportation network separately. So sharing each copy of the transportation network between a larger number of concurrent routing requests reduces the number of identical, arguably redundant network update processes going on simultaneously. From a3d0659688b8ac71aae638ed4bbec630b4846ee8 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 17 May 2024 10:47:55 +0000 Subject: [PATCH 1128/1688] Add changelog entry for #5796 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 0b7c70dac2b..55b76823b79 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -20,6 +20,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add prettier:write to docs and rephrase slightly [ci skip] [#5831](https://github.com/opentripplanner/OpenTripPlanner/pull/5831) - Make naming of stopTransferCosts/stopBoardAlightCosts consistent [#5822](https://github.com/opentripplanner/OpenTripPlanner/pull/5822) - Namer for applying street names to nearby sidewalks [#5774](https://github.com/opentripplanner/OpenTripPlanner/pull/5774) +- Implement GTFS Flex safe duration spec draft [#5796](https://github.com/opentripplanner/OpenTripPlanner/pull/5796) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From ef02c9084c2ce85e8c32b3c15140837242b7e741 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Fri, 17 May 2024 10:48:20 +0000 Subject: [PATCH 1129/1688] Bump serialization version id for #5796 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 60570418622..cb8f45f5a16 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 149 + 150 31.0 2.51.1 From e9d5d3dd509dde428f7bacfdee0232c8ba5b8c33 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 17 May 2024 14:16:50 +0300 Subject: [PATCH 1130/1688] Make eq/hc null safe --- .../apis/gtfs/model/PlanPageInfo.java | 22 +++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java index 1575933b924..6eebad77580 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java @@ -49,8 +49,8 @@ public Duration searchWindowUsed() { @Override public int hashCode() { return Objects.hash( - startCursor.getValue(), - endCursor.getValue(), + startCursor != null ? startCursor.getValue() : null, + endCursor != null ? endCursor.getValue() : null, hasPreviousPage, hasNextPage, searchWindowUsed @@ -67,8 +67,22 @@ public boolean equals(Object o) { } PlanPageInfo that = (PlanPageInfo) o; return ( - Objects.equals(startCursor.getValue(), that.startCursor.getValue()) && - Objects.equals(endCursor.getValue(), that.endCursor.getValue()) && + ( + (startCursor == null && that.startCursor == null) || + ( + startCursor != null && + that.startCursor != null && + Objects.equals(startCursor.getValue(), that.startCursor.getValue()) + ) + ) && + ( + (endCursor == null && that.endCursor == null) || + ( + endCursor != null && + that.endCursor != null && + Objects.equals(endCursor.getValue(), that.endCursor.getValue()) + ) + ) && Objects.equals(searchWindowUsed, that.searchWindowUsed) && hasPreviousPage == that.hasPreviousPage && hasNextPage == that.hasNextPage From 5ae15a0fe9a6e85ac70f80d359fe580b7a3bd93c Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Fri, 17 May 2024 15:11:02 +0200 Subject: [PATCH 1131/1688] Update SiriTimetableSnapshotSourceTest --- .../siri/SiriTimetableSnapshotSourceTest.java | 35 +++++++++++++++---- 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 0d98cd62e70..11ff56179c8 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -9,6 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentripplanner.DateTimeHelper; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; @@ -39,10 +40,6 @@ class SiriTimetableSnapshotSourceTest { - // TODO testcases: - // Error case: Et message contains a call for stop that is not expected and is not marked as - // extra call. This silently works currently by ignoring the extra call, but should probably fail. - @Test void testCancelTrip() { var env = new RealtimeTestEnvironment(); @@ -201,9 +198,9 @@ void testCancelStop() { assertEquals(PickDrop.SCHEDULED, pattern.getAlightType(2)); } - // Ignore this for now since it isn't supported // TODO: support this - // @Test + @Test + @Disabled("Not supported yet") void testAddStop() { var env = new RealtimeTestEnvironment(); @@ -330,6 +327,32 @@ void testNegativeDwellTime() { assertFailure(result, UpdateError.UpdateErrorType.NEGATIVE_DWELL_TIME); } + // TODO: support this + @Test + @Disabled("Not supported yet") + void testExtraUnknownStop() { + var env = new RealtimeTestEnvironment(); + + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withEstimatedCalls(builder -> + builder + .call(env.stopA1) + .departAimedExpected("00:00:11", "00:00:15") + // Unexpected extra stop without isExtraCall flag + .call(env.stopD1) + .arriveAimedExpected("00:00:19", "00:00:20") + .departAimedExpected("00:00:24", "00:00:25") + .call(env.stopB1) + .arriveAimedExpected("00:00:20", "00:00:33") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(updates); + + assertFailure(result, UpdateError.UpdateErrorType.INVALID_STOP_SEQUENCE); + } + private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType errorType) { assertEquals(result.failures().keySet(), Set.of(errorType)); } From 18d742f1b2f259e619066802eb48e7a82170f39e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 18 May 2024 02:01:28 +0000 Subject: [PATCH 1132/1688] fix(deps): update dependency org.entur.gbfs:gbfs-java-model to v3.1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index cb8f45f5a16..2e313351a7a 100644 --- a/pom.xml +++ b/pom.xml @@ -674,7 +674,7 @@ org.entur.gbfs gbfs-java-model - 3.1.1 + 3.1.3 From 1fbf5ca42445b6ee3fc483394be8dcfda48a70ba Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 18 May 2024 09:33:54 +0200 Subject: [PATCH 1133/1688] Finish up renaming duration factor to time penalty --- .../ext/flex/flexpathcalculator/FlexPathTest.java | 4 ++-- .../ext/flex/flexpathcalculator/FlexPath.java | 2 +- .../flex/flexpathcalculator/TimePenaltyCalculator.java | 6 +++--- .../gtfs/mapping/GTFSToOtpTransitServiceMapper.java | 2 +- .../org/opentripplanner/gtfs/mapping/TripMapper.java | 10 +++++----- .../model/impl/OtpTransitServiceBuilder.java | 4 ++-- .../opentripplanner/gtfs/mapping/TripMapperTest.java | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java index 8bd3abee785..fca0d22cdf3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java @@ -30,8 +30,8 @@ static List cases() { @ParameterizedTest @MethodSource("cases") - void calculate(TimePenalty mod, int expectedSeconds) { - var modified = PATH.withDurationModifier(mod); + void calculate(TimePenalty penalty, int expectedSeconds) { + var modified = PATH.withTimePenalty(penalty); assertEquals(expectedSeconds, modified.durationSeconds); assertEquals(LineStrings.SIMPLE, modified.getGeometry()); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index 3a692dff40b..0b227490e9d 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java @@ -41,7 +41,7 @@ public LineString getGeometry() { /** * Returns an (immutable) copy of this path with the duration modified. */ - public FlexPath withDurationModifier(TimePenalty mod) { + public FlexPath withTimePenalty(TimePenalty mod) { if (mod.isZero()) { return this; } else { diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java index 63b661f0f9a..4fde3fcfbff 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java @@ -11,11 +11,11 @@ public class TimePenaltyCalculator implements FlexPathCalculator { private final FlexPathCalculator delegate; - private final TimePenalty factors; + private final TimePenalty penalty; public TimePenaltyCalculator(FlexPathCalculator delegate, TimePenalty penalty) { this.delegate = delegate; - this.factors = penalty; + this.penalty = penalty; } @Nullable @@ -26,7 +26,7 @@ public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, i if (path == null) { return null; } else { - return path.withDurationModifier(factors); + return path.withTimePenalty(penalty); } } } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index ce65d6b0820..354c1f16177 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -171,7 +171,7 @@ public void mapStopTripAndRouteDataIntoBuilder() { builder.getPathways().addAll(pathwayMapper.map(data.getAllPathways())); builder.getStopTimesSortedByTrip().addAll(stopTimeMapper.map(data.getAllStopTimes())); - builder.getFlexTimePenalty().putAll(tripMapper.flexSafeDurationModifiers()); + builder.getFlexTimePenalty().putAll(tripMapper.flexSafeTimePenalties()); builder.getTripsById().addAll(tripMapper.map(data.getAllTrips())); fareRulesBuilder.fareAttributes().addAll(fareAttributeMapper.map(data.getAllFareAttributes())); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java index ca221c1c6ca..3a62ba2b269 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/TripMapper.java @@ -18,7 +18,7 @@ class TripMapper { private final TranslationHelper translationHelper; private final Map mappedTrips = new HashMap<>(); - private final Map flexSafeDurationModifiers = new HashMap<>(); + private final Map flexSafeTimePenalties = new HashMap<>(); TripMapper( RouteMapper routeMapper, @@ -45,8 +45,8 @@ Collection getMappedTrips() { /** * The map of flex duration factors per flex trip. */ - Map flexSafeDurationModifiers() { - return flexSafeDurationModifiers; + Map flexSafeTimePenalties() { + return flexSafeTimePenalties; } private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { @@ -73,11 +73,11 @@ private Trip doMap(org.onebusaway.gtfs.model.Trip rhs) { lhs.withBikesAllowed(BikeAccessMapper.mapForTrip(rhs)); var trip = lhs.build(); - mapSafeDurationModifier(rhs).ifPresent(f -> flexSafeDurationModifiers.put(trip, f)); + mapSafeTimePenalty(rhs).ifPresent(f -> flexSafeTimePenalties.put(trip, f)); return trip; } - private Optional mapSafeDurationModifier(org.onebusaway.gtfs.model.Trip rhs) { + private Optional mapSafeTimePenalty(org.onebusaway.gtfs.model.Trip rhs) { if (rhs.getSafeDurationFactor() == null && rhs.getSafeDurationOffset() == null) { return Optional.empty(); } else { diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java index 544ca29599d..43c18cec59d 100644 --- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java +++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java @@ -94,7 +94,7 @@ public class OtpTransitServiceBuilder { private final TripStopTimes stopTimesByTrip = new TripStopTimes(); - private final Map flexDurationFactors = new HashMap<>(); + private final Map flexTimePenalties = new HashMap<>(); private final EntityById fareZonesById = new DefaultEntityById<>(); @@ -214,7 +214,7 @@ public TripStopTimes getStopTimesSortedByTrip() { } public Map getFlexTimePenalty() { - return flexDurationFactors; + return flexTimePenalties; } public EntityById getFareZonesById() { diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java index f24e405515d..535ec349fba 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java @@ -111,14 +111,14 @@ void testMapCache() throws Exception { } @Test - void noFlexDurationModifier() { + void noFlexTimePenalty() { var mapper = defaultTripMapper(); mapper.map(TRIP); - assertTrue(mapper.flexSafeDurationModifiers().isEmpty()); + assertTrue(mapper.flexSafeTimePenalties().isEmpty()); } @Test - void flexDurationModifier() { + void flexTimePenalty() { var flexTrip = new Trip(); flexTrip.setId(new AgencyAndId("1", "1")); flexTrip.setSafeDurationFactor(1.5); @@ -126,7 +126,7 @@ void flexDurationModifier() { flexTrip.setRoute(new GtfsTestData().route); var mapper = defaultTripMapper(); var mapped = mapper.map(flexTrip); - var mod = mapper.flexSafeDurationModifiers().get(mapped); + var mod = mapper.flexSafeTimePenalties().get(mapped); assertEquals(1.5f, mod.coefficient()); assertEquals(600, mod.constant().toSeconds()); } From 0113169c6b7cd2b6c10dcfb6278f4bcfc2734f46 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 18 May 2024 14:10:26 +0200 Subject: [PATCH 1134/1688] Add test for default time penalty --- .../ext/flex/FlexTripsMapperTest.java | 30 +++++++++++++++++++ .../flex/flexpathcalculator/FlexPathTest.java | 2 +- .../ext/flex/flexpathcalculator/FlexPath.java | 10 ++----- .../ext/flex/trip/UnscheduledTrip.java | 12 +++++++- 4 files changed, 45 insertions(+), 9 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/FlexTripsMapperTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTripsMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexTripsMapperTest.java new file mode 100644 index 00000000000..9670bec2802 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexTripsMapperTest.java @@ -0,0 +1,30 @@ +package org.opentripplanner.ext.flex; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.graph_builder.issue.api.DataImportIssueStore.NOOP; + +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.impl.OtpTransitServiceBuilder; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.service.StopModel; + +class FlexTripsMapperTest { + + @Test + void defaultTimePenalty() { + var builder = new OtpTransitServiceBuilder(StopModel.of().build(), NOOP); + var stopTimes = List.of(stopTime(0), stopTime(1)); + builder.getStopTimesSortedByTrip().addAll(stopTimes); + var trips = FlexTripsMapper.createFlexTrips(builder, NOOP); + assertEquals("[UnscheduledTrip{F:flex-1 timePenalty=(0s + 1.00 t)}]", trips.toString()); + } + + private static StopTime stopTime(int seq) { + var st = FlexStopTimesForTest.area("08:00", "18:00"); + st.setTrip(TransitModelForTest.trip("flex-1").build()); + st.setStopSequence(seq); + return st; + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java index fca0d22cdf3..3d37de02af4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathTest.java @@ -21,7 +21,7 @@ class FlexPathTest { static List cases() { return List.of( - Arguments.of(TimePenalty.ZERO, THIRTY_MINS_IN_SECONDS), + Arguments.of(TimePenalty.NONE, THIRTY_MINS_IN_SECONDS), Arguments.of(TimePenalty.of(Duration.ofMinutes(10), 1), 2400), Arguments.of(TimePenalty.of(Duration.ofMinutes(10), 1.5f), 3300), Arguments.of(TimePenalty.of(Duration.ZERO, 3), 5400) diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java index 0b227490e9d..4a494286313 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPath.java @@ -41,12 +41,8 @@ public LineString getGeometry() { /** * Returns an (immutable) copy of this path with the duration modified. */ - public FlexPath withTimePenalty(TimePenalty mod) { - if (mod.isZero()) { - return this; - } else { - int updatedDuration = (int) mod.calculate(Duration.ofSeconds(durationSeconds)).toSeconds(); - return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); - } + public FlexPath withTimePenalty(TimePenalty penalty) { + int updatedDuration = (int) penalty.calculate(Duration.ofSeconds(durationSeconds)).toSeconds(); + return new FlexPath(distanceMeters, updatedDuration, geometrySupplier); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 402d39e2aa7..a14f80d74a4 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -14,6 +14,7 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.TimePenaltyCalculator; @@ -29,6 +30,7 @@ import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.framework.LogInfo; import org.opentripplanner.transit.model.framework.TransitBuilder; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; @@ -45,7 +47,9 @@ *

              * For a discussion of this behaviour see https://github.com/MobilityData/gtfs-flex/issues/76 */ -public class UnscheduledTrip extends FlexTrip { +public class UnscheduledTrip + extends FlexTrip + implements LogInfo { private static final Set N_STOPS = Set.of(1, 2); private static final int INDEX_NOT_FOUND = -1; @@ -154,6 +158,12 @@ public Stream getFlexAccessTemplates( ); } + @Nullable + @Override + public String logName() { + return "timePenalty=(%s)".formatted(timePenalty.toString()); + } + /** * Get the correct {@link FlexPathCalculator} depending on the {@code timePenalty}. * If the modifier doesn't actually modify, we return the regular calculator. From e36ef154876812eff39945324879ab4f08eace30 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 22:58:02 +0000 Subject: [PATCH 1135/1688] chore(deps): update debug ui dependencies (non-major) --- client-next/package-lock.json | 319 +++++++++++++--------------------- client-next/package.json | 12 +- 2 files changed, 124 insertions(+), 207 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 83f19bf3c48..dff0052d861 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -12,7 +12,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.2.0", + "maplibre-gl": "4.3.2", "react": "18.3.1", "react-bootstrap": "2.10.2", "react-dom": "18.3.1", @@ -20,14 +20,14 @@ }, "devDependencies": { "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/client-preset": "4.2.5", + "@graphql-codegen/client-preset": "4.2.6", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "15.0.7", - "@types/react": "18.3.1", + "@types/react": "18.3.2", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", + "@typescript-eslint/eslint-plugin": "7.10.0", + "@typescript-eslint/parser": "7.10.0", "@vitejs/plugin-react": "4.2.1", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", @@ -36,7 +36,7 @@ "eslint-plugin-jsx-a11y": "6.8.0", "eslint-plugin-react": "7.34.1", "eslint-plugin-react-hooks": "4.6.2", - "eslint-plugin-react-refresh": "0.4.6", + "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.5", @@ -1693,20 +1693,21 @@ } }, "node_modules/@graphql-codegen/client-preset": { - "version": "4.2.5", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.5.tgz", - "integrity": "sha512-hAdB6HN8EDmkoBtr0bPUN/7NH6svzqbcTDMWBCRXPESXkl7y80po+IXrXUjsSrvhKG8xkNXgJNz/2mjwHzywcA==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.6.tgz", + "integrity": "sha512-e7SzPb+nxNJfsD0uG+NSyzIeTtCXTouX5VThmcCoqGMDLgF5Lo7932B3HtZCvzmzqcXxRjJ81CmkA2LhlqIbCw==", "dev": true, + "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", "@graphql-codegen/add": "^5.0.2", - "@graphql-codegen/gql-tag-operations": "4.0.6", - "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/typed-document-node": "^5.0.6", - "@graphql-codegen/typescript": "^4.0.6", - "@graphql-codegen/typescript-operations": "^4.2.0", - "@graphql-codegen/visitor-plugin-common": "^5.1.0", + "@graphql-codegen/gql-tag-operations": "4.0.7", + "@graphql-codegen/plugin-helpers": "^5.0.4", + "@graphql-codegen/typed-document-node": "^5.0.7", + "@graphql-codegen/typescript": "^4.0.7", + "@graphql-codegen/typescript-operations": "^4.2.1", + "@graphql-codegen/visitor-plugin-common": "^5.2.0", "@graphql-tools/documents": "^1.0.0", "@graphql-tools/utils": "^10.0.0", "@graphql-typed-document-node/core": "3.2.0", @@ -1732,13 +1733,14 @@ } }, "node_modules/@graphql-codegen/gql-tag-operations": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.6.tgz", - "integrity": "sha512-y6iXEDpDNjwNxJw3WZqX1/Znj0QHW7+y8O+t2V8qvbTT+3kb2lr9ntc8By7vCr6ctw9tXI4XKaJgpTstJDOwFA==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.7.tgz", + "integrity": "sha512-2I69+IDC8pqAohH6cgKse/vPfJ/4TRTJX96PkAKz8S4RD54PUHtBmzCdBInIFEP/vQuH5mFUAaIKXXjznmGOsg==", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/visitor-plugin-common": "5.1.0", + "@graphql-codegen/plugin-helpers": "^5.0.4", + "@graphql-codegen/visitor-plugin-common": "5.2.0", "@graphql-tools/utils": "^10.0.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" @@ -1762,10 +1764,11 @@ } }, "node_modules/@graphql-codegen/plugin-helpers": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.3.tgz", - "integrity": "sha512-yZ1rpULIWKBZqCDlvGIJRSyj1B2utkEdGmXZTBT/GVayP4hyRYlkd36AJV/LfEsVD8dnsKL5rLz2VTYmRNlJ5Q==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@graphql-codegen/plugin-helpers/-/plugin-helpers-5.0.4.tgz", + "integrity": "sha512-MOIuHFNWUnFnqVmiXtrI+4UziMTYrcquljaI5f/T/Bc7oO7sXcfkAvgkNWEEi9xWreYwvuer3VHCuPI/lAFWbw==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-tools/utils": "^10.0.0", "change-case-all": "1.0.15", @@ -1793,13 +1796,14 @@ } }, "node_modules/@graphql-codegen/typed-document-node": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.6.tgz", - "integrity": "sha512-US0J95hOE2/W/h42w4oiY+DFKG7IetEN1mQMgXXeat1w6FAR5PlIz4JrRrEkiVfVetZ1g7K78SOwBD8/IJnDiA==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.7.tgz", + "integrity": "sha512-rgFh96hAbNwPUxLVlRcNhGaw2+y7ZGx7giuETtdO8XzPasTQGWGRkZ3wXQ5UUiTX4X3eLmjnuoXYKT7HoxSznQ==", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/visitor-plugin-common": "5.1.0", + "@graphql-codegen/plugin-helpers": "^5.0.4", + "@graphql-codegen/visitor-plugin-common": "5.2.0", "auto-bind": "~4.0.0", "change-case-all": "1.0.15", "tslib": "~2.6.0" @@ -1809,14 +1813,15 @@ } }, "node_modules/@graphql-codegen/typescript": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.6.tgz", - "integrity": "sha512-IBG4N+Blv7KAL27bseruIoLTjORFCT3r+QYyMC3g11uY3/9TPpaUyjSdF70yBe5GIQ6dAgDU+ENUC1v7EPi0rw==", + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.7.tgz", + "integrity": "sha512-Gn+JNvQBJhBqH7s83piAJ6UeU/MTj9GXWFO9bdbl8PMLCAM1uFAtg04iHfkGCtDKXcUg5a3Dt/SZG85uk5KuhA==", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/plugin-helpers": "^5.0.4", "@graphql-codegen/schema-ast": "^4.0.2", - "@graphql-codegen/visitor-plugin-common": "5.1.0", + "@graphql-codegen/visitor-plugin-common": "5.2.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -1825,14 +1830,15 @@ } }, "node_modules/@graphql-codegen/typescript-operations": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.0.tgz", - "integrity": "sha512-lmuwYb03XC7LNRS8oo9M4/vlOrq/wOKmTLBHlltK2YJ1BO/4K/Q9Jdv/jDmJpNydHVR1fmeF4wAfsIp1f9JibA==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.1.tgz", + "integrity": "sha512-LhEPsaP+AI65zfK2j6CBAL4RT0bJL/rR9oRWlvwtHLX0t7YQr4CP4BXgvvej9brYdedAxHGPWeV1tPHy5/z9KQ==", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.3", - "@graphql-codegen/typescript": "^4.0.6", - "@graphql-codegen/visitor-plugin-common": "5.1.0", + "@graphql-codegen/plugin-helpers": "^5.0.4", + "@graphql-codegen/typescript": "^4.0.7", + "@graphql-codegen/visitor-plugin-common": "5.2.0", "auto-bind": "~4.0.0", "tslib": "~2.6.0" }, @@ -1841,12 +1847,13 @@ } }, "node_modules/@graphql-codegen/visitor-plugin-common": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.1.0.tgz", - "integrity": "sha512-eamQxtA9bjJqI2lU5eYoA1GbdMIRT2X8m8vhWYsVQVWD3qM7sx/IqJU0kx0J3Vd4/CSd36BzL6RKwksibytDIg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.2.0.tgz", + "integrity": "sha512-0p8AwmARaZCAlDFfQu6Sz+JV6SjbPDx3y2nNM7WAAf0au7Im/GpJ7Ke3xaIYBc1b2rTZ+DqSTJI/zomENGD9NA==", "dev": true, + "license": "MIT", "dependencies": { - "@graphql-codegen/plugin-helpers": "^5.0.3", + "@graphql-codegen/plugin-helpers": "^5.0.4", "@graphql-tools/optimize": "^2.0.0", "@graphql-tools/relay-operation-optimizer": "^7.0.0", "@graphql-tools/utils": "^10.0.0", @@ -3469,12 +3476,6 @@ "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==", "dev": true }, - "node_modules/@types/json-schema": { - "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", - "dev": true - }, "node_modules/@types/json-stable-stringify": { "version": "1.0.36", "resolved": "https://registry.npmjs.org/@types/json-stable-stringify/-/json-stable-stringify-1.0.36.tgz", @@ -3535,9 +3536,10 @@ "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/react": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.1.tgz", - "integrity": "sha512-V0kuGBX3+prX+DQ/7r2qsv1NsdfnCLnTgnRJ1pYnxykBhGMz+qj+box5lq7XsO5mtZsBqpjwwTu/7wszPfMBcw==", + "version": "18.3.2", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.2.tgz", + "integrity": "sha512-Btgg89dAnqD4vV7R3hlwOxgqobUQKgx3MmrQRi0yYbs/P0ym8XozIAlkqVilPqHQwXs4e9Tf63rrCgl58BcO4w==", + "license": "MIT", "dependencies": { "@types/prop-types": "*", "csstype": "^3.0.2" @@ -3560,12 +3562,6 @@ "@types/react": "*" } }, - "node_modules/@types/semver": { - "version": "7.5.8", - "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.8.tgz", - "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", - "dev": true - }, "node_modules/@types/supercluster": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/@types/supercluster/-/supercluster-7.1.3.tgz", @@ -3589,21 +3585,20 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.8.0.tgz", - "integrity": "sha512-gFTT+ezJmkwutUPmB0skOj3GZJtlEGnlssems4AjkVweUPGj7jRwwqg0Hhg7++kPGJqKtTYx+R05Ftww372aIg==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.10.0.tgz", + "integrity": "sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.8.0", - "@typescript-eslint/type-utils": "7.8.0", - "@typescript-eslint/utils": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0", - "debug": "^4.3.4", + "@typescript-eslint/scope-manager": "7.10.0", + "@typescript-eslint/type-utils": "7.10.0", + "@typescript-eslint/utils": "7.10.0", + "@typescript-eslint/visitor-keys": "7.10.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", - "semver": "^7.6.0", "ts-api-utils": "^1.3.0" }, "engines": { @@ -3623,49 +3618,17 @@ } } }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/eslint-plugin/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/parser": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.8.0.tgz", - "integrity": "sha512-KgKQly1pv0l4ltcftP59uQZCi4HUYswCLbTqVZEJu7uLX8CTLyswqMLqLN+2QFz4jCptqWVV4SB7vdxcH2+0kQ==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.10.0.tgz", + "integrity": "sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "7.8.0", - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/typescript-estree": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0", + "@typescript-eslint/scope-manager": "7.10.0", + "@typescript-eslint/types": "7.10.0", + "@typescript-eslint/typescript-estree": "7.10.0", + "@typescript-eslint/visitor-keys": "7.10.0", "debug": "^4.3.4" }, "engines": { @@ -3685,13 +3648,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.8.0.tgz", - "integrity": "sha512-viEmZ1LmwsGcnr85gIq+FCYI7nO90DVbE37/ll51hjv9aG+YZMb4WDE2fyWpUR4O/UrhGRpYXK/XajcGTk2B8g==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.10.0.tgz", + "integrity": "sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0" + "@typescript-eslint/types": "7.10.0", + "@typescript-eslint/visitor-keys": "7.10.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3702,13 +3666,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.8.0.tgz", - "integrity": "sha512-H70R3AefQDQpz9mGv13Uhi121FNMh+WEaRqcXTX09YEDky21km4dV1ZXJIp8QjXc4ZaVkXVdohvWDzbnbHDS+A==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.10.0.tgz", + "integrity": "sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.8.0", - "@typescript-eslint/utils": "7.8.0", + "@typescript-eslint/typescript-estree": "7.10.0", + "@typescript-eslint/utils": "7.10.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3729,10 +3694,11 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.8.0.tgz", - "integrity": "sha512-wf0peJ+ZGlcH+2ZS23aJbOv+ztjeeP8uQ9GgwMJGVLx/Nj9CJt17GWgWWoSmoRVKAX2X+7fzEnAjxdvK2gqCLw==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.10.0.tgz", + "integrity": "sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==", "dev": true, + "license": "MIT", "engines": { "node": "^18.18.0 || >=20.0.0" }, @@ -3742,13 +3708,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.8.0.tgz", - "integrity": "sha512-5pfUCOwK5yjPaJQNy44prjCwtr981dO8Qo9J9PwYXZ0MosgAbfEMB008dJ5sNo3+/BN6ytBPuSvXUg9SAqB0dg==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.10.0.tgz", + "integrity": "sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==", "dev": true, + "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/visitor-keys": "7.8.0", + "@typescript-eslint/types": "7.10.0", + "@typescript-eslint/visitor-keys": "7.10.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3769,26 +3736,12 @@ } } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz", + "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==", "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -3796,25 +3749,17 @@ "node": ">=10" } }, - "node_modules/@typescript-eslint/typescript-estree/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/utils": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.8.0.tgz", - "integrity": "sha512-L0yFqOCflVqXxiZyXrDr80lnahQfSOfc9ELAAZ75sqicqp2i36kEZZGuUymHNFoYOqxRT05up760b4iGsl02nQ==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.10.0.tgz", + "integrity": "sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==", "dev": true, + "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@types/json-schema": "^7.0.15", - "@types/semver": "^7.5.8", - "@typescript-eslint/scope-manager": "7.8.0", - "@typescript-eslint/types": "7.8.0", - "@typescript-eslint/typescript-estree": "7.8.0", - "semver": "^7.6.0" + "@typescript-eslint/scope-manager": "7.10.0", + "@typescript-eslint/types": "7.10.0", + "@typescript-eslint/typescript-estree": "7.10.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3827,46 +3772,14 @@ "eslint": "^8.56.0" } }, - "node_modules/@typescript-eslint/utils/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", - "dev": true, - "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/semver": { - "version": "7.6.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz", - "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==", - "dev": true, - "dependencies": { - "lru-cache": "^6.0.0" - }, - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/@typescript-eslint/utils/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.8.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.8.0.tgz", - "integrity": "sha512-q4/gibTNBQNA0lGyYQCmWRS5D15n8rXh4QjK3KV+MBPlTYHpfBUT3D3PaPR/HeNiI9W6R7FvlkcGhNyAoP+caA==", + "version": "7.10.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.10.0.tgz", + "integrity": "sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==", "dev": true, + "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.8.0", + "@typescript-eslint/types": "7.10.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -4629,6 +4542,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -6007,10 +5921,11 @@ } }, "node_modules/eslint-plugin-react-refresh": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.6.tgz", - "integrity": "sha512-NjGXdm7zgcKRkKMua34qVO9doI7VOxZ6ancSvBELJSSoX97jyndXcSoa8XBh69JoB31dNz3EEzlMcizZl7LaMA==", + "version": "0.4.7", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.7.tgz", + "integrity": "sha512-yrj+KInFmwuQS2UQcg1SF83ha1tuHC1jMQbRNyuWtlEzzKRDgAl7L4Yp4NlDUZTZNlWvHEzOtJhMi40R7JxcSw==", "dev": true, + "license": "MIT", "peerDependencies": { "eslint": ">=7" } @@ -8346,9 +8261,10 @@ } }, "node_modules/maplibre-gl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.2.0.tgz", - "integrity": "sha512-x5GgYyKKn5UDvbUZFK7ng3Pq829/uYWDSVN/itZoP2slWSzKbjIXKi/Qhz5FnYiMXwpRgM08UIcVjtn1PLK9Tg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.3.2.tgz", + "integrity": "sha512-/oXDsb9I+LkjweL/28aFMLDZoIcXKNEhYNAZDLA4xgTNkfvKQmV/r0KZdxEMcVthincJzdyc6Y4N8YwZtHKNnQ==", + "license": "BSD-3-Clause", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", "@mapbox/jsonlint-lines-primitives": "^2.0.2", @@ -8466,6 +8382,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz", "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, diff --git a/client-next/package.json b/client-next/package.json index 5ff988bdc87..d8a246827bc 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -21,7 +21,7 @@ "bootstrap": "5.3.3", "graphql": "16.8.1", "graphql-request": "6.1.0", - "maplibre-gl": "4.2.0", + "maplibre-gl": "4.3.2", "react": "18.3.1", "react-bootstrap": "2.10.2", "react-dom": "18.3.1", @@ -29,14 +29,14 @@ }, "devDependencies": { "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/client-preset": "4.2.5", + "@graphql-codegen/client-preset": "4.2.6", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "15.0.7", - "@types/react": "18.3.1", + "@types/react": "18.3.2", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", + "@typescript-eslint/eslint-plugin": "7.10.0", + "@typescript-eslint/parser": "7.10.0", "@vitejs/plugin-react": "4.2.1", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", @@ -45,7 +45,7 @@ "eslint-plugin-jsx-a11y": "6.8.0", "eslint-plugin-react": "7.34.1", "eslint-plugin-react-hooks": "4.6.2", - "eslint-plugin-react-refresh": "0.4.6", + "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.0.0", "prettier": "3.2.5", "typescript": "5.4.5", From 27c5343907482e2fd37a4097a6ed53cdd1a775ef Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Tue, 21 May 2024 14:54:46 +0200 Subject: [PATCH 1136/1688] Rollback fix for Timetable tripId comparison --- .../ext/siri/SiriTimetableSnapshotSourceTest.java | 6 +++--- src/main/java/org/opentripplanner/model/Timetable.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 11ff56179c8..19fdfb8636f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -503,10 +503,10 @@ public TripTimes getTripTimesForTrip(String id) { */ public TripTimes getTripTimesForTrip(FeedScopedId tripId, LocalDate serviceDate) { var transitService = getTransitService(); - var trip = transitService.getTripOnServiceDateById(tripId); - var pattern = transitService.getPatternForTrip(trip.getTrip(), serviceDate); + var trip = transitService.getTripOnServiceDateById(tripId).getTrip(); + var pattern = transitService.getPatternForTrip(trip, serviceDate); var timetable = transitService.getTimetableForTripPattern(pattern, serviceDate); - return timetable.getTripTimes(tripId); + return timetable.getTripTimes(trip); } public DateTimeHelper getDateTimeHelper() { diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/src/main/java/org/opentripplanner/model/Timetable.java index 269667ba98e..031e95e8870 100644 --- a/src/main/java/org/opentripplanner/model/Timetable.java +++ b/src/main/java/org/opentripplanner/model/Timetable.java @@ -126,7 +126,7 @@ public TripTimes getTripTimes(Trip trip) { public TripTimes getTripTimes(FeedScopedId tripId) { for (TripTimes tt : tripTimes) { - if (tt.getTrip().getId().equals(tripId)) { + if (tt.getTrip().getId() == tripId) { return tt; } } From cef1fd52646aa663a4382c989ff023b0684b43a0 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Tue, 21 May 2024 15:33:43 +0200 Subject: [PATCH 1137/1688] Fix comparison of feedId --- src/main/java/org/opentripplanner/model/Timetable.java | 2 +- src/test/java/org/opentripplanner/model/TimetableTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/model/Timetable.java b/src/main/java/org/opentripplanner/model/Timetable.java index 031e95e8870..269667ba98e 100644 --- a/src/main/java/org/opentripplanner/model/Timetable.java +++ b/src/main/java/org/opentripplanner/model/Timetable.java @@ -126,7 +126,7 @@ public TripTimes getTripTimes(Trip trip) { public TripTimes getTripTimes(FeedScopedId tripId) { for (TripTimes tt : tripTimes) { - if (tt.getTrip().getId() == tripId) { + if (tt.getTrip().getId().equals(tripId)) { return tt; } } diff --git a/src/test/java/org/opentripplanner/model/TimetableTest.java b/src/test/java/org/opentripplanner/model/TimetableTest.java index 07b44844291..9e6a7467dc5 100644 --- a/src/test/java/org/opentripplanner/model/TimetableTest.java +++ b/src/test/java/org/opentripplanner/model/TimetableTest.java @@ -66,6 +66,12 @@ public static void setUp() throws Exception { trip_1_1_index = timetable.getTripIndex(new FeedScopedId(feedId, TRIP_ID)); } + @Test + public void getGetTripTimes() { + var tt = timetable.getTripTimes(new FeedScopedId(feedId, TRIP_ID)); + assertNotNull(tt); + } + @Test public void tripNotFoundInPattern() { // non-existing trip From 187135e82aea5fabe633ba681704b330d8a21ced Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 22 May 2024 06:50:27 +0000 Subject: [PATCH 1138/1688] Add changelog entry for #5852 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 55b76823b79..4067e62defd 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -21,6 +21,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Make naming of stopTransferCosts/stopBoardAlightCosts consistent [#5822](https://github.com/opentripplanner/OpenTripPlanner/pull/5822) - Namer for applying street names to nearby sidewalks [#5774](https://github.com/opentripplanner/OpenTripPlanner/pull/5774) - Implement GTFS Flex safe duration spec draft [#5796](https://github.com/opentripplanner/OpenTripPlanner/pull/5796) +- SiriTimetableSnapshot tests [#5852](https://github.com/opentripplanner/OpenTripPlanner/pull/5852) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 9f20c65a5ef89a4d697330c7765caff7568d222d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 21 May 2024 21:57:52 +0000 Subject: [PATCH 1139/1688] chore(deps): update dependency org.codehaus.mojo:build-helper-maven-plugin to v3.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4e42473cb5d..9a77c8f1be5 100644 --- a/pom.xml +++ b/pom.xml @@ -209,7 +209,7 @@ org.codehaus.mojo build-helper-maven-plugin - 3.5.0 + 3.6.0 build-helper-generate-sources From 57c4282909bc05ef1eee427954639d780b2e2659 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 09:21:51 +0200 Subject: [PATCH 1140/1688] Apply review feedback --- .../ext/flex/flexpathcalculator/TimePenaltyCalculator.java | 4 ++-- .../org/opentripplanner/ext/flex/trip/UnscheduledTrip.java | 2 +- .../routing/api/request/framework/TimePenalty.java | 3 +++ .../org/opentripplanner/gtfs/mapping/TripMapperTest.java | 6 +++--- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java index 4fde3fcfbff..a2252f3fec8 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java @@ -5,8 +5,8 @@ import org.opentripplanner.street.model.vertex.Vertex; /** - * A calculator to delegates the main computation to another instance and applies a duration - * modifier afterward. + * A calculator to delegates the main computation to another instance and applies a time penalty + * afterward. */ public class TimePenaltyCalculator implements FlexPathCalculator { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index a14f80d74a4..08c1f9b5d3c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -166,7 +166,7 @@ public String logName() { /** * Get the correct {@link FlexPathCalculator} depending on the {@code timePenalty}. - * If the modifier doesn't actually modify, we return the regular calculator. + * If the penalty would not change the result, we return the regular calculator. */ protected FlexPathCalculator flexPathCalculator(FlexPathCalculator calculator) { if (timePenalty.modifies()) { diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java b/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java index 0c6fdd96436..3ee07034135 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java +++ b/src/main/java/org/opentripplanner/routing/api/request/framework/TimePenalty.java @@ -7,6 +7,9 @@ public final class TimePenalty extends AbstractLinearFunction { public static final TimePenalty ZERO = new TimePenalty(Duration.ZERO, 0.0); + /** + * An instance that doesn't actually apply a penalty and returns the duration unchanged. + */ public static final TimePenalty NONE = new TimePenalty(Duration.ZERO, 1.0); private TimePenalty(Duration constant, double coefficient) { diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java index 535ec349fba..964c3d8155e 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TripMapperTest.java @@ -126,8 +126,8 @@ void flexTimePenalty() { flexTrip.setRoute(new GtfsTestData().route); var mapper = defaultTripMapper(); var mapped = mapper.map(flexTrip); - var mod = mapper.flexSafeTimePenalties().get(mapped); - assertEquals(1.5f, mod.coefficient()); - assertEquals(600, mod.constant().toSeconds()); + var penalty = mapper.flexSafeTimePenalties().get(mapped); + assertEquals(1.5f, penalty.coefficient()); + assertEquals(600, penalty.constant().toSeconds()); } } From fe41603a9b2ca1ea08c550349a02abaa8584fe19 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Wed, 22 May 2024 08:30:39 +0000 Subject: [PATCH 1141/1688] Upgrade debug client to version 2024/05/2024-05-22T08:30 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 974356161cb..783c7ee6965 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

              From 8c0eb2cffcbe03543a514891322a2b11cfb9c261 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 08:31:01 +0000 Subject: [PATCH 1142/1688] fix(deps): update dependency graphql-request to v7 --- client-next/package-lock.json | 344 +++++++++++++++++++++++++++++++++- client-next/package.json | 2 +- 2 files changed, 338 insertions(+), 8 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index dff0052d861..39b2c2e2298 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -11,7 +11,7 @@ "@googlemaps/polyline-codec": "1.0.28", "bootstrap": "5.3.3", "graphql": "16.8.1", - "graphql-request": "6.1.0", + "graphql-request": "7.0.1", "maplibre-gl": "4.3.2", "react": "18.3.1", "react-bootstrap": "2.10.2", @@ -1143,6 +1143,109 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "node_modules/@dprint/darwin-arm64": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.45.1.tgz", + "integrity": "sha512-pH0/uKLJ5SJPoHhOwLWFMhCmL0BY3FzWQbull8OGMK/FRkIPgOl2adZSovtUZpUMGWyDOzIWH1fW9X2DuMhnEg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@dprint/darwin-x64": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.45.1.tgz", + "integrity": "sha512-YUj421LmBLDlxpIER3pORKfQmpmXD50n5mClHjpZrnl17WTiHtQ+jHvDJdJoxH2eS66W0mQyxLoGo5SfFfiM7A==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@dprint/formatter": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/@dprint/formatter/-/formatter-0.3.0.tgz", + "integrity": "sha512-N9fxCxbaBOrDkteSOzaCqwWjso5iAe+WJPsHC021JfHNj2ThInPNEF13ORDKta3llq5D1TlclODCvOvipH7bWQ==", + "license": "MIT" + }, + "node_modules/@dprint/linux-arm64-glibc": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.45.1.tgz", + "integrity": "sha512-lJ7s/pOQWRJ0mstjZQnVyX2/3QRXZ9cpFHJDZ7e81Y8QSn/iqxTrnK0DPgxUrDG8hYKQmWQdQLU4sP5DKBz0Jg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/linux-arm64-musl": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-musl/-/linux-arm64-musl-0.45.1.tgz", + "integrity": "sha512-un2awe1L1sAJLsCPSEUrE0/cgupdzbYFoyBOutyU1zHR9KQn47AtIDw+chvuinU4xleHDuEGyXGuJ6NE+Ky6vw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/linux-x64-glibc": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.45.1.tgz", + "integrity": "sha512-5Civht90S/g8zlyYB7n4oH78p+sLbNqeFCFuImJRK7uRxZwCRya7lji6RwlB6DQ7qngVqovTHj9RLOYfZzfVlg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/linux-x64-musl": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.45.1.tgz", + "integrity": "sha512-p2/gjnHDd8GRCvtey5HZO4o/He6pSmY/zpcCuIXprFW9P0vNlEj3DFhz4FPpOKXM+csrsVWWs2E0T/xr5QZtVg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@dprint/typescript": { + "version": "0.90.5", + "resolved": "https://registry.npmjs.org/@dprint/typescript/-/typescript-0.90.5.tgz", + "integrity": "sha512-/1aP6saonFvJyQN3l2is6eTOec3GnLGyW+opid/eDm8pnlhwzYl8A9p36pI6WO5jLl/a9Ghod+LWpvSOuXFGUw==", + "license": "MIT" + }, + "node_modules/@dprint/win32-x64": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.45.1.tgz", + "integrity": "sha512-2l78XM7KsW46P2Yv6uPB3fE+y92EsBlrCxi+RVQ0pbznPFdMdkLyGgaCuh683zdld14jHlaADpIQ7YchGAEMAg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@esbuild/aix-ppc64": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", @@ -2405,6 +2508,20 @@ "node": ">=16.0.0" } }, + "node_modules/@graphql-tools/prisma-loader/node_modules/graphql-request": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-6.1.0.tgz", + "integrity": "sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@graphql-typed-document-node/core": "^3.2.0", + "cross-fetch": "^3.1.5" + }, + "peerDependencies": { + "graphql": "14 - 16" + } + }, "node_modules/@graphql-tools/prisma-loader/node_modules/urlpattern-polyfill": { "version": "10.0.0", "resolved": "https://registry.npmjs.org/urlpattern-polyfill/-/urlpattern-polyfill-10.0.0.tgz", @@ -2763,6 +2880,85 @@ "gl-style-validate": "dist/gl-style-validate.mjs" } }, + "node_modules/@molt/command": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@molt/command/-/command-0.9.0.tgz", + "integrity": "sha512-1JI8dAlpqlZoXyKWVQggX7geFNPxBpocHIXQCsnxDjKy+3WX4SGyZVJXuLlqRRrX7FmQCuuMAfx642ovXmPA9g==", + "license": "MIT", + "dependencies": { + "@molt/types": "0.2.0", + "alge": "0.8.1", + "chalk": "^5.3.0", + "lodash.camelcase": "^4.3.0", + "lodash.snakecase": "^4.1.1", + "readline-sync": "^1.4.10", + "string-length": "^6.0.0", + "strip-ansi": "^7.1.0", + "ts-toolbelt": "^9.6.0", + "type-fest": "^4.3.1", + "zod": "^3.22.2" + } + }, + "node_modules/@molt/command/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/@molt/command/node_modules/chalk": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.3.0.tgz", + "integrity": "sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==", + "license": "MIT", + "engines": { + "node": "^12.17.0 || ^14.13 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/@molt/command/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, + "node_modules/@molt/command/node_modules/type-fest": { + "version": "4.18.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.18.2.tgz", + "integrity": "sha512-+suCYpfJLAe4OXS6+PPXjW3urOS4IoP9waSiLuXfLgqZODKw/aWwASvzqE886wA0kQgGy0mIWyhd87VpqIy6Xg==", + "license": "(MIT OR CC0-1.0)", + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@molt/types": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/@molt/types/-/types-0.2.0.tgz", + "integrity": "sha512-p6ChnEZDGjg9PYPec9BK6Yp5/DdSrYQvXTBAtgrnqX6N36cZy37ql1c8Tc5LclfIYBNG7EZp8NBcRTYJwyi84g==", + "license": "MIT", + "dependencies": { + "ts-toolbelt": "^9.6.0" + } + }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", @@ -4105,6 +4301,18 @@ "url": "https://github.com/sponsors/epoberezkin" } }, + "node_modules/alge": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/alge/-/alge-0.8.1.tgz", + "integrity": "sha512-kiV9nTt+XIauAXsowVygDxMZLplZxDWt0W8plE/nB32/V2ziM/P/TxDbSVK7FYIUt2Xo16h3/htDh199LNPCKQ==", + "license": "MIT", + "dependencies": { + "lodash.ismatch": "^4.4.0", + "remeda": "^1.0.0", + "ts-toolbelt": "^9.6.0", + "zod": "^3.17.3" + } + }, "node_modules/ansi-escapes": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", @@ -5031,6 +5239,7 @@ "version": "3.1.8", "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.8.tgz", "integrity": "sha512-cvA+JwZoU0Xq+h6WkMvAUqPEYy92Obet6UdKLfW60qn99ftItKjB5T+BkyWOFWe2pUyfQ+IJHmpOTznqk1M6Kg==", + "dev": true, "dependencies": { "node-fetch": "^2.6.12" } @@ -5373,6 +5582,25 @@ "url": "https://dotenvx.com" } }, + "node_modules/dprint": { + "version": "0.45.1", + "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.45.1.tgz", + "integrity": "sha512-OYefcDgxd6jSdig/Cfkw1vdvyiOIRruCPnqGBbXpc95buDt9kvwL+Lic1OHc+SaQSsQub0BUZMd5+TNgy8Sh3A==", + "hasInstallScript": true, + "license": "MIT", + "bin": { + "dprint": "bin.js" + }, + "optionalDependencies": { + "@dprint/darwin-arm64": "0.45.1", + "@dprint/darwin-x64": "0.45.1", + "@dprint/linux-arm64-glibc": "0.45.1", + "@dprint/linux-arm64-musl": "0.45.1", + "@dprint/linux-x64-glibc": "0.45.1", + "@dprint/linux-x64-musl": "0.45.1", + "@dprint/win32-x64": "0.45.1" + } + }, "node_modules/dset": { "version": "3.1.3", "resolved": "https://registry.npmjs.org/dset/-/dset-3.1.3.tgz", @@ -6803,12 +7031,20 @@ } }, "node_modules/graphql-request": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-6.1.0.tgz", - "integrity": "sha512-p+XPfS4q7aIpKVcgmnZKhMNqhltk20hfXtkaIkTfjjmiKMJ5xrt5c743cL03y/K7y1rg3WrIC49xGiEQ4mxdNw==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-7.0.1.tgz", + "integrity": "sha512-hfGBZF6o6lC3C0th+aTMOFP6p8Ev+ydXn4PUlT8rvqPDUFCbaynXszjBCyu0saZIP3VGbJ67GpxW8UGK+tphSw==", + "license": "MIT", "dependencies": { + "@dprint/formatter": "^0.3.0", + "@dprint/typescript": "^0.90.4", "@graphql-typed-document-node/core": "^3.2.0", - "cross-fetch": "^3.1.5" + "@molt/command": "^0.9.0", + "dprint": "^0.45.1", + "zod": "^3.23.5" + }, + "bin": { + "graffle": "build/cli/generate.js" }, "peerDependencies": { "graphql": "14 - 16" @@ -8061,12 +8297,30 @@ "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "dev": true }, + "node_modules/lodash.camelcase": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", + "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", + "license": "MIT" + }, + "node_modules/lodash.ismatch": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz", + "integrity": "sha512-fPMfXjGQEV9Xsq/8MTSgUf255gawYRbjwMyDbcvDhXgV7enSZA0hynz6vMPnpAb5iONEzBHBPsT+0zes5Z301g==", + "license": "MIT" + }, "node_modules/lodash.merge": { "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, + "node_modules/lodash.snakecase": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", + "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==", + "license": "MIT" + }, "node_modules/lodash.sortby": { "version": "4.7.0", "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", @@ -8477,6 +8731,7 @@ "version": "2.7.0", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, "dependencies": { "whatwg-url": "^5.0.0" }, @@ -8495,17 +8750,20 @@ "node_modules/node-fetch/node_modules/tr46": { "version": "0.0.3", "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true }, "node_modules/node-fetch/node_modules/webidl-conversions": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true }, "node_modules/node-fetch/node_modules/whatwg-url": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, "dependencies": { "tr46": "~0.0.3", "webidl-conversions": "^3.0.0" @@ -9376,6 +9634,15 @@ "node": ">= 6" } }, + "node_modules/readline-sync": { + "version": "1.4.10", + "resolved": "https://registry.npmjs.org/readline-sync/-/readline-sync-1.4.10.tgz", + "integrity": "sha512-gNva8/6UAe8QYepIQH/jQ2qn91Qj0B9sYjMBBs3QOB8F2CXcKgLxQaJRP76sWVRQt+QU+8fAkCbCvjjMFu7Ycw==", + "license": "MIT", + "engines": { + "node": ">= 0.8.0" + } + }, "node_modules/reflect.getprototypeof": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", @@ -9431,6 +9698,12 @@ "invariant": "^2.2.4" } }, + "node_modules/remeda": { + "version": "1.61.0", + "resolved": "https://registry.npmjs.org/remeda/-/remeda-1.61.0.tgz", + "integrity": "sha512-caKfSz9rDeSKBQQnlJnVW3mbVdFgxgGWQKq1XlFokqjf+hQD5gxutLGTTY2A/x24UxVyJe9gH5fAkFI63ULw4A==", + "license": "MIT" + }, "node_modules/remedial": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/remedial/-/remedial-1.0.8.tgz", @@ -10019,6 +10292,48 @@ "integrity": "sha512-78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg==", "dev": true }, + "node_modules/string-length": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-6.0.0.tgz", + "integrity": "sha512-1U361pxZHEQ+FeSjzqRpV+cu2vTzYeWeafXFLykiFlv4Vc0n3njgU8HrMbyik5uwm77naWMuVG8fhEF+Ovb1Kg==", + "license": "MIT", + "dependencies": { + "strip-ansi": "^7.1.0" + }, + "engines": { + "node": ">=16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/string-length/node_modules/ansi-regex": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz", + "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==", + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/ansi-regex?sponsor=1" + } + }, + "node_modules/string-length/node_modules/strip-ansi": { + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz", + "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^6.0.1" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -10406,6 +10721,12 @@ "integrity": "sha512-PGcnJoTBnVGy6yYNFxWVNkdcAuAMstvutN9MgDJIV6L0oG8fB+ZNNy1T+wJzah8RPGor1mZuPQkVfXNDpy9eHA==", "dev": true }, + "node_modules/ts-toolbelt": { + "version": "9.6.0", + "resolved": "https://registry.npmjs.org/ts-toolbelt/-/ts-toolbelt-9.6.0.tgz", + "integrity": "sha512-nsZd8ZeNUzukXPlJmTBwUAuABDe/9qtVDelJeT/qW0ow3ZS3BsQJtNkan1802aM9Uf68/Y8ljw86Hu0h5IUW3w==", + "license": "Apache-2.0" + }, "node_modules/tsconfig-paths": { "version": "3.15.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.15.0.tgz", @@ -11273,6 +11594,15 @@ "funding": { "url": "https://github.com/sponsors/sindresorhus" } + }, + "node_modules/zod": { + "version": "3.23.8", + "resolved": "https://registry.npmjs.org/zod/-/zod-3.23.8.tgz", + "integrity": "sha512-XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/colinhacks" + } } } } diff --git a/client-next/package.json b/client-next/package.json index d8a246827bc..8c4548e7a7f 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -20,7 +20,7 @@ "@googlemaps/polyline-codec": "1.0.28", "bootstrap": "5.3.3", "graphql": "16.8.1", - "graphql-request": "6.1.0", + "graphql-request": "7.0.1", "maplibre-gl": "4.3.2", "react": "18.3.1", "react-bootstrap": "2.10.2", From ca7e2a194b7bf47f8fef74df8c42e9ba96c763c6 Mon Sep 17 00:00:00 2001 From: sharhio Date: Wed, 22 May 2024 15:51:36 +0300 Subject: [PATCH 1143/1688] Realtime stop layer checks for existing stoptimes --- .../layers/stops/RealtimeStopsLayerTest.java | 3 +++ .../DigitransitRealtimeStopPropertyMapper.java | 13 ++++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java index 8f2e1f94fa6..5c991a53f52 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java @@ -46,6 +46,7 @@ public void setUp() { .withName(name) .withDescription(desc) .withCoordinate(50, 10) + .withTimeZone(ZoneIds.HELSINKI) .build(); stop2 = StopModel @@ -54,6 +55,7 @@ public void setUp() { .withName(name) .withDescription(desc) .withCoordinate(51, 10) + .withTimeZone(ZoneIds.HELSINKI) .build(); } @@ -100,5 +102,6 @@ public TransitAlertService getTransitAlertService() { assertEquals("name", map.get("name")); assertEquals("desc", map.get("desc")); assertEquals(true, map.get("closedByServiceAlert")); + assertEquals(true, map.get("noServiceOnServiceDay")); } } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java index 55d67d28d71..9bcdf646394 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java @@ -3,6 +3,7 @@ import static org.opentripplanner.ext.vectortiles.layers.stops.DigitransitStopPropertyMapper.getBaseKeyValues; import java.time.Instant; +import java.time.LocalDate; import java.util.Collection; import java.util.List; import java.util.Locale; @@ -10,6 +11,7 @@ import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NStringMapper; import org.opentripplanner.inspector.vector.KeyValue; +import org.opentripplanner.routing.stoptimes.ArrivalDeparture; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.service.TransitService; @@ -32,10 +34,19 @@ protected Collection map(RegularStop stop) { .stream() .anyMatch(alert -> alert.noServiceAt(currentTime)); + var serviceDate = LocalDate.ofInstant(currentTime, transitService.getTimeZone()); + boolean stopTimesExist = transitService + .getStopTimesForStop(stop, serviceDate, ArrivalDeparture.BOTH, true) + .stream() + .anyMatch(stopTime -> stopTime.times.size() > 0); + Collection sharedKeyValues = getBaseKeyValues(stop, i18NStringMapper, transitService); return ListUtils.combine( sharedKeyValues, - List.of(new KeyValue("closedByServiceAlert", noServiceAlert)) + List.of( + new KeyValue("closedByServiceAlert", noServiceAlert), + new KeyValue("noServiceOnServiceDay", !stopTimesExist) + ) ); } } From d0fe22b9e1635e62b6261fc64081cd088873c968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Wed, 22 May 2024 15:04:57 +0200 Subject: [PATCH 1144/1688] Fix imports --- client-next/src/hooks/useServerInfo.ts | 2 +- client-next/src/hooks/useTripQuery.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client-next/src/hooks/useServerInfo.ts b/client-next/src/hooks/useServerInfo.ts index aff463d571a..54bc67c0db7 100644 --- a/client-next/src/hooks/useServerInfo.ts +++ b/client-next/src/hooks/useServerInfo.ts @@ -1,6 +1,6 @@ import { useEffect, useState } from 'react'; import { graphql } from '../gql'; -import request from 'graphql-request'; +import { request } from 'graphql-request'; // eslint-disable-line import/no-unresolved import { QueryType } from '../gql/graphql.ts'; const endpoint = import.meta.env.VITE_API_URL; diff --git a/client-next/src/hooks/useTripQuery.ts b/client-next/src/hooks/useTripQuery.ts index 3720e2c450a..e96a04d7cc3 100644 --- a/client-next/src/hooks/useTripQuery.ts +++ b/client-next/src/hooks/useTripQuery.ts @@ -1,6 +1,6 @@ import { useCallback, useEffect, useState } from 'react'; import { graphql } from '../gql'; -import request from 'graphql-request'; +import { request } from 'graphql-request'; // eslint-disable-line import/no-unresolved import { QueryType, TripQueryVariables } from '../gql/graphql.ts'; const endpoint = import.meta.env.VITE_API_URL; From 6bd98ac29480cea9e3ec57d967a0066c6df59f46 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 13:08:13 +0000 Subject: [PATCH 1145/1688] fix(deps): update dependency org.entur:siri-java-model to v1.27 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a77c8f1be5..fec2595680a 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ 9.10.0 2.0.13 2.0.15 - 1.26 + 1.27 4.0.5 UTF-8 From e2868c6018ec8c0f43d3a3aef3a2d02599160ece Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Wed, 22 May 2024 13:16:27 +0000 Subject: [PATCH 1146/1688] Upgrade debug client to version 2024/05/2024-05-22T13:15 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 783c7ee6965..1e67df27055 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
              From 01c26407ae70a8343b4a3df708eee8c5f3b848c6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 22 May 2024 21:30:25 +0000 Subject: [PATCH 1147/1688] fix(deps): update geotools.version to v31.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9a77c8f1be5..412e1184c78 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 150 - 31.0 + 31.1 2.51.1 2.17.1 3.1.6 From 18ccc909573daa99a0ce259e7db0e1fd27be293a Mon Sep 17 00:00:00 2001 From: sharhio Date: Thu, 23 May 2024 14:44:51 +0300 Subject: [PATCH 1148/1688] boolean reversed --- .../ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java | 2 +- .../layers/stops/DigitransitRealtimeStopPropertyMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java index 5c991a53f52..dbee4597a7a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java @@ -102,6 +102,6 @@ public TransitAlertService getTransitAlertService() { assertEquals("name", map.get("name")); assertEquals("desc", map.get("desc")); assertEquals(true, map.get("closedByServiceAlert")); - assertEquals(true, map.get("noServiceOnServiceDay")); + assertEquals(false, map.get("servicesRunningOnServiceDay")); } } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java index 9bcdf646394..30393feaccf 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java @@ -45,7 +45,7 @@ protected Collection map(RegularStop stop) { sharedKeyValues, List.of( new KeyValue("closedByServiceAlert", noServiceAlert), - new KeyValue("noServiceOnServiceDay", !stopTimesExist) + new KeyValue("servicesRunningOnServiceDay", stopTimesExist) ) ); } From 4fb7615d20443d0371bd8acccf6b297390258a42 Mon Sep 17 00:00:00 2001 From: sharhio <113033056+sharhio@users.noreply.github.com> Date: Thu, 23 May 2024 14:54:47 +0300 Subject: [PATCH 1149/1688] Update src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java Co-authored-by: Leonard Ehrenfried --- .../layers/stops/DigitransitRealtimeStopPropertyMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java index 30393feaccf..711572eed86 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java @@ -34,7 +34,7 @@ protected Collection map(RegularStop stop) { .stream() .anyMatch(alert -> alert.noServiceAt(currentTime)); - var serviceDate = LocalDate.ofInstant(currentTime, transitService.getTimeZone()); + var serviceDate = LocalDate.now(transitService.getTimeZone()); boolean stopTimesExist = transitService .getStopTimesForStop(stop, serviceDate, ArrivalDeparture.BOTH, true) .stream() From 2562fb55ecdde4f2f6a6d339ff207dfdb813a2ab Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 23 May 2024 16:20:09 +0200 Subject: [PATCH 1150/1688] Remove extra changelog items [ci skip] --- docs/Changelog.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/Changelog.md b/docs/Changelog.md index 4067e62defd..ac317fa2272 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -17,11 +17,9 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Optionally abort startup when unknown configuration parameters were detected [#5676](https://github.com/opentripplanner/OpenTripPlanner/pull/5676) - Fix bug in heuristics cost calculation for egress legs [#5783](https://github.com/opentripplanner/OpenTripPlanner/pull/5783) - Fix handling of implicit access and egress mode parameters. [#5821](https://github.com/opentripplanner/OpenTripPlanner/pull/5821) -- Add prettier:write to docs and rephrase slightly [ci skip] [#5831](https://github.com/opentripplanner/OpenTripPlanner/pull/5831) - Make naming of stopTransferCosts/stopBoardAlightCosts consistent [#5822](https://github.com/opentripplanner/OpenTripPlanner/pull/5822) - Namer for applying street names to nearby sidewalks [#5774](https://github.com/opentripplanner/OpenTripPlanner/pull/5774) - Implement GTFS Flex safe duration spec draft [#5796](https://github.com/opentripplanner/OpenTripPlanner/pull/5796) -- SiriTimetableSnapshot tests [#5852](https://github.com/opentripplanner/OpenTripPlanner/pull/5852) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 3faf5916abcea6c2440fcde7054729fcb18c624d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 23 May 2024 17:26:53 +0200 Subject: [PATCH 1151/1688] Re-implement test by checking the calculator --- .../ext/flex/{ => trip}/FlexTripsMapperTest.java | 11 +++++++++-- .../ext/flex/trip/UnscheduledTrip.java | 12 +----------- 2 files changed, 10 insertions(+), 13 deletions(-) rename src/ext-test/java/org/opentripplanner/ext/flex/{ => trip}/FlexTripsMapperTest.java (62%) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTripsMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java similarity index 62% rename from src/ext-test/java/org/opentripplanner/ext/flex/FlexTripsMapperTest.java rename to src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java index 9670bec2802..0d0376bbd32 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexTripsMapperTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/FlexTripsMapperTest.java @@ -1,10 +1,14 @@ -package org.opentripplanner.ext.flex; +package org.opentripplanner.ext.flex.trip; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; import static org.opentripplanner.graph_builder.issue.api.DataImportIssueStore.NOOP; import java.util.List; import org.junit.jupiter.api.Test; +import org.opentripplanner.ext.flex.FlexStopTimesForTest; +import org.opentripplanner.ext.flex.FlexTripsMapper; +import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.impl.OtpTransitServiceBuilder; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -18,7 +22,10 @@ void defaultTimePenalty() { var stopTimes = List.of(stopTime(0), stopTime(1)); builder.getStopTimesSortedByTrip().addAll(stopTimes); var trips = FlexTripsMapper.createFlexTrips(builder, NOOP); - assertEquals("[UnscheduledTrip{F:flex-1 timePenalty=(0s + 1.00 t)}]", trips.toString()); + assertEquals("[UnscheduledTrip{F:flex-1}]", trips.toString()); + var unscheduled = (UnscheduledTrip) trips.getFirst(); + var unchanged = unscheduled.flexPathCalculator(new DirectFlexPathCalculator()); + assertInstanceOf(DirectFlexPathCalculator.class, unchanged); } private static StopTime stopTime(int seq) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 08c1f9b5d3c..a4c8d9568ca 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -14,7 +14,6 @@ import java.util.stream.IntStream; import java.util.stream.Stream; import javax.annotation.Nonnull; -import javax.annotation.Nullable; import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.TimePenaltyCalculator; @@ -30,7 +29,6 @@ import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.standalone.config.sandbox.FlexConfig; import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.framework.LogInfo; import org.opentripplanner.transit.model.framework.TransitBuilder; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; @@ -47,9 +45,7 @@ *

              * For a discussion of this behaviour see https://github.com/MobilityData/gtfs-flex/issues/76 */ -public class UnscheduledTrip - extends FlexTrip - implements LogInfo { +public class UnscheduledTrip extends FlexTrip { private static final Set N_STOPS = Set.of(1, 2); private static final int INDEX_NOT_FOUND = -1; @@ -158,12 +154,6 @@ public Stream getFlexAccessTemplates( ); } - @Nullable - @Override - public String logName() { - return "timePenalty=(%s)".formatted(timePenalty.toString()); - } - /** * Get the correct {@link FlexPathCalculator} depending on the {@code timePenalty}. * If the penalty would not change the result, we return the regular calculator. From b1314cd11fe66a04fb6230cca7337a91bfdc6ad7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 01:10:10 +0000 Subject: [PATCH 1152/1688] chore(deps): update dependency org.apache.commons:commons-compress to v1.26.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 412e1184c78..b199272dc63 100644 --- a/pom.xml +++ b/pom.xml @@ -916,7 +916,7 @@ org.apache.commons commons-compress - 1.26.1 + 1.26.2 test From c653f5643b60a0a6aa799929aa5be6accb92c585 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 24 May 2024 10:26:01 +0300 Subject: [PATCH 1153/1688] Apply suggestions from code review Co-authored-by: Andrew Byrd --- .../model/TimetableSnapshot.java | 22 ++++++++++--------- .../trip/TimetableSnapshotSourceTest.java | 19 ++++++++++++++++ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index 3c0078da62a..47ea720c194 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -262,15 +262,15 @@ public void clear(String feedId) { } /** - * If a previous realtime update has changed which trip pattern is used for this trip on the given - * service date, this removes the timetables for this trip on the service date for the trip - * pattern and also the connection of that trip pattern for this trip on the given service date. - * The original trip pattern from the scheduled data will be used for the trip again on this - * service date until a new trip pattern is used for the trip. + * If a previous realtime update has changed which trip pattern is associated with the given trip + * on the given service date, this method will dissociate the trip from that pattern and remove + * the trip's timetables from that pattern on that particular service date. * - * @return true if a new trip pattern was used for the trip previously and its connection to the - * trip one the given service date was attempted to removed together with its timetables for the - * trip. + * For this service date, the trip will revert to its original trip pattern from the scheduled + * data, remaining on that pattern unless it's changed again by a future realtime update. + * + * @return true if the trip was found to be shifted to a different trip pattern by a realtime + * message and an attempt was made to re-associate it with its originally scheduled trip pattern. */ public boolean removeRealtimeAddedTripPatternAndTimetablesForTrip( FeedScopedId tripId, @@ -280,9 +280,11 @@ public boolean removeRealtimeAddedTripPatternAndTimetablesForTrip( final TripPattern pattern = getRealtimeAddedTripPattern(tripId, serviceDate); if (pattern != null) { - // Remove the previous real-time-added TripPattern from buffer. - // Only one version of the real-time-update should exist + // Dissociate the given trip from any realtime-added pattern. + // The trip will then fall back to its original scheduled pattern. realtimeAddedTripPattern.remove(new TripIdAndServiceDate(tripId, serviceDate)); + // Remove times for the trip from any timetables + // under that now-obsolete realtime-added pattern. SortedSet sortedTimetables = this.timetables.get(pattern); if (sortedTimetables != null) { TripTimes tripTimesToRemove = null; diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index ec46cd5b93b..33e9ffb3842 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -853,6 +853,15 @@ public void scheduledTripWithSkippedAndScheduled() { } } + /** + * Test realtime system behavior under one very particular case from issue #5725. + * When applying differential realtime updates, an update may cancel some stops on a trip. A + * later update may then revert the trip back to its originally scheduled sequence of stops. + * When this happens, we expect the trip to be associated with a new trip pattern (where some + * stops have no pickup or dropoff) then dissociated from that new pattern and re-associated + * with its originally scheduled pattern. Any trip times that were created in timetables under + * the new stop-skipping trip pattern should also be removed. + */ @Test public void scheduledTripWithPreviouslySkipped() { // Create update with a skipped stop at first @@ -1185,6 +1194,16 @@ static List addedRemovalTestCase() { ); } + /** + * Test behavior of the realtime system in a case related to #5725 that is discussed at: + * https://github.com/opentripplanner/OpenTripPlanner/pull/5726#discussion_r1521653840 + * When a trip is added by a realtime message, in the realtime data indexes a corresponding + * trip pattern should be associated with the stops that trip visits. When a subsequent + * realtime message cancels or deletes that trip, the pattern should continue to be present in + * the realtime data indexes, and it should still contain the previously added trip, but that + * trip should be marked as having canceled or deleted status. At no point should the trip + * added by realtime data be present in the trip pattern for scheduled service. + */ @ParameterizedTest @MethodSource("addedRemovalTestCase") public void cancelingAddedTrip( From 0aa8374ecb54938114aa668e3e0d43997acd51c8 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 24 May 2024 10:35:08 +0300 Subject: [PATCH 1154/1688] Fix formatting --- .../updater/trip/TimetableSnapshotSourceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 33e9ffb3842..bbac054f2df 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -1198,11 +1198,11 @@ static List addedRemovalTestCase() { * Test behavior of the realtime system in a case related to #5725 that is discussed at: * https://github.com/opentripplanner/OpenTripPlanner/pull/5726#discussion_r1521653840 * When a trip is added by a realtime message, in the realtime data indexes a corresponding - * trip pattern should be associated with the stops that trip visits. When a subsequent + * trip pattern should be associated with the stops that trip visits. When a subsequent * realtime message cancels or deletes that trip, the pattern should continue to be present in * the realtime data indexes, and it should still contain the previously added trip, but that * trip should be marked as having canceled or deleted status. At no point should the trip - * added by realtime data be present in the trip pattern for scheduled service. + * added by realtime data be present in the trip pattern for scheduled service. */ @ParameterizedTest @MethodSource("addedRemovalTestCase") From e77791e884f60351d7e8501065d2b0e66f87a0df Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 24 May 2024 08:23:24 +0200 Subject: [PATCH 1155/1688] Fix handling of missing aimed departure time --- .../ext/siri/SiriEtBuilder.java | 52 ++++++- .../siri/SiriTimetableSnapshotSourceTest.java | 147 +++++++++++++----- .../ext/siri/SiriFuzzyTripMatcher.java | 25 ++- 3 files changed, 170 insertions(+), 54 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java index 11f9d137642..a82283f0b48 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java @@ -1,6 +1,8 @@ package org.opentripplanner.ext.siri; import java.math.BigInteger; +import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.function.Function; @@ -8,11 +10,13 @@ import org.opentripplanner.DateTimeHelper; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; +import uk.org.siri.siri20.DataFrameRefStructure; import uk.org.siri.siri20.DatedVehicleJourneyRef; import uk.org.siri.siri20.EstimatedCall; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; import uk.org.siri.siri20.EstimatedVehicleJourney; import uk.org.siri.siri20.EstimatedVersionFrameStructure; +import uk.org.siri.siri20.FramedVehicleJourneyRefStructure; import uk.org.siri.siri20.LineRef; import uk.org.siri.siri20.OperatorRefStructure; import uk.org.siri.siri20.QuayRefStructure; @@ -129,6 +133,40 @@ public SiriEtBuilder withVehicleJourneyRef(String id) { return this; } + public SiriEtBuilder withFramedVehicleJourneyRef( + Function producer + ) { + var builder = new FramedVehicleRefBuilder(); + builder = producer.apply(builder); + evj.setFramedVehicleJourneyRef(builder.build()); + return this; + } + + public static class FramedVehicleRefBuilder { + + private LocalDate serviceDate; + private String vehicleJourneyRef; + + public SiriEtBuilder.FramedVehicleRefBuilder withServiceDate(LocalDate serviceDate) { + this.serviceDate = serviceDate; + return this; + } + + public SiriEtBuilder.FramedVehicleRefBuilder withVehicleJourneyRef(String vehicleJourneyRef) { + this.vehicleJourneyRef = vehicleJourneyRef; + return this; + } + + public FramedVehicleJourneyRefStructure build() { + DataFrameRefStructure dataFrameRefStructure = new DataFrameRefStructure(); + dataFrameRefStructure.setValue(DateTimeFormatter.ISO_LOCAL_DATE.format(serviceDate)); + FramedVehicleJourneyRefStructure framedVehicleJourneyRefStructure = new FramedVehicleJourneyRefStructure(); + framedVehicleJourneyRefStructure.setDataFrameRef(dataFrameRefStructure); + framedVehicleJourneyRefStructure.setDatedVehicleJourneyRef(vehicleJourneyRef); + return framedVehicleJourneyRefStructure; + } + } + public static class RecordedCallsBuilder { private final ArrayList calls; @@ -210,15 +248,21 @@ public EstimatedCallsBuilder call(StopLocation stop) { public EstimatedCallsBuilder arriveAimedExpected(String aimedTime, String expectedTime) { var call = calls.getLast(); - call.setAimedArrivalTime(dateTimeHelper.zonedDateTime(aimedTime)); - call.setExpectedArrivalTime(dateTimeHelper.zonedDateTime(expectedTime)); + call.setAimedArrivalTime(aimedTime == null ? null : dateTimeHelper.zonedDateTime(aimedTime)); + call.setExpectedArrivalTime( + expectedTime == null ? null : dateTimeHelper.zonedDateTime(expectedTime) + ); return this; } public EstimatedCallsBuilder departAimedExpected(String aimedTime, String expectedTime) { var call = calls.getLast(); - call.setAimedDepartureTime(dateTimeHelper.zonedDateTime(aimedTime)); - call.setExpectedDepartureTime(dateTimeHelper.zonedDateTime(expectedTime)); + call.setAimedDepartureTime( + aimedTime == null ? null : dateTimeHelper.zonedDateTime(aimedTime) + ); + call.setExpectedDepartureTime( + expectedTime == null ? null : dateTimeHelper.zonedDateTime(expectedTime) + ); return this; } diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 19fdfb8636f..feb29cdab58 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -9,6 +9,7 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentripplanner.DateTimeHelper; @@ -40,10 +41,15 @@ class SiriTimetableSnapshotSourceTest { + private RealtimeTestEnvironment env; + + @BeforeEach + void setUp() { + env = new RealtimeTestEnvironment(); + } + @Test void testCancelTrip() { - var env = new RealtimeTestEnvironment(); - assertEquals(RealTimeState.SCHEDULED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); var updates = new SiriEtBuilder(env.getDateTimeHelper()) @@ -59,8 +65,6 @@ void testCancelTrip() { @Test void testAddJourney() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) @@ -81,8 +85,6 @@ void testAddJourney() { @Test void testReplaceJourney() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) @@ -111,32 +113,75 @@ void testReplaceJourney() { } /** - * Update calls without changing the pattern + * Update calls without changing the pattern. Match trip by dated vehicle journey. */ @Test - void testUpdateJourney() { - var env = new RealtimeTestEnvironment(); - - var updates = new SiriEtBuilder(env.getDateTimeHelper()) + void testUpdateJourneyWithDatedVehicleJourneyRef() { + var updates = updatedJourneyBuilder(env) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) - .withRecordedCalls(builder -> - builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") - ) - .withEstimatedCalls(builder -> - builder.call(env.stopB1).arriveAimedExpected("00:00:20", "00:00:25") + .buildEstimatedTimetableDeliveries(); + var result = env.applyEstimatedTimetable(updates); + assertEquals(1, result.successful()); + assertTripUpdated(env); + } + + /** + * Update calls without changing the pattern. Match trip by framed vehicle journey. + */ + @Test + void testUpdateJourneyWithFramedVehicleJourneyRef() { + var updates = updatedJourneyBuilder(env) + .withFramedVehicleJourneyRef(builder -> + builder.withServiceDate(env.serviceDate).withVehicleJourneyRef(env.trip1.getId().getId()) ) .buildEstimatedTimetableDeliveries(); + var result = env.applyEstimatedTimetable(updates); + assertEquals(1, result.successful()); + assertTripUpdated(env); + } + /** + * Update calls without changing the pattern. Missing reference to vehicle journey. + */ + @Test + void testUpdateJourneyWithoutJourneyRef() { + var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); + assertEquals(0, result.successful()); + } + /** + * Update calls without changing the pattern. Fuzzy matching. + */ + @Test + void testUpdateJourneyWithFuzzyMatching() { + var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); + var result = env.applyEstimatedTimetableWithFuzzyMatcher(updates); assertEquals(1, result.successful()); + assertTripUpdated(env); + } - var tripTimes = env.getTripTimesForTrip(env.trip1); - assertEquals(RealTimeState.UPDATED, tripTimes.getRealTimeState()); - assertEquals(11, tripTimes.getScheduledDepartureTime(0)); - assertEquals(15, tripTimes.getDepartureTime(0)); - assertEquals(20, tripTimes.getScheduledArrivalTime(1)); - assertEquals(25, tripTimes.getArrivalTime(1)); + /** + * Update calls without changing the pattern. Fuzzy matching. + * Edge case: invalid reference to vehicle journey and missing aimed departure time. + */ + @Test + void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { + var updates = new SiriEtBuilder(env.getDateTimeHelper()) + .withFramedVehicleJourneyRef(builder -> + builder.withServiceDate(env.serviceDate).withVehicleJourneyRef("XXX") + ) + .withEstimatedCalls(builder -> + builder + .call(env.stopA1) + .departAimedExpected(null, "00:00:12") + .call(env.stopB1) + .arriveAimedExpected("00:00:20", "00:00:22") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetableWithFuzzyMatcher(updates); + assertEquals(0, result.successful(), "Should fail gracefully"); } /** @@ -144,8 +189,6 @@ void testUpdateJourney() { */ @Test void testChangeQuay() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> @@ -172,8 +215,6 @@ void testChangeQuay() { @Test void testCancelStop() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip2.getId().getId()) .withEstimatedCalls(builder -> @@ -202,8 +243,6 @@ void testCancelStop() { @Test @Disabled("Not supported yet") void testAddStop() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> @@ -248,8 +287,6 @@ void testAddStop() { @Test void testNotMonitored() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withMonitored(false) .buildEstimatedTimetableDeliveries(); @@ -261,8 +298,6 @@ void testNotMonitored() { @Test void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef("newJourney") .withIsExtraJourney(true) @@ -286,8 +321,6 @@ void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { @Test void testNegativeHopTime() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> @@ -306,8 +339,6 @@ void testNegativeHopTime() { @Test void testNegativeDwellTime() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip2.getId().getId()) .withRecordedCalls(builder -> @@ -331,8 +362,6 @@ void testNegativeDwellTime() { @Test @Disabled("Not supported yet") void testExtraUnknownStop() { - var env = new RealtimeTestEnvironment(); - var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withEstimatedCalls(builder -> @@ -357,8 +386,28 @@ private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType erro assertEquals(result.failures().keySet(), Set.of(errorType)); } + private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) { + return new SiriEtBuilder(env.getDateTimeHelper()) + .withRecordedCalls(builder -> + builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") + ) + .withEstimatedCalls(builder -> + builder.call(env.stopB1).arriveAimedExpected("00:00:20", "00:00:25") + ); + } + + private static void assertTripUpdated(RealtimeTestEnvironment env) { + var tripTimes = env.getTripTimesForTrip(env.trip1); + assertEquals(RealTimeState.UPDATED, tripTimes.getRealTimeState()); + assertEquals(11, tripTimes.getScheduledDepartureTime(0)); + assertEquals(15, tripTimes.getDepartureTime(0)); + assertEquals(20, tripTimes.getScheduledArrivalTime(1)); + assertEquals(25, tripTimes.getArrivalTime(1)); + } + private static class RealtimeTestEnvironment { + public static final FeedScopedId SERVICE_ID = TransitModelForTest.id("SERVICE_ID"); private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); public final Station stationA = testModel.station("A").build(); @@ -411,12 +460,11 @@ public RealtimeTestEnvironment() { ); CalendarServiceData calendarServiceData = new CalendarServiceData(); - var cal_id = TransitModelForTest.id("CAL_1"); calendarServiceData.putServiceDatesForServiceId( - cal_id, + SERVICE_ID, List.of(serviceDate.minusDays(1), serviceDate, serviceDate.plusDays(1)) ); - transitModel.getServiceCodes().put(cal_id, 0); + transitModel.getServiceCodes().put(SERVICE_ID, 0); transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); transitModel.index(); @@ -428,7 +476,7 @@ public RealtimeTestEnvironment() { private record Stop(RegularStop stop, int arrivalTime, int departureTime) {} private Trip createTrip(String id, Route route, List stops) { - var trip = Trip.of(id(id)).withRoute(route).build(); + var trip = Trip.of(id(id)).withRoute(route).withServiceId(SERVICE_ID).build(); var tripOnServiceDate = TripOnServiceDate .of(trip.getId()) @@ -534,8 +582,21 @@ public String getFeedId() { } public UpdateResult applyEstimatedTimetable(List updates) { + return applyEstimatedTimetable(updates, null); + } + + public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( + List updates + ) { + return applyEstimatedTimetable(updates, SiriFuzzyTripMatcher.of(getTransitService())); + } + + private UpdateResult applyEstimatedTimetable( + List updates, + SiriFuzzyTripMatcher siriFuzzyTripMatcher + ) { return this.snapshotSource.applyEstimatedTimetable( - null, + siriFuzzyTripMatcher, getEntityResolver(), getFeedId(), false, diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java index 2f2f113fc79..5a2c89c3cb0 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java @@ -11,6 +11,7 @@ import java.util.function.BiFunction; import java.util.stream.Collectors; import javax.annotation.Nonnull; +import javax.annotation.Nullable; import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.calendar.CalendarService; @@ -98,6 +99,7 @@ public Trip match( /** * Matches EstimatedVehicleJourney to a set of possible Trips based on tripId */ + @Nullable public TripAndPattern match( EstimatedVehicleJourney journey, EntityResolver entityResolver, @@ -110,6 +112,14 @@ public TripAndPattern match( return null; } + if (calls.getFirst().getAimedDepartureTime() == null) { + LOG.warn( + "Missing aimed departure time on first stop for estimated vehicle journey '{}'", + DebugString.of(journey) + ); + return null; + } + Set trips = null; if ( journey.getVehicleRef() != null && @@ -119,7 +129,7 @@ public TripAndPattern match( } if (trips == null || trips.isEmpty()) { - CallWrapper lastStop = calls.get(calls.size() - 1); + CallWrapper lastStop = calls.getLast(); String lastStopPoint = lastStop.getStopPointRef(); ZonedDateTime arrivalTime = lastStop.getAimedArrivalTime() != null ? lastStop.getAimedArrivalTime() @@ -269,20 +279,21 @@ private Set getCachedTripsByInternalPlanningCode(String internalPlanningCo /** * Finds the correct trip based on OTP-ServiceDate and SIRI-DepartureTime */ - private TripAndPattern getTripAndPatternForJourney( + @Nullable + TripAndPattern getTripAndPatternForJourney( Set trips, List calls, EntityResolver entityResolver, BiFunction getCurrentTimetable, BiFunction getRealtimeAddedTripPattern ) { - var journeyFirstStop = entityResolver.resolveQuay(calls.get(0).getStopPointRef()); - var journeyLastStop = entityResolver.resolveQuay(calls.get(calls.size() - 1).getStopPointRef()); + var journeyFirstStop = entityResolver.resolveQuay(calls.getFirst().getStopPointRef()); + var journeyLastStop = entityResolver.resolveQuay(calls.getLast().getStopPointRef()); if (journeyFirstStop == null || journeyLastStop == null) { return null; } - ZonedDateTime date = calls.get(0).getAimedDepartureTime(); + ZonedDateTime date = calls.getFirst().getAimedDepartureTime(); LocalDate serviceDate = date.toLocalDate(); int departureInSecondsSinceMidnight = ServiceDateUtils.secondsSinceStartOfService( @@ -359,7 +370,7 @@ private Trip getTripForJourney( } if (results.size() == 1) { - return results.get(0); + return results.getFirst(); } else if (results.size() > 1) { // Multiple possible matches - check if lineRef/routeId matches if ( @@ -376,7 +387,7 @@ private Trip getTripForJourney( } // Line does not match any routeId - return first result. - return results.get(0); + return results.getFirst(); } return null; From f7466f0770d47ef80a42c9ac8546e3f0ab012be3 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 24 May 2024 11:03:16 +0200 Subject: [PATCH 1156/1688] refactor: Move FlexServiceDate into template package --- .../org/opentripplanner/ext/flex/FlexIntegrationTestData.java | 1 + .../ext/flex/template/FlexTemplateFactoryTest.java | 1 - src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java | 1 + .../ext/flex/template/AbstractFlexTemplate.java | 1 - .../opentripplanner/ext/flex/template/FlexAccessTemplate.java | 1 - .../opentripplanner/ext/flex/template/FlexEgressTemplate.java | 1 - .../ext/flex/{ => template}/FlexServiceDate.java | 4 ++-- .../ext/flex/template/FlexTemplateFactory.java | 1 - .../org/opentripplanner/model/plan/TestItineraryBuilder.java | 2 +- 9 files changed, 5 insertions(+), 8 deletions(-) rename src/ext/java/org/opentripplanner/ext/flex/{ => template}/FlexServiceDate.java (88%) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index 97deac5b3d9..d4a8a3894c1 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -11,6 +11,7 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; +import org.opentripplanner.ext.flex.template.FlexServiceDate; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.gtfs.graphbuilder.GtfsBundle; import org.opentripplanner.gtfs.graphbuilder.GtfsModule; diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index 68a657ebee7..4da59721b4f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -17,7 +17,6 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index c8d6c5cdae1..896fe7fdab0 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -19,6 +19,7 @@ import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; +import org.opentripplanner.ext.flex.template.FlexServiceDate; import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPRequestTimeoutException; diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index b8649422a7d..5a613d5a7df 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -10,7 +10,6 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.ext.flex.FlexPathDurations; -import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.trip.FlexTrip; diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 59fbb094eff..af64a7c9bfd 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -8,7 +8,6 @@ import java.util.List; import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.ext.flex.FlexPathDurations; -import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.trip.FlexTrip; diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index 1ab7ba89084..cb4a01273dd 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -5,7 +5,6 @@ import java.util.Collection; import java.util.List; import org.opentripplanner.ext.flex.FlexPathDurations; -import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.trip.FlexTrip; diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexServiceDate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java similarity index 88% rename from src/ext/java/org/opentripplanner/ext/flex/FlexServiceDate.java rename to src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java index d2ead1c80be..5019defefcd 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexServiceDate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.flex; +package org.opentripplanner.ext.flex.template; import gnu.trove.set.TIntSet; import java.time.LocalDate; @@ -33,7 +33,7 @@ public FlexServiceDate( this.servicesRunning = servicesRunning; } - boolean isFlexTripRunning(FlexTrip flexTrip, TransitService transitService) { + public boolean isFlexTripRunning(FlexTrip flexTrip, TransitService transitService) { return ( servicesRunning != null && servicesRunning.contains( diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 8df3e624132..6fe0cacabc5 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -4,7 +4,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.trip.FlexTrip; diff --git a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java index cfe3d553354..11cb59ffa5c 100644 --- a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -16,11 +16,11 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.ext.flex.FlexParameters; -import org.opentripplanner.ext.flex.FlexServiceDate; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; +import org.opentripplanner.ext.flex.template.FlexServiceDate; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.ext.ridehailing.model.RideEstimate; import org.opentripplanner.ext.ridehailing.model.RideHailingLeg; From 6fdc37de61daa9bf03e53dc43ea04098db11327e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 24 May 2024 11:18:43 +0200 Subject: [PATCH 1157/1688] refactor: Introduce an interface to hide dependencies to the graph and transit-service --- .../opentripplanner/ext/flex/FlexRouter.java | 34 ++++++++++++++++--- .../flex/template/AbstractFlexTemplate.java | 11 +++--- .../FlexAccessEgressCallbackService.java | 22 ++++++++++++ .../ext/flex/template/FlexAccessTemplate.java | 7 ++-- .../ext/flex/template/FlexEgressTemplate.java | 9 ++--- 5 files changed, 64 insertions(+), 19 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 896fe7fdab0..ef93925e49a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -17,6 +17,7 @@ import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; +import org.opentripplanner.ext.flex.template.FlexAccessEgressCallbackService; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; import org.opentripplanner.ext.flex.template.FlexServiceDate; @@ -24,14 +25,17 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.framework.time.ServiceDateUtils; +import org.opentripplanner.model.PathTransfer; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.street.model.vertex.TransitStopVertex; +import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; -public class FlexRouter { +public class FlexRouter implements FlexAccessEgressCallbackService { /* Transit data */ @@ -153,7 +157,7 @@ public Collection createFlexAccesses() { calculateFlexAccessTemplates(); return this.flexAccessTemplates.stream() - .flatMap(template -> template.createFlexAccessEgressStream(graph, transitService)) + .flatMap(template -> template.createFlexAccessEgressStream(this)) .toList(); } @@ -162,10 +166,30 @@ public Collection createFlexEgresses() { calculateFlexEgressTemplates(); return this.flexEgressTemplates.stream() - .flatMap(template -> template.createFlexAccessEgressStream(graph, transitService)) + .flatMap(template -> template.createFlexAccessEgressStream(this)) .toList(); } + @Override + public TransitStopVertex getStopVertexForStopId(FeedScopedId stopId) { + return graph.getStopVertexForStopId(stopId); + } + + @Override + public Collection getTransfersFromStop(StopLocation stop) { + return transitService.getTransfersByStop(stop); + } + + @Override + public Collection getTransfersToStop(StopLocation stop) { + return transitService.getFlexIndex().getTransfersToStop(stop); + } + + @Override + public boolean isDateActive(FlexServiceDate date, FlexTrip trip) { + return date.isFlexTripRunning(trip, transitService); + } + private void calculateFlexAccessTemplates() { if (this.flexAccessTemplates != null) { return; @@ -184,7 +208,7 @@ private void calculateFlexAccessTemplates() { Arrays .stream(dates) // Discard if service is not running on date - .filter(date -> date.isFlexTripRunning(it.flexTrip(), this.transitService)) + .filter(date -> isDateActive(date, it.flexTrip())) // Create templates from trip, boarding at the nearbyStop .flatMap(date -> templateFactory @@ -214,7 +238,7 @@ private void calculateFlexEgressTemplates() { Arrays .stream(dates) // Discard if service is not running on date - .filter(date -> date.isFlexTripRunning(it.flexTrip(), this.transitService)) + .filter(date -> isDateActive(date, it.flexTrip())) // Create templates from trips, alighting at the nearbyStop .flatMap(date -> templateFactory diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 5a613d5a7df..fc9303abfda 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -15,7 +15,6 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.model.PathTransfer; -import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.TransitStopVertex; @@ -24,7 +23,6 @@ import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.service.TransitService; /** * A container for a few pieces of information that can be used to calculate flex accesses, egresses, @@ -92,11 +90,10 @@ public StopLocation getAccessEgressStop() { * here will lead to noticeable speedups. */ public Stream createFlexAccessEgressStream( - Graph graph, - TransitService transitService + FlexAccessEgressCallbackService callback ) { if (transferStop instanceof RegularStop stop) { - TransitStopVertex flexVertex = graph.getStopVertexForStopId(stop.getId()); + TransitStopVertex flexVertex = callback.getStopVertexForStopId(stop.getId()); return Stream .of(getFlexAccessEgress(new ArrayList<>(), flexVertex, (RegularStop) transferStop)) .filter(Objects::nonNull); @@ -107,7 +104,7 @@ public Stream createFlexAccessEgressStream( maxTransferDuration.getSeconds() * accessEgress.state.getRequest().preferences().walk().speed(); - return getTransfersFromTransferStop(transitService) + return getTransfersFromTransferStop(callback) .stream() .filter(pathTransfer -> pathTransfer.getDistanceMeters() <= maxDistanceMeters) .filter(transfer -> getFinalStop(transfer) != null) @@ -153,7 +150,7 @@ public String toString() { * flex ride for the access/egress. */ protected abstract Collection getTransfersFromTransferStop( - TransitService transitService + FlexAccessEgressCallbackService callback ); /** diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java new file mode 100644 index 00000000000..f73e70e7ff0 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java @@ -0,0 +1,22 @@ +package org.opentripplanner.ext.flex.template; + +import java.util.Collection; +import org.opentripplanner.ext.flex.trip.FlexTrip; +import org.opentripplanner.model.PathTransfer; +import org.opentripplanner.street.model.vertex.TransitStopVertex; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.site.StopLocation; + +public interface FlexAccessEgressCallbackService { + TransitStopVertex getStopVertexForStopId(FeedScopedId id); + Collection getTransfersFromStop(StopLocation stop); + Collection getTransfersToStop(StopLocation stop); + + /** + * Return true if date is an active service date for the given trip, and can be used for + * the given boarding stop position. The implementation should check that the trip is in + * service for the given date. It should check other restrictions as well, like booking + * arrangement constraints. + */ + boolean isDateActive(FlexServiceDate date, FlexTrip trip); +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index af64a7c9bfd..dfd3682b286 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -21,7 +21,6 @@ import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.service.TransitService; public class FlexAccessTemplate extends AbstractFlexTemplate { @@ -126,8 +125,10 @@ protected RegularStop getFinalStop(PathTransfer transfer) { return transfer.to instanceof RegularStop ? (RegularStop) transfer.to : null; } - protected Collection getTransfersFromTransferStop(TransitService transitService) { - return transitService.getTransfersByStop(transferStop); + protected Collection getTransfersFromTransferStop( + FlexAccessEgressCallbackService callback + ) { + return callback.getTransfersFromStop(transferStop); } protected Vertex getFlexVertex(Edge edge) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index cb4a01273dd..38000e92848 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -15,13 +15,12 @@ import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.service.TransitService; public class FlexEgressTemplate extends AbstractFlexTemplate { public FlexEgressTemplate( NearbyStop accessEgress, - FlexTrip trip, + FlexTrip trip, int fromStopIndex, int toStopIndex, StopLocation transferStop, @@ -49,8 +48,10 @@ protected RegularStop getFinalStop(PathTransfer transfer) { return transfer.from instanceof RegularStop regularStop ? regularStop : null; } - protected Collection getTransfersFromTransferStop(TransitService transitService) { - return transitService.getFlexIndex().getTransfersToStop(transferStop); + protected Collection getTransfersFromTransferStop( + FlexAccessEgressCallbackService callback + ) { + return callback.getTransfersToStop(transferStop); } protected Vertex getFlexVertex(Edge edge) { From 8ea57a3d094fdc4eee13264e63bc1799b7961da3 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 24 May 2024 11:19:34 +0200 Subject: [PATCH 1158/1688] refactor: Declare generic types for FlexTrip --- .../org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java | 6 +++--- .../flexpathcalculator/ScheduledFlexPathCalculator.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index 0db66e04e0d..a3aed8f70e1 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -16,7 +16,7 @@ public class FlexTripEdge extends Edge { - private final FlexTrip trip; + private final FlexTrip trip; public final StopLocation s1; public final StopLocation s2; public final AbstractFlexTemplate flexTemplate; @@ -27,7 +27,7 @@ private FlexTripEdge( Vertex v2, StopLocation s1, StopLocation s2, - FlexTrip trip, + FlexTrip trip, AbstractFlexTemplate flexTemplate, FlexPath flexPath ) { @@ -48,7 +48,7 @@ public static FlexTripEdge createFlexTripEdge( Vertex v2, StopLocation s1, StopLocation s2, - FlexTrip trip, + FlexTrip trip, AbstractFlexTemplate flexTemplate, FlexPath flexPath ) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java index 7d953abc4fd..4168ecdf157 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java @@ -13,7 +13,7 @@ public class ScheduledFlexPathCalculator implements FlexPathCalculator { private final FlexPathCalculator flexPathCalculator; private final FlexTrip trip; - public ScheduledFlexPathCalculator(FlexPathCalculator flexPathCalculator, FlexTrip trip) { + public ScheduledFlexPathCalculator(FlexPathCalculator flexPathCalculator, FlexTrip trip) { this.flexPathCalculator = flexPathCalculator; this.trip = trip; } From 46ad6d6b7772487f57cf4d1458ebe71e7996f410 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 24 May 2024 11:25:16 +0200 Subject: [PATCH 1159/1688] refactor: Inline state in FlexRouter --- .../opentripplanner/ext/flex/FlexRouter.java | 102 ++++++++---------- 1 file changed, 44 insertions(+), 58 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index ef93925e49a..05c58e11792 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -53,13 +53,8 @@ public class FlexRouter implements FlexAccessEgressCallbackService { private final ZonedDateTime startOfTime; private final int departureTime; private final boolean arriveBy; - private final FlexServiceDate[] dates; - /* State */ - private List flexAccessTemplates = null; - private List flexEgressTemplates = null; - public FlexRouter( Graph graph, TransitService transitService, @@ -120,19 +115,18 @@ public FlexRouter( public Collection createFlexOnlyItineraries() { OTPRequestTimeoutException.checkForTimeout(); - calculateFlexAccessTemplates(); - calculateFlexEgressTemplates(); + var flexAccessTemplates = calculateFlexAccessTemplates(); + var flexEgressTemplates = calculateFlexEgressTemplates(); Multimap streetEgressByStop = HashMultimap.create(); streetEgresses.forEach(it -> streetEgressByStop.put(it.stop, it)); Collection itineraries = new ArrayList<>(); - for (FlexAccessTemplate template : this.flexAccessTemplates) { + for (FlexAccessTemplate template : flexAccessTemplates) { StopLocation transferStop = template.getTransferStop(); if ( - this.flexEgressTemplates.stream() - .anyMatch(t -> t.getAccessEgressStop().equals(transferStop)) + flexEgressTemplates.stream().anyMatch(t -> t.getAccessEgressStop().equals(transferStop)) ) { for (NearbyStop egress : streetEgressByStop.get(transferStop)) { Itinerary itinerary = template.createDirectGraphPath( @@ -154,18 +148,20 @@ public Collection createFlexOnlyItineraries() { public Collection createFlexAccesses() { OTPRequestTimeoutException.checkForTimeout(); - calculateFlexAccessTemplates(); + var flexAccessTemplates = calculateFlexAccessTemplates(); - return this.flexAccessTemplates.stream() + return flexAccessTemplates + .stream() .flatMap(template -> template.createFlexAccessEgressStream(this)) .toList(); } public Collection createFlexEgresses() { OTPRequestTimeoutException.checkForTimeout(); - calculateFlexEgressTemplates(); + var flexEgressTemplates = calculateFlexEgressTemplates(); - return this.flexEgressTemplates.stream() + return flexEgressTemplates + .stream() .flatMap(template -> template.createFlexAccessEgressStream(this)) .toList(); } @@ -190,64 +186,54 @@ public boolean isDateActive(FlexServiceDate date, FlexTrip trip) { return date.isFlexTripRunning(trip, transitService); } - private void calculateFlexAccessTemplates() { - if (this.flexAccessTemplates != null) { - return; - } - + private List calculateFlexAccessTemplates() { var templateFactory = FlexTemplateFactory.of( accessFlexPathCalculator, flexParameters.maxTransferDuration() ); // Fetch the closest flexTrips reachable from the access stops - this.flexAccessTemplates = - getClosestFlexTrips(streetAccesses, true) - // For each date the router has data for - .flatMap(it -> - Arrays - .stream(dates) - // Discard if service is not running on date - .filter(date -> isDateActive(date, it.flexTrip())) - // Create templates from trip, boarding at the nearbyStop - .flatMap(date -> - templateFactory - .with(date, it.flexTrip(), it.accessEgress()) - .createAccessTemplates() - .stream() - ) - ) - .toList(); + return getClosestFlexTrips(streetAccesses, true) + // For each date the router has data for + .flatMap(it -> + Arrays + .stream(dates) + // Discard if service is not running on date + .filter(date -> isDateActive(date, it.flexTrip())) + // Create templates from trip, boarding at the nearbyStop + .flatMap(date -> + templateFactory + .with(date, it.flexTrip(), it.accessEgress()) + .createAccessTemplates() + .stream() + ) + ) + .toList(); } - private void calculateFlexEgressTemplates() { - if (this.flexEgressTemplates != null) { - return; - } - + private List calculateFlexEgressTemplates() { var templateFactory = FlexTemplateFactory.of( egressFlexPathCalculator, flexParameters.maxTransferDuration() ); // Fetch the closest flexTrips reachable from the egress stops - this.flexEgressTemplates = - getClosestFlexTrips(streetEgresses, false) - // For each date the router has data for - .flatMap(it -> - Arrays - .stream(dates) - // Discard if service is not running on date - .filter(date -> isDateActive(date, it.flexTrip())) - // Create templates from trips, alighting at the nearbyStop - .flatMap(date -> - templateFactory - .with(date, it.flexTrip(), it.accessEgress()) - .createEgressTemplates() - .stream() - ) - ) - .toList(); + return getClosestFlexTrips(streetEgresses, false) + // For each date the router has data for + .flatMap(it -> + Arrays + .stream(dates) + // Discard if service is not running on date + .filter(date -> isDateActive(date, it.flexTrip())) + // Create templates from trips, alighting at the nearbyStop + .flatMap(date -> + templateFactory + .with(date, it.flexTrip(), it.accessEgress()) + .createEgressTemplates() + .stream() + ) + ) + .toList(); } private Stream getClosestFlexTrips( From a9ba2492a4c1b3d75bf56c7715794212b7521426 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 24 May 2024 11:38:53 +0200 Subject: [PATCH 1160/1688] Relax access to fuzzy matcher constructor for tests --- .../ext/siri/SiriTimetableSnapshotSourceTest.java | 3 ++- .../org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index feb29cdab58..3ca345c3fed 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -588,7 +588,8 @@ public UpdateResult applyEstimatedTimetable(List updates ) { - return applyEstimatedTimetable(updates, SiriFuzzyTripMatcher.of(getTransitService())); + SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); + return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); } private UpdateResult applyEstimatedTimetable( diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java index 5a2c89c3cb0..aa7afd573d5 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java @@ -65,7 +65,10 @@ public static SiriFuzzyTripMatcher of(TransitService transitService) { return instance; } - private SiriFuzzyTripMatcher(TransitService transitService) { + /** + * Constructor with package access for tests only. + */ + SiriFuzzyTripMatcher(TransitService transitService) { this.transitService = transitService; initCache(this.transitService); } From 61f9fd9bc7363b3db25175f7750d791bfef1793b Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 24 May 2024 12:15:09 +0200 Subject: [PATCH 1161/1688] Ignore silently missing aimed departure time --- .../org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java index aa7afd573d5..a0b56dec58a 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java @@ -116,10 +116,6 @@ public TripAndPattern match( } if (calls.getFirst().getAimedDepartureTime() == null) { - LOG.warn( - "Missing aimed departure time on first stop for estimated vehicle journey '{}'", - DebugString.of(journey) - ); return null; } From 387f698168160a07edb5cfa2765a7de536a8af32 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 24 May 2024 12:52:41 +0200 Subject: [PATCH 1162/1688] refactor: Cleanup flex-service-dates creation --- .../opentripplanner/ext/flex/FlexRouter.java | 54 +++++++++++-------- 1 file changed, 33 insertions(+), 21 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 05c58e11792..60999e208c8 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -7,7 +7,6 @@ import java.time.ZoneId; import java.time.ZonedDateTime; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.List; @@ -53,7 +52,7 @@ public class FlexRouter implements FlexAccessEgressCallbackService { private final ZonedDateTime startOfTime; private final int departureTime; private final boolean arriveBy; - private final FlexServiceDate[] dates; + private final List dates; public FlexRouter( Graph graph, @@ -96,21 +95,13 @@ public FlexRouter( this.startOfTime = ServiceDateUtils.asStartOfService(searchDate, tz); this.departureTime = ServiceDateUtils.secondsSinceStartOfTime(startOfTime, searchInstant); this.arriveBy = arriveBy; - - int totalDays = additionalPastSearchDays + 1 + additionalFutureSearchDays; - - this.dates = new FlexServiceDate[totalDays]; - - for (int d = -additionalPastSearchDays; d <= additionalFutureSearchDays; ++d) { - LocalDate date = searchDate.plusDays(d); - int index = d + additionalPastSearchDays; - dates[index] = - new FlexServiceDate( - date, - ServiceDateUtils.secondsSinceStartOfTime(startOfTime, date), - transitService.getServiceCodesRunningForDate(date) - ); - } + this.dates = + createFlexServiceDates( + transitService, + additionalPastSearchDays, + additionalFutureSearchDays, + searchDate + ); } public Collection createFlexOnlyItineraries() { @@ -196,8 +187,8 @@ private List calculateFlexAccessTemplates() { return getClosestFlexTrips(streetAccesses, true) // For each date the router has data for .flatMap(it -> - Arrays - .stream(dates) + dates + .stream() // Discard if service is not running on date .filter(date -> isDateActive(date, it.flexTrip())) // Create templates from trip, boarding at the nearbyStop @@ -221,8 +212,8 @@ private List calculateFlexEgressTemplates() { return getClosestFlexTrips(streetEgresses, false) // For each date the router has data for .flatMap(it -> - Arrays - .stream(dates) + dates + .stream() // Discard if service is not running on date .filter(date -> isDateActive(date, it.flexTrip())) // Create templates from trips, alighting at the nearbyStop @@ -271,5 +262,26 @@ private Stream getClosestFlexTrips( .flatMap(Optional::stream); } + private List createFlexServiceDates( + TransitService transitService, + int additionalPastSearchDays, + int additionalFutureSearchDays, + LocalDate searchDate + ) { + final List dates = new ArrayList<>(); + + for (int d = -additionalPastSearchDays; d <= additionalFutureSearchDays; ++d) { + LocalDate date = searchDate.plusDays(d); + dates.add( + new FlexServiceDate( + date, + ServiceDateUtils.secondsSinceStartOfTime(startOfTime, date), + transitService.getServiceCodesRunningForDate(date) + ) + ); + } + return List.copyOf(dates); + } + private record AccessEgressAndNearbyStop(NearbyStop accessEgress, FlexTrip flexTrip) {} } From e7ae4704821e2593ebb692611746221c984c4cbf Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 24 May 2024 14:52:45 +0300 Subject: [PATCH 1163/1688] More doc and method name changes based on review --- .../ext/siri/SiriTimetableSnapshotSource.java | 2 +- .../org/opentripplanner/model/TimetableSnapshot.java | 5 +---- .../updater/trip/TimetableSnapshotSource.java | 2 +- .../updater/trip/TimetableSnapshotSourceTest.java | 12 +++++------- 4 files changed, 8 insertions(+), 13 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 83f2b491632..e5bd9927cc0 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -356,7 +356,7 @@ private Result handleModifiedTrip( // Also check whether trip id has been used for previously ADDED/MODIFIED trip message and // remove the previously created trip - this.buffer.removeRealtimeAddedTripPatternAndTimetablesForTrip(trip.getId(), serviceDate); + this.buffer.revertTripToScheduledTripPattern(trip.getId(), serviceDate); return updateResult; } diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index cce55c0c4a0..60fb8c52205 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -303,10 +303,7 @@ public void clear(String feedId) { * @return true if the trip was found to be shifted to a different trip pattern by a realtime * message and an attempt was made to re-associate it with its originally scheduled trip pattern. */ - public boolean removeRealtimeAddedTripPatternAndTimetablesForTrip( - FeedScopedId tripId, - LocalDate serviceDate - ) { + public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serviceDate) { boolean success = false; final TripPattern pattern = getRealtimeAddedTripPattern(tripId, serviceDate); diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 2299601255b..6287bde6fb0 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -290,7 +290,7 @@ public UpdateResult applyTripUpdates( cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType); // Remove previous realtime updates for this trip. This is necessary to avoid previous // stop pattern modifications from persisting - this.buffer.removeRealtimeAddedTripPatternAndTimetablesForTrip(tripId, serviceDate); + this.buffer.revertTripToScheduledTripPattern(tripId, serviceDate); } uIndex += 1; diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index f9a2c429369..9a2c197a70c 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -1013,7 +1013,7 @@ private TripPattern assertAddedTrip( boolean forceSnapshotCommit ) { var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A")); - // Get trip pattern of last (most recently added) outgoing edge + // Get the trip pattern of the added trip which goes through stopA var snapshot = updater.getTimetableSnapshot(forceSnapshotCommit); var patternsAtA = snapshot.getPatternsForStop(stopA); @@ -1184,7 +1184,7 @@ public void repeatedlyAddedTripWithNewRoute() { assertNotNull(transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId())); } - static List addedRemovalTestCase() { + static List cancelingAddedTripTestCases() { return List.of( // TODO we might want to change the behaviour so that only the trip without pattern is // persisted if the added trip is cancelled @@ -1204,7 +1204,7 @@ static List addedRemovalTestCase() { * added by realtime data be present in the trip pattern for scheduled service. */ @ParameterizedTest - @MethodSource("addedRemovalTestCase") + @MethodSource("cancelingAddedTripTestCases") public void cancelingAddedTrip( ScheduleRelationship scheduleRelationship, RealTimeState expectedState @@ -1234,8 +1234,6 @@ public void cancelingAddedTrip( // THEN assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, true); - builder = new TripUpdateBuilder(addedTripId, SERVICE_DATE, ADDED, transitModel.getTimeZone()); - var tripDescriptorBuilder = TripDescriptor.newBuilder(); tripDescriptorBuilder.setTripId(addedTripId); tripDescriptorBuilder.setScheduleRelationship(scheduleRelationship); @@ -1253,9 +1251,9 @@ public void cancelingAddedTrip( ); // THEN - // Get trip pattern of last (most recently added) outgoing edge var snapshot = updater.getTimetableSnapshot(true); var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A")); + // Get the trip pattern of the added trip which goes through stopA var patternsAtA = snapshot.getPatternsForStop(stopA); assertNotNull(patternsAtA, "Added trip pattern should be found"); @@ -1269,7 +1267,7 @@ public void cancelingAddedTrip( final int forTodayAddedTripIndex = forToday.getTripIndex(addedTripId); assertTrue( forTodayAddedTripIndex > -1, - "Added trip should not be found in time table for service date" + "Added trip should be found in time table for the service date" ); assertEquals(expectedState, forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState()); From b6a80717724aa22e17b77bf74f3c62d36f3ea738 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 24 May 2024 13:43:40 +0000 Subject: [PATCH 1164/1688] fix(deps): update jersey monorepo to v3.1.7 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b199272dc63..b9b08e64a58 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ 31.1 2.51.1 2.17.1 - 3.1.6 + 3.1.7 5.10.2 1.13.0 5.5.3 From 78b180d9da8aae0390ccb85124409b3b9071999b Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 24 May 2024 19:18:25 +0200 Subject: [PATCH 1165/1688] refactor: remove itinerary mapping from flex direct search --- .../opentripplanner/ext/flex/FlexRouter.java | 20 ++-- .../ext/flex/template/DirectFlexPath.java | 5 + .../ext/flex/template/FlexAccessTemplate.java | 99 +++++++++---------- 3 files changed, 61 insertions(+), 63 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 60999e208c8..6a8c9b10fed 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -13,6 +13,7 @@ import java.util.Optional; import java.util.stream.Collectors; import java.util.stream.Stream; +import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; @@ -120,15 +121,16 @@ public Collection createFlexOnlyItineraries() { flexEgressTemplates.stream().anyMatch(t -> t.getAccessEgressStop().equals(transferStop)) ) { for (NearbyStop egress : streetEgressByStop.get(transferStop)) { - Itinerary itinerary = template.createDirectGraphPath( - egress, - arriveBy, - departureTime, - startOfTime, - graphPathToItineraryMapper - ); - if (itinerary != null) { - itineraries.add(itinerary); + var directFlexPath = template.createDirectGraphPath(egress, arriveBy, departureTime); + if(directFlexPath.isPresent()) { + var startTime = startOfTime.plusSeconds(directFlexPath.get().startTime()); + var itinerary = graphPathToItineraryMapper + .generateItinerary(new GraphPath<>(directFlexPath.get().state())) + .withTimeShiftToStartAt(startTime); + + if (itinerary != null) { + itineraries.add(itinerary); + } } } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java new file mode 100644 index 00000000000..2e20d94b88c --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java @@ -0,0 +1,5 @@ +package org.opentripplanner.ext.flex.template; + +import org.opentripplanner.street.search.state.State; + +public record DirectFlexPath(int startTime, State state) {} diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index dfd3682b286..136de329703 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -3,17 +3,14 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; import java.time.Duration; -import java.time.ZonedDateTime; import java.util.Collection; import java.util.List; -import org.opentripplanner.astar.model.GraphPath; +import java.util.Optional; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.model.PathTransfer; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.routing.algorithm.mapping.GraphPathToItineraryMapper; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.Vertex; @@ -46,75 +43,69 @@ public FlexAccessTemplate( ); } - public Itinerary createDirectGraphPath( + public Optional createDirectGraphPath( NearbyStop egress, boolean arriveBy, - int departureTime, - ZonedDateTime startOfTime, - GraphPathToItineraryMapper graphPathToItineraryMapper + int departureTime ) { List egressEdges = egress.edges; Vertex flexToVertex = egress.state.getVertex(); if (!isRouteable(flexToVertex)) { - return null; + return Optional.empty(); } var flexEdge = getFlexEdge(flexToVertex, egress.stop); if (flexEdge == null) { - return null; + return Optional.empty(); } final State[] afterFlexState = flexEdge.traverse(accessEgress.state); var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], egressEdges); - return finalStateOpt - .map(finalState -> { - var flexDurations = calculateFlexPathDurations(flexEdge, finalState); - - int timeShift; - - if (arriveBy) { - int lastStopArrivalTime = flexDurations.mapToFlexTripArrivalTime(departureTime); - int latestArrivalTime = trip.latestArrivalTime( - lastStopArrivalTime, - fromStopIndex, - toStopIndex, - flexDurations.trip() - ); - - if (latestArrivalTime == MISSING_VALUE) { - return null; - } - - // Shift from departing at departureTime to arriving at departureTime - timeShift = - flexDurations.mapToRouterArrivalTime(latestArrivalTime) - flexDurations.total(); - } else { - int firstStopDepartureTime = flexDurations.mapToFlexTripDepartureTime(departureTime); - int earliestDepartureTime = trip.earliestDepartureTime( - firstStopDepartureTime, - fromStopIndex, - toStopIndex, - flexDurations.trip() - ); - - if (earliestDepartureTime == MISSING_VALUE) { - return null; - } - timeShift = flexDurations.mapToRouterDepartureTime(earliestDepartureTime); - } - - ZonedDateTime startTime = startOfTime.plusSeconds(timeShift); - - return graphPathToItineraryMapper - .generateItinerary(new GraphPath<>(finalState)) - .withTimeShiftToStartAt(startTime); - }) - .orElse(null); + if (finalStateOpt.isEmpty()) { + return Optional.empty(); + } + + var finalState = finalStateOpt.get(); + var flexDurations = calculateFlexPathDurations(flexEdge, finalState); + + int timeShift; + + if (arriveBy) { + int lastStopArrivalTime = flexDurations.mapToFlexTripArrivalTime(departureTime); + int latestArrivalTime = trip.latestArrivalTime( + lastStopArrivalTime, + fromStopIndex, + toStopIndex, + flexDurations.trip() + ); + + if (latestArrivalTime == MISSING_VALUE) { + return Optional.empty(); + } + + // Shift from departing at departureTime to arriving at departureTime + timeShift = flexDurations.mapToRouterArrivalTime(latestArrivalTime) - flexDurations.total(); + } else { + int firstStopDepartureTime = flexDurations.mapToFlexTripDepartureTime(departureTime); + int earliestDepartureTime = trip.earliestDepartureTime( + firstStopDepartureTime, + fromStopIndex, + toStopIndex, + flexDurations.trip() + ); + + if (earliestDepartureTime == MISSING_VALUE) { + return Optional.empty(); + } + timeShift = flexDurations.mapToRouterDepartureTime(earliestDepartureTime); + } + + return Optional.of(new DirectFlexPath(timeShift, finalState)); } protected List getTransferEdges(PathTransfer transfer) { From a94def8984f2496274e1f9903e9b3c0d113337b4 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 24 May 2024 19:32:26 +0200 Subject: [PATCH 1166/1688] refactor: Pass arguments to create access/egress methods, without setup first --- .../template/FlexTemplateFactoryTest.java | 36 +++++++++---------- .../opentripplanner/ext/flex/FlexRouter.java | 12 ++----- .../flex/template/FlexTemplateFactory.java | 22 ++++++++++-- 3 files changed, 40 insertions(+), 30 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index 4da59721b4f..4360fb4f63d 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -93,7 +93,7 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createAccessTemplates(); + var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_A)); var template = subject.get(0); assertEquals(0, template.fromStopIndex); @@ -106,11 +106,11 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createAccessTemplates(); + subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_B)); assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createAccessTemplates(); + subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_C)); assertTrue(subject.isEmpty(), subject::toString); } @@ -125,7 +125,7 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with egress alighting at stop B - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createEgressTemplates(); + var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_B)); var template = subject.get(0); assertEquals(0, template.fromStopIndex); @@ -138,11 +138,11 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createEgressTemplates(); + subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_A)); assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createEgressTemplates(); + subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_C)); assertTrue(subject.isEmpty(), subject::toString); } @@ -159,7 +159,7 @@ void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with boarding at stop A - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createAccessTemplates(); + var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_A)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -170,7 +170,7 @@ void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() assertEquals(2, subject.size()); // Board at stop C - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createAccessTemplates(); + subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_C)); t1 = subject.get(0); assertEquals(2, t1.fromStopIndex); @@ -179,11 +179,11 @@ void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createAccessTemplates(); + subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_B)); assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_D)).createAccessTemplates(); + subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_D)); assertTrue(subject.isEmpty(), subject::toString); } @@ -200,7 +200,7 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with boarding at stop A - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_D)).createEgressTemplates(); + var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_D)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -211,7 +211,7 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() assertEquals(2, subject.size()); // Board at stop C - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createEgressTemplates(); + subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_B)); t1 = subject.get(0); assertEquals(0, t1.fromStopIndex); @@ -220,11 +220,11 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_C)).createEgressTemplates(); + subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_C)); assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result - subject = factory.with(DATE, flexTrip, nearbyStop(STOP_A)).createEgressTemplates(); + subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_A)); assertTrue(subject.isEmpty(), subject::toString); } @@ -239,7 +239,7 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoGroupsStops() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_G1)).createAccessTemplates(); + var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_G1)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -262,7 +262,7 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoGroupsStops() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_G4)).createEgressTemplates(); + var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_G4)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -286,7 +286,7 @@ void testCreateAccessTemplateForScheduledDeviatedTrip() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createAccessTemplates(); + var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_B)); var template = subject.get(0); assertEquals(1, template.fromStopIndex); @@ -308,7 +308,7 @@ void testCreateEgressTemplateForScheduledDeviatedTrip() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.with(DATE, flexTrip, nearbyStop(STOP_B)).createEgressTemplates(); + var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_B)); var template = subject.get(0); assertEquals(0, template.fromStopIndex); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 6a8c9b10fed..95385ac9c11 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -122,7 +122,7 @@ public Collection createFlexOnlyItineraries() { ) { for (NearbyStop egress : streetEgressByStop.get(transferStop)) { var directFlexPath = template.createDirectGraphPath(egress, arriveBy, departureTime); - if(directFlexPath.isPresent()) { + if (directFlexPath.isPresent()) { var startTime = startOfTime.plusSeconds(directFlexPath.get().startTime()); var itinerary = graphPathToItineraryMapper .generateItinerary(new GraphPath<>(directFlexPath.get().state())) @@ -195,10 +195,7 @@ private List calculateFlexAccessTemplates() { .filter(date -> isDateActive(date, it.flexTrip())) // Create templates from trip, boarding at the nearbyStop .flatMap(date -> - templateFactory - .with(date, it.flexTrip(), it.accessEgress()) - .createAccessTemplates() - .stream() + templateFactory.createAccessTemplates(date, it.flexTrip(), it.accessEgress()).stream() ) ) .toList(); @@ -220,10 +217,7 @@ private List calculateFlexEgressTemplates() { .filter(date -> isDateActive(date, it.flexTrip())) // Create templates from trips, alighting at the nearbyStop .flatMap(date -> - templateFactory - .with(date, it.flexTrip(), it.accessEgress()) - .createEgressTemplates() - .stream() + templateFactory.createEgressTemplates(date, it.flexTrip(), it.accessEgress()).stream() ) ) .toList(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 6fe0cacabc5..7bc2b4555ff 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -35,10 +35,26 @@ public static FlexTemplateFactory of( return new FlexTemplateFactory(calculator, maxTransferDuration); } + public List createAccessTemplates( + FlexServiceDate date, + FlexTrip flexTrip, + NearbyStop nearbyStop + ) { + return with(date, flexTrip, nearbyStop).createAccessTemplates(); + } + + public List createEgressTemplates( + FlexServiceDate date, + FlexTrip flexTrip, + NearbyStop nearbyStop + ) { + return with(date, flexTrip, nearbyStop).createEgressTemplates(); + } + /** * Add required parameters to the factory before calling the create methods. */ - public FlexTemplateFactory with( + private FlexTemplateFactory with( FlexServiceDate date, FlexTrip flexTrip, NearbyStop nearbyStop @@ -49,7 +65,7 @@ public FlexTemplateFactory with( return this; } - public List createAccessTemplates() { + private List createAccessTemplates() { assertRequiredParametersSet(); int boardIndex = trip.findBoardIndex(stop()); @@ -74,7 +90,7 @@ public List createAccessTemplates() { return result; } - public List createEgressTemplates() { + private List createEgressTemplates() { assertRequiredParametersSet(); var alightIndex = trip.findAlightIndex(stop()); From 77f336b8617d85eec45bb8ca1c1dabe08a7358d2 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 01:37:11 +0200 Subject: [PATCH 1167/1688] refactor: Separate integration and business logic in FlexRouter --- .../opentripplanner/ext/flex/FlexRouter.java | 187 +++++++++++------- .../FlexAccessEgressCallbackService.java | 1 + 2 files changed, 113 insertions(+), 75 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 95385ac9c11..554e6a83661 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -8,15 +8,14 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Collection; -import java.util.Comparator; +import java.util.HashMap; import java.util.List; -import java.util.Optional; -import java.util.stream.Collectors; -import java.util.stream.Stream; +import java.util.Map; import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; +import org.opentripplanner.ext.flex.template.DirectFlexPath; import org.opentripplanner.ext.flex.template.FlexAccessEgressCallbackService; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; import org.opentripplanner.ext.flex.template.FlexEgressTemplate; @@ -107,36 +106,56 @@ public FlexRouter( public Collection createFlexOnlyItineraries() { OTPRequestTimeoutException.checkForTimeout(); + + var directFlexPaths = calculateDirectFlexPaths(); + var itineraries = new ArrayList(); + + for (DirectFlexPath it : directFlexPaths) { + var startTime = startOfTime.plusSeconds(it.startTime()); + var itinerary = graphPathToItineraryMapper + .generateItinerary(new GraphPath<>(it.state())) + .withTimeShiftToStartAt(startTime); + + if (itinerary != null) { + itineraries.add(itinerary); + } + } + return itineraries; + } + + private Collection calculateDirectFlexPaths() { + Collection directFlexPaths = new ArrayList<>(); + var flexAccessTemplates = calculateFlexAccessTemplates(); var flexEgressTemplates = calculateFlexEgressTemplates(); Multimap streetEgressByStop = HashMultimap.create(); streetEgresses.forEach(it -> streetEgressByStop.put(it.stop, it)); - Collection itineraries = new ArrayList<>(); - for (FlexAccessTemplate template : flexAccessTemplates) { StopLocation transferStop = template.getTransferStop(); + + // TODO: Document or reimplement this. Why are we using the egress to see if the + // access-transfer-stop (last-stop) is used by at least one egress-template? + // Is it because: + // - of the group-stop expansion? + // - of the alight-restriction check? + // - nearest stop to trip match? + // Fix: Find out why and refactor out the business logic and reuse it. + // Problem: Any asymmetrical restriction witch apply/do not apply to the egress, + // but do not apply/apply to the access, like booking-notice. if ( flexEgressTemplates.stream().anyMatch(t -> t.getAccessEgressStop().equals(transferStop)) ) { for (NearbyStop egress : streetEgressByStop.get(transferStop)) { - var directFlexPath = template.createDirectGraphPath(egress, arriveBy, departureTime); - if (directFlexPath.isPresent()) { - var startTime = startOfTime.plusSeconds(directFlexPath.get().startTime()); - var itinerary = graphPathToItineraryMapper - .generateItinerary(new GraphPath<>(directFlexPath.get().state())) - .withTimeShiftToStartAt(startTime); - - if (itinerary != null) { - itineraries.add(itinerary); - } - } + template + .createDirectGraphPath(egress, arriveBy, departureTime) + .ifPresent(directFlexPaths::add); } } } - return itineraries; + return directFlexPaths; } public Collection createFlexAccesses() { @@ -174,6 +193,11 @@ public Collection getTransfersToStop(StopLocation stop) { return transitService.getFlexIndex().getTransfersToStop(stop); } + @Override + public Collection> getFlexTripsByStop(StopLocation stopLocation) { + return flexIndex.getFlexTripsByStop(stopLocation); + } + @Override public boolean isDateActive(FlexServiceDate date, FlexTrip trip) { return date.isFlexTripRunning(trip, transitService); @@ -185,20 +209,15 @@ private List calculateFlexAccessTemplates() { flexParameters.maxTransferDuration() ); - // Fetch the closest flexTrips reachable from the access stops - return getClosestFlexTrips(streetAccesses, true) - // For each date the router has data for - .flatMap(it -> - dates - .stream() - // Discard if service is not running on date - .filter(date -> isDateActive(date, it.flexTrip())) - // Create templates from trip, boarding at the nearbyStop - .flatMap(date -> - templateFactory.createAccessTemplates(date, it.flexTrip(), it.accessEgress()).stream() - ) - ) - .toList(); + var result = new ArrayList(); + var closestFlexTrips = getClosestFlexTrips(this, streetAccesses, dates, true); + + for (var it : closestFlexTrips) { + for (var date : it.activeDates) { + result.addAll(templateFactory.createAccessTemplates(date, it.flexTrip(), it.nearbyStop())); + } + } + return result; } private List calculateFlexEgressTemplates() { @@ -207,55 +226,50 @@ private List calculateFlexEgressTemplates() { flexParameters.maxTransferDuration() ); - // Fetch the closest flexTrips reachable from the egress stops - return getClosestFlexTrips(streetEgresses, false) - // For each date the router has data for - .flatMap(it -> - dates - .stream() - // Discard if service is not running on date - .filter(date -> isDateActive(date, it.flexTrip())) - // Create templates from trips, alighting at the nearbyStop - .flatMap(date -> - templateFactory.createEgressTemplates(date, it.flexTrip(), it.accessEgress()).stream() - ) - ) - .toList(); + var result = new ArrayList(); + var closestFlexTrips = getClosestFlexTrips(this, streetEgresses, dates, false); + + for (var it : closestFlexTrips) { + for (var date : it.activeDates) { + result.addAll(templateFactory.createEgressTemplates(date, it.flexTrip, it.nearbyStop())); + } + } + return result; } - private Stream getClosestFlexTrips( + /** This method is static, so we can move it to the FlexTemplateFactory later. */ + private static Collection getClosestFlexTrips( + FlexAccessEgressCallbackService callbackService, Collection nearbyStops, + List dates, boolean pickup ) { + Map, ClosestTrip> map = new HashMap<>(); // Find all trips reachable from the nearbyStops - Stream flexTripsReachableFromNearbyStops = nearbyStops - .stream() - .flatMap(accessEgress -> - flexIndex - .getFlexTripsByStop(accessEgress.stop) - .stream() - .filter(flexTrip -> - pickup - ? flexTrip.isBoardingPossible(accessEgress.stop) - : flexTrip.isAlightingPossible(accessEgress.stop) - ) - .map(flexTrip -> new AccessEgressAndNearbyStop(accessEgress, flexTrip)) - ); - - // Group all (NearbyStop, FlexTrip) tuples by flexTrip - Collection> groupedReachableFlexTrips = flexTripsReachableFromNearbyStops - .collect(Collectors.groupingBy(AccessEgressAndNearbyStop::flexTrip)) - .values(); + for (NearbyStop nearbyStop : nearbyStops) { + var stop = nearbyStop.stop; + for (var trip : callbackService.getFlexTripsByStop(stop)) { + int stopPos = pickup ? trip.findBoardIndex(stop) : trip.findAlightIndex(stop); + if (stopPos != FlexTrip.STOP_INDEX_NOT_FOUND) { + var existing = map.get(trip); + if (existing == null || nearbyStop.isBetter(existing.nearbyStop())) { + map.put(trip, new ClosestTrip(nearbyStop, trip, stopPos)); + } + } + } + } - // Get the tuple with least walking time from each group - return groupedReachableFlexTrips - .stream() - .map(t2s -> - t2s - .stream() - .min(Comparator.comparingLong(t2 -> t2.accessEgress().state.getElapsedTimeSeconds())) - ) - .flatMap(Optional::stream); + // Add active dates + for (Map.Entry, ClosestTrip> e : map.entrySet()) { + var closestTrip = e.getValue(); + // Include dates where the service is running + dates + .stream() + .filter(date -> callbackService.isDateActive(date, e.getKey())) + .forEach(closestTrip::addDate); + } + // Filter inactive trips and return + return map.values().stream().filter(ClosestTrip::hasActiveDates).toList(); } private List createFlexServiceDates( @@ -279,5 +293,28 @@ private List createFlexServiceDates( return List.copyOf(dates); } - private record AccessEgressAndNearbyStop(NearbyStop accessEgress, FlexTrip flexTrip) {} + /** + * The combination of the closest stop and trip with active dates where the trip is in service. + * + * @param activeDates This is a mutable list, when building an instance the + * {@link #addDate(FlexServiceDate)} can be used to add dates to the list. + */ + private record ClosestTrip( + NearbyStop nearbyStop, + FlexTrip flexTrip, + int stopPos, + List activeDates + ) { + public ClosestTrip(NearbyStop nearbyStop, FlexTrip flexTrip, int stopPos) { + this(nearbyStop, flexTrip, stopPos, new ArrayList<>()); + } + + public void addDate(FlexServiceDate date) { + activeDates.add(date); + } + + public boolean hasActiveDates() { + return !activeDates.isEmpty(); + } + } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java index f73e70e7ff0..213a643a99c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java @@ -11,6 +11,7 @@ public interface FlexAccessEgressCallbackService { TransitStopVertex getStopVertexForStopId(FeedScopedId id); Collection getTransfersFromStop(StopLocation stop); Collection getTransfersToStop(StopLocation stop); + Collection> getFlexTripsByStop(StopLocation stopLocation); /** * Return true if date is an active service date for the given trip, and can be used for From c94b013f0c8c1c85a0d8d0ff347475f074a2e16f Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 02:06:18 +0200 Subject: [PATCH 1168/1688] refactor: Move ClosestTrip logic out of FlexRouter --- .../opentripplanner/ext/flex/FlexRouter.java | 73 ++------------ .../ext/flex/template/ClosestTrip.java | 94 +++++++++++++++++++ 2 files changed, 100 insertions(+), 67 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 554e6a83661..595200b4219 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -8,13 +8,12 @@ import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.Collection; -import java.util.HashMap; import java.util.List; -import java.util.Map; import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; +import org.opentripplanner.ext.flex.template.ClosestTrip; import org.opentripplanner.ext.flex.template.DirectFlexPath; import org.opentripplanner.ext.flex.template.FlexAccessEgressCallbackService; import org.opentripplanner.ext.flex.template.FlexAccessTemplate; @@ -210,10 +209,10 @@ private List calculateFlexAccessTemplates() { ); var result = new ArrayList(); - var closestFlexTrips = getClosestFlexTrips(this, streetAccesses, dates, true); + var closestFlexTrips = ClosestTrip.of(this, streetAccesses, dates, true); for (var it : closestFlexTrips) { - for (var date : it.activeDates) { + for (var date : it.activeDates()) { result.addAll(templateFactory.createAccessTemplates(date, it.flexTrip(), it.nearbyStop())); } } @@ -227,51 +226,16 @@ private List calculateFlexEgressTemplates() { ); var result = new ArrayList(); - var closestFlexTrips = getClosestFlexTrips(this, streetEgresses, dates, false); + var closestFlexTrips = ClosestTrip.of(this, streetEgresses, dates, false); for (var it : closestFlexTrips) { - for (var date : it.activeDates) { - result.addAll(templateFactory.createEgressTemplates(date, it.flexTrip, it.nearbyStop())); + for (var date : it.activeDates()) { + result.addAll(templateFactory.createEgressTemplates(date, it.flexTrip(), it.nearbyStop())); } } return result; } - /** This method is static, so we can move it to the FlexTemplateFactory later. */ - private static Collection getClosestFlexTrips( - FlexAccessEgressCallbackService callbackService, - Collection nearbyStops, - List dates, - boolean pickup - ) { - Map, ClosestTrip> map = new HashMap<>(); - // Find all trips reachable from the nearbyStops - for (NearbyStop nearbyStop : nearbyStops) { - var stop = nearbyStop.stop; - for (var trip : callbackService.getFlexTripsByStop(stop)) { - int stopPos = pickup ? trip.findBoardIndex(stop) : trip.findAlightIndex(stop); - if (stopPos != FlexTrip.STOP_INDEX_NOT_FOUND) { - var existing = map.get(trip); - if (existing == null || nearbyStop.isBetter(existing.nearbyStop())) { - map.put(trip, new ClosestTrip(nearbyStop, trip, stopPos)); - } - } - } - } - - // Add active dates - for (Map.Entry, ClosestTrip> e : map.entrySet()) { - var closestTrip = e.getValue(); - // Include dates where the service is running - dates - .stream() - .filter(date -> callbackService.isDateActive(date, e.getKey())) - .forEach(closestTrip::addDate); - } - // Filter inactive trips and return - return map.values().stream().filter(ClosestTrip::hasActiveDates).toList(); - } - private List createFlexServiceDates( TransitService transitService, int additionalPastSearchDays, @@ -292,29 +256,4 @@ private List createFlexServiceDates( } return List.copyOf(dates); } - - /** - * The combination of the closest stop and trip with active dates where the trip is in service. - * - * @param activeDates This is a mutable list, when building an instance the - * {@link #addDate(FlexServiceDate)} can be used to add dates to the list. - */ - private record ClosestTrip( - NearbyStop nearbyStop, - FlexTrip flexTrip, - int stopPos, - List activeDates - ) { - public ClosestTrip(NearbyStop nearbyStop, FlexTrip flexTrip, int stopPos) { - this(nearbyStop, flexTrip, stopPos, new ArrayList<>()); - } - - public void addDate(FlexServiceDate date) { - activeDates.add(date); - } - - public boolean hasActiveDates() { - return !activeDates.isEmpty(); - } - } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java new file mode 100644 index 00000000000..085f6170429 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java @@ -0,0 +1,94 @@ +package org.opentripplanner.ext.flex.template; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.opentripplanner.ext.flex.trip.FlexTrip; +import org.opentripplanner.routing.graphfinder.NearbyStop; + +/** + * The combination of the closest stop and trip with active dates where the trip is in service. + * + * @param activeDates This is a mutable list, when building an instance the + * {@link #addDate(FlexServiceDate)} can be used to add dates to the list. + */ +public class ClosestTrip { + + private final NearbyStop nearbyStop; + private final FlexTrip flexTrip; + private final int stopPos; + private final List activeDates = new ArrayList<>(); + + private ClosestTrip(NearbyStop nearbyStop, FlexTrip flexTrip, int stopPos) { + this.nearbyStop = nearbyStop; + this.flexTrip = flexTrip; + this.stopPos = stopPos; + } + + /** This method is static, so we can move it to the FlexTemplateFactory later. */ + public static Collection of( + FlexAccessEgressCallbackService callbackService, + Collection nearbyStops, + List dates, + boolean pickup + ) { + Map, ClosestTrip> map = new HashMap<>(); + // Find all trips reachable from the nearbyStops + for (NearbyStop nearbyStop : nearbyStops) { + var stop = nearbyStop.stop; + for (var trip : callbackService.getFlexTripsByStop(stop)) { + int stopPos = pickup ? trip.findBoardIndex(stop) : trip.findAlightIndex(stop); + if (stopPos != FlexTrip.STOP_INDEX_NOT_FOUND) { + var existing = map.get(trip); + if ( + existing == null || + ( + nearbyStop.state.getElapsedTimeSeconds() < + existing.nearbyStop().state.getElapsedTimeSeconds() + ) + ) { + map.put(trip, new ClosestTrip(nearbyStop, trip, stopPos)); + } + } + } + } + + // Add active dates + for (Map.Entry, ClosestTrip> e : map.entrySet()) { + var closestTrip = e.getValue(); + // Include dates where the service is running + dates + .stream() + .filter(date -> callbackService.isDateActive(date, e.getKey())) + .forEach(closestTrip::addDate); + } + // Filter inactive trips and return + return map.values().stream().filter(ClosestTrip::hasActiveDates).toList(); + } + + public NearbyStop nearbyStop() { + return nearbyStop; + } + + public FlexTrip flexTrip() { + return flexTrip; + } + + public int stopPos() { + return stopPos; + } + + public Iterable activeDates() { + return activeDates; + } + + public void addDate(FlexServiceDate date) { + activeDates.add(date); + } + + public boolean hasActiveDates() { + return !activeDates.isEmpty(); + } +} From 00a7b4035fdf8198517da241522ce0cec2b4e1c8 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 01:35:31 +0200 Subject: [PATCH 1169/1688] fix: Add NearbyStop#isBetter and use in FlexRouting - this uses cost/weight not time for comparison. Unit-test on the added method is included --- .../ext/flex/template/ClosestTrip.java | 8 +---- .../routing/graphfinder/NearbyStop.java | 9 ++++++ .../routing/graphfinder/NearbyStopTest.java | 29 +++++++++++++++++++ 3 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java index 085f6170429..2a3b2392b02 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java @@ -42,13 +42,7 @@ public static Collection of( int stopPos = pickup ? trip.findBoardIndex(stop) : trip.findAlightIndex(stop); if (stopPos != FlexTrip.STOP_INDEX_NOT_FOUND) { var existing = map.get(trip); - if ( - existing == null || - ( - nearbyStop.state.getElapsedTimeSeconds() < - existing.nearbyStop().state.getElapsedTimeSeconds() - ) - ) { + if (existing == null || nearbyStop.isBetter(existing.nearbyStop())) { map.put(trip, new ClosestTrip(nearbyStop, trip, stopPos)); } } diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java b/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java index 4c35f11de8a..ada17120c6b 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/NearbyStop.java @@ -43,6 +43,15 @@ public static NearbyStop nearbyStopForState(State state, StopLocation stop) { return new NearbyStop(stop, effectiveWalkDistance, edges, state); } + /** + * Return {@code true} if this instance has a lower weight/cost than the given {@code other}. + * If the state is not set, the distance is used for comparison instead. If the + * weight/cost/distance is equals (or worse) this method returns {@code false}. + */ + public boolean isBetter(NearbyStop other) { + return compareTo(other) < 0; + } + @Override public int compareTo(NearbyStop that) { if ((this.state == null) != (that.state == null)) { diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java new file mode 100644 index 00000000000..a81d7c39c5e --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/graphfinder/NearbyStopTest.java @@ -0,0 +1,29 @@ +package org.opentripplanner.routing.graphfinder; + +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.transit.model._data.TransitModelForTest; + +class NearbyStopTest { + + private static TransitModelForTest MODEL = TransitModelForTest.of(); + + // TODO Add tests for all public methods in NearbyStop here + + @Test + void testIsBetter() { + // We only test the distance here, since the compareTo method used should have a more complete + // unit-test including tests on state weight. + var a = new NearbyStop(MODEL.stop("A").build(), 20.0, null, null); + var b = new NearbyStop(MODEL.stop("A").build(), 30.0, null, null); + + assertTrue(a.isBetter(b)); + assertFalse(b.isBetter(a)); + + var sameDistance = new NearbyStop(MODEL.stop("A").build(), 20.0, null, null); + assertFalse(a.isBetter(sameDistance)); + assertFalse(sameDistance.isBetter(a)); + } +} From daf61527a990c06a03105d67c1337ea3c0bb1db0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 26 May 2024 09:54:15 +0000 Subject: [PATCH 1170/1688] chore(deps): update debug ui dependencies (non-major) --- client-next/package-lock.json | 336 +++++++++++++++++++--------------- client-next/package.json | 6 +- 2 files changed, 192 insertions(+), 150 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 39b2c2e2298..20e7e0b83c1 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -24,11 +24,11 @@ "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "15.0.7", - "@types/react": "18.3.2", + "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@typescript-eslint/eslint-plugin": "7.10.0", "@typescript-eslint/parser": "7.10.0", - "@vitejs/plugin-react": "4.2.1", + "@vitejs/plugin-react": "4.3.0", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", @@ -37,7 +37,7 @@ "eslint-plugin-react": "7.34.1", "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", - "jsdom": "24.0.0", + "jsdom": "24.1.0", "prettier": "3.2.5", "typescript": "5.4.5", "vite": "5.2.11", @@ -214,12 +214,13 @@ } }, "node_modules/@babel/code-frame": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.2.tgz", - "integrity": "sha512-y5+tLQyV8pg3fsiln67BVLD1P13Eg4lh5RW9mF0zUuvLrv9uIQ4MCL+CRT+FTsBlBjcIan6PGsLcBN0m3ClUyQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.6.tgz", + "integrity": "sha512-ZJhac6FkEd1yhG2AHOmfcXG4ceoLltoCVJjN5XsWN9BifBQr+cHJbWi0h68HZuSORq+3WtJ2z0hwF2NG1b5kcA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/highlight": "^7.24.2", + "@babel/highlight": "^7.24.6", "picocolors": "^1.0.0" }, "engines": { @@ -227,30 +228,32 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.1.tgz", - "integrity": "sha512-Pc65opHDliVpRHuKfzI+gSA4zcgr65O4cl64fFJIWEEh8JoHIHh0Oez1Eo8Arz8zq/JhgKodQaxEwUPRtZylVA==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.6.tgz", + "integrity": "sha512-aC2DGhBq5eEdyXWqrDInSqQjO0k8xtPRf5YylULqx8MCd6jBtzqfta/3ETMRpuKIc5hyswfO80ObyA1MvkCcUQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/core": { - "version": "7.24.3", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.3.tgz", - "integrity": "sha512-5FcvN1JHw2sHJChotgx8Ek0lyuh4kCKelgMTTqhYJJtloNvUfpAFMeNQUtdlIaktwrSV9LtCdqwk48wL2wBacQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.24.6.tgz", + "integrity": "sha512-qAHSfAdVyFmIvl0VHELib8xar7ONuSHrE2hLnsaWkYNTI68dmi1x8GYDhJjMI/e7XWal9QBlZkwbOnkcw7Z8gQ==", "dev": true, + "license": "MIT", "dependencies": { "@ampproject/remapping": "^2.2.0", - "@babel/code-frame": "^7.24.2", - "@babel/generator": "^7.24.1", - "@babel/helper-compilation-targets": "^7.23.6", - "@babel/helper-module-transforms": "^7.23.3", - "@babel/helpers": "^7.24.1", - "@babel/parser": "^7.24.1", - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.1", - "@babel/types": "^7.24.0", + "@babel/code-frame": "^7.24.6", + "@babel/generator": "^7.24.6", + "@babel/helper-compilation-targets": "^7.24.6", + "@babel/helper-module-transforms": "^7.24.6", + "@babel/helpers": "^7.24.6", + "@babel/parser": "^7.24.6", + "@babel/template": "^7.24.6", + "@babel/traverse": "^7.24.6", + "@babel/types": "^7.24.6", "convert-source-map": "^2.0.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -266,12 +269,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.1.tgz", - "integrity": "sha512-DfCRfZsBcrPEHUfuBMgbJ1Ut01Y/itOs+hY2nFLgqsqXd52/iSiVq5TITtUasIUgm+IIKdY2/1I7auiQOEeC9A==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.24.6.tgz", + "integrity": "sha512-S7m4eNa6YAPJRHmKsLHIDJhNAGNKoWNiWefz1MBbpnt8g9lvMDl1hir4P9bo/57bQEmuwEhnRU/AMWsD0G/Fbg==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.24.0", + "@babel/types": "^7.24.6", "@jridgewell/gen-mapping": "^0.3.5", "@jridgewell/trace-mapping": "^0.3.25", "jsesc": "^2.5.1" @@ -293,13 +297,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.23.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.23.6.tgz", - "integrity": "sha512-9JB548GZoQVmzrFgp8o7KxdgkTGm6xs9DW0o/Pim72UDjzr5ObUQ6ZzYPqA+g9OTS2bBQoctLJrky0RDCAWRgQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.6.tgz", + "integrity": "sha512-VZQ57UsDGlX/5fFA7GkVPplZhHsVc+vuErWgdOiysI9Ksnw0Pbbd6pnPiR/mmJyKHgyIW0c7KT32gmhiF+cirg==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.23.5", - "@babel/helper-validator-option": "^7.23.5", + "@babel/compat-data": "^7.24.6", + "@babel/helper-validator-option": "^7.24.6", "browserslist": "^4.22.2", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -332,34 +337,37 @@ } }, "node_modules/@babel/helper-environment-visitor": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.22.20.tgz", - "integrity": "sha512-zfedSIzFhat/gFhWfHtgWvlec0nqB9YEIVrpuwjruLlXfUSnA8cJB0miHKwqDnQ7d32aKo2xt88/xZptwxbfhA==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.6.tgz", + "integrity": "sha512-Y50Cg3k0LKLMjxdPjIl40SdJgMB85iXn27Vk/qbHZCFx/o5XO3PSnpi675h1KEmmDb6OFArfd5SCQEQ5Q4H88g==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-function-name": { - "version": "7.23.0", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.23.0.tgz", - "integrity": "sha512-OErEqsrxjZTJciZ4Oo+eoZqeW9UIiOcuYKRJA4ZAgV9myA+pOXhhmpfNCKjEH/auVfEYVFJ6y1Tc4r0eIApqiw==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.24.6.tgz", + "integrity": "sha512-xpeLqeeRkbxhnYimfr2PC+iA0Q7ljX/d1eZ9/inYbmfG2jpl8Lu3DyXvpOAnrS5kxkfOWJjioIMQsaMBXFI05w==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.22.15", - "@babel/types": "^7.23.0" + "@babel/template": "^7.24.6", + "@babel/types": "^7.24.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-hoist-variables": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.22.5.tgz", - "integrity": "sha512-wGjk9QZVzvknA6yKIUURb8zY3grXCcOZt+/7Wcy8O2uctxhplmUPkOdlgoNhmdVee2c92JXbf1xpMtVNbfoxRw==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.24.6.tgz", + "integrity": "sha512-SF/EMrC3OD7dSta1bLJIlrsVxwtd0UpjRJqLno6125epQMJ/kyFmpTT4pbvPbdQHzCHg+biQ7Syo8lnDtbR+uA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.6" }, "engines": { "node": ">=6.9.0" @@ -378,28 +386,30 @@ } }, "node_modules/@babel/helper-module-imports": { - "version": "7.24.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.3.tgz", - "integrity": "sha512-viKb0F9f2s0BCS22QSF308z/+1YWKV/76mwt61NBzS5izMzDPwdq1pTrzf+Li3npBWX9KdQbkeCt1jSAM7lZqg==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.6.tgz", + "integrity": "sha512-a26dmxFJBF62rRO9mmpgrfTLsAuyHk4e1hKTUkD/fcMfynt8gvEKwQPQDVxWhca8dHoDck+55DFt42zV0QMw5g==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.24.0" + "@babel/types": "^7.24.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.23.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.23.3.tgz", - "integrity": "sha512-7bBs4ED9OmswdfDzpz4MpWgSrV7FXlc3zIagvLFjS5H+Mk7Snr21vQ6QwrsoCGMfNC4e4LQPdoULEt4ykz0SRQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.6.tgz", + "integrity": "sha512-Y/YMPm83mV2HJTbX1Qh2sjgjqcacvOlhbzdCCsSlblOKjSYmQqEbO6rUniWQyRo9ncyfjT8hnUjlG06RXDEmcA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-module-imports": "^7.22.15", - "@babel/helper-simple-access": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/helper-validator-identifier": "^7.22.20" + "@babel/helper-environment-visitor": "^7.24.6", + "@babel/helper-module-imports": "^7.24.6", + "@babel/helper-simple-access": "^7.24.6", + "@babel/helper-split-export-declaration": "^7.24.6", + "@babel/helper-validator-identifier": "^7.24.6" }, "engines": { "node": ">=6.9.0" @@ -421,10 +431,11 @@ } }, "node_modules/@babel/helper-plugin-utils": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.0.tgz", - "integrity": "sha512-9cUznXMG0+FxRuJfvL82QlTqIzhVW9sL0KjMPHhAOOvpQGL8QtdxnBKILjBqxlHyliz0yCa1G903ZXI/FuHy2w==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.6.tgz", + "integrity": "sha512-MZG/JcWfxybKwsA9N9PmtF2lOSFSEMVCpIRrbxccZFLJPrJciJdG/UhSh5W96GEteJI2ARqm5UAHxISwRDLSNg==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } @@ -447,12 +458,13 @@ } }, "node_modules/@babel/helper-simple-access": { - "version": "7.22.5", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.22.5.tgz", - "integrity": "sha512-n0H99E/K+Bika3++WNL17POvo4rKWZ7lZEp1Q+fStVbUi8nxPQEBOlTmCOxW/0JsS56SKKQ+ojAe2pHKJHN35w==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.6.tgz", + "integrity": "sha512-nZzcMMD4ZhmB35MOOzQuiGO5RzL6tJbsT37Zx8M5L/i9KSrukGXWTjLe1knIbb/RmxoJE9GON9soq0c0VEMM5g==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.6" }, "engines": { "node": ">=6.9.0" @@ -471,65 +483,70 @@ } }, "node_modules/@babel/helper-split-export-declaration": { - "version": "7.22.6", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.22.6.tgz", - "integrity": "sha512-AsUnxuLhRYsisFiaJwvp1QF+I3KjD5FOxut14q/GzovUe6orHLesW2C7d754kRm53h5gqrz6sFl6sxc4BVtE/g==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.24.6.tgz", + "integrity": "sha512-CvLSkwXGWnYlF9+J3iZUvwgAxKiYzK3BWuo+mLzD/MDGOZDj7Gq8+hqaOkMxmJwmlv0iu86uH5fdADd9Hxkymw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/types": "^7.22.5" + "@babel/types": "^7.24.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-string-parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.1.tgz", - "integrity": "sha512-2ofRCjnnA9y+wk8b9IAREroeUP02KHp431N2mhKniy2yKIDKpbrHv9eXwm8cBeWQYcJmzv5qKCu65P47eCF7CQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.6.tgz", + "integrity": "sha512-WdJjwMEkmBicq5T9fm/cHND3+UlFa2Yj8ALLgmoSQAJZysYbBjw+azChSGPN4DSPLXOcooGRvDwZWMcF/mLO2Q==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.22.20", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz", - "integrity": "sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.6.tgz", + "integrity": "sha512-4yA7s865JHaqUdRbnaxarZREuPTHrjpDT+pXoAZ1yhyo6uFnIEpS8VMu16siFOHDpZNKYv5BObhsB//ycbICyw==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.23.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.23.5.tgz", - "integrity": "sha512-85ttAOMLsr53VgXkTbkx8oA6YTfT4q7/HzXSLEYmjcSTJPMPQtvq1BD79Byep5xMUYbGRzEpDsjUf3dyp54IKw==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.6.tgz", + "integrity": "sha512-Jktc8KkF3zIkePb48QO+IapbXlSapOW9S+ogZZkcO6bABgYAxtZcjZ/O005111YLf+j4M84uEgwYoidDkXbCkQ==", "dev": true, + "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helpers": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.1.tgz", - "integrity": "sha512-BpU09QqEe6ZCHuIHFphEFgvNSrubve1FtyMton26ekZ85gRGi6LrTF7zArARp2YvyFxloeiRmtSCq5sjh1WqIg==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.6.tgz", + "integrity": "sha512-V2PI+NqnyFu1i0GyTd/O/cTpxzQCYioSkUIRmgo7gFEHKKCg5w46+r/A6WeUR1+P3TeQ49dspGPNd/E3n9AnnA==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/template": "^7.24.0", - "@babel/traverse": "^7.24.1", - "@babel/types": "^7.24.0" + "@babel/template": "^7.24.6", + "@babel/types": "^7.24.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/highlight": { - "version": "7.24.2", - "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.2.tgz", - "integrity": "sha512-Yac1ao4flkTxTteCDZLEvdxg2fZfz1v8M4QpaGypq/WPDqg3ijHYbDfs+LG5hvzSoqaSZ9/Z9lKSP3CjZjv+pA==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.6.tgz", + "integrity": "sha512-2YnuOp4HAk2BsBrJJvYCbItHx0zWscI1C3zgWkz+wDyD9I7GIVrfnLyrR4Y1VR+7p+chAEcrgRQYZAGIKMV7vQ==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-validator-identifier": "^7.24.6", "chalk": "^2.4.2", "js-tokens": "^4.0.0", "picocolors": "^1.0.0" @@ -543,6 +560,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", "dev": true, + "license": "MIT", "dependencies": { "color-convert": "^1.9.0" }, @@ -555,6 +573,7 @@ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", "dev": true, + "license": "MIT", "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -569,6 +588,7 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", "dev": true, + "license": "MIT", "dependencies": { "color-name": "1.1.3" } @@ -577,13 +597,15 @@ "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", - "dev": true + "dev": true, + "license": "MIT" }, "node_modules/@babel/highlight/node_modules/escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -593,6 +615,7 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", "dev": true, + "license": "MIT", "engines": { "node": ">=4" } @@ -602,6 +625,7 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", "dev": true, + "license": "MIT", "dependencies": { "has-flag": "^3.0.0" }, @@ -610,10 +634,11 @@ } }, "node_modules/@babel/parser": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.1.tgz", - "integrity": "sha512-Zo9c7N3xdOIQrNip7Lc9wvRPzlRtovHVE4lkz8WEDr7uYh/GMQhSiIgFxGIArRHYdJE5kxtZjAf8rT0xhdLCzg==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.24.6.tgz", + "integrity": "sha512-eNZXdfU35nJC2h24RznROuOpO94h6x8sg9ju0tT9biNtLZ2vuP8SduLqqV+/8+cebSLV9SJEAN5Z3zQbJG/M+Q==", "dev": true, + "license": "MIT", "bin": { "parser": "bin/babel-parser.js" }, @@ -1002,12 +1027,13 @@ } }, "node_modules/@babel/plugin-transform-react-jsx-self": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.1.tgz", - "integrity": "sha512-kDJgnPujTmAZ/9q2CN4m2/lRsUUPDvsG3+tSHWUJIzMGTt5U/b/fwWd3RO3n+5mjLrsBrVa5eKFRVSQbi3dF1w==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.24.6.tgz", + "integrity": "sha512-FfZfHXtQ5jYPQsCRyLpOv2GeLIIJhs8aydpNh39vRDjhD411XcfWDni5i7OjP/Rs8GAtTn7sWFFELJSHqkIxYg==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-plugin-utils": "^7.24.0" + "@babel/helper-plugin-utils": "^7.24.6" }, "engines": { "node": ">=6.9.0" @@ -1089,33 +1115,35 @@ } }, "node_modules/@babel/template": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz", - "integrity": "sha512-Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.24.6.tgz", + "integrity": "sha512-3vgazJlLwNXi9jhrR1ef8qiB65L1RK90+lEQwv4OxveHnqC3BfmnHdgySwRLzf6akhlOYenT+b7AfWq+a//AHw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.23.5", - "@babel/parser": "^7.24.0", - "@babel/types": "^7.24.0" + "@babel/code-frame": "^7.24.6", + "@babel/parser": "^7.24.6", + "@babel/types": "^7.24.6" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.24.1", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.1.tgz", - "integrity": "sha512-xuU6o9m68KeqZbQuDt2TcKSxUw/mrsvavlEqQ1leZ/B+C9tk6E4sRWy97WaXgvq5E+nU3cXMxv3WKOCanVMCmQ==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.6.tgz", + "integrity": "sha512-OsNjaJwT9Zn8ozxcfoBc+RaHdj3gFmCmYoQLUII1o6ZrUwku0BMg80FoOTPx+Gi6XhcQxAYE4xyjPTo4SxEQqw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.24.1", - "@babel/generator": "^7.24.1", - "@babel/helper-environment-visitor": "^7.22.20", - "@babel/helper-function-name": "^7.23.0", - "@babel/helper-hoist-variables": "^7.22.5", - "@babel/helper-split-export-declaration": "^7.22.6", - "@babel/parser": "^7.24.1", - "@babel/types": "^7.24.0", + "@babel/code-frame": "^7.24.6", + "@babel/generator": "^7.24.6", + "@babel/helper-environment-visitor": "^7.24.6", + "@babel/helper-function-name": "^7.24.6", + "@babel/helper-hoist-variables": "^7.24.6", + "@babel/helper-split-export-declaration": "^7.24.6", + "@babel/parser": "^7.24.6", + "@babel/types": "^7.24.6", "debug": "^4.3.1", "globals": "^11.1.0" }, @@ -1124,13 +1152,14 @@ } }, "node_modules/@babel/types": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz", - "integrity": "sha512-+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==", + "version": "7.24.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.24.6.tgz", + "integrity": "sha512-WaMsgi6Q8zMgMth93GvWPXkhAIEobfsIkLTacoVZoK1J0CevIPGYY2Vo5YvJGqyHqXM6P4ppOYGsIRU8MM9pFQ==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.23.4", - "@babel/helper-validator-identifier": "^7.22.20", + "@babel/helper-string-parser": "^7.24.6", + "@babel/helper-validator-identifier": "^7.24.6", "to-fast-properties": "^2.0.0" }, "engines": { @@ -3732,9 +3761,9 @@ "integrity": "sha512-5zvhXYtRNRluoE/jAp4GVsSduVUzNWKkOZrCDBWYtE7biZywwdC2AcEzg+cSMLFRfVgeAFqpfNabiPjxFddV1Q==" }, "node_modules/@types/react": { - "version": "18.3.2", - "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.2.tgz", - "integrity": "sha512-Btgg89dAnqD4vV7R3hlwOxgqobUQKgx3MmrQRi0yYbs/P0ym8XozIAlkqVilPqHQwXs4e9Tf63rrCgl58BcO4w==", + "version": "18.3.3", + "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.3.tgz", + "integrity": "sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==", "license": "MIT", "dependencies": { "@types/prop-types": "*", @@ -3993,16 +4022,17 @@ "dev": true }, "node_modules/@vitejs/plugin-react": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.2.1.tgz", - "integrity": "sha512-oojO9IDc4nCUUi8qIR11KoQm0XFFLIwsRBwHRR4d/88IWghn1y6ckz/bJ8GHDCsYEJee8mDzqtJxh15/cisJNQ==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.0.tgz", + "integrity": "sha512-KcEbMsn4Dpk+LIbHMj7gDPRKaTMStxxWRkRmxsg/jVdFdJCZWt1SchZcf0M4t8lIKdwwMsEyzhrcOXRrDPtOBw==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/core": "^7.23.5", - "@babel/plugin-transform-react-jsx-self": "^7.23.3", - "@babel/plugin-transform-react-jsx-source": "^7.23.3", + "@babel/core": "^7.24.5", + "@babel/plugin-transform-react-jsx-self": "^7.24.5", + "@babel/plugin-transform-react-jsx-source": "^7.24.1", "@types/babel__core": "^7.20.5", - "react-refresh": "^0.14.0" + "react-refresh": "^0.14.2" }, "engines": { "node": "^14.18.0 || >=16.0.0" @@ -8004,31 +8034,32 @@ } }, "node_modules/jsdom": { - "version": "24.0.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.0.0.tgz", - "integrity": "sha512-UDS2NayCvmXSXVP6mpTj+73JnNQadZlr9N68189xib2tx5Mls7swlTNao26IoHv46BZJFvXygyRtyXd1feAk1A==", + "version": "24.1.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz", + "integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==", "dev": true, + "license": "MIT", "dependencies": { "cssstyle": "^4.0.1", "data-urls": "^5.0.0", "decimal.js": "^10.4.3", "form-data": "^4.0.0", "html-encoding-sniffer": "^4.0.0", - "http-proxy-agent": "^7.0.0", - "https-proxy-agent": "^7.0.2", + "http-proxy-agent": "^7.0.2", + "https-proxy-agent": "^7.0.4", "is-potential-custom-element-name": "^1.0.1", - "nwsapi": "^2.2.7", + "nwsapi": "^2.2.10", "parse5": "^7.1.2", - "rrweb-cssom": "^0.6.0", + "rrweb-cssom": "^0.7.0", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^4.1.3", + "tough-cookie": "^4.1.4", "w3c-xmlserializer": "^5.0.0", "webidl-conversions": "^7.0.0", "whatwg-encoding": "^3.1.1", "whatwg-mimetype": "^4.0.0", "whatwg-url": "^14.0.0", - "ws": "^8.16.0", + "ws": "^8.17.0", "xml-name-validator": "^5.0.0" }, "engines": { @@ -8043,6 +8074,13 @@ } } }, + "node_modules/jsdom/node_modules/rrweb-cssom": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.0.tgz", + "integrity": "sha512-KlSv0pm9kgQSRxXEMgtivPJ4h826YHsuob8pSHcfSZsSXGtvpEAie8S0AnXuObEJ7nhikOb4ahwxDm0H2yW17g==", + "dev": true, + "license": "MIT" + }, "node_modules/jsesc": { "version": "2.5.2", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", @@ -8827,10 +8865,11 @@ "dev": true }, "node_modules/nwsapi": { - "version": "2.2.7", - "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.7.tgz", - "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", - "dev": true + "version": "2.2.10", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz", + "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==", + "dev": true, + "license": "MIT" }, "node_modules/object-assign": { "version": "4.1.1", @@ -9597,10 +9636,11 @@ "integrity": "sha512-Rc2suX5meI0S3bfdZuA7JMFBGkJ875ApfVyq2WHELjBiiG22My/l7/8zPpH/CfFVQHuVLd8NLR0nv6vi0BYYKA==" }, "node_modules/react-refresh": { - "version": "0.14.0", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.0.tgz", - "integrity": "sha512-wViHqhAd8OHeLS/IRMJjTSDHF3U9eWi62F/MledQGPdJGDhodXJ9PBLNGr6WWL7qlH12Mt3TyTpbS+hGXMjCzQ==", + "version": "0.14.2", + "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz", + "integrity": "sha512-jCvmsr+1IUSMUyzOkRcvnVbX3ZYC6g9TDrDbFuFmRDq7PD4yaGbLKNQL6k2jnArV8hjYxh7hVhAZB6s9HDGpZA==", "dev": true, + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -10659,10 +10699,11 @@ } }, "node_modules/tough-cookie": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz", - "integrity": "sha512-aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", "dev": true, + "license": "BSD-3-Clause", "dependencies": { "psl": "^1.1.33", "punycode": "^2.1.1", @@ -11488,10 +11529,11 @@ "dev": true }, "node_modules/ws": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.16.0.tgz", - "integrity": "sha512-HS0c//TP7Ina87TfiPUz1rQzMhHrl/SG2guqRcTOIUYD2q8uhUdNHZYJUaQ8aTGPzCh+c6oawMKW35nFl1dxyQ==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz", + "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==", "dev": true, + "license": "MIT", "engines": { "node": ">=10.0.0" }, diff --git a/client-next/package.json b/client-next/package.json index 8c4548e7a7f..9195702c1ad 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -33,11 +33,11 @@ "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "15.0.7", - "@types/react": "18.3.2", + "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@typescript-eslint/eslint-plugin": "7.10.0", "@typescript-eslint/parser": "7.10.0", - "@vitejs/plugin-react": "4.2.1", + "@vitejs/plugin-react": "4.3.0", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", @@ -46,7 +46,7 @@ "eslint-plugin-react": "7.34.1", "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", - "jsdom": "24.0.0", + "jsdom": "24.1.0", "prettier": "3.2.5", "typescript": "5.4.5", "vite": "5.2.11", From c1597c14e2754b4580e24eb4752df9e284ce0ec9 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 12:25:01 +0200 Subject: [PATCH 1171/1688] refactor: Move domain logic from FlexRouter into domain classes --- .../opentripplanner/ext/flex/FlexRouter.java | 171 ++++++------------ .../ext/flex/template/FlexAccessFactory.java | 55 ++++++ .../ext/flex/template/FlexAccessTemplate.java | 2 + .../flex/template/FlexDirectPathFactory.java | 83 +++++++++ .../ext/flex/template/FlexEgressFactory.java | 55 ++++++ .../ext/flex/template/FlexEgressTemplate.java | 4 +- 6 files changed, 257 insertions(+), 113 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java create mode 100644 src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java create mode 100644 src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 595200b4219..5c09def4a5e 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -1,7 +1,5 @@ package org.opentripplanner.ext.flex; -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; import java.time.Instant; import java.time.LocalDate; import java.time.ZoneId; @@ -13,13 +11,12 @@ import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; -import org.opentripplanner.ext.flex.template.ClosestTrip; import org.opentripplanner.ext.flex.template.DirectFlexPath; import org.opentripplanner.ext.flex.template.FlexAccessEgressCallbackService; -import org.opentripplanner.ext.flex.template.FlexAccessTemplate; -import org.opentripplanner.ext.flex.template.FlexEgressTemplate; +import org.opentripplanner.ext.flex.template.FlexAccessFactory; +import org.opentripplanner.ext.flex.template.FlexDirectPathFactory; +import org.opentripplanner.ext.flex.template.FlexEgressFactory; import org.opentripplanner.ext.flex.template.FlexServiceDate; -import org.opentripplanner.ext.flex.template.FlexTemplateFactory; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.framework.time.ServiceDateUtils; @@ -33,7 +30,7 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.TransitService; -public class FlexRouter implements FlexAccessEgressCallbackService { +public class FlexRouter { /* Transit data */ @@ -46,6 +43,7 @@ public class FlexRouter implements FlexAccessEgressCallbackService { private final FlexPathCalculator accessFlexPathCalculator; private final FlexPathCalculator egressFlexPathCalculator; private final GraphPathToItineraryMapper graphPathToItineraryMapper; + private final FlexAccessEgressCallbackService callbackService; /* Request data */ private final ZonedDateTime startOfTime; @@ -70,6 +68,7 @@ public FlexRouter( this.streetAccesses = streetAccesses; this.streetEgresses = egressTransfers; this.flexIndex = transitService.getFlexIndex(); + this.callbackService = new CallbackAdapter(); this.graphPathToItineraryMapper = new GraphPathToItineraryMapper( transitService.getTimeZone(), @@ -106,7 +105,14 @@ public FlexRouter( public Collection createFlexOnlyItineraries() { OTPRequestTimeoutException.checkForTimeout(); - var directFlexPaths = calculateDirectFlexPaths(); + var directFlexPaths = new FlexDirectPathFactory( + callbackService, + accessFlexPathCalculator, + egressFlexPathCalculator, + flexParameters.maxTransferDuration() + ) + .calculateDirectFlexPaths(streetAccesses, streetEgresses, dates, departureTime, arriveBy); + var itineraries = new ArrayList(); for (DirectFlexPath it : directFlexPaths) { @@ -122,118 +128,25 @@ public Collection createFlexOnlyItineraries() { return itineraries; } - private Collection calculateDirectFlexPaths() { - Collection directFlexPaths = new ArrayList<>(); - - var flexAccessTemplates = calculateFlexAccessTemplates(); - var flexEgressTemplates = calculateFlexEgressTemplates(); - - Multimap streetEgressByStop = HashMultimap.create(); - streetEgresses.forEach(it -> streetEgressByStop.put(it.stop, it)); - - for (FlexAccessTemplate template : flexAccessTemplates) { - StopLocation transferStop = template.getTransferStop(); - - // TODO: Document or reimplement this. Why are we using the egress to see if the - // access-transfer-stop (last-stop) is used by at least one egress-template? - // Is it because: - // - of the group-stop expansion? - // - of the alight-restriction check? - // - nearest stop to trip match? - // Fix: Find out why and refactor out the business logic and reuse it. - // Problem: Any asymmetrical restriction witch apply/do not apply to the egress, - // but do not apply/apply to the access, like booking-notice. - if ( - flexEgressTemplates.stream().anyMatch(t -> t.getAccessEgressStop().equals(transferStop)) - ) { - for (NearbyStop egress : streetEgressByStop.get(transferStop)) { - template - .createDirectGraphPath(egress, arriveBy, departureTime) - .ifPresent(directFlexPaths::add); - } - } - } - - return directFlexPaths; - } - public Collection createFlexAccesses() { OTPRequestTimeoutException.checkForTimeout(); - var flexAccessTemplates = calculateFlexAccessTemplates(); - - return flexAccessTemplates - .stream() - .flatMap(template -> template.createFlexAccessEgressStream(this)) - .toList(); - } - - public Collection createFlexEgresses() { - OTPRequestTimeoutException.checkForTimeout(); - var flexEgressTemplates = calculateFlexEgressTemplates(); - - return flexEgressTemplates - .stream() - .flatMap(template -> template.createFlexAccessEgressStream(this)) - .toList(); - } - - @Override - public TransitStopVertex getStopVertexForStopId(FeedScopedId stopId) { - return graph.getStopVertexForStopId(stopId); - } - - @Override - public Collection getTransfersFromStop(StopLocation stop) { - return transitService.getTransfersByStop(stop); - } - - @Override - public Collection getTransfersToStop(StopLocation stop) { - return transitService.getFlexIndex().getTransfersToStop(stop); - } - @Override - public Collection> getFlexTripsByStop(StopLocation stopLocation) { - return flexIndex.getFlexTripsByStop(stopLocation); - } - - @Override - public boolean isDateActive(FlexServiceDate date, FlexTrip trip) { - return date.isFlexTripRunning(trip, transitService); - } - - private List calculateFlexAccessTemplates() { - var templateFactory = FlexTemplateFactory.of( + return new FlexAccessFactory( + callbackService, accessFlexPathCalculator, flexParameters.maxTransferDuration() - ); - - var result = new ArrayList(); - var closestFlexTrips = ClosestTrip.of(this, streetAccesses, dates, true); - - for (var it : closestFlexTrips) { - for (var date : it.activeDates()) { - result.addAll(templateFactory.createAccessTemplates(date, it.flexTrip(), it.nearbyStop())); - } - } - return result; + ) + .createFlexAccesses(streetAccesses, dates); } - private List calculateFlexEgressTemplates() { - var templateFactory = FlexTemplateFactory.of( + public Collection createFlexEgresses() { + OTPRequestTimeoutException.checkForTimeout(); + return new FlexEgressFactory( + callbackService, egressFlexPathCalculator, flexParameters.maxTransferDuration() - ); - - var result = new ArrayList(); - var closestFlexTrips = ClosestTrip.of(this, streetEgresses, dates, false); - - for (var it : closestFlexTrips) { - for (var date : it.activeDates()) { - result.addAll(templateFactory.createEgressTemplates(date, it.flexTrip(), it.nearbyStop())); - } - } - return result; + ) + .createFlexEgresses(streetEgresses, dates); } private List createFlexServiceDates( @@ -244,6 +157,8 @@ private List createFlexServiceDates( ) { final List dates = new ArrayList<>(); + + // TODO - This code id not DRY, the same logic is in RaptorRoutingRequestTransitDataCreator for (int d = -additionalPastSearchDays; d <= additionalFutureSearchDays; ++d) { LocalDate date = searchDate.plusDays(d); dates.add( @@ -256,4 +171,38 @@ private List createFlexServiceDates( } return List.copyOf(dates); } + + /** + * This class work as an adaptor around OTP services. This allows us to pass in this instance + * and not the implementations (graph, transitService, flexIndex). We can easily mock this in + * unit-tests. This also serves as documentation of witch services the flex access/egress + * generation logic needs. + */ + private class CallbackAdapter implements FlexAccessEgressCallbackService { + + @Override + public TransitStopVertex getStopVertexForStopId(FeedScopedId stopId) { + return graph.getStopVertexForStopId(stopId); + } + + @Override + public Collection getTransfersFromStop(StopLocation stop) { + return transitService.getTransfersByStop(stop); + } + + @Override + public Collection getTransfersToStop(StopLocation stop) { + return transitService.getFlexIndex().getTransfersToStop(stop); + } + + @Override + public Collection> getFlexTripsByStop(StopLocation stopLocation) { + return flexIndex.getFlexTripsByStop(stopLocation); + } + + @Override + public boolean isDateActive(FlexServiceDate date, FlexTrip trip) { + return date.isFlexTripRunning(trip, transitService); + } + } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java new file mode 100644 index 00000000000..24bd6c299de --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java @@ -0,0 +1,55 @@ +package org.opentripplanner.ext.flex.template; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.opentripplanner.ext.flex.FlexAccessEgress; +import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; +import org.opentripplanner.routing.graphfinder.NearbyStop; + +public class FlexAccessFactory { + + private final FlexAccessEgressCallbackService callbackService; + private final FlexPathCalculator pathCalculator; + private final Duration maxTransferDuration; + + public FlexAccessFactory( + FlexAccessEgressCallbackService callbackService, + FlexPathCalculator pathCalculator, + Duration maxTransferDuration + ) { + this.callbackService = callbackService; + this.pathCalculator = pathCalculator; + this.maxTransferDuration = maxTransferDuration; + } + + public Collection createFlexAccesses( + Collection streetAccesses, + List dates + ) { + var flexAccessTemplates = calculateFlexAccessTemplates(streetAccesses, dates); + + return flexAccessTemplates + .stream() + .flatMap(template -> template.createFlexAccessEgressStream(callbackService)) + .toList(); + } + + List calculateFlexAccessTemplates( + Collection streetAccesses, + List dates + ) { + var templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); + + var result = new ArrayList(); + var closestFlexTrips = ClosestTrip.of(callbackService, streetAccesses, dates, true); + + for (var it : closestFlexTrips) { + for (var date : it.activeDates()) { + result.addAll(templateFactory.createAccessTemplates(date, it.flexTrip(), it.nearbyStop())); + } + } + return result; + } +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 136de329703..d354c106141 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -19,6 +19,8 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; + +// TODO Make this package local by removing the dependency to AbstractFlexTemplate in FlexTripEdge. public class FlexAccessTemplate extends AbstractFlexTemplate { public FlexAccessTemplate( diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java new file mode 100644 index 00000000000..3861edea7bc --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java @@ -0,0 +1,83 @@ +package org.opentripplanner.ext.flex.template; + +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; +import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.transit.model.site.StopLocation; + +public class FlexDirectPathFactory { + + private final FlexAccessEgressCallbackService callbackService; + private final FlexPathCalculator accessPathCalculator; + private final FlexPathCalculator egressPathCalculator; + private final Duration maxTransferDuration; + + public FlexDirectPathFactory( + FlexAccessEgressCallbackService callbackService, + FlexPathCalculator accessPathCalculator, + FlexPathCalculator egressPathCalculator, + Duration maxTransferDuration + ) { + this.callbackService = callbackService; + this.accessPathCalculator = accessPathCalculator; + this.egressPathCalculator = egressPathCalculator; + this.maxTransferDuration = maxTransferDuration; + } + + public Collection calculateDirectFlexPaths( + Collection streetAccesses, + Collection streetEgresses, + List dates, + int departureTime, + boolean arriveBy + ) { + Collection directFlexPaths = new ArrayList<>(); + + var flexAccessTemplates = new FlexAccessFactory( + callbackService, + accessPathCalculator, + maxTransferDuration + ) + .calculateFlexAccessTemplates(streetAccesses, dates); + + var flexEgressTemplates = new FlexEgressFactory( + callbackService, + egressPathCalculator, + maxTransferDuration + ) + .calculateFlexEgressTemplates(streetEgresses, dates); + + Multimap streetEgressByStop = HashMultimap.create(); + streetEgresses.forEach(it -> streetEgressByStop.put(it.stop, it)); + + for (FlexAccessTemplate template : flexAccessTemplates) { + StopLocation transferStop = template.getTransferStop(); + + // TODO: Document or reimplement this. Why are we using the egress to see if the + // access-transfer-stop (last-stop) is used by at least one egress-template? + // Is it because: + // - of the group-stop expansion? + // - of the alight-restriction check? + // - nearest stop to trip match? + // Fix: Find out why and refactor out the business logic and reuse it. + // Problem: Any asymmetrical restriction witch apply/do not apply to the egress, + // but do not apply/apply to the access, like booking-notice. + if ( + flexEgressTemplates.stream().anyMatch(t -> t.getAccessEgressStop().equals(transferStop)) + ) { + for (NearbyStop egress : streetEgressByStop.get(transferStop)) { + template + .createDirectGraphPath(egress, arriveBy, departureTime) + .ifPresent(directFlexPaths::add); + } + } + } + + return directFlexPaths; + } +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java new file mode 100644 index 00000000000..b44f316112d --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java @@ -0,0 +1,55 @@ +package org.opentripplanner.ext.flex.template; + +import java.time.Duration; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import org.opentripplanner.ext.flex.FlexAccessEgress; +import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; +import org.opentripplanner.routing.graphfinder.NearbyStop; + +public class FlexEgressFactory { + + private final FlexAccessEgressCallbackService callbackService; + private final FlexPathCalculator pathCalculator; + private final Duration maxTransferDuration; + + public FlexEgressFactory( + FlexAccessEgressCallbackService callbackService, + FlexPathCalculator pathCalculator, + Duration maxTransferDuration + ) { + this.callbackService = callbackService; + this.pathCalculator = pathCalculator; + this.maxTransferDuration = maxTransferDuration; + } + + public Collection createFlexEgresses( + Collection streetEgresses, + List dates + ) { + var flexEgressTemplates = calculateFlexEgressTemplates(streetEgresses, dates); + + return flexEgressTemplates + .stream() + .flatMap(template -> template.createFlexAccessEgressStream(callbackService)) + .toList(); + } + + List calculateFlexEgressTemplates( + Collection streetEgresses, + List dates + ) { + var templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); + + var result = new ArrayList(); + var closestFlexTrips = ClosestTrip.of(callbackService, streetEgresses, dates, false); + + for (var it : closestFlexTrips) { + for (var date : it.activeDates()) { + result.addAll(templateFactory.createEgressTemplates(date, it.flexTrip(), it.nearbyStop())); + } + } + return result; + } +} diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index 38000e92848..ffd31caf3ad 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -16,9 +16,9 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; -public class FlexEgressTemplate extends AbstractFlexTemplate { +class FlexEgressTemplate extends AbstractFlexTemplate { - public FlexEgressTemplate( + FlexEgressTemplate( NearbyStop accessEgress, FlexTrip trip, int fromStopIndex, From 93d759f85f47b5da9c9bcd667a86deecc861c1e8 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 13:21:47 +0200 Subject: [PATCH 1172/1688] refactor: Encapsulate fields in FlexTripEdge and remove dependency on FlexTemplate --- .../ext/flex/FlexibleTransitLeg.java | 10 +-- .../ext/flex/edgetype/FlexTripEdge.java | 85 +++++++++++-------- .../ext/flex/template/FlexAccessTemplate.java | 7 +- .../ext/flex/template/FlexEgressTemplate.java | 6 +- .../model/plan/TestItineraryBuilder.java | 25 ++---- 5 files changed, 70 insertions(+), 63 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java index c8c049f4e08..c39bd40716b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexibleTransitLeg.java @@ -133,17 +133,17 @@ public I18NString getHeadsign() { @Override public LocalDate getServiceDate() { - return edge.flexTemplate.serviceDate; + return edge.serviceDate(); } @Override public Place getFrom() { - return Place.forFlexStop(edge.s1, edge.getFromVertex()); + return Place.forFlexStop(edge.s1(), edge.getFromVertex()); } @Override public Place getTo() { - return Place.forFlexStop(edge.s2, edge.getToVertex()); + return Place.forFlexStop(edge.s2(), edge.getToVertex()); } @Override @@ -183,12 +183,12 @@ public BookingInfo getPickupBookingInfo() { @Override public Integer getBoardStopPosInPattern() { - return edge.flexTemplate.fromStopIndex; + return edge.boardStopPosInPattern(); } @Override public Integer getAlightStopPosInPattern() { - return edge.flexTemplate.toStopIndex; + return edge.alightStopPosInPattern(); } @Override diff --git a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index a3aed8f70e1..9e186cb5932 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -1,10 +1,10 @@ package org.opentripplanner.ext.flex.edgetype; +import java.time.LocalDate; import java.util.Objects; import javax.annotation.Nonnull; import org.locationtech.jts.geom.LineString; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPath; -import org.opentripplanner.ext.flex.template.AbstractFlexTemplate; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.street.model.edge.Edge; @@ -14,63 +14,66 @@ import org.opentripplanner.street.search.state.StateEditor; import org.opentripplanner.transit.model.site.StopLocation; +/** + * Flex trips are not connected to the graph. + */ public class FlexTripEdge extends Edge { + private final StopLocation s1; + private final StopLocation s2; private final FlexTrip trip; - public final StopLocation s1; - public final StopLocation s2; - public final AbstractFlexTemplate flexTemplate; - public final FlexPath flexPath; + private final int boardStopPosInPattern; + private final int alightStopPosInPattern; + private final LocalDate serviceDate; + private final FlexPath flexPath; - private FlexTripEdge( + public FlexTripEdge( Vertex v1, Vertex v2, StopLocation s1, StopLocation s2, FlexTrip trip, - AbstractFlexTemplate flexTemplate, + int boardStopPosInPattern, + int alightStopPosInPattern, + LocalDate serviceDate, FlexPath flexPath ) { super(v1, v2); this.s1 = s1; this.s2 = s2; this.trip = trip; - this.flexTemplate = flexTemplate; + this.boardStopPosInPattern = boardStopPosInPattern; + this.alightStopPosInPattern = alightStopPosInPattern; + this.serviceDate = serviceDate; this.flexPath = Objects.requireNonNull(flexPath); } - /** - * Create a Flex Trip. - * Flex trips are not connected to the graph. - */ - public static FlexTripEdge createFlexTripEdge( - Vertex v1, - Vertex v2, - StopLocation s1, - StopLocation s2, - FlexTrip trip, - AbstractFlexTemplate flexTemplate, - FlexPath flexPath - ) { - return new FlexTripEdge(v1, v2, s1, s2, trip, flexTemplate, flexPath); + public StopLocation s1() { + return s1; + } + + public StopLocation s2() { + return s2; + } + + public int boardStopPosInPattern() { + return boardStopPosInPattern; + } + + public int alightStopPosInPattern() { + return alightStopPosInPattern; + } + + public LocalDate serviceDate() { + return serviceDate; } public int getTimeInSeconds() { return flexPath.durationSeconds; } - @Override - @Nonnull - public State[] traverse(State s0) { - StateEditor editor = s0.edit(this); - editor.setBackMode(TraverseMode.FLEX); - // TODO: decide good value - editor.incrementWeight(10 * 60); - int timeInSeconds = getTimeInSeconds(); - editor.incrementTimeInSeconds(timeInSeconds); - editor.incrementWeight(timeInSeconds); - editor.resetEnteredNoThroughTrafficArea(); - return editor.makeStateArray(); + public FlexTrip getFlexTrip() { + return trip; } @Override @@ -88,7 +91,17 @@ public double getDistanceMeters() { return flexPath.distanceMeters; } - public FlexTrip getFlexTrip() { - return trip; + @Override + @Nonnull + public State[] traverse(State s0) { + StateEditor editor = s0.edit(this); + editor.setBackMode(TraverseMode.FLEX); + // TODO: decide good value + editor.incrementWeight(10 * 60); + int timeInSeconds = getTimeInSeconds(); + editor.incrementTimeInSeconds(timeInSeconds); + editor.incrementWeight(timeInSeconds); + editor.resetEnteredNoThroughTrafficArea(); + return editor.makeStateArray(); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index d354c106141..01279ce94c4 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -19,7 +19,6 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; - // TODO Make this package local by removing the dependency to AbstractFlexTemplate in FlexTripEdge. public class FlexAccessTemplate extends AbstractFlexTemplate { @@ -152,13 +151,15 @@ protected FlexTripEdge getFlexEdge(Vertex flexToVertex, StopLocation transferSto return null; } - return FlexTripEdge.createFlexTripEdge( + return new FlexTripEdge( accessEgress.state.getVertex(), flexToVertex, accessEgress.stop, transferStop, trip, - this, + fromStopIndex, + toStopIndex, + serviceDate, flexPath ); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index ffd31caf3ad..bc332b58bec 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -82,13 +82,15 @@ protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, StopLocation transferS return null; } - return FlexTripEdge.createFlexTripEdge( + return new FlexTripEdge( flexFromVertex, accessEgress.state.getVertex(), transferStop, accessEgress.stop, trip, - this, + fromStopIndex, + toStopIndex, + serviceDate, flexPath ); } diff --git a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java index 11cb59ffa5c..28be5b3a7e2 100644 --- a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -8,19 +8,15 @@ import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import static org.opentripplanner.transit.model._data.TransitModelForTest.route; -import gnu.trove.set.hash.TIntHashSet; import java.time.Duration; import java.time.LocalDate; import java.time.Month; import java.time.ZonedDateTime; import java.util.ArrayList; import java.util.List; -import org.opentripplanner.ext.flex.FlexParameters; import org.opentripplanner.ext.flex.FlexibleTransitLeg; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; -import org.opentripplanner.ext.flex.template.FlexAccessTemplate; -import org.opentripplanner.ext.flex.template.FlexServiceDate; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.ext.ridehailing.model.RideEstimate; import org.opentripplanner.ext.ridehailing.model.RideHailingLeg; @@ -212,16 +208,9 @@ public TestItineraryBuilder flex(int start, int end, Place to) { .withTrip(trip) .build(); - var template = new FlexAccessTemplate( - null, - flexTrip, - 0, - 1, - null, - new FlexServiceDate(LocalDate.now(), 0, new TIntHashSet()), - new DirectFlexPathCalculator(), - FlexParameters.defaultValues().maxTransferDuration() - ); + int fromStopPos = 0; + int toStopPos = 1; + LocalDate serviceDate = LocalDate.of(2024, Month.MAY, 22); var fromv = StreetModelForTest.intersectionVertex( "v1", @@ -235,15 +224,17 @@ public TestItineraryBuilder flex(int start, int end, Place to) { ); var flexPath = new DirectFlexPathCalculator() - .calculateFlexPath(fromv, tov, template.fromStopIndex, template.toStopIndex); + .calculateFlexPath(fromv, tov, fromStopPos, toStopPos); - var edge = FlexTripEdge.createFlexTripEdge( + var edge = new FlexTripEdge( fromv, tov, lastPlace.stop, to.stop, flexTrip, - template, + fromStopPos, + toStopPos, + serviceDate, flexPath ); From 7de5fa888238265683c70b47af496cb7be9b52d0 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 13:24:00 +0200 Subject: [PATCH 1173/1688] refactor: Rename and doc on FlexAccessEgressCallbackAdapter --- .../opentripplanner/ext/flex/FlexRouter.java | 7 +++---- .../flex/template/AbstractFlexTemplate.java | 4 ++-- .../ext/flex/template/ClosestTrip.java | 2 +- ...va => FlexAccessEgressCallbackAdapter.java} | 18 +++++++++++++++++- .../ext/flex/template/FlexAccessFactory.java | 4 ++-- .../ext/flex/template/FlexAccessTemplate.java | 2 +- .../flex/template/FlexDirectPathFactory.java | 4 ++-- .../ext/flex/template/FlexEgressFactory.java | 4 ++-- .../ext/flex/template/FlexEgressTemplate.java | 2 +- 9 files changed, 31 insertions(+), 16 deletions(-) rename src/ext/java/org/opentripplanner/ext/flex/template/{FlexAccessEgressCallbackService.java => FlexAccessEgressCallbackAdapter.java} (55%) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 5c09def4a5e..d5dd7d1af86 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -12,7 +12,7 @@ import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; import org.opentripplanner.ext.flex.template.DirectFlexPath; -import org.opentripplanner.ext.flex.template.FlexAccessEgressCallbackService; +import org.opentripplanner.ext.flex.template.FlexAccessEgressCallbackAdapter; import org.opentripplanner.ext.flex.template.FlexAccessFactory; import org.opentripplanner.ext.flex.template.FlexDirectPathFactory; import org.opentripplanner.ext.flex.template.FlexEgressFactory; @@ -43,7 +43,7 @@ public class FlexRouter { private final FlexPathCalculator accessFlexPathCalculator; private final FlexPathCalculator egressFlexPathCalculator; private final GraphPathToItineraryMapper graphPathToItineraryMapper; - private final FlexAccessEgressCallbackService callbackService; + private final FlexAccessEgressCallbackAdapter callbackService; /* Request data */ private final ZonedDateTime startOfTime; @@ -157,7 +157,6 @@ private List createFlexServiceDates( ) { final List dates = new ArrayList<>(); - // TODO - This code id not DRY, the same logic is in RaptorRoutingRequestTransitDataCreator for (int d = -additionalPastSearchDays; d <= additionalFutureSearchDays; ++d) { LocalDate date = searchDate.plusDays(d); @@ -178,7 +177,7 @@ private List createFlexServiceDates( * unit-tests. This also serves as documentation of witch services the flex access/egress * generation logic needs. */ - private class CallbackAdapter implements FlexAccessEgressCallbackService { + private class CallbackAdapter implements FlexAccessEgressCallbackAdapter { @Override public TransitStopVertex getStopVertexForStopId(FeedScopedId stopId) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index fc9303abfda..0a0cb010059 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -90,7 +90,7 @@ public StopLocation getAccessEgressStop() { * here will lead to noticeable speedups. */ public Stream createFlexAccessEgressStream( - FlexAccessEgressCallbackService callback + FlexAccessEgressCallbackAdapter callback ) { if (transferStop instanceof RegularStop stop) { TransitStopVertex flexVertex = callback.getStopVertexForStopId(stop.getId()); @@ -150,7 +150,7 @@ public String toString() { * flex ride for the access/egress. */ protected abstract Collection getTransfersFromTransferStop( - FlexAccessEgressCallbackService callback + FlexAccessEgressCallbackAdapter callback ); /** diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java index 2a3b2392b02..83ee693b53b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java @@ -29,7 +29,7 @@ private ClosestTrip(NearbyStop nearbyStop, FlexTrip flexTrip, int stopPos) /** This method is static, so we can move it to the FlexTemplateFactory later. */ public static Collection of( - FlexAccessEgressCallbackService callbackService, + FlexAccessEgressCallbackAdapter callbackService, Collection nearbyStops, List dates, boolean pickup diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java similarity index 55% rename from src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java rename to src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java index 213a643a99c..792213cd2c8 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackService.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessEgressCallbackAdapter.java @@ -7,10 +7,26 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; -public interface FlexAccessEgressCallbackService { +/** + * To perform access/egress/direct flex searches, this module (this package) needs these + * services. We do not want to inject the implementations here and create unnecessary + * hard dependencies. By doing this, we explicitly list all external services needed and make + * testing easier. This also serves as documentation. + *

              + * The implementation of this interface will for the most part just delegate to the implementing + * OTP service - look in these services for the documentation. + */ +public interface FlexAccessEgressCallbackAdapter { + /** Adapter, look at implementing service for documentation. */ TransitStopVertex getStopVertexForStopId(FeedScopedId id); + + /** Adapter, look at implementing service for documentation. */ Collection getTransfersFromStop(StopLocation stop); + + /** Adapter, look at implementing service for documentation. */ Collection getTransfersToStop(StopLocation stop); + + /** Adapter, look at implementing service for documentation. */ Collection> getFlexTripsByStop(StopLocation stopLocation); /** diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java index 24bd6c299de..f64a345b424 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java @@ -10,12 +10,12 @@ public class FlexAccessFactory { - private final FlexAccessEgressCallbackService callbackService; + private final FlexAccessEgressCallbackAdapter callbackService; private final FlexPathCalculator pathCalculator; private final Duration maxTransferDuration; public FlexAccessFactory( - FlexAccessEgressCallbackService callbackService, + FlexAccessEgressCallbackAdapter callbackService, FlexPathCalculator pathCalculator, Duration maxTransferDuration ) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 01279ce94c4..f9d490c83aa 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -118,7 +118,7 @@ protected RegularStop getFinalStop(PathTransfer transfer) { } protected Collection getTransfersFromTransferStop( - FlexAccessEgressCallbackService callback + FlexAccessEgressCallbackAdapter callback ) { return callback.getTransfersFromStop(transferStop); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java index 3861edea7bc..b44881915da 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java @@ -12,13 +12,13 @@ public class FlexDirectPathFactory { - private final FlexAccessEgressCallbackService callbackService; + private final FlexAccessEgressCallbackAdapter callbackService; private final FlexPathCalculator accessPathCalculator; private final FlexPathCalculator egressPathCalculator; private final Duration maxTransferDuration; public FlexDirectPathFactory( - FlexAccessEgressCallbackService callbackService, + FlexAccessEgressCallbackAdapter callbackService, FlexPathCalculator accessPathCalculator, FlexPathCalculator egressPathCalculator, Duration maxTransferDuration diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java index b44f316112d..a6f1589c9d7 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java @@ -10,12 +10,12 @@ public class FlexEgressFactory { - private final FlexAccessEgressCallbackService callbackService; + private final FlexAccessEgressCallbackAdapter callbackService; private final FlexPathCalculator pathCalculator; private final Duration maxTransferDuration; public FlexEgressFactory( - FlexAccessEgressCallbackService callbackService, + FlexAccessEgressCallbackAdapter callbackService, FlexPathCalculator pathCalculator, Duration maxTransferDuration ) { diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index bc332b58bec..a3e79579d78 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -49,7 +49,7 @@ protected RegularStop getFinalStop(PathTransfer transfer) { } protected Collection getTransfersFromTransferStop( - FlexAccessEgressCallbackService callback + FlexAccessEgressCallbackAdapter callback ) { return callback.getTransfersToStop(transferStop); } From 1651f85275e7e93342bf7e5be234cc945fb7c4cd Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 13:09:03 +0200 Subject: [PATCH 1174/1688] doc: Add JavaDoc on DirectFlexPath --- .../opentripplanner/ext/flex/template/DirectFlexPath.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java b/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java index 2e20d94b88c..3ca6225c2ec 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/DirectFlexPath.java @@ -2,4 +2,10 @@ import org.opentripplanner.street.search.state.State; +/** + * This is the result of a direct flex search. It only contains the start-time and + * the AStar state. It is used by the FlexRouter to build an itinerary. + *

              + * This is a simple data-transfer-object (design pattern). + */ public record DirectFlexPath(int startTime, State state) {} From 84657a060541f1c63055af01eeffb37d1427e7fa Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 13:28:27 +0200 Subject: [PATCH 1175/1688] refactor: Restrict access to template package --- .../ext/flex/template/AbstractFlexTemplate.java | 10 ++++------ .../ext/flex/template/ClosestTrip.java | 14 +++++++------- .../ext/flex/template/FlexAccessTemplate.java | 7 +++---- .../ext/flex/template/FlexTemplateFactory.java | 13 +++++-------- 4 files changed, 19 insertions(+), 25 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 0a0cb010059..8318cd57b35 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -30,7 +30,7 @@ *

              * Please also see Flex.svg for an illustration of how the flex concepts relate to each other. */ -public abstract class AbstractFlexTemplate { +abstract class AbstractFlexTemplate { /** * We do not want extremely short flex trips, they will normally be dominated in the @@ -77,11 +77,11 @@ public abstract class AbstractFlexTemplate { this.maxTransferDuration = maxTransferDuration; } - public StopLocation getTransferStop() { + StopLocation getTransferStop() { return transferStop; } - public StopLocation getAccessEgressStop() { + StopLocation getAccessEgressStop() { return accessEgress.stop; } @@ -89,9 +89,7 @@ public StopLocation getAccessEgressStop() { * This method is very much the hot code path in the flex access/egress search so any optimization * here will lead to noticeable speedups. */ - public Stream createFlexAccessEgressStream( - FlexAccessEgressCallbackAdapter callback - ) { + Stream createFlexAccessEgressStream(FlexAccessEgressCallbackAdapter callback) { if (transferStop instanceof RegularStop stop) { TransitStopVertex flexVertex = callback.getStopVertexForStopId(stop.getId()); return Stream diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java index 83ee693b53b..32882c1cd43 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java @@ -14,7 +14,7 @@ * @param activeDates This is a mutable list, when building an instance the * {@link #addDate(FlexServiceDate)} can be used to add dates to the list. */ -public class ClosestTrip { +class ClosestTrip { private final NearbyStop nearbyStop; private final FlexTrip flexTrip; @@ -62,27 +62,27 @@ public static Collection of( return map.values().stream().filter(ClosestTrip::hasActiveDates).toList(); } - public NearbyStop nearbyStop() { + NearbyStop nearbyStop() { return nearbyStop; } - public FlexTrip flexTrip() { + FlexTrip flexTrip() { return flexTrip; } - public int stopPos() { + int stopPos() { return stopPos; } - public Iterable activeDates() { + Iterable activeDates() { return activeDates; } - public void addDate(FlexServiceDate date) { + void addDate(FlexServiceDate date) { activeDates.add(date); } - public boolean hasActiveDates() { + boolean hasActiveDates() { return !activeDates.isEmpty(); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index f9d490c83aa..69c8d33303b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -19,10 +19,9 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; -// TODO Make this package local by removing the dependency to AbstractFlexTemplate in FlexTripEdge. -public class FlexAccessTemplate extends AbstractFlexTemplate { +class FlexAccessTemplate extends AbstractFlexTemplate { - public FlexAccessTemplate( + FlexAccessTemplate( NearbyStop accessEgress, FlexTrip trip, int fromStopTime, @@ -44,7 +43,7 @@ public FlexAccessTemplate( ); } - public Optional createDirectGraphPath( + Optional createDirectGraphPath( NearbyStop egress, boolean arriveBy, int departureTime diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 7bc2b4555ff..8de4ccd4b95 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -15,7 +15,7 @@ /** * The factory is used to create flex trip templates. */ -public class FlexTemplateFactory { +class FlexTemplateFactory { private final FlexPathCalculator calculator; private final Duration maxTransferDuration; @@ -28,14 +28,11 @@ private FlexTemplateFactory(FlexPathCalculator calculator, Duration maxTransferD this.maxTransferDuration = Objects.requireNonNull(maxTransferDuration); } - public static FlexTemplateFactory of( - FlexPathCalculator calculator, - Duration maxTransferDuration - ) { + static FlexTemplateFactory of(FlexPathCalculator calculator, Duration maxTransferDuration) { return new FlexTemplateFactory(calculator, maxTransferDuration); } - public List createAccessTemplates( + List createAccessTemplates( FlexServiceDate date, FlexTrip flexTrip, NearbyStop nearbyStop @@ -43,7 +40,7 @@ public List createAccessTemplates( return with(date, flexTrip, nearbyStop).createAccessTemplates(); } - public List createEgressTemplates( + List createEgressTemplates( FlexServiceDate date, FlexTrip flexTrip, NearbyStop nearbyStop @@ -148,7 +145,7 @@ private static List expandStopsAt(FlexTrip flexTrip, int ind return stop instanceof GroupStop groupStop ? groupStop.getChildLocations() : List.of(stop); } - FlexPathCalculator createCalculator(FlexTrip flexTrip) { + private FlexPathCalculator createCalculator(FlexTrip flexTrip) { return flexTrip instanceof ScheduledDeviatedTrip ? new ScheduledFlexPathCalculator(calculator, flexTrip) : calculator; From dc00a9bce04075c9a47d1f3d83945f5a63bae0cd Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 13:31:03 +0200 Subject: [PATCH 1176/1688] refactor: Remove redundant code from FlexTemplateFactory --- .../flex/template/FlexTemplateFactory.java | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 8de4ccd4b95..8e702cd6f47 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -63,8 +63,6 @@ private FlexTemplateFactory with( } private List createAccessTemplates() { - assertRequiredParametersSet(); - int boardIndex = trip.findBoardIndex(stop()); if (boardIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { @@ -88,8 +86,6 @@ private List createAccessTemplates() { } private List createEgressTemplates() { - assertRequiredParametersSet(); - var alightIndex = trip.findAlightIndex(stop()); if (alightIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { @@ -110,12 +106,6 @@ private List createEgressTemplates() { return result; } - private void assertRequiredParametersSet() { - Objects.requireNonNull(date); - Objects.requireNonNull(trip); - Objects.requireNonNull(nearbyStop); - } - /** * With respect to one journey/itinerary this method retuns {@code true} if a passenger can * board and alight at the same stop in the journey pattern. This is not allowed for regular @@ -145,12 +135,6 @@ private static List expandStopsAt(FlexTrip flexTrip, int ind return stop instanceof GroupStop groupStop ? groupStop.getChildLocations() : List.of(stop); } - private FlexPathCalculator createCalculator(FlexTrip flexTrip) { - return flexTrip instanceof ScheduledDeviatedTrip - ? new ScheduledFlexPathCalculator(calculator, flexTrip) - : calculator; - } - private FlexAccessTemplate createAccessTemplate( FlexTrip flexTrip, int boardIndex, @@ -186,4 +170,10 @@ private FlexEgressTemplate createEgressTemplate( maxTransferDuration ); } + + private FlexPathCalculator createCalculator(FlexTrip flexTrip) { + return flexTrip instanceof ScheduledDeviatedTrip + ? new ScheduledFlexPathCalculator(calculator, flexTrip) + : calculator; + } } From b5837468231fc81af52e7cfdda88c3c6d71eab83 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 14:13:46 +0200 Subject: [PATCH 1177/1688] refactor: Make FlexTemplateFactory a member of Access/Egress factories --- .../ext/flex/template/FlexAccessFactory.java | 8 ++------ .../ext/flex/template/FlexEgressFactory.java | 8 ++------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java index f64a345b424..b65c689085e 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java @@ -11,8 +11,7 @@ public class FlexAccessFactory { private final FlexAccessEgressCallbackAdapter callbackService; - private final FlexPathCalculator pathCalculator; - private final Duration maxTransferDuration; + private final FlexTemplateFactory templateFactory; public FlexAccessFactory( FlexAccessEgressCallbackAdapter callbackService, @@ -20,8 +19,7 @@ public FlexAccessFactory( Duration maxTransferDuration ) { this.callbackService = callbackService; - this.pathCalculator = pathCalculator; - this.maxTransferDuration = maxTransferDuration; + this.templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); } public Collection createFlexAccesses( @@ -40,8 +38,6 @@ List calculateFlexAccessTemplates( Collection streetAccesses, List dates ) { - var templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); - var result = new ArrayList(); var closestFlexTrips = ClosestTrip.of(callbackService, streetAccesses, dates, true); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java index a6f1589c9d7..ea15f06d400 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java @@ -11,8 +11,7 @@ public class FlexEgressFactory { private final FlexAccessEgressCallbackAdapter callbackService; - private final FlexPathCalculator pathCalculator; - private final Duration maxTransferDuration; + private final FlexTemplateFactory templateFactory; public FlexEgressFactory( FlexAccessEgressCallbackAdapter callbackService, @@ -20,8 +19,7 @@ public FlexEgressFactory( Duration maxTransferDuration ) { this.callbackService = callbackService; - this.pathCalculator = pathCalculator; - this.maxTransferDuration = maxTransferDuration; + this.templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); } public Collection createFlexEgresses( @@ -40,8 +38,6 @@ List calculateFlexEgressTemplates( Collection streetEgresses, List dates ) { - var templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); - var result = new ArrayList(); var closestFlexTrips = ClosestTrip.of(callbackService, streetEgresses, dates, false); From 9b1e9afad1941c9ac38f979907ee0b3987df5661 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 17:12:25 +0200 Subject: [PATCH 1178/1688] refactor: Replace constructor with factory method for TransitStopVertex --- .../AddTransitModelEntitiesToGraph.java | 3 +- .../model/vertex/TransitStopVertex.java | 4 +++ .../vertex/TransitStopVertexBuilder.java | 6 ++++ .../OsmBoardingLocationsModuleTest.java | 8 +++--- .../module/StreetLinkerModuleTest.java | 3 +- .../islandpruning/SubgraphOnlyFerryTest.java | 28 ++++++++++++------- .../module/linking/TestGraph.java | 9 +++--- .../routing/TestHalfEdges.java | 5 ++-- .../routing/algorithm/GraphRoutingTest.java | 3 +- .../linking/LinkStopToPlatformTest.java | 3 +- .../edge/StreetTransitEntityLinkTest.java | 8 ++---- .../street/search/state/TestStateBuilder.java | 4 +-- 12 files changed, 46 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java b/src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java index 8b5653a4f55..a53730b104c 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/AddTransitModelEntitiesToGraph.java @@ -27,7 +27,6 @@ import org.opentripplanner.street.model.vertex.TransitEntranceVertex; import org.opentripplanner.street.model.vertex.TransitPathwayNodeVertex; import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.street.model.vertex.VertexFactory; import org.opentripplanner.transit.model.basic.Accessibility; import org.opentripplanner.transit.model.basic.TransitMode; @@ -124,7 +123,7 @@ private void addStopsToGraphAndGenerateStopVertexes(TransitModel transitModel) { for (RegularStop stop : otpTransitService.stopModel().listRegularStops()) { Set modes = stopModeMap.get(stop); TransitStopVertex stopVertex = vertexFactory.transitStop( - new TransitStopVertexBuilder().withStop(stop).withModes(modes) + TransitStopVertex.of().withStop(stop).withModes(modes) ); if (modes != null && modes.contains(TransitMode.SUBWAY)) { diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java b/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java index d196c7d1830..92911833366 100644 --- a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java +++ b/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java @@ -41,6 +41,10 @@ public class TransitStopVertex extends StationElementVertex { this.wheelchairAccessibility = stop.getWheelchairAccessibility(); } + public static TransitStopVertexBuilder of() { + return TransitStopVertex.of(); + } + public Accessibility getWheelchairAccessibility() { return wheelchairAccessibility; } diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java b/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java index 83369629af5..38fe0d45790 100644 --- a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java +++ b/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertexBuilder.java @@ -10,6 +10,12 @@ public class TransitStopVertexBuilder { private RegularStop stop; private Set modes; + /** + * Protected access to avoid instantiation, use + * {@link org.opentripplanner.street.model.vertex.TransitStopVertex#of()} method instead. + */ + TransitStopVertexBuilder() {} + public TransitStopVertexBuilder withStop(RegularStop stop) { this.stop = stop; return this; diff --git a/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java index 1d8d819b5cb..4756608f57d 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/OsmBoardingLocationsModuleTest.java @@ -19,7 +19,7 @@ import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.StreetEdge; import org.opentripplanner.street.model.vertex.OsmBoardingLocationVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; +import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.model.vertex.VertexFactory; import org.opentripplanner.street.model.vertex.VertexLabel; @@ -74,7 +74,7 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti var provider = new OsmProvider(file, false); var floatingBusVertex = factory.transitStop( - new TransitStopVertexBuilder().withStop(floatingBusStop).withModes(Set.of(TransitMode.BUS)) + TransitStopVertex.of().withStop(floatingBusStop).withModes(Set.of(TransitMode.BUS)) ); var floatingBoardingLocation = factory.osmBoardingLocation( floatingBusVertex.getCoordinate(), @@ -91,10 +91,10 @@ void addAndLinkBoardingLocations(boolean areaVisibility, Set linkedVerti osmModule.buildGraph(); var platformVertex = factory.transitStop( - new TransitStopVertexBuilder().withStop(platform).withModes(Set.of(TransitMode.RAIL)) + TransitStopVertex.of().withStop(platform).withModes(Set.of(TransitMode.RAIL)) ); var busVertex = factory.transitStop( - new TransitStopVertexBuilder().withStop(busStop).withModes(Set.of(TransitMode.BUS)) + TransitStopVertex.of().withStop(busStop).withModes(Set.of(TransitMode.BUS)) ); transitModel.index(); diff --git a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java b/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java index a327cd427ab..06b10575ef9 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/StreetLinkerModuleTest.java @@ -21,7 +21,6 @@ import org.opentripplanner.street.model.edge.StreetTransitStopLink; import org.opentripplanner.street.model.vertex.SplitterVertex; import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; import org.opentripplanner.transit.model.site.RegularStop; @@ -126,7 +125,7 @@ public TestModel() { transitModel = new TransitModel(builder.build(), new Deduplicator()); - stopVertex = new TransitStopVertexBuilder().withStop(stop).build(); + stopVertex = TransitStopVertex.of().withStop(stop).build(); graph.addVertex(stopVertex); graph.hasStreets = true; diff --git a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java index 26aaf12896b..f069a518fc0 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/islandpruning/SubgraphOnlyFerryTest.java @@ -6,7 +6,6 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.site.RegularStop; @@ -19,7 +18,8 @@ class SubgraphOnlyFerryTest { @Test void subgraphHasOnlyFerry() { - TransitStopVertex transitStopVertex = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex = TransitStopVertex + .of() .withStop(regularStop1) .withModes(Set.of(TransitMode.FERRY)) .build(); @@ -32,7 +32,8 @@ void subgraphHasOnlyFerry() { @Test void subgraphHasOnlyNoFerry() { - TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex1 = TransitStopVertex + .of() .withStop(regularStop1) .withModes(Set.of(TransitMode.BUS)) .build(); @@ -45,7 +46,8 @@ void subgraphHasOnlyNoFerry() { @Test void subgraphHasOnlyNoMode() { - TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex1 = TransitStopVertex + .of() .withStop(regularStop1) .withModes(Set.of()) .build(); @@ -58,11 +60,13 @@ void subgraphHasOnlyNoMode() { @Test void subgraphHasOnlyFerryMoreStops() { - TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex1 = TransitStopVertex + .of() .withStop(regularStop1) .withModes(Set.of(TransitMode.FERRY)) .build(); - TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex2 = TransitStopVertex + .of() .withStop(regularStop2) .withModes(Set.of(TransitMode.FERRY)) .build(); @@ -76,11 +80,13 @@ void subgraphHasOnlyFerryMoreStops() { @Test void subgraphHasNotOnlyFerryMoreStops() { - TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex1 = TransitStopVertex + .of() .withStop(regularStop1) .withModes(Set.of(TransitMode.FERRY)) .build(); - TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex2 = TransitStopVertex + .of() .withStop(regularStop2) .withModes(Set.of(TransitMode.BUS)) .build(); @@ -94,11 +100,13 @@ void subgraphHasNotOnlyFerryMoreStops() { @Test void subgraphHasNoModeMoreStops() { - TransitStopVertex transitStopVertex1 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex1 = TransitStopVertex + .of() .withStop(regularStop1) .withModes(Set.of(TransitMode.FERRY)) .build(); - TransitStopVertex transitStopVertex2 = new TransitStopVertexBuilder() + TransitStopVertex transitStopVertex2 = TransitStopVertex + .of() .withStop(regularStop2) .withModes(Set.of()) .build(); diff --git a/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java b/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java index e7ac5e16a68..a45b8eef239 100644 --- a/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java +++ b/src/test/java/org/opentripplanner/graph_builder/module/linking/TestGraph.java @@ -6,7 +6,6 @@ import org.opentripplanner.routing.linking.VertexLinker; import org.opentripplanner.street.model.edge.StreetTransitStopLink; import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.TraverseModeSet; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -28,7 +27,7 @@ public static void addRegularStopGrid(Graph graph) { for (double lon = -83.1341; lon < -82.8646; lon += 0.005) { String id = Integer.toString(count++); RegularStop stop = TEST_MODEL.stop(id).withCoordinate(lat, lon).build(); - graph.addVertex(new TransitStopVertexBuilder().withStop(stop).build()); + graph.addVertex(TransitStopVertex.of().withStop(stop).build()); } } } @@ -40,7 +39,7 @@ public static void addExtraStops(Graph graph) { for (double lat = 40; lat < 40.01; lat += 0.005) { String id = "EXTRA_" + count++; RegularStop stop = TEST_MODEL.stop(id).withCoordinate(lat, lon).build(); - graph.addVertex(new TransitStopVertexBuilder().withStop(stop).build()); + graph.addVertex(TransitStopVertex.of().withStop(stop).build()); } // add some duplicate stops, identical to the regular stop grid @@ -48,7 +47,7 @@ public static void addExtraStops(Graph graph) { for (double lat = 39.9058; lat < 40.0281; lat += 0.005) { String id = "DUPE_" + count++; RegularStop stop = TEST_MODEL.stop(id).withCoordinate(lat, lon).build(); - graph.addVertex(new TransitStopVertexBuilder().withStop(stop).build()); + graph.addVertex(TransitStopVertex.of().withStop(stop).build()); } // add some almost duplicate stops @@ -56,7 +55,7 @@ public static void addExtraStops(Graph graph) { for (double lat = 39.9059; lat < 40.0281; lat += 0.005) { String id = "ALMOST_" + count++; RegularStop stop = TEST_MODEL.stop(id).withCoordinate(lat, lon).build(); - graph.addVertex(new TransitStopVertexBuilder().withStop(stop).build()); + graph.addVertex(TransitStopVertex.of().withStop(stop).build()); } } diff --git a/src/test/java/org/opentripplanner/routing/TestHalfEdges.java b/src/test/java/org/opentripplanner/routing/TestHalfEdges.java index 13785564074..ba7e024e57a 100644 --- a/src/test/java/org/opentripplanner/routing/TestHalfEdges.java +++ b/src/test/java/org/opentripplanner/routing/TestHalfEdges.java @@ -40,7 +40,6 @@ import org.opentripplanner.street.model.vertex.IntersectionVertex; import org.opentripplanner.street.model.vertex.TemporaryStreetLocation; import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.model.vertex.VertexFactory; import org.opentripplanner.street.search.StreetSearchBuilder; @@ -165,8 +164,8 @@ public void setUp() { stopModelBuilder.withRegularStop(s1).withRegularStop(s2); transitModel = new TransitModel(stopModelBuilder.build(), deduplicator); - station1 = factory.transitStop(new TransitStopVertexBuilder().withStop(s1)); - station2 = factory.transitStop(new TransitStopVertexBuilder().withStop(s2)); + station1 = factory.transitStop(TransitStopVertex.of().withStop(s1)); + station2 = factory.transitStop(TransitStopVertex.of().withStop(s2)); station1.addMode(TransitMode.RAIL); station2.addMode(TransitMode.RAIL); diff --git a/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java b/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java index 2c8847748ed..69e2ddaa944 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/GraphRoutingTest.java @@ -40,7 +40,6 @@ import org.opentripplanner.street.model.vertex.TemporaryVertex; import org.opentripplanner.street.model.vertex.TransitEntranceVertex; import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.model.vertex.VertexFactory; @@ -253,7 +252,7 @@ public TransitStopVertex stop( boolean noTransfers ) { return vertexFactory.transitStop( - new TransitStopVertexBuilder().withStop(stopEntity(id, latitude, longitude, noTransfers)) + TransitStopVertex.of().withStop(stopEntity(id, latitude, longitude, noTransfers)) ); } diff --git a/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java b/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java index e44ecf48f2f..23607d2e0b3 100644 --- a/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java +++ b/src/test/java/org/opentripplanner/routing/linking/LinkStopToPlatformTest.java @@ -26,7 +26,6 @@ import org.opentripplanner.street.model.vertex.IntersectionVertex; import org.opentripplanner.street.model.vertex.LabelledIntersectionVertex; import org.opentripplanner.street.model.vertex.TransitStopVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.TraverseModeSet; @@ -111,7 +110,7 @@ private Graph prepareTest(Coordinate[] platform, int[] visible, Coordinate[] sto graph.index(transitModel.getStopModel()); for (RegularStop s : transitStops) { - var v = new TransitStopVertexBuilder().withStop(s).build(); + var v = TransitStopVertex.of().withStop(s).build(); graph.addVertex(v); } diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java index 25234cce3f6..68b3ac9ab6a 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java @@ -21,7 +21,6 @@ import org.opentripplanner.routing.api.request.preference.WheelchairPreferences; import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.model.vertex.StreetVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.TestStateBuilder; @@ -89,10 +88,7 @@ void unknownStop() { private State[] traverse(RegularStop stop, boolean onlyAccessible) { var from = StreetModelForTest.intersectionVertex("A", 10, 10); - var to = new TransitStopVertexBuilder() - .withStop(stop) - .withModes(Set.of(TransitMode.RAIL)) - .build(); + var to = TransitStopVertex.of().withStop(stop).withModes(Set.of(TransitMode.RAIL)).build(); var req = StreetSearchRequest.of().withMode(StreetMode.BIKE); AccessibilityPreferences feature; @@ -166,7 +162,7 @@ void stationBasedVehiclesAreNotAllowedIntoStops(State state) { } private void testTraversalWithState(State state, boolean canTraverse) { - var transitStopVertex = new TransitStopVertexBuilder().withStop(ACCESSIBLE_STOP).build(); + var transitStopVertex = TransitStopVertex.of().withStop(ACCESSIBLE_STOP).build(); var edge = StreetTransitStopLink.createStreetTransitStopLink( (StreetVertex) state.getVertex(), transitStopVertex diff --git a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java index a4dbf76e55e..e43c5a769d0 100644 --- a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java +++ b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java @@ -32,7 +32,7 @@ import org.opentripplanner.street.model.vertex.ElevatorOffboardVertex; import org.opentripplanner.street.model.vertex.ElevatorOnboardVertex; import org.opentripplanner.street.model.vertex.StreetVertex; -import org.opentripplanner.street.model.vertex.TransitStopVertexBuilder; +import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.search.TraverseMode; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -266,7 +266,7 @@ public TestStateBuilder pathway(String s) { @Nonnull private TestStateBuilder arriveAtStop(RegularStop stop) { var from = (StreetVertex) currentState.vertex; - var to = new TransitStopVertexBuilder().withStop(stop).build(); + var to = TransitStopVertex.of().withStop(stop).build(); Edge edge; if (currentState.getRequest().arriveBy()) { From 339a3823443d8e13738bbecef1453111401ec78b Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 17:14:01 +0200 Subject: [PATCH 1179/1688] refactor: Replace constructor with factory method for TransitStopVertex --- .../opentripplanner/street/model/vertex/TransitStopVertex.java | 2 +- .../street/model/edge/StreetTransitEntityLinkTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java b/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java index 92911833366..a9d7d221d44 100644 --- a/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java +++ b/src/main/java/org/opentripplanner/street/model/vertex/TransitStopVertex.java @@ -42,7 +42,7 @@ public class TransitStopVertex extends StationElementVertex { } public static TransitStopVertexBuilder of() { - return TransitStopVertex.of(); + return new TransitStopVertexBuilder(); } public Accessibility getWheelchairAccessibility() { diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java index 68b3ac9ab6a..6ba4dea0216 100644 --- a/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java +++ b/src/test/java/org/opentripplanner/street/model/edge/StreetTransitEntityLinkTest.java @@ -21,6 +21,7 @@ import org.opentripplanner.routing.api.request.preference.WheelchairPreferences; import org.opentripplanner.street.model._data.StreetModelForTest; import org.opentripplanner.street.model.vertex.StreetVertex; +import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.search.request.StreetSearchRequest; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.state.TestStateBuilder; From ec0640b094a9bb881315fff54b3ec1e62943c4ab Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 17:45:10 +0200 Subject: [PATCH 1180/1688] refactor: Cleanup ClosestTrip --- .../ext/flex/template/BoardAlight.java | 7 ++ .../template/FlexTemplateFactoryTest.java | 57 ++++----- .../ext/flex/template/ClosestTrip.java | 116 +++++++++++------- .../ext/flex/template/FlexAccessFactory.java | 15 +-- .../ext/flex/template/FlexEgressFactory.java | 15 +-- .../flex/template/FlexTemplateFactory.java | 64 ++++------ 6 files changed, 140 insertions(+), 134 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java new file mode 100644 index 00000000000..cac09fb24a0 --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/BoardAlight.java @@ -0,0 +1,7 @@ +package org.opentripplanner.ext.flex.template; + +enum BoardAlight { + BOARD_ONLY, + ALIGHT_ONLY, + BOARD_AND_ALIGHT, +} diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index 4360fb4f63d..bcfcdd26d32 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.ext.flex.template.FlexTemplateFactoryTest.BoardAlight.ALIGHT_ONLY; -import static org.opentripplanner.ext.flex.template.FlexTemplateFactoryTest.BoardAlight.BOARD_AND_ALIGHT; -import static org.opentripplanner.ext.flex.template.FlexTemplateFactoryTest.BoardAlight.BOARD_ONLY; +import static org.opentripplanner.ext.flex.template.BoardAlight.ALIGHT_ONLY; +import static org.opentripplanner.ext.flex.template.BoardAlight.BOARD_AND_ALIGHT; +import static org.opentripplanner.ext.flex.template.BoardAlight.BOARD_ONLY; import static org.opentripplanner.framework.time.TimeUtils.time; import gnu.trove.set.hash.TIntHashSet; @@ -20,6 +20,7 @@ import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.ScheduledFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.StreetFlexPathCalculator; +import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.ext.flex.trip.ScheduledDeviatedTrip; import org.opentripplanner.ext.flex.trip.UnscheduledTrip; import org.opentripplanner.framework.i18n.I18NString; @@ -93,7 +94,7 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_A)); + var subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_A, 0)); var template = subject.get(0); assertEquals(0, template.fromStopIndex); @@ -106,11 +107,11 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_B)); + subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_B, 2)); assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result - subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_C)); + subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_C, 99)); assertTrue(subject.isEmpty(), subject::toString); } @@ -125,7 +126,7 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with egress alighting at stop B - var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_B)); + var subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_B, 1)); var template = subject.get(0); assertEquals(0, template.fromStopIndex); @@ -138,11 +139,10 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_A)); + subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_A, 0)); assertTrue(subject.isEmpty(), subject::toString); - // Search for a stop not part of the pattern should result in an empty result - subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_C)); + subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_C, 99)); assertTrue(subject.isEmpty(), subject::toString); } @@ -159,7 +159,7 @@ void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with boarding at stop A - var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_A)); + var subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_A, 0)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -170,20 +170,19 @@ void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() assertEquals(2, subject.size()); // Board at stop C - subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_C)); + subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_C, 2)); t1 = subject.get(0); assertEquals(2, t1.fromStopIndex); assertEquals(3, t1.toStopIndex); assertEquals(1, subject.size()); - // We are not allowed to board and alight at the same stop so boarding the last stop - // will result in an empty result - subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_B)); + // We are not allowed to board at stop B, an empty result is expected + subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_B, 1)); assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result - subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_D)); + subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_D, 3)); assertTrue(subject.isEmpty(), subject::toString); } @@ -200,7 +199,7 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with boarding at stop A - var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_D)); + var subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_D, 3)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -211,7 +210,7 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() assertEquals(2, subject.size()); // Board at stop C - subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_B)); + subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_B, 1)); t1 = subject.get(0); assertEquals(0, t1.fromStopIndex); @@ -220,11 +219,11 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_C)); + subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_C, 2)); assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result - subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_A)); + subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_A, 0)); assertTrue(subject.isEmpty(), subject::toString); } @@ -239,7 +238,7 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoGroupsStops() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_G1)); + var subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_G1, 0)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -262,7 +261,7 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoGroupsStops() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_G4)); + var subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_G4, 1)); var t1 = subject.get(0); var t2 = subject.get(1); @@ -286,7 +285,7 @@ void testCreateAccessTemplateForScheduledDeviatedTrip() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.createAccessTemplates(DATE, flexTrip, nearbyStop(STOP_B)); + var subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_B, 1)); var template = subject.get(0); assertEquals(1, template.fromStopIndex); @@ -308,7 +307,7 @@ void testCreateEgressTemplateForScheduledDeviatedTrip() { var factory = FlexTemplateFactory.of(CALCULATOR, MAX_TRANSFER_DURATION); // Create template with access boarding at stop A - var subject = factory.createEgressTemplates(DATE, flexTrip, nearbyStop(STOP_B)); + var subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_B, 1)); var template = subject.get(0); assertEquals(0, template.fromStopIndex); @@ -343,6 +342,10 @@ private static UnscheduledTrip unscheduledTrip(String id, StopTime... stopTimes) return MODEL.unscheduledTrip(id, Arrays.asList(stopTimes)); } + private static ClosestTrip closestTrip(FlexTrip trip, StopLocation stop, int stopPos) { + return new ClosestTrip(nearbyStop(stop), trip, stopPos, DATE); + } + private static StopTime stopTime( int seqNr, StopLocation stop, @@ -363,10 +366,4 @@ private static StopTime stopTime( st.setFlexWindowEnd(startTime + 300); return st; } - - enum BoardAlight { - BOARD_ONLY, - ALIGHT_ONLY, - BOARD_AND_ALIGHT, - } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java index 32882c1cd43..b0094c976ba 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java @@ -5,37 +5,73 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Objects; import org.opentripplanner.ext.flex.trip.FlexTrip; +import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.routing.graphfinder.NearbyStop; /** - * The combination of the closest stop and trip with active dates where the trip is in service. - * - * @param activeDates This is a mutable list, when building an instance the - * {@link #addDate(FlexServiceDate)} can be used to add dates to the list. + * The combination of the closest stop, trip and trip active date. */ -class ClosestTrip { - - private final NearbyStop nearbyStop; - private final FlexTrip flexTrip; - private final int stopPos; - private final List activeDates = new ArrayList<>(); +record ClosestTrip( + NearbyStop nearbyStop, + FlexTrip flexTrip, + int stopPos, + FlexServiceDate activeDate +) { + public ClosestTrip( + NearbyStop nearbyStop, + FlexTrip flexTrip, + int stopPos, + FlexServiceDate activeDate + ) { + this.nearbyStop = Objects.requireNonNull(nearbyStop); + this.flexTrip = Objects.requireNonNull(flexTrip); + this.stopPos = IntUtils.requireNotNegative(stopPos, "stopPos"); + this.activeDate = activeDate; + } + /** + * Create a temporary closest-trip without an active-date + */ private ClosestTrip(NearbyStop nearbyStop, FlexTrip flexTrip, int stopPos) { - this.nearbyStop = nearbyStop; - this.flexTrip = flexTrip; - this.stopPos = stopPos; + this(nearbyStop, flexTrip, stopPos, null); + } + + private ClosestTrip(ClosestTrip original, FlexServiceDate activeDate) { + this(original.nearbyStop, original.flexTrip, original.stopPos, activeDate); } - /** This method is static, so we can move it to the FlexTemplateFactory later. */ - public static Collection of( + /** + * Create a set of the closest trips running on the dates provided. Only the + * combination of the closest nearby-stop and trip is kept. For each combination, + * the set of dates is checked, and an instance with each active date is returned. + */ + static Collection of( FlexAccessEgressCallbackAdapter callbackService, Collection nearbyStops, List dates, boolean pickup ) { - Map, ClosestTrip> map = new HashMap<>(); - // Find all trips reachable from the nearbyStops + var closestTrips = findAllTripsReachableFromNearbyStop(callbackService, nearbyStops, pickup); + return findActiveDatesForTripAndDecorateResult(callbackService, dates, closestTrips); + } + + @Override + public FlexServiceDate activeDate() { + // The active date is not required as an internal "trick" to create closest-trips + // in two steps, but the instance is not valid before the active-date is added. This + // method should not be used inside this class, only on fully constructed valid instances; + // Hence the active-date should not be null. + return Objects.requireNonNull(activeDate); + } + + private static Map, ClosestTrip> findAllTripsReachableFromNearbyStop( + FlexAccessEgressCallbackAdapter callbackService, + Collection nearbyStops, + boolean pickup + ) { + var map = new HashMap, ClosestTrip>(); for (NearbyStop nearbyStop : nearbyStops) { var stop = nearbyStop.stop; for (var trip : callbackService.getFlexTripsByStop(stop)) { @@ -48,41 +84,31 @@ public static Collection of( } } } + return map; + } + private static ArrayList findActiveDatesForTripAndDecorateResult( + FlexAccessEgressCallbackAdapter callbackService, + List dates, + Map, ClosestTrip> map + ) { + var result = new ArrayList(); // Add active dates for (Map.Entry, ClosestTrip> e : map.entrySet()) { + var trip = e.getKey(); var closestTrip = e.getValue(); // Include dates where the service is running - dates - .stream() - .filter(date -> callbackService.isDateActive(date, e.getKey())) - .forEach(closestTrip::addDate); + for (FlexServiceDate date : dates) { + if (callbackService.isDateActive(date, trip)) { + result.add(closestTrip.withDate(date)); + } + } } - // Filter inactive trips and return - return map.values().stream().filter(ClosestTrip::hasActiveDates).toList(); - } - - NearbyStop nearbyStop() { - return nearbyStop; - } - - FlexTrip flexTrip() { - return flexTrip; - } - - int stopPos() { - return stopPos; - } - - Iterable activeDates() { - return activeDates; - } - - void addDate(FlexServiceDate date) { - activeDates.add(date); + return result; } - boolean hasActiveDates() { - return !activeDates.isEmpty(); + private ClosestTrip withDate(FlexServiceDate date) { + Objects.requireNonNull(date); + return new ClosestTrip(this, date); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java index b65c689085e..a4d348e6603 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessFactory.java @@ -1,7 +1,6 @@ package org.opentripplanner.ext.flex.template; import java.time.Duration; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.opentripplanner.ext.flex.FlexAccessEgress; @@ -22,7 +21,7 @@ public FlexAccessFactory( this.templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); } - public Collection createFlexAccesses( + public List createFlexAccesses( Collection streetAccesses, List dates ) { @@ -38,14 +37,10 @@ List calculateFlexAccessTemplates( Collection streetAccesses, List dates ) { - var result = new ArrayList(); var closestFlexTrips = ClosestTrip.of(callbackService, streetAccesses, dates, true); - - for (var it : closestFlexTrips) { - for (var date : it.activeDates()) { - result.addAll(templateFactory.createAccessTemplates(date, it.flexTrip(), it.nearbyStop())); - } - } - return result; + return closestFlexTrips + .stream() + .flatMap(it -> templateFactory.createAccessTemplates(it).stream()) + .toList(); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java index ea15f06d400..28908cb7e7b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressFactory.java @@ -1,7 +1,6 @@ package org.opentripplanner.ext.flex.template; import java.time.Duration; -import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.opentripplanner.ext.flex.FlexAccessEgress; @@ -22,7 +21,7 @@ public FlexEgressFactory( this.templateFactory = FlexTemplateFactory.of(pathCalculator, maxTransferDuration); } - public Collection createFlexEgresses( + public List createFlexEgresses( Collection streetEgresses, List dates ) { @@ -38,14 +37,10 @@ List calculateFlexEgressTemplates( Collection streetEgresses, List dates ) { - var result = new ArrayList(); var closestFlexTrips = ClosestTrip.of(callbackService, streetEgresses, dates, false); - - for (var it : closestFlexTrips) { - for (var date : it.activeDates()) { - result.addAll(templateFactory.createEgressTemplates(date, it.flexTrip(), it.nearbyStop())); - } - } - return result; + return closestFlexTrips + .stream() + .flatMap(it -> templateFactory.createEgressTemplates(it).stream()) + .toList(); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 8e702cd6f47..9e783529d9a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -19,9 +19,9 @@ class FlexTemplateFactory { private final FlexPathCalculator calculator; private final Duration maxTransferDuration; - private FlexServiceDate date; - private FlexTrip trip; private NearbyStop nearbyStop; + private FlexTrip trip; + private FlexServiceDate date; private FlexTemplateFactory(FlexPathCalculator calculator, Duration maxTransferDuration) { this.calculator = Objects.requireNonNull(calculator); @@ -32,53 +32,40 @@ static FlexTemplateFactory of(FlexPathCalculator calculator, Duration maxTransfe return new FlexTemplateFactory(calculator, maxTransferDuration); } - List createAccessTemplates( - FlexServiceDate date, - FlexTrip flexTrip, - NearbyStop nearbyStop - ) { - return with(date, flexTrip, nearbyStop).createAccessTemplates(); + List createAccessTemplates(ClosestTrip closestTrip) { + return with(closestTrip).createAccessTemplates(); } - List createEgressTemplates( - FlexServiceDate date, - FlexTrip flexTrip, - NearbyStop nearbyStop - ) { - return with(date, flexTrip, nearbyStop).createEgressTemplates(); + List createEgressTemplates(ClosestTrip closestTrip) { + return with(closestTrip).createEgressTemplates(); } /** * Add required parameters to the factory before calling the create methods. */ - private FlexTemplateFactory with( - FlexServiceDate date, - FlexTrip flexTrip, - NearbyStop nearbyStop - ) { - this.date = Objects.requireNonNull(date); - this.trip = Objects.requireNonNull(flexTrip); - this.nearbyStop = Objects.requireNonNull(nearbyStop); + private FlexTemplateFactory with(ClosestTrip closestTrip) { + this.nearbyStop = closestTrip.nearbyStop(); + this.trip = closestTrip.flexTrip(); + this.date = closestTrip.activeDate(); return this; } private List createAccessTemplates() { - int boardIndex = trip.findBoardIndex(stop()); + int boardStopPos = trip.findBoardIndex(stop()); - if (boardIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + if (boardStopPos == FlexTrip.STOP_INDEX_NOT_FOUND) { return List.of(); } - ArrayList result = new ArrayList<>(); - - int alightIndex = isBoardingAndAlightingAtSameStopPositionAllowed() - ? boardIndex - : boardIndex + 1; + var result = new ArrayList(); + int alightStopPos = isBoardingAndAlightingAtSameStopPositionAllowed() + ? boardStopPos + : boardStopPos + 1; - for (; alightIndex < trip.numberOfStops(); alightIndex++) { - if (trip.getAlightRule(alightIndex).isRoutable()) { - for (var stop : expandStopsAt(trip, alightIndex)) { - result.add(createAccessTemplate(trip, boardIndex, stop, alightIndex)); + for (; alightStopPos < trip.numberOfStops(); alightStopPos++) { + if (trip.getAlightRule(alightStopPos).isRoutable()) { + for (var stop : expandStopsAt(trip, alightStopPos)) { + result.add(createAccessTemplate(trip, boardStopPos, stop, alightStopPos)); } } } @@ -86,20 +73,19 @@ private List createAccessTemplates() { } private List createEgressTemplates() { - var alightIndex = trip.findAlightIndex(stop()); + var alightStopPos = trip.findAlightIndex(stop()); - if (alightIndex == FlexTrip.STOP_INDEX_NOT_FOUND) { + if (alightStopPos == FlexTrip.STOP_INDEX_NOT_FOUND) { return List.of(); } - List result = new ArrayList<>(); - - int end = isBoardingAndAlightingAtSameStopPositionAllowed() ? alightIndex : alightIndex - 1; + var result = new ArrayList(); + int end = isBoardingAndAlightingAtSameStopPositionAllowed() ? alightStopPos : alightStopPos - 1; for (int boardIndex = 0; boardIndex <= end; boardIndex++) { if (trip.getBoardRule(boardIndex).isRoutable()) { for (var stop : expandStopsAt(trip, boardIndex)) { - result.add(createEgressTemplate(trip, stop, boardIndex, alightIndex)); + result.add(createEgressTemplate(trip, stop, boardIndex, alightStopPos)); } } } From a7cb04f6929e90baa26bbd955c0ad2f2ca59c335 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 17:51:53 +0200 Subject: [PATCH 1181/1688] refactor: Remove duplicate logic from FlexTemplateFactory The unit-test is updated(test-cases removed), but no new test is added. --- .../template/FlexTemplateFactoryTest.java | 21 +++++++++++-------- .../flex/template/FlexTemplateFactory.java | 14 ++++--------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index bcfcdd26d32..8fe26b2718a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -141,9 +141,10 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction // will result in an empty result subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_A, 0)); assertTrue(subject.isEmpty(), subject::toString); + // TODO This is no longer the responsibility of the template factory, reimplement test // Search for a stop not part of the pattern should result in an empty result - subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_C, 99)); - assertTrue(subject.isEmpty(), subject::toString); + // subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_C, 99)); + // assertTrue(subject.isEmpty(), subject::toString); } @Test @@ -176,14 +177,15 @@ void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() assertEquals(2, t1.fromStopIndex); assertEquals(3, t1.toStopIndex); assertEquals(1, subject.size()); - + // TODO This is no longer the responsibility of the template factory, reimplement test // We are not allowed to board at stop B, an empty result is expected - subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_B, 1)); - assertTrue(subject.isEmpty(), subject::toString); + // subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_B, 1)); + // assertTrue(subject.isEmpty(), subject::toString); + // TODO This is no longer the responsibility of the template factory, reimplement test // Search for a stop not part of the pattern should result in an empty result - subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_D, 3)); - assertTrue(subject.isEmpty(), subject::toString); + // subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_D, 3)); + // assertTrue(subject.isEmpty(), subject::toString); } @Test @@ -217,10 +219,11 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() assertEquals(1, t1.toStopIndex); assertEquals(1, subject.size()); + // TODO This is no longer the responsibility of the template factory, reimplement test // We are not allowed to board and alight at the same stop so boarding the last stop // will result in an empty result - subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_C, 2)); - assertTrue(subject.isEmpty(), subject::toString); + // subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_C, 2)); + // assertTrue(subject.isEmpty(), subject::toString); // Search for a stop not part of the pattern should result in an empty result subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_A, 0)); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 9e783529d9a..730c50c1279 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -20,6 +20,7 @@ class FlexTemplateFactory { private final FlexPathCalculator calculator; private final Duration maxTransferDuration; private NearbyStop nearbyStop; + private int stopPos; private FlexTrip trip; private FlexServiceDate date; @@ -45,17 +46,14 @@ List createEgressTemplates(ClosestTrip closestTrip) { */ private FlexTemplateFactory with(ClosestTrip closestTrip) { this.nearbyStop = closestTrip.nearbyStop(); + this.stopPos = closestTrip.stopPos(); this.trip = closestTrip.flexTrip(); this.date = closestTrip.activeDate(); return this; } private List createAccessTemplates() { - int boardStopPos = trip.findBoardIndex(stop()); - - if (boardStopPos == FlexTrip.STOP_INDEX_NOT_FOUND) { - return List.of(); - } + int boardStopPos = stopPos; var result = new ArrayList(); int alightStopPos = isBoardingAndAlightingAtSameStopPositionAllowed() @@ -73,11 +71,7 @@ private List createAccessTemplates() { } private List createEgressTemplates() { - var alightStopPos = trip.findAlightIndex(stop()); - - if (alightStopPos == FlexTrip.STOP_INDEX_NOT_FOUND) { - return List.of(); - } + var alightStopPos = stopPos; var result = new ArrayList(); int end = isBoardingAndAlightingAtSameStopPositionAllowed() ? alightStopPos : alightStopPos - 1; From 3363d8ede2e458efd624655c00a7374dc39076b0 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Sun, 26 May 2024 19:15:54 +0200 Subject: [PATCH 1182/1688] refactor: Cleanup naming stopIndex -> stopPosition --- .../flex/trip/ScheduledDeviatedTripTest.java | 7 ++- .../opentripplanner/ext/flex/FlexRouter.java | 15 +++--- .../flex/template/AbstractFlexTemplate.java | 54 ++++++++++--------- .../ext/flex/template/FlexAccessTemplate.java | 16 +++--- .../ext/flex/template/FlexEgressTemplate.java | 16 +++--- .../flex/template/FlexTemplateFactory.java | 28 ++++------ .../router/street/DirectFlexRouter.java | 3 +- .../router/street/FlexAccessEgressRouter.java | 1 - 8 files changed, 68 insertions(+), 72 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 591583fb4ad..ffaa19e15f4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -104,7 +104,6 @@ void calculateDirectFare() { new DefaultTransitService(transitModel), FlexParameters.defaultValues(), OffsetDateTime.parse("2021-11-12T10:15:24-05:00").toInstant(), - false, 1, 1, List.of(from), @@ -113,7 +112,11 @@ void calculateDirectFare() { var filter = new DecorateWithFare(graph.getFareService()); - var itineraries = router.createFlexOnlyItineraries().stream().peek(filter::decorate).toList(); + var itineraries = router + .createFlexOnlyItineraries(false) + .stream() + .peek(filter::decorate) + .toList(); var itinerary = itineraries.getFirst(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index d5dd7d1af86..9170eabb8cf 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -48,15 +48,13 @@ public class FlexRouter { /* Request data */ private final ZonedDateTime startOfTime; private final int departureTime; - private final boolean arriveBy; private final List dates; public FlexRouter( Graph graph, TransitService transitService, FlexParameters flexParameters, - Instant searchInstant, - boolean arriveBy, + Instant requestedTime, int additionalPastSearchDays, int additionalFutureSearchDays, Collection streetAccesses, @@ -78,9 +76,9 @@ public FlexRouter( if (graph.hasStreets) { this.accessFlexPathCalculator = - new StreetFlexPathCalculator(false, this.flexParameters.maxFlexTripDuration()); + new StreetFlexPathCalculator(false, flexParameters.maxFlexTripDuration()); this.egressFlexPathCalculator = - new StreetFlexPathCalculator(true, this.flexParameters.maxFlexTripDuration()); + new StreetFlexPathCalculator(true, flexParameters.maxFlexTripDuration()); } else { // this is only really useful in tests. in real world scenarios you're unlikely to get useful // results if you don't have streets @@ -89,10 +87,9 @@ public FlexRouter( } ZoneId tz = transitService.getTimeZone(); - LocalDate searchDate = LocalDate.ofInstant(searchInstant, tz); + LocalDate searchDate = LocalDate.ofInstant(requestedTime, tz); this.startOfTime = ServiceDateUtils.asStartOfService(searchDate, tz); - this.departureTime = ServiceDateUtils.secondsSinceStartOfTime(startOfTime, searchInstant); - this.arriveBy = arriveBy; + this.departureTime = ServiceDateUtils.secondsSinceStartOfTime(startOfTime, requestedTime); this.dates = createFlexServiceDates( transitService, @@ -102,7 +99,7 @@ public FlexRouter( ); } - public Collection createFlexOnlyItineraries() { + public List createFlexOnlyItineraries(boolean arriveBy) { OTPRequestTimeoutException.checkForTimeout(); var directFlexPaths = new FlexDirectPathFactory( diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 8318cd57b35..3e83449df16 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -17,7 +17,6 @@ import org.opentripplanner.model.PathTransfer; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.street.model.vertex.Vertex; import org.opentripplanner.street.search.state.EdgeTraverser; import org.opentripplanner.street.search.state.State; @@ -37,6 +36,10 @@ abstract class AbstractFlexTemplate { * routing later. We set an absolute min duration to 10 seconds (167m with 60 km/h). */ private static final int MIN_FLEX_TRIP_DURATION_SECONDS = 10; + + // TODO - This is confusing, and not following OO principles. The from/to stop + // - changes type for access/egress, move them down into child class. + // - this apply to transferStop as well. protected final NearbyStop accessEgress; protected final FlexTrip trip; public final int fromStopIndex; @@ -48,28 +51,31 @@ abstract class AbstractFlexTemplate { private final Duration maxTransferDuration; /** - * @param accessEgress Path from origin to the point of boarding for this flex trip - * @param trip The FlexTrip used for this Template - * @param fromStopIndex Stop sequence index where this FlexTrip is boarded - * @param toStopIndex The stop where this FlexTrip alights - * @param transferStop The stop location where this FlexTrip alights - * @param date The service date of this FlexTrip - * @param calculator Calculates the path and duration of the FlexTrip + * @param trip The FlexTrip used for this template + * @param accessEgress Path from origin/destination to the point of boarding/alighting for + * this flex trip + * @param transferStop The stop location where this FlexTrip transfers to another transit + * service. + * @param boardStopPosition The stop-board-position in the trip pattern + * @param alightStopPosition The stop-alight-position in the trip pattern + * @param date The service date of this FlexTrip + * @param calculator Calculates the path and duration of the FlexTrip + * @param maxTransferDuration The limit for how long a transfer is allowed to be */ AbstractFlexTemplate( - NearbyStop accessEgress, FlexTrip trip, - int fromStopIndex, - int toStopIndex, + NearbyStop accessEgress, StopLocation transferStop, + int boardStopPosition, + int alightStopPosition, FlexServiceDate date, FlexPathCalculator calculator, Duration maxTransferDuration ) { this.accessEgress = accessEgress; this.trip = trip; - this.fromStopIndex = fromStopIndex; - this.toStopIndex = toStopIndex; + this.fromStopIndex = boardStopPosition; + this.toStopIndex = alightStopPosition; this.transferStop = transferStop; this.secondsFromStartOfTime = date.secondsFromStartOfTime; this.serviceDate = date.serviceDate; @@ -86,14 +92,14 @@ StopLocation getAccessEgressStop() { } /** - * This method is very much the hot code path in the flex access/egress search so any optimization - * here will lead to noticeable speedups. + * This method is very much the hot code path in the flex access/egress search, so any + * optimization here will lead to noticeable speedups. */ Stream createFlexAccessEgressStream(FlexAccessEgressCallbackAdapter callback) { if (transferStop instanceof RegularStop stop) { - TransitStopVertex flexVertex = callback.getStopVertexForStopId(stop.getId()); + var flexVertex = callback.getStopVertexForStopId(stop.getId()); return Stream - .of(getFlexAccessEgress(new ArrayList<>(), flexVertex, (RegularStop) transferStop)) + .of(createFlexAccessEgress(new ArrayList<>(), flexVertex, stop)) .filter(Objects::nonNull); } // transferStop is Location Area/Line @@ -107,10 +113,10 @@ Stream createFlexAccessEgressStream(FlexAccessEgressCallbackAd .filter(pathTransfer -> pathTransfer.getDistanceMeters() <= maxDistanceMeters) .filter(transfer -> getFinalStop(transfer) != null) .map(transfer -> { - List edges = getTransferEdges(transfer); - Vertex flexVertex = getFlexVertex(edges.get(0)); - RegularStop finalStop = getFinalStop(transfer); - return getFlexAccessEgress(edges, flexVertex, finalStop); + var edges = getTransferEdges(transfer); + var flexVertex = getFlexVertex(edges.get(0)); + var finalStop = getFinalStop(transfer); + return createFlexAccessEgress(edges, flexVertex, finalStop); }) .filter(Objects::nonNull); } @@ -171,21 +177,21 @@ protected abstract FlexPathDurations calculateFlexPathDurations( protected abstract FlexTripEdge getFlexEdge(Vertex flexFromVertex, StopLocation transferStop); @Nullable - protected FlexAccessEgress getFlexAccessEgress( + private FlexAccessEgress createFlexAccessEgress( List transferEdges, Vertex flexVertex, RegularStop stop ) { var flexEdge = getFlexEdge(flexVertex, transferStop); - // Drop none routable and very short(<10s) trips + // Drop none routable and very short(<10s) trips if (flexEdge == null || flexEdge.getTimeInSeconds() < MIN_FLEX_TRIP_DURATION_SECONDS) { return null; } // this code is a little repetitive but needed as a performance improvement. previously // the flex path was checked before this method was called. this meant that every path - // was traversed twice leading to a noticeable slowdown. + // was traversed twice, leading to a noticeable slowdown. final var afterFlexState = flexEdge.traverse(accessEgress.state); if (State.isEmpty(afterFlexState)) { return null; diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 69c8d33303b..4d7577bb4b1 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -22,21 +22,21 @@ class FlexAccessTemplate extends AbstractFlexTemplate { FlexAccessTemplate( - NearbyStop accessEgress, FlexTrip trip, - int fromStopTime, - int toStopTime, - StopLocation transferStop, + NearbyStop boardStop, + int boardStopPosition, + StopLocation alightStop, + int alightStopPosition, FlexServiceDate date, FlexPathCalculator calculator, Duration maxTransferDuration ) { super( - accessEgress, trip, - fromStopTime, - toStopTime, - transferStop, + boardStop, + alightStop, + boardStopPosition, + alightStopPosition, date, calculator, maxTransferDuration diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index a3e79579d78..2864725c56e 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -19,21 +19,21 @@ class FlexEgressTemplate extends AbstractFlexTemplate { FlexEgressTemplate( - NearbyStop accessEgress, FlexTrip trip, - int fromStopIndex, - int toStopIndex, - StopLocation transferStop, + StopLocation boardStop, + int boardStopPosition, + NearbyStop alightStop, + int alightStopPosition, FlexServiceDate date, FlexPathCalculator calculator, Duration maxTransferDuration ) { super( - accessEgress, trip, - fromStopIndex, - toStopIndex, - transferStop, + alightStop, + boardStop, + boardStopPosition, + alightStopPosition, date, calculator, maxTransferDuration diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index 730c50c1279..b11d6fe4610 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -102,14 +102,6 @@ private boolean isBoardingAndAlightingAtSameStopPositionAllowed() { return false; } - /** - * Return the access/egress stop, can be Regular-, Group- and AreaStop. - * Se also {@link #expandStopsAt(FlexTrip, int)}. - */ - private StopLocation stop() { - return nearbyStop.stop; - } - private static List expandStopsAt(FlexTrip flexTrip, int index) { var stop = flexTrip.getStop(index); return stop instanceof GroupStop groupStop ? groupStop.getChildLocations() : List.of(stop); @@ -117,16 +109,16 @@ private static List expandStopsAt(FlexTrip flexTrip, int ind private FlexAccessTemplate createAccessTemplate( FlexTrip flexTrip, - int boardIndex, + int boardStopPosition, StopLocation alightStop, - int alightStopIndex + int alightStopPosition ) { return new FlexAccessTemplate( - nearbyStop, flexTrip, - boardIndex, - alightStopIndex, + nearbyStop, + boardStopPosition, alightStop, + alightStopPosition, date, createCalculator(flexTrip), maxTransferDuration @@ -136,15 +128,15 @@ private FlexAccessTemplate createAccessTemplate( private FlexEgressTemplate createEgressTemplate( FlexTrip flexTrip, StopLocation boardStop, - int boardStopIndex, - int alightIndex + int boardStopPosition, + int alightStopPosition ) { return new FlexEgressTemplate( - nearbyStop, flexTrip, - boardStopIndex, - alightIndex, boardStop, + boardStopPosition, + nearbyStop, + alightStopPosition, date, createCalculator(flexTrip), maxTransferDuration diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java index 037ecdf7b07..35c627828c6 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java @@ -60,14 +60,13 @@ public static List route( serverContext.transitService(), serverContext.flexParameters(), request.dateTime(), - request.arriveBy(), additionalSearchDays.additionalSearchDaysInPast(), additionalSearchDays.additionalSearchDaysInFuture(), accessStops, egressStops ); - return new ArrayList<>(flexRouter.createFlexOnlyItineraries()); + return new ArrayList<>(flexRouter.createFlexOnlyItineraries(request.arriveBy())); } } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java index e05e4753175..347bbc33d79 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java @@ -64,7 +64,6 @@ public static Collection routeAccessEgress( transitService, config, request.dateTime(), - request.arriveBy(), searchDays.additionalSearchDaysInPast(), searchDays.additionalSearchDaysInFuture(), accessStops, From ae3a95ab4829092d9a4c9455520d0691d9e493fb Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 27 May 2024 09:43:27 +0300 Subject: [PATCH 1183/1688] Date instead of day --- .../ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java | 2 +- .../layers/stops/DigitransitRealtimeStopPropertyMapper.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java index dbee4597a7a..bb258beb76f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/stops/RealtimeStopsLayerTest.java @@ -102,6 +102,6 @@ public TransitAlertService getTransitAlertService() { assertEquals("name", map.get("name")); assertEquals("desc", map.get("desc")); assertEquals(true, map.get("closedByServiceAlert")); - assertEquals(false, map.get("servicesRunningOnServiceDay")); + assertEquals(false, map.get("servicesRunningOnServiceDate")); } } diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java index 711572eed86..cf555d6412f 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/stops/DigitransitRealtimeStopPropertyMapper.java @@ -45,7 +45,7 @@ protected Collection map(RegularStop stop) { sharedKeyValues, List.of( new KeyValue("closedByServiceAlert", noServiceAlert), - new KeyValue("servicesRunningOnServiceDay", stopTimesExist) + new KeyValue("servicesRunningOnServiceDate", stopTimesExist) ) ); } From 5ad9121a60e80e8b7a89f926d5aed05750d186f8 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 27 May 2024 08:18:15 +0000 Subject: [PATCH 1184/1688] Add changelog entry for #5834 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index ac317fa2272..e799f6fd784 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -20,6 +20,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Make naming of stopTransferCosts/stopBoardAlightCosts consistent [#5822](https://github.com/opentripplanner/OpenTripPlanner/pull/5822) - Namer for applying street names to nearby sidewalks [#5774](https://github.com/opentripplanner/OpenTripPlanner/pull/5774) - Implement GTFS Flex safe duration spec draft [#5796](https://github.com/opentripplanner/OpenTripPlanner/pull/5796) +- Document and validate timeRange GraphQL parameter [#5834](https://github.com/opentripplanner/OpenTripPlanner/pull/5834) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From aa38ffc90204a3f208f7712785efb580f0294735 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Mon, 27 May 2024 08:50:35 +0000 Subject: [PATCH 1185/1688] Upgrade debug client to version 2024/05/2024-05-27T08:49 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 1e67df27055..91f07c43b9a 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

              From 8a0ce281340c30037e49f4175ed3493bbee3f173 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 10:05:33 +0200 Subject: [PATCH 1186/1688] Clean TimetableSnapshotTest --- .../trip/TimetableSnapshotSourceTest.java | 69 +++++++++---------- 1 file changed, 34 insertions(+), 35 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 8c28290de66..bb2f5136767 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -15,7 +15,6 @@ import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.NotSame; import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.Same; -import com.google.protobuf.InvalidProtocolBufferException; import com.google.transit.realtime.GtfsRealtime.TripDescriptor; import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship; import com.google.transit.realtime.GtfsRealtime.TripUpdate; @@ -59,8 +58,7 @@ public class TimetableSnapshotSourceTest { private final GtfsRealtimeFuzzyTripMatcher TRIP_MATCHER_NOOP = null; - private final boolean fullDataset = false; - private byte[] cancellation; + private final boolean FULL_DATASET = false; private String feedId; @BeforeEach @@ -69,28 +67,30 @@ public void setUp() { transitModel = model.transitModel(); feedId = transitModel.getFeedIds().stream().findFirst().get(); + } + private static TripUpdate cancellation(String tripId) { final TripDescriptor.Builder tripDescriptorBuilder = TripDescriptor.newBuilder(); - tripDescriptorBuilder.setTripId("1.1"); + tripDescriptorBuilder.setTripId(tripId); tripDescriptorBuilder.setScheduleRelationship(TripDescriptor.ScheduleRelationship.CANCELED); final TripUpdate.Builder tripUpdateBuilder = TripUpdate.newBuilder(); tripUpdateBuilder.setTrip(tripDescriptorBuilder); - cancellation = tripUpdateBuilder.build().toByteArray(); + return tripUpdateBuilder.build(); } @Test - public void testGetSnapshot() throws InvalidProtocolBufferException { + public void testGetSnapshot() { var updater = defaultUpdater(); updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, - List.of(TripUpdate.parseFrom(cancellation)), + FULL_DATASET, + List.of(cancellation("1.1")), feedId ); @@ -101,16 +101,15 @@ public void testGetSnapshot() throws InvalidProtocolBufferException { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, - List.of(TripUpdate.parseFrom(cancellation)), + FULL_DATASET, + List.of(cancellation("1.1")), feedId ); assertSame(snapshot, updater.getTimetableSnapshot()); } @Test - public void testGetSnapshotWithMaxSnapshotFrequencyCleared() - throws InvalidProtocolBufferException { + public void testGetSnapshotWithMaxSnapshotFrequencyCleared() { var updater = new TimetableSnapshotSource( TimetableSnapshotSourceParameters.DEFAULT.withMaxSnapshotFrequency(Duration.ofMillis(-1)), transitModel @@ -121,8 +120,8 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, - List.of(TripUpdate.parseFrom(cancellation)), + FULL_DATASET, + List.of(cancellation("1.1")), feedId ); @@ -132,7 +131,7 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() } @Test - public void testHandleCanceledTrip() throws InvalidProtocolBufferException { + public void testHandleCanceledTrip() { final FeedScopedId tripId = new FeedScopedId(feedId, "1.1"); final FeedScopedId tripId2 = new FeedScopedId(feedId, "1.2"); final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); @@ -149,8 +148,8 @@ public void testHandleCanceledTrip() throws InvalidProtocolBufferException { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, - List.of(TripUpdate.parseFrom(cancellation)), + FULL_DATASET, + List.of(cancellation("1.1")), feedId ); @@ -167,7 +166,7 @@ public void testHandleCanceledTrip() throws InvalidProtocolBufferException { } @Test - public void testHandleDeletedTrip() throws InvalidProtocolBufferException { + public void testHandleDeletedTrip() { final FeedScopedId tripId = new FeedScopedId(feedId, "1.1"); final FeedScopedId tripId2 = new FeedScopedId(feedId, "1.2"); final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); @@ -186,13 +185,13 @@ public void testHandleDeletedTrip() throws InvalidProtocolBufferException { tripUpdateBuilder.setTrip(tripDescriptorBuilder); - var deletion = tripUpdateBuilder.build().toByteArray(); + var deletion = tripUpdateBuilder.build(); updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, - List.of(TripUpdate.parseFrom(deletion)), + FULL_DATASET, + List.of(deletion), feedId ); @@ -234,7 +233,7 @@ public void invalidTripId() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -357,7 +356,7 @@ public void testHandleModifiedTrip() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -476,7 +475,7 @@ public void delayed() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -521,7 +520,7 @@ public void scheduled() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -604,7 +603,7 @@ public void invalidTripDate() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -641,7 +640,7 @@ public void scheduledTripWithSkippedAndNoData() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -772,7 +771,7 @@ public void scheduledTripWithSkippedAndScheduled() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -875,7 +874,7 @@ public void addedTrip() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -944,7 +943,7 @@ public void addedTripWithNewRoute() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -995,7 +994,7 @@ public void addedWithUnknownStop() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -1037,7 +1036,7 @@ public void repeatedlyAddedTripWithNewRoute() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -1048,7 +1047,7 @@ public void repeatedlyAddedTripWithNewRoute() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdate), feedId ); @@ -1141,7 +1140,7 @@ public void testPurgeExpiredData( updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdateYesterday), feedId ); @@ -1154,7 +1153,7 @@ public void testPurgeExpiredData( updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - fullDataset, + FULL_DATASET, List.of(tripUpdateToday), feedId ); From e3549e5976575baf41791f436d6b4828eaf74638 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 23:18:55 +0200 Subject: [PATCH 1187/1688] Introduce module tests for GTFS snapshot --- .../ext/siri/RealtimeTestEnvironment.java | 229 ++++++++++++++++++ .../siri/SiriTimetableSnapshotSourceTest.java | 216 +---------------- .../trip/TimetableSnapshotSourceTest.java | 35 --- .../moduletests/C01_CancellationTest.java | 49 ++++ 4 files changed, 279 insertions(+), 250 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java create mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java new file mode 100644 index 00000000000..4585178468d --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java @@ -0,0 +1,229 @@ +package org.opentripplanner.ext.siri; + +import com.google.transit.realtime.GtfsRealtime; +import java.time.Duration; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.IntStream; +import org.opentripplanner.DateTimeHelper; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; +import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.calendar.CalendarServiceData; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.Station; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.TripOnServiceDate; +import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.transit.model.timetable.TripTimesFactory; +import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.StopModel; +import org.opentripplanner.transit.service.TransitModel; +import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.updater.TimetableSnapshotSourceParameters; +import org.opentripplanner.updater.spi.UpdateResult; +import org.opentripplanner.updater.trip.BackwardsDelayPropagationType; +import org.opentripplanner.updater.trip.TimetableSnapshotSource; +import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; + +public class RealtimeTestEnvironment { + + private final TransitModelForTest testModel = TransitModelForTest.of(); + public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); + public final Station stationA = testModel.station("A").build(); + public final Station stationB = testModel.station("B").build(); + public final Station stationC = testModel.station("C").build(); + public final Station stationD = testModel.station("D").build(); + public final RegularStop stopA1 = testModel.stop("A1").withParentStation(stationA).build(); + public final RegularStop stopB1 = testModel.stop("B1").withParentStation(stationB).build(); + public final RegularStop stopB2 = testModel.stop("B2").withParentStation(stationB).build(); + public final RegularStop stopC1 = testModel.stop("C1").withParentStation(stationC).build(); + public final RegularStop stopD1 = testModel.stop("D1").withParentStation(stationD).build(); + public final StopModel stopModel = testModel + .stopModelBuilder() + .withRegularStop(stopA1) + .withRegularStop(stopB1) + .withRegularStop(stopB2) + .withRegularStop(stopC1) + .withRegularStop(stopD1) + .build(); + + public final LocalDate serviceDate = LocalDate.of(2024, 5, 8); + public TransitModel transitModel; + public SiriTimetableSnapshotSource siriSource; + public final TimetableSnapshotSource gtfsSource; + + public final FeedScopedId operator1Id = TransitModelForTest.id("TestOperator1"); + public final FeedScopedId route1Id = TransitModelForTest.id("TestRoute1"); + public final Trip trip1; + public final Trip trip2; + + public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, serviceDate); + + public RealtimeTestEnvironment() { + transitModel = new TransitModel(stopModel, new Deduplicator()); + transitModel.initTimeZone(timeZone); + transitModel.addAgency(TransitModelForTest.AGENCY); + + Route route1 = TransitModelForTest.route(route1Id).build(); + + trip1 = + createTrip("TestTrip1", route1, List.of(new Stop(stopA1, 10, 11), new Stop(stopB1, 20, 21))); + trip2 = + createTrip( + "TestTrip2", + route1, + List.of(new Stop(stopA1, 60, 61), new Stop(stopB1, 70, 71), new Stop(stopC1, 80, 81)) + ); + + CalendarServiceData calendarServiceData = new CalendarServiceData(); + var cal_id = TransitModelForTest.id("CAL_1"); + calendarServiceData.putServiceDatesForServiceId( + cal_id, + List.of(serviceDate.minusDays(1), serviceDate, serviceDate.plusDays(1)) + ); + transitModel.getServiceCodes().put(cal_id, 0); + transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); + + transitModel.index(); + + var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); + //siriSource = new SiriTimetableSnapshotSource(parameters, transitModel); + gtfsSource = new TimetableSnapshotSource(parameters, transitModel); + } + + private record Stop(RegularStop stop, int arrivalTime, int departureTime) {} + + private Trip createTrip(String id, Route route, List stops) { + var trip = Trip.of(id(id)).withRoute(route).build(); + + var tripOnServiceDate = TripOnServiceDate + .of(trip.getId()) + .withTrip(trip) + .withServiceDate(serviceDate) + .build(); + + transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate); + + var stopTimes = IntStream + .range(0, stops.size()) + .mapToObj(i -> { + var stop = stops.get(i); + return createStopTime(trip, i, stop.stop(), stop.arrivalTime(), stop.departureTime()); + }) + .collect(Collectors.toList()); + + TripTimes tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, null); + + final TripPattern pattern = TransitModelForTest + .tripPattern(id + "Pattern", route) + .withStopPattern(TransitModelForTest.stopPattern(stops.stream().map(Stop::stop).toList())) + .build(); + pattern.add(tripTimes); + + transitModel.addTripPattern(pattern.getId(), pattern); + + return trip; + } + + public FeedScopedId id(String id) { + return TransitModelForTest.id(id); + } + + /** + * Returns a new fresh TransitService + */ + public TransitService getTransitService() { + return new DefaultTransitService(transitModel); + } + + public EntityResolver getEntityResolver() { + return new EntityResolver(getTransitService(), getFeedId()); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId) { + return getPatternForTrip(tripId, serviceDate); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { + var transitService = getTransitService(); + var trip = transitService.getTripOnServiceDateById(tripId); + return transitService.getPatternForTrip(trip.getTrip(), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(Trip trip) { + return getTripTimesForTrip(trip.getId(), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(String id) { + return getTripTimesForTrip(id(id), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on a serviceDate + */ + public TripTimes getTripTimesForTrip(FeedScopedId tripId, LocalDate serviceDate) { + var transitService = getTransitService(); + var trip = transitService.getTripOnServiceDateById(tripId).getTrip(); + var pattern = transitService.getPatternForTrip(trip, serviceDate); + var timetable = transitService.getTimetableForTripPattern(pattern, serviceDate); + return timetable.getTripTimes(trip); + } + + public DateTimeHelper getDateTimeHelper() { + return dateTimeHelper; + } + + private StopTime createStopTime( + Trip trip, + int stopSequence, + StopLocation stop, + int arrivalTime, + int departureTime + ) { + var st = new StopTime(); + st.setTrip(trip); + st.setStopSequence(stopSequence); + st.setStop(stop); + st.setArrivalTime(arrivalTime); + st.setDepartureTime(departureTime); + return st; + } + + public String getFeedId() { + return TransitModelForTest.FEED_ID; + } + + public UpdateResult applyEstimatedTimetable(List updates) { + return this.siriSource.applyEstimatedTimetable( + null, + getEntityResolver(), + getFeedId(), + false, + updates + ); + } + + public UpdateResult applyTripUpdates(List updates) { + return gtfsSource.applyTripUpdates( + null, + BackwardsDelayPropagationType.REQUIRED, + true, + updates, + getFeedId() + ); + } +} diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 19fdfb8636f..5db0f012ff6 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -1,42 +1,15 @@ package org.opentripplanner.ext.siri; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; -import java.time.Duration; -import java.time.LocalDate; -import java.time.ZoneId; import java.util.List; import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.IntStream; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.opentripplanner.DateTimeHelper; -import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.StopTime; -import org.opentripplanner.model.calendar.CalendarServiceData; -import org.opentripplanner.transit.model._data.TransitModelForTest; -import org.opentripplanner.transit.model.framework.Deduplicator; -import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.network.Route; -import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.model.site.Station; -import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.RealTimeState; -import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.model.timetable.TripOnServiceDate; -import org.opentripplanner.transit.model.timetable.TripTimes; -import org.opentripplanner.transit.model.timetable.TripTimesFactory; -import org.opentripplanner.transit.service.DefaultTransitService; -import org.opentripplanner.transit.service.StopModel; -import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.transit.service.TransitService; -import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; -import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; class SiriTimetableSnapshotSourceTest { @@ -356,191 +329,4 @@ void testExtraUnknownStop() { private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType errorType) { assertEquals(result.failures().keySet(), Set.of(errorType)); } - - private static class RealtimeTestEnvironment { - - private final TransitModelForTest testModel = TransitModelForTest.of(); - public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); - public final Station stationA = testModel.station("A").build(); - public final Station stationB = testModel.station("B").build(); - public final Station stationC = testModel.station("C").build(); - public final Station stationD = testModel.station("D").build(); - public final RegularStop stopA1 = testModel.stop("A1").withParentStation(stationA).build(); - public final RegularStop stopB1 = testModel.stop("B1").withParentStation(stationB).build(); - public final RegularStop stopB2 = testModel.stop("B2").withParentStation(stationB).build(); - public final RegularStop stopC1 = testModel.stop("C1").withParentStation(stationC).build(); - public final RegularStop stopD1 = testModel.stop("D1").withParentStation(stationD).build(); - public final StopModel stopModel = testModel - .stopModelBuilder() - .withRegularStop(stopA1) - .withRegularStop(stopB1) - .withRegularStop(stopB2) - .withRegularStop(stopC1) - .withRegularStop(stopD1) - .build(); - - public final LocalDate serviceDate = LocalDate.of(2024, 5, 8); - public TransitModel transitModel; - public SiriTimetableSnapshotSource snapshotSource; - - public final FeedScopedId operator1Id = TransitModelForTest.id("TestOperator1"); - public final FeedScopedId route1Id = TransitModelForTest.id("TestRoute1"); - public Trip trip1; - public Trip trip2; - - public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, serviceDate); - - public RealtimeTestEnvironment() { - transitModel = new TransitModel(stopModel, new Deduplicator()); - transitModel.initTimeZone(timeZone); - transitModel.addAgency(TransitModelForTest.AGENCY); - - Route route1 = TransitModelForTest.route(route1Id).build(); - - trip1 = - createTrip( - "TestTrip1", - route1, - List.of(new Stop(stopA1, 10, 11), new Stop(stopB1, 20, 21)) - ); - trip2 = - createTrip( - "TestTrip2", - route1, - List.of(new Stop(stopA1, 60, 61), new Stop(stopB1, 70, 71), new Stop(stopC1, 80, 81)) - ); - - CalendarServiceData calendarServiceData = new CalendarServiceData(); - var cal_id = TransitModelForTest.id("CAL_1"); - calendarServiceData.putServiceDatesForServiceId( - cal_id, - List.of(serviceDate.minusDays(1), serviceDate, serviceDate.plusDays(1)) - ); - transitModel.getServiceCodes().put(cal_id, 0); - transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); - - transitModel.index(); - - var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); - snapshotSource = new SiriTimetableSnapshotSource(parameters, transitModel); - } - - private record Stop(RegularStop stop, int arrivalTime, int departureTime) {} - - private Trip createTrip(String id, Route route, List stops) { - var trip = Trip.of(id(id)).withRoute(route).build(); - - var tripOnServiceDate = TripOnServiceDate - .of(trip.getId()) - .withTrip(trip) - .withServiceDate(serviceDate) - .build(); - - transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate); - - var stopTimes = IntStream - .range(0, stops.size()) - .mapToObj(i -> { - var stop = stops.get(i); - return createStopTime(trip, i, stop.stop(), stop.arrivalTime(), stop.departureTime()); - }) - .collect(Collectors.toList()); - - TripTimes tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, null); - - final TripPattern pattern = TransitModelForTest - .tripPattern(id + "Pattern", route) - .withStopPattern(TransitModelForTest.stopPattern(stops.stream().map(Stop::stop).toList())) - .build(); - pattern.add(tripTimes); - - transitModel.addTripPattern(pattern.getId(), pattern); - - return trip; - } - - public FeedScopedId id(String id) { - return TransitModelForTest.id(id); - } - - /** - * Returns a new fresh TransitService - */ - public TransitService getTransitService() { - return new DefaultTransitService(transitModel); - } - - public EntityResolver getEntityResolver() { - return new EntityResolver(getTransitService(), getFeedId()); - } - - public TripPattern getPatternForTrip(FeedScopedId tripId) { - return getPatternForTrip(tripId, serviceDate); - } - - public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { - var transitService = getTransitService(); - var trip = transitService.getTripOnServiceDateById(tripId); - return transitService.getPatternForTrip(trip.getTrip(), serviceDate); - } - - /** - * Find the current TripTimes for a trip id on the default serviceDate - */ - public TripTimes getTripTimesForTrip(Trip trip) { - return getTripTimesForTrip(trip.getId(), serviceDate); - } - - /** - * Find the current TripTimes for a trip id on the default serviceDate - */ - public TripTimes getTripTimesForTrip(String id) { - return getTripTimesForTrip(id(id), serviceDate); - } - - /** - * Find the current TripTimes for a trip id on a serviceDate - */ - public TripTimes getTripTimesForTrip(FeedScopedId tripId, LocalDate serviceDate) { - var transitService = getTransitService(); - var trip = transitService.getTripOnServiceDateById(tripId).getTrip(); - var pattern = transitService.getPatternForTrip(trip, serviceDate); - var timetable = transitService.getTimetableForTripPattern(pattern, serviceDate); - return timetable.getTripTimes(trip); - } - - public DateTimeHelper getDateTimeHelper() { - return dateTimeHelper; - } - - private StopTime createStopTime( - Trip trip, - int stopSequence, - StopLocation stop, - int arrivalTime, - int departureTime - ) { - var st = new StopTime(); - st.setTrip(trip); - st.setStopSequence(stopSequence); - st.setStop(stop); - st.setArrivalTime(arrivalTime); - st.setDepartureTime(departureTime); - return st; - } - - public String getFeedId() { - return TransitModelForTest.FEED_ID; - } - - public UpdateResult applyEstimatedTimetable(List updates) { - return this.snapshotSource.applyEstimatedTimetable( - null, - getEntityResolver(), - getFeedId(), - false, - updates - ); - } - } } diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index bb2f5136767..eeeed4c94f8 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -130,41 +130,6 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() { assertNotSame(snapshot, newSnapshot); } - @Test - public void testHandleCanceledTrip() { - final FeedScopedId tripId = new FeedScopedId(feedId, "1.1"); - final FeedScopedId tripId2 = new FeedScopedId(feedId, "1.2"); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern pattern = transitModel.getTransitModelIndex().getPatternForTrip().get(trip); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(tripId); - final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(tripId2); - - var updater = new TimetableSnapshotSource( - TimetableSnapshotSourceParameters.DEFAULT, - transitModel, - () -> SERVICE_DATE - ); - - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - FULL_DATASET, - List.of(cancellation("1.1")), - feedId - ); - - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern, SERVICE_DATE); - final Timetable schedule = snapshot.resolve(pattern, null); - assertNotSame(forToday, schedule); - assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); - assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); - - final TripTimes tripTimes = forToday.getTripTimes(tripIndex); - - assertEquals(RealTimeState.CANCELED, tripTimes.getRealTimeState()); - } - @Test public void testHandleDeletedTrip() { final FeedScopedId tripId = new FeedScopedId(feedId, "1.1"); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java new file mode 100644 index 00000000000..5981eb1ce71 --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java @@ -0,0 +1,49 @@ +package org.opentripplanner.updater.trip.moduletests; + +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.CANCELED; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; + +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner.ext.siri.RealtimeTestEnvironment; +import org.opentripplanner.model.Timetable; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.updater.trip.TripUpdateBuilder; + +public class C01_CancellationTest { + + @Test + public void cancelledTrip() { + var env = new RealtimeTestEnvironment(); + var pattern = env.transitModel + .getTransitModelIndex() + .getPatternForTrip() + .get(env.trip1); + final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip1.getId()); + final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); + + var cancellation = new TripUpdateBuilder( + env.trip1.getId().getId(), + env.serviceDate, + CANCELED, + env.timeZone + ) + .build(); + var result = env.applyTripUpdates(List.of(cancellation)); + + assertEquals(1, result.successful()); + + final TimetableSnapshot snapshot = env.gtfsSource.getTimetableSnapshot(); + final Timetable forToday = snapshot.resolve(pattern, env.serviceDate); + final Timetable schedule = snapshot.resolve(pattern, null); + assertNotSame(forToday, schedule); + assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); + //assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); + + var tripTimes = forToday.getTripTimes(tripIndex); + + assertEquals(RealTimeState.CANCELED, tripTimes.getRealTimeState()); + } +} From 6282852b06bcef10c0c025885c6650e7afed1384 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 25 May 2024 23:29:55 +0200 Subject: [PATCH 1188/1688] Improve module tests --- .../ext/siri/RealtimeTestEnvironment.java | 8 +-- .../trip/TimetableSnapshotSourceTest.java | 42 ------------- .../updater/trip/TripUpdateBuilder.java | 5 ++ .../A01_CancellationDeletionTest.java | 55 ++++++++++++++++ .../trip/moduletests/B01_DelayedTest.java | 62 +++++++++++++++++++ .../moduletests/C01_CancellationTest.java | 49 --------------- 6 files changed, 126 insertions(+), 95 deletions(-) create mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java create mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java delete mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java index 4585178468d..7f302670ee8 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java @@ -35,6 +35,7 @@ public class RealtimeTestEnvironment { + private static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); public final Station stationA = testModel.station("A").build(); @@ -84,12 +85,11 @@ public RealtimeTestEnvironment() { ); CalendarServiceData calendarServiceData = new CalendarServiceData(); - var cal_id = TransitModelForTest.id("CAL_1"); calendarServiceData.putServiceDatesForServiceId( - cal_id, + CAL_ID, List.of(serviceDate.minusDays(1), serviceDate, serviceDate.plusDays(1)) ); - transitModel.getServiceCodes().put(cal_id, 0); + transitModel.getServiceCodes().put(CAL_ID, 0); transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); transitModel.index(); @@ -102,7 +102,7 @@ public RealtimeTestEnvironment() { private record Stop(RegularStop stop, int arrivalTime, int departureTime) {} private Trip createTrip(String id, Route route, List stops) { - var trip = Trip.of(id(id)).withRoute(route).build(); + var trip = Trip.of(id(id)).withRoute(route).withServiceId(CAL_ID).build(); var tripOnServiceDate = TripOnServiceDate .of(trip.getId()) diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index eeeed4c94f8..1704094f109 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -130,48 +130,6 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() { assertNotSame(snapshot, newSnapshot); } - @Test - public void testHandleDeletedTrip() { - final FeedScopedId tripId = new FeedScopedId(feedId, "1.1"); - final FeedScopedId tripId2 = new FeedScopedId(feedId, "1.2"); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern pattern = transitModel.getTransitModelIndex().getPatternForTrip().get(trip); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(tripId); - final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(tripId2); - - var updater = defaultUpdater(); - - final TripDescriptor.Builder tripDescriptorBuilder = TripDescriptor.newBuilder(); - - tripDescriptorBuilder.setTripId("1.1"); - tripDescriptorBuilder.setScheduleRelationship(ScheduleRelationship.DELETED); - - final TripUpdate.Builder tripUpdateBuilder = TripUpdate.newBuilder(); - - tripUpdateBuilder.setTrip(tripDescriptorBuilder); - - var deletion = tripUpdateBuilder.build(); - - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - FULL_DATASET, - List.of(deletion), - feedId - ); - - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern, SERVICE_DATE); - final Timetable schedule = snapshot.resolve(pattern, null); - assertNotSame(forToday, schedule); - assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); - assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); - - final TripTimes tripTimes = forToday.getTripTimes(tripIndex); - - assertEquals(RealTimeState.DELETED, tripTimes.getRealTimeState()); - } - /** * This test just asserts that invalid trip ids don't throw an exception and are ignored instead */ diff --git a/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java b/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java index 2960d92a9cd..8fe35f09320 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java +++ b/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java @@ -7,6 +7,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.util.List; import org.opentripplanner.framework.time.ServiceDateUtils; public class TripUpdateBuilder { @@ -174,6 +175,10 @@ public GtfsRealtime.TripUpdate build() { return tripUpdateBuilder.build(); } + public List buildList() { + return List.of(build()); + } + /** * Set route name, agency id, url and type (mode) via a custom extension. */ diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java new file mode 100644 index 00000000000..dc2a30fd62c --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java @@ -0,0 +1,55 @@ +package org.opentripplanner.updater.trip.moduletests; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; + +import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship; +import java.util.List; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.ext.siri.RealtimeTestEnvironment; +import org.opentripplanner.model.Timetable; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.updater.trip.TripUpdateBuilder; + +public class A01_CancellationDeletionTest { + + static List cases() { + return List.of( + Arguments.of(ScheduleRelationship.CANCELED, RealTimeState.CANCELED), + Arguments.of(ScheduleRelationship.DELETED, RealTimeState.DELETED) + ); + } + + @ParameterizedTest + @MethodSource("cases") + public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { + var env = new RealtimeTestEnvironment(); + var pattern1 = env.transitModel.getTransitModelIndex().getPatternForTrip().get(env.trip1); + + final int tripIndex1 = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); + + var update = new TripUpdateBuilder( + env.trip1.getId().getId(), + env.serviceDate, + relationship, + env.timeZone + ) + .buildList(); + var result = env.applyTripUpdates(update); + + assertEquals(1, result.successful()); + + final TimetableSnapshot snapshot = env.gtfsSource.getTimetableSnapshot(); + final Timetable forToday = snapshot.resolve(pattern1, env.serviceDate); + final Timetable schedule = snapshot.resolve(pattern1, null); + assertNotSame(forToday, schedule); + assertNotSame(forToday.getTripTimes(tripIndex1), schedule.getTripTimes(tripIndex1)); + + var tripTimes = forToday.getTripTimes(tripIndex1); + + assertEquals(state, tripTimes.getRealTimeState()); + } +} diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java new file mode 100644 index 00000000000..c63fb582dec --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java @@ -0,0 +1,62 @@ +package org.opentripplanner.updater.trip.moduletests; + +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.ext.siri.RealtimeTestEnvironment; +import org.opentripplanner.model.Timetable; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.updater.trip.TripUpdateBuilder; + +public class B01_DelayedTest { + + + @Test + public void delayed() { + var env = new RealtimeTestEnvironment(); + + final TripPattern pattern = env.transitModel.getTransitModelIndex().getPatternForTrip().get(env.trip1); + final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip1.getId()); + //final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); + + var tripUpdateBuilder = new TripUpdateBuilder( + env.trip1.getId().getId(), + env.serviceDate, + SCHEDULED, + env.timeZone + ); + + int stopSequence = 2; + int delay = 1; + tripUpdateBuilder.addDelayedStopTime(stopSequence, delay); + + var tripUpdate = tripUpdateBuilder.buildList(); + + + var result = env.applyTripUpdates( + tripUpdate + ); + + assertEquals(1, result.successful()); + + final TimetableSnapshot snapshot = env.gtfsSource.getTimetableSnapshot(); + final Timetable forToday = snapshot.resolve(pattern, env.serviceDate); + final Timetable schedule = snapshot.resolve(pattern, null); + assertNotSame(forToday, schedule); + assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); + //assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); + assertEquals(1, forToday.getTripTimes(tripIndex).getArrivalDelay(1)); + assertEquals(1, forToday.getTripTimes(tripIndex).getDepartureDelay(1)); + + assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex).getRealTimeState()); + assertEquals(RealTimeState.UPDATED, forToday.getTripTimes(tripIndex).getRealTimeState()); + + //assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex2).getRealTimeState()); + //assertEquals(RealTimeState.SCHEDULED, forToday.getTripTimes(tripIndex2).getRealTimeState()); + } + + } \ No newline at end of file diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java deleted file mode 100644 index 5981eb1ce71..00000000000 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_CancellationTest.java +++ /dev/null @@ -1,49 +0,0 @@ -package org.opentripplanner.updater.trip.moduletests; - -import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.CANCELED; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotSame; - -import java.util.List; -import org.junit.jupiter.api.Test; -import org.opentripplanner.ext.siri.RealtimeTestEnvironment; -import org.opentripplanner.model.Timetable; -import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.transit.model.timetable.RealTimeState; -import org.opentripplanner.updater.trip.TripUpdateBuilder; - -public class C01_CancellationTest { - - @Test - public void cancelledTrip() { - var env = new RealtimeTestEnvironment(); - var pattern = env.transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(env.trip1); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip1.getId()); - final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); - - var cancellation = new TripUpdateBuilder( - env.trip1.getId().getId(), - env.serviceDate, - CANCELED, - env.timeZone - ) - .build(); - var result = env.applyTripUpdates(List.of(cancellation)); - - assertEquals(1, result.successful()); - - final TimetableSnapshot snapshot = env.gtfsSource.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern, env.serviceDate); - final Timetable schedule = snapshot.resolve(pattern, null); - assertNotSame(forToday, schedule); - assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); - //assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); - - var tripTimes = forToday.getTripTimes(tripIndex); - - assertEquals(RealTimeState.CANCELED, tripTimes.getRealTimeState()); - } -} From 28f1b0008c311407c6f72cefc6c26dac7cfaace9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 25 May 2024 23:40:50 +0200 Subject: [PATCH 1189/1688] Extract separate enviroments for Siri and GTFS --- .../ext/siri/SiriRealtimeTestEnvironment.java | 30 +++++ .../siri/SiriTimetableSnapshotSourceTest.java | 24 ++-- .../AbstractRealtimeTestEnvironment.java} | 121 +++++++----------- .../trip/GtfsRealtimeTestEnvironment.java | 28 ++++ .../trip/TimetableSnapshotSourceTest.java | 48 ------- .../A01_CancellationDeletionTest.java | 6 +- .../trip/moduletests/B01_DelayedTest.java | 8 +- 7 files changed, 120 insertions(+), 145 deletions(-) create mode 100644 src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java rename src/{ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java => test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java} (81%) create mode 100644 src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java new file mode 100644 index 00000000000..d3f5a72fe2b --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java @@ -0,0 +1,30 @@ +package org.opentripplanner.ext.siri; + +import java.time.Duration; +import java.util.List; +import org.opentripplanner.updater.TimetableSnapshotSourceParameters; +import org.opentripplanner.updater.spi.UpdateResult; +import org.opentripplanner.updater.trip.AbstractRealtimeTestEnvironment; +import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; + +public class SiriRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment { + + private final SiriTimetableSnapshotSource source; + + public SiriRealtimeTestEnvironment() { + super(); + var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); + source = new SiriTimetableSnapshotSource(parameters, transitModel); + } + + public UpdateResult applyEstimatedTimetable(List updates) { + return source.applyEstimatedTimetable( + null, + getEntityResolver(), + getFeedId(), + false, + updates + ); + } + +} diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 5db0f012ff6..d6f8c0be6c8 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -15,7 +15,7 @@ class SiriTimetableSnapshotSourceTest { @Test void testCancelTrip() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); assertEquals(RealTimeState.SCHEDULED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); @@ -32,7 +32,7 @@ void testCancelTrip() { @Test void testAddJourney() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") @@ -54,7 +54,7 @@ void testAddJourney() { @Test void testReplaceJourney() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") @@ -88,7 +88,7 @@ void testReplaceJourney() { */ @Test void testUpdateJourney() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) @@ -117,7 +117,7 @@ void testUpdateJourney() { */ @Test void testChangeQuay() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) @@ -145,7 +145,7 @@ void testChangeQuay() { @Test void testCancelStop() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip2.getId().getId()) @@ -175,7 +175,7 @@ void testCancelStop() { @Test @Disabled("Not supported yet") void testAddStop() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) @@ -221,7 +221,7 @@ void testAddStop() { @Test void testNotMonitored() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withMonitored(false) @@ -234,7 +234,7 @@ void testNotMonitored() { @Test void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef("newJourney") @@ -259,7 +259,7 @@ void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { @Test void testNegativeHopTime() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) @@ -279,7 +279,7 @@ void testNegativeHopTime() { @Test void testNegativeDwellTime() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip2.getId().getId()) @@ -304,7 +304,7 @@ void testNegativeDwellTime() { @Test @Disabled("Not supported yet") void testExtraUnknownStop() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java similarity index 81% rename from src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java rename to src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java index 7f302670ee8..fa101e14e44 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java @@ -1,13 +1,12 @@ -package org.opentripplanner.ext.siri; +package org.opentripplanner.updater.trip; -import com.google.transit.realtime.GtfsRealtime; -import java.time.Duration; import java.time.LocalDate; import java.time.ZoneId; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; import org.opentripplanner.DateTimeHelper; +import org.opentripplanner.ext.siri.EntityResolver; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; @@ -27,15 +26,9 @@ import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; -import org.opentripplanner.updater.TimetableSnapshotSourceParameters; -import org.opentripplanner.updater.spi.UpdateResult; -import org.opentripplanner.updater.trip.BackwardsDelayPropagationType; -import org.opentripplanner.updater.trip.TimetableSnapshotSource; -import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; -public class RealtimeTestEnvironment { - - private static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); +public class AbstractRealtimeTestEnvironment { + protected static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); public final Station stationA = testModel.station("A").build(); @@ -55,20 +48,15 @@ public class RealtimeTestEnvironment { .withRegularStop(stopC1) .withRegularStop(stopD1) .build(); - public final LocalDate serviceDate = LocalDate.of(2024, 5, 8); - public TransitModel transitModel; - public SiriTimetableSnapshotSource siriSource; - public final TimetableSnapshotSource gtfsSource; - public final FeedScopedId operator1Id = TransitModelForTest.id("TestOperator1"); public final FeedScopedId route1Id = TransitModelForTest.id("TestRoute1"); public final Trip trip1; public final Trip trip2; - public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, serviceDate); + public TransitModel transitModel; - public RealtimeTestEnvironment() { + public AbstractRealtimeTestEnvironment() { transitModel = new TransitModel(stopModel, new Deduplicator()); transitModel.initTimeZone(timeZone); transitModel.addAgency(TransitModelForTest.AGENCY); @@ -93,44 +81,6 @@ public RealtimeTestEnvironment() { transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); transitModel.index(); - - var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); - //siriSource = new SiriTimetableSnapshotSource(parameters, transitModel); - gtfsSource = new TimetableSnapshotSource(parameters, transitModel); - } - - private record Stop(RegularStop stop, int arrivalTime, int departureTime) {} - - private Trip createTrip(String id, Route route, List stops) { - var trip = Trip.of(id(id)).withRoute(route).withServiceId(CAL_ID).build(); - - var tripOnServiceDate = TripOnServiceDate - .of(trip.getId()) - .withTrip(trip) - .withServiceDate(serviceDate) - .build(); - - transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate); - - var stopTimes = IntStream - .range(0, stops.size()) - .mapToObj(i -> { - var stop = stops.get(i); - return createStopTime(trip, i, stop.stop(), stop.arrivalTime(), stop.departureTime()); - }) - .collect(Collectors.toList()); - - TripTimes tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, null); - - final TripPattern pattern = TransitModelForTest - .tripPattern(id + "Pattern", route) - .withStopPattern(TransitModelForTest.stopPattern(stops.stream().map(Stop::stop).toList())) - .build(); - pattern.add(tripTimes); - - transitModel.addTripPattern(pattern.getId(), pattern); - - return trip; } public FeedScopedId id(String id) { @@ -187,6 +137,42 @@ public DateTimeHelper getDateTimeHelper() { return dateTimeHelper; } + public String getFeedId() { + return TransitModelForTest.FEED_ID; + } + + protected Trip createTrip(String id, Route route, List stops) { + var trip = Trip.of(id(id)).withRoute(route).withServiceId(CAL_ID).build(); + + var tripOnServiceDate = TripOnServiceDate + .of(trip.getId()) + .withTrip(trip) + .withServiceDate(serviceDate) + .build(); + + transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate); + + var stopTimes = IntStream + .range(0, stops.size()) + .mapToObj(i -> { + var stop = stops.get(i); + return createStopTime(trip, i, stop.stop(), stop.arrivalTime(), stop.departureTime()); + }) + .collect(Collectors.toList()); + + TripTimes tripTimes = TripTimesFactory.tripTimes(trip, stopTimes, null); + + final TripPattern pattern = TransitModelForTest + .tripPattern(id + "Pattern", route) + .withStopPattern(TransitModelForTest.stopPattern(stops.stream().map(Stop::stop).toList())) + .build(); + pattern.add(tripTimes); + + transitModel.addTripPattern(pattern.getId(), pattern); + + return trip; + } + private StopTime createStopTime( Trip trip, int stopSequence, @@ -203,27 +189,6 @@ private StopTime createStopTime( return st; } - public String getFeedId() { - return TransitModelForTest.FEED_ID; - } - - public UpdateResult applyEstimatedTimetable(List updates) { - return this.siriSource.applyEstimatedTimetable( - null, - getEntityResolver(), - getFeedId(), - false, - updates - ); - } - - public UpdateResult applyTripUpdates(List updates) { - return gtfsSource.applyTripUpdates( - null, - BackwardsDelayPropagationType.REQUIRED, - true, - updates, - getFeedId() - ); + protected record Stop(RegularStop stop, int arrivalTime, int departureTime) { } } diff --git a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java new file mode 100644 index 00000000000..be96813b06b --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java @@ -0,0 +1,28 @@ +package org.opentripplanner.updater.trip; + +import com.google.transit.realtime.GtfsRealtime; +import java.time.Duration; +import java.util.List; +import org.opentripplanner.updater.TimetableSnapshotSourceParameters; +import org.opentripplanner.updater.spi.UpdateResult; + +public class GtfsRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment { + + public final TimetableSnapshotSource source; + + public GtfsRealtimeTestEnvironment() { + super(); + var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); + source = new TimetableSnapshotSource(parameters, transitModel); + } + + public UpdateResult applyTripUpdates(List updates) { + return source.applyTripUpdates( + null, + BackwardsDelayPropagationType.REQUIRED, + true, + updates, + getFeedId() + ); + } +} diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 1704094f109..74e17a09679 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -371,54 +371,6 @@ public void testHandleModifiedTrip() { @Nested class Scheduled { - @Test - public void delayed() { - final FeedScopedId tripId = new FeedScopedId(feedId, "1.1"); - final FeedScopedId tripId2 = new FeedScopedId(feedId, "1.2"); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern pattern = transitModel.getTransitModelIndex().getPatternForTrip().get(trip); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(tripId); - final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(tripId2); - - var tripUpdateBuilder = new TripUpdateBuilder( - tripId.getId(), - SERVICE_DATE, - ScheduleRelationship.SCHEDULED, - transitModel.getTimeZone() - ); - - int stopSequence = 2; - int delay = 1; - tripUpdateBuilder.addDelayedStopTime(stopSequence, delay); - - final TripUpdate tripUpdate = tripUpdateBuilder.build(); - - var updater = defaultUpdater(); - - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - FULL_DATASET, - List.of(tripUpdate), - feedId - ); - - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern, SERVICE_DATE); - final Timetable schedule = snapshot.resolve(pattern, null); - assertNotSame(forToday, schedule); - assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); - assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); - assertEquals(1, forToday.getTripTimes(tripIndex).getArrivalDelay(1)); - assertEquals(1, forToday.getTripTimes(tripIndex).getDepartureDelay(1)); - - assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex).getRealTimeState()); - assertEquals(RealTimeState.UPDATED, forToday.getTripTimes(tripIndex).getRealTimeState()); - - assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex2).getRealTimeState()); - assertEquals(RealTimeState.SCHEDULED, forToday.getTripTimes(tripIndex2).getRealTimeState()); - } - @Test public void scheduled() { // GIVEN diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java index dc2a30fd62c..8c1686273a6 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java @@ -8,10 +8,10 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.ext.siri.RealtimeTestEnvironment; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; public class A01_CancellationDeletionTest { @@ -26,7 +26,7 @@ static List cases() { @ParameterizedTest @MethodSource("cases") public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { - var env = new RealtimeTestEnvironment(); + var env = new GtfsRealtimeTestEnvironment(); var pattern1 = env.transitModel.getTransitModelIndex().getPatternForTrip().get(env.trip1); final int tripIndex1 = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); @@ -42,7 +42,7 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state assertEquals(1, result.successful()); - final TimetableSnapshot snapshot = env.gtfsSource.getTimetableSnapshot(); + final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); final Timetable forToday = snapshot.resolve(pattern1, env.serviceDate); final Timetable schedule = snapshot.resolve(pattern1, null); assertNotSame(forToday, schedule); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java index c63fb582dec..cd6412ea843 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java @@ -5,11 +5,11 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import org.junit.jupiter.api.Test; -import org.opentripplanner.ext.siri.RealtimeTestEnvironment; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; public class B01_DelayedTest { @@ -17,7 +17,7 @@ public class B01_DelayedTest { @Test public void delayed() { - var env = new RealtimeTestEnvironment(); + var env = new GtfsRealtimeTestEnvironment(); final TripPattern pattern = env.transitModel.getTransitModelIndex().getPatternForTrip().get(env.trip1); final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip1.getId()); @@ -30,7 +30,7 @@ public void delayed() { env.timeZone ); - int stopSequence = 2; + int stopSequence = 1; int delay = 1; tripUpdateBuilder.addDelayedStopTime(stopSequence, delay); @@ -43,7 +43,7 @@ public void delayed() { assertEquals(1, result.successful()); - final TimetableSnapshot snapshot = env.gtfsSource.getTimetableSnapshot(); + final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); final Timetable forToday = snapshot.resolve(pattern, env.serviceDate); final Timetable schedule = snapshot.resolve(pattern, null); assertNotSame(forToday, schedule); From 19d663b4c0e889b3fedb29a526582674a972590d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 26 May 2024 11:50:59 +0200 Subject: [PATCH 1190/1688] Extract test for delay --- .../ext/siri/SiriRealtimeTestEnvironment.java | 11 +-- .../trip/AbstractRealtimeTestEnvironment.java | 4 +- .../trip/GtfsRealtimeTestEnvironment.java | 2 +- .../trip/moduletests/B01_DelayedTest.java | 89 +++++++++---------- 4 files changed, 48 insertions(+), 58 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java index d3f5a72fe2b..3cb7bd05632 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java @@ -14,17 +14,10 @@ public class SiriRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment public SiriRealtimeTestEnvironment() { super(); var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); - source = new SiriTimetableSnapshotSource(parameters, transitModel); + source = new SiriTimetableSnapshotSource(parameters, transitModel); } public UpdateResult applyEstimatedTimetable(List updates) { - return source.applyEstimatedTimetable( - null, - getEntityResolver(), - getFeedId(), - false, - updates - ); + return source.applyEstimatedTimetable(null, getEntityResolver(), getFeedId(), false, updates); } - } diff --git a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java index fa101e14e44..1ae818a5a2d 100644 --- a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java @@ -28,6 +28,7 @@ import org.opentripplanner.transit.service.TransitService; public class AbstractRealtimeTestEnvironment { + protected static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); @@ -189,6 +190,5 @@ private StopTime createStopTime( return st; } - protected record Stop(RegularStop stop, int arrivalTime, int departureTime) { - } + protected record Stop(RegularStop stop, int arrivalTime, int departureTime) {} } diff --git a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java index be96813b06b..60ef314cae6 100644 --- a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java @@ -13,7 +13,7 @@ public class GtfsRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment public GtfsRealtimeTestEnvironment() { super(); var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); - source = new TimetableSnapshotSource(parameters, transitModel); + source = new TimetableSnapshotSource(parameters, transitModel); } public UpdateResult applyTripUpdates(List updates) { diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java index cd6412ea843..5a913f80826 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java @@ -14,49 +14,46 @@ public class B01_DelayedTest { - - @Test - public void delayed() { - var env = new GtfsRealtimeTestEnvironment(); - - final TripPattern pattern = env.transitModel.getTransitModelIndex().getPatternForTrip().get(env.trip1); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip1.getId()); - //final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); - - var tripUpdateBuilder = new TripUpdateBuilder( - env.trip1.getId().getId(), - env.serviceDate, - SCHEDULED, - env.timeZone - ); - - int stopSequence = 1; - int delay = 1; - tripUpdateBuilder.addDelayedStopTime(stopSequence, delay); - - var tripUpdate = tripUpdateBuilder.buildList(); - - - var result = env.applyTripUpdates( - tripUpdate - ); - - assertEquals(1, result.successful()); - - final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern, env.serviceDate); - final Timetable schedule = snapshot.resolve(pattern, null); - assertNotSame(forToday, schedule); - assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); - //assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); - assertEquals(1, forToday.getTripTimes(tripIndex).getArrivalDelay(1)); - assertEquals(1, forToday.getTripTimes(tripIndex).getDepartureDelay(1)); - - assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex).getRealTimeState()); - assertEquals(RealTimeState.UPDATED, forToday.getTripTimes(tripIndex).getRealTimeState()); - - //assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex2).getRealTimeState()); - //assertEquals(RealTimeState.SCHEDULED, forToday.getTripTimes(tripIndex2).getRealTimeState()); - } - - } \ No newline at end of file + @Test + public void delayed() { + var env = new GtfsRealtimeTestEnvironment(); + + final TripPattern pattern = env.transitModel + .getTransitModelIndex() + .getPatternForTrip() + .get(env.trip1); + final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip1.getId()); + //final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); + + var tripUpdateBuilder = new TripUpdateBuilder( + env.trip1.getId().getId(), + env.serviceDate, + SCHEDULED, + env.timeZone + ); + + int stopSequence = 1; + int delay = 1; + tripUpdateBuilder.addDelayedStopTime(stopSequence, delay); + + var tripUpdate = tripUpdateBuilder.buildList(); + + var result = env.applyTripUpdates(tripUpdate); + + assertEquals(1, result.successful()); + + final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); + final Timetable forToday = snapshot.resolve(pattern, env.serviceDate); + final Timetable schedule = snapshot.resolve(pattern, null); + assertNotSame(forToday, schedule); + assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); + //assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); + assertEquals(1, forToday.getTripTimes(tripIndex).getArrivalDelay(1)); + assertEquals(1, forToday.getTripTimes(tripIndex).getDepartureDelay(1)); + + assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex).getRealTimeState()); + assertEquals(RealTimeState.UPDATED, forToday.getTripTimes(tripIndex).getRealTimeState()); + //assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex2).getRealTimeState()); + //assertEquals(RealTimeState.SCHEDULED, forToday.getTripTimes(tripIndex2).getRealTimeState()); + } +} From d7827e91047ed348abcadb4ff6cfdf09722668f7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 26 May 2024 12:01:23 +0200 Subject: [PATCH 1191/1688] Simplify building of cancellation --- .../updater/trip/TimetableSnapshotSourceTest.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 74e17a09679..89b9077470a 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -1,6 +1,7 @@ package org.opentripplanner.updater.trip; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.ADDED; +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.CANCELED; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.SKIPPED; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -35,6 +36,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; +import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.PickDrop; @@ -70,16 +72,7 @@ public void setUp() { } private static TripUpdate cancellation(String tripId) { - final TripDescriptor.Builder tripDescriptorBuilder = TripDescriptor.newBuilder(); - - tripDescriptorBuilder.setTripId(tripId); - tripDescriptorBuilder.setScheduleRelationship(TripDescriptor.ScheduleRelationship.CANCELED); - - final TripUpdate.Builder tripUpdateBuilder = TripUpdate.newBuilder(); - - tripUpdateBuilder.setTrip(tripDescriptorBuilder); - - return tripUpdateBuilder.build(); + return new TripUpdateBuilder(tripId, SERVICE_DATE, CANCELED, ZoneIds.NEW_YORK).build(); } @Test From 8c9d8e7d38a7442fb037cf233b51abbe62eb5bc5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 26 May 2024 22:35:18 +0200 Subject: [PATCH 1192/1688] Move skipped test --- .../trip/AbstractRealtimeTestEnvironment.java | 2 +- .../trip/GtfsRealtimeTestEnvironment.java | 6 +- .../trip/TimetableSnapshotSourceTest.java | 162 ++---------------- .../updater/trip/TripUpdateBuilder.java | 5 - .../A01_CancellationDeletionTest.java | 2 +- .../trip/moduletests/B01_DelayedTest.java | 2 +- .../trip/moduletests/B02_SkippedTest.java | 114 ++++++++++++ .../moduletests/C01_InvalidInputTest.java | 46 +++++ 8 files changed, 178 insertions(+), 161 deletions(-) create mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/B02_SkippedTest.java create mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/C01_InvalidInputTest.java diff --git a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java index 1ae818a5a2d..9047f5e15ef 100644 --- a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java @@ -55,7 +55,7 @@ public class AbstractRealtimeTestEnvironment { public final Trip trip1; public final Trip trip2; public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, serviceDate); - public TransitModel transitModel; + public final TransitModel transitModel; public AbstractRealtimeTestEnvironment() { transitModel = new TransitModel(stopModel, new Deduplicator()); diff --git a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java index 60ef314cae6..71b2d99fe5d 100644 --- a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java @@ -16,10 +16,14 @@ public GtfsRealtimeTestEnvironment() { source = new TimetableSnapshotSource(parameters, transitModel); } + public UpdateResult applyTripUpdates(GtfsRealtime.TripUpdate update) { + return applyTripUpdates(List.of(update)); + } + public UpdateResult applyTripUpdates(List updates) { return source.applyTripUpdates( null, - BackwardsDelayPropagationType.REQUIRED, + BackwardsDelayPropagationType.REQUIRED_NO_DATA, true, updates, getFeedId() diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 89b9077470a..546c181aa2c 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -11,7 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; import static org.opentripplanner.updater.trip.BackwardsDelayPropagationType.REQUIRED_NO_DATA; import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.NotSame; import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.Same; @@ -56,6 +55,13 @@ public class TimetableSnapshotSourceTest { private static final LocalDate SERVICE_DATE = LocalDate.parse("2009-02-01"); + private static final TripUpdate CANCELLATION = new TripUpdateBuilder( + "1.1", + SERVICE_DATE, + CANCELED, + ZoneIds.NEW_YORK + ) + .build(); private TransitModel transitModel; private final GtfsRealtimeFuzzyTripMatcher TRIP_MATCHER_NOOP = null; @@ -71,10 +77,6 @@ public void setUp() { feedId = transitModel.getFeedIds().stream().findFirst().get(); } - private static TripUpdate cancellation(String tripId) { - return new TripUpdateBuilder(tripId, SERVICE_DATE, CANCELED, ZoneIds.NEW_YORK).build(); - } - @Test public void testGetSnapshot() { var updater = defaultUpdater(); @@ -83,7 +85,7 @@ public void testGetSnapshot() { TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, FULL_DATASET, - List.of(cancellation("1.1")), + List.of(CANCELLATION), feedId ); @@ -95,7 +97,7 @@ public void testGetSnapshot() { TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, FULL_DATASET, - List.of(cancellation("1.1")), + List.of(CANCELLATION), feedId ); assertSame(snapshot, updater.getTimetableSnapshot()); @@ -114,7 +116,7 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() { TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, FULL_DATASET, - List.of(cancellation("1.1")), + List.of(CANCELLATION), feedId ); @@ -442,48 +444,6 @@ public void scheduled() { assertEquals(90, originalTripTimesForToday.getDepartureDelay(2)); } - /** - * This test just asserts that trip with start date that is outside the service period doesn't - * throw an exception and is ignored instead. - */ - @Test - public void invalidTripDate() { - // GIVEN - - String scheduledTripId = "1.1"; - - var serviceDateOutsideService = SERVICE_DATE.minusYears(10); - var builder = new TripUpdateBuilder( - scheduledTripId, - serviceDateOutsideService, - SCHEDULED, - transitModel.getTimeZone() - ) - .addDelayedStopTime(1, 0) - .addDelayedStopTime(2, 60, 80) - .addDelayedStopTime(3, 90, 90); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - var result = updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - FULL_DATASET, - List.of(tripUpdate), - feedId - ); - - // THEN - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - assertNull(snapshot); - assertEquals(1, result.failed()); - var errors = result.failures(); - assertEquals(1, errors.get(NO_SERVICE_ON_DATE).size()); - } - @Test public void scheduledTripWithSkippedAndNoData() { // GIVEN @@ -614,108 +574,6 @@ public void scheduledTripWithSkippedAndNoData() { assertTrue(newTripTimes.isNoDataStop(2)); } } - - @Test - public void scheduledTripWithSkippedAndScheduled() { - // GIVEN - - String scheduledTripId = "1.1"; - - var builder = new TripUpdateBuilder( - scheduledTripId, - SERVICE_DATE, - SCHEDULED, - transitModel.getTimeZone() - ) - .addDelayedStopTime(1, 0) - .addSkippedStop(2) - .addDelayedStopTime(3, 90); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - FULL_DATASET, - List.of(tripUpdate), - feedId - ); - - // THEN - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - - // Original trip pattern - { - final FeedScopedId tripId = new FeedScopedId(feedId, scheduledTripId); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(trip); - - final Timetable originalTimetableForToday = snapshot.resolve( - originalTripPattern, - SERVICE_DATE - ); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); - - assertNotSame(originalTimetableForToday, originalTimetableScheduled); - - final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( - originalTripIndexForToday - ); - assertTrue( - originalTripTimesForToday.isDeleted(), - "Original trip times should be deleted in time table for service date" - ); - // original trip should be canceled - assertEquals(RealTimeState.DELETED, originalTripTimesForToday.getRealTimeState()); - } - - // New trip pattern - { - final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( - new FeedScopedId(feedId, scheduledTripId), - SERVICE_DATE - ); - - final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); - final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); - - assertNotSame(newTimetableForToday, newTimetableScheduled); - - assertTrue(newTripPattern.canBoard(0)); - assertFalse(newTripPattern.canBoard(1)); - assertTrue(newTripPattern.canBoard(2)); - - final int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex( - scheduledTripId - ); - - var newTripTimes = newTimetableForToday.getTripTimes(newTimetableForTodayModifiedTripIndex); - assertEquals(RealTimeState.UPDATED, newTripTimes.getRealTimeState()); - - assertEquals( - -1, - newTimetableScheduled.getTripIndex(scheduledTripId), - "New trip should not be found in scheduled time table" - ); - - assertEquals(0, newTripTimes.getArrivalDelay(0)); - assertEquals(0, newTripTimes.getDepartureDelay(0)); - assertEquals(45, newTripTimes.getArrivalDelay(1)); - assertEquals(45, newTripTimes.getDepartureDelay(1)); - assertEquals(90, newTripTimes.getArrivalDelay(2)); - assertEquals(90, newTripTimes.getDepartureDelay(2)); - assertFalse(newTripTimes.isCancelledStop(0)); - assertTrue(newTripTimes.isCancelledStop(1)); - assertFalse(newTripTimes.isNoDataStop(2)); - } - } } @Nested diff --git a/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java b/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java index 8fe35f09320..2960d92a9cd 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java +++ b/src/test/java/org/opentripplanner/updater/trip/TripUpdateBuilder.java @@ -7,7 +7,6 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; -import java.util.List; import org.opentripplanner.framework.time.ServiceDateUtils; public class TripUpdateBuilder { @@ -175,10 +174,6 @@ public GtfsRealtime.TripUpdate build() { return tripUpdateBuilder.build(); } - public List buildList() { - return List.of(build()); - } - /** * Set route name, agency id, url and type (mode) via a custom extension. */ diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java index 8c1686273a6..623cc957992 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java @@ -37,7 +37,7 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state relationship, env.timeZone ) - .buildList(); + .build(); var result = env.applyTripUpdates(update); assertEquals(1, result.successful()); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java index 5a913f80826..e83805df2bf 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java @@ -36,7 +36,7 @@ public void delayed() { int delay = 1; tripUpdateBuilder.addDelayedStopTime(stopSequence, delay); - var tripUpdate = tripUpdateBuilder.buildList(); + var tripUpdate = tripUpdateBuilder.build(); var result = env.applyTripUpdates(tripUpdate); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/B02_SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/B02_SkippedTest.java new file mode 100644 index 00000000000..81929a7be10 --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/B02_SkippedTest.java @@ -0,0 +1,114 @@ +package org.opentripplanner.updater.trip.moduletests; + +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.model.Timetable; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; +import org.opentripplanner.updater.trip.TripUpdateBuilder; + +public class B02_SkippedTest { + + @Test + public void scheduledTripWithSkippedAndScheduled() { + var env = new GtfsRealtimeTestEnvironment(); + String scheduledTripId = env.trip2.getId().getId(); + + var tripUpdate = new TripUpdateBuilder( + scheduledTripId, + env.serviceDate, + SCHEDULED, + env.timeZone + ) + .addDelayedStopTime(0, 0) + .addSkippedStop(1) + .addDelayedStopTime(2, 90) + .build(); + + var result = env.applyTripUpdates(tripUpdate); + + assertEquals(1, result.successful()); + + // THEN + final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); + + // Original trip pattern + { + final FeedScopedId tripId = env.trip2.getId(); + final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); + final TripPattern originalTripPattern = env.transitModel + .getTransitModelIndex() + .getPatternForTrip() + .get(trip); + + final Timetable originalTimetableForToday = snapshot.resolve( + originalTripPattern, + env.serviceDate + ); + final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + + assertNotSame(originalTimetableForToday, originalTimetableScheduled); + + final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( + originalTripIndexForToday + ); + assertTrue( + originalTripTimesForToday.isDeleted(), + "Original trip times should be deleted in time table for service date" + ); + // original trip should be canceled + assertEquals(RealTimeState.DELETED, originalTripTimesForToday.getRealTimeState()); + } + + // New trip pattern + { + final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( + env.trip2.getId(), + env.serviceDate + ); + + final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, env.serviceDate); + final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); + + assertNotSame(newTimetableForToday, newTimetableScheduled); + + assertTrue(newTripPattern.canBoard(0)); + assertFalse(newTripPattern.canBoard(1)); + assertTrue(newTripPattern.canBoard(2)); + + final int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex( + scheduledTripId + ); + + var newTripTimes = newTimetableForToday.getTripTimes(newTimetableForTodayModifiedTripIndex); + assertEquals(RealTimeState.UPDATED, newTripTimes.getRealTimeState()); + + assertEquals( + -1, + newTimetableScheduled.getTripIndex(scheduledTripId), + "New trip should not be found in scheduled time table" + ); + + assertEquals(0, newTripTimes.getArrivalDelay(0)); + assertEquals(0, newTripTimes.getDepartureDelay(0)); + assertEquals(42, newTripTimes.getArrivalDelay(1)); + assertEquals(47, newTripTimes.getDepartureDelay(1)); + assertEquals(90, newTripTimes.getArrivalDelay(2)); + assertEquals(90, newTripTimes.getDepartureDelay(2)); + assertFalse(newTripTimes.isCancelledStop(0)); + assertTrue(newTripTimes.isCancelledStop(1)); + assertFalse(newTripTimes.isNoDataStop(2)); + } + } +} diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_InvalidInputTest.java new file mode 100644 index 00000000000..4fdbc226500 --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_InvalidInputTest.java @@ -0,0 +1,46 @@ +package org.opentripplanner.updater.trip.moduletests; + +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; +import org.opentripplanner.updater.trip.TripUpdateBuilder; + +public class C01_InvalidInputTest { + + /** + * This test asserts that trip with start date that is outside the service period doesn't + * throw an exception and is ignored instead. + */ + @Test + public void invalidTripDate() { + var env = new GtfsRealtimeTestEnvironment(); + + String scheduledTripId = env.trip1.getId().getId(); + + var serviceDateOutsideService = env.serviceDate.minusYears(10); + var builder = new TripUpdateBuilder( + scheduledTripId, + serviceDateOutsideService, + SCHEDULED, + env.timeZone + ) + .addDelayedStopTime(1, 0) + .addDelayedStopTime(2, 60, 80) + .addDelayedStopTime(3, 90, 90); + + var tripUpdate = builder.build(); + + var result = env.applyTripUpdates(tripUpdate); + + final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); + assertNull(snapshot); + assertEquals(1, result.failed()); + var errors = result.failures(); + assertEquals(1, errors.get(NO_SERVICE_ON_DATE).size()); + } +} From 1252e78d7172cf7307f4ff96170b4d6f5a5ca4fc Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 27 May 2024 10:16:19 +0200 Subject: [PATCH 1193/1688] Move tests into packages --- .../CancellationDeletionTest.java} | 10 ++++++++-- .../DelayedTest.java} | 4 ++-- .../SkippedTest.java} | 4 ++-- .../InvalidInputTest.java} | 16 +++++++--------- 4 files changed, 19 insertions(+), 15 deletions(-) rename src/test/java/org/opentripplanner/updater/trip/moduletests/{A01_CancellationDeletionTest.java => cancellation/CancellationDeletionTest.java} (85%) rename src/test/java/org/opentripplanner/updater/trip/moduletests/{B01_DelayedTest.java => delay/DelayedTest.java} (96%) rename src/test/java/org/opentripplanner/updater/trip/moduletests/{B02_SkippedTest.java => delay/SkippedTest.java} (97%) rename src/test/java/org/opentripplanner/updater/trip/moduletests/{C01_InvalidInputTest.java => rejection/InvalidInputTest.java} (79%) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java similarity index 85% rename from src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java rename to src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index 623cc957992..a793156d424 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/A01_CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -1,7 +1,8 @@ -package org.opentripplanner.updater.trip.moduletests; +package org.opentripplanner.updater.trip.moduletests.cancellation; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship; import java.util.List; @@ -14,7 +15,11 @@ import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; -public class A01_CancellationDeletionTest { +/** + * Cancellations and deletions should end up in the internal data model and make trips unavailable + * for routing. + */ +public class CancellationDeletionTest { static List cases() { return List.of( @@ -51,5 +56,6 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state var tripTimes = forToday.getTripTimes(tripIndex1); assertEquals(state, tripTimes.getRealTimeState()); + assertTrue(tripTimes.isCanceledOrDeleted()); } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java similarity index 96% rename from src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java rename to src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index e83805df2bf..c44b99d5e6d 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/B01_DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.updater.trip.moduletests; +package org.opentripplanner.updater.trip.moduletests.delay; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,7 +12,7 @@ import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; -public class B01_DelayedTest { +public class DelayedTest { @Test public void delayed() { diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/B02_SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java similarity index 97% rename from src/test/java/org/opentripplanner/updater/trip/moduletests/B02_SkippedTest.java rename to src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 81929a7be10..4af2e282a09 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/B02_SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.updater.trip.moduletests; +package org.opentripplanner.updater.trip.moduletests.delay; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,7 +17,7 @@ import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; -public class B02_SkippedTest { +public class SkippedTest { @Test public void scheduledTripWithSkippedAndScheduled() { diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java similarity index 79% rename from src/test/java/org/opentripplanner/updater/trip/moduletests/C01_InvalidInputTest.java rename to src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index 4fdbc226500..bae3afdc446 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/C01_InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.updater.trip.moduletests; +package org.opentripplanner.updater.trip.moduletests.rejection; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -10,21 +10,19 @@ import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; -public class C01_InvalidInputTest { +/** + * A trip with start date that is outside the service period shouldn't throw an exception and is + * ignored instead. + */ +public class InvalidInputTest { - /** - * This test asserts that trip with start date that is outside the service period doesn't - * throw an exception and is ignored instead. - */ @Test public void invalidTripDate() { var env = new GtfsRealtimeTestEnvironment(); - String scheduledTripId = env.trip1.getId().getId(); - var serviceDateOutsideService = env.serviceDate.minusYears(10); var builder = new TripUpdateBuilder( - scheduledTripId, + env.trip1.getId().getId(), serviceDateOutsideService, SCHEDULED, env.timeZone From 6abcd5f0f68092ff8bd15627be734c695891ab7d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 27 May 2024 10:48:12 +0200 Subject: [PATCH 1194/1688] Move environment methods around, add documentation --- .../ext/siri/SiriRealtimeTestEnvironment.java | 40 ++++++++- .../trip/AbstractRealtimeTestEnvironment.java | 31 +------ .../trip/GtfsRealtimeTestEnvironment.java | 6 ++ .../trip/moduletests/delay/DelayedTest.java | 84 ++++++++++++------- .../trip/moduletests/delay/SkippedTest.java | 3 + 5 files changed, 103 insertions(+), 61 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java index 3cb7bd05632..6a2472135fb 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java @@ -1,7 +1,12 @@ package org.opentripplanner.ext.siri; import java.time.Duration; +import java.time.LocalDate; import java.util.List; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.trip.AbstractRealtimeTestEnvironment; @@ -9,12 +14,43 @@ public class SiriRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment { + private static final TimetableSnapshotSourceParameters PARAMETERS = new TimetableSnapshotSourceParameters( + Duration.ZERO, + false + ); private final SiriTimetableSnapshotSource source; public SiriRealtimeTestEnvironment() { super(); - var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); - source = new SiriTimetableSnapshotSource(parameters, transitModel); + source = new SiriTimetableSnapshotSource(PARAMETERS, transitModel); + } + + public EntityResolver getEntityResolver() { + return new EntityResolver(getTransitService(), getFeedId()); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId) { + return getPatternForTrip(tripId, serviceDate); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { + var transitService = getTransitService(); + var trip = transitService.getTripOnServiceDateById(tripId); + return transitService.getPatternForTrip(trip.getTrip(), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(Trip trip) { + return getTripTimesForTrip(trip.getId(), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(String id) { + return getTripTimesForTrip(id(id), serviceDate); } public UpdateResult applyEstimatedTimetable(List updates) { diff --git a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java index 9047f5e15ef..282cfeb9e6b 100644 --- a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java @@ -6,7 +6,6 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.opentripplanner.DateTimeHelper; -import org.opentripplanner.ext.siri.EntityResolver; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; @@ -27,7 +26,7 @@ import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; -public class AbstractRealtimeTestEnvironment { +public abstract class AbstractRealtimeTestEnvironment { protected static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); @@ -95,34 +94,6 @@ public TransitService getTransitService() { return new DefaultTransitService(transitModel); } - public EntityResolver getEntityResolver() { - return new EntityResolver(getTransitService(), getFeedId()); - } - - public TripPattern getPatternForTrip(FeedScopedId tripId) { - return getPatternForTrip(tripId, serviceDate); - } - - public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { - var transitService = getTransitService(); - var trip = transitService.getTripOnServiceDateById(tripId); - return transitService.getPatternForTrip(trip.getTrip(), serviceDate); - } - - /** - * Find the current TripTimes for a trip id on the default serviceDate - */ - public TripTimes getTripTimesForTrip(Trip trip) { - return getTripTimesForTrip(trip.getId(), serviceDate); - } - - /** - * Find the current TripTimes for a trip id on the default serviceDate - */ - public TripTimes getTripTimesForTrip(String id) { - return getTripTimesForTrip(id(id), serviceDate); - } - /** * Find the current TripTimes for a trip id on a serviceDate */ diff --git a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java index 71b2d99fe5d..837abfb98ae 100644 --- a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java @@ -3,6 +3,8 @@ import com.google.transit.realtime.GtfsRealtime; import java.time.Duration; import java.util.List; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.spi.UpdateResult; @@ -29,4 +31,8 @@ public UpdateResult applyTripUpdates(List updates) { getFeedId() ); } + + public TripPattern getPatternForTrip(Trip trip) { + return transitModel.getTransitModelIndex().getPatternForTrip().get(trip); + } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index c44b99d5e6d..5d80ae2eb03 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -3,57 +3,83 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; import org.junit.jupiter.api.Test; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; +/** + * Delays should be applied to the first trip but should leave the second trip untouched. + */ public class DelayedTest { + private static final int DELAY = 1; + private static final int STOP_SEQUENCE = 1; + @Test public void delayed() { var env = new GtfsRealtimeTestEnvironment(); - final TripPattern pattern = env.transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(env.trip1); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip1.getId()); - //final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); - - var tripUpdateBuilder = new TripUpdateBuilder( + var tripUpdate = new TripUpdateBuilder( env.trip1.getId().getId(), env.serviceDate, SCHEDULED, env.timeZone - ); - - int stopSequence = 1; - int delay = 1; - tripUpdateBuilder.addDelayedStopTime(stopSequence, delay); - - var tripUpdate = tripUpdateBuilder.build(); + ) + .addDelayedStopTime(STOP_SEQUENCE, DELAY) + .build(); var result = env.applyTripUpdates(tripUpdate); assertEquals(1, result.successful()); - final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern, env.serviceDate); - final Timetable schedule = snapshot.resolve(pattern, null); - assertNotSame(forToday, schedule); - assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); - //assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); - assertEquals(1, forToday.getTripTimes(tripIndex).getArrivalDelay(1)); - assertEquals(1, forToday.getTripTimes(tripIndex).getDepartureDelay(1)); - - assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex).getRealTimeState()); - assertEquals(RealTimeState.UPDATED, forToday.getTripTimes(tripIndex).getRealTimeState()); - //assertEquals(RealTimeState.SCHEDULED, schedule.getTripTimes(tripIndex2).getRealTimeState()); - //assertEquals(RealTimeState.SCHEDULED, forToday.getTripTimes(tripIndex2).getRealTimeState()); + // trip1 should be modified + { + var pattern1 = env.getPatternForTrip(env.trip1); + final int trip1Index = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); + + final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); + final Timetable trip1Realtime = snapshot.resolve(pattern1, env.serviceDate); + final Timetable trip1Scheduled = snapshot.resolve(pattern1, null); + + assertNotSame(trip1Realtime, trip1Scheduled); + assertNotSame( + trip1Realtime.getTripTimes(trip1Index), + trip1Scheduled.getTripTimes(trip1Index) + ); + assertEquals(1, trip1Realtime.getTripTimes(trip1Index).getArrivalDelay(STOP_SEQUENCE)); + assertEquals(1, trip1Realtime.getTripTimes(trip1Index).getDepartureDelay(STOP_SEQUENCE)); + + assertEquals( + RealTimeState.SCHEDULED, + trip1Scheduled.getTripTimes(trip1Index).getRealTimeState() + ); + assertEquals( + RealTimeState.UPDATED, + trip1Realtime.getTripTimes(trip1Index).getRealTimeState() + ); + } + + // trip2 should keep the scheduled information + { + var pattern = env.getPatternForTrip(env.trip2); + final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); + + final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); + final Timetable realtime = snapshot.resolve(pattern, env.serviceDate); + final Timetable scheduled = snapshot.resolve(pattern, null); + + assertSame(realtime, scheduled); + assertSame(realtime.getTripTimes(tripIndex), scheduled.getTripTimes(tripIndex)); + assertEquals(0, realtime.getTripTimes(tripIndex).getArrivalDelay(STOP_SEQUENCE)); + assertEquals(0, realtime.getTripTimes(tripIndex).getDepartureDelay(STOP_SEQUENCE)); + + assertEquals(RealTimeState.SCHEDULED, scheduled.getTripTimes(tripIndex).getRealTimeState()); + assertEquals(RealTimeState.SCHEDULED, realtime.getTripTimes(tripIndex).getRealTimeState()); + } } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 4af2e282a09..9d8a06cdc06 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -17,6 +17,9 @@ import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; +/** + * A mixture of delayed and skipped stops should result in both delayed and cancelled stops. + */ public class SkippedTest { @Test From 367ac906b3467813df1a190f29b68514da0ecc24 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 27 May 2024 12:42:40 +0200 Subject: [PATCH 1195/1688] Add test case for date in the future --- .../ext/siri/SiriRealtimeTestEnvironment.java | 6 ++-- .../trip/AbstractRealtimeTestEnvironment.java | 8 ++--- .../CancellationDeletionTest.java | 4 +-- .../trip/moduletests/delay/DelayedTest.java | 6 ++-- .../trip/moduletests/delay/SkippedTest.java | 9 +++-- .../rejection/InvalidInputTest.java | 35 ++++++++++--------- 6 files changed, 35 insertions(+), 33 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java index 6a2472135fb..aba02333759 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java @@ -30,7 +30,7 @@ public EntityResolver getEntityResolver() { } public TripPattern getPatternForTrip(FeedScopedId tripId) { - return getPatternForTrip(tripId, serviceDate); + return getPatternForTrip(tripId, SERVICE_DATE); } public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { @@ -43,14 +43,14 @@ public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) * Find the current TripTimes for a trip id on the default serviceDate */ public TripTimes getTripTimesForTrip(Trip trip) { - return getTripTimesForTrip(trip.getId(), serviceDate); + return getTripTimesForTrip(trip.getId(), SERVICE_DATE); } /** * Find the current TripTimes for a trip id on the default serviceDate */ public TripTimes getTripTimesForTrip(String id) { - return getTripTimesForTrip(id(id), serviceDate); + return getTripTimesForTrip(id(id), SERVICE_DATE); } public UpdateResult applyEstimatedTimetable(List updates) { diff --git a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java index 282cfeb9e6b..49b6f0c5b7a 100644 --- a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java @@ -28,6 +28,7 @@ public abstract class AbstractRealtimeTestEnvironment { + public static final LocalDate SERVICE_DATE = LocalDate.of(2024, 5, 8); protected static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); @@ -48,12 +49,11 @@ public abstract class AbstractRealtimeTestEnvironment { .withRegularStop(stopC1) .withRegularStop(stopD1) .build(); - public final LocalDate serviceDate = LocalDate.of(2024, 5, 8); public final FeedScopedId operator1Id = TransitModelForTest.id("TestOperator1"); public final FeedScopedId route1Id = TransitModelForTest.id("TestRoute1"); public final Trip trip1; public final Trip trip2; - public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, serviceDate); + public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, SERVICE_DATE); public final TransitModel transitModel; public AbstractRealtimeTestEnvironment() { @@ -75,7 +75,7 @@ public AbstractRealtimeTestEnvironment() { CalendarServiceData calendarServiceData = new CalendarServiceData(); calendarServiceData.putServiceDatesForServiceId( CAL_ID, - List.of(serviceDate.minusDays(1), serviceDate, serviceDate.plusDays(1)) + List.of(SERVICE_DATE.minusDays(1), SERVICE_DATE, SERVICE_DATE.plusDays(1)) ); transitModel.getServiceCodes().put(CAL_ID, 0); transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); @@ -119,7 +119,7 @@ protected Trip createTrip(String id, Route route, List stops) { var tripOnServiceDate = TripOnServiceDate .of(trip.getId()) .withTrip(trip) - .withServiceDate(serviceDate) + .withServiceDate(SERVICE_DATE) .build(); transitModel.addTripOnServiceDate(tripOnServiceDate.getId(), tripOnServiceDate); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index a793156d424..d5ceba912c4 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -38,7 +38,7 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state var update = new TripUpdateBuilder( env.trip1.getId().getId(), - env.serviceDate, + env.SERVICE_DATE, relationship, env.timeZone ) @@ -48,7 +48,7 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state assertEquals(1, result.successful()); final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern1, env.serviceDate); + final Timetable forToday = snapshot.resolve(pattern1, env.SERVICE_DATE); final Timetable schedule = snapshot.resolve(pattern1, null); assertNotSame(forToday, schedule); assertNotSame(forToday.getTripTimes(tripIndex1), schedule.getTripTimes(tripIndex1)); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index 5d80ae2eb03..389c43d5325 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -26,7 +26,7 @@ public void delayed() { var tripUpdate = new TripUpdateBuilder( env.trip1.getId().getId(), - env.serviceDate, + env.SERVICE_DATE, SCHEDULED, env.timeZone ) @@ -43,7 +43,7 @@ public void delayed() { final int trip1Index = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable trip1Realtime = snapshot.resolve(pattern1, env.serviceDate); + final Timetable trip1Realtime = snapshot.resolve(pattern1, env.SERVICE_DATE); final Timetable trip1Scheduled = snapshot.resolve(pattern1, null); assertNotSame(trip1Realtime, trip1Scheduled); @@ -70,7 +70,7 @@ public void delayed() { final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable realtime = snapshot.resolve(pattern, env.serviceDate); + final Timetable realtime = snapshot.resolve(pattern, env.SERVICE_DATE); final Timetable scheduled = snapshot.resolve(pattern, null); assertSame(realtime, scheduled); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 9d8a06cdc06..4c872fd1b8d 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -29,7 +29,7 @@ public void scheduledTripWithSkippedAndScheduled() { var tripUpdate = new TripUpdateBuilder( scheduledTripId, - env.serviceDate, + env.SERVICE_DATE, SCHEDULED, env.timeZone ) @@ -42,7 +42,6 @@ public void scheduledTripWithSkippedAndScheduled() { assertEquals(1, result.successful()); - // THEN final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); // Original trip pattern @@ -56,7 +55,7 @@ public void scheduledTripWithSkippedAndScheduled() { final Timetable originalTimetableForToday = snapshot.resolve( originalTripPattern, - env.serviceDate + env.SERVICE_DATE ); final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); @@ -78,10 +77,10 @@ public void scheduledTripWithSkippedAndScheduled() { { final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( env.trip2.getId(), - env.serviceDate + env.SERVICE_DATE ); - final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, env.serviceDate); + final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, env.SERVICE_DATE); final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); assertNotSame(newTimetableForToday, newTimetableScheduled); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index bae3afdc446..d6297456e0c 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -4,8 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; +import static org.opentripplanner.updater.trip.AbstractRealtimeTestEnvironment.SERVICE_DATE; -import org.junit.jupiter.api.Test; +import java.time.LocalDate; +import java.util.List; +import java.util.Set; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; @@ -16,29 +21,27 @@ */ public class InvalidInputTest { - @Test - public void invalidTripDate() { + public static List cases() { + return List.of(SERVICE_DATE.minusYears(10), SERVICE_DATE.plusYears(10)); + } + + @ParameterizedTest + @MethodSource("cases") + public void invalidTripDate(LocalDate date) { var env = new GtfsRealtimeTestEnvironment(); - var serviceDateOutsideService = env.serviceDate.minusYears(10); - var builder = new TripUpdateBuilder( - env.trip1.getId().getId(), - serviceDateOutsideService, - SCHEDULED, - env.timeZone - ) + var update = new TripUpdateBuilder(env.trip1.getId().getId(), date, SCHEDULED, env.timeZone) .addDelayedStopTime(1, 0) .addDelayedStopTime(2, 60, 80) - .addDelayedStopTime(3, 90, 90); - - var tripUpdate = builder.build(); + .addDelayedStopTime(3, 90, 90) + .build(); - var result = env.applyTripUpdates(tripUpdate); + var result = env.applyTripUpdates(update); final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); assertNull(snapshot); assertEquals(1, result.failed()); - var errors = result.failures(); - assertEquals(1, errors.get(NO_SERVICE_ON_DATE).size()); + var errors = result.failures().keySet(); + assertEquals(Set.of(NO_SERVICE_ON_DATE), errors); } } From db9d8748996959aef4bb91062f09aef9f8e20319 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Mon, 27 May 2024 13:32:42 +0300 Subject: [PATCH 1196/1688] Add FeedPublisher type mapping --- .../org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java | 2 +- .../apis/gtfs/generated/GraphQLDataFetchers.java | 3 ++- .../opentripplanner/apis/gtfs/generated/graphql-codegen.yml | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java index 9c5b17a62e2..d6488d3f375 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/FeedImpl.java @@ -66,7 +66,7 @@ public DataFetcher feedId() { } @Override - public DataFetcher publisher() { + public DataFetcher publisher() { return environment -> { String id = getSource(environment); return new FeedPublisher( diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 455503ad8ef..fbfc4965c62 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -20,6 +20,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRelativeDirection; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLRoutingErrorCode; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode; +import org.opentripplanner.apis.gtfs.model.FeedPublisher; import org.opentripplanner.apis.gtfs.model.RideHailingProvider; import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.apis.gtfs.model.TripOccupancy; @@ -381,7 +382,7 @@ public interface GraphQLFeed { public DataFetcher feedId(); - public DataFetcher publisher(); + public DataFetcher publisher(); } /** Feed publisher information */ diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 55f76863cc6..29c2bff0257 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -56,6 +56,7 @@ config: elevationProfileComponent: org.opentripplanner.model.plan.ElevationProfile.Step Emissions: org.opentripplanner.model.plan.Emissions#Emissions Feed: String + FeedPublisher: org.opentripplanner.apis.gtfs.model.FeedPublisher#FeedPublisher Geometry: org.locationtech.jts.geom.Geometry#Geometry InputField: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField#GraphQLInputField Itinerary: org.opentripplanner.model.plan.Itinerary#Itinerary From d278c82faaf65a5d5565b4fa686f6c0fa8faa183 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 16 May 2024 14:10:48 +0200 Subject: [PATCH 1197/1688] Extract initial abstract class --- .../siri/AbstractTimetableSnapshotSource.java | 84 +++++++++++++++++++ .../ext/siri/SiriTimetableSnapshotSource.java | 67 +-------------- .../updater/trip/TimetableSnapshotSource.java | 6 +- 3 files changed, 90 insertions(+), 67 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java new file mode 100644 index 00000000000..b62c1baa593 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java @@ -0,0 +1,84 @@ +package org.opentripplanner.ext.siri; + +import java.util.concurrent.locks.ReentrantLock; +import org.opentripplanner.framework.time.CountdownTimer; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.model.TimetableSnapshotProvider; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvider { + private static final Logger LOG = LoggerFactory.getLogger(AbstractTimetableSnapshotSource.class); + private final TransitLayerUpdater transitLayerUpdater; + /** + * Lock to indicate that buffer is in use + */ + protected final ReentrantLock bufferLock = new ReentrantLock(true); + + /** + * The working copy of the timetable snapshot. Should not be visible to routing threads. Should + * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that + * might modify this buffer will correctly acquire the lock. + */ + protected final TimetableSnapshot buffer = new TimetableSnapshot(); + + public AbstractTimetableSnapshotSource(TransitLayerUpdater transitLayerUpdater) { + this.transitLayerUpdater = transitLayerUpdater; + } + + /** + * The last committed snapshot that was handed off to a routing thread. This snapshot may be given + * to more than one routing thread if the maximum snapshot frequency is exceeded. + */ + protected volatile TimetableSnapshot snapshot = null; + + /** + * If a timetable snapshot is requested less than this number of milliseconds after the previous + * snapshot, just return the same one. Throttles the potentially resource-consuming task of + * duplicating a TripPattern -> Timetable map and indexing the new Timetables. + */ + protected CountdownTimer snapshotFrequencyThrottle; + + + /** + * @return an up-to-date snapshot mapping TripPatterns to Timetables. This snapshot and the + * timetable objects it references are guaranteed to never change, so the requesting thread is + * provided a consistent view of all TripTimes. The routing thread need only release its reference + * to the snapshot to release resources. + */ + public TimetableSnapshot getTimetableSnapshot() { + + // Try to get a lock on the buffer + if (bufferLock.tryLock()) { + // Make a new snapshot if necessary + try { + commitTimetableSnapshot(false); + return snapshot; + } finally { + bufferLock.unlock(); + } + } + // No lock could be obtained because there is either a snapshot commit busy or updates + // are applied at this moment, just return the current snapshot + return snapshot; + } + + protected void commitTimetableSnapshot(final boolean force) { + if (force || snapshotFrequencyThrottle.timeIsUp()) { + if (force || buffer.isDirty()) { + LOG.debug("Committing {}", buffer); + snapshot = buffer.commit(transitLayerUpdater, force); + + // We only reset the timer when the snapshot is updated. This will cause the first + // update to be committed after a silent period. This should not have any effect in + // a busy updater. It is however useful when manually testing the updater. + snapshotFrequencyThrottle.restart(); + } else { + LOG.debug("Buffer was unchanged, keeping old snapshot."); + } + } else { + LOG.debug("Snapshot frequency exceeded. Reusing snapshot {}", snapshot); + } + } +} diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 080a1535284..f4449a4605e 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -11,13 +11,10 @@ import java.time.LocalDate; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.locks.ReentrantLock; import javax.annotation.Nullable; import org.opentripplanner.framework.time.CountdownTimer; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.model.TimetableSnapshotProvider; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Result; import org.opentripplanner.transit.model.network.TripPattern; @@ -42,20 +39,10 @@ * necessary to provide planning threads a consistent constant view of a graph with real-time data at * a specific point in time. */ -public class SiriTimetableSnapshotSource implements TimetableSnapshotProvider { +public class SiriTimetableSnapshotSource extends AbstractTimetableSnapshotSource { private static final Logger LOG = LoggerFactory.getLogger(SiriTimetableSnapshotSource.class); - /** - * The working copy of the timetable snapshot. Should not be visible to routing threads. Should - * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that - * might modify this buffer will correctly acquire the lock. - */ - private final TimetableSnapshot buffer = new TimetableSnapshot(); - /** - * Lock to indicate that buffer is in use - */ - private final ReentrantLock bufferLock = new ReentrantLock(true); /** * Use a id generator to generate TripPattern ids for new TripPatterns created by RealTime * updates. @@ -69,20 +56,8 @@ public class SiriTimetableSnapshotSource implements TimetableSnapshotProvider { private final TransitModel transitModel; private final TransitService transitService; - private final TransitLayerUpdater transitLayerUpdater; - /** - * If a timetable snapshot is requested less than this number of milliseconds after the previous - * snapshot, just return the same one. Throttles the potentially resource-consuming task of - * duplicating a TripPattern -> Timetable map and indexing the new Timetables. - */ - protected CountdownTimer snapshotFrequencyThrottle; - /** - * The last committed snapshot that was handed off to a routing thread. This snapshot may be given - * to more than one routing thread if the maximum snapshot frequency is exceeded. - */ - private volatile TimetableSnapshot snapshot = null; /** Should expired real-time data be purged from the graph. */ private final boolean purgeExpiredData; @@ -93,9 +68,9 @@ public SiriTimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel ) { + super(transitModel.getTransitLayerUpdater()); this.transitModel = transitModel; this.transitService = new DefaultTransitService(transitModel); - this.transitLayerUpdater = transitModel.getTransitLayerUpdater(); this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); this.purgeExpiredData = parameters.purgeExpiredData(); this.tripPatternCache = @@ -107,29 +82,7 @@ public SiriTimetableSnapshotSource( commitTimetableSnapshot(true); } - /** - * @return an up-to-date snapshot mapping TripPatterns to Timetables. This snapshot and the - * timetable objects it references are guaranteed to never change, so the requesting thread is - * provided a consistent view of all TripTimes. The routing thread need only release its reference - * to the snapshot to release resources. - */ - public TimetableSnapshot getTimetableSnapshot() { - TimetableSnapshot snapshotToReturn; - // Try to get a lock on the buffer - if (bufferLock.tryLock()) { - // Make a new snapshot if necessary - try { - commitTimetableSnapshot(false); - return snapshot; - } finally { - bufferLock.unlock(); - } - } - // No lock could be obtained because there is either a snapshot commit busy or updates - // are applied at this moment, just return the current snapshot - return snapshot; - } /** * Method to apply a trip update list to the most recent version of the timetable snapshot. @@ -249,23 +202,7 @@ private boolean shouldAddNewTrip( return entityResolver.resolveTrip(vehicleJourney) == null; } - private void commitTimetableSnapshot(final boolean force) { - if (force || snapshotFrequencyThrottle.timeIsUp()) { - if (force || buffer.isDirty()) { - LOG.debug("Committing {}", buffer); - snapshot = buffer.commit(transitLayerUpdater, force); - // We only reset the timer when the snapshot is updated. This will cause the first - // update to be committed after a silent period. This should not have any effect in - // a busy updater. It is however useful when manually testing the updater. - snapshotFrequencyThrottle.restart(); - } else { - LOG.debug("Buffer was unchanged, keeping old snapshot."); - } - } else { - LOG.debug("Snapshot frequency exceeded. Reusing snapshot {}", snapshot); - } - } /** * Get the latest timetable for TripPattern for a given service date. diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 9cc0cab52a9..803681866b0 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -33,6 +33,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; import javax.annotation.Nonnull; +import org.opentripplanner.ext.siri.AbstractTimetableSnapshotSource; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.lang.StringUtils; @@ -41,7 +42,6 @@ import org.opentripplanner.model.StopTime; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.model.TimetableSnapshotProvider; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.DataValidationException; @@ -76,7 +76,7 @@ * necessary to provide planning threads a consistent constant view of a graph with realtime data at * a specific point in time. */ -public class TimetableSnapshotSource implements TimetableSnapshotProvider { +public class TimetableSnapshotSource extends AbstractTimetableSnapshotSource { private static final Logger LOG = LoggerFactory.getLogger(TimetableSnapshotSource.class); @@ -158,6 +158,7 @@ public TimetableSnapshotSource( TransitModel transitModel, Supplier localDateNow ) { + super(transitModel.getTransitLayerUpdater()); this.timeZone = transitModel.getTimeZone(); this.transitService = new DefaultTransitService(transitModel); this.transitLayerUpdater = transitModel.getTransitLayerUpdater(); @@ -177,6 +178,7 @@ public TimetableSnapshotSource( * provided a consistent view of all TripTimes. The routing thread need only release its reference * to the snapshot to release resources. */ + @Override public TimetableSnapshot getTimetableSnapshot() { TimetableSnapshot snapshotToReturn; From dc044ac278f850a1768bb23a9827f616d12008d9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 16 May 2024 16:23:55 +0200 Subject: [PATCH 1198/1688] Move buffer and lock handling from GTFS-RT --- .../siri/AbstractTimetableSnapshotSource.java | 8 +++- .../ext/siri/SiriTimetableSnapshotSource.java | 6 +-- .../model/TimetableSnapshot.java | 4 ++ .../updater/trip/TimetableSnapshotSource.java | 46 ++----------------- .../trip/TimetableSnapshotSourceTest.java | 18 ++++---- 5 files changed, 26 insertions(+), 56 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java index b62c1baa593..a4fb4f0ce48 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java @@ -5,6 +5,7 @@ import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.model.TimetableSnapshotProvider; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater; +import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -23,8 +24,11 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide */ protected final TimetableSnapshot buffer = new TimetableSnapshot(); - public AbstractTimetableSnapshotSource(TransitLayerUpdater transitLayerUpdater) { + public AbstractTimetableSnapshotSource(TransitLayerUpdater transitLayerUpdater, TimetableSnapshotSourceParameters parameters) { this.transitLayerUpdater = transitLayerUpdater; + this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); + // Force commit so that snapshot initializes + commitTimetableSnapshot(true); } /** @@ -64,7 +68,7 @@ public TimetableSnapshot getTimetableSnapshot() { return snapshot; } - protected void commitTimetableSnapshot(final boolean force) { + public void commitTimetableSnapshot(final boolean force) { if (force || snapshotFrequencyThrottle.timeIsUp()) { if (force || buffer.isDirty()) { LOG.debug("Committing {}", buffer); diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index f4449a4605e..d3ebf1e2d65 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -12,7 +12,6 @@ import java.util.ArrayList; import java.util.List; import javax.annotation.Nullable; -import org.opentripplanner.framework.time.CountdownTimer; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.framework.DataValidationException; @@ -68,18 +67,15 @@ public SiriTimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel ) { - super(transitModel.getTransitLayerUpdater()); + super(transitModel.getTransitLayerUpdater(), parameters); this.transitModel = transitModel; this.transitService = new DefaultTransitService(transitModel); - this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); this.purgeExpiredData = parameters.purgeExpiredData(); this.tripPatternCache = new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip); transitModel.initTimetableSnapshotProvider(this); - // Force commit so that snapshot initializes - commitTimetableSnapshot(true); } diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index 136d70fd7d9..5edcacb1ffb 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -397,6 +397,10 @@ public void setPatternsForStop(SetMultimap patternsFo this.patternsForStop = patternsForStop; } + public boolean isEmpty() { + return timetables.isEmpty() && realtimeAddedTripPattern.isEmpty(); + } + /** * Clear timetable for all patterns matching the provided feed id. * diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 803681866b0..283e75545ce 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -21,7 +21,6 @@ import com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate; import de.mfdz.MfdzRealtimeExtensions; import java.text.ParseException; -import java.time.Duration; import java.time.LocalDate; import java.time.ZoneId; import java.util.ArrayList; @@ -42,7 +41,6 @@ import org.opentripplanner.model.StopTime; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; @@ -106,20 +104,6 @@ public class TimetableSnapshotSource extends AbstractTimetableSnapshotSource { private final ZoneId timeZone; private final TransitEditorService transitService; - private final TransitLayerUpdater transitLayerUpdater; - - /** - * If a timetable snapshot is requested less than this number of milliseconds after the previous - * snapshot, just return the same one. Throttles the potentially resource-consuming task of - * duplicating a TripPattern → Timetable map and indexing the new Timetables. - */ - private final Duration maxSnapshotFrequency; - - /** - * The last committed snapshot that was handed off to a routing thread. This snapshot may be given - * to more than one routing thread if the maximum snapshot frequency is exceeded. - */ - private volatile TimetableSnapshot snapshot = null; /** * Should expired real-time data be purged from the graph. @@ -129,9 +113,6 @@ public class TimetableSnapshotSource extends AbstractTimetableSnapshotSource { protected LocalDate lastPurgeDate = null; - /** Epoch time in milliseconds at which the last snapshot was generated. */ - protected long lastSnapshotTime = -1; - private final Deduplicator deduplicator; private final Map serviceCodes; @@ -158,13 +139,11 @@ public TimetableSnapshotSource( TransitModel transitModel, Supplier localDateNow ) { - super(transitModel.getTransitLayerUpdater()); + super(transitModel.getTransitLayerUpdater(), parameters); this.timeZone = transitModel.getTimeZone(); this.transitService = new DefaultTransitService(transitModel); - this.transitLayerUpdater = transitModel.getTransitLayerUpdater(); this.deduplicator = transitModel.getDeduplicator(); this.serviceCodes = transitModel.getServiceCodes(); - this.maxSnapshotFrequency = parameters.maxSnapshotFrequency(); this.purgeExpiredData = parameters.purgeExpiredData(); this.localDateNow = localDateNow; @@ -186,7 +165,8 @@ public TimetableSnapshot getTimetableSnapshot() { if (bufferLock.tryLock()) { // Make a new snapshot if necessary try { - snapshotToReturn = getTimetableSnapshot(false); + commitTimetableSnapshot(false); + snapshotToReturn = snapshot; } finally { bufferLock.unlock(); } @@ -335,9 +315,9 @@ public UpdateResult applyTripUpdates( // Make sure that the public (locking) getTimetableSnapshot function is not called. if (purgeExpiredData) { final boolean modified = purgeExpiredData(); - getTimetableSnapshot(modified); + commitTimetableSnapshot(modified); } else { - getTimetableSnapshot(false); + commitTimetableSnapshot(false); } } finally { // Always release lock @@ -372,22 +352,6 @@ private static void logUpdateResult( }); } - private TimetableSnapshot getTimetableSnapshot(final boolean force) { - final long now = System.currentTimeMillis(); - if (force || now - lastSnapshotTime > maxSnapshotFrequency.toMillis()) { - if (force || buffer.isDirty()) { - LOG.debug("Committing {}", buffer); - snapshot = buffer.commit(transitLayerUpdater, force); - } else { - LOG.debug("Buffer was unchanged, keeping old snapshot."); - } - lastSnapshotTime = System.currentTimeMillis(); - } else { - LOG.debug("Snapshot frequency exceeded. Reusing snapshot {}", snapshot); - } - return snapshot; - } - /** * Determine how the trip update should be handled. * diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 8c28290de66..a634177abcd 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -7,7 +7,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; @@ -105,7 +104,7 @@ public void testGetSnapshot() throws InvalidProtocolBufferException { List.of(TripUpdate.parseFrom(cancellation)), feedId ); - assertSame(snapshot, updater.getTimetableSnapshot()); + assertNotSame(snapshot, updater.getTimetableSnapshot()); } @Test @@ -154,10 +153,11 @@ public void testHandleCanceledTrip() throws InvalidProtocolBufferException { feedId ); + updater.commitTimetableSnapshot(true); + final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); final Timetable forToday = snapshot.resolve(pattern, SERVICE_DATE); final Timetable schedule = snapshot.resolve(pattern, null); - assertNotSame(forToday, schedule); assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); @@ -231,7 +231,7 @@ public void invalidTripId() { tripUpdateBuilder.setTrip(tripDescriptorBuilder); var tripUpdate = tripUpdateBuilder.build(); - updater.applyTripUpdates( + var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, fullDataset, @@ -239,8 +239,7 @@ public void invalidTripId() { feedId ); - var snapshot = updater.getTimetableSnapshot(); - assertNull(snapshot); + assertEquals(0, result.successful()); }); } @@ -362,6 +361,8 @@ public void testHandleModifiedTrip() { feedId ); + updater.commitTimetableSnapshot(true); + // THEN final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); @@ -611,7 +612,8 @@ public void invalidTripDate() { // THEN final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - assertNull(snapshot); + assertTrue(snapshot.isEmpty()); + assertFalse(snapshot.isDirty()); assertEquals(1, result.failed()); var errors = result.failures(); assertEquals(1, errors.get(NO_SERVICE_ON_DATE).size()); @@ -1065,7 +1067,7 @@ public void repeatedlyAddedTripWithNewRoute() { @Nonnull private TimetableSnapshotSource defaultUpdater() { return new TimetableSnapshotSource( - TimetableSnapshotSourceParameters.DEFAULT, + new TimetableSnapshotSourceParameters(Duration.ofMillis(-1), true), transitModel, () -> SERVICE_DATE ); From 4774759258552b1fa596aa204eb394e38d036712 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 16 May 2024 16:32:58 +0200 Subject: [PATCH 1199/1688] Move more methods into base class --- .../siri/AbstractTimetableSnapshotSource.java | 8 +++-- .../ext/siri/SiriTimetableSnapshotSource.java | 7 ----- .../updater/trip/TimetableSnapshotSource.java | 30 ------------------- .../java/org/opentripplanner/GtfsTest.java | 5 +++- 4 files changed, 9 insertions(+), 41 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java index a4fb4f0ce48..275609251c3 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java @@ -10,6 +10,7 @@ import org.slf4j.LoggerFactory; public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvider { + private static final Logger LOG = LoggerFactory.getLogger(AbstractTimetableSnapshotSource.class); private final TransitLayerUpdater transitLayerUpdater; /** @@ -24,7 +25,10 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide */ protected final TimetableSnapshot buffer = new TimetableSnapshot(); - public AbstractTimetableSnapshotSource(TransitLayerUpdater transitLayerUpdater, TimetableSnapshotSourceParameters parameters) { + public AbstractTimetableSnapshotSource( + TransitLayerUpdater transitLayerUpdater, + TimetableSnapshotSourceParameters parameters + ) { this.transitLayerUpdater = transitLayerUpdater; this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); // Force commit so that snapshot initializes @@ -44,7 +48,6 @@ public AbstractTimetableSnapshotSource(TransitLayerUpdater transitLayerUpdater, */ protected CountdownTimer snapshotFrequencyThrottle; - /** * @return an up-to-date snapshot mapping TripPatterns to Timetables. This snapshot and the * timetable objects it references are guaranteed to never change, so the requesting thread is @@ -52,7 +55,6 @@ public AbstractTimetableSnapshotSource(TransitLayerUpdater transitLayerUpdater, * to the snapshot to release resources. */ public TimetableSnapshot getTimetableSnapshot() { - // Try to get a lock on the buffer if (bufferLock.tryLock()) { // Make a new snapshot if necessary diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index d3ebf1e2d65..133303e18eb 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -56,8 +56,6 @@ public class SiriTimetableSnapshotSource extends AbstractTimetableSnapshotSource private final TransitService transitService; - - /** Should expired real-time data be purged from the graph. */ private final boolean purgeExpiredData; @@ -75,11 +73,8 @@ public SiriTimetableSnapshotSource( new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip); transitModel.initTimetableSnapshotProvider(this); - } - - /** * Method to apply a trip update list to the most recent version of the timetable snapshot. * FIXME RT_AB: TripUpdate is the GTFS term, and these SIRI ETs are never converted into that @@ -198,8 +193,6 @@ private boolean shouldAddNewTrip( return entityResolver.resolveTrip(vehicleJourney) == null; } - - /** * Get the latest timetable for TripPattern for a given service date. *

              diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 283e75545ce..aea1bffec2c 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -29,7 +29,6 @@ import java.util.Map; import java.util.Objects; import java.util.Set; -import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; import javax.annotation.Nonnull; import org.opentripplanner.ext.siri.AbstractTimetableSnapshotSource; @@ -40,7 +39,6 @@ import org.opentripplanner.gtfs.mapping.TransitModeMapper; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.Timetable; -import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; @@ -151,34 +149,6 @@ public TimetableSnapshotSource( transitModel.initTimetableSnapshotProvider(this); } - /** - * @return an up-to-date snapshot mapping TripPatterns to Timetables. This snapshot and the - * timetable objects it references are guaranteed to never change, so the requesting thread is - * provided a consistent view of all TripTimes. The routing thread need only release its reference - * to the snapshot to release resources. - */ - @Override - public TimetableSnapshot getTimetableSnapshot() { - TimetableSnapshot snapshotToReturn; - - // Try to get a lock on the buffer - if (bufferLock.tryLock()) { - // Make a new snapshot if necessary - try { - commitTimetableSnapshot(false); - snapshotToReturn = snapshot; - } finally { - bufferLock.unlock(); - } - } else { - // No lock could be obtained because there is either a snapshot commit busy or updates - // are applied at this moment, just return the current snapshot - snapshotToReturn = snapshot; - } - - return snapshotToReturn; - } - /** * Method to apply a trip update list to the most recent version of the timetable snapshot. A * GTFS-RT feed is always applied against a single static feed (indicated by feedId). diff --git a/src/test/java/org/opentripplanner/GtfsTest.java b/src/test/java/org/opentripplanner/GtfsTest.java index 99f78c18e33..6f14a6db662 100644 --- a/src/test/java/org/opentripplanner/GtfsTest.java +++ b/src/test/java/org/opentripplanner/GtfsTest.java @@ -13,6 +13,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.InputStream; +import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.Collections; @@ -207,7 +208,9 @@ protected void setUp() throws Exception { serverContext = TestServerContext.createServerContext(graph, transitModel); timetableSnapshotSource = new TimetableSnapshotSource( - TimetableSnapshotSourceParameters.DEFAULT.withPurgeExpiredData(false), + TimetableSnapshotSourceParameters.DEFAULT + .withPurgeExpiredData(true) + .withMaxSnapshotFrequency(Duration.ZERO), transitModel ); alertPatchServiceImpl = new TransitAlertServiceImpl(transitModel); From 8d2e26801e15f1ca2f844eb24e987cdec0d10613 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 16 May 2024 16:50:57 +0200 Subject: [PATCH 1200/1688] Move purging of old data into base class --- .../siri/AbstractTimetableSnapshotSource.java | 37 ++++++++++++++++++- .../ext/siri/SiriTimetableSnapshotSource.java | 19 +--------- .../updater/trip/TimetableSnapshotSource.java | 30 +-------------- .../trip/TimetableSnapshotSourceTest.java | 5 +-- 4 files changed, 40 insertions(+), 51 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java index 275609251c3..35bccbba9ee 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java @@ -1,6 +1,8 @@ package org.opentripplanner.ext.siri; +import java.time.LocalDate; import java.util.concurrent.locks.ReentrantLock; +import java.util.function.Supplier; import org.opentripplanner.framework.time.CountdownTimer; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.model.TimetableSnapshotProvider; @@ -27,10 +29,12 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide public AbstractTimetableSnapshotSource( TransitLayerUpdater transitLayerUpdater, - TimetableSnapshotSourceParameters parameters + TimetableSnapshotSourceParameters parameters, + Supplier localDateNow ) { this.transitLayerUpdater = transitLayerUpdater; this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); + this.localDateNow = localDateNow; // Force commit so that snapshot initializes commitTimetableSnapshot(true); } @@ -46,7 +50,15 @@ public AbstractTimetableSnapshotSource( * snapshot, just return the same one. Throttles the potentially resource-consuming task of * duplicating a TripPattern -> Timetable map and indexing the new Timetables. */ - protected CountdownTimer snapshotFrequencyThrottle; + private final CountdownTimer snapshotFrequencyThrottle; + + /** + * We inject a provider to retrieve the current service-date(now). This enables us to unit-test + * the purgeExpiredData feature. + */ + private final Supplier localDateNow; + + private LocalDate lastPurgeDate = null; /** * @return an up-to-date snapshot mapping TripPatterns to Timetables. This snapshot and the @@ -87,4 +99,25 @@ public void commitTimetableSnapshot(final boolean force) { LOG.debug("Snapshot frequency exceeded. Reusing snapshot {}", snapshot); } } + + protected boolean purgeExpiredData() { + final LocalDate today = localDateNow.get(); + // TODO: Base this on numberOfDaysOfLongestTrip for tripPatterns + final LocalDate previously = today.minusDays(2); // Just to be safe... + + // Purge data only if we have changed date + if (lastPurgeDate != null && lastPurgeDate.compareTo(previously) >= 0) { + return false; + } + + LOG.debug("purging expired realtime data"); + + lastPurgeDate = previously; + + return buffer.purgeExpiredData(previously); + } + + protected LocalDate localDateNow() { + return localDateNow.get(); + } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 133303e18eb..abc03907312 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -59,13 +59,11 @@ public class SiriTimetableSnapshotSource extends AbstractTimetableSnapshotSource /** Should expired real-time data be purged from the graph. */ private final boolean purgeExpiredData; - protected LocalDate lastPurgeDate = null; - public SiriTimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel ) { - super(transitModel.getTransitLayerUpdater(), parameters); + super(transitModel.getTransitLayerUpdater(), parameters, LocalDate::now); this.transitModel = transitModel; this.transitService = new DefaultTransitService(transitModel); this.purgeExpiredData = parameters.purgeExpiredData(); @@ -355,19 +353,4 @@ private boolean removePreviousRealtimeUpdate(final Trip trip, final LocalDate se return success; } - - private boolean purgeExpiredData() { - final LocalDate today = LocalDate.now(transitModel.getTimeZone()); - final LocalDate previously = today.minusDays(2); // Just to be safe... - - if (lastPurgeDate != null && lastPurgeDate.compareTo(previously) > 0) { - return false; - } - - LOG.debug("purging expired real-time data"); - - lastPurgeDate = previously; - - return buffer.purgeExpiredData(previously); - } } diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index aea1bffec2c..eec9bd81583 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -109,18 +109,10 @@ public class TimetableSnapshotSource extends AbstractTimetableSnapshotSource { */ private final boolean purgeExpiredData; - protected LocalDate lastPurgeDate = null; - private final Deduplicator deduplicator; private final Map serviceCodes; - /** - * We inject a provider to retrieve the current service-date(now). This enables us to unit-test - * the purgeExpiredData feature. - */ - private final Supplier localDateNow; - public TimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel @@ -137,13 +129,12 @@ public TimetableSnapshotSource( TransitModel transitModel, Supplier localDateNow ) { - super(transitModel.getTransitLayerUpdater(), parameters); + super(transitModel.getTransitLayerUpdater(), parameters, localDateNow); this.timeZone = transitModel.getTimeZone(); this.transitService = new DefaultTransitService(transitModel); this.deduplicator = transitModel.getDeduplicator(); this.serviceCodes = transitModel.getServiceCodes(); this.purgeExpiredData = parameters.purgeExpiredData(); - this.localDateNow = localDateNow; // Inject this into the transit model transitModel.initTimetableSnapshotProvider(this); @@ -224,7 +215,7 @@ public UpdateResult applyTripUpdates( } else { // TODO: figure out the correct service date. For the special case that a trip // starts for example at 40:00, yesterday would probably be a better guess. - serviceDate = localDateNow.get(); + serviceDate = localDateNow(); } uIndex += 1; @@ -1080,23 +1071,6 @@ private Result handleCanceledTrip( return Result.success(UpdateSuccess.noWarnings()); } - private boolean purgeExpiredData() { - final LocalDate today = localDateNow.get(); - // TODO: Base this on numberOfDaysOfLongestTrip for tripPatterns - final LocalDate previously = today.minusDays(2); // Just to be safe... - - // Purge data only if we have changed date - if (lastPurgeDate != null && lastPurgeDate.compareTo(previously) >= 0) { - return false; - } - - LOG.debug("purging expired realtime data"); - - lastPurgeDate = previously; - - return buffer.purgeExpiredData(previously); - } - /** * Retrieve a trip pattern given a trip id. * diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index a634177abcd..95019692c89 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -158,6 +158,7 @@ public void testHandleCanceledTrip() throws InvalidProtocolBufferException { final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); final Timetable forToday = snapshot.resolve(pattern, SERVICE_DATE); final Timetable schedule = snapshot.resolve(pattern, null); + assertNotSame(forToday, schedule); assertNotSame(forToday.getTripTimes(tripIndex), schedule.getTripTimes(tripIndex)); assertSame(forToday.getTripTimes(tripIndex2), schedule.getTripTimes(tripIndex2)); @@ -361,8 +362,6 @@ public void testHandleModifiedTrip() { feedId ); - updater.commitTimetableSnapshot(true); - // THEN final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); @@ -1067,7 +1066,7 @@ public void repeatedlyAddedTripWithNewRoute() { @Nonnull private TimetableSnapshotSource defaultUpdater() { return new TimetableSnapshotSource( - new TimetableSnapshotSourceParameters(Duration.ofMillis(-1), true), + new TimetableSnapshotSourceParameters(Duration.ZERO, true), transitModel, () -> SERVICE_DATE ); From 9243c01d605dae778cc8eb21c8738336f50f6329 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 16 May 2024 21:16:40 +0200 Subject: [PATCH 1201/1688] Make snapshot private --- .../siri/AbstractTimetableSnapshotSource.java | 34 +++++++++---------- .../ext/siri/SiriTimetableSnapshotSource.java | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java index 35bccbba9ee..a5ab6dfa069 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java @@ -27,23 +27,11 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide */ protected final TimetableSnapshot buffer = new TimetableSnapshot(); - public AbstractTimetableSnapshotSource( - TransitLayerUpdater transitLayerUpdater, - TimetableSnapshotSourceParameters parameters, - Supplier localDateNow - ) { - this.transitLayerUpdater = transitLayerUpdater; - this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); - this.localDateNow = localDateNow; - // Force commit so that snapshot initializes - commitTimetableSnapshot(true); - } - /** * The last committed snapshot that was handed off to a routing thread. This snapshot may be given * to more than one routing thread if the maximum snapshot frequency is exceeded. */ - protected volatile TimetableSnapshot snapshot = null; + private volatile TimetableSnapshot snapshot = null; /** * If a timetable snapshot is requested less than this number of milliseconds after the previous @@ -60,13 +48,25 @@ public AbstractTimetableSnapshotSource( private LocalDate lastPurgeDate = null; + public AbstractTimetableSnapshotSource( + TransitLayerUpdater transitLayerUpdater, + TimetableSnapshotSourceParameters parameters, + Supplier localDateNow + ) { + this.transitLayerUpdater = transitLayerUpdater; + this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); + this.localDateNow = localDateNow; + // Force commit so that snapshot initializes + commitTimetableSnapshot(true); + } + /** * @return an up-to-date snapshot mapping TripPatterns to Timetables. This snapshot and the * timetable objects it references are guaranteed to never change, so the requesting thread is * provided a consistent view of all TripTimes. The routing thread need only release its reference * to the snapshot to release resources. */ - public TimetableSnapshot getTimetableSnapshot() { + public final TimetableSnapshot getTimetableSnapshot() { // Try to get a lock on the buffer if (bufferLock.tryLock()) { // Make a new snapshot if necessary @@ -82,7 +82,7 @@ public TimetableSnapshot getTimetableSnapshot() { return snapshot; } - public void commitTimetableSnapshot(final boolean force) { + public final void commitTimetableSnapshot(final boolean force) { if (force || snapshotFrequencyThrottle.timeIsUp()) { if (force || buffer.isDirty()) { LOG.debug("Committing {}", buffer); @@ -100,7 +100,7 @@ public void commitTimetableSnapshot(final boolean force) { } } - protected boolean purgeExpiredData() { + protected final boolean purgeExpiredData() { final LocalDate today = localDateNow.get(); // TODO: Base this on numberOfDaysOfLongestTrip for tripPatterns final LocalDate previously = today.minusDays(2); // Just to be safe... @@ -117,7 +117,7 @@ protected boolean purgeExpiredData() { return buffer.purgeExpiredData(previously); } - protected LocalDate localDateNow() { + protected final LocalDate localDateNow() { return localDateNow.get(); } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index abc03907312..ea7f12358a1 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -197,7 +197,7 @@ private boolean shouldAddNewTrip( * Snapshot timetable is used as source if initialised, trip patterns scheduled timetable if not. */ private Timetable getCurrentTimetable(TripPattern tripPattern, LocalDate serviceDate) { - TimetableSnapshot timetableSnapshot = snapshot; + TimetableSnapshot timetableSnapshot = getTimetableSnapshot(); if (timetableSnapshot != null) { return timetableSnapshot.resolve(tripPattern, serviceDate); } From da3e60ddd74381e8aa691c8246dc8c197cde1542 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 16 May 2024 21:58:41 +0200 Subject: [PATCH 1202/1688] Extract common method for purgeAndCommit --- .../siri/AbstractTimetableSnapshotSource.java | 19 ++++++++++++++++++- .../ext/siri/SiriTimetableSnapshotSource.java | 10 +--------- .../updater/trip/TimetableSnapshotSource.java | 11 +---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java index a5ab6dfa069..646e2e655e9 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java @@ -40,6 +40,8 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide */ private final CountdownTimer snapshotFrequencyThrottle; + /** Should expired real-time data be purged from the graph. */ + private final boolean purgeExpiredData; /** * We inject a provider to retrieve the current service-date(now). This enables us to unit-test * the purgeExpiredData feature. @@ -55,6 +57,7 @@ public AbstractTimetableSnapshotSource( ) { this.transitLayerUpdater = transitLayerUpdater; this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); + this.purgeExpiredData = parameters.purgeExpiredData(); this.localDateNow = localDateNow; // Force commit so that snapshot initializes commitTimetableSnapshot(true); @@ -100,6 +103,20 @@ public final void commitTimetableSnapshot(final boolean force) { } } + /** + * Make a snapshot after each message in anticipation of incoming requests. + * Purge data if necessary (and force new snapshot if anything was purged). + * Make sure that the public (locking) getTimetableSnapshot function is not called. + */ + protected void purgeAndCommit() { + if (purgeExpiredData) { + final boolean modified = purgeExpiredData(); + commitTimetableSnapshot(modified); + } else { + commitTimetableSnapshot(false); + } + } + protected final boolean purgeExpiredData() { final LocalDate today = localDateNow.get(); // TODO: Base this on numberOfDaysOfLongestTrip for tripPatterns @@ -110,7 +127,7 @@ protected final boolean purgeExpiredData() { return false; } - LOG.debug("purging expired realtime data"); + LOG.debug("Purging expired realtime data"); lastPurgeDate = previously; diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index ea7f12358a1..18bbf0748f4 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -117,15 +117,7 @@ public UpdateResult applyEstimatedTimetable( LOG.debug("message contains {} trip updates", updates.size()); - // Make a snapshot after each message in anticipation of incoming requests - // Purge data if necessary (and force new snapshot if anything was purged) - // Make sure that the public (locking) getTimetableSnapshot function is not called. - if (purgeExpiredData) { - final boolean modified = purgeExpiredData(); - commitTimetableSnapshot(modified); - } else { - commitTimetableSnapshot(false); - } + purgeAndCommit(); } finally { // Always release lock bufferLock.unlock(); diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index eec9bd81583..8951a93544c 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -134,7 +134,6 @@ public TimetableSnapshotSource( this.transitService = new DefaultTransitService(transitModel); this.deduplicator = transitModel.getDeduplicator(); this.serviceCodes = transitModel.getServiceCodes(); - this.purgeExpiredData = parameters.purgeExpiredData(); // Inject this into the transit model transitModel.initTimetableSnapshotProvider(this); @@ -271,15 +270,7 @@ public UpdateResult applyTripUpdates( } } - // Make a snapshot after each message in anticipation of incoming requests - // Purge data if necessary (and force new snapshot if anything was purged) - // Make sure that the public (locking) getTimetableSnapshot function is not called. - if (purgeExpiredData) { - final boolean modified = purgeExpiredData(); - commitTimetableSnapshot(modified); - } else { - commitTimetableSnapshot(false); - } + purgeAndCommit(); } finally { // Always release lock bufferLock.unlock(); From fbf07ee12476f6a9c755b89dcd04caa2b08b0d79 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 16 May 2024 22:14:49 +0200 Subject: [PATCH 1203/1688] Extract method for locking the buffer --- .../ext/siri/AbstractTimetableSnapshotSource.java | 13 ++++++++++++- .../ext/siri/SiriTimetableSnapshotSource.java | 15 +++------------ .../updater/trip/TimetableSnapshotSource.java | 10 ++-------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java index 646e2e655e9..86a50a070c5 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java @@ -18,7 +18,7 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide /** * Lock to indicate that buffer is in use */ - protected final ReentrantLock bufferLock = new ReentrantLock(true); + private final ReentrantLock bufferLock = new ReentrantLock(true); /** * The working copy of the timetable snapshot. Should not be visible to routing threads. Should @@ -137,4 +137,15 @@ protected final boolean purgeExpiredData() { protected final LocalDate localDateNow() { return localDateNow.get(); } + + protected final void withLock(Runnable action) { + bufferLock.lock(); + + try { + action.run(); + } finally { + // Always release lock + bufferLock.unlock(); + } + } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 18bbf0748f4..1b5170c3cc2 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -56,9 +56,6 @@ public class SiriTimetableSnapshotSource extends AbstractTimetableSnapshotSource private final TransitService transitService; - /** Should expired real-time data be purged from the graph. */ - private final boolean purgeExpiredData; - public SiriTimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel @@ -66,7 +63,6 @@ public SiriTimetableSnapshotSource( super(transitModel.getTransitLayerUpdater(), parameters, LocalDate::now); this.transitModel = transitModel; this.transitService = new DefaultTransitService(transitModel); - this.purgeExpiredData = parameters.purgeExpiredData(); this.tripPatternCache = new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip); @@ -94,12 +90,9 @@ public UpdateResult applyEstimatedTimetable( return UpdateResult.empty(); } - // Acquire lock on buffer - bufferLock.lock(); - List> results = new ArrayList<>(); - try { + withLock(() -> { if (fullDataset) { // Remove all updates from the buffer buffer.clear(feedId); @@ -118,10 +111,8 @@ public UpdateResult applyEstimatedTimetable( LOG.debug("message contains {} trip updates", updates.size()); purgeAndCommit(); - } finally { - // Always release lock - bufferLock.unlock(); - } + }); + return UpdateResult.ofResults(results); } diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 8951a93544c..6e97b78dfa0 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -165,13 +165,10 @@ public UpdateResult applyTripUpdates( return UpdateResult.empty(); } - // Acquire lock on buffer - bufferLock.lock(); - Map failuresByRelationship = new HashMap<>(); List> results = new ArrayList<>(); - try { + withLock(() -> { if (fullDataset) { // Remove all updates from the buffer buffer.clear(feedId); @@ -271,10 +268,7 @@ public UpdateResult applyTripUpdates( } purgeAndCommit(); - } finally { - // Always release lock - bufferLock.unlock(); - } + }); var updateResult = UpdateResult.ofResults(results); From fdc3c752b4442a5e1abf5b12832039d3bdc3fb2c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 17 May 2024 10:42:42 +0200 Subject: [PATCH 1204/1688] Force commit of snapshot in purging code --- .../updater/trip/TimetableSnapshotSourceTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 95019692c89..f3a1d15dac4 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -1146,6 +1146,7 @@ public void testPurgeExpiredData( List.of(tripUpdateYesterday), feedId ); + updater.commitTimetableSnapshot(true); final TimetableSnapshot snapshotA = updater.getTimetableSnapshot(); From de0f58c659fa52df1df54d41a41e36740ac4a30a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 10:19:35 +0200 Subject: [PATCH 1205/1688] Move abstract class into core --- .../opentripplanner/ext/siri/SiriTimetableSnapshotSource.java | 1 + .../updater/trip}/AbstractTimetableSnapshotSource.java | 2 +- .../opentripplanner/updater/trip/TimetableSnapshotSource.java | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) rename src/{ext/java/org/opentripplanner/ext/siri => main/java/org/opentripplanner/updater/trip}/AbstractTimetableSnapshotSource.java (99%) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 1b5170c3cc2..5cd39e1c4ff 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -28,6 +28,7 @@ import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.UpdateSuccess; +import org.opentripplanner.updater.trip.AbstractTimetableSnapshotSource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; diff --git a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java similarity index 99% rename from src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java rename to src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java index 86a50a070c5..3dbb44678fb 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AbstractTimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.siri; +package org.opentripplanner.updater.trip; import java.time.LocalDate; import java.util.concurrent.locks.ReentrantLock; diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 6e97b78dfa0..a046daa1aa5 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -31,7 +31,6 @@ import java.util.Set; import java.util.function.Supplier; import javax.annotation.Nonnull; -import org.opentripplanner.ext.siri.AbstractTimetableSnapshotSource; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.lang.StringUtils; From 9ced71e5f1229306f760212618d7f31280c0ab24 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 16:41:13 +0200 Subject: [PATCH 1206/1688] Add null checks --- .../updater/trip/AbstractTimetableSnapshotSource.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java index 3dbb44678fb..395bceacf8d 100644 --- a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java @@ -1,6 +1,7 @@ package org.opentripplanner.updater.trip; import java.time.LocalDate; +import java.util.Objects; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; import org.opentripplanner.framework.time.CountdownTimer; @@ -58,7 +59,7 @@ public AbstractTimetableSnapshotSource( this.transitLayerUpdater = transitLayerUpdater; this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency()); this.purgeExpiredData = parameters.purgeExpiredData(); - this.localDateNow = localDateNow; + this.localDateNow = Objects.requireNonNull(localDateNow); // Force commit so that snapshot initializes commitTimetableSnapshot(true); } From c1ea7a2dc97e7f8fcd40f1b9e9d601028d9d84eb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 23 May 2024 21:31:05 +0200 Subject: [PATCH 1207/1688] Fix merge conflicts after rebase --- .../trip/AbstractTimetableSnapshotSource.java | 16 +++++++++++--- .../updater/trip/TimetableSnapshotSource.java | 22 ------------------- 2 files changed, 13 insertions(+), 25 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java index 395bceacf8d..5df6bfb5e80 100644 --- a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java @@ -29,8 +29,15 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide protected final TimetableSnapshot buffer = new TimetableSnapshot(); /** - * The last committed snapshot that was handed off to a routing thread. This snapshot may be given - * to more than one routing thread if the maximum snapshot frequency is exceeded. + * The working copy of the timetable snapshot. Should not be visible to routing threads. Should + * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that + * might modify this buffer will correctly acquire the lock. By design, only one thread should + * ever be writing to this buffer. + * TODO RT_AB: research and document why this lock is needed since only one thread should ever be + * writing to this buffer. One possible reason may be a need to suspend writes while indexing + * and swapping out the buffer. But the original idea was to make a new copy of the buffer + * before re-indexing it. While refactoring or rewriting parts of this system, we could throw + * an exception if a writing section is entered by more than one thread. */ private volatile TimetableSnapshot snapshot = null; @@ -41,7 +48,10 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide */ private final CountdownTimer snapshotFrequencyThrottle; - /** Should expired real-time data be purged from the graph. */ + /** + * Should expired real-time data be purged from the graph. + * TODO RT_AB: Clarify exactly what "purge" means and in what circumstances would one turn it off. + */ private final boolean purgeExpiredData; /** * We inject a provider to retrieve the current service-date(now). This enables us to unit-test diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index a046daa1aa5..a530f348a00 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -80,34 +80,12 @@ public class TimetableSnapshotSource extends AbstractTimetableSnapshotSource { */ private static final long MAX_ARRIVAL_DEPARTURE_TIME = 48 * 60 * 60; - /** - * The working copy of the timetable snapshot. Should not be visible to routing threads. Should - * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that - * might modify this buffer will correctly acquire the lock. By design, only one thread should - * ever be writing to this buffer. - * TODO RT_AB: research and document why this lock is needed since only one thread should ever be - * writing to this buffer. One possible reason may be a need to suspend writes while indexing - * and swapping out the buffer. But the original idea was to make a new copy of the buffer - * before re-indexing it. While refactoring or rewriting parts of this system, we could throw - * an exception if a writing section is entered by more than one thread. - */ - private final TimetableSnapshot buffer = new TimetableSnapshot(); - - /** Lock to indicate that buffer is in use. */ - private final ReentrantLock bufferLock = new ReentrantLock(true); - /** A synchronized cache of trip patterns added to the graph due to GTFS-realtime messages. */ private final TripPatternCache tripPatternCache = new TripPatternCache(); private final ZoneId timeZone; private final TransitEditorService transitService; - /** - * Should expired real-time data be purged from the graph. - * TODO RT_AB: Clarify exactly what "purge" means and in what circumstances would one turn it off. - */ - private final boolean purgeExpiredData; - private final Deduplicator deduplicator; private final Map serviceCodes; From 3c5856410574f98010a3efa421e773616ec94b2c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 27 May 2024 13:55:40 +0200 Subject: [PATCH 1208/1688] Add documentation --- .../model/TimetableSnapshot.java | 5 +++- .../trip/AbstractTimetableSnapshotSource.java | 28 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index 5edcacb1ffb..e1dfd5681c0 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -397,8 +397,11 @@ public void setPatternsForStop(SetMultimap patternsFo this.patternsForStop = patternsForStop; } + /** + * Does this snapshot contain any realtime data or is it completely empty? + */ public boolean isEmpty() { - return timetables.isEmpty() && realtimeAddedTripPattern.isEmpty(); + return dirtyTimetables.isEmpty() && timetables.isEmpty() && realtimeAddedTripPattern.isEmpty(); } /** diff --git a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java index 5df6bfb5e80..eb063a1a097 100644 --- a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java @@ -12,6 +12,15 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +/** + * A base class for which abstracts away locking, updating, committing and purging of the timetable snapshot. + * In order to keep code reviews easier this is an intermediate stage and will be refactored further. + * In particular the following refactorings are planned: + * + * - use composition instead of inheritance + * - make the buffer private to this class and add an API for its access + * - create only one "snapshot manager" per transit model that + */ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvider { private static final Logger LOG = LoggerFactory.getLogger(AbstractTimetableSnapshotSource.class); @@ -96,6 +105,13 @@ public final TimetableSnapshot getTimetableSnapshot() { return snapshot; } + /** + * Request a commit of the timetable snapshot. + *

              + * If there are no updated buffered up or not enough time has elapsed, no snapshot is created. + * + * @param force Force the committing of a new snapshot even if the above conditions are not met. + */ public final void commitTimetableSnapshot(final boolean force) { if (force || snapshotFrequencyThrottle.timeIsUp()) { if (force || buffer.isDirty()) { @@ -128,6 +144,13 @@ protected void purgeAndCommit() { } } + /** + * Remove realtime data from previous service dates from the snapshot. This is useful so that + * instances that run for multiple days don't accumulate a lot of realtime data for past + * dates which would increase memory consumption. + * If your OTP instances are restarted throughout the day, this is less useful and can be + * turned off. + */ protected final boolean purgeExpiredData() { final LocalDate today = localDateNow.get(); // TODO: Base this on numberOfDaysOfLongestTrip for tripPatterns @@ -149,6 +172,11 @@ protected final LocalDate localDateNow() { return localDateNow.get(); } + /** + * Execute a {@code Runnable} with a locked snapshot buffer and release the lock afterwards. While + * the action of locking an unlocking is not complicated to do for calling code, this method + * exist so that the lock instance is a private field. + */ protected final void withLock(Runnable action) { bufferLock.lock(); From 9476a27852e5bb1f2d44092d85dad73597237ab0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 28 May 2024 07:38:44 +0200 Subject: [PATCH 1209/1688] Automerge nexus-staging-maven-plugin [ci skip] --- renovate.json5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json5 b/renovate.json5 index b3472c1a0d1..7543ce9512b 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -122,7 +122,8 @@ "com.google.cloud.tools:jib-maven-plugin", "org.apache.maven.plugins:maven-shade-plugin", "org.apache.maven.plugins:maven-compiler-plugin", - "org.apache.maven.plugins:maven-jar-plugin" + "org.apache.maven.plugins:maven-jar-plugin", + "org.sonatype.plugins:nexus-staging-maven-plugin" ], "matchPackagePrefixes": [ "org.junit.jupiter:", From 39a727060e945ee4dd2eda80165e815a8849ebc1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 27 May 2024 19:14:45 +0000 Subject: [PATCH 1210/1688] chore(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.6.14 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 984d0b340fd..46bfcb8fdb4 100644 --- a/pom.xml +++ b/pom.xml @@ -1013,7 +1013,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.6.14 true ossrh From e89548230c152d658f77f0f28a3c90021232c5bb Mon Sep 17 00:00:00 2001 From: Johan Torin Date: Mon, 27 May 2024 14:36:55 +0200 Subject: [PATCH 1211/1688] Log the origin of a request that causes a transfer cache addition. With this it's possible to differentiate between entries added because of configuration and those from runtime requests, the latter being candidates for the former. --- .../raptoradapter/transit/TransitLayer.java | 4 +++ .../request/RaptorRequestTransferCache.java | 26 ++++++++++++------- .../configure/ConstructApplication.java | 2 +- 3 files changed, 21 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java index 31b8d38ba66..c92bbd750ad 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/TransitLayer.java @@ -165,6 +165,10 @@ public RaptorTransferIndex getRaptorTransfersForRequest(RouteRequest request) { return transferCache.get(transfersByStopIndex, request); } + public void initTransferCacheForRequest(RouteRequest request) { + transferCache.put(transfersByStopIndex, request); + } + public RaptorRequestTransferCache getTransferCache() { return transferCache; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java index 32935d77fe0..7ae910caba3 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java @@ -35,14 +35,20 @@ public LoadingCache getTransferCache() { return transferCache; } + public void put(List> transfersByStopIndex, RouteRequest request) { + final CacheKey cacheKey = new CacheKey(transfersByStopIndex, request); + final RaptorTransferIndex raptorTransferIndex = RaptorTransferIndex.create( + transfersByStopIndex, + cacheKey.request + ); + + LOG.info("Adding request from config to cache: {}", cacheKey.options); + transferCache.put(cacheKey, raptorTransferIndex); + } + public RaptorTransferIndex get(List> transfersByStopIndex, RouteRequest request) { try { - return transferCache.get( - new CacheKey( - transfersByStopIndex, - StreetSearchRequestMapper.mapToTransferRequest(request).build() - ) - ); + return transferCache.get(new CacheKey(transfersByStopIndex, request)); } catch (ExecutionException e) { throw new RuntimeException("Failed to get item from transfer cache", e); } @@ -53,7 +59,7 @@ private CacheLoader cacheLoader() { @Override @Nonnull public RaptorTransferIndex load(@Nonnull CacheKey cacheKey) { - LOG.info("Adding request to cache: {}", cacheKey.options); + LOG.info("Adding runtime request to cache: {}", cacheKey.options); return RaptorTransferIndex.create(cacheKey.transfersByStopIndex, cacheKey.request); } }; @@ -65,10 +71,10 @@ private static class CacheKey { private final StreetSearchRequest request; private final StreetRelevantOptions options; - private CacheKey(List> transfersByStopIndex, StreetSearchRequest request) { + private CacheKey(List> transfersByStopIndex, RouteRequest request) { this.transfersByStopIndex = transfersByStopIndex; - this.request = request; - this.options = new StreetRelevantOptions(request); + this.request = StreetSearchRequestMapper.mapToTransferRequest(request).build(); + this.options = new StreetRelevantOptions(this.request); } @Override diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java index 72a46254b58..b1bc6888753 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -233,7 +233,7 @@ public static void initializeTransferCache( LOG.info(progress.startMessage()); transferCacheRequests.forEach(request -> { - transitModel.getTransitLayer().getRaptorTransfersForRequest(request); + transitModel.getTransitLayer().initTransferCacheForRequest(request); //noinspection Convert2MethodRef progress.step(s -> LOG.info(s)); From ca07e9af1bcf379fb357a77adea26a3eebdd2608 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 28 May 2024 10:10:11 +0200 Subject: [PATCH 1212/1688] Migrate java model to mobilitydata package --- pom.xml | 4 +-- renovate.json5 | 2 +- .../model/RentalVehicleType.java | 2 +- .../datasources/GbfsFeedLoader.java | 8 ++--- .../GbfsFreeVehicleStatusMapper.java | 4 +-- .../datasources/GbfsGeofencingZoneMapper.java | 4 +-- .../GbfsStationInformationMapper.java | 4 +-- .../datasources/GbfsStationStatusMapper.java | 4 +-- .../GbfsSystemInformationMapper.java | 2 +- .../GbfsVehicleRentalDataSource.java | 16 +++++----- .../datasources/GbfsVehicleTypeMapper.java | 2 +- .../datasources/GbfsFeedLoaderTest.java | 30 +++++++++---------- .../GbfsFreeVehicleStatusMapperTest.java | 2 +- .../GbfsVehicleRentalDataSourceTest.java | 2 +- 14 files changed, 43 insertions(+), 43 deletions(-) diff --git a/pom.xml b/pom.xml index 46bfcb8fdb4..4dec1ea6d29 100644 --- a/pom.xml +++ b/pom.xml @@ -672,9 +672,9 @@ - org.entur.gbfs + org.mobilitydata gbfs-java-model - 3.1.3 + 1.0.6 diff --git a/renovate.json5 b/renovate.json5 index 7543ce9512b..466bc36a94a 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -46,7 +46,7 @@ // noise, so we slow it down a bit { "matchPackageNames": [ - "org.entur.gbfs:gbfs-java-model" + "org.mobilitydata:gbfs-java-model" ], "matchUpdateTypes": ["patch"], "schedule": "on the 18th day of the month", diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java b/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java index d9972dd3149..0d26682395d 100644 --- a/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java +++ b/src/main/java/org/opentripplanner/service/vehiclerental/model/RentalVehicleType.java @@ -3,7 +3,7 @@ import java.io.Serializable; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleType; +import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleType; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.transit.model.framework.FeedScopedId; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java index d4e5cbd4952..0e103231849 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoader.java @@ -7,10 +7,10 @@ import java.net.URISyntaxException; import java.util.HashMap; import java.util.Map; -import org.entur.gbfs.v2_3.gbfs.GBFS; -import org.entur.gbfs.v2_3.gbfs.GBFSFeed; -import org.entur.gbfs.v2_3.gbfs.GBFSFeedName; -import org.entur.gbfs.v2_3.gbfs.GBFSFeeds; +import org.mobilitydata.gbfs.v2_3.gbfs.GBFS; +import org.mobilitydata.gbfs.v2_3.gbfs.GBFSFeed; +import org.mobilitydata.gbfs.v2_3.gbfs.GBFSFeedName; +import org.mobilitydata.gbfs.v2_3.gbfs.GBFSFeeds; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientException; import org.opentripplanner.framework.io.OtpHttpClientFactory; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java index c871ac49649..7fd884b7ab8 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapper.java @@ -7,8 +7,8 @@ import java.util.Map; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import org.entur.gbfs.v2_3.free_bike_status.GBFSBike; -import org.entur.gbfs.v2_3.free_bike_status.GBFSRentalUris; +import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSBike; +import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSRentalUris; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java index 910ab855585..caf5d97c0d4 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java @@ -5,9 +5,9 @@ import java.util.List; import java.util.Objects; import javax.annotation.Nullable; -import org.entur.gbfs.v2_3.geofencing_zones.GBFSFeature; -import org.entur.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; import org.locationtech.jts.geom.Geometry; +import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSFeature; +import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.UnsupportedGeometryException; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java index 496bd08c819..2f58476457c 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationInformationMapper.java @@ -2,8 +2,8 @@ import java.util.Map; import java.util.stream.Collectors; -import org.entur.gbfs.v2_3.station_information.GBFSRentalUris; -import org.entur.gbfs.v2_3.station_information.GBFSStation; +import org.mobilitydata.gbfs.v2_3.station_information.GBFSRentalUris; +import org.mobilitydata.gbfs.v2_3.station_information.GBFSStation; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java index 77053917e7a..21ee8d000c0 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsStationStatusMapper.java @@ -4,8 +4,8 @@ import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; -import org.entur.gbfs.v2_3.station_status.GBFSStation; -import org.entur.gbfs.v2_3.station_status.GBFSVehicleTypesAvailable; +import org.mobilitydata.gbfs.v2_3.station_status.GBFSStation; +import org.mobilitydata.gbfs.v2_3.station_status.GBFSVehicleTypesAvailable; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; import org.slf4j.Logger; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java index 6a32d27c3e7..8011fd1ce63 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsSystemInformationMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.updater.vehicle_rental.datasources; -import org.entur.gbfs.v2_3.system_information.GBFSData; +import org.mobilitydata.gbfs.v2_3.system_information.GBFSData; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystemAppInformation; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java index aed214102ff..c441efb974a 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSource.java @@ -6,14 +6,14 @@ import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; -import org.entur.gbfs.v2_3.free_bike_status.GBFSFreeBikeStatus; -import org.entur.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; -import org.entur.gbfs.v2_3.station_information.GBFSStationInformation; -import org.entur.gbfs.v2_3.station_status.GBFSStation; -import org.entur.gbfs.v2_3.station_status.GBFSStationStatus; -import org.entur.gbfs.v2_3.system_information.GBFSSystemInformation; -import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleType; -import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleTypes; +import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSFreeBikeStatus; +import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; +import org.mobilitydata.gbfs.v2_3.station_information.GBFSStationInformation; +import org.mobilitydata.gbfs.v2_3.station_status.GBFSStation; +import org.mobilitydata.gbfs.v2_3.station_status.GBFSStationStatus; +import org.mobilitydata.gbfs.v2_3.system_information.GBFSSystemInformation; +import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleType; +import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleTypes; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.io.OtpHttpClient; import org.opentripplanner.framework.io.OtpHttpClientFactory; diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java index b17c4b20200..5c7816781ce 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleTypeMapper.java @@ -1,6 +1,6 @@ package org.opentripplanner.updater.vehicle_rental.datasources; -import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleType; +import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleType; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.transit.model.framework.FeedScopedId; diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java index 9a0dbcdfe87..836d1ef3124 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFeedLoaderTest.java @@ -13,21 +13,21 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import org.entur.gbfs.v2_3.free_bike_status.GBFSFreeBikeStatus; -import org.entur.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; -import org.entur.gbfs.v2_3.station_information.GBFSStation; -import org.entur.gbfs.v2_3.station_information.GBFSStationInformation; -import org.entur.gbfs.v2_3.station_status.GBFSStationStatus; -import org.entur.gbfs.v2_3.system_alerts.GBFSSystemAlerts; -import org.entur.gbfs.v2_3.system_calendar.GBFSSystemCalendar; -import org.entur.gbfs.v2_3.system_hours.GBFSSystemHours; -import org.entur.gbfs.v2_3.system_information.GBFSSystemInformation; -import org.entur.gbfs.v2_3.system_pricing_plans.GBFSSystemPricingPlans; -import org.entur.gbfs.v2_3.system_regions.GBFSSystemRegions; -import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleType; -import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleTypes; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSFreeBikeStatus; +import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; +import org.mobilitydata.gbfs.v2_3.station_information.GBFSStation; +import org.mobilitydata.gbfs.v2_3.station_information.GBFSStationInformation; +import org.mobilitydata.gbfs.v2_3.station_status.GBFSStationStatus; +import org.mobilitydata.gbfs.v2_3.system_alerts.GBFSSystemAlerts; +import org.mobilitydata.gbfs.v2_3.system_calendar.GBFSSystemCalendar; +import org.mobilitydata.gbfs.v2_3.system_hours.GBFSSystemHours; +import org.mobilitydata.gbfs.v2_3.system_information.GBFSSystemInformation; +import org.mobilitydata.gbfs.v2_3.system_pricing_plans.GBFSSystemPricingPlans; +import org.mobilitydata.gbfs.v2_3.system_regions.GBFSSystemRegions; +import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleType; +import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleTypes; import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.updater.spi.HttpHeaders; import org.slf4j.LoggerFactory; @@ -181,7 +181,7 @@ private void validateV22Feed(GbfsFeedLoader loader) { GBFSStationStatus stationStatus = loader.getFeed(GBFSStationStatus.class); assertNotNull(stationStatus); - List stationStatuses = stationStatus + List stationStatuses = stationStatus .getData() .getStations(); assertEquals(6, stationStatuses.size()); @@ -228,7 +228,7 @@ private void validateV10Feed(GbfsFeedLoader loader) { GBFSStationStatus stationStatus = loader.getFeed(GBFSStationStatus.class); assertNotNull(stationStatus); - List stationStatuses = stationStatus + List stationStatuses = stationStatus .getData() .getStations(); assertEquals(10, stationStatuses.size()); diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java index 8e5b900a401..02295ce09e9 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsFreeVehicleStatusMapperTest.java @@ -3,8 +3,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Map; -import org.entur.gbfs.v2_3.free_bike_status.GBFSBike; import org.junit.jupiter.api.Test; +import org.mobilitydata.gbfs.v2_3.free_bike_status.GBFSBike; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.street.model.RentalFormFactor; diff --git a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java index 018a3d06e5b..7b062bcc17c 100644 --- a/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsVehicleRentalDataSourceTest.java @@ -8,8 +8,8 @@ import java.util.Collections; import java.util.List; import java.util.Map; -import org.entur.gbfs.v2_3.vehicle_types.GBFSVehicleType; import org.junit.jupiter.api.Test; +import org.mobilitydata.gbfs.v2_3.vehicle_types.GBFSVehicleType; import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; From e9b1e93ae507739841cab1638bcd4431f01ed5e0 Mon Sep 17 00:00:00 2001 From: Johan Torin Date: Tue, 28 May 2024 10:55:08 +0200 Subject: [PATCH 1213/1688] Update src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java Co-authored-by: Henrik Abrahamsson <127481124+habrahamsson-skanetrafiken@users.noreply.github.com> --- .../transit/request/RaptorRequestTransferCache.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java index 7ae910caba3..99ad83d3f4d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRequestTransferCache.java @@ -42,7 +42,7 @@ public void put(List> transfersByStopIndex, RouteRequest request) cacheKey.request ); - LOG.info("Adding request from config to cache: {}", cacheKey.options); + LOG.info("Initializing cache with request: {}", cacheKey.options); transferCache.put(cacheKey, raptorTransferIndex); } From 01e2a14fe45e7f22f40aa2b2690208a1849a61f1 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Tue, 28 May 2024 12:17:35 +0300 Subject: [PATCH 1214/1688] Make FeedPublisher nullable --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 15de75f5408..0ea8899ba32 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -997,7 +997,7 @@ type Feed { agencies: [Agency] """publisher""" - publisher: FeedPublisher! + publisher: FeedPublisher """ Alerts relevant for the feed. From 22da07cbb4da20010f689cfc75cfad985ef038aa Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 28 May 2024 13:50:43 +0200 Subject: [PATCH 1215/1688] Use correct date --- .../opentripplanner/ext/siri/SiriTimetableSnapshotSource.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 5cd39e1c4ff..16e5a2e5ecd 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -61,7 +61,7 @@ public SiriTimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel ) { - super(transitModel.getTransitLayerUpdater(), parameters, LocalDate::now); + super(transitModel.getTransitLayerUpdater(), parameters, () -> LocalDate.now(transitModel.getTimeZone())); this.transitModel = transitModel; this.transitService = new DefaultTransitService(transitModel); this.tripPatternCache = From 619e7cf5b2aba59ee2dcdbda44e1f070654e2f81 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 28 May 2024 13:52:53 +0200 Subject: [PATCH 1216/1688] Add Javadoc --- .../ext/siri/SiriTimetableSnapshotSource.java | 6 +++++- .../updater/trip/AbstractTimetableSnapshotSource.java | 5 +++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 16e5a2e5ecd..99e9063418c 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -61,7 +61,11 @@ public SiriTimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel ) { - super(transitModel.getTransitLayerUpdater(), parameters, () -> LocalDate.now(transitModel.getTimeZone())); + super( + transitModel.getTransitLayerUpdater(), + parameters, + () -> LocalDate.now(transitModel.getTimeZone()) + ); this.transitModel = transitModel; this.transitService = new DefaultTransitService(transitModel); this.tripPatternCache = diff --git a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java index eb063a1a097..ed604a63a64 100644 --- a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java @@ -70,6 +70,11 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide private LocalDate lastPurgeDate = null; + /** + * + * @param localDateNow This supplier allows you to inject a custom lambda to override what is + * considered 'today'. This is useful for unit testing. + */ public AbstractTimetableSnapshotSource( TransitLayerUpdater transitLayerUpdater, TimetableSnapshotSourceParameters parameters, From 490df7f459b5614392369eed44eb8beb45b3821c Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 28 May 2024 11:59:38 +0000 Subject: [PATCH 1217/1688] Add changelog entry for #5874 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index e799f6fd784..03159dab1ea 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -21,6 +21,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Namer for applying street names to nearby sidewalks [#5774](https://github.com/opentripplanner/OpenTripPlanner/pull/5774) - Implement GTFS Flex safe duration spec draft [#5796](https://github.com/opentripplanner/OpenTripPlanner/pull/5796) - Document and validate timeRange GraphQL parameter [#5834](https://github.com/opentripplanner/OpenTripPlanner/pull/5834) +- Log the origin of a request that causes a transfer cache addition. [#5874](https://github.com/opentripplanner/OpenTripPlanner/pull/5874) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 251e73b3e51c99c6d5a051844140b5e71ef57081 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 28 May 2024 14:04:57 +0200 Subject: [PATCH 1218/1688] Incorporate review feedback --- .../trip/TimetableSnapshotSourceTest.java | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index f3a1d15dac4..eeb7368091c 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -96,15 +96,6 @@ public void testGetSnapshot() throws InvalidProtocolBufferException { final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); assertNotNull(snapshot); assertSame(snapshot, updater.getTimetableSnapshot()); - - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - fullDataset, - List.of(TripUpdate.parseFrom(cancellation)), - feedId - ); - assertNotSame(snapshot, updater.getTimetableSnapshot()); } @Test @@ -139,11 +130,7 @@ public void testHandleCanceledTrip() throws InvalidProtocolBufferException { final int tripIndex = pattern.getScheduledTimetable().getTripIndex(tripId); final int tripIndex2 = pattern.getScheduledTimetable().getTripIndex(tripId2); - var updater = new TimetableSnapshotSource( - TimetableSnapshotSourceParameters.DEFAULT, - transitModel, - () -> SERVICE_DATE - ); + var updater = defaultUpdater(); updater.applyTripUpdates( TRIP_MATCHER_NOOP, @@ -153,8 +140,6 @@ public void testHandleCanceledTrip() throws InvalidProtocolBufferException { feedId ); - updater.commitTimetableSnapshot(true); - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); final Timetable forToday = snapshot.resolve(pattern, SERVICE_DATE); final Timetable schedule = snapshot.resolve(pattern, null); From a1818037c4db49fa8d83d656c8d797edf11cd43b Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Tue, 28 May 2024 15:14:25 +0300 Subject: [PATCH 1219/1688] Update src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls Co-authored-by: Leonard Ehrenfried --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 0ea8899ba32..41ed352ebf1 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -996,7 +996,7 @@ type Feed { """List of agencies which provide data to this feed""" agencies: [Agency] - """publisher""" + "The publisher of the input transit data." publisher: FeedPublisher """ From d3a9d9721494f149ed99a4f285a4691dd06d24fb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 28 May 2024 15:11:33 +0200 Subject: [PATCH 1220/1688] Remove long-disabled MMRI tests --- .../mmri/AllModesAndAgenciesTest.java | 31 ---------- .../mmri/ExcludedStopsTest.java | 29 ---------- .../org/opentripplanner/mmri/OnTripTest.java | 41 ------------- .../mmri/PlannerstackScenarioTest.java | 48 ---------------- .../opentripplanner/mmri/PreferencesTest.java | 26 --------- .../mmri/ServiceAlertTest.java | 29 ---------- .../org/opentripplanner/mmri/TimeTest.java | 25 -------- .../mmri/TransferTimeTest.java | 54 ------------------ src/test/resources/mmri/1a/agency.txt | 2 - src/test/resources/mmri/1a/calendar_dates.txt | 4 -- src/test/resources/mmri/1a/routes.txt | 4 -- src/test/resources/mmri/1a/stop_times.txt | 7 --- src/test/resources/mmri/1a/stops.txt | 7 --- src/test/resources/mmri/1a/transfers.txt | 3 - src/test/resources/mmri/1a/trips.txt | 4 -- src/test/resources/mmri/2a2/agency.txt | 2 - .../resources/mmri/2a2/calendar_dates.txt | 2 - src/test/resources/mmri/2a2/routes.txt | 3 - src/test/resources/mmri/2a2/stop_times.txt | 15 ----- src/test/resources/mmri/2a2/stops.txt | 5 -- src/test/resources/mmri/2a2/transfers.txt | 2 - src/test/resources/mmri/2a2/trips.txt | 8 --- src/test/resources/mmri/2f/agency.txt | 2 - src/test/resources/mmri/2f/calendar_dates.txt | 2 - src/test/resources/mmri/2f/routes.txt | 4 -- src/test/resources/mmri/2f/stop_times.txt | 9 --- src/test/resources/mmri/2f/stops.txt | 4 -- src/test/resources/mmri/2f/trips.txt | 4 -- src/test/resources/mmri/3f/agency.txt | 2 - src/test/resources/mmri/3f/calendar_dates.txt | 2 - src/test/resources/mmri/3f/routes.txt | 3 - src/test/resources/mmri/3f/stop_times.txt | 7 --- src/test/resources/mmri/3f/stops.txt | 5 -- src/test/resources/mmri/3f/trips.txt | 3 - src/test/resources/mmri/3i.pb | Bin 51 -> 0 bytes src/test/resources/mmri/3i/agency.txt | 2 - src/test/resources/mmri/3i/calendar_dates.txt | 2 - src/test/resources/mmri/3i/routes.txt | 2 - src/test/resources/mmri/3i/stop_times.txt | 3 - src/test/resources/mmri/3i/stops.txt | 3 - src/test/resources/mmri/3i/trips.txt | 2 - .../resources/mmri/plannerstack_scenario.pb | Bin 120 -> 0 bytes .../mmri/plannerstack_scenario/agency.txt | 2 - .../plannerstack_scenario/calendar_dates.txt | 2 - .../mmri/plannerstack_scenario/routes.txt | 4 -- .../mmri/plannerstack_scenario/stop_times.txt | 12 ---- .../mmri/plannerstack_scenario/stops.txt | 4 -- .../mmri/plannerstack_scenario/trips.txt | 5 -- 48 files changed, 441 deletions(-) delete mode 100644 src/test/java/org/opentripplanner/mmri/AllModesAndAgenciesTest.java delete mode 100644 src/test/java/org/opentripplanner/mmri/ExcludedStopsTest.java delete mode 100644 src/test/java/org/opentripplanner/mmri/OnTripTest.java delete mode 100644 src/test/java/org/opentripplanner/mmri/PlannerstackScenarioTest.java delete mode 100644 src/test/java/org/opentripplanner/mmri/ServiceAlertTest.java delete mode 100644 src/test/java/org/opentripplanner/mmri/TransferTimeTest.java delete mode 100644 src/test/resources/mmri/1a/agency.txt delete mode 100644 src/test/resources/mmri/1a/calendar_dates.txt delete mode 100644 src/test/resources/mmri/1a/routes.txt delete mode 100644 src/test/resources/mmri/1a/stop_times.txt delete mode 100644 src/test/resources/mmri/1a/stops.txt delete mode 100644 src/test/resources/mmri/1a/transfers.txt delete mode 100644 src/test/resources/mmri/1a/trips.txt delete mode 100644 src/test/resources/mmri/2a2/agency.txt delete mode 100644 src/test/resources/mmri/2a2/calendar_dates.txt delete mode 100644 src/test/resources/mmri/2a2/routes.txt delete mode 100644 src/test/resources/mmri/2a2/stop_times.txt delete mode 100644 src/test/resources/mmri/2a2/stops.txt delete mode 100644 src/test/resources/mmri/2a2/transfers.txt delete mode 100644 src/test/resources/mmri/2a2/trips.txt delete mode 100644 src/test/resources/mmri/2f/agency.txt delete mode 100644 src/test/resources/mmri/2f/calendar_dates.txt delete mode 100644 src/test/resources/mmri/2f/routes.txt delete mode 100644 src/test/resources/mmri/2f/stop_times.txt delete mode 100644 src/test/resources/mmri/2f/stops.txt delete mode 100644 src/test/resources/mmri/2f/trips.txt delete mode 100644 src/test/resources/mmri/3f/agency.txt delete mode 100644 src/test/resources/mmri/3f/calendar_dates.txt delete mode 100644 src/test/resources/mmri/3f/routes.txt delete mode 100644 src/test/resources/mmri/3f/stop_times.txt delete mode 100644 src/test/resources/mmri/3f/stops.txt delete mode 100644 src/test/resources/mmri/3f/trips.txt delete mode 100644 src/test/resources/mmri/3i.pb delete mode 100644 src/test/resources/mmri/3i/agency.txt delete mode 100644 src/test/resources/mmri/3i/calendar_dates.txt delete mode 100644 src/test/resources/mmri/3i/routes.txt delete mode 100644 src/test/resources/mmri/3i/stop_times.txt delete mode 100644 src/test/resources/mmri/3i/stops.txt delete mode 100644 src/test/resources/mmri/3i/trips.txt delete mode 100644 src/test/resources/mmri/plannerstack_scenario.pb delete mode 100644 src/test/resources/mmri/plannerstack_scenario/agency.txt delete mode 100644 src/test/resources/mmri/plannerstack_scenario/calendar_dates.txt delete mode 100644 src/test/resources/mmri/plannerstack_scenario/routes.txt delete mode 100644 src/test/resources/mmri/plannerstack_scenario/stop_times.txt delete mode 100644 src/test/resources/mmri/plannerstack_scenario/stops.txt delete mode 100644 src/test/resources/mmri/plannerstack_scenario/trips.txt diff --git a/src/test/java/org/opentripplanner/mmri/AllModesAndAgenciesTest.java b/src/test/java/org/opentripplanner/mmri/AllModesAndAgenciesTest.java deleted file mode 100644 index f4e0a42fe83..00000000000 --- a/src/test/java/org/opentripplanner/mmri/AllModesAndAgenciesTest.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.opentripplanner.mmri; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.opentripplanner.GtfsTest; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; - -@Disabled("Requires stop-to-stop transfers without street network") -public class AllModesAndAgenciesTest extends GtfsTest { - - @Override - public final String getFeedName() { - return "mmri/1a"; - } - - @Test - public void test1a1() { - Itinerary itinerary = plan(+1388530800L, "1a1", "1a6", null, false, false, null, "", "", 5); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[5]); - - validateLeg(legs[0], 1388530860000L, 1388530920000L, "1a2", "1a1", null); - validateLeg(legs[2], 1388530980000L, 1388531040000L, "1a4", "1a3", null); - validateLeg(legs[4], 1388531100000L, 1388531160000L, "1a6", "1a5", null); - - assertEquals("", itinerary.toStr()); - } -} diff --git a/src/test/java/org/opentripplanner/mmri/ExcludedStopsTest.java b/src/test/java/org/opentripplanner/mmri/ExcludedStopsTest.java deleted file mode 100644 index 4fe48f2c123..00000000000 --- a/src/test/java/org/opentripplanner/mmri/ExcludedStopsTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.opentripplanner.mmri; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.opentripplanner.GtfsTest; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; - -@Disabled("Requires stop banning") -public class ExcludedStopsTest extends GtfsTest { - - @Override - public final String getFeedName() { - return "mmri/3f"; - } - - @Test - public void test3f1() { - Itinerary itinerary = plan(+1388530860L, "3f1", "3f3", null, false, false, null, "", "3f2", 1); - - Leg leg = itinerary.getLegs().toArray(new Leg[1])[0]; - - validateLeg(leg, 1388530860000L, 1388531040000L, "3f3", "3f1", null); - - assertEquals("", itinerary.toStr()); - } -} diff --git a/src/test/java/org/opentripplanner/mmri/OnTripTest.java b/src/test/java/org/opentripplanner/mmri/OnTripTest.java deleted file mode 100644 index 2b0e574f352..00000000000 --- a/src/test/java/org/opentripplanner/mmri/OnTripTest.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.opentripplanner.mmri; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.opentripplanner.GtfsTest; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; - -@Disabled("Requires departing onboard trip") -public class OnTripTest extends GtfsTest { - - @Override - public final String getFeedName() { - return "mmri/2f"; - } - - @Test - public void test2f1() { - Itinerary itinerary = plan( - +1388530920L, - null, - "2f2", - "2f|intercity", - false, - false, - null, - "", - "", - 2 - ); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[2]); - - validateLeg(legs[0], 1388530920000L, 1388531040000L, "2f3", null, null); - validateLeg(legs[1], 1388531160000L, 1388531340000L, "2f2", "2f3", null); - - assertEquals("", itinerary.toStr()); - } -} diff --git a/src/test/java/org/opentripplanner/mmri/PlannerstackScenarioTest.java b/src/test/java/org/opentripplanner/mmri/PlannerstackScenarioTest.java deleted file mode 100644 index 1e0ac9b96f2..00000000000 --- a/src/test/java/org/opentripplanner/mmri/PlannerstackScenarioTest.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.opentripplanner.mmri; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.opentripplanner.GtfsTest; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; - -@Disabled("Requires departing onboard a trip") -public class PlannerstackScenarioTest extends GtfsTest { - - @Override - public final String getFeedName() { - return "mmri/plannerstack_scenario"; - } - - @Test - public void testPlannerstackScenario() { - Itinerary itinerary = plan( - +1388531220L, - null, - "plannerstack_scenario2", - "plannerstack_scenario|intercity", - false, - false, - null, - "", - "", - 2 - ); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[2]); - - validateLeg(legs[0], 1388531220000L, 1388531340000L, "plannerstack_scenario3", null, null); - validateLeg( - legs[1], - 1388531400000L, - 1388531640000L, - "plannerstack_scenario2", - "plannerstack_scenario3", - null - ); - - assertEquals("", itinerary.toStr()); - } -} diff --git a/src/test/java/org/opentripplanner/mmri/PreferencesTest.java b/src/test/java/org/opentripplanner/mmri/PreferencesTest.java index d3c55097511..c33f67345fc 100644 --- a/src/test/java/org/opentripplanner/mmri/PreferencesTest.java +++ b/src/test/java/org/opentripplanner/mmri/PreferencesTest.java @@ -1,9 +1,7 @@ package org.opentripplanner.mmri; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.transit.model.basic.TransitMode.BUS; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentripplanner.GtfsTest; import org.opentripplanner.model.plan.Itinerary; @@ -30,28 +28,4 @@ public void test2c1() { itinerary.toStr() ); } - - @Test - @Disabled - public void test2c2() { - Itinerary itinerary = plan(+1388530860L, "2c1", "2c3", null, false, false, BUS, "", "", 3); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[3]); - - validateLeg(legs[1], 1388530920000L, 1388531160000L, "2c5", "2c4", null); - - assertEquals("", itinerary.toStr()); - } - - @Test - @Disabled - public void test2c3() { - Itinerary itinerary = plan(+1388530860L, "2c1", "2c3", null, false, true, null, "", "", 3); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[3]); - - validateLeg(legs[1], 1388530920000L, 1388531160000L, "2c5", "2c4", null); - - assertEquals("", itinerary.toStr()); - } } diff --git a/src/test/java/org/opentripplanner/mmri/ServiceAlertTest.java b/src/test/java/org/opentripplanner/mmri/ServiceAlertTest.java deleted file mode 100644 index 2d35f0a246d..00000000000 --- a/src/test/java/org/opentripplanner/mmri/ServiceAlertTest.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.opentripplanner.mmri; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.opentripplanner.GtfsTest; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; - -@Disabled("Service alerts not mapped correctly") -public class ServiceAlertTest extends GtfsTest { - - @Override - public final String getFeedName() { - return "mmri/3i"; - } - - @Test - public void test3i1() { - Itinerary itinerary = plan(+1388530860L, "3i1", "3i2", null, false, false, null, "", "", 1); - - Leg leg = itinerary.getLegs().toArray(new Leg[1])[0]; - - validateLeg(leg, 1388530860000L, 1388530920000L, "3i2", "3i1", "Unknown effect"); - - assertEquals("", itinerary.toStr()); - } -} diff --git a/src/test/java/org/opentripplanner/mmri/TimeTest.java b/src/test/java/org/opentripplanner/mmri/TimeTest.java index 77123d3e656..90be00a56bb 100644 --- a/src/test/java/org/opentripplanner/mmri/TimeTest.java +++ b/src/test/java/org/opentripplanner/mmri/TimeTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentripplanner.GtfsTest; import org.opentripplanner.model.plan.Itinerary; @@ -37,30 +36,6 @@ public void test1g2() { assertEquals("Stop 1g1 ~ BUS bus 0:01 0:02 ~ Stop 1g2 [C₁90]", itinerary.toStr()); } - @Test - @Disabled - public void test1g3() { - Itinerary itinerary = plan(+1388617380L, "1g1", "1g2", null, false, false, null, "", "", 1); - - Leg leg = itinerary.getLegs().toArray(new Leg[1])[0]; - - validateLeg(leg, 1388703660000L, 1388703720000L, "1g2", "1g1", null); - - assertEquals("", itinerary.toStr()); - } - - @Test - @Disabled - public void test1g4() { - Itinerary itinerary = plan(-1388617440L, "1g1", "1g2", null, false, false, null, "", "", 1); - - Leg leg = itinerary.getLegs().toArray(new Leg[1])[0]; - - validateLeg(leg, 1388531100000L, 1388531160000L, "1g2", "1g1", null); - - assertEquals("", itinerary.toStr()); - } - @Test public void test1g5() { Itinerary itinerary = plan(+1388703780L, "1g1", "1g2", null, false, false, null, "", "", 1); diff --git a/src/test/java/org/opentripplanner/mmri/TransferTimeTest.java b/src/test/java/org/opentripplanner/mmri/TransferTimeTest.java deleted file mode 100644 index 9b0fc12cf37..00000000000 --- a/src/test/java/org/opentripplanner/mmri/TransferTimeTest.java +++ /dev/null @@ -1,54 +0,0 @@ -package org.opentripplanner.mmri; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import org.junit.jupiter.api.Disabled; -import org.junit.jupiter.api.Test; -import org.opentripplanner.GtfsTest; -import org.opentripplanner.model.plan.Itinerary; -import org.opentripplanner.model.plan.Leg; - -@Disabled -public class TransferTimeTest extends GtfsTest { - - @Override - public final String getFeedName() { - return "mmri/2a2"; - } - - @Test - public void test2a3() { - Itinerary itinerary = plan(+1388530860L, "2a3", "2a6", null, false, false, null, "", "", 3); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[3]); - - validateLeg(legs[0], 1388530860000L, 1388530920000L, "2a4", "2a3", null); - validateLeg(legs[2], 1388531280000L, 1388531340000L, "2a6", "2a5", null); - - assertEquals("", itinerary.toStr()); - } - - @Test - public void test2a4() { - Itinerary itinerary = plan(+1388530920L, "2a3", "2a6", null, false, false, null, "", "", 3); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[3]); - - validateLeg(legs[0], 1388531040000L, 1388531100000L, "2a4", "2a3", null); - validateLeg(legs[2], 1388531400000L, 1388531460000L, "2a6", "2a5", null); - - assertEquals("", itinerary.toStr()); - } - - @Test - public void test2a5() { - Itinerary itinerary = plan(-1388531460L, "2a3", "2a6", null, false, false, null, "", "", 3); - - Leg[] legs = itinerary.getLegs().toArray(new Leg[3]); - - validateLeg(legs[0], 1388531040000L, 1388531100000L, "2a4", "2a3", null); - validateLeg(legs[2], 1388531400000L, 1388531460000L, "2a6", "2a5", null); - - assertEquals("", itinerary.toStr()); - } -} diff --git a/src/test/resources/mmri/1a/agency.txt b/src/test/resources/mmri/1a/agency.txt deleted file mode 100644 index d6f92d6af7f..00000000000 --- a/src/test/resources/mmri/1a/agency.txt +++ /dev/null @@ -1,2 +0,0 @@ -agency_id,agency_name,agency_url,agency_timezone,agency_lang -MMRI,Multimodale Reisinformatie,http://mmri.nl/,Europe/Amsterdam,nl diff --git a/src/test/resources/mmri/1a/calendar_dates.txt b/src/test/resources/mmri/1a/calendar_dates.txt deleted file mode 100644 index bc0abe90518..00000000000 --- a/src/test/resources/mmri/1a/calendar_dates.txt +++ /dev/null @@ -1,4 +0,0 @@ -date,service_id,exception_type -20140101,1a|bus|1,1 -20140101,1a|ferry|1,1 -20140101,1a|train|1,1 diff --git a/src/test/resources/mmri/1a/routes.txt b/src/test/resources/mmri/1a/routes.txt deleted file mode 100644 index 130126398bf..00000000000 --- a/src/test/resources/mmri/1a/routes.txt +++ /dev/null @@ -1,4 +0,0 @@ -agency_id,route_id,route_short_name,route_long_name,route_type -MMRI,1a|bus,bus,,3 -MMRI,1a|ferry,ferry,,4 -MMRI,1a|train,train,,2 diff --git a/src/test/resources/mmri/1a/stop_times.txt b/src/test/resources/mmri/1a/stop_times.txt deleted file mode 100644 index 280a530103d..00000000000 --- a/src/test/resources/mmri/1a/stop_times.txt +++ /dev/null @@ -1,7 +0,0 @@ -trip_id,arrival_time,departure_time,stop_id,stop_sequence -1a|bus|1,00:01:00,00:01:00,1a1,1 -1a|bus|1,00:02:00,00:02:00,1a2,2 -1a|ferry|1,00:03:00,00:03:00,1a3,3 -1a|ferry|1,00:04:00,00:04:00,1a4,4 -1a|train|1,00:05:00,00:05:00,1a5,5 -1a|train|1,00:06:00,00:06:00,1a6,6 diff --git a/src/test/resources/mmri/1a/stops.txt b/src/test/resources/mmri/1a/stops.txt deleted file mode 100644 index 11b92589dd2..00000000000 --- a/src/test/resources/mmri/1a/stops.txt +++ /dev/null @@ -1,7 +0,0 @@ -stop_id,stop_name,stop_lat,stop_lon -1a1,Stop 1a1,1.101,1.1 -1a2,Stop 1a2,1.102,1.1 -1a3,Stop 1a3,1.103,1.1 -1a4,Stop 1a4,1.104,1.1 -1a5,Stop 1a5,1.105,1.1 -1a6,Stop 1a6,1.106,1.1 diff --git a/src/test/resources/mmri/1a/transfers.txt b/src/test/resources/mmri/1a/transfers.txt deleted file mode 100644 index 9bdfd232de9..00000000000 --- a/src/test/resources/mmri/1a/transfers.txt +++ /dev/null @@ -1,3 +0,0 @@ -from_stop_id,to_stop_id,transfer_type,min_transfer_time -1a2,1a3,2,0 -1a4,1a5,2,0 diff --git a/src/test/resources/mmri/1a/trips.txt b/src/test/resources/mmri/1a/trips.txt deleted file mode 100644 index 4573658c9a5..00000000000 --- a/src/test/resources/mmri/1a/trips.txt +++ /dev/null @@ -1,4 +0,0 @@ -route_id,service_id,trip_id -1a|bus,1a|bus|1,1a|bus|1 -1a|ferry,1a|ferry|1,1a|ferry|1 -1a|train,1a|train|1,1a|train|1 diff --git a/src/test/resources/mmri/2a2/agency.txt b/src/test/resources/mmri/2a2/agency.txt deleted file mode 100644 index d6f92d6af7f..00000000000 --- a/src/test/resources/mmri/2a2/agency.txt +++ /dev/null @@ -1,2 +0,0 @@ -agency_id,agency_name,agency_url,agency_timezone,agency_lang -MMRI,Multimodale Reisinformatie,http://mmri.nl/,Europe/Amsterdam,nl diff --git a/src/test/resources/mmri/2a2/calendar_dates.txt b/src/test/resources/mmri/2a2/calendar_dates.txt deleted file mode 100644 index 2461c7fe35f..00000000000 --- a/src/test/resources/mmri/2a2/calendar_dates.txt +++ /dev/null @@ -1,2 +0,0 @@ -date,service_id,exception_type -20140101,ignore,1 diff --git a/src/test/resources/mmri/2a2/routes.txt b/src/test/resources/mmri/2a2/routes.txt deleted file mode 100644 index f8da6695081..00000000000 --- a/src/test/resources/mmri/2a2/routes.txt +++ /dev/null @@ -1,3 +0,0 @@ -agency_id,route_id,route_short_name,route_long_name,route_type -MMRI,2a2|bus|1,bus 1,,3 -MMRI,2a2|bus|2,bus 2,,3 diff --git a/src/test/resources/mmri/2a2/stop_times.txt b/src/test/resources/mmri/2a2/stop_times.txt deleted file mode 100644 index a3bb8933370..00000000000 --- a/src/test/resources/mmri/2a2/stop_times.txt +++ /dev/null @@ -1,15 +0,0 @@ -trip_id,arrival_time,departure_time,stop_id,stop_sequence -2a2|bus|1|1,00:01:00,00:01:00,2a3,1 -2a2|bus|1|1,00:02:00,00:02:00,2a4,2 -2a2|bus|1|2,00:04:00,00:04:00,2a3,1 -2a2|bus|1|2,00:05:00,00:05:00,2a4,2 -2a2|bus|1|3,00:07:00,00:07:00,2a3,1 -2a2|bus|1|3,00:08:00,00:08:00,2a4,2 -2a2|bus|2|1,00:02:00,00:02:00,2a5,1 -2a2|bus|2|1,00:03:00,00:03:00,2a6,2 -2a2|bus|2|2,00:05:00,00:05:00,2a5,1 -2a2|bus|2|2,00:06:00,00:06:00,2a6,2 -2a2|bus|2|3,00:08:00,00:08:00,2a5,1 -2a2|bus|2|3,00:09:00,00:09:00,2a6,2 -2a2|bus|2|4,00:10:00,00:10:00,2a5,1 -2a2|bus|2|4,00:11:00,00:11:00,2a6,2 \ No newline at end of file diff --git a/src/test/resources/mmri/2a2/stops.txt b/src/test/resources/mmri/2a2/stops.txt deleted file mode 100644 index c3c457bc753..00000000000 --- a/src/test/resources/mmri/2a2/stops.txt +++ /dev/null @@ -1,5 +0,0 @@ -stop_id,stop_name,stop_lat,stop_lon -2a3,Stop 2a3,2.103,2.102 -2a4,Stop 2a4,2.104,2.102 -2a5,Stop 2a5,2.105,2.102 -2a6,Stop 2a6,2.106,2.102 diff --git a/src/test/resources/mmri/2a2/transfers.txt b/src/test/resources/mmri/2a2/transfers.txt deleted file mode 100644 index 4ec2f4adf41..00000000000 --- a/src/test/resources/mmri/2a2/transfers.txt +++ /dev/null @@ -1,2 +0,0 @@ -from_stop_id,to_stop_id,transfer_type,min_transfer_time -2a4,2a5,2,300 diff --git a/src/test/resources/mmri/2a2/trips.txt b/src/test/resources/mmri/2a2/trips.txt deleted file mode 100644 index 1a8f2a56fdc..00000000000 --- a/src/test/resources/mmri/2a2/trips.txt +++ /dev/null @@ -1,8 +0,0 @@ -route_id,service_id,trip_id -2a2|bus|1,ignore,2a2|bus|1|1 -2a2|bus|1,ignore,2a2|bus|1|2 -2a2|bus|1,ignore,2a2|bus|1|3 -2a2|bus|2,ignore,2a2|bus|2|1 -2a2|bus|2,ignore,2a2|bus|2|2 -2a2|bus|2,ignore,2a2|bus|2|3 -2a2|bus|2,ignore,2a2|bus|2|4 \ No newline at end of file diff --git a/src/test/resources/mmri/2f/agency.txt b/src/test/resources/mmri/2f/agency.txt deleted file mode 100644 index d6f92d6af7f..00000000000 --- a/src/test/resources/mmri/2f/agency.txt +++ /dev/null @@ -1,2 +0,0 @@ -agency_id,agency_name,agency_url,agency_timezone,agency_lang -MMRI,Multimodale Reisinformatie,http://mmri.nl/,Europe/Amsterdam,nl diff --git a/src/test/resources/mmri/2f/calendar_dates.txt b/src/test/resources/mmri/2f/calendar_dates.txt deleted file mode 100644 index 2461c7fe35f..00000000000 --- a/src/test/resources/mmri/2f/calendar_dates.txt +++ /dev/null @@ -1,2 +0,0 @@ -date,service_id,exception_type -20140101,ignore,1 diff --git a/src/test/resources/mmri/2f/routes.txt b/src/test/resources/mmri/2f/routes.txt deleted file mode 100644 index 5875e0081d4..00000000000 --- a/src/test/resources/mmri/2f/routes.txt +++ /dev/null @@ -1,4 +0,0 @@ -agency_id,route_id,route_short_name,route_long_name,route_type -MMRI,2f|intercity,,Intercity,2 -MMRI,2f|slt|1,,Local train 1,2 -MMRI,2f|slt|2,,Local train 2,2 diff --git a/src/test/resources/mmri/2f/stop_times.txt b/src/test/resources/mmri/2f/stop_times.txt deleted file mode 100644 index 559d84d992f..00000000000 --- a/src/test/resources/mmri/2f/stop_times.txt +++ /dev/null @@ -1,9 +0,0 @@ -trip_id,arrival_time,departure_time,stop_id,stop_sequence -2f|intercity,00:01:00,00:01:00,2f1,1 -2f|intercity,00:04:00,00:04:00,2f3,2 -2f|slt|1,00:01:00,00:01:00,2f1,1 -2f|slt|1,00:03:00,00:03:00,2f2,2 -2f|slt|1,00:05:00,00:05:00,2f3,3 -2f|slt|2,00:06:00,00:06:00,2f3,1 -2f|slt|2,00:09:00,00:09:00,2f2,2 -2f|slt|2,00:11:00,00:11:00,2f1,3 diff --git a/src/test/resources/mmri/2f/stops.txt b/src/test/resources/mmri/2f/stops.txt deleted file mode 100644 index 538a3240e55..00000000000 --- a/src/test/resources/mmri/2f/stops.txt +++ /dev/null @@ -1,4 +0,0 @@ -stop_id,stop_name,stop_lat,stop_lon -2f1,Stop 2f1,2.701,2.700 -2f2,Stop 2f2,2.702,2.700 -2f3,Stop 2f3,2.703,2.700 diff --git a/src/test/resources/mmri/2f/trips.txt b/src/test/resources/mmri/2f/trips.txt deleted file mode 100644 index f9dba48f134..00000000000 --- a/src/test/resources/mmri/2f/trips.txt +++ /dev/null @@ -1,4 +0,0 @@ -route_id,service_id,trip_id -2f|intercity,ignore,2f|intercity -2f|slt|1,ignore,2f|slt|1 -2f|slt|2,ignore,2f|slt|2 diff --git a/src/test/resources/mmri/3f/agency.txt b/src/test/resources/mmri/3f/agency.txt deleted file mode 100644 index d6f92d6af7f..00000000000 --- a/src/test/resources/mmri/3f/agency.txt +++ /dev/null @@ -1,2 +0,0 @@ -agency_id,agency_name,agency_url,agency_timezone,agency_lang -MMRI,Multimodale Reisinformatie,http://mmri.nl/,Europe/Amsterdam,nl diff --git a/src/test/resources/mmri/3f/calendar_dates.txt b/src/test/resources/mmri/3f/calendar_dates.txt deleted file mode 100644 index 2461c7fe35f..00000000000 --- a/src/test/resources/mmri/3f/calendar_dates.txt +++ /dev/null @@ -1,2 +0,0 @@ -date,service_id,exception_type -20140101,ignore,1 diff --git a/src/test/resources/mmri/3f/routes.txt b/src/test/resources/mmri/3f/routes.txt deleted file mode 100644 index 33917fc7217..00000000000 --- a/src/test/resources/mmri/3f/routes.txt +++ /dev/null @@ -1,3 +0,0 @@ -agency_id,route_id,route_short_name,route_long_name,route_type -MMRI,3f|1,,Intercity 1,2 -MMRI,3f|2,,Intercity 2,2 diff --git a/src/test/resources/mmri/3f/stop_times.txt b/src/test/resources/mmri/3f/stop_times.txt deleted file mode 100644 index 563936db238..00000000000 --- a/src/test/resources/mmri/3f/stop_times.txt +++ /dev/null @@ -1,7 +0,0 @@ -trip_id,arrival_time,departure_time,stop_id,stop_sequence -3f|1,00:01:00,00:01:00,3f1,1 -3f|1,00:02:00,00:02:00,3f2,2 -3f|1,00:03:00,00:03:00,3f3,3 -3f|2,00:01:00,00:01:00,3f1,1 -3f|2,00:02:00,00:02:00,3f4,2 -3f|2,00:04:00,00:04:00,3f3,3 diff --git a/src/test/resources/mmri/3f/stops.txt b/src/test/resources/mmri/3f/stops.txt deleted file mode 100644 index 7ccbea9059f..00000000000 --- a/src/test/resources/mmri/3f/stops.txt +++ /dev/null @@ -1,5 +0,0 @@ -stop_id,stop_name,stop_lat,stop_lon -3f1,Stop 3f1,3.601,3.602 -3f2,Stop 3f2,3.602,3.601 -3f3,Stop 3f3,3.603,3.602 -3f4,Stop 3f4,3.602,3.603 diff --git a/src/test/resources/mmri/3f/trips.txt b/src/test/resources/mmri/3f/trips.txt deleted file mode 100644 index c16ec0732bb..00000000000 --- a/src/test/resources/mmri/3f/trips.txt +++ /dev/null @@ -1,3 +0,0 @@ -route_id,service_id,trip_id -3f|1,ignore,3f|1 -3f|2,ignore,3f|2 diff --git a/src/test/resources/mmri/3i.pb b/src/test/resources/mmri/3i.pb deleted file mode 100644 index f03fd3dc6bff1eaaf69b7a3a966c5243e0a854e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 51 zcmd<$ Date: Tue, 28 May 2024 16:22:31 +0200 Subject: [PATCH 1221/1688] refactor: Small cleanups --- .../template/FlexTemplateFactoryTest.java | 4 +-- .../opentripplanner/ext/flex/FlexRouter.java | 3 ++- .../flex/template/AbstractFlexTemplate.java | 10 ++++---- .../ext/flex/template/ClosestTrip.java | 2 +- .../ext/flex/template/FlexServiceDate.java | 25 ++++++++++--------- .../ext/flex/trip/UnscheduledTrip.java | 1 - 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index 8fe26b2718a..ba8f38f4c9b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -101,7 +101,7 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction assertEquals(1, template.toStopIndex); assertSame(CALCULATOR, template.calculator); assertSame(STOP_B, template.transferStop); - assertSame(DATE.serviceDate, template.serviceDate); + assertSame(DATE.serviceDate(), template.serviceDate); assertEquals(SERVICE_TIME_OFFSET, template.secondsFromStartOfTime); assertEquals(1, subject.size(), subject::toString); @@ -133,7 +133,7 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction assertEquals(1, template.toStopIndex); assertSame(CALCULATOR, template.calculator); assertSame(STOP_A, template.transferStop); - assertSame(DATE.serviceDate, template.serviceDate); + assertSame(DATE.serviceDate(), template.serviceDate); assertEquals(SERVICE_TIME_OFFSET, template.secondsFromStartOfTime); assertEquals(1, subject.size(), subject::toString); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 9170eabb8cf..9e0600fb312 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -198,7 +198,8 @@ public Collection getTransfersToStop(StopLocation stop) { @Override public boolean isDateActive(FlexServiceDate date, FlexTrip trip) { - return date.isFlexTripRunning(trip, transitService); + int serviceCode = transitService.getServiceCodeForId(trip.getTrip().getServiceId()); + return date.isTripServiceRunning(serviceCode); } } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 3e83449df16..e386331352c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -42,11 +42,11 @@ abstract class AbstractFlexTemplate { // - this apply to transferStop as well. protected final NearbyStop accessEgress; protected final FlexTrip trip; - public final int fromStopIndex; - public final int toStopIndex; + protected final int fromStopIndex; + protected final int toStopIndex; protected final StopLocation transferStop; protected final int secondsFromStartOfTime; - public final LocalDate serviceDate; + protected final LocalDate serviceDate; protected final FlexPathCalculator calculator; private final Duration maxTransferDuration; @@ -77,8 +77,8 @@ abstract class AbstractFlexTemplate { this.fromStopIndex = boardStopPosition; this.toStopIndex = alightStopPosition; this.transferStop = transferStop; - this.secondsFromStartOfTime = date.secondsFromStartOfTime; - this.serviceDate = date.serviceDate; + this.secondsFromStartOfTime = date.secondsFromStartOfTime(); + this.serviceDate = date.serviceDate(); this.calculator = calculator; this.maxTransferDuration = maxTransferDuration; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java index b0094c976ba..0e360fc6395 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java @@ -19,7 +19,7 @@ record ClosestTrip( int stopPos, FlexServiceDate activeDate ) { - public ClosestTrip( + ClosestTrip( NearbyStop nearbyStop, FlexTrip flexTrip, int stopPos, diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java index 5019defefcd..56fc3498047 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java @@ -2,8 +2,6 @@ import gnu.trove.set.TIntSet; import java.time.LocalDate; -import org.opentripplanner.ext.flex.trip.FlexTrip; -import org.opentripplanner.transit.service.TransitService; /** * This class contains information used in a flex router, and depends on the date the search was @@ -12,16 +10,16 @@ public class FlexServiceDate { /** The local date */ - public final LocalDate serviceDate; + private final LocalDate serviceDate; /** * How many seconds does this date's "midnight" (12 hours before noon) differ from the "midnight" * of the date for the search. */ - public final int secondsFromStartOfTime; + private final int secondsFromStartOfTime; /** Which services are running on the date. */ - public final TIntSet servicesRunning; + private final TIntSet servicesRunning; public FlexServiceDate( LocalDate serviceDate, @@ -33,12 +31,15 @@ public FlexServiceDate( this.servicesRunning = servicesRunning; } - public boolean isFlexTripRunning(FlexTrip flexTrip, TransitService transitService) { - return ( - servicesRunning != null && - servicesRunning.contains( - transitService.getServiceCodeForId(flexTrip.getTrip().getServiceId()) - ) - ); + LocalDate serviceDate() { + return serviceDate; + } + + int secondsFromStartOfTime() { + return secondsFromStartOfTime; + } + + public boolean isTripServiceRunning(int serviceCode) { + return (servicesRunning != null && servicesRunning.contains(serviceCode)); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 09da0c87112..11df0381f4e 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -10,7 +10,6 @@ import java.util.Set; import java.util.function.Predicate; import java.util.stream.Collectors; -import java.util.stream.Stream; import javax.annotation.Nonnull; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.TimePenaltyCalculator; From 3d8a392549484a965be318468ba052ea9a57a91a Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 28 May 2024 16:19:08 +0200 Subject: [PATCH 1222/1688] Apply review suggestions --- .../ext/siri/SiriEtBuilder.java | 22 +++++----- .../siri/SiriTimetableSnapshotSourceTest.java | 40 +++++++++++++++---- 2 files changed, 44 insertions(+), 18 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java index a82283f0b48..a81f1377e31 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java @@ -248,21 +248,23 @@ public EstimatedCallsBuilder call(StopLocation stop) { public EstimatedCallsBuilder arriveAimedExpected(String aimedTime, String expectedTime) { var call = calls.getLast(); - call.setAimedArrivalTime(aimedTime == null ? null : dateTimeHelper.zonedDateTime(aimedTime)); - call.setExpectedArrivalTime( - expectedTime == null ? null : dateTimeHelper.zonedDateTime(expectedTime) - ); + if (aimedTime != null) { + call.setAimedArrivalTime(dateTimeHelper.zonedDateTime(aimedTime)); + } + if (expectedTime != null) { + call.setExpectedArrivalTime(dateTimeHelper.zonedDateTime(expectedTime)); + } return this; } public EstimatedCallsBuilder departAimedExpected(String aimedTime, String expectedTime) { var call = calls.getLast(); - call.setAimedDepartureTime( - aimedTime == null ? null : dateTimeHelper.zonedDateTime(aimedTime) - ); - call.setExpectedDepartureTime( - expectedTime == null ? null : dateTimeHelper.zonedDateTime(expectedTime) - ); + if (aimedTime != null) { + call.setAimedDepartureTime(dateTimeHelper.zonedDateTime(aimedTime)); + } + if (expectedTime != null) { + call.setExpectedDepartureTime(dateTimeHelper.zonedDateTime(expectedTime)); + } return this; } diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 3ca345c3fed..ecc44c8d913 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -9,7 +9,6 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentripplanner.DateTimeHelper; @@ -41,15 +40,10 @@ class SiriTimetableSnapshotSourceTest { - private RealtimeTestEnvironment env; - - @BeforeEach - void setUp() { - env = new RealtimeTestEnvironment(); - } - @Test void testCancelTrip() { + var env = new RealtimeTestEnvironment(); + assertEquals(RealTimeState.SCHEDULED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); var updates = new SiriEtBuilder(env.getDateTimeHelper()) @@ -65,6 +59,8 @@ void testCancelTrip() { @Test void testAddJourney() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) @@ -85,6 +81,8 @@ void testAddJourney() { @Test void testReplaceJourney() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) @@ -117,6 +115,8 @@ void testReplaceJourney() { */ @Test void testUpdateJourneyWithDatedVehicleJourneyRef() { + var env = new RealtimeTestEnvironment(); + var updates = updatedJourneyBuilder(env) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .buildEstimatedTimetableDeliveries(); @@ -130,6 +130,8 @@ void testUpdateJourneyWithDatedVehicleJourneyRef() { */ @Test void testUpdateJourneyWithFramedVehicleJourneyRef() { + var env = new RealtimeTestEnvironment(); + var updates = updatedJourneyBuilder(env) .withFramedVehicleJourneyRef(builder -> builder.withServiceDate(env.serviceDate).withVehicleJourneyRef(env.trip1.getId().getId()) @@ -145,6 +147,8 @@ void testUpdateJourneyWithFramedVehicleJourneyRef() { */ @Test void testUpdateJourneyWithoutJourneyRef() { + var env = new RealtimeTestEnvironment(); + var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); assertEquals(0, result.successful()); @@ -155,6 +159,8 @@ void testUpdateJourneyWithoutJourneyRef() { */ @Test void testUpdateJourneyWithFuzzyMatching() { + var env = new RealtimeTestEnvironment(); + var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetableWithFuzzyMatcher(updates); assertEquals(1, result.successful()); @@ -167,6 +173,8 @@ void testUpdateJourneyWithFuzzyMatching() { */ @Test void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withFramedVehicleJourneyRef(builder -> builder.withServiceDate(env.serviceDate).withVehicleJourneyRef("XXX") @@ -189,6 +197,8 @@ void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { */ @Test void testChangeQuay() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> @@ -215,6 +225,8 @@ void testChangeQuay() { @Test void testCancelStop() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip2.getId().getId()) .withEstimatedCalls(builder -> @@ -243,6 +255,8 @@ void testCancelStop() { @Test @Disabled("Not supported yet") void testAddStop() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> @@ -287,6 +301,8 @@ void testAddStop() { @Test void testNotMonitored() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withMonitored(false) .buildEstimatedTimetableDeliveries(); @@ -298,6 +314,8 @@ void testNotMonitored() { @Test void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef("newJourney") .withIsExtraJourney(true) @@ -321,6 +339,8 @@ void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { @Test void testNegativeHopTime() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> @@ -339,6 +359,8 @@ void testNegativeHopTime() { @Test void testNegativeDwellTime() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip2.getId().getId()) .withRecordedCalls(builder -> @@ -362,6 +384,8 @@ void testNegativeDwellTime() { @Test @Disabled("Not supported yet") void testExtraUnknownStop() { + var env = new RealtimeTestEnvironment(); + var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withEstimatedCalls(builder -> From 668851459a7499332f88a7489454c1af361a6f5d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 28 May 2024 16:31:03 +0200 Subject: [PATCH 1223/1688] refactor: Remove booking info restrictions on access/egress. --- .../ext/flex/FlexAccessEgress.java | 28 --- .../raptoradapter/router/TransitRouter.java | 12 - .../BookingRestrictionAccessEgress.java | 155 ------------- .../transit/FlexAccessEgressAdapter.java | 7 - .../transit/RoutingAccessEgress.java | 9 - .../timetable/booking/RoutingBookingInfo.java | 203 ----------------- .../booking/RoutingBookingInfoTest.java | 211 ------------------ 7 files changed, 625 deletions(-) delete mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java delete mode 100644 src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java delete mode 100644 src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index f7ccd441185..50791b32561 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -3,13 +3,10 @@ import static org.opentripplanner.model.StopTime.MISSING_VALUE; import java.util.Objects; -import java.util.Optional; -import javax.annotation.Nullable; import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; public final class FlexAccessEgress { @@ -21,9 +18,6 @@ public final class FlexAccessEgress { private final State lastState; private final boolean stopReachedOnBoard; - @Nullable - private final RoutingBookingInfo routingBookingInfo; - public FlexAccessEgress( RegularStop stop, FlexPathDurations pathDurations, @@ -40,7 +34,6 @@ public FlexAccessEgress( this.trip = Objects.requireNonNull(trip); this.lastState = lastState; this.stopReachedOnBoard = stopReachedOnBoard; - this.routingBookingInfo = createRoutingBookingInfo().orElse(null); } public RegularStop stop() { @@ -83,14 +76,6 @@ public int latestArrivalTime(int arrivalTime) { return pathDurations.mapToRouterArrivalTime(latestArrivalTime); } - /** - * Return routing booking info for the boarding stop. Empty, if there are not any - * booking restrictions, witch applies to routing. - */ - public Optional routingBookingInfo() { - return Optional.ofNullable(routingBookingInfo); - } - @Override public String toString() { return ToStringBuilder @@ -104,17 +89,4 @@ public String toString() { .addBoolIfTrue("stopReachedOnBoard", stopReachedOnBoard) .toString(); } - - private Optional createRoutingBookingInfo() { - var bookingInfo = trip.getPickupBookingInfo(fromStopIndex); - if (bookingInfo == null) { - return Optional.empty(); - } - return RoutingBookingInfo - .of() - .withBookingInfo(bookingInfo) - .withLegDurationInSeconds(pathDurations.total()) - .withTimeOffsetInSeconds(pathDurations.access()) - .build(); - } } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 416e0159944..6a1404c3039 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -1,9 +1,7 @@ package org.opentripplanner.routing.algorithm.raptoradapter.router; -import static org.opentripplanner.framework.time.TimeUtils.toTransitTimeSeconds; import static org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType.ACCESS; import static org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressType.EGRESS; -import static org.opentripplanner.routing.algorithm.raptoradapter.transit.BookingRestrictionAccessEgress.decorateAccessEgressBookingRestriction; import java.time.Duration; import java.time.Instant; @@ -277,16 +275,6 @@ private Collection fetchAccessEgresses(AccessEgre results.addAll(AccessEgressMapper.mapFlexAccessEgresses(flexAccessList, type.isEgress())); } - if (request.bookingTime() != null) { - int requestedBookingTime = toTransitTimeSeconds(transitSearchTimeZero, request.bookingTime()); - return results - .stream() - .map(accessEgress -> - decorateAccessEgressBookingRestriction(accessEgress, requestedBookingTime) - ) - .toList(); - } - return results; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java deleted file mode 100644 index 71c864b4ecb..00000000000 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/BookingRestrictionAccessEgress.java +++ /dev/null @@ -1,155 +0,0 @@ -package org.opentripplanner.routing.algorithm.raptoradapter.transit; - -import static org.opentripplanner.raptor.api.model.RaptorConstants.TIME_NOT_SET; - -import javax.annotation.Nullable; -import org.opentripplanner.framework.model.TimeAndCost; -import org.opentripplanner.street.search.state.State; -import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; - -public class BookingRestrictionAccessEgress implements RoutingAccessEgress { - - private final RoutingAccessEgress delegate; - - /** - * The requested time the passenger will book the trip. Normally, this is when the search is - * performed plus a small grace period to allow the user to complete the booking. - */ - private final int requestedBookingTime; - - private final RoutingBookingInfo bookingInfo; - - public BookingRestrictionAccessEgress( - RoutingAccessEgress delegate, - RoutingBookingInfo bookingInfo, - int requestedBookingTime - ) { - this.delegate = delegate; - this.requestedBookingTime = requestedBookingTime; - this.bookingInfo = bookingInfo; - } - - public static RoutingAccessEgress decorateAccessEgressBookingRestriction( - RoutingAccessEgress accessEgress, - int requestedBookingTime - ) { - var bookingInfo = accessEgress.routingBookingInfo(); - return bookingInfo.isPresent() - ? new BookingRestrictionAccessEgress(accessEgress, bookingInfo.get(), requestedBookingTime) - : accessEgress; - } - - @Override - public int stop() { - return delegate.stop(); - } - - @Override - public int c1() { - return delegate.c1(); - } - - @Override - public int durationInSeconds() { - return delegate.durationInSeconds(); - } - - @Override - public int earliestDepartureTime(int requestedDepartureTime) { - int edt = delegate.earliestDepartureTime(requestedDepartureTime); - if (edt == TIME_NOT_SET) { - return TIME_NOT_SET; - } - if (bookingInfo.isThereEnoughTimeToBookForDeparture(edt, requestedBookingTime)) { - return edt; - } - return TIME_NOT_SET; - } - - @Override - public int latestArrivalTime(int requestedArrivalTime) { - var lat = delegate.latestArrivalTime(requestedArrivalTime); - if (lat == TIME_NOT_SET) { - return TIME_NOT_SET; - } - if (bookingInfo.isThereEnoughTimeToBookForArrival(lat, requestedBookingTime)) { - return lat; - } - return TIME_NOT_SET; - } - - @Override - public boolean hasOpeningHours() { - return delegate.hasOpeningHours(); - } - - @Override - @Nullable - public String openingHoursToString() { - return delegate.openingHoursToString(); - } - - @Override - public int numberOfRides() { - return delegate.numberOfRides(); - } - - @Override - public boolean hasRides() { - return delegate.hasRides(); - } - - @Override - public boolean stopReachedOnBoard() { - return delegate.stopReachedOnBoard(); - } - - @Override - public boolean stopReachedByWalking() { - return delegate.stopReachedByWalking(); - } - - @Override - public boolean isFree() { - return delegate.isFree(); - } - - @Override - public String defaultToString() { - return delegate.defaultToString(); - } - - @Override - public String asString(boolean includeStop, boolean includeCost, @Nullable String summary) { - return delegate.asString(includeStop, includeCost, summary); - } - - @Override - public RoutingAccessEgress withPenalty(TimeAndCost penalty) { - return new BookingRestrictionAccessEgress( - delegate.withPenalty(penalty), - bookingInfo, - requestedBookingTime - ); - } - - @Override - public State getLastState() { - return delegate.getLastState(); - } - - @Override - public boolean isWalkOnly() { - return delegate.isWalkOnly(); - } - - @Override - public boolean hasPenalty() { - return delegate.hasPenalty(); - } - - @Override - public TimeAndCost penalty() { - return delegate.penalty(); - } -} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java index fae11497c84..04f51e76681 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/FlexAccessEgressAdapter.java @@ -1,11 +1,9 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit; -import java.util.Optional; import org.opentripplanner.ext.flex.FlexAccessEgress; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.model.StopTime; import org.opentripplanner.raptor.api.model.RaptorConstants; -import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * This class is used to adapt the FlexAccessEgress into a time-dependent multi-leg DefaultAccessEgress. @@ -65,11 +63,6 @@ public RoutingAccessEgress withPenalty(TimeAndCost penalty) { return new FlexAccessEgressAdapter(this, penalty); } - @Override - public Optional routingBookingInfo() { - return flexAccessEgress.routingBookingInfo(); - } - private static int mapToRaptorTime(int flexTime) { return flexTime == StopTime.MISSING_VALUE ? RaptorConstants.TIME_NOT_SET : flexTime; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java index debf5ac17ed..d22ec0f71f9 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/RoutingAccessEgress.java @@ -1,10 +1,8 @@ package org.opentripplanner.routing.algorithm.raptoradapter.transit; -import java.util.Optional; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.raptor.api.model.RaptorAccessEgress; import org.opentripplanner.street.search.state.State; -import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * Encapsulate information about an access or egress path. This interface extends @@ -32,11 +30,4 @@ public interface RoutingAccessEgress extends RaptorAccessEgress { boolean hasPenalty(); TimeAndCost penalty(); - - /** - * Booking info enforced by the router. By default nothing is returned. - */ - default Optional routingBookingInfo() { - return Optional.empty(); - } } diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java deleted file mode 100644 index e3e0c8feb93..00000000000 --- a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java +++ /dev/null @@ -1,203 +0,0 @@ -package org.opentripplanner.transit.model.timetable.booking; - -import java.util.Objects; -import java.util.Optional; -import org.opentripplanner.framework.lang.IntUtils; -import org.opentripplanner.framework.tostring.ToStringBuilder; - -/** - * This is the contract between booking info and the router. The router will enforce - * this information if the request sets the earliest-booking-time request parameter. - *

              - * Both {@code latestBookingTime} and {@code minimumBookingNotice} can be {@code null}, - * but at least one ot them must be none {@code null}. - *

              - * This class is not used by Raptor directly, but used by the BookingTimeAccessEgress with - * implement the RaptorAccessEgress interface. - */ -public final class RoutingBookingInfo { - - private static final int NOT_SET = -1_999_999; - - private final int latestBookingTime; - private final int minimumBookingNotice; - private final int legDurationInSeconds; - private final int timeOffsetInSeconds; - - private RoutingBookingInfo( - int latestBookingTime, - int minimumBookingNotice, - int legDurationInSeconds, - int timeOffsetInSeconds - ) { - if (latestBookingTime == NOT_SET && minimumBookingNotice == NOT_SET) { - throw new IllegalArgumentException( - "Either latestBookingTime or minimumBookingNotice must be set." - ); - } - this.latestBookingTime = latestBookingTime; - this.minimumBookingNotice = minimumBookingNotice; - this.legDurationInSeconds = - IntUtils.requireNotNegative(legDurationInSeconds, "legDurationInSeconds"); - this.timeOffsetInSeconds = - IntUtils.requireNotNegative(timeOffsetInSeconds, "timeOffsetInSeconds"); - } - - public static RoutingBookingInfo.Builder of() { - return new Builder(); - } - - /** - * Check if requested board-time can be booked according to the booking info rules. See - * {@link BookingInfo}. - *

              - * If not the case, the RaptorConstants.TIME_NOT_SET is returned. - */ - public boolean isThereEnoughTimeToBookForDeparture(int departureTime, int requestedBookingTime) { - return isThereEnoughTimeToBook(departureTime + timeOffsetInSeconds, requestedBookingTime); - } - - /** - * Check if requested board-time can be booked according to the booking info rules. See - * {@link BookingInfo}. - *

              - * If not the case, the RaptorConstants.TIME_NOT_SET is returned. - */ - public boolean isThereEnoughTimeToBookForArrival(int arrivalTime, int requestedBookingTime) { - return isThereEnoughTimeToBook( - arrivalTime - legDurationInSeconds + timeOffsetInSeconds, - requestedBookingTime - ); - } - - /** - * Check if requested board-time can be booked according to the booking info rules. See - * {@link BookingInfo}. - *

              - * If not the case, the RaptorConstants.TIME_NOT_SET is returned. - */ - private boolean isThereEnoughTimeToBook(int time, int requestedBookingTime) { - // This can be optimized/simplified; it can be done before the search start since it - // only depends on the latestBookingTime and requestedBookingTime, not the departure time. - if (exceedsLatestBookingTime(requestedBookingTime)) { - return false; - } - if (exceedsMinimumBookingNotice(time, requestedBookingTime)) { - return false; - } - return true; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - var other = (RoutingBookingInfo) o; - return ( - Objects.equals(latestBookingTime, other.latestBookingTime) && - Objects.equals(minimumBookingNotice, other.minimumBookingNotice) - ); - } - - @Override - public int hashCode() { - return Objects.hash(latestBookingTime, minimumBookingNotice); - } - - @Override - public String toString() { - return ToStringBuilder - .of(RoutingBookingInfo.class) - .addServiceTime("latestBookingTime", latestBookingTime, NOT_SET) - .addDurationSec("minimumBookingNotice", minimumBookingNotice, NOT_SET) - .toString(); - } - - private boolean exceedsLatestBookingTime(int requestedEarliestBookingTime) { - return exist(latestBookingTime) && requestedEarliestBookingTime > latestBookingTime; - } - - /** - * Check if the given time is after (or eq to) the earliest time allowed according to the minimum - * booking notice. - */ - private boolean exceedsMinimumBookingNotice(int departureTime, int requestedBookingTime) { - return ( - exist(minimumBookingNotice) && (departureTime - minimumBookingNotice < requestedBookingTime) - ); - } - - private static boolean exist(int value) { - return value != NOT_SET; - } - - public static class Builder { - - private int latestBookingTime = NOT_SET; - private int minimumBookingNotice = NOT_SET; - private int legDurationInSeconds = 0; - private int timeOffsetInSeconds = 0; - - /** - * Convenience method to add booking info to builder. - */ - public Builder withBookingInfo(BookingInfo bookingInfo) { - if (bookingInfo.getLatestBookingTime() != null) { - withLatestBookingTime(bookingInfo.getLatestBookingTime().relativeTimeSeconds()); - } - if (bookingInfo.getMinimumBookingNotice() != null) { - withMinimumBookingNotice((int) bookingInfo.getMinimumBookingNotice().toSeconds()); - } - return this; - } - - public Builder withLatestBookingTime(int latestBookingTime) { - this.latestBookingTime = latestBookingTime; - return this; - } - - public Builder withMinimumBookingNotice(int minimumBookingNotice) { - this.minimumBookingNotice = minimumBookingNotice; - return this; - } - - /** - * The total time of the leg including any access and egress. - * See {@link #withTimeOffsetInSeconds(int)} - */ - public Builder withLegDurationInSeconds(int legDurationInSeconds) { - this.legDurationInSeconds = legDurationInSeconds; - return this; - } - - /** - * The offset is used to calculate when the "real" boardingTime is for the bookable service. - * For example, when a Flex Service is part of access, there might be a walking section before - * the flex service is boarded. In such a case the {@code timeOffsetInSeconds} should be set - * to the time it takes to walk, before boarding the flex. - */ - public Builder withTimeOffsetInSeconds(int timeOffsetInSeconds) { - this.timeOffsetInSeconds = timeOffsetInSeconds; - return this; - } - - public Optional build() { - if (latestBookingTime == NOT_SET && minimumBookingNotice == NOT_SET) { - return Optional.empty(); - } - - return Optional.of( - new RoutingBookingInfo( - latestBookingTime, - minimumBookingNotice, - legDurationInSeconds, - timeOffsetInSeconds - ) - ); - } - } -} diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java deleted file mode 100644 index 8b575d76517..00000000000 --- a/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java +++ /dev/null @@ -1,211 +0,0 @@ -package org.opentripplanner.transit.model.timetable.booking; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.LATEST_BOOKING_TIME; -import static org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfoTest.Expected.MIN_BOOKING_NOTICE; - -import java.time.Duration; -import java.time.LocalTime; -import java.util.List; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.TimeUtils; - -class RoutingBookingInfoTest { - - private static final int MINIMUM_BOOKING_NOTICE_20m = DurationUtils.durationInSeconds("20m"); - private static final LocalTime T13_20 = LocalTime.of(13, 20); - private static final LocalTime T13_00 = LocalTime.of(13, 0); - private static final LocalTime T14_00 = LocalTime.of(14, 0); - private static final LocalTime LATEST_BOOKING_TIME_13_00 = T13_00; - - static List testCase() { - // BOARD-TIME | REQUESTED-BOOKING-TIME | EXPECTED - List arguments = List.of( - // Test min-booking-notice <= 13:40 (14:00-20m) - Arguments.of(T14_00, LocalTime.of(13, 39, 59), MIN_BOOKING_NOTICE), - Arguments.of(T14_00, LocalTime.of(13, 40, 0), MIN_BOOKING_NOTICE), - Arguments.of(T14_00, LocalTime.of(13, 40, 1), Expected.NONE), - // Test latest-booking-time <= 13_00 - Arguments.of(T13_00, LocalTime.of(12, 59, 59), LATEST_BOOKING_TIME), - Arguments.of(T13_00, LocalTime.of(13, 0, 0), LATEST_BOOKING_TIME), - Arguments.of(T13_00, LocalTime.of(13, 0, 1), Expected.NONE), - // Combination of both - Arguments.of(T13_20, LocalTime.of(13, 0, 0), Expected.BOTH) - ); - return arguments; - } - - @ParameterizedTest - @MethodSource("testCase") - void isThereEnoughTimeToBookWithMinBookingTimeBeforeDeparture( - LocalTime searchTime, - LocalTime requestedBookingTime, - Expected expected - ) { - int searchTimeSec = searchTime.toSecondOfDay(); - int reqBookingTime = requestedBookingTime.toSecondOfDay(); - - var subject = RoutingBookingInfo - .of() - .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) - .build() - .orElseThrow(); - - // Since we have not set a duration or offset, departure and arrival is the same - assertEquals( - expected.minBookingNotice, - subject.isThereEnoughTimeToBookForDeparture(searchTimeSec, reqBookingTime) - ); - assertEquals( - expected.minBookingNotice, - subject.isThereEnoughTimeToBookForArrival(searchTimeSec, reqBookingTime) - ); - } - - @ParameterizedTest - @MethodSource("testCase") - void isThereEnoughTimeToBookWithMinBookingTimeBeforeArrival( - LocalTime searchTime, - LocalTime requestedBookingTime, - Expected expected - ) { - int duration = 110; - int offset = 10; - int departureTimeSec = searchTime.toSecondOfDay() - offset; - int arrivalTimeSec = departureTimeSec + duration; - int reqBookingTime = requestedBookingTime.toSecondOfDay(); - - var subject = RoutingBookingInfo - .of() - .withBookingInfo( - BookingInfo - .of() - .withMinimumBookingNotice(Duration.ofSeconds(MINIMUM_BOOKING_NOTICE_20m)) - .build() - ) - .withLegDurationInSeconds(duration) - .withTimeOffsetInSeconds(offset) - .build() - .orElseThrow(); - - assertEquals( - expected.minBookingNotice, - subject.isThereEnoughTimeToBookForDeparture(departureTimeSec, reqBookingTime) - ); - assertEquals( - expected.minBookingNotice, - subject.isThereEnoughTimeToBookForArrival(arrivalTimeSec, reqBookingTime) - ); - } - - @ParameterizedTest - @MethodSource("testCase") - void isThereEnoughTimeToBookWithLatestBookingTime( - LocalTime searchTime, - LocalTime requestedBookingTime, - Expected expected - ) { - int duration = 300; - int offset = 50; - int departureTimeSec = searchTime.toSecondOfDay() - offset; - int arrivalTimeSec = departureTimeSec + duration; - int reqBookingTime = requestedBookingTime.toSecondOfDay(); - - var subject = RoutingBookingInfo - .of() - .withBookingInfo( - BookingInfo - .of() - .withLatestBookingTime(new BookingTime(LATEST_BOOKING_TIME_13_00, 0)) - .build() - ) - .withLegDurationInSeconds(duration) - .withTimeOffsetInSeconds(offset) - .build() - .orElseThrow(); - - assertEquals( - expected.latestBookingTime, - subject.isThereEnoughTimeToBookForDeparture(departureTimeSec, reqBookingTime) - ); - assertEquals( - expected.latestBookingTime, - subject.isThereEnoughTimeToBookForArrival(arrivalTimeSec, reqBookingTime) - ); - } - - @ParameterizedTest - @MethodSource("testCase") - void isThereEnoughTimeToBookUsingBoth( - LocalTime searchTime, - LocalTime requestedBookingTime, - Expected expected - ) { - int duration = 0; - int offset = 0; - int departureTimeSec = searchTime.toSecondOfDay() - offset; - int arrivalTimeSec = departureTimeSec + duration; - int reqBookingTime = requestedBookingTime.toSecondOfDay(); - - // NeTEx does not support booking notice and latest booking time, but there is no conflict - // between these parameters. To make sure we support all combinations, we create all 3: - var subject = RoutingBookingInfo - .of() - .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) - .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) - .withLegDurationInSeconds(duration) - .withTimeOffsetInSeconds(offset) - .build() - .orElseThrow(); - - assertEquals( - expected == Expected.BOTH, - subject.isThereEnoughTimeToBookForDeparture(departureTimeSec, reqBookingTime), - expected + - " " + - subject + - " " + - TimeUtils.timeToStrLong(departureTimeSec) + - " " + - TimeUtils.timeToStrLong(reqBookingTime) - ); - assertEquals( - expected == Expected.BOTH, - subject.isThereEnoughTimeToBookForArrival(arrivalTimeSec, reqBookingTime) - ); - } - - @Test - void testToString() { - var subject = RoutingBookingInfo - .of() - .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) - .withLatestBookingTime(LATEST_BOOKING_TIME_13_00.toSecondOfDay()) - .build() - .orElseThrow(); - - assertEquals( - "RoutingBookingInfo{latestBookingTime: 13:00, minimumBookingNotice: 20m}", - subject.toString() - ); - } - - enum Expected { - NONE(false, false), - MIN_BOOKING_NOTICE(true, false), - LATEST_BOOKING_TIME(false, true), - BOTH(true, true); - - final boolean minBookingNotice; - final boolean latestBookingTime; - - Expected(boolean minBookingNotice, boolean latestBookingTime) { - this.minBookingNotice = minBookingNotice; - this.latestBookingTime = latestBookingTime; - } - } -} From d9700984fff173c80a46753d8f0d997a258707ab Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 28 May 2024 03:18:54 +0200 Subject: [PATCH 1224/1688] refactor: rename from-/to-StopIndex to board-/alight-StopPosition This also contains a few other minor cleanups. --- .../ScheduledFlexPathCalculatorTest.java | 2 +- .../TimePenaltyCalculatorTest.java | 4 +- .../template/FlexTemplateFactoryTest.java | 52 +++++++++---------- .../trip/UnscheduledDrivingDurationTest.java | 7 ++- .../ext/flex/FlexAccessEgress.java | 32 ++++++------ .../opentripplanner/ext/flex/FlexRouter.java | 6 +-- .../DirectFlexPathCalculator.java | 7 ++- .../FlexPathCalculator.java | 7 ++- .../ScheduledFlexPathCalculator.java | 22 +++++--- .../StreetFlexPathCalculator.java | 7 ++- .../TimePenaltyCalculator.java | 9 +++- .../flex/template/AbstractFlexTemplate.java | 16 +++--- .../ext/flex/template/FlexAccessTemplate.java | 20 +++---- .../flex/template/FlexDirectPathFactory.java | 4 +- .../ext/flex/template/FlexEgressTemplate.java | 8 +-- .../flex/template/FlexTemplateFactory.java | 8 +-- .../ext/flex/trip/FlexTrip.java | 16 +++--- .../ext/flex/trip/ScheduledDeviatedTrip.java | 12 ++--- .../ext/flex/trip/UnscheduledTrip.java | 32 ++++++------ .../RaptorPathToItineraryMapperTest.java | 4 +- 20 files changed, 156 insertions(+), 119 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java index 70f39af2420..985ca5a9898 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculatorTest.java @@ -29,7 +29,7 @@ class ScheduledFlexPathCalculatorTest { @Test void calculateTime() { - var c = (FlexPathCalculator) (fromv, tov, fromStopIndex, toStopIndex) -> + var c = (FlexPathCalculator) (fromv, tov, boardStopPosition, alightStopPosition) -> new FlexPath(10_000, (int) Duration.ofMinutes(10).toSeconds(), () -> LineStrings.SIMPLE); var calc = new ScheduledFlexPathCalculator(c, TRIP); var path = calc.calculateFlexPath(V1, V2, 0, 1); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java index e504f8ac762..15f62038a6f 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculatorTest.java @@ -15,7 +15,7 @@ class TimePenaltyCalculatorTest { @Test void calculate() { - FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> + FlexPathCalculator delegate = (fromv, tov, boardStopPosition, alightStopPosition) -> new FlexPath(10_000, THIRTY_MINS_IN_SECONDS, () -> LineStrings.SIMPLE); var mod = TimePenalty.of(Duration.ofMinutes(10), 1.5f); @@ -26,7 +26,7 @@ void calculate() { @Test void nullValue() { - FlexPathCalculator delegate = (fromv, tov, fromStopIndex, toStopIndex) -> null; + FlexPathCalculator delegate = (fromv, tov, boardStopPosition, alightStopPosition) -> null; var mod = TimePenalty.of(Duration.ofMinutes(10), 1.5f); var calc = new TimePenaltyCalculator(delegate, mod); var path = calc.calculateFlexPath(StreetModelForTest.V1, StreetModelForTest.V2, 0, 5); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index ba8f38f4c9b..4c6784f777b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -97,8 +97,8 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction var subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_A, 0)); var template = subject.get(0); - assertEquals(0, template.fromStopIndex); - assertEquals(1, template.toStopIndex); + assertEquals(0, template.boardStopPosition); + assertEquals(1, template.alightStopPosition); assertSame(CALCULATOR, template.calculator); assertSame(STOP_B, template.transferStop); assertSame(DATE.serviceDate(), template.serviceDate); @@ -129,8 +129,8 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoStopsAndNoBoardRestriction var subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_B, 1)); var template = subject.get(0); - assertEquals(0, template.fromStopIndex); - assertEquals(1, template.toStopIndex); + assertEquals(0, template.boardStopPosition); + assertEquals(1, template.alightStopPosition); assertSame(CALCULATOR, template.calculator); assertSame(STOP_A, template.transferStop); assertSame(DATE.serviceDate(), template.serviceDate); @@ -165,17 +165,17 @@ void testCreateAccessTemplateForUnscheduledTripWithBoardAndAlightRestrictions() var t1 = subject.get(0); var t2 = subject.get(1); - assertEquals(0, t1.fromStopIndex); - assertEquals(0, t2.fromStopIndex); - assertEquals(Set.of(1, 3), Set.of(t1.toStopIndex, t2.toStopIndex)); + assertEquals(0, t1.boardStopPosition); + assertEquals(0, t2.boardStopPosition); + assertEquals(Set.of(1, 3), Set.of(t1.alightStopPosition, t2.alightStopPosition)); assertEquals(2, subject.size()); // Board at stop C subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_C, 2)); t1 = subject.get(0); - assertEquals(2, t1.fromStopIndex); - assertEquals(3, t1.toStopIndex); + assertEquals(2, t1.boardStopPosition); + assertEquals(3, t1.alightStopPosition); assertEquals(1, subject.size()); // TODO This is no longer the responsibility of the template factory, reimplement test // We are not allowed to board at stop B, an empty result is expected @@ -206,17 +206,17 @@ void testCreateEgressTemplateForUnscheduledTripWithBoardAndAlightRestrictions() var t1 = subject.get(0); var t2 = subject.get(1); - assertEquals(Set.of(0, 2), Set.of(t1.fromStopIndex, t2.fromStopIndex)); - assertEquals(3, t1.toStopIndex); - assertEquals(3, t2.toStopIndex); + assertEquals(Set.of(0, 2), Set.of(t1.boardStopPosition, t2.boardStopPosition)); + assertEquals(3, t1.alightStopPosition); + assertEquals(3, t2.alightStopPosition); assertEquals(2, subject.size()); // Board at stop C subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_B, 1)); t1 = subject.get(0); - assertEquals(0, t1.fromStopIndex); - assertEquals(1, t1.toStopIndex); + assertEquals(0, t1.boardStopPosition); + assertEquals(1, t1.alightStopPosition); assertEquals(1, subject.size()); // TODO This is no longer the responsibility of the template factory, reimplement test @@ -245,10 +245,10 @@ void testCreateAccessTemplateForUnscheduledTripWithTwoGroupsStops() { var t1 = subject.get(0); var t2 = subject.get(1); - assertEquals(0, t1.fromStopIndex); - assertEquals(0, t2.fromStopIndex); - assertEquals(1, t1.toStopIndex); - assertEquals(1, t2.toStopIndex); + assertEquals(0, t1.boardStopPosition); + assertEquals(0, t2.boardStopPosition); + assertEquals(1, t1.alightStopPosition); + assertEquals(1, t2.alightStopPosition); assertEquals(Set.of(STOP_G3, STOP_G4), Set.of(t1.transferStop, t2.transferStop)); assertEquals(2, subject.size(), subject::toString); } @@ -268,10 +268,10 @@ void testCreateEgressTemplateForUnscheduledTripWithTwoGroupsStops() { var t1 = subject.get(0); var t2 = subject.get(1); - assertEquals(0, t1.fromStopIndex); - assertEquals(0, t2.fromStopIndex); - assertEquals(1, t1.toStopIndex); - assertEquals(1, t2.toStopIndex); + assertEquals(0, t1.boardStopPosition); + assertEquals(0, t2.boardStopPosition); + assertEquals(1, t1.alightStopPosition); + assertEquals(1, t2.alightStopPosition); assertEquals(Set.of(STOP_G1, STOP_G2), Set.of(t1.transferStop, t2.transferStop)); assertEquals(2, subject.size(), subject::toString); } @@ -291,8 +291,8 @@ void testCreateAccessTemplateForScheduledDeviatedTrip() { var subject = factory.createAccessTemplates(closestTrip(flexTrip, STOP_B, 1)); var template = subject.get(0); - assertEquals(1, template.fromStopIndex); - assertEquals(2, template.toStopIndex); + assertEquals(1, template.boardStopPosition); + assertEquals(2, template.alightStopPosition); assertEquals(STOP_C, template.transferStop); assertTrue(template.calculator instanceof ScheduledFlexPathCalculator); assertEquals(1, subject.size(), subject::toString); @@ -313,8 +313,8 @@ void testCreateEgressTemplateForScheduledDeviatedTrip() { var subject = factory.createEgressTemplates(closestTrip(flexTrip, STOP_B, 1)); var template = subject.get(0); - assertEquals(0, template.fromStopIndex); - assertEquals(1, template.toStopIndex); + assertEquals(0, template.boardStopPosition); + assertEquals(1, template.alightStopPosition); assertEquals(STOP_A, template.transferStop); assertTrue(template.calculator instanceof ScheduledFlexPathCalculator); assertEquals(1, subject.size(), subject::toString); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java index 3f5b7cca136..f19478af629 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/UnscheduledDrivingDurationTest.java @@ -17,7 +17,12 @@ class UnscheduledDrivingDurationTest { - static final FlexPathCalculator STATIC_CALCULATOR = (fromv, tov, fromStopIndex, toStopIndex) -> + static final FlexPathCalculator STATIC_CALCULATOR = ( + fromv, + tov, + boardStopPosition, + alightStopPosition + ) -> new FlexPath(10_000, (int) Duration.ofMinutes(10).toSeconds(), () -> LineStrings.SIMPLE); private static final StopTime STOP_TIME = FlexStopTimesForTest.area("10:00", "18:00"); diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index 50791b32561..58debc23217 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -12,8 +12,8 @@ public final class FlexAccessEgress { private final RegularStop stop; private final FlexPathDurations pathDurations; - private final int fromStopIndex; - private final int toStopIndex; + private final int boardStopPosition; + private final int alightStopPosition; private final FlexTrip trip; private final State lastState; private final boolean stopReachedOnBoard; @@ -21,16 +21,16 @@ public final class FlexAccessEgress { public FlexAccessEgress( RegularStop stop, FlexPathDurations pathDurations, - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, FlexTrip trip, State lastState, boolean stopReachedOnBoard ) { this.stop = stop; this.pathDurations = pathDurations; - this.fromStopIndex = fromStopIndex; - this.toStopIndex = toStopIndex; + this.boardStopPosition = boardStopPosition; + this.alightStopPosition = alightStopPosition; this.trip = Objects.requireNonNull(trip); this.lastState = lastState; this.stopReachedOnBoard = stopReachedOnBoard; @@ -49,11 +49,11 @@ public boolean stopReachedOnBoard() { } public int earliestDepartureTime(int departureTime) { - int requestedDepartureTime = pathDurations.mapToFlexTripDepartureTime(departureTime); + int tripDepartureTime = pathDurations.mapToFlexTripDepartureTime(departureTime); int earliestDepartureTime = trip.earliestDepartureTime( - requestedDepartureTime, - fromStopIndex, - toStopIndex, + tripDepartureTime, + boardStopPosition, + alightStopPosition, pathDurations.trip() ); if (earliestDepartureTime == MISSING_VALUE) { @@ -63,11 +63,11 @@ public int earliestDepartureTime(int departureTime) { } public int latestArrivalTime(int arrivalTime) { - int requestedArrivalTime = pathDurations.mapToFlexTripArrivalTime(arrivalTime); + int tripArrivalTime = pathDurations.mapToFlexTripArrivalTime(arrivalTime); int latestArrivalTime = trip.latestArrivalTime( - requestedArrivalTime, - fromStopIndex, - toStopIndex, + tripArrivalTime, + boardStopPosition, + alightStopPosition, pathDurations.trip() ); if (latestArrivalTime == MISSING_VALUE) { @@ -80,8 +80,8 @@ public int latestArrivalTime(int arrivalTime) { public String toString() { return ToStringBuilder .of(FlexAccessEgress.class) - .addNum("fromStopIndex", fromStopIndex) - .addNum("toStopIndex", toStopIndex) + .addNum("boardStopPosition", boardStopPosition) + .addNum("alightStopPosition", alightStopPosition) .addObj("durations", pathDurations) .addObj("stop", stop) .addObj("trip", trip.getId()) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 9e0600fb312..a4f818c5eb1 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -47,7 +47,7 @@ public class FlexRouter { /* Request data */ private final ZonedDateTime startOfTime; - private final int departureTime; + private final int requestedTime; private final List dates; public FlexRouter( @@ -89,7 +89,7 @@ public FlexRouter( ZoneId tz = transitService.getTimeZone(); LocalDate searchDate = LocalDate.ofInstant(requestedTime, tz); this.startOfTime = ServiceDateUtils.asStartOfService(searchDate, tz); - this.departureTime = ServiceDateUtils.secondsSinceStartOfTime(startOfTime, requestedTime); + this.requestedTime = ServiceDateUtils.secondsSinceStartOfTime(startOfTime, requestedTime); this.dates = createFlexServiceDates( transitService, @@ -108,7 +108,7 @@ public List createFlexOnlyItineraries(boolean arriveBy) { egressFlexPathCalculator, flexParameters.maxTransferDuration() ) - .calculateDirectFlexPaths(streetAccesses, streetEgresses, dates, departureTime, arriveBy); + .calculateDirectFlexPaths(streetAccesses, streetEgresses, dates, requestedTime, arriveBy); var itineraries = new ArrayList(); diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java index 9a5b71257d0..793cd112444 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/DirectFlexPathCalculator.java @@ -22,7 +22,12 @@ public DirectFlexPathCalculator() { } @Override - public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex) { + public FlexPath calculateFlexPath( + Vertex fromv, + Vertex tov, + int boardStopPosition, + int alightStopPosition + ) { double distance = SphericalDistanceLibrary.distance(fromv.getCoordinate(), tov.getCoordinate()); LineString geometry = GeometryUtils .getGeometryFactory() diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java index 98e218a1c0d..77dbc703424 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/FlexPathCalculator.java @@ -8,5 +8,10 @@ */ public interface FlexPathCalculator { @Nullable - FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex); + FlexPath calculateFlexPath( + Vertex fromv, + Vertex tov, + int boardStopPosition, + int alightStopPosition + ); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java index 593d6fc7bc9..7b4f6ecaf8b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/ScheduledFlexPathCalculator.java @@ -19,20 +19,25 @@ public ScheduledFlexPathCalculator(FlexPathCalculator flexPathCalculator, FlexTr } @Override - public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex) { + public FlexPath calculateFlexPath( + Vertex fromv, + Vertex tov, + int boardStopPosition, + int alightStopPosition + ) { final var flexPath = flexPathCalculator.calculateFlexPath( fromv, tov, - fromStopIndex, - toStopIndex + boardStopPosition, + alightStopPosition ); if (flexPath == null) { return null; } int departureTime = trip.earliestDepartureTime( Integer.MIN_VALUE, - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, 0 ); @@ -40,7 +45,12 @@ public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, i return null; } - int arrivalTime = trip.latestArrivalTime(Integer.MAX_VALUE, fromStopIndex, toStopIndex, 0); + int arrivalTime = trip.latestArrivalTime( + Integer.MAX_VALUE, + boardStopPosition, + alightStopPosition, + 0 + ); if (arrivalTime == MISSING_VALUE) { return null; diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java index 9870f7013a5..597afd9b17a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/StreetFlexPathCalculator.java @@ -42,7 +42,12 @@ public StreetFlexPathCalculator(boolean reverseDirection, Duration maxFlexTripDu } @Override - public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex) { + public FlexPath calculateFlexPath( + Vertex fromv, + Vertex tov, + int boardStopPosition, + int alightStopPosition + ) { // These are the origin and destination vertices from the perspective of the one-to-many search, // which may be reversed Vertex originVertex = reverseDirection ? tov : fromv; diff --git a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java index 63b661f0f9a..135e1256e83 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java +++ b/src/ext/java/org/opentripplanner/ext/flex/flexpathcalculator/TimePenaltyCalculator.java @@ -20,8 +20,13 @@ public TimePenaltyCalculator(FlexPathCalculator delegate, TimePenalty penalty) { @Nullable @Override - public FlexPath calculateFlexPath(Vertex fromv, Vertex tov, int fromStopIndex, int toStopIndex) { - var path = delegate.calculateFlexPath(fromv, tov, fromStopIndex, toStopIndex); + public FlexPath calculateFlexPath( + Vertex fromv, + Vertex tov, + int boardStopPosition, + int alightStopPosition + ) { + var path = delegate.calculateFlexPath(fromv, tov, boardStopPosition, alightStopPosition); if (path == null) { return null; diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index e386331352c..c87444f88f3 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -42,8 +42,8 @@ abstract class AbstractFlexTemplate { // - this apply to transferStop as well. protected final NearbyStop accessEgress; protected final FlexTrip trip; - protected final int fromStopIndex; - protected final int toStopIndex; + protected final int boardStopPosition; + protected final int alightStopPosition; protected final StopLocation transferStop; protected final int secondsFromStartOfTime; protected final LocalDate serviceDate; @@ -74,8 +74,8 @@ abstract class AbstractFlexTemplate { ) { this.accessEgress = accessEgress; this.trip = trip; - this.fromStopIndex = boardStopPosition; - this.toStopIndex = alightStopPosition; + this.boardStopPosition = boardStopPosition; + this.alightStopPosition = alightStopPosition; this.transferStop = transferStop; this.secondsFromStartOfTime = date.secondsFromStartOfTime(); this.serviceDate = date.serviceDate(); @@ -128,8 +128,8 @@ public String toString() { .of(AbstractFlexTemplate.class) .addObj("accessEgress", accessEgress) .addObj("trip", trip) - .addNum("fromStopIndex", fromStopIndex) - .addNum("toStopIndex", toStopIndex) + .addNum("boardStopPosition", boardStopPosition) + .addNum("alightStopPosition", alightStopPosition) .addObj("transferStop", transferStop) .addServiceTime("secondsFromStartOfTime", secondsFromStartOfTime) .addDate("serviceDate", serviceDate) @@ -206,8 +206,8 @@ private FlexAccessEgress createFlexAccessEgress( return new FlexAccessEgress( stop, durations, - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, trip, finalState, transferEdges.isEmpty() diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 4d7577bb4b1..64d02305a20 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -79,8 +79,8 @@ Optional createDirectGraphPath( int lastStopArrivalTime = flexDurations.mapToFlexTripArrivalTime(departureTime); int latestArrivalTime = trip.latestArrivalTime( lastStopArrivalTime, - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, flexDurations.trip() ); @@ -94,8 +94,8 @@ Optional createDirectGraphPath( int firstStopDepartureTime = flexDurations.mapToFlexTripDepartureTime(departureTime); int earliestDepartureTime = trip.earliestDepartureTime( firstStopDepartureTime, - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, flexDurations.trip() ); @@ -142,8 +142,8 @@ protected FlexTripEdge getFlexEdge(Vertex flexToVertex, StopLocation transferSto var flexPath = calculator.calculateFlexPath( accessEgress.state.getVertex(), flexToVertex, - fromStopIndex, - toStopIndex + boardStopPosition, + alightStopPosition ); if (flexPath == null) { @@ -156,8 +156,8 @@ protected FlexTripEdge getFlexEdge(Vertex flexToVertex, StopLocation transferSto accessEgress.stop, transferStop, trip, - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, serviceDate, flexPath ); @@ -170,8 +170,8 @@ protected boolean isRouteable(Vertex flexVertex) { calculator.calculateFlexPath( accessEgress.state.getVertex(), flexVertex, - fromStopIndex, - toStopIndex + boardStopPosition, + alightStopPosition ) != null ); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java index b44881915da..86ae9deb425 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java @@ -33,7 +33,7 @@ public Collection calculateDirectFlexPaths( Collection streetAccesses, Collection streetEgresses, List dates, - int departureTime, + int requestTime, boolean arriveBy ) { Collection directFlexPaths = new ArrayList<>(); @@ -72,7 +72,7 @@ public Collection calculateDirectFlexPaths( ) { for (NearbyStop egress : streetEgressByStop.get(transferStop)) { template - .createDirectGraphPath(egress, arriveBy, departureTime) + .createDirectGraphPath(egress, arriveBy, requestTime) .ifPresent(directFlexPaths::add); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java index 2864725c56e..2ee5d4382ae 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexEgressTemplate.java @@ -74,8 +74,8 @@ protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, StopLocation transferS var flexPath = calculator.calculateFlexPath( flexFromVertex, accessEgress.state.getVertex(), - fromStopIndex, - toStopIndex + boardStopPosition, + alightStopPosition ); if (flexPath == null) { @@ -88,8 +88,8 @@ protected FlexTripEdge getFlexEdge(Vertex flexFromVertex, StopLocation transferS transferStop, accessEgress.stop, trip, - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, serviceDate, flexPath ); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index cc807d86f70..e19413b2487 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -74,10 +74,10 @@ private List createEgressTemplates() { var result = new ArrayList(); int end = isBoardingAndAlightingAtSameStopPositionAllowed() ? alightStopPos : alightStopPos - 1; - for (int boardIndex = 0; boardIndex <= end; boardIndex++) { - if (trip.getBoardRule(boardIndex).isRoutable()) { - for (var stop : expandStopsAt(trip, boardIndex)) { - result.add(createEgressTemplate(trip, stop, boardIndex, alightStopPos)); + for (int boardStopPos = 0; boardStopPos <= end; boardStopPos++) { + if (trip.getBoardRule(boardStopPos).isRoutable()) { + for (var stop : expandStopsAt(trip, boardStopPos)) { + result.add(createEgressTemplate(trip, stop, boardStopPos, alightStopPos)); } } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java index d44afcb7d5d..8fdb1b8fd5c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/FlexTrip.java @@ -40,40 +40,40 @@ public static boolean isFlexStop(StopLocation stop) { } /** - * Earliest departure time from fromStopIndex to toStopIndex, which departs after departureTime, + * Earliest departure time from boardStopPosition to alightStopPosition, which departs after departureTime, * and for which the flex trip has a duration of flexTime seconds. * * @return {@link StopTime#MISSING_VALUE} is returned if a departure does not exist. */ public abstract int earliestDepartureTime( int departureTime, - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int flexTripDurationSeconds ); /** - * Earliest departure time from fromStopIndex. + * Earliest departure time from boardStopPosition. * * @return {@link StopTime#MISSING_VALUE} is returned if a departure does not exist. */ public abstract int earliestDepartureTime(int stopIndex); /** - * Latest arrival time to toStopIndex from fromStopIndex, which arrives before arrivalTime, + * Latest arrival time to alightStopPosition from boardStopPosition, which arrives before arrivalTime, * and for which the flex trip has a duration of flexTime seconds. * * @return {@link StopTime#MISSING_VALUE} is returned if a departure does not exist. */ public abstract int latestArrivalTime( int arrivalTime, - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int tripDurationSeconds ); /** - * Latest arrival time to toStopIndex. + * Latest arrival time to alightStopPosition. * * @return {@link StopTime#MISSING_VALUE} is returned if a departure does not exist. */ diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java index 22a7ba29791..5ea0cb9fb91 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTrip.java @@ -68,12 +68,12 @@ public static boolean isScheduledFlexTrip(List stopTimes) { @Override public int earliestDepartureTime( int departureTime, - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int flexTripDurationSeconds ) { int stopTime = MISSING_VALUE; - for (int i = fromStopIndex; stopTime == MISSING_VALUE && i >= 0; i--) { + for (int i = boardStopPosition; stopTime == MISSING_VALUE && i >= 0; i--) { stopTime = stopTimes[i].departureTime; } return stopTime >= departureTime ? stopTime : MISSING_VALUE; @@ -87,12 +87,12 @@ public int earliestDepartureTime(int stopIndex) { @Override public int latestArrivalTime( int arrivalTime, - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int flexTripDurationSeconds ) { int stopTime = MISSING_VALUE; - for (int i = toStopIndex; stopTime == MISSING_VALUE && i < stopTimes.length; i++) { + for (int i = alightStopPosition; stopTime == MISSING_VALUE && i < stopTimes.length; i++) { stopTime = stopTimes[i].arrivalTime; } return stopTime <= arrivalTime ? stopTime : MISSING_VALUE; diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 11df0381f4e..7c587995ca2 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -98,13 +98,13 @@ public static boolean isUnscheduledTrip(List stopTimes) { @Override public int earliestDepartureTime( int requestedDepartureTime, - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int tripDurationSeconds ) { var optionalDepartureTimeWindow = departureTimeWindow( - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, tripDurationSeconds ); @@ -126,13 +126,13 @@ public int earliestDepartureTime(int stopIndex) { @Override public int latestArrivalTime( int requestedArrivalTime, - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int tripDurationSeconds ) { var optionalArrivalTimeWindow = arrivalTimeWindow( - fromStopIndex, - toStopIndex, + boardStopPosition, + alightStopPosition, tripDurationSeconds ); @@ -264,13 +264,13 @@ public FlexPathCalculator decorateFlexPathCalculator(FlexPathCalculator defaultC } private Optional departureTimeWindow( - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int tripDurationSeconds ) { // Align the from and to time-windows by subtracting the trip-duration from the to-time-window. - var fromTime = stopTimes[fromStopIndex].timeWindow(); - var toTimeShifted = stopTimes[toStopIndex].timeWindow().minus(tripDurationSeconds); + var fromTime = stopTimes[boardStopPosition].timeWindow(); + var toTimeShifted = stopTimes[alightStopPosition].timeWindow().minus(tripDurationSeconds); // Then take the intersection of the aligned windows to find the window where the // requested-departure-time must be within @@ -278,13 +278,13 @@ private Optional departureTimeWindow( } private Optional arrivalTimeWindow( - int fromStopIndex, - int toStopIndex, + int boardStopPosition, + int alightStopPosition, int tripDurationSeconds ) { // Align the from and to time-windows by adding the trip-duration to the from-time-window. - var fromTimeShifted = stopTimes[fromStopIndex].timeWindow().plus(tripDurationSeconds); - var toTime = stopTimes[toStopIndex].timeWindow(); + var fromTimeShifted = stopTimes[boardStopPosition].timeWindow().plus(tripDurationSeconds); + var toTime = stopTimes[alightStopPosition].timeWindow(); // Then take the intersection of the aligned windows to find the window where the // requested-arrival-time must be within diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index 6f228bdd420..b2a16093e8c 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -17,6 +17,7 @@ import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.ext.flex.FlexAccessEgress; +import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.TimeAndCost; import org.opentripplanner.framework.time.TimeUtils; @@ -149,7 +150,8 @@ void createItineraryWithOnBoardFlexAccess() { ); State state = TestStateBuilder.ofWalking().streetEdge().streetEdge().build(); - FlexAccessEgress flexAccessEgress = new FlexAccessEgress(S1, null, 0, 1, flexTrip, state, true); + var flexDur = new FlexPathDurations(0, (int) state.getElapsedTimeSeconds(), 0, 0); + var flexAccessEgress = new FlexAccessEgress(S1, flexDur, 0, 1, flexTrip, state, true); RaptorAccessEgress access = new FlexAccessEgressAdapter(flexAccessEgress, false); Transfer transfer = new Transfer(S2.getIndex(), 0); RaptorTransfer raptorTransfer = new DefaultRaptorTransfer(S1.getIndex(), 0, 0, transfer); From 26e9446c645781f96f6047a1fae2e2bee6a11b12 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 29 May 2024 00:43:32 +0200 Subject: [PATCH 1225/1688] refactor: Copy direct logic from FlexAccessTemplate to FlexDirectPathFactory --- .../ext/flex/template/FlexAccessTemplate.java | 83 ----------------- .../flex/template/FlexDirectPathFactory.java | 93 ++++++++++++++++++- 2 files changed, 91 insertions(+), 85 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java index 64d02305a20..08d130ecec0 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexAccessTemplate.java @@ -1,11 +1,8 @@ package org.opentripplanner.ext.flex.template; -import static org.opentripplanner.model.StopTime.MISSING_VALUE; - import java.time.Duration; import java.util.Collection; import java.util.List; -import java.util.Optional; import org.opentripplanner.ext.flex.FlexPathDurations; import org.opentripplanner.ext.flex.edgetype.FlexTripEdge; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; @@ -14,7 +11,6 @@ import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.vertex.Vertex; -import org.opentripplanner.street.search.state.EdgeTraverser; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; @@ -43,71 +39,6 @@ class FlexAccessTemplate extends AbstractFlexTemplate { ); } - Optional createDirectGraphPath( - NearbyStop egress, - boolean arriveBy, - int departureTime - ) { - List egressEdges = egress.edges; - - Vertex flexToVertex = egress.state.getVertex(); - - if (!isRouteable(flexToVertex)) { - return Optional.empty(); - } - - var flexEdge = getFlexEdge(flexToVertex, egress.stop); - - if (flexEdge == null) { - return Optional.empty(); - } - - final State[] afterFlexState = flexEdge.traverse(accessEgress.state); - - var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], egressEdges); - - if (finalStateOpt.isEmpty()) { - return Optional.empty(); - } - - var finalState = finalStateOpt.get(); - var flexDurations = calculateFlexPathDurations(flexEdge, finalState); - - int timeShift; - - if (arriveBy) { - int lastStopArrivalTime = flexDurations.mapToFlexTripArrivalTime(departureTime); - int latestArrivalTime = trip.latestArrivalTime( - lastStopArrivalTime, - boardStopPosition, - alightStopPosition, - flexDurations.trip() - ); - - if (latestArrivalTime == MISSING_VALUE) { - return Optional.empty(); - } - - // Shift from departing at departureTime to arriving at departureTime - timeShift = flexDurations.mapToRouterArrivalTime(latestArrivalTime) - flexDurations.total(); - } else { - int firstStopDepartureTime = flexDurations.mapToFlexTripDepartureTime(departureTime); - int earliestDepartureTime = trip.earliestDepartureTime( - firstStopDepartureTime, - boardStopPosition, - alightStopPosition, - flexDurations.trip() - ); - - if (earliestDepartureTime == MISSING_VALUE) { - return Optional.empty(); - } - timeShift = flexDurations.mapToRouterDepartureTime(earliestDepartureTime); - } - - return Optional.of(new DirectFlexPath(timeShift, finalState)); - } - protected List getTransferEdges(PathTransfer transfer) { return transfer.getEdges(); } @@ -162,18 +93,4 @@ protected FlexTripEdge getFlexEdge(Vertex flexToVertex, StopLocation transferSto flexPath ); } - - protected boolean isRouteable(Vertex flexVertex) { - if (accessEgress.state.getVertex() == flexVertex) { - return false; - } else return ( - calculator.calculateFlexPath( - accessEgress.state.getVertex(), - flexVertex, - boardStopPosition, - alightStopPosition - ) != - null - ); - } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java index 86ae9deb425..ba8bd9fa894 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java @@ -1,13 +1,19 @@ package org.opentripplanner.ext.flex.template; +import static org.opentripplanner.model.StopTime.MISSING_VALUE; + import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import java.time.Duration; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.street.search.state.EdgeTraverser; +import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.StopLocation; public class FlexDirectPathFactory { @@ -71,8 +77,7 @@ public Collection calculateDirectFlexPaths( flexEgressTemplates.stream().anyMatch(t -> t.getAccessEgressStop().equals(transferStop)) ) { for (NearbyStop egress : streetEgressByStop.get(transferStop)) { - template - .createDirectGraphPath(egress, arriveBy, requestTime) + createDirectGraphPath(template, egress, arriveBy, requestTime) .ifPresent(directFlexPaths::add); } } @@ -80,4 +85,88 @@ public Collection calculateDirectFlexPaths( return directFlexPaths; } + + private Optional createDirectGraphPath( + FlexAccessTemplate accessTemplate, + NearbyStop egress, + boolean arriveBy, + int requestTime + ) { + var accessNearbyStop = accessTemplate.accessEgress; + var trip = accessTemplate.trip; + int accessBoardStopPosition = accessTemplate.boardStopPosition; + int accessAlightStopPosition = accessTemplate.alightStopPosition; + + var flexToVertex = egress.state.getVertex(); + + if (!isRouteable(accessTemplate, flexToVertex)) { + return Optional.empty(); + } + + var flexEdge = accessTemplate.getFlexEdge(flexToVertex, egress.stop); + + if (flexEdge == null) { + return Optional.empty(); + } + + final State[] afterFlexState = flexEdge.traverse(accessNearbyStop.state); + + var finalStateOpt = EdgeTraverser.traverseEdges(afterFlexState[0], egress.edges); + + if (finalStateOpt.isEmpty()) { + return Optional.empty(); + } + + var finalState = finalStateOpt.get(); + var flexDurations = accessTemplate.calculateFlexPathDurations(flexEdge, finalState); + + int timeShift; + + if (arriveBy) { + int lastStopArrivalTime = flexDurations.mapToFlexTripArrivalTime(requestTime); + int latestArrivalTime = trip.latestArrivalTime( + lastStopArrivalTime, + accessBoardStopPosition, + accessAlightStopPosition, + flexDurations.trip() + ); + + if (latestArrivalTime == MISSING_VALUE) { + return Optional.empty(); + } + + // Shift from departing at departureTime to arriving at departureTime + timeShift = flexDurations.mapToRouterArrivalTime(latestArrivalTime) - flexDurations.total(); + } else { + int firstStopDepartureTime = flexDurations.mapToFlexTripDepartureTime(requestTime); + int earliestDepartureTime = trip.earliestDepartureTime( + firstStopDepartureTime, + accessBoardStopPosition, + accessAlightStopPosition, + flexDurations.trip() + ); + + if (earliestDepartureTime == MISSING_VALUE) { + return Optional.empty(); + } + + timeShift = flexDurations.mapToRouterDepartureTime(earliestDepartureTime); + } + + return Optional.of(new DirectFlexPath(timeShift, finalState)); + } + + protected boolean isRouteable(FlexAccessTemplate accessTemplate, Vertex flexVertex) { + if (accessTemplate.accessEgress.state.getVertex() == flexVertex) { + return false; + } else return ( + accessTemplate.calculator.calculateFlexPath( + accessTemplate.accessEgress.state.getVertex(), + flexVertex, + accessTemplate.boardStopPosition, + accessTemplate.alightStopPosition + ) != + null + ); + } } From ae7a20e955bccb3aacf110ed996c8e2f8ea01f9a Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 28 May 2024 23:48:58 +0200 Subject: [PATCH 1226/1688] feature: Support for min-booking-notice and latest-booking-time --- .../ext/flex/FlexIntegrationTestData.java | 2 + .../template/FlexTemplateFactoryTest.java | 2 + .../flex/trip/ScheduledDeviatedTripTest.java | 1 + .../ext/flex/FlexAccessEgress.java | 14 +- .../opentripplanner/ext/flex/FlexRouter.java | 9 + .../flex/template/AbstractFlexTemplate.java | 5 +- .../ext/flex/template/ClosestTrip.java | 24 ++- .../flex/template/FlexDirectPathFactory.java | 20 ++ .../ext/flex/template/FlexServiceDate.java | 13 +- .../flex/template/FlexTemplateFactory.java | 15 +- .../router/street/DirectFlexRouter.java | 1 + .../router/street/FlexAccessEgressRouter.java | 1 + .../timetable/booking/RoutingBookingInfo.java | 185 ++++++++++++++++++ .../RaptorPathToItineraryMapperTest.java | 13 +- .../booking/RoutingBookingInfoTest.java | 152 ++++++++++++++ 15 files changed, 449 insertions(+), 8 deletions(-) create mode 100644 src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java create mode 100644 src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index d4a8a3894c1..e0a85e23794 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -19,6 +19,7 @@ import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; @@ -39,6 +40,7 @@ public final class FlexIntegrationTestData { public static final FlexServiceDate FLEX_DATE = new FlexServiceDate( SERVICE_DATE, SECONDS_SINCE_MIDNIGHT, + RoutingBookingInfo.NOT_SET, new TIntHashSet() ); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java index 4c6784f777b..8c73d0901ff 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/template/FlexTemplateFactoryTest.java @@ -34,6 +34,7 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; class FlexTemplateFactoryTest { @@ -61,6 +62,7 @@ class FlexTemplateFactoryTest { private static final FlexServiceDate DATE = new FlexServiceDate( LocalDate.of(2024, Month.MAY, 17), SERVICE_TIME_OFFSET, + RoutingBookingInfo.NOT_SET, new TIntHashSet() ); diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index ffaa19e15f4..2883394f837 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -104,6 +104,7 @@ void calculateDirectFare() { new DefaultTransitService(transitModel), FlexParameters.defaultValues(), OffsetDateTime.parse("2021-11-12T10:15:24-05:00").toInstant(), + null, 1, 1, List.of(from), diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java index 58debc23217..f464f1e1907 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexAccessEgress.java @@ -7,6 +7,7 @@ import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; public final class FlexAccessEgress { @@ -17,6 +18,7 @@ public final class FlexAccessEgress { private final FlexTrip trip; private final State lastState; private final boolean stopReachedOnBoard; + private final RoutingBookingInfo routingBookingInfo; public FlexAccessEgress( RegularStop stop, @@ -25,7 +27,8 @@ public FlexAccessEgress( int alightStopPosition, FlexTrip trip, State lastState, - boolean stopReachedOnBoard + boolean stopReachedOnBoard, + int requestedBookingTime ) { this.stop = stop; this.pathDurations = pathDurations; @@ -34,6 +37,8 @@ public FlexAccessEgress( this.trip = Objects.requireNonNull(trip); this.lastState = lastState; this.stopReachedOnBoard = stopReachedOnBoard; + this.routingBookingInfo = + RoutingBookingInfo.of(requestedBookingTime, trip.getPickupBookingInfo(boardStopPosition)); } public RegularStop stop() { @@ -50,6 +55,10 @@ public boolean stopReachedOnBoard() { public int earliestDepartureTime(int departureTime) { int tripDepartureTime = pathDurations.mapToFlexTripDepartureTime(departureTime); + + // Apply minimum-booking-notice + tripDepartureTime = routingBookingInfo.earliestDepartureTime(tripDepartureTime); + int earliestDepartureTime = trip.earliestDepartureTime( tripDepartureTime, boardStopPosition, @@ -73,6 +82,9 @@ public int latestArrivalTime(int arrivalTime) { if (latestArrivalTime == MISSING_VALUE) { return MISSING_VALUE; } + if (routingBookingInfo.exceedsMinimumBookingNotice(latestArrivalTime - pathDurations.trip())) { + return MISSING_VALUE; + } return pathDurations.mapToRouterArrivalTime(latestArrivalTime); } diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index a4f818c5eb1..17b955d24a5 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -7,6 +7,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import javax.annotation.Nullable; import org.opentripplanner.astar.model.GraphPath; import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; import org.opentripplanner.ext.flex.flexpathcalculator.FlexPathCalculator; @@ -28,6 +29,7 @@ import org.opentripplanner.street.model.vertex.TransitStopVertex; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; import org.opentripplanner.transit.service.TransitService; public class FlexRouter { @@ -48,6 +50,7 @@ public class FlexRouter { /* Request data */ private final ZonedDateTime startOfTime; private final int requestedTime; + private final int requestedBookingTime; private final List dates; public FlexRouter( @@ -55,6 +58,7 @@ public FlexRouter( TransitService transitService, FlexParameters flexParameters, Instant requestedTime, + @Nullable Instant requestedBookingTime, int additionalPastSearchDays, int additionalFutureSearchDays, Collection streetAccesses, @@ -90,6 +94,10 @@ public FlexRouter( LocalDate searchDate = LocalDate.ofInstant(requestedTime, tz); this.startOfTime = ServiceDateUtils.asStartOfService(searchDate, tz); this.requestedTime = ServiceDateUtils.secondsSinceStartOfTime(startOfTime, requestedTime); + this.requestedBookingTime = + requestedBookingTime == null + ? RoutingBookingInfo.NOT_SET + : ServiceDateUtils.secondsSinceStartOfTime(startOfTime, requestedBookingTime); this.dates = createFlexServiceDates( transitService, @@ -161,6 +169,7 @@ private List createFlexServiceDates( new FlexServiceDate( date, ServiceDateUtils.secondsSinceStartOfTime(startOfTime, date), + requestedBookingTime, transitService.getServiceCodesRunningForDate(date) ) ); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index c87444f88f3..51116b4ea6c 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -47,6 +47,7 @@ abstract class AbstractFlexTemplate { protected final StopLocation transferStop; protected final int secondsFromStartOfTime; protected final LocalDate serviceDate; + protected final int requestedBookingTime; protected final FlexPathCalculator calculator; private final Duration maxTransferDuration; @@ -79,6 +80,7 @@ abstract class AbstractFlexTemplate { this.transferStop = transferStop; this.secondsFromStartOfTime = date.secondsFromStartOfTime(); this.serviceDate = date.serviceDate(); + this.requestedBookingTime = date.requestedBookingTime(); this.calculator = calculator; this.maxTransferDuration = maxTransferDuration; } @@ -210,7 +212,8 @@ private FlexAccessEgress createFlexAccessEgress( alightStopPosition, trip, finalState, - transferEdges.isEmpty() + transferEdges.isEmpty(), + requestedBookingTime ); }) .orElse(null); diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java index 0e360fc6395..a30ebacc497 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/ClosestTrip.java @@ -9,6 +9,7 @@ import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.lang.IntUtils; import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * The combination of the closest stop, trip and trip active date. @@ -54,7 +55,7 @@ static Collection of( boolean pickup ) { var closestTrips = findAllTripsReachableFromNearbyStop(callbackService, nearbyStops, pickup); - return findActiveDatesForTripAndDecorateResult(callbackService, dates, closestTrips); + return findActiveDatesForTripAndDecorateResult(callbackService, dates, closestTrips, true); } @Override @@ -90,7 +91,8 @@ public FlexServiceDate activeDate() { private static ArrayList findActiveDatesForTripAndDecorateResult( FlexAccessEgressCallbackAdapter callbackService, List dates, - Map, ClosestTrip> map + Map, ClosestTrip> map, + boolean pickup ) { var result = new ArrayList(); // Add active dates @@ -99,6 +101,11 @@ private static ArrayList findActiveDatesForTripAndDecorateResult( var closestTrip = e.getValue(); // Include dates where the service is running for (FlexServiceDate date : dates) { + // Filter away boardings early. This needs to be done for egress as well when the + // board stop is known (not known here). + if (pickup && exceedsLatestBookingTime(trip, date, closestTrip.stopPos())) { + continue; + } if (callbackService.isDateActive(date, trip)) { result.add(closestTrip.withDate(date)); } @@ -111,4 +118,17 @@ private ClosestTrip withDate(FlexServiceDate date) { Objects.requireNonNull(date); return new ClosestTrip(this, date); } + + /** + * Check if the trip can be booked at the given date and boarding stop position. + */ + private static boolean exceedsLatestBookingTime( + FlexTrip trip, + FlexServiceDate date, + int stopPos + ) { + return RoutingBookingInfo + .of(date.requestedBookingTime(), trip.getPickupBookingInfo(stopPos)) + .exceedsLatestBookingTime(); + } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java index ba8bd9fa894..f27a502911f 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexDirectPathFactory.java @@ -15,6 +15,7 @@ import org.opentripplanner.street.search.state.EdgeTraverser; import org.opentripplanner.street.search.state.State; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; public class FlexDirectPathFactory { @@ -96,6 +97,7 @@ private Optional createDirectGraphPath( var trip = accessTemplate.trip; int accessBoardStopPosition = accessTemplate.boardStopPosition; int accessAlightStopPosition = accessTemplate.alightStopPosition; + int requestedBookingTime = accessTemplate.requestedBookingTime; var flexToVertex = egress.state.getVertex(); @@ -135,10 +137,28 @@ private Optional createDirectGraphPath( return Optional.empty(); } + // No need to time-shift latestArrivalTime for meeting the min-booking notice restriction, + // the time is already as-late-as-possible + var bookingInfo = RoutingBookingInfo.of( + requestedBookingTime, + trip.getPickupBookingInfo(accessTemplate.boardStopPosition) + ); + if (bookingInfo.exceedsMinimumBookingNotice(latestArrivalTime)) { + return Optional.empty(); + } + // Shift from departing at departureTime to arriving at departureTime timeShift = flexDurations.mapToRouterArrivalTime(latestArrivalTime) - flexDurations.total(); } else { int firstStopDepartureTime = flexDurations.mapToFlexTripDepartureTime(requestTime); + + // Time-shift departure so the minimum-booking-notice restriction is honored. + var bookingInfo = trip.getPickupBookingInfo(accessBoardStopPosition); + firstStopDepartureTime = + RoutingBookingInfo + .of(requestedBookingTime, bookingInfo) + .earliestDepartureTime(firstStopDepartureTime); + int earliestDepartureTime = trip.earliestDepartureTime( firstStopDepartureTime, accessBoardStopPosition, diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java index 56fc3498047..ee85cf77b03 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexServiceDate.java @@ -21,13 +21,17 @@ public class FlexServiceDate { /** Which services are running on the date. */ private final TIntSet servicesRunning; + private final int requestedBookingTime; + public FlexServiceDate( LocalDate serviceDate, int secondsFromStartOfTime, + int requestedBookingTime, TIntSet servicesRunning ) { this.serviceDate = serviceDate; this.secondsFromStartOfTime = secondsFromStartOfTime; + this.requestedBookingTime = requestedBookingTime; this.servicesRunning = servicesRunning; } @@ -39,7 +43,14 @@ int secondsFromStartOfTime() { return secondsFromStartOfTime; } + int requestedBookingTime() { + return requestedBookingTime; + } + + /** + * Return true if the given {@code serviceCode} is active and running. + */ public boolean isTripServiceRunning(int serviceCode) { - return (servicesRunning != null && servicesRunning.contains(serviceCode)); + return servicesRunning != null && servicesRunning.contains(serviceCode); } } diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java index e19413b2487..b7a9408af4a 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/FlexTemplateFactory.java @@ -9,6 +9,7 @@ import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.transit.model.site.GroupStop; import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; /** * The factory is used to create flex trip templates. @@ -75,7 +76,7 @@ private List createEgressTemplates() { int end = isBoardingAndAlightingAtSameStopPositionAllowed() ? alightStopPos : alightStopPos - 1; for (int boardStopPos = 0; boardStopPos <= end; boardStopPos++) { - if (trip.getBoardRule(boardStopPos).isRoutable()) { + if (isAllowedToBoardAt(boardStopPos)) { for (var stop : expandStopsAt(trip, boardStopPos)) { result.add(createEgressTemplate(trip, stop, boardStopPos, alightStopPos)); } @@ -84,6 +85,18 @@ private List createEgressTemplates() { return result; } + /** + * Check if stop position is routable and that the latest-booking time criteria is met. + */ + private boolean isAllowedToBoardAt(int boardStopPosition) { + return ( + trip.getBoardRule(boardStopPosition).isRoutable() && + !RoutingBookingInfo + .of(date.requestedBookingTime(), trip.getPickupBookingInfo(boardStopPosition)) + .exceedsLatestBookingTime() + ); + } + /** * With respect to one journey/itinerary this method retuns {@code true} if a passenger can * board and alight at the same stop in the journey pattern. This is not allowed for regular diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java index 35c627828c6..ff60138d77d 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java @@ -60,6 +60,7 @@ public static List route( serverContext.transitService(), serverContext.flexParameters(), request.dateTime(), + request.bookingTime(), additionalSearchDays.additionalSearchDaysInPast(), additionalSearchDays.additionalSearchDaysInFuture(), accessStops, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java index 347bbc33d79..5023e595678 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java @@ -64,6 +64,7 @@ public static Collection routeAccessEgress( transitService, config, request.dateTime(), + request.bookingTime(), searchDays.additionalSearchDaysInPast(), searchDays.additionalSearchDaysInFuture(), accessStops, diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java new file mode 100644 index 00000000000..0674c6c5cbb --- /dev/null +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java @@ -0,0 +1,185 @@ +package org.opentripplanner.transit.model.timetable.booking; + +import java.time.Duration; +import java.util.Objects; +import javax.annotation.Nullable; +import org.opentripplanner.framework.tostring.ToStringBuilder; + +/** + * This is the contract between booking info and the router. The router will enforce + * this information if the request sets the earliest-booking-time request parameter. + *

              + * Both {@code latestBookingTime} and {@code minimumBookingNotice} can be {@code null}, + * but at least one ot them must be none {@code null}. + *

              + * This class is not used by Raptor directly, but used by the BookingTimeAccessEgress with + * implement the RaptorAccessEgress interface. + */ +public final class RoutingBookingInfo { + + public static final int NOT_SET = -1_999_999; + private static final RoutingBookingInfo UNRESTRICTED = new RoutingBookingInfo(); + + private final int requestedBookingTime; + private final int latestBookingTime; + private final int minimumBookingNotice; + + /** Unrestricted booking info. */ + private RoutingBookingInfo() { + this.requestedBookingTime = NOT_SET; + this.latestBookingTime = NOT_SET; + this.minimumBookingNotice = NOT_SET; + } + + private RoutingBookingInfo( + int requestedBookingTime, + int latestBookingTime, + int minimumBookingNotice + ) { + if (notSet(requestedBookingTime)) { + throw new IllegalArgumentException("The requestedBookingTime must be set."); + } + if (notSet(latestBookingTime) && notSet(minimumBookingNotice)) { + throw new IllegalArgumentException( + "At least latestBookingTime or minimumBookingNotice must be set." + ); + } + this.requestedBookingTime = requestedBookingTime; + this.latestBookingTime = latestBookingTime; + this.minimumBookingNotice = minimumBookingNotice; + } + + public static RoutingBookingInfo.Builder of(int requestedBookingTime) { + return new Builder(requestedBookingTime); + } + + public static RoutingBookingInfo of(int requestedBookingTime, @Nullable BookingInfo bookingInfo) { + return of(requestedBookingTime).withBookingInfo(bookingInfo).build(); + } + + /** + * Return an instance without any booking restrictions. + */ + public static RoutingBookingInfo unrestricted() { + return UNRESTRICTED; + } + + /** + * Time-shift departureTime if the minimum-booking-notice requires it. If required, the + * new time-shifted departureTime is returned, if not the given {@code departureTime} is + * returned as is. For example, if a service is available between 12:00 and 15:00 and the + * minimum booking notice is 30 minutes, the first available trip at 13:00 + * ({@code requestedBookingTime}) is 13:30. + */ + public int earliestDepartureTime(int departureTime) { + return notSet(minimumBookingNotice) + ? departureTime + : Math.max(minBookingNoticeLimit(), departureTime); + } + + /** + * Check if the given time is after (or eq to) the earliest time allowed according to the minimum + * booking notice. + */ + public boolean exceedsMinimumBookingNotice(int departureTime) { + return exist(minimumBookingNotice) && departureTime < minBookingNoticeLimit(); + } + + public boolean exceedsLatestBookingTime() { + return exist(latestBookingTime) && requestedBookingTime > latestBookingTime; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + var other = (RoutingBookingInfo) o; + return ( + Objects.equals(latestBookingTime, other.latestBookingTime) && + Objects.equals(minimumBookingNotice, other.minimumBookingNotice) + ); + } + + @Override + public int hashCode() { + return Objects.hash(latestBookingTime, minimumBookingNotice); + } + + @Override + public String toString() { + return ToStringBuilder + .of(RoutingBookingInfo.class) + .addServiceTime("latestBookingTime", latestBookingTime, NOT_SET) + .addDurationSec("minimumBookingNotice", minimumBookingNotice, NOT_SET) + .toString(); + } + + private int minBookingNoticeLimit() { + return requestedBookingTime + minimumBookingNotice; + } + + private static boolean exist(int value) { + return value != NOT_SET; + } + + private static boolean notSet(int value) { + return value == NOT_SET; + } + + public static class Builder { + + private final int requestedBookingTime; + private int latestBookingTime; + private int minimumBookingNotice; + + public Builder(int requestedBookingTime) { + this.requestedBookingTime = requestedBookingTime; + setUnrestricted(); + } + + /** + * Convenience method to add booking info to builder. + */ + Builder withBookingInfo(@Nullable BookingInfo bookingInfo) { + // Clear booking + if (bookingInfo == null) { + setUnrestricted(); + return this; + } + withLatestBookingTime(bookingInfo.getLatestBookingTime()); + withMinimumBookingNotice(bookingInfo.getMinimumBookingNotice()); + return this; + } + + public Builder withLatestBookingTime(BookingTime latestBookingTime) { + this.latestBookingTime = + latestBookingTime == null ? NOT_SET : latestBookingTime.relativeTimeSeconds(); + return this; + } + + public Builder withMinimumBookingNotice(Duration minimumBookingNotice) { + this.minimumBookingNotice = + minimumBookingNotice == null ? NOT_SET : (int) minimumBookingNotice.toSeconds(); + return this; + } + + public RoutingBookingInfo build() { + if (notSet(requestedBookingTime)) { + return unrestricted(); + } + if (notSet(latestBookingTime) && notSet(minimumBookingNotice)) { + return RoutingBookingInfo.unrestricted(); + } + return new RoutingBookingInfo(requestedBookingTime, latestBookingTime, minimumBookingNotice); + } + + private void setUnrestricted() { + latestBookingTime = NOT_SET; + minimumBookingNotice = NOT_SET; + } + } +} diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java index b2a16093e8c..5da127de2ba 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/RaptorPathToItineraryMapperTest.java @@ -58,6 +58,7 @@ import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; @@ -150,8 +151,16 @@ void createItineraryWithOnBoardFlexAccess() { ); State state = TestStateBuilder.ofWalking().streetEdge().streetEdge().build(); - var flexDur = new FlexPathDurations(0, (int) state.getElapsedTimeSeconds(), 0, 0); - var flexAccessEgress = new FlexAccessEgress(S1, flexDur, 0, 1, flexTrip, state, true); + FlexAccessEgress flexAccessEgress = new FlexAccessEgress( + S1, + new FlexPathDurations(0, (int) state.getElapsedTimeSeconds(), 0, 0), + 0, + 1, + flexTrip, + state, + true, + RoutingBookingInfo.NOT_SET + ); RaptorAccessEgress access = new FlexAccessEgressAdapter(flexAccessEgress, false); Transfer transfer = new Transfer(S2.getIndex(), 0); RaptorTransfer raptorTransfer = new DefaultRaptorTransfer(S1.getIndex(), 0, 0, transfer); diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java new file mode 100644 index 00000000000..e0f507a7983 --- /dev/null +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfoTest.java @@ -0,0 +1,152 @@ +package org.opentripplanner.transit.model.timetable.booking; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotEquals; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; + +import java.time.Duration; +import java.time.LocalTime; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.framework.time.TimeUtils; + +class RoutingBookingInfoTest { + + private static final Duration MINIMUM_BOOKING_NOTICE_20m = Duration.ofMinutes(20); + private static final LocalTime T13_20 = LocalTime.of(13, 20); + private static final LocalTime T13_00 = LocalTime.of(13, 0); + private static final LocalTime T13_00_01 = LocalTime.of(13, 0, 1); + private static final LocalTime T13_40 = LocalTime.of(13, 40); + private static final LocalTime T13_40_01 = LocalTime.of(13, 40, 1); + private static final LocalTime T14_00 = LocalTime.of(14, 0); + private static final LocalTime LATEST_BOOKING_TIME_13_00 = T13_00; + + static List testCase() { + // BOARD-TIME | REQUESTED-BOOKING-TIME | EXPECTED + return List.of( + // Test min-booking-notice <= 13:40 (14:00-20m) + Arguments.of(T14_00, T13_40, Expect.MIN_BOOKING_NOTICE), + Arguments.of(T14_00, T13_40_01, Expect.NONE), + // Test latest-booking-time <= 13_00 + Arguments.of(T13_00, T13_00, Expect.LATEST_BOOKING_TIME), + Arguments.of(T13_00, T13_00_01, Expect.NONE), + // Combination of both + Arguments.of(T13_20, LocalTime.of(13, 0, 0), Expect.BOTH) + ); + } + + @ParameterizedTest + @MethodSource("testCase") + void isThereEnoughTimeToBookWithMinBookingTimeBeforeDeparture( + LocalTime searchTime, + LocalTime requestedBookingTime, + Expect expect + ) { + int searchTimeSec = searchTime.toSecondOfDay(); + + var subject = RoutingBookingInfo + .of(requestedBookingTime.toSecondOfDay()) + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .withLatestBookingTime(new BookingTime(LATEST_BOOKING_TIME_13_00, 0)) + .build(); + + // Since we have not set a duration or offset, departure and arrival is the same + assertEquals(expect.latestBookingTime, !subject.exceedsLatestBookingTime()); + assertEquals(expect.minBookingNotice, !subject.exceedsMinimumBookingNotice(searchTimeSec)); + } + + @Test + void earliestDepartureTime() { + int t11_35 = TimeUtils.time("11:35"); + int t11_55 = TimeUtils.time("11:35") + (int) MINIMUM_BOOKING_NOTICE_20m.toSeconds(); + + var subject = RoutingBookingInfo + .of(t11_35) + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .build(); + + // 11:55 is the earliest departure time for any time before 11:55 + assertEquals(subject.earliestDepartureTime(0), t11_55); + assertEquals(subject.earliestDepartureTime(t11_55 - 1), t11_55); + assertEquals(subject.earliestDepartureTime(t11_55), t11_55); + assertEquals(subject.earliestDepartureTime(t11_55 + 1), t11_55 + 1); + } + + @Test + void unrestricted() { + assertFalse(RoutingBookingInfo.unrestricted().exceedsMinimumBookingNotice(10_000_000)); + assertFalse(RoutingBookingInfo.unrestricted().exceedsMinimumBookingNotice(0)); + assertFalse(RoutingBookingInfo.unrestricted().exceedsLatestBookingTime()); + + assertSame(RoutingBookingInfo.unrestricted(), RoutingBookingInfo.of(3600).build()); + + assertSame( + RoutingBookingInfo.unrestricted(), + RoutingBookingInfo + .of(RoutingBookingInfo.NOT_SET) + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .build() + ); + assertSame( + RoutingBookingInfo.unrestricted(), + RoutingBookingInfo.of(T13_00.toSecondOfDay()).build() + ); + } + + @Test + void testToString() { + var subject = RoutingBookingInfo + .of(TimeUtils.time("11:35")) + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .withLatestBookingTime(new BookingTime(LATEST_BOOKING_TIME_13_00, 0)) + .build(); + + assertEquals( + "RoutingBookingInfo{latestBookingTime: 13:00, minimumBookingNotice: 20m}", + subject.toString() + ); + } + + @Test + void testEqAndHashCode() { + var subject = RoutingBookingInfo.of( + TimeUtils.time("11:35"), + BookingInfo.of().withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m).build() + ); + var same = RoutingBookingInfo + .of(TimeUtils.time("11:35")) + .withMinimumBookingNotice(MINIMUM_BOOKING_NOTICE_20m) + .build(); + + // Equals + assertNotSame(subject, same); + assertEquals(subject, same); + assertEquals(true, subject.equals(subject)); + assertNotEquals(subject, RoutingBookingInfo.unrestricted()); + assertNotEquals(subject, ""); + + // HashCode + assertEquals(subject.hashCode(), same.hashCode()); + assertNotEquals(subject.hashCode(), RoutingBookingInfo.unrestricted().hashCode()); + } + + enum Expect { + NONE(false, false), + MIN_BOOKING_NOTICE(true, false), + LATEST_BOOKING_TIME(false, true), + BOTH(true, true); + + final boolean minBookingNotice; + final boolean latestBookingTime; + + Expect(boolean minBookingNotice, boolean latestBookingTime) { + this.minBookingNotice = minBookingNotice; + this.latestBookingTime = latestBookingTime; + } + } +} From 4a2bc930887540fcf9375063c930d3c601defd72 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 May 2024 22:40:32 +0000 Subject: [PATCH 1227/1688] chore(deps): update dependency org.sonatype.plugins:nexus-staging-maven-plugin to v1.7.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 690453112f3..e5074c374a3 100644 --- a/pom.xml +++ b/pom.xml @@ -1013,7 +1013,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.14 + 1.7.0 true ossrh From 3a12663112b157778635bf83790edaeef9cea443 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 28 May 2024 22:28:57 +0200 Subject: [PATCH 1228/1688] Apply review suggestions --- .../opentripplanner/ext/siri/SiriEtBuilder.java | 14 +++++++++++--- .../ext/siri/SiriTimetableSnapshotSourceTest.java | 2 ++ 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java index a81f1377e31..3b54809b0a3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriEtBuilder.java @@ -159,7 +159,9 @@ public SiriEtBuilder.FramedVehicleRefBuilder withVehicleJourneyRef(String vehicl public FramedVehicleJourneyRefStructure build() { DataFrameRefStructure dataFrameRefStructure = new DataFrameRefStructure(); - dataFrameRefStructure.setValue(DateTimeFormatter.ISO_LOCAL_DATE.format(serviceDate)); + if (serviceDate != null) { + dataFrameRefStructure.setValue(DateTimeFormatter.ISO_LOCAL_DATE.format(serviceDate)); + } FramedVehicleJourneyRefStructure framedVehicleJourneyRefStructure = new FramedVehicleJourneyRefStructure(); framedVehicleJourneyRefStructure.setDataFrameRef(dataFrameRefStructure); framedVehicleJourneyRefStructure.setDatedVehicleJourneyRef(vehicleJourneyRef); @@ -246,7 +248,10 @@ public EstimatedCallsBuilder call(StopLocation stop) { return this; } - public EstimatedCallsBuilder arriveAimedExpected(String aimedTime, String expectedTime) { + public EstimatedCallsBuilder arriveAimedExpected( + @Nullable String aimedTime, + @Nullable String expectedTime + ) { var call = calls.getLast(); if (aimedTime != null) { call.setAimedArrivalTime(dateTimeHelper.zonedDateTime(aimedTime)); @@ -257,7 +262,10 @@ public EstimatedCallsBuilder arriveAimedExpected(String aimedTime, String expect return this; } - public EstimatedCallsBuilder departAimedExpected(String aimedTime, String expectedTime) { + public EstimatedCallsBuilder departAimedExpected( + @Nullable String aimedTime, + @Nullable String expectedTime + ) { var call = calls.getLast(); if (aimedTime != null) { call.setAimedDepartureTime(dateTimeHelper.zonedDateTime(aimedTime)); diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index ecc44c8d913..fa1af949bd3 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -152,6 +152,7 @@ void testUpdateJourneyWithoutJourneyRef() { var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); assertEquals(0, result.successful()); + assertFailure(result, UpdateError.UpdateErrorType.TRIP_NOT_FOUND); } /** @@ -190,6 +191,7 @@ void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { var result = env.applyEstimatedTimetableWithFuzzyMatcher(updates); assertEquals(0, result.successful(), "Should fail gracefully"); + assertFailure(result, UpdateError.UpdateErrorType.NO_FUZZY_TRIP_MATCH); } /** From bf34653343573f530690bb1ffcf5ea7f41033965 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 29 May 2024 09:34:40 +0000 Subject: [PATCH 1229/1688] Add changelog entry for #5865 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 03159dab1ea..7b0982efd14 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -22,6 +22,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Implement GTFS Flex safe duration spec draft [#5796](https://github.com/opentripplanner/OpenTripPlanner/pull/5796) - Document and validate timeRange GraphQL parameter [#5834](https://github.com/opentripplanner/OpenTripPlanner/pull/5834) - Log the origin of a request that causes a transfer cache addition. [#5874](https://github.com/opentripplanner/OpenTripPlanner/pull/5874) +- Fix handling of missing aimed departure time [#5865](https://github.com/opentripplanner/OpenTripPlanner/pull/5865) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 9595722e26dbb41985e1d89855059c665331eb94 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 29 May 2024 11:38:55 +0200 Subject: [PATCH 1230/1688] Polish JavaDoc --- .../updater/trip/AbstractTimetableSnapshotSource.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java index ed604a63a64..3df4f2aba59 100644 --- a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java @@ -19,7 +19,7 @@ * * - use composition instead of inheritance * - make the buffer private to this class and add an API for its access - * - create only one "snapshot manager" per transit model that + * - create only one "snapshot manager" per transit model that is shared between Siri/GTFS-RT updaters */ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvider { @@ -113,7 +113,8 @@ public final TimetableSnapshot getTimetableSnapshot() { /** * Request a commit of the timetable snapshot. *

              - * If there are no updated buffered up or not enough time has elapsed, no snapshot is created. + * If there are no updates buffered up or not enough time has elapsed, the existing snapshot + * is returned. * * @param force Force the committing of a new snapshot even if the above conditions are not met. */ @@ -179,8 +180,8 @@ protected final LocalDate localDateNow() { /** * Execute a {@code Runnable} with a locked snapshot buffer and release the lock afterwards. While - * the action of locking an unlocking is not complicated to do for calling code, this method - * exist so that the lock instance is a private field. + * the action of locking and unlocking is not complicated to do for calling code, this method + * exists so that the lock instance is a private field. */ protected final void withLock(Runnable action) { bufferLock.lock(); From 733efa9b1b22e0034347e018ee35c9434a03a7f2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 11:29:52 +0200 Subject: [PATCH 1231/1688] Introduce primary and secondary elements for stop clusters --- .../ext/geocoder/LuceneIndexTest.java | 26 ++++++++++------- .../ext/geocoder/LuceneIndex.java | 5 +++- .../ext/geocoder/StopCluster.java | 28 ++++++++++++++----- 3 files changed, 41 insertions(+), 18 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index b1fb33dfdd3..15f205ad802 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -10,7 +10,9 @@ import java.time.LocalDate; import java.util.List; import java.util.Set; +import java.util.function.Function; import java.util.stream.Collectors; +import javax.annotation.Nonnull; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; @@ -213,13 +215,13 @@ class StopClusters { ) void stopClustersWithTypos(String searchTerm) { var results = index.queryStopClusters(searchTerm).toList(); - var ids = results.stream().map(StopCluster::id).toList(); + var ids = results.stream().map(primaryId()).toList(); assertEquals(List.of(ALEXANDERPLATZ_STATION.getId()), ids); } @Test void fuzzyStopClusters() { - var result1 = index.queryStopClusters("arts").map(StopCluster::id).toList(); + var result1 = index.queryStopClusters("arts").map(primaryId()).toList(); assertEquals(List.of(ARTS_CENTER.getId()), result1); } @@ -227,7 +229,7 @@ void fuzzyStopClusters() { void deduplicatedStopClusters() { var result = index.queryStopClusters("lich").toList(); assertEquals(1, result.size()); - assertEquals(LICHTERFELDE_OST_1.getName().toString(), result.getFirst().name()); + assertEquals(LICHTERFELDE_OST_1.getName().toString(), result.getFirst().primary().name()); } @ParameterizedTest @@ -259,7 +261,7 @@ void deduplicatedStopClusters() { } ) void stopClustersWithSpace(String query) { - var result = index.queryStopClusters(query).map(StopCluster::id).toList(); + var result = index.queryStopClusters(query).map(primaryId()).toList(); assertEquals(List.of(FIVE_POINTS_STATION.getId()), result); } @@ -268,7 +270,7 @@ void stopClustersWithSpace(String query) { void fuzzyStopCode(String query) { var result = index.queryStopClusters(query).toList(); assertEquals(1, result.size()); - assertEquals(ARTS_CENTER.getName().toString(), result.getFirst().name()); + assertEquals(ARTS_CENTER.getName().toString(), result.getFirst().primary().name()); } @Test @@ -276,16 +278,20 @@ void modes() { var result = index.queryStopClusters("westh").toList(); assertEquals(1, result.size()); var stop = result.getFirst(); - assertEquals(WESTHAFEN.getName().toString(), stop.name()); - assertEquals(List.of(FERRY.name(), BUS.name()), stop.modes()); + assertEquals(WESTHAFEN.getName().toString(), stop.primary().name()); + assertEquals(List.of(FERRY.name(), BUS.name()), stop.primary().modes()); } @Test void agenciesAndFeedPublisher() { var result = index.queryStopClusters("alexanderplatz").toList().getFirst(); - assertEquals(ALEXANDERPLATZ_STATION.getName().toString(), result.name()); - assertEquals(List.of(StopClusterMapper.toAgency(BVG)), result.agencies()); - assertEquals("A Publisher", result.feedPublisher().name()); + assertEquals(ALEXANDERPLATZ_STATION.getName().toString(), result.primary().name()); + assertEquals(List.of(StopClusterMapper.toAgency(BVG)), result.primary().agencies()); + assertEquals("A Publisher", result.primary().feedPublisher().name()); } } + + private static @Nonnull Function primaryId() { + return c -> c.primary().id(); + } } diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 56769db0028..b43028ff4d9 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -6,6 +6,7 @@ import java.io.Serializable; import java.util.Arrays; import java.util.Collection; +import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Set; @@ -198,7 +199,7 @@ private StopCluster toStopCluster(Document document) { var feedPublisher = StopClusterMapper.toFeedPublisher( transitService.getFeedInfo(clusterId.getFeedId()) ); - return new StopCluster( + var primary = new StopCluster.Location( clusterId, code, name, @@ -207,6 +208,8 @@ private StopCluster toStopCluster(Document document) { agencies, feedPublisher ); + + return new StopCluster(primary, List.of()); } static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, final Set suggestFields) { diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java index 8ffd44511fd..20c86e18ed9 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java @@ -2,6 +2,7 @@ import java.util.Collection; import java.util.List; +import java.util.Objects; import javax.annotation.Nullable; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -15,13 +16,8 @@ * - if stops are closer than 10 meters to each and have an identical name, only one is returned */ record StopCluster( - FeedScopedId id, - @Nullable String code, - String name, - Coordinate coordinate, - Collection modes, - List agencies, - @Nullable FeedPublisher feedPublisher + Location primary, + Collection secondaries ) { /** * Easily serializable version of a coordinate @@ -37,4 +33,22 @@ public record Agency(FeedScopedId id, String name) {} * Easily serializable version of a feed publisher */ public record FeedPublisher(String name) {} + + public record Location( + FeedScopedId id, + @Nullable String code, + String name, + Coordinate coordinate, + Collection modes, + List agencies, + @Nullable FeedPublisher feedPublisher + ){ + public Location{ + Objects.requireNonNull(id); + Objects.requireNonNull(name); + Objects.requireNonNull(coordinate); + Objects.requireNonNull(modes); + Objects.requireNonNull(agencies); + } + } } From 3686f3543d9eed105aa32431b85ff8dfa3ac2a76 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 12:18:25 +0200 Subject: [PATCH 1232/1688] Improve mapping of primaries/secondaries --- .../ext/geocoder/LuceneIndex.java | 36 ++++++++++--------- .../ext/geocoder/LuceneStopCluster.java | 15 ++++---- .../ext/geocoder/StopClusterMapper.java | 32 +++++++++-------- .../framework/collection/ListUtils.java | 13 +++++++ 4 files changed, 56 insertions(+), 40 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index b43028ff4d9..8502bb9887a 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -11,7 +11,6 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; -import javax.annotation.Nullable; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper; @@ -42,6 +41,7 @@ import org.apache.lucene.search.suggest.document.SuggestIndexSearcher; import org.apache.lucene.store.ByteBuffersDirectory; import org.opentripplanner.ext.geocoder.StopCluster.Coordinate; +import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -96,8 +96,8 @@ public LuceneIndex(TransitService transitService) { directoryWriter, StopLocation.class, stopLocation.getId().toString(), - stopLocation.getName(), - stopLocation.getCode(), + ListUtils.ofNullable(stopLocation.getName()), + ListUtils.ofNullable(stopLocation.getCode()), stopLocation.getCoordinate().latitude(), stopLocation.getCoordinate().longitude(), Set.of(), @@ -112,8 +112,8 @@ public LuceneIndex(TransitService transitService) { directoryWriter, StopLocationsGroup.class, stopLocationsGroup.getId().toString(), - stopLocationsGroup.getName(), - null, + ListUtils.ofNullable(stopLocationsGroup.getName()), + List.of(), stopLocationsGroup.getCoordinate().latitude(), stopLocationsGroup.getCoordinate().longitude(), Set.of(), @@ -130,13 +130,13 @@ public LuceneIndex(TransitService transitService) { addToIndex( directoryWriter, StopCluster.class, - stopCluster.id().toString(), - I18NString.of(stopCluster.name()), - stopCluster.code(), + stopCluster.primaryId(), + stopCluster.names(), + stopCluster.codes(), stopCluster.coordinate().lat(), stopCluster.coordinate().lon(), stopCluster.modes(), - stopCluster.agencyIds() + List.of() ) ); } @@ -233,8 +233,8 @@ private static void addToIndex( IndexWriter writer, Class type, String id, - I18NString name, - @Nullable String code, + Collection names, + Collection codes, double latitude, double longitude, Collection modes, @@ -245,13 +245,15 @@ private static void addToIndex( Document document = new Document(); document.add(new StoredField(ID, id)); document.add(new TextField(TYPE, typeName, Store.YES)); - document.add(new TextField(NAME, Objects.toString(name), Store.YES)); - document.add(new TextField(NAME_NGRAM, Objects.toString(name), Store.YES)); - document.add(new ContextSuggestField(SUGGEST, Objects.toString(name), 1, typeName)); + for(var name: names) { + document.add(new TextField(NAME, Objects.toString(name), Store.YES)); + document.add(new TextField(NAME_NGRAM, Objects.toString(name), Store.YES)); + document.add(new ContextSuggestField(SUGGEST, Objects.toString(name), 1, typeName)); + } document.add(new StoredField(LAT, latitude)); document.add(new StoredField(LON, longitude)); - if (code != null) { + for (var code : codes) { document.add(new TextField(CODE, code, Store.YES)); document.add(new ContextSuggestField(SUGGEST, code, 1, typeName)); } @@ -259,8 +261,8 @@ private static void addToIndex( for (var mode : modes) { document.add(new TextField(MODE, mode, Store.YES)); } - for (var ids : agencyIds) { - document.add(new TextField(AGENCY_IDS, ids, Store.YES)); + for (var aId : agencyIds) { + document.add(new TextField(AGENCY_IDS, aId, Store.YES)); } try { diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index f58d7aa9af9..5a52ea2a831 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -1,17 +1,16 @@ package org.opentripplanner.ext.geocoder; import java.util.Collection; -import javax.annotation.Nullable; -import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.framework.i18n.I18NString; /** * A package-private helper type for transporting data before serializing. */ record LuceneStopCluster( - FeedScopedId id, - @Nullable String code, - String name, - StopCluster.Coordinate coordinate, + String primaryId, + Collection secondaryIds, + Collection names, Collection modes, - Collection agencyIds -) {} + Collection codes, + StopCluster.Coordinate coordinate){ +} diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 6f16d4a0cce..fd808d41bcf 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -3,6 +3,7 @@ import com.google.common.collect.Iterables; import java.util.Collection; import java.util.List; +import java.util.Objects; import java.util.Optional; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; @@ -61,33 +62,34 @@ Iterable generateStopClusters( LuceneStopCluster map(StopLocationsGroup g) { var modes = transitService.getModesOfStopLocationsGroup(g).stream().map(Enum::name).toList(); - var agencies = agenciesForStopLocationsGroup(g) - .stream() - .map(s -> s.getId().toString()) - .toList(); + + var childStops = g.getChildStops(); + var ids = childStops.stream().map(s -> s.getId().toString()).toList(); + var childNames = childStops.stream().map(StopLocation::getName).filter(Objects::nonNull).toList(); + var codes = childStops.stream().map(StopLocation::getCode).filter(Objects::nonNull).toList(); + return new LuceneStopCluster( - g.getId(), - null, - g.getName().toString(), - toCoordinate(g.getCoordinate()), + g.getId().toString(), + ids, + ListUtils.combine(List.of(g.getName()), childNames), + codes, modes, - agencies + toCoordinate(g.getCoordinate()) ); } Optional map(StopLocation sl) { - var agencies = agenciesForStopLocation(sl).stream().map(a -> a.getId().toString()).toList(); return Optional .ofNullable(sl.getName()) .map(name -> { var modes = transitService.getModesOfStopLocation(sl).stream().map(Enum::name).toList(); return new LuceneStopCluster( - sl.getId(), - sl.getCode(), - name.toString(), - toCoordinate(sl.getCoordinate()), + sl.getId().toString(), + List.of(), + List.of(name), modes, - agencies + ListUtils.ofNullable(sl.getCode()), + toCoordinate(sl.getCoordinate()) ); }); } diff --git a/src/main/java/org/opentripplanner/framework/collection/ListUtils.java b/src/main/java/org/opentripplanner/framework/collection/ListUtils.java index 513c0bcc0d3..302df428d12 100644 --- a/src/main/java/org/opentripplanner/framework/collection/ListUtils.java +++ b/src/main/java/org/opentripplanner/framework/collection/ListUtils.java @@ -57,4 +57,17 @@ public static List distinctByKey( return ret; } + + /** + * Take a single nullable variable and return an empty list if it is null. Otherwise + * return a list with one element. + */ + public static List ofNullable(T input) { + if(input == null){ + return List.of(); + } + else { + return List.of(input); + } + } } From 60469d74ada63ae3ddba7b11b692cb3ae7a4ff44 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 12:41:24 +0200 Subject: [PATCH 1233/1688] Rework indexing --- .../ext/geocoder/LuceneIndex.java | 73 ++++++++++++------- .../ext/geocoder/LuceneStopCluster.java | 4 +- .../ext/geocoder/StopCluster.java | 9 +-- .../ext/geocoder/StopClusterMapper.java | 10 ++- .../framework/collection/ListUtils.java | 5 +- .../transit/model/site/GroupOfStations.java | 6 ++ .../model/site/StopLocationsGroup.java | 4 + 7 files changed, 71 insertions(+), 40 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 8502bb9887a..c39d18d6c22 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -65,10 +65,11 @@ public class LuceneIndex implements Serializable { private final TransitService transitService; private final Analyzer analyzer; private final SuggestIndexSearcher searcher; + private final StopClusterMapper stopClusterMapper; public LuceneIndex(TransitService transitService) { this.transitService = transitService; - StopClusterMapper stopClusterMapper = new StopClusterMapper(transitService); + this.stopClusterMapper = new StopClusterMapper(transitService); this.analyzer = new PerFieldAnalyzerWrapper( @@ -184,34 +185,54 @@ public Stream queryStopClusters(String query) { } private StopCluster toStopCluster(Document document) { - var clusterId = FeedScopedId.parse(document.get(ID)); - var name = document.get(NAME); - var code = document.get(CODE); - var lat = document.getField(LAT).numericValue().doubleValue(); - var lon = document.getField(LON).numericValue().doubleValue(); - var modes = Arrays.asList(document.getValues(MODE)); - var agencies = Arrays - .stream(document.getValues(AGENCY_IDS)) - .map(id -> transitService.getAgencyForId(FeedScopedId.parse(id))) - .filter(Objects::nonNull) - .map(StopClusterMapper::toAgency) - .toList(); - var feedPublisher = StopClusterMapper.toFeedPublisher( - transitService.getFeedInfo(clusterId.getFeedId()) - ); - var primary = new StopCluster.Location( - clusterId, - code, - name, - new Coordinate(lat, lon), - modes, - agencies, - feedPublisher - ); + var primaryId = FeedScopedId.parse(document.get(ID)); + var primary = toLocation(primaryId); return new StopCluster(primary, List.of()); } + private StopCluster.Location toLocation(FeedScopedId id) { + var loc = transitService.getStopLocation(id); + if (loc != null) { + var feedPublisher = StopClusterMapper.toFeedPublisher( + transitService.getFeedInfo(id.getFeedId()) + ); + var agencies = stopClusterMapper + .agenciesForStopLocation(loc) + .stream() + .map(StopClusterMapper::toAgency) + .toList(); + return new StopCluster.Location( + loc.getId(), + loc.getCode(), + loc.getName().toString(), + new Coordinate(loc.getLat(), loc.getLon()), + List.of(), + agencies, + feedPublisher + ); + } else { + var group = transitService.getStopLocationsGroup(id); + var feedPublisher = StopClusterMapper.toFeedPublisher( + transitService.getFeedInfo(id.getFeedId()) + ); + var agencies = stopClusterMapper + .agenciesForStopLocationsGroup(group) + .stream() + .map(StopClusterMapper::toAgency) + .toList(); + return new StopCluster.Location( + group.getId(), + group.getCode(), + group.getName().toString(), + new Coordinate(group.getLat(), group.getLon()), + List.of(), + agencies, + feedPublisher + ); + } + } + static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, final Set suggestFields) { IndexWriterConfig iwc = new IndexWriterConfig(analyzer); Codec filterCodec = new Lucene99Codec() { @@ -245,7 +266,7 @@ private static void addToIndex( Document document = new Document(); document.add(new StoredField(ID, id)); document.add(new TextField(TYPE, typeName, Store.YES)); - for(var name: names) { + for (var name : names) { document.add(new TextField(NAME, Objects.toString(name), Store.YES)); document.add(new TextField(NAME_NGRAM, Objects.toString(name), Store.YES)); document.add(new ContextSuggestField(SUGGEST, Objects.toString(name), 1, typeName)); diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index 5a52ea2a831..9ed1b71da76 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -12,5 +12,5 @@ record LuceneStopCluster( Collection names, Collection modes, Collection codes, - StopCluster.Coordinate coordinate){ -} + StopCluster.Coordinate coordinate +) {} diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java index 20c86e18ed9..4c51c7586dd 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java @@ -15,10 +15,7 @@ * - if a stop has a parent station only the parent is returned * - if stops are closer than 10 meters to each and have an identical name, only one is returned */ -record StopCluster( - Location primary, - Collection secondaries -) { +record StopCluster(Location primary, Collection secondaries) { /** * Easily serializable version of a coordinate */ @@ -42,8 +39,8 @@ public record Location( Collection modes, List agencies, @Nullable FeedPublisher feedPublisher - ){ - public Location{ + ) { + public Location { Objects.requireNonNull(id); Objects.requireNonNull(name); Objects.requireNonNull(coordinate); diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index fd808d41bcf..2c5e4e1aa29 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -65,7 +65,11 @@ LuceneStopCluster map(StopLocationsGroup g) { var childStops = g.getChildStops(); var ids = childStops.stream().map(s -> s.getId().toString()).toList(); - var childNames = childStops.stream().map(StopLocation::getName).filter(Objects::nonNull).toList(); + var childNames = childStops + .stream() + .map(StopLocation::getName) + .filter(Objects::nonNull) + .toList(); var codes = childStops.stream().map(StopLocation::getCode).filter(Objects::nonNull).toList(); return new LuceneStopCluster( @@ -94,11 +98,11 @@ Optional map(StopLocation sl) { }); } - private List agenciesForStopLocation(StopLocation stop) { + List agenciesForStopLocation(StopLocation stop) { return transitService.getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList(); } - private List agenciesForStopLocationsGroup(StopLocationsGroup group) { + List agenciesForStopLocationsGroup(StopLocationsGroup group) { return group .getChildStops() .stream() diff --git a/src/main/java/org/opentripplanner/framework/collection/ListUtils.java b/src/main/java/org/opentripplanner/framework/collection/ListUtils.java index 302df428d12..5964a1674e3 100644 --- a/src/main/java/org/opentripplanner/framework/collection/ListUtils.java +++ b/src/main/java/org/opentripplanner/framework/collection/ListUtils.java @@ -63,10 +63,9 @@ public static List distinctByKey( * return a list with one element. */ public static List ofNullable(T input) { - if(input == null){ + if (input == null) { return List.of(); - } - else { + } else { return List.of(input); } } diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java b/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java index c62d6099c97..66b45317718 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java @@ -51,6 +51,12 @@ public WgsCoordinate getCoordinate() { return coordinate; } + @Nullable + @Override + public String getCode() { + return null; + } + @Nonnull public Collection getChildStops() { return this.childStations.stream().flatMap(s -> s.getChildStops().stream()).toList(); diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java index 3536f59e9b6..70b2ee45a81 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java @@ -1,6 +1,7 @@ package org.opentripplanner.transit.model.site; import java.util.Collection; +import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.lang.ObjectUtils; @@ -39,4 +40,7 @@ default double getLon() { default String logName() { return ObjectUtils.ifNotNull(getName(), Object::toString, null); } + + @Nullable + String getCode(); } From b4805c58b42af2c27a56ebd4b82b68056c991c2d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 12:47:29 +0200 Subject: [PATCH 1234/1688] Move mapping code --- .../ext/geocoder/LuceneIndex.java | 45 +------------------ .../ext/geocoder/StopClusterMapper.java | 43 ++++++++++++++++++ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index c39d18d6c22..689b7419122 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -40,7 +40,6 @@ import org.apache.lucene.search.suggest.document.FuzzyCompletionQuery; import org.apache.lucene.search.suggest.document.SuggestIndexSearcher; import org.apache.lucene.store.ByteBuffersDirectory; -import org.opentripplanner.ext.geocoder.StopCluster.Coordinate; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.standalone.api.OtpServerRequestContext; @@ -186,53 +185,11 @@ public Stream queryStopClusters(String query) { private StopCluster toStopCluster(Document document) { var primaryId = FeedScopedId.parse(document.get(ID)); - var primary = toLocation(primaryId); + var primary = stopClusterMapper.toLocation(primaryId); return new StopCluster(primary, List.of()); } - private StopCluster.Location toLocation(FeedScopedId id) { - var loc = transitService.getStopLocation(id); - if (loc != null) { - var feedPublisher = StopClusterMapper.toFeedPublisher( - transitService.getFeedInfo(id.getFeedId()) - ); - var agencies = stopClusterMapper - .agenciesForStopLocation(loc) - .stream() - .map(StopClusterMapper::toAgency) - .toList(); - return new StopCluster.Location( - loc.getId(), - loc.getCode(), - loc.getName().toString(), - new Coordinate(loc.getLat(), loc.getLon()), - List.of(), - agencies, - feedPublisher - ); - } else { - var group = transitService.getStopLocationsGroup(id); - var feedPublisher = StopClusterMapper.toFeedPublisher( - transitService.getFeedInfo(id.getFeedId()) - ); - var agencies = stopClusterMapper - .agenciesForStopLocationsGroup(group) - .stream() - .map(StopClusterMapper::toAgency) - .toList(); - return new StopCluster.Location( - group.getId(), - group.getCode(), - group.getName().toString(), - new Coordinate(group.getLat(), group.getLon()), - List.of(), - agencies, - feedPublisher - ); - } - } - static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, final Set suggestFields) { IndexWriterConfig iwc = new IndexWriterConfig(analyzer); Codec filterCodec = new Lucene99Codec() { diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 2c5e4e1aa29..543f06949ff 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -9,6 +9,7 @@ import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.model.FeedInfo; +import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Agency; import org.opentripplanner.transit.model.site.StopLocation; @@ -127,5 +128,47 @@ static StopCluster.FeedPublisher toFeedPublisher(FeedInfo fi) { } } + StopCluster.Location toLocation(FeedScopedId id) { + var loc = transitService.getStopLocation(id); + if (loc != null) { + var feedPublisher = toFeedPublisher( + transitService.getFeedInfo(id.getFeedId()) + ); + var modes = transitService.getModesOfStopLocation(loc).stream().map(Enum::name).toList(); + var agencies = agenciesForStopLocation(loc) + .stream() + .map(StopClusterMapper::toAgency) + .toList(); + return new StopCluster.Location( + loc.getId(), + loc.getCode(), + loc.getName().toString(), + new StopCluster.Coordinate(loc.getLat(), loc.getLon()), + modes, + agencies, + feedPublisher + ); + } else { + var group = transitService.getStopLocationsGroup(id); + var feedPublisher = toFeedPublisher( + transitService.getFeedInfo(id.getFeedId()) + ); + var modes = transitService.getModesOfStopLocationsGroup(group).stream().map(Enum::name).toList(); + var agencies = agenciesForStopLocationsGroup(group) + .stream() + .map(StopClusterMapper::toAgency) + .toList(); + return new StopCluster.Location( + group.getId(), + group.getCode(), + group.getName().toString(), + new StopCluster.Coordinate(group.getLat(), group.getLon()), + modes, + agencies, + feedPublisher + ); + } + } + private record DeduplicationKey(I18NString name, WgsCoordinate coordinate) {} } From f78d9c96ff2e7b4d6de06f00f2154baae7c24b1a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 22 May 2024 15:43:37 +0200 Subject: [PATCH 1235/1688] Also add secondaries from stop clusters --- .../ext/geocoder/LuceneIndex.java | 41 ++++---- .../ext/geocoder/LuceneStopCluster.java | 1 - .../ext/geocoder/StopClusterMapper.java | 99 ++++++++++--------- 3 files changed, 71 insertions(+), 70 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 689b7419122..e0ea8ba36b9 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -52,14 +52,13 @@ public class LuceneIndex implements Serializable { private static final String TYPE = "type"; private static final String ID = "id"; + private static final String SECONDARY_IDS = "secondary_ids"; private static final String SUGGEST = "suggest"; private static final String NAME = "name"; private static final String NAME_NGRAM = "name_ngram"; private static final String CODE = "code"; private static final String LAT = "latitude"; private static final String LON = "longitude"; - private static final String MODE = "mode"; - private static final String AGENCY_IDS = "agency_ids"; private final TransitService transitService; private final Analyzer analyzer; @@ -96,12 +95,11 @@ public LuceneIndex(TransitService transitService) { directoryWriter, StopLocation.class, stopLocation.getId().toString(), + List.of(), ListUtils.ofNullable(stopLocation.getName()), ListUtils.ofNullable(stopLocation.getCode()), stopLocation.getCoordinate().latitude(), - stopLocation.getCoordinate().longitude(), - Set.of(), - Set.of() + stopLocation.getCoordinate().longitude() ) ); @@ -112,12 +110,11 @@ public LuceneIndex(TransitService transitService) { directoryWriter, StopLocationsGroup.class, stopLocationsGroup.getId().toString(), + List.of(), ListUtils.ofNullable(stopLocationsGroup.getName()), List.of(), stopLocationsGroup.getCoordinate().latitude(), - stopLocationsGroup.getCoordinate().longitude(), - Set.of(), - Set.of() + stopLocationsGroup.getCoordinate().longitude() ) ); @@ -131,12 +128,11 @@ public LuceneIndex(TransitService transitService) { directoryWriter, StopCluster.class, stopCluster.primaryId(), + stopCluster.secondaryIds(), stopCluster.names(), stopCluster.codes(), stopCluster.coordinate().lat(), - stopCluster.coordinate().lon(), - stopCluster.modes(), - List.of() + stopCluster.coordinate().lon() ) ); } @@ -187,7 +183,13 @@ private StopCluster toStopCluster(Document document) { var primaryId = FeedScopedId.parse(document.get(ID)); var primary = stopClusterMapper.toLocation(primaryId); - return new StopCluster(primary, List.of()); + var secondaryIds = Arrays + .stream(document.getValues(SECONDARY_IDS)) + .map(FeedScopedId::parse) + .map(stopClusterMapper::toLocation) + .toList(); + + return new StopCluster(primary, secondaryIds); } static IndexWriterConfig iwcWithSuggestField(Analyzer analyzer, final Set suggestFields) { @@ -211,17 +213,19 @@ private static void addToIndex( IndexWriter writer, Class type, String id, + Collection secondaryIds, Collection names, Collection codes, double latitude, - double longitude, - Collection modes, - Collection agencyIds + double longitude ) { String typeName = type.getSimpleName(); Document document = new Document(); document.add(new StoredField(ID, id)); + for (var secondaryId : secondaryIds) { + document.add(new StoredField(SECONDARY_IDS, secondaryId)); + } document.add(new TextField(TYPE, typeName, Store.YES)); for (var name : names) { document.add(new TextField(NAME, Objects.toString(name), Store.YES)); @@ -236,13 +240,6 @@ private static void addToIndex( document.add(new ContextSuggestField(SUGGEST, code, 1, typeName)); } - for (var mode : modes) { - document.add(new TextField(MODE, mode, Store.YES)); - } - for (var aId : agencyIds) { - document.add(new TextField(AGENCY_IDS, aId, Store.YES)); - } - try { writer.addDocument(document); } catch (IOException ex) { diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java index 9ed1b71da76..b4ee0f0919b 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneStopCluster.java @@ -10,7 +10,6 @@ record LuceneStopCluster( String primaryId, Collection secondaryIds, Collection names, - Collection modes, Collection codes, StopCluster.Coordinate coordinate ) {} diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 543f06949ff..bb8f0e72bbe 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -5,6 +5,7 @@ import java.util.List; import java.util.Objects; import java.util.Optional; +import java.util.stream.Collectors; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; @@ -39,7 +40,7 @@ Iterable generateStopClusters( Collection stopLocations, Collection stopLocationsGroups ) { - var stops = stopLocations + List stops = stopLocations .stream() // remove stop locations without a parent station .filter(sl -> sl.getParentStation() == null) @@ -48,13 +49,17 @@ Iterable generateStopClusters( .toList(); // if they are very close to each other and have the same name, only one is chosen (at random) - var deduplicatedStops = ListUtils - .distinctByKey( - stops, - sl -> new DeduplicationKey(sl.getName(), sl.getCoordinate().roundToApproximate100m()) + var deduplicatedStops = stops + .stream() + .collect( + Collectors.groupingBy(sl -> + new DeduplicationKey(sl.getName(), sl.getCoordinate().roundToApproximate100m()) + ) ) + .values() .stream() - .flatMap(s -> this.map(s).stream()) + .map(group -> this.map(group).orElse(null)) + .filter(Objects::nonNull) .toList(); var stations = stopLocationsGroups.stream().map(this::map).toList(); @@ -62,8 +67,6 @@ Iterable generateStopClusters( } LuceneStopCluster map(StopLocationsGroup g) { - var modes = transitService.getModesOfStopLocationsGroup(g).stream().map(Enum::name).toList(); - var childStops = g.getChildStops(); var ids = childStops.stream().map(s -> s.getId().toString()).toList(); var childNames = childStops @@ -78,32 +81,34 @@ LuceneStopCluster map(StopLocationsGroup g) { ids, ListUtils.combine(List.of(g.getName()), childNames), codes, - modes, toCoordinate(g.getCoordinate()) ); } - Optional map(StopLocation sl) { + Optional map(List stopLocations) { + var primary = stopLocations.getFirst(); + var secondaryIds = stopLocations.stream().skip(1).map(sl -> sl.getId().toString()).toList(); + var names = stopLocations.stream().map(StopLocation::getName).toList(); + var codes = stopLocations.stream().map(StopLocation::getCode).filter(Objects::nonNull).toList(); + return Optional - .ofNullable(sl.getName()) - .map(name -> { - var modes = transitService.getModesOfStopLocation(sl).stream().map(Enum::name).toList(); - return new LuceneStopCluster( - sl.getId().toString(), - List.of(), - List.of(name), - modes, - ListUtils.ofNullable(sl.getCode()), - toCoordinate(sl.getCoordinate()) - ); - }); + .ofNullable(primary.getName()) + .map(name -> + new LuceneStopCluster( + primary.getId().toString(), + secondaryIds, + names, + codes, + toCoordinate(primary.getCoordinate()) + ) + ); } - List agenciesForStopLocation(StopLocation stop) { + private List agenciesForStopLocation(StopLocation stop) { return transitService.getRoutesForStop(stop).stream().map(Route::getAgency).distinct().toList(); } - List agenciesForStopLocationsGroup(StopLocationsGroup group) { + private List agenciesForStopLocationsGroup(StopLocationsGroup group) { return group .getChildStops() .stream() @@ -112,28 +117,10 @@ List agenciesForStopLocationsGroup(StopLocationsGroup group) { .toList(); } - private static StopCluster.Coordinate toCoordinate(WgsCoordinate c) { - return new StopCluster.Coordinate(c.latitude(), c.longitude()); - } - - static StopCluster.Agency toAgency(Agency a) { - return new StopCluster.Agency(a.getId(), a.getName()); - } - - static StopCluster.FeedPublisher toFeedPublisher(FeedInfo fi) { - if (fi == null) { - return null; - } else { - return new StopCluster.FeedPublisher(fi.getPublisherName()); - } - } - StopCluster.Location toLocation(FeedScopedId id) { var loc = transitService.getStopLocation(id); if (loc != null) { - var feedPublisher = toFeedPublisher( - transitService.getFeedInfo(id.getFeedId()) - ); + var feedPublisher = toFeedPublisher(transitService.getFeedInfo(id.getFeedId())); var modes = transitService.getModesOfStopLocation(loc).stream().map(Enum::name).toList(); var agencies = agenciesForStopLocation(loc) .stream() @@ -150,10 +137,12 @@ StopCluster.Location toLocation(FeedScopedId id) { ); } else { var group = transitService.getStopLocationsGroup(id); - var feedPublisher = toFeedPublisher( - transitService.getFeedInfo(id.getFeedId()) - ); - var modes = transitService.getModesOfStopLocationsGroup(group).stream().map(Enum::name).toList(); + var feedPublisher = toFeedPublisher(transitService.getFeedInfo(id.getFeedId())); + var modes = transitService + .getModesOfStopLocationsGroup(group) + .stream() + .map(Enum::name) + .toList(); var agencies = agenciesForStopLocationsGroup(group) .stream() .map(StopClusterMapper::toAgency) @@ -170,5 +159,21 @@ StopCluster.Location toLocation(FeedScopedId id) { } } + private static StopCluster.Coordinate toCoordinate(WgsCoordinate c) { + return new StopCluster.Coordinate(c.latitude(), c.longitude()); + } + + static StopCluster.Agency toAgency(Agency a) { + return new StopCluster.Agency(a.getId(), a.getName()); + } + + private static StopCluster.FeedPublisher toFeedPublisher(FeedInfo fi) { + if (fi == null) { + return null; + } else { + return new StopCluster.FeedPublisher(fi.getPublisherName()); + } + } + private record DeduplicationKey(I18NString name, WgsCoordinate coordinate) {} } From c27e8ce6f729054ad120c29ac21c6b8f870f05f5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 29 May 2024 10:33:14 +0200 Subject: [PATCH 1236/1688] Add type to geocoding results --- .../java/org/opentripplanner/ext/geocoder/StopCluster.java | 7 +++++++ .../opentripplanner/ext/geocoder/StopClusterMapper.java | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java index 4c51c7586dd..30647cc7b20 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopCluster.java @@ -31,9 +31,15 @@ public record Agency(FeedScopedId id, String name) {} */ public record FeedPublisher(String name) {} + public enum LocationType { + STATION, + STOP, + } + public record Location( FeedScopedId id, @Nullable String code, + LocationType type, String name, Coordinate coordinate, Collection modes, @@ -43,6 +49,7 @@ public record Location( public Location { Objects.requireNonNull(id); Objects.requireNonNull(name); + Objects.requireNonNull(type); Objects.requireNonNull(coordinate); Objects.requireNonNull(modes); Objects.requireNonNull(agencies); diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index bb8f0e72bbe..de8d2681fd9 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -1,5 +1,8 @@ package org.opentripplanner.ext.geocoder; +import static org.opentripplanner.ext.geocoder.StopCluster.LocationType.STATION; +import static org.opentripplanner.ext.geocoder.StopCluster.LocationType.STOP; + import com.google.common.collect.Iterables; import java.util.Collection; import java.util.List; @@ -129,6 +132,7 @@ StopCluster.Location toLocation(FeedScopedId id) { return new StopCluster.Location( loc.getId(), loc.getCode(), + STOP, loc.getName().toString(), new StopCluster.Coordinate(loc.getLat(), loc.getLon()), modes, @@ -150,6 +154,7 @@ StopCluster.Location toLocation(FeedScopedId id) { return new StopCluster.Location( group.getId(), group.getCode(), + STATION, group.getName().toString(), new StopCluster.Coordinate(group.getLat(), group.getLon()), modes, From 78cd79b221ad92ba051d812bd807d5f7a2fc990f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 29 May 2024 11:07:06 +0200 Subject: [PATCH 1237/1688] Add test for ofNullable --- .../opentripplanner/framework/collection/ListUtilsTest.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java b/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java index 6e72d5626c5..33dce1f5574 100644 --- a/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/collection/ListUtilsTest.java @@ -56,5 +56,11 @@ void distinctByKey() { assertEquals(List.of(first, third), deduplicated); } + @Test + void ofNullable() { + assertEquals(List.of(), ListUtils.ofNullable(null)); + assertEquals(List.of("A"), ListUtils.ofNullable("A")); + } + private record Wrapper(int i, String string) {} } From e7e38e409cf2501b00a2876e988ae383bf827810 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 24 May 2024 14:12:50 +0200 Subject: [PATCH 1238/1688] Add validation for scheduled data in SIRI update --- .../siri/SiriTimetableSnapshotSourceTest.java | 25 +++++++++++++++++++ .../ext/siri/AddedTripBuilder.java | 5 ++++ .../model/timetable/RealTimeTripTimes.java | 4 ++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index fa1af949bd3..c3919562af4 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -79,6 +79,31 @@ void testAddJourney() { assertEquals(4 * 60, tripTimes.getDepartureTime(1)); } + @Test + void testAddedJourneyWithInvalidScheduledData() { + var env = new RealtimeTestEnvironment(); + + // Create an extra journey with invalid planned data (travel back in time) + // and valid real time data + var createExtraJourney = new SiriEtBuilder(env.getDateTimeHelper()) + .withEstimatedVehicleJourneyCode("newJourney") + .withIsExtraJourney(true) + .withOperatorRef(env.operator1Id.getId()) + .withLineRef(env.route1Id.getId()) + .withEstimatedCalls(builder -> + builder + .call(env.stopA1) + .departAimedExpected("10:58", "10:48") + .call(env.stopB1) + .arriveAimedExpected("10:08", "10:58") + ) + .buildEstimatedTimetableDeliveries(); + + var result = env.applyEstimatedTimetable(createExtraJourney); + assertEquals(0, result.successful()); + assertFailure(result, UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME); + } + @Test void testReplaceJourney() { var env = new RealtimeTestEnvironment(); diff --git a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java index 7f0e51fab18..8eae3be7077 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java @@ -216,6 +216,11 @@ Result build() { aimedStopTimes, transitModel.getDeduplicator() ); + // validate the scheduled trip times + // they are in general superseded by real-time trip times + // but in case of trip cancellation, OTP will fall back to scheduled trip times + // therefore they must be valid + tripTimes.validateNonIncreasingTimes(); tripTimes.setServiceCode(transitModel.getServiceCodes().get(trip.getServiceId())); pattern.add(tripTimes); RealTimeTripTimes updatedTripTimes = tripTimes.copyScheduledTimes(); diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java index a62da95e79a..9e91d691fbe 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java @@ -263,7 +263,9 @@ public void setRealTimeState(final RealTimeState realTimeState) { * found. */ public void validateNonIncreasingTimes() { - final int nStops = arrivalTimes.length; + final int nStops = arrivalTimes != null + ? arrivalTimes.length + : scheduledTripTimes.getNumStops(); int prevDep = -9_999_999; for (int s = 0; s < nStops; s++) { final int arr = getArrivalTime(s); From cd53540be62f9ae156dcdeb9dc2d808ab900b4ff Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 29 May 2024 11:39:03 +0200 Subject: [PATCH 1239/1688] doc: Update bookingTime doc. --- .../apis/transmodel/model/plan/TripQuery.java | 18 +++++++++++------- .../framework/groupids/GroupByDistance.java | 2 +- .../apis/transmodel/schema.graphql | 11 +++++++++-- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index 9ef69a96b97..49a14fdb758 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -51,9 +51,9 @@ public static GraphQLFieldDefinition create( .newArgument() .name("dateTime") .description( - "Date and time for the earliest time the user is willing to start the journey " + - "(if arriveBy=false/not set) or the latest acceptable time of arriving " + - "(arriveBy=true). Defaults to now" + "The date and time for the earliest time the user is willing to start the journey " + + "(if `false`or not set) or the latest acceptable time of arriving " + + "(`true`). Defaults to now" ) .type(gqlUtil.dateTimeScalar) .build() @@ -63,10 +63,14 @@ public static GraphQLFieldDefinition create( .newArgument() .name("bookingTime") .description( - "Date and time for the time the user can book the journey. Normally this is when the " + - "search is performed, plus a small grace period to complete the booking. Services witch " + - "must be booked before this time is excluded. Currently only flex services used as " + - "access and egress is supported, not direct flex or other services." + """ + The date and time for the latest time the user is expected to book the journey. + Normally this is when the search is performed(now), plus a small grace period to + complete the booking. Services witch must be booked before this time is excluded. The + `latestBookingTime` and `minimumBookingPeriod` in `BookingArrangement` (flexible + services only) is used to enforce this. If this parameter is _not set_, no booking-time + restrictions are applied - all journeys are listed. + """ ) .type(gqlUtil.dateTimeScalar) .build() diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java index 7ab605fb792..ee67e4f76d0 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/framework/groupids/GroupByDistance.java @@ -10,7 +10,7 @@ import org.opentripplanner.routing.algorithm.filterchain.framework.spi.GroupId; /** - * This class create a group identifier for an itinerary based on the longest legs which together + * This class creates a group identifier for an itinerary based on the longest legs which together * account for more than 'p' part of the total distance. Transit legs must overlap and ride the * same trip, while street-legs only need to have the same mode. We call the set of legs the * 'key-set-of-legs' or just 'key-set'. diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index aa0c75fa80c..376ded34ea7 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -792,9 +792,16 @@ type QueryType { boardSlackDefault: Int = 0, "List of boardSlack for a given set of modes. Defaults: []" boardSlackList: [TransportModeSlack], - "Date and time for the time the user can book the journey. Normally this is when the search is performed, plus a small grace period to complete the booking. Services witch must be booked before this time is excluded. Currently only flex services used as access and egress is supported, not direct flex or other services." + """ + The date and time for the latest time the user is expected to book the journey. + Normally this is when the search is performed(now), plus a small grace period to + complete the booking. Services witch must be booked before this time is excluded. The + `latestBookingTime` and `minimumBookingPeriod` in `BookingArrangement` (flexible + services only) is used to enforce this. If this parameter is _not set_, no booking-time + restrictions are applied - all journeys are listed. + """ bookingTime: DateTime, - "Date and time for the earliest time the user is willing to start the journey (if arriveBy=false/not set) or the latest acceptable time of arriving (arriveBy=true). Defaults to now" + "The date and time for the earliest time the user is willing to start the journey (if `false`or not set) or the latest acceptable time of arriving (`true`). Defaults to now" dateTime: DateTime, "Debug the itinerary-filter-chain. OTP will attach a system notice to itineraries instead of removing them. This is very convenient when tuning the filters." debugItineraryFilter: Boolean = false @deprecated(reason : "Use `itineraryFilter.debug` instead."), From 072210db36eed88a8ea759b56b42a151449a93b9 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Tue, 28 May 2024 17:16:50 +0200 Subject: [PATCH 1240/1688] Add nicer assertions to SiriTimetableSnapshotSourceTest --- .../siri/SiriTimetableSnapshotSourceTest.java | 145 +++++++++++------- 1 file changed, 92 insertions(+), 53 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index fa1af949bd3..b74fde4ec31 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -12,6 +12,7 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentripplanner.DateTimeHelper; +import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; @@ -73,10 +74,11 @@ void testAddJourney() { var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); - var tripTimes = env.getTripTimesForTrip("newJourney"); - assertEquals(RealTimeState.ADDED, tripTimes.getRealTimeState()); - assertEquals(2 * 60, tripTimes.getDepartureTime(0)); - assertEquals(4 * 60, tripTimes.getDepartureTime(1)); + assertEquals("ADDED | C1 0:02 0:02 | D1 0:04 0:04", env.getRealtimeTimetable("newJourney")); + assertEquals( + "SCHEDULED | C1 0:01 0:01 | D1 0:03 0:03", + env.getScheduledTimetable("newJourney") + ); } @Test @@ -98,14 +100,13 @@ void testReplaceJourney() { assertEquals(1, result.successful()); - var tripTimes = env.getTripTimesForTrip("newJourney"); - var pattern = env.getPatternForTrip(env.id("newJourney")); - assertEquals(RealTimeState.ADDED, tripTimes.getRealTimeState()); - assertEquals(2 * 60, tripTimes.getDepartureTime(0)); - assertEquals(4 * 60, tripTimes.getDepartureTime(1)); - assertEquals(env.stopA1.getId(), pattern.getStop(0).getId()); - assertEquals(env.stopC1.getId(), pattern.getStop(1).getId()); + assertEquals("ADDED | A1 0:02 0:02 | C1 0:04 0:04", env.getRealtimeTimetable("newJourney")); + assertEquals( + "SCHEDULED | A1 0:01 0:01 | C1 0:03 0:03", + env.getScheduledTimetable("newJourney") + ); + // Original trip should not get canceled var originalTripTimes = env.getTripTimesForTrip(env.trip1); assertEquals(RealTimeState.SCHEDULED, originalTripTimes.getRealTimeState()); } @@ -123,6 +124,10 @@ void testUpdateJourneyWithDatedVehicleJourneyRef() { var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); assertTripUpdated(env); + assertEquals( + "UPDATED | A1 0:00:15 0:00:15 | B1 0:00:25 0:00:25", + env.getRealtimeTimetable(env.trip1) + ); } /** @@ -214,15 +219,10 @@ void testChangeQuay() { var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); - - var pattern = env.getPatternForTrip(env.trip1.getId()); - var tripTimes = env.getTripTimesForTrip(env.trip1); - assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); - assertEquals(11, tripTimes.getScheduledDepartureTime(0)); - assertEquals(15, tripTimes.getDepartureTime(0)); - assertEquals(20, tripTimes.getScheduledArrivalTime(1)); - assertEquals(33, tripTimes.getArrivalTime(1)); - assertEquals(env.stopB2, pattern.getStop(1)); + assertEquals( + "MODIFIED | A1 0:00:15 0:00:15 | B2 0:00:33 0:00:33", + env.getRealtimeTimetable(env.trip1) + ); } @Test @@ -245,12 +245,10 @@ void testCancelStop() { var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); - - var pattern = env.getPatternForTrip(env.trip2.getId()); - - assertEquals(PickDrop.SCHEDULED, pattern.getAlightType(0)); - assertEquals(PickDrop.CANCELLED, pattern.getAlightType(1)); - assertEquals(PickDrop.SCHEDULED, pattern.getAlightType(2)); + assertEquals( + "MODIFIED | A1 0:01:01 0:01:01 | B1 0:01:10 0:01:11 CANCELLED | C1 0:01:30 0:01:30", + env.getRealtimeTimetable(env.trip2) + ); } // TODO: support this @@ -278,23 +276,10 @@ void testAddStop() { var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); - - var pattern = env.getPatternForTrip(env.trip1.getId()); - var tripTimes = env.getTripTimesForTrip(env.trip1); - assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); - assertEquals(11, tripTimes.getScheduledDepartureTime(0)); - assertEquals(15, tripTimes.getDepartureTime(0)); - - // Should it work to get the scheduled times from an extra call? - assertEquals(19, tripTimes.getScheduledArrivalTime(1)); - assertEquals(24, tripTimes.getScheduledDepartureTime(1)); - - assertEquals(20, tripTimes.getDepartureTime(1)); - assertEquals(25, tripTimes.getDepartureTime(1)); - - assertEquals(20, tripTimes.getScheduledArrivalTime(2)); - assertEquals(33, tripTimes.getArrivalTime(2)); - assertEquals(List.of(env.stopA1, env.stopD1, env.stopB1), pattern.getStops()); + assertEquals( + "MODIFIED | A1 0:00:15 0:00:15 | D1 0:00:20 0:00:25 CANCELLED | B1 0:00:33 0:00:33", + env.getRealtimeTimetable(env.trip1) + ); } ///////////////// @@ -414,21 +399,20 @@ private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType erro private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) { return new SiriEtBuilder(env.getDateTimeHelper()) - .withRecordedCalls(builder -> - builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") - ) .withEstimatedCalls(builder -> - builder.call(env.stopB1).arriveAimedExpected("00:00:20", "00:00:25") + builder + .call(env.stopA1) + .departAimedExpected("00:00:11", "00:00:15") + .call(env.stopB1) + .arriveAimedExpected("00:00:20", "00:00:25") ); } private static void assertTripUpdated(RealtimeTestEnvironment env) { - var tripTimes = env.getTripTimesForTrip(env.trip1); - assertEquals(RealTimeState.UPDATED, tripTimes.getRealTimeState()); - assertEquals(11, tripTimes.getScheduledDepartureTime(0)); - assertEquals(15, tripTimes.getDepartureTime(0)); - assertEquals(20, tripTimes.getScheduledArrivalTime(1)); - assertEquals(25, tripTimes.getArrivalTime(1)); + assertEquals( + "UPDATED | A1 0:00:15 0:00:15 | B1 0:00:25 0:00:25", + env.getRealtimeTimetable(env.trip1) + ); } private static class RealtimeTestEnvironment { @@ -565,6 +549,61 @@ public TripTimes getTripTimesForTrip(Trip trip) { return getTripTimesForTrip(trip.getId(), serviceDate); } + public String getRealtimeTimetable(String tripId) { + return getRealtimeTimetable(id(tripId), serviceDate); + } + + public String getRealtimeTimetable(Trip trip) { + return getRealtimeTimetable(trip.getId(), serviceDate); + } + + public String getRealtimeTimetable(FeedScopedId tripId, LocalDate serviceDate) { + var tt = getTripTimesForTrip(tripId, serviceDate); + var pattern = getPatternForTrip(tripId); + + return encodeTimetable(tt, pattern); + } + + public String getScheduledTimetable(String tripId) { + return getScheduledTimetable(id(tripId)); + } + + public String getScheduledTimetable(FeedScopedId tripId) { + var pattern = getPatternForTrip(tripId); + var tt = pattern.getScheduledTimetable().getTripTimes(tripId); + + return encodeTimetable(tt, pattern); + } + + /** + * This encodes the times and information about stops in a readable way in order to simplify + * testing. The format is: + * + * REALTIME_STATE | stop1 arrivalTime departureTime [CANCELLED] | stop2 ... + */ + private String encodeTimetable(TripTimes tripTimes, TripPattern pattern) { + var stops = pattern.getStops(); + + StringBuilder s = new StringBuilder(tripTimes.getRealTimeState().toString()); + for (int i = 0; i < tripTimes.getNumStops(); i++) { + var depart = tripTimes.getDepartureTime(i); + var arrive = tripTimes.getArrivalTime(i); + + s + .append(" | ") + .append(stops.get(i).getName()) + .append(" ") + .append(TimeUtils.timeToStrCompact(arrive)) + .append(" ") + .append(TimeUtils.timeToStrCompact(depart)); + + if (tripTimes.isCancelledStop(i)) { + s.append(" CANCELLED"); + } + } + return s.toString(); + } + /** * Find the current TripTimes for a trip id on the default serviceDate */ From 3cc15926a4edde4a54ac243f43514f560258042f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 29 May 2024 12:58:54 +0200 Subject: [PATCH 1241/1688] Update code after merge --- .../ext/siri/SiriRealtimeTestEnvironment.java | 32 ++++++++++++++-- .../siri/SiriTimetableSnapshotSourceTest.java | 37 ++++--------------- .../rejection/InvalidInputTest.java | 7 ++-- 3 files changed, 40 insertions(+), 36 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java index aba02333759..60bf1bb2daa 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java @@ -18,11 +18,11 @@ public class SiriRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment Duration.ZERO, false ); - private final SiriTimetableSnapshotSource source; + private final SiriTimetableSnapshotSource snapshotSource; public SiriRealtimeTestEnvironment() { super(); - source = new SiriTimetableSnapshotSource(PARAMETERS, transitModel); + snapshotSource = new SiriTimetableSnapshotSource(PARAMETERS, transitModel); } public EntityResolver getEntityResolver() { @@ -54,6 +54,32 @@ public TripTimes getTripTimesForTrip(String id) { } public UpdateResult applyEstimatedTimetable(List updates) { - return source.applyEstimatedTimetable(null, getEntityResolver(), getFeedId(), false, updates); + return snapshotSource.applyEstimatedTimetable( + null, + getEntityResolver(), + getFeedId(), + false, + updates + ); + } + + public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( + List updates + ) { + SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); + return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); + } + + private UpdateResult applyEstimatedTimetable( + List updates, + SiriFuzzyTripMatcher siriFuzzyTripMatcher + ) { + return this.snapshotSource.applyEstimatedTimetable( + siriFuzzyTripMatcher, + getEntityResolver(), + getFeedId(), + false, + updates + ); } } diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index e6028d9050c..bbb01f0a0a1 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -103,11 +103,11 @@ void testUpdateJourneyWithDatedVehicleJourneyRef() { */ @Test void testUpdateJourneyWithFramedVehicleJourneyRef() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = updatedJourneyBuilder(env) .withFramedVehicleJourneyRef(builder -> - builder.withServiceDate(env.serviceDate).withVehicleJourneyRef(env.trip1.getId().getId()) + builder.withServiceDate(env.SERVICE_DATE).withVehicleJourneyRef(env.trip1.getId().getId()) ) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -120,7 +120,7 @@ void testUpdateJourneyWithFramedVehicleJourneyRef() { */ @Test void testUpdateJourneyWithoutJourneyRef() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -133,7 +133,7 @@ void testUpdateJourneyWithoutJourneyRef() { */ @Test void testUpdateJourneyWithFuzzyMatching() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetableWithFuzzyMatcher(updates); @@ -147,11 +147,11 @@ void testUpdateJourneyWithFuzzyMatching() { */ @Test void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { - var env = new RealtimeTestEnvironment(); + var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withFramedVehicleJourneyRef(builder -> - builder.withServiceDate(env.serviceDate).withVehicleJourneyRef("XXX") + builder.withServiceDate(env.SERVICE_DATE).withVehicleJourneyRef("XXX") ) .withEstimatedCalls(builder -> builder @@ -385,7 +385,7 @@ private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType erro assertEquals(result.failures().keySet(), Set.of(errorType)); } - private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) { + private static SiriEtBuilder updatedJourneyBuilder(SiriRealtimeTestEnvironment env) { return new SiriEtBuilder(env.getDateTimeHelper()) .withRecordedCalls(builder -> builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") @@ -395,7 +395,7 @@ private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) ); } - private static void assertTripUpdated(RealtimeTestEnvironment env) { + private static void assertTripUpdated(SiriRealtimeTestEnvironment env) { var tripTimes = env.getTripTimesForTrip(env.trip1); assertEquals(RealTimeState.UPDATED, tripTimes.getRealTimeState()); assertEquals(11, tripTimes.getScheduledDepartureTime(0)); @@ -403,25 +403,4 @@ private static void assertTripUpdated(RealtimeTestEnvironment env) { assertEquals(20, tripTimes.getScheduledArrivalTime(1)); assertEquals(25, tripTimes.getArrivalTime(1)); } - - public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( - List updates - ) { - SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); - return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); - } - - private UpdateResult applyEstimatedTimetable( - List updates, - SiriFuzzyTripMatcher siriFuzzyTripMatcher - ) { - return this.snapshotSource.applyEstimatedTimetable( - siriFuzzyTripMatcher, - getEntityResolver(), - getFeedId(), - false, - updates - ); - } - } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index d6297456e0c..b194cdf1462 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -2,7 +2,7 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; import static org.opentripplanner.updater.trip.AbstractRealtimeTestEnvironment.SERVICE_DATE; @@ -11,7 +11,6 @@ import java.util.Set; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; @@ -38,8 +37,8 @@ public void invalidTripDate(LocalDate date) { var result = env.applyTripUpdates(update); - final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - assertNull(snapshot); + var snapshot = env.source.getTimetableSnapshot(); + assertTrue(snapshot.isEmpty()); assertEquals(1, result.failed()); var errors = result.failures().keySet(); assertEquals(Set.of(NO_SERVICE_ON_DATE), errors); From 399217c52ddca9d0238e9797955c9ac0e5d9df7d Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Wed, 29 May 2024 13:07:51 +0200 Subject: [PATCH 1242/1688] Add abbreviations for stop realtime states in test --- .../siri/SiriTimetableSnapshotSourceTest.java | 45 +++++++++++++------ 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index b74fde4ec31..4098c633c5b 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -5,6 +5,7 @@ import java.time.Duration; import java.time.LocalDate; import java.time.ZoneId; +import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -14,7 +15,6 @@ import org.opentripplanner.DateTimeHelper; import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; -import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.transit.model._data.TransitModelForTest; @@ -74,7 +74,7 @@ void testAddJourney() { var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); - assertEquals("ADDED | C1 0:02 0:02 | D1 0:04 0:04", env.getRealtimeTimetable("newJourney")); + assertEquals("ADDED | C1 [R] 0:02 0:02 | D1 0:04 0:04", env.getRealtimeTimetable("newJourney")); assertEquals( "SCHEDULED | C1 0:01 0:01 | D1 0:03 0:03", env.getScheduledTimetable("newJourney") @@ -100,7 +100,7 @@ void testReplaceJourney() { assertEquals(1, result.successful()); - assertEquals("ADDED | A1 0:02 0:02 | C1 0:04 0:04", env.getRealtimeTimetable("newJourney")); + assertEquals("ADDED | A1 [R] 0:02 0:02 | C1 0:04 0:04", env.getRealtimeTimetable("newJourney")); assertEquals( "SCHEDULED | A1 0:01 0:01 | C1 0:03 0:03", env.getScheduledTimetable("newJourney") @@ -220,7 +220,7 @@ void testChangeQuay() { assertEquals(1, result.successful()); assertEquals( - "MODIFIED | A1 0:00:15 0:00:15 | B2 0:00:33 0:00:33", + "MODIFIED | A1 [R] 0:00:15 0:00:15 | B2 0:00:33 0:00:33", env.getRealtimeTimetable(env.trip1) ); } @@ -246,7 +246,7 @@ void testCancelStop() { assertEquals(1, result.successful()); assertEquals( - "MODIFIED | A1 0:01:01 0:01:01 | B1 0:01:10 0:01:11 CANCELLED | C1 0:01:30 0:01:30", + "MODIFIED | A1 0:01:01 0:01:01 | B1 [C] 0:01:10 0:01:11 | C1 0:01:30 0:01:30", env.getRealtimeTimetable(env.trip2) ); } @@ -277,7 +277,7 @@ void testAddStop() { assertEquals(1, result.successful()); assertEquals( - "MODIFIED | A1 0:00:15 0:00:15 | D1 0:00:20 0:00:25 CANCELLED | B1 0:00:33 0:00:33", + "MODIFIED | A1 0:00:15 0:00:15 | D1 [C] 0:00:20 0:00:25 | B1 0:00:33 0:00:33", env.getRealtimeTimetable(env.trip1) ); } @@ -579,7 +579,15 @@ public String getScheduledTimetable(FeedScopedId tripId) { * This encodes the times and information about stops in a readable way in order to simplify * testing. The format is: * - * REALTIME_STATE | stop1 arrivalTime departureTime [CANCELLED] | stop2 ... + * 

              +     * REALTIME_STATE | stop1 [FLAGS] arrivalTime departureTime | stop2 ...
+     *
+     * Where flags are:
+     * C: Canceled
+     * R: Recorded
+     * PI: Prediction Inaccurate
+     * ND: No Data
+     *
              */ private String encodeTimetable(TripTimes tripTimes, TripPattern pattern) { var stops = pattern.getStops(); @@ -588,18 +596,29 @@ private String encodeTimetable(TripTimes tripTimes, TripPattern pattern) { for (int i = 0; i < tripTimes.getNumStops(); i++) { var depart = tripTimes.getDepartureTime(i); var arrive = tripTimes.getArrivalTime(i); + var flags = new ArrayList(); + if (tripTimes.isCancelledStop(i)) { + flags.add("C"); + } + if (tripTimes.isRecordedStop(i)) { + flags.add("R"); + } + if (tripTimes.isPredictionInaccurate(i)) { + flags.add("PI"); + } + if (tripTimes.isNoDataStop(i)) { + flags.add("ND"); + } + s.append(" | ").append(stops.get(i).getName()); + if (!flags.isEmpty()) { + s.append(" [").append(String.join(",", flags)).append("]"); + } s - .append(" | ") - .append(stops.get(i).getName()) .append(" ") .append(TimeUtils.timeToStrCompact(arrive)) .append(" ") .append(TimeUtils.timeToStrCompact(depart)); - - if (tripTimes.isCancelledStop(i)) { - s.append(" CANCELLED"); - } } return s.toString(); } From 5e1736cb4cab2ba39c6730338b2e047a889b5dce Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Wed, 29 May 2024 13:12:28 +0200 Subject: [PATCH 1243/1688] Switch expected-actual in assertFailure() --- .../siri/SiriTimetableSnapshotSourceTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 4098c633c5b..cd80da6f842 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -157,7 +157,7 @@ void testUpdateJourneyWithoutJourneyRef() { var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); assertEquals(0, result.successful()); - assertFailure(result, UpdateError.UpdateErrorType.TRIP_NOT_FOUND); + assertFailure(UpdateError.UpdateErrorType.TRIP_NOT_FOUND, result); } /** @@ -196,7 +196,7 @@ void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { var result = env.applyEstimatedTimetableWithFuzzyMatcher(updates); assertEquals(0, result.successful(), "Should fail gracefully"); - assertFailure(result, UpdateError.UpdateErrorType.NO_FUZZY_TRIP_MATCH); + assertFailure(UpdateError.UpdateErrorType.NO_FUZZY_TRIP_MATCH, result); } /** @@ -296,7 +296,7 @@ void testNotMonitored() { var result = env.applyEstimatedTimetable(updates); - assertFailure(result, UpdateError.UpdateErrorType.NOT_MONITORED); + assertFailure(UpdateError.UpdateErrorType.NOT_MONITORED, result); } @Test @@ -321,7 +321,7 @@ void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { var result = env.applyEstimatedTimetable(updates); // TODO: this should have a more specific error type - assertFailure(result, UpdateError.UpdateErrorType.UNKNOWN); + assertFailure(UpdateError.UpdateErrorType.UNKNOWN, result); } @Test @@ -341,7 +341,7 @@ void testNegativeHopTime() { var result = env.applyEstimatedTimetable(updates); - assertFailure(result, UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME); + assertFailure(UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME, result); } @Test @@ -364,7 +364,7 @@ void testNegativeDwellTime() { var result = env.applyEstimatedTimetable(updates); - assertFailure(result, UpdateError.UpdateErrorType.NEGATIVE_DWELL_TIME); + assertFailure(UpdateError.UpdateErrorType.NEGATIVE_DWELL_TIME, result); } // TODO: support this @@ -390,11 +390,11 @@ void testExtraUnknownStop() { var result = env.applyEstimatedTimetable(updates); - assertFailure(result, UpdateError.UpdateErrorType.INVALID_STOP_SEQUENCE); + assertFailure(UpdateError.UpdateErrorType.INVALID_STOP_SEQUENCE, result); } - private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType errorType) { - assertEquals(result.failures().keySet(), Set.of(errorType)); + private void assertFailure(UpdateError.UpdateErrorType expectedError, UpdateResult result) { + assertEquals(Set.of(expectedError), result.failures().keySet()); } private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) { From 4865cdc5d24e672f2471da93b82df4d6c396d816 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 29 May 2024 15:48:15 +0200 Subject: [PATCH 1244/1688] Apply suggestions from code review Co-authored-by: Johan Torin Co-authored-by: Leonard Ehrenfried --- .../ext/ridehailing/RideHailingAccessShifter.java | 2 +- .../apis/gtfs/generated/graphql-codegen.yml | 4 ++-- .../org/opentripplanner/framework/time/TimeUtils.java | 6 ++++++ .../opentripplanner/routing/api/request/RouteRequest.java | 2 +- .../transit/model/timetable/booking/BookingInfo.java | 2 +- .../model/timetable/booking/RoutingBookingInfo.java | 8 ++++---- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java index d406842a030..5e4eee09920 100644 --- a/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java +++ b/src/ext/java/org/opentripplanner/ext/ridehailing/RideHailingAccessShifter.java @@ -29,7 +29,7 @@ public class RideHailingAccessShifter { private static final Duration MAX_DURATION_FROM_NOW = Duration.ofMinutes(30); /** - * Given a list of {@link RoutingAccessEgress} shift the access ones that contain driving + * Given a list of {@link RoutingAccessEgress}, shift the access ones that contain driving * so that they only start at the time when the ride hailing vehicle can actually be there * to pick up passengers. */ diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index bed80cd2229..8ffdb6325c3 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -45,8 +45,8 @@ config: RentalVehicle: org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle#VehicleRentalVehicle VehicleRentalUris: org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris#VehicleRentalStationUris BikesAllowed: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed#GraphQLBikesAllowed - BookingInfo: org.opentripplanner.transit.model.timetable.booking.BookingInfo - BookingTime: org.opentripplanner.transit.model.timetable.booking.BookingTime + BookingInfo: org.opentripplanner.transit.model.timetable.booking.BookingInfo#BookingInfo + BookingTime: org.opentripplanner.transit.model.timetable.booking.BookingTime#BookingTime CarPark: org.opentripplanner.routing.vehicle_parking.VehicleParking#VehicleParking ContactInfo: org.opentripplanner.transit.model.organization.ContactInfo Cluster: Object diff --git a/src/main/java/org/opentripplanner/framework/time/TimeUtils.java b/src/main/java/org/opentripplanner/framework/time/TimeUtils.java index 1f64bbe84a4..9cc5594cb76 100644 --- a/src/main/java/org/opentripplanner/framework/time/TimeUtils.java +++ b/src/main/java/org/opentripplanner/framework/time/TimeUtils.java @@ -249,6 +249,12 @@ public static long busyWait(int waitMs) { return value; } + /** + * Calculate the relative time in seconds with the given {@code transitSearchTimeZero} as the + * base. There is no restriction on the returned time, it can be in the past(negative) and + * many days ahead of the base. This method can be used to translate an API instance of time + * into the OTP internal transit model time, when the search zero-point-in-time is known. + */ public static int toTransitTimeSeconds(ZonedDateTime transitSearchTimeZero, Instant time) { return (int) ChronoUnit.SECONDS.between(transitSearchTimeZero.toInstant(), time); } diff --git a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java index be208653cd1..67a08bfb138 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java +++ b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java @@ -115,7 +115,7 @@ public void withPreferences(Consumer body) { } /** - * The booking time is used exclude services witch is not bookable at the + * The booking time is used to exclude services which are not bookable at the * requested booking time. If a service is bookable at this time or later, the service * is included. Currently, OTP only supports this for FLEX access and egress. */ diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java index 628dc29c1aa..3e23696b65a 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/BookingInfo.java @@ -128,7 +128,7 @@ public String getDropOffMessage() { public String toString() { return ToStringBuilder .of(BookingInfo.class) - .addObj("cntactInfo", contactInfo) + .addObj("contactInfo", contactInfo) .addObj("bookingMethods", bookingMethods) .addObj("earliestBookingTime", earliestBookingTime) .addObj("latestBookingTime", latestBookingTime) diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java index 0674c6c5cbb..8dad53a0bde 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/booking/RoutingBookingInfo.java @@ -9,11 +9,11 @@ * This is the contract between booking info and the router. The router will enforce * this information if the request sets the earliest-booking-time request parameter. *

              - * Both {@code latestBookingTime} and {@code minimumBookingNotice} can be {@code null}, - * but at least one ot them must be none {@code null}. + * Either {@code latestBookingTime} and {@code minimumBookingNotice} must be set to + * an actual value, both can not be set to {@NOT_SET} simultaneously. *

              - * This class is not used by Raptor directly, but used by the BookingTimeAccessEgress with - * implement the RaptorAccessEgress interface. + * This class is not used by Raptor directly, but used by the BookingTimeAccessEgress which + * implements the RaptorAccessEgress interface. */ public final class RoutingBookingInfo { From 8f773971d022bc88628baa81afb52aec06de651a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 30 May 2024 13:22:36 +0200 Subject: [PATCH 1245/1688] Replace inheritance with composition --- .../ext/siri/SiriRealtimeTestEnvironment.java | 34 +++-- .../siri/SiriTimetableSnapshotSourceTest.java | 138 ++++++++++-------- .../trip/GtfsRealtimeTestEnvironment.java | 16 +- ...Environment.java => RealtimeTestData.java} | 14 +- .../CancellationDeletionTest.java | 15 +- .../trip/moduletests/delay/DelayedTest.java | 22 +-- .../trip/moduletests/delay/SkippedTest.java | 24 +-- .../rejection/InvalidInputTest.java | 9 +- 8 files changed, 159 insertions(+), 113 deletions(-) rename src/test/java/org/opentripplanner/updater/trip/{AbstractRealtimeTestEnvironment.java => RealtimeTestData.java} (92%) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java index 60bf1bb2daa..ab449a6db19 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java @@ -3,38 +3,42 @@ import java.time.Duration; import java.time.LocalDate; import java.util.List; +import org.opentripplanner.DateTimeHelper; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.spi.UpdateResult; -import org.opentripplanner.updater.trip.AbstractRealtimeTestEnvironment; +import org.opentripplanner.updater.trip.RealtimeTestData; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; -public class SiriRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment { +public class SiriRealtimeTestEnvironment { + + public final RealtimeTestData testData = new RealtimeTestData(); private static final TimetableSnapshotSourceParameters PARAMETERS = new TimetableSnapshotSourceParameters( Duration.ZERO, false ); private final SiriTimetableSnapshotSource snapshotSource; + private final DateTimeHelper dateTimeHelper; public SiriRealtimeTestEnvironment() { - super(); - snapshotSource = new SiriTimetableSnapshotSource(PARAMETERS, transitModel); + snapshotSource = new SiriTimetableSnapshotSource(PARAMETERS, testData.transitModel); + dateTimeHelper = new DateTimeHelper(testData.timeZone, RealtimeTestData.SERVICE_DATE); } public EntityResolver getEntityResolver() { - return new EntityResolver(getTransitService(), getFeedId()); + return new EntityResolver(testData.getTransitService(), testData.getFeedId()); } public TripPattern getPatternForTrip(FeedScopedId tripId) { - return getPatternForTrip(tripId, SERVICE_DATE); + return getPatternForTrip(tripId, RealtimeTestData.SERVICE_DATE); } public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { - var transitService = getTransitService(); + var transitService = testData.getTransitService(); var trip = transitService.getTripOnServiceDateById(tripId); return transitService.getPatternForTrip(trip.getTrip(), serviceDate); } @@ -43,21 +47,21 @@ public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) * Find the current TripTimes for a trip id on the default serviceDate */ public TripTimes getTripTimesForTrip(Trip trip) { - return getTripTimesForTrip(trip.getId(), SERVICE_DATE); + return testData.getTripTimesForTrip(trip.getId(), RealtimeTestData.SERVICE_DATE); } /** * Find the current TripTimes for a trip id on the default serviceDate */ public TripTimes getTripTimesForTrip(String id) { - return getTripTimesForTrip(id(id), SERVICE_DATE); + return testData.getTripTimesForTrip(testData.id(id), RealtimeTestData.SERVICE_DATE); } public UpdateResult applyEstimatedTimetable(List updates) { return snapshotSource.applyEstimatedTimetable( null, getEntityResolver(), - getFeedId(), + testData.getFeedId(), false, updates ); @@ -66,10 +70,16 @@ public UpdateResult applyEstimatedTimetable(List updates ) { - SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); + SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher( + testData.getTransitService() + ); return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); } + public DateTimeHelper getDateTimeHelper() { + return dateTimeHelper; + } + private UpdateResult applyEstimatedTimetable( List updates, SiriFuzzyTripMatcher siriFuzzyTripMatcher @@ -77,7 +87,7 @@ private UpdateResult applyEstimatedTimetable( return this.snapshotSource.applyEstimatedTimetable( siriFuzzyTripMatcher, getEntityResolver(), - getFeedId(), + testData.getFeedId(), false, updates ); diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index bbb01f0a0a1..7082f93daec 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -10,6 +10,7 @@ import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; +import org.opentripplanner.updater.trip.RealtimeTestData; class SiriTimetableSnapshotSourceTest { @@ -17,30 +18,41 @@ class SiriTimetableSnapshotSourceTest { void testCancelTrip() { var env = new SiriRealtimeTestEnvironment(); - assertEquals(RealTimeState.SCHEDULED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); + assertEquals( + RealTimeState.SCHEDULED, + env.getTripTimesForTrip(env.testData.trip1).getRealTimeState() + ); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) .withCancellation(true) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); - assertEquals(RealTimeState.CANCELED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); + assertEquals( + RealTimeState.CANCELED, + env.getTripTimesForTrip(env.testData.trip1).getRealTimeState() + ); } @Test void testAddJourney() { var env = new SiriRealtimeTestEnvironment(); + var testData = env.testData; var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) - .withOperatorRef(env.operator1Id.getId()) - .withLineRef(env.route1Id.getId()) - .withRecordedCalls(builder -> builder.call(env.stopC1).departAimedActual("00:01", "00:02")) - .withEstimatedCalls(builder -> builder.call(env.stopD1).arriveAimedExpected("00:03", "00:04")) + .withOperatorRef(testData.operator1Id.getId()) + .withLineRef(testData.route1Id.getId()) + .withRecordedCalls(builder -> + builder.call(testData.stopC1).departAimedActual("00:01", "00:02") + ) + .withEstimatedCalls(builder -> + builder.call(testData.stopD1).arriveAimedExpected("00:03", "00:04") + ) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -55,16 +67,21 @@ void testAddJourney() { @Test void testReplaceJourney() { var env = new SiriRealtimeTestEnvironment(); + var testData = env.testData; var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) // replace trip1 - .withVehicleJourneyRef(env.trip1.getId().getId()) - .withOperatorRef(env.operator1Id.getId()) - .withLineRef(env.route1Id.getId()) - .withRecordedCalls(builder -> builder.call(env.stopA1).departAimedActual("00:01", "00:02")) - .withEstimatedCalls(builder -> builder.call(env.stopC1).arriveAimedExpected("00:03", "00:04")) + .withVehicleJourneyRef(testData.trip1.getId().getId()) + .withOperatorRef(testData.operator1Id.getId()) + .withLineRef(testData.route1Id.getId()) + .withRecordedCalls(builder -> + builder.call(testData.stopA1).departAimedActual("00:01", "00:02") + ) + .withEstimatedCalls(builder -> + builder.call(testData.stopC1).arriveAimedExpected("00:03", "00:04") + ) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -72,14 +89,14 @@ void testReplaceJourney() { assertEquals(1, result.successful()); var tripTimes = env.getTripTimesForTrip("newJourney"); - var pattern = env.getPatternForTrip(env.id("newJourney")); + var pattern = env.getPatternForTrip(testData.id("newJourney")); assertEquals(RealTimeState.ADDED, tripTimes.getRealTimeState()); assertEquals(2 * 60, tripTimes.getDepartureTime(0)); assertEquals(4 * 60, tripTimes.getDepartureTime(1)); - assertEquals(env.stopA1.getId(), pattern.getStop(0).getId()); - assertEquals(env.stopC1.getId(), pattern.getStop(1).getId()); + assertEquals(testData.stopA1.getId(), pattern.getStop(0).getId()); + assertEquals(testData.stopC1.getId(), pattern.getStop(1).getId()); - var originalTripTimes = env.getTripTimesForTrip(env.trip1); + var originalTripTimes = env.getTripTimesForTrip(testData.trip1); assertEquals(RealTimeState.SCHEDULED, originalTripTimes.getRealTimeState()); } @@ -91,7 +108,7 @@ void testUpdateJourneyWithDatedVehicleJourneyRef() { var env = new SiriRealtimeTestEnvironment(); var updates = updatedJourneyBuilder(env) - .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); @@ -107,7 +124,9 @@ void testUpdateJourneyWithFramedVehicleJourneyRef() { var updates = updatedJourneyBuilder(env) .withFramedVehicleJourneyRef(builder -> - builder.withServiceDate(env.SERVICE_DATE).withVehicleJourneyRef(env.trip1.getId().getId()) + builder + .withServiceDate(RealtimeTestData.SERVICE_DATE) + .withVehicleJourneyRef(env.testData.trip1.getId().getId()) ) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -151,13 +170,13 @@ void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withFramedVehicleJourneyRef(builder -> - builder.withServiceDate(env.SERVICE_DATE).withVehicleJourneyRef("XXX") + builder.withServiceDate(RealtimeTestData.SERVICE_DATE).withVehicleJourneyRef("XXX") ) .withEstimatedCalls(builder -> builder - .call(env.stopA1) + .call(env.testData.stopA1) .departAimedExpected(null, "00:00:12") - .call(env.stopB1) + .call(env.testData.stopB1) .arriveAimedExpected("00:00:20", "00:00:22") ) .buildEstimatedTimetableDeliveries(); @@ -175,12 +194,12 @@ void testChangeQuay() { var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) .withRecordedCalls(builder -> - builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") + builder.call(env.testData.stopA1).departAimedActual("00:00:11", "00:00:15") ) .withEstimatedCalls(builder -> - builder.call(env.stopB2).arriveAimedExpected("00:00:20", "00:00:33") + builder.call(env.testData.stopB2).arriveAimedExpected("00:00:20", "00:00:33") ) .buildEstimatedTimetableDeliveries(); @@ -188,14 +207,14 @@ void testChangeQuay() { assertEquals(1, result.successful()); - var pattern = env.getPatternForTrip(env.trip1.getId()); - var tripTimes = env.getTripTimesForTrip(env.trip1); + var pattern = env.getPatternForTrip(env.testData.trip1.getId()); + var tripTimes = env.getTripTimesForTrip(env.testData.trip1); assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); assertEquals(11, tripTimes.getScheduledDepartureTime(0)); assertEquals(15, tripTimes.getDepartureTime(0)); assertEquals(20, tripTimes.getScheduledArrivalTime(1)); assertEquals(33, tripTimes.getArrivalTime(1)); - assertEquals(env.stopB2, pattern.getStop(1)); + assertEquals(env.testData.stopB2, pattern.getStop(1)); } @Test @@ -203,14 +222,14 @@ void testCancelStop() { var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.trip2.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip2.getId().getId()) .withEstimatedCalls(builder -> builder - .call(env.stopA1) + .call(env.testData.stopA1) .departAimedExpected("00:01:01", "00:01:01") - .call(env.stopB1) + .call(env.testData.stopB1) .withIsCancellation(true) - .call(env.stopC1) + .call(env.testData.stopC1) .arriveAimedExpected("00:01:30", "00:01:30") ) .buildEstimatedTimetableDeliveries(); @@ -219,7 +238,7 @@ void testCancelStop() { assertEquals(1, result.successful()); - var pattern = env.getPatternForTrip(env.trip2.getId()); + var pattern = env.getPatternForTrip(env.testData.trip2.getId()); assertEquals(PickDrop.SCHEDULED, pattern.getAlightType(0)); assertEquals(PickDrop.CANCELLED, pattern.getAlightType(1)); @@ -233,17 +252,17 @@ void testAddStop() { var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) .withRecordedCalls(builder -> - builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") + builder.call(env.testData.stopA1).departAimedActual("00:00:11", "00:00:15") ) .withEstimatedCalls(builder -> builder - .call(env.stopD1) + .call(env.testData.stopD1) .withIsExtraCall(true) .arriveAimedExpected("00:00:19", "00:00:20") .departAimedExpected("00:00:24", "00:00:25") - .call(env.stopB1) + .call(env.testData.stopB1) .arriveAimedExpected("00:00:20", "00:00:33") ) .buildEstimatedTimetableDeliveries(); @@ -252,8 +271,8 @@ void testAddStop() { assertEquals(1, result.successful()); - var pattern = env.getPatternForTrip(env.trip1.getId()); - var tripTimes = env.getTripTimesForTrip(env.trip1); + var pattern = env.getPatternForTrip(env.testData.trip1.getId()); + var tripTimes = env.getTripTimesForTrip(env.testData.trip1); assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); assertEquals(11, tripTimes.getScheduledDepartureTime(0)); assertEquals(15, tripTimes.getDepartureTime(0)); @@ -267,7 +286,10 @@ void testAddStop() { assertEquals(20, tripTimes.getScheduledArrivalTime(2)); assertEquals(33, tripTimes.getArrivalTime(2)); - assertEquals(List.of(env.stopA1, env.stopD1, env.stopB1), pattern.getStops()); + assertEquals( + List.of(env.testData.stopA1, env.testData.stopD1, env.testData.stopB1), + pattern.getStops() + ); } ///////////////// @@ -294,14 +316,14 @@ void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef("newJourney") .withIsExtraJourney(true) - .withVehicleJourneyRef(env.trip1.getId().getId()) - .withOperatorRef(env.operator1Id.getId()) - .withLineRef(env.route1Id.getId()) + .withVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withOperatorRef(env.testData.operator1Id.getId()) + .withLineRef(env.testData.route1Id.getId()) .withEstimatedCalls(builder -> builder - .call(env.stopA1) + .call(env.testData.stopA1) .departAimedExpected("00:01", "00:02") - .call(env.stopC1) + .call(env.testData.stopC1) .arriveAimedExpected("00:03", "00:04") ) .buildEstimatedTimetableDeliveries(); @@ -317,12 +339,12 @@ void testNegativeHopTime() { var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) .withRecordedCalls(builder -> builder - .call(env.stopA1) + .call(env.testData.stopA1) .departAimedActual("00:00:11", "00:00:15") - .call(env.stopB1) + .call(env.testData.stopB1) .arriveAimedActual("00:00:20", "00:00:14") ) .buildEstimatedTimetableDeliveries(); @@ -337,15 +359,15 @@ void testNegativeDwellTime() { var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.trip2.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip2.getId().getId()) .withRecordedCalls(builder -> builder - .call(env.stopA1) + .call(env.testData.stopA1) .departAimedActual("00:01:01", "00:01:01") - .call(env.stopB1) + .call(env.testData.stopB1) .arriveAimedActual("00:01:10", "00:01:13") .departAimedActual("00:01:11", "00:01:12") - .call(env.stopB1) + .call(env.testData.stopB1) .arriveAimedActual("00:01:20", "00:01:20") ) .buildEstimatedTimetableDeliveries(); @@ -362,16 +384,16 @@ void testExtraUnknownStop() { var env = new SiriRealtimeTestEnvironment(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) .withEstimatedCalls(builder -> builder - .call(env.stopA1) + .call(env.testData.stopA1) .departAimedExpected("00:00:11", "00:00:15") // Unexpected extra stop without isExtraCall flag - .call(env.stopD1) + .call(env.testData.stopD1) .arriveAimedExpected("00:00:19", "00:00:20") .departAimedExpected("00:00:24", "00:00:25") - .call(env.stopB1) + .call(env.testData.stopB1) .arriveAimedExpected("00:00:20", "00:00:33") ) .buildEstimatedTimetableDeliveries(); @@ -388,15 +410,15 @@ private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType erro private static SiriEtBuilder updatedJourneyBuilder(SiriRealtimeTestEnvironment env) { return new SiriEtBuilder(env.getDateTimeHelper()) .withRecordedCalls(builder -> - builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") + builder.call(env.testData.stopA1).departAimedActual("00:00:11", "00:00:15") ) .withEstimatedCalls(builder -> - builder.call(env.stopB1).arriveAimedExpected("00:00:20", "00:00:25") + builder.call(env.testData.stopB1).arriveAimedExpected("00:00:20", "00:00:25") ); } private static void assertTripUpdated(SiriRealtimeTestEnvironment env) { - var tripTimes = env.getTripTimesForTrip(env.trip1); + var tripTimes = env.getTripTimesForTrip(env.testData.trip1); assertEquals(RealTimeState.UPDATED, tripTimes.getRealTimeState()); assertEquals(11, tripTimes.getScheduledDepartureTime(0)); assertEquals(15, tripTimes.getDepartureTime(0)); diff --git a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java index 837abfb98ae..80fa1805e36 100644 --- a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java @@ -8,14 +8,18 @@ import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.spi.UpdateResult; -public class GtfsRealtimeTestEnvironment extends AbstractRealtimeTestEnvironment { +public class GtfsRealtimeTestEnvironment { + private static final TimetableSnapshotSourceParameters PARAMETERS = new TimetableSnapshotSourceParameters( + Duration.ZERO, + false + ); public final TimetableSnapshotSource source; + public final RealtimeTestData testData = new RealtimeTestData(); + public GtfsRealtimeTestEnvironment() { - super(); - var parameters = new TimetableSnapshotSourceParameters(Duration.ZERO, false); - source = new TimetableSnapshotSource(parameters, transitModel); + source = new TimetableSnapshotSource(PARAMETERS, testData.transitModel); } public UpdateResult applyTripUpdates(GtfsRealtime.TripUpdate update) { @@ -28,11 +32,11 @@ public UpdateResult applyTripUpdates(List updates) { BackwardsDelayPropagationType.REQUIRED_NO_DATA, true, updates, - getFeedId() + testData.getFeedId() ); } public TripPattern getPatternForTrip(Trip trip) { - return transitModel.getTransitModelIndex().getPatternForTrip().get(trip); + return testData.transitModel.getTransitModelIndex().getPatternForTrip().get(trip); } } diff --git a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java similarity index 92% rename from src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java rename to src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java index 49b6f0c5b7a..4e96619014f 100644 --- a/src/test/java/org/opentripplanner/updater/trip/AbstractRealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java @@ -5,7 +5,6 @@ import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; -import org.opentripplanner.DateTimeHelper; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; @@ -26,10 +25,10 @@ import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; -public abstract class AbstractRealtimeTestEnvironment { +public final class RealtimeTestData { public static final LocalDate SERVICE_DATE = LocalDate.of(2024, 5, 8); - protected static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); + public static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); public final Station stationA = testModel.station("A").build(); @@ -53,10 +52,9 @@ public abstract class AbstractRealtimeTestEnvironment { public final FeedScopedId route1Id = TransitModelForTest.id("TestRoute1"); public final Trip trip1; public final Trip trip2; - public final DateTimeHelper dateTimeHelper = new DateTimeHelper(timeZone, SERVICE_DATE); public final TransitModel transitModel; - public AbstractRealtimeTestEnvironment() { + public RealtimeTestData() { transitModel = new TransitModel(stopModel, new Deduplicator()); transitModel.initTimeZone(timeZone); transitModel.addAgency(TransitModelForTest.AGENCY); @@ -105,15 +103,11 @@ public TripTimes getTripTimesForTrip(FeedScopedId tripId, LocalDate serviceDate) return timetable.getTripTimes(trip); } - public DateTimeHelper getDateTimeHelper() { - return dateTimeHelper; - } - public String getFeedId() { return TransitModelForTest.FEED_ID; } - protected Trip createTrip(String id, Route route, List stops) { + private Trip createTrip(String id, Route route, List stops) { var trip = Trip.of(id(id)).withRoute(route).withServiceId(CAL_ID).build(); var tripOnServiceDate = TripOnServiceDate diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index d5ceba912c4..0abf3583380 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -13,6 +13,7 @@ import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; +import org.opentripplanner.updater.trip.RealtimeTestData; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** @@ -32,15 +33,17 @@ static List cases() { @MethodSource("cases") public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { var env = new GtfsRealtimeTestEnvironment(); - var pattern1 = env.transitModel.getTransitModelIndex().getPatternForTrip().get(env.trip1); + var pattern1 = env.getPatternForTrip(env.testData.trip1); - final int tripIndex1 = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); + final int tripIndex1 = pattern1 + .getScheduledTimetable() + .getTripIndex(env.testData.trip1.getId()); var update = new TripUpdateBuilder( - env.trip1.getId().getId(), - env.SERVICE_DATE, + env.testData.trip1.getId().getId(), + RealtimeTestData.SERVICE_DATE, relationship, - env.timeZone + env.testData.timeZone ) .build(); var result = env.applyTripUpdates(update); @@ -48,7 +51,7 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state assertEquals(1, result.successful()); final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern1, env.SERVICE_DATE); + final Timetable forToday = snapshot.resolve(pattern1, RealtimeTestData.SERVICE_DATE); final Timetable schedule = snapshot.resolve(pattern1, null); assertNotSame(forToday, schedule); assertNotSame(forToday.getTripTimes(tripIndex1), schedule.getTripTimes(tripIndex1)); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index 389c43d5325..673d0b0326b 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -10,6 +10,7 @@ import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; +import org.opentripplanner.updater.trip.RealtimeTestData; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** @@ -23,12 +24,13 @@ public class DelayedTest { @Test public void delayed() { var env = new GtfsRealtimeTestEnvironment(); + var testData = env.testData; var tripUpdate = new TripUpdateBuilder( - env.trip1.getId().getId(), - env.SERVICE_DATE, + env.testData.trip1.getId().getId(), + RealtimeTestData.SERVICE_DATE, SCHEDULED, - env.timeZone + testData.timeZone ) .addDelayedStopTime(STOP_SEQUENCE, DELAY) .build(); @@ -39,11 +41,13 @@ public void delayed() { // trip1 should be modified { - var pattern1 = env.getPatternForTrip(env.trip1); - final int trip1Index = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); + var pattern1 = env.getPatternForTrip(env.testData.trip1); + final int trip1Index = pattern1 + .getScheduledTimetable() + .getTripIndex(env.testData.trip1.getId()); final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable trip1Realtime = snapshot.resolve(pattern1, env.SERVICE_DATE); + final Timetable trip1Realtime = snapshot.resolve(pattern1, RealtimeTestData.SERVICE_DATE); final Timetable trip1Scheduled = snapshot.resolve(pattern1, null); assertNotSame(trip1Realtime, trip1Scheduled); @@ -66,11 +70,11 @@ public void delayed() { // trip2 should keep the scheduled information { - var pattern = env.getPatternForTrip(env.trip2); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); + var pattern = env.getPatternForTrip(testData.trip2); + final int tripIndex = pattern.getScheduledTimetable().getTripIndex(testData.trip2.getId()); final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable realtime = snapshot.resolve(pattern, env.SERVICE_DATE); + final Timetable realtime = snapshot.resolve(pattern, RealtimeTestData.SERVICE_DATE); final Timetable scheduled = snapshot.resolve(pattern, null); assertSame(realtime, scheduled); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 4c872fd1b8d..3cbb6e985c2 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -15,6 +15,7 @@ import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; +import org.opentripplanner.updater.trip.RealtimeTestData; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** @@ -25,13 +26,13 @@ public class SkippedTest { @Test public void scheduledTripWithSkippedAndScheduled() { var env = new GtfsRealtimeTestEnvironment(); - String scheduledTripId = env.trip2.getId().getId(); + String scheduledTripId = env.testData.trip2.getId().getId(); var tripUpdate = new TripUpdateBuilder( scheduledTripId, - env.SERVICE_DATE, + RealtimeTestData.SERVICE_DATE, SCHEDULED, - env.timeZone + env.testData.timeZone ) .addDelayedStopTime(0, 0) .addSkippedStop(1) @@ -46,16 +47,16 @@ public void scheduledTripWithSkippedAndScheduled() { // Original trip pattern { - final FeedScopedId tripId = env.trip2.getId(); - final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = env.transitModel + final FeedScopedId tripId = env.testData.trip2.getId(); + final Trip trip = env.testData.transitModel.getTransitModelIndex().getTripForId().get(tripId); + final TripPattern originalTripPattern = env.testData.transitModel .getTransitModelIndex() .getPatternForTrip() .get(trip); final Timetable originalTimetableForToday = snapshot.resolve( originalTripPattern, - env.SERVICE_DATE + RealtimeTestData.SERVICE_DATE ); final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); @@ -76,11 +77,14 @@ public void scheduledTripWithSkippedAndScheduled() { // New trip pattern { final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( - env.trip2.getId(), - env.SERVICE_DATE + env.testData.trip2.getId(), + RealtimeTestData.SERVICE_DATE ); - final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, env.SERVICE_DATE); + final Timetable newTimetableForToday = snapshot.resolve( + newTripPattern, + RealtimeTestData.SERVICE_DATE + ); final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); assertNotSame(newTimetableForToday, newTimetableScheduled); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index b194cdf1462..e3bfaf95b8c 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; -import static org.opentripplanner.updater.trip.AbstractRealtimeTestEnvironment.SERVICE_DATE; +import static org.opentripplanner.updater.trip.RealtimeTestData.SERVICE_DATE; import java.time.LocalDate; import java.util.List; @@ -29,7 +29,12 @@ public static List cases() { public void invalidTripDate(LocalDate date) { var env = new GtfsRealtimeTestEnvironment(); - var update = new TripUpdateBuilder(env.trip1.getId().getId(), date, SCHEDULED, env.timeZone) + var update = new TripUpdateBuilder( + env.testData.trip1.getId().getId(), + date, + SCHEDULED, + env.testData.timeZone + ) .addDelayedStopTime(1, 0) .addDelayedStopTime(2, 60, 80) .addDelayedStopTime(3, 90, 90) From 13526c8d06e043c65691af5202de79b0fb642b50 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 30 May 2024 13:27:31 +0200 Subject: [PATCH 1246/1688] Add Javadoc --- .../org/opentripplanner/updater/trip/RealtimeTestData.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java index 4e96619014f..120ea153132 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java @@ -25,6 +25,13 @@ import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; +/** + * This class exists so that you can share the data building logic for GTFS and Siri tests. + * Since it's not possible to add a Siri and GTFS updater to the transit model at the same time, + * they each have their own test environment. + *

              + * It is however a goal to change that and then these two can be combined together. + */ public final class RealtimeTestData { public static final LocalDate SERVICE_DATE = LocalDate.of(2024, 5, 8); From 3bbdd65b64b39ad99bae6edac92f0e2a07983e0e Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 30 May 2024 13:58:02 +0200 Subject: [PATCH 1247/1688] refactor: Rename test --- .../java/org/opentripplanner/framework/time/TimeUtilsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java b/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java index 63224c499a9..c2eb828cc21 100644 --- a/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/time/TimeUtilsTest.java @@ -184,7 +184,7 @@ void testMsToString() { } @Test - void testOtpTime() { + void toTransitTimeSeconds() { var timeZero = ZonedDateTime.of( LocalDate.of(2024, Month.JANUARY, 15), LocalTime.of(0, 0, 0), From 2a3eeb5d1632410879d539548e58a84fc74823b6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 30 May 2024 14:01:13 +0200 Subject: [PATCH 1248/1688] Extract TimetableSnapshotManager --- .../ext/siri/SiriTimetableSnapshotSource.java | 44 ++++++++----- ...rce.java => TimetableSnapshotManager.java} | 62 ++++++++++++++----- .../updater/trip/TimetableSnapshotSource.java | 42 +++++++++---- .../trip/TimetableSnapshotSourceTest.java | 2 +- 4 files changed, 106 insertions(+), 44 deletions(-) rename src/main/java/org/opentripplanner/updater/trip/{AbstractTimetableSnapshotSource.java => TimetableSnapshotManager.java} (80%) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 99e9063418c..48d7f6d782f 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -14,6 +14,7 @@ import javax.annotation.Nullable; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.model.TimetableSnapshotProvider; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Result; import org.opentripplanner.transit.model.network.TripPattern; @@ -28,7 +29,7 @@ import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.UpdateSuccess; -import org.opentripplanner.updater.trip.AbstractTimetableSnapshotSource; +import org.opentripplanner.updater.trip.TimetableSnapshotManager; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; @@ -39,7 +40,7 @@ * necessary to provide planning threads a consistent constant view of a graph with real-time data at * a specific point in time. */ -public class SiriTimetableSnapshotSource extends AbstractTimetableSnapshotSource { +public class SiriTimetableSnapshotSource implements TimetableSnapshotProvider { private static final Logger LOG = LoggerFactory.getLogger(SiriTimetableSnapshotSource.class); @@ -57,15 +58,18 @@ public class SiriTimetableSnapshotSource extends AbstractTimetableSnapshotSource private final TransitService transitService; + private final TimetableSnapshotManager snapshotManager; + public SiriTimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel ) { - super( - transitModel.getTransitLayerUpdater(), - parameters, - () -> LocalDate.now(transitModel.getTimeZone()) - ); + this.snapshotManager = + new TimetableSnapshotManager( + transitModel.getTransitLayerUpdater(), + parameters, + () -> LocalDate.now(transitModel.getTimeZone()) + ); this.transitModel = transitModel; this.transitService = new DefaultTransitService(transitModel); this.tripPatternCache = @@ -97,10 +101,10 @@ public UpdateResult applyEstimatedTimetable( List> results = new ArrayList<>(); - withLock(() -> { + snapshotManager.withLock(() -> { if (fullDataset) { // Remove all updates from the buffer - buffer.clear(feedId); + snapshotManager.clearBuffer(feedId); } for (var etDelivery : updates) { @@ -115,12 +119,17 @@ public UpdateResult applyEstimatedTimetable( LOG.debug("message contains {} trip updates", updates.size()); - purgeAndCommit(); + snapshotManager.purgeAndCommit(); }); return UpdateResult.ofResults(results); } + @Override + public TimetableSnapshot getTimetableSnapshot() { + return snapshotManager.getTimetableSnapshot(); + } + private Result apply( EstimatedVehicleJourney journey, TransitModel transitModel, @@ -225,7 +234,7 @@ private Result handleModifiedTrip( estimatedVehicleJourney, entityResolver, this::getCurrentTimetable, - buffer::getRealtimeAddedTripPattern + snapshotManager::getRealtimeAddedTripPattern ); if (tripAndPattern == null) { @@ -287,7 +296,7 @@ private Result addTripToGraphAndBuffer(TripUpdate tr serviceDate ); // Add new trip times to buffer, making protective copies as needed. Bubble success/error up. - var result = buffer.update(pattern, tripUpdate.tripTimes(), serviceDate); + var result = snapshotManager.updateBuffer(pattern, tripUpdate.tripTimes(), serviceDate); LOG.debug("Applied real-time data for trip {} on {}", trip, serviceDate); return result; } @@ -313,7 +322,7 @@ private boolean markScheduledTripAsDeleted(Trip trip, final LocalDate serviceDat } else { final RealTimeTripTimes newTripTimes = tripTimes.copyScheduledTimes(); newTripTimes.deleteTrip(); - buffer.update(pattern, newTripTimes, serviceDate); + snapshotManager.updateBuffer(pattern, newTripTimes, serviceDate); success = true; } } @@ -330,12 +339,15 @@ private boolean markScheduledTripAsDeleted(Trip trip, final LocalDate serviceDat private boolean removePreviousRealtimeUpdate(final Trip trip, final LocalDate serviceDate) { boolean success = false; - final TripPattern pattern = buffer.getRealtimeAddedTripPattern(trip.getId(), serviceDate); + final TripPattern pattern = snapshotManager.getRealtimeAddedTripPattern( + trip.getId(), + serviceDate + ); if (pattern != null) { // Remove the previous real-time-added TripPattern from buffer. // Only one version of the real-time-update should exist - buffer.removeLastAddedTripPattern(trip.getId(), serviceDate); - buffer.removeRealtimeUpdatedTripTimes(pattern, trip.getId(), serviceDate); + snapshotManager.removeLastAddedTripPattern(trip.getId(), serviceDate); + snapshotManager.removeRealtimeUpdatedTripTimes(pattern, trip.getId(), serviceDate); success = true; } diff --git a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java similarity index 80% rename from src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java rename to src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index 3df4f2aba59..a404adb4ef0 100644 --- a/src/main/java/org/opentripplanner/updater/trip/AbstractTimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -5,10 +5,16 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; import org.opentripplanner.framework.time.CountdownTimer; +import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.model.TimetableSnapshotProvider; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.framework.Result; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.TimetableSnapshotSourceParameters; +import org.opentripplanner.updater.spi.UpdateError; +import org.opentripplanner.updater.spi.UpdateSuccess; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -16,14 +22,14 @@ * A base class for which abstracts away locking, updating, committing and purging of the timetable snapshot. * In order to keep code reviews easier this is an intermediate stage and will be refactored further. * In particular the following refactorings are planned: - * + *

              * - use composition instead of inheritance * - make the buffer private to this class and add an API for its access * - create only one "snapshot manager" per transit model that is shared between Siri/GTFS-RT updaters */ -public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvider { +public final class TimetableSnapshotManager { - private static final Logger LOG = LoggerFactory.getLogger(AbstractTimetableSnapshotSource.class); + private static final Logger LOG = LoggerFactory.getLogger(TimetableSnapshotManager.class); private final TransitLayerUpdater transitLayerUpdater; /** * Lock to indicate that buffer is in use @@ -35,7 +41,7 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that * might modify this buffer will correctly acquire the lock. */ - protected final TimetableSnapshot buffer = new TimetableSnapshot(); + private final TimetableSnapshot buffer = new TimetableSnapshot(); /** * The working copy of the timetable snapshot. Should not be visible to routing threads. Should @@ -75,7 +81,7 @@ public class AbstractTimetableSnapshotSource implements TimetableSnapshotProvide * @param localDateNow This supplier allows you to inject a custom lambda to override what is * considered 'today'. This is useful for unit testing. */ - public AbstractTimetableSnapshotSource( + public TimetableSnapshotManager( TransitLayerUpdater transitLayerUpdater, TimetableSnapshotSourceParameters parameters, Supplier localDateNow @@ -94,7 +100,7 @@ public AbstractTimetableSnapshotSource( * provided a consistent view of all TripTimes. The routing thread need only release its reference * to the snapshot to release resources. */ - public final TimetableSnapshot getTimetableSnapshot() { + public TimetableSnapshot getTimetableSnapshot() { // Try to get a lock on the buffer if (bufferLock.tryLock()) { // Make a new snapshot if necessary @@ -118,7 +124,7 @@ public final TimetableSnapshot getTimetableSnapshot() { * * @param force Force the committing of a new snapshot even if the above conditions are not met. */ - public final void commitTimetableSnapshot(final boolean force) { + public void commitTimetableSnapshot(final boolean force) { if (force || snapshotFrequencyThrottle.timeIsUp()) { if (force || buffer.isDirty()) { LOG.debug("Committing {}", buffer); @@ -136,12 +142,16 @@ public final void commitTimetableSnapshot(final boolean force) { } } + public TripPattern getRealtimeAddedTripPattern(FeedScopedId id, LocalDate localDate) { + return buffer.getRealtimeAddedTripPattern(id, localDate); + } + /** * Make a snapshot after each message in anticipation of incoming requests. * Purge data if necessary (and force new snapshot if anything was purged). * Make sure that the public (locking) getTimetableSnapshot function is not called. */ - protected void purgeAndCommit() { + public void purgeAndCommit() { if (purgeExpiredData) { final boolean modified = purgeExpiredData(); commitTimetableSnapshot(modified); @@ -174,16 +184,12 @@ protected final boolean purgeExpiredData() { return buffer.purgeExpiredData(previously); } - protected final LocalDate localDateNow() { - return localDateNow.get(); - } - /** * Execute a {@code Runnable} with a locked snapshot buffer and release the lock afterwards. While * the action of locking and unlocking is not complicated to do for calling code, this method * exists so that the lock instance is a private field. */ - protected final void withLock(Runnable action) { + public void withLock(Runnable action) { bufferLock.lock(); try { @@ -193,4 +199,32 @@ protected final void withLock(Runnable action) { bufferLock.unlock(); } } + + public void clearBuffer(String feedId) { + buffer.clear(feedId); + } + + public Result updateBuffer( + TripPattern pattern, + TripTimes tripTimes, + LocalDate serviceDate + ) { + return buffer.update(pattern, tripTimes, serviceDate); + } + + public void removeLastAddedTripPattern(FeedScopedId id, LocalDate serviceDate) { + buffer.removeLastAddedTripPattern(id, serviceDate); + } + + public void removeRealtimeUpdatedTripTimes( + TripPattern pattern, + FeedScopedId id, + LocalDate serviceDate + ) { + buffer.removeRealtimeUpdatedTripTimes(pattern, id, serviceDate); + } + + public Timetable resolve(TripPattern pattern, LocalDate serviceDate) { + return buffer.resolve(pattern, serviceDate); + } } diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index a530f348a00..61169431282 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -38,6 +38,8 @@ import org.opentripplanner.gtfs.mapping.TransitModeMapper; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.Timetable; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.model.TimetableSnapshotProvider; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.DataValidationException; import org.opentripplanner.transit.model.framework.Deduplicator; @@ -71,7 +73,7 @@ * necessary to provide planning threads a consistent constant view of a graph with realtime data at * a specific point in time. */ -public class TimetableSnapshotSource extends AbstractTimetableSnapshotSource { +public class TimetableSnapshotSource implements TimetableSnapshotProvider { private static final Logger LOG = LoggerFactory.getLogger(TimetableSnapshotSource.class); @@ -90,6 +92,9 @@ public class TimetableSnapshotSource extends AbstractTimetableSnapshotSource { private final Map serviceCodes; + private final TimetableSnapshotManager snapshotManager; + private final Supplier localDateNow; + public TimetableSnapshotSource( TimetableSnapshotSourceParameters parameters, TransitModel transitModel @@ -106,11 +111,13 @@ public TimetableSnapshotSource( TransitModel transitModel, Supplier localDateNow ) { - super(transitModel.getTransitLayerUpdater(), parameters, localDateNow); + this.snapshotManager = + new TimetableSnapshotManager(transitModel.getTransitLayerUpdater(), parameters, localDateNow); this.timeZone = transitModel.getTimeZone(); this.transitService = new DefaultTransitService(transitModel); this.deduplicator = transitModel.getDeduplicator(); this.serviceCodes = transitModel.getServiceCodes(); + this.localDateNow = localDateNow; // Inject this into the transit model transitModel.initTimetableSnapshotProvider(this); @@ -145,10 +152,10 @@ public UpdateResult applyTripUpdates( Map failuresByRelationship = new HashMap<>(); List> results = new ArrayList<>(); - withLock(() -> { + snapshotManager.withLock(() -> { if (fullDataset) { // Remove all updates from the buffer - buffer.clear(feedId); + snapshotManager.clearBuffer(feedId); } LOG.debug("message contains {} trip updates", updates.size()); @@ -188,7 +195,7 @@ public UpdateResult applyTripUpdates( } else { // TODO: figure out the correct service date. For the special case that a trip // starts for example at 40:00, yesterday would probably be a better guess. - serviceDate = localDateNow(); + serviceDate = localDateNow.get(); } uIndex += 1; @@ -244,7 +251,7 @@ public UpdateResult applyTripUpdates( } } - purgeAndCommit(); + snapshotManager.purgeAndCommit(); }); var updateResult = UpdateResult.ofResults(results); @@ -255,6 +262,15 @@ public UpdateResult applyTripUpdates( return updateResult; } + @Override + public TimetableSnapshot getTimetableSnapshot() { + return snapshotManager.getTimetableSnapshot(); + } + + protected void commitTimetableSnapshot() { + snapshotManager.commitTimetableSnapshot(true); + } + private static void logUpdateResult( String feedId, Map failuresByRelationship, @@ -372,10 +388,10 @@ private Result handleScheduledTrip( ); cancelScheduledTrip(tripId, serviceDate, CancelationType.DELETE); - return buffer.update(newPattern, updatedTripTimes, serviceDate); + return snapshotManager.updateBuffer(newPattern, updatedTripTimes, serviceDate); } else { // Set the updated trip times in the buffer - return buffer.update(pattern, updatedTripTimes, serviceDate); + return snapshotManager.updateBuffer(pattern, updatedTripTimes, serviceDate); } } @@ -821,7 +837,7 @@ private Result addTripToGraphAndBuffer( pattern.lastStop().getName() ); // Add new trip times to the buffer - return buffer.update(pattern, newTripTimes, serviceDate); + return snapshotManager.updateBuffer(pattern, newTripTimes, serviceDate); } /** @@ -854,7 +870,7 @@ private boolean cancelScheduledTrip( case CANCEL -> newTripTimes.cancelTrip(); case DELETE -> newTripTimes.deleteTrip(); } - buffer.update(pattern, newTripTimes, serviceDate); + snapshotManager.updateBuffer(pattern, newTripTimes, serviceDate); success = true; } } @@ -881,10 +897,10 @@ private boolean cancelPreviouslyAddedTrip( ) { boolean success = false; - final TripPattern pattern = buffer.getRealtimeAddedTripPattern(tripId, serviceDate); + final TripPattern pattern = snapshotManager.getRealtimeAddedTripPattern(tripId, serviceDate); if (pattern != null) { // Cancel trip times for this trip in this pattern - final Timetable timetable = buffer.resolve(pattern, serviceDate); + final Timetable timetable = snapshotManager.resolve(pattern, serviceDate); final int tripIndex = timetable.getTripIndex(tripId); if (tripIndex == -1) { debug(tripId, "Could not cancel previously added trip on {}", serviceDate); @@ -896,7 +912,7 @@ private boolean cancelPreviouslyAddedTrip( case CANCEL -> newTripTimes.cancelTrip(); case DELETE -> newTripTimes.deleteTrip(); } - buffer.update(pattern, newTripTimes, serviceDate); + snapshotManager.updateBuffer(pattern, newTripTimes, serviceDate); success = true; } } diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index eeb7368091c..da8cd7d2600 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -1131,7 +1131,7 @@ public void testPurgeExpiredData( List.of(tripUpdateYesterday), feedId ); - updater.commitTimetableSnapshot(true); + updater.commitTimetableSnapshot(); final TimetableSnapshot snapshotA = updater.getTimetableSnapshot(); From ec4baa396c994d0bd89aa6e7b1e5496353b92c93 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Thu, 30 May 2024 14:23:43 +0200 Subject: [PATCH 1249/1688] Add OTP request timeout GraphQL instrumentation --- .../OTPRequestTimeoutInstrumentation.java | 36 +++++++++++++++++++ .../apis/transmodel/TransmodelGraph.java | 5 ++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java diff --git a/src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java b/src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java new file mode 100644 index 00000000000..acb27eb4e87 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java @@ -0,0 +1,36 @@ +package org.opentripplanner.apis.transmodel; + +import static graphql.execution.instrumentation.SimpleInstrumentationContext.noOp; + +import graphql.execution.instrumentation.Instrumentation; +import graphql.execution.instrumentation.InstrumentationContext; +import graphql.execution.instrumentation.InstrumentationState; +import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters; +import java.util.concurrent.atomic.AtomicLong; +import org.opentripplanner.framework.application.OTPRequestTimeoutException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A GraphQL instrumentation that periodically checks the OTP request interruption status while the + * query is being processed. + */ +public class OTPRequestTimeoutInstrumentation implements Instrumentation { + + private static final Logger LOG = LoggerFactory.getLogger(OTPRequestTimeoutInstrumentation.class); + + private final AtomicLong fieldFetchCounter = new AtomicLong(); + + @Override + public InstrumentationContext beginFieldFetch( + InstrumentationFieldFetchParameters parameters, + InstrumentationState state + ) { + long fetched = fieldFetchCounter.incrementAndGet(); + if (fetched % 100000 == 0) { + LOG.debug("Fetched {} fields", fetched); + OTPRequestTimeoutException.checkForTimeout(); + } + return noOp(); + } +} diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java index 051e369dde0..2cd405212c2 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java @@ -79,7 +79,10 @@ Response executeGraphQL( } private static Instrumentation createInstrumentation(int maxResolves, Iterable tracingTags) { - Instrumentation instrumentation = new MaxQueryComplexityInstrumentation(maxResolves); + Instrumentation instrumentation = new ChainedInstrumentation( + new MaxQueryComplexityInstrumentation(maxResolves), + new OTPRequestTimeoutInstrumentation() + ); if (OTPFeature.ActuatorAPI.isOn()) { instrumentation = From d7be6380b7cd5450dcb4fcd451acdc53cee4f2db Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Thu, 30 May 2024 16:19:16 +0200 Subject: [PATCH 1250/1688] Apply suggestions from code review Co-authored-by: Leonard Ehrenfried --- src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java | 2 +- .../org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java | 2 +- .../opentripplanner/ext/flex/template/AbstractFlexTemplate.java | 2 +- .../java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java | 2 +- .../opentripplanner/apis/transmodel/model/plan/TripQuery.java | 2 +- .../org/opentripplanner/routing/api/request/RouteRequest.java | 2 +- .../transit/model/timetable/booking/BookingInfoTest.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java index 17b955d24a5..84098db9dc9 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java +++ b/src/ext/java/org/opentripplanner/ext/flex/FlexRouter.java @@ -180,7 +180,7 @@ private List createFlexServiceDates( /** * This class work as an adaptor around OTP services. This allows us to pass in this instance * and not the implementations (graph, transitService, flexIndex). We can easily mock this in - * unit-tests. This also serves as documentation of witch services the flex access/egress + * unit-tests. This also serves as documentation of which services the flex access/egress * generation logic needs. */ private class CallbackAdapter implements FlexAccessEgressCallbackAdapter { diff --git a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java index 9e186cb5932..40201295d7b 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java +++ b/src/ext/java/org/opentripplanner/ext/flex/edgetype/FlexTripEdge.java @@ -15,7 +15,7 @@ import org.opentripplanner.transit.model.site.StopLocation; /** - * Flex trips are not connected to the graph. + * Flex trips edges are not connected to the graph. */ public class FlexTripEdge extends Edge { diff --git a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java index 51116b4ea6c..9ce9cf8a4c4 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java +++ b/src/ext/java/org/opentripplanner/ext/flex/template/AbstractFlexTemplate.java @@ -186,7 +186,7 @@ private FlexAccessEgress createFlexAccessEgress( ) { var flexEdge = getFlexEdge(flexVertex, transferStop); - // Drop none routable and very short(<10s) trips + // Drop non-routable and very short(<10s) trips if (flexEdge == null || flexEdge.getTimeInSeconds() < MIN_FLEX_TRIP_DURATION_SECONDS) { return null; } diff --git a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java index 7c587995ca2..7f32b5a69cd 100644 --- a/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java +++ b/src/ext/java/org/opentripplanner/ext/flex/trip/UnscheduledTrip.java @@ -255,7 +255,7 @@ public int findAlightIndex(StopLocation toStop) { @Override public FlexPathCalculator decorateFlexPathCalculator(FlexPathCalculator defaultCalculator) { // Get the correct {@link FlexPathCalculator} depending on the {@code timePenalty}. - // Ff the modifier doesn't actually modify, we return the regular calculator. + // If the modifier doesn't actually modify, we return the regular calculator. if (timePenalty.modifies()) { return new TimePenaltyCalculator(defaultCalculator, timePenalty); } else { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index 49a14fdb758..6906044c1be 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -52,7 +52,7 @@ public static GraphQLFieldDefinition create( .name("dateTime") .description( "The date and time for the earliest time the user is willing to start the journey " + - "(if `false`or not set) or the latest acceptable time of arriving " + + "(if `false` or not set) or the latest acceptable time of arriving " + "(`true`). Defaults to now" ) .type(gqlUtil.dateTimeScalar) diff --git a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java index 67a08bfb138..76e5dcc558a 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java +++ b/src/main/java/org/opentripplanner/routing/api/request/RouteRequest.java @@ -117,7 +117,7 @@ public void withPreferences(Consumer body) { /** * The booking time is used to exclude services which are not bookable at the * requested booking time. If a service is bookable at this time or later, the service - * is included. Currently, OTP only supports this for FLEX access and egress. + * is included. This apply to FLEX access, egress and direct services. */ public Instant bookingTime() { return bookingTime; diff --git a/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java index 369764fd8e1..0bf189a1c29 100644 --- a/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java +++ b/src/test/java/org/opentripplanner/transit/model/timetable/booking/BookingInfoTest.java @@ -43,7 +43,7 @@ void testBookingInfoWithLatestBookingTime() { assertEquals("dropoff", subject.getDropOffMessage()); assertEquals( - "BookingInfo{cntactInfo: ContactInfo{contactPerson: 'Jo Contact', bookingUrl: 'http://booking.otp.org'}, bookingMethods: [CALL_DRIVER], latestBookingTime: 12:00, message: 'message', pickupMessage: 'pickup', dropOffMessage: 'dropoff'}", + "BookingInfo{contactInfo: ContactInfo{contactPerson: 'Jo Contact', bookingUrl: 'http://booking.otp.org'}, bookingMethods: [CALL_DRIVER], latestBookingTime: 12:00, message: 'message', pickupMessage: 'pickup', dropOffMessage: 'dropoff'}", subject.toString() ); } From 6777db71272b5642c81e21efe2e1fec12f500f14 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 30 May 2024 17:01:43 +0200 Subject: [PATCH 1251/1688] Move test of purging to separate file --- .../trip/TimetableSnapshotManager.java | 2 +- .../trip/TimetableSnapshotManagerTest.java | 124 ++++++++++++++++++ .../trip/TimetableSnapshotSourceTest.java | 110 ---------------- 3 files changed, 125 insertions(+), 111 deletions(-) create mode 100644 src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index a404adb4ef0..201202aa2a3 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -167,7 +167,7 @@ public void purgeAndCommit() { * If your OTP instances are restarted throughout the day, this is less useful and can be * turned off. */ - protected final boolean purgeExpiredData() { + private boolean purgeExpiredData() { final LocalDate today = localDateNow.get(); // TODO: Base this on numberOfDaysOfLongestTrip for tripPatterns final LocalDate previously = today.minusDays(2); // Just to be safe... diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java new file mode 100644 index 00000000000..b4c13ad7778 --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java @@ -0,0 +1,124 @@ +package org.opentripplanner.updater.trip; + +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.updater.trip.TimetableSnapshotManagerTest.SameAssert.NotSame; +import static org.opentripplanner.updater.trip.TimetableSnapshotManagerTest.SameAssert.Same; + +import java.time.Duration; +import java.time.LocalDate; +import java.time.Month; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.RealTimeTripTimes; +import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; +import org.opentripplanner.updater.TimetableSnapshotSourceParameters; + +class TimetableSnapshotManagerTest { + + private static final LocalDate TODAY = LocalDate.of(2024, Month.MAY, 30); + private static final LocalDate TOMORROW = TODAY.plusDays(1); + private static final LocalDate YESTERDAY = TODAY.minusDays(1); + + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final TripPattern PATTERN = TransitModelForTest + .tripPattern("pattern", TransitModelForTest.route("r1").build()) + .withStopPattern( + TransitModelForTest.stopPattern(TEST_MODEL.stop("1").build(), TEST_MODEL.stop("2").build()) + ) + .build(); + private static final RealTimeTripTimes TRIP_TIMES = RealTimeTripTimes.of( + ScheduledTripTimes + .of() + .withArrivalTimes("00:00 00:01") + .withTrip(TransitModelForTest.trip("trip").build()) + .build() + ); + + enum SameAssert { + Same { + public void test(Object a, Object b) { + assertSame(a, b); + } + }, + NotSame { + public void test(Object a, Object b) { + assertNotSame(a, b); + } + }; + + abstract void test(Object a, Object b); + + SameAssert not() { + return this == Same ? NotSame : Same; + } + } + + static Stream purgeExpiredDataTestCases() { + return Stream.of( + // purgeExpiredData maxSnapshotFrequency || snapshots PatternSnapshotA PatternSnapshotB + Arguments.of(Boolean.TRUE, -1, NotSame, NotSame), + Arguments.of(Boolean.FALSE, -1, NotSame, Same), + Arguments.of(Boolean.TRUE, 1000, NotSame, NotSame), + Arguments.of(Boolean.FALSE, 1000, Same, Same) + ); + } + + @ParameterizedTest(name = "purgeExpired: {0}, maxFrequency: {1} || {2} {3}") + @MethodSource("purgeExpiredDataTestCases") + public void testPurgeExpiredData( + boolean purgeExpiredData, + int maxSnapshotFrequency, + SameAssert expSnapshots, + SameAssert expPatternAeqB + ) { + + // We will simulate the clock turning midnight into tomorrow, data on + // yesterday is candidate to expire + final AtomicReference clock = new AtomicReference<>(YESTERDAY); + + var snapshotManager = new TimetableSnapshotManager( + null, + TimetableSnapshotSourceParameters.DEFAULT + .withPurgeExpiredData(purgeExpiredData) + .withMaxSnapshotFrequency(Duration.ofMillis(maxSnapshotFrequency)), + clock::get + ); + + var res1 = snapshotManager.updateBuffer(PATTERN, TRIP_TIMES, YESTERDAY); + assertTrue(res1.isSuccess()); + + snapshotManager.commitTimetableSnapshot(true); + final TimetableSnapshot snapshotA = snapshotManager.getTimetableSnapshot(); + + // Turn the clock to tomorrow + clock.set(TOMORROW); + + var res2 = snapshotManager.updateBuffer(PATTERN, TRIP_TIMES, TODAY); + assertTrue(res2.isSuccess()); + + snapshotManager.purgeAndCommit(); + + final TimetableSnapshot snapshotB = snapshotManager.getTimetableSnapshot(); + + expSnapshots.test(snapshotA, snapshotB); + expPatternAeqB.test( + snapshotA.resolve(PATTERN, YESTERDAY), + snapshotB.resolve(PATTERN, YESTERDAY) + ); + expPatternAeqB + .not() + .test(snapshotB.resolve(PATTERN, null), snapshotB.resolve(PATTERN, YESTERDAY)); + + // Expect the same results regardless of the config for these + assertNotSame(snapshotA.resolve(PATTERN, null), snapshotA.resolve(PATTERN, YESTERDAY)); + assertSame(snapshotA.resolve(PATTERN, null), snapshotB.resolve(PATTERN, null)); + } +} diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index da8cd7d2600..83f9fabf75a 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -11,8 +11,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; import static org.opentripplanner.updater.trip.BackwardsDelayPropagationType.REQUIRED_NO_DATA; -import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.NotSame; -import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.Same; import com.google.protobuf.InvalidProtocolBufferException; import com.google.transit.realtime.GtfsRealtime.TripDescriptor; @@ -24,15 +22,11 @@ import java.time.Duration; import java.time.LocalDate; import java.util.List; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Stream; import javax.annotation.Nonnull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner.framework.i18n.NonLocalizedString; @@ -1056,108 +1050,4 @@ private TimetableSnapshotSource defaultUpdater() { () -> SERVICE_DATE ); } - - enum SameAssert { - Same { - public void test(Object a, Object b) { - assertSame(a, b); - } - }, - NotSame { - public void test(Object a, Object b) { - assertNotSame(a, b); - } - }; - - abstract void test(Object a, Object b); - - SameAssert not() { - return this == Same ? NotSame : Same; - } - } - - static Stream purgeExpiredDataTestCases() { - return Stream.of( - // purgeExpiredData maxSnapshotFrequency || snapshots PatternSnapshotA PatternSnapshotB - Arguments.of(Boolean.TRUE, -1, NotSame, NotSame), - Arguments.of(Boolean.FALSE, -1, NotSame, Same), - Arguments.of(Boolean.TRUE, 1000, NotSame, NotSame), - Arguments.of(Boolean.FALSE, 1000, Same, Same) - ); - } - - @ParameterizedTest(name = "purgeExpired: {0}, maxFrequency: {1} || {2} {3}") - @MethodSource("purgeExpiredDataTestCases") - public void testPurgeExpiredData( - boolean purgeExpiredData, - int maxSnapshotFrequency, - SameAssert expSnapshots, - SameAssert expPatternAeqB - ) { - final FeedScopedId tripId = new FeedScopedId(feedId, "1.1"); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern pattern = transitModel.getTransitModelIndex().getPatternForTrip().get(trip); - - // We will simulate the clock turning midnight into tomorrow, data on - // yesterday is candidate to expire - final LocalDate yesterday = SERVICE_DATE.minusDays(1); - final LocalDate tomorrow = SERVICE_DATE.plusDays(1); - final AtomicReference clock = new AtomicReference<>(yesterday); - - var tripDescriptorBuilder = TripDescriptor.newBuilder(); - tripDescriptorBuilder.setTripId("1.1"); - tripDescriptorBuilder.setScheduleRelationship(ScheduleRelationship.CANCELED); - - tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(yesterday)); - var tripUpdateYesterday = TripUpdate.newBuilder().setTrip(tripDescriptorBuilder).build(); - - // Update pattern on today, even if the time the update is performed is tomorrow - tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE)); - var tripUpdateToday = TripUpdate.newBuilder().setTrip(tripDescriptorBuilder).build(); - - var updater = new TimetableSnapshotSource( - TimetableSnapshotSourceParameters.DEFAULT - .withPurgeExpiredData(purgeExpiredData) - .withMaxSnapshotFrequency(Duration.ofMillis(maxSnapshotFrequency)), - transitModel, - clock::get - ); - - // Apply update when clock is yesterday - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - fullDataset, - List.of(tripUpdateYesterday), - feedId - ); - updater.commitTimetableSnapshot(); - - final TimetableSnapshot snapshotA = updater.getTimetableSnapshot(); - - // Turn the clock to tomorrow - clock.set(tomorrow); - - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - fullDataset, - List.of(tripUpdateToday), - feedId - ); - final TimetableSnapshot snapshotB = updater.getTimetableSnapshot(); - - expSnapshots.test(snapshotA, snapshotB); - expPatternAeqB.test( - snapshotA.resolve(pattern, yesterday), - snapshotB.resolve(pattern, yesterday) - ); - expPatternAeqB - .not() - .test(snapshotB.resolve(pattern, null), snapshotB.resolve(pattern, yesterday)); - - // Expect the same results regardless of the config for these - assertNotSame(snapshotA.resolve(pattern, null), snapshotA.resolve(pattern, yesterday)); - assertSame(snapshotA.resolve(pattern, null), snapshotB.resolve(pattern, null)); - } } From 50e653f32633b0c618dacfa0fb245fa386faa105 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 30 May 2024 17:07:44 +0200 Subject: [PATCH 1252/1688] Remove unneeded method --- .../opentripplanner/updater/trip/TimetableSnapshotSource.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 61169431282..0f81e2e6da6 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -267,10 +267,6 @@ public TimetableSnapshot getTimetableSnapshot() { return snapshotManager.getTimetableSnapshot(); } - protected void commitTimetableSnapshot() { - snapshotManager.commitTimetableSnapshot(true); - } - private static void logUpdateResult( String feedId, Map failuresByRelationship, From 0dbc6099ce898796fa26b02a8e6ce6e6c774cb59 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 30 May 2024 17:23:01 +0200 Subject: [PATCH 1253/1688] Update JavaDoc --- .../trip/TimetableSnapshotManager.java | 36 ++++++++++++++++--- .../trip/TimetableSnapshotManagerTest.java | 1 - 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index 201202aa2a3..e3fe3790fbe 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -19,12 +19,10 @@ import org.slf4j.LoggerFactory; /** - * A base class for which abstracts away locking, updating, committing and purging of the timetable snapshot. + * A class which abstracts away locking, updating, committing and purging of the timetable snapshot. * In order to keep code reviews easier this is an intermediate stage and will be refactored further. * In particular the following refactorings are planned: *

              - * - use composition instead of inheritance - * - make the buffer private to this class and add an API for its access * - create only one "snapshot manager" per transit model that is shared between Siri/GTFS-RT updaters */ public final class TimetableSnapshotManager { @@ -142,8 +140,16 @@ public void commitTimetableSnapshot(final boolean force) { } } - public TripPattern getRealtimeAddedTripPattern(FeedScopedId id, LocalDate localDate) { - return buffer.getRealtimeAddedTripPattern(id, localDate); + /** + * Get the current trip pattern given a trip id and a service date, if it has been changed from + * the scheduled pattern with an update, for which the stopPattern is different. + * + * @param trioId trip id + * @param serviceDate service date + * @return trip pattern created by the updater; null if trip is on the original trip pattern + */ + public TripPattern getRealtimeAddedTripPattern(FeedScopedId trioId, LocalDate serviceDate) { + return buffer.getRealtimeAddedTripPattern(trioId, serviceDate); } /** @@ -200,10 +206,22 @@ public void withLock(Runnable action) { } } + /** + * Clear all data of snapshot for the provided feed id + */ public void clearBuffer(String feedId) { buffer.clear(feedId); } + /** + * Update the TripTimes of one Trip in a Timetable of a TripPattern. If the Trip of the TripTimes + * does not exist yet in the Timetable, add it. This method will make a protective copy + * of the Timetable if such a copy has not already been made while building up this snapshot, + * handling both cases where patterns were pre-existing in static data or created by realtime data. + * + * @param serviceDate service day for which this update is valid + * @return whether the update was actually applied + */ public Result updateBuffer( TripPattern pattern, TripTimes tripTimes, @@ -212,6 +230,10 @@ public Result updateBuffer( return buffer.update(pattern, tripTimes, serviceDate); } + /** + * Removes the latest added trip pattern from the cache. This should be done when removing the + * trip times from the timetable the trip has been added to. + */ public void removeLastAddedTripPattern(FeedScopedId id, LocalDate serviceDate) { buffer.removeLastAddedTripPattern(id, serviceDate); } @@ -224,6 +246,10 @@ public void removeRealtimeUpdatedTripTimes( buffer.removeRealtimeUpdatedTripTimes(pattern, id, serviceDate); } + /** + * Returns an updated timetable for the specified pattern if one is available in this snapshot, or + * the originally scheduled timetable if there are no updates in this snapshot. + */ public Timetable resolve(TripPattern pattern, LocalDate serviceDate) { return buffer.resolve(pattern, serviceDate); } diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java index b4c13ad7778..8f5c278b586 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java @@ -79,7 +79,6 @@ public void testPurgeExpiredData( SameAssert expSnapshots, SameAssert expPatternAeqB ) { - // We will simulate the clock turning midnight into tomorrow, data on // yesterday is candidate to expire final AtomicReference clock = new AtomicReference<>(YESTERDAY); From ab5ec25ca1b86995bd567b9d2ec1ab1f1d514fc4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 31 May 2024 10:39:18 +0200 Subject: [PATCH 1254/1688] Use cast to extract code --- .../ext/geocoder/StopClusterMapper.java | 13 ++++++++++++- .../transit/model/site/GroupOfStations.java | 6 ------ .../transit/model/site/StopLocationsGroup.java | 4 ---- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index de8d2681fd9..fbb9941c59c 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -9,6 +9,7 @@ import java.util.Objects; import java.util.Optional; import java.util.stream.Collectors; +import javax.annotation.Nullable; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; @@ -16,6 +17,7 @@ import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.organization.Agency; +import org.opentripplanner.transit.model.site.Station; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.site.StopLocationsGroup; import org.opentripplanner.transit.service.TransitService; @@ -153,7 +155,7 @@ StopCluster.Location toLocation(FeedScopedId id) { .toList(); return new StopCluster.Location( group.getId(), - group.getCode(), + extractCode(group), STATION, group.getName().toString(), new StopCluster.Coordinate(group.getLat(), group.getLon()), @@ -164,6 +166,15 @@ StopCluster.Location toLocation(FeedScopedId id) { } } + @Nullable + private static String extractCode(StopLocationsGroup group) { + if (group instanceof Station station) { + return station.getCode(); + } else { + return null; + } + } + private static StopCluster.Coordinate toCoordinate(WgsCoordinate c) { return new StopCluster.Coordinate(c.latitude(), c.longitude()); } diff --git a/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java b/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java index 66b45317718..c62d6099c97 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java +++ b/src/main/java/org/opentripplanner/transit/model/site/GroupOfStations.java @@ -51,12 +51,6 @@ public WgsCoordinate getCoordinate() { return coordinate; } - @Nullable - @Override - public String getCode() { - return null; - } - @Nonnull public Collection getChildStops() { return this.childStations.stream().flatMap(s -> s.getChildStops().stream()).toList(); diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java index 70b2ee45a81..3536f59e9b6 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java +++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocationsGroup.java @@ -1,7 +1,6 @@ package org.opentripplanner.transit.model.site; import java.util.Collection; -import javax.annotation.Nullable; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.lang.ObjectUtils; @@ -40,7 +39,4 @@ default double getLon() { default String logName() { return ObjectUtils.ifNotNull(getName(), Object::toString, null); } - - @Nullable - String getCode(); } From a8571b473d420539a552f40950dfd59903d3bca0 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 31 May 2024 09:11:42 +0000 Subject: [PATCH 1255/1688] Add changelog entry for #5881 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 7b0982efd14..0c4356c99c8 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -23,6 +23,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Document and validate timeRange GraphQL parameter [#5834](https://github.com/opentripplanner/OpenTripPlanner/pull/5834) - Log the origin of a request that causes a transfer cache addition. [#5874](https://github.com/opentripplanner/OpenTripPlanner/pull/5874) - Fix handling of missing aimed departure time [#5865](https://github.com/opentripplanner/OpenTripPlanner/pull/5865) +- Add OTP request timeout GraphQL instrumentation [#5881](https://github.com/opentripplanner/OpenTripPlanner/pull/5881) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 19495abed6df1de4c1687ca3e895571156093a05 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 31 May 2024 11:12:23 +0200 Subject: [PATCH 1256/1688] Add OTP request timeout GraphQL instrumentation --- .../MaxFieldsInResultInstrumentation.java | 69 +++++++++++++++++++ .../OTPRequestTimeoutInstrumentation.java | 36 ---------- .../apis/transmodel/TransmodelGraph.java | 6 +- 3 files changed, 70 insertions(+), 41 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java delete mode 100644 src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java diff --git a/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java b/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java new file mode 100644 index 00000000000..6d22f18783c --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java @@ -0,0 +1,69 @@ +package org.opentripplanner.apis.transmodel; + +import static graphql.execution.instrumentation.SimpleInstrumentationContext.noOp; + +import graphql.ExecutionResult; +import graphql.execution.AbortExecutionException; +import graphql.execution.instrumentation.Instrumentation; +import graphql.execution.instrumentation.InstrumentationContext; +import graphql.execution.instrumentation.InstrumentationState; +import graphql.execution.instrumentation.parameters.InstrumentationExecutionParameters; +import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters; +import jakarta.validation.constraints.NotNull; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.atomic.AtomicLong; +import org.opentripplanner.framework.application.OTPRequestTimeoutException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * A GraphQL instrumentation that aborts the execution if the number of fetched fields exceeds + * a configurable limit. + * The instrumentation also periodically checks the OTP request interruption status while the + * query is being processed, giving the possibility to control the request runtime complexity + * both in terms of result size and execution time. + */ +public class MaxFieldsInResultInstrumentation implements Instrumentation { + + private static final Logger LOG = LoggerFactory.getLogger(MaxFieldsInResultInstrumentation.class); + + /** + * The maximum number of fields that can be present in the GraphQL result. + */ + private final int maxFieldFetch; + + private final AtomicLong fieldFetchCounter = new AtomicLong(); + + public MaxFieldsInResultInstrumentation(int maxFieldFetch) { + this.maxFieldFetch = maxFieldFetch; + } + + @Override + public InstrumentationContext beginFieldFetch( + InstrumentationFieldFetchParameters parameters, + InstrumentationState state + ) { + long fetched = fieldFetchCounter.incrementAndGet(); + if (fetched % 10000 == 0) { + LOG.debug("Fetched {} fields", fetched); + if (fetched > maxFieldFetch) { + throw new AbortExecutionException( + "The number of fields in the GraphQL result exceeds the maximum allowed: " + maxFieldFetch + ); + } + OTPRequestTimeoutException.checkForTimeout(); + } + return noOp(); + } + + @Override + @NotNull + public CompletableFuture instrumentExecutionResult( + ExecutionResult executionResult, + InstrumentationExecutionParameters parameters, + InstrumentationState state + ) { + LOG.debug("The GraphQL result contains {} fields", fieldFetchCounter.get()); + return Instrumentation.super.instrumentExecutionResult(executionResult, parameters, state); + } +} diff --git a/src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java b/src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java deleted file mode 100644 index acb27eb4e87..00000000000 --- a/src/main/java/org/opentripplanner/apis/transmodel/OTPRequestTimeoutInstrumentation.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.opentripplanner.apis.transmodel; - -import static graphql.execution.instrumentation.SimpleInstrumentationContext.noOp; - -import graphql.execution.instrumentation.Instrumentation; -import graphql.execution.instrumentation.InstrumentationContext; -import graphql.execution.instrumentation.InstrumentationState; -import graphql.execution.instrumentation.parameters.InstrumentationFieldFetchParameters; -import java.util.concurrent.atomic.AtomicLong; -import org.opentripplanner.framework.application.OTPRequestTimeoutException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * A GraphQL instrumentation that periodically checks the OTP request interruption status while the - * query is being processed. - */ -public class OTPRequestTimeoutInstrumentation implements Instrumentation { - - private static final Logger LOG = LoggerFactory.getLogger(OTPRequestTimeoutInstrumentation.class); - - private final AtomicLong fieldFetchCounter = new AtomicLong(); - - @Override - public InstrumentationContext beginFieldFetch( - InstrumentationFieldFetchParameters parameters, - InstrumentationState state - ) { - long fetched = fieldFetchCounter.incrementAndGet(); - if (fetched % 100000 == 0) { - LOG.debug("Fetched {} fields", fetched); - OTPRequestTimeoutException.checkForTimeout(); - } - return noOp(); - } -} diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java index 2cd405212c2..2a8d98a769a 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java @@ -3,7 +3,6 @@ import graphql.ExecutionInput; import graphql.ExecutionResult; import graphql.GraphQL; -import graphql.analysis.MaxQueryComplexityInstrumentation; import graphql.execution.ExecutionStrategy; import graphql.execution.UnknownOperationException; import graphql.execution.instrumentation.ChainedInstrumentation; @@ -79,10 +78,7 @@ Response executeGraphQL( } private static Instrumentation createInstrumentation(int maxResolves, Iterable tracingTags) { - Instrumentation instrumentation = new ChainedInstrumentation( - new MaxQueryComplexityInstrumentation(maxResolves), - new OTPRequestTimeoutInstrumentation() - ); + Instrumentation instrumentation = new MaxFieldsInResultInstrumentation(maxResolves); if (OTPFeature.ActuatorAPI.isOn()) { instrumentation = From 0fcc240a8199cf102d0714254e2700edc461a86a Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 31 May 2024 14:26:46 +0200 Subject: [PATCH 1257/1688] Add parameter maxNumberOfResultFields --- docs/RouterConfiguration.md | 10 ++++++++++ .../apis/transmodel/TransmodelAPI.java | 15 +++++---------- .../transmodel/TransmodelAPIParameters.java | 5 +++++ .../apis/transmodel/TransmodelGraph.java | 11 +++++++---- .../config/sandbox/TransmodelAPIConfig.java | 17 +++++++++++++++++ 5 files changed, 44 insertions(+), 14 deletions(-) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 663c9dd5c8a..cf2abdfc515 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -65,6 +65,7 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md). |    [transferCacheRequests](#transit_transferCacheRequests) | `object[]` | Routing requests to use for pre-filling the stop-to-stop transfer cache. | *Optional* | | 2.3 | | transmodelApi | `object` | Configuration for the Transmodel GraphQL API. | *Optional* | | 2.1 | |    [hideFeedId](#transmodelApi_hideFeedId) | `boolean` | Hide the FeedId in all API output, and add it to input. | *Optional* | `false` | na | +|    [maxNumberOfResultFields](#transmodelApi_maxNumberOfResultFields) | `integer` | The maximum number of fields in a GraphQL result | *Optional* | `1000000` | na | |    [tracingHeaderTags](#transmodelApi_tracingHeaderTags) | `string[]` | Used to group requests when monitoring OTP. | *Optional* | | na | | [updaters](UpdaterConfig.md) | `object[]` | Configuration for the updaters that import various types of data into OTP. | *Optional* | | 1.5 | | [vectorTiles](sandbox/MapboxVectorTilesApi.md) | `object` | Vector tile configuration | *Optional* | | na | @@ -423,6 +424,15 @@ Hide the FeedId in all API output, and add it to input. Only turn this feature on if you have unique ids across all feeds, without the feedId prefix. +

              maxNumberOfResultFields

              + +**Since version:** `na` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `1000000` +**Path:** /transmodelApi + +The maximum number of fields in a GraphQL result + +Enforce rate limiting based on query complexity: queries that return too much data are cancelled. +

              tracingHeaderTags

              **Since version:** `na` ∙ **Type:** `string[]` ∙ **Cardinality:** `Optional` diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java index 3df6e1d6a51..4ce7c1561bb 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPI.java @@ -5,8 +5,6 @@ import io.micrometer.core.instrument.Tag; import jakarta.ws.rs.BadRequestException; import jakarta.ws.rs.Consumes; -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.HeaderParam; import jakarta.ws.rs.POST; import jakarta.ws.rs.Path; import jakarta.ws.rs.PathParam; @@ -37,6 +35,7 @@ public class TransmodelAPI { private static GraphQLSchema schema; private static Collection tracingHeaderTags; + private static int maxNumberOfResultFields; private final OtpServerRequestContext serverContext; private final TransmodelGraph index; @@ -75,6 +74,7 @@ public static void setUp( TransitIdMapper.setupFixedFeedId(transitModel.getAgencies()); } tracingHeaderTags = config.tracingHeaderTags(); + maxNumberOfResultFields = config.maxNumberOfResultFields(); GqlUtil gqlUtil = new GqlUtil(transitModel.getTimeZone()); schema = TransmodelGraphQLSchema.create(defaultRouteRequest, gqlUtil); } @@ -83,7 +83,6 @@ public static void setUp( @Consumes(MediaType.APPLICATION_JSON) public Response getGraphQL( HashMap queryParameters, - @HeaderParam("OTPMaxResolves") @DefaultValue("1000000") int maxResolves, @Context HttpHeaders headers ) { if (queryParameters == null || !queryParameters.containsKey("query")) { @@ -116,24 +115,20 @@ public Response getGraphQL( serverContext, variables, operationName, - maxResolves, + maxNumberOfResultFields, getTagsFromHeaders(headers) ); } @POST @Consumes("application/graphql") - public Response getGraphQL( - String query, - @HeaderParam("OTPMaxResolves") @DefaultValue("1000000") int maxResolves, - @Context HttpHeaders headers - ) { + public Response getGraphQL(String query, @Context HttpHeaders headers) { return index.executeGraphQL( query, serverContext, null, null, - maxResolves, + maxNumberOfResultFields, getTagsFromHeaders(headers) ); } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java index 5ab64dcd2e6..11ec6937a55 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelAPIParameters.java @@ -19,4 +19,9 @@ public interface TransmodelAPIParameters { * @see MicrometerGraphQLInstrumentation */ Collection tracingHeaderTags(); + + /** + * The maximum number of fields that can be present in a GraphQL result. + */ + int maxNumberOfResultFields(); } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java index 2a8d98a769a..1bff91638fd 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java @@ -47,12 +47,12 @@ Response executeGraphQL( OtpServerRequestContext serverContext, Map variables, String operationName, - int maxResolves, + int maxNumberOfResultFields, Iterable tracingTags ) { try (var executionStrategy = new AbortOnTimeoutExecutionStrategy()) { variables = ObjectUtils.ifNotNull(variables, new HashMap<>()); - var instrumentation = createInstrumentation(maxResolves, tracingTags); + var instrumentation = createInstrumentation(maxNumberOfResultFields, tracingTags); var transmodelRequestContext = createRequestContext(serverContext); var executionInput = createExecutionInput( query, @@ -77,8 +77,11 @@ Response executeGraphQL( } } - private static Instrumentation createInstrumentation(int maxResolves, Iterable tracingTags) { - Instrumentation instrumentation = new MaxFieldsInResultInstrumentation(maxResolves); + private static Instrumentation createInstrumentation( + int maxNumberOfResultFields, + Iterable tracingTags + ) { + Instrumentation instrumentation = new MaxFieldsInResultInstrumentation(maxNumberOfResultFields); if (OTPFeature.ActuatorAPI.isOn()) { instrumentation = diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java index c6728f90d63..de59234a7b8 100644 --- a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java @@ -15,6 +15,7 @@ public class TransmodelAPIConfig implements TransmodelAPIParameters { private final boolean hideFeedId; private final Collection tracingHeaderTags; + private int maxNumberOfResultFields; public TransmodelAPIConfig(String parameterName, NodeAdapter root) { var c = root @@ -39,6 +40,17 @@ public TransmodelAPIConfig(String parameterName, NodeAdapter root) { .since(NA) .summary("Used to group requests when monitoring OTP.") .asStringList(Set.of()); + + maxNumberOfResultFields = + c + .of("maxNumberOfResultFields") + .since(NA) + .summary("The maximum number of fields in a GraphQL result") + .description( + "Enforce rate limiting based on query complexity: queries that return too much data are" + + " cancelled." + ) + .asInt(1_000_000); } @Override @@ -50,4 +62,9 @@ public boolean hideFeedId() { public Collection tracingHeaderTags() { return tracingHeaderTags; } + + @Override + public int maxNumberOfResultFields() { + return maxNumberOfResultFields; + } } From 626c6ab6b38f2ac79d02e73aa25fc24abc30870d Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 31 May 2024 14:58:36 +0200 Subject: [PATCH 1258/1688] refactor: Fix doc generation failure --- .../org/opentripplanner/apis/transmodel/schema.graphql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 376ded34ea7..2850c57ed30 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -801,7 +801,7 @@ type QueryType { restrictions are applied - all journeys are listed. """ bookingTime: DateTime, - "The date and time for the earliest time the user is willing to start the journey (if `false`or not set) or the latest acceptable time of arriving (`true`). Defaults to now" + "The date and time for the earliest time the user is willing to start the journey (if `false` or not set) or the latest acceptable time of arriving (`true`). Defaults to now" dateTime: DateTime, "Debug the itinerary-filter-chain. OTP will attach a system notice to itineraries instead of removing them. This is very convenient when tuning the filters." debugItineraryFilter: Boolean = false @deprecated(reason : "Use `itineraryFilter.debug` instead."), From 6a73f0140556c0a4c99a731ec0f2c438028062fe Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 31 May 2024 23:52:15 +0200 Subject: [PATCH 1259/1688] Apply review feedback --- .../ext/geocoder/LuceneIndexTest.java | 14 +++++----- .../ext/geocoder/StopClusterMapper.java | 28 +++++++++++-------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index 15f205ad802..cee6cf3a2d8 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -277,17 +277,17 @@ void fuzzyStopCode(String query) { void modes() { var result = index.queryStopClusters("westh").toList(); assertEquals(1, result.size()); - var stop = result.getFirst(); - assertEquals(WESTHAFEN.getName().toString(), stop.primary().name()); - assertEquals(List.of(FERRY.name(), BUS.name()), stop.primary().modes()); + var cluster = result.getFirst(); + assertEquals(WESTHAFEN.getName().toString(), cluster.primary().name()); + assertEquals(List.of(FERRY.name(), BUS.name()), cluster.primary().modes()); } @Test void agenciesAndFeedPublisher() { - var result = index.queryStopClusters("alexanderplatz").toList().getFirst(); - assertEquals(ALEXANDERPLATZ_STATION.getName().toString(), result.primary().name()); - assertEquals(List.of(StopClusterMapper.toAgency(BVG)), result.primary().agencies()); - assertEquals("A Publisher", result.primary().feedPublisher().name()); + var cluster = index.queryStopClusters("alexanderplatz").toList().getFirst(); + assertEquals(ALEXANDERPLATZ_STATION.getName().toString(), cluster.primary().name()); + assertEquals(List.of(StopClusterMapper.toAgency(BVG)), cluster.primary().agencies()); + assertEquals("A Publisher", cluster.primary().feedPublisher().name()); } } diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index fbb9941c59c..d9f388ea0e8 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -63,23 +63,19 @@ Iterable generateStopClusters( ) .values() .stream() - .map(group -> this.map(group).orElse(null)) + .map(group -> map(group).orElse(null)) .filter(Objects::nonNull) .toList(); - var stations = stopLocationsGroups.stream().map(this::map).toList(); + var stations = stopLocationsGroups.stream().map(StopClusterMapper::map).toList(); return Iterables.concat(deduplicatedStops, stations); } - LuceneStopCluster map(StopLocationsGroup g) { + private static LuceneStopCluster map(StopLocationsGroup g) { var childStops = g.getChildStops(); var ids = childStops.stream().map(s -> s.getId().toString()).toList(); - var childNames = childStops - .stream() - .map(StopLocation::getName) - .filter(Objects::nonNull) - .toList(); - var codes = childStops.stream().map(StopLocation::getCode).filter(Objects::nonNull).toList(); + var childNames = getNames(childStops); + var codes = getCodes(childStops); return new LuceneStopCluster( g.getId().toString(), @@ -90,11 +86,19 @@ LuceneStopCluster map(StopLocationsGroup g) { ); } - Optional map(List stopLocations) { + private static List getCodes(Collection childStops) { + return childStops.stream().map(StopLocation::getCode).filter(Objects::nonNull).toList(); + } + + private static List getNames(Collection childStops) { + return childStops.stream().map(StopLocation::getName).filter(Objects::nonNull).toList(); + } + + private static Optional map(List stopLocations) { var primary = stopLocations.getFirst(); var secondaryIds = stopLocations.stream().skip(1).map(sl -> sl.getId().toString()).toList(); - var names = stopLocations.stream().map(StopLocation::getName).toList(); - var codes = stopLocations.stream().map(StopLocation::getCode).filter(Objects::nonNull).toList(); + var names = getNames(stopLocations); + var codes = getCodes(stopLocations); return Optional .ofNullable(primary.getName()) From 170abf8dbfbdd950d94748448cf28e37acb5da69 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 21:53:24 +0000 Subject: [PATCH 1260/1688] chore(deps): update dependency com.google.cloud.tools:jib-maven-plugin to v3.4.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c06bfcafeb1..90bfffb731a 100644 --- a/pom.xml +++ b/pom.xml @@ -444,7 +444,7 @@ com.google.cloud.tools jib-maven-plugin - 3.4.2 + 3.4.3 org.opentripplanner.standalone.OTPMain From 4fafb1c30e62be754ef29ca293222ead97075c21 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 21:53:29 +0000 Subject: [PATCH 1261/1688] chore(deps): update dependency org.apache.maven.plugins:maven-shade-plugin to v3.6.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 90bfffb731a..5880d9dcc62 100644 --- a/pom.xml +++ b/pom.xml @@ -363,7 +363,7 @@ properly if some input files are missing a terminating newline) --> org.apache.maven.plugins maven-shade-plugin - 3.5.3 + 3.6.0 package From dfcba06aba3ed34b4a26734c808ca3294020a874 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 1 Jun 2024 09:11:35 +0200 Subject: [PATCH 1262/1688] Combine SIRI and GTFS-RT environments --- .../ext/siri/SiriRealtimeTestEnvironment.java | 95 ---------- .../siri/SiriTimetableSnapshotSourceTest.java | 175 ++++++++---------- .../ext/siri/SiriFuzzyTripMatcher.java | 2 +- .../trip/GtfsRealtimeTestEnvironment.java | 42 ----- ...Data.java => RealtimeTestEnvironment.java} | 136 +++++++++++++- .../CancellationDeletionTest.java | 21 +-- .../trip/moduletests/delay/DelayedTest.java | 33 ++-- .../trip/moduletests/delay/SkippedTest.java | 27 ++- .../rejection/InvalidInputTest.java | 17 +- 9 files changed, 257 insertions(+), 291 deletions(-) delete mode 100644 src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java delete mode 100644 src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java rename src/test/java/org/opentripplanner/updater/trip/{RealtimeTestData.java => RealtimeTestEnvironment.java} (59%) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java deleted file mode 100644 index ab449a6db19..00000000000 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriRealtimeTestEnvironment.java +++ /dev/null @@ -1,95 +0,0 @@ -package org.opentripplanner.ext.siri; - -import java.time.Duration; -import java.time.LocalDate; -import java.util.List; -import org.opentripplanner.DateTimeHelper; -import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.model.timetable.TripTimes; -import org.opentripplanner.updater.TimetableSnapshotSourceParameters; -import org.opentripplanner.updater.spi.UpdateResult; -import org.opentripplanner.updater.trip.RealtimeTestData; -import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; - -public class SiriRealtimeTestEnvironment { - - public final RealtimeTestData testData = new RealtimeTestData(); - - private static final TimetableSnapshotSourceParameters PARAMETERS = new TimetableSnapshotSourceParameters( - Duration.ZERO, - false - ); - private final SiriTimetableSnapshotSource snapshotSource; - private final DateTimeHelper dateTimeHelper; - - public SiriRealtimeTestEnvironment() { - snapshotSource = new SiriTimetableSnapshotSource(PARAMETERS, testData.transitModel); - dateTimeHelper = new DateTimeHelper(testData.timeZone, RealtimeTestData.SERVICE_DATE); - } - - public EntityResolver getEntityResolver() { - return new EntityResolver(testData.getTransitService(), testData.getFeedId()); - } - - public TripPattern getPatternForTrip(FeedScopedId tripId) { - return getPatternForTrip(tripId, RealtimeTestData.SERVICE_DATE); - } - - public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { - var transitService = testData.getTransitService(); - var trip = transitService.getTripOnServiceDateById(tripId); - return transitService.getPatternForTrip(trip.getTrip(), serviceDate); - } - - /** - * Find the current TripTimes for a trip id on the default serviceDate - */ - public TripTimes getTripTimesForTrip(Trip trip) { - return testData.getTripTimesForTrip(trip.getId(), RealtimeTestData.SERVICE_DATE); - } - - /** - * Find the current TripTimes for a trip id on the default serviceDate - */ - public TripTimes getTripTimesForTrip(String id) { - return testData.getTripTimesForTrip(testData.id(id), RealtimeTestData.SERVICE_DATE); - } - - public UpdateResult applyEstimatedTimetable(List updates) { - return snapshotSource.applyEstimatedTimetable( - null, - getEntityResolver(), - testData.getFeedId(), - false, - updates - ); - } - - public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( - List updates - ) { - SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher( - testData.getTransitService() - ); - return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); - } - - public DateTimeHelper getDateTimeHelper() { - return dateTimeHelper; - } - - private UpdateResult applyEstimatedTimetable( - List updates, - SiriFuzzyTripMatcher siriFuzzyTripMatcher - ) { - return this.snapshotSource.applyEstimatedTimetable( - siriFuzzyTripMatcher, - getEntityResolver(), - testData.getFeedId(), - false, - updates - ); - } -} diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 7082f93daec..edfb6855835 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -10,49 +10,38 @@ import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; -import org.opentripplanner.updater.trip.RealtimeTestData; +import org.opentripplanner.updater.trip.RealtimeTestEnvironment; class SiriTimetableSnapshotSourceTest { @Test void testCancelTrip() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); - assertEquals( - RealTimeState.SCHEDULED, - env.getTripTimesForTrip(env.testData.trip1).getRealTimeState() - ); + assertEquals(RealTimeState.SCHEDULED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withCancellation(true) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); - assertEquals( - RealTimeState.CANCELED, - env.getTripTimesForTrip(env.testData.trip1).getRealTimeState() - ); + assertEquals(RealTimeState.CANCELED, env.getTripTimesForTrip(env.trip1).getRealTimeState()); } @Test void testAddJourney() { - var env = new SiriRealtimeTestEnvironment(); - var testData = env.testData; + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) - .withOperatorRef(testData.operator1Id.getId()) - .withLineRef(testData.route1Id.getId()) - .withRecordedCalls(builder -> - builder.call(testData.stopC1).departAimedActual("00:01", "00:02") - ) - .withEstimatedCalls(builder -> - builder.call(testData.stopD1).arriveAimedExpected("00:03", "00:04") - ) + .withOperatorRef(env.operator1Id.getId()) + .withLineRef(env.route1Id.getId()) + .withRecordedCalls(builder -> builder.call(env.stopC1).departAimedActual("00:01", "00:02")) + .withEstimatedCalls(builder -> builder.call(env.stopD1).arriveAimedExpected("00:03", "00:04")) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -66,22 +55,17 @@ void testAddJourney() { @Test void testReplaceJourney() { - var env = new SiriRealtimeTestEnvironment(); - var testData = env.testData; + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedVehicleJourneyCode("newJourney") .withIsExtraJourney(true) // replace trip1 - .withVehicleJourneyRef(testData.trip1.getId().getId()) - .withOperatorRef(testData.operator1Id.getId()) - .withLineRef(testData.route1Id.getId()) - .withRecordedCalls(builder -> - builder.call(testData.stopA1).departAimedActual("00:01", "00:02") - ) - .withEstimatedCalls(builder -> - builder.call(testData.stopC1).arriveAimedExpected("00:03", "00:04") - ) + .withVehicleJourneyRef(env.trip1.getId().getId()) + .withOperatorRef(env.operator1Id.getId()) + .withLineRef(env.route1Id.getId()) + .withRecordedCalls(builder -> builder.call(env.stopA1).departAimedActual("00:01", "00:02")) + .withEstimatedCalls(builder -> builder.call(env.stopC1).arriveAimedExpected("00:03", "00:04")) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -89,14 +73,14 @@ void testReplaceJourney() { assertEquals(1, result.successful()); var tripTimes = env.getTripTimesForTrip("newJourney"); - var pattern = env.getPatternForTrip(testData.id("newJourney")); + var pattern = env.getPatternForTrip(env.id("newJourney")); assertEquals(RealTimeState.ADDED, tripTimes.getRealTimeState()); assertEquals(2 * 60, tripTimes.getDepartureTime(0)); assertEquals(4 * 60, tripTimes.getDepartureTime(1)); - assertEquals(testData.stopA1.getId(), pattern.getStop(0).getId()); - assertEquals(testData.stopC1.getId(), pattern.getStop(1).getId()); + assertEquals(env.stopA1.getId(), pattern.getStop(0).getId()); + assertEquals(env.stopC1.getId(), pattern.getStop(1).getId()); - var originalTripTimes = env.getTripTimesForTrip(testData.trip1); + var originalTripTimes = env.getTripTimesForTrip(env.trip1); assertEquals(RealTimeState.SCHEDULED, originalTripTimes.getRealTimeState()); } @@ -105,10 +89,10 @@ void testReplaceJourney() { */ @Test void testUpdateJourneyWithDatedVehicleJourneyRef() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = updatedJourneyBuilder(env) - .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); assertEquals(1, result.successful()); @@ -120,13 +104,13 @@ void testUpdateJourneyWithDatedVehicleJourneyRef() { */ @Test void testUpdateJourneyWithFramedVehicleJourneyRef() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = updatedJourneyBuilder(env) .withFramedVehicleJourneyRef(builder -> builder - .withServiceDate(RealtimeTestData.SERVICE_DATE) - .withVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withServiceDate(RealtimeTestEnvironment.SERVICE_DATE) + .withVehicleJourneyRef(env.trip1.getId().getId()) ) .buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -139,7 +123,7 @@ void testUpdateJourneyWithFramedVehicleJourneyRef() { */ @Test void testUpdateJourneyWithoutJourneyRef() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetable(updates); @@ -152,7 +136,7 @@ void testUpdateJourneyWithoutJourneyRef() { */ @Test void testUpdateJourneyWithFuzzyMatching() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = updatedJourneyBuilder(env).buildEstimatedTimetableDeliveries(); var result = env.applyEstimatedTimetableWithFuzzyMatcher(updates); @@ -166,17 +150,17 @@ void testUpdateJourneyWithFuzzyMatching() { */ @Test void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withFramedVehicleJourneyRef(builder -> - builder.withServiceDate(RealtimeTestData.SERVICE_DATE).withVehicleJourneyRef("XXX") + builder.withServiceDate(RealtimeTestEnvironment.SERVICE_DATE).withVehicleJourneyRef("XXX") ) .withEstimatedCalls(builder -> builder - .call(env.testData.stopA1) + .call(env.stopA1) .departAimedExpected(null, "00:00:12") - .call(env.testData.stopB1) + .call(env.stopB1) .arriveAimedExpected("00:00:20", "00:00:22") ) .buildEstimatedTimetableDeliveries(); @@ -191,15 +175,15 @@ void testUpdateJourneyWithFuzzyMatchingAndMissingAimedDepartureTime() { */ @Test void testChangeQuay() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> - builder.call(env.testData.stopA1).departAimedActual("00:00:11", "00:00:15") + builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") ) .withEstimatedCalls(builder -> - builder.call(env.testData.stopB2).arriveAimedExpected("00:00:20", "00:00:33") + builder.call(env.stopB2).arriveAimedExpected("00:00:20", "00:00:33") ) .buildEstimatedTimetableDeliveries(); @@ -207,29 +191,29 @@ void testChangeQuay() { assertEquals(1, result.successful()); - var pattern = env.getPatternForTrip(env.testData.trip1.getId()); - var tripTimes = env.getTripTimesForTrip(env.testData.trip1); + var pattern = env.getPatternForTrip(env.trip1.getId()); + var tripTimes = env.getTripTimesForTrip(env.trip1); assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); assertEquals(11, tripTimes.getScheduledDepartureTime(0)); assertEquals(15, tripTimes.getDepartureTime(0)); assertEquals(20, tripTimes.getScheduledArrivalTime(1)); assertEquals(33, tripTimes.getArrivalTime(1)); - assertEquals(env.testData.stopB2, pattern.getStop(1)); + assertEquals(env.stopB2, pattern.getStop(1)); } @Test void testCancelStop() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.testData.trip2.getId().getId()) + .withDatedVehicleJourneyRef(env.trip2.getId().getId()) .withEstimatedCalls(builder -> builder - .call(env.testData.stopA1) + .call(env.stopA1) .departAimedExpected("00:01:01", "00:01:01") - .call(env.testData.stopB1) + .call(env.stopB1) .withIsCancellation(true) - .call(env.testData.stopC1) + .call(env.stopC1) .arriveAimedExpected("00:01:30", "00:01:30") ) .buildEstimatedTimetableDeliveries(); @@ -238,7 +222,7 @@ void testCancelStop() { assertEquals(1, result.successful()); - var pattern = env.getPatternForTrip(env.testData.trip2.getId()); + var pattern = env.getPatternForTrip(env.trip2.getId()); assertEquals(PickDrop.SCHEDULED, pattern.getAlightType(0)); assertEquals(PickDrop.CANCELLED, pattern.getAlightType(1)); @@ -249,20 +233,20 @@ void testCancelStop() { @Test @Disabled("Not supported yet") void testAddStop() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> - builder.call(env.testData.stopA1).departAimedActual("00:00:11", "00:00:15") + builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") ) .withEstimatedCalls(builder -> builder - .call(env.testData.stopD1) + .call(env.stopD1) .withIsExtraCall(true) .arriveAimedExpected("00:00:19", "00:00:20") .departAimedExpected("00:00:24", "00:00:25") - .call(env.testData.stopB1) + .call(env.stopB1) .arriveAimedExpected("00:00:20", "00:00:33") ) .buildEstimatedTimetableDeliveries(); @@ -271,8 +255,8 @@ void testAddStop() { assertEquals(1, result.successful()); - var pattern = env.getPatternForTrip(env.testData.trip1.getId()); - var tripTimes = env.getTripTimesForTrip(env.testData.trip1); + var pattern = env.getPatternForTrip(env.trip1.getId()); + var tripTimes = env.getTripTimesForTrip(env.trip1); assertEquals(RealTimeState.MODIFIED, tripTimes.getRealTimeState()); assertEquals(11, tripTimes.getScheduledDepartureTime(0)); assertEquals(15, tripTimes.getDepartureTime(0)); @@ -286,10 +270,7 @@ void testAddStop() { assertEquals(20, tripTimes.getScheduledArrivalTime(2)); assertEquals(33, tripTimes.getArrivalTime(2)); - assertEquals( - List.of(env.testData.stopA1, env.testData.stopD1, env.testData.stopB1), - pattern.getStops() - ); + assertEquals(List.of(env.stopA1, env.stopD1, env.stopB1), pattern.getStops()); } ///////////////// @@ -298,7 +279,7 @@ void testAddStop() { @Test void testNotMonitored() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withMonitored(false) @@ -311,19 +292,19 @@ void testNotMonitored() { @Test void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) .withDatedVehicleJourneyRef("newJourney") .withIsExtraJourney(true) - .withVehicleJourneyRef(env.testData.trip1.getId().getId()) - .withOperatorRef(env.testData.operator1Id.getId()) - .withLineRef(env.testData.route1Id.getId()) + .withVehicleJourneyRef(env.trip1.getId().getId()) + .withOperatorRef(env.operator1Id.getId()) + .withLineRef(env.route1Id.getId()) .withEstimatedCalls(builder -> builder - .call(env.testData.stopA1) + .call(env.stopA1) .departAimedExpected("00:01", "00:02") - .call(env.testData.stopC1) + .call(env.stopC1) .arriveAimedExpected("00:03", "00:04") ) .buildEstimatedTimetableDeliveries(); @@ -336,15 +317,15 @@ void testReplaceJourneyWithoutEstimatedVehicleJourneyCode() { @Test void testNegativeHopTime() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withRecordedCalls(builder -> builder - .call(env.testData.stopA1) + .call(env.stopA1) .departAimedActual("00:00:11", "00:00:15") - .call(env.testData.stopB1) + .call(env.stopB1) .arriveAimedActual("00:00:20", "00:00:14") ) .buildEstimatedTimetableDeliveries(); @@ -356,18 +337,18 @@ void testNegativeHopTime() { @Test void testNegativeDwellTime() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.testData.trip2.getId().getId()) + .withDatedVehicleJourneyRef(env.trip2.getId().getId()) .withRecordedCalls(builder -> builder - .call(env.testData.stopA1) + .call(env.stopA1) .departAimedActual("00:01:01", "00:01:01") - .call(env.testData.stopB1) + .call(env.stopB1) .arriveAimedActual("00:01:10", "00:01:13") .departAimedActual("00:01:11", "00:01:12") - .call(env.testData.stopB1) + .call(env.stopB1) .arriveAimedActual("00:01:20", "00:01:20") ) .buildEstimatedTimetableDeliveries(); @@ -381,19 +362,19 @@ void testNegativeDwellTime() { @Test @Disabled("Not supported yet") void testExtraUnknownStop() { - var env = new SiriRealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); var updates = new SiriEtBuilder(env.getDateTimeHelper()) - .withDatedVehicleJourneyRef(env.testData.trip1.getId().getId()) + .withDatedVehicleJourneyRef(env.trip1.getId().getId()) .withEstimatedCalls(builder -> builder - .call(env.testData.stopA1) + .call(env.stopA1) .departAimedExpected("00:00:11", "00:00:15") // Unexpected extra stop without isExtraCall flag - .call(env.testData.stopD1) + .call(env.stopD1) .arriveAimedExpected("00:00:19", "00:00:20") .departAimedExpected("00:00:24", "00:00:25") - .call(env.testData.stopB1) + .call(env.stopB1) .arriveAimedExpected("00:00:20", "00:00:33") ) .buildEstimatedTimetableDeliveries(); @@ -407,18 +388,18 @@ private void assertFailure(UpdateResult result, UpdateError.UpdateErrorType erro assertEquals(result.failures().keySet(), Set.of(errorType)); } - private static SiriEtBuilder updatedJourneyBuilder(SiriRealtimeTestEnvironment env) { + private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) { return new SiriEtBuilder(env.getDateTimeHelper()) .withRecordedCalls(builder -> - builder.call(env.testData.stopA1).departAimedActual("00:00:11", "00:00:15") + builder.call(env.stopA1).departAimedActual("00:00:11", "00:00:15") ) .withEstimatedCalls(builder -> - builder.call(env.testData.stopB1).arriveAimedExpected("00:00:20", "00:00:25") + builder.call(env.stopB1).arriveAimedExpected("00:00:20", "00:00:25") ); } - private static void assertTripUpdated(SiriRealtimeTestEnvironment env) { - var tripTimes = env.getTripTimesForTrip(env.testData.trip1); + private static void assertTripUpdated(RealtimeTestEnvironment env) { + var tripTimes = env.getTripTimesForTrip(env.trip1); assertEquals(RealTimeState.UPDATED, tripTimes.getRealTimeState()); assertEquals(11, tripTimes.getScheduledDepartureTime(0)); assertEquals(15, tripTimes.getDepartureTime(0)); diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java index a0b56dec58a..dad5acff83e 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java @@ -68,7 +68,7 @@ public static SiriFuzzyTripMatcher of(TransitService transitService) { /** * Constructor with package access for tests only. */ - SiriFuzzyTripMatcher(TransitService transitService) { + public SiriFuzzyTripMatcher(TransitService transitService) { this.transitService = transitService; initCache(this.transitService); } diff --git a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java deleted file mode 100644 index 80fa1805e36..00000000000 --- a/src/test/java/org/opentripplanner/updater/trip/GtfsRealtimeTestEnvironment.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.opentripplanner.updater.trip; - -import com.google.transit.realtime.GtfsRealtime; -import java.time.Duration; -import java.util.List; -import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.updater.TimetableSnapshotSourceParameters; -import org.opentripplanner.updater.spi.UpdateResult; - -public class GtfsRealtimeTestEnvironment { - - private static final TimetableSnapshotSourceParameters PARAMETERS = new TimetableSnapshotSourceParameters( - Duration.ZERO, - false - ); - public final TimetableSnapshotSource source; - - public final RealtimeTestData testData = new RealtimeTestData(); - - public GtfsRealtimeTestEnvironment() { - source = new TimetableSnapshotSource(PARAMETERS, testData.transitModel); - } - - public UpdateResult applyTripUpdates(GtfsRealtime.TripUpdate update) { - return applyTripUpdates(List.of(update)); - } - - public UpdateResult applyTripUpdates(List updates) { - return source.applyTripUpdates( - null, - BackwardsDelayPropagationType.REQUIRED_NO_DATA, - true, - updates, - testData.getFeedId() - ); - } - - public TripPattern getPatternForTrip(Trip trip) { - return testData.transitModel.getTransitModelIndex().getPatternForTrip().get(trip); - } -} diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java similarity index 59% rename from src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java rename to src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index 120ea153132..b8ee36b9f42 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestData.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -1,12 +1,19 @@ package org.opentripplanner.updater.trip; +import com.google.transit.realtime.GtfsRealtime; +import java.time.Duration; import java.time.LocalDate; import java.time.ZoneId; import java.util.List; import java.util.stream.Collectors; import java.util.stream.IntStream; +import org.opentripplanner.DateTimeHelper; +import org.opentripplanner.ext.siri.EntityResolver; +import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; +import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; +import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.model.calendar.CalendarServiceData; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.Deduplicator; @@ -24,6 +31,9 @@ import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.updater.TimetableSnapshotSourceParameters; +import org.opentripplanner.updater.spi.UpdateResult; +import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; /** * This class exists so that you can share the data building logic for GTFS and Siri tests. @@ -32,8 +42,12 @@ *

              * It is however a goal to change that and then these two can be combined together. */ -public final class RealtimeTestData { +public final class RealtimeTestEnvironment { + private static final TimetableSnapshotSourceParameters PARAMETERS = new TimetableSnapshotSourceParameters( + Duration.ZERO, + false + ); public static final LocalDate SERVICE_DATE = LocalDate.of(2024, 5, 8); public static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); @@ -60,8 +74,24 @@ public final class RealtimeTestData { public final Trip trip1; public final Trip trip2; public final TransitModel transitModel; + private final SiriTimetableSnapshotSource siriSource; + private final TimetableSnapshotSource gtfsSource; + private final DateTimeHelper dateTimeHelper; - public RealtimeTestData() { + private enum SourceType { + GTFS_RT, + SIRI, + } + + public static RealtimeTestEnvironment siri() { + return new RealtimeTestEnvironment(SourceType.SIRI); + } + + public static RealtimeTestEnvironment gtfs() { + return new RealtimeTestEnvironment(SourceType.GTFS_RT); + } + + private RealtimeTestEnvironment(SourceType sourceType) { transitModel = new TransitModel(stopModel, new Deduplicator()); transitModel.initTimeZone(timeZone); transitModel.addAgency(TransitModelForTest.AGENCY); @@ -86,6 +116,18 @@ public RealtimeTestData() { transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); transitModel.index(); + + // SIRI and GTFS-RT cannot be registered with the transit model at the same time + // we are actively refactoring to remove this restriction + // for the time being you cannot run a SIRI and GTFS-RT test at the same time + if (sourceType == SourceType.SIRI) { + siriSource = new SiriTimetableSnapshotSource(PARAMETERS, transitModel); + gtfsSource = null; + } else { + gtfsSource = new TimetableSnapshotSource(PARAMETERS, transitModel); + siriSource = null; + } + dateTimeHelper = new DateTimeHelper(timeZone, RealtimeTestEnvironment.SERVICE_DATE); } public FeedScopedId id(String id) { @@ -114,6 +156,96 @@ public String getFeedId() { return TransitModelForTest.FEED_ID; } + public UpdateResult applyTripUpdates(GtfsRealtime.TripUpdate update) { + return applyTripUpdates(List.of(update)); + } + + public UpdateResult applyTripUpdates(List updates) { + return gtfsSource.applyTripUpdates( + null, + BackwardsDelayPropagationType.REQUIRED_NO_DATA, + true, + updates, + getFeedId() + ); + } + + public EntityResolver getEntityResolver() { + return new EntityResolver(getTransitService(), getFeedId()); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId) { + return getPatternForTrip(tripId, RealtimeTestEnvironment.SERVICE_DATE); + } + + public TripPattern getPatternForTrip(FeedScopedId tripId, LocalDate serviceDate) { + var transitService = getTransitService(); + var trip = transitService.getTripOnServiceDateById(tripId); + return transitService.getPatternForTrip(trip.getTrip(), serviceDate); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(Trip trip) { + return getTripTimesForTrip(trip.getId(), SERVICE_DATE); + } + + /** + * Find the current TripTimes for a trip id on the default serviceDate + */ + public TripTimes getTripTimesForTrip(String id) { + return getTripTimesForTrip(id(id), SERVICE_DATE); + } + + public UpdateResult applyEstimatedTimetable(List updates) { + return siriSource.applyEstimatedTimetable( + null, + getEntityResolver(), + getFeedId(), + false, + updates + ); + } + + public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( + List updates + ) { + SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); + return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); + } + + public DateTimeHelper getDateTimeHelper() { + return dateTimeHelper; + } + + private UpdateResult applyEstimatedTimetable( + List updates, + SiriFuzzyTripMatcher siriFuzzyTripMatcher + ) { + return siriSource.applyEstimatedTimetable( + siriFuzzyTripMatcher, + getEntityResolver(), + getFeedId(), + false, + updates + ); + } + + public TripPattern getPatternForTrip(Trip trip) { + return transitModel.getTransitModelIndex().getPatternForTrip().get(trip); + } + + public TimetableSnapshot getTimetableSnapshot() { + if (siriSource != null) { + return siriSource.getTimetableSnapshot(); + } else { + return gtfsSource.getTimetableSnapshot(); + } + } + + // private methods + private Trip createTrip(String id, Route route, List stops) { var trip = Trip.of(id(id)).withRoute(route).withServiceId(CAL_ID).build(); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index 0abf3583380..3795a9e683b 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -12,8 +12,7 @@ import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.timetable.RealTimeState; -import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; -import org.opentripplanner.updater.trip.RealtimeTestData; +import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** @@ -32,26 +31,24 @@ static List cases() { @ParameterizedTest @MethodSource("cases") public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { - var env = new GtfsRealtimeTestEnvironment(); - var pattern1 = env.getPatternForTrip(env.testData.trip1); + var env = RealtimeTestEnvironment.gtfs(); + var pattern1 = env.getPatternForTrip(env.trip1); - final int tripIndex1 = pattern1 - .getScheduledTimetable() - .getTripIndex(env.testData.trip1.getId()); + final int tripIndex1 = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); var update = new TripUpdateBuilder( - env.testData.trip1.getId().getId(), - RealtimeTestData.SERVICE_DATE, + env.trip1.getId().getId(), + RealtimeTestEnvironment.SERVICE_DATE, relationship, - env.testData.timeZone + env.timeZone ) .build(); var result = env.applyTripUpdates(update); assertEquals(1, result.successful()); - final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern1, RealtimeTestData.SERVICE_DATE); + final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + final Timetable forToday = snapshot.resolve(pattern1, RealtimeTestEnvironment.SERVICE_DATE); final Timetable schedule = snapshot.resolve(pattern1, null); assertNotSame(forToday, schedule); assertNotSame(forToday.getTripTimes(tripIndex1), schedule.getTripTimes(tripIndex1)); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index 673d0b0326b..9b4ac2b47c0 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -9,8 +9,7 @@ import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.timetable.RealTimeState; -import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; -import org.opentripplanner.updater.trip.RealtimeTestData; +import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** @@ -23,14 +22,13 @@ public class DelayedTest { @Test public void delayed() { - var env = new GtfsRealtimeTestEnvironment(); - var testData = env.testData; + var env = RealtimeTestEnvironment.gtfs(); var tripUpdate = new TripUpdateBuilder( - env.testData.trip1.getId().getId(), - RealtimeTestData.SERVICE_DATE, + env.trip1.getId().getId(), + RealtimeTestEnvironment.SERVICE_DATE, SCHEDULED, - testData.timeZone + env.timeZone ) .addDelayedStopTime(STOP_SEQUENCE, DELAY) .build(); @@ -41,13 +39,14 @@ public void delayed() { // trip1 should be modified { - var pattern1 = env.getPatternForTrip(env.testData.trip1); - final int trip1Index = pattern1 - .getScheduledTimetable() - .getTripIndex(env.testData.trip1.getId()); + var pattern1 = env.getPatternForTrip(env.trip1); + final int trip1Index = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); - final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable trip1Realtime = snapshot.resolve(pattern1, RealtimeTestData.SERVICE_DATE); + final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + final Timetable trip1Realtime = snapshot.resolve( + pattern1, + RealtimeTestEnvironment.SERVICE_DATE + ); final Timetable trip1Scheduled = snapshot.resolve(pattern1, null); assertNotSame(trip1Realtime, trip1Scheduled); @@ -70,11 +69,11 @@ public void delayed() { // trip2 should keep the scheduled information { - var pattern = env.getPatternForTrip(testData.trip2); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(testData.trip2.getId()); + var pattern = env.getPatternForTrip(env.trip2); + final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); - final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); - final Timetable realtime = snapshot.resolve(pattern, RealtimeTestData.SERVICE_DATE); + final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + final Timetable realtime = snapshot.resolve(pattern, RealtimeTestEnvironment.SERVICE_DATE); final Timetable scheduled = snapshot.resolve(pattern, null); assertSame(realtime, scheduled); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 3cbb6e985c2..624f7b0dd58 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -14,8 +14,7 @@ import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimes; -import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; -import org.opentripplanner.updater.trip.RealtimeTestData; +import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** @@ -25,14 +24,14 @@ public class SkippedTest { @Test public void scheduledTripWithSkippedAndScheduled() { - var env = new GtfsRealtimeTestEnvironment(); - String scheduledTripId = env.testData.trip2.getId().getId(); + var env = RealtimeTestEnvironment.gtfs(); + String scheduledTripId = env.trip2.getId().getId(); var tripUpdate = new TripUpdateBuilder( scheduledTripId, - RealtimeTestData.SERVICE_DATE, + RealtimeTestEnvironment.SERVICE_DATE, SCHEDULED, - env.testData.timeZone + env.timeZone ) .addDelayedStopTime(0, 0) .addSkippedStop(1) @@ -43,20 +42,20 @@ public void scheduledTripWithSkippedAndScheduled() { assertEquals(1, result.successful()); - final TimetableSnapshot snapshot = env.source.getTimetableSnapshot(); + final TimetableSnapshot snapshot = env.getTimetableSnapshot(); // Original trip pattern { - final FeedScopedId tripId = env.testData.trip2.getId(); - final Trip trip = env.testData.transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = env.testData.transitModel + final FeedScopedId tripId = env.trip2.getId(); + final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); + final TripPattern originalTripPattern = env.transitModel .getTransitModelIndex() .getPatternForTrip() .get(trip); final Timetable originalTimetableForToday = snapshot.resolve( originalTripPattern, - RealtimeTestData.SERVICE_DATE + RealtimeTestEnvironment.SERVICE_DATE ); final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); @@ -77,13 +76,13 @@ public void scheduledTripWithSkippedAndScheduled() { // New trip pattern { final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( - env.testData.trip2.getId(), - RealtimeTestData.SERVICE_DATE + env.trip2.getId(), + RealtimeTestEnvironment.SERVICE_DATE ); final Timetable newTimetableForToday = snapshot.resolve( newTripPattern, - RealtimeTestData.SERVICE_DATE + RealtimeTestEnvironment.SERVICE_DATE ); final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index e3bfaf95b8c..c6d28bca686 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -4,14 +4,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; -import static org.opentripplanner.updater.trip.RealtimeTestData.SERVICE_DATE; +import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE; import java.time.LocalDate; import java.util.List; import java.util.Set; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.updater.trip.GtfsRealtimeTestEnvironment; +import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** @@ -27,14 +27,9 @@ public static List cases() { @ParameterizedTest @MethodSource("cases") public void invalidTripDate(LocalDate date) { - var env = new GtfsRealtimeTestEnvironment(); - - var update = new TripUpdateBuilder( - env.testData.trip1.getId().getId(), - date, - SCHEDULED, - env.testData.timeZone - ) + var env = RealtimeTestEnvironment.gtfs(); + + var update = new TripUpdateBuilder(env.trip1.getId().getId(), date, SCHEDULED, env.timeZone) .addDelayedStopTime(1, 0) .addDelayedStopTime(2, 60, 80) .addDelayedStopTime(3, 90, 90) @@ -42,7 +37,7 @@ public void invalidTripDate(LocalDate date) { var result = env.applyTripUpdates(update); - var snapshot = env.source.getTimetableSnapshot(); + var snapshot = env.getTimetableSnapshot(); assertTrue(snapshot.isEmpty()); assertEquals(1, result.failed()); var errors = result.failures().keySet(); From 19b9ab9f08ddec29a6643c365f70a15cacd4b195 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sat, 1 Jun 2024 21:43:03 +0200 Subject: [PATCH 1263/1688] Reorder methods --- .../ext/siri/SiriFuzzyTripMatcher.java | 2 +- .../updater/trip/RealtimeTestEnvironment.java | 77 ++++++++++--------- .../CancellationDeletionTest.java | 2 +- .../trip/moduletests/delay/DelayedTest.java | 2 +- .../trip/moduletests/delay/SkippedTest.java | 2 +- .../rejection/InvalidInputTest.java | 2 +- 6 files changed, 47 insertions(+), 40 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java index dad5acff83e..cc76ad3ac4f 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriFuzzyTripMatcher.java @@ -66,7 +66,7 @@ public static SiriFuzzyTripMatcher of(TransitService transitService) { } /** - * Constructor with package access for tests only. + * Constructor with public access for tests only. */ public SiriFuzzyTripMatcher(TransitService transitService) { this.transitService = transitService; diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index b8ee36b9f42..d32cee09359 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -5,6 +5,7 @@ import java.time.LocalDate; import java.time.ZoneId; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.IntStream; import org.opentripplanner.DateTimeHelper; @@ -156,20 +157,6 @@ public String getFeedId() { return TransitModelForTest.FEED_ID; } - public UpdateResult applyTripUpdates(GtfsRealtime.TripUpdate update) { - return applyTripUpdates(List.of(update)); - } - - public UpdateResult applyTripUpdates(List updates) { - return gtfsSource.applyTripUpdates( - null, - BackwardsDelayPropagationType.REQUIRED_NO_DATA, - true, - updates, - getFeedId() - ); - } - public EntityResolver getEntityResolver() { return new EntityResolver(getTransitService(), getFeedId()); } @@ -198,6 +185,31 @@ public TripTimes getTripTimesForTrip(String id) { return getTripTimesForTrip(id(id), SERVICE_DATE); } + public DateTimeHelper getDateTimeHelper() { + return dateTimeHelper; + } + + public TripPattern getPatternForTrip(Trip trip) { + return transitModel.getTransitModelIndex().getPatternForTrip().get(trip); + } + + public TimetableSnapshot getTimetableSnapshot() { + if (siriSource != null) { + return siriSource.getTimetableSnapshot(); + } else { + return gtfsSource.getTimetableSnapshot(); + } + } + + // SIRI updates + + public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( + List updates + ) { + SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); + return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); + } + public UpdateResult applyEstimatedTimetable(List updates) { return siriSource.applyEstimatedTimetable( null, @@ -208,21 +220,30 @@ public UpdateResult applyEstimatedTimetable(List updates - ) { - SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); - return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); + // GTFS-RT updates + + public UpdateResult applyTripUpdate(GtfsRealtime.TripUpdate update) { + return applyTripUpdates(List.of(update)); } - public DateTimeHelper getDateTimeHelper() { - return dateTimeHelper; + public UpdateResult applyTripUpdates(List updates) { + Objects.requireNonNull(gtfsSource, "Test environment is configured for SIRI only"); + return gtfsSource.applyTripUpdates( + null, + BackwardsDelayPropagationType.REQUIRED_NO_DATA, + true, + updates, + getFeedId() + ); } + // private methods + private UpdateResult applyEstimatedTimetable( List updates, SiriFuzzyTripMatcher siriFuzzyTripMatcher ) { + Objects.requireNonNull(siriSource, "Test environment is configured for GTFS-RT only"); return siriSource.applyEstimatedTimetable( siriFuzzyTripMatcher, getEntityResolver(), @@ -232,20 +253,6 @@ private UpdateResult applyEstimatedTimetable( ); } - public TripPattern getPatternForTrip(Trip trip) { - return transitModel.getTransitModelIndex().getPatternForTrip().get(trip); - } - - public TimetableSnapshot getTimetableSnapshot() { - if (siriSource != null) { - return siriSource.getTimetableSnapshot(); - } else { - return gtfsSource.getTimetableSnapshot(); - } - } - - // private methods - private Trip createTrip(String id, Route route, List stops) { var trip = Trip.of(id(id)).withRoute(route).withServiceId(CAL_ID).build(); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index 3795a9e683b..8af13ac286f 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -43,7 +43,7 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state env.timeZone ) .build(); - var result = env.applyTripUpdates(update); + var result = env.applyTripUpdate(update); assertEquals(1, result.successful()); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index 9b4ac2b47c0..4cfe1e5500d 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -33,7 +33,7 @@ public void delayed() { .addDelayedStopTime(STOP_SEQUENCE, DELAY) .build(); - var result = env.applyTripUpdates(tripUpdate); + var result = env.applyTripUpdate(tripUpdate); assertEquals(1, result.successful()); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 624f7b0dd58..d97704549ee 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -38,7 +38,7 @@ public void scheduledTripWithSkippedAndScheduled() { .addDelayedStopTime(2, 90) .build(); - var result = env.applyTripUpdates(tripUpdate); + var result = env.applyTripUpdate(tripUpdate); assertEquals(1, result.successful()); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index c6d28bca686..00831333943 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -35,7 +35,7 @@ public void invalidTripDate(LocalDate date) { .addDelayedStopTime(3, 90, 90) .build(); - var result = env.applyTripUpdates(update); + var result = env.applyTripUpdate(update); var snapshot = env.getTimetableSnapshot(); assertTrue(snapshot.isEmpty()); From f4e2fe229e90b0d4e26594ef8b77f698c5ad76e2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 2 Jun 2024 01:10:47 +0000 Subject: [PATCH 1264/1688] chore(deps): update debug ui dependencies (non-major) --- client-next/package-lock.json | 155 ++++++++++++++++++---------------- client-next/package.json | 10 +-- 2 files changed, 87 insertions(+), 78 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 20e7e0b83c1..75fec4ca86c 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -26,21 +26,21 @@ "@testing-library/react": "15.0.7", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.10.0", - "@typescript-eslint/parser": "7.10.0", + "@typescript-eslint/eslint-plugin": "7.11.0", + "@typescript-eslint/parser": "7.11.0", "@vitejs/plugin-react": "4.3.0", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", "eslint-plugin-jsx-a11y": "6.8.0", - "eslint-plugin-react": "7.34.1", + "eslint-plugin-react": "7.34.2", "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.1.0", - "prettier": "3.2.5", + "prettier": "3.3.0", "typescript": "5.4.5", - "vite": "5.2.11", + "vite": "5.2.12", "vitest": "1.6.0" } }, @@ -3810,17 +3810,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.10.0.tgz", - "integrity": "sha512-PzCr+a/KAef5ZawX7nbyNwBDtM1HdLIT53aSA2DDlxmxMngZ43O8SIePOeX8H5S+FHXeI6t97mTt/dDdzY4Fyw==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.11.0.tgz", + "integrity": "sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.10.0", - "@typescript-eslint/type-utils": "7.10.0", - "@typescript-eslint/utils": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0", + "@typescript-eslint/scope-manager": "7.11.0", + "@typescript-eslint/type-utils": "7.11.0", + "@typescript-eslint/utils": "7.11.0", + "@typescript-eslint/visitor-keys": "7.11.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3844,16 +3844,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.10.0.tgz", - "integrity": "sha512-2EjZMA0LUW5V5tGQiaa2Gys+nKdfrn2xiTIBLR4fxmPmVSvgPcKNW+AE/ln9k0A4zDUti0J/GZXMDupQoI+e1w==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.11.0.tgz", + "integrity": "sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "7.10.0", - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/typescript-estree": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0", + "@typescript-eslint/scope-manager": "7.11.0", + "@typescript-eslint/types": "7.11.0", + "@typescript-eslint/typescript-estree": "7.11.0", + "@typescript-eslint/visitor-keys": "7.11.0", "debug": "^4.3.4" }, "engines": { @@ -3873,14 +3873,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.10.0.tgz", - "integrity": "sha512-7L01/K8W/VGl7noe2mgH0K7BE29Sq6KAbVmxurj8GGaPDZXPr8EEQ2seOeAS+mEV9DnzxBQB6ax6qQQ5C6P4xg==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz", + "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0" + "@typescript-eslint/types": "7.11.0", + "@typescript-eslint/visitor-keys": "7.11.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3891,14 +3891,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.10.0.tgz", - "integrity": "sha512-D7tS4WDkJWrVkuzgm90qYw9RdgBcrWmbbRkrLA4d7Pg3w0ttVGDsvYGV19SH8gPR5L7OtcN5J1hTtyenO9xE9g==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz", + "integrity": "sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.10.0", - "@typescript-eslint/utils": "7.10.0", + "@typescript-eslint/typescript-estree": "7.11.0", + "@typescript-eslint/utils": "7.11.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3919,9 +3919,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.10.0.tgz", - "integrity": "sha512-7fNj+Ya35aNyhuqrA1E/VayQX9Elwr8NKZ4WueClR3KwJ7Xx9jcCdOrLW04h51de/+gNbyFMs+IDxh5xIwfbNg==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz", + "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==", "dev": true, "license": "MIT", "engines": { @@ -3933,14 +3933,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.10.0.tgz", - "integrity": "sha512-LXFnQJjL9XIcxeVfqmNj60YhatpRLt6UhdlFwAkjNc6jSUlK8zQOl1oktAP8PlWFzPQC1jny/8Bai3/HPuvN5g==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz", + "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/visitor-keys": "7.10.0", + "@typescript-eslint/types": "7.11.0", + "@typescript-eslint/visitor-keys": "7.11.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3975,16 +3975,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.10.0.tgz", - "integrity": "sha512-olzif1Fuo8R8m/qKkzJqT7qwy16CzPRWBvERS0uvyc+DHd8AKbO4Jb7kpAvVzMmZm8TrHnI7hvjN4I05zow+tg==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz", + "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.10.0", - "@typescript-eslint/types": "7.10.0", - "@typescript-eslint/typescript-estree": "7.10.0" + "@typescript-eslint/scope-manager": "7.11.0", + "@typescript-eslint/types": "7.11.0", + "@typescript-eslint/typescript-estree": "7.11.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3998,13 +3998,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.10.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.10.0.tgz", - "integrity": "sha512-9ntIVgsi6gg6FIq9xjEO4VQJvwOqA3jaBFQJ/6TK5AvEup2+cECI6Fh7QiBxmfMHXU0V0J4RyPeOU1VDNzl9cg==", + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz", + "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.10.0", + "@typescript-eslint/types": "7.11.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -5679,10 +5679,11 @@ } }, "node_modules/es-abstract": { - "version": "1.23.2", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.2.tgz", - "integrity": "sha512-60s3Xv2T2p1ICykc7c+DNDPLDMm9t4QxCOUU0K9JxiLjM3C1zB9YVdN7tjxrFd4+AkZ8CdX1ovUga4P2+1e+/w==", + "version": "1.23.3", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", + "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", "dev": true, + "license": "MIT", "dependencies": { "array-buffer-byte-length": "^1.0.1", "arraybuffer.prototype.slice": "^1.0.3", @@ -5723,11 +5724,11 @@ "safe-regex-test": "^1.0.3", "string.prototype.trim": "^1.2.9", "string.prototype.trimend": "^1.0.8", - "string.prototype.trimstart": "^1.0.7", + "string.prototype.trimstart": "^1.0.8", "typed-array-buffer": "^1.0.2", "typed-array-byte-length": "^1.0.1", "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.5", + "typed-array-length": "^1.0.6", "unbox-primitive": "^1.0.2", "which-typed-array": "^1.1.15" }, @@ -5760,14 +5761,15 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.18.tgz", - "integrity": "sha512-scxAJaewsahbqTYrGKJihhViaM6DDZDDoucfvzNbK0pOren1g/daDQ3IAhzn+1G14rBG7w+i5N+qul60++zlKA==", + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz", + "integrity": "sha512-zoMwbCcH5hwUkKJkT8kDIBZSz9I6mVG//+lDCinLCGov4+r7NIy0ld8o03M0cJxl2spVf6ESYVS6/gpIfq1FFw==", "dev": true, + "license": "MIT", "dependencies": { "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", + "es-abstract": "^1.23.3", "es-errors": "^1.3.0", "es-set-tostringtag": "^2.0.3", "function-bind": "^1.1.2", @@ -6135,29 +6137,30 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.34.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.1.tgz", - "integrity": "sha512-N97CxlouPT1AHt8Jn0mhhN2RrADlUAsk1/atcT2KyA/l9Q/E6ll7OIGwNumFmWfZ9skV3XXccYS19h80rHtgkw==", + "version": "7.34.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz", + "integrity": "sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==", "dev": true, + "license": "MIT", "dependencies": { - "array-includes": "^3.1.7", - "array.prototype.findlast": "^1.2.4", + "array-includes": "^3.1.8", + "array.prototype.findlast": "^1.2.5", "array.prototype.flatmap": "^1.3.2", "array.prototype.toreversed": "^1.1.2", "array.prototype.tosorted": "^1.1.3", "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.0.17", + "es-iterator-helpers": "^1.0.19", "estraverse": "^5.3.0", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", - "object.entries": "^1.1.7", - "object.fromentries": "^2.0.7", - "object.hasown": "^1.1.3", - "object.values": "^1.1.7", + "object.entries": "^1.1.8", + "object.fromentries": "^2.0.8", + "object.hasown": "^1.1.4", + "object.values": "^1.2.0", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.10" + "string.prototype.matchall": "^4.0.11" }, "engines": { "node": ">=4" @@ -6193,6 +6196,7 @@ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6203,6 +6207,7 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz", "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==", "dev": true, + "license": "Apache-2.0", "dependencies": { "esutils": "^2.0.2" }, @@ -6215,6 +6220,7 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -6227,6 +6233,7 @@ "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz", "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==", "dev": true, + "license": "MIT", "dependencies": { "is-core-module": "^2.13.0", "path-parse": "^1.0.7", @@ -9379,10 +9386,11 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", + "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", "dev": true, + "license": "MIT", "bin": { "prettier": "bin/prettier.cjs" }, @@ -11135,10 +11143,11 @@ } }, "node_modules/vite": { - "version": "5.2.11", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.11.tgz", - "integrity": "sha512-HndV31LWW05i1BLPMUCE1B9E9GFbOu1MbenhS58FuK6owSO5qHm7GiCotrNY1YE5rMeQSFBGmT5ZaLEjFizgiQ==", + "version": "5.2.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz", + "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.20.1", "postcss": "^8.4.38", diff --git a/client-next/package.json b/client-next/package.json index 9195702c1ad..17171945476 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -35,21 +35,21 @@ "@testing-library/react": "15.0.7", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.10.0", - "@typescript-eslint/parser": "7.10.0", + "@typescript-eslint/eslint-plugin": "7.11.0", + "@typescript-eslint/parser": "7.11.0", "@vitejs/plugin-react": "4.3.0", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-import": "2.29.1", "eslint-plugin-jsx-a11y": "6.8.0", - "eslint-plugin-react": "7.34.1", + "eslint-plugin-react": "7.34.2", "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.1.0", - "prettier": "3.2.5", + "prettier": "3.3.0", "typescript": "5.4.5", - "vite": "5.2.11", + "vite": "5.2.12", "vitest": "1.6.0" } } From 22aa4b1cd8e7f0fe04f36340e5d72668fd66ac2c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Sun, 2 Jun 2024 22:07:46 +0200 Subject: [PATCH 1265/1688] Apply review feedback --- .../transit/model/timetable/TripTimes.java | 2 +- .../updater/trip/RealtimeTestEnvironment.java | 18 ++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java index 7bf1a826c1c..7ff66f0b90e 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimes.java @@ -12,7 +12,7 @@ /** * A TripTimes represents the arrival and departure times for a single trip in a timetable. It is - * one of the core class used for transit routing. This interface allow different kind of trip + * one of the core class used for transit routing. This interface allows different kind of trip * to implement their own trip times. Scheduled/planned trips should be immutable, real-time * trip times should allow updates and more info, frequency-based trips can use a more compact * implementation, and Flex may expose part of the trip as a "scheduled/regular" stop-to-stop diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index d32cee09359..88076a3bdce 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -41,7 +41,7 @@ * Since it's not possible to add a Siri and GTFS updater to the transit model at the same time, * they each have their own test environment. *

              - * It is however a goal to change that and then these two can be combined together. + * It is however a goal to change that and then these two can be combined. */ public final class RealtimeTestEnvironment { @@ -50,7 +50,7 @@ public final class RealtimeTestEnvironment { false ); public static final LocalDate SERVICE_DATE = LocalDate.of(2024, 5, 8); - public static final FeedScopedId CAL_ID = TransitModelForTest.id("CAL_1"); + public static final FeedScopedId SERVICE_ID = TransitModelForTest.id("CAL_1"); private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); public final Station stationA = testModel.station("A").build(); @@ -84,10 +84,16 @@ private enum SourceType { SIRI, } + /** + * Siri and GTFS-RT cannot be run at the same time, so you need to decide. + */ public static RealtimeTestEnvironment siri() { return new RealtimeTestEnvironment(SourceType.SIRI); } + /** + * Siri and GTFS-RT cannot be run at the same time, so you need to decide. + */ public static RealtimeTestEnvironment gtfs() { return new RealtimeTestEnvironment(SourceType.GTFS_RT); } @@ -110,10 +116,10 @@ private RealtimeTestEnvironment(SourceType sourceType) { CalendarServiceData calendarServiceData = new CalendarServiceData(); calendarServiceData.putServiceDatesForServiceId( - CAL_ID, + SERVICE_ID, List.of(SERVICE_DATE.minusDays(1), SERVICE_DATE, SERVICE_DATE.plusDays(1)) ); - transitModel.getServiceCodes().put(CAL_ID, 0); + transitModel.getServiceCodes().put(SERVICE_ID, 0); transitModel.updateCalendarServiceData(true, calendarServiceData, DataImportIssueStore.NOOP); transitModel.index(); @@ -131,7 +137,7 @@ private RealtimeTestEnvironment(SourceType sourceType) { dateTimeHelper = new DateTimeHelper(timeZone, RealtimeTestEnvironment.SERVICE_DATE); } - public FeedScopedId id(String id) { + public static FeedScopedId id(String id) { return TransitModelForTest.id(id); } @@ -254,7 +260,7 @@ private UpdateResult applyEstimatedTimetable( } private Trip createTrip(String id, Route route, List stops) { - var trip = Trip.of(id(id)).withRoute(route).withServiceId(CAL_ID).build(); + var trip = Trip.of(id(id)).withRoute(route).withServiceId(SERVICE_ID).build(); var tripOnServiceDate = TripOnServiceDate .of(trip.getId()) From b567ac52692efa9fe64b6bcb6be860be63def227 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Mon, 3 Jun 2024 06:11:28 +0000 Subject: [PATCH 1266/1688] Upgrade debug client to version 2024/06/2024-06-03T06:10 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 91f07c43b9a..717fce1baf2 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +

              From 397818f50b2c6015df92e3c3ff8b2a6bcd046a23 Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Mon, 3 Jun 2024 08:46:29 +0200 Subject: [PATCH 1267/1688] Move TripTimesStringBuilder to core --- .../siri/SiriTimetableSnapshotSourceTest.java | 55 +--------------- .../timetable/TripTimesStringBuilder.java | 64 +++++++++++++++++++ 2 files changed, 67 insertions(+), 52 deletions(-) create mode 100644 src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index cd80da6f842..cfe080c47dc 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -5,7 +5,6 @@ import java.time.Duration; import java.time.LocalDate; import java.time.ZoneId; -import java.util.ArrayList; import java.util.List; import java.util.Set; import java.util.stream.Collectors; @@ -13,7 +12,6 @@ import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.opentripplanner.DateTimeHelper; -import org.opentripplanner.framework.time.TimeUtils; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.calendar.CalendarServiceData; @@ -30,6 +28,7 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; +import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; @@ -561,7 +560,7 @@ public String getRealtimeTimetable(FeedScopedId tripId, LocalDate serviceDate) { var tt = getTripTimesForTrip(tripId, serviceDate); var pattern = getPatternForTrip(tripId); - return encodeTimetable(tt, pattern); + return TripTimesStringBuilder.encodeTripTimes(tt, pattern); } public String getScheduledTimetable(String tripId) { @@ -572,55 +571,7 @@ public String getScheduledTimetable(FeedScopedId tripId) { var pattern = getPatternForTrip(tripId); var tt = pattern.getScheduledTimetable().getTripTimes(tripId); - return encodeTimetable(tt, pattern); - } - - /** - * This encodes the times and information about stops in a readable way in order to simplify - * testing. The format is: - * - * 
              -     * REALTIME_STATE | stop1 [FLAGS] arrivalTime departureTime | stop2 ...
-     *
-     * Where flags are:
-     * C: Canceled
-     * R: Recorded
-     * PI: Prediction Inaccurate
-     * ND: No Data
-     *
              - */ - private String encodeTimetable(TripTimes tripTimes, TripPattern pattern) { - var stops = pattern.getStops(); - - StringBuilder s = new StringBuilder(tripTimes.getRealTimeState().toString()); - for (int i = 0; i < tripTimes.getNumStops(); i++) { - var depart = tripTimes.getDepartureTime(i); - var arrive = tripTimes.getArrivalTime(i); - var flags = new ArrayList(); - if (tripTimes.isCancelledStop(i)) { - flags.add("C"); - } - if (tripTimes.isRecordedStop(i)) { - flags.add("R"); - } - if (tripTimes.isPredictionInaccurate(i)) { - flags.add("PI"); - } - if (tripTimes.isNoDataStop(i)) { - flags.add("ND"); - } - - s.append(" | ").append(stops.get(i).getName()); - if (!flags.isEmpty()) { - s.append(" [").append(String.join(",", flags)).append("]"); - } - s - .append(" ") - .append(TimeUtils.timeToStrCompact(arrive)) - .append(" ") - .append(TimeUtils.timeToStrCompact(depart)); - } - return s.toString(); + return TripTimesStringBuilder.encodeTripTimes(tt, pattern); } /** diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java new file mode 100644 index 00000000000..a5e77037dea --- /dev/null +++ b/src/main/java/org/opentripplanner/transit/model/timetable/TripTimesStringBuilder.java @@ -0,0 +1,64 @@ +package org.opentripplanner.transit.model.timetable; + +import java.util.ArrayList; +import org.opentripplanner.framework.time.TimeUtils; +import org.opentripplanner.transit.model.network.TripPattern; + +public class TripTimesStringBuilder { + + /** + * This encodes the trip times and information about stops in a readable way in order to simplify + * testing/debugging. The format of the outputput string is: + * + * 
              +   * REALTIME_STATE | stop1 [FLAGS] arrivalTime departureTime | stop2 ...
+   *
+   * Where flags are:
+   * C: Canceled
+   * R: Recorded
+   * PI: Prediction Inaccurate
+   * ND: No Data
+   *
              + * + * @throws IllegalStateException if TripTimes does not match the TripPattern + */ + public static String encodeTripTimes(TripTimes tripTimes, TripPattern pattern) { + var stops = pattern.getStops(); + + if (tripTimes.getNumStops() != stops.size()) { + throw new IllegalArgumentException( + "TripTimes and TripPattern have different number of stops" + ); + } + + StringBuilder s = new StringBuilder(tripTimes.getRealTimeState().toString()); + for (int i = 0; i < tripTimes.getNumStops(); i++) { + var depart = tripTimes.getDepartureTime(i); + var arrive = tripTimes.getArrivalTime(i); + var flags = new ArrayList(); + if (tripTimes.isCancelledStop(i)) { + flags.add("C"); + } + if (tripTimes.isRecordedStop(i)) { + flags.add("R"); + } + if (tripTimes.isPredictionInaccurate(i)) { + flags.add("PI"); + } + if (tripTimes.isNoDataStop(i)) { + flags.add("ND"); + } + + s.append(" | ").append(stops.get(i).getName()); + if (!flags.isEmpty()) { + s.append(" [").append(String.join(",", flags)).append("]"); + } + s + .append(" ") + .append(TimeUtils.timeToStrCompact(arrive)) + .append(" ") + .append(TimeUtils.timeToStrCompact(depart)); + } + return s.toString(); + } +} From dd4a76ae2db7331d02f3f700331e8ec14b60e4f8 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 3 Jun 2024 09:14:24 +0000 Subject: [PATCH 1268/1688] Add changelog entry for #5835 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 0c4356c99c8..9df32c081af 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -24,6 +24,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Log the origin of a request that causes a transfer cache addition. [#5874](https://github.com/opentripplanner/OpenTripPlanner/pull/5874) - Fix handling of missing aimed departure time [#5865](https://github.com/opentripplanner/OpenTripPlanner/pull/5865) - Add OTP request timeout GraphQL instrumentation [#5881](https://github.com/opentripplanner/OpenTripPlanner/pull/5881) +- Add feed publisher name and url to GTFS GraphQL API [#5835](https://github.com/opentripplanner/OpenTripPlanner/pull/5835) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 3a601b0290002c2bfb1f62a01b7df20a2ba94d31 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 14:13:03 +0000 Subject: [PATCH 1269/1688] chore(deps): update dependency @testing-library/react to v16 --- client-next/package-lock.json | 31 +++++++++++++++++++++---------- client-next/package.json | 2 +- 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 75fec4ca86c..a97de6f1338 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -23,7 +23,7 @@ "@graphql-codegen/client-preset": "4.2.6", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.7", + "@testing-library/react": "16.0.0", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@typescript-eslint/eslint-plugin": "7.11.0", @@ -3591,6 +3591,7 @@ "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.0.0.tgz", "integrity": "sha512-PmJPnogldqoVFf+EwbHvbBJ98MmqASV8kLrBYgsDNxQcFMeIS7JFL48sfyXvuMtgmWO/wMhh25odr+8VhDmn4g==", "dev": true, + "peer": true, "dependencies": { "@babel/code-frame": "^7.10.4", "@babel/runtime": "^7.12.5", @@ -3606,26 +3607,30 @@ } }, "node_modules/@testing-library/react": { - "version": "15.0.7", - "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-15.0.7.tgz", - "integrity": "sha512-cg0RvEdD1TIhhkm1IeYMQxrzy0MtUNfa3minv4MjbgcYzJAZ7yD0i0lwoPOTPr+INtiXFezt2o8xMSnyHhEn2Q==", + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.0.0.tgz", + "integrity": "sha512-guuxUKRWQ+FgNX0h0NS0FIq3Q3uLtWVpBzcLOggmfMoUpgBnzBzvLLd4fbm6yS8ydJd94cIfY4yP9qUQjM2KwQ==", "dev": true, + "license": "MIT", "dependencies": { - "@babel/runtime": "^7.12.5", - "@testing-library/dom": "^10.0.0", - "@types/react-dom": "^18.0.0" + "@babel/runtime": "^7.12.5" }, "engines": { "node": ">=18" }, "peerDependencies": { + "@testing-library/dom": "^10.0.0", "@types/react": "^18.0.0", + "@types/react-dom": "^18.0.0", "react": "^18.0.0", "react-dom": "^18.0.0" }, "peerDependenciesMeta": { "@types/react": { "optional": true + }, + "@types/react-dom": { + "optional": true } } }, @@ -3633,7 +3638,8 @@ "version": "5.0.4", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", - "dev": true + "dev": true, + "peer": true }, "node_modules/@types/babel__core": { "version": "7.20.5", @@ -5579,7 +5585,8 @@ "version": "0.5.16", "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", - "dev": true + "dev": true, + "peer": true }, "node_modules/dom-helpers": { "version": "5.2.1", @@ -8475,6 +8482,7 @@ "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", "dev": true, + "peer": true, "bin": { "lz-string": "bin/bin.js" } @@ -9406,6 +9414,7 @@ "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", "dev": true, + "peer": true, "dependencies": { "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", @@ -9420,6 +9429,7 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, + "peer": true, "engines": { "node": ">=10" }, @@ -9590,7 +9600,8 @@ "version": "17.0.2", "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true + "dev": true, + "peer": true }, "node_modules/react-lifecycles-compat": { "version": "3.0.4", diff --git a/client-next/package.json b/client-next/package.json index 17171945476..60753359edd 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -32,7 +32,7 @@ "@graphql-codegen/client-preset": "4.2.6", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", - "@testing-library/react": "15.0.7", + "@testing-library/react": "16.0.0", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", "@typescript-eslint/eslint-plugin": "7.11.0", From 410284ceddce6e93af3995f10e3f13d1d759fe0a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 3 Jun 2024 17:39:26 +0200 Subject: [PATCH 1270/1688] Clean up after merge --- .../updater/trip/RealtimeTestEnvironment.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index 88076a3bdce..1b385df153b 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -28,6 +28,7 @@ import org.opentripplanner.transit.model.timetable.TripOnServiceDate; import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.transit.model.timetable.TripTimesFactory; +import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; @@ -207,6 +208,32 @@ public TimetableSnapshot getTimetableSnapshot() { } } + public String getRealtimeTimetable(String tripId) { + return getRealtimeTimetable(id(tripId), SERVICE_DATE); + } + + public String getRealtimeTimetable(Trip trip) { + return getRealtimeTimetable(trip.getId(), SERVICE_DATE); + } + + public String getRealtimeTimetable(FeedScopedId tripId, LocalDate serviceDate) { + var tt = getTripTimesForTrip(tripId, serviceDate); + var pattern = getPatternForTrip(tripId); + + return TripTimesStringBuilder.encodeTripTimes(tt, pattern); + } + + public String getScheduledTimetable(String tripId) { + return getScheduledTimetable(id(tripId)); + } + + public String getScheduledTimetable(FeedScopedId tripId) { + var pattern = getPatternForTrip(tripId); + var tt = pattern.getScheduledTimetable().getTripTimes(tripId); + + return TripTimesStringBuilder.encodeTripTimes(tt, pattern); + } + // SIRI updates public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( From d2a80c5bda8b36a4d5e6687a31dd67be1672bea5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 3 Jun 2024 20:26:14 +0300 Subject: [PATCH 1271/1688] Update src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java Co-authored-by: Thomas Gran --- .../org/opentripplanner/apis/gtfs/model/PlanPageInfo.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java index 6eebad77580..f7859f6a65f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java @@ -49,8 +49,8 @@ public Duration searchWindowUsed() { @Override public int hashCode() { return Objects.hash( - startCursor != null ? startCursor.getValue() : null, - endCursor != null ? endCursor.getValue() : null, + startCursor == null ? null : startCursor.getValue(), + endCursor == null ? null : endCursor.getValue(), hasPreviousPage, hasNextPage, searchWindowUsed From e1552c2014217551613a8c895eed9ea272609270 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Mon, 3 Jun 2024 20:39:27 +0300 Subject: [PATCH 1272/1688] Make equals more readable --- .../apis/gtfs/model/PlanPageInfo.java | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java index f7859f6a65f..dd017971f8a 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/model/PlanPageInfo.java @@ -67,25 +67,21 @@ public boolean equals(Object o) { } PlanPageInfo that = (PlanPageInfo) o; return ( - ( - (startCursor == null && that.startCursor == null) || - ( - startCursor != null && - that.startCursor != null && - Objects.equals(startCursor.getValue(), that.startCursor.getValue()) - ) - ) && - ( - (endCursor == null && that.endCursor == null) || - ( - endCursor != null && - that.endCursor != null && - Objects.equals(endCursor.getValue(), that.endCursor.getValue()) - ) - ) && + equalsCursors(startCursor, that.startCursor) && + equalsCursors(endCursor, that.endCursor) && Objects.equals(searchWindowUsed, that.searchWindowUsed) && hasPreviousPage == that.hasPreviousPage && hasNextPage == that.hasNextPage ); } + + /** + * Only checks that the values of the cursors are equal and ignores rest of the fields. + */ + private static boolean equalsCursors(ConnectionCursor a, ConnectionCursor b) { + return ( + (a == null && b == null) || + (a != null && b != null && Objects.equals(a.getValue(), b.getValue())) + ); + } } From e7b622d4b9c2d4c5daab90727ce9b3206b046dcf Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 3 Jun 2024 20:55:25 +0200 Subject: [PATCH 1273/1688] Apply suggestions from code review Co-authored-by: Johan Torin --- .../apis/transmodel/model/plan/TripQuery.java | 6 +++--- .../org/opentripplanner/apis/transmodel/schema.graphql | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index 6906044c1be..5ed3264a4fd 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -53,7 +53,7 @@ public static GraphQLFieldDefinition create( .description( "The date and time for the earliest time the user is willing to start the journey " + "(if `false` or not set) or the latest acceptable time of arriving " + - "(`true`). Defaults to now" + "(`true`). Defaults to now." ) .type(gqlUtil.dateTimeScalar) .build() @@ -65,8 +65,8 @@ public static GraphQLFieldDefinition create( .description( """ The date and time for the latest time the user is expected to book the journey. - Normally this is when the search is performed(now), plus a small grace period to - complete the booking. Services witch must be booked before this time is excluded. The + Normally this is when the search is performed (now), plus a small grace period to + complete the booking. Services which must be booked before this time is excluded. The `latestBookingTime` and `minimumBookingPeriod` in `BookingArrangement` (flexible services only) is used to enforce this. If this parameter is _not set_, no booking-time restrictions are applied - all journeys are listed. diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 2850c57ed30..426de70ebcc 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -794,14 +794,14 @@ type QueryType { boardSlackList: [TransportModeSlack], """ The date and time for the latest time the user is expected to book the journey. - Normally this is when the search is performed(now), plus a small grace period to - complete the booking. Services witch must be booked before this time is excluded. The + Normally this is when the search is performed (now), plus a small grace period to + complete the booking. Services which must be booked before this time is excluded. The `latestBookingTime` and `minimumBookingPeriod` in `BookingArrangement` (flexible services only) is used to enforce this. If this parameter is _not set_, no booking-time restrictions are applied - all journeys are listed. """ bookingTime: DateTime, - "The date and time for the earliest time the user is willing to start the journey (if `false` or not set) or the latest acceptable time of arriving (`true`). Defaults to now" + "The date and time for the earliest time the user is willing to start the journey (if `false` or not set) or the latest acceptable time of arriving (`true`). Defaults to now." dateTime: DateTime, "Debug the itinerary-filter-chain. OTP will attach a system notice to itineraries instead of removing them. This is very convenient when tuning the filters." debugItineraryFilter: Boolean = false @deprecated(reason : "Use `itineraryFilter.debug` instead."), From b9526c3264de12905f5d842a59180a8f55b0bef5 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 4 Jun 2024 10:55:44 +0300 Subject: [PATCH 1274/1688] Fix added trip cancellation/deletion logic --- .../updater/trip/TimetableSnapshotSource.java | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 4574d5db48f..a8e03075591 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -205,8 +205,17 @@ public UpdateResult applyTripUpdates( canceledPreviouslyAddedTrip = cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType); // Remove previous realtime updates for this trip. This is necessary to avoid previous - // stop pattern modifications from persisting - this.buffer.revertTripToScheduledTripPattern(tripId, serviceDate); + // stop pattern modifications from persisting. If a trip was previously added with the ScheduleRelationship + // ADDED and is now cancelled or deleted, we still want to keep the realtime added trip pattern. + if ( + !canceledPreviouslyAddedTrip || + ( + tripScheduleRelationship != TripDescriptor.ScheduleRelationship.CANCELED && + tripScheduleRelationship != TripDescriptor.ScheduleRelationship.DELETED + ) + ) { + this.buffer.revertTripToScheduledTripPattern(tripId, serviceDate); + } } uIndex += 1; @@ -893,7 +902,7 @@ private boolean cancelPreviouslyAddedTrip( final LocalDate serviceDate, CancelationType cancelationType ) { - boolean success = false; + boolean cancelledAddedTrip = false; final TripPattern pattern = buffer.getRealtimeAddedTripPattern(tripId, serviceDate); if (pattern != null) { @@ -911,11 +920,10 @@ private boolean cancelPreviouslyAddedTrip( case DELETE -> newTripTimes.deleteTrip(); } buffer.update(pattern, newTripTimes, serviceDate); - success = true; + cancelledAddedTrip = pattern.getOriginalTripPattern() == null; } } - - return success; + return cancelledAddedTrip; } /** From bdf716135f056acc0ebb5192d4d7dfea6b6dd95d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 4 Jun 2024 10:58:01 +0300 Subject: [PATCH 1275/1688] Remove some unnecessary param javadoc --- .../opentripplanner/ext/siri/SiriTimetableSnapshotSource.java | 1 - .../java/org/opentripplanner/model/TimetableSnapshot.java | 2 -- .../opentripplanner/updater/trip/TimetableSnapshotSource.java | 4 ---- 3 files changed, 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 54bd4b17bdd..e0a3f6c715c 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -295,7 +295,6 @@ private Result addTripToGraphAndBuffer(TripUpdate tr /** * Mark the scheduled trip in the buffer as deleted, given trip on service date * - * @param serviceDate service date * @return true if scheduled trip was marked as deleted */ private boolean markScheduledTripAsDeleted(Trip trip, final LocalDate serviceDate) { diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index f5ef0707106..933f89b75a5 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -145,8 +145,6 @@ public Timetable resolve(TripPattern pattern, LocalDate serviceDate) { * Get the current trip pattern given a trip id and a service date, if it has been changed from * the scheduled pattern with an update, for which the stopPattern is different. * - * @param tripId trip id - * @param serviceDate service date * @return trip pattern created by the updater; null if trip is on the original trip pattern */ public TripPattern getRealtimeAddedTripPattern(FeedScopedId tripId, LocalDate serviceDate) { diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index a8e03075591..c84eb53a003 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -850,8 +850,6 @@ private Result addTripToGraphAndBuffer( /** * Cancel scheduled trip in buffer given trip id on service date * - * @param tripId trip id - * @param serviceDate service date * @return true if scheduled trip was cancelled */ private boolean cancelScheduledTrip( @@ -893,8 +891,6 @@ private boolean cancelScheduledTrip( * exist, and will be reused if a similar added/modified trip message is received with the same * route and stop sequence. * - * @param tripId trip id without agency id - * @param serviceDate service date * @return true if a previously added trip was cancelled */ private boolean cancelPreviouslyAddedTrip( From 1cb32d978a31ef0e244ad666d0922079650a3b2a Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 4 Jun 2024 11:59:22 +0300 Subject: [PATCH 1276/1688] Clarify javadoc and only remove added removal when trip was added --- .../updater/trip/TimetableSnapshotSource.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index c84eb53a003..b27dd31e8f6 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -885,11 +885,10 @@ private boolean cancelScheduledTrip( /** * Cancel previously added trip from buffer if there is a previously added trip with given trip id - * (without agency id) on service date. This does not remove the modified/added trip from the - * buffer, it just marks it as canceled. This also does not remove the corresponding vertices and - * edges from the Graph. Any TripPattern that was created for the added/modified trip continues to - * exist, and will be reused if a similar added/modified trip message is received with the same - * route and stop sequence. + * on service date. This does not remove the added trip from the buffer, it just marks it as + * canceled or deleted. Any TripPattern that was created for the added trip continues to exist, + * and will be reused if a similar added trip message is received with the same route and stop + * sequence. * * @return true if a previously added trip was cancelled */ @@ -901,7 +900,8 @@ private boolean cancelPreviouslyAddedTrip( boolean cancelledAddedTrip = false; final TripPattern pattern = buffer.getRealtimeAddedTripPattern(tripId, serviceDate); - if (pattern != null) { + // If pattern doesn't have an original trip pattern, it was created through an ADDED update. + if (pattern != null && pattern.getOriginalTripPattern() == null) { // Cancel trip times for this trip in this pattern final Timetable timetable = buffer.resolve(pattern, serviceDate); final int tripIndex = timetable.getTripIndex(tripId); @@ -916,7 +916,7 @@ private boolean cancelPreviouslyAddedTrip( case DELETE -> newTripTimes.deleteTrip(); } buffer.update(pattern, newTripTimes, serviceDate); - cancelledAddedTrip = pattern.getOriginalTripPattern() == null; + cancelledAddedTrip = true; } } return cancelledAddedTrip; From 625436a84450e2a40d72e724c7f04484a97111aa Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 4 Jun 2024 11:10:55 +0200 Subject: [PATCH 1277/1688] Code cleanup --- .../opentripplanner/standalone/config/RouterConfig.java | 2 +- .../standalone/config/sandbox/TransmodelAPIConfig.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java index 4ac0688a759..74b89f8e56a 100644 --- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java @@ -65,7 +65,7 @@ public RouterConfig(JsonNode node, String source, boolean logUnusedParams) { .asString(null); this.server = new ServerConfig("server", root); - this.transmodelApi = new TransmodelAPIConfig("transmodelApi", root); + this.transmodelApi = new TransmodelAPIConfig(root); this.routingRequestDefaults = mapDefaultRouteRequest("routingDefaults", root); this.transitConfig = new TransitRoutingConfig("transit", root, routingRequestDefaults); this.routingRequestDefaults.setMaxSearchWindow(transitConfig.maxSearchWindow()); diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java index de59234a7b8..be327a25e88 100644 --- a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java @@ -15,9 +15,9 @@ public class TransmodelAPIConfig implements TransmodelAPIParameters { private final boolean hideFeedId; private final Collection tracingHeaderTags; - private int maxNumberOfResultFields; + private final int maxNumberOfResultFields; - public TransmodelAPIConfig(String parameterName, NodeAdapter root) { + public TransmodelAPIConfig(NodeAdapter root) { var c = root .of("transmodelApi") .since(V2_1) @@ -27,7 +27,6 @@ public TransmodelAPIConfig(String parameterName, NodeAdapter root) { hideFeedId = c .of("hideFeedId") - .since(NA) .summary("Hide the FeedId in all API output, and add it to input.") .description( "Only turn this feature on if you have unique ids across all feeds, without the " + @@ -37,14 +36,12 @@ public TransmodelAPIConfig(String parameterName, NodeAdapter root) { tracingHeaderTags = c .of("tracingHeaderTags") - .since(NA) .summary("Used to group requests when monitoring OTP.") .asStringList(Set.of()); maxNumberOfResultFields = c .of("maxNumberOfResultFields") - .since(NA) .summary("The maximum number of fields in a GraphQL result") .description( "Enforce rate limiting based on query complexity: queries that return too much data are" + From 06a7e8c45f259004b989df262a35d5f8875af9b0 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Tue, 4 Jun 2024 10:00:21 +0000 Subject: [PATCH 1278/1688] Upgrade debug client to version 2024/06/2024-06-04T09:59 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 717fce1baf2..b3929350fe2 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
              From 3ca1a0c7914ccf2e5aa77b47af5a0ce1eae3ee24 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 23 May 2024 15:20:27 +0200 Subject: [PATCH 1279/1688] Implement query for filtering by service days --- .../apis/gtfs/GraphQLScalars.java | 5 ++ .../apis/gtfs/GtfsGraphQLIndex.java | 8 +-- .../apis/gtfs/datafetchers/RouteImpl.java | 45 ++++++++++++++++- .../apis/gtfs/generated/GraphQLTypes.java | 49 +++++++++++++++++++ .../apis/gtfs/generated/graphql-codegen.yml | 1 + .../apis/transmodel/support/GqlUtil.java | 4 +- .../graphql/scalar}/DateScalarFactory.java | 20 +++++--- .../opentripplanner/apis/gtfs/schema.graphqls | 12 ++++- .../graphql/scalar/DateScalarFactoryTest.java | 23 +++++++++ .../gtfs/expectations/routes-extended.json | 42 ++++++++++------ .../apis/gtfs/queries/routes-extended.graphql | 3 ++ 11 files changed, 180 insertions(+), 32 deletions(-) rename src/main/java/org/opentripplanner/{apis/transmodel/model/scalars => framework/graphql/scalar}/DateScalarFactory.java (72%) create mode 100644 src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index 5ab24c89543..a3034cad273 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -15,6 +15,7 @@ import java.time.format.DateTimeFormatter; import javax.annotation.Nonnull; import org.locationtech.jts.geom.Geometry; +import org.opentripplanner.framework.graphql.scalar.DateScalarFactory; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; import org.opentripplanner.framework.json.ObjectMappers; import org.opentripplanner.framework.model.Grams; @@ -111,6 +112,10 @@ public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralExce ) .build(); + public static final GraphQLScalarType LOCAL_DATE_SCALAR = DateScalarFactory.createDateScalar( + "LocalDate" + ); + public static final GraphQLScalarType GEOJSON_SCALAR = GraphQLScalarType .newScalar() .name("GeoJson") diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 53d53b9bc4b..20a37d6b940 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -22,8 +22,6 @@ import java.util.Map; import java.util.Objects; import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.opentripplanner.apis.gtfs.datafetchers.AgencyImpl; @@ -84,7 +82,6 @@ import org.opentripplanner.apis.gtfs.model.StopPosition; import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation; import org.opentripplanner.framework.application.OTPFeature; -import org.opentripplanner.framework.concurrent.OtpRequestThreadFactory; import org.opentripplanner.framework.graphql.GraphQLResponseSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,10 +92,6 @@ class GtfsGraphQLIndex { private static final GraphQLSchema indexSchema = buildSchema(); - static final ExecutorService threadPool = Executors.newCachedThreadPool( - OtpRequestThreadFactory.of("gtfs-api-%d") - ); - protected static GraphQLSchema buildSchema() { try { URL url = Objects.requireNonNull(GtfsGraphQLIndex.class.getResource("schema.graphqls")); @@ -112,6 +105,7 @@ protected static GraphQLSchema buildSchema() { .scalar(GraphQLScalars.GRAPHQL_ID_SCALAR) .scalar(GraphQLScalars.GRAMS_SCALAR) .scalar(GraphQLScalars.OFFSET_DATETIME_SCALAR) + .scalar(GraphQLScalars.LOCAL_DATE_SCALAR) .scalar(ExtendedScalars.GraphQLLong) .type("Node", type -> type.typeResolver(new NodeTypeResolver())) .type("PlaceInterface", type -> type.typeResolver(new PlaceInterfaceTypeResolver())) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java index 9f9b3c60b31..4b21728b8b4 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java @@ -3,6 +3,7 @@ import graphql.relay.Relay; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Collection; import java.util.List; @@ -174,10 +175,32 @@ public DataFetcher mode() { @Override public DataFetcher> patterns() { - return environment -> - getTransitService(environment).getPatternsForRoute(getSource(environment)); + return environment -> { + final TransitService transitService = getTransitService(environment); + var patterns = transitService.getPatternsForRoute(getSource(environment)); + + var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments()); + + var serviceDays = args.getGraphQLServiceDays(); + if ( + serviceDays != null && + (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null) + ) { + var start = args.getGraphQLServiceDays().getGraphQLStart(); + return patterns + .stream() + .filter(pattern -> + hasServicesOnDate(patterns, transitService, start) + ) + .toList(); + } else { + return patterns; + } + }; } + + @Override public DataFetcher shortName() { return environment -> getSource(environment).getShortName(); @@ -241,4 +264,22 @@ private TransitService getTransitService(DataFetchingEnvironment environment) { private Route getSource(DataFetchingEnvironment environment) { return environment.getSource(); } + + private static boolean hasServicesOnDate(Collection patterns, TransitService transitService, LocalDate start) { + return patterns + .stream() + .anyMatch(p -> + p + .scheduledTripsAsStream() + .anyMatch(trip -> { + var dates = transitService + .getCalendarService() + .getServiceDatesForServiceId(trip.getServiceId()); + + return dates + .stream() + .anyMatch(date -> date.isEqual(start) || date.isAfter(start)); + }) + ); + } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index ecc038fec18..de625f15c7b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -2751,6 +2751,26 @@ public void setGraphQLLanguage(String language) { } } + public static class GraphQLRoutePatternsArgs { + + private GraphQLServiceDayFilterInput serviceDays; + + public GraphQLRoutePatternsArgs(Map args) { + if (args != null) { + this.serviceDays = + new GraphQLServiceDayFilterInput((Map) args.get("serviceDays")); + } + } + + public GraphQLServiceDayFilterInput getGraphQLServiceDays() { + return this.serviceDays; + } + + public void setGraphQLServiceDays(GraphQLServiceDayFilterInput serviceDays) { + this.serviceDays = serviceDays; + } + } + /** Entities that are relevant for routes that can contain alerts */ public enum GraphQLRouteAlertType { AGENCY, @@ -2772,6 +2792,35 @@ public enum GraphQLRoutingErrorCode { WALKING_BETTER_THAN_TRANSIT, } + public static class GraphQLServiceDayFilterInput { + + private java.time.LocalDate end; + private java.time.LocalDate start; + + public GraphQLServiceDayFilterInput(Map args) { + if (args != null) { + this.end = (java.time.LocalDate) args.get("end"); + this.start = (java.time.LocalDate) args.get("start"); + } + } + + public java.time.LocalDate getGraphQLEnd() { + return this.end; + } + + public java.time.LocalDate getGraphQLStart() { + return this.start; + } + + public void setGraphQLEnd(java.time.LocalDate end) { + this.end = end; + } + + public void setGraphQLStart(java.time.LocalDate start) { + this.start = start; + } + } + public static class GraphQLStopAlertsArgs { private List types; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index 29c2bff0257..9309e60224f 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -28,6 +28,7 @@ config: Grams: org.opentripplanner.framework.model.Grams OffsetDateTime: java.time.OffsetDateTime Duration: java.time.Duration + LocalDate: java.time.LocalDate mappers: AbsoluteDirection: org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLAbsoluteDirection#GraphQLAbsoluteDirection Agency: org.opentripplanner.transit.model.organization.Agency#Agency diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java index 1f0722eb991..05a8eaa45fa 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java @@ -15,12 +15,12 @@ import java.util.Locale; import org.opentripplanner.apis.transmodel.TransmodelRequestContext; import org.opentripplanner.apis.transmodel.mapping.TransitIdMapper; -import org.opentripplanner.apis.transmodel.model.scalars.DateScalarFactory; import org.opentripplanner.apis.transmodel.model.scalars.DateTimeScalarFactory; import org.opentripplanner.apis.transmodel.model.scalars.DoubleFunctionFactory; import org.opentripplanner.apis.transmodel.model.scalars.LocalTimeScalarFactory; import org.opentripplanner.apis.transmodel.model.scalars.TimeScalarFactory; import org.opentripplanner.framework.graphql.GraphQLUtils; +import org.opentripplanner.framework.graphql.scalar.DateScalarFactory; import org.opentripplanner.framework.graphql.scalar.DurationScalarFactory; import org.opentripplanner.routing.graphfinder.GraphFinder; import org.opentripplanner.routing.vehicle_parking.VehicleParkingService; @@ -45,7 +45,7 @@ public class GqlUtil { public GqlUtil(ZoneId timeZone) { this.dateTimeScalar = DateTimeScalarFactory.createMillisecondsSinceEpochAsDateTimeStringScalar(timeZone); - this.dateScalar = DateScalarFactory.createDateScalar(); + this.dateScalar = DateScalarFactory.createDateScalar("Date"); this.doubleFunctionScalar = DoubleFunctionFactory.createDoubleFunctionScalar(); this.localTimeScalar = LocalTimeScalarFactory.createLocalTimeScalar(); this.timeScalar = TimeScalarFactory.createSecondsSinceMidnightAsTimeObject(); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateScalarFactory.java b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java similarity index 72% rename from src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateScalarFactory.java rename to src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java index 6d45018ed2a..c19add1e0cb 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/scalars/DateScalarFactory.java +++ b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java @@ -1,4 +1,4 @@ -package org.opentripplanner.apis.transmodel.model.scalars; +package org.opentripplanner.framework.graphql.scalar; import graphql.language.StringValue; import graphql.schema.Coercing; @@ -8,6 +8,7 @@ import graphql.schema.GraphQLScalarType; import java.time.LocalDate; import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; public class DateScalarFactory { @@ -15,14 +16,21 @@ public class DateScalarFactory { private static final String DOCUMENTATION = "Local date using the ISO 8601 format: `YYYY-MM-DD`. Example: `2020-05-17`."; - private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE; + private static final DateTimeFormatter FORMATTER = new DateTimeFormatterBuilder() + .optionalStart() + .append(DateTimeFormatter.ofPattern("yyyyMMdd")) + .optionalEnd() + .optionalStart() + .append(DateTimeFormatter.ISO_LOCAL_DATE) + .optionalStart() + .toFormatter(); private DateScalarFactory() {} - public static GraphQLScalarType createDateScalar() { + public static GraphQLScalarType createDateScalar(String scalarName) { return GraphQLScalarType .newScalar() - .name("Date") + .name(scalarName) .description(DOCUMENTATION) .coercing( new Coercing() { @@ -33,7 +41,7 @@ public String serialize(Object input) throws CoercingSerializeException { } throw new CoercingSerializeException( - "Only LocalDate is supported to serialize but found " + input + "Only %s is supported to serialize but found %s".formatted(scalarName, input) ); } @@ -43,7 +51,7 @@ public LocalDate parseValue(Object input) throws CoercingParseValueException { return LocalDate.from(FORMATTER.parse((String) input)); } catch (DateTimeParseException e) { throw new CoercingParseValueException( - "Expected type 'Date' but was '" + input + "'." + "Expected type '%s' but was '%s'.".formatted(scalarName, input) ); } } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 393d5f014db..44426296c29 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -2542,6 +2542,13 @@ enum Qualifier { HAIL } +scalar LocalDate + +input ServiceDayFilterInput { + start: LocalDate + end: LocalDate +} + type QueryType { """Fetches an object given its ID""" node( @@ -3421,7 +3428,10 @@ type Route implements Node { bikesAllowed: BikesAllowed """List of patterns which operate on this route""" - patterns: [Pattern] + patterns( + "Filter patterns by the service day they operate on." + serviceDays: ServiceDayFilterInput + ): [Pattern] """List of stops on this route""" stops: [Stop] diff --git a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java new file mode 100644 index 00000000000..afc4a41f408 --- /dev/null +++ b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java @@ -0,0 +1,23 @@ +package org.opentripplanner.framework.graphql.scalar; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertInstanceOf; + +import graphql.schema.GraphQLScalarType; +import java.time.LocalDate; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class DateScalarFactoryTest { + + private static final GraphQLScalarType SCALAR = DateScalarFactory.createDateScalar("Date"); + + @ParameterizedTest + @ValueSource(strings = { "2024-05-23", "20240523" }) + void parse(String input) { + var result = SCALAR.getCoercing().parseValue(input); + assertInstanceOf(LocalDate.class, result); + var date = (LocalDate) result; + assertEquals(LocalDate.of(2024, 5, 23), date); + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json index 8739eab0045..8856972ce4e 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json +++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/routes-extended.json @@ -11,7 +11,8 @@ }, "mode" : "CARPOOL", "sortOrder" : 12, - "bikesAllowed" : "ALLOWED" + "bikesAllowed" : "ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for SUBWAY", @@ -23,7 +24,8 @@ }, "mode" : "SUBWAY", "sortOrder" : 2, - "bikesAllowed" : "NO_INFORMATION" + "bikesAllowed" : "NO_INFORMATION", + "patterns" : [ ] }, { "longName" : "Long name for BUS", @@ -35,7 +37,8 @@ }, "mode" : "BUS", "sortOrder" : 3, - "bikesAllowed" : "ALLOWED" + "bikesAllowed" : "ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for FERRY", @@ -47,7 +50,8 @@ }, "mode" : "FERRY", "sortOrder" : 5, - "bikesAllowed" : "NO_INFORMATION" + "bikesAllowed" : "NO_INFORMATION", + "patterns" : [ ] }, { "longName" : "Long name for COACH", @@ -59,7 +63,8 @@ }, "mode" : "COACH", "sortOrder" : 1, - "bikesAllowed" : "NOT_ALLOWED" + "bikesAllowed" : "NOT_ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for TRAM", @@ -71,7 +76,8 @@ }, "mode" : "TRAM", "sortOrder" : 4, - "bikesAllowed" : "NOT_ALLOWED" + "bikesAllowed" : "NOT_ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for CABLE_CAR", @@ -83,7 +89,8 @@ }, "mode" : "CABLE_CAR", "sortOrder" : 7, - "bikesAllowed" : "NOT_ALLOWED" + "bikesAllowed" : "NOT_ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for FUNICULAR", @@ -95,7 +102,8 @@ }, "mode" : "FUNICULAR", "sortOrder" : 9, - "bikesAllowed" : "ALLOWED" + "bikesAllowed" : "ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for RAIL", @@ -107,7 +115,8 @@ }, "mode" : "RAIL", "sortOrder" : null, - "bikesAllowed" : "ALLOWED" + "bikesAllowed" : "ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for MONORAIL", @@ -119,7 +128,8 @@ }, "mode" : "MONORAIL", "sortOrder" : 11, - "bikesAllowed" : "NO_INFORMATION" + "bikesAllowed" : "NO_INFORMATION", + "patterns" : [ ] }, { "longName" : "Long name for GONDOLA", @@ -131,7 +141,8 @@ }, "mode" : "GONDOLA", "sortOrder" : 8, - "bikesAllowed" : "NO_INFORMATION" + "bikesAllowed" : "NO_INFORMATION", + "patterns" : [ ] }, { "longName" : "Long name for TROLLEYBUS", @@ -143,7 +154,8 @@ }, "mode" : "TROLLEYBUS", "sortOrder" : 10, - "bikesAllowed" : "NOT_ALLOWED" + "bikesAllowed" : "NOT_ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for AIRPLANE", @@ -155,7 +167,8 @@ }, "mode" : "AIRPLANE", "sortOrder" : 6, - "bikesAllowed" : "ALLOWED" + "bikesAllowed" : "ALLOWED", + "patterns" : [ ] }, { "longName" : "Long name for TAXI", @@ -167,7 +180,8 @@ }, "mode" : "TAXI", "sortOrder" : 13, - "bikesAllowed" : "NOT_ALLOWED" + "bikesAllowed" : "NOT_ALLOWED", + "patterns" : [ ] } ] } diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql index 50d89980442..5da7db77286 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql @@ -10,5 +10,8 @@ mode sortOrder bikesAllowed + patterns(serviceDays: {start: "2024-05-23" end: "2024-05-30"}) { + name + } } } \ No newline at end of file From c3cb2d663b0fecca30ab94408956bfea5defb060 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 13:18:40 +0200 Subject: [PATCH 1280/1688] Move filtering logic into class --- .../apis/gtfs/PatternByServiceDaysFilter.java | 78 +++++++++++++++++++ .../apis/gtfs/datafetchers/QueryTypeImpl.java | 26 +++---- .../apis/gtfs/datafetchers/RouteImpl.java | 37 +-------- .../apis/gtfs/generated/GraphQLTypes.java | 15 ++++ .../opentripplanner/apis/gtfs/schema.graphqls | 2 + 5 files changed, 112 insertions(+), 46 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java new file mode 100644 index 00000000000..ee42964ae03 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java @@ -0,0 +1,78 @@ +package org.opentripplanner.apis.gtfs; + +import java.time.LocalDate; +import java.util.Collection; +import java.util.Objects; +import java.util.stream.Stream; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDayFilterInput; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.service.TransitService; + +public class PatternByServiceDaysFilter { + + private final TransitService transitService; + private final LocalDate startInclusive; + private final LocalDate endInclusive; + + PatternByServiceDaysFilter( + TransitService transitService, + LocalDate startInclusive, + LocalDate endInclusive + ) { + Objects.requireNonNull(transitService); + this.transitService = transitService; + // optional + this.startInclusive = startInclusive; + this.endInclusive = endInclusive; + } + + public PatternByServiceDaysFilter( + TransitService transitService, + GraphQLServiceDayFilterInput graphQLServiceDays + ) { + this(transitService, graphQLServiceDays.getGraphQLStart(), graphQLServiceDays.getGraphQLEnd()); + } + + public Collection filterPatterns(Collection tripPatterns) { + return tripPatterns.stream().filter(this::hasServicesOnDate).toList(); + } + + public Stream filterRoutes(Stream routeStream) { + return routeStream.filter(r -> { + var patterns = transitService.getPatternsForRoute(r); + return !this.filterPatterns(patterns).isEmpty(); + }); + } + + private boolean hasServicesOnDate(TripPattern pattern) { + return pattern + .scheduledTripsAsStream() + .anyMatch(trip -> { + var dates = transitService + .getCalendarService() + .getServiceDatesForServiceId(trip.getServiceId()); + + var matchesStartInclusive = dates + .stream() + .anyMatch(date -> + date == null || date.isEqual(startInclusive) || date.isAfter(startInclusive) + ); + + var matchesEndInclusive = dates + .stream() + .anyMatch(date -> + date == null || date.isEqual(endInclusive) || date.isBefore(endInclusive) + ); + + return matchesStartInclusive && matchesEndInclusive; + }); + } + + public static boolean hasServiceDayFilter(GraphQLServiceDayFilterInput serviceDays) { + return ( + serviceDays != null && + (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null) + ); + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index a4f5cb00e2f..38bf604171c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -13,20 +13,14 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import graphql.schema.DataFetchingEnvironmentImpl; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.EnumSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; +import java.util.*; import java.util.stream.Collectors; import java.util.stream.Stream; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.Envelope; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.GraphQLUtils; +import org.opentripplanner.apis.gtfs.PatternByServiceDaysFilter; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLQueryTypeStopsByRadiusArgs; @@ -46,11 +40,7 @@ import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.error.RoutingValidationException; import org.opentripplanner.routing.fares.FareService; -import org.opentripplanner.routing.graphfinder.GraphFinder; -import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.routing.graphfinder.PatternAtStop; -import org.opentripplanner.routing.graphfinder.PlaceAtDistance; -import org.opentripplanner.routing.graphfinder.PlaceType; +import org.opentripplanner.routing.graphfinder.*; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingService; import org.opentripplanner.service.vehiclerental.VehicleRentalService; @@ -604,6 +594,16 @@ public DataFetcher> routes() { GraphQLUtils.startsWith(route.getLongName(), name, environment.getLocale()) ); } + + if ( + PatternByServiceDaysFilter.hasServiceDayFilter(args.getGraphQLLimitByPatternServiceDays()) + ) { + var filter = new PatternByServiceDaysFilter( + transitService, + args.getGraphQLLimitByPatternServiceDays() + ); + routeStream = filter.filterRoutes(routeStream); + } return routeStream.toList(); }; } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java index 4b21728b8b4..17b3cc56c87 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java @@ -3,13 +3,13 @@ import graphql.relay.Relay; import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; -import java.time.LocalDate; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.stream.Collectors; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.GraphQLUtils; +import org.opentripplanner.apis.gtfs.PatternByServiceDaysFilter; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed; @@ -181,26 +181,15 @@ public DataFetcher> patterns() { var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments()); - var serviceDays = args.getGraphQLServiceDays(); - if ( - serviceDays != null && - (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null) - ) { - var start = args.getGraphQLServiceDays().getGraphQLStart(); - return patterns - .stream() - .filter(pattern -> - hasServicesOnDate(patterns, transitService, start) - ) - .toList(); + if (PatternByServiceDaysFilter.hasServiceDayFilter(args.getGraphQLServiceDays())) { + var filter = new PatternByServiceDaysFilter(transitService, args.getGraphQLServiceDays()); + return filter.filterPatterns(patterns); } else { return patterns; } }; } - - @Override public DataFetcher shortName() { return environment -> getSource(environment).getShortName(); @@ -264,22 +253,4 @@ private TransitService getTransitService(DataFetchingEnvironment environment) { private Route getSource(DataFetchingEnvironment environment) { return environment.getSource(); } - - private static boolean hasServicesOnDate(Collection patterns, TransitService transitService, LocalDate start) { - return patterns - .stream() - .anyMatch(p -> - p - .scheduledTripsAsStream() - .anyMatch(trip -> { - var dates = transitService - .getCalendarService() - .getServiceDatesForServiceId(trip.getServiceId()); - - return dates - .stream() - .anyMatch(date -> date.isEqual(start) || date.isAfter(start)); - }) - ); - } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index de625f15c7b..fcd64389f59 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -2266,6 +2266,7 @@ public static class GraphQLQueryTypeRoutesArgs { private List feeds; private List ids; + private GraphQLServiceDayFilterInput limitByPatternServiceDays; private String name; private List transportModes; @@ -2273,6 +2274,10 @@ public GraphQLQueryTypeRoutesArgs(Map args) { if (args != null) { this.feeds = (List) args.get("feeds"); this.ids = (List) args.get("ids"); + this.limitByPatternServiceDays = + new GraphQLServiceDayFilterInput( + (Map) args.get("limitByPatternServiceDays") + ); this.name = (String) args.get("name"); if (args.get("transportModes") != null) { this.transportModes = @@ -2292,6 +2297,10 @@ public List getGraphQLIds() { return this.ids; } + public GraphQLServiceDayFilterInput getGraphQLLimitByPatternServiceDays() { + return this.limitByPatternServiceDays; + } + public String getGraphQLName() { return this.name; } @@ -2308,6 +2317,12 @@ public void setGraphQLIds(List ids) { this.ids = ids; } + public void setGraphQLLimitByPatternServiceDays( + GraphQLServiceDayFilterInput limitByPatternServiceDays + ) { + this.limitByPatternServiceDays = limitByPatternServiceDays; + } + public void setGraphQLName(String name) { this.name = name; } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 44426296c29..c4ed7ff40d3 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -2707,6 +2707,8 @@ type QueryType { """Only include routes, which use one of these modes""" transportModes: [Mode] + + limitByPatternServiceDays: ServiceDayFilterInput ): [Route] """ From 775a77618804adf2be6097d91d16a193a9437401 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 14:37:45 +0200 Subject: [PATCH 1281/1688] Add test for range handling --- .../apis/gtfs/PatternByServiceDaysFilter.java | 10 +++- .../gtfs/PatternByServiceDaysFilterTest.java | 51 +++++++++++++++++++ .../graphql/scalar/DateScalarFactoryTest.java | 8 +++ 3 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java index ee42964ae03..b953699656a 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java @@ -4,6 +4,7 @@ import java.util.Collection; import java.util.Objects; import java.util.stream.Stream; +import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDayFilterInput; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.TripPattern; @@ -17,14 +18,19 @@ public class PatternByServiceDaysFilter { PatternByServiceDaysFilter( TransitService transitService, - LocalDate startInclusive, - LocalDate endInclusive + @Nullable LocalDate startInclusive, + @Nullable LocalDate endInclusive ) { Objects.requireNonNull(transitService); this.transitService = transitService; + // optional this.startInclusive = startInclusive; this.endInclusive = endInclusive; + + if (startInclusive != null && endInclusive != null && startInclusive.isAfter(endInclusive)) { + throw new IllegalArgumentException("start must be before end"); + } } public PatternByServiceDaysFilter( diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java new file mode 100644 index 00000000000..8c480119722 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java @@ -0,0 +1,51 @@ +package org.opentripplanner.apis.gtfs; + +import static java.time.LocalDate.parse; +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.time.LocalDate; +import java.util.List; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.TransitModel; +import org.opentripplanner.transit.service.TransitService; + +class PatternByServiceDaysFilterTest { + + private static final TransitService EMPTY_SERVICE = new DefaultTransitService(new TransitModel()); + + static List invalidRange() { + return List.of( + Arguments.of(parse("2024-05-02"), parse("2024-05-01")), + Arguments.of(parse("2024-05-03"), parse("2024-05-01")) + ); + } + + @ParameterizedTest + @MethodSource("invalidRange") + void invalidRange(LocalDate start, LocalDate end) { + assertThrows( + IllegalArgumentException.class, + () -> new PatternByServiceDaysFilter(EMPTY_SERVICE, start, end) + ); + } + + static List validRange() { + return List.of( + Arguments.of(parse("2024-05-02"), parse("2024-05-02")), + Arguments.of(parse("2024-05-02"), parse("2024-05-03")), + Arguments.of(null, parse("2024-05-03")), + Arguments.of(parse("2024-05-03"), null), + Arguments.of(null, null) + ); + } + + @ParameterizedTest + @MethodSource("validRange") + void validRange(LocalDate start, LocalDate end) { + assertDoesNotThrow(() -> new PatternByServiceDaysFilter(EMPTY_SERVICE, start, end)); + } +} diff --git a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java index afc4a41f408..afc86cdf9ba 100644 --- a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java +++ b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java @@ -2,7 +2,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import static org.junit.jupiter.api.Assertions.assertThrows; +import graphql.schema.CoercingParseValueException; import graphql.schema.GraphQLScalarType; import java.time.LocalDate; import org.junit.jupiter.params.ParameterizedTest; @@ -20,4 +22,10 @@ void parse(String input) { var date = (LocalDate) result; assertEquals(LocalDate.of(2024, 5, 23), date); } + + @ParameterizedTest + @ValueSource(strings = { "2024-05", "2024", "2024-99-04", "202405-23" }) + void failParsing(String input) { + assertThrows(CoercingParseValueException.class, () -> SCALAR.getCoercing().parseValue(input)); + } } From 7e66dfd009b394878837ac578b7a7b30db63ce98 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 15:47:44 +0200 Subject: [PATCH 1282/1688] Add tests --- .../apis/gtfs/PatternByServiceDaysFilter.java | 15 +-- .../gtfs/PatternByServiceDaysFilterTest.java | 94 +++++++++++++++++++ 2 files changed, 99 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java index b953699656a..a53b7842257 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java @@ -59,19 +59,14 @@ private boolean hasServicesOnDate(TripPattern pattern) { .getCalendarService() .getServiceDatesForServiceId(trip.getServiceId()); - var matchesStartInclusive = dates + return dates .stream() .anyMatch(date -> - date == null || date.isEqual(startInclusive) || date.isAfter(startInclusive) + ( + startInclusive == null || date.isEqual(startInclusive) || date.isAfter(startInclusive) + ) && + (endInclusive == null || date.isEqual(endInclusive) || date.isBefore(endInclusive)) ); - - var matchesEndInclusive = dates - .stream() - .anyMatch(date -> - date == null || date.isEqual(endInclusive) || date.isBefore(endInclusive) - ); - - return matchesStartInclusive && matchesEndInclusive; }); } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java index 8c480119722..76b4a3bb526 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java @@ -2,20 +2,57 @@ import static java.time.LocalDate.parse; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; import java.time.LocalDate; +import java.util.Collection; import java.util.List; +import java.util.Set; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.model.calendar.CalendarService; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.framework.FeedScopedId; +import org.opentripplanner.transit.model.network.Route; +import org.opentripplanner.transit.model.network.StopPattern; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; +import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; class PatternByServiceDaysFilterTest { private static final TransitService EMPTY_SERVICE = new DefaultTransitService(new TransitModel()); + private static final Route ROUTE_1 = TransitModelForTest.route("1").build(); + private static final Trip TRIP = TransitModelForTest.trip("t1").withRoute(ROUTE_1).build(); + private static final TransitModelForTest MODEL = new TransitModelForTest(StopModel.of()); + private static final RegularStop STOP_1 = MODEL.stop("1").build(); + private static final StopPattern STOP_PATTERN = TransitModelForTest.stopPattern(STOP_1, STOP_1); + private static final TripPattern PATTERN_1 = pattern(); + private static final List NOT_REMOVED = List.of(PATTERN_1); + private static final List REMOVED = List.of(); + + private static TripPattern pattern() { + var pattern = TransitModelForTest + .tripPattern("1", ROUTE_1) + .withStopPattern(STOP_PATTERN) + .build(); + + var tt = ScheduledTripTimes + .of() + .withTrip(TRIP) + .withArrivalTimes("10:00 10:05") + .withDepartureTimes("10:00 10:05") + .build(); + pattern.add(tt); + return pattern; + } static List invalidRange() { return List.of( @@ -48,4 +85,61 @@ static List validRange() { void validRange(LocalDate start, LocalDate end) { assertDoesNotThrow(() -> new PatternByServiceDaysFilter(EMPTY_SERVICE, start, end)); } + + static List patternRanges() { + return List.of( + Arguments.of(null, null, NOT_REMOVED), + Arguments.of(null, parse("2024-05-03"), NOT_REMOVED), + Arguments.of(null, parse("2024-05-01"), NOT_REMOVED), + Arguments.of(parse("2024-05-03"), null, NOT_REMOVED), + Arguments.of(parse("2024-05-02"), parse("2024-05-02"), REMOVED), + Arguments.of(parse("2024-05-02"), parse("2024-05-03"), REMOVED), + Arguments.of(parse("2025-01-01"), null, REMOVED), + Arguments.of(parse("2025-01-01"), parse("2025-01-02"), REMOVED), + Arguments.of(null, parse("2023-12-31"), REMOVED), + Arguments.of(parse("2023-12-31"), parse("2024-04-30"), REMOVED) + ); + } + + @ParameterizedTest + @MethodSource("patternRanges") + void filterPatterns(LocalDate start, LocalDate end, List expectedPatterns) { + var model = new TransitModel(); + var service = mockService(model); + + var filter = new PatternByServiceDaysFilter(service, start, end); + + var result = filter.filterPatterns(NOT_REMOVED); + + assertEquals(expectedPatterns, result); + } + + private static TransitService mockService(TransitModel model) { + return new DefaultTransitService(model) { + @Override + public Collection getPatternsForRoute(Route route) { + return Set.of(PATTERN_1); + } + + @Override + public CalendarService getCalendarService() { + return new CalendarService() { + @Override + public Set getServiceIds() { + return Set.of(); + } + + @Override + public Set getServiceDatesForServiceId(FeedScopedId serviceId) { + return Set.of(parse("2024-05-01"), parse("2024-06-01")); + } + + @Override + public Set getServiceIdsOnDate(LocalDate date) { + return Set.of(); + } + }; + } + }; + } } From cbe912dd1fcc9361840105983c04880ef1ebba87 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 16:45:56 +0200 Subject: [PATCH 1283/1688] Flesh out tests --- .../apis/gtfs/PatternByServiceDaysFilter.java | 12 +++-- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 17 +++++-- .../gtfs/PatternByServiceDaysFilterTest.java | 46 ++++++++++++++----- 3 files changed, 56 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java index a53b7842257..6d6a5e3d8e1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java @@ -44,11 +44,13 @@ public Collection filterPatterns(Collection tripPatter return tripPatterns.stream().filter(this::hasServicesOnDate).toList(); } - public Stream filterRoutes(Stream routeStream) { - return routeStream.filter(r -> { - var patterns = transitService.getPatternsForRoute(r); - return !this.filterPatterns(patterns).isEmpty(); - }); + public Collection filterRoutes(Stream routeStream) { + return routeStream + .filter(r -> { + var patterns = transitService.getPatternsForRoute(r); + return !this.filterPatterns(patterns).isEmpty(); + }) + .toList(); } private boolean hasServicesOnDate(TripPattern pattern) { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index 38bf604171c..d5f99860e5d 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -13,7 +13,14 @@ import graphql.schema.DataFetcher; import graphql.schema.DataFetchingEnvironment; import graphql.schema.DataFetchingEnvironmentImpl; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.EnumSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; import java.util.stream.Stream; import org.locationtech.jts.geom.Coordinate; @@ -40,7 +47,11 @@ import org.opentripplanner.routing.core.FareType; import org.opentripplanner.routing.error.RoutingValidationException; import org.opentripplanner.routing.fares.FareService; -import org.opentripplanner.routing.graphfinder.*; +import org.opentripplanner.routing.graphfinder.GraphFinder; +import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.routing.graphfinder.PatternAtStop; +import org.opentripplanner.routing.graphfinder.PlaceAtDistance; +import org.opentripplanner.routing.graphfinder.PlaceType; import org.opentripplanner.routing.vehicle_parking.VehicleParking; import org.opentripplanner.routing.vehicle_parking.VehicleParkingService; import org.opentripplanner.service.vehiclerental.VehicleRentalService; @@ -602,7 +613,7 @@ public DataFetcher> routes() { transitService, args.getGraphQLLimitByPatternServiceDays() ); - routeStream = filter.filterRoutes(routeStream); + routeStream = filter.filterRoutes(routeStream).stream(); } return routeStream.toList(); }; diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java index 76b4a3bb526..32f6a78b2ee 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java @@ -4,6 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.opentripplanner.apis.gtfs.PatternByServiceDaysFilterTest.FilterExpectation.NOT_REMOVED; +import static org.opentripplanner.apis.gtfs.PatternByServiceDaysFilterTest.FilterExpectation.REMOVED; import java.time.LocalDate; import java.util.Collection; @@ -35,8 +37,11 @@ class PatternByServiceDaysFilterTest { private static final RegularStop STOP_1 = MODEL.stop("1").build(); private static final StopPattern STOP_PATTERN = TransitModelForTest.stopPattern(STOP_1, STOP_1); private static final TripPattern PATTERN_1 = pattern(); - private static final List NOT_REMOVED = List.of(PATTERN_1); - private static final List REMOVED = List.of(); + + enum FilterExpectation { + REMOVED, + NOT_REMOVED, + } private static TripPattern pattern() { var pattern = TransitModelForTest @@ -86,7 +91,7 @@ void validRange(LocalDate start, LocalDate end) { assertDoesNotThrow(() -> new PatternByServiceDaysFilter(EMPTY_SERVICE, start, end)); } - static List patternRanges() { + static List ranges() { return List.of( Arguments.of(null, null, NOT_REMOVED), Arguments.of(null, parse("2024-05-03"), NOT_REMOVED), @@ -102,20 +107,39 @@ static List patternRanges() { } @ParameterizedTest - @MethodSource("patternRanges") - void filterPatterns(LocalDate start, LocalDate end, List expectedPatterns) { - var model = new TransitModel(); - var service = mockService(model); + @MethodSource("ranges") + void filterPatterns(LocalDate start, LocalDate end, FilterExpectation expectation) { + var service = mockService(); + var filter = new PatternByServiceDaysFilter(service, start, end); + + var filterInput = List.of(PATTERN_1); + var filterOutput = filter.filterPatterns(filterInput); + if (expectation == NOT_REMOVED) { + assertEquals(filterOutput, filterInput); + } else { + assertEquals(List.of(), filterOutput); + } + } + + @ParameterizedTest + @MethodSource("ranges") + void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation) { + var service = mockService(); var filter = new PatternByServiceDaysFilter(service, start, end); - var result = filter.filterPatterns(NOT_REMOVED); + var filterInput = List.of(ROUTE_1); + var filterOutput = filter.filterRoutes(filterInput.stream()); - assertEquals(expectedPatterns, result); + if (expectation == NOT_REMOVED) { + assertEquals(filterOutput, filterInput); + } else { + assertEquals(List.of(), filterOutput); + } } - private static TransitService mockService(TransitModel model) { - return new DefaultTransitService(model) { + private static TransitService mockService() { + return new DefaultTransitService(new TransitModel()) { @Override public Collection getPatternsForRoute(Route route) { return Set.of(PATTERN_1); From d6b568fe6210f67c9fa37df9ffcf383e0938bb8b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 17:22:22 +0200 Subject: [PATCH 1284/1688] Rename service day to service date --- ....java => PatternByServiceDatesFilter.java} | 33 +++++++++++++---- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 8 ++--- .../apis/gtfs/datafetchers/RouteImpl.java | 6 ++-- .../apis/gtfs/generated/GraphQLTypes.java | 36 +++++++++---------- .../opentripplanner/apis/gtfs/schema.graphqls | 24 ++++++++++--- ...a => PatternByServiceDatesFilterTest.java} | 14 ++++---- 6 files changed, 77 insertions(+), 44 deletions(-) rename src/main/java/org/opentripplanner/apis/gtfs/{PatternByServiceDaysFilter.java => PatternByServiceDatesFilter.java} (65%) rename src/test/java/org/opentripplanner/apis/gtfs/{PatternByServiceDaysFilterTest.java => PatternByServiceDatesFilterTest.java} (90%) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java similarity index 65% rename from src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java rename to src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index 6d6a5e3d8e1..313c44f2647 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -5,18 +5,30 @@ import java.util.Objects; import java.util.stream.Stream; import javax.annotation.Nullable; -import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDayFilterInput; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDateFilterInput; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.service.TransitService; -public class PatternByServiceDaysFilter { +/** + * Encapsulates the logic to filter patterns by the service dates that they operate on. It also + * has a method to filter routes by checking if their patterns operate on the required days + */ +public class PatternByServiceDatesFilter { private final TransitService transitService; private final LocalDate startInclusive; private final LocalDate endInclusive; - PatternByServiceDaysFilter( + /** + * + * @param transitService + * @param startInclusive The inclusive start date to check the patterns for. If null then no start + * date is defined and this will therefore match all dates. + * @param endInclusive The inclusive end date to check the patterns for. If null then no end date + * is defined this will therefore match all dates. + */ + PatternByServiceDatesFilter( TransitService transitService, @Nullable LocalDate startInclusive, @Nullable LocalDate endInclusive @@ -33,17 +45,24 @@ public class PatternByServiceDaysFilter { } } - public PatternByServiceDaysFilter( + public PatternByServiceDatesFilter( TransitService transitService, - GraphQLServiceDayFilterInput graphQLServiceDays + GraphQLServiceDateFilterInput filterInput ) { - this(transitService, graphQLServiceDays.getGraphQLStart(), graphQLServiceDays.getGraphQLEnd()); + this(transitService, filterInput.getGraphQLStart(), filterInput.getGraphQLEnd()); } + /** + * Filter the patterns by the service dates that it operates on. + */ public Collection filterPatterns(Collection tripPatterns) { return tripPatterns.stream().filter(this::hasServicesOnDate).toList(); } + /** + * Filter the routes by listing all their patterns' service dates and checking if they + * operate on the specified dates. + */ public Collection filterRoutes(Stream routeStream) { return routeStream .filter(r -> { @@ -72,7 +91,7 @@ private boolean hasServicesOnDate(TripPattern pattern) { }); } - public static boolean hasServiceDayFilter(GraphQLServiceDayFilterInput serviceDays) { + public static boolean hasServiceDayFilter(GraphQLServiceDateFilterInput serviceDays) { return ( serviceDays != null && (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index d5f99860e5d..d5033af7da7 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -27,7 +27,7 @@ import org.locationtech.jts.geom.Envelope; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.GraphQLUtils; -import org.opentripplanner.apis.gtfs.PatternByServiceDaysFilter; +import org.opentripplanner.apis.gtfs.PatternByServiceDatesFilter; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLQueryTypeStopsByRadiusArgs; @@ -607,11 +607,11 @@ public DataFetcher> routes() { } if ( - PatternByServiceDaysFilter.hasServiceDayFilter(args.getGraphQLLimitByPatternServiceDays()) + PatternByServiceDatesFilter.hasServiceDayFilter(args.getGraphQLLimitByPatternServiceDates()) ) { - var filter = new PatternByServiceDaysFilter( + var filter = new PatternByServiceDatesFilter( transitService, - args.getGraphQLLimitByPatternServiceDays() + args.getGraphQLLimitByPatternServiceDates() ); routeStream = filter.filterRoutes(routeStream).stream(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java index 17b3cc56c87..d9b76ab72ef 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; import org.opentripplanner.apis.gtfs.GraphQLRequestContext; import org.opentripplanner.apis.gtfs.GraphQLUtils; -import org.opentripplanner.apis.gtfs.PatternByServiceDaysFilter; +import org.opentripplanner.apis.gtfs.PatternByServiceDatesFilter; import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed; @@ -181,8 +181,8 @@ public DataFetcher> patterns() { var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments()); - if (PatternByServiceDaysFilter.hasServiceDayFilter(args.getGraphQLServiceDays())) { - var filter = new PatternByServiceDaysFilter(transitService, args.getGraphQLServiceDays()); + if (PatternByServiceDatesFilter.hasServiceDayFilter(args.getGraphQLServiceDates())) { + var filter = new PatternByServiceDatesFilter(transitService, args.getGraphQLServiceDates()); return filter.filterPatterns(patterns); } else { return patterns; diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index fcd64389f59..04da89080c3 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -2266,7 +2266,7 @@ public static class GraphQLQueryTypeRoutesArgs { private List feeds; private List ids; - private GraphQLServiceDayFilterInput limitByPatternServiceDays; + private GraphQLServiceDateFilterInput limitByPatternServiceDates; private String name; private List transportModes; @@ -2274,9 +2274,9 @@ public GraphQLQueryTypeRoutesArgs(Map args) { if (args != null) { this.feeds = (List) args.get("feeds"); this.ids = (List) args.get("ids"); - this.limitByPatternServiceDays = - new GraphQLServiceDayFilterInput( - (Map) args.get("limitByPatternServiceDays") + this.limitByPatternServiceDates = + new GraphQLServiceDateFilterInput( + (Map) args.get("limitByPatternServiceDates") ); this.name = (String) args.get("name"); if (args.get("transportModes") != null) { @@ -2297,8 +2297,8 @@ public List getGraphQLIds() { return this.ids; } - public GraphQLServiceDayFilterInput getGraphQLLimitByPatternServiceDays() { - return this.limitByPatternServiceDays; + public GraphQLServiceDateFilterInput getGraphQLLimitByPatternServiceDates() { + return this.limitByPatternServiceDates; } public String getGraphQLName() { @@ -2317,10 +2317,10 @@ public void setGraphQLIds(List ids) { this.ids = ids; } - public void setGraphQLLimitByPatternServiceDays( - GraphQLServiceDayFilterInput limitByPatternServiceDays + public void setGraphQLLimitByPatternServiceDates( + GraphQLServiceDateFilterInput limitByPatternServiceDates ) { - this.limitByPatternServiceDays = limitByPatternServiceDays; + this.limitByPatternServiceDates = limitByPatternServiceDates; } public void setGraphQLName(String name) { @@ -2768,21 +2768,21 @@ public void setGraphQLLanguage(String language) { public static class GraphQLRoutePatternsArgs { - private GraphQLServiceDayFilterInput serviceDays; + private GraphQLServiceDateFilterInput serviceDates; public GraphQLRoutePatternsArgs(Map args) { if (args != null) { - this.serviceDays = - new GraphQLServiceDayFilterInput((Map) args.get("serviceDays")); + this.serviceDates = + new GraphQLServiceDateFilterInput((Map) args.get("serviceDates")); } } - public GraphQLServiceDayFilterInput getGraphQLServiceDays() { - return this.serviceDays; + public GraphQLServiceDateFilterInput getGraphQLServiceDates() { + return this.serviceDates; } - public void setGraphQLServiceDays(GraphQLServiceDayFilterInput serviceDays) { - this.serviceDays = serviceDays; + public void setGraphQLServiceDates(GraphQLServiceDateFilterInput serviceDates) { + this.serviceDates = serviceDates; } } @@ -2807,12 +2807,12 @@ public enum GraphQLRoutingErrorCode { WALKING_BETTER_THAN_TRANSIT, } - public static class GraphQLServiceDayFilterInput { + public static class GraphQLServiceDateFilterInput { private java.time.LocalDate end; private java.time.LocalDate start; - public GraphQLServiceDayFilterInput(Map args) { + public GraphQLServiceDateFilterInput(Map args) { if (args != null) { this.end = (java.time.LocalDate) args.get("end"); this.start = (java.time.LocalDate) args.get("start"); diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index c4ed7ff40d3..c495b821965 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1663,6 +1663,11 @@ type RideHailingEstimate { productName: String } +""" +An ISO-8601-formatted local date, i.e. `2024-05-24` for the 24th of May, 2024. +""" +scalar LocalDate + """ An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. @@ -2542,10 +2547,18 @@ enum Qualifier { HAIL } -scalar LocalDate -input ServiceDayFilterInput { +"""Filters entity by their service dates.""" +input ServiceDateFilterInput { + """ + Inclusive start date of the filter. If `null` this means that no `start` filter is applied and all + dates that are before or on `end` are selected. + """ start: LocalDate + """ + Inclusive end date of the filter. If `null` this means that no end filter is applied and all + entities that are after or on `start` are selected. + """ end: LocalDate } @@ -2708,7 +2721,8 @@ type QueryType { """Only include routes, which use one of these modes""" transportModes: [Mode] - limitByPatternServiceDays: ServiceDayFilterInput + """Only include routes whose pattern operates on at least one service date specified by this filter.""" + limitByPatternServiceDates: ServiceDateFilterInput ): [Route] """ @@ -3431,8 +3445,8 @@ type Route implements Node { """List of patterns which operate on this route""" patterns( - "Filter patterns by the service day they operate on." - serviceDays: ServiceDayFilterInput + "Filter patterns by the service dates they operate on." + serviceDates: ServiceDateFilterInput ): [Pattern] """List of stops on this route""" diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java similarity index 90% rename from src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java rename to src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index 32f6a78b2ee..2ef9b22f335 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDaysFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.opentripplanner.apis.gtfs.PatternByServiceDaysFilterTest.FilterExpectation.NOT_REMOVED; -import static org.opentripplanner.apis.gtfs.PatternByServiceDaysFilterTest.FilterExpectation.REMOVED; +import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.NOT_REMOVED; +import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.REMOVED; import java.time.LocalDate; import java.util.Collection; @@ -28,7 +28,7 @@ import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.transit.service.TransitService; -class PatternByServiceDaysFilterTest { +class PatternByServiceDatesFilterTest { private static final TransitService EMPTY_SERVICE = new DefaultTransitService(new TransitModel()); private static final Route ROUTE_1 = TransitModelForTest.route("1").build(); @@ -71,7 +71,7 @@ static List invalidRange() { void invalidRange(LocalDate start, LocalDate end) { assertThrows( IllegalArgumentException.class, - () -> new PatternByServiceDaysFilter(EMPTY_SERVICE, start, end) + () -> new PatternByServiceDatesFilter(EMPTY_SERVICE, start, end) ); } @@ -88,7 +88,7 @@ static List validRange() { @ParameterizedTest @MethodSource("validRange") void validRange(LocalDate start, LocalDate end) { - assertDoesNotThrow(() -> new PatternByServiceDaysFilter(EMPTY_SERVICE, start, end)); + assertDoesNotThrow(() -> new PatternByServiceDatesFilter(EMPTY_SERVICE, start, end)); } static List ranges() { @@ -110,7 +110,7 @@ static List ranges() { @MethodSource("ranges") void filterPatterns(LocalDate start, LocalDate end, FilterExpectation expectation) { var service = mockService(); - var filter = new PatternByServiceDaysFilter(service, start, end); + var filter = new PatternByServiceDatesFilter(service, start, end); var filterInput = List.of(PATTERN_1); var filterOutput = filter.filterPatterns(filterInput); @@ -126,7 +126,7 @@ void filterPatterns(LocalDate start, LocalDate end, FilterExpectation expectatio @MethodSource("ranges") void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation) { var service = mockService(); - var filter = new PatternByServiceDaysFilter(service, start, end); + var filter = new PatternByServiceDatesFilter(service, start, end); var filterInput = List.of(ROUTE_1); var filterOutput = filter.filterRoutes(filterInput.stream()); From 3f0d492ebc7081f33540f7e487bd4826b9ea7d9c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 17:38:08 +0200 Subject: [PATCH 1285/1688] Add example for LocalDate --- magidoc.mjs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/magidoc.mjs b/magidoc.mjs index 4fea5e4e127..73f1a4d8343 100644 --- a/magidoc.mjs +++ b/magidoc.mjs @@ -36,7 +36,8 @@ To learn how to deactivate it, read the queryGenerationFactories: { 'Polyline': '<>', 'GeoJson': '<>', - 'OffsetDateTime': '2024-02-05T18:04:23+01:00' + 'OffsetDateTime': '2024-02-05T18:04:23+01:00', + 'LocalDate': '2024-05-24', }, } }, From 28b078d0ed817067c790f124a2b9e3b76e8786b0 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 24 May 2024 17:39:16 +0200 Subject: [PATCH 1286/1688] Update test --- .../opentripplanner/apis/gtfs/queries/routes-extended.graphql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql index 5da7db77286..0251245d183 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql @@ -10,7 +10,7 @@ mode sortOrder bikesAllowed - patterns(serviceDays: {start: "2024-05-23" end: "2024-05-30"}) { + patterns(serviceDates: {start: "2024-05-23" end: "2024-05-30"}) { name } } From e6971b4d786e3c94b02e52aca1512c81079ac887 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 27 May 2024 13:02:49 +0200 Subject: [PATCH 1287/1688] Add more test cases --- .../gtfs/PatternByServiceDatesFilter.java | 2 +- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 4 ++- .../apis/gtfs/datafetchers/RouteImpl.java | 2 +- .../gtfs/PatternByServiceDatesFilterTest.java | 30 +++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index 313c44f2647..c7a0314fbb5 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -91,7 +91,7 @@ private boolean hasServicesOnDate(TripPattern pattern) { }); } - public static boolean hasServiceDayFilter(GraphQLServiceDateFilterInput serviceDays) { + public static boolean hasServiceDateFilter(GraphQLServiceDateFilterInput serviceDays) { return ( serviceDays != null && (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index d5033af7da7..0936d98cf74 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -607,7 +607,9 @@ public DataFetcher> routes() { } if ( - PatternByServiceDatesFilter.hasServiceDayFilter(args.getGraphQLLimitByPatternServiceDates()) + PatternByServiceDatesFilter.hasServiceDateFilter( + args.getGraphQLLimitByPatternServiceDates() + ) ) { var filter = new PatternByServiceDatesFilter( transitService, diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java index d9b76ab72ef..ac4a485706b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java @@ -181,7 +181,7 @@ public DataFetcher> patterns() { var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments()); - if (PatternByServiceDatesFilter.hasServiceDayFilter(args.getGraphQLServiceDates())) { + if (PatternByServiceDatesFilter.hasServiceDateFilter(args.getGraphQLServiceDates())) { var filter = new PatternByServiceDatesFilter(transitService, args.getGraphQLServiceDates()); return filter.filterPatterns(patterns); } else { diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index 2ef9b22f335..09582d67d3c 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -3,17 +3,22 @@ import static java.time.LocalDate.parse; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.NOT_REMOVED; import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.REMOVED; import java.time.LocalDate; +import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Map; import java.util.Set; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDateFilterInput; import org.opentripplanner.model.calendar.CalendarService; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -37,6 +42,7 @@ class PatternByServiceDatesFilterTest { private static final RegularStop STOP_1 = MODEL.stop("1").build(); private static final StopPattern STOP_PATTERN = TransitModelForTest.stopPattern(STOP_1, STOP_1); private static final TripPattern PATTERN_1 = pattern(); + private static final LocalDate DATE = LocalDate.parse("2024-05-27"); enum FilterExpectation { REMOVED, @@ -166,4 +172,28 @@ public Set getServiceIdsOnDate(LocalDate date) { } }; } + + public static List noFilterCases() { + var list = new ArrayList(); + list.add(null); + list.add(new GraphQLServiceDateFilterInput(Map.of())); + return list; + } + + @ParameterizedTest + @MethodSource("noFilterCases") + void hasNoServiceDateFilter(GraphQLServiceDateFilterInput input) { + assertFalse(PatternByServiceDatesFilter.hasServiceDateFilter(input)); + } + + public static List> hasFilterCases() { + return List.of(Map.of("start", DATE), Map.of("end", DATE), Map.of("start", DATE, "end", DATE)); + } + + @ParameterizedTest + @MethodSource("hasFilterCases") + void hasServiceDateFilter(Map params) { + var input = new GraphQLServiceDateFilterInput(params); + assertTrue(PatternByServiceDatesFilter.hasServiceDateFilter(input)); + } } From 244da3f314334ee22803325053765208f863d356 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 27 May 2024 14:36:36 +0200 Subject: [PATCH 1288/1688] Update test case for edge case --- .../apis/gtfs/PatternByServiceDatesFilterTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index 09582d67d3c..7e0cae144ed 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -103,6 +103,7 @@ static List ranges() { Arguments.of(null, parse("2024-05-03"), NOT_REMOVED), Arguments.of(null, parse("2024-05-01"), NOT_REMOVED), Arguments.of(parse("2024-05-03"), null, NOT_REMOVED), + Arguments.of(parse("2024-05-01"), null, NOT_REMOVED), Arguments.of(parse("2024-05-02"), parse("2024-05-02"), REMOVED), Arguments.of(parse("2024-05-02"), parse("2024-05-03"), REMOVED), Arguments.of(parse("2025-01-01"), null, REMOVED), From 2909c882669c6b328d2f79a799c05eb5e6147333 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 4 Jun 2024 14:23:29 +0200 Subject: [PATCH 1289/1688] Apply review suggestions --- .../transit/model/timetable/RealTimeTripTimes.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java index 9e91d691fbe..f03f8e93ea3 100644 --- a/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java +++ b/src/main/java/org/opentripplanner/transit/model/timetable/RealTimeTripTimes.java @@ -261,11 +261,15 @@ public void setRealTimeState(final RealTimeState realTimeState) { * * @throws org.opentripplanner.transit.model.framework.DataValidationException of the first error * found. + * + * Note! This is a duplicate (almost) of the same method in ScheduledTripTimes. + * We should aim for just one implementation. We need to decide how to do this. + * A common abstract base class would simplify it, but may lead to other problems and performance + * overhead. We should look back on this after refactoring + * the rest of the timetable classes (calendar/patterns). */ public void validateNonIncreasingTimes() { - final int nStops = arrivalTimes != null - ? arrivalTimes.length - : scheduledTripTimes.getNumStops(); + final int nStops = scheduledTripTimes.getNumStops(); int prevDep = -9_999_999; for (int s = 0; s < nStops; s++) { final int arr = getArrivalTime(s); From d84e7f5f46bfe34d13f8e073fa2d2bfa9573f5e4 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Tue, 4 Jun 2024 14:38:51 +0200 Subject: [PATCH 1290/1688] Fix merge conflict --- .../ext/siri/SiriTimetableSnapshotSourceTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index 95b04a70be0..a069f5c6656 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -65,7 +65,7 @@ void testAddJourney() { @Test void testAddedJourneyWithInvalidScheduledData() { - var env = new RealtimeTestEnvironment(); + var env = RealtimeTestEnvironment.siri(); // Create an extra journey with invalid planned data (travel back in time) // and valid real time data @@ -85,7 +85,7 @@ void testAddedJourneyWithInvalidScheduledData() { var result = env.applyEstimatedTimetable(createExtraJourney); assertEquals(0, result.successful()); - assertFailure(result, UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME); + assertFailure(UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME, result); } @Test From 662515e774d815ded56117ed35300b2cc0b385ea Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Tue, 4 Jun 2024 15:30:19 +0200 Subject: [PATCH 1291/1688] feature: Remove TravelTime API --- docs/Analysis.md | 1 - docs/Configuration.md | 1 - docs/sandbox/TravelTime.md | 61 ---- mkdocs.yml | 1 - .../ext/traveltime/IsochroneData.java | 10 - .../ext/traveltime/IsochroneRenderer.java | 85 ----- .../ext/traveltime/IsolineMetric.java | 33 -- .../PostTransitSkipEdgeStrategy.java | 43 --- .../ext/traveltime/RasterRenderer.java | 73 ---- .../ext/traveltime/SampleGridRenderer.java | 91 ----- .../ext/traveltime/SampleGridSPTVisitor.java | 59 --- .../ext/traveltime/TravelTimeRequest.java | 67 ---- .../ext/traveltime/TravelTimeResource.java | 305 ---------------- .../ext/traveltime/TravelTimeStateData.java | 14 - .../opentripplanner/ext/traveltime/WTWD.java | 32 -- .../traveltime/WTWDAccumulativeMetric.java | 98 ----- .../geometry/AccumulativeGridSampler.java | 109 ------ .../geometry/AccumulativeMetric.java | 34 -- .../ext/traveltime/geometry/DelaunayEdge.java | 46 --- .../geometry/DelaunayIsolineBuilder.java | 192 ---------- .../traveltime/geometry/DelaunayPoint.java | 20 - .../geometry/DelaunayTriangulation.java | 16 - .../traveltime/geometry/IsolineBuilder.java | 12 - .../ext/traveltime/geometry/SparseMatrix.java | 167 --------- .../geometry/SparseMatrixZSampleGrid.java | 342 ------------------ .../ext/traveltime/geometry/ZMetric.java | 36 -- .../ext/traveltime/geometry/ZSampleGrid.java | 65 ---- .../ext/traveltime/geometry/ZSamplePoint.java | 40 -- .../ext/traveltime/spt/SPTVisitor.java | 26 -- .../ext/traveltime/spt/SPTWalker.java | 146 -------- .../opentripplanner/apis/APIEndpoints.java | 3 - .../framework/application/OTPFeature.java | 1 - .../raptor/api/request/SearchParams.java | 21 +- .../api/request/SearchParamsBuilder.java | 11 - .../street/search/state/StateData.java | 29 +- 35 files changed, 8 insertions(+), 2282 deletions(-) delete mode 100644 docs/sandbox/TravelTime.md delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/IsochroneData.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/IsochroneRenderer.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/IsolineMetric.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/PostTransitSkipEdgeStrategy.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/RasterRenderer.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/SampleGridRenderer.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/SampleGridSPTVisitor.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeRequest.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeStateData.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/WTWD.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/WTWDAccumulativeMetric.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeGridSampler.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeMetric.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayEdge.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayIsolineBuilder.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayPoint.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayTriangulation.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/IsolineBuilder.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrix.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrixZSampleGrid.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZMetric.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSampleGrid.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSamplePoint.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTVisitor.java delete mode 100644 src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTWalker.java diff --git a/docs/Analysis.md b/docs/Analysis.md index 867e90869c4..f07010c5442 100644 --- a/docs/Analysis.md +++ b/docs/Analysis.md @@ -14,7 +14,6 @@ Much of the analysis code present in the v1.x legacy branch of OTP is essentiall OTP2's new transit router is quite similar to R5 (indeed it was directly influenced by R5) and would not face the same technical problems. Nonetheless, we have decided not to port the OTP1 analysis features over to OTP2 since it would broaden the scope of OTP2 away from passenger information and draw the finite amount of available attention and resources away from existing open source analytics tools. If you would like to apply the routing innovations present in OTP2 in analytics situations, we recommend taking a look at projects like R5 or the R and Python language wrappers for it created by the community. -Some analytics features may still be available as optional "sandbox" features in OTP2 (such as [Travel Time](sandbox/TravelTime.md)), but these do not work in the same way as the features you may have used or read about in OTP1. They are unmaintained and unsupported, and may be removed in the near future. ## Terminology Note diff --git a/docs/Configuration.md b/docs/Configuration.md index ed58f13fa6e..05611e23628 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -248,7 +248,6 @@ Here is a list of all features which can be toggled on/off and their default val | `SandboxAPIGeocoder` | Enable the Geocoder API. | | ✓️ | | `SandboxAPIMapboxVectorTilesApi` | Enable Mapbox vector tiles API. | | ✓️ | | `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ | -| `SandboxAPITravelTime` | Enable the isochrone/travel time surface API. | | ✓️ | | `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ | diff --git a/docs/sandbox/TravelTime.md b/docs/sandbox/TravelTime.md deleted file mode 100644 index 817f71506f3..00000000000 --- a/docs/sandbox/TravelTime.md +++ /dev/null @@ -1,61 +0,0 @@ -# Travel Time (Isochrone & Surface) API - -## Contact Info - -- Entur, Norway - -## Changelog - -- 2022-05-09 Initial implementation - -## Documentation - -The API produces a snapshot of travel time form a single place to places around it. The results can -be fetched either as a set of isochrones or a raster map. Please note that as a sandbox feature this -functionality is UNSUPPORTED and neither maintained nor well-understood by most current OTP -developers, and may not be accurate or reliable. Travel time analytics work that began within OTP -has moved years ago to other projects, where it actively continues. See the -[Analysis](../Analysis.md) page for further details. - -### Configuration - -The feature must be enabled in otp-config.json as follows: - -```JSON -// otp-config.json -{ - "otpFeatures" : { - "SandboxAPITravelTime" : true - } -} -``` - -### API parameters - -- `location` Origin of the search, can be either `latitude,longitude` or a stop id -- `time` Departure time as a ISO-8601 time and date (example `2023-04-24T15:40:12+02:00`). The default value is the current time. -- `cutoff` The maximum travel duration as a ISO-8601 duration. The `PT` can be dropped to simplify the value. - This parameter can be given multiple times to include multiple isochrones in a single request. - The default value is one hour. -- `modes` A list of travel modes. WALK is not implemented, use `WALK, TRANSIT` instead. -- `arriveBy` Set to `false` when searching from the location and `true` when searching to the - location - -### Isochrone API - -`/otp/traveltime/isochrone` - -Results is the travel time boundaries at the `cutoff` travel time. - -### Travel time surface API - -`/otp/traveltime/surface` - -The travel time as a GeoTIFF raster file. The file has a single 32-bit int band, which contains the -travel time in seconds. - -### Example Request - -``` -http://localhost:8080/otp/traveltime/isochrone?batch=true&location=52.499959,13.388803&time=2023-04-12T10:19:03%2B02:00&modes=WALK,TRANSIT&arriveBy=false&cutoff=30M17S -``` diff --git a/mkdocs.yml b/mkdocs.yml index da976615d1b..b8c257ceb7d 100644 --- a/mkdocs.yml +++ b/mkdocs.yml @@ -110,7 +110,6 @@ nav: - Data Overlay: 'sandbox/DataOverlay.md' - Vehicle Parking Updaters: 'sandbox/VehicleParking.md' - Geocoder API: 'sandbox/GeocoderAPI.md' - - Travel Time Isochrones: 'sandbox/TravelTime.md' - IBI Accessibility Score: 'sandbox/IBIAccessibilityScore.md' - Fares: 'sandbox/Fares.md' - Ride Hailing: 'sandbox/RideHailing.md' diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/IsochroneData.java b/src/ext/java/org/opentripplanner/ext/traveltime/IsochroneData.java deleted file mode 100644 index 5e367be2eef..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/IsochroneData.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import org.locationtech.jts.geom.Geometry; - -/** - * A conveyor for an isochrone. - * - * @author laurent - */ -public record IsochroneData(long cutoffSec, Geometry geometry, Geometry debugGeometry) {} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/IsochroneRenderer.java b/src/ext/java/org/opentripplanner/ext/traveltime/IsochroneRenderer.java deleted file mode 100644 index 2c4f2ed1ac1..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/IsochroneRenderer.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import java.time.Duration; -import java.util.ArrayList; -import java.util.List; -import org.geojson.MultiPolygon; -import org.geotools.api.feature.simple.SimpleFeatureType; -import org.geotools.data.simple.SimpleFeatureCollection; -import org.geotools.feature.DefaultFeatureCollection; -import org.geotools.feature.simple.SimpleFeatureBuilder; -import org.geotools.feature.simple.SimpleFeatureTypeBuilder; -import org.geotools.referencing.crs.DefaultGeographicCRS; -import org.locationtech.jts.geom.Geometry; -import org.opentripplanner.ext.traveltime.geometry.DelaunayIsolineBuilder; -import org.opentripplanner.ext.traveltime.geometry.ZMetric; -import org.opentripplanner.ext.traveltime.geometry.ZSampleGrid; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class IsochroneRenderer { - - private static final Logger LOG = LoggerFactory.getLogger(IsochroneRenderer.class); - private static final SimpleFeatureType contourSchema = makeContourSchema(); - - static List renderIsochrones( - ZSampleGrid sampleGrid, - TravelTimeRequest traveltimeRequest - ) { - long t0 = System.currentTimeMillis(); - ZMetric zMetric = new IsolineMetric(); - DelaunayIsolineBuilder isolineBuilder = new DelaunayIsolineBuilder<>( - sampleGrid.delaunayTriangulate(), - zMetric - ); - isolineBuilder.setDebug(traveltimeRequest.includeDebugGeometry); - - List isochrones = new ArrayList<>(); - for (Duration cutoff : traveltimeRequest.cutoffs) { - long cutoffSec = cutoff.toSeconds(); - WTWD z0 = new WTWD(); - z0.w = 1.0; - z0.wTime = cutoffSec; - z0.d = traveltimeRequest.offRoadDistanceMeters; - Geometry geometry = isolineBuilder.computeIsoline(z0); - Geometry debugGeometry = null; - if (traveltimeRequest.includeDebugGeometry) { - debugGeometry = isolineBuilder.getDebugGeometry(); - } - - isochrones.add(new IsochroneData(cutoffSec, geometry, debugGeometry)); - } - - long t1 = System.currentTimeMillis(); - LOG.info("Computed {} isochrones in {}msec", isochrones.size(), (int) (t1 - t0)); - - return isochrones; - } - - /** - * Create a geotools feature collection from a list of isochrones in the OTPA internal format. - * Once in a FeatureCollection, they can for example be exported as GeoJSON. - */ - static SimpleFeatureCollection makeContourFeatures(List isochrones) { - DefaultFeatureCollection featureCollection = new DefaultFeatureCollection(null, contourSchema); - SimpleFeatureBuilder fbuilder = new SimpleFeatureBuilder(contourSchema); - for (IsochroneData isochrone : isochrones) { - fbuilder.add(isochrone.geometry()); - fbuilder.add(isochrone.cutoffSec()); - featureCollection.add(fbuilder.buildFeature(null)); - } - return featureCollection; - } - - private static SimpleFeatureType makeContourSchema() { - /* Create the output feature schema. */ - SimpleFeatureTypeBuilder typeBuilder = new SimpleFeatureTypeBuilder(); - typeBuilder.setName("contours"); - typeBuilder.setCRS(DefaultGeographicCRS.WGS84); - typeBuilder.setDefaultGeometry("the_geom"); - // Do not use "geom" or "geometry" below, it seems to broke shapefile generation - typeBuilder.add("the_geom", MultiPolygon.class); - typeBuilder.add("time", Long.class); - return typeBuilder.buildFeatureType(); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/IsolineMetric.java b/src/ext/java/org/opentripplanner/ext/traveltime/IsolineMetric.java deleted file mode 100644 index 8afa3b938ba..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/IsolineMetric.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import org.opentripplanner.ext.traveltime.geometry.ZMetric; - -public class IsolineMetric implements ZMetric { - - @Override - public int cut(WTWD zA, WTWD zB, WTWD z0) { - double t0 = z0.wTime / z0.w; - double tA = zA.d > z0.d ? Double.POSITIVE_INFINITY : zA.wTime / zA.w; - double tB = zB.d > z0.d ? Double.POSITIVE_INFINITY : zB.wTime / zB.w; - if (tA < t0 && t0 <= tB) return 1; - if (tB < t0 && t0 <= tA) return -1; - return 0; - } - - @Override - public double interpolate(WTWD zA, WTWD zB, WTWD z0) { - if (zA.d > z0.d || zB.d > z0.d) { - if (zA.d > z0.d && zB.d > z0.d) { - throw new AssertionError("dA > d0 && dB > d0"); - } - // Interpolate on d - return zA.d == zB.d ? 0.5 : (z0.d - zA.d) / (zB.d - zA.d); - } else { - // Interpolate on t - double tA = zA.wTime / zA.w; - double tB = zB.wTime / zB.w; - double t0 = z0.wTime / z0.w; - return tA == tB ? 0.5 : (t0 - tA) / (tB - tA); - } - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/PostTransitSkipEdgeStrategy.java b/src/ext/java/org/opentripplanner/ext/traveltime/PostTransitSkipEdgeStrategy.java deleted file mode 100644 index c0175819da5..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/PostTransitSkipEdgeStrategy.java +++ /dev/null @@ -1,43 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import java.time.Duration; -import java.time.Instant; -import org.opentripplanner.astar.spi.SkipEdgeStrategy; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.search.state.State; - -public class PostTransitSkipEdgeStrategy implements SkipEdgeStrategy { - - private final long maxDurationSeconds; - private final long departureTime; - private final boolean arriveBy; - - public PostTransitSkipEdgeStrategy( - Duration maxEgressTime, - Instant departureTime, - boolean arriveBy - ) { - this.maxDurationSeconds = maxEgressTime.toSeconds(); - this.departureTime = departureTime.getEpochSecond(); - this.arriveBy = arriveBy; - } - - @Override - public boolean shouldSkipEdge(State current, Edge edge) { - long postTransitDepartureTime; - if (current.stateData instanceof TravelTimeStateData travelTimeStateData) { - postTransitDepartureTime = travelTimeStateData.postTransitDepartureTime; - } else { - postTransitDepartureTime = departureTime; - } - long duration; - - if (arriveBy) { - duration = postTransitDepartureTime - current.getTimeSeconds(); - } else { - duration = current.getTimeSeconds() - postTransitDepartureTime; - } - - return duration > maxDurationSeconds; - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/RasterRenderer.java b/src/ext/java/org/opentripplanner/ext/traveltime/RasterRenderer.java deleted file mode 100644 index 6343c6a1f68..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/RasterRenderer.java +++ /dev/null @@ -1,73 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import static javax.imageio.ImageWriteParam.MODE_EXPLICIT; - -import jakarta.ws.rs.core.StreamingOutput; -import java.awt.image.DataBuffer; -import javax.media.jai.RasterFactory; -import org.geotools.api.parameter.GeneralParameterValue; -import org.geotools.api.parameter.ParameterValueGroup; -import org.geotools.coverage.grid.GridCoverage2D; -import org.geotools.coverage.grid.GridCoverageFactory; -import org.geotools.coverage.grid.GridEnvelope2D; -import org.geotools.coverage.grid.GridGeometry2D; -import org.geotools.coverage.grid.io.AbstractGridFormat; -import org.geotools.gce.geotiff.GeoTiffFormat; -import org.geotools.gce.geotiff.GeoTiffWriteParams; -import org.geotools.gce.geotiff.GeoTiffWriter; -import org.geotools.geometry.jts.ReferencedEnvelope; -import org.geotools.referencing.crs.DefaultGeographicCRS; -import org.geotools.referencing.operation.transform.AffineTransform2D; -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.ext.traveltime.geometry.ZSampleGrid; - -public class RasterRenderer { - - static StreamingOutput createGeoTiffRaster(ZSampleGrid sampleGrid) { - int minX = sampleGrid.getXMin(); - int minY = sampleGrid.getYMin(); - int maxY = sampleGrid.getYMax(); - - int width = sampleGrid.getXMax() - minX + 1; - int height = maxY - minY + 1; - - Coordinate center = sampleGrid.getCenter(); - - double resX = sampleGrid.getCellSize().x; - double resY = sampleGrid.getCellSize().y; - - var raster = RasterFactory.createBandedRaster(DataBuffer.TYPE_INT, width, height, 1, null); - var dataBuffer = raster.getDataBuffer(); - - // Initialize with NO DATA value - for (int i = 0; i < dataBuffer.getSize(); i++) { - dataBuffer.setElem(i, Integer.MIN_VALUE); - } - - for (var s : sampleGrid) { - final WTWD z = s.getZ(); - raster.setSample(s.getX() - minX, maxY - s.getY(), 0, z.wTime / z.w); - } - - ReferencedEnvelope geom = new GridGeometry2D( - new GridEnvelope2D(0, 0, width, height), - new AffineTransform2D(resX, 0, 0, resY, center.x + resX * minX, center.y + resY * minY), - DefaultGeographicCRS.WGS84 - ) - .getEnvelope2D(); - - GridCoverage2D gridCoverage = new GridCoverageFactory().create("traveltime", raster, geom); - - GeoTiffWriteParams wp = new GeoTiffWriteParams(); - wp.setCompressionMode(MODE_EXPLICIT); - wp.setCompressionType("LZW"); - ParameterValueGroup params = new GeoTiffFormat().getWriteParameters(); - params.parameter(AbstractGridFormat.GEOTOOLS_WRITE_PARAMS.getName().toString()).setValue(wp); - return outputStream -> { - GeoTiffWriter writer = new GeoTiffWriter(outputStream); - writer.write(gridCoverage, params.values().toArray(new GeneralParameterValue[1])); - writer.dispose(); - outputStream.close(); - }; - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/SampleGridRenderer.java b/src/ext/java/org/opentripplanner/ext/traveltime/SampleGridRenderer.java deleted file mode 100644 index c72732f3515..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/SampleGridRenderer.java +++ /dev/null @@ -1,91 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.astar.model.ShortestPathTree; -import org.opentripplanner.ext.traveltime.geometry.AccumulativeGridSampler; -import org.opentripplanner.ext.traveltime.geometry.AccumulativeMetric; -import org.opentripplanner.ext.traveltime.geometry.SparseMatrixZSampleGrid; -import org.opentripplanner.ext.traveltime.geometry.ZSampleGrid; -import org.opentripplanner.ext.traveltime.spt.SPTVisitor; -import org.opentripplanner.ext.traveltime.spt.SPTWalker; -import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.vertex.Vertex; -import org.opentripplanner.street.search.state.State; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class SampleGridRenderer { - - private static final Logger LOG = LoggerFactory.getLogger(SampleGridRenderer.class); - - public static ZSampleGrid getSampleGrid( - ShortestPathTree spt, - TravelTimeRequest traveltimeRequest - ) { - final double offRoadDistanceMeters = traveltimeRequest.offRoadDistanceMeters; - final double offRoadWalkSpeedMps = 1.00; // m/s, off-road walk speed - - // Create a sample grid based on the SPT. - long t1 = System.currentTimeMillis(); - Coordinate coordinateOrigin = spt.getAllStates().iterator().next().getVertex().getCoordinate(); - final double gridSizeMeters = traveltimeRequest.precisionMeters; - final double cosLat = Math.cos(Math.toRadians(coordinateOrigin.y)); - double dY = Math.toDegrees(gridSizeMeters / SphericalDistanceLibrary.RADIUS_OF_EARTH_IN_M); - double dX = dY / cosLat; - - SparseMatrixZSampleGrid sampleGrid = new SparseMatrixZSampleGrid<>( - 16, - spt.getVertexCount(), - dX, - dY, - coordinateOrigin - ); - sampleSPT( - spt, - sampleGrid, - gridSizeMeters, - offRoadDistanceMeters, - offRoadWalkSpeedMps, - (int) traveltimeRequest.maxCutoff.getSeconds(), - cosLat - ); - - long t2 = System.currentTimeMillis(); - LOG.info("Computed sampling in {}msec", (int) (t2 - t1)); - - return sampleGrid; - } - - /** - * Sample a SPT using a SPTWalker and an AccumulativeGridSampler. - */ - public static void sampleSPT( - final ShortestPathTree spt, - final ZSampleGrid sampleGrid, - final double gridSizeMeters, - final double offRoadDistanceMeters, - final double offRoadWalkSpeedMps, - final int maxTimeSec, - final double cosLat - ) { - final AccumulativeMetric accMetric = new WTWDAccumulativeMetric( - cosLat, - offRoadDistanceMeters, - offRoadWalkSpeedMps, - gridSizeMeters - ); - final AccumulativeGridSampler gridSampler = new AccumulativeGridSampler<>( - sampleGrid, - accMetric - ); - - // At which distance we split edges along the geometry during sampling. - // For best results, this should be slighly lower than the grid size. - double walkerSplitDistanceMeters = gridSizeMeters * 0.5; - - SPTVisitor visitor = new SampleGridSPTVisitor(maxTimeSec, gridSampler, offRoadWalkSpeedMps); - new SPTWalker(spt).walk(visitor, walkerSplitDistanceMeters); - gridSampler.close(); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/SampleGridSPTVisitor.java b/src/ext/java/org/opentripplanner/ext/traveltime/SampleGridSPTVisitor.java deleted file mode 100644 index 3784bef2e48..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/SampleGridSPTVisitor.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.ext.traveltime.geometry.AccumulativeGridSampler; -import org.opentripplanner.ext.traveltime.spt.SPTVisitor; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.edge.StreetEdge; -import org.opentripplanner.street.search.state.State; - -class SampleGridSPTVisitor implements SPTVisitor { - - private final int maxTimeSec; - private final AccumulativeGridSampler gridSampler; - private final double offRoadWalkSpeedMps; - - public SampleGridSPTVisitor( - int maxTimeSec, - AccumulativeGridSampler gridSampler, - double offRoadWalkSpeedMps - ) { - this.maxTimeSec = maxTimeSec; - this.gridSampler = gridSampler; - this.offRoadWalkSpeedMps = offRoadWalkSpeedMps; - } - - @Override - public boolean accept(Edge e) { - return e instanceof StreetEdge; - } - - @Override - public void visit( - Edge e, - Coordinate c, - State s0, - State s1, - double d0, - double d1, - double speedAlongEdge - ) { - double t0 = s0.getElapsedTimeSeconds() + d0 / speedAlongEdge; - double t1 = s1.getElapsedTimeSeconds() + d1 / speedAlongEdge; - if (t0 < maxTimeSec || t1 < maxTimeSec) { - if (!Double.isInfinite(t0) || !Double.isInfinite(t1)) { - WTWD z = new WTWD(); - z.w = 1.0; - z.d = 0.0; - if (t0 < t1) { - z.wTime = t0; - z.wWalkDist = s0.getWalkDistance() + d0; - } else { - z.wTime = t1; - z.wWalkDist = s1.getWalkDistance() + d1; - } - gridSampler.addSamplingPoint(c, z, offRoadWalkSpeedMps); - } - } - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeRequest.java b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeRequest.java deleted file mode 100644 index 2b7f8cedb9e..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeRequest.java +++ /dev/null @@ -1,67 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import java.time.Duration; -import java.util.Arrays; -import java.util.List; - -/** - * A request for an travel time map. - * - * @author laurent - */ -public class TravelTimeRequest { - - public final List cutoffs; - - public final boolean includeDebugGeometry = false; - - public final int precisionMeters = 200; - - public final int offRoadDistanceMeters = 150; - - public final Duration maxCutoff; - - public final Duration maxAccessDuration; - public final Duration maxEgressDuration; - - public TravelTimeRequest( - List cutoffList, - Duration defaultAccessDuration, - Duration defaultEgressDuration - ) { - this.cutoffs = cutoffList; - this.maxCutoff = cutoffs.stream().max(Duration::compareTo).orElseThrow(); - if (maxCutoff.compareTo(defaultAccessDuration) < 0) { - maxAccessDuration = maxCutoff; - } else { - maxAccessDuration = defaultAccessDuration; - } - - if (maxCutoff.compareTo(defaultEgressDuration) < 0) { - maxEgressDuration = maxCutoff; - } else { - maxEgressDuration = defaultEgressDuration; - } - } - - @Override - public int hashCode() { - return cutoffs.hashCode(); - } - - @Override - public boolean equals(Object other) { - if (other instanceof TravelTimeRequest otherReq) { - return this.cutoffs.equals(otherReq.cutoffs); - } - return false; - } - - public String toString() { - return String.format( - "", - Arrays.toString(cutoffs.toArray()), - precisionMeters - ); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java deleted file mode 100644 index 67d8bb0d6cb..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeResource.java +++ /dev/null @@ -1,305 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import jakarta.ws.rs.DefaultValue; -import jakarta.ws.rs.GET; -import jakarta.ws.rs.Path; -import jakarta.ws.rs.Produces; -import jakarta.ws.rs.QueryParam; -import jakarta.ws.rs.core.Context; -import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Response; -import jakarta.ws.rs.core.StreamingOutput; -import java.time.Instant; -import java.time.LocalDate; -import java.time.Period; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.temporal.ChronoUnit; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import org.geotools.data.geojson.GeoJSONWriter; -import org.opentripplanner.api.common.LocationStringParser; -import org.opentripplanner.api.parameter.QualifiedModeSet; -import org.opentripplanner.astar.model.ShortestPathTree; -import org.opentripplanner.ext.traveltime.geometry.ZSampleGrid; -import org.opentripplanner.framework.time.DurationUtils; -import org.opentripplanner.framework.time.ServiceDateUtils; -import org.opentripplanner.raptor.RaptorService; -import org.opentripplanner.raptor.api.model.RaptorAccessEgress; -import org.opentripplanner.raptor.api.model.SearchDirection; -import org.opentripplanner.raptor.api.request.RaptorProfile; -import org.opentripplanner.raptor.api.request.RaptorRequestBuilder; -import org.opentripplanner.raptor.api.response.RaptorResponse; -import org.opentripplanner.raptor.api.response.StopArrivals; -import org.opentripplanner.routing.algorithm.raptoradapter.router.street.AccessEgressRouter; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.DefaultAccessEgress; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripSchedule; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.AccessEgressMapper; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.RaptorRoutingRequestTransitData; -import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.RouteRequestTransitDataProviderFilter; -import org.opentripplanner.routing.api.request.RouteRequest; -import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.routing.api.request.request.StreetRequest; -import org.opentripplanner.routing.api.request.request.filter.SelectRequest; -import org.opentripplanner.routing.api.request.request.filter.TransitFilterRequest; -import org.opentripplanner.routing.graph.Graph; -import org.opentripplanner.routing.graphfinder.NearbyStop; -import org.opentripplanner.standalone.api.OtpServerRequestContext; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.vertex.Vertex; -import org.opentripplanner.street.search.StreetSearchBuilder; -import org.opentripplanner.street.search.TemporaryVerticesContainer; -import org.opentripplanner.street.search.request.StreetSearchRequest; -import org.opentripplanner.street.search.request.StreetSearchRequestMapper; -import org.opentripplanner.street.search.state.State; -import org.opentripplanner.street.search.state.StateData; -import org.opentripplanner.street.search.strategy.DominanceFunctions; -import org.opentripplanner.transit.model.basic.MainAndSubMode; -import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.service.TransitService; - -@Path("/traveltime") -public class TravelTimeResource { - - private final RouteRequest routingRequest; - private final RaptorRoutingRequestTransitData requestTransitDataProvider; - private final Instant startTime; - private final Instant endTime; - private final ZonedDateTime startOfTime; - private final TravelTimeRequest traveltimeRequest; - private final RaptorService raptorService; - private final Graph graph; - private final TransitService transitService; - - public TravelTimeResource( - @Context OtpServerRequestContext serverContext, - @QueryParam("location") String location, - @QueryParam("time") String time, - @QueryParam("cutoff") @DefaultValue("60m") List cutoffs, - @QueryParam("modes") String modes, - @QueryParam("arriveBy") @DefaultValue("false") boolean arriveBy - ) { - this.graph = serverContext.graph(); - this.transitService = serverContext.transitService(); - routingRequest = serverContext.defaultRouteRequest(); - routingRequest.setArriveBy(arriveBy); - - if (modes != null) { - var modeSet = new QualifiedModeSet(modes); - routingRequest.journey().setModes(modeSet.getRequestModes()); - var transitModes = modeSet.getTransitModes().stream().map(MainAndSubMode::new).toList(); - var select = SelectRequest.of().withTransportModes(transitModes).build(); - var request = TransitFilterRequest.of().addSelect(select).build(); - routingRequest.journey().transit().setFilters(List.of(request)); - } - - var durationForMode = routingRequest.preferences().street().accessEgress().maxDuration(); - traveltimeRequest = - new TravelTimeRequest( - cutoffs.stream().map(DurationUtils::duration).toList(), - durationForMode.valueOf(getAccessRequest(routingRequest).mode()), - durationForMode.valueOf(getEgressRequest(routingRequest).mode()) - ); - - var parsedLocation = LocationStringParser.fromOldStyleString(location); - var requestTime = time != null ? Instant.parse(time) : Instant.now(); - routingRequest.setDateTime(requestTime); - - if (routingRequest.arriveBy()) { - startTime = requestTime.minus(traveltimeRequest.maxCutoff); - endTime = requestTime; - routingRequest.setTo(parsedLocation); - } else { - startTime = requestTime; - endTime = startTime.plus(traveltimeRequest.maxCutoff); - routingRequest.setFrom(parsedLocation); - } - - ZoneId zoneId = transitService.getTimeZone(); - LocalDate startDate = LocalDate.ofInstant(startTime, zoneId); - LocalDate endDate = LocalDate.ofInstant(endTime, zoneId); - startOfTime = ServiceDateUtils.asStartOfService(startDate, zoneId); - - requestTransitDataProvider = - new RaptorRoutingRequestTransitData( - transitService.getRealtimeTransitLayer(), - startOfTime, - 0, - (int) Period.between(startDate, endDate).get(ChronoUnit.DAYS), - new RouteRequestTransitDataProviderFilter(routingRequest), - routingRequest - ); - - raptorService = new RaptorService<>(serverContext.raptorConfig()); - } - - @GET - @Path("/isochrone") - @Produces(MediaType.APPLICATION_JSON) - public Response getIsochrones() { - ZSampleGrid sampleGrid = getSampleGrid(); - - var isochrones = IsochroneRenderer.renderIsochrones(sampleGrid, traveltimeRequest); - var features = IsochroneRenderer.makeContourFeatures(isochrones); - - StreamingOutput out = outputStream -> { - try (final GeoJSONWriter geoJSONWriter = new GeoJSONWriter(outputStream)) { - geoJSONWriter.writeFeatureCollection(features); - } - }; - - return Response.ok().entity(out).build(); - } - - @GET - @Path("/surface") - @Produces("image/tiff") - public Response getSurface() { - ZSampleGrid sampleGrid = getSampleGrid(); - StreamingOutput streamingOutput = RasterRenderer.createGeoTiffRaster(sampleGrid); - return Response.ok().entity(streamingOutput).build(); - } - - private ZSampleGrid getSampleGrid() { - try ( - var temporaryVertices = new TemporaryVerticesContainer( - graph, - routingRequest, - getAccessRequest(routingRequest).mode(), - StreetMode.NOT_SET - ) - ) { - var accessList = getAccess(temporaryVertices); - var arrivals = route(accessList).getArrivals(); - var spt = getShortestPathTree(temporaryVertices, arrivals); - return SampleGridRenderer.getSampleGrid(spt, traveltimeRequest); - } - } - - private Collection getAccess(TemporaryVerticesContainer temporaryVertices) { - final Collection accessStops = AccessEgressRouter.streetSearch( - routingRequest, - temporaryVertices, - transitService, - getAccessRequest(routingRequest), - null, - routingRequest.arriveBy(), - traveltimeRequest.maxAccessDuration, - 0 - ); - return AccessEgressMapper.mapNearbyStops(accessStops, routingRequest.arriveBy()); - } - - private ShortestPathTree getShortestPathTree( - TemporaryVerticesContainer temporaryVertices, - StopArrivals arrivals - ) { - return StreetSearchBuilder - .of() - .setSkipEdgeStrategy( - new PostTransitSkipEdgeStrategy( - traveltimeRequest.maxEgressDuration, - routingRequest.dateTime(), - routingRequest.arriveBy() - ) - ) - .setRequest(routingRequest) - .setStreetRequest(getEgressRequest(routingRequest)) - .setVerticesContainer(temporaryVertices) - .setDominanceFunction(new DominanceFunctions.EarliestArrival()) - .setInitialStates(getInitialStates(arrivals, temporaryVertices)) - .getShortestPathTree(); - } - - private List getInitialStates( - StopArrivals arrivals, - TemporaryVerticesContainer temporaryVertices - ) { - List initialStates = new ArrayList<>(); - - StreetSearchRequest directStreetSearchRequest = StreetSearchRequestMapper - .map(routingRequest) - .withMode(routingRequest.journey().direct().mode()) - .withArriveBy(routingRequest.arriveBy()) - .build(); - - List directStateDatas = StateData.getInitialStateDatas(directStreetSearchRequest); - - Set vertices = routingRequest.arriveBy() - ? temporaryVertices.getToVertices() - : temporaryVertices.getFromVertices(); - for (var vertex : vertices) { - for (var stateData : directStateDatas) { - initialStates.add(new State(vertex, startTime, stateData, directStreetSearchRequest)); - } - } - - StreetSearchRequest egressStreetSearchRequest = StreetSearchRequestMapper - .map(routingRequest) - .withMode(getEgressRequest(routingRequest).mode()) - .withArriveBy(routingRequest.arriveBy()) - .build(); - - for (RegularStop stop : transitService.listRegularStops()) { - int index = stop.getIndex(); - if (!arrivals.reachedByTransit(index)) { - continue; - } - final int arrivalTime = arrivals.bestTransitArrivalTime(index); - Vertex v = graph.getStopVertexForStopId(stop.getId()); - if (v == null) { - continue; - } - Instant time = startOfTime.plusSeconds(arrivalTime).toInstant(); - List egressStateDatas = StateData.getInitialStateDatas( - egressStreetSearchRequest, - mode -> new TravelTimeStateData(mode, time.getEpochSecond()) - ); - for (var stopStateData : egressStateDatas) { - State s = new State(v, time, stopStateData, directStreetSearchRequest); - s.weight = - routingRequest.arriveBy() - ? time.until(endTime, ChronoUnit.SECONDS) - : startTime.until(time, ChronoUnit.SECONDS); - initialStates.add(s); - } - } - return initialStates; - } - - private RaptorResponse route(Collection accessList) { - RaptorRequestBuilder builder = new RaptorRequestBuilder<>(); - - builder - .profile(RaptorProfile.BEST_TIME) - .searchParams() - .earliestDepartureTime(ServiceDateUtils.secondsSinceStartOfTime(startOfTime, startTime)) - .latestArrivalTime(ServiceDateUtils.secondsSinceStartOfTime(startOfTime, endTime)) - .searchOneIterationOnly() - .timetable(false) - .allowEmptyAccessEgressPaths(true) - .constrainedTransfers(false); // TODO: Not compatible with best times - - if (routingRequest.arriveBy()) { - builder.searchDirection(SearchDirection.REVERSE).searchParams().addEgressPaths(accessList); - } else { - builder.searchDirection(SearchDirection.FORWARD).searchParams().addAccessPaths(accessList); - } - - return raptorService.route(builder.build(), requestTransitDataProvider); - } - - private StreetRequest getAccessRequest(RouteRequest accessRequest) { - return routingRequest.arriveBy() - ? accessRequest.journey().egress() - : accessRequest.journey().access(); - } - - private StreetRequest getEgressRequest(RouteRequest accessRequest) { - return routingRequest.arriveBy() - ? accessRequest.journey().access() - : accessRequest.journey().egress(); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeStateData.java b/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeStateData.java deleted file mode 100644 index 1c1ad71ae4f..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/TravelTimeStateData.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.street.search.state.StateData; - -public class TravelTimeStateData extends StateData { - - protected final long postTransitDepartureTime; - - public TravelTimeStateData(StreetMode streetMode, long postTransitDepartureTime) { - super(streetMode); - this.postTransitDepartureTime = postTransitDepartureTime; - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/WTWD.java b/src/ext/java/org/opentripplanner/ext/traveltime/WTWD.java deleted file mode 100644 index a86af8c7b3c..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/WTWD.java +++ /dev/null @@ -1,32 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -/** - * The default TZ data we keep for each sample: Weighted Time and Walk Distance - *

              - * For now we keep all possible values in the vector; we may want to remove the values that will not - * be used in the process (for example # of boardings). Currently, the filtering is done afterwards, - * it may be faster and surely less memory-intensive to do the filtering when processing. - * - * @author laurent - */ -public class WTWD { - - /* Total weight */ - public double w; - - // TODO Add generalized cost - - /* Weighted sum of time in seconds */ - public double wTime; - - /* Weighted sum of walk distance in meters */ - public double wWalkDist; - - /* Minimum off-road distance to any sample */ - public double d; - - @Override - public String toString() { - return String.format("[t/w=%f,w=%f,d=%f]", wTime / w, w, d); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/WTWDAccumulativeMetric.java b/src/ext/java/org/opentripplanner/ext/traveltime/WTWDAccumulativeMetric.java deleted file mode 100644 index 14186d54082..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/WTWDAccumulativeMetric.java +++ /dev/null @@ -1,98 +0,0 @@ -package org.opentripplanner.ext.traveltime; - -import java.util.ArrayList; -import java.util.List; -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.ext.traveltime.geometry.AccumulativeMetric; -import org.opentripplanner.ext.traveltime.geometry.ZSamplePoint; -import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; - -/** - * Any given sample is weighted according to the inverse of the squared normalized distance + 1 to - * the grid sample. We add to the sampling time a default off-road walk distance to account for - * off-road sampling. TODO how does this "account" for off-road sampling ? - */ -public class WTWDAccumulativeMetric implements AccumulativeMetric { - - private final double cosLat; - private final double offRoadDistanceMeters; - private final double offRoadSpeed; - private final double gridSizeMeters; - - public WTWDAccumulativeMetric( - double cosLat, - double offRoadDistanceMeters, - double offRoadSpeed, - double gridSizeMeters - ) { - this.cosLat = cosLat; - this.offRoadDistanceMeters = offRoadDistanceMeters; - this.offRoadSpeed = offRoadSpeed; - this.gridSizeMeters = gridSizeMeters; - } - - @Override - public WTWD cumulateSample(Coordinate C0, Coordinate Cs, WTWD z, WTWD zS, double offRoadSpeed) { - double t = z.wTime / z.w; - double wd = z.wWalkDist / z.w; - double d = SphericalDistanceLibrary.fastDistance(C0, Cs, cosLat); - // additional time - double dt = d / offRoadSpeed; - /* - * Compute weight for time. The weight function to distance here is somehow arbitrary. - * Its only purpose is to weight the samples when there is various samples within the - * same "cell", giving more weight to the closest samples to the cell center. - */ - double w = 1 / ((d + gridSizeMeters) * (d + gridSizeMeters)); - if (zS == null) { - zS = new WTWD(); - zS.d = Double.MAX_VALUE; - } - zS.w = zS.w + w; - zS.wTime = zS.wTime + w * (t + dt); - zS.wWalkDist = zS.wWalkDist + w * (wd + d); - if (d < zS.d) { - zS.d = d; - } - return zS; - } - - /** - * A Generated closing sample take 1) as off-road distance, the minimum of the off-road distance - * of all enclosing samples, plus the grid size, and 2) as time the minimum time of all enclosing - * samples plus the grid size * off-road walk speed as additional time. All this are - * approximations. - *

              - * TODO Is there a better way of computing this? Here the computation will be different - * based on the order where we close the samples. - */ - @Override - public boolean closeSample(ZSamplePoint point) { - double dMin = Double.MAX_VALUE; - double tMin = Double.MAX_VALUE; - double wdMin = Double.MAX_VALUE; - List zz = new ArrayList<>(4); - if (point.up() != null) zz.add(point.up().getZ()); - if (point.down() != null) zz.add(point.down().getZ()); - if (point.right() != null) zz.add(point.right().getZ()); - if (point.left() != null) zz.add(point.left().getZ()); - for (WTWD z : zz) { - if (z.d < dMin) dMin = z.d; - double t = z.wTime / z.w; - if (t < tMin) tMin = t; - double wd = z.wWalkDist / z.w; - if (wd < wdMin) wdMin = wd; - } - WTWD z = new WTWD(); - z.w = 1.0; - /* - * The computations below are approximation, but we are on the edge anyway and the - * current sample does not correspond to any computed value. - */ - z.wTime = tMin + gridSizeMeters / offRoadSpeed; - z.wWalkDist = wdMin + gridSizeMeters; - z.d = dMin + gridSizeMeters; - point.setZ(z); - return dMin > offRoadDistanceMeters; - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeGridSampler.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeGridSampler.java deleted file mode 100644 index 32a6e3c6c62..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeGridSampler.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import java.util.ArrayList; -import java.util.List; -import org.locationtech.jts.geom.Coordinate; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Helper class to fill-in a ZSampleGrid from a given loosely-defined set of sampling points. - * - * The process is customized by an "accumulative" metric which gives the behavior of cumulating - * several values onto one sampling point. - * - * To use this class, create an instance giving an AccumulativeMetric implementation as parameter. - * Then for each source sample, call "addSample" with the its TZ value. At the end, call close() to - * close the sample grid (ie add grid node at the edge to make sure borders are correctly defined, - * the definition of correct is left to the client). - * - * @author laurent - */ -public class AccumulativeGridSampler { - - private static final Logger LOG = LoggerFactory.getLogger(AccumulativeGridSampler.class); - - private final AccumulativeMetric metric; - - private final ZSampleGrid sampleGrid; - - private boolean closed = false; - - /** - * @param metric TZ data "behavior" and "metric". - */ - public AccumulativeGridSampler(ZSampleGrid sampleGrid, AccumulativeMetric metric) { - this.metric = metric; - this.sampleGrid = sampleGrid; - } - - public final void addSamplingPoint(Coordinate C0, TZ z, double offRoadSpeed) { - if (closed) throw new IllegalStateException("Can't add a sample after closing."); - int[] xy = sampleGrid.getLowerLeftIndex(C0); - int x = xy[0]; - int y = xy[1]; - List> ABCD = List.of( - sampleGrid.getOrCreate(x, y), - sampleGrid.getOrCreate(x + 1, y), - sampleGrid.getOrCreate(x, y + 1), - sampleGrid.getOrCreate(x + 1, y + 1) - ); - for (ZSamplePoint P : ABCD) { - Coordinate C = sampleGrid.getCoordinates(P); - P.setZ(metric.cumulateSample(C0, C, z, P.getZ(), offRoadSpeed)); - } - } - - /** - * Surround all existing samples on the edge by a layer of closing samples. - */ - public final void close() { - if (closed) return; - closed = true; - List> processList = new ArrayList<>(sampleGrid.size()); - for (ZSamplePoint A : sampleGrid) { - processList.add(A); - } - int round = 0; - int n = 0; - while (!processList.isEmpty()) { - List> newProcessList = new ArrayList<>(processList.size()); - for (ZSamplePoint A : processList) { - if (A.right() == null) { - ZSamplePoint B = closeSample(A.getX() + 1, A.getY()); - if (B != null) newProcessList.add(B); - n++; - } - if (A.left() == null) { - ZSamplePoint B = closeSample(A.getX() - 1, A.getY()); - if (B != null) newProcessList.add(B); - n++; - } - if (A.up() == null) { - ZSamplePoint B = closeSample(A.getX(), A.getY() + 1); - if (B != null) newProcessList.add(B); - n++; - } - if (A.down() == null) { - ZSamplePoint B = closeSample(A.getX(), A.getY() - 1); - if (B != null) newProcessList.add(B); - n++; - } - } - processList = newProcessList; - LOG.debug("Round {} : next process list {}", round, processList.size()); - round++; - } - LOG.info("Added {} closing samples to get a total of {}.", n, sampleGrid.size()); - } - - private ZSamplePoint closeSample(int x, int y) { - ZSamplePoint A = sampleGrid.getOrCreate(x, y); - boolean ok = metric.closeSample(A); - if (ok) { - return null; - } else { - return A; - } - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeMetric.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeMetric.java deleted file mode 100644 index 2f7d18c409a..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/AccumulativeMetric.java +++ /dev/null @@ -1,34 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import org.locationtech.jts.geom.Coordinate; - -/** - * An accumulative metric give the behavior of combining several samples to a regular sample grid, - * ie how we should weight and add several TZ values from inside a cell to compute the cell corner - * TZ values. - * - * @author laurent - */ -public interface AccumulativeMetric { - /** - * Callback function to handle a new added sample. - * - * @param C0 The initial position of the sample, as given in the addSample() call. - * @param Cs The position of the sample on the grid, never farther away than (dX,dY) - * @param z The z value of the initial sample, as given in the addSample() call. - * @param zS The previous z value of the sample. Can be null if this is the first time, - * it's up to the caller to initialize the z value. - * @param offRoadSpeed The offroad speed to assume. - * @return The modified z value for the sample. - */ - TZ cumulateSample(Coordinate C0, Coordinate Cs, TZ z, TZ zS, double offRoadSpeed); - - /** - * Callback function to handle a "closing" sample (that is a sample post-created to surround - * existing samples and provide nice and smooth edges for the algorithm). - * - * @param point The point to set Z. - * @return True if the point "close" the set. - */ - boolean closeSample(ZSamplePoint point); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayEdge.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayEdge.java deleted file mode 100644 index ad3a6623044..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayEdge.java +++ /dev/null @@ -1,46 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -/** - * A DelaunayEdge is a directed segment between two DelaunayPoints of the triangulation. - *

              - * The interface is kept minimal for isoline building purposes. - * - * @author laurent - */ -interface DelaunayEdge { - /** - * @return The start point (node) of this edge. - */ - DelaunayPoint getA(); - - /** - * @return The end point (node) of this edge. - */ - DelaunayPoint getB(); - - /** - * @param ccw true (CCW) for A->B left edge, false (CW) for right edge. - * @return The edge starting at B, going right or left. - */ - DelaunayEdge getEdge1(boolean ccw); - - /** - * @param ccw For same value of ccw, will return the same side as getEdge1(). - * @return The edge starting at A, going right or left. - */ - DelaunayEdge getEdge2(boolean ccw); - - /** - * HACK. This should not be here really. But with Java, attaching some user value to an object - * rely on another level of indirection and costly maps/arrays. Exposing this flag directly here - * saves *lots* of processing time. TODO Is there a better way to do that? - * - * @return The flag set by setProcessed. - */ - boolean isProcessed(); - - /** - * - */ - void setProcessed(boolean processed); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayIsolineBuilder.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayIsolineBuilder.java deleted file mode 100644 index f669df864b9..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayIsolineBuilder.java +++ /dev/null @@ -1,192 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import static org.locationtech.jts.geom.CoordinateArrays.toCoordinateArray; -import static org.locationtech.jts.geom.GeometryFactory.toGeometryArray; -import static org.locationtech.jts.geom.GeometryFactory.toLinearRingArray; -import static org.locationtech.jts.geom.GeometryFactory.toPolygonArray; - -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.List; -import java.util.Queue; -import org.locationtech.jts.algorithm.Area; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.geom.GeometryFactory; -import org.locationtech.jts.geom.LinearRing; -import org.locationtech.jts.geom.MultiPolygon; -import org.locationtech.jts.geom.Polygon; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Compute isoline based on a Delaunay triangulation of z samplings. - * - * It will compute an isoline for a given z0 value. The isoline is composed of a list of n polygons, - * CW for normal polygons, CCW for "holes". The isoline computation can be called multiple times on - * the same builder for different z0 value: this will reduce the number of Fz sampling as they are - * cached in the builder, and reduce the number of time the Delaunay triangulation has to be built. - * - * The algorithm is rather simple: for each edges of the triangulation check if the edge is - * "cutting" (ie crossing the z0 plane). Then start for each unprocessed cutting edge using a walk - * algorithm, keeping high z0 always one the same side, to build a set of closed polygons. Then - * process each polygon to punch holes: a CW polygon is a hole in a larger CCW polygon, a CCW - * polygon is an island (shell). - * - * @author laurent - */ -public class DelaunayIsolineBuilder implements IsolineBuilder { - - private static final Logger LOG = LoggerFactory.getLogger(DelaunayIsolineBuilder.class); - - private final ZMetric zMetric; - - private final DelaunayTriangulation triangulation; - - private final GeometryFactory geometryFactory = new GeometryFactory(); - - private final List debugGeom = new ArrayList<>(); - - private boolean debug = false; - - /** - * Create an object to compute isolines. One may call several time computeIsoline on the same - * object, with different z0 values. - * - * @param triangulation The triangulation to process. Must be closed (no edge at the border - * should intersect). - * @param zMetric The Z metric (intersection detection and interpolation method). - */ - public DelaunayIsolineBuilder(DelaunayTriangulation triangulation, ZMetric zMetric) { - this.triangulation = triangulation; - this.zMetric = zMetric; - } - - public void setDebug(boolean debug) { - this.debug = debug; - } - - @Override - public Geometry computeIsoline(TZ z0) { - Queue> processQ = new ArrayDeque<>(triangulation.edgesCount()); - for (DelaunayEdge e : triangulation.edges()) { - e.setProcessed(false); - processQ.add(e); - } - - if (debug) generateDebugGeometry(z0); - - List rings = new ArrayList<>(); - while (!processQ.isEmpty()) { - DelaunayEdge e = processQ.remove(); - if (e.isProcessed()) continue; - e.setProcessed(true); - int cut = zMetric.cut(e.getA().getZ(), e.getB().getZ(), z0); - if (cut == 0) { - continue; // While, next edge - } - List polyPoints = new ArrayList<>(); - boolean ccw = cut > 0; - while (true) { - // Add a point to polyline - Coordinate cA = e.getA().getCoordinates(); - Coordinate cB = e.getB().getCoordinates(); - double k = zMetric.interpolate(e.getA().getZ(), e.getB().getZ(), z0); - Coordinate cC = new Coordinate(cA.x * (1.0 - k) + cB.x * k, cA.y * (1.0 - k) + cB.y * k); - polyPoints.add(cC); - e.setProcessed(true); - DelaunayEdge E1 = e.getEdge1(ccw); - DelaunayEdge E2 = e.getEdge2(ccw); - int cut1 = E1 == null ? 0 : zMetric.cut(E1.getA().getZ(), E1.getB().getZ(), z0); - int cut2 = E2 == null ? 0 : zMetric.cut(E2.getA().getZ(), E2.getB().getZ(), z0); - boolean ok1 = cut1 != 0 && !E1.isProcessed(); - boolean ok2 = cut2 != 0 && !E2.isProcessed(); - if (ok1) { - e = E1; - ccw = cut1 > 0; - } else if (ok2) { - e = E2; - ccw = cut2 > 0; - } else { - // This must be the end of the polyline... - break; - } - } - // Close the polyline - polyPoints.add(polyPoints.get(0)); - if (polyPoints.size() > 5) { - // If the ring is smaller than 4 points do not add it, - // that will remove too small islands or holes. - LinearRing ring = geometryFactory.createLinearRing(toCoordinateArray(polyPoints)); - rings.add(ring); - } - } - return punchHoles(rings); - } - - private void generateDebugGeometry(TZ z0) { - debug = false; - for (DelaunayEdge e : triangulation.edges()) { - Coordinate cA = e.getA().getCoordinates(); - Coordinate cB = e.getB().getCoordinates(); - debugGeom.add(geometryFactory.createLineString(new Coordinate[] { cA, cB })); - if (zMetric.cut(e.getA().getZ(), e.getB().getZ(), z0) != 0) { - double k = zMetric.interpolate(e.getA().getZ(), e.getB().getZ(), z0); - Coordinate cC = new Coordinate(cA.x * (1.0 - k) + cB.x * k, cA.y * (1.0 - k) + cB.y * k); - debugGeom.add(geometryFactory.createPoint(cC)); - } - } - } - - public final Geometry getDebugGeometry() { - return geometryFactory.createGeometryCollection(toGeometryArray(debugGeom)); - } - - @SuppressWarnings("unchecked") - private MultiPolygon punchHoles(List rings) { - List shells = new ArrayList<>(rings.size()); - List holes = new ArrayList<>(rings.size() / 2); - // 1. Split the polygon list in two: shells and holes (CCW and CW) - for (LinearRing ring : rings) { - if (Area.ofRingSigned(ring.getCoordinateSequence()) > 0.0) { - holes.add(ring); - } else { - shells.add(geometryFactory.createPolygon(ring)); - } - } - // 2. Sort the shells based on number of points to optimize step 3. - shells.sort((o1, o2) -> o2.getNumPoints() - o1.getNumPoints()); - for (Polygon shell : shells) { - shell.setUserData(new ArrayList()); - } - // 3. For each hole, determine which shell it fits in. - int nHolesFailed = 0; - for (LinearRing hole : holes) { - outer:{ - // Probably most of the time, the first shell will be the one - for (Polygon shell : shells) { - if (shell.contains(hole)) { - ((List) shell.getUserData()).add(hole); - break outer; - } - } - // This should not happen, but do not break bad here - // as loosing a hole is not critical, we still have - // sensible data to return. - nHolesFailed += 1; - } - } - if (nHolesFailed > 0) { - LOG.error("Could not find a shell for {} holes.", nHolesFailed); - } - // 4. Build the list of punched polygons - List punched = new ArrayList<>(shells.size()); - for (Polygon shell : shells) { - List shellHoles = ((List) shell.getUserData()); - punched.add( - geometryFactory.createPolygon(shell.getExteriorRing(), toLinearRingArray(shellHoles)) - ); - } - return geometryFactory.createMultiPolygon(toPolygonArray(punched)); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayPoint.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayPoint.java deleted file mode 100644 index 9bfb5f04882..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayPoint.java +++ /dev/null @@ -1,20 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import org.locationtech.jts.geom.Coordinate; - -/** - * A DelaunayPoint is the geometrical point of a node of the triangulation. - * - * @author laurent - */ -interface DelaunayPoint { - /** - * @return The geometric location of this point. - */ - Coordinate getCoordinates(); - - /** - * @return The Z value for this point. - */ - TZ getZ(); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayTriangulation.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayTriangulation.java deleted file mode 100644 index cfd3ae3db59..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/DelaunayTriangulation.java +++ /dev/null @@ -1,16 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -/** - * A Delaunay triangulation (adapted to isoline building). - * - * A simple interface returning a collection (an iterable) of DelaunayEdges. The interface is kept - * minimal for isoline building purposes. - * - * @author laurent - * @param The value stored for each node. - */ -public interface DelaunayTriangulation { - int edgesCount(); - - Iterable> edges(); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/IsolineBuilder.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/IsolineBuilder.java deleted file mode 100644 index 4dd775e948d..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/IsolineBuilder.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import org.locationtech.jts.geom.Geometry; - -/** - * Generic interface for a class that compute an isoline out of a TZ 2D "field". - * - * @author laurent - */ -public interface IsolineBuilder { - Geometry computeIsoline(TZ z0); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrix.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrix.java deleted file mode 100644 index e1a61c224ca..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrix.java +++ /dev/null @@ -1,167 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -/** - * A fast sparse 2D matrix holding elements of type T. - * The x and y indexes into the sparse matrix are _signed_ 32-bit integers (negative indexes are allowed). - * Square sub-chunks of size chunkSize x chunkSize are stored in a hashmap, - * keyed on a combination of the x and y coordinates. - * Does not implement the collection interface for simplicity and speed. - * Not thread-safe! - * - * @author laurent - */ -public class SparseMatrix implements Iterable { - - private int shift; // How many low order bits to shift off to get the index of a chunk. - - private final int mask; // The low order bits to retain when finding the index within a chunk. - - private final Map chunks; - - int size = 0; // The number of elements currently stored in this matrix (number of cells containing a T). - - int matSize; // The capacity of a single chunk TODO rename - - int chunkSize; // The dimension of a single chunk in each of two dimensions TODO rename - - public int xMin, xMax, yMin, yMax; // The maximum and minimum indices where an element is stored. - - /** - * @param chunkSize Must be a power of two so chunk indexes can be determined by shifting off low order bits. - * Keep it small (8, 16, 32...). Chunks are square, with this many elements in each of two dimensions, - * so the number of elements in each chunk will be the square of this value. - * @param totalSize Estimated total number of elements to be stored in the matrix (actual use, not capacity). - */ - public SparseMatrix(int chunkSize, int totalSize) { - shift = 0; - this.chunkSize = chunkSize; - mask = chunkSize - 1; // all low order bits below the given power of two - this.matSize = chunkSize * chunkSize; // capacity of a single chunk - /* Find log_2 chunkSize, the number of low order bits to shift off an index to get its chunk index. */ - while (chunkSize > 1) { - if (chunkSize % 2 != 0) throw new IllegalArgumentException("Chunk size must be a power of 2"); - chunkSize /= 2; - shift++; - } - // We assume here that each chunk will be filled at ~25% (thus the x4) - this.chunks = new HashMap<>(totalSize / matSize * 4); - this.xMin = Integer.MAX_VALUE; - this.yMin = Integer.MAX_VALUE; - this.xMax = Integer.MIN_VALUE; - this.yMax = Integer.MIN_VALUE; - } - - public final T get(int x, int y) { - T[] ts = chunks.get(new Key(x, y, shift)); - if (ts == null) { - return null; - } - int index = ((x & mask) << shift) + (y & mask); - return ts[index]; - } - - @SuppressWarnings("unchecked") - public final T put(int x, int y, T t) { - /* Keep a bounding box around all matrix cells in use. */ - if (x < xMin) xMin = x; - if (x > xMax) xMax = x; - if (y < yMin) yMin = y; - if (y > yMax) yMax = y; - Key key = new Key(x, y, shift); - // Java does not allow arrays of generics. - T[] ts = chunks.computeIfAbsent(key, k -> (T[]) (new Object[matSize])); - /* Find index within chunk: concatenated low order bits of x and y. */ - int index = ((x & mask) << shift) + (y & mask); - if (ts[index] == null) size++; - ts[index] = t; - return t; - } - - public int size() { - return size; - } - - /* - * We rely on the map iterator for checking for concurrent modification exceptions. - */ - private class SparseMatrixIterator implements Iterator { - - private final Iterator mapIterator; - - private int chunkIndex = -1; - - private T[] chunk = null; - - private SparseMatrixIterator() { - mapIterator = chunks.values().iterator(); - moveToNext(); - } - - @Override - public boolean hasNext() { - return chunk != null; - } - - @Override - public T next() { - T t = chunk[chunkIndex]; - moveToNext(); - return t; - } - - @Override - public void remove() { - throw new UnsupportedOperationException("remove"); - } - - private void moveToNext() { - if (chunk == null) { - chunk = mapIterator.hasNext() ? mapIterator.next() : null; - if (chunk == null) return; // End - } - while (true) { - chunkIndex++; - if (chunkIndex == matSize) { - chunkIndex = 0; - chunk = mapIterator.hasNext() ? mapIterator.next() : null; - if (chunk == null) return; // End - } - if (chunk[chunkIndex] != null) return; - } - } - } - - @Override - public Iterator iterator() { - return new SparseMatrixIterator(); - } - - /** - * We were previously bit-shifting two 32 bit integers into a long. These are used as map keys, so they had to be - * Long objects rather than primitive long ints. This purpose-built key object should be roughly the same in terms - * of space and speed, and more readable. - */ - static class Key { - - int x, y; - - public Key(int x, int y, int shift) { - this.x = x >>> shift; // shift off low order bits (index within chunk) retaining only the chunk number - this.y = y >>> shift; // same for y coordinate - } - - @Override - public int hashCode() { - return x ^ y; - } - - @Override - public boolean equals(Object other) { - return other instanceof Key && ((Key) other).x == x && ((Key) other).y == y; - } - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrixZSampleGrid.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrixZSampleGrid.java deleted file mode 100644 index c2fa3744107..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/SparseMatrixZSampleGrid.java +++ /dev/null @@ -1,342 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import javax.annotation.Nonnull; -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.framework.lang.IntUtils; - -/** - * A generic indexed grid of Z samples. - * - * Internally use a SparseMatrix to store samples. - * - * @author laurent - */ -public final class SparseMatrixZSampleGrid - implements ZSampleGrid, DelaunayTriangulation { - - private final class SparseMatrixSamplePoint implements ZSamplePoint, DelaunayPoint { - - private int x; - - private int y; - - private TZ z; - - private SparseMatrixSamplePoint up, down, right, left; - - private GridDelaunayEdge eUp, eUpRight, eRight; - - @Override - public ZSamplePoint up() { - return up; - } - - @Override - public ZSamplePoint down() { - return down; - } - - @Override - public ZSamplePoint right() { - return right; - } - - @Override - public ZSamplePoint left() { - return left; - } - - @Override - public Coordinate getCoordinates() { - return SparseMatrixZSampleGrid.this.getCoordinates(this); - } - - @Override - public int getX() { - return this.x; - } - - @Override - public int getY() { - return this.y; - } - - @Override - public TZ getZ() { - return this.z; - } - - @Override - public void setZ(TZ z) { - this.z = z; - } - } - - private final class GridDelaunayEdge implements DelaunayEdge { - - private static final int TYPE_VERTICAL = 0; - - private static final int TYPE_HORIZONTAL = 1; - - private static final int TYPE_DIAGONAL = 2; - - private boolean processed; - - private final SparseMatrixSamplePoint A, B; - - private GridDelaunayEdge ccw1, ccw2, cw1, cw2; - - private final int type; - - private GridDelaunayEdge(SparseMatrixSamplePoint A, SparseMatrixSamplePoint B, int type) { - this.A = A; - this.B = B; - switch (type) { - case TYPE_HORIZONTAL -> A.eRight = this; - case TYPE_VERTICAL -> A.eUp = this; - case TYPE_DIAGONAL -> A.eUpRight = this; - } - this.type = type; - } - - @Override - public DelaunayPoint getA() { - return A; - } - - @Override - public DelaunayPoint getB() { - return B; - } - - @Override - public DelaunayEdge getEdge1(boolean ccw) { - return ccw ? ccw1 : cw1; - } - - @Override - public DelaunayEdge getEdge2(boolean ccw) { - return ccw ? ccw2 : cw2; - } - - @Override - public boolean isProcessed() { - return processed; - } - - @Override - public void setProcessed(boolean processed) { - this.processed = processed; - } - - @Override - public String toString() { - return "" + B.getCoordinates() + ">"; - } - } - - private final double dX, dY; - - private final Coordinate center; - - private final SparseMatrix allSamples; - - private List triangulation = null; - - /** - * @param chunkSize SparseMatrix chunk side (eg 8 or 16). See SparseMatrix. - * @param totalSize Total estimated size for pre-allocating. - * @param dX X grid size, same units as center coordinates. - * @param dY Y grid size, same units as center coordinates. - * @param center Center position of the grid. Do not need to be precise. - */ - public SparseMatrixZSampleGrid( - int chunkSize, - int totalSize, - double dX, - double dY, - Coordinate center - ) { - this.center = center; - this.dX = dX; - this.dY = dY; - allSamples = new SparseMatrix<>(chunkSize, totalSize); - } - - public ZSamplePoint getOrCreate(int x, int y) { - SparseMatrixSamplePoint A = allSamples.get(x, y); - if (A != null) return A; - A = new SparseMatrixSamplePoint(); - A.x = x; - A.y = y; - A.z = null; - SparseMatrixSamplePoint Aup = allSamples.get(x, y + 1); - if (Aup != null) { - Aup.down = A; - A.up = Aup; - } - SparseMatrixSamplePoint Adown = allSamples.get(x, y - 1); - if (Adown != null) { - Adown.up = A; - A.down = Adown; - } - SparseMatrixSamplePoint Aright = allSamples.get(x + 1, y); - if (Aright != null) { - Aright.left = A; - A.right = Aright; - } - SparseMatrixSamplePoint Aleft = allSamples.get(x - 1, y); - if (Aleft != null) { - Aleft.right = A; - A.left = Aleft; - } - allSamples.put(x, y, A); - return A; - } - - @Override - @Nonnull - public Iterator> iterator() { - return new Iterator<>() { - private final Iterator iterator = allSamples.iterator(); - - @Override - public boolean hasNext() { - return iterator.hasNext(); - } - - @Override - public ZSamplePoint next() { - return iterator.next(); - } - - @Override - public void remove() { - iterator.remove(); - } - }; - } - - @Override - public Coordinate getCoordinates(ZSamplePoint point) { - // TODO Cache the coordinates in the point? - return new Coordinate(point.getX() * dX + center.x, point.getY() * dY + center.y); - } - - @Override - public int[] getLowerLeftIndex(Coordinate C) { - return new int[] { - IntUtils.round((C.x - center.x - dX / 2) / dX), - IntUtils.round((C.y - center.y - dY / 2) / dY), - }; - } - - @Override - public Coordinate getCenter() { - return center; - } - - @Override - public Coordinate getCellSize() { - return new Coordinate(dX, dY); - } - - @Override - public int getXMin() { - return allSamples.xMin; - } - - @Override - public int getXMax() { - return allSamples.xMax; - } - - @Override - public int getYMin() { - return allSamples.yMin; - } - - @Override - public int getYMax() { - return allSamples.yMax; - } - - @Override - public int size() { - return allSamples.size(); - } - - @Override - public int edgesCount() { - if (triangulation == null) { - delaunify(); - } - return triangulation.size(); - } - - @Override - public Iterable> edges() { - if (triangulation == null) { - delaunify(); - } - return triangulation; - } - - /** - * The conversion from a grid of points to a Delaunay triangulation is trivial. Each square from - * the grid is cut through one diagonal in two triangles, the resulting output is a Delaunay - * triangulation. - */ - private void delaunify() { - triangulation = new ArrayList<>(allSamples.size() * 3); - // 1. Create unlinked edges - for (SparseMatrixSamplePoint A : allSamples) { - SparseMatrixSamplePoint B = (SparseMatrixSamplePoint) A.right(); - SparseMatrixSamplePoint D = (SparseMatrixSamplePoint) A.up(); - SparseMatrixSamplePoint C = (SparseMatrixSamplePoint) ( - B != null ? B.up() : D != null ? D.right() : null - ); - if (B != null) { - triangulation.add(new GridDelaunayEdge(A, B, GridDelaunayEdge.TYPE_HORIZONTAL)); - } - if (D != null) { - triangulation.add(new GridDelaunayEdge(A, D, GridDelaunayEdge.TYPE_VERTICAL)); - } - if (C != null) { - triangulation.add(new GridDelaunayEdge(A, C, GridDelaunayEdge.TYPE_DIAGONAL)); - } - } - // 2. Link edges - for (GridDelaunayEdge e : triangulation) { - switch (e.type) { - case GridDelaunayEdge.TYPE_HORIZONTAL -> { - e.ccw1 = e.B.eUp; - e.ccw2 = e.A.eUpRight; - e.cw1 = e.A.down == null ? null : e.A.down.eUpRight; - e.cw2 = e.A.down == null ? null : e.A.down.eUp; - } - case GridDelaunayEdge.TYPE_VERTICAL -> { - e.ccw1 = e.A.left == null ? null : e.A.left.eUpRight; - e.ccw2 = e.A.left == null ? null : e.A.left.eRight; - e.cw1 = e.B.eRight; - e.cw2 = e.A.eUpRight; - } - case GridDelaunayEdge.TYPE_DIAGONAL -> { - e.ccw1 = e.A.up == null ? null : e.A.up.eRight; - e.ccw2 = e.A.eUp; - e.cw1 = e.A.right == null ? null : e.A.right.eUp; - e.cw2 = e.A.eRight; - } - } - } - } - - @Override - public DelaunayTriangulation delaunayTriangulate() { - // We ourselves are a DelaunayTriangulation - return this; - } -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZMetric.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZMetric.java deleted file mode 100644 index 56592359240..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZMetric.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -/** - * A ZMetric is a metric for some generic TZ value. - *

              - * By metric here we understand: - *

                - *
              • Cutting detection on a range, z0 in [Za, Zb] (rely on TZ to be an ordered set)
                • - *
              • Interpolation on a range, z0 in [Za, Zb].
                • - *
              - * Cutting detection could be easily implemented using interpolation, but usually interpolating - * is rather more expansive than cutting detection, so we split the two operations. - * - * @author laurent - */ -public interface ZMetric { - /** - * Check if the edge [AB] between two samples A and B "intersect" the zz0 plane. - * - * @param zA z value for the A sample - * @param zB z value for the B sample - * @param z0 z value for the intersecting plane - * @return 0 if no intersection, -1 or +1 if intersection (depending on which is lower, A or B). - */ - int cut(TZ zA, TZ zB, TZ z0); - - /** - * Interpolate a crossing point on an edge [AB]. - * - * @param zA z value for the A sample - * @param zB z value for the B sample - * @param z0 z value for the intersecting plane - * @return k value between 0 and 1, where the crossing occurs. 0=A, 1=B. - */ - double interpolate(TZ zA, TZ zB, TZ z0); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSampleGrid.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSampleGrid.java deleted file mode 100644 index 78b694b0f79..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSampleGrid.java +++ /dev/null @@ -1,65 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -import org.locationtech.jts.geom.Coordinate; - -/** - * A generic indexed grid of TZ samples. TZ could be anything but is usually a vector of parameters. - * - * We assume some sort of equirectangular project between the index coordinates (x,y) and the - * geographic coordinates (lat, lon). The projection factor (cos phi, standard parallel) is given as - * a cell size in lat,lon degrees (dLat,dLon)). The conversion is given by the following formulae: - * - * - * lon = lon0 + x.dLon; - * lat = lat0 + y.dLat; - * (lat0,lon0) is the center, (dLat,dLon) is the cell size. - * - * @author laurent - */ -public interface ZSampleGrid extends Iterable> { - /** - * @return The sample point located at (x,y). Create a new one if not existing. - */ - ZSamplePoint getOrCreate(int x, int y); - - /** - * @param point The sample point - * @return The (lat,lon) coordinates of this sample point. - */ - Coordinate getCoordinates(ZSamplePoint point); - - /** - * @param C The geographical coordinate - * @return The (x,y) index of the lower-left index of the cell enclosing the point. - */ - int[] getLowerLeftIndex(Coordinate C); - - /** - * @return The base coordinate center (lat0,lon0) - */ - Coordinate getCenter(); - - /** - * @return The cell size (dLat,dLon) - */ - public Coordinate getCellSize(); - - public int getXMin(); - - public int getXMax(); - - public int getYMin(); - - public int getYMax(); - - int size(); - - /** - * TODO The mapping between a ZSampleGrid and a DelaunayTriangulation should not be part of an - * interface but extracted to a converter. This assume that the conversion process does not rely - * on the inner working of the ZSampleGrid implementation, which should be the case. - * - * @return This ZSampleGrid converted as a DelaunayTriangulation. - */ - DelaunayTriangulation delaunayTriangulate(); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSamplePoint.java b/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSamplePoint.java deleted file mode 100644 index 3ac2732a8f1..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/geometry/ZSamplePoint.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.opentripplanner.ext.traveltime.geometry; - -public interface ZSamplePoint { - /** - * @return The X index of this sample point. - */ - int getX(); - - /** - * @return The Y index of this sample point. - */ - int getY(); - - /** - * @return The Z value associated with this sample point. - */ - TZ getZ(); - - void setZ(TZ z); - - /** - * @return The neighboring sample point located at (x,y-1) - */ - ZSamplePoint up(); - - /** - * @return The neighboring sample point located at (x,y+1) - */ - ZSamplePoint down(); - - /** - * @return The neighboring sample point located at (x+1,y) - */ - ZSamplePoint right(); - - /** - * @return The neighboring sample point located at (x-1,y) - */ - ZSamplePoint left(); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTVisitor.java b/src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTVisitor.java deleted file mode 100644 index a47c6d7ebda..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTVisitor.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.opentripplanner.ext.traveltime.spt; - -import org.locationtech.jts.geom.Coordinate; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.search.state.State; - -public interface SPTVisitor { - /** - * @param e The edge to filter. - * @return True to visit this edge, false to skip it. - */ - boolean accept(Edge e); - - /** - * Note: The same state can be visited several times (from different edges). - * - * @param e The edge being visited (filtered from a previous call to accept) - * @param c The coordinate of the point alongside the edge geometry. - * @param s0 The state at the start vertex of this edge - * @param s1 The state at the end vertex of this edge - * @param d0 Curvilinear coordinate of c on [s0-s1], in meters - * @param d1 Curvilinear coordinate of c on [s1-s0], in meters - * @param speed The assumed speed on the edge - */ - void visit(Edge e, Coordinate c, State s0, State s1, double d0, double d1, double speed); -} diff --git a/src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTWalker.java b/src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTWalker.java deleted file mode 100644 index 52da9bd9dd5..00000000000 --- a/src/ext/java/org/opentripplanner/ext/traveltime/spt/SPTWalker.java +++ /dev/null @@ -1,146 +0,0 @@ -package org.opentripplanner.ext.traveltime.spt; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; -import org.locationtech.jts.geom.Coordinate; -import org.locationtech.jts.geom.LineString; -import org.opentripplanner.astar.model.ShortestPathTree; -import org.opentripplanner.framework.geometry.SphericalDistanceLibrary; -import org.opentripplanner.street.model.edge.Edge; -import org.opentripplanner.street.model.edge.StreetEdge; -import org.opentripplanner.street.model.vertex.Vertex; -import org.opentripplanner.street.search.TraverseMode; -import org.opentripplanner.street.search.state.State; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * Walk over a SPT tree to geometrically visit all nodes and edge geometry. For each geometry longer - * than the provided base length d0, split it in several steps of equal length and shorter than d0. - * For each walk step call the visitor callback. - * - * @author laurent - */ -public class SPTWalker { - - private static final Logger LOG = LoggerFactory.getLogger(SPTWalker.class); - - private final ShortestPathTree spt; - - public SPTWalker(ShortestPathTree spt) { - this.spt = spt; - } - - /** - * Walk over a SPT. Call a visitor for each visited point. - */ - public void walk(SPTVisitor visitor, double d0) { - int nTotal = 0, nSkippedDupEdge = 0, nSkippedNoGeometry = 0; - Collection allStates = spt.getAllStates(); - Set allVertices = new HashSet<>(spt.getVertexCount()); - for (State s : allStates) { - allVertices.add(s.getVertex()); - } - Set processedEdges = new HashSet<>(allVertices.size()); - for (Vertex v : allVertices) { - State s0 = spt.getState(v); - if (s0 == null || !s0.isFinal()) continue; - for (Edge e : s0.getVertex().getIncoming()) { - // Take only street - if (e != null && visitor.accept(e)) { - State s1 = spt.getState(e.getFromVertex()); - if (s1 == null || !s1.isFinal()) continue; - if (e.getFromVertex() != null && e.getToVertex() != null) { - // Hack alert: e.hashCode() throw NPE - if (processedEdges.contains(e)) { - nSkippedDupEdge++; - continue; - } - processedEdges.add(e); - } - Vertex vx0 = s0.getVertex(); - Vertex vx1 = s1.getVertex(); - LineString lineString = e.getGeometry(); - if (lineString == null) { - nSkippedNoGeometry++; - continue; - } - - // Compute speed along edge - double speedAlongEdge = s0.getPreferences().walk().speed(); - if (e instanceof StreetEdge se) { - /* - * Compute effective speed, taking into account end state mode (car, bike, - * walk...) and edge properties (car max speed, slope, etc...) - */ - TraverseMode mode = s0.currentMode(); - speedAlongEdge = se.calculateSpeed(s0.getPreferences(), mode, s0.isBackWalkingBike()); - if (mode != TraverseMode.CAR) { - speedAlongEdge *= se.getEffectiveBikeDistance() / se.getDistanceMeters(); - } - double avgSpeed = - se.getDistanceMeters() / Math.abs(s0.getTimeSeconds() - s1.getTimeSeconds()); - if (avgSpeed < 1e-10) { - avgSpeed = 1e-10; - } - /* - * We can't go faster than the average speed on the edge. We can go slower - * however, that simply means that one end vertice has a time higher than - * the other end vertice + time to traverse the edge (can happen due to - * max walk clamping). - */ - if (speedAlongEdge > avgSpeed) speedAlongEdge = avgSpeed; - } - - // Length of linestring - double lineStringLen = SphericalDistanceLibrary.fastLength(lineString); - visitor.visit(e, vx0.getCoordinate(), s0, s1, 0.0, lineStringLen, speedAlongEdge); - visitor.visit(e, vx1.getCoordinate(), s0, s1, lineStringLen, 0.0, speedAlongEdge); - nTotal += 2; - Coordinate[] pList = lineString.getCoordinates(); - boolean reverse = vx1.getCoordinate().equals(pList[0]); - // Split the linestring in nSteps - if (lineStringLen > d0) { - int nSteps = (int) Math.floor(lineStringLen / d0) + 1; // Number of steps - double stepLen = lineStringLen / nSteps; // Length of step - double startLen = 0; // Distance at start of current seg - double curLen = stepLen; // Distance cursor - int ns = 1; - for (int i = 0; i < pList.length - 1; i++) { - Coordinate p0 = pList[i]; - Coordinate p1 = pList[i + 1]; - double segLen = SphericalDistanceLibrary.fastDistance(p0, p1); - while (curLen - startLen < segLen) { - double k = (curLen - startLen) / segLen; - Coordinate p = new Coordinate(p0.x * (1 - k) + p1.x * k, p0.y * (1 - k) + p1.y * k); - visitor.visit( - e, - p, - reverse ? s1 : s0, - reverse ? s0 : s1, - curLen, - lineStringLen - curLen, - speedAlongEdge - ); - nTotal++; - curLen += stepLen; - ns++; - } - startLen += segLen; - if (ns >= nSteps) break; - } - } - } - } - } - LOG.info( - "SPTWalker: Generated {} points ({} dup edges, {} no geometry) from {} vertices / {} states.", - nTotal, - nSkippedDupEdge, - nSkippedNoGeometry, - allVertices.size(), - allStates.size() - ); - } -} diff --git a/src/main/java/org/opentripplanner/apis/APIEndpoints.java b/src/main/java/org/opentripplanner/apis/APIEndpoints.java index b6b70eb238e..fe8db5b3911 100644 --- a/src/main/java/org/opentripplanner/apis/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/apis/APIEndpoints.java @@ -11,7 +11,6 @@ import static org.opentripplanner.framework.application.OTPFeature.SandboxAPIGeocoder; import static org.opentripplanner.framework.application.OTPFeature.SandboxAPIMapboxVectorTilesApi; import static org.opentripplanner.framework.application.OTPFeature.SandboxAPIParkAndRideApi; -import static org.opentripplanner.framework.application.OTPFeature.SandboxAPITravelTime; import static org.opentripplanner.framework.application.OTPFeature.TransmodelGraphQlApi; import java.util.ArrayList; @@ -32,7 +31,6 @@ import org.opentripplanner.ext.restapi.resources.IndexAPI; import org.opentripplanner.ext.restapi.resources.PlannerResource; import org.opentripplanner.ext.restapi.resources.Routers; -import org.opentripplanner.ext.traveltime.TravelTimeResource; import org.opentripplanner.ext.vectortiles.VectorTilesResource; import org.opentripplanner.framework.application.OTPFeature; @@ -65,7 +63,6 @@ private APIEndpoints() { addIfEnabled(SandboxAPIGeocoder, GeocoderResource.class); // scheduled to be removed and only here for backwards compatibility addIfEnabled(SandboxAPIGeocoder, GeocoderResource.GeocoderResourceOldPath.class); - addIfEnabled(SandboxAPITravelTime, TravelTimeResource.class); // scheduled to be removed addIfEnabled(APIBikeRental, BikeRental.class); diff --git a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java index 4ae5004cf6b..29489de19f2 100644 --- a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java +++ b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java @@ -104,7 +104,6 @@ public enum OTPFeature { SandboxAPIGeocoder(false, true, "Enable the Geocoder API."), SandboxAPIMapboxVectorTilesApi(false, true, "Enable Mapbox vector tiles API."), SandboxAPIParkAndRideApi(false, true, "Enable park-and-ride endpoint."), - SandboxAPITravelTime(false, true, "Enable the isochrone/travel time surface API."), TransferAnalyzer(false, true, "Analyze transfers during graph build."); private static final Object TEST_LOCK = new Object(); diff --git a/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java b/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java index 7dabe8e2a1c..9bad7cf7222 100644 --- a/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java +++ b/src/main/java/org/opentripplanner/raptor/api/request/SearchParams.java @@ -26,7 +26,6 @@ public class SearchParams { private final boolean constrainedTransfers; private final Collection accessPaths; private final Collection egressPaths; - private final boolean allowEmptyAccessEgressPaths; /** * Default values are defined in the default constructor. @@ -42,7 +41,6 @@ private SearchParams() { constrainedTransfers = false; accessPaths = List.of(); egressPaths = List.of(); - allowEmptyAccessEgressPaths = false; } SearchParams(SearchParamsBuilder builder) { @@ -56,7 +54,6 @@ private SearchParams() { this.constrainedTransfers = builder.constrainedTransfers(); this.accessPaths = List.copyOf(builder.accessPaths()); this.egressPaths = List.copyOf(builder.egressPaths()); - this.allowEmptyAccessEgressPaths = builder.allowEmptyAccessEgressPaths(); } /** @@ -198,14 +195,6 @@ public Collection egressPaths() { return egressPaths; } - /** - * If enabled, the check for access and egress paths is skipped. This is required when wanting to - * eg. run a separate heuristic search, with no pre-defined destinations. - */ - public boolean allowEmptyAccessEgressPaths() { - return allowEmptyAccessEgressPaths; - } - /** * Get the maximum duration of any access or egress path in seconds. */ @@ -279,14 +268,8 @@ void verify() { isEarliestDepartureTimeSet() || isLatestArrivalTimeSet(), "'earliestDepartureTime' or 'latestArrivalTime' is required." ); - assertProperty( - allowEmptyAccessEgressPaths || !accessPaths.isEmpty(), - "At least one 'accessPath' is required." - ); - assertProperty( - allowEmptyAccessEgressPaths || !egressPaths.isEmpty(), - "At least one 'egressPath' is required." - ); + assertProperty(!accessPaths.isEmpty(), "At least one 'accessPath' is required."); + assertProperty(!egressPaths.isEmpty(), "At least one 'egressPath' is required."); assertProperty( !(preferLateArrival && !isLatestArrivalTimeSet()), "The 'latestArrivalTime' is required when 'departAsLateAsPossible' is set." diff --git a/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java b/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java index 517780eb69c..5774a92d6e1 100644 --- a/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java +++ b/src/main/java/org/opentripplanner/raptor/api/request/SearchParamsBuilder.java @@ -29,7 +29,6 @@ public class SearchParamsBuilder { private int maxNumberOfTransfers; private boolean timetable; private boolean constrainedTransfers; - private boolean allowEmptyAccessEgressPaths; public SearchParamsBuilder(RaptorRequestBuilder parent, SearchParams defaults) { this.parent = parent; @@ -43,7 +42,6 @@ public SearchParamsBuilder(RaptorRequestBuilder parent, SearchParams defaults this.constrainedTransfers = defaults.constrainedTransfers(); this.accessPaths.addAll(defaults.accessPaths()); this.egressPaths.addAll(defaults.egressPaths()); - this.allowEmptyAccessEgressPaths = defaults.allowEmptyAccessEgressPaths(); } public int earliestDepartureTime() { @@ -162,15 +160,6 @@ public SearchParamsBuilder addEgressPaths(RaptorAccessEgress... egressPaths) return addEgressPaths(Arrays.asList(egressPaths)); } - public SearchParamsBuilder allowEmptyAccessEgressPaths(boolean allowEmptyEgressPaths) { - this.allowEmptyAccessEgressPaths = allowEmptyEgressPaths; - return this; - } - - public boolean allowEmptyAccessEgressPaths() { - return allowEmptyAccessEgressPaths; - } - public RaptorRequest build() { return parent.build(); } diff --git a/src/main/java/org/opentripplanner/street/search/state/StateData.java b/src/main/java/org/opentripplanner/street/search/state/StateData.java index d1db14d91f4..648b2f3110c 100644 --- a/src/main/java/org/opentripplanner/street/search/state/StateData.java +++ b/src/main/java/org/opentripplanner/street/search/state/StateData.java @@ -8,7 +8,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Set; -import java.util.function.Function; import org.opentripplanner.routing.api.request.StreetMode; import org.opentripplanner.street.model.RentalFormFactor; import org.opentripplanner.street.search.TraverseMode; @@ -21,8 +20,6 @@ */ public class StateData implements Cloneable { - // TODO OTP2 Many of these could be replaced by a more generic state machine implementation - protected boolean vehicleParked; protected VehicleRentalState vehicleRentalState; @@ -56,7 +53,7 @@ public class StateData implements Cloneable { public Set noRentalDropOffZonesAtStartOfReverseSearch = Set.of(); /** Private constructor, use static methods to get a set of initial states. */ - protected StateData(StreetMode requestMode) { + private StateData(StreetMode requestMode) { currentMode = switch (requestMode) { // when renting or using a flex vehicle, you start on foot until you have found the vehicle @@ -72,25 +69,13 @@ protected StateData(StreetMode requestMode) { * Returns a set of initial StateDatas based on the options from the RouteRequest */ public static List getInitialStateDatas(StreetSearchRequest request) { - return getInitialStateDatas(request, StateData::new); - } - - /** - * Returns a set of initial StateDatas based on the options from the RouteRequest, with a custom - * StateData implementation. - */ - public static List getInitialStateDatas( - StreetSearchRequest request, - Function stateDataConstructor - ) { var rentalPreferences = request.preferences().rental(request.mode()); return getInitialStateDatas( request.mode(), request.arriveBy(), rentalPreferences != null ? rentalPreferences.allowArrivingInRentedVehicleAtDestination() - : false, - stateDataConstructor + : false ); } @@ -106,8 +91,7 @@ public static StateData getBaseCaseStateData(StreetSearchRequest request) { request.arriveBy(), rentalPreferences != null ? rentalPreferences.allowArrivingInRentedVehicleAtDestination() - : false, - StateData::new + : false ); var baseCaseDatas = @@ -143,11 +127,10 @@ public static StateData getBaseCaseStateData(StreetSearchRequest request) { private static List getInitialStateDatas( StreetMode requestMode, boolean arriveBy, - boolean allowArrivingInRentedVehicleAtDestination, - Function stateDataConstructor + boolean allowArrivingInRentedVehicleAtDestination ) { List res = new ArrayList<>(); - var proto = stateDataConstructor.apply(requestMode); + var proto = new StateData(requestMode); // carPickup searches may start and end in two distinct states: // - CAR / IN_CAR where pickup happens directly at the bus stop @@ -233,7 +216,7 @@ private static RentalFormFactor toFormFactor(StreetMode streetMode) { }; } - public StateData clone() { + protected StateData clone() { try { return (StateData) super.clone(); } catch (CloneNotSupportedException e1) { From 519a1c27aa7e8faf7b325131a50d17ace28e4c19 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 4 Jun 2024 15:44:32 +0200 Subject: [PATCH 1292/1688] Fix grammar [ci skip] --- docs/RouteRequest.md | 2 +- .../apis/transmodel/model/TransportModeSlack.java | 2 +- .../standalone/config/routerequest/RouteRequestConfig.java | 3 +-- .../org/opentripplanner/apis/transmodel/schema.graphql | 4 ++-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 52fd177fbf6..0fd9ec47f89 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -206,7 +206,7 @@ The boardSlack is the minimum extra time to board a public transport vehicle. The board time is added to the time when going from the stop (offboard) to onboard a transit vehicle. -This is the same as the `transferSlack`, except that this also apply to to the first +This is the same as the `transferSlack`, except that this also applies to to the first transit leg in the trip. This is the default value used, if not overridden by the `boardSlackList`. diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java b/src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java index ed26711de88..dd2f72c0ec9 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/TransportModeSlack.java @@ -40,7 +40,7 @@ public class TransportModeSlack { static { BOARD_SLACK_DESCRIPTION = "The boardSlack is the minimum extra time to board a public transport vehicle. This is " + - "the same as the 'minimumTransferTime', except that this also apply to to the first " + + "the same as the 'minimumTransferTime', except that this also applies to to the first " + "transit leg in the trip."; ALIGHT_SLACK_DESCRIPTION = diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 628008da220..f9ea136fbe2 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -15,7 +15,6 @@ import static org.opentripplanner.standalone.config.routerequest.WheelchairConfig.mapWheelchairPreferences; import java.time.Duration; -import java.util.List; import java.util.stream.Collectors; import org.opentripplanner.api.parameter.QualifiedModeSet; import org.opentripplanner.framework.application.OTPFeature; @@ -237,7 +236,7 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil The board time is added to the time when going from the stop (offboard) to onboard a transit vehicle. -This is the same as the `transferSlack`, except that this also apply to to the first +This is the same as the `transferSlack`, except that this also applies to to the first transit leg in the trip. This is the default value used, if not overridden by the `boardSlackList`. """ ) diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index e6f4208c643..e7d68a2e780 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -788,7 +788,7 @@ type QueryType { bicycleOptimisationMethod: BicycleOptimisationMethod = safe, "The maximum bike speed along streets, in meters per second" bikeSpeed: Float = 5.0, - "The boardSlack is the minimum extra time to board a public transport vehicle. This is the same as the 'minimumTransferTime', except that this also apply to to the first transit leg in the trip. This is the default value used, if not overridden by the 'boardSlackList'." + "The boardSlack is the minimum extra time to board a public transport vehicle. This is the same as the 'minimumTransferTime', except that this also applies to to the first transit leg in the trip. This is the default value used, if not overridden by the 'boardSlackList'." boardSlackDefault: Int = 0, "List of boardSlack for a given set of modes. Defaults: []" boardSlackList: [TransportModeSlack], @@ -987,7 +987,7 @@ type RoutingParameters { bikeRentalPickupTime: Int "Max bike speed along streets, in meters per second" bikeSpeed: Float - "The boardSlack is the minimum extra time to board a public transport vehicle. This is the same as the 'minimumTransferTime', except that this also apply to to the first transit leg in the trip. This is the default value used, if not overridden by the 'boardSlackList'." + "The boardSlack is the minimum extra time to board a public transport vehicle. This is the same as the 'minimumTransferTime', except that this also applies to to the first transit leg in the trip. This is the default value used, if not overridden by the 'boardSlackList'." boardSlackDefault: Int "List of boardSlack for a given set of modes." boardSlackList: [TransportModeSlackType] From 994d0b5f36bf2ea51a0ec0ac28792975a1388fc3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 4 Jun 2024 15:26:01 +0200 Subject: [PATCH 1293/1688] Be strict about accepting RFC3339 --- .../framework/graphql/scalar/DateScalarFactory.java | 10 +--------- .../graphql/scalar/DateScalarFactoryTest.java | 4 ++-- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java index c19add1e0cb..9b22357f38a 100644 --- a/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java +++ b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java @@ -8,7 +8,6 @@ import graphql.schema.GraphQLScalarType; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeParseException; public class DateScalarFactory { @@ -16,14 +15,7 @@ public class DateScalarFactory { private static final String DOCUMENTATION = "Local date using the ISO 8601 format: `YYYY-MM-DD`. Example: `2020-05-17`."; - private static final DateTimeFormatter FORMATTER = new DateTimeFormatterBuilder() - .optionalStart() - .append(DateTimeFormatter.ofPattern("yyyyMMdd")) - .optionalEnd() - .optionalStart() - .append(DateTimeFormatter.ISO_LOCAL_DATE) - .optionalStart() - .toFormatter(); + private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE; private DateScalarFactory() {} diff --git a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java index afc86cdf9ba..d7a3023ab2b 100644 --- a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java +++ b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java @@ -15,7 +15,7 @@ class DateScalarFactoryTest { private static final GraphQLScalarType SCALAR = DateScalarFactory.createDateScalar("Date"); @ParameterizedTest - @ValueSource(strings = { "2024-05-23", "20240523" }) + @ValueSource(strings = { "2024-05-23" }) void parse(String input) { var result = SCALAR.getCoercing().parseValue(input); assertInstanceOf(LocalDate.class, result); @@ -24,7 +24,7 @@ void parse(String input) { } @ParameterizedTest - @ValueSource(strings = { "2024-05", "2024", "2024-99-04", "202405-23" }) + @ValueSource(strings = { "2024-05", "2024", "2024-99-04", "202405-23", "20240523" }) void failParsing(String input) { assertThrows(CoercingParseValueException.class, () -> SCALAR.getCoercing().parseValue(input)); } From 782964a500117b0d96ac614e7f6306bee779416e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 4 Jun 2024 16:06:45 +0200 Subject: [PATCH 1294/1688] Update documenation about service date --- .../opentripplanner/apis/gtfs/schema.graphqls | 24 ++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index c495b821965..b21d7c863a4 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -2548,7 +2548,13 @@ enum Qualifier { } -"""Filters entity by their service dates.""" +""" +Filters entity by their service dates. + +**Note**: A service date is a technical term useful for transit planning purposes and might not +correspond to a how a passenger thinks of a calendar date. For example, a night bus running +on Sunday morning at 1am to 3am, might have the previous Saturday's service date. +""" input ServiceDateFilterInput { """ Inclusive start date of the filter. If `null` this means that no `start` filter is applied and all @@ -2721,7 +2727,13 @@ type QueryType { """Only include routes, which use one of these modes""" transportModes: [Mode] - """Only include routes whose pattern operates on at least one service date specified by this filter.""" + """ + Only include routes whose pattern operates on at least one service date specified by this filter. + + **Note**: A service date is a technical term useful for transit planning purposes and might not + correspond to a how a passenger thinks of a calendar date. For example, a night bus running + on Sunday morning at 1am to 3am, might have the previous Saturday's service date. + """ limitByPatternServiceDates: ServiceDateFilterInput ): [Route] @@ -3445,7 +3457,13 @@ type Route implements Node { """List of patterns which operate on this route""" patterns( - "Filter patterns by the service dates they operate on." + """ + Filter patterns by the service dates they operate on. + + **Note**: A service date is a technical term useful for transit planning purposes and might not + correspond to a how a passenger thinks of a calendar date. For example, a night bus running + on Sunday morning at 1am to 3am, might have the previous Saturday's service date. + """ serviceDates: ServiceDateFilterInput ): [Pattern] From 441bd5c60591dfb71c8c5c628644175872a6cf4c Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Tue, 4 Jun 2024 18:49:09 +0300 Subject: [PATCH 1295/1688] Refactor new tests to be module tests --- .../updater/trip/RealtimeTestEnvironment.java | 21 +- .../trip/TimetableSnapshotSourceTest.java | 213 ------------------ .../CancellationDeletionTest.java | 70 ++++++ .../trip/moduletests/delay/SkippedTest.java | 109 +++++++++ 4 files changed, 197 insertions(+), 216 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index 1b385df153b..e69b60b93fb 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -208,6 +208,14 @@ public TimetableSnapshot getTimetableSnapshot() { } } + public void commitTimetableSnapshot(boolean force) { + if (siriSource != null) { + siriSource.commitTimetableSnapshot(force); + } else { + gtfsSource.commitTimetableSnapshot(force); + } + } + public String getRealtimeTimetable(String tripId) { return getRealtimeTimetable(id(tripId), SERVICE_DATE); } @@ -256,15 +264,22 @@ public UpdateResult applyEstimatedTimetable(List updates) { + public UpdateResult applyTripUpdates( + List updates, + boolean differential + ) { Objects.requireNonNull(gtfsSource, "Test environment is configured for SIRI only"); return gtfsSource.applyTripUpdates( null, BackwardsDelayPropagationType.REQUIRED_NO_DATA, - true, + !differential, updates, getFeedId() ); diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 658a0eafbbc..384698668fd 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -2,14 +2,12 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.ADDED; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.CANCELED; -import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.DELETED; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.SKIPPED; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.updater.trip.BackwardsDelayPropagationType.REQUIRED_NO_DATA; @@ -565,126 +563,6 @@ public void scheduledTripWithSkippedAndNoData() { assertTrue(newTripTimes.isNoDataStop(2)); } } - - /** - * Test realtime system behavior under one very particular case from issue #5725. - * When applying differential realtime updates, an update may cancel some stops on a trip. A - * later update may then revert the trip back to its originally scheduled sequence of stops. - * When this happens, we expect the trip to be associated with a new trip pattern (where some - * stops have no pickup or dropoff) then dissociated from that new pattern and re-associated - * with its originally scheduled pattern. Any trip times that were created in timetables under - * the new stop-skipping trip pattern should also be removed. - */ - @Test - public void scheduledTripWithPreviouslySkipped() { - // Create update with a skipped stop at first - String scheduledTripId = "1.1"; - - var skippedBuilder = new TripUpdateBuilder( - scheduledTripId, - SERVICE_DATE, - SCHEDULED, - transitModel.getTimeZone() - ) - .addDelayedStopTime(1, 0) - .addSkippedStop(2) - .addDelayedStopTime(3, 90); - - var tripUpdate = skippedBuilder.build(); - - var updater = defaultUpdater(); - - // apply the update with a skipped stop - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - false, - List.of(tripUpdate), - feedId - ); - - // Force a snapshot commit. This is done to mimic normal behaviour where a new update arrives - // after the original snapshot has been committed - updater.commitTimetableSnapshot(true); - - // Create update to the same trip but now the skipped stop is no longer skipped - var scheduledBuilder = new TripUpdateBuilder( - scheduledTripId, - SERVICE_DATE, - SCHEDULED, - transitModel.getTimeZone() - ) - .addDelayedStopTime(1, 0) - .addDelayedStopTime(2, 60, 80) - .addDelayedStopTime(3, 90, 90); - - tripUpdate = scheduledBuilder.build(); - - // apply the update with the previously skipped stop now scheduled - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - false, - List.of(tripUpdate), - feedId - ); - - // Check that the there is no longer a realtime added trip pattern for the trip and that the - // stoptime updates have gone through - var snapshot = updater.getTimetableSnapshot(); - { - final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( - new FeedScopedId(feedId, scheduledTripId), - SERVICE_DATE - ); - assertNull(newTripPattern); - - final FeedScopedId tripId = new FeedScopedId(feedId, scheduledTripId); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(trip); - - final Timetable originalTimetableForToday = snapshot.resolve( - originalTripPattern, - SERVICE_DATE - ); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); - - assertNotSame(originalTimetableForToday, originalTimetableScheduled); - - final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); - assertTrue( - originalTripIndexScheduled > -1, - "Original trip should be found in scheduled time table" - ); - final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( - originalTripIndexScheduled - ); - assertFalse( - originalTripTimesScheduled.isCanceledOrDeleted(), - "Original trip times should not be canceled in scheduled time table" - ); - assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); - - final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - assertTrue( - originalTripIndexForToday > -1, - "Original trip should be found in time table for service date" - ); - final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( - originalTripIndexForToday - ); - assertEquals(RealTimeState.UPDATED, originalTripTimesForToday.getRealTimeState()); - assertEquals(0, originalTripTimesForToday.getArrivalDelay(0)); - assertEquals(0, originalTripTimesForToday.getDepartureDelay(0)); - assertEquals(60, originalTripTimesForToday.getArrivalDelay(1)); - assertEquals(80, originalTripTimesForToday.getDepartureDelay(1)); - assertEquals(90, originalTripTimesForToday.getArrivalDelay(2)); - assertEquals(90, originalTripTimesForToday.getDepartureDelay(2)); - } - } } @Nested @@ -900,97 +778,6 @@ public void repeatedlyAddedTripWithNewRoute() { assertSame(firstRoute, secondRoute); assertNotNull(transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId())); } - - static List cancelingAddedTripTestCases() { - return List.of( - // TODO we might want to change the behaviour so that only the trip without pattern is - // persisted if the added trip is cancelled - Arguments.of(CANCELED, RealTimeState.CANCELED), - Arguments.of(DELETED, RealTimeState.DELETED) - ); - } - - /** - * Test behavior of the realtime system in a case related to #5725 that is discussed at: - * https://github.com/opentripplanner/OpenTripPlanner/pull/5726#discussion_r1521653840 - * When a trip is added by a realtime message, in the realtime data indexes a corresponding - * trip pattern should be associated with the stops that trip visits. When a subsequent - * realtime message cancels or deletes that trip, the pattern should continue to be present in - * the realtime data indexes, and it should still contain the previously added trip, but that - * trip should be marked as having canceled or deleted status. At no point should the trip - * added by realtime data be present in the trip pattern for scheduled service. - */ - @ParameterizedTest - @MethodSource("cancelingAddedTripTestCases") - public void cancelingAddedTrip( - ScheduleRelationship scheduleRelationship, - RealTimeState expectedState - ) { - var builder = new TripUpdateBuilder( - addedTripId, - SERVICE_DATE, - ADDED, - transitModel.getTimeZone() - ); - - builder.addStopTime("A", 30).addStopTime("C", 40).addStopTime("E", 55); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - FULL_DATASET, - List.of(tripUpdate), - feedId - ); - - // THEN - assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, true); - - var tripDescriptorBuilder = TripDescriptor.newBuilder(); - tripDescriptorBuilder.setTripId(addedTripId); - tripDescriptorBuilder.setScheduleRelationship(scheduleRelationship); - - tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE)); - tripUpdate = TripUpdate.newBuilder().setTrip(tripDescriptorBuilder).build(); - - // WHEN - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - FULL_DATASET, - List.of(tripUpdate), - feedId - ); - - // THEN - var snapshot = updater.getTimetableSnapshot(); - var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A")); - // Get the trip pattern of the added trip which goes through stopA - var patternsAtA = snapshot.getPatternsForStop(stopA); - - assertNotNull(patternsAtA, "Added trip pattern should be found"); - var tripPattern = patternsAtA.stream().findFirst().get(); - - final Timetable forToday = snapshot.resolve(tripPattern, SERVICE_DATE); - final Timetable schedule = snapshot.resolve(tripPattern, null); - - assertNotSame(forToday, schedule); - - final int forTodayAddedTripIndex = forToday.getTripIndex(addedTripId); - assertTrue( - forTodayAddedTripIndex > -1, - "Added trip should be found in time table for the service date" - ); - assertEquals(expectedState, forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState()); - - final int scheduleTripIndex = schedule.getTripIndex(addedTripId); - assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table"); - } } @Nonnull diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index 8af13ac286f..ac8462eb133 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -1,6 +1,7 @@ package org.opentripplanner.updater.trip.moduletests.cancellation; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -58,4 +59,73 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state assertEquals(state, tripTimes.getRealTimeState()); assertTrue(tripTimes.isCanceledOrDeleted()); } + + /** + * Test behavior of the realtime system in a case related to #5725 that is discussed at: + * https://github.com/opentripplanner/OpenTripPlanner/pull/5726#discussion_r1521653840 + * When a trip is added by a realtime message, in the realtime data indexes a corresponding + * trip pattern should be associated with the stops that trip visits. When a subsequent + * realtime message cancels or deletes that trip, the pattern should continue to be present in + * the realtime data indexes, and it should still contain the previously added trip, but that + * trip should be marked as having canceled or deleted status. At no point should the trip + * added by realtime data be present in the trip pattern for scheduled service. + */ + @ParameterizedTest + @MethodSource("cases") + public void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState state) { + var env = RealtimeTestEnvironment.gtfs(); + var addedTripId = "added-trip"; + // First add ADDED trip + var update = new TripUpdateBuilder( + addedTripId, + RealtimeTestEnvironment.SERVICE_DATE, + ScheduleRelationship.ADDED, + env.timeZone + ) + .addStopTime(env.stopA1.getId().getId(), 30) + .addStopTime(env.stopB1.getId().getId(), 40) + .addStopTime(env.stopC1.getId().getId(), 55) + .build(); + + var result = env.applyTripUpdate(update, true); + + assertEquals(1, result.successful()); + + env.commitTimetableSnapshot(true); + + // Cancel or delete the added trip + update = + new TripUpdateBuilder( + addedTripId, + RealtimeTestEnvironment.SERVICE_DATE, + relationship, + env.timeZone + ) + .build(); + result = env.applyTripUpdate(update, true); + + assertEquals(1, result.successful()); + + final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + // Get the trip pattern of the added trip which goes through stopA + var patternsAtA = snapshot.getPatternsForStop(env.stopA1); + + assertNotNull(patternsAtA, "Added trip pattern should be found"); + var tripPattern = patternsAtA.stream().findFirst().get(); + + final Timetable forToday = snapshot.resolve(tripPattern, RealtimeTestEnvironment.SERVICE_DATE); + final Timetable schedule = snapshot.resolve(tripPattern, null); + + assertNotSame(forToday, schedule); + + final int forTodayAddedTripIndex = forToday.getTripIndex(addedTripId); + assertTrue( + forTodayAddedTripIndex > -1, + "Added trip should be found in time table for the service date" + ); + assertEquals(state, forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState()); + + final int scheduleTripIndex = schedule.getTripIndex(addedTripId); + assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table"); + } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index d97704549ee..114ba911857 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; @@ -116,4 +117,112 @@ public void scheduledTripWithSkippedAndScheduled() { assertFalse(newTripTimes.isNoDataStop(2)); } } + + /** + * Test realtime system behavior under one very particular case from issue #5725. + * When applying differential realtime updates, an update may cancel some stops on a trip. A + * later update may then revert the trip back to its originally scheduled sequence of stops. + * When this happens, we expect the trip to be associated with a new trip pattern (where some + * stops have no pickup or dropoff) then dissociated from that new pattern and re-associated + * with its originally scheduled pattern. Any trip times that were created in timetables under + * the new stop-skipping trip pattern should also be removed. + */ + @Test + public void scheduledTripWithPreviouslySkipped() { + var env = RealtimeTestEnvironment.gtfs(); + var tripId = env.trip2.getId(); + + var tripUpdate = new TripUpdateBuilder( + tripId.getId(), + RealtimeTestEnvironment.SERVICE_DATE, + SCHEDULED, + env.timeZone + ) + .addDelayedStopTime(0, 0) + .addSkippedStop(1) + .addDelayedStopTime(2, 90) + .build(); + + var result = env.applyTripUpdate(tripUpdate, true); + + assertEquals(1, result.successful()); + + // Force a snapshot commit. This is done to mimic normal behaviour where a new update arrives + // after the original snapshot has been committed + env.commitTimetableSnapshot(true); + + // Create update to the same trip but now the skipped stop is no longer skipped + var scheduledBuilder = new TripUpdateBuilder( + tripId.getId(), + RealtimeTestEnvironment.SERVICE_DATE, + SCHEDULED, + env.timeZone + ) + .addDelayedStopTime(0, 0) + .addDelayedStopTime(1, 50) + .addDelayedStopTime(2, 90); + + tripUpdate = scheduledBuilder.build(); + + // apply the update with the previously skipped stop now scheduled + result = env.applyTripUpdate(tripUpdate, true); + + assertEquals(1, result.successful()); + // Check that the there is no longer a realtime added trip pattern for the trip and that the + // stoptime updates have gone through + var snapshot = env.getTimetableSnapshot(); + + { + final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( + env.trip2.getId(), + RealtimeTestEnvironment.SERVICE_DATE + ); + assertNull(newTripPattern); + final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); + + final TripPattern originalTripPattern = env.transitModel + .getTransitModelIndex() + .getPatternForTrip() + .get(trip); + final Timetable originalTimetableForToday = snapshot.resolve( + originalTripPattern, + RealtimeTestEnvironment.SERVICE_DATE + ); + + final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + + assertNotSame(originalTimetableForToday, originalTimetableScheduled); + + final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); + + assertTrue( + originalTripIndexScheduled > -1, + "Original trip should be found in scheduled time table" + ); + final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( + originalTripIndexScheduled + ); + assertFalse( + originalTripTimesScheduled.isCanceledOrDeleted(), + "Original trip times should not be canceled in scheduled time table" + ); + assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); + final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + + assertTrue( + originalTripIndexForToday > -1, + "Original trip should be found in time table for service date" + ); + final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( + originalTripIndexForToday + ); + assertEquals(RealTimeState.UPDATED, originalTripTimesForToday.getRealTimeState()); + assertEquals(0, originalTripTimesForToday.getArrivalDelay(0)); + assertEquals(0, originalTripTimesForToday.getDepartureDelay(0)); + assertEquals(50, originalTripTimesForToday.getArrivalDelay(1)); + assertEquals(50, originalTripTimesForToday.getDepartureDelay(1)); + assertEquals(90, originalTripTimesForToday.getArrivalDelay(2)); + assertEquals(90, originalTripTimesForToday.getDepartureDelay(2)); + } + } } From e14fbb30f978b1f8895c6d330f452ae0a1b2d82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 4 Jun 2024 18:06:06 +0200 Subject: [PATCH 1296/1688] Upgrade gbfs model (fixes #5889) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5880d9dcc62..244d129a5bd 100644 --- a/pom.xml +++ b/pom.xml @@ -674,7 +674,7 @@ org.mobilitydata gbfs-java-model - 1.0.6 + 1.0.7 From a9df6a9aaaae1e6c233eb306f526d37268af20b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 4 Jun 2024 18:07:42 +0200 Subject: [PATCH 1297/1688] Add test case for #5889 --- src/test/resources/gbfs/lillestrombysykkel/gbfs.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/test/resources/gbfs/lillestrombysykkel/gbfs.json b/src/test/resources/gbfs/lillestrombysykkel/gbfs.json index abcd2501381..56377e350ac 100644 --- a/src/test/resources/gbfs/lillestrombysykkel/gbfs.json +++ b/src/test/resources/gbfs/lillestrombysykkel/gbfs.json @@ -5,6 +5,10 @@ "data": { "nb": { "feeds": [ + { + "name": "gbfs", + "url": "file:src/test/resources/gbfs/lillestrombysykkel/gbfs.json" + }, { "name": "system_information", "url": "file:src/test/resources/gbfs/lillestrombysykkel/system_information.json" @@ -28,4 +32,4 @@ ] } } -} \ No newline at end of file +} From 3bcacfba080d664648a994e4808d56d78e53936c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 5 Jun 2024 08:34:38 +0200 Subject: [PATCH 1298/1688] Update src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java Co-authored-by: Henrik Abrahamsson <127481124+habrahamsson-skanetrafiken@users.noreply.github.com> --- .../opentripplanner/updater/trip/TimetableSnapshotManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index e3fe3790fbe..a67272da157 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -146,7 +146,7 @@ public void commitTimetableSnapshot(final boolean force) { * * @param trioId trip id * @param serviceDate service date - * @return trip pattern created by the updater; null if trip is on the original trip pattern + * @return trip pattern created by the updater; null if pattern has not been changed for this trip. */ public TripPattern getRealtimeAddedTripPattern(FeedScopedId trioId, LocalDate serviceDate) { return buffer.getRealtimeAddedTripPattern(trioId, serviceDate); From 3fa175aae0ca8540b036908aa1b78a7313e1a173 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 5 Jun 2024 08:34:48 +0200 Subject: [PATCH 1299/1688] Update src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java Co-authored-by: Henrik Abrahamsson <127481124+habrahamsson-skanetrafiken@users.noreply.github.com> --- .../updater/trip/TimetableSnapshotManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index a67272da157..dbcca9f3b7c 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -148,8 +148,8 @@ public void commitTimetableSnapshot(final boolean force) { * @param serviceDate service date * @return trip pattern created by the updater; null if pattern has not been changed for this trip. */ - public TripPattern getRealtimeAddedTripPattern(FeedScopedId trioId, LocalDate serviceDate) { - return buffer.getRealtimeAddedTripPattern(trioId, serviceDate); + public TripPattern getRealtimeAddedTripPattern(FeedScopedId tripId, LocalDate serviceDate) { + return buffer.getRealtimeAddedTripPattern(tripId, serviceDate); } /** From b63625c51038fcfc10b004238809ce1fc93f6378 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 5 Jun 2024 11:08:55 +0200 Subject: [PATCH 1300/1688] Add nullable annotation --- src/main/java/org/opentripplanner/model/TimetableSnapshot.java | 2 ++ .../opentripplanner/updater/trip/TimetableSnapshotManager.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index e1dfd5681c0..55b2d8bd785 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -14,6 +14,7 @@ import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; +import javax.annotation.Nullable; import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.framework.Result; @@ -181,6 +182,7 @@ public void removeRealtimeUpdatedTripTimes( * @param serviceDate service date * @return trip pattern created by the updater; null if trip is on the original trip pattern */ + @Nullable public TripPattern getRealtimeAddedTripPattern(FeedScopedId tripId, LocalDate serviceDate) { TripIdAndServiceDate tripIdAndServiceDate = new TripIdAndServiceDate(tripId, serviceDate); return realtimeAddedTripPattern.get(tripIdAndServiceDate); diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index dbcca9f3b7c..f7849bb9568 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -4,6 +4,7 @@ import java.util.Objects; import java.util.concurrent.locks.ReentrantLock; import java.util.function.Supplier; +import javax.annotation.Nullable; import org.opentripplanner.framework.time.CountdownTimer; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; @@ -148,6 +149,7 @@ public void commitTimetableSnapshot(final boolean force) { * @param serviceDate service date * @return trip pattern created by the updater; null if pattern has not been changed for this trip. */ + @Nullable public TripPattern getRealtimeAddedTripPattern(FeedScopedId tripId, LocalDate serviceDate) { return buffer.getRealtimeAddedTripPattern(tripId, serviceDate); } From dc7c19e0d4d611ce9af31bd6f76e36507d2f7839 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 5 Jun 2024 12:44:44 +0200 Subject: [PATCH 1301/1688] Update src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java Co-authored-by: Henrik Abrahamsson <127481124+habrahamsson-skanetrafiken@users.noreply.github.com> --- .../opentripplanner/updater/trip/TimetableSnapshotManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index f7849bb9568..e62c6daf547 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -145,7 +145,7 @@ public void commitTimetableSnapshot(final boolean force) { * Get the current trip pattern given a trip id and a service date, if it has been changed from * the scheduled pattern with an update, for which the stopPattern is different. * - * @param trioId trip id + * @param tripId trip id * @param serviceDate service date * @return trip pattern created by the updater; null if pattern has not been changed for this trip. */ From 5a17922181c15263d55cd5efea7ab76cf10070e2 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Thu, 6 Jun 2024 14:35:40 +0000 Subject: [PATCH 1302/1688] Add changelog entry for #5606 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 9df32c081af..92a87116a17 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -25,6 +25,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix handling of missing aimed departure time [#5865](https://github.com/opentripplanner/OpenTripPlanner/pull/5865) - Add OTP request timeout GraphQL instrumentation [#5881](https://github.com/opentripplanner/OpenTripPlanner/pull/5881) - Add feed publisher name and url to GTFS GraphQL API [#5835](https://github.com/opentripplanner/OpenTripPlanner/pull/5835) +- Add support for query parameter to enforce booking time in trip search for flexible services [#5606](https://github.com/opentripplanner/OpenTripPlanner/pull/5606) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 51281fef1f4b2e40a20448e9a2c1544c6818436e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 4 Jun 2024 23:10:35 +0200 Subject: [PATCH 1303/1688] Use enum instead of boolean for update semantics --- .../trip/GtfsRealtimeTripUpdateSource.java | 17 ++++++----- .../updater/trip/MqttGtfsRealtimeUpdater.java | 9 ++++-- .../updater/trip/PollingTripUpdater.java | 4 +-- .../updater/trip/TimetableSnapshotSource.java | 12 ++++---- .../trip/TripUpdateGraphWriterRunnable.java | 12 +++----- .../updater/trip/UpdateSemantics.java | 15 ++++++++++ .../java/org/opentripplanner/GtfsTest.java | 4 +-- .../updater/trip/RealtimeTestEnvironment.java | 2 +- .../trip/TimetableSnapshotSourceTest.java | 28 +++++++++---------- 9 files changed, 60 insertions(+), 43 deletions(-) create mode 100644 src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java diff --git a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java index 12a044424ca..0b124694d3b 100644 --- a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java @@ -1,5 +1,8 @@ package org.opentripplanner.updater.trip; +import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; +import static org.opentripplanner.updater.trip.UpdateSemantics.INCREMENTAL; + import com.google.protobuf.ExtensionRegistry; import com.google.transit.realtime.GtfsRealtime; import com.google.transit.realtime.GtfsRealtime.FeedEntity; @@ -25,7 +28,7 @@ public class GtfsRealtimeTripUpdateSource { private final String feedId; private final String url; private final HttpHeaders headers; - private boolean fullDataset = true; + private UpdateSemantics updateSemantics = FULL; private final ExtensionRegistry registry = ExtensionRegistry.newInstance(); private final OtpHttpClient otpHttpClient; @@ -41,7 +44,7 @@ public List getUpdates() { FeedMessage feedMessage; List feedEntityList; List updates = null; - fullDataset = true; + updateSemantics = FULL; try { // Decode message feedMessage = @@ -61,7 +64,7 @@ public List getUpdates() { .getIncrementality() .equals(GtfsRealtime.FeedHeader.Incrementality.DIFFERENTIAL) ) { - fullDataset = false; + updateSemantics = INCREMENTAL; } // Create List of TripUpdates @@ -85,10 +88,10 @@ public String toString() { } /** - * @return true iff the last list with updates represent all updates that are active right now, - * i.e. all previous updates should be disregarded + * @return the semantics of the last list with updates, i.e. if all previous updates + * should be disregarded */ - public boolean getFullDatasetValueOfLastUpdates() { - return fullDataset; + public UpdateSemantics updateSemanticsOfLastUpdates() { + return updateSemantics; } } diff --git a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java index 11647c0a37f..92562da3388 100644 --- a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java +++ b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java @@ -1,5 +1,8 @@ package org.opentripplanner.updater.trip; +import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; +import static org.opentripplanner.updater.trip.UpdateSemantics.INCREMENTAL; + import com.google.protobuf.InvalidProtocolBufferException; import com.google.transit.realtime.GtfsRealtime; import java.net.URI; @@ -139,7 +142,7 @@ public void connectionLost(Throwable cause) { @Override public void messageArrived(String topic, MqttMessage message) { List updates = null; - boolean fullDataset = true; + UpdateSemantics updateSemantics = FULL; try { // Decode message GtfsRealtime.FeedMessage feedMessage = GtfsRealtime.FeedMessage.PARSER.parseFrom( @@ -156,7 +159,7 @@ public void messageArrived(String topic, MqttMessage message) { .getIncrementality() .equals(GtfsRealtime.FeedHeader.Incrementality.DIFFERENTIAL) ) { - fullDataset = false; + updateSemantics = INCREMENTAL; } // Create List of TripUpdates @@ -177,7 +180,7 @@ public void messageArrived(String topic, MqttMessage message) { snapshotSource, fuzzyTripMatcher, backwardsDelayPropagationType, - fullDataset, + updateSemantics, updates, feedId, recordMetrics diff --git a/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java b/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java index 351b0be0b83..c819def7309 100644 --- a/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java +++ b/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java @@ -83,7 +83,7 @@ public void setup(WriteToGraphCallback writeToGraphCallback) { public void runPolling() { // Get update lists from update source List updates = updateSource.getUpdates(); - boolean fullDataset = updateSource.getFullDatasetValueOfLastUpdates(); + var updateSemantics = updateSource.updateSemanticsOfLastUpdates(); if (updates != null) { // Handle trip updates via graph writer runnable @@ -91,7 +91,7 @@ public void runPolling() { snapshotSource, fuzzyTripMatcher, backwardsDelayPropagationType, - fullDataset, + updateSemantics, updates, feedId, recordMetrics diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index a530f348a00..771331a90bd 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -12,6 +12,7 @@ import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TOO_FEW_STOPS; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_ALREADY_EXISTS; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_NOT_FOUND; +import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; import com.google.common.base.Preconditions; import com.google.common.collect.Multimaps; @@ -125,15 +126,14 @@ public TimetableSnapshotSource( * * @param backwardsDelayPropagationType Defines when delays are propagated to previous stops and * if these stops are given the NO_DATA flag. - * @param fullDataset true if the list with updates represent all updates that - * are active right now, i.e. all previous updates should be - * disregarded + * @param updateSemantics Determines the semantics of the updates. FULL updates clear the buffer + * of all previous updates for the given feed id. * @param updates GTFS-RT TripUpdate's that should be applied atomically */ public UpdateResult applyTripUpdates( GtfsRealtimeFuzzyTripMatcher fuzzyTripMatcher, BackwardsDelayPropagationType backwardsDelayPropagationType, - boolean fullDataset, + UpdateSemantics updateSemantics, List updates, String feedId ) { @@ -146,7 +146,7 @@ public UpdateResult applyTripUpdates( List> results = new ArrayList<>(); withLock(() -> { - if (fullDataset) { + if (updateSemantics == FULL) { // Remove all updates from the buffer buffer.clear(feedId); } @@ -249,7 +249,7 @@ public UpdateResult applyTripUpdates( var updateResult = UpdateResult.ofResults(results); - if (fullDataset) { + if (updateSemantics == FULL) { logUpdateResult(feedId, failuresByRelationship, updateResult); } return updateResult; diff --git a/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java b/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java index c5c9262f185..bb73b3e196f 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java +++ b/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java @@ -12,11 +12,7 @@ class TripUpdateGraphWriterRunnable implements GraphWriterRunnable { - /** - * True iff the list with updates represent all updates that are active right now, i.e. all - * previous updates should be disregarded - */ - private final boolean fullDataset; + private final UpdateSemantics updateSemantics; /** * The list with updates to apply to the graph @@ -35,7 +31,7 @@ class TripUpdateGraphWriterRunnable implements GraphWriterRunnable { TimetableSnapshotSource snapshotSource, GtfsRealtimeFuzzyTripMatcher fuzzyTripMatcher, BackwardsDelayPropagationType backwardsDelayPropagationType, - boolean fullDataset, + UpdateSemantics updateSemantics, List updates, String feedId, Consumer sendMetrics @@ -43,7 +39,7 @@ class TripUpdateGraphWriterRunnable implements GraphWriterRunnable { this.snapshotSource = snapshotSource; this.fuzzyTripMatcher = fuzzyTripMatcher; this.backwardsDelayPropagationType = backwardsDelayPropagationType; - this.fullDataset = fullDataset; + this.updateSemantics = updateSemantics; this.updates = Objects.requireNonNull(updates); this.feedId = Objects.requireNonNull(feedId); this.sendMetrics = sendMetrics; @@ -54,7 +50,7 @@ public void run(Graph graph, TransitModel transitModel) { var result = snapshotSource.applyTripUpdates( fuzzyTripMatcher, backwardsDelayPropagationType, - fullDataset, + updateSemantics, updates, feedId ); diff --git a/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java b/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java new file mode 100644 index 00000000000..c376eba9997 --- /dev/null +++ b/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java @@ -0,0 +1,15 @@ +package org.opentripplanner.updater.trip; + +public enum UpdateSemantics { + /** + * The update contains all available realtime information for a given feed. The previously stored + * updates can be deleted and replaced with the information from this one. + */ + FULL, + /** + * The update contains only information for a subset of all trips. If there is information stored + * from a previous realtime update it must be kept in order to have a complete picture of all + * trips. + */ + INCREMENTAL, +} diff --git a/src/test/java/org/opentripplanner/GtfsTest.java b/src/test/java/org/opentripplanner/GtfsTest.java index 6f14a6db662..6e8fccfc957 100644 --- a/src/test/java/org/opentripplanner/GtfsTest.java +++ b/src/test/java/org/opentripplanner/GtfsTest.java @@ -44,6 +44,7 @@ import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.alert.AlertsUpdateHandler; import org.opentripplanner.updater.trip.TimetableSnapshotSource; +import org.opentripplanner.updater.trip.UpdateSemantics; /** Common base class for many test classes which need to load a GTFS feed in preparation for tests. */ public abstract class GtfsTest { @@ -218,7 +219,6 @@ protected void setUp() throws Exception { alertsUpdateHandler.setFeedId(feedId.getId()); try { - final boolean fullDataset = false; InputStream inputStream = new FileInputStream(gtfsRealTime); FeedMessage feedMessage = FeedMessage.PARSER.parseFrom(inputStream); List feedEntityList = feedMessage.getEntityList(); @@ -229,7 +229,7 @@ protected void setUp() throws Exception { timetableSnapshotSource.applyTripUpdates( null, REQUIRED_NO_DATA, - fullDataset, + UpdateSemantics.INCREMENTAL, updates, feedId.getId() ); diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index 1b385df153b..babc5664343 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -264,7 +264,7 @@ public UpdateResult applyTripUpdates(List updates) { return gtfsSource.applyTripUpdates( null, BackwardsDelayPropagationType.REQUIRED_NO_DATA, - true, + UpdateSemantics.FULL, updates, getFeedId() ); diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 36ba293e508..fa6f85d7a92 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -65,7 +65,7 @@ public class TimetableSnapshotSourceTest { private final GtfsRealtimeFuzzyTripMatcher TRIP_MATCHER_NOOP = null; - private final boolean FULL_DATASET = false; + private final UpdateSemantics UPDATE_SEMANTICS = UpdateSemantics.INCREMENTAL; private String feedId; @BeforeEach @@ -83,7 +83,7 @@ public void testGetSnapshot() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(CANCELLATION), feedId ); @@ -105,7 +105,7 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(CANCELLATION), feedId ); @@ -141,7 +141,7 @@ public void invalidTripId() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -263,7 +263,7 @@ public void testHandleModifiedTrip() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -379,7 +379,7 @@ public void scheduled() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -457,7 +457,7 @@ public void scheduledTripWithSkippedAndNoData() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -589,7 +589,7 @@ public void addedTrip() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -658,7 +658,7 @@ public void addedTripWithNewRoute() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -709,7 +709,7 @@ public void addedWithUnknownStop() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -751,7 +751,7 @@ public void repeatedlyAddedTripWithNewRoute() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -762,7 +762,7 @@ public void repeatedlyAddedTripWithNewRoute() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdate), feedId ); @@ -855,7 +855,7 @@ public void testPurgeExpiredData( updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdateYesterday), feedId ); @@ -869,7 +869,7 @@ public void testPurgeExpiredData( updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - FULL_DATASET, + UPDATE_SEMANTICS, List.of(tripUpdateToday), feedId ); From 67505c84f0bd1f4c483c3f65df9efa4407a7d3db Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 6 Jun 2024 16:34:12 +0200 Subject: [PATCH 1304/1688] Also use enum for Siri updaters --- .../ext/siri/SiriTimetableSnapshotSource.java | 12 +++++++----- .../siri/updater/EstimatedTimetableSource.java | 7 ++++--- .../siri/updater/SiriETGooglePubsubUpdater.java | 3 ++- .../siri/updater/SiriETHttpTripUpdateSource.java | 15 +++++++++------ .../ext/siri/updater/SiriETUpdater.java | 4 ++-- .../siri/updater/azure/SiriAzureETUpdater.java | 3 ++- .../updater/trip/UpdateSemantics.java | 8 ++++++-- .../updater/trip/RealtimeTestEnvironment.java | 4 ++-- 8 files changed, 34 insertions(+), 22 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 99e9063418c..0a169ddb982 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -7,6 +7,7 @@ import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_NOT_FOUND; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_NOT_FOUND_IN_PATTERN; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.UNKNOWN; +import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; import java.time.LocalDate; import java.util.ArrayList; @@ -29,6 +30,7 @@ import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.UpdateSuccess; import org.opentripplanner.updater.trip.AbstractTimetableSnapshotSource; +import org.opentripplanner.updater.trip.UpdateSemantics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; @@ -79,15 +81,15 @@ public SiriTimetableSnapshotSource( * FIXME RT_AB: TripUpdate is the GTFS term, and these SIRI ETs are never converted into that * same internal model. * - * @param fullDataset true iff the list with updates represent all updates that are active right - * now, i.e. all previous updates should be disregarded - * @param updates SIRI EstimatedTimetable deliveries that should be applied atomically. + * @param semantics the semantics of the update, for example list with updates represent all + * updates that are active right now, i.e. all previous updates should be disregarded + * @param updates SIRI EstimatedTimetable deliveries that should be applied atomically. */ public UpdateResult applyEstimatedTimetable( @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher, EntityResolver entityResolver, String feedId, - boolean fullDataset, + UpdateSemantics semantics, List updates ) { if (updates == null) { @@ -98,7 +100,7 @@ public UpdateResult applyEstimatedTimetable( List> results = new ArrayList<>(); withLock(() -> { - if (fullDataset) { + if (semantics == FULL) { // Remove all updates from the buffer buffer.clear(feedId); } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java index 83edebe3911..3e648207b25 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.siri.updater; import java.util.Optional; +import org.opentripplanner.updater.trip.UpdateSemantics; import uk.org.siri.siri20.Siri; /** @@ -18,10 +19,10 @@ public interface EstimatedTimetableSource { Optional getUpdates(); /** - * @return true iff the last list with updates represent all updates that are active right now, - * i.e. all previous updates should be disregarded + * @return The update semantics of the last collection of updates. + * {@link UpdateSemantics} */ - boolean getFullDatasetValueOfLastUpdates(); + UpdateSemantics updateSemanticsOfLastUpdates(); String getFeedId(); } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index 7f79413c478..b9d353784e6 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -39,6 +39,7 @@ import org.opentripplanner.updater.spi.GraphUpdater; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; +import org.opentripplanner.updater.trip.UpdateSemantics; import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -372,7 +373,7 @@ private void processSiriData(ByteString data) { fuzzyTripMatcher, entityResolver, feedId, - false, + UpdateSemantics.INCREMENTAL, estimatedTimetableDeliveries ); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java index b3abe95dfc2..4749fe1c7b5 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java @@ -1,5 +1,8 @@ package org.opentripplanner.ext.siri.updater; +import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; +import static org.opentripplanner.updater.trip.UpdateSemantics.INCREMENTAL; + import java.time.Duration; import java.time.ZonedDateTime; import java.util.Optional; @@ -7,6 +10,7 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.io.OtpHttpClientException; import org.opentripplanner.updater.spi.HttpHeaders; +import org.opentripplanner.updater.trip.UpdateSemantics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.Siri; @@ -26,10 +30,9 @@ public class SiriETHttpTripUpdateSource implements EstimatedTimetableSource { private final String requestorRef; /** - * True iff the last list with updates represent all updates that are active right now, i.e. all - * previous updates should be disregarded + * The update semantics of the last received collection of updates. */ - private boolean fullDataset = true; + private UpdateSemantics updateSemantics = FULL; private ZonedDateTime lastTimestamp = ZonedDateTime.now().minusMonths(1); public SiriETHttpTripUpdateSource(Parameters parameters) { @@ -61,7 +64,7 @@ public Optional getUpdates() { lastTimestamp = serviceDelivery.getResponseTimestamp(); //All subsequent requests will return changes since last request - fullDataset = false; + updateSemantics = INCREMENTAL; return siri; } catch (OtpHttpClientException e) { LOG.info("Failed after {} ms", (System.currentTimeMillis() - t1)); @@ -74,8 +77,8 @@ public Optional getUpdates() { } @Override - public boolean getFullDatasetValueOfLastUpdates() { - return fullDataset; + public UpdateSemantics updateSemanticsOfLastUpdates() { + return updateSemantics; } @Override diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java index 66007f4aed8..4241e283758 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java @@ -91,7 +91,7 @@ public void runPolling() { do { var updates = updateSource.getUpdates(); if (updates.isPresent()) { - boolean fullDataset = updateSource.getFullDatasetValueOfLastUpdates(); + var updateSemantics = updateSource.updateSemanticsOfLastUpdates(); ServiceDelivery serviceDelivery = updates.get().getServiceDelivery(); moreData = Boolean.TRUE.equals(serviceDelivery.isMoreData()); // Mark this updater as primed after last page of updates. Copy moreData into a final @@ -104,7 +104,7 @@ public void runPolling() { fuzzyTripMatcher, entityResolver, feedId, - fullDataset, + updateSemantics, etds ); ResultLogger.logUpdateResult(feedId, "siri-et", result); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java index 699a89ddb4b..062b125a97c 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java @@ -19,6 +19,7 @@ import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.updater.spi.ResultLogger; import org.opentripplanner.updater.spi.UpdateResult; +import org.opentripplanner.updater.trip.UpdateSemantics; import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; import org.rutebanken.siri20.util.SiriXml; import org.slf4j.Logger; @@ -102,7 +103,7 @@ private Future processMessage(List updat fuzzyTripMatcher(), entityResolver(), feedId, - false, + UpdateSemantics.INCREMENTAL, updates ); ResultLogger.logUpdateResultErrors(feedId, "siri-et", result); diff --git a/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java b/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java index c376eba9997..37a5c5d2778 100644 --- a/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java +++ b/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java @@ -1,9 +1,13 @@ package org.opentripplanner.updater.trip; +/** + * Describes the semantics of a collection of realtime updates and how they are related to previous + * ones. + */ public enum UpdateSemantics { /** - * The update contains all available realtime information for a given feed. The previously stored - * updates can be deleted and replaced with the information from this one. + * The update contains all available realtime information for all trips in a given feed. The + * previously stored updates must be deleted and replaced with the information from this one. */ FULL, /** diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index babc5664343..587d13ed4b7 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -248,7 +248,7 @@ public UpdateResult applyEstimatedTimetable(List Date: Thu, 6 Jun 2024 16:53:06 +0200 Subject: [PATCH 1305/1688] Align names with GTFS-RT spec --- .../ext/siri/SiriTimetableSnapshotSource.java | 13 +++++---- .../updater/EstimatedTimetableSource.java | 6 ++-- .../updater/SiriETGooglePubsubUpdater.java | 4 +-- .../updater/SiriETHttpTripUpdateSource.java | 14 +++++----- .../ext/siri/updater/SiriETUpdater.java | 4 +-- .../updater/azure/SiriAzureETUpdater.java | 4 +-- .../trip/GtfsRealtimeTripUpdateSource.java | 14 +++++----- .../updater/trip/MqttGtfsRealtimeUpdater.java | 10 +++---- .../updater/trip/PollingTripUpdater.java | 4 +-- .../updater/trip/TimetableSnapshotSource.java | 10 +++---- .../trip/TripUpdateGraphWriterRunnable.java | 8 +++--- ...mantics.java => UpdateIncrementality.java} | 6 ++-- .../java/org/opentripplanner/GtfsTest.java | 4 +-- .../updater/trip/RealtimeTestEnvironment.java | 6 ++-- .../trip/TimetableSnapshotSourceTest.java | 28 +++++++++---------- 15 files changed, 68 insertions(+), 67 deletions(-) rename src/main/java/org/opentripplanner/updater/trip/{UpdateSemantics.java => UpdateIncrementality.java} (89%) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 0a169ddb982..a058015e4d6 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -7,7 +7,7 @@ import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_NOT_FOUND; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_NOT_FOUND_IN_PATTERN; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.UNKNOWN; -import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; import java.time.LocalDate; import java.util.ArrayList; @@ -30,7 +30,7 @@ import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.UpdateSuccess; import org.opentripplanner.updater.trip.AbstractTimetableSnapshotSource; -import org.opentripplanner.updater.trip.UpdateSemantics; +import org.opentripplanner.updater.trip.UpdateIncrementality; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; @@ -81,15 +81,16 @@ public SiriTimetableSnapshotSource( * FIXME RT_AB: TripUpdate is the GTFS term, and these SIRI ETs are never converted into that * same internal model. * - * @param semantics the semantics of the update, for example list with updates represent all - * updates that are active right now, i.e. all previous updates should be disregarded + * @param incrementality the incrementality of the update, for example if updates represent all + * updates that are active right now, i.e. all previous updates should be + * disregarded * @param updates SIRI EstimatedTimetable deliveries that should be applied atomically. */ public UpdateResult applyEstimatedTimetable( @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher, EntityResolver entityResolver, String feedId, - UpdateSemantics semantics, + UpdateIncrementality incrementality, List updates ) { if (updates == null) { @@ -100,7 +101,7 @@ public UpdateResult applyEstimatedTimetable( List> results = new ArrayList<>(); withLock(() -> { - if (semantics == FULL) { + if (incrementality == FULL_DATASET) { // Remove all updates from the buffer buffer.clear(feedId); } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java index 3e648207b25..f979a9f7e2b 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.siri.updater; import java.util.Optional; -import org.opentripplanner.updater.trip.UpdateSemantics; +import org.opentripplanner.updater.trip.UpdateIncrementality; import uk.org.siri.siri20.Siri; /** @@ -20,9 +20,9 @@ public interface EstimatedTimetableSource { /** * @return The update semantics of the last collection of updates. - * {@link UpdateSemantics} + * {@link UpdateIncrementality} */ - UpdateSemantics updateSemanticsOfLastUpdates(); + UpdateIncrementality incrementalityOfLastUpdates(); String getFeedId(); } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index b9d353784e6..7ca23ad4fc7 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -39,7 +39,7 @@ import org.opentripplanner.updater.spi.GraphUpdater; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; -import org.opentripplanner.updater.trip.UpdateSemantics; +import org.opentripplanner.updater.trip.UpdateIncrementality; import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -373,7 +373,7 @@ private void processSiriData(ByteString data) { fuzzyTripMatcher, entityResolver, feedId, - UpdateSemantics.INCREMENTAL, + UpdateIncrementality.DIFFERENTIAL, estimatedTimetableDeliveries ); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java index 4749fe1c7b5..d33f1261ea3 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java @@ -1,7 +1,7 @@ package org.opentripplanner.ext.siri.updater; -import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; -import static org.opentripplanner.updater.trip.UpdateSemantics.INCREMENTAL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; import java.time.Duration; import java.time.ZonedDateTime; @@ -10,7 +10,7 @@ import javax.annotation.Nullable; import org.opentripplanner.framework.io.OtpHttpClientException; import org.opentripplanner.updater.spi.HttpHeaders; -import org.opentripplanner.updater.trip.UpdateSemantics; +import org.opentripplanner.updater.trip.UpdateIncrementality; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import uk.org.siri.siri20.Siri; @@ -32,7 +32,7 @@ public class SiriETHttpTripUpdateSource implements EstimatedTimetableSource { /** * The update semantics of the last received collection of updates. */ - private UpdateSemantics updateSemantics = FULL; + private UpdateIncrementality updateIncrementality = FULL_DATASET; private ZonedDateTime lastTimestamp = ZonedDateTime.now().minusMonths(1); public SiriETHttpTripUpdateSource(Parameters parameters) { @@ -64,7 +64,7 @@ public Optional getUpdates() { lastTimestamp = serviceDelivery.getResponseTimestamp(); //All subsequent requests will return changes since last request - updateSemantics = INCREMENTAL; + updateIncrementality = DIFFERENTIAL; return siri; } catch (OtpHttpClientException e) { LOG.info("Failed after {} ms", (System.currentTimeMillis() - t1)); @@ -77,8 +77,8 @@ public Optional getUpdates() { } @Override - public UpdateSemantics updateSemanticsOfLastUpdates() { - return updateSemantics; + public UpdateIncrementality incrementalityOfLastUpdates() { + return updateIncrementality; } @Override diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java index 4241e283758..1f95468565f 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java @@ -91,7 +91,7 @@ public void runPolling() { do { var updates = updateSource.getUpdates(); if (updates.isPresent()) { - var updateSemantics = updateSource.updateSemanticsOfLastUpdates(); + var incrementality = updateSource.incrementalityOfLastUpdates(); ServiceDelivery serviceDelivery = updates.get().getServiceDelivery(); moreData = Boolean.TRUE.equals(serviceDelivery.isMoreData()); // Mark this updater as primed after last page of updates. Copy moreData into a final @@ -104,7 +104,7 @@ public void runPolling() { fuzzyTripMatcher, entityResolver, feedId, - updateSemantics, + incrementality, etds ); ResultLogger.logUpdateResult(feedId, "siri-et", result); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java index 062b125a97c..2b8c48dce11 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/azure/SiriAzureETUpdater.java @@ -19,7 +19,7 @@ import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.updater.spi.ResultLogger; import org.opentripplanner.updater.spi.UpdateResult; -import org.opentripplanner.updater.trip.UpdateSemantics; +import org.opentripplanner.updater.trip.UpdateIncrementality; import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; import org.rutebanken.siri20.util.SiriXml; import org.slf4j.Logger; @@ -103,7 +103,7 @@ private Future processMessage(List updat fuzzyTripMatcher(), entityResolver(), feedId, - UpdateSemantics.INCREMENTAL, + UpdateIncrementality.DIFFERENTIAL, updates ); ResultLogger.logUpdateResultErrors(feedId, "siri-et", result); diff --git a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java index 0b124694d3b..31cb5641920 100644 --- a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.trip; -import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; -import static org.opentripplanner.updater.trip.UpdateSemantics.INCREMENTAL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; import com.google.protobuf.ExtensionRegistry; import com.google.transit.realtime.GtfsRealtime; @@ -28,7 +28,7 @@ public class GtfsRealtimeTripUpdateSource { private final String feedId; private final String url; private final HttpHeaders headers; - private UpdateSemantics updateSemantics = FULL; + private UpdateIncrementality updateIncrementality = FULL_DATASET; private final ExtensionRegistry registry = ExtensionRegistry.newInstance(); private final OtpHttpClient otpHttpClient; @@ -44,7 +44,7 @@ public List getUpdates() { FeedMessage feedMessage; List feedEntityList; List updates = null; - updateSemantics = FULL; + updateIncrementality = FULL_DATASET; try { // Decode message feedMessage = @@ -64,7 +64,7 @@ public List getUpdates() { .getIncrementality() .equals(GtfsRealtime.FeedHeader.Incrementality.DIFFERENTIAL) ) { - updateSemantics = INCREMENTAL; + updateIncrementality = DIFFERENTIAL; } // Create List of TripUpdates @@ -91,7 +91,7 @@ public String toString() { * @return the semantics of the last list with updates, i.e. if all previous updates * should be disregarded */ - public UpdateSemantics updateSemanticsOfLastUpdates() { - return updateSemantics; + public UpdateIncrementality incrementalityOfLastUpdates() { + return updateIncrementality; } } diff --git a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java index 92562da3388..3ba7af0305b 100644 --- a/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java +++ b/src/main/java/org/opentripplanner/updater/trip/MqttGtfsRealtimeUpdater.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.trip; -import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; -import static org.opentripplanner.updater.trip.UpdateSemantics.INCREMENTAL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; import com.google.protobuf.InvalidProtocolBufferException; import com.google.transit.realtime.GtfsRealtime; @@ -142,7 +142,7 @@ public void connectionLost(Throwable cause) { @Override public void messageArrived(String topic, MqttMessage message) { List updates = null; - UpdateSemantics updateSemantics = FULL; + UpdateIncrementality updateIncrementality = FULL_DATASET; try { // Decode message GtfsRealtime.FeedMessage feedMessage = GtfsRealtime.FeedMessage.PARSER.parseFrom( @@ -159,7 +159,7 @@ public void messageArrived(String topic, MqttMessage message) { .getIncrementality() .equals(GtfsRealtime.FeedHeader.Incrementality.DIFFERENTIAL) ) { - updateSemantics = INCREMENTAL; + updateIncrementality = DIFFERENTIAL; } // Create List of TripUpdates @@ -180,7 +180,7 @@ public void messageArrived(String topic, MqttMessage message) { snapshotSource, fuzzyTripMatcher, backwardsDelayPropagationType, - updateSemantics, + updateIncrementality, updates, feedId, recordMetrics diff --git a/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java b/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java index c819def7309..8af27d9818c 100644 --- a/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java +++ b/src/main/java/org/opentripplanner/updater/trip/PollingTripUpdater.java @@ -83,7 +83,7 @@ public void setup(WriteToGraphCallback writeToGraphCallback) { public void runPolling() { // Get update lists from update source List updates = updateSource.getUpdates(); - var updateSemantics = updateSource.updateSemanticsOfLastUpdates(); + var incrementality = updateSource.incrementalityOfLastUpdates(); if (updates != null) { // Handle trip updates via graph writer runnable @@ -91,7 +91,7 @@ public void runPolling() { snapshotSource, fuzzyTripMatcher, backwardsDelayPropagationType, - updateSemantics, + incrementality, updates, feedId, recordMetrics diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 771331a90bd..fbb0118e3b5 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -12,7 +12,7 @@ import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TOO_FEW_STOPS; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_ALREADY_EXISTS; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_NOT_FOUND; -import static org.opentripplanner.updater.trip.UpdateSemantics.FULL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; import com.google.common.base.Preconditions; import com.google.common.collect.Multimaps; @@ -126,14 +126,14 @@ public TimetableSnapshotSource( * * @param backwardsDelayPropagationType Defines when delays are propagated to previous stops and * if these stops are given the NO_DATA flag. - * @param updateSemantics Determines the semantics of the updates. FULL updates clear the buffer + * @param updateIncrementality Determines the semantics of the updates. FULL updates clear the buffer * of all previous updates for the given feed id. * @param updates GTFS-RT TripUpdate's that should be applied atomically */ public UpdateResult applyTripUpdates( GtfsRealtimeFuzzyTripMatcher fuzzyTripMatcher, BackwardsDelayPropagationType backwardsDelayPropagationType, - UpdateSemantics updateSemantics, + UpdateIncrementality updateIncrementality, List updates, String feedId ) { @@ -146,7 +146,7 @@ public UpdateResult applyTripUpdates( List> results = new ArrayList<>(); withLock(() -> { - if (updateSemantics == FULL) { + if (updateIncrementality == FULL_DATASET) { // Remove all updates from the buffer buffer.clear(feedId); } @@ -249,7 +249,7 @@ public UpdateResult applyTripUpdates( var updateResult = UpdateResult.ofResults(results); - if (updateSemantics == FULL) { + if (updateIncrementality == FULL_DATASET) { logUpdateResult(feedId, failuresByRelationship, updateResult); } return updateResult; diff --git a/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java b/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java index bb73b3e196f..848e4ece9ef 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java +++ b/src/main/java/org/opentripplanner/updater/trip/TripUpdateGraphWriterRunnable.java @@ -12,7 +12,7 @@ class TripUpdateGraphWriterRunnable implements GraphWriterRunnable { - private final UpdateSemantics updateSemantics; + private final UpdateIncrementality updateIncrementality; /** * The list with updates to apply to the graph @@ -31,7 +31,7 @@ class TripUpdateGraphWriterRunnable implements GraphWriterRunnable { TimetableSnapshotSource snapshotSource, GtfsRealtimeFuzzyTripMatcher fuzzyTripMatcher, BackwardsDelayPropagationType backwardsDelayPropagationType, - UpdateSemantics updateSemantics, + UpdateIncrementality updateIncrementality, List updates, String feedId, Consumer sendMetrics @@ -39,7 +39,7 @@ class TripUpdateGraphWriterRunnable implements GraphWriterRunnable { this.snapshotSource = snapshotSource; this.fuzzyTripMatcher = fuzzyTripMatcher; this.backwardsDelayPropagationType = backwardsDelayPropagationType; - this.updateSemantics = updateSemantics; + this.updateIncrementality = updateIncrementality; this.updates = Objects.requireNonNull(updates); this.feedId = Objects.requireNonNull(feedId); this.sendMetrics = sendMetrics; @@ -50,7 +50,7 @@ public void run(Graph graph, TransitModel transitModel) { var result = snapshotSource.applyTripUpdates( fuzzyTripMatcher, backwardsDelayPropagationType, - updateSemantics, + updateIncrementality, updates, feedId ); diff --git a/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java b/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java similarity index 89% rename from src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java rename to src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java index 37a5c5d2778..fc02581cba9 100644 --- a/src/main/java/org/opentripplanner/updater/trip/UpdateSemantics.java +++ b/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java @@ -4,16 +4,16 @@ * Describes the semantics of a collection of realtime updates and how they are related to previous * ones. */ -public enum UpdateSemantics { +public enum UpdateIncrementality { /** * The update contains all available realtime information for all trips in a given feed. The * previously stored updates must be deleted and replaced with the information from this one. */ - FULL, + FULL_DATASET, /** * The update contains only information for a subset of all trips. If there is information stored * from a previous realtime update it must be kept in order to have a complete picture of all * trips. */ - INCREMENTAL, + DIFFERENTIAL, } diff --git a/src/test/java/org/opentripplanner/GtfsTest.java b/src/test/java/org/opentripplanner/GtfsTest.java index 6e8fccfc957..85ac92479da 100644 --- a/src/test/java/org/opentripplanner/GtfsTest.java +++ b/src/test/java/org/opentripplanner/GtfsTest.java @@ -44,7 +44,7 @@ import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.alert.AlertsUpdateHandler; import org.opentripplanner.updater.trip.TimetableSnapshotSource; -import org.opentripplanner.updater.trip.UpdateSemantics; +import org.opentripplanner.updater.trip.UpdateIncrementality; /** Common base class for many test classes which need to load a GTFS feed in preparation for tests. */ public abstract class GtfsTest { @@ -229,7 +229,7 @@ protected void setUp() throws Exception { timetableSnapshotSource.applyTripUpdates( null, REQUIRED_NO_DATA, - UpdateSemantics.INCREMENTAL, + UpdateIncrementality.DIFFERENTIAL, updates, feedId.getId() ); diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index 587d13ed4b7..9de5c3423e2 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -248,7 +248,7 @@ public UpdateResult applyEstimatedTimetable(List updates) { return gtfsSource.applyTripUpdates( null, BackwardsDelayPropagationType.REQUIRED_NO_DATA, - UpdateSemantics.FULL, + UpdateIncrementality.FULL_DATASET, updates, getFeedId() ); @@ -281,7 +281,7 @@ private UpdateResult applyEstimatedTimetable( siriFuzzyTripMatcher, getEntityResolver(), getFeedId(), - UpdateSemantics.INCREMENTAL, + UpdateIncrementality.DIFFERENTIAL, updates ); } diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index fa6f85d7a92..3e91f45aa11 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -13,6 +13,7 @@ import static org.opentripplanner.updater.trip.BackwardsDelayPropagationType.REQUIRED_NO_DATA; import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.NotSame; import static org.opentripplanner.updater.trip.TimetableSnapshotSourceTest.SameAssert.Same; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; import com.google.transit.realtime.GtfsRealtime.TripDescriptor; import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship; @@ -65,7 +66,6 @@ public class TimetableSnapshotSourceTest { private final GtfsRealtimeFuzzyTripMatcher TRIP_MATCHER_NOOP = null; - private final UpdateSemantics UPDATE_SEMANTICS = UpdateSemantics.INCREMENTAL; private String feedId; @BeforeEach @@ -83,7 +83,7 @@ public void testGetSnapshot() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(CANCELLATION), feedId ); @@ -105,7 +105,7 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(CANCELLATION), feedId ); @@ -141,7 +141,7 @@ public void invalidTripId() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -263,7 +263,7 @@ public void testHandleModifiedTrip() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -379,7 +379,7 @@ public void scheduled() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -457,7 +457,7 @@ public void scheduledTripWithSkippedAndNoData() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -589,7 +589,7 @@ public void addedTrip() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -658,7 +658,7 @@ public void addedTripWithNewRoute() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -709,7 +709,7 @@ public void addedWithUnknownStop() { var result = updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -751,7 +751,7 @@ public void repeatedlyAddedTripWithNewRoute() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -762,7 +762,7 @@ public void repeatedlyAddedTripWithNewRoute() { updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdate), feedId ); @@ -855,7 +855,7 @@ public void testPurgeExpiredData( updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdateYesterday), feedId ); @@ -869,7 +869,7 @@ public void testPurgeExpiredData( updater.applyTripUpdates( TRIP_MATCHER_NOOP, REQUIRED_NO_DATA, - UPDATE_SEMANTICS, + DIFFERENTIAL, List.of(tripUpdateToday), feedId ); From 6dc7da455f32c976fc4a23c0d8b9caf66cd5f2c0 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 6 Jun 2024 15:05:47 -0700 Subject: [PATCH 1306/1688] fix: ensure connsolidated transit leg carries over fare --- .../DecorateConsolidatedStopNamesTest.java | 21 +++++++++++++++++++ .../model/plan/ScheduledTransitLeg.java | 2 ++ .../plan/ScheduledTransitLegBuilder.java | 9 ++++++++ 3 files changed, 32 insertions(+) diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java index d823a55cc4a..7f389bc41ec 100644 --- a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java @@ -5,18 +5,34 @@ import static org.opentripplanner.ext.stopconsolidation.TestStopConsolidationModel.STOP_D; import static org.opentripplanner.model.plan.PlanTestConstants.T11_05; import static org.opentripplanner.model.plan.PlanTestConstants.T11_12; +import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; +import org.opentripplanner.model.fare.FareProduct; +import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.TestItineraryBuilder; +import org.opentripplanner.transit.model.basic.Money; class DecorateConsolidatedStopNamesTest { + private static final FareProduct fp = new FareProduct( + id("fp"), + "fare product", + Money.euros(10.00f), + null, + null, + null + ); + private static final List fpu = List.of( + new FareProductUse("c1a04702-1fb6-32d4-ba02-483bf68111ed", fp) + ); + @Test void changeNames() { var transitModel = TestStopConsolidationModel.buildTransitModel(); @@ -35,10 +51,15 @@ void changeNames() { .bus(1, T11_05, T11_12, PlanTestConstants.F) .build(); + itinerary.getLegs().getFirst().setFareProducts(fpu); + filter.decorate(itinerary); var updatedLeg = itinerary.getLegs().getFirst(); assertEquals(STOP_C.getName(), updatedLeg.getFrom().name); assertEquals(STOP_D.getName(), updatedLeg.getTo().name); + + // Check that the fares were carried over + assertEquals(fpu, updatedLeg.fareProducts()); } } diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index d94ec1895c2..f058bfc9955 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -85,6 +85,8 @@ protected ScheduledTransitLeg(ScheduledTransitLegBuilder builder) { this.generalizedCost = builder.generalizedCost(); + this.fareProducts = builder.fareProducts(); + this.accessibilityScore = builder.accessibilityScore(); List transitLegCoordinates = extractTransitLegCoordinates( tripPattern, diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java index 3e9b5540b1c..bdcf6e9ff3f 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java @@ -3,6 +3,8 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; +import java.util.List; +import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; @@ -24,6 +26,8 @@ public class ScheduledTransitLegBuilder> private int generalizedCost; private Float accessibilityScore; + private List fareProducts; + public ScheduledTransitLegBuilder() {} public ScheduledTransitLegBuilder(ScheduledTransitLeg original) { @@ -40,6 +44,11 @@ public ScheduledTransitLegBuilder(ScheduledTransitLeg original) { generalizedCost = original.getGeneralizedCost(); accessibilityScore = original.accessibilityScore(); zoneId = original.getZoneId(); + fareProducts = original.fareProducts(); + } + + public List fareProducts() { + return fareProducts; } public B withTripTimes(TripTimes tripTimes) { From e392843b0b1e5d6289eb90ee48224d1b0f4ed843 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 6 Jun 2024 15:13:07 -0700 Subject: [PATCH 1307/1688] remove redundant initializer --- .../org/opentripplanner/model/plan/ScheduledTransitLeg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index f058bfc9955..1e9dc6754ab 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -63,7 +63,7 @@ public class ScheduledTransitLeg implements TransitLeg { private double distanceMeters; private final double directDistanceMeters; private final Float accessibilityScore; - private List fareProducts = List.of(); + private List fareProducts; protected ScheduledTransitLeg(ScheduledTransitLegBuilder builder) { this.tripTimes = builder.tripTimes(); From 34014028100b31913e9c6c7453c723039ef85b67 Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 6 Jun 2024 15:17:37 -0700 Subject: [PATCH 1308/1688] Revert "remove redundant initializer" This reverts commit e392843b0b1e5d6289eb90ee48224d1b0f4ed843. --- .../org/opentripplanner/model/plan/ScheduledTransitLeg.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index 1e9dc6754ab..f058bfc9955 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -63,7 +63,7 @@ public class ScheduledTransitLeg implements TransitLeg { private double distanceMeters; private final double directDistanceMeters; private final Float accessibilityScore; - private List fareProducts; + private List fareProducts = List.of(); protected ScheduledTransitLeg(ScheduledTransitLegBuilder builder) { this.tripTimes = builder.tripTimes(); From 50a3825f1c3968af682e4edf8f55c32cedd00abd Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 6 Jun 2024 15:22:12 -0700 Subject: [PATCH 1309/1688] Revert "fix: ensure connsolidated transit leg carries over fare" This reverts commit 6dc7da455f32c976fc4a23c0d8b9caf66cd5f2c0. --- .../DecorateConsolidatedStopNamesTest.java | 21 ------------------- .../model/plan/ScheduledTransitLeg.java | 2 -- .../plan/ScheduledTransitLegBuilder.java | 9 -------- 3 files changed, 32 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java index 7f389bc41ec..d823a55cc4a 100644 --- a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java @@ -5,34 +5,18 @@ import static org.opentripplanner.ext.stopconsolidation.TestStopConsolidationModel.STOP_D; import static org.opentripplanner.model.plan.PlanTestConstants.T11_05; import static org.opentripplanner.model.plan.PlanTestConstants.T11_12; -import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; -import org.opentripplanner.model.fare.FareProduct; -import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.TestItineraryBuilder; -import org.opentripplanner.transit.model.basic.Money; class DecorateConsolidatedStopNamesTest { - private static final FareProduct fp = new FareProduct( - id("fp"), - "fare product", - Money.euros(10.00f), - null, - null, - null - ); - private static final List fpu = List.of( - new FareProductUse("c1a04702-1fb6-32d4-ba02-483bf68111ed", fp) - ); - @Test void changeNames() { var transitModel = TestStopConsolidationModel.buildTransitModel(); @@ -51,15 +35,10 @@ void changeNames() { .bus(1, T11_05, T11_12, PlanTestConstants.F) .build(); - itinerary.getLegs().getFirst().setFareProducts(fpu); - filter.decorate(itinerary); var updatedLeg = itinerary.getLegs().getFirst(); assertEquals(STOP_C.getName(), updatedLeg.getFrom().name); assertEquals(STOP_D.getName(), updatedLeg.getTo().name); - - // Check that the fares were carried over - assertEquals(fpu, updatedLeg.fareProducts()); } } diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java index f058bfc9955..d94ec1895c2 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLeg.java @@ -85,8 +85,6 @@ protected ScheduledTransitLeg(ScheduledTransitLegBuilder builder) { this.generalizedCost = builder.generalizedCost(); - this.fareProducts = builder.fareProducts(); - this.accessibilityScore = builder.accessibilityScore(); List transitLegCoordinates = extractTransitLegCoordinates( tripPattern, diff --git a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java index bdcf6e9ff3f..3e9b5540b1c 100644 --- a/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java +++ b/src/main/java/org/opentripplanner/model/plan/ScheduledTransitLegBuilder.java @@ -3,8 +3,6 @@ import java.time.LocalDate; import java.time.ZoneId; import java.time.ZonedDateTime; -import java.util.List; -import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.transfer.ConstrainedTransfer; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.TripOnServiceDate; @@ -26,8 +24,6 @@ public class ScheduledTransitLegBuilder> private int generalizedCost; private Float accessibilityScore; - private List fareProducts; - public ScheduledTransitLegBuilder() {} public ScheduledTransitLegBuilder(ScheduledTransitLeg original) { @@ -44,11 +40,6 @@ public ScheduledTransitLegBuilder(ScheduledTransitLeg original) { generalizedCost = original.getGeneralizedCost(); accessibilityScore = original.accessibilityScore(); zoneId = original.getZoneId(); - fareProducts = original.fareProducts(); - } - - public List fareProducts() { - return fareProducts; } public B withTripTimes(TripTimes tripTimes) { From 0ba3e70e9b53ed99b882d2366eb6538892bd8a9e Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 6 Jun 2024 15:22:47 -0700 Subject: [PATCH 1310/1688] test: test if ConsolidatedStop decorator copies fares --- .../DecorateConsolidatedStopNamesTest.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java index d823a55cc4a..7f389bc41ec 100644 --- a/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/stopconsolidation/DecorateConsolidatedStopNamesTest.java @@ -5,18 +5,34 @@ import static org.opentripplanner.ext.stopconsolidation.TestStopConsolidationModel.STOP_D; import static org.opentripplanner.model.plan.PlanTestConstants.T11_05; import static org.opentripplanner.model.plan.PlanTestConstants.T11_12; +import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; +import org.opentripplanner.model.fare.FareProduct; +import org.opentripplanner.model.fare.FareProductUse; import org.opentripplanner.model.plan.Place; import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.model.plan.TestItineraryBuilder; +import org.opentripplanner.transit.model.basic.Money; class DecorateConsolidatedStopNamesTest { + private static final FareProduct fp = new FareProduct( + id("fp"), + "fare product", + Money.euros(10.00f), + null, + null, + null + ); + private static final List fpu = List.of( + new FareProductUse("c1a04702-1fb6-32d4-ba02-483bf68111ed", fp) + ); + @Test void changeNames() { var transitModel = TestStopConsolidationModel.buildTransitModel(); @@ -35,10 +51,15 @@ void changeNames() { .bus(1, T11_05, T11_12, PlanTestConstants.F) .build(); + itinerary.getLegs().getFirst().setFareProducts(fpu); + filter.decorate(itinerary); var updatedLeg = itinerary.getLegs().getFirst(); assertEquals(STOP_C.getName(), updatedLeg.getFrom().name); assertEquals(STOP_D.getName(), updatedLeg.getTo().name); + + // Check that the fares were carried over + assertEquals(fpu, updatedLeg.fareProducts()); } } From 447375f96031c91bdb9805ec1206035a3b57a6fe Mon Sep 17 00:00:00 2001 From: Daniel Heppner Date: Thu, 6 Jun 2024 15:24:03 -0700 Subject: [PATCH 1311/1688] fix: copy transit fares in ConsolidatedStopLeg --- .../ext/stopconsolidation/model/ConsolidatedStopLeg.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java index a784bb5900e..cf39b0d2bf1 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/model/ConsolidatedStopLeg.java @@ -15,6 +15,7 @@ public ConsolidatedStopLeg(ScheduledTransitLeg original, StopLocation from, Stop super(new ScheduledTransitLegBuilder<>(original)); this.from = Objects.requireNonNull(from); this.to = Objects.requireNonNull(to); + this.setFareProducts(original.fareProducts()); } @Override From af283a57637338315d3d13dea05da1540b87e259 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 00:03:54 +0000 Subject: [PATCH 1312/1688] fix(deps): update dependency com.google.cloud:libraries-bom to v26.40.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5880d9dcc62..b0fa431e40a 100644 --- a/pom.xml +++ b/pom.xml @@ -545,7 +545,7 @@ com.google.cloud libraries-bom - 26.34.0 + 26.40.0 pom import From 489a68d36d839809f3e6b0153a7b3d55ecff9b7e Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Jun 2024 00:04:00 +0000 Subject: [PATCH 1313/1688] fix(deps): update dependency com.google.guava:guava to v33.2.1-jre --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5880d9dcc62..58055a003c9 100644 --- a/pom.xml +++ b/pom.xml @@ -725,7 +725,7 @@ com.google.guava guava - 33.0.0-jre + 33.2.1-jre From 26d73e67b2732d3cdb5a8f3c9f950af2da47a935 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 7 Jun 2024 05:39:45 +0000 Subject: [PATCH 1314/1688] Add changelog entry for #5891 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 92a87116a17..fe820b8a5e8 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -26,6 +26,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add OTP request timeout GraphQL instrumentation [#5881](https://github.com/opentripplanner/OpenTripPlanner/pull/5881) - Add feed publisher name and url to GTFS GraphQL API [#5835](https://github.com/opentripplanner/OpenTripPlanner/pull/5835) - Add support for query parameter to enforce booking time in trip search for flexible services [#5606](https://github.com/opentripplanner/OpenTripPlanner/pull/5606) +- Fix parsing of GBFS feeds [#5891](https://github.com/opentripplanner/OpenTripPlanner/pull/5891) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 348abd77f1fabf38fe69f0d49c3a69e60cba7322 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Fri, 7 Jun 2024 07:08:47 +0000 Subject: [PATCH 1315/1688] Add changelog entry for #5867 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index fe820b8a5e8..00a9f3a961e 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -27,6 +27,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add feed publisher name and url to GTFS GraphQL API [#5835](https://github.com/opentripplanner/OpenTripPlanner/pull/5835) - Add support for query parameter to enforce booking time in trip search for flexible services [#5606](https://github.com/opentripplanner/OpenTripPlanner/pull/5606) - Fix parsing of GBFS feeds [#5891](https://github.com/opentripplanner/OpenTripPlanner/pull/5891) +- Fix SIRI update travel back in time [#5867](https://github.com/opentripplanner/OpenTripPlanner/pull/5867) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From bd35ec5ba57225ad65dd31b6ac70d9191dc749e5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 6 Jun 2024 12:04:55 +0200 Subject: [PATCH 1316/1688] Clean out Siri code --- .../ext/siri/SiriTripPatternCache.java | 128 ------------------ .../ext/siri/updater/SiriHelper.java | 40 ------ 2 files changed, 168 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java index 8b5896a1bf6..40c008d0004 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTripPatternCache.java @@ -1,22 +1,13 @@ package org.opentripplanner.ext.siri; -import com.google.common.collect.ArrayListMultimap; -import com.google.common.collect.ListMultimap; -import com.google.common.collect.Multimaps; import java.time.LocalDate; -import java.util.Arrays; import java.util.HashMap; -import java.util.List; import java.util.Map; import java.util.function.Function; import javax.annotation.Nonnull; import org.opentripplanner.transit.model.network.StopPattern; import org.opentripplanner.transit.model.network.TripPattern; -import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.timetable.Trip; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Threadsafe mechanism for tracking any TripPatterns added to the graph via SIRI realtime messages. @@ -39,23 +30,11 @@ */ public class SiriTripPatternCache { - private static final Logger LOG = LoggerFactory.getLogger(SiriTripPatternCache.class); - // TODO RT_AB: Improve documentation. This seems to be the primary collection of added // TripPatterns, with other collections serving as indexes. Similar to TripPatternCache.cache // in the GTFS version of this class, but with service date as part of the key. private final Map cache = new HashMap<>(); - // TODO RT_AB: Improve documentation. This field appears to be an index that exists only in the - // SIRI version of this class (i.e. this version and not the older TripPatternCache that - // handles GTFS-RT). This index appears to be tailored for use by the Transmodel GraphQL APIs. - private final ListMultimap patternsForStop = Multimaps.synchronizedListMultimap( - ArrayListMultimap.create() - ); - - // TODO RT_AB: clarify name and add documentation to this field. - private final Map updatedTripPatternsForTripCache = new HashMap<>(); - // TODO RT_AB: generalize this so we can generate IDs for SIRI or GTFS-RT sources. private final SiriTripPatternIdGenerator tripPatternIdGenerator; @@ -128,85 +107,8 @@ public synchronized TripPattern getOrCreateTripPattern( cache.put(key, tripPattern); } - /* - When the StopPattern is first modified (e.g. change of platform), then updated (or vice - versa), the stopPattern is altered, and the StopPattern-object for the different states will - not be equal. - - This causes both tripPatterns to be added to all unchanged stops along the route, which again - causes duplicate results in departureRow-searches (one departure for "updated", one for - "modified"). - - Full example: - Planned stops: Stop 1 - Platform 1, Stop 2 - Platform 1 - - StopPattern #rt1: "updated" stopPattern cached in 'patternsForStop': - - Stop 1, Platform 1 - - StopPattern #rt1 - - Stop 2, Platform 1 - - StopPattern #rt1 - - "modified" stopPattern: Stop 1 - Platform 1, Stop 2 - Platform 2 - - StopPattern #rt2: "modified" stopPattern cached in 'patternsForStop' will then be: - - Stop 1, Platform 1 - - StopPattern #rt1, StopPattern #rt2 - - Stop 2, Platform 1 - - StopPattern #rt1 - - Stop 2, Platform 2 - - StopPattern #rt2 - - Therefore, we must clean up the duplicates by deleting the previously added (and thus - outdated) tripPattern for all affected stops. In example above, "StopPattern #rt1" should be - removed from all stops. - - TODO RT_AB: review why this particular case is handled in an ad-hoc manner. It seems like all - such indexes should be constantly rebuilt and versioned along with the TimetableSnapshot. - */ - TripServiceDateKey tripServiceDateKey = new TripServiceDateKey(trip, serviceDate); - if (updatedTripPatternsForTripCache.containsKey(tripServiceDateKey)) { - // Remove previously added TripPatterns for the trip currently being updated - if the stopPattern does not match - TripPattern cachedTripPattern = updatedTripPatternsForTripCache.get(tripServiceDateKey); - if (cachedTripPattern != null && !tripPattern.stopPatternIsEqual(cachedTripPattern)) { - int sizeBefore = patternsForStop.values().size(); - long t1 = System.currentTimeMillis(); - patternsForStop.values().removeAll(Arrays.asList(cachedTripPattern)); - int sizeAfter = patternsForStop.values().size(); - - LOG.debug( - "Removed outdated TripPattern for {} stops in {} ms - tripId: {}", - (sizeBefore - sizeAfter), - (System.currentTimeMillis() - t1), - trip.getId() - ); - // TODO: Also remove previously updated - now outdated - TripPattern from cache ? - // cache.remove(new StopPatternServiceDateKey(cachedTripPattern.stopPattern, serviceDate)); - } - } - - // To make these trip patterns visible for departureRow searches. - for (var stop : tripPattern.getStops()) { - if (!patternsForStop.containsEntry(stop, tripPattern)) { - patternsForStop.put(stop, tripPattern); - } - } - - // Cache the last added tripPattern that has been used to update a specific trip - updatedTripPatternsForTripCache.put(tripServiceDateKey, tripPattern); - return tripPattern; } - - /** - * Returns any new TripPatterns added by real time information for a given stop. - * TODO RT_AB: this appears to be currently unused. Perhaps remove it if the API has changed. - * - * @param stop the stop - * @return list of TripPatterns created by real time sources for the stop. - */ - public List getAddedTripPatternsForStop(RegularStop stop) { - return patternsForStop.get(stop); - } } // TODO RT_AB: move the below classes inside the above class as private static inner classes. @@ -243,33 +145,3 @@ public boolean equals(Object thatObject) { return (this.stopPattern.equals(that.stopPattern) && this.serviceDate.equals(that.serviceDate)); } } - -/** - * An alternative key for looking up realtime-added TripPatterns by trip and service date instead - * of stop pattern and service date. Must define hashcode and equals to confer semantic identity. - * TODO RT_AB: verify whether one map is considered the definitive collection and the other an index. - */ -class TripServiceDateKey { - - Trip trip; - LocalDate serviceDate; - - public TripServiceDateKey(Trip trip, LocalDate serviceDate) { - this.trip = trip; - this.serviceDate = serviceDate; - } - - @Override - public int hashCode() { - return trip.hashCode() + serviceDate.hashCode(); - } - - @Override - public boolean equals(Object thatObject) { - if (!(thatObject instanceof TripServiceDateKey)) { - return false; - } - TripServiceDateKey that = (TripServiceDateKey) thatObject; - return (this.trip.equals(that.trip) && this.serviceDate.equals(that.serviceDate)); - } -} diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHelper.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHelper.java index 618c5e0c31c..0f1bd449075 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHelper.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriHelper.java @@ -7,20 +7,15 @@ import java.util.UUID; import javax.xml.stream.XMLStreamException; import org.rutebanken.siri20.util.SiriXml; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import uk.org.siri.siri20.EstimatedTimetableRequestStructure; import uk.org.siri.siri20.MessageQualifierStructure; import uk.org.siri.siri20.RequestorRef; import uk.org.siri.siri20.ServiceRequest; import uk.org.siri.siri20.Siri; import uk.org.siri.siri20.SituationExchangeRequestStructure; -import uk.org.siri.siri20.VehicleMonitoringRequestStructure; public class SiriHelper { - private static final Logger LOG = LoggerFactory.getLogger(SiriHelper.class); - public static Siri unmarshal(InputStream is) throws JAXBException, XMLStreamException { return SiriXml.parseXml(is); } @@ -30,16 +25,6 @@ public static String createSXServiceRequestAsXml(String requestorRef) throws JAX return SiriXml.toXml(request); } - public static String createVMServiceRequestAsXml(String requestorRef) throws JAXBException { - Siri request = createVMServiceRequest(requestorRef); - return SiriXml.toXml(request); - } - - public static String createETServiceRequestAsXml(String requestorRef) throws JAXBException { - Siri request = createETServiceRequest(requestorRef, null); - return SiriXml.toXml(request); - } - public static String createETServiceRequestAsXml(String requestorRef, Duration previewInterval) throws JAXBException { Siri request = createETServiceRequest(requestorRef, previewInterval); @@ -106,29 +91,4 @@ private static Siri createETServiceRequest(String requestorRefValue, Duration pr return request; } - - private static Siri createVMServiceRequest(String requestorRefValue) { - Siri request = createSiriObject(); - - ServiceRequest serviceRequest = new ServiceRequest(); - serviceRequest.setRequestTimestamp(ZonedDateTime.now()); - - RequestorRef requestorRef = new RequestorRef(); - requestorRef.setValue(requestorRefValue); - serviceRequest.setRequestorRef(requestorRef); - - VehicleMonitoringRequestStructure vmRequest = new VehicleMonitoringRequestStructure(); - vmRequest.setRequestTimestamp(ZonedDateTime.now()); - vmRequest.setVersion("2.0"); - - MessageQualifierStructure messageIdentifier = new MessageQualifierStructure(); - messageIdentifier.setValue(UUID.randomUUID().toString()); - - vmRequest.setMessageIdentifier(messageIdentifier); - serviceRequest.getVehicleMonitoringRequests().add(vmRequest); - - request.setServiceRequest(serviceRequest); - - return request; - } } From 83da1d88c09363983abf99624b7038ac6a21ce2e Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 7 Jun 2024 11:09:23 +0300 Subject: [PATCH 1317/1688] Clean up tests --- .../updater/trip/RealtimeTestEnvironment.java | 8 -------- .../trip/TimetableSnapshotSourceTest.java | 16 ++++++---------- .../cancellation/CancellationDeletionTest.java | 2 -- .../trip/moduletests/delay/SkippedTest.java | 4 ---- 4 files changed, 6 insertions(+), 24 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index e69b60b93fb..52b0547e8c9 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -208,14 +208,6 @@ public TimetableSnapshot getTimetableSnapshot() { } } - public void commitTimetableSnapshot(boolean force) { - if (siriSource != null) { - siriSource.commitTimetableSnapshot(force); - } else { - gtfsSource.commitTimetableSnapshot(force); - } - } - public String getRealtimeTimetable(String tripId) { return getRealtimeTimetable(id(tripId), SERVICE_DATE); } diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 384698668fd..96396610aa1 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -595,20 +595,16 @@ public void addedTrip() { ); // THEN - assertAddedTrip(SERVICE_DATE, this.addedTripId, updater, false); + assertAddedTrip(SERVICE_DATE, this.addedTripId, updater); } private TripPattern assertAddedTrip( LocalDate serviceDate, String tripId, - TimetableSnapshotSource updater, - boolean forceSnapshotCommit + TimetableSnapshotSource updater ) { var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A")); // Get the trip pattern of the added trip which goes through stopA - if (forceSnapshotCommit) { - updater.commitTimetableSnapshot(true); - } var snapshot = updater.getTimetableSnapshot(); var patternsAtA = snapshot.getPatternsForStop(stopA); @@ -671,7 +667,7 @@ public void addedTripWithNewRoute() { assertTrue(result.warnings().isEmpty()); - var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false); + var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); var route = pattern.getRoute(); assertEquals(TripUpdateBuilder.ROUTE_URL, route.getUrl()); @@ -724,7 +720,7 @@ public void addedWithUnknownStop() { assertEquals(List.of(WarningType.UNKNOWN_STOPS_REMOVED_FROM_ADDED_TRIP), result.warnings()); - var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false); + var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); assertEquals(2, pattern.getStops().size()); } @@ -759,7 +755,7 @@ public void repeatedlyAddedTripWithNewRoute() { List.of(tripUpdate), feedId ); - var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false); + var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); var firstRoute = pattern.getRoute(); // apply the update a second time to check that no new route instance is created but the old one is reused @@ -770,7 +766,7 @@ public void repeatedlyAddedTripWithNewRoute() { List.of(tripUpdate), feedId ); - var secondPattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater, false); + var secondPattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); var secondRoute = secondPattern.getRoute(); // THEN diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index ac8462eb133..f6b6b128330 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -91,8 +91,6 @@ public void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState assertEquals(1, result.successful()); - env.commitTimetableSnapshot(true); - // Cancel or delete the added trip update = new TripUpdateBuilder( diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 114ba911857..7bee7c1b5d0 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -147,10 +147,6 @@ public void scheduledTripWithPreviouslySkipped() { assertEquals(1, result.successful()); - // Force a snapshot commit. This is done to mimic normal behaviour where a new update arrives - // after the original snapshot has been committed - env.commitTimetableSnapshot(true); - // Create update to the same trip but now the skipped stop is no longer skipped var scheduledBuilder = new TripUpdateBuilder( tripId.getId(), From cac01d38c4b0162d35f3b8fcebdac59dc9e96eb2 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 7 Jun 2024 11:01:51 +0200 Subject: [PATCH 1318/1688] Apply review suggestions --- docs/RouterConfiguration.md | 2 +- .../org/opentripplanner/standalone/config/RouterConfig.java | 2 +- .../standalone/config/sandbox/TransmodelAPIConfig.java | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index cf2abdfc515..48365eeffb7 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -431,7 +431,7 @@ Only turn this feature on if you have unique ids across all feeds, without the f The maximum number of fields in a GraphQL result -Enforce rate limiting based on query complexity: queries that return too much data are cancelled. +Enforce rate limiting based on query complexity; Queries that return too much data are cancelled.

              tracingHeaderTags

              diff --git a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java index 74b89f8e56a..4ac0688a759 100644 --- a/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/RouterConfig.java @@ -65,7 +65,7 @@ public RouterConfig(JsonNode node, String source, boolean logUnusedParams) { .asString(null); this.server = new ServerConfig("server", root); - this.transmodelApi = new TransmodelAPIConfig(root); + this.transmodelApi = new TransmodelAPIConfig("transmodelApi", root); this.routingRequestDefaults = mapDefaultRouteRequest("routingDefaults", root); this.transitConfig = new TransitRoutingConfig("transit", root, routingRequestDefaults); this.routingRequestDefaults.setMaxSearchWindow(transitConfig.maxSearchWindow()); diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java index be327a25e88..1a84b742185 100644 --- a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java @@ -17,9 +17,9 @@ public class TransmodelAPIConfig implements TransmodelAPIParameters { private final Collection tracingHeaderTags; private final int maxNumberOfResultFields; - public TransmodelAPIConfig(NodeAdapter root) { + public TransmodelAPIConfig(String parameterName, NodeAdapter root) { var c = root - .of("transmodelApi") + .of(parameterName) .since(V2_1) .summary("Configuration for the Transmodel GraphQL API.") .asObject(); @@ -44,7 +44,7 @@ public TransmodelAPIConfig(NodeAdapter root) { .of("maxNumberOfResultFields") .summary("The maximum number of fields in a GraphQL result") .description( - "Enforce rate limiting based on query complexity: queries that return too much data are" + + "Enforce rate limiting based on query complexity; Queries that return too much data are" + " cancelled." ) .asInt(1_000_000); From bc06c146b0256ab444274e6a7464a10788310012 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Fri, 7 Jun 2024 12:22:18 +0300 Subject: [PATCH 1319/1688] Refactor and fix potential issue with added trip not being detected --- .../updater/trip/TimetableSnapshotSource.java | 82 +++++++++++++------ 1 file changed, 55 insertions(+), 27 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index b27dd31e8f6..66ababa791d 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -194,28 +194,8 @@ public UpdateResult applyTripUpdates( final TripDescriptor.ScheduleRelationship tripScheduleRelationship = determineTripScheduleRelationship( tripDescriptor ); - var canceledPreviouslyAddedTrip = false; if (!fullDataset) { - // Check whether trip id has been used for previously ADDED trip message and mark previously - // created trip as DELETED unless schedule relationship is CANCELED, then as CANCEL - var cancelationType = tripScheduleRelationship == - TripDescriptor.ScheduleRelationship.CANCELED - ? CancelationType.CANCEL - : CancelationType.DELETE; - canceledPreviouslyAddedTrip = - cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType); - // Remove previous realtime updates for this trip. This is necessary to avoid previous - // stop pattern modifications from persisting. If a trip was previously added with the ScheduleRelationship - // ADDED and is now cancelled or deleted, we still want to keep the realtime added trip pattern. - if ( - !canceledPreviouslyAddedTrip || - ( - tripScheduleRelationship != TripDescriptor.ScheduleRelationship.CANCELED && - tripScheduleRelationship != TripDescriptor.ScheduleRelationship.DELETED - ) - ) { - this.buffer.revertTripToScheduledTripPattern(tripId, serviceDate); - } + purgePatternModifications(tripScheduleRelationship, tripId, serviceDate); } uIndex += 1; @@ -242,13 +222,13 @@ public UpdateResult applyTripUpdates( tripId, serviceDate, CancelationType.CANCEL, - canceledPreviouslyAddedTrip + fullDataset ); case DELETED -> handleCanceledTrip( tripId, serviceDate, CancelationType.DELETE, - canceledPreviouslyAddedTrip + fullDataset ); case REPLACEMENT -> validateAndHandleModifiedTrip( tripUpdate, @@ -287,6 +267,51 @@ public UpdateResult applyTripUpdates( return updateResult; } + /** + * Remove previous realtime updates for this trip. This is necessary to avoid previous stop + * pattern modifications from persisting. If a trip was previously added with the + * ScheduleRelationship ADDED and is now cancelled or deleted, we still want to keep the realtime + * added trip pattern. + */ + private void purgePatternModifications( + TripDescriptor.ScheduleRelationship tripScheduleRelationship, + FeedScopedId tripId, + LocalDate serviceDate + ) { + final TripPattern pattern = buffer.getRealtimeAddedTripPattern(tripId, serviceDate); + if ( + !isPreviouslyAddedTrip(tripId, pattern, serviceDate) || + ( + tripScheduleRelationship != TripDescriptor.ScheduleRelationship.CANCELED && + tripScheduleRelationship != TripDescriptor.ScheduleRelationship.DELETED + ) + ) { + // Remove previous realtime updates for this trip. This is necessary to avoid previous + // stop pattern modifications from persisting. If a trip was previously added with the ScheduleRelationship + // ADDED and is now cancelled or deleted, we still want to keep the realtime added trip pattern. + this.buffer.revertTripToScheduledTripPattern(tripId, serviceDate); + } + } + + private boolean isPreviouslyAddedTrip( + FeedScopedId tripId, + TripPattern pattern, + LocalDate serviceDate + ) { + if (pattern == null) { + return false; + } + var timetable = buffer.resolve(pattern, serviceDate); + if (timetable == null) { + return false; + } + var tripTimes = timetable.getTripTimes(tripId); + if (tripTimes == null) { + return false; + } + return tripTimes.getRealTimeState() == RealTimeState.ADDED; + } + private static void logUpdateResult( String feedId, Map failuresByRelationship, @@ -900,8 +925,7 @@ private boolean cancelPreviouslyAddedTrip( boolean cancelledAddedTrip = false; final TripPattern pattern = buffer.getRealtimeAddedTripPattern(tripId, serviceDate); - // If pattern doesn't have an original trip pattern, it was created through an ADDED update. - if (pattern != null && pattern.getOriginalTripPattern() == null) { + if (isPreviouslyAddedTrip(tripId, pattern, serviceDate)) { // Cancel trip times for this trip in this pattern final Timetable timetable = buffer.resolve(pattern, serviceDate); final int tripIndex = timetable.getTripIndex(tripId); @@ -1029,9 +1053,13 @@ private Result handleCanceledTrip( FeedScopedId tripId, final LocalDate serviceDate, CancelationType cancelationType, - boolean canceledPreviouslyAddedTrip + boolean fullDataset ) { - // if previously a added trip was removed, there can't be a scheduled trip to remove + var canceledPreviouslyAddedTrip = fullDataset + ? false + : cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType); + + // if previously an added trip was removed, there can't be a scheduled trip to remove if (canceledPreviouslyAddedTrip) { return Result.success(UpdateSuccess.noWarnings()); } From c3c298e06c5bd41fa0c3c26e8e5cbde581f7adee Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 7 Jun 2024 12:20:59 +0200 Subject: [PATCH 1320/1688] Add test for transferSlack parsing --- .../routerequest/RouteRequestConfigTest.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java b/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java index 923a140fa38..8d45e7d0509 100644 --- a/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java @@ -95,4 +95,23 @@ public void testAccessEgressPenalty() { streetPreferences.accessEgress().penalty().valueOf(StreetMode.CAR).toString() ); } + + @Test + public void transferSlackAsInt() { + var slack = mapSlack("99"); + assertEquals(99, slack); + } + + private static int mapSlack(String input) { + var nodeAdapter = newNodeAdapterForTest( + """ + { + "transferSlack": %s + } + """.formatted(input) + ); + + var subject = RouteRequestConfig.mapRouteRequest(nodeAdapter); + return subject.preferences().transfer().slack(); + } } From 208a6fee90d817b4905d412e47168f46dec93873 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 7 Jun 2024 12:52:05 +0200 Subject: [PATCH 1321/1688] Convert tranferSlack to duration or int --- docs/RouteRequest.md | 6 +++--- docs/RouterConfiguration.md | 2 +- .../resources/RequestToPreferencesMapper.java | 3 ++- .../request/RaptorRoutingRequestTransitData.java | 2 +- .../request/preference/TransferPreferences.java | 16 +++++++++------- .../config/framework/json/ParameterBuilder.java | 13 +++++++++++++ .../config/routerequest/TransferConfig.java | 2 +- src/test/java/org/opentripplanner/GtfsTest.java | 2 +- .../preference/TransferPreferencesTest.java | 3 ++- .../routing/core/RoutingPreferencesTest.java | 3 ++- .../routerequest/RouteRequestConfigTest.java | 14 +++++++++----- .../standalone/config/router-config.json | 2 +- 12 files changed, 45 insertions(+), 23 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 0fd9ec47f89..1932f8d4232 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -38,7 +38,7 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | [searchWindow](#rd_searchWindow) | `duration` | The duration of the search-window. | *Optional* | | 2.0 | | [streetRoutingTimeout](#rd_streetRoutingTimeout) | `duration` | The maximum time a street routing request is allowed to take before returning the results. | *Optional* | `"PT5S"` | 2.2 | | [transferPenalty](#rd_transferPenalty) | `integer` | An additional penalty added to boardings after the first. | *Optional* | `0` | 2.0 | -| [transferSlack](#rd_transferSlack) | `integer` | The extra time needed to make a safe transfer in seconds. | *Optional* | `120` | 2.0 | +| [transferSlack](#rd_transferSlack) | `duration` | The extra time needed to make a safe transfer in seconds. | *Optional* | `"PT2M"` | 2.0 | | turnReluctance | `double` | Multiplicative factor on expected turning time. | *Optional* | `1.0` | 2.0 | | [unpreferredCost](#rd_unpreferredCost) | `cost-linear-function` | A cost function used to calculate penalty for an unpreferred route. | *Optional* | `"0s + 1.00 t"` | 2.2 | | waitReluctance | `double` | How much worse is waiting for a transit vehicle than being on a transit vehicle, as a multiplier. | *Optional* | `1.0` | 2.0 | @@ -351,7 +351,7 @@ significant time or walking will still be taken.

              transferSlack

              -**Since version:** `2.0` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `120` +**Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT2M"` **Path:** /routingDefaults The extra time needed to make a safe transfer in seconds. @@ -1181,7 +1181,7 @@ include stairs as a last result. }, "waitReluctance" : 1.0, "otherThanPreferredRoutesPenalty" : 300, - "transferSlack" : 120, + "transferSlack" : "2m", "boardSlackForMode" : { "AIRPLANE" : "35m" }, diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 663c9dd5c8a..8ac824824d8 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -522,7 +522,7 @@ Used to group requests when monitoring OTP. }, "waitReluctance" : 1.0, "otherThanPreferredRoutesPenalty" : 300, - "transferSlack" : 120, + "transferSlack" : "2m", "boardSlackForMode" : { "AIRPLANE" : "35m" }, diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index 6248f71e214..0850967c3a9 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.restapi.resources; import jakarta.validation.constraints.NotNull; +import java.time.Duration; import java.util.function.Consumer; import org.opentripplanner.ext.restapi.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.framework.lang.ObjectUtils; @@ -151,7 +152,7 @@ private void mapTransfer(BoardAndAlightSlack boardAndAlightSlack) { "Invalid parameters: 'minTransferTime' must be greater than or equal to board slack plus alight slack" ); } - transfer.withSlack(req.minTransferTime - boardAndAlightSlack.value); + transfer.withSlack(Duration.ofSeconds(req.minTransferTime - boardAndAlightSlack.value)); } setIfNotNull(req.nonpreferredTransferPenalty, transfer::withNonpreferredCost); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java index 8c310206a01..19b5ccf8502 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java @@ -109,7 +109,7 @@ public RaptorRoutingRequestTransitData( this.slackProvider = new SlackProvider( - request.preferences().transfer().slack(), + (int) request.preferences().transfer().slack().toSeconds(), request.preferences().transit().boardSlack(), request.preferences().transit().alightSlack() ); diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java index 277ca4a1bc8..74c118ad9d1 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java @@ -4,10 +4,12 @@ import static org.opentripplanner.framework.lang.DoubleUtils.doubleEquals; import java.io.Serializable; +import java.time.Duration; import java.util.Objects; import java.util.function.Consumer; import org.opentripplanner.framework.model.Cost; import org.opentripplanner.framework.model.Units; +import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.framework.tostring.ToStringBuilder; import org.opentripplanner.routing.algorithm.transferoptimization.api.TransferOptimizationParameters; @@ -23,7 +25,7 @@ public final class TransferPreferences implements Serializable { private static final int MAX_NUMBER_OF_TRANSFERS = 30; private final Cost cost; - private final int slack; + private final Duration slack; private final double waitReluctance; private final int maxTransfers; private final int maxAdditionalTransfers; @@ -32,7 +34,7 @@ public final class TransferPreferences implements Serializable { private TransferPreferences() { this.cost = Cost.ZERO; - this.slack = 120; + this.slack = Duration.ofMinutes(2); this.waitReluctance = 1.0; this.maxTransfers = 12; this.maxAdditionalTransfers = 5; @@ -42,7 +44,7 @@ private TransferPreferences() { private TransferPreferences(Builder builder) { this.cost = builder.cost; - this.slack = Units.duration(builder.slack); + this.slack = DurationUtils.requireNonNegative(builder.slack); this.waitReluctance = Units.reluctance(builder.waitReluctance); this.maxTransfers = Units.count(builder.maxTransfers, MAX_NUMBER_OF_TRANSFERS); this.maxAdditionalTransfers = @@ -89,7 +91,7 @@ public int cost() { *

              * Unit is seconds. Default value is 2 minutes. */ - public int slack() { + public Duration slack() { return slack; } @@ -183,7 +185,7 @@ public String toString() { return ToStringBuilder .of(TransferPreferences.class) .addObj("cost", cost, DEFAULT.cost) - .addNum("slack", slack, DEFAULT.slack) + .addDuration("slack", slack, DEFAULT.slack) .addNum("waitReluctance", waitReluctance, DEFAULT.waitReluctance) .addNum("maxTransfers", maxTransfers, DEFAULT.maxTransfers) .addNum("maxAdditionalTransfers", maxAdditionalTransfers, DEFAULT.maxAdditionalTransfers) @@ -196,7 +198,7 @@ public static class Builder { private final TransferPreferences original; private Cost cost; - private int slack; + private Duration slack; private Integer maxTransfers; private Integer maxAdditionalTransfers; private double waitReluctance; @@ -223,7 +225,7 @@ public Builder withCost(int cost) { return this; } - public Builder withSlack(int slack) { + public Builder withSlack(Duration slack) { this.slack = slack; return this; } diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index fd8bd00010d..7da2f7f0bf7 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -389,6 +389,19 @@ public Duration asDuration() { return ofRequired(DURATION, node -> parseDuration(node.asText())); } + public Duration asDurationOrSeconds(Duration dflt) { + // we claim that this only accepts durations but in reality it also accepts number of seconds + // we don't want to advertise this fact though + info.withType(DURATION); + setInfoOptional(dflt.toString()); + var node = build(); + if (node.isTextual()) { + return asDuration(dflt); + } else { + return Duration.ofSeconds((long) asDouble(dflt.toSeconds())); + } + } + public List asDurations(List defaultValues) { return ofArrayAsList(DURATION, defaultValues, node -> parseDuration(node.asText())); } diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java index 365c4e89145..37a10ea61d6 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java @@ -46,7 +46,7 @@ static void mapTransferPreferences(NodeAdapter c, TransferPreferences.Builder tx `alightSlack`. """ ) - .asInt(dft.slack()) + .asDurationOrSeconds(dft.slack()) ) .withWaitReluctance( c diff --git a/src/test/java/org/opentripplanner/GtfsTest.java b/src/test/java/org/opentripplanner/GtfsTest.java index 6f14a6db662..c4a6368ca45 100644 --- a/src/test/java/org/opentripplanner/GtfsTest.java +++ b/src/test/java/org/opentripplanner/GtfsTest.java @@ -128,7 +128,7 @@ public Itinerary plan( // Init preferences routingRequest.withPreferences(preferences -> { preferences.withTransfer(tx -> { - tx.withSlack(0); + tx.withSlack(Duration.ZERO); tx.withWaitReluctance(1); tx.withCost(preferLeastTransfers ? 300 : 0); }); diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java index a82a6624376..c17ca018bbe 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java @@ -4,12 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertSame; import static org.opentripplanner.routing.api.request.preference.ImmutablePreferencesAsserts.assertEqualsAndHashCode; +import java.time.Duration; import org.junit.jupiter.api.Test; class TransferPreferencesTest { private static final int COST = 200; - private static final int SLACK = 150; + private static final Duration SLACK = Duration.ofSeconds(150); private static final double WAIT_RELUCTANCE = 0.95; private static final int MAX_TRANSFERS = 17; private static final int MAX_ADDITIONAL_TRANSFERS = 7; diff --git a/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java b/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java index c3cff43b1a9..da5f8a0b25c 100644 --- a/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/core/RoutingPreferencesTest.java @@ -3,6 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; +import java.time.Duration; import org.junit.jupiter.api.Test; import org.opentripplanner.routing.api.request.preference.RoutingPreferences; @@ -71,7 +72,7 @@ public void copyOfWithWalkChanges() { @Test public void copyOfWithTransferChanges() { var pref = new RoutingPreferences(); - var copy = pref.copyOf().withTransfer(t -> t.withSlack(2)).build(); + var copy = pref.copyOf().withTransfer(t -> t.withSlack(Duration.ofSeconds(2))).build(); assertNotSame(pref, copy); assertNotSame(pref.transfer(), copy.transfer()); diff --git a/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java b/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java index 8d45e7d0509..fca70eaa388 100644 --- a/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java +++ b/src/test/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfigTest.java @@ -5,7 +5,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.standalone.config.framework.json.JsonSupport.newNodeAdapterForTest; +import java.time.Duration; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner.routing.api.request.StreetMode; class RouteRequestConfigTest { @@ -96,13 +99,14 @@ public void testAccessEgressPenalty() { ); } - @Test - public void transferSlackAsInt() { - var slack = mapSlack("99"); - assertEquals(99, slack); + @ParameterizedTest + @ValueSource(strings = { "99", "\"99s\"", "\"1m39s\"", "\"PT1m39s\"" }) + public void transferSlackAsIntOrDuration(String input) { + var slack = mapSlack(input); + assertEquals(Duration.ofSeconds(99), slack); } - private static int mapSlack(String input) { + private static Duration mapSlack(String input) { var nodeAdapter = newNodeAdapterForTest( """ { diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json index cee86fafa2e..a2a6401985f 100644 --- a/src/test/resources/standalone/config/router-config.json +++ b/src/test/resources/standalone/config/router-config.json @@ -79,7 +79,7 @@ }, "waitReluctance": 1.0, "otherThanPreferredRoutesPenalty": 300, - "transferSlack": 120, + "transferSlack": "2m", // Default slack for any mode is 0 (zero) "boardSlackForMode": { "AIRPLANE": "35m" From 5f46bea2c2f84faa420e6bcf7f7d57f1d2c44446 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 7 Jun 2024 13:14:41 +0200 Subject: [PATCH 1322/1688] Also set slack in APIs --- docs/examples/entur/router-config.json | 2 +- docs/examples/ibi/portland/router-config.json | 2 +- docs/examples/skanetrafiken/router-config.json | 2 +- .../apis/transmodel/mapping/PreferencesMapper.java | 2 +- .../preferences/TransferPreferencesMapper.java | 12 ++++++++---- .../transmodel/model/DefaultRouteRequestType.java | 2 +- .../apis/transmodel/model/plan/TripQuery.java | 2 +- .../transmodel/mapping/TripRequestMapperTest.java | 13 +++++++++++-- .../request/preference/TransferPreferencesTest.java | 2 +- .../skanetrafiken/speed-test-config.json | 2 +- 10 files changed, 27 insertions(+), 14 deletions(-) diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json index 0cbded8bc85..57298b0f26c 100644 --- a/docs/examples/entur/router-config.json +++ b/docs/examples/entur/router-config.json @@ -52,7 +52,7 @@ }, "waitReluctance": 1.0, "otherThanPreferredRoutesPenalty": 300, - "transferSlack": 120, + "transferSlack": "2m", // Default slack for any mode is 0 (zero) "boardSlackForMode": { "AIRPLANE" : "2100s" diff --git a/docs/examples/ibi/portland/router-config.json b/docs/examples/ibi/portland/router-config.json index 445738762a1..0bf3547dbfd 100644 --- a/docs/examples/ibi/portland/router-config.json +++ b/docs/examples/ibi/portland/router-config.json @@ -3,7 +3,7 @@ "maxJourneyDuration": "6h", "boardSlack": "0s", "alightSlack": "0s", - "transferSlack": 180, + "transferSlack": "3m", "waitReluctance": 0.9, "walk": { "reluctance": 1.75, diff --git a/docs/examples/skanetrafiken/router-config.json b/docs/examples/skanetrafiken/router-config.json index 6d782879a52..a50df947fc9 100644 --- a/docs/examples/skanetrafiken/router-config.json +++ b/docs/examples/skanetrafiken/router-config.json @@ -3,7 +3,7 @@ "itineraryFilters": { "filterItinerariesWithSameFirstOrLastTrip": true }, - "transferSlack": 180, + "transferSlack": "3m", "waitReluctance": 0.175, "walk": { "reluctance": 5 diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java index a86193553f2..0a49ca985b3 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/PreferencesMapper.java @@ -26,7 +26,7 @@ static void mapPreferences( preferences.withBike(bike -> mapBikePreferences(bike, callWith)); preferences.withCar(car -> mapCarPreferences(car, callWith)); preferences.withScooter(scooter -> mapScooterPreferences(scooter, callWith)); - preferences.withTransfer(transfer -> mapTransferPreferences(transfer, environment, callWith)); + preferences.withTransfer(transfer -> mapTransferPreferences(transfer, callWith)); preferences.withTransit(transit -> mapTransitPreferences(transit, environment, callWith)); preferences.withItineraryFilter(itineraryFilter -> mapItineraryFilterPreferences(itineraryFilter, environment, callWith) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java index 4bb8bbbcbec..577bf1e381d 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java @@ -1,6 +1,7 @@ package org.opentripplanner.apis.transmodel.mapping.preferences; -import graphql.schema.DataFetchingEnvironment; +import java.time.Duration; +import java.util.function.Consumer; import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator; import org.opentripplanner.routing.api.request.preference.TransferPreferences; @@ -8,17 +9,20 @@ public class TransferPreferencesMapper { public static void mapTransferPreferences( TransferPreferences.Builder transfer, - DataFetchingEnvironment environment, DataFetcherDecorator callWith ) { callWith.argument("transferPenalty", transfer::withCost); // 'minimumTransferTime' is deprecated, that's why we are mapping 'slack' twice. - callWith.argument("minimumTransferTime", transfer::withSlack); - callWith.argument("transferSlack", transfer::withSlack); + callWith.argument("minimumTransferTime", setSlackFromSeconds(transfer)); + callWith.argument("transferSlack", setSlackFromSeconds(transfer)); callWith.argument("waitReluctance", transfer::withWaitReluctance); callWith.argument("maximumTransfers", transfer::withMaxTransfers); callWith.argument("maximumAdditionalTransfers", transfer::withMaxAdditionalTransfers); } + + private static Consumer setSlackFromSeconds(TransferPreferences.Builder transfer) { + return (Integer secs) -> transfer.withSlack(Duration.ofSeconds(secs)); + } } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java index ea1600864db..6a7a29d8d92 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/DefaultRouteRequestType.java @@ -296,7 +296,7 @@ private GraphQLObjectType createGraphQLType() { "A global minimum transfer time (in seconds) that specifies the minimum amount of time that must pass between exiting one transit vehicle and boarding another." ) .type(Scalars.GraphQLInt) - .dataFetcher(env -> preferences.transfer().slack()) + .dataFetcher(env -> preferences.transfer().slack().toSeconds()) .build() ) .field( diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java index 5ed3264a4fd..b67b26b90b6 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripQuery.java @@ -440,7 +440,7 @@ Normally this is when the search is performed (now), plus a small grace period t "This time is in addition to time it might take to walk between stops." ) .type(Scalars.GraphQLInt) - .defaultValue(preferences.transfer().slack()) + .defaultValue(preferences.transfer().slack().toSeconds()) .build() ) .argument( diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index de6b48c5ef4..2b8d5c609b6 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -15,12 +15,10 @@ import io.micrometer.core.instrument.Metrics; import java.time.Duration; import java.time.LocalDate; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Optional; import java.util.function.Function; import java.util.stream.Stream; import org.junit.jupiter.api.BeforeEach; @@ -28,6 +26,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; +import org.junit.jupiter.params.provider.ValueSource; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.apis.transmodel.TransmodelRequestContext; import org.opentripplanner.ext.emissions.DefaultEmissionsService; @@ -403,6 +402,16 @@ public void testExplicitModes() { assertEquals(StreetMode.WALK, req.journey().transfer().mode()); } + @ParameterizedTest + @ValueSource(strings = {"transferSlack", "minimumTransferTime"}) + public void testTransferSlack(String name) { + Map arguments = Map.of( + name, 101 + ); + var req = TripRequestMapper.createRequest(executionContext(arguments)); + assertEquals(Duration.ofSeconds(101), req.preferences().transfer().slack()); + } + @Test public void testExplicitModesBikeAccess() { Map arguments = Map.of("modes", Map.of("accessMode", StreetMode.BIKE)); diff --git a/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java b/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java index c17ca018bbe..f09ce529a60 100644 --- a/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java +++ b/src/test/java/org/opentripplanner/routing/api/request/preference/TransferPreferencesTest.java @@ -83,7 +83,7 @@ void testToString() { assertEquals( "TransferPreferences{" + "cost: $200, " + - "slack: 150, " + + "slack: 2m30s, " + "waitReluctance: 0.95, " + "maxTransfers: 17, " + "maxAdditionalTransfers: 7, " + diff --git a/test/performance/skanetrafiken/speed-test-config.json b/test/performance/skanetrafiken/speed-test-config.json index 69a12755336..642252937e2 100644 --- a/test/performance/skanetrafiken/speed-test-config.json +++ b/test/performance/skanetrafiken/speed-test-config.json @@ -19,7 +19,7 @@ "speed": 1.38, "reluctance": 5 }, - "transferSlack": 180, + "transferSlack": "3m", "waitReluctance": 0.175, "maxDirectStreetDuration": "1h1m", "boardSlackForMode": { From e99b562ab065022912e69724c586d90d1741cad4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 7 Jun 2024 13:29:21 +0200 Subject: [PATCH 1323/1688] Fix mapping in API layer --- .../resources/RequestToPreferencesMapper.java | 3 +-- .../apis/gtfs/mapping/RouteRequestMapper.java | 2 +- .../preferences/TransferPreferencesMapper.java | 10 ++-------- .../request/preference/TransferPreferences.java | 4 ++++ .../apis/gtfs/mapping/RouteRequestMapperTest.java | 14 ++++++++++++++ .../transmodel/mapping/TripRequestMapperTest.java | 6 ++---- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java index 0850967c3a9..51b2fae86b5 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/RequestToPreferencesMapper.java @@ -1,7 +1,6 @@ package org.opentripplanner.ext.restapi.resources; import jakarta.validation.constraints.NotNull; -import java.time.Duration; import java.util.function.Consumer; import org.opentripplanner.ext.restapi.mapping.LegacyVehicleRoutingOptimizeType; import org.opentripplanner.framework.lang.ObjectUtils; @@ -152,7 +151,7 @@ private void mapTransfer(BoardAndAlightSlack boardAndAlightSlack) { "Invalid parameters: 'minTransferTime' must be greater than or equal to board slack plus alight slack" ); } - transfer.withSlack(Duration.ofSeconds(req.minTransferTime - boardAndAlightSlack.value)); + transfer.withSlackSec(req.minTransferTime - boardAndAlightSlack.value); } setIfNotNull(req.nonpreferredTransferPenalty, transfer::withNonpreferredCost); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java index 4cd6c04b044..be0d709b150 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapper.java @@ -163,7 +163,7 @@ public static RouteRequest toRouteRequest( }); preferences.withTransfer(tx -> { callWith.argument("transferPenalty", tx::withCost); - callWith.argument("minTransferTime", tx::withSlack); + callWith.argument("minTransferTime", tx::withSlackSec); callWith.argument("waitReluctance", tx::withWaitReluctance); callWith.argument("maxTransfers", tx::withMaxTransfers); callWith.argument("nonpreferredTransferPenalty", tx::withNonpreferredCost); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java index 577bf1e381d..c4e6316119d 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/mapping/preferences/TransferPreferencesMapper.java @@ -1,7 +1,5 @@ package org.opentripplanner.apis.transmodel.mapping.preferences; -import java.time.Duration; -import java.util.function.Consumer; import org.opentripplanner.apis.transmodel.support.DataFetcherDecorator; import org.opentripplanner.routing.api.request.preference.TransferPreferences; @@ -14,15 +12,11 @@ public static void mapTransferPreferences( callWith.argument("transferPenalty", transfer::withCost); // 'minimumTransferTime' is deprecated, that's why we are mapping 'slack' twice. - callWith.argument("minimumTransferTime", setSlackFromSeconds(transfer)); - callWith.argument("transferSlack", setSlackFromSeconds(transfer)); + callWith.argument("minimumTransferTime", transfer::withSlackSec); + callWith.argument("transferSlack", transfer::withSlackSec); callWith.argument("waitReluctance", transfer::withWaitReluctance); callWith.argument("maximumTransfers", transfer::withMaxTransfers); callWith.argument("maximumAdditionalTransfers", transfer::withMaxAdditionalTransfers); } - - private static Consumer setSlackFromSeconds(TransferPreferences.Builder transfer) { - return (Integer secs) -> transfer.withSlack(Duration.ofSeconds(secs)); - } } diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java index 74c118ad9d1..fb00f56e15b 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java @@ -225,6 +225,10 @@ public Builder withCost(int cost) { return this; } + public Builder withSlackSec(Number seconds) { + return withSlack(Duration.ofSeconds(seconds.longValue())); + } + public Builder withSlack(Duration slack) { this.slack = slack; return this; diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java index 22a8583d705..f1e9d60d515 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/RouteRequestMapperTest.java @@ -12,6 +12,7 @@ import graphql.execution.ExecutionId; import graphql.schema.DataFetchingEnvironment; import graphql.schema.DataFetchingEnvironmentImpl; +import java.time.Duration; import java.util.Arrays; import java.util.List; import java.util.Locale; @@ -29,6 +30,7 @@ import org.opentripplanner.model.plan.PlanTestConstants; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.preference.TimeSlopeSafetyTriangle; +import org.opentripplanner.routing.api.request.preference.TransferPreferences; import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences; import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.routing.graphfinder.GraphFinder; @@ -217,6 +219,18 @@ void walkReluctance() { assertNotEquals(reluctance, noParamsRequest.preferences().walk().reluctance()); } + @Test + void transferSlack() { + var seconds = 119L; + Map arguments = Map.of("minTransferTime", seconds); + + var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + assertEquals(Duration.ofSeconds(seconds), routeRequest.preferences().transfer().slack()); + + var noParamsReq = RouteRequestMapper.toRouteRequest(executionContext(Map.of()), context); + assertEquals(TransferPreferences.DEFAULT.slack(), noParamsReq.preferences().transfer().slack()); + } + private DataFetchingEnvironment executionContext(Map arguments) { ExecutionInput executionInput = ExecutionInput .newExecutionInput() diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index 2b8d5c609b6..b204c8a419e 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -403,11 +403,9 @@ public void testExplicitModes() { } @ParameterizedTest - @ValueSource(strings = {"transferSlack", "minimumTransferTime"}) + @ValueSource(strings = { "transferSlack", "minimumTransferTime" }) public void testTransferSlack(String name) { - Map arguments = Map.of( - name, 101 - ); + Map arguments = Map.of(name, 101); var req = TripRequestMapper.createRequest(executionContext(arguments)); assertEquals(Duration.ofSeconds(101), req.preferences().transfer().slack()); } From 5874b945d86cce0368e35486141cfb732852c471 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 7 Jun 2024 13:35:38 +0200 Subject: [PATCH 1324/1688] Add minTransferTime to integration test --- .../org/opentripplanner/apis/gtfs/queries/plan-extended.graphql | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index bcd96892e84..aef115eebe8 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -4,6 +4,7 @@ to: { lat: 52.5147, lon: 13.3927 } date: "2023-02-15", time: "11:37", + minTransferTime: 120 parking: { unpreferredCost: 555, preferred: [{ not: [{tags: ["a", "b", "c"]}] }], From 60f407e1ebdc7ed9f11401219650f189d4b8d064 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 7 Jun 2024 13:41:40 +0200 Subject: [PATCH 1325/1688] Add Javadoc --- .../standalone/config/framework/json/ParameterBuilder.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index 7da2f7f0bf7..acfc6f31e6c 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -389,9 +389,12 @@ public Duration asDuration() { return ofRequired(DURATION, node -> parseDuration(node.asText())); } + /** + * Accepts both a string-formatted duration or a number of seconds as a number. + * In the documentation it will claim that it only accepts durations as the number is only for + * backwards compatibility. + */ public Duration asDurationOrSeconds(Duration dflt) { - // we claim that this only accepts durations but in reality it also accepts number of seconds - // we don't want to advertise this fact though info.withType(DURATION); setInfoOptional(dflt.toString()); var node = build(); From e5ea70dcd59a6cfc7b17ba27510d6d2389003ebe Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 7 Jun 2024 14:09:25 +0200 Subject: [PATCH 1326/1688] Update and clarify documentation on board, alight and transfer slack --- docs/RouteRequest.md | 37 +++++++++++++------ .../preference/TransferPreferences.java | 10 ++--- .../routerequest/RouteRequestConfig.java | 26 ++++++++----- .../config/routerequest/TransferConfig.java | 10 ++++- .../opentripplanner/apis/gtfs/schema.graphqls | 2 +- 5 files changed, 57 insertions(+), 28 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 1932f8d4232..601cc2c793e 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -15,9 +15,9 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |--------------------------------------------------------------------------------------------------------------|:----------------------:|------------------------------------------------------------------------------------------------------------------------------------------------|:----------:|------------------|:-----:| -| [alightSlack](#rd_alightSlack) | `duration` | The minimum extra time after exiting a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | +| [alightSlack](#rd_alightSlack) | `duration` | The extra time after exiting a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | | arriveBy | `boolean` | Whether the trip should depart or arrive at the specified date and time. | *Optional* | `false` | 2.0 | -| [boardSlack](#rd_boardSlack) | `duration` | The boardSlack is the minimum extra time to board a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | +| [boardSlack](#rd_boardSlack) | `duration` | The extra time before boarding a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | | [drivingDirection](#rd_drivingDirection) | `enum` | The driving direction to use in the intersection traversal calculation | *Optional* | `"right"` | 2.2 | | elevatorBoardCost | `integer` | What is the cost of boarding a elevator? | *Optional* | `90` | 2.0 | | elevatorBoardTime | `integer` | How long does it take to get on an elevator, on average. | *Optional* | `90` | 2.0 | @@ -38,7 +38,7 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | [searchWindow](#rd_searchWindow) | `duration` | The duration of the search-window. | *Optional* | | 2.0 | | [streetRoutingTimeout](#rd_streetRoutingTimeout) | `duration` | The maximum time a street routing request is allowed to take before returning the results. | *Optional* | `"PT5S"` | 2.2 | | [transferPenalty](#rd_transferPenalty) | `integer` | An additional penalty added to boardings after the first. | *Optional* | `0` | 2.0 | -| [transferSlack](#rd_transferSlack) | `duration` | The extra time needed to make a safe transfer in seconds. | *Optional* | `"PT2M"` | 2.0 | +| [transferSlack](#rd_transferSlack) | `duration` | The extra time needed to make a safe transfer. | *Optional* | `"PT2M"` | 2.0 | | turnReluctance | `double` | Multiplicative factor on expected turning time. | *Optional* | `1.0` | 2.0 | | [unpreferredCost](#rd_unpreferredCost) | `cost-linear-function` | A cost function used to calculate penalty for an unpreferred route. | *Optional* | `"0s + 1.00 t"` | 2.2 | | waitReluctance | `double` | How much worse is waiting for a transit vehicle than being on a transit vehicle, as a multiplier. | *Optional* | `1.0` | 2.0 | @@ -192,22 +192,31 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` **Path:** /routingDefaults -The minimum extra time after exiting a public transport vehicle. +The extra time after exiting a public transport vehicle. The slack is added to the time when going from the transit vehicle to the stop. +This also influences the total time it takes to transfer. See `transferSlack` for more details about +how the total transfer time is calculated. +

              boardSlack

              **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` **Path:** /routingDefaults -The boardSlack is the minimum extra time to board a public transport vehicle. +The extra time before boarding a public transport vehicle. + +The slack is added to the time when going from the stop (offboard) to onboard a transit +vehicle. It is useful for suggesting passengers arrive at the stop a little earlier than they strictly +need to to allow for unexpected circumstances. -The board time is added to the time when going from the stop (offboard) to onboard a transit -vehicle. +This is similar to `transferSlack`, except that this also applies to the first +transit leg in the trip. -This is the same as the `transferSlack`, except that this also applies to to the first -transit leg in the trip. This is the default value used, if not overridden by the `boardSlackList`. +This also influences the total time it takes to transfer. See `transferSlack` for more details about +how the total transfer time is calculated. + +This is the default value used, if not overridden by the `boardSlackList`.

              drivingDirection

              @@ -354,13 +363,19 @@ significant time or walking will still be taken. **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT2M"` **Path:** /routingDefaults -The extra time needed to make a safe transfer in seconds. +The extra time needed to make a safe transfer. -An expected transfer time in seconds that specifies the amount of time that must pass +An expected transfer time that specifies the amount of time that must pass between exiting one public transport vehicle and boarding another. This time is in addition to time it might take to walk between stops plus `boardSlack` and `alightSlack`. +The total transfer time from one vehicle to another is thus calculated as follows: + +``` +totalTransferDuration = alightSlack + walkDuration + transferSlack + boardSlack +``` +

              unpreferredCost

              diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java index fb00f56e15b..85d1d502aac 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java @@ -80,16 +80,16 @@ public int cost() { } /** - * A global minimum transfer time (in seconds) that specifies the minimum amount of time that must + * A global minimum transfer time that specifies the minimum amount of time that must * pass between exiting one transit vehicle and boarding another. This time is in addition to time * it might take to walk between transit stops, the {@link TransitPreferences#alightSlack()}, and the {@link - * TransitPreferences#boardSlack()}. This time should also be overridden by specific transfer timing information in - * transfers.txt + * TransitPreferences#boardSlack()}. + * This time can also be overridden by specific transfer timing information in transfers.txt *

              - * This only apply to transfer between two trips, it does not apply when boarding the first + * This only applies to transfer between two trips, it does not apply when boarding the first * transit. *

              - * Unit is seconds. Default value is 2 minutes. + * Default value is 2 minutes. */ public Duration slack() { return slack; diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index f9ea136fbe2..fb43db833e4 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -202,9 +202,13 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil c .of("alightSlack") .since(V2_0) - .summary("The minimum extra time after exiting a public transport vehicle.") + .summary("The extra time after exiting a public transport vehicle.") .description( - "The slack is added to the time when going from the transit vehicle to the stop." + """ +The slack is added to the time when going from the transit vehicle to the stop. +This also influences the total time it takes to transfer. See `transferSlack` for more details about +how the total transfer time is calculated. +""" ) .asDuration(dft.alightSlack().defaultValue()) ) @@ -228,16 +232,20 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil c .of("boardSlack") .since(V2_0) - .summary( - "The boardSlack is the minimum extra time to board a public transport vehicle." - ) + .summary("The extra time before boarding a public transport vehicle.") .description( """ -The board time is added to the time when going from the stop (offboard) to onboard a transit -vehicle. +The slack is added to the time when going from the stop (offboard) to onboard a transit +vehicle. It is useful for suggesting passengers arrive at the stop a little earlier than they strictly +need to to allow for unexpected circumstances. + +This is similar to `transferSlack`, except that this also applies to the first +transit leg in the trip. + +This also influences the total time it takes to transfer. See `transferSlack` for more details about +how the total transfer time is calculated. -This is the same as the `transferSlack`, except that this also applies to to the first -transit leg in the trip. This is the default value used, if not overridden by the `boardSlackList`. +This is the default value used, if not overridden by the `boardSlackList`. """ ) .asDuration(dft.boardSlack().defaultValue()) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java index 37a10ea61d6..aa68a367f72 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java @@ -37,13 +37,19 @@ static void mapTransferPreferences(NodeAdapter c, TransferPreferences.Builder tx c .of("transferSlack") .since(V2_0) - .summary("The extra time needed to make a safe transfer in seconds.") + .summary("The extra time needed to make a safe transfer.") .description( """ - An expected transfer time in seconds that specifies the amount of time that must pass + An expected transfer time that specifies the amount of time that must pass between exiting one public transport vehicle and boarding another. This time is in addition to time it might take to walk between stops plus `boardSlack` and `alightSlack`. + + The total transfer time from one vehicle to another is thus calculated as follows: + + ``` + totalTransferDuration = alightSlack + walkDuration + transferSlack + boardSlack + ``` """ ) .asDurationOrSeconds(dft.slack()) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 393d5f014db..6828ad958fd 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3169,7 +3169,7 @@ type QueryType { A global minimum transfer time (in seconds) that specifies the minimum amount of time that must pass between exiting one transit vehicle and boarding another. This time is in addition to time it might take to walk - between transit stops. Default value: 0 + between transit stops. Default value: 120 """ minTransferTime: Int From 8e5873a676ad49504447e141a134a6f25cd50a54 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 7 Jun 2024 14:34:53 +0200 Subject: [PATCH 1327/1688] Apply review suggestions --- docs/RouterConfiguration.md | 4 ++-- .../standalone/config/sandbox/TransmodelAPIConfig.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md index 48365eeffb7..19a70c44d0f 100644 --- a/docs/RouterConfiguration.md +++ b/docs/RouterConfiguration.md @@ -65,7 +65,7 @@ A full list of them can be found in the [RouteRequest](RouteRequest.md). |    [transferCacheRequests](#transit_transferCacheRequests) | `object[]` | Routing requests to use for pre-filling the stop-to-stop transfer cache. | *Optional* | | 2.3 | | transmodelApi | `object` | Configuration for the Transmodel GraphQL API. | *Optional* | | 2.1 | |    [hideFeedId](#transmodelApi_hideFeedId) | `boolean` | Hide the FeedId in all API output, and add it to input. | *Optional* | `false` | na | -|    [maxNumberOfResultFields](#transmodelApi_maxNumberOfResultFields) | `integer` | The maximum number of fields in a GraphQL result | *Optional* | `1000000` | na | +|    [maxNumberOfResultFields](#transmodelApi_maxNumberOfResultFields) | `integer` | The maximum number of fields in a GraphQL result | *Optional* | `1000000` | 2.6 | |    [tracingHeaderTags](#transmodelApi_tracingHeaderTags) | `string[]` | Used to group requests when monitoring OTP. | *Optional* | | na | | [updaters](UpdaterConfig.md) | `object[]` | Configuration for the updaters that import various types of data into OTP. | *Optional* | | 1.5 | | [vectorTiles](sandbox/MapboxVectorTilesApi.md) | `object` | Vector tile configuration | *Optional* | | na | @@ -426,7 +426,7 @@ Only turn this feature on if you have unique ids across all feeds, without the f

              maxNumberOfResultFields

              -**Since version:** `na` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `1000000` +**Since version:** `2.6` ∙ **Type:** `integer` ∙ **Cardinality:** `Optional` ∙ **Default value:** `1000000` **Path:** /transmodelApi The maximum number of fields in a GraphQL result diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java index 1a84b742185..16b438a7c5a 100644 --- a/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/TransmodelAPIConfig.java @@ -1,7 +1,7 @@ package org.opentripplanner.standalone.config.sandbox; -import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1; +import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_6; import java.util.Collection; import java.util.Set; @@ -42,6 +42,7 @@ public TransmodelAPIConfig(String parameterName, NodeAdapter root) { maxNumberOfResultFields = c .of("maxNumberOfResultFields") + .since(V2_6) .summary("The maximum number of fields in a GraphQL result") .description( "Enforce rate limiting based on query complexity; Queries that return too much data are" + From 3c2e610372de5c0a2506ee9567ca130ec89ef923 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Jun 2024 03:46:58 +0000 Subject: [PATCH 1328/1688] chore(deps): update debug ui dependencies (non-major) --- client-next/package-lock.json | 112 +++++++++++++++++----------------- client-next/package.json | 10 +-- 2 files changed, 61 insertions(+), 61 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index a97de6f1338..31549a4866d 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -26,9 +26,9 @@ "@testing-library/react": "16.0.0", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.11.0", - "@typescript-eslint/parser": "7.11.0", - "@vitejs/plugin-react": "4.3.0", + "@typescript-eslint/eslint-plugin": "7.12.0", + "@typescript-eslint/parser": "7.12.0", + "@vitejs/plugin-react": "4.3.1", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", @@ -38,9 +38,9 @@ "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.1.0", - "prettier": "3.3.0", + "prettier": "3.3.1", "typescript": "5.4.5", - "vite": "5.2.12", + "vite": "5.2.13", "vitest": "1.6.0" } }, @@ -3816,17 +3816,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.11.0.tgz", - "integrity": "sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz", + "integrity": "sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.11.0", - "@typescript-eslint/type-utils": "7.11.0", - "@typescript-eslint/utils": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0", + "@typescript-eslint/scope-manager": "7.12.0", + "@typescript-eslint/type-utils": "7.12.0", + "@typescript-eslint/utils": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3850,16 +3850,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.11.0.tgz", - "integrity": "sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.12.0.tgz", + "integrity": "sha512-dm/J2UDY3oV3TKius2OUZIFHsomQmpHtsV0FTh1WO8EKgHLQ1QCADUqscPgTpU+ih1e21FQSRjXckHn3txn6kQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "7.11.0", - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/typescript-estree": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0", + "@typescript-eslint/scope-manager": "7.12.0", + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/typescript-estree": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0", "debug": "^4.3.4" }, "engines": { @@ -3879,14 +3879,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz", - "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz", + "integrity": "sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0" + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3897,14 +3897,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz", - "integrity": "sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz", + "integrity": "sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.11.0", - "@typescript-eslint/utils": "7.11.0", + "@typescript-eslint/typescript-estree": "7.12.0", + "@typescript-eslint/utils": "7.12.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3925,9 +3925,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz", - "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.12.0.tgz", + "integrity": "sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg==", "dev": true, "license": "MIT", "engines": { @@ -3939,14 +3939,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz", - "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.12.0.tgz", + "integrity": "sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0", + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3981,16 +3981,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz", - "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.12.0.tgz", + "integrity": "sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.11.0", - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/typescript-estree": "7.11.0" + "@typescript-eslint/scope-manager": "7.12.0", + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/typescript-estree": "7.12.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -4004,13 +4004,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz", - "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz", + "integrity": "sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.11.0", + "@typescript-eslint/types": "7.12.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -4028,9 +4028,9 @@ "dev": true }, "node_modules/@vitejs/plugin-react": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.0.tgz", - "integrity": "sha512-KcEbMsn4Dpk+LIbHMj7gDPRKaTMStxxWRkRmxsg/jVdFdJCZWt1SchZcf0M4t8lIKdwwMsEyzhrcOXRrDPtOBw==", + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.3.1.tgz", + "integrity": "sha512-m/V2syj5CuVnaxcUJOQRel/Wr31FFXRFlnOoq1TVtkCxsY5veGMTEmpWHndrhB2U8ScHtCQB1e+4hWYExQc6Lg==", "dev": true, "license": "MIT", "dependencies": { @@ -9394,9 +9394,9 @@ } }, "node_modules/prettier": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", - "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", + "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", "dev": true, "license": "MIT", "bin": { @@ -11154,9 +11154,9 @@ } }, "node_modules/vite": { - "version": "5.2.12", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.12.tgz", - "integrity": "sha512-/gC8GxzxMK5ntBwb48pR32GGhENnjtY30G4A0jemunsBkiEZFw60s8InGpN8gkhHEkjnRK1aSAxeQgwvFhUHAA==", + "version": "5.2.13", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.13.tgz", + "integrity": "sha512-SSq1noJfY9pR3I1TUENL3rQYDQCFqgD+lM6fTRAM8Nv6Lsg5hDLaXkjETVeBt+7vZBCMoibD+6IWnT2mJ+Zb/A==", "dev": true, "license": "MIT", "dependencies": { diff --git a/client-next/package.json b/client-next/package.json index 60753359edd..66e372f708f 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -35,9 +35,9 @@ "@testing-library/react": "16.0.0", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.11.0", - "@typescript-eslint/parser": "7.11.0", - "@vitejs/plugin-react": "4.3.0", + "@typescript-eslint/eslint-plugin": "7.12.0", + "@typescript-eslint/parser": "7.12.0", + "@vitejs/plugin-react": "4.3.1", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", "eslint-config-prettier": "9.1.0", @@ -47,9 +47,9 @@ "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.1.0", - "prettier": "3.3.0", + "prettier": "3.3.1", "typescript": "5.4.5", - "vite": "5.2.12", + "vite": "5.2.13", "vitest": "1.6.0" } } From 286a51abecab8ff4b69a0351bc8c76ca67537804 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Mon, 10 Jun 2024 05:55:20 +0000 Subject: [PATCH 1329/1688] Upgrade debug client to version 2024/06/2024-06-10T05:54 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index b3929350fe2..a26303b904d 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
              From be8ade265d731377a5e6f0b54a01e3310470749f Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Mon, 10 Jun 2024 07:27:14 +0000 Subject: [PATCH 1330/1688] Add changelog entry for #5883 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 00a9f3a961e..ab05045175a 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -28,6 +28,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Add support for query parameter to enforce booking time in trip search for flexible services [#5606](https://github.com/opentripplanner/OpenTripPlanner/pull/5606) - Fix parsing of GBFS feeds [#5891](https://github.com/opentripplanner/OpenTripPlanner/pull/5891) - Fix SIRI update travel back in time [#5867](https://github.com/opentripplanner/OpenTripPlanner/pull/5867) +- Limit result size and execution time in TransModel GraphQL API [#5883](https://github.com/opentripplanner/OpenTripPlanner/pull/5883) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From 1734b8a61334f4bcf3de140be163fd3f93910296 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 10 Jun 2024 14:21:39 +0200 Subject: [PATCH 1331/1688] Clarify which date formats are allowed --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index b21d7c863a4..3d1d87a5233 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1665,8 +1665,10 @@ type RideHailingEstimate { """ An ISO-8601-formatted local date, i.e. `2024-05-24` for the 24th of May, 2024. + +ISO-8601 allows many different date formats, however only the most common one - `yyyy-MM-dd` - is accepted. """ -scalar LocalDate +scalar LocalDate @specifiedBy(url: "https://www.iso.org/standard/70907.html") """ An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. From 9cfc1d7b8f2bd8f3a36504e70a02465705376cd3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 10 Jun 2024 14:30:30 +0200 Subject: [PATCH 1332/1688] Allow overriding of description --- .../opentripplanner/apis/gtfs/GraphQLScalars.java | 3 ++- .../apis/transmodel/support/GqlUtil.java | 2 +- .../graphql/scalar/DateScalarFactory.java | 14 +++++++++++--- .../graphql/scalar/DateScalarFactoryTest.java | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index a3034cad273..a04e24e391b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -113,7 +113,8 @@ public OffsetDateTime parseLiteral(Object input) throws CoercingParseLiteralExce .build(); public static final GraphQLScalarType LOCAL_DATE_SCALAR = DateScalarFactory.createDateScalar( - "LocalDate" + "LocalDate", + null ); public static final GraphQLScalarType GEOJSON_SCALAR = GraphQLScalarType diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java index 05a8eaa45fa..e94253cf33f 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java @@ -45,7 +45,7 @@ public class GqlUtil { public GqlUtil(ZoneId timeZone) { this.dateTimeScalar = DateTimeScalarFactory.createMillisecondsSinceEpochAsDateTimeStringScalar(timeZone); - this.dateScalar = DateScalarFactory.createDateScalar("Date"); + this.dateScalar = DateScalarFactory.createDateScalar("Date", DateScalarFactory.DESCRIPTION); this.doubleFunctionScalar = DoubleFunctionFactory.createDoubleFunctionScalar(); this.localTimeScalar = LocalTimeScalarFactory.createLocalTimeScalar(); this.timeScalar = TimeScalarFactory.createSecondsSinceMidnightAsTimeObject(); diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java index 9b22357f38a..590dea013a3 100644 --- a/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java +++ b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java @@ -9,21 +9,29 @@ import java.time.LocalDate; import java.time.format.DateTimeFormatter; import java.time.format.DateTimeParseException; +import javax.annotation.Nullable; public class DateScalarFactory { - private static final String DOCUMENTATION = + public static final String DESCRIPTION = "Local date using the ISO 8601 format: `YYYY-MM-DD`. Example: `2020-05-17`."; private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE; private DateScalarFactory() {} - public static GraphQLScalarType createDateScalar(String scalarName) { + /** + * @param description Nullable description that allows caller to pass in null which leads to the + * description from schema.graphqls to be used. + */ + public static GraphQLScalarType createDateScalar( + String scalarName, + @Nullable String description + ) { return GraphQLScalarType .newScalar() .name(scalarName) - .description(DOCUMENTATION) + .description(description) .coercing( new Coercing() { @Override diff --git a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java index d7a3023ab2b..02e4b37d7d6 100644 --- a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java +++ b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java @@ -12,7 +12,7 @@ class DateScalarFactoryTest { - private static final GraphQLScalarType SCALAR = DateScalarFactory.createDateScalar("Date"); + private static final GraphQLScalarType SCALAR = DateScalarFactory.createDateScalar("Date", null); @ParameterizedTest @ValueSource(strings = { "2024-05-23" }) From 591405c5b9f8646ee88fc532889028582ea91ec8 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 10 Jun 2024 14:43:47 +0200 Subject: [PATCH 1333/1688] Instantiate real service instead of mocking it --- .../gtfs/PatternByServiceDatesFilterTest.java | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index 7e0cae144ed..adf7213a5ac 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -8,6 +8,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.NOT_REMOVED; import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.REMOVED; +import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.time.LocalDate; import java.util.ArrayList; @@ -20,6 +21,8 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDateFilterInput; import org.opentripplanner.model.calendar.CalendarService; +import org.opentripplanner.model.calendar.CalendarServiceData; +import org.opentripplanner.model.calendar.impl.CalendarServiceImpl; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; @@ -37,7 +40,12 @@ class PatternByServiceDatesFilterTest { private static final TransitService EMPTY_SERVICE = new DefaultTransitService(new TransitModel()); private static final Route ROUTE_1 = TransitModelForTest.route("1").build(); - private static final Trip TRIP = TransitModelForTest.trip("t1").withRoute(ROUTE_1).build(); + private static final FeedScopedId SERVICE_ID = id("service"); + private static final Trip TRIP = TransitModelForTest + .trip("t1") + .withRoute(ROUTE_1) + .withServiceId(SERVICE_ID) + .build(); private static final TransitModelForTest MODEL = new TransitModelForTest(StopModel.of()); private static final RegularStop STOP_1 = MODEL.stop("1").build(); private static final StopPattern STOP_PATTERN = TransitModelForTest.stopPattern(STOP_1, STOP_1); @@ -146,6 +154,9 @@ void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation) } private static TransitService mockService() { + var data = new CalendarServiceData(); + data.putServiceDatesForServiceId(SERVICE_ID, List.of(parse("2024-05-01"), parse("2024-06-01"))); + var service = new CalendarServiceImpl(data); return new DefaultTransitService(new TransitModel()) { @Override public Collection getPatternsForRoute(Route route) { @@ -154,22 +165,7 @@ public Collection getPatternsForRoute(Route route) { @Override public CalendarService getCalendarService() { - return new CalendarService() { - @Override - public Set getServiceIds() { - return Set.of(); - } - - @Override - public Set getServiceDatesForServiceId(FeedScopedId serviceId) { - return Set.of(parse("2024-05-01"), parse("2024-06-01")); - } - - @Override - public Set getServiceIdsOnDate(LocalDate date) { - return Set.of(); - } - }; + return service; } }; } From 5d29a448b96537f3d74da4f67be57832b60737f2 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 10 Jun 2024 14:58:04 +0200 Subject: [PATCH 1334/1688] Rename argument provider methods --- .../apis/gtfs/PatternByServiceDatesFilterTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index adf7213a5ac..4e5779d41f6 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -73,7 +73,7 @@ private static TripPattern pattern() { return pattern; } - static List invalidRange() { + static List invalidRangeCases() { return List.of( Arguments.of(parse("2024-05-02"), parse("2024-05-01")), Arguments.of(parse("2024-05-03"), parse("2024-05-01")) @@ -81,7 +81,7 @@ static List invalidRange() { } @ParameterizedTest - @MethodSource("invalidRange") + @MethodSource("invalidRangeCases") void invalidRange(LocalDate start, LocalDate end) { assertThrows( IllegalArgumentException.class, @@ -89,7 +89,7 @@ void invalidRange(LocalDate start, LocalDate end) { ); } - static List validRange() { + static List validRangeCases() { return List.of( Arguments.of(parse("2024-05-02"), parse("2024-05-02")), Arguments.of(parse("2024-05-02"), parse("2024-05-03")), @@ -100,7 +100,7 @@ static List validRange() { } @ParameterizedTest - @MethodSource("validRange") + @MethodSource("validRangeCases") void validRange(LocalDate start, LocalDate end) { assertDoesNotThrow(() -> new PatternByServiceDatesFilter(EMPTY_SERVICE, start, end)); } From 51639fc48f01aa8a0aea6c8d7eccb6452cce5314 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 11 Jun 2024 07:08:05 +0000 Subject: [PATCH 1335/1688] Add changelog entry for #5726 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index ab05045175a..c71911a7eb4 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -29,6 +29,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix parsing of GBFS feeds [#5891](https://github.com/opentripplanner/OpenTripPlanner/pull/5891) - Fix SIRI update travel back in time [#5867](https://github.com/opentripplanner/OpenTripPlanner/pull/5867) - Limit result size and execution time in TransModel GraphQL API [#5883](https://github.com/opentripplanner/OpenTripPlanner/pull/5883) +- Fix real-time added patterns persistence with DIFFERENTIAL updates [#5726](https://github.com/opentripplanner/OpenTripPlanner/pull/5726) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From df712f50510a150086bfb3a3809965e0f7f4b028 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 09:58:01 +0200 Subject: [PATCH 1336/1688] Clean up after merge --- .../ext/siri/SiriTimetableSnapshotSource.java | 2 +- .../trip/TimetableSnapshotManager.java | 31 +++++++++---------- .../updater/trip/TimetableSnapshotSource.java | 6 ++-- 3 files changed, 19 insertions(+), 20 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java index 4a9daf3cb23..68b7256e546 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java @@ -277,7 +277,7 @@ private Result handleModifiedTrip( // Also check whether trip id has been used for previously ADDED/MODIFIED trip message and // remove the previously created trip - this.buffer.revertTripToScheduledTripPattern(trip.getId(), serviceDate); + this.snapshotManager.revertTripToScheduledTripPattern(trip.getId(), serviceDate); return updateResult; } diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index e62c6daf547..5b77c44817d 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -168,6 +168,21 @@ public void purgeAndCommit() { } } + /** + * If a previous realtime update has changed which trip pattern is associated with the given trip + * on the given service date, this method will dissociate the trip from that pattern and remove + * the trip's timetables from that pattern on that particular service date. + * + * For this service date, the trip will revert to its original trip pattern from the scheduled + * data, remaining on that pattern unless it's changed again by a future realtime update. + * + * @return true if the trip was found to be shifted to a different trip pattern by a realtime + * message and an attempt was made to re-associate it with its originally scheduled trip pattern. + */ + public void revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serviceDate) { + buffer.revertTripToScheduledTripPattern(tripId, serviceDate); + } + /** * Remove realtime data from previous service dates from the snapshot. This is useful so that * instances that run for multiple days don't accumulate a lot of realtime data for past @@ -232,22 +247,6 @@ public Result updateBuffer( return buffer.update(pattern, tripTimes, serviceDate); } - /** - * Removes the latest added trip pattern from the cache. This should be done when removing the - * trip times from the timetable the trip has been added to. - */ - public void removeLastAddedTripPattern(FeedScopedId id, LocalDate serviceDate) { - buffer.removeLastAddedTripPattern(id, serviceDate); - } - - public void removeRealtimeUpdatedTripTimes( - TripPattern pattern, - FeedScopedId id, - LocalDate serviceDate - ) { - buffer.removeRealtimeUpdatedTripTimes(pattern, id, serviceDate); - } - /** * Returns an updated timetable for the specified pattern if one is available in this snapshot, or * the originally scheduled timetable if there are no updates in this snapshot. diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 440b9d7945a..4c4d7e293bd 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -285,7 +285,7 @@ private void purgePatternModifications( FeedScopedId tripId, LocalDate serviceDate ) { - final TripPattern pattern = buffer.getRealtimeAddedTripPattern(tripId, serviceDate); + final TripPattern pattern = snapshotManager.getRealtimeAddedTripPattern(tripId, serviceDate); if ( !isPreviouslyAddedTrip(tripId, pattern, serviceDate) || ( @@ -296,7 +296,7 @@ private void purgePatternModifications( // Remove previous realtime updates for this trip. This is necessary to avoid previous // stop pattern modifications from persisting. If a trip was previously added with the ScheduleRelationship // ADDED and is now cancelled or deleted, we still want to keep the realtime added trip pattern. - this.buffer.revertTripToScheduledTripPattern(tripId, serviceDate); + this.snapshotManager.revertTripToScheduledTripPattern(tripId, serviceDate); } } @@ -308,7 +308,7 @@ private boolean isPreviouslyAddedTrip( if (pattern == null) { return false; } - var timetable = buffer.resolve(pattern, serviceDate); + var timetable = snapshotManager.resolve(pattern, serviceDate); if (timetable == null) { return false; } From 2aa0eb2b2c1dbb097568a41c9cc0e6529af47cad Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 10:32:47 +0200 Subject: [PATCH 1337/1688] Clean up after merge --- .../updater/trip/TimetableSnapshotSource.java | 15 +++++++------- .../updater/trip/RealtimeTestEnvironment.java | 20 ++++++++++++------- .../trip/moduletests/delay/SkippedTest.java | 5 +++-- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 8e8ddf8d969..17a5f249f1c 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -12,6 +12,7 @@ import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TOO_FEW_STOPS; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_ALREADY_EXISTS; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TRIP_NOT_FOUND; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; import com.google.common.base.Preconditions; @@ -194,7 +195,7 @@ public UpdateResult applyTripUpdates( final TripDescriptor.ScheduleRelationship tripScheduleRelationship = determineTripScheduleRelationship( tripDescriptor ); - if (!fullDataset) { + if (updateIncrementality == DIFFERENTIAL) { purgePatternModifications(tripScheduleRelationship, tripId, serviceDate); } @@ -222,13 +223,13 @@ public UpdateResult applyTripUpdates( tripId, serviceDate, CancelationType.CANCEL, - fullDataset + updateIncrementality ); case DELETED -> handleCanceledTrip( tripId, serviceDate, CancelationType.DELETE, - fullDataset + updateIncrementality ); case REPLACEMENT -> validateAndHandleModifiedTrip( tripUpdate, @@ -1053,11 +1054,11 @@ private Result handleCanceledTrip( FeedScopedId tripId, final LocalDate serviceDate, CancelationType cancelationType, - boolean fullDataset + UpdateIncrementality incrementality ) { - var canceledPreviouslyAddedTrip = fullDataset - ? false - : cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType); + var canceledPreviouslyAddedTrip = + incrementality != FULL_DATASET && + cancelPreviouslyAddedTrip(tripId, serviceDate, cancelationType); // if previously an added trip was removed, there can't be a scheduled trip to remove if (canceledPreviouslyAddedTrip) { diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index a3f581efdf2..c2fb31e2dfb 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -1,5 +1,8 @@ package org.opentripplanner.updater.trip; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; +import static org.opentripplanner.updater.trip.UpdateIncrementality.FULL_DATASET; + import com.google.transit.realtime.GtfsRealtime; import java.time.Duration; import java.time.LocalDate; @@ -248,7 +251,7 @@ public UpdateResult applyEstimatedTimetable(List updates, - boolean differential + UpdateIncrementality incrementality ) { Objects.requireNonNull(gtfsSource, "Test environment is configured for SIRI only"); return gtfsSource.applyTripUpdates( null, BackwardsDelayPropagationType.REQUIRED_NO_DATA, - !differential, + incrementality, updates, getFeedId() ); @@ -288,7 +294,7 @@ private UpdateResult applyEstimatedTimetable( siriFuzzyTripMatcher, getEntityResolver(), getFeedId(), - UpdateIncrementality.DIFFERENTIAL, + DIFFERENTIAL, updates ); } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 7bee7c1b5d0..9afb7e76261 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -6,6 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; import org.junit.jupiter.api.Test; import org.opentripplanner.model.Timetable; @@ -143,7 +144,7 @@ public void scheduledTripWithPreviouslySkipped() { .addDelayedStopTime(2, 90) .build(); - var result = env.applyTripUpdate(tripUpdate, true); + var result = env.applyTripUpdate(tripUpdate, DIFFERENTIAL); assertEquals(1, result.successful()); @@ -161,7 +162,7 @@ public void scheduledTripWithPreviouslySkipped() { tripUpdate = scheduledBuilder.build(); // apply the update with the previously skipped stop now scheduled - result = env.applyTripUpdate(tripUpdate, true); + result = env.applyTripUpdate(tripUpdate, DIFFERENTIAL); assertEquals(1, result.successful()); // Check that the there is no longer a realtime added trip pattern for the trip and that the From d55978ea64e2fccde1cc977660599e66dbfb0bee Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 10:43:26 +0200 Subject: [PATCH 1338/1688] Fix method calls --- .../moduletests/cancellation/CancellationDeletionTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index f6b6b128330..b2c31e2254e 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship; import java.util.List; @@ -87,7 +88,7 @@ public void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState .addStopTime(env.stopC1.getId().getId(), 55) .build(); - var result = env.applyTripUpdate(update, true); + var result = env.applyTripUpdate(update, DIFFERENTIAL); assertEquals(1, result.successful()); @@ -100,7 +101,7 @@ public void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState env.timeZone ) .build(); - result = env.applyTripUpdate(update, true); + result = env.applyTripUpdate(update, DIFFERENTIAL); assertEquals(1, result.successful()); From 017705114c451e6b962a84ce7370311f6bc28170 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= Date: Tue, 11 Jun 2024 11:55:42 +0200 Subject: [PATCH 1339/1688] Due to a breaking-change in graphql-request, we need to prefix endpoint with hostname if it does not have one --- client-next/src/hooks/useServerInfo.ts | 5 ++--- client-next/src/hooks/useTripQuery.ts | 7 +++---- client-next/src/util/getApiUrl.ts | 12 ++++++++++++ 3 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 client-next/src/util/getApiUrl.ts diff --git a/client-next/src/hooks/useServerInfo.ts b/client-next/src/hooks/useServerInfo.ts index 54bc67c0db7..23ee23fc283 100644 --- a/client-next/src/hooks/useServerInfo.ts +++ b/client-next/src/hooks/useServerInfo.ts @@ -2,8 +2,7 @@ import { useEffect, useState } from 'react'; import { graphql } from '../gql'; import { request } from 'graphql-request'; // eslint-disable-line import/no-unresolved import { QueryType } from '../gql/graphql.ts'; - -const endpoint = import.meta.env.VITE_API_URL; +import { getApiUrl } from '../util/getApiUrl.ts'; const query = graphql(` query serverInfo { @@ -22,7 +21,7 @@ export const useServerInfo = () => { const [data, setData] = useState(null); useEffect(() => { const fetchData = async () => { - setData((await request(endpoint, query)) as QueryType); + setData((await request(getApiUrl(), query)) as QueryType); }; fetchData(); }, []); diff --git a/client-next/src/hooks/useTripQuery.ts b/client-next/src/hooks/useTripQuery.ts index e96a04d7cc3..c9672d0b6d2 100644 --- a/client-next/src/hooks/useTripQuery.ts +++ b/client-next/src/hooks/useTripQuery.ts @@ -2,8 +2,7 @@ import { useCallback, useEffect, useState } from 'react'; import { graphql } from '../gql'; import { request } from 'graphql-request'; // eslint-disable-line import/no-unresolved import { QueryType, TripQueryVariables } from '../gql/graphql.ts'; - -const endpoint = import.meta.env.VITE_API_URL; +import { getApiUrl } from '../util/getApiUrl.ts'; /** General purpose trip query document for debugging trip searches @@ -96,9 +95,9 @@ export const useTripQuery: TripQueryHook = (variables) => { if (variables) { setLoading(true); if (pageCursor) { - setData((await request(endpoint, query, { ...variables, pageCursor })) as QueryType); + setData((await request(getApiUrl(), query, { ...variables, pageCursor })) as QueryType); } else { - setData((await request(endpoint, query, variables)) as QueryType); + setData((await request(getApiUrl(), query, variables)) as QueryType); } setLoading(false); } else { diff --git a/client-next/src/util/getApiUrl.ts b/client-next/src/util/getApiUrl.ts new file mode 100644 index 00000000000..34d25068342 --- /dev/null +++ b/client-next/src/util/getApiUrl.ts @@ -0,0 +1,12 @@ +const endpoint = import.meta.env.VITE_API_URL; + +export const getApiUrl = () => { + try { + // the URL constructor will throw exception if endpoint is not a valid URL, + // e.g. if it is a relative path + new URL(endpoint); + return endpoint; + } catch (e) { + return `${window.location.origin}${endpoint}`; + } +}; From 6916e66f949b449ee0bac4d2cb2225bd1fa55c90 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 11 Jun 2024 11:15:14 +0000 Subject: [PATCH 1340/1688] Add changelog entry for #5185 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index c71911a7eb4..6a0cdd493a4 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -30,6 +30,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix SIRI update travel back in time [#5867](https://github.com/opentripplanner/OpenTripPlanner/pull/5867) - Limit result size and execution time in TransModel GraphQL API [#5883](https://github.com/opentripplanner/OpenTripPlanner/pull/5883) - Fix real-time added patterns persistence with DIFFERENTIAL updates [#5726](https://github.com/opentripplanner/OpenTripPlanner/pull/5726) +- Add plan query that follows the relay connection specification [#5185](https://github.com/opentripplanner/OpenTripPlanner/pull/5185) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From ab7d4b46f4de1a0795ff950068be55b9f75b96e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:15:45 +0000 Subject: [PATCH 1341/1688] fix(deps): update dependency com.graphql-java:graphql-java to v22.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 65b82d912b8..f3bddd61c51 100644 --- a/pom.xml +++ b/pom.xml @@ -852,7 +852,7 @@ com.graphql-java graphql-java - 22.0 + 22.1 com.graphql-java From c2a19069a927f61187932159d46b0b2d9e3b3944 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Tue, 11 Jun 2024 11:55:09 +0000 Subject: [PATCH 1342/1688] Upgrade debug client to version 2024/06/2024-06-11T11:54 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index a26303b904d..4bcf452cb3e 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
              From 221d95356abab509628ba2f2e306170e34319164 Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Tue, 11 Jun 2024 11:55:24 +0000 Subject: [PATCH 1343/1688] Add changelog entry for #5899 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 6a0cdd493a4..235693e1870 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -31,6 +31,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Limit result size and execution time in TransModel GraphQL API [#5883](https://github.com/opentripplanner/OpenTripPlanner/pull/5883) - Fix real-time added patterns persistence with DIFFERENTIAL updates [#5726](https://github.com/opentripplanner/OpenTripPlanner/pull/5726) - Add plan query that follows the relay connection specification [#5185](https://github.com/opentripplanner/OpenTripPlanner/pull/5185) +- Fix debug client after breaking change in dependency graphql-request [#5899](https://github.com/opentripplanner/OpenTripPlanner/pull/5899) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From b618e716e073516f93beee42f4ee8916557815a3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 15:24:43 +0200 Subject: [PATCH 1344/1688] Pass in functions rather than the whole transit service --- .../gtfs/PatternByServiceDatesFilter.java | 33 ++++++++------ .../apis/gtfs/datafetchers/QueryTypeImpl.java | 4 +- .../apis/gtfs/datafetchers/RouteImpl.java | 2 +- .../gtfs/PatternByServiceDatesFilterTest.java | 43 ++++++------------- 4 files changed, 35 insertions(+), 47 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index c7a0314fbb5..ee9b206bc09 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -3,11 +3,13 @@ import java.time.LocalDate; import java.util.Collection; import java.util.Objects; +import java.util.function.Function; import java.util.stream.Stream; import javax.annotation.Nullable; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDateFilterInput; import org.opentripplanner.transit.model.network.Route; import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.service.TransitService; /** @@ -16,26 +18,26 @@ */ public class PatternByServiceDatesFilter { - private final TransitService transitService; private final LocalDate startInclusive; private final LocalDate endInclusive; + private final Function> getPatternsForRoute; + private final Function> getServiceDatesForTrip; /** * - * @param transitService * @param startInclusive The inclusive start date to check the patterns for. If null then no start * date is defined and this will therefore match all dates. * @param endInclusive The inclusive end date to check the patterns for. If null then no end date * is defined this will therefore match all dates. */ PatternByServiceDatesFilter( - TransitService transitService, @Nullable LocalDate startInclusive, - @Nullable LocalDate endInclusive + @Nullable LocalDate endInclusive, + Function> getPatternsForRoute, + Function> getServiceDatesForTrip ) { - Objects.requireNonNull(transitService); - this.transitService = transitService; - + this.getPatternsForRoute = Objects.requireNonNull(getPatternsForRoute); + this.getServiceDatesForTrip = Objects.requireNonNull(getServiceDatesForTrip); // optional this.startInclusive = startInclusive; this.endInclusive = endInclusive; @@ -46,10 +48,15 @@ public class PatternByServiceDatesFilter { } public PatternByServiceDatesFilter( - TransitService transitService, - GraphQLServiceDateFilterInput filterInput + GraphQLServiceDateFilterInput filterInput, + TransitService transitService ) { - this(transitService, filterInput.getGraphQLStart(), filterInput.getGraphQLEnd()); + this( + filterInput.getGraphQLStart(), + filterInput.getGraphQLEnd(), + transitService::getPatternsForRoute, + trip -> transitService.getCalendarService().getServiceDatesForServiceId(trip.getServiceId()) + ); } /** @@ -66,7 +73,7 @@ public Collection filterPatterns(Collection tripPatter public Collection filterRoutes(Stream routeStream) { return routeStream .filter(r -> { - var patterns = transitService.getPatternsForRoute(r); + var patterns = getPatternsForRoute.apply(r); return !this.filterPatterns(patterns).isEmpty(); }) .toList(); @@ -76,9 +83,7 @@ private boolean hasServicesOnDate(TripPattern pattern) { return pattern .scheduledTripsAsStream() .anyMatch(trip -> { - var dates = transitService - .getCalendarService() - .getServiceDatesForServiceId(trip.getServiceId()); + var dates = getServiceDatesForTrip.apply(trip); return dates .stream() diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index 0936d98cf74..6aafa780bf7 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -612,8 +612,8 @@ public DataFetcher> routes() { ) ) { var filter = new PatternByServiceDatesFilter( - transitService, - args.getGraphQLLimitByPatternServiceDates() + args.getGraphQLLimitByPatternServiceDates(), + transitService ); routeStream = filter.filterRoutes(routeStream).stream(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java index ac4a485706b..596936dfdb5 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java @@ -182,7 +182,7 @@ public DataFetcher> patterns() { var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments()); if (PatternByServiceDatesFilter.hasServiceDateFilter(args.getGraphQLServiceDates())) { - var filter = new PatternByServiceDatesFilter(transitService, args.getGraphQLServiceDates()); + var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService); return filter.filterPatterns(patterns); } else { return patterns; diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index 4e5779d41f6..be67f3c90eb 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -12,17 +12,12 @@ import java.time.LocalDate; import java.util.ArrayList; -import java.util.Collection; import java.util.List; import java.util.Map; -import java.util.Set; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDateFilterInput; -import org.opentripplanner.model.calendar.CalendarService; -import org.opentripplanner.model.calendar.CalendarServiceData; -import org.opentripplanner.model.calendar.impl.CalendarServiceImpl; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; @@ -31,14 +26,10 @@ import org.opentripplanner.transit.model.site.RegularStop; import org.opentripplanner.transit.model.timetable.ScheduledTripTimes; import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.StopModel; -import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.transit.service.TransitService; class PatternByServiceDatesFilterTest { - private static final TransitService EMPTY_SERVICE = new DefaultTransitService(new TransitModel()); private static final Route ROUTE_1 = TransitModelForTest.route("1").build(); private static final FeedScopedId SERVICE_ID = id("service"); private static final Trip TRIP = TransitModelForTest @@ -85,7 +76,7 @@ static List invalidRangeCases() { void invalidRange(LocalDate start, LocalDate end) { assertThrows( IllegalArgumentException.class, - () -> new PatternByServiceDatesFilter(EMPTY_SERVICE, start, end) + () -> new PatternByServiceDatesFilter(start, end, r -> List.of(), d -> List.of()) ); } @@ -102,7 +93,9 @@ static List validRangeCases() { @ParameterizedTest @MethodSource("validRangeCases") void validRange(LocalDate start, LocalDate end) { - assertDoesNotThrow(() -> new PatternByServiceDatesFilter(EMPTY_SERVICE, start, end)); + assertDoesNotThrow(() -> + new PatternByServiceDatesFilter(start, end, r -> List.of(), d -> List.of()) + ); } static List ranges() { @@ -124,8 +117,7 @@ static List ranges() { @ParameterizedTest @MethodSource("ranges") void filterPatterns(LocalDate start, LocalDate end, FilterExpectation expectation) { - var service = mockService(); - var filter = new PatternByServiceDatesFilter(service, start, end); + var filter = mockFilter(start, end); var filterInput = List.of(PATTERN_1); var filterOutput = filter.filterPatterns(filterInput); @@ -140,8 +132,7 @@ void filterPatterns(LocalDate start, LocalDate end, FilterExpectation expectatio @ParameterizedTest @MethodSource("ranges") void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation) { - var service = mockService(); - var filter = new PatternByServiceDatesFilter(service, start, end); + var filter = mockFilter(start, end); var filterInput = List.of(ROUTE_1); var filterOutput = filter.filterRoutes(filterInput.stream()); @@ -153,21 +144,13 @@ void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation) } } - private static TransitService mockService() { - var data = new CalendarServiceData(); - data.putServiceDatesForServiceId(SERVICE_ID, List.of(parse("2024-05-01"), parse("2024-06-01"))); - var service = new CalendarServiceImpl(data); - return new DefaultTransitService(new TransitModel()) { - @Override - public Collection getPatternsForRoute(Route route) { - return Set.of(PATTERN_1); - } - - @Override - public CalendarService getCalendarService() { - return service; - } - }; + private static PatternByServiceDatesFilter mockFilter(LocalDate start, LocalDate end) { + return new PatternByServiceDatesFilter( + start, + end, + route -> List.of(PATTERN_1), + trip -> List.of(parse("2024-05-01"), parse("2024-06-01")) + ); } public static List noFilterCases() { From 4ad42e77ac33da5de3d85adc04a7c391af24757b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 15:32:57 +0200 Subject: [PATCH 1345/1688] Resolve merge conflicts --- .../apis/gtfs/generated/GraphQLTypes.java | 64 +++++++++++++++++++ 1 file changed, 64 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index 3c187ca3bbe..fee9eb96702 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -3448,6 +3448,7 @@ public static class GraphQLQueryTypeRoutesArgs { private List feeds; private List ids; + private GraphQLServiceDateFilterInput limitByPatternServiceDates; private String name; private List transportModes; @@ -3455,6 +3456,10 @@ public GraphQLQueryTypeRoutesArgs(Map args) { if (args != null) { this.feeds = (List) args.get("feeds"); this.ids = (List) args.get("ids"); + this.limitByPatternServiceDates = + new GraphQLServiceDateFilterInput( + (Map) args.get("limitByPatternServiceDates") + ); this.name = (String) args.get("name"); if (args.get("transportModes") != null) { this.transportModes = @@ -3474,6 +3479,10 @@ public List getGraphQLIds() { return this.ids; } + public GraphQLServiceDateFilterInput getGraphQLLimitByPatternServiceDates() { + return this.limitByPatternServiceDates; + } + public String getGraphQLName() { return this.name; } @@ -3490,6 +3499,12 @@ public void setGraphQLIds(List ids) { this.ids = ids; } + public void setGraphQLLimitByPatternServiceDates( + GraphQLServiceDateFilterInput limitByPatternServiceDates + ) { + this.limitByPatternServiceDates = limitByPatternServiceDates; + } + public void setGraphQLName(String name) { this.name = name; } @@ -3933,6 +3948,26 @@ public void setGraphQLLanguage(String language) { } } + public static class GraphQLRoutePatternsArgs { + + private GraphQLServiceDateFilterInput serviceDates; + + public GraphQLRoutePatternsArgs(Map args) { + if (args != null) { + this.serviceDates = + new GraphQLServiceDateFilterInput((Map) args.get("serviceDates")); + } + } + + public GraphQLServiceDateFilterInput getGraphQLServiceDates() { + return this.serviceDates; + } + + public void setGraphQLServiceDates(GraphQLServiceDateFilterInput serviceDates) { + this.serviceDates = serviceDates; + } + } + /** Entities that are relevant for routes that can contain alerts */ public enum GraphQLRouteAlertType { AGENCY, @@ -4094,6 +4129,35 @@ public void setGraphQLDestinationScooterPolicy( } } + public static class GraphQLServiceDateFilterInput { + + private java.time.LocalDate end; + private java.time.LocalDate start; + + public GraphQLServiceDateFilterInput(Map args) { + if (args != null) { + this.end = (java.time.LocalDate) args.get("end"); + this.start = (java.time.LocalDate) args.get("start"); + } + } + + public java.time.LocalDate getGraphQLEnd() { + return this.end; + } + + public java.time.LocalDate getGraphQLStart() { + return this.start; + } + + public void setGraphQLEnd(java.time.LocalDate end) { + this.end = end; + } + + public void setGraphQLStart(java.time.LocalDate start) { + this.start = start; + } + } + public static class GraphQLStopAlertsArgs { private List types; From 3c3bd18df7264042cb5059c2845b98013a714ecb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 15:45:47 +0200 Subject: [PATCH 1346/1688] Throw exception if both start/end are null --- .../apis/gtfs/PatternByServiceDatesFilter.java | 6 +++++- .../apis/gtfs/PatternByServiceDatesFilterTest.java | 5 ++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index ee9b206bc09..0867e6ead54 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -42,7 +42,11 @@ public class PatternByServiceDatesFilter { this.startInclusive = startInclusive; this.endInclusive = endInclusive; - if (startInclusive != null && endInclusive != null && startInclusive.isAfter(endInclusive)) { + if (startInclusive == null && endInclusive == null) { + throw new IllegalArgumentException("startInclusive and endInclusive cannot be both null"); + } else if ( + startInclusive != null && endInclusive != null && startInclusive.isAfter(endInclusive) + ) { throw new IllegalArgumentException("start must be before end"); } } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index be67f3c90eb..b9ad1c4973a 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -66,6 +66,7 @@ private static TripPattern pattern() { static List invalidRangeCases() { return List.of( + Arguments.of(null, null), Arguments.of(parse("2024-05-02"), parse("2024-05-01")), Arguments.of(parse("2024-05-03"), parse("2024-05-01")) ); @@ -85,8 +86,7 @@ static List validRangeCases() { Arguments.of(parse("2024-05-02"), parse("2024-05-02")), Arguments.of(parse("2024-05-02"), parse("2024-05-03")), Arguments.of(null, parse("2024-05-03")), - Arguments.of(parse("2024-05-03"), null), - Arguments.of(null, null) + Arguments.of(parse("2024-05-03"), null) ); } @@ -100,7 +100,6 @@ void validRange(LocalDate start, LocalDate end) { static List ranges() { return List.of( - Arguments.of(null, null, NOT_REMOVED), Arguments.of(null, parse("2024-05-03"), NOT_REMOVED), Arguments.of(null, parse("2024-05-01"), NOT_REMOVED), Arguments.of(parse("2024-05-03"), null, NOT_REMOVED), From 0a8d03cf8cbc2b1a3a185a9b94a002f2812403d4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 15:54:10 +0200 Subject: [PATCH 1347/1688] Rename and deprecate --- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 11 ++------ .../apis/gtfs/generated/GraphQLTypes.java | 27 +++++++++---------- .../opentripplanner/apis/gtfs/schema.graphqls | 4 +-- 3 files changed, 16 insertions(+), 26 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index 6713f790149..7a644da4be8 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -611,15 +611,8 @@ public DataFetcher> routes() { ); } - if ( - PatternByServiceDatesFilter.hasServiceDateFilter( - args.getGraphQLLimitByPatternServiceDates() - ) - ) { - var filter = new PatternByServiceDatesFilter( - args.getGraphQLLimitByPatternServiceDates(), - transitService - ); + if (PatternByServiceDatesFilter.hasServiceDateFilter(args.getGraphQLServiceDates())) { + var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService); routeStream = filter.filterRoutes(routeStream).stream(); } return routeStream.toList(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index fee9eb96702..9f6a237f7d9 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -1,6 +1,7 @@ // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. package org.opentripplanner.apis.gtfs.generated; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -3448,19 +3449,17 @@ public static class GraphQLQueryTypeRoutesArgs { private List feeds; private List ids; - private GraphQLServiceDateFilterInput limitByPatternServiceDates; private String name; + private GraphQLServiceDateFilterInput serviceDates; private List transportModes; public GraphQLQueryTypeRoutesArgs(Map args) { if (args != null) { this.feeds = (List) args.get("feeds"); this.ids = (List) args.get("ids"); - this.limitByPatternServiceDates = - new GraphQLServiceDateFilterInput( - (Map) args.get("limitByPatternServiceDates") - ); this.name = (String) args.get("name"); + this.serviceDates = + new GraphQLServiceDateFilterInput((Map) args.get("serviceDates")); if (args.get("transportModes") != null) { this.transportModes = ((List) args.get("transportModes")).stream() @@ -3479,14 +3478,14 @@ public List getGraphQLIds() { return this.ids; } - public GraphQLServiceDateFilterInput getGraphQLLimitByPatternServiceDates() { - return this.limitByPatternServiceDates; - } - public String getGraphQLName() { return this.name; } + public GraphQLServiceDateFilterInput getGraphQLServiceDates() { + return this.serviceDates; + } + public List getGraphQLTransportModes() { return this.transportModes; } @@ -3499,16 +3498,14 @@ public void setGraphQLIds(List ids) { this.ids = ids; } - public void setGraphQLLimitByPatternServiceDates( - GraphQLServiceDateFilterInput limitByPatternServiceDates - ) { - this.limitByPatternServiceDates = limitByPatternServiceDates; - } - public void setGraphQLName(String name) { this.name = name; } + public void setGraphQLServiceDates(GraphQLServiceDateFilterInput serviceDates) { + this.serviceDates = serviceDates; + } + public void setGraphQLTransportModes(List transportModes) { this.transportModes = transportModes; } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 64ea183fadc..8ca0ac189cb 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3606,7 +3606,7 @@ type QueryType { """Get all routes""" routes( """Only return routes with these ids""" - ids: [String] + ids: [String] @deprecated(reason: "Since it is hard to reason about the ID filter being combined with others in this resolver, it will be moved to a separate one.") """Only return routes with these feedIds""" feeds: [String] @@ -3624,7 +3624,7 @@ type QueryType { correspond to a how a passenger thinks of a calendar date. For example, a night bus running on Sunday morning at 1am to 3am, might have the previous Saturday's service date. """ - limitByPatternServiceDates: ServiceDateFilterInput + serviceDates: ServiceDateFilterInput ): [Route] """ From a9e2ee8ae38a426f399d49872b5faad4284adab7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 11 Jun 2024 16:05:58 +0200 Subject: [PATCH 1348/1688] Update Javadoc --- .../java/org/opentripplanner/model/TimetableSnapshot.java | 2 ++ .../updater/trip/TimetableSnapshotManager.java | 7 +++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java index ad3397ad9d2..5c018412572 100644 --- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java +++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java @@ -346,6 +346,8 @@ public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate s /** * Removes all Timetables which are valid for a ServiceDate on-or-before the one supplied. + * + * @return true if any data has been modified and false if no purging has happened. */ public boolean purgeExpiredData(LocalDate serviceDate) { if (readOnly) { diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java index 5b77c44817d..624d749664c 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java @@ -172,12 +172,9 @@ public void purgeAndCommit() { * If a previous realtime update has changed which trip pattern is associated with the given trip * on the given service date, this method will dissociate the trip from that pattern and remove * the trip's timetables from that pattern on that particular service date. - * + *

              * For this service date, the trip will revert to its original trip pattern from the scheduled * data, remaining on that pattern unless it's changed again by a future realtime update. - * - * @return true if the trip was found to be shifted to a different trip pattern by a realtime - * message and an attempt was made to re-associate it with its originally scheduled trip pattern. */ public void revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serviceDate) { buffer.revertTripToScheduledTripPattern(tripId, serviceDate); @@ -189,6 +186,8 @@ public void revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serv * dates which would increase memory consumption. * If your OTP instances are restarted throughout the day, this is less useful and can be * turned off. + * + * @return true if any data has been modified and false if no purging has happened. */ private boolean purgeExpiredData() { final LocalDate today = localDateNow.get(); From bb9b4bf70a90f19cf4121bdd05bd3af0dade90bf Mon Sep 17 00:00:00 2001 From: OTP Changelog Bot Date: Wed, 12 Jun 2024 07:36:35 +0000 Subject: [PATCH 1349/1688] Add changelog entry for #5890 [ci skip] --- docs/Changelog.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/Changelog.md b/docs/Changelog.md index 235693e1870..a95d931ae51 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -32,6 +32,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle - Fix real-time added patterns persistence with DIFFERENTIAL updates [#5726](https://github.com/opentripplanner/OpenTripPlanner/pull/5726) - Add plan query that follows the relay connection specification [#5185](https://github.com/opentripplanner/OpenTripPlanner/pull/5185) - Fix debug client after breaking change in dependency graphql-request [#5899](https://github.com/opentripplanner/OpenTripPlanner/pull/5899) +- Remove TravelTime API [#5890](https://github.com/opentripplanner/OpenTripPlanner/pull/5890) [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE) ## 2.5.0 (2024-03-13) From bf90d79bc70a8161b12980906ba786f04f5eee8b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 12 Jun 2024 11:24:09 +0200 Subject: [PATCH 1350/1688] Replace 'semantics' with 'incrementality' --- .../ext/siri/updater/EstimatedTimetableSource.java | 2 +- .../ext/siri/updater/SiriETHttpTripUpdateSource.java | 2 +- .../updater/trip/GtfsRealtimeTripUpdateSource.java | 2 +- .../opentripplanner/updater/trip/TimetableSnapshotSource.java | 2 +- .../org/opentripplanner/updater/trip/UpdateIncrementality.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java index f979a9f7e2b..c86be9629d2 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableSource.java @@ -19,7 +19,7 @@ public interface EstimatedTimetableSource { Optional getUpdates(); /** - * @return The update semantics of the last collection of updates. + * @return The incrementality of the last collection of updates. * {@link UpdateIncrementality} */ UpdateIncrementality incrementalityOfLastUpdates(); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java index d33f1261ea3..534539ead57 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETHttpTripUpdateSource.java @@ -30,7 +30,7 @@ public class SiriETHttpTripUpdateSource implements EstimatedTimetableSource { private final String requestorRef; /** - * The update semantics of the last received collection of updates. + * The incrementality of the last received collection of updates. */ private UpdateIncrementality updateIncrementality = FULL_DATASET; private ZonedDateTime lastTimestamp = ZonedDateTime.now().minusMonths(1); diff --git a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java index 31cb5641920..48f2d39ccc4 100644 --- a/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/GtfsRealtimeTripUpdateSource.java @@ -88,7 +88,7 @@ public String toString() { } /** - * @return the semantics of the last list with updates, i.e. if all previous updates + * @return the incrementality of the last list with updates, i.e. if all previous updates * should be disregarded */ public UpdateIncrementality incrementalityOfLastUpdates() { diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index 17a5f249f1c..7e69c35e04e 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -127,7 +127,7 @@ public TimetableSnapshotSource( * * @param backwardsDelayPropagationType Defines when delays are propagated to previous stops and * if these stops are given the NO_DATA flag. - * @param updateIncrementality Determines the semantics of the updates. FULL updates clear the buffer + * @param updateIncrementality Determines the incrementality of the updates. FULL updates clear the buffer * of all previous updates for the given feed id. * @param updates GTFS-RT TripUpdate's that should be applied atomically */ diff --git a/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java b/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java index fc02581cba9..345a0e24eda 100644 --- a/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java +++ b/src/main/java/org/opentripplanner/updater/trip/UpdateIncrementality.java @@ -1,7 +1,7 @@ package org.opentripplanner.updater.trip; /** - * Describes the semantics of a collection of realtime updates and how they are related to previous + * Describes the incrementality of a collection of realtime updates and how they are related to previous * ones. */ public enum UpdateIncrementality { From 535546ff26ef4ccb275273d60b9f302397df9729 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 12 Jun 2024 12:07:25 +0200 Subject: [PATCH 1351/1688] Update documentation --- docs/RouteRequest.md | 38 +++++++++---------- .../routerequest/RouteRequestConfig.java | 26 +++++++------ .../config/routerequest/TransferConfig.java | 12 ++---- 3 files changed, 36 insertions(+), 40 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 601cc2c793e..1ae13a97bb4 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -194,9 +194,12 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe The extra time after exiting a public transport vehicle. -The slack is added to the time when going from the transit vehicle to the stop. -This also influences the total time it takes to transfer. See `transferSlack` for more details about -how the total transfer time is calculated. +The slack is added to the time after leaving the transit vehicle. + +This also influences the time it takes to transfer. + +Since some modes, like airplanes and subways, need more time than others, this is also configurable +per mode with `boardSlackForMode`.

              boardSlack

              @@ -206,17 +209,16 @@ how the total transfer time is calculated. The extra time before boarding a public transport vehicle. -The slack is added to the time when going from the stop (offboard) to onboard a transit -vehicle. It is useful for suggesting passengers arrive at the stop a little earlier than they strictly -need to to allow for unexpected circumstances. - -This is similar to `transferSlack`, except that this also applies to the first -transit leg in the trip. +The extra time is added to the time when entering a public transport vehicle. This is a useful +tool for agencies wanting to add a general buffer time so that passengers are instructed to be +a earlier at their stop than is strictly necessary. This is also added when transferring from one +vehicle to another. -This also influences the total time it takes to transfer. See `transferSlack` for more details about -how the total transfer time is calculated. +It is similar to `transferSlack`, except that this also applies to the first transit leg in the +trip and `transferSlack` does not. -This is the default value used, if not overridden by the `boardSlackList`. +Some modes like, airplanes or subway, might need more of a slack than others, so this is also +configurable per mode with `boardSlackForMode`.

              drivingDirection

              @@ -365,16 +367,12 @@ significant time or walking will still be taken. The extra time needed to make a safe transfer. -An expected transfer time that specifies the amount of time that must pass -between exiting one public transport vehicle and boarding another. This time is in -addition to time it might take to walk between stops plus `boardSlack` and +An extra buffer time that's applied when exiting one public transport vehicle and boarding another. +This time is in addition to time it might take to walk between stops plus `boardSlack` and `alightSlack`. -The total transfer time from one vehicle to another is thus calculated as follows: - -``` -totalTransferDuration = alightSlack + walkDuration + transferSlack + boardSlack -``` +It is useful to add extra time for passengers with mobility issues, who need extra time +when moving between vehicles.

              unpreferredCost

              diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index fb43db833e4..117c9af60b0 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -205,9 +205,12 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil .summary("The extra time after exiting a public transport vehicle.") .description( """ -The slack is added to the time when going from the transit vehicle to the stop. -This also influences the total time it takes to transfer. See `transferSlack` for more details about -how the total transfer time is calculated. +The slack is added to the time after leaving the transit vehicle. + +This also influences the time it takes to transfer. + +Since some modes, like airplanes and subways, need more time than others, this is also configurable +per mode with `boardSlackForMode`. """ ) .asDuration(dft.alightSlack().defaultValue()) @@ -235,17 +238,16 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil .summary("The extra time before boarding a public transport vehicle.") .description( """ -The slack is added to the time when going from the stop (offboard) to onboard a transit -vehicle. It is useful for suggesting passengers arrive at the stop a little earlier than they strictly -need to to allow for unexpected circumstances. - -This is similar to `transferSlack`, except that this also applies to the first -transit leg in the trip. +The extra time is added to the time when entering a public transport vehicle. This is a useful +tool for agencies wanting to add a general buffer time so that passengers are instructed to be +a earlier at their stop than is strictly necessary. This is also added when transferring from one +vehicle to another. -This also influences the total time it takes to transfer. See `transferSlack` for more details about -how the total transfer time is calculated. +It is similar to `transferSlack`, except that this also applies to the first transit leg in the +trip and `transferSlack` does not. -This is the default value used, if not overridden by the `boardSlackList`. +Some modes like, airplanes or subway, might need more of a slack than others, so this is also +configurable per mode with `boardSlackForMode`. """ ) .asDuration(dft.boardSlack().defaultValue()) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java index aa68a367f72..a9de698f60c 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java @@ -40,16 +40,12 @@ static void mapTransferPreferences(NodeAdapter c, TransferPreferences.Builder tx .summary("The extra time needed to make a safe transfer.") .description( """ - An expected transfer time that specifies the amount of time that must pass - between exiting one public transport vehicle and boarding another. This time is in - addition to time it might take to walk between stops plus `boardSlack` and + An extra buffer time that's applied when exiting one public transport vehicle and boarding another. + This time is in addition to time it might take to walk between stops plus `boardSlack` and `alightSlack`. - The total transfer time from one vehicle to another is thus calculated as follows: - - ``` - totalTransferDuration = alightSlack + walkDuration + transferSlack + boardSlack - ``` + It is useful to add extra time for passengers with mobility issues, who need extra time + when moving between vehicles. """ ) .asDurationOrSeconds(dft.slack()) From 0784c7ad7a87b22514416d73bc621f9e910e7f9b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 12 Jun 2024 12:18:04 +0200 Subject: [PATCH 1352/1688] Fix code after rebase --- .../mapping/routerequest/TransitPreferencesMapper.java | 2 +- .../api/request/preference/TransferPreferences.java | 2 +- .../mapping/routerequest/LegacyRouteRequestMapperTest.java | 7 +++++-- .../routerequest/RouteRequestMapperTransitTest.java | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java index f542639ae36..d119c9bb8af 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/routerequest/TransitPreferencesMapper.java @@ -73,7 +73,7 @@ static void setTransitPreferences( var slack = transfer.getGraphQLSlack(); if (slack != null) { transferPreferences.withSlack( - (int) DurationUtils.requireNonNegativeMedium(slack, "transfer slack").toSeconds() + DurationUtils.requireNonNegativeMedium(slack, "transfer slack") ); } var maxTransfers = transfer.getGraphQLMaximumTransfers(); diff --git a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java index 85d1d502aac..464b9872bdd 100644 --- a/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java +++ b/src/main/java/org/opentripplanner/routing/api/request/preference/TransferPreferences.java @@ -158,7 +158,7 @@ public boolean equals(Object o) { TransferPreferences that = (TransferPreferences) o; return ( cost.equals(that.cost) && - slack == that.slack && + slack.equals(that.slack) && doubleEquals(that.waitReluctance, waitReluctance) && maxTransfers == that.maxTransfers && maxAdditionalTransfers == that.maxAdditionalTransfers && diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java index f8d60214abe..f2992a30d92 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/LegacyRouteRequestMapperTest.java @@ -245,10 +245,13 @@ void transferSlack() { var seconds = 119L; Map arguments = Map.of("minTransferTime", seconds); - var routeRequest = RouteRequestMapper.toRouteRequest(executionContext(arguments), context); + var routeRequest = LegacyRouteRequestMapper.toRouteRequest( + executionContext(arguments), + context + ); assertEquals(Duration.ofSeconds(seconds), routeRequest.preferences().transfer().slack()); - var noParamsReq = RouteRequestMapper.toRouteRequest(executionContext(Map.of()), context); + var noParamsReq = LegacyRouteRequestMapper.toRouteRequest(executionContext(Map.of()), context); assertEquals(TransferPreferences.DEFAULT.slack(), noParamsReq.preferences().transfer().slack()); } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java index 5b2149afe32..bdb2aea81c3 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/routerequest/RouteRequestMapperTransitTest.java @@ -87,7 +87,7 @@ void testTransferPreferences() { var routeRequest = RouteRequestMapper.toRouteRequest(env, RouteRequestMapperTest.CONTEXT); var transferPreferences = routeRequest.preferences().transfer(); assertEquals(cost.toSeconds(), transferPreferences.cost()); - assertEquals(slack.toSeconds(), transferPreferences.slack()); + assertEquals(slack, transferPreferences.slack()); assertEquals(maximumAdditionalTransfers, transferPreferences.maxAdditionalTransfers()); assertEquals(maximumTransfers + 1, transferPreferences.maxTransfers()); } From 409041e6e0c1abe863f2dd7e7d6b348a635a003b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 12 Jun 2024 13:27:43 +0200 Subject: [PATCH 1353/1688] Fix typo --- docs/RouteRequest.md | 2 +- .../standalone/config/routerequest/RouteRequestConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 1ae13a97bb4..1d518fb1dcc 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -199,7 +199,7 @@ The slack is added to the time after leaving the transit vehicle. This also influences the time it takes to transfer. Since some modes, like airplanes and subways, need more time than others, this is also configurable -per mode with `boardSlackForMode`. +per mode with `alightSlackForMode`.

              boardSlack

              diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 117c9af60b0..5f761d10f17 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -210,7 +210,7 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil This also influences the time it takes to transfer. Since some modes, like airplanes and subways, need more time than others, this is also configurable -per mode with `boardSlackForMode`. +per mode with `alightSlackForMode`. """ ) .asDuration(dft.alightSlack().defaultValue()) From baa1a75e2fea4f4b7977151d1e34545f3abed165 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 10 Jun 2024 17:51:58 +0200 Subject: [PATCH 1354/1688] Create geocoder with Dagger --- .../ext/geocoder/GeocoderResource.java | 17 +---------------- .../ext/geocoder/LuceneIndex.java | 2 ++ .../org/opentripplanner/apis/APIEndpoints.java | 2 -- 3 files changed, 3 insertions(+), 18 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java index f5d1f950632..39a6177ef68 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java @@ -3,7 +3,6 @@ import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; -import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; @@ -28,21 +27,7 @@ public class GeocoderResource { private final OtpServerRequestContext serverContext; public GeocoderResource(@Context OtpServerRequestContext requestContext) { - serverContext = requestContext; - } - - /** - * This class is only here for backwards-compatibility. It will be removed in the future. - */ - @Path("/routers/{ignoreRouterId}/geocode") - public static class GeocoderResourceOldPath extends GeocoderResource { - - public GeocoderResourceOldPath( - @Context OtpServerRequestContext serverContext, - @PathParam("ignoreRouterId") String ignore - ) { - super(serverContext); - } + luceneIndex = Objects.requireNonNull(requestContext.lucenceIndex()); } /** diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index e0ea8ba36b9..90b17f849de 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -69,6 +69,8 @@ public LuceneIndex(TransitService transitService) { this.transitService = transitService; this.stopClusterMapper = new StopClusterMapper(transitService); + LOG.info("Creating geocoder lucene index"); + this.analyzer = new PerFieldAnalyzerWrapper( new StandardAnalyzer(), diff --git a/src/main/java/org/opentripplanner/apis/APIEndpoints.java b/src/main/java/org/opentripplanner/apis/APIEndpoints.java index fe8db5b3911..b6ad08ea4d9 100644 --- a/src/main/java/org/opentripplanner/apis/APIEndpoints.java +++ b/src/main/java/org/opentripplanner/apis/APIEndpoints.java @@ -61,8 +61,6 @@ private APIEndpoints() { addIfEnabled(SandboxAPIMapboxVectorTilesApi, VectorTilesResource.class); addIfEnabled(SandboxAPIParkAndRideApi, ParkAndRideResource.class); addIfEnabled(SandboxAPIGeocoder, GeocoderResource.class); - // scheduled to be removed and only here for backwards compatibility - addIfEnabled(SandboxAPIGeocoder, GeocoderResource.GeocoderResourceOldPath.class); // scheduled to be removed addIfEnabled(APIBikeRental, BikeRental.class); From f554b8f645c17fe109bd9d7a98a9f1ce2e1ea8ad Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 10 Jun 2024 16:08:53 +0200 Subject: [PATCH 1355/1688] Add lucene index to OTP server context --- .../ext/geocoder/GeocoderResource.java | 14 +++++++------- .../ext/geocoder/LuceneIndex.java | 13 ------------- .../opentripplanner/routing/graph/Graph.java | 10 ---------- .../standalone/api/OtpServerRequestContext.java | 4 ++++ .../configure/ConstructApplication.java | 2 -- .../configure/ConstructApplicationModule.java | 7 +++++-- .../server/DefaultServerRequestContext.java | 17 ++++++++++++++--- .../org/opentripplanner/TestServerContext.java | 2 +- .../mapping/TripRequestMapperTest.java | 4 +--- .../transit/speed_test/SpeedTest.java | 2 +- 10 files changed, 33 insertions(+), 42 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java index 39a6177ef68..26aabb6bc29 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java @@ -24,10 +24,10 @@ @Produces(MediaType.APPLICATION_JSON) public class GeocoderResource { - private final OtpServerRequestContext serverContext; + private final LuceneIndex luceneIndex; public GeocoderResource(@Context OtpServerRequestContext requestContext) { - luceneIndex = Objects.requireNonNull(requestContext.lucenceIndex()); + luceneIndex = requestContext.lucenceIndex(); } /** @@ -56,7 +56,7 @@ public Response textSearch( @GET @Path("stopClusters") public Response stopClusters(@QueryParam("query") String query) { - var clusters = LuceneIndex.forServer(serverContext).queryStopClusters(query).toList(); + var clusters = luceneIndex.queryStopClusters(query).toList(); return Response.status(Response.Status.OK).entity(clusters).build(); } @@ -81,8 +81,8 @@ private List query( } private Collection queryStopLocations(String query, boolean autocomplete) { - return LuceneIndex - .forServer(serverContext) + return + luceneIndex .queryStopLocations(query, autocomplete) .map(sl -> new SearchResult( @@ -96,8 +96,8 @@ private Collection queryStopLocations(String query, boolean autoco } private Collection queryStations(String query, boolean autocomplete) { - return LuceneIndex - .forServer(serverContext) + return + luceneIndex .queryStopLocationGroups(query, autocomplete) .map(sc -> new SearchResult( diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 90b17f849de..f7702ad760c 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -42,7 +42,6 @@ import org.apache.lucene.store.ByteBuffersDirectory; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NString; -import org.opentripplanner.standalone.api.OtpServerRequestContext; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.site.StopLocationsGroup; @@ -146,18 +145,6 @@ public LuceneIndex(TransitService transitService) { } } - public static synchronized LuceneIndex forServer(OtpServerRequestContext serverContext) { - var graph = serverContext.graph(); - var existingIndex = graph.getLuceneIndex(); - if (existingIndex != null) { - return existingIndex; - } - - var newIndex = new LuceneIndex(serverContext.transitService()); - graph.setLuceneIndex(newIndex); - return newIndex; - } - public Stream queryStopLocations(String query, boolean autocomplete) { return matchingDocuments(StopLocation.class, query, autocomplete) .map(document -> transitService.getStopLocation(FeedScopedId.parse(document.get(ID)))); diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java index 4b6c9938317..926d524bad2 100644 --- a/src/main/java/org/opentripplanner/routing/graph/Graph.java +++ b/src/main/java/org/opentripplanner/routing/graph/Graph.java @@ -16,7 +16,6 @@ import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; import org.opentripplanner.ext.dataoverlay.configuration.DataOverlayParameterBindings; -import org.opentripplanner.ext.geocoder.LuceneIndex; import org.opentripplanner.framework.geometry.CompactElevationProfile; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.model.calendar.openinghours.OpeningHoursCalendarService; @@ -136,7 +135,6 @@ public class Graph implements Serializable { * creating the data overlay context when routing. */ public DataOverlayParameterBindings dataOverlayParameterBindings; - private LuceneIndex luceneIndex; @Inject public Graph( @@ -384,14 +382,6 @@ public void setFareService(FareService fareService) { this.fareService = fareService; } - public LuceneIndex getLuceneIndex() { - return luceneIndex; - } - - public void setLuceneIndex(LuceneIndex luceneIndex) { - this.luceneIndex = luceneIndex; - } - private void indexIfNotIndexed(StopModel stopModel) { if (streetIndex == null) { index(stopModel); diff --git a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java index 6552d82770f..3a577611617 100644 --- a/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/api/OtpServerRequestContext.java @@ -8,6 +8,7 @@ import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; import org.opentripplanner.ext.emissions.EmissionsService; import org.opentripplanner.ext.flex.FlexParameters; +import org.opentripplanner.ext.geocoder.LuceneIndex; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.framework.application.OTPFeature; @@ -136,4 +137,7 @@ default DataOverlayContext dataOverlayContext(RouteRequest request) { ) ); } + + @Nullable + LuceneIndex lucenceIndex(); } diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java index b1bc6888753..db4a4af7fbd 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -5,7 +5,6 @@ import org.opentripplanner.apis.transmodel.TransmodelAPI; import org.opentripplanner.datastore.api.DataSource; import org.opentripplanner.ext.emissions.EmissionsDataModel; -import org.opentripplanner.ext.geocoder.LuceneIndex; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; import org.opentripplanner.framework.application.LogMDCSupport; import org.opentripplanner.framework.application.OTPFeature; @@ -181,7 +180,6 @@ private void setupTransitRoutingServer() { if (OTPFeature.SandboxAPIGeocoder.isOn()) { LOG.info("Creating debug client geocoder lucene index"); - LuceneIndex.forServer(createServerContext()); } } diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java index eb244ce726c..6c830054c49 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationModule.java @@ -7,6 +7,7 @@ import javax.annotation.Nullable; import org.opentripplanner.astar.spi.TraverseVisitor; import org.opentripplanner.ext.emissions.EmissionsService; +import org.opentripplanner.ext.geocoder.LuceneIndex; import org.opentripplanner.ext.interactivelauncher.api.LauncherRequestDecorator; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; @@ -40,7 +41,8 @@ OtpServerRequestContext providesServerContext( StreetLimitationParametersService streetLimitationParametersService, @Nullable TraverseVisitor traverseVisitor, EmissionsService emissionsService, - LauncherRequestDecorator launcherRequestDecorator + LauncherRequestDecorator launcherRequestDecorator, + @Nullable LuceneIndex luceneIndex ) { var defaultRequest = launcherRequestDecorator.intercept(routerConfig.routingRequestDefaults()); @@ -60,7 +62,8 @@ OtpServerRequestContext providesServerContext( rideHailingServices, stopConsolidationService, streetLimitationParametersService, - traverseVisitor + traverseVisitor, + luceneIndex ); } diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index 7a4ccea9247..6b822506fd9 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -7,6 +7,7 @@ import org.opentripplanner.astar.spi.TraverseVisitor; import org.opentripplanner.ext.emissions.EmissionsService; import org.opentripplanner.ext.flex.FlexParameters; +import org.opentripplanner.ext.geocoder.LuceneIndex; import org.opentripplanner.ext.ridehailing.RideHailingService; import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.inspector.raster.TileRendererManager; @@ -49,6 +50,7 @@ public class DefaultServerRequestContext implements OtpServerRequestContext { private final EmissionsService emissionsService; private final StopConsolidationService stopConsolidationService; private final StreetLimitationParametersService streetLimitationParametersService; + private final LuceneIndex luceneIndex; /** * Make sure all mutable components are copied/cloned before calling this constructor. @@ -70,7 +72,8 @@ private DefaultServerRequestContext( StopConsolidationService stopConsolidationService, StreetLimitationParametersService streetLimitationParametersService, FlexParameters flexParameters, - TraverseVisitor traverseVisitor + TraverseVisitor traverseVisitor, + @Nullable LuceneIndex luceneIndex ) { this.graph = graph; this.transitService = transitService; @@ -89,6 +92,7 @@ private DefaultServerRequestContext( this.emissionsService = emissionsService; this.stopConsolidationService = stopConsolidationService; this.streetLimitationParametersService = streetLimitationParametersService; + this.luceneIndex = luceneIndex; } /** @@ -110,7 +114,8 @@ public static DefaultServerRequestContext create( List rideHailingServices, @Nullable StopConsolidationService stopConsolidationService, StreetLimitationParametersService streetLimitationParametersService, - @Nullable TraverseVisitor traverseVisitor + @Nullable TraverseVisitor traverseVisitor, + @Nullable LuceneIndex luceneIndex ) { return new DefaultServerRequestContext( graph, @@ -129,7 +134,7 @@ public static DefaultServerRequestContext create( stopConsolidationService, streetLimitationParametersService, flexParameters, - traverseVisitor + traverseVisitor, luceneIndex ); } @@ -235,6 +240,12 @@ public VectorTileConfig vectorTileConfig() { return vectorTileConfig; } + @Nullable + @Override + public LuceneIndex lucenceIndex() { + return luceneIndex; + } + @Override public EmissionsService emissionsService() { return emissionsService; diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index 2f4ded1121d..fe265f30fdc 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -55,7 +55,7 @@ public static OtpServerRequestContext createServerContext( List.of(), null, createStreetLimitationParametersService(), - null + null, null ); creatTransitLayerForRaptor(transitModel, routerConfig.transitTuningConfig()); return context; diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index de6b48c5ef4..d18b94e8a20 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -15,12 +15,10 @@ import io.micrometer.core.instrument.Metrics; import java.time.Duration; import java.time.LocalDate; -import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; -import java.util.Optional; import java.util.function.Function; import java.util.stream.Stream; import org.junit.jupiter.api.BeforeEach; @@ -146,7 +144,7 @@ void setup() { List.of(), null, new DefaultStreetLimitationParametersService(new StreetLimitationParameters()), - null + null, null ), null, transitService diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index e045f49c01d..41fb0311eb5 100644 --- a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -121,7 +121,7 @@ public SpeedTest( List.of(), null, TestServerContext.createStreetLimitationParametersService(), - null + null, null ); // Creating transitLayerForRaptor should be integrated into the TransitModel, but for now // we do it manually here From 9e21b04911d9761f70e080da0bc2ffc5e5e694b1 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 10 Jun 2024 18:14:32 +0200 Subject: [PATCH 1356/1688] Wire up Geocoder with Dagger --- .../ext/geocoder/GeocoderResource.java | 6 ++-- .../ext/geocoder/LuceneIndex.java | 4 +++ .../geocoder/configure/GeocoderModule.java | 28 +++++++++++++++++++ .../ConstructApplicationFactory.java | 6 ++++ .../server/DefaultServerRequestContext.java | 3 +- .../opentripplanner/TestServerContext.java | 3 +- .../mapping/TripRequestMapperTest.java | 3 +- .../transit/speed_test/SpeedTest.java | 3 +- 8 files changed, 48 insertions(+), 8 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java index 26aabb6bc29..c9cd199c557 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java @@ -81,8 +81,7 @@ private List query( } private Collection queryStopLocations(String query, boolean autocomplete) { - return - luceneIndex + return luceneIndex .queryStopLocations(query, autocomplete) .map(sl -> new SearchResult( @@ -96,8 +95,7 @@ private Collection queryStopLocations(String query, boolean autoco } private Collection queryStations(String query, boolean autocomplete) { - return - luceneIndex + return luceneIndex .queryStopLocationGroups(query, autocomplete) .map(sc -> new SearchResult( diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index f7702ad760c..e4de7b4e5c4 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -46,9 +46,13 @@ import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.model.site.StopLocationsGroup; import org.opentripplanner.transit.service.TransitService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class LuceneIndex implements Serializable { + private static final Logger LOG = LoggerFactory.getLogger(LuceneIndex.class); + private static final String TYPE = "type"; private static final String ID = "id"; private static final String SECONDARY_IDS = "secondary_ids"; diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java new file mode 100644 index 00000000000..07f14103aad --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java @@ -0,0 +1,28 @@ +package org.opentripplanner.ext.geocoder.configure; + +import dagger.Module; +import dagger.Provides; +import jakarta.inject.Singleton; +import javax.annotation.Nullable; +import org.opentripplanner.ext.geocoder.LuceneIndex; +import org.opentripplanner.framework.application.OTPFeature; +import org.opentripplanner.transit.service.TransitService; + +/** + * This module converts the ride hailing configurations into ride hailing services to be used by the + * application context. + */ +@Module +public class GeocoderModule { + + @Provides + @Singleton + @Nullable + LuceneIndex luceneIndex(TransitService service) { + if (OTPFeature.SandboxAPIGeocoder.isOn()) { + return new LuceneIndex(service); + } else { + return null; + } + } +} diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java index fe95fe0447d..b307776ef52 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplicationFactory.java @@ -6,6 +6,8 @@ import javax.annotation.Nullable; import org.opentripplanner.ext.emissions.EmissionsDataModel; import org.opentripplanner.ext.emissions.EmissionsServiceModule; +import org.opentripplanner.ext.geocoder.LuceneIndex; +import org.opentripplanner.ext.geocoder.configure.GeocoderModule; import org.opentripplanner.ext.interactivelauncher.configuration.InteractiveLauncherModule; import org.opentripplanner.ext.ridehailing.configure.RideHailingServicesModule; import org.opentripplanner.ext.stopconsolidation.StopConsolidationRepository; @@ -56,6 +58,7 @@ StopConsolidationServiceModule.class, InteractiveLauncherModule.class, StreetLimitationParametersServiceModule.class, + GeocoderModule.class, } ) public interface ConstructApplicationFactory { @@ -87,6 +90,9 @@ public interface ConstructApplicationFactory { StreetLimitationParameters streetLimitationParameters(); + @Nullable + LuceneIndex luceneIndex(); + @Component.Builder interface Builder { @BindsInstance diff --git a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java index 6b822506fd9..0e81193d787 100644 --- a/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java +++ b/src/main/java/org/opentripplanner/standalone/server/DefaultServerRequestContext.java @@ -134,7 +134,8 @@ public static DefaultServerRequestContext create( stopConsolidationService, streetLimitationParametersService, flexParameters, - traverseVisitor, luceneIndex + traverseVisitor, + luceneIndex ); } diff --git a/src/test/java/org/opentripplanner/TestServerContext.java b/src/test/java/org/opentripplanner/TestServerContext.java index fe265f30fdc..90dca6ff840 100644 --- a/src/test/java/org/opentripplanner/TestServerContext.java +++ b/src/test/java/org/opentripplanner/TestServerContext.java @@ -55,7 +55,8 @@ public static OtpServerRequestContext createServerContext( List.of(), null, createStreetLimitationParametersService(), - null, null + null, + null ); creatTransitLayerForRaptor(transitModel, routerConfig.transitTuningConfig()); return context; diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java index d18b94e8a20..14d608626b3 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java @@ -144,7 +144,8 @@ void setup() { List.of(), null, new DefaultStreetLimitationParametersService(new StreetLimitationParameters()), - null, null + null, + null ), null, transitService diff --git a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java index 41fb0311eb5..85a33281f81 100644 --- a/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java +++ b/src/test/java/org/opentripplanner/transit/speed_test/SpeedTest.java @@ -121,7 +121,8 @@ public SpeedTest( List.of(), null, TestServerContext.createStreetLimitationParametersService(), - null, null + null, + null ); // Creating transitLayerForRaptor should be integrated into the TransitModel, but for now // we do it manually here From 5a7b2efd3d4adb5348fada0d69818a202734bdce Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 12 Jun 2024 15:14:25 +0200 Subject: [PATCH 1357/1688] Add consolidated stops to geocoder --- .../ext/geocoder/LuceneIndexTest.java | 10 ++- .../ext/geocoder/LuceneIndex.java | 9 ++- .../ext/geocoder/StopClusterMapper.java | 66 +++++++++++++++++-- .../geocoder/configure/GeocoderModule.java | 11 ++-- .../StopConsolidationService.java | 2 + .../DefaultStopConsolidationService.java | 5 ++ .../configure/ConstructApplication.java | 3 +- 7 files changed, 92 insertions(+), 14 deletions(-) diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java index cee6cf3a2d8..3e6c2b15195 100644 --- a/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/LuceneIndexTest.java @@ -18,6 +18,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; +import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; +import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; import org.opentripplanner.model.FeedInfo; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.basic.TransitMode; @@ -160,8 +162,12 @@ public FeedInfo getFeedInfo(String feedId) { ); } }; - index = new LuceneIndex(transitService); - mapper = new StopClusterMapper(transitService); + var stopConsolidationService = new DefaultStopConsolidationService( + new DefaultStopConsolidationRepository(), + transitModel + ); + index = new LuceneIndex(transitService, stopConsolidationService); + mapper = new StopClusterMapper(transitService, stopConsolidationService); } @Test diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index e4de7b4e5c4..1c01c1c36ff 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -11,6 +11,7 @@ import java.util.Objects; import java.util.Set; import java.util.stream.Stream; +import javax.annotation.Nullable; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.en.EnglishAnalyzer; import org.apache.lucene.analysis.miscellaneous.PerFieldAnalyzerWrapper; @@ -40,6 +41,7 @@ import org.apache.lucene.search.suggest.document.FuzzyCompletionQuery; import org.apache.lucene.search.suggest.document.SuggestIndexSearcher; import org.apache.lucene.store.ByteBuffersDirectory; +import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -68,9 +70,12 @@ public class LuceneIndex implements Serializable { private final SuggestIndexSearcher searcher; private final StopClusterMapper stopClusterMapper; - public LuceneIndex(TransitService transitService) { + public LuceneIndex( + TransitService transitService, + @Nullable StopConsolidationService stopConsolidationService + ) { this.transitService = transitService; - this.stopClusterMapper = new StopClusterMapper(transitService); + this.stopClusterMapper = new StopClusterMapper(transitService, stopConsolidationService); LOG.info("Creating geocoder lucene index"); diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index d9f388ea0e8..4253041a88a 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -3,6 +3,7 @@ import static org.opentripplanner.ext.geocoder.StopCluster.LocationType.STATION; import static org.opentripplanner.ext.geocoder.StopCluster.LocationType.STOP; +import com.google.common.collect.ImmutableListMultimap; import com.google.common.collect.Iterables; import java.util.Collection; import java.util.List; @@ -10,6 +11,8 @@ import java.util.Optional; import java.util.stream.Collectors; import javax.annotation.Nullable; +import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; +import org.opentripplanner.ext.stopconsolidation.model.StopReplacement; import org.opentripplanner.framework.collection.ListUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; @@ -28,9 +31,14 @@ class StopClusterMapper { private final TransitService transitService; + private final StopConsolidationService stopConsolidationService; - StopClusterMapper(TransitService transitService) { + StopClusterMapper( + TransitService transitService, + StopConsolidationService stopConsolidationService + ) { this.transitService = transitService; + this.stopConsolidationService = stopConsolidationService; } /** @@ -45,16 +53,67 @@ Iterable generateStopClusters( Collection stopLocations, Collection stopLocationsGroups ) { + var stopClusters = buildStopClusters(stopLocations); + var stationClusters = buildStationClusters(stopLocationsGroups); + var consolidatedStopClusters = buildConsolidatedStopClusters(); + + return Iterables.concat(stopClusters, stationClusters, consolidatedStopClusters); + } + + private Iterable buildConsolidatedStopClusters() { + var multiMap = stopConsolidationService + .replacements() + .stream() + .collect( + ImmutableListMultimap.toImmutableListMultimap( + StopReplacement::primary, + StopReplacement::secondary + ) + ); + return multiMap + .keySet() + .stream() + .map(primary -> { + var secondaryIds = multiMap.get(primary); + var secondaries = secondaryIds.stream().map(transitService::getStopLocation).toList(); + var codes = ListUtils.combine( + ListUtils.ofNullable(primary.getCode()), + getCodes(secondaries) + ); + var names = ListUtils.combine( + ListUtils.ofNullable(primary.getName()), + getNames(secondaries) + ); + + return new LuceneStopCluster( + primary.getId().toString(), + secondaryIds.stream().map(id -> id.toString()).toList(), + names, + codes, + toCoordinate(primary.getCoordinate()) + ); + }) + .toList(); + } + + private static List buildStationClusters( + Collection stopLocationsGroups + ) { + return stopLocationsGroups.stream().map(StopClusterMapper::map).toList(); + } + + private List buildStopClusters(Collection stopLocations) { List stops = stopLocations .stream() // remove stop locations without a parent station .filter(sl -> sl.getParentStation() == null) + .filter(sl -> !stopConsolidationService.isPartOfConsolidatedStop(sl)) // stops without a name (for example flex areas) are useless for searching, so we remove them, too .filter(sl -> sl.getName() != null) .toList(); // if they are very close to each other and have the same name, only one is chosen (at random) - var deduplicatedStops = stops + return stops .stream() .collect( Collectors.groupingBy(sl -> @@ -66,9 +125,6 @@ Iterable generateStopClusters( .map(group -> map(group).orElse(null)) .filter(Objects::nonNull) .toList(); - var stations = stopLocationsGroups.stream().map(StopClusterMapper::map).toList(); - - return Iterables.concat(deduplicatedStops, stations); } private static LuceneStopCluster map(StopLocationsGroup g) { diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java index 07f14103aad..17949e5cb8a 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java @@ -5,12 +5,12 @@ import jakarta.inject.Singleton; import javax.annotation.Nullable; import org.opentripplanner.ext.geocoder.LuceneIndex; +import org.opentripplanner.ext.stopconsolidation.StopConsolidationService; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.transit.service.TransitService; /** - * This module converts the ride hailing configurations into ride hailing services to be used by the - * application context. + * This module builds the lucene geocoder based on the whether the feature flag is */ @Module public class GeocoderModule { @@ -18,9 +18,12 @@ public class GeocoderModule { @Provides @Singleton @Nullable - LuceneIndex luceneIndex(TransitService service) { + LuceneIndex luceneIndex( + TransitService service, + @Nullable StopConsolidationService stopConsolidationService + ) { if (OTPFeature.SandboxAPIGeocoder.isOn()) { - return new LuceneIndex(service); + return new LuceneIndex(service, stopConsolidationService); } else { return null; } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java index 11ad4be69ff..68efe8744cc 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/StopConsolidationService.java @@ -43,4 +43,6 @@ public interface StopConsolidationService { * For a given stop id return the primary stop if it is part of a consolidated stop group. */ Optional primaryStop(FeedScopedId id); + + boolean isPartOfConsolidatedStop(StopLocation sl); } diff --git a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java index 216489512f5..9f31e366be5 100644 --- a/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java +++ b/src/ext/java/org/opentripplanner/ext/stopconsolidation/internal/DefaultStopConsolidationService.java @@ -67,6 +67,11 @@ public boolean isSecondaryStop(StopLocation stop) { return repo.groups().stream().anyMatch(r -> r.secondaries().contains(stop.getId())); } + @Override + public boolean isPartOfConsolidatedStop(StopLocation sl) { + return isSecondaryStop(sl) || isPrimaryStop(sl); + } + @Override public boolean isActive() { return !repo.groups().isEmpty(); diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java index db4a4af7fbd..f2c279e7609 100644 --- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java +++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java @@ -179,7 +179,8 @@ private void setupTransitRoutingServer() { } if (OTPFeature.SandboxAPIGeocoder.isOn()) { - LOG.info("Creating debug client geocoder lucene index"); + LOG.info("Initializing geocoder"); + this.factory.luceneIndex(); } } From d826aeb1e3b7feb824905173267e6f24952947c4 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 12 Jun 2024 16:07:06 +0200 Subject: [PATCH 1358/1688] Filter nullable codes --- .../org/opentripplanner/ext/geocoder/StopClusterMapper.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 4253041a88a..003225f9781 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -75,7 +75,11 @@ private Iterable buildConsolidatedStopClusters() { .stream() .map(primary -> { var secondaryIds = multiMap.get(primary); - var secondaries = secondaryIds.stream().map(transitService::getStopLocation).toList(); + var secondaries = secondaryIds + .stream() + .map(transitService::getStopLocation) + .filter(Objects::nonNull) + .toList(); var codes = ListUtils.combine( ListUtils.ofNullable(primary.getCode()), getCodes(secondaries) From ba12693a795de12237166fdeb4098c53c910a97e Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 12 Jun 2024 16:18:48 +0200 Subject: [PATCH 1359/1688] Remove logging --- src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java | 2 -- .../org/opentripplanner/ext/geocoder/StopClusterMapper.java | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java index 1c01c1c36ff..f5b4a6e59e9 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java @@ -77,8 +77,6 @@ public LuceneIndex( this.transitService = transitService; this.stopClusterMapper = new StopClusterMapper(transitService, stopConsolidationService); - LOG.info("Creating geocoder lucene index"); - this.analyzer = new PerFieldAnalyzerWrapper( new StandardAnalyzer(), diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java index 003225f9781..98a617b809f 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/StopClusterMapper.java @@ -35,7 +35,7 @@ class StopClusterMapper { StopClusterMapper( TransitService transitService, - StopConsolidationService stopConsolidationService + @Nullable StopConsolidationService stopConsolidationService ) { this.transitService = transitService; this.stopConsolidationService = stopConsolidationService; From 08cc14ef304d31e68f1327e158bb52ad965e1da2 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Wed, 12 Jun 2024 15:29:05 +0200 Subject: [PATCH 1360/1688] Refactor SIRI updaters --- .../AsyncEstimatedTimetableProcessor.java | 51 +++ .../AsyncEstimatedTimetableSource.java | 22 + .../updater/EstimatedTimetableHandler.java | 75 ++++ .../GooglePubsubEstimatedTimetableSource.java | 339 ++++++++++++++++ .../updater/SiriETGooglePubsubUpdater.java | 383 ++---------------- .../ext/siri/updater/SiriETUpdater.java | 65 ++- 6 files changed, 548 insertions(+), 387 deletions(-) create mode 100644 src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java create mode 100644 src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java create mode 100644 src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java create mode 100644 src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java new file mode 100644 index 00000000000..93b7e2b3d96 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -0,0 +1,51 @@ +package org.opentripplanner.ext.siri.updater; + +import java.util.concurrent.ExecutionException; +import uk.org.siri.siri20.ServiceDelivery; + +/** + * Process a SIRI-ET feed by combining an asynchronous source of estimated timetables + * {@link AsyncEstimatedTimetableSource} with a consumer of estimated timetables + * {@link EstimatedTimetableHandler} + */ +public class AsyncEstimatedTimetableProcessor { + + private final AsyncEstimatedTimetableSource siriMessageSource; + private final EstimatedTimetableHandler estimatedTimetableHandler; + + private volatile boolean primed; + + public AsyncEstimatedTimetableProcessor( + AsyncEstimatedTimetableSource siriMessageSource, + EstimatedTimetableHandler estimatedTimetableHandler + ) { + this.siriMessageSource = siriMessageSource; + this.estimatedTimetableHandler = estimatedTimetableHandler; + } + + public void run() { + siriMessageSource.start(this::processSiriData); + } + + public boolean isPrimed() { + return this.primed; + } + + private void processSiriData(ServiceDelivery serviceDelivery) { + var f = estimatedTimetableHandler.applyUpdate( + serviceDelivery.getEstimatedTimetableDeliveries(), + false + ); + if (!isPrimed()) { + try { + f.get(); + primed = true; + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } + } + } +} diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java new file mode 100644 index 00000000000..140c2c14718 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java @@ -0,0 +1,22 @@ +package org.opentripplanner.ext.siri.updater; + +import java.util.function.Consumer; +import uk.org.siri.siri20.ServiceDelivery; + +/** + * A source of estimated timetables produced by an asynchronous (push) SIRI-ET feed. + */ +public interface AsyncEstimatedTimetableSource { + /** + * Start reading from the SIRI-ET feed and forward the estimated timetables to a consumer for + * further processing. + *
              Starting the source includes all the necessary steps to set up the network + * communication with the SIRI-ET feed as well as the (optional) processing of the message + * backlog, that is the recent history of SIRI-ET messages produced by this feed and made + * available by a message cache. + * + * @param serviceDeliveryConsumer a consumer of estimated timetable responsible for applying the + * update to the transit model. + */ + void start(Consumer serviceDeliveryConsumer); +} diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java new file mode 100644 index 00000000000..7e4dfc88251 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java @@ -0,0 +1,75 @@ +package org.opentripplanner.ext.siri.updater; + +import java.util.List; +import java.util.concurrent.Future; +import java.util.function.Consumer; +import javax.annotation.Nonnull; +import org.opentripplanner.ext.siri.EntityResolver; +import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; +import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; +import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.updater.spi.UpdateResult; +import org.opentripplanner.updater.spi.WriteToGraphCallback; +import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; + +/** + * A consumer of estimated timetables that applies the real-time updates to the transit model. + */ +public class EstimatedTimetableHandler { + + /** + * Parent update manager. Is used to execute graph writer runnables. + */ + private final WriteToGraphCallback saveResultOnGraph; + + private final SiriTimetableSnapshotSource snapshotSource; + private final SiriFuzzyTripMatcher fuzzyTripMatcher; + private final EntityResolver entityResolver; + private final Consumer updateResultConsumer; + /** + * The ID for the static feed to which these TripUpdates are applied + */ + private final String feedId; + + public EstimatedTimetableHandler( + WriteToGraphCallback saveResultOnGraph, + SiriTimetableSnapshotSource snapshotSource, + boolean fuzzyMatching, + TransitService transitService, + Consumer updateResultConsumer, + String feedId + ) { + this.saveResultOnGraph = saveResultOnGraph; + this.snapshotSource = snapshotSource; + this.fuzzyTripMatcher = fuzzyMatching ? SiriFuzzyTripMatcher.of(transitService) : null; + this.entityResolver = new EntityResolver(transitService, feedId); + this.updateResultConsumer = updateResultConsumer; + this.feedId = feedId; + } + + public Future applyUpdate( + List estimatedTimetableDeliveries, + boolean fullDataset + ) { + return applyUpdate(estimatedTimetableDeliveries, fullDataset, () -> {}); + } + + public Future applyUpdate( + List estimatedTimetableDeliveries, + boolean fullDataset, + @Nonnull Runnable onUpdateComplete + ) { + return saveResultOnGraph.execute((graph, transitModel) -> { + var results = snapshotSource.applyEstimatedTimetable( + fuzzyTripMatcher, + entityResolver, + feedId, + fullDataset, + estimatedTimetableDeliveries + ); + + updateResultConsumer.accept(results); + onUpdateComplete.run(); + }); + } +} diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java new file mode 100644 index 00000000000..3f3ab67b564 --- /dev/null +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java @@ -0,0 +1,339 @@ +package org.opentripplanner.ext.siri.updater; + +import com.google.api.gax.rpc.NotFoundException; +import com.google.cloud.pubsub.v1.AckReplyConsumer; +import com.google.cloud.pubsub.v1.MessageReceiver; +import com.google.cloud.pubsub.v1.Subscriber; +import com.google.cloud.pubsub.v1.SubscriptionAdminClient; +import com.google.protobuf.ByteString; +import com.google.protobuf.InvalidProtocolBufferException; +import com.google.pubsub.v1.ExpirationPolicy; +import com.google.pubsub.v1.ProjectSubscriptionName; +import com.google.pubsub.v1.ProjectTopicName; +import com.google.pubsub.v1.PubsubMessage; +import com.google.pubsub.v1.PushConfig; +import com.google.pubsub.v1.Subscription; +import java.io.IOException; +import java.net.URI; +import java.time.Duration; +import java.time.Instant; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.concurrent.atomic.AtomicLong; +import java.util.function.Consumer; +import org.entur.protobuf.mapper.SiriMapper; +import org.opentripplanner.framework.application.ApplicationShutdownSupport; +import org.opentripplanner.framework.io.OtpHttpClientFactory; +import org.opentripplanner.framework.retry.OtpRetry; +import org.opentripplanner.framework.retry.OtpRetryBuilder; +import org.opentripplanner.framework.text.FileSizeToTextConverter; +import org.opentripplanner.framework.time.DurationUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import uk.org.siri.siri20.ServiceDelivery; +import uk.org.siri.siri20.Siri; +import uk.org.siri.www.siri.SiriType; + +/** + * A source of estimated timetables that reads SIRI-ET messages from a Google PubSub subscription. + *

              + * This class starts a Google PubSub subscription + *

              + * NOTE: - Path to Google credentials (.json-file) MUST exist in environment-variable + * "GOOGLE_APPLICATION_CREDENTIALS" as described here: + * ServiceAccount need access + * to + * create subscription ("editor") + *

              + *

              + *

              + * Startup-flow: 1. Create subscription to topic. Subscription will receive all updates after + * creation. 2. Fetch current data to initialize state. 3. Flag updater as initialized 3. Start + * receiving updates from Pubsub-subscription + * + * + * 

              + *   "type": "google-pubsub-siri-et-updater",
+ *   "projectName":"project-1234",                                                      // Google Cloud project name
+ *   "topicName": "protobuf.estimated_timetables",                                      // Google Cloud Pubsub topic
+ *   "dataInitializationUrl": "http://server/realtime/protobuf/et"  // Optional URL used to initialize OTP with all existing data
+ *
              + */ +public class GooglePubsubEstimatedTimetableSource implements AsyncEstimatedTimetableSource { + + private static final Logger LOG = LoggerFactory.getLogger( + GooglePubsubEstimatedTimetableSource.class + ); + + private static final AtomicLong MESSAGE_COUNTER = new AtomicLong(0); + private static final AtomicLong UPDATE_COUNTER = new AtomicLong(0); + private static final AtomicLong SIZE_COUNTER = new AtomicLong(0); + private static final String SUBSCRIPTION_PREFIX = "siri-et-"; + + private static final int RETRY_MAX_ATTEMPTS = Integer.MAX_VALUE; + private static final Duration RETRY_INITIAL_DELAY = Duration.ofSeconds(1); + private static final int RETRY_BACKOFF = 2; + + /** + * The URL used to fetch all initial updates + */ + private final URI dataInitializationUrl; + + /** + * The number of seconds to wait before reconnecting after a failed connection. + */ + private final Duration reconnectPeriod; + + /** + * For larger deployments it sometimes takes more than the default 30 seconds to fetch data, if so + * this parameter can be increased. + */ + private final Duration initialGetDataTimeout; + + private final String subscriptionName; + private final ProjectTopicName topic; + private final Subscriber subscriber; + private final PushConfig pushConfig; + private final Instant startTime = Instant.now(); + + private final OtpRetry retry; + + private Consumer serviceDeliveryConsumer; + + public GooglePubsubEstimatedTimetableSource( + String dataInitializationUrl, + Duration reconnectPeriod, + Duration initialGetDataTimeout, + String subscriptionProjectName, + String topicProjectName, + String topicName + ) { + // URL that responds to HTTP GET which returns all initial data in protobuf-format. Will be + // called once to initialize real-time-data. All updates will be received from Google Cloud + // Pubsub + this.dataInitializationUrl = URI.create(dataInitializationUrl); + this.reconnectPeriod = reconnectPeriod; + this.initialGetDataTimeout = initialGetDataTimeout; + + // set subscriber + String subscriptionId = buildSubscriptionId(); + subscriptionName = + ProjectSubscriptionName.of(subscriptionProjectName, subscriptionId).toString(); + subscriber = + Subscriber.newBuilder(subscriptionName, new EstimatedTimetableMessageReceiver()).build(); + this.topic = ProjectTopicName.of(topicProjectName, topicName); + this.pushConfig = PushConfig.getDefaultInstance(); + + retry = + new OtpRetryBuilder() + .withName("SIRI-ET Google PubSub Updater setup") + .withMaxAttempts(RETRY_MAX_ATTEMPTS) + .withInitialRetryInterval(RETRY_INITIAL_DELAY) + .withBackoffMultiplier(RETRY_BACKOFF) + .build(); + + addShutdownHook(); + } + + @Override + public void start(Consumer serviceDeliveryConsumer) { + this.serviceDeliveryConsumer = serviceDeliveryConsumer; + + try { + LOG.info("Creating subscription {}", subscriptionName); + retry.execute(this::createSubscription); + LOG.info("Created subscription {}", subscriptionName); + + // Retrying until data is initialized successfully + retry.execute(this::initializeData); + + while (true) { + try { + subscriber.startAsync().awaitRunning(); + subscriber.awaitTerminated(); + } catch (IllegalStateException e) { + subscriber.stopAsync(); + } + Thread.sleep(reconnectPeriod.toMillis()); + } + } catch (InterruptedException ie) { + Thread.currentThread().interrupt(); + LOG.info("OTP is shutting down, stopping the SIRI ET Google PubSub Updater."); + } + } + + /** + * Build a unique name for the subscription. + * This ensures that if the subscription is not properly deleted during shutdown, + * a restarted instance will get a fresh subscription. + */ + private static String buildSubscriptionId() { + String hostname = System.getenv("HOSTNAME"); + if (hostname == null || hostname.isEmpty()) { + return SUBSCRIPTION_PREFIX + "otp-" + UUID.randomUUID(); + } else { + return SUBSCRIPTION_PREFIX + hostname + '-' + Instant.now().toEpochMilli(); + } + } + + private void createSubscription() { + try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) { + subscriptionAdminClient.createSubscription( + Subscription + .newBuilder() + .setTopic(topic.toString()) + .setName(subscriptionName) + .setPushConfig(pushConfig) + .setMessageRetentionDuration( + // How long will an unprocessed message be kept - minimum 10 minutes + com.google.protobuf.Duration.newBuilder().setSeconds(600).build() + ) + .setExpirationPolicy( + ExpirationPolicy + .newBuilder() + // How long will the subscription exist when no longer in use - minimum 1 day + .setTtl(com.google.protobuf.Duration.newBuilder().setSeconds(86400).build()) + .build() + ) + .build() + ); + } catch (IOException e) { + // Google libraries expects credentials json-file either as + // Path is stored in environment variable "GOOGLE_APPLICATION_CREDENTIALS" + // (https://cloud.google.com/docs/authentication/getting-started) + // or + // Credentials are provided through "workload identity" + // (https://cloud.google.com/kubernetes-engine/docs/concepts/workload-identity) + throw new RuntimeException( + "Unable to initialize Google Pubsub-updater: System.getenv('GOOGLE_APPLICATION_CREDENTIALS') = " + + System.getenv("GOOGLE_APPLICATION_CREDENTIALS") + ); + } + } + + private void deleteSubscription() { + try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) { + LOG.info("Deleting subscription {}", subscriptionName); + subscriptionAdminClient.deleteSubscription(subscriptionName); + LOG.info( + "Subscription deleted {} - time since startup: {}", + subscriptionName, + DurationUtils.durationToStr(Duration.between(startTime, Instant.now())) + ); + } catch (IOException e) { + LOG.error("Could not delete subscription {}", subscriptionName); + } catch (NotFoundException nfe) { + LOG.info("Subscription {} not found, ignoring deletion request", subscriptionName); + } + } + + private ByteString fetchInitialData() { + try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { + var otpHttpClient = otpHttpClientFactory.create(LOG); + return otpHttpClient.getAndMap( + dataInitializationUrl, + initialGetDataTimeout, + Map.of("Content-Type", "application/x-protobuf"), + ByteString::readFrom + ); + } + } + + private Optional serviceDelivery(ByteString data) { + SiriType siriType; + try { + siriType = SiriType.parseFrom(data); + } catch (InvalidProtocolBufferException e) { + throw new RuntimeException(e); + } + Siri siri = SiriMapper.mapToJaxb(siriType); + return Optional.ofNullable(siri.getServiceDelivery()); + } + + private void initializeData() { + if (dataInitializationUrl != null) { + LOG.info("Fetching initial data from {}", dataInitializationUrl); + final long t1 = System.currentTimeMillis(); + ByteString value = fetchInitialData(); + final long t2 = System.currentTimeMillis(); + LOG.info( + "Fetching initial data - finished after {} ms, got {}", + (t2 - t1), + FileSizeToTextConverter.fileSizeToString(value.size()) + ); + serviceDelivery(value).ifPresent(serviceDeliveryConsumer); + LOG.info( + "Pubsub updater initialized after {} ms: [messages: {}, updates: {}, total size: {}, time since startup: {}]", + (System.currentTimeMillis() - t2), + MESSAGE_COUNTER.get(), + UPDATE_COUNTER.get(), + FileSizeToTextConverter.fileSizeToString(SIZE_COUNTER.get()), + getTimeSinceStartupString() + ); + } + } + + private void addShutdownHook() { + ApplicationShutdownSupport.addShutdownHook( + "siri-et-google-pubsub-shutdown", + () -> { + if (subscriber != null) { + LOG.info("Stopping SIRI-ET PubSub subscriber '{}'.", subscriptionName); + subscriber.stopAsync(); + } + deleteSubscription(); + } + ); + } + + private String getTimeSinceStartupString() { + return DurationUtils.durationToStr(Duration.between(startTime, Instant.now())); + } + + class EstimatedTimetableMessageReceiver implements MessageReceiver { + + @Override + public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { + Optional serviceDelivery = serviceDelivery(message.getData()); + serviceDelivery.ifPresent(sd -> { + logPubsubMessage(sd); + serviceDeliveryConsumer.accept(sd); + }); + + // Ack only after all work for the message is complete. + consumer.ack(); + } + } + + private void logPubsubMessage(ServiceDelivery serviceDelivery) { + int numberOfUpdatedTrips = 0; + try { + numberOfUpdatedTrips = + serviceDelivery + .getEstimatedTimetableDeliveries() + .getFirst() + .getEstimatedJourneyVersionFrames() + .getFirst() + .getEstimatedVehicleJourneies() + .size(); + } catch (Exception e) { + //ignore + } + long numberOfUpdates = UPDATE_COUNTER.addAndGet(numberOfUpdatedTrips); + long numberOfMessages = MESSAGE_COUNTER.incrementAndGet(); + + if (numberOfMessages % 1000 == 0) { + LOG.info( + "Pubsub stats: [messages: {}, updates: {}, total size: {}, current delay {} ms, time since startup: {}]", + numberOfMessages, + numberOfUpdates, + FileSizeToTextConverter.fileSizeToString(SIZE_COUNTER.get()), + Duration + .between(serviceDelivery.getResponseTimestamp().toInstant(), Instant.now()) + .toMillis(), + getTimeSinceStartupString() + ); + } + } +} diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index 7f79413c478..c4bb5307f00 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -1,125 +1,29 @@ package org.opentripplanner.ext.siri.updater; -import com.google.api.gax.rpc.NotFoundException; -import com.google.cloud.pubsub.v1.AckReplyConsumer; -import com.google.cloud.pubsub.v1.MessageReceiver; -import com.google.cloud.pubsub.v1.Subscriber; -import com.google.cloud.pubsub.v1.SubscriptionAdminClient; -import com.google.protobuf.ByteString; -import com.google.protobuf.InvalidProtocolBufferException; -import com.google.pubsub.v1.ExpirationPolicy; -import com.google.pubsub.v1.ProjectSubscriptionName; -import com.google.pubsub.v1.ProjectTopicName; -import com.google.pubsub.v1.PubsubMessage; -import com.google.pubsub.v1.PushConfig; -import com.google.pubsub.v1.Subscription; -import java.io.IOException; -import java.net.URI; -import java.time.Duration; -import java.time.Instant; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Consumer; -import org.entur.protobuf.mapper.SiriMapper; -import org.opentripplanner.ext.siri.EntityResolver; -import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; +import java.util.concurrent.Future; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; -import org.opentripplanner.framework.application.ApplicationShutdownSupport; -import org.opentripplanner.framework.io.OtpHttpClientFactory; -import org.opentripplanner.framework.retry.OtpRetry; -import org.opentripplanner.framework.retry.OtpRetryBuilder; -import org.opentripplanner.framework.text.FileSizeToTextConverter; -import org.opentripplanner.framework.time.DurationUtils; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.updater.GraphWriterRunnable; import org.opentripplanner.updater.spi.GraphUpdater; -import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; -import uk.org.siri.siri20.Siri; -import uk.org.siri.www.siri.SiriType; /** - * This class starts a Google PubSub subscription - *

              - * NOTE: - Path to Google credentials (.json-file) MUST exist in environment-variable - * "GOOGLE_APPLICATION_CREDENTIALS" as described here: - * ServiceAccount need access to - * create subscription ("editor") - *

              - *

              - *

              - * Startup-flow: 1. Create subscription to topic. Subscription will receive all updates after - * creation. 2. Fetch current data to initialize state. 3. Flag updater as initialized 3. Start - * receiving updates from Pubsub-subscription - * - * - * 

              - *   "type": "google-pubsub-siri-et-updater",
- *   "projectName":"project-1234",                                                      // Google Cloud project name
- *   "topicName": "protobuf.estimated_timetables",                                      // Google Cloud Pubsub topic
- *   "dataInitializationUrl": "http://server/realtime/protobuf/et"  // Optional URL used to initialize OTP with all existing data
- *
              + * Graph updater that processes a SIRI-ET feed based on a Google Pubsub subscription. This class + * configures a {@link GooglePubsubEstimatedTimetableSource} and an {@link EstimatedTimetableHandler} + * and delegates the update process to {@link AsyncEstimatedTimetableProcessor} */ public class SiriETGooglePubsubUpdater implements GraphUpdater { - private static final Logger LOG = LoggerFactory.getLogger(SiriETGooglePubsubUpdater.class); - - private static final AtomicLong MESSAGE_COUNTER = new AtomicLong(0); - private static final AtomicLong UPDATE_COUNTER = new AtomicLong(0); - private static final AtomicLong SIZE_COUNTER = new AtomicLong(0); - private static final String SUBSCRIPTION_PREFIX = "siri-et-"; - - private static final int RETRY_MAX_ATTEMPTS = Integer.MAX_VALUE; - private static final Duration RETRY_INITIAL_DELAY = Duration.ofSeconds(1); - private static final int RETRY_BACKOFF = 2; - - /** - * The URL used to fetch all initial updates - */ - private final URI dataInitializationUrl; - /** - * The ID for the static feed to which these TripUpdates are applied - */ - private final String feedId; - /** - * The number of seconds to wait before reconnecting after a failed connection. - */ - private final java.time.Duration reconnectPeriod; - - /** - * For larger deployments it sometimes takes more than the default 30 seconds to fetch data, if so - * this parameter can be increased. - */ - private final java.time.Duration initialGetDataTimeout; - - private final String subscriptionName; - private final ProjectTopicName topic; - private final Subscriber subscriber; - private final PushConfig pushConfig; private final String configRef; - private final SiriTimetableSnapshotSource snapshotSource; - private final SiriFuzzyTripMatcher fuzzyTripMatcher; - private final Instant startTime = Instant.now(); - private final Consumer recordMetrics; - private final EntityResolver entityResolver; - - private final OtpRetry retry; + private final AsyncEstimatedTimetableProcessor asyncEstimatedTimetableProcessor; /** * Parent update manager. Is used to execute graph writer runnables. */ private WriteToGraphCallback saveResultOnGraph; - private volatile boolean primed; - public SiriETGooglePubsubUpdater( SiriETGooglePubsubUpdaterParameters config, TransitModel transitModel, @@ -127,42 +31,30 @@ public SiriETGooglePubsubUpdater( ) { this.configRef = config.configRef(); - // URL that responds to HTTP GET which returns all initial data in protobuf-format. Will be - // called once to initialize real-time-data. All updates will be received from Google Cloud - // Pubsub - this.dataInitializationUrl = URI.create(config.dataInitializationUrl()); - this.feedId = config.feedId(); - this.reconnectPeriod = config.reconnectPeriod(); - this.initialGetDataTimeout = config.initialGetDataTimeout(); - this.snapshotSource = timetableSnapshot; - - // set subscriber - String subscriptionId = buildSubscriptionId(); - String subscriptionProjectName = config.subscriptionProjectName(); - String topicProjectName = config.topicProjectName(); + AsyncEstimatedTimetableSource asyncSiriMessageSource = new GooglePubsubEstimatedTimetableSource( + config.dataInitializationUrl(), + config.reconnectPeriod(), + config.initialGetDataTimeout(), + config.subscriptionProjectName(), + config.topicProjectName(), + config.topicName() + ); - String topicName = config.topicName(); + EstimatedTimetableHandler estimatedTimetableHandler = new EstimatedTimetableHandler( + this::writeToCallBack, + timetableSnapshot, + config.fuzzyTripMatching(), + new DefaultTransitService(transitModel), + TripUpdateMetrics.streaming(config), + config.feedId() + ); - subscriptionName = - ProjectSubscriptionName.of(subscriptionProjectName, subscriptionId).toString(); - subscriber = - Subscriber.newBuilder(subscriptionName, new EstimatedTimetableMessageReceiver()).build(); - this.topic = ProjectTopicName.of(topicProjectName, topicName); - this.pushConfig = PushConfig.getDefaultInstance(); - TransitService transitService = new DefaultTransitService(transitModel); - this.entityResolver = new EntityResolver(transitService, feedId); - this.fuzzyTripMatcher = - config.fuzzyTripMatching() ? SiriFuzzyTripMatcher.of(transitService) : null; - recordMetrics = TripUpdateMetrics.streaming(config); + this.asyncEstimatedTimetableProcessor = + new AsyncEstimatedTimetableProcessor(asyncSiriMessageSource, estimatedTimetableHandler); + } - addShutdownHook(); - retry = - new OtpRetryBuilder() - .withName("SIRI-ET Google PubSub Updater setup") - .withMaxAttempts(RETRY_MAX_ATTEMPTS) - .withInitialRetryInterval(RETRY_INITIAL_DELAY) - .withBackoffMultiplier(RETRY_BACKOFF) - .build(); + private Future writeToCallBack(GraphWriterRunnable graphWriterRunnable) { + return saveResultOnGraph.execute(graphWriterRunnable); } @Override @@ -172,233 +64,16 @@ public void setup(WriteToGraphCallback writeToGraphCallback) { @Override public void run() { - try { - LOG.info("Creating subscription {}", subscriptionName); - retry.execute(this::createSubscription); - LOG.info("Created subscription {}", subscriptionName); - - // Retrying until data is initialized successfully - retry.execute(this::initializeData); - - while (true) { - try { - subscriber.startAsync().awaitRunning(); - subscriber.awaitTerminated(); - } catch (IllegalStateException e) { - subscriber.stopAsync(); - } - Thread.sleep(reconnectPeriod.toMillis()); - } - } catch (InterruptedException ie) { - Thread.currentThread().interrupt(); - LOG.info("OTP is shutting down, stopping the SIRI ET Google PubSub Updater."); - } + asyncEstimatedTimetableProcessor.run(); } @Override public boolean isPrimed() { - return this.primed; + return asyncEstimatedTimetableProcessor.isPrimed(); } @Override public String getConfigRef() { return configRef; } - - private void addShutdownHook() { - ApplicationShutdownSupport.addShutdownHook( - "siri-et-google-pubsub-shutdown", - () -> { - if (subscriber != null) { - LOG.info("Stopping SIRI-ET PubSub subscriber '{}'.", subscriptionName); - subscriber.stopAsync(); - } - deleteSubscription(); - } - ); - } - - /** - * Build a unique name for the subscription. - * This ensures that if the subscription is not properly deleted during shutdown, - * a restarted instance will get a fresh subscription. - */ - private static String buildSubscriptionId() { - String hostname = System.getenv("HOSTNAME"); - if (hostname == null || hostname.isEmpty()) { - return SUBSCRIPTION_PREFIX + "otp-" + UUID.randomUUID(); - } else { - return SUBSCRIPTION_PREFIX + hostname + '-' + Instant.now().toEpochMilli(); - } - } - - private void createSubscription() { - try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) { - subscriptionAdminClient.createSubscription( - Subscription - .newBuilder() - .setTopic(topic.toString()) - .setName(subscriptionName) - .setPushConfig(pushConfig) - .setMessageRetentionDuration( - // How long will an unprocessed message be kept - minimum 10 minutes - com.google.protobuf.Duration.newBuilder().setSeconds(600).build() - ) - .setExpirationPolicy( - ExpirationPolicy - .newBuilder() - // How long will the subscription exist when no longer in use - minimum 1 day - .setTtl(com.google.protobuf.Duration.newBuilder().setSeconds(86400).build()) - .build() - ) - .build() - ); - } catch (IOException e) { - // Google libraries expects credentials json-file either as - // Path is stored in environment variable "GOOGLE_APPLICATION_CREDENTIALS" - // (https://cloud.google.com/docs/authentication/getting-started) - // or - // Credentials are provided through "workload identity" - // (https://cloud.google.com/kubernetes-engine/docs/concepts/workload-identity) - throw new RuntimeException( - "Unable to initialize Google Pubsub-updater: System.getenv('GOOGLE_APPLICATION_CREDENTIALS') = " + - System.getenv("GOOGLE_APPLICATION_CREDENTIALS") - ); - } - } - - private void deleteSubscription() { - try (SubscriptionAdminClient subscriptionAdminClient = SubscriptionAdminClient.create()) { - LOG.info("Deleting subscription {}", subscriptionName); - subscriptionAdminClient.deleteSubscription(subscriptionName); - LOG.info( - "Subscription deleted {} - time since startup: {}", - subscriptionName, - DurationUtils.durationToStr(Duration.between(startTime, Instant.now())) - ); - } catch (IOException e) { - LOG.error("Could not delete subscription {}", subscriptionName); - } catch (NotFoundException nfe) { - LOG.info("Subscription {} not found, ignoring deletion request", subscriptionName); - } - } - - private String getTimeSinceStartupString() { - return DurationUtils.durationToStr(Duration.between(startTime, Instant.now())); - } - - private void initializeData() { - if (dataInitializationUrl != null) { - LOG.info("Fetching initial data from {}", dataInitializationUrl); - final long t1 = System.currentTimeMillis(); - ByteString value = fetchInitialData(); - final long t2 = System.currentTimeMillis(); - LOG.info( - "Fetching initial data - finished after {} ms, got {}", - (t2 - t1), - FileSizeToTextConverter.fileSizeToString(value.size()) - ); - processSiriData(value); - primed = true; - LOG.info( - "Pubsub updater initialized after {} ms: [messages: {}, updates: {}, total size: {}, time since startup: {}]", - (System.currentTimeMillis() - t2), - MESSAGE_COUNTER.get(), - UPDATE_COUNTER.get(), - FileSizeToTextConverter.fileSizeToString(SIZE_COUNTER.get()), - getTimeSinceStartupString() - ); - } - } - - private ByteString fetchInitialData() { - try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { - var otpHttpClient = otpHttpClientFactory.create(LOG); - return otpHttpClient.getAndMap( - dataInitializationUrl, - initialGetDataTimeout, - Map.of("Content-Type", "application/x-protobuf"), - ByteString::readFrom - ); - } - } - - private void processSiriData(ByteString data) { - Siri siri; - try { - SIZE_COUNTER.addAndGet(data.size()); - final SiriType siriType = SiriType.parseFrom(data); - siri = SiriMapper.mapToJaxb(siriType); - } catch (InvalidProtocolBufferException e) { - throw new RuntimeException(e); - } - - if (siri.getServiceDelivery() != null) { - // Handle trip updates via graph writer runnable - List estimatedTimetableDeliveries = siri - .getServiceDelivery() - .getEstimatedTimetableDeliveries(); - - int numberOfUpdatedTrips = 0; - try { - numberOfUpdatedTrips = - estimatedTimetableDeliveries - .get(0) - .getEstimatedJourneyVersionFrames() - .get(0) - .getEstimatedVehicleJourneies() - .size(); - } catch (Exception e) { - //ignore - } - long numberOfUpdates = UPDATE_COUNTER.addAndGet(numberOfUpdatedTrips); - long numberOfMessages = MESSAGE_COUNTER.incrementAndGet(); - - if (numberOfMessages % 1000 == 0) { - LOG.info( - "Pubsub stats: [messages: {}, updates: {}, total size: {}, current delay {} ms, time since startup: {}]", - numberOfMessages, - numberOfUpdates, - FileSizeToTextConverter.fileSizeToString(SIZE_COUNTER.get()), - Duration - .between(siri.getServiceDelivery().getResponseTimestamp().toInstant(), Instant.now()) - .toMillis(), - getTimeSinceStartupString() - ); - } - - var f = saveResultOnGraph.execute((graph, transitModel) -> { - var results = snapshotSource.applyEstimatedTimetable( - fuzzyTripMatcher, - entityResolver, - feedId, - false, - estimatedTimetableDeliveries - ); - - recordMetrics.accept(results); - }); - - if (!isPrimed()) { - try { - f.get(); - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new RuntimeException(e); - } catch (ExecutionException e) { - throw new RuntimeException(e); - } - } - } - } - - class EstimatedTimetableMessageReceiver implements MessageReceiver { - - @Override - public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { - processSiriData(message.getData()); - // Ack only after all work for the message is complete. - consumer.ack(); - } - } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java index 66007f4aed8..5a1e0b1b71e 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java @@ -1,13 +1,12 @@ package org.opentripplanner.ext.siri.updater; import java.util.List; +import java.util.concurrent.Future; import java.util.function.Consumer; -import org.opentripplanner.ext.siri.EntityResolver; -import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.transit.service.TransitService; +import org.opentripplanner.updater.GraphWriterRunnable; import org.opentripplanner.updater.spi.PollingGraphUpdater; import org.opentripplanner.updater.spi.ResultLogger; import org.opentripplanner.updater.spi.UpdateResult; @@ -38,16 +37,7 @@ public class SiriETUpdater extends PollingGraphUpdater { */ protected WriteToGraphCallback saveResultOnGraph; - /** - * The place where we'll record the incoming real-time timetables to make them available to the - * router in a thread safe way. - */ - private final SiriTimetableSnapshotSource snapshotSource; - - private final SiriFuzzyTripMatcher fuzzyTripMatcher; - private final EntityResolver entityResolver; - - private final Consumer recordMetrics; + private final EstimatedTimetableHandler estimatedTimetableHandler; public SiriETUpdater( SiriETUpdaterParameters config, @@ -60,20 +50,34 @@ public SiriETUpdater( this.updateSource = new SiriETHttpTripUpdateSource(config.sourceParameters()); - this.snapshotSource = timetableSnapshot; - this.blockReadinessUntilInitialized = config.blockReadinessUntilInitialized(); - TransitService transitService = new DefaultTransitService(transitModel); - this.entityResolver = new EntityResolver(transitService, feedId); - this.fuzzyTripMatcher = - config.fuzzyTripMatching() ? SiriFuzzyTripMatcher.of(transitService) : null; LOG.info( "Creating stop time updater (SIRI ET) running every {} seconds : {}", pollingPeriod(), updateSource ); - recordMetrics = TripUpdateMetrics.streaming(config); + + estimatedTimetableHandler = + new EstimatedTimetableHandler( + this::writeToCallBack, + timetableSnapshot, + config.fuzzyTripMatching(), + new DefaultTransitService(transitModel), + updateResultConsumer(config), + feedId + ); + } + + private Consumer updateResultConsumer(SiriETUpdaterParameters config) { + return updateResult -> { + ResultLogger.logUpdateResult(feedId, "siri-et", updateResult); + TripUpdateMetrics.streaming(config).accept(updateResult); + }; + } + + private Future writeToCallBack(GraphWriterRunnable graphWriterRunnable) { + return saveResultOnGraph.execute(graphWriterRunnable); } @Override @@ -99,20 +103,15 @@ public void runPolling() { final boolean markPrimed = !moreData; List etds = serviceDelivery.getEstimatedTimetableDeliveries(); if (etds != null) { - saveResultOnGraph.execute((graph, transitModel) -> { - var result = snapshotSource.applyEstimatedTimetable( - fuzzyTripMatcher, - entityResolver, - feedId, - fullDataset, - etds - ); - ResultLogger.logUpdateResult(feedId, "siri-et", result); - recordMetrics.accept(result); - if (markPrimed) { - primed = true; + estimatedTimetableHandler.applyUpdate( + etds, + fullDataset, + () -> { + if (markPrimed) { + primed = true; + } } - }); + ); } } } while (moreData); From 6ba74b9e15c9b549441c02475bc9db3cec017edf Mon Sep 17 00:00:00 2001 From: Henrik Abrahamsson Date: Wed, 12 Jun 2024 14:04:51 +0200 Subject: [PATCH 1361/1688] Refactor NearbyStopsFinder to follow strategy pattern. This commit should only change structure. No behaviour should be affected. --- .../module/DirectTransferGenerator.java | 53 ++++--- .../module/{ => nearbystops}/MinMap.java | 2 +- .../module/nearbystops/NearbyStopFinder.java | 23 +++ .../PatternConsideringNearbyStopFinder.java | 94 ++++++++++++ .../StraightLineNearbyStopFinder.java | 47 ++++++ .../StreetNearbyStopFinder.java} | 143 +++--------------- .../raptoradapter/router/TransitRouter.java | 1 - .../router/street/AccessEgressRouter.java | 12 +- .../router/street/DirectFlexRouter.java | 2 - .../router/street/FlexAccessEgressRouter.java | 2 - .../MaxCountSkipEdgeStrategyTest.java | 8 +- 11 files changed, 221 insertions(+), 166 deletions(-) rename src/main/java/org/opentripplanner/graph_builder/module/{ => nearbystops}/MinMap.java (95%) create mode 100644 src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java create mode 100644 src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java create mode 100644 src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java rename src/main/java/org/opentripplanner/graph_builder/module/{NearbyStopFinder.java => nearbystops/StreetNearbyStopFinder.java} (60%) diff --git a/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java b/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java index 9d798554f20..287a1a71c21 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java @@ -12,6 +12,10 @@ import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.graph_builder.issues.StopNotLinkedForTransfers; import org.opentripplanner.graph_builder.model.GraphBuilderModule; +import org.opentripplanner.graph_builder.module.nearbystops.NearbyStopFinder; +import org.opentripplanner.graph_builder.module.nearbystops.PatternConsideringNearbyStopFinder; +import org.opentripplanner.graph_builder.module.nearbystops.StraightLineNearbyStopFinder; +import org.opentripplanner.graph_builder.module.nearbystops.StreetNearbyStopFinder; import org.opentripplanner.model.PathTransfer; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.StreetRequest; @@ -68,20 +72,7 @@ public void buildGraph() { } /* The linker will use streets if they are available, or straight-line distance otherwise. */ - NearbyStopFinder nearbyStopFinder = new NearbyStopFinder( - new DefaultTransitService(transitModel), - radiusByDuration, - 0, - null, - graph.hasStreets - ); - if (nearbyStopFinder.useStreets) { - LOG.info("Creating direct transfer edges between stops using the street network from OSM..."); - } else { - LOG.info( - "Creating direct transfer edges between stops using straight line distance (not streets)..." - ); - } + NearbyStopFinder nearbyStopFinder = createNearbyStopFinder(); List stops = graph.getVerticesOfType(TransitStopVertex.class); @@ -189,6 +180,31 @@ public void buildGraph() { ); } + /** + * Factory method for creating a NearbyStopFinder. Will create different finders depending on + * whether the graph has a street network and if ConsiderPatternsForDirectTransfers feature is + * enabled. + */ + private NearbyStopFinder createNearbyStopFinder() { + var transitService = new DefaultTransitService(transitModel); + NearbyStopFinder finder; + if (!graph.hasStreets) { + LOG.info( + "Creating direct transfer edges between stops using straight line distance (not streets)..." + ); + finder = new StraightLineNearbyStopFinder(transitService, radiusByDuration); + } else { + LOG.info("Creating direct transfer edges between stops using the street network from OSM..."); + finder = new StreetNearbyStopFinder(radiusByDuration, 0, null); + } + + if (OTPFeature.ConsiderPatternsForDirectTransfers.isOn()) { + return new PatternConsideringNearbyStopFinder(transitService, finder); + } else { + return finder; + } + } + private static Iterable findNearbyStops( NearbyStopFinder nearbyStopFinder, Vertex vertex, @@ -196,14 +212,7 @@ private static Iterable findNearbyStops( StreetRequest streetRequest, boolean reverseDirection ) { - return OTPFeature.ConsiderPatternsForDirectTransfers.isOn() - ? nearbyStopFinder.findNearbyStopsConsideringPatterns( - vertex, - request, - streetRequest, - reverseDirection - ) - : nearbyStopFinder.findNearbyStops(vertex, request, streetRequest, reverseDirection); + return nearbyStopFinder.findNearbyStops(vertex, request, streetRequest, reverseDirection); } private record TransferKey(StopLocation source, StopLocation target, List edges) {} diff --git a/src/main/java/org/opentripplanner/graph_builder/module/MinMap.java b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/MinMap.java similarity index 95% rename from src/main/java/org/opentripplanner/graph_builder/module/MinMap.java rename to src/main/java/org/opentripplanner/graph_builder/module/nearbystops/MinMap.java index 6db53e39fc6..6492a134474 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/MinMap.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/MinMap.java @@ -1,4 +1,4 @@ -package org.opentripplanner.graph_builder.module; +package org.opentripplanner.graph_builder.module.nearbystops; import java.util.HashMap; diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java new file mode 100644 index 00000000000..9bd8c4f8891 --- /dev/null +++ b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java @@ -0,0 +1,23 @@ +package org.opentripplanner.graph_builder.module.nearbystops; + +import java.util.Collection; +import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.routing.api.request.request.StreetRequest; +import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.street.model.vertex.Vertex; + +/** + * This class contains code for finding nearby stops from a given vertex. It is being used by access + * and egress searches as well as transfer generation. + */ +public interface NearbyStopFinder { + /** + * Return all stops within a certain distance from the given vertex. + */ + Collection findNearbyStops( + Vertex vertex, + RouteRequest routingRequest, + StreetRequest streetRequest, + boolean reverseDirection + ); +} diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java new file mode 100644 index 00000000000..9abf759d076 --- /dev/null +++ b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/PatternConsideringNearbyStopFinder.java @@ -0,0 +1,94 @@ +package org.opentripplanner.graph_builder.module.nearbystops; + +import java.time.Duration; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; +import org.opentripplanner.ext.flex.trip.FlexTrip; +import org.opentripplanner.framework.application.OTPFeature; +import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.routing.api.request.request.StreetRequest; +import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.service.TransitService; + +public class PatternConsideringNearbyStopFinder implements NearbyStopFinder { + + private final NearbyStopFinder delegateNearbyStopFinder; + private final TransitService transitService; + + public PatternConsideringNearbyStopFinder( + TransitService transitService, + NearbyStopFinder delegateNearbyStopFinder + ) { + this.transitService = transitService; + this.delegateNearbyStopFinder = delegateNearbyStopFinder; + } + + /** + * Find all unique nearby stops that are the closest stop on some trip pattern or flex trip. Note + * that the result will include the origin vertex if it is an instance of StopVertex. This is + * intentional: we don't want to return the next stop down the line for trip patterns that pass + * through the origin vertex. Taking the patterns into account reduces the number of transfers + * significantly compared to simple traverse-duration-constrained all-to-all stop linkage. + */ + @Override + public List findNearbyStops( + Vertex vertex, + RouteRequest routingRequest, + StreetRequest streetRequest, + boolean reverseDirection + ) { + /* Track the closest stop on each pattern passing nearby. */ + MinMap closestStopForPattern = new MinMap<>(); + + /* Track the closest stop on each flex trip nearby. */ + MinMap, NearbyStop> closestStopForFlexTrip = new MinMap<>(); + + /* Iterate over nearby stops via the street network or using straight-line distance. */ + for (NearbyStop nearbyStop : delegateNearbyStopFinder.findNearbyStops( + vertex, + routingRequest, + streetRequest, + reverseDirection + )) { + StopLocation ts1 = nearbyStop.stop; + + if (ts1 instanceof RegularStop) { + /* Consider this destination stop as a candidate for every trip pattern passing through it. */ + for (TripPattern pattern : transitService.getPatternsForStop(ts1)) { + if ( + reverseDirection + ? pattern.canAlight(nearbyStop.stop) + : pattern.canBoard(nearbyStop.stop) + ) { + closestStopForPattern.putMin(pattern, nearbyStop); + } + } + } + + if (OTPFeature.FlexRouting.isOn()) { + for (FlexTrip trip : transitService.getFlexIndex().getFlexTripsByStop(ts1)) { + if ( + reverseDirection + ? trip.isAlightingPossible(nearbyStop.stop) + : trip.isBoardingPossible(nearbyStop.stop) + ) { + closestStopForFlexTrip.putMin(trip, nearbyStop); + } + } + } + } + + /* Make a transfer from the origin stop to each destination stop that was the closest stop on any pattern. */ + Set uniqueStops = new HashSet<>(); + uniqueStops.addAll(closestStopForFlexTrip.values()); + uniqueStops.addAll(closestStopForPattern.values()); + // TODO: don't convert to list + return uniqueStops.stream().toList(); + } +} diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java new file mode 100644 index 00000000000..5b304d0d20c --- /dev/null +++ b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StraightLineNearbyStopFinder.java @@ -0,0 +1,47 @@ +package org.opentripplanner.graph_builder.module.nearbystops; + +import java.time.Duration; +import java.util.List; +import org.locationtech.jts.geom.Coordinate; +import org.opentripplanner.routing.api.request.RouteRequest; +import org.opentripplanner.routing.api.request.preference.WalkPreferences; +import org.opentripplanner.routing.api.request.request.StreetRequest; +import org.opentripplanner.routing.graphfinder.DirectGraphFinder; +import org.opentripplanner.routing.graphfinder.NearbyStop; +import org.opentripplanner.street.model.vertex.Vertex; +import org.opentripplanner.transit.service.TransitService; + +public class StraightLineNearbyStopFinder implements NearbyStopFinder { + + private final Duration durationLimit; + private final DirectGraphFinder directGraphFinder; + + public StraightLineNearbyStopFinder(TransitService transitService, Duration durationLimit) { + this.durationLimit = durationLimit; + + // We need to accommodate straight line distance (in meters) but when streets are present we + // use an earliest arrival search, which optimizes on time. Ideally we'd specify in meters, + // but we don't have much of a choice here. Use the default walking speed to convert. + this.directGraphFinder = new DirectGraphFinder(transitService::findRegularStops); + } + + /** + * Find nearby stops using straight line distance. + */ + @Override + public List findNearbyStops( + Vertex vertex, + RouteRequest routingRequest, + StreetRequest streetRequest, + boolean reverseDirection + ) { + return findNearbyStopsViaDirectTransfers(vertex); + } + + private List findNearbyStopsViaDirectTransfers(Vertex vertex) { + // It make sense for the directGraphFinder to use meters as a limit, so we convert first + double limitMeters = durationLimit.toSeconds() * WalkPreferences.DEFAULT.speed(); + Coordinate c0 = vertex.getCoordinate(); + return directGraphFinder.findClosestStops(c0, limitMeters); + } +} diff --git a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinder.java similarity index 60% rename from src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java rename to src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinder.java index aca6e8a94cf..baf528a739f 100644 --- a/src/main/java/org/opentripplanner/graph_builder/module/NearbyStopFinder.java +++ b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/StreetNearbyStopFinder.java @@ -1,4 +1,4 @@ -package org.opentripplanner.graph_builder.module; +package org.opentripplanner.graph_builder.module.nearbystops; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -7,24 +7,19 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; -import java.util.HashSet; import java.util.List; import java.util.Set; -import org.locationtech.jts.geom.Coordinate; import org.opentripplanner.astar.model.ShortestPathTree; import org.opentripplanner.astar.spi.SkipEdgeStrategy; import org.opentripplanner.astar.strategy.ComposingSkipEdgeStrategy; import org.opentripplanner.astar.strategy.DurationSkipEdgeStrategy; import org.opentripplanner.astar.strategy.MaxCountSkipEdgeStrategy; import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; -import org.opentripplanner.ext.flex.trip.FlexTrip; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.StreetMode; -import org.opentripplanner.routing.api.request.preference.WalkPreferences; import org.opentripplanner.routing.api.request.request.StreetRequest; -import org.opentripplanner.routing.graphfinder.DirectGraphFinder; import org.opentripplanner.routing.graphfinder.NearbyStop; import org.opentripplanner.street.model.edge.Edge; import org.opentripplanner.street.model.edge.StreetEdge; @@ -38,139 +33,40 @@ import org.opentripplanner.street.search.request.StreetSearchRequestMapper; import org.opentripplanner.street.search.state.State; import org.opentripplanner.street.search.strategy.DominanceFunctions; -import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.site.AreaStop; -import org.opentripplanner.transit.model.site.RegularStop; -import org.opentripplanner.transit.model.site.StopLocation; -import org.opentripplanner.transit.service.TransitService; -/** - * This class contains code for finding nearby stops from a given vertex. It is being used by access - * and egress searches as well as transfer generation. - */ -public class NearbyStopFinder { - - public final boolean useStreets; - - private final TransitService transitService; +public class StreetNearbyStopFinder implements NearbyStopFinder { private final Duration durationLimit; private final int maxStopCount; private final DataOverlayContext dataOverlayContext; - private DirectGraphFinder directGraphFinder; - /** * Construct a NearbyStopFinder for the given graph and search radius. - * - * @param useStreets if true, search via the street network instead of using straight-line - * distance. */ - public NearbyStopFinder( - TransitService transitService, + public StreetNearbyStopFinder( Duration durationLimit, int maxStopCount, - DataOverlayContext dataOverlayContext, - boolean useStreets + DataOverlayContext dataOverlayContext ) { - this.transitService = transitService; this.dataOverlayContext = dataOverlayContext; - this.useStreets = useStreets; this.durationLimit = durationLimit; this.maxStopCount = maxStopCount; - - if (!useStreets) { - // We need to accommodate straight line distance (in meters) but when streets are present we - // use an earliest arrival search, which optimizes on time. Ideally we'd specify in meters, - // but we don't have much of a choice here. Use the default walking speed to convert. - this.directGraphFinder = new DirectGraphFinder(transitService::findRegularStops); - } - } - - /** - * Find all unique nearby stops that are the closest stop on some trip pattern or flex trip. Note - * that the result will include the origin vertex if it is an instance of StopVertex. This is - * intentional: we don't want to return the next stop down the line for trip patterns that pass - * through the origin vertex. - * Taking the patterns into account reduces the number of transfers significantly compared to - * simple traverse-duration-constrained all-to-all stop linkage. - */ - public Set findNearbyStopsConsideringPatterns( - Vertex vertex, - RouteRequest routingRequest, - StreetRequest streetRequest, - boolean reverseDirection - ) { - /* Track the closest stop on each pattern passing nearby. */ - MinMap closestStopForPattern = new MinMap<>(); - - /* Track the closest stop on each flex trip nearby. */ - MinMap, NearbyStop> closestStopForFlexTrip = new MinMap<>(); - - /* Iterate over nearby stops via the street network or using straight-line distance, depending on the graph. */ - for (NearbyStop nearbyStop : findNearbyStops( - vertex, - routingRequest, - streetRequest, - reverseDirection - )) { - StopLocation ts1 = nearbyStop.stop; - - if (ts1 instanceof RegularStop) { - /* Consider this destination stop as a candidate for every trip pattern passing through it. */ - for (TripPattern pattern : transitService.getPatternsForStop(ts1)) { - if ( - reverseDirection - ? pattern.canAlight(nearbyStop.stop) - : pattern.canBoard(nearbyStop.stop) - ) { - closestStopForPattern.putMin(pattern, nearbyStop); - } - } - } - - if (OTPFeature.FlexRouting.isOn()) { - for (FlexTrip trip : transitService.getFlexIndex().getFlexTripsByStop(ts1)) { - if ( - reverseDirection - ? trip.isAlightingPossible(nearbyStop.stop) - : trip.isBoardingPossible(nearbyStop.stop) - ) { - closestStopForFlexTrip.putMin(trip, nearbyStop); - } - } - } - } - - /* Make a transfer from the origin stop to each destination stop that was the closest stop on any pattern. */ - Set uniqueStops = new HashSet<>(); - uniqueStops.addAll(closestStopForFlexTrip.values()); - uniqueStops.addAll(closestStopForPattern.values()); - return uniqueStops; } /** * Return all stops within a certain radius of the given vertex, using network distance along - * streets. Use the correct method depending on whether the graph has street data or not. If the - * origin vertex is a StopVertex, the result will include it; this characteristic is essential for - * associating the correct stop with each trip pattern in the vicinity. + * streets. If the origin vertex is a StopVertex, the result will include it; this characteristic + * is essential for associating the correct stop with each trip pattern in the vicinity. */ - public List findNearbyStops( + @Override + public Collection findNearbyStops( Vertex vertex, RouteRequest routingRequest, StreetRequest streetRequest, boolean reverseDirection ) { - if (useStreets) { - return findNearbyStopsViaStreets( - Set.of(vertex), - reverseDirection, - routingRequest, - streetRequest - ); - } else { - return findNearbyStopsViaDirectTransfers(vertex); - } + return findNearbyStops(Set.of(vertex), reverseDirection, routingRequest, streetRequest); } /** @@ -181,7 +77,7 @@ public List findNearbyStops( * @param reverseDirection if true the paths returned instead originate at the nearby stops and * have the originVertex as the destination */ - public List findNearbyStopsViaStreets( + public Collection findNearbyStops( Set originVertices, boolean reverseDirection, RouteRequest request, @@ -262,18 +158,14 @@ public List findNearbyStopsViaStreets( return stopsFound; } - private List findNearbyStopsViaDirectTransfers(Vertex vertex) { - // It make sense for the directGraphFinder to use meters as a limit, so we convert first - double limitMeters = durationLimit.toSeconds() * WalkPreferences.DEFAULT.speed(); - Coordinate c0 = vertex.getCoordinate(); - return directGraphFinder.findClosestStops(c0, limitMeters); - } - private SkipEdgeStrategy getSkipEdgeStrategy() { var durationSkipEdgeStrategy = new DurationSkipEdgeStrategy(durationLimit); if (maxStopCount > 0) { - var strategy = new MaxCountSkipEdgeStrategy<>(maxStopCount, NearbyStopFinder::hasReachedStop); + var strategy = new MaxCountSkipEdgeStrategy<>( + maxStopCount, + StreetNearbyStopFinder::hasReachedStop + ); return new ComposingSkipEdgeStrategy<>(strategy, durationSkipEdgeStrategy); } return durationSkipEdgeStrategy; @@ -328,10 +220,9 @@ private boolean canBoardFlex(State state, boolean reverse) { * can dominate those that can thereby leading to zero found stops when this predicate is used with * the {@link MaxCountSkipEdgeStrategy}. *

              - * An example of this would be an egress/reverse search with a very high walk reluctance where - * the states that speculatively rent a vehicle move the walk states down the A* priority queue - * until the required number of stops are reached to abort the search, leading to zero egress - * results. + * An example of this would be an egress/reverse search with a very high walk reluctance where the + * states that speculatively rent a vehicle move the walk states down the A* priority queue until + * the required number of stops are reached to abort the search, leading to zero egress results. */ public static boolean hasReachedStop(State state) { return state.getVertex() instanceof TransitStopVertex && state.isFinal(); diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java index 6a1404c3039..06f4ff1cf45 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java @@ -247,7 +247,6 @@ private Collection fetchAccessEgresses(AccessEgre var nearbyStops = AccessEgressRouter.streetSearch( accessRequest, temporaryVerticesContainer, - serverContext.transitService(), streetRequest, serverContext.dataOverlayContext(accessRequest), type.isEgress(), diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java index d8b4132ba66..f6a0526fa66 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/AccessEgressRouter.java @@ -2,10 +2,9 @@ import java.time.Duration; import java.util.Collection; -import java.util.List; import org.opentripplanner.ext.dataoverlay.routing.DataOverlayContext; import org.opentripplanner.framework.application.OTPRequestTimeoutException; -import org.opentripplanner.graph_builder.module.NearbyStopFinder; +import org.opentripplanner.graph_builder.module.nearbystops.StreetNearbyStopFinder; import org.opentripplanner.routing.api.request.RouteRequest; import org.opentripplanner.routing.api.request.request.StreetRequest; import org.opentripplanner.routing.graphfinder.NearbyStop; @@ -31,7 +30,6 @@ private AccessEgressRouter() {} public static Collection streetSearch( RouteRequest request, TemporaryVerticesContainer verticesContainer, - TransitService transitService, StreetRequest streetRequest, DataOverlayContext dataOverlayContext, boolean fromTarget, @@ -39,14 +37,12 @@ public static Collection streetSearch( int maxStopCount ) { OTPRequestTimeoutException.checkForTimeout(); - NearbyStopFinder nearbyStopFinder = new NearbyStopFinder( - transitService, + var nearbyStopFinder = new StreetNearbyStopFinder( durationLimit, maxStopCount, - dataOverlayContext, - true + dataOverlayContext ); - List nearbyStopList = nearbyStopFinder.findNearbyStopsViaStreets( + Collection nearbyStopList = nearbyStopFinder.findNearbyStops( fromTarget ? verticesContainer.getToVertices() : verticesContainer.getFromVertices(), fromTarget, request, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java index ff60138d77d..8e4cf1b222f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/DirectFlexRouter.java @@ -37,7 +37,6 @@ public static List route( Collection accessStops = AccessEgressRouter.streetSearch( request, temporaryVertices, - serverContext.transitService(), request.journey().direct(), serverContext.dataOverlayContext(request), false, @@ -47,7 +46,6 @@ public static List route( Collection egressStops = AccessEgressRouter.streetSearch( request, temporaryVertices, - serverContext.transitService(), request.journey().direct(), serverContext.dataOverlayContext(request), true, diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java index 5023e595678..68dda38211a 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/street/FlexAccessEgressRouter.java @@ -37,7 +37,6 @@ public static Collection routeAccessEgress( ? AccessEgressRouter.streetSearch( request, verticesContainer, - transitService, new StreetRequest(StreetMode.WALK), dataOverlayContext, false, @@ -50,7 +49,6 @@ public static Collection routeAccessEgress( ? AccessEgressRouter.streetSearch( request, verticesContainer, - transitService, new StreetRequest(StreetMode.WALK), dataOverlayContext, true, diff --git a/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java b/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java index 17dc26a4c5e..88976591ea1 100644 --- a/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java +++ b/src/test/java/org/opentripplanner/astar/strategy/MaxCountSkipEdgeStrategyTest.java @@ -4,7 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.opentripplanner.graph_builder.module.NearbyStopFinder; +import org.opentripplanner.graph_builder.module.nearbystops.StreetNearbyStopFinder; import org.opentripplanner.street.search.state.TestStateBuilder; class MaxCountSkipEdgeStrategyTest { @@ -12,7 +12,7 @@ class MaxCountSkipEdgeStrategyTest { @Test void countStops() { var state = TestStateBuilder.ofWalking().stop().build(); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasReachedStop); + var strategy = new MaxCountSkipEdgeStrategy<>(1, StreetNearbyStopFinder::hasReachedStop); assertFalse(strategy.shouldSkipEdge(state, null)); assertTrue(strategy.shouldSkipEdge(state, null)); } @@ -20,7 +20,7 @@ void countStops() { @Test void doNotCountStop() { var state = TestStateBuilder.ofWalking().build(); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasReachedStop); + var strategy = new MaxCountSkipEdgeStrategy<>(1, StreetNearbyStopFinder::hasReachedStop); assertFalse(strategy.shouldSkipEdge(state, null)); assertFalse(strategy.shouldSkipEdge(state, null)); assertFalse(strategy.shouldSkipEdge(state, null)); @@ -30,7 +30,7 @@ void doNotCountStop() { void nonFinalState() { var state = TestStateBuilder.ofScooterRentalArriveBy().stop().build(); assertFalse(state.isFinal()); - var strategy = new MaxCountSkipEdgeStrategy<>(1, NearbyStopFinder::hasReachedStop); + var strategy = new MaxCountSkipEdgeStrategy<>(1, StreetNearbyStopFinder::hasReachedStop); assertFalse(strategy.shouldSkipEdge(state, null)); } } From 8258a1e03af4675554cc2ecfc2e52e99dd04c7ad Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 13 Jun 2024 13:21:39 +0200 Subject: [PATCH 1362/1688] Add Google's truth test assertion library, add test --- pom.xml | 6 ++ .../ext/geocoder/StopClusterMapperTest.java | 57 +++++++++++++++++++ 2 files changed, 63 insertions(+) create mode 100644 src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java diff --git a/pom.xml b/pom.xml index 6f202b592f8..266bbf6ab61 100644 --- a/pom.xml +++ b/pom.xml @@ -690,6 +690,12 @@ ${junit.version} test + + com.google.truth + truth + 1.4.2 + test + com.tngtech.archunit archunit diff --git a/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java b/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java new file mode 100644 index 00000000000..578f7d4118f --- /dev/null +++ b/src/ext-test/java/org/opentripplanner/ext/geocoder/StopClusterMapperTest.java @@ -0,0 +1,57 @@ +package org.opentripplanner.ext.geocoder; + +import static com.google.common.truth.Truth.assertThat; + +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationRepository; +import org.opentripplanner.ext.stopconsolidation.internal.DefaultStopConsolidationService; +import org.opentripplanner.ext.stopconsolidation.model.ConsolidatedStopGroup; +import org.opentripplanner.transit.model._data.TransitModelForTest; +import org.opentripplanner.transit.model.framework.Deduplicator; +import org.opentripplanner.transit.model.site.RegularStop; +import org.opentripplanner.transit.model.site.StopLocation; +import org.opentripplanner.transit.service.DefaultTransitService; +import org.opentripplanner.transit.service.StopModel; +import org.opentripplanner.transit.service.TransitModel; + +class StopClusterMapperTest { + + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final RegularStop STOP_A = TEST_MODEL.stop("A").build(); + private static final RegularStop STOP_B = TEST_MODEL.stop("B").build(); + private static final RegularStop STOP_C = TEST_MODEL.stop("C").build(); + private static final List STOPS = List.of(STOP_A, STOP_B, STOP_C); + private static final StopModel STOP_MODEL = TEST_MODEL + .stopModelBuilder() + .withRegularStops(STOPS) + .build(); + private static final TransitModel TRANSIT_MODEL = new TransitModel( + STOP_MODEL, + new Deduplicator() + ); + private static final List LOCATIONS = STOPS + .stream() + .map(StopLocation.class::cast) + .toList(); + + @Test + void clusterConsolidatedStops() { + var repo = new DefaultStopConsolidationRepository(); + repo.addGroups(List.of(new ConsolidatedStopGroup(STOP_A.getId(), List.of(STOP_B.getId())))); + + var service = new DefaultStopConsolidationService(repo, TRANSIT_MODEL); + var mapper = new StopClusterMapper(new DefaultTransitService(TRANSIT_MODEL), service); + + var clusters = mapper.generateStopClusters(LOCATIONS, List.of()); + + var expected = new LuceneStopCluster( + STOP_A.getId().toString(), + List.of(STOP_B.getId().toString()), + List.of(STOP_A.getName(), STOP_B.getName()), + List.of(STOP_A.getCode(), STOP_B.getCode()), + new StopCluster.Coordinate(STOP_A.getLat(), STOP_A.getLon()) + ); + assertThat(clusters).contains(expected); + } +} From 12c51f44f204db31d34a1eeb0d59204226e0fa5d Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 13 Jun 2024 17:01:57 +0300 Subject: [PATCH 1363/1688] Format test/documentation graphql files with prettier --- docs/apis/GraphQL-Tutorial.md | 122 ++++--- pom.xml | 1 + .../apis/gtfs/queries/alerts.graphql | 32 +- .../apis/gtfs/queries/feedinfo.graphql | 20 +- .../apis/gtfs/queries/nearest.graphql | 12 +- .../apis/gtfs/queries/patterns.graphql | 78 ++--- .../apis/gtfs/queries/plan-extended.graphql | 306 +++++++++--------- .../apis/gtfs/queries/plan-fares.graphql | 130 ++++---- .../gtfs/queries/plan-stop-positions.graphql | 83 +++-- .../apis/gtfs/queries/plan-tutorial.graphql | 104 +++--- .../apis/gtfs/queries/planConnection.graphql | 92 +----- .../apis/gtfs/queries/routes-extended.graphql | 24 +- .../apis/gtfs/queries/routes-tutorial.graphql | 20 +- .../apis/gtfs/queries/stops.graphql | 16 +- .../apis/gtfs/queries/vehicle-parking.graphql | 10 +- .../apis/gtfs/queries/walk-steps.graphql | 37 +-- 16 files changed, 503 insertions(+), 584 deletions(-) diff --git a/docs/apis/GraphQL-Tutorial.md b/docs/apis/GraphQL-Tutorial.md index e8bf41032b9..bfc87813f1d 100644 --- a/docs/apis/GraphQL-Tutorial.md +++ b/docs/apis/GraphQL-Tutorial.md @@ -32,17 +32,18 @@ GraphQL query in the left hand panel of the page: ```graphql { - routes { - longName - shortName - gtfsId - agency { - gtfsId - name - } - mode + routes { + longName + shortName + gtfsId + agency { + gtfsId + name } + mode + } } + ``` @@ -69,64 +70,59 @@ Most people want to get routing results out of OTP, so lets see the query for th ```graphql { - plan( - # these coordinates are in Portland, change this to YOUR origin - from: { lat: 45.5552, lon: -122.6534 } - # these coordinates are in Portland, change this to YOUR destination - to: { lat: 45.4908, lon: -122.5519 } - # use the correct date and time of your request - date: "2023-02-15", - time: "11:37", - # choose the transport modes you need - transportModes: [ - { - mode: WALK - }, - { - mode: TRANSIT - }, - ]) { - itineraries { - start - end - legs { - mode - from { - name - lat - lon - departure { - scheduledTime - estimated { - time - delay - } - } - } - to { - name - lat - lon - arrival { - scheduledTime - estimated { - time - delay - } - } - } - route { - gtfsId - longName - shortName - } - legGeometry { - points - } + plan( + # these coordinates are in Portland, change this to YOUR origin + from: { lat: 45.5552, lon: -122.6534 } + # these coordinates are in Portland, change this to YOUR destination + to: { lat: 45.4908, lon: -122.5519 } + # use the correct date and time of your request + date: "2023-02-15" + time: "11:37" + # choose the transport modes you need + transportModes: [{ mode: WALK }, { mode: TRANSIT }] + ) { + itineraries { + start + end + legs { + mode + from { + name + lat + lon + departure { + scheduledTime + estimated { + time + delay } + } } + to { + name + lat + lon + arrival { + scheduledTime + estimated { + time + delay + } + } + } + route { + gtfsId + longName + shortName + } + legGeometry { + points + } + } } + } } + ``` diff --git a/pom.xml b/pom.xml index 6f202b592f8..f055c2abd0e 100644 --- a/pom.xml +++ b/pom.xml @@ -429,6 +429,7 @@ src/test/java/**/*.java src/ext/java/**/*.java src/ext-test/java/**/*.java + src/test/resources/org/opentripplanner/apis/**/*.graphql diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql index 923d9f027cb..33ff47dd33b 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/alerts.graphql @@ -1,18 +1,18 @@ { - alerts { - id - alertHeaderText - alertDescriptionText - alertUrl - # these translations are a bit questionable, the above fields are already translated into the - # language selected in the request - alertDescriptionTextTranslations { - language - text - } - alertHeaderTextTranslations { - text - language - } + alerts { + id + alertHeaderText + alertDescriptionText + alertUrl + # these translations are a bit questionable, the above fields are already translated into the + # language selected in the request + alertDescriptionTextTranslations { + language + text } -} \ No newline at end of file + alertHeaderTextTranslations { + text + language + } + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql index 68516d26237..b9f47c3c68a 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/feedinfo.graphql @@ -1,12 +1,12 @@ { - feeds { - agencies { - name - url - } - publisher { - name - url - } + feeds { + agencies { + name + url } -} \ No newline at end of file + publisher { + name + url + } + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql index 3616ec03ff8..c7f8eed4213 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql @@ -3,15 +3,15 @@ edges { node { place { - ...on Stop { + ... on Stop { + id + gtfsId + parentStation { id - gtfsId - parentStation { - id - } } } } } } - } \ No newline at end of file + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql index 32be856274e..090473cfc7a 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/patterns.graphql @@ -1,43 +1,43 @@ { - patterns { - code - headsign - trips { - gtfsId - stoptimes { - stop { - gtfsId - name - } - headsign - scheduledArrival - scheduledDeparture - stopPosition - realtimeState - pickupType - dropoffType - } - occupancy { - occupancyStatus - } + patterns { + code + headsign + trips { + gtfsId + stoptimes { + stop { + gtfsId + name } - vehiclePositions { - vehicleId - label - lat - lon - stopRelationship { - status - stop { - gtfsId - } - } - speed - heading - lastUpdated - trip { - gtfsId - } + headsign + scheduledArrival + scheduledDeparture + stopPosition + realtimeState + pickupType + dropoffType + } + occupancy { + occupancyStatus + } + } + vehiclePositions { + vehicleId + label + lat + lon + stopRelationship { + status + stop { + gtfsId } + } + speed + heading + lastUpdated + trip { + gtfsId + } } -} \ No newline at end of file + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql index bcd96892e84..76bf8aa84e0 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-extended.graphql @@ -1,161 +1,157 @@ { - plan( - from: { lat: 52.3092, lon: 13.0291 } - to: { lat: 52.5147, lon: 13.3927 } - date: "2023-02-15", - time: "11:37", - parking: { - unpreferredCost: 555, - preferred: [{ not: [{tags: ["a", "b", "c"]}] }], - filters: [{ select: [{tags:["e"]}] }] - }, - transportModes: [ - { - mode: CAR, - qualifier: HAIL + plan( + from: { lat: 52.3092, lon: 13.0291 } + to: { lat: 52.5147, lon: 13.3927 } + date: "2023-02-15" + time: "11:37" + parking: { + unpreferredCost: 555 + preferred: [{ not: [{ tags: ["a", "b", "c"] }] }] + filters: [{ select: [{ tags: ["e"] }] }] + } + transportModes: [{ mode: CAR, qualifier: HAIL }] + ) { + itineraries { + start + end + # next two are deprecated + startTime + endTime + generalizedCost + accessibilityScore + emissionsPerPerson { + co2 + } + numberOfTransfers + walkDistance + walkTime + legs { + mode + start { + scheduledTime + estimated { + time + delay + } + } + end { + scheduledTime + estimated { + time + delay + } + } + from { + name + lat + lon + arrival { + scheduledTime + estimated { + delay + time + } + } + departure { + scheduledTime + estimated { + delay + time + } + } + departureTime + arrivalTime + } + to { + name + lat + lon + arrival { + scheduledTime + estimated { + delay + time + } + } + departure { + scheduledTime + estimated { + delay + time } - ]) { - itineraries { - start - end - # next two are deprecated - startTime - endTime - generalizedCost - accessibilityScore - emissionsPerPerson { - co2 + } + departureTime + arrivalTime + } + startTime + endTime + mode + generalizedCost + headsign + trip { + tripHeadsign + } + intermediatePlaces { + arrival { + scheduledTime + estimated { + time + delay + } + } + departure { + scheduledTime + estimated { + time + delay + } + } + stop { + name + } + } + alerts { + id + alertHeaderText + alertDescriptionText + alertEffect + alertCause + alertSeverityLevel + alertUrl + effectiveStartDate + effectiveEndDate + entities { + ... on Stop { + name + gtfsId + lat + lon + } + } + } + rideHailingEstimate { + provider { + id + } + productName + minPrice { + currency { + code + digits } - numberOfTransfers - walkDistance - walkTime - legs { - mode - start { - scheduledTime - estimated { - time - delay - } - } - end { - scheduledTime - estimated { - time - delay - } - } - from { - name - lat - lon - arrival { - scheduledTime - estimated { - delay - time - } - } - departure { - scheduledTime - estimated { - delay - time - } - } - departureTime - arrivalTime - } - to { - name - lat - lon - arrival { - scheduledTime - estimated { - delay - time - } - } - departure { - scheduledTime - estimated { - delay - time - } - } - departureTime - arrivalTime - } - startTime - endTime - mode - generalizedCost - headsign - trip { - tripHeadsign - } - intermediatePlaces { - arrival { - scheduledTime - estimated { - time - delay - } - } - departure { - scheduledTime - estimated { - time - delay - } - } - stop { - name - } - } - alerts { - id - alertHeaderText - alertDescriptionText - alertEffect - alertCause - alertSeverityLevel - alertUrl - effectiveStartDate - effectiveEndDate - entities { - ... on Stop { - name - gtfsId - lat - lon - } - } - } - rideHailingEstimate { - provider { - id - } - productName - minPrice { - currency { - code - digits - } - amount - } - maxPrice { - currency { - code - digits - } - amount - } - arrival - } - accessibilityScore + amount + } + maxPrice { + currency { + code + digits } + amount + } + arrival } + accessibilityScore + } } -} \ No newline at end of file + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-fares.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-fares.graphql index 0c2ba29dce5..c5081b1c8ed 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-fares.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-fares.graphql @@ -1,71 +1,71 @@ { - plan( - from: { lat: 52.3092, lon: 13.0291 } - to: { lat: 52.5147, lon: 13.3927 } - date: "2023-02-15", - time: "11:37", - transportModes: [{ mode: TRANSIT }] - ) { - itineraries { - legs { - mode - from { - name - lat - lon - departureTime - arrivalTime - } - to { - name - lat - lon - departureTime - arrivalTime - } - startTime - endTime - mode - generalizedCost - fareProducts { - id - product { - id - name - __typename - ... on DefaultFareProduct { - price { - currency { - digits - code - } - amount - } - } - riderCategory { - id - name - } - medium { - id - name - } - } + plan( + from: { lat: 52.3092, lon: 13.0291 } + to: { lat: 52.5147, lon: 13.3927 } + date: "2023-02-15" + time: "11:37" + transportModes: [{ mode: TRANSIT }] + ) { + itineraries { + legs { + mode + from { + name + lat + lon + departureTime + arrivalTime + } + to { + name + lat + lon + departureTime + arrivalTime + } + startTime + endTime + mode + generalizedCost + fareProducts { + id + product { + id + name + __typename + ... on DefaultFareProduct { + price { + currency { + digits + code } + amount + } } - fares { - type - cents - currency - components { - currency - cents - fareId - routes { - gtfsId - } - } + riderCategory { + id + name + } + medium { + id + name } + } + } + } + fares { + type + cents + currency + components { + currency + cents + fareId + routes { + gtfsId + } } + } } -} \ No newline at end of file + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-stop-positions.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-stop-positions.graphql index 4e0e42e4b57..dd2217e4288 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-stop-positions.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-stop-positions.graphql @@ -1,48 +1,43 @@ { - plan( - fromPlace: "from", - toPlace: "to", - date: "2023-02-15", - time: "11:37" - ){ - itineraries { - startTime - endTime - generalizedCost - accessibilityScore - legs { - mode - from { - name - lat - lon - departureTime - arrivalTime - stopPosition { - __typename - ... on PositionAtStop { - position - } - } - } - to { - name - lat - lon - departureTime - arrivalTime - stopPosition { - __typename - ... on PositionAtStop { - position - } - } - } - startTime - endTime - mode - generalizedCost + plan(fromPlace: "from", toPlace: "to", date: "2023-02-15", time: "11:37") { + itineraries { + startTime + endTime + generalizedCost + accessibilityScore + legs { + mode + from { + name + lat + lon + departureTime + arrivalTime + stopPosition { + __typename + ... on PositionAtStop { + position } + } } + to { + name + lat + lon + departureTime + arrivalTime + stopPosition { + __typename + ... on PositionAtStop { + position + } + } + } + startTime + endTime + mode + generalizedCost + } } -} \ No newline at end of file + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-tutorial.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-tutorial.graphql index 39877eef0b7..dd461060029 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-tutorial.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/plan-tutorial.graphql @@ -1,59 +1,53 @@ { - plan( - # these coordinates are in Portland, change this to YOUR origin - from: { lat: 45.5552, lon: -122.6534 } - # these coordinates are in Portland, change this to YOUR destination - to: { lat: 45.4908, lon: -122.5519 } - # use the correct date and time of your request - date: "2023-02-15", - time: "11:37", - # choose the transport modes you need - transportModes: [ - { - mode: WALK - }, - { - mode: TRANSIT - }, - ]) { - itineraries { - start - end - legs { - mode - from { - name - lat - lon - departure { - scheduledTime - estimated { - time - delay - } - } - } - to { - name - lat - lon - arrival { - scheduledTime - estimated { - time - delay - } - } - } - route { - gtfsId - longName - shortName - } - legGeometry { - points - } + plan( + # these coordinates are in Portland, change this to YOUR origin + from: { lat: 45.5552, lon: -122.6534 } + # these coordinates are in Portland, change this to YOUR destination + to: { lat: 45.4908, lon: -122.5519 } + # use the correct date and time of your request + date: "2023-02-15" + time: "11:37" + # choose the transport modes you need + transportModes: [{ mode: WALK }, { mode: TRANSIT }] + ) { + itineraries { + start + end + legs { + mode + from { + name + lat + lon + departure { + scheduledTime + estimated { + time + delay } + } } + to { + name + lat + lon + arrival { + scheduledTime + estimated { + time + delay + } + } + } + route { + gtfsId + longName + shortName + } + legGeometry { + points + } + } } -} \ No newline at end of file + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql index 4013479ded0..5691f130119 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/planConnection.graphql @@ -1,26 +1,14 @@ { planConnection( - dateTime: { - earliestDeparture: "2023-06-13T14:30+03:00" - } + dateTime: { earliestDeparture: "2023-06-13T14:30+03:00" } searchWindow: "PT2H30M" first: 5 origin: { - location: { - coordinate: { - latitude: 45.5552 - longitude: -122.6534 - } - } + location: { coordinate: { latitude: 45.5552, longitude: -122.6534 } } label: "Home" } destination: { - location: { - coordinate: { - latitude: 45.4908 - longitude: -122.5519 - } - } + location: { coordinate: { latitude: 45.4908, longitude: -122.5519 } } label: "Work" } modes: { @@ -31,25 +19,11 @@ access: [BICYCLE_RENTAL, WALK] transfer: [WALK] egress: [BICYCLE_RENTAL, WALK] - transit: [ - { - mode: TRAM - cost: { - reluctance: 1.3 - } - }, - { - mode: BUS - } - ] + transit: [{ mode: TRAM, cost: { reluctance: 1.3 } }, { mode: BUS }] } } preferences: { - accessibility: { - wheelchair: { - enabled: true - } - } + accessibility: { wheelchair: { enabled: true } } street: { car: { reluctance: 6.5 @@ -59,70 +33,36 @@ } parking: { unpreferredCost: 200 - preferred: [{ - select: [{ - tags: ["best-park"] - }] - }] - filters: [{ - not: [{ - tags: ["worst-park"] - }] - }] + preferred: [{ select: [{ tags: ["best-park"] }] }] + filters: [{ not: [{ tags: ["worst-park"] }] }] } } bicycle: { reluctance: 3.0 speed: 7.4 - optimization: { - type: SAFEST_STREETS - } + optimization: { type: SAFEST_STREETS } boardCost: 200 walk: { speed: 1.3 - cost: { - mountDismountCost: 100 - reluctance: 3.5 - } + cost: { mountDismountCost: 100, reluctance: 3.5 } mountDismountTime: "PT5S" } rental: { - destinationBicyclePolicy: { - allowKeeping: true - keepingCost: 300 - } + destinationBicyclePolicy: { allowKeeping: true, keepingCost: 300 } allowedNetworks: ["foo", "bar"] bannedNetworks: ["foobar"] } parking: { unpreferredCost: 200 - preferred: [{ - select: [{ - tags: ["best-park"] - }] - }] - filters: [{ - not: [{ - tags: ["worst-park"] - }] - }] + preferred: [{ select: [{ tags: ["best-park"] }] }] + filters: [{ not: [{ tags: ["worst-park"] }] }] } } - walk: { - speed: 2.4 - reluctance: 1.5 - safetyFactor: 0.5 - boardCost: 200 - } + walk: { speed: 2.4, reluctance: 1.5, safetyFactor: 0.5, boardCost: 200 } } transit: { - board: { - waitReluctance: 3.2 - slack: "PT1M30S" - } - alight: { - slack: "PT0S" - } + board: { waitReluctance: 3.2, slack: "PT1M30S" } + alight: { slack: "PT0S" } transfer: { cost: 200 slack: "PT2M" @@ -160,4 +100,4 @@ } } } -} \ No newline at end of file +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql index 50d89980442..90972cfa8cd 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql @@ -1,14 +1,14 @@ { - routes { - longName - shortName - gtfsId - agency { - gtfsId - name - } - mode - sortOrder - bikesAllowed + routes { + longName + shortName + gtfsId + agency { + gtfsId + name } -} \ No newline at end of file + mode + sortOrder + bikesAllowed + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql index 66d7f370c3f..6e948d2d5f8 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-tutorial.graphql @@ -1,12 +1,12 @@ { - routes { - longName - shortName - gtfsId - agency { - gtfsId - name - } - mode + routes { + longName + shortName + gtfsId + agency { + gtfsId + name } -} \ No newline at end of file + mode + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql index f5de224ebfd..5f3df71f8e7 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/stops.graphql @@ -1,9 +1,9 @@ { - stops { - gtfsId - lat - lon - name - vehicleMode - } -} \ No newline at end of file + stops { + gtfsId + lat + lon + name + vehicleMode + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql index 4eda1fae456..324d7aff5d6 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-parking.graphql @@ -1,6 +1,6 @@ { - vehicleParkings { - name - vehicleParkingId - } -} \ No newline at end of file + vehicleParkings { + name + vehicleParkingId + } +} diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql index d7d8f116745..c88958840d4 100644 --- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql +++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/walk-steps.graphql @@ -1,23 +1,20 @@ { - plan( - fromPlace: "from", - toPlace: "to", - date: "2023-02-15", - time: "11:37", - transportModes: [ - { - mode: WALK - } - ]) { - itineraries { - legs { - steps { - streetName - area - relativeDirection - absoluteDirection - } - } + plan( + fromPlace: "from" + toPlace: "to" + date: "2023-02-15" + time: "11:37" + transportModes: [{ mode: WALK }] + ) { + itineraries { + legs { + steps { + streetName + area + relativeDirection + absoluteDirection } + } } -} \ No newline at end of file + } +} From 9004bad9a94fb119e3039b19c009f60c39353553 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 13 Jun 2024 16:13:37 +0200 Subject: [PATCH 1364/1688] Fix small grammaer and punctuation errors --- docs/RouteRequest.md | 4 ++-- .../standalone/config/routerequest/RouteRequestConfig.java | 2 +- .../standalone/config/routerequest/TransferConfig.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 1d518fb1dcc..76ec510a5c7 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -217,7 +217,7 @@ vehicle to another. It is similar to `transferSlack`, except that this also applies to the first transit leg in the trip and `transferSlack` does not. -Some modes like, airplanes or subway, might need more of a slack than others, so this is also +Some modes, like airplanes or subway, might need more of a slack than others, so this is also configurable per mode with `boardSlackForMode`. @@ -368,7 +368,7 @@ significant time or walking will still be taken. The extra time needed to make a safe transfer. An extra buffer time that's applied when exiting one public transport vehicle and boarding another. -This time is in addition to time it might take to walk between stops plus `boardSlack` and +This time is in addition to how long it might take to walk between stops plus `boardSlack` and `alightSlack`. It is useful to add extra time for passengers with mobility issues, who need extra time diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 5f761d10f17..4c6913908f6 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -246,7 +246,7 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil It is similar to `transferSlack`, except that this also applies to the first transit leg in the trip and `transferSlack` does not. -Some modes like, airplanes or subway, might need more of a slack than others, so this is also +Some modes, like airplanes or subway, might need more of a slack than others, so this is also configurable per mode with `boardSlackForMode`. """ ) diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java index a9de698f60c..bbf2087c59e 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java @@ -40,8 +40,8 @@ static void mapTransferPreferences(NodeAdapter c, TransferPreferences.Builder tx .summary("The extra time needed to make a safe transfer.") .description( """ - An extra buffer time that's applied when exiting one public transport vehicle and boarding another. - This time is in addition to time it might take to walk between stops plus `boardSlack` and + An extra buffer time that's applied when exiting one public transport vehicle and boarding another. + This time is in addition to how long it might take to walk between stops plus `boardSlack` and `alightSlack`. It is useful to add extra time for passengers with mobility issues, who need extra time From 1eb31bd666d019ebef0350a75db211647b484a6e Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 13 Jun 2024 17:15:50 +0300 Subject: [PATCH 1365/1688] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index acc28473a8c..86a1a8e7653 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -4,3 +4,6 @@ # project-wide reformatting with prettier 9c9dd613489a348d2381acdcbeab8f86589154d7 +# graphql test and documentation reformatting with prettier +12c51f44f204db31d34a1eeb0d59204226e0fa5d + From 29a57d851dd8a3c7a3f7ddb94f0e98be02a388ce Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 13 Jun 2024 17:35:38 +0300 Subject: [PATCH 1366/1688] Remove extra quote --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 79a794b3607..b63465704a7 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -5508,7 +5508,7 @@ input BicycleWalkPreferencesInput { """ cost: BicycleWalkPreferencesCostInput - """" + """ How long it takes to hop on or off a bicycle when switching to walking the bicycle or when getting on the bicycle again. However, this is not applied when getting on a rented bicycle for the first time or off the bicycle when returning the bicycle. From 4a3110bfba691cc2e8c462ceaf8cc6d5b677c3ad Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Thu, 13 Jun 2024 16:48:08 +0200 Subject: [PATCH 1367/1688] Added javadoc and code cleanup --- .../AsyncEstimatedTimetableProcessor.java | 15 ++++++- .../GooglePubsubEstimatedTimetableSource.java | 45 ++++++++++++++----- .../updater/SiriETGooglePubsubUpdater.java | 8 +--- 3 files changed, 48 insertions(+), 20 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java index 93b7e2b3d96..3b5084ff612 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -23,20 +23,31 @@ public AsyncEstimatedTimetableProcessor( this.estimatedTimetableHandler = estimatedTimetableHandler; } + /** + * Start consuming from the estimated timetable source. + */ public void run() { siriMessageSource.start(this::processSiriData); } + /** + * Return true if the estimated timetable source is initialized and the backlog of messages + * is processed. + */ public boolean isPrimed() { - return this.primed; + return primed; } + /** + * Apply the estimated timetables to the transit model. + * The first successful call to this method sets the primed status to true. + */ private void processSiriData(ServiceDelivery serviceDelivery) { var f = estimatedTimetableHandler.applyUpdate( serviceDelivery.getEstimatedTimetableDeliveries(), false ); - if (!isPrimed()) { + if (!primed) { try { f.get(); primed = true; diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java index 3f3ab67b564..7a2562968e2 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java @@ -136,6 +136,12 @@ public GooglePubsubEstimatedTimetableSource( addShutdownHook(); } + /** + * Create a PubSub subscription, read the backlog of messages and start listening to the + * subscription. + * Enter an infinite loop waiting for messages. An interruption sent at server + * shutdown will cause the loop to stop. + */ @Override public void start(Consumer serviceDeliveryConsumer) { this.serviceDeliveryConsumer = serviceDeliveryConsumer; @@ -228,18 +234,9 @@ private void deleteSubscription() { } } - private ByteString fetchInitialData() { - try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { - var otpHttpClient = otpHttpClientFactory.create(LOG); - return otpHttpClient.getAndMap( - dataInitializationUrl, - initialGetDataTimeout, - Map.of("Content-Type", "application/x-protobuf"), - ByteString::readFrom - ); - } - } - + /** + * Decode the protobuf-encoded message payload into an optional SIRI ServiceDelivery. + */ private Optional serviceDelivery(ByteString data) { SiriType siriType; try { @@ -251,6 +248,9 @@ private Optional serviceDelivery(ByteString data) { return Optional.ofNullable(siri.getServiceDelivery()); } + /** + * Fetch the backlog of messages and apply the changes to the transit model. + */ private void initializeData() { if (dataInitializationUrl != null) { LOG.info("Fetching initial data from {}", dataInitializationUrl); @@ -274,6 +274,24 @@ private void initializeData() { } } + /** + * Fetch the backlog of messages from the configured data initialization URL. + */ + private ByteString fetchInitialData() { + try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { + var otpHttpClient = otpHttpClientFactory.create(LOG); + return otpHttpClient.getAndMap( + dataInitializationUrl, + initialGetDataTimeout, + Map.of("Content-Type", "application/x-protobuf"), + ByteString::readFrom + ); + } + } + + /** + * Shut down the PubSub subscriber at server shutdown. + */ private void addShutdownHook() { ApplicationShutdownSupport.addShutdownHook( "siri-et-google-pubsub-shutdown", @@ -291,6 +309,9 @@ private String getTimeSinceStartupString() { return DurationUtils.durationToStr(Duration.between(startTime, Instant.now())); } + /** + * Message receiver callback that consumes messages from the PubSub subscription. + */ class EstimatedTimetableMessageReceiver implements MessageReceiver { @Override diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index c4bb5307f00..4008cf07192 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -17,11 +17,7 @@ public class SiriETGooglePubsubUpdater implements GraphUpdater { private final String configRef; - private final AsyncEstimatedTimetableProcessor asyncEstimatedTimetableProcessor; - /** - * Parent update manager. Is used to execute graph writer runnables. - */ private WriteToGraphCallback saveResultOnGraph; public SiriETGooglePubsubUpdater( @@ -41,7 +37,7 @@ public SiriETGooglePubsubUpdater( ); EstimatedTimetableHandler estimatedTimetableHandler = new EstimatedTimetableHandler( - this::writeToCallBack, + this::writeToGraphCallBack, timetableSnapshot, config.fuzzyTripMatching(), new DefaultTransitService(transitModel), @@ -53,7 +49,7 @@ public SiriETGooglePubsubUpdater( new AsyncEstimatedTimetableProcessor(asyncSiriMessageSource, estimatedTimetableHandler); } - private Future writeToCallBack(GraphWriterRunnable graphWriterRunnable) { + private Future writeToGraphCallBack(GraphWriterRunnable graphWriterRunnable) { return saveResultOnGraph.execute(graphWriterRunnable); } From 782ae9760ba0a87c84d36326c49cd7f12654505b Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 13 Jun 2024 18:02:34 +0300 Subject: [PATCH 1368/1688] Add native graphql schema directives to the schema file This is in preparation for reformatting the schema file as the graphql library adds these --- .../opentripplanner/apis/gtfs/schema.graphqls | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index b63465704a7..d799853893e 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -8,11 +8,35 @@ This is only worth it when the execution is long running, i.e. more than ~50 mil """ directive @async on FIELD_DEFINITION +"Marks the field, argument, input field or enum value as deprecated" +directive @deprecated( + "The reason for the deprecation" + reason: String = "No longer supported" + ) on FIELD_DEFINITION | ARGUMENT_DEFINITION | ENUM_VALUE | INPUT_FIELD_DEFINITION + +"Directs the executor to include this field or fragment only when the `if` argument is true" +directive @include( + "Included when true." + if: Boolean! + ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + """ Exactly one of the fields on an input object must be set and non-null while all others are omitted. """ directive @oneOf on INPUT_OBJECT +"Directs the executor to skip this field or fragment when the `if` argument is true." +directive @skip( + "Skipped when true." + if: Boolean! + ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT + +"Exposes a URL that specifies the behaviour of this scalar." +directive @specifiedBy( + "The URL that specifies the behaviour of this scalar." + url: String! + ) on SCALAR + schema { query: QueryType } From 5436566f9859bc49a54be04c5c91628c745adb2f Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 13 Jun 2024 18:15:31 +0300 Subject: [PATCH 1369/1688] Add test for formatting GTFS GraphQL schema --- .../apis/gtfs/GraphQLFormattingTest.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java new file mode 100644 index 00000000000..7c05fc8e361 --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLFormattingTest.java @@ -0,0 +1,24 @@ +package org.opentripplanner.apis.gtfs; + +import static org.opentripplanner.framework.io.FileUtils.assertFileEquals; +import static org.opentripplanner.framework.io.FileUtils.readFile; +import static org.opentripplanner.framework.io.FileUtils.writeFile; + +import graphql.schema.idl.SchemaPrinter; +import java.io.File; +import org.junit.jupiter.api.Test; + +public class GraphQLFormattingTest { + + public static final File SCHEMA_FILE = new File( + "src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls" + ); + + @Test + public void format() { + String original = readFile(SCHEMA_FILE); + var schema = GtfsGraphQLIndex.buildSchema(); + writeFile(SCHEMA_FILE, new SchemaPrinter().print(schema)); + assertFileEquals(original, SCHEMA_FILE); + } +} From 14051fab312a67cae9a460aaf0bbc77223bec624 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 13 Jun 2024 18:26:32 +0300 Subject: [PATCH 1370/1688] Reformat GTFS GraphQL schema file with graphql-java --- .../opentripplanner/apis/gtfs/schema.graphqls | 9069 +++++++---------- 1 file changed, 3865 insertions(+), 5204 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index d799853893e..eb3c631ec3c 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -1,3 +1,7 @@ +schema { + query: QueryType +} + """ Use an asynchronous data fetcher on a separate thread for this field. @@ -20,9 +24,7 @@ directive @include( if: Boolean! ) on FIELD | FRAGMENT_SPREAD | INLINE_FRAGMENT -""" -Exactly one of the fields on an input object must be set and non-null while all others are omitted. -""" +"Exactly one of the fields on an input object must be set and non-null while all others are omitted." directive @oneOf on INPUT_OBJECT "Directs the executor to skip this field or fragment when the `if` argument is true." @@ -37,4606 +39,2880 @@ directive @specifiedBy( url: String! ) on SCALAR -schema { - query: QueryType +"A fare product (a ticket) to be bought by a passenger" +interface FareProduct { + "Identifier for the fare product." + id: String! + """ + The 'medium' that this product applies to, for example "Oyster Card" or "Berlin Ticket App". + + This communicates to riders that a specific way of buying or keeping this product is required. + """ + medium: FareMedium + "Human readable name of the product, for example example \"Day pass\" or \"Single ticket\"." + name: String! + "The category of riders this product applies to, for example students or pensioners." + riderCategory: RiderCategory } -""" -Plan accessibilty preferences. This can be expanded to contain preferences for various accessibility use cases -in the future. Currently only generic wheelchair preferences are available. -""" -input AccessibilityPreferencesInput { - """ - Wheelchair related preferences. Note, currently this is the only accessibility mode that is available. - """ - wheelchair: WheelchairPreferencesInput +"An object with an ID" +interface Node { + "The ID of an object" + id: ID! } -"""A public transport agency""" -type Agency implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """Agency feed and id""" - gtfsId: String! - - """Name of the agency""" - name: String! - - """URL to the home page of the agency""" - url: String! - - """ID of the time zone which this agency operates on""" - timezone: String! - - lang: String - - """Phone number which customers can use to contact this agency""" - phone: String +"Interface for places, e.g. stops, stations, parking areas.." +interface PlaceInterface { + id: ID! + "Latitude of the place (WGS 84)" + lat: Float + "Longitude of the place (WGS 84)" + lon: Float +} - """URL to a web page which has information of fares used by this agency""" - fareUrl: String +"Entity related to an alert" +union AlertEntity = Agency | Pattern | Route | RouteType | Stop | StopOnRoute | StopOnTrip | Trip | Unknown - """List of routes operated by this agency""" - routes: [Route] +union StopPosition = PositionAtStop | PositionBetweenStops - """ - By default, list of alerts which have an effect on all operations of the agency (e.g. a strike). - It's also possible to return other relevant alerts through defining types. - """ - alerts( - """ - Returns alerts for these types that are relevant for the agency. - By default only returns alerts that have an effect on all operations of the agency (e.g. a strike). - """ - types: [AgencyAlertType] - ): [Alert] +"A public transport agency" +type Agency implements Node { + """ + By default, list of alerts which have an effect on all operations of the agency (e.g. a strike). + It's also possible to return other relevant alerts through defining types. + """ + alerts( + """ + Returns alerts for these types that are relevant for the agency. + By default only returns alerts that have an effect on all operations of the agency (e.g. a strike). + """ + types: [AgencyAlertType] + ): [Alert] + "URL to a web page which has information of fares used by this agency" + fareUrl: String + "Agency feed and id" + gtfsId: String! + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + lang: String + "Name of the agency" + name: String! + "Phone number which customers can use to contact this agency" + phone: String + "List of routes operated by this agency" + routes: [Route] + "ID of the time zone which this agency operates on" + timezone: String! + "URL to the home page of the agency" + url: String! +} + +"Alert of a current or upcoming disruption in public transportation" +type Alert implements Node { + """ + Agency affected by the disruption. Note that this value is present only if the + disruption has an effect on all operations of the agency (e.g. in case of a strike). + """ + agency: Agency @deprecated(reason : "Alert can have multiple affected entities now instead of there being duplicate alerts\nfor different entities. This will return only one of the affected agencies.\nUse entities instead.") + "Alert cause" + alertCause: AlertCauseType + "Long description of the alert" + alertDescriptionText: String! + "Long descriptions of the alert in all different available languages" + alertDescriptionTextTranslations: [TranslatedString!]! + "Alert effect" + alertEffect: AlertEffectType + "hashcode from the original GTFS-RT alert" + alertHash: Int + "Header of the alert, if available" + alertHeaderText: String + "Header of the alert in all different available languages" + alertHeaderTextTranslations: [TranslatedString!]! + "Alert severity level" + alertSeverityLevel: AlertSeverityLevelType + "Url with more information" + alertUrl: String + "Url with more information in all different available languages" + alertUrlTranslations: [TranslatedString!]! + "Time when this alert is not in effect anymore. Format: Unix timestamp in seconds" + effectiveEndDate: Long + "Time when this alert comes into effect. Format: Unix timestamp in seconds" + effectiveStartDate: Long + "Entities affected by the disruption." + entities: [AlertEntity] + "The feed in which this alert was published" + feed: String + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Patterns affected by the disruption" + patterns: [Pattern] @deprecated(reason : "This will always return an empty list. Use entities instead.") + "Route affected by the disruption" + route: Route @deprecated(reason : "Alert can have multiple affected entities now instead of there being duplicate alerts\nfor different entities. This will return only one of the affected routes.\nUse entities instead.") + "Stop affected by the disruption" + stop: Stop @deprecated(reason : "Alert can have multiple affected entities now instead of there being duplicate alerts\nfor different entities. This will return only one of the affected stops.\nUse entities instead.") + "Trip affected by the disruption" + trip: Trip @deprecated(reason : "Alert can have multiple affected entities now instead of there being duplicate alerts\nfor different entities. This will return only one of the affected trips.\nUse entities instead.") +} + +"Bike park represents a location where bicycles can be parked." +type BikePark implements Node & PlaceInterface { + "ID of the bike park" + bikeParkId: String + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the bike park (WGS 84)" + lat: Float + "Longitude of the bike park (WGS 84)" + lon: Float + "Name of the bike park" + name( + "Returns name with the specified language, if found, otherwise returns with some default language." + language: String + ): String! + "Opening hours of the parking facility" + openingHours: OpeningHours + "If true, value of `spacesAvailable` is updated from a real-time source." + realtime: Boolean + "Number of spaces available for bikes" + spacesAvailable: Int + "Source specific tags of the bike park, which describe the available features." + tags: [String] +} + +"Bike rental station represents a location where users can rent bicycles for a fee." +type BikeRentalStation implements Node & PlaceInterface { + """ + If true, bikes can be returned to this station if the station has spaces available + or allows overloading. + """ + allowDropoff: Boolean + "If true, bikes can be currently returned to this station." + allowDropoffNow: Boolean + "If true, bikes can be returned even if spacesAvailable is zero or bikes > capacity." + allowOverloading: Boolean + "If true, bikes can be picked up from this station if the station has bikes available." + allowPickup: Boolean + "If true, bikes can be currently picked up from this station." + allowPickupNow: Boolean + """ + Number of bikes currently available on the rental station. + See field `allowPickupNow` to know if is currently possible to pick up a bike. + """ + bikesAvailable: Int + "Nominal capacity (number of racks) of the rental station." + capacity: Int + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the bike rental station (WGS 84)" + lat: Float + "Longitude of the bike rental station (WGS 84)" + lon: Float + "Name of the bike rental station" + name: String! + networks: [String] + "If true, station is on and in service." + operative: Boolean + """ + If true, values of `bikesAvailable` and `spacesAvailable` are updated from a + real-time source. If false, values of `bikesAvailable` and `spacesAvailable` + are always the total capacity divided by two. + """ + realtime: Boolean + "Platform-specific URLs to begin renting a bike from this station." + rentalUris: BikeRentalStationUris + """ + Number of free spaces currently available on the rental station. + Note that this value being 0 does not necessarily indicate that bikes cannot be returned + to this station, as for example it might be possible to leave the bike in the vicinity of + the rental station, even if the bike racks don't have any spaces available. + See field `allowDropoffNow` to know if is currently possible to return a bike. + """ + spacesAvailable: Int + "A description of the current state of this bike rental station, e.g. \"Station on\"" + state: String @deprecated(reason : "Use operative instead") + "ID of the bike rental station" + stationId: String } -"""Entities, which are relevant for an agency and can contain alerts""" -enum AgencyAlertType { - """Alerts affecting the agency.""" - AGENCY - - """Alerts affecting agency's routes""" - ROUTES +type BikeRentalStationUris { + """ + A URI that can be passed to an Android app with an {@code android.intent.action.VIEW} Android + intent to support Android Deep Links. + May be null if a rental URI does not exist. + """ + android: String + """ + A URI that can be used on iOS to launch the rental app for this station. + May be {@code null} if a rental URI does not exist. + """ + ios: String + """ + A URL that can be used by a web browser to show more information about renting a vehicle at + this station. + May be {@code null} if a rental URL does not exist. + """ + web: String +} - """ - Alerts affecting the different route types of the agency. - Alerts that affect route types on all agencies can be fetched through Feed. - """ - ROUTE_TYPES +""" +Booking information for a stop time which has special requirements to use, like calling ahead or +using an app. +""" +type BookingInfo { + "Contact information for reaching the service provider" + contactInfo: ContactInfo + "A message specific to the drop off" + dropOffMessage: String + "When is the earliest time the service can be booked." + earliestBookingTime: BookingTime + "When is the latest time the service can be booked" + latestBookingTime: BookingTime + "Maximum number of seconds before travel to make the request" + maximumBookingNoticeSeconds: Long + "A general message for those booking the service" + message: String + "Minimum number of seconds before travel to make the request" + minimumBookingNoticeSeconds: Long + "A message specific to the pick up" + pickupMessage: String } -"""Alert of a current or upcoming disruption in public transportation""" -type Alert implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! +"Temporal restriction for a booking" +type BookingTime { + "How many days before the booking" + daysPrior: Int + "Time of the booking" + time: String +} - """hashcode from the original GTFS-RT alert""" - alertHash: Int +"Car park represents a location where cars can be parked." +type CarPark implements Node & PlaceInterface { + "ID of the car park" + carParkId: String + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the car park (WGS 84)" + lat: Float + "Longitude of the car park (WGS 84)" + lon: Float + "Number of parking spaces at the car park" + maxCapacity: Int + "Name of the car park" + name( + "Returns name with the specified language, if found, otherwise returns with some default language." + language: String + ): String! + """ + Opening hours for the selected dates using the local time of the park. + Each date can have multiple time spans. + """ + openingHours: OpeningHours + "If true, value of `spacesAvailable` is updated from a real-time source." + realtime: Boolean + "Number of currently available parking spaces at the car park" + spacesAvailable: Int + "Source specific tags of the car park, which describe the available features." + tags: [String] +} - """The feed in which this alert was published""" - feed: String +"Cluster is a list of stops grouped by name and proximity" +type Cluster implements Node { + "ID of the cluster" + gtfsId: String! + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the center of this cluster (i.e. average latitude of stops in this cluster)" + lat: Float! + "Longitude of the center of this cluster (i.e. average longitude of stops in this cluster)" + lon: Float! + "Name of the cluster" + name: String! + "List of stops in the cluster" + stops: [Stop!] +} - """ - Agency affected by the disruption. Note that this value is present only if the - disruption has an effect on all operations of the agency (e.g. in case of a strike). - """ - agency: Agency @deprecated(reason: - """ - Alert can have multiple affected entities now instead of there being duplicate alerts - for different entities. This will return only one of the affected agencies. - Use entities instead. - """ - ) +"Contact information for booking an on-demand or flexible service." +type ContactInfo { + "Additional notes about the contacting the service provider" + additionalDetails: String + "URL to the booking systems of the service" + bookingUrl: String + "Name of the person to contact" + contactPerson: String + "Email to contact" + eMail: String + "Fax number to contact" + faxNumber: String + "URL containing general information about the service" + infoUrl: String + "Phone number to contact" + phoneNumber: String +} - """Route affected by the disruption""" - route: Route @deprecated(reason: - """ - Alert can have multiple affected entities now instead of there being duplicate alerts - for different entities. This will return only one of the affected routes. - Use entities instead. - """ - ) +""" +Coordinate (often referred as coordinates), which is used to specify a location using in the +WGS84 coordinate system. +""" +type Coordinate { + "Latitude as a WGS84 format number." + latitude: CoordinateValue! + "Longitude as a WGS84 format number." + longitude: CoordinateValue! +} - """Trip affected by the disruption""" - trip: Trip @deprecated(reason: - """ - Alert can have multiple affected entities now instead of there being duplicate alerts - for different entities. This will return only one of the affected trips. - Use entities instead. - """ - ) +type Coordinates { + "Latitude (WGS 84)" + lat: Float + "Longitude (WGS 84)" + lon: Float +} - """Stop affected by the disruption""" - stop: Stop @deprecated(reason: - """ - Alert can have multiple affected entities now instead of there being duplicate alerts - for different entities. This will return only one of the affected stops. - Use entities instead. - """ - ) +"A currency" +type Currency { + "ISO-4217 currency code, for example `USD` or `EUR`." + code: String! + """ + Fractional digits of this currency. A value of 2 would express that in this currency + 100 minor units make up one major unit. + + Expressed more concretely: 100 Euro-cents make up one Euro. + + Note: Some currencies don't even have any fractional digits, for example the Japanese Yen. + + See also https://en.wikipedia.org/wiki/ISO_4217#Minor_unit_fractions + """ + digits: Int! +} - """Patterns affected by the disruption""" - patterns: [Pattern] @deprecated(reason: "This will always return an empty list. Use entities instead.") +""" +The standard case of a fare product: it only has a single price to be paid by the passenger +and no discounts are applied. +""" +type DefaultFareProduct implements FareProduct { + "Identifier for the fare product." + id: String! + """ + The 'medium' that this product applies to, for example "Oyster Card" or "Berlin Ticket App". + + This communicates to riders that a specific way of buying or keeping this product is required. + """ + medium: FareMedium + "Human readable name of the product, for example example \"Day pass\" or \"Single ticket\"." + name: String! + "The price of the product" + price: Money! + "The category of riders this product applies to, for example students or pensioners." + riderCategory: RiderCategory +} - """Header of the alert, if available""" - alertHeaderText: String +""" +Departure row is a combination of a pattern and a stop of that pattern. - """Header of the alert in all different available languages""" - alertHeaderTextTranslations: [TranslatedString!]! +They are de-duplicated so for each pattern there will only be a single departure row. - """Long description of the alert""" - alertDescriptionText: String! +This is useful if you want to show a list of stop/pattern combinations but want each pattern to be +listed only once. +""" +type DepartureRow implements Node & PlaceInterface { + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the stop (WGS 84)" + lat: Float + "Longitude of the stop (WGS 84)" + lon: Float + "Pattern of the departure row" + pattern: Pattern + "Stop from which the departures leave" + stop: Stop + "Departures of the pattern from the stop" + stoptimes( + "Maximum number of departures to return." + numberOfDepartures: Int = 1, + "If false, returns also canceled trips" + omitCanceled: Boolean = true, + "If true, only those departures which allow boarding are returned" + omitNonPickups: Boolean = false, + "Return rows departing after this time. Time format: Unix timestamp in seconds. Default: current time." + startTime: Long = 0, + "How many seconds ahead to search for departures. Default is one day." + timeRange: Int = 86400 + ): [Stoptime] +} - """Long descriptions of the alert in all different available languages""" - alertDescriptionTextTranslations: [TranslatedString!]! +type Emissions { + "CO₂ emissions in grams." + co2: Grams +} - """Url with more information""" - alertUrl: String +"A 'medium' that a fare product applies to, for example cash, 'Oyster Card' or 'DB Navigator App'." +type FareMedium { + "ID of the medium" + id: String! + "Human readable name of the medium." + name: String +} - """Url with more information in all different available languages""" - alertUrlTranslations: [TranslatedString!]! +"A container for both a fare product (a ticket) and its relationship to the itinerary." +type FareProductUse { + """ + Represents the use of a single instance of a fare product throughout the itinerary. It can + be used to cross-reference and de-duplicate fare products that are applicable for more than one + leg. + + If you want to uniquely identify the fare product itself (not its use) use the product's `id`. + + ### Example: Day pass + + The day pass is valid for both legs in the itinerary. It is listed as the applicable `product` for each leg, + and the same FareProductUse id is shown, indicating that only one pass was used/bought. + + **Illustration** + ```yaml + itinerary: + leg1: + fareProducts: + id: "AAA" // id of a FareProductUse instance + product: + id: "day-pass" // product id + name: "Day Pass" + leg2: + fareProducts: + id: "AAA" // identical to leg1. the passenger needs to buy ONE pass, not two. + product: + id: "day-pass" // product id + name: "Day Pass" + ``` + + **It is the responsibility of the API consumers to display the day pass as a product for the + entire itinerary rather than two day passes!** + + ### Example: Several single tickets + + If you have two legs and need to buy two single tickets they will appear in each leg with the + same `FareProduct.id` but different `FareProductUse.id`. + + **Illustration** + ```yaml + itinerary: + leg1: + fareProducts: + id: "AAA" // id of a FareProductUse instance, not product id + product: + id: "single-ticket" // product id + name: "Single Ticket" + leg2: + fareProducts: + id: "BBB" // different to leg1. the passenger needs to buy two single tickets. + product: + id: "single-ticket" // product id + name: "Single Ticket" + ``` + """ + id: String! + "The purchasable fare product" + product: FareProduct +} - """Alert effect""" - alertEffect: AlertEffectType +"A feed provides routing data (stops, routes, timetables, etc.) from one or more public transport agencies." +type Feed { + "List of agencies which provide data to this feed" + agencies: [Agency] + "Alerts relevant for the feed." + alerts( + "Returns alerts for these types that are relevant for the feed." + types: [FeedAlertType!] + ): [Alert] + "ID of the feed" + feedId: String! + "The publisher of the input transit data." + publisher: FeedPublisher +} + +"Feed publisher information" +type FeedPublisher { + "Name of feed publisher" + name: String! + "Web address of feed publisher" + url: String! +} - """Alert cause""" - alertCause: AlertCauseType +type Geometry { + "The number of points in the string" + length: Int + """ + List of coordinates of in a Google encoded polyline format (see + https://developers.google.com/maps/documentation/utilities/polylinealgorithm) + """ + points: Polyline +} - """Alert severity level""" - alertSeverityLevel: AlertSeverityLevelType +type Itinerary { + """ + Computes a numeric accessibility score between 0 and 1. + + The closer the value is to 1 the better the wheelchair-accessibility of this itinerary is. + A value of `null` means that no score has been computed, not that the leg is inaccessible. + + More information is available in the [feature documentation](https://docs.opentripplanner.org/en/dev-2.x/sandbox/IBIAccessibilityScore/). + """ + accessibilityScore: Float + "Does the itinerary end without dropping off the rented bicycle:" + arrivedAtDestinationWithRentedBicycle: Boolean + "Duration of the trip on this itinerary, in seconds." + duration: Long + "How much elevation is gained, in total, over the course of the itinerary, in meters." + elevationGained: Float + "How much elevation is lost, in total, over the course of the itinerary, in meters." + elevationLost: Float + "Emissions of this itinerary per traveler." + emissionsPerPerson: Emissions + "Time when the user leaves arrives at the destination." + end: OffsetDateTime + "Time when the user arrives to the destination. Format: Unix timestamp in milliseconds." + endTime: Long @deprecated(reason : "Use `end` instead which includes timezone information.") + """ + Information about the fares for this itinerary. This is primarily a GTFS Fares V1 interface + and always returns an empty list. Use the leg's `fareProducts` instead. + """ + fares: [fare] @deprecated(reason : "Use the leg's `fareProducts`.") + "Generalized cost of the itinerary. Used for debugging search results." + generalizedCost: Int + """ + A list of Legs. Each Leg is either a walking (cycling, car) portion of the + itinerary, or a transit leg on a particular vehicle. So a itinerary where the + user walks to the Q train, transfers to the 6, then walks to their + destination, has four legs. + """ + legs: [Leg]! + """ + How many transfers are part of this itinerary. + + Notes: + - Interlined/stay-seated transfers do not increase this count. + - Transferring from a flex to a fixed schedule trip and vice versa increases this count. + """ + numberOfTransfers: Int! + "Time when the user leaves from the origin." + start: OffsetDateTime + "Time when the user leaves from the origin. Format: Unix timestamp in milliseconds." + startTime: Long @deprecated(reason : "Use `start` instead which includes timezone information.") + """ + A list of system notices. Contains debug information for itineraries. + One use-case is to run a routing search with 'debugItineraryFilter: true'. + This will then tag itineraries instead of removing them from the result. + This make it possible to inspect the itinerary-filter-chain. + """ + systemNotices: [SystemNotice]! + "How much time is spent waiting for transit to arrive, in seconds." + waitingTime: Long + "How far the user has to walk, in meters." + walkDistance: Float + "How much time is spent walking, in seconds." + walkTime: Long +} +type Leg { + """ + Computes a numeric accessibility score between 0 and 1. + + The closer the value is to 1 the better the wheelchair-accessibility of this leg is. + A value of `null` means that no score has been computed, not that the itinerary is inaccessible. + + More information is available in the [feature documentation](https://docs.opentripplanner.org/en/dev-2.x/sandbox/IBIAccessibilityScore/). + """ + accessibilityScore: Float + "For transit legs, the transit agency that operates the service used for this leg. For non-transit legs, `null`." + agency: Agency + "Applicable alerts for this leg." + alerts: [Alert] + """ + For transit leg, the offset from the scheduled arrival time of the alighting + stop in this leg, i.e. scheduled time of arrival at alighting stop = `endTime + - arrivalDelay` + """ + arrivalDelay: Int @deprecated(reason : "Use `start.estimated.delay` instead.") + """ + For transit leg, the offset from the scheduled departure time of the boarding + stop in this leg, i.e. scheduled time of departure at boarding stop = + `startTime - departureDelay` + """ + departureDelay: Int @deprecated(reason : "Use `end.estimated.delay` instead.") + "The distance traveled while traversing the leg in meters." + distance: Float + """ + Special booking information for the drop off stop of this leg if, for example, it needs + to be booked in advance. This could be due to a flexible or on-demand service. + """ + dropOffBookingInfo: BookingInfo + "This is used to indicate if alighting from this leg is possible only with special arrangements." + dropoffType: PickupDropoffType + "The leg's duration in seconds" + duration: Float + "The time when the leg ends including real-time information, if available." + end: LegTime! + "The date and time when this leg ends. Format: Unix timestamp in milliseconds." + endTime: Long @deprecated(reason : "Use `end.estimated.time` instead which contains timezone information.") + """ + Fare products are purchasable tickets which may have an optional fare container or rider + category that limits who can buy them or how. + + Please read the documentation of `id` very carefully to learn how a single fare product + that applies to multiple legs can appear several times. + """ + fareProducts: [FareProductUse] + "The Place where the leg originates." + from: Place! + "Generalized cost of the leg. Used for debugging search results." + generalizedCost: Int + """ + For transit legs, the headsign that the vehicle shows at the stop where the passenger boards. + For non-transit legs, null. + """ + headsign: String + """ + Interlines with previous leg. + This is true when the same vehicle is used for the previous leg as for this leg + and passenger can stay inside the vehicle. + """ + interlineWithPreviousLeg: Boolean + "Whether the destination of this leg (field `to`) is one of the intermediate places specified in the query." + intermediatePlace: Boolean + """ + For transit legs, intermediate stops between the Place where the leg + originates and the Place where the leg ends. For non-transit legs, null. + Returns Place type, which has fields for e.g. departure and arrival times + """ + intermediatePlaces: [Place] + """ + For transit legs, intermediate stops between the Place where the leg + originates and the Place where the leg ends. For non-transit legs, null. + """ + intermediateStops: [Stop] + "The leg's geometry." + legGeometry: Geometry + "The mode (e.g. `WALK`) used when traversing this leg." + mode: Mode + "Future legs with same origin and destination stops or stations" + nextLegs( """ - Time when this alert comes into effect. Format: Unix timestamp in seconds + Transportation modes for which all stops in the parent station are used as possible destination stops + for the next legs. For modes not listed, only the exact destination stop of the leg is considered. """ - effectiveStartDate: Long - + destinationModesWithParentStation: [TransitMode!], """ - Time when this alert is not in effect anymore. Format: Unix timestamp in seconds + The number of alternative legs searched. If fewer than the requested number are found, + then only the found legs are returned. """ - effectiveEndDate: Long - + numberOfLegs: Int!, """ - Entities affected by the disruption. + Transportation modes for which all stops in the parent station are used as possible origin stops + for the next legs. For modes not listed, only the exact origin stop of the leg is considered. """ - entities: [AlertEntity] + originModesWithParentStation: [TransitMode!] + ): [Leg!] + """ + Special booking information for the pick up stop of this leg if, for example, it needs + to be booked in advance. This could be due to a flexible or on-demand service. + """ + pickupBookingInfo: BookingInfo + "This is used to indicate if boarding this leg is possible only with special arrangements." + pickupType: PickupDropoffType + "Whether there is real-time data about this Leg" + realTime: Boolean + "State of real-time data" + realtimeState: RealtimeState + "Whether this leg is traversed with a rented bike." + rentedBike: Boolean + "Estimate of a hailed ride like Uber." + rideHailingEstimate: RideHailingEstimate + "For transit legs, the route that is used for traversing the leg. For non-transit legs, `null`." + route: Route + "For transit legs, the service date of the trip. Format: YYYYMMDD. For non-transit legs, null." + serviceDate: String + "The time when the leg starts including real-time information, if available." + start: LegTime! + "The date and time when this leg begins. Format: Unix timestamp in milliseconds." + startTime: Long @deprecated(reason : "Use `start.estimated.time` instead which contains timezone information.") + "The turn-by-turn navigation instructions." + steps: [step] + "The Place where the leg ends." + to: Place! + "Whether this leg is a transit leg or not." + transitLeg: Boolean + "For transit legs, the trip that is used for traversing the leg. For non-transit legs, `null`." + trip: Trip + "Whether this leg is walking with a bike." + walkingBike: Boolean } -"""Cause of a alert""" -enum AlertCauseType { - """UNKNOWN_CAUSE""" - UNKNOWN_CAUSE - - """OTHER_CAUSE""" - OTHER_CAUSE - - """TECHNICAL_PROBLEM""" - TECHNICAL_PROBLEM - - """STRIKE""" - STRIKE - - """DEMONSTRATION""" - DEMONSTRATION - - """ACCIDENT""" - ACCIDENT - - """HOLIDAY""" - HOLIDAY - - """WEATHER""" - WEATHER - - """MAINTENANCE""" - MAINTENANCE - - """CONSTRUCTION""" - CONSTRUCTION - - """POLICE_ACTIVITY""" - POLICE_ACTIVITY - - """MEDICAL_EMERGENCY""" - MEDICAL_EMERGENCY +""" +Time information about a passenger at a certain place. May contain real-time information if +available. +""" +type LegTime { + "The estimated time of the event. If no real-time information is available, this is null." + estimated: RealTimeEstimate + "The scheduled time of the event." + scheduledTime: OffsetDateTime! } -"""Effect of a alert""" -enum AlertEffectType { - """NO_SERVICE""" - NO_SERVICE - - """REDUCED_SERVICE""" - REDUCED_SERVICE - - """SIGNIFICANT_DELAYS""" - SIGNIFICANT_DELAYS - - """DETOUR""" - DETOUR - - """ADDITIONAL_SERVICE""" - ADDITIONAL_SERVICE - - """MODIFIED_SERVICE""" - MODIFIED_SERVICE - - """OTHER_EFFECT""" - OTHER_EFFECT - - """UNKNOWN_EFFECT""" - UNKNOWN_EFFECT - - """STOP_MOVED""" - STOP_MOVED - - """NO_EFFECT""" - NO_EFFECT - - """ACCESSIBILITY_ISSUE""" - ACCESSIBILITY_ISSUE +"A span of time." +type LocalTimeSpan { + "The start of the time timespan as seconds from midnight." + from: Int! + "The end of the timespan as seconds from midnight." + to: Int! } +"A date using the local timezone of the object that can contain timespans." +type LocalTimeSpanDate { + "The date of this time span. Format: YYYYMMDD." + date: String! + "The time spans for this date." + timeSpans: [LocalTimeSpan] +} -"""Entity related to an alert""" -union AlertEntity = Agency | Route | Pattern | Stop | Trip | StopOnRoute | StopOnTrip | RouteType | Unknown - -"""Severity level of a alert""" -enum AlertSeverityLevelType { - """Severity of alert is unknown""" - UNKNOWN_SEVERITY - - """ - Info alerts are used for informational messages that should not have a - significant effect on user's journey, for example: A single entrance to a - metro station is temporarily closed. - """ - INFO +"An amount of money." +type Money { + """ + Money in the major currency unit, so 3.10 USD is represented as `3.1`. + + If you want to get the minor currency unit (310 cents), multiply with + (10 to the power of `currency.digits`). + """ + amount: Float! + "The currency of this money amount." + currency: Currency! +} - """ - Warning alerts are used when a single stop or route has a disruption that can - affect user's journey, for example: All trams on a specific route are running - with irregular schedules. - """ - WARNING +type OpeningHours { + """ + Opening hours for the selected dates using the local time of the parking lot. + Each date can have multiple time spans. + + Note: This is not implemented yet and always returns null. + """ + dates( + "Opening hours will be returned for these dates. Dates should use YYYYMMDD format." + dates: [String!]! + ): [LocalTimeSpanDate] + """ + OSM-formatted string of the opening hours. + + The spec is available at: https://wiki.openstreetmap.org/wiki/Key:opening_hours + """ + osm: String +} - """ - Severe alerts are used when a significant part of public transport services is - affected, for example: All train services are cancelled due to technical problems. - """ - SEVERE +"Information about pagination in a connection." +type PageInfo { + "When paginating forwards, the cursor to continue." + endCursor: String + "When paginating forwards, are there more items?" + hasNextPage: Boolean! + "When paginating backwards, are there more items?" + hasPreviousPage: Boolean! + "When paginating backwards, the cursor to continue." + startCursor: String } """ -Preferences related to alighting from a transit vehicle. +Pattern is sequence of stops used by trips on a specific direction and variant +of a route. Most routes have only two patterns: one for outbound trips and one +for inbound trips """ -input AlightPreferencesInput { +type Pattern implements Node { + """ + By default, list of alerts which have directly an effect on just the pattern. + It's also possible to return other relevant alerts through defining types. + """ + alerts( """ - What is the required minimum time alighting from a vehicle. + Returns alerts for these types that are relevant for the pattern. + By default, list of alerts which have directly an effect on just the pattern. """ - slack: Duration + types: [PatternAlertType] + ): [Alert] + "ID of the pattern" + code: String! + """ + Direction of the pattern. Possible values: 0, 1 or -1. + -1 indicates that the direction is irrelevant, i.e. the route has patterns only in one direction. + """ + directionId: Int + geometry: [Coordinates] + "Vehicle headsign used by trips of this pattern" + headsign: String + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + """ + Name of the pattern. Pattern name can be just the name of the route or it can + include details of destination and origin stops. + """ + name: String + "Original Trip pattern for changed patterns" + originalTripPattern: Pattern + "Coordinates of the route of this pattern in Google polyline encoded format" + patternGeometry: Geometry + "The route this pattern runs on" + route: Route! + """ + Hash code of the pattern. This value is stable and not dependent on the + pattern id, i.e. this value can be used to check whether two patterns are the + same, even if their ids have changed. + """ + semanticHash: String + "List of stops served by this pattern" + stops: [Stop!] + "Trips which run on this pattern" + trips: [Trip!] + "Trips which run on this pattern on the specified date" + tripsForDate( + "Return trips of the pattern active on this date. Format: YYYYMMDD" + serviceDate: String + ): [Trip!] + "Real-time updated position of vehicles that are serving this pattern." + vehiclePositions: [VehiclePosition!] } -type OpeningHours { - """ - OSM-formatted string of the opening hours. - - The spec is available at: https://wiki.openstreetmap.org/wiki/Key:opening_hours - """ - osm: String - - """ - Opening hours for the selected dates using the local time of the parking lot. - Each date can have multiple time spans. - - Note: This is not implemented yet and always returns null. - """ - dates( - """ - Opening hours will be returned for these dates. Dates should use YYYYMMDD format. - """ - dates: [String!]! - ): [LocalTimeSpanDate] +type Place { + """ + The time the rider will arrive at the place. This also includes real-time information + if available. + """ + arrival: LegTime + "The time the rider will arrive at the place. Format: Unix timestamp in milliseconds." + arrivalTime: Long! @deprecated(reason : "Use `arrival` which includes timezone information.") + "The bike parking related to the place" + bikePark: BikePark @deprecated(reason : "bikePark is deprecated. Use vehicleParking instead.") + "The bike rental station related to the place" + bikeRentalStation: BikeRentalStation @deprecated(reason : "Use vehicleRentalStation and rentalVehicle instead") + "The car parking related to the place" + carPark: CarPark @deprecated(reason : "carPark is deprecated. Use vehicleParking instead.") + """ + The time the rider will depart the place. This also includes real-time information + if available. + """ + departure: LegTime + "The time the rider will depart the place. Format: Unix timestamp in milliseconds." + departureTime: Long! @deprecated(reason : "Use `departure` which includes timezone information.") + "Latitude of the place (WGS 84)" + lat: Float! + "Longitude of the place (WGS 84)" + lon: Float! + "For transit stops, the name of the stop. For points of interest, the name of the POI." + name: String + "The rental vehicle related to the place" + rentalVehicle: RentalVehicle + "The stop related to the place." + stop: Stop + """ + The position of the stop in the pattern. This is not required to start from 0 or be consecutive - any + increasing integer sequence along the stops is valid. + + The purpose of this field is to identify the stop within the pattern so it can be cross-referenced + between it and the itinerary. It is safe to cross-reference when done quickly, i.e. within seconds. + However, it should be noted that real-time updates can change the values, so don't store it for + longer amounts of time. + + Depending on the source data, this might not be the GTFS `stop_sequence` but another value, perhaps + even generated. + + The position can be either at a certain stop or in between two for trips where this is possible. + """ + stopPosition: StopPosition + "The vehicle parking related to the place" + vehicleParking: VehicleParking + "The vehicle rental station related to the place" + vehicleRentalStation: VehicleRentalStation + """ + Type of vertex. (Normal, Bike sharing station, Bike P+R, Transit stop) Mostly + used for better localization of bike sharing and P+R station names + """ + vertexType: VertexType } -"""Bike park represents a location where bicycles can be parked.""" -type BikePark implements Node & PlaceInterface { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ID of the bike park""" - bikeParkId: String - - """Name of the bike park""" - name( - """Returns name with the specified language, if found, otherwise returns with some default language.""" - language: String): String! - - """Number of spaces available for bikes""" - spacesAvailable: Int - - """ - If true, value of `spacesAvailable` is updated from a real-time source. - """ - realtime: Boolean - - """Longitude of the bike park (WGS 84)""" - lon: Float - - """Latitude of the bike park (WGS 84)""" - lat: Float - - """ - Source specific tags of the bike park, which describe the available features. - """ - tags: [String] - - """Opening hours of the parking facility""" - openingHours: OpeningHours +type Plan { + "The time and date of travel. Format: Unix timestamp in milliseconds." + date: Long + "Information about the timings for the plan generation" + debugOutput: debugOutput! + "The origin" + from: Place! + "A list of possible itineraries" + itineraries: [Itinerary]! + "A list of possible error messages as enum" + messageEnums: [String]! + "A list of possible error messages in cleartext" + messageStrings: [String]! + """ + This is the suggested search time for the "next page" or time window. Insert it together + with the searchWindowUsed in the request to get a new set of trips following in the + search-window AFTER the current search. No duplicate trips should be returned, unless a trip + is delayed and new real-time data is available. + """ + nextDateTime: Long @deprecated(reason : "Use nextPageCursor instead") + """ + Use the cursor to go to the next "page" of itineraries. Copy the cursor from the last response + to the pageCursor query parameter and keep the original request as is. This will enable you to + search for itineraries in the next search-window. + The cursor based paging only support stepping to the next page, as it does not support jumping. + This is only usable when public transportation mode(s) are included in the query. + """ + nextPageCursor: String + """ + This is the suggested search time for the "previous page" or time window. Insert it together + with the searchWindowUsed in the request to get a new set of trips preceding in the + search-window BEFORE the current search. No duplicate trips should be returned, unless a trip + is delayed and new real-time data is available. + """ + prevDateTime: Long @deprecated(reason : "Use previousPageCursor instead") + """ + Use the cursor to go to the previous "page" of itineraries. Copy the cursor from the last + response to the pageCursor query parameter and keep the original request otherwise as is. + This will enable you to search for itineraries in the previous search-window. + The cursor based paging only support stepping to the previous page, as it does not support + jumping. + This is only usable when public transportation mode(s) are included in the query. + """ + previousPageCursor: String + "A list of routing errors, and fields which caused them" + routingErrors: [RoutingError!]! + """ + This is the `searchWindow` used by the raptor search. It is provided here for debugging + purpousess. + + The unit is seconds. + """ + searchWindowUsed: Long + "The destination" + to: Place! } """ -Is it possible to arrive to the destination with a rented bicycle and does it -come with an extra cost. +Plan (result of an itinerary search) that follows +[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). """ -input DestinationBicyclePolicyInput { - """ - For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental bicycle first. - """ - allowKeeping: Boolean - - """ - Cost associated with arriving to the destination with a rented bicycle. - No cost is applied if arriving to the destination after dropping off the rented - bicycle. - """ - keepingCost: Cost +type PlanConnection { + """ + Edges which contain the itineraries. Part of the + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + """ + edges: [PlanEdge] + """ + Contains cursors to continue the search and the information if there are more itineraries available. + Part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + """ + pageInfo: PlanPageInfo! + "Errors faced during the routing search." + routingErrors: [RoutingError!]! + "What was the starting point for the itinerary search." + searchDateTime: OffsetDateTime } """ -Is it possible to arrive to the destination with a rented scooter and does it -come with an extra cost. +Edge outputted by a plan search. Part of the +[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). """ -input DestinationScooterPolicyInput { - """ - For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental scooter first. - """ - allowKeeping: Boolean - - """ - Cost associated with arriving to the destination with a rented scooter. - No cost is applied if arriving to the destination after dropping off the rented - scooter. - """ - keepingCost: Cost +type PlanEdge { + """ + The cursor of the edge. Part of the + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + """ + cursor: String! + """ + An itinerary suggestion. Part of the + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + """ + node: Itinerary! } -"""Vehicle parking represents a location where bicycles or cars can be parked.""" -type VehicleParking implements Node & PlaceInterface { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ID of the park""" - vehicleParkingId: String - - """Name of the park""" - name( - """Returns name with the specified language, if found, otherwise returns with some default language.""" - language: String): String! - - """ - If true, value of `spacesAvailable` is updated from a real-time source. - """ - realtime: Boolean - - """Longitude of the bike park (WGS 84)""" - lon: Float - - """Latitude of the bike park (WGS 84)""" - lat: Float +""" +Information about pagination in a connection. Part of the +[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). +""" +type PlanPageInfo { + "When paginating forwards, the cursor to continue." + endCursor: String + "When paginating forwards, are there more items?" + hasNextPage: Boolean! + "When paginating backwards, are there more items?" + hasPreviousPage: Boolean! + "The search window that was used for the search in the current page." + searchWindowUsed: Duration + "When paginating backwards, the cursor to continue." + startCursor: String +} - """ - URL which contains details of this vehicle parking. - """ - detailsUrl: String +"Stop position at a specific stop." +type PositionAtStop { + "Position of the stop in the pattern. Positions are not required to start from 0 or be consecutive." + position: Int +} - """ - URL of an image which may be displayed to the user showing the vehicle parking. - """ - imageUrl: String +"The board/alight position in between two stops of the pattern of a trip with continuous pickup/drop off." +type PositionBetweenStops { + "Position of the next stop in the pattern. Positions are not required to start from 0 or be consecutive." + nextPosition: Int + "Position of the previous stop in the pattern. Positions are not required to start from 0 or be consecutive." + previousPosition: Int +} +type QueryType { + "Get all agencies" + agencies: [Agency] + "Get a single agency based on agency ID, i.e. value of field `gtfsId` (ID format is `FeedId:StopId`)" + agency(id: String!): Agency + "Get all active alerts" + alerts( + "Only return alerts with these causes" + cause: [AlertCauseType!], + "Only return alerts with these effects" + effect: [AlertEffectType!], + "Only return alerts in these feeds" + feeds: [String!], + "Only return alerts affecting these routes" + route: [String!], + "Only return alerts with these severity levels" + severityLevel: [AlertSeverityLevelType!], + "Only return alerts affecting these stops" + stop: [String!] + ): [Alert] + "Get a single bike park based on its ID, i.e. value of field `bikeParkId`" + bikePark(id: String!): BikePark @deprecated(reason : "bikePark is deprecated. Use vehicleParking instead.") + "Get all bike parks" + bikeParks: [BikePark] @deprecated(reason : "bikeParks is deprecated. Use vehicleParkings instead.") + "Get a single bike rental station based on its ID, i.e. value of field `stationId`" + bikeRentalStation(id: String!): BikeRentalStation @deprecated(reason : "Use rentalVehicle or vehicleRentalStation instead") + "Get all bike rental stations" + bikeRentalStations( + """ + Return bike rental stations with these ids. + **Note:** if an id is invalid (or the bike rental station service is unavailable) + the returned list will contain `null` values. + """ + ids: [String] + ): [BikeRentalStation] @deprecated(reason : "Use rentalVehicles or vehicleRentalStations instead") + "Get cancelled TripTimes." + cancelledTripTimes( + "Feed feedIds (e.g. [\"HSL\"])." + feeds: [String], + """ + Only cancelled trip times that have last stop arrival time at maxArrivalTime + or before are returned. Format: seconds since midnight of maxDate. + """ + maxArrivalTime: Int, + "Only cancelled trip times scheduled to run on maxDate or before are returned. Format: \"2019-12-23\" or \"20191223\"." + maxDate: String, + """ + Only cancelled trip times that have first stop departure time at + maxDepartureTime or before are returned. Format: seconds since midnight of maxDate. + """ + maxDepartureTime: Int, + """ + Only cancelled trip times that have last stop arrival time at minArrivalTime + or after are returned. Format: seconds since midnight of minDate. + """ + minArrivalTime: Int, + "Only cancelled trip times scheduled to run on minDate or after are returned. Format: \"2019-12-23\" or \"20191223\"." + minDate: String, + """ + Only cancelled trip times that have first stop departure time at + minDepartureTime or after are returned. Format: seconds since midnight of minDate. + """ + minDepartureTime: Int, + "TripPattern codes (e.g. [\"HSL:1098:1:01\"])." + patterns: [String], + "Route gtfsIds (e.g. [\"HSL:1098\"])." + routes: [String], + "Trip gtfsIds (e.g. [\"HSL:1098_20190405_Ma_2_1455\"])." + trips: [String] + ): [Stoptime] + "Get a single car park based on its ID, i.e. value of field `carParkId`" + carPark(id: String!): CarPark @deprecated(reason : "carPark is deprecated. Use vehicleParking instead.") + "Get all car parks" + carParks( + """ + Return car parks with these ids. + **Note:** if an id is invalid (or the car park service is unavailable) the returned list will contain `null` values. + """ + ids: [String] + ): [CarPark] @deprecated(reason : "carParks is deprecated. Use vehicleParkings instead.") + "Get a single cluster based on its ID, i.e. value of field `gtfsId`" + cluster(id: String!): Cluster + "Get all clusters" + clusters: [Cluster] + "Get a single departure row based on its ID (ID format is `FeedId:StopId:PatternId`)" + departureRow(id: String!): DepartureRow + "Get all available feeds" + feeds: [Feed] + """ + Finds a trip matching the given parameters. This query type is useful if the + id of a trip is not known, but other details uniquely identifying the trip are + available from some source (e.g. MQTT vehicle positions). + """ + fuzzyTrip( + "Departure date of the trip, format: YYYY-MM-DD" + date: String!, + """ + Direction of the trip, possible values: 0, 1 or -1. + -1 indicates that the direction is irrelevant, i.e. in case the route has + trips only in one direction. See field `directionId` of Pattern. + """ + direction: Int = -1, + "id of the route" + route: String!, + "Departure time of the trip, format: seconds since midnight of the departure date" + time: Int! + ): Trip + """ + Get all places (stops, stations, etc. with coordinates) within the specified + radius from a location. The returned type is a Relay connection (see + https://facebook.github.io/relay/graphql/connections.htm). The placeAtDistance + type has two fields: place and distance. The search is done by walking so the + distance is according to the network of walkable streets and paths. + """ + nearest( + after: String, + before: String, + "Only include places that match one of the given GTFS ids." + filterByIds: InputFilters @deprecated(reason : "Not actively maintained"), + """ + Only return places that are related to one of these transport modes. This + argument can be used to return e.g. only nearest railway stations or only + nearest places related to bicycling. + """ + filterByModes: [Mode], + "Only return places that are one of these types, e.g. `STOP` or `VEHICLE_RENT`" + filterByPlaceTypes: [FilterPlaceType], + first: Int, + last: Int, + "Latitude of the location (WGS 84)" + lat: Float!, + "Longitude of the location (WGS 84)" + lon: Float!, + """ + Maximum distance (in meters) to search for from the specified location. Note + that this is walking distance along streets and paths rather than a + geographic distance. Default is 2000m + """ + maxDistance: Int = 2000, + "Maximum number of results. Search is stopped when this limit is reached. Default is 20." + maxResults: Int = 20 + ): placeAtDistanceConnection @async + "Fetches an object given its ID" + node( + "The ID of an object" + id: ID! + ): Node + """ + Get a single pattern based on its ID, i.e. value of field `code` (format is + `FeedId:RouteId:DirectionId:PatternVariantNumber`) + """ + pattern(id: String!): Pattern + "Get all patterns" + patterns: [Pattern] + "Plans an itinerary from point A to point B based on the given arguments" + plan( + "Invariant: `boardSlack + alightSlack <= transferSlack`. Default value: 0" + alightSlack: Int, + "Is bike rental allowed? Default value: false" + allowBikeRental: Boolean @deprecated(reason : "Rental is specified by modes"), """ - Source specific tags of the vehicle parking, which describe the available features. For example - park_and_ride, bike_lockers, or static_osm_data. - """ - tags: [String] - + Whether arriving at the destination with a rented (station) bicycle is allowed without + dropping it off. Default: false. """ - A short translatable note containing details of this vehicle parking. + allowKeepingRentedBicycleAtDestination: Boolean, + "Which vehicle rental networks can be used. By default, all networks are allowed." + allowedBikeRentalNetworks: [String] @deprecated(reason : "Use allowedVehicleRentalNetworks instead"), """ - note( - """Returns note with the specified language, if found, otherwise returns with some default language.""" - language: String): String - + List of ticket types that are allowed to be used in itineraries. + See `ticketTypes` query for list of possible ticket types. """ - The state of this vehicle parking. - Only ones in an OPERATIONAL state may be used for Park and Ride. + allowedTicketTypes: [String], + "Which vehicle rental networks can be used. By default, all networks are allowed." + allowedVehicleRentalNetworks: [String], """ - state: VehicleParkingState - + Whether the itinerary should depart at the specified time (false), or arrive + to the destination at the specified time (true). Default value: false. """ - Does this vehicle parking have spaces (capacity) for bicycles. + arriveBy: Boolean, + "List of routes, trips, agencies and stops which are not used in the itinerary" + banned: InputBanned, + "Which vehicle rental networks cannot be used. By default, all networks are allowed." + bannedVehicleRentalNetworks: [String], """ - bicyclePlaces: Boolean - + This argument has no use for itinerary planning and will be removed later. + When true, do not use goal direction or stop at the target, build a full SPT. Default value: false. """ - Does this vehicle parking have spaces (capacity) for either wheelchair accessible (disabled) - or normal cars. + batch: Boolean @deprecated(reason : "Removed in OTP 2"), """ - anyCarPlaces: Boolean - + Separate cost for boarding a vehicle with a bicycle, which is more difficult + than on foot. Unit: seconds. Default value: 600 """ - Does this vehicle parking have spaces (capacity) for cars excluding wheelchair accessible spaces. - Use anyCarPlaces to check if any type of car may use this vehicle parking. + bikeBoardCost: Int, """ - carPlaces: Boolean - + A multiplier for how bad biking is, compared to being in transit for equal + lengths of time. Default value: 2.0 """ - Does this vehicle parking have wheelchair accessible (disabled) car spaces (capacity). + bikeReluctance: Float, + "Max bike speed along streets, in meters per second. Default value: 5.0" + bikeSpeed: Float, + "Cost of getting on and off your own bike. Unit: seconds. Default value: 0" + bikeSwitchCost: Int, + "Time to get on and off your own bike, in seconds. Default value: 0" + bikeSwitchTime: Int, """ - wheelchairAccessibleCarPlaces: Boolean - + A multiplier for how bad walking with a bike is, compared to being in transit for equal + lengths of time. Default value: 5.0 + """ + bikeWalkingReluctance: Float, + "Invariant: `boardSlack + alightSlack <= transferSlack`. Default value: 0" + boardSlack: Int, + """ + How expensive it is to drive a car when car&parking, increase this value to + make car driving legs shorter. Default value: 1. + """ + carParkCarLegWeight: Float @deprecated(reason : "Use `carReluctance` instead."), + """ + A multiplier for how bad driving is, compared to being in transit for equal + lengths of time. Default value: 3.0 + """ + carReluctance: Float, + """ + No effect on itinerary planning, adjust argument `time` instead to get later departures. + ~~The maximum wait time in seconds the user is willing to delay trip start. Only effective in Analyst.~~ + """ + claimInitialWait: Long @deprecated(reason : "Removed in OTP 2"), + "Whether legs should be compacted by performing a reversed search." + compactLegsByReversedSearch: Boolean @deprecated(reason : "Removed in OTP 2"), + "Date of departure or arrival in format YYYY-MM-DD. Default value: current date" + date: String, + "Debug the itinerary-filter-chain. The filters will mark itineraries as deleted, but does NOT delete them when this is enabled." + debugItineraryFilter: Boolean, + """ + If true, the remaining weight heuristic is disabled. Currently only + implemented for the long distance path service. + """ + disableRemainingWeightHeuristic: Boolean @deprecated(reason : "Removed in OTP 2.2"), + """ + The geographical location where the itinerary begins. + Use either this argument or `fromPlace`, but not both. + """ + from: InputCoordinates, + """ + The place where the itinerary begins in format `name::place`, where `place` + is either a lat,lng pair (e.g. `Pasila::60.199041,24.932928`) or a stop id + (e.g. `Pasila::HSL:1000202`). + Use either this argument or `from`, but not both. + """ + fromPlace: String, + "Tuning parameter for the search algorithm, mainly useful for testing." + heuristicStepsPerMainStep: Int @deprecated(reason : "Removed. Doesn't do anything."), + "When true, real-time updates are ignored during this search. Default value: false" + ignoreRealtimeUpdates: Boolean, + "An ordered list of intermediate locations to be visited." + intermediatePlaces: [InputCoordinates] @deprecated(reason : "Not implemented in OTP2."), + """ + How easily bad itineraries are filtered from results. Value 0 (default) + disables filtering. Itineraries are filtered if they are worse than another + one in some respect (e.g. more walking) by more than the percentage of + filtering level, which is calculated by dividing 100% by the value of this + argument (e.g. `itineraryFiltering = 0.5` → 200% worse itineraries are filtered). """ - The capacity (maximum available spaces) of this vehicle parking. + itineraryFiltering: Float @deprecated(reason : "Removed. Doesn't do anything."), """ - capacity: VehicleParkingSpaces - + The cost of arriving at the destination with the rented vehicle, to discourage doing so. + Default value: 0. """ - The currently available spaces at this vehicle parking. + keepingRentedBicycleAtDestinationCost: Int, """ - availability: VehicleParkingSpaces - - """Opening hours of the parking facility""" - openingHours: OpeningHours -} - -""" -The state of the vehicle parking. TEMPORARILY_CLOSED and CLOSED are distinct states so that they -may be represented differently to the user. -""" -enum VehicleParkingState { - """May be used for park and ride.""" - OPERATIONAL - """Can't be used for park and ride.""" - TEMPORARILY_CLOSED - """Can't be used for park and ride.""" - CLOSED -} - -""" -The number of spaces by type. null if unknown. -""" -type VehicleParkingSpaces { + Two-letter language code (ISO 639-1) used for returned text. + **Note:** only part of the data has translations available and names of + stops and POIs are returned in their default language. Due to missing + translations, it is sometimes possible that returned text uses a mixture of two languages. """ - The number of bicycle spaces. + locale: String, + """ + The maximum time (in seconds) of pre-transit travel when using + drive-to-transit (park and ride or kiss and ride). Default value: 1800. + """ + maxPreTransitTime: Int @deprecated(reason : "Use walkReluctance or future reluctance parameters for other modes"), + "Maximum number of transfers. Default value: 2" + maxTransfers: Int, """ - bicycleSpaces: Int - + The maximum distance (in meters) the user is willing to walk per walking + section. If the only transport mode allowed is `WALK`, then the value of + this argument is ignored. + Default: 2000m + Maximum value: 15000m + **Note:** If this argument has a relatively small value and only some + transport modes are allowed (e.g. `WALK` and `RAIL`), it is possible to get + an itinerary which has (useless) back and forth public transport legs to + avoid walking too long distances. + """ + maxWalkDistance: Float @deprecated(reason : "Does nothing. Use walkReluctance instead."), + """ + A global minimum transfer time (in seconds) that specifies the minimum + amount of time that must pass between exiting one transit vehicle and + boarding another. This time is in addition to time it might take to walk + between transit stops. Default value: 0 + """ + minTransferTime: Int, + "The weight multipliers for transit modes. WALK, BICYCLE, CAR, TRANSIT and LEG_SWITCH are not included." + modeWeight: InputModeWeight, + "Penalty (in seconds) for using a non-preferred transfer. Default value: 180" + nonpreferredTransferPenalty: Int, + "The maximum number of itineraries to return. Default value: 3." + numItineraries: Int = 3, + "When false, return itineraries using canceled trips. Default value: true." + omitCanceled: Boolean = true, + "Optimization type for bicycling legs, e.g. prefer flat terrain. Default value: `QUICK`" + optimize: OptimizeType, + """ + Use the cursor to get the next or previous page of results. + The next page is a set of itineraries departing after the last itinerary in this result and + the previous page is a set of itineraries departing before the first itinerary. + This is only usable when public transportation mode(s) are included in the query. """ - The number of car spaces. + pageCursor: String, + "Preferences for vehicle parking" + parking: VehicleParkingInput, + "List of routes and agencies which are given higher preference when planning the itinerary" + preferred: InputPreferred, + """ + **Consider this argument experimental** – setting this argument to true + causes timeouts and unoptimal routes in many cases. + When true, reverse optimize (find alternative transportation mode, which + still arrives to the destination in time) this search on the fly after + processing each transit leg, rather than reverse-optimizing the entire path + when it's done. Default value: false. + """ + reverseOptimizeOnTheFly: Boolean @deprecated(reason : "Removed in OTP 2"), + """ + The length of the search-window in seconds. This parameter is optional. + + The search-window is defined as the duration between the earliest-departure-time(EDT) and + the latest-departure-time(LDT). OTP will search for all itineraries in this departure + window. If `arriveBy=true` the `dateTime` parameter is the latest-arrival-time, so OTP + will dynamically calculate the EDT. Using a short search-window is faster than using a + longer one, but the search duration is not linear. Using a \"too\" short search-window will + waste resources server side, while using a search-window that is too long will be slow. + + OTP will dynamically calculate a reasonable value for the search-window, if not provided. + The calculation comes with a significant overhead (10-20% extra). Whether you should use the + dynamic calculated value or pass in a value depends on your use-case. For a travel planner + in a small geographical area, with a dense network of public transportation, a fixed value + between 40 minutes and 2 hours makes sense. To find the appropriate search-window, adjust + it so that the number of itineraries on average is around the wanted `numItineraries`. Make + sure you set the `numItineraries` to a high number while testing. For a country wide area + like Norway, using the dynamic search-window is the best. + + When paginating, the search-window is calculated using the `numItineraries` in the original + search together with statistics from the search for the last page. This behaviour is + configured server side, and can not be overridden from the client. + + The search-window used is returned to the response metadata as `searchWindowUsed` for + debugging purposes. + """ + searchWindow: Long, + """ + This argument has currently no effect on which itineraries are returned. Use + argument `fromPlace` to start the itinerary from a specific stop. + ~~A transit stop that this trip must start from~~ + """ + startTransitStopId: String, + """ + ID of the trip on which the itinerary starts. This argument can be used to + plan itineraries when the user is already onboard a vehicle. When using this + argument, arguments `time` and `from` should be set based on a vehicle + position message received from the vehicle running the specified trip. + **Note:** this argument only takes into account the route and estimated + travel time of the trip (and therefore arguments `time` and `from` must be + used correctly to get meaningful itineraries). + """ + startTransitTripId: String @deprecated(reason : "Not implemented in OTP2"), + "Time of departure or arrival in format hh:mm:ss. Default value: current time" + time: String, + """ + The geographical location where the itinerary ends. + Use either this argument or `toPlace`, but not both. + """ + to: InputCoordinates, + """ + The place where the itinerary ends in format `name::place`, where `place` is + either a lat,lng pair (e.g. `Pasila::60.199041,24.932928`) or a stop id + (e.g. `Pasila::HSL:1000202`). + Use either this argument or `to`, but not both. + """ + toPlace: String, + """ + An extra penalty added on transfers (i.e. all boardings except the first + one). Not to be confused with bikeBoardCost and walkBoardCost, which are the + cost of boarding a vehicle with and without a bicycle. The boardCosts are + used to model the 'usual' perceived cost of using a transit vehicle, and the + transferPenalty is used when a user requests even less transfers. In the + latter case, we don't actually optimize for fewest transfers, as this can + lead to absurd results. Consider a trip in New York from Grand Army Plaza + (the one in Brooklyn) to Kalustyan's at noon. The true lowest transfers + route is to wait until midnight, when the 4 train runs local the whole way. + The actual fastest route is the 2/3 to the 4/5 at Nevins to the 6 at Union + Square, which takes half an hour. Even someone optimizing for fewest + transfers doesn't want to wait until midnight. Maybe they would be willing + to walk to 7th Ave and take the Q to Union Square, then transfer to the 6. + If this takes less than optimize_transfer_penalty seconds, then that's what + we'll return. Default value: 0. + """ + transferPenalty: Int, + "List of transportation modes that the user is willing to use. Default: `[\"WALK\",\"TRANSIT\"]`" + transportModes: [TransportMode], + "Triangle optimization parameters for bicycling legs. Only effective when `optimize` is set to **TRIANGLE**." + triangle: InputTriangle, + "List of routes and agencies which are given lower preference when planning the itinerary" + unpreferred: InputUnpreferred, + """ + How much less bad is waiting at the beginning of the trip (replaces + `waitReluctance` on the first boarding). Default value: 0.4 + """ + waitAtBeginningFactor: Float @deprecated(reason : "Removed in OTP 2, the timetable-view replaces this functionality."), + """ + How much worse is waiting for a transit vehicle than being on a transit + vehicle, as a multiplier. The default value treats wait and on-vehicle time + as the same. It may be tempting to set this higher than walkReluctance (as + studies often find this kind of preferences among riders) but the planner + will take this literally and walk down a transit line to avoid waiting at a + stop. This used to be set less than 1 (0.95) which would make waiting + offboard preferable to waiting onboard in an interlined trip. That is also + undesirable. If we only tried the shortest possible transfer at each stop to + neighboring stop patterns, this problem could disappear. Default value: 1.0. + """ + waitReluctance: Float, + "This prevents unnecessary transfers by adding a cost for boarding a vehicle. Unit: seconds. Default value: 600" + walkBoardCost: Int, + "How much more reluctant is the user to walk on streets with car traffic allowed. Default value: 1.0" + walkOnStreetReluctance: Float @deprecated(reason : "Use `walkSafetyFactor` instead"), + """ + A multiplier for how bad walking is, compared to being in transit for equal + lengths of time. Empirically, values between 2 and 4 seem to correspond + well to the concept of not wanting to walk too much without asking for + totally ridiculous itineraries, but this observation should in no way be + taken as scientific or definitive. Your mileage may vary. See + https://github.com/opentripplanner/OpenTripPlanner/issues/4090 for impact on + performance with high values. Default value: 2.0 + """ + walkReluctance: Float, """ - carSpaces: Int - + Factor for how much the walk safety is considered in routing. Value should be between 0 and 1. + If the value is set to be 0, safety is ignored. Default is 1.0. + """ + walkSafetyFactor: Float, + "Max walk speed along streets, in meters per second. Default value: 1.33" + walkSpeed: Float, + "Whether the itinerary must be wheelchair accessible. Default value: false" + wheelchair: Boolean + ): Plan @async + """ + Plan (itinerary) search that follows + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). + """ + planConnection( """ - The number of wheelchair accessible (disabled) car spaces. + Takes in cursor from a previous search. Used for forward pagination. If earliest departure time + is used in the original query, the new search then returns itineraries that depart after + the start time of the last itinerary that was returned, or at the same time if there are multiple + itinerary options that can depart at that moment in time. + If latest arrival time is defined, the new search returns itineraries that arrive before the end + time of the last itinerary that was returned in the previous search, or at the same time if there + are multiple itinerary options that can arrive at that moment in time. This parameter is part of + the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) and + should be used together with the `first` parameter. """ - wheelchairAccessibleCarSpaces: Int -} - -""" -Bike rental station represents a location where users can rent bicycles for a fee. -""" -type BikeRentalStation implements Node & PlaceInterface { + after: String, """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. + Takes in cursor from a previous search. Used for backwards pagination. If earliest departure time + is used in the original query, the new search then returns itineraries that depart before that time. + If latest arrival time is defined, the new search returns itineraries that arrive after that time. + This parameter is part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) + and should be used together with the `last` parameter. """ - id: ID! - - """ID of the bike rental station""" - stationId: String - - """Name of the bike rental station""" - name: String! - + before: String, """ - Number of bikes currently available on the rental station. - See field `allowPickupNow` to know if is currently possible to pick up a bike. + Datetime of the search. It's possible to either define the earliest departure time + or the latest arrival time. By default, earliest departure time is set as now. """ - bikesAvailable: Int - + dateTime: PlanDateTimeInput, + "The destination where the search ends. Usually coordinates but can also be a stop location." + destination: PlanLabeledLocationInput!, """ - Number of free spaces currently available on the rental station. - Note that this value being 0 does not necessarily indicate that bikes cannot be returned - to this station, as for example it might be possible to leave the bike in the vicinity of - the rental station, even if the bike racks don't have any spaces available. - See field `allowDropoffNow` to know if is currently possible to return a bike. + How many new itineraries should at maximum be returned in either the first search or with + forward pagination. This parameter is part of the + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) + and should be used together with the `after` parameter (although `after` shouldn't be defined + in the first search). """ - spacesAvailable: Int - + first: Int, """ - A description of the current state of this bike rental station, e.g. "Station on" + Settings that control the behavior of itinerary filtering. These are advanced settings and + should not be set by a user through user preferences. """ - state: String @deprecated(reason: "Use operative instead") - + itineraryFilter: PlanItineraryFilterInput, """ - If true, values of `bikesAvailable` and `spacesAvailable` are updated from a - real-time source. If false, values of `bikesAvailable` and `spacesAvailable` - are always the total capacity divided by two. + How many new itineraries should at maximum be returned in backwards pagination. It's recommended to + use the same value as was used for the `first` parameter in the original search for optimal + performance. This parameter is part of the + [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) + and should be used together with the `before` parameter. """ - realtime: Boolean - + last: Int, """ - If true, bikes can be returned to this station if the station has spaces available - or allows overloading. + Locale used for translations. Note, there might not necessarily be translations available. + It's possible and recommended to use the ´accept-language´ header instead of this parameter. """ - allowDropoff: Boolean - + locale: Locale, """ - If true, bikes can be picked up from this station if the station has bikes available. + Street and transit modes used during the search. This also includes options to only return + an itinerary that contains no transit legs or force transit to be used in all itineraries. + By default, all transit modes are usable and `WALK` is used for direct street suggestions, + access, egress and transfers. """ - allowPickup: Boolean - - """If true, bikes can be currently returned to this station.""" - allowDropoffNow: Boolean + modes: PlanModesInput, + "The origin where the search starts. Usually coordinates but can also be a stop location." + origin: PlanLabeledLocationInput!, + "Preferences that affect what itineraries are returned. Preferences are split into categories." + preferences: PlanPreferencesInput, + """ + Duration of the search window. This either starts at the defined earliest departure + time or ends at the latest arrival time. If this is not provided, a reasonable + search window is automatically generated. When searching for earlier or later itineraries + with paging, this search window is no longer used and the new window will be based + on how many suggestions were returned in the previous search. The new search window can be + shorter or longer than the original search window. Note, itineraries are returned faster + with a smaller search window and search window limitation is done mainly for performance reasons. + + Setting this parameter makes especially sense if the transportation network is as sparse or dense + in the whole itinerary search area. Otherwise, letting the system decide what is the search window + is in combination of using paging can lead to better performance and to getting a more consistent + number of itineraries in each search. + """ + searchWindow: Duration + ): PlanConnection @async @deprecated(reason : "Experimental and can include breaking changes, use plan instead") + "Get a single rental vehicle based on its ID, i.e. value of field `vehicleId`" + rentalVehicle(id: String!): RentalVehicle + "Get all rental vehicles" + rentalVehicles( + "Return only rental vehicles that have this form factor." + formFactors: [FormFactor], + """ + Return rental vehicles with these ids, i.e. value of field `vehicleId`. + **Note:** if an id is invalid (or the rental service is unavailable) + the returned list will contain `null` values. + + If this is provided all other filters are ignored. + """ + ids: [String] + ): [RentalVehicle] + "Get a single route based on its ID, i.e. value of field `gtfsId` (format is `FeedId:RouteId`)" + route(id: String!): Route + "Get all routes" + routes( + "Only return routes with these feedIds" + feeds: [String], + "Only return routes with these ids" + ids: [String], + "Query routes by this name" + name: String, + "Only include routes, which use one of these modes" + transportModes: [Mode] + ): [Route] + "Get the time range for which the API has data available" + serviceTimeRange: serviceTimeRange + "Get a single station based on its ID, i.e. value of field `gtfsId` (format is `FeedId:StopId`)" + station(id: String!): Stop + "Get all stations" + stations( + "Only return stations that match one of the ids in this list" + ids: [String], + "Query stations by name" + name: String + ): [Stop] + "Get a single stop based on its ID, i.e. value of field `gtfsId` (ID format is `FeedId:StopId`)" + stop(id: String!): Stop + "Get all stops" + stops( + "Return stops with these ids" + ids: [String], + "Query stops by this name" + name: String + ): [Stop] + "Get all stops within the specified bounding box" + stopsByBbox( + "List of feed ids from which stops are returned" + feeds: [String!], + "Northern bound of the bounding box" + maxLat: Float!, + "Eastern bound of the bounding box" + maxLon: Float!, + "Southern bound of the bounding box" + minLat: Float!, + "Western bound of the bounding box" + minLon: Float! + ): [Stop] + """ + Get all stops within the specified radius from a location. The returned type + is a Relay connection (see + https://facebook.github.io/relay/graphql/connections.htm). The stopAtDistance + type has two values: stop and distance. + """ + stopsByRadius( + after: String, + before: String, + "List of feed ids from which stops are returned" + feeds: [String!], + first: Int, + last: Int, + "Latitude of the location (WGS 84)" + lat: Float!, + "Longitude of the location (WGS 84)" + lon: Float!, + """ + Radius (in meters) to search for from the specified location. Note that this + is walking distance along streets and paths rather than a geographic distance. + """ + radius: Int! + ): stopAtDistanceConnection + "Return list of available ticket types" + ticketTypes: [TicketType] + "Get a single trip based on its ID, i.e. value of field `gtfsId` (format is `FeedId:TripId`)" + trip(id: String!): Trip + "Get all trips" + trips( + "Only return trips with these feedIds" + feeds: [String] + ): [Trip] + "Get a single vehicle parking based on its ID" + vehicleParking(id: String!): VehicleParking + "Get all vehicle parkings" + vehicleParkings( + """ + Return vehicle parkings with these ids. + **Note:** if an id is invalid (or the vehicle parking service is unavailable) + the returned list will contain `null` values. + """ + ids: [String] + ): [VehicleParking] + "Get a single vehicle rental station based on its ID, i.e. value of field `stationId`" + vehicleRentalStation(id: String!): VehicleRentalStation + "Get all vehicle rental stations" + vehicleRentalStations( + """ + Return vehicle rental stations with these ids, i.e. value of field `stationId`. + **Note:** if an id is invalid (or the rental service is unavailable) + the returned list will contain `null` values. + """ + ids: [String] + ): [VehicleRentalStation] + "Needed until https://github.com/facebook/relay/issues/112 is resolved" + viewer: QueryType +} - """If true, bikes can be currently picked up from this station.""" - allowPickupNow: Boolean +"Real-time estimates for a vehicle at a certain place." +type RealTimeEstimate { + """ + The delay or "earliness" of the vehicle at a certain place. + + If the vehicle is early then this is a negative duration. + """ + delay: Duration! + time: OffsetDateTime! +} - networks: [String] +"Rental vehicle represents a vehicle that belongs to a rental network." +type RentalVehicle implements Node & PlaceInterface { + "If true, vehicle is currently available for renting." + allowPickupNow: Boolean + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the vehicle (WGS 84)" + lat: Float + "Longitude of the vehicle (WGS 84)" + lon: Float + "Name of the vehicle" + name: String! + "ID of the rental network." + network: String + "If true, vehicle is not disabled." + operative: Boolean + "Platform-specific URLs to begin the vehicle." + rentalUris: VehicleRentalUris + "ID of the vehicle in the format of network:id" + vehicleId: String + "The type of the rental vehicle (scooter, bicycle, car...)" + vehicleType: RentalVehicleType +} - """Longitude of the bike rental station (WGS 84)""" - lon: Float +type RentalVehicleEntityCounts { + "The number of entities by type" + byType: [RentalVehicleTypeCount!]! + "The total number of entities (e.g. vehicles, spaces)." + total: Int! +} - """Latitude of the bike rental station (WGS 84)""" - lat: Float +type RentalVehicleType { + "The vehicle's general form factor" + formFactor: FormFactor + "The primary propulsion type of the vehicle" + propulsionType: PropulsionType +} - """Nominal capacity (number of racks) of the rental station.""" - capacity: Int +type RentalVehicleTypeCount { + "The number of vehicles of this type" + count: Int! + "The type of the rental vehicle (scooter, bicycle, car...)" + vehicleType: RentalVehicleType! +} - """If true, bikes can be returned even if spacesAvailable is zero or bikes > capacity.""" - allowOverloading: Boolean +"An estimate for a ride on a hailed vehicle, like an Uber car." +type RideHailingEstimate { + "The estimated time it takes for the vehicle to arrive." + arrival: Duration! + "The upper bound of the price estimate of this ride." + maxPrice: Money! + "The lower bound of the price estimate of this ride." + minPrice: Money! + "The name of the ride, ie. UberX" + productName: String + "The provider of the ride hailing service." + provider: RideHailingProvider! +} - """Platform-specific URLs to begin renting a bike from this station.""" - rentalUris: BikeRentalStationUris +type RideHailingProvider { + "The ID of the ride hailing provider." + id: String! +} - """ - If true, station is on and in service. - """ - operative: Boolean +"Category of riders a fare product applies to, for example students or pensioners." +type RiderCategory { + "ID of the category" + id: String! + "Human readable name of the category." + name: String } """ -Vehicle rental station represents a location where users can rent bicycles etc. for a fee. +Route represents a public transportation service, usually from point A to point +B and *back*, shown to customers under a single name, e.g. bus 550. Routes +contain patterns (see field `patterns`), which describe different variants of +the route, e.g. outbound pattern from point A to point B and inbound pattern +from point B to point A. """ -type VehicleRentalStation implements Node & PlaceInterface { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ID of the vehicle in the format of network:id""" - stationId: String - - """Name of the vehicle rental station""" - name: String! - - """ - Number of vehicles currently available on the rental station. - See field `allowPickupNow` to know if is currently possible to pick up a vehicle. +type Route implements Node { + "Agency operating the route" + agency: Agency + """ + List of alerts which have an effect on the route directly or indirectly. + By default only alerts directly affecting this route are returned. It's also possible + to return other relevant alerts through defining types. + """ + alerts( """ - vehiclesAvailable: Int @deprecated(reason: "Use `availableVehicles` instead, which also contains vehicle types") - + Returns alerts for these types that are relevant for the route. + By default only returns alerts that directly affect this route. """ - Number of free spaces currently available on the rental station. - Note that this value being 0 does not necessarily indicate that vehicles cannot be returned - to this station, as for example it might be possible to leave the vehicle in the vicinity of - the rental station, even if the vehicle racks don't have any spaces available. - See field `allowDropoffNow` to know if is currently possible to return a vehicle. + types: [RouteAlertType] + ): [Alert] + bikesAllowed: BikesAllowed + """ + The color (in hexadecimal format) the agency operating this route would prefer + to use on UI elements (e.g. polylines on a map) related to this route. This + value is not available for most routes. + """ + color: String + desc: String + "ID of the route in format `FeedId:RouteId`" + gtfsId: String! + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Long name of the route, e.g. Helsinki-Leppävaara" + longName( + """ + If translated longName is found from gtfs translation.txt and wanted language is not same as + feed's language then returns wanted translation. Otherwise uses name from routes.txt. """ - spacesAvailable: Int @deprecated(reason: "Use `availableSpaces` instead, which also contains the space vehicle types") + language: String + ): String + "Transport mode of this route, e.g. `BUS`" + mode: TransitMode + "List of patterns which operate on this route" + patterns: [Pattern] + "Short name of the route, usually a line number, e.g. 550" + shortName: String + """ + Orders the routes in a way which is useful for presentation to passengers. + Routes with smaller values should be displayed first. + + The value can be any non-negative integer. A null value means that no information was supplied. + + This value is passed through from the source data without modification. If multiple feeds + define sort orders for their routes, they may not be comparable to each other as no agreed scale + exists. + + Two routes may also have the same sort order and clients must decide based on other criteria + what the actual order is. + """ + sortOrder: Int + "List of stops on this route" + stops: [Stop] + """ + The color (in hexadecimal format) the agency operating this route would prefer + to use when displaying text related to this route. This value is not available + for most routes. + """ + textColor: String + "List of trips which operate on this route" + trips: [Trip] + """ + The raw GTFS route type as a integer. For the list of possible values, see: + https://developers.google.com/transit/gtfs/reference/#routestxt and + https://developers.google.com/transit/gtfs/reference/extended-route-types + """ + type: Int + url: String +} - """ - Number of vehicles currently available on the rental station, grouped by vehicle type. - """ - availableVehicles: RentalVehicleEntityCounts +""" +Route type entity which covers all agencies if agency is null, +otherwise only relevant for one agency. +""" +type RouteType { + "A public transport agency" + agency: Agency + """ + GTFS Route type. + For the list of possible values, see: + https://developers.google.com/transit/gtfs/reference/#routestxt and + https://developers.google.com/transit/gtfs/reference/extended-route-types + """ + routeType: Int! + """ + The routes which have the defined routeType and belong to the agency, if defined. + Otherwise all routes of the feed that have the defined routeType. + """ + routes: [Route] +} - """ - Number of free spaces currently available on the rental station, grouped by vehicle type. - """ - availableSpaces: RentalVehicleEntityCounts +"Description of the reason, why the planner did not return any results" +type RoutingError { + "An enum describing the reason" + code: RoutingErrorCode! + "A textual description of why the search failed. The clients are expected to have their own translations based on the code, for user visible error messages." + description: String! + "An enum describing the field which should be changed, in order for the search to succeed" + inputField: InputField +} +""" +Stop can represent either a single public transport stop, where passengers can +board and/or disembark vehicles, or a station, which contains multiple stops. +See field `locationType`. +""" +type Stop implements Node & PlaceInterface { + """ + By default, list of alerts which have directly an effect on just the stop. + It's also possible to return other relevant alerts through defining types. + """ + alerts( """ - If true, values of `vehiclesAvailable` and `spacesAvailable` are updated from a - real-time source. If false, values of `vehiclesAvailable` and `spacesAvailable` - are always the total capacity divided by two. + Returns alerts for these types that are relevant for the stop. + By default, list of alerts which have directly an effect on just the stop. """ - realtime: Boolean - + types: [StopAlertType] + ): [Alert] + "The cluster which this stop is part of" + cluster: Cluster + "Stop code which is visible at the stop" + code: String + "Description of the stop, usually a street name" + desc( """ - If true, vehicles can be returned to this station if the station has spaces available - or allows overloading. + If translated description is found from gtfs translation.txt and wanted language is not same as + feed's language then returns wanted translation. Otherwise uses descriptions from stops.txt. """ - allowDropoff: Boolean - + language: String + ): String + direction: String + """ + Representations of this stop's geometry. This is mainly interesting for flex stops which can be + a polygon or a group of stops either consisting of either points or polygons. + + Regular fixed-schedule stops return a single point. + + Stations (parent stations with child stops) contain a geometry collection with a point for the + central coordinate plus a convex hull polygon (https://en.wikipedia.org/wiki/Convex_hull) of all + coordinates of the child stops. + + If there are only two child stops then the convex hull is a straight line between the them. If + there is a single child stop then it's a single point. + """ + geometries: StopGeometries + "ÌD of the stop in format `FeedId:StopId`" + gtfsId: String! + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the stop (WGS 84)" + lat: Float + "Identifies whether this stop represents a stop or station." + locationType: LocationType + "Longitude of the stop (WGS 84)" + lon: Float + "Name of the stop, e.g. Pasilan asema" + name( + """ + If translated name is found from gtfs translation.txt and wanted language is not same as + feed's language then returns wanted translation. Otherwise uses name from stops.txt. + E.g. Swedish name for Pasilan asema is Böle station. """ - If true, vehicles can be picked up from this station if the station has vehicles available. + language: String + ): String! + "The station which this stop is part of (or null if this stop is not part of a station)" + parentStation: Stop + "Patterns which pass through this stop" + patterns: [Pattern] + "Identifier of the platform, usually a number. This value is only present for stops that are part of a station" + platformCode: String + "Routes which pass through this stop" + routes: [Route!] + "Returns timetable of the specified pattern at this stop" + stopTimesForPattern( + "Id of the pattern" + id: String!, + numberOfDepartures: Int = 2, + "If false, returns also canceled trips" + omitCanceled: Boolean = true, + "If true, only those departures which allow boarding are returned" + omitNonPickups: Boolean = false, + "Return departures after this time. Format: Unix timestamp in seconds. Default value: current time" + startTime: Long = 0, + "Return stoptimes within this time range, starting from `startTime`. Unit: Seconds" + timeRange: Int = 86400 + ): [Stoptime] + "Returns all stops that are children of this station (Only applicable for stations)" + stops: [Stop] + "Returns list of stoptimes (arrivals and departures) at this stop, grouped by patterns" + stoptimesForPatterns( + numberOfDepartures: Int = 5, + "If false, returns also canceled trips" + omitCanceled: Boolean = true, + "If true, only those departures which allow boarding are returned" + omitNonPickups: Boolean = false, + "Return departures after this time. Format: Unix timestamp in seconds. Default value: current time" + startTime: Long = 0, + "Return stoptimes within this time range, starting from `startTime`. Unit: Seconds" + timeRange: Int = 86400 + ): [StoptimesInPattern] + "Returns list of stoptimes for the specified date" + stoptimesForServiceDate( + "Date in format YYYYMMDD" + date: String, + "If false, returns also canceled trips" + omitCanceled: Boolean = false, + "If true, only those departures which allow boarding are returned" + omitNonPickups: Boolean = false + ): [StoptimesInPattern] + "Returns list of stoptimes (arrivals and departures) at this stop" + stoptimesWithoutPatterns( + numberOfDepartures: Int = 5, + "If false, returns also canceled trips" + omitCanceled: Boolean = true, + "If true, only those departures which allow boarding are returned" + omitNonPickups: Boolean = false, + "Return departures after this time. Format: Unix timestamp in seconds. Default value: current time" + startTime: Long = 0, + "Return stoptimes within this time range, starting from `startTime`. Unit: Seconds" + timeRange: Int = 86400 + ): [Stoptime] + timezone: String + "List of nearby stops which can be used for transfers" + transfers( + """ + Maximum distance to the transfer stop. Defaults to unlimited. + **Note:** only stops that are linked as a transfer stops to this stop are + returned, i.e. this does not do a query to search for *all* stops within + radius of `maxDistance`. + """ + maxDistance: Int + ): [stopAtDistance] + url( + """ + If translated url is found from gtfs translation.txt and wanted language is not same as + feed's language then returns wanted translation. Otherwise uses url from stops.txt. """ - allowPickup: Boolean - - """If true, vehicles can be currently returned to this station.""" - allowDropoffNow: Boolean + language: String + ): String + """ + Transport mode (e.g. `BUS`) used by routes which pass through this stop or + `null` if mode cannot be determined, e.g. in case no routes pass through the stop. + Note that also other types of vehicles may use the stop, e.g. tram replacement + buses might use stops which have `TRAM` as their mode. + """ + vehicleMode: Mode + """ + The raw GTFS route type used by routes which pass through this stop. For the + list of possible values, see: + https://developers.google.com/transit/gtfs/reference/#routestxt and + https://developers.google.com/transit/gtfs/reference/extended-route-types + """ + vehicleType: Int + "Whether wheelchair boarding is possible for at least some of vehicles on this stop" + wheelchairBoarding: WheelchairBoarding + "ID of the zone where this stop is located" + zoneId: String +} - """If true, vehicles can be currently picked up from this station.""" - allowPickupNow: Boolean - - """ID of the rental network.""" - network: String - - """Longitude of the vehicle rental station (WGS 84)""" - lon: Float - - """Latitude of the vehicle rental station (WGS 84)""" - lat: Float +type StopGeometries { + "Representation of the stop geometries as GeoJSON (https://geojson.org/)" + geoJson: GeoJson + """ + Representation of a stop as a series of polylines. + + Polygons of flex stops are represented as linear rings (lines where the first and last point are the same). + + Proper stops are represented as single point "lines". + """ + googleEncoded: [Geometry] +} - """Nominal capacity (number of racks) of the rental station.""" - capacity: Int +"Stop that should (but not guaranteed) to exist on a route." +type StopOnRoute { + "Route which contains the stop." + route: Route! + "Stop at the route. It's also possible that the stop is no longer on the route." + stop: Stop! +} - """If true, vehicles can be returned even if spacesAvailable is zero or vehicles > capacity.""" - allowOverloading: Boolean +"Stop that should (but not guaranteed) to exist on a trip." +type StopOnTrip { + "Stop at the trip. It's also possible that the stop is no longer on the trip." + stop: Stop! + "Trip which contains the stop." + trip: Trip! +} - """Platform-specific URLs to begin renting a vehicle from this station.""" - rentalUris: VehicleRentalUris +"Upcoming or current stop and how close the vehicle is to it." +type StopRelationship { + "How close the vehicle is to `stop`" + status: VehicleStopStatus! + stop: Stop! +} +"Stoptime represents the time when a specific trip arrives to or departs from a specific stop." +type Stoptime { + """ + The offset from the scheduled arrival time in seconds. Negative values + indicate that the trip is running ahead of schedule. + """ + arrivalDelay: Int + """ + The offset from the scheduled departure time in seconds. Negative values + indicate that the trip is running ahead of schedule + """ + departureDelay: Int + """ + Whether the vehicle can be disembarked at this stop. This field can also be + used to indicate if disembarkation is possible only with special arrangements. + """ + dropoffType: PickupDropoffType + """ + Vehicle headsign of the trip on this stop. Trip headsigns can change during + the trip (e.g. on routes which run on loops), so this value should be used + instead of `tripHeadsign` to display the headsign relevant to the user. + """ + headsign( """ - If true, station is on and in service. + If translated headsign is found from gtfs translation.txt and wanted language is not same as + feed's language then returns wanted translation. Otherwise uses name from trip_headsign.txt. """ - operative: Boolean -} - -type RentalVehicleEntityCounts { - """The total number of entities (e.g. vehicles, spaces).""" - total: Int! - - """The number of entities by type""" - byType: [RentalVehicleTypeCount!]! + language: String + ): String + """ + Whether the vehicle can be boarded at this stop. This field can also be used + to indicate if boarding is possible only with special arrangements. + """ + pickupType: PickupDropoffType + "true, if this stoptime has real-time data available" + realtime: Boolean + "Real-time prediction of arrival time. Format: seconds since midnight of the departure date" + realtimeArrival: Int + "Real-time prediction of departure time. Format: seconds since midnight of the departure date" + realtimeDeparture: Int + "State of real-time data" + realtimeState: RealtimeState + "Scheduled arrival time. Format: seconds since midnight of the departure date" + scheduledArrival: Int + "Scheduled departure time. Format: seconds since midnight of the departure date" + scheduledDeparture: Int + "Departure date of the trip. Format: Unix timestamp (local time) in seconds." + serviceDay: Long + "The stop where this arrival/departure happens" + stop: Stop + """ + The sequence of the stop in the pattern. This is not required to start from 0 or be consecutive - any + increasing integer sequence along the stops is valid. + + The purpose of this field is to identify the stop within the pattern so it can be cross-referenced + between it and the itinerary. It is safe to cross-reference when done quickly, i.e. within seconds. + However, it should be noted that real-time updates can change the values, so don't store it for + longer amounts of time. + + Depending on the source data, this might not be the GTFS `stop_sequence` but another value, perhaps + even generated. + """ + stopPosition: Int + "true, if this stop is used as a time equalization stop. false otherwise." + timepoint: Boolean + "Trip which this stoptime is for" + trip: Trip } -type RentalVehicleTypeCount { - """The type of the rental vehicle (scooter, bicycle, car...)""" - vehicleType: RentalVehicleType! - - """The number of vehicles of this type""" - count: Int! +"Stoptimes grouped by pattern" +type StoptimesInPattern { + pattern: Pattern + stoptimes: [Stoptime] } """ -Rental vehicle represents a vehicle that belongs to a rental network. +A system notice is used to tag elements with system information for debugging +or other system related purpose. One use-case is to run a routing search with +'debugItineraryFilter: true'. This will then tag itineraries instead of removing +them from the result. This make it possible to inspect the itinerary-filter-chain. +A SystemNotice only has english text, +because the primary user are technical staff, like testers and developers. """ -type RentalVehicle implements Node & PlaceInterface { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ID of the vehicle in the format of network:id""" - vehicleId: String - - """Name of the vehicle""" - name: String! - - """If true, vehicle is currently available for renting.""" - allowPickupNow: Boolean - - """ID of the rental network.""" - network: String - - """Longitude of the vehicle (WGS 84)""" - lon: Float - - """Latitude of the vehicle (WGS 84)""" - lat: Float - - """Platform-specific URLs to begin the vehicle.""" - rentalUris: VehicleRentalUris - - """ - If true, vehicle is not disabled. - """ - operative: Boolean +type SystemNotice { + "Notice's tag" + tag: String + "Notice's description" + text: String +} - """The type of the rental vehicle (scooter, bicycle, car...)""" - vehicleType: RentalVehicleType +"Describes ticket type" +type TicketType implements Node { + "ISO 4217 currency code" + currency: String + """ + Ticket type ID in format `FeedId:TicketTypeId`. Ticket type IDs are usually + combination of ticket zones where the ticket is valid. + """ + fareId: String! + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Price of the ticket in currency that is specified in `currency` field" + price: Float + """ + List of zones where this ticket is valid. + Corresponds to field `zoneId` in **Stop** type. + """ + zones: [String!] } -type BikeRentalStationUris { - """ - A URI that can be passed to an Android app with an {@code android.intent.action.VIEW} Android - intent to support Android Deep Links. - May be null if a rental URI does not exist. - """ - android: String +"Text with language" +type TranslatedString { + "Two-letter language code (ISO 639-1)" + language: String + text: String +} +"Trip is a specific occurance of a pattern, usually identified by route, direction on the route and exact departure time." +type Trip implements Node { + "List of dates when this trip is in service. Format: YYYYMMDD" + activeDates: [String] + """ + By default, list of alerts which have directly an effect on just the trip. + It's also possible to return other relevant alerts through defining types. + """ + alerts( """ - A URI that can be used on iOS to launch the rental app for this station. - May be {@code null} if a rental URI does not exist. + Returns alerts for these types that are relevant for the trip. + By default, list of alerts which have directly an effect on just the trip. """ - ios: String - + types: [TripAlertType] + ): [Alert] + "Arrival time to the final stop" + arrivalStoptime( """ - A URL that can be used by a web browser to show more information about renting a vehicle at - this station. - May be {@code null} if a rental URL does not exist. + Date for which the arrival time is returned. Format: YYYYMMDD. If this + argument is not used, field `serviceDay` in the stoptime will have a value of 0. """ - web: String -} - -type VehicleRentalUris { + serviceDate: String + ): Stoptime + "Whether bikes are allowed on board the vehicle running this trip" + bikesAllowed: BikesAllowed + blockId: String + "Departure time from the first stop" + departureStoptime( """ - A URI that can be passed to an Android app with an {@code android.intent.action.VIEW} Android - intent to support Android Deep Links. - May be null if a rental URI does not exist. + Date for which the departure time is returned. Format: YYYYMMDD. If this + argument is not used, field `serviceDay` in the stoptime will have a value of 0. """ - android: String - + serviceDate: String + ): Stoptime + """ + Direction code of the trip, i.e. is this the outbound or inbound trip of a + pattern. Possible values: 0, 1 or `null` if the direction is irrelevant, i.e. + the pattern has trips only in one direction. + """ + directionId: String + "List of coordinates of this trip's route" + geometry: [[Float]] + "ID of the trip in format `FeedId:TripId`" + gtfsId: String! + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + """ + The latest real-time occupancy information for the latest occurance of this + trip. + """ + occupancy: TripOccupancy + "The pattern the trip is running on" + pattern: Pattern + "The route the trip is running on" + route: Route! + "Short name of the route this trip is running. See field `shortName` of Route." + routeShortName: String + "Hash code of the trip. This value is stable and not dependent on the trip id." + semanticHash: String! + serviceId: String + shapeId: String + "List of stops this trip passes through" + stops: [Stop!]! + "List of times when this trip arrives to or departs from a stop" + stoptimes: [Stoptime] + stoptimesForDate( + "Date for which stoptimes are returned. Format: YYYYMMDD" + serviceDate: String + ): [Stoptime] + "Coordinates of the route of this trip in Google polyline encoded format" + tripGeometry: Geometry + "Headsign of the vehicle when running on this trip" + tripHeadsign( """ - A URI that can be used on iOS to launch the rental app for this rental network. - May be {@code null} if a rental URI does not exist. + If a translated headsign is found from GTFS translation.txt and wanted language is not same as + feed's language then returns wanted translation. Otherwise uses name from trip_headsign.txt. """ - ios: String + language: String + ): String + tripShortName: String + "Whether the vehicle running this trip can be boarded by a wheelchair" + wheelchairAccessible: WheelchairBoarding +} - """ - A URL that can be used by a web browser to show more information about renting a vehicle. - May be {@code null} if a rental URL does not exist. - """ - web: String +""" +Occupancy of a vehicle on a trip. This should include the most recent occupancy information +available for a trip. Historic data might not be available. +""" +type TripOccupancy { + "Occupancy information mapped to a limited set of descriptive states." + occupancyStatus: OccupancyStatus } -type RentalVehicleType { - """The vehicle's general form factor""" - formFactor: FormFactor +"This is used for alert entities that we don't explicitly handle or they are missing." +type Unknown { + "Entity's description" + description: String +} - """The primary propulsion type of the vehicle""" - propulsionType: PropulsionType +"Vehicle parking represents a location where bicycles or cars can be parked." +type VehicleParking implements Node & PlaceInterface { + """ + Does this vehicle parking have spaces (capacity) for either wheelchair accessible (disabled) + or normal cars. + """ + anyCarPlaces: Boolean + "The currently available spaces at this vehicle parking." + availability: VehicleParkingSpaces + "Does this vehicle parking have spaces (capacity) for bicycles." + bicyclePlaces: Boolean + "The capacity (maximum available spaces) of this vehicle parking." + capacity: VehicleParkingSpaces + """ + Does this vehicle parking have spaces (capacity) for cars excluding wheelchair accessible spaces. + Use anyCarPlaces to check if any type of car may use this vehicle parking. + """ + carPlaces: Boolean + "URL which contains details of this vehicle parking." + detailsUrl: String + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "URL of an image which may be displayed to the user showing the vehicle parking." + imageUrl: String + "Latitude of the bike park (WGS 84)" + lat: Float + "Longitude of the bike park (WGS 84)" + lon: Float + "Name of the park" + name( + "Returns name with the specified language, if found, otherwise returns with some default language." + language: String + ): String! + "A short translatable note containing details of this vehicle parking." + note( + "Returns note with the specified language, if found, otherwise returns with some default language." + language: String + ): String + "Opening hours of the parking facility" + openingHours: OpeningHours + "If true, value of `spacesAvailable` is updated from a real-time source." + realtime: Boolean + """ + The state of this vehicle parking. + Only ones in an OPERATIONAL state may be used for Park and Ride. + """ + state: VehicleParkingState + """ + Source specific tags of the vehicle parking, which describe the available features. For example + park_and_ride, bike_lockers, or static_osm_data. + """ + tags: [String] + "ID of the park" + vehicleParkingId: String + "Does this vehicle parking have wheelchair accessible (disabled) car spaces (capacity)." + wheelchairAccessibleCarPlaces: Boolean } -enum FormFactor { - """A bicycle""" - BICYCLE - """A bicycle with additional space for cargo""" - CARGO_BICYCLE - """An automobile""" - CAR - """A moped that the rider sits on. For a disambiguation see https://github.com/NABSA/gbfs/pull/370#issuecomment-982631989""" - MOPED - """A kick scooter that the rider either sits or stands on. Will be deprecated in GBFS v3.0.""" - SCOOTER - """A kick scooter that the rider stands on""" - SCOOTER_STANDING - """A kick scooter with a seat""" - SCOOTER_SEATED - """A vehicle that doesn't fit into any other category""" - OTHER +"The number of spaces by type. null if unknown." +type VehicleParkingSpaces { + "The number of bicycle spaces." + bicycleSpaces: Int + "The number of car spaces." + carSpaces: Int + "The number of wheelchair accessible (disabled) car spaces." + wheelchairAccessibleCarSpaces: Int } -enum PropulsionType { - """Pedal or foot propulsion""" - HUMAN - """Provides electric motor assist only in combination with human propulsion - no throttle mode""" - ELECTRIC_ASSIST - """Powered by battery-powered electric motor with throttle mode""" - ELECTRIC - """Powered by gasoline combustion engine""" - COMBUSTION - """Powered by diesel combustion engine""" - COMBUSTION_DIESEL - """Powered by combined combustion engine and battery-powered motor""" - HYBRID - """Powered by combined combustion engine and battery-powered motor with plug-in charging""" - PLUG_IN_HYBRID - """Powered by hydrogen fuel cell powered electric motor""" - HYDROGEN_FUEL_CELL +"Real-time vehicle position" +type VehiclePosition { + """ + Bearing, in degrees, clockwise from North, i.e., 0 is North and 90 is East. This can be the + compass bearing, or the direction towards the next stop or intermediate location. + """ + heading: Float + "Human-readable label of the vehicle, eg. a publicly visible number or a license plate" + label: String + "When the position of the vehicle was recorded in seconds since the UNIX epoch." + lastUpdated: Long + "Latitude of the vehicle" + lat: Float + "Longitude of the vehicle" + lon: Float + "Speed of the vehicle in meters/second" + speed: Float + "The current stop where the vehicle will be or is currently arriving." + stopRelationship: StopRelationship + "Which trip this vehicles runs on." + trip: Trip! + "Feed-scoped ID that uniquely identifies the vehicle in the format FeedId:VehicleId" + vehicleId: String +} + +"Vehicle rental station represents a location where users can rent bicycles etc. for a fee." +type VehicleRentalStation implements Node & PlaceInterface { + """ + If true, vehicles can be returned to this station if the station has spaces available + or allows overloading. + """ + allowDropoff: Boolean + "If true, vehicles can be currently returned to this station." + allowDropoffNow: Boolean + "If true, vehicles can be returned even if spacesAvailable is zero or vehicles > capacity." + allowOverloading: Boolean + "If true, vehicles can be picked up from this station if the station has vehicles available." + allowPickup: Boolean + "If true, vehicles can be currently picked up from this station." + allowPickupNow: Boolean + "Number of free spaces currently available on the rental station, grouped by vehicle type." + availableSpaces: RentalVehicleEntityCounts + "Number of vehicles currently available on the rental station, grouped by vehicle type." + availableVehicles: RentalVehicleEntityCounts + "Nominal capacity (number of racks) of the rental station." + capacity: Int + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + "Latitude of the vehicle rental station (WGS 84)" + lat: Float + "Longitude of the vehicle rental station (WGS 84)" + lon: Float + "Name of the vehicle rental station" + name: String! + "ID of the rental network." + network: String + "If true, station is on and in service." + operative: Boolean + """ + If true, values of `vehiclesAvailable` and `spacesAvailable` are updated from a + real-time source. If false, values of `vehiclesAvailable` and `spacesAvailable` + are always the total capacity divided by two. + """ + realtime: Boolean + "Platform-specific URLs to begin renting a vehicle from this station." + rentalUris: VehicleRentalUris + """ + Number of free spaces currently available on the rental station. + Note that this value being 0 does not necessarily indicate that vehicles cannot be returned + to this station, as for example it might be possible to leave the vehicle in the vicinity of + the rental station, even if the vehicle racks don't have any spaces available. + See field `allowDropoffNow` to know if is currently possible to return a vehicle. + """ + spacesAvailable: Int @deprecated(reason : "Use `availableSpaces` instead, which also contains the space vehicle types") + "ID of the vehicle in the format of network:id" + stationId: String + """ + Number of vehicles currently available on the rental station. + See field `allowPickupNow` to know if is currently possible to pick up a vehicle. + """ + vehiclesAvailable: Int @deprecated(reason : "Use `availableVehicles` instead, which also contains vehicle types") } -enum BikesAllowed { - """There is no bike information for the trip.""" - NO_INFORMATION +type VehicleRentalUris { + """ + A URI that can be passed to an Android app with an {@code android.intent.action.VIEW} Android + intent to support Android Deep Links. + May be null if a rental URI does not exist. + """ + android: String + """ + A URI that can be used on iOS to launch the rental app for this rental network. + May be {@code null} if a rental URI does not exist. + """ + ios: String + """ + A URL that can be used by a web browser to show more information about renting a vehicle. + May be {@code null} if a rental URL does not exist. + """ + web: String +} - """ - The vehicle being used on this particular trip can accommodate at least one bicycle. - """ - ALLOWED +type debugOutput { + pathCalculationTime: Long + precalculationTime: Long + renderingTime: Long + timedOut: Boolean + totalTime: Long +} - """No bicycles are allowed on this trip.""" - NOT_ALLOWED +type elevationProfileComponent { + "The distance from the start of the step, in meters." + distance: Float + "The elevation at this distance, in meters." + elevation: Float } """ -Preferences related to travel with a bicycle. +This type is only here for backwards-compatibility and this API will never return it anymore. +Please use the leg's `fareProducts` instead. """ -input BicyclePreferencesInput { - """ - A multiplier for how bad cycling is compared to being in transit for equal lengths of time. - """ - reluctance: Reluctance - - """ - Walking preferences when walking a bicycle. - """ - walk: BicycleWalkPreferencesInput - - """ - Maximum speed on flat ground while riding a bicycle. Note, this speed is higher than - the average speed will be in itineraries as this is the maximum speed but there are - factors that slow down cycling such as crossings, intersections and elevation changes. - """ - speed: Speed - - """ - What criteria should be used when optimizing a cycling route. - """ - optimization: CyclingOptimizationInput - - """ - Cost of boarding a vehicle with a bicycle. - """ - boardCost: Cost - - """ - Bicycle rental related preferences. - """ - rental: BicycleRentalPreferencesInput - - """ - Bicycle parking related preferences. - """ - parking: BicycleParkingPreferencesInput +type fare { + """ + Fare price in cents. **Note:** this value is dependent on the currency used, + as one cent is not necessarily ¹/₁₀₀ of the basic monerary unit. + """ + cents: Int @deprecated(reason : "No longer supported") + "Components which this fare is composed of" + components: [fareComponent] @deprecated(reason : "No longer supported") + "ISO 4217 currency code" + currency: String @deprecated(reason : "No longer supported") + type: String @deprecated(reason : "No longer supported") } """ -Preferences related to boarding a transit vehicle. Note, board costs for each street mode -can be found under the street mode preferences. +This type is only here for backwards-compatibility and this API will never return it anymore. +Please use the leg's `fareProducts` instead. """ -input BoardPreferencesInput { - """ - A multiplier for how bad waiting at a stop is compared to being in transit for equal lengths of time. - """ - waitReluctance: Reluctance +type fareComponent { + """ + Fare price in cents. **Note:** this value is dependent on the currency used, + as one cent is not necessarily ¹/₁₀₀ of the basic monerary unit. + """ + cents: Int @deprecated(reason : "No longer supported") + "ISO 4217 currency code" + currency: String @deprecated(reason : "No longer supported") + "ID of the ticket type. Corresponds to `fareId` in **TicketType**." + fareId: String @deprecated(reason : "No longer supported") + "List of routes which use this fare component" + routes: [Route] @deprecated(reason : "No longer supported") +} - """ - What is the required minimum waiting time at a stop. Setting this value as `PT0S`, for example, can lead - to passenger missing a connection when the vehicle leaves ahead of time or the passenger arrives to the - stop later than expected. - """ - slack: Duration +type placeAtDistance implements Node { + "Walking distance to the place along streets and paths" + distance: Int + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + place: PlaceInterface } -"""Car park represents a location where cars can be parked.""" -type CarPark implements Node & PlaceInterface { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! +"A connection to a list of items." +type placeAtDistanceConnection { + edges: [placeAtDistanceEdge] + pageInfo: PageInfo! +} + +"An edge in a connection." +type placeAtDistanceEdge { + cursor: String! + "The item at the end of the edge" + node: placeAtDistance +} - """ID of the car park""" - carParkId: String +"Time range for which the API has data available" +type serviceTimeRange { + "Time until which the API has data available. Format: Unix timestamp in seconds" + end: Long + "Time from which the API has data available. Format: Unix timestamp in seconds" + start: Long +} - """Name of the car park""" - name( - """Returns name with the specified language, if found, otherwise returns with some default language.""" - language: String): String! +type step { + "The cardinal (compass) direction (e.g. north, northeast) taken when engaging this step." + absoluteDirection: AbsoluteDirection + "A list of alerts (e.g. construction, detours) applicable to the step." + alerts: [Alert] + """ + This step is on an open area, such as a plaza or train platform, + and thus the directions should say something like "cross". + """ + area: Boolean + """ + The name of this street was generated by the system, so we should only display it once, and + generally just display right/left directions + """ + bogusName: Boolean + "The distance in meters that this step takes." + distance: Float + "The elevation profile as a list of { distance, elevation } values." + elevationProfile: [elevationProfileComponent] + "When exiting a highway or traffic circle, the exit name/number." + exit: String + "The latitude of the start of the step." + lat: Float + "The longitude of the start of the step." + lon: Float + "The relative direction (e.g. left or right turn) to take when engaging this step." + relativeDirection: RelativeDirection + "Indicates whether or not a street changes direction at an intersection." + stayOn: Boolean + "The name of the street, road, or path taken for this step." + streetName: String + "Is this step walking with a bike?" + walkingBike: Boolean +} - """Number of parking spaces at the car park""" - maxCapacity: Int +type stopAtDistance implements Node { + "Walking distance to the stop along streets and paths" + distance: Int + "Global object ID provided by Relay. This value can be used to refetch this object using **node** query." + id: ID! + stop: Stop +} - """Number of currently available parking spaces at the car park""" - spacesAvailable: Int +"A connection to a list of items." +type stopAtDistanceConnection { + edges: [stopAtDistanceEdge] + pageInfo: PageInfo! +} - """ - If true, value of `spacesAvailable` is updated from a real-time source. - """ - realtime: Boolean +"An edge in a connection." +type stopAtDistanceEdge { + cursor: String! + "The item at the end of the edge" + node: stopAtDistance +} - """Longitude of the car park (WGS 84)""" - lon: Float +"The cardinal (compass) direction taken when engaging a walking/driving step." +enum AbsoluteDirection { + EAST + NORTH + NORTHEAST + NORTHWEST + SOUTH + SOUTHEAST + SOUTHWEST + WEST +} - """Latitude of the car park (WGS 84)""" - lat: Float +"Entities, which are relevant for an agency and can contain alerts" +enum AgencyAlertType { + "Alerts affecting the agency." + AGENCY + "Alerts affecting agency's routes" + ROUTES + """ + Alerts affecting the different route types of the agency. + Alerts that affect route types on all agencies can be fetched through Feed. + """ + ROUTE_TYPES +} - """ - Source specific tags of the car park, which describe the available features. - """ - tags: [String] +"Cause of a alert" +enum AlertCauseType { + "ACCIDENT" + ACCIDENT + "CONSTRUCTION" + CONSTRUCTION + "DEMONSTRATION" + DEMONSTRATION + "HOLIDAY" + HOLIDAY + "MAINTENANCE" + MAINTENANCE + "MEDICAL_EMERGENCY" + MEDICAL_EMERGENCY + "OTHER_CAUSE" + OTHER_CAUSE + "POLICE_ACTIVITY" + POLICE_ACTIVITY + "STRIKE" + STRIKE + "TECHNICAL_PROBLEM" + TECHNICAL_PROBLEM + "UNKNOWN_CAUSE" + UNKNOWN_CAUSE + "WEATHER" + WEATHER +} + +"Effect of a alert" +enum AlertEffectType { + "ACCESSIBILITY_ISSUE" + ACCESSIBILITY_ISSUE + "ADDITIONAL_SERVICE" + ADDITIONAL_SERVICE + "DETOUR" + DETOUR + "MODIFIED_SERVICE" + MODIFIED_SERVICE + "NO_EFFECT" + NO_EFFECT + "NO_SERVICE" + NO_SERVICE + "OTHER_EFFECT" + OTHER_EFFECT + "REDUCED_SERVICE" + REDUCED_SERVICE + "SIGNIFICANT_DELAYS" + SIGNIFICANT_DELAYS + "STOP_MOVED" + STOP_MOVED + "UNKNOWN_EFFECT" + UNKNOWN_EFFECT +} + +"Severity level of a alert" +enum AlertSeverityLevelType { + """ + Info alerts are used for informational messages that should not have a + significant effect on user's journey, for example: A single entrance to a + metro station is temporarily closed. + """ + INFO + """ + Severe alerts are used when a significant part of public transport services is + affected, for example: All train services are cancelled due to technical problems. + """ + SEVERE + "Severity of alert is unknown" + UNKNOWN_SEVERITY + """ + Warning alerts are used when a single stop or route has a disruption that can + affect user's journey, for example: All trams on a specific route are running + with irregular schedules. + """ + WARNING +} - """ - Opening hours for the selected dates using the local time of the park. - Each date can have multiple time spans. - """ - openingHours: OpeningHours +enum BikesAllowed { + "The vehicle being used on this particular trip can accommodate at least one bicycle." + ALLOWED + "No bicycles are allowed on this trip." + NOT_ALLOWED + "There is no bike information for the trip." + NO_INFORMATION } """ -Preferences related to traveling on a car (excluding car travel on transit services such as taxi). +Predefined optimization alternatives for bicycling routing. For more customization, +one can use the triangle factors. """ -input CarPreferencesInput { - """ - A multiplier for how bad travelling on car is compared to being in transit for equal lengths of time. - """ - reluctance: Reluctance - - """ - Car rental related preferences. - """ - rental: CarRentalPreferencesInput +enum CyclingOptimizationType { + "Emphasize flatness over safety or duration of the route. This option was previously called `FLAT`." + FLAT_STREETS + """ + Completely ignore the elevation differences and prefer the streets, that are evaluated + to be the safest, even more than with the `SAFE_STREETS` option. + Safety can also include other concerns such as convenience and general cyclist preferences + by taking into account road surface etc. This option was previously called `GREENWAYS`. + """ + SAFEST_STREETS + """ + Emphasize cycling safety over flatness or duration of the route. Safety can also include other + concerns such as convenience and general cyclist preferences by taking into account + road surface etc. This option was previously called `SAFE`. + """ + SAFE_STREETS + """ + Search for routes with the shortest duration while ignoring the cycling safety + of the streets (the routes should still follow local regulations). Routes can include + steep streets, if they are the fastest alternatives. This option was previously called + `QUICK`. + """ + SHORTEST_DURATION +} - """ - Car parking related preferences. - """ - parking: CarParkingPreferencesInput -} - -"""Cluster is a list of stops grouped by name and proximity""" -type Cluster implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ID of the cluster""" - gtfsId: String! - - """Name of the cluster""" - name: String! - - """ - Latitude of the center of this cluster (i.e. average latitude of stops in this cluster) - """ - lat: Float! - - """ - Longitude of the center of this cluster (i.e. average longitude of stops in this cluster) - """ - lon: Float! - - """List of stops in the cluster""" - stops: [Stop!] -} - -""" -A static cost that is applied to a certain event or entity. Cost is a positive integer, -for example `450`. One cost unit should roughly match a one second travel on transit. -""" -scalar Cost - -""" -Coordinate (often referred as coordinates), which is used to specify a location using in the -WGS84 coordinate system. -""" -type Coordinate { - """ - Latitude as a WGS84 format number. - """ - latitude: CoordinateValue! - - """ - Longitude as a WGS84 format number. - """ - longitude: CoordinateValue! -} - -""" -Either a latitude or a longitude as a WGS84 format floating point number. -""" -scalar CoordinateValue @specifiedBy(url: "https://earth-info.nga.mil/?dir=wgs84&action=wgs84") - -type Coordinates { - """Latitude (WGS 84)""" - lat: Float - - """Longitude (WGS 84)""" - lon: Float -} - -""" -Plan date time options. Only one of the values should be defined. -""" -input PlanDateTimeInput @oneOf { - """ - Earliest departure date time. The returned itineraries should not - depart before this instant unless one is using paging to find earlier - itineraries. Note, it is not currently possible to define both - `earliestDeparture` and `latestArrival`. - """ - earliestDeparture: OffsetDateTime - - """ - Latest arrival time date time. The returned itineraries should not - arrive to the destination after this instant unless one is using - paging to find later itineraries. Note, it is not currently possible - to define both `earliestDeparture` and `latestArrival`. - """ - latestArrival: OffsetDateTime -} - -type debugOutput { - totalTime: Long - pathCalculationTime: Long - precalculationTime: Long - renderingTime: Long - timedOut: Boolean -} - -""" -Departure row is a combination of a pattern and a stop of that pattern. - -They are de-duplicated so for each pattern there will only be a single departure row. - -This is useful if you want to show a list of stop/pattern combinations but want each pattern to be -listed only once. -""" -type DepartureRow implements Node & PlaceInterface { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """Stop from which the departures leave""" - stop: Stop - - """Latitude of the stop (WGS 84)""" - lat: Float - - """Longitude of the stop (WGS 84)""" - lon: Float - - """Pattern of the departure row""" - pattern: Pattern - - """Departures of the pattern from the stop""" - stoptimes( - """ - Return rows departing after this time. Time format: Unix timestamp in seconds. Default: current time. - """ - startTime: Long = 0 - - """How many seconds ahead to search for departures. Default is one day.""" - timeRange: Int = 86400 - - """Maximum number of departures to return.""" - numberOfDepartures: Int = 1 - - """If true, only those departures which allow boarding are returned""" - omitNonPickups: Boolean = false - - """If false, returns also canceled trips""" - omitCanceled: Boolean = true - ): [Stoptime] -} - -type elevationProfileComponent { - """The distance from the start of the step, in meters.""" - distance: Float - - """The elevation at this distance, in meters.""" - elevation: Float -} - -type Emissions { - """ - CO₂ emissions in grams. - """ - co2: Grams -} - -""" -This type is only here for backwards-compatibility and this API will never return it anymore. -Please use the leg's `fareProducts` instead. -""" -type fare { - type: String @deprecated - - """ISO 4217 currency code""" - currency: String @deprecated - - """ - Fare price in cents. **Note:** this value is dependent on the currency used, - as one cent is not necessarily ¹/₁₀₀ of the basic monerary unit. - """ - cents: Int @deprecated - - """Components which this fare is composed of""" - components: [fareComponent] @deprecated -} - -""" -This type is only here for backwards-compatibility and this API will never return it anymore. -Please use the leg's `fareProducts` instead. -""" -type fareComponent { - """ID of the ticket type. Corresponds to `fareId` in **TicketType**.""" - fareId: String @deprecated - - """ISO 4217 currency code""" - currency: String @deprecated - - """ - Fare price in cents. **Note:** this value is dependent on the currency used, - as one cent is not necessarily ¹/₁₀₀ of the basic monerary unit. - """ - cents: Int @deprecated - - """List of routes which use this fare component""" - routes: [Route] @deprecated -} - - -""" -Feed publisher information -""" -type FeedPublisher { - """Name of feed publisher""" - name: String! - - """Web address of feed publisher""" - url: String! -} - -""" -A feed provides routing data (stops, routes, timetables, etc.) from one or more public transport agencies. -""" -type Feed { - """ID of the feed""" - feedId: String! - - """List of agencies which provide data to this feed""" - agencies: [Agency] - - "The publisher of the input transit data." - publisher: FeedPublisher - - """ - Alerts relevant for the feed. - """ - alerts( - """ - Returns alerts for these types that are relevant for the feed. - """ - types: [FeedAlertType!] - ): [Alert] -} - -"""Entities, which are relevant for a feed and can contain alerts""" -enum FeedAlertType { - """Alerts affecting the feed's agencies""" - AGENCIES - - """ - Alerts affecting the route types across the feed. - There might be alerts that only affect route types within an agency of the feed, - and those can be fetched through the Agency. - """ - ROUTE_TYPES +"Entities, which are relevant for a feed and can contain alerts" +enum FeedAlertType { + "Alerts affecting the feed's agencies" + AGENCIES + """ + Alerts affecting the route types across the feed. + There might be alerts that only affect route types within an agency of the feed, + and those can be fetched through the Agency. + """ + ROUTE_TYPES } enum FilterPlaceType { - """ - Stops. - NOTE: if this is selected at the same time as `STATION`, stops that have a parent station will not be returned but their parent stations will be returned instead. - """ - STOP - - """Departure rows""" - DEPARTURE_ROW - - """Old value for VEHICLE_RENT""" - BICYCLE_RENT @deprecated(reason: "Use VEHICLE_RENT instead as it's clearer that it also returns rental scooters, cars...") - - """Vehicle (bicycles, scooters, cars ...) rental stations and vehicles""" - VEHICLE_RENT - - """Parking lots (not rental stations) that contain spaces for bicycles""" - BIKE_PARK - - """Parking lots that contain spaces for cars""" - CAR_PARK - - - """ - Stations. - NOTE: if this is selected at the same time as `STOP`, stops that have a parent station will not be returned but their parent stations will be returned instead. - """ - STATION -} - -type Geometry { - """The number of points in the string""" - length: Int - - """ - List of coordinates of in a Google encoded polyline format (see - https://developers.google.com/maps/documentation/utilities/polylinealgorithm) - """ - points: Polyline -} - -scalar GeoJson @specifiedBy(url: "https://www.rfcreader.com/#rfc7946") - -scalar Grams - -type StopGeometries { - """Representation of the stop geometries as GeoJSON (https://geojson.org/)""" - geoJson: GeoJson, - - """ - Representation of a stop as a series of polylines. - - Polygons of flex stops are represented as linear rings (lines where the first and last point are the same). - - Proper stops are represented as single point "lines". - """ - googleEncoded: [Geometry] -} - -""" -A coordinate used for a location in a plan query. -""" -input PlanCoordinateInput { - """ - Latitude as a WGS84 format number. - """ - latitude: CoordinateValue! - """ - Longitude as a WGS84 format number. - """ - longitude: CoordinateValue! -} - -input InputBanned { - """A comma-separated list of banned route ids""" - routes: String - - """A comma-separated list of banned agency ids""" - agencies: String - - """A comma-separated list of banned trip ids""" - trips: String - - """ - A comma-separated list of banned stop ids. Note that these stops are only - banned for boarding and disembarking vehicles — it is possible to get an - itinerary where a vehicle stops at one of these stops - """ - stops: String @deprecated(reason: "Not implemented in OTP2.") - - """ - A comma-separated list of banned stop ids. Only itineraries where these stops - are not travelled through are returned, e.g. if a bus route stops at one of - these stops, that route will not be used in the itinerary, even if the stop is - not used for boarding or disembarking the vehicle. - """ - stopsHard: String @deprecated(reason: "Not implemented in OTP2.") -} - -input InputCoordinates { - """Latitude of the place (WGS 84)""" - lat: Float! - - """Longitude of the place (WGS 84)""" - lon: Float! - - """ - The name of the place. If specified, the place name in results uses this value instead of `"Origin"` or `"Destination"` - """ - address: String - - """ - The amount of time, in seconds, to spend at this location before venturing forth. - """ - locationSlack: Int -} - -input InputFilters { - """Stops to include by GTFS id.""" - stops: [String] - - """Stations to include by GTFS id.""" - stations: [String] - - """Routes to include by GTFS id.""" - routes: [String] - - """Bike rentals to include by id (without network identifier).""" - bikeRentalStations: [String] - - """Bike parks to include by id.""" - bikeParks: [String] - - """Car parks to include by id.""" - carParks: [String] -} - -input InputModeWeight { - """ - The weight of TRAM traverse mode. Values over 1 add cost to tram travel and values under 1 decrease cost - """ - TRAM: Float - - """ - The weight of SUBWAY traverse mode. Values over 1 add cost to subway travel and values under 1 decrease cost - """ - SUBWAY: Float - - """ - The weight of RAIL traverse mode. Values over 1 add cost to rail travel and values under 1 decrease cost - """ - RAIL: Float - - """ - The weight of BUS traverse mode. Values over 1 add cost to bus travel and values under 1 decrease cost - """ - BUS: Float - - """ - The weight of FERRY traverse mode. Values over 1 add cost to ferry travel and values under 1 decrease cost - """ - FERRY: Float - - """ - The weight of CABLE_CAR traverse mode. Values over 1 add cost to cable car travel and values under 1 decrease cost - """ - CABLE_CAR: Float - - """ - The weight of GONDOLA traverse mode. Values over 1 add cost to gondola travel and values under 1 decrease cost - """ - GONDOLA: Float - - """ - The weight of FUNICULAR traverse mode. Values over 1 add cost to funicular travel and values under 1 decrease cost - """ - FUNICULAR: Float - - """ - The weight of AIRPLANE traverse mode. Values over 1 add cost to airplane travel and values under 1 decrease cost - """ - AIRPLANE: Float + "Old value for VEHICLE_RENT" + BICYCLE_RENT @deprecated(reason : "Use VEHICLE_RENT instead as it's clearer that it also returns rental scooters, cars...") + "Parking lots (not rental stations) that contain spaces for bicycles" + BIKE_PARK + "Parking lots that contain spaces for cars" + CAR_PARK + "Departure rows" + DEPARTURE_ROW + """ + Stations. + NOTE: if this is selected at the same time as `STOP`, stops that have a parent station will not be returned but their parent stations will be returned instead. + """ + STATION + """ + Stops. + NOTE: if this is selected at the same time as `STATION`, stops that have a parent station will not be returned but their parent stations will be returned instead. + """ + STOP + "Vehicle (bicycles, scooters, cars ...) rental stations and vehicles" + VEHICLE_RENT } -input InputPreferred { - """A comma-separated list of ids of the routes preferred by the user.""" - routes: String - - """A comma-separated list of ids of the agencies preferred by the user.""" - agencies: String - - """ - Penalty added for using every route that is not preferred if user set any - route as preferred. We return number of seconds that we are willing to wait - for preferred route. - """ - otherThanPreferredRoutesPenalty: Int +enum FormFactor { + "A bicycle" + BICYCLE + "An automobile" + CAR + "A bicycle with additional space for cargo" + CARGO_BICYCLE + "A moped that the rider sits on. For a disambiguation see https://github.com/NABSA/gbfs/pull/370#issuecomment-982631989" + MOPED + "A vehicle that doesn't fit into any other category" + OTHER + "A kick scooter that the rider either sits or stands on. Will be deprecated in GBFS v3.0." + SCOOTER + "A kick scooter with a seat" + SCOOTER_SEATED + "A kick scooter that the rider stands on" + SCOOTER_STANDING } -""" -Locale in the format defined in [RFC5646](https://datatracker.ietf.org/doc/html/rfc5646). For example, `en` or `en-US`. -""" -scalar Locale @specifiedBy(url: "https://www.rfcreader.com/#rfc5646") - -""" -Preferences for car parking facilities used during the routing. -""" -input CarParkingPreferencesInput { - """ - Selection filters to include or exclude parking facilities. - An empty list will include all facilities in the routing search. - """ - filters: [ParkingFilter!] - - """ - If `preferred` is non-empty, using a parking facility that doesn't contain - at least one of the preferred conditions, will receive this extra cost and therefore avoided if - preferred options are available. - """ - unpreferredCost: Cost - - """ - If non-empty every parking facility that doesn't match this set of conditions will - receive an extra cost (defined by `unpreferredCost`) and therefore avoided. - """ - preferred: [ParkingFilter!] +enum InputField { + DATE_TIME + FROM + TO } """ -Preferences for bicycle parking facilities used during the routing. -""" -input BicycleParkingPreferencesInput { - """ - Selection filters to include or exclude parking facilities. - An empty list will include all facilities in the routing search. - """ - filters: [ParkingFilter!] - - """ - If `preferred` is non-empty, using a parking facility that doesn't contain - at least one of the preferred conditions, will receive this extra cost and therefore avoided if - preferred options are available. - """ - unpreferredCost: Cost - - """ - If non-empty every parking facility that doesn't match this set of conditions will - receive an extra cost (defined by `unpreferredCost`) and therefore avoided. - """ - preferred: [ParkingFilter!] -} - -""" -Preferences for parking facilities used during the routing. -""" -input VehicleParkingInput { - """ - Selection filters to include or exclude parking facilities. - An empty list will include all facilities in the routing search. - """ - filters: [ParkingFilter] - - """ - If `preferred` is non-empty, using a parking facility that doesn't contain - at least one of the preferred conditions, will receive this extra cost and therefore avoided if - preferred options are available. - """ - unpreferredCost: Int - - """ - If non-empty every parking facility that doesn't match this set of conditions will - receive an extra cost (defined by `unpreferredCost`) and therefore avoided. - """ - preferred: [ParkingFilter] -} - -input ParkingFilterOperation { - """Filter parking facilities based on their tag""" - tags: [String] -} - -""" -The filter definition to include or exclude parking facilities used during routing. - -Logically, the filter algorithm work as follows: - -- The starting point is the set of all facilities, lets call it `A`. -- Then all `select` filters are applied to `A`, potentially reducing the number of facilities used. - Let's call the result of this `B`. - An empty `select` will lead to `A` being equal to `B`. -- Lastly, the `not` filters are applied to `B`, reducing the set further. - Lets call this final set `C`. - An empty `not` will lead to `B` being equal to `C`. -- The remaining parking facilities in `C` are used for routing. -""" -input ParkingFilter { - """ - Exclude parking facilities based on their properties. - - If empty nothing is excluded from the initial set of facilities but may be filtered down - further by the `select` filter. - """ - not: [ParkingFilterOperation!] - """ - Include parking facilities based on their properties. - - If empty everything is included from the initial set of facilities but may be filtered down - further by the `not` filter. - """ - select: [ParkingFilterOperation!] -} - -""" -Settings that control the behavior of itinerary filtering. **These are advanced settings and -should not be set by a user through user preferences.** -""" -input PlanItineraryFilterInput { - """ - Itinerary filter debug profile used to control the behaviour of itinerary filters. - """ - itineraryFilterDebugProfile: ItineraryFilterDebugProfile = OFF - - """ - Pick one itinerary from each group after putting itineraries that are `85%` similar together, - if the given value is `0.85`, for example. Itineraries are grouped together based on relative - the distance of transit travel that is identical between the itineraries (access, egress and - transfers are ignored). The value must be at least `0.5`. - """ - groupSimilarityKeepOne: Ratio = 0.85 - - """ - Pick three itineraries from each group after putting itineraries that are `68%` similar together, - if the given value is `0.68`, for example. Itineraries are grouped together based on relative - the distance of transit travel that is identical between the itineraries (access, egress and - transfers are ignored). The value must be at least `0.5`. - """ - groupSimilarityKeepThree: Ratio = 0.68 - - """ - Of the itineraries grouped to maximum of three itineraries, how much worse can the non-grouped - legs be compared to the lowest cost. `2.0` means that they can be double the cost, and any - itineraries having a higher cost will be filtered away. Use a value lower than `1.0` to turn the - grouping off. - """ - groupedOtherThanSameLegsMaxCostMultiplier: Float = 2.0 -} - -""" -Plan location settings. Location must be set. Label is optional -and used for naming the location. -""" -input PlanLabeledLocationInput { - """ - A location that has to be used in an itinerary. - """ - location: PlanLocationInput! - - """ - A label that can be attached to the location. This label is then returned with the location - in the itineraries. - """ - label: String -} - -""" -Plan location. Either a coordinate or a stop location should be defined. -""" -input PlanLocationInput @oneOf { - """ - Coordinate of the location. Note, either a coordinate or a stop location should be defined. - """ - coordinate: PlanCoordinateInput - - """ - Stop, station, a group of stop places or multimodal stop place that should be used as - a location for the search. The trip doesn't have to use the given stop location for a - transit connection as it's possible to start walking to another stop from the given - location. If a station or a group of stop places is provided, a stop that makes the most - sense for the journey is picked as the location within the station or group of stop places. - """ - stopLocation: PlanStopLocationInput -} - -""" -Wrapper type for different types of preferences related to plan query. -""" -input PlanPreferencesInput { - """ - Street routing preferences used for ingress, egress and transfers. These do not directly affect - the transit legs but can change how preferable walking or cycling, for example, is compared to - transit. - """ - street: PlanStreetPreferencesInput - - """ - Transit routing preferences used for transit legs. - """ - transit: TransitPreferencesInput - - """ - Accessibility preferences that affect both the street and transit routing. - """ - accessibility: AccessibilityPreferencesInput -} - -""" -Stop, station, a group of stop places or multimodal stop place that should be used as -a location for the search. The trip doesn't have to use the given stop location for a -transit connection as it's possible to start walking to another stop from the given -location. If a station or a group of stop places is provided, a stop that makes the most -sense for the journey is picked as the location within the station or group of stop places. -""" -input PlanStopLocationInput { - """ - ID of the stop, station, a group of stop places or multimodal stop place. Format - should be `FeedId:StopLocationId`. - """ - stopLocationId: String! -} - -""" -Mode selections for the plan search. -""" -input PlanModesInput { - """ - Should only the direct search without any transit be done. - """ - directOnly: Boolean = false - - """ - Should only the transit search be done and never suggest itineraries that don't - contain any transit legs. - """ - transitOnly: Boolean = false - - """ - Street mode that is used when searching for itineraries that don't use any transit. - If more than one mode is selected, at least one of them must be used but not necessarily all. - There are modes that automatically also use walking such as the rental modes. To force rental - to be used, this should only include the rental mode and not `WALK` in addition. - The default access mode is `WALK`. - """ - direct: [PlanDirectMode!] - - """ - Modes for different phases of an itinerary when transit is included. Also - includes street mode selections related to connecting to the transit network - and transfers. By default, all transit modes are usable and `WALK` is used for - access, egress and transfers. - """ - transit: PlanTransitModesInput -} - -""" -Modes for different phases of an itinerary when transit is included. Also includes street -mode selections related to connecting to the transit network and transfers. -""" -input PlanTransitModesInput { - """ - Street mode that is used when searching for access to the transit network from origin. - If more than one mode is selected, at least one of them must be used but not necessarily all. - There are modes that automatically also use walking such as the rental modes. To force rental - to be used, this should only include the rental mode and not `WALK` in addition. - The default access mode is `WALK`. - """ - access: [PlanAccessMode!] - - """ - Street mode that is used when searching for egress to destination from the transit network. - If more than one mode is selected, at least one of them must be used but not necessarily all. - There are modes that automatically also use walking such as the rental modes. To force rental - to be used, this should only include the rental mode and not `WALK` in addition. - The default access mode is `WALK`. - """ - egress: [PlanEgressMode!] - - """ - Street mode that is used when searching for transfers. Selection of only one allowed for now. - The default transfer mode is `WALK`. - """ - transfer: [PlanTransferMode!] - - """ - Transit modes and reluctances associated with them. Each defined mode can be used in - an itinerary but doesn't have to be. If direct search is not disabled, there can be an - itinerary without any transit legs. By default, all transit modes are usable. - """ - transit: [PlanTransitModePreferenceInput!] -} - -""" -Street routing preferences used for ingress, egress and transfers. These do not directly affect -the transit legs but can change how preferable walking or cycling, for example, is compared to -transit. -""" -input PlanStreetPreferencesInput { - """ - Cycling related preferences. - """ - bicycle: BicyclePreferencesInput - - """ - Scooter (kick or electrical) related preferences. - """ - scooter: ScooterPreferencesInput - - """ - Car related preferences. These are not used for car travel as part of transit, such as - taxi travel. - """ - car: CarPreferencesInput - - """ - Walk related preferences. These are not used when walking a bicycle or a scooter as they - have their own preferences. - """ - walk: WalkPreferencesInput -} - -""" -Relative importances of optimization factors. Only effective for bicycling legs. -Invariant: `timeFactor + slopeFactor + safetyFactor == 1` -""" -input InputTriangle { - """Relative importance of safety""" - safetyFactor: Float - - """Relative importance of flat terrain""" - slopeFactor: Float - - """Relative importance of duration""" - timeFactor: Float -} - -""" -Relative importance of optimization factors. Only effective for bicycling legs. -Invariant: `safety + flatness + time == 1` -""" -input TriangleCyclingFactorsInput { - """ - Relative importance of cycling safety, but this factor can also include other - concerns such as convenience and general cyclist preferences by taking into account - road surface etc. - """ - safety: Ratio! - - """Relative importance of flat terrain""" - flatness: Ratio! - - """Relative importance of duration""" - time: Ratio! -} - -""" -Relative importance of optimization factors. Only effective for scooter legs. -Invariant: `safety + flatness + time == 1` -""" -input TriangleScooterFactorsInput { - """ - Relative importance of scooter safety, but this factor can also include other - concerns such as convenience and general scooter preferences by taking into account - road surface etc. - """ - safety: Ratio! - - """Relative importance of flat terrain""" - flatness: Ratio! - - """Relative importance of duration""" - time: Ratio! -} - -input InputUnpreferred { - """A comma-separated list of ids of the routes unpreferred by the user.""" - routes: String - - """A comma-separated list of ids of the agencies unpreferred by the user.""" - agencies: String - - """ - An cost function used to calculate penalty for an unpreferred route/agency. Function should return - number of seconds that we are willing to wait for unpreferred route/agency. - String must be of the format: - `A + B x`, where A is fixed penalty and B is a multiplier of transit leg travel time x. - For example: `600 + 2.0 x` - """ - unpreferredCost: String - - """ - Penalty added for using route that is unpreferred, i.e. number of seconds that we are willing to - wait for route that is unpreferred. - - Deprecated: Use `unpreferredCost` instead. - """ - useUnpreferredRoutesPenalty: Int @deprecated(reason: "Use unpreferredCost instead") -} - -enum RoutingErrorCode { - """ - No transit connection was found between the origin and destination within the operating day or - the next day, not even sub-optimal ones. - """ - NO_TRANSIT_CONNECTION - - """ - A transit connection was found, but it was outside the search window. See the metadata for a token - for retrieving the result outside the search window. - """ - NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW - - """ - The date specified is outside the range of data currently loaded into the system as it is too - far into the future or the past. - - The specific date range of the system is configurable by an administrator and also depends on - the input data provided. - """ - OUTSIDE_SERVICE_PERIOD - - """ - The coordinates are outside the geographic bounds of the transit and street data currently loaded - into the system and therefore cannot return any results. - """ - OUTSIDE_BOUNDS - - """ - The specified location is not close to any streets or transit stops currently loaded into the - system, even though it is generally within its bounds. - - This can happen when there is only transit but no street data coverage at the location in - question. - """ - LOCATION_NOT_FOUND - - """ - No stops are reachable from the start or end locations specified. - - You can try searching using a different access or egress mode, for example cycling instead of walking, - increase the walking/cycling/driving speed or have an administrator change the system's configuration - so that stops further away are considered. - """ - NO_STOPS_IN_RANGE - - """ - Transit connections were requested and found but because it is easier to just walk all the way - to the destination they were removed. - - If you want to still show the transit results, you need to make walking less desirable by - increasing the walk reluctance. - """ - WALKING_BETTER_THAN_TRANSIT -} - -enum InputField { - DATE_TIME - FROM - TO -} - -"""Description of the reason, why the planner did not return any results""" -type RoutingError { - """An enum describing the reason""" - code: RoutingErrorCode! - - """An enum describing the field which should be changed, in order for the search to succeed""" - inputField: InputField - - """A textual description of why the search failed. The clients are expected to have their own translations based on the code, for user visible error messages.""" - description: String! -} - -"Category of riders a fare product applies to, for example students or pensioners." -type RiderCategory { - "ID of the category" - id: String! - "Human readable name of the category." - name: String -} - -""" -A 'medium' that a fare product applies to, for example cash, 'Oyster Card' or 'DB Navigator App'. -""" -type FareMedium { - "ID of the medium" - id: String! - "Human readable name of the medium." - name: String -} - -"A container for both a fare product (a ticket) and its relationship to the itinerary." -type FareProductUse { - """ - Represents the use of a single instance of a fare product throughout the itinerary. It can - be used to cross-reference and de-duplicate fare products that are applicable for more than one - leg. - - If you want to uniquely identify the fare product itself (not its use) use the product's `id`. - - ### Example: Day pass - - The day pass is valid for both legs in the itinerary. It is listed as the applicable `product` for each leg, - and the same FareProductUse id is shown, indicating that only one pass was used/bought. - - **Illustration** - ```yaml - itinerary: - leg1: - fareProducts: - id: "AAA" // id of a FareProductUse instance - product: - id: "day-pass" // product id - name: "Day Pass" - leg2: - fareProducts: - id: "AAA" // identical to leg1. the passenger needs to buy ONE pass, not two. - product: - id: "day-pass" // product id - name: "Day Pass" - ``` - - **It is the responsibility of the API consumers to display the day pass as a product for the - entire itinerary rather than two day passes!** - - ### Example: Several single tickets - - If you have two legs and need to buy two single tickets they will appear in each leg with the - same `FareProduct.id` but different `FareProductUse.id`. - - **Illustration** - ```yaml - itinerary: - leg1: - fareProducts: - id: "AAA" // id of a FareProductUse instance, not product id - product: - id: "single-ticket" // product id - name: "Single Ticket" - leg2: - fareProducts: - id: "BBB" // different to leg1. the passenger needs to buy two single tickets. - product: - id: "single-ticket" // product id - name: "Single Ticket" - ``` - - """ - id: String! - - "The purchasable fare product" - product: FareProduct -} - -"A fare product (a ticket) to be bought by a passenger" -interface FareProduct { - "Identifier for the fare product." - id: String! - - """ - Human readable name of the product, for example example "Day pass" or "Single ticket". - """ - name: String! - - "The category of riders this product applies to, for example students or pensioners." - riderCategory: RiderCategory - - """ - The 'medium' that this product applies to, for example "Oyster Card" or "Berlin Ticket App". - - This communicates to riders that a specific way of buying or keeping this product is required. - """ - medium: FareMedium -} - -""" -The standard case of a fare product: it only has a single price to be paid by the passenger -and no discounts are applied. -""" -type DefaultFareProduct implements FareProduct { - "Identifier for the fare product." - id: String! - - """ - Human readable name of the product, for example example "Day pass" or "Single ticket". - """ - name: String! - - "The price of the product" - price: Money! - - "The category of riders this product applies to, for example students or pensioners." - riderCategory: RiderCategory - - """ - The 'medium' that this product applies to, for example "Oyster Card" or "Berlin Ticket App". - - This communicates to riders that a specific way of buying or keeping this product is required. - """ - medium: FareMedium -} - -type Itinerary { - "Time when the user leaves from the origin." - start: OffsetDateTime - - "Time when the user leaves arrives at the destination." - end: OffsetDateTime - - """Duration of the trip on this itinerary, in seconds.""" - duration: Long - - """Generalized cost of the itinerary. Used for debugging search results.""" - generalizedCost: Int - - """How much time is spent waiting for transit to arrive, in seconds.""" - waitingTime: Long - - """How much time is spent walking, in seconds.""" - walkTime: Long - - """How far the user has to walk, in meters.""" - walkDistance: Float - - """Emissions of this itinerary per traveler.""" - emissionsPerPerson: Emissions - - """ - A list of Legs. Each Leg is either a walking (cycling, car) portion of the - itinerary, or a transit leg on a particular vehicle. So a itinerary where the - user walks to the Q train, transfers to the 6, then walks to their - destination, has four legs. - """ - legs: [Leg]! - - """ - How much elevation is gained, in total, over the course of the itinerary, in meters. - """ - elevationGained: Float - - """ - How much elevation is lost, in total, over the course of the itinerary, in meters. - """ - elevationLost: Float - - """ - Does the itinerary end without dropping off the rented bicycle: - """ - arrivedAtDestinationWithRentedBicycle: Boolean - - """ - A list of system notices. Contains debug information for itineraries. - One use-case is to run a routing search with 'debugItineraryFilter: true'. - This will then tag itineraries instead of removing them from the result. - This make it possible to inspect the itinerary-filter-chain. - """ - systemNotices: [SystemNotice]! - - """ - Computes a numeric accessibility score between 0 and 1. - - The closer the value is to 1 the better the wheelchair-accessibility of this itinerary is. - A value of `null` means that no score has been computed, not that the leg is inaccessible. - - More information is available in the [feature documentation](https://docs.opentripplanner.org/en/dev-2.x/sandbox/IBIAccessibilityScore/). - """ - accessibilityScore: Float - - """ - How many transfers are part of this itinerary. - - Notes: - - Interlined/stay-seated transfers do not increase this count. - - Transferring from a flex to a fixed schedule trip and vice versa increases this count. - """ - numberOfTransfers: Int! - - # - # deprecated fields - # - - """ - Information about the fares for this itinerary. This is primarily a GTFS Fares V1 interface - and always returns an empty list. Use the leg's `fareProducts` instead. - """ - fares: [fare] @deprecated(reason: "Use the leg's `fareProducts`.") - - """ - Time when the user leaves from the origin. Format: Unix timestamp in milliseconds. - """ - startTime: Long @deprecated(reason: "Use `start` instead which includes timezone information.") - - """ - Time when the user arrives to the destination. Format: Unix timestamp in milliseconds. - """ - endTime: Long @deprecated(reason: "Use `end` instead which includes timezone information.") -} - -"A currency" -type Currency { - "ISO-4217 currency code, for example `USD` or `EUR`." - code: String! - """ - Fractional digits of this currency. A value of 2 would express that in this currency - 100 minor units make up one major unit. - - Expressed more concretely: 100 Euro-cents make up one Euro. - - Note: Some currencies don't even have any fractional digits, for example the Japanese Yen. - - See also https://en.wikipedia.org/wiki/ISO_4217#Minor_unit_fractions - """ - digits: Int! -} - -"An amount of money." -type Money { - "The currency of this money amount." - currency: Currency! - """ - Money in the major currency unit, so 3.10 USD is represented as `3.1`. - - If you want to get the minor currency unit (310 cents), multiply with - (10 to the power of `currency.digits`). - """ - amount: Float! -} - -""" -An ISO-8601-formatted duration, i.e. `PT2H30M` for 2 hours and 30 minutes. - -Negative durations are formatted like `-PT10M`. -""" -scalar Duration @specifiedBy(url:"https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)") - -type RideHailingProvider { - "The ID of the ride hailing provider." - id: String! -} - -"An estimate for a ride on a hailed vehicle, like an Uber car." -type RideHailingEstimate { - "The provider of the ride hailing service." - provider: RideHailingProvider! - "The lower bound of the price estimate of this ride." - minPrice: Money! - "The upper bound of the price estimate of this ride." - maxPrice: Money! - "The estimated time it takes for the vehicle to arrive." - arrival: Duration! - "The name of the ride, ie. UberX" - productName: String -} - -""" -An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. - -ISO-8601 allows many different formats but OTP will only return the profile specified in RFC3339. -""" -scalar OffsetDateTime @specifiedBy(url: "https://www.rfcreader.com/#rfc3339") - -"Real-time estimates for a vehicle at a certain place." -type RealTimeEstimate { - time: OffsetDateTime! - """ - The delay or "earliness" of the vehicle at a certain place. - - If the vehicle is early then this is a negative duration. - """ - delay: Duration! -} - -""" -Time information about a passenger at a certain place. May contain real-time information if -available. -""" -type LegTime { - "The scheduled time of the event." - scheduledTime: OffsetDateTime! - "The estimated time of the event. If no real-time information is available, this is null." - estimated: RealTimeEstimate -} - -type Leg { - - """ - The time when the leg starts including real-time information, if available. - """ - start: LegTime! - - """ - The time when the leg ends including real-time information, if available. - """ - end: LegTime! - - """The mode (e.g. `WALK`) used when traversing this leg.""" - mode: Mode - - """The leg's duration in seconds""" - duration: Float - - """Generalized cost of the leg. Used for debugging search results.""" - generalizedCost: Int - - """The leg's geometry.""" - legGeometry: Geometry - - """ - For transit legs, the transit agency that operates the service used for this leg. For non-transit legs, `null`. - """ - agency: Agency - - """Whether there is real-time data about this Leg""" - realTime: Boolean - - """State of real-time data""" - realtimeState: RealtimeState - - """The distance traveled while traversing the leg in meters.""" - distance: Float - - """Whether this leg is a transit leg or not.""" - transitLeg: Boolean - - "Whether this leg is walking with a bike." - walkingBike: Boolean - - """Whether this leg is traversed with a rented bike.""" - rentedBike: Boolean - - """The Place where the leg originates.""" - from: Place! - - """The Place where the leg ends.""" - to: Place! - - """ - For transit legs, the route that is used for traversing the leg. For non-transit legs, `null`. - """ - route: Route - - """ - For transit legs, the trip that is used for traversing the leg. For non-transit legs, `null`. - """ - trip: Trip - - """ - For transit legs, the service date of the trip. Format: YYYYMMDD. For non-transit legs, null. - """ - serviceDate: String - - """ - For transit legs, intermediate stops between the Place where the leg - originates and the Place where the leg ends. For non-transit legs, null. - """ - intermediateStops: [Stop] - - """ - For transit legs, intermediate stops between the Place where the leg - originates and the Place where the leg ends. For non-transit legs, null. - Returns Place type, which has fields for e.g. departure and arrival times - """ - intermediatePlaces: [Place] - - """ - Whether the destination of this leg (field `to`) is one of the intermediate places specified in the query. - """ - intermediatePlace: Boolean - - "The turn-by-turn navigation instructions." - steps: [step] - - """ - For transit legs, the headsign that the vehicle shows at the stop where the passenger boards. - For non-transit legs, null. - """ - headsign: String - - """ - This is used to indicate if boarding this leg is possible only with special arrangements. - """ - pickupType: PickupDropoffType - - """ - This is used to indicate if alighting from this leg is possible only with special arrangements. - """ - dropoffType: PickupDropoffType - - """ - Interlines with previous leg. - This is true when the same vehicle is used for the previous leg as for this leg - and passenger can stay inside the vehicle. - """ - interlineWithPreviousLeg: Boolean - - """ - Special booking information for the drop off stop of this leg if, for example, it needs - to be booked in advance. This could be due to a flexible or on-demand service. - """ - dropOffBookingInfo: BookingInfo - - """ - Special booking information for the pick up stop of this leg if, for example, it needs - to be booked in advance. This could be due to a flexible or on-demand service. - """ - pickupBookingInfo: BookingInfo - - """Applicable alerts for this leg.""" - alerts: [Alert] - - """ - Future legs with same origin and destination stops or stations - """ - nextLegs( - """ - The number of alternative legs searched. If fewer than the requested number are found, - then only the found legs are returned. - """ - numberOfLegs: Int! - - """ - Transportation modes for which all stops in the parent station are used as possible origin stops - for the next legs. For modes not listed, only the exact origin stop of the leg is considered. - """ - originModesWithParentStation: [TransitMode!] - - """ - Transportation modes for which all stops in the parent station are used as possible destination stops - for the next legs. For modes not listed, only the exact destination stop of the leg is considered. - """ - destinationModesWithParentStation: [TransitMode!] - - ): [Leg!] - - "Estimate of a hailed ride like Uber." - rideHailingEstimate: RideHailingEstimate - - """ - Computes a numeric accessibility score between 0 and 1. - - The closer the value is to 1 the better the wheelchair-accessibility of this leg is. - A value of `null` means that no score has been computed, not that the itinerary is inaccessible. - - More information is available in the [feature documentation](https://docs.opentripplanner.org/en/dev-2.x/sandbox/IBIAccessibilityScore/). - """ - accessibilityScore: Float - - """ - Fare products are purchasable tickets which may have an optional fare container or rider - category that limits who can buy them or how. - - Please read the documentation of `id` very carefully to learn how a single fare product - that applies to multiple legs can appear several times. - """ - fareProducts: [FareProductUse] - - """ - The date and time when this leg begins. Format: Unix timestamp in milliseconds. - """ - startTime: Long @deprecated(reason: "Use `start.estimated.time` instead which contains timezone information.") - - """ - The date and time when this leg ends. Format: Unix timestamp in milliseconds. - """ - endTime: Long @deprecated(reason: "Use `end.estimated.time` instead which contains timezone information.") - - """ - For transit leg, the offset from the scheduled departure time of the boarding - stop in this leg, i.e. scheduled time of departure at boarding stop = - `startTime - departureDelay` - """ - departureDelay: Int @deprecated(reason: "Use `end.estimated.delay` instead.") - - """ - For transit leg, the offset from the scheduled arrival time of the alighting - stop in this leg, i.e. scheduled time of arrival at alighting stop = `endTime - - arrivalDelay` - """ - arrivalDelay: Int @deprecated(reason: "Use `start.estimated.delay` instead.") - -} - -"""A span of time.""" -type LocalTimeSpan { - """The start of the time timespan as seconds from midnight.""" - from: Int! - - """The end of the timespan as seconds from midnight.""" - to: Int! -} - -"""A date using the local timezone of the object that can contain timespans.""" -type LocalTimeSpanDate { - """The time spans for this date.""" - timeSpans: [LocalTimeSpan] - - """The date of this time span. Format: YYYYMMDD.""" - date: String! -} - -"""Identifies whether this stop represents a stop or station.""" -enum LocationType { - """A location where passengers board or disembark from a transit vehicle.""" - STOP - - """A physical structure or area that contains one or more stop.""" - STATION - ENTRANCE -} -"""Long type""" -scalar Long - -enum Mode { - """AIRPLANE""" - AIRPLANE - - """BICYCLE""" - BICYCLE - - """BUS""" - BUS - - """CABLE_CAR""" - CABLE_CAR - - """CAR""" - CAR - - """COACH""" - COACH - - """FERRY""" - FERRY - - """Enables flexible transit for access and egress legs""" - FLEX - - """Enables flexible transit for access and egress legs""" - FLEXIBLE @deprecated(reason: "Use FLEX instead") - - """FUNICULAR""" - FUNICULAR - - """GONDOLA""" - GONDOLA - - """Only used internally. No use for API users.""" - LEG_SWITCH @deprecated - - """RAIL""" - RAIL - - """SCOOTER""" - SCOOTER - - """SUBWAY""" - SUBWAY - - """TRAM""" - TRAM - - """Private car trips shared with others.""" - CARPOOL - - """A taxi, possibly operated by a public transport agency.""" - TAXI - - """A special transport mode, which includes all public transport.""" - TRANSIT - - """WALK""" - WALK - - "Electric buses that draw power from overhead wires using poles." - TROLLEYBUS - - "Railway in which the track consists of a single rail or a beam." - MONORAIL -} - -""" -Transit modes include modes that are used within organized transportation networks -run by public transportation authorities, taxi companies etc. -Equivalent to GTFS route_type or to NeTEx TransportMode. -""" -enum TransitMode { - AIRPLANE - - BUS - - CABLE_CAR - - COACH - - FERRY - - FUNICULAR - - GONDOLA - - """ - This includes long or short distance trains. - """ - RAIL - - """ - Subway or metro, depending on the local terminology. - """ - SUBWAY - - TRAM - - """Private car trips shared with others.""" - CARPOOL - - """A taxi, possibly operated by a public transport agency.""" - TAXI - - "Electric buses that draw power from overhead wires using poles." - TROLLEYBUS - - "Railway in which the track consists of a single rail or a beam." - MONORAIL -} - -"""An object with an ID""" -interface Node { - """The ID of an object""" - id: ID! -} - -"""Optimization type for bicycling legs""" -enum OptimizeType { - """Prefer faster routes""" - QUICK - - """ - Prefer safer routes, i.e. avoid crossing streets and use bike paths when possible - """ - SAFE - - """Prefer flat terrain""" - FLAT - - """GREENWAYS""" - GREENWAYS - - """ - **TRIANGLE** optimization type can be used to set relative preferences of optimization factors. See argument `triangle`. - """ - TRIANGLE -} - -"""Information about pagination in a connection.""" -type PageInfo { - """When paginating forwards, are there more items?""" - hasNextPage: Boolean! - - """When paginating backwards, are there more items?""" - hasPreviousPage: Boolean! - - """When paginating backwards, the cursor to continue.""" - startCursor: String - - """When paginating forwards, the cursor to continue.""" - endCursor: String -} - -""" -Information about pagination in a connection. Part of the -[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). -""" -type PlanPageInfo { - """When paginating forwards, are there more items?""" - hasNextPage: Boolean! - - """When paginating backwards, are there more items?""" - hasPreviousPage: Boolean! - - """When paginating backwards, the cursor to continue.""" - startCursor: String - - """When paginating forwards, the cursor to continue.""" - endCursor: String - - """The search window that was used for the search in the current page.""" - searchWindowUsed: Duration -} - -""" -Street modes that can be used for access to the transit network from origin. -""" -enum PlanAccessMode { - """ - Cycling to a stop and boarding a vehicle with the bicycle. - Note, this can include walking when it's needed to walk the bicycle. - Access can use cycling only if the mode used for transfers - and egress is also `BICYCLE`. - """ - BICYCLE - - """ - Bicycle rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, access will include only walking. Also, this - can include walking before picking up or after dropping off the - bicycle or when it's needed to walk the bicycle. - """ - BICYCLE_RENTAL - - """ - Starting the itinerary with a bicycle and parking the bicycle to - a parking location. Note, this can include walking after parking - the bicycle or when it's needed to walk the bicycle. - """ - BICYCLE_PARKING - - """ - Car rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, access will include only walking. Also, this - can include walking before picking up or after dropping off the - car. - """ - CAR_RENTAL - - """ - Starting the itinerary with a car and parking the car to a parking location. - Note, this can include walking after parking the car. - """ - CAR_PARKING - - """ - Getting dropped off by a car to a location that is accessible with a car. - Note, this can include walking after the drop-off. - """ - CAR_DROP_OFF - - """ - Flexible transit. This can include different forms of flexible transit that - can be defined in GTFS-Flex or in Netex. Note, this can include walking before - or after the flexible transit leg. - """ - FLEX - - """ - Scooter rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, access will include only walking. Also, this - can include walking before picking up or after dropping off the - scooter. - """ - SCOOTER_RENTAL - - """ - Walking to a stop. - """ - WALK -} - -""" -Street mode that is used when searching for itineraries that don't use any transit. -""" -enum PlanDirectMode { - """ - Cycling from the origin to the destination. Note, this can include walking - when it's needed to walk the bicycle. - """ - BICYCLE - - """ - Bicycle rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, itinerary will include only walking. - Also, it can include walking before picking up or after dropping off the - bicycle or when it's needed to walk the bicycle. - """ - BICYCLE_RENTAL - - """ - Starting the itinerary with a bicycle and parking the bicycle to - a parking location. Note, this can include walking after parking - the bicycle or when it's needed to walk the bicycle. - """ - BICYCLE_PARKING - - """ - Driving a car from the origin to the destination. - """ - CAR - - """ - Car rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, itinerary will include only walking. Also, this - can include walking before picking up or after dropping off the - car. - """ - CAR_RENTAL - - """ - Starting the itinerary with a car and parking the car to a parking location. - Note, this can include walking after parking the car. - """ - CAR_PARKING - - """ - Flexible transit. This can include different forms of flexible transit that - can be defined in GTFS-Flex or in Netex. Note, this can include walking before - or after the flexible transit leg. - """ - FLEX - - """ - Scooter rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, itinerary will include only walking. Also, this - can include walking before picking up or after dropping off the - scooter. - """ - SCOOTER_RENTAL - - """ - Walking from the origin to the destination. Note, this can include walking - when it's needed to walk the bicycle. - """ - WALK -} - -""" -Street modes that can be used for egress from the transit network to destination. -""" -enum PlanEgressMode { - """ - Cycling from a stop to the destination. Note, this can include walking when - it's needed to walk the bicycle. Egress can use cycling only if the mode used - for access and transfers is also `BICYCLE`. - """ - BICYCLE - - """ - Bicycle rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, egress will include only walking. Also, this - can include walking before picking up or after dropping off the - bicycle or when it's needed to walk the bicycle. - """ - BICYCLE_RENTAL - - """ - Car rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, egress will include only walking. Also, this - can include walking before picking up or after dropping off the - car. - """ - CAR_RENTAL - - """ - Getting picked up by a car from a location that is accessible with a car. - Note, this can include walking before the pickup. - """ - CAR_PICKUP - - """ - Flexible transit. This can include different forms of flexible transit that - can be defined in GTFS-Flex or in Netex. Note, this can include walking before - or after the flexible transit leg. - """ - FLEX - - """ - Scooter rental can use either station based systems or "floating" - vehicles which are not linked to a rental station. Note, if there are no - rental options available, egress will include only walking. Also, this - can include walking before picking up or after dropping off the - scooter. - """ - SCOOTER_RENTAL - - """ - Walking from a stop to the destination. - """ - WALK -} - -enum PlanTransferMode { - """ - Cycling between transit vehicles (typically between stops). Note, this can - include walking when it's needed to walk the bicycle. Transfers can only use - cycling if the mode used for access and egress is also `BICYCLE`. - """ - BICYCLE - - """ - Walking between transit vehicles (typically between stops). - """ - WALK -} - -"""Real-time vehicle position""" -type VehiclePosition { - """Feed-scoped ID that uniquely identifies the vehicle in the format FeedId:VehicleId""" - vehicleId: String, - """Human-readable label of the vehicle, eg. a publicly visible number or a license plate""" - label: String - """Latitude of the vehicle""" - lat: Float - """Longitude of the vehicle""" - lon: Float - """The current stop where the vehicle will be or is currently arriving.""" - stopRelationship: StopRelationship - """Speed of the vehicle in meters/second""" - speed: Float - """ - Bearing, in degrees, clockwise from North, i.e., 0 is North and 90 is East. This can be the - compass bearing, or the direction towards the next stop or intermediate location. - """ - heading: Float - """When the position of the vehicle was recorded in seconds since the UNIX epoch.""" - lastUpdated: Long - """Which trip this vehicles runs on.""" - trip: Trip! -} - -"""Upcoming or current stop and how close the vehicle is to it.""" -type StopRelationship { - """How close the vehicle is to `stop`""" - status: VehicleStopStatus! - stop: Stop! -} - -"""How close the vehicle is to the stop.""" -enum VehicleStopStatus { - """ - The vehicle is standing at the stop. - """ - STOPPED_AT, - """ - The vehicle has departed the previous stop and is in transit. - """ - IN_TRANSIT_TO, - """ - The vehicle is just about to arrive at the stop (on a stop display, the vehicle symbol typically flashes). - """ - INCOMING_AT -} - -""" -Pattern is sequence of stops used by trips on a specific direction and variant -of a route. Most routes have only two patterns: one for outbound trips and one -for inbound trips -""" -type Pattern implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """The route this pattern runs on""" - route: Route! - - """ - Direction of the pattern. Possible values: 0, 1 or -1. - -1 indicates that the direction is irrelevant, i.e. the route has patterns only in one direction. - """ - directionId: Int - - """ - Name of the pattern. Pattern name can be just the name of the route or it can - include details of destination and origin stops. - """ - name: String - - """ID of the pattern""" - code: String! - - """Vehicle headsign used by trips of this pattern""" - headsign: String - - """Trips which run on this pattern""" - trips: [Trip!] - - """Trips which run on this pattern on the specified date""" - tripsForDate( - """Return trips of the pattern active on this date. Format: YYYYMMDD""" - serviceDate: String - ): [Trip!] - - """List of stops served by this pattern""" - stops: [Stop!] - geometry: [Coordinates] - - """ - Coordinates of the route of this pattern in Google polyline encoded format - """ - patternGeometry: Geometry - - """ - Hash code of the pattern. This value is stable and not dependent on the - pattern id, i.e. this value can be used to check whether two patterns are the - same, even if their ids have changed. - """ - semanticHash: String - - """ - By default, list of alerts which have directly an effect on just the pattern. - It's also possible to return other relevant alerts through defining types. - """ - alerts( - """ - Returns alerts for these types that are relevant for the pattern. - By default, list of alerts which have directly an effect on just the pattern. - """ - types: [PatternAlertType] - ): [Alert] - - """ - Real-time updated position of vehicles that are serving this pattern. - """ - vehiclePositions: [VehiclePosition!] - - """Original Trip pattern for changed patterns""" - originalTripPattern: Pattern -} - -"""Entities, which are relevant for a pattern and can contain alerts""" -enum PatternAlertType { - """Alerts affecting the pattern""" - PATTERN - - """Alerts affecting the pattern's route's agency""" - AGENCY - - """Alerts affecting the route that the pattern runs on""" - ROUTE - - """Alerts affecting the route type of the route that the pattern runs on""" - ROUTE_TYPE - - """Alerts affecting the trips which run on this pattern""" - TRIPS - - """Alerts affecting the stops which are on this pattern""" - STOPS_ON_PATTERN - - """Alerts affecting the stops of the trips which run on this pattern""" - STOPS_ON_TRIPS -} - -enum PickupDropoffType { - """Regularly scheduled pickup / drop off.""" - SCHEDULED - - """No pickup / drop off available.""" - NONE - - """Must phone agency to arrange pickup / drop off.""" - CALL_AGENCY - - """Must coordinate with driver to arrange pickup / drop off.""" - COORDINATE_WITH_DRIVER -} - -"Contact information for booking an on-demand or flexible service." -type ContactInfo { - "Name of the person to contact" - contactPerson: String - "Phone number to contact" - phoneNumber: String - "Email to contact" - eMail: String - "Fax number to contact" - faxNumber: String - "URL containing general information about the service" - infoUrl: String - "URL to the booking systems of the service" - bookingUrl: String - "Additional notes about the contacting the service provider" - additionalDetails: String -} - -"Temporal restriction for a booking" -type BookingTime { - "Time of the booking" - time: String - "How many days before the booking" - daysPrior: Int -} - -""" -Booking information for a stop time which has special requirements to use, like calling ahead or -using an app. -""" -type BookingInfo { - "Contact information for reaching the service provider" - contactInfo: ContactInfo - "When is the earliest time the service can be booked." - earliestBookingTime: BookingTime - "When is the latest time the service can be booked" - latestBookingTime: BookingTime - "Minimum number of seconds before travel to make the request" - minimumBookingNoticeSeconds: Long - "Maximum number of seconds before travel to make the request" - maximumBookingNoticeSeconds: Long - "A general message for those booking the service" - message: String - "A message specific to the pick up" - pickupMessage: String - "A message specific to the drop off" - dropOffMessage: String -} - -""" -What criteria should be used when optimizing a cycling route. -""" -input CyclingOptimizationInput @oneOf { - """ - Use one of the predefined optimization types. - """ - type: CyclingOptimizationType - - """ - Define optimization by weighing three criteria. - """ - triangle: TriangleCyclingFactorsInput -} - -""" -Predefined optimization alternatives for bicycling routing. For more customization, -one can use the triangle factors. -""" -enum CyclingOptimizationType { - """ - Search for routes with the shortest duration while ignoring the cycling safety - of the streets (the routes should still follow local regulations). Routes can include - steep streets, if they are the fastest alternatives. This option was previously called - `QUICK`. - """ - SHORTEST_DURATION - - """ - Emphasize flatness over safety or duration of the route. This option was previously called `FLAT`. - """ - FLAT_STREETS - - """ - Emphasize cycling safety over flatness or duration of the route. Safety can also include other - concerns such as convenience and general cyclist preferences by taking into account - road surface etc. This option was previously called `SAFE`. - """ - SAFE_STREETS - - """ - Completely ignore the elevation differences and prefer the streets, that are evaluated - to be the safest, even more than with the `SAFE_STREETS` option. - Safety can also include other concerns such as convenience and general cyclist preferences - by taking into account road surface etc. This option was previously called `GREENWAYS`. - """ - SAFEST_STREETS -} - -""" -What criteria should be used when optimizing a scooter route. -""" -input ScooterOptimizationInput @oneOf { - """ - Use one of the predefined optimization types. - """ - type: ScooterOptimizationType - - """ - Define optimization by weighing three criteria. - """ - triangle: TriangleScooterFactorsInput -} - -""" -Predefined optimization alternatives for scooter routing. For more customization, -one can use the triangle factors. -""" -enum ScooterOptimizationType { - """ - Search for routes with the shortest duration while ignoring the scooter safety - of the streets. The routes should still follow local regulations, but currently scooters - are only allowed on the same streets as bicycles which might not be accurate for each country - or with different types of scooters. Routes can include steep streets, if they are - the fastest alternatives. This option was previously called `QUICK`. - """ - SHORTEST_DURATION - - """ - Emphasize flatness over safety or duration of the route. This option was previously called `FLAT`. - """ - FLAT_STREETS - - """ - Emphasize scooter safety over flatness or duration of the route. Safety can also include other - concerns such as convenience and general preferences by taking into account road surface etc. - Note, currently the same criteria is used both for cycling and scooter travel to determine how - safe streets are for cycling or scooter. This option was previously called `SAFE`. - """ - SAFE_STREETS - - """ - Completely ignore the elevation differences and prefer the streets, that are evaluated - to be safest for scooters, even more than with the `SAFE_STREETS` option. - Safety can also include other concerns such as convenience and general preferences by taking - into account road surface etc. Note, currently the same criteria is used both for cycling and - scooter travel to determine how safe streets are for cycling or scooter. - This option was previously called `GREENWAYS`. - """ - SAFEST_STREETS -} - -""" -Speed in meters per seconds. Values are positive floating point numbers (for example, 2.34). -""" -scalar Speed - -"The board/alight position in between two stops of the pattern of a trip with continuous pickup/drop off." -type PositionBetweenStops { - "Position of the previous stop in the pattern. Positions are not required to start from 0 or be consecutive." - previousPosition: Int - "Position of the next stop in the pattern. Positions are not required to start from 0 or be consecutive." - nextPosition: Int -} - -"Stop position at a specific stop." -type PositionAtStop { - "Position of the stop in the pattern. Positions are not required to start from 0 or be consecutive." - position: Int -} - -union StopPosition = PositionAtStop | PositionBetweenStops - -type Place { - """ - For transit stops, the name of the stop. For points of interest, the name of the POI. - """ - name: String - - """ - Type of vertex. (Normal, Bike sharing station, Bike P+R, Transit stop) Mostly - used for better localization of bike sharing and P+R station names - """ - vertexType: VertexType - - """Latitude of the place (WGS 84)""" - lat: Float! - - """Longitude of the place (WGS 84)""" - lon: Float! - - """ - The time the rider will arrive at the place. This also includes real-time information - if available. - """ - arrival: LegTime - - """ - The time the rider will depart the place. This also includes real-time information - if available. - """ - departure: LegTime - - """The stop related to the place.""" - stop: Stop - - """ - The position of the stop in the pattern. This is not required to start from 0 or be consecutive - any - increasing integer sequence along the stops is valid. - - The purpose of this field is to identify the stop within the pattern so it can be cross-referenced - between it and the itinerary. It is safe to cross-reference when done quickly, i.e. within seconds. - However, it should be noted that real-time updates can change the values, so don't store it for - longer amounts of time. - - Depending on the source data, this might not be the GTFS `stop_sequence` but another value, perhaps - even generated. - - The position can be either at a certain stop or in between two for trips where this is possible. - """ - stopPosition: StopPosition - - """The vehicle rental station related to the place""" - vehicleRentalStation: VehicleRentalStation - - """The rental vehicle related to the place""" - rentalVehicle: RentalVehicle - - """The vehicle parking related to the place""" - vehicleParking: VehicleParking - - """The bike rental station related to the place""" - bikeRentalStation: BikeRentalStation @deprecated(reason: "Use vehicleRentalStation and rentalVehicle instead") - - """The bike parking related to the place""" - bikePark: BikePark @deprecated(reason: "bikePark is deprecated. Use vehicleParking instead.") - - """The car parking related to the place""" - carPark: CarPark @deprecated(reason: "carPark is deprecated. Use vehicleParking instead.") - - """ - The time the rider will arrive at the place. Format: Unix timestamp in milliseconds. - """ - arrivalTime: Long! @deprecated(reason: "Use `arrival` which includes timezone information.") - - """ - The time the rider will depart the place. Format: Unix timestamp in milliseconds. - """ - departureTime: Long! @deprecated(reason: "Use `departure` which includes timezone information.") -} - -type placeAtDistance implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - place: PlaceInterface - - """Walking distance to the place along streets and paths""" - distance: Int -} - -"""A connection to a list of items.""" -type placeAtDistanceConnection { - edges: [placeAtDistanceEdge] - pageInfo: PageInfo! -} - -"""An edge in a connection.""" -type placeAtDistanceEdge { - """The item at the end of the edge""" - node: placeAtDistance - cursor: String! -} - -"""Interface for places, e.g. stops, stations, parking areas..""" -interface PlaceInterface { - id: ID! - - """Latitude of the place (WGS 84)""" - lat: Float - - """Longitude of the place (WGS 84)""" - lon: Float -} - -type Plan { - """The time and date of travel. Format: Unix timestamp in milliseconds.""" - date: Long - - """The origin""" - from: Place! - - """The destination""" - to: Place! - - """A list of possible itineraries""" - itineraries: [Itinerary]! - - """A list of possible error messages as enum""" - messageEnums: [String]! - - """A list of possible error messages in cleartext""" - messageStrings: [String]! - - """A list of routing errors, and fields which caused them""" - routingErrors: [RoutingError!]! - - """ - Use the cursor to go to the next "page" of itineraries. Copy the cursor from the last response - to the pageCursor query parameter and keep the original request as is. This will enable you to - search for itineraries in the next search-window. - The cursor based paging only support stepping to the next page, as it does not support jumping. - This is only usable when public transportation mode(s) are included in the query. - """ - nextPageCursor: String - - """ - Use the cursor to go to the previous "page" of itineraries. Copy the cursor from the last - response to the pageCursor query parameter and keep the original request otherwise as is. - This will enable you to search for itineraries in the previous search-window. - The cursor based paging only support stepping to the previous page, as it does not support - jumping. - This is only usable when public transportation mode(s) are included in the query. - """ - previousPageCursor: String - - """ - This is the suggested search time for the "previous page" or time window. Insert it together - with the searchWindowUsed in the request to get a new set of trips preceding in the - search-window BEFORE the current search. No duplicate trips should be returned, unless a trip - is delayed and new real-time data is available. - """ - prevDateTime: Long @deprecated(reason: "Use previousPageCursor instead") - - """ - This is the suggested search time for the "next page" or time window. Insert it together - with the searchWindowUsed in the request to get a new set of trips following in the - search-window AFTER the current search. No duplicate trips should be returned, unless a trip - is delayed and new real-time data is available. - """ - nextDateTime: Long @deprecated(reason: "Use nextPageCursor instead") - - """ - This is the `searchWindow` used by the raptor search. It is provided here for debugging - purpousess. - - The unit is seconds. - """ - searchWindowUsed: Long - - """Information about the timings for the plan generation""" - debugOutput: debugOutput! -} - -""" -Plan (result of an itinerary search) that follows -[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). -""" -type PlanConnection { - """ - What was the starting point for the itinerary search. - """ - searchDateTime: OffsetDateTime - - """ - Errors faced during the routing search. - """ - routingErrors: [RoutingError!]! - - """ - Edges which contain the itineraries. Part of the - [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). - """ - edges: [PlanEdge] - - """ - Contains cursors to continue the search and the information if there are more itineraries available. - Part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). - """ - pageInfo: PlanPageInfo! -} - -""" -Edge outputted by a plan search. Part of the -[GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). -""" -type PlanEdge { - """ - An itinerary suggestion. Part of the - [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). - """ - node: Itinerary! - - """ - The cursor of the edge. Part of the - [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). - """ - cursor: String! -} - -""" -List of coordinates in an encoded polyline format (see -https://developers.google.com/maps/documentation/utilities/polylinealgorithm). -The value appears in JSON as a string. -""" -scalar Polyline @specifiedBy(url: "https://developers.google.com/maps/documentation/utilities/polylinealgorithm") - -""" -Additional qualifier for a transport mode. -Note that qualifiers can only be used with certain transport modes. -""" -enum Qualifier { - """The vehicle used for transport can be rented""" - RENT - - """ - ~~HAVE~~ - **Currently not used** - """ - HAVE @deprecated(reason: "Currently not used") - - """ - The vehicle used must be left to a parking area before continuing the journey. - This qualifier is usable with transport modes `CAR` and `BICYCLE`. - Note that the vehicle is only parked if the journey is continued with public - transportation (e.g. if only `CAR` and `WALK` transport modes are allowed to - be used, the car will not be parked as it is used for the whole journey). - """ - PARK - - """ - ~~KEEP~~ - **Currently not used** - """ - KEEP @deprecated(reason: "Currently not used") - - """The user can be picked up by someone else riding a vehicle""" - PICKUP - - """The user can be dropped off by someone else riding a vehicle""" - DROPOFF - - """The mode is used for the access part of the search.""" - ACCESS, - - """The mode is used for the egress part of the search.""" - EGRESS, - - """The mode is used for the direct street search.""" - DIRECT, - - """Hailing a ride, for example via an app like Uber.""" - HAIL -} - -type QueryType { - """Fetches an object given its ID""" - node( - """The ID of an object""" - id: ID! - ): Node - - """Get all available feeds""" - feeds: [Feed] - - """Get all agencies""" - agencies: [Agency] - - """Return list of available ticket types""" - ticketTypes: [TicketType] - - """ - Get a single agency based on agency ID, i.e. value of field `gtfsId` (ID format is `FeedId:StopId`) - """ - agency(id: String!): Agency - - """Get all stops""" - stops( - """Return stops with these ids""" - ids: [String] - - """Query stops by this name""" - name: String - ): [Stop] - - """Get all stops within the specified bounding box""" - stopsByBbox( - """Southern bound of the bounding box""" - minLat: Float! - - """Western bound of the bounding box""" - minLon: Float! - - """Northern bound of the bounding box""" - maxLat: Float! - - """Eastern bound of the bounding box""" - maxLon: Float! - - """List of feed ids from which stops are returned""" - feeds: [String!] - ): [Stop] - - """ - Get all stops within the specified radius from a location. The returned type - is a Relay connection (see - https://facebook.github.io/relay/graphql/connections.htm). The stopAtDistance - type has two values: stop and distance. - """ - stopsByRadius( - """Latitude of the location (WGS 84)""" - lat: Float! - - """Longitude of the location (WGS 84)""" - lon: Float! - - """ - Radius (in meters) to search for from the specified location. Note that this - is walking distance along streets and paths rather than a geographic distance. - """ - radius: Int! - - """List of feed ids from which stops are returned""" - feeds: [String!] - before: String - after: String - first: Int - last: Int - ): stopAtDistanceConnection - - """ - Get all places (stops, stations, etc. with coordinates) within the specified - radius from a location. The returned type is a Relay connection (see - https://facebook.github.io/relay/graphql/connections.htm). The placeAtDistance - type has two fields: place and distance. The search is done by walking so the - distance is according to the network of walkable streets and paths. - """ - nearest( - """Latitude of the location (WGS 84)""" - lat: Float! - - """Longitude of the location (WGS 84)""" - lon: Float! - - """ - Maximum distance (in meters) to search for from the specified location. Note - that this is walking distance along streets and paths rather than a - geographic distance. Default is 2000m - """ - maxDistance: Int = 2000 - - """ - Maximum number of results. Search is stopped when this limit is reached. Default is 20. - """ - maxResults: Int = 20 - - """ - Only return places that are one of these types, e.g. `STOP` or `VEHICLE_RENT` - """ - filterByPlaceTypes: [FilterPlaceType] - - """ - Only return places that are related to one of these transport modes. This - argument can be used to return e.g. only nearest railway stations or only - nearest places related to bicycling. - """ - filterByModes: [Mode] - - """Only include places that match one of the given GTFS ids.""" - filterByIds: InputFilters @deprecated(reason: "Not actively maintained") - before: String - after: String - first: Int - last: Int - ): placeAtDistanceConnection @async - - """ - Get a single departure row based on its ID (ID format is `FeedId:StopId:PatternId`) - """ - departureRow(id: String!): DepartureRow - - """ - Get a single stop based on its ID, i.e. value of field `gtfsId` (ID format is `FeedId:StopId`) - """ - stop(id: String!): Stop - - """ - Get a single station based on its ID, i.e. value of field `gtfsId` (format is `FeedId:StopId`) - """ - station(id: String!): Stop - - """Get all stations""" - stations( - """Only return stations that match one of the ids in this list""" - ids: [String] - - """Query stations by name""" - name: String - ): [Stop] - - """Get all routes""" - routes( - """Only return routes with these ids""" - ids: [String] - - """Only return routes with these feedIds""" - feeds: [String] - - """Query routes by this name""" - name: String - - """Only include routes, which use one of these modes""" - transportModes: [Mode] - ): [Route] - - """ - Get a single route based on its ID, i.e. value of field `gtfsId` (format is `FeedId:RouteId`) - """ - route(id: String!): Route - - """Get all trips""" - trips( - """Only return trips with these feedIds""" - feeds: [String] - ): [Trip] - - """ - Get a single trip based on its ID, i.e. value of field `gtfsId` (format is `FeedId:TripId`) - """ - trip(id: String!): Trip - - """ - Finds a trip matching the given parameters. This query type is useful if the - id of a trip is not known, but other details uniquely identifying the trip are - available from some source (e.g. MQTT vehicle positions). - """ - fuzzyTrip( - """id of the route""" - route: String! - - """ - Direction of the trip, possible values: 0, 1 or -1. - -1 indicates that the direction is irrelevant, i.e. in case the route has - trips only in one direction. See field `directionId` of Pattern. - """ - direction: Int = -1 - - """Departure date of the trip, format: YYYY-MM-DD""" - date: String! - - """ - Departure time of the trip, format: seconds since midnight of the departure date - """ - time: Int! - ): Trip - - """Get cancelled TripTimes.""" - cancelledTripTimes( - """Feed feedIds (e.g. ["HSL"]).""" - feeds: [String] - - """Route gtfsIds (e.g. ["HSL:1098"]).""" - routes: [String] - - """TripPattern codes (e.g. ["HSL:1098:1:01"]).""" - patterns: [String] - - """Trip gtfsIds (e.g. ["HSL:1098_20190405_Ma_2_1455"]).""" - trips: [String] - - """ - Only cancelled trip times scheduled to run on minDate or after are returned. Format: "2019-12-23" or "20191223". - """ - minDate: String - - """ - Only cancelled trip times scheduled to run on maxDate or before are returned. Format: "2019-12-23" or "20191223". - """ - maxDate: String - - """ - Only cancelled trip times that have first stop departure time at - minDepartureTime or after are returned. Format: seconds since midnight of minDate. - """ - minDepartureTime: Int - - """ - Only cancelled trip times that have first stop departure time at - maxDepartureTime or before are returned. Format: seconds since midnight of maxDate. - """ - maxDepartureTime: Int - - """ - Only cancelled trip times that have last stop arrival time at minArrivalTime - or after are returned. Format: seconds since midnight of minDate. - """ - minArrivalTime: Int - - """ - Only cancelled trip times that have last stop arrival time at maxArrivalTime - or before are returned. Format: seconds since midnight of maxDate. - """ - maxArrivalTime: Int - ): [Stoptime] - - """Get all patterns""" - patterns: [Pattern] - - """ - Get a single pattern based on its ID, i.e. value of field `code` (format is - `FeedId:RouteId:DirectionId:PatternVariantNumber`) - """ - pattern(id: String!): Pattern - - """Get all clusters""" - clusters: [Cluster] - - """Get a single cluster based on its ID, i.e. value of field `gtfsId`""" - cluster(id: String!): Cluster - - """Get all active alerts""" - alerts( - """Only return alerts in these feeds""" - feeds: [String!] - - """Only return alerts with these severity levels""" - severityLevel: [AlertSeverityLevelType!] - - """Only return alerts with these effects""" - effect: [AlertEffectType!] - - """Only return alerts with these causes""" - cause: [AlertCauseType!] - - """Only return alerts affecting these routes""" - route: [String!] - - """Only return alerts affecting these stops""" - stop: [String!] - ): [Alert] - - """Get the time range for which the API has data available""" - serviceTimeRange: serviceTimeRange - - """Get all bike rental stations""" - bikeRentalStations( - """ - Return bike rental stations with these ids. - **Note:** if an id is invalid (or the bike rental station service is unavailable) - the returned list will contain `null` values. - """ - ids: [String] - ): [BikeRentalStation] @deprecated(reason: "Use rentalVehicles or vehicleRentalStations instead") - - """ - Get a single bike rental station based on its ID, i.e. value of field `stationId` - """ - bikeRentalStation(id: String!): BikeRentalStation @deprecated(reason: "Use rentalVehicle or vehicleRentalStation instead") - - """Get all rental vehicles""" - rentalVehicles( - """ - Return rental vehicles with these ids, i.e. value of field `vehicleId`. - **Note:** if an id is invalid (or the rental service is unavailable) - the returned list will contain `null` values. - - If this is provided all other filters are ignored. - """ - ids: [String], - - """ - Return only rental vehicles that have this form factor. - """ - formFactors: [FormFactor] - ): [RentalVehicle] - - """ - Get a single rental vehicle based on its ID, i.e. value of field `vehicleId` - """ - rentalVehicle(id: String!): RentalVehicle - - """Get all vehicle rental stations""" - vehicleRentalStations( - """ - Return vehicle rental stations with these ids, i.e. value of field `stationId`. - **Note:** if an id is invalid (or the rental service is unavailable) - the returned list will contain `null` values. - """ - ids: [String] - ): [VehicleRentalStation] - - """ - Get a single vehicle rental station based on its ID, i.e. value of field `stationId` - """ - vehicleRentalStation(id: String!): VehicleRentalStation - - ## Deprecated fields - - """Get all bike parks""" - bikeParks: [BikePark] @deprecated(reason: "bikeParks is deprecated. Use vehicleParkings instead.") - - """ - Get a single bike park based on its ID, i.e. value of field `bikeParkId` - """ - bikePark(id: String!): BikePark @deprecated(reason: "bikePark is deprecated. Use vehicleParking instead.") - - """Get all car parks""" - carParks( - """ - Return car parks with these ids. - **Note:** if an id is invalid (or the car park service is unavailable) the returned list will contain `null` values. - """ - ids: [String] - ): [CarPark] @deprecated(reason: "carParks is deprecated. Use vehicleParkings instead.") - - """Get a single car park based on its ID, i.e. value of field `carParkId`""" - carPark(id: String!): CarPark @deprecated(reason: "carPark is deprecated. Use vehicleParking instead.") - - """Get all vehicle parkings""" - vehicleParkings( - """ - Return vehicle parkings with these ids. - **Note:** if an id is invalid (or the vehicle parking service is unavailable) - the returned list will contain `null` values. - """ - ids: [String] - ): [VehicleParking] - - """ - Get a single vehicle parking based on its ID - """ - vehicleParking(id: String!): VehicleParking - - """Needed until https://github.com/facebook/relay/issues/112 is resolved""" - viewer: QueryType - - """ - Plans an itinerary from point A to point B based on the given arguments - """ - plan( - """ - Date of departure or arrival in format YYYY-MM-DD. Default value: current date - """ - date: String - - """ - Time of departure or arrival in format hh:mm:ss. Default value: current time - """ - time: String - - """ - The geographical location where the itinerary begins. - Use either this argument or `fromPlace`, but not both. - """ - from: InputCoordinates - - """ - The geographical location where the itinerary ends. - Use either this argument or `toPlace`, but not both. - """ - to: InputCoordinates - - """ - The place where the itinerary begins in format `name::place`, where `place` - is either a lat,lng pair (e.g. `Pasila::60.199041,24.932928`) or a stop id - (e.g. `Pasila::HSL:1000202`). - Use either this argument or `from`, but not both. - """ - fromPlace: String - - """ - The place where the itinerary ends in format `name::place`, where `place` is - either a lat,lng pair (e.g. `Pasila::60.199041,24.932928`) or a stop id - (e.g. `Pasila::HSL:1000202`). - Use either this argument or `to`, but not both. - """ - toPlace: String - - """ - Whether the itinerary must be wheelchair accessible. Default value: false - """ - wheelchair: Boolean - - """The maximum number of itineraries to return. Default value: 3.""" - numItineraries: Int = 3 - - """ - The length of the search-window in seconds. This parameter is optional. - - The search-window is defined as the duration between the earliest-departure-time(EDT) and - the latest-departure-time(LDT). OTP will search for all itineraries in this departure - window. If `arriveBy=true` the `dateTime` parameter is the latest-arrival-time, so OTP - will dynamically calculate the EDT. Using a short search-window is faster than using a - longer one, but the search duration is not linear. Using a \"too\" short search-window will - waste resources server side, while using a search-window that is too long will be slow. - - OTP will dynamically calculate a reasonable value for the search-window, if not provided. - The calculation comes with a significant overhead (10-20% extra). Whether you should use the - dynamic calculated value or pass in a value depends on your use-case. For a travel planner - in a small geographical area, with a dense network of public transportation, a fixed value - between 40 minutes and 2 hours makes sense. To find the appropriate search-window, adjust - it so that the number of itineraries on average is around the wanted `numItineraries`. Make - sure you set the `numItineraries` to a high number while testing. For a country wide area - like Norway, using the dynamic search-window is the best. - - When paginating, the search-window is calculated using the `numItineraries` in the original - search together with statistics from the search for the last page. This behaviour is - configured server side, and can not be overridden from the client. - - The search-window used is returned to the response metadata as `searchWindowUsed` for - debugging purposes. - """ - searchWindow: Long, - - """ - Use the cursor to get the next or previous page of results. - The next page is a set of itineraries departing after the last itinerary in this result and - the previous page is a set of itineraries departing before the first itinerary. - This is only usable when public transportation mode(s) are included in the query. - """ - pageCursor: String - - """ - A multiplier for how bad biking is, compared to being in transit for equal - lengths of time. Default value: 2.0 - """ - bikeReluctance: Float - - """ - A multiplier for how bad walking with a bike is, compared to being in transit for equal - lengths of time. Default value: 5.0 - """ - bikeWalkingReluctance: Float - - """ - A multiplier for how bad driving is, compared to being in transit for equal - lengths of time. Default value: 3.0 - """ - carReluctance: Float - - """ - A multiplier for how bad walking is, compared to being in transit for equal - lengths of time. Empirically, values between 2 and 4 seem to correspond - well to the concept of not wanting to walk too much without asking for - totally ridiculous itineraries, but this observation should in no way be - taken as scientific or definitive. Your mileage may vary. See - https://github.com/opentripplanner/OpenTripPlanner/issues/4090 for impact on - performance with high values. Default value: 2.0 - """ - walkReluctance: Float - - """ - How much worse is waiting for a transit vehicle than being on a transit - vehicle, as a multiplier. The default value treats wait and on-vehicle time - as the same. It may be tempting to set this higher than walkReluctance (as - studies often find this kind of preferences among riders) but the planner - will take this literally and walk down a transit line to avoid waiting at a - stop. This used to be set less than 1 (0.95) which would make waiting - offboard preferable to waiting onboard in an interlined trip. That is also - undesirable. If we only tried the shortest possible transfer at each stop to - neighboring stop patterns, this problem could disappear. Default value: 1.0. - """ - waitReluctance: Float - - """ - Max walk speed along streets, in meters per second. Default value: 1.33 - """ - walkSpeed: Float - - """Max bike speed along streets, in meters per second. Default value: 5.0""" - bikeSpeed: Float - - """Time to get on and off your own bike, in seconds. Default value: 0""" - bikeSwitchTime: Int - - """ - Cost of getting on and off your own bike. Unit: seconds. Default value: 0 - """ - bikeSwitchCost: Int - - """ - Optimization type for bicycling legs, e.g. prefer flat terrain. Default value: `QUICK` - """ - optimize: OptimizeType - - """ - Triangle optimization parameters for bicycling legs. Only effective when `optimize` is set to **TRIANGLE**. - """ - triangle: InputTriangle - - """ - Whether the itinerary should depart at the specified time (false), or arrive - to the destination at the specified time (true). Default value: false. - """ - arriveBy: Boolean - - """ - List of routes and agencies which are given higher preference when planning the itinerary - """ - preferred: InputPreferred - - """ - List of routes and agencies which are given lower preference when planning the itinerary - """ - unpreferred: InputUnpreferred - - """ - This prevents unnecessary transfers by adding a cost for boarding a vehicle. Unit: seconds. Default value: 600 - """ - walkBoardCost: Int - - """ - Separate cost for boarding a vehicle with a bicycle, which is more difficult - than on foot. Unit: seconds. Default value: 600 - """ - bikeBoardCost: Int - - """ - List of routes, trips, agencies and stops which are not used in the itinerary - """ - banned: InputBanned - - """ - An extra penalty added on transfers (i.e. all boardings except the first - one). Not to be confused with bikeBoardCost and walkBoardCost, which are the - cost of boarding a vehicle with and without a bicycle. The boardCosts are - used to model the 'usual' perceived cost of using a transit vehicle, and the - transferPenalty is used when a user requests even less transfers. In the - latter case, we don't actually optimize for fewest transfers, as this can - lead to absurd results. Consider a trip in New York from Grand Army Plaza - (the one in Brooklyn) to Kalustyan's at noon. The true lowest transfers - route is to wait until midnight, when the 4 train runs local the whole way. - The actual fastest route is the 2/3 to the 4/5 at Nevins to the 6 at Union - Square, which takes half an hour. Even someone optimizing for fewest - transfers doesn't want to wait until midnight. Maybe they would be willing - to walk to 7th Ave and take the Q to Union Square, then transfer to the 6. - If this takes less than optimize_transfer_penalty seconds, then that's what - we'll return. Default value: 0. - """ - transferPenalty: Int - - """ - List of transportation modes that the user is willing to use. Default: `["WALK","TRANSIT"]` - """ - transportModes: [TransportMode] - - """ - The weight multipliers for transit modes. WALK, BICYCLE, CAR, TRANSIT and LEG_SWITCH are not included. - """ - modeWeight: InputModeWeight - - """ - Debug the itinerary-filter-chain. The filters will mark itineraries as deleted, but does NOT delete them when this is enabled. - """ - debugItineraryFilter: Boolean - - """ - Whether arriving at the destination with a rented (station) bicycle is allowed without - dropping it off. Default: false. - """ - allowKeepingRentedBicycleAtDestination: Boolean - - """ - The cost of arriving at the destination with the rented vehicle, to discourage doing so. - Default value: 0. - """ - keepingRentedBicycleAtDestinationCost: Int - - """ - Invariant: `boardSlack + alightSlack <= transferSlack`. Default value: 0 - """ - boardSlack: Int - - """ - Invariant: `boardSlack + alightSlack <= transferSlack`. Default value: 0 - """ - alightSlack: Int - - """ - A global minimum transfer time (in seconds) that specifies the minimum - amount of time that must pass between exiting one transit vehicle and - boarding another. This time is in addition to time it might take to walk - between transit stops. Default value: 0 - """ - minTransferTime: Int - - """ - Penalty (in seconds) for using a non-preferred transfer. Default value: 180 - """ - nonpreferredTransferPenalty: Int - - """Maximum number of transfers. Default value: 2""" - maxTransfers: Int - - """ - This argument has currently no effect on which itineraries are returned. Use - argument `fromPlace` to start the itinerary from a specific stop. - ~~A transit stop that this trip must start from~~ - """ - startTransitStopId: String - - """ - When false, return itineraries using canceled trips. Default value: true. - """ - omitCanceled: Boolean = true - - """ - When true, real-time updates are ignored during this search. Default value: false - """ - ignoreRealtimeUpdates: Boolean - - """ - Two-letter language code (ISO 639-1) used for returned text. - **Note:** only part of the data has translations available and names of - stops and POIs are returned in their default language. Due to missing - translations, it is sometimes possible that returned text uses a mixture of two languages. - """ - locale: String - - """ - List of ticket types that are allowed to be used in itineraries. - See `ticketTypes` query for list of possible ticket types. - """ - allowedTicketTypes: [String] - - """ - Which vehicle rental networks can be used. By default, all networks are allowed. - """ - allowedVehicleRentalNetworks: [String] - - """ - Which vehicle rental networks cannot be used. By default, all networks are allowed. - """ - bannedVehicleRentalNetworks: [String] - - """ - Factor for how much the walk safety is considered in routing. Value should be between 0 and 1. - If the value is set to be 0, safety is ignored. Default is 1.0. - """ - walkSafetyFactor: Float - - "Preferences for vehicle parking" - parking: VehicleParkingInput - - ## Deprecated fields, none of these have any effect on the routing anymore - - """ - The maximum distance (in meters) the user is willing to walk per walking - section. If the only transport mode allowed is `WALK`, then the value of - this argument is ignored. - Default: 2000m - Maximum value: 15000m - **Note:** If this argument has a relatively small value and only some - transport modes are allowed (e.g. `WALK` and `RAIL`), it is possible to get - an itinerary which has (useless) back and forth public transport legs to - avoid walking too long distances. - """ - maxWalkDistance: Float @deprecated(reason: "Does nothing. Use walkReluctance instead.") - - """ - How much more reluctant is the user to walk on streets with car traffic allowed. Default value: 1.0 - """ - walkOnStreetReluctance: Float @deprecated(reason: "Use `walkSafetyFactor` instead") - - """ - How much less bad is waiting at the beginning of the trip (replaces - `waitReluctance` on the first boarding). Default value: 0.4 - """ - waitAtBeginningFactor: Float @deprecated(reason: "Removed in OTP 2, the timetable-view replaces this functionality.") - - """ - This argument has no use for itinerary planning and will be removed later. - When true, do not use goal direction or stop at the target, build a full SPT. Default value: false. - """ - batch: Boolean @deprecated(reason: "Removed in OTP 2") - - """Is bike rental allowed? Default value: false""" - allowBikeRental: Boolean @deprecated(reason: "Rental is specified by modes") - - """ - No effect on itinerary planning, adjust argument `time` instead to get later departures. - ~~The maximum wait time in seconds the user is willing to delay trip start. Only effective in Analyst.~~ - """ - claimInitialWait: Long @deprecated(reason: "Removed in OTP 2") - - """ - **Consider this argument experimental** – setting this argument to true - causes timeouts and unoptimal routes in many cases. - When true, reverse optimize (find alternative transportation mode, which - still arrives to the destination in time) this search on the fly after - processing each transit leg, rather than reverse-optimizing the entire path - when it's done. Default value: false. - """ - reverseOptimizeOnTheFly: Boolean @deprecated(reason: "Removed in OTP 2") - - """ - If true, the remaining weight heuristic is disabled. Currently only - implemented for the long distance path service. - """ - disableRemainingWeightHeuristic: Boolean @deprecated(reason: "Removed in OTP 2.2") - - """ - Whether legs should be compacted by performing a reversed search. - """ - compactLegsByReversedSearch: Boolean @deprecated(reason: "Removed in OTP 2") - - """ - Which vehicle rental networks can be used. By default, all networks are allowed. - """ - allowedBikeRentalNetworks: [String] @deprecated(reason: "Use allowedVehicleRentalNetworks instead") - - """ - The maximum time (in seconds) of pre-transit travel when using - drive-to-transit (park and ride or kiss and ride). Default value: 1800. - """ - maxPreTransitTime: Int @deprecated(reason: "Use walkReluctance or future reluctance parameters for other modes") - - """ - How expensive it is to drive a car when car&parking, increase this value to - make car driving legs shorter. Default value: 1. - """ - carParkCarLegWeight: Float @deprecated(reason: "Use `carReluctance` instead.") - - """Tuning parameter for the search algorithm, mainly useful for testing.""" - heuristicStepsPerMainStep: Int @deprecated(reason: "Removed. Doesn't do anything.") - - """ - How easily bad itineraries are filtered from results. Value 0 (default) - disables filtering. Itineraries are filtered if they are worse than another - one in some respect (e.g. more walking) by more than the percentage of - filtering level, which is calculated by dividing 100% by the value of this - argument (e.g. `itineraryFiltering = 0.5` → 200% worse itineraries are filtered). - """ - itineraryFiltering: Float @deprecated(reason: "Removed. Doesn't do anything.") - - """An ordered list of intermediate locations to be visited.""" - intermediatePlaces: [InputCoordinates] @deprecated(reason: "Not implemented in OTP2.") - - """ - ID of the trip on which the itinerary starts. This argument can be used to - plan itineraries when the user is already onboard a vehicle. When using this - argument, arguments `time` and `from` should be set based on a vehicle - position message received from the vehicle running the specified trip. - **Note:** this argument only takes into account the route and estimated - travel time of the trip (and therefore arguments `time` and `from` must be - used correctly to get meaningful itineraries). - """ - startTransitTripId: String @deprecated(reason: "Not implemented in OTP2") - ): Plan @async - - """ - Plan (itinerary) search that follows - [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm). - """ - planConnection( - """ - Datetime of the search. It's possible to either define the earliest departure time - or the latest arrival time. By default, earliest departure time is set as now. - """ - dateTime: PlanDateTimeInput - - """ - Duration of the search window. This either starts at the defined earliest departure - time or ends at the latest arrival time. If this is not provided, a reasonable - search window is automatically generated. When searching for earlier or later itineraries - with paging, this search window is no longer used and the new window will be based - on how many suggestions were returned in the previous search. The new search window can be - shorter or longer than the original search window. Note, itineraries are returned faster - with a smaller search window and search window limitation is done mainly for performance reasons. - - Setting this parameter makes especially sense if the transportation network is as sparse or dense - in the whole itinerary search area. Otherwise, letting the system decide what is the search window - is in combination of using paging can lead to better performance and to getting a more consistent - number of itineraries in each search. - """ - searchWindow: Duration - - """ - The origin where the search starts. Usually coordinates but can also be a stop location. - """ - origin: PlanLabeledLocationInput! - - """ - The destination where the search ends. Usually coordinates but can also be a stop location. - """ - destination: PlanLabeledLocationInput! - - """ - Street and transit modes used during the search. This also includes options to only return - an itinerary that contains no transit legs or force transit to be used in all itineraries. - By default, all transit modes are usable and `WALK` is used for direct street suggestions, - access, egress and transfers. - """ - modes: PlanModesInput - - """ - Preferences that affect what itineraries are returned. Preferences are split into categories. - """ - preferences: PlanPreferencesInput - - """ - Settings that control the behavior of itinerary filtering. These are advanced settings and - should not be set by a user through user preferences. - """ - itineraryFilter: PlanItineraryFilterInput - - """ - Locale used for translations. Note, there might not necessarily be translations available. - It's possible and recommended to use the ´accept-language´ header instead of this parameter. - """ - locale: Locale - - """ - Takes in cursor from a previous search. Used for forward pagination. If earliest departure time - is used in the original query, the new search then returns itineraries that depart after - the start time of the last itinerary that was returned, or at the same time if there are multiple - itinerary options that can depart at that moment in time. - If latest arrival time is defined, the new search returns itineraries that arrive before the end - time of the last itinerary that was returned in the previous search, or at the same time if there - are multiple itinerary options that can arrive at that moment in time. This parameter is part of - the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) and - should be used together with the `first` parameter. - """ - after: String - - """ - How many new itineraries should at maximum be returned in either the first search or with - forward pagination. This parameter is part of the - [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) - and should be used together with the `after` parameter (although `after` shouldn't be defined - in the first search). - """ - first: Int - - """ - Takes in cursor from a previous search. Used for backwards pagination. If earliest departure time - is used in the original query, the new search then returns itineraries that depart before that time. - If latest arrival time is defined, the new search returns itineraries that arrive after that time. - This parameter is part of the [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) - and should be used together with the `last` parameter. - """ - before: String - - """ - How many new itineraries should at maximum be returned in backwards pagination. It's recommended to - use the same value as was used for the `first` parameter in the original search for optimal - performance. This parameter is part of the - [GraphQL Cursor Connections Specification](https://relay.dev/graphql/connections.htm) - and should be used together with the `before` parameter. - """ - last: Int - ): PlanConnection @async @deprecated(reason: "Experimental and can include breaking changes, use plan instead") -} - -enum RealtimeState { - """ - The trip information comes from the GTFS feed, i.e. no real-time update has been applied. - """ - SCHEDULED - - """ - The trip information has been updated, but the trip pattern stayed the same as the trip pattern of the scheduled trip. - """ - UPDATED - - """The trip has been canceled by a real-time update.""" - CANCELED - - """ - The trip has been added using a real-time update, i.e. the trip was not present in the GTFS feed. - """ - ADDED - - """ - The trip information has been updated and resulted in a different trip pattern - compared to the trip pattern of the scheduled trip. - """ - MODIFIED -} - -""" -A cost multiplier for how bad something is compared to being in transit for equal lengths of time. -The value should be greater than 0. 1 means neutral and values below 1 mean that something is -preferred over transit. - -""" -scalar Reluctance - -""" -Preferences related to scooter rental (station based or floating scooter rental). -""" -input ScooterRentalPreferencesInput { - """ - Is it possible to arrive to the destination with a rented scooter and does it - come with an extra cost. - """ - destinationScooterPolicy: DestinationScooterPolicyInput - - """ - Rental networks which can be potentially used as part of an itinerary. - """ - allowedNetworks: [String!] - - """ - Rental networks which cannot be used as part of an itinerary. - """ - bannedNetworks: [String!] -} - -""" -Preferences related to car rental (station based or floating car rental). -""" -input CarRentalPreferencesInput { - """ - Rental networks which can be potentially used as part of an itinerary. - """ - allowedNetworks: [String!] - - """ - Rental networks which cannot be used as part of an itinerary. - """ - bannedNetworks: [String!] -} - -""" -Preferences related to bicycle rental (station based or floating bicycle rental). -""" -input BicycleRentalPreferencesInput { - """ - Is it possible to arrive to the destination with a rented bicycle and does it - come with an extra cost. - """ - destinationBicyclePolicy: DestinationBicyclePolicyInput - - """ - Rental networks which can be potentially used as part of an itinerary. - """ - allowedNetworks: [String!] - - """ - Rental networks which cannot be used as part of an itinerary. - """ - bannedNetworks: [String!] -} - -""" -Route represents a public transportation service, usually from point A to point -B and *back*, shown to customers under a single name, e.g. bus 550. Routes -contain patterns (see field `patterns`), which describe different variants of -the route, e.g. outbound pattern from point A to point B and inbound pattern -from point B to point A. -""" -type Route implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ID of the route in format `FeedId:RouteId`""" - gtfsId: String! - - """Agency operating the route""" - agency: Agency - - """Short name of the route, usually a line number, e.g. 550""" - shortName: String - - """Long name of the route, e.g. Helsinki-Leppävaara""" - longName( - """If translated longName is found from gtfs translation.txt and wanted language is not same as - feed's language then returns wanted translation. Otherwise uses name from routes.txt. - """ - language: String): String - - """Transport mode of this route, e.g. `BUS`""" - mode: TransitMode - - """ - The raw GTFS route type as a integer. For the list of possible values, see: - https://developers.google.com/transit/gtfs/reference/#routestxt and - https://developers.google.com/transit/gtfs/reference/extended-route-types - """ - type: Int - desc: String - url: String - - """ - The color (in hexadecimal format) the agency operating this route would prefer - to use on UI elements (e.g. polylines on a map) related to this route. This - value is not available for most routes. - """ - color: String - - """ - The color (in hexadecimal format) the agency operating this route would prefer - to use when displaying text related to this route. This value is not available - for most routes. - """ - textColor: String - bikesAllowed: BikesAllowed - - """List of patterns which operate on this route""" - patterns: [Pattern] - - """List of stops on this route""" - stops: [Stop] - - """List of trips which operate on this route""" - trips: [Trip] - - """ - List of alerts which have an effect on the route directly or indirectly. - By default only alerts directly affecting this route are returned. It's also possible - to return other relevant alerts through defining types. - """ - alerts( - """ - Returns alerts for these types that are relevant for the route. - By default only returns alerts that directly affect this route. - """ - types: [RouteAlertType] - ): [Alert] - - """ - Orders the routes in a way which is useful for presentation to passengers. - Routes with smaller values should be displayed first. - - The value can be any non-negative integer. A null value means that no information was supplied. - - This value is passed through from the source data without modification. If multiple feeds - define sort orders for their routes, they may not be comparable to each other as no agreed scale - exists. - - Two routes may also have the same sort order and clients must decide based on other criteria - what the actual order is. - """ - sortOrder: Int -} - -"""Entities that are relevant for routes that can contain alerts""" -enum RouteAlertType { - """Alerts affecting the route's agency.""" - AGENCY - - """Alerts directly affecting the route.""" - ROUTE - - """Alerts affecting the route type of the route.""" - ROUTE_TYPE - - """Alerts affecting the stops that are on the route.""" - STOPS_ON_ROUTE - - """Alerts affecting the route's trips.""" - TRIPS - - """Alerts affecting the stops on some trips of the route.""" - STOPS_ON_TRIPS - - """ - Alerts affecting route's patterns. - """ - PATTERNS -} - -""" -Route type entity which covers all agencies if agency is null, -otherwise only relevant for one agency. -""" -type RouteType { - """ - GTFS Route type. - For the list of possible values, see: - https://developers.google.com/transit/gtfs/reference/#routestxt and - https://developers.google.com/transit/gtfs/reference/extended-route-types - """ - routeType: Int! - - """A public transport agency""" - agency: Agency - - """ - The routes which have the defined routeType and belong to the agency, if defined. - Otherwise all routes of the feed that have the defined routeType. - """ - routes: [Route] -} - -"""Time range for which the API has data available""" -type serviceTimeRange { - """ - Time from which the API has data available. Format: Unix timestamp in seconds - """ - start: Long - - """ - Time until which the API has data available. Format: Unix timestamp in seconds - """ - end: Long -} - -"""Actions to take relative to the current position when engaging a walking/driving step.""" -enum RelativeDirection { - DEPART - HARD_LEFT - LEFT - SLIGHTLY_LEFT - CONTINUE - SLIGHTLY_RIGHT - RIGHT - HARD_RIGHT - CIRCLE_CLOCKWISE - CIRCLE_COUNTERCLOCKWISE - ELEVATOR - UTURN_LEFT - UTURN_RIGHT - ENTER_STATION - EXIT_STATION - FOLLOW_SIGNS +Enable this to attach a system notice to itineraries instead of removing them. This is very +convenient when tuning the itinerary-filter-chain. +""" +enum ItineraryFilterDebugProfile { + """ + Only return the requested number of itineraries, counting both actual and deleted ones. + The top `numItineraries` using the request sort order is returned. This does not work + with paging, itineraries after the limit, but inside the search-window are skipped when + moving to the next page. + """ + LIMIT_TO_NUMBER_OF_ITINERARIES + """ + Return all itineraries, including deleted ones, inside the actual search-window used + (the requested search-window may differ). + """ + LIMIT_TO_SEARCH_WINDOW + "List all itineraries, including all deleted itineraries." + LIST_ALL + "By default, the debug itinerary filters is turned off." + OFF } -"""The cardinal (compass) direction taken when engaging a walking/driving step.""" -enum AbsoluteDirection { - NORTH - NORTHEAST - EAST - SOUTHEAST - SOUTH - SOUTHWEST - WEST - NORTHWEST +"Identifies whether this stop represents a stop or station." +enum LocationType { + ENTRANCE + "A physical structure or area that contains one or more stop." + STATION + "A location where passengers board or disembark from a transit vehicle." + STOP } -"""Occupancy status of a vehicle.""" +enum Mode { + "AIRPLANE" + AIRPLANE + "BICYCLE" + BICYCLE + "BUS" + BUS + "CABLE_CAR" + CABLE_CAR + "CAR" + CAR + "Private car trips shared with others." + CARPOOL + "COACH" + COACH + "FERRY" + FERRY + "Enables flexible transit for access and egress legs" + FLEX + "Enables flexible transit for access and egress legs" + FLEXIBLE @deprecated(reason : "Use FLEX instead") + "FUNICULAR" + FUNICULAR + "GONDOLA" + GONDOLA + "Only used internally. No use for API users." + LEG_SWITCH @deprecated(reason : "No longer supported") + "Railway in which the track consists of a single rail or a beam." + MONORAIL + "RAIL" + RAIL + "SCOOTER" + SCOOTER + "SUBWAY" + SUBWAY + "A taxi, possibly operated by a public transport agency." + TAXI + "TRAM" + TRAM + "A special transport mode, which includes all public transport." + TRANSIT + "Electric buses that draw power from overhead wires using poles." + TROLLEYBUS + "WALK" + WALK +} + +"Occupancy status of a vehicle." enum OccupancyStatus { - """Default. There is no occupancy-data on this departure.""" - NO_DATA_AVAILABLE - + """ + The vehicle or carriage can currently accommodate only standing passengers and has limited + space for them. There isn't a big difference between this and FULL so it's possible to handle + them as the same value, if one wants to limit the number of different values. + SIRI nordic profile: merge into `STANDING_ROOM_ONLY`. + """ + CRUSHED_STANDING_ROOM_ONLY """ The vehicle is considered empty by most measures, and has few or no passengers onboard, but is still accepting passengers. There isn't a big difference between this and MANY_SEATS_AVAILABLE @@ -4645,7 +2921,18 @@ enum OccupancyStatus { SIRI nordic profile: merge these into `MANY_SEATS_AVAILABLE`. """ EMPTY - + """ + The vehicle or carriage has a small number of seats available. The amount of free seats out of + the total seats available to be considered small enough to fall into this category is + determined at the discretion of the producer. + SIRI nordic profile: less than ~50% of seats available. + """ + FEW_SEATS_AVAILABLE + """ + The vehicle is considered full by most measures, but may still be allowing passengers to + board. + """ + FULL """ The vehicle or carriage has a large number of seats available. The amount of free seats out of the total seats available to be considered large enough to fall into this category is @@ -4655,951 +2942,1325 @@ enum OccupancyStatus { SIRI nordic profile: more than ~50% of seats available. """ MANY_SEATS_AVAILABLE - """ - The vehicle or carriage has a small number of seats available. The amount of free seats out of - the total seats available to be considered small enough to fall into this category is - determined at the discretion of the producer. - SIRI nordic profile: less than ~50% of seats available. + The vehicle or carriage is not accepting passengers. + SIRI nordic profile: if vehicle/carriage is not in use / unavailable, or passengers are only allowed + to alight due to e.g. crowding. """ - FEW_SEATS_AVAILABLE - + NOT_ACCEPTING_PASSENGERS + "Default. There is no occupancy-data on this departure." + NO_DATA_AVAILABLE """ The vehicle or carriage can currently accommodate only standing passengers. SIRI nordic profile: less than ~10% of seats available. """ STANDING_ROOM_ONLY +} +"Optimization type for bicycling legs" +enum OptimizeType { + "Prefer flat terrain" + FLAT + "GREENWAYS" + GREENWAYS + "Prefer faster routes" + QUICK + "Prefer safer routes, i.e. avoid crossing streets and use bike paths when possible" + SAFE + "**TRIANGLE** optimization type can be used to set relative preferences of optimization factors. See argument `triangle`." + TRIANGLE +} + +"Entities, which are relevant for a pattern and can contain alerts" +enum PatternAlertType { + "Alerts affecting the pattern's route's agency" + AGENCY + "Alerts affecting the pattern" + PATTERN + "Alerts affecting the route that the pattern runs on" + ROUTE + "Alerts affecting the route type of the route that the pattern runs on" + ROUTE_TYPE + "Alerts affecting the stops which are on this pattern" + STOPS_ON_PATTERN + "Alerts affecting the stops of the trips which run on this pattern" + STOPS_ON_TRIPS + "Alerts affecting the trips which run on this pattern" + TRIPS +} + +enum PickupDropoffType { + "Must phone agency to arrange pickup / drop off." + CALL_AGENCY + "Must coordinate with driver to arrange pickup / drop off." + COORDINATE_WITH_DRIVER + "No pickup / drop off available." + NONE + "Regularly scheduled pickup / drop off." + SCHEDULED +} + +"Street modes that can be used for access to the transit network from origin." +enum PlanAccessMode { """ - The vehicle or carriage can currently accommodate only standing passengers and has limited - space for them. There isn't a big difference between this and FULL so it's possible to handle - them as the same value, if one wants to limit the number of different values. - SIRI nordic profile: merge into `STANDING_ROOM_ONLY`. + Cycling to a stop and boarding a vehicle with the bicycle. + Note, this can include walking when it's needed to walk the bicycle. + Access can use cycling only if the mode used for transfers + and egress is also `BICYCLE`. """ - CRUSHED_STANDING_ROOM_ONLY - + BICYCLE """ - The vehicle is considered full by most measures, but may still be allowing passengers to - board. + Starting the itinerary with a bicycle and parking the bicycle to + a parking location. Note, this can include walking after parking + the bicycle or when it's needed to walk the bicycle. """ - FULL - + BICYCLE_PARKING """ - The vehicle or carriage is not accepting passengers. - SIRI nordic profile: if vehicle/carriage is not in use / unavailable, or passengers are only allowed - to alight due to e.g. crowding. + Bicycle rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, access will include only walking. Also, this + can include walking before picking up or after dropping off the + bicycle or when it's needed to walk the bicycle. """ - NOT_ACCEPTING_PASSENGERS + BICYCLE_RENTAL + """ + Getting dropped off by a car to a location that is accessible with a car. + Note, this can include walking after the drop-off. + """ + CAR_DROP_OFF + """ + Starting the itinerary with a car and parking the car to a parking location. + Note, this can include walking after parking the car. + """ + CAR_PARKING + """ + Car rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, access will include only walking. Also, this + can include walking before picking up or after dropping off the + car. + """ + CAR_RENTAL + """ + Flexible transit. This can include different forms of flexible transit that + can be defined in GTFS-Flex or in Netex. Note, this can include walking before + or after the flexible transit leg. + """ + FLEX + """ + Scooter rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, access will include only walking. Also, this + can include walking before picking up or after dropping off the + scooter. + """ + SCOOTER_RENTAL + "Walking to a stop." + WALK } -""" -Preferences related to travel with a scooter (kick or e-scooter). -""" -input ScooterPreferencesInput { - """ - A multiplier for how bad riding a scooter is compared to being in transit - for equal lengths of time. - """ - reluctance: Reluctance - - """ - Maximum speed on flat ground while riding a scooter. Note, this speed is higher than - the average speed will be in itineraries as this is the maximum speed but there are - factors that slow down the travel such as crossings, intersections and elevation changes. - """ - speed: Speed - - """ - What criteria should be used when optimizing a scooter route. - """ - optimization: ScooterOptimizationInput - - """ - Scooter rental related preferences. - """ - rental: ScooterRentalPreferencesInput +"Street mode that is used when searching for itineraries that don't use any transit." +enum PlanDirectMode { + """ + Cycling from the origin to the destination. Note, this can include walking + when it's needed to walk the bicycle. + """ + BICYCLE + """ + Starting the itinerary with a bicycle and parking the bicycle to + a parking location. Note, this can include walking after parking + the bicycle or when it's needed to walk the bicycle. + """ + BICYCLE_PARKING + """ + Bicycle rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, itinerary will include only walking. + Also, it can include walking before picking up or after dropping off the + bicycle or when it's needed to walk the bicycle. + """ + BICYCLE_RENTAL + "Driving a car from the origin to the destination." + CAR + """ + Starting the itinerary with a car and parking the car to a parking location. + Note, this can include walking after parking the car. + """ + CAR_PARKING + """ + Car rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, itinerary will include only walking. Also, this + can include walking before picking up or after dropping off the + car. + """ + CAR_RENTAL + """ + Flexible transit. This can include different forms of flexible transit that + can be defined in GTFS-Flex or in Netex. Note, this can include walking before + or after the flexible transit leg. + """ + FLEX + """ + Scooter rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, itinerary will include only walking. Also, this + can include walking before picking up or after dropping off the + scooter. + """ + SCOOTER_RENTAL + """ + Walking from the origin to the destination. Note, this can include walking + when it's needed to walk the bicycle. + """ + WALK } -type step { - """The distance in meters that this step takes.""" - distance: Float - - """The longitude of the start of the step.""" - lon: Float - - """The latitude of the start of the step.""" - lat: Float - - """The elevation profile as a list of { distance, elevation } values.""" - elevationProfile: [elevationProfileComponent] - - """The relative direction (e.g. left or right turn) to take when engaging this step.""" - relativeDirection: RelativeDirection - - """The cardinal (compass) direction (e.g. north, northeast) taken when engaging this step.""" - absoluteDirection: AbsoluteDirection - - """The name of the street, road, or path taken for this step.""" - streetName: String - - """When exiting a highway or traffic circle, the exit name/number.""" - exit: String - - """Indicates whether or not a street changes direction at an intersection.""" - stayOn: Boolean - - """ - This step is on an open area, such as a plaza or train platform, - and thus the directions should say something like "cross". - """ - area: Boolean - - """ - The name of this street was generated by the system, so we should only display it once, and - generally just display right/left directions - """ - bogusName: Boolean +"Street modes that can be used for egress from the transit network to destination." +enum PlanEgressMode { + """ + Cycling from a stop to the destination. Note, this can include walking when + it's needed to walk the bicycle. Egress can use cycling only if the mode used + for access and transfers is also `BICYCLE`. + """ + BICYCLE + """ + Bicycle rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, egress will include only walking. Also, this + can include walking before picking up or after dropping off the + bicycle or when it's needed to walk the bicycle. + """ + BICYCLE_RENTAL + """ + Getting picked up by a car from a location that is accessible with a car. + Note, this can include walking before the pickup. + """ + CAR_PICKUP + """ + Car rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, egress will include only walking. Also, this + can include walking before picking up or after dropping off the + car. + """ + CAR_RENTAL + """ + Flexible transit. This can include different forms of flexible transit that + can be defined in GTFS-Flex or in Netex. Note, this can include walking before + or after the flexible transit leg. + """ + FLEX + """ + Scooter rental can use either station based systems or "floating" + vehicles which are not linked to a rental station. Note, if there are no + rental options available, egress will include only walking. Also, this + can include walking before picking up or after dropping off the + scooter. + """ + SCOOTER_RENTAL + "Walking from a stop to the destination." + WALK +} - """Is this step walking with a bike?""" - walkingBike: Boolean +enum PlanTransferMode { + """ + Cycling between transit vehicles (typically between stops). Note, this can + include walking when it's needed to walk the bicycle. Transfers can only use + cycling if the mode used for access and egress is also `BICYCLE`. + """ + BICYCLE + "Walking between transit vehicles (typically between stops)." + WALK +} - """A list of alerts (e.g. construction, detours) applicable to the step.""" - alerts: [Alert] +enum PropulsionType { + "Powered by gasoline combustion engine" + COMBUSTION + "Powered by diesel combustion engine" + COMBUSTION_DIESEL + "Powered by battery-powered electric motor with throttle mode" + ELECTRIC + "Provides electric motor assist only in combination with human propulsion - no throttle mode" + ELECTRIC_ASSIST + "Pedal or foot propulsion" + HUMAN + "Powered by combined combustion engine and battery-powered motor" + HYBRID + "Powered by hydrogen fuel cell powered electric motor" + HYDROGEN_FUEL_CELL + "Powered by combined combustion engine and battery-powered motor with plug-in charging" + PLUG_IN_HYBRID } """ -Stop can represent either a single public transport stop, where passengers can -board and/or disembark vehicles, or a station, which contains multiple stops. -See field `locationType`. +Additional qualifier for a transport mode. +Note that qualifiers can only be used with certain transport modes. """ -type Stop implements Node & PlaceInterface { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """Returns timetable of the specified pattern at this stop""" - stopTimesForPattern( - """Id of the pattern""" - id: String! - - """ - Return departures after this time. Format: Unix timestamp in seconds. Default value: current time - """ - startTime: Long = 0 - - """ - Return stoptimes within this time range, starting from `startTime`. Unit: Seconds - """ - timeRange: Int = 86400 - numberOfDepartures: Int = 2 - - """If true, only those departures which allow boarding are returned""" - omitNonPickups: Boolean = false - - """If false, returns also canceled trips""" - omitCanceled: Boolean = true - ): [Stoptime] - - """ÌD of the stop in format `FeedId:StopId`""" - gtfsId: String! - - """Name of the stop, e.g. Pasilan asema""" - name( - """If translated name is found from gtfs translation.txt and wanted language is not same as - feed's language then returns wanted translation. Otherwise uses name from stops.txt. - E.g. Swedish name for Pasilan asema is Böle station.""" - language: String): String! - - """Latitude of the stop (WGS 84)""" - lat: Float - - """Longitude of the stop (WGS 84)""" - lon: Float - - """ - Representations of this stop's geometry. This is mainly interesting for flex stops which can be - a polygon or a group of stops either consisting of either points or polygons. - - Regular fixed-schedule stops return a single point. - - Stations (parent stations with child stops) contain a geometry collection with a point for the - central coordinate plus a convex hull polygon (https://en.wikipedia.org/wiki/Convex_hull) of all - coordinates of the child stops. - - If there are only two child stops then the convex hull is a straight line between the them. If - there is a single child stop then it's a single point. - """ - geometries: StopGeometries - - """Stop code which is visible at the stop""" - code: String - - """Description of the stop, usually a street name""" - desc( - """If translated description is found from gtfs translation.txt and wanted language is not same as - feed's language then returns wanted translation. Otherwise uses descriptions from stops.txt. - """ - language: String): String - - """ID of the zone where this stop is located""" - zoneId: String - - url( - """If translated url is found from gtfs translation.txt and wanted language is not same as - feed's language then returns wanted translation. Otherwise uses url from stops.txt.""" - language: String): String - - """Identifies whether this stop represents a stop or station.""" - locationType: LocationType - - """ - The station which this stop is part of (or null if this stop is not part of a station) - """ - parentStation: Stop - - """ - Whether wheelchair boarding is possible for at least some of vehicles on this stop - """ - wheelchairBoarding: WheelchairBoarding - direction: String - timezone: String - - """ - The raw GTFS route type used by routes which pass through this stop. For the - list of possible values, see: - https://developers.google.com/transit/gtfs/reference/#routestxt and - https://developers.google.com/transit/gtfs/reference/extended-route-types - """ - vehicleType: Int - - """ - Transport mode (e.g. `BUS`) used by routes which pass through this stop or - `null` if mode cannot be determined, e.g. in case no routes pass through the stop. - Note that also other types of vehicles may use the stop, e.g. tram replacement - buses might use stops which have `TRAM` as their mode. - """ - vehicleMode: Mode - - """ - Identifier of the platform, usually a number. This value is only present for stops that are part of a station - """ - platformCode: String - - """The cluster which this stop is part of""" - cluster: Cluster - - """ - Returns all stops that are children of this station (Only applicable for stations) - """ - stops: [Stop] - - """Routes which pass through this stop""" - routes: [Route!] - - """Patterns which pass through this stop""" - patterns: [Pattern] - - """List of nearby stops which can be used for transfers""" - transfers( - """ - Maximum distance to the transfer stop. Defaults to unlimited. - **Note:** only stops that are linked as a transfer stops to this stop are - returned, i.e. this does not do a query to search for *all* stops within - radius of `maxDistance`. - """ - maxDistance: Int - ): [stopAtDistance] - - """Returns list of stoptimes for the specified date""" - stoptimesForServiceDate( - """Date in format YYYYMMDD""" - date: String - - """If true, only those departures which allow boarding are returned""" - omitNonPickups: Boolean = false - - """If false, returns also canceled trips""" - omitCanceled: Boolean = false - ): [StoptimesInPattern] - - """ - Returns list of stoptimes (arrivals and departures) at this stop, grouped by patterns - """ - stoptimesForPatterns( - """ - Return departures after this time. Format: Unix timestamp in seconds. Default value: current time - """ - startTime: Long = 0 - - """ - Return stoptimes within this time range, starting from `startTime`. Unit: Seconds - """ - timeRange: Int = 86400 - numberOfDepartures: Int = 5 - - """If true, only those departures which allow boarding are returned""" - omitNonPickups: Boolean = false - - """If false, returns also canceled trips""" - omitCanceled: Boolean = true - ): [StoptimesInPattern] - - """Returns list of stoptimes (arrivals and departures) at this stop""" - stoptimesWithoutPatterns( - """ - Return departures after this time. Format: Unix timestamp in seconds. Default value: current time - """ - startTime: Long = 0 - - """ - Return stoptimes within this time range, starting from `startTime`. Unit: Seconds - """ - timeRange: Int = 86400 - numberOfDepartures: Int = 5 - - """If true, only those departures which allow boarding are returned""" - omitNonPickups: Boolean = false +enum Qualifier { + "The mode is used for the access part of the search." + ACCESS + "The mode is used for the direct street search." + DIRECT + "The user can be dropped off by someone else riding a vehicle" + DROPOFF + "The mode is used for the egress part of the search." + EGRESS + "Hailing a ride, for example via an app like Uber." + HAIL + """ + ~~HAVE~~ + **Currently not used** + """ + HAVE @deprecated(reason : "Currently not used") + """ + ~~KEEP~~ + **Currently not used** + """ + KEEP @deprecated(reason : "Currently not used") + """ + The vehicle used must be left to a parking area before continuing the journey. + This qualifier is usable with transport modes `CAR` and `BICYCLE`. + Note that the vehicle is only parked if the journey is continued with public + transportation (e.g. if only `CAR` and `WALK` transport modes are allowed to + be used, the car will not be parked as it is used for the whole journey). + """ + PARK + "The user can be picked up by someone else riding a vehicle" + PICKUP + "The vehicle used for transport can be rented" + RENT +} - """If false, returns also canceled trips""" - omitCanceled: Boolean = true - ): [Stoptime] +enum RealtimeState { + "The trip has been added using a real-time update, i.e. the trip was not present in the GTFS feed." + ADDED + "The trip has been canceled by a real-time update." + CANCELED + """ + The trip information has been updated and resulted in a different trip pattern + compared to the trip pattern of the scheduled trip. + """ + MODIFIED + "The trip information comes from the GTFS feed, i.e. no real-time update has been applied." + SCHEDULED + "The trip information has been updated, but the trip pattern stayed the same as the trip pattern of the scheduled trip." + UPDATED +} - """ - By default, list of alerts which have directly an effect on just the stop. - It's also possible to return other relevant alerts through defining types. - """ - alerts( - """ - Returns alerts for these types that are relevant for the stop. - By default, list of alerts which have directly an effect on just the stop. - """ - types: [StopAlertType] - ): [Alert] +"Actions to take relative to the current position when engaging a walking/driving step." +enum RelativeDirection { + CIRCLE_CLOCKWISE + CIRCLE_COUNTERCLOCKWISE + CONTINUE + DEPART + ELEVATOR + ENTER_STATION + EXIT_STATION + FOLLOW_SIGNS + HARD_LEFT + HARD_RIGHT + LEFT + RIGHT + SLIGHTLY_LEFT + SLIGHTLY_RIGHT + UTURN_LEFT + UTURN_RIGHT } -"""Entities, which are relevant for a stop and can contain alerts""" -enum StopAlertType { - """Alerts affecting the stop""" - STOP - - """Alerts affecting the stop's patterns""" - PATTERNS - - """Alerts affecting the agencies of the routes going through the stop""" - AGENCIES_OF_ROUTES - - """Alerts affecting the routes that go through the stop""" - ROUTES - - """Alerts affecting the trips that go through this stop""" - TRIPS - - """Alerts affecting the stop on specific routes""" - STOP_ON_ROUTES - - """Alerts affecting the stop on specific trips""" - STOP_ON_TRIPS +"Entities that are relevant for routes that can contain alerts" +enum RouteAlertType { + "Alerts affecting the route's agency." + AGENCY + "Alerts affecting route's patterns." + PATTERNS + "Alerts directly affecting the route." + ROUTE + "Alerts affecting the route type of the route." + ROUTE_TYPE + "Alerts affecting the stops that are on the route." + STOPS_ON_ROUTE + "Alerts affecting the stops on some trips of the route." + STOPS_ON_TRIPS + "Alerts affecting the route's trips." + TRIPS } -type stopAtDistance implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - stop: Stop - - """Walking distance to the stop along streets and paths""" - distance: Int +enum RoutingErrorCode { + """ + The specified location is not close to any streets or transit stops currently loaded into the + system, even though it is generally within its bounds. + + This can happen when there is only transit but no street data coverage at the location in + question. + """ + LOCATION_NOT_FOUND + """ + No stops are reachable from the start or end locations specified. + + You can try searching using a different access or egress mode, for example cycling instead of walking, + increase the walking/cycling/driving speed or have an administrator change the system's configuration + so that stops further away are considered. + """ + NO_STOPS_IN_RANGE + """ + No transit connection was found between the origin and destination within the operating day or + the next day, not even sub-optimal ones. + """ + NO_TRANSIT_CONNECTION + """ + A transit connection was found, but it was outside the search window. See the metadata for a token + for retrieving the result outside the search window. + """ + NO_TRANSIT_CONNECTION_IN_SEARCH_WINDOW + """ + The coordinates are outside the geographic bounds of the transit and street data currently loaded + into the system and therefore cannot return any results. + """ + OUTSIDE_BOUNDS + """ + The date specified is outside the range of data currently loaded into the system as it is too + far into the future or the past. + + The specific date range of the system is configurable by an administrator and also depends on + the input data provided. + """ + OUTSIDE_SERVICE_PERIOD + """ + Transit connections were requested and found but because it is easier to just walk all the way + to the destination they were removed. + + If you want to still show the transit results, you need to make walking less desirable by + increasing the walk reluctance. + """ + WALKING_BETTER_THAN_TRANSIT } -"""A connection to a list of items.""" -type stopAtDistanceConnection { - edges: [stopAtDistanceEdge] - pageInfo: PageInfo! +""" +Predefined optimization alternatives for scooter routing. For more customization, +one can use the triangle factors. +""" +enum ScooterOptimizationType { + "Emphasize flatness over safety or duration of the route. This option was previously called `FLAT`." + FLAT_STREETS + """ + Completely ignore the elevation differences and prefer the streets, that are evaluated + to be safest for scooters, even more than with the `SAFE_STREETS` option. + Safety can also include other concerns such as convenience and general preferences by taking + into account road surface etc. Note, currently the same criteria is used both for cycling and + scooter travel to determine how safe streets are for cycling or scooter. + This option was previously called `GREENWAYS`. + """ + SAFEST_STREETS + """ + Emphasize scooter safety over flatness or duration of the route. Safety can also include other + concerns such as convenience and general preferences by taking into account road surface etc. + Note, currently the same criteria is used both for cycling and scooter travel to determine how + safe streets are for cycling or scooter. This option was previously called `SAFE`. + """ + SAFE_STREETS + """ + Search for routes with the shortest duration while ignoring the scooter safety + of the streets. The routes should still follow local regulations, but currently scooters + are only allowed on the same streets as bicycles which might not be accurate for each country + or with different types of scooters. Routes can include steep streets, if they are + the fastest alternatives. This option was previously called `QUICK`. + """ + SHORTEST_DURATION } -"""An edge in a connection.""" -type stopAtDistanceEdge { - """The item at the end of the edge""" - node: stopAtDistance - cursor: String! +"Entities, which are relevant for a stop and can contain alerts" +enum StopAlertType { + "Alerts affecting the agencies of the routes going through the stop" + AGENCIES_OF_ROUTES + "Alerts affecting the stop's patterns" + PATTERNS + "Alerts affecting the routes that go through the stop" + ROUTES + "Alerts affecting the stop" + STOP + "Alerts affecting the stop on specific routes" + STOP_ON_ROUTES + "Alerts affecting the stop on specific trips" + STOP_ON_TRIPS + "Alerts affecting the trips that go through this stop" + TRIPS } """ -Stop that should (but not guaranteed) to exist on a route. +Transit modes include modes that are used within organized transportation networks +run by public transportation authorities, taxi companies etc. +Equivalent to GTFS route_type or to NeTEx TransportMode. """ -type StopOnRoute { - """ - Stop at the route. It's also possible that the stop is no longer on the route. - """ - stop: Stop! - """Route which contains the stop.""" - route: Route! +enum TransitMode { + AIRPLANE + BUS + CABLE_CAR + "Private car trips shared with others." + CARPOOL + COACH + FERRY + FUNICULAR + GONDOLA + "Railway in which the track consists of a single rail or a beam." + MONORAIL + "This includes long or short distance trains." + RAIL + "Subway or metro, depending on the local terminology." + SUBWAY + "A taxi, possibly operated by a public transport agency." + TAXI + TRAM + "Electric buses that draw power from overhead wires using poles." + TROLLEYBUS +} + +"Entities, which are relevant for a trip and can contain alerts" +enum TripAlertType { + "Alerts affecting the trip's agency" + AGENCY + "Alerts affecting the trip's pattern" + PATTERN + "Alerts affecting the trip's route" + ROUTE + "Alerts affecting the route type of the trip's route" + ROUTE_TYPE + """ + Alerts affecting the stops visited on the trip. + Some of the alerts can only affect the trip or its route on the stop. + """ + STOPS_ON_TRIP + "Alerts affecting the trip" + TRIP } """ -Stop that should (but not guaranteed) to exist on a trip. +The state of the vehicle parking. TEMPORARILY_CLOSED and CLOSED are distinct states so that they +may be represented differently to the user. """ -type StopOnTrip { - """ - Stop at the trip. It's also possible that the stop is no longer on the trip. - """ - stop: Stop! - """ - Trip which contains the stop. - """ - trip: Trip! +enum VehicleParkingState { + "Can't be used for park and ride." + CLOSED + "May be used for park and ride." + OPERATIONAL + "Can't be used for park and ride." + TEMPORARILY_CLOSED } -""" -Stoptime represents the time when a specific trip arrives to or departs from a specific stop. -""" -type Stoptime { - """The stop where this arrival/departure happens""" - stop: Stop - - """ - The sequence of the stop in the pattern. This is not required to start from 0 or be consecutive - any - increasing integer sequence along the stops is valid. +"How close the vehicle is to the stop." +enum VehicleStopStatus { + "The vehicle is just about to arrive at the stop (on a stop display, the vehicle symbol typically flashes)." + INCOMING_AT + "The vehicle has departed the previous stop and is in transit." + IN_TRANSIT_TO + "The vehicle is standing at the stop." + STOPPED_AT +} - The purpose of this field is to identify the stop within the pattern so it can be cross-referenced - between it and the itinerary. It is safe to cross-reference when done quickly, i.e. within seconds. - However, it should be noted that real-time updates can change the values, so don't store it for - longer amounts of time. +enum VertexType { + "BIKEPARK" + BIKEPARK + "BIKESHARE" + BIKESHARE + "NORMAL" + NORMAL + "PARKANDRIDE" + PARKANDRIDE + "TRANSIT" + TRANSIT +} - Depending on the source data, this might not be the GTFS `stop_sequence` but another value, perhaps - even generated. - """ - stopPosition: Int +enum WheelchairBoarding { + "Wheelchair boarding is not possible at this stop." + NOT_POSSIBLE + "There is no accessibility information for the stop." + NO_INFORMATION + "At least some vehicles at this stop can be boarded by a rider in a wheelchair." + POSSIBLE +} - """ - Scheduled arrival time. Format: seconds since midnight of the departure date - """ - scheduledArrival: Int +"Either a latitude or a longitude as a WGS84 format floating point number." +scalar CoordinateValue @specifiedBy(url : "https://earth-info.nga.mil/?dir=wgs84&action=wgs84") - """ - Real-time prediction of arrival time. Format: seconds since midnight of the departure date - """ - realtimeArrival: Int +""" +A static cost that is applied to a certain event or entity. Cost is a positive integer, +for example `450`. One cost unit should roughly match a one second travel on transit. +""" +scalar Cost - """ - The offset from the scheduled arrival time in seconds. Negative values - indicate that the trip is running ahead of schedule. - """ - arrivalDelay: Int +"Duration in a lenient ISO-8601 duration format. Example P2DT2H12M40S, 2d2h12m40s or 1h" +scalar Duration @specifiedBy(url : "https://docs.oracle.com/en/java/javase/21/docs/api/java.base/java/time/Duration.html#parse(java.lang.CharSequence)") - """ - Scheduled departure time. Format: seconds since midnight of the departure date - """ - scheduledDeparture: Int +"Geographic data structures in JSON format. See: https://geojson.org/" +scalar GeoJson @specifiedBy(url : "https://www.rfcreader.com/#rfc7946") - """ - Real-time prediction of departure time. Format: seconds since midnight of the departure date - """ - realtimeDeparture: Int +scalar Grams - """ - The offset from the scheduled departure time in seconds. Negative values - indicate that the trip is running ahead of schedule - """ - departureDelay: Int +"A IETF BCP 47 language tag" +scalar Locale @specifiedBy(url : "https://www.rfcreader.com/#rfc5646") - """ - true, if this stop is used as a time equalization stop. false otherwise. - """ - timepoint: Boolean +"A 64-bit signed integer" +scalar Long - """true, if this stoptime has real-time data available""" - realtime: Boolean +""" +An ISO-8601-formatted datetime with offset, i.e. `2023-06-13T14:30+03:00` for 2:30pm on June 13th 2023 at Helsinki's offset from UTC at that time. - """State of real-time data""" - realtimeState: RealtimeState +ISO-8601 allows many different formats but OTP will only return the profile specified in RFC3339. +""" +scalar OffsetDateTime @specifiedBy(url : "https://www.rfcreader.com/#rfc3339") - """ - Whether the vehicle can be boarded at this stop. This field can also be used - to indicate if boarding is possible only with special arrangements. - """ - pickupType: PickupDropoffType +"List of coordinates in an encoded polyline format (see https://developers.google.com/maps/documentation/utilities/polylinealgorithm). The value appears in JSON as a string." +scalar Polyline @specifiedBy(url : "https://developers.google.com/maps/documentation/utilities/polylinealgorithm") - """ - Whether the vehicle can be disembarked at this stop. This field can also be - used to indicate if disembarkation is possible only with special arrangements. - """ - dropoffType: PickupDropoffType +"A fractional multiplier between 0 and 1, for example 0.25. 0 means 0% and 1 means 100%." +scalar Ratio - """ - Departure date of the trip. Format: Unix timestamp (local time) in seconds. - """ - serviceDay: Long +""" +A cost multiplier for how bad something is compared to being in transit for equal lengths of time. +The value should be greater than 0. 1 means neutral and values below 1 mean that something is +preferred over transit. +""" +scalar Reluctance - """Trip which this stoptime is for""" - trip: Trip +"Speed in meters per seconds. Values are positive floating point numbers (for example, 2.34)." +scalar Speed - """ - Vehicle headsign of the trip on this stop. Trip headsigns can change during - the trip (e.g. on routes which run on loops), so this value should be used - instead of `tripHeadsign` to display the headsign relevant to the user. - """ - headsign( - """If translated headsign is found from gtfs translation.txt and wanted language is not same as - feed's language then returns wanted translation. Otherwise uses name from trip_headsign.txt. - """ - language: String): String +""" +Plan accessibilty preferences. This can be expanded to contain preferences for various accessibility use cases +in the future. Currently only generic wheelchair preferences are available. +""" +input AccessibilityPreferencesInput { + "Wheelchair related preferences. Note, currently this is the only accessibility mode that is available." + wheelchair: WheelchairPreferencesInput } -"""Stoptimes grouped by pattern""" -type StoptimesInPattern { - pattern: Pattern - stoptimes: [Stoptime] +"Preferences related to alighting from a transit vehicle." +input AlightPreferencesInput { + "What is the required minimum time alighting from a vehicle." + slack: Duration } -"""Describes ticket type""" -type TicketType implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ - Ticket type ID in format `FeedId:TicketTypeId`. Ticket type IDs are usually - combination of ticket zones where the ticket is valid. - """ - fareId: String! - - """Price of the ticket in currency that is specified in `currency` field""" - price: Float - - """ISO 4217 currency code""" - currency: String - - """ - List of zones where this ticket is valid. - Corresponds to field `zoneId` in **Stop** type. - """ - zones: [String!] +"Preferences for bicycle parking facilities used during the routing." +input BicycleParkingPreferencesInput { + """ + Selection filters to include or exclude parking facilities. + An empty list will include all facilities in the routing search. + """ + filters: [ParkingFilter!] + """ + If non-empty every parking facility that doesn't match this set of conditions will + receive an extra cost (defined by `unpreferredCost`) and therefore avoided. + """ + preferred: [ParkingFilter!] + """ + If `preferred` is non-empty, using a parking facility that doesn't contain + at least one of the preferred conditions, will receive this extra cost and therefore avoided if + preferred options are available. + """ + unpreferredCost: Cost } -input TimetablePreferencesInput { - """ - When false, real-time updates are considered during the routing. - In practice, when this option is set as true, some of the suggestions might not be - realistic as the transfers could be invalid due to delays, - trips can be cancelled or stops can be skipped. - """ - excludeRealTimeUpdates: Boolean - - """ - When true, departures that have been cancelled ahead of time will be - included during the routing. This means that an itinerary can include - a cancelled departure while some other alternative that contains no cancellations - could be filtered out as the alternative containing a cancellation would normally - be better. - """ - includePlannedCancellations: Boolean - - """ - When true, departures that have been cancelled through a real-time feed will be - included during the routing. This means that an itinerary can include - a cancelled departure while some other alternative that contains no cancellations - could be filtered out as the alternative containing a cancellation would normally - be better. This option can't be set to true while `includeRealTimeUpdates` is false. - """ - includeRealTimeCancellations: Boolean +"Preferences related to travel with a bicycle." +input BicyclePreferencesInput { + "Cost of boarding a vehicle with a bicycle." + boardCost: Cost + "What criteria should be used when optimizing a cycling route." + optimization: CyclingOptimizationInput + "Bicycle parking related preferences." + parking: BicycleParkingPreferencesInput + "A multiplier for how bad cycling is compared to being in transit for equal lengths of time." + reluctance: Reluctance + "Bicycle rental related preferences." + rental: BicycleRentalPreferencesInput + """ + Maximum speed on flat ground while riding a bicycle. Note, this speed is higher than + the average speed will be in itineraries as this is the maximum speed but there are + factors that slow down cycling such as crossings, intersections and elevation changes. + """ + speed: Speed + "Walking preferences when walking a bicycle." + walk: BicycleWalkPreferencesInput } -""" -Preferences related to transfers between transit vehicles (typically between stops). -""" -input TransferPreferencesInput { - """ - A static cost that is added for each transfer on top of other costs. - """ - cost: Cost - - """ - A global minimum transfer time (in seconds) that specifies the minimum amount of time - that must pass between exiting one transit vehicle and boarding another. This time is - in addition to time it might take to walk between transit stops. Setting this value - as `PT0S`, for example, can lead to passenger missing a connection when the vehicle leaves - ahead of time or the passenger arrives to the stop later than expected. - """ - slack: Duration - - """ - How many additional transfers there can be at maximum compared to the itinerary with the - least number of transfers. - """ - maximumAdditionalTransfers: Int - - """ - How many transfers there can be at maximum in an itinerary. - """ - maximumTransfers: Int +"Preferences related to bicycle rental (station based or floating bicycle rental)." +input BicycleRentalPreferencesInput { + "Rental networks which can be potentially used as part of an itinerary." + allowedNetworks: [String!] + "Rental networks which cannot be used as part of an itinerary." + bannedNetworks: [String!] + """ + Is it possible to arrive to the destination with a rented bicycle and does it + come with an extra cost. + """ + destinationBicyclePolicy: DestinationBicyclePolicyInput } -""" -Transit mode and a reluctance associated with it. -""" -input PlanTransitModePreferenceInput { - """ - Transit mode that could be (but doesn't have to be) used in an itinerary. - """ - mode: TransitMode! - - """ - Costs related to using a transit mode. - """ - cost: TransitModePreferenceCostInput +"Costs related to walking a bicycle." +input BicycleWalkPreferencesCostInput { + """ + A static cost that is added each time hopping on or off a bicycle to start or end + bicycle walking. However, this cost is not applied when getting on a rented bicycle + for the first time or when getting off the bicycle when returning the bicycle. + """ + mountDismountCost: Cost + """ + A cost multiplier of bicycle walking travel time. The multiplier is for how bad + walking the bicycle is compared to being in transit for equal lengths of time. + """ + reluctance: Reluctance } -""" -Costs related to using a transit mode. -""" -input TransitModePreferenceCostInput { - """ - A cost multiplier of transit leg travel time. - """ - reluctance: Reluctance! +"Preferences for walking a bicycle." +input BicycleWalkPreferencesInput { + "Costs related to walking a bicycle." + cost: BicycleWalkPreferencesCostInput + """ + How long it takes to hop on or off a bicycle when switching to walking the bicycle + or when getting on the bicycle again. However, this is not applied when getting + on a rented bicycle for the first time or off the bicycle when returning the bicycle. + """ + mountDismountTime: Duration + """ + Maximum walk speed on flat ground. Note, this speed is higher than the average speed + will be in itineraries as this is the maximum speed but there are + factors that slow down walking such as crossings, intersections and elevation changes. + """ + speed: Speed } """ -Transit routing preferences used for transit legs. +Preferences related to boarding a transit vehicle. Note, board costs for each street mode +can be found under the street mode preferences. """ -input TransitPreferencesInput { - """ - Preferences related to boarding a transit vehicle. Note, board costs for each street mode - can be found under the street mode preferences. - """ - board: BoardPreferencesInput - - """ - Preferences related to alighting from a transit vehicle. - """ - alight: AlightPreferencesInput - - """ - Preferences related to transfers between transit vehicles (typically between stops). - """ - transfer: TransferPreferencesInput - - """ - Preferences related to cancellations and real-time. - """ - timetable: TimetablePreferencesInput +input BoardPreferencesInput { + """ + What is the required minimum waiting time at a stop. Setting this value as `PT0S`, for example, can lead + to passenger missing a connection when the vehicle leaves ahead of time or the passenger arrives to the + stop later than expected. + """ + slack: Duration + "A multiplier for how bad waiting at a stop is compared to being in transit for equal lengths of time." + waitReluctance: Reluctance } -"""Text with language""" -type TranslatedString { - text: String +"Preferences for car parking facilities used during the routing." +input CarParkingPreferencesInput { + """ + Selection filters to include or exclude parking facilities. + An empty list will include all facilities in the routing search. + """ + filters: [ParkingFilter!] + """ + If non-empty every parking facility that doesn't match this set of conditions will + receive an extra cost (defined by `unpreferredCost`) and therefore avoided. + """ + preferred: [ParkingFilter!] + """ + If `preferred` is non-empty, using a parking facility that doesn't contain + at least one of the preferred conditions, will receive this extra cost and therefore avoided if + preferred options are available. + """ + unpreferredCost: Cost +} - """Two-letter language code (ISO 639-1)""" - language: String +"Preferences related to traveling on a car (excluding car travel on transit services such as taxi)." +input CarPreferencesInput { + "Car parking related preferences." + parking: CarParkingPreferencesInput + "A multiplier for how bad travelling on car is compared to being in transit for equal lengths of time." + reluctance: Reluctance + "Car rental related preferences." + rental: CarRentalPreferencesInput } -"""Transportation mode which can be used in the itinerary""" -input TransportMode { - mode: Mode! +"Preferences related to car rental (station based or floating car rental)." +input CarRentalPreferencesInput { + "Rental networks which can be potentially used as part of an itinerary." + allowedNetworks: [String!] + "Rental networks which cannot be used as part of an itinerary." + bannedNetworks: [String!] +} - """Optional additional qualifier for transport mode, e.g. `RENT`""" - qualifier: Qualifier +"What criteria should be used when optimizing a cycling route." +input CyclingOptimizationInput @oneOf { + "Define optimization by weighing three criteria." + triangle: TriangleCyclingFactorsInput + "Use one of the predefined optimization types." + type: CyclingOptimizationType } """ -Trip is a specific occurance of a pattern, usually identified by route, direction on the route and exact departure time. +Is it possible to arrive to the destination with a rented bicycle and does it +come with an extra cost. """ -type Trip implements Node { - """ - Global object ID provided by Relay. This value can be used to refetch this object using **node** query. - """ - id: ID! - - """ID of the trip in format `FeedId:TripId`""" - gtfsId: String! - - """The route the trip is running on""" - route: Route! - serviceId: String - - """List of dates when this trip is in service. Format: YYYYMMDD""" - activeDates: [String] - tripShortName: String - - """Headsign of the vehicle when running on this trip""" - tripHeadsign( - """If a translated headsign is found from GTFS translation.txt and wanted language is not same as - feed's language then returns wanted translation. Otherwise uses name from trip_headsign.txt. - """ - language: String): String - - """ - Short name of the route this trip is running. See field `shortName` of Route. - """ - routeShortName: String +input DestinationBicyclePolicyInput { + "For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental bicycle first." + allowKeeping: Boolean + """ + Cost associated with arriving to the destination with a rented bicycle. + No cost is applied if arriving to the destination after dropping off the rented + bicycle. + """ + keepingCost: Cost +} - """ - Direction code of the trip, i.e. is this the outbound or inbound trip of a - pattern. Possible values: 0, 1 or `null` if the direction is irrelevant, i.e. - the pattern has trips only in one direction. - """ - directionId: String - blockId: String - shapeId: String +""" +Is it possible to arrive to the destination with a rented scooter and does it +come with an extra cost. +""" +input DestinationScooterPolicyInput { + "For networks that require station drop-off, should the routing engine offer results that go directly to the destination without dropping off the rental scooter first." + allowKeeping: Boolean + """ + Cost associated with arriving to the destination with a rented scooter. + No cost is applied if arriving to the destination after dropping off the rented + scooter. + """ + keepingCost: Cost +} - """Whether the vehicle running this trip can be boarded by a wheelchair""" - wheelchairAccessible: WheelchairBoarding +input InputBanned { + "A comma-separated list of banned agency ids" + agencies: String + "A comma-separated list of banned route ids" + routes: String + """ + A comma-separated list of banned stop ids. Note that these stops are only + banned for boarding and disembarking vehicles — it is possible to get an + itinerary where a vehicle stops at one of these stops + """ + stops: String @deprecated(reason : "Not implemented in OTP2.") + """ + A comma-separated list of banned stop ids. Only itineraries where these stops + are not travelled through are returned, e.g. if a bus route stops at one of + these stops, that route will not be used in the itinerary, even if the stop is + not used for boarding or disembarking the vehicle. + """ + stopsHard: String @deprecated(reason : "Not implemented in OTP2.") + "A comma-separated list of banned trip ids" + trips: String +} - """Whether bikes are allowed on board the vehicle running this trip""" - bikesAllowed: BikesAllowed +input InputCoordinates { + "The name of the place. If specified, the place name in results uses this value instead of `\"Origin\"` or `\"Destination\"`" + address: String + "Latitude of the place (WGS 84)" + lat: Float! + "The amount of time, in seconds, to spend at this location before venturing forth." + locationSlack: Int + "Longitude of the place (WGS 84)" + lon: Float! +} - """The pattern the trip is running on""" - pattern: Pattern +input InputFilters { + "Bike parks to include by id." + bikeParks: [String] + "Bike rentals to include by id (without network identifier)." + bikeRentalStations: [String] + "Car parks to include by id." + carParks: [String] + "Routes to include by GTFS id." + routes: [String] + "Stations to include by GTFS id." + stations: [String] + "Stops to include by GTFS id." + stops: [String] +} - """List of stops this trip passes through""" - stops: [Stop!]! +input InputModeWeight { + "The weight of AIRPLANE traverse mode. Values over 1 add cost to airplane travel and values under 1 decrease cost" + AIRPLANE: Float + "The weight of BUS traverse mode. Values over 1 add cost to bus travel and values under 1 decrease cost" + BUS: Float + "The weight of CABLE_CAR traverse mode. Values over 1 add cost to cable car travel and values under 1 decrease cost" + CABLE_CAR: Float + "The weight of FERRY traverse mode. Values over 1 add cost to ferry travel and values under 1 decrease cost" + FERRY: Float + "The weight of FUNICULAR traverse mode. Values over 1 add cost to funicular travel and values under 1 decrease cost" + FUNICULAR: Float + "The weight of GONDOLA traverse mode. Values over 1 add cost to gondola travel and values under 1 decrease cost" + GONDOLA: Float + "The weight of RAIL traverse mode. Values over 1 add cost to rail travel and values under 1 decrease cost" + RAIL: Float + "The weight of SUBWAY traverse mode. Values over 1 add cost to subway travel and values under 1 decrease cost" + SUBWAY: Float + "The weight of TRAM traverse mode. Values over 1 add cost to tram travel and values under 1 decrease cost" + TRAM: Float +} - """ - Hash code of the trip. This value is stable and not dependent on the trip id. - """ - semanticHash: String! +input InputPreferred { + "A comma-separated list of ids of the agencies preferred by the user." + agencies: String + """ + Penalty added for using every route that is not preferred if user set any + route as preferred. We return number of seconds that we are willing to wait + for preferred route. + """ + otherThanPreferredRoutesPenalty: Int + "A comma-separated list of ids of the routes preferred by the user." + routes: String +} + +""" +Relative importances of optimization factors. Only effective for bicycling legs. +Invariant: `timeFactor + slopeFactor + safetyFactor == 1` +""" +input InputTriangle { + "Relative importance of safety" + safetyFactor: Float + "Relative importance of flat terrain" + slopeFactor: Float + "Relative importance of duration" + timeFactor: Float +} - """List of times when this trip arrives to or departs from a stop""" - stoptimes: [Stoptime] +input InputUnpreferred { + "A comma-separated list of ids of the agencies unpreferred by the user." + agencies: String + "A comma-separated list of ids of the routes unpreferred by the user." + routes: String + """ + An cost function used to calculate penalty for an unpreferred route/agency. Function should return + number of seconds that we are willing to wait for unpreferred route/agency. + String must be of the format: + `A + B x`, where A is fixed penalty and B is a multiplier of transit leg travel time x. + For example: `600 + 2.0 x` + """ + unpreferredCost: String + """ + Penalty added for using route that is unpreferred, i.e. number of seconds that we are willing to + wait for route that is unpreferred. + + Deprecated: Use `unpreferredCost` instead. + """ + useUnpreferredRoutesPenalty: Int @deprecated(reason : "Use unpreferredCost instead") +} - """Departure time from the first stop""" - departureStoptime( - """ - Date for which the departure time is returned. Format: YYYYMMDD. If this - argument is not used, field `serviceDay` in the stoptime will have a value of 0. - """ - serviceDate: String - ): Stoptime +""" +The filter definition to include or exclude parking facilities used during routing. - """Arrival time to the final stop""" - arrivalStoptime( - """ - Date for which the arrival time is returned. Format: YYYYMMDD. If this - argument is not used, field `serviceDay` in the stoptime will have a value of 0. - """ - serviceDate: String - ): Stoptime - stoptimesForDate( - """Date for which stoptimes are returned. Format: YYYYMMDD""" - serviceDate: String - ): [Stoptime] +Logically, the filter algorithm work as follows: - """List of coordinates of this trip's route""" - geometry: [[Float]] +- The starting point is the set of all facilities, lets call it `A`. +- Then all `select` filters are applied to `A`, potentially reducing the number of facilities used. + Let's call the result of this `B`. + An empty `select` will lead to `A` being equal to `B`. +- Lastly, the `not` filters are applied to `B`, reducing the set further. + Lets call this final set `C`. + An empty `not` will lead to `B` being equal to `C`. +- The remaining parking facilities in `C` are used for routing. +""" +input ParkingFilter { + """ + Exclude parking facilities based on their properties. + + If empty nothing is excluded from the initial set of facilities but may be filtered down + further by the `select` filter. + """ + not: [ParkingFilterOperation!] + """ + Include parking facilities based on their properties. + + If empty everything is included from the initial set of facilities but may be filtered down + further by the `not` filter. + """ + select: [ParkingFilterOperation!] +} - """ - Coordinates of the route of this trip in Google polyline encoded format - """ - tripGeometry: Geometry +input ParkingFilterOperation { + "Filter parking facilities based on their tag" + tags: [String] +} - """ - By default, list of alerts which have directly an effect on just the trip. - It's also possible to return other relevant alerts through defining types. - """ - alerts( - """ - Returns alerts for these types that are relevant for the trip. - By default, list of alerts which have directly an effect on just the trip. - """ - types: [TripAlertType] - ): [Alert] +"A coordinate used for a location in a plan query." +input PlanCoordinateInput { + "Latitude as a WGS84 format number." + latitude: CoordinateValue! + "Longitude as a WGS84 format number." + longitude: CoordinateValue! +} - """ - The latest real-time occupancy information for the latest occurance of this - trip. - """ - occupancy: TripOccupancy +"Plan date time options. Only one of the values should be defined." +input PlanDateTimeInput @oneOf { + """ + Earliest departure date time. The returned itineraries should not + depart before this instant unless one is using paging to find earlier + itineraries. Note, it is not currently possible to define both + `earliestDeparture` and `latestArrival`. + """ + earliestDeparture: OffsetDateTime + """ + Latest arrival time date time. The returned itineraries should not + arrive to the destination after this instant unless one is using + paging to find later itineraries. Note, it is not currently possible + to define both `earliestDeparture` and `latestArrival`. + """ + latestArrival: OffsetDateTime } """ -Enable this to attach a system notice to itineraries instead of removing them. This is very -convenient when tuning the itinerary-filter-chain. +Settings that control the behavior of itinerary filtering. **These are advanced settings and +should not be set by a user through user preferences.** """ -enum ItineraryFilterDebugProfile { +input PlanItineraryFilterInput { """ - Only return the requested number of itineraries, counting both actual and deleted ones. - The top `numItineraries` using the request sort order is returned. This does not work - with paging, itineraries after the limit, but inside the search-window are skipped when - moving to the next page. + Pick one itinerary from each group after putting itineraries that are `85%` similar together, + if the given value is `0.85`, for example. Itineraries are grouped together based on relative + the distance of transit travel that is identical between the itineraries (access, egress and + transfers are ignored). The value must be at least `0.5`. """ - LIMIT_TO_NUMBER_OF_ITINERARIES - + groupSimilarityKeepOne: Ratio = 0.85 """ - Return all itineraries, including deleted ones, inside the actual search-window used - (the requested search-window may differ). + Pick three itineraries from each group after putting itineraries that are `68%` similar together, + if the given value is `0.68`, for example. Itineraries are grouped together based on relative + the distance of transit travel that is identical between the itineraries (access, egress and + transfers are ignored). The value must be at least `0.5`. """ - LIMIT_TO_SEARCH_WINDOW - - "List all itineraries, including all deleted itineraries." - LIST_ALL - - "By default, the debug itinerary filters is turned off." - OFF + groupSimilarityKeepThree: Ratio = 0.68 + """ + Of the itineraries grouped to maximum of three itineraries, how much worse can the non-grouped + legs be compared to the lowest cost. `2.0` means that they can be double the cost, and any + itineraries having a higher cost will be filtered away. Use a value lower than `1.0` to turn the + grouping off. + """ + groupedOtherThanSameLegsMaxCostMultiplier: Float = 2.0 + "Itinerary filter debug profile used to control the behaviour of itinerary filters." + itineraryFilterDebugProfile: ItineraryFilterDebugProfile = OFF } -"""Entities, which are relevant for a trip and can contain alerts""" -enum TripAlertType { - """Alerts affecting the trip""" - TRIP - - """Alerts affecting the trip's pattern""" - PATTERN - - """Alerts affecting the trip's agency""" - AGENCY +""" +Plan location settings. Location must be set. Label is optional +and used for naming the location. +""" +input PlanLabeledLocationInput { + """ + A label that can be attached to the location. This label is then returned with the location + in the itineraries. + """ + label: String + "A location that has to be used in an itinerary." + location: PlanLocationInput! +} - """Alerts affecting the trip's route""" - ROUTE +"Plan location. Either a coordinate or a stop location should be defined." +input PlanLocationInput @oneOf { + "Coordinate of the location. Note, either a coordinate or a stop location should be defined." + coordinate: PlanCoordinateInput + """ + Stop, station, a group of stop places or multimodal stop place that should be used as + a location for the search. The trip doesn't have to use the given stop location for a + transit connection as it's possible to start walking to another stop from the given + location. If a station or a group of stop places is provided, a stop that makes the most + sense for the journey is picked as the location within the station or group of stop places. + """ + stopLocation: PlanStopLocationInput +} - """Alerts affecting the route type of the trip's route""" - ROUTE_TYPE +"Mode selections for the plan search." +input PlanModesInput { + """ + Street mode that is used when searching for itineraries that don't use any transit. + If more than one mode is selected, at least one of them must be used but not necessarily all. + There are modes that automatically also use walking such as the rental modes. To force rental + to be used, this should only include the rental mode and not `WALK` in addition. + The default access mode is `WALK`. + """ + direct: [PlanDirectMode!] + "Should only the direct search without any transit be done." + directOnly: Boolean = false + """ + Modes for different phases of an itinerary when transit is included. Also + includes street mode selections related to connecting to the transit network + and transfers. By default, all transit modes are usable and `WALK` is used for + access, egress and transfers. + """ + transit: PlanTransitModesInput + """ + Should only the transit search be done and never suggest itineraries that don't + contain any transit legs. + """ + transitOnly: Boolean = false +} - """ - Alerts affecting the stops visited on the trip. - Some of the alerts can only affect the trip or its route on the stop. - """ - STOPS_ON_TRIP +"Wrapper type for different types of preferences related to plan query." +input PlanPreferencesInput { + "Accessibility preferences that affect both the street and transit routing." + accessibility: AccessibilityPreferencesInput + """ + Street routing preferences used for ingress, egress and transfers. These do not directly affect + the transit legs but can change how preferable walking or cycling, for example, is compared to + transit. + """ + street: PlanStreetPreferencesInput + "Transit routing preferences used for transit legs." + transit: TransitPreferencesInput } """ -Occupancy of a vehicle on a trip. This should include the most recent occupancy information -available for a trip. Historic data might not be available. +Stop, station, a group of stop places or multimodal stop place that should be used as +a location for the search. The trip doesn't have to use the given stop location for a +transit connection as it's possible to start walking to another stop from the given +location. If a station or a group of stop places is provided, a stop that makes the most +sense for the journey is picked as the location within the station or group of stop places. """ -type TripOccupancy { - """ - Occupancy information mapped to a limited set of descriptive states. - """ - occupancyStatus: OccupancyStatus +input PlanStopLocationInput { + """ + ID of the stop, station, a group of stop places or multimodal stop place. Format + should be `FeedId:StopLocationId`. + """ + stopLocationId: String! } """ -A system notice is used to tag elements with system information for debugging -or other system related purpose. One use-case is to run a routing search with -'debugItineraryFilter: true'. This will then tag itineraries instead of removing -them from the result. This make it possible to inspect the itinerary-filter-chain. -A SystemNotice only has english text, -because the primary user are technical staff, like testers and developers. +Street routing preferences used for ingress, egress and transfers. These do not directly affect +the transit legs but can change how preferable walking or cycling, for example, is compared to +transit. """ -type SystemNotice { - """Notice's tag""" - tag: String - """Notice's description""" - text: String +input PlanStreetPreferencesInput { + "Cycling related preferences." + bicycle: BicyclePreferencesInput + """ + Car related preferences. These are not used for car travel as part of transit, such as + taxi travel. + """ + car: CarPreferencesInput + "Scooter (kick or electrical) related preferences." + scooter: ScooterPreferencesInput + """ + Walk related preferences. These are not used when walking a bicycle or a scooter as they + have their own preferences. + """ + walk: WalkPreferencesInput +} + +"Transit mode and a reluctance associated with it." +input PlanTransitModePreferenceInput { + "Costs related to using a transit mode." + cost: TransitModePreferenceCostInput + "Transit mode that could be (but doesn't have to be) used in an itinerary." + mode: TransitMode! } """ -This is used for alert entities that we don't explicitly handle or they are missing. +Modes for different phases of an itinerary when transit is included. Also includes street +mode selections related to connecting to the transit network and transfers. """ -type Unknown { - """Entity's description""" - description: String +input PlanTransitModesInput { + """ + Street mode that is used when searching for access to the transit network from origin. + If more than one mode is selected, at least one of them must be used but not necessarily all. + There are modes that automatically also use walking such as the rental modes. To force rental + to be used, this should only include the rental mode and not `WALK` in addition. + The default access mode is `WALK`. + """ + access: [PlanAccessMode!] + """ + Street mode that is used when searching for egress to destination from the transit network. + If more than one mode is selected, at least one of them must be used but not necessarily all. + There are modes that automatically also use walking such as the rental modes. To force rental + to be used, this should only include the rental mode and not `WALK` in addition. + The default access mode is `WALK`. + """ + egress: [PlanEgressMode!] + """ + Street mode that is used when searching for transfers. Selection of only one allowed for now. + The default transfer mode is `WALK`. + """ + transfer: [PlanTransferMode!] + """ + Transit modes and reluctances associated with them. Each defined mode can be used in + an itinerary but doesn't have to be. If direct search is not disabled, there can be an + itinerary without any transit legs. By default, all transit modes are usable. + """ + transit: [PlanTransitModePreferenceInput!] } -enum VertexType { - """NORMAL""" - NORMAL +"What criteria should be used when optimizing a scooter route." +input ScooterOptimizationInput @oneOf { + "Define optimization by weighing three criteria." + triangle: TriangleScooterFactorsInput + "Use one of the predefined optimization types." + type: ScooterOptimizationType +} - """TRANSIT""" - TRANSIT +"Preferences related to travel with a scooter (kick or e-scooter)." +input ScooterPreferencesInput { + "What criteria should be used when optimizing a scooter route." + optimization: ScooterOptimizationInput + """ + A multiplier for how bad riding a scooter is compared to being in transit + for equal lengths of time. + """ + reluctance: Reluctance + "Scooter rental related preferences." + rental: ScooterRentalPreferencesInput + """ + Maximum speed on flat ground while riding a scooter. Note, this speed is higher than + the average speed will be in itineraries as this is the maximum speed but there are + factors that slow down the travel such as crossings, intersections and elevation changes. + """ + speed: Speed +} - """BIKEPARK""" - BIKEPARK +"Preferences related to scooter rental (station based or floating scooter rental)." +input ScooterRentalPreferencesInput { + "Rental networks which can be potentially used as part of an itinerary." + allowedNetworks: [String!] + "Rental networks which cannot be used as part of an itinerary." + bannedNetworks: [String!] + """ + Is it possible to arrive to the destination with a rented scooter and does it + come with an extra cost. + """ + destinationScooterPolicy: DestinationScooterPolicyInput +} - """BIKESHARE""" - BIKESHARE +input TimetablePreferencesInput { + """ + When false, real-time updates are considered during the routing. + In practice, when this option is set as true, some of the suggestions might not be + realistic as the transfers could be invalid due to delays, + trips can be cancelled or stops can be skipped. + """ + excludeRealTimeUpdates: Boolean + """ + When true, departures that have been cancelled ahead of time will be + included during the routing. This means that an itinerary can include + a cancelled departure while some other alternative that contains no cancellations + could be filtered out as the alternative containing a cancellation would normally + be better. + """ + includePlannedCancellations: Boolean + """ + When true, departures that have been cancelled through a real-time feed will be + included during the routing. This means that an itinerary can include + a cancelled departure while some other alternative that contains no cancellations + could be filtered out as the alternative containing a cancellation would normally + be better. This option can't be set to true while `includeRealTimeUpdates` is false. + """ + includeRealTimeCancellations: Boolean +} - """PARKANDRIDE""" - PARKANDRIDE +"Preferences related to transfers between transit vehicles (typically between stops)." +input TransferPreferencesInput { + "A static cost that is added for each transfer on top of other costs." + cost: Cost + """ + How many additional transfers there can be at maximum compared to the itinerary with the + least number of transfers. + """ + maximumAdditionalTransfers: Int + "How many transfers there can be at maximum in an itinerary." + maximumTransfers: Int + """ + A global minimum transfer time (in seconds) that specifies the minimum amount of time + that must pass between exiting one transit vehicle and boarding another. This time is + in addition to time it might take to walk between transit stops. Setting this value + as `PT0S`, for example, can lead to passenger missing a connection when the vehicle leaves + ahead of time or the passenger arrives to the stop later than expected. + """ + slack: Duration } -""" -Preferences for walking a bicycle. -""" -input BicycleWalkPreferencesInput { - """ - Maximum walk speed on flat ground. Note, this speed is higher than the average speed - will be in itineraries as this is the maximum speed but there are - factors that slow down walking such as crossings, intersections and elevation changes. - """ - speed: Speed +"Costs related to using a transit mode." +input TransitModePreferenceCostInput { + "A cost multiplier of transit leg travel time." + reluctance: Reluctance! +} - """ - Costs related to walking a bicycle. - """ - cost: BicycleWalkPreferencesCostInput +"Transit routing preferences used for transit legs." +input TransitPreferencesInput { + "Preferences related to alighting from a transit vehicle." + alight: AlightPreferencesInput + """ + Preferences related to boarding a transit vehicle. Note, board costs for each street mode + can be found under the street mode preferences. + """ + board: BoardPreferencesInput + "Preferences related to cancellations and real-time." + timetable: TimetablePreferencesInput + "Preferences related to transfers between transit vehicles (typically between stops)." + transfer: TransferPreferencesInput +} - """ - How long it takes to hop on or off a bicycle when switching to walking the bicycle - or when getting on the bicycle again. However, this is not applied when getting - on a rented bicycle for the first time or off the bicycle when returning the bicycle. - """ - mountDismountTime: Duration +"Transportation mode which can be used in the itinerary" +input TransportMode { + mode: Mode! + "Optional additional qualifier for transport mode, e.g. `RENT`" + qualifier: Qualifier } """ -Costs related to walking a bicycle. +Relative importance of optimization factors. Only effective for bicycling legs. +Invariant: `safety + flatness + time == 1` """ -input BicycleWalkPreferencesCostInput { - """ - A static cost that is added each time hopping on or off a bicycle to start or end - bicycle walking. However, this cost is not applied when getting on a rented bicycle - for the first time or when getting off the bicycle when returning the bicycle. - """ - mountDismountCost: Cost - - """ - A cost multiplier of bicycle walking travel time. The multiplier is for how bad - walking the bicycle is compared to being in transit for equal lengths of time. - """ - reluctance: Reluctance +input TriangleCyclingFactorsInput { + "Relative importance of flat terrain" + flatness: Ratio! + """ + Relative importance of cycling safety, but this factor can also include other + concerns such as convenience and general cyclist preferences by taking into account + road surface etc. + """ + safety: Ratio! + "Relative importance of duration" + time: Ratio! } """ -Preferences related to walking (excluding walking a bicycle or a scooter). +Relative importance of optimization factors. Only effective for scooter legs. +Invariant: `safety + flatness + time == 1` """ -input WalkPreferencesInput { - """ - Maximum walk speed on flat ground. Note, this speed is higher than the average speed - will be in itineraries as this is the maximum speed but there are - factors that slow down walking such as crossings, intersections and elevation changes. - """ - speed: Speed - - """ - A multiplier for how bad walking is compared to being in transit for equal lengths of time. - """ - reluctance: Reluctance - - """ - Factor for how much the walk safety is considered in routing. Value should be between 0 and 1. - If the value is set to be 0, safety is ignored. - """ - safetyFactor: Ratio - - """ - The cost of boarding a vehicle while walking. - """ - boardCost: Cost +input TriangleScooterFactorsInput { + "Relative importance of flat terrain" + flatness: Ratio! + """ + Relative importance of scooter safety, but this factor can also include other + concerns such as convenience and general scooter preferences by taking into account + road surface etc. + """ + safety: Ratio! + "Relative importance of duration" + time: Ratio! } -"""A fractional multiplier between 0 and 1, for example 0.25. 0 means 0% and 1 means 100%.""" -scalar Ratio - -enum WheelchairBoarding { - """There is no accessibility information for the stop.""" - NO_INFORMATION - - """ - At least some vehicles at this stop can be boarded by a rider in a wheelchair. - """ - POSSIBLE +"Preferences for parking facilities used during the routing." +input VehicleParkingInput { + """ + Selection filters to include or exclude parking facilities. + An empty list will include all facilities in the routing search. + """ + filters: [ParkingFilter] + """ + If non-empty every parking facility that doesn't match this set of conditions will + receive an extra cost (defined by `unpreferredCost`) and therefore avoided. + """ + preferred: [ParkingFilter] + """ + If `preferred` is non-empty, using a parking facility that doesn't contain + at least one of the preferred conditions, will receive this extra cost and therefore avoided if + preferred options are available. + """ + unpreferredCost: Int +} - """Wheelchair boarding is not possible at this stop.""" - NOT_POSSIBLE +"Preferences related to walking (excluding walking a bicycle or a scooter)." +input WalkPreferencesInput { + "The cost of boarding a vehicle while walking." + boardCost: Cost + "A multiplier for how bad walking is compared to being in transit for equal lengths of time." + reluctance: Reluctance + """ + Factor for how much the walk safety is considered in routing. Value should be between 0 and 1. + If the value is set to be 0, safety is ignored. + """ + safetyFactor: Ratio + """ + Maximum walk speed on flat ground. Note, this speed is higher than the average speed + will be in itineraries as this is the maximum speed but there are + factors that slow down walking such as crossings, intersections and elevation changes. + """ + speed: Speed } """ @@ -5607,9 +4268,9 @@ Wheelchair related preferences. Note, this is the only from of accessibilty avai currently and is sometimes is used for other accessibility needs as well. """ input WheelchairPreferencesInput { - """ - Is wheelchair accessibility considered in routing. Note, this does not guarantee - that the itineraries are wheelchair accessible as there can be data issues. - """ - enabled: Boolean + """ + Is wheelchair accessibility considered in routing. Note, this does not guarantee + that the itineraries are wheelchair accessible as there can be data issues. + """ + enabled: Boolean } From 6b715af4da5959e450a6e5cd07b5f7b1eed92a32 Mon Sep 17 00:00:00 2001 From: Joel Lappalainen Date: Thu, 13 Jun 2024 18:27:46 +0300 Subject: [PATCH 1371/1688] Update .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index acc28473a8c..563e178f4e7 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -4,3 +4,5 @@ # project-wide reformatting with prettier 9c9dd613489a348d2381acdcbeab8f86589154d7 +# reorder and reformat GTFS GraphQL API schema file with graphql-java +14051fab312a67cae9a460aaf0bbc77223bec624 From 01df869d893d503d24906d1a0fb23cd0646f0c8d Mon Sep 17 00:00:00 2001 From: sharhio Date: Fri, 14 Jun 2024 09:55:52 +0300 Subject: [PATCH 1372/1688] return systemUrl, filter neareast by network, hide unwanted networks in maplayer, handle empty name --- .../vehiclerental/VehicleRentalLayerBuilder.java | 3 +++ .../apis/gtfs/datafetchers/QueryTypeImpl.java | 2 ++ .../apis/gtfs/datafetchers/RentalVehicleImpl.java | 5 +++++ .../apis/gtfs/generated/GraphQLDataFetchers.java | 2 ++ .../apis/gtfs/generated/GraphQLTypes.java | 10 ++++++++++ .../apis/transmodel/TransmodelGraphQLSchema.java | 10 ++++++++++ .../inspector/vector/LayerParameters.java | 8 +++++++- .../routing/graphfinder/DirectGraphFinder.java | 1 + .../routing/graphfinder/GraphFinder.java | 1 + .../graphfinder/PlaceFinderTraverseVisitor.java | 6 ++++++ .../routing/graphfinder/StreetGraphFinder.java | 2 ++ .../datasources/GbfsGeofencingZoneMapper.java | 3 ++- .../org/opentripplanner/apis/gtfs/schema.graphqls | 6 ++++++ .../apis/transmodel/schema.graphql | 3 +++ .../apis/gtfs/GraphQLIntegrationTest.java | 1 + .../PlaceFinderTraverseVisitorTest.java | 6 ++++++ .../graphfinder/StreetGraphFinderTest.java | 15 +++++++++++++++ 17 files changed, 82 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java index 0869aeb2ba8..24d922bffb3 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java @@ -18,6 +18,7 @@ abstract class VehicleRentalLayerBuilder extends LayerBuilder { private final VehicleRentalService service; + private final List hideNetworks; public VehicleRentalLayerBuilder( VehicleRentalService service, @@ -30,6 +31,7 @@ public VehicleRentalLayerBuilder( layerParameters.expansionFactor() ); this.service = service; + this.hideNetworks = layerParameters.hideNetworks(); } @Override @@ -39,6 +41,7 @@ protected List getGeometries(Envelope query) { } return getVehicleRentalPlaces(service) .stream() + .filter(rental -> !hideNetworks.contains(rental.getNetwork())) .map(rental -> { Coordinate coordinate = new Coordinate(rental.getLongitude(), rental.getLatitude()); Point point = GeometryUtils.getGeometryFactory().createPoint(coordinate); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index eae4bc2ad33..d46fa2a8cf1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -330,6 +330,7 @@ public DataFetcher> nearest() { List filterByPlaceTypes = args.getGraphQLFilterByPlaceTypes() != null ? args.getGraphQLFilterByPlaceTypes().stream().map(GraphQLUtils::toModel).toList() : DEFAULT_PLACE_TYPES; + List filterByNetworkNames = args.getGraphQLFilterByNetworkNames(); List places; try { @@ -347,6 +348,7 @@ public DataFetcher> nearest() { filterByStations, filterByRoutes, filterByBikeRentalStations, + filterByNetworkNames, getTransitService(environment) ) ); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java index 53c3ba1343d..84b45270a8b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java @@ -61,6 +61,11 @@ public DataFetcher vehicleType() { return environment -> getSource(environment).vehicleType; } + @Override + public DataFetcher systemUrl() { + return environment -> getSource(environment).system.url; + } + private VehicleRentalVehicle getSource(DataFetchingEnvironment environment) { return environment.getSource(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 6c66d3992f4..7b35af403cc 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -857,6 +857,8 @@ public interface GraphQLRentalVehicle { public DataFetcher vehicleId(); public DataFetcher vehicleType(); + + DataFetcher systemUrl(); } public interface GraphQLRentalVehicleEntityCounts { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index 3c187ca3bbe..0608e97aa77 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -2416,6 +2416,7 @@ public static class GraphQLQueryTypeNearestArgs { private Double lon; private Integer maxDistance; private Integer maxResults; + private List filterByNetworkNames; public GraphQLQueryTypeNearestArgs(Map args) { if (args != null) { @@ -2447,6 +2448,7 @@ public GraphQLQueryTypeNearestArgs(Map args) { this.lon = (Double) args.get("lon"); this.maxDistance = (Integer) args.get("maxDistance"); this.maxResults = (Integer) args.get("maxResults"); + this.filterByNetworkNames = (List) args.get("filterByNetworkNames"); } } @@ -2537,6 +2539,14 @@ public void setGraphQLMaxDistance(Integer maxDistance) { public void setGraphQLMaxResults(Integer maxResults) { this.maxResults = maxResults; } + + public List getGraphQLFilterByNetworkNames() { + return this.filterByNetworkNames; + } + + public void setGraphQLFilterByNetworkNames(List networkNames) { + this.filterByNetworkNames = networkNames; + } } public static class GraphQLQueryTypeNodeArgs { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java index 638d7783e9a..455c7400718 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java @@ -847,6 +847,14 @@ private GraphQLSchema create() { .type(Scalars.GraphQLInt) .build() ) + .argument( + GraphQLArgument + .newArgument() + .name("filterByNetworkNames") + .description("Only include places that match one of the given network names.") + .type(new GraphQLList(Scalars.GraphQLString)) + .build() + ) .argument( GraphQLArgument .newArgument() @@ -937,6 +945,7 @@ private GraphQLSchema create() { if (placeTypes.contains(TransmodelPlaceType.STOP_PLACE)) { maxResults *= 5; } + List filterByNetworkNames = environment.getArgument("filterByNetworkNames"); List places; places = @@ -953,6 +962,7 @@ private GraphQLSchema create() { filterByStations, filterByRoutes, filterByBikeRentalStations, + filterByNetworkNames, GqlUtil.getTransitService(environment) ); diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java index ca4a6a64c76..23d5d3c2f59 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java +++ b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java @@ -1,5 +1,7 @@ package org.opentripplanner.inspector.vector; +import java.util.ArrayList; +import java.util.List; import org.opentripplanner.apis.support.mapping.PropertyMapper; /** @@ -10,7 +12,7 @@ public interface LayerParameters> { int MAX_ZOOM = 20; int CACHE_MAX_SECONDS = -1; double EXPANSION_FACTOR = 0.25d; - + List HIDE_NETWORKS = new ArrayList<>(); /** * User-visible name of the layer */ @@ -54,4 +56,8 @@ default int cacheMaxSeconds() { default double expansionFactor() { return EXPANSION_FACTOR; } + + default List hideNetworks() { + return HIDE_NETWORKS; + } } diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java index 5ffa7cd2301..7eaf60e38f1 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java @@ -63,6 +63,7 @@ public List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, + List filterByNetworkNames, TransitService transitService ) { throw new UnsupportedOperationException("Not implemented"); diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java index 4c0b0c81144..eecc4f8015a 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java @@ -69,6 +69,7 @@ List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, + List filterByNetworkNames, TransitService transitService ); } diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java index e71504d58f3..6b06e358103 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java @@ -44,6 +44,7 @@ public class PlaceFinderTraverseVisitor implements TraverseVisitor private final boolean includeStations; private final int maxResults; private final double radiusMeters; + private final Set filterByNetworkNames; /** * @param transitService A TransitService used in finding information about the @@ -69,6 +70,7 @@ public PlaceFinderTraverseVisitor( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, + List filterByNetworkNames, int maxResults, double radiusMeters ) { @@ -82,6 +84,7 @@ public PlaceFinderTraverseVisitor( this.filterByStations = toSet(filterByStations); this.filterByRoutes = toSet(filterByRoutes); this.filterByVehicleRental = toSet(filterByBikeRentalStations); + this.filterByNetworkNames = toSet(filterByNetworkNames); includeStops = shouldInclude(filterByPlaceTypes, PlaceType.STOP); includePatternAtStops = shouldInclude(filterByPlaceTypes, PlaceType.PATTERN_AT_STOP); @@ -264,6 +267,9 @@ private void handleVehicleRental(VehicleRentalPlace station, double distance) { if (seenVehicleRentalPlaces.contains(station.getId())) { return; } + if (!filterByNetworkNames.isEmpty() && !filterByNetworkNames.contains(station.getNetwork())) { + return; + } seenVehicleRentalPlaces.add(station.getId()); placesFound.add(new PlaceAtDistance(station, distance)); } diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java index 1b2b1d8f522..48b4236cd5b 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java @@ -56,6 +56,7 @@ public List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, + List filterByNetworkNames, TransitService transitService ) { PlaceFinderTraverseVisitor visitor = new PlaceFinderTraverseVisitor( @@ -66,6 +67,7 @@ public List findClosestPlaces( filterByStations, filterByRoutes, filterByBikeRentalStations, + filterByNetworkNames, maxResults, radiusMeters ); diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java index caf5d97c0d4..78fa7533d58 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java @@ -51,7 +51,8 @@ private GeofencingZone toInternalModel(GBFSFeature f) { LOG.error("Could not convert geofencing zone", e); return null; } - var name = Objects.requireNonNullElseGet(f.getProperties().getName(), () -> fallbackId(g)); + var nameFromData = f.getProperties().getName().isEmpty() ? null : f.getProperties().getName(); + var name = Objects.requireNonNullElseGet(nameFromData, () -> fallbackId(g)); var dropOffBanned = !f.getProperties().getRules().get(0).getRideAllowed(); var passThroughBanned = !f.getProperties().getRules().get(0).getRideThroughAllowed(); return new GeofencingZone( diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 79a794b3607..f0fc391a31e 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -742,6 +742,9 @@ type RentalVehicle implements Node & PlaceInterface { """The type of the rental vehicle (scooter, bicycle, car...)""" vehicleType: RentalVehicleType + + """The rental vehicle operator's system URL.""" + systemUrl: String! } type BikeRentalStationUris { @@ -3543,6 +3546,9 @@ type QueryType { """ filterByModes: [Mode] + """Only include places that match one of the given network names.""" + filterByNetworkNames: [String] + """Only include places that match one of the given GTFS ids.""" filterByIds: InputFilters @deprecated(reason: "Not actively maintained") before: String diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index fbaa2418d7e..7b9fdb3f386 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -675,6 +675,8 @@ type QueryType { filterByInUse: Boolean = false, "Only include places that include this mode. Only checked for places with mode i.e. quays, departures." filterByModes: [TransportMode], + """Only include places that match one of the given network names.""" + filterByNetworkNames: [String], "Only include places of given types if set. Default accepts all types" filterByPlaceTypes: [FilterPlaceType] = [quay, stopPlace, bicycleRent, bikePark, carPark], "fetching only the first certain number of nodes" @@ -953,6 +955,7 @@ type RentalVehicle implements PlaceInterface { longitude: Float! network: String! vehicleType: RentalVehicleType! + systemUrl: String! } type RentalVehicleType { diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index 614c8778c6b..cb1d919637e 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -448,6 +448,7 @@ public List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, + List filterByNetworkNames, TransitService transitService ) { return List diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java index 1ef675c8101..0796176d9bb 100644 --- a/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java +++ b/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java @@ -96,6 +96,7 @@ void stopsOnly() { null, null, null, + null, 1, 500 ); @@ -124,6 +125,7 @@ void stationsOnly() { null, null, null, + null, 1, 500 ); @@ -152,6 +154,7 @@ void stopsAndStations() { null, null, null, + null, 1, 500 ); @@ -183,6 +186,7 @@ void stopsAndStationsWithStationFilter() { List.of(STATION1.getId()), null, null, + null, 1, 500 ); @@ -217,6 +221,7 @@ void stopsAndStationsWithStopFilter() { null, null, null, + null, 1, 500 ); @@ -250,6 +255,7 @@ void stopsAndStationsWithStopAndStationFilter() { List.of(STATION1.getId()), null, null, + null, 1, 500 ); diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java index 3285e27594c..76f231577dd 100644 --- a/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java +++ b/src/test/java/org/opentripplanner/routing/graphfinder/StreetGraphFinderTest.java @@ -156,6 +156,7 @@ void findClosestPlacesLimiting() { null, null, null, + null, transitService ) ); @@ -179,6 +180,7 @@ void findClosestPlacesLimiting() { null, null, null, + null, transitService ) ); @@ -196,6 +198,7 @@ void findClosestPlacesLimiting() { null, null, null, + null, transitService ) ); @@ -220,6 +223,7 @@ void findClosestPlacesWithAModeFilter() { null, null, null, + null, transitService ) ); @@ -237,6 +241,7 @@ void findClosestPlacesWithAModeFilter() { null, null, null, + null, transitService ) ); @@ -262,6 +267,7 @@ void findClosestPlacesWithAStopFilter() { null, null, null, + null, transitService ) ); @@ -279,6 +285,7 @@ void findClosestPlacesWithAStopFilter() { null, null, null, + null, transitService ) ); @@ -304,6 +311,7 @@ void findClosestPlacesWithAStopAndRouteFilter() { null, null, null, + null, transitService ) ); @@ -321,6 +329,7 @@ void findClosestPlacesWithAStopAndRouteFilter() { null, List.of(R1.getId()), null, + null, transitService ) ); @@ -347,6 +356,7 @@ void findClosestPlacesWithARouteFilter() { null, null, null, + null, transitService ) ); @@ -364,6 +374,7 @@ void findClosestPlacesWithARouteFilter() { null, List.of(R2.getId()), null, + null, transitService ) ); @@ -387,6 +398,7 @@ void findClosestPlacesWithAVehicleRentalFilter() { null, null, null, + null, transitService ) ); @@ -404,6 +416,7 @@ void findClosestPlacesWithAVehicleRentalFilter() { null, null, List.of("BR2"), + null, transitService ) ); @@ -426,6 +439,7 @@ void findClosestPlacesWithABikeParkFilter() { null, null, null, + null, transitService ) ); @@ -448,6 +462,7 @@ void findClosestPlacesWithACarParkFilter() { null, null, null, + null, transitService ) ); From d8b5fc7c526391c5c191049ad6e92f23b00614da Mon Sep 17 00:00:00 2001 From: sharhio Date: Fri, 14 Jun 2024 10:35:57 +0300 Subject: [PATCH 1373/1688] schema --- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 4 +++- .../org/opentripplanner/apis/transmodel/schema.graphql | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index f0fc391a31e..a4f53553e71 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3546,7 +3546,9 @@ type QueryType { """ filterByModes: [Mode] - """Only include places that match one of the given network names.""" + """ + Only include places that match one of the given network names. + """ filterByNetworkNames: [String] """Only include places that match one of the given GTFS ids.""" diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 7b9fdb3f386..03b97cab376 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -675,7 +675,7 @@ type QueryType { filterByInUse: Boolean = false, "Only include places that include this mode. Only checked for places with mode i.e. quays, departures." filterByModes: [TransportMode], - """Only include places that match one of the given network names.""" + "Only include places that match one of the given network names." filterByNetworkNames: [String], "Only include places of given types if set. Default accepts all types" filterByPlaceTypes: [FilterPlaceType] = [quay, stopPlace, bicycleRent, bikePark, carPark], @@ -955,7 +955,6 @@ type RentalVehicle implements PlaceInterface { longitude: Float! network: String! vehicleType: RentalVehicleType! - systemUrl: String! } type RentalVehicleType { From 7f69e900fa643fa6c4d40a4eb905d439524bfc46 Mon Sep 17 00:00:00 2001 From: sharhio Date: Fri, 14 Jun 2024 10:49:00 +0300 Subject: [PATCH 1374/1688] docs --- .../org/opentripplanner/inspector/vector/LayerParameters.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java index 23d5d3c2f59..0348cf0265e 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java +++ b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java @@ -57,6 +57,9 @@ default double expansionFactor() { return EXPANSION_FACTOR; } + /** + * A list of networks to hide from the results. + */ default List hideNetworks() { return HIDE_NETWORKS; } From 44c79dc65d55ce6bb8bb6827cf1cf039b663ddb1 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 14 Jun 2024 09:27:04 +0200 Subject: [PATCH 1375/1688] Fix too large response cancellation --- .../restapi/resources/PlannerResource.java | 5 ++-- .../opentripplanner/api/common/Message.java | 2 +- .../MaxFieldsInResultInstrumentation.java | 3 +-- .../transmodel/ResponseTooLargeException.java | 11 ++++++++ .../apis/transmodel/TransmodelGraph.java | 6 +++-- ...nprocessableRequestExecutionStrategy.java} | 22 ++++++++++------ .../support/ExecutionResultMapper.java | 26 ++++++++++++++----- src/main/resources/Message.properties | 2 +- src/main/resources/Message_de.properties | 2 +- src/main/resources/Message_es.properties | 2 +- src/main/resources/Message_fr.properties | 2 +- src/main/resources/Message_hu.properties | 2 +- src/main/resources/Message_nl.properties | 2 +- .../support/ExecutionResultMapperTest.java | 22 ++++++++++++++++ 14 files changed, 81 insertions(+), 28 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java rename src/main/java/org/opentripplanner/apis/transmodel/support/{AbortOnTimeoutExecutionStrategy.java => AbortOnUnprocessableRequestExecutionStrategy.java} (62%) diff --git a/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java b/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java index 38c70851b76..9c58c1c719d 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/resources/PlannerResource.java @@ -12,6 +12,7 @@ import org.opentripplanner.api.common.Message; import org.opentripplanner.api.error.PlannerError; import org.opentripplanner.apis.support.mapping.PlannerErrorMapper; +import org.opentripplanner.apis.transmodel.ResponseTooLargeException; import org.opentripplanner.ext.restapi.mapping.TripPlanMapper; import org.opentripplanner.ext.restapi.mapping.TripSearchMetadataMapper; import org.opentripplanner.ext.restapi.model.ElevationMetadata; @@ -104,8 +105,8 @@ public Response plan(@Context UriInfo uriInfo, @Context Request grizzlyRequest) LOG.error("System error - unhandled error case?", e); response.setError(new PlannerError(Message.SYSTEM_ERROR)); } - } catch (OTPRequestTimeoutException e) { - response.setError(new PlannerError(Message.PROCESSING_TIMEOUT)); + } catch (OTPRequestTimeoutException | ResponseTooLargeException e) { + response.setError(new PlannerError(Message.UNPROCESSABLE_REQUEST)); } catch (Exception e) { LOG.error("System error", e); response.setError(new PlannerError(Message.SYSTEM_ERROR)); diff --git a/src/main/java/org/opentripplanner/api/common/Message.java b/src/main/java/org/opentripplanner/api/common/Message.java index 9a07d8c33d6..3e568d57940 100644 --- a/src/main/java/org/opentripplanner/api/common/Message.java +++ b/src/main/java/org/opentripplanner/api/common/Message.java @@ -15,7 +15,7 @@ public enum Message { PLAN_OK(200), SYSTEM_ERROR(500), - PROCESSING_TIMEOUT(422), + UNPROCESSABLE_REQUEST(422), GRAPH_UNAVAILABLE(503), diff --git a/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java b/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java index 6d22f18783c..7cc356e5f6b 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/MaxFieldsInResultInstrumentation.java @@ -3,7 +3,6 @@ import static graphql.execution.instrumentation.SimpleInstrumentationContext.noOp; import graphql.ExecutionResult; -import graphql.execution.AbortExecutionException; import graphql.execution.instrumentation.Instrumentation; import graphql.execution.instrumentation.InstrumentationContext; import graphql.execution.instrumentation.InstrumentationState; @@ -47,7 +46,7 @@ public InstrumentationContext beginFieldFetch( if (fetched % 10000 == 0) { LOG.debug("Fetched {} fields", fetched); if (fetched > maxFieldFetch) { - throw new AbortExecutionException( + throw new ResponseTooLargeException( "The number of fields in the GraphQL result exceeds the maximum allowed: " + maxFieldFetch ); } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java b/src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java new file mode 100644 index 00000000000..a6b070e8fdd --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/transmodel/ResponseTooLargeException.java @@ -0,0 +1,11 @@ +package org.opentripplanner.apis.transmodel; + +/** + * Exception thrown when the API response exceeds a configurable limit. + */ +public class ResponseTooLargeException extends RuntimeException { + + public ResponseTooLargeException(String message) { + super(message); + } +} diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java index 1bff91638fd..d755c509989 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.opentripplanner.apis.transmodel.support.AbortOnTimeoutExecutionStrategy; +import org.opentripplanner.apis.transmodel.support.AbortOnUnprocessableRequestExecutionStrategy; import org.opentripplanner.apis.transmodel.support.ExecutionResultMapper; import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation; import org.opentripplanner.framework.application.OTPFeature; @@ -50,7 +50,7 @@ Response executeGraphQL( int maxNumberOfResultFields, Iterable tracingTags ) { - try (var executionStrategy = new AbortOnTimeoutExecutionStrategy()) { + try (var executionStrategy = new AbortOnUnprocessableRequestExecutionStrategy()) { variables = ObjectUtils.ifNotNull(variables, new HashMap<>()); var instrumentation = createInstrumentation(maxNumberOfResultFields, tracingTags); var transmodelRequestContext = createRequestContext(serverContext); @@ -69,6 +69,8 @@ Response executeGraphQL( return ExecutionResultMapper.okResponse(result); } catch (OTPRequestTimeoutException te) { return ExecutionResultMapper.timeoutResponse(); + } catch (ResponseTooLargeException rtle) { + return ExecutionResultMapper.tooLargeResponse(rtle.getMessage()); } catch (CoercingParseValueException | UnknownOperationException e) { return ExecutionResultMapper.badRequestResponse(e.getMessage()); } catch (Exception systemError) { diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnTimeoutExecutionStrategy.java b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java similarity index 62% rename from src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnTimeoutExecutionStrategy.java rename to src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java index a925aff0a1d..a8a664fc18d 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnTimeoutExecutionStrategy.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java @@ -5,22 +5,28 @@ import graphql.schema.DataFetchingEnvironment; import java.io.Closeable; import java.util.concurrent.CompletableFuture; +import org.opentripplanner.apis.transmodel.ResponseTooLargeException; import org.opentripplanner.framework.application.OTPRequestTimeoutException; import org.opentripplanner.framework.logging.ProgressTracker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * To abort fetching data when a timeout occurs we have to rethrow the time-out-exception. + * To abort fetching data when a request is unprocessable (either because the execution times + * out or because the response is too large) we have to rethrow the exception. * This will prevent unresolved data-fetchers to be called. The exception is not handled * gracefully. */ -public class AbortOnTimeoutExecutionStrategy extends AsyncExecutionStrategy implements Closeable { +public class AbortOnUnprocessableRequestExecutionStrategy + extends AsyncExecutionStrategy + implements Closeable { - private static final Logger LOG = LoggerFactory.getLogger(AbortOnTimeoutExecutionStrategy.class); + private static final Logger LOG = LoggerFactory.getLogger( + AbortOnUnprocessableRequestExecutionStrategy.class + ); public static final int LOG_STEPS = 25_000; private final ProgressTracker timeoutProgressTracker = ProgressTracker.track( - "TIMEOUT! Abort GraphQL query", + "Unprocessable request. Abort GraphQL query", LOG_STEPS, -1 ); @@ -31,15 +37,15 @@ protected CompletableFuture handleFetchingException( ExecutionStrategyParameters params, Throwable e ) { - if (e instanceof OTPRequestTimeoutException te) { - logTimeoutProgress(); - throw te; + if (e instanceof OTPRequestTimeoutException || e instanceof ResponseTooLargeException) { + logCancellationProgress(); + throw (RuntimeException) e; } return super.handleFetchingException(environment, params, e); } @SuppressWarnings("Convert2MethodRef") - private void logTimeoutProgress() { + private void logCancellationProgress() { timeoutProgressTracker.startOrStep(m -> LOG.info(m)); } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java b/src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java index d0ccb198e16..aac9cb1bb7c 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapper.java @@ -16,6 +16,11 @@ public class ExecutionResultMapper { private static final ErrorClassification API_PROCESSING_TIMEOUT = ErrorClassification.errorClassification( "ApiProcessingTimeout" ); + + private static final ErrorClassification RESPONSE_TOO_LARGE = ErrorClassification.errorClassification( + "ResponseTooLarge" + ); + private static final ErrorClassification BAD_REQUEST_ERROR = ErrorClassification.errorClassification( "BadRequestError" ); @@ -29,13 +34,11 @@ public static Response okResponse(ExecutionResult result) { } public static Response timeoutResponse() { - var error = GraphQLError - .newError() - .errorType(API_PROCESSING_TIMEOUT) - .message(OTPRequestTimeoutException.MESSAGE) - .build(); - var result = ExecutionResult.newExecutionResult().addError(error).build(); - return response(result, OtpHttpStatus.STATUS_UNPROCESSABLE_ENTITY); + return unprocessableResponse(API_PROCESSING_TIMEOUT, OTPRequestTimeoutException.MESSAGE); + } + + public static Response tooLargeResponse(String message) { + return unprocessableResponse(RESPONSE_TOO_LARGE, message); } public static Response badRequestResponse(String message) { @@ -56,4 +59,13 @@ public static Response response(ExecutionResult result, Response.StatusType stat .entity(GraphQLResponseSerializer.serialize(result)) .build(); } + + private static Response unprocessableResponse( + ErrorClassification errorClassification, + String message + ) { + var error = GraphQLError.newError().errorType(errorClassification).message(message).build(); + var result = ExecutionResult.newExecutionResult().addError(error).build(); + return response(result, OtpHttpStatus.STATUS_UNPROCESSABLE_ENTITY); + } } diff --git a/src/main/resources/Message.properties b/src/main/resources/Message.properties index 5c6011e3d3d..931b25c8b3b 100644 --- a/src/main/resources/Message.properties +++ b/src/main/resources/Message.properties @@ -8,7 +8,7 @@ SYSTEM_ERROR = We're sorry. The trip planner is temporarily unavailable. Please GRAPH_UNAVAILABLE = We're sorry. The trip planner is temporarily unavailable. Please try again later. OUTSIDE_BOUNDS = Trip is not possible. You might be trying to plan a trip outside the map data boundary. -PROCESSING_TIMEOUT = The trip planner is taking too long to process your request. +UNPROCESSABLE_REQUEST = The trip planner is taking too long time or too much resources to process your request. BOGUS_PARAMETER = The request has errors that the server is not willing or able to process. LOCATION_NOT_ACCESSIBLE = The location was found, but no stops could be found within the search radius. PATH_NOT_FOUND = No trip found. There may be no transit service within the maximum specified distance or at the specified time, or your start or end point might not be safely accessible. diff --git a/src/main/resources/Message_de.properties b/src/main/resources/Message_de.properties index 1b0d8a2322e..6862a993c71 100644 --- a/src/main/resources/Message_de.properties +++ b/src/main/resources/Message_de.properties @@ -2,7 +2,7 @@ PLAN_OK = Success SYSTEM_ERROR = Es tut uns leid, leider steht der Trip-Planer momentan nicht zur Verfügung. Bitte versuchen Sie es zu einem späteren Zeitpunkt nochmal. OUTSIDE_BOUNDS = Planung nicht möglich. Vielleicht versuchen sie einen Plan außerhalb der Kartengrenzen zu planen. -PROCESSING_TIMEOUT = Der Trip-Planner braucht zu lange um die Anfrage zu bearbeiten +UNPROCESSABLE_REQUEST = Der Trip-Planner braucht zu lange um die Anfrage zu bearbeiten BOGUS_PARAMETER = Die Anfrage ist fehlerhaft so dass sie der Server nicht bearbeiten möchte oder kann. PATH_NOT_FOUND = Planung nicht möglich. Ihr Start- oder Endpunkt könnte nicht erreichbar sein. Bitte stellen sie sicher, dass ihre Anfrage innerhalb der Kartendaten ist. NO_TRANSIT_TIMES = Keine Fahrzeiten verfügbar. Das Datum kann zu weit in der Vergangenheit oder zu weit in der Zukunft liegen oder es gibt keinen Verkehrsbetrieb zu dem von Ihnen gewählten Zeitpunkt. diff --git a/src/main/resources/Message_es.properties b/src/main/resources/Message_es.properties index 0c5fe7a9395..88b7c849acb 100644 --- a/src/main/resources/Message_es.properties +++ b/src/main/resources/Message_es.properties @@ -8,7 +8,7 @@ SYSTEM_ERROR = ES-We're sorry. The trip planner is temporarily unavailable. Plea GRAPH_UNAVAILABLE = ES-We're sorry. The trip planner is temporarily unavailable. Please try again later. OUTSIDE_BOUNDS = ES-los trip is not possible. You might be trying to plan a trip outside the map data boundary. -PROCESSING_TIMEOUT = ES-los trip planner is taking too long to process your request. +UNPROCESSABLE_REQUEST = ES-los trip planner is taking too long time or too much resources to process your request. BOGUS_PARAMETER = ES-los request has errors that the server is not willing or able to process. PATH_NOT_FOUND = ES-los trip is not possible. Please check that you plan is within the bound of the map. NO_TRANSIT_TIMES = ES-Non transit times available. The date may be past or too far in the future or there may not be transit service for your trip at the time you chose. diff --git a/src/main/resources/Message_fr.properties b/src/main/resources/Message_fr.properties index 6f7b73c1997..66ff82bbc59 100644 --- a/src/main/resources/Message_fr.properties +++ b/src/main/resources/Message_fr.properties @@ -8,7 +8,7 @@ SYSTEM_ERROR = Désolé: le calculateur d'itinéraires est temporairement indisp GRAPH_UNAVAILABLE = Désolé: le calculateur d'itinéraires est temporairement indisponible. Veuillez recommencer ultérieurement. OUTSIDE_BOUNDS = Impossible de calculer un itinéraire. Vous essayez de planifier un itinéraire hors des limites de la zone couverte. -PROCESSING_TIMEOUT = Le calculateur d'itinéraires prend trop de temps pour gérer votre demande. +UNPROCESSABLE_REQUEST = Le calculateur d'itinéraires prend trop de temps ou de resources pour gérer votre demande. BOGUS_PARAMETER = Le serveur ne peut pas prendre en compte la requête, elle contient des paramètres erronés. PATH_NOT_FOUND = Impossible de calculer un itinéraire. Veuillez vérifier que le trajet demandé est inclus dans la zone couverte. NO_TRANSIT_TIMES = Aucun voyage disponible. Soit la date est trop loin dans le futur, soit il n'y a pas de service ce jour. diff --git a/src/main/resources/Message_hu.properties b/src/main/resources/Message_hu.properties index eca5fad9b10..f72f2295581 100644 --- a/src/main/resources/Message_hu.properties +++ b/src/main/resources/Message_hu.properties @@ -8,7 +8,7 @@ SYSTEM_ERROR = Sajn\u00E1ljuk. Az \u00FAtvonaltervez\u0151 \u00E1tmenetileg GRAPH_UNAVAILABLE = Sajn\u00E1ljuk. Az \u00FAtvonaltervez\u0151 \u00E1tmenetileg nem el\u00E9rhet\u0151. K\u00E9rj\u00FCk, pr\u00F3b\u00E1lja \u00FAjra k\u00E9s\u0151bb. OUTSIDE_BOUNDS = Az utaz\u00E1s nem lehets\u00E9ges. Lehet, hogy a t\u00E9rk\u00E9padat-hat\u00E1ron k\u00EDv\u00FCli utat pr\u00F3b\u00E1l megtervezni. -PROCESSING_TIMEOUT = Az utaz\u00E1stervez\u0151 t\u00FAl sok\u00E1ig tart a k\u00E9r\u00E9s feldolgoz\u00E1s\u00E1hoz. +UNPROCESSABLE_REQUEST = Az utaz\u00E1stervez\u0151 t\u00FAl sok\u00E1ig tart a k\u00E9r\u00E9s feldolgoz\u00E1s\u00E1hoz. BOGUS_PARAMETER = A k\u00E9r\u00E9s olyan hib\u00E1kat tartalmaz, amelyeket a szerver nem hajland\u00F3 vagy nem k\u00E9pes feldolgozni. LOCATION_NOT_ACCESSIBLE = A helyek megtal\u00E1lhat\u00F3ak, de meg\u00E1ll\u00F3k nem tal\u00E1lhat\u00F3 a keres\u00E9si k\u00F6rzetben. PATH_NOT_FOUND = Nem tal\u00E1lhat\u00F3 utaz\u00E1s. El\u0151fordulhat, hogy a megadott maxim\u00E1lis t\u00E1vols\u00E1gon bel\u00FCl vagy a megadott id\u0151pontban nincs t\u00F6megk\u00F6zleked\u00E9si szolg\u00E1ltat\u00E1s, vagy a kezd\u0151- vagy v\u00E9gpont nem \u00E9rhet\u0151 el biztons\u00E1gosan. diff --git a/src/main/resources/Message_nl.properties b/src/main/resources/Message_nl.properties index 1e18c998264..2a7a1b7700b 100644 --- a/src/main/resources/Message_nl.properties +++ b/src/main/resources/Message_nl.properties @@ -8,7 +8,7 @@ SYSTEM_ERROR = Onze excuses. De routeplanner is momenteel niet beschikbaar. Prob GRAPH_UNAVAILABLE = Onze excuses. De routeplanner is momenteel niet beschikbaar. Probeer later opnieuw. OUTSIDE_BOUNDS = Deze reis is niet mogelijk. Mogelijk probeert u een reis te plannen buiten het beschikbare gebied -PROCESSING_TIMEOUT = De routeplanner is te lang bezig met uw verzoek. +UNPROCESSABLE_REQUEST = De routeplanner is te lang bezig met uw verzoek. BOGUS_PARAMETER = Uw verzoek bevat fouten die de server niet wil or kan verwerken. PATH_NOT_FOUND = Reis is niet mogelijk. Misschien is het startpunt of de bestemming niet veilig toegankelijk. Bijvoorbeeld een straat alleen verbonden met een snelweg. NO_TRANSIT_TIMES = Geen OV-informatie beschikbaar. De datum is mogelijk te ver in het verleden of te ver in de toekomst. Of er is geen dienst voor uw reis op het moment dat u wilt. diff --git a/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java index bce971e9f1e..b697adc9288 100644 --- a/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java +++ b/src/test/java/org/opentripplanner/apis/transmodel/support/ExecutionResultMapperTest.java @@ -34,6 +34,21 @@ class ExecutionResultMapperTest { "}" ); + public static final String TOO_LARGE_MESSAGE = + "The number of fields in the GraphQL result exceeds the maximum allowed: 100000"; + + private static final String TOO_LARGE_RESPONSE = quoteReplace( + "{'" + + "errors':[{" + + "'message':'" + + TOO_LARGE_MESSAGE + + "'," + + "'locations':[]," + + "'extensions':{'classification':'ResponseTooLarge'}" + + "}]" + + "}" + ); + public static final String SYSTEM_ERROR_MESSAGE = "A system error!"; public static final String SYSTEM_ERROR_RESPONSE = quoteReplace( @@ -62,6 +77,13 @@ void timeoutResponse() { assertEquals(TIMEOUT_RESPONSE, response.getEntity().toString()); } + @Test + void tooLargeResponse() { + var response = ExecutionResultMapper.tooLargeResponse(TOO_LARGE_MESSAGE); + assertEquals(422, response.getStatus()); + assertEquals(TOO_LARGE_RESPONSE, response.getEntity().toString()); + } + @Test void systemErrorResponse() { var response = ExecutionResultMapper.systemErrorResponse(SYSTEM_ERROR_MESSAGE); From 55cf76eeb98c51db7ecb3f09eb0dcfb4f64492a8 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 14 Jun 2024 11:18:43 +0200 Subject: [PATCH 1376/1688] Fix merge conflicts --- .../siri/updater/AsyncEstimatedTimetableProcessor.java | 3 ++- .../ext/siri/updater/EstimatedTimetableHandler.java | 9 +++++---- .../opentripplanner/ext/siri/updater/SiriETUpdater.java | 3 +-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java index 3b5084ff612..92a4c7ddd22 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.siri.updater; import java.util.concurrent.ExecutionException; +import org.opentripplanner.updater.trip.UpdateIncrementality; import uk.org.siri.siri20.ServiceDelivery; /** @@ -45,7 +46,7 @@ public boolean isPrimed() { private void processSiriData(ServiceDelivery serviceDelivery) { var f = estimatedTimetableHandler.applyUpdate( serviceDelivery.getEstimatedTimetableDeliveries(), - false + UpdateIncrementality.DIFFERENTIAL ); if (!primed) { try { diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java index 7e4dfc88251..f48252a0cdb 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java @@ -10,6 +10,7 @@ import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; +import org.opentripplanner.updater.trip.UpdateIncrementality; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; /** @@ -49,14 +50,14 @@ public EstimatedTimetableHandler( public Future applyUpdate( List estimatedTimetableDeliveries, - boolean fullDataset + UpdateIncrementality updateMode ) { - return applyUpdate(estimatedTimetableDeliveries, fullDataset, () -> {}); + return applyUpdate(estimatedTimetableDeliveries, updateMode, () -> {}); } public Future applyUpdate( List estimatedTimetableDeliveries, - boolean fullDataset, + UpdateIncrementality updateMode, @Nonnull Runnable onUpdateComplete ) { return saveResultOnGraph.execute((graph, transitModel) -> { @@ -64,7 +65,7 @@ public Future applyUpdate( fuzzyTripMatcher, entityResolver, feedId, - fullDataset, + updateMode, estimatedTimetableDeliveries ); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java index 5a1e0b1b71e..a94645b564e 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java @@ -95,7 +95,6 @@ public void runPolling() { do { var updates = updateSource.getUpdates(); if (updates.isPresent()) { - boolean fullDataset = updateSource.getFullDatasetValueOfLastUpdates(); ServiceDelivery serviceDelivery = updates.get().getServiceDelivery(); moreData = Boolean.TRUE.equals(serviceDelivery.isMoreData()); // Mark this updater as primed after last page of updates. Copy moreData into a final @@ -105,7 +104,7 @@ public void runPolling() { if (etds != null) { estimatedTimetableHandler.applyUpdate( etds, - fullDataset, + updateSource.incrementalityOfLastUpdates(), () -> { if (markPrimed) { primed = true; From 64f8bf7a2e5a251d1d5b0d4d1bed9fb198346802 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 14 Jun 2024 14:34:42 +0200 Subject: [PATCH 1377/1688] Move priming logic to AsyncEstimatedTimetableSource --- .../AsyncEstimatedTimetableProcessor.java | 30 +++------------- .../AsyncEstimatedTimetableSource.java | 14 +++++--- .../GooglePubsubEstimatedTimetableSource.java | 34 +++++++++++++++---- .../updater/SiriETGooglePubsubUpdater.java | 20 ++++++----- 4 files changed, 54 insertions(+), 44 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java index 92a4c7ddd22..e1fc382bbaa 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -1,6 +1,6 @@ package org.opentripplanner.ext.siri.updater; -import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import org.opentripplanner.updater.trip.UpdateIncrementality; import uk.org.siri.siri20.ServiceDelivery; @@ -14,8 +14,6 @@ public class AsyncEstimatedTimetableProcessor { private final AsyncEstimatedTimetableSource siriMessageSource; private final EstimatedTimetableHandler estimatedTimetableHandler; - private volatile boolean primed; - public AsyncEstimatedTimetableProcessor( AsyncEstimatedTimetableSource siriMessageSource, EstimatedTimetableHandler estimatedTimetableHandler @@ -31,33 +29,15 @@ public void run() { siriMessageSource.start(this::processSiriData); } - /** - * Return true if the estimated timetable source is initialized and the backlog of messages - * is processed. - */ - public boolean isPrimed() { - return primed; - } - /** * Apply the estimated timetables to the transit model. - * The first successful call to this method sets the primed status to true. + * This method is non-blocking and applies the changes asynchronosly. + * @return a future indicating when the changes are applied. */ - private void processSiriData(ServiceDelivery serviceDelivery) { - var f = estimatedTimetableHandler.applyUpdate( + private Future processSiriData(ServiceDelivery serviceDelivery) { + return estimatedTimetableHandler.applyUpdate( serviceDelivery.getEstimatedTimetableDeliveries(), UpdateIncrementality.DIFFERENTIAL ); - if (!primed) { - try { - f.get(); - primed = true; - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new RuntimeException(e); - } catch (ExecutionException e) { - throw new RuntimeException(e); - } - } } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java index 140c2c14718..9a70c9d5615 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableSource.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.siri.updater; -import java.util.function.Consumer; +import java.util.concurrent.Future; +import java.util.function.Function; import uk.org.siri.siri20.ServiceDelivery; /** @@ -15,8 +16,13 @@ public interface AsyncEstimatedTimetableSource { * backlog, that is the recent history of SIRI-ET messages produced by this feed and made * available by a message cache. * - * @param serviceDeliveryConsumer a consumer of estimated timetable responsible for applying the - * update to the transit model. + * @param serviceDeliveryConsumer apply asynchronously the updates to the transit model. Return a + * future indicating when the updates are applied. */ - void start(Consumer serviceDeliveryConsumer); + void start(Function> serviceDeliveryConsumer); + + /** + * Return true if the message backlog is processed and the source is ready to listen to the feed. + */ + boolean isPrimed(); } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java index 7a2562968e2..3fac173c72c 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java @@ -20,8 +20,10 @@ import java.util.Map; import java.util.Optional; import java.util.UUID; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; import java.util.concurrent.atomic.AtomicLong; -import java.util.function.Consumer; +import java.util.function.Function; import org.entur.protobuf.mapper.SiriMapper; import org.opentripplanner.framework.application.ApplicationShutdownSupport; import org.opentripplanner.framework.io.OtpHttpClientFactory; @@ -99,7 +101,8 @@ public class GooglePubsubEstimatedTimetableSource implements AsyncEstimatedTimet private final OtpRetry retry; - private Consumer serviceDeliveryConsumer; + private Function> serviceDeliveryConsumer; + private volatile boolean primed; public GooglePubsubEstimatedTimetableSource( String dataInitializationUrl, @@ -143,7 +146,7 @@ public GooglePubsubEstimatedTimetableSource( * shutdown will cause the loop to stop. */ @Override - public void start(Consumer serviceDeliveryConsumer) { + public void start(Function> serviceDeliveryConsumer) { this.serviceDeliveryConsumer = serviceDeliveryConsumer; try { @@ -157,6 +160,7 @@ public void start(Consumer serviceDeliveryConsumer) { while (true) { try { subscriber.startAsync().awaitRunning(); + primed = true; subscriber.awaitTerminated(); } catch (IllegalStateException e) { subscriber.stopAsync(); @@ -169,6 +173,11 @@ public void start(Consumer serviceDeliveryConsumer) { } } + @Override + public boolean isPrimed() { + return primed; + } + /** * Build a unique name for the subscription. * This ensures that if the subscription is not properly deleted during shutdown, @@ -250,6 +259,7 @@ private Optional serviceDelivery(ByteString data) { /** * Fetch the backlog of messages and apply the changes to the transit model. + * Block until the backlog is applied. */ private void initializeData() { if (dataInitializationUrl != null) { @@ -262,7 +272,19 @@ private void initializeData() { (t2 - t1), FileSizeToTextConverter.fileSizeToString(value.size()) ); - serviceDelivery(value).ifPresent(serviceDeliveryConsumer); + serviceDelivery(value) + .map(serviceDeliveryConsumer) + .ifPresent(future -> { + try { + future.get(); + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + throw new RuntimeException(e); + } catch (ExecutionException e) { + throw new RuntimeException(e); + } + }); + LOG.info( "Pubsub updater initialized after {} ms: [messages: {}, updates: {}, total size: {}, time since startup: {}]", (System.currentTimeMillis() - t2), @@ -275,7 +297,7 @@ private void initializeData() { } /** - * Fetch the backlog of messages from the configured data initialization URL. + * Fetch the backlog of messages over HTTP from the configured data initialization URL. */ private ByteString fetchInitialData() { try (OtpHttpClientFactory otpHttpClientFactory = new OtpHttpClientFactory()) { @@ -319,7 +341,7 @@ public void receiveMessage(PubsubMessage message, AckReplyConsumer consumer) { Optional serviceDelivery = serviceDelivery(message.getData()); serviceDelivery.ifPresent(sd -> { logPubsubMessage(sd); - serviceDeliveryConsumer.accept(sd); + serviceDeliveryConsumer.apply(sd); }); // Ack only after all work for the message is complete. diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java index 4008cf07192..4e0e9481d99 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java @@ -18,6 +18,7 @@ public class SiriETGooglePubsubUpdater implements GraphUpdater { private final String configRef; private final AsyncEstimatedTimetableProcessor asyncEstimatedTimetableProcessor; + private final AsyncEstimatedTimetableSource asyncSiriMessageSource; private WriteToGraphCallback saveResultOnGraph; public SiriETGooglePubsubUpdater( @@ -27,14 +28,15 @@ public SiriETGooglePubsubUpdater( ) { this.configRef = config.configRef(); - AsyncEstimatedTimetableSource asyncSiriMessageSource = new GooglePubsubEstimatedTimetableSource( - config.dataInitializationUrl(), - config.reconnectPeriod(), - config.initialGetDataTimeout(), - config.subscriptionProjectName(), - config.topicProjectName(), - config.topicName() - ); + asyncSiriMessageSource = + new GooglePubsubEstimatedTimetableSource( + config.dataInitializationUrl(), + config.reconnectPeriod(), + config.initialGetDataTimeout(), + config.subscriptionProjectName(), + config.topicProjectName(), + config.topicName() + ); EstimatedTimetableHandler estimatedTimetableHandler = new EstimatedTimetableHandler( this::writeToGraphCallBack, @@ -65,7 +67,7 @@ public void run() { @Override public boolean isPrimed() { - return asyncEstimatedTimetableProcessor.isPrimed(); + return asyncSiriMessageSource.isPrimed(); } @Override From ec13fc16c20742600ee379d07d14ed446549f339 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Fri, 14 Jun 2024 15:05:09 +0200 Subject: [PATCH 1378/1688] Add Javadoc --- .../updater/AsyncEstimatedTimetableProcessor.java | 2 +- .../ext/siri/updater/EstimatedTimetableHandler.java | 12 +++++++++--- .../GooglePubsubEstimatedTimetableSource.java | 12 ++++++------ 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java index e1fc382bbaa..7b60332514f 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -31,7 +31,7 @@ public void run() { /** * Apply the estimated timetables to the transit model. - * This method is non-blocking and applies the changes asynchronosly. + * This method is non-blocking and applies the changes asynchronously. * @return a future indicating when the changes are applied. */ private Future processSiriData(ServiceDelivery serviceDelivery) { diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java index f48252a0cdb..d027afa3411 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java @@ -18,9 +18,6 @@ */ public class EstimatedTimetableHandler { - /** - * Parent update manager. Is used to execute graph writer runnables. - */ private final WriteToGraphCallback saveResultOnGraph; private final SiriTimetableSnapshotSource snapshotSource; @@ -48,6 +45,10 @@ public EstimatedTimetableHandler( this.feedId = feedId; } + /** + * Apply the update to the transit model. + * @return a future indicating when the changes are applied. + */ public Future applyUpdate( List estimatedTimetableDeliveries, UpdateIncrementality updateMode @@ -55,6 +56,11 @@ public Future applyUpdate( return applyUpdate(estimatedTimetableDeliveries, updateMode, () -> {}); } + /** + * Apply the update to the transit model. + * @param onUpdateComplete callback called after the update has been applied. + * @return a future indicating when the changes are applied. + */ public Future applyUpdate( List estimatedTimetableDeliveries, UpdateIncrementality updateMode, diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java index 3fac173c72c..fe358a119fb 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java @@ -78,12 +78,15 @@ public class GooglePubsubEstimatedTimetableSource implements AsyncEstimatedTimet private static final int RETRY_BACKOFF = 2; /** - * The URL used to fetch all initial updates + * The URL used to fetch all initial updates. + * The URL responds to HTTP GET and returns all initial data in protobuf-format. It will be + * called once to initialize real-time-data. + * All subsequent updates will be received from Google Cloud Pubsub. */ private final URI dataInitializationUrl; /** - * The number of seconds to wait before reconnecting after a failed connection. + * The time to wait before reconnecting after a failed connection. */ private final Duration reconnectPeriod; @@ -112,14 +115,11 @@ public GooglePubsubEstimatedTimetableSource( String topicProjectName, String topicName ) { - // URL that responds to HTTP GET which returns all initial data in protobuf-format. Will be - // called once to initialize real-time-data. All updates will be received from Google Cloud - // Pubsub + // this.dataInitializationUrl = URI.create(dataInitializationUrl); this.reconnectPeriod = reconnectPeriod; this.initialGetDataTimeout = initialGetDataTimeout; - // set subscriber String subscriptionId = buildSubscriptionId(); subscriptionName = ProjectSubscriptionName.of(subscriptionProjectName, subscriptionId).toString(); From 17c1d5b0e5523be8bbe967658ab60369bc0558da Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Fri, 14 Jun 2024 15:54:26 +0200 Subject: [PATCH 1379/1688] Add timePenalty to Transmodel API --- .../ext/restapi/mapping/ItineraryMapper.java | 5 +- .../transmodel/TransmodelGraphQLSchema.java | 9 ++- .../plan/TripPatternTimePenaltyType.java | 79 +++++++++++++++++++ .../model/plan/TripPatternType.java | 20 ++++- .../model/plan/TripPlanTimePenaltyDto.java | 32 ++++++++ .../apis/transmodel/schema.graphql | 38 +++++++++ .../plan/TripPlanTimePenaltyDtoTest.java | 67 ++++++++++++++++ 7 files changed, 247 insertions(+), 3 deletions(-) create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java create mode 100644 src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java diff --git a/src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java b/src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java index d87cf33d71c..720d02fdd44 100644 --- a/src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java +++ b/src/ext/java/org/opentripplanner/ext/restapi/mapping/ItineraryMapper.java @@ -37,7 +37,10 @@ public ApiItinerary mapItinerary(Itinerary domain) { api.transitTime = domain.getTransitDuration().toSeconds(); api.waitingTime = domain.getWaitingDuration().toSeconds(); api.walkDistance = domain.getNonTransitDistanceMeters(); - api.generalizedCost = domain.getGeneralizedCost(); + // We list only the generalizedCostIncludingPenalty, this is the least confusing. We intend to + // delete this endpoint soon, so we will not make the proper change and add the + // generalizedCostIncludingPenalty to the response and update the debug client to show it. + api.generalizedCost = domain.getGeneralizedCostIncludingPenalty(); api.elevationLost = domain.getElevationLost(); api.elevationGained = domain.getElevationGained(); api.transfers = domain.getNumberOfTransfers(); diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java index 638d7783e9a..a88c36ac039 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java @@ -70,6 +70,7 @@ import org.opentripplanner.apis.transmodel.model.plan.PathGuidanceType; import org.opentripplanner.apis.transmodel.model.plan.PlanPlaceType; import org.opentripplanner.apis.transmodel.model.plan.RoutingErrorType; +import org.opentripplanner.apis.transmodel.model.plan.TripPatternTimePenaltyType; import org.opentripplanner.apis.transmodel.model.plan.TripPatternType; import org.opentripplanner.apis.transmodel.model.plan.TripQuery; import org.opentripplanner.apis.transmodel.model.plan.TripType; @@ -314,6 +315,7 @@ private GraphQLSchema create() { gqlUtil ); + GraphQLObjectType tripPatternTimePenaltyType = TripPatternTimePenaltyType.create(); GraphQLObjectType tripMetadataType = TripMetadataType.create(gqlUtil); GraphQLObjectType placeType = PlanPlaceType.create( bikeRentalStationType, @@ -339,7 +341,12 @@ private GraphQLSchema create() { elevationStepType, gqlUtil ); - GraphQLObjectType tripPatternType = TripPatternType.create(systemNoticeType, legType, gqlUtil); + GraphQLObjectType tripPatternType = TripPatternType.create( + systemNoticeType, + legType, + tripPatternTimePenaltyType, + gqlUtil + ); GraphQLObjectType routingErrorType = RoutingErrorType.create(); GraphQLOutputType tripType = TripType.create( diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java new file mode 100644 index 00000000000..1a6e7310697 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java @@ -0,0 +1,79 @@ +package org.opentripplanner.apis.transmodel.model.plan; + +import graphql.Scalars; +import graphql.schema.DataFetchingEnvironment; +import graphql.schema.GraphQLFieldDefinition; +import graphql.schema.GraphQLObjectType; +import org.opentripplanner.framework.time.DurationUtils; + +public class TripPatternTimePenaltyType { + + public static GraphQLObjectType create() { + return GraphQLObjectType + .newObject() + .name("TimePenalty") + .description( + """ + The time-penalty is applied to either the access-legs and/or egress-legs. Both access and + egress may contain more than one leg; Hence, the penalty is not a field on leg. + + Note! This is for debugging only. This type can change without notice. + """ + ) + .field( + GraphQLFieldDefinition + .newFieldDefinition() + .name("appliedTo") + .description( + """ + The time-penalty is applied to either the access-legs and/or egress-legs. Both access + and egress may contain more than one leg; Hence, the penalty is not a field on leg. The + `appliedTo` describe witch part of the itinerary that this instance applies to. + """ + ) + .type(Scalars.GraphQLString) + .dataFetcher(environment -> penalty(environment).appliesTo()) + .build() + ) + .field( + GraphQLFieldDefinition + .newFieldDefinition() + .name("timePenalty") + .description( + """ + The time-penalty added to the actual time/duration when comparing the itinerary with + other itineraries. This is used to decide witch is the best option, but is not visible + - the actual departure and arrival-times are not modified. + """ + ) + .type(Scalars.GraphQLString) + .dataFetcher(environment -> + DurationUtils.durationToStr(penalty(environment).penalty().time()) + ) + .build() + ) + .field( + GraphQLFieldDefinition + .newFieldDefinition() + .name("generalizedCostPenalty") + .description( + """ + The time-penalty does also propagate to the `generalizedCost` But, while the + arrival-/departure-times listed is not affected, the generalized-cost is. In some cases + the time-penalty-cost is excluded when comparing itineraries - that happens if one of + the itineraries is a "direct/street-only" itinerary. Time-penalty can not be set for + direct searches, so it needs to be excluded from such comparison to be fair. The unit + is transit-seconds. + """ + ) + .type(Scalars.GraphQLInt) + .dataFetcher(environment -> penalty(environment).penalty().cost().toSeconds()) + .build() + ) + .build(); + } + + static TripPlanTimePenaltyDto penalty(DataFetchingEnvironment environment) { + return environment.getSource(); + } +} diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java index 2238a39c139..c903016b91b 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternType.java @@ -16,6 +16,7 @@ public class TripPatternType { public static GraphQLObjectType create( GraphQLOutputType systemNoticeType, GraphQLObjectType legType, + GraphQLObjectType timePenaltyType, GqlUtil gqlUtil ) { return GraphQLObjectType @@ -189,7 +190,7 @@ public static GraphQLObjectType create( .name("generalizedCost") .description("Generalized cost or weight of the itinerary. Used for debugging.") .type(Scalars.GraphQLInt) - .dataFetcher(env -> itinerary(env).getGeneralizedCost()) + .dataFetcher(env -> itinerary(env).getGeneralizedCostIncludingPenalty()) .build() ) .field( @@ -228,6 +229,23 @@ public static GraphQLObjectType create( .dataFetcher(env -> itinerary(env).getTransferPriorityCost()) .build() ) + .field( + GraphQLFieldDefinition + .newFieldDefinition() + .name("timePenalty") + .description( + """ + A time and cost penalty applied to access and egress to favor regular scheduled + transit over potentially faster options with FLEX, Car, bike and scooter. + + Note! This field is meant for debugging only. The field can be removed without notice + in the future. + """ + ) + .type(new GraphQLNonNull(new GraphQLList(new GraphQLNonNull(timePenaltyType)))) + .dataFetcher(env -> TripPlanTimePenaltyDto.of(itinerary(env))) + .build() + ) .build(); } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java new file mode 100644 index 00000000000..b834b711327 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java @@ -0,0 +1,32 @@ +package org.opentripplanner.apis.transmodel.model.plan; + +import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; +import org.opentripplanner.framework.model.TimeAndCost; +import org.opentripplanner.model.plan.Itinerary; + +/** + * A simple data-transfer-object used to map from an itinerary to the API specific + * type. It is needed because we need to pass in the "appliedTo" field, which does not + * exist in the domain model. + */ +public record TripPlanTimePenaltyDto(String appliesTo, TimeAndCost penalty) { + static List of(Itinerary itinerary) { + // This check for null to be robust - in case of a mistake in the future. + // The check is redundant on purpose. + if (itinerary == null) { + return List.of(); + } + return Stream + .of(of("access", itinerary.getAccessPenalty()), of("egress", itinerary.getEgressPenalty())) + .filter(Objects::nonNull) + .toList(); + } + + static TripPlanTimePenaltyDto of(String appliedTo, TimeAndCost penalty) { + return penalty == null || penalty.isZero() + ? null + : new TripPlanTimePenaltyDto(appliedTo, penalty); + } +} diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index fbaa2418d7e..b521a5f6ff0 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -1215,6 +1215,36 @@ type TimeAndDayOffset { time: Time } +""" +The time-penalty is applied to either the access-legs and/or egress-legs. Both access and +egress may contain more than one leg; Hence, the penalty is not a field on leg. + +Note! This is for debugging only. This type can change without notice. +""" +type TimePenalty { + """ + The time-penalty is applied to either the access-legs and/or egress-legs. Both access + and egress may contain more than one leg; Hence, the penalty is not a field on leg. The + `appliedTo` describe witch part of the itinerary that this instance applies to. + """ + appliedTo: String + """ + The time-penalty does also propagate to the `generalizedCost` But, while the + arrival-/departure-times listed is not affected, the generalized-cost is. In some cases + the time-penalty-cost is excluded when comparing itineraries - that happens if one of + the itineraries is a "direct/street-only" itinerary. Time-penalty can not be set for + direct searches, so it needs to be excluded from such comparison to be fair. The unit + is transit-seconds. + """ + generalizedCostPenalty: Int + """ + The time-penalty added to the actual time/duration when comparing the itinerary with + other itineraries. This is used to decide witch is the best option, but is not visible + - the actual departure and arrival-times are not modified. + """ + timePenalty: String +} + "Scheduled passing times. These are not affected by real time updates." type TimetabledPassingTime { "Scheduled time of arrival at quay" @@ -1309,6 +1339,14 @@ type TripPattern { streetDistance: Float "Get all system notices." systemNotices: [SystemNotice!]! + """ + A time and cost penalty applied to access and egress to favor regular scheduled + transit over potentially faster options with FLEX, Car, bike and scooter. + + Note! This field is meant for debugging only. The field can be removed without notice + in the future. + """ + timePenalty: [TimePenalty!]! "A cost calculated to favor transfer with higher priority. This field is meant for debugging only." transferPriorityCost: Int "A cost calculated to distribute wait-time and avoid very short transfers. This field is meant for debugging only." diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java b/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java new file mode 100644 index 00000000000..9ea6016324b --- /dev/null +++ b/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java @@ -0,0 +1,67 @@ +package org.opentripplanner.apis.transmodel.model.plan; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.model.Cost; +import org.opentripplanner.framework.model.TimeAndCost; +import org.opentripplanner.framework.time.DurationUtils; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.Place; +import org.opentripplanner.model.plan.TestItineraryBuilder; +import org.opentripplanner.transit.model._data.TransitModelForTest; + +class TripPlanTimePenaltyDtoTest { + + private static final TimeAndCost PENALTY = new TimeAndCost( + DurationUtils.duration("20m30s"), + Cost.costOfSeconds(21) + ); + + private final TransitModelForTest testModel = TransitModelForTest.of(); + private final Place placeA = Place.forStop(testModel.stop("A").build()); + private final Place placeB = Place.forStop(testModel.stop("B").build()); + + @Test + void testCreateFromSingeEntry() { + assertNull(TripPlanTimePenaltyDto.of("access", null)); + assertNull(TripPlanTimePenaltyDto.of("access", TimeAndCost.ZERO)); + assertEquals( + new TripPlanTimePenaltyDto("access", PENALTY), + TripPlanTimePenaltyDto.of("access", PENALTY) + ); + } + + @Test + void testCreateFromItineraryWithNoPenalty() { + var i = itinerary(); + assertEquals(List.of(), TripPlanTimePenaltyDto.of(null)); + assertEquals(List.of(), TripPlanTimePenaltyDto.of(i)); + } + + @Test + void testCreateFromItineraryWithAccess() { + var i = itinerary(); + i.setAccessPenalty(PENALTY); + assertEquals( + List.of(new TripPlanTimePenaltyDto("access", PENALTY)), + TripPlanTimePenaltyDto.of(i) + ); + } + + @Test + void testCreateFromItineraryWithEgress() { + var i = itinerary(); + i.setEgressPenalty(PENALTY); + assertEquals( + List.of(new TripPlanTimePenaltyDto("egress", PENALTY)), + TripPlanTimePenaltyDto.of(i) + ); + } + + private Itinerary itinerary() { + return TestItineraryBuilder.newItinerary(placeA).drive(100, 200, placeB).build(); + } +} From e8e16e41f92c05d445af308a03cb7365b24d52e5 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 21:41:11 +0000 Subject: [PATCH 1380/1688] chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.3.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8f3f31761bb..171022d1685 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ org.apache.maven.plugins maven-surefire-plugin - 3.2.5 + 3.3.0 me.fabriciorby From e178289a1e4ab9f828441a90df200a6cd2f807ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 15 Jun 2024 07:35:41 +0000 Subject: [PATCH 1381/1688] fix(deps): update geotools.version to v31.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 171022d1685..1da138b7748 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 150 - 31.1 + 31.2 2.51.1 2.17.1 3.1.7 From 5aab28fdd19bd82f556fa424e019033e7e113e07 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Jun 2024 01:44:03 +0000 Subject: [PATCH 1382/1688] chore(deps): update debug ui dependencies (non-major) --- client-next/package-lock.json | 363 ++++++++++++++++++---------------- client-next/package.json | 14 +- 2 files changed, 202 insertions(+), 175 deletions(-) diff --git a/client-next/package-lock.json b/client-next/package-lock.json index 31549a4866d..38a6cbfd4dc 100644 --- a/client-next/package-lock.json +++ b/client-next/package-lock.json @@ -10,9 +10,9 @@ "dependencies": { "@googlemaps/polyline-codec": "1.0.28", "bootstrap": "5.3.3", - "graphql": "16.8.1", + "graphql": "16.8.2", "graphql-request": "7.0.1", - "maplibre-gl": "4.3.2", + "maplibre-gl": "4.4.0", "react": "18.3.1", "react-bootstrap": "2.10.2", "react-dom": "18.3.1", @@ -20,14 +20,14 @@ }, "devDependencies": { "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/client-preset": "4.2.6", + "@graphql-codegen/client-preset": "4.3.0", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "16.0.0", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.12.0", - "@typescript-eslint/parser": "7.12.0", + "@typescript-eslint/eslint-plugin": "7.13.0", + "@typescript-eslint/parser": "7.13.0", "@vitejs/plugin-react": "4.3.1", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", @@ -38,9 +38,9 @@ "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.1.0", - "prettier": "3.3.1", + "prettier": "3.3.2", "typescript": "5.4.5", - "vite": "5.2.13", + "vite": "5.3.1", "vitest": "1.6.0" } }, @@ -1276,13 +1276,14 @@ ] }, "node_modules/@esbuild/aix-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.20.2.tgz", - "integrity": "sha512-D+EBOJHXdNZcLJRBkhENNG8Wji2kgc9AZ9KiPr1JuZjsNtyHzrsfLRrY0tk2H2aoFu6RANO1y1iPPUCDYWkb5g==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", + "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "aix" @@ -1292,13 +1293,14 @@ } }, "node_modules/@esbuild/android-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.20.2.tgz", - "integrity": "sha512-t98Ra6pw2VaDhqNWO2Oph2LXbz/EJcnLmKLGBJwEwXX/JAN83Fym1rU8l0JUWK6HkIbWONCSSatf4sf2NBRx/w==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", + "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -1308,13 +1310,14 @@ } }, "node_modules/@esbuild/android-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.20.2.tgz", - "integrity": "sha512-mRzjLacRtl/tWU0SvD8lUEwb61yP9cqQo6noDZP/O8VkwafSYwZ4yWy24kan8jE/IMERpYncRt2dw438LP3Xmg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", + "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -1324,13 +1327,14 @@ } }, "node_modules/@esbuild/android-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.20.2.tgz", - "integrity": "sha512-btzExgV+/lMGDDa194CcUQm53ncxzeBrWJcncOBxuC6ndBkKxnHdFJn86mCIgTELsooUmwUm9FkhSp5HYu00Rg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", + "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "android" @@ -1340,13 +1344,14 @@ } }, "node_modules/@esbuild/darwin-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.20.2.tgz", - "integrity": "sha512-4J6IRT+10J3aJH3l1yzEg9y3wkTDgDk7TSDFX+wKFiWjqWp/iCfLIYzGyasx9l0SAFPT1HwSCR+0w/h1ES/MjA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", + "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -1356,13 +1361,14 @@ } }, "node_modules/@esbuild/darwin-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.20.2.tgz", - "integrity": "sha512-tBcXp9KNphnNH0dfhv8KYkZhjc+H3XBkF5DKtswJblV7KlT9EI2+jeA8DgBjp908WEuYll6pF+UStUCfEpdysA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", + "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "darwin" @@ -1372,13 +1378,14 @@ } }, "node_modules/@esbuild/freebsd-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.20.2.tgz", - "integrity": "sha512-d3qI41G4SuLiCGCFGUrKsSeTXyWG6yem1KcGZVS+3FYlYhtNoNgYrWcvkOoaqMhwXSMrZRl69ArHsGJ9mYdbbw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", + "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -1388,13 +1395,14 @@ } }, "node_modules/@esbuild/freebsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.20.2.tgz", - "integrity": "sha512-d+DipyvHRuqEeM5zDivKV1KuXn9WeRX6vqSqIDgwIfPQtwMP4jaDsQsDncjTDDsExT4lR/91OLjRo8bmC1e+Cw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", + "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "freebsd" @@ -1404,13 +1412,14 @@ } }, "node_modules/@esbuild/linux-arm": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.20.2.tgz", - "integrity": "sha512-VhLPeR8HTMPccbuWWcEUD1Az68TqaTYyj6nfE4QByZIQEQVWBB8vup8PpR7y1QHL3CpcF6xd5WVBU/+SBEvGTg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", + "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", "cpu": [ "arm" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1420,13 +1429,14 @@ } }, "node_modules/@esbuild/linux-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.20.2.tgz", - "integrity": "sha512-9pb6rBjGvTFNira2FLIWqDk/uaf42sSyLE8j1rnUpuzsODBq7FvpwHYZxQ/It/8b+QOS1RYfqgGFNLRI+qlq2A==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", + "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1436,13 +1446,14 @@ } }, "node_modules/@esbuild/linux-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.20.2.tgz", - "integrity": "sha512-o10utieEkNPFDZFQm9CoP7Tvb33UutoJqg3qKf1PWVeeJhJw0Q347PxMvBgVVFgouYLGIhFYG0UGdBumROyiig==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", + "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1452,13 +1463,14 @@ } }, "node_modules/@esbuild/linux-loong64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.20.2.tgz", - "integrity": "sha512-PR7sp6R/UC4CFVomVINKJ80pMFlfDfMQMYynX7t1tNTeivQ6XdX5r2XovMmha/VjR1YN/HgHWsVcTRIMkymrgQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", + "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", "cpu": [ "loong64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1468,13 +1480,14 @@ } }, "node_modules/@esbuild/linux-mips64el": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.20.2.tgz", - "integrity": "sha512-4BlTqeutE/KnOiTG5Y6Sb/Hw6hsBOZapOVF6njAESHInhlQAghVVZL1ZpIctBOoTFbQyGW+LsVYZ8lSSB3wkjA==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", + "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", "cpu": [ "mips64el" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1484,13 +1497,14 @@ } }, "node_modules/@esbuild/linux-ppc64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.20.2.tgz", - "integrity": "sha512-rD3KsaDprDcfajSKdn25ooz5J5/fWBylaaXkuotBDGnMnDP1Uv5DLAN/45qfnf3JDYyJv/ytGHQaziHUdyzaAg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", + "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", "cpu": [ "ppc64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1500,13 +1514,14 @@ } }, "node_modules/@esbuild/linux-riscv64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.20.2.tgz", - "integrity": "sha512-snwmBKacKmwTMmhLlz/3aH1Q9T8v45bKYGE3j26TsaOVtjIag4wLfWSiZykXzXuE1kbCE+zJRmwp+ZbIHinnVg==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", + "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", "cpu": [ "riscv64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1516,13 +1531,14 @@ } }, "node_modules/@esbuild/linux-s390x": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.20.2.tgz", - "integrity": "sha512-wcWISOobRWNm3cezm5HOZcYz1sKoHLd8VL1dl309DiixxVFoFe/o8HnwuIwn6sXre88Nwj+VwZUvJf4AFxkyrQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", + "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", "cpu": [ "s390x" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1532,13 +1548,14 @@ } }, "node_modules/@esbuild/linux-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.20.2.tgz", - "integrity": "sha512-1MdwI6OOTsfQfek8sLwgyjOXAu+wKhLEoaOLTjbijk6E2WONYpH9ZU2mNtR+lZ2B4uwr+usqGuVfFT9tMtGvGw==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", + "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "linux" @@ -1548,13 +1565,14 @@ } }, "node_modules/@esbuild/netbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.20.2.tgz", - "integrity": "sha512-K8/DhBxcVQkzYc43yJXDSyjlFeHQJBiowJ0uVL6Tor3jGQfSGHNNJcWxNbOI8v5k82prYqzPuwkzHt3J1T1iZQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", + "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "netbsd" @@ -1564,13 +1582,14 @@ } }, "node_modules/@esbuild/openbsd-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.20.2.tgz", - "integrity": "sha512-eMpKlV0SThJmmJgiVyN9jTPJ2VBPquf6Kt/nAoo6DgHAoN57K15ZghiHaMvqjCye/uU4X5u3YSMgVBI1h3vKrQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", + "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "openbsd" @@ -1580,13 +1599,14 @@ } }, "node_modules/@esbuild/sunos-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.20.2.tgz", - "integrity": "sha512-2UyFtRC6cXLyejf/YEld4Hajo7UHILetzE1vsRcGL3earZEW77JxrFjH4Ez2qaTiEfMgAXxfAZCm1fvM/G/o8w==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", + "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "sunos" @@ -1596,13 +1616,14 @@ } }, "node_modules/@esbuild/win32-arm64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.20.2.tgz", - "integrity": "sha512-GRibxoawM9ZCnDxnP3usoUDO9vUkpAxIIZ6GQI+IlVmr5kP3zUq+l17xELTHMWTWzjxa2guPNyrpq1GWmPvcGQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", + "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", "cpu": [ "arm64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -1612,13 +1633,14 @@ } }, "node_modules/@esbuild/win32-ia32": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.20.2.tgz", - "integrity": "sha512-HfLOfn9YWmkSKRQqovpnITazdtquEW8/SoHW7pWpuEeguaZI4QnCRW6b+oZTztdBnZOS2hqJ6im/D5cPzBTTlQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", + "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", "cpu": [ "ia32" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -1628,13 +1650,14 @@ } }, "node_modules/@esbuild/win32-x64": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz", - "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", + "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", "cpu": [ "x64" ], "dev": true, + "license": "MIT", "optional": true, "os": [ "win32" @@ -1754,10 +1777,11 @@ "integrity": "sha512-m7rh8sbxlrHvebXEweBHX8r1uPtToPRYxWDD6p6k2YG8hyhBe0Wi6xRUVFpxpEseMNgF+OBotFQC5senj8K7TQ==" }, "node_modules/@graphql-codegen/add": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@graphql-codegen/add/-/add-5.0.2.tgz", - "integrity": "sha512-ouBkSvMFUhda5VoKumo/ZvsZM9P5ZTyDsI8LW18VxSNWOjrTeLXBWHG8Gfaai0HwhflPtCYVABbriEcOmrRShQ==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@graphql-codegen/add/-/add-5.0.3.tgz", + "integrity": "sha512-SxXPmramkth8XtBlAHu4H4jYcYXM/o3p01+psU+0NADQowA8jtYkK6MW5rV6T+CxkEaNZItfSmZRPgIuypcqnA==", "dev": true, + "license": "MIT", "dependencies": { "@graphql-codegen/plugin-helpers": "^5.0.3", "tslib": "~2.6.0" @@ -1825,15 +1849,15 @@ } }, "node_modules/@graphql-codegen/client-preset": { - "version": "4.2.6", - "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.2.6.tgz", - "integrity": "sha512-e7SzPb+nxNJfsD0uG+NSyzIeTtCXTouX5VThmcCoqGMDLgF5Lo7932B3HtZCvzmzqcXxRjJ81CmkA2LhlqIbCw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.3.0.tgz", + "integrity": "sha512-p2szj5YiyLUYnQn1h7S4dsSY2Jc1LNrm32ptkb6CGtqPo3w9vgqki2WRJwgeJN8s3bhifqWRPzhoid/smrFVgA==", "dev": true, "license": "MIT", "dependencies": { "@babel/helper-plugin-utils": "^7.20.2", "@babel/template": "^7.20.7", - "@graphql-codegen/add": "^5.0.2", + "@graphql-codegen/add": "^5.0.3", "@graphql-codegen/gql-tag-operations": "4.0.7", "@graphql-codegen/plugin-helpers": "^5.0.4", "@graphql-codegen/typed-document-node": "^5.0.7", @@ -2890,9 +2914,10 @@ } }, "node_modules/@maplibre/maplibre-gl-style-spec": { - "version": "20.2.0", - "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.2.0.tgz", - "integrity": "sha512-BTw6/3ysowky22QMtNDjElp+YLwwvBDh3xxnq1izDFjTtUERm5nYSihlNZ6QaxXb+6lX2T2t0hBEjheAI+kBEQ==", + "version": "20.3.0", + "resolved": "https://registry.npmjs.org/@maplibre/maplibre-gl-style-spec/-/maplibre-gl-style-spec-20.3.0.tgz", + "integrity": "sha512-eSiQ3E5LUSxAOY9ABXGyfNhout2iEa6mUxKeaQ9nJ8NL1NuaQYU7zKqzx/LEYcXe1neT4uYAgM1wYZj3fTSXtA==", + "license": "ISC", "dependencies": { "@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/unitbezier": "^0.0.1", @@ -3816,17 +3841,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz", - "integrity": "sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.13.0.tgz", + "integrity": "sha512-FX1X6AF0w8MdVFLSdqwqN/me2hyhuQg4ykN6ZpVhh1ij/80pTvDKclX1sZB9iqex8SjQfVhwMKs3JtnnMLzG9w==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.12.0", - "@typescript-eslint/type-utils": "7.12.0", - "@typescript-eslint/utils": "7.12.0", - "@typescript-eslint/visitor-keys": "7.12.0", + "@typescript-eslint/scope-manager": "7.13.0", + "@typescript-eslint/type-utils": "7.13.0", + "@typescript-eslint/utils": "7.13.0", + "@typescript-eslint/visitor-keys": "7.13.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3850,16 +3875,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.12.0.tgz", - "integrity": "sha512-dm/J2UDY3oV3TKius2OUZIFHsomQmpHtsV0FTh1WO8EKgHLQ1QCADUqscPgTpU+ih1e21FQSRjXckHn3txn6kQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.13.0.tgz", + "integrity": "sha512-EjMfl69KOS9awXXe83iRN7oIEXy9yYdqWfqdrFAYAAr6syP8eLEFI7ZE4939antx2mNgPRW/o1ybm2SFYkbTVA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "7.12.0", - "@typescript-eslint/types": "7.12.0", - "@typescript-eslint/typescript-estree": "7.12.0", - "@typescript-eslint/visitor-keys": "7.12.0", + "@typescript-eslint/scope-manager": "7.13.0", + "@typescript-eslint/types": "7.13.0", + "@typescript-eslint/typescript-estree": "7.13.0", + "@typescript-eslint/visitor-keys": "7.13.0", "debug": "^4.3.4" }, "engines": { @@ -3879,14 +3904,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz", - "integrity": "sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.0.tgz", + "integrity": "sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.12.0", - "@typescript-eslint/visitor-keys": "7.12.0" + "@typescript-eslint/types": "7.13.0", + "@typescript-eslint/visitor-keys": "7.13.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3897,14 +3922,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz", - "integrity": "sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.13.0.tgz", + "integrity": "sha512-xMEtMzxq9eRkZy48XuxlBFzpVMDurUAfDu5Rz16GouAtXm0TaAoTFzqWUFPPuQYXI/CDaH/Bgx/fk/84t/Bc9A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.12.0", - "@typescript-eslint/utils": "7.12.0", + "@typescript-eslint/typescript-estree": "7.13.0", + "@typescript-eslint/utils": "7.13.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3925,9 +3950,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.12.0.tgz", - "integrity": "sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.0.tgz", + "integrity": "sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==", "dev": true, "license": "MIT", "engines": { @@ -3939,14 +3964,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.12.0.tgz", - "integrity": "sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.0.tgz", + "integrity": "sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "7.12.0", - "@typescript-eslint/visitor-keys": "7.12.0", + "@typescript-eslint/types": "7.13.0", + "@typescript-eslint/visitor-keys": "7.13.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3981,16 +4006,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.12.0.tgz", - "integrity": "sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.13.0.tgz", + "integrity": "sha512-jceD8RgdKORVnB4Y6BqasfIkFhl4pajB1wVxrF4akxD2QPM8GNYjgGwEzYS+437ewlqqrg7Dw+6dhdpjMpeBFQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.12.0", - "@typescript-eslint/types": "7.12.0", - "@typescript-eslint/typescript-estree": "7.12.0" + "@typescript-eslint/scope-manager": "7.13.0", + "@typescript-eslint/types": "7.13.0", + "@typescript-eslint/typescript-estree": "7.13.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -4004,13 +4029,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.12.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz", - "integrity": "sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ==", + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.0.tgz", + "integrity": "sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/types": "7.13.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -5846,11 +5871,12 @@ } }, "node_modules/esbuild": { - "version": "0.20.2", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz", - "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==", + "version": "0.21.5", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", + "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", "dev": true, "hasInstallScript": true, + "license": "MIT", "bin": { "esbuild": "bin/esbuild" }, @@ -5858,29 +5884,29 @@ "node": ">=12" }, "optionalDependencies": { - "@esbuild/aix-ppc64": "0.20.2", - "@esbuild/android-arm": "0.20.2", - "@esbuild/android-arm64": "0.20.2", - "@esbuild/android-x64": "0.20.2", - "@esbuild/darwin-arm64": "0.20.2", - "@esbuild/darwin-x64": "0.20.2", - "@esbuild/freebsd-arm64": "0.20.2", - "@esbuild/freebsd-x64": "0.20.2", - "@esbuild/linux-arm": "0.20.2", - "@esbuild/linux-arm64": "0.20.2", - "@esbuild/linux-ia32": "0.20.2", - "@esbuild/linux-loong64": "0.20.2", - "@esbuild/linux-mips64el": "0.20.2", - "@esbuild/linux-ppc64": "0.20.2", - "@esbuild/linux-riscv64": "0.20.2", - "@esbuild/linux-s390x": "0.20.2", - "@esbuild/linux-x64": "0.20.2", - "@esbuild/netbsd-x64": "0.20.2", - "@esbuild/openbsd-x64": "0.20.2", - "@esbuild/sunos-x64": "0.20.2", - "@esbuild/win32-arm64": "0.20.2", - "@esbuild/win32-ia32": "0.20.2", - "@esbuild/win32-x64": "0.20.2" + "@esbuild/aix-ppc64": "0.21.5", + "@esbuild/android-arm": "0.21.5", + "@esbuild/android-arm64": "0.21.5", + "@esbuild/android-x64": "0.21.5", + "@esbuild/darwin-arm64": "0.21.5", + "@esbuild/darwin-x64": "0.21.5", + "@esbuild/freebsd-arm64": "0.21.5", + "@esbuild/freebsd-x64": "0.21.5", + "@esbuild/linux-arm": "0.21.5", + "@esbuild/linux-arm64": "0.21.5", + "@esbuild/linux-ia32": "0.21.5", + "@esbuild/linux-loong64": "0.21.5", + "@esbuild/linux-mips64el": "0.21.5", + "@esbuild/linux-ppc64": "0.21.5", + "@esbuild/linux-riscv64": "0.21.5", + "@esbuild/linux-s390x": "0.21.5", + "@esbuild/linux-x64": "0.21.5", + "@esbuild/netbsd-x64": "0.21.5", + "@esbuild/openbsd-x64": "0.21.5", + "@esbuild/sunos-x64": "0.21.5", + "@esbuild/win32-arm64": "0.21.5", + "@esbuild/win32-ia32": "0.21.5", + "@esbuild/win32-x64": "0.21.5" } }, "node_modules/escalade": { @@ -7014,9 +7040,10 @@ "dev": true }, "node_modules/graphql": { - "version": "16.8.1", - "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.1.tgz", - "integrity": "sha512-59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==", + "version": "16.8.2", + "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz", + "integrity": "sha512-cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg==", + "license": "MIT", "engines": { "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0" } @@ -8568,9 +8595,9 @@ } }, "node_modules/maplibre-gl": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.3.2.tgz", - "integrity": "sha512-/oXDsb9I+LkjweL/28aFMLDZoIcXKNEhYNAZDLA4xgTNkfvKQmV/r0KZdxEMcVthincJzdyc6Y4N8YwZtHKNnQ==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.4.0.tgz", + "integrity": "sha512-RS5ZYjUfcTuyTjR+jbPNGO+Cbjgid8jtBsUpgmx/m+2voj9oY6DmpanBBm2xvjOxZSfChR2wUpzK22mf6sEOlw==", "license": "BSD-3-Clause", "dependencies": { "@mapbox/geojson-rewind": "^0.5.2", @@ -8580,7 +8607,7 @@ "@mapbox/unitbezier": "^0.0.1", "@mapbox/vector-tile": "^1.3.1", "@mapbox/whoots-js": "^3.1.0", - "@maplibre/maplibre-gl-style-spec": "^20.2.0", + "@maplibre/maplibre-gl-style-spec": "^20.3.0", "@types/geojson": "^7946.0.14", "@types/geojson-vt": "3.2.5", "@types/junit-report-builder": "^3.0.2", @@ -9394,9 +9421,9 @@ } }, "node_modules/prettier": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.1.tgz", - "integrity": "sha512-7CAwy5dRsxs8PHXT3twixW9/OEll8MLE0VRPCJyl7CkS6VHGPSlsVaWTiASPTyGyYRyApxlaWTzwUxVNrhcwDg==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz", + "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==", "dev": true, "license": "MIT", "bin": { @@ -11154,13 +11181,13 @@ } }, "node_modules/vite": { - "version": "5.2.13", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.2.13.tgz", - "integrity": "sha512-SSq1noJfY9pR3I1TUENL3rQYDQCFqgD+lM6fTRAM8Nv6Lsg5hDLaXkjETVeBt+7vZBCMoibD+6IWnT2mJ+Zb/A==", + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz", + "integrity": "sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==", "dev": true, "license": "MIT", "dependencies": { - "esbuild": "^0.20.1", + "esbuild": "^0.21.3", "postcss": "^8.4.38", "rollup": "^4.13.0" }, diff --git a/client-next/package.json b/client-next/package.json index 66e372f708f..b9acd846af2 100644 --- a/client-next/package.json +++ b/client-next/package.json @@ -19,9 +19,9 @@ "dependencies": { "@googlemaps/polyline-codec": "1.0.28", "bootstrap": "5.3.3", - "graphql": "16.8.1", + "graphql": "16.8.2", "graphql-request": "7.0.1", - "maplibre-gl": "4.3.2", + "maplibre-gl": "4.4.0", "react": "18.3.1", "react-bootstrap": "2.10.2", "react-dom": "18.3.1", @@ -29,14 +29,14 @@ }, "devDependencies": { "@graphql-codegen/cli": "5.0.2", - "@graphql-codegen/client-preset": "4.2.6", + "@graphql-codegen/client-preset": "4.3.0", "@graphql-codegen/introspection": "4.0.3", "@parcel/watcher": "2.4.1", "@testing-library/react": "16.0.0", "@types/react": "18.3.3", "@types/react-dom": "18.3.0", - "@typescript-eslint/eslint-plugin": "7.12.0", - "@typescript-eslint/parser": "7.12.0", + "@typescript-eslint/eslint-plugin": "7.13.0", + "@typescript-eslint/parser": "7.13.0", "@vitejs/plugin-react": "4.3.1", "@vitest/coverage-v8": "1.6.0", "eslint": "8.57.0", @@ -47,9 +47,9 @@ "eslint-plugin-react-hooks": "4.6.2", "eslint-plugin-react-refresh": "0.4.7", "jsdom": "24.1.0", - "prettier": "3.3.1", + "prettier": "3.3.2", "typescript": "5.4.5", - "vite": "5.2.13", + "vite": "5.3.1", "vitest": "1.6.0" } } From 67e6510b282af37814f4ac7b59b09cef94792f52 Mon Sep 17 00:00:00 2001 From: OTP Bot Date: Mon, 17 Jun 2024 08:44:16 +0000 Subject: [PATCH 1383/1688] Upgrade debug client to version 2024/06/2024-06-17T08:43 --- src/client/debug-client-preview/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html index 4bcf452cb3e..8f654dfb40e 100644 --- a/src/client/debug-client-preview/index.html +++ b/src/client/debug-client-preview/index.html @@ -5,8 +5,8 @@ OTP Debug Client - - + +
              From bd262752b65001f651ac504c0729b5fe6c18636c Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Thu, 13 Jun 2024 23:46:01 +0200 Subject: [PATCH 1384/1688] Validate polygons of AreaStop --- .../opentripplanner/transit/model/site/AreaStop.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index 35576e0c42f..685d8c65437 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -6,6 +6,7 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.operation.valid.IsValidOp; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; @@ -52,6 +53,16 @@ public class AreaStop this.url = builder.url(); this.zoneId = builder.zoneId(); this.geometry = builder.geometry(); + if (!this.geometry.isValid()) { + var error = new IsValidOp(this.geometry).getValidationError(); + throw new IllegalArgumentException( + "Polygon geometry for AreaStop %s is invalid: %s at %s".formatted( + getId(), + error.getMessage(), + error.getCoordinate() + ) + ); + } this.centroid = Objects.requireNonNull(builder.centroid()); } From 711c59d819afdb8a741bcf7ac3ed2654d7f246d9 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 14 Jun 2024 00:18:11 +0200 Subject: [PATCH 1385/1688] Validate geometries of AreaStops --- ...ocationMapper.java => AreaStopMapper.java} | 39 ++++++------- .../GTFSToOtpTransitServiceMapper.java | 12 ++-- .../gtfs/mapping/LocationGroupMapper.java | 8 +-- .../gtfs/mapping/StopAreaMapper.java | 8 +-- .../gtfs/mapping/StopTimeMapper.java | 8 +-- .../transit/model/site/AreaStop.java | 5 +- .../_support/geometry/Polygons.java | 9 +++ .../gtfs/mapping/AreaStopMapperTest.java | 57 +++++++++++++++++++ .../gtfs/mapping/LocationGroupMapperTest.java | 2 +- .../gtfs/mapping/LocationMapperTest.java | 39 ------------- .../gtfs/mapping/StopAreaMapperTest.java | 2 +- .../gtfs/mapping/StopTimeMapperTest.java | 8 +-- .../gtfs/mapping/TransferMapperTest.java | 2 +- 13 files changed, 111 insertions(+), 88 deletions(-) rename src/main/java/org/opentripplanner/gtfs/mapping/{LocationMapper.java => AreaStopMapper.java} (50%) create mode 100644 src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java delete mode 100644 src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java similarity index 50% rename from src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java rename to src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java index c8942d7059a..e42d7414620 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java @@ -6,52 +6,47 @@ import java.util.HashMap; import java.util.Map; import org.locationtech.jts.geom.Geometry; +import org.onebusaway.gtfs.model.Location; import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.UnsupportedGeometryException; import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.StopModelBuilder; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** Responsible for mapping GTFS Location into the OTP model. */ -public class LocationMapper { +public class AreaStopMapper { - private static final Logger LOG = LoggerFactory.getLogger(LocationMapper.class); - - private final Map mappedLocations = new HashMap<>(); + private final Map mappedLocations = new HashMap<>(); private final StopModelBuilder stopModelBuilder; - public LocationMapper(StopModelBuilder stopModelBuilder) { + public AreaStopMapper(StopModelBuilder stopModelBuilder) { this.stopModelBuilder = stopModelBuilder; } - Collection map(Collection allLocations) { + Collection map(Collection allLocations) { return MapUtils.mapToList(allLocations, this::map); } /** Map from GTFS to OTP model, {@code null} safe. */ - AreaStop map(org.onebusaway.gtfs.model.Location orginal) { + AreaStop map(Location orginal) { return orginal == null ? null : mappedLocations.computeIfAbsent(orginal, this::doMap); } - private AreaStop doMap(org.onebusaway.gtfs.model.Location gtfsLocation) { + private AreaStop doMap(Location gtfsLocation) { var name = NonLocalizedString.ofNullable(gtfsLocation.getName()); - Geometry geometry = null; try { - geometry = GeometryUtils.convertGeoJsonToJtsGeometry(gtfsLocation.getGeometry()); + Geometry geometry = GeometryUtils.convertGeoJsonToJtsGeometry(gtfsLocation.getGeometry()); + return stopModelBuilder + .areaStop(mapAgencyAndId(gtfsLocation.getId())) + .withName(name) + .withUrl(NonLocalizedString.ofNullable(gtfsLocation.getUrl())) + .withDescription(NonLocalizedString.ofNullable(gtfsLocation.getDescription())) + .withZoneId(gtfsLocation.getZoneId()) + .withGeometry(geometry) + .build(); } catch (UnsupportedGeometryException e) { - LOG.error("Unsupported geometry type for {}", gtfsLocation.getId()); + throw new IllegalArgumentException(e); } - - return stopModelBuilder - .areaStop(mapAgencyAndId(gtfsLocation.getId())) - .withName(name) - .withUrl(NonLocalizedString.ofNullable(gtfsLocation.getUrl())) - .withDescription(NonLocalizedString.ofNullable(gtfsLocation.getDescription())) - .withZoneId(gtfsLocation.getZoneId()) - .withGeometry(geometry) - .build(); } } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index 354c1f16177..88a32c0f95e 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -38,7 +38,7 @@ public class GTFSToOtpTransitServiceMapper { private final BoardingAreaMapper boardingAreaMapper; - private final LocationMapper locationMapper; + private final AreaStopMapper areaStopMapper; private final LocationGroupMapper locationGroupMapper; @@ -110,11 +110,11 @@ public GTFSToOtpTransitServiceMapper( entranceMapper = new EntranceMapper(translationHelper, stationLookup); pathwayNodeMapper = new PathwayNodeMapper(translationHelper, stationLookup); boardingAreaMapper = new BoardingAreaMapper(translationHelper, stopLookup); - locationMapper = new LocationMapper(builder.stopModel()); - locationGroupMapper = new LocationGroupMapper(stopMapper, locationMapper, builder.stopModel()); + areaStopMapper = new AreaStopMapper(builder.stopModel()); + locationGroupMapper = new LocationGroupMapper(stopMapper, areaStopMapper, builder.stopModel()); // the use of stop areas were reverted in the spec // this code will go away, please migrate now! - stopAreaMapper = new StopAreaMapper(stopMapper, locationMapper, builder.stopModel()); + stopAreaMapper = new StopAreaMapper(stopMapper, areaStopMapper, builder.stopModel()); pathwayMapper = new PathwayMapper(stopMapper, entranceMapper, pathwayNodeMapper, boardingAreaMapper); routeMapper = new RouteMapper(agencyMapper, issueStore, translationHelper); @@ -124,7 +124,7 @@ public GTFSToOtpTransitServiceMapper( stopTimeMapper = new StopTimeMapper( stopMapper, - locationMapper, + areaStopMapper, locationGroupMapper, stopAreaMapper, tripMapper, @@ -164,7 +164,7 @@ public void mapStopTripAndRouteDataIntoBuilder() { if (OTPFeature.FlexRouting.isOn()) { // Stop areas and Stop groups are only used in FLEX routes - builder.stopModel().withAreaStops(locationMapper.map(data.getAllLocations())); + builder.stopModel().withAreaStops(areaStopMapper.map(data.getAllLocations())); builder.stopModel().withGroupStops(locationGroupMapper.map(data.getAllLocationGroups())); builder.stopModel().withGroupStops(stopAreaMapper.map(data.getAllStopAreas())); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java index 591a59c492e..25193185271 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java @@ -18,18 +18,18 @@ public class LocationGroupMapper { private final StopMapper stopMapper; - private final LocationMapper locationMapper; + private final AreaStopMapper areaStopMapper; private final StopModelBuilder stopModelBuilder; private final Map mappedLocationGroups = new HashMap<>(); public LocationGroupMapper( StopMapper stopMapper, - LocationMapper locationMapper, + AreaStopMapper areaStopMapper, StopModelBuilder stopModelBuilder ) { this.stopMapper = stopMapper; - this.locationMapper = locationMapper; + this.areaStopMapper = areaStopMapper; this.stopModelBuilder = stopModelBuilder; } @@ -54,7 +54,7 @@ private GroupStop doMap(LocationGroup element) { ); switch (location) { case Stop stop -> groupStopBuilder.addLocation(stopMapper.map(stop)); - case Location loc -> groupStopBuilder.addLocation(locationMapper.map(loc)); + case Location loc -> groupStopBuilder.addLocation(areaStopMapper.map(loc)); case LocationGroup ignored -> throw new RuntimeException( "Nested GroupStops are not allowed" ); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java index 55c836aa458..a69a303d913 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java @@ -25,18 +25,18 @@ public class StopAreaMapper { private final StopMapper stopMapper; - private final LocationMapper locationMapper; + private final AreaStopMapper areaStopMapper; private final Map mappedStopAreas = new HashMap<>(); private final StopModelBuilder stopModel; public StopAreaMapper( StopMapper stopMapper, - LocationMapper locationMapper, + AreaStopMapper areaStopMapper, StopModelBuilder stopModel ) { this.stopMapper = stopMapper; - this.locationMapper = locationMapper; + this.areaStopMapper = areaStopMapper; this.stopModel = stopModel; } @@ -57,7 +57,7 @@ private GroupStop doMap(org.onebusaway.gtfs.model.StopArea element) { for (org.onebusaway.gtfs.model.StopLocation location : element.getLocations()) { switch (location) { case Stop stop -> groupStopBuilder.addLocation(stopMapper.map(stop)); - case Location loc -> groupStopBuilder.addLocation(locationMapper.map(loc)); + case Location loc -> groupStopBuilder.addLocation(areaStopMapper.map(loc)); case org.onebusaway.gtfs.model.StopArea ignored -> throw new RuntimeException( "Nested GroupStops are not allowed" ); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index 67b250c5061..e6b908d9442 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -19,7 +19,7 @@ class StopTimeMapper { private final StopMapper stopMapper; - private final LocationMapper locationMapper; + private final AreaStopMapper areaStopMapper; private final LocationGroupMapper locationGroupMapper; private final StopAreaMapper stopAreaMapper; @@ -33,7 +33,7 @@ class StopTimeMapper { StopTimeMapper( StopMapper stopMapper, - LocationMapper locationMapper, + AreaStopMapper areaStopMapper, LocationGroupMapper locationGroupMapper, StopAreaMapper stopAreaMapper, TripMapper tripMapper, @@ -41,7 +41,7 @@ class StopTimeMapper { TranslationHelper translationHelper ) { this.stopMapper = stopMapper; - this.locationMapper = locationMapper; + this.areaStopMapper = areaStopMapper; this.locationGroupMapper = locationGroupMapper; this.stopAreaMapper = stopAreaMapper; this.tripMapper = tripMapper; @@ -69,7 +69,7 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) { ); switch (stopLocation) { case Stop stop -> lhs.setStop(stopMapper.map(stop)); - case Location location -> lhs.setStop(locationMapper.map(location)); + case Location location -> lhs.setStop(areaStopMapper.map(location)); case LocationGroup locGroup -> lhs.setStop(locationGroupMapper.map(locGroup)); // TODO: only here for backwards compatibility, this will be removed in the future case StopArea area -> lhs.setStop(stopAreaMapper.map(area)); diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index 685d8c65437..cf0ac3d0b3f 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -56,10 +56,11 @@ public class AreaStop if (!this.geometry.isValid()) { var error = new IsValidOp(this.geometry).getValidationError(); throw new IllegalArgumentException( - "Polygon geometry for AreaStop %s is invalid: %s at %s".formatted( + "Polygon geometry for AreaStop %s is invalid: %s at (lat: %s, lon: %s)".formatted( getId(), error.getMessage(), - error.getCoordinate() + error.getCoordinate().y, + error.getCoordinate().x ) ); } diff --git a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java index ee110ab4f4f..bdf59c70e82 100644 --- a/src/test/java/org/opentripplanner/_support/geometry/Polygons.java +++ b/src/test/java/org/opentripplanner/_support/geometry/Polygons.java @@ -56,6 +56,15 @@ public class Polygons { } ); + public static final Polygon SELF_INTERSECTING = FAC.createPolygon( + new Coordinate[] { + Coordinates.of(1, 1), + Coordinates.of(1, 2), + Coordinates.of(1, 3), + Coordinates.of(1, 1), + } + ); + public static org.geojson.Polygon toGeoJson(Polygon polygon) { var ret = new org.geojson.Polygon(); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java new file mode 100644 index 00000000000..8cdd4282e52 --- /dev/null +++ b/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java @@ -0,0 +1,57 @@ +package org.opentripplanner.gtfs.mapping; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import java.util.stream.Stream; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.locationtech.jts.geom.Polygon; +import org.onebusaway.gtfs.model.AgencyAndId; +import org.onebusaway.gtfs.model.Location; +import org.opentripplanner._support.geometry.Polygons; +import org.opentripplanner.transit.service.StopModel; + +class AreaStopMapperTest { + + static Stream testCases() { + return Stream.of(Arguments.of(null, true), Arguments.of("a name", false)); + } + + @ParameterizedTest(name = "a name of <{0}> should set bogusName={1}") + @MethodSource("testCases") + void testMapping(String name, boolean isBogusName) { + final var gtfsLocation = getLocation(name, Polygons.OSLO); + + var mapper = new AreaStopMapper(StopModel.of()); + var flexLocation = mapper.map(gtfsLocation); + + assertEquals(isBogusName, flexLocation.hasFallbackName()); + } + + @Test + void invalidPolygon() { + var selfIntersecting = Polygons.SELF_INTERSECTING; + assertFalse(selfIntersecting.isValid()); + + var gtfsLocation = getLocation("invalid", selfIntersecting); + + var mapper = new AreaStopMapper(StopModel.of()); + var expectation = assertThrows(IllegalArgumentException.class, () -> mapper.map(gtfsLocation)); + assertEquals( + "Polygon geometry for AreaStop 1:zone-3 is invalid: Self-intersection at (lat: 1.0, lon: 2.0)", + expectation.getMessage() + ); + } + + private static Location getLocation(String name, Polygon polygon) { + var gtfsLocation = new Location(); + gtfsLocation.setId(new AgencyAndId("1", "zone-3")); + gtfsLocation.setName(name); + gtfsLocation.setGeometry(Polygons.toGeoJson(polygon)); + return gtfsLocation; + } +} diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java index f8fe52c4731..513c96edd13 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java @@ -22,7 +22,7 @@ void map() { var builder = StopModel.of(); var mapper = new LocationGroupMapper( new StopMapper(new TranslationHelper(), id -> null, builder), - new LocationMapper(builder), + new AreaStopMapper(builder), builder ); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java deleted file mode 100644 index 4461c5a31f1..00000000000 --- a/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package org.opentripplanner.gtfs.mapping; - -import static org.junit.jupiter.api.Assertions.assertEquals; - -import java.util.List; -import java.util.stream.Stream; -import org.geojson.LngLatAlt; -import org.geojson.Polygon; -import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.Arguments; -import org.junit.jupiter.params.provider.MethodSource; -import org.onebusaway.gtfs.model.AgencyAndId; -import org.onebusaway.gtfs.model.Location; -import org.opentripplanner.transit.service.StopModel; - -class LocationMapperTest { - - static Stream testCases() { - return Stream.of(Arguments.of(null, true), Arguments.of("a name", false)); - } - - @ParameterizedTest(name = "a name of <{0}> should set bogusName={1}") - @MethodSource("testCases") - void testMapping(String name, boolean isBogusName) { - var gtfsLocation = new Location(); - gtfsLocation.setId(new AgencyAndId("1", "zone-3")); - gtfsLocation.setName(name); - gtfsLocation.setGeometry( - new Polygon( - List.of(new LngLatAlt(1, 1), new LngLatAlt(1, 2), new LngLatAlt(1, 3), new LngLatAlt(1, 1)) - ) - ); - - var mapper = new LocationMapper(StopModel.of()); - var flexLocation = mapper.map(gtfsLocation); - - assertEquals(isBogusName, flexLocation.hasFallbackName()); - } -} diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java index f8597954475..d96d447ca5e 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java @@ -23,7 +23,7 @@ class StopAreaMapperTest { void map() { var stopModel = StopModel.of(); var stopMapper = new StopMapper(new TranslationHelper(), ignored -> null, stopModel); - var locationMapper = new LocationMapper(stopModel); + var locationMapper = new AreaStopMapper(stopModel); var mapper = new StopAreaMapper(stopMapper, locationMapper, stopModel); var area = new Area(); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java index 826db744d43..ebeaccbda6a 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java @@ -76,21 +76,21 @@ public class StopTimeMapperTest { stopModelBuilder ); private final BookingRuleMapper bookingRuleMapper = new BookingRuleMapper(); - private final LocationMapper locationMapper = new LocationMapper(stopModelBuilder); + private final AreaStopMapper areaStopMapper = new AreaStopMapper(stopModelBuilder); private final LocationGroupMapper locationGroupMapper = new LocationGroupMapper( stopMapper, - locationMapper, + areaStopMapper, stopModelBuilder ); private final StopAreaMapper stopAreaMapper = new StopAreaMapper( stopMapper, - locationMapper, + areaStopMapper, stopModelBuilder ); private final TranslationHelper translationHelper = new TranslationHelper(); private final StopTimeMapper subject = new StopTimeMapper( stopMapper, - locationMapper, + areaStopMapper, locationGroupMapper, stopAreaMapper, new TripMapper( diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java index 458610d9660..f58355dbd84 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java @@ -46,7 +46,7 @@ public class TransferMapperTest { ); private static final BookingRuleMapper BOOKING_RULE_MAPPER = new BookingRuleMapper(); - private static final LocationMapper LOCATION_MAPPER = new LocationMapper(STOP_MODEL_BUILDER); + private static final AreaStopMapper LOCATION_MAPPER = new AreaStopMapper(STOP_MODEL_BUILDER); private static final LocationGroupMapper LOCATION_GROUP_MAPPER = new LocationGroupMapper( STOP_MAPPER, From 1ddadf2b25123564f90d3537cd88d57f74ebfc89 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Fri, 14 Jun 2024 08:45:01 +0200 Subject: [PATCH 1386/1688] Add test for AreaStop --- .../ext/flex/FlexIntegrationTestData.java | 28 - .../flex/trip/ScheduledDeviatedTripTest.java | 10 - .../flex/lincoln-county-flex.gtfs/agency.txt | 2 - .../flex/lincoln-county-flex.gtfs/areas.txt | 1 - .../booking_rules.txt | 7 - .../lincoln-county-flex.gtfs/calendar.txt | 4 - .../calendar_attributes.txt | 4 - .../calendar_dates.txt | 14 - .../lincoln-county-flex.gtfs/directions.txt | 11 - .../lincoln-county-flex.gtfs/feed_info.txt | 2 - .../locations.geojson | 93139 ---------------- .../flex/lincoln-county-flex.gtfs/routes.txt | 7 - .../lincoln-county-flex.gtfs/stop_times.txt | 1023 - .../flex/lincoln-county-flex.gtfs/stops.txt | 17 - .../flex/lincoln-county-flex.gtfs/trips.txt | 57 - .../gtfs/mapping/AreaStopMapperTest.java | 6 +- .../transit/model/site/AreaStopTest.java | 42 +- 17 files changed, 30 insertions(+), 94344 deletions(-) delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/agency.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/areas.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/booking_rules.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_attributes.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_dates.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/directions.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/feed_info.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/locations.geojson delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/routes.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stop_times.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stops.txt delete mode 100644 src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/trips.txt diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java index e0a85e23794..d3f4f7a62e8 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/FlexIntegrationTestData.java @@ -2,16 +2,12 @@ import static graphql.Assert.assertTrue; -import gnu.trove.set.hash.TIntHashSet; import java.io.File; import java.time.LocalDate; -import java.time.LocalTime; import java.util.List; import java.util.Map; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; -import org.opentripplanner.ext.flex.flexpathcalculator.DirectFlexPathCalculator; -import org.opentripplanner.ext.flex.template.FlexServiceDate; import org.opentripplanner.framework.application.OTPFeature; import org.opentripplanner.gtfs.graphbuilder.GtfsBundle; import org.opentripplanner.gtfs.graphbuilder.GtfsModule; @@ -19,7 +15,6 @@ import org.opentripplanner.routing.graph.Graph; import org.opentripplanner.test.support.ResourceLoader; import org.opentripplanner.transit.model.framework.Deduplicator; -import org.opentripplanner.transit.model.timetable.booking.RoutingBookingInfo; import org.opentripplanner.transit.service.StopModel; import org.opentripplanner.transit.service.TransitModel; @@ -31,19 +26,8 @@ public final class FlexIntegrationTestData { static final File COBB_BUS_30_GTFS = RES.file("cobblinc-bus-30-only.gtfs.zip"); static final File COBB_FLEX_GTFS = RES.file("cobblinc-scheduled-deviated-flex.gtfs"); private static final File COBB_OSM = RES.file("cobb-county.filtered.osm.pbf"); - private static final File LINCOLN_COUNTY_GTFS = RES.file("lincoln-county-flex.gtfs"); static final File MARTA_BUS_856_GTFS = RES.file("marta-bus-856-only.gtfs.zip"); - public static final DirectFlexPathCalculator CALCULATOR = new DirectFlexPathCalculator(); - private static final LocalDate SERVICE_DATE = LocalDate.of(2021, 4, 11); - private static final int SECONDS_SINCE_MIDNIGHT = LocalTime.of(10, 0).toSecondOfDay(); - public static final FlexServiceDate FLEX_DATE = new FlexServiceDate( - SERVICE_DATE, - SECONDS_SINCE_MIDNIGHT, - RoutingBookingInfo.NOT_SET, - new TIntHashSet() - ); - public static TestOtpModel aspenGtfs() { return buildFlexGraph(ASPEN_GTFS); } @@ -52,18 +36,6 @@ public static TestOtpModel cobbFlexGtfs() { return buildFlexGraph(COBB_FLEX_GTFS); } - public static TestOtpModel cobbBus30Gtfs() { - return buildFlexGraph(COBB_BUS_30_GTFS); - } - - public static TestOtpModel martaBus856Gtfs() { - return buildFlexGraph(MARTA_BUS_856_GTFS); - } - - public static TestOtpModel lincolnCountyGtfs() { - return buildFlexGraph(LINCOLN_COUNTY_GTFS); - } - public static TestOtpModel cobbOsm() { return ConstantsForTests.buildOsmGraph(COBB_OSM); } diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java index 2883394f837..3971d03ac6d 100644 --- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java @@ -2,7 +2,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.opentripplanner.test.support.PolylineAssert.assertThatPolylinesAreEqual; import java.time.LocalDateTime; @@ -188,15 +187,6 @@ void shouldNotInterpolateFlexTimes() { assertEquals(StopTime.MISSING_VALUE, arrivalTime); } - /** - * Checks that trips which have continuous pick up/drop off set are parsed correctly. - */ - @Test - void parseContinuousPickup() { - var lincolnGraph = FlexIntegrationTestData.lincolnCountyGtfs(); - assertNotNull(lincolnGraph); - } - @BeforeAll static void setup() { TestOtpModel model = FlexIntegrationTestData.cobbFlexGtfs(); diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/agency.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/agency.txt deleted file mode 100644 index 21af34a258c..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/agency.txt +++ /dev/null @@ -1,2 +0,0 @@ -agency_id,agency_url,agency_lang,agency_name,agency_phone,agency_timezone,agency_fare_url -89,http://www.co.lincoln.or.us/transit/,en,Lincoln County Transit,541-265-4900,America/Los_Angeles,http://www.co.lincoln.or.us/transit/page/fare-schedule diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/areas.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/areas.txt deleted file mode 100644 index cac45c7d043..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/areas.txt +++ /dev/null @@ -1 +0,0 @@ -area_id,wkt diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/booking_rules.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/booking_rules.txt deleted file mode 100644 index 43369cdba8d..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/booking_rules.txt +++ /dev/null @@ -1,7 +0,0 @@ -booking_rule_id,booking_type,prior_notice_duration_min,prior_notice_duration_max,prior_notice_start_day,prior_notice_start_time,prior_notice_last_day,prior_notice_last_time,prior_notice_service_id,message,pickup_message,drop_off_message,phone_number,info_url,booking_url -booking_route_13317,2,24:00:00,,,,,,,,Lincoln County Transit's Dial-A-Ride is a “curb to curb” accessible transit service available to everyone. Call (541) 265-4900 at least one day in advance to request your ride.,Lincoln County Transit's Dial-A-Ride is a “curb to curb” accessible transit service available to everyone. Call (541) 265-4900 at least one day in advance to request your ride.,,, -booking_route_491,1,00:30:00,,,,,,,,Newport City Loop allows deviated service pickups that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated pickup.,Newport City Loop allows deviated service drop offs that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated drop off.,,, -booking_route_492,1,00:30:00,,,,,,,,Lincoln City Loop allows deviated service pickups that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated pickup.,Lincoln City Loop allows deviated service drop offs that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated drop off.,,, -booking_route_493,1,00:30:00,,,,,,,,East County allows deviated service pickups that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated pickup.,East County allows deviated service drop offs that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated drop off.,,, -booking_route_495,1,00:30:00,,,,,,,,North County allows deviated service pickups that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated pickup.,North County allows deviated service drop offs that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated drop off.,,, -booking_route_497,1,00:30:00,,,,,,,,South County allows deviated service pickups that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated pickup.,South County allows deviated service drop offs that are scheduled at least 30 minutes in advance and do not deviate more than 3/4 mile off the scheduled route to retain normal schedule. Please call (541) 265-4900 to schedule a deviated drop off.,,, diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar.txt deleted file mode 100644 index a60858e8722..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar.txt +++ /dev/null @@ -1,4 +0,0 @@ -service_id,service_name,monday,tuesday,wednesday,thursday,friday,saturday,sunday,start_date,end_date -c_15353_b_26748_d_63,Year Round (No Sunday),1,1,1,1,1,1,0,20200607,20220101 -c_15353_b_26748_d_31,Year Round (Weekday),1,1,1,1,1,0,0,20200607,20220101 -c_15353_b_26748_d_127,Year Round (All days of week),1,1,1,1,1,1,1,20200607,20220101 diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_attributes.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_attributes.txt deleted file mode 100644 index 4d5c9e1804a..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_attributes.txt +++ /dev/null @@ -1,4 +0,0 @@ -service_id,service_description -c_15353_b_26748_d_63,Year Round (No Sunday) -c_15353_b_26748_d_31,Year Round (Weekday) -c_15353_b_26748_d_127,Year Round (All days of week) diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_dates.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_dates.txt deleted file mode 100644 index 9f5444a98e0..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/calendar_dates.txt +++ /dev/null @@ -1,14 +0,0 @@ -service_id,date,holiday_name,exception_type -c_15353_b_26748_d_63,20220101,New Year's Day,2 -c_15353_b_26748_d_63,20211225,Christmas Day,2 -c_15353_b_26748_d_63,20211125,Thanksgiving Day,2 -c_15353_b_26748_d_63,20210101,New Year's Day,2 -c_15353_b_26748_d_63,20201225,Christmas Day,2 -c_15353_b_26748_d_31,20211125,Thanksgiving Day,2 -c_15353_b_26748_d_31,20210101,New Year's Day,2 -c_15353_b_26748_d_31,20201225,Christmas Day,2 -c_15353_b_26748_d_127,20220101,New Year's Day,2 -c_15353_b_26748_d_127,20211225,Christmas Day,2 -c_15353_b_26748_d_127,20211125,Thanksgiving Day,2 -c_15353_b_26748_d_127,20210101,New Year's Day,2 -c_15353_b_26748_d_127,20201225,Christmas Day,2 diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/directions.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/directions.txt deleted file mode 100644 index 141511296b4..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/directions.txt +++ /dev/null @@ -1,11 +0,0 @@ -route_id,direction_id,direction -491,0,No direction -492,0,Northbound -492,1,Southbound -493,0,Westbound -493,1,Eastbound -495,0,Northbound -495,1,Southbound -497,0,Northbound -497,1,Southbound -13317,0,No direction diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/feed_info.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/feed_info.txt deleted file mode 100644 index 036a20fbb91..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/feed_info.txt +++ /dev/null @@ -1,2 +0,0 @@ -feed_publisher_url,feed_publisher_name,feed_lang,feed_version,feed_license,feed_contact_email,feed_contact_url,feed_start_date,feed_end_date,feed_id -http://www.trilliumtransit.com,"Trillium Solutions, Inc.",en,UTC: 22-Dec-2020 22:38,,support+test+lincolncounty-or-us@trilliumtransit.com,http://support.trilliumtransit.com,20201222,20220101,lincolncounty-or-us diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/locations.geojson b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/locations.geojson deleted file mode 100644 index 5530bd15ffc..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/locations.geojson +++ /dev/null @@ -1,93139 +0,0 @@ -{ - "type": "FeatureCollection", - "features": [ - { - "id": "area_271", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0269929, - 44.6327988 - ], - [ - -124.027794, - 44.6327786 - ], - [ - -124.0277106, - 44.6311308 - ], - [ - -124.0268959, - 44.6311389 - ], - [ - -124.0269929, - 44.6327988 - ], - [ - -124.024068, - 44.6328757 - ], - [ - -124.0241089, - 44.6334103 - ], - [ - -124.0237571, - 44.6334298 - ], - [ - -124.0236022, - 44.633649 - ], - [ - -124.0235327, - 44.6328955 - ], - [ - -124.0221969, - 44.6329293 - ], - [ - -124.0222013, - 44.6336919 - ], - [ - -124.0215448, - 44.633856 - ], - [ - -124.0208617, - 44.6340437 - ], - [ - -124.020617, - 44.6340929 - ], - [ - -124.0203916, - 44.6341172 - ], - [ - -124.0201635, - 44.6341321 - ], - [ - -124.0199219, - 44.6341367 - ], - [ - -124.0197633, - 44.6341362 - ], - [ - -124.0196546, - 44.6341268 - ], - [ - -124.0196749, - 44.6339464 - ], - [ - -124.0192138, - 44.6339536 - ], - [ - -124.0191906, - 44.6339039 - ], - [ - -124.01918, - 44.6338844 - ], - [ - -124.0191597, - 44.6338544 - ], - [ - -124.0191363, - 44.6338295 - ], - [ - -124.0191129, - 44.6338105 - ], - [ - -124.0190998, - 44.6338017 - ], - [ - -124.019082, - 44.6337913 - ], - [ - -124.0190656, - 44.6337828 - ], - [ - -124.0190514, - 44.6337764 - ], - [ - -124.0190373, - 44.6337707 - ], - [ - -124.019024, - 44.6337658 - ], - [ - -124.0189643, - 44.6337447 - ], - [ - -124.0188263, - 44.6336892 - ], - [ - -124.0187485, - 44.6336601 - ], - [ - -124.0186902, - 44.6336187 - ], - [ - -124.018678, - 44.6335858 - ], - [ - -124.0186435, - 44.6334335 - ], - [ - -124.018641, - 44.6334185 - ], - [ - -124.0186395, - 44.6334077 - ], - [ - -124.0186363, - 44.6333554 - ], - [ - -124.0186453, - 44.6331262 - ], - [ - -124.0186603, - 44.6330391 - ], - [ - -124.0186618, - 44.6330199 - ], - [ - -124.0186632, - 44.6329217 - ], - [ - -124.0186825, - 44.632819 - ], - [ - -124.0186874, - 44.6327572 - ], - [ - -124.018685, - 44.6327279 - ], - [ - -124.0186438, - 44.6326013 - ], - [ - -124.0186334, - 44.6325672 - ], - [ - -124.0194447, - 44.6324527 - ], - [ - -124.0193717, - 44.6325982 - ], - [ - -124.0202495, - 44.6325828 - ], - [ - -124.0202947, - 44.6331294 - ], - [ - -124.0211169, - 44.6331041 - ], - [ - -124.0213096, - 44.6325633 - ], - [ - -124.0212887, - 44.6321591 - ], - [ - -124.0210921, - 44.6316437 - ], - [ - -124.020963, - 44.6314776 - ], - [ - -124.0208095, - 44.6313452 - ], - [ - -124.0206373, - 44.6312324 - ], - [ - -124.0203394, - 44.6311451 - ], - [ - -124.0203054, - 44.6315401 - ], - [ - -124.0201846, - 44.6315844 - ], - [ - -124.0193062, - 44.6314385 - ], - [ - -124.0194084, - 44.6320106 - ], - [ - -124.0187452, - 44.6317468 - ], - [ - -124.0188009, - 44.6317258 - ], - [ - -124.0188313, - 44.6317083 - ], - [ - -124.0188708, - 44.6316744 - ], - [ - -124.0189021, - 44.6316338 - ], - [ - -124.0189207, - 44.6315925 - ], - [ - -124.0189093, - 44.6314746 - ], - [ - -124.0188532, - 44.6313461 - ], - [ - -124.018805, - 44.6312558 - ], - [ - -124.0187443, - 44.6311227 - ], - [ - -124.0187328, - 44.6310641 - ], - [ - -124.0187194, - 44.6309961 - ], - [ - -124.0187151, - 44.6309176 - ], - [ - -124.01874, - 44.6308656 - ], - [ - -124.0188237, - 44.6307647 - ], - [ - -124.0189053, - 44.6306917 - ], - [ - -124.0190049, - 44.630646 - ], - [ - -124.0191298, - 44.6305913 - ], - [ - -124.0191939, - 44.6305615 - ], - [ - -124.0192531, - 44.6305247 - ], - [ - -124.0196607, - 44.6307533 - ], - [ - -124.0198394, - 44.6303829 - ], - [ - -124.0202117, - 44.6303457 - ], - [ - -124.0203068, - 44.6301086 - ], - [ - -124.0207851, - 44.6299569 - ], - [ - -124.0208023, - 44.6296833 - ], - [ - -124.0209365, - 44.6296809 - ], - [ - -124.0209255, - 44.6299546 - ], - [ - -124.0217663, - 44.6299354 - ], - [ - -124.0217709, - 44.6296539 - ], - [ - -124.0222225, - 44.6296401 - ], - [ - -124.0222103, - 44.6290281 - ], - [ - -124.0222203, - 44.6145375 - ], - [ - -124.0266336, - 44.6144827 - ], - [ - -124.0267072, - 44.6144877 - ], - [ - -124.0271157, - 44.6145043 - ], - [ - -124.0276094, - 44.6145243 - ], - [ - -124.0276518, - 44.6145258 - ], - [ - -124.0276942, - 44.6145268 - ], - [ - -124.0277792, - 44.6145284 - ], - [ - -124.0278254, - 44.6145284 - ], - [ - -124.0278717, - 44.614527 - ], - [ - -124.0279024, - 44.6145253 - ], - [ - -124.0279435, - 44.6145222 - ], - [ - -124.027998, - 44.6145167 - ], - [ - -124.0280292, - 44.6145129 - ], - [ - -124.0280647, - 44.6145081 - ], - [ - -124.0281048, - 44.6145018 - ], - [ - -124.0281446, - 44.6144943 - ], - [ - -124.0281707, - 44.6144885 - ], - [ - -124.0282049, - 44.6144797 - ], - [ - -124.0282241, - 44.6144741 - ], - [ - -124.0282455, - 44.6144671 - ], - [ - -124.0282694, - 44.6144582 - ], - [ - -124.0282958, - 44.614447 - ], - [ - -124.0283094, - 44.6144404 - ], - [ - -124.0285542, - 44.6143179 - ], - [ - -124.0288106, - 44.6141894 - ], - [ - -124.0288679, - 44.6141602 - ], - [ - -124.0289247, - 44.6141305 - ], - [ - -124.0290377, - 44.6140705 - ], - [ - -124.0291136, - 44.614031 - ], - [ - -124.0293646, - 44.613907 - ], - [ - -124.0296186, - 44.6137859 - ], - [ - -124.0298441, - 44.6136819 - ], - [ - -124.030073, - 44.6135819 - ], - [ - -124.0302271, - 44.613517 - ], - [ - -124.0304338, - 44.6134322 - ], - [ - -124.0304869, - 44.6134125 - ], - [ - -124.0305417, - 44.6133953 - ], - [ - -124.0305789, - 44.613385 - ], - [ - -124.0306293, - 44.6133722 - ], - [ - -124.030833, - 44.6133245 - ], - [ - -124.0308903, - 44.6133094 - ], - [ - -124.0309543, - 44.6132898 - ], - [ - -124.0309876, - 44.6132781 - ], - [ - -124.0310223, - 44.6132644 - ], - [ - -124.0310644, - 44.6132464 - ], - [ - -124.0311059, - 44.6132276 - ], - [ - -124.0311873, - 44.6131886 - ], - [ - -124.0312406, - 44.6131616 - ], - [ - -124.0313107, - 44.6131246 - ], - [ - -124.031403, - 44.613074 - ], - [ - -124.0314641, - 44.6130386 - ], - [ - -124.0315237, - 44.6130021 - ], - [ - -124.0316415, - 44.6129279 - ], - [ - -124.0317217, - 44.6128794 - ], - [ - -124.0317691, - 44.6128527 - ], - [ - -124.0318098, - 44.6128313 - ], - [ - -124.0318513, - 44.6128112 - ], - [ - -124.0318796, - 44.6127986 - ], - [ - -124.0319179, - 44.6127825 - ], - [ - -124.0319705, - 44.6127626 - ], - [ - -124.0320012, - 44.6127518 - ], - [ - -124.0320371, - 44.6127402 - ], - [ - -124.0320791, - 44.6127275 - ], - [ - -124.0321285, - 44.6127143 - ], - [ - -124.0321782, - 44.612703 - ], - [ - -124.0322116, - 44.6126965 - ], - [ - -124.0322562, - 44.6126889 - ], - [ - -124.032316, - 44.6126805 - ], - [ - -124.0323504, - 44.6126766 - ], - [ - -124.0323898, - 44.6126727 - ], - [ - -124.032435, - 44.6126691 - ], - [ - -124.0326973, - 44.6126709 - ], - [ - -124.0327366, - 44.612668 - ], - [ - -124.0327759, - 44.6126646 - ], - [ - -124.032802, - 44.6126616 - ], - [ - -124.0328365, - 44.6126567 - ], - [ - -124.0328561, - 44.6126532 - ], - [ - -124.0328782, - 44.6126485 - ], - [ - -124.0329031, - 44.6126421 - ], - [ - -124.0329162, - 44.6126382 - ], - [ - -124.03293, - 44.6126336 - ], - [ - -124.0329446, - 44.6126281 - ], - [ - -124.0329686, - 44.6126185 - ], - [ - -124.0329921, - 44.6126087 - ], - [ - -124.0330378, - 44.6125885 - ], - [ - -124.0330674, - 44.6125748 - ], - [ - -124.0331065, - 44.6125561 - ], - [ - -124.0331582, - 44.6125304 - ], - [ - -124.0333918, - 44.6124128 - ], - [ - -124.0335832, - 44.6123149 - ], - [ - -124.033648, - 44.6122822 - ], - [ - -124.0336659, - 44.6122736 - ], - [ - -124.0336845, - 44.6122655 - ], - [ - -124.0336971, - 44.6122604 - ], - [ - -124.0337143, - 44.6122542 - ], - [ - -124.0337242, - 44.612251 - ], - [ - -124.0337356, - 44.6122477 - ], - [ - -124.0337486, - 44.6122443 - ], - [ - -124.0337635, - 44.6122411 - ], - [ - -124.0337799, - 44.6122386 - ], - [ - -124.0337888, - 44.6122379 - ], - [ - -124.0337976, - 44.6122381 - ], - [ - -124.0338035, - 44.6122385 - ], - [ - -124.0338115, - 44.6122396 - ], - [ - -124.033822, - 44.6122418 - ], - [ - -124.0338361, - 44.6122457 - ], - [ - -124.0338442, - 44.6122483 - ], - [ - -124.033866, - 44.6122561 - ], - [ - -124.0338952, - 44.6122668 - ], - [ - -124.0339121, - 44.6122721 - ], - [ - -124.0339212, - 44.6122745 - ], - [ - -124.033931, - 44.6122765 - ], - [ - -124.0339414, - 44.6122779 - ], - [ - -124.0339526, - 44.6122786 - ], - [ - -124.0342926, - 44.6122808 - ], - [ - -124.034559, - 44.6122877 - ], - [ - -124.0345761, - 44.6122876 - ], - [ - -124.034593, - 44.6122872 - ], - [ - -124.0346268, - 44.6122851 - ], - [ - -124.0346492, - 44.612283 - ], - [ - -124.034679, - 44.6122792 - ], - [ - -124.0347186, - 44.6122727 - ], - [ - -124.0347411, - 44.6122684 - ], - [ - -124.0347668, - 44.6122631 - ], - [ - -124.0347961, - 44.6122564 - ], - [ - -124.0348296, - 44.6122483 - ], - [ - -124.0348799, - 44.6122349 - ], - [ - -124.0349287, - 44.6122202 - ], - [ - -124.0349605, - 44.6122094 - ], - [ - -124.0350018, - 44.6121939 - ], - [ - -124.0350248, - 44.6121844 - ], - [ - -124.0350507, - 44.6121729 - ], - [ - -124.0350796, - 44.6121589 - ], - [ - -124.0351118, - 44.6121418 - ], - [ - -124.0351475, - 44.6121207 - ], - [ - -124.0351734, - 44.6121034 - ], - [ - -124.0351976, - 44.6120853 - ], - [ - -124.0352131, - 44.6120729 - ], - [ - -124.0352331, - 44.612056 - ], - [ - -124.0353109, - 44.6119877 - ], - [ - -124.0353342, - 44.6119688 - ], - [ - -124.0353624, - 44.611948 - ], - [ - -124.0353898, - 44.6119282 - ], - [ - -124.0354169, - 44.6119077 - ], - [ - -124.0354712, - 44.6118661 - ], - [ - -124.0355082, - 44.6118393 - ], - [ - -124.03553, - 44.6118246 - ], - [ - -124.0355555, - 44.6118089 - ], - [ - -124.0355859, - 44.6117924 - ], - [ - -124.0356027, - 44.6117845 - ], - [ - -124.0356212, - 44.6117767 - ], - [ - -124.0356415, - 44.6117693 - ], - [ - -124.0356639, - 44.6117625 - ], - [ - -124.0356888, - 44.6117567 - ], - [ - -124.0361841, - 44.6116577 - ], - [ - -124.0367832, - 44.6116038 - ], - [ - -124.0368172, - 44.6116016 - ], - [ - -124.0368438, - 44.6116004 - ], - [ - -124.036897, - 44.6116002 - ], - [ - -124.0369325, - 44.6116016 - ], - [ - -124.0369798, - 44.611605 - ], - [ - -124.0370428, - 44.611612 - ], - [ - -124.0370788, - 44.6116171 - ], - [ - -124.0371198, - 44.6116237 - ], - [ - -124.0371667, - 44.6116321 - ], - [ - -124.0372916, - 44.6116568 - ], - [ - -124.0373495, - 44.6116696 - ], - [ - -124.0374059, - 44.6116838 - ], - [ - -124.0374429, - 44.6116939 - ], - [ - -124.0374919, - 44.6117079 - ], - [ - -124.0375569, - 44.6117275 - ], - [ - -124.0375852, - 44.6117373 - ], - [ - -124.0376125, - 44.6117486 - ], - [ - -124.0376303, - 44.6117568 - ], - [ - -124.0377006, - 44.6117907 - ], - [ - -124.0377212, - 44.6117998 - ], - [ - -124.0377454, - 44.6118093 - ], - [ - -124.0377586, - 44.6118139 - ], - [ - -124.0377731, - 44.6118183 - ], - [ - -124.037789, - 44.6118224 - ], - [ - -124.0378065, - 44.611826 - ], - [ - -124.0378242, - 44.611829 - ], - [ - -124.0378418, - 44.6118315 - ], - [ - -124.0378771, - 44.6118352 - ], - [ - -124.0379006, - 44.6118369 - ], - [ - -124.0379319, - 44.6118383 - ], - [ - -124.0379737, - 44.6118389 - ], - [ - -124.0380293, - 44.6118382 - ], - [ - -124.0381035, - 44.6118361 - ], - [ - -124.0382373, - 44.6118315 - ], - [ - -124.038371, - 44.6118252 - ], - [ - -124.03846, - 44.61182 - ], - [ - -124.0385784, - 44.6118119 - ], - [ - -124.0386017, - 44.6118098 - ], - [ - -124.0386248, - 44.611807 - ], - [ - -124.0386709, - 44.6117997 - ], - [ - -124.0387014, - 44.611794 - ], - [ - -124.0388228, - 44.6117695 - ], - [ - -124.0388575, - 44.6117635 - ], - [ - -124.0388974, - 44.611758 - ], - [ - -124.0389187, - 44.6117558 - ], - [ - -124.0389332, - 44.6117549 - ], - [ - -124.0389477, - 44.6117545 - ], - [ - -124.0389573, - 44.6117546 - ], - [ - -124.0389702, - 44.6117553 - ], - [ - -124.0389874, - 44.6117568 - ], - [ - -124.0389972, - 44.6117582 - ], - [ - -124.0390084, - 44.61176 - ], - [ - -124.0390212, - 44.6117626 - ], - [ - -124.0390358, - 44.6117663 - ], - [ - -124.0390524, - 44.6117713 - ], - [ - -124.0390612, - 44.6117743 - ], - [ - -124.0390706, - 44.6117778 - ], - [ - -124.0390806, - 44.6117819 - ], - [ - -124.0390881, - 44.6117854 - ], - [ - -124.0390951, - 44.6117892 - ], - [ - -124.0390994, - 44.6117918 - ], - [ - -124.0391048, - 44.6117956 - ], - [ - -124.0391116, - 44.6118007 - ], - [ - -124.0391199, - 44.6118079 - ], - [ - -124.0391302, - 44.6118177 - ], - [ - -124.0391439, - 44.6118307 - ], - [ - -124.0391522, - 44.6118378 - ], - [ - -124.0391569, - 44.6118413 - ], - [ - -124.0391623, - 44.611845 - ], - [ - -124.0391684, - 44.6118486 - ], - [ - -124.0391971, - 44.6118648 - ], - [ - -124.0392285, - 44.6118822 - ], - [ - -124.0392492, - 44.6118927 - ], - [ - -124.0392613, - 44.6118984 - ], - [ - -124.0392755, - 44.6119043 - ], - [ - -124.0392922, - 44.6119105 - ], - [ - -124.0393013, - 44.6119134 - ], - [ - -124.0393113, - 44.6119162 - ], - [ - -124.0393222, - 44.6119188 - ], - [ - -124.0393388, - 44.6119223 - ], - [ - -124.0393554, - 44.6119254 - ], - [ - -124.039389, - 44.6119307 - ], - [ - -124.0394564, - 44.6119399 - ], - [ - -124.039501, - 44.6119463 - ], - [ - -124.0395263, - 44.6119507 - ], - [ - -124.0395711, - 44.6119596 - ], - [ - -124.0396157, - 44.6119691 - ], - [ - -124.0397049, - 44.6119886 - ], - [ - -124.0397649, - 44.6120011 - ], - [ - -124.0397996, - 44.6120077 - ], - [ - -124.0398196, - 44.612011 - ], - [ - -124.0398397, - 44.6120139 - ], - [ - -124.0398803, - 44.6120184 - ], - [ - -124.0399075, - 44.6120206 - ], - [ - -124.0399438, - 44.6120225 - ], - [ - -124.0399923, - 44.6120238 - ], - [ - -124.0400563, - 44.6120238 - ], - [ - -124.0400923, - 44.6120234 - ], - [ - -124.0403284, - 44.6119724 - ], - [ - -124.0403538, - 44.6119724 - ], - [ - -124.0403792, - 44.6119734 - ], - [ - -124.0403961, - 44.6119746 - ], - [ - -124.0404187, - 44.6119769 - ], - [ - -124.0404488, - 44.6119813 - ], - [ - -124.040466, - 44.6119844 - ], - [ - -124.0404857, - 44.6119886 - ], - [ - -124.0405081, - 44.6119941 - ], - [ - -124.0405336, - 44.6120015 - ], - [ - -124.0405626, - 44.6120114 - ], - [ - -124.040578, - 44.6120173 - ], - [ - -124.0405945, - 44.6120241 - ], - [ - -124.0406221, - 44.612037 - ], - [ - -124.0406478, - 44.6120508 - ], - [ - -124.0406639, - 44.6120605 - ], - [ - -124.0406844, - 44.6120738 - ], - [ - -124.0407102, - 44.6120921 - ], - [ - -124.0407429, - 44.6121169 - ], - [ - -124.0407854, - 44.6121499 - ], - [ - -124.0408103, - 44.6121679 - ], - [ - -124.0408401, - 44.6121874 - ], - [ - -124.0408568, - 44.6121972 - ], - [ - -124.0408756, - 44.612207 - ], - [ - -124.0408967, - 44.6122166 - ], - [ - -124.0413571, - 44.6124103 - ], - [ - -124.0416952, - 44.6125534 - ], - [ - -124.0417058, - 44.6125577 - ], - [ - -124.0417171, - 44.6125619 - ], - [ - -124.0417415, - 44.6125702 - ], - [ - -124.0417588, - 44.6125757 - ], - [ - -124.0417826, - 44.612583 - ], - [ - -124.041815, - 44.6125929 - ], - [ - -124.0418576, - 44.6126067 - ], - [ - -124.0418806, - 44.612615 - ], - [ - -124.0419049, - 44.6126251 - ], - [ - -124.0419167, - 44.6126307 - ], - [ - -124.0419282, - 44.612637 - ], - [ - -124.0419392, - 44.612644 - ], - [ - -124.0419491, - 44.6126518 - ], - [ - -124.0419576, - 44.6126607 - ], - [ - -124.0419609, - 44.6126654 - ], - [ - -124.0419637, - 44.6126705 - ], - [ - -124.0419657, - 44.6126759 - ], - [ - -124.0419668, - 44.6126817 - ], - [ - -124.041967, - 44.6126879 - ], - [ - -124.041966, - 44.6126945 - ], - [ - -124.0419636, - 44.6127016 - ], - [ - -124.0419417, - 44.6127527 - ], - [ - -124.0419194, - 44.6128037 - ], - [ - -124.0418564, - 44.6129499 - ], - [ - -124.0418541, - 44.6129559 - ], - [ - -124.0418525, - 44.6129621 - ], - [ - -124.0418519, - 44.6129663 - ], - [ - -124.0418515, - 44.6129719 - ], - [ - -124.0418515, - 44.6129751 - ], - [ - -124.0418518, - 44.6129788 - ], - [ - -124.0418525, - 44.6129831 - ], - [ - -124.0418538, - 44.6129878 - ], - [ - -124.0418559, - 44.6129933 - ], - [ - -124.0418572, - 44.6129961 - ], - [ - -124.0418589, - 44.6129991 - ], - [ - -124.041861, - 44.6130023 - ], - [ - -124.0418635, - 44.6130056 - ], - [ - -124.0418666, - 44.613009 - ], - [ - -124.0418702, - 44.6130126 - ], - [ - -124.0418746, - 44.6130163 - ], - [ - -124.0418813, - 44.6130212 - ], - [ - -124.0418882, - 44.6130258 - ], - [ - -124.0419025, - 44.6130337 - ], - [ - -124.0419123, - 44.6130383 - ], - [ - -124.0419259, - 44.6130435 - ], - [ - -124.0419445, - 44.6130492 - ], - [ - -124.0419554, - 44.6130519 - ], - [ - -124.041968, - 44.6130546 - ], - [ - -124.0419826, - 44.6130573 - ], - [ - -124.0419994, - 44.6130599 - ], - [ - -124.0420442, - 44.6130664 - ], - [ - -124.0420693, - 44.6130707 - ], - [ - -124.0420823, - 44.6130735 - ], - [ - -124.042096, - 44.613077 - ], - [ - -124.0421101, - 44.6130814 - ], - [ - -124.0421245, - 44.6130871 - ], - [ - -124.0422083, - 44.6131242 - ], - [ - -124.0422358, - 44.613137 - ], - [ - -124.0422718, - 44.6131551 - ], - [ - -124.0422919, - 44.6131661 - ], - [ - -124.0423144, - 44.6131794 - ], - [ - -124.0423395, - 44.6131958 - ], - [ - -124.0423525, - 44.6132052 - ], - [ - -124.042366, - 44.6132156 - ], - [ - -124.0423733, - 44.6132216 - ], - [ - -124.0423801, - 44.6132277 - ], - [ - -124.0423927, - 44.6132401 - ], - [ - -124.0424004, - 44.6132486 - ], - [ - -124.0424097, - 44.6132601 - ], - [ - -124.042421, - 44.6132758 - ], - [ - -124.0424268, - 44.613285 - ], - [ - -124.0424331, - 44.6132955 - ], - [ - -124.0424399, - 44.6133076 - ], - [ - -124.0424566, - 44.6133405 - ], - [ - -124.0424597, - 44.6133479 - ], - [ - -124.0424619, - 44.6133554 - ], - [ - -124.0424629, - 44.6133605 - ], - [ - -124.0424638, - 44.6133674 - ], - [ - -124.0424644, - 44.6133767 - ], - [ - -124.0424645, - 44.6133892 - ], - [ - -124.0424645, - 44.6134059 - ], - [ - -124.0424649, - 44.6134153 - ], - [ - -124.0424661, - 44.6134258 - ], - [ - -124.0424673, - 44.6134313 - ], - [ - -124.0424689, - 44.613437 - ], - [ - -124.0424713, - 44.613443 - ], - [ - -124.0424741, - 44.6134481 - ], - [ - -124.0424779, - 44.6134528 - ], - [ - -124.0424809, - 44.6134558 - ], - [ - -124.0424853, - 44.6134596 - ], - [ - -124.042492, - 44.6134644 - ], - [ - -124.0425021, - 44.6134703 - ], - [ - -124.0425083, - 44.6134736 - ], - [ - -124.0425259, - 44.6134818 - ], - [ - -124.0425494, - 44.6134927 - ], - [ - -124.0425619, - 44.6134993 - ], - [ - -124.042568, - 44.613503 - ], - [ - -124.0425739, - 44.6135071 - ], - [ - -124.0425794, - 44.6135117 - ], - [ - -124.0425842, - 44.6135171 - ], - [ - -124.0425862, - 44.61352 - ], - [ - -124.042588, - 44.6135231 - ], - [ - -124.0425893, - 44.6135264 - ], - [ - -124.042592, - 44.6135354 - ], - [ - -124.042594, - 44.6135446 - ], - [ - -124.042595, - 44.6135509 - ], - [ - -124.0425959, - 44.6135594 - ], - [ - -124.0425963, - 44.613571 - ], - [ - -124.0426829, - 44.6132934 - ], - [ - -124.0426831, - 44.6125278 - ], - [ - -124.0428166, - 44.612574 - ], - [ - -124.0434451, - 44.6125845 - ], - [ - -124.0426738, - 44.6121514 - ], - [ - -124.0426488, - 44.6118259 - ], - [ - -124.0443559, - 44.6117848 - ], - [ - -124.0443478, - 44.6109338 - ], - [ - -124.044849, - 44.6109128 - ], - [ - -124.0451079, - 44.6110361 - ], - [ - -124.0454275, - 44.6111207 - ], - [ - -124.0459181, - 44.6111544 - ], - [ - -124.0463236, - 44.6111339 - ], - [ - -124.0463813, - 44.6119601 - ], - [ - -124.0468269, - 44.6119491 - ], - [ - -124.0468301, - 44.6120086 - ], - [ - -124.0473667, - 44.6119945 - ], - [ - -124.0473424, - 44.6117319 - ], - [ - -124.0476805, - 44.6117268 - ], - [ - -124.0476598, - 44.6091853 - ], - [ - -124.0453757, - 44.6091065 - ], - [ - -124.0453641, - 44.6091062 - ], - [ - -124.0449731, - 44.6090928 - ], - [ - -124.0442027, - 44.6090661 - ], - [ - -124.0441873, - 44.6090656 - ], - [ - -124.0427752, - 44.6090169 - ], - [ - -124.0422637, - 44.6084214 - ], - [ - -124.042233, - 44.6071636 - ], - [ - -124.0419163, - 44.6058809 - ], - [ - -124.0418953, - 44.6050181 - ], - [ - -124.0426775, - 44.6032982 - ], - [ - -124.0427226, - 44.6019886 - ], - [ - -124.0453402, - 44.6020595 - ], - [ - -124.0479252, - 44.6021297 - ], - [ - -124.0477944, - 44.6056576 - ], - [ - -124.0477738, - 44.6061975 - ], - [ - -124.0477704, - 44.6062968 - ], - [ - -124.0477694, - 44.6063123 - ], - [ - -124.0477497, - 44.606837 - ], - [ - -124.0477398, - 44.6071109 - ], - [ - -124.050208, - 44.6071705 - ], - [ - -124.0502298, - 44.6063327 - ], - [ - -124.0503264, - 44.606335 - ], - [ - -124.0511671, - 44.6063554 - ], - [ - -124.0511669, - 44.6057699 - ], - [ - -124.0511906, - 44.6057706 - ], - [ - -124.0512829, - 44.6057735 - ], - [ - -124.0515011, - 44.6057802 - ], - [ - -124.0515254, - 44.6057809 - ], - [ - -124.0515251, - 44.6057836 - ], - [ - -124.0515248, - 44.6057863 - ], - [ - -124.0515245, - 44.605789 - ], - [ - -124.0515243, - 44.6057917 - ], - [ - -124.051524, - 44.6057944 - ], - [ - -124.0515237, - 44.6057971 - ], - [ - -124.0515235, - 44.6057998 - ], - [ - -124.0515232, - 44.6058025 - ], - [ - -124.0515229, - 44.6058052 - ], - [ - -124.0515226, - 44.6058079 - ], - [ - -124.0515224, - 44.6058106 - ], - [ - -124.0515221, - 44.6058133 - ], - [ - -124.0515218, - 44.605816 - ], - [ - -124.0515216, - 44.6058187 - ], - [ - -124.0515213, - 44.6058215 - ], - [ - -124.0515211, - 44.6058242 - ], - [ - -124.0515208, - 44.6058269 - ], - [ - -124.0515205, - 44.6058296 - ], - [ - -124.0515203, - 44.6058323 - ], - [ - -124.05152, - 44.605835 - ], - [ - -124.0515198, - 44.6058377 - ], - [ - -124.0515195, - 44.6058404 - ], - [ - -124.0515193, - 44.6058431 - ], - [ - -124.051519, - 44.6058458 - ], - [ - -124.0515188, - 44.6058485 - ], - [ - -124.0515185, - 44.6058512 - ], - [ - -124.0515183, - 44.6058539 - ], - [ - -124.051518, - 44.6058566 - ], - [ - -124.0515178, - 44.6058593 - ], - [ - -124.0515176, - 44.605862 - ], - [ - -124.0515173, - 44.6058647 - ], - [ - -124.0515171, - 44.6058674 - ], - [ - -124.0515168, - 44.6058701 - ], - [ - -124.0515166, - 44.6058728 - ], - [ - -124.0515164, - 44.6058755 - ], - [ - -124.0515161, - 44.6058782 - ], - [ - -124.0515159, - 44.6058809 - ], - [ - -124.0515157, - 44.6058836 - ], - [ - -124.0515155, - 44.6058863 - ], - [ - -124.0515152, - 44.605889 - ], - [ - -124.051515, - 44.6058917 - ], - [ - -124.0515148, - 44.6058944 - ], - [ - -124.0515145, - 44.6058971 - ], - [ - -124.0515143, - 44.6058998 - ], - [ - -124.0515141, - 44.6059025 - ], - [ - -124.0515139, - 44.6059052 - ], - [ - -124.0515137, - 44.6059079 - ], - [ - -124.0515134, - 44.6059107 - ], - [ - -124.0515132, - 44.6059134 - ], - [ - -124.051513, - 44.6059161 - ], - [ - -124.0515128, - 44.6059188 - ], - [ - -124.0515126, - 44.6059215 - ], - [ - -124.0515124, - 44.6059242 - ], - [ - -124.0515122, - 44.6059269 - ], - [ - -124.051512, - 44.6059296 - ], - [ - -124.0515118, - 44.6059323 - ], - [ - -124.0515116, - 44.605935 - ], - [ - -124.0515113, - 44.6059377 - ], - [ - -124.0515111, - 44.6059404 - ], - [ - -124.0515109, - 44.6059431 - ], - [ - -124.0515107, - 44.6059458 - ], - [ - -124.0515105, - 44.6059485 - ], - [ - -124.0515103, - 44.6059512 - ], - [ - -124.0515102, - 44.6059539 - ], - [ - -124.05151, - 44.6059566 - ], - [ - -124.0515098, - 44.6059593 - ], - [ - -124.0515096, - 44.605962 - ], - [ - -124.0515094, - 44.6059647 - ], - [ - -124.0515092, - 44.6059675 - ], - [ - -124.051509, - 44.6059702 - ], - [ - -124.0515088, - 44.6059729 - ], - [ - -124.0515086, - 44.6059756 - ], - [ - -124.0515084, - 44.6059783 - ], - [ - -124.0515083, - 44.605981 - ], - [ - -124.0515081, - 44.6059837 - ], - [ - -124.0515079, - 44.6059864 - ], - [ - -124.0515077, - 44.6059891 - ], - [ - -124.0515075, - 44.6059918 - ], - [ - -124.0515074, - 44.6059945 - ], - [ - -124.0515072, - 44.6059972 - ], - [ - -124.051507, - 44.6059999 - ], - [ - -124.0515069, - 44.6060026 - ], - [ - -124.0515067, - 44.6060053 - ], - [ - -124.0515065, - 44.606008 - ], - [ - -124.0515063, - 44.6060107 - ], - [ - -124.0515062, - 44.6060134 - ], - [ - -124.051506, - 44.6060162 - ], - [ - -124.0515058, - 44.6060189 - ], - [ - -124.0515057, - 44.6060216 - ], - [ - -124.0515055, - 44.6060243 - ], - [ - -124.0515054, - 44.606027 - ], - [ - -124.0515052, - 44.6060297 - ], - [ - -124.051505, - 44.6060324 - ], - [ - -124.0515049, - 44.6060351 - ], - [ - -124.0515047, - 44.6060378 - ], - [ - -124.0515046, - 44.6060405 - ], - [ - -124.0515044, - 44.6060432 - ], - [ - -124.0515043, - 44.6060459 - ], - [ - -124.0515041, - 44.6060486 - ], - [ - -124.051504, - 44.6060513 - ], - [ - -124.0515038, - 44.606054 - ], - [ - -124.0515037, - 44.6060567 - ], - [ - -124.0515035, - 44.6060595 - ], - [ - -124.0515034, - 44.6060622 - ], - [ - -124.0515033, - 44.6060649 - ], - [ - -124.0515031, - 44.6060676 - ], - [ - -124.051503, - 44.6060703 - ], - [ - -124.0515028, - 44.606073 - ], - [ - -124.0515027, - 44.6060757 - ], - [ - -124.0515026, - 44.6060784 - ], - [ - -124.0515024, - 44.6060811 - ], - [ - -124.0515023, - 44.6060838 - ], - [ - -124.0515022, - 44.6060865 - ], - [ - -124.0515021, - 44.6060892 - ], - [ - -124.0515019, - 44.6060919 - ], - [ - -124.0515018, - 44.6060946 - ], - [ - -124.0515017, - 44.6060973 - ], - [ - -124.0515015, - 44.6061001 - ], - [ - -124.0515014, - 44.6061028 - ], - [ - -124.0515013, - 44.6061055 - ], - [ - -124.0515012, - 44.6061082 - ], - [ - -124.0515011, - 44.6061109 - ], - [ - -124.0515009, - 44.6061136 - ], - [ - -124.0515008, - 44.6061163 - ], - [ - -124.0515007, - 44.606119 - ], - [ - -124.0515006, - 44.6061217 - ], - [ - -124.0515005, - 44.6061244 - ], - [ - -124.0515004, - 44.6061271 - ], - [ - -124.0515003, - 44.6061298 - ], - [ - -124.0515002, - 44.6061325 - ], - [ - -124.0515001, - 44.6061352 - ], - [ - -124.0515, - 44.606138 - ], - [ - -124.0514998, - 44.6061407 - ], - [ - -124.0514997, - 44.6061434 - ], - [ - -124.0514996, - 44.6061461 - ], - [ - -124.0514995, - 44.6061488 - ], - [ - -124.0514994, - 44.6061515 - ], - [ - -124.0514994, - 44.6061542 - ], - [ - -124.0514993, - 44.6061569 - ], - [ - -124.0514992, - 44.6061596 - ], - [ - -124.0514991, - 44.6061623 - ], - [ - -124.051499, - 44.606165 - ], - [ - -124.0514989, - 44.6061677 - ], - [ - -124.0514988, - 44.6061704 - ], - [ - -124.0514987, - 44.6061732 - ], - [ - -124.0514986, - 44.6061759 - ], - [ - -124.0514985, - 44.6061786 - ], - [ - -124.0514985, - 44.6061813 - ], - [ - -124.0514984, - 44.606184 - ], - [ - -124.0514983, - 44.6061867 - ], - [ - -124.0514982, - 44.6061894 - ], - [ - -124.0514981, - 44.6061921 - ], - [ - -124.0514981, - 44.6061948 - ], - [ - -124.051498, - 44.6061975 - ], - [ - -124.0514979, - 44.6062002 - ], - [ - -124.0514978, - 44.6062029 - ], - [ - -124.0514978, - 44.6062057 - ], - [ - -124.0514977, - 44.6062084 - ], - [ - -124.0514976, - 44.6062111 - ], - [ - -124.0514975, - 44.6062138 - ], - [ - -124.0514975, - 44.6062165 - ], - [ - -124.0514974, - 44.6062192 - ], - [ - -124.0514974, - 44.6062219 - ], - [ - -124.0514973, - 44.6062246 - ], - [ - -124.0514972, - 44.6062273 - ], - [ - -124.0514972, - 44.60623 - ], - [ - -124.0514971, - 44.6062327 - ], - [ - -124.0514971, - 44.6062354 - ], - [ - -124.051497, - 44.6062381 - ], - [ - -124.0514969, - 44.6062409 - ], - [ - -124.0514969, - 44.6062436 - ], - [ - -124.0514968, - 44.6062463 - ], - [ - -124.0514968, - 44.606249 - ], - [ - -124.0514967, - 44.6062517 - ], - [ - -124.0514967, - 44.6062544 - ], - [ - -124.0514966, - 44.6062571 - ], - [ - -124.0514966, - 44.6062598 - ], - [ - -124.0514966, - 44.6062625 - ], - [ - -124.0514965, - 44.6062652 - ], - [ - -124.0514965, - 44.6062679 - ], - [ - -124.0514964, - 44.6062706 - ], - [ - -124.0514964, - 44.6062734 - ], - [ - -124.0514964, - 44.6062761 - ], - [ - -124.0514963, - 44.6062788 - ], - [ - -124.0514963, - 44.6062815 - ], - [ - -124.0514963, - 44.6062842 - ], - [ - -124.0514962, - 44.6062869 - ], - [ - -124.0514962, - 44.6062896 - ], - [ - -124.0514962, - 44.6062923 - ], - [ - -124.0514961, - 44.606295 - ], - [ - -124.0514961, - 44.6062977 - ], - [ - -124.0514961, - 44.6063004 - ], - [ - -124.0514961, - 44.6063032 - ], - [ - -124.051496, - 44.6063059 - ], - [ - -124.051496, - 44.6063086 - ], - [ - -124.051496, - 44.6063113 - ], - [ - -124.051496, - 44.606314 - ], - [ - -124.051496, - 44.6063167 - ], - [ - -124.0514959, - 44.6063194 - ], - [ - -124.0514959, - 44.6063221 - ], - [ - -124.0514959, - 44.6063248 - ], - [ - -124.0514959, - 44.6063275 - ], - [ - -124.0514959, - 44.6063302 - ], - [ - -124.0514959, - 44.6063329 - ], - [ - -124.0514959, - 44.6063357 - ], - [ - -124.0514959, - 44.6063384 - ], - [ - -124.0514959, - 44.6063411 - ], - [ - -124.0514959, - 44.6063438 - ], - [ - -124.0514959, - 44.6063465 - ], - [ - -124.0514959, - 44.6063492 - ], - [ - -124.0514959, - 44.6063519 - ], - [ - -124.0514959, - 44.6063546 - ], - [ - -124.0514959, - 44.6063573 - ], - [ - -124.0514959, - 44.60636 - ], - [ - -124.0514959, - 44.6063627 - ], - [ - -124.0514959, - 44.6063654 - ], - [ - -124.0514959, - 44.6063682 - ], - [ - -124.0514959, - 44.6063709 - ], - [ - -124.0514959, - 44.6063736 - ], - [ - -124.0514959, - 44.6063763 - ], - [ - -124.0514959, - 44.606379 - ], - [ - -124.0514959, - 44.6063817 - ], - [ - -124.051496, - 44.6063844 - ], - [ - -124.051496, - 44.6063871 - ], - [ - -124.051496, - 44.6063898 - ], - [ - -124.051496, - 44.6063925 - ], - [ - -124.051496, - 44.6063952 - ], - [ - -124.0514961, - 44.6063979 - ], - [ - -124.0514961, - 44.6064007 - ], - [ - -124.0514961, - 44.6064034 - ], - [ - -124.0514961, - 44.6064061 - ], - [ - -124.0514962, - 44.6064088 - ], - [ - -124.0514962, - 44.6064115 - ], - [ - -124.0514962, - 44.6064142 - ], - [ - -124.0514963, - 44.6064169 - ], - [ - -124.0514963, - 44.6064196 - ], - [ - -124.0514963, - 44.6064223 - ], - [ - -124.0514964, - 44.606425 - ], - [ - -124.0514964, - 44.6064277 - ], - [ - -124.0514964, - 44.6064304 - ], - [ - -124.0514965, - 44.6064332 - ], - [ - -124.0514965, - 44.6064359 - ], - [ - -124.0514966, - 44.6064386 - ], - [ - -124.0514966, - 44.6064413 - ], - [ - -124.0514967, - 44.606444 - ], - [ - -124.0514967, - 44.6064467 - ], - [ - -124.0514968, - 44.6064494 - ], - [ - -124.0514968, - 44.6064521 - ], - [ - -124.0514969, - 44.6064548 - ], - [ - -124.0514969, - 44.6064575 - ], - [ - -124.051497, - 44.6064602 - ], - [ - -124.051497, - 44.6064629 - ], - [ - -124.0514971, - 44.6064657 - ], - [ - -124.0514971, - 44.6064684 - ], - [ - -124.0514972, - 44.6064711 - ], - [ - -124.0514973, - 44.6064738 - ], - [ - -124.0514973, - 44.6064765 - ], - [ - -124.0514974, - 44.6064792 - ], - [ - -124.0514974, - 44.6064819 - ], - [ - -124.0514975, - 44.6064846 - ], - [ - -124.0514976, - 44.6064873 - ], - [ - -124.0514976, - 44.60649 - ], - [ - -124.0514977, - 44.6064927 - ], - [ - -124.0514978, - 44.6064954 - ], - [ - -124.0514979, - 44.6064982 - ], - [ - -124.0514979, - 44.6065009 - ], - [ - -124.051498, - 44.6065036 - ], - [ - -124.0514981, - 44.6065063 - ], - [ - -124.0514982, - 44.606509 - ], - [ - -124.0514982, - 44.6065117 - ], - [ - -124.0514983, - 44.6065144 - ], - [ - -124.0514984, - 44.6065171 - ], - [ - -124.0514985, - 44.6065198 - ], - [ - -124.0514986, - 44.6065225 - ], - [ - -124.0514987, - 44.6065252 - ], - [ - -124.0514987, - 44.6065279 - ], - [ - -124.0514988, - 44.6065306 - ], - [ - -124.0514989, - 44.6065334 - ], - [ - -124.051499, - 44.6065361 - ], - [ - -124.0514991, - 44.6065388 - ], - [ - -124.0514992, - 44.6065415 - ], - [ - -124.0514999, - 44.606688 - ], - [ - -124.0515041, - 44.6076178 - ], - [ - -124.0515059, - 44.6080232 - ], - [ - -124.0515106, - 44.6090486 - ], - [ - -124.0515144, - 44.6090487 - ], - [ - -124.0515182, - 44.6090488 - ], - [ - -124.0515221, - 44.6090488 - ], - [ - -124.0515259, - 44.6090489 - ], - [ - -124.0515297, - 44.609049 - ], - [ - -124.0515335, - 44.6090491 - ], - [ - -124.0515374, - 44.6090492 - ], - [ - -124.0515412, - 44.6090493 - ], - [ - -124.051545, - 44.6090494 - ], - [ - -124.0515488, - 44.6090495 - ], - [ - -124.0515526, - 44.6090496 - ], - [ - -124.0515565, - 44.6090497 - ], - [ - -124.0515603, - 44.6090498 - ], - [ - -124.0515641, - 44.6090499 - ], - [ - -124.0515679, - 44.6090501 - ], - [ - -124.0515717, - 44.6090502 - ], - [ - -124.0515756, - 44.6090503 - ], - [ - -124.0515794, - 44.6090504 - ], - [ - -124.0515832, - 44.6090506 - ], - [ - -124.051587, - 44.6090507 - ], - [ - -124.0515908, - 44.6090508 - ], - [ - -124.0515947, - 44.609051 - ], - [ - -124.0515985, - 44.6090511 - ], - [ - -124.0516023, - 44.6090513 - ], - [ - -124.0516061, - 44.6090514 - ], - [ - -124.0516099, - 44.6090516 - ], - [ - -124.0516137, - 44.6090518 - ], - [ - -124.0516176, - 44.6090519 - ], - [ - -124.0516214, - 44.6090521 - ], - [ - -124.0516252, - 44.6090523 - ], - [ - -124.051629, - 44.6090524 - ], - [ - -124.0516328, - 44.6090526 - ], - [ - -124.0516366, - 44.6090528 - ], - [ - -124.0516405, - 44.609053 - ], - [ - -124.0516443, - 44.6090532 - ], - [ - -124.0516481, - 44.6090534 - ], - [ - -124.0516519, - 44.6090536 - ], - [ - -124.0516557, - 44.6090538 - ], - [ - -124.0516595, - 44.609054 - ], - [ - -124.0516633, - 44.6090542 - ], - [ - -124.0516672, - 44.6090544 - ], - [ - -124.051671, - 44.6090546 - ], - [ - -124.0516748, - 44.6090548 - ], - [ - -124.0516786, - 44.609055 - ], - [ - -124.0516824, - 44.6090552 - ], - [ - -124.0516862, - 44.6090555 - ], - [ - -124.05169, - 44.6090557 - ], - [ - -124.0516938, - 44.6090559 - ], - [ - -124.0516977, - 44.6090562 - ], - [ - -124.0517015, - 44.6090564 - ], - [ - -124.0517053, - 44.6090566 - ], - [ - -124.0517091, - 44.6090569 - ], - [ - -124.0517129, - 44.6090571 - ], - [ - -124.0517167, - 44.6090574 - ], - [ - -124.0517205, - 44.6090577 - ], - [ - -124.0517243, - 44.6090579 - ], - [ - -124.0517281, - 44.6090582 - ], - [ - -124.0517319, - 44.6090584 - ], - [ - -124.0517357, - 44.6090587 - ], - [ - -124.0517395, - 44.609059 - ], - [ - -124.0517433, - 44.6090593 - ], - [ - -124.0517471, - 44.6090595 - ], - [ - -124.0517509, - 44.6090598 - ], - [ - -124.0517547, - 44.6090601 - ], - [ - -124.0517585, - 44.6090604 - ], - [ - -124.0517623, - 44.6090607 - ], - [ - -124.0517661, - 44.609061 - ], - [ - -124.05177, - 44.6090613 - ], - [ - -124.0517738, - 44.6090616 - ], - [ - -124.0517776, - 44.6090619 - ], - [ - -124.0517814, - 44.6090622 - ], - [ - -124.0517852, - 44.6090625 - ], - [ - -124.0517889, - 44.6090628 - ], - [ - -124.0517927, - 44.6090632 - ], - [ - -124.0517965, - 44.6090635 - ], - [ - -124.0518003, - 44.6090638 - ], - [ - -124.0518041, - 44.6090641 - ], - [ - -124.0518079, - 44.6090645 - ], - [ - -124.0518117, - 44.6090648 - ], - [ - -124.0518155, - 44.6090652 - ], - [ - -124.0518193, - 44.6090655 - ], - [ - -124.0518231, - 44.6090659 - ], - [ - -124.0518269, - 44.6090662 - ], - [ - -124.0518307, - 44.6090666 - ], - [ - -124.0518345, - 44.6090669 - ], - [ - -124.0518383, - 44.6090673 - ], - [ - -124.0518421, - 44.6090676 - ], - [ - -124.0518459, - 44.609068 - ], - [ - -124.0518496, - 44.6090684 - ], - [ - -124.0518534, - 44.6090688 - ], - [ - -124.0518572, - 44.6090691 - ], - [ - -124.051861, - 44.6090695 - ], - [ - -124.0518648, - 44.6090699 - ], - [ - -124.0518686, - 44.6090703 - ], - [ - -124.0518724, - 44.6090707 - ], - [ - -124.0518761, - 44.6090711 - ], - [ - -124.0518799, - 44.6090715 - ], - [ - -124.0518837, - 44.6090719 - ], - [ - -124.0518875, - 44.6090723 - ], - [ - -124.0518913, - 44.6090727 - ], - [ - -124.051895, - 44.6090731 - ], - [ - -124.0518988, - 44.6090735 - ], - [ - -124.0519026, - 44.6090739 - ], - [ - -124.0519064, - 44.6090744 - ], - [ - -124.0519102, - 44.6090748 - ], - [ - -124.0519139, - 44.6090752 - ], - [ - -124.0519177, - 44.6090756 - ], - [ - -124.0519215, - 44.6090761 - ], - [ - -124.0519253, - 44.6090765 - ], - [ - -124.051929, - 44.609077 - ], - [ - -124.0519328, - 44.6090774 - ], - [ - -124.0519366, - 44.6090779 - ], - [ - -124.0519404, - 44.6090783 - ], - [ - -124.0519441, - 44.6090788 - ], - [ - -124.0519479, - 44.6090792 - ], - [ - -124.0519517, - 44.6090797 - ], - [ - -124.0519554, - 44.6090802 - ], - [ - -124.0519592, - 44.6090806 - ], - [ - -124.051963, - 44.6090811 - ], - [ - -124.0519667, - 44.6090816 - ], - [ - -124.0519705, - 44.6090821 - ], - [ - -124.0521425, - 44.609104 - ], - [ - -124.0520302, - 44.609251 - ], - [ - -124.0519757, - 44.609334 - ], - [ - -124.051394, - 44.6102184 - ], - [ - -124.0503269, - 44.61018 - ], - [ - -124.0503253, - 44.609278 - ], - [ - -124.0501731, - 44.6092727 - ], - [ - -124.0501843, - 44.6116086 - ], - [ - -124.0506455, - 44.6110933 - ], - [ - -124.0509521, - 44.6107507 - ], - [ - -124.0511281, - 44.6105513 - ], - [ - -124.051541, - 44.6105767 - ], - [ - -124.052768, - 44.6106215 - ], - [ - -124.0527672, - 44.6119822 - ], - [ - -124.0527286, - 44.6121975 - ], - [ - -124.0528071, - 44.6119998 - ], - [ - -124.0528433, - 44.6118761 - ], - [ - -124.0528456, - 44.6102913 - ], - [ - -124.0528463, - 44.6093641 - ], - [ - -124.0558192, - 44.609488 - ], - [ - -124.0559053, - 44.6075211 - ], - [ - -124.0559275, - 44.6069463 - ], - [ - -124.0559572, - 44.6061791 - ], - [ - -124.0555452, - 44.6061707 - ], - [ - -124.0544257, - 44.6061465 - ], - [ - -124.0540908, - 44.6061397 - ], - [ - -124.0539378, - 44.6063726 - ], - [ - -124.0532389, - 44.6062725 - ], - [ - -124.0529285, - 44.6062807 - ], - [ - -124.0529407, - 44.6058244 - ], - [ - -124.0529422, - 44.605786 - ], - [ - -124.0529467, - 44.6056698 - ], - [ - -124.0530026, - 44.6056698 - ], - [ - -124.0530173, - 44.6052975 - ], - [ - -124.0533716, - 44.6052977 - ], - [ - -124.0535067, - 44.6052978 - ], - [ - -124.0546436, - 44.6052986 - ], - [ - -124.0543996, - 44.6056699 - ], - [ - -124.0541255, - 44.606087 - ], - [ - -124.0544603, - 44.6060938 - ], - [ - -124.0575908, - 44.6061574 - ], - [ - -124.0581383, - 44.6061685 - ], - [ - -124.0582447, - 44.6036342 - ], - [ - -124.0573334, - 44.6036267 - ], - [ - -124.0575738, - 44.6032557 - ], - [ - -124.0563094, - 44.6032568 - ], - [ - -124.0566361, - 44.6027579 - ], - [ - -124.0582774, - 44.6027563 - ], - [ - -124.0584, - 44.6001391 - ], - [ - -124.058432, - 44.5994111 - ], - [ - -124.0581672, - 44.5993232 - ], - [ - -124.0581819, - 44.5990018 - ], - [ - -124.0584467, - 44.59909 - ], - [ - -124.0584586, - 44.5988158 - ], - [ - -124.0592648, - 44.5988333 - ], - [ - -124.0636439, - 44.5988961 - ], - [ - -124.0657723, - 44.5989088 - ], - [ - -124.0658197, - 44.5981275 - ], - [ - -124.0596802, - 44.5981718 - ], - [ - -124.0596367, - 44.5977608 - ], - [ - -124.0585058, - 44.5977423 - ], - [ - -124.0584586, - 44.5988158 - ], - [ - -124.0542084, - 44.5987232 - ], - [ - -124.0540673, - 44.6022958 - ], - [ - -124.056551, - 44.602363 - ], - [ - -124.0563752, - 44.6026403 - ], - [ - -124.0558324, - 44.6034659 - ], - [ - -124.0530842, - 44.6034623 - ], - [ - -124.0531261, - 44.6022703 - ], - [ - -124.0479252, - 44.6021297 - ], - [ - -124.0480512, - 44.598582 - ], - [ - -124.0480675, - 44.598288 - ], - [ - -124.0459838, - 44.5978053 - ], - [ - -124.0464429, - 44.5969909 - ], - [ - -124.0458864, - 44.5967514 - ], - [ - -124.0427806, - 44.6003371 - ], - [ - -124.042846, - 44.5984619 - ], - [ - -124.0412385, - 44.5984734 - ], - [ - -124.0413324, - 44.5949635 - ], - [ - -124.0429676, - 44.5949354 - ], - [ - -124.0473862, - 44.5950197 - ], - [ - -124.0481883, - 44.595035 - ], - [ - -124.0480975, - 44.5914965 - ], - [ - -124.0533429, - 44.5915663 - ], - [ - -124.0532787, - 44.5879977 - ], - [ - -124.0479848, - 44.5879452 - ], - [ - -124.0481485, - 44.5736475 - ], - [ - -124.0534213, - 44.5736332 - ], - [ - -124.0534026, - 44.570986 - ], - [ - -124.05584, - 44.5709713 - ], - [ - -124.0560788, - 44.566409 - ], - [ - -124.0542291, - 44.5663902 - ], - [ - -124.0542197, - 44.5634813 - ], - [ - -124.0539144, - 44.5632787 - ], - [ - -124.0533081, - 44.5628369 - ], - [ - -124.0531502, - 44.5625452 - ], - [ - -124.0531104, - 44.5623158 - ], - [ - -124.0531379, - 44.5621317 - ], - [ - -124.0531531, - 44.5621095 - ], - [ - -124.0533669, - 44.5617982 - ], - [ - -124.0533969, - 44.5616766 - ], - [ - -124.0532968, - 44.5611959 - ], - [ - -124.053306, - 44.5610875 - ], - [ - -124.0533272, - 44.5609633 - ], - [ - -124.0533343, - 44.5609229 - ], - [ - -124.0532939, - 44.5608652 - ], - [ - -124.0532204, - 44.5608195 - ], - [ - -124.0529154, - 44.5608027 - ], - [ - -124.0526261, - 44.5609084 - ], - [ - -124.0523888, - 44.5610748 - ], - [ - -124.0518987, - 44.5615846 - ], - [ - -124.0514846, - 44.5618046 - ], - [ - -124.0510696, - 44.5620554 - ], - [ - -124.0509799, - 44.5621081 - ], - [ - -124.0507144, - 44.562264 - ], - [ - -124.0502902, - 44.5625325 - ], - [ - -124.0499237, - 44.5628557 - ], - [ - -124.0494612, - 44.5632441 - ], - [ - -124.0490476, - 44.5633926 - ], - [ - -124.0490464, - 44.5633931 - ], - [ - -124.0490475, - 44.5632699 - ], - [ - -124.0493645, - 44.563156 - ], - [ - -124.0498056, - 44.5627855 - ], - [ - -124.050179, - 44.5624564 - ], - [ - -124.0506148, - 44.5621805 - ], - [ - -124.0507384, - 44.5621079 - ], - [ - -124.0490465, - 44.5621011 - ], - [ - -124.0490445, - 44.5609061 - ], - [ - -124.049043, - 44.5600246 - ], - [ - -124.0490429, - 44.5579433 - ], - [ - -124.051636, - 44.5579251 - ], - [ - -124.0516216, - 44.5549724 - ], - [ - -124.0516178, - 44.5542089 - ], - [ - -124.0490382, - 44.5542068 - ], - [ - -124.0490302, - 44.5504703 - ], - [ - -124.0509424, - 44.5504869 - ], - [ - -124.0541999, - 44.5505153 - ], - [ - -124.0540665, - 44.5469839 - ], - [ - -124.0592328, - 44.5468935 - ], - [ - -124.059184, - 44.5451392 - ], - [ - -124.0604621, - 44.5451544 - ], - [ - -124.060178, - 44.545718 - ], - [ - -124.0603059, - 44.5459905 - ], - [ - -124.0606418, - 44.5467674 - ], - [ - -124.0605188, - 44.5469357 - ], - [ - -124.0606346, - 44.5472057 - ], - [ - -124.0610449, - 44.5474428 - ], - [ - -124.0611829, - 44.547882 - ], - [ - -124.0614395, - 44.5480984 - ], - [ - -124.0616392, - 44.5483127 - ], - [ - -124.0620749, - 44.5480952 - ], - [ - -124.0623087, - 44.5479421 - ], - [ - -124.0624676, - 44.5478394 - ], - [ - -124.0625279, - 44.547784 - ], - [ - -124.0625682, - 44.5476883 - ], - [ - -124.0625777, - 44.5475921 - ], - [ - -124.0623978, - 44.5471833 - ], - [ - -124.0627068, - 44.5471309 - ], - [ - -124.0628926, - 44.5470661 - ], - [ - -124.0631938, - 44.5471949 - ], - [ - -124.0636768, - 44.5470615 - ], - [ - -124.0641771, - 44.5471989 - ], - [ - -124.0642955, - 44.547195 - ], - [ - -124.0643831, - 44.5488009 - ], - [ - -124.0632357, - 44.5488149 - ], - [ - -124.0624067, - 44.552321 - ], - [ - -124.0618569, - 44.5523304 - ], - [ - -124.061863, - 44.5563705 - ], - [ - -124.0714813, - 44.5563959 - ], - [ - -124.0710625, - 44.5581415 - ], - [ - -124.0689219, - 44.5581518 - ], - [ - -124.068916, - 44.5590524 - ], - [ - -124.07088, - 44.5590363 - ], - [ - -124.0706478, - 44.5600297 - ], - [ - -124.0716923, - 44.5600267 - ], - [ - -124.071693, - 44.5600743 - ], - [ - -124.0716929, - 44.5601235 - ], - [ - -124.0716911, - 44.5601892 - ], - [ - -124.0716848, - 44.5602799 - ], - [ - -124.0716743, - 44.5603702 - ], - [ - -124.0716652, - 44.5604304 - ], - [ - -124.0716507, - 44.5605104 - ], - [ - -124.0716276, - 44.5606168 - ], - [ - -124.0716155, - 44.5606621 - ], - [ - -124.0716012, - 44.5607069 - ], - [ - -124.07157, - 44.5607961 - ], - [ - -124.0715505, - 44.5608558 - ], - [ - -124.0715409, - 44.5608903 - ], - [ - -124.0715307, - 44.560934 - ], - [ - -124.0715222, - 44.5609779 - ], - [ - -124.0715173, - 44.5610072 - ], - [ - -124.0715115, - 44.5610463 - ], - [ - -124.0715048, - 44.5610985 - ], - [ - -124.0715019, - 44.5611242 - ], - [ - -124.0715, - 44.5611501 - ], - [ - -124.0714996, - 44.5611674 - ], - [ - -124.0715009, - 44.5611884 - ], - [ - -124.0715027, - 44.5612011 - ], - [ - -124.071506, - 44.5612155 - ], - [ - -124.0715084, - 44.5612231 - ], - [ - -124.0715114, - 44.5612312 - ], - [ - -124.0715211, - 44.5612542 - ], - [ - -124.0715313, - 44.561277 - ], - [ - -124.0715531, - 44.5613223 - ], - [ - -124.0715683, - 44.5613523 - ], - [ - -124.0715892, - 44.5613921 - ], - [ - -124.0716703, - 44.561545 - ], - [ - -124.0716044, - 44.561624 - ], - [ - -124.0716014, - 44.5616272 - ], - [ - -124.071598, - 44.56163 - ], - [ - -124.0715954, - 44.5616318 - ], - [ - -124.0715918, - 44.5616339 - ], - [ - -124.0715866, - 44.5616364 - ], - [ - -124.0715834, - 44.5616377 - ], - [ - -124.0715796, - 44.561639 - ], - [ - -124.0715751, - 44.5616403 - ], - [ - -124.0715697, - 44.5616417 - ], - [ - -124.0715633, - 44.561643 - ], - [ - -124.0715557, - 44.5616442 - ], - [ - -124.0715469, - 44.5616454 - ], - [ - -124.0715366, - 44.5616464 - ], - [ - -124.071525, - 44.5616473 - ], - [ - -124.071512, - 44.5616482 - ], - [ - -124.0715053, - 44.5616488 - ], - [ - -124.0714778, - 44.5616509 - ], - [ - -124.0714501, - 44.5616527 - ], - [ - -124.0714317, - 44.5616536 - ], - [ - -124.0714071, - 44.5616542 - ], - [ - -124.071393, - 44.5616541 - ], - [ - -124.071377, - 44.5616537 - ], - [ - -124.0713588, - 44.5616528 - ], - [ - -124.0713365, - 44.5616508 - ], - [ - -124.0713142, - 44.5616483 - ], - [ - -124.0712697, - 44.5616424 - ], - [ - -124.07124, - 44.5616387 - ], - [ - -124.071223, - 44.561637 - ], - [ - -124.0712029, - 44.5616351 - ], - [ - -124.0711826, - 44.5616334 - ], - [ - -124.071169, - 44.5616326 - ], - [ - -124.0711509, - 44.5616319 - ], - [ - -124.0711405, - 44.5616317 - ], - [ - -124.0711287, - 44.5616318 - ], - [ - -124.0711153, - 44.5616324 - ], - [ - -124.0711, - 44.5616337 - ], - [ - -124.0710919, - 44.5616347 - ], - [ - -124.0710845, - 44.561636 - ], - [ - -124.0710772, - 44.5616378 - ], - [ - -124.0710724, - 44.5616392 - ], - [ - -124.0710661, - 44.5616415 - ], - [ - -124.071058, - 44.561645 - ], - [ - -124.0710535, - 44.5616472 - ], - [ - -124.0710486, - 44.56165 - ], - [ - -124.0710432, - 44.5616534 - ], - [ - -124.0710374, - 44.5616575 - ], - [ - -124.0710314, - 44.5616626 - ], - [ - -124.0710284, - 44.5616655 - ], - [ - -124.0710255, - 44.5616687 - ], - [ - -124.0710226, - 44.5616721 - ], - [ - -124.0710199, - 44.5616759 - ], - [ - -124.0710174, - 44.56168 - ], - [ - -124.0710152, - 44.5616845 - ], - [ - -124.0710134, - 44.5616893 - ], - [ - -124.0710113, - 44.5616972 - ], - [ - -124.0710094, - 44.5617051 - ], - [ - -124.0710067, - 44.5617209 - ], - [ - -124.0710054, - 44.5617314 - ], - [ - -124.0710042, - 44.5617454 - ], - [ - -124.0710034, - 44.5617641 - ], - [ - -124.071003, - 44.5617891 - ], - [ - -124.0710018, - 44.561897 - ], - [ - -124.0710022, - 44.561933 - ], - [ - -124.071015, - 44.5622646 - ], - [ - -124.0710156, - 44.5623461 - ], - [ - -124.0710141, - 44.5624277 - ], - [ - -124.071008, - 44.5625908 - ], - [ - -124.0710044, - 44.5626544 - ], - [ - -124.0709985, - 44.5627178 - ], - [ - -124.0709931, - 44.56276 - ], - [ - -124.0709838, - 44.5628162 - ], - [ - -124.0709773, - 44.5628483 - ], - [ - -124.0709687, - 44.562885 - ], - [ - -124.0709625, - 44.562908 - ], - [ - -124.0709554, - 44.5629307 - ], - [ - -124.0709392, - 44.5629757 - ], - [ - -124.0709268, - 44.5630054 - ], - [ - -124.0709088, - 44.5630446 - ], - [ - -124.0708824, - 44.5630964 - ], - [ - -124.070844, - 44.5631649 - ], - [ - -124.0707516, - 44.5633118 - ], - [ - -124.070719, - 44.5633599 - ], - [ - -124.070675, - 44.5634239 - ], - [ - -124.0706643, - 44.5634387 - ], - [ - -124.0706288, - 44.5634822 - ], - [ - -124.0705777, - 44.5635387 - ], - [ - -124.0705444, - 44.5635766 - ], - [ - -124.0705266, - 44.5635987 - ], - [ - -124.0705078, - 44.5636246 - ], - [ - -124.0705023, - 44.5636341 - ], - [ - -124.0704982, - 44.5636438 - ], - [ - -124.0704961, - 44.5636505 - ], - [ - -124.0704942, - 44.5636595 - ], - [ - -124.0704927, - 44.5636718 - ], - [ - -124.0704924, - 44.5636885 - ], - [ - -124.0704956, - 44.5637414 - ], - [ - -124.0704956, - 44.5637584 - ], - [ - -124.070495, - 44.5637674 - ], - [ - -124.0704936, - 44.5637768 - ], - [ - -124.0704912, - 44.5637867 - ], - [ - -124.0704874, - 44.5637971 - ], - [ - -124.0704817, - 44.5638077 - ], - [ - -124.0704667, - 44.5638311 - ], - [ - -124.0704509, - 44.5638543 - ], - [ - -124.0704177, - 44.5639 - ], - [ - -124.0703945, - 44.5639301 - ], - [ - -124.0703627, - 44.5639698 - ], - [ - -124.0703192, - 44.5640223 - ], - [ - -124.0703139, - 44.5640284 - ], - [ - -124.0703084, - 44.5640342 - ], - [ - -124.0702965, - 44.5640455 - ], - [ - -124.0702714, - 44.5640675 - ], - [ - -124.0702549, - 44.5640824 - ], - [ - -124.0702461, - 44.5640913 - ], - [ - -124.0702367, - 44.5641019 - ], - [ - -124.0702322, - 44.5641078 - ], - [ - -124.0702277, - 44.5641144 - ], - [ - -124.0702235, - 44.5641217 - ], - [ - -124.0702179, - 44.5641337 - ], - [ - -124.0702164, - 44.5641378 - ], - [ - -124.0702137, - 44.5641458 - ], - [ - -124.0702117, - 44.5641539 - ], - [ - -124.0702099, - 44.5641647 - ], - [ - -124.0702087, - 44.5641791 - ], - [ - -124.0702087, - 44.5641873 - ], - [ - -124.0702092, - 44.5641967 - ], - [ - -124.0702102, - 44.5642075 - ], - [ - -124.070212, - 44.5642198 - ], - [ - -124.0702147, - 44.5642338 - ], - [ - -124.0702233, - 44.5642708 - ], - [ - -124.0702356, - 44.5643192 - ], - [ - -124.0702486, - 44.5643676 - ], - [ - -124.0702747, - 44.5644644 - ], - [ - -124.0702912, - 44.5645342 - ], - [ - -124.0702922, - 44.5645394 - ], - [ - -124.0702942, - 44.5645498 - ], - [ - -124.0702957, - 44.5645566 - ], - [ - -124.0703083, - 44.5646037 - ], - [ - -124.0703231, - 44.5646505 - ], - [ - -124.0703555, - 44.5647437 - ], - [ - -124.0703763, - 44.5648059 - ], - [ - -124.0703868, - 44.5648416 - ], - [ - -124.0703976, - 44.5648864 - ], - [ - -124.0704061, - 44.5649316 - ], - [ - -124.0704205, - 44.5650223 - ], - [ - -124.0704312, - 44.5650826 - ], - [ - -124.0704389, - 44.5651168 - ], - [ - -124.070441, - 44.5651244 - ], - [ - -124.0704437, - 44.5651319 - ], - [ - -124.0704502, - 44.5651468 - ], - [ - -124.0704551, - 44.5651567 - ], - [ - -124.0704763, - 44.5651958 - ], - [ - -124.0704816, - 44.5652071 - ], - [ - -124.0704867, - 44.5652201 - ], - [ - -124.0704889, - 44.5652271 - ], - [ - -124.0704906, - 44.5652347 - ], - [ - -124.0704919, - 44.5652428 - ], - [ - -124.0704957, - 44.5652851 - ], - [ - -124.0704986, - 44.5653274 - ], - [ - -124.0705012, - 44.5653928 - ], - [ - -124.069634, - 44.5653988 - ], - [ - -124.0691868, - 44.5656699 - ], - [ - -124.06876, - 44.5674117 - ], - [ - -124.0684991, - 44.5673729 - ], - [ - -124.0681813, - 44.5673265 - ], - [ - -124.0681329, - 44.5675095 - ], - [ - -124.0683708, - 44.5675427 - ], - [ - -124.0683131, - 44.5677619 - ], - [ - -124.0664969, - 44.5674668 - ], - [ - -124.0661184, - 44.5673938 - ], - [ - -124.0657495, - 44.5672999 - ], - [ - -124.0653921, - 44.5671856 - ], - [ - -124.0650523, - 44.5670531 - ], - [ - -124.0648684, - 44.5669742 - ], - [ - -124.0647829, - 44.5669399 - ], - [ - -124.0646948, - 44.5669089 - ], - [ - -124.0616805, - 44.5659182 - ], - [ - -124.061572, - 44.5658864 - ], - [ - -124.0614649, - 44.5658622 - ], - [ - -124.0613552, - 44.5658444 - ], - [ - -124.0612439, - 44.5658332 - ], - [ - -124.0611317, - 44.5658287 - ], - [ - -124.0610193, - 44.5658309 - ], - [ - -124.0609076, - 44.5658397 - ], - [ - -124.0607972, - 44.5658552 - ], - [ - -124.0606891, - 44.5658772 - ], - [ - -124.060584, - 44.5659054 - ], - [ - -124.059632, - 44.5661964 - ], - [ - -124.059636, - 44.5664516 - ], - [ - -124.0598811, - 44.5664536 - ], - [ - -124.0598842, - 44.5665471 - ], - [ - -124.0611794, - 44.5665454 - ], - [ - -124.0607711, - 44.5700801 - ], - [ - -124.0638257, - 44.5700923 - ], - [ - -124.0638531, - 44.5717509 - ], - [ - -124.0671196, - 44.5717499 - ], - [ - -124.067063, - 44.5720131 - ], - [ - -124.0670281, - 44.5722221 - ], - [ - -124.06699, - 44.5724855 - ], - [ - -124.0669891, - 44.5724905 - ], - [ - -124.0661149, - 44.5748307 - ], - [ - -124.0660222, - 44.5750947 - ], - [ - -124.0659453, - 44.5753473 - ], - [ - -124.0658786, - 44.5756083 - ], - [ - -124.0658247, - 44.5758654 - ], - [ - -124.0657813, - 44.5761243 - ], - [ - -124.0657484, - 44.5763988 - ], - [ - -124.0656819, - 44.5770811 - ], - [ - -124.0655259, - 44.5786801 - ], - [ - -124.0655257, - 44.5786891 - ], - [ - -124.0655312, - 44.5787595 - ], - [ - -124.0655334, - 44.5788152 - ], - [ - -124.0655315, - 44.5788847 - ], - [ - -124.0655278, - 44.5789373 - ], - [ - -124.0655183, - 44.5790087 - ], - [ - -124.0655074, - 44.57907 - ], - [ - -124.0654177, - 44.5794345 - ], - [ - -124.0654032, - 44.5795118 - ], - [ - -124.0653932, - 44.579555 - ], - [ - -124.0653765, - 44.5796159 - ], - [ - -124.0653532, - 44.5796935 - ], - [ - -124.0653345, - 44.5797471 - ], - [ - -124.0653146, - 44.5797985 - ], - [ - -124.0652069, - 44.579979 - ], - [ - -124.0651736, - 44.5800385 - ], - [ - -124.0651362, - 44.5801116 - ], - [ - -124.0651039, - 44.5801818 - ], - [ - -124.0650751, - 44.5802508 - ], - [ - -124.0650498, - 44.5803222 - ], - [ - -124.0650295, - 44.5803868 - ], - [ - -124.0650059, - 44.5804724 - ], - [ - -124.0647907, - 44.5813567 - ], - [ - -124.0645885, - 44.5822772 - ], - [ - -124.0645883, - 44.5822807 - ], - [ - -124.0644274, - 44.583212 - ], - [ - -124.0643101, - 44.5841383 - ], - [ - -124.0643099, - 44.5841424 - ], - [ - -124.0642412, - 44.5848138 - ], - [ - -124.0639928, - 44.5848176 - ], - [ - -124.0640239, - 44.5852335 - ], - [ - -124.0641984, - 44.5852226 - ], - [ - -124.0641346, - 44.5858471 - ], - [ - -124.0640138, - 44.5867371 - ], - [ - -124.063889, - 44.587408 - ], - [ - -124.0638419, - 44.5876379 - ], - [ - -124.0638216, - 44.5877464 - ], - [ - -124.0638077, - 44.5878529 - ], - [ - -124.0637995, - 44.5879646 - ], - [ - -124.0637971, - 44.5880707 - ], - [ - -124.0637998, - 44.5881796 - ], - [ - -124.0637999, - 44.588181 - ], - [ - -124.0638084, - 44.5882823 - ], - [ - -124.0638078, - 44.5882846 - ], - [ - -124.0638098, - 44.5882993 - ], - [ - -124.0638238, - 44.5883975 - ], - [ - -124.0638242, - 44.5884032 - ], - [ - -124.0638461, - 44.5885173 - ], - [ - -124.063872, - 44.5886209 - ], - [ - -124.0639062, - 44.5887349 - ], - [ - -124.0641331, - 44.5894204 - ], - [ - -124.0641611, - 44.5895143 - ], - [ - -124.0641907, - 44.5896339 - ], - [ - -124.0642098, - 44.5897333 - ], - [ - -124.0642257, - 44.5898498 - ], - [ - -124.064234, - 44.5899547 - ], - [ - -124.0642376, - 44.5900589 - ], - [ - -124.0642349, - 44.5901779 - ], - [ - -124.0642268, - 44.5902789 - ], - [ - -124.0642111, - 44.5903997 - ], - [ - -124.0641915, - 44.5905069 - ], - [ - -124.0641644, - 44.5906178 - ], - [ - -124.0641328, - 44.5907245 - ], - [ - -124.064081, - 44.5908708 - ], - [ - -124.0644385, - 44.5909484 - ], - [ - -124.0659013, - 44.5909 - ], - [ - -124.0658454, - 44.5908086 - ], - [ - -124.0658067, - 44.5905322 - ], - [ - -124.0658182, - 44.5905319 - ], - [ - -124.06583, - 44.5905304 - ], - [ - -124.065841, - 44.5905284 - ], - [ - -124.065852, - 44.5905253 - ], - [ - -124.0658621, - 44.5905214 - ], - [ - -124.0658718, - 44.590517 - ], - [ - -124.0658807, - 44.5905115 - ], - [ - -124.0658888, - 44.5905058 - ], - [ - -124.0658961, - 44.5904992 - ], - [ - -124.0659026, - 44.5904922 - ], - [ - -124.0659079, - 44.5904849 - ], - [ - -124.0659117, - 44.5904771 - ], - [ - -124.0659147, - 44.590469 - ], - [ - -124.0659165, - 44.590461 - ], - [ - -124.0659171, - 44.5904527 - ], - [ - -124.0659162, - 44.5904442 - ], - [ - -124.0659146, - 44.5904361 - ], - [ - -124.0659114, - 44.5904282 - ], - [ - -124.0659071, - 44.5904204 - ], - [ - -124.065902, - 44.5904131 - ], - [ - -124.0658955, - 44.5904062 - ], - [ - -124.0658881, - 44.5903995 - ], - [ - -124.0658831, - 44.5903959 - ], - [ - -124.0658674, - 44.590387 - ], - [ - -124.0659973, - 44.5896771 - ], - [ - -124.0665748, - 44.5898438 - ], - [ - -124.0674253, - 44.5900893 - ], - [ - -124.0675566, - 44.5902658 - ], - [ - -124.0678176, - 44.5902658 - ], - [ - -124.0678026, - 44.5903856 - ], - [ - -124.0677873, - 44.5904762 - ], - [ - -124.0677473, - 44.5907122 - ], - [ - -124.0677075, - 44.5909476 - ], - [ - -124.0676949, - 44.5910217 - ], - [ - -124.0676836, - 44.5911089 - ], - [ - -124.0676751, - 44.5911963 - ], - [ - -124.0676624, - 44.5913712 - ], - [ - -124.067659, - 44.5914826 - ], - [ - -124.0676425, - 44.5916164 - ], - [ - -124.0676264, - 44.5917342 - ], - [ - -124.0675963, - 44.5919579 - ], - [ - -124.0675621, - 44.5921899 - ], - [ - -124.0675313, - 44.5923431 - ], - [ - -124.067493, - 44.5925044 - ], - [ - -124.0674696, - 44.5926121 - ], - [ - -124.0673748, - 44.5931126 - ], - [ - -124.0673097, - 44.5934066 - ], - [ - -124.0673026, - 44.5934488 - ], - [ - -124.067292, - 44.5935258 - ], - [ - -124.0672827, - 44.5936028 - ], - [ - -124.0672641, - 44.593757 - ], - [ - -124.0672018, - 44.5942175 - ], - [ - -124.0671366, - 44.5946177 - ], - [ - -124.067127, - 44.5946994 - ], - [ - -124.0671163, - 44.5949086 - ], - [ - -124.0671373, - 44.595235 - ], - [ - -124.0670825, - 44.5957807 - ], - [ - -124.0670188, - 44.5963577 - ], - [ - -124.0670088, - 44.5964925 - ], - [ - -124.0670028, - 44.5966274 - ], - [ - -124.0669957, - 44.5968974 - ], - [ - -124.0669888, - 44.5970773 - ], - [ - -124.0669766, - 44.5973073 - ], - [ - -124.0669615, - 44.5975373 - ], - [ - -124.0669003, - 44.5981749 - ], - [ - -124.066853, - 44.5987679 - ], - [ - -124.0668338, - 44.5989793 - ], - [ - -124.0668105, - 44.5991904 - ], - [ - -124.0667831, - 44.5993843 - ], - [ - -124.066772, - 44.5994371 - ], - [ - -124.0667443, - 44.5995423 - ], - [ - -124.066678, - 44.5997514 - ], - [ - -124.0666356, - 44.5998912 - ], - [ - -124.0666153, - 44.5999717 - ], - [ - -124.0665842, - 44.6001031 - ], - [ - -124.0665552, - 44.6002347 - ], - [ - -124.0665406, - 44.6003226 - ], - [ - -124.0665319, - 44.6004305 - ], - [ - -124.0665673, - 44.6009462 - ], - [ - -124.0665901, - 44.601207 - ], - [ - -124.0665966, - 44.601294 - ], - [ - -124.0665987, - 44.60134 - ], - [ - -124.066599, - 44.6013859 - ], - [ - -124.0665952, - 44.6014778 - ], - [ - -124.0665902, - 44.6015391 - ], - [ - -124.0665626, - 44.6017841 - ], - [ - -124.0665057, - 44.6021944 - ], - [ - -124.0665012, - 44.6022532 - ], - [ - -124.0664878, - 44.602677 - ], - [ - -124.0664661, - 44.6030978 - ], - [ - -124.0664525, - 44.6033636 - ], - [ - -124.0664243, - 44.6036245 - ], - [ - -124.0663794, - 44.6039643 - ], - [ - -124.0663591, - 44.604132 - ], - [ - -124.0663548, - 44.6041855 - ], - [ - -124.0663535, - 44.6042391 - ], - [ - -124.0663547, - 44.6043464 - ], - [ - -124.0663544, - 44.6044179 - ], - [ - -124.0663525, - 44.6044587 - ], - [ - -124.0663058, - 44.6049243 - ], - [ - -124.0662994, - 44.60506 - ], - [ - -124.0662866, - 44.6054672 - ], - [ - -124.0662817, - 44.605544 - ], - [ - -124.0662748, - 44.6056209 - ], - [ - -124.066259, - 44.6057746 - ], - [ - -124.0662506, - 44.6058771 - ], - [ - -124.0662478, - 44.6059355 - ], - [ - -124.066248, - 44.6059595 - ], - [ - -124.0662499, - 44.6059833 - ], - [ - -124.066252, - 44.6059992 - ], - [ - -124.0662557, - 44.6060204 - ], - [ - -124.0662618, - 44.6060486 - ], - [ - -124.0662715, - 44.6060862 - ], - [ - -124.0662854, - 44.6061362 - ], - [ - -124.0662911, - 44.6061571 - ], - [ - -124.0662971, - 44.6061779 - ], - [ - -124.066305, - 44.6061993 - ], - [ - -124.0663089, - 44.6062081 - ], - [ - -124.0663208, - 44.6062291 - ], - [ - -124.0663378, - 44.6062521 - ], - [ - -124.0663511, - 44.6062689 - ], - [ - -124.0663788, - 44.6063017 - ], - [ - -124.0663978, - 44.6063233 - ], - [ - -124.0664761, - 44.6064082 - ], - [ - -124.0665036, - 44.6064373 - ], - [ - -124.0665318, - 44.6064659 - ], - [ - -124.0665891, - 44.6065227 - ], - [ - -124.066627, - 44.6065612 - ], - [ - -124.0666481, - 44.6065838 - ], - [ - -124.0666717, - 44.6066103 - ], - [ - -124.066691, - 44.606634 - ], - [ - -124.0667085, - 44.6066583 - ], - [ - -124.0667191, - 44.6066748 - ], - [ - -124.066732, - 44.6066971 - ], - [ - -124.066747, - 44.6067274 - ], - [ - -124.0667543, - 44.6067448 - ], - [ - -124.0667617, - 44.606765 - ], - [ - -124.0667686, - 44.6067882 - ], - [ - -124.0667748, - 44.6068149 - ], - [ - -124.0667794, - 44.6068456 - ], - [ - -124.0667808, - 44.606862 - ], - [ - -124.0667714, - 44.6071361 - ], - [ - -124.0667956, - 44.6074643 - ], - [ - -124.0668061, - 44.6076421 - ], - [ - -124.0668125, - 44.6077012 - ], - [ - -124.0668179, - 44.6077349 - ], - [ - -124.0668263, - 44.6077734 - ], - [ - -124.0668342, - 44.6078027 - ], - [ - -124.0668431, - 44.6078318 - ], - [ - -124.0668631, - 44.6078896 - ], - [ - -124.0668776, - 44.6079278 - ], - [ - -124.0669384, - 44.6080802 - ], - [ - -124.0670754, - 44.6084362 - ], - [ - -124.0671385, - 44.6086018 - ], - [ - -124.0672001, - 44.6087676 - ], - [ - -124.0672034, - 44.6087784 - ], - [ - -124.0672054, - 44.6087893 - ], - [ - -124.0672063, - 44.6087966 - ], - [ - -124.0672068, - 44.6088064 - ], - [ - -124.0672067, - 44.6088195 - ], - [ - -124.0672058, - 44.6088371 - ], - [ - -124.0672042, - 44.6088606 - ], - [ - -124.0672039, - 44.608874 - ], - [ - -124.0672045, - 44.6088892 - ], - [ - -124.0672054, - 44.6088973 - ], - [ - -124.067207, - 44.6089058 - ], - [ - -124.0672179, - 44.6089533 - ], - [ - -124.0672297, - 44.6090007 - ], - [ - -124.0672383, - 44.6090323 - ], - [ - -124.0672512, - 44.6090741 - ], - [ - -124.0672594, - 44.6090978 - ], - [ - -124.0673083, - 44.6092322 - ], - [ - -124.0673895, - 44.6094595 - ], - [ - -124.0673962, - 44.6094764 - ], - [ - -124.0674039, - 44.6094931 - ], - [ - -124.0674214, - 44.6095259 - ], - [ - -124.0674344, - 44.6095475 - ], - [ - -124.0674889, - 44.6096332 - ], - [ - -124.0675033, - 44.6096579 - ], - [ - -124.0675181, - 44.6096866 - ], - [ - -124.0675249, - 44.6097022 - ], - [ - -124.067585, - 44.6098485 - ], - [ - -124.0676439, - 44.6099951 - ], - [ - -124.0677411, - 44.6102414 - ], - [ - -124.0678104, - 44.6104358 - ], - [ - -124.0678219, - 44.6104633 - ], - [ - -124.0678316, - 44.6104845 - ], - [ - -124.0678419, - 44.6105055 - ], - [ - -124.067864, - 44.6105472 - ], - [ - -124.0678796, - 44.6105748 - ], - [ - -124.0679445, - 44.6106843 - ], - [ - -124.0681261, - 44.6109835 - ], - [ - -124.0683375, - 44.6114375 - ], - [ - -124.0683488, - 44.6114557 - ], - [ - -124.0683608, - 44.6114736 - ], - [ - -124.0683869, - 44.6115089 - ], - [ - -124.0684054, - 44.6115321 - ], - [ - -124.0684813, - 44.6116239 - ], - [ - -124.0685019, - 44.6116504 - ], - [ - -124.0685238, - 44.6116813 - ], - [ - -124.0685456, - 44.6117163 - ], - [ - -124.0685652, - 44.611752 - ], - [ - -124.0686019, - 44.6118243 - ], - [ - -124.0686275, - 44.6118723 - ], - [ - -124.0686436, - 44.6118993 - ], - [ - -124.0686639, - 44.6119296 - ], - [ - -124.0686794, - 44.6119504 - ], - [ - -124.0686958, - 44.6119709 - ], - [ - -124.0687072, - 44.6119844 - ], - [ - -124.068723, - 44.612002 - ], - [ - -124.0687454, - 44.6120248 - ], - [ - -124.0687589, - 44.6120375 - ], - [ - -124.0687749, - 44.6120516 - ], - [ - -124.0687941, - 44.6120672 - ], - [ - -124.0689366, - 44.6121766 - ], - [ - -124.0660195, - 44.6133543 - ], - [ - -124.0661675, - 44.6134867 - ], - [ - -124.066263, - 44.6134694 - ], - [ - -124.0673297, - 44.6131829 - ], - [ - -124.0679565, - 44.6131167 - ], - [ - -124.067982, - 44.6134284 - ], - [ - -124.0682876, - 44.6133953 - ], - [ - -124.0687354, - 44.6134072 - ], - [ - -124.0689433, - 44.6137098 - ], - [ - -124.0813143, - 44.6088557 - ], - [ - -124.0818463, - 44.6114344 - ], - [ - -124.066998, - 44.6174677 - ], - [ - -124.0637072, - 44.621303 - ], - [ - -124.063893, - 44.6214054 - ], - [ - -124.0647338, - 44.6204187 - ], - [ - -124.0647453, - 44.6204649 - ], - [ - -124.0652587, - 44.6225354 - ], - [ - -124.0653228, - 44.622795 - ], - [ - -124.0658191, - 44.6239498 - ], - [ - -124.0661689, - 44.6244771 - ], - [ - -124.0659163, - 44.6250555 - ], - [ - -124.0661252, - 44.6258223 - ], - [ - -124.066995, - 44.6258384 - ], - [ - -124.0670722, - 44.6261028 - ], - [ - -124.0670952, - 44.6262324 - ], - [ - -124.0671136, - 44.6263625 - ], - [ - -124.0671232, - 44.6264493 - ], - [ - -124.0671327, - 44.6265652 - ], - [ - -124.0671392, - 44.6267198 - ], - [ - -124.0671398, - 44.6268081 - ], - [ - -124.067138, - 44.6269591 - ], - [ - -124.0671332, - 44.6271103 - ], - [ - -124.0671271, - 44.627211 - ], - [ - -124.067114, - 44.627345 - ], - [ - -124.0671033, - 44.6274214 - ], - [ - -124.0670878, - 44.6275083 - ], - [ - -124.066787, - 44.629003 - ], - [ - -124.0666764, - 44.6295617 - ], - [ - -124.0666474, - 44.6296959 - ], - [ - -124.066613, - 44.6298296 - ], - [ - -124.0665864, - 44.6299181 - ], - [ - -124.0665453, - 44.6300352 - ], - [ - -124.0665187, - 44.6301014 - ], - [ - -124.066485, - 44.6301764 - ], - [ - -124.0661772, - 44.6308129 - ], - [ - -124.0658122, - 44.6315767 - ], - [ - -124.0656294, - 44.6319622 - ], - [ - -124.0654516, - 44.632349 - ], - [ - -124.0654079, - 44.63245 - ], - [ - -124.0653667, - 44.6325515 - ], - [ - -124.0652897, - 44.6327555 - ], - [ - -124.065144, - 44.6331654 - ], - [ - -124.0650727, - 44.6333631 - ], - [ - -124.0650034, - 44.6335611 - ], - [ - -124.0649598, - 44.6336936 - ], - [ - -124.0649066, - 44.6338711 - ], - [ - -124.0648513, - 44.6340931 - ], - [ - -124.064806, - 44.6343163 - ], - [ - -124.0647266, - 44.6347638 - ], - [ - -124.0646667, - 44.6350612 - ], - [ - -124.0645402, - 44.6355453 - ], - [ - -124.064525, - 44.6356148 - ], - [ - -124.0645082, - 44.6357156 - ], - [ - -124.064497, - 44.6358167 - ], - [ - -124.0644823, - 44.6360196 - ], - [ - -124.064471, - 44.6361548 - ], - [ - -124.0644614, - 44.6362319 - ], - [ - -124.064447, - 44.6363398 - ], - [ - -124.064431, - 44.6364476 - ], - [ - -124.0644168, - 44.636519 - ], - [ - -124.0644068, - 44.6365596 - ], - [ - -124.064393, - 44.6366056 - ], - [ - -124.0643739, - 44.6366578 - ], - [ - -124.0643327, - 44.6367553 - ], - [ - -124.0642897, - 44.6368522 - ], - [ - -124.0642009, - 44.6370451 - ], - [ - -124.0640087, - 44.6374578 - ], - [ - -124.0639687, - 44.6375491 - ], - [ - -124.0639305, - 44.6376408 - ], - [ - -124.0638587, - 44.6378252 - ], - [ - -124.0638135, - 44.6379487 - ], - [ - -124.0637556, - 44.6381137 - ], - [ - -124.0635716, - 44.6387272 - ], - [ - -124.0635409, - 44.638814 - ], - [ - -124.0633874, - 44.639218 - ], - [ - -124.063303, - 44.6394365 - ], - [ - -124.0632767, - 44.6395098 - ], - [ - -124.0632522, - 44.6395835 - ], - [ - -124.0632075, - 44.6397315 - ], - [ - -124.0631267, - 44.6400288 - ], - [ - -124.0629318, - 44.640765 - ], - [ - -124.0628407, - 44.6411135 - ], - [ - -124.0627519, - 44.6414623 - ], - [ - -124.0627296, - 44.6415562 - ], - [ - -124.0627086, - 44.6416503 - ], - [ - -124.0626679, - 44.6418386 - ], - [ - -124.0626152, - 44.6420875 - ], - [ - -124.0625647, - 44.6423367 - ], - [ - -124.0625532, - 44.642399 - ], - [ - -124.0625434, - 44.6424615 - ], - [ - -124.0625274, - 44.6425867 - ], - [ - -124.0625005, - 44.6428374 - ], - [ - -124.0624968, - 44.6428776 - ], - [ - -124.0624947, - 44.642918 - ], - [ - -124.0624943, - 44.642945 - ], - [ - -124.062495, - 44.6429809 - ], - [ - -124.0624982, - 44.6430287 - ], - [ - -124.0625012, - 44.6430559 - ], - [ - -124.0625057, - 44.6430868 - ], - [ - -124.062508, - 44.6430959 - ], - [ - -124.0625116, - 44.6431045 - ], - [ - -124.0625148, - 44.6431101 - ], - [ - -124.0625197, - 44.6431174 - ], - [ - -124.0625276, - 44.6431266 - ], - [ - -124.0625401, - 44.6431385 - ], - [ - -124.062548, - 44.643145 - ], - [ - -124.0625576, - 44.6431524 - ], - [ - -124.0625692, - 44.6431606 - ], - [ - -124.0625829, - 44.6431698 - ], - [ - -124.0626196, - 44.6431945 - ], - [ - -124.0626389, - 44.6432092 - ], - [ - -124.0626483, - 44.6432173 - ], - [ - -124.0626573, - 44.6432262 - ], - [ - -124.0626655, - 44.6432361 - ], - [ - -124.0626724, - 44.6432472 - ], - [ - -124.0626818, - 44.6432668 - ], - [ - -124.06269, - 44.6432873 - ], - [ - -124.0626946, - 44.6433014 - ], - [ - -124.0626995, - 44.6433203 - ], - [ - -124.0627016, - 44.6433312 - ], - [ - -124.0627032, - 44.6433437 - ], - [ - -124.0627041, - 44.6433579 - ], - [ - -124.0627037, - 44.6433739 - ], - [ - -124.0627028, - 44.6433823 - ], - [ - -124.0627013, - 44.6433912 - ], - [ - -124.062699, - 44.6434005 - ], - [ - -124.0626958, - 44.6434102 - ], - [ - -124.0626923, - 44.6434184 - ], - [ - -124.0626883, - 44.6434265 - ], - [ - -124.0626787, - 44.6434425 - ], - [ - -124.0626713, - 44.6434529 - ], - [ - -124.0626606, - 44.6434668 - ], - [ - -124.0626131, - 44.6435216 - ], - [ - -124.0626002, - 44.6435374 - ], - [ - -124.0625868, - 44.6435559 - ], - [ - -124.0625805, - 44.6435659 - ], - [ - -124.0625746, - 44.6435768 - ], - [ - -124.0625693, - 44.6435886 - ], - [ - -124.0625651, - 44.6436015 - ], - [ - -124.0625254, - 44.643756 - ], - [ - -124.0624885, - 44.6439111 - ], - [ - -124.0624287, - 44.6441701 - ], - [ - -124.0624122, - 44.644257 - ], - [ - -124.0624045, - 44.644307 - ], - [ - -124.0624011, - 44.6443368 - ], - [ - -124.0623988, - 44.6443666 - ], - [ - -124.0623974, - 44.6444262 - ], - [ - -124.0623983, - 44.6444659 - ], - [ - -124.0624013, - 44.6445188 - ], - [ - -124.062421, - 44.6447302 - ], - [ - -124.0624686, - 44.6451203 - ], - [ - -124.0624712, - 44.6451583 - ], - [ - -124.0624727, - 44.6451968 - ], - [ - -124.0624726, - 44.6452226 - ], - [ - -124.0624707, - 44.6452568 - ], - [ - -124.0624686, - 44.6452762 - ], - [ - -124.0624649, - 44.6452983 - ], - [ - -124.0624591, - 44.6453231 - ], - [ - -124.0624499, - 44.645351 - ], - [ - -124.0624438, - 44.6453656 - ], - [ - -124.0624362, - 44.645381 - ], - [ - -124.062427, - 44.645397 - ], - [ - -124.0622731, - 44.6456434 - ], - [ - -124.062084, - 44.6458929 - ], - [ - -124.0620623, - 44.645924 - ], - [ - -124.0620434, - 44.645956 - ], - [ - -124.0620321, - 44.6459777 - ], - [ - -124.0620185, - 44.6460071 - ], - [ - -124.0620023, - 44.6460468 - ], - [ - -124.0619458, - 44.646208 - ], - [ - -124.0617654, - 44.6467005 - ], - [ - -124.0616965, - 44.6468827 - ], - [ - -124.061625, - 44.6470644 - ], - [ - -124.0615736, - 44.6471848 - ], - [ - -124.0615319, - 44.6472752 - ], - [ - -124.061488, - 44.647365 - ], - [ - -124.0613978, - 44.6475441 - ], - [ - -124.0613389, - 44.6476638 - ], - [ - -124.0611725, - 44.6480002 - ], - [ - -124.0611211, - 44.6481132 - ], - [ - -124.0610941, - 44.6481783 - ], - [ - -124.0610662, - 44.6482533 - ], - [ - -124.0610173, - 44.6483983 - ], - [ - -124.0609703, - 44.6485436 - ], - [ - -124.0608781, - 44.6488344 - ], - [ - -124.0607098, - 44.649363 - ], - [ - -124.0605292, - 44.6497976 - ], - [ - -124.060509, - 44.6498617 - ], - [ - -124.0604904, - 44.6499261 - ], - [ - -124.0604569, - 44.6500552 - ], - [ - -124.0604365, - 44.6501416 - ], - [ - -124.0604106, - 44.6502571 - ], - [ - -124.0603939, - 44.6503355 - ], - [ - -124.0603789, - 44.650414 - ], - [ - -124.0603702, - 44.6504664 - ], - [ - -124.0603607, - 44.6505365 - ], - [ - -124.0603586, - 44.6510792 - ], - [ - -124.060344, - 44.6512071 - ], - [ - -124.0603267, - 44.6513349 - ], - [ - -124.0603128, - 44.6514198 - ], - [ - -124.0602904, - 44.6515328 - ], - [ - -124.0601797, - 44.652028 - ], - [ - -124.0600691, - 44.6525123 - ], - [ - -124.0599466, - 44.6529524 - ], - [ - -124.0598319, - 44.653445 - ], - [ - -124.0596831, - 44.654098 - ], - [ - -124.0595464, - 44.6544764 - ], - [ - -124.0595411, - 44.6545022 - ], - [ - -124.0594797, - 44.6548536 - ], - [ - -124.0594035, - 44.655302 - ], - [ - -124.0593459, - 44.6556327 - ], - [ - -124.0592855, - 44.6559633 - ], - [ - -124.0591523, - 44.6565306 - ], - [ - -124.0590374, - 44.6571224 - ], - [ - -124.0589388, - 44.6576208 - ], - [ - -124.0588884, - 44.6578728 - ], - [ - -124.0588356, - 44.6581246 - ], - [ - -124.0588285, - 44.6581537 - ], - [ - -124.0588203, - 44.6581826 - ], - [ - -124.0588007, - 44.6582399 - ], - [ - -124.0587861, - 44.6582778 - ], - [ - -124.0587247, - 44.6584294 - ], - [ - -124.058709, - 44.6584731 - ], - [ - -124.0586877, - 44.6585351 - ], - [ - -124.0586672, - 44.6585972 - ], - [ - -124.0586555, - 44.6586388 - ], - [ - -124.0586497, - 44.6586628 - ], - [ - -124.0586443, - 44.6586902 - ], - [ - -124.0586423, - 44.6587048 - ], - [ - -124.0586399, - 44.6587219 - ], - [ - -124.0586371, - 44.6587676 - ], - [ - -124.058638, - 44.6588133 - ], - [ - -124.0586402, - 44.6588437 - ], - [ - -124.0586447, - 44.6588842 - ], - [ - -124.0586686, - 44.659046 - ], - [ - -124.0586737, - 44.6590923 - ], - [ - -124.0586764, - 44.6591453 - ], - [ - -124.0586778, - 44.6593156 - ], - [ - -124.0586767, - 44.659486 - ], - [ - -124.0586736, - 44.6595996 - ], - [ - -124.0586205, - 44.6600639 - ], - [ - -124.0586208, - 44.6601303 - ], - [ - -124.05863, - 44.6602903 - ], - [ - -124.0586424, - 44.6604501 - ], - [ - -124.0586731, - 44.6607696 - ], - [ - -124.0587033, - 44.66107 - ], - [ - -124.0587365, - 44.6613702 - ], - [ - -124.0587568, - 44.6615252 - ], - [ - -124.0587788, - 44.66168 - ], - [ - -124.0588234, - 44.6619897 - ], - [ - -124.0588473, - 44.6621753 - ], - [ - -124.0588677, - 44.6623611 - ], - [ - -124.0588793, - 44.662485 - ], - [ - -124.0588818, - 44.6625406 - ], - [ - -124.0588801, - 44.6625962 - ], - [ - -124.058877, - 44.6626333 - ], - [ - -124.0588709, - 44.6626827 - ], - [ - -124.05886, - 44.6627485 - ], - [ - -124.0588425, - 44.6628362 - ], - [ - -124.0588185, - 44.6629526 - ], - [ - -124.0588148, - 44.6629687 - ], - [ - -124.0588102, - 44.6629846 - ], - [ - -124.0587986, - 44.6630163 - ], - [ - -124.0587896, - 44.6630373 - ], - [ - -124.0587513, - 44.6631207 - ], - [ - -124.0587418, - 44.6631445 - ], - [ - -124.058733, - 44.6631717 - ], - [ - -124.0587294, - 44.6631862 - ], - [ - -124.0587266, - 44.6632018 - ], - [ - -124.058726, - 44.6632101 - ], - [ - -124.0587263, - 44.6632185 - ], - [ - -124.058727, - 44.6632241 - ], - [ - -124.0587284, - 44.6632316 - ], - [ - -124.0587312, - 44.6632416 - ], - [ - -124.0587331, - 44.6632474 - ], - [ - -124.0587357, - 44.6632539 - ], - [ - -124.0587389, - 44.6632613 - ], - [ - -124.058743, - 44.6632698 - ], - [ - -124.058748, - 44.6632794 - ], - [ - -124.058754, - 44.6632902 - ], - [ - -124.0587626, - 44.6633035 - ], - [ - -124.058773, - 44.6633162 - ], - [ - -124.0587806, - 44.6633244 - ], - [ - -124.0587914, - 44.663335 - ], - [ - -124.0588378, - 44.663376 - ], - [ - -124.0588504, - 44.6633878 - ], - [ - -124.0588635, - 44.6634016 - ], - [ - -124.0588698, - 44.6634092 - ], - [ - -124.0588758, - 44.6634174 - ], - [ - -124.0588814, - 44.6634265 - ], - [ - -124.0588861, - 44.6634366 - ], - [ - -124.0588897, - 44.6634477 - ], - [ - -124.0589061, - 44.6635207 - ], - [ - -124.0589199, - 44.6635938 - ], - [ - -124.0589279, - 44.6636427 - ], - [ - -124.0589371, - 44.6637079 - ], - [ - -124.0590002, - 44.6641948 - ], - [ - -124.0590491, - 44.6645994 - ], - [ - -124.0590676, - 44.6647342 - ], - [ - -124.0590828, - 44.6648135 - ], - [ - -124.0591041, - 44.664892 - ], - [ - -124.059121, - 44.664944 - ], - [ - -124.0591458, - 44.6650131 - ], - [ - -124.0592523, - 44.6652885 - ], - [ - -124.0592785, - 44.6653678 - ], - [ - -124.059347, - 44.6655915 - ], - [ - -124.0594134, - 44.6658155 - ], - [ - -124.0594541, - 44.6659654 - ], - [ - -124.0594919, - 44.6661197 - ], - [ - -124.059527, - 44.6662743 - ], - [ - -124.0595947, - 44.6665839 - ], - [ - -124.0596424, - 44.6667899 - ], - [ - -124.0597653, - 44.6672542 - ], - [ - -124.0598024, - 44.6674094 - ], - [ - -124.0598466, - 44.667625 - ], - [ - -124.0598871, - 44.6678409 - ], - [ - -124.059968, - 44.6682729 - ], - [ - -124.0600365, - 44.6686063 - ], - [ - -124.0601093, - 44.6689393 - ], - [ - -124.0601391, - 44.6690623 - ], - [ - -124.0601728, - 44.6691847 - ], - [ - -124.0601978, - 44.6692659 - ], - [ - -124.0602346, - 44.6693736 - ], - [ - -124.0602576, - 44.6694348 - ], - [ - -124.0605463, - 44.6701645 - ], - [ - -124.0607219, - 44.6706157 - ], - [ - -124.0607458, - 44.6706737 - ], - [ - -124.0607713, - 44.6707313 - ], - [ - -124.0608272, - 44.6708454 - ], - [ - -124.0608676, - 44.6709207 - ], - [ - -124.0609247, - 44.6710203 - ], - [ - -124.0610058, - 44.671152 - ], - [ - -124.0610266, - 44.6711838 - ], - [ - -124.0610482, - 44.6712151 - ], - [ - -124.0610937, - 44.6712769 - ], - [ - -124.0611253, - 44.6713176 - ], - [ - -124.0611685, - 44.6713713 - ], - [ - -124.0612271, - 44.6714426 - ], - [ - -124.061241, - 44.6714582 - ], - [ - -124.0612562, - 44.6714734 - ], - [ - -124.0612881, - 44.6715029 - ], - [ - -124.0613089, - 44.6715228 - ], - [ - -124.0613201, - 44.6715345 - ], - [ - -124.0613319, - 44.6715483 - ], - [ - -124.0613377, - 44.6715559 - ], - [ - -124.0613434, - 44.6715642 - ], - [ - -124.0613645, - 44.6715992 - ], - [ - -124.0613836, - 44.6716346 - ], - [ - -124.0613955, - 44.6716585 - ], - [ - -124.0614103, - 44.6716905 - ], - [ - -124.0614289, - 44.6717334 - ], - [ - -124.0614526, - 44.6717909 - ], - [ - -124.0615811, - 44.67212 - ], - [ - -124.0616136, - 44.6721964 - ], - [ - -124.0616477, - 44.6722724 - ], - [ - -124.0616721, - 44.6723227 - ], - [ - -124.0617075, - 44.672389 - ], - [ - -124.0617295, - 44.6724263 - ], - [ - -124.0617567, - 44.6724686 - ], - [ - -124.0617899, - 44.672515 - ], - [ - -124.0618255, - 44.6725605 - ], - [ - -124.0618995, - 44.6726502 - ], - [ - -124.0619478, - 44.6727103 - ], - [ - -124.061974, - 44.6727452 - ], - [ - -124.0621051, - 44.6729288 - ], - [ - -124.0622342, - 44.6731131 - ], - [ - -124.0622634, - 44.6731573 - ], - [ - -124.0622908, - 44.6732022 - ], - [ - -124.0623439, - 44.6732924 - ], - [ - -124.0623811, - 44.673352 - ], - [ - -124.0624042, - 44.6733855 - ], - [ - -124.0624328, - 44.673423 - ], - [ - -124.0624726, - 44.6734694 - ], - [ - -124.0625151, - 44.6735144 - ], - [ - -124.0625447, - 44.6735438 - ], - [ - -124.0625852, - 44.6735824 - ], - [ - -124.0627512, - 44.6737352 - ], - [ - -124.0628082, - 44.6737894 - ], - [ - -124.0628658, - 44.6738429 - ], - [ - -124.0629051, - 44.6738782 - ], - [ - -124.0629594, - 44.6739246 - ], - [ - -124.0629917, - 44.6739508 - ], - [ - -124.0630045, - 44.6739605 - ], - [ - -124.0630178, - 44.6739696 - ], - [ - -124.0630454, - 44.6739867 - ], - [ - -124.0630647, - 44.6739971 - ], - [ - -124.0630914, - 44.67401 - ], - [ - -124.0631285, - 44.6740257 - ], - [ - -124.0631504, - 44.674034 - ], - [ - -124.063176, - 44.674043 - ], - [ - -124.063206, - 44.6740528 - ], - [ - -124.0632409, - 44.6740636 - ], - [ - -124.0633367, - 44.6740919 - ], - [ - -124.0633949, - 44.674109 - ], - [ - -124.0634531, - 44.6741248 - ], - [ - -124.0634919, - 44.6741339 - ], - [ - -124.0635393, - 44.6741429 - ], - [ - -124.0635681, - 44.674147 - ], - [ - -124.0636009, - 44.6741501 - ], - [ - -124.0636183, - 44.674151 - ], - [ - -124.0636368, - 44.6741513 - ], - [ - -124.0636564, - 44.6741509 - ], - [ - -124.0636773, - 44.6741495 - ], - [ - -124.0636952, - 44.6741476 - ], - [ - -124.0637132, - 44.6741452 - ], - [ - -124.063749, - 44.6741393 - ], - [ - -124.0637728, - 44.6741344 - ], - [ - -124.0638045, - 44.6741268 - ], - [ - -124.0638466, - 44.6741152 - ], - [ - -124.0638704, - 44.6741078 - ], - [ - -124.0638976, - 44.6740988 - ], - [ - -124.0639284, - 44.6740879 - ], - [ - -124.0639633, - 44.6740747 - ], - [ - -124.0640028, - 44.6740589 - ], - [ - -124.0640411, - 44.6740427 - ], - [ - -124.0641159, - 44.6740104 - ], - [ - -124.064166, - 44.6739893 - ], - [ - -124.0641952, - 44.6739777 - ], - [ - -124.0645512, - 44.6738445 - ], - [ - -124.0646156, - 44.6738186 - ], - [ - -124.0646788, - 44.6737915 - ], - [ - -124.0647204, - 44.6737727 - ], - [ - -124.0647755, - 44.6737471 - ], - [ - -124.0648483, - 44.6737117 - ], - [ - -124.0648856, - 44.6736922 - ], - [ - -124.0649214, - 44.6736714 - ], - [ - -124.0649445, - 44.6736569 - ], - [ - -124.0649743, - 44.6736369 - ], - [ - -124.0650126, - 44.673609 - ], - [ - -124.0650338, - 44.6735926 - ], - [ - -124.0650575, - 44.6735735 - ], - [ - -124.065084, - 44.6735512 - ], - [ - -124.0650898, - 44.6735458 - ], - [ - -124.065095, - 44.6735402 - ], - [ - -124.0650981, - 44.6735364 - ], - [ - -124.0651022, - 44.6735312 - ], - [ - -124.0651172, - 44.6735097 - ], - [ - -124.0651217, - 44.6735037 - ], - [ - -124.0651273, - 44.6734969 - ], - [ - -124.0651305, - 44.6734934 - ], - [ - -124.0651342, - 44.6734898 - ], - [ - -124.0651802, - 44.6734486 - ], - [ - -124.0652285, - 44.6734096 - ], - [ - -124.0652619, - 44.6733847 - ], - [ - -124.065308, - 44.6733525 - ], - [ - -124.0653723, - 44.6733112 - ], - [ - -124.0654105, - 44.6732881 - ], - [ - -124.0654555, - 44.673262 - ], - [ - -124.0655087, - 44.6732324 - ], - [ - -124.0655337, - 44.6732191 - ], - [ - -124.0655598, - 44.6732061 - ], - [ - -124.0655777, - 44.6731978 - ], - [ - -124.0656022, - 44.6731876 - ], - [ - -124.0656163, - 44.6731822 - ], - [ - -124.0656327, - 44.6731767 - ], - [ - -124.0656515, - 44.6731712 - ], - [ - -124.0656732, - 44.6731662 - ], - [ - -124.0656847, - 44.6731641 - ], - [ - -124.0656971, - 44.6731624 - ], - [ - -124.0657102, - 44.6731613 - ], - [ - -124.0657242, - 44.6731608 - ], - [ - -124.0657391, - 44.6731613 - ], - [ - -124.0657548, - 44.6731629 - ], - [ - -124.0657714, - 44.673166 - ], - [ - -124.0657766, - 44.6731673 - ], - [ - -124.0657822, - 44.6731686 - ], - [ - -124.065794, - 44.6731717 - ], - [ - -124.0658023, - 44.6731739 - ], - [ - -124.0658135, - 44.6731772 - ], - [ - -124.0658284, - 44.673182 - ], - [ - -124.0658367, - 44.6731849 - ], - [ - -124.0658457, - 44.6731885 - ], - [ - -124.0658553, - 44.6731928 - ], - [ - -124.06586, - 44.6731952 - ], - [ - -124.0658646, - 44.6731978 - ], - [ - -124.065869, - 44.6732006 - ], - [ - -124.0658731, - 44.6732037 - ], - [ - -124.0658768, - 44.6732071 - ], - [ - -124.0658796, - 44.6732108 - ], - [ - -124.0658807, - 44.6732128 - ], - [ - -124.0658814, - 44.6732148 - ], - [ - -124.0658818, - 44.6732169 - ], - [ - -124.0658818, - 44.6732192 - ], - [ - -124.0658813, - 44.6732215 - ], - [ - -124.0658804, - 44.6732239 - ], - [ - -124.0658765, - 44.6732304 - ], - [ - -124.0658718, - 44.673237 - ], - [ - -124.0658682, - 44.6732415 - ], - [ - -124.065863, - 44.6732474 - ], - [ - -124.0658554, - 44.6732553 - ], - [ - -124.0658442, - 44.673266 - ], - [ - -124.0658283, - 44.6732801 - ], - [ - -124.065807, - 44.673299 - ], - [ - -124.0657955, - 44.6733097 - ], - [ - -124.0657936, - 44.6733115 - ], - [ - -124.0657915, - 44.6733132 - ], - [ - -124.0657867, - 44.6733167 - ], - [ - -124.0657831, - 44.6733191 - ], - [ - -124.0657781, - 44.6733223 - ], - [ - -124.0657563, - 44.6733348 - ], - [ - -124.0657503, - 44.6733384 - ], - [ - -124.065744, - 44.6733424 - ], - [ - -124.0657409, - 44.6733445 - ], - [ - -124.065738, - 44.6733467 - ], - [ - -124.0657353, - 44.6733491 - ], - [ - -124.0657329, - 44.6733515 - ], - [ - -124.0657309, - 44.6733541 - ], - [ - -124.0657303, - 44.6733554 - ], - [ - -124.0657298, - 44.6733567 - ], - [ - -124.0657295, - 44.6733581 - ], - [ - -124.0657296, - 44.6733595 - ], - [ - -124.0657299, - 44.6733609 - ], - [ - -124.0657307, - 44.6733623 - ], - [ - -124.0657318, - 44.6733637 - ], - [ - -124.0657335, - 44.6733652 - ], - [ - -124.0657396, - 44.6733691 - ], - [ - -124.0657464, - 44.6733723 - ], - [ - -124.0657513, - 44.6733741 - ], - [ - -124.0657583, - 44.673376 - ], - [ - -124.0657684, - 44.6733779 - ], - [ - -124.0657745, - 44.6733787 - ], - [ - -124.0657816, - 44.6733793 - ], - [ - -124.0657901, - 44.6733796 - ], - [ - -124.0658001, - 44.6733797 - ], - [ - -124.0658119, - 44.6733793 - ], - [ - -124.0658256, - 44.6733784 - ], - [ - -124.0658414, - 44.673377 - ], - [ - -124.0658594, - 44.673375 - ], - [ - -124.0658794, - 44.6733727 - ], - [ - -124.0658896, - 44.6733715 - ], - [ - -124.0659001, - 44.6733704 - ], - [ - -124.0659291, - 44.6733677 - ], - [ - -124.0659582, - 44.6733647 - ], - [ - -124.0659775, - 44.6733623 - ], - [ - -124.0660032, - 44.6733583 - ], - [ - -124.0660179, - 44.6733556 - ], - [ - -124.0660345, - 44.6733519 - ], - [ - -124.0660534, - 44.6733468 - ], - [ - -124.0660634, - 44.6733437 - ], - [ - -124.0660741, - 44.6733401 - ], - [ - -124.0661061, - 44.6733277 - ], - [ - -124.0661364, - 44.6733144 - ], - [ - -124.0661559, - 44.673305 - ], - [ - -124.0661808, - 44.6732919 - ], - [ - -124.0662127, - 44.6732735 - ], - [ - -124.0662531, - 44.6732475 - ], - [ - -124.0662754, - 44.6732321 - ], - [ - -124.0663003, - 44.673214 - ], - [ - -124.0663284, - 44.6731928 - ], - [ - -124.0663603, - 44.6731681 - ], - [ - -124.0663791, - 44.6731521 - ], - [ - -124.0663957, - 44.6731353 - ], - [ - -124.0664059, - 44.6731238 - ], - [ - -124.0664185, - 44.6731082 - ], - [ - -124.0664655, - 44.6730435 - ], - [ - -124.06648, - 44.673025 - ], - [ - -124.0664983, - 44.6730042 - ], - [ - -124.0665091, - 44.6729933 - ], - [ - -124.0665215, - 44.6729819 - ], - [ - -124.066536, - 44.6729701 - ], - [ - -124.066553, - 44.6729578 - ], - [ - -124.0665824, - 44.6729382 - ], - [ - -124.0666123, - 44.6729191 - ], - [ - -124.0666326, - 44.6729069 - ], - [ - -124.0666601, - 44.672892 - ], - [ - -124.066676, - 44.6728843 - ], - [ - -124.0666944, - 44.6728764 - ], - [ - -124.0667156, - 44.6728687 - ], - [ - -124.066727, - 44.6728652 - ], - [ - -124.0667393, - 44.6728621 - ], - [ - -124.0667525, - 44.6728595 - ], - [ - -124.0667666, - 44.6728575 - ], - [ - -124.0667819, - 44.6728564 - ], - [ - -124.0667983, - 44.6728564 - ], - [ - -124.0668159, - 44.6728579 - ], - [ - -124.0668272, - 44.6728596 - ], - [ - -124.0668385, - 44.6728615 - ], - [ - -124.0668611, - 44.672866 - ], - [ - -124.0668762, - 44.6728693 - ], - [ - -124.0669368, - 44.6728836 - ], - [ - -124.0669542, - 44.6728874 - ], - [ - -124.0669742, - 44.6728912 - ], - [ - -124.0670381, - 44.672902 - ], - [ - -124.0671024, - 44.6729122 - ], - [ - -124.0671452, - 44.6729186 - ], - [ - -124.0671574, - 44.6729198 - ], - [ - -124.0671696, - 44.6729201 - ], - [ - -124.0671779, - 44.6729198 - ], - [ - -124.0671889, - 44.672919 - ], - [ - -124.0672037, - 44.6729173 - ], - [ - -124.0672631, - 44.6729082 - ], - [ - -124.06728, - 44.6729065 - ], - [ - -124.0672889, - 44.672906 - ], - [ - -124.0672985, - 44.672906 - ], - [ - -124.0673085, - 44.6729065 - ], - [ - -124.0673192, - 44.6729077 - ], - [ - -124.0673305, - 44.6729101 - ], - [ - -124.0673407, - 44.6729132 - ], - [ - -124.0673499, - 44.6729172 - ], - [ - -124.0673555, - 44.6729203 - ], - [ - -124.0673625, - 44.6729248 - ], - [ - -124.0673708, - 44.6729316 - ], - [ - -124.0673752, - 44.6729358 - ], - [ - -124.06738, - 44.6729409 - ], - [ - -124.0673851, - 44.6729469 - ], - [ - -124.0673907, - 44.6729541 - ], - [ - -124.0673969, - 44.6729626 - ], - [ - -124.0674132, - 44.6729856 - ], - [ - -124.0674235, - 44.6729982 - ], - [ - -124.0674296, - 44.6730046 - ], - [ - -124.0674367, - 44.673011 - ], - [ - -124.0674449, - 44.6730174 - ], - [ - -124.0674548, - 44.6730235 - ], - [ - -124.0674681, - 44.6730304 - ], - [ - -124.0674816, - 44.673037 - ], - [ - -124.0674907, - 44.6730411 - ], - [ - -124.0675029, - 44.6730464 - ], - [ - -124.0675195, - 44.6730529 - ], - [ - -124.067529, - 44.6730563 - ], - [ - -124.06754, - 44.6730599 - ], - [ - -124.0675526, - 44.6730637 - ], - [ - -124.0675672, - 44.6730675 - ], - [ - -124.0675696, - 44.673068 - ], - [ - -124.0675721, - 44.6730683 - ], - [ - -124.067577, - 44.6730685 - ], - [ - -124.0675803, - 44.6730684 - ], - [ - -124.0675848, - 44.6730678 - ], - [ - -124.0675908, - 44.6730665 - ], - [ - -124.0675942, - 44.6730655 - ], - [ - -124.0675981, - 44.6730641 - ], - [ - -124.0676027, - 44.6730624 - ], - [ - -124.0676389, - 44.6730456 - ], - [ - -124.0676437, - 44.6730437 - ], - [ - -124.0676488, - 44.6730419 - ], - [ - -124.0676542, - 44.6730404 - ], - [ - -124.0676599, - 44.6730393 - ], - [ - -124.0676628, - 44.673039 - ], - [ - -124.0676658, - 44.6730389 - ], - [ - -124.0676688, - 44.673039 - ], - [ - -124.067672, - 44.6730393 - ], - [ - -124.0676752, - 44.67304 - ], - [ - -124.0676802, - 44.6730415 - ], - [ - -124.0676849, - 44.6730435 - ], - [ - -124.0676878, - 44.6730451 - ], - [ - -124.0676914, - 44.6730475 - ], - [ - -124.0676959, - 44.6730512 - ], - [ - -124.0677012, - 44.6730567 - ], - [ - -124.0677041, - 44.6730602 - ], - [ - -124.0677071, - 44.6730644 - ], - [ - -124.0677105, - 44.6730693 - ], - [ - -124.0677141, - 44.6730752 - ], - [ - -124.0677237, - 44.6730911 - ], - [ - -124.0677296, - 44.6730997 - ], - [ - -124.0677331, - 44.673104 - ], - [ - -124.067737, - 44.6731083 - ], - [ - -124.0677415, - 44.6731124 - ], - [ - -124.0677468, - 44.6731162 - ], - [ - -124.0677498, - 44.6731179 - ], - [ - -124.0677531, - 44.6731195 - ], - [ - -124.0677567, - 44.6731209 - ], - [ - -124.0677606, - 44.673122 - ], - [ - -124.0677649, - 44.6731229 - ], - [ - -124.0677913, - 44.6731269 - ], - [ - -124.0678179, - 44.6731307 - ], - [ - -124.0678357, - 44.673133 - ], - [ - -124.0678595, - 44.6731356 - ], - [ - -124.0678731, - 44.6731368 - ], - [ - -124.0679514, - 44.673143 - ], - [ - -124.0679775, - 44.6731448 - ], - [ - -124.0681985, - 44.6731586 - ], - [ - -124.0684223, - 44.6731307 - ], - [ - -124.0684266, - 44.6731301 - ], - [ - -124.0684308, - 44.6731292 - ], - [ - -124.0684388, - 44.673127 - ], - [ - -124.0684438, - 44.6731251 - ], - [ - -124.0684502, - 44.6731222 - ], - [ - -124.0684583, - 44.6731176 - ], - [ - -124.0684627, - 44.6731147 - ], - [ - -124.0684675, - 44.6731111 - ], - [ - -124.0684729, - 44.6731068 - ], - [ - -124.0684788, - 44.6731015 - ], - [ - -124.0684853, - 44.6730953 - ], - [ - -124.0685022, - 44.673078 - ], - [ - -124.068512, - 44.6730684 - ], - [ - -124.0685174, - 44.6730636 - ], - [ - -124.0685234, - 44.6730587 - ], - [ - -124.0685416, - 44.6730438 - ], - [ - -124.0685592, - 44.6730286 - ], - [ - -124.0685935, - 44.6729975 - ], - [ - -124.0686166, - 44.6729771 - ], - [ - -124.0686303, - 44.6729658 - ], - [ - -124.0686466, - 44.6729532 - ], - [ - -124.0686531, - 44.672949 - ], - [ - -124.0686601, - 44.6729454 - ], - [ - -124.0686651, - 44.6729434 - ], - [ - -124.068672, - 44.672941 - ], - [ - -124.0686816, - 44.6729385 - ], - [ - -124.0686953, - 44.672936 - ], - [ - -124.0687033, - 44.672935 - ], - [ - -124.0687128, - 44.6729341 - ], - [ - -124.0687239, - 44.6729333 - ], - [ - -124.0687368, - 44.6729327 - ], - [ - -124.0687714, - 44.6729311 - ], - [ - -124.0687909, - 44.6729294 - ], - [ - -124.068801, - 44.672928 - ], - [ - -124.0688114, - 44.6729261 - ], - [ - -124.0688221, - 44.6729234 - ], - [ - -124.068833, - 44.6729196 - ], - [ - -124.0688383, - 44.6729172 - ], - [ - -124.0688436, - 44.6729145 - ], - [ - -124.0688532, - 44.6729087 - ], - [ - -124.0688622, - 44.6729025 - ], - [ - -124.0688678, - 44.6728982 - ], - [ - -124.0688749, - 44.6728923 - ], - [ - -124.0688839, - 44.672884 - ], - [ - -124.0688887, - 44.6728792 - ], - [ - -124.068894, - 44.6728736 - ], - [ - -124.0688998, - 44.6728671 - ], - [ - -124.0689062, - 44.6728595 - ], - [ - -124.0689132, - 44.6728508 - ], - [ - -124.0689163, - 44.6728465 - ], - [ - -124.0689191, - 44.6728421 - ], - [ - -124.0689235, - 44.672833 - ], - [ - -124.0689257, - 44.6728267 - ], - [ - -124.068928, - 44.6728182 - ], - [ - -124.06893, - 44.6728065 - ], - [ - -124.0689331, - 44.6727583 - ], - [ - -124.0689349, - 44.6727449 - ], - [ - -124.0689364, - 44.6727378 - ], - [ - -124.0689385, - 44.6727305 - ], - [ - -124.0689415, - 44.6727229 - ], - [ - -124.0689457, - 44.6727151 - ], - [ - -124.0689514, - 44.6727071 - ], - [ - -124.0689551, - 44.6727033 - ], - [ - -124.0689595, - 44.6726997 - ], - [ - -124.0689629, - 44.6726974 - ], - [ - -124.0689678, - 44.6726945 - ], - [ - -124.068975, - 44.672691 - ], - [ - -124.0689795, - 44.6726892 - ], - [ - -124.0689848, - 44.6726873 - ], - [ - -124.0689911, - 44.6726854 - ], - [ - -124.0689986, - 44.6726835 - ], - [ - -124.0690074, - 44.6726818 - ], - [ - -124.0690175, - 44.6726805 - ], - [ - -124.069023, - 44.6726801 - ], - [ - -124.0690287, - 44.6726799 - ], - [ - -124.0690347, - 44.67268 - ], - [ - -124.069041, - 44.6726804 - ], - [ - -124.0690475, - 44.6726813 - ], - [ - -124.0690541, - 44.6726826 - ], - [ - -124.0690607, - 44.6726846 - ], - [ - -124.0690639, - 44.6726858 - ], - [ - -124.069067, - 44.6726873 - ], - [ - -124.06907, - 44.6726889 - ], - [ - -124.0690729, - 44.6726909 - ], - [ - -124.0690756, - 44.6726931 - ], - [ - -124.0690868, - 44.6727037 - ], - [ - -124.0690971, - 44.6727146 - ], - [ - -124.0691033, - 44.6727221 - ], - [ - -124.0691109, - 44.6727322 - ], - [ - -124.0691148, - 44.6727381 - ], - [ - -124.0691189, - 44.6727449 - ], - [ - -124.0691231, - 44.6727527 - ], - [ - -124.0691272, - 44.6727618 - ], - [ - -124.0691309, - 44.6727723 - ], - [ - -124.0691325, - 44.672778 - ], - [ - -124.0691339, - 44.6727841 - ], - [ - -124.0691359, - 44.6727978 - ], - [ - -124.0691368, - 44.6728119 - ], - [ - -124.0691368, - 44.6728214 - ], - [ - -124.0691361, - 44.6728341 - ], - [ - -124.0691342, - 44.6728511 - ], - [ - -124.0691326, - 44.6728607 - ], - [ - -124.0691304, - 44.6728715 - ], - [ - -124.0691274, - 44.6728836 - ], - [ - -124.0691235, - 44.672897 - ], - [ - -124.0691186, - 44.6729114 - ], - [ - -124.0691147, - 44.6729192 - ], - [ - -124.069109, - 44.6729269 - ], - [ - -124.0691044, - 44.6729321 - ], - [ - -124.0690971, - 44.6729389 - ], - [ - -124.069086, - 44.6729479 - ], - [ - -124.069069, - 44.6729599 - ], - [ - -124.069044, - 44.6729756 - ], - [ - -124.06901, - 44.6729963 - ], - [ - -124.0689918, - 44.6730079 - ], - [ - -124.0689829, - 44.6730141 - ], - [ - -124.0689742, - 44.6730206 - ], - [ - -124.0689661, - 44.6730274 - ], - [ - -124.0689589, - 44.6730347 - ], - [ - -124.0689532, - 44.6730424 - ], - [ - -124.0689512, - 44.6730463 - ], - [ - -124.0689498, - 44.6730503 - ], - [ - -124.0689492, - 44.6730538 - ], - [ - -124.0689493, - 44.6730587 - ], - [ - -124.0689505, - 44.6730631 - ], - [ - -124.068953, - 44.6730676 - ], - [ - -124.0689567, - 44.6730721 - ], - [ - -124.0689676, - 44.6730825 - ], - [ - -124.0689797, - 44.6730928 - ], - [ - -124.0689883, - 44.6730997 - ], - [ - -124.0690004, - 44.6731087 - ], - [ - -124.0690174, - 44.6731208 - ], - [ - -124.0690409, - 44.6731367 - ], - [ - -124.0690728, - 44.6731578 - ], - [ - -124.06908, - 44.6731625 - ], - [ - -124.0690873, - 44.673167 - ], - [ - -124.0691022, - 44.6731757 - ], - [ - -124.0691321, - 44.6731924 - ], - [ - -124.0691515, - 44.6732036 - ], - [ - -124.0691622, - 44.6732102 - ], - [ - -124.0691683, - 44.6732147 - ], - [ - -124.0691735, - 44.6732196 - ], - [ - -124.0691766, - 44.6732232 - ], - [ - -124.0691801, - 44.6732282 - ], - [ - -124.0691842, - 44.6732352 - ], - [ - -124.0691884, - 44.6732452 - ], - [ - -124.0691904, - 44.6732512 - ], - [ - -124.0691948, - 44.6732676 - ], - [ - -124.0692003, - 44.6732896 - ], - [ - -124.0692044, - 44.6733016 - ], - [ - -124.0692072, - 44.6733077 - ], - [ - -124.0692107, - 44.673314 - ], - [ - -124.0692151, - 44.6733202 - ], - [ - -124.0692208, - 44.6733263 - ], - [ - -124.0692242, - 44.6733292 - ], - [ - -124.0692281, - 44.673332 - ], - [ - -124.0692307, - 44.6733335 - ], - [ - -124.0692336, - 44.6733346 - ], - [ - -124.0692355, - 44.673335 - ], - [ - -124.0692383, - 44.6733355 - ], - [ - -124.0692421, - 44.6733356 - ], - [ - -124.0692443, - 44.6733354 - ], - [ - -124.0692469, - 44.6733351 - ], - [ - -124.06925, - 44.6733346 - ], - [ - -124.0692537, - 44.6733338 - ], - [ - -124.0692579, - 44.6733325 - ], - [ - -124.0692629, - 44.6733308 - ], - [ - -124.0692686, - 44.6733286 - ], - [ - -124.0692842, - 44.673322 - ], - [ - -124.069293, - 44.6733183 - ], - [ - -124.0692976, - 44.6733165 - ], - [ - -124.0693025, - 44.6733149 - ], - [ - -124.0693074, - 44.6733134 - ], - [ - -124.0693125, - 44.6733123 - ], - [ - -124.069315, - 44.6733119 - ], - [ - -124.0693176, - 44.6733118 - ], - [ - -124.0693201, - 44.6733118 - ], - [ - -124.0693226, - 44.673312 - ], - [ - -124.0693251, - 44.6733125 - ], - [ - -124.0693293, - 44.673314 - ], - [ - -124.0693334, - 44.673316 - ], - [ - -124.069336, - 44.6733176 - ], - [ - -124.0693394, - 44.67332 - ], - [ - -124.0693437, - 44.6733237 - ], - [ - -124.0693491, - 44.6733293 - ], - [ - -124.0693521, - 44.6733328 - ], - [ - -124.06936, - 44.6733427 - ], - [ - -124.0693705, - 44.6733562 - ], - [ - -124.0693769, - 44.6733634 - ], - [ - -124.0693805, - 44.673367 - ], - [ - -124.0693845, - 44.6733706 - ], - [ - -124.069389, - 44.6733739 - ], - [ - -124.0693941, - 44.673377 - ], - [ - -124.0693969, - 44.6733783 - ], - [ - -124.0693998, - 44.6733795 - ], - [ - -124.069403, - 44.6733805 - ], - [ - -124.0694064, - 44.6733813 - ], - [ - -124.0694101, - 44.6733818 - ], - [ - -124.0694136, - 44.673382 - ], - [ - -124.0694171, - 44.6733819 - ], - [ - -124.0694194, - 44.6733817 - ], - [ - -124.0694226, - 44.6733813 - ], - [ - -124.0694269, - 44.6733804 - ], - [ - -124.0694326, - 44.673379 - ], - [ - -124.0694403, - 44.6733768 - ], - [ - -124.0694507, - 44.6733737 - ], - [ - -124.0694565, - 44.6733722 - ], - [ - -124.0694596, - 44.6733715 - ], - [ - -124.0694629, - 44.6733709 - ], - [ - -124.0694664, - 44.6733704 - ], - [ - -124.0694701, - 44.6733702 - ], - [ - -124.069474, - 44.6733703 - ], - [ - -124.069476, - 44.6733704 - ], - [ - -124.0694817, - 44.6733713 - ], - [ - -124.0694873, - 44.6733727 - ], - [ - -124.0694911, - 44.6733737 - ], - [ - -124.069496, - 44.6733754 - ], - [ - -124.0695027, - 44.6733778 - ], - [ - -124.0695115, - 44.6733814 - ], - [ - -124.0695233, - 44.6733864 - ], - [ - -124.0695301, - 44.673389 - ], - [ - -124.0695379, - 44.6733916 - ], - [ - -124.0695421, - 44.6733928 - ], - [ - -124.0695466, - 44.6733939 - ], - [ - -124.0695515, - 44.6733948 - ], - [ - -124.0695567, - 44.6733954 - ], - [ - -124.0695623, - 44.6733955 - ], - [ - -124.0695652, - 44.6733954 - ], - [ - -124.0695803, - 44.6733942 - ], - [ - -124.0695955, - 44.6733926 - ], - [ - -124.0696257, - 44.6733887 - ], - [ - -124.0696865, - 44.67338 - ], - [ - -124.0697038, - 44.6733779 - ], - [ - -124.0697238, - 44.6733759 - ], - [ - -124.0697564, - 44.6733737 - ], - [ - -124.0697891, - 44.6733723 - ], - [ - -124.0698986, - 44.6733686 - ], - [ - -124.0699236, - 44.6733671 - ], - [ - -124.0699521, - 44.6733647 - ], - [ - -124.0699727, - 44.6733622 - ], - [ - -124.0699928, - 44.6733586 - ], - [ - -124.0700059, - 44.6733557 - ], - [ - -124.070023, - 44.673351 - ], - [ - -124.0700325, - 44.6733479 - ], - [ - -124.0700433, - 44.673344 - ], - [ - -124.0700553, - 44.6733391 - ], - [ - -124.0700688, - 44.6733327 - ], - [ - -124.0700837, - 44.6733245 - ], - [ - -124.0700915, - 44.6733197 - ], - [ - -124.0700996, - 44.6733142 - ], - [ - -124.0701081, - 44.673308 - ], - [ - -124.070117, - 44.6733009 - ], - [ - -124.0701262, - 44.6732929 - ], - [ - -124.0701321, - 44.673287 - ], - [ - -124.070137, - 44.6732811 - ], - [ - -124.0701398, - 44.673277 - ], - [ - -124.070143, - 44.6732716 - ], - [ - -124.0701464, - 44.6732642 - ], - [ - -124.0701479, - 44.6732599 - ], - [ - -124.0701493, - 44.673255 - ], - [ - -124.0701504, - 44.6732493 - ], - [ - -124.0701512, - 44.6732429 - ], - [ - -124.0701514, - 44.6732355 - ], - [ - -124.070151, - 44.673227 - ], - [ - -124.0701497, - 44.6732165 - ], - [ - -124.0701478, - 44.6732068 - ], - [ - -124.0701449, - 44.6731949 - ], - [ - -124.0701414, - 44.673182 - ], - [ - -124.0701383, - 44.6731736 - ], - [ - -124.0701336, - 44.6731653 - ], - [ - -124.0701298, - 44.6731598 - ], - [ - -124.070124, - 44.6731524 - ], - [ - -124.0701152, - 44.6731427 - ], - [ - -124.0700752, - 44.673104 - ], - [ - -124.0700648, - 44.6730929 - ], - [ - -124.0700598, - 44.673087 - ], - [ - -124.0700551, - 44.6730806 - ], - [ - -124.0700509, - 44.6730738 - ], - [ - -124.0700474, - 44.6730665 - ], - [ - -124.070045, - 44.6730587 - ], - [ - -124.0700444, - 44.6730546 - ], - [ - -124.0700438, - 44.6730452 - ], - [ - -124.070044, - 44.6730356 - ], - [ - -124.0700446, - 44.6730291 - ], - [ - -124.0700459, - 44.6730204 - ], - [ - -124.0700489, - 44.6730087 - ], - [ - -124.0700512, - 44.673002 - ], - [ - -124.0700545, - 44.6729943 - ], - [ - -124.070059, - 44.6729856 - ], - [ - -124.0700653, - 44.6729755 - ], - [ - -124.0700692, - 44.6729702 - ], - [ - -124.0700738, - 44.6729646 - ], - [ - -124.0700792, - 44.6729586 - ], - [ - -124.0700855, - 44.6729523 - ], - [ - -124.0700929, - 44.6729456 - ], - [ - -124.0701016, - 44.6729386 - ], - [ - -124.070106, - 44.6729352 - ], - [ - -124.0701106, - 44.6729322 - ], - [ - -124.0701197, - 44.6729266 - ], - [ - -124.0701258, - 44.6729233 - ], - [ - -124.0701341, - 44.6729193 - ], - [ - -124.0701452, - 44.6729149 - ], - [ - -124.0701516, - 44.6729126 - ], - [ - -124.070159, - 44.6729104 - ], - [ - -124.0701675, - 44.6729081 - ], - [ - -124.0701773, - 44.6729057 - ], - [ - -124.0701886, - 44.6729033 - ], - [ - -124.0702192, - 44.6728976 - ], - [ - -124.070237, - 44.672894 - ], - [ - -124.07025, - 44.6728916 - ], - [ - -124.0702632, - 44.6728898 - ], - [ - -124.0702721, - 44.6728889 - ], - [ - -124.0702841, - 44.672888 - ], - [ - -124.0703323, - 44.6728855 - ], - [ - -124.0703458, - 44.6728844 - ], - [ - -124.0703611, - 44.6728826 - ], - [ - -124.0703691, - 44.6728813 - ], - [ - -124.0703775, - 44.6728796 - ], - [ - -124.0703863, - 44.6728774 - ], - [ - -124.0703955, - 44.6728745 - ], - [ - -124.0704012, - 44.6728724 - ], - [ - -124.0704067, - 44.67287 - ], - [ - -124.0704169, - 44.6728646 - ], - [ - -124.0704233, - 44.6728607 - ], - [ - -124.0704313, - 44.672855 - ], - [ - -124.0704414, - 44.6728469 - ], - [ - -124.0704541, - 44.6728353 - ], - [ - -124.0704707, - 44.6728193 - ], - [ - -124.0704805, - 44.6728103 - ], - [ - -124.0704924, - 44.6728005 - ], - [ - -124.0704991, - 44.6727955 - ], - [ - -124.0705068, - 44.6727906 - ], - [ - -124.0705156, - 44.6727857 - ], - [ - -124.0705375, - 44.6727749 - ], - [ - -124.07056, - 44.6727649 - ], - [ - -124.0705752, - 44.6727587 - ], - [ - -124.0705957, - 44.672751 - ], - [ - -124.0706075, - 44.6727469 - ], - [ - -124.0706211, - 44.6727425 - ], - [ - -124.0706366, - 44.672738 - ], - [ - -124.0706544, - 44.6727333 - ], - [ - -124.0706753, - 44.6727287 - ], - [ - -124.0706971, - 44.672725 - ], - [ - -124.0707119, - 44.6727231 - ], - [ - -124.0707321, - 44.6727215 - ], - [ - -124.0707437, - 44.6727211 - ], - [ - -124.0707571, - 44.6727211 - ], - [ - -124.0707725, - 44.6727217 - ], - [ - -124.0707901, - 44.6727233 - ], - [ - -124.0708102, - 44.6727264 - ], - [ - -124.0708209, - 44.6727287 - ], - [ - -124.0708322, - 44.6727315 - ], - [ - -124.0708441, - 44.6727352 - ], - [ - -124.0708568, - 44.6727397 - ], - [ - -124.07087, - 44.6727454 - ], - [ - -124.070884, - 44.6727523 - ], - [ - -124.0708985, - 44.6727609 - ], - [ - -124.070904, - 44.6727646 - ], - [ - -124.0709089, - 44.6727686 - ], - [ - -124.0709119, - 44.6727713 - ], - [ - -124.0709155, - 44.672775 - ], - [ - -124.0709197, - 44.6727801 - ], - [ - -124.0709218, - 44.672783 - ], - [ - -124.0709238, - 44.6727865 - ], - [ - -124.0709259, - 44.6727905 - ], - [ - -124.0709277, - 44.6727951 - ], - [ - -124.0709293, - 44.6728004 - ], - [ - -124.0709304, - 44.6728065 - ], - [ - -124.0709307, - 44.6728135 - ], - [ - -124.0709305, - 44.6728172 - ], - [ - -124.07093, - 44.6728211 - ], - [ - -124.0709292, - 44.6728252 - ], - [ - -124.0709281, - 44.6728295 - ], - [ - -124.0709264, - 44.6728341 - ], - [ - -124.0709243, - 44.6728388 - ], - [ - -124.0709216, - 44.6728436 - ], - [ - -124.070909, - 44.672864 - ], - [ - -124.0708958, - 44.6728844 - ], - [ - -124.070868, - 44.672925 - ], - [ - -124.0708486, - 44.672952 - ], - [ - -124.0708219, - 44.6729876 - ], - [ - -124.0708067, - 44.6730066 - ], - [ - -124.0707906, - 44.6730253 - ], - [ - -124.0707577, - 44.6730622 - ], - [ - -124.0707366, - 44.6730868 - ], - [ - -124.0707253, - 44.673101 - ], - [ - -124.0707216, - 44.6731063 - ], - [ - -124.0707184, - 44.673112 - ], - [ - -124.0707166, - 44.6731159 - ], - [ - -124.0707145, - 44.6731214 - ], - [ - -124.0707125, - 44.6731289 - ], - [ - -124.0707117, - 44.6731332 - ], - [ - -124.0707112, - 44.6731383 - ], - [ - -124.070711, - 44.6731441 - ], - [ - -124.0707114, - 44.6731508 - ], - [ - -124.0707128, - 44.6731583 - ], - [ - -124.070714, - 44.6731622 - ], - [ - -124.0707155, - 44.6731663 - ], - [ - -124.0707174, - 44.6731706 - ], - [ - -124.07072, - 44.673175 - ], - [ - -124.0707231, - 44.6731795 - ], - [ - -124.0707271, - 44.6731841 - ], - [ - -124.070732, - 44.6731887 - ], - [ - -124.070738, - 44.6731931 - ], - [ - -124.0707414, - 44.6731952 - ], - [ - -124.0707484, - 44.6731988 - ], - [ - -124.0707556, - 44.6732017 - ], - [ - -124.0707607, - 44.6732033 - ], - [ - -124.0707675, - 44.6732051 - ], - [ - -124.070777, - 44.6732067 - ], - [ - -124.0707825, - 44.6732073 - ], - [ - -124.0707889, - 44.6732078 - ], - [ - -124.0707964, - 44.6732079 - ], - [ - -124.0708049, - 44.6732076 - ], - [ - -124.0708148, - 44.6732068 - ], - [ - -124.070826, - 44.6732052 - ], - [ - -124.0708388, - 44.6732027 - ], - [ - -124.070853, - 44.673199 - ], - [ - -124.0708604, - 44.6731967 - ], - [ - -124.070868, - 44.6731941 - ], - [ - -124.0708759, - 44.6731911 - ], - [ - -124.0708839, - 44.6731877 - ], - [ - -124.070892, - 44.673184 - ], - [ - -124.0709923, - 44.6731348 - ], - [ - -124.0710924, - 44.673085 - ], - [ - -124.0711587, - 44.6730513 - ], - [ - -124.0713787, - 44.6729364 - ], - [ - -124.0714526, - 44.6728985 - ], - [ - -124.0714926, - 44.6728789 - ], - [ - -124.0715333, - 44.6728599 - ], - [ - -124.0716161, - 44.672824 - ], - [ - -124.0716723, - 44.672801 - ], - [ - -124.0717481, - 44.6727713 - ], - [ - -124.0718504, - 44.6727321 - ], - [ - -124.0718879, - 44.6727186 - ], - [ - -124.0719261, - 44.6727063 - ], - [ - -124.0719863, - 44.672689 - ], - [ - -124.0720326, - 44.6726766 - ], - [ - -124.0720942, - 44.6726603 - ], - [ - -124.0721258, - 44.6726516 - ], - [ - -124.0721585, - 44.6726431 - ], - [ - -124.0721808, - 44.6726381 - ], - [ - -124.0721936, - 44.6726358 - ], - [ - -124.0722082, - 44.6726336 - ], - [ - -124.072225, - 44.672632 - ], - [ - -124.0722339, - 44.6726316 - ], - [ - -124.0722434, - 44.6726315 - ], - [ - -124.0722535, - 44.6726319 - ], - [ - -124.0722642, - 44.6726328 - ], - [ - -124.0722755, - 44.6726345 - ], - [ - -124.0722874, - 44.6726372 - ], - [ - -124.0723, - 44.6726411 - ], - [ - -124.0723064, - 44.6726435 - ], - [ - -124.0723149, - 44.6726474 - ], - [ - -124.0723227, - 44.6726516 - ], - [ - -124.0723276, - 44.6726546 - ], - [ - -124.0723337, - 44.6726589 - ], - [ - -124.0723411, - 44.672665 - ], - [ - -124.072345, - 44.6726686 - ], - [ - -124.0723492, - 44.6726729 - ], - [ - -124.0723535, - 44.672678 - ], - [ - -124.072358, - 44.6726841 - ], - [ - -124.0723626, - 44.6726912 - ], - [ - -124.0723671, - 44.6726995 - ], - [ - -124.0723714, - 44.6727092 - ], - [ - -124.0723752, - 44.6727205 - ], - [ - -124.0723769, - 44.6727265 - ], - [ - -124.0723861, - 44.672766 - ], - [ - -124.0723939, - 44.6728056 - ], - [ - -124.0723984, - 44.672832 - ], - [ - -124.0724039, - 44.6728673 - ], - [ - -124.0724201, - 44.673025 - ], - [ - -124.0724214, - 44.6730317 - ], - [ - -124.0724231, - 44.6730382 - ], - [ - -124.0724246, - 44.6730425 - ], - [ - -124.0724269, - 44.6730482 - ], - [ - -124.0724306, - 44.6730557 - ], - [ - -124.0724331, - 44.6730599 - ], - [ - -124.0724362, - 44.6730646 - ], - [ - -124.0724402, - 44.6730699 - ], - [ - -124.0724452, - 44.6730758 - ], - [ - -124.0724518, - 44.6730824 - ], - [ - -124.0724556, - 44.6730858 - ], - [ - -124.0724599, - 44.6730894 - ], - [ - -124.0724647, - 44.6730931 - ], - [ - -124.0724703, - 44.673097 - ], - [ - -124.072476, - 44.6731005 - ], - [ - -124.0724821, - 44.6731035 - ], - [ - -124.0724863, - 44.6731051 - ], - [ - -124.0724921, - 44.673107 - ], - [ - -124.0725002, - 44.673109 - ], - [ - -124.0725049, - 44.6731098 - ], - [ - -124.0725104, - 44.6731105 - ], - [ - -124.0725168, - 44.673111 - ], - [ - -124.0725242, - 44.6731112 - ], - [ - -124.0725328, - 44.673111 - ], - [ - -124.0725427, - 44.6731102 - ], - [ - -124.0725539, - 44.6731086 - ], - [ - -124.0725666, - 44.6731061 - ], - [ - -124.0725732, - 44.6731044 - ], - [ - -124.0725801, - 44.6731025 - ], - [ - -124.0725873, - 44.6731002 - ], - [ - -124.0725947, - 44.6730976 - ], - [ - -124.0726021, - 44.6730947 - ], - [ - -124.0726096, - 44.6730913 - ], - [ - -124.0726297, - 44.6730818 - ], - [ - -124.0726496, - 44.6730717 - ], - [ - -124.0726625, - 44.6730647 - ], - [ - -124.0726792, - 44.6730547 - ], - [ - -124.0726884, - 44.6730487 - ], - [ - -124.0726984, - 44.6730415 - ], - [ - -124.0727093, - 44.6730328 - ], - [ - -124.0727147, - 44.673028 - ], - [ - -124.0727203, - 44.6730226 - ], - [ - -124.0727259, - 44.6730166 - ], - [ - -124.072731, - 44.6730107 - ], - [ - -124.0727356, - 44.6730047 - ], - [ - -124.0727439, - 44.6729925 - ], - [ - -124.0727489, - 44.6729844 - ], - [ - -124.0727677, - 44.6729514 - ], - [ - -124.0727737, - 44.672942 - ], - [ - -124.0727813, - 44.6729313 - ], - [ - -124.0727859, - 44.6729256 - ], - [ - -124.0727912, - 44.6729196 - ], - [ - -124.0727949, - 44.6729153 - ], - [ - -124.0727986, - 44.6729107 - ], - [ - -124.072806, - 44.6729012 - ], - [ - -124.0728109, - 44.672895 - ], - [ - -124.0728137, - 44.6728916 - ], - [ - -124.072817, - 44.6728881 - ], - [ - -124.0728187, - 44.6728864 - ], - [ - -124.0728206, - 44.6728847 - ], - [ - -124.0728226, - 44.6728831 - ], - [ - -124.0728248, - 44.6728816 - ], - [ - -124.0728271, - 44.6728803 - ], - [ - -124.0728296, - 44.6728792 - ], - [ - -124.0728309, - 44.6728788 - ], - [ - -124.0728323, - 44.6728786 - ], - [ - -124.0728337, - 44.6728784 - ], - [ - -124.0728391, - 44.6728786 - ], - [ - -124.0728446, - 44.6728795 - ], - [ - -124.0728483, - 44.6728806 - ], - [ - -124.0728532, - 44.6728826 - ], - [ - -124.0728599, - 44.672886 - ], - [ - -124.0728637, - 44.6728884 - ], - [ - -124.0728681, - 44.6728914 - ], - [ - -124.0728731, - 44.6728952 - ], - [ - -124.0728789, - 44.6729 - ], - [ - -124.0728855, - 44.672906 - ], - [ - -124.0728931, - 44.6729133 - ], - [ - -124.0729019, - 44.6729222 - ], - [ - -124.0729253, - 44.672947 - ], - [ - -124.0729387, - 44.6729607 - ], - [ - -124.0729459, - 44.6729674 - ], - [ - -124.0729535, - 44.6729741 - ], - [ - -124.0729615, - 44.6729805 - ], - [ - -124.0729679, - 44.6729851 - ], - [ - -124.0729745, - 44.67299 - ], - [ - -124.0729884, - 44.6730001 - ], - [ - -124.072998, - 44.6730069 - ], - [ - -124.0730112, - 44.6730158 - ], - [ - -124.0730188, - 44.6730205 - ], - [ - -124.0730275, - 44.6730256 - ], - [ - -124.0730374, - 44.6730309 - ], - [ - -124.0730426, - 44.6730334 - ], - [ - -124.0730482, - 44.6730358 - ], - [ - -124.073054, - 44.673038 - ], - [ - -124.0730601, - 44.6730399 - ], - [ - -124.0730665, - 44.6730414 - ], - [ - -124.0730687, - 44.6730417 - ], - [ - -124.0730709, - 44.6730417 - ], - [ - -124.0730723, - 44.6730415 - ], - [ - -124.0730743, - 44.673041 - ], - [ - -124.0730768, - 44.6730401 - ], - [ - -124.0730782, - 44.6730394 - ], - [ - -124.0730798, - 44.6730385 - ], - [ - -124.0730817, - 44.6730373 - ], - [ - -124.0730837, - 44.6730358 - ], - [ - -124.0730861, - 44.6730338 - ], - [ - -124.0730887, - 44.6730313 - ], - [ - -124.0730916, - 44.6730281 - ], - [ - -124.0730948, - 44.6730243 - ], - [ - -124.0730984, - 44.6730197 - ], - [ - -124.0731024, - 44.6730143 - ], - [ - -124.0731067, - 44.6730083 - ], - [ - -124.0731089, - 44.6730053 - ], - [ - -124.0731153, - 44.6729955 - ], - [ - -124.0731203, - 44.6729856 - ], - [ - -124.0731229, - 44.6729791 - ], - [ - -124.0731255, - 44.6729704 - ], - [ - -124.0731278, - 44.6729587 - ], - [ - -124.0731292, - 44.6729432 - ], - [ - -124.0731293, - 44.6729225 - ], - [ - -124.0731288, - 44.6728951 - ], - [ - -124.0731297, - 44.6728795 - ], - [ - -124.0731309, - 44.6728712 - ], - [ - -124.0731328, - 44.6728624 - ], - [ - -124.0731358, - 44.6728531 - ], - [ - -124.0731429, - 44.6728351 - ], - [ - -124.0731506, - 44.6728174 - ], - [ - -124.0731563, - 44.6728058 - ], - [ - -124.0731646, - 44.6727905 - ], - [ - -124.0731699, - 44.6727818 - ], - [ - -124.0731765, - 44.672772 - ], - [ - -124.0731848, - 44.6727608 - ], - [ - -124.0731953, - 44.6727481 - ], - [ - -124.0732015, - 44.6727413 - ], - [ - -124.0732086, - 44.6727341 - ], - [ - -124.0732149, - 44.6727284 - ], - [ - -124.0732219, - 44.6727229 - ], - [ - -124.0732269, - 44.6727194 - ], - [ - -124.0732339, - 44.6727149 - ], - [ - -124.0732439, - 44.6727094 - ], - [ - -124.0732499, - 44.6727064 - ], - [ - -124.0732569, - 44.6727034 - ], - [ - -124.0732651, - 44.6727002 - ], - [ - -124.0732745, - 44.6726971 - ], - [ - -124.0732855, - 44.6726942 - ], - [ - -124.0732913, - 44.672693 - ], - [ - -124.0732975, - 44.672692 - ], - [ - -124.073304, - 44.6726913 - ], - [ - -124.0733109, - 44.6726909 - ], - [ - -124.073318, - 44.6726909 - ], - [ - -124.0733254, - 44.6726915 - ], - [ - -124.073333, - 44.6726928 - ], - [ - -124.0733367, - 44.6726937 - ], - [ - -124.0733405, - 44.6726949 - ], - [ - -124.0733491, - 44.6726982 - ], - [ - -124.0733575, - 44.672702 - ], - [ - -124.0733631, - 44.6727048 - ], - [ - -124.0733703, - 44.6727089 - ], - [ - -124.0733796, - 44.6727149 - ], - [ - -124.0733848, - 44.6727186 - ], - [ - -124.0733905, - 44.672723 - ], - [ - -124.0733968, - 44.6727282 - ], - [ - -124.0734036, - 44.6727346 - ], - [ - -124.0734109, - 44.6727421 - ], - [ - -124.0734184, - 44.6727511 - ], - [ - -124.0734221, - 44.6727561 - ], - [ - -124.0734257, - 44.6727614 - ], - [ - -124.0734317, - 44.6727722 - ], - [ - -124.073436, - 44.6727831 - ], - [ - -124.0734381, - 44.6727905 - ], - [ - -124.0734399, - 44.6728005 - ], - [ - -124.073441, - 44.6728139 - ], - [ - -124.0734406, - 44.672832 - ], - [ - -124.0734379, - 44.6728562 - ], - [ - -124.0734338, - 44.6728883 - ], - [ - -124.0734328, - 44.6729063 - ], - [ - -124.073433, - 44.6729157 - ], - [ - -124.073434, - 44.6729256 - ], - [ - -124.0734361, - 44.672936 - ], - [ - -124.0734397, - 44.6729468 - ], - [ - -124.0734454, - 44.672958 - ], - [ - -124.0734513, - 44.6729666 - ], - [ - -124.0734578, - 44.672975 - ], - [ - -124.0734626, - 44.6729806 - ], - [ - -124.0734692, - 44.6729879 - ], - [ - -124.0734965, - 44.673017 - ], - [ - -124.0735038, - 44.6730254 - ], - [ - -124.0735113, - 44.6730353 - ], - [ - -124.0735199, - 44.6730475 - ], - [ - -124.0735286, - 44.6730603 - ], - [ - -124.0735341, - 44.6730691 - ], - [ - -124.0735407, - 44.6730809 - ], - [ - -124.073544, - 44.6730876 - ], - [ - -124.0735471, - 44.6730953 - ], - [ - -124.0735498, - 44.6731041 - ], - [ - -124.0735508, - 44.6731086 - ], - [ - -124.0735515, - 44.6731135 - ], - [ - -124.0735517, - 44.6731186 - ], - [ - -124.0735513, - 44.6731239 - ], - [ - -124.0735502, - 44.6731294 - ], - [ - -124.0735472, - 44.673137 - ], - [ - -124.0735427, - 44.6731443 - ], - [ - -124.073539, - 44.6731489 - ], - [ - -124.0735331, - 44.6731548 - ], - [ - -124.073524, - 44.6731623 - ], - [ - -124.0735182, - 44.6731664 - ], - [ - -124.0735111, - 44.673171 - ], - [ - -124.0735024, - 44.6731761 - ], - [ - -124.073492, - 44.6731818 - ], - [ - -124.0734795, - 44.6731883 - ], - [ - -124.0734452, - 44.6732055 - ], - [ - -124.0734262, - 44.6732157 - ], - [ - -124.0734166, - 44.6732214 - ], - [ - -124.0734069, - 44.6732278 - ], - [ - -124.0733975, - 44.6732349 - ], - [ - -124.0733886, - 44.6732429 - ], - [ - -124.0733816, - 44.6732496 - ], - [ - -124.0733742, - 44.6732567 - ], - [ - -124.0733588, - 44.6732713 - ], - [ - -124.0733488, - 44.6732814 - ], - [ - -124.0733436, - 44.6732872 - ], - [ - -124.073338, - 44.6732939 - ], - [ - -124.0733325, - 44.6733015 - ], - [ - -124.0733301, - 44.6733055 - ], - [ - -124.0733278, - 44.6733098 - ], - [ - -124.0733259, - 44.6733143 - ], - [ - -124.0733245, - 44.6733191 - ], - [ - -124.0733238, - 44.6733241 - ], - [ - -124.073324, - 44.6733293 - ], - [ - -124.0733245, - 44.6733319 - ], - [ - -124.0733253, - 44.6733346 - ], - [ - -124.0733266, - 44.6733373 - ], - [ - -124.0733298, - 44.6733425 - ], - [ - -124.0733338, - 44.6733476 - ], - [ - -124.0733369, - 44.673351 - ], - [ - -124.0733416, - 44.6733554 - ], - [ - -124.0733487, - 44.673361 - ], - [ - -124.0733531, - 44.6733642 - ], - [ - -124.0733584, - 44.6733677 - ], - [ - -124.0733648, - 44.6733715 - ], - [ - -124.0733725, - 44.6733757 - ], - [ - -124.0733817, - 44.6733802 - ], - [ - -124.0733926, - 44.6733849 - ], - [ - -124.0734054, - 44.6733896 - ], - [ - -124.0734123, - 44.6733918 - ], - [ - -124.0734196, - 44.673394 - ], - [ - -124.0734273, - 44.6733959 - ], - [ - -124.0734353, - 44.6733977 - ], - [ - -124.0734443, - 44.673399 - ], - [ - -124.0734534, - 44.6733996 - ], - [ - -124.0734595, - 44.6733995 - ], - [ - -124.0734677, - 44.673399 - ], - [ - -124.0734787, - 44.6733975 - ], - [ - -124.073485, - 44.6733964 - ], - [ - -124.0734922, - 44.6733947 - ], - [ - -124.0735005, - 44.6733925 - ], - [ - -124.0735098, - 44.6733896 - ], - [ - -124.0735205, - 44.6733858 - ], - [ - -124.0735326, - 44.673381 - ], - [ - -124.0735461, - 44.6733751 - ], - [ - -124.0735611, - 44.6733681 - ], - [ - -124.0735776, - 44.6733601 - ], - [ - -124.0735859, - 44.6733559 - ], - [ - -124.0735941, - 44.6733514 - ], - [ - -124.0736016, - 44.6733462 - ], - [ - -124.0736064, - 44.6733424 - ], - [ - -124.0736125, - 44.673337 - ], - [ - -124.0736201, - 44.6733294 - ], - [ - -124.0736298, - 44.6733187 - ], - [ - -124.0736421, - 44.6733042 - ], - [ - -124.0736492, - 44.6732963 - ], - [ - -124.0736575, - 44.6732877 - ], - [ - -124.0736621, - 44.6732835 - ], - [ - -124.0736672, - 44.6732794 - ], - [ - -124.0736728, - 44.6732754 - ], - [ - -124.0736791, - 44.6732717 - ], - [ - -124.0736863, - 44.6732686 - ], - [ - -124.0736902, - 44.6732673 - ], - [ - -124.0736943, - 44.6732663 - ], - [ - -124.0736986, - 44.6732657 - ], - [ - -124.0737017, - 44.6732654 - ], - [ - -124.0737059, - 44.6732653 - ], - [ - -124.0737118, - 44.6732656 - ], - [ - -124.0737152, - 44.6732658 - ], - [ - -124.0737192, - 44.6732663 - ], - [ - -124.0737238, - 44.673267 - ], - [ - -124.0737292, - 44.673268 - ], - [ - -124.0737353, - 44.6732693 - ], - [ - -124.0737422, - 44.6732711 - ], - [ - -124.07375, - 44.6732734 - ], - [ - -124.0737585, - 44.6732762 - ], - [ - -124.0737628, - 44.6732778 - ], - [ - -124.0737671, - 44.6732794 - ], - [ - -124.0737715, - 44.6732812 - ], - [ - -124.0737787, - 44.6732848 - ], - [ - -124.0737855, - 44.673289 - ], - [ - -124.0737899, - 44.6732922 - ], - [ - -124.0737955, - 44.6732969 - ], - [ - -124.0738026, - 44.6733037 - ], - [ - -124.0738117, - 44.6733136 - ], - [ - -124.0738232, - 44.6733277 - ], - [ - -124.0738378, - 44.6733465 - ], - [ - -124.0738462, - 44.6733565 - ], - [ - -124.0738507, - 44.6733615 - ], - [ - -124.0738556, - 44.6733665 - ], - [ - -124.0738609, - 44.6733712 - ], - [ - -124.0738667, - 44.6733756 - ], - [ - -124.0738732, - 44.6733794 - ], - [ - -124.0738766, - 44.673381 - ], - [ - -124.0738803, - 44.6733823 - ], - [ - -124.0738841, - 44.6733833 - ], - [ - -124.0738882, - 44.6733839 - ], - [ - -124.073891, - 44.6733841 - ], - [ - -124.0738939, - 44.6733841 - ], - [ - -124.0739001, - 44.6733839 - ], - [ - -124.0739044, - 44.6733835 - ], - [ - -124.0739105, - 44.6733826 - ], - [ - -124.073919, - 44.6733808 - ], - [ - -124.0739239, - 44.6733795 - ], - [ - -124.0739297, - 44.6733778 - ], - [ - -124.0739363, - 44.6733756 - ], - [ - -124.0739437, - 44.6733727 - ], - [ - -124.0739521, - 44.673369 - ], - [ - -124.0739613, - 44.6733642 - ], - [ - -124.0739659, - 44.6733615 - ], - [ - -124.0739707, - 44.6733584 - ], - [ - -124.0739754, - 44.6733549 - ], - [ - -124.07398, - 44.6733511 - ], - [ - -124.0739844, - 44.6733468 - ], - [ - -124.0739884, - 44.673342 - ], - [ - -124.0739941, - 44.6733341 - ], - [ - -124.0739993, - 44.6733261 - ], - [ - -124.0740083, - 44.6733099 - ], - [ - -124.0740135, - 44.673299 - ], - [ - -124.0740196, - 44.6732845 - ], - [ - -124.0740406, - 44.6732263 - ], - [ - -124.0740472, - 44.6732099 - ], - [ - -124.0740562, - 44.6731913 - ], - [ - -124.0740617, - 44.6731816 - ], - [ - -124.0740699, - 44.6731676 - ], - [ - -124.0740775, - 44.6731537 - ], - [ - -124.0740926, - 44.6731259 - ], - [ - -124.0741033, - 44.6731082 - ], - [ - -124.0741102, - 44.6730979 - ], - [ - -124.074119, - 44.6730864 - ], - [ - -124.0741305, - 44.6730732 - ], - [ - -124.0741374, - 44.6730663 - ], - [ - -124.0741454, - 44.673059 - ], - [ - -124.0741547, - 44.6730512 - ], - [ - -124.0741657, - 44.673043 - ], - [ - -124.0741809, - 44.6730328 - ], - [ - -124.0741966, - 44.6730236 - ], - [ - -124.0742072, - 44.673018 - ], - [ - -124.0742216, - 44.6730113 - ], - [ - -124.0742524, - 44.6729995 - ], - [ - -124.0742654, - 44.6729955 - ], - [ - -124.0742805, - 44.6729914 - ], - [ - -124.0742978, - 44.6729875 - ], - [ - -124.0743178, - 44.6729838 - ], - [ - -124.0743409, - 44.6729807 - ], - [ - -124.0743673, - 44.6729782 - ], - [ - -124.0743975, - 44.6729767 - ], - [ - -124.0744254, - 44.6729763 - ], - [ - -124.0744535, - 44.6729766 - ], - [ - -124.0744724, - 44.6729773 - ], - [ - -124.0744976, - 44.6729789 - ], - [ - -124.0745314, - 44.6729822 - ], - [ - -124.0745506, - 44.6729848 - ], - [ - -124.0745726, - 44.6729884 - ], - [ - -124.0745976, - 44.6729934 - ], - [ - -124.074626, - 44.6730003 - ], - [ - -124.074641, - 44.6730046 - ], - [ - -124.074657, - 44.6730096 - ], - [ - -124.0746951, - 44.6730226 - ], - [ - -124.0747317, - 44.673036 - ], - [ - -124.0747553, - 44.6730453 - ], - [ - -124.0747858, - 44.6730583 - ], - [ - -124.0748028, - 44.6730661 - ], - [ - -124.0748217, - 44.6730754 - ], - [ - -124.0748429, - 44.6730867 - ], - [ - -124.0748665, - 44.6731006 - ], - [ - -124.0749966, - 44.6731818 - ], - [ - -124.0752633, - 44.6733497 - ], - [ - -124.0753087, - 44.6733789 - ], - [ - -124.0753682, - 44.6734191 - ], - [ - -124.0754016, - 44.6734431 - ], - [ - -124.0754143, - 44.6734534 - ], - [ - -124.0754263, - 44.6734651 - ], - [ - -124.0754324, - 44.6734718 - ], - [ - -124.0754407, - 44.6734823 - ], - [ - -124.0754505, - 44.6734967 - ], - [ - -124.0754617, - 44.6735167 - ], - [ - -124.0754674, - 44.6735285 - ], - [ - -124.0754733, - 44.6735421 - ], - [ - -124.0754797, - 44.6735578 - ], - [ - -124.0754961, - 44.6735998 - ], - [ - -124.0755065, - 44.6736233 - ], - [ - -124.0755086, - 44.6736281 - ], - [ - -124.0755104, - 44.673633 - ], - [ - -124.0755132, - 44.6736431 - ], - [ - -124.0755147, - 44.6736499 - ], - [ - -124.07552, - 44.6736773 - ], - [ - -124.075522, - 44.673685 - ], - [ - -124.075525, - 44.6736934 - ], - [ - -124.075527, - 44.6736978 - ], - [ - -124.0755295, - 44.6737024 - ], - [ - -124.0755326, - 44.6737071 - ], - [ - -124.0755365, - 44.673712 - ], - [ - -124.0755414, - 44.6737169 - ], - [ - -124.0755514, - 44.6737255 - ], - [ - -124.0755616, - 44.6737339 - ], - [ - -124.0755824, - 44.6737503 - ], - [ - -124.0755961, - 44.6737614 - ], - [ - -124.0756455, - 44.6738029 - ], - [ - -124.0756622, - 44.6738167 - ], - [ - -124.0756664, - 44.6738201 - ], - [ - -124.075671, - 44.6738236 - ], - [ - -124.0756807, - 44.6738306 - ], - [ - -124.0756877, - 44.6738352 - ], - [ - -124.0756974, - 44.6738413 - ], - [ - -124.0757109, - 44.673849 - ], - [ - -124.0757189, - 44.673853 - ], - [ - -124.0757281, - 44.6738572 - ], - [ - -124.0757385, - 44.6738613 - ], - [ - -124.0757441, - 44.6738631 - ], - [ - -124.0757499, - 44.6738648 - ], - [ - -124.0757561, - 44.6738663 - ], - [ - -124.0757625, - 44.6738674 - ], - [ - -124.0757691, - 44.673868 - ], - [ - -124.0757759, - 44.673868 - ], - [ - -124.0757793, - 44.6738677 - ], - [ - -124.0757827, - 44.6738672 - ], - [ - -124.0757861, - 44.6738664 - ], - [ - -124.0757878, - 44.6738659 - ], - [ - -124.0757895, - 44.6738653 - ], - [ - -124.0757927, - 44.6738638 - ], - [ - -124.0757948, - 44.6738626 - ], - [ - -124.0757976, - 44.6738608 - ], - [ - -124.0758012, - 44.6738581 - ], - [ - -124.0758031, - 44.6738564 - ], - [ - -124.0758054, - 44.6738543 - ], - [ - -124.0758079, - 44.6738518 - ], - [ - -124.0758106, - 44.6738488 - ], - [ - -124.0758137, - 44.6738453 - ], - [ - -124.0758217, - 44.6738356 - ], - [ - -124.075826, - 44.6738302 - ], - [ - -124.0758283, - 44.6738275 - ], - [ - -124.0758323, - 44.6738223 - ], - [ - -124.0758356, - 44.6738168 - ], - [ - -124.0758375, - 44.6738131 - ], - [ - -124.0758398, - 44.6738079 - ], - [ - -124.0758423, - 44.6738008 - ], - [ - -124.0758452, - 44.6737913 - ], - [ - -124.0758486, - 44.6737787 - ], - [ - -124.0758507, - 44.6737717 - ], - [ - -124.0758535, - 44.673764 - ], - [ - -124.0758552, - 44.6737602 - ], - [ - -124.0758572, - 44.6737563 - ], - [ - -124.0758598, - 44.6737523 - ], - [ - -124.0758629, - 44.6737484 - ], - [ - -124.0758668, - 44.6737447 - ], - [ - -124.075869, - 44.6737432 - ], - [ - -124.0758716, - 44.6737419 - ], - [ - -124.0758735, - 44.6737412 - ], - [ - -124.0758763, - 44.6737405 - ], - [ - -124.0758803, - 44.6737399 - ], - [ - -124.0758827, - 44.6737398 - ], - [ - -124.0758856, - 44.6737397 - ], - [ - -124.0758891, - 44.6737398 - ], - [ - -124.0758931, - 44.6737401 - ], - [ - -124.075898, - 44.6737408 - ], - [ - -124.0759036, - 44.6737418 - ], - [ - -124.07591, - 44.6737434 - ], - [ - -124.0759174, - 44.6737457 - ], - [ - -124.0759211, - 44.6737471 - ], - [ - -124.0759252, - 44.6737487 - ], - [ - -124.0759292, - 44.6737506 - ], - [ - -124.0759334, - 44.6737527 - ], - [ - -124.0759375, - 44.6737551 - ], - [ - -124.0759415, - 44.6737577 - ], - [ - -124.0759452, - 44.6737607 - ], - [ - -124.0759468, - 44.6737622 - ], - [ - -124.0759484, - 44.6737639 - ], - [ - -124.0759607, - 44.6737783 - ], - [ - -124.0759727, - 44.6737929 - ], - [ - -124.0759963, - 44.673822 - ], - [ - -124.0760124, - 44.6738413 - ], - [ - -124.0760219, - 44.6738522 - ], - [ - -124.0762081, - 44.6740598 - ], - [ - -124.0763947, - 44.6742726 - ], - [ - -124.0764209, - 44.6743018 - ], - [ - -124.076448, - 44.6743305 - ], - [ - -124.0764668, - 44.6743493 - ], - [ - -124.0764931, - 44.6743737 - ], - [ - -124.0765088, - 44.6743874 - ], - [ - -124.0765275, - 44.6744027 - ], - [ - -124.0765499, - 44.6744197 - ], - [ - -124.0765772, - 44.6744385 - ], - [ - -124.0765886, - 44.6744454 - ], - [ - -124.0766003, - 44.6744517 - ], - [ - -124.0766084, - 44.6744556 - ], - [ - -124.0766194, - 44.6744604 - ], - [ - -124.0766344, - 44.6744663 - ], - [ - -124.076655, - 44.6744735 - ], - [ - -124.0767207, - 44.6744936 - ], - [ - -124.0767314, - 44.6744968 - ], - [ - -124.0767422, - 44.6744996 - ], - [ - -124.0767641, - 44.6745046 - ], - [ - -124.0768085, - 44.6745134 - ], - [ - -124.0768381, - 44.6745195 - ], - [ - -124.0768548, - 44.6745236 - ], - [ - -124.0768736, - 44.6745289 - ], - [ - -124.0768835, - 44.6745322 - ], - [ - -124.0769013, - 44.6745388 - ], - [ - -124.0769185, - 44.674546 - ], - [ - -124.0769296, - 44.6745512 - ], - [ - -124.0769439, - 44.6745587 - ], - [ - -124.0769518, - 44.6745631 - ], - [ - -124.0769605, - 44.6745685 - ], - [ - -124.07697, - 44.6745749 - ], - [ - -124.0769802, - 44.6745827 - ], - [ - -124.0769964, - 44.6745974 - ], - [ - -124.0770072, - 44.6746097 - ], - [ - -124.0770385, - 44.6746512 - ], - [ - -124.0770675, - 44.6746931 - ], - [ - -124.0770857, - 44.6747212 - ], - [ - -124.0771089, - 44.6747589 - ], - [ - -124.077138, - 44.6748095 - ], - [ - -124.0771748, - 44.6748779 - ], - [ - -124.0773307, - 44.675193 - ], - [ - -124.0773414, - 44.6752146 - ], - [ - -124.0773514, - 44.6752368 - ], - [ - -124.0773712, - 44.6752819 - ], - [ - -124.0773855, - 44.6753115 - ], - [ - -124.0773946, - 44.6753279 - ], - [ - -124.0774061, - 44.6753462 - ], - [ - -124.077421, - 44.675366 - ], - [ - -124.0774299, - 44.675376 - ], - [ - -124.0774401, - 44.6753863 - ], - [ - -124.077452, - 44.6753966 - ], - [ - -124.0774658, - 44.675407 - ], - [ - -124.0774822, - 44.675417 - ], - [ - -124.0776802, - 44.6755279 - ], - [ - -124.0779121, - 44.6756129 - ], - [ - -124.0779317, - 44.6756201 - ], - [ - -124.0779514, - 44.6756275 - ], - [ - -124.0779644, - 44.6756327 - ], - [ - -124.0779812, - 44.6756401 - ], - [ - -124.0779904, - 44.6756447 - ], - [ - -124.0780006, - 44.6756503 - ], - [ - -124.0780116, - 44.6756572 - ], - [ - -124.0780172, - 44.6756611 - ], - [ - -124.0780228, - 44.6756655 - ], - [ - -124.0780286, - 44.6756704 - ], - [ - -124.0780343, - 44.6756759 - ], - [ - -124.0780399, - 44.6756823 - ], - [ - -124.078046, - 44.6756902 - ], - [ - -124.0780517, - 44.6756982 - ], - [ - -124.0780616, - 44.6757144 - ], - [ - -124.0780673, - 44.6757254 - ], - [ - -124.0780739, - 44.6757401 - ], - [ - -124.0780814, - 44.6757599 - ], - [ - -124.0781065, - 44.67584 - ], - [ - -124.078112, - 44.6758574 - ], - [ - -124.0781165, - 44.6758748 - ], - [ - -124.0781248, - 44.6759099 - ], - [ - -124.0781311, - 44.6759333 - ], - [ - -124.0781355, - 44.6759465 - ], - [ - -124.0781416, - 44.6759617 - ], - [ - -124.0781444, - 44.6759673 - ], - [ - -124.0781478, - 44.6759727 - ], - [ - -124.0781503, - 44.6759762 - ], - [ - -124.078154, - 44.6759808 - ], - [ - -124.0781595, - 44.6759867 - ], - [ - -124.078163, - 44.6759899 - ], - [ - -124.0781672, - 44.6759934 - ], - [ - -124.0781723, - 44.6759973 - ], - [ - -124.0781785, - 44.6760015 - ], - [ - -124.0781861, - 44.676006 - ], - [ - -124.0781953, - 44.6760107 - ], - [ - -124.0782004, - 44.676013 - ], - [ - -124.0782061, - 44.6760153 - ], - [ - -124.0782123, - 44.6760175 - ], - [ - -124.078219, - 44.6760197 - ], - [ - -124.0782239, - 44.676021 - ], - [ - -124.0782287, - 44.676022 - ], - [ - -124.0782383, - 44.6760232 - ], - [ - -124.0782447, - 44.6760234 - ], - [ - -124.0782532, - 44.6760231 - ], - [ - -124.0782645, - 44.6760218 - ], - [ - -124.0782709, - 44.6760206 - ], - [ - -124.0782783, - 44.6760189 - ], - [ - -124.0782867, - 44.6760166 - ], - [ - -124.0783539, - 44.6759934 - ], - [ - -124.0783628, - 44.6759908 - ], - [ - -124.0783723, - 44.6759886 - ], - [ - -124.0783825, - 44.675987 - ], - [ - -124.0783934, - 44.6759861 - ], - [ - -124.078399, - 44.6759861 - ], - [ - -124.0784048, - 44.6759864 - ], - [ - -124.0784358, - 44.6759893 - ], - [ - -124.0784667, - 44.6759928 - ], - [ - -124.0784873, - 44.6759956 - ], - [ - -124.0785147, - 44.676 - ], - [ - -124.0785304, - 44.676003 - ], - [ - -124.0785482, - 44.676007 - ], - [ - -124.0785687, - 44.6760121 - ], - [ - -124.0785921, - 44.6760189 - ], - [ - -124.0786034, - 44.6760227 - ], - [ - -124.0786179, - 44.6760278 - ], - [ - -124.0786351, - 44.6760346 - ], - [ - -124.0786514, - 44.6760418 - ], - [ - -124.0786619, - 44.6760467 - ], - [ - -124.0786752, - 44.6760536 - ], - [ - -124.0786919, - 44.6760633 - ], - [ - -124.078701, - 44.6760691 - ], - [ - -124.0787111, - 44.676076 - ], - [ - -124.078722, - 44.6760843 - ], - [ - -124.078734, - 44.6760943 - ], - [ - -124.0787469, - 44.6761064 - ], - [ - -124.0787536, - 44.6761131 - ], - [ - -124.0787592, - 44.67612 - ], - [ - -124.0787637, - 44.6761271 - ], - [ - -124.078766, - 44.6761319 - ], - [ - -124.0787685, - 44.6761385 - ], - [ - -124.0787707, - 44.6761476 - ], - [ - -124.078772, - 44.67616 - ], - [ - -124.0787722, - 44.6761672 - ], - [ - -124.07877, - 44.6762123 - ], - [ - -124.0787707, - 44.6762278 - ], - [ - -124.0787718, - 44.6762355 - ], - [ - -124.0787739, - 44.6762437 - ], - [ - -124.0787771, - 44.6762522 - ], - [ - -124.078782, - 44.676261 - ], - [ - -124.0787852, - 44.6762654 - ], - [ - -124.0787928, - 44.6762749 - ], - [ - -124.0788009, - 44.6762841 - ], - [ - -124.0788065, - 44.67629 - ], - [ - -124.0788145, - 44.6762976 - ], - [ - -124.0788194, - 44.6763017 - ], - [ - -124.0788251, - 44.6763063 - ], - [ - -124.0788321, - 44.6763112 - ], - [ - -124.0788406, - 44.6763163 - ], - [ - -124.0788454, - 44.6763189 - ], - [ - -124.0788507, - 44.6763215 - ], - [ - -124.0788567, - 44.676324 - ], - [ - -124.0788633, - 44.6763265 - ], - [ - -124.0788707, - 44.6763289 - ], - [ - -124.0788768, - 44.6763304 - ], - [ - -124.078883, - 44.6763312 - ], - [ - -124.0788871, - 44.6763314 - ], - [ - -124.0788926, - 44.6763313 - ], - [ - -124.0788999, - 44.6763306 - ], - [ - -124.0789041, - 44.6763299 - ], - [ - -124.0789089, - 44.676329 - ], - [ - -124.0789143, - 44.6763277 - ], - [ - -124.078958, - 44.6763147 - ], - [ - -124.0789638, - 44.6763134 - ], - [ - -124.0789699, - 44.6763122 - ], - [ - -124.0789764, - 44.6763115 - ], - [ - -124.0789833, - 44.6763113 - ], - [ - -124.0789869, - 44.6763114 - ], - [ - -124.0789906, - 44.6763118 - ], - [ - -124.0789943, - 44.6763124 - ], - [ - -124.0790419, - 44.6763222 - ], - [ - -124.0790894, - 44.6763324 - ], - [ - -124.0791843, - 44.6763535 - ], - [ - -124.0791886, - 44.6763546 - ], - [ - -124.079193, - 44.676356 - ], - [ - -124.0791959, - 44.6763571 - ], - [ - -124.0791998, - 44.6763587 - ], - [ - -124.0792156, - 44.6763655 - ], - [ - -124.07922, - 44.6763672 - ], - [ - -124.079225, - 44.6763691 - ], - [ - -124.0792276, - 44.6763699 - ], - [ - -124.0792304, - 44.6763706 - ], - [ - -124.0792334, - 44.6763713 - ], - [ - -124.0792364, - 44.6763717 - ], - [ - -124.0792397, - 44.676372 - ], - [ - -124.079243, - 44.6763718 - ], - [ - -124.0792447, - 44.6763716 - ], - [ - -124.0792464, - 44.6763713 - ], - [ - -124.0792482, - 44.6763708 - ], - [ - -124.07925, - 44.6763701 - ], - [ - -124.0792535, - 44.6763683 - ], - [ - -124.0792566, - 44.6763663 - ], - [ - -124.0792584, - 44.6763647 - ], - [ - -124.0792604, - 44.6763625 - ], - [ - -124.0792626, - 44.6763593 - ], - [ - -124.0792637, - 44.6763573 - ], - [ - -124.0792646, - 44.6763549 - ], - [ - -124.0792655, - 44.676352 - ], - [ - -124.0792663, - 44.6763486 - ], - [ - -124.0792668, - 44.6763445 - ], - [ - -124.0792671, - 44.6763396 - ], - [ - -124.0792672, - 44.6763339 - ], - [ - -124.0792668, - 44.6763182 - ], - [ - -124.0792669, - 44.6763093 - ], - [ - -124.0792672, - 44.6763048 - ], - [ - -124.079268, - 44.6763001 - ], - [ - -124.0792692, - 44.6762954 - ], - [ - -124.0792946, - 44.6762117 - ], - [ - -124.0792991, - 44.6761999 - ], - [ - -124.0793051, - 44.6761865 - ], - [ - -124.0793131, - 44.6761713 - ], - [ - -124.0793181, - 44.6761633 - ], - [ - -124.079324, - 44.6761549 - ], - [ - -124.0793309, - 44.676146 - ], - [ - -124.0793364, - 44.6761403 - ], - [ - -124.0793426, - 44.6761353 - ], - [ - -124.0793471, - 44.6761324 - ], - [ - -124.0793536, - 44.6761289 - ], - [ - -124.0793628, - 44.6761249 - ], - [ - -124.0793685, - 44.6761229 - ], - [ - -124.0793751, - 44.6761208 - ], - [ - -124.079383, - 44.6761187 - ], - [ - -124.0793923, - 44.6761165 - ], - [ - -124.0794032, - 44.6761143 - ], - [ - -124.0794328, - 44.6761088 - ], - [ - -124.0794494, - 44.6761053 - ], - [ - -124.079458, - 44.6761032 - ], - [ - -124.0794669, - 44.6761006 - ], - [ - -124.079476, - 44.6760974 - ], - [ - -124.0794851, - 44.6760934 - ], - [ - -124.0794955, - 44.6760885 - ], - [ - -124.0795063, - 44.6760838 - ], - [ - -124.0795284, - 44.6760743 - ], - [ - -124.079543, - 44.6760678 - ], - [ - -124.079551, - 44.6760638 - ], - [ - -124.0795597, - 44.6760591 - ], - [ - -124.0795689, - 44.6760533 - ], - [ - -124.0795735, - 44.6760501 - ], - [ - -124.079578, - 44.6760465 - ], - [ - -124.0795824, - 44.6760424 - ], - [ - -124.0795865, - 44.6760378 - ], - [ - -124.0795903, - 44.6760325 - ], - [ - -124.0795934, - 44.6760266 - ], - [ - -124.0795982, - 44.6760152 - ], - [ - -124.0796026, - 44.6760039 - ], - [ - -124.0796107, - 44.6759811 - ], - [ - -124.0796253, - 44.6759354 - ], - [ - -124.0796356, - 44.675905 - ], - [ - -124.0796635, - 44.6758238 - ], - [ - -124.0796739, - 44.6757968 - ], - [ - -124.0796805, - 44.6757813 - ], - [ - -124.0796889, - 44.6757636 - ], - [ - -124.0796961, - 44.6757513 - ], - [ - -124.0797048, - 44.6757391 - ], - [ - -124.0797115, - 44.6757312 - ], - [ - -124.0797214, - 44.6757208 - ], - [ - -124.0797359, - 44.6757076 - ], - [ - -124.0797448, - 44.6757004 - ], - [ - -124.0797555, - 44.6756925 - ], - [ - -124.0797683, - 44.6756839 - ], - [ - -124.0797833, - 44.6756749 - ], - [ - -124.0798009, - 44.6756658 - ], - [ - -124.0798104, - 44.6756615 - ], - [ - -124.0798205, - 44.6756573 - ], - [ - -124.0798313, - 44.6756533 - ], - [ - -124.0798426, - 44.6756498 - ], - [ - -124.0798545, - 44.6756468 - ], - [ - -124.0798668, - 44.6756446 - ], - [ - -124.0798752, - 44.6756439 - ], - [ - -124.0798839, - 44.6756439 - ], - [ - -124.0798898, - 44.6756444 - ], - [ - -124.0798978, - 44.6756455 - ], - [ - -124.0799087, - 44.6756478 - ], - [ - -124.0799149, - 44.6756496 - ], - [ - -124.0799222, - 44.6756519 - ], - [ - -124.0799305, - 44.6756549 - ], - [ - -124.07994, - 44.6756589 - ], - [ - -124.0799509, - 44.6756641 - ], - [ - -124.0799633, - 44.6756706 - ], - [ - -124.0799772, - 44.6756789 - ], - [ - -124.0799927, - 44.6756891 - ], - [ - -124.0800095, - 44.6757015 - ], - [ - -124.0800181, - 44.6757083 - ], - [ - -124.0800307, - 44.6757192 - ], - [ - -124.0800421, - 44.6757302 - ], - [ - -124.080049, - 44.6757376 - ], - [ - -124.0800568, - 44.6757465 - ], - [ - -124.0800676, - 44.6757606 - ], - [ - -124.0800792, - 44.6757783 - ], - [ - -124.0800851, - 44.6757885 - ], - [ - -124.0800913, - 44.6758002 - ], - [ - -124.0800978, - 44.6758137 - ], - [ - -124.0801048, - 44.6758293 - ], - [ - -124.0801231, - 44.6758714 - ], - [ - -124.0801284, - 44.6758855 - ], - [ - -124.080132, - 44.6758998 - ], - [ - -124.0801336, - 44.6759094 - ], - [ - -124.080135, - 44.6759223 - ], - [ - -124.0801379, - 44.6759744 - ], - [ - -124.0801396, - 44.6759893 - ], - [ - -124.0801431, - 44.6760063 - ], - [ - -124.0801459, - 44.6760153 - ], - [ - -124.0801496, - 44.6760248 - ], - [ - -124.0801546, - 44.6760349 - ], - [ - -124.0801614, - 44.6760457 - ], - [ - -124.0801703, - 44.676057 - ], - [ - -124.0801778, - 44.6760655 - ], - [ - -124.0801857, - 44.6760743 - ], - [ - -124.0802024, - 44.6760919 - ], - [ - -124.080214, - 44.6761031 - ], - [ - -124.0802208, - 44.6761091 - ], - [ - -124.0802285, - 44.6761153 - ], - [ - -124.0802378, - 44.676122 - ], - [ - -124.0802427, - 44.6761251 - ], - [ - -124.0802479, - 44.6761281 - ], - [ - -124.0802534, - 44.6761308 - ], - [ - -124.0802594, - 44.6761332 - ], - [ - -124.0802657, - 44.6761352 - ], - [ - -124.0802723, - 44.6761365 - ], - [ - -124.0802758, - 44.6761368 - ], - [ - -124.0802793, - 44.6761369 - ], - [ - -124.0802829, - 44.6761367 - ], - [ - -124.080288, - 44.6761359 - ], - [ - -124.0802932, - 44.6761345 - ], - [ - -124.0802967, - 44.6761334 - ], - [ - -124.0803015, - 44.6761315 - ], - [ - -124.0803078, - 44.6761284 - ], - [ - -124.0803115, - 44.6761264 - ], - [ - -124.0803156, - 44.6761239 - ], - [ - -124.0803204, - 44.6761208 - ], - [ - -124.0803258, - 44.676117 - ], - [ - -124.0803318, - 44.6761123 - ], - [ - -124.0803387, - 44.6761067 - ], - [ - -124.0803462, - 44.6761 - ], - [ - -124.0803544, - 44.6760921 - ], - [ - -124.0803632, - 44.6760832 - ], - [ - -124.0803675, - 44.6760786 - ], - [ - -124.0803776, - 44.6760672 - ], - [ - -124.0803872, - 44.6760559 - ], - [ - -124.0804053, - 44.6760332 - ], - [ - -124.0804391, - 44.6759878 - ], - [ - -124.0804618, - 44.6759576 - ], - [ - -124.0804756, - 44.6759404 - ], - [ - -124.0805056, - 44.6759034 - ], - [ - -124.0805361, - 44.6758662 - ], - [ - -124.0805566, - 44.6758421 - ], - [ - -124.0805685, - 44.6758288 - ], - [ - -124.0805822, - 44.6758142 - ], - [ - -124.0805981, - 44.6757986 - ], - [ - -124.0806066, - 44.6757907 - ], - [ - -124.0806074, - 44.6757901 - ], - [ - -124.0806082, - 44.6757897 - ], - [ - -124.0806089, - 44.6757895 - ], - [ - -124.0806097, - 44.6757893 - ], - [ - -124.0806108, - 44.6757892 - ], - [ - -124.0806115, - 44.6757893 - ], - [ - -124.0806123, - 44.6757894 - ], - [ - -124.0806132, - 44.6757897 - ], - [ - -124.0806143, - 44.6757901 - ], - [ - -124.0806156, - 44.6757907 - ], - [ - -124.0806171, - 44.6757915 - ], - [ - -124.0806189, - 44.6757926 - ], - [ - -124.0806209, - 44.6757942 - ], - [ - -124.0806232, - 44.6757961 - ], - [ - -124.0806259, - 44.6757986 - ], - [ - -124.0806289, - 44.6758015 - ], - [ - -124.0806322, - 44.6758049 - ], - [ - -124.0806339, - 44.6758066 - ], - [ - -124.0806357, - 44.6758084 - ], - [ - -124.0806374, - 44.6758101 - ], - [ - -124.0806447, - 44.6758175 - ], - [ - -124.0806514, - 44.6758248 - ], - [ - -124.0806555, - 44.6758297 - ], - [ - -124.0806607, - 44.6758362 - ], - [ - -124.0806669, - 44.675845 - ], - [ - -124.08067, - 44.67585 - ], - [ - -124.0806734, - 44.6758559 - ], - [ - -124.0806767, - 44.6758626 - ], - [ - -124.0806801, - 44.6758705 - ], - [ - -124.0806833, - 44.6758797 - ], - [ - -124.0806847, - 44.6758847 - ], - [ - -124.0806909, - 44.6759111 - ], - [ - -124.0806958, - 44.6759377 - ], - [ - -124.0806983, - 44.6759554 - ], - [ - -124.0807005, - 44.6759791 - ], - [ - -124.0807011, - 44.6759926 - ], - [ - -124.0807011, - 44.676008 - ], - [ - -124.0807002, - 44.6760256 - ], - [ - -124.080674, - 44.6762774 - ], - [ - -124.080667, - 44.6764518 - ], - [ - -124.0806656, - 44.676464 - ], - [ - -124.0806632, - 44.6764766 - ], - [ - -124.080661, - 44.6764847 - ], - [ - -124.0806573, - 44.6764954 - ], - [ - -124.0806547, - 44.6765014 - ], - [ - -124.0806513, - 44.6765082 - ], - [ - -124.0806469, - 44.676516 - ], - [ - -124.0806409, - 44.6765247 - ], - [ - -124.0806331, - 44.6765346 - ], - [ - -124.0806283, - 44.6765398 - ], - [ - -124.0806228, - 44.6765453 - ], - [ - -124.0806165, - 44.6765512 - ], - [ - -124.0806092, - 44.6765574 - ], - [ - -124.0806019, - 44.6765629 - ], - [ - -124.0805943, - 44.6765679 - ], - [ - -124.0805892, - 44.6765709 - ], - [ - -124.0805821, - 44.6765746 - ], - [ - -124.0805726, - 44.6765789 - ], - [ - -124.080567, - 44.6765812 - ], - [ - -124.0805606, - 44.6765835 - ], - [ - -124.0805531, - 44.676586 - ], - [ - -124.0805444, - 44.6765885 - ], - [ - -124.0805343, - 44.676591 - ], - [ - -124.0805227, - 44.6765935 - ], - [ - -124.0805092, - 44.6765961 - ], - [ - -124.0804936, - 44.6765989 - ], - [ - -124.0804763, - 44.6766015 - ], - [ - -124.0804588, - 44.6766034 - ], - [ - -124.0804471, - 44.6766043 - ], - [ - -124.0804313, - 44.676605 - ], - [ - -124.0804222, - 44.6766052 - ], - [ - -124.0804118, - 44.676605 - ], - [ - -124.0804, - 44.6766046 - ], - [ - -124.0803865, - 44.6766035 - ], - [ - -124.0803711, - 44.6766017 - ], - [ - -124.0803629, - 44.6766004 - ], - [ - -124.0803543, - 44.6765988 - ], - [ - -124.080343, - 44.6765963 - ], - [ - -124.080332, - 44.6765935 - ], - [ - -124.0803248, - 44.6765915 - ], - [ - -124.0803155, - 44.6765885 - ], - [ - -124.0803034, - 44.676584 - ], - [ - -124.0802967, - 44.6765812 - ], - [ - -124.0802892, - 44.6765777 - ], - [ - -124.0802809, - 44.6765735 - ], - [ - -124.0802717, - 44.6765683 - ], - [ - -124.0802616, - 44.6765617 - ], - [ - -124.0802564, - 44.676558 - ], - [ - -124.080251, - 44.6765538 - ], - [ - -124.0802454, - 44.6765492 - ], - [ - -124.0802428, - 44.6765467 - ], - [ - -124.0802407, - 44.6765441 - ], - [ - -124.0802395, - 44.6765423 - ], - [ - -124.0802383, - 44.6765399 - ], - [ - -124.0802371, - 44.6765366 - ], - [ - -124.0802361, - 44.676532 - ], - [ - -124.0802358, - 44.6765293 - ], - [ - -124.0802357, - 44.6765262 - ], - [ - -124.0802358, - 44.6765226 - ], - [ - -124.0802361, - 44.6765185 - ], - [ - -124.0802369, - 44.6765074 - ], - [ - -124.0802368, - 44.6765011 - ], - [ - -124.0802364, - 44.6764978 - ], - [ - -124.0802356, - 44.6764943 - ], - [ - -124.0802343, - 44.6764906 - ], - [ - -124.0802323, - 44.6764868 - ], - [ - -124.080231, - 44.6764849 - ], - [ - -124.0802294, - 44.676483 - ], - [ - -124.0802278, - 44.6764811 - ], - [ - -124.0802261, - 44.6764792 - ], - [ - -124.0802225, - 44.6764751 - ], - [ - -124.0802199, - 44.6764721 - ], - [ - -124.0802164, - 44.6764681 - ], - [ - -124.0802114, - 44.6764627 - ], - [ - -124.0802046, - 44.6764557 - ], - [ - -124.0802007, - 44.676452 - ], - [ - -124.0801963, - 44.676448 - ], - [ - -124.0801939, - 44.6764462 - ], - [ - -124.0801915, - 44.6764443 - ], - [ - -124.0801889, - 44.6764426 - ], - [ - -124.0801862, - 44.6764411 - ], - [ - -124.0801835, - 44.6764398 - ], - [ - -124.0801821, - 44.6764393 - ], - [ - -124.0801807, - 44.676439 - ], - [ - -124.0801794, - 44.6764387 - ], - [ - -124.080178, - 44.6764386 - ], - [ - -124.0801766, - 44.6764387 - ], - [ - -124.0801753, - 44.676439 - ], - [ - -124.0801739, - 44.6764395 - ], - [ - -124.0801727, - 44.6764403 - ], - [ - -124.0801714, - 44.6764414 - ], - [ - -124.080169, - 44.676444 - ], - [ - -124.0801666, - 44.6764468 - ], - [ - -124.0801618, - 44.6764528 - ], - [ - -124.0801587, - 44.6764571 - ], - [ - -124.0801546, - 44.6764631 - ], - [ - -124.0801493, - 44.6764715 - ], - [ - -124.0801424, - 44.6764832 - ], - [ - -124.0801337, - 44.676499 - ], - [ - -124.0801289, - 44.6765078 - ], - [ - -124.0801241, - 44.6765173 - ], - [ - -124.0801198, - 44.6765269 - ], - [ - -124.0801115, - 44.676546 - ], - [ - -124.0801057, - 44.6765586 - ], - [ - -124.0801021, - 44.6765657 - ], - [ - -124.0801, - 44.6765694 - ], - [ - -124.0800977, - 44.676573 - ], - [ - -124.0800925, - 44.67658 - ], - [ - -124.0800887, - 44.6765845 - ], - [ - -124.0800833, - 44.6765904 - ], - [ - -124.0800602, - 44.6766137 - ], - [ - -124.0800538, - 44.6766205 - ], - [ - -124.0800471, - 44.6766286 - ], - [ - -124.0800439, - 44.6766331 - ], - [ - -124.0800407, - 44.6766379 - ], - [ - -124.0800369, - 44.676645 - ], - [ - -124.0800337, - 44.6766522 - ], - [ - -124.080032, - 44.6766571 - ], - [ - -124.0800302, - 44.6766637 - ], - [ - -124.0800284, - 44.6766726 - ], - [ - -124.0800278, - 44.6766777 - ], - [ - -124.0800273, - 44.6766835 - ], - [ - -124.0800271, - 44.6766901 - ], - [ - -124.0800273, - 44.6766976 - ], - [ - -124.0800279, - 44.6767059 - ], - [ - -124.0800292, - 44.6767152 - ], - [ - -124.0800298, - 44.6767179 - ], - [ - -124.0800307, - 44.6767205 - ], - [ - -124.080033, - 44.6767257 - ], - [ - -124.080035, - 44.6767292 - ], - [ - -124.0800382, - 44.6767338 - ], - [ - -124.080043, - 44.6767398 - ], - [ - -124.0800652, - 44.6767638 - ], - [ - -124.0800708, - 44.6767707 - ], - [ - -124.0800734, - 44.6767744 - ], - [ - -124.0800758, - 44.6767784 - ], - [ - -124.0800779, - 44.6767826 - ], - [ - -124.0800794, - 44.6767872 - ], - [ - -124.0800805, - 44.6767926 - ], - [ - -124.0800812, - 44.6767981 - ], - [ - -124.0800813, - 44.6768018 - ], - [ - -124.0800812, - 44.6768069 - ], - [ - -124.0800804, - 44.6768138 - ], - [ - -124.0800797, - 44.6768177 - ], - [ - -124.0800786, - 44.6768222 - ], - [ - -124.080077, - 44.6768274 - ], - [ - -124.0800747, - 44.6768332 - ], - [ - -124.0800714, - 44.6768399 - ], - [ - -124.0800695, - 44.6768433 - ], - [ - -124.0800672, - 44.676847 - ], - [ - -124.0800645, - 44.6768508 - ], - [ - -124.0800608, - 44.6768552 - ], - [ - -124.0800564, - 44.676859 - ], - [ - -124.0800532, - 44.6768614 - ], - [ - -124.0800486, - 44.6768642 - ], - [ - -124.0800418, - 44.6768676 - ], - [ - -124.0800319, - 44.6768715 - ], - [ - -124.0800265, - 44.6768732 - ], - [ - -124.0800187, - 44.6768755 - ], - [ - -124.0800103, - 44.6768776 - ], - [ - -124.0800004, - 44.6768798 - ], - [ - -124.0799743, - 44.6768854 - ], - [ - -124.0799602, - 44.6768889 - ], - [ - -124.0799532, - 44.676891 - ], - [ - -124.0799462, - 44.6768936 - ], - [ - -124.0799394, - 44.6768967 - ], - [ - -124.079933, - 44.6769005 - ], - [ - -124.0799301, - 44.6769028 - ], - [ - -124.0799274, - 44.6769052 - ], - [ - -124.0799251, - 44.676908 - ], - [ - -124.079923, - 44.6769111 - ], - [ - -124.0799214, - 44.6769146 - ], - [ - -124.0799163, - 44.6769285 - ], - [ - -124.0799119, - 44.6769424 - ], - [ - -124.0799093, - 44.6769517 - ], - [ - -124.079906, - 44.6769642 - ], - [ - -124.0799019, - 44.6769808 - ], - [ - -124.079894, - 44.677031 - ], - [ - -124.079892, - 44.6770381 - ], - [ - -124.0798906, - 44.6770419 - ], - [ - -124.0798894, - 44.6770447 - ], - [ - -124.0798879, - 44.6770474 - ], - [ - -124.0798842, - 44.6770525 - ], - [ - -124.0798813, - 44.6770557 - ], - [ - -124.0798768, - 44.6770598 - ], - [ - -124.07987, - 44.6770648 - ], - [ - -124.0798658, - 44.6770675 - ], - [ - -124.0798607, - 44.6770705 - ], - [ - -124.0798166, - 44.677093 - ], - [ - -124.0798111, - 44.6770962 - ], - [ - -124.0798056, - 44.6770998 - ], - [ - -124.0798002, - 44.6771039 - ], - [ - -124.079795, - 44.6771086 - ], - [ - -124.0797904, - 44.6771139 - ], - [ - -124.079752, - 44.6771668 - ], - [ - -124.079728, - 44.677199 - ], - [ - -124.0797034, - 44.6772311 - ], - [ - -124.0796865, - 44.6772525 - ], - [ - -124.0796808, - 44.677259 - ], - [ - -124.0796744, - 44.6772651 - ], - [ - -124.0796698, - 44.6772691 - ], - [ - -124.0796633, - 44.6772742 - ], - [ - -124.079654, - 44.6772806 - ], - [ - -124.0796484, - 44.6772841 - ], - [ - -124.0796419, - 44.6772879 - ], - [ - -124.0796343, - 44.677292 - ], - [ - -124.0796254, - 44.6772963 - ], - [ - -124.0796152, - 44.6773009 - ], - [ - -124.0796036, - 44.6773056 - ], - [ - -124.0795975, - 44.6773078 - ], - [ - -124.0795915, - 44.6773096 - ], - [ - -124.0795851, - 44.6773109 - ], - [ - -124.0795807, - 44.6773115 - ], - [ - -124.0795746, - 44.6773121 - ], - [ - -124.0795662, - 44.6773123 - ], - [ - -124.0795612, - 44.6773122 - ], - [ - -124.0795555, - 44.6773118 - ], - [ - -124.0795489, - 44.6773111 - ], - [ - -124.0795414, - 44.6773099 - ], - [ - -124.0795328, - 44.6773081 - ], - [ - -124.0795231, - 44.6773054 - ], - [ - -124.0795181, - 44.6773037 - ], - [ - -124.0795129, - 44.6773017 - ], - [ - -124.0795075, - 44.6772994 - ], - [ - -124.0795019, - 44.6772967 - ], - [ - -124.0794963, - 44.6772935 - ], - [ - -124.0794907, - 44.6772899 - ], - [ - -124.0794853, - 44.6772857 - ], - [ - -124.0794837, - 44.6772844 - ], - [ - -124.0794823, - 44.677283 - ], - [ - -124.0794798, - 44.6772802 - ], - [ - -124.0794783, - 44.6772783 - ], - [ - -124.0794766, - 44.6772757 - ], - [ - -124.0794745, - 44.6772721 - ], - [ - -124.0794675, - 44.677258 - ], - [ - -124.0794651, - 44.6772541 - ], - [ - -124.0794637, - 44.677252 - ], - [ - -124.0794619, - 44.6772499 - ], - [ - -124.0794543, - 44.6772409 - ], - [ - -124.0794469, - 44.677232 - ], - [ - -124.0794416, - 44.6772262 - ], - [ - -124.0794384, - 44.6772229 - ], - [ - -124.0794345, - 44.6772192 - ], - [ - -124.0794296, - 44.677215 - ], - [ - -124.0794268, - 44.6772129 - ], - [ - -124.0794236, - 44.6772105 - ], - [ - -124.0794199, - 44.6772081 - ], - [ - -124.0794157, - 44.6772055 - ], - [ - -124.079409, - 44.6772017 - ], - [ - -124.0794021, - 44.6771982 - ], - [ - -124.0793975, - 44.6771961 - ], - [ - -124.0793914, - 44.6771935 - ], - [ - -124.0793831, - 44.6771904 - ], - [ - -124.0793783, - 44.6771888 - ], - [ - -124.0793729, - 44.6771871 - ], - [ - -124.0793666, - 44.6771855 - ], - [ - -124.0793595, - 44.6771839 - ], - [ - -124.0793513, - 44.6771825 - ], - [ - -124.079342, - 44.6771813 - ], - [ - -124.079337, - 44.6771809 - ], - [ - -124.0793317, - 44.6771807 - ], - [ - -124.0793261, - 44.6771806 - ], - [ - -124.07931, - 44.6771809 - ], - [ - -124.0792938, - 44.6771818 - ], - [ - -124.0792828, - 44.6771829 - ], - [ - -124.0792682, - 44.6771848 - ], - [ - -124.0792486, - 44.6771883 - ], - [ - -124.0792375, - 44.6771907 - ], - [ - -124.0792248, - 44.677194 - ], - [ - -124.0792104, - 44.6771982 - ], - [ - -124.0791943, - 44.6772039 - ], - [ - -124.0791763, - 44.6772114 - ], - [ - -124.079167, - 44.6772158 - ], - [ - -124.0791572, - 44.6772209 - ], - [ - -124.079147, - 44.6772267 - ], - [ - -124.0791365, - 44.6772334 - ], - [ - -124.0791233, - 44.6772428 - ], - [ - -124.0791112, - 44.6772522 - ], - [ - -124.0791036, - 44.6772586 - ], - [ - -124.0790941, - 44.6772672 - ], - [ - -124.0790822, - 44.6772786 - ], - [ - -124.0790671, - 44.6772939 - ], - [ - -124.0790473, - 44.6773142 - ], - [ - -124.0790354, - 44.6773257 - ], - [ - -124.0790209, - 44.6773386 - ], - [ - -124.0789854, - 44.6773692 - ], - [ - -124.07895, - 44.6773994 - ], - [ - -124.0789253, - 44.6774191 - ], - [ - -124.0789105, - 44.6774301 - ], - [ - -124.0788927, - 44.6774424 - ], - [ - -124.0788711, - 44.6774562 - ], - [ - -124.0788588, - 44.6774634 - ], - [ - -124.0788496, - 44.6774682 - ], - [ - -124.07884, - 44.6774723 - ], - [ - -124.0788334, - 44.6774747 - ], - [ - -124.078812, - 44.6774806 - ], - [ - -124.0788048, - 44.677482 - ], - [ - -124.0787964, - 44.6774833 - ], - [ - -124.0787867, - 44.6774845 - ], - [ - -124.0787755, - 44.6774853 - ], - [ - -124.0787627, - 44.6774858 - ], - [ - -124.078748, - 44.6774857 - ], - [ - -124.0787312, - 44.6774849 - ], - [ - -124.0787124, - 44.677483 - ], - [ - -124.0787026, - 44.6774817 - ], - [ - -124.0786924, - 44.6774801 - ], - [ - -124.0786507, - 44.6774727 - ], - [ - -124.078609, - 44.6774645 - ], - [ - -124.0785813, - 44.6774586 - ], - [ - -124.0785444, - 44.6774504 - ], - [ - -124.0784951, - 44.6774387 - ], - [ - -124.0784431, - 44.6774267 - ], - [ - -124.0783916, - 44.6774147 - ], - [ - -124.0783578, - 44.6774059 - ], - [ - -124.0783386, - 44.6774004 - ], - [ - -124.078317, - 44.6773933 - ], - [ - -124.0782925, - 44.6773843 - ], - [ - -124.0782796, - 44.677379 - ], - [ - -124.078266, - 44.6773728 - ], - [ - -124.0782595, - 44.6773696 - ], - [ - -124.0782533, - 44.6773662 - ], - [ - -124.0782417, - 44.677359 - ], - [ - -124.0782345, - 44.6773539 - ], - [ - -124.0782256, - 44.6773467 - ], - [ - -124.0782146, - 44.6773366 - ], - [ - -124.0782088, - 44.6773306 - ], - [ - -124.0782024, - 44.6773235 - ], - [ - -124.0781955, - 44.6773152 - ], - [ - -124.078188, - 44.6773056 - ], - [ - -124.0781797, - 44.6772945 - ], - [ - -124.0781577, - 44.6772647 - ], - [ - -124.0781513, - 44.6772559 - ], - [ - -124.0781454, - 44.6772471 - ], - [ - -124.0781347, - 44.677229 - ], - [ - -124.0781281, - 44.6772168 - ], - [ - -124.0781031, - 44.6771676 - ], - [ - -124.0780951, - 44.6771537 - ], - [ - -124.078085, - 44.6771379 - ], - [ - -124.078079, - 44.6771297 - ], - [ - -124.078072, - 44.677121 - ], - [ - -124.0780648, - 44.6771131 - ], - [ - -124.078057, - 44.6771056 - ], - [ - -124.0780514, - 44.6771008 - ], - [ - -124.0780437, - 44.6770947 - ], - [ - -124.0780328, - 44.677087 - ], - [ - -124.0780263, - 44.6770828 - ], - [ - -124.0780186, - 44.6770782 - ], - [ - -124.0780095, - 44.6770731 - ], - [ - -124.0779988, - 44.6770675 - ], - [ - -124.0779862, - 44.6770614 - ], - [ - -124.0779713, - 44.6770547 - ], - [ - -124.0779651, - 44.6770521 - ], - [ - -124.0779583, - 44.6770498 - ], - [ - -124.0779536, - 44.6770484 - ], - [ - -124.0779472, - 44.6770467 - ], - [ - -124.0779383, - 44.6770449 - ], - [ - -124.0779332, - 44.677044 - ], - [ - -124.0779273, - 44.6770433 - ], - [ - -124.0779206, - 44.6770428 - ], - [ - -124.0779131, - 44.6770427 - ], - [ - -124.0779091, - 44.6770428 - ], - [ - -124.077905, - 44.6770431 - ], - [ - -124.0779007, - 44.6770437 - ], - [ - -124.0778963, - 44.6770445 - ], - [ - -124.0778918, - 44.6770456 - ], - [ - -124.0778872, - 44.6770471 - ], - [ - -124.0778827, - 44.6770492 - ], - [ - -124.0778784, - 44.6770518 - ], - [ - -124.0778645, - 44.677062 - ], - [ - -124.0778512, - 44.6770727 - ], - [ - -124.0778427, - 44.6770801 - ], - [ - -124.0778316, - 44.6770901 - ], - [ - -124.0778175, - 44.6771039 - ], - [ - -124.0778097, - 44.6771119 - ], - [ - -124.0778011, - 44.6771212 - ], - [ - -124.0777777, - 44.6771474 - ], - [ - -124.0777552, - 44.6771738 - ], - [ - -124.0777111, - 44.6772268 - ], - [ - -124.0776806, - 44.677262 - ], - [ - -124.0776623, - 44.677282 - ], - [ - -124.077644, - 44.6773009 - ], - [ - -124.0776245, - 44.6773195 - ], - [ - -124.077611, - 44.6773316 - ], - [ - -124.0775923, - 44.6773471 - ], - [ - -124.0775814, - 44.6773555 - ], - [ - -124.0775697, - 44.6773639 - ], - [ - -124.0775538, - 44.6773745 - ], - [ - -124.0775366, - 44.6773848 - ], - [ - -124.0775273, - 44.6773898 - ], - [ - -124.0775226, - 44.6773918 - ], - [ - -124.0775176, - 44.6773934 - ], - [ - -124.0775142, - 44.6773942 - ], - [ - -124.0775095, - 44.6773949 - ], - [ - -124.077503, - 44.6773953 - ], - [ - -124.0774991, - 44.6773953 - ], - [ - -124.0774946, - 44.677395 - ], - [ - -124.0774894, - 44.6773944 - ], - [ - -124.0774833, - 44.6773934 - ], - [ - -124.0774763, - 44.6773918 - ], - [ - -124.077468, - 44.6773895 - ], - [ - -124.0774586, - 44.6773863 - ], - [ - -124.0774477, - 44.6773821 - ], - [ - -124.0774355, - 44.6773765 - ], - [ - -124.0774218, - 44.6773696 - ], - [ - -124.0774069, - 44.6773612 - ], - [ - -124.0773994, - 44.6773567 - ], - [ - -124.0773861, - 44.6773482 - ], - [ - -124.0773736, - 44.6773397 - ], - [ - -124.0773657, - 44.677334 - ], - [ - -124.077356, - 44.6773263 - ], - [ - -124.0773509, - 44.6773217 - ], - [ - -124.0773454, - 44.6773165 - ], - [ - -124.0773397, - 44.6773103 - ], - [ - -124.0773339, - 44.6773031 - ], - [ - -124.0773311, - 44.6772991 - ], - [ - -124.0773285, - 44.6772948 - ], - [ - -124.0773261, - 44.67729 - ], - [ - -124.0773238, - 44.6772849 - ], - [ - -124.0773219, - 44.6772792 - ], - [ - -124.0773197, - 44.6772698 - ], - [ - -124.0773184, - 44.6772603 - ], - [ - -124.0773179, - 44.6772539 - ], - [ - -124.0773177, - 44.6772453 - ], - [ - -124.0773182, - 44.6772338 - ], - [ - -124.0773199, - 44.6772185 - ], - [ - -124.0773235, - 44.6771981 - ], - [ - -124.0773292, - 44.6771713 - ], - [ - -124.0773305, - 44.6771661 - ], - [ - -124.0773322, - 44.6771609 - ], - [ - -124.0773367, - 44.6771505 - ], - [ - -124.0773403, - 44.6771436 - ], - [ - -124.0773457, - 44.6771344 - ], - [ - -124.0773697, - 44.6770978 - ], - [ - -124.077376, - 44.6770875 - ], - [ - -124.077382, - 44.6770757 - ], - [ - -124.0773845, - 44.6770694 - ], - [ - -124.0773866, - 44.6770628 - ], - [ - -124.0773881, - 44.6770557 - ], - [ - -124.0773886, - 44.6770482 - ], - [ - -124.0773878, - 44.6770402 - ], - [ - -124.0773867, - 44.6770361 - ], - [ - -124.0773853, - 44.6770321 - ], - [ - -124.0773833, - 44.6770281 - ], - [ - -124.0773817, - 44.6770255 - ], - [ - -124.0773792, - 44.6770219 - ], - [ - -124.0773754, - 44.6770173 - ], - [ - -124.0773731, - 44.6770147 - ], - [ - -124.0773701, - 44.6770117 - ], - [ - -124.0773666, - 44.6770085 - ], - [ - -124.0773623, - 44.677005 - ], - [ - -124.0773572, - 44.6770012 - ], - [ - -124.0773511, - 44.6769972 - ], - [ - -124.0773478, - 44.6769953 - ], - [ - -124.0773442, - 44.6769935 - ], - [ - -124.0773405, - 44.6769917 - ], - [ - -124.0773365, - 44.67699 - ], - [ - -124.0773323, - 44.6769886 - ], - [ - -124.0773261, - 44.6769871 - ], - [ - -124.0773198, - 44.6769864 - ], - [ - -124.0773156, - 44.6769863 - ], - [ - -124.0773098, - 44.6769866 - ], - [ - -124.0773021, - 44.6769878 - ], - [ - -124.0772976, - 44.6769888 - ], - [ - -124.0772925, - 44.6769903 - ], - [ - -124.0772866, - 44.6769924 - ], - [ - -124.0772798, - 44.6769953 - ], - [ - -124.0772721, - 44.6769991 - ], - [ - -124.0772633, - 44.6770042 - ], - [ - -124.0772532, - 44.6770106 - ], - [ - -124.077242, - 44.6770187 - ], - [ - -124.0772294, - 44.6770288 - ], - [ - -124.0772156, - 44.6770408 - ], - [ - -124.0772008, - 44.6770546 - ], - [ - -124.0771934, - 44.6770618 - ], - [ - -124.0771859, - 44.6770692 - ], - [ - -124.0771784, - 44.6770771 - ], - [ - -124.0771715, - 44.6770852 - ], - [ - -124.0771593, - 44.6771015 - ], - [ - -124.0771521, - 44.6771125 - ], - [ - -124.0771434, - 44.6771273 - ], - [ - -124.0771329, - 44.6771471 - ], - [ - -124.0771192, - 44.6771735 - ], - [ - -124.0771108, - 44.6771883 - ], - [ - -124.0771002, - 44.6772051 - ], - [ - -124.0770939, - 44.6772138 - ], - [ - -124.0770865, - 44.677223 - ], - [ - -124.0770778, - 44.6772327 - ], - [ - -124.0770505, - 44.6772601 - ], - [ - -124.0770222, - 44.6772865 - ], - [ - -124.0770025, - 44.6773034 - ], - [ - -124.0769751, - 44.6773251 - ], - [ - -124.0769586, - 44.6773369 - ], - [ - -124.0769391, - 44.6773501 - ], - [ - -124.0769156, - 44.6773644 - ], - [ - -124.0768872, - 44.6773799 - ], - [ - -124.0768713, - 44.6773878 - ], - [ - -124.0768538, - 44.6773959 - ], - [ - -124.076842, - 44.6774006 - ], - [ - -124.0768299, - 44.6774048 - ], - [ - -124.0768216, - 44.6774072 - ], - [ - -124.0768103, - 44.67741 - ], - [ - -124.0767949, - 44.677413 - ], - [ - -124.076786, - 44.6774144 - ], - [ - -124.0767758, - 44.6774156 - ], - [ - -124.0767641, - 44.6774165 - ], - [ - -124.0767506, - 44.6774171 - ], - [ - -124.0767354, - 44.677417 - ], - [ - -124.0767182, - 44.677416 - ], - [ - -124.0767091, - 44.6774151 - ], - [ - -124.0766997, - 44.6774138 - ], - [ - -124.0766898, - 44.677412 - ], - [ - -124.0766795, - 44.6774098 - ], - [ - -124.0766585, - 44.6774044 - ], - [ - -124.0766377, - 44.6773982 - ], - [ - -124.0765966, - 44.6773843 - ], - [ - -124.0765695, - 44.677374 - ], - [ - -124.0764609, - 44.6773316 - ], - [ - -124.0764292, - 44.6773206 - ], - [ - -124.0763924, - 44.6773095 - ], - [ - -124.0763723, - 44.6773044 - ], - [ - -124.0763506, - 44.6772998 - ], - [ - -124.0761886, - 44.6772686 - ], - [ - -124.0760259, - 44.6772384 - ], - [ - -124.075917, - 44.6772196 - ], - [ - -124.0753588, - 44.6771288 - ], - [ - -124.0752129, - 44.6771051 - ], - [ - -124.0750667, - 44.6770826 - ], - [ - -124.0749688, - 44.6770696 - ], - [ - -124.0749125, - 44.6770633 - ], - [ - -124.0748479, - 44.6770573 - ], - [ - -124.0748124, - 44.6770555 - ], - [ - -124.0747769, - 44.6770557 - ], - [ - -124.0747217, - 44.6770591 - ], - [ - -124.0746797, - 44.6770636 - ], - [ - -124.0745118, - 44.6770869 - ], - [ - -124.0744637, - 44.6770919 - ], - [ - -124.074438, - 44.6770937 - ], - [ - -124.0739157, - 44.6771019 - ], - [ - -124.0738415, - 44.6771078 - ], - [ - -124.0737866, - 44.6771145 - ], - [ - -124.0737321, - 44.677123 - ], - [ - -124.0736961, - 44.6771298 - ], - [ - -124.0736485, - 44.67714 - ], - [ - -124.0735859, - 44.6771556 - ], - [ - -124.0735506, - 44.6771655 - ], - [ - -124.0735107, - 44.6771776 - ], - [ - -124.0734657, - 44.6771925 - ], - [ - -124.0734151, - 44.6772107 - ], - [ - -124.0733585, - 44.677233 - ], - [ - -124.072844, - 44.6774489 - ], - [ - -124.0723111, - 44.6776653 - ], - [ - -124.0722353, - 44.6776986 - ], - [ - -124.0721614, - 44.6777341 - ], - [ - -124.0721133, - 44.677759 - ], - [ - -124.0720507, - 44.6777937 - ], - [ - -124.07197, - 44.6778425 - ], - [ - -124.0719254, - 44.6778717 - ], - [ - -124.0718758, - 44.6779062 - ], - [ - -124.0718212, - 44.677947 - ], - [ - -124.0717613, - 44.6779954 - ], - [ - -124.0716966, - 44.6780529 - ], - [ - -124.0716223, - 44.6781238 - ], - [ - -124.07155, - 44.6781953 - ], - [ - -124.0714102, - 44.6783399 - ], - [ - -124.0713193, - 44.6784373 - ], - [ - -124.0711992, - 44.6785682 - ], - [ - -124.0709178, - 44.6788571 - ], - [ - -124.0708804, - 44.6788994 - ], - [ - -124.0708403, - 44.6789486 - ], - [ - -124.0707987, - 44.6790063 - ], - [ - -124.0707787, - 44.6790379 - ], - [ - -124.0707593, - 44.6790723 - ], - [ - -124.0705822, - 44.679407 - ], - [ - -124.0703701, - 44.6796893 - ], - [ - -124.0703612, - 44.6797001 - ], - [ - -124.0703514, - 44.6797105 - ], - [ - -124.0703444, - 44.6797172 - ], - [ - -124.0703347, - 44.679726 - ], - [ - -124.0702945, - 44.6797606 - ], - [ - -124.0702835, - 44.6797707 - ], - [ - -124.0702718, - 44.6797826 - ], - [ - -124.0702661, - 44.6797892 - ], - [ - -124.07025, - 44.6798105 - ], - [ - -124.0702364, - 44.6798327 - ], - [ - -124.0702285, - 44.6798479 - ], - [ - -124.0702189, - 44.6798686 - ], - [ - -124.0701855, - 44.679953 - ], - [ - -124.0701751, - 44.6799769 - ], - [ - -124.0701615, - 44.6800035 - ], - [ - -124.0701532, - 44.6800173 - ], - [ - -124.0701434, - 44.6800317 - ], - [ - -124.0701317, - 44.6800465 - ], - [ - -124.0701134, - 44.6800671 - ], - [ - -124.0700942, - 44.6800872 - ], - [ - -124.0700538, - 44.6801266 - ], - [ - -124.0699708, - 44.6802047 - ], - [ - -124.069948, - 44.6802274 - ], - [ - -124.069923, - 44.680254 - ], - [ - -124.0698637, - 44.6803188 - ], - [ - -124.0698053, - 44.6803839 - ], - [ - -124.069769, - 44.6804283 - ], - [ - -124.0697497, - 44.6804542 - ], - [ - -124.0697295, - 44.6804845 - ], - [ - -124.069709, - 44.68052 - ], - [ - -124.0696995, - 44.6805394 - ], - [ - -124.0696908, - 44.6805593 - ], - [ - -124.0696831, - 44.6805794 - ], - [ - -124.06967, - 44.6806198 - ], - [ - -124.0696625, - 44.680647 - ], - [ - -124.0696537, - 44.6806833 - ], - [ - -124.0696426, - 44.6807318 - ], - [ - -124.0696266, - 44.6807963 - ], - [ - -124.0696154, - 44.6808328 - ], - [ - -124.0695888, - 44.6809094 - ], - [ - -124.0695604, - 44.6809856 - ], - [ - -124.0695402, - 44.6810363 - ], - [ - -124.0695114, - 44.6811038 - ], - [ - -124.0695024, - 44.6811221 - ], - [ - -124.0694919, - 44.68114 - ], - [ - -124.0694841, - 44.6811517 - ], - [ - -124.0694729, - 44.6811669 - ], - [ - -124.0694567, - 44.6811869 - ], - [ - -124.0694333, - 44.6812127 - ], - [ - -124.0693997, - 44.6812462 - ], - [ - -124.0693534, - 44.6812896 - ], - [ - -124.0693453, - 44.6812961 - ], - [ - -124.069336, - 44.6813018 - ], - [ - -124.0693292, - 44.6813052 - ], - [ - -124.0693194, - 44.6813093 - ], - [ - -124.0693053, - 44.681314 - ], - [ - -124.0692852, - 44.6813194 - ], - [ - -124.069257, - 44.6813255 - ], - [ - -124.0692191, - 44.6813332 - ], - [ - -124.0691986, - 44.6813379 - ], - [ - -124.0691882, - 44.6813408 - ], - [ - -124.0691778, - 44.6813442 - ], - [ - -124.0691676, - 44.6813482 - ], - [ - -124.0691578, - 44.6813531 - ], - [ - -124.0691487, - 44.6813592 - ], - [ - -124.0691447, - 44.6813626 - ], - [ - -124.0691411, - 44.6813665 - ], - [ - -124.069138, - 44.6813708 - ], - [ - -124.0691354, - 44.6813756 - ], - [ - -124.0691334, - 44.681381 - ], - [ - -124.0691302, - 44.6813935 - ], - [ - -124.0691274, - 44.681406 - ], - [ - -124.0691229, - 44.681431 - ], - [ - -124.0691205, - 44.6814477 - ], - [ - -124.0691176, - 44.68147 - ], - [ - -124.0691141, - 44.6814997 - ], - [ - -124.0691115, - 44.6815268 - ], - [ - -124.0691097, - 44.681554 - ], - [ - -124.0691071, - 44.6816084 - ], - [ - -124.0691044, - 44.6816446 - ], - [ - -124.0691019, - 44.6816652 - ], - [ - -124.0690979, - 44.6816887 - ], - [ - -124.0690915, - 44.6817154 - ], - [ - -124.0690838, - 44.6817395 - ], - [ - -124.0690749, - 44.6817632 - ], - [ - -124.0690535, - 44.6818099 - ], - [ - -124.0690371, - 44.6818405 - ], - [ - -124.0690132, - 44.6818807 - ], - [ - -124.0689091, - 44.6820398 - ], - [ - -124.0688814, - 44.6820857 - ], - [ - -124.0688533, - 44.6821391 - ], - [ - -124.0686841, - 44.6824959 - ], - [ - -124.0686298, - 44.6826153 - ], - [ - -124.06838, - 44.683183 - ], - [ - -124.0681723, - 44.683634 - ], - [ - -124.0681556, - 44.6836738 - ], - [ - -124.0681402, - 44.6837138 - ], - [ - -124.0681125, - 44.6837943 - ], - [ - -124.0680958, - 44.6838484 - ], - [ - -124.0680346, - 44.6840653 - ], - [ - -124.0679315, - 44.6845526 - ], - [ - -124.0679186, - 44.6845917 - ], - [ - -124.0679028, - 44.6846302 - ], - [ - -124.0678909, - 44.6846556 - ], - [ - -124.0678735, - 44.6846891 - ], - [ - -124.0678482, - 44.6847332 - ], - [ - -124.067812, - 44.6847914 - ], - [ - -124.0677618, - 44.6848682 - ], - [ - -124.067751, - 44.6848826 - ], - [ - -124.0677385, - 44.6848963 - ], - [ - -124.0677294, - 44.684905 - ], - [ - -124.0677164, - 44.6849164 - ], - [ - -124.0676607, - 44.6849603 - ], - [ - -124.0676452, - 44.6849731 - ], - [ - -124.0676307, - 44.6849864 - ], - [ - -124.0676206, - 44.6849965 - ], - [ - -124.0676127, - 44.6850057 - ], - [ - -124.067605, - 44.6850158 - ], - [ - -124.067598, - 44.6850272 - ], - [ - -124.0675921, - 44.6850399 - ], - [ - -124.0675877, - 44.6850517 - ], - [ - -124.0675839, - 44.6850635 - ], - [ - -124.0675779, - 44.6850871 - ], - [ - -124.0675749, - 44.6851028 - ], - [ - -124.067572, - 44.6851238 - ], - [ - -124.0675698, - 44.6851518 - ], - [ - -124.0675689, - 44.6851892 - ], - [ - -124.0675696, - 44.6852391 - ], - [ - -124.067572, - 44.6852745 - ], - [ - -124.0675766, - 44.6853066 - ], - [ - -124.0675909, - 44.6853808 - ], - [ - -124.067599, - 44.6854279 - ], - [ - -124.067602, - 44.6854549 - ], - [ - -124.0676031, - 44.6854856 - ], - [ - -124.0676025, - 44.685502 - ], - [ - -124.0676007, - 44.6855195 - ], - [ - -124.0675974, - 44.6855381 - ], - [ - -124.0675909, - 44.6855647 - ], - [ - -124.0675834, - 44.685591 - ], - [ - -124.067578, - 44.6856084 - ], - [ - -124.0675703, - 44.6856317 - ], - [ - -124.0675596, - 44.6856626 - ], - [ - -124.0674509, - 44.685959 - ], - [ - -124.0674174, - 44.6860583 - ], - [ - -124.0673997, - 44.6861167 - ], - [ - -124.0673832, - 44.6861754 - ], - [ - -124.0673514, - 44.6862929 - ], - [ - -124.0673295, - 44.686371 - ], - [ - -124.067313, - 44.6864231 - ], - [ - -124.0672947, - 44.6864749 - ], - [ - -124.0672567, - 44.6865784 - ], - [ - -124.0672332, - 44.6866477 - ], - [ - -124.0672215, - 44.6866875 - ], - [ - -124.0672103, - 44.6867334 - ], - [ - -124.0672025, - 44.6867749 - ], - [ - -124.0671967, - 44.6868166 - ], - [ - -124.067189, - 44.6869002 - ], - [ - -124.0671779, - 44.6870677 - ], - [ - -124.0671727, - 44.6871154 - ], - [ - -124.0671509, - 44.6872718 - ], - [ - -124.0671271, - 44.6874282 - ], - [ - -124.0671199, - 44.6874729 - ], - [ - -124.0671115, - 44.6875173 - ], - [ - -124.067105, - 44.6875467 - ], - [ - -124.0670945, - 44.6875859 - ], - [ - -124.0670876, - 44.6876083 - ], - [ - -124.0670785, - 44.6876338 - ], - [ - -124.0670666, - 44.687663 - ], - [ - -124.0670507, - 44.6876964 - ], - [ - -124.0670442, - 44.6877073 - ], - [ - -124.0670363, - 44.6877175 - ], - [ - -124.0670303, - 44.6877239 - ], - [ - -124.0670216, - 44.6877321 - ], - [ - -124.0670086, - 44.6877422 - ], - [ - -124.0670007, - 44.6877477 - ], - [ - -124.0669911, - 44.6877537 - ], - [ - -124.0669797, - 44.6877603 - ], - [ - -124.066966, - 44.6877673 - ], - [ - -124.0669499, - 44.687775 - ], - [ - -124.066931, - 44.6877832 - ], - [ - -124.0669091, - 44.6877921 - ], - [ - -124.0668843, - 44.6878018 - ], - [ - -124.0668793, - 44.6878034 - ], - [ - -124.0668742, - 44.6878045 - ], - [ - -124.0668707, - 44.687805 - ], - [ - -124.0668659, - 44.6878053 - ], - [ - -124.0668593, - 44.6878053 - ], - [ - -124.0668504, - 44.6878045 - ], - [ - -124.0668452, - 44.6878039 - ], - [ - -124.0668311, - 44.6878014 - ], - [ - -124.0668122, - 44.6877979 - ], - [ - -124.0668015, - 44.6877964 - ], - [ - -124.0667959, - 44.6877959 - ], - [ - -124.06679, - 44.6877956 - ], - [ - -124.0667838, - 44.6877957 - ], - [ - -124.0667774, - 44.6877964 - ], - [ - -124.0667741, - 44.687797 - ], - [ - -124.0667708, - 44.6877979 - ], - [ - -124.0667675, - 44.687799 - ], - [ - -124.0667641, - 44.6878003 - ], - [ - -124.0667608, - 44.687802 - ], - [ - -124.0667517, - 44.6878073 - ], - [ - -124.0667428, - 44.6878128 - ], - [ - -124.0667372, - 44.6878167 - ], - [ - -124.0667301, - 44.687822 - ], - [ - -124.0667263, - 44.6878251 - ], - [ - -124.0667223, - 44.6878288 - ], - [ - -124.0667181, - 44.6878331 - ], - [ - -124.066714, - 44.6878381 - ], - [ - -124.0667121, - 44.6878408 - ], - [ - -124.0667103, - 44.6878438 - ], - [ - -124.0667088, - 44.687847 - ], - [ - -124.0667075, - 44.6878505 - ], - [ - -124.0667065, - 44.6878542 - ], - [ - -124.0667061, - 44.6878583 - ], - [ - -124.0667063, - 44.6878628 - ], - [ - -124.0667129, - 44.6879085 - ], - [ - -124.0667208, - 44.6879542 - ], - [ - -124.0667383, - 44.6880455 - ], - [ - -124.0667714, - 44.6881944 - ], - [ - -124.0667809, - 44.6882441 - ], - [ - -124.0667852, - 44.6882725 - ], - [ - -124.0667868, - 44.688293 - ], - [ - -124.0667865, - 44.6883134 - ], - [ - -124.0667853, - 44.688327 - ], - [ - -124.0667826, - 44.6883451 - ], - [ - -124.0667773, - 44.6883693 - ], - [ - -124.0667679, - 44.6884014 - ], - [ - -124.0667204, - 44.6885296 - ], - [ - -124.0667162, - 44.6885409 - ], - [ - -124.0667115, - 44.6885522 - ], - [ - -124.0667008, - 44.6885744 - ], - [ - -124.066677, - 44.6886182 - ], - [ - -124.0666618, - 44.6886474 - ], - [ - -124.0666541, - 44.6886642 - ], - [ - -124.0666468, - 44.6886837 - ], - [ - -124.0666438, - 44.6886942 - ], - [ - -124.0666413, - 44.6887055 - ], - [ - -124.0666395, - 44.6887178 - ], - [ - -124.0666385, - 44.6887311 - ], - [ - -124.066638, - 44.6887445 - ], - [ - -124.0666385, - 44.6887713 - ], - [ - -124.0666421, - 44.6888249 - ], - [ - -124.066644, - 44.6888606 - ], - [ - -124.066644, - 44.688881 - ], - [ - -124.0666422, - 44.688926 - ], - [ - -124.0666393, - 44.6889709 - ], - [ - -124.0666336, - 44.6890609 - ], - [ - -124.0666322, - 44.6891209 - ], - [ - -124.066633, - 44.6891551 - ], - [ - -124.0666359, - 44.6892023 - ], - [ - -124.0666398, - 44.6892495 - ], - [ - -124.0666485, - 44.6893439 - ], - [ - -124.0666534, - 44.6894068 - ], - [ - -124.0666586, - 44.6894898 - ], - [ - -124.0666632, - 44.6895727 - ], - [ - -124.0666653, - 44.6896281 - ], - [ - -124.0666664, - 44.6897 - ], - [ - -124.0666655, - 44.6897855 - ], - [ - -124.0666628, - 44.6899159 - ], - [ - -124.0666622, - 44.6900246 - ], - [ - -124.0666598, - 44.6901558 - ], - [ - -124.0666544, - 44.6902357 - ], - [ - -124.0666491, - 44.6902814 - ], - [ - -124.0666405, - 44.6903335 - ], - [ - -124.0666322, - 44.6903697 - ], - [ - -124.0666217, - 44.6904054 - ], - [ - -124.0666137, - 44.6904291 - ], - [ - -124.0666022, - 44.6904605 - ], - [ - -124.0665524, - 44.6905855 - ], - [ - -124.0665088, - 44.6907025 - ], - [ - -124.0664641, - 44.6908191 - ], - [ - -124.0664309, - 44.6908961 - ], - [ - -124.06641, - 44.6909398 - ], - [ - -124.0663965, - 44.6909658 - ], - [ - -124.0663823, - 44.6909917 - ], - [ - -124.0663526, - 44.6910428 - ], - [ - -124.0662908, - 44.6911445 - ], - [ - -124.0660047, - 44.6915944 - ], - [ - -124.0659672, - 44.6916598 - ], - [ - -124.0659492, - 44.691694 - ], - [ - -124.0659327, - 44.6917286 - ], - [ - -124.0659033, - 44.6917986 - ], - [ - -124.0658856, - 44.6918457 - ], - [ - -124.065819, - 44.6920351 - ], - [ - -124.065798, - 44.6920888 - ], - [ - -124.0657711, - 44.6921494 - ], - [ - -124.0656173, - 44.6924623 - ], - [ - -124.0655386, - 44.6926308 - ], - [ - -124.0654625, - 44.6927999 - ], - [ - -124.0654134, - 44.6929132 - ], - [ - -124.0653861, - 44.692979 - ], - [ - -124.0653608, - 44.6930452 - ], - [ - -124.0653454, - 44.6930896 - ], - [ - -124.0653274, - 44.6931491 - ], - [ - -124.0653185, - 44.6931833 - ], - [ - -124.0653099, - 44.6932225 - ], - [ - -124.0653022, - 44.6932676 - ], - [ - -124.0652378, - 44.6937213 - ], - [ - -124.0651927, - 44.6940423 - ], - [ - -124.0651881, - 44.6940828 - ], - [ - -124.0651852, - 44.6941234 - ], - [ - -124.0651837, - 44.6942046 - ], - [ - -124.065189, - 44.6943644 - ], - [ - -124.0651914, - 44.6944759 - ], - [ - -124.0651898, - 44.6945378 - ], - [ - -124.0651764, - 44.6947465 - ], - [ - -124.0651573, - 44.694955 - ], - [ - -124.0651409, - 44.695094 - ], - [ - -124.0651289, - 44.6951821 - ], - [ - -124.065115, - 44.6952699 - ], - [ - -124.0651042, - 44.6953284 - ], - [ - -124.0650871, - 44.695406 - ], - [ - -124.0650758, - 44.6954501 - ], - [ - -124.0650613, - 44.6955004 - ], - [ - -124.0650438, - 44.6955562 - ], - [ - -124.0648906, - 44.6955568 - ], - [ - -124.0627989, - 44.6955646 - ], - [ - -124.0629488, - 44.6947835 - ], - [ - -124.0631386, - 44.6948024 - ], - [ - -124.0632425, - 44.6942723 - ], - [ - -124.0628997, - 44.6942383 - ], - [ - -124.0631673, - 44.6928704 - ], - [ - -124.0633237, - 44.6920705 - ], - [ - -124.0634286, - 44.6915256 - ], - [ - -124.0635318, - 44.690986 - ], - [ - -124.0630662, - 44.6909866 - ], - [ - -124.0628682, - 44.6920181 - ], - [ - -124.0628419, - 44.692145 - ], - [ - -124.0627888, - 44.6924169 - ], - [ - -124.0626897, - 44.6929287 - ], - [ - -124.062573, - 44.6935317 - ], - [ - -124.0625099, - 44.6938477 - ], - [ - -124.0624457, - 44.6941795 - ], - [ - -124.0622928, - 44.6941647 - ], - [ - -124.0622214, - 44.6945356 - ], - [ - -124.0621528, - 44.6948885 - ], - [ - -124.062087, - 44.6952255 - ], - [ - -124.0620195, - 44.6955678 - ], - [ - -124.0607227, - 44.6955726 - ], - [ - -124.0607219, - 44.6955908 - ], - [ - -124.060586, - 44.6991531 - ], - [ - -124.0543888, - 44.6991649 - ], - [ - -124.0544975, - 44.6963438 - ], - [ - -124.0556176, - 44.6963408 - ], - [ - -124.0556464, - 44.6955916 - ], - [ - -124.0556814, - 44.693851 - ], - [ - -124.0556801, - 44.692802 - ], - [ - -124.0608752, - 44.6928723 - ], - [ - -124.0609229, - 44.6920872 - ], - [ - -124.0595765, - 44.6920695 - ], - [ - -124.0572013, - 44.6920356 - ], - [ - -124.0572139, - 44.6901816 - ], - [ - -124.0571853, - 44.690187 - ], - [ - -124.0569565, - 44.6902198 - ], - [ - -124.0569316, - 44.6902233 - ], - [ - -124.0568041, - 44.6902468 - ], - [ - -124.0566791, - 44.6902795 - ], - [ - -124.0565699, - 44.6903182 - ], - [ - -124.0548564, - 44.6903185 - ], - [ - -124.0543046, - 44.6903187 - ], - [ - -124.0543034, - 44.6899827 - ], - [ - -124.0548632, - 44.6896449 - ], - [ - -124.0548784, - 44.6882324 - ], - [ - -124.0521876, - 44.6882263 - ], - [ - -124.0522576, - 44.6811543 - ], - [ - -124.0530428, - 44.6811561 - ], - [ - -124.0538662, - 44.6811581 - ], - [ - -124.053867, - 44.6793873 - ], - [ - -124.0538854, - 44.6766304 - ], - [ - -124.0569895, - 44.6766405 - ], - [ - -124.0569932, - 44.6760456 - ], - [ - -124.0573319, - 44.6760464 - ], - [ - -124.0573666, - 44.6705331 - ], - [ - -124.0573672, - 44.6702924 - ], - [ - -124.0573734, - 44.6693033 - ], - [ - -124.057375, - 44.6690802 - ], - [ - -124.0573794, - 44.6689324 - ], - [ - -124.0573764, - 44.6689253 - ], - [ - -124.0572031, - 44.6685138 - ], - [ - -124.0568033, - 44.6686063 - ], - [ - -124.0563464, - 44.6687023 - ], - [ - -124.0559888, - 44.6678479 - ], - [ - -124.0557626, - 44.6672978 - ], - [ - -124.0558728, - 44.6672748 - ], - [ - -124.0547511, - 44.6646225 - ], - [ - -124.054396, - 44.6646987 - ], - [ - -124.052542, - 44.6652973 - ], - [ - -124.0517759, - 44.6653529 - ], - [ - -124.0507118, - 44.6656899 - ], - [ - -124.0503519, - 44.6658455 - ], - [ - -124.0499791, - 44.6659755 - ], - [ - -124.0494619, - 44.6661998 - ], - [ - -124.0492616, - 44.6666028 - ], - [ - -124.0496024, - 44.6669499 - ], - [ - -124.0492262, - 44.6670868 - ], - [ - -124.049192, - 44.6671898 - ], - [ - -124.0493764, - 44.6674961 - ], - [ - -124.0499453, - 44.6672997 - ], - [ - -124.0504438, - 44.6678981 - ], - [ - -124.0501871, - 44.6679455 - ], - [ - -124.0509074, - 44.6702704 - ], - [ - -124.0472013, - 44.6702574 - ], - [ - -124.0471937, - 44.6666336 - ], - [ - -124.0471237, - 44.6593112 - ], - [ - -124.0466641, - 44.6593123 - ], - [ - -124.0412752, - 44.6593229 - ], - [ - -124.0413266, - 44.6575506 - ], - [ - -124.0413097, - 44.6575703 - ], - [ - -124.0412817, - 44.6576019 - ], - [ - -124.0412525, - 44.6576336 - ], - [ - -124.0412217, - 44.6576649 - ], - [ - -124.0411898, - 44.6576956 - ], - [ - -124.0411568, - 44.6577256 - ], - [ - -124.0411229, - 44.6577548 - ], - [ - -124.0411051, - 44.6577695 - ], - [ - -124.0410866, - 44.6577843 - ], - [ - -124.0410496, - 44.6578125 - ], - [ - -124.041028, - 44.6578277 - ], - [ - -124.0409851, - 44.6578549 - ], - [ - -124.0409401, - 44.6578798 - ], - [ - -124.0409148, - 44.6578925 - ], - [ - -124.0408892, - 44.6579039 - ], - [ - -124.0408631, - 44.6579147 - ], - [ - -124.0408364, - 44.6579245 - ], - [ - -124.0408085, - 44.6579339 - ], - [ - -124.0407803, - 44.6579419 - ], - [ - -124.0407514, - 44.6579495 - ], - [ - -124.04072, - 44.6579559 - ], - [ - -124.0406756, - 44.6579631 - ], - [ - -124.0406174, - 44.6579692 - ], - [ - -124.040584, - 44.657971 - ], - [ - -124.0405238, - 44.657971 - ], - [ - -124.0404637, - 44.6579671 - ], - [ - -124.0404323, - 44.6579631 - ], - [ - -124.0404038, - 44.6579588 - ], - [ - -124.0403753, - 44.6579538 - ], - [ - -124.0403477, - 44.6579481 - ], - [ - -124.0402988, - 44.6579373 - ], - [ - -124.0402763, - 44.6579324 - ], - [ - -124.0402544, - 44.657928 - ], - [ - -124.0402338, - 44.6579242 - ], - [ - -124.0402144, - 44.6579213 - ], - [ - -124.0401946, - 44.657919 - ], - [ - -124.0401777, - 44.6579175 - ], - [ - -124.0401611, - 44.6579173 - ], - [ - -124.0401436, - 44.6579176 - ], - [ - -124.0401137, - 44.65792 - ], - [ - -124.0400931, - 44.6579224 - ], - [ - -124.0400711, - 44.6579253 - ], - [ - -124.0400484, - 44.6579288 - ], - [ - -124.0400255, - 44.6579324 - ], - [ - -124.0400029, - 44.6579364 - ], - [ - -124.0399796, - 44.6579407 - ], - [ - -124.0399566, - 44.6579451 - ], - [ - -124.0399336, - 44.6579497 - ], - [ - -124.0399105, - 44.6579545 - ], - [ - -124.0398878, - 44.6579595 - ], - [ - -124.039865, - 44.6579647 - ], - [ - -124.0398423, - 44.65797 - ], - [ - -124.0398199, - 44.6579756 - ], - [ - -124.0397976, - 44.6579813 - ], - [ - -124.0397753, - 44.6579872 - ], - [ - -124.0397533, - 44.6579933 - ], - [ - -124.0397314, - 44.6579997 - ], - [ - -124.0397102, - 44.658006 - ], - [ - -124.0396675, - 44.6580198 - ], - [ - -124.0396253, - 44.6580346 - ], - [ - -124.039583, - 44.6580506 - ], - [ - -124.0395682, - 44.6580564 - ], - [ - -124.0395401, - 44.6580674 - ], - [ - -124.0394967, - 44.6580848 - ], - [ - -124.0394532, - 44.6581024 - ], - [ - -124.0394095, - 44.6581201 - ], - [ - -124.0393002, - 44.6581647 - ], - [ - -124.0392567, - 44.6581824 - ], - [ - -124.0391922, - 44.6582091 - ], - [ - -124.0391498, - 44.6582271 - ], - [ - -124.0391288, - 44.6582362 - ], - [ - -124.0391078, - 44.6582453 - ], - [ - -124.0390873, - 44.6582544 - ], - [ - -124.0390671, - 44.6582636 - ], - [ - -124.0390474, - 44.6582727 - ], - [ - -124.0390277, - 44.6582823 - ], - [ - -124.0389895, - 44.6583017 - ], - [ - -124.0389716, - 44.6583112 - ], - [ - -124.0389534, - 44.6583215 - ], - [ - -124.0389351, - 44.6583319 - ], - [ - -124.0389172, - 44.6583427 - ], - [ - -124.0388989, - 44.6583538 - ], - [ - -124.038881, - 44.658365 - ], - [ - -124.0388633, - 44.6583762 - ], - [ - -124.038846, - 44.6583876 - ], - [ - -124.0388291, - 44.6583991 - ], - [ - -124.0387948, - 44.6584233 - ], - [ - -124.0387784, - 44.6584352 - ], - [ - -124.038762, - 44.6584475 - ], - [ - -124.0387283, - 44.6584733 - ], - [ - -124.0386948, - 44.6584993 - ], - [ - -124.0386613, - 44.6585258 - ], - [ - -124.0386447, - 44.658539 - ], - [ - -124.0386113, - 44.6585656 - ], - [ - -124.0385781, - 44.6585922 - ], - [ - -124.038545, - 44.6586191 - ], - [ - -124.0385282, - 44.6586328 - ], - [ - -124.0385111, - 44.6586466 - ], - [ - -124.0384768, - 44.6586738 - ], - [ - -124.0384591, - 44.6586876 - ], - [ - -124.0384238, - 44.6587146 - ], - [ - -124.0384055, - 44.6587283 - ], - [ - -124.0383872, - 44.6587417 - ], - [ - -124.0383682, - 44.6587554 - ], - [ - -124.03833, - 44.6587817 - ], - [ - -124.0383099, - 44.6587949 - ], - [ - -124.0382895, - 44.658808 - ], - [ - -124.038249, - 44.6588326 - ], - [ - -124.0382276, - 44.6588451 - ], - [ - -124.0382059, - 44.6588571 - ], - [ - -124.0381835, - 44.6588692 - ], - [ - -124.0381599, - 44.658881 - ], - [ - -124.0381362, - 44.6588922 - ], - [ - -124.0381125, - 44.6589027 - ], - [ - -124.0380887, - 44.6589128 - ], - [ - -124.0380652, - 44.6589223 - ], - [ - -124.0380415, - 44.6589316 - ], - [ - -124.038018, - 44.6589404 - ], - [ - -124.0379951, - 44.6589489 - ], - [ - -124.0379721, - 44.6589574 - ], - [ - -124.0379641, - 44.6589602 - ], - [ - -124.0379669, - 44.6593387 - ], - [ - -124.0378132, - 44.659339 - ], - [ - -124.0376817, - 44.6594337 - ], - [ - -124.0377302, - 44.6594835 - ], - [ - -124.0380705, - 44.6598327 - ], - [ - -124.038398, - 44.6598164 - ], - [ - -124.0385684, - 44.6600661 - ], - [ - -124.0380403, - 44.6604237 - ], - [ - -124.0373254, - 44.6596902 - ], - [ - -124.0370491, - 44.6598891 - ], - [ - -124.0370555, - 44.6606545 - ], - [ - -124.0272345, - 44.6607196 - ], - [ - -124.0272256, - 44.6616303 - ], - [ - -124.0268463, - 44.6616326 - ], - [ - -124.0268214, - 44.6629782 - ], - [ - -124.0267546, - 44.6665967 - ], - [ - -124.0240385, - 44.6665819 - ], - [ - -124.0218657, - 44.6665701 - ], - [ - -124.0219909, - 44.6595599 - ], - [ - -124.0194708, - 44.658917 - ], - [ - -124.0181971, - 44.6608633 - ], - [ - -124.0170122, - 44.660863 - ], - [ - -124.0170217, - 44.6593393 - ], - [ - -124.0170364, - 44.6569857 - ], - [ - -124.0154744, - 44.6565504 - ], - [ - -124.0153613, - 44.6565472 - ], - [ - -124.0149906, - 44.6562393 - ], - [ - -124.0140327, - 44.6562303 - ], - [ - -124.0135828, - 44.6560918 - ], - [ - -124.0131617, - 44.656127 - ], - [ - -124.0130597, - 44.6567379 - ], - [ - -124.0127962, - 44.657248 - ], - [ - -124.0121266, - 44.6575469 - ], - [ - -124.0121271, - 44.657442 - ], - [ - -124.0121699, - 44.6571766 - ], - [ - -124.0121281, - 44.6572069 - ], - [ - -124.0121344, - 44.6557523 - ], - [ - -124.0121346, - 44.6556975 - ], - [ - -124.0127825, - 44.6557001 - ], - [ - -124.0127824, - 44.655724 - ], - [ - -124.0134508, - 44.6553628 - ], - [ - -124.0135328, - 44.6548974 - ], - [ - -124.0138327, - 44.6548493 - ], - [ - -124.013892, - 44.6553219 - ], - [ - -124.014773, - 44.655763 - ], - [ - -124.017044, - 44.6557721 - ], - [ - -124.0219689, - 44.6557916 - ], - [ - -124.0268938, - 44.655811 - ], - [ - -124.0306983, - 44.6557939 - ], - [ - -124.0370149, - 44.6557653 - ], - [ - -124.0405365, - 44.6557492 - ], - [ - -124.0405361, - 44.6539517 - ], - [ - -124.0407899, - 44.6539517 - ], - [ - -124.0420579, - 44.6539515 - ], - [ - -124.0438333, - 44.6539512 - ], - [ - -124.043822, - 44.6521317 - ], - [ - -124.0428396, - 44.6521386 - ], - [ - -124.0426035, - 44.6484754 - ], - [ - -124.0417331, - 44.6484777 - ], - [ - -124.0416204, - 44.6487914 - ], - [ - -124.0362624, - 44.6488204 - ], - [ - -124.0309025, - 44.6488493 - ], - [ - -124.0310251, - 44.6480862 - ], - [ - -124.0313005, - 44.6463674 - ], - [ - -124.0314698, - 44.6453015 - ], - [ - -124.0355531, - 44.6452831 - ], - [ - -124.035552, - 44.6446066 - ], - [ - -124.0348694, - 44.6446073 - ], - [ - -124.0348655, - 44.6417839 - ], - [ - -124.0343636, - 44.6417845 - ], - [ - -124.0339041, - 44.6417849 - ], - [ - -124.0338137, - 44.641785 - ], - [ - -124.0337368, - 44.6417849 - ], - [ - -124.0320332, - 44.6417862 - ], - [ - -124.0320414, - 44.6417331 - ], - [ - -124.0320919, - 44.6414253 - ], - [ - -124.0315659, - 44.6410327 - ], - [ - -124.0307851, - 44.6410302 - ], - [ - -124.030175, - 44.6406446 - ], - [ - -124.0302209, - 44.640577 - ], - [ - -124.0302273, - 44.6399915 - ], - [ - -124.0298191, - 44.6399828 - ], - [ - -124.0298453, - 44.639971 - ], - [ - -124.0299386, - 44.6398614 - ], - [ - -124.0301568, - 44.6394682 - ], - [ - -124.0303992, - 44.6396269 - ], - [ - -124.0305202, - 44.6396561 - ], - [ - -124.0306253, - 44.6396457 - ], - [ - -124.0307888, - 44.6395837 - ], - [ - -124.0310147, - 44.6394724 - ], - [ - -124.0311247, - 44.6393859 - ], - [ - -124.0311721, - 44.6393127 - ], - [ - -124.0326102, - 44.63956 - ], - [ - -124.0326108, - 44.6394443 - ], - [ - -124.0331356, - 44.6394443 - ], - [ - -124.0334145, - 44.6394439 - ], - [ - -124.0334135, - 44.6398366 - ], - [ - -124.0337193, - 44.6398369 - ], - [ - -124.0337353, - 44.6398374 - ], - [ - -124.0337351, - 44.6397186 - ], - [ - -124.03486, - 44.6397184 - ], - [ - -124.0348597, - 44.6396827 - ], - [ - -124.0348603, - 44.6394403 - ], - [ - -124.0397838, - 44.6394268 - ], - [ - -124.0397851, - 44.6394188 - ], - [ - -124.0399736, - 44.6394192 - ], - [ - -124.0399742, - 44.6390543 - ], - [ - -124.0397819, - 44.6390544 - ], - [ - -124.0397821, - 44.6381475 - ], - [ - -124.0377715, - 44.6381524 - ], - [ - -124.0377659, - 44.637911 - ], - [ - -124.0377004, - 44.6379089 - ], - [ - -124.0376597, - 44.6379026 - ], - [ - -124.0376323, - 44.6378955 - ], - [ - -124.0376087, - 44.6378873 - ], - [ - -124.0375791, - 44.6378745 - ], - [ - -124.0375532, - 44.6378595 - ], - [ - -124.0375311, - 44.6378441 - ], - [ - -124.0375148, - 44.6378291 - ], - [ - -124.0375025, - 44.6378158 - ], - [ - -124.0374919, - 44.6378017 - ], - [ - -124.0374813, - 44.6377845 - ], - [ - -124.0374237, - 44.637661 - ], - [ - -124.037413, - 44.6376435 - ], - [ - -124.0373982, - 44.6376213 - ], - [ - -124.0373836, - 44.6376025 - ], - [ - -124.0373671, - 44.6375838 - ], - [ - -124.0373405, - 44.6375568 - ], - [ - -124.0373078, - 44.6375269 - ], - [ - -124.0372795, - 44.6375048 - ], - [ - -124.0372434, - 44.6374795 - ], - [ - -124.0372035, - 44.637456 - ], - [ - -124.0371718, - 44.6374401 - ], - [ - -124.0371342, - 44.6374224 - ], - [ - -124.037081, - 44.6374021 - ], - [ - -124.0370241, - 44.637385 - ], - [ - -124.0369812, - 44.6373746 - ], - [ - -124.0369442, - 44.6373675 - ], - [ - -124.0369034, - 44.6373612 - ], - [ - -124.0368648, - 44.6373573 - ], - [ - -124.0368281, - 44.6373546 - ], - [ - -124.0368418, - 44.6364813 - ], - [ - -124.037766, - 44.6365026 - ], - [ - -124.0377068, - 44.6358509 - ], - [ - -124.0363646, - 44.6358174 - ], - [ - -124.0363616, - 44.6352978 - ], - [ - -124.0353216, - 44.6353003 - ], - [ - -124.0353229, - 44.6350397 - ], - [ - -124.0353273, - 44.6346105 - ], - [ - -124.0353271, - 44.6345425 - ], - [ - -124.0346623, - 44.6345458 - ], - [ - -124.0346613, - 44.6346282 - ], - [ - -124.0346537, - 44.6351629 - ], - [ - -124.0340612, - 44.6351581 - ], - [ - -124.0340708, - 44.6346234 - ], - [ - -124.0340712, - 44.6345487 - ], - [ - -124.0335895, - 44.634551 - ], - [ - -124.0335863, - 44.633496 - ], - [ - -124.0325848, - 44.6334986 - ], - [ - -124.0326027, - 44.6310949 - ], - [ - -124.0299787, - 44.6311114 - ], - [ - -124.0300761, - 44.633707 - ], - [ - -124.0310652, - 44.633706 - ], - [ - -124.0310753, - 44.6346323 - ], - [ - -124.0284322, - 44.6346167 - ], - [ - -124.0275999, - 44.6342386 - ], - [ - -124.0271011, - 44.6340175 - ], - [ - -124.0269929, - 44.6327988 - ] - ] - ] - } - }, - { - "id": "area_272", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0090805, - 45.0239254 - ], - [ - -124.0083172, - 45.0237164 - ], - [ - -124.0083328, - 45.0237952 - ], - [ - -124.0082493, - 45.0238718 - ], - [ - -124.0081378, - 45.0239374 - ], - [ - -124.0080998, - 45.0238785 - ], - [ - -124.0078721, - 45.0235267 - ], - [ - -124.0077542, - 45.0231876 - ], - [ - -124.0077432, - 45.0231562 - ], - [ - -124.007849, - 45.0231264 - ], - [ - -124.007902, - 45.0231037 - ], - [ - -124.0078052, - 45.0229854 - ], - [ - -124.0078297, - 45.0229698 - ], - [ - -124.0078512, - 45.0228668 - ], - [ - -124.0078059, - 45.0228538 - ], - [ - -124.0073414, - 45.0227205 - ], - [ - -124.0073186, - 45.0227045 - ], - [ - -124.0072648, - 45.0224401 - ], - [ - -124.0067411, - 45.0223699 - ], - [ - -124.0067239, - 45.0223416 - ], - [ - -124.0069235, - 45.0222128 - ], - [ - -124.0068194, - 45.0221317 - ], - [ - -124.0068923, - 45.0220846 - ], - [ - -124.0069044, - 45.022001 - ], - [ - -124.0069193, - 45.021898 - ], - [ - -124.0069253, - 45.021857 - ], - [ - -124.0065346, - 45.0218699 - ], - [ - -124.0065405, - 45.0218292 - ], - [ - -124.0065612, - 45.0216859 - ], - [ - -124.0065879, - 45.0215018 - ], - [ - -124.0066146, - 45.0213176 - ], - [ - -124.0066412, - 45.0211332 - ], - [ - -124.0066592, - 45.0210094 - ], - [ - -124.0066614, - 45.0209941 - ], - [ - -124.0066851, - 45.0208303 - ], - [ - -124.0068731, - 45.020815 - ], - [ - -124.0068602, - 45.0206336 - ], - [ - -124.0068363, - 45.0202974 - ], - [ - -124.0067922, - 45.0202059 - ], - [ - -124.0067615, - 45.0201108 - ], - [ - -124.0067611, - 45.0201088 - ], - [ - -124.0067607, - 45.0201068 - ], - [ - -124.0067603, - 45.0201049 - ], - [ - -124.0067599, - 45.020103 - ], - [ - -124.0067594, - 45.020101 - ], - [ - -124.006759, - 45.0200991 - ], - [ - -124.0067586, - 45.0200972 - ], - [ - -124.0067582, - 45.0200952 - ], - [ - -124.0067578, - 45.0200933 - ], - [ - -124.0067574, - 45.0200914 - ], - [ - -124.006757, - 45.0200894 - ], - [ - -124.0067566, - 45.0200875 - ], - [ - -124.0067561, - 45.0200856 - ], - [ - -124.0067557, - 45.0200836 - ], - [ - -124.0067553, - 45.0200817 - ], - [ - -124.0067549, - 45.0200798 - ], - [ - -124.0067545, - 45.0200778 - ], - [ - -124.0067541, - 45.0200759 - ], - [ - -124.0067537, - 45.020074 - ], - [ - -124.0067532, - 45.020072 - ], - [ - -124.0067528, - 45.0200701 - ], - [ - -124.0067332, - 45.0199622 - ], - [ - -124.0067077, - 45.0198261 - ], - [ - -124.0066825, - 45.0196901 - ], - [ - -124.0066574, - 45.0195542 - ], - [ - -124.0066323, - 45.0194182 - ], - [ - -124.0066082, - 45.0192876 - ], - [ - -124.0065595, - 45.0191605 - ], - [ - -124.0065088, - 45.0190281 - ], - [ - -124.0064878, - 45.018973 - ], - [ - -124.0064582, - 45.0188957 - ], - [ - -124.0068291, - 45.0188243 - ], - [ - -124.0068314, - 45.0188239 - ], - [ - -124.0066041, - 45.0182391 - ], - [ - -124.0061604, - 45.0176441 - ], - [ - -124.0058226, - 45.0162651 - ], - [ - -124.0057813, - 45.0160965 - ], - [ - -124.0045632, - 45.0160969 - ], - [ - -124.0045643, - 45.0159446 - ], - [ - -124.0045367, - 45.0159411 - ], - [ - -124.0045348, - 45.0154158 - ], - [ - -124.0030417, - 45.0154169 - ], - [ - -124.0030384, - 45.0160418 - ], - [ - -124.0030381, - 45.0160979 - ], - [ - -124.003037, - 45.0163177 - ], - [ - -124.0045684, - 45.0163211 - ], - [ - -124.0046592, - 45.0196434 - ], - [ - -124.0021219, - 45.0196451 - ], - [ - -123.9995845, - 45.0196468 - ], - [ - -123.9996135, - 45.0232029 - ], - [ - -123.9970624, - 45.0231913 - ], - [ - -123.994521, - 45.0231955 - ], - [ - -123.9919821, - 45.0231996 - ], - [ - -123.9919627, - 45.0196361 - ], - [ - -123.9919878, - 45.0160732 - ], - [ - -123.9894335, - 45.0160721 - ], - [ - -123.9868792, - 45.0160711 - ], - [ - -123.9843375, - 45.0160132 - ], - [ - -123.981771, - 45.0160184 - ], - [ - -123.9817019, - 45.0124952 - ], - [ - -123.9792936, - 45.0124907 - ], - [ - -123.9790371, - 45.0124903 - ], - [ - -123.9790332, - 45.012445 - ], - [ - -123.9794459, - 45.0124458 - ], - [ - -123.9794435, - 45.0119751 - ], - [ - -123.9794408, - 45.0114457 - ], - [ - -123.9791577, - 45.0108139 - ], - [ - -123.978341, - 45.0110094 - ], - [ - -123.9781753, - 45.0107348 - ], - [ - -123.978172, - 45.0107294 - ], - [ - -123.9781691, - 45.010724 - ], - [ - -123.9780981, - 45.0105919 - ], - [ - -123.9780243, - 45.0104047 - ], - [ - -123.9779785, - 45.010213 - ], - [ - -123.9779612, - 45.0100189 - ], - [ - -123.9805007, - 45.0100244 - ], - [ - -123.9805033, - 45.0106814 - ], - [ - -123.98115, - 45.0106671 - ], - [ - -123.9810611, - 45.0108914 - ], - [ - -123.9810596, - 45.0111702 - ], - [ - -123.9811245, - 45.0114366 - ], - [ - -123.9814009, - 45.0116144 - ], - [ - -123.9816986, - 45.0116798 - ], - [ - -123.981699, - 45.011766 - ], - [ - -123.981752, - 45.0117777 - ], - [ - -123.9819804, - 45.0117697 - ], - [ - -123.9823381, - 45.0116303 - ], - [ - -123.9830037, - 45.011574 - ], - [ - -123.9830159, - 45.0124976 - ], - [ - -123.9842645, - 45.0124999 - ], - [ - -123.9867114, - 45.0125043 - ], - [ - -123.986703, - 45.0104888 - ], - [ - -123.986819, - 45.010489 - ], - [ - -123.9868271, - 45.0125045 - ], - [ - -123.9868313, - 45.0127897 - ], - [ - -123.9872335, - 45.0127893 - ], - [ - -123.9872293, - 45.012504 - ], - [ - -123.9893767, - 45.0125016 - ], - [ - -123.9919263, - 45.0124987 - ], - [ - -123.9944798, - 45.0124958 - ], - [ - -123.9944362, - 45.0089171 - ], - [ - -123.991895, - 45.0089249 - ], - [ - -123.9893538, - 45.0089328 - ], - [ - -123.9868127, - 45.0089407 - ], - [ - -123.9867295, - 45.0053074 - ], - [ - -123.9867291, - 45.0052894 - ], - [ - -123.9860718, - 45.0052901 - ], - [ - -123.9853373, - 45.0052901 - ], - [ - -123.9853373, - 45.0053239 - ], - [ - -123.984857, - 45.005357 - ], - [ - -123.9844731, - 45.0054241 - ], - [ - -123.9833699, - 45.0056392 - ], - [ - -123.9833372, - 45.0054162 - ], - [ - -123.9824299, - 45.0054141 - ], - [ - -123.9823779, - 45.0052936 - ], - [ - -123.98221, - 45.0052938 - ], - [ - -123.9822022, - 45.0052938 - ], - [ - -123.9826103, - 45.0051739 - ], - [ - -123.9831877, - 45.0050043 - ], - [ - -123.9833341, - 45.0049562 - ], - [ - -123.9834724, - 45.0048975 - ], - [ - -123.9836013, - 45.0048289 - ], - [ - -123.9837193, - 45.0047511 - ], - [ - -123.9838252, - 45.004665 - ], - [ - -123.9838521, - 45.00464 - ], - [ - -123.9842213, - 45.0042909 - ], - [ - -123.984502, - 45.0040256 - ], - [ - -123.9869851, - 45.0016782 - ], - [ - -123.9870295, - 45.0016362 - ], - [ - -123.9871003, - 45.001559 - ], - [ - -123.9871028, - 45.0015566 - ], - [ - -123.9871053, - 45.0015543 - ], - [ - -123.9871078, - 45.001552 - ], - [ - -123.9871103, - 45.0015496 - ], - [ - -123.9871128, - 45.0015473 - ], - [ - -123.9871153, - 45.001545 - ], - [ - -123.9871178, - 45.0015427 - ], - [ - -123.9871203, - 45.0015403 - ], - [ - -123.9871228, - 45.001538 - ], - [ - -123.9871253, - 45.0015357 - ], - [ - -123.9871278, - 45.0015334 - ], - [ - -123.9871303, - 45.0015311 - ], - [ - -123.9871328, - 45.0015287 - ], - [ - -123.9871354, - 45.0015264 - ], - [ - -123.9871379, - 45.0015241 - ], - [ - -123.9871404, - 45.0015218 - ], - [ - -123.9871429, - 45.0015195 - ], - [ - -123.9871455, - 45.0015172 - ], - [ - -123.987148, - 45.0015149 - ], - [ - -123.9871505, - 45.0015126 - ], - [ - -123.987153, - 45.0015102 - ], - [ - -123.9871556, - 45.0015079 - ], - [ - -123.9871581, - 45.0015056 - ], - [ - -123.9871607, - 45.0015033 - ], - [ - -123.9871632, - 45.001501 - ], - [ - -123.9871658, - 45.0014987 - ], - [ - -123.9871683, - 45.0014964 - ], - [ - -123.9871709, - 45.0014941 - ], - [ - -123.9871734, - 45.0014918 - ], - [ - -123.987176, - 45.0014895 - ], - [ - -123.9871785, - 45.0014873 - ], - [ - -123.9871811, - 45.001485 - ], - [ - -123.9871837, - 45.0014827 - ], - [ - -123.9871862, - 45.0014804 - ], - [ - -123.9871888, - 45.0014781 - ], - [ - -123.9871914, - 45.0014758 - ], - [ - -123.987194, - 45.0014735 - ], - [ - -123.9871965, - 45.0014712 - ], - [ - -123.9871991, - 45.001469 - ], - [ - -123.9872017, - 45.0014667 - ], - [ - -123.9872043, - 45.0014644 - ], - [ - -123.9872069, - 45.0014621 - ], - [ - -123.9872094, - 45.0014599 - ], - [ - -123.987212, - 45.0014576 - ], - [ - -123.9872146, - 45.0014553 - ], - [ - -123.9872172, - 45.001453 - ], - [ - -123.9872198, - 45.0014508 - ], - [ - -123.9872224, - 45.0014485 - ], - [ - -123.987225, - 45.0014462 - ], - [ - -123.9872276, - 45.001444 - ], - [ - -123.9872303, - 45.0014417 - ], - [ - -123.9872329, - 45.0014394 - ], - [ - -123.9872355, - 45.0014372 - ], - [ - -123.9872381, - 45.0014349 - ], - [ - -123.9872407, - 45.0014327 - ], - [ - -123.9872433, - 45.0014304 - ], - [ - -123.987246, - 45.0014281 - ], - [ - -123.9872486, - 45.0014259 - ], - [ - -123.9872512, - 45.0014236 - ], - [ - -123.9872538, - 45.0014214 - ], - [ - -123.9872565, - 45.0014191 - ], - [ - -123.9872591, - 45.0014169 - ], - [ - -123.9872618, - 45.0014146 - ], - [ - -123.9872644, - 45.0014124 - ], - [ - -123.987267, - 45.0014101 - ], - [ - -123.9872697, - 45.0014079 - ], - [ - -123.9872723, - 45.0014057 - ], - [ - -123.987275, - 45.0014034 - ], - [ - -123.9872776, - 45.0014012 - ], - [ - -123.9872803, - 45.0013989 - ], - [ - -123.9872829, - 45.0013967 - ], - [ - -123.9872856, - 45.0013945 - ], - [ - -123.9872883, - 45.0013922 - ], - [ - -123.9872909, - 45.00139 - ], - [ - -123.9872936, - 45.0013878 - ], - [ - -123.9872963, - 45.0013855 - ], - [ - -123.9872989, - 45.0013833 - ], - [ - -123.9873016, - 45.0013811 - ], - [ - -123.9873043, - 45.0013789 - ], - [ - -123.987307, - 45.0013766 - ], - [ - -123.9873097, - 45.0013744 - ], - [ - -123.9873123, - 45.0013722 - ], - [ - -123.987315, - 45.00137 - ], - [ - -123.9873177, - 45.0013678 - ], - [ - -123.9873204, - 45.0013656 - ], - [ - -123.9873231, - 45.0013633 - ], - [ - -123.9873258, - 45.0013611 - ], - [ - -123.9873285, - 45.0013589 - ], - [ - -123.9873312, - 45.0013567 - ], - [ - -123.9873339, - 45.0013545 - ], - [ - -123.9873366, - 45.0013523 - ], - [ - -123.9873393, - 45.0013501 - ], - [ - -123.987342, - 45.0013479 - ], - [ - -123.9873447, - 45.0013457 - ], - [ - -123.9873475, - 45.0013435 - ], - [ - -123.9873502, - 45.0013413 - ], - [ - -123.9873529, - 45.0013391 - ], - [ - -123.9873556, - 45.0013369 - ], - [ - -123.9873583, - 45.0013347 - ], - [ - -123.9873611, - 45.0013325 - ], - [ - -123.9873638, - 45.0013303 - ], - [ - -123.9873665, - 45.0013281 - ], - [ - -123.9873693, - 45.0013259 - ], - [ - -123.987372, - 45.0013237 - ], - [ - -123.9873747, - 45.0013216 - ], - [ - -123.9873775, - 45.0013194 - ], - [ - -123.9873802, - 45.0013172 - ], - [ - -123.987383, - 45.001315 - ], - [ - -123.9873857, - 45.0013128 - ], - [ - -123.9873885, - 45.0013106 - ], - [ - -123.9873912, - 45.0013085 - ], - [ - -123.987394, - 45.0013063 - ], - [ - -123.9873967, - 45.0013041 - ], - [ - -123.9873995, - 45.0013019 - ], - [ - -123.9874023, - 45.0012998 - ], - [ - -123.987405, - 45.0012976 - ], - [ - -123.9874078, - 45.0012954 - ], - [ - -123.9874106, - 45.0012933 - ], - [ - -123.9874133, - 45.0012911 - ], - [ - -123.9874161, - 45.0012889 - ], - [ - -123.9874189, - 45.0012868 - ], - [ - -123.9874217, - 45.0012846 - ], - [ - -123.9874244, - 45.0012825 - ], - [ - -123.9874272, - 45.0012803 - ], - [ - -123.98743, - 45.0012781 - ], - [ - -123.9874328, - 45.001276 - ], - [ - -123.9874356, - 45.0012738 - ], - [ - -123.9874384, - 45.0012717 - ], - [ - -123.9874412, - 45.0012695 - ], - [ - -123.987444, - 45.0012674 - ], - [ - -123.9874468, - 45.0012652 - ], - [ - -123.9874496, - 45.0012631 - ], - [ - -123.9874524, - 45.001261 - ], - [ - -123.9874552, - 45.0012588 - ], - [ - -123.987458, - 45.0012567 - ], - [ - -123.9874608, - 45.0012545 - ], - [ - -123.9874636, - 45.0012524 - ], - [ - -123.9874664, - 45.0012503 - ], - [ - -123.9874693, - 45.0012481 - ], - [ - -123.9874721, - 45.001246 - ], - [ - -123.9874749, - 45.0012439 - ], - [ - -123.9874777, - 45.0012417 - ], - [ - -123.9874806, - 45.0012396 - ], - [ - -123.9874834, - 45.0012375 - ], - [ - -123.9874862, - 45.0012353 - ], - [ - -123.987489, - 45.0012332 - ], - [ - -123.9874919, - 45.0012311 - ], - [ - -123.9874947, - 45.001229 - ], - [ - -123.9874976, - 45.0012269 - ], - [ - -123.9875004, - 45.0012247 - ], - [ - -123.9875033, - 45.0012226 - ], - [ - -123.9875061, - 45.0012205 - ], - [ - -123.987509, - 45.0012184 - ], - [ - -123.9875118, - 45.0012163 - ], - [ - -123.9875147, - 45.0012142 - ], - [ - -123.9875175, - 45.0012121 - ], - [ - -123.9875204, - 45.00121 - ], - [ - -123.9875232, - 45.0012079 - ], - [ - -123.9875261, - 45.0012058 - ], - [ - -123.987529, - 45.0012036 - ], - [ - -123.9875318, - 45.0012015 - ], - [ - -123.9875347, - 45.0011994 - ], - [ - -123.9875376, - 45.0011973 - ], - [ - -123.9875405, - 45.0011953 - ], - [ - -123.9875433, - 45.0011932 - ], - [ - -123.9875462, - 45.0011911 - ], - [ - -123.9875491, - 45.001189 - ], - [ - -123.987552, - 45.0011869 - ], - [ - -123.9875549, - 45.0011848 - ], - [ - -123.9875578, - 45.0011827 - ], - [ - -123.9875606, - 45.0011806 - ], - [ - -123.9875635, - 45.0011785 - ], - [ - -123.9875664, - 45.0011765 - ], - [ - -123.9875693, - 45.0011744 - ], - [ - -123.9875722, - 45.0011723 - ], - [ - -123.9875751, - 45.0011702 - ], - [ - -123.987578, - 45.0011681 - ], - [ - -123.9875809, - 45.0011661 - ], - [ - -123.9875839, - 45.001164 - ], - [ - -123.9875868, - 45.0011619 - ], - [ - -123.9875897, - 45.0011599 - ], - [ - -123.9875926, - 45.0011578 - ], - [ - -123.9875955, - 45.0011557 - ], - [ - -123.9875984, - 45.0011537 - ], - [ - -123.9876014, - 45.0011516 - ], - [ - -123.9876043, - 45.0011495 - ], - [ - -123.9876072, - 45.0011475 - ], - [ - -123.9876101, - 45.0011454 - ], - [ - -123.9876131, - 45.0011434 - ], - [ - -123.987616, - 45.0011413 - ], - [ - -123.9876189, - 45.0011393 - ], - [ - -123.9876219, - 45.0011372 - ], - [ - -123.9876248, - 45.0011352 - ], - [ - -123.9876278, - 45.0011331 - ], - [ - -123.9876307, - 45.0011311 - ], - [ - -123.9876336, - 45.001129 - ], - [ - -123.9876366, - 45.001127 - ], - [ - -123.9876395, - 45.0011249 - ], - [ - -123.9876425, - 45.0011229 - ], - [ - -123.9876455, - 45.0011208 - ], - [ - -123.9876484, - 45.0011188 - ], - [ - -123.9876514, - 45.0011168 - ], - [ - -123.9876543, - 45.0011147 - ], - [ - -123.9876573, - 45.0011127 - ], - [ - -123.9876603, - 45.0011107 - ], - [ - -123.9876632, - 45.0011086 - ], - [ - -123.9876662, - 45.0011066 - ], - [ - -123.9876692, - 45.0011046 - ], - [ - -123.9876722, - 45.0011026 - ], - [ - -123.9876751, - 45.0011005 - ], - [ - -123.9876781, - 45.0010985 - ], - [ - -123.9876811, - 45.0010965 - ], - [ - -123.9876841, - 45.0010945 - ], - [ - -123.9876871, - 45.0010925 - ], - [ - -123.9876901, - 45.0010905 - ], - [ - -123.987693, - 45.0010884 - ], - [ - -123.987696, - 45.0010864 - ], - [ - -123.987699, - 45.0010844 - ], - [ - -123.987702, - 45.0010824 - ], - [ - -123.987705, - 45.0010804 - ], - [ - -123.987708, - 45.0010784 - ], - [ - -123.987711, - 45.0010764 - ], - [ - -123.987714, - 45.0010744 - ], - [ - -123.987717, - 45.0010724 - ], - [ - -123.9877201, - 45.0010704 - ], - [ - -123.9877231, - 45.0010684 - ], - [ - -123.9877261, - 45.0010664 - ], - [ - -123.9877291, - 45.0010644 - ], - [ - -123.9877321, - 45.0010624 - ], - [ - -123.9877351, - 45.0010604 - ], - [ - -123.9877382, - 45.0010584 - ], - [ - -123.9877412, - 45.0010565 - ], - [ - -123.9877442, - 45.0010545 - ], - [ - -123.9877472, - 45.0010525 - ], - [ - -123.9877503, - 45.0010505 - ], - [ - -123.9877533, - 45.0010485 - ], - [ - -123.9877563, - 45.0010465 - ], - [ - -123.9877594, - 45.0010446 - ], - [ - -123.9877624, - 45.0010426 - ], - [ - -123.9877655, - 45.0010406 - ], - [ - -123.9877685, - 45.0010386 - ], - [ - -123.9877716, - 45.0010367 - ], - [ - -123.9877746, - 45.0010347 - ], - [ - -123.9877777, - 45.0010327 - ], - [ - -123.9877807, - 45.0010308 - ], - [ - -123.9877838, - 45.0010288 - ], - [ - -123.9877868, - 45.0010268 - ], - [ - -123.9877899, - 45.0010249 - ], - [ - -123.9877929, - 45.0010229 - ], - [ - -123.987796, - 45.001021 - ], - [ - -123.9877991, - 45.001019 - ], - [ - -123.9878021, - 45.0010171 - ], - [ - -123.9878052, - 45.0010151 - ], - [ - -123.9878083, - 45.0010132 - ], - [ - -123.9878114, - 45.0010112 - ], - [ - -123.9878144, - 45.0010093 - ], - [ - -123.9878175, - 45.0010073 - ], - [ - -123.9878206, - 45.0010054 - ], - [ - -123.9878237, - 45.0010034 - ], - [ - -123.9878268, - 45.0010015 - ], - [ - -123.9878298, - 45.0009995 - ], - [ - -123.9878329, - 45.0009976 - ], - [ - -123.987836, - 45.0009957 - ], - [ - -123.9878391, - 45.0009937 - ], - [ - -123.9878422, - 45.0009918 - ], - [ - -123.9878453, - 45.0009899 - ], - [ - -123.9878484, - 45.0009879 - ], - [ - -123.9878515, - 45.000986 - ], - [ - -123.9878546, - 45.0009841 - ], - [ - -123.9878577, - 45.0009822 - ], - [ - -123.9878608, - 45.0009802 - ], - [ - -123.9878639, - 45.0009783 - ], - [ - -123.987867, - 45.0009764 - ], - [ - -123.9878702, - 45.0009745 - ], - [ - -123.9878733, - 45.0009726 - ], - [ - -123.9878764, - 45.0009707 - ], - [ - -123.9878795, - 45.0009688 - ], - [ - -123.9878826, - 45.0009668 - ], - [ - -123.9878858, - 45.0009649 - ], - [ - -123.9878889, - 45.000963 - ], - [ - -123.987892, - 45.0009611 - ], - [ - -123.9878951, - 45.0009592 - ], - [ - -123.9878983, - 45.0009573 - ], - [ - -123.9879014, - 45.0009554 - ], - [ - -123.9879045, - 45.0009535 - ], - [ - -123.9879077, - 45.0009516 - ], - [ - -123.9879108, - 45.0009497 - ], - [ - -123.987914, - 45.0009478 - ], - [ - -123.9879171, - 45.0009459 - ], - [ - -123.9879203, - 45.0009441 - ], - [ - -123.9879234, - 45.0009422 - ], - [ - -123.9879266, - 45.0009403 - ], - [ - -123.9879297, - 45.0009384 - ], - [ - -123.9879329, - 45.0009365 - ], - [ - -123.987936, - 45.0009346 - ], - [ - -123.9879392, - 45.0009327 - ], - [ - -123.9879423, - 45.0009309 - ], - [ - -123.9879455, - 45.000929 - ], - [ - -123.9879487, - 45.0009271 - ], - [ - -123.9879518, - 45.0009252 - ], - [ - -123.987955, - 45.0009234 - ], - [ - -123.9879582, - 45.0009215 - ], - [ - -123.9879613, - 45.0009196 - ], - [ - -123.9879645, - 45.0009178 - ], - [ - -123.9879677, - 45.0009159 - ], - [ - -123.9879709, - 45.000914 - ], - [ - -123.9879741, - 45.0009122 - ], - [ - -123.9879772, - 45.0009103 - ], - [ - -123.9879804, - 45.0009085 - ], - [ - -123.9879836, - 45.0009066 - ], - [ - -123.9879868, - 45.0009048 - ], - [ - -123.98799, - 45.0009029 - ], - [ - -123.9879932, - 45.0009011 - ], - [ - -123.9879964, - 45.0008992 - ], - [ - -123.9879996, - 45.0008974 - ], - [ - -123.9880028, - 45.0008955 - ], - [ - -123.988006, - 45.0008937 - ], - [ - -123.9880092, - 45.0008918 - ], - [ - -123.9880124, - 45.00089 - ], - [ - -123.9880156, - 45.0008882 - ], - [ - -123.9880188, - 45.0008863 - ], - [ - -123.988022, - 45.0008845 - ], - [ - -123.9880252, - 45.0008827 - ], - [ - -123.9880284, - 45.0008808 - ], - [ - -123.9880317, - 45.000879 - ], - [ - -123.9880349, - 45.0008772 - ], - [ - -123.9880381, - 45.0008753 - ], - [ - -123.9880413, - 45.0008735 - ], - [ - -123.9880445, - 45.0008717 - ], - [ - -123.9880478, - 45.0008699 - ], - [ - -123.988051, - 45.0008681 - ], - [ - -123.9880542, - 45.0008662 - ], - [ - -123.9880575, - 45.0008644 - ], - [ - -123.9880607, - 45.0008626 - ], - [ - -123.9880639, - 45.0008608 - ], - [ - -123.9880672, - 45.000859 - ], - [ - -123.9880704, - 45.0008572 - ], - [ - -123.9880737, - 45.0008554 - ], - [ - -123.9880769, - 45.0008536 - ], - [ - -123.9880801, - 45.0008518 - ], - [ - -123.9880834, - 45.00085 - ], - [ - -123.9880866, - 45.0008482 - ], - [ - -123.9880899, - 45.0008464 - ], - [ - -123.9880931, - 45.0008446 - ], - [ - -123.9880964, - 45.0008428 - ], - [ - -123.9880997, - 45.000841 - ], - [ - -123.9881029, - 45.0008392 - ], - [ - -123.9881062, - 45.0008374 - ], - [ - -123.9881094, - 45.0008356 - ], - [ - -123.9881127, - 45.0008338 - ], - [ - -123.988116, - 45.000832 - ], - [ - -123.9881193, - 45.0008303 - ], - [ - -123.9881225, - 45.0008285 - ], - [ - -123.9881258, - 45.0008267 - ], - [ - -123.9881291, - 45.0008249 - ], - [ - -123.9881323, - 45.0008232 - ], - [ - -123.9881356, - 45.0008214 - ], - [ - -123.9879111, - 45.0006671 - ], - [ - -123.9873562, - 45.0003196 - ], - [ - -123.9869959, - 45.0000809 - ], - [ - -123.9869638, - 45.0000653 - ], - [ - -123.9869686, - 45.0000588 - ], - [ - -123.9876764, - 44.9991043 - ], - [ - -123.9877738, - 44.9989729 - ], - [ - -123.9887466, - 44.9980164 - ], - [ - -123.9888379, - 44.9979365 - ], - [ - -123.9891099, - 44.9977307 - ], - [ - -123.9894107, - 44.9975462 - ], - [ - -123.9895569, - 44.9974695 - ], - [ - -123.9898937, - 44.9973196 - ], - [ - -123.9900062, - 44.9972768 - ], - [ - -123.9901317, - 44.9972311 - ], - [ - -123.9903711, - 44.9971439 - ], - [ - -123.9906579, - 44.9970395 - ], - [ - -123.9909847, - 44.9969204 - ], - [ - -123.9914004, - 44.996769 - ], - [ - -123.9915395, - 44.9967184 - ], - [ - -123.9914161, - 44.996367 - ], - [ - -123.9913345, - 44.9961343 - ], - [ - -123.9912625, - 44.9959291 - ], - [ - -123.9913274, - 44.9957363 - ], - [ - -123.9914016, - 44.9955161 - ], - [ - -123.9914753, - 44.9952958 - ], - [ - -123.9914756, - 44.9952951 - ], - [ - -123.9915542, - 44.9950501 - ], - [ - -123.9915542, - 44.99505 - ], - [ - -123.9915569, - 44.9950417 - ], - [ - -123.9916244, - 44.9948324 - ], - [ - -123.9920276, - 44.9948274 - ], - [ - -123.99252, - 44.9948213 - ], - [ - -123.9931476, - 44.9948132 - ], - [ - -123.9932141, - 44.9948123 - ], - [ - -123.9932257, - 44.9948122 - ], - [ - -123.9932458, - 44.9948734 - ], - [ - -123.9932369, - 44.9949417 - ], - [ - -123.9932439, - 44.9950084 - ], - [ - -123.9932682, - 44.9950491 - ], - [ - -123.993292, - 44.9951687 - ], - [ - -123.9932893, - 44.9952368 - ], - [ - -123.9932049, - 44.9953186 - ], - [ - -123.9931717, - 44.9953965 - ], - [ - -123.9931746, - 44.995452 - ], - [ - -123.9932112, - 44.9954782 - ], - [ - -123.9932341, - 44.995524 - ], - [ - -123.9933358, - 44.9955503 - ], - [ - -123.9934576, - 44.9955534 - ], - [ - -123.9936026, - 44.9955978 - ], - [ - -123.9936973, - 44.9956305 - ], - [ - -123.9938282, - 44.9956403 - ], - [ - -123.9939275, - 44.9956421 - ], - [ - -123.9939991, - 44.9956688 - ], - [ - -123.9941097, - 44.995691 - ], - [ - -123.9941948, - 44.9957618 - ], - [ - -123.9942105, - 44.9958079 - ], - [ - -123.994206, - 44.9958585 - ], - [ - -123.9942039, - 44.9958944 - ], - [ - -123.9941826, - 44.9959501 - ], - [ - -123.9940854, - 44.9960575 - ], - [ - -123.9940274, - 44.9961359 - ], - [ - -123.9939853, - 44.9962226 - ], - [ - -123.9939164, - 44.9962895 - ], - [ - -123.9938347, - 44.9963623 - ], - [ - -123.9937533, - 44.9964412 - ], - [ - -123.9937058, - 44.9965196 - ], - [ - -123.993638, - 44.9965894 - ], - [ - -123.9936112, - 44.9966714 - ], - [ - -123.9936026, - 44.9967462 - ], - [ - -123.993616, - 44.9968249 - ], - [ - -123.9936513, - 44.9969097 - ], - [ - -123.9937054, - 44.9969961 - ], - [ - -123.9937561, - 44.9970761 - ], - [ - -123.9937964, - 44.9971366 - ], - [ - -123.9938364, - 44.9971904 - ], - [ - -123.9938921, - 44.9972483 - ], - [ - -123.9939255, - 44.9972933 - ], - [ - -123.9939919, - 44.9973226 - ], - [ - -123.9940669, - 44.9973333 - ], - [ - -123.9941553, - 44.9973176 - ], - [ - -123.9942316, - 44.9973193 - ], - [ - -123.9942943, - 44.9973528 - ], - [ - -123.9944344, - 44.9975046 - ], - [ - -123.9944452, - 44.9975176 - ], - [ - -123.9945291, - 44.9976182 - ], - [ - -123.9946906, - 44.9976819 - ], - [ - -123.9949486, - 44.9976691 - ], - [ - -123.9950548, - 44.9975654 - ], - [ - -123.9951688, - 44.9974919 - ], - [ - -123.9953383, - 44.9973559 - ], - [ - -123.995613, - 44.9972102 - ], - [ - -123.9958511, - 44.9970912 - ], - [ - -123.9958931, - 44.9970938 - ], - [ - -123.9959031, - 44.9970944 - ], - [ - -123.9959929, - 44.997055 - ], - [ - -123.996241, - 44.9969706 - ], - [ - -123.9962641, - 44.9969628 - ], - [ - -123.9962818, - 44.9969567 - ], - [ - -123.9963155, - 44.9969208 - ], - [ - -123.996354, - 44.99688 - ], - [ - -123.9963582, - 44.9968565 - ], - [ - -123.9963775, - 44.99675 - ], - [ - -123.9963344, - 44.9966699 - ], - [ - -123.9964043, - 44.9964875 - ], - [ - -123.9964598, - 44.9963645 - ], - [ - -123.9965408, - 44.9963636 - ], - [ - -123.9966294, - 44.9963769 - ], - [ - -123.9966739, - 44.9964058 - ], - [ - -123.9966932, - 44.9963542 - ], - [ - -123.9965457, - 44.9963332 - ], - [ - -123.9964342, - 44.9963143 - ], - [ - -123.9963845, - 44.996238 - ], - [ - -123.9963845, - 44.9960945 - ], - [ - -123.9963845, - 44.9960529 - ], - [ - -123.9964155, - 44.9958971 - ], - [ - -123.996415, - 44.9958934 - ], - [ - -123.996395, - 44.9957294 - ], - [ - -123.9963468, - 44.9957317 - ], - [ - -123.9963804, - 44.9955704 - ], - [ - -123.9964096, - 44.9954298 - ], - [ - -123.9964674, - 44.9952334 - ], - [ - -123.9964149, - 44.9952222 - ], - [ - -123.9964095, - 44.9951806 - ], - [ - -123.9964022, - 44.9951253 - ], - [ - -123.9963982, - 44.9949483 - ], - [ - -123.9963566, - 44.9948236 - ], - [ - -123.9963387, - 44.99477 - ], - [ - -123.9963184, - 44.9947098 - ], - [ - -123.9962559, - 44.9946377 - ], - [ - -123.9962262, - 44.9946032 - ], - [ - -123.9961759, - 44.9945578 - ], - [ - -123.9961238, - 44.9945107 - ], - [ - -123.9959827, - 44.994523 - ], - [ - -123.9959619, - 44.9945073 - ], - [ - -123.9958717, - 44.9944397 - ], - [ - -123.9956884, - 44.9942787 - ], - [ - -123.9955975, - 44.9942178 - ], - [ - -123.9955335, - 44.9941749 - ], - [ - -123.9954341, - 44.9940879 - ], - [ - -123.9952958, - 44.9939668 - ], - [ - -123.9952187, - 44.9938915 - ], - [ - -123.9950995, - 44.993775 - ], - [ - -123.9951007, - 44.9936438 - ], - [ - -123.9951009, - 44.9936273 - ], - [ - -123.9951017, - 44.9935422 - ], - [ - -123.9950676, - 44.9935001 - ], - [ - -123.9950559, - 44.9934468 - ], - [ - -123.9950551, - 44.9934431 - ], - [ - -123.9951821, - 44.9933115 - ], - [ - -123.9952071, - 44.9932331 - ], - [ - -123.9952123, - 44.9932165 - ], - [ - -123.9952712, - 44.9931492 - ], - [ - -123.9954119, - 44.9930663 - ], - [ - -123.9954168, - 44.9930634 - ], - [ - -123.9956273, - 44.9930091 - ], - [ - -123.9957435, - 44.9929657 - ], - [ - -123.9959111, - 44.992903 - ], - [ - -123.9960135, - 44.9928882 - ], - [ - -123.996073, - 44.992857 - ], - [ - -123.9960807, - 44.9928445 - ], - [ - -123.9960992, - 44.9928144 - ], - [ - -123.9962009, - 44.9926495 - ], - [ - -123.9963126, - 44.9924683 - ], - [ - -123.9963232, - 44.9922875 - ], - [ - -123.9963289, - 44.9921892 - ], - [ - -123.9963303, - 44.9921664 - ], - [ - -123.9963351, - 44.9920253 - ], - [ - -123.9963377, - 44.9919485 - ], - [ - -123.9961159, - 44.9918581 - ], - [ - -123.9959173, - 44.9917771 - ], - [ - -123.9958901, - 44.9917712 - ], - [ - -123.9958519, - 44.99176 - ], - [ - -123.9956669, - 44.9916896 - ], - [ - -123.9956764, - 44.9916581 - ], - [ - -123.9955933, - 44.9916352 - ], - [ - -123.9955458, - 44.9916068 - ], - [ - -123.9955088, - 44.9915702 - ], - [ - -123.9954965, - 44.9915241 - ], - [ - -123.9954748, - 44.9915145 - ], - [ - -123.9954425, - 44.9915097 - ], - [ - -123.9954328, - 44.9915009 - ], - [ - -123.9954019, - 44.9914901 - ], - [ - -123.9952043, - 44.9914245 - ], - [ - -123.9952017, - 44.9914237 - ], - [ - -123.9951469, - 44.9914076 - ], - [ - -123.9949821, - 44.9912732 - ], - [ - -123.9950345, - 44.9911926 - ], - [ - -123.9950522, - 44.9910924 - ], - [ - -123.9951018, - 44.9910196 - ], - [ - -123.9951133, - 44.990977 - ], - [ - -123.9951587, - 44.9908526 - ], - [ - -123.9951625, - 44.9908423 - ], - [ - -123.9952328, - 44.9907189 - ], - [ - -123.9952424, - 44.990689 - ], - [ - -123.9952634, - 44.9906237 - ], - [ - -123.9952998, - 44.9905356 - ], - [ - -123.9953025, - 44.9905238 - ], - [ - -123.9953101, - 44.9904909 - ], - [ - -123.9953322, - 44.990383 - ], - [ - -123.9953326, - 44.9903614 - ], - [ - -123.9953349, - 44.9902572 - ], - [ - -123.9953252, - 44.9902087 - ], - [ - -123.9952975, - 44.9900709 - ], - [ - -123.9952966, - 44.9899711 - ], - [ - -123.9952643, - 44.9898685 - ], - [ - -123.9951627, - 44.9897829 - ], - [ - -123.9951176, - 44.989727 - ], - [ - -123.9950865, - 44.989705 - ], - [ - -123.995076, - 44.9896976 - ], - [ - -123.9949297, - 44.9895941 - ], - [ - -123.9948284, - 44.9895139 - ], - [ - -123.9947666, - 44.9894282 - ], - [ - -123.9946717, - 44.9890261 - ], - [ - -123.994655, - 44.9889804 - ], - [ - -123.9946203, - 44.9888854 - ], - [ - -123.9945431, - 44.988833 - ], - [ - -123.9942248, - 44.9886834 - ], - [ - -123.9939067, - 44.9885316 - ], - [ - -123.9936628, - 44.9883255 - ], - [ - -123.993581, - 44.988211 - ], - [ - -123.9935425, - 44.9880885 - ], - [ - -123.9935606, - 44.9878692 - ], - [ - -123.9935338, - 44.987734 - ], - [ - -123.9935634, - 44.9876837 - ], - [ - -123.9936021, - 44.9876178 - ], - [ - -123.9935782, - 44.9874838 - ], - [ - -123.9935824, - 44.9874727 - ], - [ - -123.9936123, - 44.9873953 - ], - [ - -123.993611, - 44.9872689 - ], - [ - -123.9936096, - 44.9871257 - ], - [ - -123.9935966, - 44.9870975 - ], - [ - -123.9935525, - 44.9870017 - ], - [ - -123.9935234, - 44.9869485 - ], - [ - -123.9934934, - 44.9869295 - ], - [ - -123.9933298, - 44.9868255 - ], - [ - -123.9933274, - 44.9868248 - ], - [ - -123.9931274, - 44.9867658 - ], - [ - -123.9930713, - 44.986722 - ], - [ - -123.9929055, - 44.9865927 - ], - [ - -123.9928884, - 44.9865795 - ], - [ - -123.9926881, - 44.9864255 - ], - [ - -123.9926315, - 44.9863391 - ], - [ - -123.9925995, - 44.9862903 - ], - [ - -123.9925446, - 44.9862063 - ], - [ - -123.9925248, - 44.9861761 - ], - [ - -123.9924468, - 44.9860954 - ], - [ - -123.9923642, - 44.9860099 - ], - [ - -123.992241, - 44.9858825 - ], - [ - -123.9921954, - 44.9858354 - ], - [ - -123.9921116, - 44.9857761 - ], - [ - -123.991951, - 44.9856625 - ], - [ - -123.9918949, - 44.9856227 - ], - [ - -123.9917268, - 44.9854454 - ], - [ - -123.9915967, - 44.9853081 - ], - [ - -123.9915877, - 44.9852872 - ], - [ - -123.9915217, - 44.9851578 - ], - [ - -123.9915023, - 44.9850477 - ], - [ - -123.9914923, - 44.9848833 - ], - [ - -123.9914934, - 44.984841 - ], - [ - -123.9915286, - 44.9847635 - ], - [ - -123.9915265, - 44.9847037 - ], - [ - -123.991503, - 44.9846518 - ], - [ - -123.9914725, - 44.9845919 - ], - [ - -123.9914116, - 44.9844721 - ], - [ - -123.9914069, - 44.9844629 - ], - [ - -123.9913002, - 44.9843569 - ], - [ - -123.9912224, - 44.9842796 - ], - [ - -123.9909872, - 44.9841669 - ], - [ - -123.9908182, - 44.9841738 - ], - [ - -123.990692, - 44.984179 - ], - [ - -123.990326, - 44.9842082 - ], - [ - -123.9902491, - 44.9841956 - ], - [ - -123.9902348, - 44.9841001 - ], - [ - -123.9903126, - 44.9839898 - ], - [ - -123.9905042, - 44.9838729 - ], - [ - -123.9907595, - 44.9837602 - ], - [ - -123.9910111, - 44.9836549 - ], - [ - -123.9910814, - 44.9836703 - ], - [ - -123.9911082, - 44.9836546 - ], - [ - -123.9912988, - 44.9835281 - ], - [ - -123.9913105, - 44.9835253 - ], - [ - -123.9915697, - 44.9834628 - ], - [ - -123.9916386, - 44.9834288 - ], - [ - -123.9917129, - 44.983426 - ], - [ - -123.9917924, - 44.9833727 - ], - [ - -123.9918618, - 44.9833642 - ], - [ - -123.9919316, - 44.9833467 - ], - [ - -123.9923182, - 44.9833322 - ], - [ - -123.9923565, - 44.9833307 - ], - [ - -123.9925108, - 44.9833079 - ], - [ - -123.9925869, - 44.9832967 - ], - [ - -123.9926739, - 44.983198 - ], - [ - -123.9926999, - 44.9831867 - ], - [ - -123.992851, - 44.9831207 - ], - [ - -123.9928927, - 44.9830082 - ], - [ - -123.9928982, - 44.9829933 - ], - [ - -123.9931065, - 44.982804 - ], - [ - -123.9932762, - 44.9827026 - ], - [ - -123.9933921, - 44.9826333 - ], - [ - -123.9936471, - 44.9825865 - ], - [ - -123.9936588, - 44.982587 - ], - [ - -123.9939396, - 44.9825985 - ], - [ - -123.9939686, - 44.9826074 - ], - [ - -123.9943058, - 44.9827102 - ], - [ - -123.9943623, - 44.9826949 - ], - [ - -123.9947674, - 44.9825851 - ], - [ - -123.9949088, - 44.9825573 - ], - [ - -123.9951424, - 44.9825663 - ], - [ - -123.9951741, - 44.9825775 - ], - [ - -123.9954647, - 44.9826809 - ], - [ - -123.995561, - 44.9825868 - ], - [ - -123.9956107, - 44.9825383 - ], - [ - -123.9956748, - 44.9821932 - ], - [ - -123.9956989, - 44.982064 - ], - [ - -123.9957014, - 44.9820553 - ], - [ - -123.9958015, - 44.9817157 - ], - [ - -123.9958489, - 44.9815566 - ], - [ - -123.9958439, - 44.9815554 - ], - [ - -123.9955702, - 44.9814911 - ], - [ - -123.9955664, - 44.9814873 - ], - [ - -123.9955632, - 44.9814865 - ], - [ - -123.9954336, - 44.9813585 - ], - [ - -123.9954262, - 44.9813551 - ], - [ - -123.9953405, - 44.981316 - ], - [ - -123.9953363, - 44.9813127 - ], - [ - -123.9953336, - 44.9813115 - ], - [ - -123.9952021, - 44.9812095 - ], - [ - -123.9950278, - 44.9812477 - ], - [ - -123.9949263, - 44.9812478 - ], - [ - -123.9948922, - 44.9812313 - ], - [ - -123.9948604, - 44.9812158 - ], - [ - -123.9948043, - 44.9811886 - ], - [ - -123.9948032, - 44.9811869 - ], - [ - -123.9947973, - 44.981184 - ], - [ - -123.9947179, - 44.9810606 - ], - [ - -123.9946752, - 44.980915 - ], - [ - -123.9946853, - 44.9808847 - ], - [ - -123.994695, - 44.9808554 - ], - [ - -123.9947395, - 44.9807211 - ], - [ - -123.9947388, - 44.9806682 - ], - [ - -123.9947385, - 44.980639 - ], - [ - -123.9947368, - 44.9805018 - ], - [ - -123.9947363, - 44.9804604 - ], - [ - -123.9947358, - 44.9803108 - ], - [ - -123.9947334, - 44.980297 - ], - [ - -123.9947038, - 44.9801319 - ], - [ - -123.9946057, - 44.979979 - ], - [ - -123.9943212, - 44.9797509 - ], - [ - -123.9941648, - 44.9795428 - ], - [ - -123.9941486, - 44.9794962 - ], - [ - -123.9940981, - 44.97935 - ], - [ - -123.9940164, - 44.9792429 - ], - [ - -123.9939609, - 44.97917 - ], - [ - -123.9937611, - 44.9790484 - ], - [ - -123.9937612, - 44.9790481 - ], - [ - -123.9937541, - 44.9790438 - ], - [ - -123.9938087, - 44.9788293 - ], - [ - -123.9939463, - 44.9787291 - ], - [ - -123.9940199, - 44.9786124 - ], - [ - -123.9940581, - 44.9785518 - ], - [ - -123.9942692, - 44.9784176 - ], - [ - -123.994286, - 44.9784069 - ], - [ - -123.9944971, - 44.9782685 - ], - [ - -123.9946315, - 44.9781804 - ], - [ - -123.9946737, - 44.978162 - ], - [ - -123.9947248, - 44.9781397 - ], - [ - -123.9949239, - 44.9780451 - ], - [ - -123.9950703, - 44.9779755 - ], - [ - -123.9951489, - 44.9779565 - ], - [ - -123.9953634, - 44.9778613 - ], - [ - -123.9955125, - 44.9777951 - ], - [ - -123.9955687, - 44.9777817 - ], - [ - -123.9955996, - 44.9777634 - ], - [ - -123.9957704, - 44.9776153 - ], - [ - -123.9957665, - 44.9775515 - ], - [ - -123.9957611, - 44.9774627 - ], - [ - -123.9957004, - 44.9771618 - ], - [ - -123.9956655, - 44.9770065 - ], - [ - -123.9955797, - 44.976915 - ], - [ - -123.9955498, - 44.9768409 - ], - [ - -123.9954725, - 44.9767359 - ], - [ - -123.9953672, - 44.9765929 - ], - [ - -123.995365, - 44.9765899 - ], - [ - -123.995173, - 44.976514 - ], - [ - -123.995166, - 44.9765094 - ], - [ - -123.9950829, - 44.9764554 - ], - [ - -123.9950759, - 44.9764508 - ], - [ - -123.9950657, - 44.9763715 - ], - [ - -123.9950558, - 44.9762941 - ], - [ - -123.9950561, - 44.9762449 - ], - [ - -123.9950335, - 44.9762212 - ], - [ - -123.9950142, - 44.9761835 - ], - [ - -123.9950196, - 44.9761438 - ], - [ - -123.9950532, - 44.976132 - ], - [ - -123.9950582, - 44.9761372 - ], - [ - -123.9950602, - 44.9761365 - ], - [ - -123.9950774, - 44.9761545 - ], - [ - -123.9951213, - 44.9761688 - ], - [ - -123.9951452, - 44.9761659 - ], - [ - -123.9951622, - 44.9761555 - ], - [ - -123.9951908, - 44.9761277 - ], - [ - -123.9952102, - 44.9760927 - ], - [ - -123.9952398, - 44.9759528 - ], - [ - -123.9953008, - 44.9758436 - ], - [ - -123.995357, - 44.9757431 - ], - [ - -123.9953728, - 44.9757136 - ], - [ - -123.9953766, - 44.9757066 - ], - [ - -123.9954348, - 44.9755983 - ], - [ - -123.9954385, - 44.9755949 - ], - [ - -123.9955709, - 44.9754727 - ], - [ - -123.9955777, - 44.9754555 - ], - [ - -123.9956186, - 44.9753528 - ], - [ - -123.9956383, - 44.9753252 - ], - [ - -123.9957218, - 44.9752087 - ], - [ - -123.995729, - 44.9751958 - ], - [ - -123.995845, - 44.9749888 - ], - [ - -123.9958455, - 44.9749878 - ], - [ - -123.9958069, - 44.9749651 - ], - [ - -123.9958071, - 44.9749648 - ], - [ - -123.9957999, - 44.9749605 - ], - [ - -123.9959123, - 44.9748281 - ], - [ - -123.9959232, - 44.9747259 - ], - [ - -123.9959257, - 44.9747018 - ], - [ - -123.9960057, - 44.9745224 - ], - [ - -123.9960397, - 44.9744409 - ], - [ - -123.9960665, - 44.9743767 - ], - [ - -123.9959967, - 44.9742261 - ], - [ - -123.9960009, - 44.9741372 - ], - [ - -123.9960022, - 44.974109 - ], - [ - -123.9960659, - 44.9739327 - ], - [ - -123.9961726, - 44.9738901 - ], - [ - -123.9961917, - 44.9738824 - ], - [ - -123.9964838, - 44.9736456 - ], - [ - -123.9965504, - 44.9736217 - ], - [ - -123.9965957, - 44.9736054 - ], - [ - -123.9966757, - 44.9735692 - ], - [ - -123.9967025, - 44.9735234 - ], - [ - -123.9967665, - 44.9735334 - ], - [ - -123.9969471, - 44.973498 - ], - [ - -123.9971654, - 44.9734552 - ], - [ - -123.9971286, - 44.9733857 - ], - [ - -123.9972116, - 44.9733983 - ], - [ - -123.9973303, - 44.9734266 - ], - [ - -123.9973663, - 44.973393 - ], - [ - -123.9974186, - 44.9733834 - ], - [ - -123.997467, - 44.9734095 - ], - [ - -123.9975291, - 44.9734488 - ], - [ - -123.9976359, - 44.9734516 - ], - [ - -123.9976998, - 44.9734727 - ], - [ - -123.9977384, - 44.9734853 - ], - [ - -123.9977902, - 44.9734825 - ], - [ - -123.9978252, - 44.9734735 - ], - [ - -123.9978575, - 44.9734921 - ], - [ - -123.9978578, - 44.9734928 - ], - [ - -123.9978645, - 44.9734967 - ], - [ - -123.9978736, - 44.9735191 - ], - [ - -123.997855, - 44.9735406 - ], - [ - -123.9978869, - 44.9735757 - ], - [ - -123.9979132, - 44.9736093 - ], - [ - -123.9979114, - 44.9736163 - ], - [ - -123.9979062, - 44.9736366 - ], - [ - -123.9979187, - 44.973675 - ], - [ - -123.9979443, - 44.9736884 - ], - [ - -123.9980037, - 44.9736687 - ], - [ - -123.9980446, - 44.9736853 - ], - [ - -123.9980021, - 44.9737271 - ], - [ - -123.9980042, - 44.9737474 - ], - [ - -123.9980325, - 44.9737614 - ], - [ - -123.9980613, - 44.9737757 - ], - [ - -123.9981624, - 44.9738081 - ], - [ - -123.9982106, - 44.9738134 - ], - [ - -123.9982418, - 44.9738167 - ], - [ - -123.9983454, - 44.9738111 - ], - [ - -123.9983889, - 44.9738147 - ], - [ - -123.9984553, - 44.9738073 - ], - [ - -123.998571, - 44.9737944 - ], - [ - -123.9985674, - 44.973772 - ], - [ - -123.998636, - 44.9737592 - ], - [ - -123.9986922, - 44.9737536 - ], - [ - -123.9989209, - 44.9737609 - ], - [ - -123.9991139, - 44.9737504 - ], - [ - -123.9992017, - 44.9737431 - ], - [ - -123.9993007, - 44.9737431 - ], - [ - -123.9995335, - 44.9737235 - ], - [ - -123.9996152, - 44.9737225 - ], - [ - -123.9996627, - 44.973689 - ], - [ - -123.9996831, - 44.973677 - ], - [ - -123.9997312, - 44.9736487 - ], - [ - -123.9998767, - 44.9736267 - ], - [ - -123.9999081, - 44.9736219 - ], - [ - -124.0000799, - 44.9735898 - ], - [ - -124.0001038, - 44.9735854 - ], - [ - -124.0001946, - 44.9735917 - ], - [ - -124.0002986, - 44.9735547 - ], - [ - -124.000306, - 44.9735211 - ], - [ - -124.0003099, - 44.9735038 - ], - [ - -124.0003051, - 44.9734593 - ], - [ - -124.0001373, - 44.9734484 - ], - [ - -124.0001726, - 44.9733062 - ], - [ - -124.0001767, - 44.9732897 - ], - [ - -124.0001207, - 44.9731846 - ], - [ - -123.9999892, - 44.9730921 - ], - [ - -124.0001023, - 44.9730183 - ], - [ - -124.0001621, - 44.973018 - ], - [ - -124.0002372, - 44.9729966 - ], - [ - -124.0002805, - 44.9729631 - ], - [ - -124.0003227, - 44.9729106 - ], - [ - -124.0003381, - 44.9728962 - ], - [ - -124.0003834, - 44.9728538 - ], - [ - -124.0004568, - 44.9727978 - ], - [ - -124.0005182, - 44.9727509 - ], - [ - -124.0005312, - 44.9727409 - ], - [ - -124.0005833, - 44.9726471 - ], - [ - -124.0006061, - 44.972601 - ], - [ - -124.0006084, - 44.9725962 - ], - [ - -124.0006641, - 44.9724837 - ], - [ - -124.0007071, - 44.9724026 - ], - [ - -124.0007904, - 44.9722458 - ], - [ - -124.0008711, - 44.972205 - ], - [ - -124.0011165, - 44.9720807 - ], - [ - -124.0012667, - 44.9720047 - ], - [ - -124.0013375, - 44.9719462 - ], - [ - -124.00134, - 44.9719441 - ], - [ - -124.0015452, - 44.9718558 - ], - [ - -124.0015804, - 44.9718404 - ], - [ - -124.0018179, - 44.9717359 - ], - [ - -124.0018304, - 44.9717305 - ], - [ - -124.0018628, - 44.971673 - ], - [ - -124.0020525, - 44.9716253 - ], - [ - -124.0020583, - 44.97163 - ], - [ - -124.002078, - 44.9716391 - ], - [ - -124.0021313, - 44.9716442 - ], - [ - -124.0021837, - 44.9716189 - ], - [ - -124.0022933, - 44.9716206 - ], - [ - -124.0023431, - 44.9716213 - ], - [ - -124.0024194, - 44.9716098 - ], - [ - -124.0024863, - 44.9716013 - ], - [ - -124.0025937, - 44.9715877 - ], - [ - -124.0026793, - 44.9715851 - ], - [ - -124.0028726, - 44.9715791 - ], - [ - -124.0028808, - 44.9715788 - ], - [ - -124.003078, - 44.9715709 - ], - [ - -124.003172, - 44.9715535 - ], - [ - -124.0032395, - 44.9715359 - ], - [ - -124.0032908, - 44.9715225 - ], - [ - -124.0034712, - 44.9715202 - ], - [ - -124.0034887, - 44.97152 - ], - [ - -124.0037149, - 44.9715274 - ], - [ - -124.0038843, - 44.9715329 - ], - [ - -124.0039601, - 44.9715691 - ], - [ - -124.0039765, - 44.9715769 - ], - [ - -124.0042174, - 44.9715727 - ], - [ - -124.0043908, - 44.9716232 - ], - [ - -124.004568, - 44.9717009 - ], - [ - -124.0046752, - 44.9717097 - ], - [ - -124.0046949, - 44.9716855 - ], - [ - -124.0048405, - 44.9716566 - ], - [ - -124.005064, - 44.9716123 - ], - [ - -124.0050547, - 44.9715958 - ], - [ - -124.0052695, - 44.9715432 - ], - [ - -124.0053406, - 44.9715525 - ], - [ - -124.005396, - 44.971591 - ], - [ - -124.005402, - 44.971598 - ], - [ - -124.0056062, - 44.9715665 - ], - [ - -124.0057779, - 44.9715401 - ], - [ - -124.0058084, - 44.9714807 - ], - [ - -124.0058852, - 44.9714149 - ], - [ - -124.0059529, - 44.9714049 - ], - [ - -124.0060047, - 44.9713972 - ], - [ - -124.0062002, - 44.9714272 - ], - [ - -124.0063723, - 44.9714536 - ], - [ - -124.0064705, - 44.9714484 - ], - [ - -124.0064862, - 44.9714476 - ], - [ - -124.0066022, - 44.9714313 - ], - [ - -124.0067223, - 44.9714144 - ], - [ - -124.0067614, - 44.9713895 - ], - [ - -124.0068184, - 44.9713938 - ], - [ - -124.0068408, - 44.9713954 - ], - [ - -124.0069482, - 44.9713604 - ], - [ - -124.0070592, - 44.971304 - ], - [ - -124.0071066, - 44.9712799 - ], - [ - -124.0072221, - 44.9712063 - ], - [ - -124.0073226, - 44.9711421 - ], - [ - -124.0073699, - 44.9711169 - ], - [ - -124.0075075, - 44.9710437 - ], - [ - -124.0075248, - 44.9710347 - ], - [ - -124.0076784, - 44.9709547 - ], - [ - -124.0076861, - 44.9709506 - ], - [ - -124.0078044, - 44.9709011 - ], - [ - -124.0078442, - 44.9708845 - ], - [ - -124.0079271, - 44.9708499 - ], - [ - -124.0079681, - 44.9708328 - ], - [ - -124.0079878, - 44.9708246 - ], - [ - -124.0080054, - 44.9708197 - ], - [ - -124.0080464, - 44.9708085 - ], - [ - -124.0080873, - 44.9707972 - ], - [ - -124.0081028, - 44.970793 - ], - [ - -124.0081209, - 44.9707824 - ], - [ - -124.00815, - 44.9707655 - ], - [ - -124.0081643, - 44.9707572 - ], - [ - -124.0081777, - 44.9707478 - ], - [ - -124.0082127, - 44.9707234 - ], - [ - -124.008243, - 44.9707023 - ], - [ - -124.0082734, - 44.9706812 - ], - [ - -124.0083069, - 44.9706578 - ], - [ - -124.0083405, - 44.9706344 - ], - [ - -124.0083741, - 44.970611 - ], - [ - -124.0084105, - 44.9705857 - ], - [ - -124.008444, - 44.9705623 - ], - [ - -124.0084665, - 44.9705466 - ], - [ - -124.0084504, - 44.9705112 - ], - [ - -124.0084011, - 44.9704028 - ], - [ - -124.0083726, - 44.9703404 - ], - [ - -124.0082655, - 44.9702533 - ], - [ - -124.0082627, - 44.9702081 - ], - [ - -124.0082653, - 44.9702056 - ], - [ - -124.0082942, - 44.9701776 - ], - [ - -124.0083108, - 44.9701614 - ], - [ - -124.0083202, - 44.9701471 - ], - [ - -124.0084157, - 44.9700044 - ], - [ - -124.0084092, - 44.9699232 - ], - [ - -124.0084461, - 44.9698769 - ], - [ - -124.008597, - 44.9696371 - ], - [ - -124.0086467, - 44.9696175 - ], - [ - -124.0088185, - 44.9695127 - ], - [ - -124.0090788, - 44.9693961 - ], - [ - -124.0092131, - 44.9693016 - ], - [ - -124.0091617, - 44.9692941 - ], - [ - -124.0095015, - 44.9692294 - ], - [ - -124.0096224, - 44.9691632 - ], - [ - -124.0090866, - 44.968106 - ], - [ - -124.0090219, - 44.9677489 - ], - [ - -124.0088419, - 44.9676657 - ], - [ - -124.0086282, - 44.9675179 - ], - [ - -124.0083652, - 44.9673988 - ], - [ - -124.0080805, - 44.967344 - ], - [ - -124.0077979, - 44.9672285 - ], - [ - -124.0075916, - 44.9671792 - ], - [ - -124.0075449, - 44.9671607 - ], - [ - -124.0072758, - 44.9670315 - ], - [ - -124.0070066, - 44.966932 - ], - [ - -124.006718, - 44.9668137 - ], - [ - -124.0064844, - 44.9667573 - ], - [ - -124.0060765, - 44.966779 - ], - [ - -124.0058495, - 44.9668314 - ], - [ - -124.0054821, - 44.9668882 - ], - [ - -124.0051822, - 44.9668968 - ], - [ - -124.0050941, - 44.96692 - ], - [ - -124.0050925, - 44.9670001 - ], - [ - -124.0049555, - 44.9670588 - ], - [ - -124.0046508, - 44.9670955 - ], - [ - -124.004577, - 44.9671431 - ], - [ - -124.0045181, - 44.9672267 - ], - [ - -124.0043666, - 44.9672586 - ], - [ - -124.0043325, - 44.9672643 - ], - [ - -124.0043325, - 44.9663106 - ], - [ - -124.0043325, - 44.9662009 - ], - [ - -124.0043325, - 44.9660533 - ], - [ - -124.0043325, - 44.9660363 - ], - [ - -124.0043325, - 44.9659814 - ], - [ - -124.0043325, - 44.9659648 - ], - [ - -124.0043325, - 44.965762 - ], - [ - -124.0043325, - 44.9655837 - ], - [ - -124.0043325, - 44.9652134 - ], - [ - -124.0043325, - 44.9648842 - ], - [ - -124.0043325, - 44.9647197 - ], - [ - -124.0043325, - 44.9646155 - ], - [ - -124.0043308, - 44.9644454 - ], - [ - -124.0043028, - 44.9616326 - ], - [ - -124.0043012, - 44.9614679 - ], - [ - -124.0042963, - 44.9609738 - ], - [ - -124.0042701, - 44.9583444 - ], - [ - -124.004268, - 44.9581286 - ], - [ - -124.004263, - 44.9576223 - ], - [ - -124.0042619, - 44.9575151 - ], - [ - -124.0042606, - 44.957387 - ], - [ - -124.0042601, - 44.9573388 - ], - [ - -124.0042601, - 44.9573322 - ], - [ - -124.004256, - 44.956236 - ], - [ - -124.004247, - 44.9538544 - ], - [ - -124.004709, - 44.9538619 - ], - [ - -124.0050953, - 44.9538665 - ], - [ - -124.005249, - 44.9538684 - ], - [ - -124.0057537, - 44.9538744 - ], - [ - -124.006156, - 44.9538792 - ], - [ - -124.0063161, - 44.9538811 - ], - [ - -124.0067151, - 44.9538905 - ], - [ - -124.0071124, - 44.9538998 - ], - [ - -124.007272, - 44.9539031 - ], - [ - -124.007737, - 44.9539106 - ], - [ - -124.0080872, - 44.9539162 - ], - [ - -124.0083653, - 44.9539207 - ], - [ - -124.0086434, - 44.9539252 - ], - [ - -124.0089215, - 44.9539296 - ], - [ - -124.0091996, - 44.9539341 - ], - [ - -124.0095163, - 44.95394 - ], - [ - -124.00951, - 44.9534584 - ], - [ - -124.0094932, - 44.9521689 - ], - [ - -124.0094695, - 44.9503522 - ], - [ - -124.0098435, - 44.9503599 - ], - [ - -124.0099219, - 44.9503615 - ], - [ - -124.0100002, - 44.9503631 - ], - [ - -124.0107246, - 44.9503779 - ], - [ - -124.0115149, - 44.950394 - ], - [ - -124.0126726, - 44.9504177 - ], - [ - -124.0132778, - 44.95043 - ], - [ - -124.0138551, - 44.9504463 - ], - [ - -124.0138562, - 44.9504438 - ], - [ - -124.0138572, - 44.9504413 - ], - [ - -124.0138583, - 44.9504388 - ], - [ - -124.0138594, - 44.9504364 - ], - [ - -124.0138604, - 44.9504339 - ], - [ - -124.0138615, - 44.9504314 - ], - [ - -124.0138626, - 44.950429 - ], - [ - -124.0138637, - 44.9504265 - ], - [ - -124.0138648, - 44.950424 - ], - [ - -124.0138659, - 44.9504216 - ], - [ - -124.013867, - 44.9504191 - ], - [ - -124.0138681, - 44.9504166 - ], - [ - -124.0138692, - 44.9504142 - ], - [ - -124.0138703, - 44.9504117 - ], - [ - -124.0138714, - 44.9504092 - ], - [ - -124.0138725, - 44.9504068 - ], - [ - -124.0138736, - 44.9504043 - ], - [ - -124.0138747, - 44.9504019 - ], - [ - -124.0138758, - 44.9503994 - ], - [ - -124.013877, - 44.9503969 - ], - [ - -124.0138781, - 44.9503945 - ], - [ - -124.0138792, - 44.950392 - ], - [ - -124.0138803, - 44.9503896 - ], - [ - -124.0138815, - 44.9503871 - ], - [ - -124.0138826, - 44.9503847 - ], - [ - -124.0138838, - 44.9503822 - ], - [ - -124.0138849, - 44.9503798 - ], - [ - -124.0138861, - 44.9503773 - ], - [ - -124.0138872, - 44.9503749 - ], - [ - -124.0138884, - 44.9503724 - ], - [ - -124.0138895, - 44.95037 - ], - [ - -124.0138907, - 44.9503675 - ], - [ - -124.0138919, - 44.9503651 - ], - [ - -124.013893, - 44.9503626 - ], - [ - -124.0138942, - 44.9503602 - ], - [ - -124.0138954, - 44.9503577 - ], - [ - -124.0138966, - 44.9503553 - ], - [ - -124.0138978, - 44.9503528 - ], - [ - -124.0138989, - 44.9503504 - ], - [ - -124.0139001, - 44.9503479 - ], - [ - -124.0139013, - 44.9503455 - ], - [ - -124.0139025, - 44.9503431 - ], - [ - -124.0139037, - 44.9503406 - ], - [ - -124.013905, - 44.9503381 - ], - [ - -124.0139062, - 44.9503355 - ], - [ - -124.0139075, - 44.950333 - ], - [ - -124.0139087, - 44.9503305 - ], - [ - -124.01391, - 44.9503279 - ], - [ - -124.0139113, - 44.9503254 - ], - [ - -124.0139125, - 44.9503229 - ], - [ - -124.0139138, - 44.9503204 - ], - [ - -124.0139151, - 44.9503178 - ], - [ - -124.0139164, - 44.9503153 - ], - [ - -124.0139177, - 44.9503128 - ], - [ - -124.013919, - 44.9503102 - ], - [ - -124.0139202, - 44.9503077 - ], - [ - -124.0139215, - 44.9503052 - ], - [ - -124.0139228, - 44.9503027 - ], - [ - -124.0139241, - 44.9503001 - ], - [ - -124.0139254, - 44.9502976 - ], - [ - -124.0139268, - 44.9502951 - ], - [ - -124.0139281, - 44.9502926 - ], - [ - -124.0139294, - 44.9502901 - ], - [ - -124.0139307, - 44.9502876 - ], - [ - -124.013932, - 44.950285 - ], - [ - -124.0139334, - 44.9502825 - ], - [ - -124.0139347, - 44.95028 - ], - [ - -124.013936, - 44.9502775 - ], - [ - -124.0139374, - 44.950275 - ], - [ - -124.0139387, - 44.9502725 - ], - [ - -124.01394, - 44.95027 - ], - [ - -124.0139414, - 44.9502674 - ], - [ - -124.0139427, - 44.9502649 - ], - [ - -124.0139441, - 44.9502624 - ], - [ - -124.0139455, - 44.9502599 - ], - [ - -124.0139468, - 44.9502574 - ], - [ - -124.0139482, - 44.9502549 - ], - [ - -124.0139496, - 44.9502524 - ], - [ - -124.0139509, - 44.9502499 - ], - [ - -124.0139523, - 44.9502474 - ], - [ - -124.0139537, - 44.9502449 - ], - [ - -124.0139551, - 44.9502424 - ], - [ - -124.0139565, - 44.9502399 - ], - [ - -124.0139578, - 44.9502374 - ], - [ - -124.0139592, - 44.9502349 - ], - [ - -124.0139606, - 44.9502324 - ], - [ - -124.013962, - 44.9502299 - ], - [ - -124.0139634, - 44.9502274 - ], - [ - -124.0139648, - 44.9502249 - ], - [ - -124.0139663, - 44.9502224 - ], - [ - -124.0139677, - 44.9502199 - ], - [ - -124.0139691, - 44.9502174 - ], - [ - -124.0139705, - 44.950215 - ], - [ - -124.0139719, - 44.9502125 - ], - [ - -124.0139734, - 44.95021 - ], - [ - -124.0139748, - 44.9502075 - ], - [ - -124.0139762, - 44.950205 - ], - [ - -124.0139777, - 44.9502025 - ], - [ - -124.0139791, - 44.9502 - ], - [ - -124.0139805, - 44.9501976 - ], - [ - -124.013982, - 44.9501951 - ], - [ - -124.0139834, - 44.9501926 - ], - [ - -124.0139849, - 44.9501901 - ], - [ - -124.0139864, - 44.9501876 - ], - [ - -124.0139878, - 44.9501852 - ], - [ - -124.0139893, - 44.9501827 - ], - [ - -124.0139908, - 44.9501802 - ], - [ - -124.0139922, - 44.9501777 - ], - [ - -124.0139937, - 44.9501753 - ], - [ - -124.0139952, - 44.9501728 - ], - [ - -124.0139967, - 44.9501703 - ], - [ - -124.0139982, - 44.9501678 - ], - [ - -124.0139996, - 44.9501654 - ], - [ - -124.0140011, - 44.9501629 - ], - [ - -124.0140026, - 44.9501604 - ], - [ - -124.0140041, - 44.950158 - ], - [ - -124.0140056, - 44.9501555 - ], - [ - -124.0140071, - 44.950153 - ], - [ - -124.0140087, - 44.9501506 - ], - [ - -124.0140102, - 44.9501481 - ], - [ - -124.0140117, - 44.9501457 - ], - [ - -124.0140132, - 44.9501432 - ], - [ - -124.0140147, - 44.9501407 - ], - [ - -124.0140163, - 44.9501383 - ], - [ - -124.0140178, - 44.9501358 - ], - [ - -124.0140193, - 44.9501334 - ], - [ - -124.0140209, - 44.9501309 - ], - [ - -124.0140224, - 44.9501285 - ], - [ - -124.0140239, - 44.950126 - ], - [ - -124.0140255, - 44.9501236 - ], - [ - -124.014027, - 44.9501211 - ], - [ - -124.0140286, - 44.9501187 - ], - [ - -124.0140302, - 44.9501162 - ], - [ - -124.0140317, - 44.9501138 - ], - [ - -124.0140333, - 44.9501113 - ], - [ - -124.0140348, - 44.9501089 - ], - [ - -124.0140364, - 44.9501064 - ], - [ - -124.014038, - 44.950104 - ], - [ - -124.0140396, - 44.9501015 - ], - [ - -124.0140412, - 44.9500991 - ], - [ - -124.0140427, - 44.9500967 - ], - [ - -124.0140443, - 44.9500942 - ], - [ - -124.0140459, - 44.9500918 - ], - [ - -124.0140475, - 44.9500894 - ], - [ - -124.0140491, - 44.9500869 - ], - [ - -124.0140507, - 44.9500845 - ], - [ - -124.0140523, - 44.9500821 - ], - [ - -124.0140539, - 44.9500796 - ], - [ - -124.0140555, - 44.9500772 - ], - [ - -124.0140572, - 44.9500748 - ], - [ - -124.0140588, - 44.9500723 - ], - [ - -124.0140604, - 44.9500699 - ], - [ - -124.014062, - 44.9500675 - ], - [ - -124.0140636, - 44.9500651 - ], - [ - -124.0140653, - 44.9500626 - ], - [ - -124.0140669, - 44.9500602 - ], - [ - -124.0140686, - 44.9500578 - ], - [ - -124.0140702, - 44.9500554 - ], - [ - -124.0140718, - 44.950053 - ], - [ - -124.0140735, - 44.9500505 - ], - [ - -124.0140751, - 44.9500481 - ], - [ - -124.0140768, - 44.9500457 - ], - [ - -124.0140785, - 44.9500433 - ], - [ - -124.0140801, - 44.9500409 - ], - [ - -124.0140818, - 44.9500385 - ], - [ - -124.0140835, - 44.9500361 - ], - [ - -124.0140851, - 44.9500336 - ], - [ - -124.0140868, - 44.9500312 - ], - [ - -124.0140885, - 44.9500288 - ], - [ - -124.0140902, - 44.9500264 - ], - [ - -124.0140918, - 44.950024 - ], - [ - -124.0140935, - 44.9500216 - ], - [ - -124.0140952, - 44.9500192 - ], - [ - -124.0140969, - 44.9500168 - ], - [ - -124.0140986, - 44.9500144 - ], - [ - -124.0141003, - 44.950012 - ], - [ - -124.014102, - 44.9500096 - ], - [ - -124.0141037, - 44.9500072 - ], - [ - -124.0141054, - 44.9500048 - ], - [ - -124.0141072, - 44.9500024 - ], - [ - -124.0141089, - 44.95 - ], - [ - -124.0141106, - 44.9499976 - ], - [ - -124.0141123, - 44.9499952 - ], - [ - -124.0141141, - 44.9499929 - ], - [ - -124.0141158, - 44.9499905 - ], - [ - -124.0141175, - 44.9499881 - ], - [ - -124.0141193, - 44.9499857 - ], - [ - -124.014121, - 44.9499833 - ], - [ - -124.0141228, - 44.9499809 - ], - [ - -124.0141245, - 44.9499785 - ], - [ - -124.0141263, - 44.9499762 - ], - [ - -124.014128, - 44.9499738 - ], - [ - -124.0141298, - 44.9499714 - ], - [ - -124.0141315, - 44.949969 - ], - [ - -124.0141333, - 44.9499667 - ], - [ - -124.0141351, - 44.9499643 - ], - [ - -124.0141368, - 44.9499619 - ], - [ - -124.0141386, - 44.9499595 - ], - [ - -124.0141404, - 44.9499572 - ], - [ - -124.0141422, - 44.9499548 - ], - [ - -124.014144, - 44.9499524 - ], - [ - -124.0141457, - 44.9499501 - ], - [ - -124.0141475, - 44.9499477 - ], - [ - -124.0141493, - 44.9499453 - ], - [ - -124.0141511, - 44.949943 - ], - [ - -124.0141529, - 44.9499406 - ], - [ - -124.0141547, - 44.9499382 - ], - [ - -124.0141565, - 44.9499359 - ], - [ - -124.0141584, - 44.9499335 - ], - [ - -124.0141602, - 44.9499312 - ], - [ - -124.014162, - 44.9499288 - ], - [ - -124.0141638, - 44.9499265 - ], - [ - -124.0141656, - 44.9499241 - ], - [ - -124.0141675, - 44.9499217 - ], - [ - -124.0141693, - 44.9499194 - ], - [ - -124.0141711, - 44.949917 - ], - [ - -124.014173, - 44.9499147 - ], - [ - -124.0141748, - 44.9499124 - ], - [ - -124.0141766, - 44.94991 - ], - [ - -124.0141785, - 44.9499077 - ], - [ - -124.0141803, - 44.9499053 - ], - [ - -124.0141822, - 44.949903 - ], - [ - -124.014184, - 44.9499006 - ], - [ - -124.0141859, - 44.9498983 - ], - [ - -124.0141878, - 44.949896 - ], - [ - -124.0141896, - 44.9498936 - ], - [ - -124.0141915, - 44.9498913 - ], - [ - -124.0141934, - 44.949889 - ], - [ - -124.0141953, - 44.9498866 - ], - [ - -124.0141971, - 44.9498843 - ], - [ - -124.014199, - 44.949882 - ], - [ - -124.0142009, - 44.9498796 - ], - [ - -124.0142028, - 44.9498773 - ], - [ - -124.0142047, - 44.949875 - ], - [ - -124.0142066, - 44.9498727 - ], - [ - -124.0142085, - 44.9498703 - ], - [ - -124.0142104, - 44.949868 - ], - [ - -124.0142123, - 44.9498657 - ], - [ - -124.0142142, - 44.9498634 - ], - [ - -124.0145586, - 44.9494451 - ], - [ - -124.0145586, - 44.9493193 - ], - [ - -124.0145582, - 44.9483745 - ], - [ - -124.014558, - 44.9478955 - ], - [ - -124.0145579, - 44.9476866 - ], - [ - -124.0156312, - 44.9481429 - ], - [ - -124.0157287, - 44.9480245 - ], - [ - -124.0160575, - 44.9476252 - ], - [ - -124.0153717, - 44.9471997 - ], - [ - -124.0153697, - 44.9471994 - ], - [ - -124.0145576, - 44.9471148 - ], - [ - -124.0145575, - 44.9468707 - ], - [ - -124.0151943, - 44.9468898 - ], - [ - -124.0151938, - 44.9459515 - ], - [ - -124.0151935, - 44.9451002 - ], - [ - -124.0145567, - 44.9450782 - ], - [ - -124.0094897, - 44.9449033 - ], - [ - -124.0094965, - 44.943087 - ], - [ - -124.0099606, - 44.9394628 - ], - [ - -124.0104247, - 44.9358386 - ], - [ - -124.0103609, - 44.9336746 - ], - [ - -124.010355, - 44.9334768 - ], - [ - -124.0103545, - 44.9334572 - ], - [ - -124.0103415, - 44.9330176 - ], - [ - -124.010328, - 44.9327782 - ], - [ - -124.0102572, - 44.9328263 - ], - [ - -124.0100697, - 44.932927 - ], - [ - -124.0095982, - 44.9330595 - ], - [ - -124.0091061, - 44.9331566 - ], - [ - -124.0087515, - 44.9331643 - ], - [ - -124.0083129, - 44.9330795 - ], - [ - -124.0079074, - 44.9329348 - ], - [ - -124.0074834, - 44.9327874 - ], - [ - -124.0071086, - 44.9326909 - ], - [ - -124.0067516, - 44.9326593 - ], - [ - -124.0063474, - 44.9326849 - ], - [ - -124.0059642, - 44.9327524 - ], - [ - -124.0057326, - 44.9328119 - ], - [ - -124.0055809, - 44.9328952 - ], - [ - -124.0053524, - 44.9330038 - ], - [ - -124.0049906, - 44.9331261 - ], - [ - -124.004991, - 44.9330031 - ], - [ - -124.0049933, - 44.932189 - ], - [ - -124.0005502, - 44.9321722 - ], - [ - -124.0003104, - 44.9321687 - ], - [ - -123.9996687, - 44.9321593 - ], - [ - -123.9997231, - 44.9306202 - ], - [ - -123.9997264, - 44.9305259 - ], - [ - -123.999759, - 44.9296047 - ], - [ - -123.999764, - 44.9294623 - ], - [ - -124.005001, - 44.9294831 - ], - [ - -124.0050036, - 44.9285779 - ], - [ - -124.0082431, - 44.9285907 - ], - [ - -124.0082612, - 44.9285906 - ], - [ - -124.0084748, - 44.9285915 - ], - [ - -124.0084825, - 44.9285915 - ], - [ - -124.0087864, - 44.9285928 - ], - [ - -124.0087863, - 44.9291716 - ], - [ - -124.0087863, - 44.9294569 - ], - [ - -124.0087863, - 44.9297833 - ], - [ - -124.0087863, - 44.9308284 - ], - [ - -124.0098612, - 44.9308284 - ], - [ - -124.0098614, - 44.9308281 - ], - [ - -124.010209, - 44.9308338 - ], - [ - -124.0102102, - 44.9285983 - ], - [ - -124.0102114, - 44.9282203 - ], - [ - -124.0102115, - 44.9280771 - ], - [ - -124.0102115, - 44.9280497 - ], - [ - -124.0102115, - 44.9279126 - ], - [ - -124.0102116, - 44.9277754 - ], - [ - -124.0102121, - 44.927 - ], - [ - -124.0102122, - 44.9268236 - ], - [ - -124.0102128, - 44.925773 - ], - [ - -124.0102132, - 44.9249782 - ], - [ - -124.0102152, - 44.921412 - ], - [ - -124.0102153, - 44.9213581 - ], - [ - -124.0102239, - 44.9195746 - ], - [ - -124.0102247, - 44.9193977 - ], - [ - -124.0102255, - 44.9192213 - ], - [ - -124.0102265, - 44.9190015 - ], - [ - -124.0102283, - 44.9186289 - ], - [ - -124.0102301, - 44.9182501 - ], - [ - -124.0102329, - 44.9176797 - ], - [ - -124.0102447, - 44.9152137 - ], - [ - -124.0102447, - 44.915206 - ], - [ - -124.0102505, - 44.9140013 - ], - [ - -124.0102429, - 44.9136212 - ], - [ - -124.0102606, - 44.9136222 - ], - [ - -124.0103918, - 44.9136182 - ], - [ - -124.0104442, - 44.9136155 - ], - [ - -124.0104612, - 44.9136147 - ], - [ - -124.0105234, - 44.9136195 - ], - [ - -124.0105725, - 44.9136233 - ], - [ - -124.0106172, - 44.9136166 - ], - [ - -124.0106709, - 44.9136029 - ], - [ - -124.0107315, - 44.9135891 - ], - [ - -124.0108009, - 44.9135882 - ], - [ - -124.0108799, - 44.9135898 - ], - [ - -124.0109611, - 44.9135967 - ], - [ - -124.011057, - 44.9135977 - ], - [ - -124.011136, - 44.9135993 - ], - [ - -124.0112104, - 44.9135863 - ], - [ - -124.0112892, - 44.9135838 - ], - [ - -124.0113584, - 44.913579 - ], - [ - -124.0114459, - 44.9135656 - ], - [ - -124.0115405, - 44.9135547 - ], - [ - -124.0116118, - 44.9135525 - ], - [ - -124.0117044, - 44.913531 - ], - [ - -124.0118217, - 44.913514 - ], - [ - -124.0119435, - 44.9134876 - ], - [ - -124.0120196, - 44.9134719 - ], - [ - -124.0121348, - 44.913451 - ], - [ - -124.0122308, - 44.9134324 - ], - [ - -124.0122412, - 44.9134304 - ], - [ - -124.0122499, - 44.9134287 - ], - [ - -124.0123539, - 44.9134094 - ], - [ - -124.0124679, - 44.9133992 - ], - [ - -124.0125825, - 44.9133984 - ], - [ - -124.0126024, - 44.9133961 - ], - [ - -124.0127141, - 44.9133836 - ], - [ - -124.0128181, - 44.9133937 - ], - [ - -124.0128812, - 44.9134118 - ], - [ - -124.0129342, - 44.9133888 - ], - [ - -124.0129851, - 44.9133797 - ], - [ - -124.0129881, - 44.9133791 - ], - [ - -124.0130061, - 44.9133825 - ], - [ - -124.0130623, - 44.9133929 - ], - [ - -124.0131193, - 44.9134045 - ], - [ - -124.0131919, - 44.9133929 - ], - [ - -124.0132852, - 44.9133347 - ], - [ - -124.013357, - 44.9133098 - ], - [ - -124.0134605, - 44.9133132 - ], - [ - -124.0134676, - 44.9133141 - ], - [ - -124.0135363, - 44.9133229 - ], - [ - -124.0135832, - 44.9133215 - ], - [ - -124.0136446, - 44.9132808 - ], - [ - -124.013695, - 44.9132753 - ], - [ - -124.0137622, - 44.9132632 - ], - [ - -124.013812, - 44.9132543 - ], - [ - -124.0139559, - 44.9132652 - ], - [ - -124.0139739, - 44.9132666 - ], - [ - -124.0140538, - 44.9132841 - ], - [ - -124.0141495, - 44.9132865 - ], - [ - -124.0142659, - 44.9132841 - ], - [ - -124.0142755, - 44.913284 - ], - [ - -124.0143625, - 44.9132705 - ], - [ - -124.0144714, - 44.9132685 - ], - [ - -124.0145368, - 44.9132702 - ], - [ - -124.0145899, - 44.9132715 - ], - [ - -124.0146947, - 44.9132643 - ], - [ - -124.0147329, - 44.9132674 - ], - [ - -124.0147886, - 44.913272 - ], - [ - -124.0149072, - 44.9132763 - ], - [ - -124.0149259, - 44.9132757 - ], - [ - -124.0149954, - 44.9132736 - ], - [ - -124.0150846, - 44.9132882 - ], - [ - -124.0151189, - 44.9132921 - ], - [ - -124.0151678, - 44.9132977 - ], - [ - -124.0152618, - 44.9133013 - ], - [ - -124.0153118, - 44.9133129 - ], - [ - -124.0153742, - 44.9133272 - ], - [ - -124.0155011, - 44.9133433 - ], - [ - -124.0155048, - 44.913343 - ], - [ - -124.0155854, - 44.913336 - ], - [ - -124.0155964, - 44.9133351 - ], - [ - -124.0156716, - 44.913334 - ], - [ - -124.0156771, - 44.9133339 - ], - [ - -124.0157397, - 44.9133546 - ], - [ - -124.0158215, - 44.9133708 - ], - [ - -124.0158683, - 44.9133738 - ], - [ - -124.0159045, - 44.9133762 - ], - [ - -124.0159836, - 44.9133791 - ], - [ - -124.0160613, - 44.9133736 - ], - [ - -124.0160846, - 44.913372 - ], - [ - -124.0161516, - 44.9133619 - ], - [ - -124.0162357, - 44.9133539 - ], - [ - -124.0162717, - 44.9133582 - ], - [ - -124.0163167, - 44.9133568 - ], - [ - -124.0163478, - 44.9133438 - ], - [ - -124.016371, - 44.9133538 - ], - [ - -124.016392, - 44.9133598 - ], - [ - -124.0164197, - 44.9133509 - ], - [ - -124.0164391, - 44.9133303 - ], - [ - -124.016448, - 44.9133276 - ], - [ - -124.0165085, - 44.9133094 - ], - [ - -124.0165842, - 44.9133178 - ], - [ - -124.016641, - 44.9133274 - ], - [ - -124.0166772, - 44.9133336 - ], - [ - -124.0167684, - 44.9133495 - ], - [ - -124.0168337, - 44.9133555 - ], - [ - -124.016844, - 44.9133565 - ], - [ - -124.0168913, - 44.9133617 - ], - [ - -124.0169222, - 44.9133754 - ], - [ - -124.0169648, - 44.9133968 - ], - [ - -124.0170504, - 44.9134142 - ], - [ - -124.0171279, - 44.9134212 - ], - [ - -124.0172188, - 44.9134246 - ], - [ - -124.0172215, - 44.9134247 - ], - [ - -124.0172962, - 44.9134478 - ], - [ - -124.0173787, - 44.9134746 - ], - [ - -124.0174109, - 44.913488 - ], - [ - -124.0174326, - 44.913497 - ], - [ - -124.0174913, - 44.9135339 - ], - [ - -124.0175698, - 44.9135582 - ], - [ - -124.0176029, - 44.9135652 - ], - [ - -124.0176307, - 44.913571 - ], - [ - -124.0177426, - 44.9135953 - ], - [ - -124.0177953, - 44.9136073 - ], - [ - -124.0178303, - 44.9136153 - ], - [ - -124.0179095, - 44.9136502 - ], - [ - -124.0179872, - 44.9136871 - ], - [ - -124.0179888, - 44.9136879 - ], - [ - -124.0180473, - 44.9137221 - ], - [ - -124.0180928, - 44.9137744 - ], - [ - -124.0181661, - 44.9138357 - ], - [ - -124.0182869, - 44.9139821 - ], - [ - -124.0182885, - 44.9140033 - ], - [ - -124.0182917, - 44.9140467 - ], - [ - -124.0183095, - 44.9141406 - ], - [ - -124.0183252, - 44.9142267 - ], - [ - -124.0183582, - 44.9142781 - ], - [ - -124.0183969, - 44.9143384 - ], - [ - -124.0183991, - 44.9143469 - ], - [ - -124.0184165, - 44.9144156 - ], - [ - -124.0184297, - 44.9144681 - ], - [ - -124.0184485, - 44.9145091 - ], - [ - -124.0184828, - 44.9145839 - ], - [ - -124.0185026, - 44.914684 - ], - [ - -124.0185019, - 44.9146905 - ], - [ - -124.0184938, - 44.9147692 - ], - [ - -124.0185521, - 44.9148281 - ], - [ - -124.0185568, - 44.9148328 - ], - [ - -124.0185939, - 44.9148703 - ], - [ - -124.0187497, - 44.914966 - ], - [ - -124.0188767, - 44.9150155 - ], - [ - -124.0189261, - 44.915105 - ], - [ - -124.0189275, - 44.9151074 - ], - [ - -124.018964, - 44.9151517 - ], - [ - -124.0190237, - 44.9152674 - ], - [ - -124.0190501, - 44.9153307 - ], - [ - -124.0190436, - 44.9153801 - ], - [ - -124.0190399, - 44.9154086 - ], - [ - -124.0190024, - 44.9154712 - ], - [ - -124.0190804, - 44.9155183 - ], - [ - -124.0190913, - 44.9155741 - ], - [ - -124.0191474, - 44.9156311 - ], - [ - -124.0191628, - 44.9156553 - ], - [ - -124.0191974, - 44.9157097 - ], - [ - -124.0192272, - 44.9157676 - ], - [ - -124.0192409, - 44.915793 - ], - [ - -124.0192823, - 44.9158701 - ], - [ - -124.0192894, - 44.9159233 - ], - [ - -124.0192916, - 44.9159305 - ], - [ - -124.0193127, - 44.9159974 - ], - [ - -124.0193349, - 44.9160528 - ], - [ - -124.0193731, - 44.9160623 - ], - [ - -124.0193845, - 44.9160683 - ], - [ - -124.0194507, - 44.9161027 - ], - [ - -124.0194753, - 44.9161981 - ], - [ - -124.01951, - 44.916316 - ], - [ - -124.0195465, - 44.9164404 - ], - [ - -124.0195661, - 44.9164947 - ], - [ - -124.0195827, - 44.9165408 - ], - [ - -124.0196203, - 44.9166011 - ], - [ - -124.019633, - 44.9166186 - ], - [ - -124.0196695, - 44.916669 - ], - [ - -124.0196574, - 44.916756 - ], - [ - -124.0196565, - 44.9167629 - ], - [ - -124.0196195, - 44.9168335 - ], - [ - -124.0196352, - 44.916893 - ], - [ - -124.0196391, - 44.9169077 - ], - [ - -124.0196689, - 44.9169656 - ], - [ - -124.0196531, - 44.9170142 - ], - [ - -124.0196844, - 44.9171075 - ], - [ - -124.0197676, - 44.917285 - ], - [ - -124.019762, - 44.9173053 - ], - [ - -124.0197242, - 44.917442 - ], - [ - -124.0197115, - 44.917488 - ], - [ - -124.0196624, - 44.9176132 - ], - [ - -124.0194985, - 44.917778 - ], - [ - -124.0185314, - 44.9182089 - ], - [ - -124.0185098, - 44.9182206 - ], - [ - -124.0184869, - 44.918233 - ], - [ - -124.0181702, - 44.9184046 - ], - [ - -124.0181329, - 44.9184248 - ], - [ - -124.0180799, - 44.9184992 - ], - [ - -124.0180464, - 44.9185463 - ], - [ - -124.0179661, - 44.9185872 - ], - [ - -124.0179139, - 44.9186139 - ], - [ - -124.0178875, - 44.9186273 - ], - [ - -124.0177775, - 44.9186805 - ], - [ - -124.0177771, - 44.9186806 - ], - [ - -124.017723, - 44.9187305 - ], - [ - -124.0176543, - 44.9187432 - ], - [ - -124.0176214, - 44.9187493 - ], - [ - -124.0174864, - 44.9187853 - ], - [ - -124.0174602, - 44.9187923 - ], - [ - -124.0173504, - 44.918851 - ], - [ - -124.0173134, - 44.9188708 - ], - [ - -124.0172951, - 44.9188806 - ], - [ - -124.0171883, - 44.9189454 - ], - [ - -124.0171629, - 44.9189608 - ], - [ - -124.0169793, - 44.9190759 - ], - [ - -124.0169356, - 44.9190935 - ], - [ - -124.0167127, - 44.9191834 - ], - [ - -124.0166584, - 44.9192135 - ], - [ - -124.0165445, - 44.9192766 - ], - [ - -124.0164135, - 44.9193231 - ], - [ - -124.0163024, - 44.9193625 - ], - [ - -124.0162654, - 44.9193842 - ], - [ - -124.016144, - 44.9194554 - ], - [ - -124.0161184, - 44.9194704 - ], - [ - -124.0159998, - 44.9195003 - ], - [ - -124.0158402, - 44.9195825 - ], - [ - -124.015828, - 44.9195888 - ], - [ - -124.015778, - 44.919621 - ], - [ - -124.0156575, - 44.9196987 - ], - [ - -124.0156159, - 44.9197172 - ], - [ - -124.0155371, - 44.9197523 - ], - [ - -124.0154403, - 44.9198053 - ], - [ - -124.0153145, - 44.9198741 - ], - [ - -124.0151671, - 44.9199355 - ], - [ - -124.0151378, - 44.9199477 - ], - [ - -124.0149567, - 44.9200334 - ], - [ - -124.0148561, - 44.9200938 - ], - [ - -124.0147742, - 44.9201428 - ], - [ - -124.0147527, - 44.9201572 - ], - [ - -124.0147085, - 44.9201869 - ], - [ - -124.0146338, - 44.920229 - ], - [ - -124.0145441, - 44.9202779 - ], - [ - -124.0144449, - 44.9203542 - ], - [ - -124.0143133, - 44.920466 - ], - [ - -124.014135, - 44.9205986 - ], - [ - -124.0140645, - 44.9206611 - ], - [ - -124.0140216, - 44.9207153 - ], - [ - -124.0139708, - 44.920742 - ], - [ - -124.0139433, - 44.9208091 - ], - [ - -124.0139131, - 44.9208507 - ], - [ - -124.0139098, - 44.9208646 - ], - [ - -124.0139069, - 44.9208767 - ], - [ - -124.0138955, - 44.9209254 - ], - [ - -124.0138926, - 44.920987 - ], - [ - -124.0139148, - 44.9210503 - ], - [ - -124.0139677, - 44.9211182 - ], - [ - -124.014024, - 44.9211885 - ], - [ - -124.0140904, - 44.9212531 - ], - [ - -124.0141325, - 44.9213035 - ], - [ - -124.0142, - 44.921344 - ], - [ - -124.014226, - 44.9213598 - ], - [ - -124.0142811, - 44.9213932 - ], - [ - -124.0143358, - 44.9214378 - ], - [ - -124.0143964, - 44.9214932 - ], - [ - -124.0144722, - 44.9215408 - ], - [ - -124.0145956, - 44.9216506 - ], - [ - -124.0145937, - 44.9217078 - ], - [ - -124.014595, - 44.9217603 - ], - [ - -124.0145955, - 44.9217764 - ], - [ - -124.0146385, - 44.9218416 - ], - [ - -124.0146928, - 44.9219213 - ], - [ - -124.0147384, - 44.9219864 - ], - [ - -124.0148151, - 44.9220506 - ], - [ - -124.0149549, - 44.922124 - ], - [ - -124.0150676, - 44.9222267 - ], - [ - -124.0150444, - 44.9223143 - ], - [ - -124.0150291, - 44.9223497 - ], - [ - -124.0149715, - 44.922483 - ], - [ - -124.0149005, - 44.9226922 - ], - [ - -124.0148862, - 44.9227505 - ], - [ - -124.0148762, - 44.9228469 - ], - [ - -124.0148469, - 44.923015 - ], - [ - -124.0148412, - 44.9230844 - ], - [ - -124.0148234, - 44.9232149 - ], - [ - -124.0148046, - 44.9233299 - ], - [ - -124.0148238, - 44.9234169 - ], - [ - -124.0148376, - 44.9234786 - ], - [ - -124.0148172, - 44.9235675 - ], - [ - -124.0148258, - 44.923611 - ], - [ - -124.01481, - 44.9236764 - ], - [ - -124.0147461, - 44.9237363 - ], - [ - -124.0147483, - 44.923773 - ], - [ - -124.0147389, - 44.9238453 - ], - [ - -124.0147102, - 44.9239282 - ], - [ - -124.0146625, - 44.9241209 - ], - [ - -124.0146451, - 44.9241949 - ], - [ - -124.0146539, - 44.9243373 - ], - [ - -124.0146651, - 44.9244556 - ], - [ - -124.0146915, - 44.9246276 - ], - [ - -124.0147096, - 44.9247956 - ], - [ - -124.0146818, - 44.9249125 - ], - [ - -124.0145473, - 44.9250023 - ], - [ - -124.0144571, - 44.9251156 - ], - [ - -124.0144289, - 44.925227 - ], - [ - -124.014289, - 44.9254623 - ], - [ - -124.0142066, - 44.9254988 - ], - [ - -124.0142062, - 44.9255008 - ], - [ - -124.0142059, - 44.9255028 - ], - [ - -124.0142056, - 44.9255048 - ], - [ - -124.0142053, - 44.9255068 - ], - [ - -124.014205, - 44.9255089 - ], - [ - -124.0142047, - 44.9255109 - ], - [ - -124.0142044, - 44.9255129 - ], - [ - -124.0142041, - 44.9255149 - ], - [ - -124.0142039, - 44.9255169 - ], - [ - -124.0142036, - 44.925519 - ], - [ - -124.0142034, - 44.925521 - ], - [ - -124.0141216, - 44.9261218 - ], - [ - -124.0141936, - 44.9261592 - ], - [ - -124.0142366, - 44.9261905 - ], - [ - -124.0142897, - 44.9262294 - ], - [ - -124.0143217, - 44.9262621 - ], - [ - -124.0143724, - 44.9263134 - ], - [ - -124.014415, - 44.9263639 - ], - [ - -124.014454, - 44.9264065 - ], - [ - -124.0144931, - 44.9264503 - ], - [ - -124.0145386, - 44.9264815 - ], - [ - -124.0145872, - 44.9265257 - ], - [ - -124.0146223, - 44.92656 - ], - [ - -124.0146865, - 44.9266043 - ], - [ - -124.0147843, - 44.9266716 - ], - [ - -124.015019, - 44.9268206 - ], - [ - -124.0151458, - 44.9269076 - ], - [ - -124.0152419, - 44.9269646 - ], - [ - -124.0154122, - 44.9270373 - ], - [ - -124.0154814, - 44.9270668 - ], - [ - -124.0156137, - 44.9271078 - ], - [ - -124.0157222, - 44.9271267 - ], - [ - -124.0158225, - 44.9271242 - ], - [ - -124.0159224, - 44.9271143 - ], - [ - -124.0159824, - 44.9270888 - ], - [ - -124.0160339, - 44.9270539 - ], - [ - -124.0160488, - 44.9270526 - ], - [ - -124.0162357, - 44.9270368 - ], - [ - -124.0162412, - 44.9270376 - ], - [ - -124.0163855, - 44.9270599 - ], - [ - -124.0164364, - 44.9270734 - ], - [ - -124.0165537, - 44.9271059 - ], - [ - -124.0166607, - 44.9271152 - ], - [ - -124.0168884, - 44.9271669 - ], - [ - -124.0170969, - 44.927194 - ], - [ - -124.017677, - 44.9273062 - ], - [ - -124.0181876, - 44.9274416 - ], - [ - -124.0184454, - 44.9275973 - ], - [ - -124.0187513, - 44.9275752 - ], - [ - -124.0187475, - 44.9275124 - ], - [ - -124.0187618, - 44.9273608 - ], - [ - -124.0189362, - 44.9273134 - ], - [ - -124.0191724, - 44.9273103 - ], - [ - -124.0194389, - 44.9273189 - ], - [ - -124.0195071, - 44.9272748 - ], - [ - -124.0195884, - 44.9272513 - ], - [ - -124.0196891, - 44.9272565 - ], - [ - -124.0197443, - 44.927385 - ], - [ - -124.0200146, - 44.9274564 - ], - [ - -124.0202208, - 44.9274458 - ], - [ - -124.0204611, - 44.9274131 - ], - [ - -124.0206133, - 44.927401 - ], - [ - -124.0207282, - 44.9273924 - ], - [ - -124.0210691, - 44.9273514 - ], - [ - -124.0212815, - 44.9273143 - ], - [ - -124.0215149, - 44.9273015 - ], - [ - -124.0215778, - 44.9273124 - ], - [ - -124.0217043, - 44.9273345 - ], - [ - -124.0220632, - 44.9273955 - ], - [ - -124.0224295, - 44.9275117 - ], - [ - -124.0227721, - 44.927626 - ], - [ - -124.0230619, - 44.9277164 - ], - [ - -124.0232639, - 44.9277794 - ], - [ - -124.0235981, - 44.9278828 - ], - [ - -124.0242229, - 44.9281064 - ], - [ - -124.0243809, - 44.9281871 - ], - [ - -124.0247333, - 44.9284086 - ], - [ - -124.0249449, - 44.9285491 - ], - [ - -124.0250872, - 44.9286784 - ], - [ - -124.0251722, - 44.9287556 - ], - [ - -124.0252218, - 44.9289436 - ], - [ - -124.0252341, - 44.9289902 - ], - [ - -124.0253078, - 44.9292655 - ], - [ - -124.0253825, - 44.9295407 - ], - [ - -124.0253857, - 44.9295524 - ], - [ - -124.0253917, - 44.929678 - ], - [ - -124.0254016, - 44.9298837 - ], - [ - -124.0254114, - 44.9300896 - ], - [ - -124.025397, - 44.9302265 - ], - [ - -124.0253725, - 44.9304591 - ], - [ - -124.0253673, - 44.9306326 - ], - [ - -124.0253475, - 44.9308804 - ], - [ - -124.0253554, - 44.9310104 - ], - [ - -124.0253317, - 44.9311945 - ], - [ - -124.0253178, - 44.9313459 - ], - [ - -124.0252935, - 44.9315245 - ], - [ - -124.0252412, - 44.9318814 - ], - [ - -124.0252169, - 44.9321847 - ], - [ - -124.0251831, - 44.9322802 - ], - [ - -124.0251038, - 44.9325047 - ], - [ - -124.024916, - 44.9328752 - ], - [ - -124.0248757, - 44.9329618 - ], - [ - -124.0248261, - 44.9330686 - ], - [ - -124.0248023, - 44.9331278 - ], - [ - -124.0247749, - 44.933196 - ], - [ - -124.0247672, - 44.9332152 - ], - [ - -124.0247332, - 44.9333709 - ], - [ - -124.0247116, - 44.9334702 - ], - [ - -124.0247022, - 44.9335936 - ], - [ - -124.02468, - 44.933839 - ], - [ - -124.0246207, - 44.9340339 - ], - [ - -124.0246076, - 44.9341063 - ], - [ - -124.0245852, - 44.9342304 - ], - [ - -124.0245574, - 44.9343856 - ], - [ - -124.0245287, - 44.934582 - ], - [ - -124.0245206, - 44.9346372 - ], - [ - -124.0245122, - 44.9346948 - ], - [ - -124.0245106, - 44.9347133 - ], - [ - -124.0244982, - 44.9348545 - ], - [ - -124.0244835, - 44.9350021 - ], - [ - -124.0245198, - 44.9352005 - ], - [ - -124.0245794, - 44.9353642 - ], - [ - -124.0245888, - 44.9353997 - ], - [ - -124.0246088, - 44.9354752 - ], - [ - -124.0246663, - 44.9356523 - ], - [ - -124.0247472, - 44.9358004 - ], - [ - -124.0248064, - 44.9359864 - ], - [ - -124.0248745, - 44.9362129 - ], - [ - -124.0249756, - 44.9364583 - ], - [ - -124.0249582, - 44.9365296 - ], - [ - -124.0249573, - 44.9365947 - ], - [ - -124.0249561, - 44.9366797 - ], - [ - -124.0249618, - 44.936757 - ], - [ - -124.0249617, - 44.9368004 - ], - [ - -124.0249617, - 44.9368405 - ], - [ - -124.0250087, - 44.9369 - ], - [ - -124.0250548, - 44.937014 - ], - [ - -124.0250433, - 44.9370908 - ], - [ - -124.0250519, - 44.937122 - ], - [ - -124.0250911, - 44.9371932 - ], - [ - -124.0251425, - 44.9372488 - ], - [ - -124.0251673, - 44.9373048 - ], - [ - -124.0251452, - 44.9373643 - ], - [ - -124.0250994, - 44.9375372 - ], - [ - -124.0250719, - 44.9376104 - ], - [ - -124.0250449, - 44.9377025 - ], - [ - -124.0250561, - 44.9379174 - ], - [ - -124.0250134, - 44.9379589 - ], - [ - -124.0249247, - 44.9380204 - ], - [ - -124.024863, - 44.9381005 - ], - [ - -124.0248659, - 44.9381925 - ], - [ - -124.0248662, - 44.9382795 - ], - [ - -124.0249161, - 44.938368 - ], - [ - -124.0249234, - 44.9384297 - ], - [ - -124.0248276, - 44.9386054 - ], - [ - -124.0247787, - 44.9386888 - ], - [ - -124.0247873, - 44.9387201 - ], - [ - -124.0248302, - 44.9387656 - ], - [ - -124.0248739, - 44.9388065 - ], - [ - -124.024859, - 44.9388619 - ], - [ - -124.0248022, - 44.9389094 - ], - [ - -124.0248502, - 44.9389436 - ], - [ - -124.0248588, - 44.9389748 - ], - [ - -124.0249196, - 44.9390782 - ], - [ - -124.0249039, - 44.9391617 - ], - [ - -124.0248825, - 44.9392165 - ], - [ - -124.0248591, - 44.9392618 - ], - [ - -124.0248969, - 44.939387 - ], - [ - -124.0249317, - 44.9395541 - ], - [ - -124.0249796, - 44.9396777 - ], - [ - -124.0249518, - 44.9397532 - ], - [ - -124.0249585, - 44.9398366 - ], - [ - -124.0249534, - 44.9399983 - ], - [ - -124.0249071, - 44.9402207 - ], - [ - -124.0248592, - 44.9404312 - ], - [ - -124.0248097, - 44.9406744 - ], - [ - -124.0248111, - 44.9407119 - ], - [ - -124.0248151, - 44.9408159 - ], - [ - -124.0248131, - 44.9408384 - ], - [ - -124.0247997, - 44.9409865 - ], - [ - -124.0247435, - 44.9411187 - ], - [ - -124.0247212, - 44.9411493 - ], - [ - -124.0246603, - 44.9412325 - ], - [ - -124.0245591, - 44.9412829 - ], - [ - -124.0245582, - 44.9412833 - ], - [ - -124.0244474, - 44.941315 - ], - [ - -124.0244301, - 44.9413419 - ], - [ - -124.0244194, - 44.9413694 - ], - [ - -124.0244165, - 44.9414115 - ], - [ - -124.0244701, - 44.9414743 - ], - [ - -124.0245113, - 44.9415315 - ], - [ - -124.024526, - 44.9415891 - ], - [ - -124.0245288, - 44.9416239 - ], - [ - -124.0245331, - 44.9416764 - ], - [ - -124.0245037, - 44.9417401 - ], - [ - -124.024492, - 44.941759 - ], - [ - -124.0244688, - 44.9417963 - ], - [ - -124.024489, - 44.9418613 - ], - [ - -124.0244608, - 44.9419392 - ], - [ - -124.0244219, - 44.9419998 - ], - [ - -124.0244089, - 44.9420284 - ], - [ - -124.0243825, - 44.9420862 - ], - [ - -124.0243371, - 44.9421464 - ], - [ - -124.024335, - 44.9421606 - ], - [ - -124.0243309, - 44.9421882 - ], - [ - -124.0243272, - 44.942235 - ], - [ - -124.02431, - 44.9422967 - ], - [ - -124.024306, - 44.942311 - ], - [ - -124.0242645, - 44.9424114 - ], - [ - -124.024236, - 44.9424469 - ], - [ - -124.02424, - 44.9424872 - ], - [ - -124.024233, - 44.9425338 - ], - [ - -124.0242363, - 44.9425787 - ], - [ - -124.0242414, - 44.9426332 - ], - [ - -124.0242125, - 44.942703 - ], - [ - -124.0242103, - 44.9427084 - ], - [ - -124.024201, - 44.9427712 - ], - [ - -124.0241752, - 44.9428328 - ], - [ - -124.0241715, - 44.9428378 - ], - [ - -124.0241255, - 44.9428996 - ], - [ - -124.0241123, - 44.9429433 - ], - [ - -124.0241323, - 44.9429728 - ], - [ - -124.0241341, - 44.9429755 - ], - [ - -124.0241825, - 44.9430733 - ], - [ - -124.0241561, - 44.9431125 - ], - [ - -124.0241357, - 44.9431427 - ], - [ - -124.0240732, - 44.9432062 - ], - [ - -124.0240613, - 44.9432431 - ], - [ - -124.0240547, - 44.9432636 - ], - [ - -124.0240797, - 44.9433825 - ], - [ - -124.0240819, - 44.9433927 - ], - [ - -124.0240724, - 44.9434344 - ], - [ - -124.0240812, - 44.9434868 - ], - [ - -124.0240733, - 44.9435197 - ], - [ - -124.0240723, - 44.9435238 - ], - [ - -124.0240128, - 44.9435899 - ], - [ - -124.0240035, - 44.9436525 - ], - [ - -124.0239979, - 44.9436899 - ], - [ - -124.0240609, - 44.9437948 - ], - [ - -124.0241176, - 44.9438892 - ], - [ - -124.0241572, - 44.9439345 - ], - [ - -124.024147, - 44.9439808 - ], - [ - -124.0241249, - 44.9439997 - ], - [ - -124.0241015, - 44.9440197 - ], - [ - -124.024045, - 44.9440649 - ], - [ - -124.0240187, - 44.9441086 - ], - [ - -124.0240137, - 44.9441169 - ], - [ - -124.0240098, - 44.9441234 - ], - [ - -124.0240102, - 44.944187 - ], - [ - -124.0240399, - 44.9442551 - ], - [ - -124.0240697, - 44.9443444 - ], - [ - -124.0240578, - 44.9444023 - ], - [ - -124.0240201, - 44.9444324 - ], - [ - -124.024031, - 44.9444708 - ], - [ - -124.0240023, - 44.9444852 - ], - [ - -124.0239476, - 44.944534 - ], - [ - -124.023922, - 44.9445568 - ], - [ - -124.023897, - 44.9446137 - ], - [ - -124.0239151, - 44.9446534 - ], - [ - -124.0239204, - 44.94467 - ], - [ - -124.023932, - 44.9447128 - ], - [ - -124.0239335, - 44.9447694 - ], - [ - -124.0239191, - 44.9448096 - ], - [ - -124.0239114, - 44.9448311 - ], - [ - -124.0238666, - 44.9448866 - ], - [ - -124.0238609, - 44.9449251 - ], - [ - -124.0238597, - 44.9449331 - ], - [ - -124.0238559, - 44.9449405 - ], - [ - -124.0238411, - 44.9449693 - ], - [ - -124.0238704, - 44.944995 - ], - [ - -124.0238928, - 44.9450226 - ], - [ - -124.0238944, - 44.945068 - ], - [ - -124.0238947, - 44.9450769 - ], - [ - -124.0239018, - 44.9450854 - ], - [ - -124.0239341, - 44.9451239 - ], - [ - -124.0239491, - 44.9451792 - ], - [ - -124.0239605, - 44.945216 - ], - [ - -124.0239659, - 44.9452335 - ], - [ - -124.0239692, - 44.9452442 - ], - [ - -124.0239497, - 44.9452863 - ], - [ - -124.0239145, - 44.9453224 - ], - [ - -124.0238983, - 44.945353 - ], - [ - -124.0238619, - 44.9453749 - ], - [ - -124.0238612, - 44.9454243 - ], - [ - -124.0238925, - 44.9454702 - ], - [ - -124.0239447, - 44.94552 - ], - [ - -124.0239558, - 44.9455679 - ], - [ - -124.0239507, - 44.9456028 - ], - [ - -124.0239577, - 44.9456221 - ], - [ - -124.0239694, - 44.9456547 - ], - [ - -124.0239575, - 44.9456785 - ], - [ - -124.0239199, - 44.9456968 - ], - [ - -124.0239088, - 44.945716 - ], - [ - -124.0238776, - 44.945736 - ], - [ - -124.0238549, - 44.9457884 - ], - [ - -124.0238541, - 44.9458048 - ], - [ - -124.0238398, - 44.9458343 - ], - [ - -124.0238113, - 44.9458475 - ], - [ - -124.0238076, - 44.9458613 - ], - [ - -124.0238152, - 44.9458772 - ], - [ - -124.0238405, - 44.9459073 - ], - [ - -124.0238689, - 44.9459506 - ], - [ - -124.0238993, - 44.946047 - ], - [ - -124.0239002, - 44.9460855 - ], - [ - -124.023922, - 44.9461177 - ], - [ - -124.023927, - 44.9461393 - ], - [ - -124.0239118, - 44.9461805 - ], - [ - -124.0238956, - 44.9462393 - ], - [ - -124.0238834, - 44.9462878 - ], - [ - -124.0238843, - 44.9463042 - ], - [ - -124.0239122, - 44.9463957 - ], - [ - -124.0239396, - 44.9464455 - ], - [ - -124.023941, - 44.9464479 - ], - [ - -124.0239414, - 44.9464546 - ], - [ - -124.0239424, - 44.9464697 - ], - [ - -124.0239459, - 44.9465227 - ], - [ - -124.0238904, - 44.946627 - ], - [ - -124.0238554, - 44.9466798 - ], - [ - -124.0238849, - 44.9467297 - ], - [ - -124.0238925, - 44.9468233 - ], - [ - -124.0238796, - 44.9469357 - ], - [ - -124.0238497, - 44.9470446 - ], - [ - -124.0238815, - 44.9471477 - ], - [ - -124.0238837, - 44.9471548 - ], - [ - -124.0238747, - 44.9472263 - ], - [ - -124.0238539, - 44.9472638 - ], - [ - -124.0238474, - 44.9473025 - ], - [ - -124.0238491, - 44.9474141 - ], - [ - -124.0238627, - 44.9475988 - ], - [ - -124.0238652, - 44.9478446 - ], - [ - -124.0238913, - 44.9480718 - ], - [ - -124.0238659, - 44.9481192 - ], - [ - -124.0238549, - 44.9481678 - ], - [ - -124.0238128, - 44.9482633 - ], - [ - -124.0238593, - 44.9483333 - ], - [ - -124.0238966, - 44.9484231 - ], - [ - -124.0238621, - 44.9484901 - ], - [ - -124.0238381, - 44.9485644 - ], - [ - -124.02386, - 44.9486076 - ], - [ - -124.0238457, - 44.948658 - ], - [ - -124.0238541, - 44.9487123 - ], - [ - -124.0238839, - 44.9487603 - ], - [ - -124.023872, - 44.9488315 - ], - [ - -124.023864, - 44.9488969 - ], - [ - -124.0238868, - 44.9489174 - ], - [ - -124.023911, - 44.9489462 - ], - [ - -124.0239354, - 44.9489049 - ], - [ - -124.0239649, - 44.9489198 - ], - [ - -124.0240093, - 44.9489504 - ], - [ - -124.0240313, - 44.94901 - ], - [ - -124.0240618, - 44.9490539 - ], - [ - -124.0240778, - 44.94908 - ], - [ - -124.0241002, - 44.9491025 - ], - [ - -124.0240944, - 44.9491371 - ], - [ - -124.0241057, - 44.9491567 - ], - [ - -124.0241376, - 44.9491924 - ], - [ - -124.0241473, - 44.9492386 - ], - [ - -124.0241275, - 44.9492699 - ], - [ - -124.0241175, - 44.9493124 - ], - [ - -124.0241382, - 44.9493451 - ], - [ - -124.0241731, - 44.9494139 - ], - [ - -124.0241921, - 44.9494919 - ], - [ - -124.0242224, - 44.9494676 - ], - [ - -124.024222, - 44.9495047 - ], - [ - -124.0242194, - 44.9495096 - ], - [ - -124.0241966, - 44.9495521 - ], - [ - -124.0241783, - 44.9495918 - ], - [ - -124.024165, - 44.9496196 - ], - [ - -124.0241294, - 44.949645 - ], - [ - -124.0241055, - 44.9496621 - ], - [ - -124.0241146, - 44.9496773 - ], - [ - -124.024149, - 44.9496802 - ], - [ - -124.0241478, - 44.9497049 - ], - [ - -124.0241459, - 44.9497336 - ], - [ - -124.0241245, - 44.9497751 - ], - [ - -124.0241117, - 44.9497472 - ], - [ - -124.0240833, - 44.9497779 - ], - [ - -124.024079, - 44.9497823 - ], - [ - -124.0240481, - 44.9498141 - ], - [ - -124.0240234, - 44.9498574 - ], - [ - -124.0240141, - 44.9498959 - ], - [ - -124.0239962, - 44.9499179 - ], - [ - -124.0239812, - 44.9499364 - ], - [ - -124.0239678, - 44.9499642 - ], - [ - -124.023933, - 44.9499634 - ], - [ - -124.0239131, - 44.9499431 - ], - [ - -124.0238843, - 44.9499592 - ], - [ - -124.0238787, - 44.9499753 - ], - [ - -124.023921, - 44.949983 - ], - [ - -124.0239277, - 44.9500124 - ], - [ - -124.0239137, - 44.9500443 - ], - [ - -124.0238833, - 44.950052 - ], - [ - -124.0238459, - 44.9500324 - ], - [ - -124.0238306, - 44.9500538 - ], - [ - -124.0238259, - 44.9500823 - ], - [ - -124.0238495, - 44.9501152 - ], - [ - -124.0238317, - 44.9501344 - ], - [ - -124.0237988, - 44.9501399 - ], - [ - -124.0238094, - 44.9501635 - ], - [ - -124.0237726, - 44.9501748 - ], - [ - -124.0237642, - 44.9501906 - ], - [ - -124.0237449, - 44.9502014 - ], - [ - -124.0237255, - 44.9501956 - ], - [ - -124.0237015, - 44.9501998 - ], - [ - -124.0236885, - 44.9502255 - ], - [ - -124.0237069, - 44.9502557 - ], - [ - -124.023714, - 44.9502949 - ], - [ - -124.0237145, - 44.9502976 - ], - [ - -124.0237065, - 44.9503279 - ], - [ - -124.0236972, - 44.9503663 - ], - [ - -124.0236792, - 44.950404 - ], - [ - -124.0236603, - 44.9504472 - ], - [ - -124.0236557, - 44.9504578 - ], - [ - -124.0237021, - 44.9504761 - ], - [ - -124.0237371, - 44.9505439 - ], - [ - -124.0237024, - 44.9506423 - ], - [ - -124.0236837, - 44.9506953 - ], - [ - -124.0236571, - 44.9507705 - ], - [ - -124.0235553, - 44.9509485 - ], - [ - -124.0235338, - 44.9510091 - ], - [ - -124.0233705, - 44.9514699 - ], - [ - -124.0232519, - 44.9517085 - ], - [ - -124.0232286, - 44.9519115 - ], - [ - -124.0231744, - 44.9520376 - ], - [ - -124.0231357, - 44.9522078 - ], - [ - -124.023097, - 44.95229 - ], - [ - -124.0230583, - 44.9524382 - ], - [ - -124.022919, - 44.9527674 - ], - [ - -124.0228183, - 44.9529594 - ], - [ - -124.0227735, - 44.9532466 - ], - [ - -124.0227593, - 44.9533831 - ], - [ - -124.0226986, - 44.9536071 - ], - [ - -124.0226904, - 44.9537262 - ], - [ - -124.0226692, - 44.9539225 - ], - [ - -124.0226432, - 44.9541336 - ], - [ - -124.0226436, - 44.9541336 - ], - [ - -124.0226241, - 44.9543763 - ], - [ - -124.0226285, - 44.9544283 - ], - [ - -124.0226052, - 44.9544986 - ], - [ - -124.0225819, - 44.9545854 - ], - [ - -124.0225573, - 44.9546545 - ], - [ - -124.0225418, - 44.9547389 - ], - [ - -124.0225547, - 44.9548184 - ], - [ - -124.0225416, - 44.9548699 - ], - [ - -124.0225263, - 44.9549357 - ], - [ - -124.0225348, - 44.9549606 - ], - [ - -124.0225477, - 44.9550834 - ], - [ - -124.0225135, - 44.9551628 - ], - [ - -124.0225081, - 44.9552355 - ], - [ - -124.0225163, - 44.9553074 - ], - [ - -124.0224911, - 44.9553757 - ], - [ - -124.0224417, - 44.9556093 - ], - [ - -124.0224359, - 44.9556765 - ], - [ - -124.0224065, - 44.9558532 - ], - [ - -124.0223643, - 44.9560552 - ], - [ - -124.022328, - 44.9562159 - ], - [ - -124.022314, - 44.956426 - ], - [ - -124.0222987, - 44.9565666 - ], - [ - -124.0222954, - 44.9566721 - ], - [ - -124.0223136, - 44.9567359 - ], - [ - -124.0223076, - 44.9567704 - ], - [ - -124.022316, - 44.9567947 - ], - [ - -124.0223052, - 44.9568326 - ], - [ - -124.0223058, - 44.9568775 - ], - [ - -124.0223049, - 44.9569141 - ], - [ - -124.0222801, - 44.9569473 - ], - [ - -124.022294, - 44.9569792 - ], - [ - -124.0222751, - 44.9569983 - ], - [ - -124.0222438, - 44.9570141 - ], - [ - -124.0222032, - 44.9570151 - ], - [ - -124.02218, - 44.9570226 - ], - [ - -124.022151, - 44.9570837 - ], - [ - -124.0220899, - 44.9571701 - ], - [ - -124.0220494, - 44.9572512 - ], - [ - -124.0220386, - 44.9572891 - ], - [ - -124.0220088, - 44.95738 - ], - [ - -124.0219716, - 44.9574698 - ], - [ - -124.0219446, - 44.9574972 - ], - [ - -124.021908, - 44.9575314 - ], - [ - -124.0218965, - 44.9575651 - ], - [ - -124.0219443, - 44.9575788 - ], - [ - -124.0219534, - 44.9576073 - ], - [ - -124.0219381, - 44.957646 - ], - [ - -124.021933, - 44.9576587 - ], - [ - -124.0218974, - 44.957723 - ], - [ - -124.0219002, - 44.9577533 - ], - [ - -124.0218702, - 44.9577977 - ], - [ - -124.0218672, - 44.9578353 - ], - [ - -124.0218228, - 44.9578833 - ], - [ - -124.0217766, - 44.9579479 - ], - [ - -124.0217675, - 44.9579681 - ], - [ - -124.0217364, - 44.9580372 - ], - [ - -124.0216556, - 44.9581041 - ], - [ - -124.0216161, - 44.9581368 - ], - [ - -124.0215695, - 44.9582403 - ], - [ - -124.0215641, - 44.9582522 - ], - [ - -124.0215579, - 44.9583204 - ], - [ - -124.0215195, - 44.9583495 - ], - [ - -124.0214814, - 44.9583766 - ], - [ - -124.0214225, - 44.9584184 - ], - [ - -124.0213702, - 44.9585812 - ], - [ - -124.0213697, - 44.9585825 - ], - [ - -124.021302, - 44.9585866 - ], - [ - -124.0212765, - 44.9586438 - ], - [ - -124.0213088, - 44.9587634 - ], - [ - -124.021307, - 44.9587862 - ], - [ - -124.0212993, - 44.9588835 - ], - [ - -124.0213058, - 44.9589234 - ], - [ - -124.0213085, - 44.9589404 - ], - [ - -124.0212649, - 44.9590103 - ], - [ - -124.02121, - 44.9592567 - ], - [ - -124.0211768, - 44.9593237 - ], - [ - -124.0211673, - 44.9593429 - ], - [ - -124.0211653, - 44.9594015 - ], - [ - -124.0211242, - 44.9594372 - ], - [ - -124.02098, - 44.9594505 - ], - [ - -124.0208843, - 44.9594717 - ], - [ - -124.0209298, - 44.9595151 - ], - [ - -124.0210369, - 44.9595598 - ], - [ - -124.0210681, - 44.9596017 - ], - [ - -124.0210748, - 44.9596107 - ], - [ - -124.0210364, - 44.9596824 - ], - [ - -124.0210324, - 44.9597544 - ], - [ - -124.0210126, - 44.9598449 - ], - [ - -124.0209201, - 44.9599855 - ], - [ - -124.0209197, - 44.9601174 - ], - [ - -124.0209227, - 44.960303 - ], - [ - -124.0209048, - 44.960403 - ], - [ - -124.0208706, - 44.9608898 - ], - [ - -124.020812, - 44.9611291 - ], - [ - -124.0207359, - 44.9614668 - ], - [ - -124.0206592, - 44.9616709 - ], - [ - -124.0205121, - 44.9618546 - ], - [ - -124.0204289, - 44.962017 - ], - [ - -124.0203429, - 44.9622404 - ], - [ - -124.0202636, - 44.9624762 - ], - [ - -124.0202443, - 44.9627351 - ], - [ - -124.0202146, - 44.9629194 - ], - [ - -124.0200945, - 44.9631605 - ], - [ - -124.0200317, - 44.9633791 - ], - [ - -124.0199467, - 44.9635234 - ], - [ - -124.019924, - 44.9635849 - ], - [ - -124.0198633, - 44.9637493 - ], - [ - -124.0198261, - 44.9638501 - ], - [ - -124.0198045, - 44.9638863 - ], - [ - -124.0197908, - 44.9639092 - ], - [ - -124.0197226, - 44.9640233 - ], - [ - -124.0197173, - 44.9640321 - ], - [ - -124.0197144, - 44.9640369 - ], - [ - -124.0196665, - 44.9641603 - ], - [ - -124.0196587, - 44.9641803 - ], - [ - -124.0196259, - 44.9644104 - ], - [ - -124.0195694, - 44.9645413 - ], - [ - -124.0194888, - 44.9647563 - ], - [ - -124.0194252, - 44.9648729 - ], - [ - -124.0194102, - 44.9649002 - ], - [ - -124.0193691, - 44.9649756 - ], - [ - -124.0193438, - 44.9650097 - ], - [ - -124.0192628, - 44.9651193 - ], - [ - -124.0191614, - 44.9652563 - ], - [ - -124.0190586, - 44.9654479 - ], - [ - -124.0190423, - 44.9654782 - ], - [ - -124.0189775, - 44.9657776 - ], - [ - -124.0189377, - 44.9660749 - ], - [ - -124.0188707, - 44.9662316 - ], - [ - -124.0188754, - 44.9663606 - ], - [ - -124.0188227, - 44.9665013 - ], - [ - -124.018728, - 44.9666615 - ], - [ - -124.0186921, - 44.9669042 - ], - [ - -124.0186888, - 44.9669269 - ], - [ - -124.0186598, - 44.9670151 - ], - [ - -124.0186163, - 44.9671475 - ], - [ - -124.018563, - 44.9673048 - ], - [ - -124.018536, - 44.9674093 - ], - [ - -124.0184504, - 44.9675501 - ], - [ - -124.0183592, - 44.9676479 - ], - [ - -124.0182856, - 44.9677862 - ], - [ - -124.0182351, - 44.9678547 - ], - [ - -124.0181556, - 44.9679456 - ], - [ - -124.0181003, - 44.9680358 - ], - [ - -124.0179801, - 44.9681065 - ], - [ - -124.0178733, - 44.9681486 - ], - [ - -124.0178218, - 44.9681524 - ], - [ - -124.017742, - 44.9681398 - ], - [ - -124.0176567, - 44.9681359 - ], - [ - -124.0175779, - 44.9681405 - ], - [ - -124.0174893, - 44.9681325 - ], - [ - -124.0174118, - 44.9681068 - ], - [ - -124.0173477, - 44.9681023 - ], - [ - -124.0172959, - 44.9680521 - ], - [ - -124.0172593, - 44.9679993 - ], - [ - -124.0172147, - 44.9679661 - ], - [ - -124.0171739, - 44.9679458 - ], - [ - -124.0171018, - 44.9679091 - ], - [ - -124.0170427, - 44.9678872 - ], - [ - -124.0170112, - 44.9678688 - ], - [ - -124.0169862, - 44.9678587 - ], - [ - -124.0169056, - 44.9678332 - ], - [ - -124.0168467, - 44.9678134 - ], - [ - -124.0168262, - 44.9678046 - ], - [ - -124.0168011, - 44.9678269 - ], - [ - -124.0167516, - 44.967871 - ], - [ - -124.0167792, - 44.9678814 - ], - [ - -124.0168916, - 44.9679046 - ], - [ - -124.0169703, - 44.9679385 - ], - [ - -124.0170504, - 44.9679693 - ], - [ - -124.017107, - 44.968006 - ], - [ - -124.0171464, - 44.9680529 - ], - [ - -124.0172292, - 44.9681281 - ], - [ - -124.0172932, - 44.9681946 - ], - [ - -124.0174107, - 44.968241 - ], - [ - -124.0175058, - 44.9683047 - ], - [ - -124.0176016, - 44.9683369 - ], - [ - -124.0177472, - 44.9684157 - ], - [ - -124.0178152, - 44.9684617 - ], - [ - -124.0178539, - 44.968492 - ], - [ - -124.0179357, - 44.9685561 - ], - [ - -124.01802, - 44.9686598 - ], - [ - -124.0180671, - 44.9687448 - ], - [ - -124.0180429, - 44.969054 - ], - [ - -124.018019, - 44.9692307 - ], - [ - -124.0178899, - 44.9695618 - ], - [ - -124.0178193, - 44.9698668 - ], - [ - -124.0177374, - 44.97007 - ], - [ - -124.0177204, - 44.9703592 - ], - [ - -124.0175731, - 44.9707088 - ], - [ - -124.0175221, - 44.9710096 - ], - [ - -124.0174143, - 44.9713577 - ], - [ - -124.0172638, - 44.9719785 - ], - [ - -124.0171899, - 44.9721497 - ], - [ - -124.0171445, - 44.972299 - ], - [ - -124.0171292, - 44.9724373 - ], - [ - -124.0170781, - 44.9725131 - ], - [ - -124.0170759, - 44.9725185 - ], - [ - -124.017053, - 44.9725755 - ], - [ - -124.0170671, - 44.9726289 - ], - [ - -124.0170581, - 44.9726568 - ], - [ - -124.0170337, - 44.9727327 - ], - [ - -124.017021, - 44.9728799 - ], - [ - -124.0170172, - 44.9729791 - ], - [ - -124.0170109, - 44.9730776 - ], - [ - -124.0169677, - 44.9731588 - ], - [ - -124.0169287, - 44.9731923 - ], - [ - -124.0168994, - 44.9732174 - ], - [ - -124.0168008, - 44.9733021 - ], - [ - -124.0167977, - 44.9733171 - ], - [ - -124.0167813, - 44.9733963 - ], - [ - -124.0167645, - 44.9734778 - ], - [ - -124.0167221, - 44.9736786 - ], - [ - -124.0167474, - 44.973914 - ], - [ - -124.0167621, - 44.9740263 - ], - [ - -124.0167745, - 44.9741211 - ], - [ - -124.0167408, - 44.9742788 - ], - [ - -124.0167378, - 44.9743004 - ], - [ - -124.0167187, - 44.9744376 - ], - [ - -124.0167168, - 44.9744514 - ], - [ - -124.0167157, - 44.9744593 - ], - [ - -124.0166455, - 44.9747384 - ], - [ - -124.0166233, - 44.9748633 - ], - [ - -124.0166025, - 44.9749811 - ], - [ - -124.0165938, - 44.9750006 - ], - [ - -124.016533, - 44.9751381 - ], - [ - -124.0165103, - 44.9751893 - ], - [ - -124.016425, - 44.9752757 - ], - [ - -124.0163978, - 44.9753032 - ], - [ - -124.0163569, - 44.9753398 - ], - [ - -124.0163086, - 44.975383 - ], - [ - -124.0163052, - 44.975443 - ], - [ - -124.0163037, - 44.9754699 - ], - [ - -124.0163034, - 44.9754755 - ], - [ - -124.0163686, - 44.9755352 - ], - [ - -124.0164885, - 44.9756008 - ], - [ - -124.0165445, - 44.9756666 - ], - [ - -124.0165587, - 44.9756833 - ], - [ - -124.0165041, - 44.9757435 - ], - [ - -124.0164072, - 44.9758158 - ], - [ - -124.0163501, - 44.9758959 - ], - [ - -124.016424, - 44.9759549 - ], - [ - -124.016454, - 44.9759998 - ], - [ - -124.0164567, - 44.9760037 - ], - [ - -124.0164832, - 44.9760834 - ], - [ - -124.0165084, - 44.9761861 - ], - [ - -124.016494, - 44.9762649 - ], - [ - -124.0164922, - 44.9762747 - ], - [ - -124.0164687, - 44.9763527 - ], - [ - -124.016463, - 44.9763715 - ], - [ - -124.0164367, - 44.9764259 - ], - [ - -124.0164372, - 44.9764796 - ], - [ - -124.0164402, - 44.9764859 - ], - [ - -124.0164865, - 44.976583 - ], - [ - -124.0164713, - 44.9766429 - ], - [ - -124.0164287, - 44.976742 - ], - [ - -124.0163559, - 44.9768324 - ], - [ - -124.0163139, - 44.976941 - ], - [ - -124.0162836, - 44.9770626 - ], - [ - -124.0162299, - 44.9771563 - ], - [ - -124.0162295, - 44.9771578 - ], - [ - -124.0162283, - 44.9771632 - ], - [ - -124.016222, - 44.9771907 - ], - [ - -124.0162022, - 44.9772779 - ], - [ - -124.0160752, - 44.9774652 - ], - [ - -124.0160128, - 44.9775441 - ], - [ - -124.0160183, - 44.977634 - ], - [ - -124.0159979, - 44.9776978 - ], - [ - -124.0159412, - 44.9777858 - ], - [ - -124.0158845, - 44.9778774 - ], - [ - -124.015865, - 44.9779089 - ], - [ - -124.0157759, - 44.9781332 - ], - [ - -124.01577, - 44.9781522 - ], - [ - -124.0157401, - 44.9782484 - ], - [ - -124.015723, - 44.9783034 - ], - [ - -124.0157217, - 44.9783073 - ], - [ - -124.0156798, - 44.9784159 - ], - [ - -124.0156734, - 44.9784271 - ], - [ - -124.0156456, - 44.9784764 - ], - [ - -124.0156118, - 44.9785647 - ], - [ - -124.0155686, - 44.9786742 - ], - [ - -124.0155494, - 44.978702 - ], - [ - -124.0154942, - 44.9787819 - ], - [ - -124.015486, - 44.9788394 - ], - [ - -124.0154734, - 44.9789282 - ], - [ - -124.0154817, - 44.9789629 - ], - [ - -124.015488, - 44.9789891 - ], - [ - -124.0154894, - 44.9789903 - ], - [ - -124.0155279, - 44.9790243 - ], - [ - -124.0155303, - 44.9790625 - ], - [ - -124.0155053, - 44.9790958 - ], - [ - -124.0154924, - 44.9791498 - ], - [ - -124.0155109, - 44.9791876 - ], - [ - -124.0155334, - 44.9792022 - ], - [ - -124.0155331, - 44.9792405 - ], - [ - -124.0155228, - 44.9792926 - ], - [ - -124.0155071, - 44.9793746 - ], - [ - -124.0154667, - 44.9795366 - ], - [ - -124.0154653, - 44.9795422 - ], - [ - -124.0154774, - 44.9796096 - ], - [ - -124.0154938, - 44.9797011 - ], - [ - -124.0154939, - 44.979702 - ], - [ - -124.0155049, - 44.9797628 - ], - [ - -124.0155579, - 44.9799874 - ], - [ - -124.0155477, - 44.9800149 - ], - [ - -124.0155093, - 44.9802618 - ], - [ - -124.0155077, - 44.9802709 - ], - [ - -124.0154919, - 44.9803622 - ], - [ - -124.0154595, - 44.9805484 - ], - [ - -124.0154584, - 44.9805561 - ], - [ - -124.0154169, - 44.9806837 - ], - [ - -124.0153862, - 44.980778 - ], - [ - -124.0153778, - 44.980819 - ], - [ - -124.01535, - 44.9809542 - ], - [ - -124.0153222, - 44.9810894 - ], - [ - -124.0153141, - 44.9811284 - ], - [ - -124.0152938, - 44.9812247 - ], - [ - -124.0152437, - 44.9814614 - ], - [ - -124.0152346, - 44.9814951 - ], - [ - -124.0152106, - 44.9815836 - ], - [ - -124.0151978, - 44.9816304 - ], - [ - -124.0151729, - 44.9817224 - ], - [ - -124.0151448, - 44.9817658 - ], - [ - -124.0151162, - 44.9818098 - ], - [ - -124.015057, - 44.9819013 - ], - [ - -124.0149824, - 44.9820166 - ], - [ - -124.0149564, - 44.9820369 - ], - [ - -124.0147909, - 44.9821666 - ], - [ - -124.0147874, - 44.9821728 - ], - [ - -124.0147686, - 44.9822331 - ], - [ - -124.0147589, - 44.9823081 - ], - [ - -124.0147485, - 44.9823892 - ], - [ - -124.0148231, - 44.9824703 - ], - [ - -124.0148373, - 44.9824857 - ], - [ - -124.0148654, - 44.9826093 - ], - [ - -124.0148468, - 44.9827798 - ], - [ - -124.0148348, - 44.9828027 - ], - [ - -124.0147934, - 44.9828819 - ], - [ - -124.0147845, - 44.9828988 - ], - [ - -124.0147813, - 44.9830223 - ], - [ - -124.0147806, - 44.9830463 - ], - [ - -124.0147801, - 44.9830657 - ], - [ - -124.0147798, - 44.9830778 - ], - [ - -124.0147707, - 44.9831357 - ], - [ - -124.0147632, - 44.9831836 - ], - [ - -124.0147624, - 44.9831888 - ], - [ - -124.0147579, - 44.9832178 - ], - [ - -124.0147536, - 44.9832447 - ], - [ - -124.0147212, - 44.9833895 - ], - [ - -124.0153253, - 44.9833858 - ], - [ - -124.0153245, - 44.983387 - ], - [ - -124.0152805, - 44.9835258 - ], - [ - -124.0153009, - 44.9836236 - ], - [ - -124.0153015, - 44.9836335 - ], - [ - -124.0153093, - 44.9837707 - ], - [ - -124.0153102, - 44.9837874 - ], - [ - -124.0153735, - 44.9838743 - ], - [ - -124.0153918, - 44.9839602 - ], - [ - -124.0153472, - 44.9840059 - ], - [ - -124.0152708, - 44.9840448 - ], - [ - -124.0152394, - 44.9840607 - ], - [ - -124.0151085, - 44.9841311 - ], - [ - -124.0150846, - 44.9841808 - ], - [ - -124.0150642, - 44.9842233 - ], - [ - -124.015074, - 44.9843179 - ], - [ - -124.0150767, - 44.9843437 - ], - [ - -124.0150791, - 44.9844551 - ], - [ - -124.0150805, - 44.9845157 - ], - [ - -124.015019, - 44.9846849 - ], - [ - -124.0149869, - 44.9847288 - ], - [ - -124.0149607, - 44.9848109 - ], - [ - -124.0149722, - 44.9848643 - ], - [ - -124.0149745, - 44.9848659 - ], - [ - -124.0150418, - 44.9849139 - ], - [ - -124.0150359, - 44.9849978 - ], - [ - -124.0150333, - 44.9850034 - ], - [ - -124.0149125, - 44.9852666 - ], - [ - -124.0149136, - 44.985277 - ], - [ - -124.0149281, - 44.9854142 - ], - [ - -124.0149314, - 44.9854458 - ], - [ - -124.0149166, - 44.9855513 - ], - [ - -124.0149113, - 44.9855896 - ], - [ - -124.0148805, - 44.9856882 - ], - [ - -124.0148303, - 44.9858494 - ], - [ - -124.0148124, - 44.9859621 - ], - [ - -124.0147907, - 44.9860991 - ], - [ - -124.0147684, - 44.9862399 - ], - [ - -124.0146819, - 44.9866545 - ], - [ - -124.0146008, - 44.9868921 - ], - [ - -124.0145784, - 44.9869849 - ], - [ - -124.0145618, - 44.9870534 - ], - [ - -124.0145451, - 44.9871229 - ], - [ - -124.0145082, - 44.9872681 - ], - [ - -124.0144854, - 44.9873274 - ], - [ - -124.0144725, - 44.9873609 - ], - [ - -124.0144643, - 44.9873822 - ], - [ - -124.0144204, - 44.9874964 - ], - [ - -124.0143534, - 44.9876013 - ], - [ - -124.0143199, - 44.9876537 - ], - [ - -124.0141271, - 44.9878748 - ], - [ - -124.0141214, - 44.9878813 - ], - [ - -124.0141026, - 44.9880119 - ], - [ - -124.0140973, - 44.988048 - ], - [ - -124.0140803, - 44.988149 - ], - [ - -124.0140746, - 44.9881829 - ], - [ - -124.0141701, - 44.9882492 - ], - [ - -124.014188, - 44.9882865 - ], - [ - -124.0142096, - 44.9883311 - ], - [ - -124.0141997, - 44.9884237 - ], - [ - -124.0141887, - 44.988527 - ], - [ - -124.014188, - 44.9885607 - ], - [ - -124.0141873, - 44.9885914 - ], - [ - -124.014185, - 44.9886978 - ], - [ - -124.0141826, - 44.9888059 - ], - [ - -124.0141882, - 44.9888349 - ], - [ - -124.0141888, - 44.9888376 - ], - [ - -124.0142089, - 44.988942 - ], - [ - -124.0141244, - 44.9890774 - ], - [ - -124.0140681, - 44.9891191 - ], - [ - -124.013995, - 44.9891391 - ], - [ - -124.0137548, - 44.9890546 - ], - [ - -124.0138342, - 44.9891099 - ], - [ - -124.0138586, - 44.9891269 - ], - [ - -124.0138833, - 44.9891442 - ], - [ - -124.0139717, - 44.9892041 - ], - [ - -124.0140793, - 44.9892714 - ], - [ - -124.0141292, - 44.9893164 - ], - [ - -124.0141385, - 44.9893484 - ], - [ - -124.0141473, - 44.9893791 - ], - [ - -124.0141069, - 44.9894484 - ], - [ - -124.014101, - 44.9894835 - ], - [ - -124.0140938, - 44.9895258 - ], - [ - -124.0141273, - 44.9896189 - ], - [ - -124.0141377, - 44.9897275 - ], - [ - -124.0141369, - 44.9897305 - ], - [ - -124.014116, - 44.9898071 - ], - [ - -124.0141083, - 44.989895 - ], - [ - -124.0141025, - 44.9899602 - ], - [ - -124.0140957, - 44.9900321 - ], - [ - -124.0140947, - 44.9900436 - ], - [ - -124.0140854, - 44.9900981 - ], - [ - -124.014025, - 44.9901964 - ], - [ - -124.0140175, - 44.9902087 - ], - [ - -124.0141088, - 44.9903064 - ], - [ - -124.0141357, - 44.9903352 - ], - [ - -124.014122, - 44.9904162 - ], - [ - -124.0141163, - 44.9904499 - ], - [ - -124.0140695, - 44.9905565 - ], - [ - -124.0140154, - 44.9906316 - ], - [ - -124.0139784, - 44.9906827 - ], - [ - -124.0139225, - 44.990771 - ], - [ - -124.0138864, - 44.9908873 - ], - [ - -124.0137139, - 44.9911399 - ], - [ - -124.0135959, - 44.9913158 - ], - [ - -124.013522, - 44.9916018 - ], - [ - -124.0135529, - 44.9918629 - ], - [ - -124.01362, - 44.9919517 - ], - [ - -124.0136811, - 44.9920956 - ], - [ - -124.0136248, - 44.9922275 - ], - [ - -124.0136281, - 44.9923264 - ], - [ - -124.0136215, - 44.9925411 - ], - [ - -124.0135935, - 44.9927319 - ], - [ - -124.0136002, - 44.9928336 - ], - [ - -124.013562, - 44.9929439 - ], - [ - -124.0136003, - 44.9931772 - ], - [ - -124.0136595, - 44.9933228 - ], - [ - -124.0137, - 44.9933908 - ], - [ - -124.0136967, - 44.9935256 - ], - [ - -124.0136008, - 44.9937396 - ], - [ - -124.0134753, - 44.9938736 - ], - [ - -124.0133923, - 44.9938938 - ], - [ - -124.0132671, - 44.9938994 - ], - [ - -124.0131313, - 44.9939922 - ], - [ - -124.013093, - 44.9940954 - ], - [ - -124.0130093, - 44.9941951 - ], - [ - -124.0129545, - 44.994248 - ], - [ - -124.0129344, - 44.9945423 - ], - [ - -124.0129316, - 44.9945835 - ], - [ - -124.0129009, - 44.9950321 - ], - [ - -124.012914, - 44.9950731 - ], - [ - -124.0125345, - 44.9969579 - ], - [ - -124.0123961, - 44.9976455 - ], - [ - -124.0123816, - 44.9977011 - ], - [ - -124.0123506, - 44.9980946 - ], - [ - -124.0121125, - 44.999708 - ], - [ - -124.0120082, - 45.0001406 - ], - [ - -124.0119461, - 45.0003981 - ], - [ - -124.011902, - 45.0005511 - ], - [ - -124.0118995, - 45.0005596 - ], - [ - -124.0118971, - 45.0005681 - ], - [ - -124.0118946, - 45.0005766 - ], - [ - -124.0118922, - 45.0005851 - ], - [ - -124.0118779, - 45.0006345 - ], - [ - -124.0118636, - 45.000684 - ], - [ - -124.0118494, - 45.0007335 - ], - [ - -124.0118351, - 45.0007829 - ], - [ - -124.011831, - 45.0007972 - ], - [ - -124.0118269, - 45.0008115 - ], - [ - -124.0118228, - 45.0008257 - ], - [ - -124.0118186, - 45.00084 - ], - [ - -124.0117976, - 45.000913 - ], - [ - -124.0117765, - 45.000986 - ], - [ - -124.0117743, - 45.0010532 - ], - [ - -124.0117522, - 45.0011299 - ], - [ - -124.0117327, - 45.0011977 - ], - [ - -124.0117179, - 45.0012488 - ], - [ - -124.0116806, - 45.001378 - ], - [ - -124.0116696, - 45.0014163 - ], - [ - -124.0116585, - 45.0014547 - ], - [ - -124.0116536, - 45.0014718 - ], - [ - -124.0116486, - 45.001489 - ], - [ - -124.011647, - 45.0014948 - ], - [ - -124.0116373, - 45.0015284 - ], - [ - -124.0113365, - 45.0015301 - ], - [ - -124.0113389, - 45.0015356 - ], - [ - -124.0113514, - 45.0015642 - ], - [ - -124.0113552, - 45.001625 - ], - [ - -124.0113491, - 45.0016663 - ], - [ - -124.0113252, - 45.0017311 - ], - [ - -124.0112872, - 45.0017779 - ], - [ - -124.0112595, - 45.0018154 - ], - [ - -124.0112404, - 45.001854 - ], - [ - -124.0112246, - 45.0018774 - ], - [ - -124.0112113, - 45.0019052 - ], - [ - -124.0112146, - 45.0019234 - ], - [ - -124.011224, - 45.0019368 - ], - [ - -124.0112359, - 45.0019562 - ], - [ - -124.0112419, - 45.001985 - ], - [ - -124.0112366, - 45.0020034 - ], - [ - -124.0112166, - 45.0020269 - ], - [ - -124.0111938, - 45.0020398 - ], - [ - -124.0111692, - 45.0020588 - ], - [ - -124.0111592, - 45.0020713 - ], - [ - -124.0111584, - 45.0020927 - ], - [ - -124.0111638, - 45.0021108 - ], - [ - -124.011182, - 45.0021285 - ], - [ - -124.0111962, - 45.0021494 - ], - [ - -124.0111997, - 45.0021721 - ], - [ - -124.0111973, - 45.0022027 - ], - [ - -124.0111892, - 45.0022456 - ], - [ - -124.01117, - 45.0022827 - ], - [ - -124.0111444, - 45.0023201 - ], - [ - -124.0111187, - 45.0023559 - ], - [ - -124.0110972, - 45.0023901 - ], - [ - -124.0110863, - 45.002424 - ], - [ - -124.01107, - 45.0024732 - ], - [ - -124.0110635, - 45.0025069 - ], - [ - -124.0110594, - 45.0025451 - ], - [ - -124.0110482, - 45.0025729 - ], - [ - -124.0110367, - 45.0025946 - ], - [ - -124.0110173, - 45.0026287 - ], - [ - -124.011009, - 45.0026686 - ], - [ - -124.0110015, - 45.0027206 - ], - [ - -124.0110059, - 45.0027585 - ], - [ - -124.011014, - 45.0027842 - ], - [ - -124.011031, - 45.0028172 - ], - [ - -124.0110346, - 45.0028414 - ], - [ - -124.0110276, - 45.002866 - ], - [ - -124.0110272, - 45.0028669 - ], - [ - -124.0110106, - 45.0029046 - ], - [ - -124.0109991, - 45.0029278 - ], - [ - -124.0109937, - 45.0029448 - ], - [ - -124.0109756, - 45.0029636 - ], - [ - -124.0109554, - 45.0029856 - ], - [ - -124.0109437, - 45.0030042 - ], - [ - -124.0109383, - 45.0030211 - ], - [ - -124.0109375, - 45.003044 - ], - [ - -124.0109413, - 45.0030698 - ], - [ - -124.0109326, - 45.0031036 - ], - [ - -124.0109129, - 45.0031316 - ], - [ - -124.0108624, - 45.0031834 - ], - [ - -124.0108402, - 45.003207 - ], - [ - -124.010823, - 45.0032425 - ], - [ - -124.0108057, - 45.003275 - ], - [ - -124.0108014, - 45.0033102 - ], - [ - -124.0108018, - 45.0033513 - ], - [ - -124.0108143, - 45.0033799 - ], - [ - -124.0108424, - 45.0034186 - ], - [ - -124.0108593, - 45.0034486 - ], - [ - -124.0108746, - 45.0034877 - ], - [ - -124.0108829, - 45.0035195 - ], - [ - -124.0108831, - 45.0035575 - ], - [ - -124.0108725, - 45.0035944 - ], - [ - -124.0108464, - 45.0036242 - ], - [ - -124.0108142, - 45.0036587 - ], - [ - -124.0107865, - 45.0036976 - ], - [ - -124.010775, - 45.0037208 - ], - [ - -124.010774, - 45.0037391 - ], - [ - -124.0107777, - 45.0037649 - ], - [ - -124.0107749, - 45.0037879 - ], - [ - -124.0107678, - 45.0038124 - ], - [ - -124.0107463, - 45.0038466 - ], - [ - -124.0107354, - 45.0038805 - ], - [ - -124.0107294, - 45.0039218 - ], - [ - -124.0107314, - 45.0039552 - ], - [ - -124.0107419, - 45.0039854 - ], - [ - -124.0107481, - 45.0040172 - ], - [ - -124.0107571, - 45.004058 - ], - [ - -124.0107741, - 45.004091 - ], - [ - -124.0107906, - 45.0041149 - ], - [ - -124.0108016, - 45.0041542 - ], - [ - -124.0108138, - 45.0042132 - ], - [ - -124.010808, - 45.0042591 - ], - [ - -124.010791, - 45.0042962 - ], - [ - -124.0107653, - 45.004332 - ], - [ - -124.0107212, - 45.0043836 - ], - [ - -124.0106977, - 45.0044209 - ], - [ - -124.0106834, - 45.0044671 - ], - [ - -124.0106814, - 45.0045052 - ], - [ - -124.0106963, - 45.0045383 - ], - [ - -124.0107289, - 45.0045799 - ], - [ - -124.0107599, - 45.0046292 - ], - [ - -124.0107747, - 45.0046608 - ], - [ - -124.0107746, - 45.0046943 - ], - [ - -124.0107655, - 45.004722 - ], - [ - -124.0107518, - 45.0047437 - ], - [ - -124.0107353, - 45.0047899 - ], - [ - -124.0107205, - 45.0048285 - ], - [ - -124.0107194, - 45.0048375 - ], - [ - -124.0107162, - 45.0048621 - ], - [ - -124.0107205, - 45.0048986 - ], - [ - -124.0107421, - 45.0049345 - ], - [ - -124.0107658, - 45.0049718 - ], - [ - -124.0107776, - 45.0050082 - ], - [ - -124.0107807, - 45.0050174 - ], - [ - -124.0107882, - 45.005039 - ], - [ - -124.0107897, - 45.0050638 - ], - [ - -124.010788, - 45.0050866 - ], - [ - -124.0107861, - 45.005112 - ], - [ - -124.0107797, - 45.0051511 - ], - [ - -124.0107643, - 45.0051842 - ], - [ - -124.0107588, - 45.0052008 - ], - [ - -124.010755, - 45.0052124 - ], - [ - -124.0107459, - 45.0052422 - ], - [ - -124.0107432, - 45.0052687 - ], - [ - -124.0107493, - 45.005298 - ], - [ - -124.0107621, - 45.0053286 - ], - [ - -124.0107701, - 45.0053502 - ], - [ - -124.0107689, - 45.0053673 - ], - [ - -124.010766, - 45.0053907 - ], - [ - -124.0107567, - 45.0054173 - ], - [ - -124.010739, - 45.0054505 - ], - [ - -124.010733, - 45.0054666 - ], - [ - -124.0107296, - 45.0054756 - ], - [ - -124.01072, - 45.0054977 - ], - [ - -124.0107124, - 45.0055166 - ], - [ - -124.0107132, - 45.0055305 - ], - [ - -124.0107189, - 45.0055521 - ], - [ - -124.0107423, - 45.0056119 - ], - [ - -124.0107469, - 45.00563 - ], - [ - -124.010751, - 45.0056458 - ], - [ - -124.0107548, - 45.0056721 - ], - [ - -124.0107553, - 45.0057171 - ], - [ - -124.0107544, - 45.0057731 - ], - [ - -124.0107495, - 45.0058012 - ], - [ - -124.0107341, - 45.0058358 - ], - [ - -124.0107311, - 45.0058577 - ], - [ - -124.0107308, - 45.0058784 - ], - [ - -124.0107306, - 45.0058856 - ], - [ - -124.0107272, - 45.005937 - ], - [ - -124.0107222, - 45.005962 - ], - [ - -124.0107046, - 45.0059967 - ], - [ - -124.0106862, - 45.0060168 - ], - [ - -124.0106738, - 45.0060303 - ], - [ - -124.0106553, - 45.0060495 - ], - [ - -124.0106453, - 45.0060653 - ], - [ - -124.0106406, - 45.006095 - ], - [ - -124.0106379, - 45.006123 - ], - [ - -124.0106447, - 45.0061551 - ], - [ - -124.0106503, - 45.0061816 - ], - [ - -124.0106561, - 45.0062063 - ], - [ - -124.0106579, - 45.0062342 - ], - [ - -124.0106576, - 45.0062653 - ], - [ - -124.0106493, - 45.0062922 - ], - [ - -124.0106485, - 45.0062951 - ], - [ - -124.010646, - 45.0063262 - ], - [ - -124.0106416, - 45.006362 - ], - [ - -124.0106504, - 45.0063975 - ], - [ - -124.0106433, - 45.0064257 - ], - [ - -124.0106413, - 45.0064296 - ], - [ - -124.0106296, - 45.0064525 - ], - [ - -124.0106246, - 45.0064775 - ], - [ - -124.0106239, - 45.0065008 - ], - [ - -124.0106274, - 45.0065225 - ], - [ - -124.0106374, - 45.0065439 - ], - [ - -124.0106389, - 45.0065669 - ], - [ - -124.0106391, - 45.0065702 - ], - [ - -124.0106318, - 45.0065953 - ], - [ - -124.0106139, - 45.0066238 - ], - [ - -124.010611, - 45.0066488 - ], - [ - -124.0106102, - 45.0066705 - ], - [ - -124.0106117, - 45.0066953 - ], - [ - -124.0106118, - 45.0067326 - ], - [ - -124.0106176, - 45.0067557 - ], - [ - -124.0106321, - 45.0067786 - ], - [ - -124.0106403, - 45.0068047 - ], - [ - -124.0106395, - 45.006828 - ], - [ - -124.0106358, - 45.0068416 - ], - [ - -124.0106288, - 45.0068672 - ], - [ - -124.0105969, - 45.0069179 - ], - [ - -124.0105745, - 45.0069465 - ], - [ - -124.0105528, - 45.006981 - ], - [ - -124.0105466, - 45.0069909 - ], - [ - -124.0105269, - 45.0070256 - ], - [ - -124.0105221, - 45.0070553 - ], - [ - -124.0105242, - 45.0070894 - ], - [ - -124.010533, - 45.0071187 - ], - [ - -124.0105352, - 45.0071263 - ], - [ - -124.0105528, - 45.0071631 - ], - [ - -124.0105427, - 45.0072131 - ], - [ - -124.0105396, - 45.0072353 - ], - [ - -124.0105382, - 45.0072458 - ], - [ - -124.0105376, - 45.0072559 - ], - [ - -124.0105362, - 45.0072847 - ], - [ - -124.0105379, - 45.0073126 - ], - [ - -124.0105305, - 45.0073346 - ], - [ - -124.0105192, - 45.0073644 - ], - [ - -124.0104907, - 45.0073995 - ], - [ - -124.0104642, - 45.0074314 - ], - [ - -124.0104349, - 45.0074593 - ], - [ - -124.0104104, - 45.0074827 - ], - [ - -124.0103898, - 45.0075002 - ], - [ - -124.0103688, - 45.0075182 - ], - [ - -124.0103271, - 45.0075521 - ], - [ - -124.0102905, - 45.0075982 - ], - [ - -124.0102345, - 45.0076481 - ], - [ - -124.0101947, - 45.0076788 - ], - [ - -124.0101751, - 45.0077152 - ], - [ - -124.0101582, - 45.0077607 - ], - [ - -124.0101553, - 45.0078214 - ], - [ - -124.0101471, - 45.0078651 - ], - [ - -124.0101354, - 45.0079245 - ], - [ - -124.0101318, - 45.0079728 - ], - [ - -124.010122, - 45.0080274 - ], - [ - -124.0101141, - 45.0080774 - ], - [ - -124.0100931, - 45.0081277 - ], - [ - -124.0100795, - 45.0081918 - ], - [ - -124.0100654, - 45.0082466 - ], - [ - -124.010055, - 45.008292 - ], - [ - -124.0100608, - 45.0083508 - ], - [ - -124.010061, - 45.0083896 - ], - [ - -124.0100584, - 45.0084107 - ], - [ - -124.0100528, - 45.0084282 - ], - [ - -124.0100371, - 45.0084939 - ], - [ - -124.0100204, - 45.0085426 - ], - [ - -124.0100174, - 45.0085517 - ], - [ - -124.0100038, - 45.0085943 - ], - [ - -124.0099827, - 45.0086431 - ], - [ - -124.0099532, - 45.0086885 - ], - [ - -124.0099507, - 45.0086922 - ], - [ - -124.0099097, - 45.008737 - ], - [ - -124.0098764, - 45.008766 - ], - [ - -124.0098097, - 45.0087851 - ], - [ - -124.0097588, - 45.0087993 - ], - [ - -124.0097473, - 45.0088026 - ], - [ - -124.0097176, - 45.0088175 - ], - [ - -124.0096925, - 45.0088369 - ], - [ - -124.0096878, - 45.0088553 - ], - [ - -124.0097064, - 45.0088803 - ], - [ - -124.0097305, - 45.0089011 - ], - [ - -124.0097437, - 45.0089112 - ], - [ - -124.0097544, - 45.0089192 - ], - [ - -124.0097674, - 45.0089458 - ], - [ - -124.0097689, - 45.0089713 - ], - [ - -124.0097646, - 45.0090253 - ], - [ - -124.0097606, - 45.0090487 - ], - [ - -124.009759, - 45.0090578 - ], - [ - -124.0097515, - 45.009089 - ], - [ - -124.0097555, - 45.0091239 - ], - [ - -124.0097627, - 45.0091492 - ], - [ - -124.0097699, - 45.0091732 - ], - [ - -124.0097787, - 45.0091863 - ], - [ - -124.0097929, - 45.0092076 - ], - [ - -124.0098042, - 45.0092368 - ], - [ - -124.0098102, - 45.009273 - ], - [ - -124.009807, - 45.0093135 - ], - [ - -124.0098039, - 45.0093239 - ], - [ - -124.0097976, - 45.0093461 - ], - [ - -124.0097786, - 45.0093777 - ], - [ - -124.0097591, - 45.0093998 - ], - [ - -124.0097492, - 45.0094243 - ], - [ - -124.0097499, - 45.0094364 - ], - [ - -124.0097507, - 45.0094485 - ], - [ - -124.0097563, - 45.0094612 - ], - [ - -124.0097595, - 45.0094685 - ], - [ - -124.0097659, - 45.0094804 - ], - [ - -124.0097882, - 45.0095026 - ], - [ - -124.0098061, - 45.0095168 - ], - [ - -124.0098251, - 45.0095486 - ], - [ - -124.0098467, - 45.009591 - ], - [ - -124.0098487, - 45.0095991 - ], - [ - -124.0098543, - 45.0096217 - ], - [ - -124.0098483, - 45.0096475 - ], - [ - -124.0098349, - 45.0096775 - ], - [ - -124.009812, - 45.0097065 - ], - [ - -124.0097923, - 45.009726 - ], - [ - -124.0097774, - 45.0097362 - ], - [ - -124.0097695, - 45.0097417 - ], - [ - -124.0097595, - 45.0097485 - ], - [ - -124.0097193, - 45.0097727 - ], - [ - -124.0096665, - 45.0098106 - ], - [ - -124.0096384, - 45.0098465 - ], - [ - -124.0096206, - 45.0098729 - ], - [ - -124.0096105, - 45.0098878 - ], - [ - -124.0096132, - 45.0099308 - ], - [ - -124.009631, - 45.0099747 - ], - [ - -124.0096559, - 45.0100089 - ], - [ - -124.0096567, - 45.0100106 - ], - [ - -124.0096734, - 45.0100474 - ], - [ - -124.0096769, - 45.0100729 - ], - [ - -124.0096663, - 45.0101162 - ], - [ - -124.0096566, - 45.0101481 - ], - [ - -124.0096489, - 45.0101733 - ], - [ - -124.0096294, - 45.0102265 - ], - [ - -124.0096116, - 45.0102769 - ], - [ - -124.0096075, - 45.0102848 - ], - [ - -124.0095811, - 45.0103371 - ], - [ - -124.0095468, - 45.0103974 - ], - [ - -124.0095358, - 45.0104216 - ], - [ - -124.0095301, - 45.0104342 - ], - [ - -124.0095223, - 45.0104614 - ], - [ - -124.0095238, - 45.010487 - ], - [ - -124.0095407, - 45.0105147 - ], - [ - -124.0095495, - 45.0105346 - ], - [ - -124.0095546, - 45.0105588 - ], - [ - -124.0095549, - 45.0105601 - ], - [ - -124.0095582, - 45.0105842 - ], - [ - -124.0095499, - 45.0106033 - ], - [ - -124.0095264, - 45.0106229 - ], - [ - -124.0095162, - 45.010642 - ], - [ - -124.0095085, - 45.0106706 - ], - [ - -124.0095112, - 45.0106956 - ], - [ - -124.0095128, - 45.0107095 - ], - [ - -124.009524, - 45.0107374 - ], - [ - -124.0095472, - 45.0107757 - ], - [ - -124.009566, - 45.0108048 - ], - [ - -124.0095841, - 45.0108331 - ], - [ - -124.009587, - 45.0108378 - ], - [ - -124.0095967, - 45.0108712 - ], - [ - -124.0095893, - 45.0109064 - ], - [ - -124.0095758, - 45.0109337 - ], - [ - -124.0095415, - 45.0109617 - ], - [ - -124.0095276, - 45.0109699 - ], - [ - -124.0094957, - 45.0109887 - ], - [ - -124.0094547, - 45.0110008 - ], - [ - -124.0094025, - 45.0110172 - ], - [ - -124.0093617, - 45.0110333 - ], - [ - -124.0093247, - 45.0110479 - ], - [ - -124.0093069, - 45.0110673 - ], - [ - -124.0093028, - 45.0110943 - ], - [ - -124.0093067, - 45.0111058 - ], - [ - -124.0093121, - 45.0111223 - ], - [ - -124.0093345, - 45.0111472 - ], - [ - -124.0093593, - 45.0111801 - ], - [ - -124.0093741, - 45.0112039 - ], - [ - -124.0093798, - 45.0112347 - ], - [ - -124.0093796, - 45.0112433 - ], - [ - -124.0093788, - 45.0112818 - ], - [ - -124.0093737, - 45.011321 - ], - [ - -124.0093531, - 45.011358 - ], - [ - -124.0093335, - 45.0113788 - ], - [ - -124.0093319, - 45.0113802 - ], - [ - -124.0092956, - 45.0114096 - ], - [ - -124.0092646, - 45.0114308 - ], - [ - -124.0092521, - 45.0114446 - ], - [ - -124.0092402, - 45.0114665 - ], - [ - -124.0092318, - 45.0114843 - ], - [ - -124.0092369, - 45.0115057 - ], - [ - -124.0092402, - 45.0115168 - ], - [ - -124.0092441, - 45.0115297 - ], - [ - -124.0092556, - 45.011563 - ], - [ - -124.0092563, - 45.0116061 - ], - [ - -124.0092568, - 45.0116451 - ], - [ - -124.0092545, - 45.0116539 - ], - [ - -124.0092476, - 45.0116804 - ], - [ - -124.0092315, - 45.0117087 - ], - [ - -124.0092305, - 45.0117106 - ], - [ - -124.0092094, - 45.0117381 - ], - [ - -124.0091977, - 45.0117641 - ], - [ - -124.0091897, - 45.0117886 - ], - [ - -124.0091876, - 45.0118169 - ], - [ - -124.0091875, - 45.0118181 - ], - [ - -124.0091841, - 45.011852 - ], - [ - -124.0091827, - 45.0118925 - ], - [ - -124.0091691, - 45.0119277 - ], - [ - -124.009168, - 45.0119306 - ], - [ - -124.0091579, - 45.0119821 - ], - [ - -124.0091527, - 45.0120213 - ], - [ - -124.0091586, - 45.0120561 - ], - [ - -124.0091599, - 45.0120647 - ], - [ - -124.0091648, - 45.0120963 - ], - [ - -124.0091598, - 45.0121382 - ], - [ - -124.0091431, - 45.0121751 - ], - [ - -124.0091276, - 45.0122016 - ], - [ - -124.009119, - 45.0122162 - ], - [ - -124.0091003, - 45.0122573 - ], - [ - -124.0090949, - 45.0122858 - ], - [ - -124.0090926, - 45.0123173 - ], - [ - -124.0090926, - 45.0123248 - ], - [ - -124.0090927, - 45.0123386 - ], - [ - -124.0090928, - 45.0123437 - ], - [ - -124.0090976, - 45.012376 - ], - [ - -124.0091074, - 45.0124193 - ], - [ - -124.009112, - 45.0124772 - ], - [ - -124.0091129, - 45.0124875 - ], - [ - -124.0091116, - 45.0125403 - ], - [ - -124.0091122, - 45.0125991 - ], - [ - -124.0091101, - 45.0126143 - ], - [ - -124.0091061, - 45.0126428 - ], - [ - -124.0090977, - 45.0126704 - ], - [ - -124.0090804, - 45.0126922 - ], - [ - -124.0090676, - 45.012719 - ], - [ - -124.0090605, - 45.0127445 - ], - [ - -124.0090609, - 45.0127511 - ], - [ - -124.0090619, - 45.0127678 - ], - [ - -124.0090726, - 45.0127796 - ], - [ - -124.0090898, - 45.0128055 - ], - [ - -124.0091076, - 45.0128425 - ], - [ - -124.0091177, - 45.0128686 - ], - [ - -124.0091189, - 45.0128886 - ], - [ - -124.0091201, - 45.0129101 - ], - [ - -124.0091165, - 45.0129456 - ], - [ - -124.0091002, - 45.0129857 - ], - [ - -124.0090859, - 45.0130094 - ], - [ - -124.009077, - 45.0130254 - ], - [ - -124.0090716, - 45.0130351 - ], - [ - -124.0090521, - 45.0130682 - ], - [ - -124.0090423, - 45.0130968 - ], - [ - -124.0090387, - 45.0131334 - ], - [ - -124.009039, - 45.0131622 - ], - [ - -124.009039, - 45.0131638 - ], - [ - -124.0090372, - 45.0132065 - ], - [ - -124.0090296, - 45.0132482 - ], - [ - -124.0090249, - 45.01329 - ], - [ - -124.0090257, - 45.0132992 - ], - [ - -124.0090291, - 45.0133375 - ], - [ - -124.0090331, - 45.013382 - ], - [ - -124.0090372, - 45.0134031 - ], - [ - -124.0090398, - 45.013409 - ], - [ - -124.009047, - 45.0134252 - ], - [ - -124.0090525, - 45.0134365 - ], - [ - -124.00906, - 45.0134521 - ], - [ - -124.0090746, - 45.0134831 - ], - [ - -124.0090775, - 45.0135074 - ], - [ - -124.0090789, - 45.0135317 - ], - [ - -124.0090731, - 45.0135552 - ], - [ - -124.0090616, - 45.0135788 - ], - [ - -124.0090455, - 45.0135965 - ], - [ - -124.0090324, - 45.0136172 - ], - [ - -124.0090248, - 45.0136346 - ], - [ - -124.0090262, - 45.0136579 - ], - [ - -124.0090329, - 45.013676 - ], - [ - -124.0090481, - 45.0136917 - ], - [ - -124.0090679, - 45.0137095 - ], - [ - -124.0090722, - 45.0137133 - ], - [ - -124.0090969, - 45.0137441 - ], - [ - -124.0091094, - 45.013763 - ], - [ - -124.0091134, - 45.0137821 - ], - [ - -124.0091157, - 45.0137983 - ], - [ - -124.0091188, - 45.0138266 - ], - [ - -124.0091123, - 45.0138426 - ], - [ - -124.0091111, - 45.0138455 - ], - [ - -124.0091078, - 45.0138535 - ], - [ - -124.0091063, - 45.0138573 - ], - [ - -124.0090907, - 45.0138852 - ], - [ - -124.0090736, - 45.01391 - ], - [ - -124.0090592, - 45.0139337 - ], - [ - -124.0090375, - 45.0139536 - ], - [ - -124.0090242, - 45.0139702 - ], - [ - -124.0090198, - 45.0139927 - ], - [ - -124.0090264, - 45.0140087 - ], - [ - -124.0090424, - 45.0140386 - ], - [ - -124.0090595, - 45.0140614 - ], - [ - -124.0090733, - 45.0140773 - ], - [ - -124.0091012, - 45.0140917 - ], - [ - -124.0091464, - 45.0141066 - ], - [ - -124.0091795, - 45.0141159 - ], - [ - -124.0091987, - 45.0141213 - ], - [ - -124.0092351, - 45.0141324 - ], - [ - -124.0092542, - 45.014142 - ], - [ - -124.0092718, - 45.0141749 - ], - [ - -124.0092819, - 45.0142263 - ], - [ - -124.0092811, - 45.0142536 - ], - [ - -124.0092805, - 45.014275 - ], - [ - -124.0092706, - 45.0143027 - ], - [ - -124.0092702, - 45.0143453 - ], - [ - -124.0092651, - 45.0143799 - ], - [ - -124.0092589, - 45.0144216 - ], - [ - -124.0092437, - 45.0144591 - ], - [ - -124.0092427, - 45.0144616 - ], - [ - -124.0092303, - 45.0144954 - ], - [ - -124.0092269, - 45.0145097 - ], - [ - -124.0092236, - 45.0145271 - ], - [ - -124.0092282, - 45.0145584 - ], - [ - -124.0092355, - 45.0145855 - ], - [ - -124.0092356, - 45.0146109 - ], - [ - -124.0092346, - 45.0146433 - ], - [ - -124.0092308, - 45.0146648 - ], - [ - -124.0092271, - 45.0146861 - ], - [ - -124.009216, - 45.0147179 - ], - [ - -124.0092149, - 45.0147473 - ], - [ - -124.0092151, - 45.0147566 - ], - [ - -124.0092161, - 45.0147939 - ], - [ - -124.0092134, - 45.0148214 - ], - [ - -124.0092107, - 45.0148488 - ], - [ - -124.0092158, - 45.0148862 - ], - [ - -124.0092165, - 45.0148937 - ], - [ - -124.0092189, - 45.0149165 - ], - [ - -124.0092285, - 45.0149588 - ], - [ - -124.0092321, - 45.0150035 - ], - [ - -124.0092339, - 45.0150266 - ], - [ - -124.0092322, - 45.0150712 - ], - [ - -124.0092307, - 45.0151199 - ], - [ - -124.0092319, - 45.0151407 - ], - [ - -124.0092333, - 45.0151655 - ], - [ - -124.0092379, - 45.0152201 - ], - [ - -124.009242, - 45.0152666 - ], - [ - -124.0092413, - 45.0152779 - ], - [ - -124.0092398, - 45.0153032 - ], - [ - -124.0092369, - 45.0153266 - ], - [ - -124.0092398, - 45.0153518 - ], - [ - -124.0092441, - 45.015377 - ], - [ - -124.0092485, - 45.0154033 - ], - [ - -124.0092492, - 45.0154151 - ], - [ - -124.0092508, - 45.0154437 - ], - [ - -124.0092479, - 45.0154915 - ], - [ - -124.0092469, - 45.0155483 - ], - [ - -124.0092466, - 45.0155522 - ], - [ - -124.0092428, - 45.0156011 - ], - [ - -124.0092287, - 45.0156542 - ], - [ - -124.0092173, - 45.0156892 - ], - [ - -124.0092153, - 45.0156952 - ], - [ - -124.0091919, - 45.0157354 - ], - [ - -124.0091806, - 45.0157611 - ], - [ - -124.0091659, - 45.0157795 - ], - [ - -124.009144, - 45.0157899 - ], - [ - -124.0091203, - 45.015798 - ], - [ - -124.0090962, - 45.0157999 - ], - [ - -124.0090651, - 45.015802 - ], - [ - -124.0090394, - 45.0158052 - ], - [ - -124.0090121, - 45.0158122 - ], - [ - -124.0089937, - 45.0158225 - ], - [ - -124.0089928, - 45.0158251 - ], - [ - -124.0089907, - 45.0158312 - ], - [ - -124.0089946, - 45.0158397 - ], - [ - -124.0090124, - 45.0158478 - ], - [ - -124.0090441, - 45.0158567 - ], - [ - -124.0090831, - 45.0158739 - ], - [ - -124.0091244, - 45.0158997 - ], - [ - -124.0091499, - 45.0159223 - ], - [ - -124.0091755, - 45.0159461 - ], - [ - -124.0091816, - 45.0159519 - ], - [ - -124.0091938, - 45.0159634 - ], - [ - -124.0091957, - 45.0159651 - ], - [ - -124.0092326, - 45.0160046 - ], - [ - -124.0092649, - 45.0160552 - ], - [ - -124.0092764, - 45.0161023 - ], - [ - -124.0092815, - 45.0161657 - ], - [ - -124.0092823, - 45.0162368 - ], - [ - -124.009282, - 45.0162387 - ], - [ - -124.0092764, - 45.0162849 - ], - [ - -124.0092735, - 45.016323 - ], - [ - -124.0092655, - 45.0163637 - ], - [ - -124.0092609, - 45.0163757 - ], - [ - -124.0092475, - 45.0164109 - ], - [ - -124.0092428, - 45.0164479 - ], - [ - -124.0092425, - 45.0164724 - ], - [ - -124.0092457, - 45.0164969 - ], - [ - -124.0092503, - 45.0165128 - ], - [ - -124.0092565, - 45.0165346 - ], - [ - -124.0092622, - 45.0165713 - ], - [ - -124.0092629, - 45.0165835 - ], - [ - -124.0092632, - 45.0166179 - ], - [ - -124.0092613, - 45.0166449 - ], - [ - -124.0092601, - 45.01665 - ], - [ - -124.0092558, - 45.0166684 - ], - [ - -124.0092359, - 45.0167132 - ], - [ - -124.0092176, - 45.0167554 - ], - [ - -124.0092116, - 45.0167869 - ], - [ - -124.009211, - 45.01679 - ], - [ - -124.009199, - 45.016821 - ], - [ - -124.0091925, - 45.0168568 - ], - [ - -124.0091941, - 45.016885 - ], - [ - -124.0091876, - 45.0169208 - ], - [ - -124.0091875, - 45.016924 - ], - [ - -124.009187, - 45.0169405 - ], - [ - -124.0091848, - 45.0169614 - ], - [ - -124.0091782, - 45.0169972 - ], - [ - -124.0091795, - 45.017018 - ], - [ - -124.0091811, - 45.0170462 - ], - [ - -124.0091774, - 45.0170611 - ], - [ - -124.0091755, - 45.0170684 - ], - [ - -124.0091749, - 45.0170881 - ], - [ - -124.0091745, - 45.0171102 - ], - [ - -124.0091703, - 45.0171275 - ], - [ - -124.0091665, - 45.0171509 - ], - [ - -124.0091642, - 45.0171694 - ], - [ - -124.0091651, - 45.0171853 - ], - [ - -124.0091671, - 45.017198 - ], - [ - -124.0091678, - 45.0172024 - ], - [ - -124.0091726, - 45.0172244 - ], - [ - -124.0091781, - 45.0172586 - ], - [ - -124.0091767, - 45.0172942 - ], - [ - -124.0091717, - 45.0173275 - ], - [ - -124.0091655, - 45.0173391 - ], - [ - -124.0091645, - 45.017341 - ], - [ - -124.0091624, - 45.017345 - ], - [ - -124.0091635, - 45.0173646 - ], - [ - -124.009161, - 45.0173794 - ], - [ - -124.0091533, - 45.0173956 - ], - [ - -124.0091394, - 45.0174254 - ], - [ - -124.0091335, - 45.0174428 - ], - [ - -124.0091278, - 45.0174626 - ], - [ - -124.0091269, - 45.0174773 - ], - [ - -124.0091247, - 45.0174965 - ], - [ - -124.0091246, - 45.017497 - ], - [ - -124.0091215, - 45.0175327 - ], - [ - -124.0091226, - 45.0175793 - ], - [ - -124.0091262, - 45.0176124 - ], - [ - -124.0091209, - 45.0176395 - ], - [ - -124.0091156, - 45.0176667 - ], - [ - -124.0091217, - 45.0176825 - ], - [ - -124.0091296, - 45.0176994 - ], - [ - -124.009129, - 45.0177473 - ], - [ - -124.0091295, - 45.017774 - ], - [ - -124.0091299, - 45.0177927 - ], - [ - -124.0091377, - 45.0178366 - ], - [ - -124.0091447, - 45.0178671 - ], - [ - -124.0091446, - 45.0178941 - ], - [ - -124.0091396, - 45.0179274 - ], - [ - -124.0091346, - 45.0179594 - ], - [ - -124.0091299, - 45.0179797 - ], - [ - -124.0091283, - 45.0179866 - ], - [ - -124.0091249, - 45.0180015 - ], - [ - -124.0091196, - 45.0180286 - ], - [ - -124.009103, - 45.0180696 - ], - [ - -124.0090955, - 45.0180895 - ], - [ - -124.0090915, - 45.0181167 - ], - [ - -124.0090893, - 45.0181314 - ], - [ - -124.0090924, - 45.0181546 - ], - [ - -124.0090894, - 45.0181915 - ], - [ - -124.0090988, - 45.018233 - ], - [ - -124.009102, - 45.0182539 - ], - [ - -124.0091043, - 45.0182684 - ], - [ - -124.0091105, - 45.0183149 - ], - [ - -124.0091122, - 45.018343 - ], - [ - -124.0091038, - 45.0183764 - ], - [ - -124.0090998, - 45.018391 - ], - [ - -124.0090981, - 45.0183975 - ], - [ - -124.0090887, - 45.0184149 - ], - [ - -124.0090745, - 45.0184374 - ], - [ - -124.0090707, - 45.0184621 - ], - [ - -124.0090653, - 45.018488 - ], - [ - -124.0090564, - 45.0185128 - ], - [ - -124.0090565, - 45.018528 - ], - [ - -124.0090566, - 45.0185447 - ], - [ - -124.0090593, - 45.0185913 - ], - [ - -124.0090653, - 45.0186341 - ], - [ - -124.0090737, - 45.0186652 - ], - [ - -124.0090741, - 45.0186669 - ], - [ - -124.0090893, - 45.0186886 - ], - [ - -124.0091003, - 45.0187288 - ], - [ - -124.0091002, - 45.018757 - ], - [ - -124.0091004, - 45.0187901 - ], - [ - -124.0090961, - 45.0188024 - ], - [ - -124.009093, - 45.0188112 - ], - [ - -124.0090845, - 45.0188434 - ], - [ - -124.0090853, - 45.0188568 - ], - [ - -124.0090922, - 45.0188861 - ], - [ - -124.0090863, - 45.0189035 - ], - [ - -124.0090804, - 45.0189196 - ], - [ - -124.0090728, - 45.0189382 - ], - [ - -124.0090725, - 45.0189395 - ], - [ - -124.0090687, - 45.0189567 - ], - [ - -124.0090692, - 45.0189936 - ], - [ - -124.0090815, - 45.0190263 - ], - [ - -124.0090902, - 45.0190493 - ], - [ - -124.0090958, - 45.0190639 - ], - [ - -124.0091137, - 45.0191027 - ], - [ - -124.0091261, - 45.0191379 - ], - [ - -124.0091326, - 45.0191593 - ], - [ - -124.009139, - 45.0191805 - ], - [ - -124.0091461, - 45.0192122 - ], - [ - -124.0091497, - 45.0192452 - ], - [ - -124.0091448, - 45.0192797 - ], - [ - -124.009135, - 45.0192964 - ], - [ - -124.0091338, - 45.0192985 - ], - [ - -124.0091207, - 45.0193111 - ], - [ - -124.0091079, - 45.0193275 - ], - [ - -124.009107, - 45.0193422 - ], - [ - -124.0091096, - 45.0193569 - ], - [ - -124.0091208, - 45.01937 - ], - [ - -124.0091389, - 45.0193842 - ], - [ - -124.0091517, - 45.0193961 - ], - [ - -124.0091777, - 45.019426 - ], - [ - -124.0091791, - 45.0194338 - ], - [ - -124.0091829, - 45.0194553 - ], - [ - -124.0091906, - 45.0194993 - ], - [ - -124.0091936, - 45.0195495 - ], - [ - -124.0091949, - 45.019571 - ], - [ - -124.0091952, - 45.0195765 - ], - [ - -124.0091983, - 45.0195997 - ], - [ - -124.0092067, - 45.0196259 - ], - [ - -124.0092089, - 45.0196325 - ], - [ - -124.0092105, - 45.0196607 - ], - [ - -124.0092086, - 45.0196865 - ], - [ - -124.0091995, - 45.0197089 - ], - [ - -124.0091859, - 45.0197412 - ], - [ - -124.0091782, - 45.0197586 - ], - [ - -124.0091795, - 45.0197807 - ], - [ - -124.0091947, - 45.0198023 - ], - [ - -124.0092062, - 45.0198228 - ], - [ - -124.0092223, - 45.0198604 - ], - [ - -124.0092252, - 45.0198812 - ], - [ - -124.0092353, - 45.01993 - ], - [ - -124.0092371, - 45.0199383 - ], - [ - -124.0092512, - 45.0200067 - ], - [ - -124.0092588, - 45.0200519 - ], - [ - -124.0092551, - 45.0200674 - ], - [ - -124.0092518, - 45.0200815 - ], - [ - -124.0092503, - 45.0201004 - ], - [ - -124.0092492, - 45.0201154 - ], - [ - -124.0092484, - 45.0201822 - ], - [ - -124.0092764, - 45.0202303 - ], - [ - -124.0092924, - 45.0202547 - ], - [ - -124.009297, - 45.0202597 - ], - [ - -124.0092976, - 45.0202604 - ], - [ - -124.0093144, - 45.0202786 - ], - [ - -124.0093296, - 45.0203027 - ], - [ - -124.0093416, - 45.0203331 - ], - [ - -124.009342, - 45.0203723 - ], - [ - -124.009339, - 45.0203944 - ], - [ - -124.0093383, - 45.0203994 - ], - [ - -124.0093214, - 45.0204392 - ], - [ - -124.0093115, - 45.0204656 - ], - [ - -124.0093075, - 45.0205371 - ], - [ - -124.0093077, - 45.0205468 - ], - [ - -124.0093166, - 45.0205718 - ], - [ - -124.0093374, - 45.0206044 - ], - [ - -124.0093459, - 45.0206336 - ], - [ - -124.0093516, - 45.0206752 - ], - [ - -124.0093463, - 45.0207048 - ], - [ - -124.0093359, - 45.0207357 - ], - [ - -124.0093281, - 45.0207838 - ], - [ - -124.0093386, - 45.0208179 - ], - [ - -124.0093504, - 45.0208361 - ], - [ - -124.0093651, - 45.0208589 - ], - [ - -124.0093928, - 45.0208913 - ], - [ - -124.009403, - 45.0209192 - ], - [ - -124.0094014, - 45.0209548 - ], - [ - -124.0093991, - 45.0209757 - ], - [ - -124.0094005, - 45.0210011 - ], - [ - -124.0094019, - 45.0210272 - ], - [ - -124.0094146, - 45.0211005 - ], - [ - -124.0094214, - 45.0211603 - ], - [ - -124.0094289, - 45.0212029 - ], - [ - -124.0094319, - 45.0212207 - ], - [ - -124.0094309, - 45.0212424 - ], - [ - -124.00943, - 45.0212482 - ], - [ - -124.0094231, - 45.0212892 - ], - [ - -124.0094167, - 45.0213299 - ], - [ - -124.0094007, - 45.0213856 - ], - [ - -124.0093859, - 45.0214326 - ], - [ - -124.0093579, - 45.0214898 - ], - [ - -124.0093353, - 45.0215518 - ], - [ - -124.0093274, - 45.0215962 - ], - [ - -124.0093283, - 45.021644 - ], - [ - -124.0093425, - 45.0216829 - ], - [ - -124.0093582, - 45.0217168 - ], - [ - -124.0093734, - 45.0217422 - ], - [ - -124.0093729, - 45.0217718 - ], - [ - -124.0093593, - 45.0218178 - ], - [ - -124.0093316, - 45.0218954 - ], - [ - -124.0093251, - 45.0219153 - ], - [ - -124.0093289, - 45.0219666 - ], - [ - -124.0093364, - 45.022031 - ], - [ - -124.0093211, - 45.0220791 - ], - [ - -124.0093075, - 45.022112 - ], - [ - -124.0092959, - 45.0221371 - ], - [ - -124.0092917, - 45.0221887 - ], - [ - -124.0092978, - 45.0222341 - ], - [ - -124.0093048, - 45.0222928 - ], - [ - -124.0093152, - 45.0223609 - ], - [ - -124.009333, - 45.0224193 - ], - [ - -124.0093401, - 45.0224799 - ], - [ - -124.0093406, - 45.0224861 - ], - [ - -124.0093459, - 45.0225577 - ], - [ - -124.0093458, - 45.0225919 - ], - [ - -124.0093376, - 45.0226265 - ], - [ - -124.0093345, - 45.0226932 - ], - [ - -124.0093435, - 45.0227423 - ], - [ - -124.0093543, - 45.0228161 - ], - [ - -124.0093522, - 45.02286 - ], - [ - -124.0093547, - 45.0228941 - ], - [ - -124.0093707, - 45.0229278 - ], - [ - -124.0093997, - 45.0229571 - ], - [ - -124.0094247, - 45.0230057 - ], - [ - -124.0094271, - 45.0230379 - ], - [ - -124.0094464, - 45.023081 - ], - [ - -124.0094489, - 45.0231151 - ], - [ - -124.0094748, - 45.023175 - ], - [ - -124.0094796, - 45.0232395 - ], - [ - -124.0094783, - 45.0232586 - ], - [ - -124.0094955, - 45.0233093 - ], - [ - -124.0095473, - 45.023393 - ], - [ - -124.009578, - 45.0234452 - ], - [ - -124.0096008, - 45.0234995 - ], - [ - -124.0096159, - 45.0235579 - ], - [ - -124.0096256, - 45.0236165 - ], - [ - -124.0096466, - 45.0236823 - ], - [ - -124.0096863, - 45.0237474 - ], - [ - -124.0097246, - 45.0238297 - ], - [ - -124.0097438, - 45.0239089 - ], - [ - -124.0097527, - 45.0239562 - ], - [ - -124.0097589, - 45.0240035 - ], - [ - -124.0098061, - 45.0240969 - ], - [ - -124.0098427, - 45.0241341 - ], - [ - -124.0098264, - 45.0241296 - ], - [ - -124.0094991, - 45.02404 - ], - [ - -124.0090805, - 45.0239254 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15881_s_16278", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9390428, - 44.6158865 - ], - [ - -123.9393814, - 44.6167227 - ], - [ - -123.9394325, - 44.6168967 - ], - [ - -123.9397214, - 44.618395 - ], - [ - -123.9397435, - 44.618629 - ], - [ - -123.9397776, - 44.6194208 - ], - [ - -123.9397718, - 44.6201508 - ], - [ - -123.9397712, - 44.6202022 - ], - [ - -123.9397624, - 44.6208082 - ], - [ - -123.9397417, - 44.6212733 - ], - [ - -123.9397247, - 44.6215003 - ], - [ - -123.9396737, - 44.6219822 - ], - [ - -123.9396367, - 44.6222512 - ], - [ - -123.9395373, - 44.6228205 - ], - [ - -123.9394534, - 44.6232155 - ], - [ - -123.9394441, - 44.6232584 - ], - [ - -123.9393682, - 44.6236065 - ], - [ - -123.9392779, - 44.623978 - ], - [ - -123.9390601, - 44.6247901 - ], - [ - -123.9390425, - 44.6248546 - ], - [ - -123.9387809, - 44.6257991 - ], - [ - -123.9387435, - 44.626107 - ], - [ - -123.9385119, - 44.6272737 - ], - [ - -123.9383551, - 44.6278408 - ], - [ - -123.9381563, - 44.6284625 - ], - [ - -123.9380034, - 44.6288835 - ], - [ - -123.937958, - 44.6289795 - ], - [ - -123.9379799, - 44.6290499 - ], - [ - -123.9389969, - 44.6301641 - ], - [ - -123.9400786, - 44.6320394 - ], - [ - -123.9406535, - 44.6340256 - ], - [ - -123.9407014, - 44.6360535 - ], - [ - -123.9402206, - 44.6380524 - ], - [ - -123.9392278, - 44.6399527 - ], - [ - -123.9375713, - 44.6423979 - ], - [ - -123.9373998, - 44.6426428 - ], - [ - -123.9367571, - 44.6440973 - ], - [ - -123.9361844, - 44.6454329 - ], - [ - -123.9361318, - 44.6455533 - ], - [ - -123.9354769, - 44.6470196 - ], - [ - -123.9351899, - 44.6477102 - ], - [ - -123.9350024, - 44.6481301 - ], - [ - -123.9347805, - 44.6485941 - ], - [ - -123.9336206, - 44.6504377 - ], - [ - -123.9334246, - 44.6506847 - ], - [ - -123.9325694, - 44.6516423 - ], - [ - -123.9322784, - 44.6519334 - ], - [ - -123.9303153, - 44.6535375 - ], - [ - -123.9279514, - 44.6548373 - ], - [ - -123.9252775, - 44.6557829 - ], - [ - -123.9223964, - 44.656338 - ], - [ - -123.919419, - 44.6564811 - ], - [ - -123.9164597, - 44.6562068 - ], - [ - -123.9136323, - 44.6555256 - ], - [ - -123.9110455, - 44.6544637 - ], - [ - -123.9087988, - 44.653062 - ], - [ - -123.9069784, - 44.6513743 - ], - [ - -123.9056544, - 44.6494655 - ], - [ - -123.9048775, - 44.647409 - ], - [ - -123.9046776, - 44.6452838 - ], - [ - -123.9050623, - 44.6431716 - ], - [ - -123.9060168, - 44.6411536 - ], - [ - -123.9063223, - 44.6407743 - ], - [ - -123.9063408, - 44.6407299 - ], - [ - -123.9064315, - 44.6405198 - ], - [ - -123.907107, - 44.6390089 - ], - [ - -123.9076734, - 44.6376893 - ], - [ - -123.9077121, - 44.6376005 - ], - [ - -123.9085421, - 44.6357241 - ], - [ - -123.9084237, - 44.6352834 - ], - [ - -123.9074236, - 44.6334631 - ], - [ - -123.9073277, - 44.6332261 - ], - [ - -123.9069304, - 44.6319696 - ], - [ - -123.9065438, - 44.6302886 - ], - [ - -123.906378, - 44.6292679 - ], - [ - -123.9063481, - 44.6289549 - ], - [ - -123.9064041, - 44.6270262 - ], - [ - -123.9069369, - 44.6251349 - ], - [ - -123.907052, - 44.6248569 - ], - [ - -123.9087495, - 44.6221679 - ], - [ - -123.9087829, - 44.6221299 - ], - [ - -123.9087952, - 44.6220724 - ], - [ - -123.9089249, - 44.621605 - ], - [ - -123.9081607, - 44.6202825 - ], - [ - -123.9080757, - 44.6200915 - ], - [ - -123.9076173, - 44.6187851 - ], - [ - -123.9075533, - 44.6185391 - ], - [ - -123.907298, - 44.6164986 - ], - [ - -123.9072991, - 44.6163586 - ], - [ - -123.9074811, - 44.6147392 - ], - [ - -123.9079991, - 44.6131572 - ], - [ - -123.9081492, - 44.6128163 - ], - [ - -123.908754, - 44.6116869 - ], - [ - -123.9090463, - 44.610513 - ], - [ - -123.9102257, - 44.6084256 - ], - [ - -123.9119817, - 44.6065565 - ], - [ - -123.9142392, - 44.604986 - ], - [ - -123.916901, - 44.6037815 - ], - [ - -123.9198531, - 44.6029946 - ], - [ - -123.9229687, - 44.6026591 - ], - [ - -123.9234566, - 44.6026431 - ], - [ - -123.923939, - 44.6026327 - ], - [ - -123.924038, - 44.6026317 - ], - [ - -123.9270088, - 44.6028105 - ], - [ - -123.9298739, - 44.6033998 - ], - [ - -123.932523, - 44.604377 - ], - [ - -123.9348545, - 44.6057047 - ], - [ - -123.9367787, - 44.6073317 - ], - [ - -123.9382217, - 44.6091956 - ], - [ - -123.939128, - 44.6112248 - ], - [ - -123.9394628, - 44.6133413 - ], - [ - -123.939213, - 44.6154638 - ], - [ - -123.9390428, - 44.6158865 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15882_s_15881", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9494656, - 44.621848 - ], - [ - -123.9494788, - 44.6224023 - ], - [ - -123.9492174, - 44.6246004 - ], - [ - -123.9483396, - 44.6267154 - ], - [ - -123.9468817, - 44.6286603 - ], - [ - -123.9449036, - 44.6303547 - ], - [ - -123.9424868, - 44.6317289 - ], - [ - -123.9397311, - 44.6327261 - ], - [ - -123.9367501, - 44.6333052 - ], - [ - -123.9336666, - 44.6334424 - ], - [ - -123.9329385, - 44.6334219 - ], - [ - -123.9300205, - 44.6331358 - ], - [ - -123.9272344, - 44.6324536 - ], - [ - -123.9246846, - 44.6314008 - ], - [ - -123.9224668, - 44.6300169 - ], - [ - -123.920664, - 44.6283538 - ], - [ - -123.9204992, - 44.6281192 - ], - [ - -123.9186619, - 44.6265353 - ], - [ - -123.917254, - 44.6246846 - ], - [ - -123.9164257, - 44.6227954 - ], - [ - -123.9161512, - 44.6226977 - ], - [ - -123.9137932, - 44.6213935 - ], - [ - -123.9118369, - 44.6197859 - ], - [ - -123.9103574, - 44.6179365 - ], - [ - -123.9094116, - 44.6159165 - ], - [ - -123.9090357, - 44.6138035 - ], - [ - -123.9092441, - 44.6116787 - ], - [ - -123.9100289, - 44.6096238 - ], - [ - -123.9113597, - 44.6077177 - ], - [ - -123.9131853, - 44.6060337 - ], - [ - -123.9154357, - 44.6046365 - ], - [ - -123.9180243, - 44.6035796 - ], - [ - -123.9208517, - 44.6029038 - ], - [ - -123.9238092, - 44.602635 - ], - [ - -123.9252001, - 44.6026068 - ], - [ - -123.9262168, - 44.6024317 - ], - [ - -123.9264234, - 44.60241 - ], - [ - -123.9286845, - 44.6022953 - ], - [ - -123.9309444, - 44.6024219 - ], - [ - -123.9311366, - 44.602443 - ], - [ - -123.9316108, - 44.6025193 - ], - [ - -123.9343054, - 44.6028424 - ], - [ - -123.9370277, - 44.6035692 - ], - [ - -123.9395068, - 44.6046526 - ], - [ - -123.9416524, - 44.6060531 - ], - [ - -123.9433859, - 44.6077195 - ], - [ - -123.9446442, - 44.6095911 - ], - [ - -123.9453813, - 44.6115994 - ], - [ - -123.9454815, - 44.612699 - ], - [ - -123.9457373, - 44.6133429 - ], - [ - -123.9469744, - 44.6144202 - ], - [ - -123.9483747, - 44.6162879 - ], - [ - -123.949241, - 44.6183142 - ], - [ - -123.9495404, - 44.6204221 - ], - [ - -123.9495441, - 44.6212081 - ], - [ - -123.9494656, - 44.621848 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15882_s_15883", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9191875, - 44.618769 - ], - [ - -123.9191905, - 44.6187059 - ], - [ - -123.9195553, - 44.6166741 - ], - [ - -123.9204476, - 44.6147273 - ], - [ - -123.9218355, - 44.6129347 - ], - [ - -123.9236696, - 44.61136 - ], - [ - -123.9258848, - 44.6100591 - ], - [ - -123.9284024, - 44.6090783 - ], - [ - -123.9311329, - 44.6084525 - ], - [ - -123.9339792, - 44.6082038 - ], - [ - -123.9354661, - 44.6081747 - ], - [ - -123.9355712, - 44.6081729 - ], - [ - -123.9370368, - 44.6081515 - ], - [ - -123.9400783, - 44.6083257 - ], - [ - -123.9430099, - 44.60893 - ], - [ - -123.9457138, - 44.6099401 - ], - [ - -123.9480812, - 44.6113153 - ], - [ - -123.9500168, - 44.6130003 - ], - [ - -123.9514427, - 44.6149274 - ], - [ - -123.9523015, - 44.6170189 - ], - [ - -123.9525586, - 44.6191908 - ], - [ - -123.9525546, - 44.6193682 - ], - [ - -123.9522145, - 44.6214842 - ], - [ - -123.9513028, - 44.6235122 - ], - [ - -123.9498546, - 44.6253742 - ], - [ - -123.9483545, - 44.6266374 - ], - [ - -123.9482483, - 44.626875 - ], - [ - -123.946815, - 44.6287303 - ], - [ - -123.9449045, - 44.6303516 - ], - [ - -123.9425896, - 44.6316772 - ], - [ - -123.9399584, - 44.6326568 - ], - [ - -123.9371109, - 44.633253 - ], - [ - -123.9341554, - 44.6334431 - ], - [ - -123.9334061, - 44.6334389 - ], - [ - -123.9303977, - 44.6332072 - ], - [ - -123.927513, - 44.632555 - ], - [ - -123.9248661, - 44.631508 - ], - [ - -123.9225618, - 44.6301077 - ], - [ - -123.9206913, - 44.6284094 - ], - [ - -123.9193283, - 44.6264804 - ], - [ - -123.9185269, - 44.624397 - ], - [ - -123.9183187, - 44.6222414 - ], - [ - -123.9187117, - 44.6200991 - ], - [ - -123.9188653, - 44.6196304 - ], - [ - -123.9190656, - 44.6192101 - ], - [ - -123.9191875, - 44.618769 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15882_s_16278", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9483498, - 44.6250214 - ], - [ - -123.9481495, - 44.6255724 - ], - [ - -123.9479206, - 44.6261404 - ], - [ - -123.9477936, - 44.6264394 - ], - [ - -123.9477386, - 44.6265624 - ], - [ - -123.946744, - 44.6282701 - ], - [ - -123.946669, - 44.6283731 - ], - [ - -123.9462945, - 44.6288077 - ], - [ - -123.9460999, - 44.6299024 - ], - [ - -123.945998, - 44.6302785 - ], - [ - -123.9454156, - 44.6318141 - ], - [ - -123.9452607, - 44.6321291 - ], - [ - -123.9445865, - 44.6332828 - ], - [ - -123.9443296, - 44.6336599 - ], - [ - -123.943638, - 44.6345633 - ], - [ - -123.943327, - 44.6349273 - ], - [ - -123.9429631, - 44.6353329 - ], - [ - -123.9427031, - 44.6356089 - ], - [ - -123.9425614, - 44.6357567 - ], - [ - -123.9421555, - 44.6361728 - ], - [ - -123.942129, - 44.6361998 - ], - [ - -123.941629, - 44.6367089 - ], - [ - -123.9416041, - 44.6367342 - ], - [ - -123.9410573, - 44.6372876 - ], - [ - -123.9410037, - 44.6373454 - ], - [ - -123.9396265, - 44.6393445 - ], - [ - -123.9395811, - 44.6394121 - ], - [ - -123.939505, - 44.6395295 - ], - [ - -123.9393337, - 44.6397932 - ], - [ - -123.9392278, - 44.6399527 - ], - [ - -123.9375713, - 44.6423979 - ], - [ - -123.9373998, - 44.6426428 - ], - [ - -123.9367571, - 44.6440973 - ], - [ - -123.9361844, - 44.6454329 - ], - [ - -123.9361318, - 44.6455533 - ], - [ - -123.9354769, - 44.6470196 - ], - [ - -123.9351899, - 44.6477102 - ], - [ - -123.9350024, - 44.6481301 - ], - [ - -123.9347805, - 44.6485941 - ], - [ - -123.9336206, - 44.6504377 - ], - [ - -123.9334246, - 44.6506847 - ], - [ - -123.9325694, - 44.6516423 - ], - [ - -123.9322784, - 44.6519334 - ], - [ - -123.9303153, - 44.6535375 - ], - [ - -123.9279514, - 44.6548373 - ], - [ - -123.9252775, - 44.6557829 - ], - [ - -123.9223964, - 44.656338 - ], - [ - -123.919419, - 44.6564811 - ], - [ - -123.9164597, - 44.6562068 - ], - [ - -123.9136323, - 44.6555256 - ], - [ - -123.9110455, - 44.6544637 - ], - [ - -123.9087988, - 44.653062 - ], - [ - -123.9069784, - 44.6513743 - ], - [ - -123.9056544, - 44.6494655 - ], - [ - -123.9048775, - 44.647409 - ], - [ - -123.9046776, - 44.6452838 - ], - [ - -123.9050623, - 44.6431716 - ], - [ - -123.9060168, - 44.6411536 - ], - [ - -123.9063223, - 44.6407743 - ], - [ - -123.9063408, - 44.6407299 - ], - [ - -123.9064315, - 44.6405198 - ], - [ - -123.907107, - 44.6390089 - ], - [ - -123.9076734, - 44.6376893 - ], - [ - -123.9077121, - 44.6376005 - ], - [ - -123.9088197, - 44.6350967 - ], - [ - -123.9102388, - 44.63283 - ], - [ - -123.9102691, - 44.6327936 - ], - [ - -123.9117785, - 44.6305671 - ], - [ - -123.9118914, - 44.6303935 - ], - [ - -123.9120092, - 44.6302119 - ], - [ - -123.9120983, - 44.630077 - ], - [ - -123.9122213, - 44.629894 - ], - [ - -123.9122868, - 44.6297979 - ], - [ - -123.9139232, - 44.6274241 - ], - [ - -123.9141699, - 44.6270817 - ], - [ - -123.9144729, - 44.6266788 - ], - [ - -123.9151946, - 44.6258172 - ], - [ - -123.9158116, - 44.6251523 - ], - [ - -123.9159533, - 44.6250044 - ], - [ - -123.9159626, - 44.6249062 - ], - [ - -123.9161227, - 44.6239023 - ], - [ - -123.9161738, - 44.6236763 - ], - [ - -123.9164905, - 44.6226147 - ], - [ - -123.9165546, - 44.6224427 - ], - [ - -123.9169794, - 44.6214831 - ], - [ - -123.9170484, - 44.6213491 - ], - [ - -123.9174592, - 44.6206318 - ], - [ - -123.9176032, - 44.6204038 - ], - [ - -123.9176509, - 44.620329 - ], - [ - -123.917834, - 44.6200451 - ], - [ - -123.9186973, - 44.6188935 - ], - [ - -123.9188093, - 44.6187635 - ], - [ - -123.9196494, - 44.6178876 - ], - [ - -123.9197269, - 44.6178147 - ], - [ - -123.9198191, - 44.6176201 - ], - [ - -123.9213077, - 44.6157744 - ], - [ - -123.9232717, - 44.6141717 - ], - [ - -123.9256356, - 44.6128733 - ], - [ - -123.9283086, - 44.6119292 - ], - [ - -123.931188, - 44.6113758 - ], - [ - -123.9341632, - 44.6112341 - ], - [ - -123.93712, - 44.6115097 - ], - [ - -123.9399447, - 44.6121919 - ], - [ - -123.9425289, - 44.6132547 - ], - [ - -123.9447734, - 44.6146571 - ], - [ - -123.9465917, - 44.6163453 - ], - [ - -123.9479141, - 44.6182543 - ], - [ - -123.9486897, - 44.620311 - ], - [ - -123.9488887, - 44.6224362 - ], - [ - -123.9485033, - 44.6245484 - ], - [ - -123.9483498, - 44.6250214 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15883_s_16276", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9525632, - 44.6199328 - ], - [ - -123.9525616, - 44.6213643 - ], - [ - -123.9522669, - 44.6234839 - ], - [ - -123.9513989, - 44.6255216 - ], - [ - -123.9499908, - 44.6273993 - ], - [ - -123.9480967, - 44.6290446 - ], - [ - -123.9457893, - 44.6303945 - ], - [ - -123.9431575, - 44.6313969 - ], - [ - -123.9403023, - 44.6320133 - ], - [ - -123.9373334, - 44.63222 - ], - [ - -123.9343652, - 44.6320092 - ], - [ - -123.9315117, - 44.6313888 - ], - [ - -123.9288825, - 44.6303827 - ], - [ - -123.9265789, - 44.6290297 - ], - [ - -123.9246892, - 44.6273817 - ], - [ - -123.9232862, - 44.6255021 - ], - [ - -123.9224237, - 44.6234631 - ], - [ - -123.9221349, - 44.6213432 - ], - [ - -123.9221374, - 44.619793 - ], - [ - -123.9221414, - 44.6195555 - ], - [ - -123.9221612, - 44.618941 - ], - [ - -123.9225217, - 44.6168266 - ], - [ - -123.9234528, - 44.6148031 - ], - [ - -123.9249185, - 44.6129482 - ], - [ - -123.9268627, - 44.6113332 - ], - [ - -123.9292104, - 44.6100201 - ], - [ - -123.9318716, - 44.6090593 - ], - [ - -123.9347439, - 44.6084878 - ], - [ - -123.9377172, - 44.6083275 - ], - [ - -123.9406771, - 44.6085846 - ], - [ - -123.9435099, - 44.6092491 - ], - [ - -123.946107, - 44.6102956 - ], - [ - -123.9483684, - 44.6116839 - ], - [ - -123.9502073, - 44.6133606 - ], - [ - -123.951553, - 44.6152613 - ], - [ - -123.9523539, - 44.6173131 - ], - [ - -123.9525789, - 44.619437 - ], - [ - -123.9525632, - 44.6199328 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15884_s_15882", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9395364, - 44.6320706 - ], - [ - -123.9385331, - 44.6323926 - ], - [ - -123.9356261, - 44.6328701 - ], - [ - -123.9326445, - 44.6329334 - ], - [ - -123.9297029, - 44.63258 - ], - [ - -123.9269144, - 44.6318236 - ], - [ - -123.9243863, - 44.6306932 - ], - [ - -123.9222157, - 44.6292322 - ], - [ - -123.9204861, - 44.627497 - ], - [ - -123.9192638, - 44.6255541 - ], - [ - -123.9185959, - 44.6234782 - ], - [ - -123.9185079, - 44.6213491 - ], - [ - -123.9190031, - 44.6192487 - ], - [ - -123.9190384, - 44.6191558 - ], - [ - -123.9190988, - 44.6189829 - ], - [ - -123.9193932, - 44.618373 - ], - [ - -123.9202511, - 44.61633 - ], - [ - -123.9216622, - 44.6144363 - ], - [ - -123.9235665, - 44.6127776 - ], - [ - -123.9258899, - 44.6114184 - ], - [ - -123.9285417, - 44.6104117 - ], - [ - -123.9314186, - 44.6097967 - ], - [ - -123.9344086, - 44.6095974 - ], - [ - -123.9374297, - 44.6096099 - ], - [ - -123.940418, - 44.6098341 - ], - [ - -123.9432864, - 44.6104736 - ], - [ - -123.9459229, - 44.6115034 - ], - [ - -123.9482247, - 44.6128832 - ], - [ - -123.9501019, - 44.6145593 - ], - [ - -123.9514814, - 44.6164663 - ], - [ - -123.9523091, - 44.6185297 - ], - [ - -123.9525527, - 44.6206691 - ], - [ - -123.952531, - 44.6215441 - ], - [ - -123.9521859, - 44.6236597 - ], - [ - -123.9512696, - 44.6256867 - ], - [ - -123.949817, - 44.627547 - ], - [ - -123.947884, - 44.6291691 - ], - [ - -123.9455449, - 44.6304908 - ], - [ - -123.9428896, - 44.6314611 - ], - [ - -123.9400201, - 44.6320428 - ], - [ - -123.9395364, - 44.6320706 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15885_s_15893", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0372816, - 44.6252941 - ], - [ - -124.0388256, - 44.6249315 - ], - [ - -124.0417862, - 44.6246737 - ], - [ - -124.0447603, - 44.6248332 - ], - [ - -124.0476337, - 44.6254039 - ], - [ - -124.0502961, - 44.6263639 - ], - [ - -124.0526451, - 44.6276764 - ], - [ - -124.0528859, - 44.6278405 - ], - [ - -124.0545956, - 44.6292218 - ], - [ - -124.0548556, - 44.6294718 - ], - [ - -124.0566245, - 44.6316675 - ], - [ - -124.0576335, - 44.6340959 - ], - [ - -124.0577136, - 44.6344259 - ], - [ - -124.0579321, - 44.6365559 - ], - [ - -124.0575629, - 44.6386754 - ], - [ - -124.0566201, - 44.6407023 - ], - [ - -124.05514, - 44.6425583 - ], - [ - -124.0531798, - 44.6441718 - ], - [ - -124.0508154, - 44.6454803 - ], - [ - -124.0481379, - 44.6464332 - ], - [ - -124.045251, - 44.6469938 - ], - [ - -124.0422663, - 44.6471403 - ], - [ - -124.0342948, - 44.6469702 - ], - [ - -124.0338635, - 44.6469567 - ], - [ - -124.0324232, - 44.6468967 - ], - [ - -124.0313211, - 44.6468219 - ], - [ - -124.0304709, - 44.6467419 - ], - [ - -124.0288717, - 44.6465288 - ], - [ - -124.0276015, - 44.6463087 - ], - [ - -124.0262034, - 44.6460153 - ], - [ - -124.0251532, - 44.6457552 - ], - [ - -124.0229115, - 44.6450512 - ], - [ - -124.0211104, - 44.6452416 - ], - [ - -124.0205503, - 44.6452616 - ], - [ - -124.0168448, - 44.6450697 - ], - [ - -124.0161346, - 44.6449697 - ], - [ - -124.0121574, - 44.6439859 - ], - [ - -124.0118985, - 44.6438915 - ], - [ - -124.0108663, - 44.6438188 - ], - [ - -124.0084075, - 44.6437319 - ], - [ - -124.0061329, - 44.643528 - ], - [ - -124.0054428, - 44.643428 - ], - [ - -124.0020326, - 44.6426251 - ], - [ - -124.0014025, - 44.6424151 - ], - [ - -123.9995839, - 44.6415894 - ], - [ - -123.9991493, - 44.6416819 - ], - [ - -123.9973133, - 44.641986 - ], - [ - -123.9963932, - 44.642096 - ], - [ - -123.9944193, - 44.6422384 - ], - [ - -123.9936292, - 44.6422584 - ], - [ - -123.9899108, - 44.6420254 - ], - [ - -123.9887306, - 44.6418454 - ], - [ - -123.9859177, - 44.6412073 - ], - [ - -123.9850676, - 44.6409473 - ], - [ - -123.9825443, - 44.6399645 - ], - [ - -123.9814242, - 44.6394244 - ], - [ - -123.9800815, - 44.6386965 - ], - [ - -123.9776114, - 44.6371963 - ], - [ - -123.9773288, - 44.6370204 - ], - [ - -123.9769604, - 44.6367852 - ], - [ - -123.9763752, - 44.6369438 - ], - [ - -123.9744949, - 44.6373339 - ], - [ - -123.9728514, - 44.6376053 - ], - [ - -123.9717212, - 44.6377453 - ], - [ - -123.9715632, - 44.6377612 - ], - [ - -123.9698311, - 44.6385382 - ], - [ - -123.969171, - 44.6387883 - ], - [ - -123.9668025, - 44.6395094 - ], - [ - -123.9664625, - 44.6395894 - ], - [ - -123.9640655, - 44.6400032 - ], - [ - -123.9631753, - 44.6401032 - ], - [ - -123.9603663, - 44.6402306 - ], - [ - -123.9600505, - 44.6402241 - ], - [ - -123.9583912, - 44.6410684 - ], - [ - -123.9583776, - 44.6410547 - ], - [ - -123.9565318, - 44.6419773 - ], - [ - -123.9536389, - 44.6428596 - ], - [ - -123.9505536, - 44.6432983 - ], - [ - -123.9474079, - 44.6432747 - ], - [ - -123.946867, - 44.6431893 - ], - [ - -123.9463182, - 44.6431657 - ], - [ - -123.9437775, - 44.6429019 - ], - [ - -123.9413352, - 44.642337 - ], - [ - -123.9409352, - 44.642217 - ], - [ - -123.9384061, - 44.6412486 - ], - [ - -123.938185, - 44.6411207 - ], - [ - -123.9377583, - 44.6409773 - ], - [ - -123.9372382, - 44.6407673 - ], - [ - -123.9347265, - 44.6394976 - ], - [ - -123.932624, - 44.637893 - ], - [ - -123.9324641, - 44.6377429 - ], - [ - -123.9309184, - 44.6359595 - ], - [ - -123.9307185, - 44.6356694 - ], - [ - -123.9298695, - 44.6341632 - ], - [ - -123.9293443, - 44.6325835 - ], - [ - -123.9290247, - 44.6311535 - ], - [ - -123.929018, - 44.6310535 - ], - [ - -123.9274354, - 44.6293111 - ], - [ - -123.9263318, - 44.6273323 - ], - [ - -123.9257901, - 44.6252377 - ], - [ - -123.925831, - 44.6231079 - ], - [ - -123.9264528, - 44.6210248 - ], - [ - -123.9276317, - 44.6190683 - ], - [ - -123.9293222, - 44.6173136 - ], - [ - -123.9314595, - 44.6158282 - ], - [ - -123.9339613, - 44.6146691 - ], - [ - -123.9367315, - 44.6138808 - ], - [ - -123.9382655, - 44.6136782 - ], - [ - -123.9400663, - 44.613361 - ], - [ - -123.9416299, - 44.6131467 - ], - [ - -123.9423397, - 44.6130768 - ], - [ - -123.9442153, - 44.6129757 - ], - [ - -123.9452551, - 44.6129657 - ], - [ - -123.947223, - 44.6130379 - ], - [ - -123.947583, - 44.6130679 - ], - [ - -123.9511027, - 44.6136709 - ], - [ - -123.9543235, - 44.6148506 - ], - [ - -123.9545935, - 44.6149806 - ], - [ - -123.9565056, - 44.6160706 - ], - [ - -123.9581484, - 44.6173654 - ], - [ - -123.9582884, - 44.6174954 - ], - [ - -123.9586246, - 44.6178823 - ], - [ - -123.9594509, - 44.6175918 - ], - [ - -123.9622496, - 44.6168417 - ], - [ - -123.9628795, - 44.6167217 - ], - [ - -123.9651572, - 44.6164183 - ], - [ - -123.9666682, - 44.616301 - ], - [ - -123.9686306, - 44.6154685 - ], - [ - -123.9708185, - 44.6147024 - ], - [ - -123.9715284, - 44.6145025 - ], - [ - -123.9735508, - 44.6140463 - ], - [ - -123.9741907, - 44.6139363 - ], - [ - -123.9773892, - 44.6136378 - ], - [ - -123.978569, - 44.6136178 - ], - [ - -123.9805591, - 44.6136772 - ], - [ - -123.980949, - 44.6137072 - ], - [ - -123.9836024, - 44.6140841 - ], - [ - -123.9846523, - 44.6143041 - ], - [ - -123.9877235, - 44.6152184 - ], - [ - -123.9884334, - 44.6154984 - ], - [ - -123.9897319, - 44.616073 - ], - [ - -123.9905419, - 44.6164729 - ], - [ - -123.9915384, - 44.6170094 - ], - [ - -123.9925283, - 44.6175893 - ], - [ - -123.9930185, - 44.6178891 - ], - [ - -123.9955355, - 44.6194957 - ], - [ - -123.9981972, - 44.6189493 - ], - [ - -123.999387, - 44.6188093 - ], - [ - -124.0026782, - 44.6186805 - ], - [ - -124.0031981, - 44.6187005 - ], - [ - -124.0052894, - 44.6188853 - ], - [ - -124.0064392, - 44.6190453 - ], - [ - -124.0089887, - 44.6195682 - ], - [ - -124.0094986, - 44.6197082 - ], - [ - -124.0121285, - 44.6206475 - ], - [ - -124.0127085, - 44.6209075 - ], - [ - -124.0140081, - 44.6215599 - ], - [ - -124.014508, - 44.6218399 - ], - [ - -124.0151723, - 44.6222862 - ], - [ - -124.0177428, - 44.6224673 - ], - [ - -124.020114, - 44.6227711 - ], - [ - -124.0207539, - 44.622891 - ], - [ - -124.0211344, - 44.6229849 - ], - [ - -124.0227244, - 44.6228363 - ], - [ - -124.0236142, - 44.6227963 - ], - [ - -124.0258698, - 44.6228146 - ], - [ - -124.0263597, - 44.6228446 - ], - [ - -124.027487, - 44.622944 - ], - [ - -124.0282669, - 44.623034 - ], - [ - -124.031701, - 44.6237333 - ], - [ - -124.0327408, - 44.6240433 - ], - [ - -124.0350756, - 44.6249157 - ], - [ - -124.0358368, - 44.6252632 - ], - [ - -124.0372816, - 44.6252941 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15887_s_16060", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682247, - 44.6340993 - ], - [ - -124.0663309, - 44.6362051 - ], - [ - -124.0638125, - 44.6379456 - ], - [ - -124.0625325, - 44.6386457 - ], - [ - -124.062251, - 44.638796 - ], - [ - -124.0601208, - 44.6399062 - ], - [ - -124.0586435, - 44.6405863 - ], - [ - -124.0571333, - 44.6411964 - ], - [ - -124.0564105, - 44.6414704 - ], - [ - -124.0540702, - 44.6423006 - ], - [ - -124.0532308, - 44.6425316 - ], - [ - -124.0529661, - 44.6427779 - ], - [ - -124.050723, - 44.6441822 - ], - [ - -124.0481391, - 44.6452471 - ], - [ - -124.0453139, - 44.6459316 - ], - [ - -124.0423558, - 44.6462093 - ], - [ - -124.0393786, - 44.6460697 - ], - [ - -124.0364969, - 44.645518 - ], - [ - -124.0338214, - 44.6445756 - ], - [ - -124.0314549, - 44.6432785 - ], - [ - -124.0300049, - 44.6423084 - ], - [ - -124.0279376, - 44.6406048 - ], - [ - -124.0264073, - 44.6386333 - ], - [ - -124.0254798, - 44.6364788 - ], - [ - -124.0253998, - 44.6361888 - ], - [ - -124.0253011, - 44.6357917 - ], - [ - -124.0252611, - 44.6356117 - ], - [ - -124.0250921, - 44.6333746 - ], - [ - -124.0251122, - 44.6330846 - ], - [ - -124.0254179, - 44.6315871 - ], - [ - -124.0253788, - 44.6313821 - ], - [ - -124.0255456, - 44.6292962 - ], - [ - -124.0262683, - 44.6272718 - ], - [ - -124.0275202, - 44.6253835 - ], - [ - -124.029255, - 44.6237012 - ], - [ - -124.0314084, - 44.6222871 - ], - [ - -124.0339009, - 44.6211935 - ], - [ - -124.0366403, - 44.6204607 - ], - [ - -124.0395255, - 44.6201158 - ], - [ - -124.0424496, - 44.6201717 - ], - [ - -124.0447845, - 44.6205433 - ], - [ - -124.0450896, - 44.6203095 - ], - [ - -124.0475094, - 44.6190645 - ], - [ - -124.0502226, - 44.6181805 - ], - [ - -124.053125, - 44.6176916 - ], - [ - -124.0561053, - 44.6176163 - ], - [ - -124.0590488, - 44.6179577 - ], - [ - -124.0618426, - 44.6187027 - ], - [ - -124.0643794, - 44.6198225 - ], - [ - -124.0665616, - 44.6212743 - ], - [ - -124.0683054, - 44.6230021 - ], - [ - -124.0695438, - 44.6249398 - ], - [ - -124.0702292, - 44.6270127 - ], - [ - -124.0703351, - 44.6291413 - ], - [ - -124.0698574, - 44.6312437 - ], - [ - -124.0688145, - 44.6332392 - ], - [ - -124.0682247, - 44.6340993 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15888_s_15887", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0720065, - 44.624396 - ], - [ - -124.0723664, - 44.6247975 - ], - [ - -124.0734537, - 44.6267808 - ], - [ - -124.0739782, - 44.6288776 - ], - [ - -124.07392, - 44.6310071 - ], - [ - -124.073281, - 44.6330876 - ], - [ - -124.0720858, - 44.635039 - ], - [ - -124.0703802, - 44.6367865 - ], - [ - -124.0682299, - 44.6382628 - ], - [ - -124.0657175, - 44.6394111 - ], - [ - -124.0629394, - 44.6401874 - ], - [ - -124.0600026, - 44.6405617 - ], - [ - -124.0570199, - 44.6405196 - ], - [ - -124.054106, - 44.6400629 - ], - [ - -124.0516177, - 44.6392855 - ], - [ - -124.051607, - 44.6392998 - ], - [ - -124.0513587, - 44.6392053 - ], - [ - -124.0507558, - 44.6389633 - ], - [ - -124.0506131, - 44.638903 - ], - [ - -124.0500825, - 44.6386405 - ], - [ - -124.0485749, - 44.6382454 - ], - [ - -124.0460288, - 44.6371354 - ], - [ - -124.0438351, - 44.6356921 - ], - [ - -124.042078, - 44.6339709 - ], - [ - -124.040825, - 44.632038 - ], - [ - -124.0401243, - 44.6299677 - ], - [ - -124.0400027, - 44.6278395 - ], - [ - -124.0404648, - 44.6257353 - ], - [ - -124.0414928, - 44.6237359 - ], - [ - -124.0426819, - 44.6219781 - ], - [ - -124.0445586, - 44.6198657 - ], - [ - -124.0470618, - 44.6181159 - ], - [ - -124.047214, - 44.6180317 - ], - [ - -124.0499489, - 44.6168249 - ], - [ - -124.0529776, - 44.6160554 - ], - [ - -124.0561651, - 44.6157576 - ], - [ - -124.0593691, - 44.6159448 - ], - [ - -124.0624465, - 44.6166086 - ], - [ - -124.0629976, - 44.6167747 - ], - [ - -124.0631949, - 44.6168353 - ], - [ - -124.0633591, - 44.6168867 - ], - [ - -124.0659917, - 44.6179452 - ], - [ - -124.0682796, - 44.6193543 - ], - [ - -124.0701326, - 44.6210584 - ], - [ - -124.0714777, - 44.6229905 - ], - [ - -124.0720065, - 44.624396 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15889_s_15888", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.071254, - 44.6373035 - ], - [ - -124.0713394, - 44.6373462 - ], - [ - -124.0712304, - 44.6374572 - ], - [ - -124.0705714, - 44.6380195 - ], - [ - -124.0703578, - 44.6382435 - ], - [ - -124.0702328, - 44.6383436 - ], - [ - -124.0702092, - 44.6383285 - ], - [ - -124.0695639, - 44.6388791 - ], - [ - -124.067583, - 44.6400779 - ], - [ - -124.0668011, - 44.6404744 - ], - [ - -124.0661232, - 44.641253 - ], - [ - -124.0660178, - 44.6413511 - ], - [ - -124.0641374, - 44.6428051 - ], - [ - -124.0619186, - 44.6439914 - ], - [ - -124.0594352, - 44.6448707 - ], - [ - -124.058697, - 44.6450211 - ], - [ - -124.058467, - 44.6451003 - ], - [ - -124.055858, - 44.6456181 - ], - [ - -124.0531617, - 44.6457976 - ], - [ - -124.0508325, - 44.645804 - ], - [ - -124.0477843, - 44.6455924 - ], - [ - -124.0448573, - 44.6449493 - ], - [ - -124.0421699, - 44.6439008 - ], - [ - -124.0398311, - 44.6424893 - ], - [ - -124.0379356, - 44.6407722 - ], - [ - -124.0365601, - 44.6388188 - ], - [ - -124.0357602, - 44.6367084 - ], - [ - -124.0355684, - 44.6345264 - ], - [ - -124.0355744, - 44.6344134 - ], - [ - -124.0358256, - 44.6328186 - ], - [ - -124.0358506, - 44.6327236 - ], - [ - -124.0362179, - 44.6316392 - ], - [ - -124.0362499, - 44.6315622 - ], - [ - -124.0368625, - 44.6303554 - ], - [ - -124.0369005, - 44.6302924 - ], - [ - -124.0380365, - 44.6287595 - ], - [ - -124.0394994, - 44.6273752 - ], - [ - -124.0395504, - 44.6273342 - ], - [ - -124.0396123, - 44.6272848 - ], - [ - -124.0397143, - 44.6272039 - ], - [ - -124.0420605, - 44.6256915 - ], - [ - -124.0425229, - 44.6254506 - ], - [ - -124.0427827, - 44.6253101 - ], - [ - -124.0432883, - 44.6250482 - ], - [ - -124.0436633, - 44.6248622 - ], - [ - -124.0450752, - 44.6242406 - ], - [ - -124.0456211, - 44.6240286 - ], - [ - -124.0460559, - 44.6239025 - ], - [ - -124.0468406, - 44.6230227 - ], - [ - -124.0489029, - 44.6214841 - ], - [ - -124.0513458, - 44.6202624 - ], - [ - -124.0540754, - 44.6194044 - ], - [ - -124.0569868, - 44.6189432 - ], - [ - -124.0599682, - 44.6188964 - ], - [ - -124.0629052, - 44.6192659 - ], - [ - -124.0656848, - 44.6200375 - ], - [ - -124.0665593, - 44.6203538 - ], - [ - -124.0690719, - 44.621496 - ], - [ - -124.0712249, - 44.622966 - ], - [ - -124.0729356, - 44.6247074 - ], - [ - -124.0741385, - 44.6266534 - ], - [ - -124.0747875, - 44.6287296 - ], - [ - -124.0748577, - 44.6308562 - ], - [ - -124.0743461, - 44.6329518 - ], - [ - -124.0732725, - 44.6349361 - ], - [ - -124.0725932, - 44.6358988 - ], - [ - -124.071254, - 44.6373035 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15889_s_15889", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0387495, - 44.634678 - ], - [ - -124.039004, - 44.6325559 - ], - [ - -124.0398335, - 44.6305099 - ], - [ - -124.0412058, - 44.6286188 - ], - [ - -124.0430684, - 44.6269552 - ], - [ - -124.0453495, - 44.625583 - ], - [ - -124.0479615, - 44.624555 - ], - [ - -124.0508042, - 44.6239105 - ], - [ - -124.0537682, - 44.6236744 - ], - [ - -124.0567398, - 44.6238557 - ], - [ - -124.0596048, - 44.6244475 - ], - [ - -124.0622532, - 44.6254271 - ], - [ - -124.0645832, - 44.6267567 - ], - [ - -124.0665053, - 44.6283854 - ], - [ - -124.0679456, - 44.6302505 - ], - [ - -124.0688488, - 44.6322804 - ], - [ - -124.0691801, - 44.6343972 - ], - [ - -124.0689266, - 44.6365194 - ], - [ - -124.0680981, - 44.6385655 - ], - [ - -124.0667264, - 44.6404569 - ], - [ - -124.0648641, - 44.6421209 - ], - [ - -124.0625828, - 44.6434935 - ], - [ - -124.0599702, - 44.6445219 - ], - [ - -124.0571267, - 44.6451666 - ], - [ - -124.0541616, - 44.6454028 - ], - [ - -124.0511889, - 44.6452214 - ], - [ - -124.0483229, - 44.6446294 - ], - [ - -124.0456739, - 44.6436496 - ], - [ - -124.0433437, - 44.6423196 - ], - [ - -124.0414217, - 44.6406905 - ], - [ - -124.039982, - 44.638825 - ], - [ - -124.0390797, - 44.6367949 - ], - [ - -124.0387495, - 44.634678 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15889_s_16039", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.048504, - 44.623268 - ], - [ - -124.0496195, - 44.6227953 - ], - [ - -124.0523893, - 44.6220912 - ], - [ - -124.0552968, - 44.6217807 - ], - [ - -124.0582338, - 44.6218753 - ], - [ - -124.0610904, - 44.6223715 - ], - [ - -124.0637602, - 44.6232508 - ], - [ - -124.0661433, - 44.6244803 - ], - [ - -124.068151, - 44.6260142 - ], - [ - -124.0687512, - 44.6265723 - ], - [ - -124.0689915, - 44.626802 - ], - [ - -124.0695462, - 44.627347 - ], - [ - -124.0710492, - 44.6291755 - ], - [ - -124.0720264, - 44.6311776 - ], - [ - -124.0724406, - 44.633277 - ], - [ - -124.0722758, - 44.635394 - ], - [ - -124.0715383, - 44.6374477 - ], - [ - -124.0702562, - 44.6393602 - ], - [ - -124.0684783, - 44.6410583 - ], - [ - -124.067895, - 44.6414336 - ], - [ - -124.0667429, - 44.6424334 - ], - [ - -124.0644344, - 44.6437826 - ], - [ - -124.0618015, - 44.6447844 - ], - [ - -124.0589454, - 44.6454001 - ], - [ - -124.0559759, - 44.6456061 - ], - [ - -124.0559089, - 44.645606 - ], - [ - -124.0558793, - 44.6456121 - ], - [ - -124.0529846, - 44.6457963 - ], - [ - -124.0529084, - 44.6457959 - ], - [ - -124.0525099, - 44.6458016 - ], - [ - -124.0522204, - 44.6458037 - ], - [ - -124.0508205, - 44.6458044 - ], - [ - -124.0477963, - 44.6455894 - ], - [ - -124.0448923, - 44.6449495 - ], - [ - -124.0422244, - 44.6439105 - ], - [ - -124.0398989, - 44.6425136 - ], - [ - -124.0380087, - 44.6408147 - ], - [ - -124.0366291, - 44.6388815 - ], - [ - -124.035815, - 44.6367912 - ], - [ - -124.0355989, - 44.634627 - ], - [ - -124.0356039, - 44.6345033 - ], - [ - -124.0360556, - 44.6321711 - ], - [ - -124.0361053, - 44.6320298 - ], - [ - -124.0372642, - 44.6298013 - ], - [ - -124.0373387, - 44.6296953 - ], - [ - -124.0380754, - 44.6287644 - ], - [ - -124.0381598, - 44.6286691 - ], - [ - -124.0398805, - 44.627074 - ], - [ - -124.0419837, - 44.625733 - ], - [ - -124.0429239, - 44.6252372 - ], - [ - -124.0439206, - 44.6247539 - ], - [ - -124.0445596, - 44.6244698 - ], - [ - -124.0458106, - 44.6239703 - ], - [ - -124.0460648, - 44.6238798 - ], - [ - -124.048504, - 44.623268 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15889_s_16045", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0758408, - 44.6328256 - ], - [ - -124.0755496, - 44.6334549 - ], - [ - -124.0754386, - 44.6336719 - ], - [ - -124.0752849, - 44.6339598 - ], - [ - -124.075158, - 44.6341878 - ], - [ - -124.0745123, - 44.6351947 - ], - [ - -124.0743203, - 44.6354578 - ], - [ - -124.0738727, - 44.6360285 - ], - [ - -124.0736507, - 44.6362926 - ], - [ - -124.0734936, - 44.6364753 - ], - [ - -124.0733556, - 44.6366323 - ], - [ - -124.0728832, - 44.637138 - ], - [ - -124.0727542, - 44.637268 - ], - [ - -124.0724368, - 44.6375763 - ], - [ - -124.0722648, - 44.6377373 - ], - [ - -124.071337, - 44.6385255 - ], - [ - -124.071166, - 44.6386575 - ], - [ - -124.0711025, - 44.6387062 - ], - [ - -124.0708625, - 44.6388892 - ], - [ - -124.0700309, - 44.6394764 - ], - [ - -124.0697219, - 44.6396785 - ], - [ - -124.0693207, - 44.6399316 - ], - [ - -124.0689857, - 44.6401357 - ], - [ - -124.0684189, - 44.6404644 - ], - [ - -124.0671888, - 44.6411435 - ], - [ - -124.0669745, - 44.6412597 - ], - [ - -124.0657755, - 44.6418978 - ], - [ - -124.0648593, - 44.6422926 - ], - [ - -124.0648057, - 44.6423318 - ], - [ - -124.0624848, - 44.6437215 - ], - [ - -124.0598243, - 44.6447554 - ], - [ - -124.0588521, - 44.6449695 - ], - [ - -124.058534, - 44.6450808 - ], - [ - -124.0559001, - 44.6456127 - ], - [ - -124.0531753, - 44.6457991 - ], - [ - -124.05089, - 44.645808 - ], - [ - -124.0478418, - 44.6455999 - ], - [ - -124.0449137, - 44.6449603 - ], - [ - -124.0422243, - 44.6439151 - ], - [ - -124.0398825, - 44.6425068 - ], - [ - -124.0379831, - 44.6407922 - ], - [ - -124.036603, - 44.6388409 - ], - [ - -124.0357979, - 44.6367318 - ], - [ - -124.0356005, - 44.6345503 - ], - [ - -124.0356066, - 44.6344313 - ], - [ - -124.0360334, - 44.6322403 - ], - [ - -124.0360832, - 44.6320953 - ], - [ - -124.0367423, - 44.6306312 - ], - [ - -124.0368019, - 44.6305252 - ], - [ - -124.0378299, - 44.6290371 - ], - [ - -124.0391631, - 44.6276782 - ], - [ - -124.0392525, - 44.6276005 - ], - [ - -124.041472, - 44.6260311 - ], - [ - -124.0417303, - 44.6258827 - ], - [ - -124.0421329, - 44.6256591 - ], - [ - -124.0427986, - 44.6253021 - ], - [ - -124.0435364, - 44.6249303 - ], - [ - -124.0440091, - 44.6247069 - ], - [ - -124.0452317, - 44.6241859 - ], - [ - -124.0457036, - 44.6240056 - ], - [ - -124.0477497, - 44.6233573 - ], - [ - -124.0483171, - 44.6232451 - ], - [ - -124.0496341, - 44.6218803 - ], - [ - -124.0501699, - 44.6212277 - ], - [ - -124.0521512, - 44.6196358 - ], - [ - -124.0545292, - 44.6183505 - ], - [ - -124.0572125, - 44.6174212 - ], - [ - -124.060098, - 44.6168835 - ], - [ - -124.0630749, - 44.6167582 - ], - [ - -124.0660288, - 44.61705 - ], - [ - -124.0688463, - 44.6177478 - ], - [ - -124.0714192, - 44.6188246 - ], - [ - -124.0736486, - 44.6202393 - ], - [ - -124.0754489, - 44.6219373 - ], - [ - -124.0767508, - 44.6238536 - ], - [ - -124.0775043, - 44.6259144 - ], - [ - -124.0776804, - 44.6280406 - ], - [ - -124.0772722, - 44.6301505 - ], - [ - -124.0762954, - 44.632163 - ], - [ - -124.076284, - 44.6321807 - ], - [ - -124.0760709, - 44.6324974 - ], - [ - -124.0758408, - 44.6328256 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15889_s_16200", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0680035, - 44.638872 - ], - [ - -124.0678617, - 44.6395617 - ], - [ - -124.0669257, - 44.6414886 - ], - [ - -124.0655018, - 44.6432566 - ], - [ - -124.0636401, - 44.6448035 - ], - [ - -124.0614061, - 44.6460747 - ], - [ - -124.0588787, - 44.6470254 - ], - [ - -124.0588388, - 44.6470342 - ], - [ - -124.0579644, - 44.6473679 - ], - [ - -124.0551093, - 44.6479863 - ], - [ - -124.05214, - 44.6481951 - ], - [ - -124.0491707, - 44.6479863 - ], - [ - -124.0463156, - 44.6473679 - ], - [ - -124.0436844, - 44.6463637 - ], - [ - -124.0413783, - 44.6450123 - ], - [ - -124.039486, - 44.6433656 - ], - [ - -124.03808, - 44.641487 - ], - [ - -124.0372146, - 44.6394487 - ], - [ - -124.0369227, - 44.637329 - ], - [ - -124.0369228, - 44.636989 - ], - [ - -124.0372102, - 44.6348892 - ], - [ - -124.0380605, - 44.6328686 - ], - [ - -124.0394416, - 44.6310035 - ], - [ - -124.0395236, - 44.6309313 - ], - [ - -124.0396951, - 44.6306554 - ], - [ - -124.0414084, - 44.6285653 - ], - [ - -124.0418464, - 44.6281462 - ], - [ - -124.0438562, - 44.6265725 - ], - [ - -124.0462573, - 44.6253089 - ], - [ - -124.0489572, - 44.6244041 - ], - [ - -124.0518524, - 44.6238927 - ], - [ - -124.0548317, - 44.6237945 - ], - [ - -124.0577805, - 44.6241132 - ], - [ - -124.0605857, - 44.6248365 - ], - [ - -124.0631395, - 44.6259367 - ], - [ - -124.0653438, - 44.6273716 - ], - [ - -124.0671138, - 44.6290859 - ], - [ - -124.0683816, - 44.6310138 - ], - [ - -124.0690984, - 44.6330814 - ], - [ - -124.0692365, - 44.635209 - ], - [ - -124.0687906, - 44.637315 - ], - [ - -124.0680035, - 44.638872 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15889_s_2456760", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0676983, - 44.6320106 - ], - [ - -124.0682181, - 44.6331739 - ], - [ - -124.0685563, - 44.6352624 - ], - [ - -124.0683247, - 44.6373582 - ], - [ - -124.0683151, - 44.6373828 - ], - [ - -124.0683122, - 44.637723 - ], - [ - -124.0683104, - 44.6381042 - ], - [ - -124.0683102, - 44.6381355 - ], - [ - -124.0683085, - 44.6383202 - ], - [ - -124.0683085, - 44.638352 - ], - [ - -124.0683083, - 44.6384109 - ], - [ - -124.0683045, - 44.6389342 - ], - [ - -124.0682997, - 44.6396826 - ], - [ - -124.068296, - 44.6401893 - ], - [ - -124.0682961, - 44.640386 - ], - [ - -124.0682959, - 44.640438 - ], - [ - -124.0682911, - 44.641183 - ], - [ - -124.0682863, - 44.6418964 - ], - [ - -124.0682815, - 44.6426644 - ], - [ - -124.0682814, - 44.6426784 - ], - [ - -124.0682796, - 44.6429015 - ], - [ - -124.0682787, - 44.6431537 - ], - [ - -124.0682786, - 44.6431792 - ], - [ - -124.0682776, - 44.6433222 - ], - [ - -124.0682775, - 44.6433385 - ], - [ - -124.0682758, - 44.643537 - ], - [ - -124.0682749, - 44.6437966 - ], - [ - -124.0682747, - 44.6438359 - ], - [ - -124.0682728, - 44.64406 - ], - [ - -124.068269, - 44.6446543 - ], - [ - -124.0682681, - 44.6448365 - ], - [ - -124.0682642, - 44.6454705 - ], - [ - -124.0682633, - 44.6456164 - ], - [ - -124.0682517, - 44.6474517 - ], - [ - -124.0682463, - 44.6483062 - ], - [ - -124.0682488, - 44.6484308 - ], - [ - -124.0682469, - 44.6486498 - ], - [ - -124.0682467, - 44.6486736 - ], - [ - -124.0682427, - 44.6490016 - ], - [ - -124.0682419, - 44.6490709 - ], - [ - -124.0682423, - 44.6491136 - ], - [ - -124.0682465, - 44.6499656 - ], - [ - -124.0682463, - 44.6500688 - ], - [ - -124.0682453, - 44.6501848 - ], - [ - -124.0679352, - 44.6523032 - ], - [ - -124.0670519, - 44.6543377 - ], - [ - -124.0656295, - 44.6562101 - ], - [ - -124.0637226, - 44.6578484 - ], - [ - -124.0614044, - 44.6591896 - ], - [ - -124.058764, - 44.6601822 - ], - [ - -124.055903, - 44.6607881 - ], - [ - -124.0529313, - 44.6609838 - ], - [ - -124.0499633, - 44.660762 - ], - [ - -124.0471129, - 44.6601311 - ], - [ - -124.0444898, - 44.6591153 - ], - [ - -124.0421949, - 44.6577538 - ], - [ - -124.0403164, - 44.6560989 - ], - [ - -124.0389264, - 44.6542142 - ], - [ - -124.0380783, - 44.6521721 - ], - [ - -124.0378047, - 44.6500511 - ], - [ - -124.0378052, - 44.6499893 - ], - [ - -124.0378007, - 44.6491085 - ], - [ - -124.0378013, - 44.64897 - ], - [ - -124.0378033, - 44.6488112 - ], - [ - -124.0378066, - 44.6485456 - ], - [ - -124.0378059, - 44.6483278 - ], - [ - -124.037806, - 44.6482482 - ], - [ - -124.0378122, - 44.6473498 - ], - [ - -124.0378247, - 44.6455133 - ], - [ - -124.0378257, - 44.6453723 - ], - [ - -124.0378299, - 44.6446598 - ], - [ - -124.0378302, - 44.6446213 - ], - [ - -124.0378311, - 44.6445416 - ], - [ - -124.0378351, - 44.6439499 - ], - [ - -124.0378353, - 44.6439341 - ], - [ - -124.0378371, - 44.6437217 - ], - [ - -124.0378381, - 44.6434604 - ], - [ - -124.0378384, - 44.6434175 - ], - [ - -124.0378404, - 44.6432056 - ], - [ - -124.0378413, - 44.6430835 - ], - [ - -124.0378423, - 44.6428263 - ], - [ - -124.0378425, - 44.6427906 - ], - [ - -124.0378445, - 44.6425588 - ], - [ - -124.0378486, - 44.641894 - ], - [ - -124.0378489, - 44.6418592 - ], - [ - -124.0378498, - 44.6417764 - ], - [ - -124.0378549, - 44.6410778 - ], - [ - -124.0378599, - 44.64036 - ], - [ - -124.03786, - 44.64016 - ], - [ - -124.0378602, - 44.6401013 - ], - [ - -124.0378643, - 44.6395759 - ], - [ - -124.0378695, - 44.6388274 - ], - [ - -124.0378736, - 44.6382327 - ], - [ - -124.0378738, - 44.6382145 - ], - [ - -124.0378757, - 44.6380101 - ], - [ - -124.0378777, - 44.6376298 - ], - [ - -124.0378778, - 44.6376189 - ], - [ - -124.0378819, - 44.6369999 - ], - [ - -124.0378865, - 44.6367826 - ], - [ - -124.0378872, - 44.6367603 - ], - [ - -124.0378914, - 44.6365981 - ], - [ - -124.0378924, - 44.6365598 - ], - [ - -124.0378991, - 44.636342 - ], - [ - -124.0379043, - 44.6360562 - ], - [ - -124.037922, - 44.6358575 - ], - [ - -124.037937, - 44.633833 - ], - [ - -124.0385344, - 44.6317462 - ], - [ - -124.0396904, - 44.6297828 - ], - [ - -124.0413605, - 44.628018 - ], - [ - -124.0434806, - 44.6265199 - ], - [ - -124.045969, - 44.6253458 - ], - [ - -124.0487304, - 44.6245409 - ], - [ - -124.0516584, - 44.6241361 - ], - [ - -124.0546408, - 44.624147 - ], - [ - -124.057563, - 44.6245731 - ], - [ - -124.0603126, - 44.6253981 - ], - [ - -124.0627842, - 44.6265902 - ], - [ - -124.0648827, - 44.6281038 - ], - [ - -124.0665275, - 44.6298806 - ], - [ - -124.0670994, - 44.6308806 - ], - [ - -124.0673231, - 44.6311711 - ], - [ - -124.0675284, - 44.6316305 - ], - [ - -124.0676553, - 44.6318524 - ], - [ - -124.0676983, - 44.6320106 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15890_s_2438932", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0673642, - 44.6506772 - ], - [ - -124.0673192, - 44.651069 - ], - [ - -124.0674025, - 44.6515695 - ], - [ - -124.0671579, - 44.6537228 - ], - [ - -124.0663212, - 44.655799 - ], - [ - -124.065407, - 44.6570545 - ], - [ - -124.0653956, - 44.6572839 - ], - [ - -124.0649603, - 44.6585835 - ], - [ - -124.0649521, - 44.6586172 - ], - [ - -124.0649439, - 44.6586326 - ], - [ - -124.0646916, - 44.6593857 - ], - [ - -124.0634186, - 44.6613464 - ], - [ - -124.0616269, - 44.6630885 - ], - [ - -124.0593875, - 44.664543 - ], - [ - -124.056789, - 44.6656524 - ], - [ - -124.0567321, - 44.6656715 - ], - [ - -124.0537583, - 44.6664123 - ], - [ - -124.0506346, - 44.6667005 - ], - [ - -124.0474946, - 44.6665237 - ], - [ - -124.0444729, - 44.6658896 - ], - [ - -124.0416987, - 44.6648252 - ], - [ - -124.0392909, - 44.6633761 - ], - [ - -124.0392543, - 44.663349 - ], - [ - -124.0372531, - 44.661505 - ], - [ - -124.0358495, - 44.6593986 - ], - [ - -124.0351083, - 44.6571269 - ], - [ - -124.0350991, - 44.6570728 - ], - [ - -124.0351, - 44.6561544 - ], - [ - -124.0347894, - 44.6554854 - ], - [ - -124.0347765, - 44.6554444 - ], - [ - -124.03441, - 44.6534094 - ], - [ - -124.0345861, - 44.6513615 - ], - [ - -124.0352983, - 44.6493738 - ], - [ - -124.0365213, - 44.647517 - ], - [ - -124.0382113, - 44.6458575 - ], - [ - -124.0390341, - 44.6453069 - ], - [ - -124.0392425, - 44.6450076 - ], - [ - -124.0410667, - 44.6433222 - ], - [ - -124.0433163, - 44.6419232 - ], - [ - -124.0459049, - 44.6408644 - ], - [ - -124.048733, - 44.6401864 - ], - [ - -124.051692, - 44.6399152 - ], - [ - -124.0546682, - 44.6400614 - ], - [ - -124.0575473, - 44.6406191 - ], - [ - -124.0602188, - 44.6415672 - ], - [ - -124.06258, - 44.642869 - ], - [ - -124.0645402, - 44.6444747 - ], - [ - -124.066024, - 44.6463225 - ], - [ - -124.0669745, - 44.6483415 - ], - [ - -124.0673549, - 44.650454 - ], - [ - -124.0673642, - 44.6506772 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15892_s_15884", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9503246, - 44.6158124 - ], - [ - -123.951517, - 44.6164829 - ], - [ - -123.9534554, - 44.6181015 - ], - [ - -123.9549144, - 44.6199592 - ], - [ - -123.9558382, - 44.6219844 - ], - [ - -123.956191, - 44.6240994 - ], - [ - -123.9559592, - 44.6262229 - ], - [ - -123.9551518, - 44.6282734 - ], - [ - -123.9537996, - 44.6301719 - ], - [ - -123.9519547, - 44.6318455 - ], - [ - -123.9496878, - 44.63323 - ], - [ - -123.9470861, - 44.634272 - ], - [ - -123.9442497, - 44.6349314 - ], - [ - -123.9412875, - 44.6351831 - ], - [ - -123.9409663, - 44.6351877 - ], - [ - -123.937805, - 44.6349971 - ], - [ - -123.9373395, - 44.6349336 - ], - [ - -123.9347925, - 44.6344189 - ], - [ - -123.9343814, - 44.6343075 - ], - [ - -123.9308979, - 44.6329703 - ], - [ - -123.930443, - 44.6327366 - ], - [ - -123.928062, - 44.6311716 - ], - [ - -123.9277275, - 44.6310139 - ], - [ - -123.9256409, - 44.6295511 - ], - [ - -123.9239848, - 44.6278303 - ], - [ - -123.9228203, - 44.625915 - ], - [ - -123.9221904, - 44.623876 - ], - [ - -123.9221182, - 44.6217886 - ], - [ - -123.9221186, - 44.6217869 - ], - [ - -123.9221159, - 44.6217302 - ], - [ - -123.9223044, - 44.6196045 - ], - [ - -123.92307, - 44.6175459 - ], - [ - -123.924383, - 44.6156335 - ], - [ - -123.9261931, - 44.6139408 - ], - [ - -123.9284306, - 44.6125328 - ], - [ - -123.9310096, - 44.6114636 - ], - [ - -123.9338309, - 44.6107743 - ], - [ - -123.9367863, - 44.6104914 - ], - [ - -123.9397622, - 44.6106256 - ], - [ - -123.9426442, - 44.6111719 - ], - [ - -123.9453218, - 44.6121093 - ], - [ - -123.947692, - 44.6134018 - ], - [ - -123.9496638, - 44.6149996 - ], - [ - -123.9503246, - 44.6158124 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15893_s_16048", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.075939, - 44.6325665 - ], - [ - -124.075948, - 44.6325684 - ], - [ - -124.075845, - 44.6328164 - ], - [ - -124.0755496, - 44.6334549 - ], - [ - -124.0754386, - 44.6336719 - ], - [ - -124.0752849, - 44.6339598 - ], - [ - -124.075158, - 44.6341878 - ], - [ - -124.0745123, - 44.6351947 - ], - [ - -124.0743203, - 44.6354578 - ], - [ - -124.0738727, - 44.6360285 - ], - [ - -124.0736507, - 44.6362926 - ], - [ - -124.0734936, - 44.6364753 - ], - [ - -124.0733556, - 44.6366323 - ], - [ - -124.0728832, - 44.637138 - ], - [ - -124.0727542, - 44.637268 - ], - [ - -124.0724368, - 44.6375763 - ], - [ - -124.0722648, - 44.6377373 - ], - [ - -124.071337, - 44.6385255 - ], - [ - -124.071166, - 44.6386575 - ], - [ - -124.0711025, - 44.6387062 - ], - [ - -124.0708625, - 44.6388892 - ], - [ - -124.0700309, - 44.6394764 - ], - [ - -124.0697219, - 44.6396785 - ], - [ - -124.0693207, - 44.6399316 - ], - [ - -124.0689857, - 44.6401357 - ], - [ - -124.0684189, - 44.6404644 - ], - [ - -124.0671888, - 44.6411435 - ], - [ - -124.0669745, - 44.6412597 - ], - [ - -124.0666014, - 44.6414583 - ], - [ - -124.0658555, - 44.6424708 - ], - [ - -124.0640699, - 44.6440709 - ], - [ - -124.0618956, - 44.6454036 - ], - [ - -124.0594099, - 44.6464217 - ], - [ - -124.0567008, - 44.647089 - ], - [ - -124.0538644, - 44.6473819 - ], - [ - -124.0510015, - 44.6472899 - ], - [ - -124.0503193, - 44.647174 - ], - [ - -124.0495263, - 44.6471769 - ], - [ - -124.0494633, - 44.6471771 - ], - [ - -124.048054, - 44.6471781 - ], - [ - -124.0480086, - 44.6471781 - ], - [ - -124.04666, - 44.6471761 - ], - [ - -124.0453424, - 44.64718 - ], - [ - -124.0449954, - 44.6471782 - ], - [ - -124.0440222, - 44.6471652 - ], - [ - -124.0436498, - 44.6471601 - ], - [ - -124.0435988, - 44.6471593 - ], - [ - -124.0423536, - 44.6471393 - ], - [ - -124.0392725, - 44.6468636 - ], - [ - -124.0363339, - 44.6461471 - ], - [ - -124.0336604, - 44.6450197 - ], - [ - -124.0313631, - 44.6435283 - ], - [ - -124.0295377, - 44.6417351 - ], - [ - -124.0292571, - 44.6412913 - ], - [ - -124.0283126, - 44.6401927 - ], - [ - -124.027278, - 44.638195 - ], - [ - -124.0268092, - 44.6360915 - ], - [ - -124.0269242, - 44.6339631 - ], - [ - -124.0276184, - 44.6318917 - ], - [ - -124.0288652, - 44.6299567 - ], - [ - -124.0306165, - 44.6282326 - ], - [ - -124.0328052, - 44.6267856 - ], - [ - -124.0353469, - 44.6256712 - ], - [ - -124.0381442, - 44.6249323 - ], - [ - -124.0397008, - 44.6247553 - ], - [ - -124.0395863, - 44.6246408 - ], - [ - -124.0393913, - 44.6244348 - ], - [ - -124.039149, - 44.6241706 - ], - [ - -124.0389421, - 44.6239375 - ], - [ - -124.0386247, - 44.6235638 - ], - [ - -124.0384097, - 44.6232988 - ], - [ - -124.0380085, - 44.6227709 - ], - [ - -124.0378215, - 44.6225079 - ], - [ - -124.037763, - 44.6224247 - ], - [ - -124.037486, - 44.6220266 - ], - [ - -124.0370026, - 44.6212583 - ], - [ - -124.0368272, - 44.6209481 - ], - [ - -124.036626, - 44.6205959 - ], - [ - -124.0362979, - 44.6199663 - ], - [ - -124.0361589, - 44.6196723 - ], - [ - -124.0358421, - 44.6189109 - ], - [ - -124.0357301, - 44.6186009 - ], - [ - -124.0355901, - 44.6181782 - ], - [ - -124.0355061, - 44.6179002 - ], - [ - -124.0354282, - 44.6176249 - ], - [ - -124.0352914, - 44.6171069 - ], - [ - -124.0351708, - 44.61658 - ], - [ - -124.0351436, - 44.6164391 - ], - [ - -124.0340298, - 44.6156982 - ], - [ - -124.0339288, - 44.6156182 - ], - [ - -124.0325986, - 44.6144005 - ], - [ - -124.0325196, - 44.6143164 - ], - [ - -124.0314436, - 44.6129746 - ], - [ - -124.0313876, - 44.6128916 - ], - [ - -124.0306443, - 44.6115762 - ], - [ - -124.0306023, - 44.6114852 - ], - [ - -124.0303956, - 44.6109991 - ], - [ - -124.0303566, - 44.610899 - ], - [ - -124.030045, - 44.6097083 - ], - [ - -124.0300433, - 44.6097062 - ], - [ - -124.0293793, - 44.6087634 - ], - [ - -124.0293153, - 44.6086604 - ], - [ - -124.0282997, - 44.6063705 - ], - [ - -124.0282677, - 44.6062555 - ], - [ - -124.028057, - 44.6052568 - ], - [ - -124.0280381, - 44.6051258 - ], - [ - -124.0279648, - 44.6043483 - ], - [ - -124.0279469, - 44.6039403 - ], - [ - -124.0281577, - 44.6017659 - ], - [ - -124.0289717, - 44.5996654 - ], - [ - -124.0303559, - 44.5977232 - ], - [ - -124.0322548, - 44.5960174 - ], - [ - -124.0345919, - 44.5946167 - ], - [ - -124.0372731, - 44.5935774 - ], - [ - -124.0401905, - 44.5929413 - ], - [ - -124.0410691, - 44.5928813 - ], - [ - -124.0423175, - 44.5925365 - ], - [ - -124.0452541, - 44.5921709 - ], - [ - -124.048234, - 44.5922215 - ], - [ - -124.0511429, - 44.5926866 - ], - [ - -124.053869, - 44.5935481 - ], - [ - -124.0563076, - 44.5947731 - ], - [ - -124.058365, - 44.5963144 - ], - [ - -124.0593246, - 44.5973949 - ], - [ - -124.0591123, - 44.5970598 - ], - [ - -124.0594553, - 44.5975421 - ], - [ - -124.0599622, - 44.5981128 - ], - [ - -124.0602843, - 44.5987079 - ], - [ - -124.0606953, - 44.5992859 - ], - [ - -124.0607094, - 44.5993129 - ], - [ - -124.060986, - 44.6000039 - ], - [ - -124.0610376, - 44.6000993 - ], - [ - -124.0610011, - 44.6000416 - ], - [ - -124.061199, - 44.6005361 - ], - [ - -124.0634051, - 44.6019526 - ], - [ - -124.0651855, - 44.6036495 - ], - [ - -124.0664707, - 44.6055611 - ], - [ - -124.0672117, - 44.6076147 - ], - [ - -124.0673802, - 44.609732 - ], - [ - -124.0669697, - 44.6118324 - ], - [ - -124.0660954, - 44.6136308 - ], - [ - -124.0665464, - 44.6140447 - ], - [ - -124.0672283, - 44.6146565 - ], - [ - -124.0692152, - 44.6163322 - ], - [ - -124.0697817, - 44.6168052 - ], - [ - -124.0700538, - 44.617026 - ], - [ - -124.0704556, - 44.6173337 - ], - [ - -124.0705579, - 44.6174128 - ], - [ - -124.0706859, - 44.6175128 - ], - [ - -124.071036, - 44.6178 - ], - [ - -124.0710361, - 44.6178 - ], - [ - -124.0713941, - 44.6180929 - ], - [ - -124.0717, - 44.6183513 - ], - [ - -124.071895, - 44.6185212 - ], - [ - -124.0725703, - 44.619156 - ], - [ - -124.0728944, - 44.619485 - ], - [ - -124.0730262, - 44.6196211 - ], - [ - -124.0731282, - 44.619728 - ], - [ - -124.0733403, - 44.6200014 - ], - [ - -124.0733662, - 44.6199895 - ], - [ - -124.0736043, - 44.6202545 - ], - [ - -124.0741761, - 44.6209459 - ], - [ - -124.0742891, - 44.6210949 - ], - [ - -124.0748306, - 44.6218833 - ], - [ - -124.0749277, - 44.6220402 - ], - [ - -124.0750188, - 44.6221879 - ], - [ - -124.0751064, - 44.622329 - ], - [ - -124.0754431, - 44.6229167 - ], - [ - -124.0755571, - 44.6231337 - ], - [ - -124.075838, - 44.623718 - ], - [ - -124.075975, - 44.624032 - ], - [ - -124.0765163, - 44.6257525 - ], - [ - -124.0765523, - 44.6259355 - ], - [ - -124.076571, - 44.6260333 - ], - [ - -124.0766119, - 44.6262558 - ], - [ - -124.0766438, - 44.6264263 - ], - [ - -124.0767299, - 44.6270036 - ], - [ - -124.0767499, - 44.6271836 - ], - [ - -124.0767953, - 44.627849 - ], - [ - -124.0768044, - 44.628209 - ], - [ - -124.0768014, - 44.6286975 - ], - [ - -124.0767954, - 44.6288555 - ], - [ - -124.0767504, - 44.6294484 - ], - [ - -124.0767364, - 44.6295704 - ], - [ - -124.0766994, - 44.6298491 - ], - [ - -124.0766864, - 44.6299351 - ], - [ - -124.0766546, - 44.6301451 - ], - [ - -124.0764976, - 44.6309188 - ], - [ - -124.0764456, - 44.6311228 - ], - [ - -124.0763043, - 44.6316134 - ], - [ - -124.0762463, - 44.6317934 - ], - [ - -124.075939, - 44.6325665 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15893_s_16279", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0537133, - 44.6423988 - ], - [ - -124.053403, - 44.6427011 - ], - [ - -124.0512038, - 44.6441404 - ], - [ - -124.0486535, - 44.6452458 - ], - [ - -124.0458501, - 44.6459746 - ], - [ - -124.0429013, - 44.6462989 - ], - [ - -124.0399206, - 44.6462062 - ], - [ - -124.0370225, - 44.6457001 - ], - [ - -124.0343184, - 44.6448 - ], - [ - -124.0319124, - 44.6435405 - ], - [ - -124.0302514, - 44.6424774 - ], - [ - -124.0280467, - 44.6407227 - ], - [ - -124.026424, - 44.6386699 - ], - [ - -124.0256338, - 44.6368225 - ], - [ - -124.0255933, - 44.6368297 - ], - [ - -124.0255423, - 44.6366827 - ], - [ - -124.0254885, - 44.6364828 - ], - [ - -124.0254597, - 44.6364154 - ], - [ - -124.0254147, - 44.6362464 - ], - [ - -124.0254245, - 44.6362451 - ], - [ - -124.0252394, - 44.6355574 - ], - [ - -124.0252154, - 44.6354334 - ], - [ - -124.0250726, - 44.633946 - ], - [ - -124.0250726, - 44.633634 - ], - [ - -124.0254483, - 44.631475 - ], - [ - -124.0255819, - 44.6293819 - ], - [ - -124.0263546, - 44.6272266 - ], - [ - -124.0277258, - 44.6252289 - ], - [ - -124.0296379, - 44.6234725 - ], - [ - -124.0320108, - 44.622031 - ], - [ - -124.0347449, - 44.6209649 - ], - [ - -124.0377257, - 44.6203188 - ], - [ - -124.0408283, - 44.6201198 - ], - [ - -124.0439226, - 44.6203762 - ], - [ - -124.0445165, - 44.6204702 - ], - [ - -124.0447767, - 44.6205339 - ], - [ - -124.0451383, - 44.6202577 - ], - [ - -124.0475609, - 44.6190156 - ], - [ - -124.0502761, - 44.6181348 - ], - [ - -124.0531797, - 44.6176492 - ], - [ - -124.0561601, - 44.6175775 - ], - [ - -124.0591029, - 44.6179223 - ], - [ - -124.061895, - 44.6186705 - ], - [ - -124.0644291, - 44.6197933 - ], - [ - -124.066608, - 44.6212476 - ], - [ - -124.0683479, - 44.6229775 - ], - [ - -124.0695818, - 44.6249166 - ], - [ - -124.0702624, - 44.6269903 - ], - [ - -124.0703635, - 44.629119 - ], - [ - -124.069881, - 44.6312209 - ], - [ - -124.0688335, - 44.6332152 - ], - [ - -124.0682137, - 44.6341152 - ], - [ - -124.0662536, - 44.636272 - ], - [ - -124.0636384, - 44.6380395 - ], - [ - -124.0602282, - 44.6398497 - ], - [ - -124.0586435, - 44.6405863 - ], - [ - -124.0571333, - 44.6411964 - ], - [ - -124.0564105, - 44.6414704 - ], - [ - -124.0540702, - 44.6423006 - ], - [ - -124.0537133, - 44.6423988 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15894_s_15882", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9473352, - 44.6268676 - ], - [ - -123.9472768, - 44.6269758 - ], - [ - -123.9456823, - 44.6287758 - ], - [ - -123.9436266, - 44.6303191 - ], - [ - -123.9411886, - 44.6315463 - ], - [ - -123.9384621, - 44.6324103 - ], - [ - -123.9355519, - 44.6328777 - ], - [ - -123.9325699, - 44.6329307 - ], - [ - -123.9296307, - 44.6325671 - ], - [ - -123.9268474, - 44.6318011 - ], - [ - -123.924327, - 44.630662 - ], - [ - -123.9221663, - 44.6291936 - ], - [ - -123.9219541, - 44.6289785 - ], - [ - -123.9207737, - 44.628314 - ], - [ - -123.9189035, - 44.6267776 - ], - [ - -123.9174675, - 44.6250189 - ], - [ - -123.9165162, - 44.6230998 - ], - [ - -123.9164634, - 44.6228546 - ], - [ - -123.9156715, - 44.6225547 - ], - [ - -123.9133597, - 44.621209 - ], - [ - -123.9114602, - 44.6195669 - ], - [ - -123.9100457, - 44.6176918 - ], - [ - -123.9091707, - 44.6156555 - ], - [ - -123.9088687, - 44.6135365 - ], - [ - -123.9091513, - 44.6114161 - ], - [ - -123.9100075, - 44.6093758 - ], - [ - -123.9114044, - 44.6074941 - ], - [ - -123.9132883, - 44.6058431 - ], - [ - -123.9155867, - 44.6044864 - ], - [ - -123.9182114, - 44.603476 - ], - [ - -123.9210615, - 44.6028508 - ], - [ - -123.9240275, - 44.6026347 - ], - [ - -123.9241657, - 44.6026344 - ], - [ - -123.9242545, - 44.6026212 - ], - [ - -123.9249586, - 44.6026119 - ], - [ - -123.927011, - 44.6023557 - ], - [ - -123.927199, - 44.6023427 - ], - [ - -123.9295847, - 44.6023127 - ], - [ - -123.9319476, - 44.6025495 - ], - [ - -123.9322176, - 44.6025922 - ], - [ - -123.9338373, - 44.6027473 - ], - [ - -123.9366508, - 44.6034333 - ], - [ - -123.9392237, - 44.6044972 - ], - [ - -123.9414579, - 44.6058984 - ], - [ - -123.943268, - 44.6075832 - ], - [ - -123.9445848, - 44.6094873 - ], - [ - -123.945358, - 44.611538 - ], - [ - -123.9454663, - 44.6126851 - ], - [ - -123.9457436, - 44.6133495 - ], - [ - -123.9470478, - 44.6145025 - ], - [ - -123.9484306, - 44.6163818 - ], - [ - -123.9492754, - 44.6184174 - ], - [ - -123.9495499, - 44.6205314 - ], - [ - -123.9495441, - 44.6212954 - ], - [ - -123.949288, - 44.623223 - ], - [ - -123.9485567, - 44.6250876 - ], - [ - -123.9473736, - 44.6268299 - ], - [ - -123.9473352, - 44.6268676 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15942_s_16048", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0648827, - 44.6155322 - ], - [ - -124.0636582, - 44.6171826 - ], - [ - -124.0617746, - 44.6188339 - ], - [ - -124.0594761, - 44.620191 - ], - [ - -124.0568509, - 44.6212016 - ], - [ - -124.0540001, - 44.621827 - ], - [ - -124.0510332, - 44.6220431 - ], - [ - -124.0480642, - 44.6218415 - ], - [ - -124.0452074, - 44.6212301 - ], - [ - -124.0425726, - 44.6202324 - ], - [ - -124.0402611, - 44.6188866 - ], - [ - -124.0401146, - 44.61876 - ], - [ - -124.0395893, - 44.618596 - ], - [ - -124.0393663, - 44.618518 - ], - [ - -124.0392434, - 44.6184745 - ], - [ - -124.0390253, - 44.6183965 - ], - [ - -124.0375264, - 44.6177817 - ], - [ - -124.0373204, - 44.6176857 - ], - [ - -124.0366794, - 44.61737 - ], - [ - -124.0365044, - 44.6172789 - ], - [ - -124.0361006, - 44.6170615 - ], - [ - -124.0359696, - 44.6169885 - ], - [ - -124.0340298, - 44.6156982 - ], - [ - -124.0339288, - 44.6156182 - ], - [ - -124.0325986, - 44.6144005 - ], - [ - -124.0325196, - 44.6143164 - ], - [ - -124.0314436, - 44.6129746 - ], - [ - -124.0313876, - 44.6128916 - ], - [ - -124.0306443, - 44.6115762 - ], - [ - -124.0306023, - 44.6114852 - ], - [ - -124.0303956, - 44.6109991 - ], - [ - -124.0303566, - 44.610899 - ], - [ - -124.030045, - 44.6097083 - ], - [ - -124.0300433, - 44.6097062 - ], - [ - -124.0293793, - 44.6087634 - ], - [ - -124.0293153, - 44.6086604 - ], - [ - -124.0282997, - 44.6063705 - ], - [ - -124.0282677, - 44.6062555 - ], - [ - -124.028057, - 44.6052568 - ], - [ - -124.0280381, - 44.6051258 - ], - [ - -124.0279648, - 44.6043483 - ], - [ - -124.0279469, - 44.6039403 - ], - [ - -124.0281577, - 44.6017659 - ], - [ - -124.0289717, - 44.5996654 - ], - [ - -124.0303559, - 44.5977232 - ], - [ - -124.0322548, - 44.5960174 - ], - [ - -124.0345919, - 44.5946167 - ], - [ - -124.0372731, - 44.5935774 - ], - [ - -124.0401905, - 44.5929413 - ], - [ - -124.0422165, - 44.592803 - ], - [ - -124.0444252, - 44.5924446 - ], - [ - -124.047405, - 44.5923871 - ], - [ - -124.0503431, - 44.5927461 - ], - [ - -124.0531269, - 44.5935077 - ], - [ - -124.0556494, - 44.5946427 - ], - [ - -124.0578136, - 44.5961074 - ], - [ - -124.0595364, - 44.5978456 - ], - [ - -124.0596211, - 44.5979198 - ], - [ - -124.0613451, - 44.6006299 - ], - [ - -124.0634051, - 44.6019526 - ], - [ - -124.0651855, - 44.6036495 - ], - [ - -124.0664707, - 44.6055611 - ], - [ - -124.0672117, - 44.6076147 - ], - [ - -124.0673802, - 44.609732 - ], - [ - -124.0669697, - 44.6118324 - ], - [ - -124.0659957, - 44.6138357 - ], - [ - -124.0656689, - 44.614342 - ], - [ - -124.0654233, - 44.614723 - ], - [ - -124.0653, - 44.6149178 - ], - [ - -124.0651709, - 44.6151229 - ], - [ - -124.0651614, - 44.6151379 - ], - [ - -124.0649989, - 44.615395 - ], - [ - -124.0649074, - 44.6155401 - ], - [ - -124.0648827, - 44.6155322 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15942_s_781974", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0894525, - 44.5230958 - ], - [ - -124.0896839, - 44.5236439 - ], - [ - -124.0897656, - 44.5239289 - ], - [ - -124.0898604, - 44.5242588 - ], - [ - -124.0900682, - 44.5251821 - ], - [ - -124.0901193, - 44.5254941 - ], - [ - -124.0902021, - 44.5261969 - ], - [ - -124.0902282, - 44.5265579 - ], - [ - -124.0902431, - 44.5274093 - ], - [ - -124.0902172, - 44.5281003 - ], - [ - -124.0902092, - 44.5282681 - ], - [ - -124.090023, - 44.5314241 - ], - [ - -124.0900073, - 44.5316393 - ], - [ - -124.0897451, - 44.5346603 - ], - [ - -124.0897263, - 44.53485 - ], - [ - -124.0896355, - 44.535665 - ], - [ - -124.0896248, - 44.5357563 - ], - [ - -124.0894931, - 44.5368245 - ], - [ - -124.0891762, - 44.5396377 - ], - [ - -124.089068, - 44.5409357 - ], - [ - -124.0890065, - 44.5414596 - ], - [ - -124.0885272, - 44.5446225 - ], - [ - -124.0882739, - 44.5464594 - ], - [ - -124.0882501, - 44.5466194 - ], - [ - -124.0879696, - 44.5483854 - ], - [ - -124.0879455, - 44.5485286 - ], - [ - -124.0877036, - 44.54989 - ], - [ - -124.0870701, - 44.554425 - ], - [ - -124.0870406, - 44.5546182 - ], - [ - -124.0867411, - 44.5564333 - ], - [ - -124.086681, - 44.5567557 - ], - [ - -124.0865761, - 44.5572607 - ], - [ - -124.0865633, - 44.5573215 - ], - [ - -124.0864474, - 44.5578585 - ], - [ - -124.0864185, - 44.5579874 - ], - [ - -124.0863246, - 44.5583904 - ], - [ - -124.0862913, - 44.5585279 - ], - [ - -124.0852283, - 44.562754 - ], - [ - -124.0851836, - 44.5629242 - ], - [ - -124.0849212, - 44.5638797 - ], - [ - -124.0844739, - 44.5657686 - ], - [ - -124.084447, - 44.5658787 - ], - [ - -124.0841503, - 44.5670578 - ], - [ - -124.0841328, - 44.567126 - ], - [ - -124.0839907, - 44.5676704 - ], - [ - -124.0835472, - 44.5695316 - ], - [ - -124.0835026, - 44.5697098 - ], - [ - -124.0833727, - 44.5702048 - ], - [ - -124.0833436, - 44.5703128 - ], - [ - -124.0831481, - 44.5710186 - ], - [ - -124.0829914, - 44.5715884 - ], - [ - -124.0829552, - 44.5717162 - ], - [ - -124.0828764, - 44.5719858 - ], - [ - -124.0825871, - 44.5731336 - ], - [ - -124.0825753, - 44.57318 - ], - [ - -124.0823275, - 44.574139 - ], - [ - -124.0820139, - 44.575104 - ], - [ - -124.0817011, - 44.5759 - ], - [ - -124.0816763, - 44.5759625 - ], - [ - -124.0813638, - 44.5767399 - ], - [ - -124.0810984, - 44.5774076 - ], - [ - -124.0810847, - 44.5780074 - ], - [ - -124.0810746, - 44.5782628 - ], - [ - -124.0810488, - 44.5787268 - ], - [ - -124.0810255, - 44.5790341 - ], - [ - -124.0810006, - 44.5792951 - ], - [ - -124.0808945, - 44.5800335 - ], - [ - -124.0808386, - 44.5803245 - ], - [ - -124.0807815, - 44.5805958 - ], - [ - -124.0807016, - 44.5809458 - ], - [ - -124.0806101, - 44.5813079 - ], - [ - -124.0805522, - 44.5815169 - ], - [ - -124.0804505, - 44.5818553 - ], - [ - -124.0803445, - 44.5821823 - ], - [ - -124.0802193, - 44.582541 - ], - [ - -124.0799606, - 44.5832318 - ], - [ - -124.0799467, - 44.5833027 - ], - [ - -124.0799305, - 44.5833997 - ], - [ - -124.0798505, - 44.5840329 - ], - [ - -124.0798487, - 44.5840468 - ], - [ - -124.0795004, - 44.5867649 - ], - [ - -124.0794802, - 44.5869114 - ], - [ - -124.0793836, - 44.5875672 - ], - [ - -124.0794755, - 44.5879759 - ], - [ - -124.0795025, - 44.5881209 - ], - [ - -124.0795896, - 44.5887102 - ], - [ - -124.0796127, - 44.5889212 - ], - [ - -124.0796548, - 44.5895178 - ], - [ - -124.0796599, - 44.5896748 - ], - [ - -124.0796638, - 44.5899522 - ], - [ - -124.0796629, - 44.5902092 - ], - [ - -124.0795813, - 44.5913051 - ], - [ - -124.0795534, - 44.5914972 - ], - [ - -124.0794128, - 44.5922235 - ], - [ - -124.0793589, - 44.5924466 - ], - [ - -124.0791939, - 44.5930322 - ], - [ - -124.0790969, - 44.5933332 - ], - [ - -124.0782524, - 44.5951807 - ], - [ - -124.0780794, - 44.5954688 - ], - [ - -124.0776477, - 44.5961262 - ], - [ - -124.0771937, - 44.5967614 - ], - [ - -124.0770955, - 44.596917 - ], - [ - -124.0769871, - 44.5970849 - ], - [ - -124.0767482, - 44.597447 - ], - [ - -124.0763005, - 44.598125 - ], - [ - -124.0759442, - 44.5986865 - ], - [ - -124.0756524, - 44.5991468 - ], - [ - -124.0755558, - 44.5992962 - ], - [ - -124.0745061, - 44.6008873 - ], - [ - -124.074499, - 44.6008981 - ], - [ - -124.0734317, - 44.6025112 - ], - [ - -124.0730392, - 44.6031229 - ], - [ - -124.0729967, - 44.6031886 - ], - [ - -124.0723565, - 44.6041691 - ], - [ - -124.0720542, - 44.6046393 - ], - [ - -124.0718074, - 44.6050232 - ], - [ - -124.0717683, - 44.6050835 - ], - [ - -124.0716513, - 44.6052625 - ], - [ - -124.0715013, - 44.605492 - ], - [ - -124.0711655, - 44.6060064 - ], - [ - -124.0711408, - 44.6060441 - ], - [ - -124.0706389, - 44.6068051 - ], - [ - -124.0678217, - 44.6110735 - ], - [ - -124.0677922, - 44.6111179 - ], - [ - -124.0675607, - 44.6114647 - ], - [ - -124.0673163, - 44.6118569 - ], - [ - -124.0671853, - 44.6120614 - ], - [ - -124.0668403, - 44.6125855 - ], - [ - -124.0667793, - 44.6126772 - ], - [ - -124.0659421, - 44.6139188 - ], - [ - -124.0656689, - 44.614342 - ], - [ - -124.0654233, - 44.614723 - ], - [ - -124.0653, - 44.6149178 - ], - [ - -124.0651709, - 44.6151229 - ], - [ - -124.0651614, - 44.6151379 - ], - [ - -124.0649989, - 44.615395 - ], - [ - -124.0649074, - 44.6155401 - ], - [ - -124.0648827, - 44.6155322 - ], - [ - -124.0636582, - 44.6171826 - ], - [ - -124.0617746, - 44.6188339 - ], - [ - -124.0594761, - 44.620191 - ], - [ - -124.0568509, - 44.6212016 - ], - [ - -124.0540001, - 44.621827 - ], - [ - -124.0510332, - 44.6220431 - ], - [ - -124.0480642, - 44.6218415 - ], - [ - -124.0452074, - 44.6212301 - ], - [ - -124.0425726, - 44.6202324 - ], - [ - -124.0402611, - 44.6188866 - ], - [ - -124.0383617, - 44.6172446 - ], - [ - -124.0369474, - 44.6153694 - ], - [ - -124.0360725, - 44.6133332 - ], - [ - -124.0357706, - 44.6112142 - ], - [ - -124.0360532, - 44.6090939 - ], - [ - -124.0369095, - 44.6070536 - ], - [ - -124.0369675, - 44.6069526 - ], - [ - -124.0371727, - 44.6066121 - ], - [ - -124.0372667, - 44.6064632 - ], - [ - -124.0374319, - 44.6062019 - ], - [ - -124.0375632, - 44.6059934 - ], - [ - -124.037577, - 44.6059716 - ], - [ - -124.0377291, - 44.6057317 - ], - [ - -124.037773, - 44.605663 - ], - [ - -124.0380421, - 44.605246 - ], - [ - -124.0383724, - 44.6047346 - ], - [ - -124.0384817, - 44.604569 - ], - [ - -124.0393441, - 44.6032909 - ], - [ - -124.0395919, - 44.6029147 - ], - [ - -124.0398539, - 44.6024944 - ], - [ - -124.0400219, - 44.6022344 - ], - [ - -124.0403251, - 44.6017806 - ], - [ - -124.0431262, - 44.5975396 - ], - [ - -124.0436149, - 44.5967991 - ], - [ - -124.0439397, - 44.596302 - ], - [ - -124.0440929, - 44.5960677 - ], - [ - -124.0441902, - 44.5959189 - ], - [ - -124.0444178, - 44.5955652 - ], - [ - -124.0447392, - 44.5950658 - ], - [ - -124.0447762, - 44.5950087 - ], - [ - -124.045414, - 44.5940325 - ], - [ - -124.045823, - 44.5933954 - ], - [ - -124.0458989, - 44.5932791 - ], - [ - -124.0470016, - 44.5916136 - ], - [ - -124.0479992, - 44.5901026 - ], - [ - -124.0482448, - 44.5897156 - ], - [ - -124.0486521, - 44.589074 - ], - [ - -124.0487487, - 44.5889251 - ], - [ - -124.0488878, - 44.5887144 - ], - [ - -124.0488702, - 44.5883396 - ], - [ - -124.0488663, - 44.5881486 - ], - [ - -124.0489163, - 44.5870931 - ], - [ - -124.0489614, - 44.5867031 - ], - [ - -124.0489684, - 44.5866445 - ], - [ - -124.0490846, - 44.5857016 - ], - [ - -124.0491101, - 44.5855136 - ], - [ - -124.0492295, - 44.5847058 - ], - [ - -124.0495689, - 44.5820681 - ], - [ - -124.0496682, - 44.5812851 - ], - [ - -124.0497143, - 44.5809719 - ], - [ - -124.0497754, - 44.5806079 - ], - [ - -124.0498157, - 44.580387 - ], - [ - -124.0498888, - 44.580016 - ], - [ - -124.0499289, - 44.5798248 - ], - [ - -124.049991, - 44.5795458 - ], - [ - -124.0501048, - 44.5790954 - ], - [ - -124.0501819, - 44.5788234 - ], - [ - -124.0502489, - 44.5785992 - ], - [ - -124.0503299, - 44.5783412 - ], - [ - -124.0504788, - 44.577909 - ], - [ - -124.0506926, - 44.5773389 - ], - [ - -124.0507113, - 44.5765417 - ], - [ - -124.050719, - 44.5761259 - ], - [ - -124.0507981, - 44.5751548 - ], - [ - -124.0508582, - 44.5747388 - ], - [ - -124.0510542, - 44.5737922 - ], - [ - -124.0511744, - 44.5733482 - ], - [ - -124.0514266, - 44.5725702 - ], - [ - -124.0516188, - 44.5720632 - ], - [ - -124.0516702, - 44.5719309 - ], - [ - -124.0521274, - 44.5707819 - ], - [ - -124.05214, - 44.5707505 - ], - [ - -124.0524466, - 44.5699888 - ], - [ - -124.0525597, - 44.5697014 - ], - [ - -124.0526757, - 44.5692532 - ], - [ - -124.0529972, - 44.5679805 - ], - [ - -124.0530778, - 44.5676848 - ], - [ - -124.0531812, - 44.5673316 - ], - [ - -124.0533227, - 44.5668176 - ], - [ - -124.0533273, - 44.5668013 - ], - [ - -124.0535105, - 44.5661412 - ], - [ - -124.053603, - 44.5657892 - ], - [ - -124.0540462, - 44.5639335 - ], - [ - -124.0540881, - 44.563766 - ], - [ - -124.0542433, - 44.5631721 - ], - [ - -124.0545181, - 44.5620823 - ], - [ - -124.0549865, - 44.5601085 - ], - [ - -124.0550582, - 44.5598288 - ], - [ - -124.0553361, - 44.5588188 - ], - [ - -124.0563624, - 44.5547468 - ], - [ - -124.0564254, - 44.554477 - ], - [ - -124.056521, - 44.5540349 - ], - [ - -124.0565863, - 44.5537212 - ], - [ - -124.056844, - 44.5521643 - ], - [ - -124.0574867, - 44.5475811 - ], - [ - -124.0575328, - 44.5472914 - ], - [ - -124.0577884, - 44.5458569 - ], - [ - -124.0580457, - 44.5442425 - ], - [ - -124.0582961, - 44.5424336 - ], - [ - -124.0583113, - 44.5423294 - ], - [ - -124.0587603, - 44.5393758 - ], - [ - -124.0588567, - 44.5382273 - ], - [ - -124.0588789, - 44.5380014 - ], - [ - -124.0592147, - 44.5350344 - ], - [ - -124.0592244, - 44.5349527 - ], - [ - -124.059356, - 44.5338893 - ], - [ - -124.0594315, - 44.5332148 - ], - [ - -124.0596776, - 44.5303962 - ], - [ - -124.0596961, - 44.5300862 - ], - [ - -124.0589069, - 44.5295149 - ], - [ - -124.058563, - 44.5292088 - ], - [ - -124.0570017, - 44.5275182 - ], - [ - -124.0567278, - 44.5271512 - ], - [ - -124.0556706, - 44.5253684 - ], - [ - -124.0555327, - 44.5250623 - ], - [ - -124.0548329, - 44.5224437 - ], - [ - -124.0548069, - 44.5221627 - ], - [ - -124.054778, - 44.521197 - ], - [ - -124.054787, - 44.520915 - ], - [ - -124.0548799, - 44.5199397 - ], - [ - -124.0549149, - 44.5197187 - ], - [ - -124.0553286, - 44.5181505 - ], - [ - -124.0553966, - 44.5179675 - ], - [ - -124.055817, - 44.5170154 - ], - [ - -124.055955, - 44.5167464 - ], - [ - -124.0567807, - 44.5154195 - ], - [ - -124.0569437, - 44.5151985 - ], - [ - -124.0582468, - 44.5137304 - ], - [ - -124.0585038, - 44.5134864 - ], - [ - -124.0603019, - 44.5120613 - ], - [ - -124.0606709, - 44.5118164 - ], - [ - -124.062938, - 44.5105734 - ], - [ - -124.0634019, - 44.5103654 - ], - [ - -124.0634432, - 44.5103494 - ], - [ - -124.0644614, - 44.5081867 - ], - [ - -124.0645924, - 44.5078705 - ], - [ - -124.0647557, - 44.5074774 - ], - [ - -124.0649311, - 44.507055 - ], - [ - -124.0649701, - 44.5069007 - ], - [ - -124.0650798, - 44.5064079 - ], - [ - -124.0654595, - 44.5046763 - ], - [ - -124.0655716, - 44.5040637 - ], - [ - -124.0656078, - 44.5038779 - ], - [ - -124.0659452, - 44.5022519 - ], - [ - -124.066513, - 44.499533 - ], - [ - -124.0665275, - 44.4994652 - ], - [ - -124.0666736, - 44.4987942 - ], - [ - -124.0667167, - 44.4986072 - ], - [ - -124.0668729, - 44.4979642 - ], - [ - -124.0669941, - 44.4975201 - ], - [ - -124.0671342, - 44.4970581 - ], - [ - -124.0672038, - 44.4968397 - ], - [ - -124.0673032, - 44.4965416 - ], - [ - -124.0677028, - 44.4953416 - ], - [ - -124.0686732, - 44.4933281 - ], - [ - -124.0701737, - 44.4914887 - ], - [ - -124.0721465, - 44.4898942 - ], - [ - -124.0745159, - 44.4886058 - ], - [ - -124.0771909, - 44.4876729 - ], - [ - -124.0800686, - 44.4871315 - ], - [ - -124.0830386, - 44.4870023 - ], - [ - -124.0859867, - 44.4872903 - ], - [ - -124.0887997, - 44.4879844 - ], - [ - -124.0913696, - 44.4890579 - ], - [ - -124.0935977, - 44.4904697 - ], - [ - -124.0953982, - 44.4921655 - ], - [ - -124.0967021, - 44.4940801 - ], - [ - -124.0974592, - 44.49614 - ], - [ - -124.0976403, - 44.498266 - ], - [ - -124.0972384, - 44.5003764 - ], - [ - -124.0968387, - 44.5015785 - ], - [ - -124.0967738, - 44.5017734 - ], - [ - -124.096734, - 44.5019048 - ], - [ - -124.0966548, - 44.5022315 - ], - [ - -124.0965367, - 44.5027749 - ], - [ - -124.0959805, - 44.5054451 - ], - [ - -124.0956642, - 44.5069733 - ], - [ - -124.0955443, - 44.5076303 - ], - [ - -124.0954893, - 44.5079045 - ], - [ - -124.0950778, - 44.5097855 - ], - [ - -124.0950723, - 44.5098107 - ], - [ - -124.0949354, - 44.5104267 - ], - [ - -124.0948831, - 44.5106475 - ], - [ - -124.0946983, - 44.5113816 - ], - [ - -124.0944073, - 44.5123047 - ], - [ - -124.0941934, - 44.5128678 - ], - [ - -124.0940971, - 44.5131102 - ], - [ - -124.0938675, - 44.5136635 - ], - [ - -124.093708, - 44.5140482 - ], - [ - -124.0934992, - 44.5145526 - ], - [ - -124.0933315, - 44.514932 - ], - [ - -124.0918854, - 44.5180068 - ], - [ - -124.0907986, - 44.5205046 - ], - [ - -124.0905625, - 44.5210831 - ], - [ - -124.0902697, - 44.5217256 - ], - [ - -124.0901597, - 44.5219436 - ], - [ - -124.0897849, - 44.5226159 - ], - [ - -124.0896489, - 44.5228379 - ], - [ - -124.0894525, - 44.5230958 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15944_s_15958", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0711838, - 44.4367472 - ], - [ - -124.0711779, - 44.4367511 - ], - [ - -124.070164, - 44.4374258 - ], - [ - -124.0699401, - 44.4375718 - ], - [ - -124.0694764, - 44.4378683 - ], - [ - -124.0693746, - 44.4379376 - ], - [ - -124.0682167, - 44.4386505 - ], - [ - -124.0675397, - 44.4390265 - ], - [ - -124.0661779, - 44.439701 - ], - [ - -124.0657318, - 44.439897 - ], - [ - -124.0647535, - 44.440292 - ], - [ - -124.0647274, - 44.4403017 - ], - [ - -124.0647213, - 44.4403041 - ], - [ - -124.0645593, - 44.440368 - ], - [ - -124.0641553, - 44.440525 - ], - [ - -124.0635425, - 44.4407504 - ], - [ - -124.0630475, - 44.4409224 - ], - [ - -124.0615644, - 44.4413697 - ], - [ - -124.0609553, - 44.4415268 - ], - [ - -124.0578726, - 44.4420686 - ], - [ - -124.0574125, - 44.4421136 - ], - [ - -124.054895, - 44.4422083 - ], - [ - -124.0523903, - 44.442003 - ], - [ - -124.0518592, - 44.4419269 - ], - [ - -124.0493792, - 44.4413828 - ], - [ - -124.0492809, - 44.4413793 - ], - [ - -124.0462449, - 44.4410491 - ], - [ - -124.0459088, - 44.4409871 - ], - [ - -124.0437857, - 44.4404728 - ], - [ - -124.0417917, - 44.4397399 - ], - [ - -124.0411146, - 44.4394439 - ], - [ - -124.0380488, - 44.4376744 - ], - [ - -124.0376968, - 44.4374104 - ], - [ - -124.036392, - 44.4362897 - ], - [ - -124.0361691, - 44.4360697 - ], - [ - -124.0345755, - 44.4340872 - ], - [ - -124.0343825, - 44.4337752 - ], - [ - -124.0339758, - 44.4330476 - ], - [ - -124.0336709, - 44.4324396 - ], - [ - -124.0335501, - 44.4321891 - ], - [ - -124.0334421, - 44.4319561 - ], - [ - -124.0327131, - 44.4303775 - ], - [ - -124.0324011, - 44.4296078 - ], - [ - -124.0322982, - 44.4293138 - ], - [ - -124.0320333, - 44.4283884 - ], - [ - -124.032004, - 44.4282575 - ], - [ - -124.0319832, - 44.4281658 - ], - [ - -124.0319127, - 44.427875 - ], - [ - -124.0317825, - 44.4271637 - ], - [ - -124.0316151, - 44.427032 - ], - [ - -124.0315913, - 44.4270133 - ], - [ - -124.0315825, - 44.4270064 - ], - [ - -124.0315649, - 44.4269935 - ], - [ - -124.0313149, - 44.4268518 - ], - [ - -124.0311561, - 44.4267606 - ], - [ - -124.0309724, - 44.4266536 - ], - [ - -124.0305965, - 44.4264354 - ], - [ - -124.0304614, - 44.4263573 - ], - [ - -124.0302918, - 44.4262601 - ], - [ - -124.0300689, - 44.4261329 - ], - [ - -124.0300666, - 44.4261316 - ], - [ - -124.029174, - 44.425764 - ], - [ - -124.0290672, - 44.4257093 - ], - [ - -124.0268133, - 44.4242963 - ], - [ - -124.024991, - 44.4225934 - ], - [ - -124.0236714, - 44.420667 - ], - [ - -124.0229059, - 44.4185923 - ], - [ - -124.0227243, - 44.4164502 - ], - [ - -124.0231337, - 44.4143243 - ], - [ - -124.024118, - 44.4122976 - ], - [ - -124.0256387, - 44.410449 - ], - [ - -124.0257334, - 44.4103562 - ], - [ - -124.0277009, - 44.4087778 - ], - [ - -124.0300579, - 44.4075028 - ], - [ - -124.0327149, - 44.4065795 - ], - [ - -124.0355711, - 44.4060429 - ], - [ - -124.0385183, - 44.4059134 - ], - [ - -124.0414446, - 44.4061959 - ], - [ - -124.044239, - 44.4068796 - ], - [ - -124.0467956, - 44.4079387 - ], - [ - -124.0469985, - 44.4080429 - ], - [ - -124.0475072, - 44.4083158 - ], - [ - -124.0484101, - 44.4088217 - ], - [ - -124.0485024, - 44.4088738 - ], - [ - -124.0486394, - 44.4089518 - ], - [ - -124.04867, - 44.4089693 - ], - [ - -124.0489662, - 44.4091388 - ], - [ - -124.0491914, - 44.4092673 - ], - [ - -124.0492116, - 44.4092789 - ], - [ - -124.0494176, - 44.4093969 - ], - [ - -124.04947, - 44.409427 - ], - [ - -124.049643, - 44.409527 - ], - [ - -124.0496651, - 44.4095398 - ], - [ - -124.050151, - 44.4098217 - ], - [ - -124.0501971, - 44.4098486 - ], - [ - -124.0502123, - 44.4098575 - ], - [ - -124.0505704, - 44.4100604 - ], - [ - -124.050755, - 44.4101666 - ], - [ - -124.051184, - 44.4104176 - ], - [ - -124.0520048, - 44.4109342 - ], - [ - -124.0525028, - 44.4112712 - ], - [ - -124.0528931, - 44.4115449 - ], - [ - -124.0533991, - 44.4119129 - ], - [ - -124.0538289, - 44.4122386 - ], - [ - -124.054036, - 44.4124022 - ], - [ - -124.0544172, - 44.4127019 - ], - [ - -124.0546415, - 44.4128822 - ], - [ - -124.0554686, - 44.4135622 - ], - [ - -124.0554996, - 44.4135878 - ], - [ - -124.0557132, - 44.4137645 - ], - [ - -124.0558343, - 44.4138641 - ], - [ - -124.0559823, - 44.413982 - ], - [ - -124.056144, - 44.4141129 - ], - [ - -124.0564721, - 44.4143828 - ], - [ - -124.0565335, - 44.414432 - ], - [ - -124.0568482, - 44.4146711 - ], - [ - -124.0571334, - 44.414894 - ], - [ - -124.0571806, - 44.4149319 - ], - [ - -124.0572767, - 44.4150057 - ], - [ - -124.0575738, - 44.4152404 - ], - [ - -124.0578208, - 44.4154413 - ], - [ - -124.0590498, - 44.4166503 - ], - [ - -124.0593515, - 44.416578 - ], - [ - -124.0620362, - 44.4161251 - ], - [ - -124.0647909, - 44.4160281 - ], - [ - -124.0653218, - 44.4160441 - ], - [ - -124.0654324, - 44.4160477 - ], - [ - -124.0656678, - 44.4160561 - ], - [ - -124.0686074, - 44.416369 - ], - [ - -124.0714053, - 44.417087 - ], - [ - -124.0739542, - 44.4181823 - ], - [ - -124.0761561, - 44.4196129 - ], - [ - -124.0779263, - 44.4213238 - ], - [ - -124.0791969, - 44.4232494 - ], - [ - -124.0799189, - 44.4253155 - ], - [ - -124.0800646, - 44.427443 - ], - [ - -124.0796283, - 44.4295499 - ], - [ - -124.0786267, - 44.4315554 - ], - [ - -124.0770983, - 44.4333822 - ], - [ - -124.0751017, - 44.4349603 - ], - [ - -124.0727137, - 44.436229 - ], - [ - -124.0711838, - 44.4367472 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15946_s_22289", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0822808, - 44.4280552 - ], - [ - -124.0822928, - 44.4280567 - ], - [ - -124.0822885, - 44.4280754 - ], - [ - -124.0822824, - 44.4281175 - ], - [ - -124.0822521, - 44.4282257 - ], - [ - -124.0822509, - 44.4282304 - ], - [ - -124.0822507, - 44.4282304 - ], - [ - -124.0817157, - 44.4301369 - ], - [ - -124.0806274, - 44.4320434 - ], - [ - -124.0790563, - 44.4337684 - ], - [ - -124.0770591, - 44.43525 - ], - [ - -124.0747074, - 44.4364348 - ], - [ - -124.0720858, - 44.4372802 - ], - [ - -124.0692886, - 44.437756 - ], - [ - -124.0664163, - 44.4378449 - ], - [ - -124.0656352, - 44.4378159 - ], - [ - -124.0655397, - 44.4378121 - ], - [ - -124.0654495, - 44.4378084 - ], - [ - -124.0652733, - 44.4378015 - ], - [ - -124.0651553, - 44.4377966 - ], - [ - -124.0650726, - 44.4377929 - ], - [ - -124.0649198, - 44.4377863 - ], - [ - -124.0619845, - 44.4374486 - ], - [ - -124.0591976, - 44.4367071 - ], - [ - -124.0566662, - 44.4355903 - ], - [ - -124.0544876, - 44.434141 - ], - [ - -124.0527456, - 44.432415 - ], - [ - -124.0515072, - 44.4304787 - ], - [ - -124.0508198, - 44.4284064 - ], - [ - -124.0507098, - 44.4262779 - ], - [ - -124.0511814, - 44.4241748 - ], - [ - -124.0522164, - 44.4221781 - ], - [ - -124.0537749, - 44.4203645 - ], - [ - -124.0557971, - 44.4188036 - ], - [ - -124.0582053, - 44.4175554 - ], - [ - -124.0583573, - 44.4175054 - ], - [ - -124.0587182, - 44.4172858 - ], - [ - -124.0613155, - 44.4162507 - ], - [ - -124.0641446, - 44.4155985 - ], - [ - -124.0670969, - 44.4153544 - ], - [ - -124.0700588, - 44.4155277 - ], - [ - -124.0729167, - 44.4161118 - ], - [ - -124.0755608, - 44.4170841 - ], - [ - -124.0778895, - 44.4184075 - ], - [ - -124.0798134, - 44.420031 - ], - [ - -124.0812584, - 44.4218923 - ], - [ - -124.0821691, - 44.4239199 - ], - [ - -124.0825103, - 44.4260358 - ], - [ - -124.0822808, - 44.4280552 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15947_s_15946", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0705935, - 44.4372412 - ], - [ - -124.0693709, - 44.4380816 - ], - [ - -124.0668653, - 44.4392281 - ], - [ - -124.0640957, - 44.4400023 - ], - [ - -124.0611683, - 44.4403744 - ], - [ - -124.0581959, - 44.4403302 - ], - [ - -124.0552927, - 44.4398712 - ], - [ - -124.0525703, - 44.4390152 - ], - [ - -124.0501334, - 44.4377952 - ], - [ - -124.0480756, - 44.4362578 - ], - [ - -124.0479623, - 44.4361546 - ], - [ - -124.0464286, - 44.4344508 - ], - [ - -124.0453634, - 44.4325726 - ], - [ - -124.0448037, - 44.4305852 - ], - [ - -124.0447691, - 44.428558 - ], - [ - -124.0452607, - 44.4265614 - ], - [ - -124.0462612, - 44.424665 - ], - [ - -124.0477359, - 44.4229348 - ], - [ - -124.0496334, - 44.4214311 - ], - [ - -124.0501491, - 44.4210921 - ], - [ - -124.0504702, - 44.4208753 - ], - [ - -124.050567, - 44.4208106 - ], - [ - -124.0514996, - 44.4201919 - ], - [ - -124.0517402, - 44.4200322 - ], - [ - -124.0522953, - 44.4196532 - ], - [ - -124.0526643, - 44.4194094 - ], - [ - -124.0529663, - 44.4192164 - ], - [ - -124.0530248, - 44.4191793 - ], - [ - -124.0532254, - 44.4190524 - ], - [ - -124.0533173, - 44.4189936 - ], - [ - -124.0566469, - 44.4173756 - ], - [ - -124.0569629, - 44.4172626 - ], - [ - -124.0589296, - 44.416679 - ], - [ - -124.0593515, - 44.416578 - ], - [ - -124.0620362, - 44.4161251 - ], - [ - -124.0647909, - 44.4160281 - ], - [ - -124.0653218, - 44.4160441 - ], - [ - -124.0658879, - 44.4160615 - ], - [ - -124.0660654, - 44.4160678 - ], - [ - -124.0663204, - 44.4160778 - ], - [ - -124.0666841, - 44.4160922 - ], - [ - -124.0696209, - 44.4164181 - ], - [ - -124.0724127, - 44.4171483 - ], - [ - -124.0749522, - 44.4182547 - ], - [ - -124.0771418, - 44.419695 - ], - [ - -124.0788974, - 44.4214136 - ], - [ - -124.0801515, - 44.4233447 - ], - [ - -124.0808559, - 44.4254141 - ], - [ - -124.0809834, - 44.4275421 - ], - [ - -124.0805291, - 44.4296471 - ], - [ - -124.0795104, - 44.4316481 - ], - [ - -124.0779664, - 44.4334682 - ], - [ - -124.0759563, - 44.4350375 - ], - [ - -124.0735575, - 44.4362956 - ], - [ - -124.0708622, - 44.4371942 - ], - [ - -124.0705935, - 44.4372412 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15947_s_2456758", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0712339, - 44.4367815 - ], - [ - -124.0693672, - 44.4380722 - ], - [ - -124.0668663, - 44.4392239 - ], - [ - -124.0640997, - 44.4400038 - ], - [ - -124.0611739, - 44.440382 - ], - [ - -124.0582013, - 44.4403439 - ], - [ - -124.0552963, - 44.439891 - ], - [ - -124.0525704, - 44.4390407 - ], - [ - -124.0501286, - 44.4378256 - ], - [ - -124.0480647, - 44.4362926 - ], - [ - -124.047957, - 44.4361951 - ], - [ - -124.0464076, - 44.4344825 - ], - [ - -124.0453326, - 44.4325925 - ], - [ - -124.0447699, - 44.4305918 - ], - [ - -124.0447392, - 44.428551 - ], - [ - -124.0452417, - 44.4265422 - ], - [ - -124.0462595, - 44.424636 - ], - [ - -124.0477566, - 44.4228999 - ], - [ - -124.0496803, - 44.421395 - ], - [ - -124.0500523, - 44.4211539 - ], - [ - -124.0505337, - 44.4208327 - ], - [ - -124.050567, - 44.4208106 - ], - [ - -124.0514996, - 44.4201919 - ], - [ - -124.0517402, - 44.4200322 - ], - [ - -124.0522953, - 44.4196532 - ], - [ - -124.0526643, - 44.4194094 - ], - [ - -124.0529663, - 44.4192164 - ], - [ - -124.0530248, - 44.4191793 - ], - [ - -124.0532254, - 44.4190524 - ], - [ - -124.0533173, - 44.4189936 - ], - [ - -124.0566469, - 44.4173756 - ], - [ - -124.0569629, - 44.4172626 - ], - [ - -124.0589296, - 44.416679 - ], - [ - -124.0593515, - 44.416578 - ], - [ - -124.0620362, - 44.4161251 - ], - [ - -124.0647909, - 44.4160281 - ], - [ - -124.065316, - 44.4160439 - ], - [ - -124.065682, - 44.4160548 - ], - [ - -124.068625, - 44.4163507 - ], - [ - -124.071431, - 44.4170524 - ], - [ - -124.0739921, - 44.4181329 - ], - [ - -124.07621, - 44.4195507 - ], - [ - -124.0779995, - 44.4212513 - ], - [ - -124.0792918, - 44.4231695 - ], - [ - -124.0800371, - 44.4252314 - ], - [ - -124.0802068, - 44.4273579 - ], - [ - -124.0797942, - 44.4294673 - ], - [ - -124.0788153, - 44.4314785 - ], - [ - -124.0773075, - 44.4333142 - ], - [ - -124.0753288, - 44.4349038 - ], - [ - -124.0729552, - 44.4361862 - ], - [ - -124.0712339, - 44.4367815 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15950_s_2456756", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.1230281, - 44.3122493 - ], - [ - -124.1231881, - 44.3129865 - ], - [ - -124.1232257, - 44.3133657 - ], - [ - -124.1231885, - 44.3152196 - ], - [ - -124.123135, - 44.3156027 - ], - [ - -124.122573, - 44.3176398 - ], - [ - -124.1214815, - 44.3195628 - ], - [ - -124.1199002, - 44.3213017 - ], - [ - -124.1178869, - 44.3227928 - ], - [ - -124.117437, - 44.3230183 - ], - [ - -124.1170405, - 44.3240554 - ], - [ - -124.1170213, - 44.3241054 - ], - [ - -124.1168324, - 44.3245904 - ], - [ - -124.1168315, - 44.3245902 - ], - [ - -124.1166258, - 44.3251278 - ], - [ - -124.1166226, - 44.3251349 - ], - [ - -124.1165565, - 44.325299 - ], - [ - -124.1161512, - 44.3263089 - ], - [ - -124.1161142, - 44.3264008 - ], - [ - -124.1161032, - 44.3264281 - ], - [ - -124.1160336, - 44.3265994 - ], - [ - -124.1159812, - 44.3267369 - ], - [ - -124.1158146, - 44.3271913 - ], - [ - -124.115707, - 44.3274697 - ], - [ - -124.1156584, - 44.3275892 - ], - [ - -124.1156242, - 44.3276809 - ], - [ - -124.115579, - 44.3277994 - ], - [ - -124.1149614, - 44.3293835 - ], - [ - -124.1149497, - 44.3294133 - ], - [ - -124.1146229, - 44.3302423 - ], - [ - -124.1145852, - 44.3303364 - ], - [ - -124.1142376, - 44.3311887 - ], - [ - -124.1142183, - 44.3312536 - ], - [ - -124.1140519, - 44.3316548 - ], - [ - -124.1139359, - 44.3320262 - ], - [ - -124.1136812, - 44.3327306 - ], - [ - -124.1136202, - 44.3328786 - ], - [ - -124.1136061, - 44.3329127 - ], - [ - -124.1132592, - 44.3337448 - ], - [ - -124.1131027, - 44.3341318 - ], - [ - -124.1131003, - 44.3341377 - ], - [ - -124.1130349, - 44.3343737 - ], - [ - -124.1129535, - 44.3347607 - ], - [ - -124.1128695, - 44.3351191 - ], - [ - -124.1127381, - 44.3356275 - ], - [ - -124.1125761, - 44.3363051 - ], - [ - -124.1117773, - 44.3399456 - ], - [ - -124.1115533, - 44.341014 - ], - [ - -124.1115449, - 44.3410533 - ], - [ - -124.1112364, - 44.3424887 - ], - [ - -124.1110386, - 44.3434099 - ], - [ - -124.1107896, - 44.3446237 - ], - [ - -124.1106784, - 44.3451988 - ], - [ - -124.1106179, - 44.3454838 - ], - [ - -124.1101728, - 44.3474097 - ], - [ - -124.109914, - 44.3486355 - ], - [ - -124.1098628, - 44.3488619 - ], - [ - -124.1097769, - 44.3492179 - ], - [ - -124.1097462, - 44.349341 - ], - [ - -124.10969, - 44.3495587 - ], - [ - -124.1093814, - 44.3510941 - ], - [ - -124.1093533, - 44.3512279 - ], - [ - -124.1092372, - 44.3517588 - ], - [ - -124.1090343, - 44.3527567 - ], - [ - -124.1089937, - 44.3529446 - ], - [ - -124.1089857, - 44.3529796 - ], - [ - -124.1082209, - 44.3550377 - ], - [ - -124.1069112, - 44.3569492 - ], - [ - -124.1051067, - 44.3586406 - ], - [ - -124.1028769, - 44.3600469 - ], - [ - -124.1003073, - 44.3611141 - ], - [ - -124.0974969, - 44.361801 - ], - [ - -124.0945537, - 44.3620813 - ], - [ - -124.0915908, - 44.3619443 - ], - [ - -124.0887221, - 44.3613951 - ], - [ - -124.0860579, - 44.3604549 - ], - [ - -124.0837008, - 44.3591598 - ], - [ - -124.0817412, - 44.3575597 - ], - [ - -124.0802544, - 44.355716 - ], - [ - -124.0792977, - 44.3536996 - ], - [ - -124.0789076, - 44.3515881 - ], - [ - -124.0790852, - 44.3496173 - ], - [ - -124.0790665, - 44.3496153 - ], - [ - -124.0792818, - 44.3485594 - ], - [ - -124.0793064, - 44.3484431 - ], - [ - -124.0794208, - 44.347921 - ], - [ - -124.0797598, - 44.346239 - ], - [ - -124.0798577, - 44.345813 - ], - [ - -124.0799529, - 44.3454445 - ], - [ - -124.0799968, - 44.3452632 - ], - [ - -124.0802481, - 44.3440756 - ], - [ - -124.0802814, - 44.3439252 - ], - [ - -124.080712, - 44.3420664 - ], - [ - -124.0808045, - 44.3415892 - ], - [ - -124.0808224, - 44.3414995 - ], - [ - -124.0810887, - 44.3402045 - ], - [ - -124.081104, - 44.3401319 - ], - [ - -124.0813103, - 44.3391739 - ], - [ - -124.0816156, - 44.3377564 - ], - [ - -124.0818438, - 44.3366711 - ], - [ - -124.0818595, - 44.3365978 - ], - [ - -124.0826845, - 44.3328469 - ], - [ - -124.0827184, - 44.3326992 - ], - [ - -124.0829156, - 44.3318762 - ], - [ - -124.0829513, - 44.331733 - ], - [ - -124.0830441, - 44.3313746 - ], - [ - -124.083048, - 44.3313147 - ], - [ - -124.0831861, - 44.3307187 - ], - [ - -124.0832725, - 44.3303793 - ], - [ - -124.0834787, - 44.3296363 - ], - [ - -124.0835526, - 44.3293855 - ], - [ - -124.0836387, - 44.3291095 - ], - [ - -124.0838764, - 44.3284462 - ], - [ - -124.0840296, - 44.3280683 - ], - [ - -124.0842029, - 44.3276404 - ], - [ - -124.0842382, - 44.3275544 - ], - [ - -124.0845096, - 44.3269043 - ], - [ - -124.0845454, - 44.3267899 - ], - [ - -124.0846939, - 44.3264385 - ], - [ - -124.0847499, - 44.3262505 - ], - [ - -124.085026, - 44.3254677 - ], - [ - -124.0855131, - 44.3242747 - ], - [ - -124.0858158, - 44.3235078 - ], - [ - -124.0864053, - 44.3219979 - ], - [ - -124.0864612, - 44.3218482 - ], - [ - -124.0865524, - 44.3216144 - ], - [ - -124.086592, - 44.3215171 - ], - [ - -124.0867269, - 44.3211499 - ], - [ - -124.0867662, - 44.3210448 - ], - [ - -124.0868713, - 44.3207698 - ], - [ - -124.0869382, - 44.3206 - ], - [ - -124.0870358, - 44.3203599 - ], - [ - -124.0874727, - 44.3192729 - ], - [ - -124.0874774, - 44.3192611 - ], - [ - -124.0875985, - 44.3189611 - ], - [ - -124.0876107, - 44.3189322 - ], - [ - -124.087681, - 44.3187357 - ], - [ - -124.0878604, - 44.3182757 - ], - [ - -124.0883151, - 44.3170877 - ], - [ - -124.088368, - 44.3169531 - ], - [ - -124.088454, - 44.3167391 - ], - [ - -124.0884714, - 44.3166961 - ], - [ - -124.0886619, - 44.3162298 - ], - [ - -124.0888899, - 44.3156388 - ], - [ - -124.0889037, - 44.3156033 - ], - [ - -124.0891684, - 44.3149264 - ], - [ - -124.0896742, - 44.313619 - ], - [ - -124.0896777, - 44.3135851 - ], - [ - -124.0901765, - 44.311502 - ], - [ - -124.0903406, - 44.3111938 - ], - [ - -124.0903305, - 44.3109574 - ], - [ - -124.0908205, - 44.3088566 - ], - [ - -124.0918717, - 44.3068648 - ], - [ - -124.0934438, - 44.3050586 - ], - [ - -124.0954763, - 44.3035072 - ], - [ - -124.0978911, - 44.3022703 - ], - [ - -124.1005955, - 44.3013955 - ], - [ - -124.1034855, - 44.3009163 - ], - [ - -124.1064501, - 44.3008511 - ], - [ - -124.1073662, - 44.3008956 - ], - [ - -124.1102258, - 44.3012343 - ], - [ - -124.112943, - 44.3019583 - ], - [ - -124.1147594, - 44.3027528 - ], - [ - -124.1148198, - 44.3027697 - ], - [ - -124.1152793, - 44.3029802 - ], - [ - -124.1154182, - 44.3030409 - ], - [ - -124.1154329, - 44.3030505 - ], - [ - -124.1173208, - 44.3039154 - ], - [ - -124.1194625, - 44.3053894 - ], - [ - -124.1211626, - 44.3071352 - ], - [ - -124.1223558, - 44.3090855 - ], - [ - -124.1229962, - 44.3111656 - ], - [ - -124.1230281, - 44.3122493 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15954_s_2456757", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.1014271, - 44.3940125 - ], - [ - -124.1014089, - 44.3942373 - ], - [ - -124.1014003, - 44.3944832 - ], - [ - -124.1013789, - 44.3948491 - ], - [ - -124.1013089, - 44.3957025 - ], - [ - -124.1012445, - 44.3969531 - ], - [ - -124.1012128, - 44.397577 - ], - [ - -124.1012048, - 44.3977337 - ], - [ - -124.1011816, - 44.3981843 - ], - [ - -124.1011777, - 44.3982543 - ], - [ - -124.1011687, - 44.3984023 - ], - [ - -124.1010808, - 44.3998386 - ], - [ - -124.1010489, - 44.400212 - ], - [ - -124.1010049, - 44.4006145 - ], - [ - -124.100913, - 44.4019318 - ], - [ - -124.1008827, - 44.4022636 - ], - [ - -124.1008302, - 44.4027301 - ], - [ - -124.1008293, - 44.4027386 - ], - [ - -124.1008113, - 44.4028948 - ], - [ - -124.1007514, - 44.4033728 - ], - [ - -124.1007195, - 44.4036008 - ], - [ - -124.1005997, - 44.4043738 - ], - [ - -124.1005802, - 44.4044932 - ], - [ - -124.1004454, - 44.4052832 - ], - [ - -124.100416, - 44.4054454 - ], - [ - -124.1000664, - 44.4072665 - ], - [ - -124.0999824, - 44.4077445 - ], - [ - -124.0999488, - 44.4079237 - ], - [ - -124.0997923, - 44.4087088 - ], - [ - -124.099659, - 44.4095065 - ], - [ - -124.0996447, - 44.4095895 - ], - [ - -124.0995299, - 44.4102345 - ], - [ - -124.0994855, - 44.4104643 - ], - [ - -124.099051, - 44.412549 - ], - [ - -124.0990105, - 44.4128302 - ], - [ - -124.0987502, - 44.4140044 - ], - [ - -124.0985054, - 44.4148184 - ], - [ - -124.0979547, - 44.4161993 - ], - [ - -124.0977028, - 44.4167023 - ], - [ - -124.0972438, - 44.4175143 - ], - [ - -124.0971003, - 44.4177414 - ], - [ - -124.0969707, - 44.4179796 - ], - [ - -124.0967263, - 44.4184024 - ], - [ - -124.0966233, - 44.4185704 - ], - [ - -124.0950782, - 44.4205175 - ], - [ - -124.0947254, - 44.4208713 - ], - [ - -124.0943527, - 44.4212461 - ], - [ - -124.0940281, - 44.4215603 - ], - [ - -124.0935992, - 44.4219603 - ], - [ - -124.0934046, - 44.4221416 - ], - [ - -124.0933622, - 44.4221182 - ], - [ - -124.0923424, - 44.4230696 - ], - [ - -124.0901059, - 44.4244735 - ], - [ - -124.0875299, - 44.4255375 - ], - [ - -124.0847136, - 44.4262208 - ], - [ - -124.0836607, - 44.4263194 - ], - [ - -124.0816584, - 44.4267022 - ], - [ - -124.0785191, - 44.4268214 - ], - [ - -124.0783637, - 44.4268157 - ], - [ - -124.0770918, - 44.4269718 - ], - [ - -124.0741204, - 44.4269147 - ], - [ - -124.0712218, - 44.4264433 - ], - [ - -124.0685072, - 44.4255757 - ], - [ - -124.0660811, - 44.4243452 - ], - [ - -124.0640368, - 44.4227991 - ], - [ - -124.0624527, - 44.4209968 - ], - [ - -124.0613897, - 44.4190077 - ], - [ - -124.0608887, - 44.4169082 - ], - [ - -124.0609688, - 44.4147789 - ], - [ - -124.0616269, - 44.4127018 - ], - [ - -124.0628376, - 44.4107566 - ], - [ - -124.0645544, - 44.4090181 - ], - [ - -124.0667113, - 44.407553 - ], - [ - -124.0674542, - 44.4072175 - ], - [ - -124.0676466, - 44.4071181 - ], - [ - -124.0678293, - 44.4070481 - ], - [ - -124.0692253, - 44.4064176 - ], - [ - -124.0696636, - 44.4062973 - ], - [ - -124.0697138, - 44.4059975 - ], - [ - -124.0697587, - 44.4057533 - ], - [ - -124.0699221, - 44.4049358 - ], - [ - -124.0700014, - 44.4044855 - ], - [ - -124.0700242, - 44.4043616 - ], - [ - -124.0703711, - 44.4025596 - ], - [ - -124.0704822, - 44.4019105 - ], - [ - -124.0705745, - 44.4013168 - ], - [ - -124.0706184, - 44.4009635 - ], - [ - -124.070651, - 44.4006762 - ], - [ - -124.0707427, - 44.3993712 - ], - [ - -124.0707703, - 44.399064 - ], - [ - -124.0708109, - 44.3986957 - ], - [ - -124.0708907, - 44.3973967 - ], - [ - -124.0708927, - 44.3973655 - ], - [ - -124.0708953, - 44.3973256 - ], - [ - -124.0709155, - 44.396937 - ], - [ - -124.0709234, - 44.3967833 - ], - [ - -124.0709556, - 44.3961557 - ], - [ - -124.0710272, - 44.3947781 - ], - [ - -124.0710432, - 44.3945409 - ], - [ - -124.0711083, - 44.3937517 - ], - [ - -124.0711169, - 44.3935088 - ], - [ - -124.071138, - 44.3931489 - ], - [ - -124.0711607, - 44.3928716 - ], - [ - -124.0711805, - 44.3924404 - ], - [ - -124.071246, - 44.3917265 - ], - [ - -124.0712891, - 44.3914145 - ], - [ - -124.0715879, - 44.3900906 - ], - [ - -124.071673, - 44.3898206 - ], - [ - -124.0719737, - 44.3890123 - ], - [ - -124.0722498, - 44.3883704 - ], - [ - -124.0733993, - 44.3864063 - ], - [ - -124.0750609, - 44.3846408 - ], - [ - -124.0771709, - 44.3831416 - ], - [ - -124.079648, - 44.3819664 - ], - [ - -124.0823971, - 44.3811602 - ], - [ - -124.0853127, - 44.3807541 - ], - [ - -124.0882827, - 44.3807637 - ], - [ - -124.0911931, - 44.3811885 - ], - [ - -124.093932, - 44.3820124 - ], - [ - -124.0963943, - 44.3832035 - ], - [ - -124.0984854, - 44.3847162 - ], - [ - -124.1001248, - 44.3864923 - ], - [ - -124.1012497, - 44.3884637 - ], - [ - -124.1018166, - 44.3905545 - ], - [ - -124.1018038, - 44.3926845 - ], - [ - -124.1014271, - 44.3940125 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15958_s_15947", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0606105, - 44.4186654 - ], - [ - -124.0631002, - 44.4188587 - ], - [ - -124.0659357, - 44.4194968 - ], - [ - -124.0685431, - 44.420519 - ], - [ - -124.0708223, - 44.4218861 - ], - [ - -124.0726856, - 44.4235455 - ], - [ - -124.0740615, - 44.4254336 - ], - [ - -124.074897, - 44.4274777 - ], - [ - -124.07516, - 44.4295994 - ], - [ - -124.0751545, - 44.4300048 - ], - [ - -124.075162, - 44.4303315 - ], - [ - -124.0749118, - 44.4324839 - ], - [ - -124.0740722, - 44.4345583 - ], - [ - -124.0726766, - 44.4364727 - ], - [ - -124.0707799, - 44.4381514 - ], - [ - -124.0684571, - 44.4395282 - ], - [ - -124.0658, - 44.4405485 - ], - [ - -124.0629136, - 44.4411721 - ], - [ - -124.0620201, - 44.4412323 - ], - [ - -124.0615644, - 44.4413697 - ], - [ - -124.0609553, - 44.4415268 - ], - [ - -124.0578726, - 44.4420686 - ], - [ - -124.0574125, - 44.4421136 - ], - [ - -124.054895, - 44.4422083 - ], - [ - -124.0523903, - 44.442003 - ], - [ - -124.0518592, - 44.4419269 - ], - [ - -124.0493792, - 44.4413828 - ], - [ - -124.0492809, - 44.4413793 - ], - [ - -124.0462449, - 44.4410491 - ], - [ - -124.0459088, - 44.4409871 - ], - [ - -124.0437857, - 44.4404728 - ], - [ - -124.0417917, - 44.4397399 - ], - [ - -124.0411146, - 44.4394439 - ], - [ - -124.0380488, - 44.4376744 - ], - [ - -124.0376968, - 44.4374104 - ], - [ - -124.036392, - 44.4362897 - ], - [ - -124.0361691, - 44.4360697 - ], - [ - -124.0345755, - 44.4340872 - ], - [ - -124.0343825, - 44.4337752 - ], - [ - -124.0339758, - 44.4330476 - ], - [ - -124.0336709, - 44.4324396 - ], - [ - -124.0335501, - 44.4321891 - ], - [ - -124.0334421, - 44.4319561 - ], - [ - -124.0327131, - 44.4303775 - ], - [ - -124.0324011, - 44.4296078 - ], - [ - -124.0322982, - 44.4293138 - ], - [ - -124.0320333, - 44.4283884 - ], - [ - -124.032004, - 44.4282575 - ], - [ - -124.0319832, - 44.4281658 - ], - [ - -124.0319127, - 44.427875 - ], - [ - -124.0317825, - 44.4271637 - ], - [ - -124.0316151, - 44.427032 - ], - [ - -124.0315913, - 44.4270133 - ], - [ - -124.0315825, - 44.4270064 - ], - [ - -124.0315649, - 44.4269935 - ], - [ - -124.0313149, - 44.4268518 - ], - [ - -124.0311561, - 44.4267606 - ], - [ - -124.0309724, - 44.4266536 - ], - [ - -124.0305965, - 44.4264354 - ], - [ - -124.0304614, - 44.4263573 - ], - [ - -124.0303534, - 44.4262954 - ], - [ - -124.0301985, - 44.4262274 - ], - [ - -124.028093, - 44.4251123 - ], - [ - -124.0279882, - 44.4250461 - ], - [ - -124.0259628, - 44.4234872 - ], - [ - -124.0244008, - 44.421675 - ], - [ - -124.0233622, - 44.4196793 - ], - [ - -124.0228869, - 44.4175767 - ], - [ - -124.022993, - 44.415448 - ], - [ - -124.0236765, - 44.4133751 - ], - [ - -124.024911, - 44.4114376 - ], - [ - -124.0266491, - 44.4097099 - ], - [ - -124.0288238, - 44.4082584 - ], - [ - -124.0313517, - 44.4071389 - ], - [ - -124.0341357, - 44.4063943 - ], - [ - -124.0360829, - 44.406168 - ], - [ - -124.0364467, - 44.4061108 - ], - [ - -124.0365917, - 44.4061088 - ], - [ - -124.0370687, - 44.4060534 - ], - [ - -124.0383098, - 44.406085 - ], - [ - -124.0394182, - 44.4060696 - ], - [ - -124.0398426, - 44.4061241 - ], - [ - -124.0400382, - 44.4061291 - ], - [ - -124.0405281, - 44.406212 - ], - [ - -124.0423438, - 44.4064448 - ], - [ - -124.0451111, - 44.407222 - ], - [ - -124.0476138, - 44.4083712 - ], - [ - -124.0484635, - 44.4088517 - ], - [ - -124.0485024, - 44.4088738 - ], - [ - -124.0486394, - 44.4089518 - ], - [ - -124.04867, - 44.4089693 - ], - [ - -124.0489662, - 44.4091388 - ], - [ - -124.0491914, - 44.4092673 - ], - [ - -124.0492116, - 44.4092789 - ], - [ - -124.0494176, - 44.4093969 - ], - [ - -124.04947, - 44.409427 - ], - [ - -124.049643, - 44.409527 - ], - [ - -124.0496666, - 44.4095407 - ], - [ - -124.0500198, - 44.4097457 - ], - [ - -124.0506187, - 44.4100879 - ], - [ - -124.050755, - 44.4101666 - ], - [ - -124.051184, - 44.4104176 - ], - [ - -124.0520048, - 44.4109342 - ], - [ - -124.0525028, - 44.4112712 - ], - [ - -124.0528931, - 44.4115449 - ], - [ - -124.0533991, - 44.4119129 - ], - [ - -124.0538289, - 44.4122386 - ], - [ - -124.054036, - 44.4124022 - ], - [ - -124.0544172, - 44.4127019 - ], - [ - -124.0546415, - 44.4128822 - ], - [ - -124.0554686, - 44.4135622 - ], - [ - -124.0554996, - 44.4135878 - ], - [ - -124.0557132, - 44.4137645 - ], - [ - -124.0558343, - 44.4138641 - ], - [ - -124.0559823, - 44.413982 - ], - [ - -124.056144, - 44.4141129 - ], - [ - -124.0564721, - 44.4143828 - ], - [ - -124.0565335, - 44.414432 - ], - [ - -124.0568482, - 44.4146711 - ], - [ - -124.0571334, - 44.414894 - ], - [ - -124.0571806, - 44.4149319 - ], - [ - -124.0572767, - 44.4150057 - ], - [ - -124.0575738, - 44.4152404 - ], - [ - -124.0578208, - 44.4154413 - ], - [ - -124.05947, - 44.4170636 - ], - [ - -124.059745, - 44.4173946 - ], - [ - -124.0606105, - 44.4186654 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15962_s_15944", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0900701, - 44.4396804 - ], - [ - -124.0903058, - 44.4409235 - ], - [ - -124.0901236, - 44.4430495 - ], - [ - -124.0900778, - 44.4432537 - ], - [ - -124.0893347, - 44.445285 - ], - [ - -124.08806, - 44.447176 - ], - [ - -124.0863013, - 44.448856 - ], - [ - -124.0841241, - 44.4502622 - ], - [ - -124.0816099, - 44.4513421 - ], - [ - -124.0788525, - 44.4520554 - ], - [ - -124.075955, - 44.4523753 - ], - [ - -124.075483, - 44.4523943 - ], - [ - -124.0726059, - 44.452314 - ], - [ - -124.0698019, - 44.4518458 - ], - [ - -124.0671719, - 44.4510063 - ], - [ - -124.0648109, - 44.449826 - ], - [ - -124.0628039, - 44.4483474 - ], - [ - -124.0612231, - 44.4466237 - ], - [ - -124.0601256, - 44.4447171 - ], - [ - -124.0595507, - 44.4426962 - ], - [ - -124.0595193, - 44.440634 - ], - [ - -124.0596399, - 44.4396093 - ], - [ - -124.0591992, - 44.4392017 - ], - [ - -124.0564695, - 44.4366748 - ], - [ - -124.0558935, - 44.4361043 - ], - [ - -124.0555496, - 44.4357393 - ], - [ - -124.0550749, - 44.4352023 - ], - [ - -124.054892, - 44.4349813 - ], - [ - -124.0537143, - 44.4342173 - ], - [ - -124.0519422, - 44.4325072 - ], - [ - -124.0506699, - 44.4305821 - ], - [ - -124.0499462, - 44.4285162 - ], - [ - -124.0497988, - 44.4263888 - ], - [ - -124.0502335, - 44.4242817 - ], - [ - -124.0512334, - 44.4222759 - ], - [ - -124.0527601, - 44.4204483 - ], - [ - -124.0547548, - 44.4188693 - ], - [ - -124.0571409, - 44.4175995 - ], - [ - -124.0598267, - 44.4166877 - ], - [ - -124.062709, - 44.4161688 - ], - [ - -124.0656771, - 44.4160629 - ], - [ - -124.0679342, - 44.4161412 - ], - [ - -124.070823, - 44.4164431 - ], - [ - -124.0735775, - 44.4171362 - ], - [ - -124.0760956, - 44.4181948 - ], - [ - -124.0782841, - 44.4195797 - ], - [ - -124.0800618, - 44.4212394 - ], - [ - -124.0813626, - 44.4231126 - ], - [ - -124.082022, - 44.4248268 - ], - [ - -124.083174, - 44.4258929 - ], - [ - -124.0857592, - 44.4282828 - ], - [ - -124.0859265, - 44.4284403 - ], - [ - -124.0860568, - 44.4285654 - ], - [ - -124.0861265, - 44.4286302 - ], - [ - -124.0866223, - 44.4291185 - ], - [ - -124.0868453, - 44.4293514 - ], - [ - -124.0878954, - 44.4306267 - ], - [ - -124.0881354, - 44.4309697 - ], - [ - -124.0887532, - 44.4319764 - ], - [ - -124.0889683, - 44.4323814 - ], - [ - -124.0894122, - 44.4333521 - ], - [ - -124.0895653, - 44.4337491 - ], - [ - -124.0899409, - 44.4350108 - ], - [ - -124.0900451, - 44.4355018 - ], - [ - -124.0902171, - 44.437132 - ], - [ - -124.0902173, - 44.437641 - ], - [ - -124.0902103, - 44.4379733 - ], - [ - -124.0901934, - 44.4383713 - ], - [ - -124.0901673, - 44.4387582 - ], - [ - -124.0901623, - 44.4388122 - ], - [ - -124.090157, - 44.4388674 - ], - [ - -124.0901191, - 44.4392484 - ], - [ - -124.0901055, - 44.4393746 - ], - [ - -124.0900701, - 44.4396804 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15962_s_15969", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0902634, - 44.4419205 - ], - [ - -124.0902525, - 44.4420662 - ], - [ - -124.0902429, - 44.4421805 - ], - [ - -124.0897294, - 44.4444037 - ], - [ - -124.0894389, - 44.4449375 - ], - [ - -124.0894163, - 44.4451205 - ], - [ - -124.0893058, - 44.4462297 - ], - [ - -124.0893011, - 44.446275 - ], - [ - -124.0890848, - 44.4483249 - ], - [ - -124.0889914, - 44.4493578 - ], - [ - -124.0889494, - 44.4497249 - ], - [ - -124.0887231, - 44.4513631 - ], - [ - -124.0887249, - 44.4513774 - ], - [ - -124.0887388, - 44.4514853 - ], - [ - -124.0894656, - 44.4534288 - ], - [ - -124.0895035, - 44.4535323 - ], - [ - -124.0897282, - 44.4541578 - ], - [ - -124.0899217, - 44.4546423 - ], - [ - -124.0899574, - 44.4547333 - ], - [ - -124.0902486, - 44.4554872 - ], - [ - -124.0903112, - 44.4556547 - ], - [ - -124.0908616, - 44.4571736 - ], - [ - -124.090869, - 44.4571942 - ], - [ - -124.0912097, - 44.458142 - ], - [ - -124.091875, - 44.4599471 - ], - [ - -124.0924331, - 44.4614051 - ], - [ - -124.0929344, - 44.4635046 - ], - [ - -124.0928543, - 44.4656338 - ], - [ - -124.0921955, - 44.4677109 - ], - [ - -124.0909835, - 44.4696561 - ], - [ - -124.0892648, - 44.4713945 - ], - [ - -124.0871053, - 44.4728594 - ], - [ - -124.0845881, - 44.4739944 - ], - [ - -124.08181, - 44.4747559 - ], - [ - -124.0788777, - 44.4751147 - ], - [ - -124.075904, - 44.4750569 - ], - [ - -124.0730032, - 44.4745847 - ], - [ - -124.0702868, - 44.4737163 - ], - [ - -124.0678594, - 44.4724852 - ], - [ - -124.0658142, - 44.4709385 - ], - [ - -124.0642297, - 44.4691358 - ], - [ - -124.0631669, - 44.4671465 - ], - [ - -124.0625905, - 44.4656387 - ], - [ - -124.0625533, - 44.4655393 - ], - [ - -124.0618587, - 44.4636522 - ], - [ - -124.0618354, - 44.463588 - ], - [ - -124.0614873, - 44.4626182 - ], - [ - -124.0609717, - 44.4611934 - ], - [ - -124.0607307, - 44.4605684 - ], - [ - -124.0605, - 44.4599898 - ], - [ - -124.0603939, - 44.4597099 - ], - [ - -124.0601377, - 44.4589957 - ], - [ - -124.0593425, - 44.4568662 - ], - [ - -124.0592022, - 44.4564593 - ], - [ - -124.0590394, - 44.4559443 - ], - [ - -124.0589089, - 44.4554864 - ], - [ - -124.0587801, - 44.4549784 - ], - [ - -124.0585995, - 44.4540317 - ], - [ - -124.0585137, - 44.4533637 - ], - [ - -124.0585114, - 44.4533455 - ], - [ - -124.0584425, - 44.4527995 - ], - [ - -124.0583818, - 44.4519355 - ], - [ - -124.058374, - 44.4513965 - ], - [ - -124.0583853, - 44.450849 - ], - [ - -124.0584194, - 44.450237 - ], - [ - -124.0584816, - 44.4495971 - ], - [ - -124.0587357, - 44.4477644 - ], - [ - -124.0588182, - 44.4468572 - ], - [ - -124.0588297, - 44.4467409 - ], - [ - -124.0590508, - 44.4446556 - ], - [ - -124.0591689, - 44.4434773 - ], - [ - -124.0591894, - 44.4432938 - ], - [ - -124.0595251, - 44.4405858 - ], - [ - -124.0601091, - 44.4384157 - ], - [ - -124.0612938, - 44.4363752 - ], - [ - -124.0630302, - 44.4345486 - ], - [ - -124.0652464, - 44.4330115 - ], - [ - -124.0662883, - 44.4325378 - ], - [ - -124.0672956, - 44.432 - ], - [ - -124.0699801, - 44.4310852 - ], - [ - -124.072862, - 44.4305631 - ], - [ - -124.0758306, - 44.4304539 - ], - [ - -124.078772, - 44.4307616 - ], - [ - -124.0815731, - 44.4314746 - ], - [ - -124.0841264, - 44.4325654 - ], - [ - -124.0863337, - 44.433992 - ], - [ - -124.0881103, - 44.4356998 - ], - [ - -124.0893878, - 44.4376231 - ], - [ - -124.0901172, - 44.439688 - ], - [ - -124.0902702, - 44.4418152 - ], - [ - -124.0902634, - 44.4419205 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15965_s_16047", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0870704, - 44.5544226 - ], - [ - -124.0870406, - 44.5546182 - ], - [ - -124.0867411, - 44.5564333 - ], - [ - -124.086681, - 44.5567557 - ], - [ - -124.0865761, - 44.5572607 - ], - [ - -124.0865633, - 44.5573215 - ], - [ - -124.0864474, - 44.5578585 - ], - [ - -124.0864185, - 44.5579874 - ], - [ - -124.0863246, - 44.5583904 - ], - [ - -124.0862913, - 44.5585279 - ], - [ - -124.0852283, - 44.562754 - ], - [ - -124.0851836, - 44.5629242 - ], - [ - -124.0849212, - 44.5638797 - ], - [ - -124.0844739, - 44.5657686 - ], - [ - -124.084447, - 44.5658787 - ], - [ - -124.0841503, - 44.5670578 - ], - [ - -124.0841328, - 44.567126 - ], - [ - -124.0839907, - 44.5676704 - ], - [ - -124.0835472, - 44.5695316 - ], - [ - -124.0835026, - 44.5697098 - ], - [ - -124.0833727, - 44.5702048 - ], - [ - -124.0833436, - 44.5703128 - ], - [ - -124.0831481, - 44.5710186 - ], - [ - -124.0829914, - 44.5715884 - ], - [ - -124.0829552, - 44.5717162 - ], - [ - -124.0828764, - 44.5719858 - ], - [ - -124.0825871, - 44.5731336 - ], - [ - -124.0825753, - 44.57318 - ], - [ - -124.0823275, - 44.574139 - ], - [ - -124.0820139, - 44.575104 - ], - [ - -124.0817011, - 44.5759 - ], - [ - -124.0816763, - 44.5759625 - ], - [ - -124.0813638, - 44.5767399 - ], - [ - -124.0810984, - 44.5774076 - ], - [ - -124.0810847, - 44.5780074 - ], - [ - -124.0810746, - 44.5782628 - ], - [ - -124.0810488, - 44.5787268 - ], - [ - -124.0810255, - 44.5790341 - ], - [ - -124.0810006, - 44.5792951 - ], - [ - -124.0808945, - 44.5800335 - ], - [ - -124.0808386, - 44.5803245 - ], - [ - -124.0807815, - 44.5805958 - ], - [ - -124.0807016, - 44.5809458 - ], - [ - -124.0806101, - 44.5813079 - ], - [ - -124.0805522, - 44.5815169 - ], - [ - -124.0804505, - 44.5818553 - ], - [ - -124.0803445, - 44.5821823 - ], - [ - -124.0802193, - 44.582541 - ], - [ - -124.0799606, - 44.5832318 - ], - [ - -124.0799467, - 44.5833027 - ], - [ - -124.0799305, - 44.5833997 - ], - [ - -124.0798505, - 44.5840329 - ], - [ - -124.0798487, - 44.5840468 - ], - [ - -124.0795004, - 44.5867649 - ], - [ - -124.0794802, - 44.5869114 - ], - [ - -124.0793836, - 44.5875672 - ], - [ - -124.0794755, - 44.5879759 - ], - [ - -124.0795025, - 44.5881209 - ], - [ - -124.0795896, - 44.5887102 - ], - [ - -124.0796127, - 44.5889212 - ], - [ - -124.0796548, - 44.5895178 - ], - [ - -124.0796599, - 44.5896748 - ], - [ - -124.0796638, - 44.5899522 - ], - [ - -124.0796629, - 44.5902092 - ], - [ - -124.0795813, - 44.5913051 - ], - [ - -124.0795534, - 44.5914972 - ], - [ - -124.0794128, - 44.5922235 - ], - [ - -124.0793589, - 44.5924466 - ], - [ - -124.0791563, - 44.5931461 - ], - [ - -124.0790863, - 44.5933531 - ], - [ - -124.0790564, - 44.5933479 - ], - [ - -124.0782524, - 44.5951807 - ], - [ - -124.0780794, - 44.5954688 - ], - [ - -124.0776477, - 44.5961262 - ], - [ - -124.0771937, - 44.5967614 - ], - [ - -124.0770955, - 44.596917 - ], - [ - -124.0769871, - 44.5970849 - ], - [ - -124.0767482, - 44.597447 - ], - [ - -124.0763005, - 44.598125 - ], - [ - -124.0759442, - 44.5986865 - ], - [ - -124.0756524, - 44.5991468 - ], - [ - -124.0755558, - 44.5992962 - ], - [ - -124.0745061, - 44.6008873 - ], - [ - -124.074499, - 44.6008981 - ], - [ - -124.0734317, - 44.6025112 - ], - [ - -124.0730392, - 44.6031229 - ], - [ - -124.0729967, - 44.6031886 - ], - [ - -124.0723565, - 44.6041691 - ], - [ - -124.0720542, - 44.6046393 - ], - [ - -124.0718074, - 44.6050232 - ], - [ - -124.0717683, - 44.6050835 - ], - [ - -124.0716513, - 44.6052625 - ], - [ - -124.0715013, - 44.605492 - ], - [ - -124.0711655, - 44.6060064 - ], - [ - -124.0711408, - 44.6060441 - ], - [ - -124.0706389, - 44.6068051 - ], - [ - -124.0699634, - 44.6078288 - ], - [ - -124.0684337, - 44.6096571 - ], - [ - -124.0664341, - 44.6112371 - ], - [ - -124.0640412, - 44.6125079 - ], - [ - -124.0613472, - 44.6134209 - ], - [ - -124.0584555, - 44.6139408 - ], - [ - -124.0554773, - 44.6140476 - ], - [ - -124.0525272, - 44.6137374 - ], - [ - -124.0497186, - 44.6130219 - ], - [ - -124.0471594, - 44.6119287 - ], - [ - -124.0449481, - 44.6104999 - ], - [ - -124.0431697, - 44.6087903 - ], - [ - -124.0418924, - 44.6068657 - ], - [ - -124.0411653, - 44.6048 - ], - [ - -124.0410163, - 44.6026728 - ], - [ - -124.041451, - 44.6005656 - ], - [ - -124.0424528, - 44.5985595 - ], - [ - -124.0431261, - 44.5975399 - ], - [ - -124.0436149, - 44.5967991 - ], - [ - -124.0439397, - 44.596302 - ], - [ - -124.0440929, - 44.5960677 - ], - [ - -124.0441902, - 44.5959189 - ], - [ - -124.0444178, - 44.5955652 - ], - [ - -124.0447392, - 44.5950658 - ], - [ - -124.0447762, - 44.5950087 - ], - [ - -124.045414, - 44.5940325 - ], - [ - -124.045823, - 44.5933954 - ], - [ - -124.0458989, - 44.5932791 - ], - [ - -124.0470016, - 44.5916136 - ], - [ - -124.0479992, - 44.5901026 - ], - [ - -124.0482448, - 44.5897156 - ], - [ - -124.0486521, - 44.589074 - ], - [ - -124.0487487, - 44.5889251 - ], - [ - -124.0488878, - 44.5887144 - ], - [ - -124.0488702, - 44.5883396 - ], - [ - -124.0488663, - 44.5881486 - ], - [ - -124.0489163, - 44.5870931 - ], - [ - -124.0489614, - 44.5867031 - ], - [ - -124.0489684, - 44.5866445 - ], - [ - -124.0490846, - 44.5857016 - ], - [ - -124.0491101, - 44.5855136 - ], - [ - -124.0492295, - 44.5847058 - ], - [ - -124.0495689, - 44.5820681 - ], - [ - -124.0496682, - 44.5812851 - ], - [ - -124.0497143, - 44.5809719 - ], - [ - -124.0497754, - 44.5806079 - ], - [ - -124.0498157, - 44.580387 - ], - [ - -124.0498888, - 44.580016 - ], - [ - -124.0499289, - 44.5798248 - ], - [ - -124.049991, - 44.5795458 - ], - [ - -124.0501048, - 44.5790954 - ], - [ - -124.0501819, - 44.5788234 - ], - [ - -124.0502489, - 44.5785992 - ], - [ - -124.0503299, - 44.5783412 - ], - [ - -124.0504788, - 44.577909 - ], - [ - -124.0506926, - 44.5773389 - ], - [ - -124.0507113, - 44.5765417 - ], - [ - -124.050719, - 44.5761259 - ], - [ - -124.0507981, - 44.5751548 - ], - [ - -124.0508582, - 44.5747388 - ], - [ - -124.0510542, - 44.5737922 - ], - [ - -124.0511744, - 44.5733482 - ], - [ - -124.0514266, - 44.5725702 - ], - [ - -124.0516188, - 44.5720632 - ], - [ - -124.0516702, - 44.5719309 - ], - [ - -124.0521274, - 44.5707819 - ], - [ - -124.05214, - 44.5707505 - ], - [ - -124.0524466, - 44.5699888 - ], - [ - -124.0525597, - 44.5697014 - ], - [ - -124.0526757, - 44.5692532 - ], - [ - -124.0529972, - 44.5679805 - ], - [ - -124.0530778, - 44.5676848 - ], - [ - -124.0531812, - 44.5673316 - ], - [ - -124.0533227, - 44.5668176 - ], - [ - -124.0533273, - 44.5668013 - ], - [ - -124.0535105, - 44.5661412 - ], - [ - -124.053603, - 44.5657892 - ], - [ - -124.0540462, - 44.5639335 - ], - [ - -124.0540881, - 44.563766 - ], - [ - -124.0542433, - 44.5631721 - ], - [ - -124.0545181, - 44.5620823 - ], - [ - -124.0549865, - 44.5601085 - ], - [ - -124.0550582, - 44.5598288 - ], - [ - -124.0553361, - 44.5588188 - ], - [ - -124.0563624, - 44.5547468 - ], - [ - -124.0564254, - 44.554477 - ], - [ - -124.056521, - 44.5540349 - ], - [ - -124.0565863, - 44.5537212 - ], - [ - -124.0568438, - 44.5521655 - ], - [ - -124.057471, - 44.5476823 - ], - [ - -124.0580566, - 44.5455939 - ], - [ - -124.0592005, - 44.5436273 - ], - [ - -124.0608589, - 44.5418581 - ], - [ - -124.0629679, - 44.5403542 - ], - [ - -124.0654465, - 44.5391734 - ], - [ - -124.0681995, - 44.5383611 - ], - [ - -124.0711211, - 44.5379485 - ], - [ - -124.0740991, - 44.5379513 - ], - [ - -124.0770192, - 44.5383696 - ], - [ - -124.0797691, - 44.5391872 - ], - [ - -124.0822432, - 44.5403728 - ], - [ - -124.0843465, - 44.5418807 - ], - [ - -124.0859982, - 44.5436531 - ], - [ - -124.0871347, - 44.5456219 - ], - [ - -124.0877124, - 44.5477114 - ], - [ - -124.0877089, - 44.5498413 - ], - [ - -124.0870704, - 44.5544226 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15967_s_15889", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.071036, - 44.6178 - ], - [ - -124.0710361, - 44.6178 - ], - [ - -124.0713941, - 44.6180929 - ], - [ - -124.0717, - 44.6183513 - ], - [ - -124.071895, - 44.6185212 - ], - [ - -124.0725703, - 44.619156 - ], - [ - -124.0728944, - 44.619485 - ], - [ - -124.0730262, - 44.6196211 - ], - [ - -124.0731282, - 44.619728 - ], - [ - -124.0734131, - 44.6200381 - ], - [ - -124.0736592, - 44.6203161 - ], - [ - -124.0741761, - 44.6209459 - ], - [ - -124.0742891, - 44.6210949 - ], - [ - -124.0748306, - 44.6218833 - ], - [ - -124.0749277, - 44.6220402 - ], - [ - -124.0750188, - 44.6221879 - ], - [ - -124.0751064, - 44.622329 - ], - [ - -124.0754431, - 44.6229167 - ], - [ - -124.0755571, - 44.6231337 - ], - [ - -124.075838, - 44.623718 - ], - [ - -124.075975, - 44.624032 - ], - [ - -124.0765163, - 44.6257525 - ], - [ - -124.0765523, - 44.6259355 - ], - [ - -124.0766651, - 44.6281914 - ], - [ - -124.0761226, - 44.6304153 - ], - [ - -124.0749483, - 44.6325111 - ], - [ - -124.0745476, - 44.6330545 - ], - [ - -124.0742402, - 44.6335058 - ], - [ - -124.0739801, - 44.633894 - ], - [ - -124.0739291, - 44.6339695 - ], - [ - -124.0731532, - 44.6351051 - ], - [ - -124.0731238, - 44.6351478 - ], - [ - -124.0726083, - 44.6358939 - ], - [ - -124.0706598, - 44.6380356 - ], - [ - -124.0682448, - 44.6396714 - ], - [ - -124.0670089, - 44.640915 - ], - [ - -124.0648823, - 44.6423596 - ], - [ - -124.0644343, - 44.6426099 - ], - [ - -124.0643141, - 44.6426779 - ], - [ - -124.0642343, - 44.6427228 - ], - [ - -124.0639652, - 44.642873 - ], - [ - -124.0638777, - 44.6429242 - ], - [ - -124.0638479, - 44.6428982 - ], - [ - -124.0622737, - 44.6437852 - ], - [ - -124.0596161, - 44.6447531 - ], - [ - -124.056745, - 44.6453323 - ], - [ - -124.0537708, - 44.6455003 - ], - [ - -124.0508078, - 44.6452509 - ], - [ - -124.04797, - 44.6445934 - ], - [ - -124.0453664, - 44.6435534 - ], - [ - -124.0430972, - 44.6421706 - ], - [ - -124.0412496, - 44.6404983 - ], - [ - -124.0398945, - 44.6386008 - ], - [ - -124.039084, - 44.6365509 - ], - [ - -124.0388492, - 44.6344276 - ], - [ - -124.0391991, - 44.6323124 - ], - [ - -124.0401201, - 44.6302865 - ], - [ - -124.0404955, - 44.6298076 - ], - [ - -124.040592, - 44.6295353 - ], - [ - -124.0418794, - 44.6276069 - ], - [ - -124.042316, - 44.6271896 - ], - [ - -124.0417161, - 44.626639 - ], - [ - -124.0404163, - 44.6254485 - ], - [ - -124.04027, - 44.6253123 - ], - [ - -124.040047, - 44.6251013 - ], - [ - -124.0395863, - 44.6246408 - ], - [ - -124.0393913, - 44.6244348 - ], - [ - -124.039149, - 44.6241706 - ], - [ - -124.0389421, - 44.6239375 - ], - [ - -124.0386247, - 44.6235638 - ], - [ - -124.0384097, - 44.6232988 - ], - [ - -124.0380085, - 44.6227709 - ], - [ - -124.0378215, - 44.6225079 - ], - [ - -124.037763, - 44.6224247 - ], - [ - -124.037486, - 44.6220266 - ], - [ - -124.0370026, - 44.6212583 - ], - [ - -124.0368272, - 44.6209481 - ], - [ - -124.036626, - 44.6205959 - ], - [ - -124.0362979, - 44.6199663 - ], - [ - -124.0361589, - 44.6196723 - ], - [ - -124.0358421, - 44.6189109 - ], - [ - -124.0357301, - 44.6186009 - ], - [ - -124.0355901, - 44.6181782 - ], - [ - -124.0355061, - 44.6179002 - ], - [ - -124.0354282, - 44.6176249 - ], - [ - -124.0352914, - 44.6171069 - ], - [ - -124.0351708, - 44.61658 - ], - [ - -124.0351019, - 44.616224 - ], - [ - -124.035084, - 44.6161312 - ], - [ - -124.034944, - 44.6148416 - ], - [ - -124.0349413, - 44.6147336 - ], - [ - -124.0349327, - 44.6144235 - ], - [ - -124.03493, - 44.6141416 - ], - [ - -124.0349321, - 44.6139006 - ], - [ - -124.0349322, - 44.6138881 - ], - [ - -124.0349332, - 44.6137871 - ], - [ - -124.034942, - 44.6134892 - ], - [ - -124.034955, - 44.6132202 - ], - [ - -124.0349953, - 44.6127216 - ], - [ - -124.0350164, - 44.6125356 - ], - [ - -124.03503, - 44.6124223 - ], - [ - -124.0350541, - 44.6122343 - ], - [ - -124.0351578, - 44.6116183 - ], - [ - -124.0351768, - 44.6115273 - ], - [ - -124.0359041, - 44.6094617 - ], - [ - -124.0371815, - 44.6075371 - ], - [ - -124.0389599, - 44.6058275 - ], - [ - -124.0411708, - 44.6043986 - ], - [ - -124.0437294, - 44.6033052 - ], - [ - -124.0465373, - 44.6025893 - ], - [ - -124.0494867, - 44.6022785 - ], - [ - -124.0524643, - 44.6023847 - ], - [ - -124.0553558, - 44.6029038 - ], - [ - -124.05805, - 44.6038158 - ], - [ - -124.0604435, - 44.6050857 - ], - [ - -124.0624443, - 44.6066649 - ], - [ - -124.0639755, - 44.6084924 - ], - [ - -124.0649783, - 44.6104983 - ], - [ - -124.0654141, - 44.6126054 - ], - [ - -124.0653878, - 44.6129823 - ], - [ - -124.065712, - 44.6132791 - ], - [ - -124.0657222, - 44.6132884 - ], - [ - -124.0665464, - 44.6140447 - ], - [ - -124.0672283, - 44.6146565 - ], - [ - -124.0692152, - 44.6163322 - ], - [ - -124.0697817, - 44.6168052 - ], - [ - -124.0700538, - 44.617026 - ], - [ - -124.0704556, - 44.6173337 - ], - [ - -124.0705579, - 44.6174128 - ], - [ - -124.0706859, - 44.6175128 - ], - [ - -124.071036, - 44.6178 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15969_s_15972", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0947114, - 44.4762259 - ], - [ - -124.0946583, - 44.4772197 - ], - [ - -124.0946553, - 44.4772662 - ], - [ - -124.0947129, - 44.4774188 - ], - [ - -124.0947323, - 44.4774708 - ], - [ - -124.095735, - 44.4801806 - ], - [ - -124.0957503, - 44.4802225 - ], - [ - -124.0959315, - 44.4807203 - ], - [ - -124.0960051, - 44.4809215 - ], - [ - -124.0974504, - 44.4848368 - ], - [ - -124.0976706, - 44.4855226 - ], - [ - -124.0978938, - 44.4863375 - ], - [ - -124.0979742, - 44.486656 - ], - [ - -124.0981294, - 44.487328 - ], - [ - -124.0982128, - 44.4877377 - ], - [ - -124.098329, - 44.4883957 - ], - [ - -124.0984371, - 44.4893316 - ], - [ - -124.0984722, - 44.4899726 - ], - [ - -124.0984814, - 44.490597 - ], - [ - -124.0984299, - 44.492619 - ], - [ - -124.098421, - 44.4928433 - ], - [ - -124.0982886, - 44.4952793 - ], - [ - -124.0982491, - 44.4957463 - ], - [ - -124.0981803, - 44.4963463 - ], - [ - -124.0981157, - 44.4967952 - ], - [ - -124.0979958, - 44.4974862 - ], - [ - -124.097921, - 44.4978634 - ], - [ - -124.0976943, - 44.4988784 - ], - [ - -124.097441, - 44.4997706 - ], - [ - -124.0974017, - 44.4998845 - ], - [ - -124.0970269, - 44.5010134 - ], - [ - -124.0960585, - 44.5030274 - ], - [ - -124.0945596, - 44.5048675 - ], - [ - -124.0925877, - 44.506463 - ], - [ - -124.0902187, - 44.5077524 - ], - [ - -124.0875435, - 44.5086863 - ], - [ - -124.0846651, - 44.5092287 - ], - [ - -124.0816941, - 44.5093588 - ], - [ - -124.0787447, - 44.5090716 - ], - [ - -124.0759304, - 44.508378 - ], - [ - -124.0733594, - 44.5073048 - ], - [ - -124.0711304, - 44.5058933 - ], - [ - -124.0693292, - 44.5041976 - ], - [ - -124.0680249, - 44.5022831 - ], - [ - -124.0672676, - 44.5002232 - ], - [ - -124.0670865, - 44.4980972 - ], - [ - -124.0674883, - 44.4959867 - ], - [ - -124.0678088, - 44.4950226 - ], - [ - -124.0678997, - 44.4946168 - ], - [ - -124.067948, - 44.4943387 - ], - [ - -124.0679644, - 44.4941969 - ], - [ - -124.0680791, - 44.4921068 - ], - [ - -124.068118, - 44.4906088 - ], - [ - -124.0680596, - 44.4903557 - ], - [ - -124.0679747, - 44.490045 - ], - [ - -124.0666521, - 44.4864572 - ], - [ - -124.0666429, - 44.4864321 - ], - [ - -124.0665629, - 44.4862131 - ], - [ - -124.0663839, - 44.4857206 - ], - [ - -124.0653998, - 44.4830574 - ], - [ - -124.0649449, - 44.4818503 - ], - [ - -124.0648329, - 44.4815343 - ], - [ - -124.0647, - 44.4811343 - ], - [ - -124.0643932, - 44.4798965 - ], - [ - -124.0643462, - 44.4796125 - ], - [ - -124.0642474, - 44.4786479 - ], - [ - -124.0642345, - 44.4783259 - ], - [ - -124.0642499, - 44.4774342 - ], - [ - -124.0643342, - 44.4763042 - ], - [ - -124.0643841, - 44.4753793 - ], - [ - -124.0643947, - 44.4751879 - ], - [ - -124.0644237, - 44.4748203 - ], - [ - -124.0645297, - 44.4737881 - ], - [ - -124.0645647, - 44.4730723 - ], - [ - -124.0645736, - 44.4729215 - ], - [ - -124.0646168, - 44.4722905 - ], - [ - -124.0646516, - 44.4719147 - ], - [ - -124.0646609, - 44.4718354 - ], - [ - -124.0646581, - 44.471695 - ], - [ - -124.0646391, - 44.4713498 - ], - [ - -124.0645628, - 44.4709713 - ], - [ - -124.0638711, - 44.4690977 - ], - [ - -124.0638364, - 44.4690019 - ], - [ - -124.0634995, - 44.4680543 - ], - [ - -124.0633031, - 44.4675092 - ], - [ - -124.0631567, - 44.4671226 - ], - [ - -124.0626631, - 44.4650221 - ], - [ - -124.0627512, - 44.4628931 - ], - [ - -124.0634176, - 44.4608172 - ], - [ - -124.0646366, - 44.4588744 - ], - [ - -124.0663614, - 44.4571392 - ], - [ - -124.0685255, - 44.4556782 - ], - [ - -124.0710459, - 44.4545477 - ], - [ - -124.0738256, - 44.4537911 - ], - [ - -124.0767581, - 44.4534373 - ], - [ - -124.0797305, - 44.4535 - ], - [ - -124.0826288, - 44.4539768 - ], - [ - -124.0853415, - 44.4548494 - ], - [ - -124.0877646, - 44.4560842 - ], - [ - -124.0898049, - 44.4576338 - ], - [ - -124.091384, - 44.4594388 - ], - [ - -124.0924412, - 44.4614296 - ], - [ - -124.0926127, - 44.4618816 - ], - [ - -124.0926611, - 44.4620125 - ], - [ - -124.0928872, - 44.4626394 - ], - [ - -124.092899, - 44.4626723 - ], - [ - -124.0932252, - 44.4635883 - ], - [ - -124.094126, - 44.4660253 - ], - [ - -124.0944777, - 44.4672637 - ], - [ - -124.0945943, - 44.4678462 - ], - [ - -124.094695, - 44.4683437 - ], - [ - -124.0947243, - 44.4684963 - ], - [ - -124.0948204, - 44.4690242 - ], - [ - -124.0949357, - 44.4699969 - ], - [ - -124.09499, - 44.4709729 - ], - [ - -124.0950004, - 44.4712493 - ], - [ - -124.0950106, - 44.4717552 - ], - [ - -124.0950102, - 44.4720858 - ], - [ - -124.0950003, - 44.4725258 - ], - [ - -124.0949497, - 44.4732543 - ], - [ - -124.0949167, - 44.4735376 - ], - [ - -124.0948918, - 44.4739051 - ], - [ - -124.0948507, - 44.4747536 - ], - [ - -124.0948193, - 44.4751696 - ], - [ - -124.0947114, - 44.4762259 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15970_s_15944", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0823439, - 44.4277449 - ], - [ - -124.0823578, - 44.4277462 - ], - [ - -124.0822252, - 44.428449 - ], - [ - -124.0815902, - 44.4304158 - ], - [ - -124.0804582, - 44.4322644 - ], - [ - -124.0788685, - 44.4339311 - ], - [ - -124.0768758, - 44.4353583 - ], - [ - -124.0745489, - 44.4364967 - ], - [ - -124.0719682, - 44.4373069 - ], - [ - -124.0692227, - 44.437761 - ], - [ - -124.0664074, - 44.4378434 - ], - [ - -124.0641343, - 44.4377582 - ], - [ - -124.061195, - 44.4374389 - ], - [ - -124.0583992, - 44.4367148 - ], - [ - -124.0558543, - 44.4356138 - ], - [ - -124.0536582, - 44.4341782 - ], - [ - -124.0518953, - 44.4324631 - ], - [ - -124.0506334, - 44.4305346 - ], - [ - -124.0499208, - 44.4284667 - ], - [ - -124.0497849, - 44.4263389 - ], - [ - -124.050231, - 44.424233 - ], - [ - -124.0512417, - 44.4222299 - ], - [ - -124.0527781, - 44.4204066 - ], - [ - -124.0547813, - 44.4188332 - ], - [ - -124.0571742, - 44.4175699 - ], - [ - -124.0587166, - 44.4170515 - ], - [ - -124.0593726, - 44.4166859 - ], - [ - -124.0620293, - 44.4157313 - ], - [ - -124.0648948, - 44.4151666 - ], - [ - -124.0678588, - 44.4150132 - ], - [ - -124.0708077, - 44.4152772 - ], - [ - -124.0736281, - 44.4159484 - ], - [ - -124.0762117, - 44.4170011 - ], - [ - -124.0784592, - 44.4183947 - ], - [ - -124.0802843, - 44.4200757 - ], - [ - -124.0816169, - 44.4219796 - ], - [ - -124.0824056, - 44.4240332 - ], - [ - -124.0826202, - 44.4261577 - ], - [ - -124.0823439, - 44.4277449 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_15972_s_15965", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0967738, - 44.5017734 - ], - [ - -124.096734, - 44.5019048 - ], - [ - -124.0966548, - 44.5022315 - ], - [ - -124.0965367, - 44.5027749 - ], - [ - -124.0959805, - 44.5054451 - ], - [ - -124.0956642, - 44.5069733 - ], - [ - -124.0955443, - 44.5076303 - ], - [ - -124.0954893, - 44.5079045 - ], - [ - -124.0950778, - 44.5097855 - ], - [ - -124.0950723, - 44.5098107 - ], - [ - -124.0949354, - 44.5104267 - ], - [ - -124.0948831, - 44.5106475 - ], - [ - -124.0946983, - 44.5113816 - ], - [ - -124.0944073, - 44.5123047 - ], - [ - -124.0941934, - 44.5128678 - ], - [ - -124.0940971, - 44.5131102 - ], - [ - -124.0938675, - 44.5136635 - ], - [ - -124.093708, - 44.5140482 - ], - [ - -124.0934992, - 44.5145526 - ], - [ - -124.0933315, - 44.514932 - ], - [ - -124.0918854, - 44.5180068 - ], - [ - -124.0907986, - 44.5205046 - ], - [ - -124.0905625, - 44.5210831 - ], - [ - -124.0902697, - 44.5217256 - ], - [ - -124.0901597, - 44.5219436 - ], - [ - -124.0897849, - 44.5226159 - ], - [ - -124.0896489, - 44.5228379 - ], - [ - -124.0894525, - 44.5230958 - ], - [ - -124.0896839, - 44.5236439 - ], - [ - -124.0897656, - 44.5239289 - ], - [ - -124.0898604, - 44.5242588 - ], - [ - -124.0900682, - 44.5251821 - ], - [ - -124.0901193, - 44.5254941 - ], - [ - -124.0902021, - 44.5261969 - ], - [ - -124.0902282, - 44.5265579 - ], - [ - -124.0902431, - 44.5274093 - ], - [ - -124.0902172, - 44.5281003 - ], - [ - -124.0902092, - 44.5282681 - ], - [ - -124.090023, - 44.5314241 - ], - [ - -124.0900073, - 44.5316393 - ], - [ - -124.0897451, - 44.5346603 - ], - [ - -124.0897263, - 44.53485 - ], - [ - -124.0896355, - 44.535665 - ], - [ - -124.0896248, - 44.5357563 - ], - [ - -124.0894931, - 44.5368245 - ], - [ - -124.0891762, - 44.5396377 - ], - [ - -124.089068, - 44.5409357 - ], - [ - -124.0890065, - 44.5414596 - ], - [ - -124.0885272, - 44.5446225 - ], - [ - -124.0882739, - 44.5464594 - ], - [ - -124.0882501, - 44.5466194 - ], - [ - -124.0879696, - 44.5483854 - ], - [ - -124.087945, - 44.5485314 - ], - [ - -124.0876638, - 44.5501104 - ], - [ - -124.0869998, - 44.5521868 - ], - [ - -124.0857819, - 44.5541306 - ], - [ - -124.084057, - 44.5558671 - ], - [ - -124.0818913, - 44.5573296 - ], - [ - -124.079368, - 44.5584619 - ], - [ - -124.0765843, - 44.5592204 - ], - [ - -124.073647, - 44.559576 - ], - [ - -124.0706691, - 44.5595149 - ], - [ - -124.0677651, - 44.5590396 - ], - [ - -124.0650467, - 44.5581683 - ], - [ - -124.0626183, - 44.5569345 - ], - [ - -124.0605734, - 44.5553856 - ], - [ - -124.0589905, - 44.5535813 - ], - [ - -124.0579304, - 44.5515908 - ], - [ - -124.0574338, - 44.5494906 - ], - [ - -124.0575197, - 44.5473616 - ], - [ - -124.0577886, - 44.5458555 - ], - [ - -124.0580457, - 44.5442425 - ], - [ - -124.0582961, - 44.5424336 - ], - [ - -124.0583113, - 44.5423294 - ], - [ - -124.0587603, - 44.5393758 - ], - [ - -124.0588567, - 44.5382273 - ], - [ - -124.0588789, - 44.5380014 - ], - [ - -124.0592147, - 44.5350344 - ], - [ - -124.0592244, - 44.5349527 - ], - [ - -124.059356, - 44.5338893 - ], - [ - -124.0594315, - 44.5332148 - ], - [ - -124.0596776, - 44.5303962 - ], - [ - -124.0596961, - 44.5300862 - ], - [ - -124.0589069, - 44.5295149 - ], - [ - -124.058563, - 44.5292088 - ], - [ - -124.0570017, - 44.5275182 - ], - [ - -124.0567278, - 44.5271512 - ], - [ - -124.0556706, - 44.5253684 - ], - [ - -124.0555327, - 44.5250623 - ], - [ - -124.0548329, - 44.5224437 - ], - [ - -124.0548069, - 44.5221627 - ], - [ - -124.054778, - 44.521197 - ], - [ - -124.054787, - 44.520915 - ], - [ - -124.0548799, - 44.5199397 - ], - [ - -124.0549149, - 44.5197187 - ], - [ - -124.0553286, - 44.5181505 - ], - [ - -124.0553966, - 44.5179675 - ], - [ - -124.055817, - 44.5170154 - ], - [ - -124.055955, - 44.5167464 - ], - [ - -124.0567807, - 44.5154195 - ], - [ - -124.0569437, - 44.5151985 - ], - [ - -124.0582468, - 44.5137304 - ], - [ - -124.0585038, - 44.5134864 - ], - [ - -124.0603019, - 44.5120613 - ], - [ - -124.0606709, - 44.5118164 - ], - [ - -124.062938, - 44.5105734 - ], - [ - -124.0634019, - 44.5103654 - ], - [ - -124.0634432, - 44.5103494 - ], - [ - -124.0644614, - 44.5081867 - ], - [ - -124.0645924, - 44.5078705 - ], - [ - -124.0647557, - 44.5074774 - ], - [ - -124.0649311, - 44.507055 - ], - [ - -124.0649701, - 44.5069007 - ], - [ - -124.0650798, - 44.5064079 - ], - [ - -124.0654595, - 44.5046763 - ], - [ - -124.0655716, - 44.5040637 - ], - [ - -124.0656078, - 44.5038779 - ], - [ - -124.0659452, - 44.5022519 - ], - [ - -124.066513, - 44.499533 - ], - [ - -124.0665275, - 44.4994652 - ], - [ - -124.0666736, - 44.4987942 - ], - [ - -124.0667167, - 44.4986072 - ], - [ - -124.0668729, - 44.4979642 - ], - [ - -124.0669941, - 44.4975201 - ], - [ - -124.0671342, - 44.4970581 - ], - [ - -124.0672038, - 44.4968397 - ], - [ - -124.067491, - 44.4959787 - ], - [ - -124.0684624, - 44.4939654 - ], - [ - -124.0699639, - 44.4921264 - ], - [ - -124.0719376, - 44.4905324 - ], - [ - -124.0743077, - 44.4892446 - ], - [ - -124.0769832, - 44.4883125 - ], - [ - -124.0798612, - 44.4877719 - ], - [ - -124.0828312, - 44.4876435 - ], - [ - -124.0857792, - 44.4879322 - ], - [ - -124.0885919, - 44.4886271 - ], - [ - -124.0911613, - 44.4897013 - ], - [ - -124.0933886, - 44.4911137 - ], - [ - -124.0951884, - 44.4928099 - ], - [ - -124.0964913, - 44.4947249 - ], - [ - -124.0972473, - 44.496785 - ], - [ - -124.0974273, - 44.498911 - ], - [ - -124.0970243, - 44.5010214 - ], - [ - -124.0967738, - 44.5017734 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16024_s_16025", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0482127, - 44.6849192 - ], - [ - -124.0481127, - 44.684273 - ], - [ - -124.0480776, - 44.6821432 - ], - [ - -124.0486255, - 44.6800495 - ], - [ - -124.0497354, - 44.6780723 - ], - [ - -124.0513645, - 44.6762875 - ], - [ - -124.0534502, - 44.6747637 - ], - [ - -124.0559123, - 44.6735595 - ], - [ - -124.0586563, - 44.6727212 - ], - [ - -124.0615767, - 44.6722808 - ], - [ - -124.0645614, - 44.6722554 - ], - [ - -124.0674957, - 44.6726459 - ], - [ - -124.070267, - 44.6734373 - ], - [ - -124.0727687, - 44.6745992 - ], - [ - -124.0749047, - 44.6760869 - ], - [ - -124.0765931, - 44.6778435 - ], - [ - -124.0777688, - 44.6798012 - ], - [ - -124.0783867, - 44.681885 - ], - [ - -124.0788074, - 44.6845949 - ], - [ - -124.0788986, - 44.6856493 - ], - [ - -124.0789189, - 44.6867593 - ], - [ - -124.0789168, - 44.6871303 - ], - [ - -124.0788772, - 44.6884703 - ], - [ - -124.0788439, - 44.6889944 - ], - [ - -124.0786744, - 44.6907344 - ], - [ - -124.0786235, - 44.6911441 - ], - [ - -124.0785171, - 44.6918487 - ], - [ - -124.0779604, - 44.6938122 - ], - [ - -124.0769077, - 44.6956693 - ], - [ - -124.0753948, - 44.6973571 - ], - [ - -124.0734731, - 44.698818 - ], - [ - -124.0712079, - 44.7000024 - ], - [ - -124.0686763, - 44.70087 - ], - [ - -124.0659643, - 44.7013913 - ], - [ - -124.0631642, - 44.7015486 - ], - [ - -124.0609093, - 44.7015265 - ], - [ - -124.0579516, - 44.70129 - ], - [ - -124.0551149, - 44.7006479 - ], - [ - -124.0525075, - 44.6996246 - ], - [ - -124.0502289, - 44.6982592 - ], - [ - -124.0483661, - 44.6966039 - ], - [ - -124.0469902, - 44.6947218 - ], - [ - -124.0461536, - 44.6926848 - ], - [ - -124.0458883, - 44.6905707 - ], - [ - -124.0458888, - 44.6905277 - ], - [ - -124.0462068, - 44.6884099 - ], - [ - -124.0470979, - 44.6863771 - ], - [ - -124.0482127, - 44.6849192 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16025_s_16026", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0483429, - 44.6850789 - ], - [ - -124.0483242, - 44.6850819 - ], - [ - -124.0474428, - 44.6822944 - ], - [ - -124.0468179, - 44.6808121 - ], - [ - -124.0465969, - 44.6803698 - ], - [ - -124.0463133, - 44.6797429 - ], - [ - -124.0455137, - 44.6777728 - ], - [ - -124.0449685, - 44.6756787 - ], - [ - -124.0450064, - 44.673549 - ], - [ - -124.0456258, - 44.6714654 - ], - [ - -124.0468029, - 44.6695081 - ], - [ - -124.0484924, - 44.6677523 - ], - [ - -124.0506293, - 44.6662653 - ], - [ - -124.0531316, - 44.6651044 - ], - [ - -124.0559031, - 44.6643141 - ], - [ - -124.0588373, - 44.6639248 - ], - [ - -124.0618215, - 44.6639514 - ], - [ - -124.0647411, - 44.664393 - ], - [ - -124.0674841, - 44.6652324 - ], - [ - -124.0699449, - 44.6664376 - ], - [ - -124.0720291, - 44.6679622 - ], - [ - -124.0736566, - 44.6697476 - ], - [ - -124.0747647, - 44.6717253 - ], - [ - -124.0754366, - 44.6733787 - ], - [ - -124.0756315, - 44.6737683 - ], - [ - -124.0758709, - 44.674288 - ], - [ - -124.0767614, - 44.6763979 - ], - [ - -124.0770338, - 44.6771363 - ], - [ - -124.0780346, - 44.6802961 - ], - [ - -124.0782854, - 44.681309 - ], - [ - -124.0783555, - 44.681699 - ], - [ - -124.0784432, - 44.683828 - ], - [ - -124.077947, - 44.6859282 - ], - [ - -124.0768859, - 44.6879191 - ], - [ - -124.0753006, - 44.689724 - ], - [ - -124.0732521, - 44.6912736 - ], - [ - -124.0708191, - 44.6925083 - ], - [ - -124.0680951, - 44.6933806 - ], - [ - -124.0651847, - 44.693857 - ], - [ - -124.0622, - 44.6939191 - ], - [ - -124.0592556, - 44.6935647 - ], - [ - -124.0564648, - 44.6928072 - ], - [ - -124.0539349, - 44.6916759 - ], - [ - -124.0517632, - 44.6902142 - ], - [ - -124.050033, - 44.6884784 - ], - [ - -124.0488109, - 44.6865351 - ], - [ - -124.0483429, - 44.6850789 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16025_s_2455449", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.076956, - 44.67697 - ], - [ - -124.0769892, - 44.6770561 - ], - [ - -124.0770612, - 44.6772497 - ], - [ - -124.0773814, - 44.6781436 - ], - [ - -124.07754, - 44.6786333 - ], - [ - -124.0776351, - 44.6789613 - ], - [ - -124.0776509, - 44.6790166 - ], - [ - -124.0776664, - 44.6790715 - ], - [ - -124.0777518, - 44.6793673 - ], - [ - -124.0777742, - 44.6794465 - ], - [ - -124.0779153, - 44.6799545 - ], - [ - -124.0779829, - 44.6802142 - ], - [ - -124.078109, - 44.6807342 - ], - [ - -124.0781202, - 44.6807811 - ], - [ - -124.0781775, - 44.6810233 - ], - [ - -124.0782357, - 44.6812675 - ], - [ - -124.0784453, - 44.6833921 - ], - [ - -124.0780699, - 44.6855051 - ], - [ - -124.0771238, - 44.6875253 - ], - [ - -124.0756433, - 44.6893749 - ], - [ - -124.0736854, - 44.690983 - ], - [ - -124.0713252, - 44.6922876 - ], - [ - -124.0686535, - 44.6932386 - ], - [ - -124.0657729, - 44.6937995 - ], - [ - -124.0627942, - 44.6939487 - ], - [ - -124.059832, - 44.6936804 - ], - [ - -124.0570001, - 44.693005 - ], - [ - -124.0544074, - 44.6919485 - ], - [ - -124.0521537, - 44.6905514 - ], - [ - -124.0503254, - 44.6888674 - ], - [ - -124.0489929, - 44.6869614 - ], - [ - -124.0482074, - 44.6849065 - ], - [ - -124.0481474, - 44.6846545 - ], - [ - -124.0481437, - 44.684639 - ], - [ - -124.0480903, - 44.6844124 - ], - [ - -124.0480016, - 44.684046 - ], - [ - -124.0479077, - 44.6837072 - ], - [ - -124.0478272, - 44.6834277 - ], - [ - -124.0477822, - 44.6832717 - ], - [ - -124.0475861, - 44.6827235 - ], - [ - -124.0475324, - 44.682584 - ], - [ - -124.0474308, - 44.682306 - ], - [ - -124.0473891, - 44.6821854 - ], - [ - -124.0473724, - 44.6821413 - ], - [ - -124.0470242, - 44.6813348 - ], - [ - -124.0467826, - 44.6808066 - ], - [ - -124.0467373, - 44.680706 - ], - [ - -124.0464174, - 44.6799829 - ], - [ - -124.0463173, - 44.6797472 - ], - [ - -124.0461006, - 44.6792156 - ], - [ - -124.0458961, - 44.6787143 - ], - [ - -124.045827, - 44.6785503 - ], - [ - -124.0458192, - 44.6785316 - ], - [ - -124.0457961, - 44.6784765 - ], - [ - -124.0457817, - 44.6784433 - ], - [ - -124.0457579, - 44.6783878 - ], - [ - -124.0453381, - 44.6774007 - ], - [ - -124.0453016, - 44.6773136 - ], - [ - -124.0450851, - 44.6767888 - ], - [ - -124.044822, - 44.6761816 - ], - [ - -124.044744, - 44.6759959 - ], - [ - -124.04451, - 44.6754196 - ], - [ - -124.044493, - 44.6753783 - ], - [ - -124.0444852, - 44.6753594 - ], - [ - -124.0440144, - 44.6742103 - ], - [ - -124.0439972, - 44.6741679 - ], - [ - -124.0439042, - 44.6739375 - ], - [ - -124.0438165, - 44.6737337 - ], - [ - -124.0437644, - 44.6736099 - ], - [ - -124.0435629, - 44.6731209 - ], - [ - -124.0434269, - 44.6728217 - ], - [ - -124.04333, - 44.6726005 - ], - [ - -124.0432145, - 44.6723266 - ], - [ - -124.0431802, - 44.6722467 - ], - [ - -124.0431516, - 44.6721794 - ], - [ - -124.0431096, - 44.6720794 - ], - [ - -124.0430719, - 44.6719881 - ], - [ - -124.0429741, - 44.6717475 - ], - [ - -124.0428534, - 44.6714796 - ], - [ - -124.0426661, - 44.671031 - ], - [ - -124.0425379, - 44.6706979 - ], - [ - -124.0424729, - 44.670529 - ], - [ - -124.0423488, - 44.6702526 - ], - [ - -124.0422856, - 44.6701084 - ], - [ - -124.0422086, - 44.6699284 - ], - [ - -124.0421844, - 44.6698711 - ], - [ - -124.0418856, - 44.6691581 - ], - [ - -124.0418358, - 44.6690367 - ], - [ - -124.0418032, - 44.6689556 - ], - [ - -124.0415209, - 44.6683269 - ], - [ - -124.0414538, - 44.6681737 - ], - [ - -124.0407362, - 44.6664906 - ], - [ - -124.0406895, - 44.6663789 - ], - [ - -124.0403479, - 44.6655457 - ], - [ - -124.0401735, - 44.665134 - ], - [ - -124.0395795, - 44.6637336 - ], - [ - -124.0394039, - 44.6632852 - ], - [ - -124.0392876, - 44.6629616 - ], - [ - -124.0390094, - 44.6622483 - ], - [ - -124.0386748, - 44.6611871 - ], - [ - -124.038444, - 44.6602351 - ], - [ - -124.0384238, - 44.6601497 - ], - [ - -124.0383319, - 44.6597517 - ], - [ - -124.0382685, - 44.6594511 - ], - [ - -124.0381916, - 44.6590481 - ], - [ - -124.0381281, - 44.6586644 - ], - [ - -124.0379475, - 44.6573763 - ], - [ - -124.0379176, - 44.657137 - ], - [ - -124.0378578, - 44.656588 - ], - [ - -124.0378233, - 44.6561654 - ], - [ - -124.0377944, - 44.6556334 - ], - [ - -124.0377831, - 44.6552438 - ], - [ - -124.0377803, - 44.6545348 - ], - [ - -124.0380758, - 44.6523732 - ], - [ - -124.0389677, - 44.6502967 - ], - [ - -124.0404202, - 44.6483884 - ], - [ - -124.0423754, - 44.6467243 - ], - [ - -124.0447549, - 44.6453711 - ], - [ - -124.0474639, - 44.6443827 - ], - [ - -124.050394, - 44.6437986 - ], - [ - -124.0534283, - 44.6436422 - ], - [ - -124.0538782, - 44.6436512 - ], - [ - -124.0547795, - 44.6436883 - ], - [ - -124.0549235, - 44.6436973 - ], - [ - -124.0578558, - 44.6440901 - ], - [ - -124.0606244, - 44.6448837 - ], - [ - -124.0631231, - 44.6460476 - ], - [ - -124.0652559, - 44.6475371 - ], - [ - -124.0669407, - 44.6492949 - ], - [ - -124.0681128, - 44.6512536 - ], - [ - -124.0687271, - 44.6533379 - ], - [ - -124.06876, - 44.6554677 - ], - [ - -124.0684616, - 44.6566036 - ], - [ - -124.0685439, - 44.6569424 - ], - [ - -124.0686593, - 44.6572378 - ], - [ - -124.0687396, - 44.6574519 - ], - [ - -124.0688135, - 44.6576573 - ], - [ - -124.0693142, - 44.6588364 - ], - [ - -124.0695108, - 44.6592998 - ], - [ - -124.0695498, - 44.6593933 - ], - [ - -124.069888, - 44.6602173 - ], - [ - -124.0705498, - 44.6617677 - ], - [ - -124.0708706, - 44.6624812 - ], - [ - -124.0710086, - 44.6628054 - ], - [ - -124.0710823, - 44.6629886 - ], - [ - -124.071344, - 44.6636124 - ], - [ - -124.0713779, - 44.6636915 - ], - [ - -124.0715666, - 44.6641115 - ], - [ - -124.0717478, - 44.6645454 - ], - [ - -124.0718979, - 44.6649344 - ], - [ - -124.0719414, - 44.6650474 - ], - [ - -124.072029, - 44.6652415 - ], - [ - -124.0721498, - 44.6655224 - ], - [ - -124.0723222, - 44.6659433 - ], - [ - -124.0723382, - 44.6659805 - ], - [ - -124.0723613, - 44.6660347 - ], - [ - -124.0724415, - 44.6662246 - ], - [ - -124.0725624, - 44.6664902 - ], - [ - -124.0725931, - 44.6665578 - ], - [ - -124.0727169, - 44.6668433 - ], - [ - -124.0729524, - 44.6674143 - ], - [ - -124.0730529, - 44.6676475 - ], - [ - -124.0731292, - 44.6678303 - ], - [ - -124.0732505, - 44.6681305 - ], - [ - -124.0737389, - 44.6693208 - ], - [ - -124.0737493, - 44.6693463 - ], - [ - -124.0739531, - 44.6698475 - ], - [ - -124.0741843, - 44.6703791 - ], - [ - -124.074227, - 44.670479 - ], - [ - -124.074248, - 44.670529 - ], - [ - -124.0742687, - 44.6705785 - ], - [ - -124.0744959, - 44.6711288 - ], - [ - -124.0749327, - 44.6721531 - ], - [ - -124.0749532, - 44.6722016 - ], - [ - -124.0749933, - 44.6722972 - ], - [ - -124.0750784, - 44.6724988 - ], - [ - -124.0751175, - 44.6725931 - ], - [ - -124.0753417, - 44.6731421 - ], - [ - -124.0755109, - 44.6735567 - ], - [ - -124.0757567, - 44.6741118 - ], - [ - -124.0760149, - 44.6746755 - ], - [ - -124.0760914, - 44.6748476 - ], - [ - -124.0765557, - 44.6759215 - ], - [ - -124.0767035, - 44.6762859 - ], - [ - -124.0768336, - 44.6766289 - ], - [ - -124.0769087, - 44.6768349 - ], - [ - -124.076956, - 44.67697 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16026_s_15893", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0378178, - 44.646528 - ], - [ - -124.0370021, - 44.6463536 - ], - [ - -124.0344633, - 44.6454119 - ], - [ - -124.0322164, - 44.6441475 - ], - [ - -124.0303407, - 44.6426052 - ], - [ - -124.0295919, - 44.6416859 - ], - [ - -124.0293088, - 44.6414373 - ], - [ - -124.0279146, - 44.6395542 - ], - [ - -124.0270619, - 44.6375131 - ], - [ - -124.0267833, - 44.6353925 - ], - [ - -124.0270895, - 44.6332738 - ], - [ - -124.0279686, - 44.6312385 - ], - [ - -124.0293868, - 44.6293647 - ], - [ - -124.0312896, - 44.6277245 - ], - [ - -124.0336038, - 44.6263808 - ], - [ - -124.0362406, - 44.6253853 - ], - [ - -124.0390985, - 44.6247763 - ], - [ - -124.0420679, - 44.624577 - ], - [ - -124.0450347, - 44.6247952 - ], - [ - -124.0478849, - 44.6254224 - ], - [ - -124.0479566, - 44.6254501 - ], - [ - -124.0479631, - 44.6254501 - ], - [ - -124.0516905, - 44.6254064 - ], - [ - -124.0541175, - 44.6255166 - ], - [ - -124.0546794, - 44.6255746 - ], - [ - -124.0577798, - 44.6261372 - ], - [ - -124.0583857, - 44.6262972 - ], - [ - -124.0611823, - 44.6272784 - ], - [ - -124.0636404, - 44.6286458 - ], - [ - -124.0656569, - 44.6303421 - ], - [ - -124.0671474, - 44.6322962 - ], - [ - -124.0680492, - 44.634426 - ], - [ - -124.0683245, - 44.6366424 - ], - [ - -124.0682791, - 44.6389412 - ], - [ - -124.0682986, - 44.642828 - ], - [ - -124.0682969, - 44.6430364 - ], - [ - -124.0682445, - 44.6454363 - ], - [ - -124.0682795, - 44.6481893 - ], - [ - -124.0682798, - 44.6483581 - ], - [ - -124.0682247, - 44.6544566 - ], - [ - -124.0682391, - 44.6550031 - ], - [ - -124.0683584, - 44.6560271 - ], - [ - -124.0685415, - 44.6567891 - ], - [ - -124.0689393, - 44.6579451 - ], - [ - -124.0697657, - 44.6598177 - ], - [ - -124.0698336, - 44.6599758 - ], - [ - -124.0746962, - 44.6716061 - ], - [ - -124.0752653, - 44.673697 - ], - [ - -124.0752518, - 44.6758268 - ], - [ - -124.0746562, - 44.6779139 - ], - [ - -124.0735013, - 44.679878 - ], - [ - -124.0718315, - 44.6816435 - ], - [ - -124.0697108, - 44.6831427 - ], - [ - -124.0672209, - 44.6843178 - ], - [ - -124.0644573, - 44.6851238 - ], - [ - -124.0615264, - 44.6855296 - ], - [ - -124.0585409, - 44.6855195 - ], - [ - -124.0556155, - 44.6850941 - ], - [ - -124.0528627, - 44.6842696 - ], - [ - -124.0503884, - 44.6830778 - ], - [ - -124.0482876, - 44.6815645 - ], - [ - -124.0466411, - 44.6797878 - ], - [ - -124.0455122, - 44.677816 - ], - [ - -124.0406879, - 44.6662636 - ], - [ - -124.0397502, - 44.6641364 - ], - [ - -124.0394866, - 44.6634637 - ], - [ - -124.0388441, - 44.6615936 - ], - [ - -124.0386242, - 44.6608388 - ], - [ - -124.0382386, - 44.6592308 - ], - [ - -124.0380723, - 44.6582939 - ], - [ - -124.0378588, - 44.6564519 - ], - [ - -124.0378095, - 44.6557569 - ], - [ - -124.0377828, - 44.6547248 - ], - [ - -124.0377806, - 44.6544499 - ], - [ - -124.0378394, - 44.6482983 - ], - [ - -124.0378178, - 44.646528 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16026_s_2483495", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0690529, - 44.6557879 - ], - [ - -124.0691216, - 44.6564753 - ], - [ - -124.0688841, - 44.6578235 - ], - [ - -124.0693142, - 44.6588364 - ], - [ - -124.0695108, - 44.6592998 - ], - [ - -124.0695498, - 44.6593933 - ], - [ - -124.069888, - 44.6602173 - ], - [ - -124.0705498, - 44.6617677 - ], - [ - -124.0708706, - 44.6624812 - ], - [ - -124.0710086, - 44.6628054 - ], - [ - -124.0710823, - 44.6629886 - ], - [ - -124.071344, - 44.6636124 - ], - [ - -124.0713779, - 44.6636915 - ], - [ - -124.0715666, - 44.6641115 - ], - [ - -124.0717478, - 44.6645454 - ], - [ - -124.0718979, - 44.6649344 - ], - [ - -124.0719414, - 44.6650474 - ], - [ - -124.072029, - 44.6652415 - ], - [ - -124.0721498, - 44.6655224 - ], - [ - -124.0723222, - 44.6659433 - ], - [ - -124.0723382, - 44.6659805 - ], - [ - -124.0723613, - 44.6660347 - ], - [ - -124.0724415, - 44.6662246 - ], - [ - -124.0725624, - 44.6664902 - ], - [ - -124.0725931, - 44.6665578 - ], - [ - -124.0727169, - 44.6668433 - ], - [ - -124.0729524, - 44.6674143 - ], - [ - -124.0730529, - 44.6676475 - ], - [ - -124.0731292, - 44.6678303 - ], - [ - -124.0732505, - 44.6681305 - ], - [ - -124.0737389, - 44.6693208 - ], - [ - -124.0737493, - 44.6693463 - ], - [ - -124.0739531, - 44.6698475 - ], - [ - -124.0741843, - 44.6703791 - ], - [ - -124.0742104, - 44.6704398 - ], - [ - -124.0747006, - 44.6715903 - ], - [ - -124.0752847, - 44.6736791 - ], - [ - -124.0752865, - 44.675809 - ], - [ - -124.0747059, - 44.6778982 - ], - [ - -124.0735651, - 44.6798665 - ], - [ - -124.071908, - 44.6816381 - ], - [ - -124.0697982, - 44.683145 - ], - [ - -124.0673167, - 44.6843292 - ], - [ - -124.064559, - 44.6851453 - ], - [ - -124.0616311, - 44.6855618 - ], - [ - -124.0586455, - 44.6855627 - ], - [ - -124.0557171, - 44.685148 - ], - [ - -124.0529584, - 44.6843336 - ], - [ - -124.0504755, - 44.6831508 - ], - [ - -124.0483639, - 44.6816452 - ], - [ - -124.0467047, - 44.6798746 - ], - [ - -124.0455616, - 44.677907 - ], - [ - -124.0450849, - 44.6767867 - ], - [ - -124.0448252, - 44.676189 - ], - [ - -124.044744, - 44.6759959 - ], - [ - -124.04451, - 44.6754196 - ], - [ - -124.044493, - 44.6753783 - ], - [ - -124.0444852, - 44.6753594 - ], - [ - -124.0440144, - 44.6742103 - ], - [ - -124.0439972, - 44.6741679 - ], - [ - -124.0439042, - 44.6739375 - ], - [ - -124.0438165, - 44.6737337 - ], - [ - -124.0437644, - 44.6736099 - ], - [ - -124.0435629, - 44.6731209 - ], - [ - -124.0434269, - 44.6728217 - ], - [ - -124.04333, - 44.6726005 - ], - [ - -124.0432145, - 44.6723266 - ], - [ - -124.0431802, - 44.6722467 - ], - [ - -124.0431516, - 44.6721794 - ], - [ - -124.0431096, - 44.6720794 - ], - [ - -124.0430719, - 44.6719881 - ], - [ - -124.0429741, - 44.6717475 - ], - [ - -124.0428534, - 44.6714796 - ], - [ - -124.0426661, - 44.671031 - ], - [ - -124.0425379, - 44.6706979 - ], - [ - -124.0424729, - 44.670529 - ], - [ - -124.0423488, - 44.6702526 - ], - [ - -124.0422856, - 44.6701084 - ], - [ - -124.0422086, - 44.6699284 - ], - [ - -124.0421844, - 44.6698711 - ], - [ - -124.0418856, - 44.6691581 - ], - [ - -124.0418358, - 44.6690367 - ], - [ - -124.0418032, - 44.6689556 - ], - [ - -124.0415209, - 44.6683269 - ], - [ - -124.0414538, - 44.6681737 - ], - [ - -124.0407362, - 44.6664906 - ], - [ - -124.0406895, - 44.6663789 - ], - [ - -124.0403479, - 44.6655457 - ], - [ - -124.0401735, - 44.665134 - ], - [ - -124.0395795, - 44.6637336 - ], - [ - -124.0394039, - 44.6632852 - ], - [ - -124.0392876, - 44.6629616 - ], - [ - -124.0390094, - 44.6622483 - ], - [ - -124.0386748, - 44.6611871 - ], - [ - -124.038444, - 44.6602351 - ], - [ - -124.0384238, - 44.6601497 - ], - [ - -124.0383319, - 44.6597517 - ], - [ - -124.0382685, - 44.6594511 - ], - [ - -124.0381916, - 44.6590481 - ], - [ - -124.0381281, - 44.6586644 - ], - [ - -124.0379475, - 44.6573763 - ], - [ - -124.0379176, - 44.657137 - ], - [ - -124.0378578, - 44.656588 - ], - [ - -124.0378233, - 44.6561654 - ], - [ - -124.0377944, - 44.6556334 - ], - [ - -124.0377831, - 44.6552438 - ], - [ - -124.0377803, - 44.6545348 - ], - [ - -124.0380847, - 44.6523416 - ], - [ - -124.0390028, - 44.6502375 - ], - [ - -124.0404968, - 44.6483088 - ], - [ - -124.0425052, - 44.646635 - ], - [ - -124.0449453, - 44.6452849 - ], - [ - -124.0477167, - 44.644314 - ], - [ - -124.0507054, - 44.6437623 - ], - [ - -124.0537886, - 44.6436525 - ], - [ - -124.0545465, - 44.6436805 - ], - [ - -124.0573334, - 44.6439696 - ], - [ - -124.0575654, - 44.6440096 - ], - [ - -124.0603999, - 44.6447157 - ], - [ - -124.0629851, - 44.6458053 - ], - [ - -124.0652206, - 44.6472359 - ], - [ - -124.0670194, - 44.6489519 - ], - [ - -124.0683113, - 44.6508865 - ], - [ - -124.0690463, - 44.6529645 - ], - [ - -124.0691954, - 44.6551051 - ], - [ - -124.0690529, - 44.6557879 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16030_s_16033", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0758507, - 44.6386749 - ], - [ - -124.0757093, - 44.6402352 - ], - [ - -124.0749395, - 44.642293 - ], - [ - -124.0736221, - 44.644204 - ], - [ - -124.0718077, - 44.6458948 - ], - [ - -124.069566, - 44.6473003 - ], - [ - -124.0669832, - 44.6483666 - ], - [ - -124.0641585, - 44.6490526 - ], - [ - -124.0612005, - 44.649332 - ], - [ - -124.0582231, - 44.649194 - ], - [ - -124.0553406, - 44.648644 - ], - [ - -124.0526639, - 44.647703 - ], - [ - -124.0502959, - 44.6464072 - ], - [ - -124.0483277, - 44.6448065 - ], - [ - -124.0468347, - 44.6429625 - ], - [ - -124.0458745, - 44.6409459 - ], - [ - -124.0454838, - 44.6388343 - ], - [ - -124.0454788, - 44.6387273 - ], - [ - -124.0454777, - 44.6383703 - ], - [ - -124.0452352, - 44.6365033 - ], - [ - -124.0455444, - 44.6343848 - ], - [ - -124.0464265, - 44.6323502 - ], - [ - -124.0478474, - 44.6304774 - ], - [ - -124.0497526, - 44.6288386 - ], - [ - -124.0520688, - 44.6274967 - ], - [ - -124.054707, - 44.6265031 - ], - [ - -124.0575659, - 44.6258962 - ], - [ - -124.0605356, - 44.6256991 - ], - [ - -124.0607906, - 44.6257001 - ], - [ - -124.0637587, - 44.6259207 - ], - [ - -124.0666096, - 44.6265508 - ], - [ - -124.0692334, - 44.627566 - ], - [ - -124.0715294, - 44.6289275 - ], - [ - -124.0734091, - 44.6305828 - ], - [ - -124.0748004, - 44.6324682 - ], - [ - -124.0756495, - 44.6345113 - ], - [ - -124.0759238, - 44.6366334 - ], - [ - -124.0759203, - 44.637028 - ], - [ - -124.0759222, - 44.6374146 - ], - [ - -124.0759223, - 44.6374333 - ], - [ - -124.0759234, - 44.6378993 - ], - [ - -124.0759172, - 44.6382268 - ], - [ - -124.0758994, - 44.6386759 - ], - [ - -124.0758507, - 44.6386749 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16031_s_16030", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0454681, - 44.6405538 - ], - [ - -124.045468, - 44.6401723 - ], - [ - -124.0454699, - 44.6399973 - ], - [ - -124.0454893, - 44.6391243 - ], - [ - -124.045491, - 44.6389938 - ], - [ - -124.0454834, - 44.6388262 - ], - [ - -124.0456794, - 44.6367009 - ], - [ - -124.0464524, - 44.6346437 - ], - [ - -124.0477724, - 44.6327337 - ], - [ - -124.0495889, - 44.6310442 - ], - [ - -124.0518319, - 44.6296403 - ], - [ - -124.0544153, - 44.6285757 - ], - [ - -124.0572399, - 44.6278914 - ], - [ - -124.060197, - 44.6276137 - ], - [ - -124.0631732, - 44.6277532 - ], - [ - -124.0660541, - 44.6283046 - ], - [ - -124.0687292, - 44.6292468 - ], - [ - -124.0710955, - 44.6305434 - ], - [ - -124.0730622, - 44.6321447 - ], - [ - -124.0745538, - 44.6339892 - ], - [ - -124.0755128, - 44.6360061 - ], - [ - -124.0759024, - 44.6381178 - ], - [ - -124.0759205, - 44.6385118 - ], - [ - -124.075928, - 44.6389647 - ], - [ - -124.0759231, - 44.6393577 - ], - [ - -124.0759219, - 44.6394296 - ], - [ - -124.0759041, - 44.6402512 - ], - [ - -124.0759055, - 44.6419697 - ], - [ - -124.0756095, - 44.6441085 - ], - [ - -124.0747295, - 44.6461638 - ], - [ - -124.0733, - 44.6480553 - ], - [ - -124.0713768, - 44.6497088 - ], - [ - -124.0690352, - 44.6510597 - ], - [ - -124.0663667, - 44.6520551 - ], - [ - -124.0634759, - 44.6526561 - ], - [ - -124.060476, - 44.652839 - ], - [ - -124.0602739, - 44.652837 - ], - [ - -124.0573088, - 44.6525988 - ], - [ - -124.0544657, - 44.6519522 - ], - [ - -124.0518541, - 44.6509221 - ], - [ - -124.0495743, - 44.649548 - ], - [ - -124.047714, - 44.6478827 - ], - [ - -124.0463446, - 44.6459904 - ], - [ - -124.0455187, - 44.6439437 - ], - [ - -124.045268, - 44.6418213 - ], - [ - -124.0454681, - 44.6405538 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16032_s_2438933", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0659313, - 44.6340192 - ], - [ - -124.0678692, - 44.634758 - ], - [ - -124.070176, - 44.6361084 - ], - [ - -124.0720697, - 44.6377541 - ], - [ - -124.0734774, - 44.639632 - ], - [ - -124.0743451, - 44.6416698 - ], - [ - -124.0746392, - 44.6437894 - ], - [ - -124.0743485, - 44.6459091 - ], - [ - -124.073484, - 44.6479477 - ], - [ - -124.072079, - 44.6498267 - ], - [ - -124.0701874, - 44.6514739 - ], - [ - -124.0678818, - 44.6528259 - ], - [ - -124.0652509, - 44.6538309 - ], - [ - -124.0623958, - 44.6544501 - ], - [ - -124.0594263, - 44.6546597 - ], - [ - -124.0588426, - 44.6546599 - ], - [ - -124.0586126, - 44.6546587 - ], - [ - -124.0565752, - 44.6546373 - ], - [ - -124.0556672, - 44.6546398 - ], - [ - -124.0527025, - 44.6544402 - ], - [ - -124.049849, - 44.6538323 - ], - [ - -124.0472161, - 44.6528394 - ], - [ - -124.0449044, - 44.6514996 - ], - [ - -124.0430025, - 44.6498641 - ], - [ - -124.0427563, - 44.64954 - ], - [ - -124.042733, - 44.649526 - ], - [ - -124.0408701, - 44.6478622 - ], - [ - -124.0394977, - 44.645971 - ], - [ - -124.0386687, - 44.6439249 - ], - [ - -124.0384147, - 44.6418027 - ], - [ - -124.0387456, - 44.6396859 - ], - [ - -124.0396484, - 44.6376559 - ], - [ - -124.0410885, - 44.6357906 - ], - [ - -124.0430105, - 44.6341617 - ], - [ - -124.0453405, - 44.6328318 - ], - [ - -124.047989, - 44.631852 - ], - [ - -124.0508543, - 44.6312599 - ], - [ - -124.0538262, - 44.6310782 - ], - [ - -124.0558346, - 44.6310965 - ], - [ - -124.058838, - 44.6313382 - ], - [ - -124.0617153, - 44.6319989 - ], - [ - -124.064353, - 44.6330526 - ], - [ - -124.0659313, - 44.6340192 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16033_s_16034", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.059929, - 44.6474268 - ], - [ - -124.0599046, - 44.6474267 - ], - [ - -124.0597465, - 44.6474258 - ], - [ - -124.0589193, - 44.6474218 - ], - [ - -124.0588853, - 44.6474216 - ], - [ - -124.0587506, - 44.6474208 - ], - [ - -124.0580709, - 44.6474179 - ], - [ - -124.0572279, - 44.6474139 - ], - [ - -124.0562531, - 44.6474099 - ], - [ - -124.0562143, - 44.6474097 - ], - [ - -124.0556397, - 44.6474063 - ], - [ - -124.054692, - 44.6474099 - ], - [ - -124.0517213, - 44.6472124 - ], - [ - -124.0488616, - 44.6466049 - ], - [ - -124.046223, - 44.6456107 - ], - [ - -124.0439069, - 44.6442681 - ], - [ - -124.0420023, - 44.6426286 - ], - [ - -124.0405824, - 44.6407554 - ], - [ - -124.0397018, - 44.6387204 - ], - [ - -124.0393941, - 44.6366018 - ], - [ - -124.0396712, - 44.6344811 - ], - [ - -124.0405224, - 44.6324397 - ], - [ - -124.0419149, - 44.6305561 - ], - [ - -124.0437952, - 44.6289027 - ], - [ - -124.0460909, - 44.6275429 - ], - [ - -124.0487139, - 44.6265291 - ], - [ - -124.0515635, - 44.6259001 - ], - [ - -124.05453, - 44.6256801 - ], - [ - -124.0555808, - 44.6256761 - ], - [ - -124.0557878, - 44.6256763 - ], - [ - -124.0564463, - 44.6256802 - ], - [ - -124.0574087, - 44.6256841 - ], - [ - -124.0582583, - 44.6256881 - ], - [ - -124.058955, - 44.6256911 - ], - [ - -124.0589997, - 44.6256913 - ], - [ - -124.0591397, - 44.6256922 - ], - [ - -124.0599615, - 44.6256962 - ], - [ - -124.0599854, - 44.6256963 - ], - [ - -124.0601432, - 44.6256972 - ], - [ - -124.060553, - 44.6256992 - ], - [ - -124.0635191, - 44.6259219 - ], - [ - -124.0663675, - 44.6265536 - ], - [ - -124.0689886, - 44.62757 - ], - [ - -124.0712818, - 44.6289319 - ], - [ - -124.073159, - 44.6305871 - ], - [ - -124.0745481, - 44.6324719 - ], - [ - -124.0753955, - 44.6345141 - ], - [ - -124.0756687, - 44.6366351 - ], - [ - -124.0753572, - 44.6387533 - ], - [ - -124.0744728, - 44.6407875 - ], - [ - -124.0730495, - 44.6426594 - ], - [ - -124.0711419, - 44.6442971 - ], - [ - -124.0688233, - 44.6456375 - ], - [ - -124.0661829, - 44.6466292 - ], - [ - -124.0633222, - 44.6472341 - ], - [ - -124.060351, - 44.6474288 - ], - [ - -124.059929, - 44.6474268 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16034_s_15889", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0695159, - 44.6344483 - ], - [ - -124.069586, - 44.6346247 - ], - [ - -124.0698246, - 44.6367478 - ], - [ - -124.0694784, - 44.6388634 - ], - [ - -124.0685608, - 44.64089 - ], - [ - -124.067107, - 44.6427499 - ], - [ - -124.0651728, - 44.6443716 - ], - [ - -124.0628325, - 44.6456926 - ], - [ - -124.060176, - 44.6466623 - ], - [ - -124.0573056, - 44.6472433 - ], - [ - -124.0543315, - 44.6474133 - ], - [ - -124.0528814, - 44.6473943 - ], - [ - -124.0502878, - 44.6472008 - ], - [ - -124.0496773, - 44.6470776 - ], - [ - -124.047722, - 44.6469283 - ], - [ - -124.0448952, - 44.6463012 - ], - [ - -124.042292, - 44.6452952 - ], - [ - -124.040011, - 44.6439484 - ], - [ - -124.0381383, - 44.6423119 - ], - [ - -124.0367449, - 44.6404475 - ], - [ - -124.0358834, - 44.6384258 - ], - [ - -124.0355864, - 44.6363233 - ], - [ - -124.0355806, - 44.634986 - ], - [ - -124.035699, - 44.6335986 - ], - [ - -124.0357362, - 44.6333871 - ], - [ - -124.0364971, - 44.6311004 - ], - [ - -124.0365611, - 44.6309717 - ], - [ - -124.0384026, - 44.6284114 - ], - [ - -124.0385043, - 44.6283069 - ], - [ - -124.0399154, - 44.6270633 - ], - [ - -124.0415669, - 44.6259813 - ], - [ - -124.042301, - 44.6255672 - ], - [ - -124.0432931, - 44.6250524 - ], - [ - -124.0437653, - 44.6248275 - ], - [ - -124.0444862, - 44.6245047 - ], - [ - -124.0449834, - 44.6242956 - ], - [ - -124.0460925, - 44.6238723 - ], - [ - -124.04633, - 44.6237905 - ], - [ - -124.0486522, - 44.6231518 - ], - [ - -124.0510891, - 44.622792 - ], - [ - -124.0513339, - 44.6227706 - ], - [ - -124.0540622, - 44.6227078 - ], - [ - -124.0567624, - 44.6229942 - ], - [ - -124.0593474, - 44.6236205 - ], - [ - -124.0596186, - 44.6237063 - ], - [ - -124.0620519, - 44.624675 - ], - [ - -124.0641972, - 44.6259443 - ], - [ - -124.0643629, - 44.6260622 - ], - [ - -124.065565, - 44.6270257 - ], - [ - -124.0660166, - 44.6274341 - ], - [ - -124.0666257, - 44.6280249 - ], - [ - -124.0668976, - 44.6283081 - ], - [ - -124.06827, - 44.6300682 - ], - [ - -124.0691639, - 44.631979 - ], - [ - -124.0695484, - 44.6339747 - ], - [ - -124.0695159, - 44.6344483 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16039_s_16040", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0606432, - 44.6238951 - ], - [ - -124.0636095, - 44.6241168 - ], - [ - -124.0664582, - 44.6247475 - ], - [ - -124.0690799, - 44.6257629 - ], - [ - -124.0713741, - 44.6271239 - ], - [ - -124.0732524, - 44.6287785 - ], - [ - -124.0746427, - 44.6306628 - ], - [ - -124.0754916, - 44.6327047 - ], - [ - -124.0757663, - 44.6348256 - ], - [ - -124.0754563, - 44.636944 - ], - [ - -124.0745734, - 44.6389784 - ], - [ - -124.0731514, - 44.6408509 - ], - [ - -124.071245, - 44.6424892 - ], - [ - -124.0689275, - 44.6438305 - ], - [ - -124.0662879, - 44.6448232 - ], - [ - -124.0634276, - 44.645429 - ], - [ - -124.0604568, - 44.6456249 - ], - [ - -124.0559059, - 44.6456049 - ], - [ - -124.0529386, - 44.645383 - ], - [ - -124.050089, - 44.644752 - ], - [ - -124.0474667, - 44.6437362 - ], - [ - -124.0451725, - 44.6423746 - ], - [ - -124.0432945, - 44.6407196 - ], - [ - -124.041905, - 44.6388349 - ], - [ - -124.0410572, - 44.6367928 - ], - [ - -124.0407837, - 44.6346718 - ], - [ - -124.041095, - 44.6325535 - ], - [ - -124.041979, - 44.6305192 - ], - [ - -124.0434017, - 44.6286472 - ], - [ - -124.0453084, - 44.6270093 - ], - [ - -124.0476258, - 44.6256685 - ], - [ - -124.0502649, - 44.6246763 - ], - [ - -124.0531243, - 44.6240707 - ], - [ - -124.0560941, - 44.6238751 - ], - [ - -124.0606432, - 44.6238951 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16040_s_16042", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0577656, - 44.6240877 - ], - [ - -124.0581005, - 44.6239737 - ], - [ - -124.0609913, - 44.6234498 - ], - [ - -124.0639696, - 44.6233387 - ], - [ - -124.0669211, - 44.6236446 - ], - [ - -124.0697324, - 44.6243557 - ], - [ - -124.0722954, - 44.6254449 - ], - [ - -124.0745118, - 44.6268701 - ], - [ - -124.0762964, - 44.6285767 - ], - [ - -124.0775805, - 44.6304991 - ], - [ - -124.0783148, - 44.6325635 - ], - [ - -124.078471, - 44.6346905 - ], - [ - -124.0784343, - 44.6352635 - ], - [ - -124.0780271, - 44.6373107 - ], - [ - -124.077084, - 44.6392658 - ], - [ - -124.0756391, - 44.6410579 - ], - [ - -124.0737447, - 44.642622 - ], - [ - -124.0714695, - 44.6439016 - ], - [ - -124.0688959, - 44.6448502 - ], - [ - -124.066117, - 44.6454335 - ], - [ - -124.0632337, - 44.6456303 - ], - [ - -124.0628791, - 44.6456303 - ], - [ - -124.0628312, - 44.6456303 - ], - [ - -124.0605017, - 44.645625 - ], - [ - -124.0575335, - 44.6454095 - ], - [ - -124.0546812, - 44.6447846 - ], - [ - -124.0520547, - 44.6437745 - ], - [ - -124.0497547, - 44.6424178 - ], - [ - -124.0478698, - 44.6407669 - ], - [ - -124.0464723, - 44.6388851 - ], - [ - -124.0456159, - 44.6368448 - ], - [ - -124.0453335, - 44.6347245 - ], - [ - -124.0456358, - 44.6326055 - ], - [ - -124.0465113, - 44.6305694 - ], - [ - -124.0479261, - 44.6286943 - ], - [ - -124.0498259, - 44.6270523 - ], - [ - -124.0521377, - 44.6257066 - ], - [ - -124.0547726, - 44.6247087 - ], - [ - -124.0576294, - 44.624097 - ], - [ - -124.0577656, - 44.6240877 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16042_s_16043", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0481237, - 44.6320902 - ], - [ - -124.0484959, - 44.6299769 - ], - [ - -124.0494383, - 44.6279561 - ], - [ - -124.0509146, - 44.6261053 - ], - [ - -124.052868, - 44.6244958 - ], - [ - -124.0552235, - 44.6231894 - ], - [ - -124.0578905, - 44.6222361 - ], - [ - -124.0607666, - 44.6216727 - ], - [ - -124.0637413, - 44.6215208 - ], - [ - -124.0667003, - 44.6217861 - ], - [ - -124.0695301, - 44.6224586 - ], - [ - -124.0721219, - 44.6235124 - ], - [ - -124.0743761, - 44.624907 - ], - [ - -124.0762061, - 44.6265888 - ], - [ - -124.0775417, - 44.6284933 - ], - [ - -124.0783313, - 44.6305472 - ], - [ - -124.0785447, - 44.6326717 - ], - [ - -124.0784772, - 44.6344852 - ], - [ - -124.078106, - 44.6365985 - ], - [ - -124.0771645, - 44.6386196 - ], - [ - -124.0756887, - 44.6404706 - ], - [ - -124.0737354, - 44.6420805 - ], - [ - -124.0713796, - 44.6433874 - ], - [ - -124.0687119, - 44.644341 - ], - [ - -124.0658347, - 44.6449046 - ], - [ - -124.0628589, - 44.6450566 - ], - [ - -124.0598986, - 44.6447911 - ], - [ - -124.0570679, - 44.6441184 - ], - [ - -124.0544754, - 44.6430643 - ], - [ - -124.052221, - 44.6416693 - ], - [ - -124.0503911, - 44.6399871 - ], - [ - -124.0490562, - 44.6380823 - ], - [ - -124.0482675, - 44.6360282 - ], - [ - -124.0480552, - 44.6339036 - ], - [ - -124.0481237, - 44.6320902 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16043_s_16044", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0481668, - 44.6308284 - ], - [ - -124.048168, - 44.6307956 - ], - [ - -124.0482447, - 44.6288403 - ], - [ - -124.0486201, - 44.6267273 - ], - [ - -124.0495654, - 44.6247072 - ], - [ - -124.0510444, - 44.6228576 - ], - [ - -124.053, - 44.6212495 - ], - [ - -124.0553573, - 44.6199448 - ], - [ - -124.0580256, - 44.6189936 - ], - [ - -124.0609023, - 44.6184323 - ], - [ - -124.0638771, - 44.6182826 - ], - [ - -124.0668356, - 44.6185503 - ], - [ - -124.0696642, - 44.6192249 - ], - [ - -124.0722543, - 44.6202806 - ], - [ - -124.0745063, - 44.6216769 - ], - [ - -124.0763338, - 44.6233601 - ], - [ - -124.0776664, - 44.6252656 - ], - [ - -124.078453, - 44.6273201 - ], - [ - -124.0786632, - 44.6294448 - ], - [ - -124.0785881, - 44.6313837 - ], - [ - -124.0785447, - 44.6326418 - ], - [ - -124.0781794, - 44.6347557 - ], - [ - -124.0772434, - 44.6367781 - ], - [ - -124.0757728, - 44.6386312 - ], - [ - -124.073824, - 44.6402438 - ], - [ - -124.0714718, - 44.641554 - ], - [ - -124.0688068, - 44.6425113 - ], - [ - -124.0659313, - 44.6430789 - ], - [ - -124.0629559, - 44.6432351 - ], - [ - -124.0599951, - 44.6429738 - ], - [ - -124.0571626, - 44.642305 - ], - [ - -124.0545673, - 44.6412545 - ], - [ - -124.0523091, - 44.6398627 - ], - [ - -124.0504747, - 44.638183 - ], - [ - -124.0491346, - 44.6362801 - ], - [ - -124.0483403, - 44.6342271 - ], - [ - -124.0481222, - 44.6321028 - ], - [ - -124.0481668, - 44.6308284 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16044_s_16045", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0491891, - 44.6328754 - ], - [ - -124.0480949, - 44.6311714 - ], - [ - -124.0474046, - 44.6290992 - ], - [ - -124.0472937, - 44.6269708 - ], - [ - -124.0477664, - 44.6248678 - ], - [ - -124.0488044, - 44.622871 - ], - [ - -124.0503679, - 44.6210572 - ], - [ - -124.0523966, - 44.6194961 - ], - [ - -124.0548128, - 44.6182476 - ], - [ - -124.0575234, - 44.6173597 - ], - [ - -124.0604244, - 44.6168665 - ], - [ - -124.0634044, - 44.6167869 - ], - [ - -124.0663488, - 44.617124 - ], - [ - -124.0691447, - 44.6178648 - ], - [ - -124.0701641, - 44.6182196 - ], - [ - -124.0726332, - 44.6192975 - ], - [ - -124.0747719, - 44.6206898 - ], - [ - -124.0765029, - 44.6223462 - ], - [ - -124.0777634, - 44.6242066 - ], - [ - -124.078508, - 44.6262039 - ], - [ - -124.0787095, - 44.6282657 - ], - [ - -124.0786678, - 44.6294269 - ], - [ - -124.0782996, - 44.6315405 - ], - [ - -124.077361, - 44.6335623 - ], - [ - -124.075888, - 44.6354144 - ], - [ - -124.0739371, - 44.6370257 - ], - [ - -124.0715833, - 44.6383342 - ], - [ - -124.0689171, - 44.6392897 - ], - [ - -124.066041, - 44.6398553 - ], - [ - -124.0630656, - 44.6400094 - ], - [ - -124.0601053, - 44.6397461 - ], - [ - -124.0572738, - 44.6390754 - ], - [ - -124.0546802, - 44.6380231 - ], - [ - -124.052424, - 44.6366297 - ], - [ - -124.0505919, - 44.6349488 - ], - [ - -124.0492545, - 44.633045 - ], - [ - -124.0491891, - 44.6328754 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16045_s_15942", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0736143, - 44.6202666 - ], - [ - -124.0739567, - 44.6204973 - ], - [ - -124.0756854, - 44.6222329 - ], - [ - -124.0769069, - 44.624176 - ], - [ - -124.0775742, - 44.6262519 - ], - [ - -124.0776615, - 44.6283809 - ], - [ - -124.0771655, - 44.6304812 - ], - [ - -124.0761052, - 44.632472 - ], - [ - -124.0745213, - 44.6342768 - ], - [ - -124.0724746, - 44.6358263 - ], - [ - -124.0700437, - 44.6370608 - ], - [ - -124.0673222, - 44.637933 - ], - [ - -124.0644146, - 44.6384092 - ], - [ - -124.0614327, - 44.6384712 - ], - [ - -124.0584912, - 44.6381166 - ], - [ - -124.0557031, - 44.637359 - ], - [ - -124.0546701, - 44.6369919 - ], - [ - -124.052078, - 44.6358244 - ], - [ - -124.0498662, - 44.6343097 - ], - [ - -124.0481244, - 44.6325093 - ], - [ - -124.0476683, - 44.6317448 - ], - [ - -124.0476505, - 44.6317312 - ], - [ - -124.0473568, - 44.6314996 - ], - [ - -124.0468688, - 44.6311036 - ], - [ - -124.0467273, - 44.6309871 - ], - [ - -124.0460663, - 44.630435 - ], - [ - -124.0460178, - 44.6303942 - ], - [ - -124.0438579, - 44.628572 - ], - [ - -124.0435653, - 44.6283174 - ], - [ - -124.0426883, - 44.6275303 - ], - [ - -124.042586, - 44.6274375 - ], - [ - -124.0417161, - 44.626639 - ], - [ - -124.0404163, - 44.6254485 - ], - [ - -124.04027, - 44.6253123 - ], - [ - -124.040047, - 44.6251013 - ], - [ - -124.0395863, - 44.6246408 - ], - [ - -124.0393913, - 44.6244348 - ], - [ - -124.039149, - 44.6241706 - ], - [ - -124.0389421, - 44.6239375 - ], - [ - -124.0386247, - 44.6235638 - ], - [ - -124.0384097, - 44.6232988 - ], - [ - -124.0380085, - 44.6227709 - ], - [ - -124.0378215, - 44.6225079 - ], - [ - -124.037763, - 44.6224247 - ], - [ - -124.037486, - 44.6220266 - ], - [ - -124.0370026, - 44.6212583 - ], - [ - -124.0368272, - 44.6209481 - ], - [ - -124.036626, - 44.6205959 - ], - [ - -124.0362979, - 44.6199663 - ], - [ - -124.0361589, - 44.6196723 - ], - [ - -124.0358421, - 44.6189109 - ], - [ - -124.0357301, - 44.6186009 - ], - [ - -124.0355901, - 44.6181782 - ], - [ - -124.0355061, - 44.6179002 - ], - [ - -124.0354282, - 44.6176249 - ], - [ - -124.0352914, - 44.6171069 - ], - [ - -124.0351708, - 44.61658 - ], - [ - -124.0351019, - 44.616224 - ], - [ - -124.035084, - 44.6161312 - ], - [ - -124.034944, - 44.6148416 - ], - [ - -124.0349413, - 44.6147336 - ], - [ - -124.0349327, - 44.6144235 - ], - [ - -124.03493, - 44.6141416 - ], - [ - -124.0349321, - 44.6139006 - ], - [ - -124.0349322, - 44.6138881 - ], - [ - -124.0349332, - 44.6137871 - ], - [ - -124.034942, - 44.6134892 - ], - [ - -124.034955, - 44.6132202 - ], - [ - -124.0349953, - 44.6127216 - ], - [ - -124.0350164, - 44.6125356 - ], - [ - -124.03503, - 44.6124223 - ], - [ - -124.0350541, - 44.6122343 - ], - [ - -124.0351627, - 44.6115948 - ], - [ - -124.0351828, - 44.6115004 - ], - [ - -124.0351966, - 44.6114301 - ], - [ - -124.0352321, - 44.6112599 - ], - [ - -124.0352411, - 44.6112189 - ], - [ - -124.0352776, - 44.6110607 - ], - [ - -124.0352906, - 44.6110067 - ], - [ - -124.0353199, - 44.6108889 - ], - [ - -124.035378, - 44.6106629 - ], - [ - -124.0355388, - 44.6101162 - ], - [ - -124.035685, - 44.6096762 - ], - [ - -124.0358904, - 44.609123 - ], - [ - -124.0360124, - 44.608826 - ], - [ - -124.0360291, - 44.6087856 - ], - [ - -124.0360441, - 44.6087496 - ], - [ - -124.0363141, - 44.6081635 - ], - [ - -124.0365242, - 44.6077475 - ], - [ - -124.036788, - 44.607262 - ], - [ - -124.036937, - 44.607006 - ], - [ - -124.0383464, - 44.6051291 - ], - [ - -124.0402412, - 44.6034846 - ], - [ - -124.0425485, - 44.6021357 - ], - [ - -124.0451797, - 44.6011343 - ], - [ - -124.0480338, - 44.6005188 - ], - [ - -124.051001, - 44.6003129 - ], - [ - -124.0539675, - 44.6005244 - ], - [ - -124.0568193, - 44.6011452 - ], - [ - -124.0594468, - 44.6021516 - ], - [ - -124.0617491, - 44.6035048 - ], - [ - -124.0636378, - 44.6051528 - ], - [ - -124.0650403, - 44.6070324 - ], - [ - -124.0659025, - 44.6090714 - ], - [ - -124.0661914, - 44.6111913 - ], - [ - -124.0658958, - 44.6133107 - ], - [ - -124.0658538, - 44.6134092 - ], - [ - -124.0665464, - 44.6140447 - ], - [ - -124.0672283, - 44.6146565 - ], - [ - -124.0692152, - 44.6163322 - ], - [ - -124.0697817, - 44.6168052 - ], - [ - -124.0700538, - 44.617026 - ], - [ - -124.0704556, - 44.6173337 - ], - [ - -124.0705579, - 44.6174128 - ], - [ - -124.0706859, - 44.6175128 - ], - [ - -124.071036, - 44.6178 - ], - [ - -124.0710361, - 44.6178 - ], - [ - -124.0713941, - 44.6180929 - ], - [ - -124.0717, - 44.6183513 - ], - [ - -124.071895, - 44.6185212 - ], - [ - -124.0725703, - 44.619156 - ], - [ - -124.0728944, - 44.619485 - ], - [ - -124.0730262, - 44.6196211 - ], - [ - -124.0731282, - 44.619728 - ], - [ - -124.0733403, - 44.6200014 - ], - [ - -124.0733662, - 44.6199895 - ], - [ - -124.0736043, - 44.6202545 - ], - [ - -124.0736143, - 44.6202666 - ] - ], - [ - [ - -124.0652084, - 44.6149227 - ], - [ - -124.0651462, - 44.6150686 - ], - [ - -124.0651514, - 44.6150699 - ], - [ - -124.0651939, - 44.6149664 - ], - [ - -124.0652084, - 44.6149227 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16047_s_15967", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0678216, - 44.6110737 - ], - [ - -124.0677922, - 44.6111179 - ], - [ - -124.0675607, - 44.6114647 - ], - [ - -124.0673163, - 44.6118569 - ], - [ - -124.0671853, - 44.6120614 - ], - [ - -124.0668403, - 44.6125855 - ], - [ - -124.0667793, - 44.6126772 - ], - [ - -124.0659421, - 44.6139188 - ], - [ - -124.0656689, - 44.614342 - ], - [ - -124.0654233, - 44.614723 - ], - [ - -124.0653, - 44.6149178 - ], - [ - -124.0651709, - 44.6151229 - ], - [ - -124.0651614, - 44.6151379 - ], - [ - -124.0650859, - 44.6152574 - ], - [ - -124.0645112, - 44.6168547 - ], - [ - -124.0632197, - 44.6187745 - ], - [ - -124.0614286, - 44.6204775 - ], - [ - -124.0592066, - 44.6218981 - ], - [ - -124.0566391, - 44.6229818 - ], - [ - -124.0538248, - 44.6236868 - ], - [ - -124.050872, - 44.6239862 - ], - [ - -124.0478942, - 44.6238683 - ], - [ - -124.0450058, - 44.6233377 - ], - [ - -124.0423179, - 44.6224148 - ], - [ - -124.0399339, - 44.6211351 - ], - [ - -124.0379454, - 44.6195477 - ], - [ - -124.0364288, - 44.6177138 - ], - [ - -124.0354423, - 44.6157038 - ], - [ - -124.0350238, - 44.6135949 - ], - [ - -124.0351824, - 44.6115582 - ], - [ - -124.0351716, - 44.6115571 - ], - [ - -124.0351966, - 44.6114301 - ], - [ - -124.0352321, - 44.6112599 - ], - [ - -124.0352411, - 44.6112189 - ], - [ - -124.0352776, - 44.6110607 - ], - [ - -124.0352906, - 44.6110067 - ], - [ - -124.0353199, - 44.6108889 - ], - [ - -124.035378, - 44.6106629 - ], - [ - -124.0355388, - 44.6101162 - ], - [ - -124.035685, - 44.6096762 - ], - [ - -124.0358904, - 44.609123 - ], - [ - -124.0360124, - 44.608826 - ], - [ - -124.0360291, - 44.6087856 - ], - [ - -124.0360441, - 44.6087496 - ], - [ - -124.0363141, - 44.6081635 - ], - [ - -124.0365242, - 44.6077475 - ], - [ - -124.0367802, - 44.6072754 - ], - [ - -124.0369872, - 44.6069185 - ], - [ - -124.0371727, - 44.6066121 - ], - [ - -124.0372667, - 44.6064632 - ], - [ - -124.0374319, - 44.6062019 - ], - [ - -124.0375632, - 44.6059934 - ], - [ - -124.037577, - 44.6059716 - ], - [ - -124.0377291, - 44.6057317 - ], - [ - -124.037773, - 44.605663 - ], - [ - -124.0380421, - 44.605246 - ], - [ - -124.0383724, - 44.6047346 - ], - [ - -124.0384817, - 44.604569 - ], - [ - -124.0393441, - 44.6032909 - ], - [ - -124.0395919, - 44.6029147 - ], - [ - -124.0398539, - 44.6024944 - ], - [ - -124.0400219, - 44.6022344 - ], - [ - -124.0403252, - 44.6017805 - ], - [ - -124.0424532, - 44.5985589 - ], - [ - -124.0439835, - 44.596731 - ], - [ - -124.0459835, - 44.5951515 - ], - [ - -124.0483761, - 44.5938812 - ], - [ - -124.0510696, - 44.5929686 - ], - [ - -124.0539603, - 44.5924491 - ], - [ - -124.0569374, - 44.5923424 - ], - [ - -124.0598864, - 44.5926527 - ], - [ - -124.0626941, - 44.593368 - ], - [ - -124.0652526, - 44.594461 - ], - [ - -124.0674637, - 44.5958895 - ], - [ - -124.0692423, - 44.5975988 - ], - [ - -124.0705201, - 44.5995232 - ], - [ - -124.071248, - 44.6015886 - ], - [ - -124.0713979, - 44.6037159 - ], - [ - -124.070964, - 44.6058231 - ], - [ - -124.069963, - 44.6078294 - ], - [ - -124.0678216, - 44.6110737 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16048_s_16051", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0649951, - 44.6193512 - ], - [ - -124.0649018, - 44.6208676 - ], - [ - -124.0641589, - 44.6229868 - ], - [ - -124.0628374, - 44.6249571 - ], - [ - -124.061665, - 44.6260626 - ], - [ - -124.0611702, - 44.6278726 - ], - [ - -124.061134, - 44.6279604 - ], - [ - -124.0600778, - 44.6298465 - ], - [ - -124.0585483, - 44.6315592 - ], - [ - -124.0565991, - 44.6330386 - ], - [ - -124.0542982, - 44.6342331 - ], - [ - -124.051726, - 44.6351008 - ], - [ - -124.0515664, - 44.6351421 - ], - [ - -124.0485703, - 44.6356794 - ], - [ - -124.045484, - 44.6357734 - ], - [ - -124.0424347, - 44.6354204 - ], - [ - -124.0395482, - 44.6346349 - ], - [ - -124.0369434, - 44.6334492 - ], - [ - -124.0347277, - 44.6319123 - ], - [ - -124.0346496, - 44.6318459 - ], - [ - -124.0327941, - 44.6298585 - ], - [ - -124.0315916, - 44.6276297 - ], - [ - -124.0311002, - 44.6252671 - ], - [ - -124.0313435, - 44.6228849 - ], - [ - -124.0313696, - 44.6227842 - ], - [ - -124.0313715, - 44.6227799 - ], - [ - -124.0313365, - 44.6222308 - ], - [ - -124.0320418, - 44.6196769 - ], - [ - -124.0320865, - 44.6195789 - ], - [ - -124.0325994, - 44.618772 - ], - [ - -124.0323029, - 44.6179234 - ], - [ - -124.0322839, - 44.6178454 - ], - [ - -124.0320606, - 44.616128 - ], - [ - -124.0320586, - 44.616021 - ], - [ - -124.0322423, - 44.6141887 - ], - [ - -124.03228, - 44.6140176 - ], - [ - -124.0314436, - 44.6129746 - ], - [ - -124.0313876, - 44.6128916 - ], - [ - -124.0306443, - 44.6115762 - ], - [ - -124.0306023, - 44.6114852 - ], - [ - -124.0303956, - 44.6109991 - ], - [ - -124.0303566, - 44.610899 - ], - [ - -124.030045, - 44.6097083 - ], - [ - -124.0300433, - 44.6097062 - ], - [ - -124.0293793, - 44.6087634 - ], - [ - -124.0293153, - 44.6086604 - ], - [ - -124.0282997, - 44.6063705 - ], - [ - -124.0282677, - 44.6062555 - ], - [ - -124.028057, - 44.6052568 - ], - [ - -124.0280381, - 44.6051258 - ], - [ - -124.0279648, - 44.6043483 - ], - [ - -124.0279469, - 44.6039403 - ], - [ - -124.0281577, - 44.6017659 - ], - [ - -124.0289717, - 44.5996654 - ], - [ - -124.0303559, - 44.5977232 - ], - [ - -124.0322548, - 44.5960174 - ], - [ - -124.0345919, - 44.5946167 - ], - [ - -124.0372731, - 44.5935774 - ], - [ - -124.0401905, - 44.5929413 - ], - [ - -124.0404309, - 44.5929249 - ], - [ - -124.0410033, - 44.5927277 - ], - [ - -124.0438508, - 44.5921964 - ], - [ - -124.046788, - 44.5920669 - ], - [ - -124.0497052, - 44.5923441 - ], - [ - -124.0497645, - 44.592354 - ], - [ - -124.0523026, - 44.5929491 - ], - [ - -124.0546559, - 44.5938523 - ], - [ - -124.0567518, - 44.5950358 - ], - [ - -124.0585256, - 44.5964631 - ], - [ - -124.058599, - 44.5965339 - ], - [ - -124.0601318, - 44.5983608 - ], - [ - -124.0611363, - 44.6003662 - ], - [ - -124.0614463, - 44.6018586 - ], - [ - -124.0631783, - 44.6034787 - ], - [ - -124.0644691, - 44.6053335 - ], - [ - -124.0652437, - 44.6073296 - ], - [ - -124.065474, - 44.6093945 - ], - [ - -124.0654473, - 44.6105885 - ], - [ - -124.0654407, - 44.6107795 - ], - [ - -124.0654379, - 44.6108379 - ], - [ - -124.0654642, - 44.6112186 - ], - [ - -124.0653452, - 44.6132103 - ], - [ - -124.0647187, - 44.6151529 - ], - [ - -124.0647095, - 44.615168 - ], - [ - -124.064936, - 44.6159318 - ], - [ - -124.0649601, - 44.6160738 - ], - [ - -124.0650562, - 44.6169139 - ], - [ - -124.0650652, - 44.6170649 - ], - [ - -124.0650778, - 44.6176703 - ], - [ - -124.0650728, - 44.6179433 - ], - [ - -124.0650729, - 44.6179503 - ], - [ - -124.0650724, - 44.6181337 - ], - [ - -124.0650547, - 44.6193517 - ], - [ - -124.0649951, - 44.6193512 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16048_s_2438934", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0613255, - 44.6017734 - ], - [ - -124.0614184, - 44.6018325 - ], - [ - -124.0631783, - 44.6034787 - ], - [ - -124.0644691, - 44.6053335 - ], - [ - -124.0652437, - 44.6073296 - ], - [ - -124.065474, - 44.6093945 - ], - [ - -124.0654473, - 44.6105885 - ], - [ - -124.0654407, - 44.6107795 - ], - [ - -124.065438, - 44.6108357 - ], - [ - -124.0654643, - 44.611214 - ], - [ - -124.0653357, - 44.6132613 - ], - [ - -124.0646712, - 44.615255 - ], - [ - -124.0634943, - 44.617124 - ], - [ - -124.0618468, - 44.6188019 - ], - [ - -124.0617959, - 44.6188446 - ], - [ - -124.0596479, - 44.620322 - ], - [ - -124.0571374, - 44.6214718 - ], - [ - -124.0543611, - 44.6222495 - ], - [ - -124.0514255, - 44.6226255 - ], - [ - -124.0484437, - 44.6225851 - ], - [ - -124.0455302, - 44.62213 - ], - [ - -124.0427972, - 44.6212776 - ], - [ - -124.0403495, - 44.6200607 - ], - [ - -124.0382814, - 44.6185262 - ], - [ - -124.0376641, - 44.6178381 - ], - [ - -124.0375264, - 44.6177817 - ], - [ - -124.0373204, - 44.6176857 - ], - [ - -124.0366794, - 44.61737 - ], - [ - -124.0365044, - 44.6172789 - ], - [ - -124.0361006, - 44.6170615 - ], - [ - -124.0359696, - 44.6169885 - ], - [ - -124.0340298, - 44.6156982 - ], - [ - -124.0339288, - 44.6156182 - ], - [ - -124.0325986, - 44.6144005 - ], - [ - -124.0325196, - 44.6143164 - ], - [ - -124.0314436, - 44.6129746 - ], - [ - -124.0313876, - 44.6128916 - ], - [ - -124.0306443, - 44.6115762 - ], - [ - -124.0306023, - 44.6114852 - ], - [ - -124.0303956, - 44.6109991 - ], - [ - -124.0303566, - 44.610899 - ], - [ - -124.030045, - 44.6097083 - ], - [ - -124.0300433, - 44.6097062 - ], - [ - -124.0293793, - 44.6087634 - ], - [ - -124.0293153, - 44.6086604 - ], - [ - -124.0282997, - 44.6063705 - ], - [ - -124.0282677, - 44.6062555 - ], - [ - -124.028057, - 44.6052568 - ], - [ - -124.0280381, - 44.6051258 - ], - [ - -124.0279648, - 44.6043483 - ], - [ - -124.0279469, - 44.6039403 - ], - [ - -124.0281577, - 44.6017659 - ], - [ - -124.0289717, - 44.5996654 - ], - [ - -124.0303559, - 44.5977232 - ], - [ - -124.0322548, - 44.5960174 - ], - [ - -124.0345919, - 44.5946167 - ], - [ - -124.0372731, - 44.5935774 - ], - [ - -124.0401905, - 44.5929413 - ], - [ - -124.041924, - 44.5928229 - ], - [ - -124.0442617, - 44.5924353 - ], - [ - -124.0470883, - 44.5923509 - ], - [ - -124.0498878, - 44.5926421 - ], - [ - -124.0525635, - 44.5932987 - ], - [ - -124.0550227, - 44.5942981 - ], - [ - -124.0571803, - 44.5956056 - ], - [ - -124.0589617, - 44.5971761 - ], - [ - -124.0603052, - 44.5989551 - ], - [ - -124.0603202, - 44.5989804 - ], - [ - -124.0612111, - 44.601013 - ], - [ - -124.0613255, - 44.6017734 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16049_s_16050", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0618887, - 44.6126296 - ], - [ - -124.0626157, - 44.6136329 - ], - [ - -124.0634308, - 44.6155846 - ], - [ - -124.0634808, - 44.6157646 - ], - [ - -124.0637722, - 44.6178843 - ], - [ - -124.063479, - 44.620004 - ], - [ - -124.0626124, - 44.622042 - ], - [ - -124.0612056, - 44.6239201 - ], - [ - -124.0593128, - 44.6255661 - ], - [ - -124.0570065, - 44.6269167 - ], - [ - -124.0543755, - 44.62792 - ], - [ - -124.051521, - 44.6285374 - ], - [ - -124.0485525, - 44.6287451 - ], - [ - -124.0455844, - 44.6285353 - ], - [ - -124.0427306, - 44.6279159 - ], - [ - -124.040101, - 44.6269107 - ], - [ - -124.0377966, - 44.6255585 - ], - [ - -124.035906, - 44.6239112 - ], - [ - -124.0357345, - 44.6236817 - ], - [ - -124.0351013, - 44.623156 - ], - [ - -124.0349613, - 44.623006 - ], - [ - -124.0335675, - 44.6211415 - ], - [ - -124.0333876, - 44.6208314 - ], - [ - -124.0324389, - 44.6184734 - ], - [ - -124.0324118, - 44.6181126 - ], - [ - -124.0322507, - 44.6176988 - ], - [ - -124.0321136, - 44.6151825 - ], - [ - -124.0321537, - 44.6148125 - ], - [ - -124.0326741, - 44.6127152 - ], - [ - -124.0337573, - 44.6107308 - ], - [ - -124.0353615, - 44.6089354 - ], - [ - -124.0374252, - 44.6073981 - ], - [ - -124.0398689, - 44.6061778 - ], - [ - -124.0425989, - 44.6053215 - ], - [ - -124.0455101, - 44.604862 - ], - [ - -124.0484909, - 44.6048171 - ], - [ - -124.0514267, - 44.6051884 - ], - [ - -124.0542048, - 44.6059616 - ], - [ - -124.0567184, - 44.6071071 - ], - [ - -124.058871, - 44.6085809 - ], - [ - -124.0605799, - 44.6103263 - ], - [ - -124.0617793, - 44.6122763 - ], - [ - -124.0618887, - 44.6126296 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16050_s_16051", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0636848, - 44.6190985 - ], - [ - -124.0634928, - 44.6197839 - ], - [ - -124.0634454, - 44.6209776 - ], - [ - -124.0628093, - 44.6230076 - ], - [ - -124.0621645, - 44.6240617 - ], - [ - -124.0618979, - 44.6248912 - ], - [ - -124.0618643, - 44.6248857 - ], - [ - -124.0617623, - 44.6251826 - ], - [ - -124.0617607, - 44.6251918 - ], - [ - -124.0617135, - 44.6255895 - ], - [ - -124.061691, - 44.6256767 - ], - [ - -124.0615259, - 44.6269558 - ], - [ - -124.0605143, - 44.6292095 - ], - [ - -124.0604569, - 44.6293014 - ], - [ - -124.058809, - 44.6313228 - ], - [ - -124.0565934, - 44.6330455 - ], - [ - -124.0539126, - 44.6343896 - ], - [ - -124.0537966, - 44.6344353 - ], - [ - -124.0508452, - 44.6353235 - ], - [ - -124.0476988, - 44.6357508 - ], - [ - -124.0444967, - 44.6356983 - ], - [ - -124.041381, - 44.6351683 - ], - [ - -124.0384898, - 44.6341844 - ], - [ - -124.0383654, - 44.6341299 - ], - [ - -124.0359471, - 44.6328165 - ], - [ - -124.0339425, - 44.6311862 - ], - [ - -124.0324317, - 44.6293039 - ], - [ - -124.0314747, - 44.6272448 - ], - [ - -124.0311097, - 44.625091 - ], - [ - -124.0313088, - 44.6233079 - ], - [ - -124.0312924, - 44.6231946 - ], - [ - -124.0315146, - 44.6212155 - ], - [ - -124.0315399, - 44.6211111 - ], - [ - -124.0323104, - 44.6191029 - ], - [ - -124.0326776, - 44.6185727 - ], - [ - -124.0330317, - 44.6168168 - ], - [ - -124.0332619, - 44.6161669 - ], - [ - -124.0340013, - 44.6145948 - ], - [ - -124.0344224, - 44.6140127 - ], - [ - -124.0350115, - 44.6129402 - ], - [ - -124.0366211, - 44.6111472 - ], - [ - -124.0386894, - 44.609613 - ], - [ - -124.0411369, - 44.6083965 - ], - [ - -124.0438695, - 44.6075443 - ], - [ - -124.0467822, - 44.6070893 - ], - [ - -124.0497632, - 44.6070489 - ], - [ - -124.052698, - 44.6074246 - ], - [ - -124.0554739, - 44.6082021 - ], - [ - -124.0579842, - 44.6093514 - ], - [ - -124.0601325, - 44.6108285 - ], - [ - -124.0618362, - 44.6125765 - ], - [ - -124.0630299, - 44.6145283 - ], - [ - -124.0636676, - 44.616609 - ], - [ - -124.0637247, - 44.6187385 - ], - [ - -124.0636848, - 44.6190985 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16051_s_16052", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0619783, - 44.6247775 - ], - [ - -124.0617201, - 44.6258578 - ], - [ - -124.0608473, - 44.627615 - ], - [ - -124.0608436, - 44.6276198 - ], - [ - -124.0606802, - 44.6279771 - ], - [ - -124.0592192, - 44.629834 - ], - [ - -124.0572789, - 44.6314517 - ], - [ - -124.0549338, - 44.6327679 - ], - [ - -124.0522741, - 44.6337321 - ], - [ - -124.0494019, - 44.6343072 - ], - [ - -124.0464278, - 44.6344711 - ], - [ - -124.0434661, - 44.6342174 - ], - [ - -124.0406306, - 44.633556 - ], - [ - -124.0380304, - 44.6325122 - ], - [ - -124.0357655, - 44.6311262 - ], - [ - -124.0339228, - 44.6294513 - ], - [ - -124.0325733, - 44.6275519 - ], - [ - -124.0317686, - 44.6255009 - ], - [ - -124.0315398, - 44.6233773 - ], - [ - -124.031543, - 44.6232678 - ], - [ - -124.0318236, - 44.6214103 - ], - [ - -124.0318375, - 44.6213596 - ], - [ - -124.0320685, - 44.6206943 - ], - [ - -124.0322689, - 44.6200604 - ], - [ - -124.0322574, - 44.6200586 - ], - [ - -124.0326955, - 44.6186204 - ], - [ - -124.0335559, - 44.6166869 - ], - [ - -124.0349045, - 44.6149014 - ], - [ - -124.0366942, - 44.613326 - ], - [ - -124.0388627, - 44.6120158 - ], - [ - -124.0413343, - 44.6110163 - ], - [ - -124.0440228, - 44.6103623 - ], - [ - -124.0468346, - 44.6100768 - ], - [ - -124.0496718, - 44.6101695 - ], - [ - -124.0498857, - 44.6101909 - ], - [ - -124.0527838, - 44.6106918 - ], - [ - -124.0554895, - 44.6115868 - ], - [ - -124.0578989, - 44.6128417 - ], - [ - -124.0599194, - 44.6144081 - ], - [ - -124.0614733, - 44.616226 - ], - [ - -124.0625009, - 44.6182255 - ], - [ - -124.0629627, - 44.6203298 - ], - [ - -124.0628408, - 44.6224579 - ], - [ - -124.0621399, - 44.6245282 - ], - [ - -124.0619783, - 44.6247775 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16052_s_16053", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0608657, - 44.6275684 - ], - [ - -124.0599291, - 44.6284534 - ], - [ - -124.0576069, - 44.6299083 - ], - [ - -124.0549209, - 44.6309982 - ], - [ - -124.0519819, - 44.6316782 - ], - [ - -124.0489111, - 44.6319201 - ], - [ - -124.0458352, - 44.6317141 - ], - [ - -124.0452487, - 44.6316312 - ], - [ - -124.0448395, - 44.6316044 - ], - [ - -124.0419795, - 44.6309996 - ], - [ - -124.0393398, - 44.6300078 - ], - [ - -124.0370218, - 44.6286674 - ], - [ - -124.0351148, - 44.6270297 - ], - [ - -124.0336918, - 44.6251578 - ], - [ - -124.0328076, - 44.6231236 - ], - [ - -124.0324962, - 44.6210053 - ], - [ - -124.0327694, - 44.6188843 - ], - [ - -124.0336166, - 44.6168422 - ], - [ - -124.0350053, - 44.6149573 - ], - [ - -124.035904, - 44.6141646 - ], - [ - -124.0364907, - 44.6134699 - ], - [ - -124.0372937, - 44.6128693 - ], - [ - -124.0380092, - 44.6121879 - ], - [ - -124.0404627, - 44.6106708 - ], - [ - -124.0413423, - 44.6103277 - ], - [ - -124.0414181, - 44.6102829 - ], - [ - -124.0433004, - 44.6095639 - ], - [ - -124.0433108, - 44.6095599 - ], - [ - -124.0433113, - 44.6095598 - ], - [ - -124.0440933, - 44.6092611 - ], - [ - -124.0469991, - 44.6086387 - ], - [ - -124.0500199, - 44.6084406 - ], - [ - -124.0512086, - 44.6084476 - ], - [ - -124.0541733, - 44.6086739 - ], - [ - -124.0570193, - 44.609309 - ], - [ - -124.0596373, - 44.6103284 - ], - [ - -124.0619267, - 44.6116931 - ], - [ - -124.0637995, - 44.6133505 - ], - [ - -124.0651837, - 44.615237 - ], - [ - -124.0660262, - 44.6172802 - ], - [ - -124.0662944, - 44.6194015 - ], - [ - -124.065978, - 44.6215194 - ], - [ - -124.0650891, - 44.6235526 - ], - [ - -124.0636619, - 44.6254228 - ], - [ - -124.061751, - 44.6270581 - ], - [ - -124.0608657, - 44.6275684 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16053_s_833259", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0731476, - 44.6200518 - ], - [ - -124.0740771, - 44.6214954 - ], - [ - -124.0741072, - 44.6215554 - ], - [ - -124.0748871, - 44.6239249 - ], - [ - -124.0748971, - 44.6239849 - ], - [ - -124.0748978, - 44.6265531 - ], - [ - -124.0748878, - 44.6266131 - ], - [ - -124.0743782, - 44.6283911 - ], - [ - -124.0734612, - 44.6300837 - ], - [ - -124.0721624, - 44.6316437 - ], - [ - -124.0720924, - 44.6317137 - ], - [ - -124.0700374, - 44.6333789 - ], - [ - -124.0675513, - 44.6347111 - ], - [ - -124.0672214, - 44.6348218 - ], - [ - -124.0661644, - 44.6354868 - ], - [ - -124.0635845, - 44.636556 - ], - [ - -124.060762, - 44.6372452 - ], - [ - -124.0578052, - 44.637528 - ], - [ - -124.0548281, - 44.6373934 - ], - [ - -124.051945, - 44.6368466 - ], - [ - -124.0492667, - 44.6359087 - ], - [ - -124.0468963, - 44.6346156 - ], - [ - -124.0449249, - 44.6330172 - ], - [ - -124.0434281, - 44.6311748 - ], - [ - -124.0424636, - 44.6291593 - ], - [ - -124.0422718, - 44.6281355 - ], - [ - -124.0403216, - 44.6269923 - ], - [ - -124.0384298, - 44.6253456 - ], - [ - -124.0370244, - 44.623467 - ], - [ - -124.0361592, - 44.6214286 - ], - [ - -124.0359469, - 44.6198862 - ], - [ - -124.0356342, - 44.6187833 - ], - [ - -124.0356242, - 44.6187233 - ], - [ - -124.035614, - 44.6162218 - ], - [ - -124.0364049, - 44.6137849 - ], - [ - -124.0364449, - 44.6137049 - ], - [ - -124.0378185, - 44.6116617 - ], - [ - -124.0397555, - 44.6098665 - ], - [ - -124.0398355, - 44.6098065 - ], - [ - -124.0430986, - 44.6079515 - ], - [ - -124.0433585, - 44.6078415 - ], - [ - -124.0461883, - 44.6069093 - ], - [ - -124.0492246, - 44.6064086 - ], - [ - -124.05234, - 44.6063604 - ], - [ - -124.0554038, - 44.6067667 - ], - [ - -124.0582874, - 44.6076105 - ], - [ - -124.0608699, - 44.6088563 - ], - [ - -124.0630428, - 44.610452 - ], - [ - -124.0647151, - 44.6123304 - ], - [ - -124.0647906, - 44.6124383 - ], - [ - -124.0656775, - 44.6132438 - ], - [ - -124.065789, - 44.6133463 - ], - [ - -124.0665486, - 44.6140534 - ], - [ - -124.0671961, - 44.6146272 - ], - [ - -124.0692341, - 44.6163441 - ], - [ - -124.0692681, - 44.6163728 - ], - [ - -124.069773, - 44.6168012 - ], - [ - -124.0699975, - 44.6169799 - ], - [ - -124.0704404, - 44.6173181 - ], - [ - -124.0704783, - 44.617347 - ], - [ - -124.0706083, - 44.617447 - ], - [ - -124.0714225, - 44.6181275 - ], - [ - -124.0715325, - 44.6182275 - ], - [ - -124.0723991, - 44.619184 - ], - [ - -124.0729609, - 44.6197619 - ], - [ - -124.0730661, - 44.6199252 - ], - [ - -124.0731565, - 44.6200485 - ], - [ - -124.0731476, - 44.6200518 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16055_s_16057", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0662313, - 44.6220995 - ], - [ - -124.0662611, - 44.6221097 - ], - [ - -124.0686484, - 44.6233862 - ], - [ - -124.0706413, - 44.6249709 - ], - [ - -124.072163, - 44.6268027 - ], - [ - -124.0731552, - 44.6288113 - ], - [ - -124.0735796, - 44.6309196 - ], - [ - -124.0734198, - 44.6330465 - ], - [ - -124.072682, - 44.6351102 - ], - [ - -124.0713945, - 44.6370315 - ], - [ - -124.0696066, - 44.6387365 - ], - [ - -124.0673871, - 44.6401597 - ], - [ - -124.0663427, - 44.6407075 - ], - [ - -124.0651604, - 44.6413362 - ], - [ - -124.0625777, - 44.642444 - ], - [ - -124.0597398, - 44.6431667 - ], - [ - -124.056758, - 44.6434761 - ], - [ - -124.0537493, - 44.6433599 - ], - [ - -124.0508317, - 44.6428228 - ], - [ - -124.0481196, - 44.6418857 - ], - [ - -124.0457193, - 44.6405855 - ], - [ - -124.0437249, - 44.6389732 - ], - [ - -124.0432108, - 44.6384636 - ], - [ - -124.0415931, - 44.636429 - ], - [ - -124.0415026, - 44.6362798 - ], - [ - -124.0407008, - 44.634587 - ], - [ - -124.0406605, - 44.6344714 - ], - [ - -124.0406015, - 44.6342234 - ], - [ - -124.0402818, - 44.6338128 - ], - [ - -124.039369, - 44.631785 - ], - [ - -124.0390278, - 44.6296691 - ], - [ - -124.0392712, - 44.6275462 - ], - [ - -124.0400899, - 44.6254981 - ], - [ - -124.0414522, - 44.6236033 - ], - [ - -124.0433059, - 44.6219348 - ], - [ - -124.0455796, - 44.6205565 - ], - [ - -124.0458526, - 44.6204216 - ], - [ - -124.0482684, - 44.6194467 - ], - [ - -124.0508918, - 44.6188014 - ], - [ - -124.0536357, - 44.6185071 - ], - [ - -124.0564087, - 44.6185736 - ], - [ - -124.0591188, - 44.6189986 - ], - [ - -124.0616758, - 44.6197681 - ], - [ - -124.0626156, - 44.6201262 - ], - [ - -124.0649121, - 44.6212018 - ], - [ - -124.0662313, - 44.6220995 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16057_s_16058", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0613496, - 44.6392548 - ], - [ - -124.058789, - 44.6403477 - ], - [ - -124.0559789, - 44.6410628 - ], - [ - -124.0530273, - 44.6413727 - ], - [ - -124.0500478, - 44.6412654 - ], - [ - -124.0471549, - 44.6407452 - ], - [ - -124.0444598, - 44.6398319 - ], - [ - -124.0420661, - 44.6385607 - ], - [ - -124.0400659, - 44.6369805 - ], - [ - -124.038536, - 44.6351521 - ], - [ - -124.0375351, - 44.6331456 - ], - [ - -124.0371017, - 44.6310383 - ], - [ - -124.0372524, - 44.628911 - ], - [ - -124.0379814, - 44.6268457 - ], - [ - -124.0392605, - 44.6249216 - ], - [ - -124.0410405, - 44.6232126 - ], - [ - -124.0432531, - 44.6217844 - ], - [ - -124.045203, - 44.6207546 - ], - [ - -124.047763, - 44.6196621 - ], - [ - -124.0505722, - 44.6189471 - ], - [ - -124.0535226, - 44.6186373 - ], - [ - -124.056501, - 44.6187445 - ], - [ - -124.0593929, - 44.6192645 - ], - [ - -124.0620873, - 44.6201774 - ], - [ - -124.0644806, - 44.6214482 - ], - [ - -124.066481, - 44.623028 - ], - [ - -124.0680114, - 44.6248561 - ], - [ - -124.0690132, - 44.6268623 - ], - [ - -124.0694477, - 44.6289695 - ], - [ - -124.0692981, - 44.6310967 - ], - [ - -124.0685703, - 44.6331622 - ], - [ - -124.067292, - 44.6350867 - ], - [ - -124.0655123, - 44.6367961 - ], - [ - -124.0632998, - 44.6382247 - ], - [ - -124.0613496, - 44.6392548 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16058_s_16059", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0602245, - 44.6398517 - ], - [ - -124.0586435, - 44.6405863 - ], - [ - -124.0571333, - 44.6411964 - ], - [ - -124.0565657, - 44.6414146 - ], - [ - -124.0544554, - 44.6421847 - ], - [ - -124.0509893, - 44.6430906 - ], - [ - -124.0505092, - 44.6431707 - ], - [ - -124.0481688, - 44.6434257 - ], - [ - -124.0477887, - 44.6434457 - ], - [ - -124.0451544, - 44.6434211 - ], - [ - -124.0425654, - 44.6430724 - ], - [ - -124.0415153, - 44.6428624 - ], - [ - -124.0402213, - 44.6425584 - ], - [ - -124.038191, - 44.6420083 - ], - [ - -124.0373768, - 44.6417682 - ], - [ - -124.0354665, - 44.6411581 - ], - [ - -124.0328758, - 44.6401019 - ], - [ - -124.0306237, - 44.6387051 - ], - [ - -124.0287965, - 44.6370214 - ], - [ - -124.0274647, - 44.6351156 - ], - [ - -124.0266792, - 44.6330608 - ], - [ - -124.0264703, - 44.6309361 - ], - [ - -124.0268458, - 44.6288231 - ], - [ - -124.0277914, - 44.626803 - ], - [ - -124.0292705, - 44.6249535 - ], - [ - -124.0312264, - 44.6233455 - ], - [ - -124.0335839, - 44.6220409 - ], - [ - -124.0362523, - 44.6210898 - ], - [ - -124.0391293, - 44.6205287 - ], - [ - -124.0421041, - 44.6203791 - ], - [ - -124.0450627, - 44.6206468 - ], - [ - -124.0456087, - 44.6207771 - ], - [ - -124.0457851, - 44.6207014 - ], - [ - -124.0485923, - 44.6199825 - ], - [ - -124.051542, - 44.6196684 - ], - [ - -124.0545207, - 44.6197713 - ], - [ - -124.0574141, - 44.6202871 - ], - [ - -124.0601111, - 44.6211962 - ], - [ - -124.0625081, - 44.6224635 - ], - [ - -124.0645129, - 44.6240404 - ], - [ - -124.0660486, - 44.6258662 - ], - [ - -124.067056, - 44.627871 - ], - [ - -124.0674964, - 44.6299776 - ], - [ - -124.0673529, - 44.632105 - ], - [ - -124.0666309, - 44.6341716 - ], - [ - -124.065358, - 44.6360979 - ], - [ - -124.0635832, - 44.6378098 - ], - [ - -124.0613746, - 44.6392416 - ], - [ - -124.0602245, - 44.6398517 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16059_s_16060", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0567008, - 44.6330008 - ], - [ - -124.0570686, - 44.6349951 - ], - [ - -124.0568736, - 44.6371204 - ], - [ - -124.0561016, - 44.6391778 - ], - [ - -124.0547822, - 44.6410881 - ], - [ - -124.0529661, - 44.6427779 - ], - [ - -124.050723, - 44.6441822 - ], - [ - -124.0481391, - 44.6452471 - ], - [ - -124.0453139, - 44.6459316 - ], - [ - -124.0423558, - 44.6462093 - ], - [ - -124.0393786, - 44.6460697 - ], - [ - -124.0364969, - 44.645518 - ], - [ - -124.0338214, - 44.6445756 - ], - [ - -124.0314549, - 44.6432785 - ], - [ - -124.0300049, - 44.6423084 - ], - [ - -124.0279376, - 44.6406048 - ], - [ - -124.0264073, - 44.6386333 - ], - [ - -124.0254798, - 44.6364788 - ], - [ - -124.0253998, - 44.6361888 - ], - [ - -124.0253011, - 44.6357917 - ], - [ - -124.0252611, - 44.6356117 - ], - [ - -124.0250921, - 44.6333746 - ], - [ - -124.0251122, - 44.6330846 - ], - [ - -124.0254313, - 44.6315217 - ], - [ - -124.0253755, - 44.6311834 - ], - [ - -124.0255935, - 44.6291057 - ], - [ - -124.0263627, - 44.627096 - ], - [ - -124.027655, - 44.6252281 - ], - [ - -124.0294226, - 44.6235706 - ], - [ - -124.0316007, - 44.6221845 - ], - [ - -124.034109, - 44.6211207 - ], - [ - -124.0368555, - 44.6204184 - ], - [ - -124.0397391, - 44.6201034 - ], - [ - -124.0426539, - 44.6201871 - ], - [ - -124.0454927, - 44.6206666 - ], - [ - -124.0459935, - 44.6207884 - ], - [ - -124.0465827, - 44.6209414 - ], - [ - -124.0471943, - 44.6211106 - ], - [ - -124.0498565, - 44.6220706 - ], - [ - -124.0522054, - 44.6233831 - ], - [ - -124.0541508, - 44.6249975 - ], - [ - -124.0556178, - 44.626852 - ], - [ - -124.0565501, - 44.6288752 - ], - [ - -124.0569118, - 44.6309894 - ], - [ - -124.0567008, - 44.6330008 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16060_s_15892", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.053444, - 44.6282726 - ], - [ - -124.0552692, - 44.6299046 - ], - [ - -124.0566236, - 44.6317557 - ], - [ - -124.0567213, - 44.6319278 - ], - [ - -124.0573253, - 44.6332185 - ], - [ - -124.0574262, - 44.6334894 - ], - [ - -124.0579155, - 44.6357038 - ], - [ - -124.057758, - 44.6379427 - ], - [ - -124.0569602, - 44.6401109 - ], - [ - -124.0555561, - 44.6421161 - ], - [ - -124.0536053, - 44.6438728 - ], - [ - -124.051191, - 44.6453063 - ], - [ - -124.0484159, - 44.6463554 - ], - [ - -124.0453981, - 44.6469755 - ], - [ - -124.0422663, - 44.6471403 - ], - [ - -124.0342948, - 44.6469702 - ], - [ - -124.0338635, - 44.6469567 - ], - [ - -124.0324232, - 44.6468967 - ], - [ - -124.0313211, - 44.6468219 - ], - [ - -124.0304709, - 44.6467419 - ], - [ - -124.0288717, - 44.6465288 - ], - [ - -124.0276015, - 44.6463087 - ], - [ - -124.0262034, - 44.6460153 - ], - [ - -124.0251532, - 44.6457552 - ], - [ - -124.0229115, - 44.6450512 - ], - [ - -124.0211104, - 44.6452416 - ], - [ - -124.0205503, - 44.6452616 - ], - [ - -124.0168448, - 44.6450697 - ], - [ - -124.0161346, - 44.6449697 - ], - [ - -124.0121574, - 44.6439859 - ], - [ - -124.0118985, - 44.6438915 - ], - [ - -124.0108663, - 44.6438188 - ], - [ - -124.0084075, - 44.6437319 - ], - [ - -124.0061329, - 44.643528 - ], - [ - -124.0054428, - 44.643428 - ], - [ - -124.0020326, - 44.6426251 - ], - [ - -124.0014025, - 44.6424151 - ], - [ - -123.9995839, - 44.6415894 - ], - [ - -123.9991493, - 44.6416819 - ], - [ - -123.9973133, - 44.641986 - ], - [ - -123.9963932, - 44.642096 - ], - [ - -123.9932923, - 44.6422371 - ], - [ - -123.9924912, - 44.642215 - ], - [ - -123.9901206, - 44.6420158 - ], - [ - -123.9890359, - 44.6418623 - ], - [ - -123.9867607, - 44.6414067 - ], - [ - -123.985826, - 44.6411623 - ], - [ - -123.9825443, - 44.6399645 - ], - [ - -123.9814242, - 44.6394244 - ], - [ - -123.9800815, - 44.6386965 - ], - [ - -123.9776114, - 44.6371963 - ], - [ - -123.9773288, - 44.6370204 - ], - [ - -123.9769604, - 44.6367852 - ], - [ - -123.9763752, - 44.6369438 - ], - [ - -123.9744949, - 44.6373339 - ], - [ - -123.9728514, - 44.6376053 - ], - [ - -123.9717212, - 44.6377453 - ], - [ - -123.9715632, - 44.6377612 - ], - [ - -123.9698311, - 44.6385382 - ], - [ - -123.969171, - 44.6387883 - ], - [ - -123.9668025, - 44.6395094 - ], - [ - -123.9664625, - 44.6395894 - ], - [ - -123.9640655, - 44.6400032 - ], - [ - -123.9631753, - 44.6401032 - ], - [ - -123.9603663, - 44.6402306 - ], - [ - -123.9600505, - 44.6402241 - ], - [ - -123.9583912, - 44.6410684 - ], - [ - -123.9555851, - 44.6421974 - ], - [ - -123.9525089, - 44.6428793 - ], - [ - -123.9517287, - 44.6429893 - ], - [ - -123.9492813, - 44.6431894 - ], - [ - -123.9484312, - 44.6432094 - ], - [ - -123.9470183, - 44.6431957 - ], - [ - -123.9463182, - 44.6431657 - ], - [ - -123.9437775, - 44.6429019 - ], - [ - -123.9413352, - 44.642337 - ], - [ - -123.9409352, - 44.642217 - ], - [ - -123.9384061, - 44.6412486 - ], - [ - -123.938185, - 44.6411207 - ], - [ - -123.9377583, - 44.6409773 - ], - [ - -123.9372382, - 44.6407673 - ], - [ - -123.9347265, - 44.6394976 - ], - [ - -123.932624, - 44.637893 - ], - [ - -123.9324641, - 44.6377429 - ], - [ - -123.9309184, - 44.6359595 - ], - [ - -123.9307185, - 44.6356694 - ], - [ - -123.9294794, - 44.6331054 - ], - [ - -123.9292345, - 44.6322733 - ], - [ - -123.9289695, - 44.631005 - ], - [ - -123.9289631, - 44.6309536 - ], - [ - -123.9274936, - 44.6293497 - ], - [ - -123.9263789, - 44.6273741 - ], - [ - -123.9258254, - 44.6252811 - ], - [ - -123.9258543, - 44.6231513 - ], - [ - -123.9264644, - 44.6210663 - ], - [ - -123.9276323, - 44.6191065 - ], - [ - -123.929313, - 44.617347 - ], - [ - -123.9314419, - 44.6158554 - ], - [ - -123.9339372, - 44.6146892 - ], - [ - -123.936703, - 44.6138929 - ], - [ - -123.9381741, - 44.6136943 - ], - [ - -123.9400663, - 44.613361 - ], - [ - -123.9416299, - 44.6131467 - ], - [ - -123.9423397, - 44.6130768 - ], - [ - -123.9445852, - 44.6129753 - ], - [ - -123.945875, - 44.6129853 - ], - [ - -123.9501397, - 44.6134555 - ], - [ - -123.9503696, - 44.6135055 - ], - [ - -123.9531943, - 44.6143496 - ], - [ - -123.9557251, - 44.6155806 - ], - [ - -123.9558751, - 44.6156706 - ], - [ - -123.9581484, - 44.6173654 - ], - [ - -123.9582884, - 44.6174954 - ], - [ - -123.9586139, - 44.6178861 - ], - [ - -123.9594509, - 44.6175918 - ], - [ - -123.9622496, - 44.6168417 - ], - [ - -123.9628795, - 44.6167217 - ], - [ - -123.9651572, - 44.6164183 - ], - [ - -123.9666682, - 44.616301 - ], - [ - -123.9686306, - 44.6154685 - ], - [ - -123.9708185, - 44.6147024 - ], - [ - -123.9715284, - 44.6145025 - ], - [ - -123.9735508, - 44.6140463 - ], - [ - -123.9741907, - 44.6139363 - ], - [ - -123.9773892, - 44.6136378 - ], - [ - -123.978569, - 44.6136178 - ], - [ - -123.9805591, - 44.6136772 - ], - [ - -123.980949, - 44.6137072 - ], - [ - -123.9836024, - 44.6140841 - ], - [ - -123.9846523, - 44.6143041 - ], - [ - -123.9877235, - 44.6152184 - ], - [ - -123.9884334, - 44.6154984 - ], - [ - -123.9897319, - 44.616073 - ], - [ - -123.9905419, - 44.6164729 - ], - [ - -123.9915384, - 44.6170094 - ], - [ - -123.9925283, - 44.6175893 - ], - [ - -123.9930185, - 44.6178891 - ], - [ - -123.9955648, - 44.6195144 - ], - [ - -123.997245, - 44.6191481 - ], - [ - -123.9982935, - 44.6189676 - ], - [ - -124.0026782, - 44.6186805 - ], - [ - -124.0031981, - 44.6187005 - ], - [ - -124.0052894, - 44.6188853 - ], - [ - -124.0064392, - 44.6190453 - ], - [ - -124.0089887, - 44.6195682 - ], - [ - -124.0094986, - 44.6197082 - ], - [ - -124.0121285, - 44.6206475 - ], - [ - -124.0127085, - 44.6209075 - ], - [ - -124.0140081, - 44.6215599 - ], - [ - -124.014508, - 44.6218399 - ], - [ - -124.0151723, - 44.6222862 - ], - [ - -124.0177428, - 44.6224673 - ], - [ - -124.020114, - 44.6227711 - ], - [ - -124.0207539, - 44.622891 - ], - [ - -124.0211344, - 44.6229849 - ], - [ - -124.0227244, - 44.6228363 - ], - [ - -124.0236142, - 44.6227963 - ], - [ - -124.0258698, - 44.6228146 - ], - [ - -124.0263597, - 44.6228446 - ], - [ - -124.027487, - 44.622944 - ], - [ - -124.0282669, - 44.623034 - ], - [ - -124.031701, - 44.6237333 - ], - [ - -124.0327408, - 44.6240433 - ], - [ - -124.0350756, - 44.6249157 - ], - [ - -124.0358368, - 44.6252632 - ], - [ - -124.0361952, - 44.6252709 - ], - [ - -124.0362543, - 44.6252491 - ], - [ - -124.0391213, - 44.6246623 - ], - [ - -124.0420936, - 44.6244862 - ], - [ - -124.0450568, - 44.6247274 - ], - [ - -124.0478973, - 44.6253768 - ], - [ - -124.0505059, - 44.6264094 - ], - [ - -124.0527824, - 44.6277855 - ], - [ - -124.053444, - 44.6282726 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16060_s_16061", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0619296, - 44.6289448 - ], - [ - -124.0623722, - 44.6291966 - ], - [ - -124.0642979, - 44.6308232 - ], - [ - -124.0657422, - 44.6326867 - ], - [ - -124.0666498, - 44.6347157 - ], - [ - -124.0669855, - 44.6368321 - ], - [ - -124.0667366, - 44.6389546 - ], - [ - -124.0659125, - 44.6410016 - ], - [ - -124.0645447, - 44.6428945 - ], - [ - -124.0626859, - 44.6445605 - ], - [ - -124.0604074, - 44.6459355 - ], - [ - -124.0577969, - 44.6469668 - ], - [ - -124.0549546, - 44.6476145 - ], - [ - -124.0519898, - 44.6478539 - ], - [ - -124.0510197, - 44.6478639 - ], - [ - -124.0480195, - 44.6476822 - ], - [ - -124.0455362, - 44.647167 - ], - [ - -124.0425587, - 44.6471445 - ], - [ - -124.0395622, - 44.6469086 - ], - [ - -124.0366896, - 44.6462557 - ], - [ - -124.0340538, - 44.6452113 - ], - [ - -124.0317581, - 44.6438165 - ], - [ - -124.0298927, - 44.6421259 - ], - [ - -124.0296433, - 44.6417744 - ], - [ - -124.0292816, - 44.6414653 - ], - [ - -124.0278525, - 44.6395957 - ], - [ - -124.0269619, - 44.6375629 - ], - [ - -124.0266438, - 44.6354451 - ], - [ - -124.0269104, - 44.6333237 - ], - [ - -124.0277515, - 44.6312802 - ], - [ - -124.0291347, - 44.6293931 - ], - [ - -124.0310068, - 44.6277349 - ], - [ - -124.0332958, - 44.6263694 - ], - [ - -124.0359137, - 44.6253489 - ], - [ - -124.0387601, - 44.6247128 - ], - [ - -124.0417255, - 44.6244853 - ], - [ - -124.044696, - 44.6246753 - ], - [ - -124.0475577, - 44.6252754 - ], - [ - -124.0480363, - 44.6254542 - ], - [ - -124.0506465, - 44.6254355 - ], - [ - -124.0536363, - 44.6256253 - ], - [ - -124.0565157, - 44.6262306 - ], - [ - -124.0591728, - 44.6272278 - ], - [ - -124.0615042, - 44.6285781 - ], - [ - -124.0619296, - 44.6289448 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16061_s_16062", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0529172, - 44.6261155 - ], - [ - -124.0559157, - 44.6263053 - ], - [ - -124.0588033, - 44.6269128 - ], - [ - -124.0614669, - 44.6279144 - ], - [ - -124.0638024, - 44.6292708 - ], - [ - -124.0657182, - 44.630929 - ], - [ - -124.0671395, - 44.6328241 - ], - [ - -124.0680105, - 44.6348819 - ], - [ - -124.0682971, - 44.6370218 - ], - [ - -124.068278, - 44.6406418 - ], - [ - -124.0679744, - 44.6427607 - ], - [ - -124.0670976, - 44.6447966 - ], - [ - -124.0656813, - 44.6466712 - ], - [ - -124.0637797, - 44.6483125 - ], - [ - -124.0614661, - 44.6496574 - ], - [ - -124.0588292, - 44.6506542 - ], - [ - -124.0559706, - 44.6512645 - ], - [ - -124.053, - 44.651465 - ], - [ - -124.0500317, - 44.6512478 - ], - [ - -124.0471799, - 44.6506214 - ], - [ - -124.0445541, - 44.6496098 - ], - [ - -124.0422554, - 44.6482519 - ], - [ - -124.040372, - 44.6465999 - ], - [ - -124.0389764, - 44.6447174 - ], - [ - -124.0381221, - 44.6426767 - ], - [ - -124.0379677, - 44.6415074 - ], - [ - -124.0377731, - 44.641254 - ], - [ - -124.0368772, - 44.6392224 - ], - [ - -124.0365536, - 44.6371051 - ], - [ - -124.0368148, - 44.6349833 - ], - [ - -124.0376507, - 44.6329387 - ], - [ - -124.0390291, - 44.6310498 - ], - [ - -124.0408969, - 44.6293892 - ], - [ - -124.0431824, - 44.6280207 - ], - [ - -124.0457978, - 44.6269968 - ], - [ - -124.0486426, - 44.6263569 - ], - [ - -124.0516075, - 44.6261255 - ], - [ - -124.0529172, - 44.6261155 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16062_s_16063", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682986, - 44.6431904 - ], - [ - -124.0682973, - 44.6434041 - ], - [ - -124.068248, - 44.6459041 - ], - [ - -124.0679137, - 44.6480206 - ], - [ - -124.0670074, - 44.6500499 - ], - [ - -124.0655639, - 44.651914 - ], - [ - -124.0636385, - 44.6535412 - ], - [ - -124.0613053, - 44.6548689 - ], - [ - -124.0586539, - 44.6558462 - ], - [ - -124.0557863, - 44.6564354 - ], - [ - -124.0528127, - 44.656614 - ], - [ - -124.0498475, - 44.6563749 - ], - [ - -124.0470046, - 44.6557275 - ], - [ - -124.0443934, - 44.6546966 - ], - [ - -124.0421142, - 44.6533218 - ], - [ - -124.0402547, - 44.651656 - ], - [ - -124.0388863, - 44.6497633 - ], - [ - -124.0380616, - 44.6477163 - ], - [ - -124.0378121, - 44.6455939 - ], - [ - -124.0378606, - 44.6432007 - ], - [ - -124.0378421, - 44.6406575 - ], - [ - -124.038119, - 44.6385368 - ], - [ - -124.0389701, - 44.6364954 - ], - [ - -124.0403625, - 44.6346117 - ], - [ - -124.0422428, - 44.6329582 - ], - [ - -124.0445385, - 44.6315983 - ], - [ - -124.0471616, - 44.6305844 - ], - [ - -124.0500113, - 44.6299552 - ], - [ - -124.052978, - 44.6297351 - ], - [ - -124.0559479, - 44.6299324 - ], - [ - -124.0588069, - 44.6305396 - ], - [ - -124.0614451, - 44.6315333 - ], - [ - -124.0637613, - 44.6328755 - ], - [ - -124.0656664, - 44.6345144 - ], - [ - -124.0670871, - 44.6363872 - ], - [ - -124.0679689, - 44.638422 - ], - [ - -124.0682779, - 44.6405404 - ], - [ - -124.0682986, - 44.6431904 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16063_s_15890", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682796, - 44.6481974 - ], - [ - -124.0682783, - 44.6484599 - ], - [ - -124.0682305, - 44.6506531 - ], - [ - -124.0678998, - 44.6527431 - ], - [ - -124.067011, - 44.6547485 - ], - [ - -124.0655975, - 44.656594 - ], - [ - -124.0637122, - 44.6582105 - ], - [ - -124.0614258, - 44.6595375 - ], - [ - -124.0588238, - 44.6605251 - ], - [ - -124.0584946, - 44.6605964 - ], - [ - -124.0577261, - 44.660878 - ], - [ - -124.0548562, - 44.6614622 - ], - [ - -124.0518817, - 44.6616356 - ], - [ - -124.0489171, - 44.6613913 - ], - [ - -124.0460762, - 44.6607389 - ], - [ - -124.0434683, - 44.6597035 - ], - [ - -124.0411937, - 44.6583247 - ], - [ - -124.0393397, - 44.6566557 - ], - [ - -124.0379777, - 44.6547606 - ], - [ - -124.0371599, - 44.6527122 - ], - [ - -124.0369176, - 44.6505893 - ], - [ - -124.0369246, - 44.6502968 - ], - [ - -124.0372663, - 44.6481837 - ], - [ - -124.0378238, - 44.6469459 - ], - [ - -124.037811, - 44.6458406 - ], - [ - -124.038079, - 44.6437193 - ], - [ - -124.0389214, - 44.641676 - ], - [ - -124.0403059, - 44.6397893 - ], - [ - -124.0421793, - 44.6381317 - ], - [ - -124.0444694, - 44.6367669 - ], - [ - -124.0470885, - 44.6357472 - ], - [ - -124.0499357, - 44.6351119 - ], - [ - -124.0529017, - 44.6348853 - ], - [ - -124.0558727, - 44.6350762 - ], - [ - -124.0587345, - 44.6356771 - ], - [ - -124.0613772, - 44.6366652 - ], - [ - -124.0636993, - 44.6380022 - ], - [ - -124.0656115, - 44.6396371 - ], - [ - -124.0670403, - 44.6415068 - ], - [ - -124.0679309, - 44.6435396 - ], - [ - -124.0682489, - 44.6456574 - ], - [ - -124.0682796, - 44.6481974 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16065_s_2483495", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0690459, - 44.6557927 - ], - [ - -124.0691126, - 44.6563891 - ], - [ - -124.0687652, - 44.6585045 - ], - [ - -124.0678462, - 44.6605309 - ], - [ - -124.0663908, - 44.6623904 - ], - [ - -124.0644551, - 44.6640115 - ], - [ - -124.0621132, - 44.6653319 - ], - [ - -124.0594554, - 44.6663008 - ], - [ - -124.0565836, - 44.666881 - ], - [ - -124.0536084, - 44.6670501 - ], - [ - -124.0533586, - 44.6670468 - ], - [ - -124.0502322, - 44.6667725 - ], - [ - -124.0472519, - 44.6660448 - ], - [ - -124.0445453, - 44.664895 - ], - [ - -124.0422283, - 44.6633722 - ], - [ - -124.0404001, - 44.6615418 - ], - [ - -124.0391389, - 44.659482 - ], - [ - -124.038844, - 44.6584681 - ], - [ - -124.0380548, - 44.6565583 - ], - [ - -124.0378676, - 44.6551358 - ], - [ - -124.0373832, - 44.6535503 - ], - [ - -124.0373283, - 44.6514207 - ], - [ - -124.0378566, - 44.6493244 - ], - [ - -124.0389475, - 44.647342 - ], - [ - -124.0405591, - 44.6455495 - ], - [ - -124.0426295, - 44.6440159 - ], - [ - -124.0450791, - 44.6428001 - ], - [ - -124.0478138, - 44.6419488 - ], - [ - -124.0507286, - 44.6414946 - ], - [ - -124.0537114, - 44.6414551 - ], - [ - -124.0566477, - 44.6418317 - ], - [ - -124.0594247, - 44.64261 - ], - [ - -124.0606622, - 44.6431768 - ], - [ - -124.0613342, - 44.6434272 - ], - [ - -124.0618278, - 44.6437106 - ], - [ - -124.0619359, - 44.6437601 - ], - [ - -124.0620461, - 44.6438359 - ], - [ - -124.0636557, - 44.6447598 - ], - [ - -124.0655692, - 44.6463896 - ], - [ - -124.0670015, - 44.6482543 - ], - [ - -124.0678499, - 44.6501742 - ], - [ - -124.0682042, - 44.6506808 - ], - [ - -124.0689873, - 44.6527046 - ], - [ - -124.0692105, - 44.6547981 - ], - [ - -124.0690459, - 44.6557927 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16066_s_16068", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.076575, - 44.6761547 - ], - [ - -124.0770193, - 44.6771048 - ], - [ - -124.0776037, - 44.6788368 - ], - [ - -124.0780146, - 44.6809464 - ], - [ - -124.0778408, - 44.6830727 - ], - [ - -124.0770889, - 44.6851339 - ], - [ - -124.0757876, - 44.6870509 - ], - [ - -124.0739871, - 44.6887499 - ], - [ - -124.0717563, - 44.6901656 - ], - [ - -124.0691812, - 44.6912436 - ], - [ - -124.0663606, - 44.6919425 - ], - [ - -124.0634031, - 44.6922354 - ], - [ - -124.0604223, - 44.692111 - ], - [ - -124.0575328, - 44.6915741 - ], - [ - -124.0548458, - 44.6906453 - ], - [ - -124.0524645, - 44.6893604 - ], - [ - -124.0504805, - 44.6877687 - ], - [ - -124.04897, - 44.6859315 - ], - [ - -124.047991, - 44.6839193 - ], - [ - -124.0476026, - 44.6827665 - ], - [ - -124.0474674, - 44.6825574 - ], - [ - -124.0466309, - 44.6805193 - ], - [ - -124.0465855, - 44.6803245 - ], - [ - -124.0457004, - 44.6782888 - ], - [ - -124.0455767, - 44.677989 - ], - [ - -124.0450369, - 44.676608 - ], - [ - -124.0433833, - 44.6727029 - ], - [ - -124.0414076, - 44.6716798 - ], - [ - -124.0393022, - 44.6700241 - ], - [ - -124.0377165, - 44.6680959 - ], - [ - -124.0367175, - 44.6659769 - ], - [ - -124.0363474, - 44.6637568 - ], - [ - -124.0366219, - 44.6615296 - ], - [ - -124.0366546, - 44.6614088 - ], - [ - -124.0374109, - 44.659536 - ], - [ - -124.0386238, - 44.6577898 - ], - [ - -124.0402542, - 44.6562263 - ], - [ - -124.0411959, - 44.6555984 - ], - [ - -124.0424844, - 44.6546802 - ], - [ - -124.04501, - 44.6534856 - ], - [ - -124.047817, - 44.6526716 - ], - [ - -124.0486113, - 44.6525646 - ], - [ - -124.0488319, - 44.6524955 - ], - [ - -124.0515425, - 44.6518558 - ], - [ - -124.0543727, - 44.6515886 - ], - [ - -124.0572231, - 44.6517033 - ], - [ - -124.0599933, - 44.6521958 - ], - [ - -124.0625861, - 44.6530489 - ], - [ - -124.0649101, - 44.6542325 - ], - [ - -124.0668838, - 44.655705 - ], - [ - -124.0684376, - 44.6574147 - ], - [ - -124.0695168, - 44.6593013 - ], - [ - -124.0742343, - 44.6704307 - ], - [ - -124.0743255, - 44.6706542 - ], - [ - -124.0748509, - 44.6719966 - ], - [ - -124.0757804, - 44.6741322 - ], - [ - -124.0758487, - 44.6744107 - ], - [ - -124.0758575, - 44.6744089 - ], - [ - -124.076575, - 44.6761547 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16068_s_16069", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.078048, - 44.6804964 - ], - [ - -124.0782397, - 44.6813144 - ], - [ - -124.0786232, - 44.6834503 - ], - [ - -124.0786686, - 44.6837322 - ], - [ - -124.0787658, - 44.6844142 - ], - [ - -124.0788252, - 44.6849761 - ], - [ - -124.0789206, - 44.6863511 - ], - [ - -124.0789312, - 44.68724 - ], - [ - -124.0789054, - 44.687809 - ], - [ - -124.0784792, - 44.6900326 - ], - [ - -124.0774217, - 44.6921462 - ], - [ - -124.0757779, - 44.6940598 - ], - [ - -124.0736445, - 44.6956714 - ], - [ - -124.0728112, - 44.6963248 - ], - [ - -124.0705937, - 44.6975261 - ], - [ - -124.0698276, - 44.6978672 - ], - [ - -124.067299, - 44.698772 - ], - [ - -124.0645794, - 44.6993276 - ], - [ - -124.0643484, - 44.6993586 - ], - [ - -124.0625038, - 44.6994759 - ], - [ - -124.0621866, - 44.6995176 - ], - [ - -124.0617883, - 44.6995443 - ], - [ - -124.0609742, - 44.6997598 - ], - [ - -124.0586904, - 44.7000376 - ], - [ - -124.0575006, - 44.700241 - ], - [ - -124.0545165, - 44.7003239 - ], - [ - -124.0515671, - 44.6999898 - ], - [ - -124.0487658, - 44.6992518 - ], - [ - -124.0462204, - 44.698138 - ], - [ - -124.0440285, - 44.6966915 - ], - [ - -124.0438505, - 44.6965485 - ], - [ - -124.0420971, - 44.6948252 - ], - [ - -124.0408486, - 44.6928912 - ], - [ - -124.0401529, - 44.6908205 - ], - [ - -124.0400368, - 44.6886929 - ], - [ - -124.0405046, - 44.68659 - ], - [ - -124.0415382, - 44.6845925 - ], - [ - -124.043098, - 44.6827771 - ], - [ - -124.045124, - 44.6812137 - ], - [ - -124.0475384, - 44.6799621 - ], - [ - -124.0477182, - 44.6798869 - ], - [ - -124.0477913, - 44.6793164 - ], - [ - -124.0486377, - 44.6772739 - ], - [ - -124.0500262, - 44.6753885 - ], - [ - -124.0519035, - 44.6737325 - ], - [ - -124.0541974, - 44.6723696 - ], - [ - -124.0568197, - 44.6713522 - ], - [ - -124.0596697, - 44.6707193 - ], - [ - -124.062638, - 44.6704953 - ], - [ - -124.0656105, - 44.6706887 - ], - [ - -124.068473, - 44.6712921 - ], - [ - -124.0711156, - 44.6722824 - ], - [ - -124.0734369, - 44.6736215 - ], - [ - -124.0753475, - 44.6752579 - ], - [ - -124.076774, - 44.6771289 - ], - [ - -124.0776617, - 44.6791624 - ], - [ - -124.078048, - 44.6804964 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16068_s_16201", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0780435, - 44.6803247 - ], - [ - -124.0783129, - 44.6814716 - ], - [ - -124.0788037, - 44.6845715 - ], - [ - -124.0788997, - 44.6858523 - ], - [ - -124.0788803, - 44.6883023 - ], - [ - -124.0788439, - 44.6889944 - ], - [ - -124.0786744, - 44.6907344 - ], - [ - -124.0786057, - 44.6912564 - ], - [ - -124.0782063, - 44.6936665 - ], - [ - -124.0781489, - 44.6939752 - ], - [ - -124.0776369, - 44.6964529 - ], - [ - -124.0772103, - 44.6989402 - ], - [ - -124.0771751, - 44.6991317 - ], - [ - -124.0758295, - 44.7059658 - ], - [ - -124.0755117, - 44.7080439 - ], - [ - -124.0754236, - 44.7090077 - ], - [ - -124.0750729, - 44.7107216 - ], - [ - -124.074903, - 44.7112517 - ], - [ - -124.0744768, - 44.7123246 - ], - [ - -124.0738969, - 44.7135422 - ], - [ - -124.0736385, - 44.7141968 - ], - [ - -124.0734965, - 44.7149002 - ], - [ - -124.0734925, - 44.714951 - ], - [ - -124.0735151, - 44.7163315 - ], - [ - -124.073681, - 44.7199789 - ], - [ - -124.0736888, - 44.7203783 - ], - [ - -124.0736793, - 44.7219483 - ], - [ - -124.0736413, - 44.7226688 - ], - [ - -124.073372, - 44.7253788 - ], - [ - -124.0732642, - 44.7261111 - ], - [ - -124.0729845, - 44.7275411 - ], - [ - -124.0722839, - 44.7296116 - ], - [ - -124.0710301, - 44.7315449 - ], - [ - -124.0692712, - 44.7332666 - ], - [ - -124.0670747, - 44.7347106 - ], - [ - -124.0645251, - 44.7358214 - ], - [ - -124.0617204, - 44.7365562 - ], - [ - -124.0587684, - 44.7368868 - ], - [ - -124.0557826, - 44.7368006 - ], - [ - -124.0528779, - 44.7363007 - ], - [ - -124.0501658, - 44.7354064 - ], - [ - -124.0477508, - 44.7341521 - ], - [ - -124.0457256, - 44.7325861 - ], - [ - -124.0441679, - 44.7307685 - ], - [ - -124.0431378, - 44.7287692 - ], - [ - -124.0426746, - 44.726665 - ], - [ - -124.0427962, - 44.7245369 - ], - [ - -124.0430051, - 44.7234718 - ], - [ - -124.0432031, - 44.721489 - ], - [ - -124.0432098, - 44.7204794 - ], - [ - -124.0430498, - 44.716919 - ], - [ - -124.0430429, - 44.7166939 - ], - [ - -124.0430134, - 44.7148339 - ], - [ - -124.0430365, - 44.7141006 - ], - [ - -124.0431067, - 44.7132106 - ], - [ - -124.0432389, - 44.712269 - ], - [ - -124.0436194, - 44.7103891 - ], - [ - -124.0440348, - 44.7089929 - ], - [ - -124.0446752, - 44.707373 - ], - [ - -124.0449146, - 44.7068234 - ], - [ - -124.0451291, - 44.7063734 - ], - [ - -124.0451849, - 44.7059188 - ], - [ - -124.0455656, - 44.7034388 - ], - [ - -124.0456239, - 44.7031061 - ], - [ - -124.0469868, - 44.6962019 - ], - [ - -124.047421, - 44.6936779 - ], - [ - -124.0474713, - 44.6934127 - ], - [ - -124.04798, - 44.6909569 - ], - [ - -124.0483116, - 44.688962 - ], - [ - -124.0484226, - 44.6878292 - ], - [ - -124.0484349, - 44.6863681 - ], - [ - -124.0481377, - 44.684485 - ], - [ - -124.0478656, - 44.6836133 - ], - [ - -124.0475052, - 44.681499 - ], - [ - -124.0477299, - 44.6793751 - ], - [ - -124.048531, - 44.6773233 - ], - [ - -124.0498777, - 44.6754225 - ], - [ - -124.0517182, - 44.6737455 - ], - [ - -124.0539816, - 44.672357 - ], - [ - -124.0565811, - 44.6713102 - ], - [ - -124.0594168, - 44.6706453 - ], - [ - -124.0623797, - 44.6703879 - ], - [ - -124.0653561, - 44.6705478 - ], - [ - -124.0682316, - 44.6711189 - ], - [ - -124.0708958, - 44.6720793 - ], - [ - -124.0732463, - 44.6733921 - ], - [ - -124.0751929, - 44.6750068 - ], - [ - -124.0766607, - 44.6768614 - ], - [ - -124.0775932, - 44.6788848 - ], - [ - -124.0780435, - 44.6803247 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16069_s_16024", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0762694, - 44.6912306 - ], - [ - -124.0761899, - 44.6918308 - ], - [ - -124.0761737, - 44.6918988 - ], - [ - -124.0760706, - 44.6926872 - ], - [ - -124.0752183, - 44.6947285 - ], - [ - -124.0738241, - 44.696612 - ], - [ - -124.0719414, - 44.6982653 - ], - [ - -124.0696426, - 44.6996248 - ], - [ - -124.067016, - 44.7006382 - ], - [ - -124.0641625, - 44.7012666 - ], - [ - -124.061192, - 44.7014858 - ], - [ - -124.0582186, - 44.7012875 - ], - [ - -124.0553566, - 44.7006791 - ], - [ - -124.0541996, - 44.7002431 - ], - [ - -124.052521, - 44.7001255 - ], - [ - -124.0496631, - 44.6995076 - ], - [ - -124.0470292, - 44.6985038 - ], - [ - -124.0467816, - 44.6983858 - ], - [ - -124.0444993, - 44.6970535 - ], - [ - -124.0426198, - 44.6954324 - ], - [ - -124.0412136, - 44.6935833 - ], - [ - -124.0403334, - 44.6915756 - ], - [ - -124.0400121, - 44.6894846 - ], - [ - -124.0402617, - 44.6873886 - ], - [ - -124.0410728, - 44.6853661 - ], - [ - -124.0424148, - 44.6834931 - ], - [ - -124.0442376, - 44.6818396 - ], - [ - -124.0443525, - 44.6817539 - ], - [ - -124.046842, - 44.6802569 - ], - [ - -124.0497205, - 44.6791716 - ], - [ - -124.0528564, - 44.6785476 - ], - [ - -124.0531548, - 44.6785122 - ], - [ - -124.0543732, - 44.6782041 - ], - [ - -124.0546031, - 44.6781641 - ], - [ - -124.05821, - 44.677855 - ], - [ - -124.05852, - 44.677855 - ], - [ - -124.0587573, - 44.6778693 - ], - [ - -124.0603265, - 44.6777221 - ], - [ - -124.062597, - 44.6777521 - ], - [ - -124.0627469, - 44.6777621 - ], - [ - -124.0653316, - 44.6780968 - ], - [ - -124.0677972, - 44.6787433 - ], - [ - -124.0700705, - 44.6796825 - ], - [ - -124.0702705, - 44.6797825 - ], - [ - -124.0724365, - 44.6810966 - ], - [ - -124.0742224, - 44.682675 - ], - [ - -124.075566, - 44.6844628 - ], - [ - -124.0764205, - 44.6863975 - ], - [ - -124.076756, - 44.6884119 - ], - [ - -124.0765608, - 44.6904356 - ], - [ - -124.0762694, - 44.6912306 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16069_s_16069", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0402646, - 44.6896106 - ], - [ - -124.0405193, - 44.6874884 - ], - [ - -124.0413494, - 44.6854425 - ], - [ - -124.042723, - 44.6835514 - ], - [ - -124.0445872, - 44.6818878 - ], - [ - -124.0468704, - 44.6805155 - ], - [ - -124.0494849, - 44.6794874 - ], - [ - -124.0523302, - 44.6788429 - ], - [ - -124.055297, - 44.6786067 - ], - [ - -124.0582714, - 44.678788 - ], - [ - -124.0611392, - 44.6793797 - ], - [ - -124.0637901, - 44.6803592 - ], - [ - -124.0661223, - 44.6816887 - ], - [ - -124.0680463, - 44.6833174 - ], - [ - -124.0694881, - 44.6851824 - ], - [ - -124.0703922, - 44.6872123 - ], - [ - -124.0707239, - 44.6893291 - ], - [ - -124.0704703, - 44.6914513 - ], - [ - -124.0696411, - 44.6934974 - ], - [ - -124.0682682, - 44.6953888 - ], - [ - -124.0664042, - 44.6970528 - ], - [ - -124.0641208, - 44.6984254 - ], - [ - -124.0615058, - 44.6994539 - ], - [ - -124.0586596, - 44.7000986 - ], - [ - -124.0556917, - 44.7003349 - ], - [ - -124.0527162, - 44.7001536 - ], - [ - -124.0498475, - 44.6995617 - ], - [ - -124.0471959, - 44.6985819 - ], - [ - -124.0448634, - 44.6972519 - ], - [ - -124.0429396, - 44.6956229 - ], - [ - -124.0414984, - 44.6937575 - ], - [ - -124.0405952, - 44.6917274 - ], - [ - -124.0402646, - 44.6896106 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16070_s_16071", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.017411, - 44.9880899 - ], - [ - -124.0174167, - 44.988094 - ], - [ - -124.0159917, - 44.9890881 - ], - [ - -124.0133777, - 44.9905514 - ], - [ - -124.0103797, - 44.991579 - ], - [ - -124.0071394, - 44.9921223 - ], - [ - -124.0070493, - 44.9921232 - ], - [ - -124.0060027, - 44.9927248 - ], - [ - -124.0059285, - 44.9927531 - ], - [ - -124.0057896, - 44.9928732 - ], - [ - -124.0034696, - 44.9942245 - ], - [ - -124.0008226, - 44.9952287 - ], - [ - -123.9979502, - 44.9958471 - ], - [ - -123.994963, - 44.9960559 - ], - [ - -123.9948422, - 44.9960559 - ], - [ - -123.9919121, - 44.9958551 - ], - [ - -123.9890904, - 44.99526 - ], - [ - -123.9864814, - 44.9942928 - ], - [ - -123.9841815, - 44.9929892 - ], - [ - -123.9822758, - 44.9913973 - ], - [ - -123.9808347, - 44.9895761 - ], - [ - -123.9799114, - 44.9875928 - ], - [ - -123.97954, - 44.9855208 - ], - [ - -123.9794777, - 44.9840579 - ], - [ - -123.9796831, - 44.9819259 - ], - [ - -123.9804724, - 44.9798638 - ], - [ - -123.9818151, - 44.9779511 - ], - [ - -123.9836592, - 44.976262 - ], - [ - -123.985198, - 44.9753145 - ], - [ - -123.9855844, - 44.9748811 - ], - [ - -123.9878707, - 44.9728858 - ], - [ - -123.9880307, - 44.9727759 - ], - [ - -123.9904923, - 44.9714004 - ], - [ - -123.9932968, - 44.9704095 - ], - [ - -123.9934468, - 44.9703695 - ], - [ - -123.9975456, - 44.9697138 - ], - [ - -123.9993852, - 44.9696038 - ], - [ - -124.0026018, - 44.9697271 - ], - [ - -124.0040008, - 44.969466 - ], - [ - -124.0070396, - 44.9693409 - ], - [ - -124.0100533, - 44.9696451 - ], - [ - -124.0129225, - 44.9703666 - ], - [ - -124.0137616, - 44.9707233 - ], - [ - -124.0142527, - 44.970876 - ], - [ - -124.0150549, - 44.9712732 - ], - [ - -124.0151177, - 44.9712999 - ], - [ - -124.0151333, - 44.9712838 - ], - [ - -124.0153783, - 44.9714038 - ], - [ - -124.0153736, - 44.9714086 - ], - [ - -124.015534, - 44.9714768 - ], - [ - -124.0157554, - 44.97162 - ], - [ - -124.0167136, - 44.9720944 - ], - [ - -124.0187925, - 44.9736302 - ], - [ - -124.0204095, - 44.9754243 - ], - [ - -124.0215023, - 44.9774078 - ], - [ - -124.022029, - 44.9795046 - ], - [ - -124.0219692, - 44.981634 - ], - [ - -124.0213253, - 44.9837142 - ], - [ - -124.0201218, - 44.9856652 - ], - [ - -124.018405, - 44.9874122 - ], - [ - -124.017411, - 44.9880899 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16071_s_16076", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0104947, - 44.9801574 - ], - [ - -124.0105696, - 44.980192 - ], - [ - -124.0127191, - 44.9816782 - ], - [ - -124.0144188, - 44.9834335 - ], - [ - -124.0156034, - 44.9853903 - ], - [ - -124.0162274, - 44.9874736 - ], - [ - -124.0162667, - 44.9896032 - ], - [ - -124.0157198, - 44.9916974 - ], - [ - -124.0146075, - 44.9936756 - ], - [ - -124.0129727, - 44.9954618 - ], - [ - -124.010878, - 44.9969873 - ], - [ - -124.0084041, - 44.9981935 - ], - [ - -124.0056459, - 44.999034 - ], - [ - -124.0040566, - 44.9993921 - ], - [ - -124.003952, - 44.9994153 - ], - [ - -124.0023077, - 44.9997766 - ], - [ - -124.0014594, - 44.9999658 - ], - [ - -123.9986131, - 45.0003948 - ], - [ - -123.9957037, - 45.000434 - ], - [ - -123.9928365, - 45.000082 - ], - [ - -123.9901149, - 44.9993514 - ], - [ - -123.9876374, - 44.9982687 - ], - [ - -123.9854933, - 44.996873 - ], - [ - -123.9837602, - 44.9952147 - ], - [ - -123.9825005, - 44.9933537 - ], - [ - -123.9817598, - 44.9913572 - ], - [ - -123.9816767, - 44.9904808 - ], - [ - -123.9808996, - 44.9894817 - ], - [ - -123.9799896, - 44.9874521 - ], - [ - -123.9796552, - 44.9853356 - ], - [ - -123.979909, - 44.9832134 - ], - [ - -123.9807413, - 44.9811671 - ], - [ - -123.98212, - 44.9792754 - ], - [ - -123.9839922, - 44.9776109 - ], - [ - -123.9862857, - 44.9762375 - ], - [ - -123.9889126, - 44.9752081 - ], - [ - -123.9917718, - 44.9745622 - ], - [ - -123.9947536, - 44.9743245 - ], - [ - -123.9948302, - 44.9743237 - ], - [ - -123.9951903, - 44.9743193 - ], - [ - -123.995374, - 44.9743167 - ], - [ - -123.995446, - 44.9743158 - ], - [ - -123.9963343, - 44.9743059 - ], - [ - -123.9967257, - 44.9743011 - ], - [ - -123.9997521, - 44.9744775 - ], - [ - -124.0026698, - 44.9750744 - ], - [ - -124.0053642, - 44.9760684 - ], - [ - -124.0077293, - 44.9774202 - ], - [ - -124.0096719, - 44.9790768 - ], - [ - -124.0104947, - 44.9801574 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16071_s_16082", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0252256, - 44.982228 - ], - [ - -124.0249344, - 44.9827939 - ], - [ - -124.0249344, - 44.982794 - ], - [ - -124.0249344, - 44.982794 - ], - [ - -124.0248641, - 44.9829305 - ], - [ - -124.0244869, - 44.9834963 - ], - [ - -124.0244845, - 44.9834955 - ], - [ - -124.0235818, - 44.9849031 - ], - [ - -124.0235518, - 44.9849391 - ], - [ - -124.0232538, - 44.9852822 - ], - [ - -124.0231388, - 44.9854092 - ], - [ - -124.0227799, - 44.9857879 - ], - [ - -124.0226629, - 44.9859059 - ], - [ - -124.0226275, - 44.9859415 - ], - [ - -124.0226185, - 44.9859505 - ], - [ - -124.0222706, - 44.9862847 - ], - [ - -124.0222446, - 44.9863087 - ], - [ - -124.0220717, - 44.9864654 - ], - [ - -124.0220446, - 44.9864895 - ], - [ - -124.0219423, - 44.9865815 - ], - [ - -124.0201984, - 44.9879058 - ], - [ - -124.019929, - 44.9880518 - ], - [ - -124.0198897, - 44.9880798 - ], - [ - -124.0196272, - 44.9882671 - ], - [ - -124.0196115, - 44.9882782 - ], - [ - -124.0195656, - 44.9883154 - ], - [ - -124.0195622, - 44.9883133 - ], - [ - -124.019486, - 44.9883676 - ], - [ - -124.0185266, - 44.9892082 - ], - [ - -124.0159574, - 44.9906665 - ], - [ - -124.0130084, - 44.9917016 - ], - [ - -124.0098157, - 44.9922657 - ], - [ - -124.0084765, - 44.992293 - ], - [ - -124.0080614, - 44.9926696 - ], - [ - -124.0057686, - 44.9940662 - ], - [ - -124.0031339, - 44.995116 - ], - [ - -124.0002598, - 44.9957782 - ], - [ - -123.9972584, - 44.9960269 - ], - [ - -123.9968906, - 44.9960314 - ], - [ - -123.9961047, - 44.9960438 - ], - [ - -123.9959431, - 44.996042 - ], - [ - -123.9957881, - 44.9960443 - ], - [ - -123.9957395, - 44.9960449 - ], - [ - -123.9953284, - 44.9960499 - ], - [ - -123.9952755, - 44.9960505 - ], - [ - -123.9951725, - 44.9960515 - ], - [ - -123.9921815, - 44.9958717 - ], - [ - -123.9892975, - 44.9952813 - ], - [ - -123.9866313, - 44.9943029 - ], - [ - -123.9842854, - 44.9929743 - ], - [ - -123.9823501, - 44.9913463 - ], - [ - -123.9808996, - 44.9894817 - ], - [ - -123.9799896, - 44.9874521 - ], - [ - -123.9796552, - 44.9853356 - ], - [ - -123.979909, - 44.9832134 - ], - [ - -123.9807413, - 44.9811671 - ], - [ - -123.98212, - 44.9792754 - ], - [ - -123.9831656, - 44.9783458 - ], - [ - -123.9834885, - 44.9775614 - ], - [ - -123.9848411, - 44.9757039 - ], - [ - -123.9853686, - 44.975124 - ], - [ - -123.9856262, - 44.9748401 - ], - [ - -123.987845, - 44.9729187 - ], - [ - -123.988034, - 44.9727887 - ], - [ - -123.9905147, - 44.9714041 - ], - [ - -123.9933426, - 44.97041 - ], - [ - -123.9935506, - 44.970355 - ], - [ - -123.9974665, - 44.9697188 - ], - [ - -123.9978424, - 44.9696938 - ], - [ - -123.9978919, - 44.9696906 - ], - [ - -123.9990026, - 44.9696193 - ], - [ - -123.9991295, - 44.969611 - ], - [ - -124.0004346, - 44.9695657 - ], - [ - -124.0006606, - 44.9695647 - ], - [ - -124.0008309, - 44.9695778 - ], - [ - -124.002945, - 44.9683293 - ], - [ - -124.0055814, - 44.9673128 - ], - [ - -124.0084465, - 44.9666808 - ], - [ - -124.0114301, - 44.9664577 - ], - [ - -124.0144177, - 44.9666521 - ], - [ - -124.0172946, - 44.9672563 - ], - [ - -124.0199502, - 44.9682474 - ], - [ - -124.0222825, - 44.9695871 - ], - [ - -124.024202, - 44.9712241 - ], - [ - -124.0256347, - 44.9730954 - ], - [ - -124.0265257, - 44.9751291 - ], - [ - -124.0268407, - 44.9772472 - ], - [ - -124.0265674, - 44.9793682 - ], - [ - -124.0257163, - 44.9814105 - ], - [ - -124.0255459, - 44.981712 - ], - [ - -124.0254406, - 44.9818934 - ], - [ - -124.0254183, - 44.9819308 - ], - [ - -124.0253051, - 44.9821271 - ], - [ - -124.0252701, - 44.9821872 - ], - [ - -124.0252431, - 44.9822332 - ], - [ - -124.0252256, - 44.982228 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16071_s_16212", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0209174, - 44.988169 - ], - [ - -124.020932, - 44.988262 - ], - [ - -124.0209717, - 44.9903916 - ], - [ - -124.0204252, - 44.9924858 - ], - [ - -124.0193133, - 44.9944641 - ], - [ - -124.0176787, - 44.9962504 - ], - [ - -124.0155843, - 44.9977761 - ], - [ - -124.0131106, - 44.9989826 - ], - [ - -124.0103525, - 44.9998234 - ], - [ - -124.0074162, - 45.0002662 - ], - [ - -124.0044146, - 45.0002939 - ], - [ - -124.0016303, - 44.9999277 - ], - [ - -124.0014594, - 44.9999658 - ], - [ - -123.9986131, - 45.0003948 - ], - [ - -123.9957037, - 45.000434 - ], - [ - -123.9928365, - 45.000082 - ], - [ - -123.9901149, - 44.9993514 - ], - [ - -123.9876374, - 44.9982687 - ], - [ - -123.9854933, - 44.996873 - ], - [ - -123.9837602, - 44.9952147 - ], - [ - -123.9825005, - 44.9933537 - ], - [ - -123.9817598, - 44.9913572 - ], - [ - -123.9816767, - 44.9904808 - ], - [ - -123.9808996, - 44.9894817 - ], - [ - -123.9799896, - 44.9874521 - ], - [ - -123.9796552, - 44.9853356 - ], - [ - -123.979909, - 44.9832134 - ], - [ - -123.9807413, - 44.9811671 - ], - [ - -123.98212, - 44.9792754 - ], - [ - -123.9839922, - 44.9776109 - ], - [ - -123.9862857, - 44.9762375 - ], - [ - -123.9889126, - 44.9752081 - ], - [ - -123.9917718, - 44.9745622 - ], - [ - -123.9947536, - 44.9743245 - ], - [ - -123.9948302, - 44.9743237 - ], - [ - -123.9951903, - 44.9743193 - ], - [ - -123.995374, - 44.9743167 - ], - [ - -123.995446, - 44.9743158 - ], - [ - -123.9963343, - 44.9743059 - ], - [ - -123.9967257, - 44.9743011 - ], - [ - -123.9997521, - 44.9744775 - ], - [ - -124.0026698, - 44.9750744 - ], - [ - -124.0053642, - 44.9760684 - ], - [ - -124.0067653, - 44.9768692 - ], - [ - -124.0071102, - 44.9768698 - ], - [ - -124.0099562, - 44.9772626 - ], - [ - -124.0126469, - 44.9780292 - ], - [ - -124.0150857, - 44.9791421 - ], - [ - -124.0171853, - 44.9805614 - ], - [ - -124.0188702, - 44.9822362 - ], - [ - -124.02008, - 44.9841064 - ], - [ - -124.0207712, - 44.9861049 - ], - [ - -124.0209191, - 44.9881601 - ], - [ - -124.0209174, - 44.988169 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16072_s_16081", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0209976, - 44.9897713 - ], - [ - -124.0210139, - 44.9899939 - ], - [ - -124.0205817, - 44.9921016 - ], - [ - -124.0195784, - 44.9941089 - ], - [ - -124.0180423, - 44.9959387 - ], - [ - -124.0160326, - 44.9975206 - ], - [ - -124.0136264, - 44.998794 - ], - [ - -124.0109162, - 44.9997098 - ], - [ - -124.0080062, - 45.0002327 - ], - [ - -124.0050083, - 45.0003428 - ], - [ - -124.0020377, - 45.0000357 - ], - [ - -123.9992088, - 44.9993232 - ], - [ - -123.9966302, - 44.9982328 - ], - [ - -123.9944011, - 44.9968064 - ], - [ - -123.9926071, - 44.9950989 - ], - [ - -123.9913172, - 44.9931757 - ], - [ - -123.9905808, - 44.991111 - ], - [ - -123.9903811, - 44.990171 - ], - [ - -123.9902649, - 44.9894708 - ], - [ - -123.990205, - 44.9889708 - ], - [ - -123.9902809, - 44.9866334 - ], - [ - -123.990331, - 44.9863634 - ], - [ - -123.9914965, - 44.9834056 - ], - [ - -123.9919583, - 44.9826606 - ], - [ - -123.9922333, - 44.9809007 - ], - [ - -123.9931396, - 44.9788703 - ], - [ - -123.9945865, - 44.9770045 - ], - [ - -123.9965184, - 44.9753747 - ], - [ - -123.9988609, - 44.9740438 - ], - [ - -124.0015242, - 44.9730628 - ], - [ - -124.0044058, - 44.9724693 - ], - [ - -124.0073952, - 44.9722863 - ], - [ - -124.0103774, - 44.9725206 - ], - [ - -124.013238, - 44.9731634 - ], - [ - -124.015867, - 44.9741898 - ], - [ - -124.0181635, - 44.9755606 - ], - [ - -124.0200393, - 44.977223 - ], - [ - -124.0214221, - 44.9791132 - ], - [ - -124.022259, - 44.9811585 - ], - [ - -124.0225175, - 44.9832804 - ], - [ - -124.022488, - 44.9850404 - ], - [ - -124.0221667, - 44.9871289 - ], - [ - -124.0221167, - 44.9872989 - ], - [ - -124.0216466, - 44.9885313 - ], - [ - -124.0214766, - 44.9888913 - ], - [ - -124.0209976, - 44.9897713 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16072_s_2455436", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0221287, - 44.9873171 - ], - [ - -124.0221325, - 44.9873177 - ], - [ - -124.0221005, - 44.9874277 - ], - [ - -124.0220891, - 44.9874585 - ], - [ - -124.0220798, - 44.987492 - ], - [ - -124.0220728, - 44.987514 - ], - [ - -124.0220688, - 44.9875134 - ], - [ - -124.0217069, - 44.9884918 - ], - [ - -124.0217105, - 44.9884926 - ], - [ - -124.0216495, - 44.9886316 - ], - [ - -124.02122, - 44.989484 - ], - [ - -124.0211881, - 44.98954 - ], - [ - -124.0211415, - 44.9896205 - ], - [ - -124.0211036, - 44.9896855 - ], - [ - -124.0210385, - 44.9897925 - ], - [ - -124.021056, - 44.9900812 - ], - [ - -124.0205975, - 44.992186 - ], - [ - -124.0195691, - 44.9941869 - ], - [ - -124.0180102, - 44.996007 - ], - [ - -124.0159808, - 44.9975763 - ], - [ - -124.0135587, - 44.9988344 - ], - [ - -124.0108372, - 44.9997331 - ], - [ - -124.0079208, - 45.0002377 - ], - [ - -124.0049216, - 45.0003288 - ], - [ - -124.001955, - 45.0000031 - ], - [ - -123.9991351, - 44.9992728 - ], - [ - -123.9965702, - 44.9981663 - ], - [ - -123.994359, - 44.9967259 - ], - [ - -123.9925865, - 44.9950071 - ], - [ - -123.9913207, - 44.9930759 - ], - [ - -123.990757, - 44.9914342 - ], - [ - -123.9907109, - 44.9914402 - ], - [ - -123.990678, - 44.9913142 - ], - [ - -123.9906605, - 44.9912462 - ], - [ - -123.9905646, - 44.9908662 - ], - [ - -123.990491, - 44.9905737 - ], - [ - -123.9903437, - 44.9898464 - ], - [ - -123.9903227, - 44.9897104 - ], - [ - -123.9902916, - 44.9894869 - ], - [ - -123.9902776, - 44.9893749 - ], - [ - -123.9902495, - 44.9891144 - ], - [ - -123.9902366, - 44.9889714 - ], - [ - -123.9902058, - 44.9883845 - ], - [ - -123.9902038, - 44.9882475 - ], - [ - -123.9903173, - 44.9868123 - ], - [ - -123.9903453, - 44.9866503 - ], - [ - -123.990428, - 44.9862381 - ], - [ - -123.990459, - 44.9861021 - ], - [ - -123.990679, - 44.9853208 - ], - [ - -123.9907311, - 44.9851658 - ], - [ - -123.9912608, - 44.9839228 - ], - [ - -123.9913268, - 44.9837958 - ], - [ - -123.9916145, - 44.983283 - ], - [ - -123.9917055, - 44.983132 - ], - [ - -123.9917197, - 44.9831086 - ], - [ - -123.9918678, - 44.9828646 - ], - [ - -123.991878, - 44.9828478 - ], - [ - -123.991956, - 44.9827198 - ], - [ - -123.9919947, - 44.9826569 - ], - [ - -123.9922868, - 44.982186 - ], - [ - -123.9923511, - 44.9820837 - ], - [ - -123.9924091, - 44.9819927 - ], - [ - -123.9924261, - 44.9819661 - ], - [ - -123.9924381, - 44.9819474 - ], - [ - -123.9924828, - 44.9817712 - ], - [ - -123.9935799, - 44.9797888 - ], - [ - -123.9952007, - 44.9779964 - ], - [ - -123.997283, - 44.9764628 - ], - [ - -123.9997467, - 44.975247 - ], - [ - -124.0024971, - 44.9743957 - ], - [ - -124.0054286, - 44.9739415 - ], - [ - -124.0084287, - 44.9739018 - ], - [ - -124.0113819, - 44.9742784 - ], - [ - -124.0141751, - 44.9750565 - ], - [ - -124.0167007, - 44.9762065 - ], - [ - -124.0188619, - 44.977684 - ], - [ - -124.0205755, - 44.9794324 - ], - [ - -124.0217758, - 44.9813844 - ], - [ - -124.0224164, - 44.9834651 - ], - [ - -124.0224728, - 44.9855946 - ], - [ - -124.0224529, - 44.9857726 - ], - [ - -124.0222805, - 44.9867487 - ], - [ - -124.0222345, - 44.9869387 - ], - [ - -124.0221287, - 44.9873171 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16074_s_16077", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.018119, - 45.0014204 - ], - [ - -124.0162258, - 45.0030509 - ], - [ - -124.0153358, - 45.003681 - ], - [ - -124.0126379, - 45.0052022 - ], - [ - -124.0113978, - 45.0057523 - ], - [ - -124.0101349, - 45.0062552 - ], - [ - -124.0090647, - 45.0066353 - ], - [ - -124.0067115, - 45.0073045 - ], - [ - -124.0056114, - 45.0075445 - ], - [ - -124.0041818, - 45.0077674 - ], - [ - -124.0027121, - 45.0083101 - ], - [ - -124.0023332, - 45.0084184 - ], - [ - -123.9994517, - 45.0090164 - ], - [ - -123.996461, - 45.0092042 - ], - [ - -123.9934762, - 45.0089743 - ], - [ - -123.9906119, - 45.0083357 - ], - [ - -123.9879785, - 45.0073129 - ], - [ - -123.985677, - 45.0059453 - ], - [ - -123.9837959, - 45.0042854 - ], - [ - -123.9824076, - 45.002397 - ], - [ - -123.9815653, - 45.0003527 - ], - [ - -123.9813013, - 44.9982312 - ], - [ - -123.981402, - 44.9975739 - ], - [ - -123.9813907, - 44.997468 - ], - [ - -123.9817343, - 44.9953917 - ], - [ - -123.982632, - 44.9934005 - ], - [ - -123.9840505, - 44.9915681 - ], - [ - -123.9859372, - 44.9899625 - ], - [ - -123.9882222, - 44.9886429 - ], - [ - -123.990821, - 44.9876583 - ], - [ - -123.9914309, - 44.9874783 - ], - [ - -123.9938091, - 44.9869333 - ], - [ - -123.994469, - 44.9868233 - ], - [ - -123.9955258, - 44.9866748 - ], - [ - -123.9959481, - 44.9866263 - ], - [ - -123.99748, - 44.9857394 - ], - [ - -124.0001308, - 44.9847408 - ], - [ - -124.0030051, - 44.9841284 - ], - [ - -124.0059925, - 44.9839255 - ], - [ - -124.0089783, - 44.9841401 - ], - [ - -124.0118478, - 44.9847639 - ], - [ - -124.0144907, - 44.985773 - ], - [ - -124.0168056, - 44.9871285 - ], - [ - -124.0187034, - 44.9887784 - ], - [ - -124.0201114, - 44.9906593 - ], - [ - -124.0209752, - 44.992699 - ], - [ - -124.0212616, - 44.9948191 - ], - [ - -124.0209597, - 44.9969381 - ], - [ - -124.0200809, - 44.9989746 - ], - [ - -124.0186589, - 45.0008503 - ], - [ - -124.018119, - 45.0014204 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16075_s_16074", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0215326, - 44.9910433 - ], - [ - -124.0216834, - 44.9920746 - ], - [ - -124.0217195, - 44.9925346 - ], - [ - -124.0217245, - 44.993677 - ], - [ - -124.0216896, - 44.994176 - ], - [ - -124.0214602, - 44.9955861 - ], - [ - -124.0213703, - 44.9959361 - ], - [ - -124.021027, - 44.9969785 - ], - [ - -124.0208781, - 44.9973475 - ], - [ - -124.0201873, - 44.9987091 - ], - [ - -124.0199254, - 44.9991342 - ], - [ - -124.018459, - 45.0009926 - ], - [ - -124.0165097, - 45.0026123 - ], - [ - -124.0141523, - 45.003931 - ], - [ - -124.0114775, - 45.0048981 - ], - [ - -124.0085881, - 45.0054763 - ], - [ - -124.0055952, - 45.0056434 - ], - [ - -124.0026138, - 45.005393 - ], - [ - -123.9997586, - 45.0047347 - ], - [ - -123.9971394, - 45.0036938 - ], - [ - -123.9948569, - 45.0023104 - ], - [ - -123.9929988, - 45.0006376 - ], - [ - -123.9916364, - 44.9987398 - ], - [ - -123.9908222, - 44.9966898 - ], - [ - -123.9905873, - 44.9945665 - ], - [ - -123.9909055, - 44.9926619 - ], - [ - -123.9907331, - 44.9918566 - ], - [ - -123.9905754, - 44.9897298 - ], - [ - -123.9910054, - 44.9876219 - ], - [ - -123.9920066, - 44.9856141 - ], - [ - -123.9935404, - 44.9837835 - ], - [ - -123.9955479, - 44.9822003 - ], - [ - -123.9979519, - 44.9809255 - ], - [ - -124.00066, - 44.980008 - ], - [ - -124.0035683, - 44.979483 - ], - [ - -124.0065649, - 44.9793707 - ], - [ - -124.0095349, - 44.9796754 - ], - [ - -124.0123641, - 44.9803854 - ], - [ - -124.0149438, - 44.9814735 - ], - [ - -124.017175, - 44.9828978 - ], - [ - -124.0189719, - 44.9846036 - ], - [ - -124.0202655, - 44.9865254 - ], - [ - -124.021006, - 44.9885894 - ], - [ - -124.0215326, - 44.9910433 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16076_s_16075", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0208616, - 44.9879642 - ], - [ - -124.0209754, - 44.9884528 - ], - [ - -124.0211724, - 44.990578 - ], - [ - -124.0207813, - 44.9926896 - ], - [ - -124.0198171, - 44.9947066 - ], - [ - -124.0183168, - 44.9965513 - ], - [ - -124.0163381, - 44.9981528 - ], - [ - -124.0139569, - 44.9994496 - ], - [ - -124.0112647, - 45.0003918 - ], - [ - -124.0083651, - 45.0009433 - ], - [ - -124.0053696, - 45.0010827 - ], - [ - -124.0023934, - 45.0008047 - ], - [ - -123.9995508, - 45.0001201 - ], - [ - -123.9973069, - 44.9992009 - ], - [ - -123.9970595, - 44.9991723 - ], - [ - -123.9942479, - 44.9984262 - ], - [ - -123.9916955, - 44.9973052 - ], - [ - -123.9895005, - 44.9958524 - ], - [ - -123.9877473, - 44.9941237 - ], - [ - -123.9865031, - 44.9921854 - ], - [ - -123.9858158, - 44.9901122 - ], - [ - -123.9857117, - 44.9879837 - ], - [ - -123.9861948, - 44.9858816 - ], - [ - -123.9872464, - 44.9838868 - ], - [ - -123.9888261, - 44.982076 - ], - [ - -123.9908731, - 44.9805186 - ], - [ - -123.9933088, - 44.9792745 - ], - [ - -123.9960395, - 44.9783915 - ], - [ - -123.9972883, - 44.9780885 - ], - [ - -123.9979075, - 44.9779487 - ], - [ - -124.0012349, - 44.9772518 - ], - [ - -124.0040506, - 44.976861 - ], - [ - -124.0069195, - 44.9768499 - ], - [ - -124.009741, - 44.9772189 - ], - [ - -124.012416, - 44.9779551 - ], - [ - -124.0148505, - 44.9790326 - ], - [ - -124.0169591, - 44.9804136 - ], - [ - -124.0186676, - 44.9820495 - ], - [ - -124.0199161, - 44.983883 - ], - [ - -124.0206606, - 44.9858496 - ], - [ - -124.020875, - 44.9878802 - ], - [ - -124.0208616, - 44.9879642 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16077_s_16077", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9812827, - 44.9984335 - ], - [ - -123.9815407, - 44.9963116 - ], - [ - -123.9823772, - 44.9942661 - ], - [ - -123.9837599, - 44.9923757 - ], - [ - -123.9856356, - 44.9907131 - ], - [ - -123.9879324, - 44.989342 - ], - [ - -123.9905618, - 44.9883151 - ], - [ - -123.993423, - 44.987672 - ], - [ - -123.996406, - 44.9874372 - ], - [ - -123.9993962, - 44.9876199 - ], - [ - -124.0022787, - 44.9882129 - ], - [ - -124.004943, - 44.9891936 - ], - [ - -124.0072865, - 44.9905242 - ], - [ - -124.0092193, - 44.9921536 - ], - [ - -124.0106671, - 44.9940193 - ], - [ - -124.0115742, - 44.9960495 - ], - [ - -124.0119057, - 44.9981663 - ], - [ - -124.0116488, - 45.0002883 - ], - [ - -124.0108133, - 45.0023339 - ], - [ - -124.0094313, - 45.0042246 - ], - [ - -124.0075557, - 45.0058877 - ], - [ - -124.0052588, - 45.0072592 - ], - [ - -124.0026288, - 45.0082863 - ], - [ - -123.9997667, - 45.0089297 - ], - [ - -123.9967826, - 45.0091646 - ], - [ - -123.9937913, - 45.0089819 - ], - [ - -123.9909078, - 45.0083886 - ], - [ - -123.9882429, - 45.0074077 - ], - [ - -123.9858991, - 45.0060767 - ], - [ - -123.9839665, - 45.0044469 - ], - [ - -123.9825193, - 45.0025809 - ], - [ - -123.9816131, - 45.0005504 - ], - [ - -123.9812827, - 44.9984335 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16077_s_759421", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9968936, - 44.9865274 - ], - [ - -123.9979172, - 44.9860561 - ], - [ - -124.0005612, - 44.9852879 - ], - [ - -124.0033603, - 44.9848816 - ], - [ - -124.006217, - 44.9848514 - ], - [ - -124.0090318, - 44.9851983 - ], - [ - -124.0117069, - 44.9859104 - ], - [ - -124.0141491, - 44.9869627 - ], - [ - -124.0162733, - 44.9883186 - ], - [ - -124.0166578, - 44.9886146 - ], - [ - -124.0183378, - 44.9901679 - ], - [ - -124.0195976, - 44.9919099 - ], - [ - -124.0196857, - 44.9920647 - ], - [ - -124.0204873, - 44.9939485 - ], - [ - -124.0207969, - 44.9959039 - ], - [ - -124.0208014, - 44.996052 - ], - [ - -124.0206095, - 44.9980119 - ], - [ - -124.0204836, - 44.998566 - ], - [ - -124.0197175, - 45.0006252 - ], - [ - -124.0183998, - 45.0025389 - ], - [ - -124.0165812, - 45.0042334 - ], - [ - -124.0143313, - 45.0056436 - ], - [ - -124.0117369, - 45.0067152 - ], - [ - -124.0088974, - 45.0074071 - ], - [ - -124.0059223, - 45.0076927 - ], - [ - -124.0050181, - 45.007653 - ], - [ - -124.0048822, - 45.0076817 - ], - [ - -124.0046939, - 45.0077111 - ], - [ - -124.0044826, - 45.0078136 - ], - [ - -124.0041722, - 45.007936 - ], - [ - -124.0029503, - 45.0083683 - ], - [ - -124.0026975, - 45.008448 - ], - [ - -124.0000572, - 45.009083 - ], - [ - -123.9972983, - 45.009368 - ], - [ - -123.9945123, - 45.0092933 - ], - [ - -123.9917916, - 45.0088616 - ], - [ - -123.9892263, - 45.0080871 - ], - [ - -123.9869016, - 45.0069955 - ], - [ - -123.9867752, - 45.0069236 - ], - [ - -123.9847186, - 45.0055103 - ], - [ - -123.9830688, - 45.0038501 - ], - [ - -123.9818836, - 45.002001 - ], - [ - -123.9812043, - 45.0000277 - ], - [ - -123.9810547, - 44.9979992 - ], - [ - -123.9814399, - 44.9959864 - ], - [ - -123.9822852, - 44.9941897 - ], - [ - -123.9823794, - 44.9939263 - ], - [ - -123.9837921, - 44.9918919 - ], - [ - -123.9857692, - 44.99011 - ], - [ - -123.9882243, - 44.9886581 - ], - [ - -123.9910506, - 44.9875994 - ], - [ - -123.9916702, - 44.9874232 - ], - [ - -123.9935569, - 44.9869851 - ], - [ - -123.9941658, - 44.9868741 - ], - [ - -123.9956925, - 44.9866539 - ], - [ - -123.9968233, - 44.9865329 - ], - [ - -123.9968936, - 44.9865274 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16079_s_16079", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9951555, - 44.996691 - ], - [ - -123.995413, - 44.994569 - ], - [ - -123.996249, - 44.9925235 - ], - [ - -123.9976312, - 44.9906329 - ], - [ - -123.9995065, - 44.98897 - ], - [ - -124.0018028, - 44.9875986 - ], - [ - -124.0044319, - 44.9865715 - ], - [ - -124.0072929, - 44.985928 - ], - [ - -124.0102757, - 44.9856929 - ], - [ - -124.0132658, - 44.9858751 - ], - [ - -124.0161484, - 44.9864678 - ], - [ - -124.0188128, - 44.9874482 - ], - [ - -124.0211566, - 44.9887785 - ], - [ - -124.0230897, - 44.9904077 - ], - [ - -124.0245379, - 44.9922732 - ], - [ - -124.0254455, - 44.9943033 - ], - [ - -124.0257775, - 44.99642 - ], - [ - -124.0255211, - 44.998542 - ], - [ - -124.0246861, - 45.0005878 - ], - [ - -124.0233046, - 45.0024786 - ], - [ - -124.0214295, - 45.0041419 - ], - [ - -124.019133, - 45.0055137 - ], - [ - -124.0165033, - 45.0065412 - ], - [ - -124.0136415, - 45.0071849 - ], - [ - -124.0106576, - 45.0074201 - ], - [ - -124.0076663, - 45.0072378 - ], - [ - -124.0047827, - 45.0066449 - ], - [ - -124.0021177, - 45.0056643 - ], - [ - -123.9997736, - 45.0043336 - ], - [ - -123.9978407, - 45.002704 - ], - [ - -123.9963931, - 45.0008382 - ], - [ - -123.9954864, - 44.9988078 - ], - [ - -123.9951555, - 44.996691 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16079_s_16080", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.025299, - 44.9988841 - ], - [ - -124.0242261, - 45.0013217 - ], - [ - -124.0241144, - 45.0014989 - ], - [ - -124.0228091, - 45.0031614 - ], - [ - -124.0211149, - 45.0046369 - ], - [ - -124.0209406, - 45.004764 - ], - [ - -124.0190423, - 45.0059384 - ], - [ - -124.0174173, - 45.0067874 - ], - [ - -124.0156287, - 45.0075927 - ], - [ - -124.0151709, - 45.0077686 - ], - [ - -124.0111415, - 45.0088299 - ], - [ - -124.0106989, - 45.0088983 - ], - [ - -124.0075449, - 45.0091475 - ], - [ - -124.0071179, - 45.0091496 - ], - [ - -124.0050311, - 45.0090588 - ], - [ - -124.0031912, - 45.0088887 - ], - [ - -124.0002786, - 45.0084107 - ], - [ - -123.9975526, - 45.0075404 - ], - [ - -123.9951169, - 45.0063109 - ], - [ - -123.9930644, - 45.0047691 - ], - [ - -123.9914733, - 45.0029738 - ], - [ - -123.9904041, - 45.0009934 - ], - [ - -123.9898977, - 44.9989034 - ], - [ - -123.9899732, - 44.9967834 - ], - [ - -123.990137, - 44.9958431 - ], - [ - -123.9907955, - 44.9937652 - ], - [ - -123.9920125, - 44.9918183 - ], - [ - -123.9937414, - 44.9900773 - ], - [ - -123.9959156, - 44.988609 - ], - [ - -123.9984515, - 44.9874699 - ], - [ - -124.0012518, - 44.9867038 - ], - [ - -124.0042089, - 44.9863399 - ], - [ - -124.0052404, - 44.9863579 - ], - [ - -124.0071795, - 44.9859236 - ], - [ - -124.0101627, - 44.985691 - ], - [ - -124.0131525, - 44.9858759 - ], - [ - -124.0160341, - 44.986471 - ], - [ - -124.0186968, - 44.9874536 - ], - [ - -124.0210383, - 44.9887859 - ], - [ - -124.0229687, - 44.9904168 - ], - [ - -124.0244137, - 44.9922835 - ], - [ - -124.0253178, - 44.9943144 - ], - [ - -124.0256463, - 44.9964314 - ], - [ - -124.0253863, - 44.9985532 - ], - [ - -124.025299, - 44.9988841 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16080_s_16072", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0206187, - 44.9980672 - ], - [ - -124.0205999, - 44.9981724 - ], - [ - -124.0205146, - 44.9986238 - ], - [ - -124.0198258, - 45.0006967 - ], - [ - -124.0185802, - 45.0026346 - ], - [ - -124.0168256, - 45.0043627 - ], - [ - -124.0146294, - 45.0058148 - ], - [ - -124.0120759, - 45.0069349 - ], - [ - -124.0092634, - 45.0076801 - ], - [ - -124.0062999, - 45.0080216 - ], - [ - -124.0032995, - 45.0079463 - ], - [ - -124.0003774, - 45.0074572 - ], - [ - -123.9976461, - 45.006573 - ], - [ - -123.9952105, - 45.0053277 - ], - [ - -123.9931643, - 45.0037693 - ], - [ - -123.9915861, - 45.0019575 - ], - [ - -123.9905365, - 44.9999621 - ], - [ - -123.9900558, - 44.9978598 - ], - [ - -123.9900673, - 44.9976309 - ], - [ - -123.9898028, - 44.9966511 - ], - [ - -123.9898434, - 44.9944564 - ], - [ - -123.9905049, - 44.9923122 - ], - [ - -123.9908024, - 44.9918368 - ], - [ - -123.9906605, - 44.9912054 - ], - [ - -123.9904809, - 44.9890794 - ], - [ - -123.9908891, - 44.9869694 - ], - [ - -123.9918696, - 44.9849565 - ], - [ - -123.9933845, - 44.9831179 - ], - [ - -123.9953755, - 44.9815244 - ], - [ - -123.9977663, - 44.9802371 - ], - [ - -124.0004649, - 44.9793055 - ], - [ - -124.0033676, - 44.9787654 - ], - [ - -124.0063629, - 44.9786376 - ], - [ - -124.0093359, - 44.9789269 - ], - [ - -124.0121723, - 44.9796222 - ], - [ - -124.0147632, - 44.9806968 - ], - [ - -124.017009, - 44.9821095 - ], - [ - -124.0188234, - 44.9838059 - ], - [ - -124.0201368, - 44.9857209 - ], - [ - -124.0208985, - 44.987781 - ], - [ - -124.0216191, - 44.9909813 - ], - [ - -124.0218064, - 44.9924322 - ], - [ - -124.0218314, - 44.9931628 - ], - [ - -124.0216924, - 44.9949102 - ], - [ - -124.0216171, - 44.9952976 - ], - [ - -124.0213289, - 44.9963752 - ], - [ - -124.0211732, - 44.9968305 - ], - [ - -124.0206187, - 44.9980672 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16080_s_16210", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0032682, - 45.0079106 - ], - [ - -124.0031613, - 45.0079266 - ], - [ - -124.0024311, - 45.0079966 - ], - [ - -124.0012879, - 45.0080657 - ], - [ - -123.9991697, - 45.0086446 - ], - [ - -123.9972837, - 45.0094718 - ], - [ - -123.9967365, - 45.0098568 - ], - [ - -123.9942333, - 45.0110328 - ], - [ - -123.9914546, - 45.0118397 - ], - [ - -123.9885073, - 45.0122465 - ], - [ - -123.9855048, - 45.0122376 - ], - [ - -123.9825625, - 45.0118133 - ], - [ - -123.9797935, - 45.0109899 - ], - [ - -123.9773042, - 45.009799 - ], - [ - -123.9751904, - 45.0082865 - ], - [ - -123.9735333, - 45.0065105 - ], - [ - -123.9723965, - 45.0045392 - ], - [ - -123.9718238, - 45.0024485 - ], - [ - -123.9718369, - 45.0003187 - ], - [ - -123.9724354, - 44.9982317 - ], - [ - -123.9735963, - 44.9962676 - ], - [ - -123.9752747, - 44.9945018 - ], - [ - -123.9755548, - 44.9942619 - ], - [ - -123.9769212, - 44.9932348 - ], - [ - -123.9774212, - 44.9929048 - ], - [ - -123.9791567, - 44.9919162 - ], - [ - -123.9796267, - 44.9916862 - ], - [ - -123.9802701, - 44.991388 - ], - [ - -123.9838498, - 44.9898183 - ], - [ - -123.9849342, - 44.9893849 - ], - [ - -123.9857341, - 44.9890949 - ], - [ - -123.9871969, - 44.9886315 - ], - [ - -123.9918062, - 44.9873717 - ], - [ - -123.9941129, - 44.986885 - ], - [ - -123.9954327, - 44.986685 - ], - [ - -123.9967186, - 44.9865305 - ], - [ - -123.9967828, - 44.9865247 - ], - [ - -123.9969543, - 44.9864321 - ], - [ - -123.9996508, - 44.9854975 - ], - [ - -124.0025524, - 44.9849541 - ], - [ - -124.0055477, - 44.9848227 - ], - [ - -124.0085215, - 44.9851085 - ], - [ - -124.0113597, - 44.9858004 - ], - [ - -124.0139532, - 44.9868718 - ], - [ - -124.0162025, - 44.9882817 - ], - [ - -124.0165825, - 44.9885717 - ], - [ - -124.0180175, - 44.9898465 - ], - [ - -124.0191674, - 44.9912594 - ], - [ - -124.0193075, - 44.9914661 - ], - [ - -124.0203595, - 44.9935271 - ], - [ - -124.0208071, - 44.995696 - ], - [ - -124.0206321, - 44.9978845 - ], - [ - -124.0206256, - 44.9979134 - ], - [ - -124.0205314, - 44.9984656 - ], - [ - -124.0198804, - 45.0005448 - ], - [ - -124.0186702, - 45.0024938 - ], - [ - -124.0169472, - 45.0042379 - ], - [ - -124.0147776, - 45.00571 - ], - [ - -124.0122448, - 45.0068535 - ], - [ - -124.009446, - 45.0076243 - ], - [ - -124.0064891, - 45.007993 - ], - [ - -124.0034875, - 45.0079452 - ], - [ - -124.0032682, - 45.0079106 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16081_s_16082", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0216491, - 44.9866582 - ], - [ - -124.0207397, - 44.988234 - ], - [ - -124.0190822, - 44.9900095 - ], - [ - -124.0169683, - 44.9915215 - ], - [ - -124.0144793, - 44.9927117 - ], - [ - -124.0117107, - 44.9935344 - ], - [ - -124.0087691, - 44.993958 - ], - [ - -124.0057676, - 44.9939662 - ], - [ - -124.0028215, - 44.9935586 - ], - [ - -124.0000441, - 44.992751 - ], - [ - -123.9975423, - 44.9915743 - ], - [ - -123.9954121, - 44.9900739 - ], - [ - -123.9937355, - 44.9883073 - ], - [ - -123.9925769, - 44.9863426 - ], - [ - -123.9919806, - 44.9842553 - ], - [ - -123.9919697, - 44.9821255 - ], - [ - -123.99209, - 44.9812255 - ], - [ - -123.9925016, - 44.9795518 - ], - [ - -123.9926317, - 44.9791918 - ], - [ - -123.9935606, - 44.9773381 - ], - [ - -123.9938207, - 44.9769381 - ], - [ - -123.9951182, - 44.9753224 - ], - [ - -123.9954583, - 44.9749724 - ], - [ - -123.9966102, - 44.9739293 - ], - [ - -123.9970602, - 44.9735693 - ], - [ - -123.9971495, - 44.9735004 - ], - [ - -123.9973032, - 44.973231 - ], - [ - -123.9986971, - 44.9713449 - ], - [ - -124.0005824, - 44.9696881 - ], - [ - -124.0028868, - 44.9683242 - ], - [ - -124.0055216, - 44.9673055 - ], - [ - -124.0083857, - 44.9666713 - ], - [ - -124.0113689, - 44.9664458 - ], - [ - -124.0143569, - 44.9666378 - ], - [ - -124.0172347, - 44.9672398 - ], - [ - -124.0198919, - 44.9682287 - ], - [ - -124.0222263, - 44.9695666 - ], - [ - -124.0241483, - 44.971202 - ], - [ - -124.025584, - 44.9730722 - ], - [ - -124.0264782, - 44.9751052 - ], - [ - -124.0267965, - 44.977223 - ], - [ - -124.0265266, - 44.9793442 - ], - [ - -124.0256788, - 44.9813872 - ], - [ - -124.0247091, - 44.9830874 - ], - [ - -124.0244716, - 44.9834812 - ], - [ - -124.0242617, - 44.9838112 - ], - [ - -124.023226, - 44.9851719 - ], - [ - -124.022966, - 44.9854619 - ], - [ - -124.0216491, - 44.9866582 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16082_s_16084", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0295645, - 44.9731011 - ], - [ - -124.0278846, - 44.9774215 - ], - [ - -124.0272496, - 44.9787252 - ], - [ - -124.0256102, - 44.9815054 - ], - [ - -124.0241858, - 44.9833801 - ], - [ - -124.0222734, - 44.9850214 - ], - [ - -124.0199464, - 44.9863664 - ], - [ - -124.0172942, - 44.9873633 - ], - [ - -124.0144189, - 44.9879738 - ], - [ - -124.011431, - 44.9881744 - ], - [ - -124.0084454, - 44.9879575 - ], - [ - -124.0055768, - 44.9873313 - ], - [ - -124.0029355, - 44.9863199 - ], - [ - -124.0006232, - 44.9849622 - ], - [ - -123.9987286, - 44.9833104 - ], - [ - -123.9973246, - 44.9814281 - ], - [ - -123.9964651, - 44.9793875 - ], - [ - -123.9961831, - 44.9772671 - ], - [ - -123.9964892, - 44.9751484 - ], - [ - -123.9973718, - 44.9731128 - ], - [ - -123.9986362, - 44.9709704 - ], - [ - -124.0006582, - 44.9657768 - ], - [ - -124.000955, - 44.965101 - ], - [ - -124.000976, - 44.9650583 - ], - [ - -124.0006272, - 44.9643821 - ], - [ - -124.0001626, - 44.962326 - ], - [ - -124.000259, - 44.9602447 - ], - [ - -124.000592, - 44.959211 - ], - [ - -124.0006364, - 44.9589178 - ], - [ - -124.0008222, - 44.9584964 - ], - [ - -124.000913, - 44.9582147 - ], - [ - -124.0010272, - 44.9580315 - ], - [ - -124.0015326, - 44.9568853 - ], - [ - -124.00297, - 44.9550159 - ], - [ - -124.0048933, - 44.9533815 - ], - [ - -124.0072286, - 44.952045 - ], - [ - -124.0098861, - 44.9510575 - ], - [ - -124.0127638, - 44.9504571 - ], - [ - -124.0157511, - 44.9502669 - ], - [ - -124.0187333, - 44.950494 - ], - [ - -124.0215959, - 44.9511299 - ], - [ - -124.0242288, - 44.95215 - ], - [ - -124.026531, - 44.9535152 - ], - [ - -124.0284139, - 44.9551731 - ], - [ - -124.0292555, - 44.9563144 - ], - [ - -124.0293223, - 44.9563693 - ], - [ - -124.0305365, - 44.957733 - ], - [ - -124.0307465, - 44.958013 - ], - [ - -124.0315398, - 44.9592515 - ], - [ - -124.0317599, - 44.9596614 - ], - [ - -124.0326505, - 44.9622143 - ], - [ - -124.0329911, - 44.9641942 - ], - [ - -124.0330998, - 44.9652602 - ], - [ - -124.0331099, - 44.9655702 - ], - [ - -124.0327915, - 44.9680396 - ], - [ - -124.0327415, - 44.9682096 - ], - [ - -124.0325953, - 44.9686591 - ], - [ - -124.0324954, - 44.9689391 - ], - [ - -124.0310587, - 44.9715207 - ], - [ - -124.0306388, - 44.9720607 - ], - [ - -124.0295645, - 44.9731011 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16082_s_759422", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0317887, - 44.970251 - ], - [ - -124.0312775, - 44.9711605 - ], - [ - -124.0311186, - 44.9713885 - ], - [ - -124.0296981, - 44.9730381 - ], - [ - -124.0294522, - 44.9732737 - ], - [ - -124.0280174, - 44.9769775 - ], - [ - -124.0276595, - 44.9777786 - ], - [ - -124.0271018, - 44.9788777 - ], - [ - -124.0268548, - 44.9793322 - ], - [ - -124.0256312, - 44.9814413 - ], - [ - -124.0242221, - 44.9833218 - ], - [ - -124.0223231, - 44.984971 - ], - [ - -124.0200071, - 44.9863255 - ], - [ - -124.0173632, - 44.9873333 - ], - [ - -124.0144929, - 44.9879556 - ], - [ - -124.0115067, - 44.9881685 - ], - [ - -124.0085193, - 44.9879638 - ], - [ - -124.0056456, - 44.9873494 - ], - [ - -124.0029962, - 44.9863489 - ], - [ - -124.0006728, - 44.9850007 - ], - [ - -123.9987648, - 44.9833568 - ], - [ - -123.9973455, - 44.9814802 - ], - [ - -123.9964693, - 44.9794432 - ], - [ - -123.99617, - 44.977324 - ], - [ - -123.9964589, - 44.9752041 - ], - [ - -123.9973248, - 44.9731649 - ], - [ - -123.9984185, - 44.9712813 - ], - [ - -123.9986593, - 44.9708071 - ], - [ - -124.0007024, - 44.9655399 - ], - [ - -124.0015382, - 44.9639077 - ], - [ - -124.0018163, - 44.9634757 - ], - [ - -124.0028296, - 44.9621527 - ], - [ - -124.0030747, - 44.9618797 - ], - [ - -124.0039888, - 44.9610406 - ], - [ - -124.0043669, - 44.9604008 - ], - [ - -124.0059933, - 44.9586722 - ], - [ - -124.0080534, - 44.9571952 - ], - [ - -124.0093776, - 44.9565538 - ], - [ - -124.0098011, - 44.9563137 - ], - [ - -124.0100992, - 44.9562043 - ], - [ - -124.010472, - 44.9560237 - ], - [ - -124.011186, - 44.9558051 - ], - [ - -124.0124653, - 44.9553352 - ], - [ - -124.0153472, - 44.9547444 - ], - [ - -124.0183359, - 44.9545642 - ], - [ - -124.0213168, - 44.9548013 - ], - [ - -124.0241753, - 44.9554467 - ], - [ - -124.0268016, - 44.9564757 - ], - [ - -124.0290949, - 44.9578486 - ], - [ - -124.030967, - 44.9595127 - ], - [ - -124.0323459, - 44.9614042 - ], - [ - -124.0331787, - 44.9634503 - ], - [ - -124.0334332, - 44.9655724 - ], - [ - -124.0330997, - 44.9676891 - ], - [ - -124.0321908, - 44.9697188 - ], - [ - -124.0321327, - 44.9698148 - ], - [ - -124.0317887, - 44.970251 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16084_s_16094", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0177916, - 44.9485303 - ], - [ - -124.0190724, - 44.9487779 - ], - [ - -124.0216965, - 44.9496947 - ], - [ - -124.0240271, - 44.9509493 - ], - [ - -124.025979, - 44.9524958 - ], - [ - -124.0274202, - 44.9542056 - ], - [ - -124.0288629, - 44.9556196 - ], - [ - -124.0301613, - 44.9576993 - ], - [ - -124.0308212, - 44.9599254 - ], - [ - -124.0308323, - 44.9600014 - ], - [ - -124.0308455, - 44.9621312 - ], - [ - -124.0302732, - 44.9642219 - ], - [ - -124.0291373, - 44.9661932 - ], - [ - -124.0274815, - 44.9679692 - ], - [ - -124.0253693, - 44.9694818 - ], - [ - -124.0228818, - 44.9706727 - ], - [ - -124.0201148, - 44.9714962 - ], - [ - -124.0171746, - 44.9719206 - ], - [ - -124.0141742, - 44.9719296 - ], - [ - -124.0135554, - 44.9718442 - ], - [ - -124.0113552, - 44.9716308 - ], - [ - -124.0085854, - 44.9709635 - ], - [ - -124.0075346, - 44.9705378 - ], - [ - -124.0074023, - 44.970528 - ], - [ - -124.0044429, - 44.9698617 - ], - [ - -124.0041624, - 44.9697502 - ], - [ - -124.0036087, - 44.9696171 - ], - [ - -124.0011989, - 44.9686673 - ], - [ - -123.9990683, - 44.967426 - ], - [ - -123.997286, - 44.9659335 - ], - [ - -123.9959097, - 44.9642383 - ], - [ - -123.9958687, - 44.9641753 - ], - [ - -123.9949534, - 44.9623603 - ], - [ - -123.9945043, - 44.9604591 - ], - [ - -123.9944974, - 44.9603951 - ], - [ - -123.9944518, - 44.9595985 - ], - [ - -123.9944451, - 44.9583855 - ], - [ - -123.9946838, - 44.956431 - ], - [ - -123.9954136, - 44.9545388 - ], - [ - -123.9966107, - 44.9527706 - ], - [ - -123.9967007, - 44.9526637 - ], - [ - -123.9985648, - 44.9508881 - ], - [ - -124.000897, - 44.9494178 - ], - [ - -124.0036005, - 44.9483139 - ], - [ - -124.0042559, - 44.9481062 - ], - [ - -124.0071013, - 44.9474329 - ], - [ - -124.0100769, - 44.9471667 - ], - [ - -124.0130685, - 44.9473178 - ], - [ - -124.0159611, - 44.9478803 - ], - [ - -124.0177916, - 44.9485303 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16084_s_16185", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0317755, - 44.9509085 - ], - [ - -124.0317491, - 44.9509331 - ], - [ - -124.0314911, - 44.9511732 - ], - [ - -124.0314739, - 44.9511891 - ], - [ - -124.031174, - 44.9514671 - ], - [ - -124.031125, - 44.9515123 - ], - [ - -124.0310878, - 44.9515464 - ], - [ - -124.0307937, - 44.9518188 - ], - [ - -124.030126, - 44.9524391 - ], - [ - -124.0300148, - 44.9525412 - ], - [ - -124.0298217, - 44.9527162 - ], - [ - -124.0297482, - 44.9527973 - ], - [ - -124.0295773, - 44.9529817 - ], - [ - -124.0294305, - 44.9531366 - ], - [ - -124.0293219, - 44.9532737 - ], - [ - -124.0293296, - 44.95346 - ], - [ - -124.0293326, - 44.953638 - ], - [ - -124.0293331, - 44.9536721 - ], - [ - -124.0293352, - 44.9538331 - ], - [ - -124.0293266, - 44.9543074 - ], - [ - -124.0293192, - 44.9544593 - ], - [ - -124.0293058, - 44.9547512 - ], - [ - -124.029275, - 44.9551718 - ], - [ - -124.029254, - 44.9553798 - ], - [ - -124.0292072, - 44.9557536 - ], - [ - -124.0292049, - 44.9557692 - ], - [ - -124.0291591, - 44.9561008 - ], - [ - -124.0291537, - 44.9561395 - ], - [ - -124.0298515, - 44.95709 - ], - [ - -124.0306927, - 44.9591344 - ], - [ - -124.0309559, - 44.961256 - ], - [ - -124.030953, - 44.961459 - ], - [ - -124.0308731, - 44.962461 - ], - [ - -124.0308651, - 44.962516 - ], - [ - -124.030393, - 44.9642956 - ], - [ - -124.0303561, - 44.9643906 - ], - [ - -124.0293433, - 44.9662839 - ], - [ - -124.0278531, - 44.9680108 - ], - [ - -124.0278151, - 44.9680468 - ], - [ - -124.0258899, - 44.9695534 - ], - [ - -124.0257249, - 44.9696604 - ], - [ - -124.0232094, - 44.9709838 - ], - [ - -124.0203672, - 44.9719161 - ], - [ - -124.017317, - 44.9724182 - ], - [ - -124.0141867, - 44.9724692 - ], - [ - -124.0111073, - 44.9720668 - ], - [ - -124.0082078, - 44.9712279 - ], - [ - -124.0056096, - 44.9699877 - ], - [ - -124.0034214, - 44.9683981 - ], - [ - -124.0033464, - 44.9683311 - ], - [ - -124.0029188, - 44.9679303 - ], - [ - -124.0026758, - 44.9676913 - ], - [ - -124.0025862, - 44.9676022 - ], - [ - -124.0023742, - 44.9673892 - ], - [ - -124.0017738, - 44.9667375 - ], - [ - -124.0015969, - 44.9665294 - ], - [ - -124.0013968, - 44.9662872 - ], - [ - -124.0011578, - 44.9659892 - ], - [ - -124.0005393, - 44.9651313 - ], - [ - -124.0005013, - 44.9650723 - ], - [ - -124.0002575, - 44.9646608 - ], - [ - -124.000213, - 44.9645888 - ], - [ - -124.0001464, - 44.9644812 - ], - [ - -123.9998754, - 44.9640144 - ], - [ - -123.9998184, - 44.9639094 - ], - [ - -123.9995789, - 44.9634354 - ], - [ - -123.9995029, - 44.9632734 - ], - [ - -123.9994363, - 44.9631279 - ], - [ - -123.9993643, - 44.9629669 - ], - [ - -123.9993449, - 44.9629233 - ], - [ - -123.999319, - 44.9628643 - ], - [ - -123.9991361, - 44.9624153 - ], - [ - -123.9990761, - 44.9622553 - ], - [ - -123.9990013, - 44.9620476 - ], - [ - -123.9988295, - 44.9615496 - ], - [ - -123.9985507, - 44.9605353 - ], - [ - -123.9984768, - 44.9601763 - ], - [ - -123.998401, - 44.9597492 - ], - [ - -123.9983751, - 44.9595752 - ], - [ - -123.9983218, - 44.9589609 - ], - [ - -123.9983171, - 44.9589611 - ], - [ - -123.9983061, - 44.9588391 - ], - [ - -123.9983016, - 44.9587269 - ], - [ - -123.9982923, - 44.9586194 - ], - [ - -123.9982883, - 44.9584574 - ], - [ - -123.9982907, - 44.9584574 - ], - [ - -123.9982753, - 44.9580785 - ], - [ - -123.9982774, - 44.9578465 - ], - [ - -123.9982835, - 44.9576004 - ], - [ - -123.9982956, - 44.9573044 - ], - [ - -123.9983363, - 44.9567669 - ], - [ - -123.9983767, - 44.9564022 - ], - [ - -123.9983942, - 44.9562346 - ], - [ - -123.9984135, - 44.9560509 - ], - [ - -123.9984429, - 44.9558069 - ], - [ - -123.9984537, - 44.955728 - ], - [ - -123.9984898, - 44.9554471 - ], - [ - -123.9985353, - 44.9551404 - ], - [ - -123.9985574, - 44.9550096 - ], - [ - -123.9985625, - 44.9549722 - ], - [ - -123.9985707, - 44.9549135 - ], - [ - -123.9985979, - 44.9547247 - ], - [ - -123.9986002, - 44.9547079 - ], - [ - -123.9986027, - 44.9546894 - ], - [ - -123.9986468, - 44.9543724 - ], - [ - -123.9986503, - 44.9543475 - ], - [ - -123.9986764, - 44.9541645 - ], - [ - -123.9986779, - 44.9541535 - ], - [ - -123.9987021, - 44.9539855 - ], - [ - -123.9987096, - 44.9539276 - ], - [ - -123.998727, - 44.9538037 - ], - [ - -123.9987229, - 44.9537374 - ], - [ - -123.9987032, - 44.953537 - ], - [ - -123.9986945, - 44.9534544 - ], - [ - -123.998608, - 44.9526587 - ], - [ - -123.9985919, - 44.9524935 - ], - [ - -123.9985738, - 44.9522859 - ], - [ - -123.9985548, - 44.9520813 - ], - [ - -123.9985231, - 44.9512306 - ], - [ - -123.9985251, - 44.9511166 - ], - [ - -123.9985294, - 44.9509628 - ], - [ - -123.9985354, - 44.9508028 - ], - [ - -123.9986348, - 44.9498241 - ], - [ - -123.9986578, - 44.9496851 - ], - [ - -123.9988844, - 44.9487059 - ], - [ - -123.9989234, - 44.9485749 - ], - [ - -123.9989944, - 44.9483484 - ], - [ - -123.9990485, - 44.9481844 - ], - [ - -123.9990673, - 44.948128 - ], - [ - -123.9990963, - 44.948042 - ], - [ - -123.9993185, - 44.9474563 - ], - [ - -123.9993615, - 44.9473543 - ], - [ - -123.9998674, - 44.9463405 - ], - [ - -123.9999925, - 44.9461245 - ], - [ - -124.0004123, - 44.9454631 - ], - [ - -124.0005493, - 44.9452651 - ], - [ - -124.0008715, - 44.9448252 - ], - [ - -124.0011586, - 44.9444543 - ], - [ - -124.0013128, - 44.9442597 - ], - [ - -124.0019809, - 44.9434368 - ], - [ - -124.0020718, - 44.9433263 - ], - [ - -124.0023115, - 44.943039 - ], - [ - -124.0023773, - 44.9429598 - ], - [ - -124.0026505, - 44.9426241 - ], - [ - -124.0030589, - 44.9421083 - ], - [ - -124.0037033, - 44.9413658 - ], - [ - -124.0041066, - 44.9409404 - ], - [ - -124.0044795, - 44.9405293 - ], - [ - -124.0053, - 44.9397105 - ], - [ - -124.005874, - 44.9391903 - ], - [ - -124.0064939, - 44.9386146 - ], - [ - -124.0065083, - 44.9386012 - ], - [ - -124.0068323, - 44.9383013 - ], - [ - -124.0071843, - 44.9379758 - ], - [ - -124.0074155, - 44.9377608 - ], - [ - -124.0074657, - 44.9377137 - ], - [ - -124.0075908, - 44.9375951 - ], - [ - -124.0077671, - 44.9374277 - ], - [ - -124.0077774, - 44.9374179 - ], - [ - -124.0080266, - 44.9371819 - ], - [ - -124.0082798, - 44.9369275 - ], - [ - -124.0095872, - 44.9358458 - ], - [ - -124.0096812, - 44.9357539 - ], - [ - -124.0097633, - 44.9357001 - ], - [ - -124.0101541, - 44.9353767 - ], - [ - -124.0108987, - 44.9349551 - ], - [ - -124.0118838, - 44.9343087 - ], - [ - -124.0144408, - 44.9331964 - ], - [ - -124.0172542, - 44.9324598 - ], - [ - -124.0202157, - 44.9321271 - ], - [ - -124.0232118, - 44.9322112 - ], - [ - -124.0261272, - 44.9327087 - ], - [ - -124.02885, - 44.9336006 - ], - [ - -124.0312756, - 44.9348527 - ], - [ - -124.0333108, - 44.9364168 - ], - [ - -124.0348775, - 44.9382328 - ], - [ - -124.0359153, - 44.940231 - ], - [ - -124.0363844, - 44.9423346 - ], - [ - -124.0362666, - 44.9444628 - ], - [ - -124.0355664, - 44.9465338 - ], - [ - -124.0354165, - 44.9468408 - ], - [ - -124.0341426, - 44.9487969 - ], - [ - -124.0323499, - 44.9505359 - ], - [ - -124.0317755, - 44.9509085 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16086_s_16087", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0337515, - 44.9265252 - ], - [ - -124.0349833, - 44.9285068 - ], - [ - -124.0356372, - 44.9306227 - ], - [ - -124.0356873, - 44.9327887 - ], - [ - -124.0351313, - 44.9349186 - ], - [ - -124.0339914, - 44.9369279 - ], - [ - -124.0323129, - 44.9387365 - ], - [ - -124.0301625, - 44.9402727 - ], - [ - -124.0276255, - 44.9414753 - ], - [ - -124.0273338, - 44.9415854 - ], - [ - -124.0244758, - 44.942414 - ], - [ - -124.0214417, - 44.9428181 - ], - [ - -124.0183552, - 44.9427813 - ], - [ - -124.0153419, - 44.9423051 - ], - [ - -124.0125247, - 44.9414089 - ], - [ - -124.0100183, - 44.9401291 - ], - [ - -124.0079248, - 44.938518 - ], - [ - -124.0076986, - 44.9383042 - ], - [ - -124.0076898, - 44.9382984 - ], - [ - -124.005814, - 44.9371289 - ], - [ - -124.0037652, - 44.9355738 - ], - [ - -124.0021831, - 44.9337645 - ], - [ - -124.0011283, - 44.9317708 - ], - [ - -124.0006414, - 44.9296693 - ], - [ - -124.0007411, - 44.9275406 - ], - [ - -124.0014234, - 44.9254667 - ], - [ - -124.0026621, - 44.9235271 - ], - [ - -124.0044094, - 44.9217965 - ], - [ - -124.0065983, - 44.9203412 - ], - [ - -124.0091447, - 44.9192173 - ], - [ - -124.0119506, - 44.9184679 - ], - [ - -124.0149084, - 44.9181217 - ], - [ - -124.0179044, - 44.9181921 - ], - [ - -124.0208235, - 44.9186763 - ], - [ - -124.0235537, - 44.9195558 - ], - [ - -124.02599, - 44.9207968 - ], - [ - -124.0280235, - 44.9220643 - ], - [ - -124.0283354, - 44.9222642 - ], - [ - -124.0290271, - 44.9227198 - ], - [ - -124.0291754, - 44.9228236 - ], - [ - -124.0296196, - 44.9230234 - ], - [ - -124.0317913, - 44.9244917 - ], - [ - -124.0335182, - 44.9262327 - ], - [ - -124.0337515, - 44.9265252 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16087_s_16088", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.02974, - 44.9244485 - ], - [ - -124.0306058, - 44.9260267 - ], - [ - -124.0311287, - 44.9281238 - ], - [ - -124.0310656, - 44.9302532 - ], - [ - -124.0304189, - 44.9323329 - ], - [ - -124.0292134, - 44.934283 - ], - [ - -124.0274953, - 44.9360286 - ], - [ - -124.0253308, - 44.9375025 - ], - [ - -124.0228028, - 44.9386481 - ], - [ - -124.0200087, - 44.9394213 - ], - [ - -124.0170559, - 44.9397924 - ], - [ - -124.0140578, - 44.9397472 - ], - [ - -124.0111298, - 44.9392874 - ], - [ - -124.0083844, - 44.9384306 - ], - [ - -124.0059272, - 44.9372098 - ], - [ - -124.0045472, - 44.9363697 - ], - [ - -124.0027601, - 44.9350839 - ], - [ - -124.0012979, - 44.9336055 - ], - [ - -124.000878, - 44.9330954 - ], - [ - -123.9993298, - 44.930482 - ], - [ - -123.9991099, - 44.9299119 - ], - [ - -123.9986834, - 44.9283827 - ], - [ - -123.9985835, - 44.9278127 - ], - [ - -123.9984725, - 44.9261662 - ], - [ - -123.9987133, - 44.9245268 - ], - [ - -123.9987198, - 44.9245014 - ], - [ - -123.9981206, - 44.9235773 - ], - [ - -123.9974217, - 44.9215061 - ], - [ - -123.997305, - 44.9193779 - ], - [ - -123.9977749, - 44.9172744 - ], - [ - -123.9988132, - 44.9152764 - ], - [ - -124.0003802, - 44.9134607 - ], - [ - -124.0024154, - 44.9118971 - ], - [ - -124.0048406, - 44.9106457 - ], - [ - -124.0075628, - 44.9097544 - ], - [ - -124.0079648, - 44.9096554 - ], - [ - -124.0113199, - 44.90912 - ], - [ - -124.0118248, - 44.909081 - ], - [ - -124.0148289, - 44.9090599 - ], - [ - -124.0177807, - 44.9094566 - ], - [ - -124.0205665, - 44.9102558 - ], - [ - -124.0230787, - 44.9114265 - ], - [ - -124.0252203, - 44.9129237 - ], - [ - -124.0269087, - 44.9146895 - ], - [ - -124.0280786, - 44.9166559 - ], - [ - -124.0285513, - 44.918286 - ], - [ - -124.0292748, - 44.9196269 - ], - [ - -124.0293649, - 44.9198769 - ], - [ - -124.0298156, - 44.9219269 - ], - [ - -124.0298457, - 44.9222869 - ], - [ - -124.0298471, - 44.923558 - ], - [ - -124.0298072, - 44.924048 - ], - [ - -124.02974, - 44.9244485 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16088_s_16088", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9972547, - 44.9201162 - ], - [ - -123.9975118, - 44.9179942 - ], - [ - -123.9983466, - 44.9159486 - ], - [ - -123.999727, - 44.914058 - ], - [ - -124.0015997, - 44.9123951 - ], - [ - -124.003893, - 44.9110237 - ], - [ - -124.0065186, - 44.9099965 - ], - [ - -124.0093757, - 44.909353 - ], - [ - -124.0123546, - 44.9091178 - ], - [ - -124.0153407, - 44.9093001 - ], - [ - -124.0182195, - 44.9098928 - ], - [ - -124.0208804, - 44.9108731 - ], - [ - -124.0232211, - 44.9122034 - ], - [ - -124.0251517, - 44.9138326 - ], - [ - -124.026598, - 44.9156981 - ], - [ - -124.0275043, - 44.9177282 - ], - [ - -124.0278359, - 44.919845 - ], - [ - -124.0275799, - 44.9219671 - ], - [ - -124.026746, - 44.9240128 - ], - [ - -124.0253664, - 44.9259037 - ], - [ - -124.0234938, - 44.927567 - ], - [ - -124.0212004, - 44.9289388 - ], - [ - -124.0185742, - 44.9299664 - ], - [ - -124.0157162, - 44.9306101 - ], - [ - -124.0127362, - 44.9308454 - ], - [ - -124.009749, - 44.9306631 - ], - [ - -124.0068692, - 44.9300702 - ], - [ - -124.0042077, - 44.9290895 - ], - [ - -124.0018667, - 44.9277588 - ], - [ - -123.9999363, - 44.9261292 - ], - [ - -123.9984906, - 44.9242634 - ], - [ - -123.9975852, - 44.922233 - ], - [ - -123.9972547, - 44.9201162 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16088_s_16089", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0296089, - 44.9248714 - ], - [ - -124.0300788, - 44.9256779 - ], - [ - -124.0306629, - 44.9277669 - ], - [ - -124.0306621, - 44.9298967 - ], - [ - -124.0300764, - 44.9319855 - ], - [ - -124.0289282, - 44.933953 - ], - [ - -124.0272616, - 44.9357235 - ], - [ - -124.0251407, - 44.9372291 - ], - [ - -124.0226468, - 44.9384118 - ], - [ - -124.019876, - 44.9392261 - ], - [ - -124.0169346, - 44.9396407 - ], - [ - -124.0139359, - 44.9396398 - ], - [ - -124.010995, - 44.9392233 - ], - [ - -124.0082252, - 44.9384072 - ], - [ - -124.0057328, - 44.937223 - ], - [ - -124.0048828, - 44.9367269 - ], - [ - -124.0034944, - 44.9358085 - ], - [ - -124.0030324, - 44.9354624 - ], - [ - -124.0007727, - 44.9332784 - ], - [ - -124.0004947, - 44.9329243 - ], - [ - -123.9989771, - 44.9301584 - ], - [ - -123.9988102, - 44.9296624 - ], - [ - -123.9983916, - 44.9272057 - ], - [ - -123.9983867, - 44.9266597 - ], - [ - -123.9984704, - 44.9259686 - ], - [ - -123.998134, - 44.925615 - ], - [ - -123.9969503, - 44.9235748 - ], - [ - -123.9963713, - 44.9214069 - ], - [ - -123.9964208, - 44.9192005 - ], - [ - -123.9970967, - 44.9170467 - ], - [ - -123.9983711, - 44.9150344 - ], - [ - -124.0001914, - 44.9132465 - ], - [ - -124.0024824, - 44.9117568 - ], - [ - -124.0029574, - 44.9115059 - ], - [ - -124.0045, - 44.9107891 - ], - [ - -124.0049879, - 44.9105912 - ], - [ - -124.0077239, - 44.9097215 - ], - [ - -124.010646, - 44.9092477 - ], - [ - -124.0136419, - 44.9091881 - ], - [ - -124.0165968, - 44.9095449 - ], - [ - -124.0193969, - 44.9103044 - ], - [ - -124.0219348, - 44.9114374 - ], - [ - -124.024113, - 44.9129005 - ], - [ - -124.0258478, - 44.9146374 - ], - [ - -124.0265866, - 44.9158101 - ], - [ - -124.0280712, - 44.9174632 - ], - [ - -124.0283032, - 44.9178172 - ], - [ - -124.0295618, - 44.9207816 - ], - [ - -124.0296439, - 44.9211676 - ], - [ - -124.0298034, - 44.9232246 - ], - [ - -124.0297695, - 44.9238266 - ], - [ - -124.0296089, - 44.9248714 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16088_s_16189", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0223384, - 44.9036115 - ], - [ - -124.0219288, - 44.905839 - ], - [ - -124.0218863, - 44.9060534 - ], - [ - -124.0208517, - 44.9109217 - ], - [ - -124.0212908, - 44.9110957 - ], - [ - -124.0235736, - 44.9124759 - ], - [ - -124.0254336, - 44.9141461 - ], - [ - -124.0267994, - 44.916042 - ], - [ - -124.0276185, - 44.9180907 - ], - [ - -124.0278594, - 44.9202137 - ], - [ - -124.0275127, - 44.9223292 - ], - [ - -124.0265917, - 44.9243561 - ], - [ - -124.0251317, - 44.9262163 - ], - [ - -124.0231889, - 44.9278384 - ], - [ - -124.0208378, - 44.92916 - ], - [ - -124.0199177, - 44.9295801 - ], - [ - -124.0173822, - 44.9305126 - ], - [ - -124.0146468, - 44.931094 - ], - [ - -124.0118069, - 44.931304 - ], - [ - -124.0089615, - 44.9311354 - ], - [ - -124.0062099, - 44.930594 - ], - [ - -124.0036479, - 44.9296986 - ], - [ - -124.001365, - 44.9284806 - ], - [ - -124.000575, - 44.9279705 - ], - [ - -123.9991906, - 44.926952 - ], - [ - -123.9988806, - 44.926692 - ], - [ - -123.9987549, - 44.9265851 - ], - [ - -123.997605, - 44.925595 - ], - [ - -123.9973242, - 44.9253459 - ], - [ - -123.9940545, - 44.9223556 - ], - [ - -123.9936641, - 44.9219823 - ], - [ - -123.9931341, - 44.9214523 - ], - [ - -123.991453, - 44.9192834 - ], - [ - -123.9910431, - 44.9185734 - ], - [ - -123.9903106, - 44.9169531 - ], - [ - -123.9901008, - 44.9163231 - ], - [ - -123.9897313, - 44.914621 - ], - [ - -123.9896814, - 44.914141 - ], - [ - -123.9896546, - 44.9128643 - ], - [ - -123.9896948, - 44.9122143 - ], - [ - -123.9899814, - 44.9105446 - ], - [ - -123.9900782, - 44.9102034 - ], - [ - -123.9916317, - 44.9029116 - ], - [ - -123.9925433, - 44.8979691 - ], - [ - -123.9926522, - 44.897469 - ], - [ - -123.9931527, - 44.895479 - ], - [ - -123.9934057, - 44.894658 - ], - [ - -123.9935958, - 44.894138 - ], - [ - -123.9942884, - 44.8926781 - ], - [ - -123.9945885, - 44.8921681 - ], - [ - -123.9960452, - 44.8902563 - ], - [ - -123.9966853, - 44.8895864 - ], - [ - -123.9992381, - 44.8875304 - ], - [ - -124.000038, - 44.8870305 - ], - [ - -124.00182, - 44.8860715 - ], - [ - -124.00258, - 44.8857216 - ], - [ - -124.005227, - 44.8847486 - ], - [ - -124.0058969, - 44.8845587 - ], - [ - -124.0069201, - 44.8842981 - ], - [ - -124.0119723, - 44.8831536 - ], - [ - -124.0129944, - 44.8823836 - ], - [ - -124.0152542, - 44.8809854 - ], - [ - -124.017854, - 44.8799273 - ], - [ - -124.0206942, - 44.8792502 - ], - [ - -124.0236656, - 44.8789799 - ], - [ - -124.0266541, - 44.8791269 - ], - [ - -124.0295448, - 44.8796856 - ], - [ - -124.0322268, - 44.8806344 - ], - [ - -124.034597, - 44.8819369 - ], - [ - -124.0365643, - 44.8835431 - ], - [ - -124.0380532, - 44.8853913 - ], - [ - -124.0390064, - 44.8874104 - ], - [ - -124.0393872, - 44.889523 - ], - [ - -124.039181, - 44.8916478 - ], - [ - -124.0383955, - 44.8937031 - ], - [ - -124.0370609, - 44.8956101 - ], - [ - -124.0352284, - 44.8972952 - ], - [ - -124.0323085, - 44.8994955 - ], - [ - -124.0312294, - 44.9002327 - ], - [ - -124.0305994, - 44.9006228 - ], - [ - -124.0282906, - 44.9018028 - ], - [ - -124.0276906, - 44.9020528 - ], - [ - -124.0258684, - 44.9027002 - ], - [ - -124.0249283, - 44.9029803 - ], - [ - -124.0236628, - 44.9033114 - ], - [ - -124.0223384, - 44.9036115 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16089_s_759418", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0278524, - 44.9220936 - ], - [ - -124.02785, - 44.9220955 - ], - [ - -124.0285526, - 44.9224691 - ], - [ - -124.0296006, - 44.923178 - ], - [ - -124.0309443, - 44.9242129 - ], - [ - -124.0316833, - 44.9248618 - ], - [ - -124.0324523, - 44.9255985 - ], - [ - -124.0347265, - 44.9279812 - ], - [ - -124.0361579, - 44.9298527 - ], - [ - -124.0370478, - 44.9318865 - ], - [ - -124.0373622, - 44.9340046 - ], - [ - -124.0370887, - 44.9361256 - ], - [ - -124.0362379, - 44.9381679 - ], - [ - -124.0348424, - 44.940053 - ], - [ - -124.0329558, - 44.9417085 - ], - [ - -124.0306506, - 44.9430708 - ], - [ - -124.0280154, - 44.9440875 - ], - [ - -124.0251514, - 44.9447194 - ], - [ - -124.0221689, - 44.9449423 - ], - [ - -124.0191825, - 44.9447477 - ], - [ - -124.0163069, - 44.9441429 - ], - [ - -124.0136528, - 44.9431513 - ], - [ - -124.0113223, - 44.9418109 - ], - [ - -124.0094048, - 44.9401734 - ], - [ - -124.0078214, - 44.9385138 - ], - [ - -124.0078048, - 44.9385056 - ], - [ - -124.0054167, - 44.9370334 - ], - [ - -124.0033558, - 44.9354863 - ], - [ - -124.0017595, - 44.9336834 - ], - [ - -124.0006891, - 44.9316939 - ], - [ - -124.0001858, - 44.9295942 - ], - [ - -124.0002688, - 44.9274652 - ], - [ - -124.0009348, - 44.9253886 - ], - [ - -124.0021583, - 44.9234442 - ], - [ - -124.0038921, - 44.9217067 - ], - [ - -124.0060696, - 44.9202428 - ], - [ - -124.0086071, - 44.9191089 - ], - [ - -124.0114071, - 44.9183484 - ], - [ - -124.0143621, - 44.9179905 - ], - [ - -124.0173586, - 44.9180491 - ], - [ - -124.0202815, - 44.9185218 - ], - [ - -124.0230185, - 44.9193905 - ], - [ - -124.0254644, - 44.9206218 - ], - [ - -124.0278524, - 44.9220936 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16089_s_781959", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0364509, - 44.9432868 - ], - [ - -124.0364359, - 44.943397 - ], - [ - -124.0360755, - 44.9449143 - ], - [ - -124.0359686, - 44.9452273 - ], - [ - -124.0354635, - 44.9464085 - ], - [ - -124.0353415, - 44.9466445 - ], - [ - -124.0344362, - 44.9480699 - ], - [ - -124.0341773, - 44.9484099 - ], - [ - -124.0332823, - 44.9494429 - ], - [ - -124.0329543, - 44.9497779 - ], - [ - -124.0326375, - 44.9500896 - ], - [ - -124.0318668, - 44.9508203 - ], - [ - -124.0298421, - 44.9523916 - ], - [ - -124.0274245, - 44.9536522 - ], - [ - -124.0247069, - 44.9545536 - ], - [ - -124.0217937, - 44.9550612 - ], - [ - -124.0187971, - 44.9551553 - ], - [ - -124.0158323, - 44.9548325 - ], - [ - -124.0130131, - 44.9541051 - ], - [ - -124.010448, - 44.9530011 - ], - [ - -124.0082357, - 44.951563 - ], - [ - -124.0064611, - 44.9498459 - ], - [ - -124.0051925, - 44.947916 - ], - [ - -124.0044784, - 44.9458475 - ], - [ - -124.0043464, - 44.9437197 - ], - [ - -124.0048014, - 44.9416145 - ], - [ - -124.0058259, - 44.9396128 - ], - [ - -124.0061584, - 44.9392233 - ], - [ - -124.0063809, - 44.938186 - ], - [ - -124.006503, - 44.937781 - ], - [ - -124.0065538, - 44.9376412 - ], - [ - -124.0056528, - 44.9371013 - ], - [ - -124.0035614, - 44.935575 - ], - [ - -124.0019296, - 44.9337882 - ], - [ - -124.00082, - 44.9318096 - ], - [ - -124.0002752, - 44.9297152 - ], - [ - -124.000316, - 44.9275855 - ], - [ - -124.0009409, - 44.9255025 - ], - [ - -124.0021257, - 44.923546 - ], - [ - -124.003825, - 44.9217914 - ], - [ - -124.0059733, - 44.9203059 - ], - [ - -124.0084881, - 44.9191467 - ], - [ - -124.0112729, - 44.9183583 - ], - [ - -124.0142205, - 44.917971 - ], - [ - -124.0172178, - 44.9179996 - ], - [ - -124.0201498, - 44.9184431 - ], - [ - -124.0229037, - 44.9192844 - ], - [ - -124.0253737, - 44.9204912 - ], - [ - -124.026803, - 44.9213474 - ], - [ - -124.0268302, - 44.9213637 - ], - [ - -124.0276542, - 44.9218596 - ], - [ - -124.0277794, - 44.9219358 - ], - [ - -124.0286344, - 44.9224618 - ], - [ - -124.0295657, - 44.923085 - ], - [ - -124.0300687, - 44.9234509 - ], - [ - -124.0307962, - 44.924019 - ], - [ - -124.0312243, - 44.924378 - ], - [ - -124.0317827, - 44.9248751 - ], - [ - -124.0321337, - 44.9252071 - ], - [ - -124.0324774, - 44.9255455 - ], - [ - -124.0327683, - 44.9258438 - ], - [ - -124.0329461, - 44.9260242 - ], - [ - -124.0330083, - 44.9260878 - ], - [ - -124.0345115, - 44.9276366 - ], - [ - -124.0347025, - 44.9278382 - ], - [ - -124.0349678, - 44.9281251 - ], - [ - -124.035325, - 44.928508 - ], - [ - -124.0354156, - 44.9286063 - ], - [ - -124.0359577, - 44.9292012 - ], - [ - -124.0371331, - 44.9307547 - ], - [ - -124.0373232, - 44.9310637 - ], - [ - -124.0374319, - 44.9312448 - ], - [ - -124.0375009, - 44.9313628 - ], - [ - -124.0381623, - 44.932751 - ], - [ - -124.0383685, - 44.933304 - ], - [ - -124.0386364, - 44.9341613 - ], - [ - -124.0387205, - 44.9344933 - ], - [ - -124.0389589, - 44.9361938 - ], - [ - -124.038967, - 44.9364727 - ], - [ - -124.0388095, - 44.9382668 - ], - [ - -124.0387476, - 44.9385678 - ], - [ - -124.0382461, - 44.9401589 - ], - [ - -124.0381172, - 44.9404599 - ], - [ - -124.0377641, - 44.9411902 - ], - [ - -124.0375042, - 44.9416712 - ], - [ - -124.037116, - 44.942325 - ], - [ - -124.036933, - 44.942607 - ], - [ - -124.0364881, - 44.943238 - ], - [ - -124.0364509, - 44.9432868 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16092_s_759419", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0292523, - 44.9533122 - ], - [ - -124.0292615, - 44.9535226 - ], - [ - -124.0292547, - 44.9544286 - ], - [ - -124.0291798, - 44.9554466 - ], - [ - -124.029042, - 44.9564296 - ], - [ - -124.0284539, - 44.9585181 - ], - [ - -124.0273031, - 44.960485 - ], - [ - -124.0256339, - 44.9622547 - ], - [ - -124.0235104, - 44.9637591 - ], - [ - -124.0210142, - 44.9649405 - ], - [ - -124.0182412, - 44.9657533 - ], - [ - -124.0152981, - 44.9661665 - ], - [ - -124.012298, - 44.966164 - ], - [ - -124.0093562, - 44.9657459 - ], - [ - -124.006586, - 44.9649284 - ], - [ - -124.0040937, - 44.9637429 - ], - [ - -124.0019751, - 44.9622349 - ], - [ - -124.0003118, - 44.9604624 - ], - [ - -123.9991676, - 44.9584936 - ], - [ - -123.9985864, - 44.9564041 - ], - [ - -123.9985905, - 44.9542743 - ], - [ - -123.9986574, - 44.9537991 - ], - [ - -123.9986574, - 44.9537963 - ], - [ - -123.9985247, - 44.9523843 - ], - [ - -123.9984919, - 44.9517945 - ], - [ - -123.9984811, - 44.9511685 - ], - [ - -123.9989136, - 44.9484666 - ], - [ - -123.9991418, - 44.9478006 - ], - [ - -124.0002985, - 44.9455456 - ], - [ - -124.0006465, - 44.9450466 - ], - [ - -124.0011659, - 44.9443645 - ], - [ - -124.0018735, - 44.9435094 - ], - [ - -124.0019067, - 44.9415277 - ], - [ - -124.0025266, - 44.9394439 - ], - [ - -124.003707, - 44.937486 - ], - [ - -124.0054023, - 44.9357292 - ], - [ - -124.0075475, - 44.9342411 - ], - [ - -124.0100601, - 44.9330788 - ], - [ - -124.0128435, - 44.932287 - ], - [ - -124.0157909, - 44.931896 - ], - [ - -124.0166028, - 44.931846 - ], - [ - -124.0192197, - 44.9318445 - ], - [ - -124.0197496, - 44.9318765 - ], - [ - -124.0221585, - 44.9321609 - ], - [ - -124.0226605, - 44.9322498 - ], - [ - -124.026243, - 44.9332384 - ], - [ - -124.0269549, - 44.9335124 - ], - [ - -124.0290094, - 44.9344616 - ], - [ - -124.0308241, - 44.9356316 - ], - [ - -124.0314911, - 44.9361365 - ], - [ - -124.0333496, - 44.9378604 - ], - [ - -124.0346885, - 44.9398124 - ], - [ - -124.0354542, - 44.9419145 - ], - [ - -124.0356161, - 44.9440827 - ], - [ - -124.0351676, - 44.9462305 - ], - [ - -124.0341267, - 44.9482721 - ], - [ - -124.0325348, - 44.9501258 - ], - [ - -124.0297639, - 44.9527263 - ], - [ - -124.0295584, - 44.9529421 - ], - [ - -124.0292523, - 44.9533122 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16094_s_16095", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0281364, - 44.9555467 - ], - [ - -124.0293691, - 44.9567541 - ], - [ - -124.0306221, - 44.9586892 - ], - [ - -124.0313194, - 44.9607607 - ], - [ - -124.0314341, - 44.962889 - ], - [ - -124.0309617, - 44.9649922 - ], - [ - -124.0299204, - 44.9669896 - ], - [ - -124.0283501, - 44.9688044 - ], - [ - -124.0263111, - 44.9703668 - ], - [ - -124.0238818, - 44.9716168 - ], - [ - -124.0211556, - 44.9725063 - ], - [ - -124.0182372, - 44.973001 - ], - [ - -124.0152389, - 44.9730821 - ], - [ - -124.0122759, - 44.9727463 - ], - [ - -124.0094623, - 44.9720066 - ], - [ - -124.0069061, - 44.9708913 - ], - [ - -124.0058236, - 44.9701792 - ], - [ - -124.0047904, - 44.9699597 - ], - [ - -124.0039139, - 44.9696287 - ], - [ - -124.0025535, - 44.9692289 - ], - [ - -124.0025029, - 44.9692092 - ], - [ - -124.0001439, - 44.9680738 - ], - [ - -123.9981225, - 44.9666476 - ], - [ - -123.9965086, - 44.96498 - ], - [ - -123.9964697, - 44.9649304 - ], - [ - -123.9954259, - 44.9632979 - ], - [ - -123.9947746, - 44.9615658 - ], - [ - -123.9945333, - 44.9597812 - ], - [ - -123.9945155, - 44.958811 - ], - [ - -123.9945146, - 44.9587534 - ], - [ - -123.9945113, - 44.9584448 - ], - [ - -123.9946977, - 44.9566673 - ], - [ - -123.995291, - 44.9549354 - ], - [ - -123.9953375, - 44.9548359 - ], - [ - -123.9963757, - 44.9531238 - ], - [ - -123.9978108, - 44.9515629 - ], - [ - -123.9978475, - 44.9515295 - ], - [ - -123.9998441, - 44.9500354 - ], - [ - -124.0022018, - 44.9488356 - ], - [ - -124.0040068, - 44.9482447 - ], - [ - -124.003987, - 44.948212 - ], - [ - -124.0044641, - 44.9480663 - ], - [ - -124.0047471, - 44.9480024 - ], - [ - -124.004836, - 44.9479732 - ], - [ - -124.0049718, - 44.9479395 - ], - [ - -124.0049772, - 44.9479504 - ], - [ - -124.0073222, - 44.9474207 - ], - [ - -124.0103026, - 44.9471834 - ], - [ - -124.013291, - 44.9473635 - ], - [ - -124.0161726, - 44.9479541 - ], - [ - -124.0178834, - 44.9485825 - ], - [ - -124.0190367, - 44.9488025 - ], - [ - -124.021648, - 44.9497041 - ], - [ - -124.0239726, - 44.9509398 - ], - [ - -124.0259266, - 44.952465 - ], - [ - -124.0274398, - 44.9542248 - ], - [ - -124.0281364, - 44.9555467 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16094_s_16185", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0320435, - 44.9506512 - ], - [ - -124.0319831, - 44.9507107 - ], - [ - -124.0317302, - 44.9509523 - ], - [ - -124.0297958, - 44.9527476 - ], - [ - -124.0295935, - 44.9529614 - ], - [ - -124.0292973, - 44.9533169 - ], - [ - -124.0293002, - 44.9533742 - ], - [ - -124.0293104, - 44.9542842 - ], - [ - -124.0292547, - 44.9553017 - ], - [ - -124.0290052, - 44.9573617 - ], - [ - -124.0289174, - 44.9579184 - ], - [ - -124.0286877, - 44.9590984 - ], - [ - -124.0279533, - 44.9612391 - ], - [ - -124.0266257, - 44.9632305 - ], - [ - -124.0247594, - 44.9649908 - ], - [ - -124.022431, - 44.9664476 - ], - [ - -124.0197365, - 44.9675409 - ], - [ - -124.0167866, - 44.9682257 - ], - [ - -124.0148618, - 44.9683806 - ], - [ - -124.0136383, - 44.9686519 - ], - [ - -124.010655, - 44.9688782 - ], - [ - -124.0076668, - 44.9686868 - ], - [ - -124.0047888, - 44.9680853 - ], - [ - -124.0021314, - 44.9670966 - ], - [ - -123.9997969, - 44.9657589 - ], - [ - -123.997875, - 44.9641235 - ], - [ - -123.9964395, - 44.9622533 - ], - [ - -123.9955456, - 44.9602202 - ], - [ - -123.9952276, - 44.9581024 - ], - [ - -123.9954976, - 44.9559812 - ], - [ - -123.9963451, - 44.9539382 - ], - [ - -123.9977377, - 44.9520518 - ], - [ - -123.9985632, - 44.9513257 - ], - [ - -123.9986523, - 44.9497013 - ], - [ - -123.9987224, - 44.9493513 - ], - [ - -123.9991334, - 44.9479596 - ], - [ - -123.9993536, - 44.9473996 - ], - [ - -124.0005871, - 44.945212 - ], - [ - -124.0012473, - 44.9443321 - ], - [ - -124.0015845, - 44.943906 - ], - [ - -124.0034848, - 44.9416262 - ], - [ - -124.0039548, - 44.9410977 - ], - [ - -124.0046649, - 44.9403478 - ], - [ - -124.0052124, - 44.9398061 - ], - [ - -124.0073038, - 44.9378659 - ], - [ - -124.0083168, - 44.9368701 - ], - [ - -124.009912, - 44.9355925 - ], - [ - -124.0103862, - 44.9351914 - ], - [ - -124.0127254, - 44.933859 - ], - [ - -124.0153856, - 44.9328763 - ], - [ - -124.0182645, - 44.932281 - ], - [ - -124.0212515, - 44.9320961 - ], - [ - -124.024232, - 44.9323286 - ], - [ - -124.0270913, - 44.9329695 - ], - [ - -124.0297198, - 44.9339944 - ], - [ - -124.0320164, - 44.9353637 - ], - [ - -124.0338929, - 44.9370249 - ], - [ - -124.0352772, - 44.9389142 - ], - [ - -124.0361159, - 44.9409591 - ], - [ - -124.0363769, - 44.9430808 - ], - [ - -124.0360501, - 44.9451979 - ], - [ - -124.0351479, - 44.9472291 - ], - [ - -124.03495, - 44.9475581 - ], - [ - -124.0334541, - 44.9494798 - ], - [ - -124.0320435, - 44.9506512 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16094_s_759425", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.025677, - 44.958345 - ], - [ - -124.0259013, - 44.9596392 - ], - [ - -124.025675, - 44.9617755 - ], - [ - -124.0248627, - 44.9638387 - ], - [ - -124.0234958, - 44.9657486 - ], - [ - -124.0216275, - 44.967431 - ], - [ - -124.0193303, - 44.9688204 - ], - [ - -124.0166937, - 44.9698627 - ], - [ - -124.0146001, - 44.9705074 - ], - [ - -124.0117982, - 44.971151 - ], - [ - -124.0088744, - 44.9714017 - ], - [ - -124.0059372, - 44.9712502 - ], - [ - -124.0030952, - 44.970702 - ], - [ - -124.0004539, - 44.9697776 - ], - [ - -123.9981109, - 44.9685112 - ], - [ - -123.9970068, - 44.9676305 - ], - [ - -123.9969497, - 44.9676032 - ], - [ - -123.9948348, - 44.9660926 - ], - [ - -123.9931758, - 44.964318 - ], - [ - -123.9920365, - 44.9623477 - ], - [ - -123.9914605, - 44.9602575 - ], - [ - -123.99147, - 44.9581277 - ], - [ - -123.9920644, - 44.9560401 - ], - [ - -123.9921057, - 44.9559445 - ], - [ - -123.9934862, - 44.9536945 - ], - [ - -123.9935575, - 44.9536069 - ], - [ - -123.9952519, - 44.9519199 - ], - [ - -123.9973664, - 44.9504919 - ], - [ - -123.9998242, - 44.949375 - ], - [ - -124.0025358, - 44.9486096 - ], - [ - -124.0026259, - 44.948591 - ], - [ - -124.0030878, - 44.9485226 - ], - [ - -124.003247, - 44.9484622 - ], - [ - -124.0060189, - 44.9476488 - ], - [ - -124.0089608, - 44.9472349 - ], - [ - -124.01196, - 44.9472365 - ], - [ - -124.0149011, - 44.9476535 - ], - [ - -124.0176712, - 44.9484699 - ], - [ - -124.0201639, - 44.9496543 - ], - [ - -124.0222834, - 44.9511613 - ], - [ - -124.0239483, - 44.9529329 - ], - [ - -124.0250945, - 44.954901 - ], - [ - -124.0256781, - 44.9569902 - ], - [ - -124.025677, - 44.958345 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16095_s_16212", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0328977, - 44.9634499 - ], - [ - -124.0329226, - 44.9635801 - ], - [ - -124.0329692, - 44.9638482 - ], - [ - -124.0329866, - 44.9639444 - ], - [ - -124.0330375, - 44.9642639 - ], - [ - -124.0330666, - 44.9644739 - ], - [ - -124.0330715, - 44.9645102 - ], - [ - -124.0330735, - 44.9645252 - ], - [ - -124.033136, - 44.9658513 - ], - [ - -124.0331301, - 44.9660043 - ], - [ - -124.033065, - 44.9667488 - ], - [ - -124.033047, - 44.9668808 - ], - [ - -124.0329362, - 44.9675057 - ], - [ - -124.0329022, - 44.9676607 - ], - [ - -124.0326524, - 44.9685531 - ], - [ - -124.0326394, - 44.9685911 - ], - [ - -124.0325973, - 44.9687113 - ], - [ - -124.0325463, - 44.9688533 - ], - [ - -124.0321393, - 44.9698033 - ], - [ - -124.0321244, - 44.9698333 - ], - [ - -124.0320215, - 44.9700329 - ], - [ - -124.0319365, - 44.970193 - ], - [ - -124.0314502, - 44.9710068 - ], - [ - -124.0313543, - 44.9711508 - ], - [ - -124.0305874, - 44.97216 - ], - [ - -124.0304594, - 44.972309 - ], - [ - -124.0304182, - 44.9723567 - ], - [ - -124.0303452, - 44.9724408 - ], - [ - -124.0295345, - 44.9732562 - ], - [ - -124.0294817, - 44.9733933 - ], - [ - -124.0294773, - 44.9734049 - ], - [ - -124.0294354, - 44.973513 - ], - [ - -124.0294112, - 44.9735829 - ], - [ - -124.0293772, - 44.9736769 - ], - [ - -124.029297, - 44.9738897 - ], - [ - -124.0291951, - 44.9741497 - ], - [ - -124.0291869, - 44.9741706 - ], - [ - -124.0290886, - 44.9744194 - ], - [ - -124.0289374, - 44.9748046 - ], - [ - -124.0289104, - 44.9748759 - ], - [ - -124.0288566, - 44.9750117 - ], - [ - -124.0288218, - 44.9751006 - ], - [ - -124.0286996, - 44.975412 - ], - [ - -124.0286884, - 44.9754414 - ], - [ - -124.0286419, - 44.9755614 - ], - [ - -124.028627, - 44.9756022 - ], - [ - -124.0285341, - 44.9758443 - ], - [ - -124.0284434, - 44.9760797 - ], - [ - -124.0284143, - 44.9761554 - ], - [ - -124.0283967, - 44.9762009 - ], - [ - -124.0282489, - 44.9765789 - ], - [ - -124.0282287, - 44.9766309 - ], - [ - -124.0282228, - 44.9766467 - ], - [ - -124.0281754, - 44.9767703 - ], - [ - -124.0281534, - 44.9768263 - ], - [ - -124.0280353, - 44.9771119 - ], - [ - -124.0277954, - 44.9776639 - ], - [ - -124.0276904, - 44.9778963 - ], - [ - -124.0276594, - 44.9779623 - ], - [ - -124.027522, - 44.9782423 - ], - [ - -124.027482, - 44.9783203 - ], - [ - -124.0274016, - 44.9784735 - ], - [ - -124.0272637, - 44.9787305 - ], - [ - -124.0272153, - 44.9788195 - ], - [ - -124.0270897, - 44.9790475 - ], - [ - -124.0270658, - 44.9790915 - ], - [ - -124.0268254, - 44.9795085 - ], - [ - -124.0265402, - 44.9799754 - ], - [ - -124.0264347, - 44.9801609 - ], - [ - -124.0262513, - 44.9804899 - ], - [ - -124.0261236, - 44.9807117 - ], - [ - -124.0258512, - 44.9811706 - ], - [ - -124.0258305, - 44.9812076 - ], - [ - -124.0258124, - 44.9812398 - ], - [ - -124.0255505, - 44.9817038 - ], - [ - -124.0254871, - 44.9818143 - ], - [ - -124.0254643, - 44.9818535 - ], - [ - -124.0253849, - 44.9820554 - ], - [ - -124.0253399, - 44.9821394 - ], - [ - -124.025312, - 44.9821911 - ], - [ - -124.025213, - 44.9823731 - ], - [ - -124.0247189, - 44.9831825 - ], - [ - -124.0247019, - 44.9832075 - ], - [ - -124.0246411, - 44.9832714 - ], - [ - -124.0245173, - 44.9834803 - ], - [ - -124.0233591, - 44.9850592 - ], - [ - -124.0224888, - 44.9858818 - ], - [ - -124.0225052, - 44.9858904 - ], - [ - -124.0224166, - 44.9859762 - ], - [ - -124.022273, - 44.9867794 - ], - [ - -124.0222528, - 44.9868613 - ], - [ - -124.022252, - 44.9868651 - ], - [ - -124.0221299, - 44.9873286 - ], - [ - -124.0220909, - 44.9874606 - ], - [ - -124.0217176, - 44.9884772 - ], - [ - -124.0216427, - 44.9886473 - ], - [ - -124.02122, - 44.989484 - ], - [ - -124.0211881, - 44.98954 - ], - [ - -124.0211415, - 44.9896205 - ], - [ - -124.0211036, - 44.9896855 - ], - [ - -124.0209825, - 44.9898843 - ], - [ - -124.0209778, - 44.9905802 - ], - [ - -124.0203783, - 44.9926671 - ], - [ - -124.0192165, - 44.9946309 - ], - [ - -124.017537, - 44.9963961 - ], - [ - -124.0154043, - 44.9978949 - ], - [ - -124.0129004, - 44.9990696 - ], - [ - -124.0101215, - 44.9998751 - ], - [ - -124.0071745, - 45.0002804 - ], - [ - -124.0041726, - 45.0002699 - ], - [ - -124.0012313, - 44.9998441 - ], - [ - -123.9984638, - 44.9990192 - ], - [ - -123.9959762, - 44.9978271 - ], - [ - -123.9938644, - 44.9963135 - ], - [ - -123.9922095, - 44.9945366 - ], - [ - -123.991075, - 44.9925648 - ], - [ - -123.9906988, - 44.9911858 - ], - [ - -123.9906476, - 44.9911924 - ], - [ - -123.9905687, - 44.9908824 - ], - [ - -123.9905535, - 44.99082 - ], - [ - -123.990495, - 44.9905895 - ], - [ - -123.9903437, - 44.9898464 - ], - [ - -123.9903227, - 44.9897104 - ], - [ - -123.9902916, - 44.9894869 - ], - [ - -123.9902776, - 44.9893749 - ], - [ - -123.9902495, - 44.9891144 - ], - [ - -123.9902366, - 44.9889714 - ], - [ - -123.9902058, - 44.9883845 - ], - [ - -123.9902038, - 44.9882475 - ], - [ - -123.9903173, - 44.9868123 - ], - [ - -123.9903453, - 44.9866503 - ], - [ - -123.990428, - 44.9862381 - ], - [ - -123.990459, - 44.9861021 - ], - [ - -123.990679, - 44.9853208 - ], - [ - -123.9907311, - 44.9851658 - ], - [ - -123.9912608, - 44.9839228 - ], - [ - -123.9913268, - 44.9837958 - ], - [ - -123.9916145, - 44.983283 - ], - [ - -123.9917055, - 44.983132 - ], - [ - -123.9917197, - 44.9831086 - ], - [ - -123.9918678, - 44.9828646 - ], - [ - -123.991878, - 44.9828478 - ], - [ - -123.9919481, - 44.9827328 - ], - [ - -123.9919517, - 44.982671 - ], - [ - -123.9919684, - 44.9823703 - ], - [ - -123.9919707, - 44.9823301 - ], - [ - -123.9919788, - 44.9821981 - ], - [ - -123.9920246, - 44.9817049 - ], - [ - -123.9920276, - 44.9816809 - ], - [ - -123.9920459, - 44.9815451 - ], - [ - -123.9920739, - 44.9813491 - ], - [ - -123.9922315, - 44.980547 - ], - [ - -123.9922375, - 44.980523 - ], - [ - -123.9923164, - 44.9802308 - ], - [ - -123.9923745, - 44.9800308 - ], - [ - -123.9924503, - 44.979784 - ], - [ - -123.9924984, - 44.979636 - ], - [ - -123.992539, - 44.9795142 - ], - [ - -123.992553, - 44.9794732 - ], - [ - -123.992896, - 44.9786222 - ], - [ - -123.9929641, - 44.9784762 - ], - [ - -123.9930288, - 44.9783403 - ], - [ - -123.9930468, - 44.9783033 - ], - [ - -123.9932566, - 44.9778985 - ], - [ - -123.9933336, - 44.9777585 - ], - [ - -123.9933459, - 44.9777363 - ], - [ - -123.9933769, - 44.9776803 - ], - [ - -123.9940023, - 44.9766974 - ], - [ - -123.9940413, - 44.9766434 - ], - [ - -123.9940904, - 44.976576 - ], - [ - -123.9941624, - 44.976478 - ], - [ - -123.9946511, - 44.9758627 - ], - [ - -123.9947992, - 44.9756897 - ], - [ - -123.9952532, - 44.9751904 - ], - [ - -123.9954172, - 44.9750204 - ], - [ - -123.9962846, - 44.9742063 - ], - [ - -123.9964336, - 44.9740794 - ], - [ - -123.9968688, - 44.9737244 - ], - [ - -123.9970788, - 44.9735605 - ], - [ - -123.9972305, - 44.9734466 - ], - [ - -123.9974173, - 44.9731124 - ], - [ - -123.9975744, - 44.9728422 - ], - [ - -123.9975957, - 44.9728068 - ], - [ - -123.9978488, - 44.9723809 - ], - [ - -123.9979835, - 44.9721395 - ], - [ - -123.9981054, - 44.9719196 - ], - [ - -123.9982385, - 44.9716873 - ], - [ - -123.9983126, - 44.9715624 - ], - [ - -123.9984324, - 44.9713655 - ], - [ - -123.9984463, - 44.9713432 - ], - [ - -123.9986248, - 44.9710512 - ], - [ - -123.9986655, - 44.9709774 - ], - [ - -123.9987102, - 44.9708745 - ], - [ - -123.9987435, - 44.9707891 - ], - [ - -123.9989213, - 44.9703334 - ], - [ - -123.9989984, - 44.9701334 - ], - [ - -123.999094, - 44.9698828 - ], - [ - -123.9991066, - 44.9698499 - ], - [ - -123.9991777, - 44.9696659 - ], - [ - -123.9991954, - 44.9696204 - ], - [ - -123.9993693, - 44.9691775 - ], - [ - -123.9994372, - 44.9690036 - ], - [ - -123.9994442, - 44.9689858 - ], - [ - -123.9996053, - 44.9685759 - ], - [ - -123.9996125, - 44.9685575 - ], - [ - -123.9997105, - 44.9683099 - ], - [ - -123.9997474, - 44.9682158 - ], - [ - -123.999758, - 44.9681854 - ], - [ - -123.9998591, - 44.9679102 - ], - [ - -123.9999579, - 44.967655 - ], - [ - -124.0001255, - 44.9672203 - ], - [ - -124.0002384, - 44.9669258 - ], - [ - -124.0002478, - 44.9669013 - ], - [ - -124.0005695, - 44.9660691 - ], - [ - -124.0006624, - 44.9658114 - ], - [ - -124.0007074, - 44.9656944 - ], - [ - -124.000979, - 44.9650647 - ], - [ - -124.001077, - 44.9648597 - ], - [ - -124.0012211, - 44.9645743 - ], - [ - -124.0011873, - 44.9644996 - ], - [ - -124.0008459, - 44.9623836 - ], - [ - -124.0010925, - 44.9602609 - ], - [ - -124.0019175, - 44.9582133 - ], - [ - -124.0032893, - 44.9563192 - ], - [ - -124.0051551, - 44.9546515 - ], - [ - -124.0074431, - 44.9532743 - ], - [ - -124.0100654, - 44.9522404 - ], - [ - -124.0129213, - 44.9515896 - ], - [ - -124.0159012, - 44.9513469 - ], - [ - -124.0188904, - 44.9515215 - ], - [ - -124.0217743, - 44.9521068 - ], - [ - -124.024442, - 44.9530803 - ], - [ - -124.0266939, - 44.9543498 - ], - [ - -124.026701, - 44.9543445 - ], - [ - -124.026752, - 44.9543785 - ], - [ - -124.0267882, - 44.954403 - ], - [ - -124.0267911, - 44.9544047 - ], - [ - -124.0268257, - 44.9544284 - ], - [ - -124.0269333, - 44.9545013 - ], - [ - -124.0272483, - 44.9547183 - ], - [ - -124.0275451, - 44.9549284 - ], - [ - -124.0277691, - 44.9550914 - ], - [ - -124.0278245, - 44.9551319 - ], - [ - -124.0278585, - 44.9551569 - ], - [ - -124.0288829, - 44.9559912 - ], - [ - -124.029132, - 44.9562162 - ], - [ - -124.0300456, - 44.9571359 - ], - [ - -124.0302036, - 44.9573139 - ], - [ - -124.0314113, - 44.9589758 - ], - [ - -124.0315213, - 44.9591658 - ], - [ - -124.0317887, - 44.9596617 - ], - [ - -124.0318488, - 44.9597817 - ], - [ - -124.0321918, - 44.9605585 - ], - [ - -124.0322398, - 44.9606835 - ], - [ - -124.0324774, - 44.9613953 - ], - [ - -124.0324984, - 44.9614693 - ], - [ - -124.0326293, - 44.9619971 - ], - [ - -124.0326503, - 44.9620961 - ], - [ - -124.0326599, - 44.9621416 - ], - [ - -124.0327009, - 44.9623406 - ], - [ - -124.0327642, - 44.9626857 - ], - [ - -124.0328083, - 44.9629606 - ], - [ - -124.0328151, - 44.9630026 - ], - [ - -124.032898, - 44.9634499 - ], - [ - -124.0328977, - 44.9634499 - ] - ], - [ - [ - -123.9905279, - 44.9905595 - ], - [ - -123.9905045, - 44.9904738 - ], - [ - -123.9905137, - 44.9905607 - ], - [ - -123.9905279, - 44.9905595 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16095_s_2456766", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0328977, - 44.9634499 - ], - [ - -124.0329226, - 44.9635801 - ], - [ - -124.0329692, - 44.9638482 - ], - [ - -124.0329866, - 44.9639444 - ], - [ - -124.0330375, - 44.9642639 - ], - [ - -124.0330666, - 44.9644739 - ], - [ - -124.0330715, - 44.9645102 - ], - [ - -124.0330735, - 44.9645252 - ], - [ - -124.033136, - 44.9658513 - ], - [ - -124.0331301, - 44.9660043 - ], - [ - -124.033065, - 44.9667488 - ], - [ - -124.033047, - 44.9668808 - ], - [ - -124.0329362, - 44.9675057 - ], - [ - -124.0329022, - 44.9676607 - ], - [ - -124.0326524, - 44.9685531 - ], - [ - -124.0326394, - 44.9685911 - ], - [ - -124.0325973, - 44.9687113 - ], - [ - -124.0325463, - 44.9688533 - ], - [ - -124.0321393, - 44.9698033 - ], - [ - -124.0321244, - 44.9698333 - ], - [ - -124.0320215, - 44.9700329 - ], - [ - -124.0319365, - 44.970193 - ], - [ - -124.0314502, - 44.9710068 - ], - [ - -124.0313543, - 44.9711508 - ], - [ - -124.0305874, - 44.97216 - ], - [ - -124.0304594, - 44.972309 - ], - [ - -124.0304182, - 44.9723567 - ], - [ - -124.0303452, - 44.9724408 - ], - [ - -124.0295345, - 44.9732562 - ], - [ - -124.0294817, - 44.9733933 - ], - [ - -124.0294773, - 44.9734049 - ], - [ - -124.0294354, - 44.973513 - ], - [ - -124.0294112, - 44.9735829 - ], - [ - -124.0293772, - 44.9736769 - ], - [ - -124.029297, - 44.9738897 - ], - [ - -124.0291951, - 44.9741497 - ], - [ - -124.0291869, - 44.9741706 - ], - [ - -124.0290886, - 44.9744194 - ], - [ - -124.0289374, - 44.9748046 - ], - [ - -124.0289104, - 44.9748759 - ], - [ - -124.0288566, - 44.9750117 - ], - [ - -124.0288218, - 44.9751006 - ], - [ - -124.0286996, - 44.975412 - ], - [ - -124.0286884, - 44.9754414 - ], - [ - -124.0286419, - 44.9755614 - ], - [ - -124.028627, - 44.9756022 - ], - [ - -124.0285341, - 44.9758443 - ], - [ - -124.0284434, - 44.9760797 - ], - [ - -124.0284143, - 44.9761554 - ], - [ - -124.0283967, - 44.9762009 - ], - [ - -124.0282489, - 44.9765789 - ], - [ - -124.0282287, - 44.9766309 - ], - [ - -124.0282228, - 44.9766467 - ], - [ - -124.0281754, - 44.9767703 - ], - [ - -124.0281534, - 44.9768263 - ], - [ - -124.0280353, - 44.9771119 - ], - [ - -124.0277954, - 44.9776639 - ], - [ - -124.0276904, - 44.9778963 - ], - [ - -124.0276594, - 44.9779623 - ], - [ - -124.027522, - 44.9782423 - ], - [ - -124.027482, - 44.9783203 - ], - [ - -124.0274016, - 44.9784735 - ], - [ - -124.0272637, - 44.9787305 - ], - [ - -124.0272153, - 44.9788195 - ], - [ - -124.0270897, - 44.9790475 - ], - [ - -124.0270658, - 44.9790915 - ], - [ - -124.0268254, - 44.9795085 - ], - [ - -124.0265402, - 44.9799754 - ], - [ - -124.0264347, - 44.9801609 - ], - [ - -124.0262513, - 44.9804899 - ], - [ - -124.0261236, - 44.9807117 - ], - [ - -124.0258512, - 44.9811706 - ], - [ - -124.0258305, - 44.9812076 - ], - [ - -124.0258124, - 44.9812398 - ], - [ - -124.0255505, - 44.9817038 - ], - [ - -124.0254871, - 44.9818143 - ], - [ - -124.0254643, - 44.9818535 - ], - [ - -124.0253849, - 44.9820554 - ], - [ - -124.0253399, - 44.9821394 - ], - [ - -124.025312, - 44.9821911 - ], - [ - -124.025213, - 44.9823731 - ], - [ - -124.0247189, - 44.9831825 - ], - [ - -124.0247019, - 44.9832075 - ], - [ - -124.0246411, - 44.9832714 - ], - [ - -124.0245173, - 44.9834803 - ], - [ - -124.0233591, - 44.9850592 - ], - [ - -124.0224888, - 44.9858818 - ], - [ - -124.0225052, - 44.9858904 - ], - [ - -124.0223523, - 44.9860384 - ], - [ - -124.0223335, - 44.9860286 - ], - [ - -124.021853, - 44.9864828 - ], - [ - -124.021609, - 44.9866778 - ], - [ - -124.021593, - 44.9866677 - ], - [ - -124.0205824, - 44.9875872 - ], - [ - -124.0203538, - 44.9877491 - ], - [ - -124.0201622, - 44.9878859 - ], - [ - -124.020147, - 44.9878967 - ], - [ - -124.0198861, - 44.9880824 - ], - [ - -124.0196935, - 44.9882197 - ], - [ - -124.0191322, - 44.9887557 - ], - [ - -124.0170729, - 44.9901115 - ], - [ - -124.0146991, - 44.9911774 - ], - [ - -124.0120908, - 44.9919175 - ], - [ - -124.0093358, - 44.992307 - ], - [ - -124.0065268, - 44.9923326 - ], - [ - -124.0063488, - 44.9923226 - ], - [ - -124.0057231, - 44.9922783 - ], - [ - -124.0055657, - 44.9922648 - ], - [ - -124.0053466, - 44.9922518 - ], - [ - -124.0052317, - 44.9922456 - ], - [ - -124.0022761, - 44.9918749 - ], - [ - -123.9994791, - 44.9911022 - ], - [ - -123.9969485, - 44.989957 - ], - [ - -123.9947814, - 44.9884835 - ], - [ - -123.9930612, - 44.9867382 - ], - [ - -123.9918539, - 44.9847884 - ], - [ - -123.9912059, - 44.9827088 - ], - [ - -123.9911421, - 44.9805794 - ], - [ - -123.9916647, - 44.9784822 - ], - [ - -123.9927538, - 44.9764976 - ], - [ - -123.9943673, - 44.9747019 - ], - [ - -123.9964432, - 44.9731641 - ], - [ - -123.997777, - 44.9725018 - ], - [ - -123.9978488, - 44.9723809 - ], - [ - -123.9979835, - 44.9721395 - ], - [ - -123.9981054, - 44.9719196 - ], - [ - -123.9982385, - 44.9716873 - ], - [ - -123.9983126, - 44.9715624 - ], - [ - -123.9984324, - 44.9713655 - ], - [ - -123.9984463, - 44.9713432 - ], - [ - -123.9986248, - 44.9710512 - ], - [ - -123.9986655, - 44.9709774 - ], - [ - -123.9987102, - 44.9708745 - ], - [ - -123.9987435, - 44.9707891 - ], - [ - -123.9989213, - 44.9703334 - ], - [ - -123.9989984, - 44.9701334 - ], - [ - -123.999094, - 44.9698828 - ], - [ - -123.9991066, - 44.9698499 - ], - [ - -123.9991777, - 44.9696659 - ], - [ - -123.9991954, - 44.9696204 - ], - [ - -123.9993693, - 44.9691775 - ], - [ - -123.9994372, - 44.9690036 - ], - [ - -123.9994442, - 44.9689858 - ], - [ - -123.9996053, - 44.9685759 - ], - [ - -123.9996125, - 44.9685575 - ], - [ - -123.9997105, - 44.9683099 - ], - [ - -123.9997474, - 44.9682158 - ], - [ - -123.999758, - 44.9681854 - ], - [ - -123.9998591, - 44.9679102 - ], - [ - -123.9999579, - 44.967655 - ], - [ - -124.0001255, - 44.9672203 - ], - [ - -124.0002384, - 44.9669258 - ], - [ - -124.0002478, - 44.9669013 - ], - [ - -124.0005695, - 44.9660691 - ], - [ - -124.0006624, - 44.9658114 - ], - [ - -124.0007074, - 44.9656944 - ], - [ - -124.000979, - 44.9650647 - ], - [ - -124.001077, - 44.9648597 - ], - [ - -124.0012511, - 44.9645149 - ], - [ - -124.0012687, - 44.9644817 - ], - [ - -124.0011237, - 44.9641113 - ], - [ - -124.0008993, - 44.9619874 - ], - [ - -124.0012628, - 44.9598733 - ], - [ - -124.0022002, - 44.9578502 - ], - [ - -124.0036755, - 44.9559957 - ], - [ - -124.0056318, - 44.9543812 - ], - [ - -124.007994, - 44.9530687 - ], - [ - -124.0106713, - 44.9521085 - ], - [ - -124.013561, - 44.9515377 - ], - [ - -124.0165519, - 44.951378 - ], - [ - -124.0195292, - 44.9516356 - ], - [ - -124.0223786, - 44.9523007 - ], - [ - -124.0249906, - 44.9533477 - ], - [ - -124.026909, - 44.9545191 - ], - [ - -124.0269333, - 44.9545013 - ], - [ - -124.0272483, - 44.9547183 - ], - [ - -124.0275451, - 44.9549284 - ], - [ - -124.0277691, - 44.9550914 - ], - [ - -124.0278245, - 44.9551319 - ], - [ - -124.0278585, - 44.9551569 - ], - [ - -124.0288829, - 44.9559912 - ], - [ - -124.029132, - 44.9562162 - ], - [ - -124.0300456, - 44.9571359 - ], - [ - -124.0302036, - 44.9573139 - ], - [ - -124.0314113, - 44.9589758 - ], - [ - -124.0315213, - 44.9591658 - ], - [ - -124.0317887, - 44.9596617 - ], - [ - -124.0318488, - 44.9597817 - ], - [ - -124.0321918, - 44.9605585 - ], - [ - -124.0322398, - 44.9606835 - ], - [ - -124.0324774, - 44.9613953 - ], - [ - -124.0324984, - 44.9614693 - ], - [ - -124.0326293, - 44.9619971 - ], - [ - -124.0326503, - 44.9620961 - ], - [ - -124.0326599, - 44.9621416 - ], - [ - -124.0327009, - 44.9623406 - ], - [ - -124.0327642, - 44.9626857 - ], - [ - -124.0328083, - 44.9629606 - ], - [ - -124.0328151, - 44.9630026 - ], - [ - -124.032898, - 44.9634499 - ], - [ - -124.0328977, - 44.9634499 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16097_s_16070", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0244464, - 44.9835088 - ], - [ - -124.0228895, - 44.9855313 - ], - [ - -124.0224595, - 44.9859714 - ], - [ - -124.0210075, - 44.9872414 - ], - [ - -124.0203533, - 44.9877328 - ], - [ - -124.0199109, - 44.9880517 - ], - [ - -124.0198666, - 44.9880824 - ], - [ - -124.0194546, - 44.988509 - ], - [ - -124.0172849, - 44.9900076 - ], - [ - -124.014742, - 44.9911739 - ], - [ - -124.0119252, - 44.9919622 - ], - [ - -124.0089449, - 44.9923417 - ], - [ - -124.0059176, - 44.9922975 - ], - [ - -124.005242, - 44.9922399 - ], - [ - -124.0023785, - 44.991795 - ], - [ - -123.999687, - 44.990971 - ], - [ - -123.9972663, - 44.9897981 - ], - [ - -123.995205, - 44.9883193 - ], - [ - -123.9935787, - 44.9865888 - ], - [ - -123.9924471, - 44.98467 - ], - [ - -123.9918855, - 44.9827498 - ], - [ - -123.9917469, - 44.9824198 - ], - [ - -123.9914673, - 44.9802992 - ], - [ - -123.9917759, - 44.9781807 - ], - [ - -123.9926609, - 44.9761456 - ], - [ - -123.9940882, - 44.9742722 - ], - [ - -123.9960028, - 44.9726323 - ], - [ - -123.9983313, - 44.9712891 - ], - [ - -123.9987913, - 44.9711165 - ], - [ - -123.9991341, - 44.9706627 - ], - [ - -124.0010406, - 44.9690181 - ], - [ - -124.0033623, - 44.9676691 - ], - [ - -124.00601, - 44.9666674 - ], - [ - -124.008882, - 44.9660517 - ], - [ - -124.011868, - 44.9658455 - ], - [ - -124.0148533, - 44.9660567 - ], - [ - -124.0177233, - 44.9666772 - ], - [ - -124.0203677, - 44.9676833 - ], - [ - -124.0226849, - 44.9690362 - ], - [ - -124.0245859, - 44.9706839 - ], - [ - -124.0259976, - 44.9725633 - ], - [ - -124.0268657, - 44.974602 - ], - [ - -124.0271569, - 44.9767218 - ], - [ - -124.0268598, - 44.9788411 - ], - [ - -124.0259858, - 44.9808786 - ], - [ - -124.0244464, - 44.9835088 - ] - ], - [ - [ - -124.0096058, - 44.9696887 - ], - [ - -124.0097158, - 44.9696968 - ], - [ - -124.0096095, - 44.9696741 - ], - [ - -124.0096058, - 44.9696887 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16183_s_16184", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9941059, - 45.0124163 - ], - [ - -123.9940602, - 45.0138373 - ], - [ - -123.9939903, - 45.0142773 - ], - [ - -123.9934141, - 45.0162451 - ], - [ - -123.9932542, - 45.0166151 - ], - [ - -123.9914384, - 45.0193667 - ], - [ - -123.9912516, - 45.0195698 - ], - [ - -123.9912439, - 45.0196192 - ], - [ - -123.9912734, - 45.0196201 - ], - [ - -123.9912534, - 45.0199401 - ], - [ - -123.991095, - 45.0205734 - ], - [ - -123.9909568, - 45.0214589 - ], - [ - -123.9907846, - 45.0218142 - ], - [ - -123.9905518, - 45.0227449 - ], - [ - -123.9903819, - 45.0231249 - ], - [ - -123.9891623, - 45.0251278 - ], - [ - -123.9889423, - 45.0254078 - ], - [ - -123.987227, - 45.027161 - ], - [ - -123.986987, - 45.027361 - ], - [ - -123.9859114, - 45.0281697 - ], - [ - -123.9856314, - 45.0283597 - ], - [ - -123.9831757, - 45.0297159 - ], - [ - -123.9827256, - 45.0299159 - ], - [ - -123.9795825, - 45.0309814 - ], - [ - -123.9791325, - 45.0310914 - ], - [ - -123.9755507, - 45.0316383 - ], - [ - -123.9749405, - 45.0316783 - ], - [ - -123.97353, - 45.0317245 - ], - [ - -123.97332, - 45.0317245 - ], - [ - -123.9701094, - 45.0314832 - ], - [ - -123.9688592, - 45.0312932 - ], - [ - -123.9681159, - 45.0311664 - ], - [ - -123.9658908, - 45.0307448 - ], - [ - -123.9635437, - 45.0307255 - ], - [ - -123.9531433, - 45.0308432 - ], - [ - -123.9503929, - 45.0306981 - ], - [ - -123.9497127, - 45.030618 - ], - [ - -123.948125, - 45.0303692 - ], - [ - -123.9475149, - 45.0302492 - ], - [ - -123.9468697, - 45.0301114 - ], - [ - -123.9447894, - 45.0296313 - ], - [ - -123.9420382, - 45.0287768 - ], - [ - -123.9395752, - 45.0275581 - ], - [ - -123.9374948, - 45.0260219 - ], - [ - -123.9358771, - 45.0242275 - ], - [ - -123.9347842, - 45.0222437 - ], - [ - -123.9342581, - 45.0201468 - ], - [ - -123.9343189, - 45.0180174 - ], - [ - -123.9349642, - 45.0159374 - ], - [ - -123.9361692, - 45.0139866 - ], - [ - -123.9378874, - 45.0122399 - ], - [ - -123.940053, - 45.0107646 - ], - [ - -123.9425826, - 45.0096173 - ], - [ - -123.945379, - 45.008842 - ], - [ - -123.9483348, - 45.0084686 - ], - [ - -123.9513366, - 45.0085113 - ], - [ - -123.954269, - 45.0089685 - ], - [ - -123.9548066, - 45.0090926 - ], - [ - -123.962612, - 45.0090043 - ], - [ - -123.9626305, - 45.0085334 - ], - [ - -123.9626705, - 45.0082934 - ], - [ - -123.9631467, - 45.0066033 - ], - [ - -123.9633268, - 45.0061533 - ], - [ - -123.9639356, - 45.0049199 - ], - [ - -123.9654662, - 45.0023301 - ], - [ - -123.9660187, - 45.0014962 - ], - [ - -123.9661587, - 45.0013062 - ], - [ - -123.9679333, - 44.9994122 - ], - [ - -123.9681433, - 44.9992322 - ], - [ - -123.9687461, - 44.9987459 - ], - [ - -123.9692461, - 44.9983659 - ], - [ - -123.9716187, - 44.9968992 - ], - [ - -123.9717987, - 44.9968092 - ], - [ - -123.9734922, - 44.9960742 - ], - [ - -123.9736511, - 44.9960149 - ], - [ - -123.9747475, - 44.9949725 - ], - [ - -123.9767699, - 44.9933987 - ], - [ - -123.979186, - 44.992135 - ], - [ - -123.981903, - 44.9912301 - ], - [ - -123.9848166, - 44.9907185 - ], - [ - -123.9878148, - 44.9906201 - ], - [ - -123.9907825, - 44.9909386 - ], - [ - -123.9936057, - 44.9916617 - ], - [ - -123.9961759, - 44.9927617 - ], - [ - -123.9983944, - 44.9941962 - ], - [ - -124.000176, - 44.9959103 - ], - [ - -124.0014521, - 44.9978381 - ], - [ - -124.0021737, - 44.9999055 - ], - [ - -124.002313, - 45.002033 - ], - [ - -124.0018646, - 45.0041389 - ], - [ - -124.0008457, - 45.0061423 - ], - [ - -123.9992953, - 45.0079661 - ], - [ - -123.9970555, - 45.0100964 - ], - [ - -123.9966709, - 45.010447 - ], - [ - -123.9955609, - 45.0114171 - ], - [ - -123.9941059, - 45.0124163 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16184_s_16079", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.007723, - 44.984253 - ], - [ - -124.0077419, - 44.9842524 - ], - [ - -124.0079807, - 44.9842592 - ], - [ - -124.0083585, - 44.9842886 - ], - [ - -124.0086682, - 44.9842845 - ], - [ - -124.0094432, - 44.9842882 - ], - [ - -124.0097185, - 44.9842945 - ], - [ - -124.0126269, - 44.9845603 - ], - [ - -124.0128341, - 44.9845938 - ], - [ - -124.0165051, - 44.9855506 - ], - [ - -124.0167354, - 44.9856357 - ], - [ - -124.0191785, - 44.9867599 - ], - [ - -124.0194686, - 44.9869232 - ], - [ - -124.0223338, - 44.9890422 - ], - [ - -124.0227316, - 44.98943 - ], - [ - -124.0241955, - 44.9911813 - ], - [ - -124.0251732, - 44.9930956 - ], - [ - -124.0252292, - 44.9932488 - ], - [ - -124.0257193, - 44.996082 - ], - [ - -124.0257164, - 44.996296 - ], - [ - -124.0255206, - 44.9979262 - ], - [ - -124.025438, - 44.9982887 - ], - [ - -124.0246705, - 45.0003477 - ], - [ - -124.0233515, - 45.0022609 - ], - [ - -124.0215317, - 45.0039548 - ], - [ - -124.0192809, - 45.0053642 - ], - [ - -124.0166857, - 45.0064349 - ], - [ - -124.0138458, - 45.0071259 - ], - [ - -124.0108705, - 45.0074104 - ], - [ - -124.007874, - 45.0072776 - ], - [ - -124.0072157, - 45.007154 - ], - [ - -124.0062778, - 45.0074102 - ], - [ - -124.0053476, - 45.0076002 - ], - [ - -124.0031613, - 45.0079266 - ], - [ - -124.0024311, - 45.0079966 - ], - [ - -124.0012879, - 45.0080657 - ], - [ - -123.9992496, - 45.0086228 - ], - [ - -123.997274, - 45.0094803 - ], - [ - -123.9966271, - 45.0099309 - ], - [ - -123.9941156, - 45.011098 - ], - [ - -123.9913313, - 45.0118951 - ], - [ - -123.9883812, - 45.0122915 - ], - [ - -123.9853788, - 45.0122719 - ], - [ - -123.9824395, - 45.0118372 - ], - [ - -123.9796763, - 45.011004 - ], - [ - -123.9771955, - 45.0098043 - ], - [ - -123.9750923, - 45.0082843 - ], - [ - -123.9734477, - 45.0065025 - ], - [ - -123.9723248, - 45.0045272 - ], - [ - -123.9717668, - 45.0024345 - ], - [ - -123.9717949, - 45.0003048 - ], - [ - -123.9724081, - 44.9982199 - ], - [ - -123.9735828, - 44.9962599 - ], - [ - -123.9752736, - 44.9945002 - ], - [ - -123.9756036, - 44.9942202 - ], - [ - -123.9769212, - 44.9932348 - ], - [ - -123.9774212, - 44.9929048 - ], - [ - -123.9791567, - 44.9919162 - ], - [ - -123.9796267, - 44.9916862 - ], - [ - -123.9803307, - 44.9913616 - ], - [ - -123.9842703, - 44.9896519 - ], - [ - -123.9856293, - 44.989127 - ], - [ - -123.9860693, - 44.9889771 - ], - [ - -123.9871969, - 44.9886315 - ], - [ - -123.9918062, - 44.9873717 - ], - [ - -123.9941129, - 44.986885 - ], - [ - -123.9954327, - 44.986685 - ], - [ - -123.996172, - 44.9865962 - ], - [ - -123.9976039, - 44.9857969 - ], - [ - -124.0004006, - 44.9848084 - ], - [ - -124.0034218, - 44.9842434 - ], - [ - -124.0065417, - 44.9841253 - ], - [ - -124.007723, - 44.984253 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16185_s_16086", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0364105, - 44.9432372 - ], - [ - -124.0363976, - 44.9433653 - ], - [ - -124.0361793, - 44.9445728 - ], - [ - -124.0360804, - 44.9449508 - ], - [ - -124.0352462, - 44.9469966 - ], - [ - -124.0338658, - 44.9488874 - ], - [ - -124.0319925, - 44.9505507 - ], - [ - -124.029698, - 44.9519224 - ], - [ - -124.0270707, - 44.9529499 - ], - [ - -124.0242116, - 44.9535935 - ], - [ - -124.0212304, - 44.9538287 - ], - [ - -124.018242, - 44.9536463 - ], - [ - -124.0153611, - 44.9530534 - ], - [ - -124.0126986, - 44.9520727 - ], - [ - -124.0103568, - 44.9507419 - ], - [ - -124.0084257, - 44.9491123 - ], - [ - -124.0069795, - 44.9472464 - ], - [ - -124.0060738, - 44.945216 - ], - [ - -124.0057432, - 44.9430992 - ], - [ - -124.0058999, - 44.9418076 - ], - [ - -124.0058808, - 44.9418066 - ], - [ - -124.0059026, - 44.9415924 - ], - [ - -124.0059102, - 44.9414899 - ], - [ - -124.0059272, - 44.9406507 - ], - [ - -124.0061837, - 44.9388201 - ], - [ - -124.0064199, - 44.9379181 - ], - [ - -124.0067644, - 44.9370996 - ], - [ - -124.0059219, - 44.9359339 - ], - [ - -124.0050887, - 44.9337854 - ], - [ - -124.0048902, - 44.9315613 - ], - [ - -124.0049772, - 44.9311295 - ], - [ - -124.0049659, - 44.9308302 - ], - [ - -124.0054716, - 44.9287308 - ], - [ - -124.0065441, - 44.9267419 - ], - [ - -124.008142, - 44.9249398 - ], - [ - -124.0102041, - 44.9233938 - ], - [ - -124.0126509, - 44.9221633 - ], - [ - -124.0153886, - 44.9212954 - ], - [ - -124.0183119, - 44.9208237 - ], - [ - -124.0213086, - 44.9207661 - ], - [ - -124.0242635, - 44.9211248 - ], - [ - -124.0270632, - 44.9218862 - ], - [ - -124.0296001, - 44.923021 - ], - [ - -124.0317768, - 44.9244855 - ], - [ - -124.0335096, - 44.9262235 - ], - [ - -124.0337332, - 44.9265023 - ], - [ - -124.0344643, - 44.9276682 - ], - [ - -124.0358712, - 44.9292024 - ], - [ - -124.0373651, - 44.9312957 - ], - [ - -124.0377142, - 44.9319527 - ], - [ - -124.0384389, - 44.9337912 - ], - [ - -124.038593, - 44.9343761 - ], - [ - -124.0388441, - 44.9367691 - ], - [ - -124.0388122, - 44.9373921 - ], - [ - -124.0381353, - 44.9402173 - ], - [ - -124.0377985, - 44.9409884 - ], - [ - -124.0365657, - 44.9430384 - ], - [ - -124.0364105, - 44.9432372 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16185_s_16087", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0365139, - 44.9431339 - ], - [ - -124.0364877, - 44.943958 - ], - [ - -124.0356416, - 44.9463285 - ], - [ - -124.0353917, - 44.9467986 - ], - [ - -124.0340624, - 44.9487077 - ], - [ - -124.032234, - 44.9503961 - ], - [ - -124.0299768, - 44.9517986 - ], - [ - -124.0273776, - 44.9528614 - ], - [ - -124.0245362, - 44.9535437 - ], - [ - -124.021562, - 44.9538192 - ], - [ - -124.0185691, - 44.9536772 - ], - [ - -124.0156729, - 44.9531234 - ], - [ - -124.0129845, - 44.9521789 - ], - [ - -124.0106074, - 44.9508801 - ], - [ - -124.0086329, - 44.9492769 - ], - [ - -124.0071369, - 44.9474309 - ], - [ - -124.0061768, - 44.9454132 - ], - [ - -124.0057896, - 44.9433012 - ], - [ - -124.0059463, - 44.9416387 - ], - [ - -124.0059417, - 44.9415183 - ], - [ - -124.0059477, - 44.9414653 - ], - [ - -124.0059431, - 44.9410338 - ], - [ - -124.0060141, - 44.9399017 - ], - [ - -124.0060743, - 44.9394617 - ], - [ - -124.0064036, - 44.93804 - ], - [ - -124.0065502, - 44.9375944 - ], - [ - -124.005851, - 44.9371631 - ], - [ - -124.0037908, - 44.9356156 - ], - [ - -124.0021953, - 44.9338123 - ], - [ - -124.0011258, - 44.9318225 - ], - [ - -124.0006234, - 44.9297228 - ], - [ - -124.0007074, - 44.9275938 - ], - [ - -124.0013743, - 44.9255173 - ], - [ - -124.0025987, - 44.9235732 - ], - [ - -124.0043332, - 44.9218361 - ], - [ - -124.0065114, - 44.9203727 - ], - [ - -124.0090494, - 44.9192393 - ], - [ - -124.0118498, - 44.9184795 - ], - [ - -124.014805, - 44.9181223 - ], - [ - -124.0178014, - 44.9181815 - ], - [ - -124.0207241, - 44.9186548 - ], - [ - -124.0234607, - 44.9195242 - ], - [ - -124.0259061, - 44.920756 - ], - [ - -124.0266454, - 44.921212 - ], - [ - -124.0271189, - 44.9214718 - ], - [ - -124.0284786, - 44.9224145 - ], - [ - -124.0285052, - 44.9223942 - ], - [ - -124.0296251, - 44.9231341 - ], - [ - -124.0313116, - 44.9244467 - ], - [ - -124.0319316, - 44.9250166 - ], - [ - -124.0325041, - 44.9255791 - ], - [ - -124.0352045, - 44.9284188 - ], - [ - -124.0353841, - 44.9286121 - ], - [ - -124.0359742, - 44.929262 - ], - [ - -124.0373471, - 44.9311612 - ], - [ - -124.0376973, - 44.9317911 - ], - [ - -124.0385829, - 44.9341053 - ], - [ - -124.0387631, - 44.9349253 - ], - [ - -124.0388372, - 44.9378956 - ], - [ - -124.0387274, - 44.9385456 - ], - [ - -124.0382647, - 44.9401935 - ], - [ - -124.0374497, - 44.9417709 - ], - [ - -124.0368699, - 44.942671 - ], - [ - -124.0365139, - 44.9431339 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16187_s_16211", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0683812, - 44.8388206 - ], - [ - -124.061987, - 44.8477344 - ], - [ - -124.0618281, - 44.8480739 - ], - [ - -124.0613506, - 44.8487631 - ], - [ - -124.0605361, - 44.8501642 - ], - [ - -124.0584166, - 44.8540452 - ], - [ - -124.057064, - 44.8559453 - ], - [ - -124.055216, - 44.8576212 - ], - [ - -124.0529438, - 44.8590085 - ], - [ - -124.0503346, - 44.8600537 - ], - [ - -124.0474888, - 44.8607167 - ], - [ - -124.0445158, - 44.8609721 - ], - [ - -124.0415298, - 44.8608099 - ], - [ - -124.0386458, - 44.8602365 - ], - [ - -124.0359745, - 44.8592739 - ], - [ - -124.0336187, - 44.857959 - ], - [ - -124.031669, - 44.8563425 - ], - [ - -124.0302002, - 44.8544865 - ], - [ - -124.0292687, - 44.8524623 - ], - [ - -124.0289104, - 44.8503478 - ], - [ - -124.0291388, - 44.8482241 - ], - [ - -124.0299453, - 44.846173 - ], - [ - -124.0321261, - 44.8421833 - ], - [ - -124.0322488, - 44.8419657 - ], - [ - -124.0333192, - 44.8401258 - ], - [ - -124.033734, - 44.8394744 - ], - [ - -124.0344008, - 44.8385126 - ], - [ - -124.0345802, - 44.8381384 - ], - [ - -124.0437525, - 44.8253595 - ], - [ - -124.0444941, - 44.8244397 - ], - [ - -124.0447642, - 44.8241397 - ], - [ - -124.0458889, - 44.8230469 - ], - [ - -124.0464389, - 44.8225769 - ], - [ - -124.0484874, - 44.8211985 - ], - [ - -124.0482903, - 44.8205859 - ], - [ - -124.0479115, - 44.8184732 - ], - [ - -124.0481192, - 44.8163484 - ], - [ - -124.0489051, - 44.8142933 - ], - [ - -124.0502392, - 44.8123869 - ], - [ - -124.05207, - 44.8107023 - ], - [ - -124.0543272, - 44.8093043 - ], - [ - -124.0569242, - 44.8082465 - ], - [ - -124.059761, - 44.8075697 - ], - [ - -124.0627287, - 44.8072998 - ], - [ - -124.0657134, - 44.8074472 - ], - [ - -124.0686004, - 44.8080061 - ], - [ - -124.0712788, - 44.8089553 - ], - [ - -124.0736457, - 44.8102581 - ], - [ - -124.0756103, - 44.8118645 - ], - [ - -124.0770969, - 44.8137129 - ], - [ - -124.0780484, - 44.8157322 - ], - [ - -124.0806103, - 44.8236818 - ], - [ - -124.0809131, - 44.8249745 - ], - [ - -124.0810032, - 44.8255845 - ], - [ - -124.0808297, - 44.828707 - ], - [ - -124.0806599, - 44.829357 - ], - [ - -124.0793023, - 44.8322341 - ], - [ - -124.0791123, - 44.8325041 - ], - [ - -124.0777775, - 44.8340599 - ], - [ - -124.0774275, - 44.8343999 - ], - [ - -124.0753108, - 44.8360641 - ], - [ - -124.0749508, - 44.8362941 - ], - [ - -124.0722321, - 44.8376808 - ], - [ - -124.0719821, - 44.8377808 - ], - [ - -124.0687059, - 44.8387544 - ], - [ - -124.0683812, - 44.8388206 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16188_s_16187", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0514155, - 44.8667412 - ], - [ - -124.0490965, - 44.8750484 - ], - [ - -124.0491452, - 44.876153 - ], - [ - -124.0491253, - 44.876363 - ], - [ - -124.0485527, - 44.8786636 - ], - [ - -124.0483728, - 44.8791036 - ], - [ - -124.0481794, - 44.8794885 - ], - [ - -124.0478688, - 44.8809403 - ], - [ - -124.046849, - 44.8829429 - ], - [ - -124.0452991, - 44.8847656 - ], - [ - -124.0432788, - 44.8863383 - ], - [ - -124.0408656, - 44.8876005 - ], - [ - -124.0381523, - 44.8885037 - ], - [ - -124.0352432, - 44.8890132 - ], - [ - -124.0322502, - 44.8891094 - ], - [ - -124.0292883, - 44.8887886 - ], - [ - -124.0264714, - 44.8880631 - ], - [ - -124.0239078, - 44.8869608 - ], - [ - -124.0216961, - 44.8855241 - ], - [ - -124.0199213, - 44.8838082 - ], - [ - -124.0186515, - 44.8818791 - ], - [ - -124.0179356, - 44.879811 - ], - [ - -124.0178009, - 44.8776833 - ], - [ - -124.0178511, - 44.8770133 - ], - [ - -124.01803, - 44.8758364 - ], - [ - -124.0181425, - 44.8753476 - ], - [ - -124.0181404, - 44.8753302 - ], - [ - -124.0184336, - 44.8732815 - ], - [ - -124.0216665, - 44.8617219 - ], - [ - -124.022124, - 44.8604766 - ], - [ - -124.0223941, - 44.8598867 - ], - [ - -124.0227684, - 44.8591585 - ], - [ - -124.0243268, - 44.8564325 - ], - [ - -124.0299483, - 44.8461675 - ], - [ - -124.0313031, - 44.8442682 - ], - [ - -124.0331526, - 44.8425934 - ], - [ - -124.0354257, - 44.8412074 - ], - [ - -124.0380351, - 44.8401636 - ], - [ - -124.0408805, - 44.8395019 - ], - [ - -124.0438527, - 44.8392478 - ], - [ - -124.0468374, - 44.839411 - ], - [ - -124.04972, - 44.8399854 - ], - [ - -124.0523899, - 44.8409487 - ], - [ - -124.0547444, - 44.8422641 - ], - [ - -124.0566931, - 44.843881 - ], - [ - -124.058161, - 44.8457372 - ], - [ - -124.0590918, - 44.8477615 - ], - [ - -124.0594496, - 44.8498761 - ], - [ - -124.0592207, - 44.8519997 - ], - [ - -124.0584136, - 44.8540507 - ], - [ - -124.0527558, - 44.8643914 - ], - [ - -124.052673, - 44.8645396 - ], - [ - -124.0514155, - 44.8667412 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16189_s_16188", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0375872, - 44.895328 - ], - [ - -124.037189, - 44.8956871 - ], - [ - -124.0357191, - 44.8969072 - ], - [ - -124.0335564, - 44.8983814 - ], - [ - -124.0310304, - 44.8995273 - ], - [ - -124.0282384, - 44.9003009 - ], - [ - -124.0252876, - 44.9006724 - ], - [ - -124.0222916, - 44.9006275 - ], - [ - -124.0193655, - 44.900168 - ], - [ - -124.0166217, - 44.8993115 - ], - [ - -124.014166, - 44.898091 - ], - [ - -124.0120925, - 44.8965534 - ], - [ - -124.010481, - 44.8947578 - ], - [ - -124.0093934, - 44.8927732 - ], - [ - -124.0088714, - 44.8906759 - ], - [ - -124.008935, - 44.8885466 - ], - [ - -124.0095818, - 44.8864669 - ], - [ - -124.0107869, - 44.884517 - ], - [ - -124.0125037, - 44.8827716 - ], - [ - -124.0135695, - 44.8818872 - ], - [ - -124.0145871, - 44.880889 - ], - [ - -124.0163049, - 44.8795129 - ], - [ - -124.0171848, - 44.8785166 - ], - [ - -124.0177904, - 44.877829 - ], - [ - -124.017799, - 44.8777085 - ], - [ - -124.0182439, - 44.8756022 - ], - [ - -124.019258, - 44.8735982 - ], - [ - -124.0208024, - 44.8717733 - ], - [ - -124.0228177, - 44.8701976 - ], - [ - -124.0252265, - 44.8689318 - ], - [ - -124.0279361, - 44.8680244 - ], - [ - -124.0308425, - 44.8675103 - ], - [ - -124.0338342, - 44.8674093 - ], - [ - -124.036796, - 44.8677251 - ], - [ - -124.0396144, - 44.8684457 - ], - [ - -124.042181, - 44.8695435 - ], - [ - -124.0443973, - 44.8709761 - ], - [ - -124.046178, - 44.8726887 - ], - [ - -124.0474548, - 44.8746153 - ], - [ - -124.0481785, - 44.8766821 - ], - [ - -124.0483212, - 44.8788095 - ], - [ - -124.0481738, - 44.8808835 - ], - [ - -124.0478664, - 44.8825701 - ], - [ - -124.0476396, - 44.8833372 - ], - [ - -124.0473326, - 44.8841987 - ], - [ - -124.0472016, - 44.8845117 - ], - [ - -124.0462672, - 44.8862092 - ], - [ - -124.0459573, - 44.8866572 - ], - [ - -124.0452971, - 44.8875123 - ], - [ - -124.0448552, - 44.8880284 - ], - [ - -124.0445958, - 44.8883206 - ], - [ - -124.0443231, - 44.8886175 - ], - [ - -124.0440929, - 44.8888987 - ], - [ - -124.0438385, - 44.8891982 - ], - [ - -124.0430867, - 44.8900523 - ], - [ - -124.0430768, - 44.8900635 - ], - [ - -124.0406772, - 44.8927818 - ], - [ - -124.0395762, - 44.8938728 - ], - [ - -124.0393972, - 44.8940288 - ], - [ - -124.0392296, - 44.8941723 - ], - [ - -124.0391286, - 44.8942573 - ], - [ - -124.0375872, - 44.895328 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16190_s_16191", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0711381, - 44.7417964 - ], - [ - -124.0711506, - 44.7421752 - ], - [ - -124.0711544, - 44.7423516 - ], - [ - -124.0711647, - 44.7433516 - ], - [ - -124.071136, - 44.7438815 - ], - [ - -124.0711552, - 44.7443385 - ], - [ - -124.0711457, - 44.7462985 - ], - [ - -124.0710906, - 44.7471847 - ], - [ - -124.0710307, - 44.7476847 - ], - [ - -124.0704218, - 44.7499327 - ], - [ - -124.0703619, - 44.7500727 - ], - [ - -124.0692133, - 44.752039 - ], - [ - -124.0675484, - 44.7538079 - ], - [ - -124.065431, - 44.7553113 - ], - [ - -124.0629426, - 44.7564914 - ], - [ - -124.0601788, - 44.7573029 - ], - [ - -124.0572459, - 44.7577145 - ], - [ - -124.0542566, - 44.7577105 - ], - [ - -124.0513259, - 44.757291 - ], - [ - -124.0485664, - 44.756472 - ], - [ - -124.0460843, - 44.7552852 - ], - [ - -124.043975, - 44.7537761 - ], - [ - -124.0423194, - 44.7520027 - ], - [ - -124.0411813, - 44.7500333 - ], - [ - -124.0406043, - 44.7479434 - ], - [ - -124.0406105, - 44.7458136 - ], - [ - -124.0406573, - 44.7456477 - ], - [ - -124.0406628, - 44.744623 - ], - [ - -124.0406551, - 44.7445359 - ], - [ - -124.0406735, - 44.7433284 - ], - [ - -124.0406664, - 44.7425946 - ], - [ - -124.0406639, - 44.7425184 - ], - [ - -124.0405964, - 44.7421709 - ], - [ - -124.0406811, - 44.7403234 - ], - [ - -124.0409842, - 44.7384992 - ], - [ - -124.041289, - 44.7351565 - ], - [ - -124.0413201, - 44.7348725 - ], - [ - -124.041761, - 44.7314325 - ], - [ - -124.041788, - 44.7312406 - ], - [ - -124.0419383, - 44.7302606 - ], - [ - -124.0420907, - 44.72951 - ], - [ - -124.0423663, - 44.7284221 - ], - [ - -124.0423898, - 44.7282109 - ], - [ - -124.0424585, - 44.7268114 - ], - [ - -124.0425596, - 44.7258857 - ], - [ - -124.0427599, - 44.7247057 - ], - [ - -124.0434078, - 44.7226265 - ], - [ - -124.0446121, - 44.7206773 - ], - [ - -124.0463266, - 44.7189331 - ], - [ - -124.0484853, - 44.7174608 - ], - [ - -124.0510052, - 44.7163171 - ], - [ - -124.0537896, - 44.7155458 - ], - [ - -124.0567315, - 44.7151765 - ], - [ - -124.0597179, - 44.7152235 - ], - [ - -124.062634, - 44.715685 - ], - [ - -124.065368, - 44.7165431 - ], - [ - -124.0678147, - 44.717765 - ], - [ - -124.0698802, - 44.7193038 - ], - [ - -124.071485, - 44.7211002 - ], - [ - -124.0725676, - 44.7230854 - ], - [ - -124.0730862, - 44.7251829 - ], - [ - -124.0730208, - 44.7273123 - ], - [ - -124.0728992, - 44.728031 - ], - [ - -124.0728421, - 44.7292066 - ], - [ - -124.0728039, - 44.7296869 - ], - [ - -124.0726941, - 44.7306769 - ], - [ - -124.0724998, - 44.731748 - ], - [ - -124.0721847, - 44.7329946 - ], - [ - -124.0721072, - 44.7335015 - ], - [ - -124.0716985, - 44.7367036 - ], - [ - -124.0713823, - 44.7401915 - ], - [ - -124.0713089, - 44.7407646 - ], - [ - -124.0711381, - 44.7417964 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16191_s_16025", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0451291, - 44.7063734 - ], - [ - -124.0451849, - 44.7059188 - ], - [ - -124.0455656, - 44.7034388 - ], - [ - -124.0456239, - 44.7031061 - ], - [ - -124.0469868, - 44.6962019 - ], - [ - -124.047421, - 44.6936779 - ], - [ - -124.0474713, - 44.6934127 - ], - [ - -124.04798, - 44.6909569 - ], - [ - -124.0483116, - 44.688962 - ], - [ - -124.0484226, - 44.6878292 - ], - [ - -124.048435, - 44.6863563 - ], - [ - -124.0481127, - 44.684273 - ], - [ - -124.0480776, - 44.6821432 - ], - [ - -124.0486255, - 44.6800495 - ], - [ - -124.0497354, - 44.6780723 - ], - [ - -124.0513645, - 44.6762875 - ], - [ - -124.0534502, - 44.6747637 - ], - [ - -124.0559123, - 44.6735595 - ], - [ - -124.0586563, - 44.6727212 - ], - [ - -124.0615767, - 44.6722808 - ], - [ - -124.0645614, - 44.6722554 - ], - [ - -124.0674957, - 44.6726459 - ], - [ - -124.070267, - 44.6734373 - ], - [ - -124.0727687, - 44.6745992 - ], - [ - -124.0749047, - 44.6760869 - ], - [ - -124.0765931, - 44.6778435 - ], - [ - -124.0777688, - 44.6798012 - ], - [ - -124.0783867, - 44.681885 - ], - [ - -124.0788074, - 44.6845949 - ], - [ - -124.0788997, - 44.6858523 - ], - [ - -124.0788803, - 44.6883023 - ], - [ - -124.0788439, - 44.6889944 - ], - [ - -124.0786744, - 44.6907344 - ], - [ - -124.0786057, - 44.6912564 - ], - [ - -124.0782063, - 44.6936665 - ], - [ - -124.0781489, - 44.6939752 - ], - [ - -124.0776369, - 44.6964529 - ], - [ - -124.0772103, - 44.6989402 - ], - [ - -124.0771751, - 44.6991317 - ], - [ - -124.0758295, - 44.7059658 - ], - [ - -124.0755117, - 44.7080439 - ], - [ - -124.0754236, - 44.7090077 - ], - [ - -124.0750729, - 44.7107216 - ], - [ - -124.074903, - 44.7112517 - ], - [ - -124.0744768, - 44.7123246 - ], - [ - -124.0738969, - 44.7135422 - ], - [ - -124.0736385, - 44.7141968 - ], - [ - -124.0734965, - 44.7149002 - ], - [ - -124.0734925, - 44.714951 - ], - [ - -124.0735151, - 44.7163315 - ], - [ - -124.073681, - 44.7199789 - ], - [ - -124.0736888, - 44.7203783 - ], - [ - -124.0736793, - 44.7219483 - ], - [ - -124.0736413, - 44.7226688 - ], - [ - -124.073372, - 44.7253788 - ], - [ - -124.0732579, - 44.7261426 - ], - [ - -124.0729783, - 44.7275426 - ], - [ - -124.0722692, - 44.7296117 - ], - [ - -124.0710074, - 44.7315423 - ], - [ - -124.0692414, - 44.7332604 - ], - [ - -124.067039, - 44.7346998 - ], - [ - -124.0644848, - 44.7358052 - ], - [ - -124.0616771, - 44.7365342 - ], - [ - -124.0587237, - 44.7368586 - ], - [ - -124.0557383, - 44.7367661 - ], - [ - -124.0528357, - 44.7362601 - ], - [ - -124.0501273, - 44.7353602 - ], - [ - -124.0477175, - 44.7341009 - ], - [ - -124.0456987, - 44.7325306 - ], - [ - -124.0441486, - 44.7307098 - ], - [ - -124.0431266, - 44.7287083 - ], - [ - -124.0426721, - 44.7266032 - ], - [ - -124.0428025, - 44.7244754 - ], - [ - -124.0430066, - 44.7234558 - ], - [ - -124.0432031, - 44.721489 - ], - [ - -124.0432098, - 44.7204794 - ], - [ - -124.0430498, - 44.716919 - ], - [ - -124.0430429, - 44.7166939 - ], - [ - -124.0430134, - 44.7148339 - ], - [ - -124.0430365, - 44.7141006 - ], - [ - -124.0431067, - 44.7132106 - ], - [ - -124.0432389, - 44.712269 - ], - [ - -124.0436194, - 44.7103891 - ], - [ - -124.0440348, - 44.7089929 - ], - [ - -124.0446752, - 44.707373 - ], - [ - -124.0449146, - 44.7068234 - ], - [ - -124.0451291, - 44.7063734 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16192_s_16190", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.08657, - 44.7764457 - ], - [ - -124.0874332, - 44.7780544 - ], - [ - -124.0876033, - 44.7784843 - ], - [ - -124.0881739, - 44.7813021 - ], - [ - -124.0881841, - 44.7819121 - ], - [ - -124.0879495, - 44.7839435 - ], - [ - -124.0878895, - 44.7841835 - ], - [ - -124.0875554, - 44.7852227 - ], - [ - -124.0868958, - 44.7868927 - ], - [ - -124.0868548, - 44.7869947 - ], - [ - -124.0862851, - 44.7883848 - ], - [ - -124.0846427, - 44.7910236 - ], - [ - -124.0841428, - 44.7916037 - ], - [ - -124.0819104, - 44.7936154 - ], - [ - -124.0816004, - 44.7938354 - ], - [ - -124.0805556, - 44.7944837 - ], - [ - -124.0804535, - 44.7961071 - ], - [ - -124.0804406, - 44.7962808 - ], - [ - -124.0803808, - 44.7969808 - ], - [ - -124.0802285, - 44.7979868 - ], - [ - -124.0801087, - 44.7985368 - ], - [ - -124.0798279, - 44.799522 - ], - [ - -124.0795381, - 44.8003421 - ], - [ - -124.0789121, - 44.8017185 - ], - [ - -124.0769329, - 44.8052487 - ], - [ - -124.0767295, - 44.805594 - ], - [ - -124.076419, - 44.8060967 - ], - [ - -124.0765732, - 44.8077969 - ], - [ - -124.0761799, - 44.8099083 - ], - [ - -124.0752154, - 44.8119244 - ], - [ - -124.0737168, - 44.8137679 - ], - [ - -124.0717416, - 44.8153678 - ], - [ - -124.0693658, - 44.8166626 - ], - [ - -124.0666806, - 44.8176026 - ], - [ - -124.0637893, - 44.8181516 - ], - [ - -124.0608031, - 44.8182885 - ], - [ - -124.0578368, - 44.818008 - ], - [ - -124.0550043, - 44.817321 - ], - [ - -124.0524147, - 44.8162538 - ], - [ - -124.0501675, - 44.8148474 - ], - [ - -124.048349, - 44.813156 - ], - [ - -124.0470292, - 44.8112446 - ], - [ - -124.0462586, - 44.8091866 - ], - [ - -124.045909, - 44.8076665 - ], - [ - -124.0457773, - 44.8069419 - ], - [ - -124.0456675, - 44.8061219 - ], - [ - -124.0456534, - 44.8041715 - ], - [ - -124.0457035, - 44.8037515 - ], - [ - -124.0462217, - 44.8017221 - ], - [ - -124.0464118, - 44.8012421 - ], - [ - -124.04678, - 44.8004346 - ], - [ - -124.0476804, - 44.7986947 - ], - [ - -124.0480323, - 44.7980742 - ], - [ - -124.0486867, - 44.7970157 - ], - [ - -124.0499951, - 44.794684 - ], - [ - -124.0503885, - 44.7884809 - ], - [ - -124.0504979, - 44.7875834 - ], - [ - -124.0506281, - 44.7868634 - ], - [ - -124.0515981, - 44.7842091 - ], - [ - -124.0517782, - 44.7838891 - ], - [ - -124.053977, - 44.7811877 - ], - [ - -124.054377, - 44.7808277 - ], - [ - -124.0552879, - 44.7801589 - ], - [ - -124.0552783, - 44.780133 - ], - [ - -124.0552183, - 44.7798429 - ], - [ - -124.0551817, - 44.7796543 - ], - [ - -124.0551218, - 44.7793243 - ], - [ - -124.0550593, - 44.776941 - ], - [ - -124.0551094, - 44.776551 - ], - [ - -124.0552286, - 44.7760074 - ], - [ - -124.0551491, - 44.7759338 - ], - [ - -124.0544991, - 44.7753037 - ], - [ - -124.0537073, - 44.7744554 - ], - [ - -124.0523275, - 44.7728152 - ], - [ - -124.0517022, - 44.7719936 - ], - [ - -124.0495727, - 44.7688833 - ], - [ - -124.0493027, - 44.7684669 - ], - [ - -124.0491128, - 44.7681569 - ], - [ - -124.0485192, - 44.7670183 - ], - [ - -124.0482893, - 44.7664882 - ], - [ - -124.0478419, - 44.7647187 - ], - [ - -124.0475236, - 44.7643804 - ], - [ - -124.0456899, - 44.7616939 - ], - [ - -124.0456469, - 44.7615998 - ], - [ - -124.0447677, - 44.7611106 - ], - [ - -124.0438177, - 44.7605405 - ], - [ - -124.0418753, - 44.759142 - ], - [ - -124.0408454, - 44.7582519 - ], - [ - -124.0400422, - 44.7574924 - ], - [ - -124.0397723, - 44.7572123 - ], - [ - -124.0385899, - 44.7557558 - ], - [ - -124.03822, - 44.7552058 - ], - [ - -124.0376066, - 44.7541557 - ], - [ - -124.0372667, - 44.7534757 - ], - [ - -124.0365759, - 44.7515528 - ], - [ - -124.0363461, - 44.7505327 - ], - [ - -124.0361658, - 44.748374 - ], - [ - -124.036589, - 44.7462326 - ], - [ - -124.0375989, - 44.7441933 - ], - [ - -124.0391555, - 44.7423369 - ], - [ - -124.0411969, - 44.740737 - ], - [ - -124.0436424, - 44.7394569 - ], - [ - -124.0456343, - 44.7387987 - ], - [ - -124.047966, - 44.7375709 - ], - [ - -124.0506696, - 44.7366638 - ], - [ - -124.0535695, - 44.7361499 - ], - [ - -124.0565544, - 44.7360491 - ], - [ - -124.0595095, - 44.7363653 - ], - [ - -124.0623213, - 44.7370862 - ], - [ - -124.0648819, - 44.7381841 - ], - [ - -124.0670929, - 44.739617 - ], - [ - -124.0688692, - 44.7413298 - ], - [ - -124.0701428, - 44.7432566 - ], - [ - -124.0708644, - 44.7453234 - ], - [ - -124.0710064, - 44.7474509 - ], - [ - -124.0708722, - 44.7480889 - ], - [ - -124.0718776, - 44.7489573 - ], - [ - -124.0721876, - 44.7492773 - ], - [ - -124.0738516, - 44.7515133 - ], - [ - -124.0740917, - 44.7519533 - ], - [ - -124.0746425, - 44.7533357 - ], - [ - -124.0755678, - 44.7541364 - ], - [ - -124.0758178, - 44.7544064 - ], - [ - -124.0775854, - 44.7570165 - ], - [ - -124.0776954, - 44.7572565 - ], - [ - -124.0782596, - 44.7589215 - ], - [ - -124.0784496, - 44.760629 - ], - [ - -124.0784497, - 44.761219 - ], - [ - -124.0784161, - 44.7614438 - ], - [ - -124.0788276, - 44.7620444 - ], - [ - -124.0795021, - 44.7628458 - ], - [ - -124.0795267, - 44.7628697 - ], - [ - -124.0823235, - 44.7653408 - ], - [ - -124.0834486, - 44.7664765 - ], - [ - -124.0840087, - 44.7671264 - ], - [ - -124.0851363, - 44.7687131 - ], - [ - -124.0854164, - 44.7692031 - ], - [ - -124.0860442, - 44.7705455 - ], - [ - -124.0863644, - 44.7714154 - ], - [ - -124.0868625, - 44.7742669 - ], - [ - -124.0868527, - 44.7750569 - ], - [ - -124.08657, - 44.7764457 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16192_s_16191", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0865689, - 44.7764508 - ], - [ - -124.0866164, - 44.7765107 - ], - [ - -124.0869665, - 44.7771107 - ], - [ - -124.0879917, - 44.7797954 - ], - [ - -124.0880518, - 44.7801054 - ], - [ - -124.0881932, - 44.7817609 - ], - [ - -124.0881833, - 44.7822109 - ], - [ - -124.0879495, - 44.7839435 - ], - [ - -124.0878895, - 44.7841835 - ], - [ - -124.0875369, - 44.7852691 - ], - [ - -124.0863076, - 44.7883293 - ], - [ - -124.0846427, - 44.7910236 - ], - [ - -124.0841428, - 44.7916037 - ], - [ - -124.0819104, - 44.7936154 - ], - [ - -124.0816004, - 44.7938354 - ], - [ - -124.0805556, - 44.7944837 - ], - [ - -124.0804535, - 44.7961071 - ], - [ - -124.0804406, - 44.7962808 - ], - [ - -124.0803808, - 44.7969808 - ], - [ - -124.0802285, - 44.7979868 - ], - [ - -124.0801087, - 44.7985368 - ], - [ - -124.0798279, - 44.799522 - ], - [ - -124.0795381, - 44.8003421 - ], - [ - -124.0789121, - 44.8017185 - ], - [ - -124.0769329, - 44.8052487 - ], - [ - -124.0767295, - 44.805594 - ], - [ - -124.076419, - 44.8060967 - ], - [ - -124.0765732, - 44.8077969 - ], - [ - -124.0761799, - 44.8099083 - ], - [ - -124.0752154, - 44.8119244 - ], - [ - -124.0737168, - 44.8137679 - ], - [ - -124.0717416, - 44.8153678 - ], - [ - -124.0693658, - 44.8166626 - ], - [ - -124.0666806, - 44.8176026 - ], - [ - -124.0637893, - 44.8181516 - ], - [ - -124.0608031, - 44.8182885 - ], - [ - -124.0578368, - 44.818008 - ], - [ - -124.0550043, - 44.817321 - ], - [ - -124.0524147, - 44.8162538 - ], - [ - -124.0501675, - 44.8148474 - ], - [ - -124.048349, - 44.813156 - ], - [ - -124.0470292, - 44.8112446 - ], - [ - -124.0462586, - 44.8091866 - ], - [ - -124.045909, - 44.8076665 - ], - [ - -124.0457773, - 44.8069419 - ], - [ - -124.0456675, - 44.8061219 - ], - [ - -124.0456534, - 44.8041715 - ], - [ - -124.0457035, - 44.8037515 - ], - [ - -124.0462217, - 44.8017221 - ], - [ - -124.0464118, - 44.8012421 - ], - [ - -124.04678, - 44.8004346 - ], - [ - -124.0476804, - 44.7986947 - ], - [ - -124.0480323, - 44.7980742 - ], - [ - -124.0486867, - 44.7970157 - ], - [ - -124.0499951, - 44.794684 - ], - [ - -124.0503885, - 44.7884809 - ], - [ - -124.0504979, - 44.7875834 - ], - [ - -124.0506281, - 44.7868634 - ], - [ - -124.0515981, - 44.7842091 - ], - [ - -124.0517782, - 44.7838891 - ], - [ - -124.053977, - 44.7811877 - ], - [ - -124.054377, - 44.7808277 - ], - [ - -124.0552879, - 44.7801589 - ], - [ - -124.0552783, - 44.780133 - ], - [ - -124.0552183, - 44.7798429 - ], - [ - -124.0551817, - 44.7796543 - ], - [ - -124.0551218, - 44.7793243 - ], - [ - -124.0550593, - 44.776941 - ], - [ - -124.0551094, - 44.776551 - ], - [ - -124.0552286, - 44.7760074 - ], - [ - -124.0551491, - 44.7759338 - ], - [ - -124.0544991, - 44.7753037 - ], - [ - -124.0537073, - 44.7744554 - ], - [ - -124.0523275, - 44.7728152 - ], - [ - -124.0517022, - 44.7719936 - ], - [ - -124.0495727, - 44.7688833 - ], - [ - -124.0493027, - 44.7684669 - ], - [ - -124.0491128, - 44.7681569 - ], - [ - -124.0485192, - 44.7670183 - ], - [ - -124.0482893, - 44.7664882 - ], - [ - -124.0478419, - 44.7647187 - ], - [ - -124.0475236, - 44.7643804 - ], - [ - -124.0456899, - 44.7616939 - ], - [ - -124.0456469, - 44.7615998 - ], - [ - -124.0447677, - 44.7611106 - ], - [ - -124.0438177, - 44.7605405 - ], - [ - -124.0422529, - 44.759456 - ], - [ - -124.0418529, - 44.7591359 - ], - [ - -124.0410671, - 44.7584533 - ], - [ - -124.0401672, - 44.7576032 - ], - [ - -124.0385899, - 44.7557558 - ], - [ - -124.03822, - 44.7552058 - ], - [ - -124.0376066, - 44.7541557 - ], - [ - -124.0372667, - 44.7534757 - ], - [ - -124.0366491, - 44.7518512 - ], - [ - -124.0364393, - 44.7510611 - ], - [ - -124.0361919, - 44.749576 - ], - [ - -124.0361421, - 44.748856 - ], - [ - -124.0362232, - 44.7470812 - ], - [ - -124.0363634, - 44.7462112 - ], - [ - -124.0366901, - 44.7448997 - ], - [ - -124.0369003, - 44.7442797 - ], - [ - -124.0376076, - 44.7427197 - ], - [ - -124.0380378, - 44.7419697 - ], - [ - -124.0385787, - 44.7411303 - ], - [ - -124.0388588, - 44.7407404 - ], - [ - -124.03983, - 44.7395738 - ], - [ - -124.0402601, - 44.7391238 - ], - [ - -124.0408598, - 44.7385393 - ], - [ - -124.0409915, - 44.7384195 - ], - [ - -124.041289, - 44.7351565 - ], - [ - -124.0413201, - 44.7348725 - ], - [ - -124.041761, - 44.7314325 - ], - [ - -124.041788, - 44.7312406 - ], - [ - -124.0419383, - 44.7302606 - ], - [ - -124.0420907, - 44.72951 - ], - [ - -124.0423663, - 44.7284221 - ], - [ - -124.0423898, - 44.7282109 - ], - [ - -124.0424585, - 44.7268114 - ], - [ - -124.0425596, - 44.7258857 - ], - [ - -124.0427599, - 44.7247057 - ], - [ - -124.0434078, - 44.7226265 - ], - [ - -124.0446121, - 44.7206773 - ], - [ - -124.0463266, - 44.7189331 - ], - [ - -124.0484853, - 44.7174608 - ], - [ - -124.0510052, - 44.7163171 - ], - [ - -124.0537896, - 44.7155458 - ], - [ - -124.0567315, - 44.7151765 - ], - [ - -124.0597179, - 44.7152235 - ], - [ - -124.062634, - 44.715685 - ], - [ - -124.065368, - 44.7165431 - ], - [ - -124.0678147, - 44.717765 - ], - [ - -124.0698802, - 44.7193038 - ], - [ - -124.071485, - 44.7211002 - ], - [ - -124.0725676, - 44.7230854 - ], - [ - -124.0730862, - 44.7251829 - ], - [ - -124.0730208, - 44.7273123 - ], - [ - -124.0728992, - 44.728031 - ], - [ - -124.0728421, - 44.7292066 - ], - [ - -124.0728039, - 44.7296869 - ], - [ - -124.0726941, - 44.7306769 - ], - [ - -124.0724998, - 44.731748 - ], - [ - -124.0721847, - 44.7329946 - ], - [ - -124.0721072, - 44.7335015 - ], - [ - -124.0716985, - 44.7367036 - ], - [ - -124.0713823, - 44.7401915 - ], - [ - -124.0713089, - 44.7407646 - ], - [ - -124.0709595, - 44.7428746 - ], - [ - -124.0702685, - 44.7450661 - ], - [ - -124.0696688, - 44.7463361 - ], - [ - -124.06931, - 44.7469053 - ], - [ - -124.0697804, - 44.7472059 - ], - [ - -124.0702204, - 44.7475259 - ], - [ - -124.0718776, - 44.7489573 - ], - [ - -124.0721876, - 44.7492773 - ], - [ - -124.0738516, - 44.7515133 - ], - [ - -124.0740917, - 44.7519533 - ], - [ - -124.0746425, - 44.7533357 - ], - [ - -124.0755678, - 44.7541364 - ], - [ - -124.0758178, - 44.7544064 - ], - [ - -124.0775854, - 44.7570165 - ], - [ - -124.0776954, - 44.7572565 - ], - [ - -124.0782596, - 44.7589215 - ], - [ - -124.0784496, - 44.760629 - ], - [ - -124.0784497, - 44.761219 - ], - [ - -124.0784161, - 44.7614438 - ], - [ - -124.0788276, - 44.7620444 - ], - [ - -124.0795021, - 44.7628458 - ], - [ - -124.0795267, - 44.7628697 - ], - [ - -124.0823235, - 44.7653408 - ], - [ - -124.0834486, - 44.7664765 - ], - [ - -124.0840087, - 44.7671264 - ], - [ - -124.0851363, - 44.7687131 - ], - [ - -124.0854164, - 44.7692031 - ], - [ - -124.0860442, - 44.7705455 - ], - [ - -124.0863644, - 44.7714154 - ], - [ - -124.0868625, - 44.7742669 - ], - [ - -124.0868527, - 44.7750569 - ], - [ - -124.0865689, - 44.7764508 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16194_s_15889", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0703323, - 44.6392473 - ], - [ - -124.0698062, - 44.64055 - ], - [ - -124.0684554, - 44.642425 - ], - [ - -124.0666228, - 44.6440783 - ], - [ - -124.0643772, - 44.6454478 - ], - [ - -124.0618033, - 44.6464818 - ], - [ - -124.0589981, - 44.6471414 - ], - [ - -124.0560671, - 44.6474017 - ], - [ - -124.0559913, - 44.6474031 - ], - [ - -124.0530153, - 44.6472507 - ], - [ - -124.0501382, - 44.6466867 - ], - [ - -124.0474706, - 44.6457328 - ], - [ - -124.0451151, - 44.6444256 - ], - [ - -124.0431621, - 44.6428154 - ], - [ - -124.0416868, - 44.6409642 - ], - [ - -124.0415443, - 44.6406581 - ], - [ - -124.0404787, - 44.6394452 - ], - [ - -124.039417, - 44.6374547 - ], - [ - -124.0389196, - 44.6353546 - ], - [ - -124.0390056, - 44.6332256 - ], - [ - -124.0396717, - 44.6311494 - ], - [ - -124.0408921, - 44.6292059 - ], - [ - -124.0426199, - 44.6274697 - ], - [ - -124.0447887, - 44.6260076 - ], - [ - -124.0473621, - 44.6245858 - ], - [ - -124.0499359, - 44.623437 - ], - [ - -124.0527778, - 44.6226759 - ], - [ - -124.0557747, - 44.6223328 - ], - [ - -124.0588072, - 44.6224212 - ], - [ - -124.0617549, - 44.6229378 - ], - [ - -124.0645004, - 44.6238619 - ], - [ - -124.0669346, - 44.6251567 - ], - [ - -124.0689605, - 44.6267709 - ], - [ - -124.0695301, - 44.6273277 - ], - [ - -124.0710125, - 44.6291131 - ], - [ - -124.0719926, - 44.6310673 - ], - [ - -124.0724344, - 44.6331188 - ], - [ - -124.0723218, - 44.6351929 - ], - [ - -124.0716588, - 44.6372139 - ], - [ - -124.0704696, - 44.6391079 - ], - [ - -124.0703323, - 44.6392473 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16195_s_16204", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0481663, - 44.8808801 - ], - [ - -124.0479688, - 44.8821412 - ], - [ - -124.0479239, - 44.8823282 - ], - [ - -124.047837, - 44.8826588 - ], - [ - -124.0478195, - 44.88272 - ], - [ - -124.0477952, - 44.8828193 - ], - [ - -124.0476591, - 44.8833089 - ], - [ - -124.0476051, - 44.8834819 - ], - [ - -124.047221, - 44.884484 - ], - [ - -124.0471471, - 44.884646 - ], - [ - -124.0467938, - 44.8853387 - ], - [ - -124.0466719, - 44.8855547 - ], - [ - -124.0459816, - 44.8866101 - ], - [ - -124.0457346, - 44.8869401 - ], - [ - -124.045307, - 44.8874745 - ], - [ - -124.0448573, - 44.8880013 - ], - [ - -124.0444126, - 44.8885241 - ], - [ - -124.044386, - 44.8885552 - ], - [ - -124.0439291, - 44.8890882 - ], - [ - -124.0438279, - 44.8892047 - ], - [ - -124.043081, - 44.8900518 - ], - [ - -124.043066, - 44.8900687 - ], - [ - -124.0416346, - 44.8916854 - ], - [ - -124.0408318, - 44.8926079 - ], - [ - -124.0401351, - 44.89334 - ], - [ - -124.0397772, - 44.893685 - ], - [ - -124.0377103, - 44.895306 - ], - [ - -124.0375023, - 44.8954145 - ], - [ - -124.0373714, - 44.8955158 - ], - [ - -124.0366236, - 44.8961702 - ], - [ - -124.0345156, - 44.8976839 - ], - [ - -124.0320324, - 44.8988761 - ], - [ - -124.0292697, - 44.899701 - ], - [ - -124.0263336, - 44.9001269 - ], - [ - -124.0233369, - 44.9001375 - ], - [ - -124.020395, - 44.8997322 - ], - [ - -124.0176209, - 44.8989268 - ], - [ - -124.0151213, - 44.8977521 - ], - [ - -124.0129922, - 44.8962533 - ], - [ - -124.0113156, - 44.8944881 - ], - [ - -124.0101557, - 44.8925243 - ], - [ - -124.0095572, - 44.8904374 - ], - [ - -124.009543, - 44.8883075 - ], - [ - -124.0101135, - 44.8862167 - ], - [ - -124.0112467, - 44.8842451 - ], - [ - -124.0128992, - 44.8824685 - ], - [ - -124.0136295, - 44.8818296 - ], - [ - -124.0145839, - 44.8808754 - ], - [ - -124.0163633, - 44.879437 - ], - [ - -124.0171931, - 44.8785002 - ], - [ - -124.0177881, - 44.8778258 - ], - [ - -124.0178006, - 44.8776579 - ], - [ - -124.018251, - 44.8755522 - ], - [ - -124.0192705, - 44.8735495 - ], - [ - -124.0208198, - 44.8717267 - ], - [ - -124.0228393, - 44.8701538 - ], - [ - -124.0252514, - 44.8688913 - ], - [ - -124.0279635, - 44.8679875 - ], - [ - -124.0308713, - 44.8674774 - ], - [ - -124.0338631, - 44.8673803 - ], - [ - -124.0368242, - 44.8677002 - ], - [ - -124.0396406, - 44.8684246 - ], - [ - -124.0422043, - 44.8695258 - ], - [ - -124.0444167, - 44.8709614 - ], - [ - -124.0461929, - 44.8726764 - ], - [ - -124.0474645, - 44.8746048 - ], - [ - -124.0481826, - 44.8766725 - ], - [ - -124.0483197, - 44.8788001 - ], - [ - -124.0481663, - 44.8808801 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16196_s_781958", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0725732, - 44.666517 - ], - [ - -124.0725814, - 44.6665359 - ], - [ - -124.0727136, - 44.6668378 - ], - [ - -124.072788, - 44.6670129 - ], - [ - -124.0729261, - 44.6673479 - ], - [ - -124.0729516, - 44.6674105 - ], - [ - -124.073061, - 44.667682 - ], - [ - -124.0737104, - 44.6692797 - ], - [ - -124.0739406, - 44.6698293 - ], - [ - -124.0742185, - 44.6704796 - ], - [ - -124.0748138, - 44.6718725 - ], - [ - -124.0754005, - 44.6739608 - ], - [ - -124.075405, - 44.6760907 - ], - [ - -124.074827, - 44.6781803 - ], - [ - -124.0736887, - 44.6801493 - ], - [ - -124.0720338, - 44.681922 - ], - [ - -124.0699258, - 44.6834303 - ], - [ - -124.0674458, - 44.6846161 - ], - [ - -124.0646891, - 44.6854339 - ], - [ - -124.0617617, - 44.6858523 - ], - [ - -124.0587761, - 44.6858551 - ], - [ - -124.0558472, - 44.6854422 - ], - [ - -124.0530875, - 44.6846296 - ], - [ - -124.0506031, - 44.6834484 - ], - [ - -124.0484896, - 44.6819441 - ], - [ - -124.0468281, - 44.6801745 - ], - [ - -124.0456826, - 44.6782077 - ], - [ - -124.0450879, - 44.6768146 - ], - [ - -124.044798, - 44.6761354 - ], - [ - -124.0447738, - 44.6760782 - ], - [ - -124.0445139, - 44.6754572 - ], - [ - -124.0444787, - 44.6753717 - ], - [ - -124.0438081, - 44.6737196 - ], - [ - -124.0437988, - 44.6736967 - ], - [ - -124.0436975, - 44.673445 - ], - [ - -124.0436086, - 44.673229 - ], - [ - -124.0435098, - 44.6730033 - ], - [ - -124.0435002, - 44.6729812 - ], - [ - -124.0434472, - 44.6728592 - ], - [ - -124.0433544, - 44.6726155 - ], - [ - -124.0433321, - 44.6725702 - ], - [ - -124.0430503, - 44.6719383 - ], - [ - -124.0429416, - 44.6716662 - ], - [ - -124.0428572, - 44.6714801 - ], - [ - -124.0426781, - 44.6710563 - ], - [ - -124.0425511, - 44.670732 - ], - [ - -124.0425009, - 44.6706321 - ], - [ - -124.0423721, - 44.6702713 - ], - [ - -124.0423563, - 44.6702748 - ], - [ - -124.0422745, - 44.6700853 - ], - [ - -124.0422392, - 44.6700075 - ], - [ - -124.0421031, - 44.6696909 - ], - [ - -124.0418023, - 44.6689518 - ], - [ - -124.0415285, - 44.6683339 - ], - [ - -124.041495, - 44.6682573 - ], - [ - -124.0407474, - 44.6665252 - ], - [ - -124.0406785, - 44.6663609 - ], - [ - -124.0403553, - 44.6655679 - ], - [ - -124.04027, - 44.6653704 - ], - [ - -124.0396738, - 44.6632834 - ], - [ - -124.0396596, - 44.6611535 - ], - [ - -124.0402278, - 44.6590626 - ], - [ - -124.0413567, - 44.6570909 - ], - [ - -124.0430026, - 44.6553143 - ], - [ - -124.0451024, - 44.653801 - ], - [ - -124.0475754, - 44.6526091 - ], - [ - -124.0503266, - 44.6517844 - ], - [ - -124.0532502, - 44.6513587 - ], - [ - -124.056234, - 44.6513481 - ], - [ - -124.0591633, - 44.6517532 - ], - [ - -124.0619258, - 44.6525585 - ], - [ - -124.0644151, - 44.6537328 - ], - [ - -124.0665358, - 44.6552312 - ], - [ - -124.0682063, - 44.6569961 - ], - [ - -124.0693624, - 44.6589597 - ], - [ - -124.0694844, - 44.6592417 - ], - [ - -124.0695557, - 44.6594113 - ], - [ - -124.0698803, - 44.6602069 - ], - [ - -124.0705768, - 44.6618185 - ], - [ - -124.070888, - 44.6625203 - ], - [ - -124.0709922, - 44.6627653 - ], - [ - -124.0712793, - 44.6634699 - ], - [ - -124.071342, - 44.6636114 - ], - [ - -124.0714561, - 44.6638754 - ], - [ - -124.0714695, - 44.663923 - ], - [ - -124.0717292, - 44.6645039 - ], - [ - -124.0719208, - 44.6649927 - ], - [ - -124.0719932, - 44.665152 - ], - [ - -124.0721511, - 44.6655219 - ], - [ - -124.0722067, - 44.6656608 - ], - [ - -124.0722122, - 44.665672 - ], - [ - -124.0723089, - 44.665874 - ], - [ - -124.0723779, - 44.666023 - ], - [ - -124.0725732, - 44.666517 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16197_s_16202", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.077647, - 44.8144593 - ], - [ - -124.077795, - 44.8149742 - ], - [ - -124.0781042, - 44.8170927 - ], - [ - -124.0778269, - 44.8192133 - ], - [ - -124.0769736, - 44.8212548 - ], - [ - -124.0755771, - 44.8231385 - ], - [ - -124.0736909, - 44.8247921 - ], - [ - -124.0713875, - 44.8261519 - ], - [ - -124.0687555, - 44.8271658 - ], - [ - -124.0658961, - 44.8277948 - ], - [ - -124.0629192, - 44.8280146 - ], - [ - -124.0599392, - 44.8278168 - ], - [ - -124.0570707, - 44.827209 - ], - [ - -124.0544241, - 44.8262146 - ], - [ - -124.052101, - 44.8248718 - ], - [ - -124.0501908, - 44.8232322 - ], - [ - -124.0487669, - 44.8213589 - ], - [ - -124.0478839, - 44.8193238 - ], - [ - -124.0475741, - 44.8182438 - ], - [ - -124.0473834, - 44.8174171 - ], - [ - -124.0472536, - 44.8166771 - ], - [ - -124.0471466, - 44.8157357 - ], - [ - -124.0471167, - 44.8151657 - ], - [ - -124.04711, - 44.8145155 - ], - [ - -124.0471397, - 44.8135796 - ], - [ - -124.0470842, - 44.8125629 - ], - [ - -124.0470685, - 44.8124745 - ], - [ - -124.0470048, - 44.8122087 - ], - [ - -124.0470117, - 44.8122078 - ], - [ - -124.046761, - 44.8114612 - ], - [ - -124.0466007, - 44.8105703 - ], - [ - -124.0459234, - 44.8077281 - ], - [ - -124.0457152, - 44.8062347 - ], - [ - -124.0456825, - 44.8054533 - ], - [ - -124.0457954, - 44.8037715 - ], - [ - -124.0459276, - 44.8030245 - ], - [ - -124.0465907, - 44.8009476 - ], - [ - -124.04781, - 44.7990027 - ], - [ - -124.0495388, - 44.7972645 - ], - [ - -124.0517105, - 44.7957998 - ], - [ - -124.0542417, - 44.7946649 - ], - [ - -124.0570351, - 44.7939033 - ], - [ - -124.0599835, - 44.7935443 - ], - [ - -124.0629735, - 44.7936018 - ], - [ - -124.0658904, - 44.7940734 - ], - [ - -124.0686222, - 44.7949411 - ], - [ - -124.0710638, - 44.7961715 - ], - [ - -124.0731214, - 44.7977174 - ], - [ - -124.0747161, - 44.7995194 - ], - [ - -124.0757864, - 44.8015082 - ], - [ - -124.0762913, - 44.8036076 - ], - [ - -124.0762381, - 44.8050216 - ], - [ - -124.0767464, - 44.8071499 - ], - [ - -124.0768379, - 44.8075868 - ], - [ - -124.0769319, - 44.8081073 - ], - [ - -124.0770942, - 44.8085494 - ], - [ - -124.0772144, - 44.8090493 - ], - [ - -124.0773124, - 44.8095192 - ], - [ - -124.0774526, - 44.8103092 - ], - [ - -124.0775612, - 44.8112444 - ], - [ - -124.0776617, - 44.8130644 - ], - [ - -124.0776697, - 44.8137325 - ], - [ - -124.077647, - 44.8144593 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16200_s_2456760", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682463, - 44.6483062 - ], - [ - -124.0682488, - 44.6484308 - ], - [ - -124.0682469, - 44.6486498 - ], - [ - -124.0682467, - 44.6486736 - ], - [ - -124.0682427, - 44.6490016 - ], - [ - -124.0682419, - 44.6490709 - ], - [ - -124.0682423, - 44.6491136 - ], - [ - -124.0682465, - 44.6499656 - ], - [ - -124.0682465, - 44.6500464 - ], - [ - -124.0682431, - 44.6506613 - ], - [ - -124.067939, - 44.6527802 - ], - [ - -124.0670617, - 44.6548159 - ], - [ - -124.0656447, - 44.6566904 - ], - [ - -124.0637425, - 44.6583315 - ], - [ - -124.0614282, - 44.6596762 - ], - [ - -124.0587907, - 44.6606727 - ], - [ - -124.0559314, - 44.6612828 - ], - [ - -124.0529603, - 44.6614829 - ], - [ - -124.0499915, - 44.6612654 - ], - [ - -124.0471393, - 44.6606387 - ], - [ - -124.0445133, - 44.6596269 - ], - [ - -124.0422145, - 44.6582687 - ], - [ - -124.0403311, - 44.6566166 - ], - [ - -124.0389356, - 44.6547339 - ], - [ - -124.0380816, - 44.6526931 - ], - [ - -124.0378018, - 44.6505725 - ], - [ - -124.0378053, - 44.6500005 - ], - [ - -124.0378007, - 44.6491085 - ], - [ - -124.0378013, - 44.64897 - ], - [ - -124.0378033, - 44.6488112 - ], - [ - -124.0378066, - 44.6485456 - ], - [ - -124.0378059, - 44.6483278 - ], - [ - -124.037806, - 44.6482482 - ], - [ - -124.0378122, - 44.6473498 - ], - [ - -124.0378247, - 44.6455133 - ], - [ - -124.0378257, - 44.6453723 - ], - [ - -124.0378299, - 44.6446598 - ], - [ - -124.0378302, - 44.6446213 - ], - [ - -124.0378311, - 44.6445416 - ], - [ - -124.0378351, - 44.6439499 - ], - [ - -124.0378353, - 44.6439341 - ], - [ - -124.0378371, - 44.6437217 - ], - [ - -124.0378381, - 44.6434604 - ], - [ - -124.0378384, - 44.6434175 - ], - [ - -124.0378404, - 44.6432056 - ], - [ - -124.0378413, - 44.6430835 - ], - [ - -124.0378423, - 44.6428263 - ], - [ - -124.0378425, - 44.6427906 - ], - [ - -124.0378445, - 44.6425588 - ], - [ - -124.0378486, - 44.641894 - ], - [ - -124.0378489, - 44.6418592 - ], - [ - -124.0378498, - 44.6417764 - ], - [ - -124.0378543, - 44.6411658 - ], - [ - -124.0373114, - 44.6399498 - ], - [ - -124.0369766, - 44.6378397 - ], - [ - -124.0369694, - 44.637493 - ], - [ - -124.0372175, - 44.6353704 - ], - [ - -124.0380407, - 44.6333232 - ], - [ - -124.0394074, - 44.63143 - ], - [ - -124.041265, - 44.6297635 - ], - [ - -124.043542, - 44.6283878 - ], - [ - -124.0461511, - 44.6273557 - ], - [ - -124.0489919, - 44.6267068 - ], - [ - -124.0519554, - 44.6264661 - ], - [ - -124.0549276, - 44.6266429 - ], - [ - -124.0577946, - 44.6272302 - ], - [ - -124.0587936, - 44.6275977 - ], - [ - -124.0588202, - 44.6276034 - ], - [ - -124.0593288, - 44.6277946 - ], - [ - -124.060446, - 44.6282056 - ], - [ - -124.060494, - 44.6282329 - ], - [ - -124.0614827, - 44.6286047 - ], - [ - -124.0638172, - 44.6299606 - ], - [ - -124.0657325, - 44.6316181 - ], - [ - -124.0671536, - 44.6335123 - ], - [ - -124.0680249, - 44.6355691 - ], - [ - -124.0683123, - 44.6377082 - ], - [ - -124.0683104, - 44.6381042 - ], - [ - -124.0683102, - 44.6381355 - ], - [ - -124.0683085, - 44.6383202 - ], - [ - -124.0683085, - 44.638352 - ], - [ - -124.0683083, - 44.6384109 - ], - [ - -124.0683045, - 44.6389342 - ], - [ - -124.0682997, - 44.6396826 - ], - [ - -124.068296, - 44.6401893 - ], - [ - -124.0682961, - 44.640386 - ], - [ - -124.0682959, - 44.640438 - ], - [ - -124.0682911, - 44.641183 - ], - [ - -124.0682863, - 44.6418964 - ], - [ - -124.0682815, - 44.6426644 - ], - [ - -124.0682814, - 44.6426784 - ], - [ - -124.0682796, - 44.6429015 - ], - [ - -124.0682787, - 44.6431537 - ], - [ - -124.0682786, - 44.6431792 - ], - [ - -124.0682776, - 44.6433222 - ], - [ - -124.0682775, - 44.6433385 - ], - [ - -124.0682758, - 44.643537 - ], - [ - -124.0682749, - 44.6437966 - ], - [ - -124.0682747, - 44.6438359 - ], - [ - -124.0682728, - 44.64406 - ], - [ - -124.068269, - 44.6446543 - ], - [ - -124.0682681, - 44.6448365 - ], - [ - -124.0682642, - 44.6454705 - ], - [ - -124.0682633, - 44.6456164 - ], - [ - -124.0682517, - 44.6474517 - ], - [ - -124.0682463, - 44.6483062 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16201_s_16197", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0865689, - 44.7764508 - ], - [ - -124.0866164, - 44.7765107 - ], - [ - -124.0869665, - 44.7771107 - ], - [ - -124.0879917, - 44.7797954 - ], - [ - -124.0880518, - 44.7801054 - ], - [ - -124.0881932, - 44.7817609 - ], - [ - -124.0881833, - 44.7822109 - ], - [ - -124.0879495, - 44.7839435 - ], - [ - -124.0878895, - 44.7841835 - ], - [ - -124.0875369, - 44.7852691 - ], - [ - -124.0863076, - 44.7883293 - ], - [ - -124.0846427, - 44.7910236 - ], - [ - -124.0841428, - 44.7916037 - ], - [ - -124.0819104, - 44.7936154 - ], - [ - -124.0816004, - 44.7938354 - ], - [ - -124.0805556, - 44.7944837 - ], - [ - -124.0804535, - 44.7961071 - ], - [ - -124.0804406, - 44.7962808 - ], - [ - -124.0803808, - 44.7969808 - ], - [ - -124.0802285, - 44.7979868 - ], - [ - -124.0801087, - 44.7985368 - ], - [ - -124.0798279, - 44.799522 - ], - [ - -124.0795381, - 44.8003421 - ], - [ - -124.0789121, - 44.8017185 - ], - [ - -124.0769871, - 44.8051519 - ], - [ - -124.0763774, - 44.806303 - ], - [ - -124.0762787, - 44.8064844 - ], - [ - -124.0752107, - 44.808396 - ], - [ - -124.0738379, - 44.8102884 - ], - [ - -124.0719726, - 44.8119537 - ], - [ - -124.0696867, - 44.813328 - ], - [ - -124.067068, - 44.8143584 - ], - [ - -124.064217, - 44.8150052 - ], - [ - -124.0612436, - 44.8152437 - ], - [ - -124.0582619, - 44.8150646 - ], - [ - -124.0553867, - 44.8144748 - ], - [ - -124.0527285, - 44.813497 - ], - [ - -124.0503894, - 44.8121688 - ], - [ - -124.0484594, - 44.8105413 - ], - [ - -124.0470126, - 44.808677 - ], - [ - -124.0461046, - 44.8066475 - ], - [ - -124.0457703, - 44.804531 - ], - [ - -124.0460224, - 44.8024087 - ], - [ - -124.0468512, - 44.8003622 - ], - [ - -124.0478694, - 44.7985412 - ], - [ - -124.0484831, - 44.7973837 - ], - [ - -124.0485891, - 44.7971895 - ], - [ - -124.0499951, - 44.794684 - ], - [ - -124.0503885, - 44.7884809 - ], - [ - -124.0504979, - 44.7875834 - ], - [ - -124.0506281, - 44.7868634 - ], - [ - -124.0515981, - 44.7842091 - ], - [ - -124.0517782, - 44.7838891 - ], - [ - -124.053977, - 44.7811877 - ], - [ - -124.054377, - 44.7808277 - ], - [ - -124.0552879, - 44.7801589 - ], - [ - -124.0552783, - 44.780133 - ], - [ - -124.0552183, - 44.7798429 - ], - [ - -124.0551817, - 44.7796543 - ], - [ - -124.0551218, - 44.7793243 - ], - [ - -124.0550593, - 44.776941 - ], - [ - -124.0551094, - 44.776551 - ], - [ - -124.0552286, - 44.7760074 - ], - [ - -124.0551491, - 44.7759338 - ], - [ - -124.0544991, - 44.7753037 - ], - [ - -124.0537073, - 44.7744554 - ], - [ - -124.0523275, - 44.7728152 - ], - [ - -124.0517022, - 44.7719936 - ], - [ - -124.0495727, - 44.7688833 - ], - [ - -124.0493027, - 44.7684669 - ], - [ - -124.0491128, - 44.7681569 - ], - [ - -124.0485192, - 44.7670183 - ], - [ - -124.0482893, - 44.7664882 - ], - [ - -124.0478419, - 44.7647187 - ], - [ - -124.0475236, - 44.7643804 - ], - [ - -124.0456899, - 44.7616939 - ], - [ - -124.0456469, - 44.7615998 - ], - [ - -124.0447677, - 44.7611106 - ], - [ - -124.0438177, - 44.7605405 - ], - [ - -124.0422529, - 44.759456 - ], - [ - -124.0418529, - 44.7591359 - ], - [ - -124.0410671, - 44.7584533 - ], - [ - -124.0401672, - 44.7576032 - ], - [ - -124.0385899, - 44.7557558 - ], - [ - -124.03822, - 44.7552058 - ], - [ - -124.0376066, - 44.7541557 - ], - [ - -124.0372667, - 44.7534757 - ], - [ - -124.0366491, - 44.7518512 - ], - [ - -124.0364393, - 44.7510611 - ], - [ - -124.0361919, - 44.749576 - ], - [ - -124.0361421, - 44.748856 - ], - [ - -124.0362232, - 44.7470812 - ], - [ - -124.0363634, - 44.7462112 - ], - [ - -124.0366901, - 44.7448997 - ], - [ - -124.0369003, - 44.7442797 - ], - [ - -124.0376076, - 44.7427197 - ], - [ - -124.0380378, - 44.7419697 - ], - [ - -124.0385787, - 44.7411303 - ], - [ - -124.0388588, - 44.7407404 - ], - [ - -124.03983, - 44.7395738 - ], - [ - -124.0402601, - 44.7391238 - ], - [ - -124.0408598, - 44.7385393 - ], - [ - -124.0409915, - 44.7384195 - ], - [ - -124.041289, - 44.7351565 - ], - [ - -124.0413201, - 44.7348725 - ], - [ - -124.041761, - 44.7314325 - ], - [ - -124.041788, - 44.7312406 - ], - [ - -124.0418767, - 44.7306619 - ], - [ - -124.0419353, - 44.7294567 - ], - [ - -124.0419707, - 44.7290023 - ], - [ - -124.042095, - 44.7278463 - ], - [ - -124.0421541, - 44.7274112 - ], - [ - -124.0423121, - 44.7264505 - ], - [ - -124.0424701, - 44.7257108 - ], - [ - -124.0429112, - 44.7240362 - ], - [ - -124.0437476, - 44.7219914 - ], - [ - -124.0451273, - 44.7201023 - ], - [ - -124.0469974, - 44.7184414 - ], - [ - -124.0492859, - 44.7170724 - ], - [ - -124.051905, - 44.7160481 - ], - [ - -124.0547539, - 44.7154076 - ], - [ - -124.0577232, - 44.7151757 - ], - [ - -124.060699, - 44.7153612 - ], - [ - -124.0635668, - 44.7159571 - ], - [ - -124.0662166, - 44.7169403 - ], - [ - -124.0685466, - 44.7182732 - ], - [ - -124.0704672, - 44.7199046 - ], - [ - -124.0719047, - 44.7217717 - ], - [ - -124.0728036, - 44.7238029 - ], - [ - -124.0731295, - 44.72592 - ], - [ - -124.0728698, - 44.7280419 - ], - [ - -124.0725263, - 44.7293487 - ], - [ - -124.0724654, - 44.7297206 - ], - [ - -124.0723893, - 44.7304316 - ], - [ - -124.072323, - 44.7318127 - ], - [ - -124.0722423, - 44.7326174 - ], - [ - -124.0721072, - 44.7335015 - ], - [ - -124.0716985, - 44.7367036 - ], - [ - -124.0713823, - 44.7401915 - ], - [ - -124.0713089, - 44.7407646 - ], - [ - -124.0709595, - 44.7428746 - ], - [ - -124.0702685, - 44.7450661 - ], - [ - -124.0696688, - 44.7463361 - ], - [ - -124.06931, - 44.7469053 - ], - [ - -124.0697804, - 44.7472059 - ], - [ - -124.0702204, - 44.7475259 - ], - [ - -124.0718776, - 44.7489573 - ], - [ - -124.0721876, - 44.7492773 - ], - [ - -124.0738516, - 44.7515133 - ], - [ - -124.0740917, - 44.7519533 - ], - [ - -124.0746425, - 44.7533357 - ], - [ - -124.0755678, - 44.7541364 - ], - [ - -124.0758178, - 44.7544064 - ], - [ - -124.0775854, - 44.7570165 - ], - [ - -124.0776954, - 44.7572565 - ], - [ - -124.0782596, - 44.7589215 - ], - [ - -124.0784496, - 44.760629 - ], - [ - -124.0784497, - 44.761219 - ], - [ - -124.0784161, - 44.7614438 - ], - [ - -124.0788276, - 44.7620444 - ], - [ - -124.0795021, - 44.7628458 - ], - [ - -124.0795267, - 44.7628697 - ], - [ - -124.0823235, - 44.7653408 - ], - [ - -124.0834486, - 44.7664765 - ], - [ - -124.0840087, - 44.7671264 - ], - [ - -124.0851363, - 44.7687131 - ], - [ - -124.0854164, - 44.7692031 - ], - [ - -124.0860442, - 44.7705455 - ], - [ - -124.0863644, - 44.7714154 - ], - [ - -124.0868625, - 44.7742669 - ], - [ - -124.0868527, - 44.7750569 - ], - [ - -124.0865689, - 44.7764508 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16202_s_16203", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0806091, - 44.823678 - ], - [ - -124.0809131, - 44.8249745 - ], - [ - -124.0810032, - 44.8255845 - ], - [ - -124.0808297, - 44.828707 - ], - [ - -124.0806599, - 44.829357 - ], - [ - -124.0793023, - 44.8322341 - ], - [ - -124.0791123, - 44.8325041 - ], - [ - -124.0777775, - 44.8340599 - ], - [ - -124.0774275, - 44.8343999 - ], - [ - -124.0753108, - 44.8360641 - ], - [ - -124.0749508, - 44.8362941 - ], - [ - -124.0722321, - 44.8376808 - ], - [ - -124.0719821, - 44.8377808 - ], - [ - -124.0687059, - 44.8387544 - ], - [ - -124.0683812, - 44.8388206 - ], - [ - -124.0617821, - 44.84802 - ], - [ - -124.0612941, - 44.8485797 - ], - [ - -124.0603266, - 44.8502554 - ], - [ - -124.058414, - 44.8537716 - ], - [ - -124.0570649, - 44.8556731 - ], - [ - -124.0552201, - 44.8573507 - ], - [ - -124.0529505, - 44.8587401 - ], - [ - -124.0503433, - 44.8597878 - ], - [ - -124.0474988, - 44.8604535 - ], - [ - -124.0445263, - 44.8607117 - ], - [ - -124.04154, - 44.8605524 - ], - [ - -124.0386549, - 44.8599818 - ], - [ - -124.0359818, - 44.8590217 - ], - [ - -124.0336236, - 44.8577091 - ], - [ - -124.0316708, - 44.8560945 - ], - [ - -124.0301985, - 44.8542398 - ], - [ - -124.0292632, - 44.8522166 - ], - [ - -124.0289009, - 44.8501023 - ], - [ - -124.0291254, - 44.8479785 - ], - [ - -124.0299279, - 44.8459266 - ], - [ - -124.0318987, - 44.8423068 - ], - [ - -124.0320149, - 44.8420997 - ], - [ - -124.0333554, - 44.8397798 - ], - [ - -124.0339227, - 44.8389094 - ], - [ - -124.0344329, - 44.8382094 - ], - [ - -124.0349529, - 44.8376192 - ], - [ - -124.0437525, - 44.8253595 - ], - [ - -124.0444941, - 44.8244397 - ], - [ - -124.0447642, - 44.8241397 - ], - [ - -124.0458889, - 44.8230469 - ], - [ - -124.0464389, - 44.8225769 - ], - [ - -124.0484841, - 44.8212007 - ], - [ - -124.0479618, - 44.8195797 - ], - [ - -124.047582, - 44.8174671 - ], - [ - -124.0477885, - 44.8153423 - ], - [ - -124.0485734, - 44.813287 - ], - [ - -124.0499065, - 44.8113802 - ], - [ - -124.0517364, - 44.8096951 - ], - [ - -124.0539929, - 44.8082965 - ], - [ - -124.0565893, - 44.8072381 - ], - [ - -124.0594257, - 44.8065606 - ], - [ - -124.0623932, - 44.8062899 - ], - [ - -124.0653779, - 44.8064365 - ], - [ - -124.0682652, - 44.8069947 - ], - [ - -124.070944, - 44.8079432 - ], - [ - -124.0733116, - 44.8092454 - ], - [ - -124.0752769, - 44.8108513 - ], - [ - -124.0767644, - 44.8126993 - ], - [ - -124.0777169, - 44.8147184 - ], - [ - -124.0806091, - 44.823678 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16203_s_16195", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0515377, - 44.8662919 - ], - [ - -124.0514476, - 44.8666115 - ], - [ - -124.0514396, - 44.8666289 - ], - [ - -124.051215, - 44.867402 - ], - [ - -124.049096, - 44.8750363 - ], - [ - -124.0491452, - 44.876153 - ], - [ - -124.0491253, - 44.876363 - ], - [ - -124.0485527, - 44.8786636 - ], - [ - -124.0483728, - 44.8791036 - ], - [ - -124.0481705, - 44.8795063 - ], - [ - -124.0478594, - 44.8809364 - ], - [ - -124.0468326, - 44.8829372 - ], - [ - -124.0452764, - 44.8847572 - ], - [ - -124.0432506, - 44.8863263 - ], - [ - -124.040833, - 44.8875842 - ], - [ - -124.0381166, - 44.8884827 - ], - [ - -124.0352057, - 44.888987 - ], - [ - -124.0322124, - 44.8890779 - ], - [ - -124.0292516, - 44.8887519 - ], - [ - -124.0264372, - 44.8880214 - ], - [ - -124.0238775, - 44.8869146 - ], - [ - -124.0216708, - 44.885474 - ], - [ - -124.019902, - 44.883755 - ], - [ - -124.018639, - 44.8818237 - ], - [ - -124.0179302, - 44.8797543 - ], - [ - -124.017803, - 44.8776264 - ], - [ - -124.0178531, - 44.8769864 - ], - [ - -124.01803, - 44.8758364 - ], - [ - -124.0181416, - 44.8753515 - ], - [ - -124.0181403, - 44.8753407 - ], - [ - -124.0184304, - 44.873293 - ], - [ - -124.0212529, - 44.8631434 - ], - [ - -124.0212798, - 44.8630488 - ], - [ - -124.0216902, - 44.8616388 - ], - [ - -124.022124, - 44.8604766 - ], - [ - -124.0223941, - 44.8598867 - ], - [ - -124.0224415, - 44.8598977 - ], - [ - -124.0227226, - 44.8590338 - ], - [ - -124.0299454, - 44.8458947 - ], - [ - -124.0313036, - 44.8439966 - ], - [ - -124.033156, - 44.8423235 - ], - [ - -124.0354316, - 44.8409396 - ], - [ - -124.0380429, - 44.839898 - ], - [ - -124.0408894, - 44.8392389 - ], - [ - -124.043862, - 44.8389875 - ], - [ - -124.0468464, - 44.8391534 - ], - [ - -124.049728, - 44.8397304 - ], - [ - -124.0523962, - 44.8406961 - ], - [ - -124.0547483, - 44.8420136 - ], - [ - -124.0566941, - 44.8436322 - ], - [ - -124.0581587, - 44.8454898 - ], - [ - -124.0590859, - 44.8475149 - ], - [ - -124.05944, - 44.8496298 - ], - [ - -124.0592072, - 44.8517532 - ], - [ - -124.0583965, - 44.8538035 - ], - [ - -124.0515377, - 44.8662919 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16204_s_16205", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0323668, - 44.8994513 - ], - [ - -124.0312294, - 44.9002327 - ], - [ - -124.0305994, - 44.9006228 - ], - [ - -124.0282906, - 44.9018028 - ], - [ - -124.0276906, - 44.9020528 - ], - [ - -124.0258684, - 44.9027002 - ], - [ - -124.0249283, - 44.9029803 - ], - [ - -124.0236628, - 44.9033114 - ], - [ - -124.0223384, - 44.9036115 - ], - [ - -124.0219288, - 44.905839 - ], - [ - -124.0218863, - 44.9060534 - ], - [ - -124.0207598, - 44.911354 - ], - [ - -124.0217353, - 44.9122384 - ], - [ - -124.0233442, - 44.9140354 - ], - [ - -124.0244289, - 44.9160209 - ], - [ - -124.0249477, - 44.9181186 - ], - [ - -124.0248805, - 44.9202479 - ], - [ - -124.0242299, - 44.922327 - ], - [ - -124.0230209, - 44.9242759 - ], - [ - -124.0212998, - 44.9260198 - ], - [ - -124.0191327, - 44.9274916 - ], - [ - -124.016603, - 44.9286348 - ], - [ - -124.0138079, - 44.9294053 - ], - [ - -124.0108549, - 44.9297736 - ], - [ - -124.0078574, - 44.9297255 - ], - [ - -124.0049308, - 44.9292628 - ], - [ - -124.0021875, - 44.9284034 - ], - [ - -123.9997331, - 44.9271802 - ], - [ - -123.9976619, - 44.9256403 - ], - [ - -123.9944421, - 44.92272 - ], - [ - -123.9941112, - 44.9224085 - ], - [ - -123.9932313, - 44.9215484 - ], - [ - -123.991453, - 44.9192834 - ], - [ - -123.9910431, - 44.9185734 - ], - [ - -123.9904814, - 44.9174194 - ], - [ - -123.9903615, - 44.9171194 - ], - [ - -123.9900584, - 44.916216 - ], - [ - -123.9899685, - 44.915886 - ], - [ - -123.9897313, - 44.914621 - ], - [ - -123.9896814, - 44.914141 - ], - [ - -123.9896546, - 44.9128643 - ], - [ - -123.9896948, - 44.9122143 - ], - [ - -123.9899814, - 44.9105446 - ], - [ - -123.9900782, - 44.9102034 - ], - [ - -123.9916317, - 44.9029116 - ], - [ - -123.9925433, - 44.8979691 - ], - [ - -123.9926522, - 44.897469 - ], - [ - -123.9931527, - 44.895479 - ], - [ - -123.9934057, - 44.894658 - ], - [ - -123.9935958, - 44.894138 - ], - [ - -123.9942884, - 44.8926781 - ], - [ - -123.9945885, - 44.8921681 - ], - [ - -123.9960452, - 44.8902563 - ], - [ - -123.9966853, - 44.8895864 - ], - [ - -123.9992381, - 44.8875304 - ], - [ - -124.000038, - 44.8870305 - ], - [ - -124.00182, - 44.8860715 - ], - [ - -124.00258, - 44.8857216 - ], - [ - -124.005227, - 44.8847486 - ], - [ - -124.0058969, - 44.8845587 - ], - [ - -124.0069201, - 44.8842981 - ], - [ - -124.0119418, - 44.8831605 - ], - [ - -124.0135861, - 44.8819079 - ], - [ - -124.0158348, - 44.8805007 - ], - [ - -124.0184263, - 44.8794323 - ], - [ - -124.0212611, - 44.8787439 - ], - [ - -124.0242303, - 44.8784619 - ], - [ - -124.0272198, - 44.878597 - ], - [ - -124.0301149, - 44.8791441 - ], - [ - -124.0328042, - 44.8800823 - ], - [ - -124.0351846, - 44.8813754 - ], - [ - -124.0371645, - 44.8829737 - ], - [ - -124.0386679, - 44.884816 - ], - [ - -124.039637, - 44.8868313 - ], - [ - -124.0400344, - 44.8889423 - ], - [ - -124.0398448, - 44.8910679 - ], - [ - -124.0390755, - 44.8931264 - ], - [ - -124.0377559, - 44.8950385 - ], - [ - -124.0359368, - 44.896731 - ], - [ - -124.0323668, - 44.8994513 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16205_s_16089", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0296807, - 44.9248022 - ], - [ - -124.0300472, - 44.9253892 - ], - [ - -124.0307047, - 44.9274672 - ], - [ - -124.030779, - 44.9295964 - ], - [ - -124.0302671, - 44.9316949 - ], - [ - -124.0291886, - 44.9336822 - ], - [ - -124.027585, - 44.9354818 - ], - [ - -124.0255178, - 44.9370246 - ], - [ - -124.0230664, - 44.9382513 - ], - [ - -124.0203252, - 44.9391146 - ], - [ - -124.0173994, - 44.9395815 - ], - [ - -124.0144015, - 44.9396339 - ], - [ - -124.0114469, - 44.9392698 - ], - [ - -124.0086492, - 44.9385032 - ], - [ - -124.0061158, - 44.9373637 - ], - [ - -124.0049997, - 44.9367449 - ], - [ - -124.0023794, - 44.9348889 - ], - [ - -124.0021695, - 44.9346988 - ], - [ - -124.0011522, - 44.9336588 - ], - [ - -124.0008423, - 44.9332987 - ], - [ - -123.9997259, - 44.931729 - ], - [ - -123.9989807, - 44.930052 - ], - [ - -123.9987908, - 44.9294619 - ], - [ - -123.9984492, - 44.9278545 - ], - [ - -123.9984491, - 44.9263197 - ], - [ - -123.9979464, - 44.9258906 - ], - [ - -123.9962637, - 44.9241278 - ], - [ - -123.9950976, - 44.9221658 - ], - [ - -123.9944927, - 44.9200797 - ], - [ - -123.9944722, - 44.9179499 - ], - [ - -123.9950369, - 44.9158582 - ], - [ - -123.996165, - 44.913885 - ], - [ - -123.9978131, - 44.912106 - ], - [ - -123.9999179, - 44.9105896 - ], - [ - -124.0023984, - 44.9093942 - ], - [ - -124.0051594, - 44.9085655 - ], - [ - -124.0080948, - 44.9081354 - ], - [ - -124.0110918, - 44.9081205 - ], - [ - -124.0140354, - 44.9085212 - ], - [ - -124.0168124, - 44.9093223 - ], - [ - -124.0193163, - 44.910493 - ], - [ - -124.0214508, - 44.9119882 - ], - [ - -124.021877, - 44.9123519 - ], - [ - -124.0235903, - 44.9133423 - ], - [ - -124.0252294, - 44.914442 - ], - [ - -124.0254994, - 44.914652 - ], - [ - -124.0277631, - 44.9169486 - ], - [ - -124.0280132, - 44.9172886 - ], - [ - -124.0292748, - 44.9196269 - ], - [ - -124.0293649, - 44.9198769 - ], - [ - -124.0298156, - 44.9219269 - ], - [ - -124.0298457, - 44.9222869 - ], - [ - -124.0298471, - 44.923558 - ], - [ - -124.0298072, - 44.924048 - ], - [ - -124.0296807, - 44.9248022 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16210_s_16214", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9990044, - 45.0082304 - ], - [ - -123.9990288, - 45.0082443 - ], - [ - -123.9990028, - 45.0082673 - ], - [ - -123.9989141, - 45.0083508 - ], - [ - -123.9988898, - 45.0083736 - ], - [ - -123.9980773, - 45.0091335 - ], - [ - -123.9967965, - 45.0103514 - ], - [ - -123.9966466, - 45.0104915 - ], - [ - -123.9962136, - 45.0108896 - ], - [ - -123.9960636, - 45.0110252 - ], - [ - -123.9959097, - 45.0111622 - ], - [ - -123.9950494, - 45.0118638 - ], - [ - -123.9949104, - 45.0119679 - ], - [ - -123.9944775, - 45.012279 - ], - [ - -123.9943225, - 45.012386 - ], - [ - -123.9942089, - 45.0124596 - ], - [ - -123.9942135, - 45.0129664 - ], - [ - -123.9942066, - 45.0131194 - ], - [ - -123.9940652, - 45.0142824 - ], - [ - -123.9940373, - 45.0144234 - ], - [ - -123.9937953, - 45.0153501 - ], - [ - -123.9937553, - 45.0154731 - ], - [ - -123.9935163, - 45.0161176 - ], - [ - -123.9934504, - 45.0162756 - ], - [ - -123.9933646, - 45.0164741 - ], - [ - -123.9932926, - 45.0166351 - ], - [ - -123.9926037, - 45.0178975 - ], - [ - -123.9924887, - 45.0180745 - ], - [ - -123.99176, - 45.0190602 - ], - [ - -123.991609, - 45.0192412 - ], - [ - -123.9912146, - 45.0196889 - ], - [ - -123.9910167, - 45.0199019 - ], - [ - -123.9905826, - 45.0203446 - ], - [ - -123.9903356, - 45.0205836 - ], - [ - -123.9898193, - 45.0210555 - ], - [ - -123.9896631, - 45.0211905 - ], - [ - -123.9894055, - 45.0218489 - ], - [ - -123.9888801, - 45.0229566 - ], - [ - -123.9887092, - 45.0232616 - ], - [ - -123.9882936, - 45.0239358 - ], - [ - -123.9881216, - 45.0241908 - ], - [ - -123.9868492, - 45.0257362 - ], - [ - -123.9866872, - 45.0259002 - ], - [ - -123.9859388, - 45.0265965 - ], - [ - -123.9857649, - 45.0267455 - ], - [ - -123.9850513, - 45.0273148 - ], - [ - -123.9848603, - 45.0274568 - ], - [ - -123.9833219, - 45.0284549 - ], - [ - -123.9830299, - 45.0286199 - ], - [ - -123.9810716, - 45.0295609 - ], - [ - -123.9807055, - 45.029709 - ], - [ - -123.978951, - 45.0303169 - ], - [ - -123.978636, - 45.0304089 - ], - [ - -123.9764887, - 45.0309082 - ], - [ - -123.9761247, - 45.0309722 - ], - [ - -123.9748284, - 45.0311584 - ], - [ - -123.9744623, - 45.0311994 - ], - [ - -123.9714886, - 45.0313246 - ], - [ - -123.9711926, - 45.0313166 - ], - [ - -123.9702519, - 45.0312706 - ], - [ - -123.9698428, - 45.0312416 - ], - [ - -123.9680089, - 45.0310313 - ], - [ - -123.9677139, - 45.0309843 - ], - [ - -123.9673565, - 45.0309241 - ], - [ - -123.9672354, - 45.0309027 - ], - [ - -123.9671589, - 45.030891 - ], - [ - -123.9663245, - 45.0307824 - ], - [ - -123.9660923, - 45.0307427 - ], - [ - -123.9658013, - 45.0307441 - ], - [ - -123.9640046, - 45.0307597 - ], - [ - -123.9639, - 45.0307603 - ], - [ - -123.9623944, - 45.0307661 - ], - [ - -123.9578666, - 45.030808 - ], - [ - -123.957671, - 45.031001 - ], - [ - -123.9554969, - 45.0324457 - ], - [ - -123.9529694, - 45.0335648 - ], - [ - -123.9501842, - 45.0343157 - ], - [ - -123.9472467, - 45.0346701 - ], - [ - -123.9442679, - 45.0346145 - ], - [ - -123.9413607, - 45.0341512 - ], - [ - -123.9387175, - 45.0335332 - ], - [ - -123.9381047, - 45.0333939 - ], - [ - -123.9365569, - 45.0329753 - ], - [ - -123.9362048, - 45.0328642 - ], - [ - -123.9338025, - 45.0319151 - ], - [ - -123.9334445, - 45.0317421 - ], - [ - -123.9328888, - 45.0314256 - ], - [ - -123.9327035, - 45.0313472 - ], - [ - -123.9325578, - 45.0312848 - ], - [ - -123.9320968, - 45.0310847 - ], - [ - -123.9301217, - 45.030066 - ], - [ - -123.9284001, - 45.0288376 - ], - [ - -123.9281601, - 45.0286365 - ], - [ - -123.9277743, - 45.0282375 - ], - [ - -123.9277364, - 45.0282175 - ], - [ - -123.9262517, - 45.0273238 - ], - [ - -123.9259827, - 45.0271398 - ], - [ - -123.9250522, - 45.0264445 - ], - [ - -123.9247825, - 45.0262242 - ], - [ - -123.9247081, - 45.026204 - ], - [ - -123.9246755, - 45.0261951 - ], - [ - -123.9243314, - 45.0261011 - ], - [ - -123.9223561, - 45.0254432 - ], - [ - -123.9218851, - 45.0252562 - ], - [ - -123.9210886, - 45.0248654 - ], - [ - -123.9210216, - 45.0248544 - ], - [ - -123.9205316, - 45.0247714 - ], - [ - -123.918459, - 45.0243079 - ], - [ - -123.9181129, - 45.0242109 - ], - [ - -123.916586, - 45.0236058 - ], - [ - -123.9165349, - 45.0236034 - ], - [ - -123.9140138, - 45.0233331 - ], - [ - -123.9137528, - 45.0232891 - ], - [ - -123.9096119, - 45.0221181 - ], - [ - -123.9093978, - 45.0220301 - ], - [ - -123.9076169, - 45.0211738 - ], - [ - -123.9073639, - 45.0210328 - ], - [ - -123.9062111, - 45.0201848 - ], - [ - -123.9041152, - 45.0196509 - ], - [ - -123.9015415, - 45.0185536 - ], - [ - -123.8993191, - 45.0171212 - ], - [ - -123.8975336, - 45.0154088 - ], - [ - -123.8962534, - 45.0134823 - ], - [ - -123.8955278, - 45.0114156 - ], - [ - -123.8953845, - 45.0092881 - ], - [ - -123.8958291, - 45.0071818 - ], - [ - -123.8968444, - 45.0051774 - ], - [ - -123.8983912, - 45.003352 - ], - [ - -123.9004102, - 45.0017758 - ], - [ - -123.9028237, - 45.0005093 - ], - [ - -123.9055391, - 44.9996011 - ], - [ - -123.9084519, - 44.9990861 - ], - [ - -123.909151, - 44.9990623 - ], - [ - -123.9093801, - 44.9989924 - ], - [ - -123.9121365, - 44.9983627 - ], - [ - -123.9150107, - 44.9981125 - ], - [ - -123.9178999, - 44.9982505 - ], - [ - -123.9207008, - 44.9987719 - ], - [ - -123.9233134, - 44.999658 - ], - [ - -123.9256442, - 45.0008772 - ], - [ - -123.92761, - 45.0023859 - ], - [ - -123.9281193, - 45.0029664 - ], - [ - -123.9284765, - 45.0030544 - ], - [ - -123.9288855, - 45.0031994 - ], - [ - -123.9309185, - 45.0041691 - ], - [ - -123.931257, - 45.0042294 - ], - [ - -123.9315639, - 45.0042884 - ], - [ - -123.9342845, - 45.0050139 - ], - [ - -123.9345585, - 45.0051089 - ], - [ - -123.9373904, - 45.0063928 - ], - [ - -123.9379328, - 45.0065454 - ], - [ - -123.9387623, - 45.0067545 - ], - [ - -123.9401343, - 45.0071544 - ], - [ - -123.9405223, - 45.0072834 - ], - [ - -123.9419739, - 45.0078354 - ], - [ - -123.9423429, - 45.0079943 - ], - [ - -123.9440266, - 45.0088346 - ], - [ - -123.9441262, - 45.0088918 - ], - [ - -123.9464155, - 45.0085115 - ], - [ - -123.9466415, - 45.0084905 - ], - [ - -123.9482736, - 45.0084014 - ], - [ - -123.9485756, - 45.0083964 - ], - [ - -123.9496564, - 45.0084056 - ], - [ - -123.9499844, - 45.0084166 - ], - [ - -123.9511153, - 45.0084844 - ], - [ - -123.9514042, - 45.0085094 - ], - [ - -123.9527221, - 45.008665 - ], - [ - -123.953055, - 45.008715 - ], - [ - -123.9541323, - 45.0089059 - ], - [ - -123.9544642, - 45.0089739 - ], - [ - -123.954923, - 45.0090734 - ], - [ - -123.9550521, - 45.009103 - ], - [ - -123.9620531, - 45.0090384 - ], - [ - -123.9621703, - 45.0090376 - ], - [ - -123.9625962, - 45.009036 - ], - [ - -123.9625997, - 45.008993 - ], - [ - -123.9626157, - 45.008856 - ], - [ - -123.9628323, - 45.0077274 - ], - [ - -123.9628743, - 45.0075704 - ], - [ - -123.9630549, - 45.0069847 - ], - [ - -123.9630919, - 45.0068787 - ], - [ - -123.9632622, - 45.0064323 - ], - [ - -123.9633052, - 45.0063283 - ], - [ - -123.9639068, - 45.0051361 - ], - [ - -123.9639932, - 45.0049921 - ], - [ - -123.9640905, - 45.0048199 - ], - [ - -123.9641134, - 45.0047797 - ], - [ - -123.9643252, - 45.0044094 - ], - [ - -123.9647594, - 45.0036097 - ], - [ - -123.9650125, - 45.0031721 - ], - [ - -123.9654894, - 45.0023963 - ], - [ - -123.9656112, - 45.0021965 - ], - [ - -123.9660255, - 45.001572 - ], - [ - -123.9661175, - 45.001444 - ], - [ - -123.9667715, - 45.0006242 - ], - [ - -123.9668746, - 45.0005072 - ], - [ - -123.9674175, - 44.9999323 - ], - [ - -123.9675135, - 44.9998373 - ], - [ - -123.9681557, - 44.9992459 - ], - [ - -123.9682757, - 44.9991429 - ], - [ - -123.9686144, - 44.9988621 - ], - [ - -123.9687804, - 44.9987291 - ], - [ - -123.9701136, - 44.9977851 - ], - [ - -123.9703676, - 44.9976261 - ], - [ - -123.9722382, - 44.9966248 - ], - [ - -123.9726562, - 44.9964349 - ], - [ - -123.973641, - 44.996034 - ], - [ - -123.9744768, - 44.9952525 - ], - [ - -123.9746827, - 44.9950589 - ], - [ - -123.974946, - 44.9948184 - ], - [ - -123.9751061, - 44.9946764 - ], - [ - -123.9753684, - 44.99445 - ], - [ - -123.9753934, - 44.994429 - ], - [ - -123.9775459, - 44.9929446 - ], - [ - -123.980065, - 44.9917867 - ], - [ - -123.982854, - 44.9909997 - ], - [ - -123.9858058, - 44.9906138 - ], - [ - -123.9888069, - 44.9906439 - ], - [ - -123.9917421, - 44.9910888 - ], - [ - -123.9944987, - 44.9919314 - ], - [ - -123.9969707, - 44.9931394 - ], - [ - -123.9990632, - 44.9946664 - ], - [ - -124.0006958, - 44.9964536 - ], - [ - -124.0018057, - 44.9984325 - ], - [ - -124.0023502, - 45.000527 - ], - [ - -124.0023084, - 45.0026566 - ], - [ - -124.0016817, - 45.0047395 - ], - [ - -124.0004942, - 45.0066956 - ], - [ - -123.9990044, - 45.0082304 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16211_s_16192", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0776479, - 44.814432 - ], - [ - -124.0777212, - 44.8147272 - ], - [ - -124.0780405, - 44.8157076 - ], - [ - -124.0784272, - 44.8178196 - ], - [ - -124.0782276, - 44.8199447 - ], - [ - -124.0774493, - 44.8220012 - ], - [ - -124.0761222, - 44.8239102 - ], - [ - -124.0742972, - 44.8255982 - ], - [ - -124.0720444, - 44.8270004 - ], - [ - -124.0694504, - 44.8280627 - ], - [ - -124.0666149, - 44.8287445 - ], - [ - -124.063647, - 44.8290194 - ], - [ - -124.0606607, - 44.8288769 - ], - [ - -124.0577709, - 44.8283226 - ], - [ - -124.0550887, - 44.8273776 - ], - [ - -124.0527172, - 44.8260783 - ], - [ - -124.0507476, - 44.8244747 - ], - [ - -124.0492555, - 44.8226285 - ], - [ - -124.0482983, - 44.8206105 - ], - [ - -124.0478886, - 44.8193504 - ], - [ - -124.0477276, - 44.8187881 - ], - [ - -124.0474079, - 44.8174981 - ], - [ - -124.0472019, - 44.8162448 - ], - [ - -124.0471321, - 44.8153948 - ], - [ - -124.04711, - 44.8145155 - ], - [ - -124.0471397, - 44.8135796 - ], - [ - -124.0470842, - 44.8125629 - ], - [ - -124.0470685, - 44.8124745 - ], - [ - -124.0470048, - 44.8122087 - ], - [ - -124.0470117, - 44.8122078 - ], - [ - -124.046761, - 44.8114612 - ], - [ - -124.0466062, - 44.8106008 - ], - [ - -124.0462877, - 44.8093087 - ], - [ - -124.046062, - 44.8071849 - ], - [ - -124.0464226, - 44.8050705 - ], - [ - -124.0473556, - 44.8030469 - ], - [ - -124.0488252, - 44.8011917 - ], - [ - -124.0507748, - 44.7995763 - ], - [ - -124.0531295, - 44.7982626 - ], - [ - -124.0557987, - 44.7973013 - ], - [ - -124.0586801, - 44.796729 - ], - [ - -124.0616628, - 44.796568 - ], - [ - -124.0646324, - 44.7968243 - ], - [ - -124.0674747, - 44.7974881 - ], - [ - -124.0700807, - 44.7985338 - ], - [ - -124.0723501, - 44.7999215 - ], - [ - -124.0741958, - 44.8015976 - ], - [ - -124.0755469, - 44.8034979 - ], - [ - -124.0763513, - 44.8055493 - ], - [ - -124.0767317, - 44.8070893 - ], - [ - -124.0768379, - 44.8075868 - ], - [ - -124.0769319, - 44.8081073 - ], - [ - -124.0770942, - 44.8085494 - ], - [ - -124.0772144, - 44.8090493 - ], - [ - -124.0773124, - 44.8095192 - ], - [ - -124.0774526, - 44.8103092 - ], - [ - -124.0775612, - 44.8112444 - ], - [ - -124.0776617, - 44.8130644 - ], - [ - -124.0776697, - 44.8137325 - ], - [ - -124.0776479, - 44.814432 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16212_s_16079", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0208492, - 44.9878359 - ], - [ - -124.0219243, - 44.9886656 - ], - [ - -124.0221289, - 44.9888464 - ], - [ - -124.0232862, - 44.99002 - ], - [ - -124.0234652, - 44.9902298 - ], - [ - -124.0246363, - 44.9919154 - ], - [ - -124.0253805, - 44.9937191 - ], - [ - -124.0254317, - 44.9938999 - ], - [ - -124.0257208, - 44.9956315 - ], - [ - -124.0256157, - 44.9973736 - ], - [ - -124.0255764, - 44.9975989 - ], - [ - -124.0255434, - 44.9977763 - ], - [ - -124.0254851, - 44.9980706 - ], - [ - -124.0247781, - 45.0001405 - ], - [ - -124.0235155, - 45.0020727 - ], - [ - -124.0217456, - 45.003793 - ], - [ - -124.0195367, - 45.0052353 - ], - [ - -124.0169734, - 45.0063441 - ], - [ - -124.0141544, - 45.0070768 - ], - [ - -124.011188, - 45.0074051 - ], - [ - -124.0081883, - 45.0073166 - ], - [ - -124.0052707, - 45.0068145 - ], - [ - -124.0025473, - 45.0059182 - ], - [ - -124.0014962, - 45.0053737 - ], - [ - -123.9995626, - 45.0049064 - ], - [ - -123.9992037, - 45.0047848 - ], - [ - -123.9966493, - 45.0036913 - ], - [ - -123.9944424, - 45.0022671 - ], - [ - -123.9926667, - 45.0005663 - ], - [ - -123.9913896, - 44.9986535 - ], - [ - -123.9906594, - 44.9966013 - ], - [ - -123.990504, - 44.9944876 - ], - [ - -123.9909022, - 44.9925252 - ], - [ - -123.9906, - 44.9912129 - ], - [ - -123.9904087, - 44.9890874 - ], - [ - -123.9908055, - 44.9869763 - ], - [ - -123.9917749, - 44.9849606 - ], - [ - -123.9932797, - 44.9831179 - ], - [ - -123.995262, - 44.9815189 - ], - [ - -123.9976457, - 44.980225 - ], - [ - -124.0003391, - 44.979286 - ], - [ - -124.0032389, - 44.978738 - ], - [ - -124.0062335, - 44.9786018 - ], - [ - -124.0092081, - 44.9788829 - ], - [ - -124.0120482, - 44.9795704 - ], - [ - -124.014645, - 44.9806379 - ], - [ - -124.0168985, - 44.9820443 - ], - [ - -124.0187222, - 44.9837357 - ], - [ - -124.020046, - 44.9856472 - ], - [ - -124.020819, - 44.9877051 - ], - [ - -124.0208492, - 44.9878359 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16214_s_16215", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.8986333, - 45.0167471 - ], - [ - -123.8982961, - 45.0172214 - ], - [ - -123.8965947, - 45.0188066 - ], - [ - -123.8963747, - 45.0189766 - ], - [ - -123.8940317, - 45.0204514 - ], - [ - -123.8913146, - 45.0215571 - ], - [ - -123.8883371, - 45.0222477 - ], - [ - -123.888207, - 45.0222677 - ], - [ - -123.8856429, - 45.0225038 - ], - [ - -123.8830594, - 45.0224307 - ], - [ - -123.88053, - 45.0220504 - ], - [ - -123.8803899, - 45.0220204 - ], - [ - -123.8788139, - 45.0216146 - ], - [ - -123.8777815, - 45.0213025 - ], - [ - -123.876991, - 45.0211517 - ], - [ - -123.8741816, - 45.0203994 - ], - [ - -123.8716331, - 45.0192728 - ], - [ - -123.8694436, - 45.0178152 - ], - [ - -123.8676972, - 45.0160826 - ], - [ - -123.866461, - 45.0141416 - ], - [ - -123.8657825, - 45.0120668 - ], - [ - -123.8656877, - 45.009938 - ], - [ - -123.8661802, - 45.007837 - ], - [ - -123.8672409, - 45.0058446 - ], - [ - -123.8688291, - 45.0040371 - ], - [ - -123.8708837, - 45.0024842 - ], - [ - -123.8733258, - 45.0012455 - ], - [ - -123.8752664, - 45.0006234 - ], - [ - -123.8767774, - 44.9993277 - ], - [ - -123.8771273, - 44.9990877 - ], - [ - -123.8796304, - 44.9976971 - ], - [ - -123.8803165, - 44.9973917 - ], - [ - -123.8811758, - 44.9968991 - ], - [ - -123.8839298, - 44.9956401 - ], - [ - -123.8846598, - 44.9953801 - ], - [ - -123.8881795, - 44.9944886 - ], - [ - -123.8886195, - 44.9944186 - ], - [ - -123.8918868, - 44.9941555 - ], - [ - -123.8987494, - 44.9941288 - ], - [ - -123.9013908, - 44.9938252 - ], - [ - -123.9035362, - 44.9936875 - ], - [ - -123.904246, - 44.9936775 - ], - [ - -123.9072367, - 44.9938439 - ], - [ - -123.9081065, - 44.9939539 - ], - [ - -123.9111403, - 44.9945719 - ], - [ - -123.9119102, - 44.9947918 - ], - [ - -123.9126725, - 44.9950269 - ], - [ - -123.9198516, - 44.9974065 - ], - [ - -123.9211253, - 44.9978816 - ], - [ - -123.9216052, - 44.9980815 - ], - [ - -123.9229227, - 44.9986973 - ], - [ - -123.9233827, - 44.9989373 - ], - [ - -123.9262257, - 45.0008651 - ], - [ - -123.9268858, - 45.001445 - ], - [ - -123.9288667, - 45.0037039 - ], - [ - -123.9293368, - 45.0044238 - ], - [ - -123.9303646, - 45.0065513 - ], - [ - -123.9307529, - 45.0087834 - ], - [ - -123.9304851, - 45.0110243 - ], - [ - -123.9295725, - 45.0131781 - ], - [ - -123.9280543, - 45.0151525 - ], - [ - -123.9259953, - 45.0168628 - ], - [ - -123.9234839, - 45.0182358 - ], - [ - -123.9217132, - 45.0188413 - ], - [ - -123.9217265, - 45.0188605 - ], - [ - -123.9206364, - 45.0192405 - ], - [ - -123.9195336, - 45.0195874 - ], - [ - -123.9188235, - 45.0197875 - ], - [ - -123.9150689, - 45.0204708 - ], - [ - -123.9134886, - 45.0206108 - ], - [ - -123.9127861, - 45.0206498 - ], - [ - -123.9113707, - 45.0208116 - ], - [ - -123.908227, - 45.0207088 - ], - [ - -123.9051793, - 45.0201525 - ], - [ - -123.9023563, - 45.0191662 - ], - [ - -123.8998771, - 45.0177915 - ], - [ - -123.8986333, - 45.0167471 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16215_s_16183", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9503598, - 45.0084732 - ], - [ - -123.9510372, - 45.0084836 - ], - [ - -123.9514771, - 45.0085236 - ], - [ - -123.9544034, - 45.009 - ], - [ - -123.9571425, - 45.0098723 - ], - [ - -123.9595892, - 45.0111067 - ], - [ - -123.9616495, - 45.012656 - ], - [ - -123.9632442, - 45.0144606 - ], - [ - -123.964312, - 45.0164512 - ], - [ - -123.9648118, - 45.0185513 - ], - [ - -123.9647244, - 45.0206802 - ], - [ - -123.9640531, - 45.0227561 - ], - [ - -123.9628235, - 45.0246993 - ], - [ - -123.9610829, - 45.0264349 - ], - [ - -123.9588982, - 45.0278963 - ], - [ - -123.9563533, - 45.0290274 - ], - [ - -123.953546, - 45.0297846 - ], - [ - -123.9507577, - 45.030118 - ], - [ - -123.9490815, - 45.0305095 - ], - [ - -123.9460246, - 45.0309847 - ], - [ - -123.9450344, - 45.0310647 - ], - [ - -123.9418001, - 45.0310823 - ], - [ - -123.94137, - 45.0310523 - ], - [ - -123.9385899, - 45.0306719 - ], - [ - -123.9379598, - 45.0305419 - ], - [ - -123.93552, - 45.0298735 - ], - [ - -123.9352599, - 45.0297835 - ], - [ - -123.9326216, - 45.0286218 - ], - [ - -123.9320915, - 45.0283317 - ], - [ - -123.9293167, - 45.0263627 - ], - [ - -123.9290667, - 45.0261327 - ], - [ - -123.9274232, - 45.0242509 - ], - [ - -123.9273662, - 45.0241677 - ], - [ - -123.9254565, - 45.0235643 - ], - [ - -123.9251641, - 45.0234693 - ], - [ - -123.9202235, - 45.0218191 - ], - [ - -123.9193605, - 45.0215067 - ], - [ - -123.9187204, - 45.0212567 - ], - [ - -123.9178801, - 45.0209032 - ], - [ - -123.9151799, - 45.019683 - ], - [ - -123.9139203, - 45.0190483 - ], - [ - -123.9115802, - 45.0177381 - ], - [ - -123.9105404, - 45.0171002 - ], - [ - -123.9091404, - 45.0161601 - ], - [ - -123.9087995, - 45.0158769 - ], - [ - -123.907841, - 45.015597 - ], - [ - -123.9063291, - 45.0150854 - ], - [ - -123.905219, - 45.0146553 - ], - [ - -123.9040547, - 45.0141554 - ], - [ - -123.9025407, - 45.0134382 - ], - [ - -123.901986, - 45.0134396 - ], - [ - -123.9014626, - 45.0134284 - ], - [ - -123.8989165, - 45.0134696 - ], - [ - -123.898049, - 45.0136474 - ], - [ - -123.8971762, - 45.014075 - ], - [ - -123.8942735, - 45.0161268 - ], - [ - -123.8915738, - 45.0181158 - ], - [ - -123.8892891, - 45.0194979 - ], - [ - -123.886668, - 45.0205373 - ], - [ - -123.8838113, - 45.021194 - ], - [ - -123.8808287, - 45.0214427 - ], - [ - -123.8778351, - 45.0212739 - ], - [ - -123.8749455, - 45.0206941 - ], - [ - -123.872271, - 45.0197255 - ], - [ - -123.8699144, - 45.0184054 - ], - [ - -123.8679663, - 45.0167846 - ], - [ - -123.8665016, - 45.0149253 - ], - [ - -123.8655765, - 45.0128991 - ], - [ - -123.8652265, - 45.0107838 - ], - [ - -123.8654649, - 45.0086606 - ], - [ - -123.8662827, - 45.0066113 - ], - [ - -123.8676482, - 45.0047145 - ], - [ - -123.8695091, - 45.0030431 - ], - [ - -123.8723191, - 45.0009734 - ], - [ - -123.8725421, - 45.0008125 - ], - [ - -123.8765321, - 44.9979929 - ], - [ - -123.8786387, - 44.9967496 - ], - [ - -123.8816185, - 44.9952898 - ], - [ - -123.8832898, - 44.994578 - ], - [ - -123.8844896, - 44.994138 - ], - [ - -123.8856871, - 44.9937444 - ], - [ - -123.8869869, - 44.9933645 - ], - [ - -123.8885713, - 44.9929719 - ], - [ - -123.8910109, - 44.992472 - ], - [ - -123.8919234, - 44.9923064 - ], - [ - -123.8929332, - 44.9921464 - ], - [ - -123.8944611, - 44.9919614 - ], - [ - -123.8960008, - 44.9918314 - ], - [ - -123.8974614, - 44.9917582 - ], - [ - -123.9011707, - 44.9916982 - ], - [ - -123.901984, - 44.9917003 - ], - [ - -123.9023931, - 44.9917091 - ], - [ - -123.9041121, - 44.9916631 - ], - [ - -123.9052934, - 44.9916638 - ], - [ - -123.9067231, - 44.9917038 - ], - [ - -123.9092498, - 44.9919247 - ], - [ - -123.9100597, - 44.9920447 - ], - [ - -123.9123685, - 44.9925237 - ], - [ - -123.9135183, - 44.9928336 - ], - [ - -123.9153954, - 44.9934453 - ], - [ - -123.9166652, - 44.9939352 - ], - [ - -123.9186715, - 44.9948602 - ], - [ - -123.9199618, - 44.9955626 - ], - [ - -123.9203788, - 44.9957601 - ], - [ - -123.9205819, - 44.9958194 - ], - [ - -123.922282, - 44.996214 - ], - [ - -123.9231031, - 44.9964232 - ], - [ - -123.923463, - 44.9965231 - ], - [ - -123.926048, - 44.9974499 - ], - [ - -123.926428, - 44.9976198 - ], - [ - -123.9288802, - 44.9989824 - ], - [ - -123.9308931, - 45.0006689 - ], - [ - -123.9313146, - 45.0011052 - ], - [ - -123.9322898, - 45.0016511 - ], - [ - -123.9338231, - 45.0023439 - ], - [ - -123.9380682, - 45.0037617 - ], - [ - -123.9413709, - 45.0048052 - ], - [ - -123.9420906, - 45.0050486 - ], - [ - -123.9437115, - 45.0056342 - ], - [ - -123.9456064, - 45.0062485 - ], - [ - -123.946835, - 45.0066953 - ], - [ - -123.9476249, - 45.0070152 - ], - [ - -123.9498543, - 45.0081148 - ], - [ - -123.9503598, - 45.0084732 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16215_s_16215", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.8656962, - 45.0106748 - ], - [ - -123.8659585, - 45.0085531 - ], - [ - -123.8667993, - 45.0065085 - ], - [ - -123.8681861, - 45.0046195 - ], - [ - -123.8700656, - 45.0029587 - ], - [ - -123.8723656, - 45.0015899 - ], - [ - -123.8749978, - 45.0005657 - ], - [ - -123.8778609, - 44.9999254 - ], - [ - -123.880845, - 44.9996937 - ], - [ - -123.8838355, - 44.9998793 - ], - [ - -123.8867175, - 45.0004753 - ], - [ - -123.8893804, - 45.0014587 - ], - [ - -123.8917218, - 45.0027916 - ], - [ - -123.8936518, - 45.0044231 - ], - [ - -123.8950962, - 45.0062902 - ], - [ - -123.8959994, - 45.0083214 - ], - [ - -123.8963267, - 45.0104385 - ], - [ - -123.8960655, - 45.0125603 - ], - [ - -123.8952257, - 45.0146051 - ], - [ - -123.8938396, - 45.0164945 - ], - [ - -123.8919603, - 45.0181556 - ], - [ - -123.8896601, - 45.0195248 - ], - [ - -123.8870273, - 45.0205494 - ], - [ - -123.8841633, - 45.0211899 - ], - [ - -123.8811781, - 45.0214217 - ], - [ - -123.8781865, - 45.021236 - ], - [ - -123.8753035, - 45.0206398 - ], - [ - -123.87264, - 45.0196562 - ], - [ - -123.8702983, - 45.0183228 - ], - [ - -123.8683685, - 45.016691 - ], - [ - -123.8669247, - 45.0148235 - ], - [ - -123.8660224, - 45.0127921 - ], - [ - -123.8656962, - 45.0106748 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16275_s_15889", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.067171, - 44.6402763 - ], - [ - -124.0655552, - 44.6418033 - ], - [ - -124.0634064, - 44.6431858 - ], - [ - -124.0631139, - 44.6433407 - ], - [ - -124.060555, - 44.6444359 - ], - [ - -124.057746, - 44.6451536 - ], - [ - -124.0547948, - 44.6454662 - ], - [ - -124.0518149, - 44.6453616 - ], - [ - -124.0489208, - 44.644844 - ], - [ - -124.0462239, - 44.6439332 - ], - [ - -124.0438278, - 44.6426642 - ], - [ - -124.0418246, - 44.6410859 - ], - [ - -124.0402913, - 44.6392588 - ], - [ - -124.0392868, - 44.6372532 - ], - [ - -124.0392018, - 44.6368437 - ], - [ - -124.038857, - 44.636053 - ], - [ - -124.0385376, - 44.6339812 - ], - [ - -124.038778, - 44.631904 - ], - [ - -124.0395695, - 44.6298978 - ], - [ - -124.0408828, - 44.6280364 - ], - [ - -124.0426697, - 44.6263883 - ], - [ - -124.0448642, - 44.6250141 - ], - [ - -124.0454433, - 44.6247164 - ], - [ - -124.0469502, - 44.623035 - ], - [ - -124.0490169, - 44.6214995 - ], - [ - -124.0514634, - 44.6202813 - ], - [ - -124.0541954, - 44.6194274 - ], - [ - -124.0571082, - 44.6189705 - ], - [ - -124.0600897, - 44.6189282 - ], - [ - -124.0630256, - 44.619302 - ], - [ - -124.065803, - 44.6200777 - ], - [ - -124.0665941, - 44.6203653 - ], - [ - -124.0690919, - 44.6215049 - ], - [ - -124.0712331, - 44.6229686 - ], - [ - -124.0729362, - 44.6247011 - ], - [ - -124.0741368, - 44.6266365 - ], - [ - -124.0747891, - 44.6287014 - ], - [ - -124.0748684, - 44.6308175 - ], - [ - -124.0743716, - 44.6329044 - ], - [ - -124.0733174, - 44.6348829 - ], - [ - -124.0726882, - 44.6357872 - ], - [ - -124.0724607, - 44.6361012 - ], - [ - -124.0723403, - 44.6362609 - ], - [ - -124.0704241, - 44.6382409 - ], - [ - -124.0679443, - 44.6398711 - ], - [ - -124.067171, - 44.6402763 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16275_s_16055", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0660592, - 44.6201728 - ], - [ - -124.066615, - 44.6203757 - ], - [ - -124.069092, - 44.6215079 - ], - [ - -124.0712179, - 44.6229593 - ], - [ - -124.072913, - 44.6246757 - ], - [ - -124.0741142, - 44.626593 - ], - [ - -124.0747764, - 44.6286394 - ], - [ - -124.0748748, - 44.6307386 - ], - [ - -124.0744058, - 44.6328122 - ], - [ - -124.0733867, - 44.6347825 - ], - [ - -124.0727769, - 44.6356825 - ], - [ - -124.0717426, - 44.6369749 - ], - [ - -124.0716026, - 44.6371249 - ], - [ - -124.0699964, - 44.638565 - ], - [ - -124.0680725, - 44.6397907 - ], - [ - -124.0675125, - 44.6400908 - ], - [ - -124.0649623, - 44.641196 - ], - [ - -124.062159, - 44.6419247 - ], - [ - -124.0592104, - 44.6422489 - ], - [ - -124.0562299, - 44.6421561 - ], - [ - -124.0533321, - 44.6416498 - ], - [ - -124.0506283, - 44.6407496 - ], - [ - -124.0482226, - 44.6394901 - ], - [ - -124.0462073, - 44.6379196 - ], - [ - -124.0446601, - 44.6360986 - ], - [ - -124.0436402, - 44.634097 - ], - [ - -124.0431868, - 44.6319919 - ], - [ - -124.0433173, - 44.629864 - ], - [ - -124.0439504, - 44.6280175 - ], - [ - -124.0443087, - 44.6266812 - ], - [ - -124.0454304, - 44.6247076 - ], - [ - -124.0470695, - 44.6229282 - ], - [ - -124.0491632, - 44.6214114 - ], - [ - -124.0516308, - 44.6202153 - ], - [ - -124.0543777, - 44.619386 - ], - [ - -124.0572983, - 44.6189553 - ], - [ - -124.0602803, - 44.6189397 - ], - [ - -124.0632094, - 44.6193399 - ], - [ - -124.065973, - 44.6201404 - ], - [ - -124.0660592, - 44.6201728 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16276_s_15885", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9503665, - 44.6158501 - ], - [ - -123.9517524, - 44.6166694 - ], - [ - -123.9536348, - 44.6183215 - ], - [ - -123.9550298, - 44.6202041 - ], - [ - -123.9558838, - 44.6222448 - ], - [ - -123.956164, - 44.6243654 - ], - [ - -123.9558595, - 44.6264842 - ], - [ - -123.9549821, - 44.6285199 - ], - [ - -123.9535652, - 44.6303942 - ], - [ - -123.9516634, - 44.6320351 - ], - [ - -123.9493498, - 44.6333795 - ], - [ - -123.9467132, - 44.6343757 - ], - [ - -123.943855, - 44.6349854 - ], - [ - -123.9408851, - 44.6351852 - ], - [ - -123.9404767, - 44.6351839 - ], - [ - -123.9362363, - 44.63474 - ], - [ - -123.9355315, - 44.6345915 - ], - [ - -123.9330469, - 44.6338937 - ], - [ - -123.9307714, - 44.6328964 - ], - [ - -123.9303744, - 44.6326861 - ], - [ - -123.9288036, - 44.6317293 - ], - [ - -123.9282736, - 44.6313592 - ], - [ - -123.9280412, - 44.631147 - ], - [ - -123.9275355, - 44.6308979 - ], - [ - -123.9255622, - 44.6294813 - ], - [ - -123.9239856, - 44.6278306 - ], - [ - -123.922859, - 44.6260016 - ], - [ - -123.9222205, - 44.6240562 - ], - [ - -123.9221201, - 44.6224999 - ], - [ - -123.9221153, - 44.6224999 - ], - [ - -123.9221147, - 44.6224162 - ], - [ - -123.9220917, - 44.6220602 - ], - [ - -123.9221111, - 44.6219603 - ], - [ - -123.9221068, - 44.6214113 - ], - [ - -123.9223827, - 44.6192905 - ], - [ - -123.9232325, - 44.6172488 - ], - [ - -123.9246236, - 44.6153648 - ], - [ - -123.9265024, - 44.6137107 - ], - [ - -123.9287968, - 44.6123503 - ], - [ - -123.9314186, - 44.6113356 - ], - [ - -123.934267, - 44.6107057 - ], - [ - -123.9372328, - 44.6104849 - ], - [ - -123.9402018, - 44.6106814 - ], - [ - -123.9430602, - 44.6112879 - ], - [ - -123.9456981, - 44.612281 - ], - [ - -123.9480142, - 44.6136226 - ], - [ - -123.9499194, - 44.6152611 - ], - [ - -123.9503665, - 44.6158501 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16278_s_15894", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9390848, - 44.6158946 - ], - [ - -123.9396849, - 44.6181195 - ], - [ - -123.939755, - 44.6187494 - ], - [ - -123.9397906, - 44.6200489 - ], - [ - -123.9397109, - 44.6214589 - ], - [ - -123.9394885, - 44.6229226 - ], - [ - -123.9387999, - 44.6256891 - ], - [ - -123.9385254, - 44.6271839 - ], - [ - -123.9381799, - 44.6284638 - ], - [ - -123.93799, - 44.6289938 - ], - [ - -123.9379874, - 44.6289992 - ], - [ - -123.9385615, - 44.6295487 - ], - [ - -123.9398374, - 44.6314511 - ], - [ - -123.9405746, - 44.6334937 - ], - [ - -123.9407452, - 44.6355995 - ], - [ - -123.9403426, - 44.6376892 - ], - [ - -123.9393822, - 44.639684 - ], - [ - -123.9378726, - 44.6420442 - ], - [ - -123.9372966, - 44.6428466 - ], - [ - -123.9368783, - 44.6438874 - ], - [ - -123.9367131, - 44.6442717 - ], - [ - -123.9357304, - 44.6464143 - ], - [ - -123.93508, - 44.6480051 - ], - [ - -123.9343918, - 44.6493511 - ], - [ - -123.9342618, - 44.6495612 - ], - [ - -123.9329101, - 44.6512965 - ], - [ - -123.9324702, - 44.6517565 - ], - [ - -123.9305544, - 44.6533895 - ], - [ - -123.9282289, - 44.6547242 - ], - [ - -123.9255833, - 44.6557095 - ], - [ - -123.9227191, - 44.6563073 - ], - [ - -123.9197465, - 44.6564947 - ], - [ - -123.9167799, - 44.6562646 - ], - [ - -123.9139332, - 44.6556256 - ], - [ - -123.9113159, - 44.6546025 - ], - [ - -123.9090286, - 44.6532346 - ], - [ - -123.9071593, - 44.6515743 - ], - [ - -123.9057798, - 44.6496857 - ], - [ - -123.904943, - 44.6476412 - ], - [ - -123.904681, - 44.6455194 - ], - [ - -123.9050039, - 44.643402 - ], - [ - -123.9058992, - 44.6413702 - ], - [ - -123.9062947, - 44.6408547 - ], - [ - -123.9065819, - 44.6401531 - ], - [ - -123.9067281, - 44.6398164 - ], - [ - -123.9077009, - 44.6376975 - ], - [ - -123.9083836, - 44.6360008 - ], - [ - -123.9085014, - 44.6357609 - ], - [ - -123.9084052, - 44.6352746 - ], - [ - -123.9082903, - 44.6351074 - ], - [ - -123.9073692, - 44.6334271 - ], - [ - -123.9068504, - 44.6316611 - ], - [ - -123.9067283, - 44.6309593 - ], - [ - -123.906585, - 44.6304431 - ], - [ - -123.9062952, - 44.6282463 - ], - [ - -123.9066329, - 44.626053 - ], - [ - -123.906723, - 44.625753 - ], - [ - -123.9078633, - 44.6233587 - ], - [ - -123.9080834, - 44.6230287 - ], - [ - -123.9087535, - 44.6222554 - ], - [ - -123.9087817, - 44.6221254 - ], - [ - -123.9089151, - 44.6215906 - ], - [ - -123.9087811, - 44.6213845 - ], - [ - -123.9079831, - 44.6198699 - ], - [ - -123.9075089, - 44.6182876 - ], - [ - -123.9074589, - 44.6180275 - ], - [ - -123.9073244, - 44.616231 - ], - [ - -123.9076068, - 44.6144432 - ], - [ - -123.9077369, - 44.6139732 - ], - [ - -123.9085189, - 44.6122823 - ], - [ - -123.908525, - 44.6121133 - ], - [ - -123.9092442, - 44.6099388 - ], - [ - -123.9105707, - 44.6079154 - ], - [ - -123.9124484, - 44.6061286 - ], - [ - -123.9147979, - 44.6046539 - ], - [ - -123.9175199, - 44.6035536 - ], - [ - -123.9204992, - 44.6028743 - ], - [ - -123.9236101, - 44.6026446 - ], - [ - -123.924278, - 44.6026446 - ], - [ - -123.927245, - 44.6028534 - ], - [ - -123.9300981, - 44.6034716 - ], - [ - -123.9327276, - 44.6044755 - ], - [ - -123.9350326, - 44.6058265 - ], - [ - -123.9369244, - 44.6074728 - ], - [ - -123.9383304, - 44.6093511 - ], - [ - -123.9391965, - 44.6113893 - ], - [ - -123.9394893, - 44.6135089 - ], - [ - -123.9391976, - 44.6156287 - ], - [ - -123.9390848, - 44.6158946 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16278_s_22287", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9707105, - 44.6759685 - ], - [ - -123.9709447, - 44.6765052 - ], - [ - -123.9712694, - 44.6785328 - ], - [ - -123.9712845, - 44.6790808 - ], - [ - -123.9712549, - 44.6800052 - ], - [ - -123.971212, - 44.6804722 - ], - [ - -123.9707088, - 44.6826188 - ], - [ - -123.9704979, - 44.6831708 - ], - [ - -123.9700764, - 44.6841054 - ], - [ - -123.9678463, - 44.6883777 - ], - [ - -123.9669601, - 44.6897678 - ], - [ - -123.9667435, - 44.6900525 - ], - [ - -123.9662943, - 44.6908448 - ], - [ - -123.9662011, - 44.6910054 - ], - [ - -123.9645107, - 44.6938546 - ], - [ - -123.9634665, - 44.6953017 - ], - [ - -123.9626044, - 44.6963039 - ], - [ - -123.9627601, - 44.6966614 - ], - [ - -123.9629923, - 44.6973014 - ], - [ - -123.9632853, - 44.6983005 - ], - [ - -123.9633704, - 44.6986784 - ], - [ - -123.9635619, - 44.7005356 - ], - [ - -123.9635451, - 44.7014996 - ], - [ - -123.9634345, - 44.7026788 - ], - [ - -123.9631949, - 44.7040818 - ], - [ - -123.9630876, - 44.704604 - ], - [ - -123.9628558, - 44.705568 - ], - [ - -123.9615332, - 44.7084945 - ], - [ - -123.9609074, - 44.7094096 - ], - [ - -123.9595601, - 44.7110127 - ], - [ - -123.9578475, - 44.7124274 - ], - [ - -123.9571265, - 44.7129285 - ], - [ - -123.9543233, - 44.7144675 - ], - [ - -123.9533962, - 44.7148636 - ], - [ - -123.952478, - 44.7152258 - ], - [ - -123.9509014, - 44.7157981 - ], - [ - -123.9431609, - 44.7186634 - ], - [ - -123.9427204, - 44.7188201 - ], - [ - -123.9399525, - 44.7197649 - ], - [ - -123.9369127, - 44.7208625 - ], - [ - -123.9365661, - 44.7209894 - ], - [ - -123.9361781, - 44.7211245 - ], - [ - -123.9361666, - 44.7211287 - ], - [ - -123.9355766, - 44.7213513 - ], - [ - -123.935378, - 44.7214963 - ], - [ - -123.9351945, - 44.7216217 - ], - [ - -123.9350742, - 44.7217181 - ], - [ - -123.9334554, - 44.7228369 - ], - [ - -123.9331984, - 44.7229899 - ], - [ - -123.9327413, - 44.7232516 - ], - [ - -123.9322931, - 44.7234982 - ], - [ - -123.9321112, - 44.723926 - ], - [ - -123.9307032, - 44.7258046 - ], - [ - -123.9288082, - 44.7274513 - ], - [ - -123.9264988, - 44.7288027 - ], - [ - -123.9238638, - 44.7298069 - ], - [ - -123.9210046, - 44.7304253 - ], - [ - -123.918031, - 44.7306341 - ], - [ - -123.9150575, - 44.7304253 - ], - [ - -123.9121982, - 44.7298069 - ], - [ - -123.9095632, - 44.7288027 - ], - [ - -123.9072538, - 44.7274513 - ], - [ - -123.9053588, - 44.7258047 - ], - [ - -123.9039508, - 44.7239261 - ], - [ - -123.9030841, - 44.7218877 - ], - [ - -123.9027918, - 44.719768 - ], - [ - -123.9027918, - 44.7197291 - ], - [ - -123.9027915, - 44.7196325 - ], - [ - -123.9027891, - 44.7195798 - ], - [ - -123.9027809, - 44.719223 - ], - [ - -123.9027812, - 44.718285 - ], - [ - -123.9027818, - 44.7181892 - ], - [ - -123.9027941, - 44.7172182 - ], - [ - -123.9029034, - 44.7160133 - ], - [ - -123.9029725, - 44.7156053 - ], - [ - -123.9037754, - 44.7132038 - ], - [ - -123.9039895, - 44.7127829 - ], - [ - -123.9050793, - 44.7111025 - ], - [ - -123.9065534, - 44.7095784 - ], - [ - -123.9069484, - 44.7092364 - ], - [ - -123.9087552, - 44.7079182 - ], - [ - -123.9092102, - 44.7076382 - ], - [ - -123.9112866, - 44.7065639 - ], - [ - -123.9117416, - 44.706368 - ], - [ - -123.9143769, - 44.7054664 - ], - [ - -123.9149342, - 44.7053207 - ], - [ - -123.9160616, - 44.70456 - ], - [ - -123.9169715, - 44.704029 - ], - [ - -123.9194954, - 44.7028339 - ], - [ - -123.9208682, - 44.702316 - ], - [ - -123.9219849, - 44.7018948 - ], - [ - -123.922123, - 44.7018433 - ], - [ - -123.9223539, - 44.7017584 - ], - [ - -123.9225472, - 44.7016885 - ], - [ - -123.9231727, - 44.7014663 - ], - [ - -123.9263381, - 44.7003235 - ], - [ - -123.9266432, - 44.7002163 - ], - [ - -123.9293419, - 44.6992953 - ], - [ - -123.9310148, - 44.6986761 - ], - [ - -123.9308927, - 44.6983414 - ], - [ - -123.9307469, - 44.6977314 - ], - [ - -123.9305407, - 44.6955003 - ], - [ - -123.9305668, - 44.6950003 - ], - [ - -123.9310782, - 44.6925851 - ], - [ - -123.9313954, - 44.6917432 - ], - [ - -123.93292, - 44.6891231 - ], - [ - -123.9342163, - 44.6875242 - ], - [ - -123.9348902, - 44.6867669 - ], - [ - -123.936415, - 44.6852001 - ], - [ - -123.9369055, - 44.6846302 - ], - [ - -123.9381034, - 44.6826129 - ], - [ - -123.9388299, - 44.6813325 - ], - [ - -123.9395631, - 44.6802246 - ], - [ - -123.9396783, - 44.6800733 - ], - [ - -123.9401243, - 44.6792196 - ], - [ - -123.9396971, - 44.6789693 - ], - [ - -123.9377477, - 44.6776003 - ], - [ - -123.9370867, - 44.6770443 - ], - [ - -123.9352998, - 44.6751772 - ], - [ - -123.9348709, - 44.6746102 - ], - [ - -123.9337415, - 44.6727007 - ], - [ - -123.9335266, - 44.6722117 - ], - [ - -123.9330696, - 44.6708843 - ], - [ - -123.9329328, - 44.6703413 - ], - [ - -123.9326977, - 44.6681286 - ], - [ - -123.9328276, - 44.6646496 - ], - [ - -123.9329419, - 44.6635794 - ], - [ - -123.9330531, - 44.6629504 - ], - [ - -123.9333747, - 44.6617128 - ], - [ - -123.9336589, - 44.6608889 - ], - [ - -123.9343561, - 44.6593632 - ], - [ - -123.9346652, - 44.6588253 - ], - [ - -123.9352134, - 44.6579771 - ], - [ - -123.9355564, - 44.6575011 - ], - [ - -123.9359097, - 44.6570389 - ], - [ - -123.9366159, - 44.656166 - ], - [ - -123.9372633, - 44.6554345 - ], - [ - -123.9376936, - 44.6549886 - ], - [ - -123.937732, - 44.6548382 - ], - [ - -123.9373118, - 44.6529853 - ], - [ - -123.9367556, - 44.6532055 - ], - [ - -123.9364396, - 44.6533215 - ], - [ - -123.9355796, - 44.6536133 - ], - [ - -123.9352626, - 44.6537123 - ], - [ - -123.9342992, - 44.6539857 - ], - [ - -123.9339632, - 44.6540717 - ], - [ - -123.9329437, - 44.6543041 - ], - [ - -123.9326097, - 44.6543711 - ], - [ - -123.9317792, - 44.6545198 - ], - [ - -123.9314562, - 44.6545709 - ], - [ - -123.9306048, - 44.6546872 - ], - [ - -123.9302677, - 44.6547262 - ], - [ - -123.9295446, - 44.6547897 - ], - [ - -123.9278275, - 44.6557079 - ], - [ - -123.9250433, - 44.6566445 - ], - [ - -123.9220519, - 44.6571622 - ], - [ - -123.9189757, - 44.6572396 - ], - [ - -123.9159406, - 44.6568737 - ], - [ - -123.9130708, - 44.6560794 - ], - [ - -123.9128397, - 44.6559954 - ], - [ - -123.9118845, - 44.6556166 - ], - [ - -123.9117545, - 44.6555606 - ], - [ - -123.9089351, - 44.6539969 - ], - [ - -123.9067038, - 44.6520073 - ], - [ - -123.9066208, - 44.6519123 - ], - [ - -123.9054808, - 44.6503325 - ], - [ - -123.9047169, - 44.6486411 - ], - [ - -123.9043495, - 44.6468835 - ], - [ - -123.9043385, - 44.6467655 - ], - [ - -123.9044777, - 44.6444145 - ], - [ - -123.9053225, - 44.6421401 - ], - [ - -123.9053705, - 44.6420511 - ], - [ - -123.9066542, - 44.6402123 - ], - [ - -123.9067702, - 44.6400793 - ], - [ - -123.9072825, - 44.63953 - ], - [ - -123.9074835, - 44.6393281 - ], - [ - -123.9094415, - 44.6377211 - ], - [ - -123.9095911, - 44.6376385 - ], - [ - -123.9098806, - 44.6373665 - ], - [ - -123.9100977, - 44.6371915 - ], - [ - -123.9115346, - 44.6361773 - ], - [ - -123.9117936, - 44.6360173 - ], - [ - -123.9132345, - 44.6352294 - ], - [ - -123.9136824, - 44.6350135 - ], - [ - -123.9160334, - 44.6340844 - ], - [ - -123.9165454, - 44.6339224 - ], - [ - -123.9191204, - 44.6332975 - ], - [ - -123.9195933, - 44.6332155 - ], - [ - -123.9213828, - 44.6329851 - ], - [ - -123.9218058, - 44.6329491 - ], - [ - -123.9238582, - 44.6328773 - ], - [ - -123.9249673, - 44.6321817 - ], - [ - -123.9253364, - 44.6319487 - ], - [ - -123.9260569, - 44.6315213 - ], - [ - -123.9264249, - 44.6313163 - ], - [ - -123.9276103, - 44.6307186 - ], - [ - -123.9279863, - 44.6305477 - ], - [ - -123.9290811, - 44.6300944 - ], - [ - -123.92947, - 44.6299484 - ], - [ - -123.9307865, - 44.6295102 - ], - [ - -123.9311594, - 44.6294012 - ], - [ - -123.9319828, - 44.6291803 - ], - [ - -123.9323907, - 44.6290803 - ], - [ - -123.9332488, - 44.6288907 - ], - [ - -123.9332616, - 44.6288773 - ], - [ - -123.9337837, - 44.6283673 - ], - [ - -123.9338424, - 44.6283104 - ], - [ - -123.9345055, - 44.6276714 - ], - [ - -123.9368741, - 44.6258628 - ], - [ - -123.9397545, - 44.6244841 - ], - [ - -123.9429972, - 44.6236069 - ], - [ - -123.9432571, - 44.62356 - ], - [ - -123.9459019, - 44.6232556 - ], - [ - -123.9485803, - 44.6232872 - ], - [ - -123.9487003, - 44.6232962 - ], - [ - -123.9514983, - 44.6236982 - ], - [ - -123.9541419, - 44.6244663 - ], - [ - -123.9542709, - 44.6245143 - ], - [ - -123.9565689, - 44.6255665 - ], - [ - -123.9585667, - 44.626895 - ], - [ - -123.9602, - 44.628457 - ], - [ - -123.960287, - 44.628558 - ], - [ - -123.9617377, - 44.6307626 - ], - [ - -123.9624642, - 44.6331426 - ], - [ - -123.9624299, - 44.6355784 - ], - [ - -123.9623221, - 44.6362044 - ], - [ - -123.9623191, - 44.6362217 - ], - [ - -123.9622512, - 44.6366107 - ], - [ - -123.9622386, - 44.6366806 - ], - [ - -123.9621864, - 44.6369649 - ], - [ - -123.963709, - 44.6392703 - ], - [ - -123.9639087, - 44.6395402 - ], - [ - -123.964523, - 44.6404753 - ], - [ - -123.9649161, - 44.6411563 - ], - [ - -123.9652304, - 44.6417491 - ], - [ - -123.9654965, - 44.6422991 - ], - [ - -123.9660488, - 44.6437652 - ], - [ - -123.966264, - 44.6445522 - ], - [ - -123.9662873, - 44.6446395 - ], - [ - -123.9665876, - 44.6457874 - ], - [ - -123.9667245, - 44.6464105 - ], - [ - -123.966967, - 44.6477707 - ], - [ - -123.9679994, - 44.6523127 - ], - [ - -123.9681003, - 44.6528374 - ], - [ - -123.9681774, - 44.6533264 - ], - [ - -123.968272, - 44.6546671 - ], - [ - -123.9682631, - 44.6552161 - ], - [ - -123.9682204, - 44.6559141 - ], - [ - -123.9681775, - 44.6563171 - ], - [ - -123.968096, - 44.656885 - ], - [ - -123.9680021, - 44.657404 - ], - [ - -123.9678822, - 44.6579552 - ], - [ - -123.9672608, - 44.6603962 - ], - [ - -123.9667398, - 44.6618575 - ], - [ - -123.966426, - 44.6625366 - ], - [ - -123.9654717, - 44.6641504 - ], - [ - -123.9651288, - 44.6646205 - ], - [ - -123.9646077, - 44.6652778 - ], - [ - -123.9645838, - 44.6653057 - ], - [ - -123.9658384, - 44.6662888 - ], - [ - -123.9674224, - 44.6682006 - ], - [ - -123.9676625, - 44.6685726 - ], - [ - -123.9677638, - 44.668733 - ], - [ - -123.9680129, - 44.669136 - ], - [ - -123.9687258, - 44.6705454 - ], - [ - -123.968923, - 44.6710394 - ], - [ - -123.9690912, - 44.671499 - ], - [ - -123.9694062, - 44.6724433 - ], - [ - -123.969766, - 44.6732106 - ], - [ - -123.9701707, - 44.6742393 - ], - [ - -123.970532, - 44.6753683 - ], - [ - -123.970592, - 44.675564 - ], - [ - -123.9707105, - 44.6759685 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_16279_s_16275", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0719979, - 44.6242537 - ], - [ - -124.072096, - 44.624352 - ], - [ - -124.07332, - 44.6262943 - ], - [ - -124.07399, - 44.6283698 - ], - [ - -124.0740802, - 44.6304987 - ], - [ - -124.0735869, - 44.6325993 - ], - [ - -124.0725292, - 44.6345908 - ], - [ - -124.0709475, - 44.6363967 - ], - [ - -124.0689028, - 44.6379476 - ], - [ - -124.0664735, - 44.6391837 - ], - [ - -124.0637529, - 44.6400577 - ], - [ - -124.0608458, - 44.6405359 - ], - [ - -124.0578639, - 44.6405999 - ], - [ - -124.0549218, - 44.6402472 - ], - [ - -124.0521327, - 44.6394915 - ], - [ - -124.0516673, - 44.6393264 - ], - [ - -124.0501925, - 44.6386314 - ], - [ - -124.0485361, - 44.6381947 - ], - [ - -124.045993, - 44.6370812 - ], - [ - -124.0438032, - 44.6356349 - ], - [ - -124.0420507, - 44.6339113 - ], - [ - -124.0408029, - 44.6319767 - ], - [ - -124.0401077, - 44.6299054 - ], - [ - -124.0399918, - 44.6277771 - ], - [ - -124.0404595, - 44.6256735 - ], - [ - -124.0414929, - 44.6236755 - ], - [ - -124.0427232, - 44.6218656 - ], - [ - -124.0443849, - 44.6199543 - ], - [ - -124.0465621, - 44.6183284 - ], - [ - -124.0491614, - 44.6170575 - ], - [ - -124.0520712, - 44.6161961 - ], - [ - -124.0551671, - 44.6157812 - ], - [ - -124.0583161, - 44.6158305 - ], - [ - -124.0613835, - 44.6163419 - ], - [ - -124.0622334, - 44.6165519 - ], - [ - -124.0648874, - 44.6174191 - ], - [ - -124.0672608, - 44.6186324 - ], - [ - -124.0692662, - 44.620147 - ], - [ - -124.0708298, - 44.6219072 - ], - [ - -124.071894, - 44.6238483 - ], - [ - -124.0719979, - 44.6242537 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22283_s_22283", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.8941545, - 44.7206863 - ], - [ - -123.8944146, - 44.7185645 - ], - [ - -123.8952503, - 44.7165196 - ], - [ - -123.8966294, - 44.7146302 - ], - [ - -123.8984989, - 44.7129689 - ], - [ - -123.9007868, - 44.7115996 - ], - [ - -123.9034053, - 44.7105748 - ], - [ - -123.9062538, - 44.7099339 - ], - [ - -123.9092228, - 44.7097015 - ], - [ - -123.9121984, - 44.7098866 - ], - [ - -123.9150663, - 44.7104819 - ], - [ - -123.9177162, - 44.7114648 - ], - [ - -123.9200464, - 44.7127973 - ], - [ - -123.9219674, - 44.7144284 - ], - [ - -123.9234053, - 44.7162954 - ], - [ - -123.9243049, - 44.7183265 - ], - [ - -123.9246314, - 44.7204436 - ], - [ - -123.9243724, - 44.7225656 - ], - [ - -123.9235376, - 44.7246107 - ], - [ - -123.9221592, - 44.7265004 - ], - [ - -123.92029, - 44.728162 - ], - [ - -123.9180019, - 44.7295317 - ], - [ - -123.9153828, - 44.7305569 - ], - [ - -123.9125334, - 44.731198 - ], - [ - -123.9095632, - 44.7314305 - ], - [ - -123.9065866, - 44.7312454 - ], - [ - -123.9037178, - 44.7306498 - ], - [ - -123.9010672, - 44.7296666 - ], - [ - -123.8987367, - 44.7283337 - ], - [ - -123.8968159, - 44.7267022 - ], - [ - -123.8953786, - 44.7248349 - ], - [ - -123.89448, - 44.7228036 - ], - [ - -123.8941545, - 44.7206863 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22283_s_22285", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9145954, - 44.7103135 - ], - [ - -123.9150467, - 44.7102155 - ], - [ - -123.918019, - 44.7100048 - ], - [ - -123.9209918, - 44.7102116 - ], - [ - -123.9238509, - 44.7108279 - ], - [ - -123.9264866, - 44.7118301 - ], - [ - -123.9287976, - 44.7131796 - ], - [ - -123.930695, - 44.7148246 - ], - [ - -123.932106, - 44.716702 - ], - [ - -123.9329763, - 44.7187395 - ], - [ - -123.9332725, - 44.720859 - ], - [ - -123.9332737, - 44.721632 - ], - [ - -123.9332736, - 44.7216847 - ], - [ - -123.9332721, - 44.7219684 - ], - [ - -123.933277, - 44.7222901 - ], - [ - -123.9330121, - 44.7244283 - ], - [ - -123.9321627, - 44.7264876 - ], - [ - -123.930762, - 44.7283876 - ], - [ - -123.9288645, - 44.7300543 - ], - [ - -123.9265443, - 44.7314225 - ], - [ - -123.9238919, - 44.7324388 - ], - [ - -123.921011, - 44.7330634 - ], - [ - -123.9180139, - 44.7332721 - ], - [ - -123.9162516, - 44.7332701 - ], - [ - -123.9150347, - 44.7332341 - ], - [ - -123.9147257, - 44.733216 - ], - [ - -123.9134566, - 44.7331037 - ], - [ - -123.9132045, - 44.7330737 - ], - [ - -123.9123773, - 44.7329584 - ], - [ - -123.9122772, - 44.7329424 - ], - [ - -123.9122095, - 44.7329315 - ], - [ - -123.911614, - 44.7328341 - ], - [ - -123.9101235, - 44.7326013 - ], - [ - -123.9096624, - 44.7325239 - ], - [ - -123.909569, - 44.7325071 - ], - [ - -123.9095557, - 44.7325052 - ], - [ - -123.9093139, - 44.7324724 - ], - [ - -123.9080821, - 44.7322676 - ], - [ - -123.907809, - 44.7322136 - ], - [ - -123.9061615, - 44.7318142 - ], - [ - -123.9059295, - 44.7317472 - ], - [ - -123.9023731, - 44.7302964 - ], - [ - -123.9021501, - 44.7301744 - ], - [ - -123.9014824, - 44.7297611 - ], - [ - -123.9014275, - 44.7297368 - ], - [ - -123.9010146, - 44.7295469 - ], - [ - -123.9009936, - 44.7295369 - ], - [ - -123.8986838, - 44.7281858 - ], - [ - -123.8967882, - 44.7265394 - ], - [ - -123.8953797, - 44.724661 - ], - [ - -123.8945124, - 44.7226228 - ], - [ - -123.8942196, - 44.7205031 - ], - [ - -123.8945124, - 44.7183834 - ], - [ - -123.8953795, - 44.7163451 - ], - [ - -123.8967876, - 44.7144667 - ], - [ - -123.8986825, - 44.7128201 - ], - [ - -123.9009913, - 44.7114688 - ], - [ - -123.9036255, - 44.7104645 - ], - [ - -123.9064836, - 44.709846 - ], - [ - -123.9094561, - 44.7096368 - ], - [ - -123.9124287, - 44.7098452 - ], - [ - -123.9145954, - 44.7103135 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22284_s_22286", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9221694, - 44.7242183 - ], - [ - -123.9221735, - 44.7242184 - ], - [ - -123.9221656, - 44.7247554 - ], - [ - -123.9221547, - 44.7254609 - ], - [ - -123.9218335, - 44.7275632 - ], - [ - -123.920947, - 44.7295814 - ], - [ - -123.9195288, - 44.7314388 - ], - [ - -123.9176326, - 44.7330653 - ], - [ - -123.9153302, - 44.734399 - ], - [ - -123.9127089, - 44.7353896 - ], - [ - -123.9098679, - 44.7359993 - ], - [ - -123.906915, - 44.7362052 - ], - [ - -123.90688, - 44.7362052 - ], - [ - -123.9039062, - 44.7359963 - ], - [ - -123.9010466, - 44.7353779 - ], - [ - -123.8984114, - 44.7343737 - ], - [ - -123.8961018, - 44.7330223 - ], - [ - -123.8942065, - 44.7313757 - ], - [ - -123.8927984, - 44.7294971 - ], - [ - -123.8919316, - 44.7274587 - ], - [ - -123.891869, - 44.727005 - ], - [ - -123.8910702, - 44.7260966 - ], - [ - -123.8900076, - 44.7241059 - ], - [ - -123.8895103, - 44.7220056 - ], - [ - -123.8895973, - 44.7198766 - ], - [ - -123.8902652, - 44.7178005 - ], - [ - -123.8914882, - 44.7158573 - ], - [ - -123.8932193, - 44.7141214 - ], - [ - -123.895392, - 44.7126597 - ], - [ - -123.8979227, - 44.7115283 - ], - [ - -123.9007143, - 44.7107706 - ], - [ - -123.9020205, - 44.7106132 - ], - [ - -123.902364, - 44.7105509 - ], - [ - -123.9026399, - 44.7105129 - ], - [ - -123.90266, - 44.7105101 - ], - [ - -123.902799, - 44.7104911 - ], - [ - -123.90331, - 44.7104579 - ], - [ - -123.9036595, - 44.7104158 - ], - [ - -123.9038854, - 44.7104204 - ], - [ - -123.9057798, - 44.7102971 - ], - [ - -123.9087562, - 44.7105223 - ], - [ - -123.9116135, - 44.711158 - ], - [ - -123.9142415, - 44.7121796 - ], - [ - -123.9165388, - 44.7135479 - ], - [ - -123.9170722, - 44.71402 - ], - [ - -123.917112, - 44.7140441 - ], - [ - -123.918714, - 44.7153875 - ], - [ - -123.918836, - 44.7155085 - ], - [ - -123.9207899, - 44.718148 - ], - [ - -123.9208509, - 44.718268 - ], - [ - -123.9215436, - 44.7201317 - ], - [ - -123.9217982, - 44.7211878 - ], - [ - -123.9219187, - 44.721658 - ], - [ - -123.9221532, - 44.7231461 - ], - [ - -123.9221723, - 44.7234631 - ], - [ - -123.9221694, - 44.7242183 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22285_s_16278", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9646357, - 44.6652912 - ], - [ - -123.965299, - 44.6657627 - ], - [ - -123.965459, - 44.6659027 - ], - [ - -123.9669308, - 44.6674433 - ], - [ - -123.9680118, - 44.6691408 - ], - [ - -123.9687221, - 44.6705707 - ], - [ - -123.9690226, - 44.6712444 - ], - [ - -123.9694228, - 44.6722544 - ], - [ - -123.9695457, - 44.6725843 - ], - [ - -123.9705164, - 44.6753641 - ], - [ - -123.9707654, - 44.6762238 - ], - [ - -123.9708855, - 44.6767438 - ], - [ - -123.9710857, - 44.6783102 - ], - [ - -123.9711059, - 44.6790902 - ], - [ - -123.9710059, - 44.6805501 - ], - [ - -123.9708162, - 44.6817101 - ], - [ - -123.9704452, - 44.6831393 - ], - [ - -123.9702054, - 44.6838094 - ], - [ - -123.9697754, - 44.6848076 - ], - [ - -123.9693456, - 44.6856577 - ], - [ - -123.9689302, - 44.6863939 - ], - [ - -123.9680825, - 44.6877507 - ], - [ - -123.965388, - 44.6924754 - ], - [ - -123.9651053, - 44.6929396 - ], - [ - -123.9641656, - 44.6943898 - ], - [ - -123.9639123, - 44.6947619 - ], - [ - -123.9636623, - 44.6951119 - ], - [ - -123.9627223, - 44.6962511 - ], - [ - -123.9626236, - 44.6963557 - ], - [ - -123.9629381, - 44.6971273 - ], - [ - -123.9634101, - 44.6987238 - ], - [ - -123.9635416, - 44.7003527 - ], - [ - -123.963502, - 44.7019527 - ], - [ - -123.9632239, - 44.7038364 - ], - [ - -123.9626044, - 44.7061064 - ], - [ - -123.9618733, - 44.7079241 - ], - [ - -123.9617334, - 44.7081842 - ], - [ - -123.9603965, - 44.7100865 - ], - [ - -123.9601665, - 44.7103466 - ], - [ - -123.9589929, - 44.7114986 - ], - [ - -123.958503, - 44.7119186 - ], - [ - -123.956382, - 44.7134118 - ], - [ - -123.955932, - 44.7136718 - ], - [ - -123.9537339, - 44.71473 - ], - [ - -123.9513837, - 44.7156602 - ], - [ - -123.9506672, - 44.7159263 - ], - [ - -123.9466734, - 44.7173147 - ], - [ - -123.9436466, - 44.7184486 - ], - [ - -123.9434406, - 44.7185243 - ], - [ - -123.9355428, - 44.7213741 - ], - [ - -123.9345729, - 44.7220744 - ], - [ - -123.9333312, - 44.7228774 - ], - [ - -123.9329244, - 44.7231127 - ], - [ - -123.932077, - 44.7250772 - ], - [ - -123.9306585, - 44.7269518 - ], - [ - -123.9287541, - 44.728593 - ], - [ - -123.9264371, - 44.7299378 - ], - [ - -123.9237965, - 44.7309345 - ], - [ - -123.9209337, - 44.7315447 - ], - [ - -123.917959, - 44.7317451 - ], - [ - -123.9149865, - 44.7315278 - ], - [ - -123.9121308, - 44.7309012 - ], - [ - -123.9095014, - 44.7298895 - ], - [ - -123.9071996, - 44.7285315 - ], - [ - -123.9053137, - 44.7268794 - ], - [ - -123.9039163, - 44.7249968 - ], - [ - -123.903061, - 44.722956 - ], - [ - -123.9027806, - 44.7208355 - ], - [ - -123.9028016, - 44.7172755 - ], - [ - -123.9029872, - 44.7156294 - ], - [ - -123.9031574, - 44.7148595 - ], - [ - -123.9039797, - 44.7126647 - ], - [ - -123.9054239, - 44.7106399 - ], - [ - -123.9074268, - 44.7088734 - ], - [ - -123.9084768, - 44.7081235 - ], - [ - -123.9106917, - 44.7068155 - ], - [ - -123.9132117, - 44.7058275 - ], - [ - -123.9142816, - 44.7054976 - ], - [ - -123.9148875, - 44.7053625 - ], - [ - -123.9152999, - 44.7050648 - ], - [ - -123.9178497, - 44.703584 - ], - [ - -123.9186496, - 44.7032141 - ], - [ - -123.9193986, - 44.7028892 - ], - [ - -123.9200385, - 44.7026292 - ], - [ - -123.9207028, - 44.7023747 - ], - [ - -123.9295783, - 44.6991725 - ], - [ - -123.9309893, - 44.698644 - ], - [ - -123.9308949, - 44.6983923 - ], - [ - -123.930775, - 44.6978923 - ], - [ - -123.9305709, - 44.6955981 - ], - [ - -123.9306211, - 44.6947581 - ], - [ - -123.9309168, - 44.6930418 - ], - [ - -123.9315904, - 44.6913807 - ], - [ - -123.9319506, - 44.6907008 - ], - [ - -123.932573, - 44.6896855 - ], - [ - -123.932853, - 44.6892856 - ], - [ - -123.9335725, - 44.6883713 - ], - [ - -123.9353027, - 44.6864015 - ], - [ - -123.93558, - 44.6860972 - ], - [ - -123.9368522, - 44.684751 - ], - [ - -123.9373078, - 44.6840484 - ], - [ - -123.939965, - 44.6793932 - ], - [ - -123.9400964, - 44.6791734 - ], - [ - -123.9397972, - 44.6790131 - ], - [ - -123.9390872, - 44.6785631 - ], - [ - -123.9372854, - 44.6772057 - ], - [ - -123.9367054, - 44.6766857 - ], - [ - -123.9349069, - 44.6746426 - ], - [ - -123.934447, - 44.6739625 - ], - [ - -123.9333227, - 44.67168 - ], - [ - -123.9331128, - 44.67103 - ], - [ - -123.9327271, - 44.6687985 - ], - [ - -123.9326973, - 44.6676885 - ], - [ - -123.9327036, - 44.6671059 - ], - [ - -123.9328344, - 44.6644059 - ], - [ - -123.9330763, - 44.6628163 - ], - [ - -123.9334266, - 44.6614563 - ], - [ - -123.9344058, - 44.6591422 - ], - [ - -123.9347959, - 44.6584922 - ], - [ - -123.9360077, - 44.6568687 - ], - [ - -123.9377376, - 44.6549602 - ], - [ - -123.937659, - 44.6546338 - ], - [ - -123.9375487, - 44.6540965 - ], - [ - -123.9373976, - 44.6532052 - ], - [ - -123.9373479, - 44.6529735 - ], - [ - -123.9370102, - 44.6531086 - ], - [ - -123.9355265, - 44.6536287 - ], - [ - -123.9349665, - 44.6537987 - ], - [ - -123.9328768, - 44.6543088 - ], - [ - -123.9317566, - 44.6545188 - ], - [ - -123.929569, - 44.6548053 - ], - [ - -123.9279211, - 44.6556911 - ], - [ - -123.9251659, - 44.6566281 - ], - [ - -123.9222042, - 44.6571539 - ], - [ - -123.9191551, - 44.6572473 - ], - [ - -123.9161411, - 44.6569047 - ], - [ - -123.9132836, - 44.6561398 - ], - [ - -123.9129435, - 44.6560197 - ], - [ - -123.9101581, - 44.654751 - ], - [ - -123.9078219, - 44.653083 - ], - [ - -123.907642, - 44.652923 - ], - [ - -123.9059931, - 44.6511149 - ], - [ - -123.9048773, - 44.6491098 - ], - [ - -123.9043385, - 44.6469869 - ], - [ - -123.9043979, - 44.6448299 - ], - [ - -123.9050532, - 44.6427237 - ], - [ - -123.9062783, - 44.6407515 - ], - [ - -123.9066684, - 44.6402616 - ], - [ - -123.9083897, - 44.6385219 - ], - [ - -123.9094242, - 44.6378207 - ], - [ - -123.9098312, - 44.637423 - ], - [ - -123.9101912, - 44.637133 - ], - [ - -123.9132052, - 44.6352679 - ], - [ - -123.9140552, - 44.634868 - ], - [ - -123.9179642, - 44.6335531 - ], - [ - -123.9186941, - 44.6333931 - ], - [ - -123.921805, - 44.6329579 - ], - [ - -123.9222749, - 44.6329279 - ], - [ - -123.9238002, - 44.6329104 - ], - [ - -123.9238618, - 44.6328703 - ], - [ - -123.9257518, - 44.6317005 - ], - [ - -123.9278515, - 44.63061 - ], - [ - -123.9283614, - 44.6303901 - ], - [ - -123.9294415, - 44.6299658 - ], - [ - -123.9300314, - 44.6297559 - ], - [ - -123.9324868, - 44.6290646 - ], - [ - -123.9332964, - 44.6288928 - ], - [ - -123.9339954, - 44.6282084 - ], - [ - -123.9355955, - 44.6267885 - ], - [ - -123.9377218, - 44.6252456 - ], - [ - -123.940234, - 44.6240343 - ], - [ - -123.9430326, - 44.6232027 - ], - [ - -123.9460064, - 44.6227837 - ], - [ - -123.9490375, - 44.622794 - ], - [ - -123.9520057, - 44.6232332 - ], - [ - -123.954793, - 44.6240838 - ], - [ - -123.9572891, - 44.6253121 - ], - [ - -123.9593947, - 44.6268694 - ], - [ - -123.9610263, - 44.6286938 - ], - [ - -123.9621192, - 44.630713 - ], - [ - -123.9626298, - 44.6328468 - ], - [ - -123.9625379, - 44.6350106 - ], - [ - -123.9621804, - 44.6369618 - ], - [ - -123.9622072, - 44.6370021 - ], - [ - -123.9636118, - 44.6391834 - ], - [ - -123.9638429, - 44.639493 - ], - [ - -123.9644257, - 44.6403658 - ], - [ - -123.9649059, - 44.6411758 - ], - [ - -123.9655467, - 44.6424833 - ], - [ - -123.966017, - 44.6436833 - ], - [ - -123.9663711, - 44.6448171 - ], - [ - -123.9666313, - 44.6459271 - ], - [ - -123.9666645, - 44.6460748 - ], - [ - -123.9675255, - 44.6500847 - ], - [ - -123.9675903, - 44.6504216 - ], - [ - -123.9677247, - 44.6512119 - ], - [ - -123.9680104, - 44.6523941 - ], - [ - -123.9681841, - 44.65338 - ], - [ - -123.9682442, - 44.65392 - ], - [ - -123.9682897, - 44.6549728 - ], - [ - -123.9682699, - 44.6557728 - ], - [ - -123.9680511, - 44.6574265 - ], - [ - -123.9673918, - 44.6601566 - ], - [ - -123.9667741, - 44.6618679 - ], - [ - -123.9662643, - 44.662918 - ], - [ - -123.9646644, - 44.6652595 - ], - [ - -123.9646357, - 44.6652912 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22286_s_22283", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9219311, - 44.7266648 - ], - [ - -123.9217102, - 44.7278366 - ], - [ - -123.9207421, - 44.7298516 - ], - [ - -123.9192411, - 44.7316933 - ], - [ - -123.9172648, - 44.7332909 - ], - [ - -123.9148892, - 44.7345828 - ], - [ - -123.9122055, - 44.7355195 - ], - [ - -123.9093169, - 44.736065 - ], - [ - -123.9063345, - 44.7361982 - ], - [ - -123.9059407, - 44.7361882 - ], - [ - -123.9030513, - 44.7359161 - ], - [ - -123.9002874, - 44.7352569 - ], - [ - -123.8977502, - 44.7342348 - ], - [ - -123.8955323, - 44.7328871 - ], - [ - -123.893715, - 44.7312631 - ], - [ - -123.8923645, - 44.7294223 - ], - [ - -123.8915302, - 44.7274319 - ], - [ - -123.8912427, - 44.7253646 - ], - [ - -123.89124, - 44.7247581 - ], - [ - -123.8912661, - 44.724596 - ], - [ - -123.8908739, - 44.7237903 - ], - [ - -123.8908256, - 44.7236428 - ], - [ - -123.8904531, - 44.7205306 - ], - [ - -123.8904673, - 44.7203587 - ], - [ - -123.8908309, - 44.7185576 - ], - [ - -123.8916109, - 44.7168251 - ], - [ - -123.8917077, - 44.7166593 - ], - [ - -123.893948, - 44.7139841 - ], - [ - -123.8940715, - 44.7138757 - ], - [ - -123.8972737, - 44.711769 - ], - [ - -123.8974842, - 44.7116659 - ], - [ - -123.9007915, - 44.7104407 - ], - [ - -123.9014002, - 44.710279 - ], - [ - -123.9017271, - 44.7101952 - ], - [ - -123.9019323, - 44.7101444 - ], - [ - -123.9038815, - 44.7097636 - ], - [ - -123.9041318, - 44.7097272 - ], - [ - -123.9050524, - 44.7096143 - ], - [ - -123.9052942, - 44.70959 - ], - [ - -123.9089721, - 44.7095408 - ], - [ - -123.9091655, - 44.7095549 - ], - [ - -123.910184, - 44.7096628 - ], - [ - -123.9109778, - 44.7096603 - ], - [ - -123.9142263, - 44.7101646 - ], - [ - -123.9172441, - 44.7111592 - ], - [ - -123.9173241, - 44.7111935 - ], - [ - -123.9197193, - 44.7124662 - ], - [ - -123.9217204, - 44.7140475 - ], - [ - -123.9232505, - 44.7158769 - ], - [ - -123.9242507, - 44.7178839 - ], - [ - -123.9246826, - 44.7199914 - ], - [ - -123.9245296, - 44.7221186 - ], - [ - -123.9237973, - 44.7241835 - ], - [ - -123.922514, - 44.726107 - ], - [ - -123.9219311, - 44.7266648 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22287_s_22284", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9332695, - 44.7200945 - ], - [ - -123.9332723, - 44.720281 - ], - [ - -123.9332724, - 44.7204786 - ], - [ - -123.9332737, - 44.7216353 - ], - [ - -123.9332736, - 44.7216847 - ], - [ - -123.9332721, - 44.7219684 - ], - [ - -123.933277, - 44.7222901 - ], - [ - -123.9330121, - 44.7244283 - ], - [ - -123.9321627, - 44.7264876 - ], - [ - -123.930762, - 44.7283876 - ], - [ - -123.9288645, - 44.7300543 - ], - [ - -123.9265443, - 44.7314225 - ], - [ - -123.9238919, - 44.7324388 - ], - [ - -123.921011, - 44.7330634 - ], - [ - -123.9180139, - 44.7332721 - ], - [ - -123.9162516, - 44.7332701 - ], - [ - -123.9150347, - 44.7332341 - ], - [ - -123.9147257, - 44.733216 - ], - [ - -123.9134566, - 44.7331037 - ], - [ - -123.9132045, - 44.7330737 - ], - [ - -123.9123184, - 44.7329489 - ], - [ - -123.9116185, - 44.7328348 - ], - [ - -123.9101235, - 44.7326013 - ], - [ - -123.9096624, - 44.7325239 - ], - [ - -123.9095826, - 44.7325096 - ], - [ - -123.9092617, - 44.7324653 - ], - [ - -123.9080821, - 44.7322676 - ], - [ - -123.907809, - 44.7322136 - ], - [ - -123.9068442, - 44.7319797 - ], - [ - -123.9063751, - 44.7320501 - ], - [ - -123.9055959, - 44.7320562 - ], - [ - -123.9051755, - 44.732084 - ], - [ - -123.9048739, - 44.7320618 - ], - [ - -123.9033872, - 44.7320735 - ], - [ - -123.9004504, - 44.7316808 - ], - [ - -123.8976775, - 44.7308872 - ], - [ - -123.8951752, - 44.7297232 - ], - [ - -123.8930397, - 44.7282335 - ], - [ - -123.8929567, - 44.728163 - ], - [ - -123.891151, - 44.7262472 - ], - [ - -123.8899537, - 44.7241026 - ], - [ - -123.8894191, - 44.7218261 - ], - [ - -123.8895709, - 44.7195205 - ], - [ - -123.8895926, - 44.7194205 - ], - [ - -123.89037, - 44.7172919 - ], - [ - -123.8917327, - 44.7153185 - ], - [ - -123.8936248, - 44.7135812 - ], - [ - -123.8959687, - 44.7121512 - ], - [ - -123.8986684, - 44.711087 - ], - [ - -123.8987821, - 44.7110524 - ], - [ - -123.8995305, - 44.7108942 - ], - [ - -123.9008824, - 44.7104152 - ], - [ - -123.9016802, - 44.7102073 - ], - [ - -123.9036175, - 44.7098038 - ], - [ - -123.9038835, - 44.7097618 - ], - [ - -123.9051456, - 44.7096019 - ], - [ - -123.9053436, - 44.7095829 - ], - [ - -123.907998, - 44.7094949 - ], - [ - -123.9082039, - 44.7095009 - ], - [ - -123.9096371, - 44.7096239 - ], - [ - -123.9101314, - 44.7096092 - ], - [ - -123.9120216, - 44.7098006 - ], - [ - -123.9122246, - 44.7097236 - ], - [ - -123.9150844, - 44.7091089 - ], - [ - -123.9180574, - 44.7089039 - ], - [ - -123.9210293, - 44.7091163 - ], - [ - -123.9238861, - 44.709738 - ], - [ - -123.926518, - 44.7107451 - ], - [ - -123.9288239, - 44.712099 - ], - [ - -123.9307152, - 44.7137476 - ], - [ - -123.9321192, - 44.7156276 - ], - [ - -123.9329819, - 44.7176668 - ], - [ - -123.9332702, - 44.7197868 - ], - [ - -123.9332695, - 44.7200945 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22287_s_22287", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -123.9027457, - 44.7198905 - ], - [ - -123.9030056, - 44.7177686 - ], - [ - -123.9038409, - 44.7157236 - ], - [ - -123.9052197, - 44.7138341 - ], - [ - -123.9070889, - 44.7121727 - ], - [ - -123.9093766, - 44.7108032 - ], - [ - -123.9119949, - 44.7097782 - ], - [ - -123.9148433, - 44.7091371 - ], - [ - -123.9178122, - 44.7089045 - ], - [ - -123.9207878, - 44.7090894 - ], - [ - -123.9236557, - 44.7096845 - ], - [ - -123.9263058, - 44.7106672 - ], - [ - -123.9286361, - 44.7119996 - ], - [ - -123.9305573, - 44.7136305 - ], - [ - -123.9319955, - 44.7154973 - ], - [ - -123.9328953, - 44.7175283 - ], - [ - -123.9332222, - 44.7196455 - ], - [ - -123.9329634, - 44.7217674 - ], - [ - -123.932129, - 44.7238126 - ], - [ - -123.9307509, - 44.7257024 - ], - [ - -123.928882, - 44.7273642 - ], - [ - -123.9265941, - 44.7287341 - ], - [ - -123.9239752, - 44.7297594 - ], - [ - -123.9211259, - 44.7304008 - ], - [ - -123.9181559, - 44.7306335 - ], - [ - -123.9151792, - 44.7304486 - ], - [ - -123.9123103, - 44.7298532 - ], - [ - -123.9096596, - 44.7288702 - ], - [ - -123.907329, - 44.7275375 - ], - [ - -123.905408, - 44.7259061 - ], - [ - -123.9039704, - 44.724039 - ], - [ - -123.9030715, - 44.7220077 - ], - [ - -123.9027457, - 44.7198905 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_22289_s_2456757", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0894051, - 44.4256859 - ], - [ - -124.089019, - 44.4260355 - ], - [ - -124.088384, - 44.4265755 - ], - [ - -124.0873879, - 44.4273441 - ], - [ - -124.0869239, - 44.4276692 - ], - [ - -124.0862835, - 44.4280927 - ], - [ - -124.085858, - 44.4283583 - ], - [ - -124.0845515, - 44.4292073 - ], - [ - -124.0838723, - 44.4296232 - ], - [ - -124.0831542, - 44.4300372 - ], - [ - -124.0826715, - 44.4303043 - ], - [ - -124.0823443, - 44.4304779 - ], - [ - -124.0822982, - 44.4305156 - ], - [ - -124.081738, - 44.4309495 - ], - [ - -124.081378, - 44.4312136 - ], - [ - -124.0800804, - 44.4320603 - ], - [ - -124.0797487, - 44.4324796 - ], - [ - -124.0778064, - 44.434092 - ], - [ - -124.0754623, - 44.435402 - ], - [ - -124.0728064, - 44.436359 - ], - [ - -124.0699409, - 44.4369263 - ], - [ - -124.066976, - 44.4370821 - ], - [ - -124.0640256, - 44.4368205 - ], - [ - -124.0612033, - 44.4361514 - ], - [ - -124.0586174, - 44.4351005 - ], - [ - -124.0563674, - 44.4337084 - ], - [ - -124.0545399, - 44.4320285 - ], - [ - -124.0532049, - 44.4301253 - ], - [ - -124.0524139, - 44.4280721 - ], - [ - -124.052197, - 44.4259478 - ], - [ - -124.0525626, - 44.423834 - ], - [ - -124.0526972, - 44.4234059 - ], - [ - -124.0531899, - 44.4221791 - ], - [ - -124.053341, - 44.4218721 - ], - [ - -124.0539387, - 44.4208324 - ], - [ - -124.0541358, - 44.4205344 - ], - [ - -124.0554464, - 44.4189254 - ], - [ - -124.0558115, - 44.4185544 - ], - [ - -124.056905, - 44.4175696 - ], - [ - -124.057161, - 44.4173646 - ], - [ - -124.0585304, - 44.416399 - ], - [ - -124.0589024, - 44.416168 - ], - [ - -124.0605452, - 44.4152803 - ], - [ - -124.0608325, - 44.415146 - ], - [ - -124.0609584, - 44.4150559 - ], - [ - -124.0609688, - 44.4147789 - ], - [ - -124.0616269, - 44.4127018 - ], - [ - -124.0628376, - 44.4107566 - ], - [ - -124.0645544, - 44.4090181 - ], - [ - -124.0667113, - 44.407553 - ], - [ - -124.0674542, - 44.4072175 - ], - [ - -124.0676466, - 44.4071181 - ], - [ - -124.0678293, - 44.4070481 - ], - [ - -124.0692253, - 44.4064176 - ], - [ - -124.0701107, - 44.4061745 - ], - [ - -124.0712221, - 44.4057489 - ], - [ - -124.071428, - 44.4056939 - ], - [ - -124.0744119, - 44.4051371 - ], - [ - -124.0767485, - 44.4050518 - ], - [ - -124.0792314, - 44.4047386 - ], - [ - -124.081904, - 44.4047431 - ], - [ - -124.082211, - 44.4047631 - ], - [ - -124.0833236, - 44.4048655 - ], - [ - -124.0837685, - 44.4049185 - ], - [ - -124.0865361, - 44.4054446 - ], - [ - -124.0891163, - 44.4063343 - ], - [ - -124.0914171, - 44.407556 - ], - [ - -124.0933565, - 44.409066 - ], - [ - -124.0948653, - 44.4108105 - ], - [ - -124.0958895, - 44.4127272 - ], - [ - -124.0963926, - 44.4147478 - ], - [ - -124.0963566, - 44.4168001 - ], - [ - -124.0957827, - 44.418811 - ], - [ - -124.0946914, - 44.4207087 - ], - [ - -124.0931215, - 44.4224253 - ], - [ - -124.0926425, - 44.4228544 - ], - [ - -124.0925013, - 44.422979 - ], - [ - -124.0922552, - 44.4231929 - ], - [ - -124.0916887, - 44.4236945 - ], - [ - -124.0916108, - 44.4237628 - ], - [ - -124.0907449, - 44.4245169 - ], - [ - -124.0906009, - 44.4246404 - ], - [ - -124.0900926, - 44.4250699 - ], - [ - -124.0897748, - 44.4253603 - ], - [ - -124.0895063, - 44.4255986 - ], - [ - -124.0894051, - 44.4256859 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_29681_s_16032", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682551, - 44.6448045 - ], - [ - -124.0682469, - 44.6455823 - ], - [ - -124.0682795, - 44.6481911 - ], - [ - -124.0682799, - 44.6482236 - ], - [ - -124.0683077, - 44.6515786 - ], - [ - -124.0680329, - 44.6536994 - ], - [ - -124.0671836, - 44.6557413 - ], - [ - -124.0657925, - 44.6576256 - ], - [ - -124.063913, - 44.65928 - ], - [ - -124.0616172, - 44.6606408 - ], - [ - -124.0589936, - 44.6616558 - ], - [ - -124.0561428, - 44.6622859 - ], - [ - -124.0531745, - 44.6625069 - ], - [ - -124.0502028, - 44.6623103 - ], - [ - -124.0473421, - 44.6617036 - ], - [ - -124.0447022, - 44.6607102 - ], - [ - -124.0423847, - 44.6593683 - ], - [ - -124.0404786, - 44.6577294 - ], - [ - -124.0390573, - 44.6558566 - ], - [ - -124.0381752, - 44.6538219 - ], - [ - -124.0378662, - 44.6517034 - ], - [ - -124.0378402, - 44.6483646 - ], - [ - -124.0378081, - 44.6456828 - ], - [ - -124.037808, - 44.6455045 - ], - [ - -124.0378482, - 44.6418566 - ], - [ - -124.0381647, - 44.6397363 - ], - [ - -124.039055, - 44.6377009 - ], - [ - -124.0404849, - 44.6358289 - ], - [ - -124.0423992, - 44.6341923 - ], - [ - -124.0447241, - 44.6328541 - ], - [ - -124.0473702, - 44.6318659 - ], - [ - -124.0502356, - 44.6312657 - ], - [ - -124.0532099, - 44.6310765 - ], - [ - -124.0537819, - 44.6310804 - ], - [ - -124.0567474, - 44.6313091 - ], - [ - -124.0595936, - 44.6319465 - ], - [ - -124.0622109, - 44.632968 - ], - [ - -124.064499, - 44.6343345 - ], - [ - -124.0663699, - 44.6359934 - ], - [ - -124.0677517, - 44.6378811 - ], - [ - -124.0685912, - 44.6399249 - ], - [ - -124.0688562, - 44.6420464 - ], - [ - -124.0685363, - 44.6441641 - ], - [ - -124.0682551, - 44.6448045 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_29681_s_16194", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682997, - 44.6425106 - ], - [ - -124.0682996, - 44.6425858 - ], - [ - -124.0682981, - 44.6427347 - ], - [ - -124.0682444, - 44.645429 - ], - [ - -124.0682795, - 44.6481893 - ], - [ - -124.0682788, - 44.6484317 - ], - [ - -124.0682449, - 44.650263 - ], - [ - -124.0684006, - 44.6510493 - ], - [ - -124.0682339, - 44.6531759 - ], - [ - -124.0674891, - 44.6552384 - ], - [ - -124.0661948, - 44.6571575 - ], - [ - -124.0644008, - 44.6588596 - ], - [ - -124.0621759, - 44.6602791 - ], - [ - -124.0596056, - 44.6613614 - ], - [ - -124.0567888, - 44.662065 - ], - [ - -124.0538338, - 44.6623629 - ], - [ - -124.0536399, - 44.6623687 - ], - [ - -124.0505559, - 44.6622374 - ], - [ - -124.0475726, - 44.6616644 - ], - [ - -124.0448129, - 44.6606733 - ], - [ - -124.0423905, - 44.6593049 - ], - [ - -124.0404051, - 44.6576155 - ], - [ - -124.0389387, - 44.6556749 - ], - [ - -124.0380514, - 44.6535629 - ], - [ - -124.0377798, - 44.6513665 - ], - [ - -124.0378389, - 44.6482615 - ], - [ - -124.0378052, - 44.6454957 - ], - [ - -124.0378062, - 44.6452423 - ], - [ - -124.0378624, - 44.6424957 - ], - [ - -124.037867, - 44.6388654 - ], - [ - -124.0378681, - 44.6387428 - ], - [ - -124.0379082, - 44.6363972 - ], - [ - -124.0382417, - 44.6342637 - ], - [ - -124.039156, - 44.6322186 - ], - [ - -124.0406156, - 44.6303419 - ], - [ - -124.0425633, - 44.6287066 - ], - [ - -124.0449232, - 44.6273767 - ], - [ - -124.047603, - 44.626404 - ], - [ - -124.0504983, - 44.6258265 - ], - [ - -124.053496, - 44.6256668 - ], - [ - -124.05432, - 44.6256811 - ], - [ - -124.054977, - 44.6256792 - ], - [ - -124.0550416, - 44.6256791 - ], - [ - -124.0555941, - 44.6256791 - ], - [ - -124.0585623, - 44.6258878 - ], - [ - -124.0614164, - 44.626506 - ], - [ - -124.0640469, - 44.6275098 - ], - [ - -124.0663528, - 44.6288608 - ], - [ - -124.0682453, - 44.6305071 - ], - [ - -124.0696518, - 44.6323854 - ], - [ - -124.0705182, - 44.6344235 - ], - [ - -124.0708112, - 44.6365431 - ], - [ - -124.0705193, - 44.6386628 - ], - [ - -124.0696539, - 44.6407011 - ], - [ - -124.0682997, - 44.6425106 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_29681_s_16196", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682301, - 44.6529113 - ], - [ - -124.0682303, - 44.6529344 - ], - [ - -124.0682293, - 44.6531474 - ], - [ - -124.0682275, - 44.6535001 - ], - [ - -124.0682275, - 44.653529 - ], - [ - -124.0682274, - 44.6535609 - ], - [ - -124.0682238, - 44.6545015 - ], - [ - -124.068226, - 44.6549833 - ], - [ - -124.0682329, - 44.655109 - ], - [ - -124.0682568, - 44.6553272 - ], - [ - -124.0683942, - 44.6563034 - ], - [ - -124.0684059, - 44.6563643 - ], - [ - -124.0684534, - 44.6565696 - ], - [ - -124.0685439, - 44.6569424 - ], - [ - -124.0686593, - 44.6572378 - ], - [ - -124.0687396, - 44.6574519 - ], - [ - -124.0688089, - 44.6576445 - ], - [ - -124.0694, - 44.6590244 - ], - [ - -124.0699887, - 44.6611125 - ], - [ - -124.0699952, - 44.6632424 - ], - [ - -124.0694194, - 44.6653323 - ], - [ - -124.0682833, - 44.6673019 - ], - [ - -124.0666305, - 44.6690754 - ], - [ - -124.0645245, - 44.6705847 - ], - [ - -124.0620463, - 44.6717718 - ], - [ - -124.059291, - 44.672591 - ], - [ - -124.0563646, - 44.6730108 - ], - [ - -124.0533797, - 44.6730151 - ], - [ - -124.0504509, - 44.6726037 - ], - [ - -124.047691, - 44.6717925 - ], - [ - -124.0452061, - 44.6706126 - ], - [ - -124.0430915, - 44.6691093 - ], - [ - -124.0414287, - 44.6673406 - ], - [ - -124.0402814, - 44.6653743 - ], - [ - -124.0395903, - 44.6637589 - ], - [ - -124.0394039, - 44.6632852 - ], - [ - -124.0392876, - 44.6629616 - ], - [ - -124.0390094, - 44.6622483 - ], - [ - -124.0386748, - 44.6611871 - ], - [ - -124.038444, - 44.6602351 - ], - [ - -124.0384238, - 44.6601497 - ], - [ - -124.0383319, - 44.6597517 - ], - [ - -124.0382685, - 44.6594511 - ], - [ - -124.0381916, - 44.6590481 - ], - [ - -124.0381281, - 44.6586644 - ], - [ - -124.0379475, - 44.6573763 - ], - [ - -124.0379176, - 44.657137 - ], - [ - -124.0378578, - 44.656588 - ], - [ - -124.0378233, - 44.6561654 - ], - [ - -124.0377944, - 44.6556334 - ], - [ - -124.0377831, - 44.6552438 - ], - [ - -124.0377803, - 44.6545348 - ], - [ - -124.0377803, - 44.6544717 - ], - [ - -124.0377845, - 44.6534487 - ], - [ - -124.0377846, - 44.6534368 - ], - [ - -124.0377867, - 44.6530717 - ], - [ - -124.0377873, - 44.6529412 - ], - [ - -124.0377827, - 44.6526418 - ], - [ - -124.0377824, - 44.6526257 - ], - [ - -124.0377795, - 44.6524077 - ], - [ - -124.0377789, - 44.652254 - ], - [ - -124.0377831, - 44.651594 - ], - [ - -124.0377832, - 44.6515813 - ], - [ - -124.0377842, - 44.6514513 - ], - [ - -124.0380915, - 44.6493402 - ], - [ - -124.0389677, - 44.6473119 - ], - [ - -124.0403796, - 44.645444 - ], - [ - -124.0422732, - 44.6438077 - ], - [ - -124.0445761, - 44.6424653 - ], - [ - -124.0472005, - 44.6414681 - ], - [ - -124.0500464, - 44.6408542 - ], - [ - -124.053005, - 44.6406469 - ], - [ - -124.053202, - 44.6406469 - ], - [ - -124.0561709, - 44.6408557 - ], - [ - -124.0590258, - 44.6414738 - ], - [ - -124.061657, - 44.6424777 - ], - [ - -124.0639634, - 44.6438287 - ], - [ - -124.0658565, - 44.645475 - ], - [ - -124.0672633, - 44.6473533 - ], - [ - -124.06813, - 44.6493913 - ], - [ - -124.068423, - 44.651511 - ], - [ - -124.0682301, - 44.6529113 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_29681_s_29681", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0379761, - 44.6515454 - ], - [ - -124.0382307, - 44.6494232 - ], - [ - -124.0390604, - 44.6473773 - ], - [ - -124.0404332, - 44.6454862 - ], - [ - -124.0422962, - 44.6438226 - ], - [ - -124.044578, - 44.6424505 - ], - [ - -124.0471909, - 44.6414224 - ], - [ - -124.0500343, - 44.640778 - ], - [ - -124.0529992, - 44.6405419 - ], - [ - -124.0559717, - 44.6407232 - ], - [ - -124.0588375, - 44.641315 - ], - [ - -124.0614866, - 44.6422946 - ], - [ - -124.0638173, - 44.6436242 - ], - [ - -124.06574, - 44.6452529 - ], - [ - -124.0671807, - 44.647118 - ], - [ - -124.0680841, - 44.6491479 - ], - [ - -124.0684155, - 44.6512647 - ], - [ - -124.0681619, - 44.6533869 - ], - [ - -124.0673332, - 44.655433 - ], - [ - -124.0659611, - 44.6573244 - ], - [ - -124.0640982, - 44.6589884 - ], - [ - -124.0618163, - 44.6603609 - ], - [ - -124.0592029, - 44.6613893 - ], - [ - -124.0563585, - 44.662034 - ], - [ - -124.0533925, - 44.6622702 - ], - [ - -124.050419, - 44.6620888 - ], - [ - -124.0475522, - 44.6614968 - ], - [ - -124.0449024, - 44.6605169 - ], - [ - -124.0425715, - 44.6591869 - ], - [ - -124.040649, - 44.6575579 - ], - [ - -124.0392089, - 44.6556924 - ], - [ - -124.0383063, - 44.6536622 - ], - [ - -124.0379761, - 44.6515454 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759417_s_16097", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0295173, - 44.9731164 - ], - [ - -124.0281266, - 44.9767284 - ], - [ - -124.0279545, - 44.9771427 - ], - [ - -124.0276516, - 44.9778218 - ], - [ - -124.0272591, - 44.9785981 - ], - [ - -124.0260345, - 44.9807583 - ], - [ - -124.0246469, - 44.9826467 - ], - [ - -124.0227667, - 44.9843067 - ], - [ - -124.0204662, - 44.9856744 - ], - [ - -124.0178338, - 44.9866973 - ], - [ - -124.0149707, - 44.987336 - ], - [ - -124.011987, - 44.987566 - ], - [ - -124.0089974, - 44.9873784 - ], - [ - -124.0061169, - 44.9867804 - ], - [ - -124.0034562, - 44.9857951 - ], - [ - -124.0011177, - 44.9844603 - ], - [ - -123.9991911, - 44.9828273 - ], - [ - -123.9977505, - 44.9809589 - ], - [ - -123.9968512, - 44.978927 - ], - [ - -123.9965278, - 44.9768095 - ], - [ - -123.9967926, - 44.974688 - ], - [ - -123.9976354, - 44.972644 - ], - [ - -123.9986437, - 44.9708669 - ], - [ - -123.9986792, - 44.9707873 - ], - [ - -124.0006962, - 44.965556 - ], - [ - -124.0015382, - 44.9639077 - ], - [ - -124.0018163, - 44.9634757 - ], - [ - -124.0028296, - 44.9621527 - ], - [ - -124.0030747, - 44.9618797 - ], - [ - -124.0047842, - 44.9603118 - ], - [ - -124.0057802, - 44.9595529 - ], - [ - -124.0080305, - 44.9581445 - ], - [ - -124.0106243, - 44.9570748 - ], - [ - -124.0134622, - 44.9563849 - ], - [ - -124.0164351, - 44.9561013 - ], - [ - -124.0194288, - 44.9562348 - ], - [ - -124.0223284, - 44.9567804 - ], - [ - -124.0250223, - 44.9577171 - ], - [ - -124.0274073, - 44.9590089 - ], - [ - -124.0293916, - 44.9606062 - ], - [ - -124.0308989, - 44.9624476 - ], - [ - -124.0318714, - 44.9644624 - ], - [ - -124.0322716, - 44.9665732 - ], - [ - -124.032084, - 44.9686989 - ], - [ - -124.0313158, - 44.9707577 - ], - [ - -124.0299965, - 44.9726706 - ], - [ - -124.0295173, - 44.9731164 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759418_s_759420", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0355671, - 44.9288629 - ], - [ - -124.0364272, - 44.9298805 - ], - [ - -124.0367143, - 44.9302665 - ], - [ - -124.0378227, - 44.9321776 - ], - [ - -124.0381099, - 44.9328475 - ], - [ - -124.0386684, - 44.9347436 - ], - [ - -124.0387646, - 44.9353246 - ], - [ - -124.0387326, - 44.9380416 - ], - [ - -124.0386078, - 44.9387006 - ], - [ - -124.0378602, - 44.9408922 - ], - [ - -124.0376013, - 44.9414092 - ], - [ - -124.0365657, - 44.9430384 - ], - [ - -124.0359589, - 44.9438155 - ], - [ - -124.0351249, - 44.9447646 - ], - [ - -124.0345399, - 44.9453597 - ], - [ - -124.0325686, - 44.946993 - ], - [ - -124.0301828, - 44.9483184 - ], - [ - -124.0274758, - 44.9492839 - ], - [ - -124.024554, - 44.9498517 - ], - [ - -124.0215318, - 44.9499995 - ], - [ - -124.0185279, - 44.9497215 - ], - [ - -124.0156601, - 44.9490286 - ], - [ - -124.0130408, - 44.947948 - ], - [ - -124.0127421, - 44.9477948 - ], - [ - -124.0122846, - 44.9476074 - ], - [ - -124.010649, - 44.9470694 - ], - [ - -124.0082259, - 44.9458143 - ], - [ - -124.0061943, - 44.9442476 - ], - [ - -124.0046322, - 44.9424295 - ], - [ - -124.0035997, - 44.9404299 - ], - [ - -124.0031363, - 44.9383257 - ], - [ - -124.0032598, - 44.9361977 - ], - [ - -124.0039654, - 44.9341276 - ], - [ - -124.0052259, - 44.9321951 - ], - [ - -124.0069929, - 44.9304744 - ], - [ - -124.0080463, - 44.9297853 - ], - [ - -124.0092986, - 44.9280968 - ], - [ - -124.0111867, - 44.9264423 - ], - [ - -124.0134927, - 44.9250813 - ], - [ - -124.0161281, - 44.924066 - ], - [ - -124.0189916, - 44.9234353 - ], - [ - -124.0219732, - 44.9232136 - ], - [ - -124.0249584, - 44.9234093 - ], - [ - -124.0278325, - 44.924015 - ], - [ - -124.0304852, - 44.9250073 - ], - [ - -124.0328146, - 44.9263481 - ], - [ - -124.034731, - 44.927986 - ], - [ - -124.0355671, - 44.9288629 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759419_s_16094", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0287633, - 44.9585995 - ], - [ - -124.0281428, - 44.9608229 - ], - [ - -124.026886, - 44.9629065 - ], - [ - -124.0250474, - 44.9647595 - ], - [ - -124.0227072, - 44.9663014 - ], - [ - -124.0199671, - 44.967465 - ], - [ - -124.0169465, - 44.9681995 - ], - [ - -124.0150258, - 44.9683653 - ], - [ - -124.0132021, - 44.9687355 - ], - [ - -124.0102119, - 44.9689101 - ], - [ - -124.0072313, - 44.9686673 - ], - [ - -124.0043746, - 44.9680162 - ], - [ - -124.0017519, - 44.966982 - ], - [ - -123.9994639, - 44.9656044 - ], - [ - -123.9975985, - 44.9639363 - ], - [ - -123.9962275, - 44.9620419 - ], - [ - -123.9954035, - 44.959994 - ], - [ - -123.9951581, - 44.9578713 - ], - [ - -123.9955006, - 44.9557554 - ], - [ - -123.9964179, - 44.9537276 - ], - [ - -123.9978746, - 44.9518658 - ], - [ - -123.9998147, - 44.9502416 - ], - [ - -124.0008831, - 44.9496392 - ], - [ - -124.0019229, - 44.9485179 - ], - [ - -124.0040292, - 44.9470018 - ], - [ - -124.0065115, - 44.9458066 - ], - [ - -124.0092744, - 44.9449781 - ], - [ - -124.0122117, - 44.9445483 - ], - [ - -124.0152107, - 44.9445337 - ], - [ - -124.018156, - 44.9449347 - ], - [ - -124.0209347, - 44.9457361 - ], - [ - -124.0234399, - 44.9469069 - ], - [ - -124.0255755, - 44.9484023 - ], - [ - -124.0272593, - 44.9501649 - ], - [ - -124.0284266, - 44.9521268 - ], - [ - -124.0290325, - 44.9542127 - ], - [ - -124.0290537, - 44.9563424 - ], - [ - -124.0287633, - 44.9585995 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759420_s_16092", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0331279, - 44.9405268 - ], - [ - -124.0330569, - 44.9410205 - ], - [ - -124.032985, - 44.9412986 - ], - [ - -124.0324095, - 44.9427947 - ], - [ - -124.0323365, - 44.9430432 - ], - [ - -124.0323372, - 44.9437785 - ], - [ - -124.0317541, - 44.9458677 - ], - [ - -124.0306083, - 44.9478359 - ], - [ - -124.0289437, - 44.9496076 - ], - [ - -124.0268242, - 44.9511145 - ], - [ - -124.0243313, - 44.9522989 - ], - [ - -124.0215609, - 44.9531151 - ], - [ - -124.0186194, - 44.9535317 - ], - [ - -124.0156199, - 44.9535328 - ], - [ - -124.0126778, - 44.9531182 - ], - [ - -124.0099062, - 44.952304 - ], - [ - -124.0074117, - 44.9511215 - ], - [ - -124.00529, - 44.949616 - ], - [ - -124.0036229, - 44.9478455 - ], - [ - -124.0035159, - 44.9477035 - ], - [ - -124.0024715, - 44.9459702 - ], - [ - -124.0018648, - 44.9441348 - ], - [ - -124.0017729, - 44.9436837 - ], - [ - -124.0016808, - 44.9411238 - ], - [ - -124.001817, - 44.9406715 - ], - [ - -124.001724, - 44.9395141 - ], - [ - -124.0021754, - 44.9373352 - ], - [ - -124.0032361, - 44.9352657 - ], - [ - -124.0033645, - 44.9351177 - ], - [ - -124.0036644, - 44.9343378 - ], - [ - -124.0037354, - 44.9341988 - ], - [ - -124.0053098, - 44.9319616 - ], - [ - -124.0075626, - 44.9300394 - ], - [ - -124.0078566, - 44.9298404 - ], - [ - -124.0102196, - 44.9285295 - ], - [ - -124.0128971, - 44.9275711 - ], - [ - -124.0157862, - 44.9270022 - ], - [ - -124.0187761, - 44.9268446 - ], - [ - -124.0217518, - 44.9271042 - ], - [ - -124.0245991, - 44.9277712 - ], - [ - -124.0272085, - 44.92882 - ], - [ - -124.02948, - 44.9302102 - ], - [ - -124.0313261, - 44.9318884 - ], - [ - -124.0326759, - 44.9337902 - ], - [ - -124.0334776, - 44.9358425 - ], - [ - -124.0337001, - 44.9379664 - ], - [ - -124.033335, - 44.9400804 - ], - [ - -124.0331279, - 44.9405268 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759421_s_16079", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0066822, - 44.9860388 - ], - [ - -124.0071379, - 44.985936 - ], - [ - -124.0101204, - 44.9856988 - ], - [ - -124.0131107, - 44.9858791 - ], - [ - -124.0159941, - 44.9864699 - ], - [ - -124.0186598, - 44.9874484 - ], - [ - -124.0210054, - 44.9887772 - ], - [ - -124.0229407, - 44.9904051 - ], - [ - -124.0243913, - 44.9922696 - ], - [ - -124.0253016, - 44.9942991 - ], - [ - -124.0256364, - 44.9964156 - ], - [ - -124.0253828, - 44.9985378 - ], - [ - -124.0252809, - 44.998929 - ], - [ - -124.0245477, - 45.0007941 - ], - [ - -124.0233595, - 45.0025373 - ], - [ - -124.0232278, - 45.0026933 - ], - [ - -124.0214824, - 45.004371 - ], - [ - -124.0193172, - 45.0057812 - ], - [ - -124.0179396, - 45.0065189 - ], - [ - -124.0177256, - 45.0066314 - ], - [ - -124.0173447, - 45.0068281 - ], - [ - -124.0158263, - 45.0075189 - ], - [ - -124.0155626, - 45.0076238 - ], - [ - -124.0140157, - 45.0081608 - ], - [ - -124.0137, - 45.0082551 - ], - [ - -124.010344, - 45.0089509 - ], - [ - -124.0099469, - 45.0089993 - ], - [ - -124.006991, - 45.0091526 - ], - [ - -124.0066817, - 45.0091474 - ], - [ - -124.0051738, - 45.0090688 - ], - [ - -124.0032944, - 45.0089044 - ], - [ - -124.0003846, - 45.0084423 - ], - [ - -123.9976563, - 45.0075889 - ], - [ - -123.9952129, - 45.0063766 - ], - [ - -123.993147, - 45.0048513 - ], - [ - -123.991537, - 45.003071 - ], - [ - -123.9904438, - 45.001103 - ], - [ - -123.9899089, - 44.9990221 - ], - [ - -123.9899525, - 44.9969071 - ], - [ - -123.990156, - 44.9956247 - ], - [ - -123.9907825, - 44.9935418 - ], - [ - -123.9919697, - 44.9915857 - ], - [ - -123.9936717, - 44.9898314 - ], - [ - -123.9958232, - 44.9883465 - ], - [ - -123.9983415, - 44.9871878 - ], - [ - -124.0011299, - 44.9864001 - ], - [ - -124.0040812, - 44.9860134 - ], - [ - -124.0066822, - 44.9860388 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759422_s_759423", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0312721, - 44.959007 - ], - [ - -124.0313168, - 44.9590474 - ], - [ - -124.0327119, - 44.9610337 - ], - [ - -124.0335093, - 44.9631799 - ], - [ - -124.0336758, - 44.9653963 - ], - [ - -124.0332043, - 44.9675905 - ], - [ - -124.033088, - 44.9679087 - ], - [ - -124.0323666, - 44.969418 - ], - [ - -124.0322193, - 44.969665 - ], - [ - -124.0307842, - 44.9715353 - ], - [ - -124.0288625, - 44.973171 - ], - [ - -124.0265281, - 44.9745091 - ], - [ - -124.0238707, - 44.9754981 - ], - [ - -124.0209924, - 44.9761001 - ], - [ - -124.018004, - 44.9762919 - ], - [ - -124.0150203, - 44.9760661 - ], - [ - -124.012156, - 44.9754314 - ], - [ - -124.0095213, - 44.9744122 - ], - [ - -124.0072174, - 44.9730477 - ], - [ - -124.005333, - 44.9713903 - ], - [ - -124.0048773, - 44.9707731 - ], - [ - -124.0048214, - 44.9707231 - ], - [ - -124.004343, - 44.9700494 - ], - [ - -124.0039403, - 44.9695038 - ], - [ - -124.0039187, - 44.9694518 - ], - [ - -124.0034199, - 44.9687492 - ], - [ - -124.0031844, - 44.9681283 - ], - [ - -124.0018441, - 44.9666536 - ], - [ - -124.0007768, - 44.9648031 - ], - [ - -124.0002053, - 44.962845 - ], - [ - -124.0001489, - 44.9608458 - ], - [ - -124.0006096, - 44.958873 - ], - [ - -124.000856, - 44.9583917 - ], - [ - -124.0014941, - 44.9569191 - ], - [ - -124.0029183, - 44.9550446 - ], - [ - -124.0048302, - 44.9534035 - ], - [ - -124.0071561, - 44.9520587 - ], - [ - -124.0098067, - 44.9510619 - ], - [ - -124.0126801, - 44.9504513 - ], - [ - -124.015666, - 44.9502505 - ], - [ - -124.0186498, - 44.9504671 - ], - [ - -124.0215167, - 44.9510929 - ], - [ - -124.0241568, - 44.9521037 - ], - [ - -124.0264685, - 44.9534608 - ], - [ - -124.028363, - 44.955112 - ], - [ - -124.0296767, - 44.9568721 - ], - [ - -124.029956, - 44.9571232 - ], - [ - -124.0303411, - 44.9575742 - ], - [ - -124.0312721, - 44.959007 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759423_s_16185", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0292521, - 44.9532983 - ], - [ - -124.0292615, - 44.9535226 - ], - [ - -124.0292547, - 44.9544286 - ], - [ - -124.029188, - 44.9553859 - ], - [ - -124.0291034, - 44.9560265 - ], - [ - -124.0298998, - 44.957165 - ], - [ - -124.03068, - 44.9591778 - ], - [ - -124.0309036, - 44.9612593 - ], - [ - -124.0309016, - 44.9613293 - ], - [ - -124.0305476, - 44.9634443 - ], - [ - -124.0296193, - 44.9654695 - ], - [ - -124.0281521, - 44.9673273 - ], - [ - -124.0262024, - 44.9689461 - ], - [ - -124.0238453, - 44.9702638 - ], - [ - -124.0211712, - 44.9712296 - ], - [ - -124.0182829, - 44.9718065 - ], - [ - -124.0152916, - 44.9719723 - ], - [ - -124.0133707, - 44.97181 - ], - [ - -124.0123129, - 44.9717577 - ], - [ - -124.0094583, - 44.971212 - ], - [ - -124.0068048, - 44.9702869 - ], - [ - -124.0044515, - 44.969017 - ], - [ - -124.0024861, - 44.9674495 - ], - [ - -124.0020531, - 44.9670284 - ], - [ - -124.0002279, - 44.9646985 - ], - [ - -123.9996681, - 44.9637164 - ], - [ - -123.9990616, - 44.9624251 - ], - [ - -123.9988148, - 44.9617641 - ], - [ - -123.9983713, - 44.959999 - ], - [ - -123.9982794, - 44.959307 - ], - [ - -123.998213, - 44.9581606 - ], - [ - -123.9982242, - 44.9574836 - ], - [ - -123.9982906, - 44.956592 - ], - [ - -123.9986571, - 44.9538297 - ], - [ - -123.9986575, - 44.9537847 - ], - [ - -123.9985106, - 44.9521703 - ], - [ - -123.9984965, - 44.9509476 - ], - [ - -123.9985387, - 44.9503256 - ], - [ - -123.9990778, - 44.9479436 - ], - [ - -123.9992649, - 44.9474646 - ], - [ - -124.0001555, - 44.9457561 - ], - [ - -124.0003556, - 44.9454531 - ], - [ - -124.0009706, - 44.9446179 - ], - [ - -124.0031191, - 44.9419852 - ], - [ - -124.0036043, - 44.9414297 - ], - [ - -124.0045674, - 44.9403978 - ], - [ - -124.0051551, - 44.9398113 - ], - [ - -124.0073683, - 44.9377506 - ], - [ - -124.0076362, - 44.9375083 - ], - [ - -124.0090033, - 44.9363075 - ], - [ - -124.0090393, - 44.9363282 - ], - [ - -124.0101641, - 44.9353416 - ], - [ - -124.0124694, - 44.9339797 - ], - [ - -124.0151044, - 44.9329633 - ], - [ - -124.0179678, - 44.9323316 - ], - [ - -124.0209497, - 44.9321087 - ], - [ - -124.0239355, - 44.9323032 - ], - [ - -124.0268106, - 44.9329077 - ], - [ - -124.0294645, - 44.933899 - ], - [ - -124.0317952, - 44.9352389 - ], - [ - -124.0337133, - 44.936876 - ], - [ - -124.0351449, - 44.9387474 - ], - [ - -124.0360351, - 44.9407812 - ], - [ - -124.0363495, - 44.9428993 - ], - [ - -124.0360761, - 44.9450203 - ], - [ - -124.0352252, - 44.9470626 - ], - [ - -124.0338296, - 44.9489477 - ], - [ - -124.0336766, - 44.9491128 - ], - [ - -124.0327975, - 44.9499673 - ], - [ - -124.031567, - 44.9510486 - ], - [ - -124.0297931, - 44.9527009 - ], - [ - -124.0293647, - 44.9531602 - ], - [ - -124.0292521, - 44.9532983 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759423_s_759423", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0003184, - 44.9612581 - ], - [ - -124.0005756, - 44.9591361 - ], - [ - -124.0014109, - 44.9570905 - ], - [ - -124.0027921, - 44.9551999 - ], - [ - -124.0046661, - 44.9535369 - ], - [ - -124.0069609, - 44.9521654 - ], - [ - -124.0095883, - 44.9511382 - ], - [ - -124.0124474, - 44.9504945 - ], - [ - -124.0154284, - 44.9502593 - ], - [ - -124.0184167, - 44.9504415 - ], - [ - -124.0212976, - 44.951034 - ], - [ - -124.0239604, - 44.9520143 - ], - [ - -124.0263028, - 44.9533445 - ], - [ - -124.0282349, - 44.9549736 - ], - [ - -124.0296824, - 44.9568391 - ], - [ - -124.0305895, - 44.9588691 - ], - [ - -124.0309215, - 44.9609859 - ], - [ - -124.0306654, - 44.9631079 - ], - [ - -124.0298311, - 44.9651537 - ], - [ - -124.0284506, - 44.9670447 - ], - [ - -124.0265768, - 44.968708 - ], - [ - -124.0242818, - 44.9700799 - ], - [ - -124.0216538, - 44.9711075 - ], - [ - -124.0187938, - 44.9717513 - ], - [ - -124.0158117, - 44.9719867 - ], - [ - -124.0128223, - 44.9718045 - ], - [ - -124.0099405, - 44.9712117 - ], - [ - -124.007277, - 44.9702311 - ], - [ - -124.0049343, - 44.9689005 - ], - [ - -124.0030024, - 44.967271 - ], - [ - -124.0015555, - 44.9654052 - ], - [ - -124.0006493, - 44.9633749 - ], - [ - -124.0003184, - 44.9612581 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_759425_s_771261", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0088585, - 44.9485223 - ], - [ - -124.0095716, - 44.9485377 - ], - [ - -124.0102699, - 44.9483758 - ], - [ - -124.0131714, - 44.9481188 - ], - [ - -124.0160888, - 44.9482584 - ], - [ - -124.0189155, - 44.9487895 - ], - [ - -124.0215484, - 44.9496928 - ], - [ - -124.0238913, - 44.9509352 - ], - [ - -124.0258587, - 44.9524713 - ], - [ - -124.0273787, - 44.9542452 - ], - [ - -124.0283958, - 44.956192 - ], - [ - -124.0285262, - 44.956541 - ], - [ - -124.0288094, - 44.9571499 - ], - [ - -124.0294663, - 44.959228 - ], - [ - -124.0295395, - 44.9613572 - ], - [ - -124.0290262, - 44.9634556 - ], - [ - -124.0279461, - 44.9654426 - ], - [ - -124.0263407, - 44.9672418 - ], - [ - -124.0242715, - 44.9687841 - ], - [ - -124.0218182, - 44.9700101 - ], - [ - -124.0190749, - 44.9708727 - ], - [ - -124.0161473, - 44.9713388 - ], - [ - -124.0131477, - 44.9713904 - ], - [ - -124.0115317, - 44.9711909 - ], - [ - -124.0088935, - 44.9714207 - ], - [ - -124.0059555, - 44.9712731 - ], - [ - -124.0031118, - 44.9707286 - ], - [ - -124.0004677, - 44.9698075 - ], - [ - -123.9981213, - 44.9685439 - ], - [ - -123.9977539, - 44.9682519 - ], - [ - -123.9972886, - 44.9680479 - ], - [ - -123.9950922, - 44.9665957 - ], - [ - -123.9933373, - 44.964867 - ], - [ - -123.9920916, - 44.9629285 - ], - [ - -123.9914028, - 44.9608546 - ], - [ - -123.9912974, - 44.9587251 - ], - [ - -123.9917793, - 44.956622 - ], - [ - -123.9928301, - 44.9546262 - ], - [ - -123.992956, - 44.9544439 - ], - [ - -123.9945343, - 44.9526327 - ], - [ - -123.9965797, - 44.951075 - ], - [ - -123.9990138, - 44.9498305 - ], - [ - -124.0017428, - 44.948947 - ], - [ - -124.0046621, - 44.9484586 - ], - [ - -124.0076595, - 44.9483839 - ], - [ - -124.0088585, - 44.9485223 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_771261_s_759417", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.027278, - 44.95479 - ], - [ - -124.0277983, - 44.9551622 - ], - [ - -124.029986, - 44.9571399 - ], - [ - -124.030244, - 44.9574389 - ], - [ - -124.0315094, - 44.9592719 - ], - [ - -124.0316895, - 44.9596099 - ], - [ - -124.0325217, - 44.9618985 - ], - [ - -124.032812, - 44.9633234 - ], - [ - -124.0329264, - 44.9640624 - ], - [ - -124.0330217, - 44.9649594 - ], - [ - -124.0328223, - 44.9677029 - ], - [ - -124.0327454, - 44.9680059 - ], - [ - -124.0321073, - 44.9697113 - ], - [ - -124.0319404, - 44.9700454 - ], - [ - -124.0305131, - 44.9721502 - ], - [ - -124.0301801, - 44.9725302 - ], - [ - -124.0286749, - 44.9739685 - ], - [ - -124.0284679, - 44.9741355 - ], - [ - -124.0262747, - 44.9755891 - ], - [ - -124.0237241, - 44.9767109 - ], - [ - -124.020914, - 44.9774579 - ], - [ - -124.0179526, - 44.9778014 - ], - [ - -124.0149536, - 44.9777282 - ], - [ - -124.0120325, - 44.977241 - ], - [ - -124.0093014, - 44.9763586 - ], - [ - -124.0068655, - 44.9751149 - ], - [ - -124.0048183, - 44.9735578 - ], - [ - -124.0032385, - 44.9717471 - ], - [ - -124.0021869, - 44.9697524 - ], - [ - -124.0017036, - 44.9676504 - ], - [ - -124.0017463, - 44.9667741 - ], - [ - -124.001446, - 44.9664441 - ], - [ - -124.0000726, - 44.9645506 - ], - [ - -123.9992459, - 44.9625032 - ], - [ - -123.9989978, - 44.9603807 - ], - [ - -123.9993377, - 44.9582646 - ], - [ - -124.0002524, - 44.9562362 - ], - [ - -124.0017069, - 44.9543735 - ], - [ - -124.003645, - 44.952748 - ], - [ - -124.0059924, - 44.9514222 - ], - [ - -124.0086589, - 44.950447 - ], - [ - -124.011542, - 44.9498599 - ], - [ - -124.0145309, - 44.9496834 - ], - [ - -124.0175109, - 44.9499243 - ], - [ - -124.0203676, - 44.9505733 - ], - [ - -124.0229911, - 44.9516055 - ], - [ - -124.0252808, - 44.9529813 - ], - [ - -124.0271485, - 44.9546478 - ], - [ - -124.027278, - 44.95479 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_781958_s_16068", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0748897, - 44.6720436 - ], - [ - -124.0749906, - 44.6722821 - ], - [ - -124.0755134, - 44.6735719 - ], - [ - -124.0757329, - 44.6740695 - ], - [ - -124.0759955, - 44.6746357 - ], - [ - -124.0760852, - 44.6748357 - ], - [ - -124.0765514, - 44.6759107 - ], - [ - -124.076714, - 44.6763129 - ], - [ - -124.0768431, - 44.6766569 - ], - [ - -124.0769474, - 44.6769512 - ], - [ - -124.0769748, - 44.6770334 - ], - [ - -124.0770396, - 44.6772224 - ], - [ - -124.0773398, - 44.6780228 - ], - [ - -124.0775622, - 44.6787022 - ], - [ - -124.0777003, - 44.6791952 - ], - [ - -124.0779957, - 44.6813146 - ], - [ - -124.077706, - 44.6834345 - ], - [ - -124.076842, - 44.6854733 - ], - [ - -124.0754371, - 44.6873526 - ], - [ - -124.0735451, - 44.6890003 - ], - [ - -124.0712387, - 44.6903529 - ], - [ - -124.0686066, - 44.6913586 - ], - [ - -124.06575, - 44.6919785 - ], - [ - -124.0627787, - 44.692189 - ], - [ - -124.059807, - 44.6919818 - ], - [ - -124.056949, - 44.691365 - ], - [ - -124.0543148, - 44.6903622 - ], - [ - -124.0520055, - 44.6890121 - ], - [ - -124.0501099, - 44.6873665 - ], - [ - -124.0487009, - 44.6854887 - ], - [ - -124.0478326, - 44.6834509 - ], - [ - -124.0477904, - 44.6833001 - ], - [ - -124.0475739, - 44.6827222 - ], - [ - -124.0474916, - 44.6824925 - ], - [ - -124.0473767, - 44.6821565 - ], - [ - -124.0473682, - 44.6821311 - ], - [ - -124.0470326, - 44.6813567 - ], - [ - -124.046782, - 44.6808154 - ], - [ - -124.0467143, - 44.6806657 - ], - [ - -124.0464085, - 44.6799716 - ], - [ - -124.0463055, - 44.6797281 - ], - [ - -124.0457823, - 44.6784357 - ], - [ - -124.0457207, - 44.6782956 - ], - [ - -124.0451102, - 44.6762107 - ], - [ - -124.0450815, - 44.6740809 - ], - [ - -124.0456358, - 44.671988 - ], - [ - -124.0467515, - 44.6700124 - ], - [ - -124.0483857, - 44.6682302 - ], - [ - -124.0504757, - 44.6667096 - ], - [ - -124.0529412, - 44.6655092 - ], - [ - -124.0556873, - 44.6646751 - ], - [ - -124.0586086, - 44.6642392 - ], - [ - -124.061593, - 44.6642184 - ], - [ - -124.0645257, - 44.6646134 - ], - [ - -124.0672942, - 44.6654091 - ], - [ - -124.069792, - 44.6665748 - ], - [ - -124.0719233, - 44.6680659 - ], - [ - -124.0736061, - 44.669825 - ], - [ - -124.0747757, - 44.6717846 - ], - [ - -124.0748897, - 44.6720436 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_781959_s_16094", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0301254, - 44.9524329 - ], - [ - -124.0300558, - 44.9524972 - ], - [ - -124.0298326, - 44.9527015 - ], - [ - -124.0297314, - 44.9528127 - ], - [ - -124.0296076, - 44.9529465 - ], - [ - -124.0294565, - 44.9531072 - ], - [ - -124.0293354, - 44.9532612 - ], - [ - -124.0293467, - 44.9535223 - ], - [ - -124.0293469, - 44.9541792 - ], - [ - -124.0293241, - 44.9547212 - ], - [ - -124.0293074, - 44.9549989 - ], - [ - -124.0292924, - 44.9551899 - ], - [ - -124.0292263, - 44.9557618 - ], - [ - -124.0290189, - 44.9571152 - ], - [ - -124.0290176, - 44.9571296 - ], - [ - -124.0289729, - 44.9575144 - ], - [ - -124.0288046, - 44.9587046 - ], - [ - -124.0282044, - 44.9608145 - ], - [ - -124.02703, - 44.962799 - ], - [ - -124.0253274, - 44.9645801 - ], - [ - -124.0231636, - 44.9660879 - ], - [ - -124.0206234, - 44.9672633 - ], - [ - -124.0178066, - 44.96806 - ], - [ - -124.0148237, - 44.9684467 - ], - [ - -124.0146541, - 44.9684565 - ], - [ - -124.0136728, - 44.9686769 - ], - [ - -124.0106907, - 44.9689106 - ], - [ - -124.0077016, - 44.9687267 - ], - [ - -124.0048206, - 44.9681323 - ], - [ - -124.0021583, - 44.9671503 - ], - [ - -123.9998171, - 44.9658185 - ], - [ - -123.9978871, - 44.9641879 - ], - [ - -123.9964424, - 44.9623213 - ], - [ - -123.9955384, - 44.9602905 - ], - [ - -123.9952098, - 44.9581735 - ], - [ - -123.9954693, - 44.9560516 - ], - [ - -123.9963067, - 44.9540065 - ], - [ - -123.9976899, - 44.9521166 - ], - [ - -123.9985335, - 44.9513692 - ], - [ - -123.9985331, - 44.9513452 - ], - [ - -123.9985642, - 44.9505008 - ], - [ - -123.9985943, - 44.9501728 - ], - [ - -123.9989857, - 44.9483397 - ], - [ - -123.9991008, - 44.9479997 - ], - [ - -123.9998745, - 44.9463253 - ], - [ - -124.0001186, - 44.9459133 - ], - [ - -124.0008223, - 44.9448816 - ], - [ - -124.0011654, - 44.9444396 - ], - [ - -124.0013541, - 44.9442035 - ], - [ - -124.0026615, - 44.9426145 - ], - [ - -124.0030401, - 44.9421333 - ], - [ - -124.003673, - 44.941399 - ], - [ - -124.0040984, - 44.9409466 - ], - [ - -124.0044953, - 44.9405109 - ], - [ - -124.005255, - 44.9397504 - ], - [ - -124.005846, - 44.9392095 - ], - [ - -124.0074477, - 44.9377208 - ], - [ - -124.0094932, - 44.9361634 - ], - [ - -124.0119269, - 44.9349193 - ], - [ - -124.0146556, - 44.9340363 - ], - [ - -124.0175742, - 44.9335483 - ], - [ - -124.0205708, - 44.9334741 - ], - [ - -124.0235303, - 44.9338164 - ], - [ - -124.0263389, - 44.9345622 - ], - [ - -124.0288888, - 44.9356829 - ], - [ - -124.031082, - 44.9371353 - ], - [ - -124.0328342, - 44.9388636 - ], - [ - -124.0340781, - 44.9408016 - ], - [ - -124.0347659, - 44.9428746 - ], - [ - -124.034871, - 44.9450031 - ], - [ - -124.0343894, - 44.9471053 - ], - [ - -124.0333395, - 44.9491004 - ], - [ - -124.0317616, - 44.9509116 - ], - [ - -124.0301254, - 44.9524329 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_781972_s_15954", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.1084342, - 44.3553513 - ], - [ - -124.1084472, - 44.3553527 - ], - [ - -124.1083244, - 44.3559337 - ], - [ - -124.1082938, - 44.3560724 - ], - [ - -124.1081395, - 44.3567436 - ], - [ - -124.1080306, - 44.3572775 - ], - [ - -124.1079941, - 44.3574474 - ], - [ - -124.107866, - 44.358013 - ], - [ - -124.1076438, - 44.3590939 - ], - [ - -124.1075163, - 44.3597194 - ], - [ - -124.1074725, - 44.3599211 - ], - [ - -124.1073011, - 44.3606637 - ], - [ - -124.1072472, - 44.3609319 - ], - [ - -124.1071119, - 44.3616109 - ], - [ - -124.1070744, - 44.3617889 - ], - [ - -124.1070156, - 44.3620527 - ], - [ - -124.1067081, - 44.3634415 - ], - [ - -124.1067044, - 44.3634581 - ], - [ - -124.1065246, - 44.3642621 - ], - [ - -124.1065125, - 44.3643157 - ], - [ - -124.1062064, - 44.3656417 - ], - [ - -124.1057437, - 44.3678646 - ], - [ - -124.1057161, - 44.367992 - ], - [ - -124.1052604, - 44.3700165 - ], - [ - -124.1048782, - 44.3719328 - ], - [ - -124.1048373, - 44.3721254 - ], - [ - -124.1047395, - 44.3725602 - ], - [ - -124.1042713, - 44.3746411 - ], - [ - -124.103429, - 44.3784701 - ], - [ - -124.1031156, - 44.3799833 - ], - [ - -124.1031738, - 44.3806499 - ], - [ - -124.1033418, - 44.3819141 - ], - [ - -124.10335, - 44.3819784 - ], - [ - -124.1034998, - 44.3831805 - ], - [ - -124.1037245, - 44.3849096 - ], - [ - -124.1037881, - 44.3860841 - ], - [ - -124.1037763, - 44.3866401 - ], - [ - -124.1035447, - 44.3883736 - ], - [ - -124.1033988, - 44.3889626 - ], - [ - -124.1031866, - 44.3896787 - ], - [ - -124.1029977, - 44.3902247 - ], - [ - -124.102973, - 44.3902951 - ], - [ - -124.1027639, - 44.3908826 - ], - [ - -124.1020002, - 44.3930521 - ], - [ - -124.1015934, - 44.3940167 - ], - [ - -124.1010487, - 44.3951208 - ], - [ - -124.1010156, - 44.3951124 - ], - [ - -124.1000427, - 44.3967631 - ], - [ - -124.0983745, - 44.3985256 - ], - [ - -124.0962587, - 44.4000209 - ], - [ - -124.0937766, - 44.4011914 - ], - [ - -124.0910235, - 44.4019923 - ], - [ - -124.0881053, - 44.4023926 - ], - [ - -124.0851343, - 44.4023771 - ], - [ - -124.0822246, - 44.4019462 - ], - [ - -124.0794881, - 44.4011166 - ], - [ - -124.0770301, - 44.3999201 - ], - [ - -124.074945, - 44.3984028 - ], - [ - -124.0733129, - 44.396623 - ], - [ - -124.0721966, - 44.3946491 - ], - [ - -124.0716389, - 44.392557 - ], - [ - -124.0716611, - 44.390427 - ], - [ - -124.0722624, - 44.3883411 - ], - [ - -124.0722955, - 44.3882651 - ], - [ - -124.0724791, - 44.3878694 - ], - [ - -124.0727895, - 44.3872409 - ], - [ - -124.0733766, - 44.3855754 - ], - [ - -124.0733244, - 44.3851724 - ], - [ - -124.0733191, - 44.3851306 - ], - [ - -124.0731714, - 44.3839398 - ], - [ - -124.072985, - 44.3825319 - ], - [ - -124.0729465, - 44.3821799 - ], - [ - -124.0728099, - 44.3806059 - ], - [ - -124.0727935, - 44.3794833 - ], - [ - -124.0728096, - 44.3792026 - ], - [ - -124.0728349, - 44.3787288 - ], - [ - -124.0729862, - 44.3775573 - ], - [ - -124.0730974, - 44.3770173 - ], - [ - -124.0731003, - 44.3770032 - ], - [ - -124.0734697, - 44.3752242 - ], - [ - -124.0734904, - 44.3751277 - ], - [ - -124.0743494, - 44.3712318 - ], - [ - -124.0743578, - 44.371194 - ], - [ - -124.0748313, - 44.3690941 - ], - [ - -124.0749078, - 44.3687548 - ], - [ - -124.0752911, - 44.3668383 - ], - [ - -124.0753322, - 44.366645 - ], - [ - -124.0757964, - 44.3645877 - ], - [ - -124.0762646, - 44.3623435 - ], - [ - -124.0763021, - 44.3621733 - ], - [ - -124.0766222, - 44.3607891 - ], - [ - -124.0767946, - 44.3600203 - ], - [ - -124.0771021, - 44.3586346 - ], - [ - -124.0771446, - 44.3584441 - ], - [ - -124.077264, - 44.3578462 - ], - [ - -124.0772672, - 44.35783 - ], - [ - -124.0773453, - 44.357443 - ], - [ - -124.0773932, - 44.3572219 - ], - [ - -124.0775671, - 44.3564696 - ], - [ - -124.0776756, - 44.3559386 - ], - [ - -124.0776783, - 44.3559256 - ], - [ - -124.0779186, - 44.3547597 - ], - [ - -124.0779526, - 44.3546026 - ], - [ - -124.0780795, - 44.3540435 - ], - [ - -124.0781913, - 44.3534966 - ], - [ - -124.0782339, - 44.3533006 - ], - [ - -124.0783951, - 44.3526009 - ], - [ - -124.0785035, - 44.3520893 - ], - [ - -124.0785446, - 44.3519061 - ], - [ - -124.0785616, - 44.3518341 - ], - [ - -124.0793424, - 44.3497791 - ], - [ - -124.0806669, - 44.3478729 - ], - [ - -124.0824841, - 44.3461887 - ], - [ - -124.0847242, - 44.3447912 - ], - [ - -124.0873011, - 44.3437341 - ], - [ - -124.0901157, - 44.343058 - ], - [ - -124.0930601, - 44.3427889 - ], - [ - -124.096021, - 44.3429371 - ], - [ - -124.0988848, - 44.3434969 - ], - [ - -124.1015414, - 44.3444468 - ], - [ - -124.1038889, - 44.3457504 - ], - [ - -124.1058369, - 44.3473575 - ], - [ - -124.1073108, - 44.3492064 - ], - [ - -124.1082536, - 44.3512261 - ], - [ - -124.1086293, - 44.353339 - ], - [ - -124.1084342, - 44.3553513 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_781974_s_15962", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0947114, - 44.4762259 - ], - [ - -124.0946583, - 44.4772197 - ], - [ - -124.0946553, - 44.4772662 - ], - [ - -124.0947129, - 44.4774188 - ], - [ - -124.0947323, - 44.4774708 - ], - [ - -124.095735, - 44.4801806 - ], - [ - -124.0957503, - 44.4802225 - ], - [ - -124.0959315, - 44.4807203 - ], - [ - -124.0960053, - 44.4809219 - ], - [ - -124.0974687, - 44.4848876 - ], - [ - -124.0976999, - 44.4856141 - ], - [ - -124.0979051, - 44.4863791 - ], - [ - -124.0979742, - 44.486656 - ], - [ - -124.0981294, - 44.487328 - ], - [ - -124.0982128, - 44.4877377 - ], - [ - -124.098329, - 44.4883957 - ], - [ - -124.0984371, - 44.4893316 - ], - [ - -124.0984722, - 44.4899726 - ], - [ - -124.0984814, - 44.490597 - ], - [ - -124.0984299, - 44.492619 - ], - [ - -124.098421, - 44.4928433 - ], - [ - -124.0982886, - 44.4952793 - ], - [ - -124.0982491, - 44.4957463 - ], - [ - -124.0981803, - 44.4963463 - ], - [ - -124.0981157, - 44.4967952 - ], - [ - -124.0979958, - 44.4974862 - ], - [ - -124.097921, - 44.4978634 - ], - [ - -124.0976943, - 44.4988784 - ], - [ - -124.097441, - 44.4997706 - ], - [ - -124.0974018, - 44.4998841 - ], - [ - -124.09724, - 44.5003716 - ], - [ - -124.0962718, - 44.5023857 - ], - [ - -124.0947731, - 44.5042259 - ], - [ - -124.0928014, - 44.5058214 - ], - [ - -124.0904325, - 44.507111 - ], - [ - -124.0877575, - 44.508045 - ], - [ - -124.0848792, - 44.5085876 - ], - [ - -124.0819083, - 44.5087178 - ], - [ - -124.0789589, - 44.5084307 - ], - [ - -124.0761445, - 44.5077373 - ], - [ - -124.0735734, - 44.5066643 - ], - [ - -124.0713443, - 44.5052529 - ], - [ - -124.0695429, - 44.5035573 - ], - [ - -124.0682384, - 44.5016428 - ], - [ - -124.067481, - 44.499583 - ], - [ - -124.0672996, - 44.497457 - ], - [ - -124.0677012, - 44.4953465 - ], - [ - -124.0678088, - 44.4950228 - ], - [ - -124.0678997, - 44.4946168 - ], - [ - -124.067948, - 44.4943387 - ], - [ - -124.0679644, - 44.4941969 - ], - [ - -124.0680791, - 44.4921068 - ], - [ - -124.068118, - 44.4906088 - ], - [ - -124.0680548, - 44.4903348 - ], - [ - -124.067985, - 44.4900741 - ], - [ - -124.0666518, - 44.4864564 - ], - [ - -124.0666429, - 44.4864321 - ], - [ - -124.0665629, - 44.4862131 - ], - [ - -124.0663839, - 44.4857206 - ], - [ - -124.0653998, - 44.4830574 - ], - [ - -124.0649449, - 44.4818503 - ], - [ - -124.0648329, - 44.4815343 - ], - [ - -124.0647, - 44.4811343 - ], - [ - -124.0643932, - 44.4798965 - ], - [ - -124.0643462, - 44.4796125 - ], - [ - -124.0642474, - 44.4786479 - ], - [ - -124.0642345, - 44.4783259 - ], - [ - -124.0642499, - 44.4774342 - ], - [ - -124.0643342, - 44.4763042 - ], - [ - -124.0643841, - 44.4753793 - ], - [ - -124.0643947, - 44.4751879 - ], - [ - -124.0644237, - 44.4748203 - ], - [ - -124.0645297, - 44.4737881 - ], - [ - -124.0645647, - 44.4730723 - ], - [ - -124.0645736, - 44.4729215 - ], - [ - -124.0646168, - 44.4722905 - ], - [ - -124.0646516, - 44.4719147 - ], - [ - -124.0646609, - 44.4718354 - ], - [ - -124.0646581, - 44.471695 - ], - [ - -124.0646391, - 44.4713498 - ], - [ - -124.0645628, - 44.4709713 - ], - [ - -124.0638711, - 44.4690977 - ], - [ - -124.0638364, - 44.4690019 - ], - [ - -124.0634995, - 44.4680543 - ], - [ - -124.0632912, - 44.467476 - ], - [ - -124.0631594, - 44.4671194 - ], - [ - -124.0625958, - 44.4656523 - ], - [ - -124.0625533, - 44.4655393 - ], - [ - -124.0618587, - 44.4636522 - ], - [ - -124.0618354, - 44.463588 - ], - [ - -124.0614873, - 44.4626182 - ], - [ - -124.0609717, - 44.4611934 - ], - [ - -124.0607307, - 44.4605684 - ], - [ - -124.0605, - 44.4599898 - ], - [ - -124.0603939, - 44.4597099 - ], - [ - -124.0601377, - 44.4589957 - ], - [ - -124.0593425, - 44.4568662 - ], - [ - -124.0592022, - 44.4564593 - ], - [ - -124.0590394, - 44.4559443 - ], - [ - -124.0589089, - 44.4554864 - ], - [ - -124.0587801, - 44.4549784 - ], - [ - -124.0585995, - 44.4540317 - ], - [ - -124.0585137, - 44.4533637 - ], - [ - -124.0585114, - 44.4533455 - ], - [ - -124.0584425, - 44.4527995 - ], - [ - -124.0583818, - 44.4519355 - ], - [ - -124.058374, - 44.4513965 - ], - [ - -124.0583853, - 44.450849 - ], - [ - -124.0584194, - 44.450237 - ], - [ - -124.0584816, - 44.4495971 - ], - [ - -124.0587357, - 44.4477644 - ], - [ - -124.0588182, - 44.4468572 - ], - [ - -124.0588297, - 44.4467409 - ], - [ - -124.0590508, - 44.4446556 - ], - [ - -124.0591689, - 44.4434773 - ], - [ - -124.0591894, - 44.4432938 - ], - [ - -124.0595251, - 44.4405858 - ], - [ - -124.0601091, - 44.4384157 - ], - [ - -124.0612938, - 44.4363752 - ], - [ - -124.0630302, - 44.4345486 - ], - [ - -124.0652464, - 44.4330115 - ], - [ - -124.0662625, - 44.4325495 - ], - [ - -124.0665464, - 44.4323777 - ], - [ - -124.0672782, - 44.4320877 - ], - [ - -124.0678507, - 44.4318274 - ], - [ - -124.0681181, - 44.4317549 - ], - [ - -124.0691478, - 44.4313469 - ], - [ - -124.0719797, - 44.4306996 - ], - [ - -124.0749335, - 44.4304605 - ], - [ - -124.0752414, - 44.4304573 - ], - [ - -124.0781203, - 44.4306249 - ], - [ - -124.0809027, - 44.4311804 - ], - [ - -124.0834876, - 44.4321039 - ], - [ - -124.0857814, - 44.4333618 - ], - [ - -124.0877008, - 44.4349085 - ], - [ - -124.0891761, - 44.4366879 - ], - [ - -124.0901539, - 44.4386354 - ], - [ - -124.0905985, - 44.4406804 - ], - [ - -124.0906141, - 44.4408686 - ], - [ - -124.0904995, - 44.4429894 - ], - [ - -124.0898116, - 44.4450538 - ], - [ - -124.0893513, - 44.4457727 - ], - [ - -124.0893058, - 44.4462297 - ], - [ - -124.0893011, - 44.446275 - ], - [ - -124.0890848, - 44.4483249 - ], - [ - -124.0889914, - 44.4493578 - ], - [ - -124.0889494, - 44.4497249 - ], - [ - -124.0887231, - 44.4513631 - ], - [ - -124.0887249, - 44.4513774 - ], - [ - -124.0887388, - 44.4514853 - ], - [ - -124.0894656, - 44.4534288 - ], - [ - -124.0895035, - 44.4535323 - ], - [ - -124.0897282, - 44.4541578 - ], - [ - -124.0899217, - 44.4546423 - ], - [ - -124.0899574, - 44.4547333 - ], - [ - -124.0902486, - 44.4554872 - ], - [ - -124.0903112, - 44.4556547 - ], - [ - -124.0908616, - 44.4571736 - ], - [ - -124.090869, - 44.4571942 - ], - [ - -124.0912097, - 44.458142 - ], - [ - -124.0918725, - 44.4599403 - ], - [ - -124.0924351, - 44.4614028 - ], - [ - -124.0924744, - 44.4615068 - ], - [ - -124.0926375, - 44.4619478 - ], - [ - -124.0926611, - 44.4620125 - ], - [ - -124.0928872, - 44.4626394 - ], - [ - -124.092899, - 44.4626723 - ], - [ - -124.0932252, - 44.4635883 - ], - [ - -124.094126, - 44.4660253 - ], - [ - -124.0944777, - 44.4672637 - ], - [ - -124.0945943, - 44.4678462 - ], - [ - -124.094695, - 44.4683437 - ], - [ - -124.0947243, - 44.4684963 - ], - [ - -124.0948204, - 44.4690242 - ], - [ - -124.0949357, - 44.4699969 - ], - [ - -124.09499, - 44.4709729 - ], - [ - -124.0950004, - 44.4712493 - ], - [ - -124.0950106, - 44.4717552 - ], - [ - -124.0950102, - 44.4720858 - ], - [ - -124.0950003, - 44.4725258 - ], - [ - -124.0949497, - 44.4732543 - ], - [ - -124.0949167, - 44.4735376 - ], - [ - -124.0948918, - 44.4739051 - ], - [ - -124.0948507, - 44.4747536 - ], - [ - -124.0948193, - 44.4751696 - ], - [ - -124.0947114, - 44.4762259 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_833259_s_16275", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0720725, - 44.6243692 - ], - [ - -124.0731988, - 44.6260471 - ], - [ - -124.0739387, - 44.6281105 - ], - [ - -124.0741006, - 44.6302372 - ], - [ - -124.0736784, - 44.6323457 - ], - [ - -124.0726882, - 44.6343549 - ], - [ - -124.071168, - 44.6361874 - ], - [ - -124.0691762, - 44.637773 - ], - [ - -124.0667894, - 44.6390506 - ], - [ - -124.0640992, - 44.6399712 - ], - [ - -124.0612091, - 44.6404993 - ], - [ - -124.0582302, - 44.6406145 - ], - [ - -124.055277, - 44.6403126 - ], - [ - -124.0524632, - 44.6396051 - ], - [ - -124.0523131, - 44.6395551 - ], - [ - -124.0512369, - 44.6391584 - ], - [ - -124.0508669, - 44.6390083 - ], - [ - -124.0488168, - 44.6380111 - ], - [ - -124.0485568, - 44.6378611 - ], - [ - -124.0463307, - 44.6362791 - ], - [ - -124.0462507, - 44.6362091 - ], - [ - -124.044957, - 44.6348877 - ], - [ - -124.0445399, - 44.6342888 - ], - [ - -124.0438964, - 44.633549 - ], - [ - -124.0438833, - 44.6335315 - ], - [ - -124.0436172, - 44.633269 - ], - [ - -124.0423885, - 44.6313787 - ], - [ - -124.0416879, - 44.6293556 - ], - [ - -124.0415411, - 44.6272743 - ], - [ - -124.0419535, - 44.6252112 - ], - [ - -124.0424909, - 44.6241048 - ], - [ - -124.0425026, - 44.6240638 - ], - [ - -124.0425352, - 44.6239732 - ], - [ - -124.0435553, - 44.6219717 - ], - [ - -124.0451024, - 44.6201508 - ], - [ - -124.0471172, - 44.6185804 - ], - [ - -124.049522, - 44.6173209 - ], - [ - -124.0522246, - 44.6164206 - ], - [ - -124.0551211, - 44.6159142 - ], - [ - -124.0581002, - 44.615821 - ], - [ - -124.0610476, - 44.6161446 - ], - [ - -124.06385, - 44.6168727 - ], - [ - -124.0663998, - 44.6179772 - ], - [ - -124.068599, - 44.6194157 - ], - [ - -124.0703632, - 44.621133 - ], - [ - -124.0716244, - 44.6230631 - ], - [ - -124.0720725, - 44.6243692 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2438932_s_16065", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0670572, - 44.6493516 - ], - [ - -124.067399, - 44.650154 - ], - [ - -124.0676936, - 44.6522735 - ], - [ - -124.0674033, - 44.6543933 - ], - [ - -124.0665391, - 44.656432 - ], - [ - -124.0651342, - 44.6583111 - ], - [ - -124.0648842, - 44.6585288 - ], - [ - -124.0643894, - 44.6597483 - ], - [ - -124.063016, - 44.6616392 - ], - [ - -124.0611519, - 44.6633026 - ], - [ - -124.0588689, - 44.6646744 - ], - [ - -124.0562547, - 44.665702 - ], - [ - -124.0534097, - 44.6663457 - ], - [ - -124.0504434, - 44.666581 - ], - [ - -124.0474697, - 44.6663986 - ], - [ - -124.0446031, - 44.6658057 - ], - [ - -124.0419537, - 44.664825 - ], - [ - -124.0396235, - 44.6634942 - ], - [ - -124.0377019, - 44.6618646 - ], - [ - -124.0362628, - 44.6599986 - ], - [ - -124.0353615, - 44.6579682 - ], - [ - -124.0350694, - 44.6560885 - ], - [ - -124.0347894, - 44.6554854 - ], - [ - -124.0347765, - 44.6554444 - ], - [ - -124.03441, - 44.6534094 - ], - [ - -124.0345861, - 44.6513615 - ], - [ - -124.0352983, - 44.6493738 - ], - [ - -124.0365213, - 44.647517 - ], - [ - -124.0382113, - 44.6458575 - ], - [ - -124.0403081, - 44.6444543 - ], - [ - -124.0407371, - 44.6442173 - ], - [ - -124.0414221, - 44.6438603 - ], - [ - -124.042645, - 44.6432594 - ], - [ - -124.0434946, - 44.6428427 - ], - [ - -124.0435022, - 44.6428506 - ], - [ - -124.0459441, - 44.6418524 - ], - [ - -124.0487591, - 44.6411763 - ], - [ - -124.0517045, - 44.6409033 - ], - [ - -124.054668, - 44.6410439 - ], - [ - -124.0575369, - 44.6415927 - ], - [ - -124.060202, - 44.6425288 - ], - [ - -124.0625617, - 44.6438166 - ], - [ - -124.0645262, - 44.645407 - ], - [ - -124.0646242, - 44.645504 - ], - [ - -124.066035, - 44.6472083 - ], - [ - -124.0664364, - 44.6479902 - ], - [ - -124.0665309, - 44.6481162 - ], - [ - -124.0666763, - 44.6484575 - ], - [ - -124.0669892, - 44.6490671 - ], - [ - -124.0670572, - 44.6493516 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2438933_s_16031", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0738621, - 44.6470465 - ], - [ - -124.0734843, - 44.6479389 - ], - [ - -124.0720804, - 44.6498184 - ], - [ - -124.0701897, - 44.6514661 - ], - [ - -124.067885, - 44.6528189 - ], - [ - -124.0652547, - 44.6538246 - ], - [ - -124.0623999, - 44.6544447 - ], - [ - -124.0594306, - 44.6546552 - ], - [ - -124.0564607, - 44.6544482 - ], - [ - -124.0536046, - 44.6538315 - ], - [ - -124.0509719, - 44.6528288 - ], - [ - -124.048664, - 44.6514788 - ], - [ - -124.0467696, - 44.6498332 - ], - [ - -124.0453613, - 44.6479555 - ], - [ - -124.0444934, - 44.6459177 - ], - [ - -124.0441991, - 44.6437981 - ], - [ - -124.0441983, - 44.6428949 - ], - [ - -124.0441998, - 44.6427347 - ], - [ - -124.044218, - 44.6418117 - ], - [ - -124.0445507, - 44.6397004 - ], - [ - -124.0454526, - 44.6376756 - ], - [ - -124.046889, - 44.6358149 - ], - [ - -124.048805, - 44.6341893 - ], - [ - -124.0511273, - 44.6328609 - ], - [ - -124.0537672, - 44.6318807 - ], - [ - -124.0566237, - 44.6312859 - ], - [ - -124.0595876, - 44.6310995 - ], - [ - -124.0600066, - 44.6311025 - ], - [ - -124.0600567, - 44.6311029 - ], - [ - -124.0606876, - 44.6311089 - ], - [ - -124.0636519, - 44.6313458 - ], - [ - -124.0664945, - 44.6319911 - ], - [ - -124.0691063, - 44.6330199 - ], - [ - -124.071387, - 44.6343927 - ], - [ - -124.0732488, - 44.6360568 - ], - [ - -124.0746203, - 44.6379483 - ], - [ - -124.0754487, - 44.6399944 - ], - [ - -124.0757021, - 44.6421166 - ], - [ - -124.0753708, - 44.6442334 - ], - [ - -124.0744673, - 44.6462633 - ], - [ - -124.0738621, - 44.6470465 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2438934_s_16049", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0617682, - 44.6188754 - ], - [ - -124.0612503, - 44.6200042 - ], - [ - -124.0597865, - 44.6218599 - ], - [ - -124.0578438, - 44.6234759 - ], - [ - -124.0554969, - 44.6247903 - ], - [ - -124.0528359, - 44.6257523 - ], - [ - -124.0499633, - 44.626325 - ], - [ - -124.0469893, - 44.6264864 - ], - [ - -124.0440284, - 44.6262303 - ], - [ - -124.0411944, - 44.6255666 - ], - [ - -124.0385962, - 44.6245207 - ], - [ - -124.0363338, - 44.6231328 - ], - [ - -124.0344941, - 44.6214564 - ], - [ - -124.0331478, - 44.6195559 - ], - [ - -124.0323466, - 44.6175042 - ], - [ - -124.0321212, - 44.6153804 - ], - [ - -124.0324802, - 44.6132659 - ], - [ - -124.0327713, - 44.6123312 - ], - [ - -124.0327622, - 44.6123636 - ], - [ - -124.0333289, - 44.6107359 - ], - [ - -124.0342502, - 44.6091775 - ], - [ - -124.0343133, - 44.6090905 - ], - [ - -124.0343447, - 44.6090473 - ], - [ - -124.0346208, - 44.6086704 - ], - [ - -124.035307, - 44.6078276 - ], - [ - -124.035497, - 44.6076167 - ], - [ - -124.0359864, - 44.6071059 - ], - [ - -124.0361594, - 44.6069359 - ], - [ - -124.036171, - 44.6069246 - ], - [ - -124.036221, - 44.6068756 - ], - [ - -124.0366157, - 44.6065057 - ], - [ - -124.0370418, - 44.6061238 - ], - [ - -124.0371222, - 44.6060523 - ], - [ - -124.0371812, - 44.6060003 - ], - [ - -124.0374742, - 44.6057498 - ], - [ - -124.0379574, - 44.6053493 - ], - [ - -124.0382802, - 44.6050642 - ], - [ - -124.0383133, - 44.605035 - ], - [ - -124.0384278, - 44.6049346 - ], - [ - -124.0405281, - 44.6034229 - ], - [ - -124.0430008, - 44.6022329 - ], - [ - -124.0457508, - 44.6014104 - ], - [ - -124.0486726, - 44.6009869 - ], - [ - -124.0516538, - 44.6009786 - ], - [ - -124.05458, - 44.601386 - ], - [ - -124.0573388, - 44.6021934 - ], - [ - -124.0598243, - 44.6033697 - ], - [ - -124.0619408, - 44.6048698 - ], - [ - -124.0636072, - 44.606636 - ], - [ - -124.0647593, - 44.6086005 - ], - [ - -124.0653528, - 44.6106878 - ], - [ - -124.0653648, - 44.6128177 - ], - [ - -124.0647949, - 44.6149084 - ], - [ - -124.0636648, - 44.6168795 - ], - [ - -124.062018, - 44.6186552 - ], - [ - -124.0619201, - 44.6187412 - ], - [ - -124.0617682, - 44.6188754 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2455436_s_16082", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0223392, - 44.9861269 - ], - [ - -124.021937, - 44.9877051 - ], - [ - -124.020837, - 44.9896867 - ], - [ - -124.0192132, - 44.9914779 - ], - [ - -124.017128, - 44.9930098 - ], - [ - -124.0146616, - 44.9942236 - ], - [ - -124.0119088, - 44.9950726 - ], - [ - -124.0089754, - 44.9955242 - ], - [ - -124.0059742, - 44.9955609 - ], - [ - -124.0030206, - 44.9951815 - ], - [ - -124.0002281, - 44.9944003 - ], - [ - -123.9977042, - 44.9932476 - ], - [ - -123.9955458, - 44.9917676 - ], - [ - -123.9938359, - 44.9900172 - ], - [ - -123.9926401, - 44.9880637 - ], - [ - -123.9920045, - 44.9859822 - ], - [ - -123.9919667, - 44.9844098 - ], - [ - -123.9919124, - 44.9844087 - ], - [ - -123.9919138, - 44.984371 - ], - [ - -123.9919123, - 44.9841285 - ], - [ - -123.9919148, - 44.9838751 - ], - [ - -123.9919159, - 44.9838371 - ], - [ - -123.9919229, - 44.9835759 - ], - [ - -123.9919224, - 44.9834259 - ], - [ - -123.9919354, - 44.98295 - ], - [ - -123.9919519, - 44.9826672 - ], - [ - -123.9919684, - 44.9823703 - ], - [ - -123.9919707, - 44.9823301 - ], - [ - -123.9919788, - 44.9821981 - ], - [ - -123.9920246, - 44.9817049 - ], - [ - -123.9920276, - 44.9816809 - ], - [ - -123.9920459, - 44.9815451 - ], - [ - -123.9920739, - 44.9813491 - ], - [ - -123.9922315, - 44.980547 - ], - [ - -123.9922375, - 44.980523 - ], - [ - -123.9923164, - 44.9802308 - ], - [ - -123.9923745, - 44.9800308 - ], - [ - -123.9924503, - 44.979784 - ], - [ - -123.9924984, - 44.979636 - ], - [ - -123.992539, - 44.9795142 - ], - [ - -123.992553, - 44.9794732 - ], - [ - -123.992896, - 44.9786222 - ], - [ - -123.9929641, - 44.9784762 - ], - [ - -123.9930288, - 44.9783403 - ], - [ - -123.9930468, - 44.9783033 - ], - [ - -123.9932566, - 44.9778985 - ], - [ - -123.9933336, - 44.9777585 - ], - [ - -123.9933459, - 44.9777363 - ], - [ - -123.9933769, - 44.9776803 - ], - [ - -123.9940023, - 44.9766974 - ], - [ - -123.9940413, - 44.9766434 - ], - [ - -123.9940904, - 44.976576 - ], - [ - -123.9941624, - 44.976478 - ], - [ - -123.9946511, - 44.9758627 - ], - [ - -123.9947992, - 44.9756897 - ], - [ - -123.9952532, - 44.9751904 - ], - [ - -123.9954172, - 44.9750204 - ], - [ - -123.9963, - 44.9741932 - ], - [ - -123.996433, - 44.9740802 - ], - [ - -123.996436, - 44.974082 - ], - [ - -123.9968688, - 44.9737244 - ], - [ - -123.9970788, - 44.9735605 - ], - [ - -123.9972268, - 44.9734494 - ], - [ - -123.9973858, - 44.9731761 - ], - [ - -123.9987973, - 44.9712966 - ], - [ - -124.0006981, - 44.9696488 - ], - [ - -124.0030152, - 44.9682957 - ], - [ - -124.0056595, - 44.9672896 - ], - [ - -124.0085295, - 44.9666689 - ], - [ - -124.0115148, - 44.9664575 - ], - [ - -124.0145009, - 44.9666635 - ], - [ - -124.017373, - 44.9672791 - ], - [ - -124.0200208, - 44.9682806 - ], - [ - -124.0223427, - 44.9696295 - ], - [ - -124.0242493, - 44.9712739 - ], - [ - -124.0256675, - 44.9731509 - ], - [ - -124.0265426, - 44.9751881 - ], - [ - -124.026841, - 44.9773073 - ], - [ - -124.0265512, - 44.9794272 - ], - [ - -124.0256842, - 44.9814662 - ], - [ - -124.0251508, - 44.9823839 - ], - [ - -124.0245142, - 44.9834885 - ], - [ - -124.0223931, - 44.9860781 - ], - [ - -124.0223392, - 44.9861269 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2455436_s_2456766", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.022531, - 44.9841855 - ], - [ - -124.0225316, - 44.9842613 - ], - [ - -124.0225317, - 44.9842736 - ], - [ - -124.0225328, - 44.9844266 - ], - [ - -124.0225284, - 44.9847428 - ], - [ - -124.0225265, - 44.9848008 - ], - [ - -124.0225257, - 44.9848222 - ], - [ - -124.0225197, - 44.9849832 - ], - [ - -124.0224751, - 44.9855743 - ], - [ - -124.0224711, - 44.9856093 - ], - [ - -124.021937, - 44.9877051 - ], - [ - -124.020837, - 44.9896867 - ], - [ - -124.0192132, - 44.9914779 - ], - [ - -124.017128, - 44.9930098 - ], - [ - -124.0146616, - 44.9942236 - ], - [ - -124.0119088, - 44.9950726 - ], - [ - -124.0089754, - 44.9955242 - ], - [ - -124.0059742, - 44.9955609 - ], - [ - -124.0030206, - 44.9951815 - ], - [ - -124.0002281, - 44.9944003 - ], - [ - -123.9977042, - 44.9932476 - ], - [ - -123.9955458, - 44.9917676 - ], - [ - -123.9938359, - 44.9900172 - ], - [ - -123.9926401, - 44.9880637 - ], - [ - -123.9920045, - 44.9859822 - ], - [ - -123.9919807, - 44.9849931 - ], - [ - -123.9918539, - 44.9847884 - ], - [ - -123.9912059, - 44.9827088 - ], - [ - -123.9911421, - 44.9805794 - ], - [ - -123.9916647, - 44.9784822 - ], - [ - -123.9927538, - 44.9764976 - ], - [ - -123.9943673, - 44.9747019 - ], - [ - -123.9964432, - 44.9731641 - ], - [ - -123.9989019, - 44.9719432 - ], - [ - -124.0016487, - 44.9710863 - ], - [ - -124.0045782, - 44.9706261 - ], - [ - -124.0075779, - 44.9705804 - ], - [ - -124.0077428, - 44.9705894 - ], - [ - -124.007843, - 44.9705951 - ], - [ - -124.0080826, - 44.9706093 - ], - [ - -124.0082541, - 44.9706187 - ], - [ - -124.0088837, - 44.9706625 - ], - [ - -124.0090377, - 44.9706755 - ], - [ - -124.0090633, - 44.9706777 - ], - [ - -124.0093903, - 44.9707057 - ], - [ - -124.0093865, - 44.9707278 - ], - [ - -124.0119022, - 44.9710479 - ], - [ - -124.014701, - 44.9718277 - ], - [ - -124.017231, - 44.9729809 - ], - [ - -124.0193948, - 44.9744628 - ], - [ - -124.0211088, - 44.9762163 - ], - [ - -124.0223068, - 44.9781739 - ], - [ - -124.0229426, - 44.9802599 - ], - [ - -124.0229916, - 44.9823938 - ], - [ - -124.022531, - 44.9841855 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2455449_s_29681", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0384372, - 44.6540176 - ], - [ - -124.0382729, - 44.6536307 - ], - [ - -124.037981, - 44.6515109 - ], - [ - -124.038274, - 44.6493913 - ], - [ - -124.0391407, - 44.6473532 - ], - [ - -124.0405475, - 44.6454749 - ], - [ - -124.0424406, - 44.6438287 - ], - [ - -124.044747, - 44.6424777 - ], - [ - -124.0473782, - 44.6414738 - ], - [ - -124.0502331, - 44.6408556 - ], - [ - -124.0532021, - 44.6406469 - ], - [ - -124.053755, - 44.6406469 - ], - [ - -124.0568224, - 44.6408699 - ], - [ - -124.059764, - 44.6415296 - ], - [ - -124.0624591, - 44.6425991 - ], - [ - -124.064797, - 44.6440344 - ], - [ - -124.065577, - 44.6446213 - ], - [ - -124.0659345, - 44.6448998 - ], - [ - -124.0662505, - 44.6451547 - ], - [ - -124.0664046, - 44.6452811 - ], - [ - -124.0667927, - 44.645604 - ], - [ - -124.0668483, - 44.6456508 - ], - [ - -124.0668483, - 44.6456508 - ], - [ - -124.0670713, - 44.6458378 - ], - [ - -124.0671284, - 44.6458859 - ], - [ - -124.0674254, - 44.6461379 - ], - [ - -124.0679978, - 44.6466545 - ], - [ - -124.0682038, - 44.6468525 - ], - [ - -124.0690598, - 44.6477687 - ], - [ - -124.0692519, - 44.6479986 - ], - [ - -124.0698112, - 44.648731 - ], - [ - -124.0699823, - 44.648977 - ], - [ - -124.0701689, - 44.6492553 - ], - [ - -124.0703059, - 44.6494673 - ], - [ - -124.0712237, - 44.6513049 - ], - [ - -124.0716663, - 44.6532301 - ], - [ - -124.0716195, - 44.6551807 - ], - [ - -124.0715839, - 44.655417 - ], - [ - -124.0715533, - 44.6556263 - ], - [ - -124.0714789, - 44.6560528 - ], - [ - -124.0714379, - 44.6562548 - ], - [ - -124.0713478, - 44.6566993 - ], - [ - -124.0713263, - 44.6568014 - ], - [ - -124.0712644, - 44.6570874 - ], - [ - -124.0710375, - 44.657919 - ], - [ - -124.0709296, - 44.658246 - ], - [ - -124.0699281, - 44.6603171 - ], - [ - -124.0683647, - 44.6622026 - ], - [ - -124.066303, - 44.6638259 - ], - [ - -124.0638268, - 44.6651209 - ], - [ - -124.0610367, - 44.6660351 - ], - [ - -124.0580464, - 44.6665311 - ], - [ - -124.0549773, - 44.6665888 - ], - [ - -124.0519545, - 44.6662058 - ], - [ - -124.0491009, - 44.6653978 - ], - [ - -124.0489389, - 44.6653378 - ], - [ - -124.0488701, - 44.6653122 - ], - [ - -124.0487581, - 44.6652702 - ], - [ - -124.0469583, - 44.6644767 - ], - [ - -124.0468393, - 44.6644157 - ], - [ - -124.0458971, - 44.6638454 - ], - [ - -124.0440913, - 44.663008 - ], - [ - -124.0419541, - 44.6615214 - ], - [ - -124.0402645, - 44.6597657 - ], - [ - -124.0390873, - 44.6578085 - ], - [ - -124.0384678, - 44.6557249 - ], - [ - -124.0384372, - 44.6540176 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456756_s_781972", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.11987, - 44.3148411 - ], - [ - -124.1198647, - 44.3151629 - ], - [ - -124.1197919, - 44.3158829 - ], - [ - -124.1197358, - 44.3163168 - ], - [ - -124.1196799, - 44.3166718 - ], - [ - -124.1194408, - 44.3177241 - ], - [ - -124.1193389, - 44.3180661 - ], - [ - -124.119123, - 44.3186975 - ], - [ - -124.1183285, - 44.3207536 - ], - [ - -124.1183175, - 44.3207818 - ], - [ - -124.1180546, - 44.3214551 - ], - [ - -124.1178036, - 44.3221064 - ], - [ - -124.1177419, - 44.322262 - ], - [ - -124.1175288, - 44.3227845 - ], - [ - -124.1174785, - 44.3229098 - ], - [ - -124.1170405, - 44.3240554 - ], - [ - -124.1170213, - 44.3241054 - ], - [ - -124.1168324, - 44.3245904 - ], - [ - -124.1168315, - 44.3245902 - ], - [ - -124.1166258, - 44.3251278 - ], - [ - -124.1166226, - 44.3251349 - ], - [ - -124.1165565, - 44.325299 - ], - [ - -124.1161512, - 44.3263089 - ], - [ - -124.1161142, - 44.3264008 - ], - [ - -124.1161032, - 44.3264281 - ], - [ - -124.1160336, - 44.3265994 - ], - [ - -124.1159812, - 44.3267369 - ], - [ - -124.1158146, - 44.3271913 - ], - [ - -124.115707, - 44.3274697 - ], - [ - -124.1156584, - 44.3275892 - ], - [ - -124.1156242, - 44.3276809 - ], - [ - -124.115579, - 44.3277994 - ], - [ - -124.1149614, - 44.3293835 - ], - [ - -124.1149497, - 44.3294133 - ], - [ - -124.1146229, - 44.3302423 - ], - [ - -124.1145852, - 44.3303364 - ], - [ - -124.1142376, - 44.3311887 - ], - [ - -124.1142183, - 44.3312536 - ], - [ - -124.1140519, - 44.3316548 - ], - [ - -124.1139359, - 44.3320262 - ], - [ - -124.1136812, - 44.3327306 - ], - [ - -124.1136202, - 44.3328786 - ], - [ - -124.1136061, - 44.3329127 - ], - [ - -124.1132592, - 44.3337448 - ], - [ - -124.1131027, - 44.3341318 - ], - [ - -124.1131003, - 44.3341377 - ], - [ - -124.1130134, - 44.3344515 - ], - [ - -124.1129149, - 44.3348774 - ], - [ - -124.1128885, - 44.3348742 - ], - [ - -124.1128695, - 44.3351191 - ], - [ - -124.1127381, - 44.3356275 - ], - [ - -124.1125761, - 44.3363051 - ], - [ - -124.1117773, - 44.3399456 - ], - [ - -124.1115533, - 44.341014 - ], - [ - -124.1115449, - 44.3410533 - ], - [ - -124.1112364, - 44.3424887 - ], - [ - -124.1110386, - 44.3434099 - ], - [ - -124.1107896, - 44.3446237 - ], - [ - -124.1106784, - 44.3451988 - ], - [ - -124.1106179, - 44.3454838 - ], - [ - -124.1101728, - 44.3474097 - ], - [ - -124.109914, - 44.3486355 - ], - [ - -124.1098628, - 44.3488619 - ], - [ - -124.1097769, - 44.3492179 - ], - [ - -124.1097462, - 44.349341 - ], - [ - -124.10969, - 44.3495587 - ], - [ - -124.1093814, - 44.3510941 - ], - [ - -124.1093533, - 44.3512279 - ], - [ - -124.1092372, - 44.3517588 - ], - [ - -124.1090343, - 44.3527567 - ], - [ - -124.1090175, - 44.3528372 - ], - [ - -124.1088467, - 44.3536353 - ], - [ - -124.108749, - 44.3540401 - ], - [ - -124.1087027, - 44.3542129 - ], - [ - -124.1086157, - 44.3546418 - ], - [ - -124.1085527, - 44.3549262 - ], - [ - -124.1084149, - 44.3554992 - ], - [ - -124.1076255, - 44.3575526 - ], - [ - -124.106293, - 44.359456 - ], - [ - -124.1044683, - 44.3611362 - ], - [ - -124.1022217, - 44.3625288 - ], - [ - -124.0996394, - 44.3635802 - ], - [ - -124.0968208, - 44.3642498 - ], - [ - -124.0938742, - 44.3645121 - ], - [ - -124.0909129, - 44.3643568 - ], - [ - -124.0880508, - 44.3637901 - ], - [ - -124.0853978, - 44.3628335 - ], - [ - -124.0830561, - 44.3615241 - ], - [ - -124.0811156, - 44.359912 - ], - [ - -124.0796508, - 44.3580592 - ], - [ - -124.0787181, - 44.356037 - ], - [ - -124.0783532, - 44.3539232 - ], - [ - -124.07857, - 44.3517988 - ], - [ - -124.078674, - 44.3513677 - ], - [ - -124.0787822, - 44.3508352 - ], - [ - -124.0788979, - 44.3503449 - ], - [ - -124.0789557, - 44.3501297 - ], - [ - -124.0790747, - 44.349575 - ], - [ - -124.0792818, - 44.3485594 - ], - [ - -124.0793064, - 44.3484431 - ], - [ - -124.0794208, - 44.347921 - ], - [ - -124.0797598, - 44.346239 - ], - [ - -124.0798577, - 44.345813 - ], - [ - -124.0799529, - 44.3454445 - ], - [ - -124.0799968, - 44.3452632 - ], - [ - -124.0802481, - 44.3440756 - ], - [ - -124.0802814, - 44.3439252 - ], - [ - -124.080712, - 44.3420664 - ], - [ - -124.0808045, - 44.3415892 - ], - [ - -124.0808224, - 44.3414995 - ], - [ - -124.0810887, - 44.3402045 - ], - [ - -124.081104, - 44.3401319 - ], - [ - -124.0813103, - 44.3391739 - ], - [ - -124.0816156, - 44.3377564 - ], - [ - -124.0818438, - 44.3366711 - ], - [ - -124.0818595, - 44.3365978 - ], - [ - -124.0826845, - 44.3328469 - ], - [ - -124.0827184, - 44.3326992 - ], - [ - -124.0829121, - 44.3318907 - ], - [ - -124.0830514, - 44.3312999 - ], - [ - -124.0831861, - 44.3307187 - ], - [ - -124.0832725, - 44.3303793 - ], - [ - -124.0834787, - 44.3296363 - ], - [ - -124.0835526, - 44.3293855 - ], - [ - -124.0836387, - 44.3291095 - ], - [ - -124.0838764, - 44.3284462 - ], - [ - -124.0840296, - 44.3280683 - ], - [ - -124.0842029, - 44.3276404 - ], - [ - -124.0842382, - 44.3275544 - ], - [ - -124.0845096, - 44.3269043 - ], - [ - -124.0845454, - 44.3267899 - ], - [ - -124.0846939, - 44.3264385 - ], - [ - -124.0847499, - 44.3262505 - ], - [ - -124.085026, - 44.3254677 - ], - [ - -124.0855131, - 44.3242747 - ], - [ - -124.0858158, - 44.3235078 - ], - [ - -124.0864053, - 44.3219979 - ], - [ - -124.0864612, - 44.3218482 - ], - [ - -124.0865524, - 44.3216144 - ], - [ - -124.086592, - 44.3215171 - ], - [ - -124.0867269, - 44.3211499 - ], - [ - -124.0867662, - 44.3210448 - ], - [ - -124.0868713, - 44.3207698 - ], - [ - -124.0869354, - 44.3206069 - ], - [ - -124.0870694, - 44.3202766 - ], - [ - -124.0874725, - 44.3192733 - ], - [ - -124.0874774, - 44.3192611 - ], - [ - -124.0875985, - 44.3189611 - ], - [ - -124.0876107, - 44.3189322 - ], - [ - -124.087681, - 44.3187357 - ], - [ - -124.0878604, - 44.3182757 - ], - [ - -124.0883151, - 44.3170877 - ], - [ - -124.088368, - 44.3169531 - ], - [ - -124.088454, - 44.3167391 - ], - [ - -124.0884714, - 44.3166961 - ], - [ - -124.0886619, - 44.3162298 - ], - [ - -124.0888899, - 44.3156388 - ], - [ - -124.0889037, - 44.3156033 - ], - [ - -124.0891684, - 44.3149264 - ], - [ - -124.0894174, - 44.3142828 - ], - [ - -124.0890322, - 44.313165 - ], - [ - -124.0889005, - 44.3110123 - ], - [ - -124.0893629, - 44.3088833 - ], - [ - -124.0904013, - 44.3068617 - ], - [ - -124.0919748, - 44.3050269 - ], - [ - -124.0940214, - 44.3034511 - ], - [ - -124.0964607, - 44.3021963 - ], - [ - -124.0991967, - 44.3013118 - ], - [ - -124.1021219, - 44.3008323 - ], - [ - -124.1051214, - 44.3007767 - ], - [ - -124.1065336, - 44.3008514 - ], - [ - -124.109456, - 44.3012152 - ], - [ - -124.1122235, - 44.3019814 - ], - [ - -124.1147298, - 44.3031206 - ], - [ - -124.1168785, - 44.304589 - ], - [ - -124.1185871, - 44.3063301 - ], - [ - -124.11979, - 44.3082771 - ], - [ - -124.1204408, - 44.3103553 - ], - [ - -124.1205146, - 44.3124846 - ], - [ - -124.1200083, - 44.3145834 - ], - [ - -124.11987, - 44.3148411 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456756_s_2456756", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0902915, - 44.3117717 - ], - [ - -124.090543, - 44.3096494 - ], - [ - -124.0913663, - 44.307603 - ], - [ - -124.0927296, - 44.3057113 - ], - [ - -124.0945806, - 44.3040469 - ], - [ - -124.0968482, - 44.3026737 - ], - [ - -124.099445, - 44.3016446 - ], - [ - -124.1022715, - 44.300999 - ], - [ - -124.1052191, - 44.3007617 - ], - [ - -124.1081744, - 44.3009418 - ], - [ - -124.1110241, - 44.3015325 - ], - [ - -124.1136586, - 44.3025111 - ], - [ - -124.1159768, - 44.3038398 - ], - [ - -124.1178896, - 44.3054678 - ], - [ - -124.1193234, - 44.3073325 - ], - [ - -124.1202232, - 44.3093621 - ], - [ - -124.1205542, - 44.3114789 - ], - [ - -124.1203038, - 44.3136013 - ], - [ - -124.1194815, - 44.3156478 - ], - [ - -124.1181188, - 44.3175399 - ], - [ - -124.1162681, - 44.3192047 - ], - [ - -124.1140004, - 44.3205782 - ], - [ - -124.1114029, - 44.3216077 - ], - [ - -124.1085756, - 44.3222535 - ], - [ - -124.105627, - 44.3224909 - ], - [ - -124.1026705, - 44.3223107 - ], - [ - -124.0998199, - 44.3217198 - ], - [ - -124.0971847, - 44.320741 - ], - [ - -124.0948663, - 44.3194118 - ], - [ - -124.0929537, - 44.3177835 - ], - [ - -124.0915204, - 44.3159185 - ], - [ - -124.0906216, - 44.3138886 - ], - [ - -124.0902915, - 44.3117717 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456757_s_15950", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.1031156, - 44.3799833 - ], - [ - -124.1031738, - 44.3806499 - ], - [ - -124.1033418, - 44.3819141 - ], - [ - -124.10335, - 44.3819784 - ], - [ - -124.1034998, - 44.3831805 - ], - [ - -124.1037245, - 44.3849096 - ], - [ - -124.1037881, - 44.3860841 - ], - [ - -124.1037763, - 44.3866401 - ], - [ - -124.1035447, - 44.3883736 - ], - [ - -124.1033988, - 44.3889626 - ], - [ - -124.1031866, - 44.3896787 - ], - [ - -124.1029977, - 44.3902247 - ], - [ - -124.102973, - 44.3902951 - ], - [ - -124.1027639, - 44.3908826 - ], - [ - -124.1020002, - 44.3930521 - ], - [ - -124.1015934, - 44.3940167 - ], - [ - -124.1014031, - 44.3944025 - ], - [ - -124.1014003, - 44.3944832 - ], - [ - -124.1013789, - 44.3948491 - ], - [ - -124.1013089, - 44.3957025 - ], - [ - -124.1012445, - 44.3969531 - ], - [ - -124.1012128, - 44.397577 - ], - [ - -124.1012048, - 44.3977337 - ], - [ - -124.1011816, - 44.3981843 - ], - [ - -124.1011777, - 44.3982543 - ], - [ - -124.1011687, - 44.3984023 - ], - [ - -124.1010808, - 44.3998386 - ], - [ - -124.1010489, - 44.400212 - ], - [ - -124.1010049, - 44.4006145 - ], - [ - -124.100913, - 44.4019318 - ], - [ - -124.1008832, - 44.4022594 - ], - [ - -124.1008233, - 44.4027934 - ], - [ - -124.1008113, - 44.4028948 - ], - [ - -124.1007514, - 44.4033728 - ], - [ - -124.1007195, - 44.4036008 - ], - [ - -124.1005997, - 44.4043738 - ], - [ - -124.1005802, - 44.4044932 - ], - [ - -124.1004454, - 44.4052832 - ], - [ - -124.100416, - 44.4054454 - ], - [ - -124.1000664, - 44.4072665 - ], - [ - -124.0999824, - 44.4077445 - ], - [ - -124.0999488, - 44.4079237 - ], - [ - -124.0997923, - 44.4087088 - ], - [ - -124.099659, - 44.4095065 - ], - [ - -124.0996447, - 44.4095895 - ], - [ - -124.0995299, - 44.4102345 - ], - [ - -124.0994855, - 44.4104643 - ], - [ - -124.099051, - 44.412549 - ], - [ - -124.0990105, - 44.4128302 - ], - [ - -124.0987502, - 44.4140044 - ], - [ - -124.0985054, - 44.4148184 - ], - [ - -124.0979547, - 44.4161993 - ], - [ - -124.0977028, - 44.4167023 - ], - [ - -124.0972438, - 44.4175143 - ], - [ - -124.0971003, - 44.4177414 - ], - [ - -124.0969707, - 44.4179796 - ], - [ - -124.0967263, - 44.4184024 - ], - [ - -124.0966233, - 44.4185704 - ], - [ - -124.0950782, - 44.4205175 - ], - [ - -124.0947254, - 44.4208713 - ], - [ - -124.0943527, - 44.4212461 - ], - [ - -124.0940281, - 44.4215603 - ], - [ - -124.0935992, - 44.4219603 - ], - [ - -124.0934046, - 44.4221416 - ], - [ - -124.0933622, - 44.4221182 - ], - [ - -124.0923424, - 44.4230696 - ], - [ - -124.0901059, - 44.4244735 - ], - [ - -124.0875299, - 44.4255375 - ], - [ - -124.0847136, - 44.4262208 - ], - [ - -124.0836607, - 44.4263194 - ], - [ - -124.0816584, - 44.4267022 - ], - [ - -124.0785191, - 44.4268214 - ], - [ - -124.0783637, - 44.4268157 - ], - [ - -124.0770918, - 44.4269718 - ], - [ - -124.0741204, - 44.4269147 - ], - [ - -124.0712218, - 44.4264433 - ], - [ - -124.0685072, - 44.4255757 - ], - [ - -124.0660811, - 44.4243452 - ], - [ - -124.0640368, - 44.4227991 - ], - [ - -124.0624527, - 44.4209968 - ], - [ - -124.0613897, - 44.4190077 - ], - [ - -124.0608887, - 44.4169082 - ], - [ - -124.0609688, - 44.4147789 - ], - [ - -124.0616269, - 44.4127018 - ], - [ - -124.0628376, - 44.4107566 - ], - [ - -124.0645544, - 44.4090181 - ], - [ - -124.0667113, - 44.407553 - ], - [ - -124.0674542, - 44.4072175 - ], - [ - -124.0676466, - 44.4071181 - ], - [ - -124.0678293, - 44.4070481 - ], - [ - -124.0692253, - 44.4064176 - ], - [ - -124.0696636, - 44.4062973 - ], - [ - -124.0697138, - 44.4059975 - ], - [ - -124.0697587, - 44.4057533 - ], - [ - -124.0699221, - 44.4049358 - ], - [ - -124.0700014, - 44.4044855 - ], - [ - -124.0700242, - 44.4043616 - ], - [ - -124.0703711, - 44.4025596 - ], - [ - -124.0704822, - 44.4019105 - ], - [ - -124.0705754, - 44.4013111 - ], - [ - -124.0706125, - 44.4010159 - ], - [ - -124.0706136, - 44.4010064 - ], - [ - -124.070651, - 44.4006762 - ], - [ - -124.0707427, - 44.3993712 - ], - [ - -124.0707703, - 44.399064 - ], - [ - -124.070811, - 44.3986945 - ], - [ - -124.0708859, - 44.3974812 - ], - [ - -124.0708873, - 44.397456 - ], - [ - -124.070916, - 44.3969281 - ], - [ - -124.0709234, - 44.3967833 - ], - [ - -124.0709556, - 44.3961557 - ], - [ - -124.0710272, - 44.3947781 - ], - [ - -124.0710432, - 44.3945409 - ], - [ - -124.0711083, - 44.3937517 - ], - [ - -124.0711169, - 44.3935088 - ], - [ - -124.071138, - 44.3931489 - ], - [ - -124.0711607, - 44.3928716 - ], - [ - -124.0711805, - 44.3924404 - ], - [ - -124.071246, - 44.3917265 - ], - [ - -124.0712891, - 44.3914145 - ], - [ - -124.0715879, - 44.3900906 - ], - [ - -124.071673, - 44.3898206 - ], - [ - -124.071975, - 44.3890092 - ], - [ - -124.0722841, - 44.3882913 - ], - [ - -124.0724791, - 44.3878694 - ], - [ - -124.0727895, - 44.3872409 - ], - [ - -124.0733766, - 44.3855754 - ], - [ - -124.0733244, - 44.3851724 - ], - [ - -124.0733191, - 44.3851306 - ], - [ - -124.0731714, - 44.3839398 - ], - [ - -124.072985, - 44.3825319 - ], - [ - -124.0729465, - 44.3821799 - ], - [ - -124.0728099, - 44.3806059 - ], - [ - -124.0727935, - 44.3794833 - ], - [ - -124.0728096, - 44.3792026 - ], - [ - -124.0728349, - 44.3787288 - ], - [ - -124.0729862, - 44.3775573 - ], - [ - -124.0730974, - 44.3770173 - ], - [ - -124.0731003, - 44.3770032 - ], - [ - -124.0734697, - 44.3752242 - ], - [ - -124.0734904, - 44.3751277 - ], - [ - -124.0743494, - 44.3712318 - ], - [ - -124.0743578, - 44.371194 - ], - [ - -124.0748313, - 44.3690941 - ], - [ - -124.0749078, - 44.3687548 - ], - [ - -124.0752911, - 44.3668383 - ], - [ - -124.0753322, - 44.366645 - ], - [ - -124.0757964, - 44.3645877 - ], - [ - -124.0762646, - 44.3623435 - ], - [ - -124.0763021, - 44.3621733 - ], - [ - -124.0766222, - 44.3607891 - ], - [ - -124.0767946, - 44.3600203 - ], - [ - -124.0771021, - 44.3586346 - ], - [ - -124.0771446, - 44.3584441 - ], - [ - -124.077264, - 44.3578462 - ], - [ - -124.0772672, - 44.35783 - ], - [ - -124.0773453, - 44.357443 - ], - [ - -124.0773932, - 44.3572219 - ], - [ - -124.0775671, - 44.3564696 - ], - [ - -124.0776756, - 44.3559386 - ], - [ - -124.0776783, - 44.3559256 - ], - [ - -124.0779186, - 44.3547597 - ], - [ - -124.0779526, - 44.3546026 - ], - [ - -124.0780795, - 44.3540435 - ], - [ - -124.0781913, - 44.3534966 - ], - [ - -124.0782339, - 44.3533006 - ], - [ - -124.0783951, - 44.3526009 - ], - [ - -124.0785035, - 44.3520893 - ], - [ - -124.0785521, - 44.3518748 - ], - [ - -124.0786736, - 44.3513697 - ], - [ - -124.0787822, - 44.3508352 - ], - [ - -124.0788979, - 44.3503449 - ], - [ - -124.0789551, - 44.3501321 - ], - [ - -124.0790743, - 44.3495747 - ], - [ - -124.07981, - 44.3475112 - ], - [ - -124.0810925, - 44.3455902 - ], - [ - -124.0828725, - 44.3438857 - ], - [ - -124.0850817, - 44.3424631 - ], - [ - -124.087635, - 44.3413771 - ], - [ - -124.0904343, - 44.3406694 - ], - [ - -124.0933723, - 44.3403671 - ], - [ - -124.096336, - 44.3404819 - ], - [ - -124.0992116, - 44.3410093 - ], - [ - -124.1018886, - 44.3419292 - ], - [ - -124.1042642, - 44.3432061 - ], - [ - -124.1062471, - 44.3447911 - ], - [ - -124.1077611, - 44.3466231 - ], - [ - -124.1087481, - 44.348632 - ], - [ - -124.10917, - 44.3507404 - ], - [ - -124.1090105, - 44.3528673 - ], - [ - -124.1088477, - 44.3536303 - ], - [ - -124.108749, - 44.3540401 - ], - [ - -124.1087027, - 44.3542129 - ], - [ - -124.1086157, - 44.3546418 - ], - [ - -124.1085537, - 44.3549222 - ], - [ - -124.1084245, - 44.3554602 - ], - [ - -124.1083244, - 44.3559337 - ], - [ - -124.1082938, - 44.3560724 - ], - [ - -124.1081395, - 44.3567436 - ], - [ - -124.1080306, - 44.3572775 - ], - [ - -124.1079941, - 44.3574474 - ], - [ - -124.107866, - 44.358013 - ], - [ - -124.1076438, - 44.3590939 - ], - [ - -124.1075163, - 44.3597194 - ], - [ - -124.1074725, - 44.3599211 - ], - [ - -124.1073011, - 44.3606637 - ], - [ - -124.1072472, - 44.3609319 - ], - [ - -124.1071119, - 44.3616109 - ], - [ - -124.1070744, - 44.3617889 - ], - [ - -124.1070156, - 44.3620527 - ], - [ - -124.1067081, - 44.3634415 - ], - [ - -124.1067044, - 44.3634581 - ], - [ - -124.1065246, - 44.3642621 - ], - [ - -124.1065125, - 44.3643157 - ], - [ - -124.1062064, - 44.3656417 - ], - [ - -124.1057437, - 44.3678646 - ], - [ - -124.1057161, - 44.367992 - ], - [ - -124.1052604, - 44.3700165 - ], - [ - -124.1048782, - 44.3719328 - ], - [ - -124.1048373, - 44.3721254 - ], - [ - -124.1047395, - 44.3725602 - ], - [ - -124.1042713, - 44.3746411 - ], - [ - -124.103429, - 44.3784701 - ], - [ - -124.1031156, - 44.3799833 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456757_s_15970", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0895216, - 44.425585 - ], - [ - -124.0894305, - 44.4256697 - ], - [ - -124.089019, - 44.4260355 - ], - [ - -124.088384, - 44.4265755 - ], - [ - -124.0873879, - 44.4273441 - ], - [ - -124.0869239, - 44.4276692 - ], - [ - -124.0862835, - 44.4280927 - ], - [ - -124.085858, - 44.4283583 - ], - [ - -124.0845515, - 44.4292073 - ], - [ - -124.0838723, - 44.4296232 - ], - [ - -124.0831542, - 44.4300372 - ], - [ - -124.0826715, - 44.4303043 - ], - [ - -124.0823443, - 44.4304779 - ], - [ - -124.0822982, - 44.4305156 - ], - [ - -124.081738, - 44.4309495 - ], - [ - -124.081378, - 44.4312136 - ], - [ - -124.0800703, - 44.4320669 - ], - [ - -124.0797443, - 44.4322559 - ], - [ - -124.0796582, - 44.432299 - ], - [ - -124.0779202, - 44.4337432 - ], - [ - -124.075577, - 44.435054 - ], - [ - -124.0729218, - 44.436012 - ], - [ - -124.0700568, - 44.4365803 - ], - [ - -124.067092, - 44.4367372 - ], - [ - -124.0641414, - 44.4364766 - ], - [ - -124.0613186, - 44.4358085 - ], - [ - -124.058732, - 44.4347586 - ], - [ - -124.0564811, - 44.4333672 - ], - [ - -124.0546524, - 44.431688 - ], - [ - -124.0533161, - 44.4297853 - ], - [ - -124.0525236, - 44.4277324 - ], - [ - -124.0523053, - 44.4256081 - ], - [ - -124.0526695, - 44.4234942 - ], - [ - -124.0526955, - 44.4234112 - ], - [ - -124.0531899, - 44.4221791 - ], - [ - -124.053341, - 44.4218721 - ], - [ - -124.0539387, - 44.4208324 - ], - [ - -124.0541358, - 44.4205344 - ], - [ - -124.0554464, - 44.4189254 - ], - [ - -124.0558115, - 44.4185544 - ], - [ - -124.056905, - 44.4175696 - ], - [ - -124.057161, - 44.4173646 - ], - [ - -124.0585304, - 44.416399 - ], - [ - -124.0589024, - 44.416168 - ], - [ - -124.0605452, - 44.4152803 - ], - [ - -124.0608325, - 44.415146 - ], - [ - -124.0609584, - 44.4150559 - ], - [ - -124.0609688, - 44.4147789 - ], - [ - -124.0616269, - 44.4127018 - ], - [ - -124.0628376, - 44.4107566 - ], - [ - -124.0645544, - 44.4090181 - ], - [ - -124.0667113, - 44.407553 - ], - [ - -124.0674542, - 44.4072175 - ], - [ - -124.0676466, - 44.4071181 - ], - [ - -124.0678293, - 44.4070481 - ], - [ - -124.0692253, - 44.4064176 - ], - [ - -124.0701107, - 44.4061745 - ], - [ - -124.0712221, - 44.4057489 - ], - [ - -124.071428, - 44.4056939 - ], - [ - -124.0744119, - 44.4051371 - ], - [ - -124.0767485, - 44.4050518 - ], - [ - -124.0792314, - 44.4047386 - ], - [ - -124.081904, - 44.4047431 - ], - [ - -124.082211, - 44.4047631 - ], - [ - -124.0833236, - 44.4048655 - ], - [ - -124.0837685, - 44.4049185 - ], - [ - -124.0865361, - 44.4054446 - ], - [ - -124.0891163, - 44.4063343 - ], - [ - -124.0914171, - 44.407556 - ], - [ - -124.0933565, - 44.409066 - ], - [ - -124.0948653, - 44.4108105 - ], - [ - -124.0958895, - 44.4127272 - ], - [ - -124.0963926, - 44.4147478 - ], - [ - -124.0963566, - 44.4168001 - ], - [ - -124.0957827, - 44.418811 - ], - [ - -124.0946914, - 44.4207087 - ], - [ - -124.0931215, - 44.4224253 - ], - [ - -124.0926425, - 44.4228544 - ], - [ - -124.0925013, - 44.422979 - ], - [ - -124.0922552, - 44.4231929 - ], - [ - -124.0916887, - 44.4236945 - ], - [ - -124.0916108, - 44.4237628 - ], - [ - -124.0907449, - 44.4245169 - ], - [ - -124.0906009, - 44.4246404 - ], - [ - -124.0900926, - 44.4250699 - ], - [ - -124.0897748, - 44.4253603 - ], - [ - -124.0895216, - 44.425585 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456758_s_15962", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0901729, - 44.4386745 - ], - [ - -124.0902192, - 44.4387697 - ], - [ - -124.0906276, - 44.4409098 - ], - [ - -124.0906382, - 44.4411189 - ], - [ - -124.0904596, - 44.4432217 - ], - [ - -124.0897179, - 44.4452604 - ], - [ - -124.0884409, - 44.4471581 - ], - [ - -124.0866766, - 44.4488436 - ], - [ - -124.0844912, - 44.4502535 - ], - [ - -124.081967, - 44.4513347 - ], - [ - -124.0791989, - 44.4520466 - ], - [ - -124.0762909, - 44.4523625 - ], - [ - -124.075934, - 44.4523761 - ], - [ - -124.075483, - 44.4523943 - ], - [ - -124.0726059, - 44.452314 - ], - [ - -124.0698019, - 44.4518458 - ], - [ - -124.0671719, - 44.4510063 - ], - [ - -124.0648109, - 44.449826 - ], - [ - -124.0628039, - 44.4483474 - ], - [ - -124.0612231, - 44.4466237 - ], - [ - -124.0601256, - 44.4447171 - ], - [ - -124.0595507, - 44.4426962 - ], - [ - -124.0595193, - 44.440634 - ], - [ - -124.0596399, - 44.4396093 - ], - [ - -124.0591992, - 44.4392017 - ], - [ - -124.0564695, - 44.4366748 - ], - [ - -124.0558935, - 44.4361043 - ], - [ - -124.0555496, - 44.4357393 - ], - [ - -124.0550749, - 44.4352023 - ], - [ - -124.054844, - 44.4349233 - ], - [ - -124.0547643, - 44.4348206 - ], - [ - -124.0538474, - 44.4342282 - ], - [ - -124.0520707, - 44.4325205 - ], - [ - -124.0507932, - 44.4305972 - ], - [ - -124.050064, - 44.4285323 - ], - [ - -124.0499109, - 44.4264051 - ], - [ - -124.05034, - 44.4242974 - ], - [ - -124.0513345, - 44.4222902 - ], - [ - -124.0528562, - 44.4204605 - ], - [ - -124.0548466, - 44.4188788 - ], - [ - -124.0572293, - 44.4176057 - ], - [ - -124.0599126, - 44.4166901 - ], - [ - -124.0627936, - 44.4161673 - ], - [ - -124.0657614, - 44.4160573 - ], - [ - -124.0659414, - 44.4160633 - ], - [ - -124.0660654, - 44.4160678 - ], - [ - -124.0663204, - 44.4160778 - ], - [ - -124.0663583, - 44.4160793 - ], - [ - -124.0668653, - 44.4161001 - ], - [ - -124.0671268, - 44.4161107 - ], - [ - -124.0679981, - 44.4161436 - ], - [ - -124.0708781, - 44.4164529 - ], - [ - -124.0736225, - 44.4171512 - ], - [ - -124.07613, - 44.4182127 - ], - [ - -124.0783081, - 44.4195981 - ], - [ - -124.0800766, - 44.4212565 - ], - [ - -124.0813701, - 44.4231265 - ], - [ - -124.0820207, - 44.4248256 - ], - [ - -124.083174, - 44.4258929 - ], - [ - -124.0857592, - 44.4282828 - ], - [ - -124.0859265, - 44.4284403 - ], - [ - -124.0860568, - 44.4285654 - ], - [ - -124.0861265, - 44.4286302 - ], - [ - -124.0866223, - 44.4291185 - ], - [ - -124.0868453, - 44.4293514 - ], - [ - -124.0878954, - 44.4306267 - ], - [ - -124.0881354, - 44.4309697 - ], - [ - -124.0887532, - 44.4319764 - ], - [ - -124.0889683, - 44.4323814 - ], - [ - -124.0894122, - 44.4333521 - ], - [ - -124.0895653, - 44.4337491 - ], - [ - -124.0899409, - 44.4350108 - ], - [ - -124.0900451, - 44.4355018 - ], - [ - -124.0902171, - 44.437132 - ], - [ - -124.0902173, - 44.437641 - ], - [ - -124.0902103, - 44.4379733 - ], - [ - -124.0901934, - 44.4383713 - ], - [ - -124.0901729, - 44.4386745 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456760_s_16196", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682458, - 44.6509219 - ], - [ - -124.0682414, - 44.6511816 - ], - [ - -124.0682266, - 44.6516194 - ], - [ - -124.0682246, - 44.651734 - ], - [ - -124.0682215, - 44.6522711 - ], - [ - -124.0682234, - 44.6524042 - ], - [ - -124.0682293, - 44.6527752 - ], - [ - -124.0682303, - 44.6529344 - ], - [ - -124.0682293, - 44.6531474 - ], - [ - -124.0682275, - 44.6535001 - ], - [ - -124.0682275, - 44.653529 - ], - [ - -124.0682274, - 44.6535609 - ], - [ - -124.0682238, - 44.6545015 - ], - [ - -124.068226, - 44.6549833 - ], - [ - -124.0682329, - 44.655109 - ], - [ - -124.0682568, - 44.6553272 - ], - [ - -124.0683942, - 44.6563034 - ], - [ - -124.0684059, - 44.6563643 - ], - [ - -124.0684534, - 44.6565696 - ], - [ - -124.0685439, - 44.6569424 - ], - [ - -124.0686593, - 44.6572378 - ], - [ - -124.0687396, - 44.6574519 - ], - [ - -124.0688135, - 44.6576573 - ], - [ - -124.0693142, - 44.6588364 - ], - [ - -124.0693289, - 44.6588711 - ], - [ - -124.069413, - 44.6590716 - ], - [ - -124.0699847, - 44.6611621 - ], - [ - -124.0699741, - 44.663292 - ], - [ - -124.0693814, - 44.6653795 - ], - [ - -124.0682294, - 44.6673443 - ], - [ - -124.0665623, - 44.669111 - ], - [ - -124.0644441, - 44.6706116 - ], - [ - -124.0619563, - 44.6717885 - ], - [ - -124.0591944, - 44.6725963 - ], - [ - -124.0562647, - 44.6730041 - ], - [ - -124.0532798, - 44.6729961 - ], - [ - -124.0503545, - 44.6725727 - ], - [ - -124.0476012, - 44.6717501 - ], - [ - -124.0451258, - 44.67056 - ], - [ - -124.0430234, - 44.669048 - ], - [ - -124.0413749, - 44.6672725 - ], - [ - -124.0402436, - 44.6653015 - ], - [ - -124.0401668, - 44.6651184 - ], - [ - -124.0395795, - 44.6637336 - ], - [ - -124.0394039, - 44.6632852 - ], - [ - -124.0392876, - 44.6629616 - ], - [ - -124.0390094, - 44.6622483 - ], - [ - -124.0386748, - 44.6611871 - ], - [ - -124.038444, - 44.6602351 - ], - [ - -124.0384238, - 44.6601497 - ], - [ - -124.0383319, - 44.6597517 - ], - [ - -124.0382685, - 44.6594511 - ], - [ - -124.0381916, - 44.6590481 - ], - [ - -124.0381281, - 44.6586644 - ], - [ - -124.0379475, - 44.6573763 - ], - [ - -124.0379176, - 44.657137 - ], - [ - -124.0378578, - 44.656588 - ], - [ - -124.0378233, - 44.6561654 - ], - [ - -124.0377944, - 44.6556334 - ], - [ - -124.0377831, - 44.6552438 - ], - [ - -124.0377803, - 44.6545348 - ], - [ - -124.0377803, - 44.6544717 - ], - [ - -124.0377845, - 44.6534487 - ], - [ - -124.0377846, - 44.6534368 - ], - [ - -124.0377867, - 44.6530717 - ], - [ - -124.0377873, - 44.6529412 - ], - [ - -124.0377827, - 44.6526418 - ], - [ - -124.0377824, - 44.6526257 - ], - [ - -124.0377795, - 44.6524077 - ], - [ - -124.0377789, - 44.652254 - ], - [ - -124.0377831, - 44.651594 - ], - [ - -124.0377832, - 44.6515813 - ], - [ - -124.0377842, - 44.6514513 - ], - [ - -124.0377881, - 44.6512609 - ], - [ - -124.0377911, - 44.6511679 - ], - [ - -124.0377916, - 44.6511544 - ], - [ - -124.0378042, - 44.6507842 - ], - [ - -124.0378044, - 44.6506181 - ], - [ - -124.0380984, - 44.6484985 - ], - [ - -124.0389661, - 44.6464606 - ], - [ - -124.0403739, - 44.6445827 - ], - [ - -124.0422677, - 44.642937 - ], - [ - -124.0445748, - 44.6415865 - ], - [ - -124.0472065, - 44.6405833 - ], - [ - -124.0500616, - 44.6399659 - ], - [ - -124.0530306, - 44.6397579 - ], - [ - -124.0559994, - 44.6399674 - ], - [ - -124.0588539, - 44.6405863 - ], - [ - -124.0614846, - 44.6415909 - ], - [ - -124.0637903, - 44.6429425 - ], - [ - -124.0656824, - 44.6445892 - ], - [ - -124.0670884, - 44.6464678 - ], - [ - -124.0679539, - 44.6485061 - ], - [ - -124.0682459, - 44.6506258 - ], - [ - -124.0682458, - 44.6509219 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456760_s_2455449", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0682455, - 44.6509884 - ], - [ - -124.0682414, - 44.6511816 - ], - [ - -124.0682266, - 44.6516194 - ], - [ - -124.0682263, - 44.6516388 - ], - [ - -124.0687271, - 44.6533379 - ], - [ - -124.06876, - 44.6554677 - ], - [ - -124.0682101, - 44.6575612 - ], - [ - -124.0670985, - 44.6595378 - ], - [ - -124.0654679, - 44.6613217 - ], - [ - -124.0633809, - 44.6628442 - ], - [ - -124.0609178, - 44.6640468 - ], - [ - -124.0581731, - 44.6648833 - ], - [ - -124.0552524, - 44.6653215 - ], - [ - -124.053027, - 44.6653388 - ], - [ - -124.0530256, - 44.6653728 - ], - [ - -124.0525756, - 44.6653638 - ], - [ - -124.0523539, - 44.665344 - ], - [ - -124.052268, - 44.6653446 - ], - [ - -124.052124, - 44.6653356 - ], - [ - -124.0521255, - 44.6653235 - ], - [ - -124.0496616, - 44.6651032 - ], - [ - -124.0468719, - 44.6644482 - ], - [ - -124.0443105, - 44.6634231 - ], - [ - -124.0420727, - 44.662066 - ], - [ - -124.0402416, - 44.6604275 - ], - [ - -124.0388855, - 44.6585685 - ], - [ - -124.0380548, - 44.6565583 - ], - [ - -124.0377803, - 44.6544717 - ], - [ - -124.0377845, - 44.6534487 - ], - [ - -124.0377846, - 44.6534368 - ], - [ - -124.0377867, - 44.6530717 - ], - [ - -124.0377873, - 44.6529412 - ], - [ - -124.0377827, - 44.6526418 - ], - [ - -124.0377824, - 44.6526257 - ], - [ - -124.0377795, - 44.6524077 - ], - [ - -124.0377789, - 44.652254 - ], - [ - -124.0377831, - 44.651594 - ], - [ - -124.0377832, - 44.6515813 - ], - [ - -124.0377842, - 44.6514513 - ], - [ - -124.0377881, - 44.6512609 - ], - [ - -124.0377911, - 44.6511679 - ], - [ - -124.0377916, - 44.6511544 - ], - [ - -124.0378054, - 44.650751 - ], - [ - -124.0378073, - 44.6505429 - ], - [ - -124.0381196, - 44.6484247 - ], - [ - -124.0390047, - 44.6463906 - ], - [ - -124.0404285, - 44.6445189 - ], - [ - -124.0423364, - 44.6428814 - ], - [ - -124.044655, - 44.6415411 - ], - [ - -124.0472953, - 44.6405494 - ], - [ - -124.0501557, - 44.6399445 - ], - [ - -124.0531264, - 44.6397495 - ], - [ - -124.0560933, - 44.6399719 - ], - [ - -124.0589425, - 44.6406033 - ], - [ - -124.0615645, - 44.6416193 - ], - [ - -124.0638585, - 44.642981 - ], - [ - -124.0657366, - 44.644636 - ], - [ - -124.0671263, - 44.6465207 - ], - [ - -124.0679744, - 44.6485627 - ], - [ - -124.0682482, - 44.6506837 - ], - [ - -124.0682455, - 44.6509884 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456760_s_2456760", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0376759, - 44.6507593 - ], - [ - -124.0379306, - 44.6486371 - ], - [ - -124.0387602, - 44.6465912 - ], - [ - -124.040133, - 44.6447001 - ], - [ - -124.0419961, - 44.6430366 - ], - [ - -124.0442779, - 44.6416644 - ], - [ - -124.0468907, - 44.6406363 - ], - [ - -124.0497341, - 44.6399919 - ], - [ - -124.052699, - 44.6397558 - ], - [ - -124.0556714, - 44.6399372 - ], - [ - -124.0585371, - 44.640529 - ], - [ - -124.0611862, - 44.6415085 - ], - [ - -124.0635169, - 44.6428382 - ], - [ - -124.0654395, - 44.6444668 - ], - [ - -124.0668802, - 44.646332 - ], - [ - -124.0677836, - 44.6483619 - ], - [ - -124.0681149, - 44.6504787 - ], - [ - -124.0678614, - 44.6526009 - ], - [ - -124.0670326, - 44.654647 - ], - [ - -124.0656605, - 44.6565384 - ], - [ - -124.0637977, - 44.6582024 - ], - [ - -124.0615157, - 44.6595749 - ], - [ - -124.0589024, - 44.6606033 - ], - [ - -124.056058, - 44.661248 - ], - [ - -124.0530921, - 44.6614841 - ], - [ - -124.0501186, - 44.6613027 - ], - [ - -124.0472519, - 44.6607107 - ], - [ - -124.0446021, - 44.6597309 - ], - [ - -124.0422713, - 44.6584009 - ], - [ - -124.0403488, - 44.6567718 - ], - [ - -124.0389087, - 44.6549063 - ], - [ - -124.0380062, - 44.6528761 - ], - [ - -124.0376759, - 44.6507593 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2456766_s_16071", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0072436, - 44.9705607 - ], - [ - -124.0074355, - 44.9705717 - ], - [ - -124.0074797, - 44.9705743 - ], - [ - -124.0076816, - 44.9705863 - ], - [ - -124.0106326, - 44.9709711 - ], - [ - -124.0134213, - 44.971757 - ], - [ - -124.0159404, - 44.972914 - ], - [ - -124.0180932, - 44.9743976 - ], - [ - -124.0197971, - 44.9761507 - ], - [ - -124.0209864, - 44.9781061 - ], - [ - -124.0216155, - 44.9801886 - ], - [ - -124.02166, - 44.9823182 - ], - [ - -124.0211183, - 44.984413 - ], - [ - -124.0200111, - 44.9863926 - ], - [ - -124.0183809, - 44.9881808 - ], - [ - -124.0162903, - 44.9897089 - ], - [ - -124.0138197, - 44.9909182 - ], - [ - -124.011064, - 44.9917622 - ], - [ - -124.0081291, - 44.9922084 - ], - [ - -124.0068924, - 44.9922213 - ], - [ - -124.005961, - 44.9927323 - ], - [ - -124.0058686, - 44.9928134 - ], - [ - -124.0035626, - 44.9941768 - ], - [ - -124.000926, - 44.9951947 - ], - [ - -123.99806, - 44.9958279 - ], - [ - -123.9950751, - 44.9960522 - ], - [ - -123.994949, - 44.9960529 - ], - [ - -123.9919979, - 44.9958648 - ], - [ - -123.9891533, - 44.9952768 - ], - [ - -123.9865215, - 44.9943111 - ], - [ - -123.9842013, - 44.9930038 - ], - [ - -123.9822794, - 44.9914038 - ], - [ - -123.9808279, - 44.9895711 - ], - [ - -123.9799011, - 44.9875743 - ], - [ - -123.9795335, - 44.9854882 - ], - [ - -123.9794768, - 44.9840248 - ], - [ - -123.9796884, - 44.9819019 - ], - [ - -123.9804789, - 44.9798491 - ], - [ - -123.9818181, - 44.977945 - ], - [ - -123.9836544, - 44.9762627 - ], - [ - -123.9852002, - 44.9753091 - ], - [ - -123.9853686, - 44.975124 - ], - [ - -123.9856262, - 44.9748401 - ], - [ - -123.987845, - 44.9729187 - ], - [ - -123.988034, - 44.9727887 - ], - [ - -123.9905147, - 44.9714041 - ], - [ - -123.9933426, - 44.97041 - ], - [ - -123.9935506, - 44.970355 - ], - [ - -123.9974665, - 44.9697188 - ], - [ - -123.9978424, - 44.9696938 - ], - [ - -123.9978895, - 44.9696907 - ], - [ - -123.9991493, - 44.9696098 - ], - [ - -124.0004346, - 44.9695657 - ], - [ - -124.0006606, - 44.9695647 - ], - [ - -124.004127, - 44.9698312 - ], - [ - -124.004283, - 44.9698562 - ], - [ - -124.0055211, - 44.9700937 - ], - [ - -124.0056951, - 44.9701327 - ], - [ - -124.0072436, - 44.9705607 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2483495_s_16066", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.069884, - 44.6612268 - ], - [ - -124.0699935, - 44.6616801 - ], - [ - -124.0699965, - 44.6617141 - ], - [ - -124.0699635, - 44.6633887 - ], - [ - -124.0695703, - 44.6650397 - ], - [ - -124.0695573, - 44.6650767 - ], - [ - -124.0679611, - 44.6678845 - ], - [ - -124.0678961, - 44.6679645 - ], - [ - -124.0660314, - 44.6697913 - ], - [ - -124.0650211, - 44.6704402 - ], - [ - -124.0644544, - 44.6708679 - ], - [ - -124.0643353, - 44.6709469 - ], - [ - -124.0638483, - 44.6712566 - ], - [ - -124.0636923, - 44.6713516 - ], - [ - -124.0625092, - 44.6720033 - ], - [ - -124.0623482, - 44.6720833 - ], - [ - -124.0610926, - 44.6726446 - ], - [ - -124.0609226, - 44.6727126 - ], - [ - -124.0597078, - 44.6731489 - ], - [ - -124.0595328, - 44.6732049 - ], - [ - -124.0571225, - 44.6738086 - ], - [ - -124.0569765, - 44.6738356 - ], - [ - -124.0558501, - 44.673923 - ], - [ - -124.0557949, - 44.6739378 - ], - [ - -124.0556779, - 44.6739588 - ], - [ - -124.0527256, - 44.6742734 - ], - [ - -124.0497441, - 44.6741709 - ], - [ - -124.0468479, - 44.6736553 - ], - [ - -124.0441484, - 44.6727463 - ], - [ - -124.0417494, - 44.6714789 - ], - [ - -124.0397431, - 44.6699019 - ], - [ - -124.0382066, - 44.6680759 - ], - [ - -124.037199, - 44.6660711 - ], - [ - -124.0367588, - 44.6639644 - ], - [ - -124.0369029, - 44.661837 - ], - [ - -124.037214, - 44.6609478 - ], - [ - -124.0372581, - 44.6607009 - ], - [ - -124.0374398, - 44.6603023 - ], - [ - -124.0376258, - 44.6597705 - ], - [ - -124.0378074, - 44.6594959 - ], - [ - -124.0381416, - 44.658763 - ], - [ - -124.0381439, - 44.6587599 - ], - [ - -124.0381281, - 44.6586644 - ], - [ - -124.0379475, - 44.6573763 - ], - [ - -124.0379176, - 44.657137 - ], - [ - -124.0378578, - 44.656588 - ], - [ - -124.0378233, - 44.6561654 - ], - [ - -124.0377944, - 44.6556334 - ], - [ - -124.0377831, - 44.6552438 - ], - [ - -124.0377803, - 44.6545348 - ], - [ - -124.0380758, - 44.6523732 - ], - [ - -124.0389677, - 44.6502967 - ], - [ - -124.0404202, - 44.6483884 - ], - [ - -124.0423754, - 44.6467243 - ], - [ - -124.0447549, - 44.6453711 - ], - [ - -124.0474639, - 44.6443827 - ], - [ - -124.050394, - 44.6437986 - ], - [ - -124.0534283, - 44.6436422 - ], - [ - -124.0538782, - 44.6436512 - ], - [ - -124.0547625, - 44.6436873 - ], - [ - -124.0550704, - 44.6437063 - ], - [ - -124.0573334, - 44.6439696 - ], - [ - -124.0575654, - 44.6440096 - ], - [ - -124.0603505, - 44.6446995 - ], - [ - -124.0628973, - 44.6457597 - ], - [ - -124.06511, - 44.6471505 - ], - [ - -124.0669057, - 44.6488197 - ], - [ - -124.0682169, - 44.6507047 - ], - [ - -124.0689946, - 44.6527348 - ], - [ - -124.0692093, - 44.6548339 - ], - [ - -124.06919, - 44.6549472 - ], - [ - -124.0692268, - 44.655254 - ], - [ - -124.0691846, - 44.6574082 - ], - [ - -124.0689863, - 44.6580641 - ], - [ - -124.0693142, - 44.6588364 - ], - [ - -124.069859, - 44.6606861 - ], - [ - -124.069884, - 44.6612268 - ] - ] - ] - } - }, - { - "id": "radius_1207_s_2483495_s_29681", - "type": "Feature", - "geometry": { - "type": "Polygon", - "coordinates": [ - [ - [ - -124.0387506, - 44.6547672 - ], - [ - -124.0383073, - 44.653771 - ], - [ - -124.0379763, - 44.6516542 - ], - [ - -124.0382301, - 44.649532 - ], - [ - -124.039059, - 44.6474859 - ], - [ - -124.0404311, - 44.6455946 - ], - [ - -124.0422936, - 44.6439307 - ], - [ - -124.0445749, - 44.6425581 - ], - [ - -124.0471873, - 44.6415295 - ], - [ - -124.0500306, - 44.6408845 - ], - [ - -124.0529954, - 44.6406479 - ], - [ - -124.0535517, - 44.6406426 - ], - [ - -124.0566636, - 44.6408423 - ], - [ - -124.0596528, - 44.6414914 - ], - [ - -124.0623935, - 44.6425626 - ], - [ - -124.06477, - 44.6440108 - ], - [ - -124.0654129, - 44.6444922 - ], - [ - -124.065851, - 44.6448347 - ], - [ - -124.0667064, - 44.6455328 - ], - [ - -124.0669274, - 44.6457172 - ], - [ - -124.0676624, - 44.6463447 - ], - [ - -124.069257, - 44.6479941 - ], - [ - -124.0694591, - 44.6482509 - ], - [ - -124.0698322, - 44.6487557 - ], - [ - -124.0701333, - 44.6491905 - ], - [ - -124.071152, - 44.651091 - ], - [ - -124.0716564, - 44.6530938 - ], - [ - -124.0716289, - 44.6551285 - ], - [ - -124.0715559, - 44.6556299 - ], - [ - -124.0714292, - 44.6562984 - ], - [ - -124.0713867, - 44.6564801 - ], - [ - -124.0713235, - 44.6568231 - ], - [ - -124.0711309, - 44.657631 - ], - [ - -124.0710278, - 44.6579825 - ], - [ - -124.0701239, - 44.6600303 - ], - [ - -124.0686734, - 44.6619112 - ], - [ - -124.0667329, - 44.6635517 - ], - [ - -124.0643781, - 44.6648879 - ], - [ - -124.0617011, - 44.6658675 - ], - [ - -124.058897, - 44.6664339 - ], - [ - -124.0580681, - 44.6666607 - ], - [ - -124.0550796, - 44.6670196 - ], - [ - -124.0549125, - 44.6670276 - ], - [ - -124.0519294, - 44.6669613 - ], - [ - -124.0490217, - 44.6664808 - ], - [ - -124.0463013, - 44.6656046 - ], - [ - -124.0438728, - 44.6643665 - ], - [ - -124.0418295, - 44.6628141 - ], - [ - -124.04025, - 44.6610069 - ], - [ - -124.0391949, - 44.6590145 - ], - [ - -124.0387047, - 44.6569136 - ], - [ - -124.0387465, - 44.6559625 - ], - [ - -124.0387226, - 44.6557753 - ], - [ - -124.0387506, - 44.6547672 - ] - ] - ] - } - } - ] -} \ No newline at end of file diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/routes.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/routes.txt deleted file mode 100644 index 52c71914b7d..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/routes.txt +++ /dev/null @@ -1,7 +0,0 @@ -agency_id,route_id,route_short_name,route_long_name,route_desc,route_type,route_url,route_color,route_text_color,route_sort_order,min_headway_minutes,eligibility_restricted,continuous_pickup,continuous_drop_off -89,491,,Newport City Loop,"Runs every day through Newport, with stops from South Beach and OCCC to north of Agate Beach.",3,https://www.nworegontransit.org/routes/newport_city_loop/,145098,ffffff,1,,0,1,1 -89,495,,North County,"Runs every day between Newport and Rose Lodge, with stops in Depoe Bay, Lincoln City, and more.",3,https://www.nworegontransit.org/routes/north_county/,145098,ffffff,2,,0,1,1 -89,497,,South County,Service running Monday - Saturday connecting Newport and Yachats.,3,https://www.nworegontransit.org/routes/south_county/,145098,ffffff,3,,0,1,1 -89,493,,East County,"Service running Monday - Saturday connecting Newport, Toledo, and Siletz.",3,https://www.nworegontransit.org/routes/east_county/,145098,ffffff,4,,0,1,1 -89,13317,,Dial-a-Ride,,3,https://www.nworegontransit.org/dial-a-ride-lct/,,,7,,0,1,1 -89,492,,Lincoln City Loop,"Service along Hwy 101, from Chinook Winds and the DMV down to Cutler City.",3,https://www.nworegontransit.org/routes/lincoln_city_loop/,145098,ffffff,8,,0,1,1 diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stop_times.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stop_times.txt deleted file mode 100644 index 643920c1932..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stop_times.txt +++ /dev/null @@ -1,1023 +0,0 @@ -trip_id,arrival_time,departure_time,stop_id,stop_sequence,stop_headsign,pickup_type,drop_off_type,shape_dist_traveled,timepoint,start_service_area_id,end_service_area_id,start_service_area_radius,end_service_area_radius,continuous_pickup,continuous_drop_off,pickup_booking_rule_id,drop_off_booking_rule_id,min_arrival_time,max_departure_time,mean_duration_factor,mean_duration_offset,safe_duration_factor,safe_duration_offset -t_1225545_b_26748_tn_0,,,area_272,1,,2,2,0,0,,,,,1,1,booking_route_13317,booking_route_13317,00:00:00,07:30:00,1,00:10:00,1,00:25:00 -t_1225545_b_26748_tn_0,,,area_272,2,,2,2,0,0,,,,,1,1,booking_route_13317,booking_route_13317,07:30:00,07:30:00,1,00:10:00,1,00:25:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16069_s_16024,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16024_s_16025,2,,0,0,775.596266212284,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16025_s_16026,3,,0,0,1807.22190535612,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16026_s_2483495,4,,0,0,2766.28482550726,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_2483495_s_29681,5,,0,0,5416.75044306174,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_29681_s_16032,6,,0,0,6436.45201007476,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16032_s_2438933,7,,0,0,7576.71452995217,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_2438933_s_16031,8,,0,0,8240.84195654157,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16031_s_16030,9,,0,0,8527.62288862872,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16030_s_16033,10,,0,0,8932.84679637186,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16033_s_16034,11,,0,0,9165.13404331625,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16034_s_15889,12,,0,0,9628.59060260394,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_15889_s_16039,13,,0,0,10510.9386855591,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16039_s_16040,14,,0,0,11686.4154079233,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16040_s_16042,15,,0,0,12047.7835753043,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16042_s_16043,16,,0,0,12324.4604601439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16043_s_16044,17,,0,0,12526.5458089135,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16044_s_16045,18,,0,0,12886.5424727922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16045_s_15942,19,,0,0,13106.2063391676,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_15942_s_16048,20,,0,0,15282.8820371869,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16048_s_2438934,21,,2,3,17060.1720314054,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_2438934_s_16049,22,,0,0,18604.0056042532,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16049_s_16050,23,,0,0,19098.7301834617,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16050_s_16051,24,,0,0,19388.6880759922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16051_s_16052,25,,0,0,20425.6382579853,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16052_s_16053,26,,0,0,20752.5347065814,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16053_s_833259,27,,0,0,21230.9536762786,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_833259_s_16275,28,,0,0,23127.0336395412,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16275_s_16055,29,,0,0,23551.6916242021,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16055_s_16057,30,,0,0,23808.8722434897,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16057_s_16058,31,,0,0,24487.418244042,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16058_s_16059,32,,0,0,24680.6102514857,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16059_s_16060,33,,0,0,25614.1591340582,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16060_s_16061,34,,0,0,26256.131709164,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16061_s_16062,35,,0,0,27180.643659028,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16062_s_16063,36,,0,0,27686.863698439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16063_s_15890,37,,0,0,28259.1890347633,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_15890_s_2438932,38,,0,0,28886.6228332024,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_2438932_s_16065,39,,2,3,29619.901749005,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16065_s_2483495,40,,0,0,30254.2525223819,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_2483495_s_16066,41,,2,3,30838.8763853997,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16066_s_16068,42,,0,0,32312.2465968761,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16068_s_16069,43,,0,0,34898.4147967777,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299223_b_26748_tn_0,,,radius_1207_s_16069_s_16069,44,,0,0,36360.0641114,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16069_s_16024,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16024_s_16025,2,,0,0,775.596266212284,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16025_s_16026,3,,0,0,1807.22190535612,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16026_s_2483495,4,,0,0,2766.28482550726,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_2483495_s_29681,5,,0,0,5416.75044306174,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_29681_s_16032,6,,0,0,6436.45201007476,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16032_s_2438933,7,,0,0,7576.71452995217,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_2438933_s_16031,8,,0,0,8240.84195654157,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16031_s_16030,9,,0,0,8527.62288862872,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16030_s_16033,10,,0,0,8932.84679637186,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16033_s_16034,11,,0,0,9165.13404331625,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16034_s_15889,12,,0,0,9628.59060260394,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_15889_s_16039,13,,0,0,10510.9386855591,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16039_s_16040,14,,0,0,11686.4154079233,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16040_s_16042,15,,0,0,12047.7835753043,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16042_s_16043,16,,0,0,12324.4604601439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16043_s_16044,17,,0,0,12526.5458089135,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16044_s_16045,18,,0,0,12886.5424727922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16045_s_15942,19,,0,0,13106.2063391676,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_15942_s_16048,20,,0,0,15282.8820371869,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16048_s_2438934,21,,2,3,17060.1720314054,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_2438934_s_16049,22,,0,0,18604.0056042532,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16049_s_16050,23,,0,0,19098.7301834617,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16050_s_16051,24,,0,0,19388.6880759922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16051_s_16052,25,,0,0,20425.6382579853,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16052_s_16053,26,,0,0,20752.5347065814,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16053_s_833259,27,,0,0,21230.9536762786,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_833259_s_16275,28,,0,0,23127.0336395412,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16275_s_16055,29,,0,0,23551.6916242021,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16055_s_16057,30,,0,0,23808.8722434897,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16057_s_16058,31,,0,0,24487.418244042,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16058_s_16059,32,,0,0,24680.6102514857,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16059_s_16060,33,,0,0,25614.1591340582,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16060_s_16061,34,,0,0,26256.131709164,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16061_s_16062,35,,0,0,27180.643659028,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16062_s_16063,36,,0,0,27686.863698439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16063_s_15890,37,,0,0,28259.1890347633,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_15890_s_2438932,38,,0,0,28886.6228332024,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_2438932_s_16065,39,,2,3,29619.901749005,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16065_s_2483495,40,,0,0,30254.2525223819,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_2483495_s_16066,41,,2,3,30838.8763853997,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16066_s_16068,42,,0,0,32312.2465968761,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16068_s_16069,43,,0,0,34898.4147967777,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299224_b_26748_tn_0,,,radius_1207_s_16069_s_16069,44,,0,0,36360.0641114,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_759423_s_16185,9,,0,0,6685.31689051341,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16185_s_16086,10,,0,0,8961.70505916116,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16086_s_16087,11,,0,0,10360.6117120665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,10902.6642789545,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299225_b_26748_tn_0,,,radius_1207_s_16088_s_16088,13,,0,0,12081.82250474,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_22284_s_22286,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_22286_s_22283,2,,0,0,580.898703890139,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_22283_s_22285,3,,0,0,1485.07965471661,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_22285_s_16278,4,,0,0,2389.72540975272,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_16278_s_15894,5,,2,3,17038.9069974779,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_15894_s_15882,6,,0,0,20982.6560544094,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_15882_s_15883,7,,0,0,22817.3023837179,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_15883_s_16276,8,,0,0,23629.5651817964,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_16276_s_15885,9,,0,0,23872.2297549312,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_15885_s_15893,10,,0,0,24379.2249071533,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_15893_s_16279,11,,0,0,34442.5528158479,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_16279_s_16275,12,,0,0,36375.0147840304,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_16275_s_15889,13,,0,0,37076.2208086132,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_15889_s_2456760,14,,0,0,37902.6201584632,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_2456760_s_2455449,15,,2,3,39685.7670273536,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,16,,2,3,40220.1382077686,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299226_b_26748_tn_0,,,radius_1207_s_29681_s_29681,17,,2,3,41071.73219809,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_15889_s_16200,1,,0,1,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16200_s_2456760,2,,0,0,390.124447144401,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_2456760_s_2455449,3,,2,3,1942.71023257005,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,4,,0,0,2422.62267762865,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_29681_s_16196,5,,0,0,3274.21666796654,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16196_s_781958,6,,2,3,4494.33427254792,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_781958_s_16068,7,,2,3,6021.13767832062,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16068_s_16201,8,,2,3,6747.70023050663,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16201_s_16197,9,,2,3,11779.7874851007,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16197_s_16202,10,,2,3,21615.370013261,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16202_s_16203,11,,0,0,23050.8716339068,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16203_s_16195,12,,0,0,27401.2515905677,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16195_s_16204,13,,0,0,30736.7981805553,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16204_s_16205,14,,2,3,32196.0237533648,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16205_s_16089,15,,2,3,36386.2354670862,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16089_s_781959,16,,0,0,37705.6185146785,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_781959_s_16094,17,,2,3,39746.7124844555,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16094_s_16095,18,,0,0,41627.503762023,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16095_s_2456766,19,,0,0,42598.7096685439,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_2456766_s_16071,20,,0,0,45092.4976364488,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16071_s_16212,21,,0,0,46524.7014916334,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16212_s_16079,22,,2,3,48100.9316569625,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16079_s_16080,23,,0,0,49207.6451476667,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16080_s_16210,24,,0,0,49808.5381113633,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16210_s_16214,25,,2,3,51569.6459203115,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16214_s_16215,26,,0,0,60177.3071557854,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299227_b_26748_tn_0,,,radius_1207_s_16215_s_16215,27,,1,0,63973.65413202,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299228_b_26748_tn_0,,,radius_1207_s_16066_s_16068,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299228_b_26748_tn_0,,,radius_1207_s_16068_s_16069,2,,0,0,2583.74475543002,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299228_b_26748_tn_0,,,radius_1207_s_16069_s_16069,3,,0,0,4045.39406991,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16215_s_16183,1,,0,0,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16183_s_16184,2,,2,3,6520.50975296256,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16184_s_16079,3,,2,3,11084.1884902035,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16079_s_16080,4,,0,0,13248.1451958165,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16080_s_16072,5,,0,0,13848.9661178394,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16072_s_2455436,6,,0,0,14751.3733239552,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_2455436_s_2456766,7,,2,3,15308.1661406291,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_2456766_s_16071,8,,0,0,15778.6377100029,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16071_s_16082,9,,0,0,17210.8415651875,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16082_s_16084,10,,0,0,19259.2327970833,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16084_s_16094,11,,0,0,21236.5820279569,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16094_s_16185,12,,0,0,22119.5215086519,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16185_s_16087,13,,2,3,24197.4842031251,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16087_s_16088,14,,0,0,26027.3114484316,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16088_s_16189,15,,2,3,27204.5843383888,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16189_s_16188,16,,2,3,31631.2452421551,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16188_s_16187,17,,0,0,33154.5344338769,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16187_s_16211,18,,2,3,36465.5949927191,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16211_s_16192,19,,0,0,40725.7914104004,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16192_s_16190,20,,0,0,41931.6524731666,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16190_s_16191,21,,2,3,49989.5176117643,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16191_s_16025,22,,2,3,52321.8018521579,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16025_s_2455449,23,,0,0,57134.220310128,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,24,,0,0,60471.8291282356,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_29681_s_16194,25,,0,0,61323.4231185735,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_16194_s_15889,26,,0,0,63200.9410346108,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299229_b_26748_tn_0,,,radius_1207_s_15889_s_15889,27,,0,0,63916.4911365,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_759423_s_16185,9,,0,0,6685.31689051341,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16185_s_16086,10,,0,0,8961.70505916116,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16086_s_16087,11,,0,0,10360.6117120665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,10902.6642789545,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299230_b_26748_tn_0,,,radius_1207_s_16088_s_16088,13,,0,0,12081.82250474,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15889_s_16045,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_16045_s_15942,2,,2,3,1709.19902985184,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15942_s_781974,3,,0,0,3887.61490675644,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_781974_s_15962,4,,0,0,17321.7379087203,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15962_s_15944,5,,2,3,23800.6169789249,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,25852.6322194589,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,29176.3686491574,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15947_s_15946,8,,0,0,32106.8180713215,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15946_s_22289,9,,2,3,32708.1019769077,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_22289_s_2456757,10,,0,0,32903.3688034016,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_2456757_s_15950,11,,0,0,34982.5332643694,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_15950_s_2456756,12,,2,3,42709.6374459764,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299231_b_26748_tn_0,,,radius_1207_s_2456756_s_2456756,13,,0,0,47675.32249262,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_15889_s_15888,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_15888_s_15887,2,,0,0,1317.07488036808,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_15887_s_16060,3,,0,0,2009.36822490283,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_16060_s_15892,4,,0,0,3915.44513711639,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_15892_s_15884,5,,0,0,13988.7032003241,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_15884_s_15882,6,,2,3,14497.8576948654,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_15882_s_16278,7,,0,0,15033.0163136232,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_16278_s_22287,8,,2,3,17915.1260372278,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_22287_s_22284,9,,0,0,32340.4796076039,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_22284_s_22286,10,,2,3,33841.6504949612,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_22286_s_22283,11,,2,3,34423.1462924291,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299232_b_26748_tn_0,,,radius_1207_s_22283_s_22283,12,,2,3,35327.32724326,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_759423_s_16185,9,,0,0,6685.31689051341,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16185_s_16086,10,,0,0,8961.70505916116,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16086_s_16087,11,,0,0,10360.6117120665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,10902.6642789545,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299233_b_26748_tn_0,,,radius_1207_s_16088_s_16088,13,,0,0,12081.82250474,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_22284_s_22286,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_22286_s_22283,2,,0,0,580.898703890139,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_22283_s_22285,3,,0,0,1485.07965471661,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_22285_s_16278,4,,0,0,2389.72540975272,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_16278_s_15894,5,,2,3,17038.9069974779,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_15894_s_15882,6,,0,0,20982.6560544094,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_15882_s_15883,7,,0,0,22817.3023837179,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_15883_s_16276,8,,0,0,23629.5651817964,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_16276_s_15885,9,,0,0,23872.2297549312,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_15885_s_15893,10,,0,0,24379.2249071533,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_15893_s_16279,11,,0,0,34442.5528158479,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_16279_s_16275,12,,0,0,36375.0147840304,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_16275_s_15889,13,,0,0,37076.2208086132,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_15889_s_2456760,14,,0,0,37902.6201584632,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299234_b_26748_tn_0,,,radius_1207_s_2456760_s_2456760,15,,2,3,39685.76702734,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_759423_s_16185,9,,0,0,6685.31689051341,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16185_s_16086,10,,0,0,8961.70505916116,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16086_s_16087,11,,0,0,10360.6117120665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,10902.6642789545,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299235_b_26748_tn_0,,,radius_1207_s_16088_s_16088,13,,0,0,12081.82250474,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_759423_s_16185,9,,0,0,6685.31689051341,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16185_s_16086,10,,0,0,8961.70505916116,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16086_s_16087,11,,0,0,10360.6117120665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,10902.6642789545,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299236_b_26748_tn_0,,,radius_1207_s_16088_s_16088,13,,0,0,12081.82250474,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_759423_s_16185,9,,0,0,6685.31689051341,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16185_s_16086,10,,0,0,8961.70505916116,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16086_s_16087,11,,0,0,10360.6117120665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,10902.6642789545,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299237_b_26748_tn_0,,,radius_1207_s_16088_s_16088,13,,0,0,12081.82250474,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16215_s_16183,1,,0,0,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16183_s_16184,2,,2,3,6520.50975296256,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16184_s_16079,3,,2,3,11084.1884902035,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16079_s_16080,4,,0,0,13248.1451958165,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16080_s_16072,5,,0,0,13848.9661178394,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16072_s_2455436,6,,0,0,14751.3733239552,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_2455436_s_2456766,7,,2,3,15308.1661406291,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_2456766_s_16071,8,,0,0,15778.6377100029,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16071_s_16082,9,,0,0,17210.8415651875,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16082_s_16084,10,,0,0,19259.2327970833,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16084_s_16094,11,,0,0,21236.5820279569,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16094_s_16185,12,,0,0,22119.5215086519,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16185_s_16087,13,,2,3,24197.4842031251,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16087_s_16088,14,,0,0,26027.3114484316,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16088_s_16189,15,,2,3,27204.5843383888,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16189_s_16188,16,,2,3,31631.2452421551,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16188_s_16187,17,,0,0,33154.5344338769,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16187_s_16211,18,,2,3,36465.5949927191,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16211_s_16192,19,,0,0,40725.7914104004,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16192_s_16190,20,,0,0,41931.6524731666,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16190_s_16191,21,,2,3,49989.5176117643,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16191_s_16025,22,,2,3,52321.8018521579,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16025_s_2455449,23,,0,0,57134.220310128,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,24,,0,0,60471.8291282356,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_29681_s_16194,25,,0,0,61323.4231185735,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_16194_s_15889,26,,0,0,63200.9410346108,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299238_b_26748_tn_0,,,radius_1207_s_15889_s_15889,27,,0,0,63916.4911365,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15889_s_16045,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_16045_s_15942,2,,2,3,1709.19902985184,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15942_s_781974,3,,0,0,3887.61490675644,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_781974_s_15962,4,,0,0,17321.7379087203,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15962_s_15944,5,,2,3,23800.6169789249,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,25852.6322194589,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,29176.3686491574,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15947_s_15946,8,,0,0,32106.8180713215,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15946_s_22289,9,,2,3,32708.1019769077,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_22289_s_2456757,10,,0,0,32903.3688034016,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_2456757_s_15950,11,,0,0,34982.5332643694,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_15950_s_2456756,12,,2,3,42709.6374459764,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299239_b_26748_tn_0,,,radius_1207_s_2456756_s_2456756,13,,0,0,47675.32249262,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_22284_s_22286,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_22286_s_22283,2,,0,0,580.898703890139,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_22283_s_22285,3,,0,0,1485.07965471661,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_22285_s_16278,4,,0,0,2389.72540975272,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_16278_s_15894,5,,2,3,17038.9069974779,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_15894_s_15882,6,,0,0,20982.6560544094,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_15882_s_15883,7,,0,0,22817.3023837179,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_15883_s_16276,8,,0,0,23629.5651817964,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_16276_s_15885,9,,0,0,23872.2297549312,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_15885_s_15893,10,,0,0,24379.2249071533,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_15893_s_16279,11,,0,0,34442.5528158479,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_16279_s_16275,12,,0,0,36375.0147840304,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_16275_s_15889,13,,0,0,37076.2208086132,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299240_b_26748_tn_0,,,radius_1207_s_15889_s_15889,14,,0,0,37902.62015844,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_759423_s_16185,9,,0,0,6685.31689051341,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16185_s_16086,10,,0,0,8961.70505916116,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16086_s_16087,11,,0,0,10360.6117120665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,10902.6642789545,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299241_b_26748_tn_0,,,radius_1207_s_16088_s_16088,13,,0,0,12081.82250474,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_22286_s_22283,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_22283_s_22285,2,,0,0,903.942886074705,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_22285_s_16278,3,,0,0,1808.58864111081,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_16278_s_15894,4,,2,3,16457.770228836,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_15894_s_15882,5,,0,0,20401.5192857675,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_15882_s_15883,6,,0,0,22236.165615076,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_15883_s_16276,7,,0,0,23048.4284131545,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_16276_s_15885,8,,0,0,23291.0929862893,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_15885_s_15893,9,,0,0,23798.0881385114,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_15893_s_16279,10,,2,3,33861.416047206,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_16279_s_16275,11,,2,3,35793.8780153885,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_16275_s_15889,12,,2,3,36495.0840399713,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299242_b_26748_tn_0,,,radius_1207_s_15889_s_15889,13,,1,3,37321.48338979,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16088_s_16089,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16089_s_759418,2,,0,0,1178.83712246948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_759418_s_759420,3,,0,0,1969.86279603153,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_759420_s_16092,4,,0,0,2927.11341583294,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16092_s_759419,5,,0,0,3543.01448403495,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_759419_s_16094,6,,0,0,5295.50711835856,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16094_s_759425,7,,0,0,5812.69004042949,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_759425_s_771261,8,,0,0,6573.62375387002,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_771261_s_759417,9,,0,0,7491.45929283844,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_759417_s_16097,10,,0,0,8308.95264594237,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16097_s_16070,11,,0,0,9477.65606835453,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16070_s_16071,12,,0,0,10328.6932386946,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16071_s_16076,13,,0,0,11858.7112708948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16076_s_16075,14,,0,0,12854.788768735,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16075_s_16074,15,,0,0,13521.4705782649,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16074_s_16077,16,,0,0,14037.794295026,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299243_b_26748_tn_0,,,radius_1207_s_16077_s_16077,17,,0,0,14969.68155963,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15889_s_16045,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_16045_s_15942,2,,2,3,1709.19902985184,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15942_s_781974,3,,0,0,3887.61490675644,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_781974_s_15962,4,,0,0,17321.7379087203,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15962_s_15944,5,,2,3,23800.6169789249,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,25852.6322194589,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,29176.3686491574,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15947_s_15946,8,,0,0,32106.8180713215,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15946_s_22289,9,,2,3,32708.1019769077,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_22289_s_2456757,10,,0,0,32903.3688034016,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_2456757_s_15950,11,,0,0,34982.5332643694,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_15950_s_2456756,12,,2,3,42709.6374459764,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299244_b_26748_tn_0,,,radius_1207_s_2456756_s_2456756,13,,0,0,47675.32249262,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_22284_s_22286,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_22286_s_22283,2,,0,0,580.898703890139,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_22283_s_22285,3,,0,0,1485.07965471661,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_22285_s_16278,4,,0,0,2389.72540975272,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_16278_s_15894,5,,2,3,17038.9069974779,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_15894_s_15882,6,,0,0,20982.6560544094,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_15882_s_15883,7,,0,0,22817.3023837179,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_15883_s_16276,8,,0,0,23629.5651817964,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_16276_s_15885,9,,0,0,23872.2297549312,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_15885_s_15893,10,,0,0,24379.2249071533,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_15893_s_16279,11,,0,0,34442.5528158479,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_16279_s_16275,12,,0,0,36375.0147840304,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_16275_s_15889,13,,0,0,37076.2208086132,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_15889_s_2456760,14,,0,0,37902.6201584632,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_2456760_s_2455449,15,,2,3,39685.7670273536,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,16,,0,0,40220.1382077686,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299245_b_26748_tn_0,,,radius_1207_s_29681_s_29681,17,,0,0,41071.73219809,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16215_s_16183,1,,0,0,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16183_s_16184,2,,2,3,6520.50975296256,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16184_s_16079,3,,2,3,11084.1884902035,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16079_s_16080,4,,0,0,13248.1451958165,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16080_s_16072,5,,0,0,13848.9661178394,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16072_s_2455436,6,,2,3,14751.3733239552,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_2455436_s_16082,7,,2,3,15308.1661406291,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16082_s_16084,8,,2,3,16234.3285942847,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16084_s_16094,9,,0,0,18211.6778251583,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16094_s_16185,10,,0,0,19094.6173058532,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16185_s_16087,11,,2,3,21172.5800003265,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16087_s_16088,12,,0,0,23002.407245633,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16088_s_16189,13,,2,3,24179.6801355902,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16189_s_16188,14,,2,3,28606.3410393564,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16188_s_16187,15,,2,3,30129.6302310783,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16187_s_16211,16,,2,3,33440.6907899205,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16211_s_16192,17,,0,0,37700.8872076018,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16192_s_16191,18,,2,3,38906.748270368,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16191_s_16025,19,,2,3,49088.9678458823,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16025_s_2455449,20,,2,3,53901.3863038524,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,21,,2,3,57238.9951219599,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_29681_s_16194,22,,2,3,58090.5891122978,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_16194_s_15889,23,,0,0,59968.1070283351,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299246_b_26748_tn_0,,,radius_1207_s_15889_s_15889,24,,0,0,60683.65713019,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_15889_s_16200,1,,0,1,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16200_s_2456760,2,,2,3,390.124447144401,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_2456760_s_2455449,3,,2,3,1942.71023257005,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,4,,0,0,2422.62267762865,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_29681_s_16196,5,,0,0,3274.21666796654,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16196_s_781958,6,,2,3,4494.33427254792,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_781958_s_16068,7,,2,3,6021.13767832062,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16068_s_16201,8,,2,3,6747.70023050663,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16201_s_16197,9,,2,3,11779.7874851007,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16197_s_16202,10,,2,3,21615.370013261,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16202_s_16203,11,,0,0,23050.8716339068,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16203_s_16195,12,,0,0,27401.2515905677,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16195_s_16204,13,,0,0,30736.7981805553,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16204_s_16205,14,,2,3,32196.0237533648,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16205_s_16089,15,,2,3,36386.2354670862,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16089_s_781959,16,,0,0,37705.6185146785,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_781959_s_16094,17,,2,3,39746.7124844555,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16094_s_16095,18,,0,0,41627.503762023,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16095_s_2456766,19,,0,0,42598.7096685439,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_2456766_s_16071,20,,0,0,45092.4976364488,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16071_s_16212,21,,0,0,46524.7014916334,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16212_s_16079,22,,2,3,48100.9316569625,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16079_s_16080,23,,0,0,49207.6451476667,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16080_s_16210,24,,0,0,49808.5381113633,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16210_s_16214,25,,2,3,51569.6459203115,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16214_s_16215,26,,2,3,60177.3071557854,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299247_b_26748_tn_0,,,radius_1207_s_16215_s_16215,27,,1,0,63973.65413202,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_15889_s_15888,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_15888_s_15887,2,,0,0,1317.07488036808,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_15887_s_16060,3,,0,0,2009.36822490283,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_16060_s_15892,4,,0,0,3915.44513711639,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_15892_s_15884,5,,0,0,13988.7032003241,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_15884_s_15882,6,,0,0,14497.8576948654,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_15882_s_15881,7,,0,0,15033.0163136232,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_15881_s_16278,8,,0,0,17044.3564195229,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_16278_s_22287,9,,2,3,20972.2366658974,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299248_b_26748_tn_0,,,radius_1207_s_22287_s_22287,10,,0,0,35397.5902362,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_15889_s_15888,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_15888_s_15887,2,,0,0,1317.07488036808,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_15887_s_16060,3,,0,0,2009.36822490283,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_16060_s_15892,4,,0,0,3915.44513711639,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_15892_s_15884,5,,0,0,13988.7032003241,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_15884_s_15882,6,,0,0,14497.8576948654,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_15882_s_15881,7,,0,0,15033.0163136232,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_15881_s_16278,8,,0,0,17044.3564195229,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_16278_s_22287,9,,2,3,20972.2366658974,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299249_b_26748_tn_0,,,radius_1207_s_22287_s_22287,10,,0,0,35397.5902362,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_15889_s_16200,1,,0,1,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16200_s_2456760,2,,2,3,390.124447144401,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_2456760_s_16196,3,,2,3,1942.71023257005,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16196_s_781958,4,,2,3,3244.96255176137,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_781958_s_16068,5,,2,3,4770.06007054754,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16068_s_16201,6,,2,3,5496.62262273355,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16201_s_16197,7,,2,3,10528.7098773277,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16197_s_16202,8,,2,3,20364.2924054879,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16202_s_16203,9,,0,0,21799.7940261338,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16203_s_16195,10,,0,0,26150.1739827946,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16195_s_16204,11,,2,3,29485.7205727822,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16204_s_16205,12,,2,3,30944.9461455917,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16205_s_16089,13,,2,3,35135.1578593131,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16089_s_781959,14,,0,0,36454.5409069054,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_781959_s_16094,15,,2,3,38495.6348766825,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16094_s_16095,16,,2,3,40376.42615425,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16095_s_16212,17,,2,3,41347.6320607708,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16212_s_16079,18,,2,3,44659.2176954334,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16079_s_16080,19,,2,3,45767.8807060955,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16080_s_16210,20,,0,0,46368.7736697921,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16210_s_16214,21,,2,3,48129.8814787402,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16214_s_16215,22,,0,0,56737.5427142141,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299250_b_26748_tn_0,,,radius_1207_s_16215_s_16215,23,,1,0,60533.88969042,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_2456756_s_781972,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_781972_s_15954,2,,2,3,4892.98593754999,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15954_s_2456757,3,,0,0,9163.8842134249,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_2456757_s_15970,4,,2,3,12346.7152514911,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15970_s_15944,5,,2,3,14386.1710952224,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,14693.4670718337,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,18015.6961187487,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15947_s_2456758,8,,0,0,20946.1455409128,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_2456758_s_15962,9,,2,3,21488.8546393623,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15962_s_15969,10,,2,3,23588.9757480457,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15969_s_15972,11,,2,3,26224.689856775,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15972_s_15965,12,,0,0,30092.112122092,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15965_s_16047,13,,2,3,36213.8474001787,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_16047_s_15967,14,,2,3,42473.6591655056,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15967_s_15889,15,,0,0,43679.0271092872,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299251_b_26748_tn_0,,,radius_1207_s_15889_s_15889,16,,0,0,46637.37079181,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15889_s_16045,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_16045_s_15942,2,,2,3,1709.19902985184,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15942_s_781974,3,,0,0,3887.61490675644,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_781974_s_15962,4,,0,0,17321.7379087203,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15962_s_15944,5,,2,3,23800.6169789249,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,25852.6322194589,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,29176.3686491574,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15947_s_15946,8,,0,0,32106.8180713215,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15946_s_22289,9,,2,3,32708.1019769077,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_22289_s_2456757,10,,0,0,32903.3688034016,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_2456757_s_15950,11,,0,0,34982.5332643694,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_15950_s_2456756,12,,2,3,42709.6374459764,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299254_b_26748_tn_0,,,radius_1207_s_2456756_s_2456756,13,,0,0,47675.32249262,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16088_s_16089,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16089_s_759418,2,,0,0,1178.83712246948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_759418_s_759420,3,,0,0,1969.86279603153,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_759420_s_16092,4,,0,0,2927.11341583294,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16092_s_759419,5,,0,0,3543.01448403495,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_759419_s_16094,6,,0,0,5295.50711835856,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16094_s_759425,7,,0,0,5812.69004042949,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_759425_s_771261,8,,0,0,6573.62375387002,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_771261_s_759417,9,,0,0,7491.45929283844,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_759417_s_16097,10,,0,0,8308.95264594237,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16097_s_16070,11,,0,0,9477.65606835453,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16070_s_16071,12,,0,0,10328.6932386946,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16071_s_16076,13,,0,0,11858.7112708948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16076_s_16075,14,,0,0,12854.788768735,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16075_s_16074,15,,0,0,13521.4705782649,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16074_s_16077,16,,0,0,14037.794295026,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299255_b_26748_tn_0,,,radius_1207_s_16077_s_16077,17,,0,0,14969.68155963,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_2456756_s_781972,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_781972_s_15954,2,,2,3,4892.98593754999,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15954_s_2456757,3,,0,0,9163.8842134249,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_2456757_s_15970,4,,2,3,12346.7152514911,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15970_s_15944,5,,2,3,14386.1710952224,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,14693.4670718337,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,18015.6961187487,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15947_s_2456758,8,,0,0,20946.1455409128,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_2456758_s_15962,9,,2,3,21488.8546393623,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15962_s_15969,10,,2,3,23588.9757480457,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15969_s_15972,11,,2,3,26224.689856775,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15972_s_15965,12,,0,0,30092.112122092,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15965_s_16047,13,,2,3,36213.8474001787,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_16047_s_15967,14,,2,3,42473.6591655056,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15967_s_15889,15,,0,0,43679.0271092872,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299256_b_26748_tn_0,,,radius_1207_s_15889_s_15889,16,,0,0,46637.37079181,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_2456756_s_781972,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_781972_s_15954,2,,2,3,4892.98593754999,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15954_s_2456757,3,,0,0,9163.8842134249,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_2456757_s_15970,4,,2,3,12346.7152514911,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15970_s_15944,5,,2,3,14386.1710952224,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,14693.4670718337,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,18015.6961187487,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15947_s_2456758,8,,0,0,20946.1455409128,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_2456758_s_15962,9,,2,3,21488.8546393623,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15962_s_15969,10,,2,3,23588.9757480457,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15969_s_15972,11,,2,3,26224.689856775,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15972_s_15965,12,,0,0,30092.112122092,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15965_s_16047,13,,2,3,36213.8474001787,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_16047_s_15967,14,,2,3,42473.6591655056,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15967_s_15889,15,,0,0,43679.0271092872,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299257_b_26748_tn_0,,,radius_1207_s_15889_s_15889,16,,0,0,46637.37079181,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_2456756_s_781972,1,,0,0,0,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_781972_s_15954,2,,2,3,4892.98593754999,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15954_s_2456757,3,,0,0,9163.8842134249,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_2456757_s_15970,4,,2,3,12346.7152514911,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15970_s_15944,5,,2,3,14386.1710952224,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15944_s_15958,6,,2,3,14693.4670718337,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15958_s_15947,7,,2,3,18015.6961187487,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15947_s_2456758,8,,0,0,20946.1455409128,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_2456758_s_15962,9,,2,3,21488.8546393623,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15962_s_15969,10,,2,3,23588.9757480457,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15969_s_15972,11,,2,3,26224.689856775,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15972_s_15965,12,,0,0,30092.112122092,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15965_s_16047,13,,2,3,36213.8474001787,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_16047_s_15967,14,,2,3,42473.6591655056,0,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15967_s_15889,15,,0,0,43679.0271092872,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299258_b_26748_tn_0,,,radius_1207_s_15889_s_15889,16,,0,0,46637.37079181,1,,,,,2,3,booking_route_497,booking_route_497,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16094_s_759425,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_759425_s_771261,2,,0,0,760.214931322142,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_771261_s_759417,3,,0,0,1678.05047029056,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_759417_s_16097,4,,0,0,2495.5438233945,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16097_s_16070,5,,0,0,3664.24724580665,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16070_s_16071,6,,0,0,4515.28441614668,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16071_s_16076,7,,0,0,6045.30244834694,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16076_s_16075,8,,0,0,7041.3799461871,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16075_s_16074,9,,0,0,7708.06175571705,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16074_s_16077,10,,0,0,8224.38547247812,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299259_b_26748_tn_0,,,radius_1207_s_16077_s_16077,11,,0,0,9156.27273709,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_15889_s_16200,1,,0,1,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16200_s_2456760,2,,2,3,390.124447144401,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_2456760_s_2455449,3,,2,3,1942.71023257005,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,4,,0,0,2422.62267762865,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_29681_s_16196,5,,0,0,3274.21666796654,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16196_s_781958,6,,2,3,4494.33427254792,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_781958_s_16068,7,,2,3,6021.13767832062,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16068_s_16201,8,,2,3,6747.70023050663,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16201_s_16197,9,,2,3,11779.7874851007,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16197_s_16202,10,,2,3,21615.370013261,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16202_s_16203,11,,0,0,23050.8716339068,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16203_s_16195,12,,2,3,27401.2515905677,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16195_s_16204,13,,2,3,30736.7981805553,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16204_s_16205,14,,2,3,32196.0237533648,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16205_s_16089,15,,2,3,36386.2354670862,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16089_s_781959,16,,2,3,37705.6185146785,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_781959_s_16094,17,,2,3,39746.7124844555,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16094_s_16095,18,,0,0,41627.503762023,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16095_s_16212,19,,2,3,42598.7096685439,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16212_s_16079,20,,2,3,45910.2953032065,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299260_b_26748_tn_0,,,radius_1207_s_16079_s_16079,21,,0,0,47018.95831388,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_15889_s_16200,1,,0,1,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16200_s_2456760,2,,0,0,390.124447144401,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_2456760_s_2455449,3,,2,3,1942.71023257005,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,4,,0,0,2422.62267762865,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_29681_s_16196,5,,0,0,3274.21666796654,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16196_s_781958,6,,2,3,4494.33427254792,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_781958_s_16068,7,,2,3,6021.13767832062,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16068_s_16201,8,,2,3,6747.70023050663,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16201_s_16197,9,,2,3,11779.7874851007,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16197_s_16202,10,,2,3,21615.370013261,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16202_s_16203,11,,0,0,23050.8716339068,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16203_s_16195,12,,0,0,27401.2515905677,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16195_s_16204,13,,0,0,30736.7981805553,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16204_s_16205,14,,2,3,32196.0237533648,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16205_s_16089,15,,2,3,36386.2354670862,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16089_s_781959,16,,0,0,37705.6185146785,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_781959_s_16094,17,,2,3,39746.7124844555,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16094_s_16095,18,,0,0,41627.503762023,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16095_s_2456766,19,,0,0,42598.7096685439,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_2456766_s_16071,20,,0,0,45092.4976364488,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16071_s_16212,21,,0,0,46524.7014916334,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16212_s_16079,22,,2,3,48100.9316569625,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16079_s_16080,23,,0,0,49207.6451476667,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16080_s_16210,24,,0,0,49808.5381113633,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16210_s_16214,25,,2,3,51569.6459203115,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16214_s_16215,26,,0,0,60177.3071557854,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299261_b_26748_tn_0,,,radius_1207_s_16215_s_16215,27,,1,0,63973.65413202,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_16077_s_759421,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_759421_s_16079,2,,0,0,1008.12935981895,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_16079_s_16080,3,,0,0,1646.05038257577,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_16080_s_16072,4,,0,0,2246.95996830662,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_16072_s_16081,5,,0,0,3149.36717442244,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_16081_s_16082,6,,0,0,3886.97801179446,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_16082_s_759422,7,,0,0,4637.00781068317,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_759422_s_759423,8,,3,2,6083.91068321656,0,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299262_b_26748_tn_0,,,radius_1207_s_759423_s_759423,9,,0,0,6685.31689049,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16079_s_16080,1,,0,0,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16080_s_16072,2,,0,0,599.788780807444,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16072_s_2455436,3,,2,3,1502.19598692326,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_2455436_s_16082,4,,2,3,2058.98880359718,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16082_s_16084,5,,2,3,2985.15125725273,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16084_s_16185,6,,0,0,4962.50048812641,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16185_s_16087,7,,2,3,7330.56322187532,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16087_s_16088,8,,2,3,9163.36884051011,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16088_s_16189,9,,2,3,10340.6417304673,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16189_s_16188,10,,2,3,14767.3026342335,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16188_s_16187,11,,2,3,16290.5918259553,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16187_s_16211,12,,2,3,19601.6523847976,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16211_s_16192,13,,0,0,23861.8488024789,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16192_s_16190,14,,2,3,25067.7098652451,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16190_s_16191,15,,2,3,33125.5750038428,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16191_s_16025,16,,2,3,35457.8592442364,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16025_s_2455449,17,,2,3,40270.2777022065,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,18,,0,0,43607.8865203141,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_29681_s_16194,19,,0,0,44459.480510652,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_16194_s_15889,20,,2,3,46336.9984266893,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299263_b_26748_tn_0,,,radius_1207_s_15889_s_15889,21,,0,0,47052.54852858,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16069_s_16024,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16024_s_16025,2,,0,0,775.596266212284,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16025_s_16026,3,,0,0,1807.22190535612,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16026_s_2483495,4,,0,0,2766.28482550726,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_2483495_s_29681,5,,0,0,5416.75044306174,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_29681_s_16032,6,,0,0,6436.45201007476,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16032_s_2438933,7,,0,0,7576.71452995217,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_2438933_s_16031,8,,0,0,8240.84195654157,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16031_s_16030,9,,0,0,8527.62288862872,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16030_s_16033,10,,0,0,8932.84679637186,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16033_s_16034,11,,0,0,9165.13404331625,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16034_s_15889,12,,0,0,9628.59060260394,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_15889_s_16039,13,,0,0,10510.9386855591,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16039_s_16040,14,,0,0,11686.4154079233,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16040_s_16042,15,,0,0,12047.7835753043,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16042_s_16043,16,,0,0,12324.4604601439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16043_s_16044,17,,0,0,12526.5458089135,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16044_s_16045,18,,0,0,12886.5424727922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16045_s_15942,19,,0,0,13106.2063391676,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_15942_s_16048,20,,0,0,15282.8820371869,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16048_s_2438934,21,,2,3,17060.1720314054,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_2438934_s_16049,22,,0,0,18604.0056042532,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16049_s_16050,23,,0,0,19098.7301834617,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16050_s_16051,24,,0,0,19388.6880759922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16051_s_16052,25,,0,0,20425.6382579853,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16052_s_16053,26,,0,0,20752.5347065814,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16053_s_833259,27,,0,0,21230.9536762786,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_833259_s_16275,28,,0,0,23127.0336395412,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16275_s_16055,29,,0,0,23551.6916242021,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16055_s_16057,30,,0,0,23808.8722434897,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16057_s_16058,31,,0,0,24487.418244042,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16058_s_16059,32,,0,0,24680.6102514857,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16059_s_16060,33,,0,0,25614.1591340582,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16060_s_16061,34,,0,0,26256.131709164,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16061_s_16062,35,,0,0,27180.643659028,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16062_s_16063,36,,0,0,27686.863698439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16063_s_15890,37,,0,0,28259.1890347633,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_15890_s_2438932,38,,0,0,28886.6228332024,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_2438932_s_16065,39,,2,3,29619.901749005,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16065_s_2483495,40,,0,0,30254.2525223819,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_2483495_s_16066,41,,2,3,30838.8763853997,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16066_s_16068,42,,0,0,32312.2465968761,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16068_s_16069,43,,0,0,34898.4147967777,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299264_b_26748_tn_0,,,radius_1207_s_16069_s_16069,44,,0,0,36360.0641114,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16069_s_16024,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16024_s_16025,2,,0,0,775.596266212284,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16025_s_16026,3,,0,0,1807.22190535612,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16026_s_2483495,4,,0,0,2766.28482550726,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_2483495_s_29681,5,,0,0,5416.75044306174,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_29681_s_16032,6,,0,0,6436.45201007476,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16032_s_2438933,7,,0,0,7576.71452995217,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_2438933_s_16031,8,,0,0,8240.84195654157,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16031_s_16030,9,,0,0,8527.62288862872,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16030_s_16033,10,,0,0,8932.84679637186,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16033_s_16034,11,,0,0,9165.13404331625,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_16034_s_15889,12,,0,0,9628.59060260394,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299265_b_26748_tn_0,,,radius_1207_s_15889_s_15889,13,,0,0,10510.93868561,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16088_s_16089,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16089_s_759418,2,,0,0,1178.83712246948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_759418_s_759420,3,,0,0,1969.86279603153,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_759420_s_16092,4,,0,0,2927.11341583294,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16092_s_759419,5,,0,0,3543.01448403495,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_759419_s_16094,6,,0,0,5295.50711835856,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16094_s_759425,7,,0,0,5812.69004042949,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_759425_s_771261,8,,0,0,6573.62375387002,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_771261_s_759417,9,,0,0,7491.45929283844,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_759417_s_16097,10,,0,0,8308.95264594237,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16097_s_16070,11,,0,0,9477.65606835453,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16070_s_16071,12,,0,0,10328.6932386946,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16071_s_16076,13,,0,0,11858.7112708948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16076_s_16075,14,,0,0,12854.788768735,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16075_s_16074,15,,0,0,13521.4705782649,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16074_s_16077,16,,0,0,14037.794295026,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299266_b_26748_tn_0,,,radius_1207_s_16077_s_16077,17,,0,0,14969.68155963,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_15889_s_15888,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_15888_s_15887,2,,0,0,1317.07488036808,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_15887_s_16060,3,,0,0,2009.36822490283,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_16060_s_15892,4,,0,0,3915.44513711639,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_15892_s_15884,5,,0,0,13988.7032003241,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_15884_s_15882,6,,0,0,14497.8576948654,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_15882_s_15881,7,,0,0,15033.0163136232,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_15881_s_16278,8,,0,0,17044.3564195229,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_16278_s_22287,9,,2,3,20972.2366658974,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_22287_s_22284,10,,0,0,35397.5902362735,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_22284_s_22286,11,,2,3,36898.7611236308,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_22286_s_22283,12,,2,3,37480.2569210987,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299267_b_26748_tn_0,,,radius_1207_s_22283_s_22283,13,,2,3,38384.43787187,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_15889_s_15888,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_15888_s_15887,2,,0,0,1317.07488036808,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_15887_s_16060,3,,0,0,2009.36822490283,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_16060_s_15892,4,,0,0,3915.44513711639,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_15892_s_15884,5,,0,0,13988.7032003241,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_15884_s_15882,6,,0,0,14497.8576948654,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_15882_s_15881,7,,0,0,15033.0163136232,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_15881_s_16278,8,,0,0,17044.3564195229,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_16278_s_22287,9,,2,3,20972.2366658974,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299268_b_26748_tn_0,,,radius_1207_s_22287_s_22287,10,,0,0,35397.5902362,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16088_s_16089,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16089_s_759418,2,,0,0,1178.83712246948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_759418_s_759420,3,,0,0,1969.86279603153,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_759420_s_16092,4,,0,0,2927.11341583294,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16092_s_759419,5,,0,0,3543.01448403495,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_759419_s_16094,6,,0,0,5295.50711835856,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16094_s_759425,7,,0,0,5812.69004042949,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_759425_s_771261,8,,0,0,6573.62375387002,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_771261_s_759417,9,,0,0,7491.45929283844,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_759417_s_16097,10,,0,0,8308.95264594237,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16097_s_16070,11,,0,0,9477.65606835453,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16070_s_16071,12,,0,0,10328.6932386946,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16071_s_16076,13,,0,0,11858.7112708948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16076_s_16075,14,,0,0,12854.788768735,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16075_s_16074,15,,0,0,13521.4705782649,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16074_s_16077,16,,0,0,14037.794295026,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299269_b_26748_tn_0,,,radius_1207_s_16077_s_16077,17,,0,0,14969.68155963,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16088_s_16089,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16089_s_759418,2,,0,0,1178.83712246948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_759418_s_759420,3,,0,0,1969.86279603153,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_759420_s_16092,4,,0,0,2927.11341583294,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16092_s_759419,5,,0,0,3543.01448403495,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_759419_s_16094,6,,0,0,5295.50711835856,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16094_s_759425,7,,0,0,5812.69004042949,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_759425_s_771261,8,,0,0,6573.62375387002,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_771261_s_759417,9,,0,0,7491.45929283844,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_759417_s_16097,10,,0,0,8308.95264594237,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16097_s_16070,11,,0,0,9477.65606835453,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16070_s_16071,12,,0,0,10328.6932386946,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16071_s_16076,13,,0,0,11858.7112708948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16076_s_16075,14,,0,0,12854.788768735,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16075_s_16074,15,,0,0,13521.4705782649,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16074_s_16077,16,,0,0,14037.794295026,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299270_b_26748_tn_0,,,radius_1207_s_16077_s_16077,17,,0,0,14969.68155963,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_22284_s_22286,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_22286_s_22283,2,,0,0,580.898703890139,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_22283_s_22285,3,,0,0,1485.07965471661,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_22285_s_16278,4,,0,0,2389.72540975272,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_16278_s_15894,5,,2,3,17038.9069974779,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_15894_s_15882,6,,0,0,20982.6560544094,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_15882_s_15883,7,,0,0,22817.3023837179,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_15883_s_16276,8,,0,0,23629.5651817964,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_16276_s_15885,9,,0,0,23872.2297549312,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_15885_s_15893,10,,0,0,24379.2249071533,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_15893_s_16279,11,,0,0,34442.5528158479,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_16279_s_16275,12,,0,0,36375.0147840304,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_16275_s_15889,13,,0,0,37076.2208086132,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_15889_s_2456760,14,,0,0,37902.6201584632,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299271_b_26748_tn_0,,,radius_1207_s_2456760_s_2456760,15,,2,3,39685.76702734,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_15889_s_15888,1,,0,0,0,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_15888_s_15887,2,,0,0,1317.07488036808,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_15887_s_16060,3,,0,0,2009.36822490283,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_16060_s_15892,4,,0,0,3915.44513711639,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_15892_s_15884,5,,0,0,13988.7032003241,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_15884_s_15882,6,,0,0,14497.8576948654,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_15882_s_15881,7,,0,0,15033.0163136232,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_15881_s_16278,8,,0,0,17044.3564195229,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_16278_s_22287,9,,2,3,20972.2366658974,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_22287_s_22284,10,,0,0,35397.5902362735,1,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_22284_s_22286,11,,2,3,36898.7611236308,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_22286_s_22283,12,,2,3,37480.2569210987,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299272_b_26748_tn_0,,,radius_1207_s_22283_s_22283,13,,2,3,38384.43787187,0,,,,,2,3,booking_route_493,booking_route_493,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16088_s_16089,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16089_s_759418,2,,0,0,1178.83712246948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_759418_s_759420,3,,0,0,1969.86279603153,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_759420_s_16092,4,,0,0,2927.11341583294,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16092_s_759419,5,,0,0,3543.01448403495,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_759419_s_16094,6,,0,0,5295.50711835856,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16094_s_759425,7,,0,0,5812.69004042949,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_759425_s_771261,8,,0,0,6573.62375387002,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_771261_s_759417,9,,0,0,7491.45929283844,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_759417_s_16097,10,,0,0,8308.95264594237,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16097_s_16070,11,,0,0,9477.65606835453,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16070_s_16071,12,,0,0,10328.6932386946,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16071_s_16076,13,,0,0,11858.7112708948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16076_s_16075,14,,0,0,12854.788768735,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16075_s_16074,15,,0,0,13521.4705782649,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16074_s_16077,16,,0,0,14037.794295026,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299273_b_26748_tn_0,,,radius_1207_s_16077_s_16077,17,,0,0,14969.68155963,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16088_s_16089,1,,0,0,0,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16089_s_759418,2,,0,0,1178.83712246948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_759418_s_759420,3,,0,0,1969.86279603153,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_759420_s_16092,4,,0,0,2927.11341583294,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16092_s_759419,5,,0,0,3543.01448403495,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_759419_s_16094,6,,0,0,5295.50711835856,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16094_s_759425,7,,0,0,5812.69004042949,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_759425_s_771261,8,,0,0,6573.62375387002,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_771261_s_759417,9,,0,0,7491.45929283844,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_759417_s_16097,10,,0,0,8308.95264594237,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16097_s_16070,11,,0,0,9477.65606835453,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16070_s_16071,12,,0,0,10328.6932386946,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16071_s_16076,13,,0,0,11858.7112708948,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16076_s_16075,14,,0,0,12854.788768735,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16075_s_16074,15,,0,0,13521.4705782649,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16074_s_16077,16,,0,0,14037.794295026,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299274_b_26748_tn_0,,,radius_1207_s_16077_s_16077,17,,0,0,14969.68155963,1,,,,,2,3,booking_route_492,booking_route_492,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16069_s_16024,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16024_s_16025,2,,0,0,775.596266212284,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16025_s_16026,3,,0,0,1807.22190535612,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16026_s_2483495,4,,0,0,2766.28482550726,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_2483495_s_29681,5,,0,0,5416.75044306174,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_29681_s_16032,6,,0,0,6436.45201007476,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16032_s_2438933,7,,0,0,7576.71452995217,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_2438933_s_16031,8,,0,0,8240.84195654157,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16031_s_16030,9,,0,0,8527.62288862872,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16030_s_16033,10,,0,0,8932.84679637186,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16033_s_16034,11,,0,0,9165.13404331625,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16034_s_15889,12,,0,0,9628.59060260394,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_15889_s_16039,13,,0,0,10510.9386855591,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16039_s_16040,14,,0,0,11686.4154079233,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16040_s_16042,15,,0,0,12047.7835753043,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16042_s_16043,16,,0,0,12324.4604601439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16043_s_16044,17,,0,0,12526.5458089135,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16044_s_16045,18,,0,0,12886.5424727922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16045_s_15942,19,,0,0,13106.2063391676,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_15942_s_16048,20,,0,0,15282.8820371869,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16048_s_2438934,21,,2,3,17060.1720314054,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_2438934_s_16049,22,,0,0,18604.0056042532,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16049_s_16050,23,,0,0,19098.7301834617,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16050_s_16051,24,,0,0,19388.6880759922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16051_s_16052,25,,0,0,20425.6382579853,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16052_s_16053,26,,0,0,20752.5347065814,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16053_s_833259,27,,0,0,21230.9536762786,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_833259_s_16275,28,,0,0,23127.0336395412,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16275_s_16055,29,,0,0,23551.6916242021,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16055_s_16057,30,,0,0,23808.8722434897,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16057_s_16058,31,,0,0,24487.418244042,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16058_s_16059,32,,0,0,24680.6102514857,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16059_s_16060,33,,0,0,25614.1591340582,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16060_s_16061,34,,0,0,26256.131709164,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16061_s_16062,35,,0,0,27180.643659028,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16062_s_16063,36,,0,0,27686.863698439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16063_s_15890,37,,0,0,28259.1890347633,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_15890_s_2438932,38,,0,0,28886.6228332024,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_2438932_s_16065,39,,2,3,29619.901749005,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16065_s_2483495,40,,0,0,30254.2525223819,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_2483495_s_16066,41,,2,3,30838.8763853997,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16066_s_16068,42,,0,0,32312.2465968761,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16068_s_16069,43,,0,0,34898.4147967777,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299275_b_26748_tn_0,,,radius_1207_s_16069_s_16069,44,,0,0,36360.0641114,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16069_s_16024,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16024_s_16025,2,,0,0,775.596266212284,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16025_s_16026,3,,0,0,1807.22190535612,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16026_s_2483495,4,,0,0,2766.28482550726,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_2483495_s_29681,5,,0,0,5416.75044306174,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_29681_s_16032,6,,0,0,6436.45201007476,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16032_s_2438933,7,,0,0,7576.71452995217,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_2438933_s_16031,8,,0,0,8240.84195654157,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16031_s_16030,9,,0,0,8527.62288862872,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16030_s_16033,10,,0,0,8932.84679637186,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16033_s_16034,11,,0,0,9165.13404331625,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16034_s_15889,12,,0,0,9628.59060260394,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_15889_s_16039,13,,0,0,10510.9386855591,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16039_s_16040,14,,0,0,11686.4154079233,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16040_s_16042,15,,0,0,12047.7835753043,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16042_s_16043,16,,0,0,12324.4604601439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16043_s_16044,17,,0,0,12526.5458089135,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16044_s_16045,18,,0,0,12886.5424727922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16045_s_15942,19,,0,0,13106.2063391676,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_15942_s_16048,20,,0,0,15282.8820371869,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16048_s_2438934,21,,2,3,17060.1720314054,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_2438934_s_16049,22,,0,0,18604.0056042532,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16049_s_16050,23,,0,0,19098.7301834617,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16050_s_16051,24,,0,0,19388.6880759922,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16051_s_16052,25,,0,0,20425.6382579853,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16052_s_16053,26,,0,0,20752.5347065814,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16053_s_833259,27,,0,0,21230.9536762786,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_833259_s_16275,28,,0,0,23127.0336395412,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16275_s_16055,29,,0,0,23551.6916242021,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16055_s_16057,30,,0,0,23808.8722434897,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16057_s_16058,31,,0,0,24487.418244042,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16058_s_16059,32,,0,0,24680.6102514857,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16059_s_16060,33,,0,0,25614.1591340582,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16060_s_16061,34,,0,0,26256.131709164,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16061_s_16062,35,,0,0,27180.643659028,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16062_s_16063,36,,0,0,27686.863698439,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16063_s_15890,37,,0,0,28259.1890347633,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_15890_s_2438932,38,,0,0,28886.6228332024,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_2438932_s_16065,39,,2,3,29619.901749005,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16065_s_2483495,40,,0,0,30254.2525223819,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_2483495_s_16066,41,,2,3,30838.8763853997,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16066_s_16068,42,,0,0,32312.2465968761,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16068_s_16069,43,,0,0,34898.4147967777,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299276_b_26748_tn_0,,,radius_1207_s_16069_s_16069,44,,0,0,36360.0641114,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16215_s_16183,1,,0,0,0,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16183_s_16184,2,,2,3,6520.50975296256,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16184_s_16079,3,,2,3,11084.1884902035,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16079_s_16080,4,,0,0,13248.1451958165,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16080_s_16072,5,,0,0,13848.9661178394,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16072_s_2455436,6,,0,0,14751.3733239552,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_2455436_s_2456766,7,,2,3,15308.1661406291,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_2456766_s_16071,8,,0,0,15778.6377100029,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16071_s_16082,9,,0,0,17210.8415651875,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16082_s_16084,10,,0,0,19259.2327970833,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16084_s_16094,11,,0,0,21236.5820279569,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16094_s_16185,12,,0,0,22119.5215086519,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16185_s_16087,13,,2,3,24197.4842031251,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16087_s_16088,14,,0,0,26027.3114484316,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16088_s_16189,15,,2,3,27204.5843383888,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16189_s_16188,16,,2,3,31631.2452421551,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16188_s_16187,17,,0,0,33154.5344338769,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16187_s_16211,18,,2,3,36465.5949927191,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16211_s_16192,19,,0,0,40725.7914104004,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16192_s_16190,20,,0,0,41931.6524731666,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16190_s_16191,21,,2,3,49989.5176117643,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16191_s_16025,22,,2,3,52321.8018521579,0,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16025_s_2455449,23,,0,0,57134.220310128,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_2455449_s_29681,24,,0,0,60471.8291282356,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_29681_s_16194,25,,0,0,61323.4231185735,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_16194_s_15889,26,,0,0,63200.9410346108,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299338_b_26748_tn_0,,,radius_1207_s_15889_s_15889,27,,0,0,63916.4911365,1,,,,,2,3,booking_route_495,booking_route_495,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16069_s_16024,1,,0,0,0,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16024_s_16025,2,,0,0,775.596266212284,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16025_s_16026,3,,0,0,1807.22190535612,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16026_s_15893,4,,0,0,2766.28482550726,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_15893_s_16048,5,,0,0,8039.23778038043,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16048_s_16051,6,,2,3,14042.8656821803,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16051_s_16052,7,,0,0,17599.5544296388,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16052_s_16053,8,,0,0,17927.7506832307,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16053_s_833259,9,,0,0,18406.1696529279,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_833259_s_16275,10,,0,0,20302.2496161905,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16275_s_16055,11,,0,0,20726.9076008514,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16055_s_16057,12,,0,0,20984.0882201391,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16057_s_16058,13,,0,0,21662.6342206914,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16058_s_16059,14,,0,0,21855.826228135,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16059_s_16060,15,,0,0,22789.3751107075,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16060_s_16061,16,,0,0,23431.3476858134,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16061_s_16062,17,,0,0,24355.8596356773,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16062_s_16063,18,,0,0,24862.0796750883,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16063_s_15890,19,,0,0,25434.4050114126,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_15890_s_2438932,20,,0,0,26061.8388098517,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_2438932_s_16065,21,,2,3,26795.1177256544,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16065_s_2483495,22,,0,0,27429.4684990313,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_2483495_s_16066,23,,2,3,28014.092362049,0,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16066_s_16068,24,,0,0,29487.4625735254,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16068_s_16069,25,,0,0,32073.6307734271,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_299339_b_26748_tn_0,,,radius_1207_s_16069_s_16069,26,,0,0,33535.28008802,1,,,,,2,3,booking_route_491,booking_route_491,,,1,00:03:00,1,00:05:00 -t_748719_b_26748_tn_0,,,area_271,1,,2,2,0,1,,,,,1,1,booking_route_13317,booking_route_13317,00:00:00,07:30:00,1,00:10:00,1,00:25:00 -t_748719_b_26748_tn_0,,,area_271,2,,2,2,0,1,,,,,1,1,booking_route_13317,booking_route_13317,07:30:00,07:30:00,1,00:10:00,1,00:25:00 diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stops.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stops.txt deleted file mode 100644 index 0525c8ec11d..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/stops.txt +++ /dev/null @@ -1,17 +0,0 @@ -stop_id,stop_code,platform_code,stop_name,stop_desc,stop_lat,stop_lon,zone_id,stop_url,location_type,parent_station,stop_timezone,position,direction,wheelchair_boarding -2456756,517,,3rd Street and Pontiac Street (Yachats Log Church),,44.3116263048855,-124.105422953253,,,0,,America/Los_Angeles,,,0 -2456757,539,,Waldport Clinic,,44.416184,-124.076029,,,0,,America/Los_Angeles,,,0 -2456758,538,,Dollar General,,44.427015,-124.065051,,,0,,America/Los_Angeles,,,0 -2456760,526,,Hwy 101 and NE 17th Street,,44.6506199947377,-124.052895474438,,,0,,America/Los_Angeles,,,0 -2456766,531,,22nd Street at Beach Club,,44.98137,-124.00641,,,0,,America/Los_Angeles,,,0 -2483495,503,,Walmart (Loop Route Only),,44.656229016403,-124.053896609126,,,0,,America/Los_Angeles,,,0 -2483496,525,,Applegate Street and 11th Street,,44.53911,-123.37108,,,0,,America/Los_Angeles,,,0 -2483497,524,,Main Street and 14th Street,,44.54015,-123.36601,,,0,,America/Los_Angeles,,,0 -2483498,523,,26th Street and SW Western Boulevard (Hilton Garden Inn),,44.55767,-123.2788,,,0,,America/Los_Angeles,,,0 -2483499,522,,Corvallis Transit Center,,44.5650440489089,-123.263958606787,,,0,,America/Los_Angeles,,,0 -2483500,521,,"Amtrak Station, Albany",,44.63053,-123.10286,,,0,,America/Los_Angeles,,,0 -2483502,518,,Corvallis Samaritan Hospital,,44.60378,-123.25316,,,0,,America/Los_Angeles,,,0 -2501902,652,,Toledo Park N' Ride,,44.624176,-123.939461,,,0,,America/Los_Angeles,,,0 -2501903,653,,Crystal Creek Loop and Highway 20,,44.628989,-123.768486,,,0,,America/Los_Angeles,,,0 -2501904,655,,South Beach Hatfield MSC,,44.622928,-124.046618,,,0,,America/Los_Angeles,,,0 -2502256,654,,Crystal Creek Loop and Highway 20,,44.6291635407879,-123.768060788296,,,0,,America/Los_Angeles,,,0 diff --git a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/trips.txt b/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/trips.txt deleted file mode 100644 index 0f7ea2c2559..00000000000 --- a/src/ext-test/resources/org/opentripplanner/ext/flex/lincoln-county-flex.gtfs/trips.txt +++ /dev/null @@ -1,57 +0,0 @@ -route_id,service_id,trip_id,trip_short_name,trip_headsign,direction_id,block_id,shape_id,bikes_allowed,wheelchair_accessible,trip_type,drt_max_travel_time,drt_avg_travel_time,drt_advance_book_min,drt_pickup_message,drt_drop_off_message,continuous_pickup_message,continuous_drop_off_message,booking_rule_id -13317,c_15353_b_26748_d_31,t_748719_b_26748_tn_0,,,0,,,,,,,,,,,,, -13317,c_15353_b_26748_d_31,t_1225545_b_26748_tn_0,,,0,,,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299224_b_26748_tn_0,,Loop,0,1343,p_737,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299264_b_26748_tn_0,,Loop,0,1343,p_737,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299265_b_26748_tn_0,,Loop,0,1343,p_736,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299275_b_26748_tn_0,,Loop,0,1343,p_737,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299276_b_26748_tn_0,,Loop,0,1343,p_737,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299223_b_26748_tn_0,,Loop,0,1343,p_737,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299339_b_26748_tn_0,,Loop,0,1343,p_738,,,,,,,,,,, -491,c_15353_b_26748_d_127,t_299228_b_26748_tn_0,,Loop,0,1343,p_735,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299273_b_26748_tn_0,,DMV,0,1344,p_742,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299274_b_26748_tn_0,,DMV,0,1344,p_742,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299243_b_26748_tn_0,,DMV,0,1344,p_742,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299255_b_26748_tn_0,,DMV,0,1344,p_742,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299259_b_26748_tn_0,,DMV,0,1344,p_743,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299266_b_26748_tn_0,,DMV,0,1344,p_742,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299269_b_26748_tn_0,,DMV,0,1344,p_742,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299270_b_26748_tn_0,,DMV,0,1344,p_742,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299230_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_740,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299225_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_740,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299233_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_740,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299235_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_740,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299236_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_740,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299237_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_740,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299241_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_740,,,,,,,,,,, -492,c_15353_b_26748_d_63,t_299262_b_26748_tn_0,,SW 62nd & Highway 101,1,1344,p_739,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299240_b_26748_tn_0,,Newport,0,21115,p_179218,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299271_b_26748_tn_0,,Newport,0,21117,p_179439,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299245_b_26748_tn_0,,Newport,0,21115,p_178796,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299242_b_26748_tn_0,,Newport,0,21115,p_178798,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299234_b_26748_tn_0,,Newport,0,21117,p_179439,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299226_b_26748_tn_0,,Newport,0,21117,p_178796,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299248_b_26748_tn_0,,Siletz,1,21117,p_179449,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299232_b_26748_tn_0,,Siletz,1,21115,p_178801,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299249_b_26748_tn_0,,Siletz,1,21115,p_179449,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299267_b_26748_tn_0,,Siletz,1,21117,p_179217,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299268_b_26748_tn_0,,Siletz,1,21115,p_178800,,,,,,,,,,, -493,c_15353_b_26748_d_63,t_299272_b_26748_tn_0,,Siletz,1,21117,p_179217,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299261_b_26748_tn_0,,Rose Lodge / Lincoln City ,0,21114,p_178791,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299227_b_26748_tn_0,,Rose Lodge / Lincoln City ,0,21114,p_178791,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299247_b_26748_tn_0,,Rose Lodge / Lincoln City ,0,21114,p_178791,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299250_b_26748_tn_0,,Rose Lodge / Lincoln City ,0,21114,p_178790,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299246_b_26748_tn_0,,Newport,1,21114,p_178795,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299238_b_26748_tn_0,,Newport,1,21114,p_178793,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299229_b_26748_tn_0,,Newport,1,21114,p_178793,,,,,,,,,,, -495,c_15353_b_26748_d_127,t_299338_b_26748_tn_0,,Newport,1,21114,p_178793,,,,,,,,,,, -495,c_15353_b_26748_d_63,t_299260_b_26748_tn_0,,Rose Lodge / Lincoln City ,0,21115,p_178792,,,,,,,,,,, -495,c_15353_b_26748_d_63,t_299263_b_26748_tn_0,,Newport,1,21115,p_178794,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299257_b_26748_tn_0,,Newport,0,21116,p_4523,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299258_b_26748_tn_0,,Newport,0,21116,p_4523,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299251_b_26748_tn_0,,Newport,0,21116,p_4523,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299256_b_26748_tn_0,,Newport,0,21116,p_4523,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299254_b_26748_tn_0,,Yachats,1,21116,p_724,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299231_b_26748_tn_0,,Yachats,1,21116,p_724,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299244_b_26748_tn_0,,Yachats,1,21116,p_724,,,,,,,,,,, -497,c_15353_b_26748_d_63,t_299239_b_26748_tn_0,,Yachats,1,21116,p_724,,,,,,,,,,, diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java index 8cdd4282e52..a1a03226014 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java @@ -40,11 +40,7 @@ void invalidPolygon() { var gtfsLocation = getLocation("invalid", selfIntersecting); var mapper = new AreaStopMapper(StopModel.of()); - var expectation = assertThrows(IllegalArgumentException.class, () -> mapper.map(gtfsLocation)); - assertEquals( - "Polygon geometry for AreaStop 1:zone-3 is invalid: Self-intersection at (lat: 1.0, lon: 2.0)", - expectation.getMessage() - ); + assertThrows(IllegalArgumentException.class, () -> mapper.map(gtfsLocation)); } private static Location getLocation(String name, Polygon polygon) { diff --git a/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java b/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java index d80c966aeff..b7a772e0cb5 100644 --- a/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java +++ b/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java @@ -4,10 +4,12 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; -import org.locationtech.jts.geom.LineString; +import org.locationtech.jts.geom.Geometry; +import org.opentripplanner._support.geometry.Polygons; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; @@ -25,19 +27,21 @@ class AreaStopTest { private static final String ZONE_ID = TransitModelForTest.TIME_ZONE_ID; - private static final LineString GEOMETRY = GeometryUtils.makeLineString(10, 0, 12, 4); + private static final Geometry GEOMETRY = Polygons.OSLO; - private static final WgsCoordinate COORDINATE = new WgsCoordinate(2, 11); + private static final WgsCoordinate COORDINATE = new WgsCoordinate(59.925, 10.7376); - private static final AreaStop subject = StopModel - .of() - .areaStop(TransitModelForTest.id(ID)) - .withName(NAME) - .withDescription(DESCRIPTION) - .withUrl(URL) - .withZoneId(ZONE_ID) - .withGeometry(GEOMETRY) - .build(); + private static final AreaStop subject = areaStopBuilder().withGeometry(GEOMETRY).build(); + + private static AreaStopBuilder areaStopBuilder() { + return StopModel + .of() + .areaStop(TransitModelForTest.id(ID)) + .withName(NAME) + .withDescription(DESCRIPTION) + .withUrl(URL) + .withZoneId(ZONE_ID); + } @Test void copy() { @@ -60,7 +64,7 @@ void copy() { assertEquals(URL, copy.getUrl()); assertEquals(ZONE_ID, copy.getFirstZoneAsString()); assertEquals(GEOMETRY, copy.getGeometry()); - assertEquals(COORDINATE, copy.getCoordinate()); + assertEquals(COORDINATE, copy.getCoordinate().roundToApproximate10m()); assertEquals("v2", copy.getName().toString()); } @@ -78,4 +82,16 @@ void sameAs() { subject.sameAs(subject.copy().withGeometry(GeometryUtils.makeLineString(0, 0, 0, 2)).build()) ); } + + @Test + void invalidGeometry() { + var ex = assertThrows( + IllegalArgumentException.class, + () -> areaStopBuilder().withGeometry(Polygons.SELF_INTERSECTING).build() + ); + assertEquals( + "Polygon geometry for AreaStop F:1 is invalid: Self-intersection at (lat: 1.0, lon: 2.0)", + ex.getMessage() + ); + } } From 51d7482e05ab8406bbedc9d1bfa06de351b34fde Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 17 Jun 2024 11:14:42 +0200 Subject: [PATCH 1387/1688] Move Google updaters to dedicated package --- .../{ => google}/GooglePubsubEstimatedTimetableSource.java | 3 ++- .../updater/{ => google}/SiriETGooglePubsubUpdater.java | 5 ++++- .../{ => google}/SiriETGooglePubsubUpdaterParameters.java | 2 +- .../standalone/config/routerconfig/UpdatersConfig.java | 2 +- .../updaters/SiriETGooglePubsubUpdaterConfig.java | 6 +++--- .../org/opentripplanner/updater/UpdatersParameters.java | 2 +- .../updater/configure/UpdaterConfigurator.java | 2 +- 7 files changed, 13 insertions(+), 9 deletions(-) rename src/ext/java/org/opentripplanner/ext/siri/updater/{ => google}/GooglePubsubEstimatedTimetableSource.java (99%) rename src/ext/java/org/opentripplanner/ext/siri/updater/{ => google}/SiriETGooglePubsubUpdater.java (90%) rename src/ext/java/org/opentripplanner/ext/siri/updater/{ => google}/SiriETGooglePubsubUpdaterParameters.java (97%) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java b/src/ext/java/org/opentripplanner/ext/siri/updater/google/GooglePubsubEstimatedTimetableSource.java similarity index 99% rename from src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java rename to src/ext/java/org/opentripplanner/ext/siri/updater/google/GooglePubsubEstimatedTimetableSource.java index fe358a119fb..88b04feb9c5 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/GooglePubsubEstimatedTimetableSource.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/google/GooglePubsubEstimatedTimetableSource.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.siri.updater; +package org.opentripplanner.ext.siri.updater.google; import com.google.api.gax.rpc.NotFoundException; import com.google.cloud.pubsub.v1.AckReplyConsumer; @@ -25,6 +25,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.function.Function; import org.entur.protobuf.mapper.SiriMapper; +import org.opentripplanner.ext.siri.updater.AsyncEstimatedTimetableSource; import org.opentripplanner.framework.application.ApplicationShutdownSupport; import org.opentripplanner.framework.io.OtpHttpClientFactory; import org.opentripplanner.framework.retry.OtpRetry; diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java similarity index 90% rename from src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java rename to src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java index 4e0e9481d99..ad317b50661 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java @@ -1,7 +1,10 @@ -package org.opentripplanner.ext.siri.updater; +package org.opentripplanner.ext.siri.updater.google; import java.util.concurrent.Future; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; +import org.opentripplanner.ext.siri.updater.AsyncEstimatedTimetableProcessor; +import org.opentripplanner.ext.siri.updater.AsyncEstimatedTimetableSource; +import org.opentripplanner.ext.siri.updater.EstimatedTimetableHandler; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.updater.GraphWriterRunnable; diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdaterParameters.java b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java similarity index 97% rename from src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdaterParameters.java rename to src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java index acb75509913..24ff12f6bd4 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETGooglePubsubUpdaterParameters.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java @@ -1,4 +1,4 @@ -package org.opentripplanner.ext.siri.updater; +package org.opentripplanner.ext.siri.updater.google; import java.time.Duration; import java.util.Objects; diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java index 08371660b8a..b60b389f788 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/UpdatersConfig.java @@ -21,11 +21,11 @@ import java.util.List; import java.util.function.BiFunction; import javax.annotation.Nullable; -import org.opentripplanner.ext.siri.updater.SiriETGooglePubsubUpdaterParameters; import org.opentripplanner.ext.siri.updater.SiriETUpdaterParameters; import org.opentripplanner.ext.siri.updater.SiriSXUpdaterParameters; import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdaterParameters; import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdaterParameters; +import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters; import org.opentripplanner.ext.vehiclerentalservicedirectory.VehicleRentalServiceDirectoryFetcher; import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java index 1d7c8249224..45221785109 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java @@ -1,10 +1,10 @@ package org.opentripplanner.standalone.config.routerconfig.updaters; -import static org.opentripplanner.ext.siri.updater.SiriETGooglePubsubUpdaterParameters.INITIAL_GET_DATA_TIMEOUT; -import static org.opentripplanner.ext.siri.updater.SiriETGooglePubsubUpdaterParameters.RECONNECT_PERIOD; +import static org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters.INITIAL_GET_DATA_TIMEOUT; +import static org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters.RECONNECT_PERIOD; import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA; -import org.opentripplanner.ext.siri.updater.SiriETGooglePubsubUpdaterParameters; +import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters; import org.opentripplanner.standalone.config.framework.json.NodeAdapter; public class SiriETGooglePubsubUpdaterConfig { diff --git a/src/main/java/org/opentripplanner/updater/UpdatersParameters.java b/src/main/java/org/opentripplanner/updater/UpdatersParameters.java index a955e757100..5f27f9dbd45 100644 --- a/src/main/java/org/opentripplanner/updater/UpdatersParameters.java +++ b/src/main/java/org/opentripplanner/updater/UpdatersParameters.java @@ -1,11 +1,11 @@ package org.opentripplanner.updater; import java.util.List; -import org.opentripplanner.ext.siri.updater.SiriETGooglePubsubUpdaterParameters; import org.opentripplanner.ext.siri.updater.SiriETUpdaterParameters; import org.opentripplanner.ext.siri.updater.SiriSXUpdaterParameters; import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdaterParameters; import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdaterParameters; +import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters; import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters; import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdaterParameters; import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdaterParameters; diff --git a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java index 3b6f7f52279..1e9b730ee3a 100644 --- a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java +++ b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java @@ -3,11 +3,11 @@ import java.util.ArrayList; import java.util.List; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; -import org.opentripplanner.ext.siri.updater.SiriETGooglePubsubUpdater; import org.opentripplanner.ext.siri.updater.SiriETUpdater; import org.opentripplanner.ext.siri.updater.SiriSXUpdater; import org.opentripplanner.ext.siri.updater.azure.SiriAzureETUpdater; import org.opentripplanner.ext.siri.updater.azure.SiriAzureSXUpdater; +import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdater; import org.opentripplanner.ext.vehiclerentalservicedirectory.VehicleRentalServiceDirectoryFetcher; import org.opentripplanner.ext.vehiclerentalservicedirectory.api.VehicleRentalServiceDirectoryFetcherParameters; import org.opentripplanner.framework.io.OtpHttpClientFactory; From d5ea5af9eb804e72c53f871b1091f0f215cf21b3 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 11:20:36 +0200 Subject: [PATCH 1388/1688] Extract two separate methods for Transmodel and GTFS scalar versions --- .../apis/gtfs/GraphQLScalars.java | 5 +-- .../apis/transmodel/support/GqlUtil.java | 2 +- .../graphql/scalar/DateScalarFactory.java | 17 ++++++-- .../graphql/scalar/DateScalarFactoryTest.java | 39 +++++++++++++++---- 4 files changed, 47 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java index e7b0b491f0d..8ec3172db52 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLScalars.java @@ -236,10 +236,7 @@ private static Optional validateCost(int cost) { ) .build(); - public static final GraphQLScalarType LOCAL_DATE_SCALAR = DateScalarFactory.createDateScalar( - "LocalDate", - null - ); + public static final GraphQLScalarType LOCAL_DATE_SCALAR = DateScalarFactory.createGtfsDateScalar(); public static final GraphQLScalarType GEOJSON_SCALAR = GraphQLScalarType .newScalar() diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java index e94253cf33f..16083085500 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/support/GqlUtil.java @@ -45,7 +45,7 @@ public class GqlUtil { public GqlUtil(ZoneId timeZone) { this.dateTimeScalar = DateTimeScalarFactory.createMillisecondsSinceEpochAsDateTimeStringScalar(timeZone); - this.dateScalar = DateScalarFactory.createDateScalar("Date", DateScalarFactory.DESCRIPTION); + this.dateScalar = DateScalarFactory.createTransmodelDateScalar(); this.doubleFunctionScalar = DoubleFunctionFactory.createDoubleFunctionScalar(); this.localTimeScalar = LocalTimeScalarFactory.createLocalTimeScalar(); this.timeScalar = TimeScalarFactory.createSecondsSinceMidnightAsTimeObject(); diff --git a/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java index 590dea013a3..931a98fc5d9 100644 --- a/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java +++ b/src/main/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactory.java @@ -13,18 +13,29 @@ public class DateScalarFactory { - public static final String DESCRIPTION = + private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE; + public static final String TRANSMODEL_DESCRIPTION = "Local date using the ISO 8601 format: `YYYY-MM-DD`. Example: `2020-05-17`."; - private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ISO_LOCAL_DATE; + private static final String TRANSMODEL_NAME = "Date"; + private static final String GTFS_NAME = "LocalDate"; private DateScalarFactory() {} + public static GraphQLScalarType createTransmodelDateScalar() { + return createDateScalar(TRANSMODEL_NAME, TRANSMODEL_DESCRIPTION); + } + + public static GraphQLScalarType createGtfsDateScalar() { + // description comes from schema.graphqls + return createDateScalar(GTFS_NAME, null); + } + /** * @param description Nullable description that allows caller to pass in null which leads to the * description from schema.graphqls to be used. */ - public static GraphQLScalarType createDateScalar( + private static GraphQLScalarType createDateScalar( String scalarName, @Nullable String description ) { diff --git a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java index 02e4b37d7d6..db95f0ba8ce 100644 --- a/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java +++ b/src/test/java/org/opentripplanner/framework/graphql/scalar/DateScalarFactoryTest.java @@ -7,25 +7,48 @@ import graphql.schema.CoercingParseValueException; import graphql.schema.GraphQLScalarType; import java.time.LocalDate; +import java.util.List; +import java.util.stream.Stream; import org.junit.jupiter.params.ParameterizedTest; -import org.junit.jupiter.params.provider.ValueSource; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; class DateScalarFactoryTest { - private static final GraphQLScalarType SCALAR = DateScalarFactory.createDateScalar("Date", null); + private static final GraphQLScalarType GTFS_SCALAR = DateScalarFactory.createGtfsDateScalar(); + private static final GraphQLScalarType TRANSMODEL_SCALAR = DateScalarFactory.createTransmodelDateScalar(); + private static final List INVALID_DATES = List.of( + "2024-05", + "2024", + "2024-99-04", + "202405-23", + "20240523" + ); + + static Stream succesfulCases() { + return Stream.of(GTFS_SCALAR, TRANSMODEL_SCALAR).map(s -> Arguments.of(s, "2024-05-23")); + } @ParameterizedTest - @ValueSource(strings = { "2024-05-23" }) - void parse(String input) { - var result = SCALAR.getCoercing().parseValue(input); + @MethodSource("succesfulCases") + void parse(GraphQLScalarType scalar, String input) { + var result = scalar.getCoercing().parseValue(input); assertInstanceOf(LocalDate.class, result); var date = (LocalDate) result; assertEquals(LocalDate.of(2024, 5, 23), date); } + static Stream invalidCases() { + return INVALID_DATES + .stream() + .flatMap(date -> + Stream.of(Arguments.of(GTFS_SCALAR, date), Arguments.of(TRANSMODEL_SCALAR, date)) + ); + } + @ParameterizedTest - @ValueSource(strings = { "2024-05", "2024", "2024-99-04", "202405-23", "20240523" }) - void failParsing(String input) { - assertThrows(CoercingParseValueException.class, () -> SCALAR.getCoercing().parseValue(input)); + @MethodSource("invalidCases") + void failParsing(GraphQLScalarType scalar, String input) { + assertThrows(CoercingParseValueException.class, () -> scalar.getCoercing().parseValue(input)); } } From d88617c897c71b4dd53f228e3256ae59b8b18f1f Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 17 Jun 2024 12:32:12 +0300 Subject: [PATCH 1389/1688] Use vehicleRentalSystemType to return system url --- .../apis/gtfs/datafetchers/RentalVehicleImpl.java | 5 +++-- .../apis/gtfs/generated/GraphQLDataFetchers.java | 3 ++- .../org/opentripplanner/apis/gtfs/schema.graphqls | 9 +++++++-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java index 84b45270a8b..71dc9ad8fa7 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java @@ -6,6 +6,7 @@ import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; import org.opentripplanner.service.vehiclerental.model.RentalVehicleType; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; +import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; public class RentalVehicleImpl implements GraphQLDataFetchers.GraphQLRentalVehicle { @@ -62,8 +63,8 @@ public DataFetcher vehicleType() { } @Override - public DataFetcher systemUrl() { - return environment -> getSource(environment).system.url; + public DataFetcher vehicleRentalSystem() { + return environment -> getSource(environment).system; } private VehicleRentalVehicle getSource(DataFetchingEnvironment environment) { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index 7b35af403cc..fef1c0b35d4 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -58,6 +58,7 @@ import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; +import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle; import org.opentripplanner.transit.model.basic.Money; import org.opentripplanner.transit.model.network.Route; @@ -858,7 +859,7 @@ public interface GraphQLRentalVehicle { public DataFetcher vehicleType(); - DataFetcher systemUrl(); + DataFetcher vehicleRentalSystem(); } public interface GraphQLRentalVehicleEntityCounts { diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index a4f53553e71..324360e3375 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -743,8 +743,8 @@ type RentalVehicle implements Node & PlaceInterface { """The type of the rental vehicle (scooter, bicycle, car...)""" vehicleType: RentalVehicleType - """The rental vehicle operator's system URL.""" - systemUrl: String! + """The vehicle rental system information.""" + vehicleRentalSystem: VehicleRentalSystemType } type BikeRentalStationUris { @@ -798,6 +798,11 @@ type RentalVehicleType { propulsionType: PropulsionType } +type VehicleRentalSystemType { + """The rental vehicle operator's system URL.""" + url: String +} + enum FormFactor { """A bicycle""" BICYCLE From 54b2fe248a34d909cb77a7e2450d0258455727d5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 11:32:42 +0200 Subject: [PATCH 1390/1688] Refer to API documentation --- .../apis/gtfs/PatternByServiceDatesFilter.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index 0867e6ead54..88dacb22afd 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -24,11 +24,9 @@ public class PatternByServiceDatesFilter { private final Function> getServiceDatesForTrip; /** - * - * @param startInclusive The inclusive start date to check the patterns for. If null then no start - * date is defined and this will therefore match all dates. - * @param endInclusive The inclusive end date to check the patterns for. If null then no end date - * is defined this will therefore match all dates. + * This method is not private to enable unit testing. + *

              + * See the API documentation for a discussion of {@code startInclusive} and {@code endInclusive}. */ PatternByServiceDatesFilter( @Nullable LocalDate startInclusive, @@ -38,7 +36,7 @@ public class PatternByServiceDatesFilter { ) { this.getPatternsForRoute = Objects.requireNonNull(getPatternsForRoute); this.getServiceDatesForTrip = Objects.requireNonNull(getServiceDatesForTrip); - // optional + // optional, but one must be defined this.startInclusive = startInclusive; this.endInclusive = endInclusive; From 665ce7ac129049849f5fed1ef05312fe8b874089 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 12:07:58 +0200 Subject: [PATCH 1391/1688] Move small helper method into separate class --- .../apis/gtfs/GraphQLUtils.java | 14 ++++++++ .../gtfs/PatternByServiceDatesFilter.java | 7 ---- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 2 +- .../apis/gtfs/datafetchers/RouteImpl.java | 2 +- .../gtfs/PatternByServiceDatesFilterTest.java | 30 ---------------- .../framework/graphql/GraphQLUtilsTest.java | 34 +++++++++++++++++++ 6 files changed, 50 insertions(+), 39 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java index 3fb339daa32..9aa1235879c 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java @@ -2,6 +2,7 @@ import java.time.Instant; import java.util.Locale; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLFilterPlaceType; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLFormFactor; import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField; @@ -109,4 +110,17 @@ public static boolean startsWith(String str, String name, Locale locale) { public static boolean startsWith(I18NString str, String name, Locale locale) { return str != null && str.toString(locale).toLowerCase(locale).startsWith(name); } + + /** + * Checks if a service date filter input has at least one filter set. If both start and end are + * null then no filtering is necessary and this method returns null. + */ + public static boolean hasServiceDateFilter( + GraphQLTypes.GraphQLServiceDateFilterInput serviceDays + ) { + return ( + serviceDays != null && + (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null) + ); + } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index 88dacb22afd..41e2b812420 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -97,11 +97,4 @@ private boolean hasServicesOnDate(TripPattern pattern) { ); }); } - - public static boolean hasServiceDateFilter(GraphQLServiceDateFilterInput serviceDays) { - return ( - serviceDays != null && - (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null) - ); - } } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index 7a644da4be8..c83669a386b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -611,7 +611,7 @@ public DataFetcher> routes() { ); } - if (PatternByServiceDatesFilter.hasServiceDateFilter(args.getGraphQLServiceDates())) { + if (GraphQLUtils.hasServiceDateFilter(args.getGraphQLServiceDates())) { var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService); routeStream = filter.filterRoutes(routeStream).stream(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java index 596936dfdb5..5eeb662a6d1 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java @@ -181,7 +181,7 @@ public DataFetcher> patterns() { var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments()); - if (PatternByServiceDatesFilter.hasServiceDateFilter(args.getGraphQLServiceDates())) { + if (GraphQLUtils.hasServiceDateFilter(args.getGraphQLServiceDates())) { var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService); return filter.filterPatterns(patterns); } else { diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index b9ad1c4973a..1893516ab58 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -3,21 +3,16 @@ import static java.time.LocalDate.parse; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.NOT_REMOVED; import static org.opentripplanner.apis.gtfs.PatternByServiceDatesFilterTest.FilterExpectation.REMOVED; import static org.opentripplanner.transit.model._data.TransitModelForTest.id; import java.time.LocalDate; -import java.util.ArrayList; import java.util.List; -import java.util.Map; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDateFilterInput; import org.opentripplanner.transit.model._data.TransitModelForTest; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.Route; @@ -41,7 +36,6 @@ class PatternByServiceDatesFilterTest { private static final RegularStop STOP_1 = MODEL.stop("1").build(); private static final StopPattern STOP_PATTERN = TransitModelForTest.stopPattern(STOP_1, STOP_1); private static final TripPattern PATTERN_1 = pattern(); - private static final LocalDate DATE = LocalDate.parse("2024-05-27"); enum FilterExpectation { REMOVED, @@ -151,28 +145,4 @@ private static PatternByServiceDatesFilter mockFilter(LocalDate start, LocalDate trip -> List.of(parse("2024-05-01"), parse("2024-06-01")) ); } - - public static List noFilterCases() { - var list = new ArrayList(); - list.add(null); - list.add(new GraphQLServiceDateFilterInput(Map.of())); - return list; - } - - @ParameterizedTest - @MethodSource("noFilterCases") - void hasNoServiceDateFilter(GraphQLServiceDateFilterInput input) { - assertFalse(PatternByServiceDatesFilter.hasServiceDateFilter(input)); - } - - public static List> hasFilterCases() { - return List.of(Map.of("start", DATE), Map.of("end", DATE), Map.of("start", DATE, "end", DATE)); - } - - @ParameterizedTest - @MethodSource("hasFilterCases") - void hasServiceDateFilter(Map params) { - var input = new GraphQLServiceDateFilterInput(params); - assertTrue(PatternByServiceDatesFilter.hasServiceDateFilter(input)); - } } diff --git a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java index b72cb6e5a0d..8119b9256c8 100644 --- a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java +++ b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java @@ -3,19 +3,29 @@ import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder; import static java.util.Map.entry; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; import graphql.ExecutionInput; import graphql.execution.ExecutionContext; import graphql.execution.ExecutionId; import graphql.schema.DataFetchingEnvironmentImpl; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; import java.util.Locale; import java.util.Map; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.apis.gtfs.generated.GraphQLTypes; import org.opentripplanner.framework.i18n.TranslatedString; class GraphQLUtilsTest { + private static final LocalDate DATE = LocalDate.parse("2024-05-27"); + static final ExecutionContext executionContext; static { @@ -122,4 +132,28 @@ void testGetLocaleWithLocalContextLocale() { assertEquals(frenchLocale, locale); } + + public static List noFilterCases() { + var list = new ArrayList(); + list.add(null); + list.add(new GraphQLTypes.GraphQLServiceDateFilterInput(Map.of())); + return list; + } + + @ParameterizedTest + @MethodSource("noFilterCases") + void hasNoServiceDateFilter(GraphQLTypes.GraphQLServiceDateFilterInput input) { + assertFalse(org.opentripplanner.apis.gtfs.GraphQLUtils.hasServiceDateFilter(input)); + } + + public static List> hasFilterCases() { + return List.of(Map.of("start", DATE), Map.of("end", DATE), Map.of("start", DATE, "end", DATE)); + } + + @ParameterizedTest + @MethodSource("hasFilterCases") + void hasServiceDateFilter(Map params) { + var input = new GraphQLTypes.GraphQLServiceDateFilterInput(params); + assertTrue(org.opentripplanner.apis.gtfs.GraphQLUtils.hasServiceDateFilter(input)); + } } From 6213bb14355977b17086d695e36d53ac57ac25e5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 12:17:49 +0200 Subject: [PATCH 1392/1688] Apply suggestions from code review Co-authored-by: Thomas Gran Co-authored-by: Joel Lappalainen --- .../standalone/config/framework/json/ParameterBuilder.java | 2 +- .../standalone/config/routerequest/RouteRequestConfig.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index acfc6f31e6c..93847202a1f 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -394,7 +394,7 @@ public Duration asDuration() { * In the documentation it will claim that it only accepts durations as the number is only for * backwards compatibility. */ - public Duration asDurationOrSeconds(Duration dflt) { + public Duration asDurationOrSeconds(Duration defaultValue) { info.withType(DURATION); setInfoOptional(dflt.toString()); var node = build(); diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 4c6913908f6..6d2eb18f41b 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -209,7 +209,7 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil This also influences the time it takes to transfer. -Since some modes, like airplanes and subways, need more time than others, this is also configurable +Since some modes, like airplane and subway, need more time than others, this is also configurable per mode with `alightSlackForMode`. """ ) @@ -246,7 +246,7 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil It is similar to `transferSlack`, except that this also applies to the first transit leg in the trip and `transferSlack` does not. -Some modes, like airplanes or subway, might need more of a slack than others, so this is also +Some modes, like airplane or subway, might need more of a slack than others, so this is also configurable per mode with `boardSlackForMode`. """ ) From 22b5d3655ef7fbe78c11d67e01171f61685000b5 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 12:26:29 +0200 Subject: [PATCH 1393/1688] Regenerate documentation --- docs/RouteRequest.md | 4 ++-- .../standalone/config/framework/json/ParameterBuilder.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 76ec510a5c7..2e2218b56c2 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -198,7 +198,7 @@ The slack is added to the time after leaving the transit vehicle. This also influences the time it takes to transfer. -Since some modes, like airplanes and subways, need more time than others, this is also configurable +Since some modes, like airplane and subway, need more time than others, this is also configurable per mode with `alightSlackForMode`. @@ -217,7 +217,7 @@ vehicle to another. It is similar to `transferSlack`, except that this also applies to the first transit leg in the trip and `transferSlack` does not. -Some modes, like airplanes or subway, might need more of a slack than others, so this is also +Some modes, like airplane or subway, might need more of a slack than others, so this is also configurable per mode with `boardSlackForMode`. diff --git a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java index 93847202a1f..0afca602872 100644 --- a/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java +++ b/src/main/java/org/opentripplanner/standalone/config/framework/json/ParameterBuilder.java @@ -396,12 +396,12 @@ public Duration asDuration() { */ public Duration asDurationOrSeconds(Duration defaultValue) { info.withType(DURATION); - setInfoOptional(dflt.toString()); + setInfoOptional(defaultValue.toString()); var node = build(); if (node.isTextual()) { - return asDuration(dflt); + return asDuration(defaultValue); } else { - return Duration.ofSeconds((long) asDouble(dflt.toSeconds())); + return Duration.ofSeconds((long) asDouble(defaultValue.toSeconds())); } } From 657e62597e273bd2c0c181cc62f20c54675ef995 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 12:34:36 +0200 Subject: [PATCH 1394/1688] Apply review suggestions --- docs/RouteRequest.md | 10 +++++----- .../config/routerequest/RouteRequestConfig.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md index 2e2218b56c2..60dec16d9b8 100644 --- a/docs/RouteRequest.md +++ b/docs/RouteRequest.md @@ -15,9 +15,9 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe | Config Parameter | Type | Summary | Req./Opt. | Default Value | Since | |--------------------------------------------------------------------------------------------------------------|:----------------------:|------------------------------------------------------------------------------------------------------------------------------------------------|:----------:|------------------|:-----:| -| [alightSlack](#rd_alightSlack) | `duration` | The extra time after exiting a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | +| [alightSlack](#rd_alightSlack) | `duration` | The extra time to exit a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | | arriveBy | `boolean` | Whether the trip should depart or arrive at the specified date and time. | *Optional* | `false` | 2.0 | -| [boardSlack](#rd_boardSlack) | `duration` | The extra time before boarding a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | +| [boardSlack](#rd_boardSlack) | `duration` | The extra time to board a public transport vehicle. | *Optional* | `"PT0S"` | 2.0 | | [drivingDirection](#rd_drivingDirection) | `enum` | The driving direction to use in the intersection traversal calculation | *Optional* | `"right"` | 2.2 | | elevatorBoardCost | `integer` | What is the cost of boarding a elevator? | *Optional* | `90` | 2.0 | | elevatorBoardTime | `integer` | How long does it take to get on an elevator, on average. | *Optional* | `90` | 2.0 | @@ -192,9 +192,9 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` **Path:** /routingDefaults -The extra time after exiting a public transport vehicle. +The extra time to exit a public transport vehicle. -The slack is added to the time after leaving the transit vehicle. +The slack is added to arrival time of the transit vehicle. This also influences the time it takes to transfer. @@ -207,7 +207,7 @@ per mode with `alightSlackForMode`. **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"` **Path:** /routingDefaults -The extra time before boarding a public transport vehicle. +The extra time to board a public transport vehicle. The extra time is added to the time when entering a public transport vehicle. This is a useful tool for agencies wanting to add a general buffer time so that passengers are instructed to be diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java index 6d2eb18f41b..ddb5d9a3a18 100644 --- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java +++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java @@ -202,10 +202,10 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil c .of("alightSlack") .since(V2_0) - .summary("The extra time after exiting a public transport vehicle.") + .summary("The extra time to exit a public transport vehicle.") .description( """ -The slack is added to the time after leaving the transit vehicle. +The slack is added to arrival time of the transit vehicle. This also influences the time it takes to transfer. @@ -235,7 +235,7 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil c .of("boardSlack") .since(V2_0) - .summary("The extra time before boarding a public transport vehicle.") + .summary("The extra time to board a public transport vehicle.") .description( """ The extra time is added to the time when entering a public transport vehicle. This is a useful From 0bc1cdb754a96ac39b4bf076dd81640e3c0123b5 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 17 Jun 2024 12:59:41 +0200 Subject: [PATCH 1395/1688] Move graph writer management to AsyncEstimatedTimetableProcessor --- .../AsyncEstimatedTimetableProcessor.java | 14 +++++--- .../updater/EstimatedTimetableHandler.java | 32 +++++++------------ .../ext/siri/updater/SiriETUpdater.java | 17 +++++----- .../google/SiriETGooglePubsubUpdater.java | 7 ++-- 4 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java index 7b60332514f..ee9554d0215 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -1,6 +1,7 @@ package org.opentripplanner.ext.siri.updater; import java.util.concurrent.Future; +import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.trip.UpdateIncrementality; import uk.org.siri.siri20.ServiceDelivery; @@ -13,13 +14,16 @@ public class AsyncEstimatedTimetableProcessor { private final AsyncEstimatedTimetableSource siriMessageSource; private final EstimatedTimetableHandler estimatedTimetableHandler; + private final WriteToGraphCallback saveResultOnGraph; public AsyncEstimatedTimetableProcessor( AsyncEstimatedTimetableSource siriMessageSource, - EstimatedTimetableHandler estimatedTimetableHandler + EstimatedTimetableHandler estimatedTimetableHandler, + WriteToGraphCallback saveResultOnGraph ) { this.siriMessageSource = siriMessageSource; this.estimatedTimetableHandler = estimatedTimetableHandler; + this.saveResultOnGraph = saveResultOnGraph; } /** @@ -35,9 +39,11 @@ public void run() { * @return a future indicating when the changes are applied. */ private Future processSiriData(ServiceDelivery serviceDelivery) { - return estimatedTimetableHandler.applyUpdate( - serviceDelivery.getEstimatedTimetableDeliveries(), - UpdateIncrementality.DIFFERENTIAL + return saveResultOnGraph.execute((graph, transitModel) -> + estimatedTimetableHandler.applyUpdate( + serviceDelivery.getEstimatedTimetableDeliveries(), + UpdateIncrementality.DIFFERENTIAL + ) ); } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java index d027afa3411..92d0b735b62 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java @@ -1,7 +1,6 @@ package org.opentripplanner.ext.siri.updater; import java.util.List; -import java.util.concurrent.Future; import java.util.function.Consumer; import javax.annotation.Nonnull; import org.opentripplanner.ext.siri.EntityResolver; @@ -9,7 +8,6 @@ import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; import org.opentripplanner.transit.service.TransitService; import org.opentripplanner.updater.spi.UpdateResult; -import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.trip.UpdateIncrementality; import uk.org.siri.siri20.EstimatedTimetableDeliveryStructure; @@ -18,8 +16,6 @@ */ public class EstimatedTimetableHandler { - private final WriteToGraphCallback saveResultOnGraph; - private final SiriTimetableSnapshotSource snapshotSource; private final SiriFuzzyTripMatcher fuzzyTripMatcher; private final EntityResolver entityResolver; @@ -30,14 +26,12 @@ public class EstimatedTimetableHandler { private final String feedId; public EstimatedTimetableHandler( - WriteToGraphCallback saveResultOnGraph, SiriTimetableSnapshotSource snapshotSource, boolean fuzzyMatching, TransitService transitService, Consumer updateResultConsumer, String feedId ) { - this.saveResultOnGraph = saveResultOnGraph; this.snapshotSource = snapshotSource; this.fuzzyTripMatcher = fuzzyMatching ? SiriFuzzyTripMatcher.of(transitService) : null; this.entityResolver = new EntityResolver(transitService, feedId); @@ -49,11 +43,11 @@ public EstimatedTimetableHandler( * Apply the update to the transit model. * @return a future indicating when the changes are applied. */ - public Future applyUpdate( + public void applyUpdate( List estimatedTimetableDeliveries, UpdateIncrementality updateMode ) { - return applyUpdate(estimatedTimetableDeliveries, updateMode, () -> {}); + applyUpdate(estimatedTimetableDeliveries, updateMode, () -> {}); } /** @@ -61,22 +55,20 @@ public Future applyUpdate( * @param onUpdateComplete callback called after the update has been applied. * @return a future indicating when the changes are applied. */ - public Future applyUpdate( + public void applyUpdate( List estimatedTimetableDeliveries, UpdateIncrementality updateMode, @Nonnull Runnable onUpdateComplete ) { - return saveResultOnGraph.execute((graph, transitModel) -> { - var results = snapshotSource.applyEstimatedTimetable( - fuzzyTripMatcher, - entityResolver, - feedId, - updateMode, - estimatedTimetableDeliveries - ); + var results = snapshotSource.applyEstimatedTimetable( + fuzzyTripMatcher, + entityResolver, + feedId, + updateMode, + estimatedTimetableDeliveries + ); - updateResultConsumer.accept(results); - onUpdateComplete.run(); - }); + updateResultConsumer.accept(results); + onUpdateComplete.run(); } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java index a94645b564e..bce2abce908 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java @@ -60,7 +60,6 @@ public SiriETUpdater( estimatedTimetableHandler = new EstimatedTimetableHandler( - this::writeToCallBack, timetableSnapshot, config.fuzzyTripMatching(), new DefaultTransitService(transitModel), @@ -102,14 +101,16 @@ public void runPolling() { final boolean markPrimed = !moreData; List etds = serviceDelivery.getEstimatedTimetableDeliveries(); if (etds != null) { - estimatedTimetableHandler.applyUpdate( - etds, - updateSource.incrementalityOfLastUpdates(), - () -> { - if (markPrimed) { - primed = true; + saveResultOnGraph.execute((graph, transitModel) -> + estimatedTimetableHandler.applyUpdate( + etds, + updateSource.incrementalityOfLastUpdates(), + () -> { + if (markPrimed) { + primed = true; + } } - } + ) ); } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java index ad317b50661..2f4851c5f17 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java @@ -42,7 +42,6 @@ public SiriETGooglePubsubUpdater( ); EstimatedTimetableHandler estimatedTimetableHandler = new EstimatedTimetableHandler( - this::writeToGraphCallBack, timetableSnapshot, config.fuzzyTripMatching(), new DefaultTransitService(transitModel), @@ -51,7 +50,11 @@ public SiriETGooglePubsubUpdater( ); this.asyncEstimatedTimetableProcessor = - new AsyncEstimatedTimetableProcessor(asyncSiriMessageSource, estimatedTimetableHandler); + new AsyncEstimatedTimetableProcessor( + asyncSiriMessageSource, + estimatedTimetableHandler, + this::writeToGraphCallBack + ); } private Future writeToGraphCallBack(GraphWriterRunnable graphWriterRunnable) { From 814846ee28575380a650e33e52329c6109cc62e0 Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 17 Jun 2024 14:24:08 +0300 Subject: [PATCH 1396/1688] replace name with default if empty --- .../datasources/GbfsGeofencingZoneMapper.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java index 78fa7533d58..c98680d8c35 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java @@ -51,8 +51,10 @@ private GeofencingZone toInternalModel(GBFSFeature f) { LOG.error("Could not convert geofencing zone", e); return null; } - var nameFromData = f.getProperties().getName().isEmpty() ? null : f.getProperties().getName(); - var name = Objects.requireNonNullElseGet(nameFromData, () -> fallbackId(g)); + var name = Objects.requireNonNullElseGet(f.getProperties().getName(), () -> fallbackId(g)); + if (name.isEmpty()) { + name = fallbackId(g); + } var dropOffBanned = !f.getProperties().getRules().get(0).getRideAllowed(); var passThroughBanned = !f.getProperties().getRules().get(0).getRideThroughAllowed(); return new GeofencingZone( From 49ac4b7acf477733f7556a0c03b825535d89eacf Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 13:27:05 +0200 Subject: [PATCH 1397/1688] Move invalid trip id test --- .../trip/TimetableSnapshotSourceTest.java | 36 ----------------- .../rejection/InvalidTripIdTest.java | 40 +++++++++++++++++++ 2 files changed, 40 insertions(+), 36 deletions(-) create mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 1dad90b416b..ef45c442f0a 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -22,7 +22,6 @@ import java.time.Duration; import java.time.LocalDate; import java.util.List; -import java.util.stream.Stream; import javax.annotation.Nonnull; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -109,41 +108,6 @@ public void testGetSnapshotWithMaxSnapshotFrequencyCleared() { assertNotSame(snapshot, newSnapshot); } - /** - * This test just asserts that invalid trip ids don't throw an exception and are ignored instead - */ - @Test - public void invalidTripId() { - var updater = new TimetableSnapshotSource( - TimetableSnapshotSourceParameters.DEFAULT, - transitModel - ); - - Stream - .of("", null) - .forEach(id -> { - var tripDescriptorBuilder = TripDescriptor.newBuilder(); - tripDescriptorBuilder.setTripId(""); - tripDescriptorBuilder.setScheduleRelationship( - TripDescriptor.ScheduleRelationship.SCHEDULED - ); - var tripUpdateBuilder = TripUpdate.newBuilder(); - - tripUpdateBuilder.setTrip(tripDescriptorBuilder); - var tripUpdate = tripUpdateBuilder.build(); - - var result = updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - - assertEquals(0, result.successful()); - }); - } - @Test public void testHandleModifiedTrip() { // GIVEN diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java new file mode 100644 index 00000000000..58f9fb2ff55 --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java @@ -0,0 +1,40 @@ +package org.opentripplanner.updater.trip.moduletests.rejection; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import com.google.transit.realtime.GtfsRealtime; +import java.util.stream.Stream; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.updater.trip.RealtimeTestEnvironment; + +public class InvalidTripIdTest { + + static Stream invalidCases() { + return Stream.of(null, "", " "); + } + + /** + * This test just asserts that invalid trip ids don't throw an exception and are ignored instead + */ + @ParameterizedTest(name = "tripId=\"{0}\"") + @MethodSource("invalidCases") + void invalidTripId(String tripId) { + var env = RealtimeTestEnvironment.gtfs(); + var tripDescriptorBuilder = GtfsRealtime.TripDescriptor.newBuilder(); + if (tripId != null) { + tripDescriptorBuilder.setTripId(tripId); + } + tripDescriptorBuilder.setScheduleRelationship( + GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED + ); + var tripUpdateBuilder = GtfsRealtime.TripUpdate.newBuilder(); + + tripUpdateBuilder.setTrip(tripDescriptorBuilder); + var tripUpdate = tripUpdateBuilder.build(); + + var result = env.applyTripUpdate(tripUpdate); + + assertEquals(0, result.successful()); + } +} From 3f79d0e357b3c8b0ff444d35efbcbcd5a4fdefc7 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 13:31:03 +0200 Subject: [PATCH 1398/1688] Move assertions into separate class --- .../siri/SiriTimetableSnapshotSourceTest.java | 18 +----------------- .../test/support/UpdateResultAssertions.java | 13 +++++++++++++ 2 files changed, 14 insertions(+), 17 deletions(-) create mode 100644 src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java index a069f5c6656..73f6b92ffe7 100644 --- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java +++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java @@ -1,24 +1,12 @@ package org.opentripplanner.ext.siri; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure; -import java.util.List; -import java.util.Set; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; -import org.opentripplanner.model.PickDrop; import org.opentripplanner.transit.model.timetable.RealTimeState; -import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.model.timetable.TripOnServiceDate; -import org.opentripplanner.transit.model.timetable.TripTimes; -import org.opentripplanner.transit.model.timetable.TripTimesFactory; -import org.opentripplanner.transit.service.DefaultTransitService; -import org.opentripplanner.transit.service.StopModel; -import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.transit.service.TransitService; -import org.opentripplanner.updater.TimetableSnapshotSourceParameters; import org.opentripplanner.updater.spi.UpdateError; -import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; class SiriTimetableSnapshotSourceTest { @@ -402,10 +390,6 @@ void testExtraUnknownStop() { assertFailure(UpdateError.UpdateErrorType.INVALID_STOP_SEQUENCE, result); } - private void assertFailure(UpdateError.UpdateErrorType expectedError, UpdateResult result) { - assertEquals(Set.of(expectedError), result.failures().keySet()); - } - private static SiriEtBuilder updatedJourneyBuilder(RealtimeTestEnvironment env) { return new SiriEtBuilder(env.getDateTimeHelper()) .withEstimatedCalls(builder -> diff --git a/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java b/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java new file mode 100644 index 00000000000..e41660b0443 --- /dev/null +++ b/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java @@ -0,0 +1,13 @@ +package org.opentripplanner.test.support; + +import static org.junit.jupiter.api.Assertions.assertEquals; + +import java.util.Set; +import org.opentripplanner.updater.spi.UpdateError; +import org.opentripplanner.updater.spi.UpdateResult; + +public class UpdateResultAssertions { + public static void assertFailure(UpdateError.UpdateErrorType expectedError, UpdateResult result) { + assertEquals(Set.of(expectedError), result.failures().keySet()); + } +} From c442d17a6392e51eb06b1d5c9283910234327595 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 14:06:47 +0200 Subject: [PATCH 1399/1688] Move skipped tests --- .../test/support/UpdateResultAssertions.java | 13 ++ .../updater/trip/RealtimeTestEnvironment.java | 8 +- .../trip/TimetableSnapshotSourceTest.java | 215 ------------------ .../trip/moduletests/delay/DelayedTest.java | 71 +++++- .../trip/moduletests/delay/SkippedTest.java | 128 ++++++++++- .../rejection/InvalidInputTest.java | 5 +- 6 files changed, 213 insertions(+), 227 deletions(-) diff --git a/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java b/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java index e41660b0443..c6be0406ae3 100644 --- a/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java +++ b/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java @@ -1,13 +1,26 @@ package org.opentripplanner.test.support; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Set; import org.opentripplanner.updater.spi.UpdateError; import org.opentripplanner.updater.spi.UpdateResult; public class UpdateResultAssertions { + public static void assertFailure(UpdateError.UpdateErrorType expectedError, UpdateResult result) { assertEquals(Set.of(expectedError), result.failures().keySet()); } + + public static UpdateResult assertSuccess(UpdateResult updateResult) { + var errorCodes = updateResult.failures().keySet(); + assertEquals( + Set.of(), + errorCodes, + "Update result should have no error codes but had %s".formatted(errorCodes) + ); + assertTrue(updateResult.successful() > 0); + return updateResult; + } } diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index c2fb31e2dfb..fdd726eb624 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -15,6 +15,7 @@ import org.opentripplanner.ext.siri.EntityResolver; import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; +import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TimetableSnapshot; @@ -300,7 +301,12 @@ private UpdateResult applyEstimatedTimetable( } private Trip createTrip(String id, Route route, List stops) { - var trip = Trip.of(id(id)).withRoute(route).withServiceId(SERVICE_ID).build(); + var trip = Trip + .of(id(id)) + .withRoute(route) + .withHeadsign(I18NString.of("Headsign of %s".formatted(id))) + .withServiceId(SERVICE_ID) + .build(); var tripOnServiceDate = TripOnServiceDate .of(trip.getId()) diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index ef45c442f0a..9cf69821aff 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -2,7 +2,6 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.ADDED; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.CANCELED; -import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.SKIPPED; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -29,7 +28,6 @@ import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; -import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.framework.time.ServiceDateUtils; import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.Timetable; @@ -310,219 +308,6 @@ public void testHandleModifiedTrip() { } } - @Nested - class Scheduled { - - @Test - public void scheduled() { - // GIVEN - - String scheduledTripId = "1.1"; - - var builder = new TripUpdateBuilder( - scheduledTripId, - SERVICE_DATE, - SCHEDULED, - transitModel.getTimeZone() - ) - .addDelayedStopTime(1, 0) - .addDelayedStopTime(2, 60, 80) - .addDelayedStopTime(3, 90, 90); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - - // THEN - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - - final FeedScopedId tripId = new FeedScopedId(feedId, scheduledTripId); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(trip); - - final Timetable originalTimetableForToday = snapshot.resolve( - originalTripPattern, - SERVICE_DATE - ); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); - - assertNotSame(originalTimetableForToday, originalTimetableScheduled); - - final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); - assertTrue( - originalTripIndexScheduled > -1, - "Original trip should be found in scheduled time table" - ); - final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( - originalTripIndexScheduled - ); - assertFalse( - originalTripTimesScheduled.isCanceledOrDeleted(), - "Original trip times should not be canceled in scheduled time table" - ); - assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); - - final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - assertTrue( - originalTripIndexForToday > -1, - "Original trip should be found in time table for service date" - ); - final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( - originalTripIndexForToday - ); - assertEquals(RealTimeState.UPDATED, originalTripTimesForToday.getRealTimeState()); - assertEquals(0, originalTripTimesForToday.getArrivalDelay(0)); - assertEquals(0, originalTripTimesForToday.getDepartureDelay(0)); - assertEquals(60, originalTripTimesForToday.getArrivalDelay(1)); - assertEquals(80, originalTripTimesForToday.getDepartureDelay(1)); - assertEquals(90, originalTripTimesForToday.getArrivalDelay(2)); - assertEquals(90, originalTripTimesForToday.getDepartureDelay(2)); - } - - @Test - public void scheduledTripWithSkippedAndNoData() { - // GIVEN - - String scheduledTripId = "1.1"; - - var builder = new TripUpdateBuilder( - scheduledTripId, - SERVICE_DATE, - SCHEDULED, - transitModel.getTimeZone() - ) - .addNoDataStop(1) - .addSkippedStop(2) - .addNoDataStop(3); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - - // THEN - final TimetableSnapshot snapshot = updater.getTimetableSnapshot(); - - // Original trip pattern - { - final FeedScopedId tripId = new FeedScopedId(feedId, scheduledTripId); - final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(trip); - - final Timetable originalTimetableForToday = snapshot.resolve( - originalTripPattern, - SERVICE_DATE - ); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); - - assertNotSame(originalTimetableForToday, originalTimetableScheduled); - - final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); - assertTrue( - originalTripIndexScheduled > -1, - "Original trip should be found in scheduled time table" - ); - final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( - originalTripIndexScheduled - ); - assertFalse( - originalTripTimesScheduled.isCanceledOrDeleted(), - "Original trip times should not be canceled in scheduled time table" - ); - assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); - - final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - assertTrue( - originalTripIndexForToday > -1, - "Original trip should be found in time table for service date" - ); - final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( - originalTripIndexForToday - ); - assertTrue( - originalTripTimesForToday.isDeleted(), - "Original trip times should be deleted in time table for service date" - ); - // original trip should be deleted - assertEquals(RealTimeState.DELETED, originalTripTimesForToday.getRealTimeState()); - } - - // New trip pattern - { - final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( - new FeedScopedId(feedId, scheduledTripId), - SERVICE_DATE - ); - assertNotNull(newTripPattern, "New trip pattern should be found"); - - final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); - final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); - - assertNotSame(newTimetableForToday, newTimetableScheduled); - - assertTrue(newTripPattern.canBoard(0)); - assertFalse(newTripPattern.canBoard(1)); - assertTrue(newTripPattern.canBoard(2)); - - assertEquals(new NonLocalizedString("foo"), newTripPattern.getTripHeadsign()); - assertEquals( - newTripPattern.getOriginalTripPattern().getTripHeadsign(), - newTripPattern.getTripHeadsign() - ); - - final int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex( - scheduledTripId - ); - assertTrue( - newTimetableForTodayModifiedTripIndex > -1, - "New trip should be found in time table for service date" - ); - - var newTripTimes = newTimetableForToday.getTripTimes(newTimetableForTodayModifiedTripIndex); - assertEquals(RealTimeState.UPDATED, newTripTimes.getRealTimeState()); - - assertEquals( - -1, - newTimetableScheduled.getTripIndex(scheduledTripId), - "New trip should not be found in scheduled time table" - ); - - assertEquals(0, newTripTimes.getArrivalDelay(0)); - assertEquals(0, newTripTimes.getDepartureDelay(0)); - assertEquals(0, newTripTimes.getArrivalDelay(1)); - assertEquals(0, newTripTimes.getDepartureDelay(1)); - assertEquals(0, newTripTimes.getArrivalDelay(2)); - assertEquals(0, newTripTimes.getDepartureDelay(2)); - assertTrue(newTripTimes.isNoDataStop(0)); - assertTrue(newTripTimes.isCancelledStop(1)); - assertTrue(newTripTimes.isNoDataStop(2)); - } - } - } - @Nested class Added { diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index 4cfe1e5500d..5752e4941be 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -2,26 +2,32 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess; +import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE; import org.junit.jupiter.api.Test; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; +import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.transit.model.timetable.TripTimes; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; /** * Delays should be applied to the first trip but should leave the second trip untouched. */ -public class DelayedTest { +class DelayedTest { private static final int DELAY = 1; private static final int STOP_SEQUENCE = 1; @Test - public void delayed() { + void singleStopDelay() { var env = RealtimeTestEnvironment.gtfs(); var tripUpdate = new TripUpdateBuilder( @@ -85,4 +91,65 @@ public void delayed() { assertEquals(RealTimeState.SCHEDULED, realtime.getTripTimes(tripIndex).getRealTimeState()); } } + + /** + * Tests delays to multiple stop times, where arrival and departure do not have the same delay. + */ + @Test + void complexDelay() { + var env = RealtimeTestEnvironment.gtfs(); + + String tripId = env.trip2.getId().getId(); + + var builder = new TripUpdateBuilder(tripId, SERVICE_DATE, SCHEDULED, env.timeZone) + .addDelayedStopTime(0, 0) + .addDelayedStopTime(1, 60, 80) + .addDelayedStopTime(2, 90, 90); + + var tripUpdate = builder.build(); + + assertSuccess(env.applyTripUpdate(tripUpdate)); + + // THEN + final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + + final TripPattern originalTripPattern = env.transitModel + .getTransitModelIndex() + .getPatternForTrip() + .get(env.trip2); + + final Timetable originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); + final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + + assertNotSame(originalTimetableForToday, originalTimetableScheduled); + + final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); + assertTrue( + originalTripIndexScheduled > -1, + "Original trip should be found in scheduled time table" + ); + final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( + originalTripIndexScheduled + ); + assertFalse( + originalTripTimesScheduled.isCanceledOrDeleted(), + "Original trip times should not be canceled in scheduled time table" + ); + assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); + + final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + assertTrue( + originalTripIndexForToday > -1, + "Original trip should be found in time table for service date" + ); + + assertEquals( + "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", + env.getScheduledTimetable(env.trip2.getId()) + ); + assertEquals( + "UPDATED | A1 0:01 0:01:01 | B1 0:02:10 0:02:31 | C1 0:02:50 0:02:51", + env.getRealtimeTimetable(env.trip2) + ); + } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 9afb7e76261..4424d47495b 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -3,12 +3,16 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess; +import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE; import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.framework.FeedScopedId; @@ -40,9 +44,8 @@ public void scheduledTripWithSkippedAndScheduled() { .addDelayedStopTime(2, 90) .build(); - var result = env.applyTripUpdate(tripUpdate); + assertSuccess(env.applyTripUpdate(tripUpdate)); - assertEquals(1, result.successful()); final TimetableSnapshot snapshot = env.getTimetableSnapshot(); @@ -144,9 +147,7 @@ public void scheduledTripWithPreviouslySkipped() { .addDelayedStopTime(2, 90) .build(); - var result = env.applyTripUpdate(tripUpdate, DIFFERENTIAL); - - assertEquals(1, result.successful()); + var result = assertSuccess(env.applyTripUpdate(tripUpdate, DIFFERENTIAL)); // Create update to the same trip but now the skipped stop is no longer skipped var scheduledBuilder = new TripUpdateBuilder( @@ -162,7 +163,7 @@ public void scheduledTripWithPreviouslySkipped() { tripUpdate = scheduledBuilder.build(); // apply the update with the previously skipped stop now scheduled - result = env.applyTripUpdate(tripUpdate, DIFFERENTIAL); + result = assertSuccess(env.applyTripUpdate(tripUpdate, DIFFERENTIAL)); assertEquals(1, result.successful()); // Check that the there is no longer a realtime added trip pattern for the trip and that the @@ -222,4 +223,119 @@ public void scheduledTripWithPreviouslySkipped() { assertEquals(90, originalTripTimesForToday.getDepartureDelay(2)); } } + + /** + * Tests a mixture of SKIPPED and NO_DATA. + */ + @Test + public void skippedNoData() { + var env = RealtimeTestEnvironment.gtfs(); + + final FeedScopedId tripId = env.trip2.getId(); + var builder = new TripUpdateBuilder(tripId.getId(), SERVICE_DATE, SCHEDULED, env.timeZone) + .addNoDataStop(0) + .addSkippedStop(1) + .addNoDataStop(2); + + var tripUpdate = builder.build(); + + assertSuccess(env.applyTripUpdate(tripUpdate)); + + // THEN + var snapshot = env.getTimetableSnapshot(); + + // Original trip pattern + { + final TripPattern originalTripPattern = env.transitModel + .getTransitModelIndex() + .getPatternForTrip() + .get(env.trip2); + + final Timetable originalTimetableForToday = snapshot.resolve( + originalTripPattern, + SERVICE_DATE + ); + final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + + assertNotSame(originalTimetableForToday, originalTimetableScheduled); + + final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); + assertTrue( + originalTripIndexScheduled > -1, + "Original trip should be found in scheduled time table" + ); + final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( + originalTripIndexScheduled + ); + assertFalse( + originalTripTimesScheduled.isCanceledOrDeleted(), + "Original trip times should not be canceled in scheduled time table" + ); + assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); + + final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + assertTrue( + originalTripIndexForToday > -1, + "Original trip should be found in time table for service date" + ); + final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( + originalTripIndexForToday + ); + assertTrue( + originalTripTimesForToday.isDeleted(), + "Original trip times should be deleted in time table for service date" + ); + // original trip should be deleted + assertEquals(RealTimeState.DELETED, originalTripTimesForToday.getRealTimeState()); + } + + // New trip pattern + { + final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); + assertNotNull(newTripPattern, "New trip pattern should be found"); + + final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); + final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); + + assertNotSame(newTimetableForToday, newTimetableScheduled); + + assertTrue(newTripPattern.canBoard(0)); + assertFalse(newTripPattern.canBoard(1)); + assertTrue(newTripPattern.canBoard(2)); + + assertEquals( + new NonLocalizedString("Headsign of TestTrip2"), + newTripPattern.getTripHeadsign() + ); + assertEquals( + newTripPattern.getOriginalTripPattern().getTripHeadsign(), + newTripPattern.getTripHeadsign() + ); + + final int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex(tripId); + assertTrue( + newTimetableForTodayModifiedTripIndex > -1, + "New trip should be found in time table for service date" + ); + + var newTripTimes = newTimetableForToday.getTripTimes(newTimetableForTodayModifiedTripIndex); + assertEquals(RealTimeState.UPDATED, newTripTimes.getRealTimeState()); + + assertEquals( + -1, + newTimetableScheduled.getTripIndex(tripId), + "New trip should not be found in scheduled time table" + ); + + assertEquals(0, newTripTimes.getArrivalDelay(0)); + assertEquals(0, newTripTimes.getDepartureDelay(0)); + assertEquals(0, newTripTimes.getArrivalDelay(1)); + assertEquals(0, newTripTimes.getDepartureDelay(1)); + assertEquals(0, newTripTimes.getArrivalDelay(2)); + assertEquals(0, newTripTimes.getDepartureDelay(2)); + assertTrue(newTripTimes.isNoDataStop(0)); + assertTrue(newTripTimes.isCancelledStop(1)); + assertTrue(newTripTimes.isNoDataStop(2)); + } + } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index 00831333943..d0b3ad5dc31 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -3,12 +3,12 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE; import java.time.LocalDate; import java.util.List; -import java.util.Set; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; @@ -40,7 +40,6 @@ public void invalidTripDate(LocalDate date) { var snapshot = env.getTimetableSnapshot(); assertTrue(snapshot.isEmpty()); assertEquals(1, result.failed()); - var errors = result.failures().keySet(); - assertEquals(Set.of(NO_SERVICE_ON_DATE), errors); + assertFailure(NO_SERVICE_ON_DATE, result); } } From 778d0dee35f3c3d196b689bf60df9440e8a900d6 Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 17 Jun 2024 15:19:00 +0300 Subject: [PATCH 1400/1688] filterByNetwork naming --- .../apis/gtfs/datafetchers/QueryTypeImpl.java | 4 ++-- .../apis/gtfs/generated/GraphQLTypes.java | 12 ++++++------ .../apis/transmodel/TransmodelGraphQLSchema.java | 6 +++--- .../routing/graphfinder/DirectGraphFinder.java | 2 +- .../routing/graphfinder/GraphFinder.java | 2 +- .../graphfinder/PlaceFinderTraverseVisitor.java | 8 ++++---- .../routing/graphfinder/StreetGraphFinder.java | 4 ++-- .../org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- .../opentripplanner/apis/transmodel/schema.graphql | 2 +- .../apis/gtfs/GraphQLIntegrationTest.java | 2 +- 10 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java index d46fa2a8cf1..f187a49d9c7 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java @@ -330,7 +330,7 @@ public DataFetcher> nearest() { List filterByPlaceTypes = args.getGraphQLFilterByPlaceTypes() != null ? args.getGraphQLFilterByPlaceTypes().stream().map(GraphQLUtils::toModel).toList() : DEFAULT_PLACE_TYPES; - List filterByNetworkNames = args.getGraphQLFilterByNetworkNames(); + List filterByNetwork = args.getGraphQLFilterByNetwork(); List places; try { @@ -348,7 +348,7 @@ public DataFetcher> nearest() { filterByStations, filterByRoutes, filterByBikeRentalStations, - filterByNetworkNames, + filterByNetwork, getTransitService(environment) ) ); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java index 0608e97aa77..b191cc0830b 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java @@ -2416,7 +2416,7 @@ public static class GraphQLQueryTypeNearestArgs { private Double lon; private Integer maxDistance; private Integer maxResults; - private List filterByNetworkNames; + private List filterByNetwork; public GraphQLQueryTypeNearestArgs(Map args) { if (args != null) { @@ -2448,7 +2448,7 @@ public GraphQLQueryTypeNearestArgs(Map args) { this.lon = (Double) args.get("lon"); this.maxDistance = (Integer) args.get("maxDistance"); this.maxResults = (Integer) args.get("maxResults"); - this.filterByNetworkNames = (List) args.get("filterByNetworkNames"); + this.filterByNetwork = (List) args.get("filterByNetwork"); } } @@ -2540,12 +2540,12 @@ public void setGraphQLMaxResults(Integer maxResults) { this.maxResults = maxResults; } - public List getGraphQLFilterByNetworkNames() { - return this.filterByNetworkNames; + public List getGraphQLFilterByNetwork() { + return this.filterByNetwork; } - public void setGraphQLFilterByNetworkNames(List networkNames) { - this.filterByNetworkNames = networkNames; + public void setGraphQLFilterByNetwork(List networks) { + this.filterByNetwork = networks; } } diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java index 455c7400718..af0d9b79bbb 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java @@ -850,7 +850,7 @@ private GraphQLSchema create() { .argument( GraphQLArgument .newArgument() - .name("filterByNetworkNames") + .name("filterByNetwork") .description("Only include places that match one of the given network names.") .type(new GraphQLList(Scalars.GraphQLString)) .build() @@ -945,7 +945,7 @@ private GraphQLSchema create() { if (placeTypes.contains(TransmodelPlaceType.STOP_PLACE)) { maxResults *= 5; } - List filterByNetworkNames = environment.getArgument("filterByNetworkNames"); + List filterByNetwork = environment.getArgument("filterByNetwork"); List places; places = @@ -962,7 +962,7 @@ private GraphQLSchema create() { filterByStations, filterByRoutes, filterByBikeRentalStations, - filterByNetworkNames, + filterByNetwork, GqlUtil.getTransitService(environment) ); diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java index 7eaf60e38f1..c36efc59e5b 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/DirectGraphFinder.java @@ -63,7 +63,7 @@ public List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, - List filterByNetworkNames, + List filterByNetwork, TransitService transitService ) { throw new UnsupportedOperationException("Not implemented"); diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java index eecc4f8015a..063ed221dd5 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/GraphFinder.java @@ -69,7 +69,7 @@ List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, - List filterByNetworkNames, + List filterByNetwork, TransitService transitService ); } diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java index 6b06e358103..41b8ea6cbc4 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java @@ -44,7 +44,7 @@ public class PlaceFinderTraverseVisitor implements TraverseVisitor private final boolean includeStations; private final int maxResults; private final double radiusMeters; - private final Set filterByNetworkNames; + private final Set filterByNetwork; /** * @param transitService A TransitService used in finding information about the @@ -70,7 +70,7 @@ public PlaceFinderTraverseVisitor( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, - List filterByNetworkNames, + List filterByNetwork, int maxResults, double radiusMeters ) { @@ -84,7 +84,7 @@ public PlaceFinderTraverseVisitor( this.filterByStations = toSet(filterByStations); this.filterByRoutes = toSet(filterByRoutes); this.filterByVehicleRental = toSet(filterByBikeRentalStations); - this.filterByNetworkNames = toSet(filterByNetworkNames); + this.filterByNetwork = toSet(filterByNetwork); includeStops = shouldInclude(filterByPlaceTypes, PlaceType.STOP); includePatternAtStops = shouldInclude(filterByPlaceTypes, PlaceType.PATTERN_AT_STOP); @@ -267,7 +267,7 @@ private void handleVehicleRental(VehicleRentalPlace station, double distance) { if (seenVehicleRentalPlaces.contains(station.getId())) { return; } - if (!filterByNetworkNames.isEmpty() && !filterByNetworkNames.contains(station.getNetwork())) { + if (!filterByNetwork.isEmpty() && !filterByNetwork.contains(station.getNetwork())) { return; } seenVehicleRentalPlaces.add(station.getId()); diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java b/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java index 48b4236cd5b..71f65209ddf 100644 --- a/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java +++ b/src/main/java/org/opentripplanner/routing/graphfinder/StreetGraphFinder.java @@ -56,7 +56,7 @@ public List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, - List filterByNetworkNames, + List filterByNetwork, TransitService transitService ) { PlaceFinderTraverseVisitor visitor = new PlaceFinderTraverseVisitor( @@ -67,7 +67,7 @@ public List findClosestPlaces( filterByStations, filterByRoutes, filterByBikeRentalStations, - filterByNetworkNames, + filterByNetwork, maxResults, radiusMeters ); diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 324360e3375..8b872900238 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3554,7 +3554,7 @@ type QueryType { """ Only include places that match one of the given network names. """ - filterByNetworkNames: [String] + filterByNetwork: [String] """Only include places that match one of the given GTFS ids.""" filterByIds: InputFilters @deprecated(reason: "Not actively maintained") diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 03b97cab376..17f44b5cd97 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -676,7 +676,7 @@ type QueryType { "Only include places that include this mode. Only checked for places with mode i.e. quays, departures." filterByModes: [TransportMode], "Only include places that match one of the given network names." - filterByNetworkNames: [String], + filterByNetwork: [String], "Only include places of given types if set. Default accepts all types" filterByPlaceTypes: [FilterPlaceType] = [quay, stopPlace, bicycleRent, bikePark, carPark], "fetching only the first certain number of nodes" diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java index cb1d919637e..c73a607b594 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java @@ -448,7 +448,7 @@ public List findClosestPlaces( List filterByStations, List filterByRoutes, List filterByBikeRentalStations, - List filterByNetworkNames, + List filterByNetwork, TransitService transitService ) { return List From 7cb284b43b936ecd40ed37931e82c4c697fe185b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 14:30:35 +0200 Subject: [PATCH 1401/1688] Move ADDED tests --- .../updater/trip/RealtimeTestEnvironment.java | 9 +- .../trip/TimetableSnapshotSourceTest.java | 217 ------------------ .../trip/moduletests/addition/AddedTest.java | 207 +++++++++++++++++ .../trip/moduletests/delay/SkippedTest.java | 1 - .../rejection/InvalidInputTest.java | 2 - 5 files changed, 213 insertions(+), 223 deletions(-) create mode 100644 src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index fdd726eb624..98f339a4cc7 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -56,16 +56,19 @@ public final class RealtimeTestEnvironment { ); public static final LocalDate SERVICE_DATE = LocalDate.of(2024, 5, 8); public static final FeedScopedId SERVICE_ID = TransitModelForTest.id("CAL_1"); + public static final String STOP_A1_ID = "A1"; + public static final String STOP_B1_ID = "B1"; + public static final String STOP_C1_ID = "C1"; private final TransitModelForTest testModel = TransitModelForTest.of(); public final ZoneId timeZone = ZoneId.of(TransitModelForTest.TIME_ZONE_ID); public final Station stationA = testModel.station("A").build(); public final Station stationB = testModel.station("B").build(); public final Station stationC = testModel.station("C").build(); public final Station stationD = testModel.station("D").build(); - public final RegularStop stopA1 = testModel.stop("A1").withParentStation(stationA).build(); - public final RegularStop stopB1 = testModel.stop("B1").withParentStation(stationB).build(); + public final RegularStop stopA1 = testModel.stop(STOP_A1_ID).withParentStation(stationA).build(); + public final RegularStop stopB1 = testModel.stop(STOP_B1_ID).withParentStation(stationB).build(); public final RegularStop stopB2 = testModel.stop("B2").withParentStation(stationB).build(); - public final RegularStop stopC1 = testModel.stop("C1").withParentStation(stationC).build(); + public final RegularStop stopC1 = testModel.stop(STOP_C1_ID).withParentStation(stationC).build(); public final RegularStop stopD1 = testModel.stop("D1").withParentStation(stationD).build(); public final StopModel stopModel = testModel .stopModelBuilder() diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java index 9cf69821aff..7ae7b7386f3 100644 --- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java @@ -1,6 +1,5 @@ package org.opentripplanner.updater.trip; -import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.ADDED; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.CANCELED; import static com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate.ScheduleRelationship.SKIPPED; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -17,22 +16,18 @@ import com.google.transit.realtime.GtfsRealtime.TripUpdate; import com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeEvent; import com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate; -import de.mfdz.MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType; import java.time.Duration; import java.time.LocalDate; import java.util.List; import javax.annotation.Nonnull; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.opentripplanner.ConstantsForTests; import org.opentripplanner.TestOtpModel; import org.opentripplanner._support.time.ZoneIds; import org.opentripplanner.framework.time.ServiceDateUtils; -import org.opentripplanner.model.PickDrop; import org.opentripplanner.model.Timetable; import org.opentripplanner.model.TimetableSnapshot; -import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; @@ -41,7 +36,6 @@ import org.opentripplanner.transit.service.TransitModel; import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher; import org.opentripplanner.updater.TimetableSnapshotSourceParameters; -import org.opentripplanner.updater.spi.UpdateSuccess.WarningType; public class TimetableSnapshotSourceTest { @@ -308,217 +302,6 @@ public void testHandleModifiedTrip() { } } - @Nested - class Added { - - final String addedTripId = "added_trip"; - - @Test - public void addedTrip() { - var builder = new TripUpdateBuilder( - addedTripId, - SERVICE_DATE, - ADDED, - transitModel.getTimeZone() - ); - - builder.addStopTime("A", 30).addStopTime("C", 40).addStopTime("E", 55); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - - // THEN - assertAddedTrip(SERVICE_DATE, this.addedTripId, updater); - } - - private TripPattern assertAddedTrip( - LocalDate serviceDate, - String tripId, - TimetableSnapshotSource updater - ) { - var stopA = transitModel.getStopModel().getRegularStop(new FeedScopedId(feedId, "A")); - // Get the trip pattern of the added trip which goes through stopA - var snapshot = updater.getTimetableSnapshot(); - var patternsAtA = snapshot.getPatternsForStop(stopA); - - assertNotNull(patternsAtA, "Added trip pattern should be found"); - assertEquals(1, patternsAtA.size()); - var tripPattern = patternsAtA.stream().findFirst().get(); - - final Timetable forToday = snapshot.resolve(tripPattern, serviceDate); - final Timetable schedule = snapshot.resolve(tripPattern, null); - - assertNotSame(forToday, schedule); - - final int forTodayAddedTripIndex = forToday.getTripIndex(tripId); - assertTrue( - forTodayAddedTripIndex > -1, - "Added trip should be found in time table for service date" - ); - assertEquals( - RealTimeState.ADDED, - forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState() - ); - - final int scheduleTripIndex = schedule.getTripIndex(tripId); - assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table"); - return tripPattern; - } - - @Test - public void addedTripWithNewRoute() { - // GIVEN - - final var builder = new TripUpdateBuilder( - addedTripId, - SERVICE_DATE, - ADDED, - transitModel.getTimeZone() - ); - // add extension to set route name, url, mode - builder.addTripExtension(); - - builder - .addStopTime("A", 30, DropOffPickupType.PHONE_AGENCY) - .addStopTime("C", 40, DropOffPickupType.COORDINATE_WITH_DRIVER) - .addStopTime("E", 55, DropOffPickupType.NONE); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - var result = updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - - // THEN - - assertTrue(result.warnings().isEmpty()); - - var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); - - var route = pattern.getRoute(); - assertEquals(TripUpdateBuilder.ROUTE_URL, route.getUrl()); - assertEquals(TripUpdateBuilder.ROUTE_NAME, route.getName()); - assertEquals(TransitMode.RAIL, route.getMode()); - - var fromTransitModel = transitModel.getTransitModelIndex().getRouteForId(route.getId()); - assertEquals(fromTransitModel, route); - - assertEquals(PickDrop.CALL_AGENCY, pattern.getBoardType(0)); - assertEquals(PickDrop.CALL_AGENCY, pattern.getAlightType(0)); - - assertEquals(PickDrop.COORDINATE_WITH_DRIVER, pattern.getBoardType(1)); - assertEquals(PickDrop.COORDINATE_WITH_DRIVER, pattern.getAlightType(1)); - } - - @Test - public void addedWithUnknownStop() { - // GIVEN - final var builder = new TripUpdateBuilder( - addedTripId, - SERVICE_DATE, - ADDED, - transitModel.getTimeZone() - ); - // add extension to set route name, url, mode - builder.addTripExtension(); - - builder - .addStopTime("A", 30, DropOffPickupType.PHONE_AGENCY) - .addStopTime("UNKNOWN_STOP_ID", 40, DropOffPickupType.COORDINATE_WITH_DRIVER) - .addStopTime("E", 55, DropOffPickupType.NONE); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - var result = updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - - // THEN - - assertFalse(result.warnings().isEmpty()); - - assertEquals(List.of(WarningType.UNKNOWN_STOPS_REMOVED_FROM_ADDED_TRIP), result.warnings()); - - var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); - - assertEquals(2, pattern.getStops().size()); - } - - @Test - public void repeatedlyAddedTripWithNewRoute() { - // GIVEN - - final var builder = new TripUpdateBuilder( - addedTripId, - SERVICE_DATE, - ADDED, - transitModel.getTimeZone() - ); - // add extension to set route name, url, mode - builder.addTripExtension(); - - builder - .addStopTime("A", 30, DropOffPickupType.PHONE_AGENCY) - .addStopTime("C", 40, DropOffPickupType.COORDINATE_WITH_DRIVER) - .addStopTime("E", 55, DropOffPickupType.NONE); - - var tripUpdate = builder.build(); - - var updater = defaultUpdater(); - - // WHEN - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - var pattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); - var firstRoute = pattern.getRoute(); - - // apply the update a second time to check that no new route instance is created but the old one is reused - updater.applyTripUpdates( - TRIP_MATCHER_NOOP, - REQUIRED_NO_DATA, - DIFFERENTIAL, - List.of(tripUpdate), - feedId - ); - var secondPattern = assertAddedTrip(SERVICE_DATE, addedTripId, updater); - var secondRoute = secondPattern.getRoute(); - - // THEN - - assertSame(firstRoute, secondRoute); - assertNotNull(transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId())); - } - } - @Nonnull private TimetableSnapshotSource defaultUpdater() { return new TimetableSnapshotSource( diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java new file mode 100644 index 00000000000..2cce94117b3 --- /dev/null +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java @@ -0,0 +1,207 @@ +package org.opentripplanner.updater.trip.moduletests.addition; + +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.ADDED; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess; +import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE; +import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.STOP_A1_ID; +import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.STOP_B1_ID; +import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.STOP_C1_ID; + +import de.mfdz.MfdzRealtimeExtensions; +import java.util.List; +import org.junit.jupiter.api.Test; +import org.opentripplanner.model.PickDrop; +import org.opentripplanner.model.Timetable; +import org.opentripplanner.transit.model.basic.TransitMode; +import org.opentripplanner.transit.model.network.TripPattern; +import org.opentripplanner.transit.model.timetable.RealTimeState; +import org.opentripplanner.updater.spi.UpdateSuccess; +import org.opentripplanner.updater.trip.RealtimeTestEnvironment; +import org.opentripplanner.updater.trip.TripUpdateBuilder; + +public class AddedTest { + + final String ADDED_TRIP_ID = "added_trip"; + + @Test + public void addedTrip() { + var env = RealtimeTestEnvironment.gtfs(); + + var tripUpdate = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone) + .addStopTime(STOP_A1_ID, 30) + .addStopTime(STOP_B1_ID, 40) + .addStopTime(STOP_C1_ID, 55) + .build(); + + assertSuccess(env.applyTripUpdate(tripUpdate)); + assertAddedTrip(this.ADDED_TRIP_ID, env); + } + + + @Test + public void addedTripWithNewRoute() { + var env = RealtimeTestEnvironment.gtfs(); + final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); + // add extension to set route name, url, mode + builder.addTripExtension(); + + builder + .addStopTime( + STOP_A1_ID, + 30, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.PHONE_AGENCY + ) + .addStopTime( + STOP_B1_ID, + 40, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.COORDINATE_WITH_DRIVER + ) + .addStopTime( + STOP_B1_ID, + 55, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.NONE + ); + + var tripUpdate = builder.build(); + + // WHEN + var result = assertSuccess(env.applyTripUpdate(tripUpdate)); + + // THEN + + assertTrue(result.warnings().isEmpty()); + + var pattern = assertAddedTrip(ADDED_TRIP_ID, env); + + var route = pattern.getRoute(); + assertEquals(TripUpdateBuilder.ROUTE_URL, route.getUrl()); + assertEquals(TripUpdateBuilder.ROUTE_NAME, route.getName()); + assertEquals(TransitMode.RAIL, route.getMode()); + + var fromTransitModel = env.transitModel.getTransitModelIndex().getRouteForId(route.getId()); + assertEquals(fromTransitModel, route); + + assertEquals(PickDrop.CALL_AGENCY, pattern.getBoardType(0)); + assertEquals(PickDrop.CALL_AGENCY, pattern.getAlightType(0)); + + assertEquals(PickDrop.COORDINATE_WITH_DRIVER, pattern.getBoardType(1)); + assertEquals(PickDrop.COORDINATE_WITH_DRIVER, pattern.getAlightType(1)); + } + + @Test + public void addedWithUnknownStop() { + var env = RealtimeTestEnvironment.gtfs(); + final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); + // add extension to set route name, url, mode + builder.addTripExtension(); + + builder + .addStopTime( + STOP_A1_ID, + 30, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.PHONE_AGENCY + ) + .addStopTime( + "UNKNOWN_STOP_ID", + 40, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.COORDINATE_WITH_DRIVER + ) + .addStopTime( + STOP_C1_ID, + 55, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.NONE + ); + + var tripUpdate = builder.build(); + + var result = assertSuccess(env.applyTripUpdate(tripUpdate)); + + assertFalse(result.warnings().isEmpty()); + + assertEquals( + List.of(UpdateSuccess.WarningType.UNKNOWN_STOPS_REMOVED_FROM_ADDED_TRIP), + result.warnings() + ); + + var pattern = assertAddedTrip(ADDED_TRIP_ID, env); + + assertEquals(2, pattern.getStops().size()); + } + + @Test + public void repeatedlyAddedTripWithNewRoute() { + var env = RealtimeTestEnvironment.gtfs(); + final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); + // add extension to set route name, url, mode + builder.addTripExtension(); + + builder + .addStopTime( + STOP_A1_ID, + 30, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.PHONE_AGENCY + ) + .addStopTime( + STOP_B1_ID, + 40, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.COORDINATE_WITH_DRIVER + ) + .addStopTime( + STOP_C1_ID, + 55, + MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.NONE + ); + + var tripUpdate = builder.build(); + + assertSuccess(env.applyTripUpdate(tripUpdate)); + var pattern = assertAddedTrip(ADDED_TRIP_ID, env); + var firstRoute = pattern.getRoute(); + + // apply the update a second time to check that no new route instance is created but the old one is reused + env.applyTripUpdate(tripUpdate); + var secondPattern = assertAddedTrip(ADDED_TRIP_ID, env); + var secondRoute = secondPattern.getRoute(); + + // THEN + + assertSame(firstRoute, secondRoute); + assertNotNull(env.transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId())); + } + private TripPattern assertAddedTrip(String tripId, RealtimeTestEnvironment env) { + var snapshot = env.getTimetableSnapshot(); + var stopA = env.transitModel.getStopModel().getRegularStop(env.stopA1.getId()); + // Get the trip pattern of the added trip which goes through stopA + var patternsAtA = env.getTimetableSnapshot().getPatternsForStop(stopA); + + assertNotNull(patternsAtA, "Added trip pattern should be found"); + assertEquals(1, patternsAtA.size()); + var tripPattern = patternsAtA.stream().findFirst().get(); + + final Timetable forToday = snapshot.resolve(tripPattern, SERVICE_DATE); + final Timetable schedule = snapshot.resolve(tripPattern, null); + + assertNotSame(forToday, schedule); + + final int forTodayAddedTripIndex = forToday.getTripIndex(tripId); + assertTrue( + forTodayAddedTripIndex > -1, + "Added trip should be found in time table for service date" + ); + assertEquals( + RealTimeState.ADDED, + forToday.getTripTimes(forTodayAddedTripIndex).getRealTimeState() + ); + + final int scheduleTripIndex = schedule.getTripIndex(tripId); + assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table"); + return tripPattern; + } + +} diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 4424d47495b..fb3ae2fd3bb 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -46,7 +46,6 @@ public void scheduledTripWithSkippedAndScheduled() { assertSuccess(env.applyTripUpdate(tripUpdate)); - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); // Original trip pattern diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index d0b3ad5dc31..8084f3e64d3 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -1,7 +1,6 @@ package org.opentripplanner.updater.trip.moduletests.rejection; import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; -import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; @@ -39,7 +38,6 @@ public void invalidTripDate(LocalDate date) { var snapshot = env.getTimetableSnapshot(); assertTrue(snapshot.isEmpty()); - assertEquals(1, result.failed()); assertFailure(NO_SERVICE_ON_DATE, result); } } From 50701c175474168cfad3fb8ff838a014ac61e267 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 14:39:43 +0200 Subject: [PATCH 1402/1688] Move ADDED tests --- .../trip/moduletests/addition/AddedTest.java | 3 +- .../trip/moduletests/delay/SkippedTest.java | 50 +++++++------------ 2 files changed, 19 insertions(+), 34 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java index 2cce94117b3..4d3da180f49 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java @@ -43,7 +43,6 @@ public void addedTrip() { assertAddedTrip(this.ADDED_TRIP_ID, env); } - @Test public void addedTripWithNewRoute() { var env = RealtimeTestEnvironment.gtfs(); @@ -174,6 +173,7 @@ public void repeatedlyAddedTripWithNewRoute() { assertSame(firstRoute, secondRoute); assertNotNull(env.transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId())); } + private TripPattern assertAddedTrip(String tripId, RealtimeTestEnvironment env) { var snapshot = env.getTimetableSnapshot(); var stopA = env.transitModel.getStopModel().getRegularStop(env.stopA1.getId()); @@ -203,5 +203,4 @@ private TripPattern assertAddedTrip(String tripId, RealtimeTestEnvironment env) assertEquals(-1, scheduleTripIndex, "Added trip should not be found in scheduled time table"); return tripPattern; } - } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index fb3ae2fd3bb..20ca8d20b30 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -33,12 +33,7 @@ public void scheduledTripWithSkippedAndScheduled() { var env = RealtimeTestEnvironment.gtfs(); String scheduledTripId = env.trip2.getId().getId(); - var tripUpdate = new TripUpdateBuilder( - scheduledTripId, - RealtimeTestEnvironment.SERVICE_DATE, - SCHEDULED, - env.timeZone - ) + var tripUpdate = new TripUpdateBuilder(scheduledTripId, SERVICE_DATE, SCHEDULED, env.timeZone) .addDelayedStopTime(0, 0) .addSkippedStop(1) .addDelayedStopTime(2, 90) @@ -59,7 +54,7 @@ public void scheduledTripWithSkippedAndScheduled() { final Timetable originalTimetableForToday = snapshot.resolve( originalTripPattern, - RealtimeTestEnvironment.SERVICE_DATE + SERVICE_DATE ); final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); @@ -81,13 +76,10 @@ public void scheduledTripWithSkippedAndScheduled() { { final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( env.trip2.getId(), - RealtimeTestEnvironment.SERVICE_DATE + SERVICE_DATE ); - final Timetable newTimetableForToday = snapshot.resolve( - newTripPattern, - RealtimeTestEnvironment.SERVICE_DATE - ); + final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); assertNotSame(newTimetableForToday, newTimetableScheduled); @@ -135,12 +127,7 @@ public void scheduledTripWithPreviouslySkipped() { var env = RealtimeTestEnvironment.gtfs(); var tripId = env.trip2.getId(); - var tripUpdate = new TripUpdateBuilder( - tripId.getId(), - RealtimeTestEnvironment.SERVICE_DATE, - SCHEDULED, - env.timeZone - ) + var tripUpdate = new TripUpdateBuilder(tripId.getId(), SERVICE_DATE, SCHEDULED, env.timeZone) .addDelayedStopTime(0, 0) .addSkippedStop(1) .addDelayedStopTime(2, 90) @@ -151,7 +138,7 @@ public void scheduledTripWithPreviouslySkipped() { // Create update to the same trip but now the skipped stop is no longer skipped var scheduledBuilder = new TripUpdateBuilder( tripId.getId(), - RealtimeTestEnvironment.SERVICE_DATE, + SERVICE_DATE, SCHEDULED, env.timeZone ) @@ -170,10 +157,7 @@ public void scheduledTripWithPreviouslySkipped() { var snapshot = env.getTimetableSnapshot(); { - final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( - env.trip2.getId(), - RealtimeTestEnvironment.SERVICE_DATE - ); + final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); assertNull(newTripPattern); final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); @@ -183,7 +167,7 @@ public void scheduledTripWithPreviouslySkipped() { .get(trip); final Timetable originalTimetableForToday = snapshot.resolve( originalTripPattern, - RealtimeTestEnvironment.SERVICE_DATE + SERVICE_DATE ); final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); @@ -213,13 +197,15 @@ public void scheduledTripWithPreviouslySkipped() { final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( originalTripIndexForToday ); - assertEquals(RealTimeState.UPDATED, originalTripTimesForToday.getRealTimeState()); - assertEquals(0, originalTripTimesForToday.getArrivalDelay(0)); - assertEquals(0, originalTripTimesForToday.getDepartureDelay(0)); - assertEquals(50, originalTripTimesForToday.getArrivalDelay(1)); - assertEquals(50, originalTripTimesForToday.getDepartureDelay(1)); - assertEquals(90, originalTripTimesForToday.getArrivalDelay(2)); - assertEquals(90, originalTripTimesForToday.getDepartureDelay(2)); + + assertEquals( + "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", + env.getScheduledTimetable(tripId) + ); + assertEquals( + "UPDATED | A1 0:01 0:01:01 | B1 0:02 0:02:01 | C1 0:02:50 0:02:51", + env.getRealtimeTimetable(tripId, SERVICE_DATE) + ); } } @@ -317,7 +303,7 @@ public void skippedNoData() { "New trip should be found in time table for service date" ); - var newTripTimes = newTimetableForToday.getTripTimes(newTimetableForTodayModifiedTripIndex); + var newTripTimes = newTimetableForToday.getTripTimes(tripId); assertEquals(RealTimeState.UPDATED, newTripTimes.getRealTimeState()); assertEquals( From d85c67a5a741d82e17a597b4ffd15787d6f98724 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 14:53:50 +0200 Subject: [PATCH 1403/1688] Refactor handling of schedule relationships --- .../updater/trip/TimetableSnapshotSource.java | 50 ++++++------------- .../trip/moduletests/delay/SkippedTest.java | 3 -- 2 files changed, 16 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index cc39d82369b..ba4ffe211b4 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -1,5 +1,6 @@ package org.opentripplanner.updater.trip; +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_ARRIVAL_TIME; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_DEPARTURE_TIME; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NOT_IMPLEMENTED_DUPLICATED; @@ -19,6 +20,7 @@ import com.google.common.collect.Multimaps; import com.google.transit.realtime.GtfsRealtime; import com.google.transit.realtime.GtfsRealtime.TripDescriptor; +import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship; import com.google.transit.realtime.GtfsRealtime.TripUpdate; import com.google.transit.realtime.GtfsRealtime.TripUpdate.StopTimeUpdate; import de.mfdz.MfdzRealtimeExtensions; @@ -150,7 +152,7 @@ public UpdateResult applyTripUpdates( return UpdateResult.empty(); } - Map failuresByRelationship = new HashMap<>(); + Map failuresByRelationship = new HashMap<>(); List> results = new ArrayList<>(); snapshotManager.withLock(() -> { @@ -199,11 +201,12 @@ public UpdateResult applyTripUpdates( serviceDate = localDateNow.get(); } // Determine what kind of trip update this is - final TripDescriptor.ScheduleRelationship tripScheduleRelationship = determineTripScheduleRelationship( - tripDescriptor + var scheduleRelationship = Objects.requireNonNullElse( + tripDescriptor.getScheduleRelationship(), + SCHEDULED ); if (updateIncrementality == DIFFERENTIAL) { - purgePatternModifications(tripScheduleRelationship, tripId, serviceDate); + purgePatternModifications(scheduleRelationship, tripId, serviceDate); } uIndex += 1; @@ -213,7 +216,7 @@ public UpdateResult applyTripUpdates( Result result; try { result = - switch (tripScheduleRelationship) { + switch (scheduleRelationship) { case SCHEDULED -> handleScheduledTrip( tripUpdate, tripId, @@ -255,11 +258,11 @@ public UpdateResult applyTripUpdates( if (result.isFailure()) { debug(tripId, "Failed to apply TripUpdate."); LOG.trace(" Contents: {}", tripUpdate); - if (failuresByRelationship.containsKey(tripScheduleRelationship)) { - var c = failuresByRelationship.get(tripScheduleRelationship); - failuresByRelationship.put(tripScheduleRelationship, ++c); + if (failuresByRelationship.containsKey(scheduleRelationship)) { + var c = failuresByRelationship.get(scheduleRelationship); + failuresByRelationship.put(scheduleRelationship, ++c); } else { - failuresByRelationship.put(tripScheduleRelationship, 1); + failuresByRelationship.put(scheduleRelationship, 1); } } } @@ -282,7 +285,7 @@ public UpdateResult applyTripUpdates( * added trip pattern. */ private void purgePatternModifications( - TripDescriptor.ScheduleRelationship tripScheduleRelationship, + ScheduleRelationship tripScheduleRelationship, FeedScopedId tripId, LocalDate serviceDate ) { @@ -290,8 +293,8 @@ private void purgePatternModifications( if ( !isPreviouslyAddedTrip(tripId, pattern, serviceDate) || ( - tripScheduleRelationship != TripDescriptor.ScheduleRelationship.CANCELED && - tripScheduleRelationship != TripDescriptor.ScheduleRelationship.DELETED + tripScheduleRelationship != ScheduleRelationship.CANCELED && + tripScheduleRelationship != ScheduleRelationship.DELETED ) ) { // Remove previous realtime updates for this trip. This is necessary to avoid previous @@ -327,7 +330,7 @@ public TimetableSnapshot getTimetableSnapshot() { private static void logUpdateResult( String feedId, - Map failuresByRelationship, + Map failuresByRelationship, UpdateResult updateResult ) { ResultLogger.logUpdateResult(feedId, "gtfs-rt-trip-updates", updateResult); @@ -345,27 +348,6 @@ private static void logUpdateResult( }); } - /** - * Determine how the trip update should be handled. - * - * @param tripDescriptor trip descriptor - * @return TripDescriptor.ScheduleRelationship indicating how the trip update should be handled - */ - private TripDescriptor.ScheduleRelationship determineTripScheduleRelationship( - final TripDescriptor tripDescriptor - ) { - // Assume default value - TripDescriptor.ScheduleRelationship tripScheduleRelationship = - TripDescriptor.ScheduleRelationship.SCHEDULED; - - // If trip update contains schedule relationship, use it - if (tripDescriptor.hasScheduleRelationship()) { - tripScheduleRelationship = tripDescriptor.getScheduleRelationship(); - } - - return tripScheduleRelationship; - } - private Result handleScheduledTrip( TripUpdate tripUpdate, FeedScopedId tripId, diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 20ca8d20b30..78770e6f6b7 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -194,9 +194,6 @@ public void scheduledTripWithPreviouslySkipped() { originalTripIndexForToday > -1, "Original trip should be found in time table for service date" ); - final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( - originalTripIndexForToday - ); assertEquals( "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", From 58005ac84917998876a0203a7f02d110908ca17b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 15:04:49 +0200 Subject: [PATCH 1404/1688] Simplify access --- .../updater/trip/moduletests/addition/AddedTest.java | 10 +++++----- .../cancellation/CancellationDeletionTest.java | 4 ++-- .../updater/trip/moduletests/delay/SkippedTest.java | 6 +++--- .../trip/moduletests/rejection/InvalidInputTest.java | 4 ++-- .../trip/moduletests/rejection/InvalidTripIdTest.java | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java index 4d3da180f49..ff03362cbdd 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java @@ -25,12 +25,12 @@ import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; -public class AddedTest { +class AddedTest { final String ADDED_TRIP_ID = "added_trip"; @Test - public void addedTrip() { + void addedTrip() { var env = RealtimeTestEnvironment.gtfs(); var tripUpdate = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone) @@ -44,7 +44,7 @@ public void addedTrip() { } @Test - public void addedTripWithNewRoute() { + void addedTripWithNewRoute() { var env = RealtimeTestEnvironment.gtfs(); final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); // add extension to set route name, url, mode @@ -94,7 +94,7 @@ public void addedTripWithNewRoute() { } @Test - public void addedWithUnknownStop() { + void addedWithUnknownStop() { var env = RealtimeTestEnvironment.gtfs(); final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); // add extension to set route name, url, mode @@ -134,7 +134,7 @@ public void addedWithUnknownStop() { } @Test - public void repeatedlyAddedTripWithNewRoute() { + void repeatedlyAddedTripWithNewRoute() { var env = RealtimeTestEnvironment.gtfs(); final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); // add extension to set route name, url, mode diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index b2c31e2254e..b0bb999f350 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -32,7 +32,7 @@ static List cases() { @ParameterizedTest @MethodSource("cases") - public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { + void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { var env = RealtimeTestEnvironment.gtfs(); var pattern1 = env.getPatternForTrip(env.trip1); @@ -73,7 +73,7 @@ public void cancelledTrip(ScheduleRelationship relationship, RealTimeState state */ @ParameterizedTest @MethodSource("cases") - public void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState state) { + void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState state) { var env = RealtimeTestEnvironment.gtfs(); var addedTripId = "added-trip"; // First add ADDED trip diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 78770e6f6b7..4d91eefd390 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -29,7 +29,7 @@ public class SkippedTest { @Test - public void scheduledTripWithSkippedAndScheduled() { + void scheduledTripWithSkippedAndScheduled() { var env = RealtimeTestEnvironment.gtfs(); String scheduledTripId = env.trip2.getId().getId(); @@ -123,7 +123,7 @@ public void scheduledTripWithSkippedAndScheduled() { * the new stop-skipping trip pattern should also be removed. */ @Test - public void scheduledTripWithPreviouslySkipped() { + void scheduledTripWithPreviouslySkipped() { var env = RealtimeTestEnvironment.gtfs(); var tripId = env.trip2.getId(); @@ -210,7 +210,7 @@ public void scheduledTripWithPreviouslySkipped() { * Tests a mixture of SKIPPED and NO_DATA. */ @Test - public void skippedNoData() { + void skippedNoData() { var env = RealtimeTestEnvironment.gtfs(); final FeedScopedId tripId = env.trip2.getId(); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index 8084f3e64d3..4d28c60eeb5 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -17,7 +17,7 @@ * A trip with start date that is outside the service period shouldn't throw an exception and is * ignored instead. */ -public class InvalidInputTest { +class InvalidInputTest { public static List cases() { return List.of(SERVICE_DATE.minusYears(10), SERVICE_DATE.plusYears(10)); @@ -25,7 +25,7 @@ public static List cases() { @ParameterizedTest @MethodSource("cases") - public void invalidTripDate(LocalDate date) { + void invalidTripDate(LocalDate date) { var env = RealtimeTestEnvironment.gtfs(); var update = new TripUpdateBuilder(env.trip1.getId().getId(), date, SCHEDULED, env.timeZone) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java index 58f9fb2ff55..8d7f7629575 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java @@ -8,7 +8,7 @@ import org.junit.jupiter.params.provider.MethodSource; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; -public class InvalidTripIdTest { +class InvalidTripIdTest { static Stream invalidCases() { return Stream.of(null, "", " "); From 3e346d438192d19143dd7da0e9ffbb522c2d7e3d Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 15:38:33 +0200 Subject: [PATCH 1405/1688] Remove unused method --- .../opentripplanner/transit/model/network/TripPattern.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index f9734c1cb1a..deab7ee79f4 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -334,10 +334,6 @@ public boolean isBoardAndAlightAt(int stopIndex, PickDrop value) { // TODO: These should probably be deprecated. That would require grabbing the scheduled timetable, // and would avoid mistakes where real-time updates are accidentally not taken into account. - public boolean stopPatternIsEqual(TripPattern other) { - return stopPattern.equals(other.stopPattern); - } - public Trip getTrip(int tripIndex) { return scheduledTimetable.getTripTimes(tripIndex).getTrip(); } From 6412eeabe0f94aae12407f7514965021374d00a6 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Mon, 17 Jun 2024 15:43:48 +0200 Subject: [PATCH 1406/1688] Remove method that is only used in test --- .../opentripplanner/transit/model/network/TripPattern.java | 7 ------- .../gtfs/interlining/InterlineProcessorTest.java | 5 ++--- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java index deab7ee79f4..57c71d06113 100644 --- a/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java +++ b/src/main/java/org/opentripplanner/transit/model/network/TripPattern.java @@ -331,13 +331,6 @@ public boolean isBoardAndAlightAt(int stopIndex, PickDrop value) { /* METHODS THAT DELEGATE TO THE SCHEDULED TIMETABLE */ - // TODO: These should probably be deprecated. That would require grabbing the scheduled timetable, - // and would avoid mistakes where real-time updates are accidentally not taken into account. - - public Trip getTrip(int tripIndex) { - return scheduledTimetable.getTripTimes(tripIndex).getTrip(); - } - // TODO OTP2 this method modifies the state, it will be refactored in a subsequent step /** * Add the given tripTimes to this pattern's scheduled timetable, recording the corresponding trip diff --git a/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java b/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java index 67ca61f0403..a1aa4f9d753 100644 --- a/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java +++ b/src/test/java/org/opentripplanner/gtfs/interlining/InterlineProcessorTest.java @@ -125,9 +125,8 @@ void testInterline( void staySeatedNotAllowed() { var transferService = new DefaultTransferService(); - var fromTrip = patterns.get(0).getTrip(0); - var toTrip = patterns.get(1).getTrip(0); - + var fromTrip = patterns.get(0).getScheduledTimetable().getTripTimes().get(0).getTrip(); + var toTrip = patterns.get(1).getScheduledTimetable().getTripTimes().get(0).getTrip(); var notAllowed = new StaySeatedNotAllowed(fromTrip, toTrip); var calendarService = new CalendarServiceData(); From 204bbdac01354f6851e37295772ac35b18c217e8 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 17 Jun 2024 15:44:39 +0200 Subject: [PATCH 1407/1688] Move result consumer management to AsyncEstimatedTimetableProcessor --- .../AsyncEstimatedTimetableProcessor.java | 15 +++++-- .../updater/EstimatedTimetableHandler.java | 26 +----------- .../ext/siri/updater/SiriETUpdater.java | 40 +++++++------------ .../google/SiriETGooglePubsubUpdater.java | 22 +++++----- .../updater/trip/RealtimeTestEnvironment.java | 33 ++++++--------- 5 files changed, 52 insertions(+), 84 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java index ee9554d0215..35ebe183564 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -1,6 +1,8 @@ package org.opentripplanner.ext.siri.updater; import java.util.concurrent.Future; +import java.util.function.Consumer; +import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.trip.UpdateIncrementality; import uk.org.siri.siri20.ServiceDelivery; @@ -15,15 +17,18 @@ public class AsyncEstimatedTimetableProcessor { private final AsyncEstimatedTimetableSource siriMessageSource; private final EstimatedTimetableHandler estimatedTimetableHandler; private final WriteToGraphCallback saveResultOnGraph; + private final Consumer updateResultConsumer; public AsyncEstimatedTimetableProcessor( AsyncEstimatedTimetableSource siriMessageSource, EstimatedTimetableHandler estimatedTimetableHandler, - WriteToGraphCallback saveResultOnGraph + WriteToGraphCallback saveResultOnGraph, + Consumer updateResultConsumer ) { this.siriMessageSource = siriMessageSource; this.estimatedTimetableHandler = estimatedTimetableHandler; this.saveResultOnGraph = saveResultOnGraph; + this.updateResultConsumer = updateResultConsumer; } /** @@ -40,9 +45,11 @@ public void run() { */ private Future processSiriData(ServiceDelivery serviceDelivery) { return saveResultOnGraph.execute((graph, transitModel) -> - estimatedTimetableHandler.applyUpdate( - serviceDelivery.getEstimatedTimetableDeliveries(), - UpdateIncrementality.DIFFERENTIAL + updateResultConsumer.accept( + estimatedTimetableHandler.applyUpdate( + serviceDelivery.getEstimatedTimetableDeliveries(), + UpdateIncrementality.DIFFERENTIAL + ) ) ); } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java index 92d0b735b62..f967a2e99a9 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java @@ -1,8 +1,6 @@ package org.opentripplanner.ext.siri.updater; import java.util.List; -import java.util.function.Consumer; -import javax.annotation.Nonnull; import org.opentripplanner.ext.siri.EntityResolver; import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; @@ -19,7 +17,6 @@ public class EstimatedTimetableHandler { private final SiriTimetableSnapshotSource snapshotSource; private final SiriFuzzyTripMatcher fuzzyTripMatcher; private final EntityResolver entityResolver; - private final Consumer updateResultConsumer; /** * The ID for the static feed to which these TripUpdates are applied */ @@ -29,46 +26,27 @@ public EstimatedTimetableHandler( SiriTimetableSnapshotSource snapshotSource, boolean fuzzyMatching, TransitService transitService, - Consumer updateResultConsumer, String feedId ) { this.snapshotSource = snapshotSource; this.fuzzyTripMatcher = fuzzyMatching ? SiriFuzzyTripMatcher.of(transitService) : null; this.entityResolver = new EntityResolver(transitService, feedId); - this.updateResultConsumer = updateResultConsumer; this.feedId = feedId; } /** * Apply the update to the transit model. - * @return a future indicating when the changes are applied. */ - public void applyUpdate( + public UpdateResult applyUpdate( List estimatedTimetableDeliveries, UpdateIncrementality updateMode ) { - applyUpdate(estimatedTimetableDeliveries, updateMode, () -> {}); - } - - /** - * Apply the update to the transit model. - * @param onUpdateComplete callback called after the update has been applied. - * @return a future indicating when the changes are applied. - */ - public void applyUpdate( - List estimatedTimetableDeliveries, - UpdateIncrementality updateMode, - @Nonnull Runnable onUpdateComplete - ) { - var results = snapshotSource.applyEstimatedTimetable( + return snapshotSource.applyEstimatedTimetable( fuzzyTripMatcher, entityResolver, feedId, updateMode, estimatedTimetableDeliveries ); - - updateResultConsumer.accept(results); - onUpdateComplete.run(); } } diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java index bce2abce908..c811d3ee5d8 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/SiriETUpdater.java @@ -1,12 +1,10 @@ package org.opentripplanner.ext.siri.updater; import java.util.List; -import java.util.concurrent.Future; import java.util.function.Consumer; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.updater.GraphWriterRunnable; import org.opentripplanner.updater.spi.PollingGraphUpdater; import org.opentripplanner.updater.spi.ResultLogger; import org.opentripplanner.updater.spi.UpdateResult; @@ -39,10 +37,12 @@ public class SiriETUpdater extends PollingGraphUpdater { private final EstimatedTimetableHandler estimatedTimetableHandler; + private final Consumer recordMetrics; + public SiriETUpdater( SiriETUpdaterParameters config, TransitModel transitModel, - SiriTimetableSnapshotSource timetableSnapshot + SiriTimetableSnapshotSource timetableSnapshotSource ) { super(config); // Create update streamer from preferences @@ -60,23 +60,13 @@ public SiriETUpdater( estimatedTimetableHandler = new EstimatedTimetableHandler( - timetableSnapshot, + timetableSnapshotSource, config.fuzzyTripMatching(), new DefaultTransitService(transitModel), - updateResultConsumer(config), feedId ); - } - - private Consumer updateResultConsumer(SiriETUpdaterParameters config) { - return updateResult -> { - ResultLogger.logUpdateResult(feedId, "siri-et", updateResult); - TripUpdateMetrics.streaming(config).accept(updateResult); - }; - } - private Future writeToCallBack(GraphWriterRunnable graphWriterRunnable) { - return saveResultOnGraph.execute(graphWriterRunnable); + recordMetrics = TripUpdateMetrics.streaming(config); } @Override @@ -94,6 +84,7 @@ public void runPolling() { do { var updates = updateSource.getUpdates(); if (updates.isPresent()) { + var incrementality = updateSource.incrementalityOfLastUpdates(); ServiceDelivery serviceDelivery = updates.get().getServiceDelivery(); moreData = Boolean.TRUE.equals(serviceDelivery.isMoreData()); // Mark this updater as primed after last page of updates. Copy moreData into a final @@ -101,17 +92,14 @@ public void runPolling() { final boolean markPrimed = !moreData; List etds = serviceDelivery.getEstimatedTimetableDeliveries(); if (etds != null) { - saveResultOnGraph.execute((graph, transitModel) -> - estimatedTimetableHandler.applyUpdate( - etds, - updateSource.incrementalityOfLastUpdates(), - () -> { - if (markPrimed) { - primed = true; - } - } - ) - ); + saveResultOnGraph.execute((graph, transitModel) -> { + var result = estimatedTimetableHandler.applyUpdate(etds, incrementality); + ResultLogger.logUpdateResult(feedId, "siri-et", result); + recordMetrics.accept(result); + if (markPrimed) { + primed = true; + } + }); } } } while (moreData); diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java index 2f4851c5f17..d49eaa7c605 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java @@ -27,7 +27,7 @@ public class SiriETGooglePubsubUpdater implements GraphUpdater { public SiriETGooglePubsubUpdater( SiriETGooglePubsubUpdaterParameters config, TransitModel transitModel, - SiriTimetableSnapshotSource timetableSnapshot + SiriTimetableSnapshotSource timetableSnapshotSource ) { this.configRef = config.configRef(); @@ -42,25 +42,21 @@ public SiriETGooglePubsubUpdater( ); EstimatedTimetableHandler estimatedTimetableHandler = new EstimatedTimetableHandler( - timetableSnapshot, + timetableSnapshotSource, config.fuzzyTripMatching(), new DefaultTransitService(transitModel), - TripUpdateMetrics.streaming(config), config.feedId() ); - this.asyncEstimatedTimetableProcessor = + asyncEstimatedTimetableProcessor = new AsyncEstimatedTimetableProcessor( asyncSiriMessageSource, estimatedTimetableHandler, - this::writeToGraphCallBack + this::writeToGraphCallBack, + TripUpdateMetrics.streaming(config) ); } - private Future writeToGraphCallBack(GraphWriterRunnable graphWriterRunnable) { - return saveResultOnGraph.execute(graphWriterRunnable); - } - @Override public void setup(WriteToGraphCallback writeToGraphCallback) { this.saveResultOnGraph = writeToGraphCallback; @@ -80,4 +76,12 @@ public boolean isPrimed() { public String getConfigRef() { return configRef; } + + /** + * Defer the invocation of {@link #saveResultOnGraph} since it is null at construction time and + * initialized when {@link #setup(WriteToGraphCallback)} is called. + */ + private Future writeToGraphCallBack(GraphWriterRunnable graphWriterRunnable) { + return saveResultOnGraph.execute(graphWriterRunnable); + } } diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index c2fb31e2dfb..49eac39838f 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -12,9 +12,8 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.opentripplanner.DateTimeHelper; -import org.opentripplanner.ext.siri.EntityResolver; -import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; +import org.opentripplanner.ext.siri.updater.EstimatedTimetableHandler; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.model.StopTime; import org.opentripplanner.model.TimetableSnapshot; @@ -167,8 +166,13 @@ public String getFeedId() { return TransitModelForTest.FEED_ID; } - public EntityResolver getEntityResolver() { - return new EntityResolver(getTransitService(), getFeedId()); + public EstimatedTimetableHandler getEstimatedTimetableHandler(boolean fuzzyMatching) { + return new EstimatedTimetableHandler( + siriSource, + fuzzyMatching, + getTransitService(), + getFeedId() + ); } public TripPattern getPatternForTrip(FeedScopedId tripId) { @@ -242,18 +246,11 @@ public String getScheduledTimetable(FeedScopedId tripId) { public UpdateResult applyEstimatedTimetableWithFuzzyMatcher( List updates ) { - SiriFuzzyTripMatcher siriFuzzyTripMatcher = new SiriFuzzyTripMatcher(getTransitService()); - return applyEstimatedTimetable(updates, siriFuzzyTripMatcher); + return applyEstimatedTimetable(updates, true); } public UpdateResult applyEstimatedTimetable(List updates) { - return siriSource.applyEstimatedTimetable( - null, - getEntityResolver(), - getFeedId(), - DIFFERENTIAL, - updates - ); + return applyEstimatedTimetable(updates, false); } // GTFS-RT updates @@ -287,16 +284,10 @@ public UpdateResult applyTripUpdates( private UpdateResult applyEstimatedTimetable( List updates, - SiriFuzzyTripMatcher siriFuzzyTripMatcher + boolean fuzzyMatching ) { Objects.requireNonNull(siriSource, "Test environment is configured for GTFS-RT only"); - return siriSource.applyEstimatedTimetable( - siriFuzzyTripMatcher, - getEntityResolver(), - getFeedId(), - DIFFERENTIAL, - updates - ); + return getEstimatedTimetableHandler(fuzzyMatching).applyUpdate(updates, DIFFERENTIAL); } private Trip createTrip(String id, Route route, List stops) { From 73ea07a04798f23d9824f8cc73f7a0a267a69b7b Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 17 Jun 2024 15:54:20 +0200 Subject: [PATCH 1408/1688] Fix race condition in test --- .../updater/EstimatedTimetableHandler.java | 19 ++++++++++++++++++- .../updater/trip/RealtimeTestEnvironment.java | 3 ++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java index f967a2e99a9..13ae4806a51 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java @@ -27,9 +27,26 @@ public EstimatedTimetableHandler( boolean fuzzyMatching, TransitService transitService, String feedId + ) { + this( + snapshotSource, + fuzzyMatching ? SiriFuzzyTripMatcher.of(transitService) : null, + transitService, + feedId + ); + } + + /** + * Constructor for tests only. + */ + public EstimatedTimetableHandler( + SiriTimetableSnapshotSource snapshotSource, + SiriFuzzyTripMatcher siriFuzzyTripMatcher, + TransitService transitService, + String feedId ) { this.snapshotSource = snapshotSource; - this.fuzzyTripMatcher = fuzzyMatching ? SiriFuzzyTripMatcher.of(transitService) : null; + this.fuzzyTripMatcher = siriFuzzyTripMatcher; this.entityResolver = new EntityResolver(transitService, feedId); this.feedId = feedId; } diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java index 49eac39838f..b752bcbf9bf 100644 --- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java +++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java @@ -12,6 +12,7 @@ import java.util.stream.Collectors; import java.util.stream.IntStream; import org.opentripplanner.DateTimeHelper; +import org.opentripplanner.ext.siri.SiriFuzzyTripMatcher; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; import org.opentripplanner.ext.siri.updater.EstimatedTimetableHandler; import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; @@ -169,7 +170,7 @@ public String getFeedId() { public EstimatedTimetableHandler getEstimatedTimetableHandler(boolean fuzzyMatching) { return new EstimatedTimetableHandler( siriSource, - fuzzyMatching, + fuzzyMatching ? new SiriFuzzyTripMatcher(getTransitService()) : null, getTransitService(), getFeedId() ); From fa4627fbaef75da48583722294816315435d4d68 Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 17 Jun 2024 17:25:00 +0300 Subject: [PATCH 1409/1688] removed network hiding option in maplayers --- .../layers/vehiclerental/VehicleRentalLayerBuilder.java | 3 --- .../opentripplanner/inspector/vector/LayerParameters.java | 7 ------- 2 files changed, 10 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java index 24d922bffb3..0869aeb2ba8 100644 --- a/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java +++ b/src/ext/java/org/opentripplanner/ext/vectortiles/layers/vehiclerental/VehicleRentalLayerBuilder.java @@ -18,7 +18,6 @@ abstract class VehicleRentalLayerBuilder extends LayerBuilder { private final VehicleRentalService service; - private final List hideNetworks; public VehicleRentalLayerBuilder( VehicleRentalService service, @@ -31,7 +30,6 @@ public VehicleRentalLayerBuilder( layerParameters.expansionFactor() ); this.service = service; - this.hideNetworks = layerParameters.hideNetworks(); } @Override @@ -41,7 +39,6 @@ protected List getGeometries(Envelope query) { } return getVehicleRentalPlaces(service) .stream() - .filter(rental -> !hideNetworks.contains(rental.getNetwork())) .map(rental -> { Coordinate coordinate = new Coordinate(rental.getLongitude(), rental.getLatitude()); Point point = GeometryUtils.getGeometryFactory().createPoint(coordinate); diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java index 0348cf0265e..0d6a4b23d6b 100644 --- a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java +++ b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java @@ -56,11 +56,4 @@ default int cacheMaxSeconds() { default double expansionFactor() { return EXPANSION_FACTOR; } - - /** - * A list of networks to hide from the results. - */ - default List hideNetworks() { - return HIDE_NETWORKS; - } } From 4d0dc4c7004794496384305376ffa6ae38ac67a4 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Mon, 17 Jun 2024 17:11:58 +0200 Subject: [PATCH 1410/1688] Add SingeCriteriaComparator to itinerary filter We will use this later to improve group-by-filter --- .../system/SingeCriteriaComparator.java | 81 +++++++++ .../model/plan/TestItineraryBuilder.java | 42 +++-- .../system/SingeCriteriaComparatorTest.java | 162 ++++++++++++++++++ 3 files changed, 270 insertions(+), 15 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java create mode 100644 src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java new file mode 100644 index 00000000000..8f757cee5a1 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java @@ -0,0 +1,81 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system; + +import java.util.Comparator; +import java.util.function.ToIntFunction; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n; + +/** + * Comparator used to compare a SINGE criteria for dominance. The difference between this and the + * {@link org.opentripplanner.raptor.util.paretoset.ParetoComparator} is that: + *

                + *
              1. This applies to one criteria, not multiple.
                2. + *
              2. This interface apply to itineraries; It is not generic.
                3. + *
              + * A set of instances of this interface can be used to create a pareto-set. See + * {@link org.opentripplanner.raptor.util.paretoset.ParetoSet} and + * {@link org.opentripplanner.raptor.util.paretoset.ParetoComparator}. + *

              + * This interface extends {@link Comparator} so elements can be sorted as well. Not all criteria + * can be sorted, if so the {@link #strictOrder()} should return false (this is the default). + */ +@FunctionalInterface +public interface SingeCriteriaComparator extends Comparator { + /** + * The left criteria dominates the right criteria. Note! The right criteria my dominate + * the left criteria if there is no {@link #strictOrder()}. If left and right are equals, then + * there is no dominance. + */ + boolean leftDominanceExist(Itinerary left, Itinerary right); + + /** + * The compare function can be used to order elements based on the criteria for this instance. + * Note! This method should not be used if there is no {@link #strictOrder()}. + */ + @Override + default int compare(Itinerary left, Itinerary right) { + throw new IllegalStateException( + "This criteria can not be used to sort elements, there is no deterministic defined order." + ); + } + + /** + * Return true if the criteria can be deterministically sorted. + */ + default boolean strictOrder() { + return false; + } + + static SingeCriteriaComparator compareNumTransfers() { + return compareLessThan(Itinerary::getNumberOfTransfers); + } + + static SingeCriteriaComparator compareGeneralizedCost() { + return compareLessThan(Itinerary::getGeneralizedCost); + } + + @SuppressWarnings("OptionalGetWithoutIsPresent") + static SingeCriteriaComparator compareTransitPriorityGroups() { + return (left, right) -> TransitGroupPriority32n.dominate(left.getGeneralizedCost2().get(), right.getGeneralizedCost2().get()); + } + + + static SingeCriteriaComparator compareLessThan(final ToIntFunction op) { + return new SingeCriteriaComparator() { + @Override + public boolean leftDominanceExist(Itinerary left, Itinerary right) { + return op.applyAsInt(left) < op.applyAsInt(right); + } + + @Override + public int compare(Itinerary left, Itinerary right) { + return op.applyAsInt(left) - op.applyAsInt(right); + } + + @Override + public boolean strictOrder() { + return true; + } + }; + } +} diff --git a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java index 28be5b3a7e2..ddff2e76fca 100644 --- a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -55,6 +55,8 @@ */ public class TestItineraryBuilder implements PlanTestConstants { + private static final int NOT_SET = -1_999_999; + public static final LocalDate SERVICE_DAY = LocalDate.of(2020, Month.FEBRUARY, 2); public static final Route BUS_ROUTE = route("1").withMode(TransitMode.BUS).build(); public static final Route RAIL_ROUTE = route("2").withMode(TransitMode.RAIL).build(); @@ -69,7 +71,8 @@ public class TestItineraryBuilder implements PlanTestConstants { private final List legs = new ArrayList<>(); private Place lastPlace; private int lastEndTime; - private int cost = 0; + private int c1 = 0; + private int c2 = NOT_SET; private TestItineraryBuilder(Place origin, int startTime) { this.lastPlace = origin; @@ -241,7 +244,7 @@ public TestItineraryBuilder flex(int start, int end, Place to) { FlexibleTransitLeg leg = new FlexibleTransitLeg(edge, newTime(start), newTime(end), legCost); legs.add(leg); - cost += legCost; + c1 += legCost; // Setup for adding another leg lastEndTime = end; @@ -330,17 +333,6 @@ public TestItineraryBuilder faresV2Rail( ); } - public Itinerary egress(int walkDuration) { - walk(walkDuration, null); - return build(); - } - - public Itinerary build() { - Itinerary itinerary = new Itinerary(legs); - itinerary.setGeneralizedCost(cost); - return itinerary; - } - public TestItineraryBuilder frequencyBus(int tripId, int startTime, int endTime, Place to) { return transit( RAIL_ROUTE, @@ -401,6 +393,26 @@ public TestItineraryBuilder carHail(int duration, Place to) { return this; } + public TestItineraryBuilder withGeneralizedCost2(int c2) { + this.c2 = c2; + return this; + } + + public Itinerary egress(int walkDuration) { + walk(walkDuration, null); + return build(); + } + + public Itinerary build() { + Itinerary itinerary = new Itinerary(legs); + itinerary.setGeneralizedCost(c1); + if(c2 != NOT_SET) { + itinerary.setGeneralizedCost2(c2); + } + return itinerary; + } + + /* private methods */ /** Create a dummy trip */ @@ -506,7 +518,7 @@ public TestItineraryBuilder transit( leg.setDistanceMeters(speed(leg.getMode()) * (end - start)); legs.add(leg); - cost += legCost; + c1 += legCost; // Setup for adding another leg lastEndTime = end; @@ -536,7 +548,7 @@ private StreetLeg streetLeg( .build(); legs.add(leg); - cost += legCost; + c1 += legCost; // Setup for adding another leg lastEndTime = endTime; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java new file mode 100644 index 00000000000..d94d21673c4 --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java @@ -0,0 +1,162 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; + +import java.util.ArrayList; +import java.util.List; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.opentripplanner.framework.collection.CompositeComparator; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.Place; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n; +import org.opentripplanner.transit.model._data.TransitModelForTest; + +class SingeCriteriaComparatorTest { + + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + + private static final Place A = TEST_MODEL.place("A", 10, 11); + private static final Place B = TEST_MODEL.place("B", 10, 13); + private static final Place C = TEST_MODEL.place("C", 10, 14); + private static final Place D = TEST_MODEL.place("D", 10, 15); + + private static final int START = 1000; + private static final int TX_AT = 1500; + private static final int END_LOW = 2000; + + // [Tx, Cost] => [0, 1240] + private static final Itinerary zeroTransferLowCost = newItinerary(A) + .bus(1, START, END_LOW, B) + .walk(60, C) + .build(); + // [Tx, Cost] => [0, 1360] + private static final Itinerary zeroTransferHighCost = newItinerary(A) + .bus(1, START, END_LOW, B) + .walk(120, C) + .build(); + // [Tx, Cost] => [1, 1240] + private static final Itinerary oneTransferLowCost = newItinerary(A) + .bus(1, START, TX_AT, B) + .bus(2, TX_AT, END_LOW, C) + .build(); + + @BeforeAll + static void setUp() { + assertEquals(0, zeroTransferLowCost.getNumberOfTransfers()); + assertEquals(0, zeroTransferHighCost.getNumberOfTransfers()); + assertEquals(1, oneTransferLowCost.getNumberOfTransfers()); + + int expectedCost = zeroTransferLowCost.getGeneralizedCost(); + assertTrue(expectedCost < zeroTransferHighCost.getGeneralizedCost()); + assertEquals(expectedCost, oneTransferLowCost.getGeneralizedCost()); + } + + @Test + void compare() { + var l = new ArrayList(); + l.add(zeroTransferHighCost); + l.add(zeroTransferLowCost); + l.add(oneTransferLowCost); + + l.sort( + new CompositeComparator<>( + SingeCriteriaComparator.compareGeneralizedCost(), + SingeCriteriaComparator.compareNumTransfers() + ) + ); + + assertEquals(List.of(zeroTransferLowCost, oneTransferLowCost, zeroTransferHighCost), l); + } + + @Test + void compareThrowsExceptionIfNotStrictOrder() { + assertThrows( + IllegalStateException.class, + () -> + SingeCriteriaComparator + .compareTransitPriorityGroups() + .compare(zeroTransferLowCost, zeroTransferHighCost) + ); + } + + @Test + void strictOrder() { + assertTrue(SingeCriteriaComparator.compareNumTransfers().strictOrder()); + assertTrue(SingeCriteriaComparator.compareGeneralizedCost().strictOrder()); + assertFalse(SingeCriteriaComparator.compareTransitPriorityGroups().strictOrder()); + } + + @Test + void compareNumTransfers() { + var subject = SingeCriteriaComparator.compareNumTransfers(); + + // leftDominanceExist + assertFalse(subject.leftDominanceExist(zeroTransferHighCost, zeroTransferLowCost)); + Assertions.assertTrue(subject.leftDominanceExist(zeroTransferLowCost, oneTransferLowCost)); + assertFalse(subject.leftDominanceExist(oneTransferLowCost, zeroTransferLowCost)); + + // strict order expected + assertTrue(subject.strictOrder()); + + // Compare + assertEquals(0, subject.compare(zeroTransferHighCost, zeroTransferLowCost)); + assertEquals(-1, subject.compare(zeroTransferLowCost, oneTransferLowCost)); + assertEquals(1, subject.compare(oneTransferLowCost, zeroTransferLowCost)); + } + + @Test + void compareGeneralizedCost() { + var subject = SingeCriteriaComparator.compareGeneralizedCost(); + + System.out.println(zeroTransferLowCost.getGeneralizedCost()); + System.out.println(zeroTransferHighCost.getGeneralizedCost()); + System.out.println(oneTransferLowCost.getGeneralizedCost()); + + // leftDominanceExist + assertFalse(subject.leftDominanceExist(zeroTransferHighCost, zeroTransferLowCost)); + assertTrue(subject.leftDominanceExist(zeroTransferLowCost, zeroTransferHighCost)); + assertFalse(subject.leftDominanceExist(zeroTransferLowCost, oneTransferLowCost)); + + // strict order expected + assertTrue(subject.strictOrder()); + + // Compare + assertTrue(0 < subject.compare(zeroTransferHighCost, zeroTransferLowCost)); + assertTrue(0 > subject.compare(zeroTransferLowCost, zeroTransferHighCost)); + assertEquals(0, subject.compare(zeroTransferLowCost, oneTransferLowCost)); + } + + @Test + void compareTransitPriorityGroups() { + var group1 = newItinerary(A) + .bus(1, START, END_LOW, C) + .withGeneralizedCost2(1) + .build(); + var group2 = newItinerary(A) + .bus(1, START, END_LOW, C) + .withGeneralizedCost2(2) + .build(); + var group1And2 = newItinerary(A) + .bus(1, START, END_LOW, C) + .withGeneralizedCost2(TransitGroupPriority32n.mergeInGroupId(1, 2)) + .build(); + + var subject = SingeCriteriaComparator.compareTransitPriorityGroups(); + + assertTrue(subject.leftDominanceExist(group1, group2)); + assertTrue(subject.leftDominanceExist(group2, group1)); + assertTrue(subject.leftDominanceExist(group1, group1And2)); + assertTrue(subject.leftDominanceExist(group2, group1And2)); + assertFalse(subject.leftDominanceExist(group1And2, group1)); + assertFalse(subject.leftDominanceExist(group1And2, group1)); + + // Cannot be ordered => compare will fail + assertFalse(subject.strictOrder()); + } +} From 5ef5fb518007e8ac40e0202b947860be2f284077 Mon Sep 17 00:00:00 2001 From: sharhio Date: Mon, 17 Jun 2024 18:48:33 +0300 Subject: [PATCH 1411/1688] filterByNetwork description --- .../apis/transmodel/TransmodelGraphQLSchema.java | 4 +++- .../resources/org/opentripplanner/apis/gtfs/schema.graphqls | 2 +- .../org/opentripplanner/apis/transmodel/schema.graphql | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java index af0d9b79bbb..7d6e5750627 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java @@ -851,7 +851,9 @@ private GraphQLSchema create() { GraphQLArgument .newArgument() .name("filterByNetwork") - .description("Only include places that match one of the given network names.") + .description( + "Only include vehicle rental networks that match one of the given network names." + ) .type(new GraphQLList(Scalars.GraphQLString)) .build() ) diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 8b872900238..36fa16a632c 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3552,7 +3552,7 @@ type QueryType { filterByModes: [Mode] """ - Only include places that match one of the given network names. + Only include vehicle rental networks that match one of the given network names. """ filterByNetwork: [String] diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 17f44b5cd97..46ee3305259 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -675,7 +675,7 @@ type QueryType { filterByInUse: Boolean = false, "Only include places that include this mode. Only checked for places with mode i.e. quays, departures." filterByModes: [TransportMode], - "Only include places that match one of the given network names." + "Only include vehicle rental networks that match one of the given network names." filterByNetwork: [String], "Only include places of given types if set. Default accepts all types" filterByPlaceTypes: [FilterPlaceType] = [quay, stopPlace, bicycleRent, bikePark, carPark], From 3727a8ffeb7ffb57856828e21a52e8fb30198ef5 Mon Sep 17 00:00:00 2001 From: Vincent Paturet Date: Mon, 17 Jun 2024 19:09:10 +0200 Subject: [PATCH 1412/1688] Decouple AsyncEstimatedTimetableSource and AsyncEstimatedTimetableProcessor --- .../AsyncEstimatedTimetableProcessor.java | 17 ++----- .../google/SiriETGooglePubsubUpdater.java | 51 ++++++++----------- 2 files changed, 25 insertions(+), 43 deletions(-) diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java index 35ebe183564..81643c476ab 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/AsyncEstimatedTimetableProcessor.java @@ -8,42 +8,31 @@ import uk.org.siri.siri20.ServiceDelivery; /** - * Process a SIRI-ET feed by combining an asynchronous source of estimated timetables - * {@link AsyncEstimatedTimetableSource} with a consumer of estimated timetables - * {@link EstimatedTimetableHandler} + * Apply asynchronously estimated timetable updates in the graph-writer thread and forward the + * result to an update result consumer. */ public class AsyncEstimatedTimetableProcessor { - private final AsyncEstimatedTimetableSource siriMessageSource; private final EstimatedTimetableHandler estimatedTimetableHandler; private final WriteToGraphCallback saveResultOnGraph; private final Consumer updateResultConsumer; public AsyncEstimatedTimetableProcessor( - AsyncEstimatedTimetableSource siriMessageSource, EstimatedTimetableHandler estimatedTimetableHandler, WriteToGraphCallback saveResultOnGraph, Consumer updateResultConsumer ) { - this.siriMessageSource = siriMessageSource; this.estimatedTimetableHandler = estimatedTimetableHandler; this.saveResultOnGraph = saveResultOnGraph; this.updateResultConsumer = updateResultConsumer; } - /** - * Start consuming from the estimated timetable source. - */ - public void run() { - siriMessageSource.start(this::processSiriData); - } - /** * Apply the estimated timetables to the transit model. * This method is non-blocking and applies the changes asynchronously. * @return a future indicating when the changes are applied. */ - private Future processSiriData(ServiceDelivery serviceDelivery) { + public Future processSiriData(ServiceDelivery serviceDelivery) { return saveResultOnGraph.execute((graph, transitModel) -> updateResultConsumer.accept( estimatedTimetableHandler.applyUpdate( diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java index d49eaa7c605..58c01815230 100644 --- a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java +++ b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdater.java @@ -1,14 +1,14 @@ package org.opentripplanner.ext.siri.updater.google; -import java.util.concurrent.Future; +import java.util.function.Consumer; import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource; import org.opentripplanner.ext.siri.updater.AsyncEstimatedTimetableProcessor; import org.opentripplanner.ext.siri.updater.AsyncEstimatedTimetableSource; import org.opentripplanner.ext.siri.updater.EstimatedTimetableHandler; import org.opentripplanner.transit.service.DefaultTransitService; import org.opentripplanner.transit.service.TransitModel; -import org.opentripplanner.updater.GraphWriterRunnable; import org.opentripplanner.updater.spi.GraphUpdater; +import org.opentripplanner.updater.spi.UpdateResult; import org.opentripplanner.updater.spi.WriteToGraphCallback; import org.opentripplanner.updater.trip.metrics.TripUpdateMetrics; @@ -20,8 +20,9 @@ public class SiriETGooglePubsubUpdater implements GraphUpdater { private final String configRef; - private final AsyncEstimatedTimetableProcessor asyncEstimatedTimetableProcessor; - private final AsyncEstimatedTimetableSource asyncSiriMessageSource; + private final AsyncEstimatedTimetableSource asyncEstimatedTimetableSource; + private final EstimatedTimetableHandler estimatedTimetableHandler; + private final Consumer updateResultConsumer; private WriteToGraphCallback saveResultOnGraph; public SiriETGooglePubsubUpdater( @@ -29,9 +30,9 @@ public SiriETGooglePubsubUpdater( TransitModel transitModel, SiriTimetableSnapshotSource timetableSnapshotSource ) { - this.configRef = config.configRef(); + configRef = config.configRef(); - asyncSiriMessageSource = + asyncEstimatedTimetableSource = new GooglePubsubEstimatedTimetableSource( config.dataInitializationUrl(), config.reconnectPeriod(), @@ -41,20 +42,15 @@ public SiriETGooglePubsubUpdater( config.topicName() ); - EstimatedTimetableHandler estimatedTimetableHandler = new EstimatedTimetableHandler( - timetableSnapshotSource, - config.fuzzyTripMatching(), - new DefaultTransitService(transitModel), - config.feedId() - ); - - asyncEstimatedTimetableProcessor = - new AsyncEstimatedTimetableProcessor( - asyncSiriMessageSource, - estimatedTimetableHandler, - this::writeToGraphCallBack, - TripUpdateMetrics.streaming(config) + estimatedTimetableHandler = + new EstimatedTimetableHandler( + timetableSnapshotSource, + config.fuzzyTripMatching(), + new DefaultTransitService(transitModel), + config.feedId() ); + + updateResultConsumer = TripUpdateMetrics.streaming(config); } @Override @@ -64,24 +60,21 @@ public void setup(WriteToGraphCallback writeToGraphCallback) { @Override public void run() { - asyncEstimatedTimetableProcessor.run(); + AsyncEstimatedTimetableProcessor asyncEstimatedTimetableProcessor = new AsyncEstimatedTimetableProcessor( + estimatedTimetableHandler, + saveResultOnGraph, + updateResultConsumer + ); + asyncEstimatedTimetableSource.start(asyncEstimatedTimetableProcessor::processSiriData); } @Override public boolean isPrimed() { - return asyncSiriMessageSource.isPrimed(); + return asyncEstimatedTimetableSource.isPrimed(); } @Override public String getConfigRef() { return configRef; } - - /** - * Defer the invocation of {@link #saveResultOnGraph} since it is null at construction time and - * initialized when {@link #setup(WriteToGraphCallback)} is called. - */ - private Future writeToGraphCallBack(GraphWriterRunnable graphWriterRunnable) { - return saveResultOnGraph.execute(graphWriterRunnable); - } } From e6603e1854b5e767c9c49f2204c92afa8843de2b Mon Sep 17 00:00:00 2001 From: sharhio Date: Tue, 18 Jun 2024 11:48:26 +0300 Subject: [PATCH 1413/1688] Fixed vehiclerentalsystem --- .../apis/gtfs/datafetchers/RentalVehicleImpl.java | 2 +- .../apis/gtfs/datafetchers/VehicleRentalStationImpl.java | 6 ++++++ .../apis/gtfs/generated/GraphQLDataFetchers.java | 2 ++ .../apis/gtfs/generated/graphql-codegen.yml | 1 + .../service/vehiclerental/model/VehicleRentalPlace.java | 3 +++ .../service/vehiclerental/model/VehicleRentalStation.java | 5 +++++ .../service/vehiclerental/model/VehicleRentalVehicle.java | 5 +++++ .../org/opentripplanner/apis/gtfs/schema.graphqls | 7 +++++-- 8 files changed, 28 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java index 71dc9ad8fa7..1449c44e315 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java @@ -64,7 +64,7 @@ public DataFetcher vehicleType() { @Override public DataFetcher vehicleRentalSystem() { - return environment -> getSource(environment).system; + return environment -> getSource(environment).getVehicleRentalSystem(); } private VehicleRentalVehicle getSource(DataFetchingEnvironment environment) { diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java index dc60a7c76e8..117061b988e 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java @@ -7,6 +7,7 @@ import org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation; import org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris; +import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; public class VehicleRentalStationImpl implements GraphQLDataFetchers.GraphQLVehicleRentalStation { @@ -107,6 +108,11 @@ public DataFetcher availableSpaces() { return environment -> getSource(environment).getVehicleSpaceCounts(); } + @Override + public DataFetcher vehicleRentalSystem() { + return environment -> getSource(environment).getVehicleRentalSystem(); + } + private VehicleRentalStation getSource(DataFetchingEnvironment environment) { return environment.getSource(); } diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index fef1c0b35d4..c956eddd954 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -1303,6 +1303,8 @@ public interface GraphQLVehicleRentalStation { public DataFetcher rentalUris(); + public DataFetcher vehicleRentalSystem(); + public DataFetcher spacesAvailable(); public DataFetcher stationId(); diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml index ff9af6f6aa0..6e5cbf7bd71 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml @@ -47,6 +47,7 @@ config: BikeRentalStation: org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace#VehicleRentalPlace BikeRentalStationUris: org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris#VehicleRentalStationUris VehicleRentalStation: org.opentripplanner.service.vehiclerental.model.VehicleRentalStation#VehicleRentalStation + VehicleRentalSystem: org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem#VehicleRentalSystem RentalVehicleEntityCounts: org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts#RentalVehicleEntityCounts RentalVehicleTypeCount: org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeCount#RentalVehicleTypeCount RentalVehicle: org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle#VehicleRentalVehicle diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java index 1725e7df2dd..cd806603c9d 100644 --- a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java +++ b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalPlace.java @@ -80,6 +80,9 @@ public interface VehicleRentalPlace { /** Deep links for this rental station or individual vehicle */ VehicleRentalStationUris getRentalUris(); + /** System information for the vehicle rental provider */ + VehicleRentalSystem getVehicleRentalSystem(); + default boolean networkIsNotAllowed(VehicleRentalPreferences preferences) { if ( getNetwork() == null && diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java index a31e5e88a0e..d6e72023a31 100644 --- a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java +++ b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalStation.java @@ -172,6 +172,11 @@ public VehicleRentalStationUris getRentalUris() { return rentalUris; } + @Override + public VehicleRentalSystem getVehicleRentalSystem() { + return system; + } + @Override public String toString() { return String.format( diff --git a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java index 7dba5e714b4..042e608c88f 100644 --- a/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java +++ b/src/main/java/org/opentripplanner/service/vehiclerental/model/VehicleRentalVehicle.java @@ -128,4 +128,9 @@ public boolean isRealTimeData() { public VehicleRentalStationUris getRentalUris() { return rentalUris; } + + @Override + public VehicleRentalSystem getVehicleRentalSystem() { + return system; + } } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 36fa16a632c..bbb02b73f33 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -687,6 +687,9 @@ type VehicleRentalStation implements Node & PlaceInterface { If true, station is on and in service. """ operative: Boolean + + """The vehicle rental system information.""" + vehicleRentalSystem: VehicleRentalSystem } type RentalVehicleEntityCounts { @@ -744,7 +747,7 @@ type RentalVehicle implements Node & PlaceInterface { vehicleType: RentalVehicleType """The vehicle rental system information.""" - vehicleRentalSystem: VehicleRentalSystemType + vehicleRentalSystem: VehicleRentalSystem } type BikeRentalStationUris { @@ -798,7 +801,7 @@ type RentalVehicleType { propulsionType: PropulsionType } -type VehicleRentalSystemType { +type VehicleRentalSystem { """The rental vehicle operator's system URL.""" url: String } From c41470ffa2eb7ed78031380b6979540e77b5d6b2 Mon Sep 17 00:00:00 2001 From: OTP Serialization Version Bot Date: Tue, 18 Jun 2024 09:18:22 +0000 Subject: [PATCH 1414/1688] Bump serialization version id for #5913 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 1da138b7748..7e06a39cdfa 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - 150 + 151 31.2 2.51.1 From aa8d4ae6150addb7dff2921f426b2e91f02cecc3 Mon Sep 17 00:00:00 2001 From: sharhio Date: Tue, 18 Jun 2024 13:24:03 +0300 Subject: [PATCH 1415/1688] no network filtering in transmodel --- .../apis/transmodel/TransmodelGraphQLSchema.java | 12 +----------- .../opentripplanner/apis/transmodel/schema.graphql | 2 -- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java index 7d6e5750627..cc3c6cdbcea 100644 --- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java +++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraphQLSchema.java @@ -847,16 +847,6 @@ private GraphQLSchema create() { .type(Scalars.GraphQLInt) .build() ) - .argument( - GraphQLArgument - .newArgument() - .name("filterByNetwork") - .description( - "Only include vehicle rental networks that match one of the given network names." - ) - .type(new GraphQLList(Scalars.GraphQLString)) - .build() - ) .argument( GraphQLArgument .newArgument() @@ -915,6 +905,7 @@ private GraphQLSchema create() { List filterByBikeRentalStations = null; List filterByBikeParks = null; List filterByCarParks = null; + List filterByNetwork = null; @SuppressWarnings("rawtypes") Map filterByIds = environment.getArgument("filterByIds"); if (filterByIds != null) { @@ -947,7 +938,6 @@ private GraphQLSchema create() { if (placeTypes.contains(TransmodelPlaceType.STOP_PLACE)) { maxResults *= 5; } - List filterByNetwork = environment.getArgument("filterByNetwork"); List places; places = diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql index 46ee3305259..fbaa2418d7e 100644 --- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql +++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql @@ -675,8 +675,6 @@ type QueryType { filterByInUse: Boolean = false, "Only include places that include this mode. Only checked for places with mode i.e. quays, departures." filterByModes: [TransportMode], - "Only include vehicle rental networks that match one of the given network names." - filterByNetwork: [String], "Only include places of given types if set. Default accepts all types" filterByPlaceTypes: [FilterPlaceType] = [quay, stopPlace, bicycleRent, bikePark, carPark], "fetching only the first certain number of nodes" From f549d053c39a6dbb84fa94b50f74b851fa842d65 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 18 Jun 2024 12:34:54 +0200 Subject: [PATCH 1416/1688] Mention new filter engine --- .../opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index 41e2b812420..f43bdf7decc 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -15,6 +15,9 @@ /** * Encapsulates the logic to filter patterns by the service dates that they operate on. It also * has a method to filter routes by checking if their patterns operate on the required days + *

              + * Once a more complete filtering engine is in place in the core data model, this code should be + * there rather than a separate class in the API package. */ public class PatternByServiceDatesFilter { From 6844979453abbeaf213e4c6063574a19ae6b420a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 18 Jun 2024 12:43:26 +0200 Subject: [PATCH 1417/1688] Return error code for invalid trip IDs --- .../updater/trip/TimetableSnapshotSource.java | 2 ++ .../trip/moduletests/rejection/InvalidTripIdTest.java | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java index ba4ffe211b4..c452d5f58f8 100644 --- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java +++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java @@ -3,6 +3,7 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_ARRIVAL_TIME; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_DEPARTURE_TIME; +import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_INPUT_STRUCTURE; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NOT_IMPLEMENTED_DUPLICATED; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NOT_IMPLEMENTED_UNSCHEDULED; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE; @@ -178,6 +179,7 @@ public UpdateResult applyTripUpdates( if (!tripDescriptor.hasTripId() || tripDescriptor.getTripId().isBlank()) { debug(feedId, "", "No trip id found for gtfs-rt trip update: \n{}", tripUpdate); + results.add(Result.failure(UpdateError.noTripId(INVALID_INPUT_STRUCTURE))); continue; } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java index 8d7f7629575..6cacaeb6ca9 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java @@ -1,6 +1,7 @@ package org.opentripplanner.updater.trip.moduletests.rejection; -import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure; +import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_INPUT_STRUCTURE; import com.google.transit.realtime.GtfsRealtime; import java.util.stream.Stream; @@ -35,6 +36,6 @@ void invalidTripId(String tripId) { var result = env.applyTripUpdate(tripUpdate); - assertEquals(0, result.successful()); + assertFailure(INVALID_INPUT_STRUCTURE, result); } } From 17858f56899971370b9200f16dc35ab619052862 Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 18 Jun 2024 13:24:50 +0200 Subject: [PATCH 1418/1688] Make module tests a lot more compact --- .../trip/moduletests/addition/AddedTest.java | 56 ++------ .../CancellationDeletionTest.java | 15 +-- .../trip/moduletests/delay/DelayedTest.java | 77 ++++------- .../trip/moduletests/delay/SkippedTest.java | 123 +++++++----------- .../rejection/InvalidInputTest.java | 2 - 5 files changed, 93 insertions(+), 180 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java index ff03362cbdd..6a7d076923f 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java @@ -13,7 +13,7 @@ import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.STOP_B1_ID; import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.STOP_C1_ID; -import de.mfdz.MfdzRealtimeExtensions; +import de.mfdz.MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType; import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.model.PickDrop; @@ -51,21 +51,9 @@ void addedTripWithNewRoute() { builder.addTripExtension(); builder - .addStopTime( - STOP_A1_ID, - 30, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.PHONE_AGENCY - ) - .addStopTime( - STOP_B1_ID, - 40, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.COORDINATE_WITH_DRIVER - ) - .addStopTime( - STOP_B1_ID, - 55, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.NONE - ); + .addStopTime(STOP_A1_ID, 30, DropOffPickupType.PHONE_AGENCY) + .addStopTime(STOP_B1_ID, 40, DropOffPickupType.COORDINATE_WITH_DRIVER) + .addStopTime(STOP_B1_ID, 55, DropOffPickupType.NONE); var tripUpdate = builder.build(); @@ -101,21 +89,9 @@ void addedWithUnknownStop() { builder.addTripExtension(); builder - .addStopTime( - STOP_A1_ID, - 30, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.PHONE_AGENCY - ) - .addStopTime( - "UNKNOWN_STOP_ID", - 40, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.COORDINATE_WITH_DRIVER - ) - .addStopTime( - STOP_C1_ID, - 55, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.NONE - ); + .addStopTime(STOP_A1_ID, 30, DropOffPickupType.PHONE_AGENCY) + .addStopTime("UNKNOWN_STOP_ID", 40, DropOffPickupType.COORDINATE_WITH_DRIVER) + .addStopTime(STOP_C1_ID, 55, DropOffPickupType.NONE); var tripUpdate = builder.build(); @@ -141,21 +117,9 @@ void repeatedlyAddedTripWithNewRoute() { builder.addTripExtension(); builder - .addStopTime( - STOP_A1_ID, - 30, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.PHONE_AGENCY - ) - .addStopTime( - STOP_B1_ID, - 40, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.COORDINATE_WITH_DRIVER - ) - .addStopTime( - STOP_C1_ID, - 55, - MfdzRealtimeExtensions.StopTimePropertiesExtension.DropOffPickupType.NONE - ); + .addStopTime(STOP_A1_ID, 30, DropOffPickupType.PHONE_AGENCY) + .addStopTime(STOP_B1_ID, 40, DropOffPickupType.COORDINATE_WITH_DRIVER) + .addStopTime(STOP_C1_ID, 55, DropOffPickupType.NONE); var tripUpdate = builder.build(); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index b0bb999f350..41e42bf00db 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -4,6 +4,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess; import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship; @@ -45,11 +46,9 @@ void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { env.timeZone ) .build(); - var result = env.applyTripUpdate(update); + assertSuccess(env.applyTripUpdate(update)); - assertEquals(1, result.successful()); - - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + var snapshot = env.getTimetableSnapshot(); final Timetable forToday = snapshot.resolve(pattern1, RealtimeTestEnvironment.SERVICE_DATE); final Timetable schedule = snapshot.resolve(pattern1, null); assertNotSame(forToday, schedule); @@ -88,9 +87,7 @@ void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState state) .addStopTime(env.stopC1.getId().getId(), 55) .build(); - var result = env.applyTripUpdate(update, DIFFERENTIAL); - - assertEquals(1, result.successful()); + assertSuccess(env.applyTripUpdate(update, DIFFERENTIAL)); // Cancel or delete the added trip update = @@ -101,9 +98,7 @@ void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState state) env.timeZone ) .build(); - result = env.applyTripUpdate(update, DIFFERENTIAL); - - assertEquals(1, result.successful()); + assertSuccess(env.applyTripUpdate(update, DIFFERENTIAL)); final TimetableSnapshot snapshot = env.getTimetableSnapshot(); // Get the trip pattern of the added trip which goes through stopA diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index 5752e4941be..7440a189846 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -4,7 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; -import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess; import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE; @@ -43,53 +42,34 @@ void singleStopDelay() { assertEquals(1, result.successful()); - // trip1 should be modified - { - var pattern1 = env.getPatternForTrip(env.trip1); - final int trip1Index = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); - - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); - final Timetable trip1Realtime = snapshot.resolve( - pattern1, - RealtimeTestEnvironment.SERVICE_DATE - ); - final Timetable trip1Scheduled = snapshot.resolve(pattern1, null); - - assertNotSame(trip1Realtime, trip1Scheduled); - assertNotSame( - trip1Realtime.getTripTimes(trip1Index), - trip1Scheduled.getTripTimes(trip1Index) - ); - assertEquals(1, trip1Realtime.getTripTimes(trip1Index).getArrivalDelay(STOP_SEQUENCE)); - assertEquals(1, trip1Realtime.getTripTimes(trip1Index).getDepartureDelay(STOP_SEQUENCE)); - - assertEquals( - RealTimeState.SCHEDULED, - trip1Scheduled.getTripTimes(trip1Index).getRealTimeState() - ); - assertEquals( - RealTimeState.UPDATED, - trip1Realtime.getTripTimes(trip1Index).getRealTimeState() - ); - } - - // trip2 should keep the scheduled information - { - var pattern = env.getPatternForTrip(env.trip2); - final int tripIndex = pattern.getScheduledTimetable().getTripIndex(env.trip2.getId()); - - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); - final Timetable realtime = snapshot.resolve(pattern, RealtimeTestEnvironment.SERVICE_DATE); - final Timetable scheduled = snapshot.resolve(pattern, null); - - assertSame(realtime, scheduled); - assertSame(realtime.getTripTimes(tripIndex), scheduled.getTripTimes(tripIndex)); - assertEquals(0, realtime.getTripTimes(tripIndex).getArrivalDelay(STOP_SEQUENCE)); - assertEquals(0, realtime.getTripTimes(tripIndex).getDepartureDelay(STOP_SEQUENCE)); - - assertEquals(RealTimeState.SCHEDULED, scheduled.getTripTimes(tripIndex).getRealTimeState()); - assertEquals(RealTimeState.SCHEDULED, realtime.getTripTimes(tripIndex).getRealTimeState()); - } + var pattern1 = env.getPatternForTrip(env.trip1); + int trip1Index = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); + + final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + final Timetable trip1Realtime = snapshot.resolve( + pattern1, + RealtimeTestEnvironment.SERVICE_DATE + ); + final Timetable trip1Scheduled = snapshot.resolve(pattern1, null); + + assertNotSame(trip1Realtime, trip1Scheduled); + assertNotSame(trip1Realtime.getTripTimes(trip1Index), trip1Scheduled.getTripTimes(trip1Index)); + assertEquals(DELAY, trip1Realtime.getTripTimes(trip1Index).getArrivalDelay(STOP_SEQUENCE)); + assertEquals(DELAY, trip1Realtime.getTripTimes(trip1Index).getDepartureDelay(STOP_SEQUENCE)); + + assertEquals( + RealTimeState.SCHEDULED, + trip1Scheduled.getTripTimes(trip1Index).getRealTimeState() + ); + + assertEquals( + "SCHEDULED | A1 0:00:10 0:00:11 | B1 0:00:20 0:00:21", + env.getScheduledTimetable(env.trip1.getId()) + ); + assertEquals( + "UPDATED | A1 [ND] 0:00:10 0:00:11 | B1 0:00:21 0:00:22", + env.getRealtimeTimetable(env.trip1.getId().getId()) + ); } /** @@ -110,7 +90,6 @@ void complexDelay() { assertSuccess(env.applyTripUpdate(tripUpdate)); - // THEN final TimetableSnapshot snapshot = env.getTimetableSnapshot(); final TripPattern originalTripPattern = env.transitModel diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index 4d91eefd390..c70dd380602 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -13,13 +13,10 @@ import org.junit.jupiter.api.Test; import org.opentripplanner.framework.i18n.NonLocalizedString; -import org.opentripplanner.model.Timetable; -import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.framework.FeedScopedId; -import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.Trip; -import org.opentripplanner.transit.model.timetable.TripTimes; +import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; @@ -41,27 +38,24 @@ void scheduledTripWithSkippedAndScheduled() { assertSuccess(env.applyTripUpdate(tripUpdate)); - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + var snapshot = env.getTimetableSnapshot(); // Original trip pattern { - final FeedScopedId tripId = env.trip2.getId(); - final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = env.transitModel + var tripId = env.trip2.getId(); + var trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); + var originalTripPattern = env.transitModel .getTransitModelIndex() .getPatternForTrip() .get(trip); - final Timetable originalTimetableForToday = snapshot.resolve( - originalTripPattern, - SERVICE_DATE - ); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); + var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); assertNotSame(originalTimetableForToday, originalTimetableScheduled); - final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( + int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + var originalTripTimesForToday = originalTimetableForToday.getTripTimes( originalTripIndexForToday ); assertTrue( @@ -74,13 +68,10 @@ void scheduledTripWithSkippedAndScheduled() { // New trip pattern { - final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern( - env.trip2.getId(), - SERVICE_DATE - ); + var newTripPattern = snapshot.getRealtimeAddedTripPattern(env.trip2.getId(), SERVICE_DATE); - final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); - final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); + var newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); + var newTimetableScheduled = snapshot.resolve(newTripPattern, null); assertNotSame(newTimetableForToday, newTimetableScheduled); @@ -88,7 +79,7 @@ void scheduledTripWithSkippedAndScheduled() { assertFalse(newTripPattern.canBoard(1)); assertTrue(newTripPattern.canBoard(2)); - final int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex( + int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex( scheduledTripId ); @@ -101,15 +92,10 @@ void scheduledTripWithSkippedAndScheduled() { "New trip should not be found in scheduled time table" ); - assertEquals(0, newTripTimes.getArrivalDelay(0)); - assertEquals(0, newTripTimes.getDepartureDelay(0)); - assertEquals(42, newTripTimes.getArrivalDelay(1)); - assertEquals(47, newTripTimes.getDepartureDelay(1)); - assertEquals(90, newTripTimes.getArrivalDelay(2)); - assertEquals(90, newTripTimes.getDepartureDelay(2)); - assertFalse(newTripTimes.isCancelledStop(0)); - assertTrue(newTripTimes.isCancelledStop(1)); - assertFalse(newTripTimes.isNoDataStop(2)); + assertEquals( + "UPDATED | A1 0:01 0:01:01 | B1 [C] 0:01:52 0:01:58 | C1 0:02:50 0:02:51", + env.getRealtimeTimetable(scheduledTripId) + ); } } @@ -133,7 +119,7 @@ void scheduledTripWithPreviouslySkipped() { .addDelayedStopTime(2, 90) .build(); - var result = assertSuccess(env.applyTripUpdate(tripUpdate, DIFFERENTIAL)); + assertSuccess(env.applyTripUpdate(tripUpdate, DIFFERENTIAL)); // Create update to the same trip but now the skipped stop is no longer skipped var scheduledBuilder = new TripUpdateBuilder( @@ -149,38 +135,34 @@ void scheduledTripWithPreviouslySkipped() { tripUpdate = scheduledBuilder.build(); // apply the update with the previously skipped stop now scheduled - result = assertSuccess(env.applyTripUpdate(tripUpdate, DIFFERENTIAL)); + assertSuccess(env.applyTripUpdate(tripUpdate, DIFFERENTIAL)); - assertEquals(1, result.successful()); // Check that the there is no longer a realtime added trip pattern for the trip and that the // stoptime updates have gone through var snapshot = env.getTimetableSnapshot(); { - final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); + var newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); assertNull(newTripPattern); final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); - final TripPattern originalTripPattern = env.transitModel + var originalTripPattern = env.transitModel .getTransitModelIndex() .getPatternForTrip() .get(trip); - final Timetable originalTimetableForToday = snapshot.resolve( - originalTripPattern, - SERVICE_DATE - ); + var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); assertNotSame(originalTimetableForToday, originalTimetableScheduled); - final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); + int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); assertTrue( originalTripIndexScheduled > -1, "Original trip should be found in scheduled time table" ); - final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( + var originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( originalTripIndexScheduled ); assertFalse( @@ -188,7 +170,7 @@ void scheduledTripWithPreviouslySkipped() { "Original trip times should not be canceled in scheduled time table" ); assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); - final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); assertTrue( originalTripIndexForToday > -1, @@ -214,12 +196,12 @@ void skippedNoData() { var env = RealtimeTestEnvironment.gtfs(); final FeedScopedId tripId = env.trip2.getId(); - var builder = new TripUpdateBuilder(tripId.getId(), SERVICE_DATE, SCHEDULED, env.timeZone) + + var tripUpdate = new TripUpdateBuilder(tripId.getId(), SERVICE_DATE, SCHEDULED, env.timeZone) .addNoDataStop(0) .addSkippedStop(1) - .addNoDataStop(2); - - var tripUpdate = builder.build(); + .addNoDataStop(2) + .build(); assertSuccess(env.applyTripUpdate(tripUpdate)); @@ -228,39 +210,40 @@ void skippedNoData() { // Original trip pattern { - final TripPattern originalTripPattern = env.transitModel + var originalTripPattern = env.transitModel .getTransitModelIndex() .getPatternForTrip() .get(env.trip2); - final Timetable originalTimetableForToday = snapshot.resolve( - originalTripPattern, - SERVICE_DATE - ); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); + var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); assertNotSame(originalTimetableForToday, originalTimetableScheduled); - final int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); + int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); assertTrue( originalTripIndexScheduled > -1, "Original trip should be found in scheduled time table" ); - final TripTimes originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( + var originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( originalTripIndexScheduled ); assertFalse( originalTripTimesScheduled.isCanceledOrDeleted(), "Original trip times should not be canceled in scheduled time table" ); - assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); - final int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + assertEquals( + "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", + TripTimesStringBuilder.encodeTripTimes(originalTripTimesScheduled, originalTripPattern) + ); + + int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); assertTrue( originalTripIndexForToday > -1, "Original trip should be found in time table for service date" ); - final TripTimes originalTripTimesForToday = originalTimetableForToday.getTripTimes( + var originalTripTimesForToday = originalTimetableForToday.getTripTimes( originalTripIndexForToday ); assertTrue( @@ -273,11 +256,11 @@ void skippedNoData() { // New trip pattern { - final TripPattern newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); + var newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); assertNotNull(newTripPattern, "New trip pattern should be found"); - final Timetable newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); - final Timetable newTimetableScheduled = snapshot.resolve(newTripPattern, null); + var newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); + var newTimetableScheduled = snapshot.resolve(newTripPattern, null); assertNotSame(newTimetableForToday, newTimetableScheduled); @@ -294,14 +277,13 @@ void skippedNoData() { newTripPattern.getTripHeadsign() ); - final int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex(tripId); + int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex(tripId); assertTrue( newTimetableForTodayModifiedTripIndex > -1, "New trip should be found in time table for service date" ); var newTripTimes = newTimetableForToday.getTripTimes(tripId); - assertEquals(RealTimeState.UPDATED, newTripTimes.getRealTimeState()); assertEquals( -1, @@ -309,15 +291,10 @@ void skippedNoData() { "New trip should not be found in scheduled time table" ); - assertEquals(0, newTripTimes.getArrivalDelay(0)); - assertEquals(0, newTripTimes.getDepartureDelay(0)); - assertEquals(0, newTripTimes.getArrivalDelay(1)); - assertEquals(0, newTripTimes.getDepartureDelay(1)); - assertEquals(0, newTripTimes.getArrivalDelay(2)); - assertEquals(0, newTripTimes.getDepartureDelay(2)); - assertTrue(newTripTimes.isNoDataStop(0)); - assertTrue(newTripTimes.isCancelledStop(1)); - assertTrue(newTripTimes.isNoDataStop(2)); + assertEquals( + "UPDATED | A1 [ND] 0:01 0:01:01 | B1 [C] 0:01:10 0:01:11 | C1 [ND] 0:01:20 0:01:21", + TripTimesStringBuilder.encodeTripTimes(newTripTimes, newTripPattern) + ); } } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java index 4d28c60eeb5..4815d7180c4 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java @@ -29,9 +29,7 @@ void invalidTripDate(LocalDate date) { var env = RealtimeTestEnvironment.gtfs(); var update = new TripUpdateBuilder(env.trip1.getId().getId(), date, SCHEDULED, env.timeZone) - .addDelayedStopTime(1, 0) .addDelayedStopTime(2, 60, 80) - .addDelayedStopTime(3, 90, 90) .build(); var result = env.applyTripUpdate(update); From ee4887ecf0a77253c1b0d56941530c91845ea95f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 18 Jun 2024 15:45:33 +0200 Subject: [PATCH 1419/1688] Switch to endExclusive --- .../apis/gtfs/PatternByServiceDatesFilter.java | 16 ++++++++-------- .../opentripplanner/apis/gtfs/schema.graphqls | 11 +++++++---- .../gtfs/PatternByServiceDatesFilterTest.java | 4 +++- 3 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java index f43bdf7decc..9184bd9d728 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java @@ -22,18 +22,18 @@ public class PatternByServiceDatesFilter { private final LocalDate startInclusive; - private final LocalDate endInclusive; + private final LocalDate endExclusive; private final Function> getPatternsForRoute; private final Function> getServiceDatesForTrip; /** * This method is not private to enable unit testing. *

              - * See the API documentation for a discussion of {@code startInclusive} and {@code endInclusive}. + * See the API documentation for a discussion of {@code startInclusive} and {@code endExclusive}. */ PatternByServiceDatesFilter( @Nullable LocalDate startInclusive, - @Nullable LocalDate endInclusive, + @Nullable LocalDate endExclusive, Function> getPatternsForRoute, Function> getServiceDatesForTrip ) { @@ -41,12 +41,12 @@ public class PatternByServiceDatesFilter { this.getServiceDatesForTrip = Objects.requireNonNull(getServiceDatesForTrip); // optional, but one must be defined this.startInclusive = startInclusive; - this.endInclusive = endInclusive; + this.endExclusive = endExclusive; - if (startInclusive == null && endInclusive == null) { - throw new IllegalArgumentException("startInclusive and endInclusive cannot be both null"); + if (startInclusive == null && endExclusive == null) { + throw new IllegalArgumentException("startInclusive and endExclusive cannot be both null"); } else if ( - startInclusive != null && endInclusive != null && startInclusive.isAfter(endInclusive) + startInclusive != null && endExclusive != null && startInclusive.isAfter(endExclusive) ) { throw new IllegalArgumentException("start must be before end"); } @@ -96,7 +96,7 @@ private boolean hasServicesOnDate(TripPattern pattern) { ( startInclusive == null || date.isEqual(startInclusive) || date.isAfter(startInclusive) ) && - (endInclusive == null || date.isEqual(endInclusive) || date.isBefore(endInclusive)) + (endExclusive == null || date.isBefore(endExclusive)) ); }); } diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls index 8ca0ac189cb..cbedf2a369f 100644 --- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls +++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls @@ -3447,13 +3447,16 @@ on Sunday morning at 1am to 3am, might have the previous Saturday's service date """ input ServiceDateFilterInput { """ - Inclusive start date of the filter. If `null` this means that no `start` filter is applied and all - dates that are before or on `end` are selected. + **Inclusive** start date of the filter. If `null` this means that no `start` filter is applied and all + dates that are before `end` are selected. """ start: LocalDate """ - Inclusive end date of the filter. If `null` this means that no end filter is applied and all - entities that are after or on `start` are selected. + **Exclusive** end date of the filter. This means that if you want a time window from Sunday to + Sunday, `end` must be on Monday. + + If `null` this means that no end filter is applied and all entities that are after or on `start` + are selected. """ end: LocalDate } diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java index 1893516ab58..01743dec89d 100644 --- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java +++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java @@ -95,11 +95,13 @@ void validRange(LocalDate start, LocalDate end) { static List ranges() { return List.of( Arguments.of(null, parse("2024-05-03"), NOT_REMOVED), - Arguments.of(null, parse("2024-05-01"), NOT_REMOVED), Arguments.of(parse("2024-05-03"), null, NOT_REMOVED), Arguments.of(parse("2024-05-01"), null, NOT_REMOVED), + Arguments.of(null, parse("2024-04-30"), REMOVED), + Arguments.of(null, parse("2024-05-01"), REMOVED), Arguments.of(parse("2024-05-02"), parse("2024-05-02"), REMOVED), Arguments.of(parse("2024-05-02"), parse("2024-05-03"), REMOVED), + Arguments.of(parse("2024-05-02"), parse("2024-06-01"), REMOVED), Arguments.of(parse("2025-01-01"), null, REMOVED), Arguments.of(parse("2025-01-01"), parse("2025-01-02"), REMOVED), Arguments.of(null, parse("2023-12-31"), REMOVED), From e9fc8d65aa5e73e88c7abd3bd35c24081949ce17 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 19 Jun 2024 00:45:40 +0200 Subject: [PATCH 1420/1688] Add McMinimumNumberItineraryFilter - a multi-criteria version of the MinNumIttnFilter --- .../system/SingeCriteriaComparator.java | 25 +-- .../filters/system/mcmin/Group.java | 56 +++++ .../filters/system/mcmin/Item.java | 47 +++++ .../mcmin/McMinimumNumberItineraryFilter.java | 102 ++++++++++ .../filters/system/mcmin/State.java | 190 +++++++++++++++++ .../model/plan/TestItineraryBuilder.java | 14 +- .../system/SingeCriteriaComparatorTest.java | 52 +---- .../filters/system/mcmin/ItemTest.java | 56 +++++ .../McMinimumNumberItineraryFilterTest.java | 192 ++++++++++++++++++ 9 files changed, 662 insertions(+), 72 deletions(-) create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Group.java create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Item.java create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilter.java create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/State.java create mode 100644 src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/ItemTest.java create mode 100644 src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilterTest.java diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java index 8f757cee5a1..aa876d5bcdc 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java @@ -20,7 +20,7 @@ * can be sorted, if so the {@link #strictOrder()} should return false (this is the default). */ @FunctionalInterface -public interface SingeCriteriaComparator extends Comparator { +public interface SingeCriteriaComparator { /** * The left criteria dominates the right criteria. Note! The right criteria my dominate * the left criteria if there is no {@link #strictOrder()}. If left and right are equals, then @@ -28,17 +28,6 @@ public interface SingeCriteriaComparator extends Comparator { */ boolean leftDominanceExist(Itinerary left, Itinerary right); - /** - * The compare function can be used to order elements based on the criteria for this instance. - * Note! This method should not be used if there is no {@link #strictOrder()}. - */ - @Override - default int compare(Itinerary left, Itinerary right) { - throw new IllegalStateException( - "This criteria can not be used to sort elements, there is no deterministic defined order." - ); - } - /** * Return true if the criteria can be deterministically sorted. */ @@ -56,10 +45,13 @@ static SingeCriteriaComparator compareGeneralizedCost() { @SuppressWarnings("OptionalGetWithoutIsPresent") static SingeCriteriaComparator compareTransitPriorityGroups() { - return (left, right) -> TransitGroupPriority32n.dominate(left.getGeneralizedCost2().get(), right.getGeneralizedCost2().get()); + return (left, right) -> + TransitGroupPriority32n.dominate( + left.getGeneralizedCost2().get(), + right.getGeneralizedCost2().get() + ); } - static SingeCriteriaComparator compareLessThan(final ToIntFunction op) { return new SingeCriteriaComparator() { @Override @@ -67,11 +59,6 @@ public boolean leftDominanceExist(Itinerary left, Itinerary right) { return op.applyAsInt(left) < op.applyAsInt(right); } - @Override - public int compare(Itinerary left, Itinerary right) { - return op.applyAsInt(left) - op.applyAsInt(right); - } - @Override public boolean strictOrder() { return true; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Group.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Group.java new file mode 100644 index 00000000000..0f231517ae3 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Group.java @@ -0,0 +1,56 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +/** + * The purpose of a group is to maintain a list of items, all optimal for a single + * criteria/comparator. After the group is created, then the criteria is no longer needed, so we do + * not keep a reference to the original criteria. + */ +class Group implements Iterable { + + private final List items = new ArrayList<>(); + + public Group(Item firstItem) { + add(firstItem); + } + + Item first() { + return items.getFirst(); + } + + boolean isEmpty() { + return items.isEmpty(); + } + + + boolean isSingleItemGroup() { + return items.size() == 1; + } + + void add(Item item) { + item.incGroupCount(); + items.add(item); + } + + void removeAllItems() { + items.forEach(Item::decGroupCount); + items.clear(); + } + + void addNewDominantItem(Item item) { + removeAllItems(); + add(item); + } + + boolean contains(Item item) { + return this.items.contains(item); + } + + @Override + public Iterator iterator() { + return items.iterator(); + } +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Item.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Item.java new file mode 100644 index 00000000000..58898f2ee63 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Item.java @@ -0,0 +1,47 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; + +import org.opentripplanner.model.plan.Itinerary; + +/** + * An item is a decorated itinerary. The extra information added is the index in the input list + * (sort order) and a groupCount. The sort order is used to break ties, while the group-count is + * used to select the itinerary witch exist in the highest number of groups. The group dynamically + * updates the group-count; The count is incremented when an item is added to a group, and + * decremented when the group is removed from the State. + */ +class Item { + + private final Itinerary item; + private final int index; + private int groupCount = 0; + + Item(Itinerary item, int index) { + this.item = item; + this.index = index; + } + + /** + * An item is better than another if the groupCount is higher, and in case of a tie, if the sort + * index is lower. + */ + public boolean betterThan(Item o) { + return groupCount != o.groupCount ? groupCount > o.groupCount : index < o.index; + } + + Itinerary item() { + return item; + } + + void incGroupCount() { + ++this.groupCount; + } + + void decGroupCount() { + --this.groupCount; + } + + @Override + public String toString() { + return "Item #%d {count:%d, %s}".formatted(index, groupCount, item.toStr()); + } +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilter.java new file mode 100644 index 00000000000..b1e7b857c3b --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilter.java @@ -0,0 +1,102 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; + +import java.util.List; +import java.util.function.Predicate; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator; +import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger; + +/** + * This filter is used to reduce a set of itineraries down to the specified limit, if possible. + * The filter is guaranteed to keep at least the given {@code minNumItineraries} and also + * the best itinerary for each criterion. The criterion is defined using the list of + * {@code comparators}. + *

              + * The main usage of this filter is to combine it with a grouping filter and for each group + * make sure there is at least {@code minNumItineraries} and that the best itinerary with respect + * to each criterion is kept. So, if the grouping is based on time and riding common trips, then + * this filter will use the reminding criterion (transfers, generalized-cost, + * [transit-group-priority]) to filter the grouped set of itineraries. + *

              + * IMPLEMENTATION DETAILS + *

              + * This is not a trivial problem. In most cases, the best itinerary for a given criteria is unique, + * but there might be ties - same number of transfers, same cost, and/or different priority groups. + * In case of a tie, we will look if an itinerary is "best-in-group" for more than one criterion, + * if so we pick the one witch is best in the highest number of groups. Again, if there is a tie + * (best in the same number of groups), then we fall back to the given itinerary sorting order. + *

              + * This filter will use the order of the input itineraries to break ties. So, make sure to call the + * appropriate sort function before this filter is invoked. + *

              + * Note! For a criteria like num-of-transfers or generalized-cost, there is only one set of "best" + * itineraries, and usually there are only one or a few itineraries. In case there is more than one, + * picking just one is fine. But, for transit-group-priority there might be more than on set of + * itineraries. For each set, we need to pick one itinerary for the final result. Each of these + * sets may or may not have more than one itinerary. + *

              + * Let's discuss an example: + * 

              + *   minNumItineraries = 4
+ *   comparators = [ generalized-cost, min-num-transfers, transit-group-priority ]
+ *   itineraries: [
+ *    #0 : [ 1000, 2, (a) ]
+ *    #1 : [ 1000, 3, (a,b) ]
+ *    #2 : [ 1000, 3, (b) ]
+ *    #3 : [ 1200, 1, (a,b) ]
+ *    #4 : [ 1200, 1, (a) ]
+ *    #5 : [ 1300, 2, (c) ]
+ *    #6 : [ 1300, 3, (c) ]
+ *   ]
+ *
              + * The best itineraries by generalized-cost are (#0, #1, #2). The best itineraries by + * min-num-transfers are (#3, #4). The best itineraries by transit-group-priority are + * (a:(#0, #4), b:(#2), c:(#5, #6)). + *

              + * So we need to pick one from each group (#0, #1, #2), (#3, #4), (#0, #4), (#2), and (#5, #6). + * Since #2 is a single, we pick it first. Itinerary #2 is also one of the best + * generalized-cost itineraries - so we are done with generalized-cost itineraries as well. The two + * groups left are (#3, #4), (#0, #4), and (#5, #6). #4 exists in 2 groups, so we pick it next. Now + * we are left with (#5, #6). To break the tie, we look at the sort-order. We pick + * itinerary #5. Result: #2, #4, and #5. + *

              + * The `minNumItineraries` limit is not met, so we need to pick another itinerary, we use the + * sort-order again and add itinerary #0. The result returned is: [#0, #2, #4, #5] + */ +public class McMinimumNumberItineraryFilter implements RemoveItineraryFlagger { + + private final String name; + private final int minNumItineraries; + private final List comparators; + + public McMinimumNumberItineraryFilter( + String name, + int minNumItineraries, + List comparators + ) { + this.name = name; + this.minNumItineraries = minNumItineraries; + this.comparators = comparators; + } + + @Override + public String name() { + return name; + } + + @Override + public List flagForRemoval(List itineraries) { + if (itineraries.size() <= minNumItineraries) { + return List.of(); + } + var state = new State(itineraries, comparators); + state.findAllSingleItemGroupsAndAddTheItemToTheResult(); + state.findTheBestItemsUntilAllGroupsAreRepresentedInTheResult(); + state.fillUpTheResultWithMinimumNumberOfItineraries(minNumItineraries); + + // We now have the itineraries we want, but we must invert this and return the + // list of itineraries to drop - keeping the original order + var ok = state.getResult(); + return itineraries.stream().filter(Predicate.not(ok::contains)).toList(); + } +} diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/State.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/State.java new file mode 100644 index 00000000000..acce6a963f4 --- /dev/null +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/State.java @@ -0,0 +1,190 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import javax.annotation.Nullable; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator; + +/** + * Keep a list of items, groups and the result in progress. This is just a class for + * simple bookkeeping for the state of the filter. + */ +class State { + private final List items; + private final List groups; + private final List result = new ArrayList<>(); + + /** + * Initialize the state by wrapping each itinerary in an item (with index) and create groups for + * each criterion with the best itineraries (can be more than one with, for example, the same + * cost). There should be at least one itinerary from each group surviving the filtering process. + * The same itinerary can exist in multiple groups. + */ + State(List itineraries, List comparators) { + this.items = createListOfItems(itineraries); + this.groups = createGroups(items, comparators); + } + + List getResult() { + return result.stream().map(Item::item).toList(); + } + + /** + * Find and add all groups with a single item in them and add them to the result + */ + void findAllSingleItemGroupsAndAddTheItemToTheResult() { + var item = findItemInFirstSingleItemGroup(groups); + while (item != null) { + addToResult(item); + item = findItemInFirstSingleItemGroup(groups); + } + } + + /** + * Find the items with the highest group count and the lowest index. Theoretically, there might be + * a smaller set of itineraries that TOGETHER represent all groups than what we achieve here, but + * it is fare more complicated to compute - so this is probably good enough. + */ + void findTheBestItemsUntilAllGroupsAreRepresentedInTheResult() { + while (!groups.isEmpty()) { + addToResult(findBestItem(groups)); + } + } + + /** + * Fill up with itineraries until the minimum number of itineraries is reached + */ + void fillUpTheResultWithMinimumNumberOfItineraries(int minNumItineraries) { + int end = Math.min(items.size(), minNumItineraries); + for (int i = 0; result.size() < end; ++i) { + var it = items.get(i); + if (!result.contains(it)) { + result.add(it); + } + } + } + + private void addToResult(Item item) { + result.add(item); + removeGroupsWitchContainsItem(item); + } + + /** + * If an itinerary is accepted into the final result, then all groups that contain that itinerary + * can be removed. In addition, the item groupCount should be decremented if a group is dropped. + * This makes sure that the groups represented in the final result do not count when selecting the + * next item. + */ + private void removeGroupsWitchContainsItem(Item item) { + for (Group group : groups) { + if (group.contains(item)) { + group.removeAllItems(); + } + } + groups.removeIf(Group::isEmpty); + } + + + /** + * The best item is the one witch exists in most groups, and in case of a tie, the sort order/ + * itinerary index is used. + */ + private static Item findBestItem(List groups) { + var candidate = groups.getFirst().first(); + for (Group group : groups) { + for (Item item : group) { + if (item.betterThan(candidate)) { + candidate = item; + } + } + } + return candidate; + } + + /** + * Search through all groups and return all items witch comes from groups with only one item. + */ + @Nullable + private static Item findItemInFirstSingleItemGroup(List groups) { + return groups.stream().filter(Group::isSingleItemGroup).findFirst().map(Group::first).orElse(null); + } + + private static ArrayList createListOfItems(List itineraries) { + var items = new ArrayList(); + for (int i = 0; i < itineraries.size(); i++) { + items.add(new Item(itineraries.get(i), i)); + } + return items; + } + + private static List createGroups(Collection items, List comparators) { + List groups = new ArrayList<>(); + for (SingeCriteriaComparator comparator : comparators) { + if (comparator.strictOrder()) { + groups.add(createOrderedGroup(items, comparator)); + } else { + groups.addAll(createUnorderedGroups(items, comparator)); + } + } + return groups; + } + + /** + * In a strict ordered group only one optimal value exist for the criteria defined by the given + * {@code comparator}. All items that have this value should be included in the group created. + */ + private static Group createOrderedGroup(Collection items, SingeCriteriaComparator comparator) { + Group group = null; + for (Item item : items) { + if (group == null) { + group = new Group(item); + continue; + } + var current = group.first(); + if (comparator.leftDominanceExist(item.item(), current.item())) { + group.addNewDominantItem(item); + } else if (!comparator.leftDominanceExist(current.item(), item.item())) { + group.add(item); + } + } + return group; + } + + /** + * For a none strict ordered criteria, multiple optimal values exist. The criterion is defined by + * the given {@code comparator}. This method will create a group for each optimal value found in + * the given set of items. + * + * @see #createOrderedGroup(Collection, SingeCriteriaComparator) + */ + private static Collection createUnorderedGroups( + Collection items, + SingeCriteriaComparator comparator + ) { + List result = new ArrayList<>(); + + for (Item item : items) { + int groupCount = result.size(); + for (Group group : result) { + var groupItem = group.first().item(); + if (comparator.leftDominanceExist(groupItem, item.item())) { + if (comparator.leftDominanceExist(item.item(), groupItem)) { + // Mutual dominance => the item belong in another group + --groupCount; + } + } else { + if (comparator.leftDominanceExist(item.item(), groupItem)) { + group.removeAllItems(); + } + group.add(item); + } + } + if (groupCount == 0) { + result.add(new Group(item)); + } + } + return result; + } +} diff --git a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java index ddff2e76fca..edaafabd753 100644 --- a/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java +++ b/src/test/java/org/opentripplanner/model/plan/TestItineraryBuilder.java @@ -394,7 +394,7 @@ public TestItineraryBuilder carHail(int duration, Place to) { } public TestItineraryBuilder withGeneralizedCost2(int c2) { - this.c2 = c2; + this.c2 = c2; return this; } @@ -403,16 +403,24 @@ public Itinerary egress(int walkDuration) { return build(); } + /** + * Override any value set for c1. The given value will be assigned to the itinerary + * independent of any values set on the legs. + */ + public Itinerary build(int c1) { + this.c1 = c1; + return build(); + } + public Itinerary build() { Itinerary itinerary = new Itinerary(legs); itinerary.setGeneralizedCost(c1); - if(c2 != NOT_SET) { + if (c2 != NOT_SET) { itinerary.setGeneralizedCost2(c2); } return itinerary; } - /* private methods */ /** Create a dummy trip */ diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java index d94d21673c4..5435a8864c7 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java @@ -2,16 +2,12 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; -import java.util.ArrayList; -import java.util.List; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.collection.CompositeComparator; import org.opentripplanner.model.plan.Itinerary; import org.opentripplanner.model.plan.Place; import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n; @@ -57,34 +53,6 @@ static void setUp() { assertEquals(expectedCost, oneTransferLowCost.getGeneralizedCost()); } - @Test - void compare() { - var l = new ArrayList(); - l.add(zeroTransferHighCost); - l.add(zeroTransferLowCost); - l.add(oneTransferLowCost); - - l.sort( - new CompositeComparator<>( - SingeCriteriaComparator.compareGeneralizedCost(), - SingeCriteriaComparator.compareNumTransfers() - ) - ); - - assertEquals(List.of(zeroTransferLowCost, oneTransferLowCost, zeroTransferHighCost), l); - } - - @Test - void compareThrowsExceptionIfNotStrictOrder() { - assertThrows( - IllegalStateException.class, - () -> - SingeCriteriaComparator - .compareTransitPriorityGroups() - .compare(zeroTransferLowCost, zeroTransferHighCost) - ); - } - @Test void strictOrder() { assertTrue(SingeCriteriaComparator.compareNumTransfers().strictOrder()); @@ -103,11 +71,6 @@ void compareNumTransfers() { // strict order expected assertTrue(subject.strictOrder()); - - // Compare - assertEquals(0, subject.compare(zeroTransferHighCost, zeroTransferLowCost)); - assertEquals(-1, subject.compare(zeroTransferLowCost, oneTransferLowCost)); - assertEquals(1, subject.compare(oneTransferLowCost, zeroTransferLowCost)); } @Test @@ -125,23 +88,12 @@ void compareGeneralizedCost() { // strict order expected assertTrue(subject.strictOrder()); - - // Compare - assertTrue(0 < subject.compare(zeroTransferHighCost, zeroTransferLowCost)); - assertTrue(0 > subject.compare(zeroTransferLowCost, zeroTransferHighCost)); - assertEquals(0, subject.compare(zeroTransferLowCost, oneTransferLowCost)); } @Test void compareTransitPriorityGroups() { - var group1 = newItinerary(A) - .bus(1, START, END_LOW, C) - .withGeneralizedCost2(1) - .build(); - var group2 = newItinerary(A) - .bus(1, START, END_LOW, C) - .withGeneralizedCost2(2) - .build(); + var group1 = newItinerary(A).bus(1, START, END_LOW, C).withGeneralizedCost2(1).build(); + var group2 = newItinerary(A).bus(1, START, END_LOW, C).withGeneralizedCost2(2).build(); var group1And2 = newItinerary(A) .bus(1, START, END_LOW, C) .withGeneralizedCost2(TransitGroupPriority32n.mergeInGroupId(1, 2)) diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/ItemTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/ItemTest.java new file mode 100644 index 00000000000..fbb2f5dea57 --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/ItemTest.java @@ -0,0 +1,56 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; + +import org.junit.jupiter.api.Test; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.Place; +import org.opentripplanner.transit.model._data.TransitModelForTest; + +class ItemTest { + + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + private static final Place A = TEST_MODEL.place("A", 10, 11); + private static final Place B = TEST_MODEL.place("B", 10, 11); + private static final Itinerary ITINERARY = newItinerary(A).bus(1, 1, 2, B).build(); + + @Test + void betterThan() { + var i1 = new Item(ITINERARY, 3); + var i2 = new Item(ITINERARY, 7); + + // i1 is better than i2 because the index is lower + assertTrue(i1.betterThan(i2)); + assertFalse(i2.betterThan(i1)); + + // Incrementing both does not change anything + i1.incGroupCount(); + i2.incGroupCount(); + assertTrue(i1.betterThan(i2)); + assertFalse(i2.betterThan(i1)); + + // Incrementing i2 make it better + i2.incGroupCount(); + assertFalse(i1.betterThan(i2)); + assertTrue(i2.betterThan(i1)); + } + + @Test + void item() { + assertSame(ITINERARY, new Item(ITINERARY, 7).item()); + } + + @Test + void testToString() { + Item item = new Item(ITINERARY, 7); + assertEquals("Item #7 {count:0, A ~ BUS 1 0:00:01 0:00:02 ~ B [C₁121]}", item.toString()); + item.incGroupCount(); + assertEquals("Item #7 {count:1, A ~ BUS 1 0:00:01 0:00:02 ~ B [C₁121]}", item.toString()); + item.decGroupCount(); + assertEquals("Item #7 {count:0, A ~ BUS 1 0:00:01 0:00:02 ~ B [C₁121]}", item.toString()); + } +} diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilterTest.java new file mode 100644 index 00000000000..8d3d03cb857 --- /dev/null +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilterTest.java @@ -0,0 +1,192 @@ +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; + +import java.util.List; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; +import org.opentripplanner.model.plan.Itinerary; +import org.opentripplanner.model.plan.Place; +import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator; +import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n; +import org.opentripplanner.transit.model._data.TransitModelForTest; + +class McMinimumNumberItineraryFilterTest { + + private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of(); + + private static final Place A = TEST_MODEL.place("A", 10, 11); + private static final Place B = TEST_MODEL.place("B", 10, 13); + private static final Place C = TEST_MODEL.place("C", 10, 14); + private static final Place D = TEST_MODEL.place("D", 10, 15); + private static final Place E = TEST_MODEL.place("E", 10, 15); + private static final Place[] PLACES = { A, B, C, D, E }; + + private static final int START = 3600 * 10; + private static final int GROUP_A = TransitGroupPriority32n.groupId(1); + private static final int GROUP_B = TransitGroupPriority32n.groupId(2); + private static final int GROUP_C = TransitGroupPriority32n.groupId(3); + private static final int GROUP_AB = TransitGroupPriority32n.mergeInGroupId(GROUP_A, GROUP_B); + private static final int GROUP_BC = TransitGroupPriority32n.mergeInGroupId(GROUP_B, GROUP_C); + private static final int GROUP_ABC = TransitGroupPriority32n.mergeInGroupId(GROUP_AB, GROUP_C); + + private static final boolean EXP_KEEP = true; + private static final boolean EXP_DROP = false; + + private static final int COST_LOW = 1000; + private static final int COST_MED = 1200; + private static final int COST_HIGH = 1500; + + private static final int TX_0 = 0; + private static final int TX_1 = 1; + private static final int TX_2 = 2; + + private final McMinimumNumberItineraryFilter subject = new McMinimumNumberItineraryFilter( + "test", + 2, + List.of( + SingeCriteriaComparator.compareGeneralizedCost(), + SingeCriteriaComparator.compareNumTransfers(), + SingeCriteriaComparator.compareTransitPriorityGroups() + ) + ); + + static TestRow row( + boolean expected, + int c1, + int nTransfers, + int transitGroups, + String description + ) { + return new TestRow(expected, c1, nTransfers, transitGroups); + } + + static List> filterTestCases() { + return List.of( + List.of(/* Should not fail for an empty list of itineraries*/), + List.of( + // Test minNumItinerariesLimit = 2 + row(EXP_KEEP, COST_LOW, TX_1, GROUP_A, "Best in everything"), + row(EXP_KEEP, COST_HIGH, TX_2, GROUP_AB, "Worse, kept because minNumItinerariesLimit is 2") + ), + List.of( + // Test minNumItinerariesLimit, first is added + row(EXP_KEEP, COST_HIGH, TX_2, GROUP_ABC, "Worst, kept because of minNumItinerariesLimit"), + row(EXP_KEEP, COST_LOW, TX_0, GROUP_A, "Best in everything"), + row(EXP_DROP, COST_HIGH, TX_1, GROUP_AB, "Dropped because not better than #2.") + ), + List.of( + // The minNumItinerariesLimit is met, so no extra itinerary(#0) is added + row(EXP_DROP, COST_HIGH, TX_2, GROUP_AB, "First element is dropped"), + row(EXP_KEEP, COST_LOW, TX_1, GROUP_B, "Best cost and group B"), + row(EXP_KEEP, COST_MED, TX_0, GROUP_A, "Best nTransfers and group A") + ), + List.of( + row(EXP_KEEP, COST_LOW, TX_2, GROUP_A, "Best: c1 and group A"), + row(EXP_DROP, COST_LOW, TX_1, GROUP_AB, "Best compromise: c1, Tx, and group AB"), + row(EXP_KEEP, COST_LOW, TX_2, GROUP_C, "Best: c1 and group C"), + row(EXP_KEEP, COST_MED, TX_0, GROUP_BC, "Best: num-of-transfers") + ), + /** + * This is the example explained in JavaDoc {@link McMinimumNumberItineraryFilter} + */ + List.of( + row(EXP_DROP, COST_LOW, TX_1, GROUP_A, ""), + row(EXP_DROP, COST_LOW, TX_2, GROUP_AB, ""), + row(EXP_KEEP, COST_LOW, TX_2, GROUP_B, "Kept -> Only one in group B"), + row(EXP_DROP, COST_MED, TX_0, GROUP_AB, ""), + row(EXP_KEEP, COST_MED, TX_0, GROUP_A, "Kept -> Best transfer and group A"), + row(EXP_KEEP, COST_HIGH, TX_1, GROUP_C, "Kept -> Best group C, tie with #6"), + row(EXP_DROP, COST_HIGH, TX_2, GROUP_C, "") + ) + ); + } + + @ParameterizedTest + @MethodSource("filterTestCases") + void filterTest(List rows) { + var input = rows.stream().map(TestRow::create).toList(); + var expected = rows.stream().filter(TestRow::expected).map(TestRow::create).toList(); + + var result = subject.removeMatchesForTest(input); + + assertEquals(toStr(expected), toStr(result)); + } + + @Test + void testName() { + assertEquals("test", subject.name()); + } + + /** + * Make sure the test setup is correct - this does not test anything in src/main + */ + @Test + void testGroupsToString() { + assertEquals("A", groupsToString(GROUP_A)); + assertEquals("B", groupsToString(GROUP_B)); + assertEquals("C", groupsToString(GROUP_C)); + assertEquals("AB", groupsToString(GROUP_AB)); + assertEquals("BC", groupsToString(GROUP_BC)); + assertEquals("ABC", groupsToString(GROUP_ABC)); + } + + private static String groupsToString(int groups) { + var buf = new StringBuilder(); + char ch = 'A'; + // Check for 5 groups - the test does not use so many, but it does not matter + for (int i = 0; i < 5; ++i) { + int mask = 1 << i; + if ((groups & mask) != 0) { + buf.append(ch); + } + ch = (char) (ch + 1); + } + return buf.toString(); + } + + private static String toStr(List list) { + return list + .stream() + .map(i -> + "[ %d %d %s ]".formatted( + i.getGeneralizedCost(), + i.getNumberOfTransfers(), + groupsToString(i.getGeneralizedCost2().orElse(-1)) + ) + ) + .collect(Collectors.joining(", ")); + } + + record TestRow(boolean expected, int c1, int nTransfers, int transitGroupIds) { + Itinerary create() { + int start = START; + var builder = newItinerary(A); + + if (nTransfers < 0) { + builder.drive(start, ++start, E); + } else { + builder.bus(1, ++start, ++start, PLACES[1]); + for (int i = 0; i < nTransfers; i++) { + builder.bus(1, ++start, ++start, PLACES[i + 2]); + } + builder.withGeneralizedCost2(transitGroupIds); + } + return builder.build(c1); + } + + @Override + public String toString() { + // The red-x is a unicode character(U+274C) and should be visible in most IDEs. + return "%s %d %d %s".formatted( + expected ? "" : "❌", + c1, + nTransfers, + groupsToString(transitGroupIds) + ); + } + } +} From 2bd255ccb14a6df7bc1bac6f78c8d466dd316642 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 18 Jun 2024 22:29:20 +0000 Subject: [PATCH 1421/1688] chore(deps): update dependency io.github.git-commit-id:git-commit-id-maven-plugin to v9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e06a39cdfa..4353671dbce 100644 --- a/pom.xml +++ b/pom.xml @@ -321,7 +321,7 @@ but we need the Maven project version as well, so we perform substitution. --> io.github.git-commit-id git-commit-id-maven-plugin - 8.0.2 + 9.0.0 From 02cb8f752a32a580daad6e7409b361761528c53f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Tue, 18 Jun 2024 14:02:32 +0200 Subject: [PATCH 1422/1688] Increase code reuse in SkippedTest --- .../trip/moduletests/addition/AddedTest.java | 5 +- .../CancellationDeletionTest.java | 12 +- .../trip/moduletests/delay/DelayedTest.java | 26 +- .../trip/moduletests/delay/SkippedTest.java | 303 +++++++----------- .../rejection/InvalidTripIdTest.java | 9 +- 5 files changed, 128 insertions(+), 227 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java index 6a7d076923f..8a2d6e96407 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java @@ -17,7 +17,6 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.opentripplanner.model.PickDrop; -import org.opentripplanner.model.Timetable; import org.opentripplanner.transit.model.basic.TransitMode; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; @@ -148,8 +147,8 @@ private TripPattern assertAddedTrip(String tripId, RealtimeTestEnvironment env) assertEquals(1, patternsAtA.size()); var tripPattern = patternsAtA.stream().findFirst().get(); - final Timetable forToday = snapshot.resolve(tripPattern, SERVICE_DATE); - final Timetable schedule = snapshot.resolve(tripPattern, null); + var forToday = snapshot.resolve(tripPattern, SERVICE_DATE); + var schedule = snapshot.resolve(tripPattern, null); assertNotSame(forToday, schedule); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java index 41e42bf00db..3b527b64e5d 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java @@ -12,8 +12,6 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; import org.junit.jupiter.params.provider.MethodSource; -import org.opentripplanner.model.Timetable; -import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; @@ -49,8 +47,8 @@ void cancelledTrip(ScheduleRelationship relationship, RealTimeState state) { assertSuccess(env.applyTripUpdate(update)); var snapshot = env.getTimetableSnapshot(); - final Timetable forToday = snapshot.resolve(pattern1, RealtimeTestEnvironment.SERVICE_DATE); - final Timetable schedule = snapshot.resolve(pattern1, null); + var forToday = snapshot.resolve(pattern1, RealtimeTestEnvironment.SERVICE_DATE); + var schedule = snapshot.resolve(pattern1, null); assertNotSame(forToday, schedule); assertNotSame(forToday.getTripTimes(tripIndex1), schedule.getTripTimes(tripIndex1)); @@ -100,15 +98,15 @@ void cancelingAddedTrip(ScheduleRelationship relationship, RealTimeState state) .build(); assertSuccess(env.applyTripUpdate(update, DIFFERENTIAL)); - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + var snapshot = env.getTimetableSnapshot(); // Get the trip pattern of the added trip which goes through stopA var patternsAtA = snapshot.getPatternsForStop(env.stopA1); assertNotNull(patternsAtA, "Added trip pattern should be found"); var tripPattern = patternsAtA.stream().findFirst().get(); - final Timetable forToday = snapshot.resolve(tripPattern, RealtimeTestEnvironment.SERVICE_DATE); - final Timetable schedule = snapshot.resolve(tripPattern, null); + var forToday = snapshot.resolve(tripPattern, RealtimeTestEnvironment.SERVICE_DATE); + var schedule = snapshot.resolve(tripPattern, null); assertNotSame(forToday, schedule); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java index 7440a189846..d9282e1b155 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java @@ -9,8 +9,6 @@ import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE; import org.junit.jupiter.api.Test; -import org.opentripplanner.model.Timetable; -import org.opentripplanner.model.TimetableSnapshot; import org.opentripplanner.transit.model.network.TripPattern; import org.opentripplanner.transit.model.timetable.RealTimeState; import org.opentripplanner.transit.model.timetable.TripTimes; @@ -45,12 +43,9 @@ void singleStopDelay() { var pattern1 = env.getPatternForTrip(env.trip1); int trip1Index = pattern1.getScheduledTimetable().getTripIndex(env.trip1.getId()); - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); - final Timetable trip1Realtime = snapshot.resolve( - pattern1, - RealtimeTestEnvironment.SERVICE_DATE - ); - final Timetable trip1Scheduled = snapshot.resolve(pattern1, null); + var snapshot = env.getTimetableSnapshot(); + var trip1Realtime = snapshot.resolve(pattern1, RealtimeTestEnvironment.SERVICE_DATE); + var trip1Scheduled = snapshot.resolve(pattern1, null); assertNotSame(trip1Realtime, trip1Scheduled); assertNotSame(trip1Realtime.getTripTimes(trip1Index), trip1Scheduled.getTripTimes(trip1Index)); @@ -79,26 +74,25 @@ void singleStopDelay() { void complexDelay() { var env = RealtimeTestEnvironment.gtfs(); - String tripId = env.trip2.getId().getId(); + var tripId = env.trip2.getId().getId(); - var builder = new TripUpdateBuilder(tripId, SERVICE_DATE, SCHEDULED, env.timeZone) + var tripUpdate = new TripUpdateBuilder(tripId, SERVICE_DATE, SCHEDULED, env.timeZone) .addDelayedStopTime(0, 0) .addDelayedStopTime(1, 60, 80) - .addDelayedStopTime(2, 90, 90); - - var tripUpdate = builder.build(); + .addDelayedStopTime(2, 90, 90) + .build(); assertSuccess(env.applyTripUpdate(tripUpdate)); - final TimetableSnapshot snapshot = env.getTimetableSnapshot(); + var snapshot = env.getTimetableSnapshot(); final TripPattern originalTripPattern = env.transitModel .getTransitModelIndex() .getPatternForTrip() .get(env.trip2); - final Timetable originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); - final Timetable originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); + var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); assertNotSame(originalTimetableForToday, originalTimetableScheduled); diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java index c70dd380602..349e472036d 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java @@ -3,7 +3,6 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -12,10 +11,8 @@ import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL; import org.junit.jupiter.api.Test; -import org.opentripplanner.framework.i18n.NonLocalizedString; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.timetable.RealTimeState; -import org.opentripplanner.transit.model.timetable.Trip; import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder; import org.opentripplanner.updater.trip.RealtimeTestEnvironment; import org.opentripplanner.updater.trip.TripUpdateBuilder; @@ -38,65 +35,14 @@ void scheduledTripWithSkippedAndScheduled() { assertSuccess(env.applyTripUpdate(tripUpdate)); - var snapshot = env.getTimetableSnapshot(); + assertOriginalTripPatternIsDeleted(env, env.trip2.getId()); + + assertNewTripTimesIsUpdated(env, env.trip2.getId()); - // Original trip pattern - { - var tripId = env.trip2.getId(); - var trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); - var originalTripPattern = env.transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(trip); - - var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); - var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); - - assertNotSame(originalTimetableForToday, originalTimetableScheduled); - - int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - var originalTripTimesForToday = originalTimetableForToday.getTripTimes( - originalTripIndexForToday - ); - assertTrue( - originalTripTimesForToday.isDeleted(), - "Original trip times should be deleted in time table for service date" - ); - // original trip should be canceled - assertEquals(RealTimeState.DELETED, originalTripTimesForToday.getRealTimeState()); - } - - // New trip pattern - { - var newTripPattern = snapshot.getRealtimeAddedTripPattern(env.trip2.getId(), SERVICE_DATE); - - var newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); - var newTimetableScheduled = snapshot.resolve(newTripPattern, null); - - assertNotSame(newTimetableForToday, newTimetableScheduled); - - assertTrue(newTripPattern.canBoard(0)); - assertFalse(newTripPattern.canBoard(1)); - assertTrue(newTripPattern.canBoard(2)); - - int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex( - scheduledTripId - ); - - var newTripTimes = newTimetableForToday.getTripTimes(newTimetableForTodayModifiedTripIndex); - assertEquals(RealTimeState.UPDATED, newTripTimes.getRealTimeState()); - - assertEquals( - -1, - newTimetableScheduled.getTripIndex(scheduledTripId), - "New trip should not be found in scheduled time table" - ); - - assertEquals( - "UPDATED | A1 0:01 0:01:01 | B1 [C] 0:01:52 0:01:58 | C1 0:02:50 0:02:51", - env.getRealtimeTimetable(scheduledTripId) - ); - } + assertEquals( + "UPDATED | A1 0:01 0:01:01 | B1 [C] 0:01:52 0:01:58 | C1 0:02:50 0:02:51", + env.getRealtimeTimetable(scheduledTripId) + ); } /** @@ -141,51 +87,18 @@ void scheduledTripWithPreviouslySkipped() { // stoptime updates have gone through var snapshot = env.getTimetableSnapshot(); - { - var newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); - assertNull(newTripPattern); - final Trip trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); - - var originalTripPattern = env.transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(trip); - var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); - - var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); - - assertNotSame(originalTimetableForToday, originalTimetableScheduled); - - int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); - - assertTrue( - originalTripIndexScheduled > -1, - "Original trip should be found in scheduled time table" - ); - var originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( - originalTripIndexScheduled - ); - assertFalse( - originalTripTimesScheduled.isCanceledOrDeleted(), - "Original trip times should not be canceled in scheduled time table" - ); - assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); - int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - - assertTrue( - originalTripIndexForToday > -1, - "Original trip should be found in time table for service date" - ); - - assertEquals( - "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", - env.getScheduledTimetable(tripId) - ); - assertEquals( - "UPDATED | A1 0:01 0:01:01 | B1 0:02 0:02:01 | C1 0:02:50 0:02:51", - env.getRealtimeTimetable(tripId, SERVICE_DATE) - ); - } + assertNull(snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE)); + + assertNewTripTimesIsUpdated(env, tripId); + + assertEquals( + "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", + env.getScheduledTimetable(tripId) + ); + assertEquals( + "UPDATED | A1 0:01 0:01:01 | B1 0:02 0:02:01 | C1 0:02:50 0:02:51", + env.getRealtimeTimetable(tripId, SERVICE_DATE) + ); } /** @@ -205,96 +118,96 @@ void skippedNoData() { assertSuccess(env.applyTripUpdate(tripUpdate)); - // THEN + assertOriginalTripPatternIsDeleted(env, tripId); + + assertNewTripTimesIsUpdated(env, tripId); + + assertEquals( + "UPDATED | A1 [ND] 0:01 0:01:01 | B1 [C] 0:01:10 0:01:11 | C1 [ND] 0:01:20 0:01:21", + env.getRealtimeTimetable(env.trip2) + ); + } + + private static void assertOriginalTripPatternIsDeleted( + RealtimeTestEnvironment env, + FeedScopedId tripId + ) { + var trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId); + var originalTripPattern = env.transitModel.getTransitModelIndex().getPatternForTrip().get(trip); var snapshot = env.getTimetableSnapshot(); + var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); + var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + + assertNotSame(originalTimetableForToday, originalTimetableScheduled); + + int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); + assertTrue( + originalTripIndexScheduled > -1, + "Original trip should be found in scheduled time table" + ); + var originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( + originalTripIndexScheduled + ); + assertFalse( + originalTripTimesScheduled.isCanceledOrDeleted(), + "Original trip times should not be canceled in scheduled time table" + ); + + assertEquals( + "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", + TripTimesStringBuilder.encodeTripTimes(originalTripTimesScheduled, originalTripPattern) + ); + + int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + assertTrue( + originalTripIndexForToday > -1, + "Original trip should be found in time table for service date" + ); + var originalTripTimesForToday = originalTimetableForToday.getTripTimes( + originalTripIndexForToday + ); + assertTrue( + originalTripTimesForToday.isDeleted(), + "Original trip times should be deleted in time table for service date" + ); + // original trip should be deleted + assertEquals(RealTimeState.DELETED, originalTripTimesForToday.getRealTimeState()); + } - // Original trip pattern - { - var originalTripPattern = env.transitModel - .getTransitModelIndex() - .getPatternForTrip() - .get(env.trip2); - - var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); - var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); - - assertNotSame(originalTimetableForToday, originalTimetableScheduled); - - int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); - assertTrue( - originalTripIndexScheduled > -1, - "Original trip should be found in scheduled time table" - ); - var originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( - originalTripIndexScheduled - ); - assertFalse( - originalTripTimesScheduled.isCanceledOrDeleted(), - "Original trip times should not be canceled in scheduled time table" - ); - - assertEquals( - "SCHEDULED | A1 0:01 0:01:01 | B1 0:01:10 0:01:11 | C1 0:01:20 0:01:21", - TripTimesStringBuilder.encodeTripTimes(originalTripTimesScheduled, originalTripPattern) - ); - - int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); - assertTrue( - originalTripIndexForToday > -1, - "Original trip should be found in time table for service date" - ); - var originalTripTimesForToday = originalTimetableForToday.getTripTimes( - originalTripIndexForToday - ); - assertTrue( - originalTripTimesForToday.isDeleted(), - "Original trip times should be deleted in time table for service date" - ); - // original trip should be deleted - assertEquals(RealTimeState.DELETED, originalTripTimesForToday.getRealTimeState()); - } - - // New trip pattern - { - var newTripPattern = snapshot.getRealtimeAddedTripPattern(tripId, SERVICE_DATE); - assertNotNull(newTripPattern, "New trip pattern should be found"); - - var newTimetableForToday = snapshot.resolve(newTripPattern, SERVICE_DATE); - var newTimetableScheduled = snapshot.resolve(newTripPattern, null); - - assertNotSame(newTimetableForToday, newTimetableScheduled); - - assertTrue(newTripPattern.canBoard(0)); - assertFalse(newTripPattern.canBoard(1)); - assertTrue(newTripPattern.canBoard(2)); - - assertEquals( - new NonLocalizedString("Headsign of TestTrip2"), - newTripPattern.getTripHeadsign() - ); - assertEquals( - newTripPattern.getOriginalTripPattern().getTripHeadsign(), - newTripPattern.getTripHeadsign() - ); - - int newTimetableForTodayModifiedTripIndex = newTimetableForToday.getTripIndex(tripId); - assertTrue( - newTimetableForTodayModifiedTripIndex > -1, - "New trip should be found in time table for service date" - ); - - var newTripTimes = newTimetableForToday.getTripTimes(tripId); - - assertEquals( - -1, - newTimetableScheduled.getTripIndex(tripId), - "New trip should not be found in scheduled time table" - ); - - assertEquals( - "UPDATED | A1 [ND] 0:01 0:01:01 | B1 [C] 0:01:10 0:01:11 | C1 [ND] 0:01:20 0:01:21", - TripTimesStringBuilder.encodeTripTimes(newTripTimes, newTripPattern) - ); - } + private static void assertNewTripTimesIsUpdated( + RealtimeTestEnvironment env, + FeedScopedId tripId + ) { + var originalTripPattern = env.transitModel + .getTransitModelIndex() + .getPatternForTrip() + .get(env.trip2); + var snapshot = env.getTimetableSnapshot(); + var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE); + + var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null); + + assertNotSame(originalTimetableForToday, originalTimetableScheduled); + + int originalTripIndexScheduled = originalTimetableScheduled.getTripIndex(tripId); + + assertTrue( + originalTripIndexScheduled > -1, + "Original trip should be found in scheduled time table" + ); + var originalTripTimesScheduled = originalTimetableScheduled.getTripTimes( + originalTripIndexScheduled + ); + assertFalse( + originalTripTimesScheduled.isCanceledOrDeleted(), + "Original trip times should not be canceled in scheduled time table" + ); + assertEquals(RealTimeState.SCHEDULED, originalTripTimesScheduled.getRealTimeState()); + int originalTripIndexForToday = originalTimetableForToday.getTripIndex(tripId); + + assertTrue( + originalTripIndexForToday > -1, + "Original trip should be found in time table for service date" + ); } } diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java index 6cacaeb6ca9..e6e7a4737f7 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java @@ -1,5 +1,6 @@ package org.opentripplanner.updater.trip.moduletests.rejection; +import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED; import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure; import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_INPUT_STRUCTURE; @@ -26,16 +27,12 @@ void invalidTripId(String tripId) { if (tripId != null) { tripDescriptorBuilder.setTripId(tripId); } - tripDescriptorBuilder.setScheduleRelationship( - GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED - ); + tripDescriptorBuilder.setScheduleRelationship(SCHEDULED); var tripUpdateBuilder = GtfsRealtime.TripUpdate.newBuilder(); tripUpdateBuilder.setTrip(tripDescriptorBuilder); var tripUpdate = tripUpdateBuilder.build(); - var result = env.applyTripUpdate(tripUpdate); - - assertFailure(INVALID_INPUT_STRUCTURE, result); + assertFailure(INVALID_INPUT_STRUCTURE, env.applyTripUpdate(tripUpdate)); } } From 21e745f4651d9f0c5b5b9112d0b209904fb4b9ab Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 19 Jun 2024 09:44:31 +0200 Subject: [PATCH 1423/1688] Simplify AddedTest --- .../trip/moduletests/addition/AddedTest.java | 46 ++++++------------- 1 file changed, 14 insertions(+), 32 deletions(-) diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java index 8a2d6e96407..1e75f558510 100644 --- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java +++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java @@ -2,7 +2,6 @@ import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.ADDED; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; @@ -45,22 +44,15 @@ void addedTrip() { @Test void addedTripWithNewRoute() { var env = RealtimeTestEnvironment.gtfs(); - final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); - // add extension to set route name, url, mode - builder.addTripExtension(); - - builder + var tripUpdate = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone) + .addTripExtension() .addStopTime(STOP_A1_ID, 30, DropOffPickupType.PHONE_AGENCY) .addStopTime(STOP_B1_ID, 40, DropOffPickupType.COORDINATE_WITH_DRIVER) - .addStopTime(STOP_B1_ID, 55, DropOffPickupType.NONE); - - var tripUpdate = builder.build(); + .addStopTime(STOP_B1_ID, 55, DropOffPickupType.NONE) + .build(); - // WHEN var result = assertSuccess(env.applyTripUpdate(tripUpdate)); - // THEN - assertTrue(result.warnings().isEmpty()); var pattern = assertAddedTrip(ADDED_TRIP_ID, env); @@ -83,21 +75,16 @@ void addedTripWithNewRoute() { @Test void addedWithUnknownStop() { var env = RealtimeTestEnvironment.gtfs(); - final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); - // add extension to set route name, url, mode - builder.addTripExtension(); - - builder + var tripUpdate = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone) + // add extension to set route name, url, mode + .addTripExtension() .addStopTime(STOP_A1_ID, 30, DropOffPickupType.PHONE_AGENCY) .addStopTime("UNKNOWN_STOP_ID", 40, DropOffPickupType.COORDINATE_WITH_DRIVER) - .addStopTime(STOP_C1_ID, 55, DropOffPickupType.NONE); - - var tripUpdate = builder.build(); + .addStopTime(STOP_C1_ID, 55, DropOffPickupType.NONE) + .build(); var result = assertSuccess(env.applyTripUpdate(tripUpdate)); - assertFalse(result.warnings().isEmpty()); - assertEquals( List.of(UpdateSuccess.WarningType.UNKNOWN_STOPS_REMOVED_FROM_ADDED_TRIP), result.warnings() @@ -111,16 +98,13 @@ void addedWithUnknownStop() { @Test void repeatedlyAddedTripWithNewRoute() { var env = RealtimeTestEnvironment.gtfs(); - final var builder = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone); - // add extension to set route name, url, mode - builder.addTripExtension(); - - builder + var tripUpdate = new TripUpdateBuilder(ADDED_TRIP_ID, SERVICE_DATE, ADDED, env.timeZone) + // add extension to set route name, url, mode + .addTripExtension() .addStopTime(STOP_A1_ID, 30, DropOffPickupType.PHONE_AGENCY) .addStopTime(STOP_B1_ID, 40, DropOffPickupType.COORDINATE_WITH_DRIVER) - .addStopTime(STOP_C1_ID, 55, DropOffPickupType.NONE); - - var tripUpdate = builder.build(); + .addStopTime(STOP_C1_ID, 55, DropOffPickupType.NONE) + .build(); assertSuccess(env.applyTripUpdate(tripUpdate)); var pattern = assertAddedTrip(ADDED_TRIP_ID, env); @@ -131,8 +115,6 @@ void repeatedlyAddedTripWithNewRoute() { var secondPattern = assertAddedTrip(ADDED_TRIP_ID, env); var secondRoute = secondPattern.getRoute(); - // THEN - assertSame(firstRoute, secondRoute); assertNotNull(env.transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId())); } From 6755cbc868b09e25f3395658b0d6bf566c543a3f Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 19 Jun 2024 10:18:12 +0200 Subject: [PATCH 1424/1688] Update Javadoc --- .../opentripplanner/ext/geocoder/configure/GeocoderModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java index 17949e5cb8a..b67f81385b8 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java @@ -10,7 +10,7 @@ import org.opentripplanner.transit.service.TransitService; /** - * This module builds the lucene geocoder based on the whether the feature flag is + * This module builds the Lucene geocoder based on whether the feature flag is on or off. */ @Module public class GeocoderModule { From 4bbe43e8c708b45bde67fb641b19ac6db1001afb Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 19 Jun 2024 10:20:17 +0200 Subject: [PATCH 1425/1688] Re-add backwards-compatibility --- .../ext/geocoder/GeocoderResource.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java index c9cd199c557..304829843ae 100644 --- a/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java +++ b/src/ext/java/org/opentripplanner/ext/geocoder/GeocoderResource.java @@ -3,6 +3,7 @@ import jakarta.ws.rs.DefaultValue; import jakarta.ws.rs.GET; import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; import jakarta.ws.rs.Produces; import jakarta.ws.rs.QueryParam; import jakarta.ws.rs.core.Context; @@ -30,6 +31,20 @@ public GeocoderResource(@Context OtpServerRequestContext requestContext) { luceneIndex = requestContext.lucenceIndex(); } + /** + * This class is only here for backwards-compatibility. It will be removed in the future. + */ + @Path("/routers/{ignoreRouterId}/geocode") + public static class GeocoderResourceOldPath extends GeocoderResource { + + public GeocoderResourceOldPath( + @Context OtpServerRequestContext serverContext, + @PathParam("ignoreRouterId") String ignore + ) { + super(serverContext); + } + } + /** * Geocode using data using the OTP graph for stops, clusters and street names * From 8a77828cff450d7ac7ac49debd41125b3fd2ee46 Mon Sep 17 00:00:00 2001 From: sharhio <113033056+sharhio@users.noreply.github.com> Date: Wed, 19 Jun 2024 12:03:28 +0300 Subject: [PATCH 1426/1688] Update src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java Co-authored-by: Leonard Ehrenfried --- .../vehicle_rental/datasources/GbfsGeofencingZoneMapper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java index c98680d8c35..0a79d45d4ee 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java @@ -52,7 +52,7 @@ private GeofencingZone toInternalModel(GBFSFeature f) { return null; } var name = Objects.requireNonNullElseGet(f.getProperties().getName(), () -> fallbackId(g)); - if (name.isEmpty()) { + if (StringUtils.hasValue(name)) { name = fallbackId(g); } var dropOffBanned = !f.getProperties().getRules().get(0).getRideAllowed(); From 98588b8d8baa1eb846700a1d83f0bb17652a938b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 19 Jun 2024 11:08:49 +0200 Subject: [PATCH 1427/1688] Convert exception into data import issue --- .../graph_builder/issue/api/Issue.java | 11 ++++++++ .../gtfs/mapping/AreaStopMapper.java | 24 +++++++++++++++-- .../GTFSToOtpTransitServiceMapper.java | 2 +- .../transit/model/site/AreaStop.java | 13 +-------- .../gtfs/mapping/AreaStopMapperTest.java | 27 +++++++++++++++---- .../gtfs/mapping/LocationGroupMapperTest.java | 3 ++- .../gtfs/mapping/StopAreaMapperTest.java | 3 ++- .../gtfs/mapping/StopTimeMapperTest.java | 5 +++- .../gtfs/mapping/TransferMapperTest.java | 5 +++- .../transit/model/site/AreaStopTest.java | 13 --------- 10 files changed, 69 insertions(+), 37 deletions(-) diff --git a/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java b/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java index 794d9785934..24beb48e845 100644 --- a/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java +++ b/src/main/java/org/opentripplanner/graph_builder/issue/api/Issue.java @@ -1,5 +1,7 @@ package org.opentripplanner.graph_builder.issue.api; +import org.opentripplanner.framework.tostring.ToStringBuilder; + /** * Generic issue type, which can be used to create issues. */ @@ -32,4 +34,13 @@ public String getType() { public String getMessage() { return String.format(message, arguments); } + + @Override + public String toString() { + return ToStringBuilder + .of(this.getClass()) + .addStr("type", type) + .addStr("message", getMessage()) + .toString(); + } } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java index e42d7414620..b2d66bdb5c4 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java @@ -6,11 +6,14 @@ import java.util.HashMap; import java.util.Map; import org.locationtech.jts.geom.Geometry; +import org.locationtech.jts.operation.valid.IsValidOp; import org.onebusaway.gtfs.model.Location; import org.opentripplanner.framework.collection.MapUtils; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.UnsupportedGeometryException; import org.opentripplanner.framework.i18n.NonLocalizedString; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; +import org.opentripplanner.graph_builder.issue.api.Issue; import org.opentripplanner.transit.model.site.AreaStop; import org.opentripplanner.transit.service.StopModelBuilder; @@ -19,9 +22,11 @@ public class AreaStopMapper { private final Map mappedLocations = new HashMap<>(); private final StopModelBuilder stopModelBuilder; + private final DataImportIssueStore issueStore; - public AreaStopMapper(StopModelBuilder stopModelBuilder) { + public AreaStopMapper(StopModelBuilder stopModelBuilder, DataImportIssueStore issueStore) { this.stopModelBuilder = stopModelBuilder; + this.issueStore = issueStore; } Collection map(Collection allLocations) { @@ -36,9 +41,24 @@ AreaStop map(Location orginal) { private AreaStop doMap(Location gtfsLocation) { var name = NonLocalizedString.ofNullable(gtfsLocation.getName()); try { + var id = mapAgencyAndId(gtfsLocation.getId()); Geometry geometry = GeometryUtils.convertGeoJsonToJtsGeometry(gtfsLocation.getGeometry()); + var isValidOp = new IsValidOp(geometry); + if (!isValidOp.isValid()) { + var error = isValidOp.getValidationError(); + issueStore.add( + Issue.issue( + "InvalidFlexAreaGeometry", + "GTFS flex location %s has an invalid geometry: %s at (lat: %s, lon: %s)", + id, + error.getMessage(), + error.getCoordinate().y, + error.getCoordinate().x + ) + ); + } return stopModelBuilder - .areaStop(mapAgencyAndId(gtfsLocation.getId())) + .areaStop(id) .withName(name) .withUrl(NonLocalizedString.ofNullable(gtfsLocation.getUrl())) .withDescription(NonLocalizedString.ofNullable(gtfsLocation.getDescription())) diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index 88a32c0f95e..afbb105aa27 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -110,7 +110,7 @@ public GTFSToOtpTransitServiceMapper( entranceMapper = new EntranceMapper(translationHelper, stationLookup); pathwayNodeMapper = new PathwayNodeMapper(translationHelper, stationLookup); boardingAreaMapper = new BoardingAreaMapper(translationHelper, stopLookup); - areaStopMapper = new AreaStopMapper(builder.stopModel()); + areaStopMapper = new AreaStopMapper(builder.stopModel(), issueStore); locationGroupMapper = new LocationGroupMapper(stopMapper, areaStopMapper, builder.stopModel()); // the use of stop areas were reverted in the spec // this code will go away, please migrate now! diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index cf0ac3d0b3f..64fafcb58b3 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -6,7 +6,6 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import org.locationtech.jts.geom.Geometry; -import org.locationtech.jts.operation.valid.IsValidOp; import org.opentripplanner.framework.geometry.WgsCoordinate; import org.opentripplanner.framework.i18n.I18NString; import org.opentripplanner.framework.i18n.NonLocalizedString; @@ -53,17 +52,7 @@ public class AreaStop this.url = builder.url(); this.zoneId = builder.zoneId(); this.geometry = builder.geometry(); - if (!this.geometry.isValid()) { - var error = new IsValidOp(this.geometry).getValidationError(); - throw new IllegalArgumentException( - "Polygon geometry for AreaStop %s is invalid: %s at (lat: %s, lon: %s)".formatted( - getId(), - error.getMessage(), - error.getCoordinate().y, - error.getCoordinate().x - ) - ); - } + this.centroid = Objects.requireNonNull(builder.centroid()); } diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java index a1a03226014..a5df87bc4ce 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java @@ -2,8 +2,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; +import java.util.List; import java.util.stream.Stream; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; @@ -13,6 +13,9 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.Location; import org.opentripplanner._support.geometry.Polygons; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; +import org.opentripplanner.graph_builder.issue.api.Issue; +import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.transit.service.StopModel; class AreaStopMapperTest { @@ -24,9 +27,9 @@ static Stream testCases() { @ParameterizedTest(name = "a name of <{0}> should set bogusName={1}") @MethodSource("testCases") void testMapping(String name, boolean isBogusName) { - final var gtfsLocation = getLocation(name, Polygons.OSLO); + var gtfsLocation = getLocation(name, Polygons.OSLO); - var mapper = new AreaStopMapper(StopModel.of()); + var mapper = new AreaStopMapper(StopModel.of(), DataImportIssueStore.NOOP); var flexLocation = mapper.map(gtfsLocation); assertEquals(isBogusName, flexLocation.hasFallbackName()); @@ -39,8 +42,22 @@ void invalidPolygon() { var gtfsLocation = getLocation("invalid", selfIntersecting); - var mapper = new AreaStopMapper(StopModel.of()); - assertThrows(IllegalArgumentException.class, () -> mapper.map(gtfsLocation)); + var issueStore = new DefaultDataImportIssueStore(); + var mapper = new AreaStopMapper(StopModel.of(), issueStore); + + mapper.map(gtfsLocation); + + assertEquals( + List + .of( + Issue.issue( + "InvalidFlexAreaGeometry", + "GTFS flex location 1:zone-3 has an invalid geometry: Self-intersection at (lat: 1.0, lon: 2.0)" + ) + ) + .toString(), + issueStore.listIssues().toString() + ); } private static Location getLocation(String name, Polygon polygon) { diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java index 513c96edd13..20cc574c383 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java @@ -9,6 +9,7 @@ import org.onebusaway.gtfs.model.AgencyAndId; import org.onebusaway.gtfs.model.LocationGroup; import org.onebusaway.gtfs.model.Stop; +import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.opentripplanner.transit.model.site.StopLocation; import org.opentripplanner.transit.service.StopModel; @@ -22,7 +23,7 @@ void map() { var builder = StopModel.of(); var mapper = new LocationGroupMapper( new StopMapper(new TranslationHelper(), id -> null, builder), - new AreaStopMapper(builder), + new AreaStopMapper(builder, DataImportIssueStore.NOOP), builder ); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java index d96d447ca5e..a68a9682371 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java @@ -1,6 +1,7 @@ package org.opentripplanner.gtfs.mapping; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.opentripplanner.graph_builder.issue.api.DataImportIssueStore.NOOP; import java.util.Set; import java.util.stream.Collectors; @@ -23,7 +24,7 @@ class StopAreaMapperTest { void map() { var stopModel = StopModel.of(); var stopMapper = new StopMapper(new TranslationHelper(), ignored -> null, stopModel); - var locationMapper = new AreaStopMapper(stopModel); + var locationMapper = new AreaStopMapper(stopModel, NOOP); var mapper = new StopAreaMapper(stopMapper, locationMapper, stopModel); var area = new Area(); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java index ebeaccbda6a..413a7f651a2 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java @@ -76,7 +76,10 @@ public class StopTimeMapperTest { stopModelBuilder ); private final BookingRuleMapper bookingRuleMapper = new BookingRuleMapper(); - private final AreaStopMapper areaStopMapper = new AreaStopMapper(stopModelBuilder); + private final AreaStopMapper areaStopMapper = new AreaStopMapper( + stopModelBuilder, + DataImportIssueStore.NOOP + ); private final LocationGroupMapper locationGroupMapper = new LocationGroupMapper( stopMapper, areaStopMapper, diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java index f58355dbd84..bace306745b 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java @@ -46,7 +46,10 @@ public class TransferMapperTest { ); private static final BookingRuleMapper BOOKING_RULE_MAPPER = new BookingRuleMapper(); - private static final AreaStopMapper LOCATION_MAPPER = new AreaStopMapper(STOP_MODEL_BUILDER); + private static final AreaStopMapper LOCATION_MAPPER = new AreaStopMapper( + STOP_MODEL_BUILDER, + ISSUE_STORE + ); private static final LocationGroupMapper LOCATION_GROUP_MAPPER = new LocationGroupMapper( STOP_MAPPER, diff --git a/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java b/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java index b7a772e0cb5..a36b6611368 100644 --- a/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java +++ b/src/test/java/org/opentripplanner/transit/model/site/AreaStopTest.java @@ -4,7 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotSame; import static org.junit.jupiter.api.Assertions.assertSame; -import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; @@ -82,16 +81,4 @@ void sameAs() { subject.sameAs(subject.copy().withGeometry(GeometryUtils.makeLineString(0, 0, 0, 2)).build()) ); } - - @Test - void invalidGeometry() { - var ex = assertThrows( - IllegalArgumentException.class, - () -> areaStopBuilder().withGeometry(Polygons.SELF_INTERSECTING).build() - ); - assertEquals( - "Polygon geometry for AreaStop F:1 is invalid: Self-intersection at (lat: 1.0, lon: 2.0)", - ex.getMessage() - ); - } } From 3ba6c8c51dbe8fd3960d5939fa207530b6770f1a Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 19 Jun 2024 11:20:06 +0200 Subject: [PATCH 1428/1688] Rename back to LocationMapper --- .../gtfs/mapping/GTFSToOtpTransitServiceMapper.java | 12 ++++++------ .../gtfs/mapping/LocationGroupMapper.java | 8 ++++---- .../{AreaStopMapper.java => LocationMapper.java} | 4 ++-- .../opentripplanner/gtfs/mapping/StopAreaMapper.java | 8 ++++---- .../opentripplanner/gtfs/mapping/StopTimeMapper.java | 8 ++++---- .../opentripplanner/transit/model/site/AreaStop.java | 1 - .../gtfs/mapping/LocationGroupMapperTest.java | 2 +- ...eaStopMapperTest.java => LocationMapperTest.java} | 6 +++--- .../gtfs/mapping/StopAreaMapperTest.java | 2 +- .../gtfs/mapping/StopTimeMapperTest.java | 8 ++++---- .../gtfs/mapping/TransferMapperTest.java | 2 +- 11 files changed, 30 insertions(+), 31 deletions(-) rename src/main/java/org/opentripplanner/gtfs/mapping/{AreaStopMapper.java => LocationMapper.java} (96%) rename src/test/java/org/opentripplanner/gtfs/mapping/{AreaStopMapperTest.java => LocationMapperTest.java} (93%) diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java index afbb105aa27..d58410741f9 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/GTFSToOtpTransitServiceMapper.java @@ -38,7 +38,7 @@ public class GTFSToOtpTransitServiceMapper { private final BoardingAreaMapper boardingAreaMapper; - private final AreaStopMapper areaStopMapper; + private final LocationMapper locationMapper; private final LocationGroupMapper locationGroupMapper; @@ -110,11 +110,11 @@ public GTFSToOtpTransitServiceMapper( entranceMapper = new EntranceMapper(translationHelper, stationLookup); pathwayNodeMapper = new PathwayNodeMapper(translationHelper, stationLookup); boardingAreaMapper = new BoardingAreaMapper(translationHelper, stopLookup); - areaStopMapper = new AreaStopMapper(builder.stopModel(), issueStore); - locationGroupMapper = new LocationGroupMapper(stopMapper, areaStopMapper, builder.stopModel()); + locationMapper = new LocationMapper(builder.stopModel(), issueStore); + locationGroupMapper = new LocationGroupMapper(stopMapper, locationMapper, builder.stopModel()); // the use of stop areas were reverted in the spec // this code will go away, please migrate now! - stopAreaMapper = new StopAreaMapper(stopMapper, areaStopMapper, builder.stopModel()); + stopAreaMapper = new StopAreaMapper(stopMapper, locationMapper, builder.stopModel()); pathwayMapper = new PathwayMapper(stopMapper, entranceMapper, pathwayNodeMapper, boardingAreaMapper); routeMapper = new RouteMapper(agencyMapper, issueStore, translationHelper); @@ -124,7 +124,7 @@ public GTFSToOtpTransitServiceMapper( stopTimeMapper = new StopTimeMapper( stopMapper, - areaStopMapper, + locationMapper, locationGroupMapper, stopAreaMapper, tripMapper, @@ -164,7 +164,7 @@ public void mapStopTripAndRouteDataIntoBuilder() { if (OTPFeature.FlexRouting.isOn()) { // Stop areas and Stop groups are only used in FLEX routes - builder.stopModel().withAreaStops(areaStopMapper.map(data.getAllLocations())); + builder.stopModel().withAreaStops(locationMapper.map(data.getAllLocations())); builder.stopModel().withGroupStops(locationGroupMapper.map(data.getAllLocationGroups())); builder.stopModel().withGroupStops(stopAreaMapper.map(data.getAllStopAreas())); } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java index 25193185271..591a59c492e 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/LocationGroupMapper.java @@ -18,18 +18,18 @@ public class LocationGroupMapper { private final StopMapper stopMapper; - private final AreaStopMapper areaStopMapper; + private final LocationMapper locationMapper; private final StopModelBuilder stopModelBuilder; private final Map mappedLocationGroups = new HashMap<>(); public LocationGroupMapper( StopMapper stopMapper, - AreaStopMapper areaStopMapper, + LocationMapper locationMapper, StopModelBuilder stopModelBuilder ) { this.stopMapper = stopMapper; - this.areaStopMapper = areaStopMapper; + this.locationMapper = locationMapper; this.stopModelBuilder = stopModelBuilder; } @@ -54,7 +54,7 @@ private GroupStop doMap(LocationGroup element) { ); switch (location) { case Stop stop -> groupStopBuilder.addLocation(stopMapper.map(stop)); - case Location loc -> groupStopBuilder.addLocation(areaStopMapper.map(loc)); + case Location loc -> groupStopBuilder.addLocation(locationMapper.map(loc)); case LocationGroup ignored -> throw new RuntimeException( "Nested GroupStops are not allowed" ); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java similarity index 96% rename from src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java rename to src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java index b2d66bdb5c4..79a28ac0f61 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/AreaStopMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/LocationMapper.java @@ -18,13 +18,13 @@ import org.opentripplanner.transit.service.StopModelBuilder; /** Responsible for mapping GTFS Location into the OTP model. */ -public class AreaStopMapper { +public class LocationMapper { private final Map mappedLocations = new HashMap<>(); private final StopModelBuilder stopModelBuilder; private final DataImportIssueStore issueStore; - public AreaStopMapper(StopModelBuilder stopModelBuilder, DataImportIssueStore issueStore) { + public LocationMapper(StopModelBuilder stopModelBuilder, DataImportIssueStore issueStore) { this.stopModelBuilder = stopModelBuilder; this.issueStore = issueStore; } diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java index a69a303d913..55c836aa458 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopAreaMapper.java @@ -25,18 +25,18 @@ public class StopAreaMapper { private final StopMapper stopMapper; - private final AreaStopMapper areaStopMapper; + private final LocationMapper locationMapper; private final Map mappedStopAreas = new HashMap<>(); private final StopModelBuilder stopModel; public StopAreaMapper( StopMapper stopMapper, - AreaStopMapper areaStopMapper, + LocationMapper locationMapper, StopModelBuilder stopModel ) { this.stopMapper = stopMapper; - this.areaStopMapper = areaStopMapper; + this.locationMapper = locationMapper; this.stopModel = stopModel; } @@ -57,7 +57,7 @@ private GroupStop doMap(org.onebusaway.gtfs.model.StopArea element) { for (org.onebusaway.gtfs.model.StopLocation location : element.getLocations()) { switch (location) { case Stop stop -> groupStopBuilder.addLocation(stopMapper.map(stop)); - case Location loc -> groupStopBuilder.addLocation(areaStopMapper.map(loc)); + case Location loc -> groupStopBuilder.addLocation(locationMapper.map(loc)); case org.onebusaway.gtfs.model.StopArea ignored -> throw new RuntimeException( "Nested GroupStops are not allowed" ); diff --git a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java index e6b908d9442..67b250c5061 100644 --- a/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java +++ b/src/main/java/org/opentripplanner/gtfs/mapping/StopTimeMapper.java @@ -19,7 +19,7 @@ class StopTimeMapper { private final StopMapper stopMapper; - private final AreaStopMapper areaStopMapper; + private final LocationMapper locationMapper; private final LocationGroupMapper locationGroupMapper; private final StopAreaMapper stopAreaMapper; @@ -33,7 +33,7 @@ class StopTimeMapper { StopTimeMapper( StopMapper stopMapper, - AreaStopMapper areaStopMapper, + LocationMapper locationMapper, LocationGroupMapper locationGroupMapper, StopAreaMapper stopAreaMapper, TripMapper tripMapper, @@ -41,7 +41,7 @@ class StopTimeMapper { TranslationHelper translationHelper ) { this.stopMapper = stopMapper; - this.areaStopMapper = areaStopMapper; + this.locationMapper = locationMapper; this.locationGroupMapper = locationGroupMapper; this.stopAreaMapper = stopAreaMapper; this.tripMapper = tripMapper; @@ -69,7 +69,7 @@ private StopTime doMap(org.onebusaway.gtfs.model.StopTime rhs) { ); switch (stopLocation) { case Stop stop -> lhs.setStop(stopMapper.map(stop)); - case Location location -> lhs.setStop(areaStopMapper.map(location)); + case Location location -> lhs.setStop(locationMapper.map(location)); case LocationGroup locGroup -> lhs.setStop(locationGroupMapper.map(locGroup)); // TODO: only here for backwards compatibility, this will be removed in the future case StopArea area -> lhs.setStop(stopAreaMapper.map(area)); diff --git a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java index 64fafcb58b3..35576e0c42f 100644 --- a/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java +++ b/src/main/java/org/opentripplanner/transit/model/site/AreaStop.java @@ -52,7 +52,6 @@ public class AreaStop this.url = builder.url(); this.zoneId = builder.zoneId(); this.geometry = builder.geometry(); - this.centroid = Objects.requireNonNull(builder.centroid()); } diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java index 20cc574c383..3a3c3f28649 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/LocationGroupMapperTest.java @@ -23,7 +23,7 @@ void map() { var builder = StopModel.of(); var mapper = new LocationGroupMapper( new StopMapper(new TranslationHelper(), id -> null, builder), - new AreaStopMapper(builder, DataImportIssueStore.NOOP), + new LocationMapper(builder, DataImportIssueStore.NOOP), builder ); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java similarity index 93% rename from src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java rename to src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java index a5df87bc4ce..ab8bd66a810 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/AreaStopMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/LocationMapperTest.java @@ -18,7 +18,7 @@ import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore; import org.opentripplanner.transit.service.StopModel; -class AreaStopMapperTest { +class LocationMapperTest { static Stream testCases() { return Stream.of(Arguments.of(null, true), Arguments.of("a name", false)); @@ -29,7 +29,7 @@ static Stream testCases() { void testMapping(String name, boolean isBogusName) { var gtfsLocation = getLocation(name, Polygons.OSLO); - var mapper = new AreaStopMapper(StopModel.of(), DataImportIssueStore.NOOP); + var mapper = new LocationMapper(StopModel.of(), DataImportIssueStore.NOOP); var flexLocation = mapper.map(gtfsLocation); assertEquals(isBogusName, flexLocation.hasFallbackName()); @@ -43,7 +43,7 @@ void invalidPolygon() { var gtfsLocation = getLocation("invalid", selfIntersecting); var issueStore = new DefaultDataImportIssueStore(); - var mapper = new AreaStopMapper(StopModel.of(), issueStore); + var mapper = new LocationMapper(StopModel.of(), issueStore); mapper.map(gtfsLocation); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java index a68a9682371..d58bcfcdd31 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/StopAreaMapperTest.java @@ -24,7 +24,7 @@ class StopAreaMapperTest { void map() { var stopModel = StopModel.of(); var stopMapper = new StopMapper(new TranslationHelper(), ignored -> null, stopModel); - var locationMapper = new AreaStopMapper(stopModel, NOOP); + var locationMapper = new LocationMapper(stopModel, NOOP); var mapper = new StopAreaMapper(stopMapper, locationMapper, stopModel); var area = new Area(); diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java index 413a7f651a2..e45f7a8ff0d 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/StopTimeMapperTest.java @@ -76,24 +76,24 @@ public class StopTimeMapperTest { stopModelBuilder ); private final BookingRuleMapper bookingRuleMapper = new BookingRuleMapper(); - private final AreaStopMapper areaStopMapper = new AreaStopMapper( + private final LocationMapper locationMapper = new LocationMapper( stopModelBuilder, DataImportIssueStore.NOOP ); private final LocationGroupMapper locationGroupMapper = new LocationGroupMapper( stopMapper, - areaStopMapper, + locationMapper, stopModelBuilder ); private final StopAreaMapper stopAreaMapper = new StopAreaMapper( stopMapper, - areaStopMapper, + locationMapper, stopModelBuilder ); private final TranslationHelper translationHelper = new TranslationHelper(); private final StopTimeMapper subject = new StopTimeMapper( stopMapper, - areaStopMapper, + locationMapper, locationGroupMapper, stopAreaMapper, new TripMapper( diff --git a/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java b/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java index bace306745b..3581cca9ac8 100644 --- a/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java +++ b/src/test/java/org/opentripplanner/gtfs/mapping/TransferMapperTest.java @@ -46,7 +46,7 @@ public class TransferMapperTest { ); private static final BookingRuleMapper BOOKING_RULE_MAPPER = new BookingRuleMapper(); - private static final AreaStopMapper LOCATION_MAPPER = new AreaStopMapper( + private static final LocationMapper LOCATION_MAPPER = new LocationMapper( STOP_MODEL_BUILDER, ISSUE_STORE ); From f70c31d383bca32982ff2fa737a2a19e64ba06b8 Mon Sep 17 00:00:00 2001 From: sharhio Date: Wed, 19 Jun 2024 12:33:39 +0300 Subject: [PATCH 1429/1688] import fixed --- .../vehicle_rental/datasources/GbfsGeofencingZoneMapper.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java index 0a79d45d4ee..32d428ee14d 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java @@ -10,6 +10,7 @@ import org.mobilitydata.gbfs.v2_3.geofencing_zones.GBFSGeofencingZones; import org.opentripplanner.framework.geometry.GeometryUtils; import org.opentripplanner.framework.geometry.UnsupportedGeometryException; +import org.opentripplanner.framework.lang.StringUtils; import org.opentripplanner.service.vehiclerental.model.GeofencingZone; import org.opentripplanner.transit.model.framework.FeedScopedId; import org.slf4j.Logger; From 8523e34937a772a2232470a57fd21b0364d872f7 Mon Sep 17 00:00:00 2001 From: sharhio Date: Wed, 19 Jun 2024 13:52:33 +0300 Subject: [PATCH 1430/1688] mapper class, fix name check --- .../apis/gtfs/GtfsGraphQLIndex.java | 2 ++ .../datafetchers/VehicleRentalSystemImpl.java | 18 ++++++++++++++++++ .../gtfs/generated/GraphQLDataFetchers.java | 4 ++++ .../datasources/GbfsGeofencingZoneMapper.java | 2 +- 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java index 9175d3486e1..4f6060a47e0 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java @@ -76,6 +76,7 @@ import org.opentripplanner.apis.gtfs.datafetchers.VehicleParkingImpl; import org.opentripplanner.apis.gtfs.datafetchers.VehiclePositionImpl; import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalStationImpl; +import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalSystemImpl; import org.opentripplanner.apis.gtfs.datafetchers.debugOutputImpl; import org.opentripplanner.apis.gtfs.datafetchers.elevationProfileComponentImpl; import org.opentripplanner.apis.gtfs.datafetchers.placeAtDistanceImpl; @@ -165,6 +166,7 @@ protected static GraphQLSchema buildSchema() { .type(typeWiring.build(BookingTimeImpl.class)) .type(typeWiring.build(BookingInfoImpl.class)) .type(typeWiring.build(VehicleRentalStationImpl.class)) + .type(typeWiring.build(VehicleRentalSystemImpl.class)) .type(typeWiring.build(RentalVehicleImpl.class)) .type(typeWiring.build(RentalVehicleTypeImpl.class)) .type(typeWiring.build(StopOnRouteImpl.class)) diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java new file mode 100644 index 00000000000..7256ab5aaa3 --- /dev/null +++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java @@ -0,0 +1,18 @@ +package org.opentripplanner.apis.gtfs.datafetchers; + +import graphql.schema.DataFetcher; +import graphql.schema.DataFetchingEnvironment; +import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers; +import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem; + +public class VehicleRentalSystemImpl implements GraphQLDataFetchers.GraphQLVehicleRentalSystem { + + @Override + public DataFetcher url() { + return environment -> getSource(environment).url; + } + + private VehicleRentalSystem getSource(DataFetchingEnvironment environment) { + return environment.getSource(); + } +} diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java index c956eddd954..be74354e284 100644 --- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java +++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java @@ -1312,6 +1312,10 @@ public interface GraphQLVehicleRentalStation { public DataFetcher vehiclesAvailable(); } + public interface GraphQLVehicleRentalSystem { + public DataFetcher url(); + } + public interface GraphQLVehicleRentalUris { public DataFetcher android(); diff --git a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java index 32d428ee14d..22a4131f338 100644 --- a/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java +++ b/src/main/java/org/opentripplanner/updater/vehicle_rental/datasources/GbfsGeofencingZoneMapper.java @@ -53,7 +53,7 @@ private GeofencingZone toInternalModel(GBFSFeature f) { return null; } var name = Objects.requireNonNullElseGet(f.getProperties().getName(), () -> fallbackId(g)); - if (StringUtils.hasValue(name)) { + if (!StringUtils.hasValue(name)) { name = fallbackId(g); } var dropOffBanned = !f.getProperties().getRules().get(0).getRideAllowed(); From 597ed9057ee67a1e637a9ee9def008d1f94a7c4b Mon Sep 17 00:00:00 2001 From: Leonard Ehrenfried Date: Wed, 19 Jun 2024 13:18:35 +0200 Subject: [PATCH 1431/1688] Keep container image snapshots for 90 days [ci skip] --- .github/workflows/prune-container-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/prune-container-images.yml b/.github/workflows/prune-container-images.yml index c1653701c3b..f3987a064a9 100644 --- a/.github/workflows/prune-container-images.yml +++ b/.github/workflows/prune-container-images.yml @@ -19,4 +19,4 @@ jobs: # remove all snapshot container images that have not been pulled for over a year # --keep-semver makes sure that any image with a x.y.z version scheme is unaffected by this pip install prune-container-repo==0.0.4 - prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=365 --keep-semver --activate + prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=90 --keep-semver --activate From 960f2439a51fb7596fa0f3699158e2e10a9e3fc4 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 19 Jun 2024 13:55:34 +0200 Subject: [PATCH 1432/1688] Add OTPFeature MultiCriteriaGroupMaxFilter - turn on/off This is default off, witch make OTP work as before. We will remove the old behavior and this OTPFeature if the new multi-criteria filter works as expected. --- docs/Configuration.md | 61 ++++++++++--------- .../framework/application/OTPFeature.java | 8 +++ 2 files changed, 39 insertions(+), 30 deletions(-) diff --git a/docs/Configuration.md b/docs/Configuration.md index 05611e23628..71048f08f82 100644 --- a/docs/Configuration.md +++ b/docs/Configuration.md @@ -219,36 +219,37 @@ Here is a list of all features which can be toggled on/off and their default val -| Feature | Description | Enabled by default | Sandbox | -|--------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------------:|:-------:| -| `APIBikeRental` | Enable the bike rental endpoint. | ✓️ | | -| `APIServerInfo` | Enable the server info endpoint. | ✓️ | | -| `APIUpdaterStatus` | Enable endpoint for graph updaters status. | ✓️ | | -| `ConsiderPatternsForDirectTransfers` | Enable limiting transfers so that there is only a single transfer to each pattern. | ✓️ | | -| `DebugUi` | Enable the debug GraphQL client and web UI and located at the root of the web server as well as the debug map tiles it uses. Be aware that the map tiles are not a stable API and can change without notice. Use the [vector tiles feature if](sandbox/MapboxVectorTilesApi.md) you want a stable map tiles API. | ✓️ | | -| `FloatingBike` | Enable floating bike routing. | ✓️ | | -| `GtfsGraphQlApi` | Enable the [GTFS GraphQL API](apis/GTFS-GraphQL-API.md). | ✓️ | | -| `GtfsGraphQlApiRentalStationFuzzyMatching` | Does vehicleRentalStation query also allow ids that are not feed scoped. | | | -| `MinimumTransferTimeIsDefinitive` | If the minimum transfer time is a lower bound (default) or the definitive time for the transfer. Set this to `true` if you want to set a transfer time lower than what OTP derives from OSM data. | | | -| `OptimizeTransfers` | OTP will inspect all itineraries found and optimize where (which stops) the transfer will happen. Waiting time, priority and guaranteed transfers are taken into account. | ✓️ | | -| `ParallelRouting` | Enable performing parts of the trip planning in parallel. | | | -| `TransferConstraints` | Enforce transfers to happen according to the _transfers.txt_ (GTFS) and Interchanges (NeTEx). Turning this _off_ will increase the routing performance a little. | ✓️ | | -| `TransmodelGraphQlApi` | Enable the [Transmodel (NeTEx) GraphQL API](apis/TransmodelApi.md). | ✓️ | ✓️ | -| `ActuatorAPI` | Endpoint for actuators (service health status). | | ✓️ | -| `AsyncGraphQLFetchers` | Whether the @async annotation in the GraphQL schema should lead to the fetch being executed asynchronously. This allows batch or alias queries to run in parallel at the cost of consuming extra threads. | | | -| `Co2Emissions` | Enable the emissions sandbox module. | | ✓️ | -| `DataOverlay` | Enable usage of data overlay when calculating costs for the street network. | | ✓️ | -| `FaresV2` | Enable import of GTFS-Fares v2 data. | | ✓️ | -| `FlexRouting` | Enable FLEX routing. | | ✓️ | -| `GoogleCloudStorage` | Enable Google Cloud Storage integration. | | ✓️ | -| `LegacyRestApi` | Enable legacy REST API. This API will be removed in the future. | ✓️ | ✓️ | -| `RealtimeResolver` | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data | | ✓️ | -| `ReportApi` | Enable the report API. | | ✓️ | -| `RestAPIPassInDefaultConfigAsJson` | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY! | | | -| `SandboxAPIGeocoder` | Enable the Geocoder API. | | ✓️ | -| `SandboxAPIMapboxVectorTilesApi` | Enable Mapbox vector tiles API. | | ✓️ | -| `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ | -| `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ | +| Feature | Description | Enabled by default | Sandbox | +|--------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:------------------:|:-------:| +| `APIBikeRental` | Enable the bike rental endpoint. | ✓️ | | +| `APIServerInfo` | Enable the server info endpoint. | ✓️ | | +| `APIUpdaterStatus` | Enable endpoint for graph updaters status. | ✓️ | | +| `ConsiderPatternsForDirectTransfers` | Enable limiting transfers so that there is only a single transfer to each pattern. | ✓️ | | +| `DebugUi` | Enable the debug GraphQL client and web UI and located at the root of the web server as well as the debug map tiles it uses. Be aware that the map tiles are not a stable API and can change without notice. Use the [vector tiles feature if](sandbox/MapboxVectorTilesApi.md) you want a stable map tiles API. | ✓️ | | +| `FloatingBike` | Enable floating bike routing. | ✓️ | | +| `GtfsGraphQlApi` | Enable the [GTFS GraphQL API](apis/GTFS-GraphQL-API.md). | ✓️ | | +| `GtfsGraphQlApiRentalStationFuzzyMatching` | Does vehicleRentalStation query also allow ids that are not feed scoped. | | | +| `MinimumTransferTimeIsDefinitive` | If the minimum transfer time is a lower bound (default) or the definitive time for the transfer. Set this to `true` if you want to set a transfer time lower than what OTP derives from OSM data. | | | +| `OptimizeTransfers` | OTP will inspect all itineraries found and optimize where (which stops) the transfer will happen. Waiting time, priority and guaranteed transfers are taken into account. | ✓️ | | +| `ParallelRouting` | Enable performing parts of the trip planning in parallel. | | | +| `TransferConstraints` | Enforce transfers to happen according to the _transfers.txt_ (GTFS) and Interchanges (NeTEx). Turning this _off_ will increase the routing performance a little. | ✓️ | | +| `TransmodelGraphQlApi` | Enable the [Transmodel (NeTEx) GraphQL API](apis/TransmodelApi.md). | ✓️ | ✓️ | +| `ActuatorAPI` | Endpoint for actuators (service health status). | | ✓️ | +| `AsyncGraphQLFetchers` | Whether the @async annotation in the GraphQL schema should lead to the fetch being executed asynchronously. This allows batch or alias queries to run in parallel at the cost of consuming extra threads. | | | +| `Co2Emissions` | Enable the emissions sandbox module. | | ✓️ | +| `DataOverlay` | Enable usage of data overlay when calculating costs for the street network. | | ✓️ | +| `FaresV2` | Enable import of GTFS-Fares v2 data. | | ✓️ | +| `FlexRouting` | Enable FLEX routing. | | ✓️ | +| `GoogleCloudStorage` | Enable Google Cloud Storage integration. | | ✓️ | +| `LegacyRestApi` | Enable legacy REST API. This API will be removed in the future. | ✓️ | ✓️ | +| `MultiCriteriaGroupMaxFilter` | Keep the best itinerary with respect to each criteria used in the transit-routing search. For example the itinerary with the lowest cost, fewest transfers, and each unique transit-group (transit-group-priority) is kept, even if the max-limit is exceeded. This is turned off by default for now, until this feature is well tested. | | | +| `RealtimeResolver` | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data | | ✓️ | +| `ReportApi` | Enable the report API. | | ✓️ | +| `RestAPIPassInDefaultConfigAsJson` | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY! | | | +| `SandboxAPIGeocoder` | Enable the Geocoder API. | | ✓️ | +| `SandboxAPIMapboxVectorTilesApi` | Enable Mapbox vector tiles API. | | ✓️ | +| `SandboxAPIParkAndRideApi` | Enable park-and-ride endpoint. | | ✓️ | +| `TransferAnalyzer` | Analyze transfers during graph build. | | ✓️ | diff --git a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java index 29489de19f2..accbf4041f2 100644 --- a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java +++ b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java @@ -90,6 +90,14 @@ public enum OTPFeature { FlexRouting(false, true, "Enable FLEX routing."), GoogleCloudStorage(false, true, "Enable Google Cloud Storage integration."), LegacyRestApi(true, true, "Enable legacy REST API. This API will be removed in the future."), + MultiCriteriaGroupMaxFilter( + false, + false, + "Keep the best itinerary with respect to each criteria used in the transit-routing search. " + + "For example the itinerary with the lowest cost, fewest transfers, and each unique transit-group " + + "(transit-group-priority) is kept, even if the max-limit is exceeded. This is turned off by default " + + "for now, until this feature is well tested." + ), RealtimeResolver( false, true, From 78c4a17669b3eb12dcf3f75f4c098dc436887587 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 19 Jun 2024 14:00:06 +0200 Subject: [PATCH 1433/1688] refactor: rename package mcmin to mcmax --- .../system/{mcmin => mcmax}/Group.java | 3 +-- .../filters/system/{mcmin => mcmax}/Item.java | 2 +- .../McMinimumNumberItineraryFilter.java | 2 +- .../system/{mcmin => mcmax}/State.java | 21 ++++++++++++++----- .../system/{mcmin => mcmax}/ItemTest.java | 2 +- .../McMinimumNumberItineraryFilterTest.java | 20 +++++++++--------- 6 files changed, 30 insertions(+), 20 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{mcmin => mcmax}/Group.java (98%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{mcmin => mcmax}/Item.java (98%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{mcmin => mcmax}/McMinimumNumberItineraryFilter.java (99%) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{mcmin => mcmax}/State.java (93%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{mcmin => mcmax}/ItemTest.java (99%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{mcmin => mcmax}/McMinimumNumberItineraryFilterTest.java (95%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Group.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Group.java similarity index 98% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Group.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Group.java index 0f231517ae3..7bfdad83e8f 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Group.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Group.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax; import java.util.ArrayList; import java.util.Iterator; @@ -25,7 +25,6 @@ boolean isEmpty() { return items.isEmpty(); } - boolean isSingleItemGroup() { return items.size() == 1; } diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Item.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Item.java similarity index 98% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Item.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Item.java index 58898f2ee63..36c3d662493 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/Item.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/Item.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax; import org.opentripplanner.model.plan.Itinerary; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilter.java similarity index 99% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilter.java index b1e7b857c3b..da8d6fa1c66 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilter.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax; import java.util.List; import java.util.function.Predicate; diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/State.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java similarity index 93% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/State.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java index acce6a963f4..d616c505446 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/State.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax; import java.util.ArrayList; import java.util.Collection; @@ -12,6 +12,7 @@ * simple bookkeeping for the state of the filter. */ class State { + private final List items; private final List groups; private final List result = new ArrayList<>(); @@ -86,7 +87,6 @@ private void removeGroupsWitchContainsItem(Item item) { groups.removeIf(Group::isEmpty); } - /** * The best item is the one witch exists in most groups, and in case of a tie, the sort order/ * itinerary index is used. @@ -108,7 +108,12 @@ private static Item findBestItem(List groups) { */ @Nullable private static Item findItemInFirstSingleItemGroup(List groups) { - return groups.stream().filter(Group::isSingleItemGroup).findFirst().map(Group::first).orElse(null); + return groups + .stream() + .filter(Group::isSingleItemGroup) + .findFirst() + .map(Group::first) + .orElse(null); } private static ArrayList createListOfItems(List itineraries) { @@ -119,7 +124,10 @@ private static ArrayList createListOfItems(List itineraries) { return items; } - private static List createGroups(Collection items, List comparators) { + private static List createGroups( + Collection items, + List comparators + ) { List groups = new ArrayList<>(); for (SingeCriteriaComparator comparator : comparators) { if (comparator.strictOrder()) { @@ -135,7 +143,10 @@ private static List createGroups(Collection items, List items, SingeCriteriaComparator comparator) { + private static Group createOrderedGroup( + Collection items, + SingeCriteriaComparator comparator + ) { Group group = null; for (Item item : items) { if (group == null) { diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/ItemTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/ItemTest.java similarity index 99% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/ItemTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/ItemTest.java index fbb2f5dea57..c8cd04212e5 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/ItemTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/ItemTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilterTest.java similarity index 95% rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilterTest.java rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilterTest.java index 8d3d03cb857..e094e53cd03 100644 --- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmin/McMinimumNumberItineraryFilterTest.java +++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilterTest.java @@ -1,4 +1,4 @@ -package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmin; +package org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary; @@ -153,10 +153,10 @@ private static String toStr(List list) { .stream() .map(i -> "[ %d %d %s ]".formatted( - i.getGeneralizedCost(), - i.getNumberOfTransfers(), - groupsToString(i.getGeneralizedCost2().orElse(-1)) - ) + i.getGeneralizedCost(), + i.getNumberOfTransfers(), + groupsToString(i.getGeneralizedCost2().orElse(-1)) + ) ) .collect(Collectors.joining(", ")); } @@ -182,11 +182,11 @@ Itinerary create() { public String toString() { // The red-x is a unicode character(U+274C) and should be visible in most IDEs. return "%s %d %d %s".formatted( - expected ? "" : "❌", - c1, - nTransfers, - groupsToString(transitGroupIds) - ); + expected ? "" : "❌", + c1, + nTransfers, + groupsToString(transitGroupIds) + ); } } } From 04574fa9f9a2fa28cc1a310687d3e77a43e765b5 Mon Sep 17 00:00:00 2001 From: Thomas Gran Date: Wed, 19 Jun 2024 14:12:20 +0200 Subject: [PATCH 1434/1688] refactor: rename McMinimumNumberItineraryFilter to McMaxLimitFilter --- ...eraryFilter.java => McMaxLimitFilter.java} | 25 +++++++++++-------- ...terTest.java => McMaxLimitFilterTest.java} | 6 ++--- 2 files changed, 17 insertions(+), 14 deletions(-) rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/{McMinimumNumberItineraryFilter.java => McMaxLimitFilter.java} (80%) rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/{McMinimumNumberItineraryFilterTest.java => McMaxLimitFilterTest.java} (96%) diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java similarity index 80% rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilter.java rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java index da8d6fa1c66..180ef979085 100644 --- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilter.java +++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java @@ -8,15 +8,15 @@ /** * This filter is used to reduce a set of itineraries down to the specified limit, if possible. - * The filter is guaranteed to keep at least the given {@code minNumItineraries} and also - * the best itinerary for each criterion. The criterion is defined using the list of - * {@code comparators}. + * The filter is guaranteed to keep at least the given {@code minNumItineraries} and/or the best + * itinerary for each criterion. The criterion is defined using the list of {@code comparators}. *

              - * The main usage of this filter is to combine it with a grouping filter and for each group + * The main usage of this filter is to combine it with a transit grouping filter and for each group * make sure there is at least {@code minNumItineraries} and that the best itinerary with respect * to each criterion is kept. So, if the grouping is based on time and riding common trips, then * this filter will use the reminding criterion (transfers, generalized-cost, - * [transit-group-priority]) to filter the grouped set of itineraries. + * [transit-group-priority]) to filter the grouped set of itineraries. DO NOT INCLUDE CRITERIA + * USED TO GROUP THE ITINERARIES, ONLY THE REMINDING CRITERION USED IN THE RAPTOR SEARCH. *

              * IMPLEMENTATION DETAILS *

              @@ -31,11 +31,14 @@ *

              * Note! For a criteria like num-of-transfers or generalized-cost, there is only one set of "best" * itineraries, and usually there are only one or a few itineraries. In case there is more than one, - * picking just one is fine. But, for transit-group-priority there might be more than on set of - * itineraries. For each set, we need to pick one itinerary for the final result. Each of these - * sets may or may not have more than one itinerary. + * picking just one is fine. But, for transit-group-priority there might be more than one optimal + * set of itineraries. For each set, we need to pick one itinerary for the final result. Each of + * these sets may or may not have more than one itinerary. If you group by agency, then there will + * be at least one itinerary for each agency present in the result (simplified, an itinerary may + * consist of legs with different agencies). The transit-group-priority pareto-function used by + * Raptor is reused, so we do not need to worry about the logic here. *

              - * Let's discuss an example: + * Let's discuss an example (this example also exists as a unit-test case): * 

                *   minNumItineraries = 4
  *   comparators = [ generalized-cost, min-num-transfers, transit-group-priority ]
@@ -63,13 +66,13 @@
  * The `minNumItineraries` limit is not met, so we need to pick another itinerary, we use the
  * sort-order again and add itinerary #0. The result returned is: [#0, #2, #4, #5]
  */
-public class McMinimumNumberItineraryFilter implements RemoveItineraryFlagger {
+public class McMaxLimitFilter implements RemoveItineraryFlagger {
 
   private final String name;
   private final int minNumItineraries;
   private final List comparators;
 
-  public McMinimumNumberItineraryFilter(
+  public McMaxLimitFilter(
     String name,
     int minNumItineraries,
     List comparators
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
similarity index 96%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilterTest.java
rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
index e094e53cd03..14d0fe62337 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMinimumNumberItineraryFilterTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
@@ -14,7 +14,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 
-class McMinimumNumberItineraryFilterTest {
+class McMaxLimitFilterTest {
 
   private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of();
 
@@ -44,7 +44,7 @@ class McMinimumNumberItineraryFilterTest {
   private static final int TX_1 = 1;
   private static final int TX_2 = 2;
 
-  private final McMinimumNumberItineraryFilter subject = new McMinimumNumberItineraryFilter(
+  private final McMaxLimitFilter subject = new McMaxLimitFilter(
     "test",
     2,
     List.of(
@@ -91,7 +91,7 @@ static List> filterTestCases() {
         row(EXP_KEEP, COST_MED, TX_0, GROUP_BC, "Best: num-of-transfers")
       ),
       /**
-       * This is the example explained in JavaDoc {@link McMinimumNumberItineraryFilter}
+       * This is the example explained in JavaDoc {@link McMaxLimitFilter}
        */
       List.of(
         row(EXP_DROP, COST_LOW, TX_1, GROUP_A, ""),

From ef6ff0edbcba690bae9ce935f7fde75c3f88248e Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 19 Jun 2024 14:17:31 +0200
Subject: [PATCH 1435/1688] feature: Integrate McMaxLimitFilter in
 ItineraryListFilterChain

---
 .../ItineraryListFilterChainBuilder.java      | 36 ++++++++++++++++---
 .../system/SingeCriteriaComparator.java       |  2 +-
 .../RouteRequestToFilterChainMapper.java      |  4 +++
 .../system/SingeCriteriaComparatorTest.java   |  4 +--
 .../system/mcmax/McMaxLimitFilterTest.java    |  2 +-
 5 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
index e8b8ed43c1c..84f3030b09f 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
@@ -12,6 +12,7 @@
 import java.util.function.Function;
 import javax.annotation.Nullable;
 import org.opentripplanner.ext.accessibilityscore.DecorateWithAccessibilityScore;
+import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.framework.collection.ListSection;
 import org.opentripplanner.framework.lang.Sandbox;
 import org.opentripplanner.model.plan.Itinerary;
@@ -27,6 +28,8 @@
 import org.opentripplanner.routing.algorithm.filterchain.filters.system.NumItinerariesFilter;
 import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter;
 import org.opentripplanner.routing.algorithm.filterchain.filters.system.PagingFilter;
+import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator;
+import org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax.McMaxLimitFilter;
 import org.opentripplanner.routing.algorithm.filterchain.filters.transit.DecorateTransitAlert;
 import org.opentripplanner.routing.algorithm.filterchain.filters.transit.KeepItinerariesWithFewestTransfers;
 import org.opentripplanner.routing.algorithm.filterchain.filters.transit.RemoveItinerariesWithShortStreetLeg;
@@ -64,7 +67,6 @@ public class ItineraryListFilterChainBuilder {
   private static final int NOT_SET = -1;
   private final SortOrder sortOrder;
   private final List groupBySimilarity = new ArrayList<>();
-
   private ItineraryFilterDebugProfile debug = ItineraryFilterDebugProfile.OFF;
   private int maxNumberOfItineraries = NOT_SET;
   private ListSection maxNumberOfItinerariesCropSection = ListSection.TAIL;
@@ -86,6 +88,7 @@ public class ItineraryListFilterChainBuilder {
   private double minBikeParkingDistance;
   private boolean removeTransitIfWalkingIsBetter = true;
   private ItinerarySortKey itineraryPageCut;
+  private boolean transitGroupPriorityUsed = false;
 
   /**
    * Sandbox filters which decorate the itineraries with extra information.
@@ -292,6 +295,15 @@ public ItineraryListFilterChainBuilder withPagingDeduplicationFilter(
     return this;
   }
 
+  /**
+   * Adjust filters to include multi-criteria parameter c2 and treat it as the
+   * transit-group.
+   */
+  public ItineraryListFilterChainBuilder withTransitGroupPriority() {
+    this.transitGroupPriorityUsed = true;
+    return this;
+  }
+
   /**
    * If set, walk-all-the-way itineraries are removed. This happens AFTER e.g. the group-by and
    * remove-transit-with-higher-cost-than-best-on-street-only filter. This make sure that poor
@@ -531,7 +543,7 @@ private ItineraryListFilter buildGroupBySameRoutesAndStopsFilter() {
       GroupBySameRoutesAndStops::new,
       List.of(
         new SortingFilter(SortOrderComparator.comparator(sortOrder)),
-        new RemoveFilter(new MaxLimit(GroupBySameRoutesAndStops.TAG, 1))
+        new RemoveFilter(createMaxLimitFilter(GroupBySameRoutesAndStops.TAG, 1))
       )
     );
   }
@@ -574,7 +586,7 @@ private List buildGroupByTripIdAndDistanceFilters() {
             GroupByAllSameStations::new,
             List.of(
               new SortingFilter(generalizedCostComparator()),
-              new RemoveFilter(new MaxLimit(innerGroupName, 1))
+              new RemoveFilter(createMaxLimitFilter(innerGroupName, 1))
             )
           )
         );
@@ -587,7 +599,7 @@ private List buildGroupByTripIdAndDistanceFilters() {
       }
 
       addSort(nested, generalizedCostComparator());
-      addRemoveFilter(nested, new MaxLimit(tag, group.maxNumOfItinerariesPerGroup));
+      addRemoveFilter(nested, createMaxLimitFilter(tag, group.maxNumOfItinerariesPerGroup));
 
       nested.add(new KeepItinerariesWithFewestTransfers(sysTags));
 
@@ -620,4 +632,20 @@ private static void addDecorateFilter(
   ) {
     filters.add(new DecorateFilter(decorator));
   }
+
+  private RemoveItineraryFlagger createMaxLimitFilter(String filterName, int maxLimit) {
+    if (OTPFeature.MultiCriteriaGroupMaxFilter.isOn()) {
+      List comparators = new ArrayList<>();
+      comparators.add(SingeCriteriaComparator.compareGeneralizedCost());
+      comparators.add(SingeCriteriaComparator.compareNumTransfers());
+      if (transitGroupPriorityUsed) {
+        comparators.add(SingeCriteriaComparator.compareTransitGroupsPriority());
+      }
+      return new McMaxLimitFilter(filterName, maxLimit, comparators);
+    }
+    // Default is to just use a "hard" max limit
+    else {
+      return new MaxLimit(filterName, maxLimit);
+    }
+  }
 }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
index aa876d5bcdc..528542d40df 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
@@ -44,7 +44,7 @@ static SingeCriteriaComparator compareGeneralizedCost() {
   }
 
   @SuppressWarnings("OptionalGetWithoutIsPresent")
-  static SingeCriteriaComparator compareTransitPriorityGroups() {
+  static SingeCriteriaComparator compareTransitGroupsPriority() {
     return (left, right) ->
       TransitGroupPriority32n.dominate(
         left.getGeneralizedCost2().get(),
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java
index 651d94b4eac..c1fab68f999 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/mapping/RouteRequestToFilterChainMapper.java
@@ -94,6 +94,10 @@ public static ItineraryListFilterChain createFilterChain(
       .withRemoveTransitIfWalkingIsBetter(true)
       .withDebugEnabled(params.debug());
 
+    if (!request.preferences().transit().relaxTransitGroupPriority().isNormal()) {
+      builder.withTransitGroupPriority();
+    }
+
     var fareService = context.graph().getFareService();
     if (fareService != null) {
       builder.withFareDecorator(new DecorateWithFare(fareService));
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
index 5435a8864c7..8f4b2b4ddeb 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
@@ -57,7 +57,7 @@ static void setUp() {
   void strictOrder() {
     assertTrue(SingeCriteriaComparator.compareNumTransfers().strictOrder());
     assertTrue(SingeCriteriaComparator.compareGeneralizedCost().strictOrder());
-    assertFalse(SingeCriteriaComparator.compareTransitPriorityGroups().strictOrder());
+    assertFalse(SingeCriteriaComparator.compareTransitGroupsPriority().strictOrder());
   }
 
   @Test
@@ -99,7 +99,7 @@ void compareTransitPriorityGroups() {
       .withGeneralizedCost2(TransitGroupPriority32n.mergeInGroupId(1, 2))
       .build();
 
-    var subject = SingeCriteriaComparator.compareTransitPriorityGroups();
+    var subject = SingeCriteriaComparator.compareTransitGroupsPriority();
 
     assertTrue(subject.leftDominanceExist(group1, group2));
     assertTrue(subject.leftDominanceExist(group2, group1));
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
index 14d0fe62337..3c35b0172f8 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
@@ -50,7 +50,7 @@ class McMaxLimitFilterTest {
     List.of(
       SingeCriteriaComparator.compareGeneralizedCost(),
       SingeCriteriaComparator.compareNumTransfers(),
-      SingeCriteriaComparator.compareTransitPriorityGroups()
+      SingeCriteriaComparator.compareTransitGroupsPriority()
     )
   );
 

From 9be3805bee51b5ab2494f64d9fe23ea233df1de3 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 19 Jun 2024 16:32:05 +0200
Subject: [PATCH 1436/1688] Apply review suggestions

---
 src/main/resources/Message.properties    | 3 ++-
 src/main/resources/Message_de.properties | 3 ++-
 src/main/resources/Message_es.properties | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/Message.properties b/src/main/resources/Message.properties
index 931b25c8b3b..eafca543bd4 100644
--- a/src/main/resources/Message.properties
+++ b/src/main/resources/Message.properties
@@ -8,7 +8,8 @@ SYSTEM_ERROR = We're sorry. The trip planner is temporarily unavailable. Please
 GRAPH_UNAVAILABLE = We're sorry. The trip planner is temporarily unavailable. Please try again later.
 
 OUTSIDE_BOUNDS            = Trip is not possible. You might be trying to plan a trip outside the map data boundary.
-UNPROCESSABLE_REQUEST        = The trip planner is taking too long time or too much resources to process your request.
+UNPROCESSABLE_REQUEST        = The trip planner is taking too long time or consuming too many resources to process your request.
+
 BOGUS_PARAMETER           = The request has errors that the server is not willing or able to process.
 LOCATION_NOT_ACCESSIBLE   = The location was found, but no stops could be found within the search radius.
 PATH_NOT_FOUND            = No trip found. There may be no transit service within the maximum specified distance or at the specified time, or your start or end point might not be safely accessible.
diff --git a/src/main/resources/Message_de.properties b/src/main/resources/Message_de.properties
index 6862a993c71..7bace521ee8 100644
--- a/src/main/resources/Message_de.properties
+++ b/src/main/resources/Message_de.properties
@@ -2,7 +2,8 @@ PLAN_OK      = Success
 SYSTEM_ERROR = Es tut uns leid, leider steht der Trip-Planer momentan nicht zur Verfügung. Bitte versuchen Sie es zu einem späteren Zeitpunkt nochmal.
 
 OUTSIDE_BOUNDS   = Planung nicht möglich. Vielleicht versuchen sie einen Plan außerhalb der Kartengrenzen zu planen.
-UNPROCESSABLE_REQUEST  = Der Trip-Planner braucht zu lange um die Anfrage zu bearbeiten
+UNPROCESSABLE_REQUEST  = Der Trip-Planner braucht zu lange oder verbraucht zu viele Ressourcen, um die Anfrage zu bearbeiten
+
 BOGUS_PARAMETER  = Die Anfrage ist fehlerhaft so dass sie der Server nicht bearbeiten möchte oder kann.
 PATH_NOT_FOUND   = Planung nicht möglich. Ihr Start- oder Endpunkt könnte nicht erreichbar sein. Bitte stellen sie sicher, dass ihre Anfrage innerhalb der Kartendaten ist.
 NO_TRANSIT_TIMES = Keine Fahrzeiten verfügbar. Das Datum kann zu weit in der Vergangenheit oder zu weit in der Zukunft liegen oder es gibt keinen Verkehrsbetrieb zu dem von Ihnen gewählten Zeitpunkt.
diff --git a/src/main/resources/Message_es.properties b/src/main/resources/Message_es.properties
index 88b7c849acb..1cdf7980252 100644
--- a/src/main/resources/Message_es.properties
+++ b/src/main/resources/Message_es.properties
@@ -8,7 +8,8 @@ SYSTEM_ERROR = ES-We're sorry. The trip planner is temporarily unavailable. Plea
 GRAPH_UNAVAILABLE = ES-We're sorry. The trip planner is temporarily unavailable. Please try again later.
 
 OUTSIDE_BOUNDS            = ES-los trip is not possible. You might be trying to plan a trip outside the map data boundary.
-UNPROCESSABLE_REQUEST           = ES-los trip planner is taking too long time or too much resources to process your request.
+UNPROCESSABLE_REQUEST           = ES-los trip planner is taking too long time or consuming many resources to process your request.
+
 BOGUS_PARAMETER           = ES-los request has errors that the server is not willing or able to process.
 PATH_NOT_FOUND            = ES-los trip is not possible.  Please check that you plan is within the bound of the map.
 NO_TRANSIT_TIMES          = ES-Non transit times available. The date may be past or too far in the future or there may not be transit service for your trip at the time you chose.

From 52c2c555b39b063440b78f59eee4d7182f628c0a Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 19 Jun 2024 17:09:36 +0200
Subject: [PATCH 1437/1688] Apply code review feedback

---
 .../transmodel/model/plan/TripPlanTimePenaltyDto.java  | 10 +++++-----
 .../request/framework/TimeAndCostPenaltyForEnum.java   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
index b834b711327..9217ed5b437 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import org.opentripplanner.framework.model.TimeAndCost;
 import org.opentripplanner.model.plan.Itinerary;
 
@@ -13,17 +14,16 @@
  */
 public record TripPlanTimePenaltyDto(String appliesTo, TimeAndCost penalty) {
   static List of(Itinerary itinerary) {
-    // This check for null to be robust - in case of a mistake in the future.
-    // The check is redundant on purpose.
-    if (itinerary == null) {
-      return List.of();
-    }
     return Stream
       .of(of("access", itinerary.getAccessPenalty()), of("egress", itinerary.getEgressPenalty()))
       .filter(Objects::nonNull)
       .toList();
   }
 
+   /**
+    * Package local to be unit-testable.
+    */
+  @Nullable
   static TripPlanTimePenaltyDto of(String appliedTo, TimeAndCost penalty) {
     return penalty == null || penalty.isZero()
       ? null
diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java b/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java
index c45fc3e33a8..2f439801cb5 100644
--- a/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java
+++ b/src/main/java/org/opentripplanner/routing/api/request/framework/TimeAndCostPenaltyForEnum.java
@@ -112,7 +112,7 @@ public static class Builder> {
     private final TimeAndCostPenaltyForEnum original;
     private final EnumMap values;
 
-    Builder(TimeAndCostPenaltyForEnum original) {
+    private Builder(TimeAndCostPenaltyForEnum original) {
       this.original = original;
       this.values = original.copyValues();
     }

From 94c19f5f135647db2db6a0dbd7cb224d8ea2899c Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 19 Jun 2024 17:20:17 +0200
Subject: [PATCH 1438/1688] Code review: Cleanup naming in Transmodel API

---
 .../model/plan/TripPatternTimePenaltyType.java | 18 +++++++++---------
 .../model/plan/TripPlanTimePenaltyDto.java     |  6 +++---
 .../apis/transmodel/schema.graphql             | 18 +++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java
index 1a6e7310697..744113929c7 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPatternTimePenaltyType.java
@@ -11,11 +11,11 @@ public class TripPatternTimePenaltyType {
   public static GraphQLObjectType create() {
     return GraphQLObjectType
       .newObject()
-      .name("TimePenalty")
+      .name("TimePenaltyWithCost")
       .description(
         """
         The time-penalty is applied to either the access-legs and/or egress-legs. Both access and
-        egress may contain more than one leg; Hence, the penalty is not a field on leg. 
+        egress may contain more than one leg; Hence, the penalty is not a field on leg.
         
         Note! This is for debugging only. This type can change without notice.
         """
@@ -55,15 +55,15 @@ public static GraphQLObjectType create() {
       .field(
         GraphQLFieldDefinition
           .newFieldDefinition()
-          .name("generalizedCostPenalty")
+          .name("generalizedCostDelta")
           .description(
             """
-            The time-penalty does also propagate to the `generalizedCost` But, while the
-            arrival-/departure-times listed is not affected, the generalized-cost is. In some cases
-            the time-penalty-cost is excluded when comparing itineraries - that happens if one of 
-            the itineraries is a "direct/street-only" itinerary. Time-penalty can not be set for 
-            direct searches, so it needs to be excluded from such comparison to be fair. The unit
-            is transit-seconds.
+            The time-penalty does also propagate to the `generalizedCost`. As a result of the given
+            time-penalty, the generalized-cost also increased by the given amount. This delta is
+            included in the itinerary generalized-cost. In some cases the generalized-cost-delta is
+            excluded when comparing itineraries - that happens if one of the itineraries is a
+            "direct/street-only" itinerary. Time-penalty can not be set for direct searches, so it
+            needs to be excluded from such comparison to be fair. The unit is transit-seconds.
             """
           )
           .type(Scalars.GraphQLInt)
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
index 9217ed5b437..0e83384157f 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDto.java
@@ -20,9 +20,9 @@ static List of(Itinerary itinerary) {
       .toList();
   }
 
-   /**
-    * Package local to be unit-testable.
-    */
+  /**
+   * Package local to be unit-testable.
+   */
   @Nullable
   static TripPlanTimePenaltyDto of(String appliedTo, TimeAndCost penalty) {
     return penalty == null || penalty.isZero()
diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
index b521a5f6ff0..5c1912df4e6 100644
--- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
+++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -1221,7 +1221,7 @@ egress may contain more than one leg; Hence, the penalty is not a field on leg.
 
 Note! This is for debugging only. This type can change without notice.
 """
-type TimePenalty {
+type TimePenaltyWithCost {
   """
   The time-penalty is applied to either the access-legs and/or egress-legs. Both access
   and egress may contain more than one leg; Hence, the penalty is not a field on leg. The
@@ -1229,14 +1229,14 @@ type TimePenalty {
   """
   appliedTo: String
   """
-  The time-penalty does also propagate to the `generalizedCost` But, while the
-  arrival-/departure-times listed is not affected, the generalized-cost is. In some cases
-  the time-penalty-cost is excluded when comparing itineraries - that happens if one of
-  the itineraries is a "direct/street-only" itinerary. Time-penalty can not be set for
-  direct searches, so it needs to be excluded from such comparison to be fair. The unit
-  is transit-seconds.
+  The time-penalty does also propagate to the `generalizedCost`. As a result of the given
+  time-penalty, the generalized-cost also increased by the given amount. This delta is
+  included in the itinerary generalized-cost. In some cases the generalized-cost-delta is
+  excluded when comparing itineraries - that happens if one of the itineraries is a
+  "direct/street-only" itinerary. Time-penalty can not be set for direct searches, so it
+  needs to be excluded from such comparison to be fair. The unit is transit-seconds.
   """
-  generalizedCostPenalty: Int
+  generalizedCostDelta: Int
   """
   The time-penalty added to the actual time/duration when comparing the itinerary with
   other itineraries. This is used to decide witch is the best option, but is not visible
@@ -1346,7 +1346,7 @@ type TripPattern {
   Note! This field is meant for debugging only. The field can be removed without notice
   in the future.
   """
-  timePenalty: [TimePenalty!]!
+  timePenalty: [TimePenaltyWithCost!]!
   "A cost calculated to favor transfer with higher priority. This field is meant for debugging only."
   transferPriorityCost: Int
   "A cost calculated to distribute wait-time and avoid very short transfers. This field is meant for debugging only."

From d9706b63e2860983a79fb4a4e913820964b5dd4d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 19 Jun 2024 21:34:15 +0000
Subject: [PATCH 1439/1688] chore(deps): update dependency
 org.apache.maven.plugins:maven-jar-plugin to v3.4.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 4353671dbce..62f6155fd10 100644
--- a/pom.xml
+++ b/pom.xml
@@ -158,7 +158,7 @@
             
                 org.apache.maven.plugins
                 maven-jar-plugin
-                3.4.1
+                3.4.2
                 
                     
                         

From 7f5ba09d13d261eeda69d3c799f9162d7570ea0e Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 20 Jun 2024 10:05:48 +0200
Subject: [PATCH 1440/1688] test: Fix broken unit-test
 TripPlanTimePenaltyDtoTest

---
 .../apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java b/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java
index 9ea6016324b..579f9b73761 100644
--- a/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java
+++ b/src/test/java/org/opentripplanner/apis/transmodel/model/plan/TripPlanTimePenaltyDtoTest.java
@@ -37,7 +37,6 @@ void testCreateFromSingeEntry() {
   @Test
   void testCreateFromItineraryWithNoPenalty() {
     var i = itinerary();
-    assertEquals(List.of(), TripPlanTimePenaltyDto.of(null));
     assertEquals(List.of(), TripPlanTimePenaltyDto.of(i));
   }
 

From aa7cdd9b517b65d3ba50149f2e3246b8f351cc29 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Thu, 20 Jun 2024 12:27:34 +0000
Subject: [PATCH 1441/1688] Add changelog entry for #5908 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index a95d931ae51..d0db11c2f2c 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -33,6 +33,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Add plan query that follows the relay connection specification [#5185](https://github.com/opentripplanner/OpenTripPlanner/pull/5185)
 - Fix debug client after breaking change in dependency graphql-request [#5899](https://github.com/opentripplanner/OpenTripPlanner/pull/5899)
 - Remove TravelTime API [#5890](https://github.com/opentripplanner/OpenTripPlanner/pull/5890)
+- Improve cancellation of large response in TransModel API [#5908](https://github.com/opentripplanner/OpenTripPlanner/pull/5908)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 960480db9a93bdf3fb56038f671f648a07cec90f Mon Sep 17 00:00:00 2001
From: Henrik Abrahamsson
 <127481124+habrahamsson-skanetrafiken@users.noreply.github.com>
Date: Thu, 20 Jun 2024 14:32:23 +0200
Subject: [PATCH 1442/1688] Small update of documentation

Co-authored-by: Thomas Gran 
---
 .../graph_builder/module/nearbystops/NearbyStopFinder.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java
index 9bd8c4f8891..13cc765987c 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/nearbystops/NearbyStopFinder.java
@@ -7,8 +7,8 @@
 import org.opentripplanner.street.model.vertex.Vertex;
 
 /**
- * This class contains code for finding nearby stops from a given vertex. It is being used by access
- * and egress searches as well as transfer generation.
+ * Interface for finding nearby stops from a given vertex. It is used by access
+ * and egress searches, and in transfer generation.
  */
 public interface NearbyStopFinder {
   /**

From a714a532e6ef0404e001fbd9519127a8a2935126 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 20 Jun 2024 13:18:21 +0200
Subject: [PATCH 1443/1688] Inject transit model instead of transit service

---
 .../opentripplanner/ext/geocoder/LuceneIndex.java | 15 ++++++++++-----
 .../ext/geocoder/configure/GeocoderModule.java    |  6 +++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
index f5b4a6e59e9..6283a779088 100644
--- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
+++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
@@ -47,14 +47,12 @@
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.site.StopLocation;
 import org.opentripplanner.transit.model.site.StopLocationsGroup;
+import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.transit.service.TransitService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 public class LuceneIndex implements Serializable {
 
-  private static final Logger LOG = LoggerFactory.getLogger(LuceneIndex.class);
-
   private static final String TYPE = "type";
   private static final String ID = "id";
   private static final String SECONDARY_IDS = "secondary_ids";
@@ -70,7 +68,14 @@ public class LuceneIndex implements Serializable {
   private final SuggestIndexSearcher searcher;
   private final StopClusterMapper stopClusterMapper;
 
-  public LuceneIndex(
+  public LuceneIndex(TransitModel transitModel, StopConsolidationService stopConsolidationService) {
+    this(new DefaultTransitService(transitModel), stopConsolidationService);
+  }
+
+  /**
+   * This method is only visible for testing.
+   */
+  LuceneIndex(
     TransitService transitService,
     @Nullable StopConsolidationService stopConsolidationService
   ) {
diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java
index b67f81385b8..9eaf6ade8e5 100644
--- a/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java
+++ b/src/ext/java/org/opentripplanner/ext/geocoder/configure/GeocoderModule.java
@@ -7,7 +7,7 @@
 import org.opentripplanner.ext.geocoder.LuceneIndex;
 import org.opentripplanner.ext.stopconsolidation.StopConsolidationService;
 import org.opentripplanner.framework.application.OTPFeature;
-import org.opentripplanner.transit.service.TransitService;
+import org.opentripplanner.transit.service.TransitModel;
 
 /**
  * This module builds the Lucene geocoder based on whether the feature flag is on or off.
@@ -19,11 +19,11 @@ public class GeocoderModule {
   @Singleton
   @Nullable
   LuceneIndex luceneIndex(
-    TransitService service,
+    TransitModel transitModel,
     @Nullable StopConsolidationService stopConsolidationService
   ) {
     if (OTPFeature.SandboxAPIGeocoder.isOn()) {
-      return new LuceneIndex(service, stopConsolidationService);
+      return new LuceneIndex(transitModel, stopConsolidationService);
     } else {
       return null;
     }

From 0ed11e753c37078b2c3b8d0d02c005a9c140328c Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 20 Jun 2024 09:54:35 +0200
Subject: [PATCH 1444/1688] Store search state in URL

---
 client-next/src/hooks/useTripQuery.ts | 5 +++++
 client-next/src/screens/App.tsx       | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/client-next/src/hooks/useTripQuery.ts b/client-next/src/hooks/useTripQuery.ts
index c9672d0b6d2..1e787d7c31b 100644
--- a/client-next/src/hooks/useTripQuery.ts
+++ b/client-next/src/hooks/useTripQuery.ts
@@ -87,6 +87,11 @@ type TripQueryHook = (
 export const useTripQuery: TripQueryHook = (variables) => {
   const [data, setData] = useState(null);
   const [loading, setLoading] = useState(false);
+
+  const urlParams = new URLSearchParams(window.location.search);
+  urlParams.set('variables', JSON.stringify(variables));
+  history.pushState({}, '', '?' + urlParams.toString());
+
   const callback = useCallback(
     async (pageCursor?: string) => {
       if (loading) {
diff --git a/client-next/src/screens/App.tsx b/client-next/src/screens/App.tsx
index df17bb713bf..2415e28eee3 100644
--- a/client-next/src/screens/App.tsx
+++ b/client-next/src/screens/App.tsx
@@ -7,12 +7,19 @@ import { TripQueryVariables } from '../gql/graphql.ts';
 import { useTripQuery } from '../hooks/useTripQuery.ts';
 import { useServerInfo } from '../hooks/useServerInfo.ts';
 
-const INITIAL_VARIABLES: TripQueryVariables = {
+const urlParams = new URLSearchParams(window.location.search);
+const variablesJson = urlParams.get('variables');
+
+let INITIAL_VARIABLES: TripQueryVariables = {
   from: {},
   to: {},
   dateTime: new Date().toISOString(),
 };
 
+if (variablesJson) {
+  INITIAL_VARIABLES = JSON.parse(variablesJson);
+}
+
 export function App() {
   const [tripQueryVariables, setTripQueryVariables] = useState(INITIAL_VARIABLES);
   const [tripQueryResult, loading, callback] = useTripQuery(tripQueryVariables);

From 6124015bfc31366d5ace166be613eb2587b26211 Mon Sep 17 00:00:00 2001
From: Daniel Heppner 
Date: Thu, 20 Jun 2024 21:08:40 +0100
Subject: [PATCH 1445/1688] fix(orca-fares): allow senior fares with cash

---
 .../ext/fares/impl/OrcaFareServiceTest.java   | 35 +++++++++----------
 .../ext/fares/impl/OrcaFareService.java       | 18 ++++------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
index 7493c33bbb2..30d11b57200 100644
--- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
@@ -134,7 +134,7 @@ private static void assertLegFareEquals(
   void calculateFareForSingleAgency() {
     List rides = List.of(getLeg(COMM_TRANS_AGENCY_ID, "400", 0));
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE);
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE);
+    calculateFare(rides, FareType.senior, TWO_DOLLARS);
     calculateFare(rides, FareType.youth, ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, TWO_DOLLARS);
     calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE);
@@ -154,7 +154,7 @@ void calculateFareWithNoFreeTransfer() {
       getLeg(COMM_TRANS_AGENCY_ID, 2)
     );
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(3));
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(3));
+    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.plus(usDollars(2.25f)));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(
       rides,
@@ -164,7 +164,7 @@ void calculateFareWithNoFreeTransfer() {
     calculateFare(
       rides,
       FareType.electronicRegular,
-      DEFAULT_TEST_RIDE_PRICE.plus(DEFAULT_TEST_RIDE_PRICE)
+      DEFAULT_TEST_RIDE_PRICE.times(2)
     );
     calculateFare(rides, FareType.electronicSenior, DEFAULT_TEST_RIDE_PRICE.plus(usDollars(1.25f)));
     calculateFare(rides, FareType.electronicYouth, Money.ZERO_USD);
@@ -200,7 +200,7 @@ void calculateFareThatExceedsTwoHourFreeTransferWindow() {
     );
 
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(2));
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(2));
+    calculateFare(rides, FareType.senior, TWO_DOLLARS);
     calculateFare(rides, FareType.youth, ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, TWO_DOLLARS);
     calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE.times(2));
@@ -227,7 +227,7 @@ void calculateFareThatIncludesNoFreeTransfers() {
     calculateFare(
       rides,
       FareType.senior,
-      DEFAULT_TEST_RIDE_PRICE.times(2).plus(usDollars(.50f)).plus(HALF_FERRY_FARE)
+      ONE_DOLLAR.plus(ONE_DOLLAR).plus(HALF_FERRY_FARE).plus(usDollars(0.5f))
     );
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     // We don't get any fares for the skagit transit leg below here because they don't accept ORCA (electronic)
@@ -263,7 +263,7 @@ void calculateFareThatExceedsTwoHourFreeTransferWindowTwice() {
       getLeg(KITSAP_TRANSIT_AGENCY_ID, 270)
     );
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(3));
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(3));
+    calculateFare(rides, FareType.senior, usDollars(3));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(3));
     calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE.times(3));
@@ -286,7 +286,7 @@ void calculateFareThatStartsWithACashFare() {
       getLeg(KITSAP_TRANSIT_AGENCY_ID, 149)
     );
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(2));
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(2));
+    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.plus(ONE_DOLLAR));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, DEFAULT_TEST_RIDE_PRICE.plus(ONE_DOLLAR));
     calculateFare(
@@ -305,7 +305,7 @@ void calculateFareThatStartsWithACashFare() {
   void calculateFareForKitsapFastFerry() {
     List rides = List.of(getLeg(KITSAP_TRANSIT_AGENCY_ID, 0, 4, "404", "east"));
     calculateFare(rides, regular, TWO_DOLLARS);
-    calculateFare(rides, FareType.senior, TWO_DOLLARS);
+    calculateFare(rides, FareType.senior, ONE_DOLLAR);
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, ONE_DOLLAR);
     calculateFare(rides, FareType.electronicRegular, TWO_DOLLARS);
@@ -314,7 +314,7 @@ void calculateFareForKitsapFastFerry() {
 
     rides = List.of(getLeg(KITSAP_TRANSIT_AGENCY_ID, 0, 4, "404", "west"));
     calculateFare(rides, regular, usDollars(10f));
-    calculateFare(rides, FareType.senior, usDollars(10f));
+    calculateFare(rides, FareType.senior, usDollars(5f));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(5f));
     calculateFare(rides, FareType.electronicRegular, usDollars(10f));
@@ -349,7 +349,7 @@ void calculateFareForSTRail() {
       getLeg(SOUND_TRANSIT_AGENCY_ID, "S Line", 100, "King Street Station", "Auburn Station")
     );
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(2));
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(2));
+    calculateFare(rides, FareType.senior, TWO_DOLLARS);
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, ORCA_SPECIAL_FARE);
     calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE);
@@ -364,7 +364,7 @@ void calculateFareForSTRail() {
   void calculateWaterTaxiFares() {
     List rides = List.of(getLeg(KC_METRO_AGENCY_ID, "973", 1));
     calculateFare(rides, regular, WEST_SEATTLE_WATER_TAXI_CASH_FARE);
-    calculateFare(rides, FareType.senior, WEST_SEATTLE_WATER_TAXI_CASH_FARE);
+    calculateFare(rides, FareType.senior, usDollars(2.50f));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(3.75f));
     calculateFare(rides, FareType.electronicRegular, usDollars(5f));
@@ -374,7 +374,7 @@ void calculateWaterTaxiFares() {
     rides = List.of(getLeg(KC_METRO_AGENCY_ID, "975", 1));
 
     calculateFare(rides, regular, VASHON_WATER_TAXI_CASH_FARE);
-    calculateFare(rides, FareType.senior, VASHON_WATER_TAXI_CASH_FARE);
+    calculateFare(rides, FareType.senior, usDollars(3f));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(4.50f));
     calculateFare(rides, FareType.electronicRegular, usDollars(5.75f));
@@ -395,8 +395,7 @@ void calculateSoundTransitBusFares() {
       getLeg(KC_METRO_AGENCY_ID, "550", 240)
     );
     calculateFare(rides, regular, usDollars(9.75f));
-    // Sound Transit does not accept senior fares in cash
-    calculateFare(rides, FareType.senior, usDollars(9.75f));
+    calculateFare(rides, FareType.senior, usDollars(3.00f));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(3f));
     calculateFare(rides, FareType.electronicRegular, usDollars(9.75f));
@@ -410,7 +409,7 @@ void calculateSoundTransitBusFares() {
         getLeg(PIERCE_COUNTY_TRANSIT_AGENCY_ID, "501", 60)
       );
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(2));
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(2));
+    calculateFare(rides, FareType.senior, TWO_DOLLARS);
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(1f));
     calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE);
@@ -430,7 +429,7 @@ void calculateCashFreeTransferKCMetroAndKitsap() {
       getLeg(KITSAP_TRANSIT_AGENCY_ID, 132)
     );
     calculateFare(rides, regular, DEFAULT_TEST_RIDE_PRICE.times(4));
-    calculateFare(rides, FareType.senior, DEFAULT_TEST_RIDE_PRICE.times(4));
+    calculateFare(rides, FareType.senior, usDollars(4.25f));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(1.25f));
     calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE.times(2));
@@ -442,12 +441,12 @@ void calculateCashFreeTransferKCMetroAndKitsap() {
   void calculateTransferExtension() {
     List rides = List.of(
       getLeg(KITSAP_TRANSIT_AGENCY_ID, 0, 4, "Kitsap Fast Ferry", "east"), // 2.00
-      getLeg(KC_METRO_AGENCY_ID, 100), // Default ride price, extends transfer
+      getLeg(KC_METRO_AGENCY_ID, 100), // Default ride price, extends transfer for regular fare
       getLeg(KITSAP_TRANSIT_AGENCY_ID, 150, 4, "Kitsap Fast Ferry", "west") // 10.00
     );
     var regularFare = usDollars(2.00f).plus(DEFAULT_TEST_RIDE_PRICE).plus(usDollars(10f));
     calculateFare(rides, regular, regularFare);
-    calculateFare(rides, FareType.senior, regularFare);
+    calculateFare(rides, FareType.senior, usDollars(7f));
     calculateFare(rides, FareType.youth, Money.ZERO_USD);
     calculateFare(rides, FareType.electronicSpecial, usDollars(6f));
     calculateFare(rides, FareType.electronicRegular, usDollars(10f)); // transfer extended on second leg
diff --git a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java
index 8f961b0b01b..c3c1873ad6d 100644
--- a/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java
+++ b/src/ext/java/org/opentripplanner/ext/fares/impl/OrcaFareService.java
@@ -352,10 +352,10 @@ private Optional getSeniorFare(
     var regularFare = getRegularFare(fareType, rideType, defaultFare, leg);
     // Many agencies only provide senior discount if using ORCA
     return switch (rideType) {
-      case COMM_TRANS_LOCAL_SWIFT -> usesOrca(fareType) ? optionalUSD(1.25f) : regularFare;
-      case COMM_TRANS_COMMUTER_EXPRESS -> usesOrca(fareType) ? optionalUSD(2f) : regularFare;
+      case COMM_TRANS_LOCAL_SWIFT -> optionalUSD(1.25f);
+      case COMM_TRANS_COMMUTER_EXPRESS -> optionalUSD(2f);
       case SKAGIT_TRANSIT, WHATCOM_LOCAL, SKAGIT_LOCAL -> optionalUSD(0.5f);
-      case EVERETT_TRANSIT -> usesOrca(fareType) ? optionalUSD(0.5f) : regularFare;
+      case EVERETT_TRANSIT -> optionalUSD(0.5f);
       case KITSAP_TRANSIT_FAST_FERRY_EASTBOUND,
         SOUND_TRANSIT,
         SOUND_TRANSIT_BUS,
@@ -365,14 +365,10 @@ private Optional getSeniorFare(
         KC_METRO,
         PIERCE_COUNTY_TRANSIT,
         SEATTLE_STREET_CAR,
-        KITSAP_TRANSIT -> fareType.equals(FareType.electronicSenior)
-        ? optionalUSD(1f)
-        : regularFare;
-      case KC_WATER_TAXI_VASHON_ISLAND -> usesOrca(fareType) ? optionalUSD(3f) : regularFare;
-      case KC_WATER_TAXI_WEST_SEATTLE -> usesOrca(fareType) ? optionalUSD(2.5f) : regularFare;
-      case KITSAP_TRANSIT_FAST_FERRY_WESTBOUND -> fareType.equals(FareType.electronicSenior)
-        ? optionalUSD(5f)
-        : regularFare;
+        KITSAP_TRANSIT -> optionalUSD(1f);
+      case KC_WATER_TAXI_VASHON_ISLAND -> optionalUSD(3f);
+      case KC_WATER_TAXI_WEST_SEATTLE -> optionalUSD(2.5f);
+      case KITSAP_TRANSIT_FAST_FERRY_WESTBOUND -> optionalUSD(5f);
       // Discount specific to Skagit transit and not Orca.
       case WASHINGTON_STATE_FERRIES -> Optional.of(
         getWashingtonStateFerriesFare(route.getLongName(), fareType, defaultFare)

From 28273d2b0e95ab317a9e071ec3b9e16a873c0cd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=20Erik=20St=C3=B8wer?= 
Date: Thu, 20 Jun 2024 22:20:44 +0200
Subject: [PATCH 1446/1688] Create hook for managing trip query variables,
 including url state

---
 client-next/src/hooks/useTripQuery.ts         |  4 ---
 .../src/hooks/useTripQueryVariables.ts        | 33 +++++++++++++++++++
 client-next/src/screens/App.tsx               | 17 ++--------
 3 files changed, 35 insertions(+), 19 deletions(-)
 create mode 100644 client-next/src/hooks/useTripQueryVariables.ts

diff --git a/client-next/src/hooks/useTripQuery.ts b/client-next/src/hooks/useTripQuery.ts
index 1e787d7c31b..ad49ae1a814 100644
--- a/client-next/src/hooks/useTripQuery.ts
+++ b/client-next/src/hooks/useTripQuery.ts
@@ -88,10 +88,6 @@ export const useTripQuery: TripQueryHook = (variables) => {
   const [data, setData] = useState(null);
   const [loading, setLoading] = useState(false);
 
-  const urlParams = new URLSearchParams(window.location.search);
-  urlParams.set('variables', JSON.stringify(variables));
-  history.pushState({}, '', '?' + urlParams.toString());
-
   const callback = useCallback(
     async (pageCursor?: string) => {
       if (loading) {
diff --git a/client-next/src/hooks/useTripQueryVariables.ts b/client-next/src/hooks/useTripQueryVariables.ts
new file mode 100644
index 00000000000..b675772182e
--- /dev/null
+++ b/client-next/src/hooks/useTripQueryVariables.ts
@@ -0,0 +1,33 @@
+import { useEffect, useState } from 'react';
+import { TripQueryVariables } from '../gql/graphql.ts';
+
+const DEFAULT_VARIABLES: TripQueryVariables = {
+  from: {},
+  to: {},
+  dateTime: new Date().toISOString(),
+};
+
+const getInitialVariables = () => {
+  const urlParams = new URLSearchParams(window.location.search);
+  const variablesJson = urlParams.get('variables');
+  return variablesJson ? JSON.parse(decodeURIComponent(variablesJson)) : DEFAULT_VARIABLES;
+};
+
+const updateUrlWithVariables = (variables: TripQueryVariables) => {
+  const urlParams = new URLSearchParams(window.location.search);
+  urlParams.set('variables', encodeURIComponent(JSON.stringify(variables)));
+  history.pushState({}, '', '?' + urlParams.toString());
+};
+
+export const useTripQueryVariables = () => {
+  const [tripQueryVariables, setTripQueryVariables] = useState(getInitialVariables());
+
+  useEffect(() => {
+    updateUrlWithVariables(tripQueryVariables);
+  }, [tripQueryVariables]);
+
+  return {
+    tripQueryVariables,
+    setTripQueryVariables,
+  };
+};
diff --git a/client-next/src/screens/App.tsx b/client-next/src/screens/App.tsx
index 2415e28eee3..3e5744e5ad6 100644
--- a/client-next/src/screens/App.tsx
+++ b/client-next/src/screens/App.tsx
@@ -3,25 +3,12 @@ import { MapView } from '../components/MapView/MapView.tsx';
 import { SearchBar } from '../components/SearchBar/SearchBar.tsx';
 import { ItineraryListContainer } from '../components/ItineraryList/ItineraryListContainer.tsx';
 import { useState } from 'react';
-import { TripQueryVariables } from '../gql/graphql.ts';
 import { useTripQuery } from '../hooks/useTripQuery.ts';
 import { useServerInfo } from '../hooks/useServerInfo.ts';
-
-const urlParams = new URLSearchParams(window.location.search);
-const variablesJson = urlParams.get('variables');
-
-let INITIAL_VARIABLES: TripQueryVariables = {
-  from: {},
-  to: {},
-  dateTime: new Date().toISOString(),
-};
-
-if (variablesJson) {
-  INITIAL_VARIABLES = JSON.parse(variablesJson);
-}
+import { useTripQueryVariables } from '../hooks/useTripQueryVariables.ts';
 
 export function App() {
-  const [tripQueryVariables, setTripQueryVariables] = useState(INITIAL_VARIABLES);
+  const { tripQueryVariables, setTripQueryVariables } = useTripQueryVariables();
   const [tripQueryResult, loading, callback] = useTripQuery(tripQueryVariables);
   const serverInfo = useServerInfo();
   const [selectedTripPatternIndex, setSelectedTripPatternIndex] = useState(0);

From 29a750daf8a04d472783603690a30b296ff5ffa4 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 20 Jun 2024 22:41:18 +0200
Subject: [PATCH 1447/1688] Add comment

---
 .../standalone/configure/ConstructApplication.java               | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
index f2c279e7609..7259acb00c2 100644
--- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
+++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
@@ -180,6 +180,7 @@ private void setupTransitRoutingServer() {
 
     if (OTPFeature.SandboxAPIGeocoder.isOn()) {
       LOG.info("Initializing geocoder");
+      // eagerly initialize the geocoder
       this.factory.luceneIndex();
     }
   }

From 9b17f9777cb21c395ce3ff890db49d8938c26c43 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 20 Jun 2024 22:42:54 +0200
Subject: [PATCH 1448/1688] Remove trailing and leading whitespace

---
 src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
index 6283a779088..8f11ff252e7 100644
--- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
+++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
@@ -253,6 +253,7 @@ private Stream matchingDocuments(
     String searchTerms,
     boolean autocomplete
   ) {
+    searchTerms = searchTerms.strip();
     try {
       if (autocomplete) {
         var completionQuery = new FuzzyCompletionQuery(

From 0f74cb5ea3a4a5018fa0c687550d65ebebe65bcc Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 19 Jun 2024 14:09:13 +0200
Subject: [PATCH 1449/1688] Make new debug client more appealing

---
 client-next/.env                              |  2 +-
 client-next/.env.development                  |  2 +-
 .../ItineraryList/ItineraryLegDetails.tsx     | 35 +++++++++++--------
 .../src/components/ItineraryList/LegTime.tsx  |  2 +-
 client-next/src/style.css                     | 15 ++++++++
 client-next/src/util/getColorForMode.ts       | 28 +++++++--------
 6 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/client-next/.env b/client-next/.env
index e8a9667bc23..ca1d71c90e3 100644
--- a/client-next/.env
+++ b/client-next/.env
@@ -1,2 +1,2 @@
-VITE_API_URL=/otp/routers/default/transmodel/index/graphql
+VITE_API_URL=/otp/transmodel/v3
 VITE_DEBUG_STYLE_URL=/otp/routers/default/inspector/vectortile/style.json
diff --git a/client-next/.env.development b/client-next/.env.development
index b10ac31fdf9..35840c239bd 100644
--- a/client-next/.env.development
+++ b/client-next/.env.development
@@ -1,2 +1,2 @@
-VITE_API_URL=http://localhost:8080/otp/routers/default/transmodel/index/graphql
+VITE_API_URL=http://localhost:8080/otp/transmodel/v3
 VITE_DEBUG_STYLE_URL=http://localhost:8080/otp/routers/default/inspector/vectortile/style.json
\ No newline at end of file
diff --git a/client-next/src/components/ItineraryList/ItineraryLegDetails.tsx b/client-next/src/components/ItineraryList/ItineraryLegDetails.tsx
index f6df37c2d1d..5f0e2b381aa 100644
--- a/client-next/src/components/ItineraryList/ItineraryLegDetails.tsx
+++ b/client-next/src/components/ItineraryList/ItineraryLegDetails.tsx
@@ -5,20 +5,27 @@ import { formatDuration } from '../../util/formatDuration.ts';
 
 export function ItineraryLegDetails({ leg, isLast }: { leg: Leg; isLast: boolean }) {
   return (
-    
              
-      -{' '}
-      {' '}
-      {leg.mode}{' '}
-      {leg.line && (
-        <>
-          
-            {leg.line.publicCode} {leg.toEstimatedCall?.destinationDisplay?.frontText}
-          
-          , {leg.authority?.name}
-        
-      )}{' '}
-      {formatDistance(leg.distance)}, {formatDuration(leg.duration)}
-      {leg.mode !== Mode.Foot && from {leg.fromPlace.name}} {!isLast && to {leg.toPlace.name}}
+    
              
+      
              
+        {formatDistance(leg.distance)}, {formatDuration(leg.duration)}
+      
              
+      
              
+         -{' '}
+        
+      
              
+      
              
+        {leg.mode}{' '}
+        {leg.line && (
+          <>
+            
+              {leg.line.publicCode} {leg.toEstimatedCall?.destinationDisplay?.frontText}
+            
+            , {leg.authority?.name}
+          
+        )}{' '}
+        
              
+        {leg.mode !== Mode.Foot && {leg.fromPlace.name}} {!isLast && → {leg.toPlace.name}}
+      
              
     
              
   );
 }
diff --git a/client-next/src/components/ItineraryList/LegTime.tsx b/client-next/src/components/ItineraryList/LegTime.tsx
index 5bd4aa56b1a..4324d8a3e71 100644
--- a/client-next/src/components/ItineraryList/LegTime.tsx
+++ b/client-next/src/components/ItineraryList/LegTime.tsx
@@ -16,7 +16,7 @@ export function LegTime({
     
   ) : (
     
-      {formatTime(expectedTime)}
+      {formatTime(expectedTime, 'short')}
       {hasRealtime &&  (on time)}
     
   );
diff --git a/client-next/src/style.css b/client-next/src/style.css
index 79c85d38628..21709bbebcb 100644
--- a/client-next/src/style.css
+++ b/client-next/src/style.css
@@ -72,6 +72,21 @@
   --bs-accordion-active-bg: pink;
 }
 
+.itinerary-leg-details {
+  border: 1px dotted grey;
+  padding: 5px;
+}
+
+.itinerary-leg-details .times {
+  margin-top: 3px;
+  float: right;
+  font-size: 11px;
+}
+
+.itinerary-leg-details .mode {
+  margin-top: 10px;
+}
+
 .itinerary-header-itinerary-number {
   position: absolute;
 }
diff --git a/client-next/src/util/getColorForMode.ts b/client-next/src/util/getColorForMode.ts
index 0276a1bce52..79af525e826 100644
--- a/client-next/src/util/getColorForMode.ts
+++ b/client-next/src/util/getColorForMode.ts
@@ -2,20 +2,20 @@ import { Mode } from '../gql/graphql.ts';
 
 export const getColorForMode = function (mode: Mode) {
   if (mode === Mode.Foot) return '#444';
-  if (mode === Mode.Bicycle) return '#44f';
-  if (mode === Mode.Scooter) return '#88f';
+  if (mode === Mode.Bicycle) return '#5076D9';
+  if (mode === Mode.Scooter) return '#253664';
   if (mode === Mode.Car) return '#444';
-  if (mode === Mode.Rail) return '#b00';
-  if (mode === Mode.Coach) return '#0f0';
-  if (mode === Mode.Metro) return '#f00';
-  if (mode === Mode.Bus) return '#0f0';
-  if (mode === Mode.Tram) return '#f00';
-  if (mode === Mode.Trolleybus) return '#0f0';
-  if (mode === Mode.Water) return '#f0f';
-  if (mode === Mode.Air) return '#f0f';
-  if (mode === Mode.Cableway) return '#f0f';
-  if (mode === Mode.Funicular) return '#f0f';
-  if (mode === Mode.Monorail) return '#f0f';
-  if (mode === Mode.Taxi) return '#f0f';
+  if (mode === Mode.Rail) return '#86BF8B';
+  if (mode === Mode.Coach) return '#25642A';
+  if (mode === Mode.Metro) return '#D9B250';
+  if (mode === Mode.Bus) return '#25642A';
+  if (mode === Mode.Tram) return '#D9B250';
+  if (mode === Mode.Trolleybus) return '#25642A';
+  if (mode === Mode.Water) return '#81304C';
+  if (mode === Mode.Air) return '#81304C';
+  if (mode === Mode.Cableway) return '#81304C';
+  if (mode === Mode.Funicular) return '#81304C';
+  if (mode === Mode.Monorail) return '#81304C';
+  if (mode === Mode.Taxi) return '#81304C';
   return '#aaa';
 };

From 263ea6ac3892b62ea7eeaecabc19ba9d74c84266 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 19 Jun 2024 14:22:08 +0200
Subject: [PATCH 1450/1688] Make edge layer visible at lower zoom levels

---
 .../org/opentripplanner/apis/vectortiles/DebugStyleSpec.java    | 2 +-
 .../resources/org/opentripplanner/apis/vectortiles/style.json   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
index 92d577480e2..da612c5ea20 100644
--- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
+++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
@@ -85,7 +85,7 @@ static StyleSpec build(
           .lineColor(MAGENTA)
           .edgeFilter(EDGES_TO_DISPLAY)
           .lineWidth(LINE_WIDTH)
-          .minZoom(13)
+          .minZoom(6)
           .maxZoom(MAX_ZOOM)
           .intiallyHidden(),
         StyleBuilder
diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
index c0e31a26f5d..d0aed828f6f 100644
--- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
+++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
@@ -29,7 +29,7 @@
       "type" : "line",
       "source" : "vectorSource",
       "source-layer" : "edges",
-      "minzoom" : 13,
+      "minzoom" : 6,
       "maxzoom" : 23,
       "paint" : {
         "line-color" : "#f21d52",

From 4581cd9d2588c966f249d286641f6ad66cb8e074 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 19 Jun 2024 14:48:18 +0200
Subject: [PATCH 1451/1688] Finetune border details of leg details

---
 client-next/src/style.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/client-next/src/style.css b/client-next/src/style.css
index 21709bbebcb..7dd2565c449 100644
--- a/client-next/src/style.css
+++ b/client-next/src/style.css
@@ -73,8 +73,10 @@
 }
 
 .itinerary-leg-details {
-  border: 1px dotted grey;
-  padding: 5px;
+  border: 1px solid #80808063;
+  padding: 10px;
+  border-radius: 3px;
+  margin-bottom: 3px;
 }
 
 .itinerary-leg-details .times {

From adbaf9617b3b205dd928281c3ffa60b34bf406e9 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 20 Jun 2024 22:58:24 +0200
Subject: [PATCH 1452/1688] Also use short time format for real time

---
 client-next/src/components/ItineraryList/LegTime.tsx | 4 ++--
 client-next/src/hooks/useTripQuery.ts                | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/client-next/src/components/ItineraryList/LegTime.tsx b/client-next/src/components/ItineraryList/LegTime.tsx
index 4324d8a3e71..1b3d01e0d05 100644
--- a/client-next/src/components/ItineraryList/LegTime.tsx
+++ b/client-next/src/components/ItineraryList/LegTime.tsx
@@ -11,8 +11,8 @@ export function LegTime({
 }) {
   return aimedTime !== expectedTime ? (
     <>
-      {formatTime(expectedTime)}
-      {formatTime(aimedTime)}
+      {formatTime(expectedTime, 'short')}
+      {formatTime(aimedTime, 'short')}
     
   ) : (
     
diff --git a/client-next/src/hooks/useTripQuery.ts b/client-next/src/hooks/useTripQuery.ts
index ad49ae1a814..c9672d0b6d2 100644
--- a/client-next/src/hooks/useTripQuery.ts
+++ b/client-next/src/hooks/useTripQuery.ts
@@ -87,7 +87,6 @@ type TripQueryHook = (
 export const useTripQuery: TripQueryHook = (variables) => {
   const [data, setData] = useState(null);
   const [loading, setLoading] = useState(false);
-
   const callback = useCallback(
     async (pageCursor?: string) => {
       if (loading) {

From 1c001beaada68a92f4c2aa51996e111aa530e8d1 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 20 Jun 2024 23:18:58 +0200
Subject: [PATCH 1453/1688] Also add hash to pushState

---
 client-next/src/components/MapView/LayerControl.tsx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/client-next/src/components/MapView/LayerControl.tsx b/client-next/src/components/MapView/LayerControl.tsx
index 237ea8ab150..1517a9ce7c8 100644
--- a/client-next/src/components/MapView/LayerControl.tsx
+++ b/client-next/src/components/MapView/LayerControl.tsx
@@ -32,6 +32,9 @@ class LayerControl implements IControl {
         .getLayersOrder()
         .map((l) => map.getLayer(l))
         .filter((s) => s?.type !== 'raster')
+        // the polylines of the routing result are put in map layers called jsx-1, jsx-2...
+        // we don't want them to show up in the debug layer selector
+        .filter((s) => !s?.id.startsWith('jsx'))
         .reverse()
         .forEach((layer) => {
           if (layer) {

From 9e162944875f08d30123c0bc25efdb323fca321e Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 20 Jun 2024 23:19:02 +0200
Subject: [PATCH 1454/1688] Also add hash to pushState

---
 client-next/src/hooks/useTripQueryVariables.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client-next/src/hooks/useTripQueryVariables.ts b/client-next/src/hooks/useTripQueryVariables.ts
index b675772182e..ba9ff84c1e2 100644
--- a/client-next/src/hooks/useTripQueryVariables.ts
+++ b/client-next/src/hooks/useTripQueryVariables.ts
@@ -16,7 +16,7 @@ const getInitialVariables = () => {
 const updateUrlWithVariables = (variables: TripQueryVariables) => {
   const urlParams = new URLSearchParams(window.location.search);
   urlParams.set('variables', encodeURIComponent(JSON.stringify(variables)));
-  history.pushState({}, '', '?' + urlParams.toString());
+  history.pushState({}, '', '?' + urlParams.toString() + window.location.hash);
 };
 
 export const useTripQueryVariables = () => {

From 3367ae71ce6309831c569451ce67d8cf118ff2de Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Thu, 20 Jun 2024 21:30:08 +0000
Subject: [PATCH 1455/1688] Upgrade debug client to version
 2024/06/2024-06-20T21:29

---
 src/client/debug-client-preview/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html
index 8f654dfb40e..77fc8ebbe8d 100644
--- a/src/client/debug-client-preview/index.html
+++ b/src/client/debug-client-preview/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 7e49edf11497091c01efd19bc2c15e68e292bc5c Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 21 Jun 2024 10:05:26 +0200
Subject: [PATCH 1456/1688] Swap old and new debug client

---
 .github/workflows/debug-client.yml            |   4 +-
 client-next/vite.config.ts                    |   2 +-
 src/client/WEB-INF/web_client.xml             |   4 +-
 src/client/{ => classic-debug}/i18n/babel.cfg |   0
 src/client/{ => classic-debug}/i18n/ca_ES.po  |   0
 src/client/{ => classic-debug}/i18n/de.po     |   0
 src/client/{ => classic-debug}/i18n/en.po     |   0
 src/client/{ => classic-debug}/i18n/es.po     |   0
 src/client/{ => classic-debug}/i18n/fr.po     |   0
 src/client/{ => classic-debug}/i18n/hu.po     |   0
 src/client/{ => classic-debug}/i18n/it.po     |   0
 .../{ => classic-debug}/i18n/messages.pot     |   0
 src/client/{ => classic-debug}/i18n/no.po     |   0
 src/client/{ => classic-debug}/i18n/pl.po     |   0
 src/client/{ => classic-debug}/i18n/pt.po     |   0
 src/client/{ => classic-debug}/i18n/sl.po     |   0
 .../images/agency_logo.png                    | Bin
 .../{ => classic-debug}/images/alert.png      | Bin
 .../images/bicycle_green.png                  | Bin
 .../images/bicycle_green_small.png            | Bin
 .../images/bicycle_red.png                    | Bin
 .../images/bicycle_red_small.png              | Bin
 .../images/directions/circle_clockwise.png    | Bin
 .../directions/circle_counterclockwise.png    | Bin
 .../images/directions/clear.png               | Bin
 .../images/directions/continue.png            | Bin
 .../images/directions/depart.png              | Bin
 .../images/directions/direction_icons.svg     |   0
 .../images/directions/elevator.png            | Bin
 .../images/directions/enter_station.png       | Bin
 .../images/directions/exit_left.png           | Bin
 .../images/directions/exit_right.png          | Bin
 .../images/directions/exit_station.png        | Bin
 .../images/directions/follow_signs.png        | Bin
 .../images/directions/hard_left.png           | Bin
 .../images/directions/hard_right.png          | Bin
 .../images/directions/left.png                | Bin
 .../images/directions/merge.png               | Bin
 .../images/directions/right.png               | Bin
 .../images/directions/slightly_left.png       | Bin
 .../images/directions/slightly_right.png      | Bin
 .../images/directions/turn_left.png           | Bin
 .../images/directions/turn_right.png          | Bin
 .../images/directions/uturn_left.png          | Bin
 .../images/directions/uturn_right.png         | Bin
 .../images/flag_marker_green.png              | Bin
 .../images/flag_marker_red.png                | Bin
 .../{ => classic-debug}/images/gear.svg       |   0
 .../images/language_icon.png                  | Bin
 .../images/language_icon.svg                  |   0
 .../images/marker-0pct.png                    | Bin
 .../images/marker-100pct.png                  | Bin
 .../images/marker-25pct.png                   | Bin
 .../images/marker-50pct.png                   | Bin
 .../images/marker-75pct.png                   | Bin
 .../images/marker-bike-green-shadowed.png     | Bin
 .../images/marker-bike-green.png              | Bin
 .../images/marker-bike-red-shadowed.png       | Bin
 .../images/marker-bike-red.png                | Bin
 .../images/marker-bike-shadow.png             | Bin
 .../images/marker-blue-med.png                | Bin
 .../images/marker-blue-nub.png                | Bin
 .../images/marker-blue-sm.png                 | Bin
 .../images/marker-flag-end-shadowed.png       | Bin
 .../images/marker-flag-end.png                | Bin
 .../images/marker-flag-shadow.png             | Bin
 .../images/marker-flag-start-shadowed.png     | Bin
 .../images/marker-flag-start.png              | Bin
 .../images/marker-med-0pct.png                | Bin
 .../images/marker-med-100pct.png              | Bin
 .../images/marker-med-25pct.png               | Bin
 .../images/marker-med-50pct.png               | Bin
 .../images/marker-med-75pct.png               | Bin
 .../images/marker-sm-0pct.png                 | Bin
 .../images/marker-sm-100pct.png               | Bin
 .../images/marker-sm-25pct.png                | Bin
 .../images/marker-sm-50pct.png                | Bin
 .../images/marker-sm-75pct.png                | Bin
 .../images/mode/airplane.png                  | Bin
 .../images/mode/arrow-left.png                | Bin
 .../{ => classic-debug}/images/mode/arrow.png | Bin
 .../images/mode/bicycle.png                   | Bin
 .../images/mode/bicycle_darkbg.png            | Bin
 .../{ => classic-debug}/images/mode/bus.png   | Bin
 .../images/mode/bus_darkbg.png                | Bin
 .../images/mode/cable_car.png                 | Bin
 .../{ => classic-debug}/images/mode/car.png   | Bin
 .../images/mode/car_darkbg.png                | Bin
 .../images/mode/carpool.png                   | Bin
 .../images/mode/carpool_darkbg.png            | Bin
 .../{ => classic-debug}/images/mode/coach.png | Bin
 .../{ => classic-debug}/images/mode/ferry.png | Bin
 .../images/mode/ferry_darkbg.png              | Bin
 .../images/mode/funicular.png                 | Bin
 .../images/mode/gondola.png                   | Bin
 .../images/mode/gondola_darkbg.png            | Bin
 .../images/mode/mode_bubble.psd               | Bin
 .../images/mode/mode_bubble_ne.png            | Bin
 .../images/mode/mode_bubble_ne_highlight.png  | Bin
 .../images/mode/mode_bubble_nw.png            | Bin
 .../images/mode/mode_bubble_nw_highlight.png  | Bin
 .../images/mode/mode_bubble_se.png            | Bin
 .../images/mode/mode_bubble_se_highlight.png  | Bin
 .../images/mode/mode_bubble_sw.png            | Bin
 .../images/mode/mode_bubble_sw_highlight.png  | Bin
 .../images/mode/monorail.png                  | Bin
 .../{ => classic-debug}/images/mode/rail.png  | Bin
 .../images/mode/rail_darkbg.png               | Bin
 .../images/mode/scooter.png                   | Bin
 .../images/mode/subway.png                    | Bin
 .../images/mode/subway_darkbg.png             | Bin
 .../{ => classic-debug}/images/mode/taxi.png  | Bin
 .../{ => classic-debug}/images/mode/tram.png  | Bin
 .../images/mode/tram_darkbg.png               | Bin
 .../images/mode/trolleybus.png                | Bin
 .../{ => classic-debug}/images/mode/walk.png  | Bin
 .../images/mode/walk_darkbg.png               | Bin
 .../images/openplans-logo-20x20.png           | Bin
 .../images/openplans-logo-40x40.png           | Bin
 .../images/openplans-logo-gray.gif            | Bin
 .../images/otp_logo_40px.png                  | Bin
 .../images/otp_logo_darkbg_40px.png           | Bin
 .../{ => classic-debug}/images/reverse.png    | Bin
 .../{ => classic-debug}/images/shadow.png     | Bin
 .../{ => classic-debug}/images/spinner.gif    | Bin
 .../{ => classic-debug}/images/stop20.png     | Bin
 .../images/widget-trip-stop-first.png         | Bin
 .../images/widget-trip-stop-last.png          | Bin
 .../images/widget-trip-stop-middle.png        | Bin
 src/client/classic-debug/index.html           | 220 +++++++++++++++++
 .../{ => classic-debug}/js/lib/ICanHaz.js     |   0
 .../js/lib/backbone-min.js                    |   0
 .../{ => classic-debug}/js/lib/backbone.js    |   0
 .../js/lib/i18next-1.7.3.min.js               |   0
 .../jquery-ui/addons/jquery-ui-timepicker.css |   0
 .../jquery-ui/addons/jquery-ui-timepicker.js  |   0
 .../images/ui-bg_flat_0_aaaaaa_40x100.png     | Bin
 .../images/ui-bg_flat_75_ffffff_40x100.png    | Bin
 .../images/ui-bg_glass_55_fbf9ee_1x400.png    | Bin
 .../images/ui-bg_glass_65_ffffff_1x400.png    | Bin
 .../images/ui-bg_glass_75_dadada_1x400.png    | Bin
 .../images/ui-bg_glass_75_e6e6e6_1x400.png    | Bin
 .../images/ui-bg_glass_95_fef1ec_1x400.png    | Bin
 .../ui-bg_highlight-soft_75_cccccc_1x100.png  | Bin
 .../images/ui-icons_222222_256x240.png        | Bin
 .../images/ui-icons_2e83ff_256x240.png        | Bin
 .../images/ui-icons_454545_256x240.png        | Bin
 .../images/ui-icons_888888_256x240.png        | Bin
 .../images/ui-icons_cd0a0a_256x240.png        | Bin
 .../css/smoothness/jquery-ui-1.9.1.custom.css |   0
 .../smoothness/jquery-ui-1.9.1.custom.min.css |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-ca.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-de.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-es.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-fr.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-hu.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-it.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-no.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-pl.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-pt.js |   0
 .../jquery-ui/i18n/jquery.ui.datepicker-sl.js |   0
 .../js/lib/jquery-ui/js/jquery-1.8.2.js       |   0
 .../jquery-ui/js/jquery-ui-1.9.1.custom.js    |   0
 .../js/jquery-ui-1.9.1.custom.min.js          |   0
 .../{ => classic-debug}/js/otp/config.js      |   0
 .../js/otp/core/ContextMenu.js                |   0
 .../js/otp/core/Geocoder.js                   |   0
 .../js/otp/core/GeocoderBag.js                |   0
 .../js/otp/core/GeocoderBuiltin.js            |   0
 .../js/otp/core/IndexApi.js                   |   0
 .../{ => classic-debug}/js/otp/core/Map.js    |   0
 .../js/otp/core/MapContextMenu.js             |   0
 .../js/otp/core/PopupMenu.js                  |   0
 .../js/otp/core/QueryLogger.js                |   0
 .../js/otp/core/SOLRGeocoder.js               |   0
 .../js/otp/core/TransitIndex.js               |   0
 .../js/otp/core/TripPlan.js                   |   0
 .../{ => classic-debug}/js/otp/core/Webapp.js |   0
 .../js/otp/core/WidgetManagerMenu.js          |   0
 .../{ => classic-debug}/js/otp/debug.js       |   0
 .../js/otp/layers/AreaStopsLayer.js           |   0
 .../js/otp/layers/GeofencingZonesLayer.js     |   0
 .../js/otp/layers/StopsLayer.js               |   0
 .../js/otp/layers/layers-templates.html       |   0
 .../js/otp/locale/Catalan.js                  |   0
 .../js/otp/locale/English.js                  |   0
 .../js/otp/locale/French.js                   |   0
 .../js/otp/locale/German.js                   |   0
 .../js/otp/locale/Hungarian.js                |   0
 .../js/otp/locale/Italian.js                  |   0
 .../js/otp/locale/Norwegian.js                |   0
 .../js/otp/locale/Polish.js                   |   0
 .../js/otp/locale/Portuguese.js               |   0
 .../js/otp/locale/Slovenian.js                |   0
 .../js/otp/locale/Spanish.js                  |   0
 .../js/otp/locale/ca_ES.json                  |   0
 .../{ => classic-debug}/js/otp/locale/de.json |   0
 .../{ => classic-debug}/js/otp/locale/en.json |   0
 .../{ => classic-debug}/js/otp/locale/es.json |   0
 .../{ => classic-debug}/js/otp/locale/fr.json |   0
 .../{ => classic-debug}/js/otp/locale/hu.json |   0
 .../{ => classic-debug}/js/otp/locale/it.json |   0
 .../{ => classic-debug}/js/otp/locale/no.json |   0
 .../{ => classic-debug}/js/otp/locale/pl.json |   0
 .../{ => classic-debug}/js/otp/locale/pt.json |   0
 .../{ => classic-debug}/js/otp/locale/sl.json |   0
 .../js/otp/modules/Module.js                  |   0
 .../otp/modules/bikeshare/BikeShareModule.js  |   0
 .../modules/bikeshare/BikeStationsWidget.js   |   0
 .../otp/modules/bikeshare/bikeshare-style.css |   0
 .../multimodal/MultimodalPlannerModule.js     |   0
 .../modules/multimodal/multimodal-style.css   |   0
 .../js/otp/modules/planner/IconFactory.js     |   0
 .../otp/modules/planner/ItinerariesWidget.js  |   0
 .../js/otp/modules/planner/Itinerary.js       |   0
 .../js/otp/modules/planner/PlannerModule.js   |   0
 .../js/otp/modules/planner/TripPlan.js        |   0
 .../planner/images/mode/mode_bubble.psd       | Bin
 .../planner/images/mode/mode_bubble_ne.png    | Bin
 .../images/mode/mode_bubble_ne_highlight.png  | Bin
 .../planner/images/mode/mode_bubble_nw.png    | Bin
 .../images/mode/mode_bubble_nw_highlight.png  | Bin
 .../planner/images/mode/mode_bubble_se.png    | Bin
 .../images/mode/mode_bubble_se_highlight.png  | Bin
 .../planner/images/mode/mode_bubble_sw.png    | Bin
 .../images/mode/mode_bubble_sw_highlight.png  | Bin
 .../otp/modules/planner/images/user_icon.png  | Bin
 .../js/otp/modules/planner/planner-style.css  |   0
 .../modules/planner/planner-templates.html    |   0
 src/client/{ => classic-debug}/js/otp/otp.js  |   0
 .../{ => classic-debug}/js/otp/templates.js   |   0
 .../js/otp/util/DataStorage.js                |   0
 .../{ => classic-debug}/js/otp/util/Geo.js    |   0
 .../js/otp/util/Imperial.js                   |   0
 .../{ => classic-debug}/js/otp/util/Itin.js   |   0
 .../{ => classic-debug}/js/otp/util/Logger.js |   0
 .../{ => classic-debug}/js/otp/util/Text.js   |   0
 .../{ => classic-debug}/js/otp/util/Time.js   |   0
 .../js/otp/widgets/Dialogs.js                 |   0
 .../js/otp/widgets/InfoWidget.js              |   0
 .../js/otp/widgets/Widget.js                  |   0
 .../js/otp/widgets/WidgetManager.js           |   0
 .../otp/widgets/transit/RouteBasedWidget.js   |   0
 .../otp/widgets/transit/StopFinderWidget.js   |   0
 .../otp/widgets/transit/StopViewerWidget.js   |   0
 .../otp/widgets/transit/TripViewerWidget.js   |   0
 .../widgets/transit/widgets-transit-style.css |   0
 .../transit/widgets-transit-templates.html    |   0
 .../widgets/tripoptions/BikeTrianglePanel.js  |   0
 .../tripoptions/RoutesSelectorWidget.js       |   0
 .../widgets/tripoptions/TripOptionsWidget.js  |   0
 .../widgets/tripoptions/tripoptions-style.css |   0
 .../tripoptions/tripoptions-templates.html    |   0
 .../js/otp/widgets/widget-style.css           |   0
 .../js/otp/widgets/widget-templates.html      |   0
 src/client/{ => classic-debug}/style.css      |   0
 src/client/debug-client-preview/index.html    |  14 --
 src/client/index.html                         | 232 +-----------------
 258 files changed, 238 insertions(+), 238 deletions(-)
 rename src/client/{ => classic-debug}/i18n/babel.cfg (100%)
 rename src/client/{ => classic-debug}/i18n/ca_ES.po (100%)
 rename src/client/{ => classic-debug}/i18n/de.po (100%)
 rename src/client/{ => classic-debug}/i18n/en.po (100%)
 rename src/client/{ => classic-debug}/i18n/es.po (100%)
 rename src/client/{ => classic-debug}/i18n/fr.po (100%)
 rename src/client/{ => classic-debug}/i18n/hu.po (100%)
 rename src/client/{ => classic-debug}/i18n/it.po (100%)
 rename src/client/{ => classic-debug}/i18n/messages.pot (100%)
 rename src/client/{ => classic-debug}/i18n/no.po (100%)
 rename src/client/{ => classic-debug}/i18n/pl.po (100%)
 rename src/client/{ => classic-debug}/i18n/pt.po (100%)
 rename src/client/{ => classic-debug}/i18n/sl.po (100%)
 rename src/client/{ => classic-debug}/images/agency_logo.png (100%)
 rename src/client/{ => classic-debug}/images/alert.png (100%)
 rename src/client/{ => classic-debug}/images/bicycle_green.png (100%)
 rename src/client/{ => classic-debug}/images/bicycle_green_small.png (100%)
 rename src/client/{ => classic-debug}/images/bicycle_red.png (100%)
 rename src/client/{ => classic-debug}/images/bicycle_red_small.png (100%)
 rename src/client/{ => classic-debug}/images/directions/circle_clockwise.png (100%)
 rename src/client/{ => classic-debug}/images/directions/circle_counterclockwise.png (100%)
 rename src/client/{ => classic-debug}/images/directions/clear.png (100%)
 rename src/client/{ => classic-debug}/images/directions/continue.png (100%)
 rename src/client/{ => classic-debug}/images/directions/depart.png (100%)
 rename src/client/{ => classic-debug}/images/directions/direction_icons.svg (100%)
 rename src/client/{ => classic-debug}/images/directions/elevator.png (100%)
 rename src/client/{ => classic-debug}/images/directions/enter_station.png (100%)
 rename src/client/{ => classic-debug}/images/directions/exit_left.png (100%)
 rename src/client/{ => classic-debug}/images/directions/exit_right.png (100%)
 rename src/client/{ => classic-debug}/images/directions/exit_station.png (100%)
 rename src/client/{ => classic-debug}/images/directions/follow_signs.png (100%)
 rename src/client/{ => classic-debug}/images/directions/hard_left.png (100%)
 rename src/client/{ => classic-debug}/images/directions/hard_right.png (100%)
 rename src/client/{ => classic-debug}/images/directions/left.png (100%)
 rename src/client/{ => classic-debug}/images/directions/merge.png (100%)
 rename src/client/{ => classic-debug}/images/directions/right.png (100%)
 rename src/client/{ => classic-debug}/images/directions/slightly_left.png (100%)
 rename src/client/{ => classic-debug}/images/directions/slightly_right.png (100%)
 rename src/client/{ => classic-debug}/images/directions/turn_left.png (100%)
 rename src/client/{ => classic-debug}/images/directions/turn_right.png (100%)
 rename src/client/{ => classic-debug}/images/directions/uturn_left.png (100%)
 rename src/client/{ => classic-debug}/images/directions/uturn_right.png (100%)
 rename src/client/{ => classic-debug}/images/flag_marker_green.png (100%)
 rename src/client/{ => classic-debug}/images/flag_marker_red.png (100%)
 rename src/client/{ => classic-debug}/images/gear.svg (100%)
 rename src/client/{ => classic-debug}/images/language_icon.png (100%)
 rename src/client/{ => classic-debug}/images/language_icon.svg (100%)
 rename src/client/{ => classic-debug}/images/marker-0pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-100pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-25pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-50pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-75pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-bike-green-shadowed.png (100%)
 rename src/client/{ => classic-debug}/images/marker-bike-green.png (100%)
 rename src/client/{ => classic-debug}/images/marker-bike-red-shadowed.png (100%)
 rename src/client/{ => classic-debug}/images/marker-bike-red.png (100%)
 rename src/client/{ => classic-debug}/images/marker-bike-shadow.png (100%)
 rename src/client/{ => classic-debug}/images/marker-blue-med.png (100%)
 rename src/client/{ => classic-debug}/images/marker-blue-nub.png (100%)
 rename src/client/{ => classic-debug}/images/marker-blue-sm.png (100%)
 rename src/client/{ => classic-debug}/images/marker-flag-end-shadowed.png (100%)
 rename src/client/{ => classic-debug}/images/marker-flag-end.png (100%)
 rename src/client/{ => classic-debug}/images/marker-flag-shadow.png (100%)
 rename src/client/{ => classic-debug}/images/marker-flag-start-shadowed.png (100%)
 rename src/client/{ => classic-debug}/images/marker-flag-start.png (100%)
 rename src/client/{ => classic-debug}/images/marker-med-0pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-med-100pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-med-25pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-med-50pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-med-75pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-sm-0pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-sm-100pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-sm-25pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-sm-50pct.png (100%)
 rename src/client/{ => classic-debug}/images/marker-sm-75pct.png (100%)
 rename src/client/{ => classic-debug}/images/mode/airplane.png (100%)
 rename src/client/{ => classic-debug}/images/mode/arrow-left.png (100%)
 rename src/client/{ => classic-debug}/images/mode/arrow.png (100%)
 rename src/client/{ => classic-debug}/images/mode/bicycle.png (100%)
 rename src/client/{ => classic-debug}/images/mode/bicycle_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/bus.png (100%)
 rename src/client/{ => classic-debug}/images/mode/bus_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/cable_car.png (100%)
 rename src/client/{ => classic-debug}/images/mode/car.png (100%)
 rename src/client/{ => classic-debug}/images/mode/car_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/carpool.png (100%)
 rename src/client/{ => classic-debug}/images/mode/carpool_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/coach.png (100%)
 rename src/client/{ => classic-debug}/images/mode/ferry.png (100%)
 rename src/client/{ => classic-debug}/images/mode/ferry_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/funicular.png (100%)
 rename src/client/{ => classic-debug}/images/mode/gondola.png (100%)
 rename src/client/{ => classic-debug}/images/mode/gondola_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble.psd (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_ne.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_ne_highlight.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_nw.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_nw_highlight.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_se.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_se_highlight.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_sw.png (100%)
 rename src/client/{ => classic-debug}/images/mode/mode_bubble_sw_highlight.png (100%)
 rename src/client/{ => classic-debug}/images/mode/monorail.png (100%)
 rename src/client/{ => classic-debug}/images/mode/rail.png (100%)
 rename src/client/{ => classic-debug}/images/mode/rail_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/scooter.png (100%)
 rename src/client/{ => classic-debug}/images/mode/subway.png (100%)
 rename src/client/{ => classic-debug}/images/mode/subway_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/taxi.png (100%)
 rename src/client/{ => classic-debug}/images/mode/tram.png (100%)
 rename src/client/{ => classic-debug}/images/mode/tram_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/mode/trolleybus.png (100%)
 rename src/client/{ => classic-debug}/images/mode/walk.png (100%)
 rename src/client/{ => classic-debug}/images/mode/walk_darkbg.png (100%)
 rename src/client/{ => classic-debug}/images/openplans-logo-20x20.png (100%)
 rename src/client/{ => classic-debug}/images/openplans-logo-40x40.png (100%)
 rename src/client/{ => classic-debug}/images/openplans-logo-gray.gif (100%)
 rename src/client/{ => classic-debug}/images/otp_logo_40px.png (100%)
 rename src/client/{ => classic-debug}/images/otp_logo_darkbg_40px.png (100%)
 rename src/client/{ => classic-debug}/images/reverse.png (100%)
 rename src/client/{ => classic-debug}/images/shadow.png (100%)
 rename src/client/{ => classic-debug}/images/spinner.gif (100%)
 rename src/client/{ => classic-debug}/images/stop20.png (100%)
 rename src/client/{ => classic-debug}/images/widget-trip-stop-first.png (100%)
 rename src/client/{ => classic-debug}/images/widget-trip-stop-last.png (100%)
 rename src/client/{ => classic-debug}/images/widget-trip-stop-middle.png (100%)
 create mode 100644 src/client/classic-debug/index.html
 rename src/client/{ => classic-debug}/js/lib/ICanHaz.js (100%)
 rename src/client/{ => classic-debug}/js/lib/backbone-min.js (100%)
 rename src/client/{ => classic-debug}/js/lib/backbone.js (100%)
 rename src/client/{ => classic-debug}/js/lib/i18next-1.7.3.min.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/addons/jquery-ui-timepicker.css (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/addons/jquery-ui-timepicker.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/js/jquery-1.8.2.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js (100%)
 rename src/client/{ => classic-debug}/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js (100%)
 rename src/client/{ => classic-debug}/js/otp/config.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/ContextMenu.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/Geocoder.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/GeocoderBag.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/GeocoderBuiltin.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/IndexApi.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/Map.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/MapContextMenu.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/PopupMenu.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/QueryLogger.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/SOLRGeocoder.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/TransitIndex.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/TripPlan.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/Webapp.js (100%)
 rename src/client/{ => classic-debug}/js/otp/core/WidgetManagerMenu.js (100%)
 rename src/client/{ => classic-debug}/js/otp/debug.js (100%)
 rename src/client/{ => classic-debug}/js/otp/layers/AreaStopsLayer.js (100%)
 rename src/client/{ => classic-debug}/js/otp/layers/GeofencingZonesLayer.js (100%)
 rename src/client/{ => classic-debug}/js/otp/layers/StopsLayer.js (100%)
 rename src/client/{ => classic-debug}/js/otp/layers/layers-templates.html (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Catalan.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/English.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/French.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/German.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Hungarian.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Italian.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Norwegian.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Polish.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Portuguese.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Slovenian.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/Spanish.js (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/ca_ES.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/de.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/en.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/es.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/fr.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/hu.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/it.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/no.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/pl.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/pt.json (100%)
 rename src/client/{ => classic-debug}/js/otp/locale/sl.json (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/Module.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/bikeshare/BikeShareModule.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/bikeshare/BikeStationsWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/bikeshare/bikeshare-style.css (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/multimodal/MultimodalPlannerModule.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/multimodal/multimodal-style.css (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/IconFactory.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/ItinerariesWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/Itinerary.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/PlannerModule.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/TripPlan.js (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble.psd (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_ne.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_nw.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_se.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_sw.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/images/user_icon.png (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/planner-style.css (100%)
 rename src/client/{ => classic-debug}/js/otp/modules/planner/planner-templates.html (100%)
 rename src/client/{ => classic-debug}/js/otp/otp.js (100%)
 rename src/client/{ => classic-debug}/js/otp/templates.js (100%)
 rename src/client/{ => classic-debug}/js/otp/util/DataStorage.js (100%)
 rename src/client/{ => classic-debug}/js/otp/util/Geo.js (100%)
 rename src/client/{ => classic-debug}/js/otp/util/Imperial.js (100%)
 rename src/client/{ => classic-debug}/js/otp/util/Itin.js (100%)
 rename src/client/{ => classic-debug}/js/otp/util/Logger.js (100%)
 rename src/client/{ => classic-debug}/js/otp/util/Text.js (100%)
 rename src/client/{ => classic-debug}/js/otp/util/Time.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/Dialogs.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/InfoWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/Widget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/WidgetManager.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/transit/RouteBasedWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/transit/StopFinderWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/transit/StopViewerWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/transit/TripViewerWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/transit/widgets-transit-style.css (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/transit/widgets-transit-templates.html (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/tripoptions/BikeTrianglePanel.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/tripoptions/RoutesSelectorWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/tripoptions/TripOptionsWidget.js (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/tripoptions/tripoptions-style.css (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/tripoptions/tripoptions-templates.html (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/widget-style.css (100%)
 rename src/client/{ => classic-debug}/js/otp/widgets/widget-templates.html (100%)
 rename src/client/{ => classic-debug}/style.css (100%)
 delete mode 100644 src/client/debug-client-preview/index.html

diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml
index 56304db88f2..15d495e6454 100644
--- a/.github/workflows/debug-client.yml
+++ b/.github/workflows/debug-client.yml
@@ -76,8 +76,8 @@ jobs:
           git checkout dev-2.x
           git pull --rebase
           
-          CLIENT_HTML_OUTPUT=src/client/debug-client-preview/index.html
-          mkdir -p src/client/debug-client-preview/
+          CLIENT_HTML_OUTPUT=src/client/index.html
+          mkdir -p src/client/
           cp client-next/output/index.html ${CLIENT_HTML_OUTPUT}
           
           # just to debug
diff --git a/client-next/vite.config.ts b/client-next/vite.config.ts
index 69bfec7f396..af49d327516 100644
--- a/client-next/vite.config.ts
+++ b/client-next/vite.config.ts
@@ -4,7 +4,7 @@ import react from '@vitejs/plugin-react';
 // https://vitejs.dev/config/
 export default defineConfig({
   plugins: [react()],
-  base: '/debug-client-preview/',
+  base: '/',
   build: {
     outDir: 'output',
     emptyOutDir: true,
diff --git a/src/client/WEB-INF/web_client.xml b/src/client/WEB-INF/web_client.xml
index d46bb48d151..7fa042e3de9 100644
--- a/src/client/WEB-INF/web_client.xml
+++ b/src/client/WEB-INF/web_client.xml
@@ -3,9 +3,9 @@
  "http://java.sun.com/dtd/web-app_2_3.dtd" >
 
 
-  OTP Leaflet Client
+  OTP Client
   
     js
-    application/x-javascript
+    application/javascript
   
 
diff --git a/src/client/i18n/babel.cfg b/src/client/classic-debug/i18n/babel.cfg
similarity index 100%
rename from src/client/i18n/babel.cfg
rename to src/client/classic-debug/i18n/babel.cfg
diff --git a/src/client/i18n/ca_ES.po b/src/client/classic-debug/i18n/ca_ES.po
similarity index 100%
rename from src/client/i18n/ca_ES.po
rename to src/client/classic-debug/i18n/ca_ES.po
diff --git a/src/client/i18n/de.po b/src/client/classic-debug/i18n/de.po
similarity index 100%
rename from src/client/i18n/de.po
rename to src/client/classic-debug/i18n/de.po
diff --git a/src/client/i18n/en.po b/src/client/classic-debug/i18n/en.po
similarity index 100%
rename from src/client/i18n/en.po
rename to src/client/classic-debug/i18n/en.po
diff --git a/src/client/i18n/es.po b/src/client/classic-debug/i18n/es.po
similarity index 100%
rename from src/client/i18n/es.po
rename to src/client/classic-debug/i18n/es.po
diff --git a/src/client/i18n/fr.po b/src/client/classic-debug/i18n/fr.po
similarity index 100%
rename from src/client/i18n/fr.po
rename to src/client/classic-debug/i18n/fr.po
diff --git a/src/client/i18n/hu.po b/src/client/classic-debug/i18n/hu.po
similarity index 100%
rename from src/client/i18n/hu.po
rename to src/client/classic-debug/i18n/hu.po
diff --git a/src/client/i18n/it.po b/src/client/classic-debug/i18n/it.po
similarity index 100%
rename from src/client/i18n/it.po
rename to src/client/classic-debug/i18n/it.po
diff --git a/src/client/i18n/messages.pot b/src/client/classic-debug/i18n/messages.pot
similarity index 100%
rename from src/client/i18n/messages.pot
rename to src/client/classic-debug/i18n/messages.pot
diff --git a/src/client/i18n/no.po b/src/client/classic-debug/i18n/no.po
similarity index 100%
rename from src/client/i18n/no.po
rename to src/client/classic-debug/i18n/no.po
diff --git a/src/client/i18n/pl.po b/src/client/classic-debug/i18n/pl.po
similarity index 100%
rename from src/client/i18n/pl.po
rename to src/client/classic-debug/i18n/pl.po
diff --git a/src/client/i18n/pt.po b/src/client/classic-debug/i18n/pt.po
similarity index 100%
rename from src/client/i18n/pt.po
rename to src/client/classic-debug/i18n/pt.po
diff --git a/src/client/i18n/sl.po b/src/client/classic-debug/i18n/sl.po
similarity index 100%
rename from src/client/i18n/sl.po
rename to src/client/classic-debug/i18n/sl.po
diff --git a/src/client/images/agency_logo.png b/src/client/classic-debug/images/agency_logo.png
similarity index 100%
rename from src/client/images/agency_logo.png
rename to src/client/classic-debug/images/agency_logo.png
diff --git a/src/client/images/alert.png b/src/client/classic-debug/images/alert.png
similarity index 100%
rename from src/client/images/alert.png
rename to src/client/classic-debug/images/alert.png
diff --git a/src/client/images/bicycle_green.png b/src/client/classic-debug/images/bicycle_green.png
similarity index 100%
rename from src/client/images/bicycle_green.png
rename to src/client/classic-debug/images/bicycle_green.png
diff --git a/src/client/images/bicycle_green_small.png b/src/client/classic-debug/images/bicycle_green_small.png
similarity index 100%
rename from src/client/images/bicycle_green_small.png
rename to src/client/classic-debug/images/bicycle_green_small.png
diff --git a/src/client/images/bicycle_red.png b/src/client/classic-debug/images/bicycle_red.png
similarity index 100%
rename from src/client/images/bicycle_red.png
rename to src/client/classic-debug/images/bicycle_red.png
diff --git a/src/client/images/bicycle_red_small.png b/src/client/classic-debug/images/bicycle_red_small.png
similarity index 100%
rename from src/client/images/bicycle_red_small.png
rename to src/client/classic-debug/images/bicycle_red_small.png
diff --git a/src/client/images/directions/circle_clockwise.png b/src/client/classic-debug/images/directions/circle_clockwise.png
similarity index 100%
rename from src/client/images/directions/circle_clockwise.png
rename to src/client/classic-debug/images/directions/circle_clockwise.png
diff --git a/src/client/images/directions/circle_counterclockwise.png b/src/client/classic-debug/images/directions/circle_counterclockwise.png
similarity index 100%
rename from src/client/images/directions/circle_counterclockwise.png
rename to src/client/classic-debug/images/directions/circle_counterclockwise.png
diff --git a/src/client/images/directions/clear.png b/src/client/classic-debug/images/directions/clear.png
similarity index 100%
rename from src/client/images/directions/clear.png
rename to src/client/classic-debug/images/directions/clear.png
diff --git a/src/client/images/directions/continue.png b/src/client/classic-debug/images/directions/continue.png
similarity index 100%
rename from src/client/images/directions/continue.png
rename to src/client/classic-debug/images/directions/continue.png
diff --git a/src/client/images/directions/depart.png b/src/client/classic-debug/images/directions/depart.png
similarity index 100%
rename from src/client/images/directions/depart.png
rename to src/client/classic-debug/images/directions/depart.png
diff --git a/src/client/images/directions/direction_icons.svg b/src/client/classic-debug/images/directions/direction_icons.svg
similarity index 100%
rename from src/client/images/directions/direction_icons.svg
rename to src/client/classic-debug/images/directions/direction_icons.svg
diff --git a/src/client/images/directions/elevator.png b/src/client/classic-debug/images/directions/elevator.png
similarity index 100%
rename from src/client/images/directions/elevator.png
rename to src/client/classic-debug/images/directions/elevator.png
diff --git a/src/client/images/directions/enter_station.png b/src/client/classic-debug/images/directions/enter_station.png
similarity index 100%
rename from src/client/images/directions/enter_station.png
rename to src/client/classic-debug/images/directions/enter_station.png
diff --git a/src/client/images/directions/exit_left.png b/src/client/classic-debug/images/directions/exit_left.png
similarity index 100%
rename from src/client/images/directions/exit_left.png
rename to src/client/classic-debug/images/directions/exit_left.png
diff --git a/src/client/images/directions/exit_right.png b/src/client/classic-debug/images/directions/exit_right.png
similarity index 100%
rename from src/client/images/directions/exit_right.png
rename to src/client/classic-debug/images/directions/exit_right.png
diff --git a/src/client/images/directions/exit_station.png b/src/client/classic-debug/images/directions/exit_station.png
similarity index 100%
rename from src/client/images/directions/exit_station.png
rename to src/client/classic-debug/images/directions/exit_station.png
diff --git a/src/client/images/directions/follow_signs.png b/src/client/classic-debug/images/directions/follow_signs.png
similarity index 100%
rename from src/client/images/directions/follow_signs.png
rename to src/client/classic-debug/images/directions/follow_signs.png
diff --git a/src/client/images/directions/hard_left.png b/src/client/classic-debug/images/directions/hard_left.png
similarity index 100%
rename from src/client/images/directions/hard_left.png
rename to src/client/classic-debug/images/directions/hard_left.png
diff --git a/src/client/images/directions/hard_right.png b/src/client/classic-debug/images/directions/hard_right.png
similarity index 100%
rename from src/client/images/directions/hard_right.png
rename to src/client/classic-debug/images/directions/hard_right.png
diff --git a/src/client/images/directions/left.png b/src/client/classic-debug/images/directions/left.png
similarity index 100%
rename from src/client/images/directions/left.png
rename to src/client/classic-debug/images/directions/left.png
diff --git a/src/client/images/directions/merge.png b/src/client/classic-debug/images/directions/merge.png
similarity index 100%
rename from src/client/images/directions/merge.png
rename to src/client/classic-debug/images/directions/merge.png
diff --git a/src/client/images/directions/right.png b/src/client/classic-debug/images/directions/right.png
similarity index 100%
rename from src/client/images/directions/right.png
rename to src/client/classic-debug/images/directions/right.png
diff --git a/src/client/images/directions/slightly_left.png b/src/client/classic-debug/images/directions/slightly_left.png
similarity index 100%
rename from src/client/images/directions/slightly_left.png
rename to src/client/classic-debug/images/directions/slightly_left.png
diff --git a/src/client/images/directions/slightly_right.png b/src/client/classic-debug/images/directions/slightly_right.png
similarity index 100%
rename from src/client/images/directions/slightly_right.png
rename to src/client/classic-debug/images/directions/slightly_right.png
diff --git a/src/client/images/directions/turn_left.png b/src/client/classic-debug/images/directions/turn_left.png
similarity index 100%
rename from src/client/images/directions/turn_left.png
rename to src/client/classic-debug/images/directions/turn_left.png
diff --git a/src/client/images/directions/turn_right.png b/src/client/classic-debug/images/directions/turn_right.png
similarity index 100%
rename from src/client/images/directions/turn_right.png
rename to src/client/classic-debug/images/directions/turn_right.png
diff --git a/src/client/images/directions/uturn_left.png b/src/client/classic-debug/images/directions/uturn_left.png
similarity index 100%
rename from src/client/images/directions/uturn_left.png
rename to src/client/classic-debug/images/directions/uturn_left.png
diff --git a/src/client/images/directions/uturn_right.png b/src/client/classic-debug/images/directions/uturn_right.png
similarity index 100%
rename from src/client/images/directions/uturn_right.png
rename to src/client/classic-debug/images/directions/uturn_right.png
diff --git a/src/client/images/flag_marker_green.png b/src/client/classic-debug/images/flag_marker_green.png
similarity index 100%
rename from src/client/images/flag_marker_green.png
rename to src/client/classic-debug/images/flag_marker_green.png
diff --git a/src/client/images/flag_marker_red.png b/src/client/classic-debug/images/flag_marker_red.png
similarity index 100%
rename from src/client/images/flag_marker_red.png
rename to src/client/classic-debug/images/flag_marker_red.png
diff --git a/src/client/images/gear.svg b/src/client/classic-debug/images/gear.svg
similarity index 100%
rename from src/client/images/gear.svg
rename to src/client/classic-debug/images/gear.svg
diff --git a/src/client/images/language_icon.png b/src/client/classic-debug/images/language_icon.png
similarity index 100%
rename from src/client/images/language_icon.png
rename to src/client/classic-debug/images/language_icon.png
diff --git a/src/client/images/language_icon.svg b/src/client/classic-debug/images/language_icon.svg
similarity index 100%
rename from src/client/images/language_icon.svg
rename to src/client/classic-debug/images/language_icon.svg
diff --git a/src/client/images/marker-0pct.png b/src/client/classic-debug/images/marker-0pct.png
similarity index 100%
rename from src/client/images/marker-0pct.png
rename to src/client/classic-debug/images/marker-0pct.png
diff --git a/src/client/images/marker-100pct.png b/src/client/classic-debug/images/marker-100pct.png
similarity index 100%
rename from src/client/images/marker-100pct.png
rename to src/client/classic-debug/images/marker-100pct.png
diff --git a/src/client/images/marker-25pct.png b/src/client/classic-debug/images/marker-25pct.png
similarity index 100%
rename from src/client/images/marker-25pct.png
rename to src/client/classic-debug/images/marker-25pct.png
diff --git a/src/client/images/marker-50pct.png b/src/client/classic-debug/images/marker-50pct.png
similarity index 100%
rename from src/client/images/marker-50pct.png
rename to src/client/classic-debug/images/marker-50pct.png
diff --git a/src/client/images/marker-75pct.png b/src/client/classic-debug/images/marker-75pct.png
similarity index 100%
rename from src/client/images/marker-75pct.png
rename to src/client/classic-debug/images/marker-75pct.png
diff --git a/src/client/images/marker-bike-green-shadowed.png b/src/client/classic-debug/images/marker-bike-green-shadowed.png
similarity index 100%
rename from src/client/images/marker-bike-green-shadowed.png
rename to src/client/classic-debug/images/marker-bike-green-shadowed.png
diff --git a/src/client/images/marker-bike-green.png b/src/client/classic-debug/images/marker-bike-green.png
similarity index 100%
rename from src/client/images/marker-bike-green.png
rename to src/client/classic-debug/images/marker-bike-green.png
diff --git a/src/client/images/marker-bike-red-shadowed.png b/src/client/classic-debug/images/marker-bike-red-shadowed.png
similarity index 100%
rename from src/client/images/marker-bike-red-shadowed.png
rename to src/client/classic-debug/images/marker-bike-red-shadowed.png
diff --git a/src/client/images/marker-bike-red.png b/src/client/classic-debug/images/marker-bike-red.png
similarity index 100%
rename from src/client/images/marker-bike-red.png
rename to src/client/classic-debug/images/marker-bike-red.png
diff --git a/src/client/images/marker-bike-shadow.png b/src/client/classic-debug/images/marker-bike-shadow.png
similarity index 100%
rename from src/client/images/marker-bike-shadow.png
rename to src/client/classic-debug/images/marker-bike-shadow.png
diff --git a/src/client/images/marker-blue-med.png b/src/client/classic-debug/images/marker-blue-med.png
similarity index 100%
rename from src/client/images/marker-blue-med.png
rename to src/client/classic-debug/images/marker-blue-med.png
diff --git a/src/client/images/marker-blue-nub.png b/src/client/classic-debug/images/marker-blue-nub.png
similarity index 100%
rename from src/client/images/marker-blue-nub.png
rename to src/client/classic-debug/images/marker-blue-nub.png
diff --git a/src/client/images/marker-blue-sm.png b/src/client/classic-debug/images/marker-blue-sm.png
similarity index 100%
rename from src/client/images/marker-blue-sm.png
rename to src/client/classic-debug/images/marker-blue-sm.png
diff --git a/src/client/images/marker-flag-end-shadowed.png b/src/client/classic-debug/images/marker-flag-end-shadowed.png
similarity index 100%
rename from src/client/images/marker-flag-end-shadowed.png
rename to src/client/classic-debug/images/marker-flag-end-shadowed.png
diff --git a/src/client/images/marker-flag-end.png b/src/client/classic-debug/images/marker-flag-end.png
similarity index 100%
rename from src/client/images/marker-flag-end.png
rename to src/client/classic-debug/images/marker-flag-end.png
diff --git a/src/client/images/marker-flag-shadow.png b/src/client/classic-debug/images/marker-flag-shadow.png
similarity index 100%
rename from src/client/images/marker-flag-shadow.png
rename to src/client/classic-debug/images/marker-flag-shadow.png
diff --git a/src/client/images/marker-flag-start-shadowed.png b/src/client/classic-debug/images/marker-flag-start-shadowed.png
similarity index 100%
rename from src/client/images/marker-flag-start-shadowed.png
rename to src/client/classic-debug/images/marker-flag-start-shadowed.png
diff --git a/src/client/images/marker-flag-start.png b/src/client/classic-debug/images/marker-flag-start.png
similarity index 100%
rename from src/client/images/marker-flag-start.png
rename to src/client/classic-debug/images/marker-flag-start.png
diff --git a/src/client/images/marker-med-0pct.png b/src/client/classic-debug/images/marker-med-0pct.png
similarity index 100%
rename from src/client/images/marker-med-0pct.png
rename to src/client/classic-debug/images/marker-med-0pct.png
diff --git a/src/client/images/marker-med-100pct.png b/src/client/classic-debug/images/marker-med-100pct.png
similarity index 100%
rename from src/client/images/marker-med-100pct.png
rename to src/client/classic-debug/images/marker-med-100pct.png
diff --git a/src/client/images/marker-med-25pct.png b/src/client/classic-debug/images/marker-med-25pct.png
similarity index 100%
rename from src/client/images/marker-med-25pct.png
rename to src/client/classic-debug/images/marker-med-25pct.png
diff --git a/src/client/images/marker-med-50pct.png b/src/client/classic-debug/images/marker-med-50pct.png
similarity index 100%
rename from src/client/images/marker-med-50pct.png
rename to src/client/classic-debug/images/marker-med-50pct.png
diff --git a/src/client/images/marker-med-75pct.png b/src/client/classic-debug/images/marker-med-75pct.png
similarity index 100%
rename from src/client/images/marker-med-75pct.png
rename to src/client/classic-debug/images/marker-med-75pct.png
diff --git a/src/client/images/marker-sm-0pct.png b/src/client/classic-debug/images/marker-sm-0pct.png
similarity index 100%
rename from src/client/images/marker-sm-0pct.png
rename to src/client/classic-debug/images/marker-sm-0pct.png
diff --git a/src/client/images/marker-sm-100pct.png b/src/client/classic-debug/images/marker-sm-100pct.png
similarity index 100%
rename from src/client/images/marker-sm-100pct.png
rename to src/client/classic-debug/images/marker-sm-100pct.png
diff --git a/src/client/images/marker-sm-25pct.png b/src/client/classic-debug/images/marker-sm-25pct.png
similarity index 100%
rename from src/client/images/marker-sm-25pct.png
rename to src/client/classic-debug/images/marker-sm-25pct.png
diff --git a/src/client/images/marker-sm-50pct.png b/src/client/classic-debug/images/marker-sm-50pct.png
similarity index 100%
rename from src/client/images/marker-sm-50pct.png
rename to src/client/classic-debug/images/marker-sm-50pct.png
diff --git a/src/client/images/marker-sm-75pct.png b/src/client/classic-debug/images/marker-sm-75pct.png
similarity index 100%
rename from src/client/images/marker-sm-75pct.png
rename to src/client/classic-debug/images/marker-sm-75pct.png
diff --git a/src/client/images/mode/airplane.png b/src/client/classic-debug/images/mode/airplane.png
similarity index 100%
rename from src/client/images/mode/airplane.png
rename to src/client/classic-debug/images/mode/airplane.png
diff --git a/src/client/images/mode/arrow-left.png b/src/client/classic-debug/images/mode/arrow-left.png
similarity index 100%
rename from src/client/images/mode/arrow-left.png
rename to src/client/classic-debug/images/mode/arrow-left.png
diff --git a/src/client/images/mode/arrow.png b/src/client/classic-debug/images/mode/arrow.png
similarity index 100%
rename from src/client/images/mode/arrow.png
rename to src/client/classic-debug/images/mode/arrow.png
diff --git a/src/client/images/mode/bicycle.png b/src/client/classic-debug/images/mode/bicycle.png
similarity index 100%
rename from src/client/images/mode/bicycle.png
rename to src/client/classic-debug/images/mode/bicycle.png
diff --git a/src/client/images/mode/bicycle_darkbg.png b/src/client/classic-debug/images/mode/bicycle_darkbg.png
similarity index 100%
rename from src/client/images/mode/bicycle_darkbg.png
rename to src/client/classic-debug/images/mode/bicycle_darkbg.png
diff --git a/src/client/images/mode/bus.png b/src/client/classic-debug/images/mode/bus.png
similarity index 100%
rename from src/client/images/mode/bus.png
rename to src/client/classic-debug/images/mode/bus.png
diff --git a/src/client/images/mode/bus_darkbg.png b/src/client/classic-debug/images/mode/bus_darkbg.png
similarity index 100%
rename from src/client/images/mode/bus_darkbg.png
rename to src/client/classic-debug/images/mode/bus_darkbg.png
diff --git a/src/client/images/mode/cable_car.png b/src/client/classic-debug/images/mode/cable_car.png
similarity index 100%
rename from src/client/images/mode/cable_car.png
rename to src/client/classic-debug/images/mode/cable_car.png
diff --git a/src/client/images/mode/car.png b/src/client/classic-debug/images/mode/car.png
similarity index 100%
rename from src/client/images/mode/car.png
rename to src/client/classic-debug/images/mode/car.png
diff --git a/src/client/images/mode/car_darkbg.png b/src/client/classic-debug/images/mode/car_darkbg.png
similarity index 100%
rename from src/client/images/mode/car_darkbg.png
rename to src/client/classic-debug/images/mode/car_darkbg.png
diff --git a/src/client/images/mode/carpool.png b/src/client/classic-debug/images/mode/carpool.png
similarity index 100%
rename from src/client/images/mode/carpool.png
rename to src/client/classic-debug/images/mode/carpool.png
diff --git a/src/client/images/mode/carpool_darkbg.png b/src/client/classic-debug/images/mode/carpool_darkbg.png
similarity index 100%
rename from src/client/images/mode/carpool_darkbg.png
rename to src/client/classic-debug/images/mode/carpool_darkbg.png
diff --git a/src/client/images/mode/coach.png b/src/client/classic-debug/images/mode/coach.png
similarity index 100%
rename from src/client/images/mode/coach.png
rename to src/client/classic-debug/images/mode/coach.png
diff --git a/src/client/images/mode/ferry.png b/src/client/classic-debug/images/mode/ferry.png
similarity index 100%
rename from src/client/images/mode/ferry.png
rename to src/client/classic-debug/images/mode/ferry.png
diff --git a/src/client/images/mode/ferry_darkbg.png b/src/client/classic-debug/images/mode/ferry_darkbg.png
similarity index 100%
rename from src/client/images/mode/ferry_darkbg.png
rename to src/client/classic-debug/images/mode/ferry_darkbg.png
diff --git a/src/client/images/mode/funicular.png b/src/client/classic-debug/images/mode/funicular.png
similarity index 100%
rename from src/client/images/mode/funicular.png
rename to src/client/classic-debug/images/mode/funicular.png
diff --git a/src/client/images/mode/gondola.png b/src/client/classic-debug/images/mode/gondola.png
similarity index 100%
rename from src/client/images/mode/gondola.png
rename to src/client/classic-debug/images/mode/gondola.png
diff --git a/src/client/images/mode/gondola_darkbg.png b/src/client/classic-debug/images/mode/gondola_darkbg.png
similarity index 100%
rename from src/client/images/mode/gondola_darkbg.png
rename to src/client/classic-debug/images/mode/gondola_darkbg.png
diff --git a/src/client/images/mode/mode_bubble.psd b/src/client/classic-debug/images/mode/mode_bubble.psd
similarity index 100%
rename from src/client/images/mode/mode_bubble.psd
rename to src/client/classic-debug/images/mode/mode_bubble.psd
diff --git a/src/client/images/mode/mode_bubble_ne.png b/src/client/classic-debug/images/mode/mode_bubble_ne.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_ne.png
rename to src/client/classic-debug/images/mode/mode_bubble_ne.png
diff --git a/src/client/images/mode/mode_bubble_ne_highlight.png b/src/client/classic-debug/images/mode/mode_bubble_ne_highlight.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_ne_highlight.png
rename to src/client/classic-debug/images/mode/mode_bubble_ne_highlight.png
diff --git a/src/client/images/mode/mode_bubble_nw.png b/src/client/classic-debug/images/mode/mode_bubble_nw.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_nw.png
rename to src/client/classic-debug/images/mode/mode_bubble_nw.png
diff --git a/src/client/images/mode/mode_bubble_nw_highlight.png b/src/client/classic-debug/images/mode/mode_bubble_nw_highlight.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_nw_highlight.png
rename to src/client/classic-debug/images/mode/mode_bubble_nw_highlight.png
diff --git a/src/client/images/mode/mode_bubble_se.png b/src/client/classic-debug/images/mode/mode_bubble_se.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_se.png
rename to src/client/classic-debug/images/mode/mode_bubble_se.png
diff --git a/src/client/images/mode/mode_bubble_se_highlight.png b/src/client/classic-debug/images/mode/mode_bubble_se_highlight.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_se_highlight.png
rename to src/client/classic-debug/images/mode/mode_bubble_se_highlight.png
diff --git a/src/client/images/mode/mode_bubble_sw.png b/src/client/classic-debug/images/mode/mode_bubble_sw.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_sw.png
rename to src/client/classic-debug/images/mode/mode_bubble_sw.png
diff --git a/src/client/images/mode/mode_bubble_sw_highlight.png b/src/client/classic-debug/images/mode/mode_bubble_sw_highlight.png
similarity index 100%
rename from src/client/images/mode/mode_bubble_sw_highlight.png
rename to src/client/classic-debug/images/mode/mode_bubble_sw_highlight.png
diff --git a/src/client/images/mode/monorail.png b/src/client/classic-debug/images/mode/monorail.png
similarity index 100%
rename from src/client/images/mode/monorail.png
rename to src/client/classic-debug/images/mode/monorail.png
diff --git a/src/client/images/mode/rail.png b/src/client/classic-debug/images/mode/rail.png
similarity index 100%
rename from src/client/images/mode/rail.png
rename to src/client/classic-debug/images/mode/rail.png
diff --git a/src/client/images/mode/rail_darkbg.png b/src/client/classic-debug/images/mode/rail_darkbg.png
similarity index 100%
rename from src/client/images/mode/rail_darkbg.png
rename to src/client/classic-debug/images/mode/rail_darkbg.png
diff --git a/src/client/images/mode/scooter.png b/src/client/classic-debug/images/mode/scooter.png
similarity index 100%
rename from src/client/images/mode/scooter.png
rename to src/client/classic-debug/images/mode/scooter.png
diff --git a/src/client/images/mode/subway.png b/src/client/classic-debug/images/mode/subway.png
similarity index 100%
rename from src/client/images/mode/subway.png
rename to src/client/classic-debug/images/mode/subway.png
diff --git a/src/client/images/mode/subway_darkbg.png b/src/client/classic-debug/images/mode/subway_darkbg.png
similarity index 100%
rename from src/client/images/mode/subway_darkbg.png
rename to src/client/classic-debug/images/mode/subway_darkbg.png
diff --git a/src/client/images/mode/taxi.png b/src/client/classic-debug/images/mode/taxi.png
similarity index 100%
rename from src/client/images/mode/taxi.png
rename to src/client/classic-debug/images/mode/taxi.png
diff --git a/src/client/images/mode/tram.png b/src/client/classic-debug/images/mode/tram.png
similarity index 100%
rename from src/client/images/mode/tram.png
rename to src/client/classic-debug/images/mode/tram.png
diff --git a/src/client/images/mode/tram_darkbg.png b/src/client/classic-debug/images/mode/tram_darkbg.png
similarity index 100%
rename from src/client/images/mode/tram_darkbg.png
rename to src/client/classic-debug/images/mode/tram_darkbg.png
diff --git a/src/client/images/mode/trolleybus.png b/src/client/classic-debug/images/mode/trolleybus.png
similarity index 100%
rename from src/client/images/mode/trolleybus.png
rename to src/client/classic-debug/images/mode/trolleybus.png
diff --git a/src/client/images/mode/walk.png b/src/client/classic-debug/images/mode/walk.png
similarity index 100%
rename from src/client/images/mode/walk.png
rename to src/client/classic-debug/images/mode/walk.png
diff --git a/src/client/images/mode/walk_darkbg.png b/src/client/classic-debug/images/mode/walk_darkbg.png
similarity index 100%
rename from src/client/images/mode/walk_darkbg.png
rename to src/client/classic-debug/images/mode/walk_darkbg.png
diff --git a/src/client/images/openplans-logo-20x20.png b/src/client/classic-debug/images/openplans-logo-20x20.png
similarity index 100%
rename from src/client/images/openplans-logo-20x20.png
rename to src/client/classic-debug/images/openplans-logo-20x20.png
diff --git a/src/client/images/openplans-logo-40x40.png b/src/client/classic-debug/images/openplans-logo-40x40.png
similarity index 100%
rename from src/client/images/openplans-logo-40x40.png
rename to src/client/classic-debug/images/openplans-logo-40x40.png
diff --git a/src/client/images/openplans-logo-gray.gif b/src/client/classic-debug/images/openplans-logo-gray.gif
similarity index 100%
rename from src/client/images/openplans-logo-gray.gif
rename to src/client/classic-debug/images/openplans-logo-gray.gif
diff --git a/src/client/images/otp_logo_40px.png b/src/client/classic-debug/images/otp_logo_40px.png
similarity index 100%
rename from src/client/images/otp_logo_40px.png
rename to src/client/classic-debug/images/otp_logo_40px.png
diff --git a/src/client/images/otp_logo_darkbg_40px.png b/src/client/classic-debug/images/otp_logo_darkbg_40px.png
similarity index 100%
rename from src/client/images/otp_logo_darkbg_40px.png
rename to src/client/classic-debug/images/otp_logo_darkbg_40px.png
diff --git a/src/client/images/reverse.png b/src/client/classic-debug/images/reverse.png
similarity index 100%
rename from src/client/images/reverse.png
rename to src/client/classic-debug/images/reverse.png
diff --git a/src/client/images/shadow.png b/src/client/classic-debug/images/shadow.png
similarity index 100%
rename from src/client/images/shadow.png
rename to src/client/classic-debug/images/shadow.png
diff --git a/src/client/images/spinner.gif b/src/client/classic-debug/images/spinner.gif
similarity index 100%
rename from src/client/images/spinner.gif
rename to src/client/classic-debug/images/spinner.gif
diff --git a/src/client/images/stop20.png b/src/client/classic-debug/images/stop20.png
similarity index 100%
rename from src/client/images/stop20.png
rename to src/client/classic-debug/images/stop20.png
diff --git a/src/client/images/widget-trip-stop-first.png b/src/client/classic-debug/images/widget-trip-stop-first.png
similarity index 100%
rename from src/client/images/widget-trip-stop-first.png
rename to src/client/classic-debug/images/widget-trip-stop-first.png
diff --git a/src/client/images/widget-trip-stop-last.png b/src/client/classic-debug/images/widget-trip-stop-last.png
similarity index 100%
rename from src/client/images/widget-trip-stop-last.png
rename to src/client/classic-debug/images/widget-trip-stop-last.png
diff --git a/src/client/images/widget-trip-stop-middle.png b/src/client/classic-debug/images/widget-trip-stop-middle.png
similarity index 100%
rename from src/client/images/widget-trip-stop-middle.png
rename to src/client/classic-debug/images/widget-trip-stop-middle.png
diff --git a/src/client/classic-debug/index.html b/src/client/classic-debug/index.html
new file mode 100644
index 00000000000..a005e624693
--- /dev/null
+++ b/src/client/classic-debug/index.html
@@ -0,0 +1,220 @@
+
+
+
+
+
+  
+
+
+OpenTripPlanner
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
              
+
              
+
+
              
+
+
+
diff --git a/src/client/js/lib/ICanHaz.js b/src/client/classic-debug/js/lib/ICanHaz.js
similarity index 100%
rename from src/client/js/lib/ICanHaz.js
rename to src/client/classic-debug/js/lib/ICanHaz.js
diff --git a/src/client/js/lib/backbone-min.js b/src/client/classic-debug/js/lib/backbone-min.js
similarity index 100%
rename from src/client/js/lib/backbone-min.js
rename to src/client/classic-debug/js/lib/backbone-min.js
diff --git a/src/client/js/lib/backbone.js b/src/client/classic-debug/js/lib/backbone.js
similarity index 100%
rename from src/client/js/lib/backbone.js
rename to src/client/classic-debug/js/lib/backbone.js
diff --git a/src/client/js/lib/i18next-1.7.3.min.js b/src/client/classic-debug/js/lib/i18next-1.7.3.min.js
similarity index 100%
rename from src/client/js/lib/i18next-1.7.3.min.js
rename to src/client/classic-debug/js/lib/i18next-1.7.3.min.js
diff --git a/src/client/js/lib/jquery-ui/addons/jquery-ui-timepicker.css b/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.css
similarity index 100%
rename from src/client/js/lib/jquery-ui/addons/jquery-ui-timepicker.css
rename to src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.css
diff --git a/src/client/js/lib/jquery-ui/addons/jquery-ui-timepicker.js b/src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/addons/jquery-ui-timepicker.js
rename to src/client/classic-debug/js/lib/jquery-ui/addons/jquery-ui-timepicker.js
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_dadada_1x400.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_222222_256x240.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_2e83ff_256x240.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_454545_256x240.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_888888_256x240.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/images/ui-icons_cd0a0a_256x240.png
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.css
diff --git a/src/client/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css b/src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css
similarity index 100%
rename from src/client/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css
rename to src/client/classic-debug/js/lib/jquery-ui/css/smoothness/jquery-ui-1.9.1.custom.min.css
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-ca.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-de.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-es.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-fr.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-hu.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-it.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-no.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pl.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-pt.js
diff --git a/src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js b/src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js
rename to src/client/classic-debug/js/lib/jquery-ui/i18n/jquery.ui.datepicker-sl.js
diff --git a/src/client/js/lib/jquery-ui/js/jquery-1.8.2.js b/src/client/classic-debug/js/lib/jquery-ui/js/jquery-1.8.2.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/js/jquery-1.8.2.js
rename to src/client/classic-debug/js/lib/jquery-ui/js/jquery-1.8.2.js
diff --git a/src/client/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js b/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js
rename to src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.js
diff --git a/src/client/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js b/src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js
similarity index 100%
rename from src/client/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js
rename to src/client/classic-debug/js/lib/jquery-ui/js/jquery-ui-1.9.1.custom.min.js
diff --git a/src/client/js/otp/config.js b/src/client/classic-debug/js/otp/config.js
similarity index 100%
rename from src/client/js/otp/config.js
rename to src/client/classic-debug/js/otp/config.js
diff --git a/src/client/js/otp/core/ContextMenu.js b/src/client/classic-debug/js/otp/core/ContextMenu.js
similarity index 100%
rename from src/client/js/otp/core/ContextMenu.js
rename to src/client/classic-debug/js/otp/core/ContextMenu.js
diff --git a/src/client/js/otp/core/Geocoder.js b/src/client/classic-debug/js/otp/core/Geocoder.js
similarity index 100%
rename from src/client/js/otp/core/Geocoder.js
rename to src/client/classic-debug/js/otp/core/Geocoder.js
diff --git a/src/client/js/otp/core/GeocoderBag.js b/src/client/classic-debug/js/otp/core/GeocoderBag.js
similarity index 100%
rename from src/client/js/otp/core/GeocoderBag.js
rename to src/client/classic-debug/js/otp/core/GeocoderBag.js
diff --git a/src/client/js/otp/core/GeocoderBuiltin.js b/src/client/classic-debug/js/otp/core/GeocoderBuiltin.js
similarity index 100%
rename from src/client/js/otp/core/GeocoderBuiltin.js
rename to src/client/classic-debug/js/otp/core/GeocoderBuiltin.js
diff --git a/src/client/js/otp/core/IndexApi.js b/src/client/classic-debug/js/otp/core/IndexApi.js
similarity index 100%
rename from src/client/js/otp/core/IndexApi.js
rename to src/client/classic-debug/js/otp/core/IndexApi.js
diff --git a/src/client/js/otp/core/Map.js b/src/client/classic-debug/js/otp/core/Map.js
similarity index 100%
rename from src/client/js/otp/core/Map.js
rename to src/client/classic-debug/js/otp/core/Map.js
diff --git a/src/client/js/otp/core/MapContextMenu.js b/src/client/classic-debug/js/otp/core/MapContextMenu.js
similarity index 100%
rename from src/client/js/otp/core/MapContextMenu.js
rename to src/client/classic-debug/js/otp/core/MapContextMenu.js
diff --git a/src/client/js/otp/core/PopupMenu.js b/src/client/classic-debug/js/otp/core/PopupMenu.js
similarity index 100%
rename from src/client/js/otp/core/PopupMenu.js
rename to src/client/classic-debug/js/otp/core/PopupMenu.js
diff --git a/src/client/js/otp/core/QueryLogger.js b/src/client/classic-debug/js/otp/core/QueryLogger.js
similarity index 100%
rename from src/client/js/otp/core/QueryLogger.js
rename to src/client/classic-debug/js/otp/core/QueryLogger.js
diff --git a/src/client/js/otp/core/SOLRGeocoder.js b/src/client/classic-debug/js/otp/core/SOLRGeocoder.js
similarity index 100%
rename from src/client/js/otp/core/SOLRGeocoder.js
rename to src/client/classic-debug/js/otp/core/SOLRGeocoder.js
diff --git a/src/client/js/otp/core/TransitIndex.js b/src/client/classic-debug/js/otp/core/TransitIndex.js
similarity index 100%
rename from src/client/js/otp/core/TransitIndex.js
rename to src/client/classic-debug/js/otp/core/TransitIndex.js
diff --git a/src/client/js/otp/core/TripPlan.js b/src/client/classic-debug/js/otp/core/TripPlan.js
similarity index 100%
rename from src/client/js/otp/core/TripPlan.js
rename to src/client/classic-debug/js/otp/core/TripPlan.js
diff --git a/src/client/js/otp/core/Webapp.js b/src/client/classic-debug/js/otp/core/Webapp.js
similarity index 100%
rename from src/client/js/otp/core/Webapp.js
rename to src/client/classic-debug/js/otp/core/Webapp.js
diff --git a/src/client/js/otp/core/WidgetManagerMenu.js b/src/client/classic-debug/js/otp/core/WidgetManagerMenu.js
similarity index 100%
rename from src/client/js/otp/core/WidgetManagerMenu.js
rename to src/client/classic-debug/js/otp/core/WidgetManagerMenu.js
diff --git a/src/client/js/otp/debug.js b/src/client/classic-debug/js/otp/debug.js
similarity index 100%
rename from src/client/js/otp/debug.js
rename to src/client/classic-debug/js/otp/debug.js
diff --git a/src/client/js/otp/layers/AreaStopsLayer.js b/src/client/classic-debug/js/otp/layers/AreaStopsLayer.js
similarity index 100%
rename from src/client/js/otp/layers/AreaStopsLayer.js
rename to src/client/classic-debug/js/otp/layers/AreaStopsLayer.js
diff --git a/src/client/js/otp/layers/GeofencingZonesLayer.js b/src/client/classic-debug/js/otp/layers/GeofencingZonesLayer.js
similarity index 100%
rename from src/client/js/otp/layers/GeofencingZonesLayer.js
rename to src/client/classic-debug/js/otp/layers/GeofencingZonesLayer.js
diff --git a/src/client/js/otp/layers/StopsLayer.js b/src/client/classic-debug/js/otp/layers/StopsLayer.js
similarity index 100%
rename from src/client/js/otp/layers/StopsLayer.js
rename to src/client/classic-debug/js/otp/layers/StopsLayer.js
diff --git a/src/client/js/otp/layers/layers-templates.html b/src/client/classic-debug/js/otp/layers/layers-templates.html
similarity index 100%
rename from src/client/js/otp/layers/layers-templates.html
rename to src/client/classic-debug/js/otp/layers/layers-templates.html
diff --git a/src/client/js/otp/locale/Catalan.js b/src/client/classic-debug/js/otp/locale/Catalan.js
similarity index 100%
rename from src/client/js/otp/locale/Catalan.js
rename to src/client/classic-debug/js/otp/locale/Catalan.js
diff --git a/src/client/js/otp/locale/English.js b/src/client/classic-debug/js/otp/locale/English.js
similarity index 100%
rename from src/client/js/otp/locale/English.js
rename to src/client/classic-debug/js/otp/locale/English.js
diff --git a/src/client/js/otp/locale/French.js b/src/client/classic-debug/js/otp/locale/French.js
similarity index 100%
rename from src/client/js/otp/locale/French.js
rename to src/client/classic-debug/js/otp/locale/French.js
diff --git a/src/client/js/otp/locale/German.js b/src/client/classic-debug/js/otp/locale/German.js
similarity index 100%
rename from src/client/js/otp/locale/German.js
rename to src/client/classic-debug/js/otp/locale/German.js
diff --git a/src/client/js/otp/locale/Hungarian.js b/src/client/classic-debug/js/otp/locale/Hungarian.js
similarity index 100%
rename from src/client/js/otp/locale/Hungarian.js
rename to src/client/classic-debug/js/otp/locale/Hungarian.js
diff --git a/src/client/js/otp/locale/Italian.js b/src/client/classic-debug/js/otp/locale/Italian.js
similarity index 100%
rename from src/client/js/otp/locale/Italian.js
rename to src/client/classic-debug/js/otp/locale/Italian.js
diff --git a/src/client/js/otp/locale/Norwegian.js b/src/client/classic-debug/js/otp/locale/Norwegian.js
similarity index 100%
rename from src/client/js/otp/locale/Norwegian.js
rename to src/client/classic-debug/js/otp/locale/Norwegian.js
diff --git a/src/client/js/otp/locale/Polish.js b/src/client/classic-debug/js/otp/locale/Polish.js
similarity index 100%
rename from src/client/js/otp/locale/Polish.js
rename to src/client/classic-debug/js/otp/locale/Polish.js
diff --git a/src/client/js/otp/locale/Portuguese.js b/src/client/classic-debug/js/otp/locale/Portuguese.js
similarity index 100%
rename from src/client/js/otp/locale/Portuguese.js
rename to src/client/classic-debug/js/otp/locale/Portuguese.js
diff --git a/src/client/js/otp/locale/Slovenian.js b/src/client/classic-debug/js/otp/locale/Slovenian.js
similarity index 100%
rename from src/client/js/otp/locale/Slovenian.js
rename to src/client/classic-debug/js/otp/locale/Slovenian.js
diff --git a/src/client/js/otp/locale/Spanish.js b/src/client/classic-debug/js/otp/locale/Spanish.js
similarity index 100%
rename from src/client/js/otp/locale/Spanish.js
rename to src/client/classic-debug/js/otp/locale/Spanish.js
diff --git a/src/client/js/otp/locale/ca_ES.json b/src/client/classic-debug/js/otp/locale/ca_ES.json
similarity index 100%
rename from src/client/js/otp/locale/ca_ES.json
rename to src/client/classic-debug/js/otp/locale/ca_ES.json
diff --git a/src/client/js/otp/locale/de.json b/src/client/classic-debug/js/otp/locale/de.json
similarity index 100%
rename from src/client/js/otp/locale/de.json
rename to src/client/classic-debug/js/otp/locale/de.json
diff --git a/src/client/js/otp/locale/en.json b/src/client/classic-debug/js/otp/locale/en.json
similarity index 100%
rename from src/client/js/otp/locale/en.json
rename to src/client/classic-debug/js/otp/locale/en.json
diff --git a/src/client/js/otp/locale/es.json b/src/client/classic-debug/js/otp/locale/es.json
similarity index 100%
rename from src/client/js/otp/locale/es.json
rename to src/client/classic-debug/js/otp/locale/es.json
diff --git a/src/client/js/otp/locale/fr.json b/src/client/classic-debug/js/otp/locale/fr.json
similarity index 100%
rename from src/client/js/otp/locale/fr.json
rename to src/client/classic-debug/js/otp/locale/fr.json
diff --git a/src/client/js/otp/locale/hu.json b/src/client/classic-debug/js/otp/locale/hu.json
similarity index 100%
rename from src/client/js/otp/locale/hu.json
rename to src/client/classic-debug/js/otp/locale/hu.json
diff --git a/src/client/js/otp/locale/it.json b/src/client/classic-debug/js/otp/locale/it.json
similarity index 100%
rename from src/client/js/otp/locale/it.json
rename to src/client/classic-debug/js/otp/locale/it.json
diff --git a/src/client/js/otp/locale/no.json b/src/client/classic-debug/js/otp/locale/no.json
similarity index 100%
rename from src/client/js/otp/locale/no.json
rename to src/client/classic-debug/js/otp/locale/no.json
diff --git a/src/client/js/otp/locale/pl.json b/src/client/classic-debug/js/otp/locale/pl.json
similarity index 100%
rename from src/client/js/otp/locale/pl.json
rename to src/client/classic-debug/js/otp/locale/pl.json
diff --git a/src/client/js/otp/locale/pt.json b/src/client/classic-debug/js/otp/locale/pt.json
similarity index 100%
rename from src/client/js/otp/locale/pt.json
rename to src/client/classic-debug/js/otp/locale/pt.json
diff --git a/src/client/js/otp/locale/sl.json b/src/client/classic-debug/js/otp/locale/sl.json
similarity index 100%
rename from src/client/js/otp/locale/sl.json
rename to src/client/classic-debug/js/otp/locale/sl.json
diff --git a/src/client/js/otp/modules/Module.js b/src/client/classic-debug/js/otp/modules/Module.js
similarity index 100%
rename from src/client/js/otp/modules/Module.js
rename to src/client/classic-debug/js/otp/modules/Module.js
diff --git a/src/client/js/otp/modules/bikeshare/BikeShareModule.js b/src/client/classic-debug/js/otp/modules/bikeshare/BikeShareModule.js
similarity index 100%
rename from src/client/js/otp/modules/bikeshare/BikeShareModule.js
rename to src/client/classic-debug/js/otp/modules/bikeshare/BikeShareModule.js
diff --git a/src/client/js/otp/modules/bikeshare/BikeStationsWidget.js b/src/client/classic-debug/js/otp/modules/bikeshare/BikeStationsWidget.js
similarity index 100%
rename from src/client/js/otp/modules/bikeshare/BikeStationsWidget.js
rename to src/client/classic-debug/js/otp/modules/bikeshare/BikeStationsWidget.js
diff --git a/src/client/js/otp/modules/bikeshare/bikeshare-style.css b/src/client/classic-debug/js/otp/modules/bikeshare/bikeshare-style.css
similarity index 100%
rename from src/client/js/otp/modules/bikeshare/bikeshare-style.css
rename to src/client/classic-debug/js/otp/modules/bikeshare/bikeshare-style.css
diff --git a/src/client/js/otp/modules/multimodal/MultimodalPlannerModule.js b/src/client/classic-debug/js/otp/modules/multimodal/MultimodalPlannerModule.js
similarity index 100%
rename from src/client/js/otp/modules/multimodal/MultimodalPlannerModule.js
rename to src/client/classic-debug/js/otp/modules/multimodal/MultimodalPlannerModule.js
diff --git a/src/client/js/otp/modules/multimodal/multimodal-style.css b/src/client/classic-debug/js/otp/modules/multimodal/multimodal-style.css
similarity index 100%
rename from src/client/js/otp/modules/multimodal/multimodal-style.css
rename to src/client/classic-debug/js/otp/modules/multimodal/multimodal-style.css
diff --git a/src/client/js/otp/modules/planner/IconFactory.js b/src/client/classic-debug/js/otp/modules/planner/IconFactory.js
similarity index 100%
rename from src/client/js/otp/modules/planner/IconFactory.js
rename to src/client/classic-debug/js/otp/modules/planner/IconFactory.js
diff --git a/src/client/js/otp/modules/planner/ItinerariesWidget.js b/src/client/classic-debug/js/otp/modules/planner/ItinerariesWidget.js
similarity index 100%
rename from src/client/js/otp/modules/planner/ItinerariesWidget.js
rename to src/client/classic-debug/js/otp/modules/planner/ItinerariesWidget.js
diff --git a/src/client/js/otp/modules/planner/Itinerary.js b/src/client/classic-debug/js/otp/modules/planner/Itinerary.js
similarity index 100%
rename from src/client/js/otp/modules/planner/Itinerary.js
rename to src/client/classic-debug/js/otp/modules/planner/Itinerary.js
diff --git a/src/client/js/otp/modules/planner/PlannerModule.js b/src/client/classic-debug/js/otp/modules/planner/PlannerModule.js
similarity index 100%
rename from src/client/js/otp/modules/planner/PlannerModule.js
rename to src/client/classic-debug/js/otp/modules/planner/PlannerModule.js
diff --git a/src/client/js/otp/modules/planner/TripPlan.js b/src/client/classic-debug/js/otp/modules/planner/TripPlan.js
similarity index 100%
rename from src/client/js/otp/modules/planner/TripPlan.js
rename to src/client/classic-debug/js/otp/modules/planner/TripPlan.js
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble.psd b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble.psd
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble.psd
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble.psd
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_ne.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_ne.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne.png
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_ne_highlight.png
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_nw.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_nw.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw.png
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_nw_highlight.png
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_se.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_se.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se.png
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_se_highlight.png
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_sw.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_sw.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw.png
diff --git a/src/client/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png b/src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png
rename to src/client/classic-debug/js/otp/modules/planner/images/mode/mode_bubble_sw_highlight.png
diff --git a/src/client/js/otp/modules/planner/images/user_icon.png b/src/client/classic-debug/js/otp/modules/planner/images/user_icon.png
similarity index 100%
rename from src/client/js/otp/modules/planner/images/user_icon.png
rename to src/client/classic-debug/js/otp/modules/planner/images/user_icon.png
diff --git a/src/client/js/otp/modules/planner/planner-style.css b/src/client/classic-debug/js/otp/modules/planner/planner-style.css
similarity index 100%
rename from src/client/js/otp/modules/planner/planner-style.css
rename to src/client/classic-debug/js/otp/modules/planner/planner-style.css
diff --git a/src/client/js/otp/modules/planner/planner-templates.html b/src/client/classic-debug/js/otp/modules/planner/planner-templates.html
similarity index 100%
rename from src/client/js/otp/modules/planner/planner-templates.html
rename to src/client/classic-debug/js/otp/modules/planner/planner-templates.html
diff --git a/src/client/js/otp/otp.js b/src/client/classic-debug/js/otp/otp.js
similarity index 100%
rename from src/client/js/otp/otp.js
rename to src/client/classic-debug/js/otp/otp.js
diff --git a/src/client/js/otp/templates.js b/src/client/classic-debug/js/otp/templates.js
similarity index 100%
rename from src/client/js/otp/templates.js
rename to src/client/classic-debug/js/otp/templates.js
diff --git a/src/client/js/otp/util/DataStorage.js b/src/client/classic-debug/js/otp/util/DataStorage.js
similarity index 100%
rename from src/client/js/otp/util/DataStorage.js
rename to src/client/classic-debug/js/otp/util/DataStorage.js
diff --git a/src/client/js/otp/util/Geo.js b/src/client/classic-debug/js/otp/util/Geo.js
similarity index 100%
rename from src/client/js/otp/util/Geo.js
rename to src/client/classic-debug/js/otp/util/Geo.js
diff --git a/src/client/js/otp/util/Imperial.js b/src/client/classic-debug/js/otp/util/Imperial.js
similarity index 100%
rename from src/client/js/otp/util/Imperial.js
rename to src/client/classic-debug/js/otp/util/Imperial.js
diff --git a/src/client/js/otp/util/Itin.js b/src/client/classic-debug/js/otp/util/Itin.js
similarity index 100%
rename from src/client/js/otp/util/Itin.js
rename to src/client/classic-debug/js/otp/util/Itin.js
diff --git a/src/client/js/otp/util/Logger.js b/src/client/classic-debug/js/otp/util/Logger.js
similarity index 100%
rename from src/client/js/otp/util/Logger.js
rename to src/client/classic-debug/js/otp/util/Logger.js
diff --git a/src/client/js/otp/util/Text.js b/src/client/classic-debug/js/otp/util/Text.js
similarity index 100%
rename from src/client/js/otp/util/Text.js
rename to src/client/classic-debug/js/otp/util/Text.js
diff --git a/src/client/js/otp/util/Time.js b/src/client/classic-debug/js/otp/util/Time.js
similarity index 100%
rename from src/client/js/otp/util/Time.js
rename to src/client/classic-debug/js/otp/util/Time.js
diff --git a/src/client/js/otp/widgets/Dialogs.js b/src/client/classic-debug/js/otp/widgets/Dialogs.js
similarity index 100%
rename from src/client/js/otp/widgets/Dialogs.js
rename to src/client/classic-debug/js/otp/widgets/Dialogs.js
diff --git a/src/client/js/otp/widgets/InfoWidget.js b/src/client/classic-debug/js/otp/widgets/InfoWidget.js
similarity index 100%
rename from src/client/js/otp/widgets/InfoWidget.js
rename to src/client/classic-debug/js/otp/widgets/InfoWidget.js
diff --git a/src/client/js/otp/widgets/Widget.js b/src/client/classic-debug/js/otp/widgets/Widget.js
similarity index 100%
rename from src/client/js/otp/widgets/Widget.js
rename to src/client/classic-debug/js/otp/widgets/Widget.js
diff --git a/src/client/js/otp/widgets/WidgetManager.js b/src/client/classic-debug/js/otp/widgets/WidgetManager.js
similarity index 100%
rename from src/client/js/otp/widgets/WidgetManager.js
rename to src/client/classic-debug/js/otp/widgets/WidgetManager.js
diff --git a/src/client/js/otp/widgets/transit/RouteBasedWidget.js b/src/client/classic-debug/js/otp/widgets/transit/RouteBasedWidget.js
similarity index 100%
rename from src/client/js/otp/widgets/transit/RouteBasedWidget.js
rename to src/client/classic-debug/js/otp/widgets/transit/RouteBasedWidget.js
diff --git a/src/client/js/otp/widgets/transit/StopFinderWidget.js b/src/client/classic-debug/js/otp/widgets/transit/StopFinderWidget.js
similarity index 100%
rename from src/client/js/otp/widgets/transit/StopFinderWidget.js
rename to src/client/classic-debug/js/otp/widgets/transit/StopFinderWidget.js
diff --git a/src/client/js/otp/widgets/transit/StopViewerWidget.js b/src/client/classic-debug/js/otp/widgets/transit/StopViewerWidget.js
similarity index 100%
rename from src/client/js/otp/widgets/transit/StopViewerWidget.js
rename to src/client/classic-debug/js/otp/widgets/transit/StopViewerWidget.js
diff --git a/src/client/js/otp/widgets/transit/TripViewerWidget.js b/src/client/classic-debug/js/otp/widgets/transit/TripViewerWidget.js
similarity index 100%
rename from src/client/js/otp/widgets/transit/TripViewerWidget.js
rename to src/client/classic-debug/js/otp/widgets/transit/TripViewerWidget.js
diff --git a/src/client/js/otp/widgets/transit/widgets-transit-style.css b/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-style.css
similarity index 100%
rename from src/client/js/otp/widgets/transit/widgets-transit-style.css
rename to src/client/classic-debug/js/otp/widgets/transit/widgets-transit-style.css
diff --git a/src/client/js/otp/widgets/transit/widgets-transit-templates.html b/src/client/classic-debug/js/otp/widgets/transit/widgets-transit-templates.html
similarity index 100%
rename from src/client/js/otp/widgets/transit/widgets-transit-templates.html
rename to src/client/classic-debug/js/otp/widgets/transit/widgets-transit-templates.html
diff --git a/src/client/js/otp/widgets/tripoptions/BikeTrianglePanel.js b/src/client/classic-debug/js/otp/widgets/tripoptions/BikeTrianglePanel.js
similarity index 100%
rename from src/client/js/otp/widgets/tripoptions/BikeTrianglePanel.js
rename to src/client/classic-debug/js/otp/widgets/tripoptions/BikeTrianglePanel.js
diff --git a/src/client/js/otp/widgets/tripoptions/RoutesSelectorWidget.js b/src/client/classic-debug/js/otp/widgets/tripoptions/RoutesSelectorWidget.js
similarity index 100%
rename from src/client/js/otp/widgets/tripoptions/RoutesSelectorWidget.js
rename to src/client/classic-debug/js/otp/widgets/tripoptions/RoutesSelectorWidget.js
diff --git a/src/client/js/otp/widgets/tripoptions/TripOptionsWidget.js b/src/client/classic-debug/js/otp/widgets/tripoptions/TripOptionsWidget.js
similarity index 100%
rename from src/client/js/otp/widgets/tripoptions/TripOptionsWidget.js
rename to src/client/classic-debug/js/otp/widgets/tripoptions/TripOptionsWidget.js
diff --git a/src/client/js/otp/widgets/tripoptions/tripoptions-style.css b/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-style.css
similarity index 100%
rename from src/client/js/otp/widgets/tripoptions/tripoptions-style.css
rename to src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-style.css
diff --git a/src/client/js/otp/widgets/tripoptions/tripoptions-templates.html b/src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-templates.html
similarity index 100%
rename from src/client/js/otp/widgets/tripoptions/tripoptions-templates.html
rename to src/client/classic-debug/js/otp/widgets/tripoptions/tripoptions-templates.html
diff --git a/src/client/js/otp/widgets/widget-style.css b/src/client/classic-debug/js/otp/widgets/widget-style.css
similarity index 100%
rename from src/client/js/otp/widgets/widget-style.css
rename to src/client/classic-debug/js/otp/widgets/widget-style.css
diff --git a/src/client/js/otp/widgets/widget-templates.html b/src/client/classic-debug/js/otp/widgets/widget-templates.html
similarity index 100%
rename from src/client/js/otp/widgets/widget-templates.html
rename to src/client/classic-debug/js/otp/widgets/widget-templates.html
diff --git a/src/client/style.css b/src/client/classic-debug/style.css
similarity index 100%
rename from src/client/style.css
rename to src/client/classic-debug/style.css
diff --git a/src/client/debug-client-preview/index.html b/src/client/debug-client-preview/index.html
deleted file mode 100644
index 77fc8ebbe8d..00000000000
--- a/src/client/debug-client-preview/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-  
-    
-    
-    
-    OTP Debug Client
-    
-    
-  
-  
-    
              
-  
-
diff --git a/src/client/index.html b/src/client/index.html
index 5f35b46a432..77fc8ebbe8d 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -1,220 +1,14 @@
-
-
-
-
-
-  
-
-
-OpenTripPlanner
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
              
-
              
-
-
              
-
-
+
+
+  
+    
+    
+    
+    OTP Debug Client
+    
+    
+  
+  
+    
              
+  
 

From f86c2b8fd3bc66a8b35b5eb77c11b37460eb7541 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 21 Jun 2024 10:26:19 +0200
Subject: [PATCH 1457/1688] Swap old and new debug client

---
 .../apis/vectortiles/DebugStyleSpec.java      |  7 +++--
 .../apis/vectortiles/DebugStyleSpecTest.java  | 27 ++++++++++++++++---
 .../test/support/JsonAssertions.java          |  9 +++----
 .../test/support/ResourceLoader.java          |  5 ++--
 .../apis/vectortiles/style.json               | 20 +++++++++++---
 5 files changed, 52 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
index da612c5ea20..7741a7a58cb 100644
--- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
+++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
@@ -147,9 +147,12 @@ static StyleSpec build(
           .ofId("regular-stop")
           .typeCircle()
           .vectorSourceLayer(regularStops)
-          .circleStroke(BLACK, 2)
+          .circleStroke(
+            BLACK,
+            new ZoomDependentNumber(1, List.of(new ZoomStop(11, 0.5f), new ZoomStop(MAX_ZOOM, 5)))
+          )
           .circleRadius(
-            new ZoomDependentNumber(1, List.of(new ZoomStop(11, 1), new ZoomStop(MAX_ZOOM, 10)))
+            new ZoomDependentNumber(1, List.of(new ZoomStop(11, 0.5f), new ZoomStop(MAX_ZOOM, 10)))
           )
           .circleColor("#fcf9fa")
           .minZoom(10)
diff --git a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java
index d971cefe2e2..6a60490a07f 100644
--- a/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java
+++ b/src/test/java/org/opentripplanner/apis/vectortiles/DebugStyleSpecTest.java
@@ -2,10 +2,14 @@
 
 import static org.opentripplanner.test.support.JsonAssertions.assertEqualJson;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.apis.vectortiles.model.TileSource.VectorSource;
 import org.opentripplanner.apis.vectortiles.model.VectorSourceLayer;
 import org.opentripplanner.framework.json.ObjectMappers;
+import org.opentripplanner.standalone.config.framework.json.JsonSupport;
 import org.opentripplanner.test.support.ResourceLoader;
 
 class DebugStyleSpecTest {
@@ -13,7 +17,7 @@ class DebugStyleSpecTest {
   private final ResourceLoader RESOURCES = ResourceLoader.of(this);
 
   @Test
-  void spec() {
+  void spec() throws IOException {
     var vectorSource = new VectorSource("vectorSource", "https://example.com");
     var regularStops = new VectorSourceLayer(vectorSource, "stops");
     var areaStops = new VectorSourceLayer(vectorSource, "stops");
@@ -23,7 +27,24 @@ void spec() {
     var spec = DebugStyleSpec.build(regularStops, areaStops, groupStops, edges, vertices);
 
     var json = ObjectMappers.ignoringExtraFields().valueToTree(spec);
-    var expectation = RESOURCES.fileToString("style.json");
-    assertEqualJson(expectation, json);
+    try {
+      var expectation = RESOURCES.fileToString("style.json");
+      assertEqualJson(expectation, json);
+    } catch (IllegalArgumentException e) {
+      Files.writeString(
+        Path.of(
+          "src",
+          "test",
+          "resources",
+          "org",
+          "opentripplanner",
+          "apis",
+          "vectortiles",
+          "style.json"
+        ),
+        JsonSupport.prettyPrint(json)
+      );
+      throw new AssertionError("style.json not found. Writing a new version to file system.");
+    }
   }
 }
diff --git a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
index 1fe87268eee..e836ace81fd 100644
--- a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
+++ b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
@@ -32,11 +32,10 @@ public static void assertEqualJson(String expected, JsonNode actual) {
       assertEquals(
         exp,
         actualNode,
-        () ->
-          "Expected '%s' but actual was '%s'".formatted(
-              JsonSupport.prettyPrint(exp),
-              JsonSupport.prettyPrint(actualNode)
-            )
+        "Expected '%s' but actual was '%s'".formatted(
+            JsonSupport.prettyPrint(exp),
+            JsonSupport.prettyPrint(actualNode)
+          )
       );
     } catch (JsonProcessingException e) {
       throw new RuntimeException(e);
diff --git a/src/test/java/org/opentripplanner/test/support/ResourceLoader.java b/src/test/java/org/opentripplanner/test/support/ResourceLoader.java
index 5eb51cac55a..5670a49fab7 100644
--- a/src/test/java/org/opentripplanner/test/support/ResourceLoader.java
+++ b/src/test/java/org/opentripplanner/test/support/ResourceLoader.java
@@ -1,6 +1,5 @@
 package org.opentripplanner.test.support;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.File;
@@ -72,7 +71,9 @@ public String fileToString(String p) {
   public URL url(String name) {
     var resource = clazz.getResource(name);
     var msg = "Resource '%s' not found in package '%s'".formatted(name, clazz.getPackageName());
-    assertNotNull(resource, msg);
+    if (resource == null) {
+      throw new IllegalArgumentException(msg);
+    }
     return resource;
   }
 
diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
index d0aed828f6f..ccb0dfb8869 100644
--- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
+++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
@@ -226,13 +226,25 @@
       "maxzoom" : 23,
       "paint" : {
         "circle-stroke-color" : "#140d0e",
-        "circle-stroke-width" : 2,
+        "circle-stroke-width" : {
+          "base" : 1.0,
+          "stops" : [
+            [
+              11,
+              0.5
+            ],
+            [
+              23,
+              2.0
+            ]
+          ]
+        },
         "circle-radius" : {
           "base" : 1.0,
           "stops" : [
             [
               11,
-              1.0
+              0.5
             ],
             [
               23,
@@ -244,6 +256,6 @@
       }
     }
   ],
-  "glyphs" : "https://cdn.jsdelivr.net/gh/klokantech/klokantech-gl-fonts@master/{fontstack}/{range}.pbf",
-  "version" : 8
+  "version" : 8,
+  "glyphs" : "https://cdn.jsdelivr.net/gh/klokantech/klokantech-gl-fonts@master/{fontstack}/{range}.pbf"
 }
\ No newline at end of file

From 7ac4f0e9d34d972a546b0c6e10cb190f007f2b41 Mon Sep 17 00:00:00 2001
From: Daniel Heppner 
Date: Fri, 21 Jun 2024 10:10:25 +0100
Subject: [PATCH 1458/1688] run formatter

---
 .../opentripplanner/ext/fares/impl/OrcaFareServiceTest.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
index 30d11b57200..e7a2610b42f 100644
--- a/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/fares/impl/OrcaFareServiceTest.java
@@ -161,11 +161,7 @@ void calculateFareWithNoFreeTransfer() {
       FareType.electronicSpecial,
       DEFAULT_TEST_RIDE_PRICE.plus(usDollars(1.25f))
     );
-    calculateFare(
-      rides,
-      FareType.electronicRegular,
-      DEFAULT_TEST_RIDE_PRICE.times(2)
-    );
+    calculateFare(rides, FareType.electronicRegular, DEFAULT_TEST_RIDE_PRICE.times(2));
     calculateFare(rides, FareType.electronicSenior, DEFAULT_TEST_RIDE_PRICE.plus(usDollars(1.25f)));
     calculateFare(rides, FareType.electronicYouth, Money.ZERO_USD);
   }

From e754f3c39904a73d29856c0c6349384bc9709962 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 21 Jun 2024 11:35:17 +0200
Subject: [PATCH 1459/1688] Update assertion

---
 .../resources/org/opentripplanner/apis/vectortiles/style.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
index ccb0dfb8869..6f981b7f67d 100644
--- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
+++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
@@ -235,7 +235,7 @@
             ],
             [
               23,
-              2.0
+              5.0
             ]
           ]
         },

From 82b0a694e2f5e64e7cb8d8dedd9d04c86b2ea208 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 21 Jun 2024 11:41:57 +0200
Subject: [PATCH 1460/1688] Update documentation

---
 client-next/README.md |  2 +-
 docs/Frontends.md     | 26 ++++++++++++++++++++------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/client-next/README.md b/client-next/README.md
index a6c8e76cfad..d3a7d87629b 100644
--- a/client-next/README.md
+++ b/client-next/README.md
@@ -34,7 +34,7 @@ Then
 
     npm run dev
 
-The debug client will now be available at `http://localhost:5173/debug-client-preview`. It has
+The debug client will now be available at `http://localhost:5173/`. It has
 hot reloading enabled, so you don't have to restart it when you save files.
 
 If you change graphql code during development you can issue the following command:
diff --git a/docs/Frontends.md b/docs/Frontends.md
index e7946102ea1..7eb85050024 100644
--- a/docs/Frontends.md
+++ b/docs/Frontends.md
@@ -16,17 +16,30 @@ On the other hand, **production frontends** are intended to be a component of la
 
 ## Debug Frontends
 
-The main OpenTripPlanner repository currently contains two debug web frontends: the original one in [`/src/client`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/src/client) and a newer one currently under development at [`/client-next`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/client-next).
+The main OpenTripPlanner repository currently contains two debug web frontends: 
 
-The **original debug client** is a jQuery and Backbone based UI whose history can be traced back over a decade to the first days of the OTP project. It connects to the OTP Java backend via a REST API using the GTFS vocabulary. Historically this was the default OTP interface, and it continues to be available by default on any running OTP instance at the root URL.
+- new one currently under development at [`/client-next`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/client-next).
+- the original one in [`/src/client/classic-debug/`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/src/client/classic-debug) 
 
-The **new debug client** is a React/TypeScript Single Page App (SPA) that can be served locally or accessed over a content delivery network (CDN). Unlike the original debug client, it connects to the OTP Java backend via the GraphQL API using the Transmodel vocabulary. It is currently under development, but expected to replace the original debug client once it reaches effective feature parity.
+The **new debug client** is a React/TypeScript Single Page App (SPA) that can be served locally or accessed over a content delivery network (CDN). 
+Unlike the original debug client, it connects to the OTP Java backend via the GraphQL API using the Transmodel vocabulary.
 
-There is a third piece of software that might qualify as an OTP client: a Java Swing application making use of the Processing visualization library, located in the [GraphVisualizer class](https://github.com/opentripplanner/OpenTripPlanner/blob/dev-2.x/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java). While it would not be accurate to call this a "native" desktop application (as it's cross-platform Java) it is not a web app. This very developer-centric UI is also over a decade old and has been very sparsely maintained, but continues to exist because it can visualize the progress of searches through the street network, providing some insight into the internals of the routing algorithms that are not otherwise visible.
+The **original debug client** is a jQuery and Backbone based UI whose history can be traced back over a decade to the first days of the OTP project. 
+It connects to the OTP Java backend via a REST API using the GTFS vocabulary. Historically this was the default OTP interface, and for now it continues to be 
+available on any running OTP instance at the root URL.
+
+There is a third piece of software that might qualify as an OTP client: a Java Swing application making use of the Processing visualization library, 
+located in the [GraphVisualizer class](https://github.com/opentripplanner/OpenTripPlanner/blob/dev-2.x/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java). 
+While it would not be accurate to call this a "native" desktop application (as it's cross-platform Java) it is not a web app. This very developer-centric 
+UI is also over a decade old and has been very sparsely maintained, but continues to exist because it can visualize the progress of searches through the 
+street network, providing some insight into the internals of the routing algorithms that are not otherwise visible.
 
 ## Working with Debug Frontends
 
-While the "classic" (i.e. old) debug frontend is enabled by default as of this writing, it may not be in the future, or you may wish to disable it if you've chosen to use a different frontend. Also, to get full use of the existing debug frontends you may want to enable OTP's built-in simple testing geocoder which performs fuzzy searches for transit stops by name, supplying their coordinates to the routing engine. Without it, you will be limited to origins and destinations selected on a map or specified in terms of latitude and longitude coordinates. The debug frontend and the geocoder can be toggled in `otp-config.json`:
+While the two debug frontends are enabled by default as of this writing, it may not be in the future, or you may wish to disable it if you've chosen to use a different frontend. 
+Also, to get full use of the existing debug frontends you may want to enable OTP's built-in simple testing geocoder which performs fuzzy searches for 
+transit stops by name, supplying their coordinates to the routing engine. Without it, you will be limited to origins and destinations selected on a map or 
+specified in terms of latitude and longitude coordinates. The debug frontend and the geocoder can be toggled in `otp-config.json`:
 
 ```json5
 // otp-config.json
@@ -73,4 +86,5 @@ The history of the more widely used OpenTripPlanner interfaces is roughly as fol
 - In the late 2010s people started developing a new React-based UI as a more modular, modern interface for public consumption. This project is located at https://github.com/opentripplanner/otp-react-redux under the OpenTripPlanner Github organization, and is developed and maintainted by Arcadis IBI.
 - Some React components were factored out of that UI project, allowing them to be integrated in different ways with different OTP deployments. This component library is in a separate repository at https://github.com/opentripplanner/otp-ui. Likewise, it is developed and maintained by Arcadis IBI.
 - Meanwhile, starting in 2014, HSL (the Helsinki Regional Transport Authority) and Finntrafic (the Finnish national transportation authority) began the Digitransit project, a set of open-source microservices to replace their existing national and regional scale trip planners. This includes a Javascript web UI module. In addition to Finland, the Digitransit system has been deployed in various places around the world including Germany.
-- As of 2024, a completely new debug UI (again, intended for developer use rather than public consumption) is being developed in the main OpenTripPlanner repository under `src/debug-client-preview`. This new UI follows a more conventional contemporary Javascript development style, and uses the most recent OpenTripPlanner GraphQL API which is expected to fully replace the older REST API. 
+- As of 2024, a completely new debug UI (again, intended for developer use rather than public consumption) is being developed in the main OpenTripPlanner repository under `src/client-next`. This new UI follows a more conventional contemporary Javascript development style, and uses the most recent OpenTripPlanner GraphQL API which is expected to fully replace the older REST API. 
+- In June 2024, the default was swapped and the new GraphQL-based one is now the default with the old one being available at `http://localhost:8080/classic-debug/`
\ No newline at end of file

From a5b829f0c7900038252997a168d1da3c4166b130 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 21 Jun 2024 12:05:47 +0200
Subject: [PATCH 1461/1688] Rename folder from 'client-next' to 'client'

---
 .github/workflows/debug-client.yml                  |  10 +++++-----
 {client-next => client}/.env                        |   0
 {client-next => client}/.env.development            |   0
 {client-next => client}/.eslintrc.cjs               |   0
 {client-next => client}/.gitignore                  |   0
 {client-next => client}/.npmrc                      |   0
 {client-next => client}/.prettierignore             |   0
 {client-next => client}/.prettierrc.cjs             |   0
 {client-next => client}/README-vite.md              |   0
 {client-next => client}/README.md                   |   4 ++--
 {client-next => client}/codegen.ts                  |   0
 {client-next => client}/index.html                  |   0
 {client-next => client}/package-lock.json           |   4 ++--
 {client-next => client}/package.json                |   2 +-
 .../components/ItineraryList/ItineraryDetails.tsx   |   0
 .../ItineraryList/ItineraryHeaderContent.tsx        |   0
 .../ItineraryList/ItineraryHeaderLegContent.tsx     |   0
 .../ItineraryList/ItineraryLegDetails.tsx           |   0
 .../components/ItineraryList/ItineraryList.test.tsx |   0
 .../ItineraryList/ItineraryListContainer.tsx        |   0
 .../ItineraryList/ItineraryPaginationControl.tsx    |   0
 .../src/components/ItineraryList/LegTime.tsx        |   0
 .../components/ItineraryList/useContainerWidth.ts   |   0
 .../ItineraryList/useEarliestAndLatestTimes.ts      |   0
 .../useHeaderContentStyleCalculations.ts            |   0
 .../useHeaderLegContentStyleCalculations.ts         |   0
 .../src/components/MapView/ContextMenuPopup.tsx     |   0
 .../components/MapView/GeometryPropertyPopup.tsx    |   0
 .../src/components/MapView/LayerControl.tsx         |   0
 .../src/components/MapView/LegLines.tsx             |   0
 .../src/components/MapView/MapView.tsx              |   0
 .../src/components/MapView/NavigationMarkers.tsx    |   0
 .../src/components/MapView/useMapDoubleClick.ts     |   0
 .../src/components/SearchBar/AccessSelect.tsx       |   0
 .../src/components/SearchBar/DateInputField.tsx     |   0
 .../components/SearchBar/DepartureArrivalSelect.tsx |   0
 .../src/components/SearchBar/DirectModeSelect.tsx   |   0
 .../src/components/SearchBar/EgressSelect.tsx       |   0
 .../SearchBar/ItineraryFilterDebugSelect.tsx        |   0
 .../src/components/SearchBar/LocationInputField.tsx |   0
 .../components/SearchBar/MultiSelectDropdown.tsx    |   0
 .../components/SearchBar/NumTripPatternsInput.tsx   |   0
 .../src/components/SearchBar/SearchBar.test.tsx     |   0
 .../src/components/SearchBar/SearchBar.tsx          |   0
 .../src/components/SearchBar/SearchWindowInput.tsx  |   0
 .../src/components/SearchBar/ServerInfoTooltip.tsx  |   0
 .../src/components/SearchBar/TimeInputField.tsx     |   0
 .../src/components/SearchBar/TransitModeSelect.tsx  |   0
 .../src/components/SearchBar/constants.ts           |   0
 {client-next => client}/src/hooks/useServerInfo.ts  |   0
 {client-next => client}/src/hooks/useTripQuery.ts   |   0
 .../src/hooks/useTripQueryVariables.ts              |   0
 {client-next => client}/src/main.tsx                |   0
 {client-next => client}/src/screens/App.tsx         |   0
 .../src/static/img/marker-flag-end-shadowed.png     | Bin
 .../src/static/img/marker-flag-start-shadowed.png   | Bin
 {client-next => client}/src/static/img/mode/air.png | Bin
 .../src/static/img/mode/bicycle.png                 | Bin
 {client-next => client}/src/static/img/mode/bus.png | Bin
 .../src/static/img/mode/cableway.png                | Bin
 {client-next => client}/src/static/img/mode/car.png | Bin
 .../src/static/img/mode/coach.png                   | Bin
 .../src/static/img/mode/foot.png                    | Bin
 .../src/static/img/mode/funicular.png               | Bin
 .../src/static/img/mode/metro.png                   | Bin
 .../src/static/img/mode/monorail.png                | Bin
 .../src/static/img/mode/rail.png                    | Bin
 .../src/static/img/mode/taxi.png                    | Bin
 .../src/static/img/mode/tram.png                    | Bin
 .../src/static/img/mode/trolleybus.png              | Bin
 .../src/static/img/mode/water.png                   | Bin
 {client-next => client}/src/static/img/otp-logo.svg |   0
 {client-next => client}/src/style.css               |   0
 {client-next => client}/src/util/formatDistance.ts  |   0
 {client-next => client}/src/util/formatDuration.ts  |   0
 {client-next => client}/src/util/formatTime.ts      |   0
 .../src/util/generateTextColor.ts                   |   0
 {client-next => client}/src/util/getApiUrl.ts       |   0
 {client-next => client}/src/util/getColorForMode.ts |   0
 {client-next => client}/src/util/isTransitMode.ts   |   0
 {client-next => client}/src/vite-env.d.ts           |   0
 {client-next => client}/tsconfig.json               |   0
 {client-next => client}/tsconfig.node.json          |   0
 {client-next => client}/vite.config.ts              |   0
 docs/Frontends.md                                   |   4 ++--
 renovate.json5                                      |   4 ++--
 86 files changed, 14 insertions(+), 14 deletions(-)
 rename {client-next => client}/.env (100%)
 rename {client-next => client}/.env.development (100%)
 rename {client-next => client}/.eslintrc.cjs (100%)
 rename {client-next => client}/.gitignore (100%)
 rename {client-next => client}/.npmrc (100%)
 rename {client-next => client}/.prettierignore (100%)
 rename {client-next => client}/.prettierrc.cjs (100%)
 rename {client-next => client}/README-vite.md (100%)
 rename {client-next => client}/README.md (94%)
 rename {client-next => client}/codegen.ts (100%)
 rename {client-next => client}/index.html (100%)
 rename {client-next => client}/package-lock.json (99%)
 rename {client-next => client}/package.json (98%)
 rename {client-next => client}/src/components/ItineraryList/ItineraryDetails.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/ItineraryHeaderContent.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/ItineraryHeaderLegContent.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/ItineraryLegDetails.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/ItineraryList.test.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/ItineraryListContainer.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/ItineraryPaginationControl.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/LegTime.tsx (100%)
 rename {client-next => client}/src/components/ItineraryList/useContainerWidth.ts (100%)
 rename {client-next => client}/src/components/ItineraryList/useEarliestAndLatestTimes.ts (100%)
 rename {client-next => client}/src/components/ItineraryList/useHeaderContentStyleCalculations.ts (100%)
 rename {client-next => client}/src/components/ItineraryList/useHeaderLegContentStyleCalculations.ts (100%)
 rename {client-next => client}/src/components/MapView/ContextMenuPopup.tsx (100%)
 rename {client-next => client}/src/components/MapView/GeometryPropertyPopup.tsx (100%)
 rename {client-next => client}/src/components/MapView/LayerControl.tsx (100%)
 rename {client-next => client}/src/components/MapView/LegLines.tsx (100%)
 rename {client-next => client}/src/components/MapView/MapView.tsx (100%)
 rename {client-next => client}/src/components/MapView/NavigationMarkers.tsx (100%)
 rename {client-next => client}/src/components/MapView/useMapDoubleClick.ts (100%)
 rename {client-next => client}/src/components/SearchBar/AccessSelect.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/DateInputField.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/DepartureArrivalSelect.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/DirectModeSelect.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/EgressSelect.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/ItineraryFilterDebugSelect.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/LocationInputField.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/MultiSelectDropdown.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/NumTripPatternsInput.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/SearchBar.test.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/SearchBar.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/SearchWindowInput.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/ServerInfoTooltip.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/TimeInputField.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/TransitModeSelect.tsx (100%)
 rename {client-next => client}/src/components/SearchBar/constants.ts (100%)
 rename {client-next => client}/src/hooks/useServerInfo.ts (100%)
 rename {client-next => client}/src/hooks/useTripQuery.ts (100%)
 rename {client-next => client}/src/hooks/useTripQueryVariables.ts (100%)
 rename {client-next => client}/src/main.tsx (100%)
 rename {client-next => client}/src/screens/App.tsx (100%)
 rename {client-next => client}/src/static/img/marker-flag-end-shadowed.png (100%)
 rename {client-next => client}/src/static/img/marker-flag-start-shadowed.png (100%)
 rename {client-next => client}/src/static/img/mode/air.png (100%)
 rename {client-next => client}/src/static/img/mode/bicycle.png (100%)
 rename {client-next => client}/src/static/img/mode/bus.png (100%)
 rename {client-next => client}/src/static/img/mode/cableway.png (100%)
 rename {client-next => client}/src/static/img/mode/car.png (100%)
 rename {client-next => client}/src/static/img/mode/coach.png (100%)
 rename {client-next => client}/src/static/img/mode/foot.png (100%)
 rename {client-next => client}/src/static/img/mode/funicular.png (100%)
 rename {client-next => client}/src/static/img/mode/metro.png (100%)
 rename {client-next => client}/src/static/img/mode/monorail.png (100%)
 rename {client-next => client}/src/static/img/mode/rail.png (100%)
 rename {client-next => client}/src/static/img/mode/taxi.png (100%)
 rename {client-next => client}/src/static/img/mode/tram.png (100%)
 rename {client-next => client}/src/static/img/mode/trolleybus.png (100%)
 rename {client-next => client}/src/static/img/mode/water.png (100%)
 rename {client-next => client}/src/static/img/otp-logo.svg (100%)
 rename {client-next => client}/src/style.css (100%)
 rename {client-next => client}/src/util/formatDistance.ts (100%)
 rename {client-next => client}/src/util/formatDuration.ts (100%)
 rename {client-next => client}/src/util/formatTime.ts (100%)
 rename {client-next => client}/src/util/generateTextColor.ts (100%)
 rename {client-next => client}/src/util/getApiUrl.ts (100%)
 rename {client-next => client}/src/util/getColorForMode.ts (100%)
 rename {client-next => client}/src/util/isTransitMode.ts (100%)
 rename {client-next => client}/src/vite-env.d.ts (100%)
 rename {client-next => client}/tsconfig.json (100%)
 rename {client-next => client}/tsconfig.node.json (100%)
 rename {client-next => client}/vite.config.ts (100%)

diff --git a/.github/workflows/debug-client.yml b/.github/workflows/debug-client.yml
index 15d495e6454..6857b56b161 100644
--- a/.github/workflows/debug-client.yml
+++ b/.github/workflows/debug-client.yml
@@ -3,10 +3,10 @@ name: Debug client
 on:
   push:
     paths:
-      - 'client-next/**'
+      - 'client/**'
   pull_request:
     paths:
-      - 'client-next/**'
+      - 'client/**'
 
 # to avoid conflicts, make sure that only one workflow pushes to Github at the same time
 concurrency:
@@ -38,7 +38,7 @@ jobs:
         run: echo "VERSION=`date +%Y/%m/%Y-%m-%dT%H:%M`" >> $GITHUB_ENV
 
       - name: Build debug client
-        working-directory: client-next
+        working-directory: client
         run: |
           npm install
           npm run build -- --base https://cdn.jsdelivr.net/gh/opentripplanner/debug-client-assets@main/${VERSION}/
@@ -65,7 +65,7 @@ jobs:
           
           # Copy the compiled output to a versioned folder
           mkdir -p $VERSION
-          rsync -r client-next/output/* ./$VERSION/
+          rsync -r client/output/* ./$VERSION/
           git add $VERSION
           git commit -am "Add version ${VERSION} of debug client"
           
@@ -78,7 +78,7 @@ jobs:
           
           CLIENT_HTML_OUTPUT=src/client/index.html
           mkdir -p src/client/
-          cp client-next/output/index.html ${CLIENT_HTML_OUTPUT}
+          cp client/output/index.html ${CLIENT_HTML_OUTPUT}
           
           # just to debug
           cat ${CLIENT_HTML_OUTPUT}
diff --git a/client-next/.env b/client/.env
similarity index 100%
rename from client-next/.env
rename to client/.env
diff --git a/client-next/.env.development b/client/.env.development
similarity index 100%
rename from client-next/.env.development
rename to client/.env.development
diff --git a/client-next/.eslintrc.cjs b/client/.eslintrc.cjs
similarity index 100%
rename from client-next/.eslintrc.cjs
rename to client/.eslintrc.cjs
diff --git a/client-next/.gitignore b/client/.gitignore
similarity index 100%
rename from client-next/.gitignore
rename to client/.gitignore
diff --git a/client-next/.npmrc b/client/.npmrc
similarity index 100%
rename from client-next/.npmrc
rename to client/.npmrc
diff --git a/client-next/.prettierignore b/client/.prettierignore
similarity index 100%
rename from client-next/.prettierignore
rename to client/.prettierignore
diff --git a/client-next/.prettierrc.cjs b/client/.prettierrc.cjs
similarity index 100%
rename from client-next/.prettierrc.cjs
rename to client/.prettierrc.cjs
diff --git a/client-next/README-vite.md b/client/README-vite.md
similarity index 100%
rename from client-next/README-vite.md
rename to client/README-vite.md
diff --git a/client-next/README.md b/client/README.md
similarity index 94%
rename from client-next/README.md
rename to client/README.md
index d3a7d87629b..54971062971 100644
--- a/client-next/README.md
+++ b/client/README.md
@@ -26,7 +26,7 @@ The dev and production builds require graphql schema to be present at
 
 ## Getting started (development)
 
-Change directory to `client-next` (current) if you haven't already.
+Change directory to `client` (current) if you haven't already.
 
     npm install
 
@@ -45,7 +45,7 @@ You don't have to restart the development server for the changes to take effect.
 
 ## Build for production
 
-Change directory to `client-next` (current) if you haven't already.
+Change directory to `client` (current) if you haven't already.
 
     npm install
 
diff --git a/client-next/codegen.ts b/client/codegen.ts
similarity index 100%
rename from client-next/codegen.ts
rename to client/codegen.ts
diff --git a/client-next/index.html b/client/index.html
similarity index 100%
rename from client-next/index.html
rename to client/index.html
diff --git a/client-next/package-lock.json b/client/package-lock.json
similarity index 99%
rename from client-next/package-lock.json
rename to client/package-lock.json
index 38a6cbfd4dc..d57d763b59c 100644
--- a/client-next/package-lock.json
+++ b/client/package-lock.json
@@ -1,11 +1,11 @@
 {
-  "name": "otp-debug-client-next",
+  "name": "otp-debug-client",
   "version": "0.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "otp-debug-client-next",
+      "name": "otp-debug-client",
       "version": "0.0.0",
       "dependencies": {
         "@googlemaps/polyline-codec": "1.0.28",
diff --git a/client-next/package.json b/client/package.json
similarity index 98%
rename from client-next/package.json
rename to client/package.json
index b9acd846af2..84c0e314dad 100644
--- a/client-next/package.json
+++ b/client/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "otp-debug-client-next",
+  "name": "otp-debug-client",
   "private": true,
   "version": "0.0.0",
   "type": "module",
diff --git a/client-next/src/components/ItineraryList/ItineraryDetails.tsx b/client/src/components/ItineraryList/ItineraryDetails.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/ItineraryDetails.tsx
rename to client/src/components/ItineraryList/ItineraryDetails.tsx
diff --git a/client-next/src/components/ItineraryList/ItineraryHeaderContent.tsx b/client/src/components/ItineraryList/ItineraryHeaderContent.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/ItineraryHeaderContent.tsx
rename to client/src/components/ItineraryList/ItineraryHeaderContent.tsx
diff --git a/client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx b/client/src/components/ItineraryList/ItineraryHeaderLegContent.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/ItineraryHeaderLegContent.tsx
rename to client/src/components/ItineraryList/ItineraryHeaderLegContent.tsx
diff --git a/client-next/src/components/ItineraryList/ItineraryLegDetails.tsx b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/ItineraryLegDetails.tsx
rename to client/src/components/ItineraryList/ItineraryLegDetails.tsx
diff --git a/client-next/src/components/ItineraryList/ItineraryList.test.tsx b/client/src/components/ItineraryList/ItineraryList.test.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/ItineraryList.test.tsx
rename to client/src/components/ItineraryList/ItineraryList.test.tsx
diff --git a/client-next/src/components/ItineraryList/ItineraryListContainer.tsx b/client/src/components/ItineraryList/ItineraryListContainer.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/ItineraryListContainer.tsx
rename to client/src/components/ItineraryList/ItineraryListContainer.tsx
diff --git a/client-next/src/components/ItineraryList/ItineraryPaginationControl.tsx b/client/src/components/ItineraryList/ItineraryPaginationControl.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/ItineraryPaginationControl.tsx
rename to client/src/components/ItineraryList/ItineraryPaginationControl.tsx
diff --git a/client-next/src/components/ItineraryList/LegTime.tsx b/client/src/components/ItineraryList/LegTime.tsx
similarity index 100%
rename from client-next/src/components/ItineraryList/LegTime.tsx
rename to client/src/components/ItineraryList/LegTime.tsx
diff --git a/client-next/src/components/ItineraryList/useContainerWidth.ts b/client/src/components/ItineraryList/useContainerWidth.ts
similarity index 100%
rename from client-next/src/components/ItineraryList/useContainerWidth.ts
rename to client/src/components/ItineraryList/useContainerWidth.ts
diff --git a/client-next/src/components/ItineraryList/useEarliestAndLatestTimes.ts b/client/src/components/ItineraryList/useEarliestAndLatestTimes.ts
similarity index 100%
rename from client-next/src/components/ItineraryList/useEarliestAndLatestTimes.ts
rename to client/src/components/ItineraryList/useEarliestAndLatestTimes.ts
diff --git a/client-next/src/components/ItineraryList/useHeaderContentStyleCalculations.ts b/client/src/components/ItineraryList/useHeaderContentStyleCalculations.ts
similarity index 100%
rename from client-next/src/components/ItineraryList/useHeaderContentStyleCalculations.ts
rename to client/src/components/ItineraryList/useHeaderContentStyleCalculations.ts
diff --git a/client-next/src/components/ItineraryList/useHeaderLegContentStyleCalculations.ts b/client/src/components/ItineraryList/useHeaderLegContentStyleCalculations.ts
similarity index 100%
rename from client-next/src/components/ItineraryList/useHeaderLegContentStyleCalculations.ts
rename to client/src/components/ItineraryList/useHeaderLegContentStyleCalculations.ts
diff --git a/client-next/src/components/MapView/ContextMenuPopup.tsx b/client/src/components/MapView/ContextMenuPopup.tsx
similarity index 100%
rename from client-next/src/components/MapView/ContextMenuPopup.tsx
rename to client/src/components/MapView/ContextMenuPopup.tsx
diff --git a/client-next/src/components/MapView/GeometryPropertyPopup.tsx b/client/src/components/MapView/GeometryPropertyPopup.tsx
similarity index 100%
rename from client-next/src/components/MapView/GeometryPropertyPopup.tsx
rename to client/src/components/MapView/GeometryPropertyPopup.tsx
diff --git a/client-next/src/components/MapView/LayerControl.tsx b/client/src/components/MapView/LayerControl.tsx
similarity index 100%
rename from client-next/src/components/MapView/LayerControl.tsx
rename to client/src/components/MapView/LayerControl.tsx
diff --git a/client-next/src/components/MapView/LegLines.tsx b/client/src/components/MapView/LegLines.tsx
similarity index 100%
rename from client-next/src/components/MapView/LegLines.tsx
rename to client/src/components/MapView/LegLines.tsx
diff --git a/client-next/src/components/MapView/MapView.tsx b/client/src/components/MapView/MapView.tsx
similarity index 100%
rename from client-next/src/components/MapView/MapView.tsx
rename to client/src/components/MapView/MapView.tsx
diff --git a/client-next/src/components/MapView/NavigationMarkers.tsx b/client/src/components/MapView/NavigationMarkers.tsx
similarity index 100%
rename from client-next/src/components/MapView/NavigationMarkers.tsx
rename to client/src/components/MapView/NavigationMarkers.tsx
diff --git a/client-next/src/components/MapView/useMapDoubleClick.ts b/client/src/components/MapView/useMapDoubleClick.ts
similarity index 100%
rename from client-next/src/components/MapView/useMapDoubleClick.ts
rename to client/src/components/MapView/useMapDoubleClick.ts
diff --git a/client-next/src/components/SearchBar/AccessSelect.tsx b/client/src/components/SearchBar/AccessSelect.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/AccessSelect.tsx
rename to client/src/components/SearchBar/AccessSelect.tsx
diff --git a/client-next/src/components/SearchBar/DateInputField.tsx b/client/src/components/SearchBar/DateInputField.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/DateInputField.tsx
rename to client/src/components/SearchBar/DateInputField.tsx
diff --git a/client-next/src/components/SearchBar/DepartureArrivalSelect.tsx b/client/src/components/SearchBar/DepartureArrivalSelect.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/DepartureArrivalSelect.tsx
rename to client/src/components/SearchBar/DepartureArrivalSelect.tsx
diff --git a/client-next/src/components/SearchBar/DirectModeSelect.tsx b/client/src/components/SearchBar/DirectModeSelect.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/DirectModeSelect.tsx
rename to client/src/components/SearchBar/DirectModeSelect.tsx
diff --git a/client-next/src/components/SearchBar/EgressSelect.tsx b/client/src/components/SearchBar/EgressSelect.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/EgressSelect.tsx
rename to client/src/components/SearchBar/EgressSelect.tsx
diff --git a/client-next/src/components/SearchBar/ItineraryFilterDebugSelect.tsx b/client/src/components/SearchBar/ItineraryFilterDebugSelect.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/ItineraryFilterDebugSelect.tsx
rename to client/src/components/SearchBar/ItineraryFilterDebugSelect.tsx
diff --git a/client-next/src/components/SearchBar/LocationInputField.tsx b/client/src/components/SearchBar/LocationInputField.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/LocationInputField.tsx
rename to client/src/components/SearchBar/LocationInputField.tsx
diff --git a/client-next/src/components/SearchBar/MultiSelectDropdown.tsx b/client/src/components/SearchBar/MultiSelectDropdown.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/MultiSelectDropdown.tsx
rename to client/src/components/SearchBar/MultiSelectDropdown.tsx
diff --git a/client-next/src/components/SearchBar/NumTripPatternsInput.tsx b/client/src/components/SearchBar/NumTripPatternsInput.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/NumTripPatternsInput.tsx
rename to client/src/components/SearchBar/NumTripPatternsInput.tsx
diff --git a/client-next/src/components/SearchBar/SearchBar.test.tsx b/client/src/components/SearchBar/SearchBar.test.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/SearchBar.test.tsx
rename to client/src/components/SearchBar/SearchBar.test.tsx
diff --git a/client-next/src/components/SearchBar/SearchBar.tsx b/client/src/components/SearchBar/SearchBar.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/SearchBar.tsx
rename to client/src/components/SearchBar/SearchBar.tsx
diff --git a/client-next/src/components/SearchBar/SearchWindowInput.tsx b/client/src/components/SearchBar/SearchWindowInput.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/SearchWindowInput.tsx
rename to client/src/components/SearchBar/SearchWindowInput.tsx
diff --git a/client-next/src/components/SearchBar/ServerInfoTooltip.tsx b/client/src/components/SearchBar/ServerInfoTooltip.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/ServerInfoTooltip.tsx
rename to client/src/components/SearchBar/ServerInfoTooltip.tsx
diff --git a/client-next/src/components/SearchBar/TimeInputField.tsx b/client/src/components/SearchBar/TimeInputField.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/TimeInputField.tsx
rename to client/src/components/SearchBar/TimeInputField.tsx
diff --git a/client-next/src/components/SearchBar/TransitModeSelect.tsx b/client/src/components/SearchBar/TransitModeSelect.tsx
similarity index 100%
rename from client-next/src/components/SearchBar/TransitModeSelect.tsx
rename to client/src/components/SearchBar/TransitModeSelect.tsx
diff --git a/client-next/src/components/SearchBar/constants.ts b/client/src/components/SearchBar/constants.ts
similarity index 100%
rename from client-next/src/components/SearchBar/constants.ts
rename to client/src/components/SearchBar/constants.ts
diff --git a/client-next/src/hooks/useServerInfo.ts b/client/src/hooks/useServerInfo.ts
similarity index 100%
rename from client-next/src/hooks/useServerInfo.ts
rename to client/src/hooks/useServerInfo.ts
diff --git a/client-next/src/hooks/useTripQuery.ts b/client/src/hooks/useTripQuery.ts
similarity index 100%
rename from client-next/src/hooks/useTripQuery.ts
rename to client/src/hooks/useTripQuery.ts
diff --git a/client-next/src/hooks/useTripQueryVariables.ts b/client/src/hooks/useTripQueryVariables.ts
similarity index 100%
rename from client-next/src/hooks/useTripQueryVariables.ts
rename to client/src/hooks/useTripQueryVariables.ts
diff --git a/client-next/src/main.tsx b/client/src/main.tsx
similarity index 100%
rename from client-next/src/main.tsx
rename to client/src/main.tsx
diff --git a/client-next/src/screens/App.tsx b/client/src/screens/App.tsx
similarity index 100%
rename from client-next/src/screens/App.tsx
rename to client/src/screens/App.tsx
diff --git a/client-next/src/static/img/marker-flag-end-shadowed.png b/client/src/static/img/marker-flag-end-shadowed.png
similarity index 100%
rename from client-next/src/static/img/marker-flag-end-shadowed.png
rename to client/src/static/img/marker-flag-end-shadowed.png
diff --git a/client-next/src/static/img/marker-flag-start-shadowed.png b/client/src/static/img/marker-flag-start-shadowed.png
similarity index 100%
rename from client-next/src/static/img/marker-flag-start-shadowed.png
rename to client/src/static/img/marker-flag-start-shadowed.png
diff --git a/client-next/src/static/img/mode/air.png b/client/src/static/img/mode/air.png
similarity index 100%
rename from client-next/src/static/img/mode/air.png
rename to client/src/static/img/mode/air.png
diff --git a/client-next/src/static/img/mode/bicycle.png b/client/src/static/img/mode/bicycle.png
similarity index 100%
rename from client-next/src/static/img/mode/bicycle.png
rename to client/src/static/img/mode/bicycle.png
diff --git a/client-next/src/static/img/mode/bus.png b/client/src/static/img/mode/bus.png
similarity index 100%
rename from client-next/src/static/img/mode/bus.png
rename to client/src/static/img/mode/bus.png
diff --git a/client-next/src/static/img/mode/cableway.png b/client/src/static/img/mode/cableway.png
similarity index 100%
rename from client-next/src/static/img/mode/cableway.png
rename to client/src/static/img/mode/cableway.png
diff --git a/client-next/src/static/img/mode/car.png b/client/src/static/img/mode/car.png
similarity index 100%
rename from client-next/src/static/img/mode/car.png
rename to client/src/static/img/mode/car.png
diff --git a/client-next/src/static/img/mode/coach.png b/client/src/static/img/mode/coach.png
similarity index 100%
rename from client-next/src/static/img/mode/coach.png
rename to client/src/static/img/mode/coach.png
diff --git a/client-next/src/static/img/mode/foot.png b/client/src/static/img/mode/foot.png
similarity index 100%
rename from client-next/src/static/img/mode/foot.png
rename to client/src/static/img/mode/foot.png
diff --git a/client-next/src/static/img/mode/funicular.png b/client/src/static/img/mode/funicular.png
similarity index 100%
rename from client-next/src/static/img/mode/funicular.png
rename to client/src/static/img/mode/funicular.png
diff --git a/client-next/src/static/img/mode/metro.png b/client/src/static/img/mode/metro.png
similarity index 100%
rename from client-next/src/static/img/mode/metro.png
rename to client/src/static/img/mode/metro.png
diff --git a/client-next/src/static/img/mode/monorail.png b/client/src/static/img/mode/monorail.png
similarity index 100%
rename from client-next/src/static/img/mode/monorail.png
rename to client/src/static/img/mode/monorail.png
diff --git a/client-next/src/static/img/mode/rail.png b/client/src/static/img/mode/rail.png
similarity index 100%
rename from client-next/src/static/img/mode/rail.png
rename to client/src/static/img/mode/rail.png
diff --git a/client-next/src/static/img/mode/taxi.png b/client/src/static/img/mode/taxi.png
similarity index 100%
rename from client-next/src/static/img/mode/taxi.png
rename to client/src/static/img/mode/taxi.png
diff --git a/client-next/src/static/img/mode/tram.png b/client/src/static/img/mode/tram.png
similarity index 100%
rename from client-next/src/static/img/mode/tram.png
rename to client/src/static/img/mode/tram.png
diff --git a/client-next/src/static/img/mode/trolleybus.png b/client/src/static/img/mode/trolleybus.png
similarity index 100%
rename from client-next/src/static/img/mode/trolleybus.png
rename to client/src/static/img/mode/trolleybus.png
diff --git a/client-next/src/static/img/mode/water.png b/client/src/static/img/mode/water.png
similarity index 100%
rename from client-next/src/static/img/mode/water.png
rename to client/src/static/img/mode/water.png
diff --git a/client-next/src/static/img/otp-logo.svg b/client/src/static/img/otp-logo.svg
similarity index 100%
rename from client-next/src/static/img/otp-logo.svg
rename to client/src/static/img/otp-logo.svg
diff --git a/client-next/src/style.css b/client/src/style.css
similarity index 100%
rename from client-next/src/style.css
rename to client/src/style.css
diff --git a/client-next/src/util/formatDistance.ts b/client/src/util/formatDistance.ts
similarity index 100%
rename from client-next/src/util/formatDistance.ts
rename to client/src/util/formatDistance.ts
diff --git a/client-next/src/util/formatDuration.ts b/client/src/util/formatDuration.ts
similarity index 100%
rename from client-next/src/util/formatDuration.ts
rename to client/src/util/formatDuration.ts
diff --git a/client-next/src/util/formatTime.ts b/client/src/util/formatTime.ts
similarity index 100%
rename from client-next/src/util/formatTime.ts
rename to client/src/util/formatTime.ts
diff --git a/client-next/src/util/generateTextColor.ts b/client/src/util/generateTextColor.ts
similarity index 100%
rename from client-next/src/util/generateTextColor.ts
rename to client/src/util/generateTextColor.ts
diff --git a/client-next/src/util/getApiUrl.ts b/client/src/util/getApiUrl.ts
similarity index 100%
rename from client-next/src/util/getApiUrl.ts
rename to client/src/util/getApiUrl.ts
diff --git a/client-next/src/util/getColorForMode.ts b/client/src/util/getColorForMode.ts
similarity index 100%
rename from client-next/src/util/getColorForMode.ts
rename to client/src/util/getColorForMode.ts
diff --git a/client-next/src/util/isTransitMode.ts b/client/src/util/isTransitMode.ts
similarity index 100%
rename from client-next/src/util/isTransitMode.ts
rename to client/src/util/isTransitMode.ts
diff --git a/client-next/src/vite-env.d.ts b/client/src/vite-env.d.ts
similarity index 100%
rename from client-next/src/vite-env.d.ts
rename to client/src/vite-env.d.ts
diff --git a/client-next/tsconfig.json b/client/tsconfig.json
similarity index 100%
rename from client-next/tsconfig.json
rename to client/tsconfig.json
diff --git a/client-next/tsconfig.node.json b/client/tsconfig.node.json
similarity index 100%
rename from client-next/tsconfig.node.json
rename to client/tsconfig.node.json
diff --git a/client-next/vite.config.ts b/client/vite.config.ts
similarity index 100%
rename from client-next/vite.config.ts
rename to client/vite.config.ts
diff --git a/docs/Frontends.md b/docs/Frontends.md
index 7eb85050024..b8134d4cf7c 100644
--- a/docs/Frontends.md
+++ b/docs/Frontends.md
@@ -18,7 +18,7 @@ On the other hand, **production frontends** are intended to be a component of la
 
 The main OpenTripPlanner repository currently contains two debug web frontends: 
 
-- new one currently under development at [`/client-next`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/client-next).
+- new one currently under development at [`/client`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/client).
 - the original one in [`/src/client/classic-debug/`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/src/client/classic-debug) 
 
 The **new debug client** is a React/TypeScript Single Page App (SPA) that can be served locally or accessed over a content delivery network (CDN). 
@@ -86,5 +86,5 @@ The history of the more widely used OpenTripPlanner interfaces is roughly as fol
 - In the late 2010s people started developing a new React-based UI as a more modular, modern interface for public consumption. This project is located at https://github.com/opentripplanner/otp-react-redux under the OpenTripPlanner Github organization, and is developed and maintainted by Arcadis IBI.
 - Some React components were factored out of that UI project, allowing them to be integrated in different ways with different OTP deployments. This component library is in a separate repository at https://github.com/opentripplanner/otp-ui. Likewise, it is developed and maintained by Arcadis IBI.
 - Meanwhile, starting in 2014, HSL (the Helsinki Regional Transport Authority) and Finntrafic (the Finnish national transportation authority) began the Digitransit project, a set of open-source microservices to replace their existing national and regional scale trip planners. This includes a Javascript web UI module. In addition to Finland, the Digitransit system has been deployed in various places around the world including Germany.
-- As of 2024, a completely new debug UI (again, intended for developer use rather than public consumption) is being developed in the main OpenTripPlanner repository under `src/client-next`. This new UI follows a more conventional contemporary Javascript development style, and uses the most recent OpenTripPlanner GraphQL API which is expected to fully replace the older REST API. 
+- As of 2024, a completely new debug UI (again, intended for developer use rather than public consumption) is being developed in the main OpenTripPlanner repository under `src/client`. This new UI follows a more conventional contemporary Javascript development style, and uses the most recent OpenTripPlanner GraphQL API which is expected to fully replace the older REST API. 
 - In June 2024, the default was swapped and the new GraphQL-based one is now the default with the old one being available at `http://localhost:8080/classic-debug/`
\ No newline at end of file
diff --git a/renovate.json5 b/renovate.json5
index 466bc36a94a..7b957c577e3 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -31,14 +31,14 @@
       "enabled": false
     },
     {
-      "matchFiles": ["client-next/package.json"],
+      "matchFiles": ["client/package.json"],
       "matchUpdateTypes": ["patch", "minor"],
       "groupName": "Debug UI dependencies (non-major)",
       "schedule": ["on the first day of the week"],
       "reviewers": ["testower"]
     },
     {
-      "matchFiles": ["client-next/package.json"],
+      "matchFiles": ["client/package.json"],
       "matchUpdateTypes": ["major"],
       "reviewers": ["testower"]
     },

From f95fd60bbd42ca15a4123fb3132fbd6f2a0620ae Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 21 Jun 2024 14:50:20 +0200
Subject: [PATCH 1462/1688] Add comment about unusal instantiation of
 DefaultTransitService

---
 .../java/org/opentripplanner/ext/geocoder/LuceneIndex.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
index 8f11ff252e7..fe7bef8ad13 100644
--- a/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
+++ b/src/ext/java/org/opentripplanner/ext/geocoder/LuceneIndex.java
@@ -68,6 +68,11 @@ public class LuceneIndex implements Serializable {
   private final SuggestIndexSearcher searcher;
   private final StopClusterMapper stopClusterMapper;
 
+  /**
+   * Since the {@link TransitService} is request scoped, we don't inject it into this class.
+   * However, we do need some methods in the service and that's why we instantiate it manually in this
+   * constructor.
+   */
   public LuceneIndex(TransitModel transitModel, StopConsolidationService stopConsolidationService) {
     this(new DefaultTransitService(transitModel), stopConsolidationService);
   }

From ed7d9da30e15be1303a8cf1ea659dacdfec3dd83 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 21 Jun 2024 16:13:40 +0200
Subject: [PATCH 1463/1688] Apply review suggestions

---
 .../ext/siri/updater/EstimatedTimetableHandler.java             | 2 +-
 .../opentripplanner/updater/trip/RealtimeTestEnvironment.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java
index 13ae4806a51..961d6a10282 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/EstimatedTimetableHandler.java
@@ -18,7 +18,7 @@ public class EstimatedTimetableHandler {
   private final SiriFuzzyTripMatcher fuzzyTripMatcher;
   private final EntityResolver entityResolver;
   /**
-   * The ID for the static feed to which these TripUpdates are applied
+   * The ID for the static feed to which these real time updates are applied
    */
   private final String feedId;
 
diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
index b752bcbf9bf..d557aa1319b 100644
--- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
+++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -167,7 +167,7 @@ public String getFeedId() {
     return TransitModelForTest.FEED_ID;
   }
 
-  public EstimatedTimetableHandler getEstimatedTimetableHandler(boolean fuzzyMatching) {
+  private EstimatedTimetableHandler getEstimatedTimetableHandler(boolean fuzzyMatching) {
     return new EstimatedTimetableHandler(
       siriSource,
       fuzzyMatching ? new SiriFuzzyTripMatcher(getTransitService()) : null,

From e29e9cc7b76200a245fe5a2c7792cd8c7decf849 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Mon, 24 Jun 2024 07:32:13 +0000
Subject: [PATCH 1464/1688] Add changelog entry for #5904 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index d0db11c2f2c..8cdfb231eb3 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -34,6 +34,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Fix debug client after breaking change in dependency graphql-request [#5899](https://github.com/opentripplanner/OpenTripPlanner/pull/5899)
 - Remove TravelTime API [#5890](https://github.com/opentripplanner/OpenTripPlanner/pull/5890)
 - Improve cancellation of large response in TransModel API [#5908](https://github.com/opentripplanner/OpenTripPlanner/pull/5908)
+- Refactor SIRI-ET updaters [#5904](https://github.com/opentripplanner/OpenTripPlanner/pull/5904)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 8b5324b90a686cfae84c00a4e6ba43ad657c4489 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 24 Jun 2024 09:45:58 +0200
Subject: [PATCH 1465/1688] Update magidoc

---
 .github/workflows/cibuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 09150d0d868..a4074e8c30d 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -121,7 +121,7 @@ jobs:
 
       - name: Build GTFS GraphQL API documentation
         run: |
-          npm install -g @magidoc/cli@4.1.4
+          npm install -g @magidoc/cli@5.0.3
           magidoc generate
 
       - name: Deploy compiled HTML to Github pages

From 617950a45d8e0b17254356d6cc7ffd6de153a86a Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 24 Jun 2024 09:50:15 +0200
Subject: [PATCH 1466/1688] Update Github action

---
 .github/workflows/performance-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/performance-test.yml b/.github/workflows/performance-test.yml
index 60b3e69610d..bfddea1b408 100644
--- a/.github/workflows/performance-test.yml
+++ b/.github/workflows/performance-test.yml
@@ -109,7 +109,7 @@ jobs:
 
       - name: Archive Flight Recorder instrumentation file
         if: matrix.profile == 'core' || github.ref == 'refs/heads/dev-2.x'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ matrix.location }}-flight-recorder
           path: ${{ matrix.location}}-speed-test.jfr

From 5d28009fa89844b318b545cfbd2b4a4ea371b702 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 24 Jun 2024 09:54:44 +0200
Subject: [PATCH 1467/1688] Update to node 20

---
 .github/workflows/cibuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index a4074e8c30d..233ea8635ee 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -117,7 +117,7 @@ jobs:
 
       - uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Build GTFS GraphQL API documentation
         run: |

From 0e71b7b2a95d2acc078f901e3d13c84616d19038 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 24 Jun 2024 10:13:18 +0200
Subject: [PATCH 1468/1688] Add more query factories

---
 magidoc.mjs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/magidoc.mjs b/magidoc.mjs
index 4fea5e4e127..4d9e8c98a7f 100644
--- a/magidoc.mjs
+++ b/magidoc.mjs
@@ -36,7 +36,15 @@ To learn how to deactivate it, read the
       queryGenerationFactories: {
         'Polyline': '<>',
         'GeoJson': '<>',
-        'OffsetDateTime': '2024-02-05T18:04:23+01:00'
+        'OffsetDateTime': '2024-02-05T18:04:23+01:00',
+        'Duration': 'PT10M',
+        'CoordinateValue': 19.24,
+        'Reluctance': 3.1,
+        'Speed': 3.4,
+        'Cost': 100,
+        'Ratio': 0.25,
+        'Locale': 'en'
+
       },
     }
   },

From cf3c552a326bb6a512ff9818f80c2a35c988c826 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 24 Jun 2024 10:16:39 +0200
Subject: [PATCH 1469/1688] Add --stacktrace

---
 .github/workflows/cibuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 233ea8635ee..f5c09aaa5eb 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -122,7 +122,7 @@ jobs:
       - name: Build GTFS GraphQL API documentation
         run: |
           npm install -g @magidoc/cli@5.0.3
-          magidoc generate
+          magidoc generate --stacktrace
 
       - name: Deploy compiled HTML to Github pages
         if: github.event_name == 'push' && (github.ref == 'refs/heads/dev-2.x' || github.ref == 'refs/heads/master')

From 35eff90a83c88b9c3fe4683ed4f527aab1e64b13 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 24 Jun 2024 10:31:10 +0200
Subject: [PATCH 1470/1688] Add debug statements

---
 .github/workflows/cibuild.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index f5c09aaa5eb..ea6c118361f 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -122,6 +122,7 @@ jobs:
       - name: Build GTFS GraphQL API documentation
         run: |
           npm install -g @magidoc/cli@5.0.3
+          cat src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
           magidoc generate --stacktrace
 
       - name: Deploy compiled HTML to Github pages

From 9b4dede62e64d81c6b31f083762ab63247cd02ef Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 25 Jun 2024 09:53:37 +0200
Subject: [PATCH 1471/1688] Update Magidoc to 6.0.0

---
 .github/workflows/cibuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index ea6c118361f..120220de7f1 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -121,7 +121,7 @@ jobs:
 
       - name: Build GTFS GraphQL API documentation
         run: |
-          npm install -g @magidoc/cli@5.0.3
+          npm install -g @magidoc/cli@6.0.0
           cat src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
           magidoc generate --stacktrace
 

From b3b5c59eecefa947102a35524949a2f05abf72bf Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 25 Jun 2024 10:55:55 +0200
Subject: [PATCH 1472/1688] Remove debug statement [ci skip]

---
 .github/workflows/cibuild.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/cibuild.yml b/.github/workflows/cibuild.yml
index 120220de7f1..4b814d03e35 100644
--- a/.github/workflows/cibuild.yml
+++ b/.github/workflows/cibuild.yml
@@ -122,7 +122,6 @@ jobs:
       - name: Build GTFS GraphQL API documentation
         run: |
           npm install -g @magidoc/cli@6.0.0
-          cat src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
           magidoc generate --stacktrace
 
       - name: Deploy compiled HTML to Github pages

From 6fda1a8b76682c3e68881dfe671b15607c82c019 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Mon, 24 Jun 2024 12:05:00 +0200
Subject: [PATCH 1473/1688] Update Siri Google PubSub updater documentation

---
 .../sandbox/siri/SiriGooglePubSubUpdater.md   |  29 +++++
 docs/RouterConfiguration.md                   |  11 ++
 docs/examples/entur/router-config.json        |   3 +-
 docs/sandbox/VehicleParking.md                |  18 +--
 docs/sandbox/siri/SiriGooglePubSubUpdater.md  | 118 ++++++++++++++++++
 .../SiriETGooglePubsubUpdaterParameters.java  |  20 +--
 .../SiriETGooglePubsubUpdaterConfig.java      |  79 ++++++++++--
 .../doc/SiriGooglePubSubConfigDocTest.java    | 101 +++++++++++++++
 .../generate/doc/UpdaterConfigDocTest.java    |   1 +
 .../standalone/config/router-config.json      |  12 ++
 10 files changed, 353 insertions(+), 39 deletions(-)
 create mode 100644 doc-templates/sandbox/siri/SiriGooglePubSubUpdater.md
 create mode 100644 docs/sandbox/siri/SiriGooglePubSubUpdater.md
 create mode 100644 src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java

diff --git a/doc-templates/sandbox/siri/SiriGooglePubSubUpdater.md b/doc-templates/sandbox/siri/SiriGooglePubSubUpdater.md
new file mode 100644
index 00000000000..09fd3996bef
--- /dev/null
+++ b/doc-templates/sandbox/siri/SiriGooglePubSubUpdater.md
@@ -0,0 +1,29 @@
+# Siri-ET Google PubSub Updater
+
+Support for consuming SIRI-ET messages over a Google Cloud PubSub subscription.
+Similarly to the SIRI-ET HTTP updater, this updater is developed to support the Nordic SIRI profile
+which is a subset of the SIRI specification.
+
+## Contact Info
+Entur, Norway
+https://entur.no/
+
+## Documentation
+
+This updater consumes SIRI real time information over an asynchronous publisher/subscriber feed
+provided by a Google Cloud PubSub topic.
+
+For more documentation see
+the [Entur Real-Time Data](https://developer.entur.org/pages-real-time-intro) documentation and
+the [Norwegian SIRI profile](https://enturas.atlassian.net/wiki/spaces/PUBLIC/pages/637370420/Norwegian+SIRI+profile)
+.
+
+## Configuration
+
+To enable the SIRI-ET Google PubSub updater you need to add it to the updaters section
+of the `router-config.json`.
+
+### Siri-ET via Google PubSub
+
+
+
diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md
index 19a70c44d0f..0891bf6d20d 100644
--- a/docs/RouterConfiguration.md
+++ b/docs/RouterConfiguration.md
@@ -859,6 +859,17 @@ Used to group requests when monitoring OTP.
         "timeout" : 300000
       }
     },
+    {
+      "type" : "siri-et-google-pubsub-updater",
+      "feedId" : "feed_id",
+      "reconnectPeriod" : "5s",
+      "initialGetDataTimeout" : "1m20s",
+      "topicProjectName" : "google_pubsub_topic_project_name",
+      "subscriptionProjectName" : "google_pubsub_subscription_project_name",
+      "topicName" : "estimated_timetables",
+      "dataInitializationUrl" : "https://example.com/some/path",
+      "fuzzyTripMatching" : true
+    },
     {
       "type" : "vehicle-parking",
       "feedId" : "bikeep",
diff --git a/docs/examples/entur/router-config.json b/docs/examples/entur/router-config.json
index 0cbded8bc85..a54e40eb44d 100644
--- a/docs/examples/entur/router-config.json
+++ b/docs/examples/entur/router-config.json
@@ -123,8 +123,9 @@
     {
       "type": "siri-et-google-pubsub-updater",
       "feedId": "EN",
-      "projectName": "entur-ror",
+      "topicProjectName": "entur-anshar",
       "topicName": "estimated_timetables",
+      "subscriptionProjectName": "entur-otp2",
       "dataInitializationUrl": "https://example.com"
     },
     // SIRI ET updater
diff --git a/docs/sandbox/VehicleParking.md b/docs/sandbox/VehicleParking.md
index 8d9e4942440..a5adde1d4c2 100644
--- a/docs/sandbox/VehicleParking.md
+++ b/docs/sandbox/VehicleParking.md
@@ -320,36 +320,36 @@ HTTP headers to add to the request. Any header key, value can be inserted.
 | Config Parameter                 |       Type      | Summary                                                                      |  Req./Opt. | Default Value | Since |
 |----------------------------------|:---------------:|------------------------------------------------------------------------------|:----------:|---------------|:-----:|
 | type = "vehicle-parking"         |      `enum`     | The type of the updater.                                                     | *Required* |               |  1.5  |
-| [feedId](#u__13__feedId)         |     `string`    | The id of the data source, which will be the prefix of the parking lot's id. | *Required* |               |  2.2  |
+| [feedId](#u__14__feedId)         |     `string`    | The id of the data source, which will be the prefix of the parking lot's id. | *Required* |               |  2.2  |
 | frequency                        |    `duration`   | How often to update the source.                                              | *Optional* | `"PT1M"`      |  2.6  |
-| [sourceType](#u__13__sourceType) |      `enum`     | The source of the vehicle updates.                                           | *Required* |               |  2.2  |
+| [sourceType](#u__14__sourceType) |      `enum`     | The source of the vehicle updates.                                           | *Required* |               |  2.2  |
 | url                              |      `uri`      | URL of the locations endpoint.                                               | *Required* |               |  2.6  |
-| [headers](#u__13__headers)       | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.   | *Optional* |               |  2.6  |
+| [headers](#u__14__headers)       | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.   | *Optional* |               |  2.6  |
 
 
 #### Details
 
-
              feedId
              
+
              feedId
              
 
 **Since version:** `2.2` ∙ **Type:** `string` ∙ **Cardinality:** `Required`   
-**Path:** /updaters/[13] 
+**Path:** /updaters/[14] 
 
 The id of the data source, which will be the prefix of the parking lot's id.
 
 This will end up in the API responses as the feed id of of the parking lot.
 
-
              sourceType
              
+
              sourceType
              
 
 **Since version:** `2.2` ∙ **Type:** `enum` ∙ **Cardinality:** `Required`   
-**Path:** /updaters/[13]   
+**Path:** /updaters/[14]   
 **Enum values:** `park-api` | `bicycle-park-api` | `hsl-park` | `bikely` | `noi-open-data-hub` | `bikeep`
 
 The source of the vehicle updates.
 
-
              headers
              
+
              headers
              
 
 **Since version:** `2.6` ∙ **Type:** `map of string` ∙ **Cardinality:** `Optional`   
-**Path:** /updaters/[13] 
+**Path:** /updaters/[14] 
 
 HTTP headers to add to the request. Any header key, value can be inserted.
 
diff --git a/docs/sandbox/siri/SiriGooglePubSubUpdater.md b/docs/sandbox/siri/SiriGooglePubSubUpdater.md
new file mode 100644
index 00000000000..9eee17c5900
--- /dev/null
+++ b/docs/sandbox/siri/SiriGooglePubSubUpdater.md
@@ -0,0 +1,118 @@
+# Siri-ET Google PubSub Updater
+
+Support for consuming SIRI-ET messages over a Google Cloud PubSub subscription.
+Similarly to the SIRI-ET HTTP updater, this updater is developed to support the Nordic SIRI profile
+which is a subset of the SIRI specification.
+
+## Contact Info
+Entur, Norway
+https://entur.no/
+
+## Documentation
+
+This updater consumes SIRI real time information over an asynchronous publisher/subscriber feed
+provided by a Google Cloud PubSub topic.
+
+For more documentation see
+the [Entur Real-Time Data](https://developer.entur.org/pages-real-time-intro) documentation and
+the [Norwegian SIRI profile](https://enturas.atlassian.net/wiki/spaces/PUBLIC/pages/637370420/Norwegian+SIRI+profile)
+.
+
+## Configuration
+
+To enable the SIRI-ET Google PubSub updater you need to add it to the updaters section
+of the `router-config.json`.
+
+### Siri-ET via Google PubSub
+
+
+
+
+| Config Parameter                                           |    Type    | Summary                                                                          |  Req./Opt. | Default Value | Since |
+|------------------------------------------------------------|:----------:|----------------------------------------------------------------------------------|:----------:|---------------|:-----:|
+| type = "siri-et-google-pubsub-updater"                     |   `enum`   | The type of the updater.                                                         | *Required* |               |  1.5  |
+| [dataInitializationUrl](#u__13__dataInitializationUrl)     |  `string`  | URL used to download over HTTP the recent history of SIRI-ET messages.           | *Optional* |               |   na  |
+| feedId                                                     |  `string`  | The ID of the feed to apply the updates to.                                      | *Optional* |               |   na  |
+| fuzzyTripMatching                                          |  `boolean` | If the trips should be matched fuzzily.                                          | *Optional* | `false`       |   na  |
+| [initialGetDataTimeout](#u__13__initialGetDataTimeout)     | `duration` | Timeout for retrieving the recent history of SIRI-ET messages.                   | *Optional* | `"PT30S"`     |   na  |
+| [reconnectPeriod](#u__13__reconnectPeriod)                 | `duration` | Wait this amount of time before trying to reconnect to the PubSub subscription.  | *Optional* | `"PT30S"`     |   na  |
+| [subscriptionProjectName](#u__13__subscriptionProjectName) |  `string`  | The Google Cloud project that hosts the PubSub subscription.                     | *Required* |               |   na  |
+| topicName                                                  |  `string`  | The name of the PubSub topic that publishes the updates.                         | *Required* |               |   na  |
+| topicProjectName                                           |  `string`  | The Google Cloud project that hosts the PubSub topic that publishes the updates. | *Required* |               |   na  |
+
+
+##### Parameter details
+
+
              dataInitializationUrl
              
+
+**Since version:** `na` ∙ **Type:** `string` ∙ **Cardinality:** `Optional`   
+**Path:** /updaters/[13] 
+
+URL used to download over HTTP the recent history of SIRI-ET messages.
+
+Optionally the updater can download the recent history of SIRI-ET messages from this URL.
+If this parameter is set, the updater will be marked as initialized (primed) only when
+the message history is fully downloaded and applied.
+
+
+
              initialGetDataTimeout
              
+
+**Since version:** `na` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT30S"`   
+**Path:** /updaters/[13] 
+
+Timeout for retrieving the recent history of SIRI-ET messages.
+
+When trying to fetch the message history over HTTP, the updater will wait this amount
+of time for the connection to be established.
+If the connection times out, the updater will retry indefinitely with exponential backoff.
+
+
+
              reconnectPeriod
              
+
+**Since version:** `na` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT30S"`   
+**Path:** /updaters/[13] 
+
+Wait this amount of time before trying to reconnect to the PubSub subscription.
+
+In case of a network error, the updater will try periodically to reconnect to the
+Google PubSub subscription.
+
+
+
              subscriptionProjectName
              
+
+**Since version:** `na` ∙ **Type:** `string` ∙ **Cardinality:** `Required`   
+**Path:** /updaters/[13] 
+
+The Google Cloud project that hosts the PubSub subscription.
+
+During startup, the updater creates a PubSub subscription that listens
+to the PubSub topic that publishes SIRI-ET updates.
+This parameter specifies in which Google Cloud project the subscription will be created.
+The topic and the subscription can be hosted in two different projects.
+
+
+
+
+##### Example configuration
+
+```JSON
+// router-config.json
+{
+  "updaters" : [
+    {
+      "type" : "siri-et-google-pubsub-updater",
+      "feedId" : "feed_id",
+      "reconnectPeriod" : "5s",
+      "initialGetDataTimeout" : "1m20s",
+      "topicProjectName" : "google_pubsub_topic_project_name",
+      "subscriptionProjectName" : "google_pubsub_subscription_project_name",
+      "topicName" : "estimated_timetables",
+      "dataInitializationUrl" : "https://example.com/some/path",
+      "fuzzyTripMatching" : true
+    }
+  ]
+}
+```
+
+
+
diff --git a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java
index 24ff12f6bd4..c9e070311c6 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/updater/google/SiriETGooglePubsubUpdaterParameters.java
@@ -10,15 +10,12 @@
 public record SiriETGooglePubsubUpdaterParameters(
   @Nonnull String configRef,
   @Nullable String feedId,
-  String type,
-  @Deprecated String projectName,
   String subscriptionProjectName,
   String topicProjectName,
   String topicName,
   @Nullable String dataInitializationUrl,
   Duration reconnectPeriod,
   Duration initialGetDataTimeout,
-  boolean purgeExpiredData,
   boolean fuzzyTripMatching
 )
   implements UrlUpdaterParameters {
@@ -26,16 +23,6 @@ public record SiriETGooglePubsubUpdaterParameters(
   public static Duration INITIAL_GET_DATA_TIMEOUT = Duration.ofSeconds(30);
 
   public SiriETGooglePubsubUpdaterParameters {
-    Objects.requireNonNull(type);
-
-    if (subscriptionProjectName == null && topicProjectName == null) {
-      // New config-parameters not yet in use
-      // TODO: Remove deprecated `projectName` when config is updated
-      Objects.requireNonNull(projectName);
-      subscriptionProjectName = projectName;
-      topicProjectName = projectName;
-    }
-
     Objects.requireNonNull(subscriptionProjectName);
     Objects.requireNonNull(topicProjectName);
     Objects.requireNonNull(topicName);
@@ -50,14 +37,11 @@ public String toString() {
       .of(SiriETGooglePubsubUpdaterParameters.class)
       .addObj("configRef", configRef, null)
       .addObj("feedId", feedId, null)
-      .addObj("type", type)
-      .addObj("projectName", projectName)
-      .addObj("subscriptionProjectName", subscriptionProjectName, projectName)
-      .addObj("topicProjectName", topicProjectName, projectName)
+      .addObj("subscriptionProjectName", subscriptionProjectName)
+      .addObj("topicProjectName", topicProjectName)
       .addObj("topicName", topicName)
       .addDuration("reconnectPeriod", reconnectPeriod, RECONNECT_PERIOD)
       .addDuration("initialGetDataTimeout", initialGetDataTimeout, INITIAL_GET_DATA_TIMEOUT)
-      .addBoolIfTrue("purgeExpiredData", purgeExpiredData)
       .addBoolIfTrue("fuzzyTripMatching", fuzzyTripMatching)
       .addObj("dataInitializationUrl", dataInitializationUrl, null)
       .toString();
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
index 45221785109..25fbd235cd3 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
@@ -12,17 +12,74 @@ public class SiriETGooglePubsubUpdaterConfig {
   public static SiriETGooglePubsubUpdaterParameters create(String configRef, NodeAdapter c) {
     return new SiriETGooglePubsubUpdaterParameters(
       configRef,
-      c.of("feedId").since(NA).summary("TODO").asString(null),
-      c.of("type").since(NA).summary("TODO").asString(),
-      c.of("projectName").since(NA).summary("TODO").asString(null), // TODO: Remove (deprecated)
-      c.of("subscriptionProjectName").since(NA).summary("TODO").asString(null), // TODO: Set as required
-      c.of("topicProjectName").since(NA).summary("TODO").asString(null), // TODO: Set as required
-      c.of("topicName").since(NA).summary("TODO").asString(),
-      c.of("dataInitializationUrl").since(NA).summary("TODO").asString(null),
-      c.of("reconnectPeriod").since(NA).summary("TODO").asDuration(RECONNECT_PERIOD),
-      c.of("initialGetDataTimeout").since(NA).summary("TODO").asDuration(INITIAL_GET_DATA_TIMEOUT),
-      c.of("purgeExpiredData").since(NA).summary("TODO").asBoolean(false),
-      c.of("fuzzyTripMatching").since(NA).summary("TODO").asBoolean(false)
+      c
+        .of("feedId")
+        .since(NA)
+        .summary("The ID of the feed to apply the updates to.")
+        .asString(null),
+      c
+        .of("subscriptionProjectName")
+        .since(NA)
+        .summary("The Google Cloud project that hosts the PubSub subscription.")
+        .description(
+          """
+        During startup, the updater creates a PubSub subscription that listens
+        to the PubSub topic that publishes SIRI-ET updates.
+        This parameter specifies in which Google Cloud project the subscription will be created.
+        The topic and the subscription can be hosted in two different projects.
+        """
+        )
+        .asString(),
+      c
+        .of("topicProjectName")
+        .since(NA)
+        .summary("The Google Cloud project that hosts the PubSub topic that publishes the updates.")
+        .asString(),
+      c
+        .of("topicName")
+        .since(NA)
+        .summary("The name of the PubSub topic that publishes the updates.")
+        .asString(),
+      c
+        .of("dataInitializationUrl")
+        .since(NA)
+        .summary("URL used to download over HTTP the recent history of SIRI-ET messages.")
+        .description(
+          """
+          Optionally the updater can download the recent history of SIRI-ET messages from this URL.
+          If this parameter is set, the updater will be marked as initialized (primed) only when
+          the message history is fully downloaded and applied.
+          """
+        )
+        .asString(null),
+      c
+        .of("reconnectPeriod")
+        .since(NA)
+        .summary("Wait this amount of time before trying to reconnect to the PubSub subscription.")
+        .description(
+          """
+            In case of a network error, the updater will try periodically to reconnect to the
+            Google PubSub subscription.
+            """
+        )
+        .asDuration(RECONNECT_PERIOD),
+      c
+        .of("initialGetDataTimeout")
+        .since(NA)
+        .summary("Timeout for retrieving the recent history of SIRI-ET messages.")
+        .description(
+          """
+          When trying to fetch the message history over HTTP, the updater will wait this amount
+          of time for the connection to be established.
+          If the connection times out, the updater will retry indefinitely with exponential backoff.
+          """
+        )
+        .asDuration(INITIAL_GET_DATA_TIMEOUT),
+      c
+        .of("fuzzyTripMatching")
+        .since(NA)
+        .summary("If the trips should be matched fuzzily.")
+        .asBoolean(false)
     );
   }
 }
diff --git a/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java b/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java
new file mode 100644
index 00000000000..f5aa3e130ed
--- /dev/null
+++ b/src/test/java/org/opentripplanner/generate/doc/SiriGooglePubSubConfigDocTest.java
@@ -0,0 +1,101 @@
+package org.opentripplanner.generate.doc;
+
+import static org.opentripplanner.framework.application.OtpFileNames.ROUTER_CONFIG_FILENAME;
+import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
+import static org.opentripplanner.framework.io.FileUtils.readFile;
+import static org.opentripplanner.framework.io.FileUtils.writeFile;
+import static org.opentripplanner.framework.text.MarkdownFormatter.HEADER_4;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT;
+import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
+import static org.opentripplanner.standalone.config.framework.json.JsonSupport.jsonNodeFromResource;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
+import java.util.Set;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.generate.doc.framework.DocBuilder;
+import org.opentripplanner.generate.doc.framework.GeneratesDocumentation;
+import org.opentripplanner.generate.doc.framework.ParameterDetailsList;
+import org.opentripplanner.generate.doc.framework.ParameterSummaryTable;
+import org.opentripplanner.generate.doc.framework.SkipNodes;
+import org.opentripplanner.standalone.config.RouterConfig;
+import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
+
+@GeneratesDocumentation
+public class SiriGooglePubSubConfigDocTest {
+
+  private static final File TEMPLATE = new File(
+    TEMPLATE_ROOT,
+    "sandbox/siri/SiriGooglePubSubUpdater.md"
+  );
+  private static final File OUT_FILE = new File(
+    DOCS_ROOT,
+    "sandbox/siri/SiriGooglePubSubUpdater.md"
+  );
+
+  private static final String ROUTER_CONFIG_PATH = "standalone/config/" + ROUTER_CONFIG_FILENAME;
+  private static final Set INCLUDE_UPDATERS = Set.of("siri-et-google-pubsub-updater");
+  private static final SkipNodes SKIP_NODES = SkipNodes.of().build();
+  public static final ObjectMapper mapper = new ObjectMapper();
+
+  /**
+   * NOTE! This test updates the {@code docs/sandbox/SiriGooglePubSubUpdater.md} document based on the latest
+   * version of the code.
+   */
+  @Test
+  public void updateSiriDoc() {
+    NodeAdapter node = readUpdaterConfig();
+
+    // Read and close input file (same as output file)
+    String template = readFile(TEMPLATE);
+    String original = readFile(OUT_FILE);
+
+    for (String childName : node.listChildrenByName()) {
+      var child = node.child(childName);
+      var type = child.typeQualifier();
+
+      if (INCLUDE_UPDATERS.contains(type)) {
+        template = replaceSection(template, type, updaterDoc(child));
+      }
+    }
+
+    writeFile(OUT_FILE, template);
+    assertFileEquals(original, OUT_FILE);
+  }
+
+  private NodeAdapter readUpdaterConfig() {
+    var json = jsonNodeFromResource(ROUTER_CONFIG_PATH);
+    var conf = new RouterConfig(json, ROUTER_CONFIG_PATH, false);
+    return conf.asNodeAdapter().child("updaters");
+  }
+
+  private String updaterDoc(NodeAdapter node) {
+    DocBuilder buf = new DocBuilder();
+    addParameterSummaryTable(buf, node);
+    addDetailsSection(buf, node);
+    addExample(buf, node);
+    return buf.toString();
+  }
+
+  private void addParameterSummaryTable(DocBuilder buf, NodeAdapter node) {
+    buf.addSection(new ParameterSummaryTable(SKIP_NODES).createTable(node).toMarkdownTable());
+  }
+
+  private void addDetailsSection(DocBuilder buf, NodeAdapter node) {
+    String details = getParameterDetailsTable(node);
+
+    if (!details.isBlank()) {
+      buf.header(5, "Parameter details", null).addSection(details);
+    }
+  }
+
+  private String getParameterDetailsTable(NodeAdapter node) {
+    return ParameterDetailsList.listParametersWithDetails(node, SKIP_NODES, HEADER_4);
+  }
+
+  private void addExample(DocBuilder buf, NodeAdapter node) {
+    buf.addSection("##### Example configuration");
+    buf.addUpdaterExample(ROUTER_CONFIG_FILENAME, node.rawNode());
+  }
+}
diff --git a/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java b/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java
index 4bdfe782615..264d0d6850a 100644
--- a/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/UpdaterConfigDocTest.java
@@ -34,6 +34,7 @@ public class UpdaterConfigDocTest {
     "siri-azure-et-updater",
     "vehicle-parking",
     "siri-et-updater",
+    "siri-et-google-pubsub-updater",
     "siri-sx-updater"
   );
   private static final SkipNodes SKIP_NODES = SkipNodes.of().build();
diff --git a/src/test/resources/standalone/config/router-config.json b/src/test/resources/standalone/config/router-config.json
index cee86fafa2e..e6285a77d41 100644
--- a/src/test/resources/standalone/config/router-config.json
+++ b/src/test/resources/standalone/config/router-config.json
@@ -421,6 +421,18 @@
         "timeout": 300000
       }
     },
+    // SIRI ET Google Pubsub updater
+    {
+      "type": "siri-et-google-pubsub-updater",
+      "feedId": "feed_id",
+      "reconnectPeriod": "5s",
+      "initialGetDataTimeout": "1m20s",
+      "topicProjectName": "google_pubsub_topic_project_name",
+      "subscriptionProjectName": "google_pubsub_subscription_project_name",
+      "topicName": "estimated_timetables",
+      "dataInitializationUrl": "https://example.com/some/path",
+      "fuzzyTripMatching": true
+    },
     {
       "type": "vehicle-parking",
       "feedId": "bikeep",

From fc497ca9f1277905fe428ded9eb50215cc096e77 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 25 Jun 2024 15:04:59 +0200
Subject: [PATCH 1474/1688] Apply review suggestions

---
 docs/sandbox/siri/SiriGooglePubSubUpdater.md  | 24 +++++++++----------
 .../SiriETGooglePubsubUpdaterConfig.java      | 18 +++++++-------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/docs/sandbox/siri/SiriGooglePubSubUpdater.md b/docs/sandbox/siri/SiriGooglePubSubUpdater.md
index 9eee17c5900..74dfc4a4238 100644
--- a/docs/sandbox/siri/SiriGooglePubSubUpdater.md
+++ b/docs/sandbox/siri/SiriGooglePubSubUpdater.md
@@ -31,21 +31,21 @@ of the `router-config.json`.
 | Config Parameter                                           |    Type    | Summary                                                                          |  Req./Opt. | Default Value | Since |
 |------------------------------------------------------------|:----------:|----------------------------------------------------------------------------------|:----------:|---------------|:-----:|
 | type = "siri-et-google-pubsub-updater"                     |   `enum`   | The type of the updater.                                                         | *Required* |               |  1.5  |
-| [dataInitializationUrl](#u__13__dataInitializationUrl)     |  `string`  | URL used to download over HTTP the recent history of SIRI-ET messages.           | *Optional* |               |   na  |
-| feedId                                                     |  `string`  | The ID of the feed to apply the updates to.                                      | *Optional* |               |   na  |
-| fuzzyTripMatching                                          |  `boolean` | If the trips should be matched fuzzily.                                          | *Optional* | `false`       |   na  |
-| [initialGetDataTimeout](#u__13__initialGetDataTimeout)     | `duration` | Timeout for retrieving the recent history of SIRI-ET messages.                   | *Optional* | `"PT30S"`     |   na  |
-| [reconnectPeriod](#u__13__reconnectPeriod)                 | `duration` | Wait this amount of time before trying to reconnect to the PubSub subscription.  | *Optional* | `"PT30S"`     |   na  |
-| [subscriptionProjectName](#u__13__subscriptionProjectName) |  `string`  | The Google Cloud project that hosts the PubSub subscription.                     | *Required* |               |   na  |
-| topicName                                                  |  `string`  | The name of the PubSub topic that publishes the updates.                         | *Required* |               |   na  |
-| topicProjectName                                           |  `string`  | The Google Cloud project that hosts the PubSub topic that publishes the updates. | *Required* |               |   na  |
+| [dataInitializationUrl](#u__13__dataInitializationUrl)     |  `string`  | URL used to download over HTTP the recent history of SIRI-ET messages.           | *Optional* |               |  2.1  |
+| feedId                                                     |  `string`  | The ID of the feed to apply the updates to.                                      | *Optional* |               |  2.1  |
+| fuzzyTripMatching                                          |  `boolean` | If the trips should be matched fuzzily.                                          | *Optional* | `false`       |  2.1  |
+| [initialGetDataTimeout](#u__13__initialGetDataTimeout)     | `duration` | Timeout for retrieving the recent history of SIRI-ET messages.                   | *Optional* | `"PT30S"`     |  2.1  |
+| [reconnectPeriod](#u__13__reconnectPeriod)                 | `duration` | Wait this amount of time before trying to reconnect to the PubSub subscription.  | *Optional* | `"PT30S"`     |  2.1  |
+| [subscriptionProjectName](#u__13__subscriptionProjectName) |  `string`  | The Google Cloud project that hosts the PubSub subscription.                     | *Required* |               |  2.1  |
+| topicName                                                  |  `string`  | The name of the PubSub topic that publishes the updates.                         | *Required* |               |  2.1  |
+| topicProjectName                                           |  `string`  | The Google Cloud project that hosts the PubSub topic that publishes the updates. | *Required* |               |  2.1  |
 
 
 ##### Parameter details
 
 
              dataInitializationUrl
              
 
-**Since version:** `na` ∙ **Type:** `string` ∙ **Cardinality:** `Optional`   
+**Since version:** `2.1` ∙ **Type:** `string` ∙ **Cardinality:** `Optional`   
 **Path:** /updaters/[13] 
 
 URL used to download over HTTP the recent history of SIRI-ET messages.
@@ -57,7 +57,7 @@ the message history is fully downloaded and applied.
 
 
              initialGetDataTimeout
              
 
-**Since version:** `na` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT30S"`   
+**Since version:** `2.1` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT30S"`   
 **Path:** /updaters/[13] 
 
 Timeout for retrieving the recent history of SIRI-ET messages.
@@ -69,7 +69,7 @@ If the connection times out, the updater will retry indefinitely with exponentia
 
 
              reconnectPeriod
              
 
-**Since version:** `na` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT30S"`   
+**Since version:** `2.1` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT30S"`   
 **Path:** /updaters/[13] 
 
 Wait this amount of time before trying to reconnect to the PubSub subscription.
@@ -80,7 +80,7 @@ Google PubSub subscription.
 
 
              subscriptionProjectName
              
 
-**Since version:** `na` ∙ **Type:** `string` ∙ **Cardinality:** `Required`   
+**Since version:** `2.1` ∙ **Type:** `string` ∙ **Cardinality:** `Required`   
 **Path:** /updaters/[13] 
 
 The Google Cloud project that hosts the PubSub subscription.
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
index 25fbd235cd3..75ade008070 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerconfig/updaters/SiriETGooglePubsubUpdaterConfig.java
@@ -2,7 +2,7 @@
 
 import static org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters.INITIAL_GET_DATA_TIMEOUT;
 import static org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters.RECONNECT_PERIOD;
-import static org.opentripplanner.standalone.config.framework.json.OtpVersion.NA;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1;
 
 import org.opentripplanner.ext.siri.updater.google.SiriETGooglePubsubUpdaterParameters;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
@@ -14,12 +14,12 @@ public static SiriETGooglePubsubUpdaterParameters create(String configRef, NodeA
       configRef,
       c
         .of("feedId")
-        .since(NA)
+        .since(V2_1)
         .summary("The ID of the feed to apply the updates to.")
         .asString(null),
       c
         .of("subscriptionProjectName")
-        .since(NA)
+        .since(V2_1)
         .summary("The Google Cloud project that hosts the PubSub subscription.")
         .description(
           """
@@ -32,17 +32,17 @@ public static SiriETGooglePubsubUpdaterParameters create(String configRef, NodeA
         .asString(),
       c
         .of("topicProjectName")
-        .since(NA)
+        .since(V2_1)
         .summary("The Google Cloud project that hosts the PubSub topic that publishes the updates.")
         .asString(),
       c
         .of("topicName")
-        .since(NA)
+        .since(V2_1)
         .summary("The name of the PubSub topic that publishes the updates.")
         .asString(),
       c
         .of("dataInitializationUrl")
-        .since(NA)
+        .since(V2_1)
         .summary("URL used to download over HTTP the recent history of SIRI-ET messages.")
         .description(
           """
@@ -54,7 +54,7 @@ If this parameter is set, the updater will be marked as initialized (primed) onl
         .asString(null),
       c
         .of("reconnectPeriod")
-        .since(NA)
+        .since(V2_1)
         .summary("Wait this amount of time before trying to reconnect to the PubSub subscription.")
         .description(
           """
@@ -65,7 +65,7 @@ If this parameter is set, the updater will be marked as initialized (primed) onl
         .asDuration(RECONNECT_PERIOD),
       c
         .of("initialGetDataTimeout")
-        .since(NA)
+        .since(V2_1)
         .summary("Timeout for retrieving the recent history of SIRI-ET messages.")
         .description(
           """
@@ -77,7 +77,7 @@ If this parameter is set, the updater will be marked as initialized (primed) onl
         .asDuration(INITIAL_GET_DATA_TIMEOUT),
       c
         .of("fuzzyTripMatching")
-        .since(NA)
+        .since(V2_1)
         .summary("If the trips should be matched fuzzily.")
         .asBoolean(false)
     );

From e1c02b221a22e1ba278973e16144050abc5962b9 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 25 Jun 2024 16:13:09 +0200
Subject: [PATCH 1475/1688] Add GraphQL data fetcher error logging

---
 .../LoggingDataFetcherExceptionHandler.java   | 21 +++++++++++++++++++
 .../apis/transmodel/TransmodelGraph.java      |  1 +
 ...UnprocessableRequestExecutionStrategy.java |  5 +++++
 src/main/resources/logback.xml                |  6 +++++-
 4 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/opentripplanner/apis/transmodel/LoggingDataFetcherExceptionHandler.java

diff --git a/src/main/java/org/opentripplanner/apis/transmodel/LoggingDataFetcherExceptionHandler.java b/src/main/java/org/opentripplanner/apis/transmodel/LoggingDataFetcherExceptionHandler.java
new file mode 100644
index 00000000000..42bd8fd35eb
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/transmodel/LoggingDataFetcherExceptionHandler.java
@@ -0,0 +1,21 @@
+package org.opentripplanner.apis.transmodel;
+
+import graphql.ExceptionWhileDataFetching;
+import graphql.execution.SimpleDataFetcherExceptionHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Log a warning message when an exception occurs in a data fetcher.
+ */
+public class LoggingDataFetcherExceptionHandler extends SimpleDataFetcherExceptionHandler {
+
+  private static final Logger LOG = LoggerFactory.getLogger(
+    LoggingDataFetcherExceptionHandler.class
+  );
+
+  @Override
+  protected void logException(ExceptionWhileDataFetching error, Throwable exception) {
+    LOG.warn(error.getMessage(), exception);
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
index d755c509989..b2bff3416c0 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
@@ -130,6 +130,7 @@ private GraphQL createGraphQL(
       .newGraphQL(indexSchema)
       .instrumentation(instrumentation)
       .queryExecutionStrategy(executionStrategy)
+      .defaultDataFetcherExceptionHandler(new LoggingDataFetcherExceptionHandler())
       .build();
   }
 
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
index a8a664fc18d..4da0bb926ff 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
@@ -5,6 +5,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
+import org.opentripplanner.apis.transmodel.LoggingDataFetcherExceptionHandler;
 import org.opentripplanner.apis.transmodel.ResponseTooLargeException;
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
 import org.opentripplanner.framework.logging.ProgressTracker;
@@ -31,6 +32,10 @@ public class AbortOnUnprocessableRequestExecutionStrategy
     -1
   );
 
+  public AbortOnUnprocessableRequestExecutionStrategy() {
+    super(new LoggingDataFetcherExceptionHandler());
+  }
+
   @Override
   protected  CompletableFuture handleFetchingException(
     DataFetchingEnvironment environment,
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index e71ba4aae49..2c0276cd11b 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -83,7 +83,6 @@
   
   
   
-  
 
   
   
@@ -95,6 +94,11 @@
   
   
 
+  
+  
+
   
   
   

From f06ec46bd1cd19f6fb0bc40f1417fc61f9c53817 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Tue, 25 Jun 2024 14:24:19 +0000
Subject: [PATCH 1476/1688] Add changelog entry for #5927 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 8cdfb231eb3..7d524a77258 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -35,6 +35,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Remove TravelTime API [#5890](https://github.com/opentripplanner/OpenTripPlanner/pull/5890)
 - Improve cancellation of large response in TransModel API [#5908](https://github.com/opentripplanner/OpenTripPlanner/pull/5908)
 - Refactor SIRI-ET updaters [#5904](https://github.com/opentripplanner/OpenTripPlanner/pull/5904)
+- Update Google Pubsub updater configuration [#5927](https://github.com/opentripplanner/OpenTripPlanner/pull/5927)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 858637651006b45e11f4ae3a3e457b1ccb74197c Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 25 Jun 2024 16:40:56 +0200
Subject: [PATCH 1477/1688] Add support for GraphQL error logging in GTFS API

---
 .../org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java    | 7 ++++++-
 .../graphql}/LoggingDataFetcherExceptionHandler.java       | 2 +-
 .../opentripplanner/apis/transmodel/TransmodelGraph.java   | 1 +
 .../AbortOnUnprocessableRequestExecutionStrategy.java      | 2 +-
 src/main/resources/logback.xml                             | 4 ++--
 5 files changed, 11 insertions(+), 5 deletions(-)
 rename src/main/java/org/opentripplanner/apis/{transmodel => support/graphql}/LoggingDataFetcherExceptionHandler.java (92%)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
index 9175d3486e1..e309346339b 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
@@ -83,6 +83,7 @@
 import org.opentripplanner.apis.gtfs.datafetchers.stepImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.stopAtDistanceImpl;
 import org.opentripplanner.apis.gtfs.model.StopPosition;
+import org.opentripplanner.apis.support.graphql.LoggingDataFetcherExceptionHandler;
 import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation;
 import org.opentripplanner.framework.application.OTPFeature;
 import org.opentripplanner.framework.concurrent.OtpRequestThreadFactory;
@@ -210,7 +211,11 @@ static ExecutionResult getGraphQLExecutionResult(
         );
     }
 
-    GraphQL graphQL = GraphQL.newGraphQL(indexSchema).instrumentation(instrumentation).build();
+    GraphQL graphQL = GraphQL
+      .newGraphQL(indexSchema)
+      .instrumentation(instrumentation)
+      .defaultDataFetcherExceptionHandler(new LoggingDataFetcherExceptionHandler())
+      .build();
 
     if (variables == null) {
       variables = new HashMap<>();
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/LoggingDataFetcherExceptionHandler.java b/src/main/java/org/opentripplanner/apis/support/graphql/LoggingDataFetcherExceptionHandler.java
similarity index 92%
rename from src/main/java/org/opentripplanner/apis/transmodel/LoggingDataFetcherExceptionHandler.java
rename to src/main/java/org/opentripplanner/apis/support/graphql/LoggingDataFetcherExceptionHandler.java
index 42bd8fd35eb..1394a847ed6 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/LoggingDataFetcherExceptionHandler.java
+++ b/src/main/java/org/opentripplanner/apis/support/graphql/LoggingDataFetcherExceptionHandler.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.apis.transmodel;
+package org.opentripplanner.apis.support.graphql;
 
 import graphql.ExceptionWhileDataFetching;
 import graphql.execution.SimpleDataFetcherExceptionHandler;
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
index b2bff3416c0..79e767b1fea 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/TransmodelGraph.java
@@ -16,6 +16,7 @@
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
+import org.opentripplanner.apis.support.graphql.LoggingDataFetcherExceptionHandler;
 import org.opentripplanner.apis.transmodel.support.AbortOnUnprocessableRequestExecutionStrategy;
 import org.opentripplanner.apis.transmodel.support.ExecutionResultMapper;
 import org.opentripplanner.ext.actuator.MicrometerGraphQLInstrumentation;
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
index 4da0bb926ff..c395d359131 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/support/AbortOnUnprocessableRequestExecutionStrategy.java
@@ -5,7 +5,7 @@
 import graphql.schema.DataFetchingEnvironment;
 import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
-import org.opentripplanner.apis.transmodel.LoggingDataFetcherExceptionHandler;
+import org.opentripplanner.apis.support.graphql.LoggingDataFetcherExceptionHandler;
 import org.opentripplanner.apis.transmodel.ResponseTooLargeException;
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
 import org.opentripplanner.framework.logging.ProgressTracker;
diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
index 2c0276cd11b..7ff48379a7d 100644
--- a/src/main/resources/logback.xml
+++ b/src/main/resources/logback.xml
@@ -94,10 +94,10 @@
   
   
 
-  
-  
+  
 
   
   

From f00e907777bd586cec393a57f2721ae93e328dcd Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 25 Jun 2024 17:45:34 +0200
Subject: [PATCH 1478/1688] Document integration with OSM

---
 doc-templates/OsmMapper.md                    |   17 +
 docs/osm/Atlanta.md                           | 1270 +++++++++++++
 docs/osm/Default.md                           | 1254 +++++++++++++
 docs/osm/Finland.md                           | 1607 +++++++++++++++++
 docs/osm/Germany.md                           | 1337 ++++++++++++++
 docs/osm/Hamburg.md                           |  217 +++
 docs/osm/Houston.md                           | 1262 +++++++++++++
 docs/osm/Norway.md                            |  428 +++++
 docs/osm/Portland.md                          | 1275 +++++++++++++
 docs/osm/UK.md                                | 1366 ++++++++++++++
 mkdocs.yml                                    |    9 +
 .../tagmapping/NorwayMapper.java              |   78 +-
 .../tagmapping/OsmTagMapperSource.java        |    4 +
 .../wayproperty/SafetyFeatures.java           |    4 +
 .../specifier/BestMatchSpecifier.java         |    7 +
 .../wayproperty/specifier/Condition.java      |   46 +-
 .../specifier/ExactMatchSpecifier.java        |    6 +
 .../specifier/LogicalOrSpecifier.java         |   10 +-
 .../wayproperty/specifier/OsmSpecifier.java   |    2 +
 .../generate/doc/OsmMapperDocTest.java        |  141 ++
 .../wayproperty/specifier/ConditionTest.java  |    6 +-
 21 files changed, 10297 insertions(+), 49 deletions(-)
 create mode 100644 doc-templates/OsmMapper.md
 create mode 100644 docs/osm/Atlanta.md
 create mode 100644 docs/osm/Default.md
 create mode 100644 docs/osm/Finland.md
 create mode 100644 docs/osm/Germany.md
 create mode 100644 docs/osm/Hamburg.md
 create mode 100644 docs/osm/Houston.md
 create mode 100644 docs/osm/Norway.md
 create mode 100644 docs/osm/Portland.md
 create mode 100644 docs/osm/UK.md
 create mode 100644 src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java

diff --git a/doc-templates/OsmMapper.md b/doc-templates/OsmMapper.md
new file mode 100644
index 00000000000..555805f0c8d
--- /dev/null
+++ b/doc-templates/OsmMapper.md
@@ -0,0 +1,17 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
diff --git a/docs/osm/Atlanta.md b/docs/osm/Atlanta.md
new file mode 100644
index 00000000000..da8caa3b433
--- /dev/null
+++ b/docs/osm/Atlanta.md
@@ -0,0 +1,1270 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                               | permission             | safety |
+|---------------------------------------------------------|------------------------|--------|
+| `highway=trunk_link`                                    | ALL                    | 🚴     |
+| `highway=trunk`                                         | ALL                    | 🚴     |
+| `mtb:scale=3`                                           | NONE                   |        |
+| `mtb:scale=4`                                           | NONE                   |        |
+| `mtb:scale=5`                                           | NONE                   |        |
+| `mtb:scale=6`                                           | NONE                   |        |
+| `highway=corridor`                                      | PEDESTRIAN             |        |
+| `highway=steps`                                         | PEDESTRIAN             |        |
+| `highway=crossing`                                      | PEDESTRIAN             |        |
+| `highway=platform`                                      | PEDESTRIAN             |        |
+| `public_transport=platform`                             | PEDESTRIAN             |        |
+| `railway=platform`                                      | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
+| `mtb:scale=1`                                           | PEDESTRIAN             |        |
+| `mtb:scale=2`                                           | PEDESTRIAN             |        |
+| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                 | ALL                    | 🚴     |
+| `highway=unclassified`                                  | ALL                    |        |
+| `highway=road`                                          | ALL                    |        |
+| `highway=byway`                                         | ALL                    | 🚴     |
+| `highway=track`                                         | ALL                    | 🚴     |
+| `highway=service`                                       | ALL                    | 🚴     |
+| `highway=residential`                                   | ALL                    | 🚴     |
+| `highway=residential_link`                              | ALL                    | 🚴     |
+| `highway=tertiary`                                      | ALL                    |        |
+| `highway=tertiary_link`                                 | ALL                    |        |
+| `highway=secondary`                                     | ALL                    | 🚴     |
+| `highway=secondary_link`                                | ALL                    | 🚴     |
+| `highway=primary`                                       | ALL                    | 🚴     |
+| `highway=primary_link`                                  | ALL                    | 🚴     |
+| `highway=trunk_link`                                    | CAR                    | 🚴     |
+| `highway=motorway_link`                                 | CAR                    | 🚴     |
+| `highway=trunk`                                         | CAR                    | 🚴     |
+| `highway=motorway`                                      | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `mtb:scale=3`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `mtb:scale=4`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `mtb:scale=5`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `mtb:scale=6`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `highway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `railway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #13
              
+
+**Specifier:** `mtb:scale=1`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #14
              
+
+**Specifier:** `mtb:scale=2`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `mtb:scale=0`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #16
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #17
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #18
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #22
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #23
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #27
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #29
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #30
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #31
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #32
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #33
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #34
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #35
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #36
              
+
+**Specifier:** `highway=motorway_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #37
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #38
              
+
+**Specifier:** `highway=motorway`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 8.0, back: 8.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #39
              
+
+**Specifier:** `present(highway); cycleway=lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #40
              
+
+**Specifier:** `highway=service; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #41
              
+
+**Specifier:** `highway=residential; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #42
              
+
+**Specifier:** `highway=residential_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `highway=tertiary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #44
              
+
+**Specifier:** `highway=tertiary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #45
              
+
+**Specifier:** `highway=secondary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #46
              
+
+**Specifier:** `highway=secondary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #47
              
+
+**Specifier:** `highway=primary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #48
              
+
+**Specifier:** `highway=primary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #49
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #50
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #51
              
+
+**Specifier:** `highway=motorway; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #52
              
+
+**Specifier:** `highway=motorway_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #53
              
+
+**Specifier:** `present(highway); cycleway=share_busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #54
              
+
+**Specifier:** `highway=service; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #55
              
+
+**Specifier:** `highway=residential; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #56
              
+
+**Specifier:** `highway=residential_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #57
              
+
+**Specifier:** `highway=tertiary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #58
              
+
+**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #59
              
+
+**Specifier:** `highway=secondary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #60
              
+
+**Specifier:** `highway=secondary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #61
              
+
+**Specifier:** `highway=primary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #62
              
+
+**Specifier:** `highway=primary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #63
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #64
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #65
              
+
+**Specifier:** `highway=motorway; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #66
              
+
+**Specifier:** `highway=motorway_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #67
              
+
+**Specifier:** `present(highway); cycleway=opposite_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #68
              
+
+**Specifier:** `highway=service; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #69
              
+
+**Specifier:** `highway=residential; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #70
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #71
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #72
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #73
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #74
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #75
              
+
+**Specifier:** `highway=primary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #76
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #77
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #78
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #79
              
+
+**Specifier:** `present(highway); cycleway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #80
              
+
+**Specifier:** `highway=service; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #81
              
+
+**Specifier:** `highway=residential; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #82
              
+
+**Specifier:** `highway=residential_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #83
              
+
+**Specifier:** `highway=tertiary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #84
              
+
+**Specifier:** `highway=tertiary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #85
              
+
+**Specifier:** `highway=secondary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #86
              
+
+**Specifier:** `highway=secondary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #87
              
+
+**Specifier:** `highway=primary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #88
              
+
+**Specifier:** `highway=primary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #89
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #90
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #91
              
+
+**Specifier:** `present(highway); cycleway=opposite_track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #92
              
+
+**Specifier:** `highway=service; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #93
              
+
+**Specifier:** `highway=residential; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #94
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #95
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #96
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #97
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #98
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #99
              
+
+**Specifier:** `highway=primary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #100
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #101
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #102
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #103
              
+
+**Specifier:** `present(highway); cycleway=shared_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #104
              
+
+**Specifier:** `highway=service; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.73, back: 0.73   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #105
              
+
+**Specifier:** `highway=residential; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #106
              
+
+**Specifier:** `highway=residential_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #107
              
+
+**Specifier:** `highway=tertiary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #108
              
+
+**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #109
              
+
+**Specifier:** `highway=secondary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #110
              
+
+**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #111
              
+
+**Specifier:** `highway=primary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #112
              
+
+**Specifier:** `highway=primary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #113
              
+
+**Specifier:** `present(highway); cycleway=opposite`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.4   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #114
              
+
+**Specifier:** `highway=service; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #115
              
+
+**Specifier:** `highway=residential; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #116
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #117
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #118
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #119
              
+
+**Specifier:** `highway=secondary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #120
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #121
              
+
+**Specifier:** `highway=primary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #122
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #123
              
+
+**Specifier:** `highway=path; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #124
              
+
+**Specifier:** `highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #125
              
+
+**Specifier:** `highway=footway; bicycle=yes; area=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #126
              
+
+**Specifier:** `highway=pedestrian; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #127
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #128
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #129
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #130
              
+
+**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #131
              
+
+**Specifier:** `highway=track; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #132
              
+
+**Specifier:** `highway=track; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #133
              
+
+**Specifier:** `highway=track; bicycle=yes; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #134
              
+
+**Specifier:** `highway=track; bicycle=designated; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #135
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #136
              
+
+**Specifier:** `present(highway); bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #137
              
+
+**Specifier:** `highway=service; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.84, back: 0.84   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #138
              
+
+**Specifier:** `highway=residential; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #139
              
+
+**Specifier:** `highway=unclassified; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #140
              
+
+**Specifier:** `highway=residential_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #141
              
+
+**Specifier:** `highway=tertiary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #142
              
+
+**Specifier:** `highway=tertiary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #143
              
+
+**Specifier:** `highway=secondary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #144
              
+
+**Specifier:** `highway=secondary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #145
              
+
+**Specifier:** `highway=primary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #146
              
+
+**Specifier:** `highway=primary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #147
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #148
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #149
              
+
+**Specifier:** `highway=motorway; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.76, back: 7.76   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #150
              
+
+**Specifier:** `highway=motorway_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/docs/osm/Default.md b/docs/osm/Default.md
new file mode 100644
index 00000000000..fe2b8895b23
--- /dev/null
+++ b/docs/osm/Default.md
@@ -0,0 +1,1254 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                               | permission             | safety |
+|---------------------------------------------------------|------------------------|--------|
+| `mtb:scale=3`                                           | NONE                   |        |
+| `mtb:scale=4`                                           | NONE                   |        |
+| `mtb:scale=5`                                           | NONE                   |        |
+| `mtb:scale=6`                                           | NONE                   |        |
+| `highway=corridor`                                      | PEDESTRIAN             |        |
+| `highway=steps`                                         | PEDESTRIAN             |        |
+| `highway=crossing`                                      | PEDESTRIAN             |        |
+| `highway=platform`                                      | PEDESTRIAN             |        |
+| `public_transport=platform`                             | PEDESTRIAN             |        |
+| `railway=platform`                                      | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
+| `mtb:scale=1`                                           | PEDESTRIAN             |        |
+| `mtb:scale=2`                                           | PEDESTRIAN             |        |
+| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                 | ALL                    | 🚴     |
+| `highway=unclassified`                                  | ALL                    |        |
+| `highway=road`                                          | ALL                    |        |
+| `highway=byway`                                         | ALL                    | 🚴     |
+| `highway=track`                                         | ALL                    | 🚴     |
+| `highway=service`                                       | ALL                    | 🚴     |
+| `highway=residential`                                   | ALL                    | 🚴     |
+| `highway=residential_link`                              | ALL                    | 🚴     |
+| `highway=tertiary`                                      | ALL                    |        |
+| `highway=tertiary_link`                                 | ALL                    |        |
+| `highway=secondary`                                     | ALL                    | 🚴     |
+| `highway=secondary_link`                                | ALL                    | 🚴     |
+| `highway=primary`                                       | ALL                    | 🚴     |
+| `highway=primary_link`                                  | ALL                    | 🚴     |
+| `highway=trunk_link`                                    | CAR                    | 🚴     |
+| `highway=motorway_link`                                 | CAR                    | 🚴     |
+| `highway=trunk`                                         | CAR                    | 🚴     |
+| `highway=motorway`                                      | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `mtb:scale=3`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `mtb:scale=4`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `mtb:scale=5`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `mtb:scale=6`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `highway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `railway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `mtb:scale=1`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `mtb:scale=2`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #13
              
+
+**Specifier:** `mtb:scale=0`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #14
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #16
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #17
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #18
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #22
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #23
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #27
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #29
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #30
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #31
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #32
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #33
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #34
              
+
+**Specifier:** `highway=motorway_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #35
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #36
              
+
+**Specifier:** `highway=motorway`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 8.0, back: 8.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #37
              
+
+**Specifier:** `present(highway); cycleway=lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #38
              
+
+**Specifier:** `highway=service; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #39
              
+
+**Specifier:** `highway=residential; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #40
              
+
+**Specifier:** `highway=residential_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #41
              
+
+**Specifier:** `highway=tertiary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #42
              
+
+**Specifier:** `highway=tertiary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `highway=secondary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #44
              
+
+**Specifier:** `highway=secondary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #45
              
+
+**Specifier:** `highway=primary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #46
              
+
+**Specifier:** `highway=primary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #47
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #48
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #49
              
+
+**Specifier:** `highway=motorway; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #50
              
+
+**Specifier:** `highway=motorway_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #51
              
+
+**Specifier:** `present(highway); cycleway=share_busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #52
              
+
+**Specifier:** `highway=service; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #53
              
+
+**Specifier:** `highway=residential; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #54
              
+
+**Specifier:** `highway=residential_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #55
              
+
+**Specifier:** `highway=tertiary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #56
              
+
+**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #57
              
+
+**Specifier:** `highway=secondary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #58
              
+
+**Specifier:** `highway=secondary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #59
              
+
+**Specifier:** `highway=primary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #60
              
+
+**Specifier:** `highway=primary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #61
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #62
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #63
              
+
+**Specifier:** `highway=motorway; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #64
              
+
+**Specifier:** `highway=motorway_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #65
              
+
+**Specifier:** `present(highway); cycleway=opposite_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #66
              
+
+**Specifier:** `highway=service; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #67
              
+
+**Specifier:** `highway=residential; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #68
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #69
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #70
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #71
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #72
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #73
              
+
+**Specifier:** `highway=primary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #74
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #75
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #76
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #77
              
+
+**Specifier:** `present(highway); cycleway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #78
              
+
+**Specifier:** `highway=service; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #79
              
+
+**Specifier:** `highway=residential; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #80
              
+
+**Specifier:** `highway=residential_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #81
              
+
+**Specifier:** `highway=tertiary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #82
              
+
+**Specifier:** `highway=tertiary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #83
              
+
+**Specifier:** `highway=secondary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #84
              
+
+**Specifier:** `highway=secondary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #85
              
+
+**Specifier:** `highway=primary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #86
              
+
+**Specifier:** `highway=primary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #87
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #88
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #89
              
+
+**Specifier:** `present(highway); cycleway=opposite_track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #90
              
+
+**Specifier:** `highway=service; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #91
              
+
+**Specifier:** `highway=residential; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #92
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #93
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #94
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #95
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #96
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #97
              
+
+**Specifier:** `highway=primary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #98
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #99
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #100
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #101
              
+
+**Specifier:** `present(highway); cycleway=shared_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #102
              
+
+**Specifier:** `highway=service; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.73, back: 0.73   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #103
              
+
+**Specifier:** `highway=residential; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #104
              
+
+**Specifier:** `highway=residential_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #105
              
+
+**Specifier:** `highway=tertiary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #106
              
+
+**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #107
              
+
+**Specifier:** `highway=secondary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #108
              
+
+**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #109
              
+
+**Specifier:** `highway=primary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #110
              
+
+**Specifier:** `highway=primary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #111
              
+
+**Specifier:** `present(highway); cycleway=opposite`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.4   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #112
              
+
+**Specifier:** `highway=service; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #113
              
+
+**Specifier:** `highway=residential; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #114
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #115
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #116
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #117
              
+
+**Specifier:** `highway=secondary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #118
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #119
              
+
+**Specifier:** `highway=primary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #120
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #121
              
+
+**Specifier:** `highway=path; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #122
              
+
+**Specifier:** `highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #123
              
+
+**Specifier:** `highway=footway; bicycle=yes; area=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #124
              
+
+**Specifier:** `highway=pedestrian; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #125
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #126
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #127
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #128
              
+
+**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #129
              
+
+**Specifier:** `highway=track; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #130
              
+
+**Specifier:** `highway=track; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #131
              
+
+**Specifier:** `highway=track; bicycle=yes; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #132
              
+
+**Specifier:** `highway=track; bicycle=designated; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #133
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #134
              
+
+**Specifier:** `present(highway); bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #135
              
+
+**Specifier:** `highway=service; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.84, back: 0.84   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #136
              
+
+**Specifier:** `highway=residential; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #137
              
+
+**Specifier:** `highway=unclassified; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #138
              
+
+**Specifier:** `highway=residential_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #139
              
+
+**Specifier:** `highway=tertiary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #140
              
+
+**Specifier:** `highway=tertiary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #141
              
+
+**Specifier:** `highway=secondary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #142
              
+
+**Specifier:** `highway=secondary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #143
              
+
+**Specifier:** `highway=primary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #144
              
+
+**Specifier:** `highway=primary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #145
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #146
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #147
              
+
+**Specifier:** `highway=motorway; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.76, back: 7.76   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #148
              
+
+**Specifier:** `highway=motorway_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/docs/osm/Finland.md b/docs/osm/Finland.md
new file mode 100644
index 00000000000..2cd77be22ea
--- /dev/null
+++ b/docs/osm/Finland.md
@@ -0,0 +1,1607 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                                                       | permission             | safety |
+|---------------------------------------------------------------------------------|------------------------|--------|
+| `highway=living_street`                                                         | ALL                    | 🚴     |
+| `highway=unclassified`                                                          | ALL                    |        |
+| `highway=road`                                                                  | ALL                    |        |
+| `highway=byway`                                                                 | ALL                    | 🚴     |
+| `highway=track`                                                                 | ALL                    | 🚴     |
+| `highway=service`                                                               | ALL                    | 🚴     |
+| `highway=residential`                                                           | ALL                    | 🚴     |
+| `highway=residential_link`                                                      | ALL                    | 🚴     |
+| `highway=tertiary`                                                              | ALL                    |        |
+| `highway=tertiary_link`                                                         | ALL                    |        |
+| `highway=secondary`                                                             | ALL                    | 🚴     |
+| `highway=secondary_link`                                                        | ALL                    | 🚴     |
+| `highway=primary`                                                               | ALL                    | 🚴     |
+| `highway=primary_link`                                                          | ALL                    | 🚴     |
+| `highway=trunk_link`                                                            | ALL                    | 🚴     |
+| `highway=trunk`                                                                 | ALL                    | 🚴     |
+| `highway=trunk; tunnel=yes`                                                     | CAR                    | 🚴     |
+| `motorroad=yes`                                                                 | CAR                    | 🚴     |
+| `present(highway); informal=yes`                                                | NONE                   |        |
+| `highway=service; access=private`                                               | NONE                   |        |
+| `highway=trail`                                                                 | NONE                   |        |
+| `present(highway); seasonal=winter`                                             | NONE                   |        |
+| `present(highway); ice_road=yes`                                                | NONE                   |        |
+| `present(highway); winter_road=yes`                                             | NONE                   |        |
+| `highway=footway`                                                               | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                                             | PEDESTRIAN             |        |
+| `highway=cycleway; segregated=yes`                                              | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=footway; bridge=yes`                                                   | PEDESTRIAN             |        |
+| `highway=footway; tunnel=yes`                                                   | PEDESTRIAN             |        |
+| `highway=cycleway; bridge=yes`                                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=cycleway; tunnel=yes`                                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; crossing=traffic_signals`                   | PEDESTRIAN             | 🚶     |
+| `highway=footway; footway=crossing`                                             | PEDESTRIAN             | 🚶     |
+| `highway=cycleway; cycleway=crossing; segregated=yes; crossing=traffic_signals` | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; footway=crossing; segregated=yes; crossing=traffic_signals`  | PEDESTRIAN             | 🚴 🚶  |
+| `highway=cycleway; cycleway=crossing; segregated=yes`                           | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; footway=crossing; segregated=yes`                            | PEDESTRIAN             | 🚴 🚶  |
+| `highway=cycleway; cycleway=crossing; crossing=traffic_signals`                 | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; footway=crossing; crossing=traffic_signals`                  | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; cycleway=crossing`                                           | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; footway=crossing`                                            | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; bicycle=designated`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; tunnel=yes; access=destination`                               | NONE                   |        |
+| `highway=service; access=destination`                                           | ALL                    | 🚴     |
+| `mtb:scale=3`                                                                   | NONE                   |        |
+| `mtb:scale=4`                                                                   | NONE                   |        |
+| `mtb:scale=5`                                                                   | NONE                   |        |
+| `mtb:scale=6`                                                                   | NONE                   |        |
+| `highway=corridor`                                                              | PEDESTRIAN             |        |
+| `highway=steps`                                                                 | PEDESTRIAN             |        |
+| `highway=crossing`                                                              | PEDESTRIAN             |        |
+| `highway=platform`                                                              | PEDESTRIAN             |        |
+| `public_transport=platform`                                                     | PEDESTRIAN             |        |
+| `railway=platform`                                                              | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                                             | PEDESTRIAN             |        |
+| `mtb:scale=1`                                                                   | PEDESTRIAN             |        |
+| `mtb:scale=2`                                                                   | PEDESTRIAN             |        |
+| `mtb:scale=0`                                                                   | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                                              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                                             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                                         | ALL                    | 🚴     |
+| `highway=unclassified`                                                          | ALL                    |        |
+| `highway=road`                                                                  | ALL                    |        |
+| `highway=byway`                                                                 | ALL                    | 🚴     |
+| `highway=track`                                                                 | ALL                    | 🚴     |
+| `highway=service`                                                               | ALL                    | 🚴     |
+| `highway=residential`                                                           | ALL                    | 🚴     |
+| `highway=residential_link`                                                      | ALL                    | 🚴     |
+| `highway=tertiary`                                                              | ALL                    |        |
+| `highway=tertiary_link`                                                         | ALL                    |        |
+| `highway=secondary`                                                             | ALL                    | 🚴     |
+| `highway=secondary_link`                                                        | ALL                    | 🚴     |
+| `highway=primary`                                                               | ALL                    | 🚴     |
+| `highway=primary_link`                                                          | ALL                    | 🚴     |
+| `highway=trunk_link`                                                            | CAR                    | 🚴     |
+| `highway=motorway_link`                                                         | CAR                    | 🚴     |
+| `highway=trunk`                                                                 | CAR                    | 🚴     |
+| `highway=motorway`                                                              | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                                                | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                                            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`                                       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                                               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                                          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                                              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                                         | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                                                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                                           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                                                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                                             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                                               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                                          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`                                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`                               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`                                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`                                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`                                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`                                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`                                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`                                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`                                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`                                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`                                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`                                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`                              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`                                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`                                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`                                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`                                | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`                                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`                                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`                                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                                              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                                               | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                                           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`                                      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                                              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                                         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                                             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                                        | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                                               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                                          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                                                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                                            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`                                      | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`                                  | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`                             | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`                                     | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`                                | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`                                    | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`                               | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`                                      | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`                                 | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                                        | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`                                   | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                                         | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`                                     | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`                                | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                                        | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`                                   | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`                                       | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`                                  | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                                         | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`                                    | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                                           | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                                            | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                                        | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`                                   | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                                           | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`                                      | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                                          | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`                                     | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                                            | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`                                       | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                                              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                                           | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`                                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated`                         | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                                             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated`                         | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                                             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`                           | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                                          | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                                           | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`                                       | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`                                      | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`                                  | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                                          | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`                                     | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                                         | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`                                    | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                                           | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`                                      | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                                             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                                        | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`                                     | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #13
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #14
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #16
              
+
+**Specifier:** `highway=trunk; tunnel=yes`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #17
              
+
+**Specifier:** `motorroad=yes`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #18
              
+
+**Specifier:** `present(highway); informal=yes`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `highway=service; access=private`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `highway=trail`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `present(highway); seasonal=winter`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #22
              
+
+**Specifier:** `present(highway); ice_road=yes`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #23
              
+
+**Specifier:** `present(highway); winter_road=yes`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `highway=cycleway; segregated=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.1, back: 1.1 
+
+
              Rule #27
              
+
+**Specifier:** `highway=footway; bridge=yes`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=footway; tunnel=yes`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #29
              
+
+**Specifier:** `highway=cycleway; bridge=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #30
              
+
+**Specifier:** `highway=cycleway; tunnel=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #31
              
+
+**Specifier:** `highway=footway; footway=crossing; crossing=traffic_signals`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.1, back: 1.1 
+
+
              Rule #32
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.2, back: 1.2 
+
+
              Rule #33
              
+
+**Specifier:** `highway=cycleway; cycleway=crossing; segregated=yes; crossing=traffic_signals`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.1, back: 1.1 
+
+
              Rule #34
              
+
+**Specifier:** `highway=cycleway; footway=crossing; segregated=yes; crossing=traffic_signals`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.1, back: 1.1 
+
+
              Rule #35
              
+
+**Specifier:** `highway=cycleway; cycleway=crossing; segregated=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.2, back: 1.2   
+**Walk safety factor:** forward: 1.2, back: 1.2 
+
+
              Rule #36
              
+
+**Specifier:** `highway=cycleway; footway=crossing; segregated=yes`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.2, back: 1.2   
+**Walk safety factor:** forward: 1.2, back: 1.2 
+
+
              Rule #37
              
+
+**Specifier:** `highway=cycleway; cycleway=crossing; crossing=traffic_signals`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.15, back: 1.15 
+
+
              Rule #38
              
+
+**Specifier:** `highway=cycleway; footway=crossing; crossing=traffic_signals`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.15, back: 1.15 
+
+
              Rule #39
              
+
+**Specifier:** `highway=cycleway; cycleway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.2, back: 1.2   
+**Walk safety factor:** forward: 1.25, back: 1.25 
+
+
              Rule #40
              
+
+**Specifier:** `highway=cycleway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.2, back: 1.2   
+**Walk safety factor:** forward: 1.25, back: 1.25 
+
+
              Rule #41
              
+
+**Specifier:** `highway=cycleway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #42
              
+
+**Specifier:** `highway=service; tunnel=yes; access=destination`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `highway=service; access=destination`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #44
              
+
+**Specifier:** `mtb:scale=3`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #45
              
+
+**Specifier:** `mtb:scale=4`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #46
              
+
+**Specifier:** `mtb:scale=5`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #47
              
+
+**Specifier:** `mtb:scale=6`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #48
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #49
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #50
              
+
+**Specifier:** `highway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #51
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #52
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #53
              
+
+**Specifier:** `railway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #54
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #55
              
+
+**Specifier:** `mtb:scale=1`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #56
              
+
+**Specifier:** `mtb:scale=2`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #57
              
+
+**Specifier:** `mtb:scale=0`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #58
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #59
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #60
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #61
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #62
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #63
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #64
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #65
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #66
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #67
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #68
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #69
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #70
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #71
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #72
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #73
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #74
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #75
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #76
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #77
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #78
              
+
+**Specifier:** `highway=motorway_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #79
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #80
              
+
+**Specifier:** `highway=motorway`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 8.0, back: 8.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #81
              
+
+**Specifier:** `present(highway); cycleway=lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #82
              
+
+**Specifier:** `highway=service; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #83
              
+
+**Specifier:** `highway=residential; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #84
              
+
+**Specifier:** `highway=residential_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #85
              
+
+**Specifier:** `highway=tertiary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #86
              
+
+**Specifier:** `highway=tertiary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #87
              
+
+**Specifier:** `highway=secondary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #88
              
+
+**Specifier:** `highway=secondary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #89
              
+
+**Specifier:** `highway=primary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #90
              
+
+**Specifier:** `highway=primary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #91
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #92
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #93
              
+
+**Specifier:** `highway=motorway; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #94
              
+
+**Specifier:** `highway=motorway_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #95
              
+
+**Specifier:** `present(highway); cycleway=share_busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #96
              
+
+**Specifier:** `highway=service; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #97
              
+
+**Specifier:** `highway=residential; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #98
              
+
+**Specifier:** `highway=residential_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #99
              
+
+**Specifier:** `highway=tertiary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #100
              
+
+**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #101
              
+
+**Specifier:** `highway=secondary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #102
              
+
+**Specifier:** `highway=secondary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #103
              
+
+**Specifier:** `highway=primary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #104
              
+
+**Specifier:** `highway=primary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #105
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #106
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #107
              
+
+**Specifier:** `highway=motorway; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #108
              
+
+**Specifier:** `highway=motorway_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #109
              
+
+**Specifier:** `present(highway); cycleway=opposite_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #110
              
+
+**Specifier:** `highway=service; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #111
              
+
+**Specifier:** `highway=residential; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #112
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #113
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #114
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #115
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #116
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #117
              
+
+**Specifier:** `highway=primary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #118
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #119
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #120
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #121
              
+
+**Specifier:** `present(highway); cycleway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #122
              
+
+**Specifier:** `highway=service; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #123
              
+
+**Specifier:** `highway=residential; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #124
              
+
+**Specifier:** `highway=residential_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #125
              
+
+**Specifier:** `highway=tertiary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #126
              
+
+**Specifier:** `highway=tertiary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #127
              
+
+**Specifier:** `highway=secondary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #128
              
+
+**Specifier:** `highway=secondary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #129
              
+
+**Specifier:** `highway=primary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #130
              
+
+**Specifier:** `highway=primary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #131
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #132
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #133
              
+
+**Specifier:** `present(highway); cycleway=opposite_track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #134
              
+
+**Specifier:** `highway=service; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #135
              
+
+**Specifier:** `highway=residential; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #136
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #137
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #138
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #139
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #140
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #141
              
+
+**Specifier:** `highway=primary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #142
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #143
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #144
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #145
              
+
+**Specifier:** `present(highway); cycleway=shared_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #146
              
+
+**Specifier:** `highway=service; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.73, back: 0.73   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #147
              
+
+**Specifier:** `highway=residential; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #148
              
+
+**Specifier:** `highway=residential_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #149
              
+
+**Specifier:** `highway=tertiary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #150
              
+
+**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #151
              
+
+**Specifier:** `highway=secondary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #152
              
+
+**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #153
              
+
+**Specifier:** `highway=primary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #154
              
+
+**Specifier:** `highway=primary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #155
              
+
+**Specifier:** `present(highway); cycleway=opposite`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.4   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #156
              
+
+**Specifier:** `highway=service; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #157
              
+
+**Specifier:** `highway=residential; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #158
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #159
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #160
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #161
              
+
+**Specifier:** `highway=secondary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #162
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #163
              
+
+**Specifier:** `highway=primary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #164
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #165
              
+
+**Specifier:** `highway=path; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #166
              
+
+**Specifier:** `highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #167
              
+
+**Specifier:** `highway=footway; bicycle=yes; area=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #168
              
+
+**Specifier:** `highway=pedestrian; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #169
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #170
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #171
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #172
              
+
+**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #173
              
+
+**Specifier:** `highway=track; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #174
              
+
+**Specifier:** `highway=track; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #175
              
+
+**Specifier:** `highway=track; bicycle=yes; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #176
              
+
+**Specifier:** `highway=track; bicycle=designated; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #177
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #178
              
+
+**Specifier:** `present(highway); bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #179
              
+
+**Specifier:** `highway=service; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.84, back: 0.84   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #180
              
+
+**Specifier:** `highway=residential; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #181
              
+
+**Specifier:** `highway=unclassified; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #182
              
+
+**Specifier:** `highway=residential_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #183
              
+
+**Specifier:** `highway=tertiary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #184
              
+
+**Specifier:** `highway=tertiary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #185
              
+
+**Specifier:** `highway=secondary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #186
              
+
+**Specifier:** `highway=secondary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #187
              
+
+**Specifier:** `highway=primary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #188
              
+
+**Specifier:** `highway=primary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #189
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #190
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #191
              
+
+**Specifier:** `highway=motorway; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.76, back: 7.76   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #192
              
+
+**Specifier:** `highway=motorway_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `bicycle=use_sidepath`                                     | 🚶            |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/docs/osm/Germany.md b/docs/osm/Germany.md
new file mode 100644
index 00000000000..b6d218f95e7
--- /dev/null
+++ b/docs/osm/Germany.md
@@ -0,0 +1,1337 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                               | permission             | safety |
+|---------------------------------------------------------|------------------------|--------|
+| `highway=track`                                         | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=residential; junction=roundabout`              | ALL                    | 🚴     |
+| `present(highway); junction=roundabout`                 | BICYCLE_AND_CAR        |        |
+| `highway=pedestrian`                                    | PEDESTRIAN             |        |
+| `highway=residential; maxspeed=30`                      | ALL                    | 🚴     |
+| `highway=footway; bicycle=yes`                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=unclassified; cycleway=lane`                   | ALL                    | 🚴     |
+| `mtb:scale=3`                                           | NONE                   |        |
+| `mtb:scale=4`                                           | NONE                   |        |
+| `mtb:scale=5`                                           | NONE                   |        |
+| `mtb:scale=6`                                           | NONE                   |        |
+| `highway=corridor`                                      | PEDESTRIAN             |        |
+| `highway=steps`                                         | PEDESTRIAN             |        |
+| `highway=crossing`                                      | PEDESTRIAN             |        |
+| `highway=platform`                                      | PEDESTRIAN             |        |
+| `public_transport=platform`                             | PEDESTRIAN             |        |
+| `railway=platform`                                      | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
+| `mtb:scale=1`                                           | PEDESTRIAN             |        |
+| `mtb:scale=2`                                           | PEDESTRIAN             |        |
+| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                 | ALL                    | 🚴     |
+| `highway=unclassified`                                  | ALL                    |        |
+| `highway=road`                                          | ALL                    |        |
+| `highway=byway`                                         | ALL                    | 🚴     |
+| `highway=track`                                         | ALL                    | 🚴     |
+| `highway=service`                                       | ALL                    | 🚴     |
+| `highway=residential`                                   | ALL                    | 🚴     |
+| `highway=residential_link`                              | ALL                    | 🚴     |
+| `highway=tertiary`                                      | ALL                    |        |
+| `highway=tertiary_link`                                 | ALL                    |        |
+| `highway=secondary`                                     | ALL                    | 🚴     |
+| `highway=secondary_link`                                | ALL                    | 🚴     |
+| `highway=primary`                                       | ALL                    | 🚴     |
+| `highway=primary_link`                                  | ALL                    | 🚴     |
+| `highway=trunk_link`                                    | CAR                    | 🚴     |
+| `highway=motorway_link`                                 | CAR                    | 🚴     |
+| `highway=trunk`                                         | CAR                    | 🚴     |
+| `highway=motorway`                                      | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `highway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `highway=residential; junction=roundabout`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `present(highway); junction=roundabout`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `highway=residential; maxspeed=30`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.2, back: 1.2   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `highway=unclassified; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `mtb:scale=3`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `mtb:scale=4`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `mtb:scale=5`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `mtb:scale=6`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #13
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #14
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `highway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #16
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #17
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #18
              
+
+**Specifier:** `railway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `mtb:scale=1`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `mtb:scale=2`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #22
              
+
+**Specifier:** `mtb:scale=0`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #23
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #27
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #29
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #30
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #31
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #32
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #33
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #34
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #35
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #36
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #37
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #38
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #39
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #40
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #41
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #42
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `highway=motorway_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #44
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #45
              
+
+**Specifier:** `highway=motorway`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 8.0, back: 8.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #46
              
+
+**Specifier:** `present(highway); cycleway=lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #47
              
+
+**Specifier:** `highway=service; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #48
              
+
+**Specifier:** `highway=residential; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #49
              
+
+**Specifier:** `highway=residential_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #50
              
+
+**Specifier:** `highway=tertiary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #51
              
+
+**Specifier:** `highway=tertiary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #52
              
+
+**Specifier:** `highway=secondary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #53
              
+
+**Specifier:** `highway=secondary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #54
              
+
+**Specifier:** `highway=primary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #55
              
+
+**Specifier:** `highway=primary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #56
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #57
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #58
              
+
+**Specifier:** `highway=motorway; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #59
              
+
+**Specifier:** `highway=motorway_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #60
              
+
+**Specifier:** `present(highway); cycleway=share_busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #61
              
+
+**Specifier:** `highway=service; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #62
              
+
+**Specifier:** `highway=residential; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #63
              
+
+**Specifier:** `highway=residential_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #64
              
+
+**Specifier:** `highway=tertiary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #65
              
+
+**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #66
              
+
+**Specifier:** `highway=secondary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #67
              
+
+**Specifier:** `highway=secondary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #68
              
+
+**Specifier:** `highway=primary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #69
              
+
+**Specifier:** `highway=primary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #70
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #71
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #72
              
+
+**Specifier:** `highway=motorway; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #73
              
+
+**Specifier:** `highway=motorway_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #74
              
+
+**Specifier:** `present(highway); cycleway=opposite_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #75
              
+
+**Specifier:** `highway=service; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #76
              
+
+**Specifier:** `highway=residential; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #77
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #78
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #79
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #80
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #81
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #82
              
+
+**Specifier:** `highway=primary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #83
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #84
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #85
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #86
              
+
+**Specifier:** `present(highway); cycleway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #87
              
+
+**Specifier:** `highway=service; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #88
              
+
+**Specifier:** `highway=residential; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #89
              
+
+**Specifier:** `highway=residential_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #90
              
+
+**Specifier:** `highway=tertiary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #91
              
+
+**Specifier:** `highway=tertiary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #92
              
+
+**Specifier:** `highway=secondary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #93
              
+
+**Specifier:** `highway=secondary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #94
              
+
+**Specifier:** `highway=primary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #95
              
+
+**Specifier:** `highway=primary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #96
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #97
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #98
              
+
+**Specifier:** `present(highway); cycleway=opposite_track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #99
              
+
+**Specifier:** `highway=service; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #100
              
+
+**Specifier:** `highway=residential; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #101
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #102
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #103
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #104
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #105
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #106
              
+
+**Specifier:** `highway=primary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #107
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #108
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #109
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #110
              
+
+**Specifier:** `present(highway); cycleway=shared_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #111
              
+
+**Specifier:** `highway=service; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.73, back: 0.73   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #112
              
+
+**Specifier:** `highway=residential; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #113
              
+
+**Specifier:** `highway=residential_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #114
              
+
+**Specifier:** `highway=tertiary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #115
              
+
+**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #116
              
+
+**Specifier:** `highway=secondary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #117
              
+
+**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #118
              
+
+**Specifier:** `highway=primary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #119
              
+
+**Specifier:** `highway=primary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #120
              
+
+**Specifier:** `present(highway); cycleway=opposite`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.4   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #121
              
+
+**Specifier:** `highway=service; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #122
              
+
+**Specifier:** `highway=residential; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #123
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #124
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #125
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #126
              
+
+**Specifier:** `highway=secondary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #127
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #128
              
+
+**Specifier:** `highway=primary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #129
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #130
              
+
+**Specifier:** `highway=path; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #131
              
+
+**Specifier:** `highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #132
              
+
+**Specifier:** `highway=footway; bicycle=yes; area=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #133
              
+
+**Specifier:** `highway=pedestrian; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #134
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #135
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #136
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #137
              
+
+**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #138
              
+
+**Specifier:** `highway=track; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #139
              
+
+**Specifier:** `highway=track; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #140
              
+
+**Specifier:** `highway=track; bicycle=yes; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #141
              
+
+**Specifier:** `highway=track; bicycle=designated; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #142
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #143
              
+
+**Specifier:** `present(highway); bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #144
              
+
+**Specifier:** `highway=service; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.84, back: 0.84   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #145
              
+
+**Specifier:** `highway=residential; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #146
              
+
+**Specifier:** `highway=unclassified; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #147
              
+
+**Specifier:** `highway=residential_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #148
              
+
+**Specifier:** `highway=tertiary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #149
              
+
+**Specifier:** `highway=tertiary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #150
              
+
+**Specifier:** `highway=secondary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #151
              
+
+**Specifier:** `highway=secondary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #152
              
+
+**Specifier:** `highway=primary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #153
              
+
+**Specifier:** `highway=primary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #154
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #155
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #156
              
+
+**Specifier:** `highway=motorway; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.76, back: 7.76   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #157
              
+
+**Specifier:** `highway=motorway_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `highway=tertiary`                                         | 🚴            |
+| `maxspeed=70`                                              | 🚴            |
+| `maxspeed=80`                                              | 🚴            |
+| `maxspeed=90`                                              | 🚴            |
+| `maxspeed=100`                                             | 🚴            |
+| `tracktype=grade1`                                         |               |
+| `tracktype=grade2`                                         | 🚴            |
+| `tracktype=grade3`                                         | 🚴            |
+| `tracktype=grade4`                                         | 🚴            |
+| `tracktype=grade5`                                         | 🚴            |
+| `lit=no`                                                   | 🚴            |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/docs/osm/Hamburg.md b/docs/osm/Hamburg.md
new file mode 100644
index 00000000000..2cdd3068ca6
--- /dev/null
+++ b/docs/osm/Hamburg.md
@@ -0,0 +1,217 @@
+## OSM tag mapping
+
+
+
+
+| matcher                                                 | permission             | safety |
+|---------------------------------------------------------|------------------------|--------|
+| `highway=track`                                         | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=residential; junction=roundabout`              | ALL                    | 🚴     |
+| `present(highway); junction=roundabout`                 | BICYCLE_AND_CAR        |        |
+| `highway=pedestrian`                                    | PEDESTRIAN             |        |
+| `highway=residential; maxspeed=30`                      | ALL                    | 🚴     |
+| `highway=footway; bicycle=yes`                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=unclassified; cycleway=lane`                   | ALL                    | 🚴     |
+| `mtb:scale=3`                                           | NONE                   |        |
+| `mtb:scale=4`                                           | NONE                   |        |
+| `mtb:scale=5`                                           | NONE                   |        |
+| `mtb:scale=6`                                           | NONE                   |        |
+| `highway=corridor`                                      | PEDESTRIAN             |        |
+| `highway=steps`                                         | PEDESTRIAN             |        |
+| `highway=crossing`                                      | PEDESTRIAN             |        |
+| `highway=platform`                                      | PEDESTRIAN             |        |
+| `public_transport=platform`                             | PEDESTRIAN             |        |
+| `railway=platform`                                      | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
+| `mtb:scale=1`                                           | PEDESTRIAN             |        |
+| `mtb:scale=2`                                           | PEDESTRIAN             |        |
+| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                 | ALL                    | 🚴     |
+| `highway=unclassified`                                  | ALL                    |        |
+| `highway=road`                                          | ALL                    |        |
+| `highway=byway`                                         | ALL                    | 🚴     |
+| `highway=track`                                         | ALL                    | 🚴     |
+| `highway=service`                                       | ALL                    | 🚴     |
+| `highway=residential`                                   | ALL                    | 🚴     |
+| `highway=residential_link`                              | ALL                    | 🚴     |
+| `highway=tertiary`                                      | ALL                    |        |
+| `highway=tertiary_link`                                 | ALL                    |        |
+| `highway=secondary`                                     | ALL                    | 🚴     |
+| `highway=secondary_link`                                | ALL                    | 🚴     |
+| `highway=primary`                                       | ALL                    | 🚴     |
+| `highway=primary_link`                                  | ALL                    | 🚴     |
+| `highway=trunk_link`                                    | CAR                    | 🚴     |
+| `highway=motorway_link`                                 | CAR                    | 🚴     |
+| `highway=trunk`                                         | CAR                    | 🚴     |
+| `highway=motorway`                                      | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+### Bicycle and walking safety mixins
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `highway=tertiary`                                         | 🚴            |
+| `maxspeed=70`                                              | 🚴            |
+| `maxspeed=80`                                              | 🚴            |
+| `maxspeed=90`                                              | 🚴            |
+| `maxspeed=100`                                             | 🚴            |
+| `tracktype=grade1`                                         |               |
+| `tracktype=grade2`                                         | 🚴            |
+| `tracktype=grade3`                                         | 🚴            |
+| `tracktype=grade4`                                         | 🚴            |
+| `tracktype=grade5`                                         | 🚴            |
+| `lit=no`                                                   | 🚴            |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/docs/osm/Houston.md b/docs/osm/Houston.md
new file mode 100644
index 00000000000..8071d9a0a8a
--- /dev/null
+++ b/docs/osm/Houston.md
@@ -0,0 +1,1262 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                               | permission             | safety |
+|---------------------------------------------------------|------------------------|--------|
+| `highway=footway; layer=-1; tunnel=yes; indoor=yes`     | NONE                   |        |
+| `mtb:scale=3`                                           | NONE                   |        |
+| `mtb:scale=4`                                           | NONE                   |        |
+| `mtb:scale=5`                                           | NONE                   |        |
+| `mtb:scale=6`                                           | NONE                   |        |
+| `highway=corridor`                                      | PEDESTRIAN             |        |
+| `highway=steps`                                         | PEDESTRIAN             |        |
+| `highway=crossing`                                      | PEDESTRIAN             |        |
+| `highway=platform`                                      | PEDESTRIAN             |        |
+| `public_transport=platform`                             | PEDESTRIAN             |        |
+| `railway=platform`                                      | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
+| `mtb:scale=1`                                           | PEDESTRIAN             |        |
+| `mtb:scale=2`                                           | PEDESTRIAN             |        |
+| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                 | ALL                    | 🚴     |
+| `highway=unclassified`                                  | ALL                    |        |
+| `highway=road`                                          | ALL                    |        |
+| `highway=byway`                                         | ALL                    | 🚴     |
+| `highway=track`                                         | ALL                    | 🚴     |
+| `highway=service`                                       | ALL                    | 🚴     |
+| `highway=residential`                                   | ALL                    | 🚴     |
+| `highway=residential_link`                              | ALL                    | 🚴     |
+| `highway=tertiary`                                      | ALL                    |        |
+| `highway=tertiary_link`                                 | ALL                    |        |
+| `highway=secondary`                                     | ALL                    | 🚴     |
+| `highway=secondary_link`                                | ALL                    | 🚴     |
+| `highway=primary`                                       | ALL                    | 🚴     |
+| `highway=primary_link`                                  | ALL                    | 🚴     |
+| `highway=trunk_link`                                    | CAR                    | 🚴     |
+| `highway=motorway_link`                                 | CAR                    | 🚴     |
+| `highway=trunk`                                         | CAR                    | 🚴     |
+| `highway=motorway`                                      | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `highway=footway; layer=-1; tunnel=yes; indoor=yes`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `mtb:scale=3`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `mtb:scale=4`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `mtb:scale=5`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `mtb:scale=6`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `highway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `railway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `mtb:scale=1`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #13
              
+
+**Specifier:** `mtb:scale=2`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #14
              
+
+**Specifier:** `mtb:scale=0`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #16
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #17
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #18
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #22
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #23
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #27
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #29
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #30
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #31
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #32
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #33
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #34
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #35
              
+
+**Specifier:** `highway=motorway_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #36
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #37
              
+
+**Specifier:** `highway=motorway`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 8.0, back: 8.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #38
              
+
+**Specifier:** `present(highway); cycleway=lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #39
              
+
+**Specifier:** `highway=service; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #40
              
+
+**Specifier:** `highway=residential; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #41
              
+
+**Specifier:** `highway=residential_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #42
              
+
+**Specifier:** `highway=tertiary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `highway=tertiary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #44
              
+
+**Specifier:** `highway=secondary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #45
              
+
+**Specifier:** `highway=secondary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #46
              
+
+**Specifier:** `highway=primary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #47
              
+
+**Specifier:** `highway=primary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #48
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #49
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #50
              
+
+**Specifier:** `highway=motorway; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #51
              
+
+**Specifier:** `highway=motorway_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #52
              
+
+**Specifier:** `present(highway); cycleway=share_busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #53
              
+
+**Specifier:** `highway=service; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #54
              
+
+**Specifier:** `highway=residential; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #55
              
+
+**Specifier:** `highway=residential_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #56
              
+
+**Specifier:** `highway=tertiary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #57
              
+
+**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #58
              
+
+**Specifier:** `highway=secondary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #59
              
+
+**Specifier:** `highway=secondary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #60
              
+
+**Specifier:** `highway=primary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #61
              
+
+**Specifier:** `highway=primary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #62
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #63
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #64
              
+
+**Specifier:** `highway=motorway; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #65
              
+
+**Specifier:** `highway=motorway_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #66
              
+
+**Specifier:** `present(highway); cycleway=opposite_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #67
              
+
+**Specifier:** `highway=service; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #68
              
+
+**Specifier:** `highway=residential; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #69
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #70
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #71
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #72
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #73
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #74
              
+
+**Specifier:** `highway=primary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #75
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #76
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #77
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #78
              
+
+**Specifier:** `present(highway); cycleway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #79
              
+
+**Specifier:** `highway=service; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #80
              
+
+**Specifier:** `highway=residential; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #81
              
+
+**Specifier:** `highway=residential_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #82
              
+
+**Specifier:** `highway=tertiary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #83
              
+
+**Specifier:** `highway=tertiary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #84
              
+
+**Specifier:** `highway=secondary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #85
              
+
+**Specifier:** `highway=secondary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #86
              
+
+**Specifier:** `highway=primary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #87
              
+
+**Specifier:** `highway=primary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #88
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #89
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #90
              
+
+**Specifier:** `present(highway); cycleway=opposite_track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #91
              
+
+**Specifier:** `highway=service; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #92
              
+
+**Specifier:** `highway=residential; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #93
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #94
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #95
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #96
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #97
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #98
              
+
+**Specifier:** `highway=primary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #99
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #100
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #101
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #102
              
+
+**Specifier:** `present(highway); cycleway=shared_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #103
              
+
+**Specifier:** `highway=service; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.73, back: 0.73   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #104
              
+
+**Specifier:** `highway=residential; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #105
              
+
+**Specifier:** `highway=residential_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #106
              
+
+**Specifier:** `highway=tertiary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #107
              
+
+**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #108
              
+
+**Specifier:** `highway=secondary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #109
              
+
+**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #110
              
+
+**Specifier:** `highway=primary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #111
              
+
+**Specifier:** `highway=primary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #112
              
+
+**Specifier:** `present(highway); cycleway=opposite`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.4   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #113
              
+
+**Specifier:** `highway=service; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #114
              
+
+**Specifier:** `highway=residential; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #115
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #116
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #117
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #118
              
+
+**Specifier:** `highway=secondary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #119
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #120
              
+
+**Specifier:** `highway=primary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #121
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #122
              
+
+**Specifier:** `highway=path; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #123
              
+
+**Specifier:** `highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #124
              
+
+**Specifier:** `highway=footway; bicycle=yes; area=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #125
              
+
+**Specifier:** `highway=pedestrian; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #126
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #127
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #128
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #129
              
+
+**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #130
              
+
+**Specifier:** `highway=track; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #131
              
+
+**Specifier:** `highway=track; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #132
              
+
+**Specifier:** `highway=track; bicycle=yes; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #133
              
+
+**Specifier:** `highway=track; bicycle=designated; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #134
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #135
              
+
+**Specifier:** `present(highway); bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #136
              
+
+**Specifier:** `highway=service; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.84, back: 0.84   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #137
              
+
+**Specifier:** `highway=residential; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #138
              
+
+**Specifier:** `highway=unclassified; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #139
              
+
+**Specifier:** `highway=residential_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #140
              
+
+**Specifier:** `highway=tertiary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #141
              
+
+**Specifier:** `highway=tertiary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #142
              
+
+**Specifier:** `highway=secondary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #143
              
+
+**Specifier:** `highway=secondary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #144
              
+
+**Specifier:** `highway=primary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #145
              
+
+**Specifier:** `highway=primary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #146
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #147
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #148
              
+
+**Specifier:** `highway=motorway; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.76, back: 7.76   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #149
              
+
+**Specifier:** `highway=motorway_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/docs/osm/Norway.md b/docs/osm/Norway.md
new file mode 100644
index 00000000000..00ba1b4bf51
--- /dev/null
+++ b/docs/osm/Norway.md
@@ -0,0 +1,428 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                                                                                                                                  | permission             | safety |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------|--------|
+| `highway one of [motorway, motorway_link]`                                                                                                                 | CAR                    |        |
+| `highway one of [trunk, trunk_link, primary, primary_link]; motorroad=yes`                                                                                 | CAR                    |        |
+| `highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                 | ALL                    |        |
+| `cycleway=track; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]` | ALL                    |        |
+| `cycleway=lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`                             | ALL                    | 🚴     |
+| `cycleway=lane; maxspeed < 50; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`              | ALL                    | 🚴     |
+| `cycleway=lane; highway one of [unclassified, residential]`                                                                                                | ALL                    | 🚴     |
+| `highway=service`                                                                                                                                          | ALL                    |        |
+| `highway=service; service=parking_aisle`                                                                                                                   | ALL                    | 🚴     |
+| `highway=service; service=drive-through`                                                                                                                   | ALL                    | 🚴     |
+| `highway=living_street`                                                                                                                                    | ALL                    | 🚴     |
+| `highway=pedestrian`                                                                                                                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=busway`                                                                                                                                           | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=service; bus one of [yes, designated]`                                                                                                            | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=footway`                                                                                                                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=cycleway`                                                                                                                                         | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; lanes > 1`                                                                                                                              | PEDESTRIAN_AND_BICYCLE | 🚶     |
+| `highway=cycleway; oneway=yes`                                                                                                                             | PEDESTRIAN_AND_BICYCLE | 🚶     |
+| `highway=cycleway; sidewalk one of [yes, left, right, both]`                                                                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=cycleway; lanes > 1; sidewalk one of [yes, left, right, both]`                                                                                    | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway; oneway=yes; sidewalk one of [yes, left, right, both]`                                                                                   | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway; foot=designated; segregated=no`                                                                                                         | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=path; foot=designated; bicycle=designated; segregated=no`                                                                                         | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; foot=designated; segregated=yes`                                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path; foot=designated; bicycle=designated; segregated=yes`                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=cycleway; foot=designated; segregated=yes; lanes > 1`                                                                                             | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway; foot=designated; present(segregated); motor_vehicle=destination`                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path; foot=designated; bicycle=designated; present(segregated); motor_vehicle=destination`                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=sidewalk`                                                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=footway; footway=crossing`                                                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=cycleway; cycleway=crossing`                                                                                                                      | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
+| `highway=track`                                                                                                                                            | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=bridleway`                                                                                                                                        | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=path`                                                                                                                                             | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=steps`                                                                                                                                            | PEDESTRIAN             |        |
+| `highway=corridor`                                                                                                                                         | PEDESTRIAN             |        |
+| `highway=footway; indoor=yes`                                                                                                                              | PEDESTRIAN             |        |
+| `highway=platform`                                                                                                                                         | PEDESTRIAN             |        |
+| `public_transport=platform`                                                                                                                                | PEDESTRIAN             |        |
+| `trail_visibility one of [bad, low, poor, horrible, no]; highway=path`                                                                                     | NONE                   |        |
+| `sac_scale one of [demanding_mountain_hiking, alpine_hiking, demanding_alpine_hiking, difficult_alpine_hiking]; highway one of [path, steps]`              | NONE                   |        |
+| `smoothness one of [horrible, very_horrible]; highway one of [path, bridleway, track]`                                                                     | PEDESTRIAN             | 🚶     |
+| `smoothness=impassable; highway one of [path, bridleway, track]`                                                                                           | NONE                   |        |
+| `1 > mtb:scale < 2; highway one of [path, bridleway, track]`                                                                                               | PEDESTRIAN             | 🚶     |
+| `mtb:scale > 2; highway one of [path, bridleway, track]`                                                                                                   | NONE                   |        |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `highway one of [motorway, motorway_link]`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `highway one of [trunk, trunk_link, primary, primary_link]; motorroad=yes`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `cycleway=track; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `cycleway=lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.27, back: 1.27   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `cycleway=lane; maxspeed < 50; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `cycleway=lane; highway one of [unclassified, residential]`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `highway=service; service=parking_aisle`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `highway=service; service=drive-through`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.83, back: 1.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.2, back: 1.2   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `highway=busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.37, back: 2.37   
+**Walk safety factor:** forward: 1.9, back: 1.9 
+
+
              Rule #13
              
+
+**Specifier:** `highway=service; bus one of [yes, designated]`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.37, back: 2.37   
+**Walk safety factor:** forward: 1.9, back: 1.9 
+
+
              Rule #14
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.42, back: 1.42   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.05, back: 1.05   
+**Walk safety factor:** forward: 1.4, back: 1.4 
+
+
              Rule #16
              
+
+**Specifier:** `highway=cycleway; lanes > 1`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.4, back: 1.4 
+
+
              Rule #17
              
+
+**Specifier:** `highway=cycleway; oneway=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.4, back: 1.4 
+
+
              Rule #18
              
+
+**Specifier:** `highway=cycleway; sidewalk one of [yes, left, right, both]`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.05, back: 1.05   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `highway=cycleway; lanes > 1; sidewalk one of [yes, left, right, both]`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `highway=cycleway; oneway=yes; sidewalk one of [yes, left, right, both]`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `highway=cycleway; foot=designated; segregated=no`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.05, back: 1.05   
+**Walk safety factor:** forward: 1.15, back: 1.15 
+
+
              Rule #22
              
+
+**Specifier:** `highway=path; foot=designated; bicycle=designated; segregated=no`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.05, back: 1.05   
+**Walk safety factor:** forward: 1.15, back: 1.15 
+
+
              Rule #23
              
+
+**Specifier:** `highway=cycleway; foot=designated; segregated=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.05, back: 1.05   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `highway=path; foot=designated; bicycle=designated; segregated=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.05, back: 1.05   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `highway=cycleway; foot=designated; segregated=yes; lanes > 1`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `highway=cycleway; foot=designated; present(segregated); motor_vehicle=destination`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.57, back: 1.57   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #27
              
+
+**Specifier:** `highway=path; foot=designated; bicycle=designated; present(segregated); motor_vehicle=destination`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.57, back: 1.57   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=footway; footway=sidewalk`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.93, back: 1.93   
+**Walk safety factor:** forward: 1.1, back: 1.1 
+
+
              Rule #29
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.33, back: 2.33   
+**Walk safety factor:** forward: 1.35, back: 1.35 
+
+
              Rule #30
              
+
+**Specifier:** `highway=cycleway; cycleway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.33, back: 2.33   
+**Walk safety factor:** forward: 1.35, back: 1.35 
+
+
              Rule #31
              
+
+**Specifier:** `highway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #32
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #33
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #34
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #35
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #36
              
+
+**Specifier:** `highway=footway; indoor=yes`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #37
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #38
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #39
              
+
+**Specifier:** `trail_visibility one of [bad, low, poor, horrible, no]; highway=path`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #40
              
+
+**Specifier:** `sac_scale one of [demanding_mountain_hiking, alpine_hiking, demanding_alpine_hiking, difficult_alpine_hiking]; highway one of [path, steps]`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #41
              
+
+**Specifier:** `smoothness one of [horrible, very_horrible]; highway one of [path, bridleway, track]`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.15, back: 1.15 
+
+
              Rule #42
              
+
+**Specifier:** `smoothness=impassable; highway one of [path, bridleway, track]`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `1 > mtb:scale < 2; highway one of [path, bridleway, track]`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.15, back: 1.15 
+
+
              Rule #44
              
+
+**Specifier:** `mtb:scale > 2; highway one of [path, bridleway, track]`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                                                                                                                                                                                                                                                                                                                                     | modifications |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
+| `cycleway=shared_lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                                                                                                                                                                                                            | 🚴            |
+| `lcn=yes¦rcn=yes¦ncn=yes`                                                                                                                                                                                                                                                                                                                                                   | 🚴            |
+| `oneway=yes; cycleway not one of [no, none] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                                                                                                                                                                            | 🚴            |
+| `embedded_rails one of [tram, light_rail, disused]`                                                                                                                                                                                                                                                                                                                         | 🚴            |
+| `tunnel=yes; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]`                                                                                                                                                                                                                                   | 🚶            |
+| `bridge=yes; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]¦verge=no; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]` | 🚶            |
+| `junction=roundabout; sidewalk not one of [no, separate] or absent`                                                                                                                                                                                                                                                                                                         | 🚶            |
+| `surface=grass_paver`                                                                                                                                                                                                                                                                                                                                                       | 🚴            |
+| `surface=sett`                                                                                                                                                                                                                                                                                                                                                              | 🚴            |
+| `surface=cobblestone`                                                                                                                                                                                                                                                                                                                                                       | 🚴            |
+| `surface=unhewn_cobblestone`                                                                                                                                                                                                                                                                                                                                                | 🚴            |
+| `surface=metal_grid`                                                                                                                                                                                                                                                                                                                                                        | 🚴            |
+| `surface=metal`                                                                                                                                                                                                                                                                                                                                                             | 🚴            |
+| `smoothness=intermediate; surface one of [asfalt, concrete, paving_stones, paved, wood]`                                                                                                                                                                                                                                                                                    | 🚴            |
+| `smoothness=bad; surface one of [asfalt, concrete, paving_stones, paved, wood]`                                                                                                                                                                                                                                                                                             | 🚴 🚶         |
+| `surface=unpaved; !tracktype`                                                                                                                                                                                                                                                                                                                                               | 🚴 🚶         |
+| `surface=compacted`                                                                                                                                                                                                                                                                                                                                                         | 🚴 🚶         |
+| `surface=fine_gravel`                                                                                                                                                                                                                                                                                                                                                       | 🚴 🚶         |
+| `surface=pebblestone`                                                                                                                                                                                                                                                                                                                                                       | 🚴 🚶         |
+| `surface=gravel`                                                                                                                                                                                                                                                                                                                                                            | 🚴 🚶         |
+| `surface=woodchip`                                                                                                                                                                                                                                                                                                                                                          | 🚴 🚶         |
+| `surface=ground`                                                                                                                                                                                                                                                                                                                                                            | 🚴 🚶         |
+| `surface=dirt`                                                                                                                                                                                                                                                                                                                                                              | 🚴 🚶         |
+| `surface=earth`                                                                                                                                                                                                                                                                                                                                                             | 🚴 🚶         |
+| `surface=grass`                                                                                                                                                                                                                                                                                                                                                             | 🚴 🚶         |
+| `surface=mud`                                                                                                                                                                                                                                                                                                                                                               | 🚴 🚶         |
+| `surface=sand`                                                                                                                                                                                                                                                                                                                                                              | 🚴 🚶         |
+| `!tracktype; surface not one of [unpaved] or absent; highway one of [track, bridleway]`                                                                                                                                                                                                                                                                                     | 🚴 🚶         |
+| `tracktype=grade2; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
+| `tracktype=grade3; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
+| `tracktype=grade4; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
+| `tracktype=grade5; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
+| `surface not one of [no, none] or absent; highway=path`                                                                                                                                                                                                                                                                                                                     | 🚴 🚶         |
+| `sac_scale=mountain_hiking`                                                                                                                                                                                                                                                                                                                                                 | 🚶            |
+| `trail_visibility=intermediate`                                                                                                                                                                                                                                                                                                                                             | 🚶            |
+
+
diff --git a/docs/osm/Portland.md b/docs/osm/Portland.md
new file mode 100644
index 00000000000..7f7baed3d8b
--- /dev/null
+++ b/docs/osm/Portland.md
@@ -0,0 +1,1275 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                               | permission             | safety |
+|---------------------------------------------------------|------------------------|--------|
+| `mtb:scale=3`                                           | NONE                   |        |
+| `mtb:scale=4`                                           | NONE                   |        |
+| `mtb:scale=5`                                           | NONE                   |        |
+| `mtb:scale=6`                                           | NONE                   |        |
+| `highway=corridor`                                      | PEDESTRIAN             |        |
+| `highway=steps`                                         | PEDESTRIAN             |        |
+| `highway=crossing`                                      | PEDESTRIAN             |        |
+| `highway=platform`                                      | PEDESTRIAN             |        |
+| `public_transport=platform`                             | PEDESTRIAN             |        |
+| `railway=platform`                                      | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
+| `mtb:scale=1`                                           | PEDESTRIAN             |        |
+| `mtb:scale=2`                                           | PEDESTRIAN             |        |
+| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                 | ALL                    | 🚴     |
+| `highway=unclassified`                                  | ALL                    |        |
+| `highway=road`                                          | ALL                    |        |
+| `highway=byway`                                         | ALL                    | 🚴     |
+| `highway=track`                                         | ALL                    | 🚴     |
+| `highway=service`                                       | ALL                    | 🚴     |
+| `highway=residential`                                   | ALL                    | 🚴     |
+| `highway=residential_link`                              | ALL                    | 🚴     |
+| `highway=tertiary`                                      | ALL                    |        |
+| `highway=tertiary_link`                                 | ALL                    |        |
+| `highway=secondary`                                     | ALL                    | 🚴     |
+| `highway=secondary_link`                                | ALL                    | 🚴     |
+| `highway=primary`                                       | ALL                    | 🚴     |
+| `highway=primary_link`                                  | ALL                    | 🚴     |
+| `highway=trunk_link`                                    | CAR                    | 🚴     |
+| `highway=motorway_link`                                 | CAR                    | 🚴     |
+| `highway=trunk`                                         | CAR                    | 🚴     |
+| `highway=motorway`                                      | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `mtb:scale=3`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `mtb:scale=4`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `mtb:scale=5`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `mtb:scale=6`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `highway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `railway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `mtb:scale=1`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `mtb:scale=2`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #13
              
+
+**Specifier:** `mtb:scale=0`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #14
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #16
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #17
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #18
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #22
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #23
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #27
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #29
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #30
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #31
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #32
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #33
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #34
              
+
+**Specifier:** `highway=motorway_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #35
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #36
              
+
+**Specifier:** `highway=motorway`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 8.0, back: 8.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #37
              
+
+**Specifier:** `present(highway); cycleway=lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #38
              
+
+**Specifier:** `highway=service; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #39
              
+
+**Specifier:** `highway=residential; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #40
              
+
+**Specifier:** `highway=residential_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #41
              
+
+**Specifier:** `highway=tertiary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #42
              
+
+**Specifier:** `highway=tertiary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `highway=secondary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #44
              
+
+**Specifier:** `highway=secondary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #45
              
+
+**Specifier:** `highway=primary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #46
              
+
+**Specifier:** `highway=primary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #47
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #48
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #49
              
+
+**Specifier:** `highway=motorway; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #50
              
+
+**Specifier:** `highway=motorway_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #51
              
+
+**Specifier:** `present(highway); cycleway=share_busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #52
              
+
+**Specifier:** `highway=service; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #53
              
+
+**Specifier:** `highway=residential; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #54
              
+
+**Specifier:** `highway=residential_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #55
              
+
+**Specifier:** `highway=tertiary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #56
              
+
+**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #57
              
+
+**Specifier:** `highway=secondary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #58
              
+
+**Specifier:** `highway=secondary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #59
              
+
+**Specifier:** `highway=primary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #60
              
+
+**Specifier:** `highway=primary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #61
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #62
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #63
              
+
+**Specifier:** `highway=motorway; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #64
              
+
+**Specifier:** `highway=motorway_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #65
              
+
+**Specifier:** `present(highway); cycleway=opposite_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #66
              
+
+**Specifier:** `highway=service; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #67
              
+
+**Specifier:** `highway=residential; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #68
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #69
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #70
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #71
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #72
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #73
              
+
+**Specifier:** `highway=primary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #74
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #75
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #76
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #77
              
+
+**Specifier:** `present(highway); cycleway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #78
              
+
+**Specifier:** `highway=service; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #79
              
+
+**Specifier:** `highway=residential; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #80
              
+
+**Specifier:** `highway=residential_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #81
              
+
+**Specifier:** `highway=tertiary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #82
              
+
+**Specifier:** `highway=tertiary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #83
              
+
+**Specifier:** `highway=secondary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #84
              
+
+**Specifier:** `highway=secondary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #85
              
+
+**Specifier:** `highway=primary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #86
              
+
+**Specifier:** `highway=primary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #87
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #88
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #89
              
+
+**Specifier:** `present(highway); cycleway=opposite_track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #90
              
+
+**Specifier:** `highway=service; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #91
              
+
+**Specifier:** `highway=residential; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #92
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #93
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #94
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #95
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #96
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #97
              
+
+**Specifier:** `highway=primary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #98
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #99
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #100
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #101
              
+
+**Specifier:** `present(highway); cycleway=shared_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #102
              
+
+**Specifier:** `highway=service; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.73, back: 0.73   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #103
              
+
+**Specifier:** `highway=residential; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #104
              
+
+**Specifier:** `highway=residential_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #105
              
+
+**Specifier:** `highway=tertiary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #106
              
+
+**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #107
              
+
+**Specifier:** `highway=secondary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #108
              
+
+**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #109
              
+
+**Specifier:** `highway=primary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #110
              
+
+**Specifier:** `highway=primary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #111
              
+
+**Specifier:** `present(highway); cycleway=opposite`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.4   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #112
              
+
+**Specifier:** `highway=service; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #113
              
+
+**Specifier:** `highway=residential; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #114
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #115
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #116
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #117
              
+
+**Specifier:** `highway=secondary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #118
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #119
              
+
+**Specifier:** `highway=primary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #120
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #121
              
+
+**Specifier:** `highway=path; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #122
              
+
+**Specifier:** `highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #123
              
+
+**Specifier:** `highway=footway; bicycle=yes; area=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #124
              
+
+**Specifier:** `highway=pedestrian; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #125
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #126
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #127
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #128
              
+
+**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #129
              
+
+**Specifier:** `highway=track; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #130
              
+
+**Specifier:** `highway=track; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #131
              
+
+**Specifier:** `highway=track; bicycle=yes; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #132
              
+
+**Specifier:** `highway=track; bicycle=designated; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #133
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #134
              
+
+**Specifier:** `present(highway); bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #135
              
+
+**Specifier:** `highway=service; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.84, back: 0.84   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #136
              
+
+**Specifier:** `highway=residential; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #137
              
+
+**Specifier:** `highway=unclassified; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #138
              
+
+**Specifier:** `highway=residential_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #139
              
+
+**Specifier:** `highway=tertiary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #140
              
+
+**Specifier:** `highway=tertiary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #141
              
+
+**Specifier:** `highway=secondary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #142
              
+
+**Specifier:** `highway=secondary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #143
              
+
+**Specifier:** `highway=primary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #144
              
+
+**Specifier:** `highway=primary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #145
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #146
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #147
              
+
+**Specifier:** `highway=motorway; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.76, back: 7.76   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #148
              
+
+**Specifier:** `highway=motorway_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `footway=sidewalk`                                         | 🚶            |
+| `!name`                                                    | 🚶            |
+| `highway=trunk`                                            | 🚶            |
+| `highway=trunk_link`                                       | 🚶            |
+| `highway=primary`                                          | 🚶            |
+| `highway=primary_link`                                     | 🚶            |
+| `highway=secondary`                                        | 🚶            |
+| `highway=secondary_link`                                   | 🚶            |
+| `highway=tertiary`                                         | 🚶            |
+| `highway=tertiary_link`                                    | 🚶            |
+| `lanes > 4`                                                | 🚶            |
+| `sidewalk=both`                                            | 🚶            |
+| `sidewalk=left`                                            | 🚶            |
+| `sidewalk=right`                                           | 🚶            |
+| `surface=unpaved`                                          | 🚶            |
+| `sidewalk=no; maxspeed=55 mph`                             | 🚶            |
+| `sidewalk=no; maxspeed=50 mph`                             | 🚶            |
+| `sidewalk=no; maxspeed=45 mph`                             | 🚶            |
+| `sidewalk=no; maxspeed=40 mph`                             | 🚶            |
+| `sidewalk=no; maxspeed=35 mph`                             | 🚶            |
+| `sidewalk=no; maxspeed=30 mph`                             | 🚶            |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/docs/osm/UK.md b/docs/osm/UK.md
new file mode 100644
index 00000000000..9a1f7388228
--- /dev/null
+++ b/docs/osm/UK.md
@@ -0,0 +1,1366 @@
+## OSM tag mapping
+
+### Way properties
+
+Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+
+
+
+
+| specifier                                               | permission             | safety |
+|---------------------------------------------------------|------------------------|--------|
+| `highway=trunk_link`                                    | ALL                    | 🚴     |
+| `highway=trunk`                                         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | ALL                    | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | ALL                    | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | ALL                    | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | ALL                    | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | ALL                    | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | ALL                    | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | ALL                    | 🚴     |
+| `mtb:scale=3`                                           | NONE                   |        |
+| `mtb:scale=4`                                           | NONE                   |        |
+| `mtb:scale=5`                                           | NONE                   |        |
+| `mtb:scale=6`                                           | NONE                   |        |
+| `highway=corridor`                                      | PEDESTRIAN             |        |
+| `highway=steps`                                         | PEDESTRIAN             |        |
+| `highway=crossing`                                      | PEDESTRIAN             |        |
+| `highway=platform`                                      | PEDESTRIAN             |        |
+| `public_transport=platform`                             | PEDESTRIAN             |        |
+| `railway=platform`                                      | PEDESTRIAN             |        |
+| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
+| `mtb:scale=1`                                           | PEDESTRIAN             |        |
+| `mtb:scale=2`                                           | PEDESTRIAN             |        |
+| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
+| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=living_street`                                 | ALL                    | 🚴     |
+| `highway=unclassified`                                  | ALL                    |        |
+| `highway=road`                                          | ALL                    |        |
+| `highway=byway`                                         | ALL                    | 🚴     |
+| `highway=track`                                         | ALL                    | 🚴     |
+| `highway=service`                                       | ALL                    | 🚴     |
+| `highway=residential`                                   | ALL                    | 🚴     |
+| `highway=residential_link`                              | ALL                    | 🚴     |
+| `highway=tertiary`                                      | ALL                    |        |
+| `highway=tertiary_link`                                 | ALL                    |        |
+| `highway=secondary`                                     | ALL                    | 🚴     |
+| `highway=secondary_link`                                | ALL                    | 🚴     |
+| `highway=primary`                                       | ALL                    | 🚴     |
+| `highway=primary_link`                                  | ALL                    | 🚴     |
+| `highway=trunk_link`                                    | CAR                    | 🚴     |
+| `highway=motorway_link`                                 | CAR                    | 🚴     |
+| `highway=trunk`                                         | CAR                    | 🚴     |
+| `highway=motorway`                                      | CAR                    | 🚴     |
+| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
+| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
+| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
+| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
+| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
+| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
+| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
+| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
+| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
+| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
+| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
+| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
+| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
+| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
+| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
+| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
+| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
+| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
+| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
+| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
+| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
+| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
+| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
+| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
+| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
+| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
+| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
+| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
+| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
+| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
+| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
+| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
+| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
+| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
+| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
+| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+
+
+
+
+
+
+
              Rule #0
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #1
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #2
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #3
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #4
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #5
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #6
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #7
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #8
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #9
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #10
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #11
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #12
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #13
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #14
              
+
+**Specifier:** `mtb:scale=3`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #15
              
+
+**Specifier:** `mtb:scale=4`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #16
              
+
+**Specifier:** `mtb:scale=5`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #17
              
+
+**Specifier:** `mtb:scale=6`   
+**Permission:** NONE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #18
              
+
+**Specifier:** `highway=corridor`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #19
              
+
+**Specifier:** `highway=steps`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #20
              
+
+**Specifier:** `highway=crossing`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #21
              
+
+**Specifier:** `highway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #22
              
+
+**Specifier:** `public_transport=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #23
              
+
+**Specifier:** `railway=platform`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #24
              
+
+**Specifier:** `footway=sidewalk; highway=footway`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #25
              
+
+**Specifier:** `mtb:scale=1`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #26
              
+
+**Specifier:** `mtb:scale=2`   
+**Permission:** PEDESTRIAN   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #27
              
+
+**Specifier:** `mtb:scale=0`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #28
              
+
+**Specifier:** `highway=cycleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #29
              
+
+**Specifier:** `highway=path`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #30
              
+
+**Specifier:** `highway=pedestrian`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #31
              
+
+**Specifier:** `highway=footway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #32
              
+
+**Specifier:** `highway=bridleway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #33
              
+
+**Specifier:** `highway=living_street`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #34
              
+
+**Specifier:** `highway=unclassified`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #35
              
+
+**Specifier:** `highway=road`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #36
              
+
+**Specifier:** `highway=byway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #37
              
+
+**Specifier:** `highway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #38
              
+
+**Specifier:** `highway=service`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #39
              
+
+**Specifier:** `highway=residential`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #40
              
+
+**Specifier:** `highway=residential_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #41
              
+
+**Specifier:** `highway=tertiary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #42
              
+
+**Specifier:** `highway=tertiary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #43
              
+
+**Specifier:** `highway=secondary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #44
              
+
+**Specifier:** `highway=secondary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #45
              
+
+**Specifier:** `highway=primary`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #46
              
+
+**Specifier:** `highway=primary_link`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #47
              
+
+**Specifier:** `highway=trunk_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #48
              
+
+**Specifier:** `highway=motorway_link`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 2.06, back: 2.06   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #49
              
+
+**Specifier:** `highway=trunk`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 7.47, back: 7.47   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #50
              
+
+**Specifier:** `highway=motorway`   
+**Permission:** CAR   
+**Bike safety factor:** forward: 8.0, back: 8.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #51
              
+
+**Specifier:** `present(highway); cycleway=lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #52
              
+
+**Specifier:** `highway=service; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #53
              
+
+**Specifier:** `highway=residential; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #54
              
+
+**Specifier:** `highway=residential_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #55
              
+
+**Specifier:** `highway=tertiary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #56
              
+
+**Specifier:** `highway=tertiary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.87, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #57
              
+
+**Specifier:** `highway=secondary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #58
              
+
+**Specifier:** `highway=secondary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.96, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #59
              
+
+**Specifier:** `highway=primary; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #60
              
+
+**Specifier:** `highway=primary_link; cycleway=lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #61
              
+
+**Specifier:** `highway=trunk; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.5, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #62
              
+
+**Specifier:** `highway=trunk_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #63
              
+
+**Specifier:** `highway=motorway; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #64
              
+
+**Specifier:** `highway=motorway_link; cycleway=lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.15, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #65
              
+
+**Specifier:** `present(highway); cycleway=share_busway`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #66
              
+
+**Specifier:** `highway=service; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #67
              
+
+**Specifier:** `highway=residential; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #68
              
+
+**Specifier:** `highway=residential_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #69
              
+
+**Specifier:** `highway=tertiary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #70
              
+
+**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.92, back: 0.92   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #71
              
+
+**Specifier:** `highway=secondary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #72
              
+
+**Specifier:** `highway=secondary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #73
              
+
+**Specifier:** `highway=primary; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #74
              
+
+**Specifier:** `highway=primary_link; cycleway=share_busway`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #75
              
+
+**Specifier:** `highway=trunk; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #76
              
+
+**Specifier:** `highway=trunk_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #77
              
+
+**Specifier:** `highway=motorway; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #78
              
+
+**Specifier:** `highway=motorway_link; cycleway=share_busway`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #79
              
+
+**Specifier:** `present(highway); cycleway=opposite_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #80
              
+
+**Specifier:** `highway=service; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #81
              
+
+**Specifier:** `highway=residential; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #82
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #83
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #84
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.87   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #85
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #86
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.96   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #87
              
+
+**Specifier:** `highway=primary; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #88
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #89
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 1.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #90
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 1.15   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #91
              
+
+**Specifier:** `present(highway); cycleway=track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #92
              
+
+**Specifier:** `highway=service; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #93
              
+
+**Specifier:** `highway=residential; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #94
              
+
+**Specifier:** `highway=residential_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.65, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #95
              
+
+**Specifier:** `highway=tertiary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #96
              
+
+**Specifier:** `highway=tertiary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #97
              
+
+**Specifier:** `highway=secondary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #98
              
+
+**Specifier:** `highway=secondary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.8, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #99
              
+
+**Specifier:** `highway=primary; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #100
              
+
+**Specifier:** `highway=primary_link; cycleway=track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #101
              
+
+**Specifier:** `highway=trunk; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #102
              
+
+**Specifier:** `highway=trunk_link; cycleway=track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 0.85, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #103
              
+
+**Specifier:** `present(highway); cycleway=opposite_track`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #104
              
+
+**Specifier:** `highway=service; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #105
              
+
+**Specifier:** `highway=residential; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #106
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.65   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #107
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #108
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #109
              
+
+**Specifier:** `highway=secondary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #110
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 0.8   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #111
              
+
+**Specifier:** `highway=primary; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #112
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite_track`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #113
              
+
+**Specifier:** `highway=trunk; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.47, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #114
              
+
+**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.06, back: 0.85   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #115
              
+
+**Specifier:** `present(highway); cycleway=shared_lane`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #116
              
+
+**Specifier:** `highway=service; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.73, back: 0.73   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #117
              
+
+**Specifier:** `highway=residential; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #118
              
+
+**Specifier:** `highway=residential_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.77, back: 0.77   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #119
              
+
+**Specifier:** `highway=tertiary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #120
              
+
+**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.83, back: 0.83   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #121
              
+
+**Specifier:** `highway=secondary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #122
              
+
+**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.25, back: 1.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #123
              
+
+**Specifier:** `highway=primary; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #124
              
+
+**Specifier:** `highway=primary_link; cycleway=shared_lane`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.75, back: 1.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #125
              
+
+**Specifier:** `present(highway); cycleway=opposite`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.0, back: 1.4   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #126
              
+
+**Specifier:** `highway=service; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #127
              
+
+**Specifier:** `highway=residential; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #128
              
+
+**Specifier:** `highway=residential_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.98, back: 0.98   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #129
              
+
+**Specifier:** `highway=tertiary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #130
              
+
+**Specifier:** `highway=tertiary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.0, back: 1.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #131
              
+
+**Specifier:** `highway=secondary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #132
              
+
+**Specifier:** `highway=secondary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.5, back: 1.71   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #133
              
+
+**Specifier:** `highway=primary; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #134
              
+
+**Specifier:** `highway=primary_link; cycleway=opposite`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.06, back: 2.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #135
              
+
+**Specifier:** `highway=path; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.6, back: 0.6   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #136
              
+
+**Specifier:** `highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #137
              
+
+**Specifier:** `highway=footway; bicycle=yes; area=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.9, back: 0.9   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #138
              
+
+**Specifier:** `highway=pedestrian; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.75, back: 0.75   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #139
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #140
              
+
+**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #141
              
+
+**Specifier:** `highway=footway; footway=crossing`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 2.5, back: 2.5   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #142
              
+
+**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.1, back: 1.1   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #143
              
+
+**Specifier:** `highway=track; bicycle=yes`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #144
              
+
+**Specifier:** `highway=track; bicycle=designated`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #145
              
+
+**Specifier:** `highway=track; bicycle=yes; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.18, back: 1.18   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #146
              
+
+**Specifier:** `highway=track; bicycle=designated; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 0.99, back: 0.99   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #147
              
+
+**Specifier:** `highway=track; present(surface)`   
+**Permission:** PEDESTRIAN_AND_BICYCLE   
+**Bike safety factor:** forward: 1.3, back: 1.3   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #148
              
+
+**Specifier:** `present(highway); bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #149
              
+
+**Specifier:** `highway=service; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.84, back: 0.84   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #150
              
+
+**Specifier:** `highway=residential; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #151
              
+
+**Specifier:** `highway=unclassified; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #152
              
+
+**Specifier:** `highway=residential_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.95, back: 0.95   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #153
              
+
+**Specifier:** `highway=tertiary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #154
              
+
+**Specifier:** `highway=tertiary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 0.97, back: 0.97   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #155
              
+
+**Specifier:** `highway=secondary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #156
              
+
+**Specifier:** `highway=secondary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 1.46, back: 1.46   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #157
              
+
+**Specifier:** `highway=primary; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #158
              
+
+**Specifier:** `highway=primary_link; bicycle=designated`   
+**Permission:** ALL   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #159
              
+
+**Specifier:** `highway=trunk; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.25, back: 7.25   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #160
              
+
+**Specifier:** `highway=trunk_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #161
              
+
+**Specifier:** `highway=motorway; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 7.76, back: 7.76   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
              Rule #162
              
+
+**Specifier:** `highway=motorway_link; bicycle=designated`   
+**Permission:** BICYCLE_AND_CAR   
+**Bike safety factor:** forward: 2.0, back: 2.0   
+**Walk safety factor:** forward: 1.0, back: 1.0 
+
+
+
+
+### Bicycle and walking safety mixins
+
+Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
+permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+
+
+
+
+| matcher                                                    | modifications |
+|------------------------------------------------------------|---------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
+| `surface=unpaved`                                          | 🚴            |
+| `surface=compacted`                                        | 🚴            |
+| `surface=wood`                                             | 🚴            |
+| `surface=cobblestone`                                      | 🚴            |
+| `surface=sett`                                             | 🚴            |
+| `surface=unhewn_cobblestone`                               | 🚴            |
+| `surface=grass_paver`                                      | 🚴            |
+| `surface=pebblestone`                                      | 🚴            |
+| `surface=metal`                                            | 🚴            |
+| `surface=ground`                                           | 🚴            |
+| `surface=dirt`                                             | 🚴            |
+| `surface=earth`                                            | 🚴            |
+| `surface=grass`                                            | 🚴            |
+| `surface=mud`                                              | 🚴            |
+| `surface=woodchip`                                         | 🚴            |
+| `surface=gravel`                                           | 🚴            |
+| `surface=artifical_turf`                                   | 🚴            |
+| `surface=sand`                                             | 🚴            |
+| `rlis:bicycle=caution_area`                                | 🚴            |
+| `rlis:bicycle:right=caution_area`                          | 🚴            |
+| `rlis:bicycle:left=caution_area`                           | 🚴            |
+| `ccgis:bicycle=caution_area`                               | 🚴            |
+| `ccgis:bicycle:right=caution_area`                         | 🚴            |
+| `ccgis:bicycle:left=caution_area`                          | 🚴            |
+| `foot=discouraged`                                         | 🚶            |
+| `bicycle=discouraged`                                      | 🚴            |
+| `foot=use_sidepath`                                        | 🚶            |
+| `bicycle=use_sidepath`                                     | 🚴            |
+
+
diff --git a/mkdocs.yml b/mkdocs.yml
index b8c257ceb7d..1a380e0fe9b 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -73,6 +73,15 @@ nav:
 - Configuration:
     - Introduction: 'Configuration.md'
     - Build: 'BuildConfiguration.md'
+    - OSM Tag Mapping:
+        - Default: 'osm/Default.md'
+        - Norway: 'osm/Norway.md'
+        - Germany: 'osm/Germany.md'
+        - Finland: 'osm/Finland.md'
+        - UK: 'osm/Finland.md'
+        - Atlanta: 'osm/Atlanta.md'
+        - Portland: 'osm/Portland.md'
+        - Houston: 'osm/Houston.md'
     - Router: 'RouterConfiguration.md'
     - "Route Request": 'RouteRequest.md'
     - "Realtime Updaters": 'UpdaterConfig.md'
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java
index 9de824a145b..efe7850f08b 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/NorwayMapper.java
@@ -30,7 +30,7 @@ class NorwayMapper implements OsmTagMapper {
 
   @Override
   public void populateProperties(WayPropertySet props) {
-    var hasSidewalk = new Condition.EqualsAnyIn("sidewalk", "yes", "left", "right", "both");
+    var hasSidewalk = new Condition.OneOf("sidewalk", "yes", "left", "right", "both");
     var hasPrefixSidewalk = new Condition.Equals("sidewalk", "yes"); // e.g sidewalk:left=yes
     props.setDefaultWalkSafetyForPermission((permission, speedLimit, way) ->
       switch (permission) {
@@ -74,16 +74,16 @@ else if (speedLimit >= 11.1f) {
     var cycleSafetyLowTraffic = 1.83;
     var cycleSafetyVeryLowTraffic = 1.57;
 
-    var isTrunkOrPrimary = new Condition.EqualsAnyIn(
+    var isTrunkOrPrimary = new Condition.OneOf(
       "highway",
       "trunk",
       "trunk_link",
       "primary",
       "primary_link"
     );
-    var isSecondaryHighway = new Condition.EqualsAnyIn("highway", "secondary", "secondary_link");
-    var isTertiaryHighway = new Condition.EqualsAnyIn("highway", "tertiary", "tertiary_link");
-    var isClassifiedRoad = new Condition.EqualsAnyIn(
+    var isSecondaryHighway = new Condition.OneOf("highway", "secondary", "secondary_link");
+    var isTertiaryHighway = new Condition.OneOf("highway", "tertiary", "tertiary_link");
+    var isClassifiedRoad = new Condition.OneOf(
       "highway",
       "trunk",
       "trunk_link",
@@ -94,7 +94,7 @@ else if (speedLimit >= 11.1f) {
       "tertiary",
       "tertiary_link"
     );
-    var isClassifiedOrUnclassifiedRoad = new Condition.EqualsAnyIn(
+    var isClassifiedOrUnclassifiedRoad = new Condition.OneOf(
       "highway",
       "trunk",
       "trunk_link",
@@ -107,7 +107,7 @@ else if (speedLimit >= 11.1f) {
       "unclassified"
     );
 
-    var isNormalRoad = new Condition.EqualsAnyIn(
+    var isNormalRoad = new Condition.OneOf(
       "highway",
       "trunk",
       "trunk_link",
@@ -166,7 +166,7 @@ else if (speedLimit >= 11.1f) {
     );
 
     props.setProperties(
-      new ExactMatchSpecifier(new Condition.EqualsAnyIn("highway", "motorway", "motorway_link")),
+      new ExactMatchSpecifier(new Condition.OneOf("highway", "motorway", "motorway_link")),
       withModes(CAR)
     );
 
@@ -205,7 +205,7 @@ else if (speedLimit >= 11.1f) {
     props.setProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("cycleway", "lane"),
-        new Condition.EqualsAnyIn("highway", "unclassified", "residential")
+        new Condition.OneOf("highway", "unclassified", "residential")
       ),
       cycleLaneInLowTraffic
     );
@@ -224,7 +224,7 @@ else if (speedLimit >= 11.1f) {
     props.setMixinProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("oneway", "yes"),
-        new Condition.EqualsAnyInOrAbsent("cycleway"),
+        new Condition.OneOfOrAbsent("cycleway"),
         isNormalRoad
       ),
       ofBicycleSafety(1, 1.15)
@@ -233,7 +233,7 @@ else if (speedLimit >= 11.1f) {
     // Discourage cycling along tram tracks
     props.setMixinProperties(
       new ExactMatchSpecifier(
-        new Condition.EqualsAnyIn("embedded_rails", "tram", "light_rail", "disused")
+        new Condition.OneOf("embedded_rails", "tram", "light_rail", "disused")
       ),
       ofBicycleSafety(1.2)
     );
@@ -252,12 +252,12 @@ else if (speedLimit >= 11.1f) {
       new LogicalOrSpecifier(
         new ExactMatchSpecifier(
           new Condition.Equals("bridge", "yes"),
-          new Condition.EqualsAnyInOrAbsent("sidewalk", "no", "separate"),
+          new Condition.OneOfOrAbsent("sidewalk", "no", "separate"),
           isClassifiedOrUnclassifiedRoad
         ),
         new ExactMatchSpecifier(
           new Condition.Equals("verge", "no"),
-          new Condition.EqualsAnyInOrAbsent("sidewalk", "no", "separate"),
+          new Condition.OneOfOrAbsent("sidewalk", "no", "separate"),
           isClassifiedOrUnclassifiedRoad
         )
       ),
@@ -268,7 +268,7 @@ else if (speedLimit >= 11.1f) {
     props.setMixinProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("junction", "roundabout"),
-        new Condition.EqualsAnyInOrAbsent("sidewalk", "no", "separate")
+        new Condition.OneOfOrAbsent("sidewalk", "no", "separate")
       ),
       ofWalkSafety(2.)
     );
@@ -297,7 +297,7 @@ else if (speedLimit >= 11.1f) {
     props.setProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("highway", "service"),
-        new Condition.EqualsAnyIn("bus", "yes", "designated")
+        new Condition.OneOf("bus", "yes", "designated")
       ),
       withModes(PEDESTRIAN_AND_BICYCLE).bicycleSafety(cycleSafetyMediumLowTraffic).walkSafety(1.9)
     );
@@ -404,49 +404,49 @@ else if (speedLimit >= 11.1f) {
 
     props.setProperties(
       new ExactMatchSpecifier(
-        new Condition.EqualsAnyIn("trail_visibility", "bad", "low", "poor", "horrible", "no"),
+        new Condition.OneOf("trail_visibility", "bad", "low", "poor", "horrible", "no"),
         new Condition.Equals("highway", "path")
       ),
       withModes(NONE)
     );
     props.setProperties(
       new ExactMatchSpecifier(
-        new Condition.EqualsAnyIn(
+        new Condition.OneOf(
           "sac_scale",
           "demanding_mountain_hiking",
           "alpine_hiking",
           "demanding_alpine_hiking",
           "difficult_alpine_hiking"
         ),
-        new Condition.EqualsAnyIn("highway", "path", "steps")
+        new Condition.OneOf("highway", "path", "steps")
       ),
       withModes(NONE)
     );
     props.setProperties(
       new ExactMatchSpecifier(
-        new Condition.EqualsAnyIn("smoothness", "horrible", "very_horrible"),
-        new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+        new Condition.OneOf("smoothness", "horrible", "very_horrible"),
+        new Condition.OneOf("highway", "path", "bridleway", "track")
       ),
       withModes(PEDESTRIAN).walkSafety(1.15)
     );
     props.setProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("smoothness", "impassable"),
-        new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+        new Condition.OneOf("highway", "path", "bridleway", "track")
       ),
       withModes(NONE)
     );
     props.setProperties(
       new ExactMatchSpecifier(
         new Condition.InclusiveRange("mtb:scale", 2, 1),
-        new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+        new Condition.OneOf("highway", "path", "bridleway", "track")
       ),
       withModes(PEDESTRIAN).walkSafety(1.15)
     );
     props.setProperties(
       new ExactMatchSpecifier(
         new Condition.GreaterThan("mtb:scale", 2),
-        new Condition.EqualsAnyIn("highway", "path", "bridleway", "track")
+        new Condition.OneOf("highway", "path", "bridleway", "track")
       ),
       withModes(NONE)
     );
@@ -461,7 +461,7 @@ else if (speedLimit >= 11.1f) {
     props.setMixinProperties("surface=metal_grid", ofBicycleSafety(1.2));
     props.setMixinProperties("surface=metal", ofBicycleSafety(1.2));
     // Paved but damaged
-    var isPaved = new Condition.EqualsAnyIn(
+    var isPaved = new Condition.OneOf(
       "surface",
       "asfalt",
       "concrete",
@@ -502,46 +502,46 @@ else if (speedLimit >= 11.1f) {
     props.setMixinProperties(
       new ExactMatchSpecifier(
         new Condition.Absent("tracktype"),
-        new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
-        new Condition.EqualsAnyIn("highway", "track", "bridleway")
+        new Condition.OneOfOrAbsent("surface", "unpaved"),
+        new Condition.OneOf("highway", "track", "bridleway")
       ),
       ofBicycleSafety(1.8).walkSafety(1.6)
     );
     props.setMixinProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("tracktype", "grade2"),
-        new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
-        new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+        new Condition.OneOfOrAbsent("surface", "unpaved"),
+        new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
       ),
       ofBicycleSafety(1.4).walkSafety(1.4)
     );
     props.setMixinProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("tracktype", "grade3"),
-        new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
-        new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+        new Condition.OneOfOrAbsent("surface", "unpaved"),
+        new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
       ),
       ofBicycleSafety(1.8).walkSafety(1.6)
     );
     props.setMixinProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("tracktype", "grade4"),
-        new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
-        new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+        new Condition.OneOfOrAbsent("surface", "unpaved"),
+        new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
       ),
       ofBicycleSafety(2.3).walkSafety(1.8)
     );
     props.setMixinProperties(
       new ExactMatchSpecifier(
         new Condition.Equals("tracktype", "grade5"),
-        new Condition.EqualsAnyInOrAbsent("surface", "unpaved"),
-        new Condition.EqualsAnyIn("highway", "track", "bridleway", "service", "unclassified")
+        new Condition.OneOfOrAbsent("surface", "unpaved"),
+        new Condition.OneOf("highway", "track", "bridleway", "service", "unclassified")
       ),
       ofBicycleSafety(2.3).walkSafety(2.4)
     );
     props.setMixinProperties(
       new ExactMatchSpecifier(
-        new Condition.EqualsAnyInOrAbsent("surface"),
+        new Condition.OneOfOrAbsent("surface"),
         new Condition.Equals("highway", "path")
       ),
       ofBicycleSafety(2.3).walkSafety(2.4)
@@ -560,7 +560,7 @@ else if (speedLimit >= 11.1f) {
      */
 
     props.setCarSpeed(
-      new ExactMatchSpecifier(new Condition.EqualsAnyIn("highway", "motorway", "motorway_link")),
+      new ExactMatchSpecifier(new Condition.OneOf("highway", "motorway", "motorway_link")),
       30.56f // 110 km/t
     );
 
@@ -570,7 +570,7 @@ else if (speedLimit >= 11.1f) {
     );
     props.setCarSpeed(
       new ExactMatchSpecifier(
-        new Condition.EqualsAnyIn(
+        new Condition.OneOf(
           "highway",
           "trunk",
           "trunk_link",
@@ -589,8 +589,8 @@ else if (speedLimit >= 11.1f) {
     );
     props.setCarSpeed(
       new ExactMatchSpecifier(
-        new Condition.EqualsAnyIn("sidewalk", "yes", "both", "left", "right", "separate"),
-        new Condition.EqualsAnyIn(
+        new Condition.OneOf("sidewalk", "yes", "both", "left", "right", "separate"),
+        new Condition.OneOf(
           "highway",
           "trunk",
           "trunk_link",
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java
index d430ad05f7d..e43b50c46ef 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java
@@ -30,4 +30,8 @@ public OsmTagMapper getInstance() {
       case CONSTANT_SPEED_FINLAND -> new ConstantSpeedFinlandMapper();
     };
   }
+
+  public boolean needsDocumentation() {
+    return this != CONSTANT_SPEED_FINLAND;
+  }
 }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
index fc166a69927..fa9d174f583 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
@@ -5,4 +5,8 @@
  */
 public record SafetyFeatures(double forward, double back) {
   public static final SafetyFeatures DEFAULT = new SafetyFeatures(1, 1);
+
+  public boolean modifies() {
+    return !(forward == 1 && back == 1);
+  }
 }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
index d9f194aa4e5..2c33470f2f7 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
@@ -1,5 +1,7 @@
 package org.opentripplanner.openstreetmap.wayproperty.specifier;
 
+import java.util.Arrays;
+import java.util.stream.Collectors;
 import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.openstreetmap.model.OSMWithTags;
 
@@ -72,6 +74,11 @@ public int matchScore(OSMWithTags way) {
     return score;
   }
 
+  @Override
+  public String toMarkdown() {
+    return Arrays.stream(conditions).map(Object::toString).collect(Collectors.joining("; "));
+  }
+
   @Override
   public String toString() {
     return ToStringBuilder.of(this.getClass()).addObj("conditions", conditions).toString();
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
index 4d8381963b3..89448cad158 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
@@ -112,6 +112,11 @@ record Equals(String key, String value) implements Condition {
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
       return way.hasTag(exKey) && way.isTag(exKey, value);
     }
+
+    @Override
+    public String toString() {
+      return "%s=%s".formatted(key, value);
+    }
   }
 
   record Present(String key) implements Condition {
@@ -123,6 +128,11 @@ public MatchResult matchType() {
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
       return way.hasTag(exKey);
     }
+
+    @Override
+    public String toString() {
+      return "present(%s)".formatted(key);
+    }
   }
 
   record Absent(String key) implements Condition {
@@ -130,6 +140,11 @@ record Absent(String key) implements Condition {
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
       return !way.hasTag(exKey);
     }
+
+    @Override
+    public String toString() {
+      return "!%s".formatted(key);
+    }
   }
 
   record GreaterThan(String key, int value) implements Condition {
@@ -138,6 +153,11 @@ public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
       var maybeInt = way.getTagAsInt(exKey, ignored -> {});
       return maybeInt.isPresent() && maybeInt.getAsInt() > value;
     }
+
+    @Override
+    public String toString() {
+      return "%s > %s".formatted(key, value);
+    }
   }
 
   record LessThan(String key, int value) implements Condition {
@@ -146,6 +166,11 @@ public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
       var maybeInt = way.getTagAsInt(exKey, ignored -> {});
       return maybeInt.isPresent() && maybeInt.getAsInt() < value;
     }
+
+    @Override
+    public String toString() {
+      return "%s < %s".formatted(key, value);
+    }
   }
 
   record InclusiveRange(String key, int upper, int lower) implements Condition {
@@ -160,18 +185,28 @@ public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
       var maybeInt = way.getTagAsInt(exKey, ignored -> {});
       return maybeInt.isPresent() && maybeInt.getAsInt() >= lower && maybeInt.getAsInt() <= upper;
     }
+
+    @Override
+    public String toString() {
+      return "%s > %s < %s".formatted(lower, key, upper);
+    }
   }
 
-  record EqualsAnyIn(String key, String... values) implements Condition {
+  record OneOf(String key, String... values) implements Condition {
     @Override
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
       return Arrays.stream(values).anyMatch(value -> way.isTag(exKey, value));
     }
+
+    @Override
+    public String toString() {
+      return "%s one of [%s]".formatted(key, String.join(", ", values));
+    }
   }
 
-  record EqualsAnyInOrAbsent(String key, String... values) implements Condition {
+  record OneOfOrAbsent(String key, String... values) implements Condition {
     /* A use case for this is to detect the absence of a sidewalk, cycle lane or verge*/
-    public EqualsAnyInOrAbsent(String key) {
+    public OneOfOrAbsent(String key) {
       this(key, "no", "none");
     }
 
@@ -181,5 +216,10 @@ public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
         !way.hasTag(exKey) || Arrays.stream(values).anyMatch(value -> way.isTag(exKey, value))
       );
     }
+
+    @Override
+    public String toString() {
+      return "%s not one of [%s] or absent".formatted(key, String.join(", ", values));
+    }
   }
 }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
index e6eb3f37940..4c26784682f 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.opentripplanner.openstreetmap.model.OSMWithTags;
 
 /**
@@ -54,6 +55,11 @@ public int matchScore(OSMWithTags way) {
     }
   }
 
+  @Override
+  public String toMarkdown() {
+    return conditions.stream().map(Object::toString).collect(Collectors.joining("; "));
+  }
+
   public boolean allTagsMatch(OSMWithTags way) {
     return conditions.stream().allMatch(o -> o.isMatch(way));
   }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
index 229b26fa25a..1a0691deb08 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
@@ -2,6 +2,7 @@
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 import org.opentripplanner.openstreetmap.model.OSMWithTags;
 
 /**
@@ -25,10 +26,6 @@ public LogicalOrSpecifier(ExactMatchSpecifier... specifiers) {
     this.subSpecs = Arrays.asList(specifiers);
   }
 
-  public LogicalOrSpecifier(Condition... conditions) {
-    this.subSpecs = Arrays.stream(conditions).map(ExactMatchSpecifier::new).toList();
-  }
-
   public LogicalOrSpecifier(String... specs) {
     this.subSpecs = Arrays.stream(specs).map(ExactMatchSpecifier::new).toList();
   }
@@ -47,4 +44,9 @@ public int matchScore(OSMWithTags way) {
       return 0;
     }
   }
+
+  @Override
+  public String toMarkdown() {
+    return subSpecs.stream().map(ExactMatchSpecifier::toMarkdown).collect(Collectors.joining("|"));
+  }
 }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
index 1e6c53a25c9..f87845e729f 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
@@ -42,6 +42,8 @@ static Condition[] parseConditions(String spec, String separator) {
    */
   int matchScore(OSMWithTags way);
 
+  String toMarkdown();
+
   record Scores(int forward, int backward) {
     public static Scores of(int s) {
       return new Scores(s, s);
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
new file mode 100644
index 00000000000..16930febdf1
--- /dev/null
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -0,0 +1,141 @@
+package org.opentripplanner.generate.doc;
+
+import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
+import static org.opentripplanner.framework.io.FileUtils.readFile;
+import static org.opentripplanner.framework.io.FileUtils.writeFile;
+import static org.opentripplanner.framework.text.MarkdownFormatter.bold;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT;
+import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT;
+import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.CONSTANT_SPEED_FINLAND;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.HAMBURG;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opentripplanner.framework.text.Table;
+import org.opentripplanner.framework.text.TableBuilder;
+import org.opentripplanner.generate.doc.framework.DocBuilder;
+import org.opentripplanner.generate.doc.framework.GeneratesDocumentation;
+import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapper;
+import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
+import org.opentripplanner.openstreetmap.wayproperty.SafetyFeatures;
+import org.opentripplanner.openstreetmap.wayproperty.WayPropertyPicker;
+import org.opentripplanner.openstreetmap.wayproperty.WayPropertySet;
+
+@GeneratesDocumentation
+public class OsmMapperDocTest {
+
+  private static final String FILE_NAME = "OsmMapper.md";
+  private static final File TEMPLATE = new File(TEMPLATE_ROOT, FILE_NAME);
+
+  public static List mappers() {
+    return Arrays
+      .stream(OsmTagMapperSource.values())
+      .filter(m -> !Set.of(HAMBURG, CONSTANT_SPEED_FINLAND).contains(m))
+      .toList();
+  }
+
+  @ParameterizedTest
+  @MethodSource("mappers")
+  public void updateDocs(OsmTagMapperSource source) {
+    var mapper = source.getInstance();
+    var wps = new WayPropertySet();
+    mapper.populateProperties(wps);
+
+    var outFile = outputFile(mapper);
+
+    // Read and close input file (same as output file)
+    String template = readFile(TEMPLATE);
+    String original = readFile(outFile);
+
+    var propTable = propTable(wps);
+    var mixinTable = mixinTable(wps);
+
+    template = replaceSection(template, "props", propTable.toMarkdownTable());
+    template = replaceSection(template, "prop-details", propDetails(wps));
+    template = replaceSection(template, "mixins", mixinTable.toMarkdownTable());
+    writeFile(outFile, template);
+    assertFileEquals(original, outFile);
+  }
+
+  private static File outputFile(OsmTagMapper mapper) {
+    var name = mapper.getClass().getSimpleName().replaceAll("Mapper", ".md");
+    return new File("%s/osm/".formatted(DOCS_ROOT), name);
+  }
+
+  private static Table propTable(WayPropertySet wps) {
+    var propTable = new TableBuilder();
+    propTable.withHeaders("specifier", "permission", "safety");
+
+    for (var prop : wps.getWayProperties()) {
+      propTable.addRow(
+        "`%s`".formatted(prop.specifier().toMarkdown()),
+        prop.properties().getPermission(),
+        emojiModifications(prop.properties().bicycleSafety(), prop.properties().walkSafety())
+      );
+    }
+    return propTable.build();
+  }
+
+  private static String propDetails(WayPropertySet wps) {
+    var docBuilder = new DocBuilder();
+
+    var wayProperties = wps.getWayProperties();
+    for (var prop : wayProperties) {
+      var index = wayProperties.indexOf(prop);
+
+      docBuilder.header(3, "Rule #%s".formatted(index), Integer.toString(index));
+      docBuilder
+        .text(bold("Specifier:"))
+        .text("`%s`".formatted(prop.specifier().toMarkdown()))
+        .lineBreak();
+
+      docBuilder.text(bold("Permission:")).text(prop.properties().getPermission());
+      docBuilder.lineBreak();
+      var bike = prop.properties().bicycleSafety();
+      docBuilder
+        .text(bold("Bike safety factor:"))
+        .text("forward: %s, back: %s".formatted(bike.forward(), bike.back()));
+      docBuilder.lineBreak();
+      var walk = prop.properties().walkSafety();
+      docBuilder
+        .text(bold("Walk safety factor:"))
+        .text("forward: %s, back: %s".formatted(walk.forward(), walk.back()));
+      docBuilder.endParagraph();
+    }
+    return docBuilder.toString();
+  }
+
+  private static String hash(WayPropertyPicker prop) {
+    return prop.specifier().toMarkdown().replaceAll(" ", "").toLowerCase();
+  }
+
+  private static Table mixinTable(WayPropertySet wps) {
+    var propTable = new TableBuilder();
+    propTable.withHeaders("matcher", "modifications");
+
+    for (var prop : wps.getMixins()) {
+      propTable.addRow(
+        "`%s`".formatted(prop.specifier().toMarkdown()),
+        emojiModifications(prop.bicycleSafety(), prop.walkSafety())
+      );
+    }
+    return propTable.build();
+  }
+
+  private static String emojiModifications(SafetyFeatures bicycle, SafetyFeatures walk) {
+    return emojiIfModifies(bicycle, "\uD83D\uDEB4") + " " + emojiIfModifies(walk, "\uD83D\uDEB6");
+  }
+
+  private static String emojiIfModifies(SafetyFeatures prop, String value) {
+    if (prop.modifies()) {
+      return value;
+    } else {
+      return "";
+    }
+  }
+}
diff --git a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java
index def272652f6..6386aa902e2 100644
--- a/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java
+++ b/src/test/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ConditionTest.java
@@ -29,11 +29,11 @@
 import org.opentripplanner.openstreetmap.model.OSMWithTags;
 import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Absent;
 import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Equals;
-import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.EqualsAnyIn;
 import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.GreaterThan;
 import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.InclusiveRange;
 import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.LessThan;
 import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.MatchResult;
+import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.OneOf;
 import org.opentripplanner.openstreetmap.wayproperty.specifier.Condition.Present;
 
 class ConditionTest {
@@ -46,7 +46,7 @@ class ConditionTest {
   static Condition moreThanFourLanes = new GreaterThan("lanes", 4);
   static Condition lessThanFourLanes = new LessThan("lanes", 4);
   static Condition betweenFiveAndThreeLanes = new InclusiveRange("lanes", 5, 3);
-  static Condition smoothnessBadAndWorseThanBad = new EqualsAnyIn(
+  static Condition smoothnessBadAndWorseThanBad = new OneOf(
     "smoothness",
     "bad",
     "very_bad",
@@ -54,7 +54,7 @@ class ConditionTest {
     "very_horrible",
     "impassable"
   );
-  static Condition noSidewalk = new Condition.EqualsAnyInOrAbsent("sidewalk");
+  static Condition noSidewalk = new Condition.OneOfOrAbsent("sidewalk");
 
   static Stream equalsCases() {
     return Stream.of(

From e942193474fa29fcb8d16e47219f50237559a287 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 26 Jun 2024 10:07:35 +0200
Subject: [PATCH 1479/1688] Skip more mappers

---
 docs/osm/Atlanta.md                           | 1270 ----------------
 docs/osm/Hamburg.md                           |  217 ---
 docs/osm/Houston.md                           | 1262 ----------------
 docs/osm/Portland.md                          | 1275 -----------------
 mkdocs.yml                                    |    3 -
 .../generate/doc/OsmMapperDocTest.java        |   17 +-
 6 files changed, 11 insertions(+), 4033 deletions(-)
 delete mode 100644 docs/osm/Atlanta.md
 delete mode 100644 docs/osm/Hamburg.md
 delete mode 100644 docs/osm/Houston.md
 delete mode 100644 docs/osm/Portland.md

diff --git a/docs/osm/Atlanta.md b/docs/osm/Atlanta.md
deleted file mode 100644
index da8caa3b433..00000000000
--- a/docs/osm/Atlanta.md
+++ /dev/null
@@ -1,1270 +0,0 @@
-## OSM tag mapping
-
-### Way properties
-
-Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
-These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
-
-
-
-
-| specifier                                               | permission             | safety |
-|---------------------------------------------------------|------------------------|--------|
-| `highway=trunk_link`                                    | ALL                    | 🚴     |
-| `highway=trunk`                                         | ALL                    | 🚴     |
-| `mtb:scale=3`                                           | NONE                   |        |
-| `mtb:scale=4`                                           | NONE                   |        |
-| `mtb:scale=5`                                           | NONE                   |        |
-| `mtb:scale=6`                                           | NONE                   |        |
-| `highway=corridor`                                      | PEDESTRIAN             |        |
-| `highway=steps`                                         | PEDESTRIAN             |        |
-| `highway=crossing`                                      | PEDESTRIAN             |        |
-| `highway=platform`                                      | PEDESTRIAN             |        |
-| `public_transport=platform`                             | PEDESTRIAN             |        |
-| `railway=platform`                                      | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
-| `mtb:scale=1`                                           | PEDESTRIAN             |        |
-| `mtb:scale=2`                                           | PEDESTRIAN             |        |
-| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                 | ALL                    | 🚴     |
-| `highway=unclassified`                                  | ALL                    |        |
-| `highway=road`                                          | ALL                    |        |
-| `highway=byway`                                         | ALL                    | 🚴     |
-| `highway=track`                                         | ALL                    | 🚴     |
-| `highway=service`                                       | ALL                    | 🚴     |
-| `highway=residential`                                   | ALL                    | 🚴     |
-| `highway=residential_link`                              | ALL                    | 🚴     |
-| `highway=tertiary`                                      | ALL                    |        |
-| `highway=tertiary_link`                                 | ALL                    |        |
-| `highway=secondary`                                     | ALL                    | 🚴     |
-| `highway=secondary_link`                                | ALL                    | 🚴     |
-| `highway=primary`                                       | ALL                    | 🚴     |
-| `highway=primary_link`                                  | ALL                    | 🚴     |
-| `highway=trunk_link`                                    | CAR                    | 🚴     |
-| `highway=motorway_link`                                 | CAR                    | 🚴     |
-| `highway=trunk`                                         | CAR                    | 🚴     |
-| `highway=motorway`                                      | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
-
-
-
-
-
-
-
              Rule #0
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `mtb:scale=3`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `mtb:scale=4`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `mtb:scale=5`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `mtb:scale=6`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `highway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `railway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #13
              
-
-**Specifier:** `mtb:scale=1`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #14
              
-
-**Specifier:** `mtb:scale=2`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `mtb:scale=0`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #16
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #17
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #18
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #22
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #23
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #27
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #29
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #30
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #31
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #32
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #33
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #34
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #35
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #36
              
-
-**Specifier:** `highway=motorway_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #37
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #38
              
-
-**Specifier:** `highway=motorway`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 8.0, back: 8.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #39
              
-
-**Specifier:** `present(highway); cycleway=lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #40
              
-
-**Specifier:** `highway=service; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #41
              
-
-**Specifier:** `highway=residential; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #42
              
-
-**Specifier:** `highway=residential_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `highway=tertiary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #44
              
-
-**Specifier:** `highway=tertiary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #45
              
-
-**Specifier:** `highway=secondary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #46
              
-
-**Specifier:** `highway=secondary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #47
              
-
-**Specifier:** `highway=primary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #48
              
-
-**Specifier:** `highway=primary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #49
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #50
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #51
              
-
-**Specifier:** `highway=motorway; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #52
              
-
-**Specifier:** `highway=motorway_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #53
              
-
-**Specifier:** `present(highway); cycleway=share_busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #54
              
-
-**Specifier:** `highway=service; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #55
              
-
-**Specifier:** `highway=residential; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #56
              
-
-**Specifier:** `highway=residential_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #57
              
-
-**Specifier:** `highway=tertiary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #58
              
-
-**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #59
              
-
-**Specifier:** `highway=secondary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #60
              
-
-**Specifier:** `highway=secondary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #61
              
-
-**Specifier:** `highway=primary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #62
              
-
-**Specifier:** `highway=primary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #63
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #64
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #65
              
-
-**Specifier:** `highway=motorway; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #66
              
-
-**Specifier:** `highway=motorway_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #67
              
-
-**Specifier:** `present(highway); cycleway=opposite_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #68
              
-
-**Specifier:** `highway=service; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #69
              
-
-**Specifier:** `highway=residential; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #70
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #71
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #72
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #73
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #74
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #75
              
-
-**Specifier:** `highway=primary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #76
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #77
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #78
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #79
              
-
-**Specifier:** `present(highway); cycleway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #80
              
-
-**Specifier:** `highway=service; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #81
              
-
-**Specifier:** `highway=residential; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #82
              
-
-**Specifier:** `highway=residential_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #83
              
-
-**Specifier:** `highway=tertiary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #84
              
-
-**Specifier:** `highway=tertiary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #85
              
-
-**Specifier:** `highway=secondary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #86
              
-
-**Specifier:** `highway=secondary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #87
              
-
-**Specifier:** `highway=primary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #88
              
-
-**Specifier:** `highway=primary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #89
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #90
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #91
              
-
-**Specifier:** `present(highway); cycleway=opposite_track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #92
              
-
-**Specifier:** `highway=service; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #93
              
-
-**Specifier:** `highway=residential; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #94
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #95
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #96
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #97
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #98
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #99
              
-
-**Specifier:** `highway=primary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #100
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #101
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #102
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #103
              
-
-**Specifier:** `present(highway); cycleway=shared_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #104
              
-
-**Specifier:** `highway=service; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.73, back: 0.73   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #105
              
-
-**Specifier:** `highway=residential; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #106
              
-
-**Specifier:** `highway=residential_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #107
              
-
-**Specifier:** `highway=tertiary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #108
              
-
-**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #109
              
-
-**Specifier:** `highway=secondary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #110
              
-
-**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #111
              
-
-**Specifier:** `highway=primary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #112
              
-
-**Specifier:** `highway=primary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #113
              
-
-**Specifier:** `present(highway); cycleway=opposite`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.4   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #114
              
-
-**Specifier:** `highway=service; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #115
              
-
-**Specifier:** `highway=residential; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #116
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #117
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #118
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #119
              
-
-**Specifier:** `highway=secondary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #120
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #121
              
-
-**Specifier:** `highway=primary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #122
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #123
              
-
-**Specifier:** `highway=path; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #124
              
-
-**Specifier:** `highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #125
              
-
-**Specifier:** `highway=footway; bicycle=yes; area=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #126
              
-
-**Specifier:** `highway=pedestrian; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #127
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #128
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #129
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #130
              
-
-**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #131
              
-
-**Specifier:** `highway=track; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #132
              
-
-**Specifier:** `highway=track; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #133
              
-
-**Specifier:** `highway=track; bicycle=yes; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #134
              
-
-**Specifier:** `highway=track; bicycle=designated; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #135
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #136
              
-
-**Specifier:** `present(highway); bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #137
              
-
-**Specifier:** `highway=service; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.84, back: 0.84   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #138
              
-
-**Specifier:** `highway=residential; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #139
              
-
-**Specifier:** `highway=unclassified; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #140
              
-
-**Specifier:** `highway=residential_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #141
              
-
-**Specifier:** `highway=tertiary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #142
              
-
-**Specifier:** `highway=tertiary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #143
              
-
-**Specifier:** `highway=secondary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #144
              
-
-**Specifier:** `highway=secondary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #145
              
-
-**Specifier:** `highway=primary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #146
              
-
-**Specifier:** `highway=primary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #147
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #148
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #149
              
-
-**Specifier:** `highway=motorway; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.76, back: 7.76   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #150
              
-
-**Specifier:** `highway=motorway_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
-
-Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
-
-
-
-
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
-
-
diff --git a/docs/osm/Hamburg.md b/docs/osm/Hamburg.md
deleted file mode 100644
index 2cdd3068ca6..00000000000
--- a/docs/osm/Hamburg.md
+++ /dev/null
@@ -1,217 +0,0 @@
-## OSM tag mapping
-
-
-
-
-| matcher                                                 | permission             | safety |
-|---------------------------------------------------------|------------------------|--------|
-| `highway=track`                                         | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=residential; junction=roundabout`              | ALL                    | 🚴     |
-| `present(highway); junction=roundabout`                 | BICYCLE_AND_CAR        |        |
-| `highway=pedestrian`                                    | PEDESTRIAN             |        |
-| `highway=residential; maxspeed=30`                      | ALL                    | 🚴     |
-| `highway=footway; bicycle=yes`                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=unclassified; cycleway=lane`                   | ALL                    | 🚴     |
-| `mtb:scale=3`                                           | NONE                   |        |
-| `mtb:scale=4`                                           | NONE                   |        |
-| `mtb:scale=5`                                           | NONE                   |        |
-| `mtb:scale=6`                                           | NONE                   |        |
-| `highway=corridor`                                      | PEDESTRIAN             |        |
-| `highway=steps`                                         | PEDESTRIAN             |        |
-| `highway=crossing`                                      | PEDESTRIAN             |        |
-| `highway=platform`                                      | PEDESTRIAN             |        |
-| `public_transport=platform`                             | PEDESTRIAN             |        |
-| `railway=platform`                                      | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
-| `mtb:scale=1`                                           | PEDESTRIAN             |        |
-| `mtb:scale=2`                                           | PEDESTRIAN             |        |
-| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                 | ALL                    | 🚴     |
-| `highway=unclassified`                                  | ALL                    |        |
-| `highway=road`                                          | ALL                    |        |
-| `highway=byway`                                         | ALL                    | 🚴     |
-| `highway=track`                                         | ALL                    | 🚴     |
-| `highway=service`                                       | ALL                    | 🚴     |
-| `highway=residential`                                   | ALL                    | 🚴     |
-| `highway=residential_link`                              | ALL                    | 🚴     |
-| `highway=tertiary`                                      | ALL                    |        |
-| `highway=tertiary_link`                                 | ALL                    |        |
-| `highway=secondary`                                     | ALL                    | 🚴     |
-| `highway=secondary_link`                                | ALL                    | 🚴     |
-| `highway=primary`                                       | ALL                    | 🚴     |
-| `highway=primary_link`                                  | ALL                    | 🚴     |
-| `highway=trunk_link`                                    | CAR                    | 🚴     |
-| `highway=motorway_link`                                 | CAR                    | 🚴     |
-| `highway=trunk`                                         | CAR                    | 🚴     |
-| `highway=motorway`                                      | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
-
-
-
-### Bicycle and walking safety mixins
-
-
-
-
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `highway=tertiary`                                         | 🚴            |
-| `maxspeed=70`                                              | 🚴            |
-| `maxspeed=80`                                              | 🚴            |
-| `maxspeed=90`                                              | 🚴            |
-| `maxspeed=100`                                             | 🚴            |
-| `tracktype=grade1`                                         |               |
-| `tracktype=grade2`                                         | 🚴            |
-| `tracktype=grade3`                                         | 🚴            |
-| `tracktype=grade4`                                         | 🚴            |
-| `tracktype=grade5`                                         | 🚴            |
-| `lit=no`                                                   | 🚴            |
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
-
-
diff --git a/docs/osm/Houston.md b/docs/osm/Houston.md
deleted file mode 100644
index 8071d9a0a8a..00000000000
--- a/docs/osm/Houston.md
+++ /dev/null
@@ -1,1262 +0,0 @@
-## OSM tag mapping
-
-### Way properties
-
-Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
-These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
-
-
-
-
-| specifier                                               | permission             | safety |
-|---------------------------------------------------------|------------------------|--------|
-| `highway=footway; layer=-1; tunnel=yes; indoor=yes`     | NONE                   |        |
-| `mtb:scale=3`                                           | NONE                   |        |
-| `mtb:scale=4`                                           | NONE                   |        |
-| `mtb:scale=5`                                           | NONE                   |        |
-| `mtb:scale=6`                                           | NONE                   |        |
-| `highway=corridor`                                      | PEDESTRIAN             |        |
-| `highway=steps`                                         | PEDESTRIAN             |        |
-| `highway=crossing`                                      | PEDESTRIAN             |        |
-| `highway=platform`                                      | PEDESTRIAN             |        |
-| `public_transport=platform`                             | PEDESTRIAN             |        |
-| `railway=platform`                                      | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
-| `mtb:scale=1`                                           | PEDESTRIAN             |        |
-| `mtb:scale=2`                                           | PEDESTRIAN             |        |
-| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                 | ALL                    | 🚴     |
-| `highway=unclassified`                                  | ALL                    |        |
-| `highway=road`                                          | ALL                    |        |
-| `highway=byway`                                         | ALL                    | 🚴     |
-| `highway=track`                                         | ALL                    | 🚴     |
-| `highway=service`                                       | ALL                    | 🚴     |
-| `highway=residential`                                   | ALL                    | 🚴     |
-| `highway=residential_link`                              | ALL                    | 🚴     |
-| `highway=tertiary`                                      | ALL                    |        |
-| `highway=tertiary_link`                                 | ALL                    |        |
-| `highway=secondary`                                     | ALL                    | 🚴     |
-| `highway=secondary_link`                                | ALL                    | 🚴     |
-| `highway=primary`                                       | ALL                    | 🚴     |
-| `highway=primary_link`                                  | ALL                    | 🚴     |
-| `highway=trunk_link`                                    | CAR                    | 🚴     |
-| `highway=motorway_link`                                 | CAR                    | 🚴     |
-| `highway=trunk`                                         | CAR                    | 🚴     |
-| `highway=motorway`                                      | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
-
-
-
-
-
-
-
              Rule #0
              
-
-**Specifier:** `highway=footway; layer=-1; tunnel=yes; indoor=yes`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `mtb:scale=3`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `mtb:scale=4`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `mtb:scale=5`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `mtb:scale=6`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `highway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `railway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `mtb:scale=1`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #13
              
-
-**Specifier:** `mtb:scale=2`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #14
              
-
-**Specifier:** `mtb:scale=0`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #16
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #17
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #18
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #22
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #23
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #27
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #29
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #30
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #31
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #32
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #33
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #34
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #35
              
-
-**Specifier:** `highway=motorway_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #36
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #37
              
-
-**Specifier:** `highway=motorway`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 8.0, back: 8.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #38
              
-
-**Specifier:** `present(highway); cycleway=lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #39
              
-
-**Specifier:** `highway=service; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #40
              
-
-**Specifier:** `highway=residential; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #41
              
-
-**Specifier:** `highway=residential_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #42
              
-
-**Specifier:** `highway=tertiary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `highway=tertiary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #44
              
-
-**Specifier:** `highway=secondary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #45
              
-
-**Specifier:** `highway=secondary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #46
              
-
-**Specifier:** `highway=primary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #47
              
-
-**Specifier:** `highway=primary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #48
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #49
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #50
              
-
-**Specifier:** `highway=motorway; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #51
              
-
-**Specifier:** `highway=motorway_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #52
              
-
-**Specifier:** `present(highway); cycleway=share_busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #53
              
-
-**Specifier:** `highway=service; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #54
              
-
-**Specifier:** `highway=residential; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #55
              
-
-**Specifier:** `highway=residential_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #56
              
-
-**Specifier:** `highway=tertiary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #57
              
-
-**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #58
              
-
-**Specifier:** `highway=secondary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #59
              
-
-**Specifier:** `highway=secondary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #60
              
-
-**Specifier:** `highway=primary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #61
              
-
-**Specifier:** `highway=primary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #62
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #63
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #64
              
-
-**Specifier:** `highway=motorway; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #65
              
-
-**Specifier:** `highway=motorway_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #66
              
-
-**Specifier:** `present(highway); cycleway=opposite_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #67
              
-
-**Specifier:** `highway=service; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #68
              
-
-**Specifier:** `highway=residential; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #69
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #70
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #71
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #72
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #73
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #74
              
-
-**Specifier:** `highway=primary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #75
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #76
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #77
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #78
              
-
-**Specifier:** `present(highway); cycleway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #79
              
-
-**Specifier:** `highway=service; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #80
              
-
-**Specifier:** `highway=residential; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #81
              
-
-**Specifier:** `highway=residential_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #82
              
-
-**Specifier:** `highway=tertiary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #83
              
-
-**Specifier:** `highway=tertiary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #84
              
-
-**Specifier:** `highway=secondary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #85
              
-
-**Specifier:** `highway=secondary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #86
              
-
-**Specifier:** `highway=primary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #87
              
-
-**Specifier:** `highway=primary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #88
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #89
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #90
              
-
-**Specifier:** `present(highway); cycleway=opposite_track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #91
              
-
-**Specifier:** `highway=service; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #92
              
-
-**Specifier:** `highway=residential; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #93
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #94
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #95
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #96
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #97
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #98
              
-
-**Specifier:** `highway=primary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #99
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #100
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #101
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #102
              
-
-**Specifier:** `present(highway); cycleway=shared_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #103
              
-
-**Specifier:** `highway=service; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.73, back: 0.73   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #104
              
-
-**Specifier:** `highway=residential; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #105
              
-
-**Specifier:** `highway=residential_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #106
              
-
-**Specifier:** `highway=tertiary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #107
              
-
-**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #108
              
-
-**Specifier:** `highway=secondary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #109
              
-
-**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #110
              
-
-**Specifier:** `highway=primary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #111
              
-
-**Specifier:** `highway=primary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #112
              
-
-**Specifier:** `present(highway); cycleway=opposite`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.4   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #113
              
-
-**Specifier:** `highway=service; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #114
              
-
-**Specifier:** `highway=residential; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #115
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #116
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #117
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #118
              
-
-**Specifier:** `highway=secondary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #119
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #120
              
-
-**Specifier:** `highway=primary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #121
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #122
              
-
-**Specifier:** `highway=path; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #123
              
-
-**Specifier:** `highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #124
              
-
-**Specifier:** `highway=footway; bicycle=yes; area=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #125
              
-
-**Specifier:** `highway=pedestrian; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #126
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #127
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #128
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #129
              
-
-**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #130
              
-
-**Specifier:** `highway=track; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #131
              
-
-**Specifier:** `highway=track; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #132
              
-
-**Specifier:** `highway=track; bicycle=yes; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #133
              
-
-**Specifier:** `highway=track; bicycle=designated; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #134
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #135
              
-
-**Specifier:** `present(highway); bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #136
              
-
-**Specifier:** `highway=service; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.84, back: 0.84   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #137
              
-
-**Specifier:** `highway=residential; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #138
              
-
-**Specifier:** `highway=unclassified; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #139
              
-
-**Specifier:** `highway=residential_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #140
              
-
-**Specifier:** `highway=tertiary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #141
              
-
-**Specifier:** `highway=tertiary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #142
              
-
-**Specifier:** `highway=secondary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #143
              
-
-**Specifier:** `highway=secondary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #144
              
-
-**Specifier:** `highway=primary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #145
              
-
-**Specifier:** `highway=primary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #146
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #147
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #148
              
-
-**Specifier:** `highway=motorway; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.76, back: 7.76   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #149
              
-
-**Specifier:** `highway=motorway_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
-
-Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
-
-
-
-
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
-
-
diff --git a/docs/osm/Portland.md b/docs/osm/Portland.md
deleted file mode 100644
index 7f7baed3d8b..00000000000
--- a/docs/osm/Portland.md
+++ /dev/null
@@ -1,1275 +0,0 @@
-## OSM tag mapping
-
-### Way properties
-
-Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
-These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
-
-
-
-
-| specifier                                               | permission             | safety |
-|---------------------------------------------------------|------------------------|--------|
-| `mtb:scale=3`                                           | NONE                   |        |
-| `mtb:scale=4`                                           | NONE                   |        |
-| `mtb:scale=5`                                           | NONE                   |        |
-| `mtb:scale=6`                                           | NONE                   |        |
-| `highway=corridor`                                      | PEDESTRIAN             |        |
-| `highway=steps`                                         | PEDESTRIAN             |        |
-| `highway=crossing`                                      | PEDESTRIAN             |        |
-| `highway=platform`                                      | PEDESTRIAN             |        |
-| `public_transport=platform`                             | PEDESTRIAN             |        |
-| `railway=platform`                                      | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
-| `mtb:scale=1`                                           | PEDESTRIAN             |        |
-| `mtb:scale=2`                                           | PEDESTRIAN             |        |
-| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                 | ALL                    | 🚴     |
-| `highway=unclassified`                                  | ALL                    |        |
-| `highway=road`                                          | ALL                    |        |
-| `highway=byway`                                         | ALL                    | 🚴     |
-| `highway=track`                                         | ALL                    | 🚴     |
-| `highway=service`                                       | ALL                    | 🚴     |
-| `highway=residential`                                   | ALL                    | 🚴     |
-| `highway=residential_link`                              | ALL                    | 🚴     |
-| `highway=tertiary`                                      | ALL                    |        |
-| `highway=tertiary_link`                                 | ALL                    |        |
-| `highway=secondary`                                     | ALL                    | 🚴     |
-| `highway=secondary_link`                                | ALL                    | 🚴     |
-| `highway=primary`                                       | ALL                    | 🚴     |
-| `highway=primary_link`                                  | ALL                    | 🚴     |
-| `highway=trunk_link`                                    | CAR                    | 🚴     |
-| `highway=motorway_link`                                 | CAR                    | 🚴     |
-| `highway=trunk`                                         | CAR                    | 🚴     |
-| `highway=motorway`                                      | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
-
-
-
-
-
-
-
              Rule #0
              
-
-**Specifier:** `mtb:scale=3`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `mtb:scale=4`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `mtb:scale=5`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `mtb:scale=6`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `highway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `railway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `mtb:scale=1`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `mtb:scale=2`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #13
              
-
-**Specifier:** `mtb:scale=0`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #14
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #16
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #17
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #18
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #22
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #23
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #27
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #29
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #30
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #31
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #32
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #33
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #34
              
-
-**Specifier:** `highway=motorway_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #35
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #36
              
-
-**Specifier:** `highway=motorway`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 8.0, back: 8.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #37
              
-
-**Specifier:** `present(highway); cycleway=lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #38
              
-
-**Specifier:** `highway=service; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #39
              
-
-**Specifier:** `highway=residential; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #40
              
-
-**Specifier:** `highway=residential_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #41
              
-
-**Specifier:** `highway=tertiary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #42
              
-
-**Specifier:** `highway=tertiary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `highway=secondary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #44
              
-
-**Specifier:** `highway=secondary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #45
              
-
-**Specifier:** `highway=primary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #46
              
-
-**Specifier:** `highway=primary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #47
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #48
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #49
              
-
-**Specifier:** `highway=motorway; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #50
              
-
-**Specifier:** `highway=motorway_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #51
              
-
-**Specifier:** `present(highway); cycleway=share_busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #52
              
-
-**Specifier:** `highway=service; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #53
              
-
-**Specifier:** `highway=residential; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #54
              
-
-**Specifier:** `highway=residential_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #55
              
-
-**Specifier:** `highway=tertiary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #56
              
-
-**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #57
              
-
-**Specifier:** `highway=secondary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #58
              
-
-**Specifier:** `highway=secondary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #59
              
-
-**Specifier:** `highway=primary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #60
              
-
-**Specifier:** `highway=primary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #61
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #62
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #63
              
-
-**Specifier:** `highway=motorway; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #64
              
-
-**Specifier:** `highway=motorway_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #65
              
-
-**Specifier:** `present(highway); cycleway=opposite_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #66
              
-
-**Specifier:** `highway=service; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #67
              
-
-**Specifier:** `highway=residential; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #68
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #69
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #70
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #71
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #72
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #73
              
-
-**Specifier:** `highway=primary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #74
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #75
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #76
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #77
              
-
-**Specifier:** `present(highway); cycleway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #78
              
-
-**Specifier:** `highway=service; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #79
              
-
-**Specifier:** `highway=residential; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #80
              
-
-**Specifier:** `highway=residential_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #81
              
-
-**Specifier:** `highway=tertiary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #82
              
-
-**Specifier:** `highway=tertiary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #83
              
-
-**Specifier:** `highway=secondary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #84
              
-
-**Specifier:** `highway=secondary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #85
              
-
-**Specifier:** `highway=primary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #86
              
-
-**Specifier:** `highway=primary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #87
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #88
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #89
              
-
-**Specifier:** `present(highway); cycleway=opposite_track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #90
              
-
-**Specifier:** `highway=service; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #91
              
-
-**Specifier:** `highway=residential; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #92
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #93
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #94
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #95
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #96
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #97
              
-
-**Specifier:** `highway=primary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #98
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #99
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #100
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #101
              
-
-**Specifier:** `present(highway); cycleway=shared_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #102
              
-
-**Specifier:** `highway=service; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.73, back: 0.73   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #103
              
-
-**Specifier:** `highway=residential; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #104
              
-
-**Specifier:** `highway=residential_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #105
              
-
-**Specifier:** `highway=tertiary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #106
              
-
-**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #107
              
-
-**Specifier:** `highway=secondary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #108
              
-
-**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #109
              
-
-**Specifier:** `highway=primary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #110
              
-
-**Specifier:** `highway=primary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #111
              
-
-**Specifier:** `present(highway); cycleway=opposite`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.4   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #112
              
-
-**Specifier:** `highway=service; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #113
              
-
-**Specifier:** `highway=residential; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #114
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #115
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #116
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #117
              
-
-**Specifier:** `highway=secondary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #118
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #119
              
-
-**Specifier:** `highway=primary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #120
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #121
              
-
-**Specifier:** `highway=path; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #122
              
-
-**Specifier:** `highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #123
              
-
-**Specifier:** `highway=footway; bicycle=yes; area=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #124
              
-
-**Specifier:** `highway=pedestrian; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #125
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #126
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #127
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #128
              
-
-**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #129
              
-
-**Specifier:** `highway=track; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #130
              
-
-**Specifier:** `highway=track; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #131
              
-
-**Specifier:** `highway=track; bicycle=yes; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #132
              
-
-**Specifier:** `highway=track; bicycle=designated; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #133
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #134
              
-
-**Specifier:** `present(highway); bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #135
              
-
-**Specifier:** `highway=service; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.84, back: 0.84   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #136
              
-
-**Specifier:** `highway=residential; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #137
              
-
-**Specifier:** `highway=unclassified; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #138
              
-
-**Specifier:** `highway=residential_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #139
              
-
-**Specifier:** `highway=tertiary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #140
              
-
-**Specifier:** `highway=tertiary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #141
              
-
-**Specifier:** `highway=secondary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #142
              
-
-**Specifier:** `highway=secondary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #143
              
-
-**Specifier:** `highway=primary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #144
              
-
-**Specifier:** `highway=primary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #145
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #146
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #147
              
-
-**Specifier:** `highway=motorway; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.76, back: 7.76   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #148
              
-
-**Specifier:** `highway=motorway_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
-
-Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
-
-
-
-
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `footway=sidewalk`                                         | 🚶            |
-| `!name`                                                    | 🚶            |
-| `highway=trunk`                                            | 🚶            |
-| `highway=trunk_link`                                       | 🚶            |
-| `highway=primary`                                          | 🚶            |
-| `highway=primary_link`                                     | 🚶            |
-| `highway=secondary`                                        | 🚶            |
-| `highway=secondary_link`                                   | 🚶            |
-| `highway=tertiary`                                         | 🚶            |
-| `highway=tertiary_link`                                    | 🚶            |
-| `lanes > 4`                                                | 🚶            |
-| `sidewalk=both`                                            | 🚶            |
-| `sidewalk=left`                                            | 🚶            |
-| `sidewalk=right`                                           | 🚶            |
-| `surface=unpaved`                                          | 🚶            |
-| `sidewalk=no; maxspeed=55 mph`                             | 🚶            |
-| `sidewalk=no; maxspeed=50 mph`                             | 🚶            |
-| `sidewalk=no; maxspeed=45 mph`                             | 🚶            |
-| `sidewalk=no; maxspeed=40 mph`                             | 🚶            |
-| `sidewalk=no; maxspeed=35 mph`                             | 🚶            |
-| `sidewalk=no; maxspeed=30 mph`                             | 🚶            |
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
-
-
diff --git a/mkdocs.yml b/mkdocs.yml
index 1a380e0fe9b..0db31c4df53 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -79,9 +79,6 @@ nav:
         - Germany: 'osm/Germany.md'
         - Finland: 'osm/Finland.md'
         - UK: 'osm/Finland.md'
-        - Atlanta: 'osm/Atlanta.md'
-        - Portland: 'osm/Portland.md'
-        - Houston: 'osm/Houston.md'
     - Router: 'RouterConfiguration.md'
     - "Route Request": 'RouteRequest.md'
     - "Realtime Updaters": 'UpdaterConfig.md'
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
index 16930febdf1..52400a05b01 100644
--- a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -7,8 +7,11 @@
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.ATLANTA;
 import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.CONSTANT_SPEED_FINLAND;
 import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.HAMBURG;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.HOUSTON;
+import static org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource.PORTLAND;
 
 import java.io.File;
 import java.util.Arrays;
@@ -23,7 +26,6 @@
 import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapper;
 import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
 import org.opentripplanner.openstreetmap.wayproperty.SafetyFeatures;
-import org.opentripplanner.openstreetmap.wayproperty.WayPropertyPicker;
 import org.opentripplanner.openstreetmap.wayproperty.WayPropertySet;
 
 @GeneratesDocumentation
@@ -31,11 +33,18 @@ public class OsmMapperDocTest {
 
   private static final String FILE_NAME = "OsmMapper.md";
   private static final File TEMPLATE = new File(TEMPLATE_ROOT, FILE_NAME);
+  private static final Set SKIP_MAPPERS = Set.of(
+    ATLANTA,
+    HOUSTON,
+    PORTLAND,
+    HAMBURG,
+    CONSTANT_SPEED_FINLAND
+  );
 
   public static List mappers() {
     return Arrays
       .stream(OsmTagMapperSource.values())
-      .filter(m -> !Set.of(HAMBURG, CONSTANT_SPEED_FINLAND).contains(m))
+      .filter(m -> !SKIP_MAPPERS.contains(m))
       .toList();
   }
 
@@ -110,10 +119,6 @@ private static String propDetails(WayPropertySet wps) {
     return docBuilder.toString();
   }
 
-  private static String hash(WayPropertyPicker prop) {
-    return prop.specifier().toMarkdown().replaceAll(" ", "").toLowerCase();
-  }
-
   private static Table mixinTable(WayPropertySet wps) {
     var propTable = new TableBuilder();
     propTable.withHeaders("matcher", "modifications");

From c28736b70199b0ac069298bcbe00ac306b8d39f3 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 26 Jun 2024 10:29:49 +0200
Subject: [PATCH 1480/1688] Move Portland specific tags to PortlandMapper

---
 docs/osm/Default.md                           | 56 ++++++-------
 docs/osm/Finland.md                           | 58 +++++++-------
 docs/osm/Germany.md                           | 78 +++++++++----------
 docs/osm/Norway.md                            | 74 +++++++++---------
 docs/osm/UK.md                                | 56 ++++++-------
 .../tagmapping/DefaultMapper.java             | 18 -----
 .../tagmapping/PortlandMapper.java            | 21 +++++
 .../wayproperty/SafetyFeatures.java           |  4 +
 .../generate/doc/OsmMapperDocTest.java        | 17 +++-
 9 files changed, 189 insertions(+), 193 deletions(-)

diff --git a/docs/osm/Default.md b/docs/osm/Default.md
index fe2b8895b23..cadf5fe488d 100644
--- a/docs/osm/Default.md
+++ b/docs/osm/Default.md
@@ -1219,36 +1219,30 @@ permission of an OSM way. Multiple mixins can apply to the same way and their ef
 
 
 
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
+| matcher                                                    | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7            |             |
+| `surface=unpaved`                                          | 1.18           |             |
+| `surface=compacted`                                        | 1.18           |             |
+| `surface=wood`                                             | 1.18           |             |
+| `surface=cobblestone`                                      | 1.3            |             |
+| `surface=sett`                                             | 1.3            |             |
+| `surface=unhewn_cobblestone`                               | 1.5            |             |
+| `surface=grass_paver`                                      | 1.3            |             |
+| `surface=pebblestone`                                      | 1.3            |             |
+| `surface=metal`                                            | 1.3            |             |
+| `surface=ground`                                           | 1.5            |             |
+| `surface=dirt`                                             | 1.5            |             |
+| `surface=earth`                                            | 1.5            |             |
+| `surface=grass`                                            | 1.5            |             |
+| `surface=mud`                                              | 1.5            |             |
+| `surface=woodchip`                                         | 1.5            |             |
+| `surface=gravel`                                           | 1.5            |             |
+| `surface=artifical_turf`                                   | 1.5            |             |
+| `surface=sand`                                             | 100.0          |             |
+| `foot=discouraged`                                         |                | 3.0         |
+| `bicycle=discouraged`                                      | 3.0            |             |
+| `foot=use_sidepath`                                        |                | 5.0         |
+| `bicycle=use_sidepath`                                     | 5.0            |             |
 
 
diff --git a/docs/osm/Finland.md b/docs/osm/Finland.md
index 2cd77be22ea..acb7bd5e302 100644
--- a/docs/osm/Finland.md
+++ b/docs/osm/Finland.md
@@ -1571,37 +1571,31 @@ permission of an OSM way. Multiple mixins can apply to the same way and their ef
 
 
 
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `bicycle=use_sidepath`                                     | 🚶            |
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
+| matcher                                                    | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `bicycle=use_sidepath`                                     |                | 5.0         |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7            |             |
+| `surface=unpaved`                                          | 1.18           |             |
+| `surface=compacted`                                        | 1.18           |             |
+| `surface=wood`                                             | 1.18           |             |
+| `surface=cobblestone`                                      | 1.3            |             |
+| `surface=sett`                                             | 1.3            |             |
+| `surface=unhewn_cobblestone`                               | 1.5            |             |
+| `surface=grass_paver`                                      | 1.3            |             |
+| `surface=pebblestone`                                      | 1.3            |             |
+| `surface=metal`                                            | 1.3            |             |
+| `surface=ground`                                           | 1.5            |             |
+| `surface=dirt`                                             | 1.5            |             |
+| `surface=earth`                                            | 1.5            |             |
+| `surface=grass`                                            | 1.5            |             |
+| `surface=mud`                                              | 1.5            |             |
+| `surface=woodchip`                                         | 1.5            |             |
+| `surface=gravel`                                           | 1.5            |             |
+| `surface=artifical_turf`                                   | 1.5            |             |
+| `surface=sand`                                             | 100.0          |             |
+| `foot=discouraged`                                         |                | 3.0         |
+| `bicycle=discouraged`                                      | 3.0            |             |
+| `foot=use_sidepath`                                        |                | 5.0         |
+| `bicycle=use_sidepath`                                     | 5.0            |             |
 
 
diff --git a/docs/osm/Germany.md b/docs/osm/Germany.md
index b6d218f95e7..7cd6cbf91cf 100644
--- a/docs/osm/Germany.md
+++ b/docs/osm/Germany.md
@@ -1291,47 +1291,41 @@ permission of an OSM way. Multiple mixins can apply to the same way and their ef
 
 
 
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `highway=tertiary`                                         | 🚴            |
-| `maxspeed=70`                                              | 🚴            |
-| `maxspeed=80`                                              | 🚴            |
-| `maxspeed=90`                                              | 🚴            |
-| `maxspeed=100`                                             | 🚴            |
-| `tracktype=grade1`                                         |               |
-| `tracktype=grade2`                                         | 🚴            |
-| `tracktype=grade3`                                         | 🚴            |
-| `tracktype=grade4`                                         | 🚴            |
-| `tracktype=grade5`                                         | 🚴            |
-| `lit=no`                                                   | 🚴            |
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
+| matcher                                                    | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `highway=tertiary`                                         | 1.2            |             |
+| `maxspeed=70`                                              | 1.5            |             |
+| `maxspeed=80`                                              | 2.0            |             |
+| `maxspeed=90`                                              | 3.0            |             |
+| `maxspeed=100`                                             | 5.0            |             |
+| `tracktype=grade1`                                         |                |             |
+| `tracktype=grade2`                                         | 1.1            |             |
+| `tracktype=grade3`                                         | 1.15           |             |
+| `tracktype=grade4`                                         | 1.3            |             |
+| `tracktype=grade5`                                         | 1.5            |             |
+| `lit=no`                                                   | 1.05           |             |
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7            |             |
+| `surface=unpaved`                                          | 1.18           |             |
+| `surface=compacted`                                        | 1.18           |             |
+| `surface=wood`                                             | 1.18           |             |
+| `surface=cobblestone`                                      | 1.3            |             |
+| `surface=sett`                                             | 1.3            |             |
+| `surface=unhewn_cobblestone`                               | 1.5            |             |
+| `surface=grass_paver`                                      | 1.3            |             |
+| `surface=pebblestone`                                      | 1.3            |             |
+| `surface=metal`                                            | 1.3            |             |
+| `surface=ground`                                           | 1.5            |             |
+| `surface=dirt`                                             | 1.5            |             |
+| `surface=earth`                                            | 1.5            |             |
+| `surface=grass`                                            | 1.5            |             |
+| `surface=mud`                                              | 1.5            |             |
+| `surface=woodchip`                                         | 1.5            |             |
+| `surface=gravel`                                           | 1.5            |             |
+| `surface=artifical_turf`                                   | 1.5            |             |
+| `surface=sand`                                             | 100.0          |             |
+| `foot=discouraged`                                         |                | 3.0         |
+| `bicycle=discouraged`                                      | 3.0            |             |
+| `foot=use_sidepath`                                        |                | 5.0         |
+| `bicycle=use_sidepath`                                     | 5.0            |             |
 
 
diff --git a/docs/osm/Norway.md b/docs/osm/Norway.md
index 00ba1b4bf51..7237319d738 100644
--- a/docs/osm/Norway.md
+++ b/docs/osm/Norway.md
@@ -387,42 +387,42 @@ permission of an OSM way. Multiple mixins can apply to the same way and their ef
 
 
 
-| matcher                                                                                                                                                                                                                                                                                                                                                                     | modifications |
-|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| `cycleway=shared_lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                                                                                                                                                                                                            | 🚴            |
-| `lcn=yes¦rcn=yes¦ncn=yes`                                                                                                                                                                                                                                                                                                                                                   | 🚴            |
-| `oneway=yes; cycleway not one of [no, none] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                                                                                                                                                                            | 🚴            |
-| `embedded_rails one of [tram, light_rail, disused]`                                                                                                                                                                                                                                                                                                                         | 🚴            |
-| `tunnel=yes; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]`                                                                                                                                                                                                                                   | 🚶            |
-| `bridge=yes; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]¦verge=no; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]` | 🚶            |
-| `junction=roundabout; sidewalk not one of [no, separate] or absent`                                                                                                                                                                                                                                                                                                         | 🚶            |
-| `surface=grass_paver`                                                                                                                                                                                                                                                                                                                                                       | 🚴            |
-| `surface=sett`                                                                                                                                                                                                                                                                                                                                                              | 🚴            |
-| `surface=cobblestone`                                                                                                                                                                                                                                                                                                                                                       | 🚴            |
-| `surface=unhewn_cobblestone`                                                                                                                                                                                                                                                                                                                                                | 🚴            |
-| `surface=metal_grid`                                                                                                                                                                                                                                                                                                                                                        | 🚴            |
-| `surface=metal`                                                                                                                                                                                                                                                                                                                                                             | 🚴            |
-| `smoothness=intermediate; surface one of [asfalt, concrete, paving_stones, paved, wood]`                                                                                                                                                                                                                                                                                    | 🚴            |
-| `smoothness=bad; surface one of [asfalt, concrete, paving_stones, paved, wood]`                                                                                                                                                                                                                                                                                             | 🚴 🚶         |
-| `surface=unpaved; !tracktype`                                                                                                                                                                                                                                                                                                                                               | 🚴 🚶         |
-| `surface=compacted`                                                                                                                                                                                                                                                                                                                                                         | 🚴 🚶         |
-| `surface=fine_gravel`                                                                                                                                                                                                                                                                                                                                                       | 🚴 🚶         |
-| `surface=pebblestone`                                                                                                                                                                                                                                                                                                                                                       | 🚴 🚶         |
-| `surface=gravel`                                                                                                                                                                                                                                                                                                                                                            | 🚴 🚶         |
-| `surface=woodchip`                                                                                                                                                                                                                                                                                                                                                          | 🚴 🚶         |
-| `surface=ground`                                                                                                                                                                                                                                                                                                                                                            | 🚴 🚶         |
-| `surface=dirt`                                                                                                                                                                                                                                                                                                                                                              | 🚴 🚶         |
-| `surface=earth`                                                                                                                                                                                                                                                                                                                                                             | 🚴 🚶         |
-| `surface=grass`                                                                                                                                                                                                                                                                                                                                                             | 🚴 🚶         |
-| `surface=mud`                                                                                                                                                                                                                                                                                                                                                               | 🚴 🚶         |
-| `surface=sand`                                                                                                                                                                                                                                                                                                                                                              | 🚴 🚶         |
-| `!tracktype; surface not one of [unpaved] or absent; highway one of [track, bridleway]`                                                                                                                                                                                                                                                                                     | 🚴 🚶         |
-| `tracktype=grade2; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
-| `tracktype=grade3; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
-| `tracktype=grade4; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
-| `tracktype=grade5; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 🚴 🚶         |
-| `surface not one of [no, none] or absent; highway=path`                                                                                                                                                                                                                                                                                                                     | 🚴 🚶         |
-| `sac_scale=mountain_hiking`                                                                                                                                                                                                                                                                                                                                                 | 🚶            |
-| `trail_visibility=intermediate`                                                                                                                                                                                                                                                                                                                                             | 🚶            |
+| matcher                                                                                                                                                                                                                                                                                                                                                                     | bicycle safety               | walk safety |
+|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------|-------------|
+| `cycleway=shared_lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                                                                                                                                                                                                            | 0.85                         |             |
+| `lcn=yes¦rcn=yes¦ncn=yes`                                                                                                                                                                                                                                                                                                                                                   | 0.85                         |             |
+| `oneway=yes; cycleway not one of [no, none] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                                                                                                                                                                            | forward: 1.0 
               back: 1.15 |             |
+| `embedded_rails one of [tram, light_rail, disused]`                                                                                                                                                                                                                                                                                                                         | 1.2                          |             |
+| `tunnel=yes; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]`                                                                                                                                                                                                                                   |                              | 2.0         |
+| `bridge=yes; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]¦verge=no; sidewalk not one of [no, separate] or absent; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified]` |                              | 2.0         |
+| `junction=roundabout; sidewalk not one of [no, separate] or absent`                                                                                                                                                                                                                                                                                                         |                              | 2.0         |
+| `surface=grass_paver`                                                                                                                                                                                                                                                                                                                                                       | 1.2                          |             |
+| `surface=sett`                                                                                                                                                                                                                                                                                                                                                              | 1.2                          |             |
+| `surface=cobblestone`                                                                                                                                                                                                                                                                                                                                                       | 1.2                          |             |
+| `surface=unhewn_cobblestone`                                                                                                                                                                                                                                                                                                                                                | 3.0                          |             |
+| `surface=metal_grid`                                                                                                                                                                                                                                                                                                                                                        | 1.2                          |             |
+| `surface=metal`                                                                                                                                                                                                                                                                                                                                                             | 1.2                          |             |
+| `smoothness=intermediate; surface one of [asfalt, concrete, paving_stones, paved, wood]`                                                                                                                                                                                                                                                                                    | 1.2                          |             |
+| `smoothness=bad; surface one of [asfalt, concrete, paving_stones, paved, wood]`                                                                                                                                                                                                                                                                                             | 1.4                          | 1.6         |
+| `surface=unpaved; !tracktype`                                                                                                                                                                                                                                                                                                                                               | 1.8                          | 1.6         |
+| `surface=compacted`                                                                                                                                                                                                                                                                                                                                                         | 1.4                          | 1.4         |
+| `surface=fine_gravel`                                                                                                                                                                                                                                                                                                                                                       | 1.8                          | 1.6         |
+| `surface=pebblestone`                                                                                                                                                                                                                                                                                                                                                       | 1.8                          | 1.6         |
+| `surface=gravel`                                                                                                                                                                                                                                                                                                                                                            | 1.8                          | 1.6         |
+| `surface=woodchip`                                                                                                                                                                                                                                                                                                                                                          | 1.8                          | 1.6         |
+| `surface=ground`                                                                                                                                                                                                                                                                                                                                                            | 2.3                          | 2.4         |
+| `surface=dirt`                                                                                                                                                                                                                                                                                                                                                              | 2.3                          | 2.4         |
+| `surface=earth`                                                                                                                                                                                                                                                                                                                                                             | 2.3                          | 2.4         |
+| `surface=grass`                                                                                                                                                                                                                                                                                                                                                             | 2.3                          | 1.8         |
+| `surface=mud`                                                                                                                                                                                                                                                                                                                                                               | 3.0                          | 3.0         |
+| `surface=sand`                                                                                                                                                                                                                                                                                                                                                              | 3.0                          | 1.8         |
+| `!tracktype; surface not one of [unpaved] or absent; highway one of [track, bridleway]`                                                                                                                                                                                                                                                                                     | 1.8                          | 1.6         |
+| `tracktype=grade2; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 1.4                          | 1.4         |
+| `tracktype=grade3; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 1.8                          | 1.6         |
+| `tracktype=grade4; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 2.3                          | 1.8         |
+| `tracktype=grade5; surface not one of [unpaved] or absent; highway one of [track, bridleway, service, unclassified]`                                                                                                                                                                                                                                                        | 2.3                          | 2.4         |
+| `surface not one of [no, none] or absent; highway=path`                                                                                                                                                                                                                                                                                                                     | 2.3                          | 2.4         |
+| `sac_scale=mountain_hiking`                                                                                                                                                                                                                                                                                                                                                 |                              | 1.8         |
+| `trail_visibility=intermediate`                                                                                                                                                                                                                                                                                                                                             |                              | 1.8         |
 
 
diff --git a/docs/osm/UK.md b/docs/osm/UK.md
index 9a1f7388228..26376a29f17 100644
--- a/docs/osm/UK.md
+++ b/docs/osm/UK.md
@@ -1331,36 +1331,30 @@ permission of an OSM way. Multiple mixins can apply to the same way and their ef
 
 
 
-| matcher                                                    | modifications |
-|------------------------------------------------------------|---------------|
-| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 🚴            |
-| `surface=unpaved`                                          | 🚴            |
-| `surface=compacted`                                        | 🚴            |
-| `surface=wood`                                             | 🚴            |
-| `surface=cobblestone`                                      | 🚴            |
-| `surface=sett`                                             | 🚴            |
-| `surface=unhewn_cobblestone`                               | 🚴            |
-| `surface=grass_paver`                                      | 🚴            |
-| `surface=pebblestone`                                      | 🚴            |
-| `surface=metal`                                            | 🚴            |
-| `surface=ground`                                           | 🚴            |
-| `surface=dirt`                                             | 🚴            |
-| `surface=earth`                                            | 🚴            |
-| `surface=grass`                                            | 🚴            |
-| `surface=mud`                                              | 🚴            |
-| `surface=woodchip`                                         | 🚴            |
-| `surface=gravel`                                           | 🚴            |
-| `surface=artifical_turf`                                   | 🚴            |
-| `surface=sand`                                             | 🚴            |
-| `rlis:bicycle=caution_area`                                | 🚴            |
-| `rlis:bicycle:right=caution_area`                          | 🚴            |
-| `rlis:bicycle:left=caution_area`                           | 🚴            |
-| `ccgis:bicycle=caution_area`                               | 🚴            |
-| `ccgis:bicycle:right=caution_area`                         | 🚴            |
-| `ccgis:bicycle:left=caution_area`                          | 🚴            |
-| `foot=discouraged`                                         | 🚶            |
-| `bicycle=discouraged`                                      | 🚴            |
-| `foot=use_sidepath`                                        | 🚶            |
-| `bicycle=use_sidepath`                                     | 🚴            |
+| matcher                                                    | bicycle safety | walk safety |
+|------------------------------------------------------------|----------------|-------------|
+| `lcn=yes¦rcn=yes¦ncn=yes¦bicycle_road=yes¦cyclestreet=yes` | 0.7            |             |
+| `surface=unpaved`                                          | 1.18           |             |
+| `surface=compacted`                                        | 1.18           |             |
+| `surface=wood`                                             | 1.18           |             |
+| `surface=cobblestone`                                      | 1.3            |             |
+| `surface=sett`                                             | 1.3            |             |
+| `surface=unhewn_cobblestone`                               | 1.5            |             |
+| `surface=grass_paver`                                      | 1.3            |             |
+| `surface=pebblestone`                                      | 1.3            |             |
+| `surface=metal`                                            | 1.3            |             |
+| `surface=ground`                                           | 1.5            |             |
+| `surface=dirt`                                             | 1.5            |             |
+| `surface=earth`                                            | 1.5            |             |
+| `surface=grass`                                            | 1.5            |             |
+| `surface=mud`                                              | 1.5            |             |
+| `surface=woodchip`                                         | 1.5            |             |
+| `surface=gravel`                                           | 1.5            |             |
+| `surface=artifical_turf`                                   | 1.5            |             |
+| `surface=sand`                                             | 100.0          |             |
+| `foot=discouraged`                                         |                | 3.0         |
+| `bicycle=discouraged`                                      | 3.0            |             |
+| `foot=use_sidepath`                                        |                | 5.0         |
+| `bicycle=use_sidepath`                                     | 5.0            |             |
 
 
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
index 9989c102030..f6343cfd384 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
@@ -602,24 +602,6 @@ public void populateProperties(WayPropertySet props) {
 
     /* Portland-local mixins */
 
-    /*
-     * the RLIS/CCGIS:bicycle=designated mixins are coded out as they are no longer neccessary because of of the bicycle=designated block of code
-     * above. This switch makes our weighting system less reliant on tags that aren't generally used by the OSM community, and prevents the double
-     * counting that was occuring on streets with both bicycle infrastructure and an RLIS:bicycle=designated tag
-     */
-
-    /*
-     * props.setProperties("RLIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
-     */
-    props.setMixinProperties("RLIS:bicycle=caution_area", ofBicycleSafety(1.45));
-    props.setMixinProperties("RLIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
-    props.setMixinProperties("RLIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
-    /*
-     * props.setProperties("CCGIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
-     */
-    props.setMixinProperties("CCGIS:bicycle=caution_area", ofBicycleSafety(1.45));
-    props.setMixinProperties("CCGIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
-    props.setMixinProperties("CCGIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
 
     props.setMixinProperties("foot=discouraged", ofWalkSafety(3));
     props.setMixinProperties("bicycle=discouraged", ofBicycleSafety(3));
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
index a532d279ba4..f58daa1ddb3 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
@@ -1,5 +1,6 @@
 package org.opentripplanner.openstreetmap.tagmapping;
 
+import static org.opentripplanner.openstreetmap.wayproperty.MixinPropertiesBuilder.ofBicycleSafety;
 import static org.opentripplanner.openstreetmap.wayproperty.MixinPropertiesBuilder.ofWalkSafety;
 import static org.opentripplanner.openstreetmap.wayproperty.specifier.ExactMatchSpecifier.exact;
 
@@ -41,6 +42,26 @@ public void populateProperties(WayPropertySet props) {
     props.setMixinProperties(exact("sidewalk=no;maxspeed=35 mph"), ofWalkSafety(2));
     props.setMixinProperties(exact("sidewalk=no;maxspeed=30 mph"), ofWalkSafety(1.5));
 
+    /*
+     * the RLIS/CCGIS:bicycle=designated mixins are coded out as they are no longer neccessary because of of the bicycle=designated block of code
+     * above. This switch makes our weighting system less reliant on tags that aren't generally used by the OSM community, and prevents the double
+     * counting that was occuring on streets with both bicycle infrastructure and an RLIS:bicycle=designated tag
+     */
+
+    /*
+     * props.setProperties("RLIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
+     */
+    props.setMixinProperties("RLIS:bicycle=caution_area", ofBicycleSafety(1.45));
+    props.setMixinProperties("RLIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
+    props.setMixinProperties("RLIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
+    /*
+     * props.setProperties("CCGIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
+     */
+    props.setMixinProperties("CCGIS:bicycle=caution_area", ofBicycleSafety(1.45));
+    props.setMixinProperties("CCGIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
+    props.setMixinProperties("CCGIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
+
+
     // Max speed limit in Oregon is 70 mph ~= 113kmh ~= 31.3m/s
     props.maxPossibleCarSpeed = 31.4f;
 
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
index fa9d174f583..dcf5969322f 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
@@ -9,4 +9,8 @@ public record SafetyFeatures(double forward, double back) {
   public boolean modifies() {
     return !(forward == 1 && back == 1);
   }
+
+  public boolean isSymetric() {
+    return forward == back;
+  }
 }
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
index 52400a05b01..1884551d3cc 100644
--- a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -121,17 +121,30 @@ private static String propDetails(WayPropertySet wps) {
 
   private static Table mixinTable(WayPropertySet wps) {
     var propTable = new TableBuilder();
-    propTable.withHeaders("matcher", "modifications");
+    propTable.withHeaders("matcher", "bicycle safety", "walk safety");
 
     for (var prop : wps.getMixins()) {
       propTable.addRow(
         "`%s`".formatted(prop.specifier().toMarkdown()),
-        emojiModifications(prop.bicycleSafety(), prop.walkSafety())
+        tableValues(prop.bicycleSafety()),
+        tableValues(prop.walkSafety())
       );
     }
     return propTable.build();
   }
 
+  private static String tableValues(SafetyFeatures safety) {
+    if (!safety.modifies()) {
+      return "";
+    }
+    else if(safety.isSymetric()){
+      return Double.toString(safety.forward());
+    }
+    else {
+      return "forward: %s 
               back: %s".formatted(safety.forward(), safety.back());
+    }
+  }
+
   private static String emojiModifications(SafetyFeatures bicycle, SafetyFeatures walk) {
     return emojiIfModifies(bicycle, "\uD83D\uDEB4") + " " + emojiIfModifies(walk, "\uD83D\uDEB6");
   }

From 669da728640d42923220743277f7c4b78a3a8ed5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 26 Jun 2024 11:56:08 +0200
Subject: [PATCH 1481/1688] Finetune look of tables

---
 doc-templates/OsmMapper.md                    |   11 +-
 docs/osm/Default.md                           | 1360 ++-----------
 docs/osm/Finland.md                           | 1756 ++---------------
 docs/osm/Germany.md                           | 1441 ++------------
 docs/osm/Norway.md                            |  424 +---
 docs/osm/UK.md                                | 1486 ++------------
 mkdocs.yml                                    |    2 +-
 .../tagmapping/PortlandMapper.java            |   15 +-
 .../generate/doc/OsmMapperDocTest.java        |   56 +-
 9 files changed, 768 insertions(+), 5783 deletions(-)

diff --git a/doc-templates/OsmMapper.md b/doc-templates/OsmMapper.md
index 555805f0c8d..1fe32ea06e9 100644
--- a/doc-templates/OsmMapper.md
+++ b/doc-templates/OsmMapper.md
@@ -1,17 +1,18 @@
-## OSM tag mapping
+# OSM tag mapping
 
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+
 These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+Lower safety values make an OSM way more desirable and higher values less desirable.
 
 
 
-
-
-### Bicycle and walking safety mixins
+### Safety mixins
 
 Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+permission of an OSM way. Their safety values are multiplied with the base values from the selected
+way properties. Multiple mixins can apply to the same way and their effects compound.
 
 
diff --git a/docs/osm/Default.md b/docs/osm/Default.md
index cadf5fe488d..c390c8e4a1b 100644
--- a/docs/osm/Default.md
+++ b/docs/osm/Default.md
@@ -1,1220 +1,174 @@
-## OSM tag mapping
+# OSM tag mapping
 
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+
 These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+Lower safety values make an OSM way more desirable and higher values less desirable.
 
 
 
 
-| specifier                                               | permission             | safety |
-|---------------------------------------------------------|------------------------|--------|
-| `mtb:scale=3`                                           | NONE                   |        |
-| `mtb:scale=4`                                           | NONE                   |        |
-| `mtb:scale=5`                                           | NONE                   |        |
-| `mtb:scale=6`                                           | NONE                   |        |
-| `highway=corridor`                                      | PEDESTRIAN             |        |
-| `highway=steps`                                         | PEDESTRIAN             |        |
-| `highway=crossing`                                      | PEDESTRIAN             |        |
-| `highway=platform`                                      | PEDESTRIAN             |        |
-| `public_transport=platform`                             | PEDESTRIAN             |        |
-| `railway=platform`                                      | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
-| `mtb:scale=1`                                           | PEDESTRIAN             |        |
-| `mtb:scale=2`                                           | PEDESTRIAN             |        |
-| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                 | ALL                    | 🚴     |
-| `highway=unclassified`                                  | ALL                    |        |
-| `highway=road`                                          | ALL                    |        |
-| `highway=byway`                                         | ALL                    | 🚴     |
-| `highway=track`                                         | ALL                    | 🚴     |
-| `highway=service`                                       | ALL                    | 🚴     |
-| `highway=residential`                                   | ALL                    | 🚴     |
-| `highway=residential_link`                              | ALL                    | 🚴     |
-| `highway=tertiary`                                      | ALL                    |        |
-| `highway=tertiary_link`                                 | ALL                    |        |
-| `highway=secondary`                                     | ALL                    | 🚴     |
-| `highway=secondary_link`                                | ALL                    | 🚴     |
-| `highway=primary`                                       | ALL                    | 🚴     |
-| `highway=primary_link`                                  | ALL                    | 🚴     |
-| `highway=trunk_link`                                    | CAR                    | 🚴     |
-| `highway=motorway_link`                                 | CAR                    | 🚴     |
-| `highway=trunk`                                         | CAR                    | 🚴     |
-| `highway=motorway`                                      | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+| specifier                                               | permission               | bike safety                   | walk safety |
+|---------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `mtb:scale=3`                                           | `NONE`                   |                               |             |
+| `mtb:scale=4`                                           | `NONE`                   |                               |             |
+| `mtb:scale=5`                                           | `NONE`                   |                               |             |
+| `mtb:scale=6`                                           | `NONE`                   |                               |             |
+| `highway=corridor`                                      | `PEDESTRIAN`             |                               |             |
+| `highway=steps`                                         | `PEDESTRIAN`             |                               |             |
+| `highway=crossing`                                      | `PEDESTRIAN`             |                               |             |
+| `highway=platform`                                      | `PEDESTRIAN`             |                               |             |
+| `public_transport=platform`                             | `PEDESTRIAN`             |                               |             |
+| `railway=platform`                                      | `PEDESTRIAN`             |                               |             |
+| `footway=sidewalk; highway=footway`                     | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=1`                                           | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=2`                                           | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=0`                                           | `PEDESTRIAN_AND_BICYCLE` |                               |             |
+| `highway=cycleway`                                      | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=path`                                          | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=pedestrian`                                    | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=footway`                                       | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=bridleway`                                     | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `highway=living_street`                                 | `ALL`                    | 0.9                           |             |
+| `highway=unclassified`                                  | `ALL`                    |                               |             |
+| `highway=road`                                          | `ALL`                    |                               |             |
+| `highway=byway`                                         | `ALL`                    | 1.3                           |             |
+| `highway=track`                                         | `ALL`                    | 1.3                           |             |
+| `highway=service`                                       | `ALL`                    | 1.1                           |             |
+| `highway=residential`                                   | `ALL`                    | 0.98                          |             |
+| `highway=residential_link`                              | `ALL`                    | 0.98                          |             |
+| `highway=tertiary`                                      | `ALL`                    |                               |             |
+| `highway=tertiary_link`                                 | `ALL`                    |                               |             |
+| `highway=secondary`                                     | `ALL`                    | 1.5                           |             |
+| `highway=secondary_link`                                | `ALL`                    | 1.5                           |             |
+| `highway=primary`                                       | `ALL`                    | 2.06                          |             |
+| `highway=primary_link`                                  | `ALL`                    | 2.06                          |             |
+| `highway=trunk_link`                                    | `CAR`                    | 2.06                          |             |
+| `highway=motorway_link`                                 | `CAR`                    | 2.06                          |             |
+| `highway=trunk`                                         | `CAR`                    | 7.47                          |             |
+| `highway=motorway`                                      | `CAR`                    | 8.0                           |             |
+| `present(highway); cycleway=lane`                       | `PEDESTRIAN_AND_BICYCLE` | 0.87                          |             |
+| `highway=service; cycleway=lane`                        | `ALL`                    | 0.77                          |             |
+| `highway=residential; cycleway=lane`                    | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=lane`               | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=lane`                       | `ALL`                    | 0.87                          |             |
+| `highway=tertiary_link; cycleway=lane`                  | `ALL`                    | 0.87                          |             |
+| `highway=secondary; cycleway=lane`                      | `ALL`                    | 0.96                          |             |
+| `highway=secondary_link; cycleway=lane`                 | `ALL`                    | 0.96                          |             |
+| `highway=primary; cycleway=lane`                        | `ALL`                    | 1.15                          |             |
+| `highway=primary_link; cycleway=lane`                   | `ALL`                    | 1.15                          |             |
+| `highway=trunk; cycleway=lane`                          | `BICYCLE_AND_CAR`        | 1.5                           |             |
+| `highway=trunk_link; cycleway=lane`                     | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `highway=motorway; cycleway=lane`                       | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway_link; cycleway=lane`                  | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `present(highway); cycleway=share_busway`               | `PEDESTRIAN_AND_BICYCLE` | 0.92                          |             |
+| `highway=service; cycleway=share_busway`                | `ALL`                    | 0.85                          |             |
+| `highway=residential; cycleway=share_busway`            | `ALL`                    | 0.85                          |             |
+| `highway=residential_link; cycleway=share_busway`       | `ALL`                    | 0.85                          |             |
+| `highway=tertiary; cycleway=share_busway`               | `ALL`                    | 0.92                          |             |
+| `highway=tertiary_link; cycleway=share_busway`          | `ALL`                    | 0.92                          |             |
+| `highway=secondary; cycleway=share_busway`              | `ALL`                    | 0.99                          |             |
+| `highway=secondary_link; cycleway=share_busway`         | `ALL`                    | 0.99                          |             |
+| `highway=primary; cycleway=share_busway`                | `ALL`                    | 1.25                          |             |
+| `highway=primary_link; cycleway=share_busway`           | `ALL`                    | 1.25                          |             |
+| `highway=trunk; cycleway=share_busway`                  | `BICYCLE_AND_CAR`        | 1.75                          |             |
+| `highway=trunk_link; cycleway=share_busway`             | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `highway=motorway; cycleway=share_busway`               | `BICYCLE_AND_CAR`        | 2.5                           |             |
+| `highway=motorway_link; cycleway=share_busway`          | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `present(highway); cycleway=opposite_lane`              | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.87  |             |
+| `highway=service; cycleway=opposite_lane`               | `ALL`                    | forward: 1.1 
               back: 0.77  |             |
+| `highway=residential; cycleway=opposite_lane`           | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=residential_link; cycleway=opposite_lane`      | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=tertiary; cycleway=opposite_lane`              | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=tertiary_link; cycleway=opposite_lane`         | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=secondary; cycleway=opposite_lane`             | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=secondary_link; cycleway=opposite_lane`        | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=primary; cycleway=opposite_lane`               | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=primary_link; cycleway=opposite_lane`          | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=trunk; cycleway=opposite_lane`                 | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 1.5  |             |
+| `highway=trunk_link; cycleway=opposite_lane`            | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 1.15 |             |
+| `present(highway); cycleway=track`                      | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=service; cycleway=track`                       | `ALL`                    | 0.65                          |             |
+| `highway=residential; cycleway=track`                   | `ALL`                    | 0.65                          |             |
+| `highway=residential_link; cycleway=track`              | `ALL`                    | 0.65                          |             |
+| `highway=tertiary; cycleway=track`                      | `ALL`                    | 0.75                          |             |
+| `highway=tertiary_link; cycleway=track`                 | `ALL`                    | 0.75                          |             |
+| `highway=secondary; cycleway=track`                     | `ALL`                    | 0.8                           |             |
+| `highway=secondary_link; cycleway=track`                | `ALL`                    | 0.8                           |             |
+| `highway=primary; cycleway=track`                       | `ALL`                    | 0.85                          |             |
+| `highway=primary_link; cycleway=track`                  | `ALL`                    | 0.85                          |             |
+| `highway=trunk; cycleway=track`                         | `BICYCLE_AND_CAR`        | 0.95                          |             |
+| `highway=trunk_link; cycleway=track`                    | `BICYCLE_AND_CAR`        | 0.85                          |             |
+| `present(highway); cycleway=opposite_track`             | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.75  |             |
+| `highway=service; cycleway=opposite_track`              | `ALL`                    | forward: 1.1 
               back: 0.65  |             |
+| `highway=residential; cycleway=opposite_track`          | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=residential_link; cycleway=opposite_track`     | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=tertiary; cycleway=opposite_track`             | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=tertiary_link; cycleway=opposite_track`        | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=secondary; cycleway=opposite_track`            | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=secondary_link; cycleway=opposite_track`       | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=primary; cycleway=opposite_track`              | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=primary_link; cycleway=opposite_track`         | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=trunk; cycleway=opposite_track`                | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 0.95 |             |
+| `highway=trunk_link; cycleway=opposite_track`           | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 0.85 |             |
+| `present(highway); cycleway=shared_lane`                | `PEDESTRIAN_AND_BICYCLE` | 0.77                          |             |
+| `highway=service; cycleway=shared_lane`                 | `ALL`                    | 0.73                          |             |
+| `highway=residential; cycleway=shared_lane`             | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=shared_lane`        | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=shared_lane`                | `ALL`                    | 0.83                          |             |
+| `highway=tertiary_link; cycleway=shared_lane`           | `ALL`                    | 0.83                          |             |
+| `highway=secondary; cycleway=shared_lane`               | `ALL`                    | 1.25                          |             |
+| `highway=secondary_link; cycleway=shared_lane`          | `ALL`                    | 1.25                          |             |
+| `highway=primary; cycleway=shared_lane`                 | `ALL`                    | 1.75                          |             |
+| `highway=primary_link; cycleway=shared_lane`            | `ALL`                    | 1.75                          |             |
+| `present(highway); cycleway=opposite`                   | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 1.4   |             |
+| `highway=service; cycleway=opposite`                    | `ALL`                    | 1.1                           |             |
+| `highway=residential; cycleway=opposite`                | `ALL`                    | 0.98                          |             |
+| `highway=residential_link; cycleway=opposite`           | `ALL`                    | 0.98                          |             |
+| `highway=tertiary; cycleway=opposite`                   | `ALL`                    |                               |             |
+| `highway=tertiary_link; cycleway=opposite`              | `ALL`                    |                               |             |
+| `highway=secondary; cycleway=opposite`                  | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=secondary_link; cycleway=opposite`             | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=primary; cycleway=opposite`                    | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=primary_link; cycleway=opposite`               | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=path; bicycle=designated`                      | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=footway; bicycle=designated`                   | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=footway; bicycle=yes; area=yes`                | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=pedestrian; bicycle=designated`                | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `footway=sidewalk; highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=footway; footway=crossing`                     | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `highway=footway; footway=crossing; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=track; bicycle=yes`                            | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated`                     | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; bicycle=yes; present(surface)`          | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated; present(surface)`   | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; present(surface)`                       | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `present(highway); bicycle=designated`                  | `ALL`                    | 0.97                          |             |
+| `highway=service; bicycle=designated`                   | `ALL`                    | 0.84                          |             |
+| `highway=residential; bicycle=designated`               | `ALL`                    | 0.95                          |             |
+| `highway=unclassified; bicycle=designated`              | `ALL`                    | 0.95                          |             |
+| `highway=residential_link; bicycle=designated`          | `ALL`                    | 0.95                          |             |
+| `highway=tertiary; bicycle=designated`                  | `ALL`                    | 0.97                          |             |
+| `highway=tertiary_link; bicycle=designated`             | `ALL`                    | 0.97                          |             |
+| `highway=secondary; bicycle=designated`                 | `ALL`                    | 1.46                          |             |
+| `highway=secondary_link; bicycle=designated`            | `ALL`                    | 1.46                          |             |
+| `highway=primary; bicycle=designated`                   | `ALL`                    | 2.0                           |             |
+| `highway=primary_link; bicycle=designated`              | `ALL`                    | 2.0                           |             |
+| `highway=trunk; bicycle=designated`                     | `BICYCLE_AND_CAR`        | 7.25                          |             |
+| `highway=trunk_link; bicycle=designated`                | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway; bicycle=designated`                  | `BICYCLE_AND_CAR`        | 7.76                          |             |
+| `highway=motorway_link; bicycle=designated`             | `BICYCLE_AND_CAR`        | 2.0                           |             |
 
 
 
-
-
-
-
              Rule #0
              
-
-**Specifier:** `mtb:scale=3`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `mtb:scale=4`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `mtb:scale=5`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `mtb:scale=6`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `highway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `railway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `mtb:scale=1`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `mtb:scale=2`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #13
              
-
-**Specifier:** `mtb:scale=0`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #14
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #16
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #17
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #18
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #22
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #23
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #27
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #29
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #30
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #31
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #32
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #33
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #34
              
-
-**Specifier:** `highway=motorway_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #35
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #36
              
-
-**Specifier:** `highway=motorway`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 8.0, back: 8.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #37
              
-
-**Specifier:** `present(highway); cycleway=lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #38
              
-
-**Specifier:** `highway=service; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #39
              
-
-**Specifier:** `highway=residential; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #40
              
-
-**Specifier:** `highway=residential_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #41
              
-
-**Specifier:** `highway=tertiary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #42
              
-
-**Specifier:** `highway=tertiary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `highway=secondary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #44
              
-
-**Specifier:** `highway=secondary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #45
              
-
-**Specifier:** `highway=primary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #46
              
-
-**Specifier:** `highway=primary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #47
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #48
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #49
              
-
-**Specifier:** `highway=motorway; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #50
              
-
-**Specifier:** `highway=motorway_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #51
              
-
-**Specifier:** `present(highway); cycleway=share_busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #52
              
-
-**Specifier:** `highway=service; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #53
              
-
-**Specifier:** `highway=residential; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #54
              
-
-**Specifier:** `highway=residential_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #55
              
-
-**Specifier:** `highway=tertiary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #56
              
-
-**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #57
              
-
-**Specifier:** `highway=secondary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #58
              
-
-**Specifier:** `highway=secondary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #59
              
-
-**Specifier:** `highway=primary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #60
              
-
-**Specifier:** `highway=primary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #61
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #62
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #63
              
-
-**Specifier:** `highway=motorway; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #64
              
-
-**Specifier:** `highway=motorway_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #65
              
-
-**Specifier:** `present(highway); cycleway=opposite_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #66
              
-
-**Specifier:** `highway=service; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #67
              
-
-**Specifier:** `highway=residential; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #68
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #69
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #70
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #71
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #72
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #73
              
-
-**Specifier:** `highway=primary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #74
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #75
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #76
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #77
              
-
-**Specifier:** `present(highway); cycleway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #78
              
-
-**Specifier:** `highway=service; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #79
              
-
-**Specifier:** `highway=residential; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #80
              
-
-**Specifier:** `highway=residential_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #81
              
-
-**Specifier:** `highway=tertiary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #82
              
-
-**Specifier:** `highway=tertiary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #83
              
-
-**Specifier:** `highway=secondary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #84
              
-
-**Specifier:** `highway=secondary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #85
              
-
-**Specifier:** `highway=primary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #86
              
-
-**Specifier:** `highway=primary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #87
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #88
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #89
              
-
-**Specifier:** `present(highway); cycleway=opposite_track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #90
              
-
-**Specifier:** `highway=service; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #91
              
-
-**Specifier:** `highway=residential; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #92
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #93
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #94
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #95
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #96
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #97
              
-
-**Specifier:** `highway=primary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #98
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #99
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #100
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #101
              
-
-**Specifier:** `present(highway); cycleway=shared_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #102
              
-
-**Specifier:** `highway=service; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.73, back: 0.73   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #103
              
-
-**Specifier:** `highway=residential; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #104
              
-
-**Specifier:** `highway=residential_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #105
              
-
-**Specifier:** `highway=tertiary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #106
              
-
-**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #107
              
-
-**Specifier:** `highway=secondary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #108
              
-
-**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #109
              
-
-**Specifier:** `highway=primary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #110
              
-
-**Specifier:** `highway=primary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #111
              
-
-**Specifier:** `present(highway); cycleway=opposite`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.4   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #112
              
-
-**Specifier:** `highway=service; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #113
              
-
-**Specifier:** `highway=residential; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #114
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #115
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #116
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #117
              
-
-**Specifier:** `highway=secondary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #118
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #119
              
-
-**Specifier:** `highway=primary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #120
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #121
              
-
-**Specifier:** `highway=path; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #122
              
-
-**Specifier:** `highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #123
              
-
-**Specifier:** `highway=footway; bicycle=yes; area=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #124
              
-
-**Specifier:** `highway=pedestrian; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #125
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #126
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #127
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #128
              
-
-**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #129
              
-
-**Specifier:** `highway=track; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #130
              
-
-**Specifier:** `highway=track; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #131
              
-
-**Specifier:** `highway=track; bicycle=yes; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #132
              
-
-**Specifier:** `highway=track; bicycle=designated; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #133
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #134
              
-
-**Specifier:** `present(highway); bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #135
              
-
-**Specifier:** `highway=service; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.84, back: 0.84   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #136
              
-
-**Specifier:** `highway=residential; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #137
              
-
-**Specifier:** `highway=unclassified; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #138
              
-
-**Specifier:** `highway=residential_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #139
              
-
-**Specifier:** `highway=tertiary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #140
              
-
-**Specifier:** `highway=tertiary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #141
              
-
-**Specifier:** `highway=secondary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #142
              
-
-**Specifier:** `highway=secondary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #143
              
-
-**Specifier:** `highway=primary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #144
              
-
-**Specifier:** `highway=primary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #145
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #146
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #147
              
-
-**Specifier:** `highway=motorway; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.76, back: 7.76   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #148
              
-
-**Specifier:** `highway=motorway_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
+### Safety mixins
 
 Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+permission of an OSM way. Their safety values are multiplied with the base values from the selected
+way properties. Multiple mixins can apply to the same way and their effects compound.
 
 
 
diff --git a/docs/osm/Finland.md b/docs/osm/Finland.md
index acb7bd5e302..33b1ee9ae2a 100644
--- a/docs/osm/Finland.md
+++ b/docs/osm/Finland.md
@@ -1,1572 +1,218 @@
-## OSM tag mapping
+# OSM tag mapping
 
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+
 These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+Lower safety values make an OSM way more desirable and higher values less desirable.
 
 
 
 
-| specifier                                                                       | permission             | safety |
-|---------------------------------------------------------------------------------|------------------------|--------|
-| `highway=living_street`                                                         | ALL                    | 🚴     |
-| `highway=unclassified`                                                          | ALL                    |        |
-| `highway=road`                                                                  | ALL                    |        |
-| `highway=byway`                                                                 | ALL                    | 🚴     |
-| `highway=track`                                                                 | ALL                    | 🚴     |
-| `highway=service`                                                               | ALL                    | 🚴     |
-| `highway=residential`                                                           | ALL                    | 🚴     |
-| `highway=residential_link`                                                      | ALL                    | 🚴     |
-| `highway=tertiary`                                                              | ALL                    |        |
-| `highway=tertiary_link`                                                         | ALL                    |        |
-| `highway=secondary`                                                             | ALL                    | 🚴     |
-| `highway=secondary_link`                                                        | ALL                    | 🚴     |
-| `highway=primary`                                                               | ALL                    | 🚴     |
-| `highway=primary_link`                                                          | ALL                    | 🚴     |
-| `highway=trunk_link`                                                            | ALL                    | 🚴     |
-| `highway=trunk`                                                                 | ALL                    | 🚴     |
-| `highway=trunk; tunnel=yes`                                                     | CAR                    | 🚴     |
-| `motorroad=yes`                                                                 | CAR                    | 🚴     |
-| `present(highway); informal=yes`                                                | NONE                   |        |
-| `highway=service; access=private`                                               | NONE                   |        |
-| `highway=trail`                                                                 | NONE                   |        |
-| `present(highway); seasonal=winter`                                             | NONE                   |        |
-| `present(highway); ice_road=yes`                                                | NONE                   |        |
-| `present(highway); winter_road=yes`                                             | NONE                   |        |
-| `highway=footway`                                                               | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                                             | PEDESTRIAN             |        |
-| `highway=cycleway; segregated=yes`                                              | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=footway; bridge=yes`                                                   | PEDESTRIAN             |        |
-| `highway=footway; tunnel=yes`                                                   | PEDESTRIAN             |        |
-| `highway=cycleway; bridge=yes`                                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=cycleway; tunnel=yes`                                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; crossing=traffic_signals`                   | PEDESTRIAN             | 🚶     |
-| `highway=footway; footway=crossing`                                             | PEDESTRIAN             | 🚶     |
-| `highway=cycleway; cycleway=crossing; segregated=yes; crossing=traffic_signals` | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; footway=crossing; segregated=yes; crossing=traffic_signals`  | PEDESTRIAN             | 🚴 🚶  |
-| `highway=cycleway; cycleway=crossing; segregated=yes`                           | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; footway=crossing; segregated=yes`                            | PEDESTRIAN             | 🚴 🚶  |
-| `highway=cycleway; cycleway=crossing; crossing=traffic_signals`                 | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; footway=crossing; crossing=traffic_signals`                  | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; cycleway=crossing`                                           | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; footway=crossing`                                            | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; bicycle=designated`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; tunnel=yes; access=destination`                               | NONE                   |        |
-| `highway=service; access=destination`                                           | ALL                    | 🚴     |
-| `mtb:scale=3`                                                                   | NONE                   |        |
-| `mtb:scale=4`                                                                   | NONE                   |        |
-| `mtb:scale=5`                                                                   | NONE                   |        |
-| `mtb:scale=6`                                                                   | NONE                   |        |
-| `highway=corridor`                                                              | PEDESTRIAN             |        |
-| `highway=steps`                                                                 | PEDESTRIAN             |        |
-| `highway=crossing`                                                              | PEDESTRIAN             |        |
-| `highway=platform`                                                              | PEDESTRIAN             |        |
-| `public_transport=platform`                                                     | PEDESTRIAN             |        |
-| `railway=platform`                                                              | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                                             | PEDESTRIAN             |        |
-| `mtb:scale=1`                                                                   | PEDESTRIAN             |        |
-| `mtb:scale=2`                                                                   | PEDESTRIAN             |        |
-| `mtb:scale=0`                                                                   | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                                              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                                             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                                         | ALL                    | 🚴     |
-| `highway=unclassified`                                                          | ALL                    |        |
-| `highway=road`                                                                  | ALL                    |        |
-| `highway=byway`                                                                 | ALL                    | 🚴     |
-| `highway=track`                                                                 | ALL                    | 🚴     |
-| `highway=service`                                                               | ALL                    | 🚴     |
-| `highway=residential`                                                           | ALL                    | 🚴     |
-| `highway=residential_link`                                                      | ALL                    | 🚴     |
-| `highway=tertiary`                                                              | ALL                    |        |
-| `highway=tertiary_link`                                                         | ALL                    |        |
-| `highway=secondary`                                                             | ALL                    | 🚴     |
-| `highway=secondary_link`                                                        | ALL                    | 🚴     |
-| `highway=primary`                                                               | ALL                    | 🚴     |
-| `highway=primary_link`                                                          | ALL                    | 🚴     |
-| `highway=trunk_link`                                                            | CAR                    | 🚴     |
-| `highway=motorway_link`                                                         | CAR                    | 🚴     |
-| `highway=trunk`                                                                 | CAR                    | 🚴     |
-| `highway=motorway`                                                              | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                                                | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                                            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`                                       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                                               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                                          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                                              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                                         | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                                                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                                           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                                                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                                             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                                               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                                          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`                                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`                               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`                                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`                                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`                                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`                                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`                                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`                                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`                                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`                                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`                                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`                                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`                              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`                                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`                                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`                                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`                                | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`                                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`                                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`                                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                                              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                                               | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                                           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`                                      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                                              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                                         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                                             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                                        | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                                               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                                          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                                                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                                            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`                                      | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`                                  | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`                             | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`                                     | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`                                | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`                                    | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`                               | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`                                      | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`                                 | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                                        | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`                                   | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                                         | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`                                     | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`                                | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                                        | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`                                   | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`                                       | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`                                  | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                                         | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`                                    | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                                           | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                                            | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                                        | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`                                   | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                                           | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`                                      | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                                          | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`                                     | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                                            | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`                                       | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                                              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                                           | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`                                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated`                         | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                                             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated`                         | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                                             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`                                  | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`                           | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                                          | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                                           | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`                                       | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`                                      | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`                                  | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                                          | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`                                     | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                                         | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`                                    | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                                           | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`                                      | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                                             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                                        | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`                                     | BICYCLE_AND_CAR        | 🚴     |
+| specifier                                                                       | permission               | bike safety                   | walk safety |
+|---------------------------------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `highway=living_street`                                                         | `ALL`                    | 0.9                           |             |
+| `highway=unclassified`                                                          | `ALL`                    |                               |             |
+| `highway=road`                                                                  | `ALL`                    |                               |             |
+| `highway=byway`                                                                 | `ALL`                    | 1.3                           |             |
+| `highway=track`                                                                 | `ALL`                    | 1.3                           |             |
+| `highway=service`                                                               | `ALL`                    | 1.1                           |             |
+| `highway=residential`                                                           | `ALL`                    | 0.98                          |             |
+| `highway=residential_link`                                                      | `ALL`                    | 0.98                          |             |
+| `highway=tertiary`                                                              | `ALL`                    |                               |             |
+| `highway=tertiary_link`                                                         | `ALL`                    |                               |             |
+| `highway=secondary`                                                             | `ALL`                    | 1.5                           |             |
+| `highway=secondary_link`                                                        | `ALL`                    | 1.5                           |             |
+| `highway=primary`                                                               | `ALL`                    | 2.06                          |             |
+| `highway=primary_link`                                                          | `ALL`                    | 2.06                          |             |
+| `highway=trunk_link`                                                            | `ALL`                    | 2.06                          |             |
+| `highway=trunk`                                                                 | `ALL`                    | 7.47                          |             |
+| `highway=trunk; tunnel=yes`                                                     | `CAR`                    | 7.47                          |             |
+| `motorroad=yes`                                                                 | `CAR`                    | 7.47                          |             |
+| `present(highway); informal=yes`                                                | `NONE`                   |                               |             |
+| `highway=service; access=private`                                               | `NONE`                   |                               |             |
+| `highway=trail`                                                                 | `NONE`                   |                               |             |
+| `present(highway); seasonal=winter`                                             | `NONE`                   |                               |             |
+| `present(highway); ice_road=yes`                                                | `NONE`                   |                               |             |
+| `present(highway); winter_road=yes`                                             | `NONE`                   |                               |             |
+| `highway=footway`                                                               | `PEDESTRIAN`             |                               |             |
+| `footway=sidewalk; highway=footway`                                             | `PEDESTRIAN`             |                               |             |
+| `highway=cycleway; segregated=yes`                                              | `PEDESTRIAN_AND_BICYCLE` | 0.6                           | 1.1         |
+| `highway=footway; bridge=yes`                                                   | `PEDESTRIAN`             |                               |             |
+| `highway=footway; tunnel=yes`                                                   | `PEDESTRIAN`             |                               |             |
+| `highway=cycleway; bridge=yes`                                                  | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=cycleway; tunnel=yes`                                                  | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=footway; footway=crossing; crossing=traffic_signals`                   | `PEDESTRIAN`             |                               | 1.1         |
+| `highway=footway; footway=crossing`                                             | `PEDESTRIAN`             |                               | 1.2         |
+| `highway=cycleway; cycleway=crossing; segregated=yes; crossing=traffic_signals` | `PEDESTRIAN_AND_BICYCLE` | 0.8                           | 1.1         |
+| `highway=cycleway; footway=crossing; segregated=yes; crossing=traffic_signals`  | `PEDESTRIAN`             | 0.8                           | 1.1         |
+| `highway=cycleway; cycleway=crossing; segregated=yes`                           | `PEDESTRIAN_AND_BICYCLE` | 1.2                           | 1.2         |
+| `highway=cycleway; footway=crossing; segregated=yes`                            | `PEDESTRIAN`             | 1.2                           | 1.2         |
+| `highway=cycleway; cycleway=crossing; crossing=traffic_signals`                 | `PEDESTRIAN_AND_BICYCLE` | 0.8                           | 1.15        |
+| `highway=cycleway; footway=crossing; crossing=traffic_signals`                  | `PEDESTRIAN_AND_BICYCLE` | 0.8                           | 1.15        |
+| `highway=cycleway; cycleway=crossing`                                           | `PEDESTRIAN_AND_BICYCLE` | 1.2                           | 1.25        |
+| `highway=cycleway; footway=crossing`                                            | `PEDESTRIAN_AND_BICYCLE` | 1.2                           | 1.25        |
+| `highway=cycleway; bicycle=designated`                                          | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=service; tunnel=yes; access=destination`                               | `NONE`                   |                               |             |
+| `highway=service; access=destination`                                           | `ALL`                    | 1.1                           |             |
+| `mtb:scale=3`                                                                   | `NONE`                   |                               |             |
+| `mtb:scale=4`                                                                   | `NONE`                   |                               |             |
+| `mtb:scale=5`                                                                   | `NONE`                   |                               |             |
+| `mtb:scale=6`                                                                   | `NONE`                   |                               |             |
+| `highway=corridor`                                                              | `PEDESTRIAN`             |                               |             |
+| `highway=steps`                                                                 | `PEDESTRIAN`             |                               |             |
+| `highway=crossing`                                                              | `PEDESTRIAN`             |                               |             |
+| `highway=platform`                                                              | `PEDESTRIAN`             |                               |             |
+| `public_transport=platform`                                                     | `PEDESTRIAN`             |                               |             |
+| `railway=platform`                                                              | `PEDESTRIAN`             |                               |             |
+| `footway=sidewalk; highway=footway`                                             | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=1`                                                                   | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=2`                                                                   | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=0`                                                                   | `PEDESTRIAN_AND_BICYCLE` |                               |             |
+| `highway=cycleway`                                                              | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=path`                                                                  | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=pedestrian`                                                            | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=footway`                                                               | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=bridleway`                                                             | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `highway=living_street`                                                         | `ALL`                    | 0.9                           |             |
+| `highway=unclassified`                                                          | `ALL`                    |                               |             |
+| `highway=road`                                                                  | `ALL`                    |                               |             |
+| `highway=byway`                                                                 | `ALL`                    | 1.3                           |             |
+| `highway=track`                                                                 | `ALL`                    | 1.3                           |             |
+| `highway=service`                                                               | `ALL`                    | 1.1                           |             |
+| `highway=residential`                                                           | `ALL`                    | 0.98                          |             |
+| `highway=residential_link`                                                      | `ALL`                    | 0.98                          |             |
+| `highway=tertiary`                                                              | `ALL`                    |                               |             |
+| `highway=tertiary_link`                                                         | `ALL`                    |                               |             |
+| `highway=secondary`                                                             | `ALL`                    | 1.5                           |             |
+| `highway=secondary_link`                                                        | `ALL`                    | 1.5                           |             |
+| `highway=primary`                                                               | `ALL`                    | 2.06                          |             |
+| `highway=primary_link`                                                          | `ALL`                    | 2.06                          |             |
+| `highway=trunk_link`                                                            | `CAR`                    | 2.06                          |             |
+| `highway=motorway_link`                                                         | `CAR`                    | 2.06                          |             |
+| `highway=trunk`                                                                 | `CAR`                    | 7.47                          |             |
+| `highway=motorway`                                                              | `CAR`                    | 8.0                           |             |
+| `present(highway); cycleway=lane`                                               | `PEDESTRIAN_AND_BICYCLE` | 0.87                          |             |
+| `highway=service; cycleway=lane`                                                | `ALL`                    | 0.77                          |             |
+| `highway=residential; cycleway=lane`                                            | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=lane`                                       | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=lane`                                               | `ALL`                    | 0.87                          |             |
+| `highway=tertiary_link; cycleway=lane`                                          | `ALL`                    | 0.87                          |             |
+| `highway=secondary; cycleway=lane`                                              | `ALL`                    | 0.96                          |             |
+| `highway=secondary_link; cycleway=lane`                                         | `ALL`                    | 0.96                          |             |
+| `highway=primary; cycleway=lane`                                                | `ALL`                    | 1.15                          |             |
+| `highway=primary_link; cycleway=lane`                                           | `ALL`                    | 1.15                          |             |
+| `highway=trunk; cycleway=lane`                                                  | `BICYCLE_AND_CAR`        | 1.5                           |             |
+| `highway=trunk_link; cycleway=lane`                                             | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `highway=motorway; cycleway=lane`                                               | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway_link; cycleway=lane`                                          | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `present(highway); cycleway=share_busway`                                       | `PEDESTRIAN_AND_BICYCLE` | 0.92                          |             |
+| `highway=service; cycleway=share_busway`                                        | `ALL`                    | 0.85                          |             |
+| `highway=residential; cycleway=share_busway`                                    | `ALL`                    | 0.85                          |             |
+| `highway=residential_link; cycleway=share_busway`                               | `ALL`                    | 0.85                          |             |
+| `highway=tertiary; cycleway=share_busway`                                       | `ALL`                    | 0.92                          |             |
+| `highway=tertiary_link; cycleway=share_busway`                                  | `ALL`                    | 0.92                          |             |
+| `highway=secondary; cycleway=share_busway`                                      | `ALL`                    | 0.99                          |             |
+| `highway=secondary_link; cycleway=share_busway`                                 | `ALL`                    | 0.99                          |             |
+| `highway=primary; cycleway=share_busway`                                        | `ALL`                    | 1.25                          |             |
+| `highway=primary_link; cycleway=share_busway`                                   | `ALL`                    | 1.25                          |             |
+| `highway=trunk; cycleway=share_busway`                                          | `BICYCLE_AND_CAR`        | 1.75                          |             |
+| `highway=trunk_link; cycleway=share_busway`                                     | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `highway=motorway; cycleway=share_busway`                                       | `BICYCLE_AND_CAR`        | 2.5                           |             |
+| `highway=motorway_link; cycleway=share_busway`                                  | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `present(highway); cycleway=opposite_lane`                                      | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.87  |             |
+| `highway=service; cycleway=opposite_lane`                                       | `ALL`                    | forward: 1.1 
               back: 0.77  |             |
+| `highway=residential; cycleway=opposite_lane`                                   | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=residential_link; cycleway=opposite_lane`                              | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=tertiary; cycleway=opposite_lane`                                      | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=tertiary_link; cycleway=opposite_lane`                                 | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=secondary; cycleway=opposite_lane`                                     | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=secondary_link; cycleway=opposite_lane`                                | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=primary; cycleway=opposite_lane`                                       | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=primary_link; cycleway=opposite_lane`                                  | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=trunk; cycleway=opposite_lane`                                         | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 1.5  |             |
+| `highway=trunk_link; cycleway=opposite_lane`                                    | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 1.15 |             |
+| `present(highway); cycleway=track`                                              | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=service; cycleway=track`                                               | `ALL`                    | 0.65                          |             |
+| `highway=residential; cycleway=track`                                           | `ALL`                    | 0.65                          |             |
+| `highway=residential_link; cycleway=track`                                      | `ALL`                    | 0.65                          |             |
+| `highway=tertiary; cycleway=track`                                              | `ALL`                    | 0.75                          |             |
+| `highway=tertiary_link; cycleway=track`                                         | `ALL`                    | 0.75                          |             |
+| `highway=secondary; cycleway=track`                                             | `ALL`                    | 0.8                           |             |
+| `highway=secondary_link; cycleway=track`                                        | `ALL`                    | 0.8                           |             |
+| `highway=primary; cycleway=track`                                               | `ALL`                    | 0.85                          |             |
+| `highway=primary_link; cycleway=track`                                          | `ALL`                    | 0.85                          |             |
+| `highway=trunk; cycleway=track`                                                 | `BICYCLE_AND_CAR`        | 0.95                          |             |
+| `highway=trunk_link; cycleway=track`                                            | `BICYCLE_AND_CAR`        | 0.85                          |             |
+| `present(highway); cycleway=opposite_track`                                     | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.75  |             |
+| `highway=service; cycleway=opposite_track`                                      | `ALL`                    | forward: 1.1 
               back: 0.65  |             |
+| `highway=residential; cycleway=opposite_track`                                  | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=residential_link; cycleway=opposite_track`                             | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=tertiary; cycleway=opposite_track`                                     | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=tertiary_link; cycleway=opposite_track`                                | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=secondary; cycleway=opposite_track`                                    | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=secondary_link; cycleway=opposite_track`                               | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=primary; cycleway=opposite_track`                                      | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=primary_link; cycleway=opposite_track`                                 | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=trunk; cycleway=opposite_track`                                        | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 0.95 |             |
+| `highway=trunk_link; cycleway=opposite_track`                                   | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 0.85 |             |
+| `present(highway); cycleway=shared_lane`                                        | `PEDESTRIAN_AND_BICYCLE` | 0.77                          |             |
+| `highway=service; cycleway=shared_lane`                                         | `ALL`                    | 0.73                          |             |
+| `highway=residential; cycleway=shared_lane`                                     | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=shared_lane`                                | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=shared_lane`                                        | `ALL`                    | 0.83                          |             |
+| `highway=tertiary_link; cycleway=shared_lane`                                   | `ALL`                    | 0.83                          |             |
+| `highway=secondary; cycleway=shared_lane`                                       | `ALL`                    | 1.25                          |             |
+| `highway=secondary_link; cycleway=shared_lane`                                  | `ALL`                    | 1.25                          |             |
+| `highway=primary; cycleway=shared_lane`                                         | `ALL`                    | 1.75                          |             |
+| `highway=primary_link; cycleway=shared_lane`                                    | `ALL`                    | 1.75                          |             |
+| `present(highway); cycleway=opposite`                                           | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 1.4   |             |
+| `highway=service; cycleway=opposite`                                            | `ALL`                    | 1.1                           |             |
+| `highway=residential; cycleway=opposite`                                        | `ALL`                    | 0.98                          |             |
+| `highway=residential_link; cycleway=opposite`                                   | `ALL`                    | 0.98                          |             |
+| `highway=tertiary; cycleway=opposite`                                           | `ALL`                    |                               |             |
+| `highway=tertiary_link; cycleway=opposite`                                      | `ALL`                    |                               |             |
+| `highway=secondary; cycleway=opposite`                                          | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=secondary_link; cycleway=opposite`                                     | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=primary; cycleway=opposite`                                            | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=primary_link; cycleway=opposite`                                       | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=path; bicycle=designated`                                              | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=footway; bicycle=designated`                                           | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=footway; bicycle=yes; area=yes`                                        | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=pedestrian; bicycle=designated`                                        | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `footway=sidewalk; highway=footway; bicycle=yes`                                | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `footway=sidewalk; highway=footway; bicycle=designated`                         | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=footway; footway=crossing`                                             | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `highway=footway; footway=crossing; bicycle=designated`                         | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=track; bicycle=yes`                                                    | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated`                                             | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; bicycle=yes; present(surface)`                                  | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated; present(surface)`                           | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; present(surface)`                                               | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `present(highway); bicycle=designated`                                          | `ALL`                    | 0.97                          |             |
+| `highway=service; bicycle=designated`                                           | `ALL`                    | 0.84                          |             |
+| `highway=residential; bicycle=designated`                                       | `ALL`                    | 0.95                          |             |
+| `highway=unclassified; bicycle=designated`                                      | `ALL`                    | 0.95                          |             |
+| `highway=residential_link; bicycle=designated`                                  | `ALL`                    | 0.95                          |             |
+| `highway=tertiary; bicycle=designated`                                          | `ALL`                    | 0.97                          |             |
+| `highway=tertiary_link; bicycle=designated`                                     | `ALL`                    | 0.97                          |             |
+| `highway=secondary; bicycle=designated`                                         | `ALL`                    | 1.46                          |             |
+| `highway=secondary_link; bicycle=designated`                                    | `ALL`                    | 1.46                          |             |
+| `highway=primary; bicycle=designated`                                           | `ALL`                    | 2.0                           |             |
+| `highway=primary_link; bicycle=designated`                                      | `ALL`                    | 2.0                           |             |
+| `highway=trunk; bicycle=designated`                                             | `BICYCLE_AND_CAR`        | 7.25                          |             |
+| `highway=trunk_link; bicycle=designated`                                        | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway; bicycle=designated`                                          | `BICYCLE_AND_CAR`        | 7.76                          |             |
+| `highway=motorway_link; bicycle=designated`                                     | `BICYCLE_AND_CAR`        | 2.0                           |             |
 
 
 
-
-
-
-
              Rule #0
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #13
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #14
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #16
              
-
-**Specifier:** `highway=trunk; tunnel=yes`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #17
              
-
-**Specifier:** `motorroad=yes`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #18
              
-
-**Specifier:** `present(highway); informal=yes`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `highway=service; access=private`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `highway=trail`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `present(highway); seasonal=winter`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #22
              
-
-**Specifier:** `present(highway); ice_road=yes`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #23
              
-
-**Specifier:** `present(highway); winter_road=yes`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `highway=cycleway; segregated=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.1, back: 1.1 
-
-
              Rule #27
              
-
-**Specifier:** `highway=footway; bridge=yes`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=footway; tunnel=yes`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #29
              
-
-**Specifier:** `highway=cycleway; bridge=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #30
              
-
-**Specifier:** `highway=cycleway; tunnel=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #31
              
-
-**Specifier:** `highway=footway; footway=crossing; crossing=traffic_signals`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.1, back: 1.1 
-
-
              Rule #32
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.2, back: 1.2 
-
-
              Rule #33
              
-
-**Specifier:** `highway=cycleway; cycleway=crossing; segregated=yes; crossing=traffic_signals`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.1, back: 1.1 
-
-
              Rule #34
              
-
-**Specifier:** `highway=cycleway; footway=crossing; segregated=yes; crossing=traffic_signals`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.1, back: 1.1 
-
-
              Rule #35
              
-
-**Specifier:** `highway=cycleway; cycleway=crossing; segregated=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.2, back: 1.2   
-**Walk safety factor:** forward: 1.2, back: 1.2 
-
-
              Rule #36
              
-
-**Specifier:** `highway=cycleway; footway=crossing; segregated=yes`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.2, back: 1.2   
-**Walk safety factor:** forward: 1.2, back: 1.2 
-
-
              Rule #37
              
-
-**Specifier:** `highway=cycleway; cycleway=crossing; crossing=traffic_signals`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.15, back: 1.15 
-
-
              Rule #38
              
-
-**Specifier:** `highway=cycleway; footway=crossing; crossing=traffic_signals`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.15, back: 1.15 
-
-
              Rule #39
              
-
-**Specifier:** `highway=cycleway; cycleway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.2, back: 1.2   
-**Walk safety factor:** forward: 1.25, back: 1.25 
-
-
              Rule #40
              
-
-**Specifier:** `highway=cycleway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.2, back: 1.2   
-**Walk safety factor:** forward: 1.25, back: 1.25 
-
-
              Rule #41
              
-
-**Specifier:** `highway=cycleway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #42
              
-
-**Specifier:** `highway=service; tunnel=yes; access=destination`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `highway=service; access=destination`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #44
              
-
-**Specifier:** `mtb:scale=3`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #45
              
-
-**Specifier:** `mtb:scale=4`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #46
              
-
-**Specifier:** `mtb:scale=5`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #47
              
-
-**Specifier:** `mtb:scale=6`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #48
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #49
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #50
              
-
-**Specifier:** `highway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #51
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #52
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #53
              
-
-**Specifier:** `railway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #54
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #55
              
-
-**Specifier:** `mtb:scale=1`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #56
              
-
-**Specifier:** `mtb:scale=2`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #57
              
-
-**Specifier:** `mtb:scale=0`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #58
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #59
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #60
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #61
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #62
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #63
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #64
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #65
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #66
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #67
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #68
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #69
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #70
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #71
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #72
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #73
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #74
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #75
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #76
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #77
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #78
              
-
-**Specifier:** `highway=motorway_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #79
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #80
              
-
-**Specifier:** `highway=motorway`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 8.0, back: 8.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #81
              
-
-**Specifier:** `present(highway); cycleway=lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #82
              
-
-**Specifier:** `highway=service; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #83
              
-
-**Specifier:** `highway=residential; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #84
              
-
-**Specifier:** `highway=residential_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #85
              
-
-**Specifier:** `highway=tertiary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #86
              
-
-**Specifier:** `highway=tertiary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #87
              
-
-**Specifier:** `highway=secondary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #88
              
-
-**Specifier:** `highway=secondary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #89
              
-
-**Specifier:** `highway=primary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #90
              
-
-**Specifier:** `highway=primary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #91
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #92
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #93
              
-
-**Specifier:** `highway=motorway; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #94
              
-
-**Specifier:** `highway=motorway_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #95
              
-
-**Specifier:** `present(highway); cycleway=share_busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #96
              
-
-**Specifier:** `highway=service; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #97
              
-
-**Specifier:** `highway=residential; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #98
              
-
-**Specifier:** `highway=residential_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #99
              
-
-**Specifier:** `highway=tertiary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #100
              
-
-**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #101
              
-
-**Specifier:** `highway=secondary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #102
              
-
-**Specifier:** `highway=secondary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #103
              
-
-**Specifier:** `highway=primary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #104
              
-
-**Specifier:** `highway=primary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #105
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #106
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #107
              
-
-**Specifier:** `highway=motorway; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #108
              
-
-**Specifier:** `highway=motorway_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #109
              
-
-**Specifier:** `present(highway); cycleway=opposite_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #110
              
-
-**Specifier:** `highway=service; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #111
              
-
-**Specifier:** `highway=residential; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #112
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #113
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #114
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #115
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #116
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #117
              
-
-**Specifier:** `highway=primary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #118
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #119
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #120
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #121
              
-
-**Specifier:** `present(highway); cycleway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #122
              
-
-**Specifier:** `highway=service; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #123
              
-
-**Specifier:** `highway=residential; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #124
              
-
-**Specifier:** `highway=residential_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #125
              
-
-**Specifier:** `highway=tertiary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #126
              
-
-**Specifier:** `highway=tertiary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #127
              
-
-**Specifier:** `highway=secondary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #128
              
-
-**Specifier:** `highway=secondary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #129
              
-
-**Specifier:** `highway=primary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #130
              
-
-**Specifier:** `highway=primary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #131
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #132
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #133
              
-
-**Specifier:** `present(highway); cycleway=opposite_track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #134
              
-
-**Specifier:** `highway=service; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #135
              
-
-**Specifier:** `highway=residential; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #136
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #137
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #138
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #139
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #140
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #141
              
-
-**Specifier:** `highway=primary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #142
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #143
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #144
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #145
              
-
-**Specifier:** `present(highway); cycleway=shared_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #146
              
-
-**Specifier:** `highway=service; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.73, back: 0.73   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #147
              
-
-**Specifier:** `highway=residential; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #148
              
-
-**Specifier:** `highway=residential_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #149
              
-
-**Specifier:** `highway=tertiary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #150
              
-
-**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #151
              
-
-**Specifier:** `highway=secondary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #152
              
-
-**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #153
              
-
-**Specifier:** `highway=primary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #154
              
-
-**Specifier:** `highway=primary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #155
              
-
-**Specifier:** `present(highway); cycleway=opposite`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.4   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #156
              
-
-**Specifier:** `highway=service; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #157
              
-
-**Specifier:** `highway=residential; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #158
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #159
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #160
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #161
              
-
-**Specifier:** `highway=secondary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #162
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #163
              
-
-**Specifier:** `highway=primary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #164
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #165
              
-
-**Specifier:** `highway=path; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #166
              
-
-**Specifier:** `highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #167
              
-
-**Specifier:** `highway=footway; bicycle=yes; area=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #168
              
-
-**Specifier:** `highway=pedestrian; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #169
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #170
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #171
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #172
              
-
-**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #173
              
-
-**Specifier:** `highway=track; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #174
              
-
-**Specifier:** `highway=track; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #175
              
-
-**Specifier:** `highway=track; bicycle=yes; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #176
              
-
-**Specifier:** `highway=track; bicycle=designated; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #177
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #178
              
-
-**Specifier:** `present(highway); bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #179
              
-
-**Specifier:** `highway=service; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.84, back: 0.84   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #180
              
-
-**Specifier:** `highway=residential; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #181
              
-
-**Specifier:** `highway=unclassified; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #182
              
-
-**Specifier:** `highway=residential_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #183
              
-
-**Specifier:** `highway=tertiary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #184
              
-
-**Specifier:** `highway=tertiary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #185
              
-
-**Specifier:** `highway=secondary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #186
              
-
-**Specifier:** `highway=secondary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #187
              
-
-**Specifier:** `highway=primary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #188
              
-
-**Specifier:** `highway=primary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #189
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #190
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #191
              
-
-**Specifier:** `highway=motorway; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.76, back: 7.76   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #192
              
-
-**Specifier:** `highway=motorway_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
+### Safety mixins
 
 Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+permission of an OSM way. Their safety values are multiplied with the base values from the selected
+way properties. Multiple mixins can apply to the same way and their effects compound.
 
 
 
diff --git a/docs/osm/Germany.md b/docs/osm/Germany.md
index 7cd6cbf91cf..9420e22025e 100644
--- a/docs/osm/Germany.md
+++ b/docs/osm/Germany.md
@@ -1,1292 +1,183 @@
-## OSM tag mapping
+# OSM tag mapping
 
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+
 These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+Lower safety values make an OSM way more desirable and higher values less desirable.
 
 
 
 
-| specifier                                               | permission             | safety |
-|---------------------------------------------------------|------------------------|--------|
-| `highway=track`                                         | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=residential; junction=roundabout`              | ALL                    | 🚴     |
-| `present(highway); junction=roundabout`                 | BICYCLE_AND_CAR        |        |
-| `highway=pedestrian`                                    | PEDESTRIAN             |        |
-| `highway=residential; maxspeed=30`                      | ALL                    | 🚴     |
-| `highway=footway; bicycle=yes`                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=unclassified; cycleway=lane`                   | ALL                    | 🚴     |
-| `mtb:scale=3`                                           | NONE                   |        |
-| `mtb:scale=4`                                           | NONE                   |        |
-| `mtb:scale=5`                                           | NONE                   |        |
-| `mtb:scale=6`                                           | NONE                   |        |
-| `highway=corridor`                                      | PEDESTRIAN             |        |
-| `highway=steps`                                         | PEDESTRIAN             |        |
-| `highway=crossing`                                      | PEDESTRIAN             |        |
-| `highway=platform`                                      | PEDESTRIAN             |        |
-| `public_transport=platform`                             | PEDESTRIAN             |        |
-| `railway=platform`                                      | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
-| `mtb:scale=1`                                           | PEDESTRIAN             |        |
-| `mtb:scale=2`                                           | PEDESTRIAN             |        |
-| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                 | ALL                    | 🚴     |
-| `highway=unclassified`                                  | ALL                    |        |
-| `highway=road`                                          | ALL                    |        |
-| `highway=byway`                                         | ALL                    | 🚴     |
-| `highway=track`                                         | ALL                    | 🚴     |
-| `highway=service`                                       | ALL                    | 🚴     |
-| `highway=residential`                                   | ALL                    | 🚴     |
-| `highway=residential_link`                              | ALL                    | 🚴     |
-| `highway=tertiary`                                      | ALL                    |        |
-| `highway=tertiary_link`                                 | ALL                    |        |
-| `highway=secondary`                                     | ALL                    | 🚴     |
-| `highway=secondary_link`                                | ALL                    | 🚴     |
-| `highway=primary`                                       | ALL                    | 🚴     |
-| `highway=primary_link`                                  | ALL                    | 🚴     |
-| `highway=trunk_link`                                    | CAR                    | 🚴     |
-| `highway=motorway_link`                                 | CAR                    | 🚴     |
-| `highway=trunk`                                         | CAR                    | 🚴     |
-| `highway=motorway`                                      | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+| specifier                                               | permission               | bike safety                   | walk safety |
+|---------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `highway=track`                                         | `PEDESTRIAN_AND_BICYCLE` |                               |             |
+| `highway=track; present(surface)`                       | `PEDESTRIAN_AND_BICYCLE` |                               |             |
+| `highway=residential; junction=roundabout`              | `ALL`                    | 0.98                          |             |
+| `present(highway); junction=roundabout`                 | `BICYCLE_AND_CAR`        |                               |             |
+| `highway=pedestrian`                                    | `PEDESTRIAN`             |                               |             |
+| `highway=residential; maxspeed=30`                      | `ALL`                    | 0.9                           |             |
+| `highway=footway; bicycle=yes`                          | `PEDESTRIAN_AND_BICYCLE` | 0.8                           |             |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | `PEDESTRIAN_AND_BICYCLE` | 1.2                           |             |
+| `highway=unclassified; cycleway=lane`                   | `ALL`                    | 0.87                          |             |
+| `mtb:scale=3`                                           | `NONE`                   |                               |             |
+| `mtb:scale=4`                                           | `NONE`                   |                               |             |
+| `mtb:scale=5`                                           | `NONE`                   |                               |             |
+| `mtb:scale=6`                                           | `NONE`                   |                               |             |
+| `highway=corridor`                                      | `PEDESTRIAN`             |                               |             |
+| `highway=steps`                                         | `PEDESTRIAN`             |                               |             |
+| `highway=crossing`                                      | `PEDESTRIAN`             |                               |             |
+| `highway=platform`                                      | `PEDESTRIAN`             |                               |             |
+| `public_transport=platform`                             | `PEDESTRIAN`             |                               |             |
+| `railway=platform`                                      | `PEDESTRIAN`             |                               |             |
+| `footway=sidewalk; highway=footway`                     | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=1`                                           | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=2`                                           | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=0`                                           | `PEDESTRIAN_AND_BICYCLE` |                               |             |
+| `highway=cycleway`                                      | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=path`                                          | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=pedestrian`                                    | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=footway`                                       | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=bridleway`                                     | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `highway=living_street`                                 | `ALL`                    | 0.9                           |             |
+| `highway=unclassified`                                  | `ALL`                    |                               |             |
+| `highway=road`                                          | `ALL`                    |                               |             |
+| `highway=byway`                                         | `ALL`                    | 1.3                           |             |
+| `highway=track`                                         | `ALL`                    | 1.3                           |             |
+| `highway=service`                                       | `ALL`                    | 1.1                           |             |
+| `highway=residential`                                   | `ALL`                    | 0.98                          |             |
+| `highway=residential_link`                              | `ALL`                    | 0.98                          |             |
+| `highway=tertiary`                                      | `ALL`                    |                               |             |
+| `highway=tertiary_link`                                 | `ALL`                    |                               |             |
+| `highway=secondary`                                     | `ALL`                    | 1.5                           |             |
+| `highway=secondary_link`                                | `ALL`                    | 1.5                           |             |
+| `highway=primary`                                       | `ALL`                    | 2.06                          |             |
+| `highway=primary_link`                                  | `ALL`                    | 2.06                          |             |
+| `highway=trunk_link`                                    | `CAR`                    | 2.06                          |             |
+| `highway=motorway_link`                                 | `CAR`                    | 2.06                          |             |
+| `highway=trunk`                                         | `CAR`                    | 7.47                          |             |
+| `highway=motorway`                                      | `CAR`                    | 8.0                           |             |
+| `present(highway); cycleway=lane`                       | `PEDESTRIAN_AND_BICYCLE` | 0.87                          |             |
+| `highway=service; cycleway=lane`                        | `ALL`                    | 0.77                          |             |
+| `highway=residential; cycleway=lane`                    | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=lane`               | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=lane`                       | `ALL`                    | 0.87                          |             |
+| `highway=tertiary_link; cycleway=lane`                  | `ALL`                    | 0.87                          |             |
+| `highway=secondary; cycleway=lane`                      | `ALL`                    | 0.96                          |             |
+| `highway=secondary_link; cycleway=lane`                 | `ALL`                    | 0.96                          |             |
+| `highway=primary; cycleway=lane`                        | `ALL`                    | 1.15                          |             |
+| `highway=primary_link; cycleway=lane`                   | `ALL`                    | 1.15                          |             |
+| `highway=trunk; cycleway=lane`                          | `BICYCLE_AND_CAR`        | 1.5                           |             |
+| `highway=trunk_link; cycleway=lane`                     | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `highway=motorway; cycleway=lane`                       | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway_link; cycleway=lane`                  | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `present(highway); cycleway=share_busway`               | `PEDESTRIAN_AND_BICYCLE` | 0.92                          |             |
+| `highway=service; cycleway=share_busway`                | `ALL`                    | 0.85                          |             |
+| `highway=residential; cycleway=share_busway`            | `ALL`                    | 0.85                          |             |
+| `highway=residential_link; cycleway=share_busway`       | `ALL`                    | 0.85                          |             |
+| `highway=tertiary; cycleway=share_busway`               | `ALL`                    | 0.92                          |             |
+| `highway=tertiary_link; cycleway=share_busway`          | `ALL`                    | 0.92                          |             |
+| `highway=secondary; cycleway=share_busway`              | `ALL`                    | 0.99                          |             |
+| `highway=secondary_link; cycleway=share_busway`         | `ALL`                    | 0.99                          |             |
+| `highway=primary; cycleway=share_busway`                | `ALL`                    | 1.25                          |             |
+| `highway=primary_link; cycleway=share_busway`           | `ALL`                    | 1.25                          |             |
+| `highway=trunk; cycleway=share_busway`                  | `BICYCLE_AND_CAR`        | 1.75                          |             |
+| `highway=trunk_link; cycleway=share_busway`             | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `highway=motorway; cycleway=share_busway`               | `BICYCLE_AND_CAR`        | 2.5                           |             |
+| `highway=motorway_link; cycleway=share_busway`          | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `present(highway); cycleway=opposite_lane`              | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.87  |             |
+| `highway=service; cycleway=opposite_lane`               | `ALL`                    | forward: 1.1 
               back: 0.77  |             |
+| `highway=residential; cycleway=opposite_lane`           | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=residential_link; cycleway=opposite_lane`      | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=tertiary; cycleway=opposite_lane`              | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=tertiary_link; cycleway=opposite_lane`         | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=secondary; cycleway=opposite_lane`             | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=secondary_link; cycleway=opposite_lane`        | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=primary; cycleway=opposite_lane`               | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=primary_link; cycleway=opposite_lane`          | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=trunk; cycleway=opposite_lane`                 | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 1.5  |             |
+| `highway=trunk_link; cycleway=opposite_lane`            | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 1.15 |             |
+| `present(highway); cycleway=track`                      | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=service; cycleway=track`                       | `ALL`                    | 0.65                          |             |
+| `highway=residential; cycleway=track`                   | `ALL`                    | 0.65                          |             |
+| `highway=residential_link; cycleway=track`              | `ALL`                    | 0.65                          |             |
+| `highway=tertiary; cycleway=track`                      | `ALL`                    | 0.75                          |             |
+| `highway=tertiary_link; cycleway=track`                 | `ALL`                    | 0.75                          |             |
+| `highway=secondary; cycleway=track`                     | `ALL`                    | 0.8                           |             |
+| `highway=secondary_link; cycleway=track`                | `ALL`                    | 0.8                           |             |
+| `highway=primary; cycleway=track`                       | `ALL`                    | 0.85                          |             |
+| `highway=primary_link; cycleway=track`                  | `ALL`                    | 0.85                          |             |
+| `highway=trunk; cycleway=track`                         | `BICYCLE_AND_CAR`        | 0.95                          |             |
+| `highway=trunk_link; cycleway=track`                    | `BICYCLE_AND_CAR`        | 0.85                          |             |
+| `present(highway); cycleway=opposite_track`             | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.75  |             |
+| `highway=service; cycleway=opposite_track`              | `ALL`                    | forward: 1.1 
               back: 0.65  |             |
+| `highway=residential; cycleway=opposite_track`          | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=residential_link; cycleway=opposite_track`     | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=tertiary; cycleway=opposite_track`             | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=tertiary_link; cycleway=opposite_track`        | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=secondary; cycleway=opposite_track`            | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=secondary_link; cycleway=opposite_track`       | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=primary; cycleway=opposite_track`              | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=primary_link; cycleway=opposite_track`         | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=trunk; cycleway=opposite_track`                | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 0.95 |             |
+| `highway=trunk_link; cycleway=opposite_track`           | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 0.85 |             |
+| `present(highway); cycleway=shared_lane`                | `PEDESTRIAN_AND_BICYCLE` | 0.77                          |             |
+| `highway=service; cycleway=shared_lane`                 | `ALL`                    | 0.73                          |             |
+| `highway=residential; cycleway=shared_lane`             | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=shared_lane`        | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=shared_lane`                | `ALL`                    | 0.83                          |             |
+| `highway=tertiary_link; cycleway=shared_lane`           | `ALL`                    | 0.83                          |             |
+| `highway=secondary; cycleway=shared_lane`               | `ALL`                    | 1.25                          |             |
+| `highway=secondary_link; cycleway=shared_lane`          | `ALL`                    | 1.25                          |             |
+| `highway=primary; cycleway=shared_lane`                 | `ALL`                    | 1.75                          |             |
+| `highway=primary_link; cycleway=shared_lane`            | `ALL`                    | 1.75                          |             |
+| `present(highway); cycleway=opposite`                   | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 1.4   |             |
+| `highway=service; cycleway=opposite`                    | `ALL`                    | 1.1                           |             |
+| `highway=residential; cycleway=opposite`                | `ALL`                    | 0.98                          |             |
+| `highway=residential_link; cycleway=opposite`           | `ALL`                    | 0.98                          |             |
+| `highway=tertiary; cycleway=opposite`                   | `ALL`                    |                               |             |
+| `highway=tertiary_link; cycleway=opposite`              | `ALL`                    |                               |             |
+| `highway=secondary; cycleway=opposite`                  | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=secondary_link; cycleway=opposite`             | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=primary; cycleway=opposite`                    | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=primary_link; cycleway=opposite`               | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=path; bicycle=designated`                      | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=footway; bicycle=designated`                   | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=footway; bicycle=yes; area=yes`                | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=pedestrian; bicycle=designated`                | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `footway=sidewalk; highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=footway; footway=crossing`                     | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `highway=footway; footway=crossing; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=track; bicycle=yes`                            | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated`                     | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; bicycle=yes; present(surface)`          | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated; present(surface)`   | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; present(surface)`                       | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `present(highway); bicycle=designated`                  | `ALL`                    | 0.97                          |             |
+| `highway=service; bicycle=designated`                   | `ALL`                    | 0.84                          |             |
+| `highway=residential; bicycle=designated`               | `ALL`                    | 0.95                          |             |
+| `highway=unclassified; bicycle=designated`              | `ALL`                    | 0.95                          |             |
+| `highway=residential_link; bicycle=designated`          | `ALL`                    | 0.95                          |             |
+| `highway=tertiary; bicycle=designated`                  | `ALL`                    | 0.97                          |             |
+| `highway=tertiary_link; bicycle=designated`             | `ALL`                    | 0.97                          |             |
+| `highway=secondary; bicycle=designated`                 | `ALL`                    | 1.46                          |             |
+| `highway=secondary_link; bicycle=designated`            | `ALL`                    | 1.46                          |             |
+| `highway=primary; bicycle=designated`                   | `ALL`                    | 2.0                           |             |
+| `highway=primary_link; bicycle=designated`              | `ALL`                    | 2.0                           |             |
+| `highway=trunk; bicycle=designated`                     | `BICYCLE_AND_CAR`        | 7.25                          |             |
+| `highway=trunk_link; bicycle=designated`                | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway; bicycle=designated`                  | `BICYCLE_AND_CAR`        | 7.76                          |             |
+| `highway=motorway_link; bicycle=designated`             | `BICYCLE_AND_CAR`        | 2.0                           |             |
 
 
 
-
-
-
-
              Rule #0
              
-
-**Specifier:** `highway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `highway=residential; junction=roundabout`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `present(highway); junction=roundabout`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `highway=residential; maxspeed=30`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.2, back: 1.2   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `highway=unclassified; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `mtb:scale=3`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `mtb:scale=4`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `mtb:scale=5`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `mtb:scale=6`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #13
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #14
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `highway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #16
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #17
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #18
              
-
-**Specifier:** `railway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `mtb:scale=1`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `mtb:scale=2`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #22
              
-
-**Specifier:** `mtb:scale=0`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #23
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #27
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #29
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #30
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #31
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #32
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #33
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #34
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #35
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #36
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #37
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #38
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #39
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #40
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #41
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #42
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `highway=motorway_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #44
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #45
              
-
-**Specifier:** `highway=motorway`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 8.0, back: 8.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #46
              
-
-**Specifier:** `present(highway); cycleway=lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #47
              
-
-**Specifier:** `highway=service; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #48
              
-
-**Specifier:** `highway=residential; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #49
              
-
-**Specifier:** `highway=residential_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #50
              
-
-**Specifier:** `highway=tertiary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #51
              
-
-**Specifier:** `highway=tertiary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #52
              
-
-**Specifier:** `highway=secondary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #53
              
-
-**Specifier:** `highway=secondary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #54
              
-
-**Specifier:** `highway=primary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #55
              
-
-**Specifier:** `highway=primary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #56
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #57
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #58
              
-
-**Specifier:** `highway=motorway; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #59
              
-
-**Specifier:** `highway=motorway_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #60
              
-
-**Specifier:** `present(highway); cycleway=share_busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #61
              
-
-**Specifier:** `highway=service; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #62
              
-
-**Specifier:** `highway=residential; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #63
              
-
-**Specifier:** `highway=residential_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #64
              
-
-**Specifier:** `highway=tertiary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #65
              
-
-**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #66
              
-
-**Specifier:** `highway=secondary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #67
              
-
-**Specifier:** `highway=secondary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #68
              
-
-**Specifier:** `highway=primary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #69
              
-
-**Specifier:** `highway=primary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #70
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #71
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #72
              
-
-**Specifier:** `highway=motorway; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #73
              
-
-**Specifier:** `highway=motorway_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #74
              
-
-**Specifier:** `present(highway); cycleway=opposite_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #75
              
-
-**Specifier:** `highway=service; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #76
              
-
-**Specifier:** `highway=residential; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #77
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #78
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #79
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #80
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #81
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #82
              
-
-**Specifier:** `highway=primary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #83
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #84
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #85
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #86
              
-
-**Specifier:** `present(highway); cycleway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #87
              
-
-**Specifier:** `highway=service; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #88
              
-
-**Specifier:** `highway=residential; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #89
              
-
-**Specifier:** `highway=residential_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #90
              
-
-**Specifier:** `highway=tertiary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #91
              
-
-**Specifier:** `highway=tertiary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #92
              
-
-**Specifier:** `highway=secondary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #93
              
-
-**Specifier:** `highway=secondary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #94
              
-
-**Specifier:** `highway=primary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #95
              
-
-**Specifier:** `highway=primary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #96
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #97
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #98
              
-
-**Specifier:** `present(highway); cycleway=opposite_track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #99
              
-
-**Specifier:** `highway=service; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #100
              
-
-**Specifier:** `highway=residential; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #101
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #102
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #103
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #104
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #105
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #106
              
-
-**Specifier:** `highway=primary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #107
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #108
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #109
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #110
              
-
-**Specifier:** `present(highway); cycleway=shared_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #111
              
-
-**Specifier:** `highway=service; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.73, back: 0.73   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #112
              
-
-**Specifier:** `highway=residential; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #113
              
-
-**Specifier:** `highway=residential_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #114
              
-
-**Specifier:** `highway=tertiary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #115
              
-
-**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #116
              
-
-**Specifier:** `highway=secondary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #117
              
-
-**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #118
              
-
-**Specifier:** `highway=primary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #119
              
-
-**Specifier:** `highway=primary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #120
              
-
-**Specifier:** `present(highway); cycleway=opposite`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.4   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #121
              
-
-**Specifier:** `highway=service; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #122
              
-
-**Specifier:** `highway=residential; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #123
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #124
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #125
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #126
              
-
-**Specifier:** `highway=secondary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #127
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #128
              
-
-**Specifier:** `highway=primary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #129
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #130
              
-
-**Specifier:** `highway=path; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #131
              
-
-**Specifier:** `highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #132
              
-
-**Specifier:** `highway=footway; bicycle=yes; area=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #133
              
-
-**Specifier:** `highway=pedestrian; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #134
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #135
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #136
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #137
              
-
-**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #138
              
-
-**Specifier:** `highway=track; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #139
              
-
-**Specifier:** `highway=track; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #140
              
-
-**Specifier:** `highway=track; bicycle=yes; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #141
              
-
-**Specifier:** `highway=track; bicycle=designated; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #142
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #143
              
-
-**Specifier:** `present(highway); bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #144
              
-
-**Specifier:** `highway=service; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.84, back: 0.84   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #145
              
-
-**Specifier:** `highway=residential; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #146
              
-
-**Specifier:** `highway=unclassified; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #147
              
-
-**Specifier:** `highway=residential_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #148
              
-
-**Specifier:** `highway=tertiary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #149
              
-
-**Specifier:** `highway=tertiary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #150
              
-
-**Specifier:** `highway=secondary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #151
              
-
-**Specifier:** `highway=secondary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #152
              
-
-**Specifier:** `highway=primary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #153
              
-
-**Specifier:** `highway=primary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #154
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #155
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #156
              
-
-**Specifier:** `highway=motorway; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.76, back: 7.76   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #157
              
-
-**Specifier:** `highway=motorway_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
+### Safety mixins
 
 Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+permission of an OSM way. Their safety values are multiplied with the base values from the selected
+way properties. Multiple mixins can apply to the same way and their effects compound.
 
 
 
diff --git a/docs/osm/Norway.md b/docs/osm/Norway.md
index 7237319d738..f0c17c24a6c 100644
--- a/docs/osm/Norway.md
+++ b/docs/osm/Norway.md
@@ -1,388 +1,70 @@
-## OSM tag mapping
+# OSM tag mapping
 
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+
 These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+Lower safety values make an OSM way more desirable and higher values less desirable.
 
 
 
 
-| specifier                                                                                                                                                  | permission             | safety |
-|------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------|--------|
-| `highway one of [motorway, motorway_link]`                                                                                                                 | CAR                    |        |
-| `highway one of [trunk, trunk_link, primary, primary_link]; motorroad=yes`                                                                                 | CAR                    |        |
-| `highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                 | ALL                    |        |
-| `cycleway=track; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]` | ALL                    |        |
-| `cycleway=lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`                             | ALL                    | 🚴     |
-| `cycleway=lane; maxspeed < 50; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`              | ALL                    | 🚴     |
-| `cycleway=lane; highway one of [unclassified, residential]`                                                                                                | ALL                    | 🚴     |
-| `highway=service`                                                                                                                                          | ALL                    |        |
-| `highway=service; service=parking_aisle`                                                                                                                   | ALL                    | 🚴     |
-| `highway=service; service=drive-through`                                                                                                                   | ALL                    | 🚴     |
-| `highway=living_street`                                                                                                                                    | ALL                    | 🚴     |
-| `highway=pedestrian`                                                                                                                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=busway`                                                                                                                                           | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=service; bus one of [yes, designated]`                                                                                                            | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=footway`                                                                                                                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=cycleway`                                                                                                                                         | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; lanes > 1`                                                                                                                              | PEDESTRIAN_AND_BICYCLE | 🚶     |
-| `highway=cycleway; oneway=yes`                                                                                                                             | PEDESTRIAN_AND_BICYCLE | 🚶     |
-| `highway=cycleway; sidewalk one of [yes, left, right, both]`                                                                                               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=cycleway; lanes > 1; sidewalk one of [yes, left, right, both]`                                                                                    | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway; oneway=yes; sidewalk one of [yes, left, right, both]`                                                                                   | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway; foot=designated; segregated=no`                                                                                                         | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=path; foot=designated; bicycle=designated; segregated=no`                                                                                         | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; foot=designated; segregated=yes`                                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path; foot=designated; bicycle=designated; segregated=yes`                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=cycleway; foot=designated; segregated=yes; lanes > 1`                                                                                             | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway; foot=designated; present(segregated); motor_vehicle=destination`                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path; foot=designated; bicycle=designated; present(segregated); motor_vehicle=destination`                                                        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=sidewalk`                                                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=footway; footway=crossing`                                                                                                                        | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=cycleway; cycleway=crossing`                                                                                                                      | PEDESTRIAN_AND_BICYCLE | 🚴 🚶  |
-| `highway=track`                                                                                                                                            | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=bridleway`                                                                                                                                        | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=path`                                                                                                                                             | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=steps`                                                                                                                                            | PEDESTRIAN             |        |
-| `highway=corridor`                                                                                                                                         | PEDESTRIAN             |        |
-| `highway=footway; indoor=yes`                                                                                                                              | PEDESTRIAN             |        |
-| `highway=platform`                                                                                                                                         | PEDESTRIAN             |        |
-| `public_transport=platform`                                                                                                                                | PEDESTRIAN             |        |
-| `trail_visibility one of [bad, low, poor, horrible, no]; highway=path`                                                                                     | NONE                   |        |
-| `sac_scale one of [demanding_mountain_hiking, alpine_hiking, demanding_alpine_hiking, difficult_alpine_hiking]; highway one of [path, steps]`              | NONE                   |        |
-| `smoothness one of [horrible, very_horrible]; highway one of [path, bridleway, track]`                                                                     | PEDESTRIAN             | 🚶     |
-| `smoothness=impassable; highway one of [path, bridleway, track]`                                                                                           | NONE                   |        |
-| `1 > mtb:scale < 2; highway one of [path, bridleway, track]`                                                                                               | PEDESTRIAN             | 🚶     |
-| `mtb:scale > 2; highway one of [path, bridleway, track]`                                                                                                   | NONE                   |        |
+| specifier                                                                                                                                                  | permission               | bike safety | walk safety |
+|------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------|-------------|-------------|
+| `highway one of [motorway, motorway_link]`                                                                                                                 | `CAR`                    |             |             |
+| `highway one of [trunk, trunk_link, primary, primary_link]; motorroad=yes`                                                                                 | `CAR`                    |             |             |
+| `highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`                 | `ALL`                    |             |             |
+| `cycleway=track; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]` | `ALL`                    |             |             |
+| `cycleway=lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`                             | `ALL`                    | 1.27        |             |
+| `cycleway=lane; maxspeed < 50; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`              | `ALL`                    | 1.1         |             |
+| `cycleway=lane; highway one of [unclassified, residential]`                                                                                                | `ALL`                    | 1.1         |             |
+| `highway=service`                                                                                                                                          | `ALL`                    |             |             |
+| `highway=service; service=parking_aisle`                                                                                                                   | `ALL`                    | 2.5         |             |
+| `highway=service; service=drive-through`                                                                                                                   | `ALL`                    | 2.5         |             |
+| `highway=living_street`                                                                                                                                    | `ALL`                    | 1.83        |             |
+| `highway=pedestrian`                                                                                                                                       | `PEDESTRIAN_AND_BICYCLE` | 1.2         |             |
+| `highway=busway`                                                                                                                                           | `PEDESTRIAN_AND_BICYCLE` | 2.37        | 1.9         |
+| `highway=service; bus one of [yes, designated]`                                                                                                            | `PEDESTRIAN_AND_BICYCLE` | 2.37        | 1.9         |
+| `highway=footway`                                                                                                                                          | `PEDESTRIAN_AND_BICYCLE` | 1.42        |             |
+| `highway=cycleway`                                                                                                                                         | `PEDESTRIAN_AND_BICYCLE` | 1.05        | 1.4         |
+| `highway=cycleway; lanes > 1`                                                                                                                              | `PEDESTRIAN_AND_BICYCLE` |             | 1.4         |
+| `highway=cycleway; oneway=yes`                                                                                                                             | `PEDESTRIAN_AND_BICYCLE` |             | 1.4         |
+| `highway=cycleway; sidewalk one of [yes, left, right, both]`                                                                                               | `PEDESTRIAN_AND_BICYCLE` | 1.05        |             |
+| `highway=cycleway; lanes > 1; sidewalk one of [yes, left, right, both]`                                                                                    | `PEDESTRIAN_AND_BICYCLE` |             |             |
+| `highway=cycleway; oneway=yes; sidewalk one of [yes, left, right, both]`                                                                                   | `PEDESTRIAN_AND_BICYCLE` |             |             |
+| `highway=cycleway; foot=designated; segregated=no`                                                                                                         | `PEDESTRIAN_AND_BICYCLE` | 1.05        | 1.15        |
+| `highway=path; foot=designated; bicycle=designated; segregated=no`                                                                                         | `PEDESTRIAN_AND_BICYCLE` | 1.05        | 1.15        |
+| `highway=cycleway; foot=designated; segregated=yes`                                                                                                        | `PEDESTRIAN_AND_BICYCLE` | 1.05        |             |
+| `highway=path; foot=designated; bicycle=designated; segregated=yes`                                                                                        | `PEDESTRIAN_AND_BICYCLE` | 1.05        |             |
+| `highway=cycleway; foot=designated; segregated=yes; lanes > 1`                                                                                             | `PEDESTRIAN_AND_BICYCLE` |             |             |
+| `highway=cycleway; foot=designated; present(segregated); motor_vehicle=destination`                                                                        | `PEDESTRIAN_AND_BICYCLE` | 1.57        |             |
+| `highway=path; foot=designated; bicycle=designated; present(segregated); motor_vehicle=destination`                                                        | `PEDESTRIAN_AND_BICYCLE` | 1.57        |             |
+| `highway=footway; footway=sidewalk`                                                                                                                        | `PEDESTRIAN_AND_BICYCLE` | 1.93        | 1.1         |
+| `highway=footway; footway=crossing`                                                                                                                        | `PEDESTRIAN_AND_BICYCLE` | 2.33        | 1.35        |
+| `highway=cycleway; cycleway=crossing`                                                                                                                      | `PEDESTRIAN_AND_BICYCLE` | 2.33        | 1.35        |
+| `highway=track`                                                                                                                                            | `PEDESTRIAN_AND_BICYCLE` |             |             |
+| `highway=bridleway`                                                                                                                                        | `PEDESTRIAN_AND_BICYCLE` |             |             |
+| `highway=path`                                                                                                                                             | `PEDESTRIAN_AND_BICYCLE` |             |             |
+| `highway=steps`                                                                                                                                            | `PEDESTRIAN`             |             |             |
+| `highway=corridor`                                                                                                                                         | `PEDESTRIAN`             |             |             |
+| `highway=footway; indoor=yes`                                                                                                                              | `PEDESTRIAN`             |             |             |
+| `highway=platform`                                                                                                                                         | `PEDESTRIAN`             |             |             |
+| `public_transport=platform`                                                                                                                                | `PEDESTRIAN`             |             |             |
+| `trail_visibility one of [bad, low, poor, horrible, no]; highway=path`                                                                                     | `NONE`                   |             |             |
+| `sac_scale one of [demanding_mountain_hiking, alpine_hiking, demanding_alpine_hiking, difficult_alpine_hiking]; highway one of [path, steps]`              | `NONE`                   |             |             |
+| `smoothness one of [horrible, very_horrible]; highway one of [path, bridleway, track]`                                                                     | `PEDESTRIAN`             |             | 1.15        |
+| `smoothness=impassable; highway one of [path, bridleway, track]`                                                                                           | `NONE`                   |             |             |
+| `1 > mtb:scale < 2; highway one of [path, bridleway, track]`                                                                                               | `PEDESTRIAN`             |             | 1.15        |
+| `mtb:scale > 2; highway one of [path, bridleway, track]`                                                                                                   | `NONE`                   |             |             |
 
 
 
-
-
-
-
              Rule #0
              
-
-**Specifier:** `highway one of [motorway, motorway_link]`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `highway one of [trunk, trunk_link, primary, primary_link]; motorroad=yes`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `cycleway=track; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link, unclassified, residential]`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `cycleway=lane; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.27, back: 1.27   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `cycleway=lane; maxspeed < 50; highway one of [trunk, trunk_link, primary, primary_link, secondary, secondary_link, tertiary, tertiary_link]`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `cycleway=lane; highway one of [unclassified, residential]`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `highway=service; service=parking_aisle`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `highway=service; service=drive-through`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.83, back: 1.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.2, back: 1.2   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `highway=busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.37, back: 2.37   
-**Walk safety factor:** forward: 1.9, back: 1.9 
-
-
              Rule #13
              
-
-**Specifier:** `highway=service; bus one of [yes, designated]`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.37, back: 2.37   
-**Walk safety factor:** forward: 1.9, back: 1.9 
-
-
              Rule #14
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.42, back: 1.42   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.05, back: 1.05   
-**Walk safety factor:** forward: 1.4, back: 1.4 
-
-
              Rule #16
              
-
-**Specifier:** `highway=cycleway; lanes > 1`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.4, back: 1.4 
-
-
              Rule #17
              
-
-**Specifier:** `highway=cycleway; oneway=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.4, back: 1.4 
-
-
              Rule #18
              
-
-**Specifier:** `highway=cycleway; sidewalk one of [yes, left, right, both]`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.05, back: 1.05   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `highway=cycleway; lanes > 1; sidewalk one of [yes, left, right, both]`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `highway=cycleway; oneway=yes; sidewalk one of [yes, left, right, both]`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `highway=cycleway; foot=designated; segregated=no`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.05, back: 1.05   
-**Walk safety factor:** forward: 1.15, back: 1.15 
-
-
              Rule #22
              
-
-**Specifier:** `highway=path; foot=designated; bicycle=designated; segregated=no`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.05, back: 1.05   
-**Walk safety factor:** forward: 1.15, back: 1.15 
-
-
              Rule #23
              
-
-**Specifier:** `highway=cycleway; foot=designated; segregated=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.05, back: 1.05   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `highway=path; foot=designated; bicycle=designated; segregated=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.05, back: 1.05   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `highway=cycleway; foot=designated; segregated=yes; lanes > 1`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `highway=cycleway; foot=designated; present(segregated); motor_vehicle=destination`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.57, back: 1.57   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #27
              
-
-**Specifier:** `highway=path; foot=designated; bicycle=designated; present(segregated); motor_vehicle=destination`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.57, back: 1.57   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=footway; footway=sidewalk`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.93, back: 1.93   
-**Walk safety factor:** forward: 1.1, back: 1.1 
-
-
              Rule #29
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.33, back: 2.33   
-**Walk safety factor:** forward: 1.35, back: 1.35 
-
-
              Rule #30
              
-
-**Specifier:** `highway=cycleway; cycleway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.33, back: 2.33   
-**Walk safety factor:** forward: 1.35, back: 1.35 
-
-
              Rule #31
              
-
-**Specifier:** `highway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #32
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #33
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #34
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #35
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #36
              
-
-**Specifier:** `highway=footway; indoor=yes`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #37
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #38
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #39
              
-
-**Specifier:** `trail_visibility one of [bad, low, poor, horrible, no]; highway=path`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #40
              
-
-**Specifier:** `sac_scale one of [demanding_mountain_hiking, alpine_hiking, demanding_alpine_hiking, difficult_alpine_hiking]; highway one of [path, steps]`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #41
              
-
-**Specifier:** `smoothness one of [horrible, very_horrible]; highway one of [path, bridleway, track]`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.15, back: 1.15 
-
-
              Rule #42
              
-
-**Specifier:** `smoothness=impassable; highway one of [path, bridleway, track]`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `1 > mtb:scale < 2; highway one of [path, bridleway, track]`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.15, back: 1.15 
-
-
              Rule #44
              
-
-**Specifier:** `mtb:scale > 2; highway one of [path, bridleway, track]`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
+### Safety mixins
 
 Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+permission of an OSM way. Their safety values are multiplied with the base values from the selected
+way properties. Multiple mixins can apply to the same way and their effects compound.
 
 
 
diff --git a/docs/osm/UK.md b/docs/osm/UK.md
index 26376a29f17..3dd77b1b393 100644
--- a/docs/osm/UK.md
+++ b/docs/osm/UK.md
@@ -1,1332 +1,188 @@
-## OSM tag mapping
+# OSM tag mapping
 
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
+
 These factors determine how desirable an OSM way is when routing for cyclists and pedestrians.
+Lower safety values make an OSM way more desirable and higher values less desirable.
 
 
 
 
-| specifier                                               | permission             | safety |
-|---------------------------------------------------------|------------------------|--------|
-| `highway=trunk_link`                                    | ALL                    | 🚴     |
-| `highway=trunk`                                         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | ALL                    | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | ALL                    | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | ALL                    | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | ALL                    | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | ALL                    | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | ALL                    | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | ALL                    | 🚴     |
-| `mtb:scale=3`                                           | NONE                   |        |
-| `mtb:scale=4`                                           | NONE                   |        |
-| `mtb:scale=5`                                           | NONE                   |        |
-| `mtb:scale=6`                                           | NONE                   |        |
-| `highway=corridor`                                      | PEDESTRIAN             |        |
-| `highway=steps`                                         | PEDESTRIAN             |        |
-| `highway=crossing`                                      | PEDESTRIAN             |        |
-| `highway=platform`                                      | PEDESTRIAN             |        |
-| `public_transport=platform`                             | PEDESTRIAN             |        |
-| `railway=platform`                                      | PEDESTRIAN             |        |
-| `footway=sidewalk; highway=footway`                     | PEDESTRIAN             |        |
-| `mtb:scale=1`                                           | PEDESTRIAN             |        |
-| `mtb:scale=2`                                           | PEDESTRIAN             |        |
-| `mtb:scale=0`                                           | PEDESTRIAN_AND_BICYCLE |        |
-| `highway=cycleway`                                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=path`                                          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian`                                    | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway`                                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=bridleway`                                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=living_street`                                 | ALL                    | 🚴     |
-| `highway=unclassified`                                  | ALL                    |        |
-| `highway=road`                                          | ALL                    |        |
-| `highway=byway`                                         | ALL                    | 🚴     |
-| `highway=track`                                         | ALL                    | 🚴     |
-| `highway=service`                                       | ALL                    | 🚴     |
-| `highway=residential`                                   | ALL                    | 🚴     |
-| `highway=residential_link`                              | ALL                    | 🚴     |
-| `highway=tertiary`                                      | ALL                    |        |
-| `highway=tertiary_link`                                 | ALL                    |        |
-| `highway=secondary`                                     | ALL                    | 🚴     |
-| `highway=secondary_link`                                | ALL                    | 🚴     |
-| `highway=primary`                                       | ALL                    | 🚴     |
-| `highway=primary_link`                                  | ALL                    | 🚴     |
-| `highway=trunk_link`                                    | CAR                    | 🚴     |
-| `highway=motorway_link`                                 | CAR                    | 🚴     |
-| `highway=trunk`                                         | CAR                    | 🚴     |
-| `highway=motorway`                                      | CAR                    | 🚴     |
-| `present(highway); cycleway=lane`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=residential; cycleway=lane`                    | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=lane`               | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=lane`                       | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=lane`                  | ALL                    | 🚴     |
-| `highway=secondary; cycleway=lane`                      | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=lane`                 | ALL                    | 🚴     |
-| `highway=primary; cycleway=lane`                        | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=lane`                   | ALL                    | 🚴     |
-| `highway=trunk; cycleway=lane`                          | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=lane`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=lane`                       | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=lane`                  | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=share_busway`               | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=residential; cycleway=share_busway`            | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=share_busway`       | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=share_busway`               | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=share_busway`          | ALL                    | 🚴     |
-| `highway=secondary; cycleway=share_busway`              | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=share_busway`         | ALL                    | 🚴     |
-| `highway=primary; cycleway=share_busway`                | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=share_busway`           | ALL                    | 🚴     |
-| `highway=trunk; cycleway=share_busway`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=share_busway`             | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; cycleway=share_busway`               | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; cycleway=share_busway`          | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_lane`              | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_lane`           | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_lane`      | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_lane`              | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_lane`         | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_lane`             | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_lane`        | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_lane`               | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_lane`          | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_lane`                 | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_lane`            | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=track`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=residential; cycleway=track`                   | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=track`              | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=track`                      | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=track`                 | ALL                    | 🚴     |
-| `highway=secondary; cycleway=track`                     | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=track`                | ALL                    | 🚴     |
-| `highway=primary; cycleway=track`                       | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=track`                  | ALL                    | 🚴     |
-| `highway=trunk; cycleway=track`                         | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=track`                    | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=opposite_track`             | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite_track`          | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite_track`     | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite_track`             | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=opposite_track`        | ALL                    | 🚴     |
-| `highway=secondary; cycleway=opposite_track`            | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite_track`       | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite_track`              | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite_track`         | ALL                    | 🚴     |
-| `highway=trunk; cycleway=opposite_track`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; cycleway=opposite_track`           | BICYCLE_AND_CAR        | 🚴     |
-| `present(highway); cycleway=shared_lane`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=residential; cycleway=shared_lane`             | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=shared_lane`        | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=shared_lane`                | ALL                    | 🚴     |
-| `highway=tertiary_link; cycleway=shared_lane`           | ALL                    | 🚴     |
-| `highway=secondary; cycleway=shared_lane`               | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=shared_lane`          | ALL                    | 🚴     |
-| `highway=primary; cycleway=shared_lane`                 | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=shared_lane`            | ALL                    | 🚴     |
-| `present(highway); cycleway=opposite`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=service; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=residential; cycleway=opposite`                | ALL                    | 🚴     |
-| `highway=residential_link; cycleway=opposite`           | ALL                    | 🚴     |
-| `highway=tertiary; cycleway=opposite`                   | ALL                    |        |
-| `highway=tertiary_link; cycleway=opposite`              | ALL                    |        |
-| `highway=secondary; cycleway=opposite`                  | ALL                    | 🚴     |
-| `highway=secondary_link; cycleway=opposite`             | ALL                    | 🚴     |
-| `highway=primary; cycleway=opposite`                    | ALL                    | 🚴     |
-| `highway=primary_link; cycleway=opposite`               | ALL                    | 🚴     |
-| `highway=path; bicycle=designated`                      | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=designated`                   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; bicycle=yes; area=yes`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=pedestrian; bicycle=designated`                | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=yes`        | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `footway=sidewalk; highway=footway; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=footway; footway=crossing; bicycle=designated` | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes`                            | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated`                     | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=yes; present(surface)`          | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; bicycle=designated; present(surface)`   | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `highway=track; present(surface)`                       | PEDESTRIAN_AND_BICYCLE | 🚴     |
-| `present(highway); bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=service; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=residential; bicycle=designated`               | ALL                    | 🚴     |
-| `highway=unclassified; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=residential_link; bicycle=designated`          | ALL                    | 🚴     |
-| `highway=tertiary; bicycle=designated`                  | ALL                    | 🚴     |
-| `highway=tertiary_link; bicycle=designated`             | ALL                    | 🚴     |
-| `highway=secondary; bicycle=designated`                 | ALL                    | 🚴     |
-| `highway=secondary_link; bicycle=designated`            | ALL                    | 🚴     |
-| `highway=primary; bicycle=designated`                   | ALL                    | 🚴     |
-| `highway=primary_link; bicycle=designated`              | ALL                    | 🚴     |
-| `highway=trunk; bicycle=designated`                     | BICYCLE_AND_CAR        | 🚴     |
-| `highway=trunk_link; bicycle=designated`                | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway; bicycle=designated`                  | BICYCLE_AND_CAR        | 🚴     |
-| `highway=motorway_link; bicycle=designated`             | BICYCLE_AND_CAR        | 🚴     |
+| specifier                                               | permission               | bike safety                   | walk safety |
+|---------------------------------------------------------|--------------------------|-------------------------------|-------------|
+| `highway=trunk_link`                                    | `ALL`                    | 2.06                          |             |
+| `highway=trunk`                                         | `ALL`                    | 7.47                          |             |
+| `highway=trunk; cycleway=lane`                          | `ALL`                    | 1.5                           |             |
+| `highway=trunk_link; cycleway=lane`                     | `ALL`                    | 1.15                          |             |
+| `highway=trunk; cycleway=share_busway`                  | `ALL`                    | 1.75                          |             |
+| `highway=trunk_link; cycleway=share_busway`             | `ALL`                    | 1.25                          |             |
+| `highway=trunk; cycleway=opposite_lane`                 | `ALL`                    | forward: 7.47 
               back: 1.5  |             |
+| `highway=trunk_link; cycleway=opposite_lane`            | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=trunk; cycleway=track`                         | `ALL`                    | 0.95                          |             |
+| `highway=trunk_link; cycleway=track`                    | `ALL`                    | 0.85                          |             |
+| `highway=trunk; cycleway=opposite_track`                | `ALL`                    | forward: 7.47 
               back: 0.95 |             |
+| `highway=trunk_link; cycleway=opposite_track`           | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=trunk; bicycle=designated`                     | `ALL`                    | 7.25                          |             |
+| `highway=trunk_link; bicycle=designated`                | `ALL`                    | 2.0                           |             |
+| `mtb:scale=3`                                           | `NONE`                   |                               |             |
+| `mtb:scale=4`                                           | `NONE`                   |                               |             |
+| `mtb:scale=5`                                           | `NONE`                   |                               |             |
+| `mtb:scale=6`                                           | `NONE`                   |                               |             |
+| `highway=corridor`                                      | `PEDESTRIAN`             |                               |             |
+| `highway=steps`                                         | `PEDESTRIAN`             |                               |             |
+| `highway=crossing`                                      | `PEDESTRIAN`             |                               |             |
+| `highway=platform`                                      | `PEDESTRIAN`             |                               |             |
+| `public_transport=platform`                             | `PEDESTRIAN`             |                               |             |
+| `railway=platform`                                      | `PEDESTRIAN`             |                               |             |
+| `footway=sidewalk; highway=footway`                     | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=1`                                           | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=2`                                           | `PEDESTRIAN`             |                               |             |
+| `mtb:scale=0`                                           | `PEDESTRIAN_AND_BICYCLE` |                               |             |
+| `highway=cycleway`                                      | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=path`                                          | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=pedestrian`                                    | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=footway`                                       | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=bridleway`                                     | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `highway=living_street`                                 | `ALL`                    | 0.9                           |             |
+| `highway=unclassified`                                  | `ALL`                    |                               |             |
+| `highway=road`                                          | `ALL`                    |                               |             |
+| `highway=byway`                                         | `ALL`                    | 1.3                           |             |
+| `highway=track`                                         | `ALL`                    | 1.3                           |             |
+| `highway=service`                                       | `ALL`                    | 1.1                           |             |
+| `highway=residential`                                   | `ALL`                    | 0.98                          |             |
+| `highway=residential_link`                              | `ALL`                    | 0.98                          |             |
+| `highway=tertiary`                                      | `ALL`                    |                               |             |
+| `highway=tertiary_link`                                 | `ALL`                    |                               |             |
+| `highway=secondary`                                     | `ALL`                    | 1.5                           |             |
+| `highway=secondary_link`                                | `ALL`                    | 1.5                           |             |
+| `highway=primary`                                       | `ALL`                    | 2.06                          |             |
+| `highway=primary_link`                                  | `ALL`                    | 2.06                          |             |
+| `highway=trunk_link`                                    | `CAR`                    | 2.06                          |             |
+| `highway=motorway_link`                                 | `CAR`                    | 2.06                          |             |
+| `highway=trunk`                                         | `CAR`                    | 7.47                          |             |
+| `highway=motorway`                                      | `CAR`                    | 8.0                           |             |
+| `present(highway); cycleway=lane`                       | `PEDESTRIAN_AND_BICYCLE` | 0.87                          |             |
+| `highway=service; cycleway=lane`                        | `ALL`                    | 0.77                          |             |
+| `highway=residential; cycleway=lane`                    | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=lane`               | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=lane`                       | `ALL`                    | 0.87                          |             |
+| `highway=tertiary_link; cycleway=lane`                  | `ALL`                    | 0.87                          |             |
+| `highway=secondary; cycleway=lane`                      | `ALL`                    | 0.96                          |             |
+| `highway=secondary_link; cycleway=lane`                 | `ALL`                    | 0.96                          |             |
+| `highway=primary; cycleway=lane`                        | `ALL`                    | 1.15                          |             |
+| `highway=primary_link; cycleway=lane`                   | `ALL`                    | 1.15                          |             |
+| `highway=trunk; cycleway=lane`                          | `BICYCLE_AND_CAR`        | 1.5                           |             |
+| `highway=trunk_link; cycleway=lane`                     | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `highway=motorway; cycleway=lane`                       | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway_link; cycleway=lane`                  | `BICYCLE_AND_CAR`        | 1.15                          |             |
+| `present(highway); cycleway=share_busway`               | `PEDESTRIAN_AND_BICYCLE` | 0.92                          |             |
+| `highway=service; cycleway=share_busway`                | `ALL`                    | 0.85                          |             |
+| `highway=residential; cycleway=share_busway`            | `ALL`                    | 0.85                          |             |
+| `highway=residential_link; cycleway=share_busway`       | `ALL`                    | 0.85                          |             |
+| `highway=tertiary; cycleway=share_busway`               | `ALL`                    | 0.92                          |             |
+| `highway=tertiary_link; cycleway=share_busway`          | `ALL`                    | 0.92                          |             |
+| `highway=secondary; cycleway=share_busway`              | `ALL`                    | 0.99                          |             |
+| `highway=secondary_link; cycleway=share_busway`         | `ALL`                    | 0.99                          |             |
+| `highway=primary; cycleway=share_busway`                | `ALL`                    | 1.25                          |             |
+| `highway=primary_link; cycleway=share_busway`           | `ALL`                    | 1.25                          |             |
+| `highway=trunk; cycleway=share_busway`                  | `BICYCLE_AND_CAR`        | 1.75                          |             |
+| `highway=trunk_link; cycleway=share_busway`             | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `highway=motorway; cycleway=share_busway`               | `BICYCLE_AND_CAR`        | 2.5                           |             |
+| `highway=motorway_link; cycleway=share_busway`          | `BICYCLE_AND_CAR`        | 1.25                          |             |
+| `present(highway); cycleway=opposite_lane`              | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.87  |             |
+| `highway=service; cycleway=opposite_lane`               | `ALL`                    | forward: 1.1 
               back: 0.77  |             |
+| `highway=residential; cycleway=opposite_lane`           | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=residential_link; cycleway=opposite_lane`      | `ALL`                    | forward: 0.98 
               back: 0.77 |             |
+| `highway=tertiary; cycleway=opposite_lane`              | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=tertiary_link; cycleway=opposite_lane`         | `ALL`                    | forward: 1.0 
               back: 0.87  |             |
+| `highway=secondary; cycleway=opposite_lane`             | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=secondary_link; cycleway=opposite_lane`        | `ALL`                    | forward: 1.5 
               back: 0.96  |             |
+| `highway=primary; cycleway=opposite_lane`               | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=primary_link; cycleway=opposite_lane`          | `ALL`                    | forward: 2.06 
               back: 1.15 |             |
+| `highway=trunk; cycleway=opposite_lane`                 | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 1.5  |             |
+| `highway=trunk_link; cycleway=opposite_lane`            | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 1.15 |             |
+| `present(highway); cycleway=track`                      | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=service; cycleway=track`                       | `ALL`                    | 0.65                          |             |
+| `highway=residential; cycleway=track`                   | `ALL`                    | 0.65                          |             |
+| `highway=residential_link; cycleway=track`              | `ALL`                    | 0.65                          |             |
+| `highway=tertiary; cycleway=track`                      | `ALL`                    | 0.75                          |             |
+| `highway=tertiary_link; cycleway=track`                 | `ALL`                    | 0.75                          |             |
+| `highway=secondary; cycleway=track`                     | `ALL`                    | 0.8                           |             |
+| `highway=secondary_link; cycleway=track`                | `ALL`                    | 0.8                           |             |
+| `highway=primary; cycleway=track`                       | `ALL`                    | 0.85                          |             |
+| `highway=primary_link; cycleway=track`                  | `ALL`                    | 0.85                          |             |
+| `highway=trunk; cycleway=track`                         | `BICYCLE_AND_CAR`        | 0.95                          |             |
+| `highway=trunk_link; cycleway=track`                    | `BICYCLE_AND_CAR`        | 0.85                          |             |
+| `present(highway); cycleway=opposite_track`             | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 0.75  |             |
+| `highway=service; cycleway=opposite_track`              | `ALL`                    | forward: 1.1 
               back: 0.65  |             |
+| `highway=residential; cycleway=opposite_track`          | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=residential_link; cycleway=opposite_track`     | `ALL`                    | forward: 0.98 
               back: 0.65 |             |
+| `highway=tertiary; cycleway=opposite_track`             | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=tertiary_link; cycleway=opposite_track`        | `ALL`                    | forward: 1.0 
               back: 0.75  |             |
+| `highway=secondary; cycleway=opposite_track`            | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=secondary_link; cycleway=opposite_track`       | `ALL`                    | forward: 1.5 
               back: 0.8   |             |
+| `highway=primary; cycleway=opposite_track`              | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=primary_link; cycleway=opposite_track`         | `ALL`                    | forward: 2.06 
               back: 0.85 |             |
+| `highway=trunk; cycleway=opposite_track`                | `BICYCLE_AND_CAR`        | forward: 7.47 
               back: 0.95 |             |
+| `highway=trunk_link; cycleway=opposite_track`           | `BICYCLE_AND_CAR`        | forward: 2.06 
               back: 0.85 |             |
+| `present(highway); cycleway=shared_lane`                | `PEDESTRIAN_AND_BICYCLE` | 0.77                          |             |
+| `highway=service; cycleway=shared_lane`                 | `ALL`                    | 0.73                          |             |
+| `highway=residential; cycleway=shared_lane`             | `ALL`                    | 0.77                          |             |
+| `highway=residential_link; cycleway=shared_lane`        | `ALL`                    | 0.77                          |             |
+| `highway=tertiary; cycleway=shared_lane`                | `ALL`                    | 0.83                          |             |
+| `highway=tertiary_link; cycleway=shared_lane`           | `ALL`                    | 0.83                          |             |
+| `highway=secondary; cycleway=shared_lane`               | `ALL`                    | 1.25                          |             |
+| `highway=secondary_link; cycleway=shared_lane`          | `ALL`                    | 1.25                          |             |
+| `highway=primary; cycleway=shared_lane`                 | `ALL`                    | 1.75                          |             |
+| `highway=primary_link; cycleway=shared_lane`            | `ALL`                    | 1.75                          |             |
+| `present(highway); cycleway=opposite`                   | `PEDESTRIAN_AND_BICYCLE` | forward: 1.0 
               back: 1.4   |             |
+| `highway=service; cycleway=opposite`                    | `ALL`                    | 1.1                           |             |
+| `highway=residential; cycleway=opposite`                | `ALL`                    | 0.98                          |             |
+| `highway=residential_link; cycleway=opposite`           | `ALL`                    | 0.98                          |             |
+| `highway=tertiary; cycleway=opposite`                   | `ALL`                    |                               |             |
+| `highway=tertiary_link; cycleway=opposite`              | `ALL`                    |                               |             |
+| `highway=secondary; cycleway=opposite`                  | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=secondary_link; cycleway=opposite`             | `ALL`                    | forward: 1.5 
               back: 1.71  |             |
+| `highway=primary; cycleway=opposite`                    | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=primary_link; cycleway=opposite`               | `ALL`                    | forward: 2.06 
               back: 2.99 |             |
+| `highway=path; bicycle=designated`                      | `PEDESTRIAN_AND_BICYCLE` | 0.6                           |             |
+| `highway=footway; bicycle=designated`                   | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `highway=footway; bicycle=yes; area=yes`                | `PEDESTRIAN_AND_BICYCLE` | 0.9                           |             |
+| `highway=pedestrian; bicycle=designated`                | `PEDESTRIAN_AND_BICYCLE` | 0.75                          |             |
+| `footway=sidewalk; highway=footway; bicycle=yes`        | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `footway=sidewalk; highway=footway; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=footway; footway=crossing`                     | `PEDESTRIAN_AND_BICYCLE` | 2.5                           |             |
+| `highway=footway; footway=crossing; bicycle=designated` | `PEDESTRIAN_AND_BICYCLE` | 1.1                           |             |
+| `highway=track; bicycle=yes`                            | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated`                     | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; bicycle=yes; present(surface)`          | `PEDESTRIAN_AND_BICYCLE` | 1.18                          |             |
+| `highway=track; bicycle=designated; present(surface)`   | `PEDESTRIAN_AND_BICYCLE` | 0.99                          |             |
+| `highway=track; present(surface)`                       | `PEDESTRIAN_AND_BICYCLE` | 1.3                           |             |
+| `present(highway); bicycle=designated`                  | `ALL`                    | 0.97                          |             |
+| `highway=service; bicycle=designated`                   | `ALL`                    | 0.84                          |             |
+| `highway=residential; bicycle=designated`               | `ALL`                    | 0.95                          |             |
+| `highway=unclassified; bicycle=designated`              | `ALL`                    | 0.95                          |             |
+| `highway=residential_link; bicycle=designated`          | `ALL`                    | 0.95                          |             |
+| `highway=tertiary; bicycle=designated`                  | `ALL`                    | 0.97                          |             |
+| `highway=tertiary_link; bicycle=designated`             | `ALL`                    | 0.97                          |             |
+| `highway=secondary; bicycle=designated`                 | `ALL`                    | 1.46                          |             |
+| `highway=secondary_link; bicycle=designated`            | `ALL`                    | 1.46                          |             |
+| `highway=primary; bicycle=designated`                   | `ALL`                    | 2.0                           |             |
+| `highway=primary_link; bicycle=designated`              | `ALL`                    | 2.0                           |             |
+| `highway=trunk; bicycle=designated`                     | `BICYCLE_AND_CAR`        | 7.25                          |             |
+| `highway=trunk_link; bicycle=designated`                | `BICYCLE_AND_CAR`        | 2.0                           |             |
+| `highway=motorway; bicycle=designated`                  | `BICYCLE_AND_CAR`        | 7.76                          |             |
+| `highway=motorway_link; bicycle=designated`             | `BICYCLE_AND_CAR`        | 2.0                           |             |
 
 
 
-
-
-
-
              Rule #0
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #1
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #2
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #3
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #4
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #5
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #6
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #7
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #8
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #9
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #10
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #11
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #12
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #13
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #14
              
-
-**Specifier:** `mtb:scale=3`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #15
              
-
-**Specifier:** `mtb:scale=4`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #16
              
-
-**Specifier:** `mtb:scale=5`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #17
              
-
-**Specifier:** `mtb:scale=6`   
-**Permission:** NONE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #18
              
-
-**Specifier:** `highway=corridor`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #19
              
-
-**Specifier:** `highway=steps`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #20
              
-
-**Specifier:** `highway=crossing`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #21
              
-
-**Specifier:** `highway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #22
              
-
-**Specifier:** `public_transport=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #23
              
-
-**Specifier:** `railway=platform`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #24
              
-
-**Specifier:** `footway=sidewalk; highway=footway`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #25
              
-
-**Specifier:** `mtb:scale=1`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #26
              
-
-**Specifier:** `mtb:scale=2`   
-**Permission:** PEDESTRIAN   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #27
              
-
-**Specifier:** `mtb:scale=0`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #28
              
-
-**Specifier:** `highway=cycleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #29
              
-
-**Specifier:** `highway=path`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #30
              
-
-**Specifier:** `highway=pedestrian`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #31
              
-
-**Specifier:** `highway=footway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #32
              
-
-**Specifier:** `highway=bridleway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #33
              
-
-**Specifier:** `highway=living_street`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #34
              
-
-**Specifier:** `highway=unclassified`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #35
              
-
-**Specifier:** `highway=road`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #36
              
-
-**Specifier:** `highway=byway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #37
              
-
-**Specifier:** `highway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #38
              
-
-**Specifier:** `highway=service`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #39
              
-
-**Specifier:** `highway=residential`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #40
              
-
-**Specifier:** `highway=residential_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #41
              
-
-**Specifier:** `highway=tertiary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #42
              
-
-**Specifier:** `highway=tertiary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #43
              
-
-**Specifier:** `highway=secondary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #44
              
-
-**Specifier:** `highway=secondary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #45
              
-
-**Specifier:** `highway=primary`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #46
              
-
-**Specifier:** `highway=primary_link`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #47
              
-
-**Specifier:** `highway=trunk_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #48
              
-
-**Specifier:** `highway=motorway_link`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 2.06, back: 2.06   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #49
              
-
-**Specifier:** `highway=trunk`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 7.47, back: 7.47   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #50
              
-
-**Specifier:** `highway=motorway`   
-**Permission:** CAR   
-**Bike safety factor:** forward: 8.0, back: 8.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #51
              
-
-**Specifier:** `present(highway); cycleway=lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #52
              
-
-**Specifier:** `highway=service; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #53
              
-
-**Specifier:** `highway=residential; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #54
              
-
-**Specifier:** `highway=residential_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #55
              
-
-**Specifier:** `highway=tertiary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #56
              
-
-**Specifier:** `highway=tertiary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.87, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #57
              
-
-**Specifier:** `highway=secondary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #58
              
-
-**Specifier:** `highway=secondary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.96, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #59
              
-
-**Specifier:** `highway=primary; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #60
              
-
-**Specifier:** `highway=primary_link; cycleway=lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #61
              
-
-**Specifier:** `highway=trunk; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.5, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #62
              
-
-**Specifier:** `highway=trunk_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #63
              
-
-**Specifier:** `highway=motorway; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #64
              
-
-**Specifier:** `highway=motorway_link; cycleway=lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.15, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #65
              
-
-**Specifier:** `present(highway); cycleway=share_busway`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #66
              
-
-**Specifier:** `highway=service; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #67
              
-
-**Specifier:** `highway=residential; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #68
              
-
-**Specifier:** `highway=residential_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #69
              
-
-**Specifier:** `highway=tertiary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #70
              
-
-**Specifier:** `highway=tertiary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.92, back: 0.92   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #71
              
-
-**Specifier:** `highway=secondary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #72
              
-
-**Specifier:** `highway=secondary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #73
              
-
-**Specifier:** `highway=primary; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #74
              
-
-**Specifier:** `highway=primary_link; cycleway=share_busway`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #75
              
-
-**Specifier:** `highway=trunk; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #76
              
-
-**Specifier:** `highway=trunk_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #77
              
-
-**Specifier:** `highway=motorway; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #78
              
-
-**Specifier:** `highway=motorway_link; cycleway=share_busway`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #79
              
-
-**Specifier:** `present(highway); cycleway=opposite_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #80
              
-
-**Specifier:** `highway=service; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #81
              
-
-**Specifier:** `highway=residential; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #82
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #83
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #84
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.87   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #85
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #86
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.96   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #87
              
-
-**Specifier:** `highway=primary; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #88
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #89
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 1.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #90
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_lane`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 1.15   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #91
              
-
-**Specifier:** `present(highway); cycleway=track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #92
              
-
-**Specifier:** `highway=service; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #93
              
-
-**Specifier:** `highway=residential; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #94
              
-
-**Specifier:** `highway=residential_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.65, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #95
              
-
-**Specifier:** `highway=tertiary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #96
              
-
-**Specifier:** `highway=tertiary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #97
              
-
-**Specifier:** `highway=secondary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #98
              
-
-**Specifier:** `highway=secondary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.8, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #99
              
-
-**Specifier:** `highway=primary; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #100
              
-
-**Specifier:** `highway=primary_link; cycleway=track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #101
              
-
-**Specifier:** `highway=trunk; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #102
              
-
-**Specifier:** `highway=trunk_link; cycleway=track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 0.85, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #103
              
-
-**Specifier:** `present(highway); cycleway=opposite_track`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #104
              
-
-**Specifier:** `highway=service; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #105
              
-
-**Specifier:** `highway=residential; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #106
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.65   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #107
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #108
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #109
              
-
-**Specifier:** `highway=secondary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #110
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 0.8   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #111
              
-
-**Specifier:** `highway=primary; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #112
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite_track`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #113
              
-
-**Specifier:** `highway=trunk; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.47, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #114
              
-
-**Specifier:** `highway=trunk_link; cycleway=opposite_track`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.06, back: 0.85   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #115
              
-
-**Specifier:** `present(highway); cycleway=shared_lane`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #116
              
-
-**Specifier:** `highway=service; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.73, back: 0.73   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #117
              
-
-**Specifier:** `highway=residential; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #118
              
-
-**Specifier:** `highway=residential_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.77, back: 0.77   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #119
              
-
-**Specifier:** `highway=tertiary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #120
              
-
-**Specifier:** `highway=tertiary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.83, back: 0.83   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #121
              
-
-**Specifier:** `highway=secondary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #122
              
-
-**Specifier:** `highway=secondary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.25, back: 1.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #123
              
-
-**Specifier:** `highway=primary; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #124
              
-
-**Specifier:** `highway=primary_link; cycleway=shared_lane`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.75, back: 1.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #125
              
-
-**Specifier:** `present(highway); cycleway=opposite`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.0, back: 1.4   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #126
              
-
-**Specifier:** `highway=service; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #127
              
-
-**Specifier:** `highway=residential; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #128
              
-
-**Specifier:** `highway=residential_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.98, back: 0.98   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #129
              
-
-**Specifier:** `highway=tertiary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #130
              
-
-**Specifier:** `highway=tertiary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.0, back: 1.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #131
              
-
-**Specifier:** `highway=secondary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #132
              
-
-**Specifier:** `highway=secondary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.5, back: 1.71   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #133
              
-
-**Specifier:** `highway=primary; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #134
              
-
-**Specifier:** `highway=primary_link; cycleway=opposite`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.06, back: 2.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #135
              
-
-**Specifier:** `highway=path; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.6, back: 0.6   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #136
              
-
-**Specifier:** `highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #137
              
-
-**Specifier:** `highway=footway; bicycle=yes; area=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.9, back: 0.9   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #138
              
-
-**Specifier:** `highway=pedestrian; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.75, back: 0.75   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #139
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #140
              
-
-**Specifier:** `footway=sidewalk; highway=footway; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #141
              
-
-**Specifier:** `highway=footway; footway=crossing`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 2.5, back: 2.5   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #142
              
-
-**Specifier:** `highway=footway; footway=crossing; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.1, back: 1.1   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #143
              
-
-**Specifier:** `highway=track; bicycle=yes`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #144
              
-
-**Specifier:** `highway=track; bicycle=designated`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #145
              
-
-**Specifier:** `highway=track; bicycle=yes; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.18, back: 1.18   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #146
              
-
-**Specifier:** `highway=track; bicycle=designated; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 0.99, back: 0.99   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #147
              
-
-**Specifier:** `highway=track; present(surface)`   
-**Permission:** PEDESTRIAN_AND_BICYCLE   
-**Bike safety factor:** forward: 1.3, back: 1.3   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #148
              
-
-**Specifier:** `present(highway); bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #149
              
-
-**Specifier:** `highway=service; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.84, back: 0.84   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #150
              
-
-**Specifier:** `highway=residential; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #151
              
-
-**Specifier:** `highway=unclassified; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #152
              
-
-**Specifier:** `highway=residential_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.95, back: 0.95   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #153
              
-
-**Specifier:** `highway=tertiary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #154
              
-
-**Specifier:** `highway=tertiary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 0.97, back: 0.97   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #155
              
-
-**Specifier:** `highway=secondary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #156
              
-
-**Specifier:** `highway=secondary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 1.46, back: 1.46   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #157
              
-
-**Specifier:** `highway=primary; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #158
              
-
-**Specifier:** `highway=primary_link; bicycle=designated`   
-**Permission:** ALL   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #159
              
-
-**Specifier:** `highway=trunk; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.25, back: 7.25   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #160
              
-
-**Specifier:** `highway=trunk_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #161
              
-
-**Specifier:** `highway=motorway; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 7.76, back: 7.76   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
              Rule #162
              
-
-**Specifier:** `highway=motorway_link; bicycle=designated`   
-**Permission:** BICYCLE_AND_CAR   
-**Bike safety factor:** forward: 2.0, back: 2.0   
-**Walk safety factor:** forward: 1.0, back: 1.0 
-
-
-
-
-### Bicycle and walking safety mixins
+### Safety mixins
 
 Mixins are selectors that have only an effect on the bicycle and walk safety factors but not on the
-permission of an OSM way. Multiple mixins can apply to the same way and their effects compound.
+permission of an OSM way. Their safety values are multiplied with the base values from the selected
+way properties. Multiple mixins can apply to the same way and their effects compound.
 
 
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 0db31c4df53..0689ea0211c 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -78,7 +78,7 @@ nav:
         - Norway: 'osm/Norway.md'
         - Germany: 'osm/Germany.md'
         - Finland: 'osm/Finland.md'
-        - UK: 'osm/Finland.md'
+        - UK: 'osm/UK.md'
     - Router: 'RouterConfiguration.md'
     - "Route Request": 'RouteRequest.md'
     - "Realtime Updaters": 'UpdaterConfig.md'
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
index f58daa1ddb3..99df904e314 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
@@ -42,21 +42,14 @@ public void populateProperties(WayPropertySet props) {
     props.setMixinProperties(exact("sidewalk=no;maxspeed=35 mph"), ofWalkSafety(2));
     props.setMixinProperties(exact("sidewalk=no;maxspeed=30 mph"), ofWalkSafety(1.5));
 
-    /*
-     * the RLIS/CCGIS:bicycle=designated mixins are coded out as they are no longer neccessary because of of the bicycle=designated block of code
-     * above. This switch makes our weighting system less reliant on tags that aren't generally used by the OSM community, and prevents the double
-     * counting that was occuring on streets with both bicycle infrastructure and an RLIS:bicycle=designated tag
-     */
+    // rarely used tags that are specific to counties near Portland
+    // https://taginfo.openstreetmap.org/keys/RLIS:bicycle#overview
 
-    /*
-     * props.setProperties("RLIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
-     */
     props.setMixinProperties("RLIS:bicycle=caution_area", ofBicycleSafety(1.45));
     props.setMixinProperties("RLIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
     props.setMixinProperties("RLIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
-    /*
-     * props.setProperties("CCGIS:bicycle=designated", StreetTraversalPermission.ALL, 0.97, 0.97, true);
-     */
+
+    // https://taginfo.openstreetmap.org/keys/CCGIS:bicycle#overview
     props.setMixinProperties("CCGIS:bicycle=caution_area", ofBicycleSafety(1.45));
     props.setMixinProperties("CCGIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
     props.setMixinProperties("CCGIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
index 1884551d3cc..48c64f068c9 100644
--- a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -3,7 +3,6 @@
 import static org.opentripplanner.framework.io.FileUtils.assertFileEquals;
 import static org.opentripplanner.framework.io.FileUtils.readFile;
 import static org.opentripplanner.framework.io.FileUtils.writeFile;
-import static org.opentripplanner.framework.text.MarkdownFormatter.bold;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.DOCS_ROOT;
 import static org.opentripplanner.generate.doc.framework.DocsTestConstants.TEMPLATE_ROOT;
 import static org.opentripplanner.generate.doc.framework.TemplateUtil.replaceSection;
@@ -21,7 +20,6 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.framework.text.Table;
 import org.opentripplanner.framework.text.TableBuilder;
-import org.opentripplanner.generate.doc.framework.DocBuilder;
 import org.opentripplanner.generate.doc.framework.GeneratesDocumentation;
 import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapper;
 import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
@@ -65,7 +63,6 @@ public void updateDocs(OsmTagMapperSource source) {
     var mixinTable = mixinTable(wps);
 
     template = replaceSection(template, "props", propTable.toMarkdownTable());
-    template = replaceSection(template, "prop-details", propDetails(wps));
     template = replaceSection(template, "mixins", mixinTable.toMarkdownTable());
     writeFile(outFile, template);
     assertFileEquals(original, outFile);
@@ -78,50 +75,26 @@ private static File outputFile(OsmTagMapper mapper) {
 
   private static Table propTable(WayPropertySet wps) {
     var propTable = new TableBuilder();
-    propTable.withHeaders("specifier", "permission", "safety");
+    propTable.withHeaders("specifier", "permission", "bike safety", "walk safety");
 
     for (var prop : wps.getWayProperties()) {
       propTable.addRow(
         "`%s`".formatted(prop.specifier().toMarkdown()),
-        prop.properties().getPermission(),
-        emojiModifications(prop.properties().bicycleSafety(), prop.properties().walkSafety())
+        "`%s`".formatted(prop.properties().getPermission()),
+        tableValues(prop.properties().bicycleSafety()),
+        tableValues(prop.properties().walkSafety())
       );
     }
     return propTable.build();
   }
 
-  private static String propDetails(WayPropertySet wps) {
-    var docBuilder = new DocBuilder();
-
-    var wayProperties = wps.getWayProperties();
-    for (var prop : wayProperties) {
-      var index = wayProperties.indexOf(prop);
-
-      docBuilder.header(3, "Rule #%s".formatted(index), Integer.toString(index));
-      docBuilder
-        .text(bold("Specifier:"))
-        .text("`%s`".formatted(prop.specifier().toMarkdown()))
-        .lineBreak();
-
-      docBuilder.text(bold("Permission:")).text(prop.properties().getPermission());
-      docBuilder.lineBreak();
-      var bike = prop.properties().bicycleSafety();
-      docBuilder
-        .text(bold("Bike safety factor:"))
-        .text("forward: %s, back: %s".formatted(bike.forward(), bike.back()));
-      docBuilder.lineBreak();
-      var walk = prop.properties().walkSafety();
-      docBuilder
-        .text(bold("Walk safety factor:"))
-        .text("forward: %s, back: %s".formatted(walk.forward(), walk.back()));
-      docBuilder.endParagraph();
-    }
-    return docBuilder.toString();
-  }
-
   private static Table mixinTable(WayPropertySet wps) {
     var propTable = new TableBuilder();
-    propTable.withHeaders("matcher", "bicycle safety", "walk safety");
+    propTable.withHeaders(
+      "matcher",
+      "bicycle safety",
+      "walk safety"
+    );
 
     for (var prop : wps.getMixins()) {
       propTable.addRow(
@@ -145,15 +118,4 @@ else if(safety.isSymetric()){
     }
   }
 
-  private static String emojiModifications(SafetyFeatures bicycle, SafetyFeatures walk) {
-    return emojiIfModifies(bicycle, "\uD83D\uDEB4") + " " + emojiIfModifies(walk, "\uD83D\uDEB6");
-  }
-
-  private static String emojiIfModifies(SafetyFeatures prop, String value) {
-    if (prop.modifies()) {
-      return value;
-    } else {
-      return "";
-    }
-  }
 }

From 69f9076f14fe3ddd10074e8c68fb289b25507a12 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 26 Jun 2024 13:22:42 +0200
Subject: [PATCH 1482/1688] Remove bike safety endpoint from Report API

---
 docs/sandbox/ReportApi.md                     |  8 --
 .../reportapi/model/BicycleSafetyReport.java  | 57 ------------
 .../reportapi/resource/ReportResource.java    | 40 --------
 src/ext/resources/reportapi/report.html       | 93 -------------------
 .../tagmapping/DefaultMapper.java             |  1 -
 .../tagmapping/PortlandMapper.java            |  1 -
 .../generate/doc/OsmMapperDocTest.java        | 13 +--
 7 files changed, 3 insertions(+), 210 deletions(-)
 delete mode 100644 src/ext/java/org/opentripplanner/ext/reportapi/model/BicycleSafetyReport.java
 delete mode 100644 src/ext/resources/reportapi/report.html

diff --git a/docs/sandbox/ReportApi.md b/docs/sandbox/ReportApi.md
index 1a0668d1740..bc219ec2f98 100644
--- a/docs/sandbox/ReportApi.md
+++ b/docs/sandbox/ReportApi.md
@@ -24,14 +24,6 @@ This module mounts an endpoint for generating reports under `otp/report`. Availa
 - [/otp/report/transfers.csv](http://localhost:8080/otp/report/transfers.csv)
 - [/otp/report/graph.json](http://localhost:8080/otp/report/graph.json)
   Detailed numbers of transit and street entities in the graph
-- [/otp/report/bicycle-safety.html](http://localhost:8080/otp/report/bicycle-safety.html):
-  Interactive viewer of the rules that determine how bicycle safety factors are calculated.
-- [/otp/report/bicycle-safety.csv](http://localhost:8080/otp/report/bicycle-safety.csv): Raw CSV
-  data for the bicycle safety report.
-    - [Norwegian version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=norway)
-    - [German version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=germany)
-    - [UK version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=uk)
-    - [Finnish version](http://localhost:8080/otp/report/bicycle-safety.csv?osmWayPropertySet=finland)
 - [/otp/report/transit/group/priorities](http://localhost:8080/otp/report/transit/group/priorities):
   List all transit groups used for transit-group-priority (Competition neutral planning).   
 
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/BicycleSafetyReport.java b/src/ext/java/org/opentripplanner/ext/reportapi/model/BicycleSafetyReport.java
deleted file mode 100644
index 8830189107d..00000000000
--- a/src/ext/java/org/opentripplanner/ext/reportapi/model/BicycleSafetyReport.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package org.opentripplanner.ext.reportapi.model;
-
-import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
-import org.opentripplanner.openstreetmap.wayproperty.WayPropertySet;
-
-public class BicycleSafetyReport {
-
-  public static void main(String[] args) {
-    System.out.println(makeCsv(OsmTagMapperSource.NORWAY));
-  }
-
-  public static String makeCsv(OsmTagMapperSource source) {
-    var wayPropertySet = new WayPropertySet();
-
-    source.getInstance().populateProperties(wayPropertySet);
-
-    var buf = new CsvReportBuilder(",");
-
-    buf.addHeader(
-      "OSM tags for osmWayPropertySet " + source,
-      "mixin",
-      "permissions",
-      "safety penalty there",
-      "safety penalty back"
-    );
-
-    wayPropertySet
-      .getWayProperties()
-      .forEach(p -> {
-        buf.addText(p.specifier().toString());
-        buf.addBoolean(false);
-        buf.addText(p.properties().getPermission().toString());
-
-        var safetyProps = p.properties().bicycleSafety();
-        if (safetyProps != null) {
-          buf.addNumber(safetyProps.forward());
-          buf.addNumber(safetyProps.back());
-        }
-        buf.newLine();
-      });
-
-    wayPropertySet
-      .getMixins()
-      .forEach(p -> {
-        buf.addText(p.specifier().toString());
-        buf.addBoolean(true);
-        buf.addText("");
-
-        var safetyProps = p.bicycleSafety();
-        buf.addNumber(safetyProps.forward());
-        buf.addNumber(safetyProps.back());
-        buf.newLine();
-      });
-
-    return buf.toString();
-  }
-}
diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java b/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
index a859b4ff78a..e06aec71b53 100644
--- a/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
+++ b/src/ext/java/org/opentripplanner/ext/reportapi/resource/ReportResource.java
@@ -1,25 +1,18 @@
 package org.opentripplanner.ext.reportapi.resource;
 
-import jakarta.ws.rs.BadRequestException;
-import jakarta.ws.rs.DefaultValue;
 import jakarta.ws.rs.GET;
 import jakarta.ws.rs.Path;
 import jakarta.ws.rs.Produces;
-import jakarta.ws.rs.QueryParam;
 import jakarta.ws.rs.core.Context;
 import jakarta.ws.rs.core.MediaType;
 import jakarta.ws.rs.core.Response;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
 import java.time.Duration;
-import org.opentripplanner.ext.reportapi.model.BicycleSafetyReport;
 import org.opentripplanner.ext.reportapi.model.CachedValue;
 import org.opentripplanner.ext.reportapi.model.GraphReportBuilder;
 import org.opentripplanner.ext.reportapi.model.GraphReportBuilder.GraphStats;
 import org.opentripplanner.ext.reportapi.model.TransfersReport;
 import org.opentripplanner.ext.reportapi.model.TransitGroupPriorityReport;
 import org.opentripplanner.model.transfer.TransferService;
-import org.opentripplanner.openstreetmap.tagmapping.OsmTagMapperSource;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.standalone.api.OtpServerRequestContext;
 import org.opentripplanner.transit.service.TransitService;
@@ -51,39 +44,6 @@ public String getTransfersAsCsv() {
     return TransfersReport.export(transferService.listAll(), transitService);
   }
 
-  @GET
-  @Path("/bicycle-safety.html")
-  @Produces(MediaType.TEXT_HTML)
-  public Response getBicycleSafetyPage() {
-    try (var is = getClass().getResourceAsStream("/reportapi/report.html")) {
-      return Response.ok(new String(is.readAllBytes(), StandardCharsets.UTF_8)).build();
-    } catch (IOException e) {
-      return Response.serverError().build();
-    }
-  }
-
-  @GET
-  @Path("/bicycle-safety.csv")
-  @Produces("text/csv")
-  public Response getBicycleSafetyAsCsv(
-    @DefaultValue("DEFAULT") @QueryParam("osmWayPropertySet") String osmWayPropertySet
-  ) {
-    OsmTagMapperSource source;
-    try {
-      source = OsmTagMapperSource.valueOf(osmWayPropertySet.toUpperCase());
-    } catch (IllegalArgumentException ignore) {
-      throw new BadRequestException("Unknown osmWayPropertySet: " + osmWayPropertySet);
-    }
-
-    return Response
-      .ok(BicycleSafetyReport.makeCsv(source))
-      .header(
-        "Content-Disposition",
-        "attachment; filename=\"" + osmWayPropertySet + "-bicycle-safety.csv\""
-      )
-      .build();
-  }
-
   @GET
   @Path("/transit/group/priorities")
   @Produces(MediaType.TEXT_PLAIN)
diff --git a/src/ext/resources/reportapi/report.html b/src/ext/resources/reportapi/report.html
deleted file mode 100644
index bfa5af66603..00000000000
--- a/src/ext/resources/reportapi/report.html
+++ /dev/null
@@ -1,93 +0,0 @@
-
-
-
-
-  OTP Bicycle safety factor report browser
-
-  
-  
-
-  
-  
-
-  
-  
-
-  
-
-
-
-
-
-
              
-  
-
-  
              
-    
              OTP Bicycle safety factor report browser
              
-    
              
-    Documentation
-  
              
-
-  
              
-
-    
              
-
-      
              
-        
-          
-          
-            
-            
-            
-            
-            
-          
-          
-          
-          
-        
              OSM tag match expressionMixin?Traversal permissionsSafety factor there1Safety factor back1
              
-      
              
-
-      
              
-        1: Smaller means more cycling friendly. Larger means less cycle friendly. Think of at as a multiplier for the cost of traversing the way.
-      
              
-    
              
-  
              
-
              
-
-
-
-
-
-
-
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
index f6343cfd384..c5d1c0d1582 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/DefaultMapper.java
@@ -602,7 +602,6 @@ public void populateProperties(WayPropertySet props) {
 
     /* Portland-local mixins */
 
-
     props.setMixinProperties("foot=discouraged", ofWalkSafety(3));
     props.setMixinProperties("bicycle=discouraged", ofBicycleSafety(3));
 
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
index 99df904e314..1a09b3b6714 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/PortlandMapper.java
@@ -54,7 +54,6 @@ public void populateProperties(WayPropertySet props) {
     props.setMixinProperties("CCGIS:bicycle:right=caution_area", ofBicycleSafety(1.45, 1));
     props.setMixinProperties("CCGIS:bicycle:left=caution_area", ofBicycleSafety(1, 1.45));
 
-
     // Max speed limit in Oregon is 70 mph ~= 113kmh ~= 31.3m/s
     props.maxPossibleCarSpeed = 31.4f;
 
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
index 48c64f068c9..cd69830f023 100644
--- a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -90,11 +90,7 @@ private static Table propTable(WayPropertySet wps) {
 
   private static Table mixinTable(WayPropertySet wps) {
     var propTable = new TableBuilder();
-    propTable.withHeaders(
-      "matcher",
-      "bicycle safety",
-      "walk safety"
-    );
+    propTable.withHeaders("matcher", "bicycle safety", "walk safety");
 
     for (var prop : wps.getMixins()) {
       propTable.addRow(
@@ -109,13 +105,10 @@ private static Table mixinTable(WayPropertySet wps) {
   private static String tableValues(SafetyFeatures safety) {
     if (!safety.modifies()) {
       return "";
-    }
-    else if(safety.isSymetric()){
+    } else if (safety.isSymetric()) {
       return Double.toString(safety.forward());
-    }
-    else {
+    } else {
       return "forward: %s 
               back: %s".formatted(safety.forward(), safety.back());
     }
   }
-
 }

From fd222ecc3f81ef77b7cc37241e61574ce0ecb46d Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 26 Jun 2024 13:30:37 +0200
Subject: [PATCH 1483/1688] Fix Javadoc of TimetableSnapshotManager

---
 .../updater/trip/TimetableSnapshotManager.java      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index 624d749664c..bf7c8c98919 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -35,13 +35,6 @@ public final class TimetableSnapshotManager {
    */
   private final ReentrantLock bufferLock = new ReentrantLock(true);
 
-  /**
-   * The working copy of the timetable snapshot. Should not be visible to routing threads. Should
-   * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that
-   * might modify this buffer will correctly acquire the lock.
-   */
-  private final TimetableSnapshot buffer = new TimetableSnapshot();
-
   /**
    * The working copy of the timetable snapshot. Should not be visible to routing threads. Should
    * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that
@@ -53,6 +46,12 @@ public final class TimetableSnapshotManager {
    *   before re-indexing it. While refactoring or rewriting parts of this system, we could throw
    *   an exception if a writing section is entered by more than one thread.
    */
+  private final TimetableSnapshot buffer = new TimetableSnapshot();
+
+  /**
+   * The last committed snapshot that was handed off to a routing thread. This snapshot may be given
+   * to more than one routing thread if the maximum snapshot frequency is exceeded.
+   */
   private volatile TimetableSnapshot snapshot = null;
 
   /**

From 75af424f7f2b238cc7ae778eb5e78f0d93dbf82d Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 26 Jun 2024 14:08:41 +0200
Subject: [PATCH 1484/1688] Update Javadoc

---
 .../openstreetmap/wayproperty/SafetyFeatures.java           | 6 ++++++
 .../wayproperty/specifier/BestMatchSpecifier.java           | 2 +-
 .../wayproperty/specifier/ExactMatchSpecifier.java          | 2 +-
 .../wayproperty/specifier/LogicalOrSpecifier.java           | 4 ++--
 .../openstreetmap/wayproperty/specifier/OsmSpecifier.java   | 6 +++++-
 .../org/opentripplanner/generate/doc/OsmMapperDocTest.java  | 4 ++--
 6 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
index dcf5969322f..37669984405 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
@@ -6,10 +6,16 @@
 public record SafetyFeatures(double forward, double back) {
   public static final SafetyFeatures DEFAULT = new SafetyFeatures(1, 1);
 
+  /**
+   * Does this instance actually modify the safety values?
+   */
   public boolean modifies() {
     return !(forward == 1 && back == 1);
   }
 
+  /**
+   * Does forward and back have the same value?
+   */
   public boolean isSymetric() {
     return forward == back;
   }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
index 2c33470f2f7..293bcf84644 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/BestMatchSpecifier.java
@@ -75,7 +75,7 @@ public int matchScore(OSMWithTags way) {
   }
 
   @Override
-  public String toMarkdown() {
+  public String toDocString() {
     return Arrays.stream(conditions).map(Object::toString).collect(Collectors.joining("; "));
   }
 
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
index 4c26784682f..48c3b5edb64 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/ExactMatchSpecifier.java
@@ -56,7 +56,7 @@ public int matchScore(OSMWithTags way) {
   }
 
   @Override
-  public String toMarkdown() {
+  public String toDocString() {
     return conditions.stream().map(Object::toString).collect(Collectors.joining("; "));
   }
 
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
index 1a0691deb08..74db280115b 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/LogicalOrSpecifier.java
@@ -46,7 +46,7 @@ public int matchScore(OSMWithTags way) {
   }
 
   @Override
-  public String toMarkdown() {
-    return subSpecs.stream().map(ExactMatchSpecifier::toMarkdown).collect(Collectors.joining("|"));
+  public String toDocString() {
+    return subSpecs.stream().map(ExactMatchSpecifier::toDocString).collect(Collectors.joining("|"));
   }
 }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
index f87845e729f..71d629552ff 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/OsmSpecifier.java
@@ -42,7 +42,11 @@ static Condition[] parseConditions(String spec, String separator) {
    */
   int matchScore(OSMWithTags way);
 
-  String toMarkdown();
+  /**
+   * Convert this specifier to a human-readable identifier that represents this in (generated)
+   * documentation.
+   */
+  String toDocString();
 
   record Scores(int forward, int backward) {
     public static Scores of(int s) {
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
index cd69830f023..443b01fbeb0 100644
--- a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -79,7 +79,7 @@ private static Table propTable(WayPropertySet wps) {
 
     for (var prop : wps.getWayProperties()) {
       propTable.addRow(
-        "`%s`".formatted(prop.specifier().toMarkdown()),
+        "`%s`".formatted(prop.specifier().toDocString()),
         "`%s`".formatted(prop.properties().getPermission()),
         tableValues(prop.properties().bicycleSafety()),
         tableValues(prop.properties().walkSafety())
@@ -94,7 +94,7 @@ private static Table mixinTable(WayPropertySet wps) {
 
     for (var prop : wps.getMixins()) {
       propTable.addRow(
-        "`%s`".formatted(prop.specifier().toMarkdown()),
+        "`%s`".formatted(prop.specifier().toDocString()),
         tableValues(prop.bicycleSafety()),
         tableValues(prop.walkSafety())
       );

From d176d5fdeb86837b3ce4b2802964c2d4ddf64459 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 26 Jun 2024 15:08:24 +0200
Subject: [PATCH 1485/1688] Update links to Siri on Google Cloud [ci skip]

---
 doc-templates/UpdaterConfig.md | 1 +
 docs/UpdaterConfig.md          | 1 +
 mkdocs.yml                     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/doc-templates/UpdaterConfig.md b/doc-templates/UpdaterConfig.md
index b0444f038af..f16d28f570c 100644
--- a/doc-templates/UpdaterConfig.md
+++ b/doc-templates/UpdaterConfig.md
@@ -83,6 +83,7 @@ GBFS form factors:
 
 - [Vehicle parking](sandbox/VehicleParking.md)
 - [Siri over HTTP](sandbox/siri/SiriUpdater.md)
+- [Siri over Google Cloud PubSub](sandbox/siri/SiriGooglePubSubUpdater.md)
 - [Siri over Azure Message Bus](sandbox/siri/SiriAzureUpdater.md)
 - [VehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md)
 
diff --git a/docs/UpdaterConfig.md b/docs/UpdaterConfig.md
index 3e0907f60ad..ebe0acf94b4 100644
--- a/docs/UpdaterConfig.md
+++ b/docs/UpdaterConfig.md
@@ -415,6 +415,7 @@ HTTP headers to add to the request. Any header key, value can be inserted.
 
 - [Vehicle parking](sandbox/VehicleParking.md)
 - [Siri over HTTP](sandbox/siri/SiriUpdater.md)
+- [Siri over Google Cloud PubSub](sandbox/siri/SiriGooglePubSubUpdater.md)
 - [Siri over Azure Message Bus](sandbox/siri/SiriAzureUpdater.md)
 - [VehicleRentalServiceDirectory](sandbox/VehicleRentalServiceDirectory.md)
 
diff --git a/mkdocs.yml b/mkdocs.yml
index b8c257ceb7d..7925151ac35 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -99,6 +99,7 @@ nav:
     - Direct Transfer Analyzer: 'sandbox/transferanalyzer.md'
     - Google Cloud Storage: 'sandbox/GoogleCloudStorage.md'
     - SIRI Updaters: 'sandbox/siri/SiriUpdater.md'
+    - SIRI Updaters (Google Cloud): 'sandbox/siri/SiriGooglePubSubUpdater.md'
     - SIRI Updater (Azure): 'sandbox/siri/SiriAzureUpdater.md'
     - Vehicle Rental Service Directory API support: 'sandbox/VehicleRentalServiceDirectory.md'
     - Smoove Bike Rental Updator Support: 'sandbox/SmooveBikeRental.md'

From d0ec77e9f0cfe9f75ca2ed68e227a15ff1db2d02 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Thu, 27 Jun 2024 09:25:59 +0200
Subject: [PATCH 1486/1688] Improve handling of SIRI added trip with
 unresolvable agency

---
 .../siri/SiriTimetableSnapshotSourceTest.java | 35 ++++++++++++------
 .../ext/siri/AddedTripBuilder.java            | 36 +++++++++++++------
 .../updater/spi/UpdateError.java              |  1 +
 3 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
index a069f5c6656..7eb44302fb9 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
@@ -2,21 +2,10 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import java.util.List;
 import java.util.Set;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.model.PickDrop;
 import org.opentripplanner.transit.model.timetable.RealTimeState;
-import org.opentripplanner.transit.model.timetable.Trip;
-import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
-import org.opentripplanner.transit.model.timetable.TripTimes;
-import org.opentripplanner.transit.model.timetable.TripTimesFactory;
-import org.opentripplanner.transit.service.DefaultTransitService;
-import org.opentripplanner.transit.service.StopModel;
-import org.opentripplanner.transit.service.TransitModel;
-import org.opentripplanner.transit.service.TransitService;
-import org.opentripplanner.updater.TimetableSnapshotSourceParameters;
 import org.opentripplanner.updater.spi.UpdateError;
 import org.opentripplanner.updater.spi.UpdateResult;
 import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
@@ -88,6 +77,30 @@ void testAddedJourneyWithInvalidScheduledData() {
     assertFailure(UpdateError.UpdateErrorType.NEGATIVE_HOP_TIME, result);
   }
 
+  @Test
+  void testAddedJourneyWithUnresolvableAgency() {
+    var env = RealtimeTestEnvironment.siri();
+
+    // Create an extra journey with unknown line and operator
+    var createExtraJourney = new SiriEtBuilder(env.getDateTimeHelper())
+      .withEstimatedVehicleJourneyCode("newJourney")
+      .withIsExtraJourney(true)
+      .withOperatorRef("unknown operator")
+      .withLineRef("unknown line")
+      .withEstimatedCalls(builder ->
+        builder
+          .call(env.stopA1)
+          .departAimedExpected("10:58", "10:48")
+          .call(env.stopB1)
+          .arriveAimedExpected("10:08", "10:58")
+      )
+      .buildEstimatedTimetableDeliveries();
+
+    var result = env.applyEstimatedTimetable(createExtraJourney);
+    assertEquals(0, result.successful());
+    assertFailure(UpdateError.UpdateErrorType.CANNOT_RESOLVE_AGENCY, result);
+  }
+
   @Test
   void testReplaceJourney() {
     var env = RealtimeTestEnvironment.siri();
diff --git a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
index 8eae3be7077..aac485da4eb 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
@@ -2,6 +2,7 @@
 
 import static java.lang.Boolean.TRUE;
 import static org.opentripplanner.ext.siri.mapper.SiriTransportModeMapper.mapTransitMainMode;
+import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.CANNOT_RESOLVE_AGENCY;
 import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_START_DATE;
 import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_VALID_STOPS;
 import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.TOO_FEW_STOPS;
@@ -13,6 +14,8 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Function;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opentripplanner.ext.siri.mapper.PickDropMapper;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.framework.time.ServiceDateUtils;
@@ -172,7 +175,11 @@ Result build() {
 
     Route route = entityResolver.resolveRoute(lineRef);
     if (route == null) {
-      route = createRoute();
+      Agency agency = resolveAgency();
+      if (agency == null) {
+        return UpdateError.result(tripId, CANNOT_RESOLVE_AGENCY);
+      }
+      route = createRoute(agency);
       LOG.info("Adding route {} to transitModel.", route);
       transitModel.getTransitModelIndex().addRoutes(route);
     }
@@ -278,24 +285,34 @@ Result build() {
   /**
    * Method to create a Route. Commonly used to create a route if a real-time message
    * refers to a route that is not in the transit model.
-   *
-   * We will find the first Route with same Operator, and use the same Authority
-   * If no operator found, copy the agency from replaced route
-   *
    * If no name is given for the route, an empty string will be set as the name.
    *
    * @return a new Route
    */
-  private Route createRoute() {
+  @Nonnull
+  private Route createRoute(Agency agency) {
     var routeBuilder = Route.of(entityResolver.resolveId(lineRef));
 
     routeBuilder.withShortName(shortName);
     routeBuilder.withMode(transitMode);
     routeBuilder.withNetexSubmode(transitSubMode);
     routeBuilder.withOperator(operator);
+    routeBuilder.withAgency(agency);
+
+    return routeBuilder.build();
+  }
 
-    // TODO - SIRI: Is there a better way to find authority/Agency?
-    Agency agency = transitModel
+  /**
+   * Attempt to find the agency to which this new trip belongs.
+   * The algorithm retrieves any route operated by the same operator as the one operating this new
+   * trip and resolves its agency.
+   * If no route with the same operator can be found, the algorithm falls back to retrieving the
+   * agency operating the replaced route.
+   * If none can be found the method returns null.
+   */
+  @Nullable
+  private Agency resolveAgency() {
+    return transitModel
       .getTransitModelIndex()
       .getAllRoutes()
       .stream()
@@ -303,9 +320,6 @@ private Route createRoute() {
       .findFirst()
       .map(Route::getAgency)
       .orElseGet(() -> replacedRoute != null ? replacedRoute.getAgency() : null);
-    routeBuilder.withAgency(agency);
-
-    return routeBuilder.build();
   }
 
   private Trip createTrip(Route route, FeedScopedId calServiceId) {
diff --git a/src/main/java/org/opentripplanner/updater/spi/UpdateError.java b/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
index 548ef0210eb..1f568ba99a4 100644
--- a/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
+++ b/src/main/java/org/opentripplanner/updater/spi/UpdateError.java
@@ -49,6 +49,7 @@ public enum UpdateErrorType {
     NOT_IMPLEMENTED_UNSCHEDULED,
     NOT_IMPLEMENTED_DUPLICATED,
     NOT_MONITORED,
+    CANNOT_RESOLVE_AGENCY,
   }
 
   public static  Result result(FeedScopedId tripId, UpdateErrorType errorType) {

From 6915d08a11625b87e7ebf681464a7743a59881d6 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 27 Jun 2024 14:54:11 +0200
Subject: [PATCH 1487/1688] Apply suggestions from code review

Co-authored-by: Leonard Ehrenfried 
---
 .../filterchain/filters/system/SingeCriteriaComparator.java | 6 +++---
 .../filterchain/filters/system/mcmax/McMaxLimitFilter.java  | 6 +++---
 .../algorithm/filterchain/filters/system/mcmax/State.java   | 4 ++--
 .../filters/system/SingeCriteriaComparatorTest.java         | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
index 528542d40df..55fb040caf8 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
@@ -6,11 +6,11 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n;
 
 /**
- * Comparator used to compare a SINGE criteria for dominance. The difference between this and the
+ * Comparator used to compare a SINGLE criteria for dominance. The difference between this and the
  * {@link org.opentripplanner.raptor.util.paretoset.ParetoComparator} is that:
  * 
                
  *   
              1. This applies to one criteria, not multiple.
                2. 
- *   
              2. This interface apply to itineraries; It is not generic.
                3. 
+ *   
              3. This interface applies to itineraries; It is not generic.
                4. 
  * 
              
  * A set of instances of this interface can be used to create a pareto-set. See
  * {@link org.opentripplanner.raptor.util.paretoset.ParetoSet} and
@@ -22,7 +22,7 @@
 @FunctionalInterface
 public interface SingeCriteriaComparator {
   /**
-   * The left criteria dominates the right criteria. Note! The right criteria my dominate
+   * The left criteria dominates the right criteria. Note! The right criteria may dominate
    * the left criteria if there is no {@link #strictOrder()}. If left and right are equals, then
    * there is no dominance.
    */
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
index 180ef979085..687d5d0c17c 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
@@ -16,20 +16,20 @@
  * to each criterion is kept. So, if the grouping is based on time and riding common trips, then
  * this filter will use the reminding criterion (transfers, generalized-cost,
  * [transit-group-priority]) to filter the grouped set of itineraries. DO NOT INCLUDE CRITERIA
- * USED TO GROUP THE ITINERARIES, ONLY THE REMINDING CRITERION USED IN THE RAPTOR SEARCH.
+ * USED TO GROUP THE ITINERARIES, ONLY THE REMAINING CRITERION USED IN THE RAPTOR SEARCH.
  * 
              
  * IMPLEMENTATION DETAILS
  * 
              
  * This is not a trivial problem. In most cases, the best itinerary for a given criteria is unique,
  * but there might be ties - same number of transfers, same cost, and/or different priority groups.
  * In case of a tie, we will look if an itinerary is "best-in-group" for more than one criterion,
- * if so we pick the one witch is best in the highest number of groups. Again, if there is a tie
+ * if so we pick the one which is best in the highest number of groups. Again, if there is a tie
  * (best in the same number of groups), then we fall back to the given itinerary sorting order.
  * 
              
  * This filter will use the order of the input itineraries to break ties. So, make sure to call the
  * appropriate sort function before this filter is invoked.
  * 
              
- * Note! For a criteria like num-of-transfers or generalized-cost, there is only one set of "best"
+ * Note! For criteria like num-of-transfers or generalized-cost, there is only one set of "best"
  * itineraries, and usually there are only one or a few itineraries. In case there is more than one,
  * picking just one is fine. But, for transit-group-priority there might be more than one optimal
  * set of itineraries. For each set, we need to pick one itinerary for the final result. Each of
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
index d616c505446..06224ccfcab 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
@@ -46,7 +46,7 @@ void findAllSingleItemGroupsAndAddTheItemToTheResult() {
   /**
    * Find the items with the highest group count and the lowest index. Theoretically, there might be
    * a smaller set of itineraries that TOGETHER represent all groups than what we achieve here, but
-   * it is fare more complicated to compute - so this is probably good enough.
+   * it is far more complicated to compute - so this is probably good enough.
    */
   void findTheBestItemsUntilAllGroupsAreRepresentedInTheResult() {
     while (!groups.isEmpty()) {
@@ -88,7 +88,7 @@ private void removeGroupsWitchContainsItem(Item item) {
   }
 
   /**
-   * The best item is the one witch exists in most groups, and in case of a tie, the sort order/
+   * The best item is the one which exists in most groups, and in case of a tie, the sort order/
    * itinerary index is used.
    */
   private static Item findBestItem(List groups) {
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
index 8f4b2b4ddeb..addf6dcd1d0 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
@@ -13,7 +13,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 
-class SingeCriteriaComparatorTest {
+class SingleCriteriaComparatorTest {
 
   private static final TransitModelForTest TEST_MODEL = TransitModelForTest.of();
 
@@ -66,7 +66,7 @@ void compareNumTransfers() {
 
     // leftDominanceExist
     assertFalse(subject.leftDominanceExist(zeroTransferHighCost, zeroTransferLowCost));
-    Assertions.assertTrue(subject.leftDominanceExist(zeroTransferLowCost, oneTransferLowCost));
+    assertTrue(subject.leftDominanceExist(zeroTransferLowCost, oneTransferLowCost));
     assertFalse(subject.leftDominanceExist(oneTransferLowCost, zeroTransferLowCost));
 
     // strict order expected

From c1dc4b324890abd0c4f5010e48de072abc7c461a Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 27 Jun 2024 14:57:49 +0200
Subject: [PATCH 1488/1688] refactor: Fix spelling SingleCriteriaComparator

---
 .../ItineraryListFilterChainBuilder.java           | 10 +++++-----
 ...mparator.java => SingleCriteriaComparator.java} | 12 ++++++------
 .../filters/system/mcmax/McMaxLimitFilter.java     |  6 +++---
 .../filterchain/filters/system/mcmax/State.java    | 14 +++++++-------
 ...Test.java => SingleCriteriaComparatorTest.java} | 13 ++++++-------
 .../filters/system/mcmax/McMaxLimitFilterTest.java |  8 ++++----
 6 files changed, 31 insertions(+), 32 deletions(-)
 rename src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{SingeCriteriaComparator.java => SingleCriteriaComparator.java} (85%)
 rename src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/{SingeCriteriaComparatorTest.java => SingleCriteriaComparatorTest.java} (89%)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
index 84f3030b09f..071814a7abf 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/ItineraryListFilterChainBuilder.java
@@ -28,7 +28,7 @@
 import org.opentripplanner.routing.algorithm.filterchain.filters.system.NumItinerariesFilter;
 import org.opentripplanner.routing.algorithm.filterchain.filters.system.OutsideSearchWindowFilter;
 import org.opentripplanner.routing.algorithm.filterchain.filters.system.PagingFilter;
-import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator;
+import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingleCriteriaComparator;
 import org.opentripplanner.routing.algorithm.filterchain.filters.system.mcmax.McMaxLimitFilter;
 import org.opentripplanner.routing.algorithm.filterchain.filters.transit.DecorateTransitAlert;
 import org.opentripplanner.routing.algorithm.filterchain.filters.transit.KeepItinerariesWithFewestTransfers;
@@ -635,11 +635,11 @@ private static void addDecorateFilter(
 
   private RemoveItineraryFlagger createMaxLimitFilter(String filterName, int maxLimit) {
     if (OTPFeature.MultiCriteriaGroupMaxFilter.isOn()) {
-      List comparators = new ArrayList<>();
-      comparators.add(SingeCriteriaComparator.compareGeneralizedCost());
-      comparators.add(SingeCriteriaComparator.compareNumTransfers());
+      List comparators = new ArrayList<>();
+      comparators.add(SingleCriteriaComparator.compareGeneralizedCost());
+      comparators.add(SingleCriteriaComparator.compareNumTransfers());
       if (transitGroupPriorityUsed) {
-        comparators.add(SingeCriteriaComparator.compareTransitGroupsPriority());
+        comparators.add(SingleCriteriaComparator.compareTransitGroupsPriority());
       }
       return new McMaxLimitFilter(filterName, maxLimit, comparators);
     }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparator.java
similarity index 85%
rename from src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
rename to src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparator.java
index 55fb040caf8..ee814213157 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparator.java
@@ -20,7 +20,7 @@
  * can be sorted, if so the {@link #strictOrder()} should return false (this is the default).
  */
 @FunctionalInterface
-public interface SingeCriteriaComparator {
+public interface SingleCriteriaComparator {
   /**
    * The left criteria dominates the right criteria. Note! The right criteria may dominate
    * the left criteria if there is no {@link #strictOrder()}. If left and right are equals, then
@@ -35,16 +35,16 @@ default boolean strictOrder() {
     return false;
   }
 
-  static SingeCriteriaComparator compareNumTransfers() {
+  static SingleCriteriaComparator compareNumTransfers() {
     return compareLessThan(Itinerary::getNumberOfTransfers);
   }
 
-  static SingeCriteriaComparator compareGeneralizedCost() {
+  static SingleCriteriaComparator compareGeneralizedCost() {
     return compareLessThan(Itinerary::getGeneralizedCost);
   }
 
   @SuppressWarnings("OptionalGetWithoutIsPresent")
-  static SingeCriteriaComparator compareTransitGroupsPriority() {
+  static SingleCriteriaComparator compareTransitGroupsPriority() {
     return (left, right) ->
       TransitGroupPriority32n.dominate(
         left.getGeneralizedCost2().get(),
@@ -52,8 +52,8 @@ static SingeCriteriaComparator compareTransitGroupsPriority() {
       );
   }
 
-  static SingeCriteriaComparator compareLessThan(final ToIntFunction op) {
-    return new SingeCriteriaComparator() {
+  static SingleCriteriaComparator compareLessThan(final ToIntFunction op) {
+    return new SingleCriteriaComparator() {
       @Override
       public boolean leftDominanceExist(Itinerary left, Itinerary right) {
         return op.applyAsInt(left) < op.applyAsInt(right);
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
index 687d5d0c17c..9ee35e0c656 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
@@ -3,7 +3,7 @@
 import java.util.List;
 import java.util.function.Predicate;
 import org.opentripplanner.model.plan.Itinerary;
-import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator;
+import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingleCriteriaComparator;
 import org.opentripplanner.routing.algorithm.filterchain.framework.spi.RemoveItineraryFlagger;
 
 /**
@@ -70,12 +70,12 @@ public class McMaxLimitFilter implements RemoveItineraryFlagger {
 
   private final String name;
   private final int minNumItineraries;
-  private final List comparators;
+  private final List comparators;
 
   public McMaxLimitFilter(
     String name,
     int minNumItineraries,
-    List comparators
+    List comparators
   ) {
     this.name = name;
     this.minNumItineraries = minNumItineraries;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
index 06224ccfcab..93b8b1097c9 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/State.java
@@ -5,7 +5,7 @@
 import java.util.List;
 import javax.annotation.Nullable;
 import org.opentripplanner.model.plan.Itinerary;
-import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator;
+import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingleCriteriaComparator;
 
 /**
  * Keep a list of items, groups and the result in progress. This is just a class for
@@ -23,7 +23,7 @@ class State {
    * cost). There should be at least one itinerary from each group surviving the filtering process.
    * The same itinerary can exist in multiple groups.
    */
-  State(List itineraries, List comparators) {
+  State(List itineraries, List comparators) {
     this.items = createListOfItems(itineraries);
     this.groups = createGroups(items, comparators);
   }
@@ -126,10 +126,10 @@ private static ArrayList createListOfItems(List itineraries) {
 
   private static List createGroups(
     Collection items,
-    List comparators
+    List comparators
   ) {
     List groups = new ArrayList<>();
-    for (SingeCriteriaComparator comparator : comparators) {
+    for (SingleCriteriaComparator comparator : comparators) {
       if (comparator.strictOrder()) {
         groups.add(createOrderedGroup(items, comparator));
       } else {
@@ -145,7 +145,7 @@ private static List createGroups(
    */
   private static Group createOrderedGroup(
     Collection items,
-    SingeCriteriaComparator comparator
+    SingleCriteriaComparator comparator
   ) {
     Group group = null;
     for (Item item : items) {
@@ -168,11 +168,11 @@ private static Group createOrderedGroup(
    * the given {@code comparator}. This method will create a group for each optimal value found in
    * the given set of items.
    *
-   * @see #createOrderedGroup(Collection, SingeCriteriaComparator)
+   * @see #createOrderedGroup(Collection, SingleCriteriaComparator)
    */
   private static Collection createUnorderedGroups(
     Collection items,
-    SingeCriteriaComparator comparator
+    SingleCriteriaComparator comparator
   ) {
     List result = new ArrayList<>();
 
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
similarity index 89%
rename from src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
rename to src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
index addf6dcd1d0..2609fc931b5 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingeCriteriaComparatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.opentripplanner.model.plan.TestItineraryBuilder.newItinerary;
 
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.model.plan.Itinerary;
@@ -55,14 +54,14 @@ static void setUp() {
 
   @Test
   void strictOrder() {
-    assertTrue(SingeCriteriaComparator.compareNumTransfers().strictOrder());
-    assertTrue(SingeCriteriaComparator.compareGeneralizedCost().strictOrder());
-    assertFalse(SingeCriteriaComparator.compareTransitGroupsPriority().strictOrder());
+    assertTrue(SingleCriteriaComparator.compareNumTransfers().strictOrder());
+    assertTrue(SingleCriteriaComparator.compareGeneralizedCost().strictOrder());
+    assertFalse(SingleCriteriaComparator.compareTransitGroupsPriority().strictOrder());
   }
 
   @Test
   void compareNumTransfers() {
-    var subject = SingeCriteriaComparator.compareNumTransfers();
+    var subject = SingleCriteriaComparator.compareNumTransfers();
 
     // leftDominanceExist
     assertFalse(subject.leftDominanceExist(zeroTransferHighCost, zeroTransferLowCost));
@@ -75,7 +74,7 @@ void compareNumTransfers() {
 
   @Test
   void compareGeneralizedCost() {
-    var subject = SingeCriteriaComparator.compareGeneralizedCost();
+    var subject = SingleCriteriaComparator.compareGeneralizedCost();
 
     System.out.println(zeroTransferLowCost.getGeneralizedCost());
     System.out.println(zeroTransferHighCost.getGeneralizedCost());
@@ -99,7 +98,7 @@ void compareTransitPriorityGroups() {
       .withGeneralizedCost2(TransitGroupPriority32n.mergeInGroupId(1, 2))
       .build();
 
-    var subject = SingeCriteriaComparator.compareTransitGroupsPriority();
+    var subject = SingleCriteriaComparator.compareTransitGroupsPriority();
 
     assertTrue(subject.leftDominanceExist(group1, group2));
     assertTrue(subject.leftDominanceExist(group2, group1));
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
index 3c35b0172f8..ca7a1bb5336 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilterTest.java
@@ -10,7 +10,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.model.plan.Itinerary;
 import org.opentripplanner.model.plan.Place;
-import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingeCriteriaComparator;
+import org.opentripplanner.routing.algorithm.filterchain.filters.system.SingleCriteriaComparator;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 
@@ -48,9 +48,9 @@ class McMaxLimitFilterTest {
     "test",
     2,
     List.of(
-      SingeCriteriaComparator.compareGeneralizedCost(),
-      SingeCriteriaComparator.compareNumTransfers(),
-      SingeCriteriaComparator.compareTransitGroupsPriority()
+      SingleCriteriaComparator.compareGeneralizedCost(),
+      SingleCriteriaComparator.compareNumTransfers(),
+      SingleCriteriaComparator.compareTransitGroupsPriority()
     )
   );
 

From dd4bf1bb11ebd7df3940d3ee07100c1205b2809e Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 27 Jun 2024 14:59:07 +0200
Subject: [PATCH 1489/1688] Apply suggestions from code review

Co-authored-by: Leonard Ehrenfried 
---
 .../filterchain/filters/system/mcmax/McMaxLimitFilter.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
index 9ee35e0c656..c0b07e7400a 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/mcmax/McMaxLimitFilter.java
@@ -14,7 +14,7 @@
  * The main usage of this filter is to combine it with a transit grouping filter and for each group
  * make sure there is at least {@code minNumItineraries} and that the best itinerary with respect
  * to each criterion is kept. So, if the grouping is based on time and riding common trips, then
- * this filter will use the reminding criterion (transfers, generalized-cost,
+ * this filter will use the remaining criterion (transfers, generalized-cost,
  * [transit-group-priority]) to filter the grouped set of itineraries. DO NOT INCLUDE CRITERIA
  * USED TO GROUP THE ITINERARIES, ONLY THE REMAINING CRITERION USED IN THE RAPTOR SEARCH.
  * 
              

From 9b4b7fe884f05ec965e31aaef7124a1358e2f6d8 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 27 Jun 2024 15:03:13 +0200
Subject: [PATCH 1490/1688] refactor: Remove System.out

---
 .../opentripplanner/datastore/file/ZipFileDataSourceTest.java | 1 -
 .../datastore/file/ZipStreamDataSourceDecoratorTest.java      | 1 -
 .../filters/system/SingleCriteriaComparatorTest.java          | 4 ----
 3 files changed, 6 deletions(-)

diff --git a/src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java b/src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java
index da46fc430b6..b5b8f797eb3 100644
--- a/src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java
+++ b/src/test/java/org/opentripplanner/datastore/file/ZipFileDataSourceTest.java
@@ -74,7 +74,6 @@ public void testIO() throws IOException {
     Collection content = subject.content();
     Collection names = content.stream().map(DataSource::name).toList();
 
-    //System.out.println(names);
     assertTrue(
       names.containsAll(List.of("agency.txt", "stops.txt", "trips.txt")),
       names.toString()
diff --git a/src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java b/src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java
index 09479d85478..21d4bc6bed0 100644
--- a/src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java
+++ b/src/test/java/org/opentripplanner/datastore/file/ZipStreamDataSourceDecoratorTest.java
@@ -100,7 +100,6 @@ void testIO() throws IOException {
     Collection content = subject.content();
     Collection names = content.stream().map(DataSource::name).toList();
 
-    System.out.println(names);
     assertTrue(names.containsAll(EXPECTED_ZIP_ENTRIES), names.toString());
 
     DataSource entry = subject.entry("agency.txt");
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
index 2609fc931b5..ebcf441370f 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/filterchain/filters/system/SingleCriteriaComparatorTest.java
@@ -76,10 +76,6 @@ void compareNumTransfers() {
   void compareGeneralizedCost() {
     var subject = SingleCriteriaComparator.compareGeneralizedCost();
 
-    System.out.println(zeroTransferLowCost.getGeneralizedCost());
-    System.out.println(zeroTransferHighCost.getGeneralizedCost());
-    System.out.println(oneTransferLowCost.getGeneralizedCost());
-
     // leftDominanceExist
     assertFalse(subject.leftDominanceExist(zeroTransferHighCost, zeroTransferLowCost));
     assertTrue(subject.leftDominanceExist(zeroTransferLowCost, zeroTransferHighCost));

From 1850dd1ab7f9ed0c7db255c2d163b116bfe45b3b Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Thu, 27 Jun 2024 15:28:12 +0200
Subject: [PATCH 1491/1688] Use immutable collections in timetable snapshot.

---
 .../model/TimetableSnapshot.java              | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index 5c018412572..ac4de0ce38c 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.model;
 
 import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableSetMultimap;
 import com.google.common.collect.SetMultimap;
 import java.time.LocalDate;
 import java.util.Collection;
@@ -9,6 +10,7 @@
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 import java.util.Set;
@@ -80,8 +82,7 @@ public class TimetableSnapshot {
    * include ones from the scheduled GTFS, as well as ones added by realtime messages and
    * tracked by the TripPatternCache. 
              
    * Note that the keys do not include all scheduled TripPatterns, only those for which we have at
-   * least one update. The type of the field is specifically HashMap (rather than the more general
-   * Map interface) because we need to efficiently clone it. 
              
+   * least one update.
              
    * The members of the SortedSet (the Timetable for a particular day) are treated as copy-on-write
    * when we're updating them. If an update will modify the timetable for a particular day, that
    * timetable is replicated before any modifications are applied to avoid affecting any previous
@@ -91,16 +92,15 @@ public class TimetableSnapshot {
    * The compound key approach better reflects the fact that there should be only one Timetable per
    * TripPattern and date.
    */
-  private HashMap> timetables = new HashMap();
+  private Map> timetables = new HashMap();
 
   /**
    * For cases where the trip pattern (sequence of stops visited) has been changed by a realtime
    * update, a Map associating the updated trip pattern with a compound key of the feed-scoped
-   * trip ID and the service date. The type of this field is HashMap rather than the more general
-   * Map interface because we need to efficiently clone it whenever we start building up a new
-   * snapshot. TODO RT_AB: clarify if this is an index or the original source of truth.
+   * trip ID and the service date.
+   * TODO RT_AB: clarify if this is an index or the original source of truth.
    */
-  private HashMap realtimeAddedTripPattern = new HashMap<>();
+  private Map realtimeAddedTripPattern = new HashMap<>();
 
   /**
    * This is an index of TripPatterns, not the primary collection. It tracks which TripPatterns
@@ -256,9 +256,8 @@ public TimetableSnapshot commit(TransitLayerUpdater transitLayerUpdater, boolean
     if (!force && !this.isDirty()) {
       return null;
     }
-    ret.timetables = (HashMap>) this.timetables.clone();
-    ret.realtimeAddedTripPattern =
-      (HashMap) this.realtimeAddedTripPattern.clone();
+    ret.timetables = Map.copyOf(timetables);
+    ret.realtimeAddedTripPattern = Map.copyOf(realtimeAddedTripPattern);
 
     if (transitLayerUpdater != null) {
       transitLayerUpdater.update(dirtyTimetables, timetables);
@@ -267,7 +266,7 @@ public TimetableSnapshot commit(TransitLayerUpdater transitLayerUpdater, boolean
     this.dirtyTimetables.clear();
     this.dirty = false;
 
-    ret.setPatternsForStop(HashMultimap.create(this.patternsForStop));
+    ret.setPatternsForStop(ImmutableSetMultimap.copyOf(patternsForStop));
 
     ret.readOnly = true; // mark the snapshot as henceforth immutable
     return ret;

From 41794f4ad5f406fb4045ef420791e7d57a0465b6 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 27 Jun 2024 18:20:55 +0200
Subject: [PATCH 1492/1688] Apply suggestions from code review

Co-authored-by: Andrew Byrd 
---
 docs/Frontends.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/Frontends.md b/docs/Frontends.md
index b8134d4cf7c..92c1d0bba4d 100644
--- a/docs/Frontends.md
+++ b/docs/Frontends.md
@@ -22,11 +22,11 @@ The main OpenTripPlanner repository currently contains two debug web frontends:
 - the original one in [`/src/client/classic-debug/`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/src/client/classic-debug) 
 
 The **new debug client** is a React/TypeScript Single Page App (SPA) that can be served locally or accessed over a content delivery network (CDN). 
-Unlike the original debug client, it connects to the OTP Java backend via the GraphQL API using the Transmodel vocabulary.
+Unlike the original debug client, it connects to the OTP Java backend via the GraphQL API using the Transmodel vocabulary. By default, it is available at the root URL (`http://localhost:8080/` in local operation).
 
 The **original debug client** is a jQuery and Backbone based UI whose history can be traced back over a decade to the first days of the OTP project. 
-It connects to the OTP Java backend via a REST API using the GTFS vocabulary. Historically this was the default OTP interface, and for now it continues to be 
-available on any running OTP instance at the root URL.
+It connects to the OTP Java backend via a REST API using the GTFS vocabulary. Historically this was the default OTP interface available at the root URL.
+It is still available, but has been moved to `http://localhost:8080/classic-debug/` .
 
 There is a third piece of software that might qualify as an OTP client: a Java Swing application making use of the Processing visualization library, 
 located in the [GraphVisualizer class](https://github.com/opentripplanner/OpenTripPlanner/blob/dev-2.x/src/main/java/org/opentripplanner/visualizer/GraphVisualizer.java). 
@@ -36,7 +36,7 @@ street network, providing some insight into the internals of the routing algorit
 
 ## Working with Debug Frontends
 
-While the two debug frontends are enabled by default as of this writing, it may not be in the future, or you may wish to disable it if you've chosen to use a different frontend. 
+While the two debug frontends are enabled by default as of this writing, they may not be in the future, and you may wish to disable them if you've chosen to use a different frontend. 
 Also, to get full use of the existing debug frontends you may want to enable OTP's built-in simple testing geocoder which performs fuzzy searches for 
 transit stops by name, supplying their coordinates to the routing engine. Without it, you will be limited to origins and destinations selected on a map or 
 specified in terms of latitude and longitude coordinates. The debug frontend and the geocoder can be toggled in `otp-config.json`:

From 07728f218d3191c198b0295a92ec1c1361201b33 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 27 Jun 2024 18:22:50 +0200
Subject: [PATCH 1493/1688] Replace 'original' with 'classic'

---
 docs/Frontends.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Frontends.md b/docs/Frontends.md
index 92c1d0bba4d..b2f0b9d0b2e 100644
--- a/docs/Frontends.md
+++ b/docs/Frontends.md
@@ -19,12 +19,12 @@ On the other hand, **production frontends** are intended to be a component of la
 The main OpenTripPlanner repository currently contains two debug web frontends: 
 
 - new one currently under development at [`/client`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/client).
-- the original one in [`/src/client/classic-debug/`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/src/client/classic-debug) 
+- the classic one in [`/src/client/classic-debug/`](https://github.com/opentripplanner/OpenTripPlanner/tree/dev-2.x/src/client/classic-debug) 
 
 The **new debug client** is a React/TypeScript Single Page App (SPA) that can be served locally or accessed over a content delivery network (CDN). 
 Unlike the original debug client, it connects to the OTP Java backend via the GraphQL API using the Transmodel vocabulary. By default, it is available at the root URL (`http://localhost:8080/` in local operation).
 
-The **original debug client** is a jQuery and Backbone based UI whose history can be traced back over a decade to the first days of the OTP project. 
+The **classic debug client** is a jQuery and Backbone based UI whose history can be traced back over a decade to the first days of the OTP project. 
 It connects to the OTP Java backend via a REST API using the GTFS vocabulary. Historically this was the default OTP interface available at the root URL.
 It is still available, but has been moved to `http://localhost:8080/classic-debug/` .
 

From 46c5373470ffeba624e018ed2a8305f5eb7c6746 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 27 Jun 2024 18:24:44 +0200
Subject: [PATCH 1494/1688] Revert change

---
 .../org/opentripplanner/test/support/JsonAssertions.java | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
index e836ace81fd..1fe87268eee 100644
--- a/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
+++ b/src/test/java/org/opentripplanner/test/support/JsonAssertions.java
@@ -32,10 +32,11 @@ public static void assertEqualJson(String expected, JsonNode actual) {
       assertEquals(
         exp,
         actualNode,
-        "Expected '%s' but actual was '%s'".formatted(
-            JsonSupport.prettyPrint(exp),
-            JsonSupport.prettyPrint(actualNode)
-          )
+        () ->
+          "Expected '%s' but actual was '%s'".formatted(
+              JsonSupport.prettyPrint(exp),
+              JsonSupport.prettyPrint(actualNode)
+            )
       );
     } catch (JsonProcessingException e) {
       throw new RuntimeException(e);

From 7c8c4a679dd261b19d6fadf4cbf362fa7886bc9f Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 27 Jun 2024 22:04:55 +0000
Subject: [PATCH 1495/1688] Update junit5 monorepo to v5.10.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 62f6155fd10..d77daf01502 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
         2.51.1
         2.17.1
         3.1.7
-        5.10.2
+        5.10.3
         1.13.0
         5.5.3
         1.5.6

From df5fc3fe859ee2a0ea78e1cc46634298e2cd6296 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Fri, 28 Jun 2024 10:52:23 +0000
Subject: [PATCH 1496/1688] Add changelog entry for #5924 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 7d524a77258..27e84a71ff6 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -36,6 +36,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Improve cancellation of large response in TransModel API [#5908](https://github.com/opentripplanner/OpenTripPlanner/pull/5908)
 - Refactor SIRI-ET updaters [#5904](https://github.com/opentripplanner/OpenTripPlanner/pull/5904)
 - Update Google Pubsub updater configuration [#5927](https://github.com/opentripplanner/OpenTripPlanner/pull/5927)
+- Make new debug client the default, move old one to `classic-debug` [#5924](https://github.com/opentripplanner/OpenTripPlanner/pull/5924)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 1322ecb90daf8b6e978d0f6102562d543c110e6b Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Fri, 28 Jun 2024 10:53:24 +0000
Subject: [PATCH 1497/1688] Upgrade debug client to version
 2024/06/2024-06-28T10:52

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index 77fc8ebbe8d..8767b03a337 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 59c4183137b43977252faa0f069f158ec016fcd2 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 28 Jun 2024 10:53:35 +0000
Subject: [PATCH 1498/1688] Update Debug UI dependencies (non-major)

---
 client/package-lock.json | 551 +++++++++++++++++++++++++--------------
 client/package.json      |  22 +-
 2 files changed, 367 insertions(+), 206 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index d57d763b59c..3c4520eb745 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -10,37 +10,37 @@
       "dependencies": {
         "@googlemaps/polyline-codec": "1.0.28",
         "bootstrap": "5.3.3",
-        "graphql": "16.8.2",
-        "graphql-request": "7.0.1",
-        "maplibre-gl": "4.4.0",
+        "graphql": "16.9.0",
+        "graphql-request": "7.1.0",
+        "maplibre-gl": "4.5.0",
         "react": "18.3.1",
-        "react-bootstrap": "2.10.2",
+        "react-bootstrap": "2.10.3",
         "react-dom": "18.3.1",
         "react-map-gl": "7.1.7"
       },
       "devDependencies": {
         "@graphql-codegen/cli": "5.0.2",
-        "@graphql-codegen/client-preset": "4.3.0",
+        "@graphql-codegen/client-preset": "4.3.1",
         "@graphql-codegen/introspection": "4.0.3",
         "@parcel/watcher": "2.4.1",
         "@testing-library/react": "16.0.0",
         "@types/react": "18.3.3",
         "@types/react-dom": "18.3.0",
-        "@typescript-eslint/eslint-plugin": "7.13.0",
-        "@typescript-eslint/parser": "7.13.0",
+        "@typescript-eslint/eslint-plugin": "7.14.1",
+        "@typescript-eslint/parser": "7.14.1",
         "@vitejs/plugin-react": "4.3.1",
         "@vitest/coverage-v8": "1.6.0",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",
-        "eslint-plugin-jsx-a11y": "6.8.0",
-        "eslint-plugin-react": "7.34.2",
+        "eslint-plugin-jsx-a11y": "6.9.0",
+        "eslint-plugin-react": "7.34.3",
         "eslint-plugin-react-hooks": "4.6.2",
         "eslint-plugin-react-refresh": "0.4.7",
         "jsdom": "24.1.0",
         "prettier": "3.3.2",
-        "typescript": "5.4.5",
-        "vite": "5.3.1",
+        "typescript": "5.5.2",
+        "vite": "5.3.2",
         "vitest": "1.6.0"
       }
     },
@@ -1104,9 +1104,10 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.24.1",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.1.tgz",
-      "integrity": "sha512-+BIznRzyqBf+2wCTxcKE3wDjfGeCoVE61KSHGpkzqrLi8qxqFwBeUFyId2cxkTmm55fzDGnm0+yCxaxygrLUnQ==",
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz",
+      "integrity": "sha512-UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==",
+      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -1173,9 +1174,9 @@
       "dev": true
     },
     "node_modules/@dprint/darwin-arm64": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.45.1.tgz",
-      "integrity": "sha512-pH0/uKLJ5SJPoHhOwLWFMhCmL0BY3FzWQbull8OGMK/FRkIPgOl2adZSovtUZpUMGWyDOzIWH1fW9X2DuMhnEg==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/@dprint/darwin-arm64/-/darwin-arm64-0.46.3.tgz",
+      "integrity": "sha512-1ycDpGvclGHF3UG5V6peymPDg6ouNTqM6BjhVELQ6zwr+X98AMhq/1slgO8hwHtPcaS5qhTAS+PkzOmBJRegow==",
       "cpu": [
         "arm64"
       ],
@@ -1183,12 +1184,13 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@dprint/darwin-x64": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.45.1.tgz",
-      "integrity": "sha512-YUj421LmBLDlxpIER3pORKfQmpmXD50n5mClHjpZrnl17WTiHtQ+jHvDJdJoxH2eS66W0mQyxLoGo5SfFfiM7A==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/@dprint/darwin-x64/-/darwin-x64-0.46.3.tgz",
+      "integrity": "sha512-v5IpLmrY836Q5hJAxZuX097ZNQvoZgO6JKO4bK4l6XDhhHAw2XTIUr41+FM5r36ENxyASMk0NpHjhcHtih3o0g==",
       "cpu": [
         "x64"
       ],
@@ -1196,18 +1198,21 @@
       "optional": true,
       "os": [
         "darwin"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@dprint/formatter": {
       "version": "0.3.0",
       "resolved": "https://registry.npmjs.org/@dprint/formatter/-/formatter-0.3.0.tgz",
       "integrity": "sha512-N9fxCxbaBOrDkteSOzaCqwWjso5iAe+WJPsHC021JfHNj2ThInPNEF13ORDKta3llq5D1TlclODCvOvipH7bWQ==",
-      "license": "MIT"
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/@dprint/linux-arm64-glibc": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.45.1.tgz",
-      "integrity": "sha512-lJ7s/pOQWRJ0mstjZQnVyX2/3QRXZ9cpFHJDZ7e81Y8QSn/iqxTrnK0DPgxUrDG8hYKQmWQdQLU4sP5DKBz0Jg==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-glibc/-/linux-arm64-glibc-0.46.3.tgz",
+      "integrity": "sha512-9P13g1vgV8RfQH2qBGa8YAfaOeWA42RIhj7lmWRpkDFtwau96reMKwnBBn8bHUnc5e6bSsbPUOMb/X1KMUKz/g==",
       "cpu": [
         "arm64"
       ],
@@ -1215,12 +1220,13 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@dprint/linux-arm64-musl": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-musl/-/linux-arm64-musl-0.45.1.tgz",
-      "integrity": "sha512-un2awe1L1sAJLsCPSEUrE0/cgupdzbYFoyBOutyU1zHR9KQn47AtIDw+chvuinU4xleHDuEGyXGuJ6NE+Ky6vw==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/@dprint/linux-arm64-musl/-/linux-arm64-musl-0.46.3.tgz",
+      "integrity": "sha512-AAcdcMSZ6DEIoY9E0xQHjkZP+THP7EWsQge4TWzglSIjzn31YltglHAGYFcLB4CTJYpF0NsFDNFktzgkO+s0og==",
       "cpu": [
         "arm64"
       ],
@@ -1228,12 +1234,13 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@dprint/linux-x64-glibc": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.45.1.tgz",
-      "integrity": "sha512-5Civht90S/g8zlyYB7n4oH78p+sLbNqeFCFuImJRK7uRxZwCRya7lji6RwlB6DQ7qngVqovTHj9RLOYfZzfVlg==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/@dprint/linux-x64-glibc/-/linux-x64-glibc-0.46.3.tgz",
+      "integrity": "sha512-c5cQ3G1rC64nBZ8Pd2LGWwzkEk4D7Ax9NrBbwYmNPvs6mFbGlJPC1+RD95x2WwIrIlMIciLG+Kxmt25PzBphmg==",
       "cpu": [
         "x64"
       ],
@@ -1241,12 +1248,13 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@dprint/linux-x64-musl": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.45.1.tgz",
-      "integrity": "sha512-p2/gjnHDd8GRCvtey5HZO4o/He6pSmY/zpcCuIXprFW9P0vNlEj3DFhz4FPpOKXM+csrsVWWs2E0T/xr5QZtVg==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/@dprint/linux-x64-musl/-/linux-x64-musl-0.46.3.tgz",
+      "integrity": "sha512-ONtk2QtLcV0TqWOCOqzUFQixgk3JC+vnJLB5L6tQwT7BX5LzeircfE/1f4dg459iqejNC9MBXZkHnXqabvWSow==",
       "cpu": [
         "x64"
       ],
@@ -1254,18 +1262,21 @@
       "optional": true,
       "os": [
         "linux"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@dprint/typescript": {
-      "version": "0.90.5",
-      "resolved": "https://registry.npmjs.org/@dprint/typescript/-/typescript-0.90.5.tgz",
-      "integrity": "sha512-/1aP6saonFvJyQN3l2is6eTOec3GnLGyW+opid/eDm8pnlhwzYl8A9p36pI6WO5jLl/a9Ghod+LWpvSOuXFGUw==",
-      "license": "MIT"
+      "version": "0.91.1",
+      "resolved": "https://registry.npmjs.org/@dprint/typescript/-/typescript-0.91.1.tgz",
+      "integrity": "sha512-BX3TneRLf3OuO/3tsxbseHqWbpCPOOb2vOm9OlKgSYIKqOsCHpz5kWx5iDuGrNwxWWMKife/1ccz87I5tBLaNA==",
+      "license": "MIT",
+      "optional": true,
+      "peer": true
     },
     "node_modules/@dprint/win32-x64": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.45.1.tgz",
-      "integrity": "sha512-2l78XM7KsW46P2Yv6uPB3fE+y92EsBlrCxi+RVQ0pbznPFdMdkLyGgaCuh683zdld14jHlaADpIQ7YchGAEMAg==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/@dprint/win32-x64/-/win32-x64-0.46.3.tgz",
+      "integrity": "sha512-xvj4DSEilf0gGdT7CqnwNEgfWNuWqT6eIBxHDEUbmcn1vZ7IwirtqRq/nm3lmYtQaJ4EbtMQZvACHZwxC7G96w==",
       "cpu": [
         "x64"
       ],
@@ -1273,7 +1284,8 @@
       "optional": true,
       "os": [
         "win32"
-      ]
+      ],
+      "peer": true
     },
     "node_modules/@esbuild/aix-ppc64": {
       "version": "0.21.5",
@@ -1849,21 +1861,21 @@
       }
     },
     "node_modules/@graphql-codegen/client-preset": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.3.0.tgz",
-      "integrity": "sha512-p2szj5YiyLUYnQn1h7S4dsSY2Jc1LNrm32ptkb6CGtqPo3w9vgqki2WRJwgeJN8s3bhifqWRPzhoid/smrFVgA==",
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.3.1.tgz",
+      "integrity": "sha512-FHszBKhubbJkrZHwzUNfMUp9IkzufCfn/riTpIy5yA84Wq0AJSPFL7nWkG+h3azFPeznLfqo3KJmfzRb+xeFEA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/template": "^7.20.7",
         "@graphql-codegen/add": "^5.0.3",
-        "@graphql-codegen/gql-tag-operations": "4.0.7",
+        "@graphql-codegen/gql-tag-operations": "4.0.8",
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/typed-document-node": "^5.0.7",
-        "@graphql-codegen/typescript": "^4.0.7",
-        "@graphql-codegen/typescript-operations": "^4.2.1",
-        "@graphql-codegen/visitor-plugin-common": "^5.2.0",
+        "@graphql-codegen/typed-document-node": "^5.0.8",
+        "@graphql-codegen/typescript": "^4.0.8",
+        "@graphql-codegen/typescript-operations": "^4.2.2",
+        "@graphql-codegen/visitor-plugin-common": "^5.3.0",
         "@graphql-tools/documents": "^1.0.0",
         "@graphql-tools/utils": "^10.0.0",
         "@graphql-typed-document-node/core": "3.2.0",
@@ -1889,14 +1901,14 @@
       }
     },
     "node_modules/@graphql-codegen/gql-tag-operations": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.7.tgz",
-      "integrity": "sha512-2I69+IDC8pqAohH6cgKse/vPfJ/4TRTJX96PkAKz8S4RD54PUHtBmzCdBInIFEP/vQuH5mFUAaIKXXjznmGOsg==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.8.tgz",
+      "integrity": "sha512-slCICQOFbMfdL7mAZ6XUiOhcJl0yOKfqHFiULIlQJKpo8ey6NHsrtc8Q02ZF417BfTfZ/Qj7rmXhkc/dwY94ag==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/visitor-plugin-common": "5.2.0",
+        "@graphql-codegen/visitor-plugin-common": "5.3.0",
         "@graphql-tools/utils": "^10.0.0",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
@@ -1952,14 +1964,14 @@
       }
     },
     "node_modules/@graphql-codegen/typed-document-node": {
-      "version": "5.0.7",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.7.tgz",
-      "integrity": "sha512-rgFh96hAbNwPUxLVlRcNhGaw2+y7ZGx7giuETtdO8XzPasTQGWGRkZ3wXQ5UUiTX4X3eLmjnuoXYKT7HoxSznQ==",
+      "version": "5.0.8",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.8.tgz",
+      "integrity": "sha512-ImJd1KwS0vYZiPVZzs8EOZ79V96zN0p1A1MJNpk/8CiJWpIi4FupLLfTMMYq5Rr0AZET+O/A+udw4LDjDrAWvg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/visitor-plugin-common": "5.2.0",
+        "@graphql-codegen/visitor-plugin-common": "5.3.0",
         "auto-bind": "~4.0.0",
         "change-case-all": "1.0.15",
         "tslib": "~2.6.0"
@@ -1969,15 +1981,15 @@
       }
     },
     "node_modules/@graphql-codegen/typescript": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.7.tgz",
-      "integrity": "sha512-Gn+JNvQBJhBqH7s83piAJ6UeU/MTj9GXWFO9bdbl8PMLCAM1uFAtg04iHfkGCtDKXcUg5a3Dt/SZG85uk5KuhA==",
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.8.tgz",
+      "integrity": "sha512-kYS3SjGNnC9vgFS8N3vaxzRFkdXX2umMi1SOpHjMFCPjMe8NR0uNdW4nP9T0YEq+DvWgj+XojjpFy2oyz9q12w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
         "@graphql-codegen/schema-ast": "^4.0.2",
-        "@graphql-codegen/visitor-plugin-common": "5.2.0",
+        "@graphql-codegen/visitor-plugin-common": "5.3.0",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
       },
@@ -1986,15 +1998,15 @@
       }
     },
     "node_modules/@graphql-codegen/typescript-operations": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.1.tgz",
-      "integrity": "sha512-LhEPsaP+AI65zfK2j6CBAL4RT0bJL/rR9oRWlvwtHLX0t7YQr4CP4BXgvvej9brYdedAxHGPWeV1tPHy5/z9KQ==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.2.tgz",
+      "integrity": "sha512-8FJHIAubM4r9ElLuuDAKhdOjainSwRHEmGIrtEgEwHARKhMk1Ttj6bpOQDisYlbDl4ZTHWEJCdNa9o9rgcl+9g==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/typescript": "^4.0.7",
-        "@graphql-codegen/visitor-plugin-common": "5.2.0",
+        "@graphql-codegen/typescript": "^4.0.8",
+        "@graphql-codegen/visitor-plugin-common": "5.3.0",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
       },
@@ -2003,9 +2015,9 @@
       }
     },
     "node_modules/@graphql-codegen/visitor-plugin-common": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.2.0.tgz",
-      "integrity": "sha512-0p8AwmARaZCAlDFfQu6Sz+JV6SjbPDx3y2nNM7WAAf0au7Im/GpJ7Ke3xaIYBc1b2rTZ+DqSTJI/zomENGD9NA==",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.3.0.tgz",
+      "integrity": "sha512-+kUk7gRD/72Wfkjd7D96Lonh9k4lFw9d3O1+I07Jyja4QN9H42kdFEO0hM/b4Q9lLkI1yJ66Oym7lWz2Ikj3aw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3401,9 +3413,10 @@
       }
     },
     "node_modules/@restart/ui": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.8.tgz",
-      "integrity": "sha512-6ndCv3oZ7r9vuP1Ok9KH55TM1/UkdBnP/fSraW0DFDMbPMzWKhVKeFAIEUCRCSdzayjZDcFYK6xbMlipN9dmMA==",
+      "version": "1.6.9",
+      "resolved": "https://registry.npmjs.org/@restart/ui/-/ui-1.6.9.tgz",
+      "integrity": "sha512-mUbygUsJcRurjZCt1f77gg4DpheD1D+Sc7J3JjAkysUj7t8m4EBJVOqWC9788Qtbc69cJ+HlJc6jBguKwS8Mcw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.21.0",
         "@popperjs/core": "^2.11.6",
@@ -3841,17 +3854,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.13.0.tgz",
-      "integrity": "sha512-FX1X6AF0w8MdVFLSdqwqN/me2hyhuQg4ykN6ZpVhh1ij/80pTvDKclX1sZB9iqex8SjQfVhwMKs3JtnnMLzG9w==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.14.1.tgz",
+      "integrity": "sha512-aAJd6bIf2vvQRjUG3ZkNXkmBpN+J7Wd0mfQiiVCJMu9Z5GcZZdcc0j8XwN/BM97Fl7e3SkTXODSk4VehUv7CGw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.13.0",
-        "@typescript-eslint/type-utils": "7.13.0",
-        "@typescript-eslint/utils": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/type-utils": "7.14.1",
+        "@typescript-eslint/utils": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -3875,16 +3888,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.13.0.tgz",
-      "integrity": "sha512-EjMfl69KOS9awXXe83iRN7oIEXy9yYdqWfqdrFAYAAr6syP8eLEFI7ZE4939antx2mNgPRW/o1ybm2SFYkbTVA==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.14.1.tgz",
+      "integrity": "sha512-8lKUOebNLcR0D7RvlcloOacTOWzOqemWEWkKSVpMZVF/XVcwjPR+3MD08QzbW9TCGJ+DwIc6zUSGZ9vd8cO1IA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.13.0",
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/typescript-estree": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/typescript-estree": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -3904,14 +3917,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.13.0.tgz",
-      "integrity": "sha512-ZrMCe1R6a01T94ilV13egvcnvVJ1pxShkE0+NDjDzH4nvG1wXpwsVI5bZCvE7AEDH1mXEx5tJSVR68bLgG7Dng==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz",
+      "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0"
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -3922,14 +3935,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.13.0.tgz",
-      "integrity": "sha512-xMEtMzxq9eRkZy48XuxlBFzpVMDurUAfDu5Rz16GouAtXm0TaAoTFzqWUFPPuQYXI/CDaH/Bgx/fk/84t/Bc9A==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.14.1.tgz",
+      "integrity": "sha512-/MzmgNd3nnbDbOi3LfasXWWe292+iuo+umJ0bCCMCPc1jLO/z2BQmWUUUXvXLbrQey/JgzdF/OV+I5bzEGwJkQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.13.0",
-        "@typescript-eslint/utils": "7.13.0",
+        "@typescript-eslint/typescript-estree": "7.14.1",
+        "@typescript-eslint/utils": "7.14.1",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -3950,9 +3963,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.13.0.tgz",
-      "integrity": "sha512-QWuwm9wcGMAuTsxP+qz6LBBd3Uq8I5Nv8xb0mk54jmNoCyDspnMvVsOxI6IsMmway5d1S9Su2+sCKv1st2l6eA==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz",
+      "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -3964,14 +3977,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.13.0.tgz",
-      "integrity": "sha512-cAvBvUoobaoIcoqox1YatXOnSl3gx92rCZoMRPzMNisDiM12siGilSM4+dJAekuuHTibI2hVC2fYK79iSFvWjw==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz",
+      "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/visitor-keys": "7.13.0",
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/visitor-keys": "7.14.1",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -4006,16 +4019,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.13.0.tgz",
-      "integrity": "sha512-jceD8RgdKORVnB4Y6BqasfIkFhl4pajB1wVxrF4akxD2QPM8GNYjgGwEzYS+437ewlqqrg7Dw+6dhdpjMpeBFQ==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz",
+      "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.13.0",
-        "@typescript-eslint/types": "7.13.0",
-        "@typescript-eslint/typescript-estree": "7.13.0"
+        "@typescript-eslint/scope-manager": "7.14.1",
+        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/typescript-estree": "7.14.1"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -4029,13 +4042,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.13.0.tgz",
-      "integrity": "sha512-nxn+dozQx+MK61nn/JP+M4eCkHDSxSLDpgE3WcQo0+fkjEolnaB5jswvIKC4K56By8MMgIho7f1PVxERHEo8rw==",
+      "version": "7.14.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz",
+      "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.13.0",
+        "@typescript-eslint/types": "7.14.1",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -4424,6 +4437,7 @@
       "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
       "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
       "dev": true,
+      "peer": true,
       "dependencies": {
         "dequal": "^2.0.3"
       }
@@ -4570,16 +4584,20 @@
       }
     },
     "node_modules/array.prototype.tosorted": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz",
-      "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
+      "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "call-bind": "^1.0.5",
+        "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
-        "es-abstract": "^1.22.3",
-        "es-errors": "^1.1.0",
+        "es-abstract": "^1.23.3",
+        "es-errors": "^1.3.0",
         "es-shim-unscopables": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
     "node_modules/arraybuffer.prototype.slice": {
@@ -4690,23 +4708,15 @@
       }
     },
     "node_modules/axe-core": {
-      "version": "4.7.0",
-      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.7.0.tgz",
-      "integrity": "sha512-M0JtH+hlOL5pLQwHOLNYZaXuhqmvS8oExsqB1SBYgA4Dk7u/xx+YdGHXaK5pyUfed5mYXdlYiphWq3G8cRi5JQ==",
+      "version": "4.9.1",
+      "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.9.1.tgz",
+      "integrity": "sha512-QbUdXJVTpvUTHU7871ppZkdOLBeGUKBQWHkHrvN2V9IQWGMt61zf3B45BtzjxEJzYuj0JBjBZP/hmYS/R9pmAw==",
       "dev": true,
+      "license": "MPL-2.0",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/axobject-query": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.2.1.tgz",
-      "integrity": "sha512-jsyHu61e6N4Vbz/v18DHwWYKK0bSWLqn47eeDSKPB7m8tqMHF9YJ+mhIk2lVteyZrY8tnSj/jHOv4YiTCuCJgg==",
-      "dev": true,
-      "dependencies": {
-        "dequal": "^2.0.3"
-      }
-    },
     "node_modules/babel-plugin-syntax-trailing-function-commas": {
       "version": "7.0.0-beta.0",
       "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz",
@@ -5474,6 +5484,39 @@
         "node": ">=6"
       }
     },
+    "node_modules/deep-equal": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
+      "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-buffer-byte-length": "^1.0.0",
+        "call-bind": "^1.0.5",
+        "es-get-iterator": "^1.1.3",
+        "get-intrinsic": "^1.2.2",
+        "is-arguments": "^1.1.1",
+        "is-array-buffer": "^3.0.2",
+        "is-date-object": "^1.0.5",
+        "is-regex": "^1.1.4",
+        "is-shared-array-buffer": "^1.0.2",
+        "isarray": "^2.0.5",
+        "object-is": "^1.1.5",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.4",
+        "regexp.prototype.flags": "^1.5.1",
+        "side-channel": "^1.0.4",
+        "which-boxed-primitive": "^1.0.2",
+        "which-collection": "^1.0.1",
+        "which-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
@@ -5645,22 +5688,24 @@
       }
     },
     "node_modules/dprint": {
-      "version": "0.45.1",
-      "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.45.1.tgz",
-      "integrity": "sha512-OYefcDgxd6jSdig/Cfkw1vdvyiOIRruCPnqGBbXpc95buDt9kvwL+Lic1OHc+SaQSsQub0BUZMd5+TNgy8Sh3A==",
+      "version": "0.46.3",
+      "resolved": "https://registry.npmjs.org/dprint/-/dprint-0.46.3.tgz",
+      "integrity": "sha512-ACEd7B7sO/uvPvV/nsHbtkIeMqeD2a8XGO1DokROtKDUmI5WbuflGZOwyjFCYwy4rkX6FXoYBzGdEQ6um7BjCA==",
       "hasInstallScript": true,
       "license": "MIT",
+      "optional": true,
+      "peer": true,
       "bin": {
         "dprint": "bin.js"
       },
       "optionalDependencies": {
-        "@dprint/darwin-arm64": "0.45.1",
-        "@dprint/darwin-x64": "0.45.1",
-        "@dprint/linux-arm64-glibc": "0.45.1",
-        "@dprint/linux-arm64-musl": "0.45.1",
-        "@dprint/linux-x64-glibc": "0.45.1",
-        "@dprint/linux-x64-musl": "0.45.1",
-        "@dprint/win32-x64": "0.45.1"
+        "@dprint/darwin-arm64": "0.46.3",
+        "@dprint/darwin-x64": "0.46.3",
+        "@dprint/linux-arm64-glibc": "0.46.3",
+        "@dprint/linux-arm64-musl": "0.46.3",
+        "@dprint/linux-x64-glibc": "0.46.3",
+        "@dprint/linux-x64-musl": "0.46.3",
+        "@dprint/win32-x64": "0.46.3"
       }
     },
     "node_modules/dset": {
@@ -5792,6 +5837,27 @@
         "node": ">= 0.4"
       }
     },
+    "node_modules/es-get-iterator": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
+      "integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "get-intrinsic": "^1.1.3",
+        "has-symbols": "^1.0.3",
+        "is-arguments": "^1.1.1",
+        "is-map": "^2.0.2",
+        "is-set": "^2.0.2",
+        "is-string": "^1.0.7",
+        "isarray": "^2.0.5",
+        "stop-iteration-iterator": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/es-iterator-helpers": {
       "version": "1.0.19",
       "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.0.19.tgz",
@@ -6118,27 +6184,28 @@
       }
     },
     "node_modules/eslint-plugin-jsx-a11y": {
-      "version": "6.8.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.8.0.tgz",
-      "integrity": "sha512-Hdh937BS3KdwwbBaKd5+PLCOmYY6U4f2h9Z2ktwtNKvIdIEu137rjYbcb9ApSbVJfWxANNuiKTD/9tOKjK9qOA==",
+      "version": "6.9.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.9.0.tgz",
+      "integrity": "sha512-nOFOCaJG2pYqORjK19lqPqxMO/JpvdCZdPtNdxY3kvom3jTvkAbOvQvD8wuD0G8BYR0IGAGYDlzqWJOh/ybn2g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.23.2",
-        "aria-query": "^5.3.0",
-        "array-includes": "^3.1.7",
+        "aria-query": "~5.1.3",
+        "array-includes": "^3.1.8",
         "array.prototype.flatmap": "^1.3.2",
         "ast-types-flow": "^0.0.8",
-        "axe-core": "=4.7.0",
-        "axobject-query": "^3.2.1",
+        "axe-core": "^4.9.1",
+        "axobject-query": "~3.1.1",
         "damerau-levenshtein": "^1.0.8",
         "emoji-regex": "^9.2.2",
-        "es-iterator-helpers": "^1.0.15",
-        "hasown": "^2.0.0",
+        "es-iterator-helpers": "^1.0.19",
+        "hasown": "^2.0.2",
         "jsx-ast-utils": "^3.3.5",
         "language-tags": "^1.0.9",
         "minimatch": "^3.1.2",
-        "object.entries": "^1.1.7",
-        "object.fromentries": "^2.0.7"
+        "object.fromentries": "^2.0.8",
+        "safe-regex-test": "^1.0.3",
+        "string.prototype.includes": "^2.0.0"
       },
       "engines": {
         "node": ">=4.0"
@@ -6147,11 +6214,32 @@
         "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
       }
     },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/aria-query": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
+      "integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "deep-equal": "^2.0.5"
+      }
+    },
+    "node_modules/eslint-plugin-jsx-a11y/node_modules/axobject-query": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-3.1.1.tgz",
+      "integrity": "sha512-goKlv8DZrK9hUh975fnHzhNIO4jUnFCfv/dszV5VwUGDFjI6vQ2VwoyjYjYNEbBE8AH87TduWP5uyDR1D+Iteg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "deep-equal": "^2.0.5"
+      }
+    },
     "node_modules/eslint-plugin-jsx-a11y/node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -6162,6 +6250,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -6170,9 +6259,9 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.34.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.2.tgz",
-      "integrity": "sha512-2HCmrU+/JNigDN6tg55cRDKCQWicYAPB38JGSFDQt95jDm8rrvSUo7YPkOIm5l6ts1j1zCvysNcasvfTMQzUOw==",
+      "version": "7.34.3",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz",
+      "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -6180,7 +6269,7 @@
         "array.prototype.findlast": "^1.2.5",
         "array.prototype.flatmap": "^1.3.2",
         "array.prototype.toreversed": "^1.1.2",
-        "array.prototype.tosorted": "^1.1.3",
+        "array.prototype.tosorted": "^1.1.4",
         "doctrine": "^2.1.0",
         "es-iterator-helpers": "^1.0.19",
         "estraverse": "^5.3.0",
@@ -6817,9 +6906,10 @@
       }
     },
     "node_modules/geojson-vt": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-3.2.1.tgz",
-      "integrity": "sha512-EvGQQi/zPrDA6zr6BnJD/YhwAkBP8nnJ9emh3EnHQKVMfg/MRVtPbMYdgVy/IaEmn4UfagD2a6fafPDL5hbtwg=="
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/geojson-vt/-/geojson-vt-4.0.2.tgz",
+      "integrity": "sha512-AV9ROqlNqoZEIJGfm1ncNjEXfkz2hdFlZf0qkVfmkwdKa8vj7H16YUOT81rJw1rdFhyEDlN2Tds91p/glzbl5A==",
+      "license": "ISC"
     },
     "node_modules/get-caller-file": {
       "version": "2.0.5",
@@ -7040,9 +7130,9 @@
       "dev": true
     },
     "node_modules/graphql": {
-      "version": "16.8.2",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz",
-      "integrity": "sha512-cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg==",
+      "version": "16.9.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz",
+      "integrity": "sha512-GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==",
       "license": "MIT",
       "engines": {
         "node": "^12.22.0 || ^14.16.0 || ^16.0.0 || >=17.0.0"
@@ -7102,23 +7192,34 @@
       }
     },
     "node_modules/graphql-request": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-7.0.1.tgz",
-      "integrity": "sha512-hfGBZF6o6lC3C0th+aTMOFP6p8Ev+ydXn4PUlT8rvqPDUFCbaynXszjBCyu0saZIP3VGbJ67GpxW8UGK+tphSw==",
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/graphql-request/-/graphql-request-7.1.0.tgz",
+      "integrity": "sha512-Ouu/lYVFhARS1aXeZoVJWnGT6grFJXTLwXJuK4mUGGRo0EUk1JkyYp43mdGmRgUVezpRm6V5Sq3t8jBDQcajng==",
       "license": "MIT",
       "dependencies": {
-        "@dprint/formatter": "^0.3.0",
-        "@dprint/typescript": "^0.90.4",
         "@graphql-typed-document-node/core": "^3.2.0",
         "@molt/command": "^0.9.0",
-        "dprint": "^0.45.1",
-        "zod": "^3.23.5"
+        "zod": "^3.23.8"
       },
       "bin": {
         "graffle": "build/cli/generate.js"
       },
       "peerDependencies": {
+        "@dprint/formatter": "^0.3.0",
+        "@dprint/typescript": "^0.91.1",
+        "dprint": "^0.46.2",
         "graphql": "14 - 16"
+      },
+      "peerDependenciesMeta": {
+        "@dprint/formatter": {
+          "optional": true
+        },
+        "@dprint/typescript": {
+          "optional": true
+        },
+        "dprint": {
+          "optional": true
+        }
       }
     },
     "node_modules/graphql-tag": {
@@ -7478,6 +7579,23 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/is-arguments": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
+      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.2",
+        "has-tostringtag": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/is-array-buffer": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz",
@@ -8595,9 +8713,9 @@
       }
     },
     "node_modules/maplibre-gl": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.4.0.tgz",
-      "integrity": "sha512-RS5ZYjUfcTuyTjR+jbPNGO+Cbjgid8jtBsUpgmx/m+2voj9oY6DmpanBBm2xvjOxZSfChR2wUpzK22mf6sEOlw==",
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/maplibre-gl/-/maplibre-gl-4.5.0.tgz",
+      "integrity": "sha512-qOS1hn4d/pn2i0uva4S5Oz+fACzTkgBKq+NpwT/Tqzi4MSyzcWNtDELzLUSgWqHfNIkGCl5CZ/w7dtis+t4RCw==",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@mapbox/geojson-rewind": "^0.5.2",
@@ -8616,7 +8734,7 @@
         "@types/pbf": "^3.0.5",
         "@types/supercluster": "^7.1.3",
         "earcut": "^2.2.4",
-        "geojson-vt": "^3.2.1",
+        "geojson-vt": "^4.0.2",
         "gl-matrix": "^3.4.3",
         "global-prefix": "^3.0.0",
         "kdbush": "^4.0.2",
@@ -8712,9 +8830,9 @@
       }
     },
     "node_modules/minimatch": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
-      "integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
@@ -8930,6 +9048,23 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/object-is": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
+      "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/object-keys": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
@@ -9583,13 +9718,14 @@
       }
     },
     "node_modules/react-bootstrap": {
-      "version": "2.10.2",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.2.tgz",
-      "integrity": "sha512-UvB7mRqQjivdZNxJNEA2yOQRB7L9N43nBnKc33K47+cH90/ujmnMwatTCwQLu83gLhrzAl8fsa6Lqig/KLghaA==",
+      "version": "2.10.3",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.3.tgz",
+      "integrity": "sha512-cc1KAaQyj6Gr3AfA0eRRiUMSlRi3brDVcjc/o0E9y9XNW7ISo8TITrq8G8G3QTFe7VIhCiDt38k99AEFoLOolw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.22.5",
+        "@babel/runtime": "^7.24.7",
         "@restart/hooks": "^0.4.9",
-        "@restart/ui": "^1.6.8",
+        "@restart/ui": "^1.6.9",
         "@types/react-transition-group": "^4.4.6",
         "classnames": "^2.3.2",
         "dom-helpers": "^5.2.1",
@@ -10354,6 +10490,19 @@
       "integrity": "sha512-JPbdCEQLj1w5GilpiHAx3qJvFndqybBysA3qUOnznweH4QbNYUsW/ea8QzSrnh0vNsezMMw5bcVool8lM0gwzg==",
       "dev": true
     },
+    "node_modules/stop-iteration-iterator": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
+      "integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "internal-slot": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/streamsearch": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/streamsearch/-/streamsearch-1.1.0.tgz",
@@ -10440,6 +10589,17 @@
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "dev": true
     },
+    "node_modules/string.prototype.includes": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.includes/-/string.prototype.includes-2.0.0.tgz",
+      "integrity": "sha512-E34CkBgyeqNDcrbU76cDjL5JLcVrtSdYq0MEh/B10r17pRP4ciHLwTgnuLV8Ay6cgEMLkcBkFCKyFZ43YldYzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
     "node_modules/string.prototype.matchall": {
       "version": "4.0.11",
       "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz",
@@ -10950,10 +11110,11 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
-      "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
+      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
       "dev": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -11181,9 +11342,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.1.tgz",
-      "integrity": "sha512-XBmSKRLXLxiaPYamLv3/hnP/KXDai1NDexN0FpkTaZXTfycHvkRHoenpgl/fvuK/kPbB6xAgoyiryAhQNxYmAQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
+      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
diff --git a/client/package.json b/client/package.json
index 84c0e314dad..509c25752dd 100644
--- a/client/package.json
+++ b/client/package.json
@@ -19,37 +19,37 @@
   "dependencies": {
     "@googlemaps/polyline-codec": "1.0.28",
     "bootstrap": "5.3.3",
-    "graphql": "16.8.2",
-    "graphql-request": "7.0.1",
-    "maplibre-gl": "4.4.0",
+    "graphql": "16.9.0",
+    "graphql-request": "7.1.0",
+    "maplibre-gl": "4.5.0",
     "react": "18.3.1",
-    "react-bootstrap": "2.10.2",
+    "react-bootstrap": "2.10.3",
     "react-dom": "18.3.1",
     "react-map-gl": "7.1.7"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
-    "@graphql-codegen/client-preset": "4.3.0",
+    "@graphql-codegen/client-preset": "4.3.1",
     "@graphql-codegen/introspection": "4.0.3",
     "@parcel/watcher": "2.4.1",
     "@testing-library/react": "16.0.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
-    "@typescript-eslint/eslint-plugin": "7.13.0",
-    "@typescript-eslint/parser": "7.13.0",
+    "@typescript-eslint/eslint-plugin": "7.14.1",
+    "@typescript-eslint/parser": "7.14.1",
     "@vitejs/plugin-react": "4.3.1",
     "@vitest/coverage-v8": "1.6.0",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-jsx-a11y": "6.8.0",
-    "eslint-plugin-react": "7.34.2",
+    "eslint-plugin-jsx-a11y": "6.9.0",
+    "eslint-plugin-react": "7.34.3",
     "eslint-plugin-react-hooks": "4.6.2",
     "eslint-plugin-react-refresh": "0.4.7",
     "jsdom": "24.1.0",
     "prettier": "3.3.2",
-    "typescript": "5.4.5",
-    "vite": "5.3.1",
+    "typescript": "5.5.2",
+    "vite": "5.3.2",
     "vitest": "1.6.0"
   }
 }

From 15cf5f81e6eb2aef59d0cb573ef44384d740c7a1 Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Fri, 28 Jun 2024 12:06:51 +0000
Subject: [PATCH 1499/1688] Upgrade debug client to version
 2024/06/2024-06-28T12:06

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index 8767b03a337..d406984f024 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 6e75b10eebf6354e5ead7c7166bcf544a3dfb3b7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 00:34:47 +0000
Subject: [PATCH 1500/1688] Update dependency mkdocs-material to v9.5.27

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 93a8c6c673e..442ecdd9fe9 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +1,4 @@
 mkdocs==1.5.3
-mkdocs-material==9.5.16
+mkdocs-material==9.5.27
 mike@git+https://github.com/jimporter/mike.git@f0522f245e64687dd18384fbd86b721175711474
 mkdocs-no-sitemap-plugin==0.0.1

From b1c52dafbcebbf88278da048dd7798ddf408234b Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 1 Jul 2024 09:36:14 +0200
Subject: [PATCH 1501/1688] Update mkdocs to 1.6.0

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 442ecdd9fe9..4681f78c93f 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,4 +1,4 @@
-mkdocs==1.5.3
+mkdocs==1.6.0
 mkdocs-material==9.5.27
 mike@git+https://github.com/jimporter/mike.git@f0522f245e64687dd18384fbd86b721175711474
 mkdocs-no-sitemap-plugin==0.0.1

From 755d60c2702e5bac07d4dc2e2b69c7aab2031868 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 07:57:44 +0000
Subject: [PATCH 1502/1688] Update lucene.version to v9.11.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index d77daf01502..c6ce3a03f60 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@
         1.13.0
         5.5.3
         1.5.6
-        9.10.0
+        9.11.1
         2.0.13
         2.0.15
         1.27

From 13d55c22999ff71795065e754adff9efec21efd8 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 1 Jul 2024 13:55:51 +0200
Subject: [PATCH 1503/1688] Rename ServiceDateFilterInput to
 LocalDateRangeInput

---
 .../apis/gtfs/GraphQLUtils.java               |  8 +-
 .../gtfs/PatternByServiceDatesFilter.java     |  4 +-
 .../apis/gtfs/generated/GraphQLTypes.java     | 75 +++++++++----------
 .../opentripplanner/apis/gtfs/schema.graphqls | 12 +--
 .../framework/graphql/GraphQLUtilsTest.java   | 10 +--
 5 files changed, 51 insertions(+), 58 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
index 9aa1235879c..1fe09b60787 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
@@ -115,12 +115,10 @@ public static boolean startsWith(I18NString str, String name, Locale locale) {
    * Checks if a service date filter input has at least one filter set. If both start and end are
    * null then no filtering is necessary and this method returns null.
    */
-  public static boolean hasServiceDateFilter(
-    GraphQLTypes.GraphQLServiceDateFilterInput serviceDays
-  ) {
+  public static boolean hasServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput dateRange) {
     return (
-      serviceDays != null &&
-      (serviceDays.getGraphQLStart() != null || serviceDays.getGraphQLEnd() != null)
+      dateRange != null &&
+      (dateRange.getGraphQLStart() != null || dateRange.getGraphQLEnd() != null)
     );
   }
 }
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
index 9184bd9d728..2aef232abc1 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
@@ -6,7 +6,7 @@
 import java.util.function.Function;
 import java.util.stream.Stream;
 import javax.annotation.Nullable;
-import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLServiceDateFilterInput;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.timetable.Trip;
@@ -53,7 +53,7 @@ public class PatternByServiceDatesFilter {
   }
 
   public PatternByServiceDatesFilter(
-    GraphQLServiceDateFilterInput filterInput,
+    GraphQLTypes.GraphQLLocalDateRangeInput filterInput,
     TransitService transitService
   ) {
     this(
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
index 9f6a237f7d9..01c40b5b239 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
@@ -1,7 +1,6 @@
 // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 package org.opentripplanner.apis.gtfs.generated;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -1269,6 +1268,35 @@ public void setGraphQLOriginModesWithParentStation(
     }
   }
 
+  public static class GraphQLLocalDateRangeInput {
+
+    private java.time.LocalDate end;
+    private java.time.LocalDate start;
+
+    public GraphQLLocalDateRangeInput(Map args) {
+      if (args != null) {
+        this.end = (java.time.LocalDate) args.get("end");
+        this.start = (java.time.LocalDate) args.get("start");
+      }
+    }
+
+    public java.time.LocalDate getGraphQLEnd() {
+      return this.end;
+    }
+
+    public java.time.LocalDate getGraphQLStart() {
+      return this.start;
+    }
+
+    public void setGraphQLEnd(java.time.LocalDate end) {
+      this.end = end;
+    }
+
+    public void setGraphQLStart(java.time.LocalDate start) {
+      this.start = start;
+    }
+  }
+
   /** Identifies whether this stop represents a stop or station. */
   public enum GraphQLLocationType {
     ENTRANCE,
@@ -3450,7 +3478,7 @@ public static class GraphQLQueryTypeRoutesArgs {
     private List feeds;
     private List ids;
     private String name;
-    private GraphQLServiceDateFilterInput serviceDates;
+    private GraphQLLocalDateRangeInput serviceDates;
     private List transportModes;
 
     public GraphQLQueryTypeRoutesArgs(Map args) {
@@ -3459,7 +3487,7 @@ public GraphQLQueryTypeRoutesArgs(Map args) {
         this.ids = (List) args.get("ids");
         this.name = (String) args.get("name");
         this.serviceDates =
-          new GraphQLServiceDateFilterInput((Map) args.get("serviceDates"));
+          new GraphQLLocalDateRangeInput((Map) args.get("serviceDates"));
         if (args.get("transportModes") != null) {
           this.transportModes =
             ((List) args.get("transportModes")).stream()
@@ -3482,7 +3510,7 @@ public String getGraphQLName() {
       return this.name;
     }
 
-    public GraphQLServiceDateFilterInput getGraphQLServiceDates() {
+    public GraphQLLocalDateRangeInput getGraphQLServiceDates() {
       return this.serviceDates;
     }
 
@@ -3502,7 +3530,7 @@ public void setGraphQLName(String name) {
       this.name = name;
     }
 
-    public void setGraphQLServiceDates(GraphQLServiceDateFilterInput serviceDates) {
+    public void setGraphQLServiceDates(GraphQLLocalDateRangeInput serviceDates) {
       this.serviceDates = serviceDates;
     }
 
@@ -3947,20 +3975,20 @@ public void setGraphQLLanguage(String language) {
 
   public static class GraphQLRoutePatternsArgs {
 
-    private GraphQLServiceDateFilterInput serviceDates;
+    private GraphQLLocalDateRangeInput serviceDates;
 
     public GraphQLRoutePatternsArgs(Map args) {
       if (args != null) {
         this.serviceDates =
-          new GraphQLServiceDateFilterInput((Map) args.get("serviceDates"));
+          new GraphQLLocalDateRangeInput((Map) args.get("serviceDates"));
       }
     }
 
-    public GraphQLServiceDateFilterInput getGraphQLServiceDates() {
+    public GraphQLLocalDateRangeInput getGraphQLServiceDates() {
       return this.serviceDates;
     }
 
-    public void setGraphQLServiceDates(GraphQLServiceDateFilterInput serviceDates) {
+    public void setGraphQLServiceDates(GraphQLLocalDateRangeInput serviceDates) {
       this.serviceDates = serviceDates;
     }
   }
@@ -4126,35 +4154,6 @@ public void setGraphQLDestinationScooterPolicy(
     }
   }
 
-  public static class GraphQLServiceDateFilterInput {
-
-    private java.time.LocalDate end;
-    private java.time.LocalDate start;
-
-    public GraphQLServiceDateFilterInput(Map args) {
-      if (args != null) {
-        this.end = (java.time.LocalDate) args.get("end");
-        this.start = (java.time.LocalDate) args.get("start");
-      }
-    }
-
-    public java.time.LocalDate getGraphQLEnd() {
-      return this.end;
-    }
-
-    public java.time.LocalDate getGraphQLStart() {
-      return this.start;
-    }
-
-    public void setGraphQLEnd(java.time.LocalDate end) {
-      this.end = end;
-    }
-
-    public void setGraphQLStart(java.time.LocalDate start) {
-      this.start = start;
-    }
-  }
-
   public static class GraphQLStopAlertsArgs {
 
     private List types;
diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index cbedf2a369f..26ee6bdf4db 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -3439,13 +3439,9 @@ enum Qualifier {
 
 
 """
-Filters entity by their service dates.
-
-**Note**: A service date is a technical term useful for transit planning purposes and might not
-correspond to a how a passenger thinks of a calendar date. For example, a night bus running
-on Sunday morning at 1am to 3am, might have the previous Saturday's service date.
+Filters an entity by a date range.
 """
-input ServiceDateFilterInput {
+input LocalDateRangeInput {
     """
     **Inclusive** start date of the filter. If `null` this means that no `start` filter is applied and all
     dates that are before `end` are selected.
@@ -3627,7 +3623,7 @@ type QueryType {
         correspond to a how a passenger thinks of a calendar date. For example, a night bus running
         on Sunday morning at 1am to 3am, might have the previous Saturday's service date.
         """
-        serviceDates: ServiceDateFilterInput
+        serviceDates: LocalDateRangeInput
     ): [Route]
 
     """
@@ -4525,7 +4521,7 @@ type Route implements Node {
         correspond to a how a passenger thinks of a calendar date. For example, a night bus running
         on Sunday morning at 1am to 3am, might have the previous Saturday's service date.
         """
-        serviceDates: ServiceDateFilterInput
+        serviceDates: LocalDateRangeInput
     ): [Pattern]
 
     """List of stops on this route"""
diff --git a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
index 8119b9256c8..42330652410 100644
--- a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
+++ b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
@@ -133,16 +133,16 @@ void testGetLocaleWithLocalContextLocale() {
     assertEquals(frenchLocale, locale);
   }
 
-  public static List noFilterCases() {
-    var list = new ArrayList();
+  public static List noFilterCases() {
+    var list = new ArrayList();
     list.add(null);
-    list.add(new GraphQLTypes.GraphQLServiceDateFilterInput(Map.of()));
+    list.add(new GraphQLTypes.GraphQLLocalDateRangeInput(Map.of()));
     return list;
   }
 
   @ParameterizedTest
   @MethodSource("noFilterCases")
-  void hasNoServiceDateFilter(GraphQLTypes.GraphQLServiceDateFilterInput input) {
+  void hasNoServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput input) {
     assertFalse(org.opentripplanner.apis.gtfs.GraphQLUtils.hasServiceDateFilter(input));
   }
 
@@ -153,7 +153,7 @@ public static List> hasFilterCases() {
   @ParameterizedTest
   @MethodSource("hasFilterCases")
   void hasServiceDateFilter(Map params) {
-    var input = new GraphQLTypes.GraphQLServiceDateFilterInput(params);
+    var input = new GraphQLTypes.GraphQLLocalDateRangeInput(params);
     assertTrue(org.opentripplanner.apis.gtfs.GraphQLUtils.hasServiceDateFilter(input));
   }
 }

From 0edc190f22bb03c9d97044a2c8147ed691195b37 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 1 Jul 2024 17:36:45 +0200
Subject: [PATCH 1504/1688] Move logic into mapper, extract separate class for
 date range

---
 .../apis/gtfs/GraphQLUtils.java               | 12 ------
 .../gtfs/PatternByServiceDatesFilter.java     | 28 +++++--------
 .../apis/gtfs/datafetchers/QueryTypeImpl.java |  3 +-
 .../apis/gtfs/datafetchers/RouteImpl.java     |  3 +-
 .../gtfs/mapping/LocalDateRangeMapper.java    | 18 ++++++++
 .../apis/gtfs/model/LocalDateRange.java       | 23 +++++++++++
 .../gtfs/PatternByServiceDatesFilterTest.java | 17 ++++++--
 .../mapping/LocalDateRangeMapperTest.java     | 41 +++++++++++++++++++
 .../apis/gtfs/model/LocalDateRangeTest.java   | 22 ++++++++++
 .../framework/graphql/GraphQLUtilsTest.java   | 34 ---------------
 10 files changed, 132 insertions(+), 69 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapper.java
 create mode 100644 src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
 create mode 100644 src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
index 1fe09b60787..3fb339daa32 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GraphQLUtils.java
@@ -2,7 +2,6 @@
 
 import java.time.Instant;
 import java.util.Locale;
-import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLFilterPlaceType;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLFormFactor;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLInputField;
@@ -110,15 +109,4 @@ public static boolean startsWith(String str, String name, Locale locale) {
   public static boolean startsWith(I18NString str, String name, Locale locale) {
     return str != null && str.toString(locale).toLowerCase(locale).startsWith(name);
   }
-
-  /**
-   * Checks if a service date filter input has at least one filter set. If both start and end are
-   * null then no filtering is necessary and this method returns null.
-   */
-  public static boolean hasServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput dateRange) {
-    return (
-      dateRange != null &&
-      (dateRange.getGraphQLStart() != null || dateRange.getGraphQLEnd() != null)
-    );
-  }
 }
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
index 2aef232abc1..82d67cae7f3 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
@@ -5,8 +5,8 @@
 import java.util.Objects;
 import java.util.function.Function;
 import java.util.stream.Stream;
-import javax.annotation.Nullable;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.apis.gtfs.model.LocalDateRange;
 import org.opentripplanner.transit.model.network.Route;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.timetable.Trip;
@@ -21,33 +21,26 @@
  */
 public class PatternByServiceDatesFilter {
 
-  private final LocalDate startInclusive;
-  private final LocalDate endExclusive;
   private final Function> getPatternsForRoute;
   private final Function> getServiceDatesForTrip;
+  private final LocalDateRange range;
 
   /**
    * This method is not private to enable unit testing.
    * 
              
-   * See the API documentation for a discussion of {@code startInclusive} and {@code endExclusive}.
    */
   PatternByServiceDatesFilter(
-    @Nullable LocalDate startInclusive,
-    @Nullable LocalDate endExclusive,
+    LocalDateRange range,
     Function> getPatternsForRoute,
     Function> getServiceDatesForTrip
   ) {
     this.getPatternsForRoute = Objects.requireNonNull(getPatternsForRoute);
     this.getServiceDatesForTrip = Objects.requireNonNull(getServiceDatesForTrip);
-    // optional, but one must be defined
-    this.startInclusive = startInclusive;
-    this.endExclusive = endExclusive;
+    this.range = range;
 
-    if (startInclusive == null && endExclusive == null) {
+    if (range.unlimited()) {
       throw new IllegalArgumentException("startInclusive and endExclusive cannot be both null");
-    } else if (
-      startInclusive != null && endExclusive != null && startInclusive.isAfter(endExclusive)
-    ) {
+    } else if (range.startBeforeEnd()) {
       throw new IllegalArgumentException("start must be before end");
     }
   }
@@ -57,8 +50,7 @@ public PatternByServiceDatesFilter(
     TransitService transitService
   ) {
     this(
-      filterInput.getGraphQLStart(),
-      filterInput.getGraphQLEnd(),
+      new LocalDateRange(filterInput.getGraphQLStart(), filterInput.getGraphQLEnd()),
       transitService::getPatternsForRoute,
       trip -> transitService.getCalendarService().getServiceDatesForServiceId(trip.getServiceId())
     );
@@ -94,9 +86,11 @@ private boolean hasServicesOnDate(TripPattern pattern) {
           .stream()
           .anyMatch(date ->
             (
-              startInclusive == null || date.isEqual(startInclusive) || date.isAfter(startInclusive)
+              range.startInclusive() == null ||
+              date.isEqual(range.startInclusive()) ||
+              date.isAfter(range.startInclusive())
             ) &&
-            (endExclusive == null || date.isBefore(endExclusive))
+            (range.endExclusive() == null || date.isBefore(range.endExclusive()))
           );
       });
   }
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
index c83669a386b..b22310d1da3 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
@@ -31,6 +31,7 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLQueryTypeStopsByRadiusArgs;
+import org.opentripplanner.apis.gtfs.mapping.LocalDateRangeMapper;
 import org.opentripplanner.apis.gtfs.mapping.routerequest.LegacyRouteRequestMapper;
 import org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapper;
 import org.opentripplanner.ext.fares.impl.DefaultFareService;
@@ -611,7 +612,7 @@ public DataFetcher> routes() {
           );
       }
 
-      if (GraphQLUtils.hasServiceDateFilter(args.getGraphQLServiceDates())) {
+      if (LocalDateRangeMapper.hasServiceDateFilter(args.getGraphQLServiceDates())) {
         var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService);
         routeStream = filter.filterRoutes(routeStream).stream();
       }
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
index 5eeb662a6d1..921f85ff813 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
@@ -15,6 +15,7 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode;
 import org.opentripplanner.apis.gtfs.mapping.BikesAllowedMapper;
+import org.opentripplanner.apis.gtfs.mapping.LocalDateRangeMapper;
 import org.opentripplanner.routing.alertpatch.EntitySelector;
 import org.opentripplanner.routing.alertpatch.TransitAlert;
 import org.opentripplanner.routing.services.TransitAlertService;
@@ -181,7 +182,7 @@ public DataFetcher> patterns() {
 
       var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments());
 
-      if (GraphQLUtils.hasServiceDateFilter(args.getGraphQLServiceDates())) {
+      if (LocalDateRangeMapper.hasServiceDateFilter(args.getGraphQLServiceDates())) {
         var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService);
         return filter.filterPatterns(patterns);
       } else {
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapper.java
new file mode 100644
index 00000000000..56064ea37dc
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapper.java
@@ -0,0 +1,18 @@
+package org.opentripplanner.apis.gtfs.mapping;
+
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.apis.gtfs.model.LocalDateRange;
+
+public class LocalDateRangeMapper {
+
+  /**
+   * Checks if a service date filter input has at least one filter set. If both start and end are
+   * null then no filtering is necessary and this method returns null.
+   */
+  public static boolean hasServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput dateRange) {
+    return (
+      dateRange != null &&
+      !new LocalDateRange(dateRange.getGraphQLStart(), dateRange.getGraphQLEnd()).unlimited()
+    );
+  }
+}
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
new file mode 100644
index 00000000000..83e0c93b5bd
--- /dev/null
+++ b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
@@ -0,0 +1,23 @@
+package org.opentripplanner.apis.gtfs.model;
+
+import java.time.LocalDate;
+import javax.annotation.Nullable;
+
+/**
+ * See the API documentation for a discussion of {@code startInclusive} and {@code endExclusive}.
+ */
+public record LocalDateRange(@Nullable LocalDate startInclusive, @Nullable LocalDate endExclusive) {
+  /**
+   * Does it actually define a limit or is the range unlimited?
+   */
+  public boolean unlimited() {
+    return startInclusive == null && endExclusive == null;
+  }
+
+  /**
+   * Is the start date before the end (
+   */
+  public boolean startBeforeEnd() {
+    return startInclusive != null && endExclusive != null && startInclusive.isAfter(endExclusive);
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java
index 01743dec89d..57f399ad821 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java
@@ -13,6 +13,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
+import org.opentripplanner.apis.gtfs.model.LocalDateRange;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.Route;
@@ -71,7 +72,12 @@ static List invalidRangeCases() {
   void invalidRange(LocalDate start, LocalDate end) {
     assertThrows(
       IllegalArgumentException.class,
-      () -> new PatternByServiceDatesFilter(start, end, r -> List.of(), d -> List.of())
+      () ->
+        new PatternByServiceDatesFilter(
+          new LocalDateRange(start, end),
+          r -> List.of(),
+          d -> List.of()
+        )
     );
   }
 
@@ -88,7 +94,11 @@ static List validRangeCases() {
   @MethodSource("validRangeCases")
   void validRange(LocalDate start, LocalDate end) {
     assertDoesNotThrow(() ->
-      new PatternByServiceDatesFilter(start, end, r -> List.of(), d -> List.of())
+      new PatternByServiceDatesFilter(
+        new LocalDateRange(start, end),
+        r -> List.of(),
+        d -> List.of()
+      )
     );
   }
 
@@ -141,8 +151,7 @@ void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation)
 
   private static PatternByServiceDatesFilter mockFilter(LocalDate start, LocalDate end) {
     return new PatternByServiceDatesFilter(
-      start,
-      end,
+      new LocalDateRange(start, end),
       route -> List.of(PATTERN_1),
       trip -> List.of(parse("2024-05-01"), parse("2024-06-01"))
     );
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
new file mode 100644
index 00000000000..eba38c0a180
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
@@ -0,0 +1,41 @@
+package org.opentripplanner.apis.gtfs.mapping;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.time.LocalDate;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+
+class LocalDateRangeMapperTest {
+
+  private static final LocalDate DATE = LocalDate.parse("2024-05-27");
+
+  public static List noFilterCases() {
+    var list = new ArrayList();
+    list.add(null);
+    list.add(new GraphQLTypes.GraphQLLocalDateRangeInput(Map.of()));
+    return list;
+  }
+
+  @ParameterizedTest
+  @MethodSource("noFilterCases")
+  void hasNoServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput input) {
+    assertFalse(LocalDateRangeMapper.hasServiceDateFilter(input));
+  }
+
+  public static List> hasFilterCases() {
+    return List.of(Map.of("start", DATE), Map.of("end", DATE), Map.of("start", DATE, "end", DATE));
+  }
+
+  @ParameterizedTest
+  @MethodSource("hasFilterCases")
+  void hasServiceDateFilter(Map params) {
+    var input = new GraphQLTypes.GraphQLLocalDateRangeInput(params);
+    assertTrue(LocalDateRangeMapper.hasServiceDateFilter(input));
+  }
+}
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java b/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
new file mode 100644
index 00000000000..e675a4c8772
--- /dev/null
+++ b/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
@@ -0,0 +1,22 @@
+package org.opentripplanner.apis.gtfs.model;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+import java.time.LocalDate;
+import org.junit.jupiter.api.Test;
+
+class LocalDateRangeTest {
+
+  private static final LocalDate DATE = LocalDate.parse("2024-06-01");
+
+  @Test
+  void unlimited() {
+    assertFalse(new LocalDateRange(DATE, DATE).unlimited());
+  }
+
+  @Test
+  void limited() {
+    assertFalse(new LocalDateRange(DATE, null).unlimited());
+    assertFalse(new LocalDateRange(null, DATE).unlimited());
+  }
+}
diff --git a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
index 42330652410..b72cb6e5a0d 100644
--- a/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
+++ b/src/test/java/org/opentripplanner/framework/graphql/GraphQLUtilsTest.java
@@ -3,29 +3,19 @@
 import static graphql.execution.ExecutionContextBuilder.newExecutionContextBuilder;
 import static java.util.Map.entry;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import graphql.ExecutionInput;
 import graphql.execution.ExecutionContext;
 import graphql.execution.ExecutionId;
 import graphql.schema.DataFetchingEnvironmentImpl;
-import java.time.LocalDate;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.MethodSource;
-import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.framework.i18n.TranslatedString;
 
 class GraphQLUtilsTest {
 
-  private static final LocalDate DATE = LocalDate.parse("2024-05-27");
-
   static final ExecutionContext executionContext;
 
   static {
@@ -132,28 +122,4 @@ void testGetLocaleWithLocalContextLocale() {
 
     assertEquals(frenchLocale, locale);
   }
-
-  public static List noFilterCases() {
-    var list = new ArrayList();
-    list.add(null);
-    list.add(new GraphQLTypes.GraphQLLocalDateRangeInput(Map.of()));
-    return list;
-  }
-
-  @ParameterizedTest
-  @MethodSource("noFilterCases")
-  void hasNoServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput input) {
-    assertFalse(org.opentripplanner.apis.gtfs.GraphQLUtils.hasServiceDateFilter(input));
-  }
-
-  public static List> hasFilterCases() {
-    return List.of(Map.of("start", DATE), Map.of("end", DATE), Map.of("start", DATE, "end", DATE));
-  }
-
-  @ParameterizedTest
-  @MethodSource("hasFilterCases")
-  void hasServiceDateFilter(Map params) {
-    var input = new GraphQLTypes.GraphQLLocalDateRangeInput(params);
-    assertTrue(org.opentripplanner.apis.gtfs.GraphQLUtils.hasServiceDateFilter(input));
-  }
 }

From 4fac03cfcbd52aa699fd575429fb5f1dbae28777 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 1 Jul 2024 17:46:28 +0200
Subject: [PATCH 1505/1688] Update
 src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java

Co-authored-by: Thomas Gran 
---
 .../standalone/config/routerequest/TransferConfig.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
index bbf2087c59e..990d7402776 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
@@ -40,12 +40,12 @@ static void mapTransferPreferences(NodeAdapter c, TransferPreferences.Builder tx
           .summary("The extra time needed to make a safe transfer.")
           .description(
             """
-            An extra buffer time that's applied when exiting one public transport vehicle and boarding another.
-            This time is in addition to how long it might take to walk between stops plus `boardSlack` and
-            `alightSlack`.
+            The extra buffer time/safety margin added to transfers to make sure the connection is safe, time
+            wise. We recommend allowing the end-user to set this, and use `board-/alight-slack` to enforce
+            agency policies. This time is in addition to how long it might take to walk, board and alight.
             
-            It is useful to add extra time for passengers with mobility issues, who need extra time
-            when moving between vehicles.
+            It is useful for passengers on long distance travel, and people with mobility issues, but can be set
+            close to zero for everyday commuters and short distance searches in high transit frequency areas.
             """
           )
           .asDurationOrSeconds(dft.slack())

From 8fc0d9f7c58083481b95585194a66570bfe4e495 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 1 Jul 2024 17:49:08 +0200
Subject: [PATCH 1506/1688] Update compiled documentation

---
 docs/RouteRequest.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md
index 60dec16d9b8..2d894dee8dd 100644
--- a/docs/RouteRequest.md
+++ b/docs/RouteRequest.md
@@ -367,12 +367,12 @@ significant time or walking will still be taken.
 
 The extra time needed to make a safe transfer.
 
-An extra buffer time that's applied when exiting one public transport vehicle and boarding another.
-This time is in addition to how long it might take to walk between stops plus `boardSlack` and
-`alightSlack`.
+The extra buffer time/safety margin added to transfers to make sure the connection is safe, time
+wise. We recommend allowing the end-user to set this, and use `board-/alight-slack` to enforce
+agency policies. This time is in addition to how long it might take to walk, board and alight.
 
-It is useful to add extra time for passengers with mobility issues, who need extra time
-when moving between vehicles.
+It is useful for passengers on long distance travel, and people with mobility issues, but can be set
+close to zero for everyday commuters and short distance searches in high transit frequency areas.
 
 
 
              unpreferredCost
              

From 85d513a1ed29e3bba87acd11f26657b20bbeef83 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 1 Jul 2024 17:59:18 +0200
Subject: [PATCH 1507/1688] Move assertion class to another package

---
 .../ext/siri/SiriTimetableSnapshotSourceTest.java             | 2 +-
 .../{test/support => updater/spi}/UpdateResultAssertions.java | 4 +---
 .../updater/trip/moduletests/addition/AddedTest.java          | 2 +-
 .../moduletests/cancellation/CancellationDeletionTest.java    | 2 +-
 .../updater/trip/moduletests/delay/DelayedTest.java           | 2 +-
 .../updater/trip/moduletests/delay/SkippedTest.java           | 2 +-
 .../updater/trip/moduletests/rejection/InvalidInputTest.java  | 2 +-
 .../updater/trip/moduletests/rejection/InvalidTripIdTest.java | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)
 rename src/test/java/org/opentripplanner/{test/support => updater/spi}/UpdateResultAssertions.java (82%)

diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
index 73f6b92ffe7..3c5d3acf1cb 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSourceTest.java
@@ -1,7 +1,7 @@
 package org.opentripplanner.ext.siri;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertFailure;
 
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java b/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
similarity index 82%
rename from src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java
rename to src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
index c6be0406ae3..13806cde4c3 100644
--- a/src/test/java/org/opentripplanner/test/support/UpdateResultAssertions.java
+++ b/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
@@ -1,11 +1,9 @@
-package org.opentripplanner.test.support;
+package org.opentripplanner.updater.spi;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Set;
-import org.opentripplanner.updater.spi.UpdateError;
-import org.opentripplanner.updater.spi.UpdateResult;
 
 public class UpdateResultAssertions {
 
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
index 1e75f558510..7f5d976e737 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
@@ -6,7 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess;
 import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE;
 import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.STOP_A1_ID;
 import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.STOP_B1_ID;
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java
index 3b527b64e5d..c85225b7828 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/cancellation/CancellationDeletionTest.java
@@ -4,7 +4,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess;
 import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL;
 
 import com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship;
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
index d9282e1b155..53805939e40 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
@@ -5,7 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess;
 import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE;
 
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
index 349e472036d..c17130fbda6 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
@@ -6,7 +6,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opentripplanner.test.support.UpdateResultAssertions.assertSuccess;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertSuccess;
 import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE;
 import static org.opentripplanner.updater.trip.UpdateIncrementality.DIFFERENTIAL;
 
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java
index 4815d7180c4..da362451753 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidInputTest.java
@@ -2,8 +2,8 @@
 
 import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure;
 import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.NO_SERVICE_ON_DATE;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertFailure;
 import static org.opentripplanner.updater.trip.RealtimeTestEnvironment.SERVICE_DATE;
 
 import java.time.LocalDate;
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java
index e6e7a4737f7..83c2547dbc7 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/rejection/InvalidTripIdTest.java
@@ -1,8 +1,8 @@
 package org.opentripplanner.updater.trip.moduletests.rejection;
 
 import static com.google.transit.realtime.GtfsRealtime.TripDescriptor.ScheduleRelationship.SCHEDULED;
-import static org.opentripplanner.test.support.UpdateResultAssertions.assertFailure;
 import static org.opentripplanner.updater.spi.UpdateError.UpdateErrorType.INVALID_INPUT_STRUCTURE;
+import static org.opentripplanner.updater.spi.UpdateResultAssertions.assertFailure;
 
 import com.google.transit.realtime.GtfsRealtime;
 import java.util.stream.Stream;

From 8c3364e9830682b8ab8dab1bf321fe57933cb90e Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 1 Jul 2024 18:09:04 +0200
Subject: [PATCH 1508/1688] Rename Stop to StopCall

---
 .../updater/trip/RealtimeTestEnvironment.java  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
index e9aa783833f..57aba0b19bb 100644
--- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
+++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -114,12 +114,20 @@ private RealtimeTestEnvironment(SourceType sourceType) {
     Route route1 = TransitModelForTest.route(route1Id).build();
 
     trip1 =
-      createTrip("TestTrip1", route1, List.of(new Stop(stopA1, 10, 11), new Stop(stopB1, 20, 21)));
+      createTrip(
+        "TestTrip1",
+        route1,
+        List.of(new StopCall(stopA1, 10, 11), new StopCall(stopB1, 20, 21))
+      );
     trip2 =
       createTrip(
         "TestTrip2",
         route1,
-        List.of(new Stop(stopA1, 60, 61), new Stop(stopB1, 70, 71), new Stop(stopC1, 80, 81))
+        List.of(
+          new StopCall(stopA1, 60, 61),
+          new StopCall(stopB1, 70, 71),
+          new StopCall(stopC1, 80, 81)
+        )
       );
 
     CalendarServiceData calendarServiceData = new CalendarServiceData();
@@ -295,7 +303,7 @@ private UpdateResult applyEstimatedTimetable(
     return getEstimatedTimetableHandler(fuzzyMatching).applyUpdate(updates, DIFFERENTIAL);
   }
 
-  private Trip createTrip(String id, Route route, List stops) {
+  private Trip createTrip(String id, Route route, List stops) {
     var trip = Trip
       .of(id(id))
       .withRoute(route)
@@ -323,7 +331,7 @@ private Trip createTrip(String id, Route route, List stops) {
 
     final TripPattern pattern = TransitModelForTest
       .tripPattern(id + "Pattern", route)
-      .withStopPattern(TransitModelForTest.stopPattern(stops.stream().map(Stop::stop).toList()))
+      .withStopPattern(TransitModelForTest.stopPattern(stops.stream().map(StopCall::stop).toList()))
       .build();
     pattern.add(tripTimes);
 
@@ -348,5 +356,5 @@ private StopTime createStopTime(
     return st;
   }
 
-  protected record Stop(RegularStop stop, int arrivalTime, int departureTime) {}
+  protected record StopCall(RegularStop stop, int arrivalTime, int departureTime) {}
 }

From 22d2123ed120801b114279892a8acc260af3dbf0 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 2 Jul 2024 09:58:21 +0200
Subject: [PATCH 1509/1688] Apply review feedback

---
 mkdocs.yml                                    |  4 ++--
 .../tagmapping/OsmTagMapperSource.java        |  4 ----
 .../wayproperty/specifier/Condition.java      | 24 +++++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/mkdocs.yml b/mkdocs.yml
index 0689ea0211c..81dbf9a36fe 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -75,9 +75,9 @@ nav:
     - Build: 'BuildConfiguration.md'
     - OSM Tag Mapping:
         - Default: 'osm/Default.md'
-        - Norway: 'osm/Norway.md'
-        - Germany: 'osm/Germany.md'
         - Finland: 'osm/Finland.md'
+        - Germany: 'osm/Germany.md'
+        - Norway: 'osm/Norway.md'
         - UK: 'osm/UK.md'
     - Router: 'RouterConfiguration.md'
     - "Route Request": 'RouteRequest.md'
diff --git a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java
index e43b50c46ef..d430ad05f7d 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/tagmapping/OsmTagMapperSource.java
@@ -30,8 +30,4 @@ public OsmTagMapper getInstance() {
       case CONSTANT_SPEED_FINLAND -> new ConstantSpeedFinlandMapper();
     };
   }
-
-  public boolean needsDocumentation() {
-    return this != CONSTANT_SPEED_FINLAND;
-  }
 }
diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
index 89448cad158..35a104c5980 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
@@ -107,6 +107,9 @@ enum MatchResult {
     NONE,
   }
 
+  /**
+   * Selects tags where a given key/value matches.
+   */
   record Equals(String key, String value) implements Condition {
     @Override
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
@@ -119,6 +122,9 @@ public String toString() {
     }
   }
 
+  /**
+   * Selects tags with a give key.
+   */
   record Present(String key) implements Condition {
     @Override
     public MatchResult matchType() {
@@ -135,6 +141,9 @@ public String toString() {
     }
   }
 
+  /**
+   * Selects tags where a given tag is absent.
+   */
   record Absent(String key) implements Condition {
     @Override
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
@@ -147,6 +156,9 @@ public String toString() {
     }
   }
 
+  /**
+   * Selects tags where the integer value is greater than a given number.
+   */
   record GreaterThan(String key, int value) implements Condition {
     @Override
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
@@ -160,6 +172,9 @@ public String toString() {
     }
   }
 
+  /**
+   * Selects tags where the integer value is less than a given number.
+   */
   record LessThan(String key, int value) implements Condition {
     @Override
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
@@ -173,6 +188,9 @@ public String toString() {
     }
   }
 
+  /**
+   * Selects integer tag values and checks if they are in between a lower and an upper bound.
+   */
   record InclusiveRange(String key, int upper, int lower) implements Condition {
     public InclusiveRange {
       if (upper < lower) {
@@ -192,6 +210,9 @@ public String toString() {
     }
   }
 
+  /**
+   * Selects a tag which has one of a set of given values.
+   */
   record OneOf(String key, String... values) implements Condition {
     @Override
     public boolean isExtendedKeyMatch(OSMWithTags way, String exKey) {
@@ -204,6 +225,9 @@ public String toString() {
     }
   }
 
+  /**
+   * Selects a tag which has one of a set of given values or the tag is absent.
+   */
   record OneOfOrAbsent(String key, String... values) implements Condition {
     /* A use case for this is to detect the absence of a sidewalk, cycle lane or verge*/
     public OneOfOrAbsent(String key) {

From 22ed45effc1cc4e70c03dab62f814d8b834d0561 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Thu, 27 Jun 2024 16:45:00 +0200
Subject: [PATCH 1510/1688] Prevent modifications on read-only timetables

---
 .../model/TimetableSnapshot.java              | 16 +++----
 .../model/TimetableSnapshotTest.java          | 47 +++++++++++++++++++
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index ac4de0ce38c..2499264d8c8 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -92,7 +92,7 @@ public class TimetableSnapshot {
    * The compound key approach better reflects the fact that there should be only one Timetable per
    * TripPattern and date.
    */
-  private Map> timetables = new HashMap();
+  private Map> timetables = new HashMap<>();
 
   /**
    * For cases where the trip pattern (sequence of stops visited) has been changed by a realtime
@@ -266,7 +266,7 @@ public TimetableSnapshot commit(TransitLayerUpdater transitLayerUpdater, boolean
     this.dirtyTimetables.clear();
     this.dirty = false;
 
-    ret.setPatternsForStop(ImmutableSetMultimap.copyOf(patternsForStop));
+    ret.patternsForStop = ImmutableSetMultimap.copyOf(patternsForStop);
 
     ret.readOnly = true; // mark the snapshot as henceforth immutable
     return ret;
@@ -303,6 +303,10 @@ public void clear(String feedId) {
    * message and an attempt was made to re-associate it with its originally scheduled trip pattern.
    */
   public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serviceDate) {
+    if (readOnly) {
+      throw new ConcurrentModificationException("This TimetableSnapshot is read-only.");
+    }
+
     boolean success = false;
 
     final TripPattern pattern = getRealtimeAddedTripPattern(tripId, serviceDate);
@@ -406,10 +410,6 @@ public Collection getPatternsForStop(StopLocation stop) {
     return patternsForStop.get(stop);
   }
 
-  public void setPatternsForStop(SetMultimap patternsForStop) {
-    this.patternsForStop = patternsForStop;
-  }
-
   /**
    * Does this snapshot contain any realtime data or is it completely empty?
    */
@@ -423,7 +423,7 @@ public boolean isEmpty() {
    * @param feedId feed id to clear out
    * @return true if the timetable changed as a result of the call
    */
-  protected boolean clearTimetable(String feedId) {
+  private boolean clearTimetable(String feedId) {
     return timetables.keySet().removeIf(tripPattern -> feedId.equals(tripPattern.getFeedId()));
   }
 
@@ -433,7 +433,7 @@ protected boolean clearTimetable(String feedId) {
    * @param feedId feed id to clear out
    * @return true if the realtimeAddedTripPattern changed as a result of the call
    */
-  protected boolean clearRealtimeAddedTripPattern(String feedId) {
+  private boolean clearRealtimeAddedTripPattern(String feedId) {
     return realtimeAddedTripPattern
       .keySet()
       .removeIf(realtimeAddedTripPattern ->
diff --git a/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java b/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
index 26d93f6a848..89c30da79e4 100644
--- a/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
+++ b/src/test/java/org/opentripplanner/model/TimetableSnapshotTest.java
@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNotSame;
 import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.google.transit.realtime.GtfsRealtime.TripDescriptor;
@@ -261,6 +262,52 @@ public void testPurge() {
     assertFalse(resolver.isDirty());
   }
 
+  @Test
+  void testCannotUpdateReadOnlyTimetableSnapshot() {
+    TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+    LocalDate today = LocalDate.now(timeZone);
+    TripPattern pattern = patternIndex.get(new FeedScopedId(feedId, "1.1"));
+    assertThrows(
+      ConcurrentModificationException.class,
+      () -> committedSnapshot.update(pattern, null, today)
+    );
+  }
+
+  @Test
+  void testCannotCommitReadOnlyTimetableSnapshot() {
+    TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+    assertThrows(ConcurrentModificationException.class, () -> committedSnapshot.commit(null, true));
+  }
+
+  @Test
+  void testCannotClearReadOnlyTimetableSnapshot() {
+    TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+    assertThrows(ConcurrentModificationException.class, () -> committedSnapshot.clear(null));
+  }
+
+  @Test
+  void testCannotPurgeReadOnlyTimetableSnapshot() {
+    TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+    assertThrows(
+      ConcurrentModificationException.class,
+      () -> committedSnapshot.purgeExpiredData(null)
+    );
+  }
+
+  @Test
+  void testCannotRevertReadOnlyTimetableSnapshot() {
+    TimetableSnapshot committedSnapshot = createCommittedSnapshot();
+    assertThrows(
+      ConcurrentModificationException.class,
+      () -> committedSnapshot.revertTripToScheduledTripPattern(null, null)
+    );
+  }
+
+  private static TimetableSnapshot createCommittedSnapshot() {
+    TimetableSnapshot timetableSnapshot = new TimetableSnapshot();
+    return timetableSnapshot.commit(null, true);
+  }
+
   private Result updateResolver(
     TimetableSnapshot resolver,
     TripPattern pattern,

From 1301e96ac7224728a7be8ff36cfdaeaa2cb3b57d Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 2 Jul 2024 11:41:03 +0200
Subject: [PATCH 1511/1688] Make assertion return void

---
 .../updater/spi/UpdateResultAssertions.java                | 3 +--
 .../updater/trip/moduletests/addition/AddedTest.java       | 7 ++++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java b/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
index 13806cde4c3..38468744886 100644
--- a/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
+++ b/src/test/java/org/opentripplanner/updater/spi/UpdateResultAssertions.java
@@ -11,7 +11,7 @@ public static void assertFailure(UpdateError.UpdateErrorType expectedError, Upda
     assertEquals(Set.of(expectedError), result.failures().keySet());
   }
 
-  public static UpdateResult assertSuccess(UpdateResult updateResult) {
+  public static void assertSuccess(UpdateResult updateResult) {
     var errorCodes = updateResult.failures().keySet();
     assertEquals(
       Set.of(),
@@ -19,6 +19,5 @@ public static UpdateResult assertSuccess(UpdateResult updateResult) {
       "Update result should have no error codes but had %s".formatted(errorCodes)
     );
     assertTrue(updateResult.successful() > 0);
-    return updateResult;
   }
 }
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
index 7f5d976e737..8d3984cc546 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
@@ -51,8 +51,8 @@ void addedTripWithNewRoute() {
       .addStopTime(STOP_B1_ID, 55, DropOffPickupType.NONE)
       .build();
 
-    var result = assertSuccess(env.applyTripUpdate(tripUpdate));
-
+    var result = env.applyTripUpdate(tripUpdate);
+    assertSuccess(result);
     assertTrue(result.warnings().isEmpty());
 
     var pattern = assertAddedTrip(ADDED_TRIP_ID, env);
@@ -83,7 +83,8 @@ void addedWithUnknownStop() {
       .addStopTime(STOP_C1_ID, 55, DropOffPickupType.NONE)
       .build();
 
-    var result = assertSuccess(env.applyTripUpdate(tripUpdate));
+    var result = env.applyTripUpdate(tripUpdate);
+    assertSuccess(result);
 
     assertEquals(
       List.of(UpdateSuccess.WarningType.UNKNOWN_STOPS_REMOVED_FROM_ADDED_TRIP),

From c321509b15f70441e35c8b9ebba1d1d3f130c462 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 2 Jul 2024 12:30:18 +0200
Subject: [PATCH 1512/1688] Update slack docs

---
 docs/RouteRequest.md                          | 35 ++++++++++---------
 .../routerequest/RouteRequestConfig.java      | 31 ++++++++--------
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md
index 2d894dee8dd..2401c378513 100644
--- a/docs/RouteRequest.md
+++ b/docs/RouteRequest.md
@@ -15,9 +15,9 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe
 
 | Config Parameter                                                                                             |          Type          | Summary                                                                                                                                        |  Req./Opt. | Default Value    | Since |
 |--------------------------------------------------------------------------------------------------------------|:----------------------:|------------------------------------------------------------------------------------------------------------------------------------------------|:----------:|------------------|:-----:|
-| [alightSlack](#rd_alightSlack)                                                                               |       `duration`       | The extra time to exit a public transport vehicle.                                                                                             | *Optional* | `"PT0S"`         |  2.0  |
+| [alightSlack](#rd_alightSlack)                                                                               |       `duration`       | The time safety margin when alighting from a vehicle.                                                                                          | *Optional* | `"PT0S"`         |  2.0  |
 | arriveBy                                                                                                     |        `boolean`       | Whether the trip should depart or arrive at the specified date and time.                                                                       | *Optional* | `false`          |  2.0  |
-| [boardSlack](#rd_boardSlack)                                                                                 |       `duration`       | The extra time to board a public transport vehicle.                                                                                            | *Optional* | `"PT0S"`         |  2.0  |
+| [boardSlack](#rd_boardSlack)                                                                                 |       `duration`       | The time safety margin when boarding a vehicle.                                                                                                | *Optional* | `"PT0S"`         |  2.0  |
 | [drivingDirection](#rd_drivingDirection)                                                                     |         `enum`         | The driving direction to use in the intersection traversal calculation                                                                         | *Optional* | `"right"`        |  2.2  |
 | elevatorBoardCost                                                                                            |        `integer`       | What is the cost of boarding a elevator?                                                                                                       | *Optional* | `90`             |  2.0  |
 | elevatorBoardTime                                                                                            |        `integer`       | How long does it take to get on an elevator, on average.                                                                                       | *Optional* | `90`             |  2.0  |
@@ -192,14 +192,14 @@ and in the [transferRequests in build-config.json](BuildConfiguration.md#transfe
 **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"`   
 **Path:** /routingDefaults 
 
-The extra time to exit a public transport vehicle.
+The time safety margin when alighting from a vehicle.
 
-The slack is added to arrival time of the transit vehicle.
+This time slack is added to arrival time of the vehicle before any transfer or onward travel.
 
-This also influences the time it takes to transfer.
-
-Since some modes, like airplane and subway, need more time than others, this is also configurable
-per mode with `alightSlackForMode`.
+The sole reason for this is to avoid missed connections when there are minor schedule variations. This
+parameter is intended to be set by agencies not individual users. In general it is better to use
+`boardSlack` - see its documentation for details. However, for specific modes, like airplane and
+subway, that need more time than others, this is also configurable per mode with `alightSlackForMode`.
 
 
 
              boardSlack
              
@@ -207,18 +207,19 @@ per mode with `alightSlackForMode`.
 **Since version:** `2.0` ∙ **Type:** `duration` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"PT0S"`   
 **Path:** /routingDefaults 
 
-The extra time to board a public transport vehicle.
+The time safety margin when boarding a vehicle.
 
-The extra time is added to the time when entering a public transport vehicle. This is a useful
-tool for agencies wanting to add a general buffer time so that passengers are instructed to be
-a earlier at their stop than is strictly necessary. This is also added when transferring from one
-vehicle to another.
+The board slack is added to the passenger's arrival time at a stop before boarding evaluating which
+vehicles can be boarded.
 
-It is similar to `transferSlack`, except that this also applies to the first transit leg in the
-trip and `transferSlack` does not.
+The sole reason for this is to avoid missed connections when there are minor schedule variations. This
+parameter is intended to be set by agencies not individual users. For specific modes, like airplane and
+subway, that need more time than others, this is also configurable per mode with `boardSlackForMode`.
 
-Some modes, like airplane or subway, might need more of a slack than others, so this is also
-configurable per mode with `boardSlackForMode`.
+Agencies can use this parameter to ensure that the trip planner does not instruct passengers to arrive
+at the last second.
+This slack is added at every boarding including the first vehicle and transfers except for in-seat
+transfers and guaranteed transfers.
 
 
 
              drivingDirection
              
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
index ddb5d9a3a18..9286e519acd 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
@@ -202,15 +202,15 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil
             c
               .of("alightSlack")
               .since(V2_0)
-              .summary("The extra time to exit a public transport vehicle.")
+              .summary("The time safety margin when alighting from a vehicle.")
               .description(
                 """
-The slack is added to arrival time of the transit vehicle.
+This time slack is added to arrival time of the vehicle before any transfer or onward travel.
 
-This also influences the time it takes to transfer.
-
-Since some modes, like airplane and subway, need more time than others, this is also configurable
-per mode with `alightSlackForMode`.
+The sole reason for this is to avoid missed connections when there are minor schedule variations. This
+parameter is intended to be set by agencies not individual users. In general it is better to use
+`boardSlack` - see its documentation for details. However, for specific modes, like airplane and
+subway, that need more time than others, this is also configurable per mode with `alightSlackForMode`.
 """
               )
               .asDuration(dft.alightSlack().defaultValue())
@@ -235,19 +235,20 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil
             c
               .of("boardSlack")
               .since(V2_0)
-              .summary("The extra time to board a public transport vehicle.")
+              .summary("The time safety margin when boarding a vehicle.")
               .description(
                 """
-The extra time is added to the time when entering a public transport vehicle. This is a useful
-tool for agencies wanting to add a general buffer time so that passengers are instructed to be
-a earlier at their stop than is strictly necessary. This is also added when transferring from one
-vehicle to another.
+The board slack is added to the passenger's arrival time at a stop before boarding evaluating which
+vehicles can be boarded.
 
-It is similar to `transferSlack`, except that this also applies to the first transit leg in the
-trip and `transferSlack` does not.
+The sole reason for this is to avoid missed connections when there are minor schedule variations. This
+parameter is intended to be set by agencies not individual users. For specific modes, like airplane and
+subway, that need more time than others, this is also configurable per mode with `boardSlackForMode`.
 
-Some modes, like airplane or subway, might need more of a slack than others, so this is also
-configurable per mode with `boardSlackForMode`.
+Agencies can use this parameter to ensure that the trip planner does not instruct passengers to arrive 
+at the last second.
+This slack is added at every boarding including the first vehicle and transfers except for in-seat 
+transfers and guaranteed transfers. 
 """
               )
               .asDuration(dft.boardSlack().defaultValue())

From 93a132ad9d1ca2a8bddc642b4f917437a4ed73ed Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 2 Jul 2024 14:42:28 +0200
Subject: [PATCH 1513/1688] Apply review feedback

---
 doc-templates/OsmMapper.md | 12 ++++++++++++
 docs/osm/Default.md        | 12 ++++++++++++
 docs/osm/Finland.md        | 12 ++++++++++++
 docs/osm/Germany.md        | 12 ++++++++++++
 docs/osm/Norway.md         | 12 ++++++++++++
 docs/osm/UK.md             | 12 ++++++++++++
 6 files changed, 72 insertions(+)

diff --git a/doc-templates/OsmMapper.md b/doc-templates/OsmMapper.md
index 1fe32ea06e9..1690deac627 100644
--- a/doc-templates/OsmMapper.md
+++ b/doc-templates/OsmMapper.md
@@ -1,5 +1,17 @@
 # OSM tag mapping
 
+This page is intended to give an overview of which OpenStreetMap(OSM) tags OTP uses to evaluate its
+walking and bicycling instructions. If a tag is not part of the documentation on this page
+then this tag mapper (profile) does not use it. 
+
+The exception are access permissions and wheelchair accessibility tags like
+
+- `access=no`
+- `wheelchair=no`
+- `oneway=yes`
+
+These are identical for all mappers and not separately listed on this page.
+
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
diff --git a/docs/osm/Default.md b/docs/osm/Default.md
index c390c8e4a1b..814420b791f 100644
--- a/docs/osm/Default.md
+++ b/docs/osm/Default.md
@@ -1,5 +1,17 @@
 # OSM tag mapping
 
+This page is intended to give an overview of which OpenStreetMap(OSM) tags OTP uses to evaluate its
+walking and bicycling instructions. If a tag is not part of the documentation on this page
+then this tag mapper (profile) does not use it. 
+
+The exception are access permissions and wheelchair accessibility tags like
+
+- `access=no`
+- `wheelchair=no`
+- `oneway=yes`
+
+These are identical for all mappers and not separately listed on this page.
+
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
diff --git a/docs/osm/Finland.md b/docs/osm/Finland.md
index 33b1ee9ae2a..8a60b5f0b13 100644
--- a/docs/osm/Finland.md
+++ b/docs/osm/Finland.md
@@ -1,5 +1,17 @@
 # OSM tag mapping
 
+This page is intended to give an overview of which OpenStreetMap(OSM) tags OTP uses to evaluate its
+walking and bicycling instructions. If a tag is not part of the documentation on this page
+then this tag mapper (profile) does not use it. 
+
+The exception are access permissions and wheelchair accessibility tags like
+
+- `access=no`
+- `wheelchair=no`
+- `oneway=yes`
+
+These are identical for all mappers and not separately listed on this page.
+
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
diff --git a/docs/osm/Germany.md b/docs/osm/Germany.md
index 9420e22025e..922aa3af836 100644
--- a/docs/osm/Germany.md
+++ b/docs/osm/Germany.md
@@ -1,5 +1,17 @@
 # OSM tag mapping
 
+This page is intended to give an overview of which OpenStreetMap(OSM) tags OTP uses to evaluate its
+walking and bicycling instructions. If a tag is not part of the documentation on this page
+then this tag mapper (profile) does not use it. 
+
+The exception are access permissions and wheelchair accessibility tags like
+
+- `access=no`
+- `wheelchair=no`
+- `oneway=yes`
+
+These are identical for all mappers and not separately listed on this page.
+
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
diff --git a/docs/osm/Norway.md b/docs/osm/Norway.md
index f0c17c24a6c..d38fc4c04df 100644
--- a/docs/osm/Norway.md
+++ b/docs/osm/Norway.md
@@ -1,5 +1,17 @@
 # OSM tag mapping
 
+This page is intended to give an overview of which OpenStreetMap(OSM) tags OTP uses to evaluate its
+walking and bicycling instructions. If a tag is not part of the documentation on this page
+then this tag mapper (profile) does not use it. 
+
+The exception are access permissions and wheelchair accessibility tags like
+
+- `access=no`
+- `wheelchair=no`
+- `oneway=yes`
+
+These are identical for all mappers and not separately listed on this page.
+
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.
diff --git a/docs/osm/UK.md b/docs/osm/UK.md
index 3dd77b1b393..4a640caf95c 100644
--- a/docs/osm/UK.md
+++ b/docs/osm/UK.md
@@ -1,5 +1,17 @@
 # OSM tag mapping
 
+This page is intended to give an overview of which OpenStreetMap(OSM) tags OTP uses to evaluate its
+walking and bicycling instructions. If a tag is not part of the documentation on this page
+then this tag mapper (profile) does not use it. 
+
+The exception are access permissions and wheelchair accessibility tags like
+
+- `access=no`
+- `wheelchair=no`
+- `oneway=yes`
+
+These are identical for all mappers and not separately listed on this page.
+
 ### Way properties
 
 Way properties set a way's permission and optionally influences its walk and bicycle safety factors.

From a83a9e820481df8bda3f37e799aa30626aa971f6 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 2 Jul 2024 16:20:33 +0200
Subject: [PATCH 1514/1688] Update
 src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java

Co-authored-by: Joel Lappalainen 
---
 .../opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
index 82d67cae7f3..e7dfa1bcf07 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
@@ -14,7 +14,7 @@
 
 /**
  * Encapsulates the logic to filter patterns by the service dates that they operate on. It also
- * has a method to filter routes by checking if their patterns operate on the required days
+ * has a method to filter routes by checking if their patterns operate on the required days.
  * 
              
  * Once a more complete filtering engine is in place in the core data model, this code should be
  * there rather than a separate class in the API package.

From b88a35e69b1b576ac2930fd511f1a6298dc2dfb0 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 2 Jul 2024 16:21:10 +0200
Subject: [PATCH 1515/1688] Update error message

---
 .../opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
index e7dfa1bcf07..1f2ef45dfd5 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
@@ -39,7 +39,7 @@ public class PatternByServiceDatesFilter {
     this.range = range;
 
     if (range.unlimited()) {
-      throw new IllegalArgumentException("startInclusive and endExclusive cannot be both null");
+      throw new IllegalArgumentException("start and end cannot be both null");
     } else if (range.startBeforeEnd()) {
       throw new IllegalArgumentException("start must be before end");
     }

From dd0c06abadd4ccb521ec10f964a5b59ab22e1aa2 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Wed, 3 Jul 2024 07:48:21 +0000
Subject: [PATCH 1516/1688] Add changelog entry for #5915 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 27e84a71ff6..756f677579f 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -37,6 +37,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Refactor SIRI-ET updaters [#5904](https://github.com/opentripplanner/OpenTripPlanner/pull/5904)
 - Update Google Pubsub updater configuration [#5927](https://github.com/opentripplanner/OpenTripPlanner/pull/5927)
 - Make new debug client the default, move old one to `classic-debug` [#5924](https://github.com/opentripplanner/OpenTripPlanner/pull/5924)
+- Require valid polygons for AreaStop [#5915](https://github.com/opentripplanner/OpenTripPlanner/pull/5915)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 98c075d99bc026f24ce7c6a0b063494e4338dd6e Mon Sep 17 00:00:00 2001
From: OTP Serialization Version Bot
 
Date: Wed, 3 Jul 2024 07:48:47 +0000
Subject: [PATCH 1517/1688] Bump serialization version id for #5915

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index c6ce3a03f60..2a828e2e976 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 
     
-        151
+        152
         
         31.2
         2.51.1

From b057fbce5a6317cb433bb36f144fc1a8ffad60dc Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 10:13:19 +0200
Subject: [PATCH 1518/1688] Update
 src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java

Co-authored-by: Joel Lappalainen 
---
 .../openstreetmap/wayproperty/specifier/Condition.java          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
index 35a104c5980..3344074f536 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
@@ -123,7 +123,7 @@ public String toString() {
   }
 
   /**
-   * Selects tags with a give key.
+   * Selects tags with a given key.
    */
   record Present(String key) implements Condition {
     @Override

From a9441a7060ba7e9c56ad667280f83933288323ea Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 10:14:37 +0200
Subject: [PATCH 1519/1688] Improve Javadoc

---
 .../openstreetmap/wayproperty/specifier/Condition.java        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
index 3344074f536..4ad180c16c3 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/specifier/Condition.java
@@ -226,7 +226,9 @@ public String toString() {
   }
 
   /**
-   * Selects a tag which has one of a set of given values or the tag is absent.
+   * Selects a tag where one of the following conditions is true:
+   *  - one of a set of given values matches
+   *  - the tag is absent
    */
   record OneOfOrAbsent(String key, String... values) implements Condition {
     /* A use case for this is to detect the absence of a sidewalk, cycle lane or verge*/

From 10f746416c39e9a970f1dc8c65685008daea1a72 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 2 Jul 2024 16:39:38 +0200
Subject: [PATCH 1520/1688] Expose stop transfer priority in API

---
 .../apis/transmodel/model/EnumTypes.java          | 15 +++++++++++++++
 .../model/stop/MonoOrMultiModalStation.java       |  9 +++++++++
 .../apis/transmodel/model/stop/StopPlaceType.java | 12 ++++++++++++
 .../apis/transmodel/schema.graphql                | 14 +++++++++++++-
 4 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
index 6c173ba815f..54efb958406 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
@@ -22,6 +22,7 @@
 import org.opentripplanner.transit.model.basic.Accessibility;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.network.BikeAccess;
+import org.opentripplanner.transit.model.site.StopTransferPriority;
 import org.opentripplanner.transit.model.timetable.Direction;
 import org.opentripplanner.transit.model.timetable.OccupancyStatus;
 import org.opentripplanner.transit.model.timetable.RealTimeState;
@@ -133,6 +134,7 @@ public class EnumTypes {
 
   public static final GraphQLEnumType INTERCHANGE_WEIGHTING = GraphQLEnumType
     .newEnum()
+    .description("Deprecated. Use STOP_INTERCHANGE_PRIORITY")
     .name("InterchangeWeighting")
     .value("preferredInterchange", 2, "Highest priority interchange.")
     .value("recommendedInterchange", 1, "Second highest priority interchange.")
@@ -140,6 +142,19 @@ public class EnumTypes {
     .value("noInterchange", -1, "Interchange not allowed.")
     .build();
 
+  public static final GraphQLEnumType STOP_INTERCHANGE_PRIORITY = GraphQLEnumType
+    .newEnum()
+    .name("StopInterchangePriority")
+    .value("preferred", StopTransferPriority.PREFERRED, "Highest interchange priority.")
+    .value("recommended", StopTransferPriority.RECOMMENDED)
+    .value("allowed", StopTransferPriority.ALLOWED)
+    .value(
+      "discouraged",
+      StopTransferPriority.DISCOURAGED,
+      "This maps to 'interchangeNotAllowed' in NeTEx."
+    )
+    .build();
+
   public static final GraphQLEnumType ITINERARY_FILTER_DEBUG_PROFILE = createFromDocumentedEnum(
     "ItineraryFilterDebugProfile",
     List.of(
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java
index 3055c1a0115..9a7c92f6618 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/MonoOrMultiModalStation.java
@@ -8,6 +8,7 @@
 import org.opentripplanner.transit.model.site.MultiModalStation;
 import org.opentripplanner.transit.model.site.Station;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.transit.model.site.StopTransferPriority;
 
 public class MonoOrMultiModalStation {
 
@@ -40,6 +41,8 @@ public class MonoOrMultiModalStation {
 
   private final MonoOrMultiModalStation parentStation;
 
+  private final StopTransferPriority priority;
+
   public MonoOrMultiModalStation(Station station, MultiModalStation parentStation) {
     this.id = station.getId();
     this.name = station.getName();
@@ -50,6 +53,7 @@ public MonoOrMultiModalStation(Station station, MultiModalStation parentStation)
     this.url = station.getUrl();
     this.timezone = station.getTimezone();
     this.childStops = station.getChildStops();
+    this.priority = station.getPriority();
     this.parentStation = parentStation != null ? new MonoOrMultiModalStation(parentStation) : null;
   }
 
@@ -63,6 +67,7 @@ public MonoOrMultiModalStation(MultiModalStation multiModalStation) {
     this.url = multiModalStation.getUrl();
     this.timezone = null;
     this.childStops = multiModalStation.getChildStops();
+    this.priority = null;
     this.parentStation = null;
   }
 
@@ -102,6 +107,10 @@ public Collection getChildStops() {
     return childStops;
   }
 
+  public StopTransferPriority getPriority() {
+    return priority;
+  }
+
   public MonoOrMultiModalStation getParentStation() {
     return parentStation;
   }
diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java
index 13a1521bf1a..53621ee9b5a 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/stop/StopPlaceType.java
@@ -147,10 +147,22 @@ public static GraphQLObjectType create(
           .description(
             "Relative weighting of this stop with regards to interchanges. NOT IMPLEMENTED"
           )
+          .deprecate("Not implemented. Use stopInterchangePriority")
           .type(EnumTypes.INTERCHANGE_WEIGHTING)
           .dataFetcher(environment -> 0)
           .build()
       )
+      .field(
+        GraphQLFieldDefinition
+          .newFieldDefinition()
+          .name("stopInterchangePriority")
+          .description("Specify the priority of interchanges at this stop")
+          .type(EnumTypes.STOP_INTERCHANGE_PRIORITY)
+          .dataFetcher(environment ->
+            ((MonoOrMultiModalStation) environment.getSource()).getPriority()
+          )
+          .build()
+      )
       .field(
         GraphQLFieldDefinition
           .newFieldDefinition()
diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
index 5c1912df4e6..e93eca94f83 100644
--- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
+++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -1167,6 +1167,8 @@ type StopPlace implements PlaceInterface {
   ): [Quay] @timingData
   "Get all situations active for the stop place. Situations affecting individual quays are not returned, and should be fetched directly from the quay."
   situations: [PtSituationElement!]!
+  "Specify the priority of interchanges at this stop"
+  stopInterchangePriority: StopInterchangePriority
   tariffZones: [TariffZone]!
   timeZone: String
   "The transport modes of quays under this stop place."
@@ -1174,7 +1176,7 @@ type StopPlace implements PlaceInterface {
   "The transport submode serviced by this stop place."
   transportSubmode: [TransportSubmode]
   "Relative weighting of this stop with regards to interchanges. NOT IMPLEMENTED"
-  weighting: InterchangeWeighting
+  weighting: InterchangeWeighting @deprecated(reason : "Not implemented. Use stopInterchangePriority")
 }
 
 "List of coordinates between two stops as a polyline"
@@ -1531,6 +1533,7 @@ enum InterchangePriority {
   recommended
 }
 
+"Deprecated. Use STOP_INTERCHANGE_PRIORITY"
 enum InterchangeWeighting {
   "Third highest priority interchange."
   interchangeAllowed
@@ -1746,6 +1749,15 @@ enum StopCondition {
   startPoint
 }
 
+enum StopInterchangePriority {
+  allowed
+  "This maps to 'interchangeNotAllowed' in NeTEx."
+  discouraged
+  "Highest interchange priority."
+  preferred
+  recommended
+}
+
 enum StreetMode {
   "Bike only. This can be used as access/egress, but transfers will still be walk only."
   bicycle

From d6c9f6fff313c48276b5155f3d4611fc5f961096 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 3 Jul 2024 11:07:00 +0200
Subject: [PATCH 1521/1688] refactor: Add logging of wholes in the stop-index.

---
 .../transit/service/StopModelIndex.java       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java b/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
index 16337d980a1..5c0a5d3c0f9 100644
--- a/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
+++ b/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
@@ -1,8 +1,11 @@
 package org.opentripplanner.transit.service;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import javax.annotation.Nullable;
 import org.locationtech.jts.geom.Envelope;
 import org.opentripplanner.framework.collection.CollectionsView;
 import org.opentripplanner.framework.geometry.HashGridSpatialIndex;
@@ -12,6 +15,9 @@
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.Station;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.event.Level;
 
 /**
  * Indexed access to Stop entities.
@@ -20,6 +26,8 @@
  */
 class StopModelIndex {
 
+  private static final Logger LOG = LoggerFactory.getLogger(StopModelIndex.class);
+
   private final HashGridSpatialIndex regularStopSpatialIndex = new HashGridSpatialIndex<>();
   private final Map multiModalStationForStations = new HashMap<>();
   private final HashGridSpatialIndex locationIndex = new HashGridSpatialIndex<>();
@@ -58,6 +66,8 @@ class StopModelIndex {
     // Trim the sizes of the indices
     regularStopSpatialIndex.compact();
     locationIndex.compact();
+
+    logWholesInIndex();
   }
 
   /**
@@ -71,6 +81,7 @@ MultiModalStation getMultiModalStationForStation(Station station) {
     return multiModalStationForStations.get(station);
   }
 
+  @Nullable
   StopLocation stopByIndex(int index) {
     return stopsByIndex[index];
   }
@@ -82,4 +93,19 @@ int stopIndexSize() {
   Collection findAreaStops(Envelope envelope) {
     return locationIndex.query(envelope);
   }
+
+  /**
+   * A small number of wholes in the stop-index is ok, but if there are many, it will affect
+   * the Raptor performance.
+   */
+  private void logWholesInIndex() {
+    int c = (int) Arrays.stream(stopsByIndex).filter(Objects::isNull).count();
+    if (c > 0) {
+      double p = (100.0 * c) / stopsByIndex.length;
+      // Log this as warning is more than 5% of the space is null
+      LOG
+        .atLevel(p >= 5.0 ? Level.WARN : Level.INFO)
+        .log("The stop index contains wholes in it. {} of {} is null.", c, stopsByIndex.length);
+    }
+  }
 }

From 76e9139844513fd361b0a8e0821cb71c6a8acbfe Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 3 Jul 2024 11:08:55 +0200
Subject: [PATCH 1522/1688] Fix: NullPointerException in TransitLayerMapper

---
 .../transit/mappers/TransfersMapper.java          |  5 +++++
 .../transit/mappers/TransitLayerMapper.java       | 15 ++++++++++++---
 .../transit/service/StopModel.java                |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
index 3cb259d3a67..74a5d7a6352 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
@@ -19,6 +19,11 @@ static List> mapTransfers(StopModel stopModel, TransitModel trans
 
     for (int i = 0; i < stopModel.stopIndexSize(); ++i) {
       var stop = stopModel.stopByIndex(i);
+
+      if (stop == null) {
+        continue;
+      }
+
       ArrayList list = new ArrayList<>();
 
       for (PathTransfer pathTransfer : transitModel.getTransfersByStop(stop)) {
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
index 210c8b42066..546a97b1d6e 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
@@ -190,12 +190,21 @@ static int[] createStopBoardAlightTransferCosts(
     if (!tuningParams.enableStopTransferPriority()) {
       return null;
     }
+    int defaultCost = RaptorCostConverter.toRaptorCost(
+      tuningParams.stopBoardAlightDuringTransferCost(StopTransferPriority.ALLOWED)
+    );
     int[] stopBoardAlightTransferCosts = new int[stops.stopIndexSize()];
 
     for (int i = 0; i < stops.stopIndexSize(); ++i) {
-      StopTransferPriority priority = stops.stopByIndex(i).getPriority();
-      int domainCost = tuningParams.stopBoardAlightDuringTransferCost(priority);
-      stopBoardAlightTransferCosts[i] = RaptorCostConverter.toRaptorCost(domainCost);
+      // There can be wholes in the stop index, so we need to account for 'null' here.
+      var stop = stops.stopByIndex(i);
+      if (stop == null) {
+        stopBoardAlightTransferCosts[i] = defaultCost;
+      } else {
+        var priority = stop.getPriority();
+        int domainCost = tuningParams.stopBoardAlightDuringTransferCost(priority);
+        stopBoardAlightTransferCosts[i] = RaptorCostConverter.toRaptorCost(domainCost);
+      }
     }
     return stopBoardAlightTransferCosts;
   }
diff --git a/src/main/java/org/opentripplanner/transit/service/StopModel.java b/src/main/java/org/opentripplanner/transit/service/StopModel.java
index 763aa504c40..4f55ca25b5b 100644
--- a/src/main/java/org/opentripplanner/transit/service/StopModel.java
+++ b/src/main/java/org/opentripplanner/transit/service/StopModel.java
@@ -162,6 +162,7 @@ public Collection listGroupStops() {
     return groupStopById.values();
   }
 
+  @Nullable
   public StopLocation stopByIndex(int stopIndex) {
     return index.stopByIndex(stopIndex);
   }

From b84f11735a8e2724021f7c410968c73f241180d1 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 3 Jul 2024 11:12:01 +0200
Subject: [PATCH 1523/1688] refactor: Explicit default-value for
 StopTransferPriority

---
 docs/BuildConfiguration.md                    |  4 +--
 docs/RouterConfiguration.md                   |  2 +-
 .../gtfs/graphbuilder/GtfsFeedParameters.java |  3 --
 .../GtfsFeedParametersBuilder.java            |  2 +-
 .../transit/mappers/TransitLayerMapper.java   |  2 +-
 .../transit/model/site/RegularStop.java       |  4 ++-
 .../transit/model/site/Station.java           |  5 ++--
 .../transit/model/site/StopLocation.java      |  2 +-
 .../model/site/StopTransferPriority.java      | 30 +++++++++++--------
 9 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md
index 7d2d90ea41b..cefd8d2cf2f 100644
--- a/docs/BuildConfiguration.md
+++ b/docs/BuildConfiguration.md
@@ -731,7 +731,7 @@ but we want to calculate the transfers always from OSM data.
 
 **Since version:** `2.3` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"allowed"`   
 **Path:** /gtfsDefaults   
-**Enum values:** `discouraged` | `allowed` | `recommended` | `preferred`
+**Enum values:** `preferred` | `recommended` | `allowed` | `discouraged`
 
 Should there be some preference or aversion for transfers at stops that are part of a station.
 
@@ -980,7 +980,7 @@ but we want to calculate the transfers always from OSM data.
 
 **Since version:** `2.3` ∙ **Type:** `enum` ∙ **Cardinality:** `Optional` ∙ **Default value:** `"allowed"`   
 **Path:** /transitFeeds/[0]   
-**Enum values:** `discouraged` | `allowed` | `recommended` | `preferred`
+**Enum values:** `preferred` | `recommended` | `allowed` | `discouraged`
 
 Should there be some preference or aversion for transfers at stops that are part of a station. Overrides the value specified in `gtfsDefaults`.
 
diff --git a/docs/RouterConfiguration.md b/docs/RouterConfiguration.md
index 0891bf6d20d..aff2f4964f0 100644
--- a/docs/RouterConfiguration.md
+++ b/docs/RouterConfiguration.md
@@ -363,7 +363,7 @@ for more info."
 
 **Since version:** `2.0` ∙ **Type:** `enum map of integer` ∙ **Cardinality:** `Optional`   
 **Path:** /transit   
-**Enum keys:** `discouraged` | `allowed` | `recommended` | `preferred`
+**Enum keys:** `preferred` | `recommended` | `allowed` | `discouraged`
 
 Costs for boarding and alighting during transfers at stops with a given transfer priority.
 
diff --git a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java b/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java
index fa23e02bac5..68b8874d5e6 100644
--- a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java
+++ b/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParameters.java
@@ -24,9 +24,6 @@ public record GtfsFeedParameters(
   implements DataSourceConfig {
   public static final boolean DEFAULT_REMOVE_REPEATED_STOPS = true;
 
-  public static final StopTransferPriority DEFAULT_STATION_TRANSFER_PREFERENCE =
-    StopTransferPriority.ALLOWED;
-
   public static final boolean DEFAULT_DISCARD_MIN_TRANSFER_TIMES = false;
 
   public static final boolean DEFAULT_BLOCK_BASED_INTERLINING = true;
diff --git a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java b/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java
index 9dd3ad3a25e..1e799dbecbb 100644
--- a/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java
+++ b/src/main/java/org/opentripplanner/gtfs/graphbuilder/GtfsFeedParametersBuilder.java
@@ -18,7 +18,7 @@ public class GtfsFeedParametersBuilder {
 
   public GtfsFeedParametersBuilder() {
     this.removeRepeatedStops = GtfsFeedParameters.DEFAULT_REMOVE_REPEATED_STOPS;
-    this.stationTransferPreference = GtfsFeedParameters.DEFAULT_STATION_TRANSFER_PREFERENCE;
+    this.stationTransferPreference = StopTransferPriority.defaultValue();
     this.discardMinTransferTimes = GtfsFeedParameters.DEFAULT_DISCARD_MIN_TRANSFER_TIMES;
     this.blockBasedInterlining = GtfsFeedParameters.DEFAULT_BLOCK_BASED_INTERLINING;
     this.maxInterlineDistance = GtfsFeedParameters.DEFAULT_MAX_INTERLINE_DISTANCE;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
index 546a97b1d6e..91bdd78f396 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
@@ -191,7 +191,7 @@ static int[] createStopBoardAlightTransferCosts(
       return null;
     }
     int defaultCost = RaptorCostConverter.toRaptorCost(
-      tuningParams.stopBoardAlightDuringTransferCost(StopTransferPriority.ALLOWED)
+      tuningParams.stopBoardAlightDuringTransferCost(StopTransferPriority.defaultValue())
     );
     int[] stopBoardAlightTransferCosts = new int[stops.stopIndexSize()];
 
diff --git a/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java b/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java
index 4c1638e7bae..9f3327beff9 100644
--- a/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java
+++ b/src/main/java/org/opentripplanner/transit/model/site/RegularStop.java
@@ -127,7 +127,9 @@ public Point getGeometry() {
   @Override
   @Nonnull
   public StopTransferPriority getPriority() {
-    return isPartOfStation() ? getParentStation().getPriority() : StopTransferPriority.ALLOWED;
+    return isPartOfStation()
+      ? getParentStation().getPriority()
+      : StopTransferPriority.defaultValue();
   }
 
   @Override
diff --git a/src/main/java/org/opentripplanner/transit/model/site/Station.java b/src/main/java/org/opentripplanner/transit/model/site/Station.java
index 3bfbcb7594e..68ce2d6d5a2 100644
--- a/src/main/java/org/opentripplanner/transit/model/site/Station.java
+++ b/src/main/java/org/opentripplanner/transit/model/site/Station.java
@@ -30,8 +30,6 @@ public class Station
   extends AbstractTransitEntity
   implements StopLocationsGroup, LogInfo {
 
-  public static final StopTransferPriority DEFAULT_PRIORITY = StopTransferPriority.ALLOWED;
-
   private final I18NString name;
   private final String code;
   private final I18NString description;
@@ -52,7 +50,8 @@ public class Station
     // Required fields
     this.name = Objects.requireNonNull(builder.getName());
     this.coordinate = Objects.requireNonNull(builder.getCoordinate());
-    this.priority = Objects.requireNonNullElse(builder.getPriority(), DEFAULT_PRIORITY);
+    this.priority =
+      Objects.requireNonNullElse(builder.getPriority(), StopTransferPriority.defaultValue());
     this.transfersNotAllowed = builder.isTransfersNotAllowed();
 
     // Optional fields
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java
index a3cbd1a8014..9cb4411437c 100644
--- a/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java
+++ b/src/main/java/org/opentripplanner/transit/model/site/StopLocation.java
@@ -142,7 +142,7 @@ default ZoneId getTimeZone() {
 
   @Nonnull
   default StopTransferPriority getPriority() {
-    return StopTransferPriority.ALLOWED;
+    return StopTransferPriority.defaultValue();
   }
 
   boolean isPartOfSameStationAs(StopLocation alternativeStop);
diff --git a/src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java b/src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java
index 1bc214fd47e..0e072c19ed6 100644
--- a/src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java
+++ b/src/main/java/org/opentripplanner/transit/model/site/StopTransferPriority.java
@@ -9,31 +9,35 @@
  */
 public enum StopTransferPriority {
   /**
-   * Block transfers from/to this stop. In OTP this is not a definitive block, just a huge penalty
-   * is added to the cost function.
+   * Preferred place to transfer, strongly recommended.
    * 
              
-   * NeTEx equivalent is NO_INTERCHANGE.
+   * NeTEx equivalent is PREFERRED_INTERCHANGE.
    */
-  DISCOURAGED,
-
+  PREFERRED,
+  /**
+   * Recommended stop place.
+   * 
              
+   * NeTEx equivalent is RECOMMENDED_INTERCHANGE.
+   */
+  RECOMMENDED,
   /**
    * Allow transfers from/to this stop. This is the default.
    * 
              
    * NeTEx equivalent is INTERCHANGE_ALLOWED.
    */
   ALLOWED,
-
   /**
-   * Recommended stop place.
+   * Block transfers from/to this stop. In OTP this is not a definitive block, just a huge penalty
+   * is added to the cost function.
    * 
              
-   * NeTEx equivalent is RECOMMENDED_INTERCHANGE.
+   * NeTEx equivalent is NO_INTERCHANGE.
    */
-  RECOMMENDED,
+  DISCOURAGED;
 
   /**
-   * Preferred place to transfer, strongly recommended.
-   * 
              
-   * NeTEx equivalent is PREFERRED_INTERCHANGE.
+   * The {@link #ALLOWED} is used as default value in cases where the value is not set.
    */
-  PREFERRED,
+  public static StopTransferPriority defaultValue() {
+    return ALLOWED;
+  }
 }

From eef2d6b87ca77d051c6933b4682c4a9fa03cb2fb Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 3 Jul 2024 11:51:27 +0200
Subject: [PATCH 1524/1688] review: Fix spelling

---
 .../raptoradapter/transit/mappers/TransitLayerMapper.java   | 2 +-
 .../org/opentripplanner/transit/service/StopModelIndex.java | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
index 91bdd78f396..33a076bb8d6 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
@@ -196,7 +196,7 @@ static int[] createStopBoardAlightTransferCosts(
     int[] stopBoardAlightTransferCosts = new int[stops.stopIndexSize()];
 
     for (int i = 0; i < stops.stopIndexSize(); ++i) {
-      // There can be wholes in the stop index, so we need to account for 'null' here.
+      // There can be holes in the stop index, so we need to account for 'null' here.
       var stop = stops.stopByIndex(i);
       if (stop == null) {
         stopBoardAlightTransferCosts[i] = defaultCost;
diff --git a/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java b/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
index 5c0a5d3c0f9..6b89915aa42 100644
--- a/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
+++ b/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
@@ -67,7 +67,7 @@ class StopModelIndex {
     regularStopSpatialIndex.compact();
     locationIndex.compact();
 
-    logWholesInIndex();
+    logHolesInIndex();
   }
 
   /**
@@ -98,14 +98,14 @@ Collection findAreaStops(Envelope envelope) {
    * A small number of wholes in the stop-index is ok, but if there are many, it will affect
    * the Raptor performance.
    */
-  private void logWholesInIndex() {
+  private void logHolesInIndex() {
     int c = (int) Arrays.stream(stopsByIndex).filter(Objects::isNull).count();
     if (c > 0) {
       double p = (100.0 * c) / stopsByIndex.length;
       // Log this as warning is more than 5% of the space is null
       LOG
         .atLevel(p >= 5.0 ? Level.WARN : Level.INFO)
-        .log("The stop index contains wholes in it. {} of {} is null.", c, stopsByIndex.length);
+        .log("The stop index contains holes in it. {} of {} is null.", c, stopsByIndex.length);
     }
   }
 }

From a4ab59a8914e51c9a9edbaa6aee1b70425058b89 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 3 Jul 2024 12:03:20 +0200
Subject: [PATCH 1525/1688] Improve GraphQL Enum documentation

---
 .../apis/transmodel/model/EnumTypes.java      | 21 +++++++++++++++----
 .../apis/transmodel/schema.graphql            |  6 ++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
index 54efb958406..6e63ddf3921 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
@@ -145,13 +145,26 @@ public class EnumTypes {
   public static final GraphQLEnumType STOP_INTERCHANGE_PRIORITY = GraphQLEnumType
     .newEnum()
     .name("StopInterchangePriority")
-    .value("preferred", StopTransferPriority.PREFERRED, "Highest interchange priority.")
-    .value("recommended", StopTransferPriority.RECOMMENDED)
-    .value("allowed", StopTransferPriority.ALLOWED)
+    .value(
+      "preferred",
+      StopTransferPriority.PREFERRED,
+      "Preferred place to transfer, strongly recommended. NeTEx equivalent is PREFERRED_INTERCHANGE."
+    )
+    .value(
+      "recommended",
+      StopTransferPriority.RECOMMENDED,
+      "Recommended stop place. NeTEx equivalent is RECOMMENDED_INTERCHANGE."
+    )
+    .value(
+      "allowed",
+      StopTransferPriority.ALLOWED,
+      "Allow transfers from/to this stop. This is the default. NeTEx equivalent is INTERCHANGE_ALLOWED."
+    )
     .value(
       "discouraged",
       StopTransferPriority.DISCOURAGED,
-      "This maps to 'interchangeNotAllowed' in NeTEx."
+      "Block transfers from/to this stop. In OTP this is not a definitive block," +
+      " just a huge penalty is added to the cost function. NeTEx equivalent is NO_INTERCHANGE."
     )
     .build();
 
diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
index e93eca94f83..64440780f78 100644
--- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
+++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -1750,11 +1750,13 @@ enum StopCondition {
 }
 
 enum StopInterchangePriority {
+  "Allow transfers from/to this stop. This is the default. NeTEx equivalent is INTERCHANGE_ALLOWED."
   allowed
-  "This maps to 'interchangeNotAllowed' in NeTEx."
+  "Block transfers from/to this stop. In OTP this is not a definitive block, just a huge penalty is added to the cost function. NeTEx equivalent is NO_INTERCHANGE."
   discouraged
-  "Highest interchange priority."
+  "Preferred place to transfer, strongly recommended. NeTEx equivalent is PREFERRED_INTERCHANGE."
   preferred
+  "Recommended stop place. NeTEx equivalent is RECOMMENDED_INTERCHANGE."
   recommended
 }
 

From 2a07977cdf4f4f7602c940b20611412b3b402143 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 12:32:02 +0200
Subject: [PATCH 1526/1688] Allow configuration of allowKeepingAtDestination

---
 docs/sandbox/VehicleRentalServiceDirectory.md      |  1 +
 .../VehicleRentalServiceDirectoryFetcher.java      |  3 +--
 .../api/NetworkParameters.java                     | 14 +++++++++-----
 ...VehicleRentalServiceDirectoryFetcherConfig.java |  6 ++++++
 4 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/docs/sandbox/VehicleRentalServiceDirectory.md b/docs/sandbox/VehicleRentalServiceDirectory.md
index 8009a62f912..a822fe93d65 100644
--- a/docs/sandbox/VehicleRentalServiceDirectory.md
+++ b/docs/sandbox/VehicleRentalServiceDirectory.md
@@ -38,6 +38,7 @@ the `router-config.json`
 | url                                                 |      `uri`      | Endpoint for the VehicleRentalServiceDirectory                                  | *Required* |               |  2.1  |
 | [headers](#vehicleRentalServiceDirectory_headers)   | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.      | *Optional* |               |  2.1  |
 | [networks](#vehicleRentalServiceDirectory_networks) |    `object[]`   | List all networks to include. Use "network": "default-network" to set defaults. | *Optional* |               |  2.4  |
+|       allowKeepingVehicleAtDestination              |    `boolean`    | Enables `allowKeepingVehicleAtDestination` for the given network                | *Optional* | `false`       |  2.5  |
 |       geofencingZones                               |    `boolean`    | Enables geofencingZones for the given network                                   | *Optional* | `false`       |  2.4  |
 |       network                                       |     `string`    | The network name                                                                | *Required* |               |  2.4  |
 
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
index 9b350dec345..03b0acd59cd 100644
--- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
+++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/VehicleRentalServiceDirectoryFetcher.java
@@ -105,8 +105,7 @@ private static List buildListOfNetworksFr
             new GbfsVehicleRentalDataSourceParameters(
               updaterUrl.get(),
               parameters.getLanguage(),
-              // allowKeepingRentedVehicleAtDestination - not part of GBFS, not supported here
-              false,
+              networkParams.allowKeepingAtDestination(),
               parameters.getHeaders(),
               networkName,
               networkParams.geofencingZones(),
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
index 25d394f72ec..c99c6893618 100644
--- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
+++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
@@ -5,15 +5,19 @@
 /**
  * Parameters for a specific network.
  * 
              
- * The {@link GbfsVehicleRentalDataSourceParameters} support  {@code overloadingAllowed} and
- * {@code allowKeepingRentedVehicleAtDestination} is not included here since they are not part of
- * the GBFS specification. If there is a demand for these, they can be added.
+ * The {@link GbfsVehicleRentalDataSourceParameters} supports {@code overloadingAllowed}
+ * which is not included here since they are not part of
+ * the GBFS specification. If there is a demand for it, it can be added.
  * 
              
  * @param network The network name
  * @param geofencingZones enable geofencingZones for the given network
  */
-public record NetworkParameters(String network, boolean geofencingZones) {
+public record NetworkParameters(
+  String network,
+  boolean geofencingZones,
+  boolean allowKeepingAtDestination
+) {
   public NetworkParameters withName(String network) {
-    return new NetworkParameters(network, geofencingZones);
+    return new NetworkParameters(network, geofencingZones, allowKeepingAtDestination);
   }
 }
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
index b30fc3d5b3f..3a7da95bfec 100644
--- a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
@@ -3,6 +3,7 @@
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0;
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_1;
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_4;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_5;
 
 import java.util.List;
 import org.opentripplanner.ext.vehiclerentalservicedirectory.api.NetworkParameters;
@@ -79,6 +80,11 @@ private static List mapNetworkParameters(
             .of("geofencingZones")
             .since(V2_4)
             .summary("Enables geofencingZones for the given network")
+            .asBoolean(false),
+          c
+            .of("allowKeepingVehicleAtDestination")
+            .since(V2_5)
+            .summary("Enables `allowKeepingVehicleAtDestination` for the given network")
             .asBoolean(false)
         )
       );

From 39cfada63b1f9e1673631958e2a88086f1b6ad6f Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 12:42:38 +0200
Subject: [PATCH 1527/1688] Add changelog entry

---
 doc-templates/sandbox/VehicleRentalServiceDirectory.md | 3 ++-
 docs/sandbox/VehicleRentalServiceDirectory.md          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/doc-templates/sandbox/VehicleRentalServiceDirectory.md b/doc-templates/sandbox/VehicleRentalServiceDirectory.md
index d9908de1a90..d550fe27dc2 100644
--- a/doc-templates/sandbox/VehicleRentalServiceDirectory.md
+++ b/doc-templates/sandbox/VehicleRentalServiceDirectory.md
@@ -1,4 +1,4 @@
-# Vehicle Rental Service Directory API support.
+# Vehicle Rental Service Directory API support
 
 This adds support for the GBFS service directory endpoint component located at 
 https://github.com/entur/lamassu. OTP uses the service directory to lookup and connect to all GBFS
@@ -17,6 +17,7 @@ configuration from it.
 - Initial implementation of bike share updater API support
 - Make json tag names configurable [#3447](https://github.com/opentripplanner/OpenTripPlanner/pull/3447)
 - Enable GBFS geofencing with VehicleRentalServiceDirectory [#5324](https://github.com/opentripplanner/OpenTripPlanner/pull/5324)
+- Enable `allowKeepingVehicleAtDestination` [#5944](https://github.com/opentripplanner/OpenTripPlanner/pull/5944)
 
 
 ## Configuration
diff --git a/docs/sandbox/VehicleRentalServiceDirectory.md b/docs/sandbox/VehicleRentalServiceDirectory.md
index a822fe93d65..feb5cb91ecb 100644
--- a/docs/sandbox/VehicleRentalServiceDirectory.md
+++ b/docs/sandbox/VehicleRentalServiceDirectory.md
@@ -1,4 +1,4 @@
-# Vehicle Rental Service Directory API support.
+# Vehicle Rental Service Directory API support
 
 This adds support for the GBFS service directory endpoint component located at 
 https://github.com/entur/lamassu. OTP uses the service directory to lookup and connect to all GBFS
@@ -17,6 +17,7 @@ configuration from it.
 - Initial implementation of bike share updater API support
 - Make json tag names configurable [#3447](https://github.com/opentripplanner/OpenTripPlanner/pull/3447)
 - Enable GBFS geofencing with VehicleRentalServiceDirectory [#5324](https://github.com/opentripplanner/OpenTripPlanner/pull/5324)
+- Enable `allowKeepingVehicleAtDestination` [#5944](https://github.com/opentripplanner/OpenTripPlanner/pull/5944)
 
 
 ## Configuration

From 0c914c4b8e1e93a319297ad535b1504a5ca76e51 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Wed, 3 Jul 2024 14:05:01 +0200
Subject: [PATCH 1528/1688] review: Fix doc

---
 .../org/opentripplanner/transit/service/StopModelIndex.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java b/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
index 6b89915aa42..c12c6f715f7 100644
--- a/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
+++ b/src/main/java/org/opentripplanner/transit/service/StopModelIndex.java
@@ -95,14 +95,14 @@ Collection findAreaStops(Envelope envelope) {
   }
 
   /**
-   * A small number of wholes in the stop-index is ok, but if there are many, it will affect
+   * A small number of holes in the stop-index is ok, but if there are many, it will affect
    * the Raptor performance.
    */
   private void logHolesInIndex() {
     int c = (int) Arrays.stream(stopsByIndex).filter(Objects::isNull).count();
     if (c > 0) {
       double p = (100.0 * c) / stopsByIndex.length;
-      // Log this as warning is more than 5% of the space is null
+      // Log this as warning if more than 5% of the space is null
       LOG
         .atLevel(p >= 5.0 ? Level.WARN : Level.INFO)
         .log("The stop index contains holes in it. {} of {} is null.", c, stopsByIndex.length);

From 3d138afb0404b84a694128d4e9470071f910bcf8 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 17:29:55 +0200
Subject: [PATCH 1529/1688] Make record private

---
 .../opentripplanner/updater/trip/RealtimeTestEnvironment.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
index 57aba0b19bb..34923fed9e4 100644
--- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
+++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -356,5 +356,5 @@ private StopTime createStopTime(
     return st;
   }
 
-  protected record StopCall(RegularStop stop, int arrivalTime, int departureTime) {}
+  private record StopCall(RegularStop stop, int arrivalTime, int departureTime) {}
 }

From 2e22b5e28b14d8cfe510a289ab812b26a3e13488 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 17:37:56 +0200
Subject: [PATCH 1530/1688] Clean up after merge

---
 .../opentripplanner/apis/gtfs/schema.graphqls | 110 ++++++++++++------
 .../apis/gtfs/queries/routes-extended.graphql |  30 ++---
 2 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index eb3c631ec3c..0fcb76a211a 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -469,18 +469,18 @@ type FareProductUse {
   **Illustration**
   ```yaml
   itinerary:
-    leg1:
-      fareProducts:
-        id: "AAA" // id of a FareProductUse instance
-        product:
-          id: "day-pass" // product id
-          name: "Day Pass"
-    leg2:
-      fareProducts:
-        id: "AAA" // identical to leg1. the passenger needs to buy ONE pass, not two.
-        product:
-          id: "day-pass"  // product id
-          name: "Day Pass"
+  leg1:
+  fareProducts:
+  id: "AAA" // id of a FareProductUse instance
+  product:
+  id: "day-pass" // product id
+  name: "Day Pass"
+  leg2:
+  fareProducts:
+  id: "AAA" // identical to leg1. the passenger needs to buy ONE pass, not two.
+  product:
+  id: "day-pass"  // product id
+  name: "Day Pass"
   ```
     
   **It is the responsibility of the API consumers to display the day pass as a product for the
@@ -494,18 +494,18 @@ type FareProductUse {
   **Illustration**
   ```yaml
   itinerary:
-    leg1:
-      fareProducts:
-        id: "AAA" // id of a FareProductUse instance, not product id
-        product:
-          id: "single-ticket" // product id
-          name: "Single Ticket"
-    leg2:
-      fareProducts:
-        id: "BBB" // different to leg1. the passenger needs to buy two single tickets.
-        product:
-          id: "single-ticket"  // product id
-          name: "Single Ticket"
+  leg1:
+  fareProducts:
+  id: "AAA" // id of a FareProductUse instance, not product id
+  product:
+  id: "single-ticket" // product id
+  name: "Single Ticket"
+  leg2:
+  fareProducts:
+  id: "BBB" // different to leg1. the passenger needs to buy two single tickets.
+  product:
+  id: "single-ticket"  // product id
+  name: "Single Ticket"
   ```
   """
   id: String!
@@ -588,8 +588,8 @@ type Itinerary {
   How many transfers are part of this itinerary.
     
   Notes:
-   - Interlined/stay-seated transfers do not increase this count.
-   - Transferring from a flex to a fixed schedule trip and vice versa increases this count.
+  - Interlined/stay-seated transfers do not increase this count.
+  - Transferring from a flex to a fixed schedule trip and vice versa increases this count.
   """
   numberOfTransfers: Int!
   "Time when the user leaves from the origin."
@@ -1618,9 +1618,17 @@ type QueryType {
     "Only return routes with these feedIds"
     feeds: [String],
     "Only return routes with these ids"
-    ids: [String],
+    ids: [String] @deprecated(reason : "Since it is hard to reason about the ID filter being combined with others in this resolver, it will be moved to a separate one."),
     "Query routes by this name"
     name: String,
+    """
+    Only include routes whose pattern operates on at least one service date specified by this filter.
+        
+    **Note**: A service date is a technical term useful for transit planning purposes and might not
+    correspond to a how a passenger thinks of a calendar date. For example, a night bus running
+    on Sunday morning at 1am to 3am, might have the previous Saturday's service date.
+    """
+    serviceDates: LocalDateRangeInput,
     "Only include routes, which use one of these modes"
     transportModes: [Mode]
   ): [Route]
@@ -1843,7 +1851,16 @@ type Route implements Node {
   "Transport mode of this route, e.g. `BUS`"
   mode: TransitMode
   "List of patterns which operate on this route"
-  patterns: [Pattern]
+  patterns(
+    """
+    Filter patterns by the service dates they operate on.
+        
+    **Note**: A service date is a technical term useful for transit planning purposes and might not
+    correspond to a how a passenger thinks of a calendar date. For example, a night bus running
+    on Sunday morning at 1am to 3am, might have the previous Saturday's service date.
+    """
+    serviceDates: LocalDateRangeInput
+  ): [Pattern]
   "Short name of the route, usually a line number, e.g. 550"
   shortName: String
   """
@@ -1889,8 +1906,8 @@ type RouteType {
   """
   GTFS Route type.
   For the list of possible values, see:
-      https://developers.google.com/transit/gtfs/reference/#routestxt and
-      https://developers.google.com/transit/gtfs/reference/extended-route-types
+  https://developers.google.com/transit/gtfs/reference/#routestxt and
+  https://developers.google.com/transit/gtfs/reference/extended-route-types
   """
   routeType: Int!
   """
@@ -3496,6 +3513,13 @@ scalar GeoJson @specifiedBy(url : "https://www.rfcreader.com/#rfc7946")
 
 scalar Grams
 
+"""
+An ISO-8601-formatted local date, i.e. `2024-05-24` for the 24th of May, 2024.
+
+ISO-8601 allows many different date formats, however only the most common one - `yyyy-MM-dd` - is accepted.
+"""
+scalar LocalDate @specifiedBy(url : "https://www.iso.org/standard/70907.html")
+
 "A IETF BCP 47 language tag"
 scalar Locale @specifiedBy(url : "https://www.rfcreader.com/#rfc5646")
 
@@ -3615,6 +3639,7 @@ input BicycleWalkPreferencesInput {
   "Costs related to walking a bicycle."
   cost: BicycleWalkPreferencesCostInput
   """
+  "
   How long it takes to hop on or off a bicycle when switching to walking the bicycle
   or when getting on the bicycle again. However, this is not applied when getting
   on a rented bicycle for the first time or off the bicycle when returning the bicycle.
@@ -3836,6 +3861,23 @@ input InputUnpreferred {
   useUnpreferredRoutesPenalty: Int @deprecated(reason : "Use unpreferredCost instead")
 }
 
+"Filters an entity by a date range."
+input LocalDateRangeInput {
+  """
+  **Exclusive** end date of the filter. This means that if you want a time window from Sunday to
+  Sunday, `end` must be on Monday.
+    
+  If `null` this means that no end filter is applied and all entities that are after or on `start`
+  are selected.
+  """
+  end: LocalDate
+  """
+  **Inclusive** start date of the filter. If `null` this means that no `start` filter is applied and all
+  dates that are before `end` are selected.
+  """
+  start: LocalDate
+}
+
 """
 The filter definition to include or exclude parking facilities used during routing.
 
@@ -3843,11 +3885,11 @@ Logically, the filter algorithm work as follows:
 
 - The starting point is the set of all facilities, lets call it `A`.
 - Then all `select` filters are applied to `A`, potentially reducing the number of facilities used.
-  Let's call the result of this `B`.
-  An empty `select` will lead to `A` being equal to `B`.
+Let's call the result of this `B`.
+An empty `select` will lead to `A` being equal to `B`.
 - Lastly, the `not` filters are applied to `B`, reducing the set further.
-  Lets call this final set `C`.
-  An empty `not` will lead to `B` being equal to `C`.
+Lets call this final set `C`.
+An empty `not` will lead to `B` being equal to `C`.
 - The remaining parking facilities in `C` are used for routing.
 """
 input ParkingFilter {
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
index 0251245d183..7f5c68961aa 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/routes-extended.graphql
@@ -1,17 +1,17 @@
 {
-    routes {
-        longName
-        shortName
-        gtfsId
-        agency {
-            gtfsId
-            name
-        }
-        mode
-        sortOrder
-        bikesAllowed
-        patterns(serviceDates: {start: "2024-05-23" end: "2024-05-30"}) {
-            name
-        }
+  routes {
+    longName
+    shortName
+    gtfsId
+    agency {
+      gtfsId
+      name
     }
-}
\ No newline at end of file
+    mode
+    sortOrder
+    bikesAllowed
+    patterns(serviceDates: { start: "2024-05-23", end: "2024-05-30" }) {
+      name
+    }
+  }
+}

From 67c32797197bfcaeb940aa330d3a2922eaa15f83 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 17:45:14 +0200
Subject: [PATCH 1531/1688] Fix indentation

---
 .../opentripplanner/apis/gtfs/schema.graphqls | 65 +++++++++----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 0fcb76a211a..1a43a763ea9 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -469,18 +469,18 @@ type FareProductUse {
   **Illustration**
   ```yaml
   itinerary:
-  leg1:
-  fareProducts:
-  id: "AAA" // id of a FareProductUse instance
-  product:
-  id: "day-pass" // product id
-  name: "Day Pass"
-  leg2:
-  fareProducts:
-  id: "AAA" // identical to leg1. the passenger needs to buy ONE pass, not two.
-  product:
-  id: "day-pass"  // product id
-  name: "Day Pass"
+    leg1:
+      fareProducts:
+        id: "AAA" // id of a FareProductUse instance
+        product:
+          id: "day-pass" // product id
+          name: "Day Pass"
+    leg2:
+      fareProducts:
+        id: "AAA" // identical to leg1. the passenger needs to buy ONE pass, not two.
+        product:
+          id: "day-pass"  // product id
+          name: "Day Pass"
   ```
     
   **It is the responsibility of the API consumers to display the day pass as a product for the
@@ -494,18 +494,18 @@ type FareProductUse {
   **Illustration**
   ```yaml
   itinerary:
-  leg1:
-  fareProducts:
-  id: "AAA" // id of a FareProductUse instance, not product id
-  product:
-  id: "single-ticket" // product id
-  name: "Single Ticket"
-  leg2:
-  fareProducts:
-  id: "BBB" // different to leg1. the passenger needs to buy two single tickets.
-  product:
-  id: "single-ticket"  // product id
-  name: "Single Ticket"
+    leg1:
+      fareProducts:
+        id: "AAA" // id of a FareProductUse instance, not product id
+        product:
+          id: "single-ticket" // product id
+          name: "Single Ticket"
+    leg2:
+      fareProducts:
+        id: "BBB" // different to leg1. the passenger needs to buy two single tickets.
+        product:
+          id: "single-ticket"  // product id
+          name: "Single Ticket"
   ```
   """
   id: String!
@@ -588,8 +588,8 @@ type Itinerary {
   How many transfers are part of this itinerary.
     
   Notes:
-  - Interlined/stay-seated transfers do not increase this count.
-  - Transferring from a flex to a fixed schedule trip and vice versa increases this count.
+   - Interlined/stay-seated transfers do not increase this count.
+   - Transferring from a flex to a fixed schedule trip and vice versa increases this count.
   """
   numberOfTransfers: Int!
   "Time when the user leaves from the origin."
@@ -1906,8 +1906,8 @@ type RouteType {
   """
   GTFS Route type.
   For the list of possible values, see:
-  https://developers.google.com/transit/gtfs/reference/#routestxt and
-  https://developers.google.com/transit/gtfs/reference/extended-route-types
+      https://developers.google.com/transit/gtfs/reference/#routestxt and
+      https://developers.google.com/transit/gtfs/reference/extended-route-types
   """
   routeType: Int!
   """
@@ -3639,7 +3639,6 @@ input BicycleWalkPreferencesInput {
   "Costs related to walking a bicycle."
   cost: BicycleWalkPreferencesCostInput
   """
-  "
   How long it takes to hop on or off a bicycle when switching to walking the bicycle
   or when getting on the bicycle again. However, this is not applied when getting
   on a rented bicycle for the first time or off the bicycle when returning the bicycle.
@@ -3885,11 +3884,11 @@ Logically, the filter algorithm work as follows:
 
 - The starting point is the set of all facilities, lets call it `A`.
 - Then all `select` filters are applied to `A`, potentially reducing the number of facilities used.
-Let's call the result of this `B`.
-An empty `select` will lead to `A` being equal to `B`.
+  Let's call the result of this `B`.
+  An empty `select` will lead to `A` being equal to `B`.
 - Lastly, the `not` filters are applied to `B`, reducing the set further.
-Lets call this final set `C`.
-An empty `not` will lead to `B` being equal to `C`.
+  Lets call this final set `C`.
+  An empty `not` will lead to `B` being equal to `C`.
 - The remaining parking facilities in `C` are used for routing.
 """
 input ParkingFilter {

From ac2cb37d9866ead1b55df52fb41283fbb49b030e Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 18:02:33 +0200
Subject: [PATCH 1532/1688] Re-apply update

---
 .../resources/org/opentripplanner/apis/gtfs/schema.graphqls     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index eb3c631ec3c..57fe17a55ab 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -1356,7 +1356,7 @@ type QueryType {
     A global minimum transfer time (in seconds) that specifies the minimum
     amount of time that must pass between exiting one transit vehicle and
     boarding another. This time is in addition to time it might take to walk
-    between transit stops. Default value: 0
+    between transit stops. Default value: 120
     """
     minTransferTime: Int,
     "The weight multipliers for transit modes. WALK, BICYCLE, CAR, TRANSIT and LEG_SWITCH are not included."

From 3c81fcaf9c754a760ece74cd61a3859eb7541161 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Wed, 3 Jul 2024 23:12:11 +0300
Subject: [PATCH 1533/1688] Remove unused code

---
 .../org/opentripplanner/inspector/vector/LayerParameters.java  | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java
index 0d6a4b23d6b..cb849e0f0ac 100644
--- a/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java
+++ b/src/main/java/org/opentripplanner/inspector/vector/LayerParameters.java
@@ -1,7 +1,5 @@
 package org.opentripplanner.inspector.vector;
 
-import java.util.ArrayList;
-import java.util.List;
 import org.opentripplanner.apis.support.mapping.PropertyMapper;
 
 /**
@@ -12,7 +10,6 @@ public interface LayerParameters> {
   int MAX_ZOOM = 20;
   int CACHE_MAX_SECONDS = -1;
   double EXPANSION_FACTOR = 0.25d;
-  List HIDE_NETWORKS = new ArrayList<>();
   /**
    * User-visible name of the layer
    */

From cf87f1650ed8c208834d02d2cfa36be85fd47af7 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Fri, 28 Jun 2024 17:20:43 +0200
Subject: [PATCH 1534/1688] refactor: Move transit-group-priority to the domain
 model

---
 .../model/TransitGroupPriorityReport.java     |  2 +-
 .../cost/DefaultTransitGroupCalculator.java   | 23 ++++++++
 .../transit/mappers/RaptorRequestMapper.java  |  4 +-
 .../RaptorRoutingRequestTransitData.java      |  1 +
 ...aptorRoutingRequestTransitDataCreator.java |  1 +
 .../grouppriority}/BinarySetOperator.java     |  2 +-
 .../PriorityGroupConfigurator.java            |  3 +-
 .../grouppriority}/PriorityGroupMatcher.java  |  6 +-
 .../TransitGroupPriority32n.java              | 26 +--------
 .../DefaultTransitGroupCalculatorTest.java    | 32 +++++++++++
 .../TransitGroupPriority32nTest.java          | 57 ++++++++++---------
 ...rRoutingRequestTransitDataCreatorTest.java |  1 +
 .../PriorityGroupConfiguratorTest.java        |  3 +-
 .../PriorityGroupMatcherTest.java             |  3 +-
 14 files changed, 101 insertions(+), 63 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculator.java
 rename src/main/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/request => transit/model/network/grouppriority}/BinarySetOperator.java (79%)
 rename src/main/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/request => transit/model/network/grouppriority}/PriorityGroupConfigurator.java (96%)
 rename src/main/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/request => transit/model/network/grouppriority}/PriorityGroupMatcher.java (95%)
 rename src/main/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/cost => transit/model/network}/grouppriority/TransitGroupPriority32n.java (67%)
 create mode 100644 src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
 rename src/test/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/request => transit/model/network/grouppriority}/PriorityGroupConfiguratorTest.java (96%)
 rename src/test/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/request => transit/model/network/grouppriority}/PriorityGroupMatcherTest.java (96%)

diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
index 635469cb3a2..8e3dd0dfb17 100644
--- a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
+++ b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
@@ -4,9 +4,9 @@
 import java.util.TreeMap;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
-import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.PriorityGroupConfigurator;
 import org.opentripplanner.routing.api.request.request.TransitRequest;
 import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
 
 /**
  * This class is used to report all transit-groups used for transit-group-priority. The report is
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculator.java
new file mode 100644
index 00000000000..c16a7ea9e7b
--- /dev/null
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculator.java
@@ -0,0 +1,23 @@
+package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost;
+
+import org.opentripplanner.raptor.api.model.DominanceFunction;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriority32n;
+
+public class DefaultTransitGroupCalculator implements RaptorTransitGroupCalculator {
+
+  @Override
+  public int mergeGroupIds(int currentGroupIds, int boardingGroupId) {
+    return TransitGroupPriority32n.mergeInGroupId(currentGroupIds, boardingGroupId);
+  }
+
+  @Override
+  public DominanceFunction dominanceFunction() {
+    return TransitGroupPriority32n::dominate;
+  }
+
+  @Override
+  public String toString() {
+    return "DefaultTransitGroupCalculator{Using TGP32n}";
+  }
+}
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
index 879536fdcd0..f6851b5e918 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
@@ -20,8 +20,8 @@
 import org.opentripplanner.raptor.api.request.RaptorRequestBuilder;
 import org.opentripplanner.raptor.rangeraptor.SystemErrDebugLogger;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.performance.PerformanceTimersForRaptor;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultTransitGroupCalculator;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter;
-import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n;
 import org.opentripplanner.routing.api.request.DebugEventType;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.framework.CostLinearFunction;
@@ -119,7 +119,7 @@ private RaptorRequest doMap() {
         mcBuilder.withPassThroughPoints(mapPassThroughPoints());
         r.relaxGeneralizedCostAtDestination().ifPresent(mcBuilder::withRelaxCostAtDestination);
       } else if (!pt.relaxTransitGroupPriority().isNormal()) {
-        mcBuilder.withTransitPriorityCalculator(TransitGroupPriority32n.priorityCalculator());
+        mcBuilder.withTransitPriorityCalculator(new DefaultTransitGroupCalculator());
         mcBuilder.withRelaxC1(mapRelaxCost(pt.relaxTransitGroupPriority()));
       }
     });
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
index 8c310206a01..909b1c0a6b3 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
@@ -30,6 +30,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.GeneralizedCostParametersMapper;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.transit.model.network.RoutingTripPattern;
+import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
 
 /**
  * This is the data provider for the Range Raptor search engine. It uses data from the TransitLayer,
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
index f987e4f7a21..e2233e1e9df 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
@@ -19,6 +19,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate;
 import org.opentripplanner.transit.model.network.RoutingTripPattern;
+import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/BinarySetOperator.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/BinarySetOperator.java
similarity index 79%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/BinarySetOperator.java
rename to src/main/java/org/opentripplanner/transit/model/network/grouppriority/BinarySetOperator.java
index 35e5b8c0918..4d8ce2c8fd7 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/BinarySetOperator.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/BinarySetOperator.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.request;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 /**
  * Used to concatenate matches with either the logical "AND" or "OR" operator.
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfigurator.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfigurator.java
similarity index 96%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfigurator.java
rename to src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfigurator.java
index 6ef82786b99..dc25bc498d0 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfigurator.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfigurator.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.request;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 import gnu.trove.impl.Constants;
 import gnu.trove.map.TObjectIntMap;
@@ -8,7 +8,6 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.opentripplanner.framework.lang.ArrayUtils;
-import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority.TransitGroupPriority32n;
 import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.TripPattern;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcher.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
similarity index 95%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcher.java
rename to src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
index c017f2862ab..b4c37c6735b 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcher.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
@@ -1,7 +1,7 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.request;
+package org.opentripplanner.transit.model.network.grouppriority;
 
-import static org.opentripplanner.routing.algorithm.raptoradapter.transit.request.BinarySetOperator.AND;
-import static org.opentripplanner.routing.algorithm.raptoradapter.transit.request.BinarySetOperator.OR;
+import static org.opentripplanner.transit.model.network.grouppriority.BinarySetOperator.AND;
+import static org.opentripplanner.transit.model.network.grouppriority.BinarySetOperator.OR;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32n.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
similarity index 67%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32n.java
rename to src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
index feb3f6f7b3a..1bdff703e07 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32n.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
@@ -1,7 +1,4 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority;
-
-import org.opentripplanner.raptor.api.model.DominanceFunction;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 /**
  * This is a "BitSet" implementation for groupId. It can store upto 32 groups,
@@ -13,25 +10,6 @@ public class TransitGroupPriority32n {
   private static final int MIN_SEQ_NO = 0;
   private static final int MAX_SEQ_NO = 32;
 
-  public static RaptorTransitGroupCalculator priorityCalculator() {
-    return new RaptorTransitGroupCalculator() {
-      @Override
-      public int mergeGroupIds(int currentGroupIds, int boardingGroupId) {
-        return mergeInGroupId(currentGroupIds, boardingGroupId);
-      }
-
-      @Override
-      public DominanceFunction dominanceFunction() {
-        return TransitGroupPriority32n::dominate;
-      }
-
-      @Override
-      public String toString() {
-        return "TransitGroupPriority32nCalculator{}";
-      }
-    };
-  }
-
   /**
    * Left dominate right, if right contains a group which does not exist in left. Left
    * do NOT dominate right if they are equals or left is a super set of right.
@@ -47,7 +25,7 @@ public String toString() {
 
   /**
    * Use this method to map from a continuous group index [0..32) to the groupId used
-   * during routing. The ID is implementation specific and optimized for performance.
+   * during routing. The ID is implementation-specific and optimized for performance.
    */
   public static int groupId(final int priorityGroupIndex) {
     assertValidGroupSeqNo(priorityGroupIndex);
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
new file mode 100644
index 00000000000..9e24bf573c4
--- /dev/null
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
@@ -0,0 +1,32 @@
+package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+
+class DefaultTransitGroupCalculatorTest {
+
+  private final DefaultTransitGroupCalculator subject = new DefaultTransitGroupCalculator();
+
+  @Test
+  void mergeGroupIds() {
+    // Smoke test, should not fail
+    subject.mergeGroupIds(1, 2);
+  }
+
+  @Test
+  void dominanceFunction() {
+    // This is assuming 1 & 2 represent different transit-groups - this just a smoke test to
+    // see that the delegation works as expected. The 'leftDominateRight' is unit-tested elsewhere.
+    assertTrue(subject.dominanceFunction().leftDominateRight(1, 2));
+    assertTrue(subject.dominanceFunction().leftDominateRight(2, 1));
+    assertFalse(subject.dominanceFunction().leftDominateRight(1, 1));
+  }
+
+  @Test
+  void testToString() {
+    assertEquals("DefaultTransitGroupCalculator{Using TGP32n}", subject.toString());
+  }
+}
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java
index 2713a190dbf..3fe242c984b 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java
@@ -4,9 +4,11 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriority32n.dominate;
+import static org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriority32n.groupId;
+import static org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriority32n.mergeInGroupId;
 
 import org.junit.jupiter.api.Test;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
 
 class TransitGroupPriority32nTest {
 
@@ -16,49 +18,48 @@ class TransitGroupPriority32nTest {
   private static final int GROUP_INDEX_30 = 30;
   private static final int GROUP_INDEX_31 = 31;
 
-  private static final int GROUP_0 = TransitGroupPriority32n.groupId(GROUP_INDEX_0);
-  private static final int GROUP_1 = TransitGroupPriority32n.groupId(GROUP_INDEX_1);
-  private static final int GROUP_2 = TransitGroupPriority32n.groupId(GROUP_INDEX_2);
-  private static final int GROUP_30 = TransitGroupPriority32n.groupId(GROUP_INDEX_30);
-  private static final int GROUP_31 = TransitGroupPriority32n.groupId(GROUP_INDEX_31);
-  private static final RaptorTransitGroupCalculator subjct = TransitGroupPriority32n.priorityCalculator();
+  private static final int GROUP_0 = groupId(GROUP_INDEX_0);
+  private static final int GROUP_1 = groupId(GROUP_INDEX_1);
+  private static final int GROUP_2 = groupId(GROUP_INDEX_2);
+  private static final int GROUP_30 = groupId(GROUP_INDEX_30);
+  private static final int GROUP_31 = groupId(GROUP_INDEX_31);
 
   @Test
-  void groupId() {
-    assertEqualsHex(0x00_00_00_00, TransitGroupPriority32n.groupId(0));
-    assertEqualsHex(0x00_00_00_01, TransitGroupPriority32n.groupId(1));
-    assertEqualsHex(0x00_00_00_02, TransitGroupPriority32n.groupId(2));
-    assertEqualsHex(0x00_00_00_04, TransitGroupPriority32n.groupId(3));
-    assertEqualsHex(0x40_00_00_00, TransitGroupPriority32n.groupId(31));
-    assertEqualsHex(0x80_00_00_00, TransitGroupPriority32n.groupId(32));
+  void testGroupId() {
+    assertEqualsHex(0x00_00_00_00, groupId(0));
+    assertEqualsHex(0x00_00_00_01, groupId(1));
+    assertEqualsHex(0x00_00_00_02, groupId(2));
+    assertEqualsHex(0x00_00_00_04, groupId(3));
+    assertEqualsHex(0x40_00_00_00, groupId(31));
+    assertEqualsHex(0x80_00_00_00, groupId(32));
 
-    assertThrows(IllegalArgumentException.class, () -> TransitGroupPriority32n.groupId(-1));
-    assertThrows(IllegalArgumentException.class, () -> TransitGroupPriority32n.groupId(33));
+    assertThrows(IllegalArgumentException.class, () -> groupId(-1));
+    assertThrows(IllegalArgumentException.class, () -> groupId(33));
   }
 
   @Test
   void mergeTransitGroupPriorityIds() {
-    assertEqualsHex(GROUP_0, subjct.mergeGroupIds(GROUP_0, GROUP_0));
-    assertEqualsHex(GROUP_1, subjct.mergeGroupIds(GROUP_1, GROUP_1));
-    assertEqualsHex(GROUP_0 | GROUP_1, subjct.mergeGroupIds(GROUP_0, GROUP_1));
-    assertEqualsHex(GROUP_30 | GROUP_31, subjct.mergeGroupIds(GROUP_30, GROUP_31));
+    assertEqualsHex(GROUP_0, mergeInGroupId(GROUP_0, GROUP_0));
+    assertEqualsHex(GROUP_1, mergeInGroupId(GROUP_1, GROUP_1));
+    assertEqualsHex(GROUP_0 | GROUP_1, mergeInGroupId(GROUP_0, GROUP_1));
+    assertEqualsHex(GROUP_30 | GROUP_31, mergeInGroupId(GROUP_30, GROUP_31));
     assertEqualsHex(
       GROUP_0 | GROUP_1 | GROUP_2 | GROUP_30 | GROUP_31,
-      subjct.mergeGroupIds(GROUP_0 | GROUP_1 | GROUP_2 | GROUP_30, GROUP_31)
+      mergeInGroupId(GROUP_0 | GROUP_1 | GROUP_2 | GROUP_30, GROUP_31)
     );
   }
 
   @Test
   void dominanceFunction() {
-    assertFalse(subjct.dominanceFunction().leftDominateRight(GROUP_0, GROUP_0));
-    assertFalse(subjct.dominanceFunction().leftDominateRight(GROUP_31, GROUP_31));
-    assertFalse(subjct.dominanceFunction().leftDominateRight(GROUP_1 | GROUP_2, GROUP_1 | GROUP_2));
+    assertFalse(dominate(GROUP_0, GROUP_0));
+    assertFalse(dominate(GROUP_31, GROUP_31));
+    assertFalse(dominate(GROUP_1 | GROUP_2, GROUP_1 | GROUP_2));
 
-    assertTrue(subjct.dominanceFunction().leftDominateRight(GROUP_0, GROUP_1));
-    assertFalse(subjct.dominanceFunction().leftDominateRight(GROUP_1, GROUP_0));
+    assertTrue(dominate(GROUP_0, GROUP_1));
+    assertFalse(dominate(GROUP_1, GROUP_0));
 
-    assertTrue(subjct.dominanceFunction().leftDominateRight(GROUP_1, GROUP_1 | GROUP_2));
-    assertFalse(subjct.dominanceFunction().leftDominateRight(GROUP_1 | GROUP_2, GROUP_1));
+    assertTrue(dominate(GROUP_1, GROUP_1 | GROUP_2));
+    assertFalse(dominate(GROUP_1 | GROUP_2, GROUP_1));
   }
 
   static void assertEqualsHex(int expected, int actual) {
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
index ed71b3de400..861420d73eb 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
@@ -19,6 +19,7 @@
 import org.opentripplanner.transit.model.network.RoutingTripPattern;
 import org.opentripplanner.transit.model.network.StopPattern;
 import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
 import org.opentripplanner.transit.model.timetable.ScheduledTripTimes;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfiguratorTest.java
similarity index 96%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java
rename to src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfiguratorTest.java
index 7f974927c1b..14e18968160 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupConfiguratorTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfiguratorTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.request;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TestTransitCaseData.STOP_A;
@@ -7,6 +7,7 @@
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TestRouteData;
 import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.network.TripPattern;
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcherTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
similarity index 96%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcherTest.java
rename to src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
index 91d0142f9ef..030ac65ecf4 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/PriorityGroupMatcherTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.request;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -6,6 +6,7 @@
 
 import java.util.List;
 import org.junit.jupiter.api.Test;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.request.TestRouteData;
 import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;

From 916a9a931e8d99e53b52f2e90956181735d86c93 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:06:07 +0200
Subject: [PATCH 1535/1688] refactor: Rename to
 RaptorTransitGroupPriorityCalculator

---
 .../raptor/api/request/MultiCriteriaRequest.java       | 10 +++++-----
 ....java => RaptorTransitGroupPriorityCalculator.java} |  2 +-
 .../multicriteria/configure/McRangeRaptorConfig.java   |  4 ++--
 .../ride/c2/TransitGroupPriorityRideFactory.java       |  6 +++---
 ...java => DefaultTransitGroupPriorityCalculator.java} |  4 ++--
 .../transit/mappers/RaptorRequestMapper.java           |  4 ++--
 .../raptor/moduletests/K01_TransitPriorityTest.java    |  4 ++--
 .../K02_TransitPriorityDestinationTest.java            |  4 ++--
 .../support/TestGroupPriorityCalculator.java           |  6 +++---
 .../cost/DefaultTransitGroupCalculatorTest.java        |  2 +-
 10 files changed, 23 insertions(+), 23 deletions(-)
 rename src/main/java/org/opentripplanner/raptor/api/request/{RaptorTransitGroupCalculator.java => RaptorTransitGroupPriorityCalculator.java} (93%)
 rename src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/{DefaultTransitGroupCalculator.java => DefaultTransitGroupPriorityCalculator.java} (84%)

diff --git a/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java b/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java
index 368b4660922..683c9807af5 100644
--- a/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java
+++ b/src/main/java/org/opentripplanner/raptor/api/request/MultiCriteriaRequest.java
@@ -18,7 +18,7 @@ public class MultiCriteriaRequest {
   private final RelaxFunction relaxC1;
 
   @Nullable
-  private final RaptorTransitGroupCalculator transitPriorityCalculator;
+  private final RaptorTransitGroupPriorityCalculator transitPriorityCalculator;
 
   private final List passThroughPoints;
 
@@ -63,7 +63,7 @@ public RelaxFunction relaxC1() {
     return relaxC1;
   }
 
-  public Optional transitPriorityCalculator() {
+  public Optional transitPriorityCalculator() {
     return Optional.ofNullable(transitPriorityCalculator);
   }
 
@@ -140,7 +140,7 @@ public static class Builder {
 
     private final MultiCriteriaRequest original;
     private RelaxFunction relaxC1;
-    private RaptorTransitGroupCalculator transitPriorityCalculator;
+    private RaptorTransitGroupPriorityCalculator transitPriorityCalculator;
     private List passThroughPoints;
     private Double relaxCostAtDestination;
 
@@ -163,11 +163,11 @@ public Builder withRelaxC1(RelaxFunction relaxC1) {
     }
 
     @Nullable
-    public RaptorTransitGroupCalculator transitPriorityCalculator() {
+    public RaptorTransitGroupPriorityCalculator transitPriorityCalculator() {
       return transitPriorityCalculator;
     }
 
-    public Builder withTransitPriorityCalculator(RaptorTransitGroupCalculator value) {
+    public Builder withTransitPriorityCalculator(RaptorTransitGroupPriorityCalculator value) {
       transitPriorityCalculator = value;
       return this;
     }
diff --git a/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupCalculator.java b/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java
similarity index 93%
rename from src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupCalculator.java
rename to src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java
index b5f0598415e..06c10b51daf 100644
--- a/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupCalculator.java
+++ b/src/main/java/org/opentripplanner/raptor/api/request/RaptorTransitGroupPriorityCalculator.java
@@ -2,7 +2,7 @@
 
 import org.opentripplanner.raptor.api.model.DominanceFunction;
 
-public interface RaptorTransitGroupCalculator {
+public interface RaptorTransitGroupPriorityCalculator {
   /**
    * Merge in the transit group id with an existing set. Note! Both the set
    * and the group id type is {@code int}.
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java
index 8eef90950dd..3673e78ee47 100644
--- a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java
+++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/configure/McRangeRaptorConfig.java
@@ -6,7 +6,7 @@
 import org.opentripplanner.raptor.api.model.DominanceFunction;
 import org.opentripplanner.raptor.api.model.RaptorTripSchedule;
 import org.opentripplanner.raptor.api.request.MultiCriteriaRequest;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
 import org.opentripplanner.raptor.rangeraptor.context.SearchContext;
 import org.opentripplanner.raptor.rangeraptor.internalapi.Heuristics;
 import org.opentripplanner.raptor.rangeraptor.internalapi.ParetoSetCost;
@@ -201,7 +201,7 @@ private DominanceFunction dominanceFunctionC2() {
     return null;
   }
 
-  private RaptorTransitGroupCalculator getTransitGroupPriorityCalculator() {
+  private RaptorTransitGroupPriorityCalculator getTransitGroupPriorityCalculator() {
     return mcRequest().transitPriorityCalculator().orElseThrow();
   }
 
diff --git a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java b/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java
index 5d65c40d021..79ae1558836 100644
--- a/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java
+++ b/src/main/java/org/opentripplanner/raptor/rangeraptor/multicriteria/ride/c2/TransitGroupPriorityRideFactory.java
@@ -2,7 +2,7 @@
 
 import org.opentripplanner.raptor.api.model.RaptorTripPattern;
 import org.opentripplanner.raptor.api.model.RaptorTripSchedule;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
 import org.opentripplanner.raptor.rangeraptor.multicriteria.arrivals.McStopArrival;
 import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.PatternRide;
 import org.opentripplanner.raptor.rangeraptor.multicriteria.ride.PatternRideFactory;
@@ -15,10 +15,10 @@ public class TransitGroupPriorityRideFactory
   implements PatternRideFactory> {
 
   private int currentPatternGroupPriority;
-  private final RaptorTransitGroupCalculator transitGroupPriorityCalculator;
+  private final RaptorTransitGroupPriorityCalculator transitGroupPriorityCalculator;
 
   public TransitGroupPriorityRideFactory(
-    RaptorTransitGroupCalculator transitGroupPriorityCalculator
+    RaptorTransitGroupPriorityCalculator transitGroupPriorityCalculator
   ) {
     this.transitGroupPriorityCalculator = transitGroupPriorityCalculator;
   }
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupPriorityCalculator.java
similarity index 84%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculator.java
rename to src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupPriorityCalculator.java
index c16a7ea9e7b..6045a9aa1de 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupPriorityCalculator.java
@@ -1,10 +1,10 @@
 package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost;
 
 import org.opentripplanner.raptor.api.model.DominanceFunction;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
 import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriority32n;
 
-public class DefaultTransitGroupCalculator implements RaptorTransitGroupCalculator {
+public class DefaultTransitGroupPriorityCalculator implements RaptorTransitGroupPriorityCalculator {
 
   @Override
   public int mergeGroupIds(int currentGroupIds, int boardingGroupId) {
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
index f6851b5e918..0123d85c7ad 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
@@ -20,7 +20,7 @@
 import org.opentripplanner.raptor.api.request.RaptorRequestBuilder;
 import org.opentripplanner.raptor.rangeraptor.SystemErrDebugLogger;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.performance.PerformanceTimersForRaptor;
-import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultTransitGroupCalculator;
+import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultTransitGroupPriorityCalculator;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter;
 import org.opentripplanner.routing.api.request.DebugEventType;
 import org.opentripplanner.routing.api.request.RouteRequest;
@@ -119,7 +119,7 @@ private RaptorRequest doMap() {
         mcBuilder.withPassThroughPoints(mapPassThroughPoints());
         r.relaxGeneralizedCostAtDestination().ifPresent(mcBuilder::withRelaxCostAtDestination);
       } else if (!pt.relaxTransitGroupPriority().isNormal()) {
-        mcBuilder.withTransitPriorityCalculator(new DefaultTransitGroupCalculator());
+        mcBuilder.withTransitPriorityCalculator(new DefaultTransitGroupPriorityCalculator());
         mcBuilder.withRelaxC1(mapRelaxCost(pt.relaxTransitGroupPriority()));
       }
     });
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java
index 00b1d528e7e..f03eb5335a0 100644
--- a/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java
+++ b/src/test/java/org/opentripplanner/raptor/moduletests/K01_TransitPriorityTest.java
@@ -22,7 +22,7 @@
 import org.opentripplanner.raptor._data.transit.TestTripSchedule;
 import org.opentripplanner.raptor.api.request.RaptorProfile;
 import org.opentripplanner.raptor.api.request.RaptorRequestBuilder;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
 import org.opentripplanner.raptor.configure.RaptorConfig;
 import org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter;
@@ -34,7 +34,7 @@
  */
 public class K01_TransitPriorityTest {
 
-  private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR =
+  private static final RaptorTransitGroupPriorityCalculator PRIORITY_GROUP_CALCULATOR =
     TestGroupPriorityCalculator.PRIORITY_CALCULATOR;
   private static final int C1_SLACK_90s = RaptorCostConverter.toRaptorCost(90);
 
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java b/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java
index c6ab8e337ea..fb21128728c 100644
--- a/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java
+++ b/src/test/java/org/opentripplanner/raptor/moduletests/K02_TransitPriorityDestinationTest.java
@@ -25,7 +25,7 @@
 import org.opentripplanner.raptor._data.transit.TestTripSchedule;
 import org.opentripplanner.raptor.api.request.RaptorProfile;
 import org.opentripplanner.raptor.api.request.RaptorRequestBuilder;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
 import org.opentripplanner.raptor.configure.RaptorConfig;
 import org.opentripplanner.raptor.moduletests.support.TestGroupPriorityCalculator;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter;
@@ -37,7 +37,7 @@
  */
 public class K02_TransitPriorityDestinationTest {
 
-  private static final RaptorTransitGroupCalculator PRIORITY_GROUP_CALCULATOR =
+  private static final RaptorTransitGroupPriorityCalculator PRIORITY_GROUP_CALCULATOR =
     TestGroupPriorityCalculator.PRIORITY_CALCULATOR;
   private static final int C1_SLACK_90s = RaptorCostConverter.toRaptorCost(90);
 
diff --git a/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java b/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java
index cdbe82f18a6..3234dc126fb 100644
--- a/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java
+++ b/src/test/java/org/opentripplanner/raptor/moduletests/support/TestGroupPriorityCalculator.java
@@ -5,11 +5,11 @@
 
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.raptor.api.model.DominanceFunction;
-import org.opentripplanner.raptor.api.request.RaptorTransitGroupCalculator;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
 
-public class TestGroupPriorityCalculator implements RaptorTransitGroupCalculator {
+public class TestGroupPriorityCalculator implements RaptorTransitGroupPriorityCalculator {
 
-  public static final RaptorTransitGroupCalculator PRIORITY_CALCULATOR = new TestGroupPriorityCalculator();
+  public static final RaptorTransitGroupPriorityCalculator PRIORITY_CALCULATOR = new TestGroupPriorityCalculator();
 
   public static final int GROUP_A = 0x01;
   public static final int GROUP_B = 0x02;
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
index 9e24bf573c4..7c523abf741 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
@@ -8,7 +8,7 @@
 
 class DefaultTransitGroupCalculatorTest {
 
-  private final DefaultTransitGroupCalculator subject = new DefaultTransitGroupCalculator();
+  private final DefaultTransitGroupPriorityCalculator subject = new DefaultTransitGroupPriorityCalculator();
 
   @Test
   void mergeGroupIds() {

From 3627e5014c02e27ca77c3e9295f7ee9758442846 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:01:58 +0200
Subject: [PATCH 1536/1688] refactor: Move DefaultTransitGroupCalculator to
 grouppriority package

---
 .../raptoradapter/transit/mappers/RaptorRequestMapper.java     | 2 +-
 .../grouppriority}/DefaultTransitGroupPriorityCalculator.java  | 3 +--
 .../grouppriority}/DefaultTransitGroupCalculatorTest.java      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
 rename src/main/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/cost => transit/model/network/grouppriority}/DefaultTransitGroupPriorityCalculator.java (79%)
 rename src/test/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/cost => transit/model/network/grouppriority}/DefaultTransitGroupCalculatorTest.java (93%)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
index 0123d85c7ad..948b132e408 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/RaptorRequestMapper.java
@@ -20,11 +20,11 @@
 import org.opentripplanner.raptor.api.request.RaptorRequestBuilder;
 import org.opentripplanner.raptor.rangeraptor.SystemErrDebugLogger;
 import org.opentripplanner.routing.algorithm.raptoradapter.router.performance.PerformanceTimersForRaptor;
-import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.DefaultTransitGroupPriorityCalculator;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.RaptorCostConverter;
 import org.opentripplanner.routing.api.request.DebugEventType;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.routing.api.request.framework.CostLinearFunction;
+import org.opentripplanner.transit.model.network.grouppriority.DefaultTransitGroupPriorityCalculator;
 import org.opentripplanner.transit.model.site.StopLocation;
 
 public class RaptorRequestMapper {
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupPriorityCalculator.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
similarity index 79%
rename from src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupPriorityCalculator.java
rename to src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
index 6045a9aa1de..d09d206adb0 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupPriorityCalculator.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
@@ -1,8 +1,7 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 import org.opentripplanner.raptor.api.model.DominanceFunction;
 import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
-import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriority32n;
 
 public class DefaultTransitGroupPriorityCalculator implements RaptorTransitGroupPriorityCalculator {
 
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupCalculatorTest.java
similarity index 93%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
rename to src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupCalculatorTest.java
index 7c523abf741..131bce04707 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/DefaultTransitGroupCalculatorTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupCalculatorTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

From dea9911773b06a26ec04b818c712097eec70836f Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:16:32 +0200
Subject: [PATCH 1537/1688] refactor: Move TransitGroupPriority32nTest to
 grouppriority package

---
 .../network}/grouppriority/TransitGroupPriority32nTest.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/test/java/org/opentripplanner/{routing/algorithm/raptoradapter/transit/cost => transit/model/network}/grouppriority/TransitGroupPriority32nTest.java (96%)

diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32nTest.java
similarity index 96%
rename from src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java
rename to src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32nTest.java
index 3fe242c984b..9f681dc16c6 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/cost/grouppriority/TransitGroupPriority32nTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32nTest.java
@@ -1,4 +1,4 @@
-package org.opentripplanner.routing.algorithm.raptoradapter.transit.cost.grouppriority;
+package org.opentripplanner.transit.model.network.grouppriority;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;

From 82b21681c658c8e141e480386f84be49bc6684be Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:28:24 +0200
Subject: [PATCH 1538/1688] refactor: Rename to TransitGroupPriorityService
 from PriorityGroupConfigurator

---
 .../model/TransitGroupPriorityReport.java          |  6 +++---
 .../request/RaptorRoutingRequestTransitData.java   |  8 ++++----
 .../RaptorRoutingRequestTransitDataCreator.java    | 10 +++++-----
 ...rator.java => TransitGroupPriorityService.java} | 14 +++++++-------
 ...RaptorRoutingRequestTransitDataCreatorTest.java |  4 ++--
 ...t.java => TransitGroupPriorityServiceTest.java} |  8 ++++----
 6 files changed, 25 insertions(+), 25 deletions(-)
 rename src/main/java/org/opentripplanner/transit/model/network/grouppriority/{PriorityGroupConfigurator.java => TransitGroupPriorityService.java} (93%)
 rename src/test/java/org/opentripplanner/transit/model/network/grouppriority/{PriorityGroupConfiguratorTest.java => TransitGroupPriorityServiceTest.java} (94%)

diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
index 8e3dd0dfb17..67f7350ee14 100644
--- a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
+++ b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
@@ -6,7 +6,7 @@
 import java.util.stream.Collectors;
 import org.opentripplanner.routing.api.request.request.TransitRequest;
 import org.opentripplanner.transit.model.network.TripPattern;
-import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
 
 /**
  * This class is used to report all transit-groups used for transit-group-priority. The report is
@@ -17,14 +17,14 @@
 public class TransitGroupPriorityReport {
 
   public static String build(Collection patterns, TransitRequest request) {
-    var c = PriorityGroupConfigurator.of(
+    var service = TransitGroupPriorityService.of(
       request.priorityGroupsByAgency(),
       request.priorityGroupsGlobal()
     );
 
     var map = new TreeMap();
     for (var it : patterns) {
-      int groupId = c.lookupTransitGroupPriorityId(it);
+      int groupId = service.lookupTransitGroupPriorityId(it);
       var de = map.computeIfAbsent(groupId, DebugEntity::new);
       de.add(
         it.getRoute().getAgency().getId().toString(),
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
index 909b1c0a6b3..83a29ee88d7 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
@@ -30,7 +30,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.GeneralizedCostParametersMapper;
 import org.opentripplanner.routing.api.request.RouteRequest;
 import org.opentripplanner.transit.model.network.RoutingTripPattern;
-import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
 
 /**
  * This is the data provider for the Range Raptor search engine. It uses data from the TransitLayer,
@@ -244,12 +244,12 @@ public RaptorConstrainedBoardingSearch transferConstraintsReverseS
     return new ConstrainedBoardingSearch(false, toStopTransfers, fromStopTransfers);
   }
 
-  private PriorityGroupConfigurator createTransitGroupPriorityConfigurator(RouteRequest request) {
+  private TransitGroupPriorityService createTransitGroupPriorityConfigurator(RouteRequest request) {
     if (request.preferences().transit().relaxTransitGroupPriority().isNormal()) {
-      return PriorityGroupConfigurator.empty();
+      return TransitGroupPriorityService.empty();
     }
     var transitRequest = request.journey().transit();
-    return PriorityGroupConfigurator.of(
+    return TransitGroupPriorityService.of(
       transitRequest.priorityGroupsByAgency(),
       transitRequest.priorityGroupsGlobal()
     );
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
index e2233e1e9df..815bf839e31 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreator.java
@@ -19,7 +19,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.TripPatternForDate;
 import org.opentripplanner.transit.model.network.RoutingTripPattern;
-import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -94,7 +94,7 @@ static List merge(
     ZonedDateTime transitSearchTimeZero,
     List patternForDateList,
     TransitDataProviderFilter filter,
-    PriorityGroupConfigurator priorityGroupConfigurator
+    TransitGroupPriorityService transitGroupPriorityService
   ) {
     // Group TripPatternForDate objects by TripPattern.
     // This is done in a loop to increase performance.
@@ -148,7 +148,7 @@ static List merge(
             tripPattern.getAlightingPossible(),
             BoardAlight.ALIGHT
           ),
-          priorityGroupConfigurator.lookupTransitGroupPriorityId(tripPattern.getPattern())
+          transitGroupPriorityService.lookupTransitGroupPriorityId(tripPattern.getPattern())
         )
       );
     }
@@ -160,7 +160,7 @@ List createTripPatterns(
     int additionalPastSearchDays,
     int additionalFutureSearchDays,
     TransitDataProviderFilter filter,
-    PriorityGroupConfigurator priorityGroupConfigurator
+    TransitGroupPriorityService transitGroupPriorityService
   ) {
     List tripPatternForDates = getTripPatternsForDateRange(
       additionalPastSearchDays,
@@ -168,7 +168,7 @@ List createTripPatterns(
       filter
     );
 
-    return merge(transitSearchTimeZero, tripPatternForDates, filter, priorityGroupConfigurator);
+    return merge(transitSearchTimeZero, tripPatternForDates, filter, transitGroupPriorityService);
   }
 
   private static List filterActiveTripPatterns(
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfigurator.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
similarity index 93%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfigurator.java
rename to src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
index dc25bc498d0..9967d6ed8eb 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfigurator.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
@@ -20,7 +20,7 @@
  * 
              
  * THIS CLASS IS NOT THREAD-SAFE.
  */
-public class PriorityGroupConfigurator {
+public class TransitGroupPriorityService {
 
   /**
    * There are two ways we can treat the base (local-traffic) transit priority group:
@@ -53,7 +53,7 @@ public class PriorityGroupConfigurator {
   private final List agencyMatchersIds;
   private final List globalMatchersIds;
 
-  private PriorityGroupConfigurator() {
+  private TransitGroupPriorityService() {
     this.enabled = false;
     this.agencyMatchers = null;
     this.globalMatchers = null;
@@ -61,7 +61,7 @@ private PriorityGroupConfigurator() {
     this.globalMatchersIds = List.of();
   }
 
-  private PriorityGroupConfigurator(
+  private TransitGroupPriorityService(
     Collection byAgency,
     Collection global
   ) {
@@ -74,18 +74,18 @@ private PriorityGroupConfigurator(
     this.agencyMatchersIds = Arrays.stream(agencyMatchers).map(MatcherAgencyAndIds::new).toList();
   }
 
-  public static PriorityGroupConfigurator empty() {
-    return new PriorityGroupConfigurator();
+  public static TransitGroupPriorityService empty() {
+    return new TransitGroupPriorityService();
   }
 
-  public static PriorityGroupConfigurator of(
+  public static TransitGroupPriorityService of(
     Collection byAgency,
     Collection global
   ) {
     if (Stream.of(byAgency, global).allMatch(Collection::isEmpty)) {
       return empty();
     }
-    return new PriorityGroupConfigurator(byAgency, global);
+    return new TransitGroupPriorityService(byAgency, global);
   }
 
   /**
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
index 861420d73eb..c66caa05985 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
@@ -19,7 +19,7 @@
 import org.opentripplanner.transit.model.network.RoutingTripPattern;
 import org.opentripplanner.transit.model.network.StopPattern;
 import org.opentripplanner.transit.model.network.TripPattern;
-import org.opentripplanner.transit.model.network.grouppriority.PriorityGroupConfigurator;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
 import org.opentripplanner.transit.model.timetable.ScheduledTripTimes;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 
@@ -66,7 +66,7 @@ public void testMergeTripPatterns() {
       startOfTime,
       tripPatternsForDates,
       new TestTransitDataProviderFilter(),
-      PriorityGroupConfigurator.empty()
+      TransitGroupPriorityService.empty()
     );
 
     // Get the results
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfiguratorTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
similarity index 94%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfiguratorTest.java
rename to src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
index 14e18968160..b81bc4ed15f 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupConfiguratorTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
@@ -13,7 +13,7 @@
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.RegularStop;
 
-class PriorityGroupConfiguratorTest {
+class TransitGroupPriorityServiceTest {
 
   private static final String AGENCY_A1 = "A1";
   private static final String AGENCY_A2 = "A2";
@@ -69,7 +69,7 @@ class PriorityGroupConfiguratorTest {
 
   @Test
   void emptyConfigurationShouldReturnGroupZero() {
-    var subject = PriorityGroupConfigurator.of(List.of(), List.of());
+    var subject = TransitGroupPriorityService.of(List.of(), List.of());
     assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(railR1));
     assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(busB2));
     assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(null));
@@ -83,7 +83,7 @@ void lookupTransitGroupIdByAgency() {
       .build();
 
     // Add matcher `byAgency` for bus and real
-    var subject = PriorityGroupConfigurator.of(List.of(select), List.of());
+    var subject = TransitGroupPriorityService.of(List.of(select), List.of());
 
     // Agency groups are indexed (group-id set) at request time
     assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(null));
@@ -97,7 +97,7 @@ void lookupTransitGroupIdByAgency() {
   @Test
   void lookupTransitPriorityGroupIdByGlobalMode() {
     // Global groups are indexed (group-id set) at construction time
-    var subject = PriorityGroupConfigurator.of(
+    var subject = TransitGroupPriorityService.of(
       List.of(),
       List.of(
         TransitGroupSelect.of().addModes(List.of(TransitMode.BUS)).build(),

From 376a05fbea056963279dcef101aadc475196a6eb Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:38:26 +0200
Subject: [PATCH 1539/1688] refactor: Extract Matcher interface in
 group-priority

---
 .../model/network/grouppriority/Matcher.java  | 11 ++++
 .../grouppriority/PriorityGroupMatcher.java   | 50 ++++++++-----------
 .../TransitGroupPriorityService.java          | 10 ++--
 .../PriorityGroupMatcherTest.java             |  4 +-
 4 files changed, 40 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java

diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
new file mode 100644
index 00000000000..d92ac9476a6
--- /dev/null
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
@@ -0,0 +1,11 @@
+package org.opentripplanner.transit.model.network.grouppriority;
+
+import org.opentripplanner.transit.model.network.TripPattern;
+
+interface Matcher {
+  boolean match(TripPattern pattern);
+
+  default boolean isEmpty() {
+    return false;
+  }
+}
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
index b4c37c6735b..50782093e5f 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
@@ -28,25 +28,25 @@
  * a `CompositeMatcher`. So, a new matcher is only created if the field in the
  * select is present.
  */
-public abstract class PriorityGroupMatcher {
+public final class PriorityGroupMatcher {
 
-  private static final PriorityGroupMatcher NOOP = new PriorityGroupMatcher() {
+  private static final Matcher NOOP = new Matcher() {
     @Override
-    boolean match(TripPattern pattern) {
+    public boolean match(TripPattern pattern) {
       return false;
     }
 
     @Override
-    boolean isEmpty() {
+    public boolean isEmpty() {
       return true;
     }
   };
 
-  public static PriorityGroupMatcher of(TransitGroupSelect select) {
+  public static Matcher of(TransitGroupSelect select) {
     if (select.isEmpty()) {
       return NOOP;
     }
-    List list = new ArrayList<>();
+    List list = new ArrayList<>();
 
     if (!select.modes().isEmpty()) {
       list.add(new ModeMatcher(select.modes()));
@@ -65,12 +65,12 @@ public static PriorityGroupMatcher of(TransitGroupSelect select) {
     return andOf(list);
   }
 
-  static PriorityGroupMatcher[] of(Collection selectors) {
+  static Matcher[] of(Collection selectors) {
     return selectors
       .stream()
       .map(PriorityGroupMatcher::of)
-      .filter(Predicate.not(PriorityGroupMatcher::isEmpty))
-      .toArray(PriorityGroupMatcher[]::new);
+      .filter(Predicate.not(Matcher::isEmpty))
+      .toArray(Matcher[]::new);
   }
 
   private static  String arrayToString(BinarySetOperator op, T[] values) {
@@ -81,9 +81,9 @@ private static  String colToString(BinarySetOperator op, Collection values
     return values.stream().map(Objects::toString).collect(Collectors.joining(" " + op + " "));
   }
 
-  private static PriorityGroupMatcher andOf(List list) {
+  private static Matcher andOf(List list) {
     // Remove empty/noop matchers
-    list = list.stream().filter(Predicate.not(PriorityGroupMatcher::isEmpty)).toList();
+    list = list.stream().filter(Predicate.not(Matcher::isEmpty)).toList();
 
     if (list.isEmpty()) {
       return NOOP;
@@ -94,13 +94,7 @@ private static PriorityGroupMatcher andOf(List list) {
     return new AndMatcher(list);
   }
 
-  abstract boolean match(TripPattern pattern);
-
-  boolean isEmpty() {
-    return false;
-  }
-
-  private static final class ModeMatcher extends PriorityGroupMatcher {
+  private static final class ModeMatcher implements Matcher {
 
     private final Set modes;
 
@@ -109,7 +103,7 @@ public ModeMatcher(List modes) {
     }
 
     @Override
-    boolean match(TripPattern pattern) {
+    public boolean match(TripPattern pattern) {
       return modes.contains(pattern.getMode());
     }
 
@@ -119,7 +113,7 @@ public String toString() {
     }
   }
 
-  private static final class RegExpMatcher extends PriorityGroupMatcher {
+  private static final class RegExpMatcher implements Matcher {
 
     private final String typeName;
     private final Pattern[] subModeRegexp;
@@ -136,7 +130,7 @@ public RegExpMatcher(
     }
 
     @Override
-    boolean match(TripPattern pattern) {
+    public boolean match(TripPattern pattern) {
       var value = toValue.apply(pattern);
       for (Pattern p : subModeRegexp) {
         if (p.matcher(value).matches()) {
@@ -152,7 +146,7 @@ public String toString() {
     }
   }
 
-  private static final class IdMatcher extends PriorityGroupMatcher {
+  private static final class IdMatcher implements Matcher {
 
     private final String typeName;
     private final Set ids;
@@ -169,7 +163,7 @@ public IdMatcher(
     }
 
     @Override
-    boolean match(TripPattern pattern) {
+    public boolean match(TripPattern pattern) {
       return ids.contains(idProvider.apply(pattern));
     }
 
@@ -183,16 +177,16 @@ public String toString() {
    * Takes a list of matchers and provide a single interface. All matchers in the list must match
    * for the composite matcher to return a match.
    */
-  private static final class AndMatcher extends PriorityGroupMatcher {
+  private static final class AndMatcher implements Matcher {
 
-    private final PriorityGroupMatcher[] matchers;
+    private final Matcher[] matchers;
 
-    public AndMatcher(List matchers) {
-      this.matchers = matchers.toArray(PriorityGroupMatcher[]::new);
+    public AndMatcher(List matchers) {
+      this.matchers = matchers.toArray(Matcher[]::new);
     }
 
     @Override
-    boolean match(TripPattern pattern) {
+    public boolean match(TripPattern pattern) {
       for (var m : matchers) {
         if (!m.match(pattern)) {
           return false;
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
index 9967d6ed8eb..4e9165944eb 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
@@ -46,8 +46,8 @@ public class TransitGroupPriorityService {
   private final int baseGroupId = TransitGroupPriority32n.groupId(GROUP_INDEX_COUNTER_START);
   private int groupIndexCounter = GROUP_INDEX_COUNTER_START;
   private final boolean enabled;
-  private final PriorityGroupMatcher[] agencyMatchers;
-  private final PriorityGroupMatcher[] globalMatchers;
+  private final Matcher[] agencyMatchers;
+  private final Matcher[] globalMatchers;
 
   // Index matchers and ids
   private final List agencyMatchersIds;
@@ -129,11 +129,11 @@ private int nextGroupId() {
   }
 
   /** Pair of matcher and groupId. Used only inside this class. */
-  record MatcherAndId(PriorityGroupMatcher matcher, int groupId) {}
+  record MatcherAndId(Matcher matcher, int groupId) {}
 
   /** Matcher with map of ids by agency. */
-  record MatcherAgencyAndIds(PriorityGroupMatcher matcher, TObjectIntMap ids) {
-    MatcherAgencyAndIds(PriorityGroupMatcher matcher) {
+  record MatcherAgencyAndIds(Matcher matcher, TObjectIntMap ids) {
+    MatcherAgencyAndIds(Matcher matcher) {
       this(
         matcher,
         new TObjectIntHashMap<>(Constants.DEFAULT_CAPACITY, Constants.DEFAULT_LOAD_FACTOR, -1)
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
index 030ac65ecf4..18941f8232c 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
@@ -58,7 +58,7 @@ void testAgencyIds() {
     assertEquals("AgencyId(F:A1)", m1.toString());
     assertEquals("AgencyId(F:A1 | F:ANY)", m2.toString());
 
-    for (PriorityGroupMatcher m : matchers) {
+    for (Matcher m : matchers) {
       assertFalse(m.isEmpty());
       assertTrue(m.match(rail1));
       assertTrue(m.match(ferry));
@@ -79,7 +79,7 @@ void routeIds() {
     assertEquals("RouteId(F:R1)", m1.toString());
     assertEquals("RouteId(F:R1 | F:ANY)", m2.toString());
 
-    for (PriorityGroupMatcher m : matchers) {
+    for (Matcher m : matchers) {
       assertFalse(m.isEmpty());
       assertTrue(m.match(rail1));
       assertFalse(m.match(ferry));

From 6ca1e8b60c0b9b38561bcbf3143843224a1d23b5 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:40:29 +0200
Subject: [PATCH 1540/1688] refactor: Rename local class to Matchers from
 PriorityGroupMatcher

---
 ...riorityGroupMatcher.java => Matchers.java} |  4 +--
 .../TransitGroupPriorityService.java          |  4 +--
 ...roupMatcherTest.java => MatchersTest.java} | 26 +++++++------------
 3 files changed, 13 insertions(+), 21 deletions(-)
 rename src/main/java/org/opentripplanner/transit/model/network/grouppriority/{PriorityGroupMatcher.java => Matchers.java} (98%)
 rename src/test/java/org/opentripplanner/transit/model/network/grouppriority/{PriorityGroupMatcherTest.java => MatchersTest.java} (84%)

diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
similarity index 98%
rename from src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
rename to src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
index 50782093e5f..a82b34ac8ee 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcher.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
@@ -28,7 +28,7 @@
  * a `CompositeMatcher`. So, a new matcher is only created if the field in the
  * select is present.
  */
-public final class PriorityGroupMatcher {
+public final class Matchers {
 
   private static final Matcher NOOP = new Matcher() {
     @Override
@@ -68,7 +68,7 @@ public static Matcher of(TransitGroupSelect select) {
   static Matcher[] of(Collection selectors) {
     return selectors
       .stream()
-      .map(PriorityGroupMatcher::of)
+      .map(Matchers::of)
       .filter(Predicate.not(Matcher::isEmpty))
       .toArray(Matcher[]::new);
   }
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
index 4e9165944eb..220d6a2cc03 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
@@ -65,8 +65,8 @@ private TransitGroupPriorityService(
     Collection byAgency,
     Collection global
   ) {
-    this.agencyMatchers = PriorityGroupMatcher.of(byAgency);
-    this.globalMatchers = PriorityGroupMatcher.of(global);
+    this.agencyMatchers = Matchers.of(byAgency);
+    this.globalMatchers = Matchers.of(global);
     this.enabled = Stream.of(agencyMatchers, globalMatchers).anyMatch(ArrayUtils::hasContent);
     this.globalMatchersIds =
       Arrays.stream(globalMatchers).map(m -> new MatcherAndId(m, nextGroupId())).toList();
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
similarity index 84%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
rename to src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
index 18941f8232c..15b26313f89 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/PriorityGroupMatcherTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
@@ -12,7 +12,7 @@
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.TripPattern;
 
-class PriorityGroupMatcherTest {
+class MatchersTest {
 
   private final TestRouteData r1 = TestRouteData
     .rail("R1")
@@ -35,7 +35,7 @@ class PriorityGroupMatcherTest {
 
   @Test
   void testMode() {
-    var m = PriorityGroupMatcher.of(
+    var m = Matchers.of(
       TransitGroupSelect.of().addModes(List.of(TransitMode.BUS, TransitMode.TRAM)).build()
     );
     assertEquals("Mode(BUS | TRAM)", m.toString());
@@ -47,12 +47,8 @@ void testMode() {
 
   @Test
   void testAgencyIds() {
-    var m1 = PriorityGroupMatcher.of(
-      TransitGroupSelect.of().addAgencyIds(List.of(r1agencyId)).build()
-    );
-    var m2 = PriorityGroupMatcher.of(
-      TransitGroupSelect.of().addAgencyIds(List.of(r1agencyId, anyId)).build()
-    );
+    var m1 = Matchers.of(TransitGroupSelect.of().addAgencyIds(List.of(r1agencyId)).build());
+    var m2 = Matchers.of(TransitGroupSelect.of().addAgencyIds(List.of(r1agencyId, anyId)).build());
     var matchers = List.of(m1, m2);
 
     assertEquals("AgencyId(F:A1)", m1.toString());
@@ -68,12 +64,8 @@ void testAgencyIds() {
 
   @Test
   void routeIds() {
-    var m1 = PriorityGroupMatcher.of(
-      TransitGroupSelect.of().addRouteIds(List.of(r1routeId)).build()
-    );
-    var m2 = PriorityGroupMatcher.of(
-      TransitGroupSelect.of().addRouteIds(List.of(r1routeId, anyId)).build()
-    );
+    var m1 = Matchers.of(TransitGroupSelect.of().addRouteIds(List.of(r1routeId)).build());
+    var m2 = Matchers.of(TransitGroupSelect.of().addRouteIds(List.of(r1routeId, anyId)).build());
     var matchers = List.of(m1, m2);
 
     assertEquals("RouteId(F:R1)", m1.toString());
@@ -89,7 +81,7 @@ void routeIds() {
 
   @Test
   void testSubMode() {
-    var subject = PriorityGroupMatcher.of(
+    var subject = Matchers.of(
       TransitGroupSelect.of().addSubModeRegexp(List.of(".*local.*")).build()
     );
 
@@ -103,7 +95,7 @@ void testSubMode() {
 
   @Test
   void testAnd() {
-    var subject = PriorityGroupMatcher.of(
+    var subject = Matchers.of(
       TransitGroupSelect
         .of()
         .addSubModeRegexp(List.of("express"))
@@ -125,7 +117,7 @@ void testAnd() {
 
   @Test
   void testToString() {
-    var subject = PriorityGroupMatcher.of(
+    var subject = Matchers.of(
       TransitGroupSelect
         .of()
         .addModes(List.of(TransitMode.BUS, TransitMode.TRAM))

From af2bff225dd27e33a33f78eb68a1cb827c7b1a30 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:44:19 +0200
Subject: [PATCH 1541/1688] refactor: Cleanup access modifiers in
 group-priority

---
 .../model/network/grouppriority/Matchers.java  | 10 +++++-----
 .../grouppriority/TransitGroupPriority32n.java | 18 +++++++++---------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
index a82b34ac8ee..90fcae9c77a 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
@@ -28,7 +28,7 @@
  * a `CompositeMatcher`. So, a new matcher is only created if the field in the
  * select is present.
  */
-public final class Matchers {
+final class Matchers {
 
   private static final Matcher NOOP = new Matcher() {
     @Override
@@ -42,7 +42,7 @@ public boolean isEmpty() {
     }
   };
 
-  public static Matcher of(TransitGroupSelect select) {
+  static Matcher of(TransitGroupSelect select) {
     if (select.isEmpty()) {
       return NOOP;
     }
@@ -119,7 +119,7 @@ private static final class RegExpMatcher implements Matcher {
     private final Pattern[] subModeRegexp;
     private final Function toValue;
 
-    public RegExpMatcher(
+    RegExpMatcher(
       String typeName,
       List subModeRegexp,
       Function toValue
@@ -152,7 +152,7 @@ private static final class IdMatcher implements Matcher {
     private final Set ids;
     private final Function idProvider;
 
-    public IdMatcher(
+    IdMatcher(
       String typeName,
       List ids,
       Function idProvider
@@ -181,7 +181,7 @@ private static final class AndMatcher implements Matcher {
 
     private final Matcher[] matchers;
 
-    public AndMatcher(List matchers) {
+    AndMatcher(List matchers) {
       this.matchers = matchers.toArray(Matcher[]::new);
     }
 
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
index 1bdff703e07..0243f64a206 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
@@ -4,7 +4,7 @@
  * This is a "BitSet" implementation for groupId. It can store upto 32 groups,
  * a set with few elements does NOT dominate a set with more elements.
  */
-public class TransitGroupPriority32n {
+class TransitGroupPriority32n {
 
   private static final int GROUP_ZERO = 0;
   private static final int MIN_SEQ_NO = 0;
@@ -14,20 +14,15 @@ public class TransitGroupPriority32n {
    * Left dominate right, if right contains a group which does not exist in left. Left
    * do NOT dominate right if they are equals or left is a super set of right.
    */
-  public static boolean dominate(int left, int right) {
+  static boolean dominate(int left, int right) {
     return ((left ^ right) & right) != 0;
   }
 
-  @Override
-  public String toString() {
-    return "TransitGroupPriority32n{}";
-  }
-
   /**
    * Use this method to map from a continuous group index [0..32) to the groupId used
    * during routing. The ID is implementation-specific and optimized for performance.
    */
-  public static int groupId(final int priorityGroupIndex) {
+  static int groupId(final int priorityGroupIndex) {
     assertValidGroupSeqNo(priorityGroupIndex);
     return priorityGroupIndex == MIN_SEQ_NO ? GROUP_ZERO : 0x01 << (priorityGroupIndex - 1);
   }
@@ -35,10 +30,15 @@ public static int groupId(final int priorityGroupIndex) {
   /**
    * Merge a groupId into a set of groupIds.
    */
-  public static int mergeInGroupId(final int currentSetOfGroupIds, final int newGroupId) {
+  static int mergeInGroupId(final int currentSetOfGroupIds, final int newGroupId) {
     return currentSetOfGroupIds | newGroupId;
   }
 
+  @Override
+  public String toString() {
+    return "TransitGroupPriority32n{}";
+  }
+
   private static void assertValidGroupSeqNo(int priorityGroupIndex) {
     if (priorityGroupIndex < MIN_SEQ_NO) {
       throw new IllegalArgumentException(

From 7f9e18652779fc8f00dcbf585b4e268772a3a106 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:54:04 +0200
Subject: [PATCH 1542/1688] refactor: Rename
 DefaultTransitGroupPriorityCalculator

---
 .../DefaultTransitGroupPriorityCalculator.java              | 6 +++++-
 ....java => DefaultTransitGroupPriorityCalculatorTest.java} | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)
 rename src/test/java/org/opentripplanner/transit/model/network/grouppriority/{DefaultTransitGroupCalculatorTest.java => DefaultTransitGroupPriorityCalculatorTest.java} (95%)

diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
index d09d206adb0..df5d2abef8a 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculator.java
@@ -3,7 +3,11 @@
 import org.opentripplanner.raptor.api.model.DominanceFunction;
 import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
 
-public class DefaultTransitGroupPriorityCalculator implements RaptorTransitGroupPriorityCalculator {
+/**
+ * Implement {@link RaptorTransitGroupPriorityCalculator}.
+ */
+public final class DefaultTransitGroupPriorityCalculator
+  implements RaptorTransitGroupPriorityCalculator {
 
   @Override
   public int mergeGroupIds(int currentGroupIds, int boardingGroupId) {
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupCalculatorTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculatorTest.java
similarity index 95%
rename from src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupCalculatorTest.java
rename to src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculatorTest.java
index 131bce04707..745442e3e7b 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupCalculatorTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/DefaultTransitGroupPriorityCalculatorTest.java
@@ -6,7 +6,7 @@
 
 import org.junit.jupiter.api.Test;
 
-class DefaultTransitGroupCalculatorTest {
+class DefaultTransitGroupPriorityCalculatorTest {
 
   private final DefaultTransitGroupPriorityCalculator subject = new DefaultTransitGroupPriorityCalculator();
 

From d683b22901fe037a3f3b4dd5a9b305e2133b23ac Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 01:20:56 +0200
Subject: [PATCH 1543/1688] feature: Prepare to support group-priority for
 trips

---
 .../model/TransitGroupPriorityReport.java     |  2 +-
 .../RaptorRoutingRequestTransitData.java      |  1 +
 .../network/grouppriority/EntityAdapter.java  | 16 ++++
 .../model/network/grouppriority/Matcher.java  |  4 +-
 .../model/network/grouppriority/Matchers.java | 54 ++++++------
 .../TransitGroupPriority32n.java              |  9 +-
 .../TransitGroupPriorityService.java          | 85 ++++++++++++-------
 .../grouppriority/TripPatternAdapter.java     | 34 ++++++++
 .../network/grouppriority/MatchersTest.java   | 11 ++-
 .../TransitGroupPriorityServiceTest.java      | 13 +--
 10 files changed, 151 insertions(+), 78 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
 create mode 100644 src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java

diff --git a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
index 67f7350ee14..66ad29fad56 100644
--- a/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
+++ b/src/ext/java/org/opentripplanner/ext/reportapi/model/TransitGroupPriorityReport.java
@@ -17,7 +17,7 @@
 public class TransitGroupPriorityReport {
 
   public static String build(Collection patterns, TransitRequest request) {
-    var service = TransitGroupPriorityService.of(
+    var service = new TransitGroupPriorityService(
       request.priorityGroupsByAgency(),
       request.priorityGroupsGlobal()
     );
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
index 83a29ee88d7..fa0676dcf94 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
@@ -250,6 +250,7 @@ private TransitGroupPriorityService createTransitGroupPriorityConfigurator(Route
     }
     var transitRequest = request.journey().transit();
     return TransitGroupPriorityService.of(
+      request.preferences().transit().relaxTransitGroupPriority(),
       transitRequest.priorityGroupsByAgency(),
       transitRequest.priorityGroupsGlobal()
     );
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
new file mode 100644
index 00000000000..c6802562283
--- /dev/null
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
@@ -0,0 +1,16 @@
+package org.opentripplanner.transit.model.network.grouppriority;
+
+import org.opentripplanner.transit.model.basic.TransitMode;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+
+/**
+ * This is the keys used to group transit trips and trip-patterns. This is used to calculate a
+ * unique groupId based on the request config. We use the adapter pattern to be able to generate
+ * the groupId based on different input types (TripPattern and Trip).
+ */
+interface EntityAdapter {
+  TransitMode mode();
+  String subMode();
+  FeedScopedId agencyId();
+  FeedScopedId routeId();
+}
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
index d92ac9476a6..bb5b4075364 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matcher.java
@@ -1,9 +1,7 @@
 package org.opentripplanner.transit.model.network.grouppriority;
 
-import org.opentripplanner.transit.model.network.TripPattern;
-
 interface Matcher {
-  boolean match(TripPattern pattern);
+  boolean match(EntityAdapter entity);
 
   default boolean isEmpty() {
     return false;
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
index 90fcae9c77a..6a22ea2172f 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
@@ -18,7 +18,6 @@
 import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
-import org.opentripplanner.transit.model.network.TripPattern;
 
 /**
  * This class turns a {@link TransitGroupSelect} into a matcher.
@@ -32,7 +31,7 @@ final class Matchers {
 
   private static final Matcher NOOP = new Matcher() {
     @Override
-    public boolean match(TripPattern pattern) {
+    public boolean match(EntityAdapter entity) {
       return false;
     }
 
@@ -42,7 +41,7 @@ public boolean isEmpty() {
     }
   };
 
-  static Matcher of(TransitGroupSelect select) {
+  public static Matcher of(TransitGroupSelect select) {
     if (select.isEmpty()) {
       return NOOP;
     }
@@ -52,19 +51,18 @@ static Matcher of(TransitGroupSelect select) {
       list.add(new ModeMatcher(select.modes()));
     }
     if (!select.subModeRegexp().isEmpty()) {
-      list.add(
-        new RegExpMatcher("SubMode", select.subModeRegexp(), p -> p.getNetexSubmode().name())
-      );
+      list.add(new RegExpMatcher("SubMode", select.subModeRegexp(), EntityAdapter::subMode));
     }
     if (!select.agencyIds().isEmpty()) {
-      list.add(new IdMatcher("Agency", select.agencyIds(), p -> p.getRoute().getAgency().getId()));
+      list.add(new IdMatcher("Agency", select.agencyIds(), EntityAdapter::agencyId));
     }
     if (!select.routeIds().isEmpty()) {
-      list.add(new IdMatcher("Route", select.routeIds(), p -> p.getRoute().getId()));
+      list.add(new IdMatcher("Route", select.routeIds(), EntityAdapter::routeId));
     }
     return andOf(list);
   }
 
+  @SuppressWarnings("unchecked")
   static Matcher[] of(Collection selectors) {
     return selectors
       .stream()
@@ -103,8 +101,8 @@ public ModeMatcher(List modes) {
     }
 
     @Override
-    public boolean match(TripPattern pattern) {
-      return modes.contains(pattern.getMode());
+    public boolean match(EntityAdapter entity) {
+      return modes.contains(entity.mode());
     }
 
     @Override
@@ -116,23 +114,23 @@ public String toString() {
   private static final class RegExpMatcher implements Matcher {
 
     private final String typeName;
-    private final Pattern[] subModeRegexp;
-    private final Function toValue;
+    private final Pattern[] patterns;
+    private final Function toValue;
 
-    RegExpMatcher(
+    public RegExpMatcher(
       String typeName,
-      List subModeRegexp,
-      Function toValue
+      List regexps,
+      Function toValue
     ) {
       this.typeName = typeName;
-      this.subModeRegexp = subModeRegexp.stream().map(Pattern::compile).toArray(Pattern[]::new);
+      this.patterns = regexps.stream().map(Pattern::compile).toArray(Pattern[]::new);
       this.toValue = toValue;
     }
 
     @Override
-    public boolean match(TripPattern pattern) {
-      var value = toValue.apply(pattern);
-      for (Pattern p : subModeRegexp) {
+    public boolean match(EntityAdapter entity) {
+      var value = toValue.apply(entity);
+      for (Pattern p : patterns) {
         if (p.matcher(value).matches()) {
           return true;
         }
@@ -142,7 +140,7 @@ public boolean match(TripPattern pattern) {
 
     @Override
     public String toString() {
-      return typeName + "Regexp(" + arrayToString(OR, subModeRegexp) + ')';
+      return typeName + "Regexp(" + arrayToString(OR, patterns) + ')';
     }
   }
 
@@ -150,12 +148,12 @@ private static final class IdMatcher implements Matcher {
 
     private final String typeName;
     private final Set ids;
-    private final Function idProvider;
+    private final Function idProvider;
 
-    IdMatcher(
+    public IdMatcher(
       String typeName,
       List ids,
-      Function idProvider
+      Function idProvider
     ) {
       this.typeName = typeName;
       this.ids = new HashSet<>(ids);
@@ -163,8 +161,8 @@ private static final class IdMatcher implements Matcher {
     }
 
     @Override
-    public boolean match(TripPattern pattern) {
-      return ids.contains(idProvider.apply(pattern));
+    public boolean match(EntityAdapter entity) {
+      return ids.contains(idProvider.apply(entity));
     }
 
     @Override
@@ -181,14 +179,14 @@ private static final class AndMatcher implements Matcher {
 
     private final Matcher[] matchers;
 
-    AndMatcher(List matchers) {
+    public AndMatcher(List matchers) {
       this.matchers = matchers.toArray(Matcher[]::new);
     }
 
     @Override
-    public boolean match(TripPattern pattern) {
+    public boolean match(EntityAdapter entity) {
       for (var m : matchers) {
-        if (!m.match(pattern)) {
+        if (!m.match(entity)) {
           return false;
         }
       }
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
index 0243f64a206..32423070e09 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriority32n.java
@@ -1,7 +1,7 @@
 package org.opentripplanner.transit.model.network.grouppriority;
 
 /**
- * This is a "BitSet" implementation for groupId. It can store upto 32 groups,
+ * This is a "BitSet" implementation for groupId. It can store up to 31 groups,
  * a set with few elements does NOT dominate a set with more elements.
  */
 class TransitGroupPriority32n {
@@ -11,8 +11,11 @@ class TransitGroupPriority32n {
   private static final int MAX_SEQ_NO = 32;
 
   /**
-   * Left dominate right, if right contains a group which does not exist in left. Left
-   * do NOT dominate right if they are equals or left is a super set of right.
+   * Left dominates right:
+   *   - if right contains a group which does not exist in the left.
+   * Left do NOT dominate right:
+   *   - if they are equals or
+   *   - left is a superset of right.
    */
   static boolean dominate(int left, int right) {
     return ((left ^ right) & right) != 0;
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
index 220d6a2cc03..dab40533dba 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
@@ -8,38 +8,35 @@
 import java.util.List;
 import java.util.stream.Stream;
 import org.opentripplanner.framework.lang.ArrayUtils;
+import org.opentripplanner.routing.api.request.framework.CostLinearFunction;
 import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.TripPattern;
 
 /**
- * This class dynamically builds an index of transit-group-ids from the
- * provided {@link TransitGroupSelect}s while serving the caller with
- * group-ids for each requested pattern. It is made for optimal
- * performance, since it is used in request scope.
+ * This class dynamically builds an index of transit-group-ids from the provided
+ * {@link TransitGroupSelect}s while serving the caller with group-ids for each requested
+ * trip/pattern. It is made for optimal performance, since it is used in request scope.
  * 
              
  * THIS CLASS IS NOT THREAD-SAFE.
  */
 public class TransitGroupPriorityService {
 
   /**
+   * IMPLEMENTATION DETAILS
+   *
    * There are two ways we can treat the base (local-traffic) transit priority group:
    * 
                
-   *   
              1.  We can assign group id 1 (one) to the base group and it will be treated as any other group.
-   *   
              2.  We can assign group id 0 (zero) to the base and it will not be added to the set of groups
-   *   a given path has.
+   *   
              3. 
+   *     We can assign group id 1 (one) to the base group and it will be treated as any other group.
+   *   
                4. 
+   *   
              4. 
+   *     We can assign group id 0 (zero) to the base and it will not be added to the set of groups
+   *     a given path has.
+   *   
                5. 
    * 
              
-   * When we compare paths we compare sets of group ids. A set is dominating another set if it is
+   * When we compare paths, we compare sets of group ids. A set is dominating another set if it is
    * a smaller subset or different from the other set.
-   * 
              
-   * Example - base-group-id = 0 (zero)
-   * 
              
-   * Let B be the base and G be concrete group. Then: (B) dominates (G), (G) dominates (B), (B)
-   * dominates (BG), but (G) does not dominate (BG). In other words, paths with only agency
-   * X (group G) is not given an advantage in the routing over paths with a combination of agency
-   * X (group G) and local traffic (group B).
-   * 
              
-   * TODO: Experiment with base-group-id=0 and make it configurable.
    */
   private static final int GROUP_INDEX_COUNTER_START = 1;
 
@@ -61,7 +58,7 @@ private TransitGroupPriorityService() {
     this.globalMatchersIds = List.of();
   }
 
-  private TransitGroupPriorityService(
+  public TransitGroupPriorityService(
     Collection byAgency,
     Collection global
   ) {
@@ -79,13 +76,25 @@ public static TransitGroupPriorityService empty() {
   }
 
   public static TransitGroupPriorityService of(
-    Collection byAgency,
-    Collection global
+    CostLinearFunction relaxTransitGroupPriority,
+    List groupByAgency,
+    List groupGlobal
   ) {
-    if (Stream.of(byAgency, global).allMatch(Collection::isEmpty)) {
-      return empty();
+    if (relaxTransitGroupPriority.isNormal()) {
+      return TransitGroupPriorityService.empty();
+    } else if (Stream.of(groupByAgency, groupGlobal).allMatch(Collection::isEmpty)) {
+      return TransitGroupPriorityService.empty();
+    } else {
+      return new TransitGroupPriorityService(groupByAgency, groupGlobal);
     }
-    return new TransitGroupPriorityService(byAgency, global);
+  }
+
+  /**
+   * Return true is the feature is configured and the request a {@code relaxTransitGroupPriority}
+   * function.
+   */
+  public boolean isEnabled() {
+    return enabled;
   }
 
   /**
@@ -94,13 +103,23 @@ public static TransitGroupPriorityService of(
    * @throws IllegalArgumentException if more than 32 group-ids are requested.
    */
   public int lookupTransitGroupPriorityId(TripPattern tripPattern) {
-    if (!enabled || tripPattern == null) {
+    return tripPattern == null
+      ? baseGroupId
+      : lookupTransitGroupPriorityId(new TripPatternAdapter(tripPattern));
+  }
+
+  /**
+   * Fetch/lookup the transit-group-id for the given entity.
+   * 
              
+   * @throws IllegalArgumentException if more than 32 group-ids are requested.
+   */
+  private int lookupTransitGroupPriorityId(EntityAdapter entity) {
+    if (!enabled) {
       return baseGroupId;
     }
-
     for (var it : agencyMatchersIds) {
-      if (it.matcher().match(tripPattern)) {
-        var agencyId = tripPattern.getRoute().getAgency().getId();
+      if (it.matcher().match(entity)) {
+        var agencyId = entity.agencyId();
         int groupId = it.ids().get(agencyId);
 
         if (groupId < 0) {
@@ -112,7 +131,7 @@ public int lookupTransitGroupPriorityId(TripPattern tripPattern) {
     }
 
     for (var it : globalMatchersIds) {
-      if (it.matcher.match(tripPattern)) {
+      if (it.matcher.match(entity)) {
         return it.groupId();
       }
     }
@@ -120,6 +139,10 @@ public int lookupTransitGroupPriorityId(TripPattern tripPattern) {
     return baseGroupId;
   }
 
+  /**
+   * This is the group-id assigned to all transit trips/patterns witch does not match a
+   * specific group.
+   */
   public int baseGroupId() {
     return baseGroupId;
   }
@@ -129,10 +152,10 @@ private int nextGroupId() {
   }
 
   /** Pair of matcher and groupId. Used only inside this class. */
-  record MatcherAndId(Matcher matcher, int groupId) {}
+  private record MatcherAndId(Matcher matcher, int groupId) {}
 
-  /** Matcher with map of ids by agency. */
-  record MatcherAgencyAndIds(Matcher matcher, TObjectIntMap ids) {
+  /** Matcher with a map of ids by agency. */
+  private record MatcherAgencyAndIds(Matcher matcher, TObjectIntMap ids) {
     MatcherAgencyAndIds(Matcher matcher) {
       this(
         matcher,
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java
new file mode 100644
index 00000000000..223f163f535
--- /dev/null
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripPatternAdapter.java
@@ -0,0 +1,34 @@
+package org.opentripplanner.transit.model.network.grouppriority;
+
+import org.opentripplanner.transit.model.basic.TransitMode;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.network.TripPattern;
+
+class TripPatternAdapter implements EntityAdapter {
+
+  private final TripPattern tripPattern;
+
+  public TripPatternAdapter(TripPattern tripPattern) {
+    this.tripPattern = tripPattern;
+  }
+
+  @Override
+  public TransitMode mode() {
+    return tripPattern.getMode();
+  }
+
+  @Override
+  public String subMode() {
+    return tripPattern.getNetexSubmode().name();
+  }
+
+  @Override
+  public FeedScopedId agencyId() {
+    return tripPattern.getRoute().getAgency().getId();
+  }
+
+  @Override
+  public FeedScopedId routeId() {
+    return tripPattern.getRoute().getId();
+  }
+}
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
index 15b26313f89..36901214d5b 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
@@ -10,7 +10,6 @@
 import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
-import org.opentripplanner.transit.model.network.TripPattern;
 
 class MatchersTest {
 
@@ -26,11 +25,11 @@ class MatchersTest {
     .withSubmode("localFerry")
     .build();
 
-  private final TripPattern rail1 = r1.getTripPattern();
-  private final TripPattern bus = b1.getTripPattern();
-  private final TripPattern ferry = f1.getTripPattern();
-  private final FeedScopedId r1agencyId = rail1.getRoute().getAgency().getId();
-  private final FeedScopedId r1routeId = rail1.getRoute().getId();
+  private final EntityAdapter rail1 = new TripPatternAdapter(r1.getTripPattern());
+  private final EntityAdapter bus = new TripPatternAdapter(b1.getTripPattern());
+  private final EntityAdapter ferry = new TripPatternAdapter(f1.getTripPattern());
+  private final FeedScopedId r1agencyId = rail1.agencyId();
+  private final FeedScopedId r1routeId = rail1.routeId();
   private final FeedScopedId anyId = new FeedScopedId("F", "ANY");
 
   @Test
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
index b81bc4ed15f..4ef17d7ce04 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
@@ -66,13 +66,14 @@ class TransitGroupPriorityServiceTest {
   private final TripPattern railR3 = routeR3.getTripPattern();
   private final TripPattern ferryF3 = routeF3.getTripPattern();
   private final TripPattern busB3 = routeB3.getTripPattern();
+  private final TripPattern nullValue = null;
 
   @Test
   void emptyConfigurationShouldReturnGroupZero() {
-    var subject = TransitGroupPriorityService.of(List.of(), List.of());
+    var subject = new TransitGroupPriorityService(List.of(), List.of());
     assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(railR1));
     assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(busB2));
-    assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(null));
+    assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(nullValue));
   }
 
   @Test
@@ -83,10 +84,10 @@ void lookupTransitGroupIdByAgency() {
       .build();
 
     // Add matcher `byAgency` for bus and real
-    var subject = TransitGroupPriorityService.of(List.of(select), List.of());
+    var subject = new TransitGroupPriorityService(List.of(select), List.of());
 
     // Agency groups are indexed (group-id set) at request time
-    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(null));
+    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullValue));
     assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2));
     assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3));
     assertEquals(EXP_GROUP_3, subject.lookupTransitGroupPriorityId(railR1));
@@ -97,7 +98,7 @@ void lookupTransitGroupIdByAgency() {
   @Test
   void lookupTransitPriorityGroupIdByGlobalMode() {
     // Global groups are indexed (group-id set) at construction time
-    var subject = TransitGroupPriorityService.of(
+    var subject = new TransitGroupPriorityService(
       List.of(),
       List.of(
         TransitGroupSelect.of().addModes(List.of(TransitMode.BUS)).build(),
@@ -105,7 +106,7 @@ void lookupTransitPriorityGroupIdByGlobalMode() {
       )
     );
 
-    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(null));
+    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullValue));
     assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR1));
     assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2));
     assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3));

From cea94e49a76c89f91b850045945e2c0c143a93f7 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 01:37:17 +0200
Subject: [PATCH 1544/1688] refactor: Create TransitGroupPriorityService in
 RoutingWorker and pass down

This is preparing for using the service to decorate street only itineraries.
---
 .../flex/trip/ScheduledDeviatedTripTest.java  |  6 ++++--
 .../routing/algorithm/RoutingWorker.java      |  9 +++++++++
 .../raptoradapter/router/TransitRouter.java   |  7 +++++++
 .../RaptorRoutingRequestTransitData.java      | 19 ++++---------------
 ...rRoutingRequestTransitDataCreatorTest.java |  3 ++-
 5 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
index 3971d03ac6d..6466d7bf6d6 100644
--- a/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/flex/trip/ScheduledDeviatedTripTest.java
@@ -41,14 +41,15 @@
 import org.opentripplanner.street.search.request.StreetSearchRequest;
 import org.opentripplanner.street.search.state.State;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
 import org.opentripplanner.transit.model.site.AreaStop;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitModel;
 
 /**
  * This tests that the feed for the Cobb County Flex service is processed correctly. This service
- * contains both flex zones but also scheduled stops. Inside the zone passengers can get on or off
- * anywhere so there it works more like a taxi.
+ * contains both flex zones but also scheduled stops. Inside the zone, passengers can get on or off
+ * anywhere, so there it works more like a taxi.
  * 
              
  * Read about the details at: https://www.cobbcounty.org/transportation/cobblinc/routes-and-schedules/flex
  */
@@ -212,6 +213,7 @@ private static List getItineraries(
     var result = TransitRouter.route(
       request,
       serverContext,
+      TransitGroupPriorityService.empty(),
       transitStartOfTime,
       additionalSearchDays,
       new DebugTimingAggregator()
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
index 06ceaeebeb2..a6218e1720a 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
@@ -36,6 +36,7 @@
 import org.opentripplanner.routing.framework.DebugTimingAggregator;
 import org.opentripplanner.service.paging.PagingService;
 import org.opentripplanner.standalone.api.OtpServerRequestContext;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,6 +65,7 @@ public class RoutingWorker {
    */
   private final ZonedDateTime transitSearchTimeZero;
   private final AdditionalSearchDays additionalSearchDays;
+  private final TransitGroupPriorityService transitGroupPriorityService;
   private SearchParams raptorSearchParamsUsed = null;
   private PageCursorInput pageCursorInput = null;
 
@@ -79,6 +81,12 @@ public RoutingWorker(OtpServerRequestContext serverContext, RouteRequest request
     this.transitSearchTimeZero = ServiceDateUtils.asStartOfService(request.dateTime(), zoneId);
     this.additionalSearchDays =
       createAdditionalSearchDays(serverContext.raptorTuningParameters(), zoneId, request);
+    this.transitGroupPriorityService =
+      TransitGroupPriorityService.of(
+        request.preferences().transit().relaxTransitGroupPriority(),
+        request.journey().transit().priorityGroupsByAgency(),
+        request.journey().transit().priorityGroupsGlobal()
+      );
   }
 
   public RoutingResponse route() {
@@ -258,6 +266,7 @@ private Void routeTransit(List itineraries, Collection
       var transitResults = TransitRouter.route(
         request,
         serverContext,
+        transitGroupPriorityService,
         transitSearchTimeZero,
         additionalSearchDays,
         debugTimingAggregator
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java
index 06f4ff1cf45..37bb7270902 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/router/TransitRouter.java
@@ -41,6 +41,7 @@
 import org.opentripplanner.routing.framework.DebugTimingAggregator;
 import org.opentripplanner.standalone.api.OtpServerRequestContext;
 import org.opentripplanner.street.search.TemporaryVerticesContainer;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
 
 public class TransitRouter {
 
@@ -48,6 +49,7 @@ public class TransitRouter {
 
   private final RouteRequest request;
   private final OtpServerRequestContext serverContext;
+  private final TransitGroupPriorityService transitGroupPriorityService;
   private final DebugTimingAggregator debugTimingAggregator;
   private final ZonedDateTime transitSearchTimeZero;
   private final AdditionalSearchDays additionalSearchDays;
@@ -56,12 +58,14 @@ public class TransitRouter {
   private TransitRouter(
     RouteRequest request,
     OtpServerRequestContext serverContext,
+    TransitGroupPriorityService transitGroupPriorityService,
     ZonedDateTime transitSearchTimeZero,
     AdditionalSearchDays additionalSearchDays,
     DebugTimingAggregator debugTimingAggregator
   ) {
     this.request = request;
     this.serverContext = serverContext;
+    this.transitGroupPriorityService = transitGroupPriorityService;
     this.transitSearchTimeZero = transitSearchTimeZero;
     this.additionalSearchDays = additionalSearchDays;
     this.debugTimingAggregator = debugTimingAggregator;
@@ -71,6 +75,7 @@ private TransitRouter(
   public static TransitRouterResult route(
     RouteRequest request,
     OtpServerRequestContext serverContext,
+    TransitGroupPriorityService priorityGroupConfigurator,
     ZonedDateTime transitSearchTimeZero,
     AdditionalSearchDays additionalSearchDays,
     DebugTimingAggregator debugTimingAggregator
@@ -78,6 +83,7 @@ public static TransitRouterResult route(
     TransitRouter transitRouter = new TransitRouter(
       request,
       serverContext,
+      priorityGroupConfigurator,
       transitSearchTimeZero,
       additionalSearchDays,
       debugTimingAggregator
@@ -309,6 +315,7 @@ private RaptorRoutingRequestTransitData createRequestTransitDataProvider(
   ) {
     return new RaptorRoutingRequestTransitData(
       transitLayer,
+      transitGroupPriorityService,
       transitSearchTimeZero,
       additionalSearchDays.additionalSearchDaysInPast(),
       additionalSearchDays.additionalSearchDaysInFuture(),
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
index fa0676dcf94..66e29b392d4 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitData.java
@@ -34,7 +34,7 @@
 
 /**
  * This is the data provider for the Range Raptor search engine. It uses data from the TransitLayer,
- * but filters it by dates and modes per request. Transfers durations are pre-calculated per request
+ * but filters it by dates and modes per request. Transfer durations are pre-calculated per request
  * based on walk speed.
  */
 public class RaptorRoutingRequestTransitData implements RaptorTransitDataProvider {
@@ -72,6 +72,7 @@ public class RaptorRoutingRequestTransitData implements RaptorTransitDataProvide
 
   public RaptorRoutingRequestTransitData(
     TransitLayer transitLayer,
+    TransitGroupPriorityService transitGroupPriorityService,
     ZonedDateTime transitSearchTimeZero,
     int additionalPastSearchDays,
     int additionalFutureSearchDays,
@@ -83,7 +84,7 @@ public RaptorRoutingRequestTransitData(
     this.transitSearchTimeZero = transitSearchTimeZero;
 
     // Delegate to the creator to construct the needed data structures. The code is messy so
-    // it is nice to NOT have it in the class. It isolate this code to only be available at
+    // it is nice to NOT have it in the class. It isolates this code to only be available at
     // the time of construction
     var transitDataCreator = new RaptorRoutingRequestTransitDataCreator(
       transitLayer,
@@ -93,7 +94,7 @@ public RaptorRoutingRequestTransitData(
       additionalPastSearchDays,
       additionalFutureSearchDays,
       filter,
-      createTransitGroupPriorityConfigurator(request)
+      transitGroupPriorityService
     );
     this.patternIndex = transitDataCreator.createPatternIndex(tripPatterns);
     this.activeTripPatternsPerStop = transitDataCreator.createTripPatternsPerStop(tripPatterns);
@@ -243,16 +244,4 @@ public RaptorConstrainedBoardingSearch transferConstraintsReverseS
     }
     return new ConstrainedBoardingSearch(false, toStopTransfers, fromStopTransfers);
   }
-
-  private TransitGroupPriorityService createTransitGroupPriorityConfigurator(RouteRequest request) {
-    if (request.preferences().transit().relaxTransitGroupPriority().isNormal()) {
-      return TransitGroupPriorityService.empty();
-    }
-    var transitRequest = request.journey().transit();
-    return TransitGroupPriorityService.of(
-      request.preferences().transit().relaxTransitGroupPriority(),
-      transitRequest.priorityGroupsByAgency(),
-      transitRequest.priorityGroupsGlobal()
-    );
-  }
 }
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
index c66caa05985..ea815a2f47f 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
+++ b/src/test/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/request/RaptorRoutingRequestTransitDataCreatorTest.java
@@ -61,7 +61,8 @@ public void testMergeTripPatterns() {
     tripPatternsForDates.add(new TripPatternForDate(tripPattern1, tripTimes, List.of(), third));
     tripPatternsForDates.add(new TripPatternForDate(tripPattern3, tripTimes, List.of(), third));
 
-    // Patterns containing trip schedules for all 3 days. Trip schedules for later days are offset in time when requested.
+    // Patterns containing trip schedules for all 3 days. Trip schedules for later days are offset
+    // in time when requested.
     List combinedTripPatterns = RaptorRoutingRequestTransitDataCreator.merge(
       startOfTime,
       tripPatternsForDates,

From 90213eff461b7b70dc6a8f6c8ee153731ef6b2f0 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 01:39:31 +0200
Subject: [PATCH 1545/1688] refactor: Cleanup on Itinerary and Leg

---
 .../opentripplanner/model/plan/Itinerary.java | 203 +++++++++---------
 .../org/opentripplanner/model/plan/Leg.java   |   1 +
 2 files changed, 100 insertions(+), 104 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/plan/Itinerary.java b/src/main/java/org/opentripplanner/model/plan/Itinerary.java
index cb14227e83d..dee80addd91 100644
--- a/src/main/java/org/opentripplanner/model/plan/Itinerary.java
+++ b/src/main/java/org/opentripplanner/model/plan/Itinerary.java
@@ -177,11 +177,6 @@ public Leg lastLeg() {
     return getLegs().get(getLegs().size() - 1);
   }
 
-  /** Get the first transit leg if one exist */
-  public Optional firstTransitLeg() {
-    return getLegs().stream().filter(TransitLeg.class::isInstance).findFirst();
-  }
-
   /**
    * An itinerary can be flagged for removal with a system notice.
    * 
              
@@ -225,105 +220,6 @@ public Itinerary withTimeShiftToStartAt(ZonedDateTime afterTime) {
     return newItin;
   }
 
-  /** @see #equals(Object) */
-  @Override
-  public final int hashCode() {
-    return super.hashCode();
-  }
-
-  /**
-   * Return {@code true} it the other object is the same object using the {@link
-   * Object#equals(Object)}. An itinerary is a temporary object and the equals method should not be
-   * used for comparision of 2 instances, only to check that to objects are the same instance.
-   */
-  @Override
-  public final boolean equals(Object o) {
-    return super.equals(o);
-  }
-
-  /**
-   * Used to convert a list of itineraries to a SHORT human-readable string.
-   *
-   * @see #toStr()
-   * 
              
-   * It is great for comparing lists of itineraries in a test: {@code
-   * assertEquals(toStr(List.of(it1)), toStr(result))}.
-   */
-  public static String toStr(List list) {
-    return list.stream().map(Itinerary::toStr).collect(Collectors.joining(", "));
-  }
-
-  @Override
-  public String toString() {
-    return ToStringBuilder
-      .of(Itinerary.class)
-      .addStr("from", firstLeg().getFrom().toStringShort())
-      .addStr("to", lastLeg().getTo().toStringShort())
-      .addTime("start", firstLeg().getStartTime())
-      .addTime("end", lastLeg().getEndTime())
-      .addNum("nTransfers", numberOfTransfers)
-      .addDuration("duration", duration)
-      .addDuration("nonTransitTime", nonTransitDuration)
-      .addDuration("transitTime", transitDuration)
-      .addDuration("waitingTime", waitingDuration)
-      .addNum("generalizedCost", generalizedCost, UNKNOWN)
-      .addNum("generalizedCost2", generalizedCost2)
-      .addNum("waitTimeOptimizedCost", waitTimeOptimizedCost, UNKNOWN)
-      .addNum("transferPriorityCost", transferPriorityCost, UNKNOWN)
-      .addNum("nonTransitDistance", nonTransitDistanceMeters, "m")
-      .addBool("tooSloped", tooSloped)
-      .addNum("elevationLost", elevationLost, 0.0)
-      .addNum("elevationGained", elevationGained, 0.0)
-      .addCol("legs", legs)
-      .addObj("fare", fare)
-      .addObj("emissionsPerPerson", emissionsPerPerson)
-      .toString();
-  }
-
-  /**
-   * Used to convert an itinerary to a SHORT human readable string - including just a few of the
-   * most important fields. It is much shorter and easier to read then the {@link
-   * Itinerary#toString()}.
-   * 
              
-   * It is great for comparing to itineraries in a test: {@code assertEquals(toStr(it1),
-   * toStr(it2))}.
-   * 
              
-   * Example: {@code A ~ Walk 2m ~ B ~ BUS 55 12:04 12:14 ~ C [cost: 1066]}
-   * 
              
-   * Reads: Start at A, walk 2 minutes to stop B, take bus 55, board at 12:04 and alight at 12:14
-   * ...
-   */
-  public String toStr() {
-    // No translater needed, stop indexes are never passed to the builder
-    PathStringBuilder buf = new PathStringBuilder(null);
-    buf.stop(firstLeg().getFrom().name.toString());
-
-    for (Leg leg : legs) {
-      if (leg.isWalkingLeg()) {
-        buf.walk((int) leg.getDuration().toSeconds());
-      } else if (leg instanceof TransitLeg transitLeg) {
-        buf.transit(
-          transitLeg.getMode().name(),
-          transitLeg.getTrip().logName(),
-          transitLeg.getStartTime(),
-          transitLeg.getEndTime()
-        );
-      } else if (leg instanceof StreetLeg streetLeg) {
-        buf.street(streetLeg.getMode().name(), leg.getStartTime(), leg.getEndTime());
-      }
-      buf.stop(leg.getTo().name.toString());
-    }
-
-    // The generalizedCost2 is printed as is, it is a special cost and the scale depends on the
-    // use-case.
-    buf.summary(
-      RaptorCostConverter.toRaptorCost(generalizedCost),
-      getGeneralizedCost2().orElse(RaptorConstants.NOT_SET)
-    );
-
-    return buf.toString();
-  }
-
   /** Total duration of the itinerary in seconds */
   public Duration getDuration() {
     return duration;
@@ -698,6 +594,105 @@ public Duration walkDuration() {
     return walkDuration;
   }
 
+  /** @see #equals(Object) */
+  @Override
+  public final int hashCode() {
+    return super.hashCode();
+  }
+
+  /**
+   * Return {@code true} it the other object is the same object using the {@link
+   * Object#equals(Object)}. An itinerary is a temporary object and the equals method should not be
+   * used for comparision of 2 instances, only to check that to objects are the same instance.
+   */
+  @Override
+  public final boolean equals(Object o) {
+    return super.equals(o);
+  }
+
+  @Override
+  public String toString() {
+    return ToStringBuilder
+      .of(Itinerary.class)
+      .addStr("from", firstLeg().getFrom().toStringShort())
+      .addStr("to", lastLeg().getTo().toStringShort())
+      .addTime("start", firstLeg().getStartTime())
+      .addTime("end", lastLeg().getEndTime())
+      .addNum("nTransfers", numberOfTransfers)
+      .addDuration("duration", duration)
+      .addDuration("nonTransitTime", nonTransitDuration)
+      .addDuration("transitTime", transitDuration)
+      .addDuration("waitingTime", waitingDuration)
+      .addNum("generalizedCost", generalizedCost, UNKNOWN)
+      .addNum("generalizedCost2", generalizedCost2)
+      .addNum("waitTimeOptimizedCost", waitTimeOptimizedCost, UNKNOWN)
+      .addNum("transferPriorityCost", transferPriorityCost, UNKNOWN)
+      .addNum("nonTransitDistance", nonTransitDistanceMeters, "m")
+      .addBool("tooSloped", tooSloped)
+      .addNum("elevationLost", elevationLost, 0.0)
+      .addNum("elevationGained", elevationGained, 0.0)
+      .addCol("legs", legs)
+      .addObj("fare", fare)
+      .addObj("emissionsPerPerson", emissionsPerPerson)
+      .toString();
+  }
+
+  /**
+   * Used to convert a list of itineraries to a SHORT human-readable string.
+   *
+   * @see #toStr()
+   * 
              
+   * It is great for comparing lists of itineraries in a test: {@code
+   * assertEquals(toStr(List.of(it1)), toStr(result))}.
+   */
+  public static String toStr(List list) {
+    return list.stream().map(Itinerary::toStr).collect(Collectors.joining(", "));
+  }
+
+  /**
+   * Used to convert an itinerary to a SHORT human readable string - including just a few of the
+   * most important fields. It is much shorter and easier to read then the {@link
+   * Itinerary#toString()}.
+   * 
              
+   * It is great for comparing to itineraries in a test: {@code assertEquals(toStr(it1),
+   * toStr(it2))}.
+   * 
              
+   * Example: {@code A ~ Walk 2m ~ B ~ BUS 55 12:04 12:14 ~ C [cost: 1066]}
+   * 
              
+   * Reads: Start at A, walk 2 minutes to stop B, take bus 55, board at 12:04 and alight at 12:14
+   * ...
+   */
+  public String toStr() {
+    // No translater needed, stop indexes are never passed to the builder
+    PathStringBuilder buf = new PathStringBuilder(null);
+    buf.stop(firstLeg().getFrom().name.toString());
+
+    for (Leg leg : legs) {
+      if (leg.isWalkingLeg()) {
+        buf.walk((int) leg.getDuration().toSeconds());
+      } else if (leg instanceof TransitLeg transitLeg) {
+        buf.transit(
+          transitLeg.getMode().name(),
+          transitLeg.getTrip().logName(),
+          transitLeg.getStartTime(),
+          transitLeg.getEndTime()
+        );
+      } else if (leg instanceof StreetLeg streetLeg) {
+        buf.street(streetLeg.getMode().name(), leg.getStartTime(), leg.getEndTime());
+      }
+      buf.stop(leg.getTo().name.toString());
+    }
+
+    // The generalizedCost2 is printed as is, it is a special cost and the scale depends on the
+    // use-case.
+    buf.summary(
+      RaptorCostConverter.toRaptorCost(generalizedCost),
+      getGeneralizedCost2().orElse(RaptorConstants.NOT_SET)
+    );
+
+    return buf.toString();
+  }
+
   private static int penaltyCost(TimeAndCost penalty) {
     return penalty.cost().toSeconds();
   }
diff --git a/src/main/java/org/opentripplanner/model/plan/Leg.java b/src/main/java/org/opentripplanner/model/plan/Leg.java
index 1ee72761d66..2a0b6726560 100644
--- a/src/main/java/org/opentripplanner/model/plan/Leg.java
+++ b/src/main/java/org/opentripplanner/model/plan/Leg.java
@@ -184,6 +184,7 @@ default Route getRoute() {
   /**
    * For transit legs, the trip. For non-transit legs, null.
    */
+  @Nullable
   default Trip getTrip() {
     return null;
   }

From cefcc05f3fbeb2ed4e27bd9b77a9a398a0743688 Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 01:44:11 +0200
Subject: [PATCH 1546/1688] feature: Add c2 for street itineraries if
 transit-group-priority is used

---
 ...ransitGroupPriorityItineraryDecorator.java | 49 +++++++++++++++++++
 .../routing/algorithm/RoutingWorker.java      |  4 ++
 .../TransitGroupPriorityService.java          | 10 ++++
 .../network/grouppriority/TripAdapter.java    | 34 +++++++++++++
 4 files changed, 97 insertions(+)
 create mode 100644 src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java
 create mode 100644 src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java

diff --git a/src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java b/src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java
new file mode 100644
index 00000000000..80b7b39bd0c
--- /dev/null
+++ b/src/main/java/org/opentripplanner/model/plan/grouppriority/TransitGroupPriorityItineraryDecorator.java
@@ -0,0 +1,49 @@
+package org.opentripplanner.model.plan.grouppriority;
+
+import java.util.Collection;
+import org.opentripplanner.model.plan.Itinerary;
+import org.opentripplanner.model.plan.Leg;
+import org.opentripplanner.raptor.api.request.RaptorTransitGroupPriorityCalculator;
+import org.opentripplanner.transit.model.network.grouppriority.DefaultTransitGroupPriorityCalculator;
+import org.opentripplanner.transit.model.network.grouppriority.TransitGroupPriorityService;
+
+/**
+ * This class will set the {@link Itinerary#getGeneralizedCost2()} value if the feature is
+ * enabled and no such value is set. The AStar router does not produce itineraries with this,
+ * so we decorate itineraries with this here to make sure the `c2` is set correct and can be
+ * used in the itinerary-filter-chain.
+ */
+public class TransitGroupPriorityItineraryDecorator {
+
+  private final TransitGroupPriorityService priorityGroupConfigurator;
+  private final RaptorTransitGroupPriorityCalculator transitGroupCalculator;
+
+  public TransitGroupPriorityItineraryDecorator(
+    TransitGroupPriorityService priorityGroupConfigurator
+  ) {
+    this.priorityGroupConfigurator = priorityGroupConfigurator;
+    this.transitGroupCalculator = new DefaultTransitGroupPriorityCalculator();
+  }
+
+  public void decorate(Collection itineraries) {
+    if (!priorityGroupConfigurator.isEnabled()) {
+      return;
+    }
+    for (Itinerary it : itineraries) {
+      decorate(it);
+    }
+  }
+
+  public void decorate(Itinerary itinerary) {
+    if (itinerary.getGeneralizedCost2().isEmpty() && priorityGroupConfigurator.isEnabled()) {
+      int c2 = priorityGroupConfigurator.baseGroupId();
+      for (Leg leg : itinerary.getLegs()) {
+        if (leg.getTrip() != null) {
+          int newGroupId = priorityGroupConfigurator.lookupTransitGroupPriorityId(leg.getTrip());
+          c2 = transitGroupCalculator.mergeGroupIds(c2, newGroupId);
+        }
+      }
+      itinerary.setGeneralizedCost2(c2);
+    }
+  }
+}
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
index a6218e1720a..7ac3dd1caf6 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/RoutingWorker.java
@@ -16,6 +16,7 @@
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
 import org.opentripplanner.framework.time.ServiceDateUtils;
 import org.opentripplanner.model.plan.Itinerary;
+import org.opentripplanner.model.plan.grouppriority.TransitGroupPriorityItineraryDecorator;
 import org.opentripplanner.model.plan.paging.cursor.PageCursorInput;
 import org.opentripplanner.raptor.api.request.RaptorTuningParameters;
 import org.opentripplanner.raptor.api.request.SearchParams;
@@ -130,6 +131,9 @@ public RoutingResponse route() {
       routeTransit(itineraries, routingErrors);
     }
 
+    // Set C2 value for Street and FLEX if transit-group-priority is used
+    new TransitGroupPriorityItineraryDecorator(transitGroupPriorityService).decorate(itineraries);
+
     debugTimingAggregator.finishedRouting();
 
     // Filter itineraries
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
index dab40533dba..048b2279a88 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityService.java
@@ -12,6 +12,7 @@
 import org.opentripplanner.routing.api.request.request.filter.TransitGroupSelect;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.TripPattern;
+import org.opentripplanner.transit.model.timetable.Trip;
 
 /**
  * This class dynamically builds an index of transit-group-ids from the provided
@@ -108,6 +109,15 @@ public int lookupTransitGroupPriorityId(TripPattern tripPattern) {
       : lookupTransitGroupPriorityId(new TripPatternAdapter(tripPattern));
   }
 
+  /**
+   * Fetch/lookup the transit-group-id for the given trip.
+   * 
              
+   * @throws IllegalArgumentException if more than 32 group-ids are requested.
+   */
+  public int lookupTransitGroupPriorityId(Trip trip) {
+    return trip == null ? baseGroupId : lookupTransitGroupPriorityId(new TripAdapter(trip));
+  }
+
   /**
    * Fetch/lookup the transit-group-id for the given entity.
    * 
              
diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java
new file mode 100644
index 00000000000..7ff1d158e62
--- /dev/null
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapter.java
@@ -0,0 +1,34 @@
+package org.opentripplanner.transit.model.network.grouppriority;
+
+import org.opentripplanner.transit.model.basic.TransitMode;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+import org.opentripplanner.transit.model.timetable.Trip;
+
+class TripAdapter implements EntityAdapter {
+
+  private final Trip trip;
+
+  public TripAdapter(Trip trip) {
+    this.trip = trip;
+  }
+
+  @Override
+  public TransitMode mode() {
+    return trip.getMode();
+  }
+
+  @Override
+  public String subMode() {
+    return trip.getNetexSubMode().name();
+  }
+
+  @Override
+  public FeedScopedId agencyId() {
+    return trip.getRoute().getAgency().getId();
+  }
+
+  @Override
+  public FeedScopedId routeId() {
+    return trip.getRoute().getId();
+  }
+}

From de7c6989662343fd777a7c67a5ac754f2101d0dc Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Thu, 4 Jul 2024 00:01:58 +0200
Subject: [PATCH 1547/1688] test: Add missing tests to
 o.o.transit.model.network.grouppriority

---
 .../model/network/grouppriority/Matchers.java | 32 ++++++++++-------
 .../network/grouppriority/MatchersTest.java   |  8 +++++
 .../TransitGroupPriorityServiceTest.java      | 21 +++++++++---
 .../grouppriority/TripAdapterTest.java        | 34 +++++++++++++++++++
 4 files changed, 78 insertions(+), 17 deletions(-)
 create mode 100644 src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java

diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
index 6a22ea2172f..7e1e7e6853a 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/Matchers.java
@@ -29,19 +29,9 @@
  */
 final class Matchers {
 
-  private static final Matcher NOOP = new Matcher() {
-    @Override
-    public boolean match(EntityAdapter entity) {
-      return false;
-    }
+  private static final Matcher NOOP = new EmptyMatcher();
 
-    @Override
-    public boolean isEmpty() {
-      return true;
-    }
-  };
-
-  public static Matcher of(TransitGroupSelect select) {
+  static Matcher of(TransitGroupSelect select) {
     if (select.isEmpty()) {
       return NOOP;
     }
@@ -92,6 +82,24 @@ private static Matcher andOf(List list) {
     return new AndMatcher(list);
   }
 
+  private static final class EmptyMatcher implements Matcher {
+
+    @Override
+    public boolean match(EntityAdapter entity) {
+      return false;
+    }
+
+    @Override
+    public boolean isEmpty() {
+      return true;
+    }
+
+    @Override
+    public String toString() {
+      return "Empty";
+    }
+  }
+
   private static final class ModeMatcher implements Matcher {
 
     private final Set modes;
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
index 36901214d5b..cdda3755d37 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/MatchersTest.java
@@ -32,6 +32,14 @@ class MatchersTest {
   private final FeedScopedId r1routeId = rail1.routeId();
   private final FeedScopedId anyId = new FeedScopedId("F", "ANY");
 
+  @Test
+  void testEmptySelect() {
+    var m = Matchers.of(TransitGroupSelect.of().build());
+    assertEquals("Empty", m.toString());
+    assertTrue(m.isEmpty());
+    assertFalse(m.match(bus));
+  }
+
   @Test
   void testMode() {
     var m = Matchers.of(
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
index 4ef17d7ce04..993eb14c424 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
@@ -12,6 +12,7 @@
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.RegularStop;
+import org.opentripplanner.transit.model.timetable.Trip;
 
 class TransitGroupPriorityServiceTest {
 
@@ -66,14 +67,15 @@ class TransitGroupPriorityServiceTest {
   private final TripPattern railR3 = routeR3.getTripPattern();
   private final TripPattern ferryF3 = routeF3.getTripPattern();
   private final TripPattern busB3 = routeB3.getTripPattern();
-  private final TripPattern nullValue = null;
+  private final TripPattern nullTripPattern = null;
+  private final Trip nullTrip = null;
 
   @Test
   void emptyConfigurationShouldReturnGroupZero() {
-    var subject = new TransitGroupPriorityService(List.of(), List.of());
+    var subject = TransitGroupPriorityService.empty();
     assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(railR1));
     assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(busB2));
-    assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(nullValue));
+    assertEquals(subject.baseGroupId(), subject.lookupTransitGroupPriorityId(nullTripPattern));
   }
 
   @Test
@@ -87,12 +89,17 @@ void lookupTransitGroupIdByAgency() {
     var subject = new TransitGroupPriorityService(List.of(select), List.of());
 
     // Agency groups are indexed (group-id set) at request time
-    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullValue));
+    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTripPattern));
     assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2));
     assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3));
     assertEquals(EXP_GROUP_3, subject.lookupTransitGroupPriorityId(railR1));
     assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(busB3));
     assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(ferryF3));
+
+    // Verify we get the same result with using the trip, not trip-pattern
+    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTrip));
+    assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2.getTrip(0)));
+    assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3.getTrip(0)));
   }
 
   @Test
@@ -106,12 +113,16 @@ void lookupTransitPriorityGroupIdByGlobalMode() {
       )
     );
 
-    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullValue));
+    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTripPattern));
     assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR1));
     assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2));
     assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3));
     assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB3));
     assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(ferryF3));
+
+    // Verify we get the same result with using the trip, not trip-pattern
+    assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTrip));
+    assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR1.getTrip(0)));
   }
 
   private static TestRouteData route(
diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java
new file mode 100644
index 00000000000..c1aeeea1a59
--- /dev/null
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TripAdapterTest.java
@@ -0,0 +1,34 @@
+package org.opentripplanner.transit.model.network.grouppriority;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.transit.model._data.TransitModelForTest;
+import org.opentripplanner.transit.model.timetable.Trip;
+
+class TripAdapterTest {
+
+  private final Trip trip = TransitModelForTest.trip("Trip").build();
+
+  private final TripAdapter subject = new TripAdapter(trip);
+
+  @Test
+  void mode() {
+    assertEquals(trip.getMode(), subject.mode());
+  }
+
+  @Test
+  void subMode() {
+    assertEquals(trip.getNetexSubMode().name(), subject.subMode());
+  }
+
+  @Test
+  void agencyId() {
+    assertEquals(trip.getRoute().getAgency().getId(), subject.agencyId());
+  }
+
+  @Test
+  void routeId() {
+    assertEquals(trip.getRoute().getId(), subject.routeId());
+  }
+}

From b64b08af2b6c0ee79189c6e571daf2be7dc79c3e Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 4 Jul 2024 12:50:04 +0300
Subject: [PATCH 1548/1688] Add and update GraphQL integration tests

---
 .../apis/gtfs/GraphQLIntegrationTest.java     | 34 ++++++++++++-------
 .../TestFreeFloatingRentalVehicleBuilder.java | 24 +++++++++++++
 .../TestVehicleRentalStationBuilder.java      | 24 +++++++++++++
 .../apis/gtfs/expectations/nearest.json       | 14 ++++++++
 .../gtfs/expectations/rental-vehicle.json     | 21 ++++++++++++
 .../expectations/vehicle-rental-station.json  |  5 ++-
 .../apis/gtfs/queries/nearest.graphql         | 14 +++++++-
 .../apis/gtfs/queries/rental-vehicle.graphql  | 23 +++++++++++++
 .../queries/vehicle-rental-station.graphql    |  3 ++
 9 files changed, 148 insertions(+), 14 deletions(-)
 create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
 create mode 100644 src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index c73a607b594..6b74db2c20d 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -73,8 +73,10 @@
 import org.opentripplanner.service.realtimevehicles.internal.DefaultRealtimeVehicleService;
 import org.opentripplanner.service.realtimevehicles.model.RealtimeVehicle;
 import org.opentripplanner.service.vehiclerental.internal.DefaultVehicleRentalService;
+import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder;
 import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle;
 import org.opentripplanner.standalone.config.framework.json.JsonSupport;
 import org.opentripplanner.test.support.FilePatternSource;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
@@ -112,6 +114,18 @@ class GraphQLIntegrationTest {
     .map(p -> (RegularStop) p.stop)
     .toList();
 
+  private static VehicleRentalStation VEHICLE_RENTAL_STATION = new TestVehicleRentalStationBuilder()
+    .withVehicles(10)
+    .withSpaces(10)
+    .withVehicleTypeBicycle(5, 7)
+    .withVehicleTypeElectricBicycle(5, 3)
+    .withSystem("system-1", "https://foo.bar")
+    .build();
+
+  private static VehicleRentalVehicle RENTAL_VEHICLE = new TestFreeFloatingRentalVehicleBuilder()
+    .withSystem("system-1", "https://foo.bar")
+    .build();
+
   static final Graph GRAPH = new Graph();
 
   static final Instant ALERT_START_TIME = OffsetDateTime
@@ -280,13 +294,8 @@ public TransitAlertService getTransitAlertService() {
     realtimeVehicleService.setRealtimeVehicles(pattern, List.of(occypancyVehicle, positionVehicle));
 
     DefaultVehicleRentalService defaultVehicleRentalService = new DefaultVehicleRentalService();
-    VehicleRentalStation vehicleRentalStation = new TestVehicleRentalStationBuilder()
-      .withVehicles(10)
-      .withSpaces(10)
-      .withVehicleTypeBicycle(5, 7)
-      .withVehicleTypeElectricBicycle(5, 3)
-      .build();
-    defaultVehicleRentalService.addVehicleRentalStation(vehicleRentalStation);
+    defaultVehicleRentalService.addVehicleRentalStation(VEHICLE_RENTAL_STATION);
+    defaultVehicleRentalService.addVehicleRentalStation(RENTAL_VEHICLE);
 
     context =
       new GraphQLRequestContext(
@@ -451,11 +460,12 @@ public List findClosestPlaces(
       List filterByNetwork,
       TransitService transitService
     ) {
-      return List
-        .of(TransitModelForTest.of().stop("A").build())
-        .stream()
-        .map(stop -> new PlaceAtDistance(stop, 0))
-        .toList();
+      var stop = TransitModelForTest.of().stop("A").build();
+      return List.of(
+        new PlaceAtDistance(stop, 0),
+        new PlaceAtDistance(VEHICLE_RENTAL_STATION, 30),
+        new PlaceAtDistance(RENTAL_VEHICLE, 50)
+      );
     }
   };
 }
diff --git a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
index 4864fab5e43..c3837942426 100644
--- a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
+++ b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestFreeFloatingRentalVehicleBuilder.java
@@ -13,6 +13,7 @@ public class TestFreeFloatingRentalVehicleBuilder {
 
   private double latitude = DEFAULT_LATITUDE;
   private double longitude = DEFAULT_LONGITUDE;
+  private VehicleRentalSystem system = null;
 
   private RentalVehicleType vehicleType = RentalVehicleType.getDefaultType(NETWORK_1);
 
@@ -30,6 +31,28 @@ public TestFreeFloatingRentalVehicleBuilder withLongitude(double longitude) {
     return this;
   }
 
+  public TestFreeFloatingRentalVehicleBuilder withSystem(String id, String url) {
+    this.system =
+      new VehicleRentalSystem(
+        id,
+        null,
+        null,
+        null,
+        null,
+        url,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      );
+    return this;
+  }
+
   public TestFreeFloatingRentalVehicleBuilder withVehicleScooter() {
     return buildVehicleType(RentalFormFactor.SCOOTER);
   }
@@ -63,6 +86,7 @@ public VehicleRentalVehicle build() {
     vehicle.latitude = latitude;
     vehicle.longitude = longitude;
     vehicle.vehicleType = vehicleType;
+    vehicle.system = system;
     return vehicle;
   }
 }
diff --git a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
index 33f922ff0b9..0fb9f8b620f 100644
--- a/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
+++ b/src/test/java/org/opentripplanner/service/vehiclerental/model/TestVehicleRentalStationBuilder.java
@@ -19,6 +19,7 @@ public class TestVehicleRentalStationBuilder {
   private int spaces = 10;
   private boolean overloadingAllowed = false;
   private boolean stationOn = false;
+  private VehicleRentalSystem system = null;
   private final Map vehicleTypesAvailable = new HashMap<>();
   private final Map vehicleSpacesAvailable = new HashMap<>();
 
@@ -52,6 +53,28 @@ public TestVehicleRentalStationBuilder withStationOn(boolean stationOn) {
     return this;
   }
 
+  public TestVehicleRentalStationBuilder withSystem(String id, String url) {
+    this.system =
+      new VehicleRentalSystem(
+        id,
+        null,
+        null,
+        null,
+        null,
+        url,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      );
+    return this;
+  }
+
   public TestVehicleRentalStationBuilder withVehicleTypeBicycle(int numAvailable, int numSpaces) {
     return buildVehicleType(
       RentalFormFactor.BICYCLE,
@@ -127,6 +150,7 @@ public VehicleRentalStation build() {
     station.isRenting = stationOn;
     station.isReturning = stationOn;
     station.realTimeData = true;
+    station.system = system;
     return station;
   }
 }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
index 82d929adeb1..b6b5b7ee674 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/nearest.json
@@ -10,6 +10,20 @@
               "parentStation" : null
             }
           }
+        },
+        {
+          "node" : {
+            "place" : {
+              "stationId" : "Network-1:FooStation"
+            }
+          }
+        },
+        {
+          "node" : {
+            "place" : {
+              "vehicleId" : "Network-1:free-floating-bicycle"
+            }
+          }
         }
       ]
     }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
new file mode 100644
index 00000000000..800366f4e2c
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
@@ -0,0 +1,21 @@
+{
+  "data": {
+    "rentalVehicle": {
+      "vehicleId":"Network-1:free-floating-bicycle",
+      "name":"free-floating-bicycle",
+      "allowPickupNow":true,
+      "network":"Network-1",
+      "lon":19.01,
+      "lat":47.52,
+      "rentalUris":null,
+      "operative":true,
+      "vehicleType": {
+        "formFactor":"BICYCLE",
+        "propulsionType":"HUMAN"
+      },
+      "vehicleRentalSystem": {
+        "url":"https://foo.bar"
+      }
+    }
+  }
+}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
index ef1284c5c5e..4981b44f7e7 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
@@ -53,7 +53,10 @@
       "capacity" : null,
       "allowOverloading" : false,
       "rentalUris" : null,
-      "operative" : false
+      "operative" : false,
+      "vehicleRentalSystem" : {
+        "url" : "https://foo.bar"
+      }
     }
   }
 }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
index c7f8eed4213..469a117bab4 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/nearest.graphql
@@ -1,5 +1,11 @@
 {
-  nearest(lat: 60.19915, lon: 24.94089, maxDistance: 500) {
+  nearest(
+    lat: 60.19915
+    lon: 24.94089
+    maxDistance: 500
+    filterByPlaceTypes: [STOP, VEHICLE_RENT]
+    filterByNetwork: ["Network-1"]
+  ) {
     edges {
       node {
         place {
@@ -10,6 +16,12 @@
               id
             }
           }
+          ... on RentalVehicle {
+            vehicleId
+          }
+          ... on VehicleRentalStation {
+            stationId
+          }
         }
       }
     }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
new file mode 100644
index 00000000000..859051e0c24
--- /dev/null
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
@@ -0,0 +1,23 @@
+{
+  rentalVehicle(id: "Network-1:free-floating-bicycle") {
+    vehicleId
+    name
+    allowPickupNow
+    network
+    lon
+    lat
+    rentalUris {
+      android
+      ios
+      web
+    }
+    operative
+    vehicleType {
+      formFactor
+      propulsionType
+    }
+    vehicleRentalSystem {
+      url
+    }
+  }
+}
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
index 8e555ffdbdd..f0c5d221dd2 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
@@ -39,5 +39,8 @@
       web
     }
     operative
+    vehicleRentalSystem {
+      url
+    }
   }
 }

From 64788299559072ef179c9ffe8597e563ef7e43d0 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 12:31:03 +0200
Subject: [PATCH 1549/1688] Apply suggestions from code review

Co-authored-by: Andrew Byrd 
---
 .../config/routerequest/RouteRequestConfig.java      | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
index 9286e519acd..4bde66bd467 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
@@ -207,10 +207,10 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil
                 """
 This time slack is added to arrival time of the vehicle before any transfer or onward travel.
 
-The sole reason for this is to avoid missed connections when there are minor schedule variations. This
-parameter is intended to be set by agencies not individual users. In general it is better to use
-`boardSlack` - see its documentation for details. However, for specific modes, like airplane and
+This time slack helps model potential delays or procedures a passenger experiences during the process of passing through the alighting location. This
+parameter is intended to be set by agencies not individual users. For specific modes, like airplane and
 subway, that need more time than others, this is also configurable per mode with `alightSlackForMode`.
+A related parameter (transferSlack) exists to help avoid missed connections when there are minor schedule variations.
 """
               )
               .asDuration(dft.alightSlack().defaultValue())
@@ -238,10 +238,10 @@ private static void mapTransitPreferences(NodeAdapter c, TransitPreferences.Buil
               .summary("The time safety margin when boarding a vehicle.")
               .description(
                 """
-The board slack is added to the passenger's arrival time at a stop before boarding evaluating which
+The board slack is added to the passenger's arrival time at a stop, before evaluating which
 vehicles can be boarded.
-
-The sole reason for this is to avoid missed connections when there are minor schedule variations. This
+This time slack helps model potential delays or procedures a passenger experiences during the process of passing through the boarding location, as well as some minor schedule variation.
+A related parameter (transferSlack) also helps avoid missed connections when there are minor schedule variations. This
 parameter is intended to be set by agencies not individual users. For specific modes, like airplane and
 subway, that need more time than others, this is also configurable per mode with `boardSlackForMode`.
 

From 9ee2076adfe78141787b83256c5d7ab0f3f0f038 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 13:13:03 +0200
Subject: [PATCH 1550/1688] Update slack documentation

---
 docs/RouteRequest.md                          | 27 +++++++++++--------
 .../routerequest/RouteRequestConfig.java      | 21 +++++++++------
 .../config/routerequest/TransferConfig.java   |  2 +-
 3 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md
index 2401c378513..14d937eeb63 100644
--- a/docs/RouteRequest.md
+++ b/docs/RouteRequest.md
@@ -196,10 +196,10 @@ The time safety margin when alighting from a vehicle.
 
 This time slack is added to arrival time of the vehicle before any transfer or onward travel.
 
-The sole reason for this is to avoid missed connections when there are minor schedule variations. This
-parameter is intended to be set by agencies not individual users. In general it is better to use
-`boardSlack` - see its documentation for details. However, for specific modes, like airplane and
+This time slack helps model potential delays or procedures a passenger experiences during the process of passing through the alighting location. This
+parameter is intended to be set by agencies not individual users. For specific modes, like airplane and
 subway, that need more time than others, this is also configurable per mode with `alightSlackForMode`.
+A related parameter (transferSlack) exists to help avoid missed connections when there are minor schedule variations.
 
 
 
              boardSlack
              
@@ -209,17 +209,22 @@ subway, that need more time than others, this is also configurable per mode with
 
 The time safety margin when boarding a vehicle.
 
-The board slack is added to the passenger's arrival time at a stop before boarding evaluating which
+The board slack is added to the passenger's arrival time at a stop, before evaluating which
 vehicles can be boarded.
 
-The sole reason for this is to avoid missed connections when there are minor schedule variations. This
-parameter is intended to be set by agencies not individual users. For specific modes, like airplane and
-subway, that need more time than others, this is also configurable per mode with `boardSlackForMode`.
+This time slack helps model potential delays or procedures a passenger experiences during the process
+of passing through the boarding location, as well as some minor schedule variation. This parameter is
+intended to be set by agencies not individual users.
 
 Agencies can use this parameter to ensure that the trip planner does not instruct passengers to arrive
-at the last second.
-This slack is added at every boarding including the first vehicle and transfers except for in-seat
-transfers and guaranteed transfers.
+at the last second. This slack is added at every boarding including the first vehicle and transfers
+except for in-seat transfers and guaranteed transfers.
+
+For specific modes, like airplane and subway, that need more time than others, this is also
+configurable per mode with `boardSlackForMode`.
+
+A related parameter (transferSlack) also helps avoid missed connections when there are minor schedule
+variations.
 
 
 
              drivingDirection
              
@@ -373,7 +378,7 @@ wise. We recommend allowing the end-user to set this, and use `board-/alight-sla
 agency policies. This time is in addition to how long it might take to walk, board and alight.
 
 It is useful for passengers on long distance travel, and people with mobility issues, but can be set
-close to zero for everyday commuters and short distance searches in high transit frequency areas.
+close to zero for everyday commuters and short distance searches in high-frequency transit areas.
 
 
 
              unpreferredCost
              
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
index 4bde66bd467..6fa33aac267 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
@@ -240,15 +240,20 @@ A related parameter (transferSlack) exists to help avoid missed connections when
                 """
 The board slack is added to the passenger's arrival time at a stop, before evaluating which
 vehicles can be boarded.
-This time slack helps model potential delays or procedures a passenger experiences during the process of passing through the boarding location, as well as some minor schedule variation.
-A related parameter (transferSlack) also helps avoid missed connections when there are minor schedule variations. This
-parameter is intended to be set by agencies not individual users. For specific modes, like airplane and
-subway, that need more time than others, this is also configurable per mode with `boardSlackForMode`.
 
-Agencies can use this parameter to ensure that the trip planner does not instruct passengers to arrive 
-at the last second.
-This slack is added at every boarding including the first vehicle and transfers except for in-seat 
-transfers and guaranteed transfers. 
+This time slack helps model potential delays or procedures a passenger experiences during the process
+of passing through the boarding location, as well as some minor schedule variation. This parameter is
+intended to be set by agencies not individual users.
+
+Agencies can use this parameter to ensure that the trip planner does not instruct passengers to arrive
+at the last second. This slack is added at every boarding including the first vehicle and transfers
+except for in-seat transfers and guaranteed transfers.
+
+For specific modes, like airplane and subway, that need more time than others, this is also
+configurable per mode with `boardSlackForMode`.
+
+A related parameter (transferSlack) also helps avoid missed connections when there are minor schedule
+variations.
 """
               )
               .asDuration(dft.boardSlack().defaultValue())
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
index 990d7402776..99b051e7941 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/TransferConfig.java
@@ -45,7 +45,7 @@ static void mapTransferPreferences(NodeAdapter c, TransferPreferences.Builder tx
             agency policies. This time is in addition to how long it might take to walk, board and alight.
             
             It is useful for passengers on long distance travel, and people with mobility issues, but can be set
-            close to zero for everyday commuters and short distance searches in high transit frequency areas.
+            close to zero for everyday commuters and short distance searches in high-frequency transit areas.
             """
           )
           .asDurationOrSeconds(dft.slack())

From 468bb838f71f622367e1b3c3ae02ee199387a7fd Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 13:27:14 +0200
Subject: [PATCH 1551/1688] Add Javadoc

---
 .../apis/transmodel/mapping/TripRequestMapperTest.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java
index b204c8a419e..42e4607a8b6 100644
--- a/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/transmodel/mapping/TripRequestMapperTest.java
@@ -402,9 +402,14 @@ public void testExplicitModes() {
     assertEquals(StreetMode.WALK, req.journey().transfer().mode());
   }
 
+  /**
+   * This tests that both the new parameter name 'transferSlack` and the deprecated one
+   * 'minimumTransferTime' (for backwards compatibility) are correctly mapped to the internal
+   * transfer slack as a duration.
+   */
   @ParameterizedTest
   @ValueSource(strings = { "transferSlack", "minimumTransferTime" })
-  public void testTransferSlack(String name) {
+  public void testBackwardsCompatibleTransferSlack(String name) {
     Map arguments = Map.of(name, 101);
     var req = TripRequestMapper.createRequest(executionContext(arguments));
     assertEquals(Duration.ofSeconds(101), req.preferences().transfer().slack());

From 9a3edc14362465b75b1f792718808a07f9c27f6c Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Thu, 4 Jul 2024 14:53:45 +0300
Subject: [PATCH 1552/1688] Add place finder tests for rental

---
 .../PlaceFinderTraverseVisitor.java           |  2 +-
 .../PlaceFinderTraverseVisitorTest.java       | 71 +++++++++++++++++++
 .../street/search/state/TestStateBuilder.java | 14 ++++
 3 files changed, 86 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
index 41b8ea6cbc4..16420a0d9eb 100644
--- a/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
+++ b/src/main/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitor.java
@@ -31,6 +31,7 @@ public class PlaceFinderTraverseVisitor implements TraverseVisitor
   private final Set filterByStops;
   private final Set filterByStations;
   private final Set filterByRoutes;
+  private final Set filterByNetwork;
   private final Set filterByVehicleRental;
   private final Set seenPatternAtStops = new HashSet<>();
   private final Set seenStops = new HashSet<>();
@@ -44,7 +45,6 @@ public class PlaceFinderTraverseVisitor implements TraverseVisitor
   private final boolean includeStations;
   private final int maxResults;
   private final double radiusMeters;
-  private final Set filterByNetwork;
 
   /**
    * @param transitService             A TransitService used in finding information about the
diff --git a/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java b/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
index 0796176d9bb..b69a6533334 100644
--- a/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
+++ b/src/test/java/org/opentripplanner/routing/graphfinder/PlaceFinderTraverseVisitorTest.java
@@ -13,6 +13,7 @@
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.model.StopTime;
+import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder;
 import org.opentripplanner.street.search.state.TestStateBuilder;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 import org.opentripplanner.transit.model.basic.TransitMode;
@@ -280,4 +281,74 @@ void stopsAndStationsWithStopAndStationFilter() {
 
     visitor.visitVertex(state1);
   }
+
+  @Test
+  void rentalStation() {
+    var visitor = new PlaceFinderTraverseVisitor(
+      transitService,
+      null,
+      List.of(PlaceType.VEHICLE_RENT),
+      null,
+      null,
+      null,
+      null,
+      null,
+      1,
+      500
+    );
+    var station = new TestVehicleRentalStationBuilder().build();
+    assertEquals(List.of(), visitor.placesFound);
+    var state1 = TestStateBuilder.ofWalking().rentalStation(station).build();
+    visitor.visitVertex(state1);
+
+    var res = visitor.placesFound.stream().map(PlaceAtDistance::place).toList();
+
+    assertEquals(List.of(station), res);
+  }
+
+  @Test
+  void rentalStationWithNetworksFilter() {
+    var visitor = new PlaceFinderTraverseVisitor(
+      transitService,
+      null,
+      List.of(PlaceType.VEHICLE_RENT),
+      null,
+      null,
+      null,
+      null,
+      List.of("Network-1"),
+      1,
+      500
+    );
+    var station = new TestVehicleRentalStationBuilder().build();
+    assertEquals(List.of(), visitor.placesFound);
+    var state1 = TestStateBuilder.ofWalking().rentalStation(station).build();
+    visitor.visitVertex(state1);
+
+    var res = visitor.placesFound.stream().map(PlaceAtDistance::place).toList();
+
+    assertEquals(List.of(station), res);
+
+    visitor =
+      new PlaceFinderTraverseVisitor(
+        transitService,
+        null,
+        List.of(PlaceType.VEHICLE_RENT),
+        null,
+        null,
+        null,
+        null,
+        List.of("Network-2"),
+        1,
+        500
+      );
+
+    assertEquals(List.of(), visitor.placesFound);
+    state1 = TestStateBuilder.ofWalking().rentalStation(station).build();
+    visitor.visitVertex(state1);
+
+    res = visitor.placesFound.stream().map(PlaceAtDistance::place).toList();
+
+    assertEquals(List.of(), res);
+  }
 }
diff --git a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
index e43c5a769d0..3750c4619b9 100644
--- a/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
+++ b/src/test/java/org/opentripplanner/street/search/state/TestStateBuilder.java
@@ -16,6 +16,7 @@
 import org.opentripplanner.service.vehiclerental.model.TestFreeFloatingRentalVehicleBuilder;
 import org.opentripplanner.service.vehiclerental.model.TestVehicleRentalStationBuilder;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
 import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink;
 import org.opentripplanner.service.vehiclerental.street.VehicleRentalEdge;
 import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
@@ -219,6 +220,19 @@ public TestStateBuilder stop() {
     return arriveAtStop(testModel.stop("stop", count, count).build());
   }
 
+  /**
+   * Add a state that arrives at a rental station.
+   */
+  public TestStateBuilder rentalStation(VehicleRentalStation station) {
+    count++;
+    var from = (StreetVertex) currentState.vertex;
+    var to = new VehicleRentalPlaceVertex(station);
+
+    var link = StreetVehicleRentalLink.createStreetVehicleRentalLink(from, to);
+    currentState = link.traverse(currentState)[0];
+    return this;
+  }
+
   public TestStateBuilder enterStation(String id) {
     count++;
     var from = (StreetVertex) currentState.vertex;

From b46b160000d0a17ea0fc3d42088cac2082628643 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Thu, 4 Jul 2024 14:36:24 +0200
Subject: [PATCH 1553/1688] Fix duration parsing error handling

---
 .../LinearFunctionSerialization.java          | 29 +++++++++++++++----
 1 file changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java b/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java
index bccad0568c5..cb9dfb5c4cc 100644
--- a/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java
+++ b/src/main/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerialization.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.routing.api.request.framework;
 
 import java.time.Duration;
+import java.time.format.DateTimeParseException;
 import java.util.Locale;
 import java.util.Optional;
 import java.util.function.BiFunction;
@@ -39,6 +40,8 @@ public class LinearFunctionSerialization {
     String.join(SEP, DUR, PLUS, NUM, VARIABLE)
   );
 
+  private static final Pattern DECIMAL_NUMBER_PATTERN = Pattern.compile("\\d+(\\.\\d+)?");
+
   private LinearFunctionSerialization() {}
 
   /**
@@ -61,11 +64,7 @@ public static  Optional parse(String text, BiFunction
       var coefficient = Double.parseDouble(coefficientText);
       coefficient = Units.normalizedFactor(coefficient, 0.0, 100.0);
 
-      // Unfortunately, to be backwards compatible we need to support decimal numbers.
-      // If a decimal number, then the value is converted to seconds
-      var constant = constantText.matches("\\d+(\\.\\d+)?")
-        ? Duration.ofSeconds(IntUtils.round(Double.parseDouble(constantText)))
-        : DurationUtils.duration(constantText);
+      var constant = parseDecimalSecondsOrDuration(constantText);
 
       return Optional.of(factory.apply(constant, coefficient));
     }
@@ -85,4 +84,24 @@ public static String serialize(Duration constant, double coefficient) {
       Units.factorToString(coefficient)
     );
   }
+
+  /**
+   * Parse a String as a Duration.
+   * Unfortunately, to be backwards compatible we need to support decimal numbers.
+   * If the text represents a decimal number, then the value is converted to seconds.
+   * 
              
+   * The parsing function {@link DurationUtils#parseSecondsOrDuration(String)} cannot be used
+   * here since it supports only integer seconds, not decimal seconds.
+   *
+   */
+  private static Duration parseDecimalSecondsOrDuration(String text) {
+    try {
+      if (DECIMAL_NUMBER_PATTERN.matcher(text).matches()) {
+        return Duration.ofSeconds(IntUtils.round(Double.parseDouble(text)));
+      }
+      return DurationUtils.duration(text);
+    } catch (DateTimeParseException e) {
+      throw new IllegalArgumentException("Unable to parse duration: '" + text + "'");
+    }
+  }
 }

From 361ff9130c759254e98a2091c80dd312795c68d2 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 16:28:27 +0200
Subject: [PATCH 1554/1688] Move helper code into utils

---
 .../apis/gtfs/datafetchers/QueryTypeImpl.java                | 4 ++--
 .../opentripplanner/apis/gtfs/datafetchers/RouteImpl.java    | 4 ++--
 .../time/LocalDateRangeUtil.java}                            | 4 ++--
 .../apis/gtfs/mapping/LocalDateRangeMapperTest.java          | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)
 rename src/main/java/org/opentripplanner/apis/gtfs/{mapping/LocalDateRangeMapper.java => support/time/LocalDateRangeUtil.java} (86%)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
index b22310d1da3..d0963361d11 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/QueryTypeImpl.java
@@ -31,9 +31,9 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLQueryTypeStopsByRadiusArgs;
-import org.opentripplanner.apis.gtfs.mapping.LocalDateRangeMapper;
 import org.opentripplanner.apis.gtfs.mapping.routerequest.LegacyRouteRequestMapper;
 import org.opentripplanner.apis.gtfs.mapping.routerequest.RouteRequestMapper;
+import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil;
 import org.opentripplanner.ext.fares.impl.DefaultFareService;
 import org.opentripplanner.ext.fares.impl.GtfsFaresService;
 import org.opentripplanner.ext.fares.model.FareRuleSet;
@@ -612,7 +612,7 @@ public DataFetcher> routes() {
           );
       }
 
-      if (LocalDateRangeMapper.hasServiceDateFilter(args.getGraphQLServiceDates())) {
+      if (LocalDateRangeUtil.hasServiceDateFilter(args.getGraphQLServiceDates())) {
         var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService);
         routeStream = filter.filterRoutes(routeStream).stream();
       }
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
index 921f85ff813..a3f557951f0 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RouteImpl.java
@@ -15,7 +15,7 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLBikesAllowed;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes.GraphQLTransitMode;
 import org.opentripplanner.apis.gtfs.mapping.BikesAllowedMapper;
-import org.opentripplanner.apis.gtfs.mapping.LocalDateRangeMapper;
+import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil;
 import org.opentripplanner.routing.alertpatch.EntitySelector;
 import org.opentripplanner.routing.alertpatch.TransitAlert;
 import org.opentripplanner.routing.services.TransitAlertService;
@@ -182,7 +182,7 @@ public DataFetcher> patterns() {
 
       var args = new GraphQLTypes.GraphQLRoutePatternsArgs(environment.getArguments());
 
-      if (LocalDateRangeMapper.hasServiceDateFilter(args.getGraphQLServiceDates())) {
+      if (LocalDateRangeUtil.hasServiceDateFilter(args.getGraphQLServiceDates())) {
         var filter = new PatternByServiceDatesFilter(args.getGraphQLServiceDates(), transitService);
         return filter.filterPatterns(patterns);
       } else {
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapper.java b/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java
similarity index 86%
rename from src/main/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapper.java
rename to src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java
index 56064ea37dc..b4545f10658 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapper.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/support/time/LocalDateRangeUtil.java
@@ -1,9 +1,9 @@
-package org.opentripplanner.apis.gtfs.mapping;
+package org.opentripplanner.apis.gtfs.support.time;
 
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
 import org.opentripplanner.apis.gtfs.model.LocalDateRange;
 
-public class LocalDateRangeMapper {
+public class LocalDateRangeUtil {
 
   /**
    * Checks if a service date filter input has at least one filter set. If both start and end are
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
index eba38c0a180..81b3b283151 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
@@ -10,6 +10,7 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.apis.gtfs.generated.GraphQLTypes;
+import org.opentripplanner.apis.gtfs.support.time.LocalDateRangeUtil;
 
 class LocalDateRangeMapperTest {
 
@@ -25,7 +26,7 @@ public static List noFilterCases() {
   @ParameterizedTest
   @MethodSource("noFilterCases")
   void hasNoServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput input) {
-    assertFalse(LocalDateRangeMapper.hasServiceDateFilter(input));
+    assertFalse(LocalDateRangeUtil.hasServiceDateFilter(input));
   }
 
   public static List> hasFilterCases() {
@@ -36,6 +37,6 @@ public static List> hasFilterCases() {
   @MethodSource("hasFilterCases")
   void hasServiceDateFilter(Map params) {
     var input = new GraphQLTypes.GraphQLLocalDateRangeInput(params);
-    assertTrue(LocalDateRangeMapper.hasServiceDateFilter(input));
+    assertTrue(LocalDateRangeUtil.hasServiceDateFilter(input));
   }
 }

From e955e832e0e2af6d12889971152a4931bb07684a Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Thu, 4 Jul 2024 14:51:37 +0000
Subject: [PATCH 1555/1688] Add changelog entry for #5943 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 756f677579f..dd32b0a2548 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -38,6 +38,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Update Google Pubsub updater configuration [#5927](https://github.com/opentripplanner/OpenTripPlanner/pull/5927)
 - Make new debug client the default, move old one to `classic-debug` [#5924](https://github.com/opentripplanner/OpenTripPlanner/pull/5924)
 - Require valid polygons for AreaStop [#5915](https://github.com/opentripplanner/OpenTripPlanner/pull/5915)
+- Fix NullPointerException in stop transfer priority cost vector generation [#5943](https://github.com/opentripplanner/OpenTripPlanner/pull/5943)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 36760322b2bf45ee539a6f525ba69d82290470a7 Mon Sep 17 00:00:00 2001
From: OTP Serialization Version Bot
 
Date: Thu, 4 Jul 2024 14:52:04 +0000
Subject: [PATCH 1556/1688] Bump serialization version id for #5943

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0816cd6962c..cb738fee822 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 
     
-        152
+        153
         
         31.2
         2.51.1

From 4c5d1ea319a34d603f877e44cd222600b1853894 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 5 Jul 2024 09:26:23 +0200
Subject: [PATCH 1557/1688] Added unit test

---
 .../framework/LinearFunctionSerializationTest.java  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java b/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java
index e1785db61b1..46ef4b50e77 100644
--- a/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java
+++ b/src/test/java/org/opentripplanner/routing/api/request/framework/LinearFunctionSerializationTest.java
@@ -36,6 +36,8 @@ static Stream parseTestCases() {
            3h + 5.111 t   ||       3h  |   5.1
             7m + 10.1 x   ||       7m  |  10.0
           PT7s + 10.1 x   ||       7s  |  10.0
+          0.1 + 10.1 x   ||       0s  |  10.0
+          0.5 + 10.1 x   ||       1s  |  10.0
         """
     );
   }
@@ -53,7 +55,7 @@ void parseTest(String input, String expectedConstant, double expectedCoefficient
   }
 
   @Test
-  void parseEmtpy() {
+  void parseEmpty() {
     assertEquals(Optional.empty(), LinearFunctionSerialization.parse(null, fail()));
     assertEquals(Optional.empty(), LinearFunctionSerialization.parse("", fail()));
     assertEquals(Optional.empty(), LinearFunctionSerialization.parse(" \r\n", fail()));
@@ -77,6 +79,15 @@ void parseIllegalArgument() {
     assertEquals("Unable to parse function: 'foo'", ex.getMessage());
   }
 
+  @Test
+  void parseIllegalDuration() {
+    var ex = assertThrows(
+      IllegalArgumentException.class,
+      () -> LinearFunctionSerialization.parse("600ss + 1.3 t", fail())
+    );
+    assertEquals("Unable to parse duration: '600ss'", ex.getMessage());
+  }
+
   private static BiFunction fail() {
     return (a, b) -> Assertions.fail("Factory method called, not expected!");
   }

From 13e2caf9d3eb670dbbeec6b7568f3bb14b29cba9 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 5 Jul 2024 10:14:10 +0200
Subject: [PATCH 1558/1688] Add French case study [ci skip]

---
 docs/Presentations.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/Presentations.md b/docs/Presentations.md
index 4313346801f..ad44be751f5 100644
--- a/docs/Presentations.md
+++ b/docs/Presentations.md
@@ -11,3 +11,6 @@
 
 ## Presentations in German
 * [ÖPNV und Fahrgemeinschaften intermodal mit dem OpenTripPlanner. FOSSGIS 2019. Holger Bruch. March, 2019](https://www.youtube.com/watch?v=XUiqEdnXEfo)
+
+## Case studies and reports
+* [Case study by the French MOT about a national OTP instance](https://blog.transport.data.gouv.fr/images/rapport-otp-complet-2024-03-14.pdf)
\ No newline at end of file

From babd0fa23d1abcbe549a6ec1e16fbe5196f98e50 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 5 Jul 2024 11:02:40 +0200
Subject: [PATCH 1559/1688] Disable Legacy REST API by default

---
 docs/Configuration.md                                           | 2 +-
 .../org/opentripplanner/framework/application/OTPFeature.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/Configuration.md b/docs/Configuration.md
index 05611e23628..a4e8b5100a4 100644
--- a/docs/Configuration.md
+++ b/docs/Configuration.md
@@ -241,7 +241,7 @@ Here is a list of all features which can be toggled on/off and their default val
 | `FaresV2`                                  | Enable import of GTFS-Fares v2 data.                                                                                                                                                                                                                                                                             |                    |    ✓️   |
 | `FlexRouting`                              | Enable FLEX routing.                                                                                                                                                                                                                                                                                             |                    |    ✓️   |
 | `GoogleCloudStorage`                       | Enable Google Cloud Storage integration.                                                                                                                                                                                                                                                                         |                    |    ✓️   |
-| `LegacyRestApi`                            | Enable legacy REST API. This API will be removed in the future.                                                                                                                                                                                                                                                  |         ✓️         |    ✓️   |
+| `LegacyRestApi`                            | Enable legacy REST API. This API will be removed in the future.                                                                                                                                                                                                                                                  |                    |    ✓️   |
 | `RealtimeResolver`                         | When routing with ignoreRealtimeUpdates=true, add an extra step which populates results with real-time data                                                                                                                                                                                                      |                    |    ✓️   |
 | `ReportApi`                                | Enable the report API.                                                                                                                                                                                                                                                                                           |                    |    ✓️   |
 | `RestAPIPassInDefaultConfigAsJson`         | Enable a default RouteRequest to be passed in as JSON on the REST API - FOR DEBUGGING ONLY!                                                                                                                                                                                                                      |                    |         |
diff --git a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
index 29489de19f2..8ee5d100b94 100644
--- a/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
+++ b/src/main/java/org/opentripplanner/framework/application/OTPFeature.java
@@ -89,7 +89,7 @@ public enum OTPFeature {
   FaresV2(false, true, "Enable import of GTFS-Fares v2 data."),
   FlexRouting(false, true, "Enable FLEX routing."),
   GoogleCloudStorage(false, true, "Enable Google Cloud Storage integration."),
-  LegacyRestApi(true, true, "Enable legacy REST API. This API will be removed in the future."),
+  LegacyRestApi(false, true, "Enable legacy REST API. This API will be removed in the future."),
   RealtimeResolver(
     false,
     true,

From 66dedbb9435b2ab65f7c472a7f0633ebbf412d05 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Mon, 1 Jul 2024 09:34:59 +0200
Subject: [PATCH 1560/1688] Fix copy-on-write in TimetableSnapshot

---
 .../model/TimetableSnapshot.java              | 61 ++++++++++++-------
 1 file changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index 5c018412572..0b6655e2ec4 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.model;
 
 import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.SetMultimap;
 import java.time.LocalDate;
 import java.util.Collection;
@@ -186,25 +187,7 @@ public Result update(
     Timetable tt = resolve(pattern, serviceDate);
     // we need to perform the copy of Timetable here rather than in Timetable.update()
     // to avoid repeatedly copying in case several updates are applied to the same timetable
-    if (!dirtyTimetables.contains(tt)) {
-      Timetable old = tt;
-      tt = new Timetable(tt, serviceDate);
-      SortedSet sortedTimetables = timetables.get(pattern);
-      if (sortedTimetables == null) {
-        sortedTimetables = new TreeSet<>(new SortedTimetableComparator());
-      } else {
-        SortedSet temp = new TreeSet<>(new SortedTimetableComparator());
-        temp.addAll(sortedTimetables);
-        sortedTimetables = temp;
-      }
-      if (old.getServiceDate() != null) {
-        sortedTimetables.remove(old);
-      }
-      sortedTimetables.add(tt);
-      timetables.put(pattern, sortedTimetables);
-      dirtyTimetables.add(tt);
-      dirty = true;
-    }
+    tt = copyTimetable(pattern, serviceDate, tt);
 
     // Assume all trips in a pattern are from the same feed, which should be the case.
     // Find trip index
@@ -330,10 +313,11 @@ public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate s
         }
 
         if (tripTimesToRemove != null) {
-          for (Timetable sortedTimetable : sortedTimetables) {
-            boolean isDirty = sortedTimetable.getTripTimes().remove(tripTimesToRemove);
+          for (Timetable originalTimetable : sortedTimetables) {
+            boolean isDirty = originalTimetable.getTripTimes().contains(tripTimesToRemove);
             if (isDirty) {
-              dirtyTimetables.add(sortedTimetable);
+              Timetable updatedTimetable = copyTimetable(pattern, serviceDate, originalTimetable);
+              updatedTimetable.getTripTimes().remove(tripTimesToRemove);
             }
           }
         }
@@ -455,6 +439,39 @@ private void addPatternToIndex(TripPattern tripPattern) {
     }
   }
 
+  /**
+   * Make a copy of the given timetable for a given pattern and service date.
+   * If the timetable was already copied-on write in this snapshot, the same instance will be
+   * returned. The SortedSet that holds the collection of Timetables for that pattern
+   * (sorted by service date) is shared between multiple snapshots and must be copied as well.
              
+   * Note on performance: if  multiple Timetables are modified in a SortedSet, the SortedSet will be
+   * copied multiple times. The impact on memory/garbage collection is assumed to be minimal
+   * since the collection is small.
+   * The SortedSet is made immutable to prevent change after snapshot publication.
+   */
+  private Timetable copyTimetable(TripPattern pattern, LocalDate serviceDate, Timetable tt) {
+    if (!dirtyTimetables.contains(tt)) {
+      Timetable old = tt;
+      tt = new Timetable(tt, serviceDate);
+      SortedSet sortedTimetables = timetables.get(pattern);
+      if (sortedTimetables == null) {
+        sortedTimetables = new TreeSet<>(new SortedTimetableComparator());
+      } else {
+        SortedSet temp = new TreeSet<>(new SortedTimetableComparator());
+        temp.addAll(sortedTimetables);
+        sortedTimetables = temp;
+      }
+      if (old.getServiceDate() != null) {
+        sortedTimetables.remove(old);
+      }
+      sortedTimetables.add(tt);
+      timetables.put(pattern, ImmutableSortedSet.copyOfSorted(sortedTimetables));
+      dirtyTimetables.add(tt);
+      dirty = true;
+    }
+    return tt;
+  }
+
   protected static class SortedTimetableComparator implements Comparator {
 
     @Override

From 7ab29bcc8922828a1386fcce3c621320aff2e28f Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 5 Jul 2024 15:34:41 +0300
Subject: [PATCH 1561/1688] Call system network in schema and move network id
 there

---
 .../apis/gtfs/GtfsGraphQLIndex.java           |  4 +--
 .../gtfs/datafetchers/RentalVehicleImpl.java  |  2 +-
 ...mpl.java => VehicleRentalNetworkImpl.java} |  7 +++-
 .../VehicleRentalStationImpl.java             |  2 +-
 .../gtfs/generated/GraphQLDataFetchers.java   | 23 ++++++++-----
 .../apis/gtfs/generated/GraphQLTypes.java     | 20 ++++++------
 .../apis/gtfs/generated/graphql-codegen.yml   |  2 +-
 .../opentripplanner/apis/gtfs/schema.graphqls | 32 ++++++++++++-------
 .../apis/gtfs/GraphQLIntegrationTest.java     |  4 +--
 .../gtfs/expectations/rental-vehicle.json     |  4 +--
 .../expectations/vehicle-rental-station.json  |  4 +--
 .../apis/gtfs/queries/rental-vehicle.graphql  |  4 +--
 .../queries/vehicle-rental-station.graphql    |  4 +--
 13 files changed, 67 insertions(+), 45 deletions(-)
 rename src/main/java/org/opentripplanner/apis/gtfs/datafetchers/{VehicleRentalSystemImpl.java => VehicleRentalNetworkImpl.java} (70%)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
index 833dd96a907..ca059723acd 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/GtfsGraphQLIndex.java
@@ -75,8 +75,8 @@
 import org.opentripplanner.apis.gtfs.datafetchers.UnknownImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.VehicleParkingImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.VehiclePositionImpl;
+import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalNetworkImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalStationImpl;
-import org.opentripplanner.apis.gtfs.datafetchers.VehicleRentalSystemImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.debugOutputImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.elevationProfileComponentImpl;
 import org.opentripplanner.apis.gtfs.datafetchers.placeAtDistanceImpl;
@@ -167,7 +167,7 @@ protected static GraphQLSchema buildSchema() {
         .type(typeWiring.build(BookingTimeImpl.class))
         .type(typeWiring.build(BookingInfoImpl.class))
         .type(typeWiring.build(VehicleRentalStationImpl.class))
-        .type(typeWiring.build(VehicleRentalSystemImpl.class))
+        .type(typeWiring.build(VehicleRentalNetworkImpl.class))
         .type(typeWiring.build(RentalVehicleImpl.class))
         .type(typeWiring.build(RentalVehicleTypeImpl.class))
         .type(typeWiring.build(StopOnRouteImpl.class))
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java
index 1449c44e315..c4fb92c0ef4 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/RentalVehicleImpl.java
@@ -63,7 +63,7 @@ public DataFetcher vehicleType() {
   }
 
   @Override
-  public DataFetcher vehicleRentalSystem() {
+  public DataFetcher rentalNetwork() {
     return environment -> getSource(environment).getVehicleRentalSystem();
   }
 
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalNetworkImpl.java
similarity index 70%
rename from src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java
rename to src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalNetworkImpl.java
index 7256ab5aaa3..75f771eed83 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalSystemImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalNetworkImpl.java
@@ -5,7 +5,12 @@
 import org.opentripplanner.apis.gtfs.generated.GraphQLDataFetchers;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
 
-public class VehicleRentalSystemImpl implements GraphQLDataFetchers.GraphQLVehicleRentalSystem {
+public class VehicleRentalNetworkImpl implements GraphQLDataFetchers.GraphQLVehicleRentalNetwork {
+
+  @Override
+  public DataFetcher networkId() {
+    return environment -> getSource(environment).systemId;
+  }
 
   @Override
   public DataFetcher url() {
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java
index 117061b988e..0603d19e412 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/datafetchers/VehicleRentalStationImpl.java
@@ -109,7 +109,7 @@ public DataFetcher availableSpaces() {
   }
 
   @Override
-  public DataFetcher vehicleRentalSystem() {
+  public DataFetcher rentalNetwork() {
     return environment -> getSource(environment).getVehicleRentalSystem();
   }
 
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
index be74354e284..67944543580 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLDataFetchers.java
@@ -853,13 +853,13 @@ public interface GraphQLRentalVehicle {
 
     public DataFetcher operative();
 
+    public DataFetcher rentalNetwork();
+
     public DataFetcher rentalUris();
 
     public DataFetcher vehicleId();
 
     public DataFetcher vehicleType();
-
-    DataFetcher vehicleRentalSystem();
   }
 
   public interface GraphQLRentalVehicleEntityCounts {
@@ -1269,6 +1269,17 @@ public interface GraphQLVehiclePosition {
     public DataFetcher vehicleId();
   }
 
+  /**
+   * Vehicle rental network, which is referred as system in the GBFS terminology. Note, the same operator can operate in multiple
+   * regions either with the same network/system or with a different one. This can contain information about either the rental brand
+   * or about the operator.
+   */
+  public interface GraphQLVehicleRentalNetwork {
+    public DataFetcher networkId();
+
+    public DataFetcher url();
+  }
+
   /** Vehicle rental station represents a location where users can rent bicycles etc. for a fee. */
   public interface GraphQLVehicleRentalStation {
     public DataFetcher allowDropoff();
@@ -1301,9 +1312,9 @@ public interface GraphQLVehicleRentalStation {
 
     public DataFetcher realtime();
 
-    public DataFetcher rentalUris();
+    public DataFetcher rentalNetwork();
 
-    public DataFetcher vehicleRentalSystem();
+    public DataFetcher rentalUris();
 
     public DataFetcher spacesAvailable();
 
@@ -1312,10 +1323,6 @@ public interface GraphQLVehicleRentalStation {
     public DataFetcher vehiclesAvailable();
   }
 
-  public interface GraphQLVehicleRentalSystem {
-    public DataFetcher url();
-  }
-
   public interface GraphQLVehicleRentalUris {
     public DataFetcher android();
 
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
index b191cc0830b..541219481ef 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/GraphQLTypes.java
@@ -2409,6 +2409,7 @@ public static class GraphQLQueryTypeNearestArgs {
     private String before;
     private GraphQLInputFiltersInput filterByIds;
     private List filterByModes;
+    private List filterByNetwork;
     private List filterByPlaceTypes;
     private Integer first;
     private Integer last;
@@ -2416,7 +2417,6 @@ public static class GraphQLQueryTypeNearestArgs {
     private Double lon;
     private Integer maxDistance;
     private Integer maxResults;
-    private List filterByNetwork;
 
     public GraphQLQueryTypeNearestArgs(Map args) {
       if (args != null) {
@@ -2431,6 +2431,7 @@ public GraphQLQueryTypeNearestArgs(Map args) {
               .map(GraphQLMode.class::cast)
               .collect(Collectors.toList());
         }
+        this.filterByNetwork = (List) args.get("filterByNetwork");
         if (args.get("filterByPlaceTypes") != null) {
           this.filterByPlaceTypes =
             ((List) args.get("filterByPlaceTypes")).stream()
@@ -2448,7 +2449,6 @@ public GraphQLQueryTypeNearestArgs(Map args) {
         this.lon = (Double) args.get("lon");
         this.maxDistance = (Integer) args.get("maxDistance");
         this.maxResults = (Integer) args.get("maxResults");
-        this.filterByNetwork = (List) args.get("filterByNetwork");
       }
     }
 
@@ -2468,6 +2468,10 @@ public List getGraphQLFilterByModes() {
       return this.filterByModes;
     }
 
+    public List getGraphQLFilterByNetwork() {
+      return this.filterByNetwork;
+    }
+
     public List getGraphQLFilterByPlaceTypes() {
       return this.filterByPlaceTypes;
     }
@@ -2512,6 +2516,10 @@ public void setGraphQLFilterByModes(List filterByModes) {
       this.filterByModes = filterByModes;
     }
 
+    public void setGraphQLFilterByNetwork(List filterByNetwork) {
+      this.filterByNetwork = filterByNetwork;
+    }
+
     public void setGraphQLFilterByPlaceTypes(List filterByPlaceTypes) {
       this.filterByPlaceTypes = filterByPlaceTypes;
     }
@@ -2539,14 +2547,6 @@ public void setGraphQLMaxDistance(Integer maxDistance) {
     public void setGraphQLMaxResults(Integer maxResults) {
       this.maxResults = maxResults;
     }
-
-    public List getGraphQLFilterByNetwork() {
-      return this.filterByNetwork;
-    }
-
-    public void setGraphQLFilterByNetwork(List networks) {
-      this.filterByNetwork = networks;
-    }
   }
 
   public static class GraphQLQueryTypeNodeArgs {
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
index 6e5cbf7bd71..b9ee0ac3e16 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
+++ b/src/main/java/org/opentripplanner/apis/gtfs/generated/graphql-codegen.yml
@@ -47,7 +47,7 @@ config:
     BikeRentalStation: org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace#VehicleRentalPlace
     BikeRentalStationUris: org.opentripplanner.service.vehiclerental.model.VehicleRentalStationUris#VehicleRentalStationUris
     VehicleRentalStation: org.opentripplanner.service.vehiclerental.model.VehicleRentalStation#VehicleRentalStation
-    VehicleRentalSystem: org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem#VehicleRentalSystem
+    VehicleRentalNetwork: org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem#VehicleRentalSystem
     RentalVehicleEntityCounts: org.opentripplanner.service.vehiclerental.model.RentalVehicleEntityCounts#RentalVehicleEntityCounts
     RentalVehicleTypeCount: org.opentripplanner.service.vehiclerental.model.RentalVehicleTypeCount#RentalVehicleTypeCount
     RentalVehicle: org.opentripplanner.service.vehiclerental.model.VehicleRentalVehicle#VehicleRentalVehicle
diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 02900c6f2ee..6de46739182 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -1741,15 +1741,15 @@ type RentalVehicle implements Node & PlaceInterface {
   "Name of the vehicle"
   name: String!
   "ID of the rental network."
-  network: String
+  network: String @deprecated(reason : "Use `networkId` from `rentalNetwork` instead.")
   "If true, vehicle is not disabled."
   operative: Boolean
+  "The vehicle rental network information. This is referred as system in the GBFS terminology."
+  rentalNetwork: VehicleRentalNetwork!
   "Platform-specific URLs to begin the vehicle."
   rentalUris: VehicleRentalUris
   "ID of the vehicle in the format of network:id"
   vehicleId: String
-  "The vehicle rental system information."
-  vehicleRentalSystem: VehicleRentalSystem
   "The type of the rental vehicle (scooter, bicycle, car...)"
   vehicleType: RentalVehicleType
 }
@@ -2417,6 +2417,21 @@ type VehiclePosition {
   vehicleId: String
 }
 
+"""
+Vehicle rental network, which is referred as system in the GBFS terminology. Note, the same operator can operate in multiple
+regions either with the same network/system or with a different one. This can contain information about either the rental brand
+or about the operator.
+"""
+type VehicleRentalNetwork {
+  """
+  ID of the vehicle rental network. In GBFS, this is the `system_id` field from the system information, but it can
+  be overridden in the configuration to have a different value so this field doesn't necessarily match the source data.
+  """
+  networkId: String!
+  "The rental vehicle operator's network/system URL. In GBFS, this is the `url` field from the system information."
+  url: String
+}
+
 "Vehicle rental station represents a location where users can rent bicycles etc. for a fee."
 type VehicleRentalStation implements Node & PlaceInterface {
   """
@@ -2447,7 +2462,7 @@ type VehicleRentalStation implements Node & PlaceInterface {
   "Name of the vehicle rental station"
   name: String!
   "ID of the rental network."
-  network: String
+  network: String @deprecated(reason : "Use `networkId` from `rentalNetwork` instead.")
   "If true, station is on and in service."
   operative: Boolean
   """
@@ -2456,6 +2471,8 @@ type VehicleRentalStation implements Node & PlaceInterface {
   are always the total capacity divided by two.
   """
   realtime: Boolean
+  "The vehicle rental network information. This is referred as system in the GBFS terminology."
+  rentalNetwork: VehicleRentalNetwork!
   "Platform-specific URLs to begin renting a vehicle from this station."
   rentalUris: VehicleRentalUris
   """
@@ -2468,8 +2485,6 @@ type VehicleRentalStation implements Node & PlaceInterface {
   spacesAvailable: Int @deprecated(reason : "Use `availableSpaces` instead, which also contains the space vehicle types")
   "ID of the vehicle in the format of network:id"
   stationId: String
-  "The vehicle rental system information."
-  vehicleRentalSystem: VehicleRentalSystem
   """
   Number of vehicles currently available on the rental station.
   See field `allowPickupNow` to know if is currently possible to pick up a vehicle.
@@ -2477,11 +2492,6 @@ type VehicleRentalStation implements Node & PlaceInterface {
   vehiclesAvailable: Int @deprecated(reason : "Use `availableVehicles` instead, which also contains vehicle types")
 }
 
-type VehicleRentalSystem {
-  "The rental vehicle operator's system URL."
-  url: String
-}
-
 type VehicleRentalUris {
   """
   A URI that can be passed to an Android app with an {@code android.intent.action.VIEW} Android
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index 6b74db2c20d..2fb7a8d9db2 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -119,11 +119,11 @@ class GraphQLIntegrationTest {
     .withSpaces(10)
     .withVehicleTypeBicycle(5, 7)
     .withVehicleTypeElectricBicycle(5, 3)
-    .withSystem("system-1", "https://foo.bar")
+    .withSystem("Network-1", "https://foo.bar")
     .build();
 
   private static VehicleRentalVehicle RENTAL_VEHICLE = new TestFreeFloatingRentalVehicleBuilder()
-    .withSystem("system-1", "https://foo.bar")
+    .withSystem("Network-1", "https://foo.bar")
     .build();
 
   static final Graph GRAPH = new Graph();
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
index 800366f4e2c..9017fe77a93 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/rental-vehicle.json
@@ -4,7 +4,6 @@
       "vehicleId":"Network-1:free-floating-bicycle",
       "name":"free-floating-bicycle",
       "allowPickupNow":true,
-      "network":"Network-1",
       "lon":19.01,
       "lat":47.52,
       "rentalUris":null,
@@ -13,7 +12,8 @@
         "formFactor":"BICYCLE",
         "propulsionType":"HUMAN"
       },
-      "vehicleRentalSystem": {
+      "rentalNetwork": {
+        "networkId":"Network-1",
         "url":"https://foo.bar"
       }
     }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
index 4981b44f7e7..ad1ce76d9be 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/expectations/vehicle-rental-station.json
@@ -47,14 +47,14 @@
       "allowPickup" : false,
       "allowDropoffNow" : false,
       "allowPickupNow" : false,
-      "network" : "Network-1",
       "lon" : 18.99,
       "lat" : 47.51,
       "capacity" : null,
       "allowOverloading" : false,
       "rentalUris" : null,
       "operative" : false,
-      "vehicleRentalSystem" : {
+      "rentalNetwork" : {
+        "networkId" : "Network-1",
         "url" : "https://foo.bar"
       }
     }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
index 859051e0c24..9a912781c56 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/rental-vehicle.graphql
@@ -3,7 +3,6 @@
     vehicleId
     name
     allowPickupNow
-    network
     lon
     lat
     rentalUris {
@@ -16,7 +15,8 @@
       formFactor
       propulsionType
     }
-    vehicleRentalSystem {
+    rentalNetwork {
+      networkId
       url
     }
   }
diff --git a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
index f0c5d221dd2..a2200465912 100644
--- a/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
+++ b/src/test/resources/org/opentripplanner/apis/gtfs/queries/vehicle-rental-station.graphql
@@ -28,7 +28,6 @@
     allowPickup
     allowDropoffNow
     allowPickupNow
-    network
     lon
     lat
     capacity
@@ -39,7 +38,8 @@
       web
     }
     operative
-    vehicleRentalSystem {
+    rentalNetwork {
+      networkId
       url
     }
   }

From 3eaa5d071b05fe495ef680b37da7ff5a4964eff7 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 5 Jul 2024 16:51:08 +0300
Subject: [PATCH 1562/1688] Add system to smoove stations

---
 .../SmooveBikeRentalDataSource.java           | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
index 3876ff44651..1f287ad950b 100644
--- a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
+++ b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
@@ -8,6 +8,7 @@
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalPlace;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
+import org.opentripplanner.service.vehiclerental.model.VehicleRentalSystem;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.updater.spi.DataSource;
 import org.opentripplanner.updater.spi.GenericJsonDataSource;
@@ -32,6 +33,7 @@ public class SmooveBikeRentalDataSource
 
   private final String networkName;
   private final RentalVehicleType vehicleType;
+  private final VehicleRentalSystem system;
 
   public SmooveBikeRentalDataSource(SmooveBikeRentalDataSourceParameters config) {
     this(config, new OtpHttpClientFactory());
@@ -45,6 +47,24 @@ public SmooveBikeRentalDataSource(
     networkName = config.getNetwork(DEFAULT_NETWORK_NAME);
     vehicleType = RentalVehicleType.getDefaultType(networkName);
     overloadingAllowed = config.overloadingAllowed();
+    system =
+      new VehicleRentalSystem(
+        networkName,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        null
+      );
   }
 
   /**
@@ -94,6 +114,7 @@ protected VehicleRentalStation parseElement(JsonNode node) {
     station.vehicleTypesAvailable = Map.of(vehicleType, station.vehiclesAvailable);
     station.vehicleSpacesAvailable = Map.of(vehicleType, station.spacesAvailable);
     station.overloadingAllowed = overloadingAllowed;
+    station.system = system;
     return station;
   }
 }

From b9a0c82cb3e6929c94f172c98cfd4459ed47229e Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Fri, 5 Jul 2024 17:11:39 +0300
Subject: [PATCH 1563/1688] Add more required fields to smoove system

---
 .../ext/smoovebikerental/SmooveBikeRentalDataSource.java    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
index 1f287ad950b..b65c22b4727 100644
--- a/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
+++ b/src/ext/java/org/opentripplanner/ext/smoovebikerental/SmooveBikeRentalDataSource.java
@@ -50,6 +50,8 @@ public SmooveBikeRentalDataSource(
     system =
       new VehicleRentalSystem(
         networkName,
+        "fi",
+        "Helsinki/Espoo",
         null,
         null,
         null,
@@ -58,9 +60,7 @@ public SmooveBikeRentalDataSource(
         null,
         null,
         null,
-        null,
-        null,
-        null,
+        "Europe/Helsinki",
         null,
         null,
         null

From 364d33e1f45f1ab065b2c5efb30e2ab6e10d05ac Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Fri, 5 Jul 2024 17:04:39 +0200
Subject: [PATCH 1564/1688] Update
 src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java

Co-authored-by: Leonard Ehrenfried 
---
 .../transit/model/network/grouppriority/EntityAdapter.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
index c6802562283..760da3d87ca 100644
--- a/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
+++ b/src/main/java/org/opentripplanner/transit/model/network/grouppriority/EntityAdapter.java
@@ -4,7 +4,7 @@
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 
 /**
- * This is the keys used to group transit trips and trip-patterns. This is used to calculate a
+ * These are the keys used to group transit trips and trip-patterns. This is used to calculate a
  * unique groupId based on the request config. We use the adapter pattern to be able to generate
  * the groupId based on different input types (TripPattern and Trip).
  */

From 623b52d829b2baf7dcc9503d4211eedc00d6d703 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Fri, 5 Jul 2024 15:28:26 +0000
Subject: [PATCH 1565/1688] Add changelog entry for #5897 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index dd32b0a2548..ca97c053229 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -39,6 +39,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Make new debug client the default, move old one to `classic-debug` [#5924](https://github.com/opentripplanner/OpenTripPlanner/pull/5924)
 - Require valid polygons for AreaStop [#5915](https://github.com/opentripplanner/OpenTripPlanner/pull/5915)
 - Fix NullPointerException in stop transfer priority cost vector generation [#5943](https://github.com/opentripplanner/OpenTripPlanner/pull/5943)
+- Convert transferSlack configuration to duration [#5897](https://github.com/opentripplanner/OpenTripPlanner/pull/5897)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From bd2ecedc3524d0aa9e1960efe53ab41aa4afce68 Mon Sep 17 00:00:00 2001
From: OTP Serialization Version Bot
 
Date: Fri, 5 Jul 2024 15:28:50 +0000
Subject: [PATCH 1566/1688] Bump serialization version id for #5897

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cb738fee822..b177a1e1d41 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 
     
-        153
+        154
         
         31.2
         2.51.1

From 7f7bbeec4b7dd6fbff0571f2067ca35256041609 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 5 Jul 2024 18:04:11 +0000
Subject: [PATCH 1567/1688] fix(deps): update jackson.version to v2.17.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b177a1e1d41..c7700971d5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,7 +60,7 @@
         
         31.2
         2.51.1
-        2.17.1
+        2.17.2
         3.1.7
         5.10.3
         1.13.0

From b6de8304340acb952d88a46cd9589f569d3c7db9 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 5 Jul 2024 22:46:04 +0200
Subject: [PATCH 1568/1688] Rename method

---
 .../apis/gtfs/PatternByServiceDatesFilterTest.java          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java
index 57f399ad821..f01bac12006 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilterTest.java
@@ -122,7 +122,7 @@ static List ranges() {
   @ParameterizedTest
   @MethodSource("ranges")
   void filterPatterns(LocalDate start, LocalDate end, FilterExpectation expectation) {
-    var filter = mockFilter(start, end);
+    var filter = defaultFilter(start, end);
 
     var filterInput = List.of(PATTERN_1);
     var filterOutput = filter.filterPatterns(filterInput);
@@ -137,7 +137,7 @@ void filterPatterns(LocalDate start, LocalDate end, FilterExpectation expectatio
   @ParameterizedTest
   @MethodSource("ranges")
   void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation) {
-    var filter = mockFilter(start, end);
+    var filter = defaultFilter(start, end);
 
     var filterInput = List.of(ROUTE_1);
     var filterOutput = filter.filterRoutes(filterInput.stream());
@@ -149,7 +149,7 @@ void filterRoutes(LocalDate start, LocalDate end, FilterExpectation expectation)
     }
   }
 
-  private static PatternByServiceDatesFilter mockFilter(LocalDate start, LocalDate end) {
+  private static PatternByServiceDatesFilter defaultFilter(LocalDate start, LocalDate end) {
     return new PatternByServiceDatesFilter(
       new LocalDateRange(start, end),
       route -> List.of(PATTERN_1),

From 614434fa0b772aea3378b1ee9e2c1ae53f611bec Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 5 Jul 2024 22:54:34 +0200
Subject: [PATCH 1569/1688] Move code inside date range in order to remove
 feature envy

---
 .../apis/gtfs/PatternByServiceDatesFilter.java     | 11 +----------
 .../apis/gtfs/model/LocalDateRange.java            | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
index 1f2ef45dfd5..8eecfe6273b 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/PatternByServiceDatesFilter.java
@@ -82,16 +82,7 @@ private boolean hasServicesOnDate(TripPattern pattern) {
       .anyMatch(trip -> {
         var dates = getServiceDatesForTrip.apply(trip);
 
-        return dates
-          .stream()
-          .anyMatch(date ->
-            (
-              range.startInclusive() == null ||
-              date.isEqual(range.startInclusive()) ||
-              date.isAfter(range.startInclusive())
-            ) &&
-            (range.endExclusive() == null || date.isBefore(range.endExclusive()))
-          );
+        return dates.stream().anyMatch(range::contains);
       });
   }
 }
diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
index 83e0c93b5bd..d466534e65c 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
@@ -15,9 +15,21 @@ public boolean unlimited() {
   }
 
   /**
-   * Is the start date before the end (
+   * Is the start date before the end?
    */
   public boolean startBeforeEnd() {
     return startInclusive != null && endExclusive != null && startInclusive.isAfter(endExclusive);
   }
+
+  /**
+   * Is the given LocalDate instance inside of this date range?
+   */
+  public boolean contains(LocalDate date) {
+    return (
+      (
+        startInclusive() == null || date.isEqual(startInclusive()) || date.isAfter(startInclusive())
+      ) &&
+      (endExclusive() == null || date.isBefore(endExclusive()))
+    );
+  }
 }

From de9640bcad387d52314665d97ac51d4fb529ca1c Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Sun, 7 Jul 2024 17:21:11 +0200
Subject: [PATCH 1570/1688] Use immutable set when purging expired data

---
 src/main/java/org/opentripplanner/model/TimetableSnapshot.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index 0b6655e2ec4..7ddeb6aaa77 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -354,7 +354,7 @@ public boolean purgeExpiredData(LocalDate serviceDate) {
       if (toKeepTimetables.isEmpty()) {
         it.remove();
       } else {
-        timetables.put(pattern, toKeepTimetables);
+        timetables.put(pattern, ImmutableSortedSet.copyOfSorted(toKeepTimetables));
       }
     }
 

From c8f9bbadbf7aaa48f770d3d8bd4ddfca839fcabb Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 8 Jul 2024 10:25:33 +0200
Subject: [PATCH 1571/1688] Update
 src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java

Co-authored-by: Joel Lappalainen 
---
 .../vehiclerentalservicedirectory/api/NetworkParameters.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
index c99c6893618..849f56c0c0c 100644
--- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
+++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
@@ -6,7 +6,7 @@
  * Parameters for a specific network.
  * 
              
  * The {@link GbfsVehicleRentalDataSourceParameters} supports {@code overloadingAllowed}
- * which is not included here since they are not part of
+ * which is not included here since it is not part of
  * the GBFS specification. If there is a demand for it, it can be added.
  * 
              
  * @param network The network name

From 87bda743e4f1672417b0b09ff6a4bc65292bcb21 Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 8 Jul 2024 11:38:18 +0300
Subject: [PATCH 1572/1688] Improve documentation and make list items non null

---
 .../resources/org/opentripplanner/apis/gtfs/schema.graphqls   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
index 6de46739182..2c545648e00 100644
--- a/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
+++ b/src/main/resources/org/opentripplanner/apis/gtfs/schema.graphqls
@@ -1183,8 +1183,8 @@ type QueryType {
     nearest places related to bicycling.
     """
     filterByModes: [Mode],
-    "Only include vehicle rental networks that match one of the given network names."
-    filterByNetwork: [String],
+    "Only include vehicle rental networks that match one of the given network ids."
+    filterByNetwork: [String!],
     "Only return places that are one of these types, e.g. `STOP` or `VEHICLE_RENT`"
     filterByPlaceTypes: [FilterPlaceType],
     first: Int,

From d1d8235731a76b213c1bb419066b344552243bfa Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 8 Jul 2024 11:02:38 +0200
Subject: [PATCH 1573/1688] Flesh out documentation a bit more

---
 docs/sandbox/VehicleRentalServiceDirectory.md | 46 ++++++++++++++-----
 .../api/NetworkParameters.java                |  3 ++
 ...leRentalServiceDirectoryFetcherConfig.java | 13 +++++-
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/docs/sandbox/VehicleRentalServiceDirectory.md b/docs/sandbox/VehicleRentalServiceDirectory.md
index feb5cb91ecb..140dab5ecc5 100644
--- a/docs/sandbox/VehicleRentalServiceDirectory.md
+++ b/docs/sandbox/VehicleRentalServiceDirectory.md
@@ -30,18 +30,18 @@ the `router-config.json`
 
 
 
-| Config Parameter                                    |       Type      | Summary                                                                         |  Req./Opt. | Default Value | Since |
-|-----------------------------------------------------|:---------------:|---------------------------------------------------------------------------------|:----------:|---------------|:-----:|
-| language                                            |     `string`    | Language code.                                                                  | *Optional* |               |  2.1  |
-| sourcesName                                         |     `string`    | Json tag name for updater sources.                                              | *Optional* | `"systems"`   |  2.1  |
-| updaterNetworkName                                  |     `string`    | Json tag name for the network name for each source.                             | *Optional* | `"id"`        |  2.1  |
-| updaterUrlName                                      |     `string`    | Json tag name for endpoint urls for each source.                                | *Optional* | `"url"`       |  2.1  |
-| url                                                 |      `uri`      | Endpoint for the VehicleRentalServiceDirectory                                  | *Required* |               |  2.1  |
-| [headers](#vehicleRentalServiceDirectory_headers)   | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.      | *Optional* |               |  2.1  |
-| [networks](#vehicleRentalServiceDirectory_networks) |    `object[]`   | List all networks to include. Use "network": "default-network" to set defaults. | *Optional* |               |  2.4  |
-|       allowKeepingVehicleAtDestination              |    `boolean`    | Enables `allowKeepingVehicleAtDestination` for the given network                | *Optional* | `false`       |  2.5  |
-|       geofencingZones                               |    `boolean`    | Enables geofencingZones for the given network                                   | *Optional* | `false`       |  2.4  |
-|       network                                       |     `string`    | The network name                                                                | *Required* |               |  2.4  |
+| Config Parameter                                                                                                     |       Type      | Summary                                                                         |  Req./Opt. | Default Value | Since |
+|----------------------------------------------------------------------------------------------------------------------|:---------------:|---------------------------------------------------------------------------------|:----------:|---------------|:-----:|
+| language                                                                                                             |     `string`    | Language code.                                                                  | *Optional* |               |  2.1  |
+| sourcesName                                                                                                          |     `string`    | Json tag name for updater sources.                                              | *Optional* | `"systems"`   |  2.1  |
+| updaterNetworkName                                                                                                   |     `string`    | Json tag name for the network name for each source.                             | *Optional* | `"id"`        |  2.1  |
+| updaterUrlName                                                                                                       |     `string`    | Json tag name for endpoint urls for each source.                                | *Optional* | `"url"`       |  2.1  |
+| url                                                                                                                  |      `uri`      | Endpoint for the VehicleRentalServiceDirectory                                  | *Required* |               |  2.1  |
+| [headers](#vehicleRentalServiceDirectory_headers)                                                                    | `map of string` | HTTP headers to add to the request. Any header key, value can be inserted.      | *Optional* |               |  2.1  |
+| [networks](#vehicleRentalServiceDirectory_networks)                                                                  |    `object[]`   | List all networks to include. Use "network": "default-network" to set defaults. | *Optional* |               |  2.4  |
+|       [allowKeepingVehicleAtDestination](#vehicleRentalServiceDirectory_networks_0_allowKeepingVehicleAtDestination) |    `boolean`    | Enables `allowKeepingVehicleAtDestination` for the given network.               | *Optional* | `false`       |  2.5  |
+|       [geofencingZones](#vehicleRentalServiceDirectory_networks_0_geofencingZones)                                   |    `boolean`    | Enables geofencingZones for the given network                                   | *Optional* | `false`       |  2.4  |
+|       network                                                                                                        |     `string`    | The network name                                                                | *Required* |               |  2.4  |
 
 
 
@@ -71,6 +71,28 @@ networks are dropped. Note! The values in the "default-network" are not used to
 missing field values in networks listed.
 
 
+
              allowKeepingVehicleAtDestination
              
+
+**Since version:** `2.5` ∙ **Type:** `boolean` ∙ **Cardinality:** `Optional` ∙ **Default value:** `false`   
+**Path:** /vehicleRentalServiceDirectory/networks/[0] 
+
+Enables `allowKeepingVehicleAtDestination` for the given network.
+
+Configures if a vehicle rented from a station must be returned to another one or can
+be kept at the end of the trip.
+
+See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information.
+
+
+
              geofencingZones
              
+
+**Since version:** `2.4` ∙ **Type:** `boolean` ∙ **Cardinality:** `Optional` ∙ **Default value:** `false`   
+**Path:** /vehicleRentalServiceDirectory/networks/[0] 
+
+Enables geofencingZones for the given network
+
+See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information.
+
 
 
 
diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
index 849f56c0c0c..0c529cd48ae 100644
--- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
+++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
@@ -11,6 +11,9 @@
  * 
              
  * @param network The network name
  * @param geofencingZones enable geofencingZones for the given network
+ * @param allowKeepingAtDestination if a vehicle that was picked up from a station must be returned
+ *                                  to another one or can be kept at the destination.
+ *                                  {@link org.opentripplanner.standalone.config.routerconfig.updaters.sources.VehicleRentalSourceFactory#allOwKeepingRentedVehicleAtDestination()}
  */
 public record NetworkParameters(
   String network,
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
index 3a7da95bfec..811915f3061 100644
--- a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
@@ -80,11 +80,22 @@ private static List mapNetworkParameters(
             .of("geofencingZones")
             .since(V2_4)
             .summary("Enables geofencingZones for the given network")
+            .description(
+              "See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information."
+            )
             .asBoolean(false),
           c
             .of("allowKeepingVehicleAtDestination")
             .since(V2_5)
-            .summary("Enables `allowKeepingVehicleAtDestination` for the given network")
+            .summary("Enables `allowKeepingVehicleAtDestination` for the given network.")
+            .description(
+              """
+              Configures if a vehicle rented from a station must be returned to another one or can
+              be kept at the end of the trip.
+              
+              See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information.
+              """
+            )
             .asBoolean(false)
         )
       );

From 9a2b8de10e1831f5552039549fbfa7ae960d2a92 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 8 Jul 2024 11:07:56 +0200
Subject: [PATCH 1574/1688] Remove unused method

---
 .../api/NetworkParameters.java                              | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
index 0c529cd48ae..c8b638edae3 100644
--- a/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
+++ b/src/ext/java/org/opentripplanner/ext/vehiclerentalservicedirectory/api/NetworkParameters.java
@@ -19,8 +19,4 @@ public record NetworkParameters(
   String network,
   boolean geofencingZones,
   boolean allowKeepingAtDestination
-) {
-  public NetworkParameters withName(String network) {
-    return new NetworkParameters(network, geofencingZones, allowKeepingAtDestination);
-  }
-}
+) {}

From 4b55d2a2da5c25a6494a795f1251a6858be32acd Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Mon, 8 Jul 2024 11:19:51 +0200
Subject: [PATCH 1575/1688] Remove reference to TimetableSnapshot in
 TransitModelIndex

---
 .../service/DefaultTransitService.java        | 35 ++++++++++++-------
 .../transit/service/TransitModel.java         |  1 +
 .../transit/service/TransitModelIndex.java    | 19 ----------
 .../transit/service/TransitService.java       | 20 +++++++++++
 .../service/DefaultTransitServiceTest.java    | 21 +++++++++++
 5 files changed, 65 insertions(+), 31 deletions(-)

diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
index ca88b7d3130..9edb9d5647a 100644
--- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
@@ -9,6 +9,7 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -16,6 +17,7 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
+import javax.annotation.Nullable;
 import org.locationtech.jts.geom.Envelope;
 import org.opentripplanner.ext.flex.FlexIndex;
 import org.opentripplanner.framework.application.OTPRequestTimeoutException;
@@ -398,15 +400,23 @@ public List stopTimesForPatternAtStop(
   /**
    * Returns all the patterns for a specific stop. If includeRealtimeUpdates is set, new patterns
    * added by realtime updates are added to the collection.
+   * A set is used here because trip patterns
+   * that were updated by realtime data is both part of the TransitModelIndex and the TimetableSnapshot
    */
   @Override
   public Collection getPatternsForStop(
     StopLocation stop,
     boolean includeRealtimeUpdates
   ) {
-    return transitModel
-      .getTransitModelIndex()
-      .getPatternsForStop(stop, includeRealtimeUpdates ? lazyGetTimeTableSnapShot() : null);
+    Set tripPatterns = new HashSet<>(getPatternsForStop(stop));
+
+    if (includeRealtimeUpdates) {
+      TimetableSnapshot currentSnapshot = lazyGetTimeTableSnapShot();
+      if (currentSnapshot != null) {
+        tripPatterns.addAll(currentSnapshot.getPatternsForStop(stop));
+      }
+    }
+    return tripPatterns;
   }
 
   @Override
@@ -434,28 +444,28 @@ public GroupOfRoutes getGroupOfRoutesForId(FeedScopedId id) {
   @Override
   public Timetable getTimetableForTripPattern(TripPattern tripPattern, LocalDate serviceDate) {
     OTPRequestTimeoutException.checkForTimeout();
-    TimetableSnapshot timetableSnapshot = lazyGetTimeTableSnapShot();
-    return timetableSnapshot != null
-      ? timetableSnapshot.resolve(tripPattern, serviceDate)
+    TimetableSnapshot currentSnapshot = lazyGetTimeTableSnapShot();
+    return currentSnapshot != null
+      ? currentSnapshot.resolve(tripPattern, serviceDate)
       : tripPattern.getScheduledTimetable();
   }
 
   @Override
   public TripPattern getRealtimeAddedTripPattern(FeedScopedId tripId, LocalDate serviceDate) {
-    TimetableSnapshot timetableSnapshot = lazyGetTimeTableSnapShot();
-    if (timetableSnapshot == null) {
+    TimetableSnapshot currentSnapshot = lazyGetTimeTableSnapShot();
+    if (currentSnapshot == null) {
       return null;
     }
-    return timetableSnapshot.getRealtimeAddedTripPattern(tripId, serviceDate);
+    return currentSnapshot.getRealtimeAddedTripPattern(tripId, serviceDate);
   }
 
   @Override
   public boolean hasRealtimeAddedTripPatterns() {
-    TimetableSnapshot timetableSnapshot = lazyGetTimeTableSnapShot();
-    if (timetableSnapshot == null) {
+    TimetableSnapshot currentSnapshot = lazyGetTimeTableSnapShot();
+    if (currentSnapshot == null) {
       return false;
     }
-    return timetableSnapshot.hasRealtimeAddedTripPatterns();
+    return currentSnapshot.hasRealtimeAddedTripPatterns();
   }
 
   /**
@@ -463,6 +473,7 @@ public boolean hasRealtimeAddedTripPatterns() {
    *
    * @return The same TimetableSnapshot is returned throughout the lifecycle of this object.
    */
+  @Nullable
   private TimetableSnapshot lazyGetTimeTableSnapShot() {
     if (this.timetableSnapshot == null) {
       timetableSnapshot = transitModel.getTimetableSnapshot();
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
index d5211d5dd2e..8fb8da5e391 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitModel.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
@@ -169,6 +169,7 @@ public void index() {
     }
   }
 
+  @Nullable
   public TimetableSnapshot getTimetableSnapshot() {
     return timetableSnapshotProvider == null
       ? null
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java b/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
index 84759ffae72..468fc72942e 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
@@ -15,7 +15,6 @@
 import org.opentripplanner.ext.flex.FlexIndex;
 import org.opentripplanner.ext.flex.trip.FlexTrip;
 import org.opentripplanner.framework.application.OTPFeature;
-import org.opentripplanner.model.TimetableSnapshot;
 import org.opentripplanner.model.calendar.CalendarService;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.GroupOfRoutes;
@@ -154,24 +153,6 @@ public Collection getTripsForStop(StopLocation stop) {
       .collect(Collectors.toList());
   }
 
-  /**
-   * Returns all the patterns for a specific stop. If timetableSnapshot is included, new patterns
-   * added by realtime updates are added to the collection. A set is used here because trip patterns
-   * that were updated by realtime data is both part of the TransitModelIndex and the TimetableSnapshot.
-   */
-  public Collection getPatternsForStop(
-    StopLocation stop,
-    TimetableSnapshot timetableSnapshot
-  ) {
-    Set tripPatterns = new HashSet<>(getPatternsForStop(stop));
-
-    if (timetableSnapshot != null) {
-      tripPatterns.addAll(timetableSnapshot.getPatternsForStop(stop));
-    }
-
-    return tripPatterns;
-  }
-
   /**
    * Get a list of all operators spanning across all feeds.
    */
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java
index 83b65c44d12..5cedfd91f9c 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java
@@ -93,8 +93,16 @@ public interface TransitService {
 
   Set getRoutesForStop(StopLocation stop);
 
+  /**
+   * Return all the scheduled trip patterns for a specific stop
+   * (not taking into account real-time updates).
+   */
   Collection getPatternsForStop(StopLocation stop);
 
+  /**
+   * Returns all the patterns for a specific stop. If includeRealtimeUpdates is set, new patterns
+   * added by realtime updates are added to the collection.
+   */
   Collection getPatternsForStop(StopLocation stop, boolean includeRealtimeUpdates);
 
   Collection getTripsForStop(StopLocation stop);
@@ -127,8 +135,16 @@ public interface TransitService {
 
   Collection getAllRoutes();
 
+  /**
+   * Return the scheduled trip pattern for a given trip (not taking into account real-time updates)
+   */
   TripPattern getPatternForTrip(Trip trip);
 
+  /**
+   * Return the trip pattern for a given trip on a service date. The real-time updated version
+   * is returned if it exists, otherwise the scheduled trip pattern is returned.
+   *
+   */
   TripPattern getPatternForTrip(Trip trip, LocalDate serviceDate);
 
   Collection getPatternsForRoute(Route route);
@@ -167,6 +183,10 @@ List stopTimesForPatternAtStop(
 
   GroupOfRoutes getGroupOfRoutesForId(FeedScopedId id);
 
+  /**
+   * Return the timetable for a given trip pattern and date, taking into account real-time updates.
+   * If no real-times update are applied, fall back to scheduled data.
+   */
   Timetable getTimetableForTripPattern(TripPattern tripPattern, LocalDate serviceDate);
 
   TripPattern getRealtimeAddedTripPattern(FeedScopedId tripId, LocalDate serviceDate);
diff --git a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
index f04fe782a0a..0cf72dd4748 100644
--- a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
+++ b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
@@ -6,10 +6,13 @@
 import static org.opentripplanner.transit.model.basic.TransitMode.RAIL;
 import static org.opentripplanner.transit.model.basic.TransitMode.TRAM;
 
+import com.google.common.collect.ImmutableSetMultimap;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.opentripplanner.model.TimetableSnapshot;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.opentripplanner.transit.model.network.TripPattern;
@@ -46,6 +49,12 @@ static void setup() {
     transitModel.addTripPattern(RAIL_PATTERN.getId(), RAIL_PATTERN);
     transitModel.index();
 
+    transitModel.initTimetableSnapshotProvider(() -> {
+      TimetableSnapshot timetableSnapshot = new TimetableSnapshot();
+      timetableSnapshot.setPatternsForStop(ImmutableSetMultimap.of(STOP_B, BUS_PATTERN));
+      return timetableSnapshot;
+    });
+
     service =
       new DefaultTransitService(transitModel) {
         @Override
@@ -76,4 +85,16 @@ void stationModes() {
     var modes = service.getModesOfStopLocationsGroup(STATION);
     assertEquals(List.of(RAIL, FERRY, TRAM), modes);
   }
+
+  @Test
+  void getPatternForStopsWithoutRealTime() {
+    Collection patternsForStop = service.getPatternsForStop(STOP_B, false);
+    assertEquals(Set.of(FERRY_PATTERN, RAIL_PATTERN), patternsForStop);
+  }
+
+  @Test
+  void getPatternForStopsWithRealTime() {
+    Collection patternsForStop = service.getPatternsForStop(STOP_B, true);
+    assertEquals(Set.of(FERRY_PATTERN, RAIL_PATTERN, BUS_PATTERN), patternsForStop);
+  }
 }

From b617f95f7e3a525fd7299eff3dd433fbe28a934e Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 8 Jul 2024 11:18:50 +0200
Subject: [PATCH 1576/1688] Rework test

---
 .../apis/gtfs/model/LocalDateRangeTest.java            | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java b/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
index e675a4c8772..5d079f47459 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/model/LocalDateRangeTest.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.apis.gtfs.model;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.time.LocalDate;
 import org.junit.jupiter.api.Test;
@@ -10,13 +11,14 @@ class LocalDateRangeTest {
   private static final LocalDate DATE = LocalDate.parse("2024-06-01");
 
   @Test
-  void unlimited() {
+  void limited() {
     assertFalse(new LocalDateRange(DATE, DATE).unlimited());
+    assertFalse(new LocalDateRange(DATE, null).unlimited());
+    assertFalse(new LocalDateRange(null, DATE).unlimited());
   }
 
   @Test
-  void limited() {
-    assertFalse(new LocalDateRange(DATE, null).unlimited());
-    assertFalse(new LocalDateRange(null, DATE).unlimited());
+  void unlimited() {
+    assertTrue(new LocalDateRange(null, null).unlimited());
   }
 }

From d083bfd57dfbee377a74dca7a91031ebb6feb185 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 8 Jul 2024 11:36:29 +0200
Subject: [PATCH 1577/1688] Update docs

---
 doc-templates/sandbox/VehicleRentalServiceDirectory.md | 10 +++++-----
 docs/sandbox/VehicleRentalServiceDirectory.md          | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/doc-templates/sandbox/VehicleRentalServiceDirectory.md b/doc-templates/sandbox/VehicleRentalServiceDirectory.md
index d550fe27dc2..787a17e90e4 100644
--- a/doc-templates/sandbox/VehicleRentalServiceDirectory.md
+++ b/doc-templates/sandbox/VehicleRentalServiceDirectory.md
@@ -1,10 +1,10 @@
 # Vehicle Rental Service Directory API support
 
-This adds support for the GBFS service directory endpoint component located at 
-https://github.com/entur/lamassu. OTP uses the service directory to lookup and connect to all GBFS
-endpoints registered in the directory. This simplifies the management of the GBFS endpoints, since
-multiple services/components like OTP can connect to the directory and get the necessary
-configuration from it.
+This adds support for the GBFS service directory endpoint component
+[Lamassu](https://github.com/entur/lamassu). 
+OTP uses the service directory to lookup and connects to all GBFS endpoints registered in the 
+directory. This simplifies the management of the GBFS endpoints, since multiple services/components 
+like OTP can connect to the directory and get the necessary configuration from it.
 
 
 ## Contact Info
diff --git a/docs/sandbox/VehicleRentalServiceDirectory.md b/docs/sandbox/VehicleRentalServiceDirectory.md
index 140dab5ecc5..fc9aed8b379 100644
--- a/docs/sandbox/VehicleRentalServiceDirectory.md
+++ b/docs/sandbox/VehicleRentalServiceDirectory.md
@@ -1,10 +1,10 @@
 # Vehicle Rental Service Directory API support
 
-This adds support for the GBFS service directory endpoint component located at 
-https://github.com/entur/lamassu. OTP uses the service directory to lookup and connect to all GBFS
-endpoints registered in the directory. This simplifies the management of the GBFS endpoints, since
-multiple services/components like OTP can connect to the directory and get the necessary
-configuration from it.
+This adds support for the GBFS service directory endpoint component
+[Lamassu](https://github.com/entur/lamassu). 
+OTP uses the service directory to lookup and connects to all GBFS endpoints registered in the 
+directory. This simplifies the management of the GBFS endpoints, since multiple services/components 
+like OTP can connect to the directory and get the necessary configuration from it.
 
 
 ## Contact Info

From 95544871de507dedb6a4c0b12224cca82a5af2f5 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Mon, 8 Jul 2024 09:42:34 +0000
Subject: [PATCH 1578/1688] Add changelog entry for #5942 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index ca97c053229..5712915216c 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -40,6 +40,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Require valid polygons for AreaStop [#5915](https://github.com/opentripplanner/OpenTripPlanner/pull/5915)
 - Fix NullPointerException in stop transfer priority cost vector generation [#5943](https://github.com/opentripplanner/OpenTripPlanner/pull/5943)
 - Convert transferSlack configuration to duration [#5897](https://github.com/opentripplanner/OpenTripPlanner/pull/5897)
+- Expose stop transfer priority in Transmodel API [#5942](https://github.com/opentripplanner/OpenTripPlanner/pull/5942)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From b6d4aeb5689db55d99817986f158ca840e55cac5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 8 Jul 2024 12:49:31 +0200
Subject: [PATCH 1579/1688] Use hyphenated anchors

---
 docs/sandbox/VehicleRentalServiceDirectory.md                 | 4 ++--
 .../sandbox/VehicleRentalServiceDirectoryFetcherConfig.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/sandbox/VehicleRentalServiceDirectory.md b/docs/sandbox/VehicleRentalServiceDirectory.md
index fc9aed8b379..1be5418e155 100644
--- a/docs/sandbox/VehicleRentalServiceDirectory.md
+++ b/docs/sandbox/VehicleRentalServiceDirectory.md
@@ -81,7 +81,7 @@ Enables `allowKeepingVehicleAtDestination` for the given network.
 Configures if a vehicle rented from a station must be returned to another one or can
 be kept at the end of the trip.
 
-See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information.
+See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information.
 
 
 
              geofencingZones
              
@@ -91,7 +91,7 @@ See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental sys
 
 Enables geofencingZones for the given network
 
-See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information.
+See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information.
 
 
 
diff --git a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
index 811915f3061..f8ed1184c04 100644
--- a/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/sandbox/VehicleRentalServiceDirectoryFetcherConfig.java
@@ -81,7 +81,7 @@ private static List mapNetworkParameters(
             .since(V2_4)
             .summary("Enables geofencingZones for the given network")
             .description(
-              "See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information."
+              "See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information."
             )
             .asBoolean(false),
           c
@@ -93,7 +93,7 @@ private static List mapNetworkParameters(
               Configures if a vehicle rented from a station must be returned to another one or can
               be kept at the end of the trip.
               
-              See the regular [GBFS documentation](../UpdaterConfig.md#GBFS vehicle rental systems) for more information.
+              See the regular [GBFS documentation](../UpdaterConfig.md#gbfs-vehicle-rental-systems) for more information.
               """
             )
             .asBoolean(false)

From dbdc80bf95aabdd3468a0df6fe6f2bd56b3456bd Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 16:06:10 +0200
Subject: [PATCH 1580/1688] Parse parking lots from NeTEx

---
 .../netex/index/NetexEntityIndex.java         | 14 +++-
 .../api/NetexEntityIndexReadOnlyView.java     |  4 +
 .../netex/loader/parser/NetexParser.java      |  6 +-
 .../netex/loader/parser/SiteFrameParser.java  | 12 ++-
 .../netex/mapping/NetexMapper.java            |  8 ++
 .../netex/mapping/VehicleParkingMapper.java   | 78 +++++++++++++++++++
 .../vehicle_parking/VehicleParking.java       |  1 +
 7 files changed, 118 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java

diff --git a/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java b/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
index 0ca734d5b6a..9841765f3a3 100644
--- a/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
+++ b/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
@@ -1,6 +1,9 @@
 package org.opentripplanner.netex.index;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
 import org.opentripplanner.netex.index.api.NetexEntityIndexReadOnlyView;
 import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap;
 import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMapById;
@@ -28,6 +31,7 @@
 import org.rutebanken.netex.model.OperatingDay;
 import org.rutebanken.netex.model.OperatingPeriod_VersionStructure;
 import org.rutebanken.netex.model.Operator;
+import org.rutebanken.netex.model.Parking;
 import org.rutebanken.netex.model.Quay;
 import org.rutebanken.netex.model.Route;
 import org.rutebanken.netex.model.ServiceJourney;
@@ -97,8 +101,9 @@ public class NetexEntityIndex {
   public final HierarchicalVersionMapById stopPlaceById;
   public final HierarchicalVersionMapById tariffZonesById;
   public final HierarchicalMapById brandingById;
+  public final Set parkings;
 
-  // Relations between entities - The Netex XML sometimes rely on the the
+  // Relations between entities - The Netex XML sometimes relies on the
   // nested structure of the XML document, rater than explicit references.
   // Since we throw away the document we need to keep track of these.
 
@@ -142,6 +147,7 @@ public NetexEntityIndex() {
     this.tariffZonesById = new HierarchicalVersionMapById<>();
     this.brandingById = new HierarchicalMapById<>();
     this.timeZone = new HierarchicalElement<>();
+    this.parkings = new HashSet<>(0);
   }
 
   /**
@@ -184,6 +190,7 @@ public NetexEntityIndex(NetexEntityIndex parent) {
     this.tariffZonesById = new HierarchicalVersionMapById<>(parent.tariffZonesById);
     this.brandingById = new HierarchicalMapById<>(parent.brandingById);
     this.timeZone = new HierarchicalElement<>(parent.timeZone);
+    this.parkings = new HashSet<>(parent.parkings);
   }
 
   /**
@@ -353,6 +360,11 @@ public ReadOnlyHierarchicalVersionMapById getStopPlaceById() {
         return stopPlaceById;
       }
 
+      @Override
+      public ImmutableSet getParkings() {
+        return ImmutableSet.copyOf(parkings);
+      }
+
       @Override
       public ReadOnlyHierarchicalVersionMapById getTariffZonesById() {
         return tariffZonesById;
diff --git a/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java b/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
index 3c7bc98b36a..9229f40c7f8 100644
--- a/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
+++ b/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
@@ -1,5 +1,6 @@
 package org.opentripplanner.netex.index.api;
 
+import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
 import org.rutebanken.netex.model.Authority;
 import org.rutebanken.netex.model.Branding;
@@ -19,6 +20,7 @@
 import org.rutebanken.netex.model.OperatingDay;
 import org.rutebanken.netex.model.OperatingPeriod_VersionStructure;
 import org.rutebanken.netex.model.Operator;
+import org.rutebanken.netex.model.Parking;
 import org.rutebanken.netex.model.Quay;
 import org.rutebanken.netex.model.Route;
 import org.rutebanken.netex.model.ServiceJourney;
@@ -80,6 +82,8 @@ public interface NetexEntityIndexReadOnlyView {
 
   ReadOnlyHierarchicalVersionMapById getStopPlaceById();
 
+  ImmutableSet getParkings();
+
   ReadOnlyHierarchicalVersionMapById getTariffZonesById();
 
   ReadOnlyHierarchicalMapById getBrandingById();
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java b/src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java
index 54b0043e072..3c24562ef6f 100644
--- a/src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java
+++ b/src/main/java/org/opentripplanner/netex/loader/parser/NetexParser.java
@@ -16,7 +16,7 @@
 abstract class NetexParser {
 
   /**
-   * Currently a lot of elements on a frame is skipped. If any of these elements are pressent we
+   * Currently a lot of elements on a frame is skipped. If any of these elements are present we
    * print a warning for elements that might be relevant for OTP and an info message for none
    * relevant elements.
    */
@@ -39,10 +39,10 @@ static void verifyCommonUnusedPropertiesIsNotSet(Logger log, VersionFrame_Versio
   /**
    * Log a warning for Netex elements which is not mapped. There might be something wrong with the
    * data or there might be something wrong with the Netex data import(ignoring these elements). The
-   * element should be relevant to OTP. OTP do not support Netex 100%, but elements in Nordic
+   * element should be relevant to OTP. OTP does not support NeTEx 100%, but elements in the Nordic
    * profile, see https://enturas.atlassian.net/wiki/spaces/PUBLIC/overview should be supported.
    * 
              
-   * If you get this warning and think the element should be mapped, please feel free to report an
+   * If you see this warning and think the element should be mapped, please feel free to report an
    * issue on GitHub.
    */
   static void warnOnMissingMapping(Logger log, Object rel) {
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java b/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
index 8cbe0c8aee6..7651bbb39d9 100644
--- a/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
+++ b/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
@@ -9,6 +9,7 @@
 import org.opentripplanner.netex.support.JAXBUtils;
 import org.rutebanken.netex.model.FlexibleStopPlace;
 import org.rutebanken.netex.model.GroupOfStopPlaces;
+import org.rutebanken.netex.model.Parking;
 import org.rutebanken.netex.model.Quay;
 import org.rutebanken.netex.model.Quays_RelStructure;
 import org.rutebanken.netex.model.Site_VersionFrameStructure;
@@ -35,6 +36,7 @@ class SiteFrameParser extends NetexParser {
   private final Collection tariffZones = new ArrayList<>();
 
   private final Collection quays = new ArrayList<>();
+  private final Collection parkings = new ArrayList<>(0);
 
   @Override
   public void parse(Site_VersionFrameStructure frame) {
@@ -51,6 +53,10 @@ public void parse(Site_VersionFrameStructure frame) {
     if (frame.getTariffZones() != null) {
       parseTariffZones(frame.getTariffZones().getTariffZone());
     }
+
+    if (frame.getParkings() != null) {
+      parseParkings(frame.getParkings().getParking());
+    }
     // Keep list sorted alphabetically
     warnOnMissingMapping(LOG, frame.getAccesses());
     warnOnMissingMapping(LOG, frame.getAddresses());
@@ -59,7 +65,6 @@ public void parse(Site_VersionFrameStructure frame) {
     warnOnMissingMapping(LOG, frame.getCheckConstraintDelays());
     warnOnMissingMapping(LOG, frame.getCheckConstraintThroughputs());
     warnOnMissingMapping(LOG, frame.getNavigationPaths());
-    warnOnMissingMapping(LOG, frame.getParkings());
     warnOnMissingMapping(LOG, frame.getPathJunctions());
     warnOnMissingMapping(LOG, frame.getPathLinks());
     warnOnMissingMapping(LOG, frame.getPointsOfInterest());
@@ -79,6 +84,7 @@ void setResultOnIndex(NetexEntityIndex netexIndex) {
     netexIndex.stopPlaceById.addAll(stopPlaces);
     netexIndex.tariffZonesById.addAll(tariffZones);
     netexIndex.quayById.addAll(quays);
+    netexIndex.parkings.addAll(parkings);
   }
 
   private void parseFlexibleStopPlaces(Collection flexibleStopPlacesList) {
@@ -89,6 +95,10 @@ private void parseGroupsOfStopPlaces(Collection groupsOfStopP
     groupsOfStopPlaces.addAll(groupsOfStopPlacesList);
   }
 
+  private void parseParkings(List parking) {
+    parkings.addAll(parking);
+  }
+
   private void parseStopPlaces(List> stopPlaceList) {
     for (JAXBElement jaxBStopPlace : stopPlaceList) {
       StopPlace stopPlace = (StopPlace) jaxBStopPlace.getValue();
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
index c3c9ad2d0ae..85ab33fabc5 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
@@ -200,6 +200,8 @@ public void mapNetexToOtp(NetexEntityIndexReadOnlyView netexIndex) {
     mapNoticeAssignments();
 
     addEntriesToGroupMapperForPostProcessingLater();
+
+    mapParkings();
   }
 
   /* PRIVATE METHODS */
@@ -511,6 +513,12 @@ private void mapNoticeAssignments() {
     }
   }
 
+  private void mapParkings() {
+    var mapper = new VehicleParkingMapper(idFactory);
+    var parkingLots = mapper.map(currentNetexIndex.getParkings());
+    System.out.print(parkingLots);
+  }
+
   private void addEntriesToGroupMapperForPostProcessingLater() {
     if (level != 0) {
       groupMapper.addInterchange(
diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
new file mode 100644
index 00000000000..11003ea2561
--- /dev/null
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -0,0 +1,78 @@
+package org.opentripplanner.netex.mapping;
+
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.CYCLE;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.E_CYCLE;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.PEDAL_CYCLE;
+
+import java.util.Collection;
+import java.util.Set;
+import java.util.stream.Collectors;
+import org.opentripplanner.framework.i18n.NonLocalizedString;
+import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
+import org.rutebanken.netex.model.Parking;
+import org.rutebanken.netex.model.ParkingVehicleEnumeration;
+
+/**
+ * Maps from NeTEx Parking to an internal {@link VehicleParking}.
+ */
+class VehicleParkingMapper {
+
+  private final FeedScopedIdFactory idFactory;
+
+  private static final Set BICYCLE_TYPES = Set.of(
+    PEDAL_CYCLE,
+    E_CYCLE,
+    CYCLE
+  );
+
+  public VehicleParkingMapper(FeedScopedIdFactory idFactory) {
+    this.idFactory = idFactory;
+  }
+
+  Collection map(Collection parkings) {
+    return parkings.stream().map(this::map).collect(Collectors.toUnmodifiableSet());
+  }
+
+  VehicleParking map(Parking parking) {
+    return VehicleParking
+      .builder()
+      .id(idFactory.createId(parking.getId()))
+      .name(NonLocalizedString.ofNullable(parking.getName().getValue()))
+      .coordinate(WgsCoordinateMapper.mapToDomain(parking.getCentroid()))
+      .capacity(mapCapacity(parking))
+      .entrance(mapEntrance(parking))
+      .build();
+  }
+
+  private VehicleParking.VehicleParkingEntranceCreator mapEntrance(Parking parking) {
+    return builder ->
+      builder
+        .entranceId(idFactory.createId(parking.getId() + "/entrance"))
+        .coordinate(WgsCoordinateMapper.mapToDomain(parking.getCentroid()))
+        .walkAccessible(true)
+        .carAccessible(true);
+  }
+
+  private static VehicleParkingSpaces mapCapacity(Parking parking) {
+    var builder = VehicleParkingSpaces.builder();
+
+    // we assume that if we have bicycle in vehicle types it's a bicycle parking lot
+    // it's not possible in NeTEx to split the spaces between the types
+    var hasBikes = hasBikes(parking);
+    int capacity = parking.getTotalCapacity().intValue();
+
+    if (hasBikes) {
+      builder.bicycleSpaces(capacity);
+    } else {
+      builder.carSpaces(capacity);
+    }
+
+    return builder.carSpaces(capacity).build();
+  }
+
+  private static boolean hasBikes(Parking parking) {
+    return parking.getParkingVehicleTypes().stream().anyMatch(BICYCLE_TYPES::contains);
+  }
+}
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
index 6ebd34e1287..d5dfc4ce8c1 100644
--- a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
+++ b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParking.java
@@ -308,6 +308,7 @@ public boolean equals(Object o) {
   public String toString() {
     return ToStringBuilder
       .of(VehicleParking.class)
+      .addStr("id", id.toString())
       .addStr("name", name.toString())
       .addObj("coordinate", coordinate)
       .toString();

From 8550febea5b78272777faa34f1e4a67039d2650e Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 17:29:05 +0200
Subject: [PATCH 1581/1688] Flesh out parsing, add test

---
 .../VehicleParkingGroupsLayerTest.java        |  4 +-
 .../VehicleParkingsLayerTest.java             |  4 +-
 .../opentripplanner/netex/NetexBundle.java    |  7 +-
 .../netex/configure/NetexConfigure.java       |  7 +-
 .../netex/mapping/NetexMapper.java            |  8 +-
 .../netex/mapping/VehicleParkingMapper.java   | 11 +--
 .../vehicle_parking/VehicleParkingSpaces.java | 11 +++
 .../opentripplanner/ConstantsForTests.java    |  7 +-
 .../mapping/VehicleParkingMapperTest.java     | 86 +++++++++++++++++++
 9 files changed, 129 insertions(+), 16 deletions(-)
 create mode 100644 src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java

diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java
index 60ba9100f43..1beca037457 100644
--- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingGroupsLayerTest.java
@@ -125,8 +125,8 @@ public void vehicleParkingGroupGeometryTest() {
 
     assertEquals("[POINT (1.1 1.9)]", geometries.toString());
     assertEquals(
-      "VehicleParkingAndGroup[vehicleParkingGroup=VehicleParkingGroup{name: 'groupName', coordinate: (1.9, 1.1)}, vehicleParking=[VehicleParking{name: 'name', coordinate: (2.0, 1.0)}]]",
-      geometries.get(0).getUserData().toString()
+      "VehicleParkingAndGroup[vehicleParkingGroup=VehicleParkingGroup{name: 'groupName', coordinate: (1.9, 1.1)}, vehicleParking=[VehicleParking{id: 'F:id', name: 'name', coordinate: (2.0, 1.0)}]]",
+      geometries.getFirst().getUserData().toString()
     );
   }
 
diff --git a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java
index fdb723b3dc7..14e96e2aa28 100644
--- a/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/vectortiles/layers/vehicleparkings/VehicleParkingsLayerTest.java
@@ -117,8 +117,8 @@ public void vehicleParkingGeometryTest() {
 
     assertEquals("[POINT (1 2)]", geometries.toString());
     assertEquals(
-      "VehicleParking{name: 'default name', coordinate: (2.0, 1.0)}",
-      geometries.get(0).getUserData().toString()
+      "VehicleParking{id: 'F:id', name: 'default name', coordinate: (2.0, 1.0)}",
+      geometries.getFirst().getUserData().toString()
     );
   }
 
diff --git a/src/main/java/org/opentripplanner/netex/NetexBundle.java b/src/main/java/org/opentripplanner/netex/NetexBundle.java
index 8d6f098de89..c0da007bb10 100644
--- a/src/main/java/org/opentripplanner/netex/NetexBundle.java
+++ b/src/main/java/org/opentripplanner/netex/NetexBundle.java
@@ -17,6 +17,7 @@
 import org.opentripplanner.netex.loader.parser.NetexDocumentParser;
 import org.opentripplanner.netex.mapping.NetexMapper;
 import org.opentripplanner.netex.validation.Validator;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
 import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.rutebanken.netex.model.PublicationDeliveryStructure;
 import org.slf4j.Logger;
@@ -46,6 +47,7 @@ public class NetexBundle implements Closeable {
   private final double maxStopToShapeSnapDistance;
   private final boolean noTransfersOnIsolatedStops;
   private final boolean ignoreFareFrame;
+  private final VehicleParkingService parkingService;
   /** The NeTEx entities loaded from the input files and passed on to the mapper. */
   private NetexEntityIndex index = new NetexEntityIndex();
   /** Report errors to issue store */
@@ -59,6 +61,7 @@ public NetexBundle(
     CompositeDataSource source,
     NetexDataSourceHierarchy hierarchy,
     OtpTransitServiceBuilder transitBuilder,
+    VehicleParkingService parkingService,
     Set ferryIdsNotAllowedForBicycle,
     double maxStopToShapeSnapDistance,
     boolean noTransfersOnIsolatedStops,
@@ -68,6 +71,7 @@ public NetexBundle(
     this.source = source;
     this.hierarchy = hierarchy;
     this.transitBuilder = transitBuilder;
+    this.parkingService = parkingService;
     this.ferryIdsNotAllowedForBicycle = ferryIdsNotAllowedForBicycle;
     this.maxStopToShapeSnapDistance = maxStopToShapeSnapDistance;
     this.noTransfersOnIsolatedStops = noTransfersOnIsolatedStops;
@@ -93,7 +97,8 @@ public OtpTransitServiceBuilder loadBundle(
         issueStore,
         ferryIdsNotAllowedForBicycle,
         maxStopToShapeSnapDistance,
-        noTransfersOnIsolatedStops
+        noTransfersOnIsolatedStops,
+        parkingService
       );
 
     // Load data
diff --git a/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java b/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
index 464c03f28e1..7224d243d77 100644
--- a/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
+++ b/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
@@ -11,6 +11,7 @@
 import org.opentripplanner.netex.config.NetexFeedParameters;
 import org.opentripplanner.netex.loader.NetexDataSourceHierarchy;
 import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
 import org.opentripplanner.standalone.config.BuildConfig;
 import org.opentripplanner.transit.service.TransitModel;
 
@@ -46,7 +47,7 @@ public NetexModule createNetexModule(
         transitModel.getStopModel(),
         issueStore
       );
-      netexBundles.add(netexBundle(transitServiceBuilder, it));
+      netexBundles.add(netexBundle(transitServiceBuilder, it, graph.getVehicleParkingService()));
     }
 
     return new NetexModule(
@@ -62,7 +63,8 @@ public NetexModule createNetexModule(
   /** public to enable testing */
   public NetexBundle netexBundle(
     OtpTransitServiceBuilder transitServiceBuilder,
-    ConfiguredDataSource configuredDataSource
+    ConfiguredDataSource configuredDataSource,
+    VehicleParkingService parkingService
   ) {
     var source = (CompositeDataSource) configuredDataSource.dataSource();
     var config = configuredDataSource.config();
@@ -72,6 +74,7 @@ public NetexBundle netexBundle(
       source,
       hierarchy(source, config),
       transitServiceBuilder,
+      parkingService,
       config.ferryIdsNotAllowedForBicycle(),
       buildParams.maxStopToShapeSnapDistance,
       config.noTransfersOnIsolatedStops(),
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
index 85ab33fabc5..d99a315a39b 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
@@ -19,6 +19,7 @@
 import org.opentripplanner.netex.mapping.calendar.CalendarServiceBuilder;
 import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
 import org.opentripplanner.netex.mapping.support.NetexMapperIndexes;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
 import org.opentripplanner.transit.model.basic.Notice;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
 import org.opentripplanner.transit.model.framework.Deduplicator;
@@ -68,6 +69,7 @@ public class NetexMapper {
   private final Set ferryIdsNotAllowedForBicycle;
   private final double maxStopToShapeSnapDistance;
   private final boolean noTransfersOnIsolatedStops;
+  private final VehicleParkingService parkingService;
 
   /** Map entries that cross reference entities within a group/operator, for example Interchanges. */
   private GroupNetexMapper groupMapper;
@@ -94,7 +96,8 @@ public NetexMapper(
     DataImportIssueStore issueStore,
     Set ferryIdsNotAllowedForBicycle,
     double maxStopToShapeSnapDistance,
-    boolean noTransfersOnIsolatedStops
+    boolean noTransfersOnIsolatedStops,
+    VehicleParkingService parkingService
   ) {
     this.transitBuilder = transitBuilder;
     this.deduplicator = deduplicator;
@@ -103,6 +106,7 @@ public NetexMapper(
     this.ferryIdsNotAllowedForBicycle = ferryIdsNotAllowedForBicycle;
     this.noTransfersOnIsolatedStops = noTransfersOnIsolatedStops;
     this.maxStopToShapeSnapDistance = maxStopToShapeSnapDistance;
+    this.parkingService = parkingService;
     this.calendarServiceBuilder = new CalendarServiceBuilder(idFactory);
     this.tripCalendarBuilder = new TripCalendarBuilder(this.calendarServiceBuilder, issueStore);
   }
@@ -516,7 +520,7 @@ private void mapNoticeAssignments() {
   private void mapParkings() {
     var mapper = new VehicleParkingMapper(idFactory);
     var parkingLots = mapper.map(currentNetexIndex.getParkings());
-    System.out.print(parkingLots);
+    parkingService.updateVehicleParking(parkingLots, List.of());
   }
 
   private void addEntriesToGroupMapperForPostProcessingLater() {
diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
index 11003ea2561..a6ee863596e 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -42,6 +42,8 @@ VehicleParking map(Parking parking) {
       .name(NonLocalizedString.ofNullable(parking.getName().getValue()))
       .coordinate(WgsCoordinateMapper.mapToDomain(parking.getCentroid()))
       .capacity(mapCapacity(parking))
+      .bicyclePlaces(hasBikes(parking))
+      .carPlaces(!hasBikes(parking))
       .entrance(mapEntrance(parking))
       .build();
   }
@@ -57,13 +59,12 @@ private VehicleParking.VehicleParkingEntranceCreator mapEntrance(Parking parking
 
   private static VehicleParkingSpaces mapCapacity(Parking parking) {
     var builder = VehicleParkingSpaces.builder();
-
-    // we assume that if we have bicycle in vehicle types it's a bicycle parking lot
-    // it's not possible in NeTEx to split the spaces between the types
-    var hasBikes = hasBikes(parking);
     int capacity = parking.getTotalCapacity().intValue();
 
-    if (hasBikes) {
+    // we assume that if we have bicycle in vehicle types it's a bicycle parking lot
+    // it's not possible in NeTEx to split the spaces between the types, so if you want that
+    // you have to define two parking lots with the same coordinates
+    if (hasBikes(parking)) {
       builder.bicycleSpaces(capacity);
     } else {
       builder.carSpaces(capacity);
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java
index de25fc75521..8b21cc21f2c 100644
--- a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java
+++ b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingSpaces.java
@@ -2,6 +2,7 @@
 
 import java.io.Serializable;
 import java.util.Objects;
+import org.opentripplanner.framework.tostring.ToStringBuilder;
 
 /**
  * The number of spaces by type. {@code null} if unknown.
@@ -70,6 +71,16 @@ public boolean equals(Object o) {
     );
   }
 
+  @Override
+  public String toString() {
+    return ToStringBuilder
+      .of(VehicleParkingSpaces.class)
+      .addNum("carSpaces", carSpaces)
+      .addNum("wheelchairAccessibleCarSpaces", wheelchairAccessibleCarSpaces)
+      .addNum("bicycleSpaces", bicycleSpaces)
+      .toString();
+  }
+
   public static class VehicleParkingSpacesBuilder {
 
     private Integer bicycleSpaces;
diff --git a/src/test/java/org/opentripplanner/ConstantsForTests.java b/src/test/java/org/opentripplanner/ConstantsForTests.java
index e74c66e527b..b002d7a3c41 100644
--- a/src/test/java/org/opentripplanner/ConstantsForTests.java
+++ b/src/test/java/org/opentripplanner/ConstantsForTests.java
@@ -31,6 +31,7 @@
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.linking.LinkingDirection;
 import org.opentripplanner.routing.linking.VertexLinker;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
 import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink;
@@ -102,7 +103,8 @@ public static NetexBundle createMinimalNetexNordicBundle() {
     var configuredDataSource = new ConfiguredDataSource<>(dataSource, buildConfig.netexDefaults);
     var transitService = new OtpTransitServiceBuilder(new StopModel(), DataImportIssueStore.NOOP);
 
-    return new NetexConfigure(buildConfig).netexBundle(transitService, configuredDataSource);
+    return new NetexConfigure(buildConfig)
+      .netexBundle(transitService, configuredDataSource, new VehicleParkingService());
   }
 
   public static NetexBundle createMinimalNetexEpipBundle() {
@@ -114,7 +116,8 @@ public static NetexBundle createMinimalNetexEpipBundle() {
     var configuredDataSource = new ConfiguredDataSource<>(dataSource, buildConfig.netexDefaults);
     var transitService = new OtpTransitServiceBuilder(new StopModel(), DataImportIssueStore.NOOP);
 
-    return new NetexConfigure(buildConfig).netexBundle(transitService, configuredDataSource);
+    return new NetexConfigure(buildConfig)
+      .netexBundle(transitService, configuredDataSource, new VehicleParkingService());
   }
 
   /**
diff --git a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
new file mode 100644
index 00000000000..336281fe53d
--- /dev/null
+++ b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
@@ -0,0 +1,86 @@
+package org.opentripplanner.netex.mapping;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.AGRICULTURAL_VEHICLE;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.CAR;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.CAR_WITH_CARAVAN;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.CYCLE;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.PEDAL_CYCLE;
+
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Set;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
+import org.opentripplanner.framework.geometry.WgsCoordinate;
+import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
+import org.rutebanken.netex.model.LocationStructure;
+import org.rutebanken.netex.model.MultilingualString;
+import org.rutebanken.netex.model.Parking;
+import org.rutebanken.netex.model.ParkingVehicleEnumeration;
+import org.rutebanken.netex.model.SimplePoint_VersionStructure;
+
+class VehicleParkingMapperTest {
+
+  private static final VehicleParkingMapper MAPPER = new VehicleParkingMapper(
+    new FeedScopedIdFactory("parking")
+  );
+
+  public static List> carCases() {
+    return List.of(Set.of(), Set.of(CAR, AGRICULTURAL_VEHICLE));
+  }
+
+  @ParameterizedTest
+  @MethodSource("carCases")
+  void mapCarLot(Set vehicleTypes) {
+    var vp = MAPPER.map(parking(vehicleTypes));
+    assertEquals("A name", vp.getName().toString());
+    assertCommonProperties(vp);
+    assertTrue(vp.hasAnyCarPlaces());
+    assertEquals(VehicleParkingSpaces.builder().carSpaces(10).build(), vp.getCapacity());
+  }
+
+  public static List> bicycleCases() {
+    return List.of(Set.of(CYCLE), Set.of(PEDAL_CYCLE, CAR, CAR_WITH_CARAVAN));
+  }
+
+  @ParameterizedTest
+  @MethodSource("bicycleCases")
+  void mapBicycleLot(Set vehicleTypes) {
+    var vp = MAPPER.map(parking(vehicleTypes));
+    assertEquals("A name", vp.getName().toString());
+    assertCommonProperties(vp);
+    assertTrue(vp.hasBicyclePlaces());
+    assertEquals(VehicleParkingSpaces.builder().bicycleSpaces(10).build(), vp.getCapacity());
+  }
+
+  private static void assertCommonProperties(VehicleParking vp) {
+    assertEquals(new WgsCoordinate(10, 20), vp.getCoordinate());
+    assertEquals(
+      "[VehicleParkingEntrance{entranceId: parking:LOT1/entrance, coordinate: (10.0, 20.0), carAccessible: true, walkAccessible: true}]",
+      vp.getEntrances().toString()
+    );
+  }
+
+  private static Parking parking(Set vehicleTypes) {
+    var name = new MultilingualString();
+    name.setValue("A name");
+    var point = new SimplePoint_VersionStructure();
+    var loc = new LocationStructure();
+    loc.setLatitude(new BigDecimal(10));
+    loc.setLongitude(new BigDecimal(20));
+    point.setLocation(loc);
+
+    var parking = new Parking();
+    parking.setId("LOT1");
+    parking.setName(name);
+    parking.setCentroid(point);
+    parking.setTotalCapacity(BigInteger.TEN);
+    parking.getParkingVehicleTypes().addAll(vehicleTypes);
+    return parking;
+  }
+}

From e95b6755b9efb011713368d8dcd55faf74bf6fc6 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 17:54:23 +0200
Subject: [PATCH 1582/1688] Fix building of capacity

---
 .../org/opentripplanner/netex/mapping/VehicleParkingMapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
index a6ee863596e..15ebea466c0 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -70,7 +70,7 @@ private static VehicleParkingSpaces mapCapacity(Parking parking) {
       builder.carSpaces(capacity);
     }
 
-    return builder.carSpaces(capacity).build();
+    return builder.build();
   }
 
   private static boolean hasBikes(Parking parking) {

From b5d492afd92c6ceee0801b553fefaa3340ae9e1c Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 3 Jul 2024 22:53:31 +0200
Subject: [PATCH 1583/1688] Change wiring of vehicle parking

---
 .../org/opentripplanner/netex/NetexBundle.java | 16 ++++++++++------
 .../org/opentripplanner/netex/NetexModule.java |  7 +++++++
 .../netex/configure/NetexConfigure.java        |  7 ++-----
 .../netex/mapping/NetexMapper.java             | 18 ++++++------------
 .../mapping/VehicleParkingMapperTest.java      |  3 +--
 5 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/NetexBundle.java b/src/main/java/org/opentripplanner/netex/NetexBundle.java
index c0da007bb10..7d80f431309 100644
--- a/src/main/java/org/opentripplanner/netex/NetexBundle.java
+++ b/src/main/java/org/opentripplanner/netex/NetexBundle.java
@@ -3,6 +3,7 @@
 import jakarta.xml.bind.JAXBException;
 import java.io.Closeable;
 import java.io.IOException;
+import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import org.opentripplanner.datastore.api.CompositeDataSource;
@@ -17,7 +18,7 @@
 import org.opentripplanner.netex.loader.parser.NetexDocumentParser;
 import org.opentripplanner.netex.mapping.NetexMapper;
 import org.opentripplanner.netex.validation.Validator;
-import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.rutebanken.netex.model.PublicationDeliveryStructure;
 import org.slf4j.Logger;
@@ -47,7 +48,6 @@ public class NetexBundle implements Closeable {
   private final double maxStopToShapeSnapDistance;
   private final boolean noTransfersOnIsolatedStops;
   private final boolean ignoreFareFrame;
-  private final VehicleParkingService parkingService;
   /** The NeTEx entities loaded from the input files and passed on to the mapper. */
   private NetexEntityIndex index = new NetexEntityIndex();
   /** Report errors to issue store */
@@ -61,7 +61,6 @@ public NetexBundle(
     CompositeDataSource source,
     NetexDataSourceHierarchy hierarchy,
     OtpTransitServiceBuilder transitBuilder,
-    VehicleParkingService parkingService,
     Set ferryIdsNotAllowedForBicycle,
     double maxStopToShapeSnapDistance,
     boolean noTransfersOnIsolatedStops,
@@ -71,7 +70,6 @@ public NetexBundle(
     this.source = source;
     this.hierarchy = hierarchy;
     this.transitBuilder = transitBuilder;
-    this.parkingService = parkingService;
     this.ferryIdsNotAllowedForBicycle = ferryIdsNotAllowedForBicycle;
     this.maxStopToShapeSnapDistance = maxStopToShapeSnapDistance;
     this.noTransfersOnIsolatedStops = noTransfersOnIsolatedStops;
@@ -97,8 +95,7 @@ public OtpTransitServiceBuilder loadBundle(
         issueStore,
         ferryIdsNotAllowedForBicycle,
         maxStopToShapeSnapDistance,
-        noTransfersOnIsolatedStops,
-        parkingService
+        noTransfersOnIsolatedStops
       );
 
     // Load data
@@ -120,6 +117,13 @@ public void close() throws IOException {
     source.close();
   }
 
+  /**
+   * Return the list of parking lots contained in the netex bundle.
+   */
+  public Collection vehicleParkings() {
+    return mapper.mapVehicleParkings();
+  }
+
   /** Load all files entries in the bundle */
   private void loadFileEntries() {
     // Load global shared files
diff --git a/src/main/java/org/opentripplanner/netex/NetexModule.java b/src/main/java/org/opentripplanner/netex/NetexModule.java
index b9a05d25b10..8c5c0826670 100644
--- a/src/main/java/org/opentripplanner/netex/NetexModule.java
+++ b/src/main/java/org/opentripplanner/netex/NetexModule.java
@@ -13,6 +13,7 @@
 import org.opentripplanner.model.calendar.ServiceDateInterval;
 import org.opentripplanner.model.impl.OtpTransitServiceBuilder;
 import org.opentripplanner.routing.graph.Graph;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingHelper;
 import org.opentripplanner.standalone.config.BuildConfig;
 import org.opentripplanner.transit.service.TransitModel;
 
@@ -100,6 +101,12 @@ public void buildGraph() {
         );
 
         transitModel.validateTimeZones();
+
+        var lots = netexBundle.vehicleParkings();
+        graph.getVehicleParkingService().updateVehicleParking(lots, List.of());
+        var linker = new VehicleParkingHelper(graph);
+        lots.forEach(linker::linkVehicleParkingToGraph);
+
       }
 
       transitModel.updateCalendarServiceData(hasActiveTransit, calendarServiceData, issueStore);
diff --git a/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java b/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
index 7224d243d77..464c03f28e1 100644
--- a/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
+++ b/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
@@ -11,7 +11,6 @@
 import org.opentripplanner.netex.config.NetexFeedParameters;
 import org.opentripplanner.netex.loader.NetexDataSourceHierarchy;
 import org.opentripplanner.routing.graph.Graph;
-import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
 import org.opentripplanner.standalone.config.BuildConfig;
 import org.opentripplanner.transit.service.TransitModel;
 
@@ -47,7 +46,7 @@ public NetexModule createNetexModule(
         transitModel.getStopModel(),
         issueStore
       );
-      netexBundles.add(netexBundle(transitServiceBuilder, it, graph.getVehicleParkingService()));
+      netexBundles.add(netexBundle(transitServiceBuilder, it));
     }
 
     return new NetexModule(
@@ -63,8 +62,7 @@ public NetexModule createNetexModule(
   /** public to enable testing */
   public NetexBundle netexBundle(
     OtpTransitServiceBuilder transitServiceBuilder,
-    ConfiguredDataSource configuredDataSource,
-    VehicleParkingService parkingService
+    ConfiguredDataSource configuredDataSource
   ) {
     var source = (CompositeDataSource) configuredDataSource.dataSource();
     var config = configuredDataSource.config();
@@ -74,7 +72,6 @@ public NetexBundle netexBundle(
       source,
       hierarchy(source, config),
       transitServiceBuilder,
-      parkingService,
       config.ferryIdsNotAllowedForBicycle(),
       buildParams.maxStopToShapeSnapDistance,
       config.noTransfersOnIsolatedStops(),
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
index d99a315a39b..e6a0d724dd4 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
@@ -19,7 +19,7 @@
 import org.opentripplanner.netex.mapping.calendar.CalendarServiceBuilder;
 import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
 import org.opentripplanner.netex.mapping.support.NetexMapperIndexes;
-import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.transit.model.basic.Notice;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
 import org.opentripplanner.transit.model.framework.Deduplicator;
@@ -69,7 +69,6 @@ public class NetexMapper {
   private final Set ferryIdsNotAllowedForBicycle;
   private final double maxStopToShapeSnapDistance;
   private final boolean noTransfersOnIsolatedStops;
-  private final VehicleParkingService parkingService;
 
   /** Map entries that cross reference entities within a group/operator, for example Interchanges. */
   private GroupNetexMapper groupMapper;
@@ -96,8 +95,7 @@ public NetexMapper(
     DataImportIssueStore issueStore,
     Set ferryIdsNotAllowedForBicycle,
     double maxStopToShapeSnapDistance,
-    boolean noTransfersOnIsolatedStops,
-    VehicleParkingService parkingService
+    boolean noTransfersOnIsolatedStops
   ) {
     this.transitBuilder = transitBuilder;
     this.deduplicator = deduplicator;
@@ -106,7 +104,6 @@ public NetexMapper(
     this.ferryIdsNotAllowedForBicycle = ferryIdsNotAllowedForBicycle;
     this.noTransfersOnIsolatedStops = noTransfersOnIsolatedStops;
     this.maxStopToShapeSnapDistance = maxStopToShapeSnapDistance;
-    this.parkingService = parkingService;
     this.calendarServiceBuilder = new CalendarServiceBuilder(idFactory);
     this.tripCalendarBuilder = new TripCalendarBuilder(this.calendarServiceBuilder, issueStore);
   }
@@ -204,8 +201,11 @@ public void mapNetexToOtp(NetexEntityIndexReadOnlyView netexIndex) {
     mapNoticeAssignments();
 
     addEntriesToGroupMapperForPostProcessingLater();
+  }
 
-    mapParkings();
+  public Collection mapVehicleParkings() {
+    var mapper = new VehicleParkingMapper(idFactory);
+    return mapper.map(currentNetexIndex.getParkings());
   }
 
   /* PRIVATE METHODS */
@@ -517,12 +517,6 @@ private void mapNoticeAssignments() {
     }
   }
 
-  private void mapParkings() {
-    var mapper = new VehicleParkingMapper(idFactory);
-    var parkingLots = mapper.map(currentNetexIndex.getParkings());
-    parkingService.updateVehicleParking(parkingLots, List.of());
-  }
-
   private void addEntriesToGroupMapperForPostProcessingLater() {
     if (level != 0) {
       groupMapper.addInterchange(
diff --git a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
index 336281fe53d..98dbf661839 100644
--- a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
+++ b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
@@ -38,7 +38,6 @@ public static List> carCases() {
   @MethodSource("carCases")
   void mapCarLot(Set vehicleTypes) {
     var vp = MAPPER.map(parking(vehicleTypes));
-    assertEquals("A name", vp.getName().toString());
     assertCommonProperties(vp);
     assertTrue(vp.hasAnyCarPlaces());
     assertEquals(VehicleParkingSpaces.builder().carSpaces(10).build(), vp.getCapacity());
@@ -52,13 +51,13 @@ public static List> bicycleCases() {
   @MethodSource("bicycleCases")
   void mapBicycleLot(Set vehicleTypes) {
     var vp = MAPPER.map(parking(vehicleTypes));
-    assertEquals("A name", vp.getName().toString());
     assertCommonProperties(vp);
     assertTrue(vp.hasBicyclePlaces());
     assertEquals(VehicleParkingSpaces.builder().bicycleSpaces(10).build(), vp.getCapacity());
   }
 
   private static void assertCommonProperties(VehicleParking vp) {
+    assertEquals("A name", vp.getName().toString());
     assertEquals(new WgsCoordinate(10, 20), vp.getCoordinate());
     assertEquals(
       "[VehicleParkingEntrance{entranceId: parking:LOT1/entrance, coordinate: (10.0, 20.0), carAccessible: true, walkAccessible: true}]",

From 3133496c81fbbe7ae8af2fc6c324d8688e4a04e1 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 00:02:15 +0200
Subject: [PATCH 1584/1688] Improve building of the links

---
 client/src/components/MapView/MapView.tsx     |  2 +-
 client/src/util/getColorForMode.ts            |  4 ++--
 .../apis/vectortiles/DebugStyleSpec.java      | 23 +++++++++++++++----
 .../apis/vectortiles/model/StyleBuilder.java  | 23 ++++++++++++++++---
 .../graph_builder/GraphBuilder.java           |  2 +-
 .../module/StreetLinkerModule.java            | 22 +-----------------
 .../vector/vertex/VertexPropertyMapper.java   |  6 +++++
 .../netex/mapping/VehicleParkingMapper.java   |  2 +-
 .../opentripplanner/routing/graph/Graph.java  |  6 -----
 .../vehicle_parking/VehicleParkingHelper.java |  3 +--
 .../model/edge/StreetVehicleParkingLink.java  |  7 +++---
 .../vertex/VehicleParkingEntranceVertex.java  | 16 +++++++++++++
 12 files changed, 71 insertions(+), 45 deletions(-)

diff --git a/client/src/components/MapView/MapView.tsx b/client/src/components/MapView/MapView.tsx
index 36d98be79b6..9c3761bb530 100644
--- a/client/src/components/MapView/MapView.tsx
+++ b/client/src/components/MapView/MapView.tsx
@@ -75,7 +75,7 @@ export function MapView({
         }}
         // it's unfortunate that you have to list these layers here.
         // maybe there is a way around it: https://github.com/visgl/react-map-gl/discussions/2343
-        interactiveLayerIds={['regular-stop', 'area-stop', 'group-stop', 'vertex', 'edge', 'link']}
+        interactiveLayerIds={['regular-stop', 'area-stop', 'group-stop', 'parking-vertex', 'vertex', 'edge', 'link']}
         onClick={showFeaturePropPopup}
         // put lat/long in URL and pan to it on page reload
         hash={true}
diff --git a/client/src/util/getColorForMode.ts b/client/src/util/getColorForMode.ts
index 79af525e826..ca7f9fd3474 100644
--- a/client/src/util/getColorForMode.ts
+++ b/client/src/util/getColorForMode.ts
@@ -1,10 +1,10 @@
 import { Mode } from '../gql/graphql.ts';
 
 export const getColorForMode = function (mode: Mode) {
-  if (mode === Mode.Foot) return '#444';
+  if (mode === Mode.Foot) return '#7e7e7e';
   if (mode === Mode.Bicycle) return '#5076D9';
   if (mode === Mode.Scooter) return '#253664';
-  if (mode === Mode.Car) return '#444';
+  if (mode === Mode.Car) return '#191616';
   if (mode === Mode.Rail) return '#86BF8B';
   if (mode === Mode.Coach) return '#25642A';
   if (mode === Mode.Metro) return '#D9B250';
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
index 7741a7a58cb..21cdfee9ef7 100644
--- a/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
+++ b/src/main/java/org/opentripplanner/apis/vectortiles/DebugStyleSpec.java
@@ -23,6 +23,7 @@
 import org.opentripplanner.street.model.edge.StreetVehicleParkingLink;
 import org.opentripplanner.street.model.edge.TemporaryFreeEdge;
 import org.opentripplanner.street.model.edge.TemporaryPartialStreetEdge;
+import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
 
 /**
  *  A Mapbox/Mapblibre style specification for rendering debug information about transit and
@@ -38,7 +39,8 @@ public class DebugStyleSpec {
     "© OpenStreetMap Contributors"
   );
   private static final String MAGENTA = "#f21d52";
-  private static final String GREEN = "#22DD9E";
+  private static final String BRIGHT_GREEN = "#22DD9E";
+  private static final String DARK_GREEN = "#136b04";
   private static final String PURPLE = "#BC55F2";
   private static final String BLACK = "#140d0e";
   private static final int MAX_ZOOM = 23;
@@ -101,7 +103,7 @@ static StyleSpec build(
           .ofId("link")
           .typeLine()
           .vectorSourceLayer(edges)
-          .lineColor(GREEN)
+          .lineColor(BRIGHT_GREEN)
           .edgeFilter(
             StreetTransitStopLink.class,
             StreetTransitEntranceLink.class,
@@ -125,11 +127,24 @@ static StyleSpec build(
           .minZoom(15)
           .maxZoom(MAX_ZOOM)
           .intiallyHidden(),
+        StyleBuilder
+          .ofId("parking-vertex")
+          .typeCircle()
+          .vectorSourceLayer(vertices)
+          .vertexFilter(VehicleParkingEntranceVertex.class)
+          .circleStroke(BLACK, CIRCLE_STROKE)
+          .circleRadius(
+            new ZoomDependentNumber(1, List.of(new ZoomStop(13, 1.4f), new ZoomStop(MAX_ZOOM, 10)))
+          )
+          .circleColor(DARK_GREEN)
+          .minZoom(13)
+          .maxZoom(MAX_ZOOM)
+          .intiallyHidden(),
         StyleBuilder
           .ofId("area-stop")
           .typeFill()
           .vectorSourceLayer(areaStops)
-          .fillColor(GREEN)
+          .fillColor(BRIGHT_GREEN)
           .fillOpacity(0.5f)
           .fillOutlineColor(BLACK)
           .minZoom(6)
@@ -138,7 +153,7 @@ static StyleSpec build(
           .ofId("group-stop")
           .typeFill()
           .vectorSourceLayer(groupStops)
-          .fillColor(GREEN)
+          .fillColor(BRIGHT_GREEN)
           .fillOpacity(0.5f)
           .fillOutlineColor(BLACK)
           .minZoom(6)
diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
index 28c1e792fd1..312eaa9e727 100644
--- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
+++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
@@ -12,6 +12,7 @@
 import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.framework.json.ObjectMappers;
 import org.opentripplanner.street.model.edge.Edge;
+import org.opentripplanner.street.model.vertex.Vertex;
 
 /**
  * Builds a Maplibre/Mapbox vector tile
@@ -37,6 +38,8 @@ public StyleBuilder vectorSourceLayer(VectorSourceLayer source) {
     return sourceLayer(source.vectorLayer());
   }
 
+
+
   public enum LayerType {
     Circle,
     Line,
@@ -192,9 +195,17 @@ public StyleBuilder intiallyHidden() {
    */
   @SafeVarargs
   public final StyleBuilder edgeFilter(Class... classToFilter) {
-    var clazzes = Arrays.stream(classToFilter).map(Class::getSimpleName).toList();
-    filter = ListUtils.combine(List.of("in", "class"), clazzes);
-    return this;
+    return filterClasses(classToFilter);
+  }
+
+
+
+  /**
+   * Only apply the style to the given vertices.
+   */
+  @SafeVarargs
+  public final StyleBuilder vertexFilter(Class... classToFilter) {
+    return filterClasses(classToFilter);
   }
 
   public JsonNode toJson() {
@@ -216,6 +227,12 @@ public JsonNode toJson() {
     return OBJECT_MAPPER.valueToTree(copy);
   }
 
+  private StyleBuilder filterClasses(Class... classToFilter) {
+    var clazzes = Arrays.stream(classToFilter).map(Class::getSimpleName).toList();
+    filter = ListUtils.combine(List.of("in", "class"), clazzes);
+    return this;
+  }
+
   private String validateColor(String color) {
     if (!color.startsWith("#")) {
       throw new IllegalArgumentException("Colors must start with '#'");
diff --git a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java b/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
index c036c113e26..3c1408089a4 100644
--- a/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
+++ b/src/main/java/org/opentripplanner/graph_builder/GraphBuilder.java
@@ -127,7 +127,7 @@ public static GraphBuilder create(
       graphBuilder.addModule(factory.osmBoardingLocationsModule());
     }
 
-    // This module is outside the hasGTFS conditional block because it also links things like bike rental
+    // This module is outside the hasGTFS conditional block because it also links things like parking
     // which need to be handled even when there's no transit.
     graphBuilder.addModule(factory.streetLinkerModule());
 
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java b/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java
index 37334161b0a..48e6e484a0c 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/StreetLinkerModule.java
@@ -258,16 +258,12 @@ private void linkTransitEntrances(Graph graph) {
   }
 
   private void linkVehicleParks(Graph graph, DataImportIssueStore issueStore) {
-    if (graph.hasLinkedBikeParks) {
-      LOG.info("Already linked vehicle parks to graph...");
-      return;
-    }
     LOG.info("Linking vehicle parks to graph...");
     List vehicleParkingToRemove = new ArrayList<>();
     for (VehicleParkingEntranceVertex vehicleParkingEntranceVertex : graph.getVerticesOfType(
       VehicleParkingEntranceVertex.class
     )) {
-      if (vehicleParkingEntranceHasLinks(vehicleParkingEntranceVertex)) {
+      if (vehicleParkingEntranceVertex.isLinkedToGraph()) {
         continue;
       }
 
@@ -296,22 +292,6 @@ private void linkVehicleParks(Graph graph, DataImportIssueStore issueStore) {
       var vehicleParkingService = graph.getVehicleParkingService();
       vehicleParkingService.updateVehicleParking(List.of(), vehicleParkingToRemove);
     }
-    graph.hasLinkedBikeParks = true;
-  }
-
-  private boolean vehicleParkingEntranceHasLinks(
-    VehicleParkingEntranceVertex vehicleParkingEntranceVertex
-  ) {
-    return !(
-      vehicleParkingEntranceVertex
-        .getIncoming()
-        .stream()
-        .allMatch(VehicleParkingEdge.class::isInstance) &&
-      vehicleParkingEntranceVertex
-        .getOutgoing()
-        .stream()
-        .allMatch(VehicleParkingEdge.class::isInstance)
-    );
   }
 
   /**
diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
index a493269cc3b..3bf6a9d8706 100644
--- a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
+++ b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
@@ -9,6 +9,7 @@
 import org.opentripplanner.inspector.vector.KeyValue;
 import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
 import org.opentripplanner.street.model.vertex.BarrierVertex;
+import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
 import org.opentripplanner.street.model.vertex.Vertex;
 
 public class VertexPropertyMapper extends PropertyMapper {
@@ -23,6 +24,11 @@ protected Collection map(Vertex input) {
       switch (input) {
         case BarrierVertex v -> List.of(kv("permission", v.getBarrierPermissions().toString()));
         case VehicleRentalPlaceVertex v -> List.of(kv("rentalId", v.getStation().getId()));
+        case VehicleParkingEntranceVertex v -> List.of(
+          kv("rentalId", v.getVehicleParking().getId()),
+          kv("walkAccessible", Boolean.toString(v.isWalkAccessible())),
+          kv("carAccessible", Boolean.toString(v.isCarAccessible()))
+          );
         default -> List.of();
       };
     return ListUtils.combine(baseProps, properties);
diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
index 15ebea466c0..ffb545d5dd9 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -27,7 +27,7 @@ class VehicleParkingMapper {
     CYCLE
   );
 
-  public VehicleParkingMapper(FeedScopedIdFactory idFactory) {
+  VehicleParkingMapper(FeedScopedIdFactory idFactory) {
     this.idFactory = idFactory;
   }
 
diff --git a/src/main/java/org/opentripplanner/routing/graph/Graph.java b/src/main/java/org/opentripplanner/routing/graph/Graph.java
index 4b6c9938317..6a6d962cf36 100644
--- a/src/main/java/org/opentripplanner/routing/graph/Graph.java
+++ b/src/main/java/org/opentripplanner/routing/graph/Graph.java
@@ -90,12 +90,6 @@ public class Graph implements Serializable {
   /** True if OSM data was loaded into this Graph. */
   public boolean hasStreets = false;
 
-  /**
-   * Have bike parks already been linked to the graph. As the linking happens twice if a base graph
-   * is used, we store information on whether bike park linking should be skipped.
-   */
-
-  public boolean hasLinkedBikeParks = false;
   /**
    * The difference in meters between the WGS84 ellipsoid height and geoid height at the graph's
    * center
diff --git a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java
index 507ce9329ed..257f2805ca2 100644
--- a/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java
+++ b/src/main/java/org/opentripplanner/routing/vehicle_parking/VehicleParkingHelper.java
@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.street.model.edge.StreetVehicleParkingLink;
 import org.opentripplanner.street.model.edge.VehicleParkingEdge;
@@ -30,7 +29,7 @@ public List createVehicleParkingVertices(
       .getEntrances()
       .stream()
       .map(vertexFactory::vehicleParkingEntrance)
-      .collect(Collectors.toList());
+      .toList();
   }
 
   public static void linkVehicleParkingEntrances(
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java b/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
index e682a7bfac1..098e91b1b63 100644
--- a/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
+++ b/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
@@ -2,6 +2,7 @@
 
 import javax.annotation.Nonnull;
 import org.locationtech.jts.geom.LineString;
+import org.opentripplanner.framework.geometry.GeometryUtils;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.routing.api.request.preference.VehicleParkingPreferences;
@@ -95,11 +96,9 @@ public I18NString getName() {
     return vehicleParkingEntranceVertex.getName();
   }
 
+  @Override
   public LineString getGeometry() {
-    return null;
+    return GeometryUtils.makeLineString(fromv.getCoordinate(), tov.getCoordinate());
   }
 
-  public double getDistanceMeters() {
-    return 0;
-  }
 }
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
index a3ab0aa17b0..d43f29ad2bc 100644
--- a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
+++ b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
@@ -1,10 +1,12 @@
 package org.opentripplanner.street.model.vertex;
 
+import java.util.Collection;
 import java.util.Objects;
 import javax.annotation.Nonnull;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingEntrance;
+import org.opentripplanner.street.model.edge.Edge;
 import org.opentripplanner.street.model.edge.StreetVehicleParkingLink;
 import org.opentripplanner.street.model.edge.VehicleParkingEdge;
 
@@ -49,4 +51,18 @@ public boolean isCarAccessible() {
   public boolean isWalkAccessible() {
     return parkingEntrance.isWalkAccessible();
   }
+
+  public boolean isLinkedToGraph(
+  ) {
+    return !(
+      hasLinks(getIncoming()) &&
+        hasLinks(getOutgoing())
+    );
+  }
+
+  private boolean hasLinks(Collection incoming) {
+    return incoming
+      .stream()
+      .allMatch(VehicleParkingEdge.class::isInstance);
+  }
 }

From 96b900489c0a5c58cebb68d64802ada8cdfa7293 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 00:04:59 +0200
Subject: [PATCH 1585/1688] Swap colour order

---
 client/src/util/getColorForMode.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/util/getColorForMode.ts b/client/src/util/getColorForMode.ts
index ca7f9fd3474..cb1ad8b6981 100644
--- a/client/src/util/getColorForMode.ts
+++ b/client/src/util/getColorForMode.ts
@@ -1,10 +1,10 @@
 import { Mode } from '../gql/graphql.ts';
 
 export const getColorForMode = function (mode: Mode) {
-  if (mode === Mode.Foot) return '#7e7e7e';
+  if (mode === Mode.Foot) return '#191616';
   if (mode === Mode.Bicycle) return '#5076D9';
   if (mode === Mode.Scooter) return '#253664';
-  if (mode === Mode.Car) return '#191616';
+  if (mode === Mode.Car) return '#7e7e7e';
   if (mode === Mode.Rail) return '#86BF8B';
   if (mode === Mode.Coach) return '#25642A';
   if (mode === Mode.Metro) return '#D9B250';

From 90ddcec9e9dd7598bcfffce746dba5be2f8b5fdd Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 08:02:56 +0200
Subject: [PATCH 1586/1688] Format code

---
 .../apis/vectortiles/model/StyleBuilder.java  |  4 --
 .../vector/vertex/VertexPropertyMapper.java   |  2 +-
 .../opentripplanner/netex/NetexModule.java    |  1 -
 .../model/edge/StreetVehicleParkingLink.java  |  1 -
 .../vertex/VehicleParkingEntranceVertex.java  | 12 ++---
 .../opentripplanner/ConstantsForTests.java    |  5 +-
 .../apis/vectortiles/style.json               | 46 +++++++++++++++++++
 7 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
index 312eaa9e727..d842b5e6687 100644
--- a/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
+++ b/src/main/java/org/opentripplanner/apis/vectortiles/model/StyleBuilder.java
@@ -38,8 +38,6 @@ public StyleBuilder vectorSourceLayer(VectorSourceLayer source) {
     return sourceLayer(source.vectorLayer());
   }
 
-
-
   public enum LayerType {
     Circle,
     Line,
@@ -198,8 +196,6 @@ public final StyleBuilder edgeFilter(Class... classToFilter) {
     return filterClasses(classToFilter);
   }
 
-
-
   /**
    * Only apply the style to the given vertices.
    */
diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
index 3bf6a9d8706..83b4a675fdb 100644
--- a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
+++ b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
@@ -28,7 +28,7 @@ protected Collection map(Vertex input) {
           kv("rentalId", v.getVehicleParking().getId()),
           kv("walkAccessible", Boolean.toString(v.isWalkAccessible())),
           kv("carAccessible", Boolean.toString(v.isCarAccessible()))
-          );
+        );
         default -> List.of();
       };
     return ListUtils.combine(baseProps, properties);
diff --git a/src/main/java/org/opentripplanner/netex/NetexModule.java b/src/main/java/org/opentripplanner/netex/NetexModule.java
index 8c5c0826670..c0390e9793d 100644
--- a/src/main/java/org/opentripplanner/netex/NetexModule.java
+++ b/src/main/java/org/opentripplanner/netex/NetexModule.java
@@ -106,7 +106,6 @@ public void buildGraph() {
         graph.getVehicleParkingService().updateVehicleParking(lots, List.of());
         var linker = new VehicleParkingHelper(graph);
         lots.forEach(linker::linkVehicleParkingToGraph);
-
       }
 
       transitModel.updateCalendarServiceData(hasActiveTransit, calendarServiceData, issueStore);
diff --git a/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java b/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
index 098e91b1b63..2ad9d0f39c4 100644
--- a/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
+++ b/src/main/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLink.java
@@ -100,5 +100,4 @@ public I18NString getName() {
   public LineString getGeometry() {
     return GeometryUtils.makeLineString(fromv.getCoordinate(), tov.getCoordinate());
   }
-
 }
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
index d43f29ad2bc..91512c98c46 100644
--- a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
+++ b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
@@ -52,17 +52,11 @@ public boolean isWalkAccessible() {
     return parkingEntrance.isWalkAccessible();
   }
 
-  public boolean isLinkedToGraph(
-  ) {
-    return !(
-      hasLinks(getIncoming()) &&
-        hasLinks(getOutgoing())
-    );
+  public boolean isLinkedToGraph() {
+    return !(hasLinks(getIncoming()) && hasLinks(getOutgoing()));
   }
 
   private boolean hasLinks(Collection incoming) {
-    return incoming
-      .stream()
-      .allMatch(VehicleParkingEdge.class::isInstance);
+    return incoming.stream().allMatch(VehicleParkingEdge.class::isInstance);
   }
 }
diff --git a/src/test/java/org/opentripplanner/ConstantsForTests.java b/src/test/java/org/opentripplanner/ConstantsForTests.java
index b002d7a3c41..76826b8c247 100644
--- a/src/test/java/org/opentripplanner/ConstantsForTests.java
+++ b/src/test/java/org/opentripplanner/ConstantsForTests.java
@@ -31,7 +31,6 @@
 import org.opentripplanner.routing.graph.Graph;
 import org.opentripplanner.routing.linking.LinkingDirection;
 import org.opentripplanner.routing.linking.VertexLinker;
-import org.opentripplanner.routing.vehicle_parking.VehicleParkingService;
 import org.opentripplanner.service.vehiclerental.model.RentalVehicleType;
 import org.opentripplanner.service.vehiclerental.model.VehicleRentalStation;
 import org.opentripplanner.service.vehiclerental.street.StreetVehicleRentalLink;
@@ -104,7 +103,7 @@ public static NetexBundle createMinimalNetexNordicBundle() {
     var transitService = new OtpTransitServiceBuilder(new StopModel(), DataImportIssueStore.NOOP);
 
     return new NetexConfigure(buildConfig)
-      .netexBundle(transitService, configuredDataSource, new VehicleParkingService());
+      .netexBundle(transitService, configuredDataSource);
   }
 
   public static NetexBundle createMinimalNetexEpipBundle() {
@@ -117,7 +116,7 @@ public static NetexBundle createMinimalNetexEpipBundle() {
     var transitService = new OtpTransitServiceBuilder(new StopModel(), DataImportIssueStore.NOOP);
 
     return new NetexConfigure(buildConfig)
-      .netexBundle(transitService, configuredDataSource, new VehicleParkingService());
+      .netexBundle(transitService, configuredDataSource);
   }
 
   /**
diff --git a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
index 6f981b7f67d..5a2ed9572e2 100644
--- a/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
+++ b/src/test/resources/org/opentripplanner/apis/vectortiles/style.json
@@ -191,6 +191,52 @@
         "visibility" : "none"
       }
     },
+    {
+      "id" : "parking-vertex",
+      "type" : "circle",
+      "source" : "vectorSource",
+      "source-layer" : "vertices",
+      "minzoom" : 13,
+      "maxzoom" : 23,
+      "paint" : {
+        "circle-stroke-color" : "#140d0e",
+        "circle-stroke-width" : {
+          "base" : 1.0,
+          "stops" : [
+            [
+              15,
+              0.2
+            ],
+            [
+              23,
+              3.0
+            ]
+          ]
+        },
+        "circle-radius" : {
+          "base" : 1.0,
+          "stops" : [
+            [
+              13,
+              1.4
+            ],
+            [
+              23,
+              10.0
+            ]
+          ]
+        },
+        "circle-color" : "#136b04"
+      },
+      "filter" : [
+        "in",
+        "class",
+        "VehicleParkingEntranceVertex"
+      ],
+      "layout" : {
+        "visibility" : "none"
+      }
+    },
     {
       "id" : "area-stop",
       "type" : "fill",

From 39f13f3a75b08809bae948074bb55e99c0834125 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 08:07:49 +0200
Subject: [PATCH 1587/1688] Update snapshot tests

---
 src/test/java/org/opentripplanner/ConstantsForTests.java  | 6 ++----
 .../algorithm/mapping/__snapshots__/CarSnapshotTest.snap  | 8 ++++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/test/java/org/opentripplanner/ConstantsForTests.java b/src/test/java/org/opentripplanner/ConstantsForTests.java
index 76826b8c247..e74c66e527b 100644
--- a/src/test/java/org/opentripplanner/ConstantsForTests.java
+++ b/src/test/java/org/opentripplanner/ConstantsForTests.java
@@ -102,8 +102,7 @@ public static NetexBundle createMinimalNetexNordicBundle() {
     var configuredDataSource = new ConfiguredDataSource<>(dataSource, buildConfig.netexDefaults);
     var transitService = new OtpTransitServiceBuilder(new StopModel(), DataImportIssueStore.NOOP);
 
-    return new NetexConfigure(buildConfig)
-      .netexBundle(transitService, configuredDataSource);
+    return new NetexConfigure(buildConfig).netexBundle(transitService, configuredDataSource);
   }
 
   public static NetexBundle createMinimalNetexEpipBundle() {
@@ -115,8 +114,7 @@ public static NetexBundle createMinimalNetexEpipBundle() {
     var configuredDataSource = new ConfiguredDataSource<>(dataSource, buildConfig.netexDefaults);
     var transitService = new OtpTransitServiceBuilder(new StopModel(), DataImportIssueStore.NOOP);
 
-    return new NetexConfigure(buildConfig)
-      .netexBundle(transitService, configuredDataSource);
+    return new NetexConfigure(buildConfig).netexBundle(transitService, configuredDataSource);
   }
 
   /**
diff --git a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap
index 8f527b15bf7..5d83d85cd7a 100644
--- a/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap
+++ b/src/test/java/org/opentripplanner/routing/algorithm/mapping/__snapshots__/CarSnapshotTest.snap
@@ -28,8 +28,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[
           "generalizedCost" : 61,
           "interlineWithPreviousLeg" : false,
           "legGeometry" : {
-            "length" : 5,
-            "points" : "ya|tGv~{kV??nCEB|Dn@@"
+            "length" : 6,
+            "points" : "ya|tGv~{kV??nCEB|Dn@@??"
           },
           "mode" : "CAR",
           "pathway" : false,
@@ -147,8 +147,8 @@ org.opentripplanner.routing.algorithm.mapping.CarSnapshotTest.directCarPark=[
           "generalizedCost" : 285,
           "interlineWithPreviousLeg" : false,
           "legGeometry" : {
-            "length" : 5,
-            "points" : "gz{tGrd|kVn@@CgElCEB?"
+            "length" : 6,
+            "points" : "gz{tGrd|kV??n@@CgElCEB?"
           },
           "mode" : "WALK",
           "pathway" : false,

From 2dd6589e169b957227965f9e53211a6987a4f235 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 11:10:22 +0200
Subject: [PATCH 1588/1688] Update docs

---
 .../opentripplanner/netex/mapping/VehicleParkingMapper.java   | 3 ++-
 .../street/model/vertex/VehicleParkingEntranceVertex.java     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
index ffb545d5dd9..84dfc201909 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -61,7 +61,8 @@ private static VehicleParkingSpaces mapCapacity(Parking parking) {
     var builder = VehicleParkingSpaces.builder();
     int capacity = parking.getTotalCapacity().intValue();
 
-    // we assume that if we have bicycle in vehicle types it's a bicycle parking lot
+    // we assume that if we have something bicycle-like in the vehicle types it's a bicycle parking
+    // lot
     // it's not possible in NeTEx to split the spaces between the types, so if you want that
     // you have to define two parking lots with the same coordinates
     if (hasBikes(parking)) {
diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
index 91512c98c46..6ba13ecf9b8 100644
--- a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
+++ b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
@@ -53,10 +53,10 @@ public boolean isWalkAccessible() {
   }
 
   public boolean isLinkedToGraph() {
-    return !(hasLinks(getIncoming()) && hasLinks(getOutgoing()));
+    return !(hasNoLinkEdges(getIncoming()) && hasNoLinkEdges(getOutgoing()));
   }
 
-  private boolean hasLinks(Collection incoming) {
+  private boolean hasNoLinkEdges(Collection incoming) {
     return incoming.stream().allMatch(VehicleParkingEdge.class::isInstance);
   }
 }

From aab96e6597b4a95a5d032aba18d6398ce03af8fb Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 11:39:54 +0200
Subject: [PATCH 1589/1688] Update Javadoc and implementation

---
 .../model/vertex/VehicleParkingEntranceVertex.java       | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
index 6ba13ecf9b8..2f389f60817 100644
--- a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
+++ b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
@@ -52,11 +52,14 @@ public boolean isWalkAccessible() {
     return parkingEntrance.isWalkAccessible();
   }
 
+  /**
+   * Is this vertex already linked to the graph with a {@link StreetVehicleParkingLink}?
+   */
   public boolean isLinkedToGraph() {
-    return !(hasNoLinkEdges(getIncoming()) && hasNoLinkEdges(getOutgoing()));
+    return hasLink(getIncoming()) || hasLink(getOutgoing());
   }
 
-  private boolean hasNoLinkEdges(Collection incoming) {
-    return incoming.stream().allMatch(VehicleParkingEdge.class::isInstance);
+  private boolean hasLink(Collection incoming) {
+    return incoming.stream().anyMatch(StreetVehicleParkingLink.class::isInstance);
   }
 }

From 6df518f281b1dc30cc7454c0d8160d231ba11b1d Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 12:05:02 +0200
Subject: [PATCH 1590/1688] Add test for linking

---
 .../edge/StreetVehicleParkingLinkTest.java    | 60 ++++++++++++-------
 1 file changed, 38 insertions(+), 22 deletions(-)

diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
index 99de720a5a2..af03bd754bb 100644
--- a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
+++ b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
@@ -9,6 +9,7 @@
 
 import java.util.Set;
 import java.util.stream.Stream;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -38,37 +39,25 @@ static Stream testCases() {
 
   @ParameterizedTest(name = "Parking[tags={0}], Request[not={1}, select={2}] should traverse={3}")
   @MethodSource("testCases")
-  void foo(Set parkingTags, Set not, Set select, boolean shouldTraverse) {
+  void parkingFilters(
+    Set parkingTags,
+    Set not,
+    Set select,
+    boolean shouldTraverse
+  ) {
     var streetVertex = intersectionVertex(1, 1);
-    var parking = VehicleParking
-      .builder()
-      .id(id("parking"))
-      .coordinate(new WgsCoordinate(1, 1))
-      .tags(parkingTags)
-      .build();
-
-    var entrance = VehicleParkingEntrance
-      .builder()
-      .vehicleParking(parking)
-      .entranceId(id("entrance"))
-      .coordinate(new WgsCoordinate(1, 1))
-      .name(new NonLocalizedString("entrance"))
-      .walkAccessible(true)
-      .carAccessible(true)
-      .build();
-
-    var entranceVertex = new VehicleParkingEntranceVertex(entrance);
+    final var entranceVertex = buildVertex(parkingTags);
 
     var req = StreetSearchRequest.of();
     req.withMode(StreetMode.BIKE_TO_PARK);
     req.withPreferences(p ->
-      p.withBike(bike -> {
+      p.withBike(bike ->
         bike.withParking(parkingPreferences -> {
           parkingPreferences.withRequiredVehicleParkingTags(select);
           parkingPreferences.withBannedVehicleParkingTags(not);
           parkingPreferences.withCost(0);
-        });
-      })
+        })
+      )
     );
 
     var edge = StreetVehicleParkingLink.createStreetVehicleParkingLink(
@@ -84,6 +73,33 @@ void foo(Set parkingTags, Set not, Set select, boolean s
     }
   }
 
+  @Test
+  void isLinkedToGraph() {
+    var vertex = buildVertex(Set.of());
+    assertFalse(vertex.isLinkedToGraph());
+  }
+
+  private static VehicleParkingEntranceVertex buildVertex(Set parkingTags) {
+    var parking = VehicleParking
+      .builder()
+      .id(id("parking"))
+      .coordinate(new WgsCoordinate(1, 1))
+      .tags(parkingTags)
+      .build();
+
+    var entrance = VehicleParkingEntrance
+      .builder()
+      .vehicleParking(parking)
+      .entranceId(id("entrance"))
+      .coordinate(new WgsCoordinate(1, 1))
+      .name(new NonLocalizedString("entrance"))
+      .walkAccessible(true)
+      .carAccessible(true)
+      .build();
+
+    return new VehicleParkingEntranceVertex(entrance);
+  }
+
   private State[] traverse(Vertex fromV, Edge edge, StreetSearchRequest request) {
     var state = new State(fromV, request);
 

From c12d713e32b708ef433908f4d5f0f4f41e4517b6 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 4 Jul 2024 12:33:42 +0200
Subject: [PATCH 1591/1688] Add more tests

---
 .../edge/StreetVehicleParkingLinkTest.java    | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
index af03bd754bb..8a3316e44e0 100644
--- a/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
+++ b/src/test/java/org/opentripplanner/street/model/edge/StreetVehicleParkingLinkTest.java
@@ -18,6 +18,7 @@
 import org.opentripplanner.routing.api.request.StreetMode;
 import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingEntrance;
+import org.opentripplanner.street.model._data.StreetModelForTest;
 import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
 import org.opentripplanner.street.model.vertex.Vertex;
 import org.opentripplanner.street.search.request.StreetSearchRequest;
@@ -74,11 +75,31 @@ void parkingFilters(
   }
 
   @Test
-  void isLinkedToGraph() {
+  void notLinkedToGraph() {
     var vertex = buildVertex(Set.of());
     assertFalse(vertex.isLinkedToGraph());
   }
 
+  @Test
+  void linkedToGraphWithIncoming() {
+    var vertex = buildVertex(Set.of());
+    var streetVertex = StreetModelForTest.intersectionVertex(1, 1);
+    vertex.addIncoming(
+      StreetVehicleParkingLink.createStreetVehicleParkingLink(streetVertex, vertex)
+    );
+    assertTrue(vertex.isLinkedToGraph());
+  }
+
+  @Test
+  void linkedToGraphWithOutgoing() {
+    var vertex = buildVertex(Set.of());
+    var streetVertex = StreetModelForTest.intersectionVertex(1, 1);
+    vertex.addOutgoing(
+      StreetVehicleParkingLink.createStreetVehicleParkingLink(streetVertex, vertex)
+    );
+    assertTrue(vertex.isLinkedToGraph());
+  }
+
   private static VehicleParkingEntranceVertex buildVertex(Set parkingTags) {
     var parking = VehicleParking
       .builder()

From 55257014ad99bd041ef5c3817a4163570785334b Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 8 Jul 2024 17:37:04 +0200
Subject: [PATCH 1592/1688] Use HierarchicalMapById

---
 .../netex/index/NetexEntityIndex.java               | 13 +++++--------
 .../index/api/NetexEntityIndexReadOnlyView.java     |  3 +--
 .../opentripplanner/netex/mapping/NetexMapper.java  |  2 +-
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java b/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
index 9841765f3a3..6a5308f91a3 100644
--- a/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
+++ b/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
@@ -1,9 +1,6 @@
 package org.opentripplanner.netex.index;
 
-import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.Set;
 import org.opentripplanner.netex.index.api.NetexEntityIndexReadOnlyView;
 import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMap;
 import org.opentripplanner.netex.index.api.ReadOnlyHierarchicalMapById;
@@ -101,7 +98,7 @@ public class NetexEntityIndex {
   public final HierarchicalVersionMapById stopPlaceById;
   public final HierarchicalVersionMapById tariffZonesById;
   public final HierarchicalMapById brandingById;
-  public final Set parkings;
+  public final HierarchicalMapById parkings;
 
   // Relations between entities - The Netex XML sometimes relies on the
   // nested structure of the XML document, rater than explicit references.
@@ -147,7 +144,7 @@ public NetexEntityIndex() {
     this.tariffZonesById = new HierarchicalVersionMapById<>();
     this.brandingById = new HierarchicalMapById<>();
     this.timeZone = new HierarchicalElement<>();
-    this.parkings = new HashSet<>(0);
+    this.parkings = new HierarchicalMapById<>();
   }
 
   /**
@@ -190,7 +187,7 @@ public NetexEntityIndex(NetexEntityIndex parent) {
     this.tariffZonesById = new HierarchicalVersionMapById<>(parent.tariffZonesById);
     this.brandingById = new HierarchicalMapById<>(parent.brandingById);
     this.timeZone = new HierarchicalElement<>(parent.timeZone);
-    this.parkings = new HashSet<>(parent.parkings);
+    this.parkings = new HierarchicalMapById<>(parent.parkings);
   }
 
   /**
@@ -361,8 +358,8 @@ public ReadOnlyHierarchicalVersionMapById getStopPlaceById() {
       }
 
       @Override
-      public ImmutableSet getParkings() {
-        return ImmutableSet.copyOf(parkings);
+      public ReadOnlyHierarchicalMapById getParkings() {
+        return parkings;
       }
 
       @Override
diff --git a/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java b/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
index 9229f40c7f8..24a3d7a8ac4 100644
--- a/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
+++ b/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
@@ -1,6 +1,5 @@
 package org.opentripplanner.netex.index.api;
 
-import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
 import org.rutebanken.netex.model.Authority;
 import org.rutebanken.netex.model.Branding;
@@ -82,7 +81,7 @@ public interface NetexEntityIndexReadOnlyView {
 
   ReadOnlyHierarchicalVersionMapById getStopPlaceById();
 
-  ImmutableSet getParkings();
+  ReadOnlyHierarchicalMapById getParkings();
 
   ReadOnlyHierarchicalVersionMapById getTariffZonesById();
 
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
index e6a0d724dd4..e88a75f750a 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
@@ -205,7 +205,7 @@ public void mapNetexToOtp(NetexEntityIndexReadOnlyView netexIndex) {
 
   public Collection mapVehicleParkings() {
     var mapper = new VehicleParkingMapper(idFactory);
-    return mapper.map(currentNetexIndex.getParkings());
+    return mapper.map(currentNetexIndex.getParkings().localValues());
   }
 
   /* PRIVATE METHODS */

From b06433000a7b05265519d7e40b181f540c3445d4 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Mon, 8 Jul 2024 18:57:52 +0000
Subject: [PATCH 1593/1688] Add changelog entry for #5909 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 5712915216c..38fb046f344 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -41,6 +41,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Fix NullPointerException in stop transfer priority cost vector generation [#5943](https://github.com/opentripplanner/OpenTripPlanner/pull/5943)
 - Convert transferSlack configuration to duration [#5897](https://github.com/opentripplanner/OpenTripPlanner/pull/5897)
 - Expose stop transfer priority in Transmodel API [#5942](https://github.com/opentripplanner/OpenTripPlanner/pull/5942)
+- Add rental system to GraphQL API [#5909](https://github.com/opentripplanner/OpenTripPlanner/pull/5909)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 0579e22f62266975b73fc9f46c183ec5e7a4abe9 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Jul 2024 07:42:48 +0000
Subject: [PATCH 1594/1688] Update micrometer.version to v1.13.2

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b177a1e1d41..8ecd21a9a75 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
         2.17.1
         3.1.7
         5.10.3
-        1.13.0
+        1.13.2
         5.5.3
         1.5.6
         9.11.1

From 0a34d24d26001ff34220930b9e37c9b9fbbcc4a2 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 9 Jul 2024 10:42:05 +0200
Subject: [PATCH 1595/1688] Increase container image pruning to 365 days [ci
 skip]

---
 .github/workflows/prune-container-images.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/prune-container-images.yml b/.github/workflows/prune-container-images.yml
index f3987a064a9..c1653701c3b 100644
--- a/.github/workflows/prune-container-images.yml
+++ b/.github/workflows/prune-container-images.yml
@@ -19,4 +19,4 @@ jobs:
           # remove all snapshot container images that have not been pulled for over a year
           # --keep-semver makes sure that any image with a x.y.z version scheme is unaffected by this
           pip install prune-container-repo==0.0.4
-          prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=90 --keep-semver --activate
+          prune-container-repo -u ${CONTAINER_REGISTRY_USER} -r ${CONTAINER_REPO} --days=365 --keep-semver --activate

From 203db5de5b894605fb9447656daf40c1b86c8a6f Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Tue, 9 Jul 2024 09:09:56 +0000
Subject: [PATCH 1596/1688] Add changelog entry for #5931 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 38fb046f344..6dd08114790 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -42,6 +42,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Convert transferSlack configuration to duration [#5897](https://github.com/opentripplanner/OpenTripPlanner/pull/5897)
 - Expose stop transfer priority in Transmodel API [#5942](https://github.com/opentripplanner/OpenTripPlanner/pull/5942)
 - Add rental system to GraphQL API [#5909](https://github.com/opentripplanner/OpenTripPlanner/pull/5909)
+- Improve handling of SIRI added trip with unresolvable agency [#5931](https://github.com/opentripplanner/OpenTripPlanner/pull/5931)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From d283fdf25de92f4a792e62b162269e1717821ff0 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 10 Jul 2024 08:47:50 +0200
Subject: [PATCH 1597/1688] Inline isDirty variable

---
 src/main/java/org/opentripplanner/model/TimetableSnapshot.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index 7ddeb6aaa77..7c660a11391 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -314,8 +314,7 @@ public boolean revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate s
 
         if (tripTimesToRemove != null) {
           for (Timetable originalTimetable : sortedTimetables) {
-            boolean isDirty = originalTimetable.getTripTimes().contains(tripTimesToRemove);
-            if (isDirty) {
+            if (originalTimetable.getTripTimes().contains(tripTimesToRemove)) {
               Timetable updatedTimetable = copyTimetable(pattern, serviceDate, originalTimetable);
               updatedTimetable.getTripTimes().remove(tripTimesToRemove);
             }

From c15db15b82fee53046b744b3fc1e56a06e5cd9b1 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 10 Jul 2024 12:00:23 +0200
Subject: [PATCH 1598/1688] Show quay ID in leg view

---
 .../src/components/ItineraryList/ItineraryLegDetails.tsx   | 7 ++++++-
 client/src/hooks/useTripQuery.ts                           | 6 ++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/client/src/components/ItineraryList/ItineraryLegDetails.tsx b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
index 5f0e2b381aa..4b711dc65e8 100644
--- a/client/src/components/ItineraryList/ItineraryLegDetails.tsx
+++ b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
@@ -24,7 +24,12 @@ export function ItineraryLegDetails({ leg, isLast }: { leg: Leg; isLast: boolean
           
         )}{' '}
         
              
-        {leg.mode !== Mode.Foot && {leg.fromPlace.name}} {!isLast && → {leg.toPlace.name}}
+        {leg.mode !== Mode.Foot && (
+          <>
+            {leg.fromPlace.name} →{' '}
+          
+        )}{' '}
+        {!isLast && {leg.toPlace.name}}
       
     
   );
diff --git a/client/src/hooks/useTripQuery.ts b/client/src/hooks/useTripQuery.ts
index c9672d0b6d2..58fabd79ce6 100644
--- a/client/src/hooks/useTripQuery.ts
+++ b/client/src/hooks/useTripQuery.ts
@@ -52,9 +52,15 @@ const query = graphql(`
           duration
           fromPlace {
             name
+            quay {
+              id
+            }
           }
           toPlace {
             name
+            quay {
+              id
+            }
           }
           toEstimatedCall {
             destinationDisplay {

From d770a67567da7724b99e480f8bf3741a436346e4 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 10 Jul 2024 12:21:29 +0200
Subject: [PATCH 1599/1688] Add icon for stay-seated tranfers

---
 .../ItineraryList/ItineraryLegDetails.tsx     | 27 +++++++++++++++++--
 client/src/hooks/useTripQuery.ts              |  6 +++++
 client/src/static/img/stay-seated.svg         |  8 ++++++
 3 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 client/src/static/img/stay-seated.svg

diff --git a/client/src/components/ItineraryList/ItineraryLegDetails.tsx b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
index 4b711dc65e8..1990b7c62ff 100644
--- a/client/src/components/ItineraryList/ItineraryLegDetails.tsx
+++ b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
@@ -2,6 +2,25 @@ import { Leg, Mode } from '../../gql/graphql.ts';
 import { LegTime } from './LegTime.tsx';
 import { formatDistance } from '../../util/formatDistance.ts';
 import { formatDuration } from '../../util/formatDuration.ts';
+import logo from '../../static/img/stay-seated.svg';
+import React from 'react';
+
+const staySeatedIcon: (leg: Leg) => React.JSX.Element = (leg: Leg) => {
+  if (leg.interchangeFrom?.staySeated) {
+    return (
+      Stay-seated transfer
+    );
+  } else {
+    return <>;
+  }
+};
 
 export function ItineraryLegDetails({ leg, isLast }: { leg: Leg; isLast: boolean }) {
   return (
@@ -10,8 +29,12 @@ export function ItineraryLegDetails({ leg, isLast }: { leg: Leg; isLast: boolean
         {formatDistance(leg.distance)}, {formatDuration(leg.duration)}
       
       
              
-         -{' '}
-        
+        {staySeatedIcon(leg)}
+         - 
       
              
       
              
         {leg.mode}{' '}
diff --git a/client/src/hooks/useTripQuery.ts b/client/src/hooks/useTripQuery.ts
index 58fabd79ce6..e50e7019b66 100644
--- a/client/src/hooks/useTripQuery.ts
+++ b/client/src/hooks/useTripQuery.ts
@@ -77,6 +77,12 @@ const query = graphql(`
           pointsOnLink {
             points
           }
+          interchangeTo {
+            staySeated
+          }
+          interchangeFrom {
+            staySeated
+          }
         }
         systemNotices {
           tag
diff --git a/client/src/static/img/stay-seated.svg b/client/src/static/img/stay-seated.svg
new file mode 100644
index 00000000000..a0e451c497f
--- /dev/null
+++ b/client/src/static/img/stay-seated.svg
@@ -0,0 +1,8 @@
+
+
+ 
+  
+  
+  
+ 
+

From 07bdb99d5bf18d352047662abee623a62eb23ba1 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 10 Jul 2024 14:39:24 +0200
Subject: [PATCH 1600/1688] Fix typo

---
 .../openstreetmap/wayproperty/SafetyFeatures.java               | 2 +-
 .../java/org/opentripplanner/generate/doc/OsmMapperDocTest.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
index 37669984405..ab68fd978c2 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/wayproperty/SafetyFeatures.java
@@ -16,7 +16,7 @@ public boolean modifies() {
   /**
    * Does forward and back have the same value?
    */
-  public boolean isSymetric() {
+  public boolean isSymmetric() {
     return forward == back;
   }
 }
diff --git a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
index 443b01fbeb0..3090c696e37 100644
--- a/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
+++ b/src/test/java/org/opentripplanner/generate/doc/OsmMapperDocTest.java
@@ -105,7 +105,7 @@ private static Table mixinTable(WayPropertySet wps) {
   private static String tableValues(SafetyFeatures safety) {
     if (!safety.modifies()) {
       return "";
-    } else if (safety.isSymetric()) {
+    } else if (safety.isSymmetric()) {
       return Double.toString(safety.forward());
     } else {
       return "forward: %s 
               back: %s".formatted(safety.forward(), safety.back());

From 6dfc0be1356a29200a2fc85ff746dc36a92495b0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 10 Jul 2024 22:15:16 +0000
Subject: [PATCH 1601/1688] chore(deps): update dependency
 org.apache.maven.plugins:maven-surefire-plugin to v3.3.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3991bd1936c..cb331acccd5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -242,7 +242,7 @@
             
                 org.apache.maven.plugins
                 maven-surefire-plugin
-                3.3.0
+                3.3.1
                 
                     
                         me.fabriciorby

From 31af1035e22d89b47490ff4a9559c6df050d5b57 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Thu, 11 Jul 2024 09:05:42 +0000
Subject: [PATCH 1602/1688] Add changelog entry for #5941 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 6dd08114790..6ddc5fc5ad9 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -43,6 +43,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Expose stop transfer priority in Transmodel API [#5942](https://github.com/opentripplanner/OpenTripPlanner/pull/5942)
 - Add rental system to GraphQL API [#5909](https://github.com/opentripplanner/OpenTripPlanner/pull/5909)
 - Improve handling of SIRI added trip with unresolvable agency [#5931](https://github.com/opentripplanner/OpenTripPlanner/pull/5931)
+- Fix copy-on-write in TimetableSnapshot [#5941](https://github.com/opentripplanner/OpenTripPlanner/pull/5941)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 962d128f8940d9b1326289c13f4c3f724e9232c0 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Thu, 11 Jul 2024 10:59:53 +0000
Subject: [PATCH 1603/1688] Add changelog entry for #5929 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 6ddc5fc5ad9..cb9b91dcb8c 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -44,6 +44,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Add rental system to GraphQL API [#5909](https://github.com/opentripplanner/OpenTripPlanner/pull/5909)
 - Improve handling of SIRI added trip with unresolvable agency [#5931](https://github.com/opentripplanner/OpenTripPlanner/pull/5931)
 - Fix copy-on-write in TimetableSnapshot [#5941](https://github.com/opentripplanner/OpenTripPlanner/pull/5941)
+- Generate documentation for OSM tag mappers [#5929](https://github.com/opentripplanner/OpenTripPlanner/pull/5929)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 2a397c7b2ae36dd450e7ddd2d8d228d615ca133d Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Thu, 11 Jul 2024 11:08:26 +0000
Subject: [PATCH 1604/1688] Add changelog entry for #5948 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index cb9b91dcb8c..6d84b377de7 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -45,6 +45,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Improve handling of SIRI added trip with unresolvable agency [#5931](https://github.com/opentripplanner/OpenTripPlanner/pull/5931)
 - Fix copy-on-write in TimetableSnapshot [#5941](https://github.com/opentripplanner/OpenTripPlanner/pull/5941)
 - Generate documentation for OSM tag mappers [#5929](https://github.com/opentripplanner/OpenTripPlanner/pull/5929)
+- Disable Legacy REST API by default [#5948](https://github.com/opentripplanner/OpenTripPlanner/pull/5948)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 6d9ff333beed9ab229d382fe6bff324c0623946c Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 11 Jul 2024 14:00:16 +0200
Subject: [PATCH 1605/1688] Update documentation on REST API [ci skip]

---
 docs/apis/Apis.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/apis/Apis.md b/docs/apis/Apis.md
index ab6b41a25cd..9e8f31f6eeb 100644
--- a/docs/apis/Apis.md
+++ b/docs/apis/Apis.md
@@ -25,5 +25,5 @@ The [Geocoder API](../sandbox/GeocoderAPI.md) allows you to geocode stop names a
 The OTP REST API used to power many apps and frontends. For years it was the only way to access
 OTP programmatically.
 
-Over time it has been replaced by the GraphQL APIs and is scheduled to be disabled by default
-and eventually removed completely. It's therefore not recommended to use it.
+Over time it has been replaced by the GraphQL APIs and is now disabled by default
+and will eventually be removed completely. It's therefore not recommended to use it.

From 7695a1efe9faeabc0b8e1ec6ce6ea35d7d5d9f9f Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Mon, 8 Jul 2024 08:04:32 +0200
Subject: [PATCH 1606/1688] Use transit editor service in SIRI timetable
 snapshot source

---
 .../ext/siri/AddedTripBuilderTest.java        | 21 +++---
 .../ext/siri/AddedTripBuilder.java            | 46 ++++++-------
 .../ext/siri/SiriTimetableSnapshotSource.java | 14 ++--
 .../service/DefaultTransitService.java        | 69 +++++++++++++++++++
 .../transit/service/TransitEditorService.java | 21 ++++++
 .../transit/service/TransitModel.java         |  2 -
 .../transit/service/TransitModelIndex.java    |  4 --
 .../transit/service/TransitService.java       |  3 +
 8 files changed, 132 insertions(+), 48 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
index b7431c16091..911fb015c27 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
@@ -35,6 +35,7 @@
 import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.StopModel;
+import org.opentripplanner.transit.service.TransitEditorService;
 import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.updater.spi.UpdateError;
 import uk.org.siri.siri20.VehicleModesEnumeration;
@@ -77,6 +78,7 @@ class AddedTripBuilderTest {
 
   private final Deduplicator DEDUPLICATOR = new Deduplicator();
   private final TransitModel TRANSIT_MODEL = new TransitModel(STOP_MODEL, DEDUPLICATOR);
+  private TransitEditorService TRANSIT_SERVICE;
   private EntityResolver ENTITY_RESOLVER;
 
   @BeforeEach
@@ -101,6 +103,7 @@ void setUp() {
 
     // Create transit model index
     TRANSIT_MODEL.index();
+    TRANSIT_SERVICE = new DefaultTransitService(TRANSIT_MODEL);
 
     // Create the entity resolver only after the model has been indexed
     ENTITY_RESOLVER =
@@ -110,7 +113,7 @@ void setUp() {
   @Test
   void testAddedTrip() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -239,7 +242,7 @@ void testAddedTrip() {
   @Test
   void testAddedTripOnAddedRoute() {
     var firstAddedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -265,7 +268,7 @@ void testAddedTripOnAddedRoute() {
     var tripId2 = TransitModelForTest.id("TRIP_ID_2");
 
     var secondAddedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       tripId2,
@@ -316,7 +319,7 @@ void testAddedTripOnAddedRoute() {
   @Test
   void testAddedTripOnExistingRoute() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -347,7 +350,7 @@ void testAddedTripOnExistingRoute() {
   @Test
   void testAddedTripWithoutReplacedRoute() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -390,7 +393,7 @@ void testAddedTripWithoutReplacedRoute() {
   @Test
   void testAddedTripFailOnMissingServiceId() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -445,7 +448,7 @@ void testAddedTripFailOnNonIncreasingDwellTime() {
     );
 
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -484,7 +487,7 @@ void testAddedTripFailOnTooFewCalls() {
         .build()
     );
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -531,7 +534,7 @@ void testAddedTripFailOnUnknownStop() {
         .build()
     );
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_MODEL,
+      TRANSIT_SERVICE,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
diff --git a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
index aac485da4eb..be5b30b38b9 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/AddedTripBuilder.java
@@ -36,7 +36,7 @@
 import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
 import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 import org.opentripplanner.transit.model.timetable.TripTimesFactory;
-import org.opentripplanner.transit.service.TransitModel;
+import org.opentripplanner.transit.service.TransitEditorService;
 import org.opentripplanner.updater.spi.DataValidationExceptionMapper;
 import org.opentripplanner.updater.spi.UpdateError;
 import org.rutebanken.netex.model.BusSubmodeEnumeration;
@@ -52,7 +52,7 @@
 class AddedTripBuilder {
 
   private static final Logger LOG = LoggerFactory.getLogger(AddedTripBuilder.class);
-  private final TransitModel transitModel;
+  private final TransitEditorService transitService;
   private final EntityResolver entityResolver;
   private final ZoneId timeZone;
   private final Function getTripPatternId;
@@ -73,7 +73,7 @@ class AddedTripBuilder {
 
   AddedTripBuilder(
     EstimatedVehicleJourney estimatedVehicleJourney,
-    TransitModel transitModel,
+    TransitEditorService transitService,
     EntityResolver entityResolver,
     Function getTripPatternId
   ) {
@@ -112,16 +112,16 @@ class AddedTripBuilder {
 
     calls = CallWrapper.of(estimatedVehicleJourney);
 
-    this.transitModel = transitModel;
+    this.transitService = transitService;
     this.entityResolver = entityResolver;
     this.getTripPatternId = getTripPatternId;
-    timeZone = transitModel.getTimeZone();
+    timeZone = transitService.getTimeZone();
 
     replacedTrips = getReplacedVehicleJourneys(estimatedVehicleJourney);
   }
 
   AddedTripBuilder(
-    TransitModel transitModel,
+    TransitEditorService transitService,
     EntityResolver entityResolver,
     Function getTripPatternId,
     FeedScopedId tripId,
@@ -139,9 +139,9 @@ class AddedTripBuilder {
     String headsign,
     List replacedTrips
   ) {
-    this.transitModel = transitModel;
+    this.transitService = transitService;
     this.entityResolver = entityResolver;
-    this.timeZone = transitModel.getTimeZone();
+    this.timeZone = transitService.getTimeZone();
     this.getTripPatternId = getTripPatternId;
     this.tripId = tripId;
     this.operator = operator;
@@ -168,7 +168,7 @@ Result build() {
       return UpdateError.result(tripId, NO_START_DATE);
     }
 
-    FeedScopedId calServiceId = transitModel.getOrCreateServiceIdForDate(serviceDate);
+    FeedScopedId calServiceId = transitService.getOrCreateServiceIdForDate(serviceDate);
     if (calServiceId == null) {
       return UpdateError.result(tripId, NO_START_DATE);
     }
@@ -181,7 +181,7 @@ Result build() {
       }
       route = createRoute(agency);
       LOG.info("Adding route {} to transitModel.", route);
-      transitModel.getTransitModelIndex().addRoutes(route);
+      transitService.addRoutes(route);
     }
 
     Trip trip = createTrip(route, calServiceId);
@@ -221,14 +221,14 @@ Result build() {
     RealTimeTripTimes tripTimes = TripTimesFactory.tripTimes(
       trip,
       aimedStopTimes,
-      transitModel.getDeduplicator()
+      transitService.getDeduplicator()
     );
     // validate the scheduled trip times
     // they are in general superseded by real-time trip times
     // but in case of trip cancellation, OTP will fall back to scheduled trip times
     // therefore they must be valid
     tripTimes.validateNonIncreasingTimes();
-    tripTimes.setServiceCode(transitModel.getServiceCodes().get(trip.getServiceId()));
+    tripTimes.setServiceCode(transitService.getServiceCodeForId(trip.getServiceId()));
     pattern.add(tripTimes);
     RealTimeTripTimes updatedTripTimes = tripTimes.copyScheduledTimes();
 
@@ -267,17 +267,14 @@ Result build() {
 
     // Adding trip to index necessary to include values in graphql-queries
     // TODO - SIRI: should more data be added to index?
-    transitModel.getTransitModelIndex().getTripForId().put(tripId, trip);
-    transitModel.getTransitModelIndex().getPatternForTrip().put(trip, pattern);
-    transitModel.getTransitModelIndex().getPatternsForRoute().put(route, pattern);
-    transitModel
-      .getTransitModelIndex()
-      .getTripOnServiceDateById()
-      .put(tripOnServiceDate.getId(), tripOnServiceDate);
-    transitModel
-      .getTransitModelIndex()
-      .getTripOnServiceDateForTripAndDay()
-      .put(new TripIdAndServiceDate(tripId, serviceDate), tripOnServiceDate);
+    transitService.addTripForId(tripId, trip);
+    transitService.addPatternForTrip(trip, pattern);
+    transitService.addPatternsForRoute(route, pattern);
+    transitService.addTripOnServiceDateById(tripOnServiceDate.getId(), tripOnServiceDate);
+    transitService.addTripOnServiceDateForTripAndDay(
+      new TripIdAndServiceDate(tripId, serviceDate),
+      tripOnServiceDate
+    );
 
     return Result.success(new TripUpdate(stopPattern, updatedTripTimes, serviceDate));
   }
@@ -312,8 +309,7 @@ private Route createRoute(Agency agency) {
    */
   @Nullable
   private Agency resolveAgency() {
-    return transitModel
-      .getTransitModelIndex()
+    return transitService
       .getAllRoutes()
       .stream()
       .filter(r -> r != null && r.getOperator() != null && r.getOperator().equals(operator))
diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index db9c1fcc441..7ab316bfc55 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -23,8 +23,8 @@
 import org.opentripplanner.transit.model.timetable.Trip;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TransitEditorService;
 import org.opentripplanner.transit.service.TransitModel;
-import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.updater.TimetableSnapshotSourceParameters;
 import org.opentripplanner.updater.spi.DataValidationExceptionMapper;
 import org.opentripplanner.updater.spi.UpdateError;
@@ -56,9 +56,8 @@ public class SiriTimetableSnapshotSource implements TimetableSnapshotProvider {
    * messages.
    */
   private final SiriTripPatternCache tripPatternCache;
-  private final TransitModel transitModel;
 
-  private final TransitService transitService;
+  private final TransitEditorService transitService;
 
   private final TimetableSnapshotManager snapshotManager;
 
@@ -72,7 +71,6 @@ public SiriTimetableSnapshotSource(
         parameters,
         () -> LocalDate.now(transitModel.getTimeZone())
       );
-    this.transitModel = transitModel;
     this.transitService = new DefaultTransitService(transitModel);
     this.tripPatternCache =
       new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip);
@@ -115,7 +113,7 @@ public UpdateResult applyEstimatedTimetable(
           var journeys = estimatedJourneyVersion.getEstimatedVehicleJourneies();
           LOG.debug("Handling {} EstimatedVehicleJourneys.", journeys.size());
           for (EstimatedVehicleJourney journey : journeys) {
-            results.add(apply(journey, transitModel, fuzzyTripMatcher, entityResolver));
+            results.add(apply(journey, transitService, fuzzyTripMatcher, entityResolver));
           }
         }
       }
@@ -135,7 +133,7 @@ public TimetableSnapshot getTimetableSnapshot() {
 
   private Result apply(
     EstimatedVehicleJourney journey,
-    TransitModel transitModel,
+    TransitEditorService transitService,
     @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher,
     EntityResolver entityResolver
   ) {
@@ -147,7 +145,7 @@ private Result apply(
         result =
           new AddedTripBuilder(
             journey,
-            transitModel,
+            transitService,
             entityResolver,
             tripPatternIdGenerator::generateUniqueTripPatternId
           )
@@ -265,7 +263,7 @@ private Result handleModifiedTrip(
       pattern,
       estimatedVehicleJourney,
       serviceDate,
-      transitModel.getTimeZone(),
+      transitService.getTimeZone(),
       entityResolver
     )
       .build();
diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
index ca88b7d3130..197860fc8a4 100644
--- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
@@ -34,6 +34,7 @@
 import org.opentripplanner.transit.model.basic.Notice;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
+import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.GroupOfRoutes;
 import org.opentripplanner.transit.model.network.Route;
@@ -181,6 +182,10 @@ public Route getRouteForId(FeedScopedId id) {
     return this.transitModelIndex.getRouteForId(id);
   }
 
+  /**
+   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
+   * this when doing the issue #3030.
+   */
   @Override
   public void addRoutes(Route route) {
     this.transitModelIndex.addRoutes(route);
@@ -259,6 +264,15 @@ public Trip getTripForId(FeedScopedId id) {
     return this.transitModelIndex.getTripForId().get(id);
   }
 
+  /**
+   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
+   * this when doing the issue #3030.
+   */
+  @Override
+  public void addTripForId(FeedScopedId tripId, Trip trip) {
+    transitModelIndex.getTripForId().put(tripId, trip);
+  }
+
   @Override
   public Collection getAllTrips() {
     OTPRequestTimeoutException.checkForTimeout();
@@ -276,6 +290,15 @@ public TripPattern getPatternForTrip(Trip trip) {
     return this.transitModelIndex.getPatternForTrip().get(trip);
   }
 
+  /**
+   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
+   * this when doing the issue #3030.
+   */
+  @Override
+  public void addPatternForTrip(Trip trip, TripPattern pattern) {
+    transitModelIndex.getPatternForTrip().put(trip, pattern);
+  }
+
   @Override
   public TripPattern getPatternForTrip(Trip trip, LocalDate serviceDate) {
     TripPattern realtimePattern = getRealtimeAddedTripPattern(trip.getId(), serviceDate);
@@ -291,6 +314,15 @@ public Collection getPatternsForRoute(Route route) {
     return this.transitModelIndex.getPatternsForRoute().get(route);
   }
 
+  /**
+   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
+   * this when doing the issue #3030.
+   */
+  @Override
+  public void addPatternsForRoute(Route route, TripPattern pattern) {
+    transitModelIndex.getPatternsForRoute().put(route, pattern);
+  }
+
   @Override
   public MultiModalStation getMultiModalStationForStation(Station station) {
     return this.transitModel.getStopModel().getMultiModalStationForStation(station);
@@ -475,6 +507,15 @@ public TripOnServiceDate getTripOnServiceDateById(FeedScopedId datedServiceJourn
     return transitModelIndex.getTripOnServiceDateById().get(datedServiceJourneyId);
   }
 
+  /**
+   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
+   * this when doing the issue #3030.
+   */
+  @Override
+  public void addTripOnServiceDateById(FeedScopedId id, TripOnServiceDate tripOnServiceDate) {
+    transitModelIndex.getTripOnServiceDateById().put(id, tripOnServiceDate);
+  }
+
   @Override
   public Collection getAllTripOnServiceDates() {
     return transitModelIndex.getTripOnServiceDateForTripAndDay().values();
@@ -487,6 +528,29 @@ public TripOnServiceDate getTripOnServiceDateForTripAndDay(
     return transitModelIndex.getTripOnServiceDateForTripAndDay().get(tripIdAndServiceDate);
   }
 
+  /**
+   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
+   * this when doing the issue #3030.
+   */
+  @Override
+  public void addTripOnServiceDateForTripAndDay(
+    TripIdAndServiceDate tripIdAndServiceDate,
+    TripOnServiceDate tripOnServiceDate
+  ) {
+    transitModelIndex
+      .getTripOnServiceDateForTripAndDay()
+      .put(tripIdAndServiceDate, tripOnServiceDate);
+  }
+
+  /**
+   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
+   * this when doing the issue #3030.
+   */
+  @Override
+  public FeedScopedId getOrCreateServiceIdForDate(LocalDate serviceDate) {
+    return transitModel.getOrCreateServiceIdForDate(serviceDate);
+  }
+
   @Override
   public void addTransitMode(TransitMode mode) {
     this.transitModel.addTransitMode(mode);
@@ -579,6 +643,11 @@ public List getModesOfStopLocation(StopLocation stop) {
     return sortByOccurrenceAndReduce(getPatternModesOfStop(stop)).toList();
   }
 
+  @Override
+  public Deduplicator getDeduplicator() {
+    return transitModel.getDeduplicator();
+  }
+
   /**
    * For each pattern visiting this {@link StopLocation} return its {@link TransitMode}
    */
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java b/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
index 7d2f99df71b..6a11fe902f2 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
@@ -1,10 +1,16 @@
 package org.opentripplanner.transit.service;
 
+import java.time.LocalDate;
 import org.opentripplanner.model.FeedInfo;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.TransitLayer;
 import org.opentripplanner.transit.model.basic.TransitMode;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.Route;
+import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.organization.Agency;
+import org.opentripplanner.transit.model.timetable.Trip;
+import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
+import org.opentripplanner.transit.model.timetable.TripOnServiceDate;
 
 /**
  * Entry point for requests (both read-only and read-write) towards the transit API.
@@ -14,9 +20,24 @@ public interface TransitEditorService extends TransitService {
 
   void addFeedInfo(FeedInfo info);
 
+  void addPatternForTrip(Trip trip, TripPattern pattern);
+
+  void addPatternsForRoute(Route route, TripPattern pattern);
+
   void addRoutes(Route route);
 
   void addTransitMode(TransitMode mode);
 
+  void addTripForId(FeedScopedId tripId, Trip trip);
+
+  void addTripOnServiceDateById(FeedScopedId id, TripOnServiceDate tripOnServiceDate);
+
+  void addTripOnServiceDateForTripAndDay(
+    TripIdAndServiceDate tripIdAndServiceDate,
+    TripOnServiceDate tripOnServiceDate
+  );
+
+  FeedScopedId getOrCreateServiceIdForDate(LocalDate serviceDate);
+
   void setTransitLayer(TransitLayer transitLayer);
 }
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
index d5211d5dd2e..27df0941c29 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitModel.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
@@ -254,8 +254,6 @@ public void updateCalendarServiceData(
    * Get or create a serviceId for a given date. This method is used when a new trip is added from a
    * realtime data update. It make sure the date is in the existing transit service period.
    * 
              
-   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
-   *           - this when doing the issue #3030.
    *
    * @param serviceDate service date for the added service id
    * @return service-id for date if it exist or is created. If the given service date is outside the
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java b/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
index 84759ffae72..375e5c57b3d 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
@@ -126,10 +126,6 @@ public Route getRouteForId(FeedScopedId id) {
     return routeForId.get(id);
   }
 
-  /**
-   * TODO OTP2 - This is NOT THREAD-SAFE and is used in the real-time updaters, we need to fix
-   *           - this when doing the issue #3030.
-   */
   public void addRoutes(Route route) {
     routeForId.put(route.getId(), route);
   }
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java
index 83b65c44d12..8469f5ec186 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java
@@ -25,6 +25,7 @@
 import org.opentripplanner.transit.model.basic.Notice;
 import org.opentripplanner.transit.model.basic.TransitMode;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
+import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.network.GroupOfRoutes;
 import org.opentripplanner.transit.model.network.Route;
@@ -231,4 +232,6 @@ List stopTimesForPatternAtStop(
    * So, if more patterns of mode BUS than RAIL visit the stop, the result will be [BUS,RAIL].
    */
   List getModesOfStopLocation(StopLocation stop);
+
+  Deduplicator getDeduplicator();
 }

From b508c79f6c8679b3c40a9bb555a22752b4e7ee12 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 12 Jul 2024 09:53:08 +0200
Subject: [PATCH 1607/1688] Make TimetableSnapshot state final

---
 .../model/TimetableSnapshot.java              | 36 +++++++++++++------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index d7d9385d9b8..7d3f6181d44 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -93,7 +93,7 @@ public class TimetableSnapshot {
    * The compound key approach better reflects the fact that there should be only one Timetable per
    * TripPattern and date.
    */
-  private Map> timetables = new HashMap<>();
+  private final Map> timetables;
 
   /**
    * For cases where the trip pattern (sequence of stops visited) has been changed by a realtime
@@ -101,7 +101,7 @@ public class TimetableSnapshot {
    * trip ID and the service date.
    * TODO RT_AB: clarify if this is an index or the original source of truth.
    */
-  private Map realtimeAddedTripPattern = new HashMap<>();
+  private final Map realtimeAddedTripPattern;
 
   /**
    * This is an index of TripPatterns, not the primary collection. It tracks which TripPatterns
@@ -111,13 +111,13 @@ public class TimetableSnapshot {
    * more than once.
    * TODO RT_AB: More general handling of all realtime indexes outside primary data structures.
    */
-  private SetMultimap patternsForStop = HashMultimap.create();
+  private final SetMultimap patternsForStop;
 
   /**
    * Boolean value indicating that timetable snapshot is read only if true. Once it is true, it
    * shouldn't be possible to change it to false anymore.
    */
-  private boolean readOnly = false;
+  private final boolean readOnly;
 
   /**
    * Boolean value indicating that this timetable snapshot contains changes compared to the state of
@@ -125,6 +125,22 @@ public class TimetableSnapshot {
    */
   private boolean dirty = false;
 
+  public TimetableSnapshot() {
+    this(new HashMap<>(), new HashMap<>(), HashMultimap.create(), false);
+  }
+
+  private TimetableSnapshot(
+    Map> timetables,
+    Map realtimeAddedTripPattern,
+    SetMultimap patternsForStop,
+    boolean readOnly
+  ) {
+    this.timetables = timetables;
+    this.realtimeAddedTripPattern = realtimeAddedTripPattern;
+    this.patternsForStop = patternsForStop;
+    this.readOnly = readOnly;
+  }
+
   /**
    * Returns an updated timetable for the specified pattern if one is available in this snapshot, or
    * the originally scheduled timetable if there are no updates in this snapshot.
@@ -235,12 +251,15 @@ public TimetableSnapshot commit(TransitLayerUpdater transitLayerUpdater, boolean
       throw new ConcurrentModificationException("This TimetableSnapshot is read-only.");
     }
 
-    TimetableSnapshot ret = new TimetableSnapshot();
     if (!force && !this.isDirty()) {
       return null;
     }
-    ret.timetables = Map.copyOf(timetables);
-    ret.realtimeAddedTripPattern = Map.copyOf(realtimeAddedTripPattern);
+    TimetableSnapshot ret = new TimetableSnapshot(
+      Map.copyOf(timetables),
+      Map.copyOf(realtimeAddedTripPattern),
+      ImmutableSetMultimap.copyOf(patternsForStop),
+      true
+    );
 
     if (transitLayerUpdater != null) {
       transitLayerUpdater.update(dirtyTimetables, timetables);
@@ -249,9 +268,6 @@ public TimetableSnapshot commit(TransitLayerUpdater transitLayerUpdater, boolean
     this.dirtyTimetables.clear();
     this.dirty = false;
 
-    ret.patternsForStop = ImmutableSetMultimap.copyOf(patternsForStop);
-
-    ret.readOnly = true; // mark the snapshot as henceforth immutable
     return ret;
   }
 

From 126b60291e63428e716a00354ef0d23d7813e4bf Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 15 Jul 2024 10:18:03 +0200
Subject: [PATCH 1608/1688] Fix Javadoc [ci skip]

---
 .../java/org/opentripplanner/openstreetmap/model/OSMNode.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java b/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java
index a1897d87124..d181cde4564 100644
--- a/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java
+++ b/src/main/java/org/opentripplanner/openstreetmap/model/OSMNode.java
@@ -38,7 +38,8 @@ public boolean hasCrossingTrafficLight() {
     return hasTag("crossing") && "traffic_signals".equals(getTag("crossing"));
   }
 
-  /* Checks if this node is a barrier which prevents motor vehicle traffic
+  /**
+   * Checks if this node is a barrier which prevents motor vehicle traffic.
    *
    * @return true if it is
    */

From c6ae01a5d62fcb0ec61f0f4c832372bc41e00275 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 15 Jul 2024 10:30:42 +0200
Subject: [PATCH 1609/1688] Add test for allPassengerVehicles

---
 .../netex/mapping/VehicleParkingMapperTest.java                | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
index 98dbf661839..b81075a5b0e 100644
--- a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
+++ b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
@@ -3,6 +3,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.AGRICULTURAL_VEHICLE;
+import static org.rutebanken.netex.model.ParkingVehicleEnumeration.ALL_PASSENGER_VEHICLES;
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.CAR;
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.CAR_WITH_CARAVAN;
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.CYCLE;
@@ -31,7 +32,7 @@ class VehicleParkingMapperTest {
   );
 
   public static List> carCases() {
-    return List.of(Set.of(), Set.of(CAR, AGRICULTURAL_VEHICLE));
+    return List.of(Set.of(), Set.of(CAR, AGRICULTURAL_VEHICLE, ALL_PASSENGER_VEHICLES));
   }
 
   @ParameterizedTest

From acaa41fa1167decf003db61a9b70a1c1da24319a Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 15 Jul 2024 16:14:48 +0200
Subject: [PATCH 1610/1688] Take NeTEx hierarchy into account when mapping lots

---
 .../inspector/vector/KeyValue.java            | 21 +++++++++++
 .../vector/vertex/VertexPropertyMapper.java   | 36 ++++++++++++++++---
 .../model/impl/OtpTransitServiceBuilder.java  | 11 ++++++
 .../opentripplanner/netex/NetexBundle.java    |  9 -----
 .../opentripplanner/netex/NetexModule.java    |  2 +-
 .../netex/index/NetexEntityIndex.java         |  2 +-
 .../api/NetexEntityIndexReadOnlyView.java     |  2 +-
 .../netex/mapping/NetexMapper.java            | 25 ++++++++-----
 8 files changed, 83 insertions(+), 25 deletions(-)

diff --git a/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java b/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
index 6c8b0f3aa4e..05429b77fb7 100644
--- a/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
+++ b/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
@@ -1,7 +1,28 @@
 package org.opentripplanner.inspector.vector;
 
+import java.util.Collection;
+import java.util.stream.Collectors;
+import org.opentripplanner.transit.model.framework.FeedScopedId;
+
 public record KeyValue(String key, Object value) {
   public static KeyValue kv(String key, Object value) {
     return new KeyValue(key, value);
   }
+  public static KeyValue kv(String key, FeedScopedId value) {
+    if(value !=null){
+      return new KeyValue(key, value.toString());
+    }
+    else {
+      return new KeyValue(key, null);
+    }
+  }
+
+  /**
+   * Takes a key and a collection of values, calls toString on the values and joins them using
+   * comma as the separator.
+   */
+  public static KeyValue kColl(String key, Collection value) {
+    var values = value.stream().map(Object::toString).collect(Collectors.joining(","));
+    return new KeyValue(key, values);
+  }
 }
diff --git a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
index 83b4a675fdb..01f5263b11a 100644
--- a/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
+++ b/src/main/java/org/opentripplanner/inspector/vector/vertex/VertexPropertyMapper.java
@@ -1,16 +1,22 @@
 package org.opentripplanner.inspector.vector.vertex;
 
+import static org.opentripplanner.inspector.vector.KeyValue.kColl;
 import static org.opentripplanner.inspector.vector.KeyValue.kv;
 
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import org.opentripplanner.apis.support.mapping.PropertyMapper;
 import org.opentripplanner.framework.collection.ListUtils;
 import org.opentripplanner.inspector.vector.KeyValue;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
+import org.opentripplanner.routing.vehicle_parking.VehicleParkingEntrance;
 import org.opentripplanner.service.vehiclerental.street.VehicleRentalPlaceVertex;
 import org.opentripplanner.street.model.vertex.BarrierVertex;
 import org.opentripplanner.street.model.vertex.VehicleParkingEntranceVertex;
 import org.opentripplanner.street.model.vertex.Vertex;
+import org.opentripplanner.street.search.TraverseMode;
 
 public class VertexPropertyMapper extends PropertyMapper {
 
@@ -23,14 +29,36 @@ protected Collection map(Vertex input) {
     List properties =
       switch (input) {
         case BarrierVertex v -> List.of(kv("permission", v.getBarrierPermissions().toString()));
-        case VehicleRentalPlaceVertex v -> List.of(kv("rentalId", v.getStation().getId()));
+        case VehicleRentalPlaceVertex v -> List.of(kv("rentalId", v.getStation()));
         case VehicleParkingEntranceVertex v -> List.of(
-          kv("rentalId", v.getVehicleParking().getId()),
-          kv("walkAccessible", Boolean.toString(v.isWalkAccessible())),
-          kv("carAccessible", Boolean.toString(v.isCarAccessible()))
+          kv("parkingId", v.getVehicleParking().getId()),
+          kColl("spacesFor", spacesFor(v.getVehicleParking())),
+          kColl("traversalPermission", traversalPermissions(v.getParkingEntrance()))
         );
         default -> List.of();
       };
     return ListUtils.combine(baseProps, properties);
   }
+
+  private Set spacesFor(VehicleParking vehicleParking) {
+    var ret = new HashSet();
+    if (vehicleParking.hasAnyCarPlaces()) {
+      ret.add(TraverseMode.CAR);
+    }
+    if (vehicleParking.hasBicyclePlaces()) {
+      ret.add(TraverseMode.BICYCLE);
+    }
+    return ret;
+  }
+
+  private Set traversalPermissions(VehicleParkingEntrance entrance) {
+    var ret = new HashSet();
+    if (entrance.isCarAccessible()) {
+      ret.add(TraverseMode.CAR);
+    }
+    if (entrance.isWalkAccessible()) {
+      ret.add(TraverseMode.WALK);
+    }
+    return ret;
+  }
 }
diff --git a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java
index 43c18cec59d..373b99f0bc6 100644
--- a/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java
+++ b/src/main/java/org/opentripplanner/model/impl/OtpTransitServiceBuilder.java
@@ -24,6 +24,7 @@
 import org.opentripplanner.model.transfer.ConstrainedTransfer;
 import org.opentripplanner.model.transfer.TransferPoint;
 import org.opentripplanner.routing.api.request.framework.TimePenalty;
+import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.transit.model.basic.Notice;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
 import org.opentripplanner.transit.model.framework.DefaultEntityById;
@@ -116,6 +117,8 @@ public class OtpTransitServiceBuilder {
 
   private final EntityById groupOfRouteById = new DefaultEntityById<>();
 
+  private final List vehicleParkings = new ArrayList<>();
+
   private final DataImportIssueStore issueStore;
 
   public OtpTransitServiceBuilder(StopModel stopModel, DataImportIssueStore issueStore) {
@@ -264,6 +267,14 @@ public CalendarServiceData buildCalendarServiceData() {
     );
   }
 
+  /**
+   * The list of parking lots contained in the transit data (so far only NeTEx).
+   * Note that parking lots can also be sourced from OSM data as well as realtime updaters.
+   */
+  public List vehicleParkings() {
+    return vehicleParkings;
+  }
+
   public OtpTransitService build() {
     return new OtpTransitServiceImpl(this);
   }
diff --git a/src/main/java/org/opentripplanner/netex/NetexBundle.java b/src/main/java/org/opentripplanner/netex/NetexBundle.java
index 7d80f431309..8d6f098de89 100644
--- a/src/main/java/org/opentripplanner/netex/NetexBundle.java
+++ b/src/main/java/org/opentripplanner/netex/NetexBundle.java
@@ -3,7 +3,6 @@
 import jakarta.xml.bind.JAXBException;
 import java.io.Closeable;
 import java.io.IOException;
-import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 import org.opentripplanner.datastore.api.CompositeDataSource;
@@ -18,7 +17,6 @@
 import org.opentripplanner.netex.loader.parser.NetexDocumentParser;
 import org.opentripplanner.netex.mapping.NetexMapper;
 import org.opentripplanner.netex.validation.Validator;
-import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.transit.model.framework.Deduplicator;
 import org.rutebanken.netex.model.PublicationDeliveryStructure;
 import org.slf4j.Logger;
@@ -117,13 +115,6 @@ public void close() throws IOException {
     source.close();
   }
 
-  /**
-   * Return the list of parking lots contained in the netex bundle.
-   */
-  public Collection vehicleParkings() {
-    return mapper.mapVehicleParkings();
-  }
-
   /** Load all files entries in the bundle */
   private void loadFileEntries() {
     // Load global shared files
diff --git a/src/main/java/org/opentripplanner/netex/NetexModule.java b/src/main/java/org/opentripplanner/netex/NetexModule.java
index c0390e9793d..2bf3403395c 100644
--- a/src/main/java/org/opentripplanner/netex/NetexModule.java
+++ b/src/main/java/org/opentripplanner/netex/NetexModule.java
@@ -102,7 +102,7 @@ public void buildGraph() {
 
         transitModel.validateTimeZones();
 
-        var lots = netexBundle.vehicleParkings();
+        var lots = transitBuilder.vehicleParkings();
         graph.getVehicleParkingService().updateVehicleParking(lots, List.of());
         var linker = new VehicleParkingHelper(graph);
         lots.forEach(linker::linkVehicleParkingToGraph);
diff --git a/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java b/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
index 6a5308f91a3..0cb94f66a77 100644
--- a/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
+++ b/src/main/java/org/opentripplanner/netex/index/NetexEntityIndex.java
@@ -358,7 +358,7 @@ public ReadOnlyHierarchicalVersionMapById getStopPlaceById() {
       }
 
       @Override
-      public ReadOnlyHierarchicalMapById getParkings() {
+      public ReadOnlyHierarchicalMapById getParkingsById() {
         return parkings;
       }
 
diff --git a/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java b/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
index 24a3d7a8ac4..37b8e9790b9 100644
--- a/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
+++ b/src/main/java/org/opentripplanner/netex/index/api/NetexEntityIndexReadOnlyView.java
@@ -81,7 +81,7 @@ public interface NetexEntityIndexReadOnlyView {
 
   ReadOnlyHierarchicalVersionMapById getStopPlaceById();
 
-  ReadOnlyHierarchicalMapById getParkings();
+  ReadOnlyHierarchicalMapById getParkingsById();
 
   ReadOnlyHierarchicalVersionMapById getTariffZonesById();
 
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
index e88a75f750a..8e3fd6e166d 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
@@ -19,7 +19,6 @@
 import org.opentripplanner.netex.mapping.calendar.CalendarServiceBuilder;
 import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
 import org.opentripplanner.netex.mapping.support.NetexMapperIndexes;
-import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.transit.model.basic.Notice;
 import org.opentripplanner.transit.model.framework.AbstractTransitEntity;
 import org.opentripplanner.transit.model.framework.Deduplicator;
@@ -78,9 +77,9 @@ public class NetexMapper {
 
   /**
    * Shared/cached entity index, used by more than one mapper. This index provides alternative
-   * indexes to netex entites, as well as global indexes to OTP domain objects needed in the mapping
+   * indexes to netex entities, as well as global indexes to OTP domain objects needed in the mapping
    * process. Some of these indexes are feed scoped, and some are file group level scoped. As a rule
-   * of tomb the indexes for OTP Model entities are global(small memory overhead), while the indexes
+   * of thumb the indexes for OTP Model entities are global(small memory overhead), while the indexes
    * for the Netex entities follow the main index {@link  #currentNetexIndex}, hence sopped by file
    * group.
    */
@@ -159,7 +158,7 @@ public void finishUp() {
 
   /**
    * 
              
-   * This method mapes the last Netex file imported using the *local* entities in the hierarchical
+   * This method maps the last Netex file imported using the *local* entities in the hierarchical
    * {@link NetexEntityIndexReadOnlyView}.
    * 
              
    * 
              
@@ -200,12 +199,9 @@ public void mapNetexToOtp(NetexEntityIndexReadOnlyView netexIndex) {
     mapTripPatterns(serviceIds);
     mapNoticeAssignments();
 
-    addEntriesToGroupMapperForPostProcessingLater();
-  }
+    mapVehicleParkings();
 
-  public Collection mapVehicleParkings() {
-    var mapper = new VehicleParkingMapper(idFactory);
-    return mapper.map(currentNetexIndex.getParkings().localValues());
+    addEntriesToGroupMapperForPostProcessingLater();
   }
 
   /* PRIVATE METHODS */
@@ -525,6 +521,17 @@ private void addEntriesToGroupMapperForPostProcessingLater() {
     }
   }
 
+  private void mapVehicleParkings() {
+    var mapper = new VehicleParkingMapper(idFactory);
+    currentNetexIndex
+      .getParkingsById()
+      .localKeys()
+      .forEach(id -> {
+        var parking = mapper.map(currentNetexIndex.getParkingsById().lookup(id));
+        transitBuilder.vehicleParkings().add(parking);
+      });
+  }
+
   /**
    * The start of period is used to find the valid entities based on the current time. This should
    * probably be configurable in the future, or even better incorporate the version number into the

From ac046c67387920bc977f74281e5e284e0bff8bf4 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 15 Jul 2024 18:06:11 +0200
Subject: [PATCH 1611/1688] Take missing capacity into account

---
 .../netex/mapping/NetexMapper.java            |  6 ++--
 .../netex/mapping/VehicleParkingMapper.java   | 21 ++++++++----
 .../mapping/VehicleParkingMapperTest.java     | 34 +++++++++++++++----
 3 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
index 8e3fd6e166d..897260fbddb 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
@@ -522,13 +522,15 @@ private void addEntriesToGroupMapperForPostProcessingLater() {
   }
 
   private void mapVehicleParkings() {
-    var mapper = new VehicleParkingMapper(idFactory);
+    var mapper = new VehicleParkingMapper(idFactory, issueStore);
     currentNetexIndex
       .getParkingsById()
       .localKeys()
       .forEach(id -> {
         var parking = mapper.map(currentNetexIndex.getParkingsById().lookup(id));
-        transitBuilder.vehicleParkings().add(parking);
+        if (parking != null) {
+          transitBuilder.vehicleParkings().add(parking);
+        }
       });
   }
 
diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
index 84dfc201909..7f78e7191ef 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -4,10 +4,10 @@
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.E_CYCLE;
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.PEDAL_CYCLE;
 
-import java.util.Collection;
 import java.util.Set;
-import java.util.stream.Collectors;
+import javax.annotation.Nullable;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
+import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
 import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
@@ -26,16 +26,23 @@ class VehicleParkingMapper {
     E_CYCLE,
     CYCLE
   );
+  private final DataImportIssueStore issueStore;
 
-  VehicleParkingMapper(FeedScopedIdFactory idFactory) {
+  VehicleParkingMapper(FeedScopedIdFactory idFactory, DataImportIssueStore issueStore) {
     this.idFactory = idFactory;
+    this.issueStore = issueStore;
   }
 
-  Collection map(Collection parkings) {
-    return parkings.stream().map(this::map).collect(Collectors.toUnmodifiableSet());
-  }
-
+  @Nullable
   VehicleParking map(Parking parking) {
+    if (parking.getTotalCapacity() == null) {
+      issueStore.add(
+        "MissingParkingCapacity",
+        "NeTEx Parking %s does not contain totalCapacity",
+        parking.getId()
+      );
+      return null;
+    }
     return VehicleParking
       .builder()
       .id(idFactory.createId(parking.getId()))
diff --git a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
index b81075a5b0e..bf56be1be1b 100644
--- a/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
+++ b/src/test/java/org/opentripplanner/netex/mapping/VehicleParkingMapperTest.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.netex.mapping;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.AGRICULTURAL_VEHICLE;
 import static org.rutebanken.netex.model.ParkingVehicleEnumeration.ALL_PASSENGER_VEHICLES;
@@ -13,9 +14,13 @@
 import java.math.BigInteger;
 import java.util.List;
 import java.util.Set;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
+import org.opentripplanner.graph_builder.issue.api.DataImportIssue;
+import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
+import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore;
 import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
 import org.opentripplanner.routing.vehicle_parking.VehicleParking;
 import org.opentripplanner.routing.vehicle_parking.VehicleParkingSpaces;
@@ -27,10 +32,6 @@
 
 class VehicleParkingMapperTest {
 
-  private static final VehicleParkingMapper MAPPER = new VehicleParkingMapper(
-    new FeedScopedIdFactory("parking")
-  );
-
   public static List> carCases() {
     return List.of(Set.of(), Set.of(CAR, AGRICULTURAL_VEHICLE, ALL_PASSENGER_VEHICLES));
   }
@@ -38,7 +39,7 @@ public static List> carCases() {
   @ParameterizedTest
   @MethodSource("carCases")
   void mapCarLot(Set vehicleTypes) {
-    var vp = MAPPER.map(parking(vehicleTypes));
+    var vp = mapper().map(parking(vehicleTypes));
     assertCommonProperties(vp);
     assertTrue(vp.hasAnyCarPlaces());
     assertEquals(VehicleParkingSpaces.builder().carSpaces(10).build(), vp.getCapacity());
@@ -51,12 +52,33 @@ public static List> bicycleCases() {
   @ParameterizedTest
   @MethodSource("bicycleCases")
   void mapBicycleLot(Set vehicleTypes) {
-    var vp = MAPPER.map(parking(vehicleTypes));
+    var vp = mapper().map(parking(vehicleTypes));
     assertCommonProperties(vp);
     assertTrue(vp.hasBicyclePlaces());
     assertEquals(VehicleParkingSpaces.builder().bicycleSpaces(10).build(), vp.getCapacity());
   }
 
+  @Test
+  void dropEmptyCapacity() {
+    var parking = parking(Set.of(CAR));
+    parking.setTotalCapacity(null);
+    var issueStore = new DefaultDataImportIssueStore();
+    var vp = mapper(issueStore).map(parking);
+    assertNull(vp);
+    assertEquals(
+      List.of("MissingParkingCapacity"),
+      issueStore.listIssues().stream().map(DataImportIssue::getType).toList()
+    );
+  }
+
+  private VehicleParkingMapper mapper() {
+    return mapper(DataImportIssueStore.NOOP);
+  }
+
+  private static VehicleParkingMapper mapper(DataImportIssueStore issueStore) {
+    return new VehicleParkingMapper(new FeedScopedIdFactory("parking"), issueStore);
+  }
+
   private static void assertCommonProperties(VehicleParking vp) {
     assertEquals("A name", vp.getName().toString());
     assertEquals(new WgsCoordinate(10, 20), vp.getCoordinate());

From 618e0a1a7e2ea7ef438f68ee9c6a1319eb70d675 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Mon, 15 Jul 2024 18:20:39 +0200
Subject: [PATCH 1612/1688] Add more robust null check for issue

---
 .../netex/mapping/VehicleParkingMapper.java      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
index 7f78e7191ef..f0ca2aeb51f 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -38,8 +38,8 @@ VehicleParking map(Parking parking) {
     if (parking.getTotalCapacity() == null) {
       issueStore.add(
         "MissingParkingCapacity",
-        "NeTEx Parking %s does not contain totalCapacity",
-        parking.getId()
+        "NeTEx Parking '%s' does not contain totalCapacity",
+        parkingDebugId(parking)
       );
       return null;
     }
@@ -55,6 +55,18 @@ VehicleParking map(Parking parking) {
       .build();
   }
 
+  private static String parkingDebugId(Parking parking) {
+    if (parking.getId() != null) {
+      return parking.getId();
+    } else if (parking.getName() != null) {
+      return parking.getName().getValue();
+    } else if (parking.getCentroid() != null) {
+      return parking.getCentroid().toString();
+    } else {
+      return parking.toString();
+    }
+  }
+
   private VehicleParking.VehicleParkingEntranceCreator mapEntrance(Parking parking) {
     return builder ->
       builder

From 3dda63ccbffb67727f95d96e6921b5e46f5aa02c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 16 Jul 2024 02:00:58 +0000
Subject: [PATCH 1613/1688] fix(deps): update dependency edu.ucar:netcdf4 to
 v5.6.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index cb331acccd5..b7f26812e99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,7 +64,7 @@
         3.1.7
         5.10.3
         1.13.2
-        5.5.3
+        5.6.0
         1.5.6
         9.11.1
         2.0.13

From 098123a06d344fbea7a84e6e7b3b3439b165b768 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 16 Jul 2024 11:57:05 +0200
Subject: [PATCH 1614/1688] Apply review suggestion

---
 .../ext/siri/AddedTripBuilderTest.java        | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
index 911fb015c27..e322b0ddea9 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
@@ -78,7 +78,7 @@ class AddedTripBuilderTest {
 
   private final Deduplicator DEDUPLICATOR = new Deduplicator();
   private final TransitModel TRANSIT_MODEL = new TransitModel(STOP_MODEL, DEDUPLICATOR);
-  private TransitEditorService TRANSIT_SERVICE;
+  private TransitEditorService transitService;
   private EntityResolver ENTITY_RESOLVER;
 
   @BeforeEach
@@ -103,7 +103,7 @@ void setUp() {
 
     // Create transit model index
     TRANSIT_MODEL.index();
-    TRANSIT_SERVICE = new DefaultTransitService(TRANSIT_MODEL);
+    transitService = new DefaultTransitService(TRANSIT_MODEL);
 
     // Create the entity resolver only after the model has been indexed
     ENTITY_RESOLVER =
@@ -113,7 +113,7 @@ void setUp() {
   @Test
   void testAddedTrip() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -242,7 +242,7 @@ void testAddedTrip() {
   @Test
   void testAddedTripOnAddedRoute() {
     var firstAddedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -268,7 +268,7 @@ void testAddedTripOnAddedRoute() {
     var tripId2 = TransitModelForTest.id("TRIP_ID_2");
 
     var secondAddedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       tripId2,
@@ -319,7 +319,7 @@ void testAddedTripOnAddedRoute() {
   @Test
   void testAddedTripOnExistingRoute() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -350,7 +350,7 @@ void testAddedTripOnExistingRoute() {
   @Test
   void testAddedTripWithoutReplacedRoute() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -393,7 +393,7 @@ void testAddedTripWithoutReplacedRoute() {
   @Test
   void testAddedTripFailOnMissingServiceId() {
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -448,7 +448,7 @@ void testAddedTripFailOnNonIncreasingDwellTime() {
     );
 
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -487,7 +487,7 @@ void testAddedTripFailOnTooFewCalls() {
         .build()
     );
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,
@@ -534,7 +534,7 @@ void testAddedTripFailOnUnknownStop() {
         .build()
     );
     var addedTrip = new AddedTripBuilder(
-      TRANSIT_SERVICE,
+      transitService,
       ENTITY_RESOLVER,
       AbstractTransitEntity::getId,
       TRIP_ID,

From 949a6c7c080507a578440d8213f965f226d54795 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 16 Jul 2024 12:49:13 +0200
Subject: [PATCH 1615/1688] Add comment

---
 docs/examples/entur/build-config.json                         | 3 ++-
 .../opentripplanner/netex/mapping/VehicleParkingMapper.java   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/examples/entur/build-config.json b/docs/examples/entur/build-config.json
index e9351882774..c8f6b4c9ccd 100644
--- a/docs/examples/entur/build-config.json
+++ b/docs/examples/entur/build-config.json
@@ -33,7 +33,8 @@
     {
       "type": "netex",
       "source": "gs://${OTP_GCS_BUCKET}/outbound/netex/rb_norway-aggregated-netex-otp2.zip",
-      "feedId": "EN"
+      "feedId": "EN",
+      "ignoreParkingData": true
     }
   ],
   "osm": [
diff --git a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
index f0ca2aeb51f..862c5f0c648 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/VehicleParkingMapper.java
@@ -55,6 +55,10 @@ VehicleParking map(Parking parking) {
       .build();
   }
 
+  /**
+   * In the Nordic profile many fields of {@link Parking} are optional so even adding the ID to the
+   * issue store can lead to NPEs. For this reason we have a lot of fallbacks.
+   */
   private static String parkingDebugId(Parking parking) {
     if (parking.getId() != null) {
       return parking.getId();

From 44edc443d47947b6bc9ea6294be44d0c03d911fa Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 16 Jul 2024 13:55:46 +0200
Subject: [PATCH 1616/1688] Add config option to ignore parking

---
 docs/BuildConfiguration.md                    |  2 +
 docs/examples/entur/build-config.json         |  2 +-
 .../opentripplanner/netex/NetexBundle.java    |  9 ++--
 .../netex/config/IgnorableFeature.java        |  6 +++
 .../netex/config/NetexFeedParameters.java     | 41 ++++++++++++++-----
 .../netex/configure/NetexConfigure.java       |  2 +-
 .../loader/parser/NetexDocumentParser.java    | 18 ++++----
 .../netex/loader/parser/SiteFrameParser.java  | 13 +++++-
 .../config/buildconfig/NetexConfig.java       |  9 ++++
 .../loader/parser/SiteFrameParserTest.java    |  3 +-
 10 files changed, 79 insertions(+), 26 deletions(-)
 create mode 100644 src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java

diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md
index cefd8d2cf2f..d6c6c87295d 100644
--- a/docs/BuildConfiguration.md
+++ b/docs/BuildConfiguration.md
@@ -78,6 +78,7 @@ Sections follow that describe particular settings in more depth.
 |    [groupFilePattern](#nd_groupFilePattern)                              |   `regexp`  | Pattern for matching group NeTEx files.                                                                                                                        | *Optional* | `"(\w{3})-.*\.xml"`               |  2.0  |
 |    ignoreFareFrame                                                       |  `boolean`  | Ignore contents of the FareFrame                                                                                                                               | *Optional* | `false`                           |  2.3  |
 |    [ignoreFilePattern](#nd_ignoreFilePattern)                            |   `regexp`  | Pattern for matching ignored files in a NeTEx bundle.                                                                                                          | *Optional* | `"$^"`                            |  2.0  |
+|    ignoreParking                                                         |  `boolean`  | Ignore Parking elements.                                                                                                                                       | *Optional* | `false`                           |  2.6  |
 |    noTransfersOnIsolatedStops                                            |  `boolean`  | Whether we should allow transfers to and from StopPlaces marked with LimitedUse.ISOLATED                                                                       | *Optional* | `false`                           |  2.2  |
 |    [sharedFilePattern](#nd_sharedFilePattern)                            |   `regexp`  | Pattern for matching shared NeTEx files in a NeTEx bundle.                                                                                                     | *Optional* | `"shared-data\.xml"`              |  2.0  |
 |    [sharedGroupFilePattern](#nd_sharedGroupFilePattern)                  |   `regexp`  | Pattern for matching shared group NeTEx files in a NeTEx bundle.                                                                                               | *Optional* | `"(\w{3})-.*-shared\.xml"`        |  2.0  |
@@ -106,6 +107,7 @@ Sections follow that describe particular settings in more depth.
 |       [groupFilePattern](#tf_1_groupFilePattern)                         |   `regexp`  | Pattern for matching group NeTEx files.                                                                                                                        | *Optional* | `"(\w{3})-.*\.xml"`               |  2.0  |
 |       ignoreFareFrame                                                    |  `boolean`  | Ignore contents of the FareFrame                                                                                                                               | *Optional* | `false`                           |  2.3  |
 |       [ignoreFilePattern](#tf_1_ignoreFilePattern)                       |   `regexp`  | Pattern for matching ignored files in a NeTEx bundle.                                                                                                          | *Optional* | `"$^"`                            |  2.0  |
+|       ignoreParking                                                      |  `boolean`  | Ignore Parking elements.                                                                                                                                       | *Optional* | `false`                           |  2.6  |
 |       noTransfersOnIsolatedStops                                         |  `boolean`  | Whether we should allow transfers to and from StopPlaces marked with LimitedUse.ISOLATED                                                                       | *Optional* | `false`                           |  2.2  |
 |       [sharedFilePattern](#tf_1_sharedFilePattern)                       |   `regexp`  | Pattern for matching shared NeTEx files in a NeTEx bundle.                                                                                                     | *Optional* | `"shared-data\.xml"`              |  2.0  |
 |       [sharedGroupFilePattern](#tf_1_sharedGroupFilePattern)             |   `regexp`  | Pattern for matching shared group NeTEx files in a NeTEx bundle.                                                                                               | *Optional* | `"(\w{3})-.*-shared\.xml"`        |  2.0  |
diff --git a/docs/examples/entur/build-config.json b/docs/examples/entur/build-config.json
index c8f6b4c9ccd..2acea588234 100644
--- a/docs/examples/entur/build-config.json
+++ b/docs/examples/entur/build-config.json
@@ -34,7 +34,7 @@
       "type": "netex",
       "source": "gs://${OTP_GCS_BUCKET}/outbound/netex/rb_norway-aggregated-netex-otp2.zip",
       "feedId": "EN",
-      "ignoreParkingData": true
+      "ignoreParking": true
     }
   ],
   "osm": [
diff --git a/src/main/java/org/opentripplanner/netex/NetexBundle.java b/src/main/java/org/opentripplanner/netex/NetexBundle.java
index 8d6f098de89..b9b8be224a9 100644
--- a/src/main/java/org/opentripplanner/netex/NetexBundle.java
+++ b/src/main/java/org/opentripplanner/netex/NetexBundle.java
@@ -9,6 +9,7 @@
 import org.opentripplanner.datastore.api.DataSource;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.model.impl.OtpTransitServiceBuilder;
+import org.opentripplanner.netex.config.IgnorableFeature;
 import org.opentripplanner.netex.config.NetexFeedParameters;
 import org.opentripplanner.netex.index.NetexEntityIndex;
 import org.opentripplanner.netex.loader.GroupEntries;
@@ -45,7 +46,7 @@ public class NetexBundle implements Closeable {
   private final Set ferryIdsNotAllowedForBicycle;
   private final double maxStopToShapeSnapDistance;
   private final boolean noTransfersOnIsolatedStops;
-  private final boolean ignoreFareFrame;
+  private final Set ignoredFeatures;
   /** The NeTEx entities loaded from the input files and passed on to the mapper. */
   private NetexEntityIndex index = new NetexEntityIndex();
   /** Report errors to issue store */
@@ -62,7 +63,7 @@ public NetexBundle(
     Set ferryIdsNotAllowedForBicycle,
     double maxStopToShapeSnapDistance,
     boolean noTransfersOnIsolatedStops,
-    boolean ignoreFareFrame
+    Set ignorableFeatures
   ) {
     this.feedId = feedId;
     this.source = source;
@@ -71,7 +72,7 @@ public NetexBundle(
     this.ferryIdsNotAllowedForBicycle = ferryIdsNotAllowedForBicycle;
     this.maxStopToShapeSnapDistance = maxStopToShapeSnapDistance;
     this.noTransfersOnIsolatedStops = noTransfersOnIsolatedStops;
-    this.ignoreFareFrame = ignoreFareFrame;
+    this.ignoredFeatures = Set.copyOf(ignorableFeatures);
   }
 
   /** load the bundle, map it to the OTP transit model and return */
@@ -179,7 +180,7 @@ private void loadSingeFileEntry(String fileDescription, DataSource entry) {
       LOG.info("reading entity {}: {}", fileDescription, entry.name());
       issueStore.startProcessingSource(entry.name());
       PublicationDeliveryStructure doc = xmlParser.parseXmlDoc(entry.asInputStream());
-      NetexDocumentParser.parseAndPopulateIndex(index, doc, ignoreFareFrame);
+      NetexDocumentParser.parseAndPopulateIndex(index, doc, ignoredFeatures);
     } catch (JAXBException e) {
       throw new RuntimeException(e.getMessage(), e);
     } finally {
diff --git a/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java b/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
new file mode 100644
index 00000000000..4aa44e062d6
--- /dev/null
+++ b/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
@@ -0,0 +1,6 @@
+package org.opentripplanner.netex.config;
+
+public enum IgnorableFeature {
+  FARE_FRAME,
+  PARKING,
+}
diff --git a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
index cffecea0d48..4c0a50105b2 100644
--- a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
+++ b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
@@ -1,6 +1,8 @@
 package org.opentripplanner.netex.config;
 
 import static java.util.Objects.requireNonNull;
+import static org.opentripplanner.netex.config.IgnorableFeature.FARE_FRAME;
+import static org.opentripplanner.netex.config.IgnorableFeature.PARKING;
 
 import java.net.URI;
 import java.util.Collection;
@@ -29,7 +31,7 @@ public class NetexFeedParameters implements DataSourceConfig {
   private static final String SHARED_GROUP_FILE_PATTERN = "(\\w{3})-.*-shared\\.xml";
   private static final String GROUP_FILE_PATTERN = "(\\w{3})-.*\\.xml";
   private static final boolean NO_TRANSFERS_ON_ISOLATED_STOPS = false;
-  private static final boolean IGNORE_FARE_FRAME = false;
+  private static final Set IGNORED_FEATURES = Set.of();
 
   private static final Set FERRY_IDS_NOT_ALLOWED_FOR_BICYCLE = Collections.emptySet();
 
@@ -48,7 +50,7 @@ public class NetexFeedParameters implements DataSourceConfig {
   private final String ignoreFilePattern;
   private final Set ferryIdsNotAllowedForBicycle;
   private final boolean noTransfersOnIsolatedStops;
-  private final boolean ignoreFareFrame;
+  private final Set ignoredFeatures;
 
   private NetexFeedParameters() {
     this.source = null;
@@ -63,7 +65,7 @@ private NetexFeedParameters() {
     }
     this.ferryIdsNotAllowedForBicycle = FERRY_IDS_NOT_ALLOWED_FOR_BICYCLE;
     this.noTransfersOnIsolatedStops = NO_TRANSFERS_ON_ISOLATED_STOPS;
-    this.ignoreFareFrame = IGNORE_FARE_FRAME;
+    this.ignoredFeatures = IGNORED_FEATURES;
   }
 
   private NetexFeedParameters(Builder builder) {
@@ -75,7 +77,7 @@ private NetexFeedParameters(Builder builder) {
     this.ignoreFilePattern = requireNonNull(builder.ignoreFilePattern);
     this.ferryIdsNotAllowedForBicycle = Set.copyOf(builder.ferryIdsNotAllowedForBicycle);
     this.noTransfersOnIsolatedStops = builder.noTransfersOnIsolatedStops;
-    this.ignoreFareFrame = builder.ignoreFareFrame;
+    this.ignoredFeatures = Set.copyOf(builder.ignoredFeatures);
   }
 
   public static Builder of() {
@@ -127,7 +129,11 @@ public boolean noTransfersOnIsolatedStops() {
 
   /** See {@link org.opentripplanner.standalone.config.buildconfig.NetexConfig}. */
   public boolean ignoreFareFrame() {
-    return ignoreFareFrame;
+    return ignoredFeatures.contains(FARE_FRAME);
+  }
+
+  public boolean ignoreParking() {
+    return ignoredFeatures.contains(PARKING);
   }
 
   @Override
@@ -142,7 +148,7 @@ public boolean equals(Object o) {
       sharedFilePattern.equals(that.sharedFilePattern) &&
       sharedGroupFilePattern.equals(that.sharedGroupFilePattern) &&
       groupFilePattern.equals(that.groupFilePattern) &&
-      ignoreFareFrame == that.ignoreFareFrame &&
+      ignoredFeatures == that.ignoredFeatures &&
       ferryIdsNotAllowedForBicycle.equals(that.ferryIdsNotAllowedForBicycle)
     );
   }
@@ -156,7 +162,7 @@ public int hashCode() {
       sharedFilePattern,
       sharedGroupFilePattern,
       groupFilePattern,
-      ignoreFareFrame,
+      ignoredFeatures,
       ferryIdsNotAllowedForBicycle
     );
   }
@@ -171,11 +177,15 @@ public String toString() {
       .addStr("sharedGroupFilePattern", sharedGroupFilePattern, DEFAULT.sharedGroupFilePattern)
       .addStr("groupFilePattern", groupFilePattern, DEFAULT.groupFilePattern)
       .addStr("ignoreFilePattern", ignoreFilePattern, DEFAULT.ignoreFilePattern)
-      .addBoolIfTrue("ignoreFareFrame", ignoreFareFrame)
+      .addCol("ignoredFeatures", ignoredFeatures)
       .addCol("ferryIdsNotAllowedForBicycle", ferryIdsNotAllowedForBicycle, Set.of())
       .toString();
   }
 
+  public Set ignoredFeatures() {
+    return ignoredFeatures;
+  }
+
   public static class Builder {
 
     private final NetexFeedParameters original;
@@ -187,7 +197,7 @@ public static class Builder {
     private String ignoreFilePattern;
     private final Set ferryIdsNotAllowedForBicycle = new HashSet<>();
     private boolean noTransfersOnIsolatedStops;
-    private boolean ignoreFareFrame;
+    private final Set ignoredFeatures;
 
     private Builder(NetexFeedParameters original) {
       this.original = original;
@@ -199,7 +209,7 @@ private Builder(NetexFeedParameters original) {
       this.ignoreFilePattern = original.ignoreFilePattern;
       this.ferryIdsNotAllowedForBicycle.addAll(original.ferryIdsNotAllowedForBicycle);
       this.noTransfersOnIsolatedStops = original.noTransfersOnIsolatedStops;
-      this.ignoreFareFrame = original.ignoreFareFrame;
+      this.ignoredFeatures = new HashSet<>(original.ignoredFeatures);
     }
 
     public URI source() {
@@ -247,7 +257,16 @@ public Builder withNoTransfersOnIsolatedStops(boolean noTransfersOnIsolatedStops
     }
 
     public Builder withIgnoreFareFrame(boolean ignoreFareFrame) {
-      this.ignoreFareFrame = ignoreFareFrame;
+      if (ignoreFareFrame) {
+        this.ignoredFeatures.add(FARE_FRAME);
+      }
+      return this;
+    }
+
+    public Builder withIgnoreParking(boolean ignoreParking) {
+      if (ignoreParking) {
+        this.ignoredFeatures.add(PARKING);
+      }
       return this;
     }
 
diff --git a/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java b/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
index 464c03f28e1..50c49836246 100644
--- a/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
+++ b/src/main/java/org/opentripplanner/netex/configure/NetexConfigure.java
@@ -75,7 +75,7 @@ public NetexBundle netexBundle(
       config.ferryIdsNotAllowedForBicycle(),
       buildParams.maxStopToShapeSnapDistance,
       config.noTransfersOnIsolatedStops(),
-      config.ignoreFareFrame()
+      config.ignoredFeatures()
     );
   }
 
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java b/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
index 925b6dfd019..00ffa8a9d2f 100644
--- a/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
+++ b/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
@@ -1,8 +1,12 @@
 package org.opentripplanner.netex.loader.parser;
 
+import static org.opentripplanner.netex.config.IgnorableFeature.FARE_FRAME;
+
 import jakarta.xml.bind.JAXBElement;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
+import org.opentripplanner.netex.config.IgnorableFeature;
 import org.opentripplanner.netex.index.NetexEntityIndex;
 import org.rutebanken.netex.model.Common_VersionFrameStructure;
 import org.rutebanken.netex.model.CompositeFrame;
@@ -30,11 +34,11 @@ public class NetexDocumentParser {
   private static final Logger LOG = LoggerFactory.getLogger(NetexDocumentParser.class);
 
   private final NetexEntityIndex netexIndex;
-  private final boolean ignoreFareFrame;
+  private final Set ignoredFeatures;
 
-  private NetexDocumentParser(NetexEntityIndex netexIndex, boolean ignoreFareFrame) {
+  private NetexDocumentParser(NetexEntityIndex netexIndex, Set ignoredFeatures) {
     this.netexIndex = netexIndex;
-    this.ignoreFareFrame = ignoreFareFrame;
+    this.ignoredFeatures = ignoredFeatures;
   }
 
   /**
@@ -44,9 +48,9 @@ private NetexDocumentParser(NetexEntityIndex netexIndex, boolean ignoreFareFrame
   public static void parseAndPopulateIndex(
     NetexEntityIndex index,
     PublicationDeliveryStructure doc,
-    boolean ignoreFareFrame
+    Set ignoredFeatures
   ) {
-    new NetexDocumentParser(index, ignoreFareFrame).parse(doc);
+    new NetexDocumentParser(index, ignoredFeatures).parse(doc);
   }
 
   public static void finnishUp() {
@@ -74,8 +78,8 @@ private void parseCommonFrame(Common_VersionFrameStructure value) {
     } else if (value instanceof ServiceFrame) {
       parse((ServiceFrame) value, new ServiceFrameParser(netexIndex.flexibleStopPlaceById));
     } else if (value instanceof SiteFrame) {
-      parse((SiteFrame) value, new SiteFrameParser());
-    } else if (!ignoreFareFrame && value instanceof FareFrame) {
+      parse((SiteFrame) value, new SiteFrameParser(ignoredFeatures));
+    } else if (ignoredFeatures.contains(FARE_FRAME) && value instanceof FareFrame) {
       parse((FareFrame) value, new FareFrameParser());
     } else if (value instanceof CompositeFrame) {
       // We recursively parse composite frames and content until there
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java b/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
index 7651bbb39d9..38cd91ded98 100644
--- a/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
+++ b/src/main/java/org/opentripplanner/netex/loader/parser/SiteFrameParser.java
@@ -1,10 +1,14 @@
 package org.opentripplanner.netex.loader.parser;
 
+import static org.opentripplanner.netex.config.IgnorableFeature.PARKING;
+
 import jakarta.xml.bind.JAXBElement;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.Set;
 import org.opentripplanner.framework.application.OTPFeature;
+import org.opentripplanner.netex.config.IgnorableFeature;
 import org.opentripplanner.netex.index.NetexEntityIndex;
 import org.opentripplanner.netex.support.JAXBUtils;
 import org.rutebanken.netex.model.FlexibleStopPlace;
@@ -36,8 +40,15 @@ class SiteFrameParser extends NetexParser {
   private final Collection tariffZones = new ArrayList<>();
 
   private final Collection quays = new ArrayList<>();
+
   private final Collection parkings = new ArrayList<>(0);
 
+  private final Set ignoredFeatures;
+
+  SiteFrameParser(Set ignoredFeatures) {
+    this.ignoredFeatures = ignoredFeatures;
+  }
+
   @Override
   public void parse(Site_VersionFrameStructure frame) {
     if (frame.getStopPlaces() != null) {
@@ -54,7 +65,7 @@ public void parse(Site_VersionFrameStructure frame) {
       parseTariffZones(frame.getTariffZones().getTariffZone());
     }
 
-    if (frame.getParkings() != null) {
+    if (!ignoredFeatures.contains(PARKING) && frame.getParkings() != null) {
       parseParkings(frame.getParkings().getParking());
     }
     // Keep list sorted alphabetically
diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java b/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
index d4cd4521e54..6be400b7549 100644
--- a/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
@@ -3,6 +3,7 @@
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_0;
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_2;
 import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_3;
+import static org.opentripplanner.standalone.config.framework.json.OtpVersion.V2_6;
 
 import org.opentripplanner.netex.config.NetexFeedParameters;
 import org.opentripplanner.standalone.config.framework.json.NodeAdapter;
@@ -164,6 +165,14 @@ private static NetexFeedParameters.Builder mapFilePatternParameters(
           .summary("Ignore contents of the FareFrame")
           .docDefaultValue(base.ignoreFareFrame())
           .asBoolean(base.ignoreFareFrame())
+      )
+      .withIgnoreParking(
+        config
+          .of("ignoreParking")
+          .since(V2_6)
+          .summary("Ignore Parking elements.")
+          .docDefaultValue(base.ignoreParking())
+          .asBoolean(base.ignoreFareFrame())
       );
   }
 
diff --git a/src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java b/src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java
index efd9365b84d..bc60cff2d0e 100644
--- a/src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java
+++ b/src/test/java/org/opentripplanner/netex/loader/parser/SiteFrameParserTest.java
@@ -6,6 +6,7 @@
 
 import jakarta.xml.bind.JAXBElement;
 import java.util.Collection;
+import java.util.Set;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.netex.NetexTestDataSupport;
 import org.opentripplanner.netex.index.NetexEntityIndex;
@@ -21,7 +22,7 @@ class SiteFrameParserTest {
 
   @Test
   void testParseQuays() {
-    SiteFrameParser siteFrameParser = new SiteFrameParser();
+    SiteFrameParser siteFrameParser = new SiteFrameParser(Set.of());
     SiteFrame siteFrame = OBJECT_FACTORY.createSiteFrame();
     NetexEntityIndex netexEntityIndex = new NetexEntityIndex();
 

From 3a88dd313952d260aae8b4d17e9a5a96cfee2ba4 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 16 Jul 2024 14:06:07 +0200
Subject: [PATCH 1617/1688] Add code reuse

---
 .../netex/config/NetexFeedParameters.java         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
index 4c0a50105b2..5ff5004d0c8 100644
--- a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
+++ b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
@@ -257,15 +257,18 @@ public Builder withNoTransfersOnIsolatedStops(boolean noTransfersOnIsolatedStops
     }
 
     public Builder withIgnoreFareFrame(boolean ignoreFareFrame) {
-      if (ignoreFareFrame) {
-        this.ignoredFeatures.add(FARE_FRAME);
-      }
-      return this;
+      return applyIgnore(ignoreFareFrame, FARE_FRAME);
     }
 
     public Builder withIgnoreParking(boolean ignoreParking) {
-      if (ignoreParking) {
-        this.ignoredFeatures.add(PARKING);
+      return applyIgnore(ignoreParking, PARKING);
+    }
+
+    private Builder applyIgnore(boolean ignore, IgnorableFeature feature) {
+      if (ignore) {
+        ignoredFeatures.add(feature);
+      } else {
+        ignoredFeatures.remove(feature);
       }
       return this;
     }

From e0f60f552b8d535d9c4bf396ca66249863559f94 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 16 Jul 2024 14:53:33 +0200
Subject: [PATCH 1618/1688] Fix TimetableSnapshot merge conflict

---
 .../service/DefaultTransitServiceTest.java    | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
index 0cf72dd4748..54733f084d6 100644
--- a/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
+++ b/src/test/java/org/opentripplanner/transit/service/DefaultTransitServiceTest.java
@@ -6,7 +6,7 @@
 import static org.opentripplanner.transit.model.basic.TransitMode.RAIL;
 import static org.opentripplanner.transit.model.basic.TransitMode.TRAM;
 
-import com.google.common.collect.ImmutableSetMultimap;
+import java.time.LocalDate;
 import java.util.Collection;
 import java.util.List;
 import java.util.Set;
@@ -15,10 +15,13 @@
 import org.opentripplanner.model.TimetableSnapshot;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
 import org.opentripplanner.transit.model.framework.Deduplicator;
+import org.opentripplanner.transit.model.network.StopPattern;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.site.Station;
 import org.opentripplanner.transit.model.site.StopLocation;
+import org.opentripplanner.transit.model.timetable.RealTimeTripTimes;
+import org.opentripplanner.transit.model.timetable.ScheduledTripTimes;
 
 class DefaultTransitServiceTest {
 
@@ -36,6 +39,13 @@ class DefaultTransitServiceTest {
   static TripPattern FERRY_PATTERN = TEST_MODEL.pattern(FERRY).build();
   static TripPattern BUS_PATTERN = TEST_MODEL.pattern(BUS).build();
 
+  static StopPattern REAL_TIME_STOP_PATTERN = TransitModelForTest.stopPattern(STOP_A, STOP_B);
+  static TripPattern REAL_TIME_PATTERN = TEST_MODEL
+    .pattern(BUS)
+    .withStopPattern(REAL_TIME_STOP_PATTERN)
+    .withCreatedByRealtimeUpdater(true)
+    .build();
+
   @BeforeAll
   static void setup() {
     var stopModel = TEST_MODEL
@@ -51,8 +61,16 @@ static void setup() {
 
     transitModel.initTimetableSnapshotProvider(() -> {
       TimetableSnapshot timetableSnapshot = new TimetableSnapshot();
-      timetableSnapshot.setPatternsForStop(ImmutableSetMultimap.of(STOP_B, BUS_PATTERN));
-      return timetableSnapshot;
+      RealTimeTripTimes tripTimes = RealTimeTripTimes.of(
+        ScheduledTripTimes
+          .of()
+          .withTrip(TransitModelForTest.trip("REAL_TIME_TRIP").build())
+          .withDepartureTimes(new int[] { 0, 1 })
+          .build()
+      );
+      timetableSnapshot.update(REAL_TIME_PATTERN, tripTimes, LocalDate.now());
+
+      return timetableSnapshot.commit();
     });
 
     service =
@@ -95,6 +113,6 @@ void getPatternForStopsWithoutRealTime() {
   @Test
   void getPatternForStopsWithRealTime() {
     Collection patternsForStop = service.getPatternsForStop(STOP_B, true);
-    assertEquals(Set.of(FERRY_PATTERN, RAIL_PATTERN, BUS_PATTERN), patternsForStop);
+    assertEquals(Set.of(FERRY_PATTERN, RAIL_PATTERN, REAL_TIME_PATTERN), patternsForStop);
   }
 }

From 1238429266cf33bc079cbb6770f9e6f6e8ecd648 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 16 Jul 2024 15:19:03 +0200
Subject: [PATCH 1619/1688] Add Javadoc

---
 .../org/opentripplanner/netex/config/IgnorableFeature.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java b/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
index 4aa44e062d6..53fe7f87f48 100644
--- a/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
+++ b/src/main/java/org/opentripplanner/netex/config/IgnorableFeature.java
@@ -1,5 +1,8 @@
 package org.opentripplanner.netex.config;
 
+/**
+ * Optional data that can be ignored during the NeTEx parsing process.
+ */
 public enum IgnorableFeature {
   FARE_FRAME,
   PARKING,

From cc659fade4f5a693d01176d7e9da664bf35c840f Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 16 Jul 2024 15:20:28 +0200
Subject: [PATCH 1620/1688] Replace typo in 'finishUp'

---
 src/main/java/org/opentripplanner/netex/NetexBundle.java        | 2 +-
 .../netex/loader/parser/NetexDocumentParser.java                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/NetexBundle.java b/src/main/java/org/opentripplanner/netex/NetexBundle.java
index b9b8be224a9..3cd52cd246e 100644
--- a/src/main/java/org/opentripplanner/netex/NetexBundle.java
+++ b/src/main/java/org/opentripplanner/netex/NetexBundle.java
@@ -137,7 +137,7 @@ private void loadFileEntries() {
       });
     }
     mapper.finishUp();
-    NetexDocumentParser.finnishUp();
+    NetexDocumentParser.finishUp();
   }
 
   /**
diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java b/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
index 00ffa8a9d2f..763217f7e52 100644
--- a/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
+++ b/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
@@ -53,7 +53,7 @@ public static void parseAndPopulateIndex(
     new NetexDocumentParser(index, ignoredFeatures).parse(doc);
   }
 
-  public static void finnishUp() {
+  public static void finishUp() {
     ServiceFrameParser.logSummary();
   }
 

From b5e0ee6a5f609eb53b1892050a39b1eccc19ec66 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 16 Jul 2024 09:47:04 +0200
Subject: [PATCH 1621/1688] Enforce non-null coordinates on multimodal station

---
 .../netex/mapping/MultiModalStationMapper.java            | 8 +++++---
 .../org/opentripplanner/netex/mapping/NetexMapper.java    | 5 +++--
 .../transit/model/site/MultiModalStation.java             | 2 +-
 .../transit/model/site/MultiModalStationTest.java         | 2 ++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java b/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java
index ef4b0a25cfd..5a4fb23bbb9 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/MultiModalStationMapper.java
@@ -1,6 +1,7 @@
 package org.opentripplanner.netex.mapping;
 
 import java.util.Collection;
+import javax.annotation.Nullable;
 import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
@@ -21,6 +22,7 @@ public MultiModalStationMapper(DataImportIssueStore issueStore, FeedScopedIdFact
     this.idFactory = idFactory;
   }
 
+  @Nullable
   MultiModalStation map(StopPlace stopPlace, Collection childStations) {
     MultiModalStationBuilder multiModalStation = MultiModalStation
       .of(idFactory.createId(stopPlace.getId()))
@@ -34,13 +36,13 @@ MultiModalStation map(StopPlace stopPlace, Collection childStations) {
     if (coordinate == null) {
       issueStore.add(
         "MultiModalStationWithoutCoordinates",
-        "MultiModal station {} does not contain any coordinates.",
+        "MultiModal station %s does not contain any coordinates.",
         multiModalStation.getId()
       );
+      return null;
     } else {
       multiModalStation.withCoordinate(coordinate);
+      return multiModalStation.build();
     }
-
-    return multiModalStation.build();
   }
 }
diff --git a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
index c3c9ad2d0ae..991c0477266 100644
--- a/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
+++ b/src/main/java/org/opentripplanner/netex/mapping/NetexMapper.java
@@ -332,8 +332,9 @@ private void mapMultiModalStopPlaces() {
         .getStationsByMultiModalStationRfs()
         .get(multiModalStopPlace.getId());
       var multiModalStation = mapper.map(multiModalStopPlace, stations);
-
-      transitBuilder.stopModel().withMultiModalStation(multiModalStation);
+      if (multiModalStation != null) {
+        transitBuilder.stopModel().withMultiModalStation(multiModalStation);
+      }
     }
   }
 
diff --git a/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java b/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java
index 749b156656e..70f4924e8e1 100644
--- a/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java
+++ b/src/main/java/org/opentripplanner/transit/model/site/MultiModalStation.java
@@ -37,11 +37,11 @@ public class MultiModalStation
     super(builder.getId());
     // Required fields
     this.childStations = Objects.requireNonNull(builder.childStations());
+    this.coordinate = Objects.requireNonNull(builder.coordinate());
     this.name = I18NString.assertHasValue(builder.name());
 
     // Optional fields
     // TODO Make required
-    this.coordinate = builder.coordinate();
     this.code = builder.code();
     this.description = builder.description();
     this.url = builder.url();
diff --git a/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java b/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java
index 4ca8e8d33ea..615b0c49674 100644
--- a/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/site/MultiModalStationTest.java
@@ -8,6 +8,7 @@
 
 import java.util.Set;
 import org.junit.jupiter.api.Test;
+import org.opentripplanner.framework.geometry.WgsCoordinate;
 import org.opentripplanner.framework.i18n.I18NString;
 import org.opentripplanner.framework.i18n.NonLocalizedString;
 import org.opentripplanner.transit.model._data.TransitModelForTest;
@@ -26,6 +27,7 @@ class MultiModalStationTest {
     .of(TransitModelForTest.id(ID))
     .withName(NAME)
     .withChildStations(CHILD_STATIONS)
+    .withCoordinate(new WgsCoordinate(1, 1))
     .build();
 
   @Test

From 5bc0b78079eb2ec97a8e575cd3ec0ba9a2ee58a0 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 16 Jul 2024 13:55:27 +0200
Subject: [PATCH 1622/1688] Apply review suggestion

---
 .../mapping/MultiModalStationMapperTest.java  | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java

diff --git a/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
new file mode 100644
index 00000000000..435ba2878f2
--- /dev/null
+++ b/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
@@ -0,0 +1,32 @@
+package org.opentripplanner.netex.mapping;
+
+import java.util.List;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
+import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore;
+import org.opentripplanner.netex.NetexTestDataSupport;
+import org.opentripplanner.netex.mapping.support.FeedScopedIdFactory;
+import org.opentripplanner.transit.model._data.TransitModelForTest;
+import org.rutebanken.netex.model.StopPlace;
+
+class MultiModalStationMapperTest {
+
+  @Test
+  void testMissingCoordinates() {
+    DataImportIssueStore dataIssueStore = new DefaultDataImportIssueStore();
+    FeedScopedIdFactory feedScopeIdFactory = new FeedScopedIdFactory(TransitModelForTest.FEED_ID);
+    MultiModalStationMapper multiModalStationMapper = new MultiModalStationMapper(
+      dataIssueStore,
+      feedScopeIdFactory
+    );
+    StopPlace stopPlace = new StopPlace();
+    stopPlace.setId(NetexTestDataSupport.STOP_PLACE_ID);
+    Assertions.assertNull(multiModalStationMapper.map(stopPlace, List.of()));
+    Assertions.assertEquals(1, dataIssueStore.listIssues().size());
+    Assertions.assertEquals(
+      "MultiModalStationWithoutCoordinates",
+      dataIssueStore.listIssues().getFirst().getType()
+    );
+  }
+}

From e58ff95647191fdfaed11ad7fbd1d7962942c801 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 16 Jul 2024 15:36:52 +0200
Subject: [PATCH 1623/1688] Apply review suggestion

---
 .../netex/mapping/MultiModalStationMapperTest.java       | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java b/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
index 435ba2878f2..218942d29ef 100644
--- a/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
+++ b/src/test/java/org/opentripplanner/netex/mapping/MultiModalStationMapperTest.java
@@ -1,7 +1,8 @@
 package org.opentripplanner.netex.mapping;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 import java.util.List;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.graph_builder.issue.api.DataImportIssueStore;
 import org.opentripplanner.graph_builder.issue.service.DefaultDataImportIssueStore;
@@ -22,9 +23,9 @@ void testMissingCoordinates() {
     );
     StopPlace stopPlace = new StopPlace();
     stopPlace.setId(NetexTestDataSupport.STOP_PLACE_ID);
-    Assertions.assertNull(multiModalStationMapper.map(stopPlace, List.of()));
-    Assertions.assertEquals(1, dataIssueStore.listIssues().size());
-    Assertions.assertEquals(
+    assertNull(multiModalStationMapper.map(stopPlace, List.of()));
+    assertEquals(1, dataIssueStore.listIssues().size());
+    assertEquals(
       "MultiModalStationWithoutCoordinates",
       dataIssueStore.listIssues().getFirst().getType()
     );

From dffd3d8bd7678a66c52f087a57529593d8f0b3e6 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Tue, 16 Jul 2024 15:33:09 +0000
Subject: [PATCH 1624/1688] Add changelog entry for #5971 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 6d84b377de7..1ae81820e72 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -46,6 +46,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Fix copy-on-write in TimetableSnapshot [#5941](https://github.com/opentripplanner/OpenTripPlanner/pull/5941)
 - Generate documentation for OSM tag mappers [#5929](https://github.com/opentripplanner/OpenTripPlanner/pull/5929)
 - Disable Legacy REST API by default [#5948](https://github.com/opentripplanner/OpenTripPlanner/pull/5948)
+- Enforce non-null coordinates on multimodal station [#5971](https://github.com/opentripplanner/OpenTripPlanner/pull/5971)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 990ce7c52a6a06f020a772c3e95df63d46b45d30 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 17 Jul 2024 11:39:32 +0200
Subject: [PATCH 1625/1688] Invert check

---
 .../netex/loader/parser/NetexDocumentParser.java                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java b/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
index 763217f7e52..f8058f2df8e 100644
--- a/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
+++ b/src/main/java/org/opentripplanner/netex/loader/parser/NetexDocumentParser.java
@@ -79,7 +79,7 @@ private void parseCommonFrame(Common_VersionFrameStructure value) {
       parse((ServiceFrame) value, new ServiceFrameParser(netexIndex.flexibleStopPlaceById));
     } else if (value instanceof SiteFrame) {
       parse((SiteFrame) value, new SiteFrameParser(ignoredFeatures));
-    } else if (ignoredFeatures.contains(FARE_FRAME) && value instanceof FareFrame) {
+    } else if (!ignoredFeatures.contains(FARE_FRAME) && value instanceof FareFrame) {
       parse((FareFrame) value, new FareFrameParser());
     } else if (value instanceof CompositeFrame) {
       // We recursively parse composite frames and content until there

From f99542be1a47d4885db3a4c492eb0533594c408d Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 9 Jul 2024 15:27:48 +0200
Subject: [PATCH 1626/1688] Encapsulate TransitModelIndex

---
 .../ext/siri/AddedTripBuilderTest.java        | 24 +++++-------
 .../module/DirectTransferGenerator.java       |  4 +-
 .../transit/mappers/TransfersMapper.java      |  6 +--
 .../transit/mappers/TransitLayerMapper.java   | 26 ++++++-------
 .../transit/mappers/TransitLayerUpdater.java  | 14 +++----
 .../configure/ConstructApplication.java       |  8 ++--
 .../service/DefaultTransitService.java        | 11 ++++++
 .../transit/service/TransitModel.java         |  7 +++-
 .../transit/service/TransitModelIndex.java    | 38 +++++++++----------
 .../transit/service/TransitService.java       | 11 ++++--
 .../PollingVehiclePositionUpdater.java        | 19 +++++-----
 .../apis/gtfs/GraphQLIntegrationTest.java     | 29 +++++++-------
 .../graph/DefaultRoutingServiceTest.java      | 21 +++++-----
 .../updater/trip/RealtimeTestEnvironment.java |  3 +-
 .../trip/TimetableSnapshotSourceTest.java     | 11 +++---
 .../trip/moduletests/delay/SkippedTest.java   | 13 ++++---
 16 files changed, 126 insertions(+), 119 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
index e322b0ddea9..aa26985c5b9 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
@@ -154,37 +154,34 @@ void testAddedTrip() {
     assertEquals(SubMode.of(SUB_MODE), route.getNetexSubmode(), "submode should be mapped");
     assertNotEquals(REPLACED_ROUTE, route, "Should not re-use replaced route");
 
-    // Assert transit model index
-    var transitModelIndex = TRANSIT_MODEL.getTransitModelIndex();
-    assertNotNull(transitModelIndex);
     assertEquals(
       route,
-      transitModelIndex.getRouteForId(TransitModelForTest.id(LINE_REF)),
+      transitService.getRouteForId(TransitModelForTest.id(LINE_REF)),
       "Route should be added to transit index"
     );
     assertEquals(
       trip,
-      transitModelIndex.getTripForId().get(TRIP_ID),
+      transitService.getTripForId(TRIP_ID),
       "Route should be added to transit index"
     );
-    var pattern = transitModelIndex.getPatternForTrip().get(trip);
+    var pattern = transitService.getPatternForTrip(trip);
     assertNotNull(pattern);
     assertEquals(route, pattern.getRoute());
     assertTrue(
-      transitModelIndex
+      transitService
         .getServiceCodesRunningForDate()
         .get(SERVICE_DATE)
         .contains(TRANSIT_MODEL.getServiceCodes().get(trip.getServiceId())),
       "serviceId should be running on service date"
     );
     assertNotNull(
-      transitModelIndex.getTripOnServiceDateById().get(TRIP_ID),
+      transitService.getTripOnServiceDateById(TRIP_ID),
       "TripOnServiceDate should be added to transit index by id"
     );
     assertNotNull(
-      transitModelIndex
-        .getTripOnServiceDateForTripAndDay()
-        .get(new TripIdAndServiceDate(TRIP_ID, SERVICE_DATE)),
+      transitService.getTripOnServiceDateForTripAndDay(
+        new TripIdAndServiceDate(TRIP_ID, SERVICE_DATE)
+      ),
       "TripOnServiceDate should be added to transit index for trip and day"
     );
 
@@ -299,10 +296,7 @@ void testAddedTripOnAddedRoute() {
     Route route = secondTrip.getRoute();
     assertSame(firstTrip.getRoute(), route, "route be reused from the first trip");
 
-    // Assert transit model index
-    var transitModelIndex = TRANSIT_MODEL.getTransitModelIndex();
-    assertNotNull(transitModelIndex);
-    assertEquals(2, transitModelIndex.getPatternsForRoute().get(route).size());
+    assertEquals(2, transitService.getPatternsForRoute(route).size());
 
     // Assert trip times
     var times = secondAddedTrip.successValue().tripTimes();
diff --git a/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java b/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java
index 287a1a71c21..3137b66070f 100644
--- a/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java
+++ b/src/main/java/org/opentripplanner/graph_builder/module/DirectTransferGenerator.java
@@ -67,9 +67,7 @@ public DirectTransferGenerator(
   @Override
   public void buildGraph() {
     /* Initialize transit model index which is needed by the nearby stop finder. */
-    if (transitModel.getTransitModelIndex() == null) {
-      transitModel.index();
-    }
+    transitModel.index();
 
     /* The linker will use streets if they are available, or straight-line distance otherwise. */
     NearbyStopFinder nearbyStopFinder = createNearbyStopFinder();
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
index 74a5d7a6352..c7e9ea05320 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransfersMapper.java
@@ -6,7 +6,7 @@
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.Transfer;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.service.StopModel;
-import org.opentripplanner.transit.service.TransitModel;
+import org.opentripplanner.transit.service.TransitService;
 
 class TransfersMapper {
 
@@ -14,7 +14,7 @@ class TransfersMapper {
    * Copy pre-calculated transfers from the original graph
    * @return a list where each element is a list of transfers for the corresponding stop index
    */
-  static List> mapTransfers(StopModel stopModel, TransitModel transitModel) {
+  static List> mapTransfers(StopModel stopModel, TransitService transitService) {
     List> transferByStopIndex = new ArrayList<>();
 
     for (int i = 0; i < stopModel.stopIndexSize(); ++i) {
@@ -26,7 +26,7 @@ static List> mapTransfers(StopModel stopModel, TransitModel trans
 
       ArrayList list = new ArrayList<>();
 
-      for (PathTransfer pathTransfer : transitModel.getTransfersByStop(stop)) {
+      for (PathTransfer pathTransfer : transitService.getTransfersByStop(stop)) {
         if (pathTransfer.to instanceof RegularStop) {
           int toStopIndex = pathTransfer.to.getIndex();
           Transfer newTransfer;
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
index 33a076bb8d6..8ce328fe1b6 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerMapper.java
@@ -27,8 +27,10 @@
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.site.StopTransferPriority;
 import org.opentripplanner.transit.model.timetable.TripTimes;
+import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.StopModel;
 import org.opentripplanner.transit.service.TransitModel;
+import org.opentripplanner.transit.service.TransitService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -47,10 +49,12 @@ public class TransitLayerMapper {
 
   private static final Logger LOG = LoggerFactory.getLogger(TransitLayerMapper.class);
 
-  private final TransitModel transitModel;
+  private final TransitService transitService;
+  private final StopModel stopModel;
 
   private TransitLayerMapper(TransitModel transitModel) {
-    this.transitModel = transitModel;
+    this.transitService = new DefaultTransitService(transitModel);
+    this.stopModel = transitModel.getStopModel();
   }
 
   public static TransitLayer map(
@@ -74,20 +78,19 @@ private TransitLayer map(TransitTuningParameters tuningParameters) {
     HashMap> tripPatternsByStopByDate;
     List> transferByStopIndex;
     ConstrainedTransfersForPatterns constrainedTransfers = null;
-    StopModel stopModel = transitModel.getStopModel();
 
     LOG.info("Mapping transitLayer from TransitModel...");
 
-    Collection allTripPatterns = transitModel.getAllTripPatterns();
+    Collection allTripPatterns = transitService.getAllTripPatterns();
 
     tripPatternsByStopByDate = mapTripPatterns(allTripPatterns);
 
-    transferByStopIndex = mapTransfers(stopModel, transitModel);
+    transferByStopIndex = mapTransfers(stopModel, transitService);
 
     TransferIndexGenerator transferIndexGenerator = null;
     if (OTPFeature.TransferConstraints.isOn()) {
       transferIndexGenerator =
-        new TransferIndexGenerator(transitModel.getTransferService().listAll(), allTripPatterns);
+        new TransferIndexGenerator(transitService.getTransferService().listAll(), allTripPatterns);
       constrainedTransfers = transferIndexGenerator.generateTransfers();
     }
 
@@ -98,9 +101,9 @@ private TransitLayer map(TransitTuningParameters tuningParameters) {
     return new TransitLayer(
       tripPatternsByStopByDate,
       transferByStopIndex,
-      transitModel.getTransferService(),
+      transitService.getTransferService(),
       stopModel,
-      transitModel.getTimeZone(),
+      transitService.getTimeZone(),
       transferCache,
       constrainedTransfers,
       transferIndexGenerator,
@@ -118,13 +121,10 @@ private HashMap> mapTripPatterns(
     Collection allTripPatterns
   ) {
     TripPatternForDateMapper tripPatternForDateMapper = new TripPatternForDateMapper(
-      transitModel.getTransitModelIndex().getServiceCodesRunningForDate()
+      transitService.getServiceCodesRunningForDate()
     );
 
-    Set allServiceDates = transitModel
-      .getTransitModelIndex()
-      .getServiceCodesRunningForDate()
-      .keySet();
+    Set allServiceDates = transitService.getAllServiceCodes();
 
     List tripPatternForDates = Collections.synchronizedList(new ArrayList<>());
 
diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
index 5188bdef8b1..dc4e90683dd 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
@@ -2,7 +2,6 @@
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.SetMultimap;
-import gnu.trove.set.TIntSet;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,6 +20,7 @@
 import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
 import org.opentripplanner.transit.model.timetable.TripTimes;
 import org.opentripplanner.transit.service.TransitModel;
+import org.opentripplanner.transit.service.TransitService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,8 +41,7 @@ public class TransitLayerUpdater {
   private static final Logger LOG = LoggerFactory.getLogger(TransitLayerUpdater.class);
 
   private final TransitModel transitModel;
-
-  private final Map serviceCodesRunningForDate;
+  private final TransitService transitService;
 
   /**
    * Cache the TripPatternForDates indexed on the original TripPatterns in order to avoid this
@@ -58,12 +57,9 @@ public class TransitLayerUpdater {
 
   private final Map> tripPatternsRunningOnDateMapCache = new HashMap<>();
 
-  public TransitLayerUpdater(
-    TransitModel transitModel,
-    Map serviceCodesRunningForDate
-  ) {
+  public TransitLayerUpdater(TransitModel transitModel, TransitService transitService) {
     this.transitModel = transitModel;
-    this.serviceCodesRunningForDate = serviceCodesRunningForDate;
+    this.transitService = transitService;
   }
 
   public void update(
@@ -82,7 +78,7 @@ public void update(
 
     // Instantiate a TripPatternForDateMapper with the new TripPattern mappings
     TripPatternForDateMapper tripPatternForDateMapper = new TripPatternForDateMapper(
-      serviceCodesRunningForDate
+      transitService.getServiceCodesRunningForDate()
     );
 
     Set datesToBeUpdated = new HashSet<>();
diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
index b1bc6888753..2817c4d1ba0 100644
--- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
+++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
@@ -33,6 +33,7 @@
 import org.opentripplanner.standalone.server.OTPWebApplication;
 import org.opentripplanner.street.model.StreetLimitationParameters;
 import org.opentripplanner.street.model.elevation.ElevationUtils;
+import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.updater.configure.UpdaterConfigurator;
 import org.opentripplanner.visualizer.GraphVisualizer;
@@ -202,7 +203,7 @@ public static void creatTransitLayerForRaptor(
     TransitModel transitModel,
     TransitTuningParameters tuningParameters
   ) {
-    if (!transitModel.hasTransit() || transitModel.getTransitModelIndex() == null) {
+    if (!transitModel.hasTransit() || !transitModel.isIndexed()) {
       LOG.warn(
         "Cannot create Raptor data, that requires the graph to have transit data and be indexed."
       );
@@ -211,10 +212,7 @@ public static void creatTransitLayerForRaptor(
     transitModel.setTransitLayer(TransitLayerMapper.map(tuningParameters, transitModel));
     transitModel.setRealtimeTransitLayer(new TransitLayer(transitModel.getTransitLayer()));
     transitModel.setTransitLayerUpdater(
-      new TransitLayerUpdater(
-        transitModel,
-        transitModel.getTransitModelIndex().getServiceCodesRunningForDate()
-      )
+      new TransitLayerUpdater(transitModel, new DefaultTransitService(transitModel))
     );
   }
 
diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
index 41d88726233..8fa5100e6d4 100644
--- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
@@ -9,6 +9,7 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -659,6 +660,16 @@ public Deduplicator getDeduplicator() {
     return transitModel.getDeduplicator();
   }
 
+  @Override
+  public Set getAllServiceCodes() {
+    return Collections.unmodifiableSet(transitModelIndex.getServiceCodesRunningForDate().keySet());
+  }
+
+  @Override
+  public Map getServiceCodesRunningForDate() {
+    return Collections.unmodifiableMap(transitModelIndex.getServiceCodesRunningForDate());
+  }
+
   /**
    * For each pattern visiting this {@link StopLocation} return its {@link TransitMode}
    */
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModel.java b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
index c5a36e54e3a..84c7597d562 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitModel.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitModel.java
@@ -539,10 +539,15 @@ public void setHasScheduledService(boolean hasScheduledService) {
    * The caller is responsible for calling the {@link #index()} method if it is a
    * possibility that the index is not initialized (during graph build).
    */
-  public @Nullable TransitModelIndex getTransitModelIndex() {
+  @Nullable
+  TransitModelIndex getTransitModelIndex() {
     return index;
   }
 
+  public boolean isIndexed() {
+    return index != null;
+  }
+
   public boolean hasFlexTrips() {
     return !flexTripsById.isEmpty();
   }
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java b/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
index 333011e9baf..36ab937416c 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitModelIndex.java
@@ -34,7 +34,7 @@
  * For performance reasons these indexes are not part of the serialized state of the graph.
  * They are rebuilt at runtime after graph deserialization.
  */
-public class TransitModelIndex {
+class TransitModelIndex {
 
   private static final Logger LOG = LoggerFactory.getLogger(TransitModelIndex.class);
 
@@ -117,20 +117,20 @@ public class TransitModelIndex {
     LOG.info("Transit Model index init complete.");
   }
 
-  public Agency getAgencyForId(FeedScopedId id) {
+  Agency getAgencyForId(FeedScopedId id) {
     return agencyForId.get(id);
   }
 
-  public Route getRouteForId(FeedScopedId id) {
+  Route getRouteForId(FeedScopedId id) {
     return routeForId.get(id);
   }
 
-  public void addRoutes(Route route) {
+  void addRoutes(Route route) {
     routeForId.put(route.getId(), route);
   }
 
   /** Dynamically generate the set of Routes passing though a Stop on demand. */
-  public Set getRoutesForStop(StopLocation stop) {
+  Set getRoutesForStop(StopLocation stop) {
     Set routes = new HashSet<>();
     for (TripPattern p : getPatternsForStop(stop)) {
       routes.add(p.getRoute());
@@ -138,11 +138,11 @@ public Set getRoutesForStop(StopLocation stop) {
     return routes;
   }
 
-  public Collection getPatternsForStop(StopLocation stop) {
+  Collection getPatternsForStop(StopLocation stop) {
     return patternsForStopId.get(stop);
   }
 
-  public Collection getTripsForStop(StopLocation stop) {
+  Collection getTripsForStop(StopLocation stop) {
     return getPatternsForStop(stop)
       .stream()
       .flatMap(TripPattern::scheduledTripsAsStream)
@@ -152,43 +152,43 @@ public Collection getTripsForStop(StopLocation stop) {
   /**
    * Get a list of all operators spanning across all feeds.
    */
-  public Collection getAllOperators() {
+  Collection getAllOperators() {
     return getOperatorForId().values();
   }
 
-  public Map getOperatorForId() {
+  Map getOperatorForId() {
     return operatorForId;
   }
 
-  public Map getTripForId() {
+  Map getTripForId() {
     return tripForId;
   }
 
-  public Map getTripOnServiceDateById() {
+  Map getTripOnServiceDateById() {
     return tripOnServiceDateById;
   }
 
-  public Map getTripOnServiceDateForTripAndDay() {
+  Map getTripOnServiceDateForTripAndDay() {
     return tripOnServiceDateForTripAndDay;
   }
 
-  public Collection getAllRoutes() {
+  Collection getAllRoutes() {
     return routeForId.values();
   }
 
-  public Map getPatternForTrip() {
+  Map getPatternForTrip() {
     return patternForTrip;
   }
 
-  public Multimap getPatternsForRoute() {
+  Multimap getPatternsForRoute() {
     return patternsForRoute;
   }
 
-  public Map getServiceCodesRunningForDate() {
+  Map getServiceCodesRunningForDate() {
     return serviceCodesRunningForDate;
   }
 
-  public FlexIndex getFlexIndex() {
+  FlexIndex getFlexIndex() {
     return flexIndex;
   }
 
@@ -229,11 +229,11 @@ private void initalizeServiceCodesForDate(TransitModel transitModel) {
     }
   }
 
-  public Multimap getRoutesForGroupOfRoutes() {
+  Multimap getRoutesForGroupOfRoutes() {
     return routesForGroupOfRoutes;
   }
 
-  public Map getGroupOfRoutesForId() {
+  Map getGroupOfRoutesForId() {
     return groupOfRoutesForId;
   }
 }
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java
index 6624cb946ad..8f48999e2a1 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java
@@ -8,8 +8,10 @@
 import java.time.ZonedDateTime;
 import java.util.Collection;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
+import javax.annotation.Nullable;
 import org.locationtech.jts.geom.Envelope;
 import org.opentripplanner.ext.flex.FlexIndex;
 import org.opentripplanner.model.FeedInfo;
@@ -184,10 +186,7 @@ List stopTimesForPatternAtStop(
 
   GroupOfRoutes getGroupOfRoutesForId(FeedScopedId id);
 
-  /**
-   * Return the timetable for a given trip pattern and date, taking into account real-time updates.
-   * If no real-times update are applied, fall back to scheduled data.
-   */
+  @Nullable
   Timetable getTimetableForTripPattern(TripPattern tripPattern, LocalDate serviceDate);
 
   TripPattern getRealtimeAddedTripPattern(FeedScopedId tripId, LocalDate serviceDate);
@@ -254,4 +253,8 @@ List stopTimesForPatternAtStop(
   List getModesOfStopLocation(StopLocation stop);
 
   Deduplicator getDeduplicator();
+
+  Set getAllServiceCodes();
+
+  Map getServiceCodesRunningForDate();
 }
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java b/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
index 745418f5132..a1d1325560e 100644
--- a/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
@@ -3,13 +3,13 @@
 import com.google.transit.realtime.GtfsRealtime.VehiclePosition;
 import java.time.LocalDate;
 import java.util.List;
-import java.util.Optional;
 import org.opentripplanner.framework.tostring.ToStringBuilder;
 import org.opentripplanner.service.realtimevehicles.RealtimeVehicleRepository;
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.timetable.Trip;
 import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitModel;
+import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher;
 import org.opentripplanner.updater.spi.PollingGraphUpdater;
 import org.opentripplanner.updater.spi.WriteToGraphCallback;
@@ -45,18 +45,18 @@ public PollingVehiclePositionUpdater(
     super(params);
     this.vehiclePositionSource =
       new GtfsRealtimeHttpVehiclePositionSource(params.url(), params.headers());
-    var index = transitModel.getTransitModelIndex();
+    TransitService transitService = new DefaultTransitService(transitModel);
     var fuzzyTripMatcher = params.fuzzyTripMatching()
-      ? new GtfsRealtimeFuzzyTripMatcher(new DefaultTransitService(transitModel))
+      ? new GtfsRealtimeFuzzyTripMatcher(transitService)
       : null;
     this.realtimeVehiclePatternMatcher =
       new RealtimeVehiclePatternMatcher(
         params.feedId(),
-        tripId -> index.getTripForId().get(tripId),
-        trip -> index.getPatternForTrip().get(trip),
+        transitService::getTripForId,
+        transitService::getPatternForTrip,
         (trip, date) -> getPatternIncludingRealtime(transitModel, trip, date),
         realtimeVehicleRepository,
-        transitModel.getTimeZone(),
+        transitService.getTimeZone(),
         fuzzyTripMatcher,
         params.vehiclePositionFeatures()
       );
@@ -99,9 +99,8 @@ private static TripPattern getPatternIncludingRealtime(
     Trip trip,
     LocalDate sd
   ) {
-    return Optional
-      .ofNullable(transitModel.getTimetableSnapshot())
-      .map(snapshot -> snapshot.getRealtimeAddedTripPattern(trip.getId(), sd))
-      .orElseGet(() -> transitModel.getTransitModelIndex().getPatternForTrip().get(trip));
+    // TODO OTP2 RT_VP a new instance of DefaultTransitService must be created to retrieve
+    // the latest TimetableSnapshot
+    return (new DefaultTransitService(transitModel)).getPatternForTrip(trip, sd);
   }
 }
diff --git a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
index 2fb7a8d9db2..79590ca2775 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/GraphQLIntegrationTest.java
@@ -93,6 +93,7 @@
 import org.opentripplanner.transit.model.timetable.RealTimeTripTimes;
 import org.opentripplanner.transit.model.timetable.TripTimesFactory;
 import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TransitEditorService;
 import org.opentripplanner.transit.service.TransitModel;
 import org.opentripplanner.transit.service.TransitService;
 
@@ -196,8 +197,20 @@ static void setup() {
       .toList();
 
     var busRoute = routes.stream().filter(r -> r.getMode().equals(BUS)).findFirst().get();
+    TransitEditorService transitService = new DefaultTransitService(transitModel) {
+      private final TransitAlertService alertService = new TransitAlertServiceImpl(transitModel);
+
+      @Override
+      public List getModesOfStopLocation(StopLocation stop) {
+        return List.of(BUS, FERRY);
+      }
 
-    routes.forEach(route -> transitModel.getTransitModelIndex().addRoutes(route));
+      @Override
+      public TransitAlertService getTransitAlertService() {
+        return alertService;
+      }
+    };
+    routes.forEach(transitService::addRoutes);
 
     var step1 = walkStep("street")
       .withRelativeDirection(RelativeDirection.DEPART)
@@ -254,20 +267,6 @@ static void setup() {
     var emissions = new Emissions(new Grams(123.0));
     i1.setEmissionsPerPerson(emissions);
 
-    var transitService = new DefaultTransitService(transitModel) {
-      private final TransitAlertService alertService = new TransitAlertServiceImpl(transitModel);
-
-      @Override
-      public List getModesOfStopLocation(StopLocation stop) {
-        return List.of(BUS, FERRY);
-      }
-
-      @Override
-      public TransitAlertService getTransitAlertService() {
-        return alertService;
-      }
-    };
-
     var alerts = ListUtils.combine(List.of(alert), getTransitAlert(entitySelector));
     transitService.getTransitAlertService().setAlerts(alerts);
 
diff --git a/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java b/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
index e9d286d5a92..e70ae9aa086 100644
--- a/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
+++ b/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
@@ -18,6 +18,8 @@
 import org.opentripplanner.transit.model.organization.Agency;
 import org.opentripplanner.transit.model.site.RegularStop;
 import org.opentripplanner.transit.model.timetable.Trip;
+import org.opentripplanner.transit.service.DefaultTransitService;
+import org.opentripplanner.transit.service.TransitService;
 
 /**
  * Check that the graph index is created, that GTFS elements can be found in the index, and that the
@@ -46,9 +48,10 @@ public void testIdLookup() {
     /* Agencies */
     String feedId = transitModel.getFeedIds().iterator().next();
     Agency agency;
-    agency = transitModel.getTransitModelIndex().getAgencyForId(new FeedScopedId(feedId, "azerty"));
+    TransitService transitService = new DefaultTransitService(transitModel);
+    agency = transitService.getAgencyForId(new FeedScopedId(feedId, "azerty"));
     assertNull(agency);
-    agency = transitModel.getTransitModelIndex().getAgencyForId(new FeedScopedId(feedId, "agency"));
+    agency = transitService.getAgencyForId(new FeedScopedId(feedId, "agency"));
     assertEquals(feedId + ":" + "agency", agency.getId().toString());
     assertEquals("Fake Agency", agency.getName());
 
@@ -67,21 +70,19 @@ public void testIdLookup() {
    */
   @Test
   public void testPatternsCoherent() {
-    for (Trip trip : transitModel.getTransitModelIndex().getTripForId().values()) {
-      TripPattern pattern = transitModel.getTransitModelIndex().getPatternForTrip().get(trip);
+    TransitService transitService = new DefaultTransitService(transitModel);
+    for (Trip trip : transitService.getAllTrips()) {
+      TripPattern pattern = transitService.getPatternForTrip(trip);
       assertTrue(pattern.scheduledTripsAsStream().anyMatch(t -> t.equals(trip)));
     }
     /* This one depends on a feed where each TripPattern appears on only one route. */
-    for (Route route : transitModel.getTransitModelIndex().getAllRoutes()) {
-      for (TripPattern pattern : transitModel
-        .getTransitModelIndex()
-        .getPatternsForRoute()
-        .get(route)) {
+    for (Route route : transitService.getAllRoutes()) {
+      for (TripPattern pattern : transitService.getPatternsForRoute(route)) {
         assertEquals(pattern.getRoute(), route);
       }
     }
     for (var stop : transitModel.getStopModel().listStopLocations()) {
-      for (TripPattern pattern : transitModel.getTransitModelIndex().getPatternsForStop(stop)) {
+      for (TripPattern pattern : transitService.getPatternsForStop(stop)) {
         int stopPos = pattern.findStopPosition(stop);
         assertTrue(stopPos >= 0, "Stop position exist");
       }
diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
index 34923fed9e4..fcf6974ed34 100644
--- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
+++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -217,7 +217,8 @@ public DateTimeHelper getDateTimeHelper() {
   }
 
   public TripPattern getPatternForTrip(Trip trip) {
-    return transitModel.getTransitModelIndex().getPatternForTrip().get(trip);
+    var transitService = getTransitService();
+    return transitService.getPatternForTrip(trip);
   }
 
   public TimetableSnapshot getTimetableSnapshot() {
diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
index 7ae7b7386f3..64db5d63c01 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
@@ -33,7 +33,9 @@
 import org.opentripplanner.transit.model.timetable.RealTimeState;
 import org.opentripplanner.transit.model.timetable.Trip;
 import org.opentripplanner.transit.model.timetable.TripTimes;
+import org.opentripplanner.transit.service.DefaultTransitService;
 import org.opentripplanner.transit.service.TransitModel;
+import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.updater.GtfsRealtimeFuzzyTripMatcher;
 import org.opentripplanner.updater.TimetableSnapshotSourceParameters;
 
@@ -52,11 +54,13 @@ public class TimetableSnapshotSourceTest {
   private final GtfsRealtimeFuzzyTripMatcher TRIP_MATCHER_NOOP = null;
 
   private String feedId;
+  private TransitService transitService;
 
   @BeforeEach
   public void setUp() {
     TestOtpModel model = ConstantsForTests.buildGtfsGraph(ConstantsForTests.SIMPLE_GTFS);
     transitModel = model.transitModel();
+    transitService = new DefaultTransitService(transitModel);
 
     feedId = transitModel.getFeedIds().stream().findFirst().get();
   }
@@ -224,11 +228,8 @@ public void testHandleModifiedTrip() {
     // Original trip pattern
     {
       final FeedScopedId tripId = new FeedScopedId(feedId, modifiedTripId);
-      final Trip trip = transitModel.getTransitModelIndex().getTripForId().get(tripId);
-      final TripPattern originalTripPattern = transitModel
-        .getTransitModelIndex()
-        .getPatternForTrip()
-        .get(trip);
+      final Trip trip = transitService.getTripForId(tripId);
+      final TripPattern originalTripPattern = transitService.getPatternForTrip(trip);
 
       final Timetable originalTimetableForToday = snapshot.resolve(
         originalTripPattern,
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
index c17130fbda6..ebd34cd390a 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
@@ -13,6 +13,9 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.timetable.RealTimeState;
+import org.opentripplanner.transit.model.timetable.Trip;
+import org.opentripplanner.transit.model.timetable.TripTimes;
+import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder;
 import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
 import org.opentripplanner.updater.trip.TripUpdateBuilder;
@@ -132,8 +135,8 @@ private static void assertOriginalTripPatternIsDeleted(
     RealtimeTestEnvironment env,
     FeedScopedId tripId
   ) {
-    var trip = env.transitModel.getTransitModelIndex().getTripForId().get(tripId);
-    var originalTripPattern = env.transitModel.getTransitModelIndex().getPatternForTrip().get(trip);
+    var trip = env.getTransitService().getTripForId(tripId);
+    var originalTripPattern = env.getTransitService().getPatternForTrip(trip);
     var snapshot = env.getTimetableSnapshot();
     var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE);
     var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null);
@@ -178,10 +181,8 @@ private static void assertNewTripTimesIsUpdated(
     RealtimeTestEnvironment env,
     FeedScopedId tripId
   ) {
-    var originalTripPattern = env.transitModel
-      .getTransitModelIndex()
-      .getPatternForTrip()
-      .get(env.trip2);
+    var originalTripPattern = env.getTransitService()
+      .getPatternForTrip(env.trip2);
     var snapshot = env.getTimetableSnapshot();
     var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE);
 

From f101f4950e0383551e4376050a4357d62f7cd21e Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 17 Jul 2024 09:12:59 +0200
Subject: [PATCH 1627/1688] Remove duplicate wrapping in unmodifiable map

---
 .../raptoradapter/transit/mappers/TripPatternForDateMapper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java
index 30551421138..cd00b9356dc 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TripPatternForDateMapper.java
@@ -41,7 +41,7 @@ public class TripPatternForDateMapper {
    * @param serviceCodesRunningForDate - READ ONLY
    */
   TripPatternForDateMapper(Map serviceCodesRunningForDate) {
-    this.serviceCodesRunningForDate = Collections.unmodifiableMap(serviceCodesRunningForDate);
+    this.serviceCodesRunningForDate = serviceCodesRunningForDate;
   }
 
   /**

From 8b0e4623049b736b55d12daf89110ffa5c65a072 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 17 Jul 2024 09:27:14 +0200
Subject: [PATCH 1628/1688] Use TransitEditorService in TransitLayerUpdater

---
 .../transit/mappers/TransitLayerUpdater.java      | 15 ++++++---------
 .../configure/ConstructApplication.java           |  2 +-
 .../transit/service/DefaultTransitService.java    | 10 ++++++++++
 .../transit/service/TransitEditorService.java     |  4 ++++
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
index dc4e90683dd..934bec39c11 100644
--- a/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
+++ b/src/main/java/org/opentripplanner/routing/algorithm/raptoradapter/transit/mappers/TransitLayerUpdater.java
@@ -19,8 +19,7 @@
 import org.opentripplanner.transit.model.network.TripPattern;
 import org.opentripplanner.transit.model.timetable.TripIdAndServiceDate;
 import org.opentripplanner.transit.model.timetable.TripTimes;
-import org.opentripplanner.transit.service.TransitModel;
-import org.opentripplanner.transit.service.TransitService;
+import org.opentripplanner.transit.service.TransitEditorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,8 +39,7 @@ public class TransitLayerUpdater {
 
   private static final Logger LOG = LoggerFactory.getLogger(TransitLayerUpdater.class);
 
-  private final TransitModel transitModel;
-  private final TransitService transitService;
+  private final TransitEditorService transitService;
 
   /**
    * Cache the TripPatternForDates indexed on the original TripPatterns in order to avoid this
@@ -57,8 +55,7 @@ public class TransitLayerUpdater {
 
   private final Map> tripPatternsRunningOnDateMapCache = new HashMap<>();
 
-  public TransitLayerUpdater(TransitModel transitModel, TransitService transitService) {
-    this.transitModel = transitModel;
+  public TransitLayerUpdater(TransitEditorService transitService) {
     this.transitService = transitService;
   }
 
@@ -66,7 +63,7 @@ public void update(
     Set updatedTimetables,
     Map> timetables
   ) {
-    if (!transitModel.hasRealtimeTransitLayer()) {
+    if (!transitService.hasRealtimeTransitLayer()) {
       return;
     }
 
@@ -74,7 +71,7 @@ public void update(
 
     // Make a shallow copy of the realtime transit layer. Only the objects that are copied will be
     // changed during this update process.
-    TransitLayer realtimeTransitLayer = new TransitLayer(transitModel.getRealtimeTransitLayer());
+    TransitLayer realtimeTransitLayer = new TransitLayer(transitService.getRealtimeTransitLayer());
 
     // Instantiate a TripPatternForDateMapper with the new TripPattern mappings
     TripPatternForDateMapper tripPatternForDateMapper = new TripPatternForDateMapper(
@@ -225,7 +222,7 @@ public void update(
 
     // Switch out the reference with the updated realtimeTransitLayer. This is synchronized to
     // guarantee that the reference is set after all the fields have been updated.
-    transitModel.setRealtimeTransitLayer(realtimeTransitLayer);
+    transitService.setRealtimeTransitLayer(realtimeTransitLayer);
 
     LOG.debug(
       "UPDATING {} tripPatterns took {} ms",
diff --git a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
index 2817c4d1ba0..7d07ca29f0e 100644
--- a/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
+++ b/src/main/java/org/opentripplanner/standalone/configure/ConstructApplication.java
@@ -212,7 +212,7 @@ public static void creatTransitLayerForRaptor(
     transitModel.setTransitLayer(TransitLayerMapper.map(tuningParameters, transitModel));
     transitModel.setRealtimeTransitLayer(new TransitLayer(transitModel.getTransitLayer()));
     transitModel.setTransitLayerUpdater(
-      new TransitLayerUpdater(transitModel, new DefaultTransitService(transitModel))
+      new TransitLayerUpdater(new DefaultTransitService(transitModel))
     );
   }
 
diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
index 8fa5100e6d4..398cb806524 100644
--- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
@@ -595,6 +595,16 @@ public void setTransitLayer(TransitLayer transitLayer) {
     this.transitModel.setTransitLayer(transitLayer);
   }
 
+  @Override
+  public void setRealtimeTransitLayer(TransitLayer realtimeTransitLayer) {
+    transitModel.setRealtimeTransitLayer(realtimeTransitLayer);
+  }
+
+  @Override
+  public boolean hasRealtimeTransitLayer() {
+    return transitModel.hasRealtimeTransitLayer();
+  }
+
   @Override
   public CalendarService getCalendarService() {
     return this.transitModel.getCalendarService();
diff --git a/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java b/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
index 6a11fe902f2..3bdcf607363 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
@@ -40,4 +40,8 @@ void addTripOnServiceDateForTripAndDay(
   FeedScopedId getOrCreateServiceIdForDate(LocalDate serviceDate);
 
   void setTransitLayer(TransitLayer transitLayer);
+
+  boolean hasRealtimeTransitLayer();
+
+  void setRealtimeTransitLayer(TransitLayer realtimeTransitLayer);
 }

From 1b81847314d32de2187d40eeeed9598dcad03f46 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 17 Jul 2024 10:13:04 +0200
Subject: [PATCH 1629/1688] Update documentation

---
 .../org/opentripplanner/transit/service/TransitService.java   | 4 ++++
 .../vehicle_position/PollingVehiclePositionUpdater.java       | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/transit/service/TransitService.java b/src/main/java/org/opentripplanner/transit/service/TransitService.java
index 8f48999e2a1..94870643f71 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitService.java
@@ -186,6 +186,10 @@ List stopTimesForPatternAtStop(
 
   GroupOfRoutes getGroupOfRoutesForId(FeedScopedId id);
 
+  /**
+   * Return the timetable for a given trip pattern and date, taking into account real-time updates.
+   * If no real-times update are applied, fall back to scheduled data.
+   */
   @Nullable
   Timetable getTimetableForTripPattern(TripPattern tripPattern, LocalDate serviceDate);
 
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java b/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
index a1d1325560e..6b9391f3ea2 100644
--- a/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
@@ -99,8 +99,8 @@ private static TripPattern getPatternIncludingRealtime(
     Trip trip,
     LocalDate sd
   ) {
-    // TODO OTP2 RT_VP a new instance of DefaultTransitService must be created to retrieve
-    // the latest TimetableSnapshot
+    // a new instance of DefaultTransitService must be created to retrieve
+    // the current TimetableSnapshot
     return (new DefaultTransitService(transitModel)).getPatternForTrip(trip, sd);
   }
 }

From 7baf92b873f4a0d25e6507b74857a5fa7e6dee31 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 17 Jul 2024 10:13:17 +0200
Subject: [PATCH 1630/1688] Refactor unit tests

---
 .../ext/siri/AddedTripBuilderTest.java        |  3 +-
 .../graph/DefaultRoutingServiceTest.java      | 28 ++++++++++++-------
 .../updater/trip/RealtimeTestEnvironment.java |  3 +-
 .../trip/TimetableSnapshotSourceTest.java     |  6 ++--
 .../trip/moduletests/addition/AddedTest.java  |  4 +--
 .../trip/moduletests/delay/DelayedTest.java   |  5 +---
 .../trip/moduletests/delay/SkippedTest.java   |  6 +---
 7 files changed, 27 insertions(+), 28 deletions(-)

diff --git a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
index aa26985c5b9..59995062eb7 100644
--- a/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
+++ b/src/ext-test/java/org/opentripplanner/ext/siri/AddedTripBuilderTest.java
@@ -169,8 +169,7 @@ void testAddedTrip() {
     assertEquals(route, pattern.getRoute());
     assertTrue(
       transitService
-        .getServiceCodesRunningForDate()
-        .get(SERVICE_DATE)
+        .getServiceCodesRunningForDate(SERVICE_DATE)
         .contains(TRANSIT_MODEL.getServiceCodes().get(trip.getServiceId())),
       "serviceId should be running on service date"
     );
diff --git a/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java b/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
index e70ae9aa086..8c56bb89a1f 100644
--- a/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
+++ b/src/test/java/org/opentripplanner/routing/graph/DefaultRoutingServiceTest.java
@@ -5,6 +5,7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.Collection;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.locationtech.jts.geom.Coordinate;
 import org.locationtech.jts.geom.Envelope;
@@ -29,6 +30,15 @@
  */
 public class DefaultRoutingServiceTest extends GtfsTest {
 
+  private TransitService transitService;
+
+  @BeforeEach
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    transitService = new DefaultTransitService(transitModel);
+  }
+
   @Override
   public String getFeedName() {
     return "gtfs/simple";
@@ -46,9 +56,8 @@ public void testIdLookup() {
     }
 
     /* Agencies */
-    String feedId = transitModel.getFeedIds().iterator().next();
+    String feedId = transitService.getFeedIds().iterator().next();
     Agency agency;
-    TransitService transitService = new DefaultTransitService(transitModel);
     agency = transitService.getAgencyForId(new FeedScopedId(feedId, "azerty"));
     assertNull(agency);
     agency = transitService.getAgencyForId(new FeedScopedId(feedId, "agency"));
@@ -56,7 +65,7 @@ public void testIdLookup() {
     assertEquals("Fake Agency", agency.getName());
 
     /* Stops */
-    transitModel.getStopModel().getRegularStop(new FeedScopedId("X", "Y"));
+    transitService.getRegularStop(new FeedScopedId("X", "Y"));
     /* Trips */
     //        graph.index.tripForId;
     //        graph.index.routeForId;
@@ -70,7 +79,6 @@ public void testIdLookup() {
    */
   @Test
   public void testPatternsCoherent() {
-    TransitService transitService = new DefaultTransitService(transitModel);
     for (Trip trip : transitService.getAllTrips()) {
       TripPattern pattern = transitService.getPatternForTrip(trip);
       assertTrue(pattern.scheduledTripsAsStream().anyMatch(t -> t.equals(trip)));
@@ -81,7 +89,7 @@ public void testPatternsCoherent() {
         assertEquals(pattern.getRoute(), route);
       }
     }
-    for (var stop : transitModel.getStopModel().listStopLocations()) {
+    for (var stop : transitService.listStopLocations()) {
       for (TripPattern pattern : transitService.getPatternsForStop(stop)) {
         int stopPos = pattern.findStopPosition(stop);
         assertTrue(stopPos >= 0, "Stop position exist");
@@ -91,13 +99,13 @@ public void testPatternsCoherent() {
 
   @Test
   public void testSpatialIndex() {
-    String feedId = transitModel.getFeedIds().iterator().next();
+    String feedId = transitService.getFeedIds().iterator().next();
     FeedScopedId idJ = new FeedScopedId(feedId, "J");
-    var stopJ = transitModel.getStopModel().getRegularStop(idJ);
+    var stopJ = transitService.getRegularStop(idJ);
     FeedScopedId idL = new FeedScopedId(feedId, "L");
-    var stopL = transitModel.getStopModel().getRegularStop(idL);
+    var stopL = transitService.getRegularStop(idL);
     FeedScopedId idM = new FeedScopedId(feedId, "M");
-    var stopM = transitModel.getStopModel().getRegularStop(idM);
+    var stopM = transitService.getRegularStop(idM);
     TransitStopVertex stopvJ = graph.getStopVertexForStopId(idJ);
     TransitStopVertex stopvL = graph.getStopVertexForStopId(idL);
     TransitStopVertex stopvM = graph.getStopVertexForStopId(idM);
@@ -107,7 +115,7 @@ public void testSpatialIndex() {
       SphericalDistanceLibrary.metersToLonDegrees(100, stopJ.getLat()),
       SphericalDistanceLibrary.metersToDegrees(100)
     );
-    Collection stops = transitModel.getStopModel().findRegularStops(env);
+    Collection stops = transitService.findRegularStops(env);
     assertTrue(stops.contains(stopJ));
     assertTrue(stops.contains(stopL));
     assertTrue(stops.contains(stopM));
diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
index fcf6974ed34..6adce735fb0 100644
--- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
+++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -217,8 +217,7 @@ public DateTimeHelper getDateTimeHelper() {
   }
 
   public TripPattern getPatternForTrip(Trip trip) {
-    var transitService = getTransitService();
-    return transitService.getPatternForTrip(trip);
+    return getTransitService().getPatternForTrip(trip);
   }
 
   public TimetableSnapshot getTimetableSnapshot() {
diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
index 64db5d63c01..84b53c95f9c 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
@@ -50,11 +50,11 @@ public class TimetableSnapshotSourceTest {
   )
     .build();
   private TransitModel transitModel;
+  private TransitService transitService;
 
   private final GtfsRealtimeFuzzyTripMatcher TRIP_MATCHER_NOOP = null;
 
   private String feedId;
-  private TransitService transitService;
 
   @BeforeEach
   public void setUp() {
@@ -62,7 +62,7 @@ public void setUp() {
     transitModel = model.transitModel();
     transitService = new DefaultTransitService(transitModel);
 
-    feedId = transitModel.getFeedIds().stream().findFirst().get();
+    feedId = transitService.getFeedIds().stream().findFirst().get();
   }
 
   @Test
@@ -119,7 +119,7 @@ public void testHandleModifiedTrip() {
       tripDescriptorBuilder.setStartDate(ServiceDateUtils.asCompactString(SERVICE_DATE));
 
       final long midnightSecondsSinceEpoch = ServiceDateUtils
-        .asStartOfService(SERVICE_DATE, transitModel.getTimeZone())
+        .asStartOfService(SERVICE_DATE, transitService.getTimeZone())
         .toEpochSecond();
 
       final TripUpdate.Builder tripUpdateBuilder = TripUpdate.newBuilder();
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
index 8d3984cc546..8371c5dda3a 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/addition/AddedTest.java
@@ -62,7 +62,7 @@ void addedTripWithNewRoute() {
     assertEquals(TripUpdateBuilder.ROUTE_NAME, route.getName());
     assertEquals(TransitMode.RAIL, route.getMode());
 
-    var fromTransitModel = env.transitModel.getTransitModelIndex().getRouteForId(route.getId());
+    var fromTransitModel = env.getTransitService().getRouteForId(route.getId());
     assertEquals(fromTransitModel, route);
 
     assertEquals(PickDrop.CALL_AGENCY, pattern.getBoardType(0));
@@ -117,7 +117,7 @@ void repeatedlyAddedTripWithNewRoute() {
     var secondRoute = secondPattern.getRoute();
 
     assertSame(firstRoute, secondRoute);
-    assertNotNull(env.transitModel.getTransitModelIndex().getRouteForId(firstRoute.getId()));
+    assertNotNull(env.getTransitService().getRouteForId(firstRoute.getId()));
   }
 
   private TripPattern assertAddedTrip(String tripId, RealtimeTestEnvironment env) {
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
index 53805939e40..5298853f36d 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/DelayedTest.java
@@ -86,10 +86,7 @@ void complexDelay() {
 
     var snapshot = env.getTimetableSnapshot();
 
-    final TripPattern originalTripPattern = env.transitModel
-      .getTransitModelIndex()
-      .getPatternForTrip()
-      .get(env.trip2);
+    final TripPattern originalTripPattern = env.getTransitService().getPatternForTrip(env.trip2);
 
     var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE);
     var originalTimetableScheduled = snapshot.resolve(originalTripPattern, null);
diff --git a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
index ebd34cd390a..de699324bb6 100644
--- a/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/moduletests/delay/SkippedTest.java
@@ -13,9 +13,6 @@
 import org.junit.jupiter.api.Test;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.timetable.RealTimeState;
-import org.opentripplanner.transit.model.timetable.Trip;
-import org.opentripplanner.transit.model.timetable.TripTimes;
-import org.opentripplanner.transit.service.TransitService;
 import org.opentripplanner.transit.model.timetable.TripTimesStringBuilder;
 import org.opentripplanner.updater.trip.RealtimeTestEnvironment;
 import org.opentripplanner.updater.trip.TripUpdateBuilder;
@@ -181,8 +178,7 @@ private static void assertNewTripTimesIsUpdated(
     RealtimeTestEnvironment env,
     FeedScopedId tripId
   ) {
-    var originalTripPattern = env.getTransitService()
-      .getPatternForTrip(env.trip2);
+    var originalTripPattern = env.getTransitService().getPatternForTrip(env.trip2);
     var snapshot = env.getTimetableSnapshot();
     var originalTimetableForToday = snapshot.resolve(originalTripPattern, SERVICE_DATE);
 

From 01266a83cd049cdb9ee973ee9e6ab3dcdfca2a74 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 18 Jul 2024 22:57:44 +0200
Subject: [PATCH 1631/1688] Auto-merge test reporter [ci skip]

---
 renovate.json5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renovate.json5 b/renovate.json5
index 7b957c577e3..d8ba10984e5 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -113,6 +113,7 @@
         "org.mockito:mockito-core",
         "com.tngtech.archunit:archunit",
         "org.apache.maven.plugins:maven-surefire-plugin",
+        "me.fabriciorby:maven-surefire-junit5-tree-reporter",
         "org.jacoco:jacoco-maven-plugin", // coverage plugin
         "org.apache.commons:commons-compress", // only used by tests
         // maven plugins

From 4198402425875fad1d139d28ca4aecbdd40f61b5 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 09:56:02 +0000
Subject: [PATCH 1632/1688] chore(deps): update dependency
 me.fabriciorby:maven-surefire-junit5-tree-reporter to v1.3.0

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b7f26812e99..02f87de47d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -247,7 +247,7 @@
                     
                         me.fabriciorby
                         maven-surefire-junit5-tree-reporter
-                        1.2.1
+                        1.3.0
                     
                 
                 

From cfe694786bd1db0b86aa6a030fbff5c9f9ec01c8 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 19 Jul 2024 08:32:22 +0200
Subject: [PATCH 1633/1688] Add car rental to Transmodel street mode options

---
 .../opentripplanner/apis/transmodel/model/EnumTypes.java   | 7 +++++++
 .../org/opentripplanner/apis/transmodel/schema.graphql     | 4 +++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
index 6e63ddf3921..438c3d48052 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
@@ -434,6 +434,13 @@ public class EnumTypes {
       "the road, drive to a drop-off point along the road, and walk the rest of the way. " +
       "This can include various taxi-services or kiss & ride."
     )
+    .value(
+      "car_rental",
+      StreetMode.CAR_RENTAL,
+      "Walk to a car rental point along " +
+      "the road, drive to a drop-off point along the road, and walk the rest of the way. " +
+      "This can include car rental at fixed locations or free-floating services."
+    )
     .value(
       "flexible",
       StreetMode.FLEXIBLE,
diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
index 64440780f78..72f682e4634 100644
--- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
+++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -775,7 +775,7 @@ type QueryType {
   "Input type for executing a travel search for a trip between two locations. Returns trip patterns describing suggested alternatives for the trip."
   trip(
     "Time and cost penalty on access/egress modes."
-    accessEgressPenalty: [PenaltyForStreetMode!] = [{streetMode : car_park, timePenalty : "20m + 2.0 t", costFactor : 1.5}, {streetMode : flexible, timePenalty : "10m + 1.30 t", costFactor : 1.3}],
+    accessEgressPenalty: [PenaltyForStreetMode!] = [{streetMode : car_park, timePenalty : "20m + 2.0 t", costFactor : 1.5}, {streetMode : car_rental, timePenalty : "20m + 2.0 t", costFactor : 1.5}, {streetMode : flexible, timePenalty : "10m + 1.30 t", costFactor : 1.3}],
     "The alightSlack is the minimum extra time after exiting a public transport vehicle. This is the default value used, if not overridden by the 'alightSlackList'."
     alightSlackDefault: Int = 0,
     "List of alightSlack for a given set of modes. Defaults: []"
@@ -1773,6 +1773,8 @@ enum StreetMode {
   car_park
   "Walk to a pickup point along the road, drive to a drop-off point along the road, and walk the rest of the way. This can include various taxi-services or kiss & ride."
   car_pickup
+  "Walk to a car rental point along the road, drive to a drop-off point along the road, and walk the rest of the way. This can include car rental at fixed locations or free-floating services."
+  car_rental
   "Walk to an eligible pickup area for flexible transportation, ride to an eligible drop-off area and then walk the rest of the way."
   flexible
   "Walk only"

From c3c1ea08a9da9711315a961a49633ed7b85e993c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 18 Jul 2024 22:34:33 +0000
Subject: [PATCH 1634/1688] chore(deps): update dependency
 io.github.git-commit-id:git-commit-id-maven-plugin to v9.0.1

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 02f87de47d6..00165487fb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -321,7 +321,7 @@
                   but we need the Maven project version as well, so we perform substitution. -->
                 io.github.git-commit-id
                 git-commit-id-maven-plugin
-                9.0.0
+                9.0.1
                 
                     
                         

From d4943c0db68a23be213bd64210bf154f72e3704a Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 19 Jul 2024 10:42:27 +0200
Subject: [PATCH 1635/1688] Add newline in client to trigger build

---
 client/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/README.md b/client/README.md
index 54971062971..ad86e9666cb 100644
--- a/client/README.md
+++ b/client/README.md
@@ -63,3 +63,4 @@ or add it to a new `.env.development.local` file (this file will be ignored by g
 In production mode, the default is to access OTP via the same origin as the client (see `.env`).
 This behavior can also be modified by changing the previously mentioned environment variable at
 build-time.
+

From cc74ad82dc89810d219cba9434392a798bb890c5 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 19 Jul 2024 10:46:47 +0200
Subject: [PATCH 1636/1688] Format code

---
 client/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client/README.md b/client/README.md
index ad86e9666cb..54971062971 100644
--- a/client/README.md
+++ b/client/README.md
@@ -63,4 +63,3 @@ or add it to a new `.env.development.local` file (this file will be ignored by g
 In production mode, the default is to access OTP via the same origin as the client (see `.env`).
 This behavior can also be modified by changing the previously mentioned environment variable at
 build-time.
-

From 6382fd8d4221c2a173d396a84504a77ce7c388b9 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 19 Jul 2024 10:47:56 +0200
Subject: [PATCH 1637/1688] Add newline change to trigger build

---
 client/.env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/.env b/client/.env
index ca1d71c90e3..a2d09f3b312 100644
--- a/client/.env
+++ b/client/.env
@@ -1,2 +1,3 @@
 VITE_API_URL=/otp/transmodel/v3
 VITE_DEBUG_STYLE_URL=/otp/routers/default/inspector/vectortile/style.json
+

From 23bbf8915c6f462742dad904361cb937de28b03e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 19 Jul 2024 10:58:00 +0000
Subject: [PATCH 1638/1688] fix(deps): update geotools.version to v31.3

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 00165487fb3..ae3fdfec72d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -58,7 +58,7 @@
     
         154
         
-        31.2
+        31.3
         2.51.1
         2.17.2
         3.1.7

From 0ff397da1fc18efeaee86b526b10f6c0faac797e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 22 Jul 2024 11:26:06 +0000
Subject: [PATCH 1639/1688] chore(deps): update vitest monorepo to v2

---
 client/package-lock.json | 804 ++++++++++++++++++++++-----------------
 client/package.json      |   4 +-
 2 files changed, 447 insertions(+), 361 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index 3c4520eb745..a5c2422df3f 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -29,7 +29,7 @@
         "@typescript-eslint/eslint-plugin": "7.14.1",
         "@typescript-eslint/parser": "7.14.1",
         "@vitejs/plugin-react": "4.3.1",
-        "@vitest/coverage-v8": "1.6.0",
+        "@vitest/coverage-v8": "2.0.4",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",
@@ -41,7 +41,7 @@
         "prettier": "3.3.2",
         "typescript": "5.5.2",
         "vite": "5.3.2",
-        "vitest": "1.6.0"
+        "vitest": "2.0.4"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -2799,25 +2799,109 @@
       "integrity": "sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==",
       "dev": true
     },
-    "node_modules/@istanbuljs/schema": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
-      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+    "node_modules/@isaacs/cliui": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
+      "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
       "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^5.1.2",
+        "string-width-cjs": "npm:string-width@^4.2.0",
+        "strip-ansi": "^7.0.1",
+        "strip-ansi-cjs": "npm:strip-ansi@^6.0.1",
+        "wrap-ansi": "^8.1.0",
+        "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=12"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
+      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/ansi-styles": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
+      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/@jest/schemas": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz",
-      "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==",
+    "node_modules/@isaacs/cliui/node_modules/string-width": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
+      "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@sinclair/typebox": "^0.27.8"
+        "eastasianwidth": "^0.2.0",
+        "emoji-regex": "^9.2.2",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
+      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@isaacs/cliui/node_modules/wrap-ansi": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
+      "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^6.1.0",
+        "string-width": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "engines": {
+        "node": ">=8"
       }
     },
     "node_modules/@jridgewell/gen-mapping": {
@@ -3372,6 +3456,17 @@
         "node": ">=10.12.0"
       }
     },
+    "node_modules/@pkgjs/parseargs": {
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
+      "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=14"
+      }
+    },
     "node_modules/@popperjs/core": {
       "version": "2.11.8",
       "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
@@ -3610,12 +3705,6 @@
         "win32"
       ]
     },
-    "node_modules/@sinclair/typebox": {
-      "version": "0.27.8",
-      "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz",
-      "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==",
-      "dev": true
-    },
     "node_modules/@swc/helpers": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.7.tgz",
@@ -4086,192 +4175,119 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-1.6.0.tgz",
-      "integrity": "sha512-KvapcbMY/8GYIG0rlwwOKCVNRc0OL20rrhFkg/CHNzncV03TE2XWvO5w9uZYoxNiMEBacAJt3unSOiZ7svePew==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.0.4.tgz",
+      "integrity": "sha512-i4lx/Wpg5zF1h2op7j0wdwuEQxaL/YTwwQaKuKMHYj7MMh8c7I4W7PNfOptZBCSBZI0z1qwn64o0pM/pA8Tz1g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@ampproject/remapping": "^2.2.1",
+        "@ampproject/remapping": "^2.3.0",
         "@bcoe/v8-coverage": "^0.2.3",
-        "debug": "^4.3.4",
+        "debug": "^4.3.5",
         "istanbul-lib-coverage": "^3.2.2",
         "istanbul-lib-report": "^3.0.1",
-        "istanbul-lib-source-maps": "^5.0.4",
-        "istanbul-reports": "^3.1.6",
-        "magic-string": "^0.30.5",
-        "magicast": "^0.3.3",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.5.0",
-        "strip-literal": "^2.0.0",
-        "test-exclude": "^6.0.0"
+        "istanbul-lib-source-maps": "^5.0.6",
+        "istanbul-reports": "^3.1.7",
+        "magic-string": "^0.30.10",
+        "magicast": "^0.3.4",
+        "std-env": "^3.7.0",
+        "test-exclude": "^7.0.1",
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "1.6.0"
+        "vitest": "2.0.4"
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-1.6.0.tgz",
-      "integrity": "sha512-ixEvFVQjycy/oNgHjqsL6AZCDduC+tflRluaHIzKIsdbzkLn2U/iBnVeJwB6HsIjQBdfMR8Z0tRxKUsvFJEeWQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.4.tgz",
+      "integrity": "sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "1.6.0",
-        "@vitest/utils": "1.6.0",
-        "chai": "^4.3.10"
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
+        "chai": "^5.1.1",
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/runner": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-1.6.0.tgz",
-      "integrity": "sha512-P4xgwPjwesuBiHisAVz/LSSZtDjOTPYZVmNAnpHHSR6ONrf8eCJOFRvUwdHn30F5M1fxhqtl7QZQUk2dprIXAg==",
+    "node_modules/@vitest/pretty-format": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.4.tgz",
+      "integrity": "sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "1.6.0",
-        "p-limit": "^5.0.0",
-        "pathe": "^1.1.1"
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/runner/node_modules/p-limit": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-5.0.0.tgz",
-      "integrity": "sha512-/Eaoq+QyLSiXQ4lyYV23f14mZRQcXnxfHrN0vCai+ak9G0pp9iEQukIIZq5NccEvwRB8PUnZT0KsOoDCINS1qQ==",
+    "node_modules/@vitest/runner": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.4.tgz",
+      "integrity": "sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18"
+        "@vitest/utils": "2.0.4",
+        "pathe": "^1.1.2"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@vitest/runner/node_modules/yocto-queue": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz",
-      "integrity": "sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==",
-      "dev": true,
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-1.6.0.tgz",
-      "integrity": "sha512-+Hx43f8Chus+DCmygqqfetcAZrDJwvTj0ymqjQq4CvmpKFSTVteEOBzCusu1x2tt4OJcvBflyHUE0DZSLgEMtQ==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.4.tgz",
+      "integrity": "sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "magic-string": "^0.30.5",
-        "pathe": "^1.1.1",
-        "pretty-format": "^29.7.0"
+        "@vitest/pretty-format": "2.0.4",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/snapshot/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@vitest/snapshot/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@vitest/snapshot/node_modules/react-is": {
-      "version": "18.2.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz",
-      "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==",
-      "dev": true
-    },
     "node_modules/@vitest/spy": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-1.6.0.tgz",
-      "integrity": "sha512-leUTap6B/cqi/bQkXUu6bQV5TZPx7pmMBKBQiI0rJA8c3pB56ZsaTbREnF7CJfmvAS4V2cXIBAh/3rVwrrCYgw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.4.tgz",
+      "integrity": "sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "tinyspy": "^2.2.0"
+        "tinyspy": "^3.0.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-1.6.0.tgz",
-      "integrity": "sha512-21cPiuGMoMZwiOHa2i4LXkMkMkCGzA+MVFV70jRwHo95dL4x/ts5GZhML1QWuy7yfp3WzK3lRvZi3JnXTYqrBw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.4.tgz",
+      "integrity": "sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "diff-sequences": "^29.6.3",
+        "@vitest/pretty-format": "2.0.4",
         "estree-walker": "^3.0.3",
-        "loupe": "^2.3.7",
-        "pretty-format": "^29.7.0"
+        "loupe": "^3.1.1",
+        "tinyrainbow": "^1.2.0"
       },
       "funding": {
         "url": "https://opencollective.com/vitest"
       }
     },
-    "node_modules/@vitest/utils/node_modules/ansi-styles": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz",
-      "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==",
-      "dev": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/@vitest/utils/node_modules/pretty-format": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
-      "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==",
-      "dev": true,
-      "dependencies": {
-        "@jest/schemas": "^29.6.3",
-        "ansi-styles": "^5.0.0",
-        "react-is": "^18.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/@vitest/utils/node_modules/react-is": {
-      "version": "18.3.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "dev": true
-    },
     "node_modules/@whatwg-node/events": {
       "version": "0.0.3",
       "resolved": "https://registry.npmjs.org/@whatwg-node/events/-/events-0.0.3.tgz",
@@ -4325,15 +4341,6 @@
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
-    "node_modules/acorn-walk": {
-      "version": "8.3.2",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz",
-      "integrity": "sha512-cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
     "node_modules/agent-base": {
       "version": "7.1.0",
       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz",
@@ -4643,12 +4650,13 @@
       }
     },
     "node_modules/assertion-error": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-1.1.0.tgz",
-      "integrity": "sha512-jgsaNduz+ndvGyFt3uSuWqvy4lCnIJiovtouQN5JZHOKCS2QuhEdbcQHFhVksz2N2U9hXJo8odG7ETyWlEeuDw==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
+      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">=12"
       }
     },
     "node_modules/assign-symbols": {
@@ -5020,21 +5028,20 @@
       }
     },
     "node_modules/chai": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/chai/-/chai-4.4.1.tgz",
-      "integrity": "sha512-13sOfMv2+DWduEU+/xbun3LScLoqN17nBeTLUsmDfKdoiC1fr0n9PU4guu4AhRcOVFk/sW8LyZWHuhWtQZiF+g==",
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/chai/-/chai-5.1.1.tgz",
+      "integrity": "sha512-pT1ZgP8rPNqUgieVaEY+ryQr6Q4HXNg8Ei9UnLUrjN4IA7dvQC5JB+/kxVcPNDHyBcc/26CXPkbNzq3qwrOEKA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "assertion-error": "^1.1.0",
-        "check-error": "^1.0.3",
-        "deep-eql": "^4.1.3",
-        "get-func-name": "^2.0.2",
-        "loupe": "^2.3.6",
-        "pathval": "^1.1.1",
-        "type-detect": "^4.0.8"
+        "assertion-error": "^2.0.1",
+        "check-error": "^2.1.1",
+        "deep-eql": "^5.0.1",
+        "loupe": "^3.1.0",
+        "pathval": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
       }
     },
     "node_modules/chalk": {
@@ -5098,15 +5105,13 @@
       "dev": true
     },
     "node_modules/check-error": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/check-error/-/check-error-1.0.3.tgz",
-      "integrity": "sha512-iKEoDYaRmd1mxM90a2OEfWhjsjPpYPuQ+lMYsoxB126+t8fw7ySEO48nmDg5COTjxDI65/Y2OWpeEHk3ZOe8zg==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
+      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==",
       "dev": true,
-      "dependencies": {
-        "get-func-name": "^2.0.2"
-      },
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 16"
       }
     },
     "node_modules/classnames": {
@@ -5441,10 +5446,11 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.4",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+      "version": "4.3.5",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz",
+      "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ms": "2.1.2"
       },
@@ -5473,13 +5479,11 @@
       "dev": true
     },
     "node_modules/deep-eql": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-4.1.3.tgz",
-      "integrity": "sha512-WaEtAOpRA1MQ0eohqZjpGD8zdI0Ovsm8mmFhaDN8dvDZzyoUMcYDnf5Y6iu7HTXxf8JDS23qWa4a+hKCDyOPzw==",
+      "version": "5.0.2",
+      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
+      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==",
       "dev": true,
-      "dependencies": {
-        "type-detect": "^4.0.0"
-      },
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -5616,15 +5620,6 @@
         "node": ">=0.10"
       }
     },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
-      "dev": true,
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -5722,6 +5717,13 @@
       "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz",
       "integrity": "sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ=="
     },
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/electron-to-chromium": {
       "version": "1.4.717",
       "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.717.tgz",
@@ -6500,6 +6502,7 @@
       "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
       "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0"
       }
@@ -6826,6 +6829,36 @@
         "is-callable": "^1.1.3"
       }
     },
+    "node_modules/foreground-child": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz",
+      "integrity": "sha512-PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/foreground-child/node_modules/signal-exit": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
+      "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/form-data": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
@@ -6925,6 +6958,7 @@
       "resolved": "https://registry.npmjs.org/get-func-name/-/get-func-name-2.0.2.tgz",
       "integrity": "sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       }
@@ -8118,10 +8152,11 @@
       }
     },
     "node_modules/istanbul-lib-source-maps": {
-      "version": "5.0.4",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.4.tgz",
-      "integrity": "sha512-wHOoEsNJTVltaJp8eVkm8w+GVkVNHT2YDYo53YdzQEL2gWm1hBX5cGFR9hQJtuGLebidVX7et3+dmDZrmclduw==",
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-5.0.6.tgz",
+      "integrity": "sha512-yg2d+Em4KizZC5niWhQaIomgf5WlL4vOOjZ5xGCmF8SnPE/mDWWXgvRExdcpCgh9lLRRa1/fSYp2ymmbJ1pI+A==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.23",
         "debug": "^4.1.1",
@@ -8157,6 +8192,22 @@
         "set-function-name": "^2.0.1"
       }
     },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
     "node_modules/jiti": {
       "version": "1.21.0",
       "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.0.tgz",
@@ -8324,12 +8375,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/jsonc-parser": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz",
-      "integrity": "sha512-AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==",
-      "dev": true
-    },
     "node_modules/jsonify": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
@@ -8457,22 +8502,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/local-pkg": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-0.5.0.tgz",
-      "integrity": "sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==",
-      "dev": true,
-      "dependencies": {
-        "mlly": "^1.4.2",
-        "pkg-types": "^1.0.3"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
@@ -8587,10 +8616,11 @@
       }
     },
     "node_modules/loupe": {
-      "version": "2.3.7",
-      "resolved": "https://registry.npmjs.org/loupe/-/loupe-2.3.7.tgz",
-      "integrity": "sha512-zSMINGVYkdpYSOBmLi0D1Uo7JU9nVdQKrHxC8eYlV+9YKK9WePqAlL7lSlorG/U2Fw1w0hTBmaa/jrQ3UbPHtA==",
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.1.tgz",
+      "integrity": "sha512-edNu/8D5MKVfGVFRhFf8aAxiTM6Wumfz5XsaatSxlD3w4R1d/WEKUTydCdPGbl9K7QG/Ca3GnDV2sIKIpXRQcw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "get-func-name": "^2.0.1"
       }
@@ -8633,26 +8663,25 @@
       }
     },
     "node_modules/magic-string": {
-      "version": "0.30.8",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.8.tgz",
-      "integrity": "sha512-ISQTe55T2ao7XtlAStud6qwYPZjE4GK1S/BeVPus4jrq6JuOnQ00YKQC581RWhR122W7msZV263KzVeLoqidyQ==",
+      "version": "0.30.10",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.10.tgz",
+      "integrity": "sha512-iIRwTIf0QKV3UAnYK4PU8uiEc4SRh5jX0mwpIwETPpHdhVM4f53RSwS/vXvN1JhGX+Cs7B8qIq3d6AH49O5fAQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.4.15"
-      },
-      "engines": {
-        "node": ">=12"
       }
     },
     "node_modules/magicast": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.3.tgz",
-      "integrity": "sha512-ZbrP1Qxnpoes8sz47AM0z08U+jW6TyRgZzcWy3Ma3vDhJttwMwAFDMMQFobwdBxByBD46JYmxRzeF7w2+wJEuw==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/magicast/-/magicast-0.3.4.tgz",
+      "integrity": "sha512-TyDF/Pn36bBji9rWKHlZe+PZb6Mx5V8IHCSxk7X4aljM4e/vyDvZZYwHewdVaqiA0nb3ghfHU/6AUpDxWoER2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.23.6",
-        "@babel/types": "^7.23.6",
-        "source-map-js": "^1.0.2"
+        "@babel/parser": "^7.24.4",
+        "@babel/types": "^7.24.0",
+        "source-map-js": "^1.2.0"
       }
     },
     "node_modules/make-dir": {
@@ -8853,16 +8882,14 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/mlly": {
-      "version": "1.6.1",
-      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.6.1.tgz",
-      "integrity": "sha512-vLgaHvaeunuOXHSmEbZ9izxPx3USsk8KCQ8iC+aTlp5sKRSoZvwhHh5L9VbKSaVC6sJDqbyohIS76E2VmHIPAA==",
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "dev": true,
-      "dependencies": {
-        "acorn": "^8.11.3",
-        "pathe": "^1.1.2",
-        "pkg-types": "^1.0.3",
-        "ufo": "^1.3.2"
+      "license": "ISC",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/ms": {
@@ -9299,6 +9326,13 @@
         "node": ">=6"
       }
     },
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz",
+      "integrity": "sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==",
+      "dev": true,
+      "license": "BlueOak-1.0.0"
+    },
     "node_modules/param-case": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
@@ -9439,6 +9473,30 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+      },
+      "engines": {
+        "node": ">=16 || 14 >=14.18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/path-type": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
@@ -9455,12 +9513,13 @@
       "dev": true
     },
     "node_modules/pathval": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
-      "integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
+      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "*"
+        "node": ">= 14.16"
       }
     },
     "node_modules/pbf": {
@@ -9493,17 +9552,6 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/pkg-types": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.0.3.tgz",
-      "integrity": "sha512-nN7pYi0AQqJnoLPC9eHFQ8AcyaixBUOwvqc5TDnIKCMEE6I0y8P7OKA7fPexsXGCGxQDl/cmrLAp26LhcwxZ4A==",
-      "dev": true,
-      "dependencies": {
-        "jsonc-parser": "^3.2.0",
-        "mlly": "^1.2.0",
-        "pathe": "^1.1.0"
-      }
-    },
     "node_modules/possible-typed-array-names": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz",
@@ -10583,6 +10631,29 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs": {
+      "name": "string-width",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
+      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "emoji-regex": "^8.0.0",
+        "is-fullwidth-code-point": "^3.0.0",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/string-width-cjs/node_modules/emoji-regex": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/string-width/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -10687,6 +10758,20 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi-cjs": {
+      "name": "strip-ansi",
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-bom": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
@@ -10720,24 +10805,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/strip-literal": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/strip-literal/-/strip-literal-2.0.0.tgz",
-      "integrity": "sha512-f9vHgsCWBq2ugHAkGMiiYY+AYG0D/cbloKKg0nhaaaSNsujdGIpVXCNsrJpCKr5M0f4aI31mr13UjY6GAuXCKA==",
-      "dev": true,
-      "dependencies": {
-        "js-tokens": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antfu"
-      }
-    },
-    "node_modules/strip-literal/node_modules/js-tokens": {
-      "version": "8.0.3",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-8.0.3.tgz",
-      "integrity": "sha512-UfJMcSJc+SEXEl9lH/VLHSZbThQyLpw1vLO1Lb+j4RWDvG3N2f7yj3PVQA3cmkTBNldJ9eFnM+xEXxHIXrYiJw==",
-      "dev": true
-    },
     "node_modules/supercluster": {
       "version": "8.0.1",
       "resolved": "https://registry.npmjs.org/supercluster/-/supercluster-8.0.1.tgz",
@@ -10786,39 +10853,39 @@
       "dev": true
     },
     "node_modules/test-exclude": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
-      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-7.0.1.tgz",
+      "integrity": "sha512-pFYqmTw68LXVjeWJMST4+borgQP2AyMNbg1BpZh9LbyhUeNkeaPF9gzfPGUAnSMV3qPYdWUwDIjjCLiSDOl7vg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "@istanbuljs/schema": "^0.1.2",
-        "glob": "^7.1.4",
-        "minimatch": "^3.0.4"
+        "glob": "^10.4.1",
+        "minimatch": "^9.0.4"
       },
       "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/test-exclude/node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "node": ">=18"
       }
     },
-    "node_modules/test-exclude/node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+    "node_modules/test-exclude/node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": "*"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
     "node_modules/text-table": {
@@ -10834,18 +10901,20 @@
       "dev": true
     },
     "node_modules/tinybench": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.6.0.tgz",
-      "integrity": "sha512-N8hW3PG/3aOoZAN5V/NSAEDz0ZixDSSt5b/a05iqtpgfLWMSVuCo7w0k2vVvEjdrIoeGqZzweX2WlyioNIHchA==",
-      "dev": true
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.8.0.tgz",
+      "integrity": "sha512-1/eK7zUnIklz4JUUlL+658n58XO2hHLQfSk1Zf2LKieUjxidN16eKFEoDEfjHc3ohofSSqK3X5yO6VGb6iW8Lw==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/tinypool": {
-      "version": "0.8.3",
-      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-0.8.3.tgz",
-      "integrity": "sha512-Ud7uepAklqRH1bvwy22ynrliC7Dljz7Tm8M/0RBUW+YRa4YHhZ6e4PpgE+fu1zr/WqB1kbeuVrdfeuyIBpy4tw==",
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.0.tgz",
+      "integrity": "sha512-KIKExllK7jp3uvrNtvRBYBWBOAXSX8ZvoaD8T+7KB/QHIuoJW3Pmr60zucywjAlMb5TeXUkcs/MWeWLu0qvuAQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": ">=14.0.0"
+        "node": "^18.0.0 || >=20.0.0"
       }
     },
     "node_modules/tinyqueue": {
@@ -10853,11 +10922,22 @@
       "resolved": "https://registry.npmjs.org/tinyqueue/-/tinyqueue-2.0.3.tgz",
       "integrity": "sha512-ppJZNDuKGgxzkHihX8v9v9G5f+18gzaTfrukGrq6ueg0lmH4nqVnA2IPG0AEH3jKEk2GRJCUhDoqpoiw3PHLBA=="
     },
+    "node_modules/tinyrainbow": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-1.2.0.tgz",
+      "integrity": "sha512-weEDEq7Z5eTHPDh4xjX789+fHfF+P8boiFB+0vbWzpbnbsEr/GRaohi/uMKxg8RZMXnl1ItAi/IUHWMsjDV7kQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=14.0.0"
+      }
+    },
     "node_modules/tinyspy": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-2.2.1.tgz",
-      "integrity": "sha512-KYad6Vy5VDWV4GH3fjpseMQ/XU2BhIYP7Vzd0LG44qRWm/Yt2WCOTicFdvmgo6gWaqooMQCawTtILVQJupKu7A==",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.0.tgz",
+      "integrity": "sha512-q5nmENpTHgiPVd1cJDDc9cVoYN5x4vCvwT3FMilvKPKneCBZAxn2YWQjDF0UMcE9k0Cay1gBiDfTMU0g+mPMQA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=14.0.0"
       }
@@ -11015,15 +11095,6 @@
         "node": ">= 0.8.0"
       }
     },
-    "node_modules/type-detect": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
-      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
-      "dev": true,
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/type-fest": {
       "version": "0.21.3",
       "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
@@ -11159,12 +11230,6 @@
         "node": "*"
       }
     },
-    "node_modules/ufo": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz",
-      "integrity": "sha512-Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==",
-      "dev": true
-    },
     "node_modules/unbox-primitive": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz",
@@ -11398,15 +11463,16 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-1.6.0.tgz",
-      "integrity": "sha512-de6HJgzC+TFzOu0NTC4RAIsyf/DY/ibWDYQUcuEA84EMHhcefTUGkjFHKKEJhQN4A+6I0u++kr3l36ZF2d7XRw==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.4.tgz",
+      "integrity": "sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "cac": "^6.7.14",
-        "debug": "^4.3.4",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
+        "debug": "^4.3.5",
+        "pathe": "^1.1.2",
+        "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0"
       },
       "bin": {
@@ -11420,31 +11486,31 @@
       }
     },
     "node_modules/vitest": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-1.6.0.tgz",
-      "integrity": "sha512-H5r/dN06swuFnzNFhq/dnz37bPXnq8xB2xB5JOVk8K09rUtoeNN+LHWkoQ0A/i3hvbUKKcCei9KpbxqHMLhLLA==",
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.4.tgz",
+      "integrity": "sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@vitest/expect": "1.6.0",
-        "@vitest/runner": "1.6.0",
-        "@vitest/snapshot": "1.6.0",
-        "@vitest/spy": "1.6.0",
-        "@vitest/utils": "1.6.0",
-        "acorn-walk": "^8.3.2",
-        "chai": "^4.3.10",
-        "debug": "^4.3.4",
+        "@ampproject/remapping": "^2.3.0",
+        "@vitest/expect": "2.0.4",
+        "@vitest/pretty-format": "^2.0.4",
+        "@vitest/runner": "2.0.4",
+        "@vitest/snapshot": "2.0.4",
+        "@vitest/spy": "2.0.4",
+        "@vitest/utils": "2.0.4",
+        "chai": "^5.1.1",
+        "debug": "^4.3.5",
         "execa": "^8.0.1",
-        "local-pkg": "^0.5.0",
-        "magic-string": "^0.30.5",
-        "pathe": "^1.1.1",
-        "picocolors": "^1.0.0",
-        "std-env": "^3.5.0",
-        "strip-literal": "^2.0.0",
-        "tinybench": "^2.5.1",
-        "tinypool": "^0.8.3",
+        "magic-string": "^0.30.10",
+        "pathe": "^1.1.2",
+        "std-env": "^3.7.0",
+        "tinybench": "^2.8.0",
+        "tinypool": "^1.0.0",
+        "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "1.6.0",
-        "why-is-node-running": "^2.2.2"
+        "vite-node": "2.0.4",
+        "why-is-node-running": "^2.3.0"
       },
       "bin": {
         "vitest": "vitest.mjs"
@@ -11458,8 +11524,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "1.6.0",
-        "@vitest/ui": "1.6.0",
+        "@vitest/browser": "2.0.4",
+        "@vitest/ui": "2.0.4",
         "happy-dom": "*",
         "jsdom": "*"
       },
@@ -11701,10 +11767,11 @@
       }
     },
     "node_modules/why-is-node-running": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.2.2.tgz",
-      "integrity": "sha512-6tSwToZxTOcotxHeA+qGCq1mVzKR3CwcJGmVcY+QE8SHy6TnpFnh8PAvPNHYr7EcuVeG0QSMxtYCuO1ta/G/oA==",
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
+      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "siginfo": "^2.0.0",
         "stackback": "0.0.2"
@@ -11730,6 +11797,25 @@
         "node": ">=8"
       }
     },
+    "node_modules/wrap-ansi-cjs": {
+      "name": "wrap-ansi",
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
+      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
+      }
+    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/client/package.json b/client/package.json
index 509c25752dd..1681ed56d1d 100644
--- a/client/package.json
+++ b/client/package.json
@@ -38,7 +38,7 @@
     "@typescript-eslint/eslint-plugin": "7.14.1",
     "@typescript-eslint/parser": "7.14.1",
     "@vitejs/plugin-react": "4.3.1",
-    "@vitest/coverage-v8": "1.6.0",
+    "@vitest/coverage-v8": "2.0.4",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
@@ -50,6 +50,6 @@
     "prettier": "3.3.2",
     "typescript": "5.5.2",
     "vite": "5.3.2",
-    "vitest": "1.6.0"
+    "vitest": "2.0.4"
   }
 }

From 5765d5856d403f7e43579f7f7b08b9760cffe58f Mon Sep 17 00:00:00 2001
From: Joel Lappalainen 
Date: Mon, 22 Jul 2024 15:08:10 +0300
Subject: [PATCH 1640/1688] Clarify where logback extensions file should be in
 a container

---
 docs/Container-Image.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/Container-Image.md b/docs/Container-Image.md
index d8e6db6d614..ed2441f5ac1 100644
--- a/docs/Container-Image.md
+++ b/docs/Container-Image.md
@@ -4,7 +4,9 @@ The CI pipeline deploys container images for runtimes like Docker, Kubernetes or
 [Dockerhub](https://hub.docker.com/r/opentripplanner/opentripplanner/tags).
 
 The image assumes you use a volume to mount the input data (GTFS/NeTex, OSM) and config files into 
-`/var/opentripplanner/`. When serving a graph it's also expected to be in this directory.
+`/var/opentripplanner/`. When serving a graph it's also expected to be in this directory. If a logback
+extensions file needs to be used, it should be mounted to the root location `/logback-include-extensions.xml`
+instead of the `/var/opentripplanner/` directory.
 
 ## Quick start
 

From 6764a08d89a599525c161c6370ee6f3ebcdc551c Mon Sep 17 00:00:00 2001
From: Thomas Gran 
Date: Tue, 23 Jul 2024 13:40:20 +0200
Subject: [PATCH 1641/1688] Fix megre conflict in
 TransitGroupPriorityServiceTest

---
 .../TransitGroupPriorityServiceTest.java          | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
index 993eb14c424..fe2cb361f07 100644
--- a/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
+++ b/src/test/java/org/opentripplanner/transit/model/network/grouppriority/TransitGroupPriorityServiceTest.java
@@ -98,8 +98,14 @@ void lookupTransitGroupIdByAgency() {
 
     // Verify we get the same result with using the trip, not trip-pattern
     assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTrip));
-    assertEquals(EXP_GROUP_1, subject.lookupTransitGroupPriorityId(busB2.getTrip(0)));
-    assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR3.getTrip(0)));
+    assertEquals(
+      EXP_GROUP_1,
+      subject.lookupTransitGroupPriorityId(busB2.getScheduledTimetable().getTripTimes(0).getTrip())
+    );
+    assertEquals(
+      EXP_GROUP_2,
+      subject.lookupTransitGroupPriorityId(railR3.getScheduledTimetable().getTripTimes(0).getTrip())
+    );
   }
 
   @Test
@@ -122,7 +128,10 @@ void lookupTransitPriorityGroupIdByGlobalMode() {
 
     // Verify we get the same result with using the trip, not trip-pattern
     assertEquals(EXP_GROUP_ID_BASE, subject.lookupTransitGroupPriorityId(nullTrip));
-    assertEquals(EXP_GROUP_2, subject.lookupTransitGroupPriorityId(railR1.getTrip(0)));
+    assertEquals(
+      EXP_GROUP_2,
+      subject.lookupTransitGroupPriorityId(railR1.getScheduledTimetable().getTripTimes(0).getTrip())
+    );
   }
 
   private static TestRouteData route(

From 18985dbfb696ca53e17391a3909e0e922c78aa4b Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 23 Jul 2024 15:01:12 +0200
Subject: [PATCH 1642/1688] Apply suggestions from code review

Co-authored-by: Johan Torin 
---
 .../org/opentripplanner/apis/transmodel/model/EnumTypes.java    | 2 +-
 .../org/opentripplanner/apis/transmodel/schema.graphql          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
index 438c3d48052..b325eac3653 100644
--- a/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
+++ b/src/main/java/org/opentripplanner/apis/transmodel/model/EnumTypes.java
@@ -439,7 +439,7 @@ public class EnumTypes {
       StreetMode.CAR_RENTAL,
       "Walk to a car rental point along " +
       "the road, drive to a drop-off point along the road, and walk the rest of the way. " +
-      "This can include car rental at fixed locations or free-floating services."
+      "This can include car rentals at fixed locations or free-floating services."
     )
     .value(
       "flexible",
diff --git a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
index 72f682e4634..0d2bf71dcc6 100644
--- a/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
+++ b/src/main/resources/org/opentripplanner/apis/transmodel/schema.graphql
@@ -1773,7 +1773,7 @@ enum StreetMode {
   car_park
   "Walk to a pickup point along the road, drive to a drop-off point along the road, and walk the rest of the way. This can include various taxi-services or kiss & ride."
   car_pickup
-  "Walk to a car rental point along the road, drive to a drop-off point along the road, and walk the rest of the way. This can include car rental at fixed locations or free-floating services."
+  "Walk to a car rental point along the road, drive to a drop-off point along the road, and walk the rest of the way. This can include car rentals at fixed locations or free-floating services."
   car_rental
   "Walk to an eligible pickup area for flexible transportation, ride to an eligible drop-off area and then walk the rest of the way."
   flexible

From 03dae4e1b6acd6b1c90d693d7b0614a1a50ba8a3 Mon Sep 17 00:00:00 2001
From: OTP Serialization Version Bot
 
Date: Tue, 23 Jul 2024 13:02:27 +0000
Subject: [PATCH 1643/1688] Bump serialization version id for #5978

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index ae3fdfec72d..2f007cbb214 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 
     
-        154
+        155
         
         31.3
         2.51.1

From fc53d94216474ba06598ff9427a8b487b76cf93c Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 23 Jul 2024 15:05:04 +0200
Subject: [PATCH 1644/1688] Apply review suggestions

---
 .../transit/service/TransitEditorService.java       | 13 +++++++++++++
 .../PollingVehiclePositionUpdater.java              |  2 ++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java b/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
index 3bdcf607363..150d1749272 100644
--- a/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
+++ b/src/main/java/org/opentripplanner/transit/service/TransitEditorService.java
@@ -39,9 +39,22 @@ void addTripOnServiceDateForTripAndDay(
 
   FeedScopedId getOrCreateServiceIdForDate(LocalDate serviceDate);
 
+  /**
+   * Set the original, immutable, transit layer,
+   * based on scheduled data (not real-time data).
+   */
   void setTransitLayer(TransitLayer transitLayer);
 
+  /**
+   * Return true if a real-time transit layer is present.
+   * The real-time transit layer is optional,
+   * it is present only when real-time updaters are configured.
+   */
   boolean hasRealtimeTransitLayer();
 
+  /**
+   * Publish the latest snapshot of the real-time transit layer.
+   * Should be called only when creating a new TransitLayer, from the graph writer thread.
+   */
   void setRealtimeTransitLayer(TransitLayer realtimeTransitLayer);
 }
diff --git a/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java b/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
index 6b9391f3ea2..f1355ca0fa4 100644
--- a/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
+++ b/src/main/java/org/opentripplanner/updater/vehicle_position/PollingVehiclePositionUpdater.java
@@ -45,6 +45,8 @@ public PollingVehiclePositionUpdater(
     super(params);
     this.vehiclePositionSource =
       new GtfsRealtimeHttpVehiclePositionSource(params.url(), params.headers());
+    // TODO Inject TransitService, do not create it here. We currently do not
+    //      support dagger injection in updaters, so this is ok for now.
     TransitService transitService = new DefaultTransitService(transitModel);
     var fuzzyTripMatcher = params.fuzzyTripMatching()
       ? new GtfsRealtimeFuzzyTripMatcher(transitService)

From 7b1f7602612702aa41b60aef285db82a5587d6b8 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 23 Jul 2024 15:55:33 +0200
Subject: [PATCH 1645/1688] Fix copy&paste error

Co-authored-by: Henrik Abrahamsson <127481124+habrahamsson-skanetrafiken@users.noreply.github.com>
---
 .../standalone/config/buildconfig/NetexConfig.java              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java b/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
index 6be400b7549..52bccf605d8 100644
--- a/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/buildconfig/NetexConfig.java
@@ -172,7 +172,7 @@ private static NetexFeedParameters.Builder mapFilePatternParameters(
           .since(V2_6)
           .summary("Ignore Parking elements.")
           .docDefaultValue(base.ignoreParking())
-          .asBoolean(base.ignoreFareFrame())
+          .asBoolean(base.ignoreParking())
       );
   }
 

From 18ef55532060d581062d3a3c79d669f6da2c3e33 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 23 Jul 2024 16:06:42 +0200
Subject: [PATCH 1646/1688] Move component into separate file

---
 .../ItineraryList/InterchangeInfo.tsx         | 22 +++++++++++++++++++
 .../ItineraryList/ItineraryLegDetails.tsx     | 22 ++-----------------
 2 files changed, 24 insertions(+), 20 deletions(-)
 create mode 100644 client/src/components/ItineraryList/InterchangeInfo.tsx

diff --git a/client/src/components/ItineraryList/InterchangeInfo.tsx b/client/src/components/ItineraryList/InterchangeInfo.tsx
new file mode 100644
index 00000000000..0dbd7368c0e
--- /dev/null
+++ b/client/src/components/ItineraryList/InterchangeInfo.tsx
@@ -0,0 +1,22 @@
+import logo from '../../static/img/stay-seated.svg';
+import { Leg } from '../../gql/graphql.ts';
+
+/**
+ * Displays an icon if a leg has a stay-seated transfer from the previous one.
+ */
+export function InterchangeInfo({ leg }: { leg: Leg }) {
+  if (leg.interchangeFrom?.staySeated) {
+    return (
+      Stay-seated transfer
+    );
+  } else {
+    return <>;
+  }
+}
diff --git a/client/src/components/ItineraryList/ItineraryLegDetails.tsx b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
index 1990b7c62ff..56fdf430388 100644
--- a/client/src/components/ItineraryList/ItineraryLegDetails.tsx
+++ b/client/src/components/ItineraryList/ItineraryLegDetails.tsx
@@ -2,25 +2,7 @@ import { Leg, Mode } from '../../gql/graphql.ts';
 import { LegTime } from './LegTime.tsx';
 import { formatDistance } from '../../util/formatDistance.ts';
 import { formatDuration } from '../../util/formatDuration.ts';
-import logo from '../../static/img/stay-seated.svg';
-import React from 'react';
-
-const staySeatedIcon: (leg: Leg) => React.JSX.Element = (leg: Leg) => {
-  if (leg.interchangeFrom?.staySeated) {
-    return (
-      Stay-seated transfer
-    );
-  } else {
-    return <>;
-  }
-};
+import { InterchangeInfo } from './InterchangeInfo.tsx';
 
 export function ItineraryLegDetails({ leg, isLast }: { leg: Leg; isLast: boolean }) {
   return (
@@ -29,7 +11,7 @@ export function ItineraryLegDetails({ leg, isLast }: { leg: Leg; isLast: boolean
         {formatDistance(leg.distance)}, {formatDuration(leg.duration)}
       
              
       
              
-        {staySeatedIcon(leg)}
+        
         
Date: Tue, 23 Jul 2024 16:09:17 +0200
Subject: [PATCH 1647/1688] Replace identity with equality

---
 .../org/opentripplanner/netex/config/NetexFeedParameters.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
index 5ff5004d0c8..f565ea5a187 100644
--- a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
+++ b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
@@ -148,7 +148,7 @@ public boolean equals(Object o) {
       sharedFilePattern.equals(that.sharedFilePattern) &&
       sharedGroupFilePattern.equals(that.sharedGroupFilePattern) &&
       groupFilePattern.equals(that.groupFilePattern) &&
-      ignoredFeatures == that.ignoredFeatures &&
+      ignoredFeatures.equals(that.ignoredFeatures) &&
       ferryIdsNotAllowedForBicycle.equals(that.ferryIdsNotAllowedForBicycle)
     );
   }

From 1cfaa3800ddf777e47785329b27199cff3b8599a Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 23 Jul 2024 16:22:57 +0200
Subject: [PATCH 1648/1688] Add Javadoc for KeyValue

---
 .../inspector/vector/KeyValue.java             | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java b/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
index 8557ad0a465..edad5e1b295 100644
--- a/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
+++ b/src/main/java/org/opentripplanner/inspector/vector/KeyValue.java
@@ -1,14 +1,30 @@
 package org.opentripplanner.inspector.vector;
 
+import jakarta.annotation.Nullable;
 import java.util.Collection;
 import java.util.stream.Collectors;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 
+/**
+ * A key value pair that represents data being sent to the vector tile library for visualisation
+ * in a map (including popups).
+ * 
              
+ * The underlying format (and library) supports only a limited number of Java types and silently
+ * drops those that aren't supported: https://github.com/CI-CMG/mapbox-vector-tile/blob/master/src/main/java/edu/colorado/cires/cmg/mvt/encoding/MvtValue.java#L18-L40
+ * 
              
+ * For this reason this class also has static initializer that automatically converts common
+ * OTP classes into vector tile-compatible strings.
+ */
 public record KeyValue(String key, Object value) {
   public static KeyValue kv(String key, Object value) {
     return new KeyValue(key, value);
   }
-  public static KeyValue kv(String key, FeedScopedId value) {
+
+  /**
+   * A {@link FeedScopedId} is not a type that can be converted to a vector tile feature property
+   * value. Therefore, we convert it to a string after performing a null check.
+   */
+  public static KeyValue kv(String key, @Nullable FeedScopedId value) {
     if (value != null) {
       return new KeyValue(key, value.toString());
     } else {

From a2eaecc797bd9a58d8191d972822825ec1de76b6 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 23 Jul 2024 16:31:05 +0200
Subject: [PATCH 1649/1688] Rename variable

---
 .../street/model/vertex/VehicleParkingEntranceVertex.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
index 2f389f60817..ba7a1540715 100644
--- a/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
+++ b/src/main/java/org/opentripplanner/street/model/vertex/VehicleParkingEntranceVertex.java
@@ -59,7 +59,7 @@ public boolean isLinkedToGraph() {
     return hasLink(getIncoming()) || hasLink(getOutgoing());
   }
 
-  private boolean hasLink(Collection incoming) {
-    return incoming.stream().anyMatch(StreetVehicleParkingLink.class::isInstance);
+  private boolean hasLink(Collection edges) {
+    return edges.stream().anyMatch(StreetVehicleParkingLink.class::isInstance);
   }
 }

From 2c34a4e8f5b9b381e07ad26a64dc263681169b38 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 12 Jul 2024 13:41:07 +0200
Subject: [PATCH 1650/1688] Remove lock on Timetable snapshot buffer

---
 .../ext/siri/SiriTimetableSnapshotSource.java |  14 +-
 .../trip/TimetableSnapshotManager.java        |  44 +---
 .../updater/trip/TimetableSnapshotSource.java | 198 +++++++++---------
 3 files changed, 106 insertions(+), 150 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index 7ab316bfc55..3284e1620bd 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -102,11 +102,10 @@ public UpdateResult applyEstimatedTimetable(
 
     List> results = new ArrayList<>();
 
-    snapshotManager.withLock(() -> {
-      if (incrementality == FULL_DATASET) {
-        // Remove all updates from the buffer
-        snapshotManager.clearBuffer(feedId);
-      }
+    if (incrementality == FULL_DATASET) {
+      // Remove all updates from the buffer
+      snapshotManager.clearBuffer(feedId);
+    }
 
       for (var etDelivery : updates) {
         for (var estimatedJourneyVersion : etDelivery.getEstimatedJourneyVersionFrames()) {
@@ -118,10 +117,9 @@ public UpdateResult applyEstimatedTimetable(
         }
       }
 
-      LOG.debug("message contains {} trip updates", updates.size());
+    LOG.debug("message contains {} trip updates", updates.size());
 
-      snapshotManager.purgeAndCommit();
-    });
+    snapshotManager.purgeAndCommit();
 
     return UpdateResult.ofResults(results);
   }
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index bf7c8c98919..71703df459a 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -2,7 +2,6 @@
 
 import java.time.LocalDate;
 import java.util.Objects;
-import java.util.concurrent.locks.ReentrantLock;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
 import org.opentripplanner.framework.time.CountdownTimer;
@@ -30,21 +29,10 @@ public final class TimetableSnapshotManager {
 
   private static final Logger LOG = LoggerFactory.getLogger(TimetableSnapshotManager.class);
   private final TransitLayerUpdater transitLayerUpdater;
-  /**
-   * Lock to indicate that buffer is in use
-   */
-  private final ReentrantLock bufferLock = new ReentrantLock(true);
 
   /**
-   * The working copy of the timetable snapshot. Should not be visible to routing threads. Should
-   * only be modified by a thread that holds a lock on {@link #bufferLock}. All public methods that
-   * might modify this buffer will correctly acquire the lock. By design, only one thread should
-   * ever be writing to this buffer.
-   * TODO RT_AB: research and document why this lock is needed since only one thread should ever be
-   *   writing to this buffer. One possible reason may be a need to suspend writes while indexing
-   *   and swapping out the buffer. But the original idea was to make a new copy of the buffer
-   *   before re-indexing it. While refactoring or rewriting parts of this system, we could throw
-   *   an exception if a writing section is entered by more than one thread.
+   * The working copy of the timetable snapshot. Should not be visible to routing threads.
+   * By design, only one thread should ever be writing to this buffer.
    */
   private final TimetableSnapshot buffer = new TimetableSnapshot();
 
@@ -99,18 +87,6 @@ public TimetableSnapshotManager(
    * to the snapshot to release resources.
    */
   public TimetableSnapshot getTimetableSnapshot() {
-    // Try to get a lock on the buffer
-    if (bufferLock.tryLock()) {
-      // Make a new snapshot if necessary
-      try {
-        commitTimetableSnapshot(false);
-        return snapshot;
-      } finally {
-        bufferLock.unlock();
-      }
-    }
-    // No lock could be obtained because there is either a snapshot commit busy or updates
-    // are applied at this moment, just return the current snapshot
     return snapshot;
   }
 
@@ -205,22 +181,6 @@ private boolean purgeExpiredData() {
     return buffer.purgeExpiredData(previously);
   }
 
-  /**
-   * Execute a {@code Runnable} with a locked snapshot buffer and release the lock afterwards. While
-   * the action of locking and unlocking is not complicated to do for calling code, this method
-   * exists so that the lock instance is a private field.
-   */
-  public void withLock(Runnable action) {
-    bufferLock.lock();
-
-    try {
-      action.run();
-    } finally {
-      // Always release lock
-      bufferLock.unlock();
-    }
-  }
-
   /**
    * Clear all data of snapshot for the provided feed id
    */
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index c452d5f58f8..10137b99837 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -156,121 +156,119 @@ public UpdateResult applyTripUpdates(
     Map failuresByRelationship = new HashMap<>();
     List> results = new ArrayList<>();
 
-    snapshotManager.withLock(() -> {
-      if (updateIncrementality == FULL_DATASET) {
-        // Remove all updates from the buffer
-        snapshotManager.clearBuffer(feedId);
+    if (updateIncrementality == FULL_DATASET) {
+      // Remove all updates from the buffer
+      snapshotManager.clearBuffer(feedId);
+    }
+
+    LOG.debug("message contains {} trip updates", updates.size());
+    int uIndex = 0;
+    for (TripUpdate tripUpdate : updates) {
+      if (!tripUpdate.hasTrip()) {
+        debug(feedId, "", "Missing TripDescriptor in gtfs-rt trip update: \n{}", tripUpdate);
+        continue;
       }
 
-      LOG.debug("message contains {} trip updates", updates.size());
-      int uIndex = 0;
-      for (TripUpdate tripUpdate : updates) {
-        if (!tripUpdate.hasTrip()) {
-          debug(feedId, "", "Missing TripDescriptor in gtfs-rt trip update: \n{}", tripUpdate);
-          continue;
-        }
+      if (fuzzyTripMatcher != null) {
+        final TripDescriptor trip = fuzzyTripMatcher.match(feedId, tripUpdate.getTrip());
+        tripUpdate = tripUpdate.toBuilder().setTrip(trip).build();
+      }
 
-        if (fuzzyTripMatcher != null) {
-          final TripDescriptor trip = fuzzyTripMatcher.match(feedId, tripUpdate.getTrip());
-          tripUpdate = tripUpdate.toBuilder().setTrip(trip).build();
-        }
+      final TripDescriptor tripDescriptor = tripUpdate.getTrip();
+
+      if (!tripDescriptor.hasTripId() || tripDescriptor.getTripId().isBlank()) {
+        debug(feedId, "", "No trip id found for gtfs-rt trip update: \n{}", tripUpdate);
+        results.add(Result.failure(UpdateError.noTripId(INVALID_INPUT_STRUCTURE)));
+        continue;
+      }
 
-        final TripDescriptor tripDescriptor = tripUpdate.getTrip();
+      FeedScopedId tripId = new FeedScopedId(feedId, tripUpdate.getTrip().getTripId());
 
-        if (!tripDescriptor.hasTripId() || tripDescriptor.getTripId().isBlank()) {
-          debug(feedId, "", "No trip id found for gtfs-rt trip update: \n{}", tripUpdate);
-          results.add(Result.failure(UpdateError.noTripId(INVALID_INPUT_STRUCTURE)));
+      LocalDate serviceDate;
+      if (tripDescriptor.hasStartDate()) {
+        try {
+          serviceDate = ServiceDateUtils.parseString(tripDescriptor.getStartDate());
+        } catch (final ParseException e) {
+          debug(
+            tripId,
+            "Failed to parse start date in gtfs-rt trip update: {}",
+            tripDescriptor.getStartDate()
+          );
           continue;
         }
+      } else {
+        // TODO: figure out the correct service date. For the special case that a trip
+        // starts for example at 40:00, yesterday would probably be a better guess.
+        serviceDate = localDateNow.get();
+      }
+      // Determine what kind of trip update this is
+      var scheduleRelationship = Objects.requireNonNullElse(
+        tripDescriptor.getScheduleRelationship(),
+        SCHEDULED
+      );
+      if (updateIncrementality == DIFFERENTIAL) {
+        purgePatternModifications(scheduleRelationship, tripId, serviceDate);
+      }
 
-        FeedScopedId tripId = new FeedScopedId(feedId, tripUpdate.getTrip().getTripId());
+      uIndex += 1;
+      LOG.debug("trip update #{} ({} updates) :", uIndex, tripUpdate.getStopTimeUpdateCount());
+      LOG.trace("{}", tripUpdate);
 
-        LocalDate serviceDate;
-        if (tripDescriptor.hasStartDate()) {
-          try {
-            serviceDate = ServiceDateUtils.parseString(tripDescriptor.getStartDate());
-          } catch (final ParseException e) {
-            debug(
+      Result result;
+      try {
+        result =
+          switch (scheduleRelationship) {
+            case SCHEDULED -> handleScheduledTrip(
+              tripUpdate,
               tripId,
-              "Failed to parse start date in gtfs-rt trip update: {}",
-              tripDescriptor.getStartDate()
+              serviceDate,
+              backwardsDelayPropagationType
             );
-            continue;
-          }
-        } else {
-          // TODO: figure out the correct service date. For the special case that a trip
-          // starts for example at 40:00, yesterday would probably be a better guess.
-          serviceDate = localDateNow.get();
-        }
-        // Determine what kind of trip update this is
-        var scheduleRelationship = Objects.requireNonNullElse(
-          tripDescriptor.getScheduleRelationship(),
-          SCHEDULED
-        );
-        if (updateIncrementality == DIFFERENTIAL) {
-          purgePatternModifications(scheduleRelationship, tripId, serviceDate);
-        }
-
-        uIndex += 1;
-        LOG.debug("trip update #{} ({} updates) :", uIndex, tripUpdate.getStopTimeUpdateCount());
-        LOG.trace("{}", tripUpdate);
-
-        Result result;
-        try {
-          result =
-            switch (scheduleRelationship) {
-              case SCHEDULED -> handleScheduledTrip(
-                tripUpdate,
-                tripId,
-                serviceDate,
-                backwardsDelayPropagationType
-              );
-              case ADDED -> validateAndHandleAddedTrip(
-                tripUpdate,
-                tripDescriptor,
-                tripId,
-                serviceDate
-              );
-              case CANCELED -> handleCanceledTrip(
-                tripId,
-                serviceDate,
-                CancelationType.CANCEL,
-                updateIncrementality
-              );
-              case DELETED -> handleCanceledTrip(
-                tripId,
-                serviceDate,
-                CancelationType.DELETE,
-                updateIncrementality
-              );
-              case REPLACEMENT -> validateAndHandleModifiedTrip(
-                tripUpdate,
-                tripDescriptor,
-                tripId,
-                serviceDate
-              );
-              case UNSCHEDULED -> UpdateError.result(tripId, NOT_IMPLEMENTED_UNSCHEDULED);
-              case DUPLICATED -> UpdateError.result(tripId, NOT_IMPLEMENTED_DUPLICATED);
-            };
-        } catch (DataValidationException e) {
-          result = DataValidationExceptionMapper.toResult(e);
-        }
+            case ADDED -> validateAndHandleAddedTrip(
+              tripUpdate,
+              tripDescriptor,
+              tripId,
+              serviceDate
+            );
+            case CANCELED -> handleCanceledTrip(
+              tripId,
+              serviceDate,
+              CancelationType.CANCEL,
+              updateIncrementality
+            );
+            case DELETED -> handleCanceledTrip(
+              tripId,
+              serviceDate,
+              CancelationType.DELETE,
+              updateIncrementality
+            );
+            case REPLACEMENT -> validateAndHandleModifiedTrip(
+              tripUpdate,
+              tripDescriptor,
+              tripId,
+              serviceDate
+            );
+            case UNSCHEDULED -> UpdateError.result(tripId, NOT_IMPLEMENTED_UNSCHEDULED);
+            case DUPLICATED -> UpdateError.result(tripId, NOT_IMPLEMENTED_DUPLICATED);
+          };
+      } catch (DataValidationException e) {
+        result = DataValidationExceptionMapper.toResult(e);
+      }
 
-        results.add(result);
-        if (result.isFailure()) {
-          debug(tripId, "Failed to apply TripUpdate.");
-          LOG.trace(" Contents: {}", tripUpdate);
-          if (failuresByRelationship.containsKey(scheduleRelationship)) {
-            var c = failuresByRelationship.get(scheduleRelationship);
-            failuresByRelationship.put(scheduleRelationship, ++c);
-          } else {
-            failuresByRelationship.put(scheduleRelationship, 1);
-          }
+      results.add(result);
+      if (result.isFailure()) {
+        debug(tripId, "Failed to apply TripUpdate.");
+        LOG.trace(" Contents: {}", tripUpdate);
+        if (failuresByRelationship.containsKey(scheduleRelationship)) {
+          var c = failuresByRelationship.get(scheduleRelationship);
+          failuresByRelationship.put(scheduleRelationship, ++c);
+        } else {
+          failuresByRelationship.put(scheduleRelationship, 1);
         }
       }
+    }
 
-      snapshotManager.purgeAndCommit();
-    });
+    snapshotManager.purgeAndCommit();
 
     var updateResult = UpdateResult.ofResults(results);
 

From 892449a334f4cd611bc495acbc9e7707aee0d874 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 12 Jul 2024 13:56:54 +0200
Subject: [PATCH 1651/1688] Use current buffer from SiriTimetableSnapshotSource

---
 .../ext/siri/SiriTimetableSnapshotSource.java         | 11 ++++++-----
 .../updater/trip/TimetableSnapshotManager.java        |  6 ++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index 3284e1620bd..a7fc686c45b 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -129,6 +129,10 @@ public TimetableSnapshot getTimetableSnapshot() {
     return snapshotManager.getTimetableSnapshot();
   }
 
+  private TimetableSnapshot getTimetableSnapshotBuffer() {
+    return snapshotManager.getTimetableSnapshotBuffer();
+  }
+
   private Result apply(
     EstimatedVehicleJourney journey,
     TransitEditorService transitService,
@@ -193,13 +197,10 @@ private boolean shouldAddNewTrip(
    * Snapshot timetable is used as source if initialised, trip patterns scheduled timetable if not.
    */
   private Timetable getCurrentTimetable(TripPattern tripPattern, LocalDate serviceDate) {
-    TimetableSnapshot timetableSnapshot = getTimetableSnapshot();
-    if (timetableSnapshot != null) {
-      return timetableSnapshot.resolve(tripPattern, serviceDate);
-    }
-    return tripPattern.getScheduledTimetable();
+    return getTimetableSnapshotBuffer().resolve(tripPattern, serviceDate);
   }
 
+
   private Result handleModifiedTrip(
     @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher,
     EntityResolver entityResolver,
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index 71703df459a..3d95abd4853 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -90,6 +90,10 @@ public TimetableSnapshot getTimetableSnapshot() {
     return snapshot;
   }
 
+  public TimetableSnapshot getTimetableSnapshotBuffer() {
+    return buffer;
+  }
+
   /**
    * Request a commit of the timetable snapshot.
    * 
              
@@ -155,6 +159,8 @@ public void revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serv
     buffer.revertTripToScheduledTripPattern(tripId, serviceDate);
   }
 
+
+
   /**
    * Remove realtime data from previous service dates from the snapshot. This is useful so that
    * instances that run for multiple days don't accumulate a lot of realtime data for past

From 78dd01f38e64a4562448e2cd3acf51158d2fa36d Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 12 Jul 2024 14:11:31 +0200
Subject: [PATCH 1652/1688] use current buffer in TransitEditorService

---
 .../ext/siri/SiriTimetableSnapshotSource.java   | 17 ++++++++---------
 .../transit/service/DefaultTransitService.java  |  8 ++++++++
 .../updater/trip/TimetableSnapshotManager.java  |  2 --
 .../updater/trip/TimetableSnapshotSource.java   |  3 ++-
 4 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index a7fc686c45b..f87582a5e4e 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -71,7 +71,7 @@ public SiriTimetableSnapshotSource(
         parameters,
         () -> LocalDate.now(transitModel.getTimeZone())
       );
-    this.transitService = new DefaultTransitService(transitModel);
+    this.transitService = new DefaultTransitService(transitModel, getTimetableSnapshotBuffer());
     this.tripPatternCache =
       new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip);
 
@@ -107,15 +107,15 @@ public UpdateResult applyEstimatedTimetable(
       snapshotManager.clearBuffer(feedId);
     }
 
-      for (var etDelivery : updates) {
-        for (var estimatedJourneyVersion : etDelivery.getEstimatedJourneyVersionFrames()) {
-          var journeys = estimatedJourneyVersion.getEstimatedVehicleJourneies();
-          LOG.debug("Handling {} EstimatedVehicleJourneys.", journeys.size());
-          for (EstimatedVehicleJourney journey : journeys) {
-            results.add(apply(journey, transitService, fuzzyTripMatcher, entityResolver));
-          }
+    for (var etDelivery : updates) {
+      for (var estimatedJourneyVersion : etDelivery.getEstimatedJourneyVersionFrames()) {
+        var journeys = estimatedJourneyVersion.getEstimatedVehicleJourneies();
+        LOG.debug("Handling {} EstimatedVehicleJourneys.", journeys.size());
+        for (EstimatedVehicleJourney journey : journeys) {
+          results.add(apply(journey, transitService, fuzzyTripMatcher, entityResolver));
         }
       }
+    }
 
     LOG.debug("message contains {} trip updates", updates.size());
 
@@ -200,7 +200,6 @@ private Timetable getCurrentTimetable(TripPattern tripPattern, LocalDate service
     return getTimetableSnapshotBuffer().resolve(tripPattern, serviceDate);
   }
 
-
   private Result handleModifiedTrip(
     @Nullable SiriFuzzyTripMatcher fuzzyTripMatcher,
     EntityResolver entityResolver,
diff --git a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
index 398cb806524..b3d68b6ffa5 100644
--- a/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
+++ b/src/main/java/org/opentripplanner/transit/service/DefaultTransitService.java
@@ -79,6 +79,14 @@ public DefaultTransitService(TransitModel transitModel) {
     this.transitModelIndex = transitModel.getTransitModelIndex();
   }
 
+  public DefaultTransitService(
+    TransitModel transitModel,
+    TimetableSnapshot timetableSnapshotBuffer
+  ) {
+    this(transitModel);
+    this.timetableSnapshot = timetableSnapshotBuffer;
+  }
+
   @Override
   public Collection getFeedIds() {
     return this.transitModel.getFeedIds();
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index 3d95abd4853..232a798d2f8 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -159,8 +159,6 @@ public void revertTripToScheduledTripPattern(FeedScopedId tripId, LocalDate serv
     buffer.revertTripToScheduledTripPattern(tripId, serviceDate);
   }
 
-
-
   /**
    * Remove realtime data from previous service dates from the snapshot. This is useful so that
    * instances that run for multiple days don't accumulate a lot of realtime data for past
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index 10137b99837..ac03ab62e60 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -119,7 +119,8 @@ public TimetableSnapshotSource(
     this.snapshotManager =
       new TimetableSnapshotManager(transitModel.getTransitLayerUpdater(), parameters, localDateNow);
     this.timeZone = transitModel.getTimeZone();
-    this.transitService = new DefaultTransitService(transitModel);
+    this.transitService =
+      new DefaultTransitService(transitModel, snapshotManager.getTimetableSnapshotBuffer());
     this.deduplicator = transitModel.getDeduplicator();
     this.serviceCodes = transitModel.getServiceCodes();
     this.localDateNow = localDateNow;

From 20505506c09b6b54172e4bb0b95b4ec59b9ec902 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 16 Jul 2024 17:23:56 +0200
Subject: [PATCH 1653/1688] Reduce visibility of commitTimetableSnapshot

---
 .../opentripplanner/updater/trip/TimetableSnapshotManager.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index 232a798d2f8..e435623ce85 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -102,7 +102,7 @@ public TimetableSnapshot getTimetableSnapshotBuffer() {
    *
    * @param force Force the committing of a new snapshot even if the above conditions are not met.
    */
-  public void commitTimetableSnapshot(final boolean force) {
+  void commitTimetableSnapshot(final boolean force) {
     if (force || snapshotFrequencyThrottle.timeIsUp()) {
       if (force || buffer.isDirty()) {
         LOG.debug("Committing {}", buffer);

From 79802f06a689989109159604f1c1747f3184b668 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 16 Jul 2024 17:24:06 +0200
Subject: [PATCH 1654/1688] Introduce timetable snapshot flush

---
 .../ext/siri/SiriTimetableSnapshotSource.java |  4 ++
 .../model/TimetableSnapshot.java              |  5 +++
 .../configure/UpdaterConfigurator.java        | 22 +++++++++++
 .../updater/spi/TimetableSnapshotFlush.java   | 37 +++++++++++++++++++
 .../updater/trip/TimetableSnapshotSource.java |  4 ++
 5 files changed, 72 insertions(+)
 create mode 100644 src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index f87582a5e4e..4237fa318d7 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -327,4 +327,8 @@ private boolean markScheduledTripAsDeleted(Trip trip, final LocalDate serviceDat
 
     return success;
   }
+
+  public void flushBuffer() {
+    snapshotManager.purgeAndCommit();
+  }
 }
diff --git a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
index 7d3f6181d44..c0a7737abce 100644
--- a/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
+++ b/src/main/java/org/opentripplanner/model/TimetableSnapshot.java
@@ -65,6 +65,11 @@
  * up timetables on this class could conceivably be replaced with snapshotting entire views of the
  * transit network. It would also be possible to make the realtime version of Timetables or
  * TripTimes the primary view, and include references back to their scheduled versions.
+ * 
              
+ * Implementation note: when a snapshot is committed, the mutable state of this class is stored
+ * in final fields and completely initialized in the constructor. This provides an additional
+ * guarantee of safe-publication without synchronization.
+ * (see final Field Semantics)
  */
 public class TimetableSnapshot {
 
diff --git a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java
index 1e9b730ee3a..103120b7ecb 100644
--- a/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java
+++ b/src/main/java/org/opentripplanner/updater/configure/UpdaterConfigurator.java
@@ -2,6 +2,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource;
 import org.opentripplanner.ext.siri.updater.SiriETUpdater;
 import org.opentripplanner.ext.siri.updater.SiriSXUpdater;
@@ -20,6 +21,7 @@
 import org.opentripplanner.updater.UpdatersParameters;
 import org.opentripplanner.updater.alert.GtfsRealtimeAlertsUpdater;
 import org.opentripplanner.updater.spi.GraphUpdater;
+import org.opentripplanner.updater.spi.TimetableSnapshotFlush;
 import org.opentripplanner.updater.trip.MqttGtfsRealtimeUpdater;
 import org.opentripplanner.updater.trip.PollingTripUpdater;
 import org.opentripplanner.updater.trip.TimetableSnapshotSource;
@@ -94,6 +96,9 @@ private void configure() {
     );
 
     GraphUpdaterManager updaterManager = new GraphUpdaterManager(graph, transitModel, updaters);
+
+    configureTimetableSnapshotFlush(updaterManager);
+
     updaterManager.startUpdaters();
 
     // Stop the updater manager if it contains nothing
@@ -223,4 +228,21 @@ private TimetableSnapshotSource provideGtfsTimetableSnapshot() {
     }
     return gtfsTimetableSnapshotSource;
   }
+
+  /**
+   * If SIRI or GTFS real-time updaters are in use, configure a periodic flush of the timetable
+   * snapshot.
+   */
+  private void configureTimetableSnapshotFlush(GraphUpdaterManager updaterManager) {
+    if (siriTimetableSnapshotSource != null || gtfsTimetableSnapshotSource != null) {
+      updaterManager
+        .getScheduler()
+        .scheduleWithFixedDelay(
+          new TimetableSnapshotFlush(siriTimetableSnapshotSource, gtfsTimetableSnapshotSource),
+          0,
+          updatersParameters.timetableSnapshotParameters().maxSnapshotFrequency().toSeconds(),
+          TimeUnit.SECONDS
+        );
+    }
+  }
 }
diff --git a/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java b/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
new file mode 100644
index 00000000000..8c9f43e987e
--- /dev/null
+++ b/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
@@ -0,0 +1,37 @@
+package org.opentripplanner.updater.spi;
+
+import org.opentripplanner.ext.siri.SiriTimetableSnapshotSource;
+import org.opentripplanner.updater.trip.TimetableSnapshotSource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Flush the timetable snapshot buffer by committing pending changes.
+ */
+public class TimetableSnapshotFlush implements Runnable {
+
+  private static final Logger LOG = LoggerFactory.getLogger(TimetableSnapshotFlush.class);
+
+  private final SiriTimetableSnapshotSource siriTimetableSnapshotSource;
+  private final TimetableSnapshotSource gtfsTimetableSnapshotSource;
+
+  public TimetableSnapshotFlush(
+    SiriTimetableSnapshotSource siriTimetableSnapshotSource,
+    TimetableSnapshotSource gtfsTimetableSnapshotSource
+  ) {
+    this.siriTimetableSnapshotSource = siriTimetableSnapshotSource;
+    this.gtfsTimetableSnapshotSource = gtfsTimetableSnapshotSource;
+  }
+
+  @Override
+  public void run() {
+    LOG.debug("Flushing timetable snapshot buffer");
+    if (siriTimetableSnapshotSource != null) {
+      siriTimetableSnapshotSource.flushBuffer();
+    }
+    if (gtfsTimetableSnapshotSource != null) {
+      gtfsTimetableSnapshotSource.flushBuffer();
+    }
+    LOG.debug("Flushed timetable snapshot buffer");
+  }
+}
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index ac03ab62e60..bbbda0d9e4a 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -1097,4 +1097,8 @@ private enum CancelationType {
     CANCEL,
     DELETE,
   }
+
+  public void flushBuffer() {
+    snapshotManager.purgeAndCommit();
+  }
 }

From 104ee668294cc2b4289a78cf48ce4c0e37f2c2c5 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 19 Jul 2024 10:17:00 +0200
Subject: [PATCH 1655/1688] PUblish timetable snapshot with ConcurrentPublished

---
 .../updater/trip/TimetableSnapshotManager.java           | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index e435623ce85..d0b4044433d 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -8,6 +8,7 @@
 import org.opentripplanner.model.Timetable;
 import org.opentripplanner.model.TimetableSnapshot;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater;
+import org.opentripplanner.routing.util.ConcurrentPublished;
 import org.opentripplanner.transit.model.framework.FeedScopedId;
 import org.opentripplanner.transit.model.framework.Result;
 import org.opentripplanner.transit.model.network.TripPattern;
@@ -38,9 +39,9 @@ public final class TimetableSnapshotManager {
 
   /**
    * The last committed snapshot that was handed off to a routing thread. This snapshot may be given
-   * to more than one routing thread if the maximum snapshot frequency is exceeded.
+   * to more than one routing thread.
    */
-  private volatile TimetableSnapshot snapshot = null;
+  private final ConcurrentPublished snapshot = new ConcurrentPublished<>();
 
   /**
    * If a timetable snapshot is requested less than this number of milliseconds after the previous
@@ -87,7 +88,7 @@ public TimetableSnapshotManager(
    * to the snapshot to release resources.
    */
   public TimetableSnapshot getTimetableSnapshot() {
-    return snapshot;
+    return snapshot.get();
   }
 
   public TimetableSnapshot getTimetableSnapshotBuffer() {
@@ -106,7 +107,7 @@ void commitTimetableSnapshot(final boolean force) {
     if (force || snapshotFrequencyThrottle.timeIsUp()) {
       if (force || buffer.isDirty()) {
         LOG.debug("Committing {}", buffer);
-        snapshot = buffer.commit(transitLayerUpdater, force);
+        snapshot.publish(buffer.commit(transitLayerUpdater, force));
 
         // We only reset the timer when the snapshot is updated. This will cause the first
         // update to be committed after a silent period. This should not have any effect in

From 0f7737441e167d82cc14b553f7ce1c43d134a886 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Fri, 19 Jul 2024 11:33:42 +0200
Subject: [PATCH 1656/1688] Commit snapshot only from the
 TimetableSnapshotFlush periodic task.

---
 .../ext/siri/SiriTimetableSnapshotSource.java |  5 ++--
 .../trip/TimetableSnapshotManager.java        | 26 +++----------------
 .../updater/trip/TimetableSnapshotSource.java |  2 --
 .../java/org/opentripplanner/GtfsTest.java    |  1 +
 .../updater/trip/RealtimeTestEnvironment.java | 15 ++++++++++-
 .../trip/TimetableSnapshotManagerTest.java    | 15 ++++-------
 .../trip/TimetableSnapshotSourceTest.java     | 23 +---------------
 7 files changed, 28 insertions(+), 59 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index 4237fa318d7..0f92264d440 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -119,8 +119,6 @@ public UpdateResult applyEstimatedTimetable(
 
     LOG.debug("message contains {} trip updates", updates.size());
 
-    snapshotManager.purgeAndCommit();
-
     return UpdateResult.ofResults(results);
   }
 
@@ -328,6 +326,9 @@ private boolean markScheduledTripAsDeleted(Trip trip, final LocalDate serviceDat
     return success;
   }
 
+  /**
+   * Flush pending changes in the timetable snapshot buffer and publish a new snapshot.
+   */
   public void flushBuffer() {
     snapshotManager.purgeAndCommit();
   }
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index d0b4044433d..37e741de598 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -4,7 +4,6 @@
 import java.util.Objects;
 import java.util.function.Supplier;
 import javax.annotation.Nullable;
-import org.opentripplanner.framework.time.CountdownTimer;
 import org.opentripplanner.model.Timetable;
 import org.opentripplanner.model.TimetableSnapshot;
 import org.opentripplanner.routing.algorithm.raptoradapter.transit.mappers.TransitLayerUpdater;
@@ -43,13 +42,6 @@ public final class TimetableSnapshotManager {
    */
   private final ConcurrentPublished snapshot = new ConcurrentPublished<>();
 
-  /**
-   * If a timetable snapshot is requested less than this number of milliseconds after the previous
-   * snapshot, just return the same one. Throttles the potentially resource-consuming task of
-   * duplicating a TripPattern -> Timetable map and indexing the new Timetables.
-   */
-  private final CountdownTimer snapshotFrequencyThrottle;
-
   /**
    * Should expired real-time data be purged from the graph.
    * TODO RT_AB: Clarify exactly what "purge" means and in what circumstances would one turn it off.
@@ -74,7 +66,6 @@ public TimetableSnapshotManager(
     Supplier localDateNow
   ) {
     this.transitLayerUpdater = transitLayerUpdater;
-    this.snapshotFrequencyThrottle = new CountdownTimer(parameters.maxSnapshotFrequency());
     this.purgeExpiredData = parameters.purgeExpiredData();
     this.localDateNow = Objects.requireNonNull(localDateNow);
     // Force commit so that snapshot initializes
@@ -104,20 +95,11 @@ public TimetableSnapshot getTimetableSnapshotBuffer() {
    * @param force Force the committing of a new snapshot even if the above conditions are not met.
    */
   void commitTimetableSnapshot(final boolean force) {
-    if (force || snapshotFrequencyThrottle.timeIsUp()) {
-      if (force || buffer.isDirty()) {
-        LOG.debug("Committing {}", buffer);
-        snapshot.publish(buffer.commit(transitLayerUpdater, force));
-
-        // We only reset the timer when the snapshot is updated. This will cause the first
-        // update to be committed after a silent period. This should not have any effect in
-        // a busy updater. It is however useful when manually testing the updater.
-        snapshotFrequencyThrottle.restart();
-      } else {
-        LOG.debug("Buffer was unchanged, keeping old snapshot.");
-      }
+    if (force || buffer.isDirty()) {
+      LOG.debug("Committing {}", buffer);
+      snapshot.publish(buffer.commit(transitLayerUpdater, force));
     } else {
-      LOG.debug("Snapshot frequency exceeded. Reusing snapshot {}", snapshot);
+      LOG.debug("Buffer was unchanged, keeping old snapshot.");
     }
   }
 
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index bbbda0d9e4a..baae30dfffa 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -269,8 +269,6 @@ public UpdateResult applyTripUpdates(
       }
     }
 
-    snapshotManager.purgeAndCommit();
-
     var updateResult = UpdateResult.ofResults(results);
 
     if (updateIncrementality == FULL_DATASET) {
diff --git a/src/test/java/org/opentripplanner/GtfsTest.java b/src/test/java/org/opentripplanner/GtfsTest.java
index baf12225c9a..074e31147a3 100644
--- a/src/test/java/org/opentripplanner/GtfsTest.java
+++ b/src/test/java/org/opentripplanner/GtfsTest.java
@@ -233,6 +233,7 @@ protected void setUp() throws Exception {
         updates,
         feedId.getId()
       );
+      timetableSnapshotSource.flushBuffer();
       alertsUpdateHandler.update(feedMessage);
     } catch (Exception exception) {}
   }
diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
index 6adce735fb0..3e053d12d45 100644
--- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
+++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -221,6 +221,7 @@ public TripPattern getPatternForTrip(Trip trip) {
   }
 
   public TimetableSnapshot getTimetableSnapshot() {
+    commitTimetableSnapshot();
     if (siriSource != null) {
       return siriSource.getTimetableSnapshot();
     } else {
@@ -300,7 +301,19 @@ private UpdateResult applyEstimatedTimetable(
     boolean fuzzyMatching
   ) {
     Objects.requireNonNull(siriSource, "Test environment is configured for GTFS-RT only");
-    return getEstimatedTimetableHandler(fuzzyMatching).applyUpdate(updates, DIFFERENTIAL);
+    UpdateResult updateResult = getEstimatedTimetableHandler(fuzzyMatching)
+      .applyUpdate(updates, DIFFERENTIAL);
+    commitTimetableSnapshot();
+    return updateResult;
+  }
+
+  private void commitTimetableSnapshot() {
+    if (siriSource != null) {
+      siriSource.flushBuffer();
+    }
+    if (gtfsSource != null) {
+      gtfsSource.flushBuffer();
+    }
   }
 
   private Trip createTrip(String id, Route route, List stops) {
diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java
index 8f5c278b586..384e8a41fd1 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotManagerTest.java
@@ -63,19 +63,16 @@ SameAssert not() {
 
   static Stream purgeExpiredDataTestCases() {
     return Stream.of(
-      // purgeExpiredData   maxSnapshotFrequency || snapshots PatternSnapshotA  PatternSnapshotB
-      Arguments.of(Boolean.TRUE, -1, NotSame, NotSame),
-      Arguments.of(Boolean.FALSE, -1, NotSame, Same),
-      Arguments.of(Boolean.TRUE, 1000, NotSame, NotSame),
-      Arguments.of(Boolean.FALSE, 1000, Same, Same)
+      // purgeExpiredData   || snapshots PatternSnapshotA  PatternSnapshotB
+      Arguments.of(Boolean.TRUE, NotSame, NotSame),
+      Arguments.of(Boolean.FALSE, NotSame, Same)
     );
   }
 
-  @ParameterizedTest(name = "purgeExpired: {0}, maxFrequency: {1}  ||  {2}  {3}")
+  @ParameterizedTest(name = "purgeExpired: {0} ||  {1}  {2}")
   @MethodSource("purgeExpiredDataTestCases")
   public void testPurgeExpiredData(
     boolean purgeExpiredData,
-    int maxSnapshotFrequency,
     SameAssert expSnapshots,
     SameAssert expPatternAeqB
   ) {
@@ -85,9 +82,7 @@ public void testPurgeExpiredData(
 
     var snapshotManager = new TimetableSnapshotManager(
       null,
-      TimetableSnapshotSourceParameters.DEFAULT
-        .withPurgeExpiredData(purgeExpiredData)
-        .withMaxSnapshotFrequency(Duration.ofMillis(maxSnapshotFrequency)),
+      TimetableSnapshotSourceParameters.DEFAULT.withPurgeExpiredData(purgeExpiredData),
       clock::get
     );
 
diff --git a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
index 84b53c95f9c..e53ba07cbcf 100644
--- a/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
+++ b/src/test/java/org/opentripplanner/updater/trip/TimetableSnapshotSourceTest.java
@@ -82,28 +82,6 @@ public void testGetSnapshot() {
     assertSame(snapshot, updater.getTimetableSnapshot());
   }
 
-  @Test
-  public void testGetSnapshotWithMaxSnapshotFrequencyCleared() {
-    var updater = new TimetableSnapshotSource(
-      TimetableSnapshotSourceParameters.DEFAULT.withMaxSnapshotFrequency(Duration.ofMillis(-1)),
-      transitModel
-    );
-
-    final TimetableSnapshot snapshot = updater.getTimetableSnapshot();
-
-    updater.applyTripUpdates(
-      TRIP_MATCHER_NOOP,
-      REQUIRED_NO_DATA,
-      DIFFERENTIAL,
-      List.of(CANCELLATION),
-      feedId
-    );
-
-    final TimetableSnapshot newSnapshot = updater.getTimetableSnapshot();
-    assertNotNull(newSnapshot);
-    assertNotSame(snapshot, newSnapshot);
-  }
-
   @Test
   public void testHandleModifiedTrip() {
     // GIVEN
@@ -221,6 +199,7 @@ public void testHandleModifiedTrip() {
       List.of(tripUpdate),
       feedId
     );
+    updater.flushBuffer();
 
     // THEN
     final TimetableSnapshot snapshot = updater.getTimetableSnapshot();

From 850a2be3ad01c4c0a712e7916313545809738a38 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 23 Jul 2024 12:04:34 +0200
Subject: [PATCH 1657/1688] Document transit editor service in
 TimetableSnapshotSource and SiriTimetableSnapshotSource

---
 .../ext/siri/SiriTimetableSnapshotSource.java | 20 +++++---
 .../updater/trip/TimetableSnapshotSource.java | 46 +++++++++++--------
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
index 0f92264d440..9e2dfaff76b 100644
--- a/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
+++ b/src/ext/java/org/opentripplanner/ext/siri/SiriTimetableSnapshotSource.java
@@ -57,7 +57,12 @@ public class SiriTimetableSnapshotSource implements TimetableSnapshotProvider {
    */
   private final SiriTripPatternCache tripPatternCache;
 
-  private final TransitEditorService transitService;
+  /**
+   * Long-lived transit editor service that has access to the timetable snapshot buffer.
+   * This differs from the usual use case where the transit service refers to the latest published
+   * timetable snapshot.
+   */
+  private final TransitEditorService transitEditorService;
 
   private final TimetableSnapshotManager snapshotManager;
 
@@ -71,9 +76,10 @@ public SiriTimetableSnapshotSource(
         parameters,
         () -> LocalDate.now(transitModel.getTimeZone())
       );
-    this.transitService = new DefaultTransitService(transitModel, getTimetableSnapshotBuffer());
+    this.transitEditorService =
+      new DefaultTransitService(transitModel, getTimetableSnapshotBuffer());
     this.tripPatternCache =
-      new SiriTripPatternCache(tripPatternIdGenerator, transitService::getPatternForTrip);
+      new SiriTripPatternCache(tripPatternIdGenerator, transitEditorService::getPatternForTrip);
 
     transitModel.initTimetableSnapshotProvider(this);
   }
@@ -112,7 +118,7 @@ public UpdateResult applyEstimatedTimetable(
         var journeys = estimatedJourneyVersion.getEstimatedVehicleJourneies();
         LOG.debug("Handling {} EstimatedVehicleJourneys.", journeys.size());
         for (EstimatedVehicleJourney journey : journeys) {
-          results.add(apply(journey, transitService, fuzzyTripMatcher, entityResolver));
+          results.add(apply(journey, transitEditorService, fuzzyTripMatcher, entityResolver));
         }
       }
     }
@@ -224,7 +230,7 @@ private Result handleModifiedTrip(
 
     if (trip != null) {
       // Found exact match
-      pattern = transitService.getPatternForTrip(trip);
+      pattern = transitEditorService.getPatternForTrip(trip);
     } else if (fuzzyTripMatcher != null) {
       // No exact match found - search for trips based on arrival-times/stop-patterns
       TripAndPattern tripAndPattern = fuzzyTripMatcher.match(
@@ -259,7 +265,7 @@ private Result handleModifiedTrip(
       pattern,
       estimatedVehicleJourney,
       serviceDate,
-      transitService.getTimeZone(),
+      transitEditorService.getTimeZone(),
       entityResolver
     )
       .build();
@@ -306,7 +312,7 @@ private Result addTripToGraphAndBuffer(TripUpdate tr
   private boolean markScheduledTripAsDeleted(Trip trip, final LocalDate serviceDate) {
     boolean success = false;
 
-    final TripPattern pattern = transitService.getPatternForTrip(trip);
+    final TripPattern pattern = transitEditorService.getPatternForTrip(trip);
 
     if (pattern != null) {
       // Mark scheduled trip times for this trip in this pattern as deleted
diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
index baae30dfffa..56e3c380b67 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotSource.java
@@ -91,7 +91,13 @@ public class TimetableSnapshotSource implements TimetableSnapshotProvider {
   private final TripPatternCache tripPatternCache = new TripPatternCache();
 
   private final ZoneId timeZone;
-  private final TransitEditorService transitService;
+
+  /**
+   * Long-lived transit editor service that has access to the timetable snapshot buffer.
+   * This differs from the usual use case where the transit service refers to the latest published
+   * timetable snapshot.
+   */
+  private final TransitEditorService transitEditorService;
 
   private final Deduplicator deduplicator;
 
@@ -119,7 +125,7 @@ public TimetableSnapshotSource(
     this.snapshotManager =
       new TimetableSnapshotManager(transitModel.getTransitLayerUpdater(), parameters, localDateNow);
     this.timeZone = transitModel.getTimeZone();
-    this.transitService =
+    this.transitEditorService =
       new DefaultTransitService(transitModel, snapshotManager.getTimetableSnapshotBuffer());
     this.deduplicator = transitModel.getDeduplicator();
     this.serviceCodes = transitModel.getServiceCodes();
@@ -365,8 +371,8 @@ private Result handleScheduledTrip(
       return UpdateError.result(tripId, NO_UPDATES);
     }
 
-    final FeedScopedId serviceId = transitService.getTripForId(tripId).getServiceId();
-    final Set serviceDates = transitService
+    final FeedScopedId serviceId = transitEditorService.getTripForId(tripId).getServiceId();
+    final Set serviceDates = transitEditorService
       .getCalendarService()
       .getServiceDatesForServiceId(serviceId);
     if (!serviceDates.contains(serviceDate)) {
@@ -409,7 +415,7 @@ private Result handleScheduledTrip(
         .cancelStops(skippedStopIndices)
         .build();
 
-      final Trip trip = transitService.getTripForId(tripId);
+      final Trip trip = transitEditorService.getTripForId(tripId);
       // Get cached trip pattern or create one if it doesn't exist yet
       final TripPattern newPattern = tripPatternCache.getOrCreateTripPattern(
         newStopPattern,
@@ -447,7 +453,7 @@ private Result validateAndHandleAddedTrip(
     //
 
     // Check whether trip id already exists in graph
-    final Trip trip = transitService.getTripForId(tripId);
+    final Trip trip = transitEditorService.getTripForId(tripId);
 
     if (trip != null) {
       // TODO: should we support this and add a new instantiation of this trip (making it
@@ -501,7 +507,7 @@ private List removeUnknownStops(TripUpdate tripUpdate, FeedScope
       .filter(StopTimeUpdate::hasStopId)
       .filter(st -> {
         var stopId = new FeedScopedId(tripId.getFeedId(), st.getStopId());
-        var stopFound = transitService.getRegularStop(stopId) != null;
+        var stopFound = transitEditorService.getRegularStop(stopId) != null;
         if (!stopFound) {
           debug(tripId, "Stop '{}' not found in graph. Removing from ADDED trip.", st.getStopId());
         }
@@ -550,7 +556,7 @@ private List checkNewStopTimeUpdatesAndFindStops(
       // Find stops
       if (stopTimeUpdate.hasStopId()) {
         // Find stop
-        final var stop = transitService.getRegularStop(
+        final var stop = transitEditorService.getRegularStop(
           new FeedScopedId(tripId.getFeedId(), stopTimeUpdate.getStopId())
         );
         if (stop != null) {
@@ -633,7 +639,7 @@ private Result handleAddedTrip(
     tripBuilder.withRoute(route);
 
     // Find service ID running on this service date
-    final Set serviceIds = transitService
+    final Set serviceIds = transitEditorService
       .getCalendarService()
       .getServiceIdsOnDate(serviceDate);
     if (serviceIds.isEmpty()) {
@@ -661,7 +667,7 @@ private Result handleAddedTrip(
   private Route getOrCreateRoute(TripDescriptor tripDescriptor, FeedScopedId tripId) {
     if (routeExists(tripId.getFeedId(), tripDescriptor)) {
       // Try to find route
-      return transitService.getRouteForId(
+      return transitEditorService.getRouteForId(
         new FeedScopedId(tripId.getFeedId(), tripDescriptor.getRouteId())
       );
     }
@@ -676,7 +682,7 @@ else if (
 
       var addedRouteExtension = AddedRoute.ofTripDescriptor(tripDescriptor);
 
-      var agency = transitService
+      var agency = transitEditorService
         .findAgencyById(new FeedScopedId(tripId.getFeedId(), addedRouteExtension.agencyId()))
         .orElseGet(() -> fallbackAgency(tripId.getFeedId()));
 
@@ -692,7 +698,7 @@ else if (
       builder.withUrl(addedRouteExtension.routeUrl());
 
       var route = builder.build();
-      transitService.addRoutes(route);
+      transitEditorService.addRoutes(route);
       return route;
     }
     // no information about the rout is given, so we create a dummy one
@@ -708,7 +714,7 @@ else if (
       I18NString longName = NonLocalizedString.ofNullable(tripDescriptor.getTripId());
       builder.withLongName(longName);
       var route = builder.build();
-      transitService.addRoutes(route);
+      transitEditorService.addRoutes(route);
       return route;
     }
   }
@@ -720,14 +726,14 @@ private Agency fallbackAgency(String feedId) {
     return Agency
       .of(new FeedScopedId(feedId, "autogenerated-gtfs-rt-added-route"))
       .withName("Agency automatically added by GTFS-RT update")
-      .withTimezone(transitService.getTimeZone().toString())
+      .withTimezone(transitEditorService.getTimeZone().toString())
       .build();
   }
 
   private boolean routeExists(String feedId, TripDescriptor tripDescriptor) {
     if (tripDescriptor.hasRouteId() && StringUtils.hasValue(tripDescriptor.getRouteId())) {
       var routeId = new FeedScopedId(feedId, tripDescriptor.getRouteId());
-      return Objects.nonNull(transitService.getRouteForId(routeId));
+      return Objects.nonNull(transitEditorService.getRouteForId(routeId));
     } else {
       return false;
     }
@@ -816,7 +822,7 @@ private Result addTripToGraphAndBuffer(
     // Create StopPattern
     final StopPattern stopPattern = new StopPattern(stopTimes);
 
-    final TripPattern originalTripPattern = transitService.getPatternForTrip(trip);
+    final TripPattern originalTripPattern = transitEditorService.getPatternForTrip(trip);
     // Get cached trip pattern or create one if it doesn't exist yet
     final TripPattern pattern = tripPatternCache.getOrCreateTripPattern(
       stopPattern,
@@ -962,7 +968,7 @@ private Result validateAndHandleModifiedTrip(
     //
 
     // Check whether trip id already exists in graph
-    Trip trip = transitService.getTripForId(tripId);
+    Trip trip = transitEditorService.getTripForId(tripId);
 
     if (trip == null) {
       // TODO: should we support this and consider it an ADDED trip?
@@ -977,7 +983,7 @@ private Result validateAndHandleModifiedTrip(
       return UpdateError.result(tripId, NO_START_DATE);
     } else {
       // Check whether service date is served by trip
-      final Set serviceIds = transitService
+      final Set serviceIds = transitEditorService
         .getCalendarService()
         .getServiceIdsOnDate(serviceDate);
       if (!serviceIds.contains(trip.getServiceId())) {
@@ -1078,8 +1084,8 @@ private Result handleCanceledTrip(
    * @return trip pattern or null if no trip pattern was found
    */
   private TripPattern getPatternForTripId(FeedScopedId tripId) {
-    Trip trip = transitService.getTripForId(tripId);
-    return transitService.getPatternForTrip(trip);
+    Trip trip = transitEditorService.getTripForId(tripId);
+    return transitEditorService.getPatternForTrip(trip);
   }
 
   private static void debug(FeedScopedId id, String message, Object... params) {

From 7fe6999178a89e70dc0d40ceb7030199d9589998 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Tue, 23 Jul 2024 12:16:13 +0200
Subject: [PATCH 1658/1688] Ignore exceptions in TimetableSnapshotFlush

---
 .../updater/spi/TimetableSnapshotFlush.java   | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java b/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
index 8c9f43e987e..3f5c8f4d23d 100644
--- a/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
+++ b/src/main/java/org/opentripplanner/updater/spi/TimetableSnapshotFlush.java
@@ -7,6 +7,8 @@
 
 /**
  * Flush the timetable snapshot buffer by committing pending changes.
+ * Exceptions occurring during the flush are caught and ignored: the scheduler can then retry
+ * the task later.
  */
 public class TimetableSnapshotFlush implements Runnable {
 
@@ -25,13 +27,17 @@ public TimetableSnapshotFlush(
 
   @Override
   public void run() {
-    LOG.debug("Flushing timetable snapshot buffer");
-    if (siriTimetableSnapshotSource != null) {
-      siriTimetableSnapshotSource.flushBuffer();
+    try {
+      LOG.debug("Flushing timetable snapshot buffer");
+      if (siriTimetableSnapshotSource != null) {
+        siriTimetableSnapshotSource.flushBuffer();
+      }
+      if (gtfsTimetableSnapshotSource != null) {
+        gtfsTimetableSnapshotSource.flushBuffer();
+      }
+      LOG.debug("Flushed timetable snapshot buffer");
+    } catch (Throwable t) {
+      LOG.error("Error flushing timetable snapshot buffer", t);
     }
-    if (gtfsTimetableSnapshotSource != null) {
-      gtfsTimetableSnapshotSource.flushBuffer();
-    }
-    LOG.debug("Flushed timetable snapshot buffer");
   }
 }

From d1d7f4304826b15467344fca6f82747a4b57cf06 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 24 Jul 2024 10:38:45 +0200
Subject: [PATCH 1659/1688] Commit snapshot while applying trip updates in
 RealtimeTestEnvironment

---
 .../updater/trip/RealtimeTestEnvironment.java                | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
index 3e053d12d45..bf6f743eac7 100644
--- a/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
+++ b/src/test/java/org/opentripplanner/updater/trip/RealtimeTestEnvironment.java
@@ -221,7 +221,6 @@ public TripPattern getPatternForTrip(Trip trip) {
   }
 
   public TimetableSnapshot getTimetableSnapshot() {
-    commitTimetableSnapshot();
     if (siriSource != null) {
       return siriSource.getTimetableSnapshot();
     } else {
@@ -285,13 +284,15 @@ public UpdateResult applyTripUpdates(
     UpdateIncrementality incrementality
   ) {
     Objects.requireNonNull(gtfsSource, "Test environment is configured for SIRI only");
-    return gtfsSource.applyTripUpdates(
+    UpdateResult updateResult = gtfsSource.applyTripUpdates(
       null,
       BackwardsDelayPropagationType.REQUIRED_NO_DATA,
       incrementality,
       updates,
       getFeedId()
     );
+    commitTimetableSnapshot();
+    return updateResult;
   }
 
   // private methods

From 7f5bc33e283971aab856fcde8cf8ee07c2f4f9cd Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Fri, 19 Jul 2024 15:25:40 +0200
Subject: [PATCH 1660/1688] Add parsing of 'any'

---
 .../opentripplanner/netex/support/NetexVersionHelper.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java b/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
index 4e6cf4967c0..448d73a5f75 100644
--- a/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
+++ b/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
@@ -26,7 +26,11 @@ private NetexVersionHelper() {}
    * increasing integer. A bigger value indicate a later version.
    */
   public static int versionOf(EntityInVersionStructure e) {
-    return Integer.parseInt(e.getVersion());
+    if(e.getVersion().equals("any")){
+      return 1;
+    } else{
+      return Integer.parseInt(e.getVersion());
+    }
   }
 
   /**

From 85b9ec04de722407a55e1380748ed3ae7ad4c549 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 23 Jul 2024 19:53:53 +0200
Subject: [PATCH 1661/1688] Implement NeTEx version 'any'

---
 .../netex/support/NetexVersionHelper.java     | 13 ++++++++-----
 .../netex/support/NetexVersionHelperTest.java | 19 +++++++++++++------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java b/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
index 448d73a5f75..6ede322dfba 100644
--- a/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
+++ b/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
@@ -16,6 +16,9 @@
  */
 public class NetexVersionHelper {
 
+  private static final String ANY = "any";
+  private static final int UNKNOWN_VERSION = -1;
+
   /**
    * private constructor to prevent instantiation of utility class
    */
@@ -23,12 +26,12 @@ private NetexVersionHelper() {}
 
   /**
    * According to the Norwegian Netex profile the version number must be a positive
-   * increasing integer. A bigger value indicate a later version.
+   * increasing integer. A bigger value indicates a later version.
    */
   public static int versionOf(EntityInVersionStructure e) {
-    if(e.getVersion().equals("any")){
-      return 1;
-    } else{
+    if (e.getVersion().equals(ANY)) {
+      return UNKNOWN_VERSION;
+    } else {
       return Integer.parseInt(e.getVersion());
     }
   }
@@ -38,7 +41,7 @@ public static int versionOf(EntityInVersionStructure e) {
    * elements exist in the collection {@code -1} is returned.
    */
   public static int latestVersionIn(Collection list) {
-    return list.stream().mapToInt(NetexVersionHelper::versionOf).max().orElse(-1);
+    return list.stream().mapToInt(NetexVersionHelper::versionOf).max().orElse(UNKNOWN_VERSION);
   }
 
   /**
diff --git a/src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java b/src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java
index d55b573a5d5..1374d871154 100644
--- a/src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java
+++ b/src/test/java/org/opentripplanner/netex/support/NetexVersionHelperTest.java
@@ -19,32 +19,39 @@
 import org.rutebanken.netex.model.EntityInVersionStructure;
 import org.rutebanken.netex.model.ValidBetween;
 
-public class NetexVersionHelperTest {
+class NetexVersionHelperTest {
 
   private static final EntityInVersionStructure E_VER_1 = new EntityInVersionStructure()
     .withVersion("1");
   private static final EntityInVersionStructure E_VER_2 = new EntityInVersionStructure()
     .withVersion("2");
+  private static final EntityInVersionStructure E_VER_ANY = new EntityInVersionStructure()
+    .withVersion("any");
 
   @Test
-  public void versionOfTest() {
+  void versionOfTest() {
     assertEquals(1, versionOf(E_VER_1));
   }
 
   @Test
-  public void latestVersionInTest() {
+  void any() {
+    assertEquals(-1, versionOf(E_VER_ANY));
+  }
+
+  @Test
+  void latestVersionInTest() {
     assertEquals(2, latestVersionIn(Arrays.asList(E_VER_1, E_VER_2)));
     assertEquals(-1, latestVersionIn(Collections.emptyList()));
   }
 
   @Test
-  public void lastestVersionedElementInTest() {
+  void lastestVersionedElementInTest() {
     assertEquals(E_VER_2, latestVersionedElementIn(Arrays.asList(E_VER_1, E_VER_2)));
     assertNull(latestVersionedElementIn(Collections.emptyList()));
   }
 
   @Test
-  public void comparingVersionTest() {
+  void comparingVersionTest() {
     // Given a comparator (subject under test)
     Comparator subject = comparingVersion();
     // And a entity with version as the E_VER_1 entity
@@ -62,7 +69,7 @@ public void comparingVersionTest() {
   }
 
   @Test
-  public void testFirstRelevantDateTime() {
+  void testFirstRelevantDateTime() {
     var may1st = LocalDateTime.of(2021, MAY, 1, 14, 0);
     var may2nd = LocalDateTime.of(2021, MAY, 2, 14, 0);
     var may3rd = LocalDateTime.of(2021, MAY, 3, 14, 0);

From d71fcc11c07a137adc1a41401b608bb6f14a251b Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Tue, 23 Jul 2024 20:25:20 +0200
Subject: [PATCH 1662/1688] Add documentation

---
 .../netex/support/NetexVersionHelper.java             | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java b/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
index 6ede322dfba..8f7a7f14913 100644
--- a/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
+++ b/src/main/java/org/opentripplanner/netex/support/NetexVersionHelper.java
@@ -16,7 +16,13 @@
  */
 public class NetexVersionHelper {
 
+  /**
+   * @see NetexVersionHelper#versionOf(EntityInVersionStructure)
+   */
   private static final String ANY = "any";
+  /**
+   * A special value that represents an unknown version.
+   */
   private static final int UNKNOWN_VERSION = -1;
 
   /**
@@ -27,6 +33,11 @@ private NetexVersionHelper() {}
   /**
    * According to the Norwegian Netex profile the version number must be a positive
    * increasing integer. A bigger value indicates a later version.
+   * However, the special value "any" is also supported and returns a constant meaning "unknown".
+   * The EPIP profile at
+   * http://netex.uk/netex/doc/2019.05.07-v1.1_FinalDraft/prCEN_TS_16614-PI_Profile_FV_%28E%29-2019-Final-Draft-v3.pdf (page 33)
+   * defines this as follows: "Use "any" if the VERSION is unknown (note that this will trigger NeTEx's
+   * XML automatic consistency check)."
    */
   public static int versionOf(EntityInVersionStructure e) {
     if (e.getVersion().equals(ANY)) {

From cd8e29eaaf94915be9588190b4e836e9aad48562 Mon Sep 17 00:00:00 2001
From: Vincent Paturet 
Date: Wed, 24 Jul 2024 15:46:28 +0200
Subject: [PATCH 1663/1688] Added Javadoc

---
 .../updater/trip/TimetableSnapshotManager.java              | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
index 37e741de598..b5683a9a62e 100644
--- a/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
+++ b/src/main/java/org/opentripplanner/updater/trip/TimetableSnapshotManager.java
@@ -82,6 +82,12 @@ public TimetableSnapshot getTimetableSnapshot() {
     return snapshot.get();
   }
 
+  /**
+   * @return the current timetable snapshot buffer that contains pending changes (not yet published
+   * in a snapshot).
+   * This should be used in the context of an updater to build a TransitEditorService that sees all
+   * the changes applied so far by real-time updates.
+   */
   public TimetableSnapshot getTimetableSnapshotBuffer() {
     return buffer;
   }

From ae363f416f5ff830e5e7b0bec9a97e837a5465a6 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 24 Jul 2024 16:31:44 +0200
Subject: [PATCH 1664/1688] Update
 src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java

Co-authored-by: Thomas Gran 
---
 .../org/opentripplanner/apis/gtfs/model/LocalDateRange.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
index d466534e65c..18a1a1624e3 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
@@ -27,9 +27,9 @@ public boolean startBeforeEnd() {
   public boolean contains(LocalDate date) {
     return (
       (
-        startInclusive() == null || date.isEqual(startInclusive()) || date.isAfter(startInclusive())
+        startInclusive == null || date.isEqual(startInclusive) || date.isAfter(startInclusive)
       ) &&
-      (endExclusive() == null || date.isBefore(endExclusive()))
+      (endExclusive == null || date.isBefore(endExclusive))
     );
   }
 }

From 1ebfc42d98e6ef99bb149efdf0c5e9ffe6305dab Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 24 Jul 2024 19:41:26 +0200
Subject: [PATCH 1665/1688] Format code

---
 .../org/opentripplanner/apis/gtfs/model/LocalDateRange.java   | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
index 18a1a1624e3..dfecfdcd960 100644
--- a/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
+++ b/src/main/java/org/opentripplanner/apis/gtfs/model/LocalDateRange.java
@@ -26,9 +26,7 @@ public boolean startBeforeEnd() {
    */
   public boolean contains(LocalDate date) {
     return (
-      (
-        startInclusive == null || date.isEqual(startInclusive) || date.isAfter(startInclusive)
-      ) &&
+      (startInclusive == null || date.isEqual(startInclusive) || date.isAfter(startInclusive)) &&
       (endExclusive == null || date.isBefore(endExclusive))
     );
   }

From 1a8ccb678b5d34862fffda39a172ec5b7ffc53bb Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Thu, 25 Jul 2024 05:46:51 +0000
Subject: [PATCH 1666/1688] Upgrade debug client to version
 2024/07/2024-07-25T05:46

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index d406984f024..befb031cbdb 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 73e03e95a45c3f5166cf7351066481b64f81005d Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 25 Jul 2024 05:46:54 +0000
Subject: [PATCH 1667/1688] chore(deps): update debug ui dependencies
 (non-major)

---
 client/package-lock.json | 309 +++++++++++++++++++--------------------
 client/package.json      |  20 +--
 2 files changed, 157 insertions(+), 172 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index a5c2422df3f..dc6c6dfa1a3 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -14,33 +14,33 @@
         "graphql-request": "7.1.0",
         "maplibre-gl": "4.5.0",
         "react": "18.3.1",
-        "react-bootstrap": "2.10.3",
+        "react-bootstrap": "2.10.4",
         "react-dom": "18.3.1",
         "react-map-gl": "7.1.7"
       },
       "devDependencies": {
         "@graphql-codegen/cli": "5.0.2",
-        "@graphql-codegen/client-preset": "4.3.1",
+        "@graphql-codegen/client-preset": "4.3.2",
         "@graphql-codegen/introspection": "4.0.3",
         "@parcel/watcher": "2.4.1",
         "@testing-library/react": "16.0.0",
         "@types/react": "18.3.3",
         "@types/react-dom": "18.3.0",
-        "@typescript-eslint/eslint-plugin": "7.14.1",
-        "@typescript-eslint/parser": "7.14.1",
+        "@typescript-eslint/eslint-plugin": "7.17.0",
+        "@typescript-eslint/parser": "7.17.0",
         "@vitejs/plugin-react": "4.3.1",
         "@vitest/coverage-v8": "2.0.4",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",
         "eslint-plugin-jsx-a11y": "6.9.0",
-        "eslint-plugin-react": "7.34.3",
+        "eslint-plugin-react": "7.35.0",
         "eslint-plugin-react-hooks": "4.6.2",
-        "eslint-plugin-react-refresh": "0.4.7",
-        "jsdom": "24.1.0",
-        "prettier": "3.3.2",
-        "typescript": "5.5.2",
-        "vite": "5.3.2",
+        "eslint-plugin-react-refresh": "0.4.9",
+        "jsdom": "24.1.1",
+        "prettier": "3.3.3",
+        "typescript": "5.5.4",
+        "vite": "5.3.4",
         "vitest": "2.0.4"
       }
     },
@@ -1861,21 +1861,21 @@
       }
     },
     "node_modules/@graphql-codegen/client-preset": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.3.1.tgz",
-      "integrity": "sha512-FHszBKhubbJkrZHwzUNfMUp9IkzufCfn/riTpIy5yA84Wq0AJSPFL7nWkG+h3azFPeznLfqo3KJmfzRb+xeFEA==",
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.3.2.tgz",
+      "integrity": "sha512-42jHyG6u2uFDIVNvzue8zR529aPT16EYIJQmvMk8XuYHo3PneQVlWmQ3j2fBy+RuWCBzpJKPKm7IGSKiw19nmg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.20.2",
         "@babel/template": "^7.20.7",
         "@graphql-codegen/add": "^5.0.3",
-        "@graphql-codegen/gql-tag-operations": "4.0.8",
+        "@graphql-codegen/gql-tag-operations": "4.0.9",
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/typed-document-node": "^5.0.8",
-        "@graphql-codegen/typescript": "^4.0.8",
-        "@graphql-codegen/typescript-operations": "^4.2.2",
-        "@graphql-codegen/visitor-plugin-common": "^5.3.0",
+        "@graphql-codegen/typed-document-node": "^5.0.9",
+        "@graphql-codegen/typescript": "^4.0.9",
+        "@graphql-codegen/typescript-operations": "^4.2.3",
+        "@graphql-codegen/visitor-plugin-common": "^5.3.1",
         "@graphql-tools/documents": "^1.0.0",
         "@graphql-tools/utils": "^10.0.0",
         "@graphql-typed-document-node/core": "3.2.0",
@@ -1901,14 +1901,14 @@
       }
     },
     "node_modules/@graphql-codegen/gql-tag-operations": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.8.tgz",
-      "integrity": "sha512-slCICQOFbMfdL7mAZ6XUiOhcJl0yOKfqHFiULIlQJKpo8ey6NHsrtc8Q02ZF417BfTfZ/Qj7rmXhkc/dwY94ag==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/gql-tag-operations/-/gql-tag-operations-4.0.9.tgz",
+      "integrity": "sha512-lVgu1HClel896HqZAEjynatlU6eJrYOw+rh05DPgM150xvmb7Gz5TnRHA2vfwlDNIXDaToAIpz5RFfkjjnYM1Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/visitor-plugin-common": "5.3.0",
+        "@graphql-codegen/visitor-plugin-common": "5.3.1",
         "@graphql-tools/utils": "^10.0.0",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
@@ -1964,14 +1964,14 @@
       }
     },
     "node_modules/@graphql-codegen/typed-document-node": {
-      "version": "5.0.8",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.8.tgz",
-      "integrity": "sha512-ImJd1KwS0vYZiPVZzs8EOZ79V96zN0p1A1MJNpk/8CiJWpIi4FupLLfTMMYq5Rr0AZET+O/A+udw4LDjDrAWvg==",
+      "version": "5.0.9",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typed-document-node/-/typed-document-node-5.0.9.tgz",
+      "integrity": "sha512-Wx6fyA4vpfIbfNTMiWUECGnjqzKkJdEbZHxVMIegiCBPzBYPAJV4mZZcildLAfm2FtZcgW4YKtFoTbnbXqPB3w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/visitor-plugin-common": "5.3.0",
+        "@graphql-codegen/visitor-plugin-common": "5.3.1",
         "auto-bind": "~4.0.0",
         "change-case-all": "1.0.15",
         "tslib": "~2.6.0"
@@ -1981,15 +1981,15 @@
       }
     },
     "node_modules/@graphql-codegen/typescript": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.8.tgz",
-      "integrity": "sha512-kYS3SjGNnC9vgFS8N3vaxzRFkdXX2umMi1SOpHjMFCPjMe8NR0uNdW4nP9T0YEq+DvWgj+XojjpFy2oyz9q12w==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript/-/typescript-4.0.9.tgz",
+      "integrity": "sha512-0O35DMR4d/ctuHL1Zo6mRUUzp0BoszKfeWsa6sCm/g70+S98+hEfTwZNDkQHylLxapiyjssF9uw/F+sXqejqLw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
         "@graphql-codegen/schema-ast": "^4.0.2",
-        "@graphql-codegen/visitor-plugin-common": "5.3.0",
+        "@graphql-codegen/visitor-plugin-common": "5.3.1",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
       },
@@ -1998,15 +1998,15 @@
       }
     },
     "node_modules/@graphql-codegen/typescript-operations": {
-      "version": "4.2.2",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.2.tgz",
-      "integrity": "sha512-8FJHIAubM4r9ElLuuDAKhdOjainSwRHEmGIrtEgEwHARKhMk1Ttj6bpOQDisYlbDl4ZTHWEJCdNa9o9rgcl+9g==",
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/typescript-operations/-/typescript-operations-4.2.3.tgz",
+      "integrity": "sha512-6z7avSSOr03l5SyKbeDs7MzRyGwnQFSCqQm8Om5wIuoIgXVu2gXRmcJAY/I7SLdAy9xbF4Sho7XNqieFM2CAFQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@graphql-codegen/plugin-helpers": "^5.0.4",
-        "@graphql-codegen/typescript": "^4.0.8",
-        "@graphql-codegen/visitor-plugin-common": "5.3.0",
+        "@graphql-codegen/typescript": "^4.0.9",
+        "@graphql-codegen/visitor-plugin-common": "5.3.1",
         "auto-bind": "~4.0.0",
         "tslib": "~2.6.0"
       },
@@ -2015,9 +2015,9 @@
       }
     },
     "node_modules/@graphql-codegen/visitor-plugin-common": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.3.0.tgz",
-      "integrity": "sha512-+kUk7gRD/72Wfkjd7D96Lonh9k4lFw9d3O1+I07Jyja4QN9H42kdFEO0hM/b4Q9lLkI1yJ66Oym7lWz2Ikj3aw==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/visitor-plugin-common/-/visitor-plugin-common-5.3.1.tgz",
+      "integrity": "sha512-MktoBdNZhSmugiDjmFl1z6rEUUaqyxtFJYWnDilE7onkPgyw//O0M+TuPBJPBWdyV6J2ond0Hdqtq+rkghgSIQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3943,17 +3943,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.14.1.tgz",
-      "integrity": "sha512-aAJd6bIf2vvQRjUG3ZkNXkmBpN+J7Wd0mfQiiVCJMu9Z5GcZZdcc0j8XwN/BM97Fl7e3SkTXODSk4VehUv7CGw==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz",
+      "integrity": "sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.14.1",
-        "@typescript-eslint/type-utils": "7.14.1",
-        "@typescript-eslint/utils": "7.14.1",
-        "@typescript-eslint/visitor-keys": "7.14.1",
+        "@typescript-eslint/scope-manager": "7.17.0",
+        "@typescript-eslint/type-utils": "7.17.0",
+        "@typescript-eslint/utils": "7.17.0",
+        "@typescript-eslint/visitor-keys": "7.17.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -3977,16 +3977,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.14.1.tgz",
-      "integrity": "sha512-8lKUOebNLcR0D7RvlcloOacTOWzOqemWEWkKSVpMZVF/XVcwjPR+3MD08QzbW9TCGJ+DwIc6zUSGZ9vd8cO1IA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.17.0.tgz",
+      "integrity": "sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.14.1",
-        "@typescript-eslint/types": "7.14.1",
-        "@typescript-eslint/typescript-estree": "7.14.1",
-        "@typescript-eslint/visitor-keys": "7.14.1",
+        "@typescript-eslint/scope-manager": "7.17.0",
+        "@typescript-eslint/types": "7.17.0",
+        "@typescript-eslint/typescript-estree": "7.17.0",
+        "@typescript-eslint/visitor-keys": "7.17.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4006,14 +4006,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.14.1.tgz",
-      "integrity": "sha512-gPrFSsoYcsffYXTOZ+hT7fyJr95rdVe4kGVX1ps/dJ+DfmlnjFN/GcMxXcVkeHDKqsq6uAcVaQaIi3cFffmAbA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz",
+      "integrity": "sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.14.1",
-        "@typescript-eslint/visitor-keys": "7.14.1"
+        "@typescript-eslint/types": "7.17.0",
+        "@typescript-eslint/visitor-keys": "7.17.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -4024,14 +4024,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.14.1.tgz",
-      "integrity": "sha512-/MzmgNd3nnbDbOi3LfasXWWe292+iuo+umJ0bCCMCPc1jLO/z2BQmWUUUXvXLbrQey/JgzdF/OV+I5bzEGwJkQ==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz",
+      "integrity": "sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.14.1",
-        "@typescript-eslint/utils": "7.14.1",
+        "@typescript-eslint/typescript-estree": "7.17.0",
+        "@typescript-eslint/utils": "7.17.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -4052,9 +4052,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.14.1.tgz",
-      "integrity": "sha512-mL7zNEOQybo5R3AavY+Am7KLv8BorIv7HCYS5rKoNZKQD9tsfGUpO4KdAn3sSUvTiS4PQkr2+K0KJbxj8H9NDg==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.17.0.tgz",
+      "integrity": "sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4066,14 +4066,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.14.1.tgz",
-      "integrity": "sha512-k5d0VuxViE2ulIO6FbxxSZaxqDVUyMbXcidC8rHvii0I56XZPv8cq+EhMns+d/EVIL41sMXqRbK3D10Oza1bbA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz",
+      "integrity": "sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "7.14.1",
-        "@typescript-eslint/visitor-keys": "7.14.1",
+        "@typescript-eslint/types": "7.17.0",
+        "@typescript-eslint/visitor-keys": "7.17.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -4095,9 +4095,9 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-      "version": "7.6.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
-      "integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
       "license": "ISC",
       "bin": {
@@ -4108,16 +4108,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.14.1.tgz",
-      "integrity": "sha512-CMmVVELns3nak3cpJhZosDkm63n+DwBlDX8g0k4QUa9BMnF+lH2lr3d130M1Zt1xxmB3LLk3NV7KQCq86ZBBhQ==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.17.0.tgz",
+      "integrity": "sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.14.1",
-        "@typescript-eslint/types": "7.14.1",
-        "@typescript-eslint/typescript-estree": "7.14.1"
+        "@typescript-eslint/scope-manager": "7.17.0",
+        "@typescript-eslint/types": "7.17.0",
+        "@typescript-eslint/typescript-estree": "7.17.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -4131,13 +4131,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.14.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.14.1.tgz",
-      "integrity": "sha512-Crb+F75U1JAEtBeQGxSKwI60hZmmzaqA3z9sYsVm8X7W5cwLEm5bRe0/uXS6+MR/y8CVpKSR/ontIAIEPFcEkA==",
+      "version": "7.17.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz",
+      "integrity": "sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.14.1",
+        "@typescript-eslint/types": "7.17.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -4578,18 +4578,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array.prototype.toreversed": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/array.prototype.toreversed/-/array.prototype.toreversed-1.1.2.tgz",
-      "integrity": "sha512-wwDCoT4Ck4Cz7sLtgUmzR5UV3YF5mFHUlbChCzZBQZ+0m2cl/DH3tKgvphv1nKgFsJ48oCSg6p91q2Vm0I/ZMA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "define-properties": "^1.2.0",
-        "es-abstract": "^1.22.1",
-        "es-shim-unscopables": "^1.0.0"
-      }
-    },
     "node_modules/array.prototype.tosorted": {
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz",
@@ -6261,36 +6249,36 @@
       }
     },
     "node_modules/eslint-plugin-react": {
-      "version": "7.34.3",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.34.3.tgz",
-      "integrity": "sha512-aoW4MV891jkUulwDApQbPYTVZmeuSyFrudpbTAQuj5Fv8VL+o6df2xIGpw8B0hPjAaih1/Fb0om9grCdyFYemA==",
+      "version": "7.35.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.35.0.tgz",
+      "integrity": "sha512-v501SSMOWv8gerHkk+IIQBkcGRGrO2nfybfj5pLxuJNFTPxxA3PSryhXTK+9pNbtkggheDdsC0E9Q8CuPk6JKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "array-includes": "^3.1.8",
         "array.prototype.findlast": "^1.2.5",
         "array.prototype.flatmap": "^1.3.2",
-        "array.prototype.toreversed": "^1.1.2",
         "array.prototype.tosorted": "^1.1.4",
         "doctrine": "^2.1.0",
         "es-iterator-helpers": "^1.0.19",
         "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
         "jsx-ast-utils": "^2.4.1 || ^3.0.0",
         "minimatch": "^3.1.2",
         "object.entries": "^1.1.8",
         "object.fromentries": "^2.0.8",
-        "object.hasown": "^1.1.4",
         "object.values": "^1.2.0",
         "prop-types": "^15.8.1",
         "resolve": "^2.0.0-next.5",
         "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.11"
+        "string.prototype.matchall": "^4.0.11",
+        "string.prototype.repeat": "^1.0.0"
       },
       "engines": {
         "node": ">=4"
       },
       "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8"
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
       }
     },
     "node_modules/eslint-plugin-react-hooks": {
@@ -6306,9 +6294,9 @@
       }
     },
     "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.7.tgz",
-      "integrity": "sha512-yrj+KInFmwuQS2UQcg1SF83ha1tuHC1jMQbRNyuWtlEzzKRDgAl7L4Yp4NlDUZTZNlWvHEzOtJhMi40R7JxcSw==",
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.9.tgz",
+      "integrity": "sha512-QK49YrBAo5CLNLseZ7sZgvgTy21E6NEw22eZqc4teZfH8pxV3yXc9XXOYfUI6JNpw7mfHNkAeWtBxrTyykB6HA==",
       "dev": true,
       "license": "MIT",
       "peerDependencies": {
@@ -7406,10 +7394,11 @@
       }
     },
     "node_modules/https-proxy-agent": {
-      "version": "7.0.4",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz",
-      "integrity": "sha512-wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==",
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz",
+      "integrity": "sha512-1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "agent-base": "^7.0.2",
         "debug": "4"
@@ -8244,9 +8233,9 @@
       }
     },
     "node_modules/jsdom": {
-      "version": "24.1.0",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.0.tgz",
-      "integrity": "sha512-6gpM7pRXCwIOKxX47cgOyvyQDN/Eh0f1MeKySBV2xGdKtqJBLj8P25eY3EVCWo2mglDDzozR2r2MW4T+JiNUZA==",
+      "version": "24.1.1",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-24.1.1.tgz",
+      "integrity": "sha512-5O1wWV99Jhq4DV7rCLIoZ/UIhyQeDR7wHVyZAHAshbrvZsLs+Xzz7gtwnlJTJDjleiTKh54F4dXrX70vJQTyJQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -8256,11 +8245,11 @@
         "form-data": "^4.0.0",
         "html-encoding-sniffer": "^4.0.0",
         "http-proxy-agent": "^7.0.2",
-        "https-proxy-agent": "^7.0.4",
+        "https-proxy-agent": "^7.0.5",
         "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.10",
+        "nwsapi": "^2.2.12",
         "parse5": "^7.1.2",
-        "rrweb-cssom": "^0.7.0",
+        "rrweb-cssom": "^0.7.1",
         "saxes": "^6.0.0",
         "symbol-tree": "^3.2.4",
         "tough-cookie": "^4.1.4",
@@ -8269,7 +8258,7 @@
         "whatwg-encoding": "^3.1.1",
         "whatwg-mimetype": "^4.0.0",
         "whatwg-url": "^14.0.0",
-        "ws": "^8.17.0",
+        "ws": "^8.18.0",
         "xml-name-validator": "^5.0.0"
       },
       "engines": {
@@ -8285,9 +8274,9 @@
       }
     },
     "node_modules/jsdom/node_modules/rrweb-cssom": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.0.tgz",
-      "integrity": "sha512-KlSv0pm9kgQSRxXEMgtivPJ4h826YHsuob8pSHcfSZsSXGtvpEAie8S0AnXuObEJ7nhikOb4ahwxDm0H2yW17g==",
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz",
+      "integrity": "sha512-TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==",
       "dev": true,
       "license": "MIT"
     },
@@ -9052,9 +9041,9 @@
       "dev": true
     },
     "node_modules/nwsapi": {
-      "version": "2.2.10",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz",
-      "integrity": "sha512-QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==",
+      "version": "2.2.12",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz",
+      "integrity": "sha512-qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==",
       "dev": true,
       "license": "MIT"
     },
@@ -9165,23 +9154,6 @@
         "node": ">= 0.4"
       }
     },
-    "node_modules/object.hasown": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/object.hasown/-/object.hasown-1.1.4.tgz",
-      "integrity": "sha512-FZ9LZt9/RHzGySlBARE3VF+gE26TxR38SdmqOqliuTnl9wrKulaQs+4dee1V+Io8VfxqzAfHu6YuRgUy8OHoTg==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/object.values": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz",
@@ -9535,10 +9507,11 @@
       }
     },
     "node_modules/picocolors": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.0.tgz",
-      "integrity": "sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==",
-      "dev": true
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz",
+      "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
@@ -9562,9 +9535,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.4.38",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz",
-      "integrity": "sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==",
+      "version": "8.4.40",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz",
+      "integrity": "sha512-YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==",
       "dev": true,
       "funding": [
         {
@@ -9580,9 +9553,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.7",
-        "picocolors": "^1.0.0",
+        "picocolors": "^1.0.1",
         "source-map-js": "^1.2.0"
       },
       "engines": {
@@ -9604,9 +9578,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
-      "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
+      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
       "dev": true,
       "license": "MIT",
       "bin": {
@@ -9766,9 +9740,9 @@
       }
     },
     "node_modules/react-bootstrap": {
-      "version": "2.10.3",
-      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.3.tgz",
-      "integrity": "sha512-cc1KAaQyj6Gr3AfA0eRRiUMSlRi3brDVcjc/o0E9y9XNW7ISo8TITrq8G8G3QTFe7VIhCiDt38k99AEFoLOolw==",
+      "version": "2.10.4",
+      "resolved": "https://registry.npmjs.org/react-bootstrap/-/react-bootstrap-2.10.4.tgz",
+      "integrity": "sha512-W3398nBM2CBfmGP2evneEO3ZZwEMPtHs72q++eNw60uDGDAdiGn0f9yNys91eo7/y8CTF5Ke1C0QO8JFVPU40Q==",
       "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.24.7",
@@ -10697,6 +10671,17 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/string.prototype.repeat": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/string.prototype.repeat/-/string.prototype.repeat-1.0.0.tgz",
+      "integrity": "sha512-0u/TldDbKD8bFCQ/4f5+mNRrXwZ8hg2w7ZR8wa16e8z9XpePWl3eGEcUD0OXpEH/VJH/2G3gjUtR3ZOiBe2S/w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-properties": "^1.1.3",
+        "es-abstract": "^1.17.5"
+      }
+    },
     "node_modules/string.prototype.trim": {
       "version": "1.2.9",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz",
@@ -11181,9 +11166,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.5.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.2.tgz",
-      "integrity": "sha512-NcRtPEOsPFFWjobJEtfihkLCZCXZt/os3zf8nTxjVH3RvTSxjrCamJpbExGvYOF+tFHc3pA65qpdwPbzjohhew==",
+      "version": "5.5.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz",
+      "integrity": "sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==",
       "dev": true,
       "license": "Apache-2.0",
       "bin": {
@@ -11407,14 +11392,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.2.tgz",
-      "integrity": "sha512-6lA7OBHBlXUxiJxbO5aAY2fsHHzDr1q7DvXYnyZycRs2Dz+dXBWuhpWHvmljTRTpQC2uvGmUFFkSHF2vGo90MA==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz",
+      "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.21.3",
-        "postcss": "^8.4.38",
+        "postcss": "^8.4.39",
         "rollup": "^4.13.0"
       },
       "bin": {
@@ -11823,9 +11808,9 @@
       "dev": true
     },
     "node_modules/ws": {
-      "version": "8.17.0",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz",
-      "integrity": "sha512-uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==",
+      "version": "8.18.0",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
+      "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
       "dev": true,
       "license": "MIT",
       "engines": {
diff --git a/client/package.json b/client/package.json
index 1681ed56d1d..8ce0ed0cbdb 100644
--- a/client/package.json
+++ b/client/package.json
@@ -23,33 +23,33 @@
     "graphql-request": "7.1.0",
     "maplibre-gl": "4.5.0",
     "react": "18.3.1",
-    "react-bootstrap": "2.10.3",
+    "react-bootstrap": "2.10.4",
     "react-dom": "18.3.1",
     "react-map-gl": "7.1.7"
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
-    "@graphql-codegen/client-preset": "4.3.1",
+    "@graphql-codegen/client-preset": "4.3.2",
     "@graphql-codegen/introspection": "4.0.3",
     "@parcel/watcher": "2.4.1",
     "@testing-library/react": "16.0.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
-    "@typescript-eslint/eslint-plugin": "7.14.1",
-    "@typescript-eslint/parser": "7.14.1",
+    "@typescript-eslint/eslint-plugin": "7.17.0",
+    "@typescript-eslint/parser": "7.17.0",
     "@vitejs/plugin-react": "4.3.1",
     "@vitest/coverage-v8": "2.0.4",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
     "eslint-plugin-jsx-a11y": "6.9.0",
-    "eslint-plugin-react": "7.34.3",
+    "eslint-plugin-react": "7.35.0",
     "eslint-plugin-react-hooks": "4.6.2",
-    "eslint-plugin-react-refresh": "0.4.7",
-    "jsdom": "24.1.0",
-    "prettier": "3.3.2",
-    "typescript": "5.5.2",
-    "vite": "5.3.2",
+    "eslint-plugin-react-refresh": "0.4.9",
+    "jsdom": "24.1.1",
+    "prettier": "3.3.3",
+    "typescript": "5.5.4",
+    "vite": "5.3.4",
     "vitest": "2.0.4"
   }
 }

From 09ced423d25d5f3d12b9ea9d060551d9f5acea51 Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Thu, 25 Jul 2024 05:57:08 +0000
Subject: [PATCH 1668/1688] Upgrade debug client to version
 2024/07/2024-07-25T05:56

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index befb031cbdb..863eb7b09a3 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 3ee1b463b4aa24c1f54c2315a81d534c9d9448e0 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 25 Jul 2024 11:05:42 +0200
Subject: [PATCH 1669/1688] Return null

---
 client/src/components/ItineraryList/InterchangeInfo.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/ItineraryList/InterchangeInfo.tsx b/client/src/components/ItineraryList/InterchangeInfo.tsx
index 0dbd7368c0e..b095564d8da 100644
--- a/client/src/components/ItineraryList/InterchangeInfo.tsx
+++ b/client/src/components/ItineraryList/InterchangeInfo.tsx
@@ -17,6 +17,6 @@ export function InterchangeInfo({ leg }: { leg: Leg }) {
       />
     );
   } else {
-    return <>;
+    return null;
   }
 }

From 80fedfa9275e046de3583bdc52077ccefb0cc963 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 25 Jul 2024 11:47:49 +0200
Subject: [PATCH 1670/1688] Make method private

---
 .../apis/gtfs/mapping/LocalDateRangeMapperTest.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
index 81b3b283151..ebf3a81d681 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
@@ -16,7 +16,7 @@ class LocalDateRangeMapperTest {
 
   private static final LocalDate DATE = LocalDate.parse("2024-05-27");
 
-  public static List noFilterCases() {
+  private static List noFilterCases() {
     var list = new ArrayList();
     list.add(null);
     list.add(new GraphQLTypes.GraphQLLocalDateRangeInput(Map.of()));

From 3cf6130f82e3062ca25a280865fcc164fff15168 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 25 Jul 2024 12:07:45 +0200
Subject: [PATCH 1671/1688] Make method private

---
 .../apis/gtfs/mapping/LocalDateRangeMapperTest.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
index ebf3a81d681..cbd771df933 100644
--- a/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
+++ b/src/test/java/org/opentripplanner/apis/gtfs/mapping/LocalDateRangeMapperTest.java
@@ -29,7 +29,7 @@ void hasNoServiceDateFilter(GraphQLTypes.GraphQLLocalDateRangeInput input) {
     assertFalse(LocalDateRangeUtil.hasServiceDateFilter(input));
   }
 
-  public static List> hasFilterCases() {
+  private static List> hasFilterCases() {
     return List.of(Map.of("start", DATE), Map.of("end", DATE), Map.of("start", DATE, "end", DATE));
   }
 

From 6eae01914321b774bb5511578cc0afefdf5463a6 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 25 Jul 2024 16:16:54 +0200
Subject: [PATCH 1672/1688] Ignore NeTEx parking by default

---
 docs/BuildConfiguration.md                                    | 4 ++--
 .../org/opentripplanner/netex/config/NetexFeedParameters.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/BuildConfiguration.md b/docs/BuildConfiguration.md
index d6c6c87295d..6a6b42cd664 100644
--- a/docs/BuildConfiguration.md
+++ b/docs/BuildConfiguration.md
@@ -78,7 +78,7 @@ Sections follow that describe particular settings in more depth.
 |    [groupFilePattern](#nd_groupFilePattern)                              |   `regexp`  | Pattern for matching group NeTEx files.                                                                                                                        | *Optional* | `"(\w{3})-.*\.xml"`               |  2.0  |
 |    ignoreFareFrame                                                       |  `boolean`  | Ignore contents of the FareFrame                                                                                                                               | *Optional* | `false`                           |  2.3  |
 |    [ignoreFilePattern](#nd_ignoreFilePattern)                            |   `regexp`  | Pattern for matching ignored files in a NeTEx bundle.                                                                                                          | *Optional* | `"$^"`                            |  2.0  |
-|    ignoreParking                                                         |  `boolean`  | Ignore Parking elements.                                                                                                                                       | *Optional* | `false`                           |  2.6  |
+|    ignoreParking                                                         |  `boolean`  | Ignore Parking elements.                                                                                                                                       | *Optional* | `true`                            |  2.6  |
 |    noTransfersOnIsolatedStops                                            |  `boolean`  | Whether we should allow transfers to and from StopPlaces marked with LimitedUse.ISOLATED                                                                       | *Optional* | `false`                           |  2.2  |
 |    [sharedFilePattern](#nd_sharedFilePattern)                            |   `regexp`  | Pattern for matching shared NeTEx files in a NeTEx bundle.                                                                                                     | *Optional* | `"shared-data\.xml"`              |  2.0  |
 |    [sharedGroupFilePattern](#nd_sharedGroupFilePattern)                  |   `regexp`  | Pattern for matching shared group NeTEx files in a NeTEx bundle.                                                                                               | *Optional* | `"(\w{3})-.*-shared\.xml"`        |  2.0  |
@@ -107,7 +107,7 @@ Sections follow that describe particular settings in more depth.
 |       [groupFilePattern](#tf_1_groupFilePattern)                         |   `regexp`  | Pattern for matching group NeTEx files.                                                                                                                        | *Optional* | `"(\w{3})-.*\.xml"`               |  2.0  |
 |       ignoreFareFrame                                                    |  `boolean`  | Ignore contents of the FareFrame                                                                                                                               | *Optional* | `false`                           |  2.3  |
 |       [ignoreFilePattern](#tf_1_ignoreFilePattern)                       |   `regexp`  | Pattern for matching ignored files in a NeTEx bundle.                                                                                                          | *Optional* | `"$^"`                            |  2.0  |
-|       ignoreParking                                                      |  `boolean`  | Ignore Parking elements.                                                                                                                                       | *Optional* | `false`                           |  2.6  |
+|       ignoreParking                                                      |  `boolean`  | Ignore Parking elements.                                                                                                                                       | *Optional* | `true`                            |  2.6  |
 |       noTransfersOnIsolatedStops                                         |  `boolean`  | Whether we should allow transfers to and from StopPlaces marked with LimitedUse.ISOLATED                                                                       | *Optional* | `false`                           |  2.2  |
 |       [sharedFilePattern](#tf_1_sharedFilePattern)                       |   `regexp`  | Pattern for matching shared NeTEx files in a NeTEx bundle.                                                                                                     | *Optional* | `"shared-data\.xml"`              |  2.0  |
 |       [sharedGroupFilePattern](#tf_1_sharedGroupFilePattern)             |   `regexp`  | Pattern for matching shared group NeTEx files in a NeTEx bundle.                                                                                               | *Optional* | `"(\w{3})-.*-shared\.xml"`        |  2.0  |
diff --git a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
index f565ea5a187..0c6c75c4db3 100644
--- a/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
+++ b/src/main/java/org/opentripplanner/netex/config/NetexFeedParameters.java
@@ -31,7 +31,7 @@ public class NetexFeedParameters implements DataSourceConfig {
   private static final String SHARED_GROUP_FILE_PATTERN = "(\\w{3})-.*-shared\\.xml";
   private static final String GROUP_FILE_PATTERN = "(\\w{3})-.*\\.xml";
   private static final boolean NO_TRANSFERS_ON_ISOLATED_STOPS = false;
-  private static final Set IGNORED_FEATURES = Set.of();
+  private static final Set IGNORED_FEATURES = Set.of(PARKING);
 
   private static final Set FERRY_IDS_NOT_ALLOWED_FOR_BICYCLE = Collections.emptySet();
 

From f21ea0f88641eab3a48c8f380c9ee40dc432d4b9 Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Thu, 25 Jul 2024 14:20:15 +0000
Subject: [PATCH 1673/1688] Upgrade debug client to version
 2024/07/2024-07-25T14:19

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index 863eb7b09a3..9ddee23eea6 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 984f199fe40d8d89410806fb8091fcf65ad63581 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Thu, 25 Jul 2024 14:20:31 +0000
Subject: [PATCH 1674/1688] Add changelog entry for #5977 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 1ae81820e72..5070247f39d 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -47,6 +47,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Generate documentation for OSM tag mappers [#5929](https://github.com/opentripplanner/OpenTripPlanner/pull/5929)
 - Disable Legacy REST API by default [#5948](https://github.com/opentripplanner/OpenTripPlanner/pull/5948)
 - Enforce non-null coordinates on multimodal station [#5971](https://github.com/opentripplanner/OpenTripPlanner/pull/5971)
+- Add car rental to Transmodel street mode options [#5977](https://github.com/opentripplanner/OpenTripPlanner/pull/5977)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From ed6b165cf06a1e5ebdd90ddcdcfe8fc0709da664 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Thu, 25 Jul 2024 16:25:00 +0200
Subject: [PATCH 1675/1688] Update tests

---
 .../opentripplanner/netex/config/NetexFeedParametersTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java b/src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java
index d010e3a0d9e..93624afe339 100644
--- a/src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java
+++ b/src/test/java/org/opentripplanner/netex/config/NetexFeedParametersTest.java
@@ -89,7 +89,7 @@ void testCopyOfEqualsAndHashCode() {
 
   @Test
   void testToString() {
-    assertEquals("NetexFeedParameters{}", DEFAULT.toString());
+    assertEquals("NetexFeedParameters{ignoredFeatures: [PARKING]}", DEFAULT.toString());
     assertEquals(
       "NetexFeedParameters{" +
       "source: https://my.test.com, " +
@@ -98,6 +98,7 @@ void testToString() {
       "sharedGroupFilePattern: '[sharedGoupFil]+', " +
       "groupFilePattern: '[groupFile]+', " +
       "ignoreFilePattern: '[ignoreFl]+', " +
+      "ignoredFeatures: [PARKING], " +
       "ferryIdsNotAllowedForBicycle: [Ferry:Id]" +
       "}",
       subject.toString()

From ae6fbc835826bb35bad8940a61a0f81c53a4e5f5 Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Thu, 25 Jul 2024 20:40:22 +0000
Subject: [PATCH 1676/1688] Upgrade debug client to version
 2024/07/2024-07-25T20:39

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index 9ddee23eea6..767f8b1d45a 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 0afceddfb826ec84e9799b950665bceae1fd2cec Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Thu, 25 Jul 2024 20:40:38 +0000
Subject: [PATCH 1677/1688] Add changelog entry for #5962 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 5070247f39d..3c53c292aff 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -48,6 +48,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Disable Legacy REST API by default [#5948](https://github.com/opentripplanner/OpenTripPlanner/pull/5948)
 - Enforce non-null coordinates on multimodal station [#5971](https://github.com/opentripplanner/OpenTripPlanner/pull/5971)
 - Add car rental to Transmodel street mode options [#5977](https://github.com/opentripplanner/OpenTripPlanner/pull/5977)
+- Add debug information for stop/quay ID and stay-seated transfers [#5962](https://github.com/opentripplanner/OpenTripPlanner/pull/5962)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From d6cf79d8c7fb9d7e56884d9e90d4973edd3a75f5 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Fri, 26 Jul 2024 07:25:12 +0000
Subject: [PATCH 1678/1688] Add changelog entry for #5983 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 3c53c292aff..e1e839a7bd5 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -49,6 +49,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Enforce non-null coordinates on multimodal station [#5971](https://github.com/opentripplanner/OpenTripPlanner/pull/5971)
 - Add car rental to Transmodel street mode options [#5977](https://github.com/opentripplanner/OpenTripPlanner/pull/5977)
 - Add debug information for stop/quay ID and stay-seated transfers [#5962](https://github.com/opentripplanner/OpenTripPlanner/pull/5962)
+- Handle NeTEx `any` version [#5983](https://github.com/opentripplanner/OpenTripPlanner/pull/5983)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 278732253780fdd8b449aef41b9c5871c5fc33a4 Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Fri, 26 Jul 2024 09:58:43 +0000
Subject: [PATCH 1679/1688] Add changelog entry for #5919 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index e1e839a7bd5..1527e18c873 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -50,6 +50,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Add car rental to Transmodel street mode options [#5977](https://github.com/opentripplanner/OpenTripPlanner/pull/5977)
 - Add debug information for stop/quay ID and stay-seated transfers [#5962](https://github.com/opentripplanner/OpenTripPlanner/pull/5962)
 - Handle NeTEx `any` version [#5983](https://github.com/opentripplanner/OpenTripPlanner/pull/5983)
+- Keep at least one result for min-transfers and each transit-group in itinerary-group-filter [#5919](https://github.com/opentripplanner/OpenTripPlanner/pull/5919)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From a3147304f73578f5eac4a409020331398731285c Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Mon, 29 Jul 2024 12:37:40 +0000
Subject: [PATCH 1680/1688] Add changelog entry for #5946 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index 1527e18c873..d9650be1dcb 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -51,6 +51,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Add debug information for stop/quay ID and stay-seated transfers [#5962](https://github.com/opentripplanner/OpenTripPlanner/pull/5962)
 - Handle NeTEx `any` version [#5983](https://github.com/opentripplanner/OpenTripPlanner/pull/5983)
 - Keep at least one result for min-transfers and each transit-group in itinerary-group-filter [#5919](https://github.com/opentripplanner/OpenTripPlanner/pull/5919)
+- Extract parking lots from NeTEx feeds [#5946](https://github.com/opentripplanner/OpenTripPlanner/pull/5946)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 4c33d38bedd62348321de9537af901cec5358dbd Mon Sep 17 00:00:00 2001
From: OTP Serialization Version Bot
 
Date: Mon, 29 Jul 2024 12:38:00 +0000
Subject: [PATCH 1681/1688] Bump serialization version id for #5946

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 2f007cbb214..9d5aa615260 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,7 +56,7 @@
 
 
     
-        155
+        156
         
         31.3
         2.51.1

From f2d24aefb8f80f38c8ddb9d5765d17dfc7c94b81 Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Mon, 29 Jul 2024 12:38:58 +0000
Subject: [PATCH 1682/1688] Upgrade debug client to version
 2024/07/2024-07-29T12:38

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index 767f8b1d45a..fd0c2e937f7 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From 18625fc58ee915eaf04821a1646a8076046dfbce Mon Sep 17 00:00:00 2001
From: OTP Changelog Bot 
Date: Tue, 30 Jul 2024 08:29:51 +0000
Subject: [PATCH 1683/1688] Add changelog entry for #5869 [ci skip]

---
 docs/Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/Changelog.md b/docs/Changelog.md
index d9650be1dcb..64840e36790 100644
--- a/docs/Changelog.md
+++ b/docs/Changelog.md
@@ -52,6 +52,7 @@ based on merged pull requests. Search GitHub issues and pull requests for smalle
 - Handle NeTEx `any` version [#5983](https://github.com/opentripplanner/OpenTripPlanner/pull/5983)
 - Keep at least one result for min-transfers and each transit-group in itinerary-group-filter [#5919](https://github.com/opentripplanner/OpenTripPlanner/pull/5919)
 - Extract parking lots from NeTEx feeds [#5946](https://github.com/opentripplanner/OpenTripPlanner/pull/5946)
+- Filter routes and patterns by service date in GTFS GraphQL API [#5869](https://github.com/opentripplanner/OpenTripPlanner/pull/5869)
 [](AUTOMATIC_CHANGELOG_PLACEHOLDER_DO_NOT_REMOVE)
 
 ## 2.5.0 (2024-03-13)

From 44864d67c0ff19e3f01596110a291e7b5d69dc47 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 31 Jul 2024 13:48:03 +0000
Subject: [PATCH 1684/1688] Update Debug UI dependencies (non-major)

---
 client/package-lock.json | 192 +++++++++++++++++++--------------------
 client/package.json      |  12 +--
 2 files changed, 102 insertions(+), 102 deletions(-)

diff --git a/client/package-lock.json b/client/package-lock.json
index dc6c6dfa1a3..9e2798660ec 100644
--- a/client/package-lock.json
+++ b/client/package-lock.json
@@ -20,16 +20,16 @@
       },
       "devDependencies": {
         "@graphql-codegen/cli": "5.0.2",
-        "@graphql-codegen/client-preset": "4.3.2",
+        "@graphql-codegen/client-preset": "4.3.3",
         "@graphql-codegen/introspection": "4.0.3",
         "@parcel/watcher": "2.4.1",
         "@testing-library/react": "16.0.0",
         "@types/react": "18.3.3",
         "@types/react-dom": "18.3.0",
-        "@typescript-eslint/eslint-plugin": "7.17.0",
-        "@typescript-eslint/parser": "7.17.0",
+        "@typescript-eslint/eslint-plugin": "7.18.0",
+        "@typescript-eslint/parser": "7.18.0",
         "@vitejs/plugin-react": "4.3.1",
-        "@vitest/coverage-v8": "2.0.4",
+        "@vitest/coverage-v8": "2.0.5",
         "eslint": "8.57.0",
         "eslint-config-prettier": "9.1.0",
         "eslint-plugin-import": "2.29.1",
@@ -40,8 +40,8 @@
         "jsdom": "24.1.1",
         "prettier": "3.3.3",
         "typescript": "5.5.4",
-        "vite": "5.3.4",
-        "vitest": "2.0.4"
+        "vite": "5.3.5",
+        "vitest": "2.0.5"
       }
     },
     "node_modules/@aashutoshrathi/word-wrap": {
@@ -1861,9 +1861,9 @@
       }
     },
     "node_modules/@graphql-codegen/client-preset": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.3.2.tgz",
-      "integrity": "sha512-42jHyG6u2uFDIVNvzue8zR529aPT16EYIJQmvMk8XuYHo3PneQVlWmQ3j2fBy+RuWCBzpJKPKm7IGSKiw19nmg==",
+      "version": "4.3.3",
+      "resolved": "https://registry.npmjs.org/@graphql-codegen/client-preset/-/client-preset-4.3.3.tgz",
+      "integrity": "sha512-IrDsSVe8bkKtxgVfKPHzjL9tYlv7KEpA59R4gZLqx/t2WIJncW1i0OMvoz9tgoZsFEs8OKKgXZbnwPZ/Qf1kEw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3943,17 +3943,17 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.17.0.tgz",
-      "integrity": "sha512-pyiDhEuLM3PuANxH7uNYan1AaFs5XE0zw1hq69JBvGvE7gSuEoQl1ydtEe/XQeoC3GQxLXyOVa5kNOATgM638A==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.18.0.tgz",
+      "integrity": "sha512-94EQTWZ40mzBc42ATNIBimBEDltSJ9RQHCC8vc/PDbxi4k8dVwUAv4o98dk50M1zB+JGFxp43FP7f8+FP8R6Sw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "7.17.0",
-        "@typescript-eslint/type-utils": "7.17.0",
-        "@typescript-eslint/utils": "7.17.0",
-        "@typescript-eslint/visitor-keys": "7.17.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/type-utils": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
@@ -3977,16 +3977,16 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.17.0.tgz",
-      "integrity": "sha512-puiYfGeg5Ydop8eusb/Hy1k7QmOU6X3nvsqCgzrB2K4qMavK//21+PzNE8qeECgNOIoertJPUC1SpegHDI515A==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.18.0.tgz",
+      "integrity": "sha512-4Z+L8I2OqhZV8qA132M4wNL30ypZGYOQVBfMgxDH/K5UX0PNqTu1c6za9ST5r9+tavvHiTWmBnKzpCJ/GlVFtg==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.17.0",
-        "@typescript-eslint/types": "7.17.0",
-        "@typescript-eslint/typescript-estree": "7.17.0",
-        "@typescript-eslint/visitor-keys": "7.17.0",
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4006,14 +4006,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz",
-      "integrity": "sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz",
+      "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.17.0",
-        "@typescript-eslint/visitor-keys": "7.17.0"
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -4024,14 +4024,14 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.17.0.tgz",
-      "integrity": "sha512-XD3aaBt+orgkM/7Cei0XNEm1vwUxQ958AOLALzPlbPqb8C1G8PZK85tND7Jpe69Wualri81PLU+Zc48GVKIMMA==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.18.0.tgz",
+      "integrity": "sha512-XL0FJXuCLaDuX2sYqZUUSOJ2sG5/i1AAze+axqmLnSkNEVMVYLF+cbwlB2w8D1tinFuSikHmFta+P+HOofrLeA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.17.0",
-        "@typescript-eslint/utils": "7.17.0",
+        "@typescript-eslint/typescript-estree": "7.18.0",
+        "@typescript-eslint/utils": "7.18.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.3.0"
       },
@@ -4052,9 +4052,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.17.0.tgz",
-      "integrity": "sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz",
+      "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -4066,14 +4066,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz",
-      "integrity": "sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz",
+      "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==",
       "dev": true,
       "license": "BSD-2-Clause",
       "dependencies": {
-        "@typescript-eslint/types": "7.17.0",
-        "@typescript-eslint/visitor-keys": "7.17.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/visitor-keys": "7.18.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -4108,16 +4108,16 @@
       }
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.17.0.tgz",
-      "integrity": "sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz",
+      "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "7.17.0",
-        "@typescript-eslint/types": "7.17.0",
-        "@typescript-eslint/typescript-estree": "7.17.0"
+        "@typescript-eslint/scope-manager": "7.18.0",
+        "@typescript-eslint/types": "7.18.0",
+        "@typescript-eslint/typescript-estree": "7.18.0"
       },
       "engines": {
         "node": "^18.18.0 || >=20.0.0"
@@ -4131,13 +4131,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz",
-      "integrity": "sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A==",
+      "version": "7.18.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz",
+      "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "7.17.0",
+        "@typescript-eslint/types": "7.18.0",
         "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
@@ -4175,9 +4175,9 @@
       }
     },
     "node_modules/@vitest/coverage-v8": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.0.4.tgz",
-      "integrity": "sha512-i4lx/Wpg5zF1h2op7j0wdwuEQxaL/YTwwQaKuKMHYj7MMh8c7I4W7PNfOptZBCSBZI0z1qwn64o0pM/pA8Tz1g==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-2.0.5.tgz",
+      "integrity": "sha512-qeFcySCg5FLO2bHHSa0tAZAOnAUbp4L6/A5JDuj9+bt53JREl8hpLjLHEWF0e/gWc8INVpJaqA7+Ene2rclpZg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4198,18 +4198,18 @@
         "url": "https://opencollective.com/vitest"
       },
       "peerDependencies": {
-        "vitest": "2.0.4"
+        "vitest": "2.0.5"
       }
     },
     "node_modules/@vitest/expect": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.4.tgz",
-      "integrity": "sha512-39jr5EguIoanChvBqe34I8m1hJFI4+jxvdOpD7gslZrVQBKhh8H9eD7J/LJX4zakrw23W+dITQTDqdt43xVcJw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-2.0.5.tgz",
+      "integrity": "sha512-yHZtwuP7JZivj65Gxoi8upUN2OzHTi3zVfjwdpu2WrvCZPLwsJ2Ey5ILIPccoW23dd/zQBlJ4/dhi7DWNyXCpA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/spy": "2.0.4",
-        "@vitest/utils": "2.0.4",
+        "@vitest/spy": "2.0.5",
+        "@vitest/utils": "2.0.5",
         "chai": "^5.1.1",
         "tinyrainbow": "^1.2.0"
       },
@@ -4218,9 +4218,9 @@
       }
     },
     "node_modules/@vitest/pretty-format": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.4.tgz",
-      "integrity": "sha512-RYZl31STbNGqf4l2eQM1nvKPXE0NhC6Eq0suTTePc4mtMQ1Fn8qZmjV4emZdEdG2NOWGKSCrHZjmTqDCDoeFBw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-2.0.5.tgz",
+      "integrity": "sha512-h8k+1oWHfwTkyTkb9egzwNMfJAEx4veaPSnMeKbVSjp4euqGSbQlm5+6VHwTr7u4FJslVVsUG5nopCaAYdOmSQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4231,13 +4231,13 @@
       }
     },
     "node_modules/@vitest/runner": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.4.tgz",
-      "integrity": "sha512-Gk+9Su/2H2zNfNdeJR124gZckd5st4YoSuhF1Rebi37qTXKnqYyFCd9KP4vl2cQHbtuVKjfEKrNJxHHCW8thbQ==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-2.0.5.tgz",
+      "integrity": "sha512-TfRfZa6Bkk9ky4tW0z20WKXFEwwvWhRY+84CnSEtq4+3ZvDlJyY32oNTJtM7AW9ihW90tX/1Q78cb6FjoAs+ig==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/utils": "2.0.4",
+        "@vitest/utils": "2.0.5",
         "pathe": "^1.1.2"
       },
       "funding": {
@@ -4245,13 +4245,13 @@
       }
     },
     "node_modules/@vitest/snapshot": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.4.tgz",
-      "integrity": "sha512-or6Mzoz/pD7xTvuJMFYEtso1vJo1S5u6zBTinfl+7smGUhqybn6VjzCDMhmTyVOFWwkCMuNjmNNxnyXPgKDoPw==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-2.0.5.tgz",
+      "integrity": "sha512-SgCPUeDFLaM0mIUHfaArq8fD2WbaXG/zVXjRupthYfYGzc8ztbFbu6dUNOblBG7XLMR1kEhS/DNnfCZ2IhdDew==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.0.4",
+        "@vitest/pretty-format": "2.0.5",
         "magic-string": "^0.30.10",
         "pathe": "^1.1.2"
       },
@@ -4260,9 +4260,9 @@
       }
     },
     "node_modules/@vitest/spy": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.4.tgz",
-      "integrity": "sha512-uTXU56TNoYrTohb+6CseP8IqNwlNdtPwEO0AWl+5j7NelS6x0xZZtP0bDWaLvOfUbaYwhhWp1guzXUxkC7mW7Q==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-2.0.5.tgz",
+      "integrity": "sha512-c/jdthAhvJdpfVuaexSrnawxZz6pywlTPe84LUB2m/4t3rl2fTo9NFGBG4oWgaD+FTgDDV8hJ/nibT7IfH3JfA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4273,13 +4273,13 @@
       }
     },
     "node_modules/@vitest/utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.4.tgz",
-      "integrity": "sha512-Zc75QuuoJhOBnlo99ZVUkJIuq4Oj0zAkrQ2VzCqNCx6wAwViHEh5Fnp4fiJTE9rA+sAoXRf00Z9xGgfEzV6fzQ==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-2.0.5.tgz",
+      "integrity": "sha512-d8HKbqIcya+GR67mkZbrzhS5kKhtp8dQLcmRZLGTscGVg7yImT82cIrhtn2L8+VujWcy6KZweApgNmPsTAO/UQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@vitest/pretty-format": "2.0.4",
+        "@vitest/pretty-format": "2.0.5",
         "estree-walker": "^3.0.3",
         "loupe": "^3.1.1",
         "tinyrainbow": "^1.2.0"
@@ -11392,9 +11392,9 @@
       }
     },
     "node_modules/vite": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.4.tgz",
-      "integrity": "sha512-Cw+7zL3ZG9/NZBB8C+8QbQZmR54GwqIz+WMI4b3JgdYJvX+ny9AjJXqkGQlDXSXRP9rP0B4tbciRMOVEKulVOA==",
+      "version": "5.3.5",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-5.3.5.tgz",
+      "integrity": "sha512-MdjglKR6AQXQb9JGiS7Rc2wC6uMjcm7Go/NHNO63EwiJXfuk9PgqiP/n5IDJCziMkfw9n4Ubp7lttNwz+8ZVKA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11448,9 +11448,9 @@
       }
     },
     "node_modules/vite-node": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.4.tgz",
-      "integrity": "sha512-ZpJVkxcakYtig5iakNeL7N3trufe3M6vGuzYAr4GsbCTwobDeyPJpE4cjDhhPluv8OvQCFzu2LWp6GkoKRITXA==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-2.0.5.tgz",
+      "integrity": "sha512-LdsW4pxj0Ot69FAoXZ1yTnA9bjGohr2yNBU7QKRxpz8ITSkhuDl6h3zS/tvgz4qrNjeRnvrWeXQ8ZF7Um4W00Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -11471,19 +11471,19 @@
       }
     },
     "node_modules/vitest": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.4.tgz",
-      "integrity": "sha512-luNLDpfsnxw5QSW4bISPe6tkxVvv5wn2BBs/PuDRkhXZ319doZyLOBr1sjfB5yCEpTiU7xCAdViM8TNVGPwoog==",
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/vitest/-/vitest-2.0.5.tgz",
+      "integrity": "sha512-8GUxONfauuIdeSl5f9GTgVEpg5BTOlplET4WEDaeY2QBiN8wSm68vxN/tb5z405OwppfoCavnwXafiaYBC/xOA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
         "@ampproject/remapping": "^2.3.0",
-        "@vitest/expect": "2.0.4",
-        "@vitest/pretty-format": "^2.0.4",
-        "@vitest/runner": "2.0.4",
-        "@vitest/snapshot": "2.0.4",
-        "@vitest/spy": "2.0.4",
-        "@vitest/utils": "2.0.4",
+        "@vitest/expect": "2.0.5",
+        "@vitest/pretty-format": "^2.0.5",
+        "@vitest/runner": "2.0.5",
+        "@vitest/snapshot": "2.0.5",
+        "@vitest/spy": "2.0.5",
+        "@vitest/utils": "2.0.5",
         "chai": "^5.1.1",
         "debug": "^4.3.5",
         "execa": "^8.0.1",
@@ -11494,7 +11494,7 @@
         "tinypool": "^1.0.0",
         "tinyrainbow": "^1.2.0",
         "vite": "^5.0.0",
-        "vite-node": "2.0.4",
+        "vite-node": "2.0.5",
         "why-is-node-running": "^2.3.0"
       },
       "bin": {
@@ -11509,8 +11509,8 @@
       "peerDependencies": {
         "@edge-runtime/vm": "*",
         "@types/node": "^18.0.0 || >=20.0.0",
-        "@vitest/browser": "2.0.4",
-        "@vitest/ui": "2.0.4",
+        "@vitest/browser": "2.0.5",
+        "@vitest/ui": "2.0.5",
         "happy-dom": "*",
         "jsdom": "*"
       },
diff --git a/client/package.json b/client/package.json
index 8ce0ed0cbdb..fe8836e8d36 100644
--- a/client/package.json
+++ b/client/package.json
@@ -29,16 +29,16 @@
   },
   "devDependencies": {
     "@graphql-codegen/cli": "5.0.2",
-    "@graphql-codegen/client-preset": "4.3.2",
+    "@graphql-codegen/client-preset": "4.3.3",
     "@graphql-codegen/introspection": "4.0.3",
     "@parcel/watcher": "2.4.1",
     "@testing-library/react": "16.0.0",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
-    "@typescript-eslint/eslint-plugin": "7.17.0",
-    "@typescript-eslint/parser": "7.17.0",
+    "@typescript-eslint/eslint-plugin": "7.18.0",
+    "@typescript-eslint/parser": "7.18.0",
     "@vitejs/plugin-react": "4.3.1",
-    "@vitest/coverage-v8": "2.0.4",
+    "@vitest/coverage-v8": "2.0.5",
     "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
@@ -49,7 +49,7 @@
     "jsdom": "24.1.1",
     "prettier": "3.3.3",
     "typescript": "5.5.4",
-    "vite": "5.3.4",
-    "vitest": "2.0.4"
+    "vite": "5.3.5",
+    "vitest": "2.0.5"
   }
 }

From d04c26c2212597f5a4efef2d55f6ace8c731ed86 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 31 Jul 2024 22:24:36 +0200
Subject: [PATCH 1685/1688] Automerge truth, fixes #5988 [ci skip]

---
 renovate.json5 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/renovate.json5 b/renovate.json5
index d8ba10984e5..5ac10731e05 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -114,6 +114,7 @@
         "com.tngtech.archunit:archunit",
         "org.apache.maven.plugins:maven-surefire-plugin",
         "me.fabriciorby:maven-surefire-junit5-tree-reporter",
+        "com.google.truth:truth",
         "org.jacoco:jacoco-maven-plugin", // coverage plugin
         "org.apache.commons:commons-compress", // only used by tests
         // maven plugins

From b04d1d56052fbd199e76d004d9d48afbc592bef0 Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Wed, 31 Jul 2024 22:36:37 +0200
Subject: [PATCH 1686/1688] Schedule test dependency upgrades once a month [ci
 skip]

---
 renovate.json5 | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/renovate.json5 b/renovate.json5
index 5ac10731e05..98ec1f24fbe 100644
--- a/renovate.json5
+++ b/renovate.json5
@@ -44,6 +44,23 @@
     },
     // some dependencies that we auto-merge release very often and even the auto-merges create a lot of
     // noise, so we slow it down a bit
+    {
+      "matchPackageNames": [
+        "org.mockito:mockito-core",
+        "com.tngtech.archunit:archunit",
+        "org.apache.maven.plugins:maven-surefire-plugin",
+        "me.fabriciorby:maven-surefire-junit5-tree-reporter",
+        "com.google.truth:truth",
+        "org.jacoco:jacoco-maven-plugin", // coverage plugin
+        "org.apache.commons:commons-compress" // only used by tests
+      ],
+      "matchPackagePrefixes": [
+        "org.junit.jupiter:",
+      ],
+      "groupName": "Test dependencies",
+      "automerge": true,
+      "schedule": "on the 17th day of the month"
+    },
     {
       "matchPackageNames": [
         "org.mobilitydata:gbfs-java-model"
@@ -110,13 +127,6 @@
     {
       "description": "automatically merge test, logging and build dependencies",
       "matchPackageNames": [
-        "org.mockito:mockito-core",
-        "com.tngtech.archunit:archunit",
-        "org.apache.maven.plugins:maven-surefire-plugin",
-        "me.fabriciorby:maven-surefire-junit5-tree-reporter",
-        "com.google.truth:truth",
-        "org.jacoco:jacoco-maven-plugin", // coverage plugin
-        "org.apache.commons:commons-compress", // only used by tests
         // maven plugins
         "org.codehaus.mojo:build-helper-maven-plugin",
         "org.apache.maven.plugins:maven-source-plugin",
@@ -128,7 +138,6 @@
         "org.sonatype.plugins:nexus-staging-maven-plugin"
       ],
       "matchPackagePrefixes": [
-        "org.junit.jupiter:",
         "org.slf4j:"
       ],
       "automerge": true,

From 669d042ae3aad3c8b03762f464c67b73b5ae5646 Mon Sep 17 00:00:00 2001
From: OTP Bot 
Date: Thu, 1 Aug 2024 06:46:11 +0000
Subject: [PATCH 1687/1688] Upgrade debug client to version
 2024/08/2024-08-01T06:45

---
 src/client/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/client/index.html b/src/client/index.html
index fd0c2e937f7..d1734898ca0 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -5,8 +5,8 @@
     
     
     OTP Debug Client
-    
-    
+    
+    
   
   
     
              

From db62d62d046a017833a516836edd45c2abd3f82f Mon Sep 17 00:00:00 2001
From: Leonard Ehrenfried 
Date: Sun, 4 Aug 2024 23:26:23 +0200
Subject: [PATCH 1688/1688] Fix spelling [ci skip]

---
 docs/RouteRequest.md                                          | 4 ++--
 .../standalone/config/routerequest/RouteRequestConfig.java    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/RouteRequest.md b/docs/RouteRequest.md
index 14d937eeb63..a8baaf1603b 100644
--- a/docs/RouteRequest.md
+++ b/docs/RouteRequest.md
@@ -254,7 +254,7 @@ This is a performance limit and should therefore be set high. Results close to t
 guaranteed to be optimal. Use itinerary-filters to limit what is presented to the client. The
 duration can be set per mode(`maxDirectStreetDurationForMode`), because some street modes searches
 are much more resource intensive than others. A default value is applied if the mode specific value
-do not exist."
+does not exist."
 
 
 
              maxJourneyDuration
              
@@ -403,7 +403,7 @@ This is a performance limit and should therefore be set high. Results close to t
 guaranteed to be optimal. Use itinerary-filters to limit what is presented to the client. The
 duration can be set per mode(`maxDurationForMode`), because some street modes searches
 are much more resource intensive than others. A default value is applied if the mode specific value
-do not exist.
+does not exist.
 
 
 
              maxStopCount
              
diff --git a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
index 6fa33aac267..dc91388458a 100644
--- a/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
+++ b/src/main/java/org/opentripplanner/standalone/config/routerequest/RouteRequestConfig.java
@@ -514,7 +514,7 @@ the access legs used. In other cases where the access(CAR) is faster than transi
 guaranteed to be optimal. Use itinerary-filters to limit what is presented to the client. The
 duration can be set per mode(`maxDurationForMode`), because some street modes searches
 are much more resource intensive than others. A default value is applied if the mode specific value
-do not exist.
+does not exist.
 """
               )
               .asDuration(dftAccessEgress.maxDuration().defaultValue()),
@@ -554,7 +554,7 @@ duration can be set per mode(`maxDurationForMode`), because some street modes se
 guaranteed to be optimal. Use itinerary-filters to limit what is presented to the client. The
 duration can be set per mode(`maxDirectStreetDurationForMode`), because some street modes searches
 are much more resource intensive than others. A default value is applied if the mode specific value
-do not exist."
+does not exist."
 """
           )
           .asDuration(dft.maxDirectDuration().defaultValue()),